From a3c723ee30db61e4c2c5375fa3c8c677336ca113 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 2 Apr 2013 23:48:55 +0100
Subject: Fix minor race condition where SOP.GetGeometricCenter() and
 GetCenterOfMass() could return results which were never the case if these
 values were changed whilst the method was running

No need to create new Vector3s since these are structs.
---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ec9e87e..2fcb199 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2136,9 +2136,9 @@ namespace OpenSim.Region.Framework.Scenes
             PhysicsActor pa = PhysActor;
 
             if (pa != null)
-                return new Vector3(pa.GeometricCenter.X, pa.GeometricCenter.Y, pa.GeometricCenter.Z);
+                return pa.GeometricCenter;
             else
-                return new Vector3(0, 0, 0);
+                return Vector3.Zero;
         }
 
         public Vector3 GetCenterOfMass()
@@ -2146,9 +2146,9 @@ namespace OpenSim.Region.Framework.Scenes
             PhysicsActor pa = PhysActor;
 
             if (pa != null)
-                return new Vector3(pa.CenterOfMass.X, pa.CenterOfMass.Y, pa.CenterOfMass.Z);
+                return pa.CenterOfMass;
             else
-                return new Vector3(0, 0, 0);
+                return Vector3.Zero;
         }
 
         public float GetMass()
-- 
cgit v1.1


From 3332af4060960a4b649d3d5237988e0f410b54e3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 3 Apr 2013 00:01:06 +0100
Subject: minor: Make SOP.UpdateOffset() more consistent by checking against
 the same old OffsetPosition rather than one which may vary if it
 simultaneously changes.

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 2fcb199..d412702 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3915,17 +3915,17 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <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)
-- 
cgit v1.1


From c0319daa403f68427bb80b4845a92eb37f21a7b7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 3 Apr 2013 00:09:28 +0100
Subject: fix minor race condition in SOP.SitTargetPositionLL where
 inconsistency could occur if the sit target position changed whilst the
 property was fetched

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index d412702..3e816fc 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1146,7 +1146,7 @@ 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; }
         }
 
-- 
cgit v1.1


From 97f0c9da84f9a3a73a63c209012260fa2c59c0de Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 3 Apr 2013 00:23:20 +0100
Subject: Use consistent GroupPosition value Make SOP.UpdateGroupPosition()
 rather than one that could change whilst the method is being executed.

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 3e816fc..7697411 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3902,13 +3902,14 @@ 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();
             }
-- 
cgit v1.1


From 7bf1986e9138df4629aa9323d3ba9fab5c884400 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 3 Apr 2013 00:24:33 +0100
Subject: Fix minor race condition in SOP.SitTargetOrientationLL where
 inconsistent values could be returned if the sit orientation was changed
 whilst the property was being fetched.

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 7697411..93d4da0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1152,17 +1152,8 @@ namespace OpenSim.Region.Framework.Scenes
 
         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
-- 
cgit v1.1


From 94d44142e37a9191162a426f28dd23f40b0cf4aa Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 3 Apr 2013 00:48:36 +0100
Subject: minor: Stop falsely logging that a teleport was being aborted on
 client logout even when no teleport was active.

---
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 3e69bf2..ca0cef1 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);
-- 
cgit v1.1


From 831e4c38506140e9ece2db4b96b4f0960a0276a8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 4 Apr 2013 00:36:15 +0100
Subject: Fix bug where outstanding llHTTPRequests for scripts were not being
 aborted when they were deleted.

This was because AsyncCommandManager was handing an item ID to IHttpRequestModule.StopHttpRequest() rather than the expected request ID.
This commit also makes the http request asynchronous using BeginGetResponse() rather than doing this by launching a new thread
so that we can more safely abort it via HttpWebRequest.Abort() rather than aborting the thread itself.
This also renames StopHttpRequest() to StopHttpRequestsForScript() since any outstanding requests are now aborted and/or removed.
---
 .../Scripting/HttpRequest/ScriptsHttpRequests.cs   | 92 +++++++++++++++-------
 .../Region/Framework/Interfaces/IHttpRequests.cs   |  8 +-
 .../Api/Implementation/AsyncCommandManager.cs      |  8 +-
 3 files changed, 76 insertions(+), 32 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index c2e37c4..1c251b8 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -28,12 +28,15 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Net.Mail;
 using System.Net.Security;
+using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Security.Cryptography.X509Certificates;
+using log4net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -250,18 +253,29 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             return reqID;
         }
 
-        public void StopHttpRequest(uint m_localID, UUID m_itemID)
+        public void StopHttpRequestsForScript(UUID id)
         {
             if (m_pendingRequests != null)
             {
+                List<UUID> keysToRemove = null;
+
                 lock (HttpListLock)
                 {
-                    HttpRequestClass tmpReq;
-                    if (m_pendingRequests.TryGetValue(m_itemID, out tmpReq))
+                    foreach (HttpRequestClass req in m_pendingRequests.Values)
                     {
-                        tmpReq.Stop();
-                        m_pendingRequests.Remove(m_itemID);
+                        if (req.ItemID == id)
+                        {
+                            req.Stop();
+
+                            if (keysToRemove == null)
+                                keysToRemove = new List<UUID>();
+
+                            keysToRemove.Add(req.ReqID);
+                        }
                     }
+
+                    if (keysToRemove != null)
+                        keysToRemove.ForEach(keyToRemove => m_pendingRequests.Remove(keyToRemove));
                 }
             }
         }
@@ -362,6 +376,8 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 
     public class HttpRequestClass: IServiceRequest
     {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         // Constants for parameters
         // public const int HTTP_BODY_MAXLENGTH = 2;
         // public const int HTTP_METHOD = 0;
@@ -419,12 +435,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 
         public void Process()
         {
-            httpThread = new Thread(SendRequest);
-            httpThread.Name = "HttpRequestThread";
-            httpThread.Priority = ThreadPriority.BelowNormal;
-            httpThread.IsBackground = true;
-            _finished = false;
-            httpThread.Start();
+            SendRequest();
         }
 
         /*
@@ -435,10 +446,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         public void SendRequest()
         {
             HttpWebResponse response = null;
-            StringBuilder sb = new StringBuilder();
-            byte[] buf = new byte[8192];
-            string tempString = null;
-            int count = 0;
 
             try
             {
@@ -497,11 +504,12 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     bstream.Close();
                 }
 
-                Request.Timeout = HttpTimeout;
                 try
                 {
-                    // execute the request
-                    response = (HttpWebResponse) Request.GetResponse();
+                    IAsyncResult result = (IAsyncResult)Request.BeginGetResponse(ResponseCallback, null);
+
+                    ThreadPool.RegisterWaitForSingleObject(
+                        result.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), null, HttpTimeout, true);
                 }
                 catch (WebException e)
                 {
@@ -510,11 +518,31 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                         throw;
                     }
                     response = (HttpWebResponse)e.Response;
+                    _finished = true;
                 }
+            }
+            catch (Exception e)
+            {
+                Status = (int)OSHttpStatusCode.ClientErrorJoker;
+                ResponseBody = e.Message;
+                _finished = true;
+            }
+        }
 
+        private void ResponseCallback(IAsyncResult ar)
+        {
+            HttpWebResponse response = null;
+
+            try
+            {
+                response = (HttpWebResponse)Request.EndGetResponse(ar);
                 Status = (int)response.StatusCode;
 
                 Stream resStream = response.GetResponseStream();
+                StringBuilder sb = new StringBuilder();
+                byte[] buf = new byte[8192];
+                string tempString = null;
+                int count = 0;
 
                 do
                 {
@@ -530,36 +558,40 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                         // continue building the string
                         sb.Append(tempString);
                     }
-                } while (count > 0); // any more data to read?
+                } 
+                while (count > 0); // any more data to read?
 
-                ResponseBody = sb.ToString();
+                ResponseBody = sb.ToString();         
             }
             catch (Exception e)
             {
                 Status = (int)OSHttpStatusCode.ClientErrorJoker;
                 ResponseBody = e.Message;
 
-                _finished = true;
-                return;
+//                m_log.Debug(
+//                    string.Format("[SCRIPTS HTTP REQUESTS]: Exception on response to {0} for {1}  ", Url, ItemID), e);
             }
             finally
             {
                 if (response != null)
                     response.Close();
+
+                _finished = true;
             }
+        }
 
-            _finished = true;
+        private void TimeoutCallback(object state, bool timedOut)
+        {
+            if (timedOut)
+                Request.Abort();
         }
 
         public void Stop()
         {
-            try
-            {
-                httpThread.Abort();
-            }
-            catch (Exception)
-            {
-            }
+//            m_log.DebugFormat("[SCRIPTS HTTP REQUESTS]: Stopping request to {0} for {1}  ", Url, ItemID);
+
+            if (Request != null)
+                Request.Abort();
         }
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
index eb6c5ac..113dcd7 100644
--- a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
+++ b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
@@ -45,7 +45,13 @@ namespace OpenSim.Region.Framework.Interfaces
     {
         UUID MakeHttpRequest(string url, string parameters, string body);
         UUID StartHttpRequest(uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body);
-        void StopHttpRequest(uint m_localID, UUID m_itemID);
+
+        /// <summary>
+        /// Stop and remove all http requests for the given script.
+        /// </summary>
+        /// <param name='id'></param>
+        void StopHttpRequestsForScript(UUID id);
+
         IServiceRequest GetNextCompletedRequest();
         void RemoveCompletedRequest(UUID id);
     }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index 47a9cdc..1c59624 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -28,7 +28,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Threading;
+using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Monitoring;
@@ -45,6 +47,8 @@ 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;
 
@@ -225,6 +229,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// <param name="itemID"></param>
         public static void RemoveScript(IScriptEngine engine, uint localID, UUID itemID)
         {
+//            m_log.DebugFormat("[ASYNC COMMAND MANAGER]: Removing facilities for script {0}", itemID);
+
             // Remove a specific script
 
             // Remove dataserver events
@@ -236,7 +242,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // Remove from: HttpRequest
             IHttpRequestModule iHttpReq = engine.World.RequestModuleInterface<IHttpRequestModule>();
             if (iHttpReq != null)
-                iHttpReq.StopHttpRequest(localID, itemID);
+                iHttpReq.StopHttpRequestsForScript(itemID);
 
             IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>();
             if (comms != null)
-- 
cgit v1.1


From f281a994e8544d95961ef669a0fe14c0cba7f175 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 4 Apr 2013 00:49:07 +0100
Subject: refactor: Simplify ScriptsHttpRequests.GetNextCompletedRequest to
 more simply iterate through pending requests without unnecessary checks.

---
 .../Scripting/HttpRequest/ScriptsHttpRequests.cs           | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 1c251b8..ebf56cd 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -293,19 +293,13 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         {
             lock (HttpListLock)
             {
-                foreach (UUID luid in m_pendingRequests.Keys)
+                foreach (HttpRequestClass req in m_pendingRequests.Values)
                 {
-                    HttpRequestClass tmpReq;
-
-                    if (m_pendingRequests.TryGetValue(luid, out tmpReq))
-                    {
-                        if (tmpReq.Finished)
-                        {
-                            return tmpReq;
-                        }
-                    }
+                    if (req.Finished)
+                        return req;
                 }
             }
+
             return null;
         }
 
-- 
cgit v1.1


From f064075a85962039f4737ec9ca631c377a6197c9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 4 Apr 2013 01:06:57 +0100
Subject: Fix XmlRpcAdmin admin_exists_user call so that it actually returns
 the last user login time rather than serializing the DateTime directly which
 generates a set of unexpected fields.

lastlogin return is in unix timestamp format.
---
 OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 5d44b2a..d19b8b6 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1094,7 +1094,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;
 
-- 
cgit v1.1


From d2367968e4227f8a6e37d22ed5904c4f1d87a15e Mon Sep 17 00:00:00 2001
From: teravus
Date: Thu, 4 Apr 2013 19:10:23 -0400
Subject: * In between the fog, a moment of clarity.   This fixes mantis 6570

---
 OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index dfdd566..96a030b 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -453,7 +453,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
             
             OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context);
-            
+            resp.ReuseContext = true;
             HandleRequest(req, resp);
            
 
-- 
cgit v1.1


From 0f008d5f7d4a34d4f7529036f5dd83742423c42f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 6 Apr 2013 01:44:06 +0100
Subject: When rezzing a coalesced object, check adjust position of all
 components.

---
 .../InventoryAccess/InventoryAccessModule.cs       | 47 +++++++++++++---------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index eaf4ce2..ebada5a 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -807,7 +807,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 }
             }
 
-            if (item != null && !DoPreRezWhenFromItem(remoteClient, item, objlist, pos, attachment))
+            if (item != null && !DoPreRezWhenFromItem(remoteClient, item, objlist, pos, veclist, attachment))
                 return null;
 
             for (int i = 0; i < objlist.Count; i++)
@@ -905,10 +905,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;
 
@@ -932,27 +937,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];
+
+                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);
 
-                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));
+                    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;
+                    return false;
+                }
             }
 
             for (int i = 0; i < objlist.Count; i++)
-- 
cgit v1.1


From 7f070236f72058ba22d017048b978adea380f0a1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 6 Apr 2013 02:34:51 +0100
Subject: Fix taking (and rezzing) of coalesced objects in the non-root
 subregions of megaregions.

This fixes the combined bounding box location for regions bigger than 256x256.
It also fixes the position on taking coalesced objects in the non-root regions, where position checks are properly done on rez instead.
It also fixes the megaregion land channel to return null if the land does not exist, which should probably also be done for the ordinary land channels rather than returning a dummy region.
Inspiration from Garmin's commit in http://opensimulator.org/mantis/view.php?id=6595.  Thanks!
---
 .../InventoryAccess/InventoryAccessModule.cs       | 32 ++++-----
 .../World/Permissions/PermissionsModule.cs         |  2 +
 OpenSim/Region/Framework/Scenes/Scene.cs           | 12 ++--
 .../RegionCombinerLargeLandChannel.cs              | 83 ++++++++++++++--------
 4 files changed, 76 insertions(+), 53 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index ebada5a..f796ec9 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -357,19 +357,19 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
             foreach (SceneObjectGroup objectGroup in objlist)
             {
-                Vector3 inventoryStoredPosition = new Vector3
-                            (((objectGroup.AbsolutePosition.X > (int)Constants.RegionSize)
-                                  ? 250
-                                  : objectGroup.AbsolutePosition.X)
-                             ,
-                             (objectGroup.AbsolutePosition.Y > (int)Constants.RegionSize)
-                                 ? 250
-                                 : objectGroup.AbsolutePosition.Y,
-                             objectGroup.AbsolutePosition.Z);
-
-                originalPositions[objectGroup.UUID] = objectGroup.AbsolutePosition;
-
-                objectGroup.AbsolutePosition = inventoryStoredPosition;
+//                Vector3 inventoryStoredPosition = new Vector3
+//                            (((objectGroup.AbsolutePosition.X > (int)Constants.RegionSize)
+//                                  ? 250
+//                                  : objectGroup.AbsolutePosition.X)
+//                             ,
+//                             (objectGroup.AbsolutePosition.Y > (int)Constants.RegionSize)
+//                                 ? 250
+//                                 : objectGroup.AbsolutePosition.Y,
+//                             objectGroup.AbsolutePosition.Z);
+//
+//                originalPositions[objectGroup.UUID] = objectGroup.AbsolutePosition;
+//
+//                objectGroup.AbsolutePosition = inventoryStoredPosition;
 
                 // Make sure all bits but the ones we want are clear
                 // on take.
@@ -397,9 +397,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);
 
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 79dd4a0..77299be 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/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 911a3e4..f50d3cd 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5361,12 +5361,12 @@ namespace OpenSim.Region.Framework.Scenes
            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>();
 
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()
-- 
cgit v1.1


From c7cd077e55c2e889f61bb2e28cd3254b15e07567 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Sun, 7 Apr 2013 17:31:44 -0700
Subject: Optimize the number of Simian calls to get the initial presence
 information for the friends list. This is a pretty big performance
 improvement on login. Note that you must upgrade simian to incorporate the
 corresponding GetSessions call.

---
 .../SimianGrid/SimianPresenceServiceConnector.cs   | 193 +++++++++------------
 1 file changed, 83 insertions(+), 110 deletions(-)

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index 854bea4..7bb06fb 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -137,10 +137,11 @@ 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();
@@ -158,13 +159,13 @@ 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);
             bool success = response["Success"].AsBoolean();
@@ -177,13 +178,13 @@ 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);
             bool success = response["Success"].AsBoolean();
@@ -202,49 +203,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>();
 
-            for (int i = 0; i < userIDs.Length; i++)
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetSessions" },
+                { "UserIDList", String.Join(",",userIDs) }
+            };
+
+            OSDMap sessionListResponse = WebUtil.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 +260,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,11 +268,11 @@ 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);
             bool success = response["Success"].AsBoolean();
@@ -287,14 +285,14 @@ 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);
             bool success = response["Success"].AsBoolean();
@@ -312,23 +310,14 @@ 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);
-
-            NameValueCollection requestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "GetUser" },
-                { "UserID", userID.ToString() }
-            };
-
-            OSDMap userResponse = WebUtil.PostToService(m_serverUrl, requestArgs);
-            if (userResponse["Success"].AsBoolean())
+            OSDMap userResponse = GetUserData(userID);
+            if (userResponse != null)
                 return ResponseToGridUserInfo(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 user data for {0}: {1}",userID,userResponse["Message"].AsString());
             return null;
         }
 
@@ -338,65 +327,49 @@ 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);
             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 = WebUtil.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);
             bool success = response["Success"].AsBoolean();
@@ -407,7 +380,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;
-- 
cgit v1.1


From fe16dc09da3f2736fad5a9e792f5f81098b5f9a1 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 7 Apr 2013 08:27:49 -0700
Subject: BulletSim: complete movement of physical object action code out of
 the physical object and into actors for setForce, setTorque, hover, lock axis
 and avatar move.

---
 .../Physics/BulletSPlugin/BSActorAvatarMove.cs     | 287 +++++++++++++++++++
 .../Region/Physics/BulletSPlugin/BSActorHover.cs   | 176 ++++++++++++
 .../Physics/BulletSPlugin/BSActorLockAxis.cs       |   4 +-
 .../Physics/BulletSPlugin/BSActorMoveToTarget.cs   | 156 +++++++++++
 .../Physics/BulletSPlugin/BSActorSetForce.cs       | 137 +++++++++
 .../Physics/BulletSPlugin/BSActorSetTorque.cs      | 138 +++++++++
 OpenSim/Region/Physics/BulletSPlugin/BSActors.cs   |  12 +-
 .../Region/Physics/BulletSPlugin/BSCharacter.cs    | 268 +++---------------
 .../Region/Physics/BulletSPlugin/BSPhysObject.cs   | 226 ++++++---------
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     | 307 ++++-----------------
 .../Region/Physics/BulletSPlugin/BulletSimTODO.txt |   3 +-
 11 files changed, 1078 insertions(+), 636 deletions(-)
 create mode 100755 OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
 create mode 100755 OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
 create mode 100755 OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
 create mode 100755 OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
 create mode 100755 OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
new file mode 100755
index 0000000..634a898
--- /dev/null
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -0,0 +1,287 @@
+/*
+ * 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;
+
+    public BSActorAvatarMove(BSScene physicsScene, BSPhysObject pObj, string actorName)
+        : base(physicsScene, pObj, actorName)
+    {
+        m_velocityMotor = null;
+        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()
+    {
+        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},BSActorAvatarMove,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},BSActorAvatarMove,refresh,notAvatarMove,removing={1}", m_controllingPrim.LocalID, ActorName);
+            m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
+            return;
+        }
+
+        // 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.RemoveBodyDependencies()
+    public override void RemoveBodyDependencies()
+    {
+        // Nothing to do for the hoverer since it is all software at pre-step action time.
+    }
+
+    public void SetVelocityAndTarget(OMV.Vector3 vel, OMV.Vector3 targ, bool inTaintTime)
+    {
+        m_physicsScene.TaintedObject(inTaintTime, "BSActorAvatarMove.setVelocityAndTarget", delegate()
+        {
+            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
+                                                BSMotor.InfiniteVector,     // friction timescale
+                                                1f                          // efficiency
+            );
+            // _velocityMotor.PhysicsScene = PhysicsScene; // DEBUG DEBUG so motor will output detail log messages.
+
+            m_physicsScene.BeforeStep += Mover;
+        }
+    }
+
+    private void DeactivateAvatarMove()
+    {
+        if (m_velocityMotor != null)
+        {
+            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_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 collising 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 up walking. Set friction to moving friction.
+                m_controllingPrim.Friction = BSParam.AvatarFriction;
+                m_physicsScene.PE.SetFriction(m_controllingPrim.PhysBody, m_controllingPrim.Friction);
+            }
+
+            // If falling, we keep the world's downward vector no matter what the other axis specify.
+            // The check for RawVelocity.Z < 0 makes jumping work (temporary upward force).
+            if (!m_controllingPrim.Flying && !m_controllingPrim.IsColliding)
+            {
+                if (m_controllingPrim.RawVelocity.Z < 0)
+                    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;
+
+            // 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();
+
+            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);
+        }
+    }
+
+    // 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 (m_controllingPrim.IsColliding && !m_controllingPrim.Flying && m_controllingPrim.TargetVelocitySpeed > 0.1f /* && ForwardSpeed < 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;
+            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 m_controllingPrim.CollisionsLastTick.m_objCollisionList)
+            {
+                // Don't care about collisions with the terrain
+                if (kvp.Key > m_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 * 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)
+                        {
+                            // Found the stairs contact point. Push up a little to raise the character.
+                            float upForce = (touchPosition.Z - nearFeetHeightMin) * m_controllingPrim.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);
+                            m_controllingPrim.ForcePosition = m_controllingPrim.RawPosition + displacement;
+                        }
+                        m_physicsScene.DetailLog("{0},BSCharacter.WalkUpStairs,touchPos={1},nearFeetMin={2},faceDir={3},norm={4},diff={5},ret={6}",
+                                m_controllingPrim.LocalID, touchPosition, nearFeetHeightMin, directionFacing, touchNormal, diff, 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..8dd3700
--- /dev/null
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
@@ -0,0 +1,176 @@
+/*
+ * 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 && 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},BSActorHover,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.HoverActive)
+        {
+            m_physicsScene.DetailLog("{0},BSActorHover,refresh,notHovering,removing={1}", m_controllingPrim.LocalID, ActorName);
+            m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
+            return;
+        }
+
+        // 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.RemoveBodyDependencies()
+    public override void RemoveBodyDependencies()
+    {
+        // 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
+                                        BSMotor.Infinite,           // friction timescale
+                                        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
index 7219617..c40a499 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
@@ -40,7 +40,7 @@ public class BSActorLockAxis : BSActor
     BSConstraint LockAxisConstraint = null;
 
     public BSActorLockAxis(BSScene physicsScene, BSPhysObject pObj, string actorName)
-        : base(physicsScene, pObj,actorName)
+        : base(physicsScene, pObj, actorName)
     {
         m_physicsScene.DetailLog("{0},BSActorLockAxis,constructor", m_controllingPrim.LocalID);
         LockAxisConstraint = null;
@@ -99,7 +99,7 @@ public class BSActorLockAxis : BSActor
             // 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(m_controllingPrim.LockedAxisActorName, m_controllingPrim.LocalID, delegate()
+            m_physicsScene.PostTaintObject("BSActorLockAxis:" + ActorName, m_controllingPrim.LocalID, delegate()
             {
                 Refresh();
             });
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
new file mode 100755
index 0000000..3517ef2
--- /dev/null
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.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.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
+    {
+        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", m_controllingPrim.LocalID);
+
+        // If not active any more, get rid of me (shouldn't ever happen, but just to be safe)
+        if (!m_controllingPrim.HoverActive)
+        {
+            m_physicsScene.DetailLog("{0},BSActorMoveToTarget,refresh,notMoveToTarget,removing={1}", m_controllingPrim.LocalID, ActorName);
+            m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
+            return;
+        }
+
+        // If the object is physically active, add the hoverer prestep action
+        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.RemoveBodyDependencies()
+    public override void RemoveBodyDependencies()
+    {
+        // 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 ActivateMoveToTarget()
+    {
+        if (m_targetMotor == null)
+        {
+            // We're taking over after this.
+            m_controllingPrim.ZeroMotion(true);
+
+            m_targetMotor = new BSVMotor("BSPrim.PIDTarget",
+                                        m_controllingPrim.MoveToTargetTau,                    // timeScale
+                                        BSMotor.Infinite,           // decay time scale
+                                        BSMotor.InfiniteVector,     // friction timescale
+                                        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;
+        }
+    }
+
+    private void DeactivateMoveToTarget()
+    {
+        if (m_targetMotor != null)
+        {
+            m_physicsScene.BeforeStep -= Mover;
+            m_targetMotor = null;
+        }
+    }
+
+    // Called just before the simulation step. Update the vertical position for hoverness.
+    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},BSPrim.PIDTarget,zeroMovement,movePos={1},pos={2},mass={3}",
+                                    m_controllingPrim.LocalID, movePosition, m_controllingPrim.RawPosition, m_controllingPrim.Mass);
+            m_controllingPrim.ForcePosition = m_targetMotor.TargetValue;
+            m_targetMotor.Enabled = false;
+        }
+        else
+        {
+            m_controllingPrim.ForcePosition = movePosition;
+        }
+        m_physicsScene.DetailLog("{0},BSPrim.PIDTarget,move,fromPos={1},movePos={2}", m_controllingPrim.LocalID, origPosition, movePosition);
+    }
+}
+}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
new file mode 100755
index 0000000..d942490
--- /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);
+            m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
+            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.RemoveBodyDependencies()
+    public override void RemoveBodyDependencies()
+    {
+        // 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, 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..e0f719f
--- /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", m_controllingPrim.LocalID);
+
+        // 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,removing={1}", m_controllingPrim.LocalID, ActorName);
+            m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
+            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.RemoveBodyDependencies()
+    public override void RemoveBodyDependencies()
+    {
+        // 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, 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
index 5a19ba4..fb4d452 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
@@ -32,12 +32,12 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 {
 public class BSActorCollection
 {
-    private BSScene PhysicsScene { get; set; }
+    private BSScene m_physicsScene { get; set; }
     private Dictionary<string, BSActor> m_actors;
 
     public BSActorCollection(BSScene physicsScene)
     {
-        PhysicsScene = physicsScene;
+        m_physicsScene = physicsScene;
         m_actors = new Dictionary<string, BSActor>();
     }
     public void Add(string name, BSActor actor)
@@ -61,6 +61,10 @@ public class BSActorCollection
         Release();
         m_actors.Clear();
     }
+    public void Dispose()
+    {
+        Clear();
+    }
     public bool HasActor(string name)
     {
         return m_actors.ContainsKey(name);
@@ -71,6 +75,10 @@ public class BSActorCollection
             act(kvp.Value);
     }
 
+    public void Enable(bool enabl)
+    {
+        ForEachActor(a => a.Enable(enabl));
+    }
     public void Release()
     {
         ForEachActor(a => a.Dispose());
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 25be416..09c9b16 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -46,9 +46,6 @@ public sealed class BSCharacter : BSPhysObject
     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;
@@ -61,17 +58,13 @@ public sealed class BSCharacter : BSPhysObject
     private OMV.Vector3 _rotationalVelocity;
     private bool _kinematic;
     private float _buoyancy;
-    private bool _isStationaryStanding; // true is standing on a stationary object
 
-    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")
@@ -81,11 +74,10 @@ public sealed class BSCharacter : BSPhysObject
 
         _flying = isFlying;
         _orientation = OMV.Quaternion.Identity;
-        _velocity = OMV.Vector3.Zero;
+        RawVelocity = OMV.Vector3.Zero;
         _buoyancy = ComputeBuoyancyFromFlying(isFlying);
         Friction = BSParam.AvatarStandingFriction;
         Density = BSParam.AvatarDensity / BSParam.DensityScaleFactor;
-        _isStationaryStanding = false;
 
         // Old versions of ScenePresence passed only the height. If width and/or depth are zero,
         //     replace with the default values.
@@ -99,7 +91,12 @@ public sealed class BSCharacter : BSPhysObject
         // set _avatarVolume and _mass based on capsule size, _density and Scale
         ComputeAvatarVolumeAndMass();
 
-        SetupMovementMotor();
+        // 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(PhysicsScene, this, AvatarMoveActorName);
+        PhysicalActors.Add(AvatarMoveActorName, m_moveActor);
 
         DetailLog("{0},BSCharacter.create,call,size={1},scale={2},density={3},volume={4},mass={5}",
                             LocalID, _size, Scale, Density, _avatarVolume, RawMass);
@@ -139,10 +136,10 @@ public sealed class BSCharacter : BSPhysObject
         ForcePosition = _position;
 
         // 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.
@@ -176,162 +173,6 @@ public sealed class BSCharacter : BSPhysObject
         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);
-            _isStationaryStanding = false;
-
-            // 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);
-                        _isStationaryStanding = true;
-                        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);
-            }
-        });
-    }
-
-    // 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()
     {
@@ -403,7 +244,7 @@ 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;
 
@@ -542,15 +383,15 @@ public sealed class BSCharacter : BSPhysObject
     }
 
     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()
             {
-                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);
+                    PhysicsScene.PE.SetObjectForce(PhysBody, RawForce);
             });
         }
     }
@@ -573,7 +414,7 @@ public sealed class BSCharacter : BSPhysObject
     {
         get
         {
-            return m_targetVelocity;
+            return base.m_targetVelocity;
         }
         set
         {
@@ -583,51 +424,39 @@ public sealed class BSCharacter : BSPhysObject
             if (_setAlwaysRun)
                 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);
+            RawVelocity = value;
+            // m_log.DebugFormat("{0}: set velocity = {1}", LogHeader, RawVelocity);
             PhysicsScene.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");
 
-            _velocity = value;
-            PhysicsScene.PE.SetLinearVelocity(PhysBody, _velocity);
+            RawVelocity = value;
+            PhysicsScene.PE.SetLinearVelocity(PhysBody, RawVelocity);
             PhysicsScene.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 {
@@ -783,27 +612,6 @@ 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.
@@ -833,7 +641,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) {
     }
@@ -887,7 +695,7 @@ public sealed class BSCharacter : BSPhysObject
     public override void UpdateProperties(EntityProperties entprop)
     {
         // Don't change position if standing on a stationary object.
-        if (!_isStationaryStanding)
+        if (!IsStationary)
             _position = entprop.Position;
 
         _orientation = entprop.Rotation;
@@ -896,8 +704,8 @@ public sealed class BSCharacter : BSPhysObject
         //    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;
@@ -920,7 +728,7 @@ public sealed class BSCharacter : BSPhysObject
         // base.RequestPhysicsterseUpdate();
 
         DetailLog("{0},BSCharacter.UpdateProperties,call,pos={1},orient={2},vel={3},accel={4},rotVel={5}",
-                LocalID, _position, _orientation, _velocity, _acceleration, _rotationalVelocity);
+                LocalID, _position, _orientation, RawVelocity, _acceleration, _rotationalVelocity);
     }
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 98ea833..644bc7e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
  *      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.
  */
 
 /*
@@ -84,6 +84,7 @@ public abstract class BSPhysObject : PhysicsActor
         // 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);
@@ -110,11 +111,10 @@ public abstract class BSPhysObject : PhysicsActor
     // Tell the object to clean up.
     public virtual void Destroy()
     {
-        UnRegisterAllPreStepActions();
-        UnRegisterAllPostStepActions();
+        PhysicalActors.Enable(false);
         PhysicsScene.TaintedObject("BSPhysObject.Destroy", delegate()
         {
-            PhysicalActors.Release();
+            PhysicalActors.Dispose();
         });
     }
 
@@ -203,15 +203,48 @@ public abstract class BSPhysObject : PhysicsActor
     public abstract 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 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
     {
@@ -237,7 +270,44 @@ public abstract class BSPhysObject : PhysicsActor
 
     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
-    public readonly String LockedAxisActorName = "BSPrim.LockedAxis";
+
+    // 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)
+            PhysicsScene.PE.Activate(PhysBody, forceIt);
+    }
+
+    // 'actors' act on the physical object to change or constrain its motion. These can range from
+    //       hovering to complex vehicle motion.
+    public delegate BSActor CreateActor();
+    public void CreateRemoveActor(bool createRemove, string actorName, bool inTaintTime, CreateActor creator)
+    {
+        if (createRemove)
+        {
+            PhysicsScene.TaintedObject(inTaintTime, "BSPrim.CreateRemoveActor:" + actorName, delegate()
+            {
+                if (!PhysicalActors.HasActor(actorName))
+                {
+                    DetailLog("{0},BSPrim.CreateRemoveActor,taint,registerActor,a={1}", LocalID, actorName);
+                    PhysicalActors.Add(actorName, creator());
+                }
+            });
+        }
+        else
+        {
+            PhysicsScene.TaintedObject(inTaintTime, "BSPrim.CreateRemoveActor:" + actorName, delegate()
+            {
+                if (PhysicalActors.HasActor(actorName))
+                {
+                    DetailLog("{0},BSPrim.CreateRemoveActor,taint,unregisterActor,a={1}", LocalID, actorName);
+                    PhysicalActors.RemoveAndRelease(actorName);
+                }
+            });
+        }
+    }
 
     #region Collisions
 
@@ -255,7 +325,9 @@ 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;
+    // Used by BSCharacter to manage standing (and not slipping)
+    public bool IsStationary;
 
     // Count of collisions for this object
     protected long CollisionAccumulation { get; set; }
@@ -293,7 +365,7 @@ public abstract class BSPhysObject : PhysicsActor
     protected CollisionEventUpdate CollisionCollection;
     // Remember collisions from last tick for fancy collision based actions
     //     (like a BSCharacter walking up stairs).
-    protected CollisionEventUpdate CollisionsLastTick;
+    public CollisionEventUpdate CollisionsLastTick;
 
     // The simulation step is telling this object about a collision.
     // Return 'true' if a collision was processed and should be sent up.
@@ -424,104 +496,6 @@ public abstract class BSPhysObject : PhysicsActor
 
     public BSActorCollection PhysicalActors;
 
-    // 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);
-    }
-
     // 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
     public delegate void PreUpdatePropertyAction(ref EntityProperties entprop);
@@ -533,46 +507,6 @@ 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.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index e56276a..71fea59 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -55,9 +55,6 @@ public class BSPrim : BSPhysObject
     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;
@@ -73,16 +70,13 @@ public class BSPrim : BSPhysObject
     private int CrossingFailures { get; set; }
 
     public BSDynamics VehicleActor;
-    public string VehicleActorName = "BasicVehicle";
+    public const string VehicleActorName = "BasicVehicle";
 
-    private BSVMotor _targetMotor;
-    private OMV.Vector3 _PIDTarget;
-    private float _PIDTau;
-
-    private BSFMotor _hoverMotor;
-    private float _PIDHoverHeight;
-    private PIDHoverType _PIDHoverType;
-    private float _PIDHoverTau;
+    public const string HoverActorName = "HoverActor";
+    public const String LockedAxisActorName = "BSPrim.LockedAxis";
+    public const string MoveToTargetActorName = "MoveToTargetActor";
+    public const string SetForceActorName = "SetForceActor";
+    public const string SetTorqueActorName = "SetTorqueActor";
 
     public BSPrim(uint localID, String primName, BSScene parent_scene, OMV.Vector3 pos, OMV.Vector3 size,
                        OMV.Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical)
@@ -95,7 +89,7 @@ public class BSPrim : BSPhysObject
         Scale = size;   // prims are the size the user wants them to be (different for BSCharactes).
         _orientation = rotation;
         _buoyancy = 0f;
-        _velocity = OMV.Vector3.Zero;
+        RawVelocity = OMV.Vector3.Zero;
         _rotationalVelocity = OMV.Vector3.Zero;
         BaseShape = pbs;
         _isPhysical = pisPhysical;
@@ -233,7 +227,7 @@ 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;
 
@@ -270,19 +264,17 @@ public class BSPrim : BSPhysObject
         if (axis.Z != 1) locking.Z = 0f;
         LockedAxis = locking;
 
-        if (LockedAxis != LockedAxisFree)
+        CreateRemoveActor(LockedAxis != LockedAxisFree /* creatActor */, LockedAxisActorName, false /* inTaintTime */, delegate()
         {
-            PhysicsScene.TaintedObject("BSPrim.LockAngularMotion", delegate()
-            {
-                // If there is not already an axis locker, make one
-                if (!PhysicalActors.HasActor(LockedAxisActorName))
-                {
-                    DetailLog("{0},BSPrim.LockAngularMotion,taint,registeringLockAxisActor", LocalID);
-                    PhysicalActors.Add(LockedAxisActorName, new BSActorLockAxis(PhysicsScene, this, LockedAxisActorName));
-                }
-                UpdatePhysicalParameters();
-            });
-        }
+            return new BSActorLockAxis(PhysicsScene, this, LockedAxisActorName);
+        });
+
+        // Update parameters so the new actor's Refresh() action is called at the right time.
+        PhysicsScene.TaintedObject("BSPrim.LockAngularMotion", delegate()
+        {
+            UpdatePhysicalParameters();
+        });
+
         return;
     }
 
@@ -407,9 +399,9 @@ public class BSPrim : BSPhysObject
             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)
@@ -506,35 +498,13 @@ public class BSPrim : BSPhysObject
     }
 
     public override OMV.Vector3 Force {
-        get { return _force; }
+        get { return RawForce; }
         set {
-            _force = value;
-            if (_force != OMV.Vector3.Zero)
-            {
-                // 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;
-                        }
-
-                        DetailLog("{0},BSPrim.setForce,preStep,force={1}", LocalID, _force);
-                        if (PhysBody.HasPhysicalBody)
-                        {
-                            PhysicsScene.PE.ApplyCentralForce(PhysBody, _force);
-                            ActivateIfPhysical(false);
-                        }
-                    }
-                );
-            }
-            else
+            RawForce = value;
+            CreateRemoveActor(RawForce == OMV.Vector3.Zero, SetForceActorName, false /* inTaintTime */, delegate()
             {
-                UnRegisterPreStepAction("BSPrim.setForce", LocalID);
-            }
+                return new BSActorSetForce(PhysicsScene, this, SetForceActorName);
+            });
         }
     }
 
@@ -670,62 +640,39 @@ public class BSPrim : BSPhysObject
             }
         }
     }
-    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;
+            RawVelocity = value;
             PhysicsScene.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");
 
-            _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);
+                PhysicsScene.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)
+            RawTorque = value;
+            CreateRemoveActor(RawTorque == OMV.Vector3.Zero, SetTorqueActorName, false /* inTaintTime */, delegate()
             {
-                // 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
-            {
-                UnRegisterPreStepAction("BSPrim.setTorque", LocalID);
-            }
+                return new BSActorSetTorque(PhysicsScene, this, SetTorqueActorName);
+            });
             // DetailLog("{0},BSPrim.SetTorque,call,torque={1}", LocalID, _torque);
         }
     }
@@ -909,7 +856,7 @@ public class BSPrim : BSPhysObject
 
             // For good measure, make sure the transform is set through to the motion state
             ForcePosition = _position;
-            ForceVelocity = _velocity;
+            ForceVelocity = RawVelocity;
             ForceRotationalVelocity = _rotationalVelocity;
 
             // A dynamic object has mass
@@ -966,15 +913,6 @@ public class BSPrim : BSPhysObject
         }
     }
 
-    // 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)
     {
@@ -1096,78 +1034,13 @@ 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)
-            {
-                // 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);
-
-                    // 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
+            base.MoveToTargetActive = value;
+            CreateRemoveActor(MoveToTargetActive, MoveToTargetActorName, false /* inTaintTime */, delegate()
             {
-                // Stop any targetting
-                UnRegisterPreStepAction("BSPrim.PIDTarget", LocalID);
-            }
+                return new BSActorMoveToTarget(PhysicsScene, this, MoveToTargetActorName);
+            });
         }
     }
 
@@ -1175,88 +1048,14 @@ public class BSPrim : BSPhysObject
     // Hover Height will override MoveTo target's Z
     public override bool PIDHoverActive {
         set {
-            if (value)
-            {
-                // 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
+            base.HoverActive = value;
+            CreateRemoveActor(HoverActive /* creatActor */, HoverActorName, false /* inTaintTime */, delegate()
             {
-                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(PhysicsScene, 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);
@@ -1324,10 +1123,8 @@ 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())
         {
@@ -1694,8 +1491,8 @@ public class BSPrim : BSPhysObject
         _orientation = 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;
 
@@ -1705,7 +1502,7 @@ public class BSPrim : BSPhysObject
         if (PositionSanityCheck(true /* inTaintTime */ ))
         {
             entprop.Position = _position;
-            entprop.Velocity = _velocity;
+            entprop.Velocity = RawVelocity;
             entprop.RotationalVelocity = _rotationalVelocity;
             entprop.Acceleration = _acceleration;
         }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
index 8a15abe..a0131c7 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
@@ -6,7 +6,6 @@ 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
 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.
@@ -344,3 +343,5 @@ 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)
+
-- 
cgit v1.1


From a7a1b8b7e9269b446e3396a35153b00942c1e35b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 7 Apr 2013 14:05:35 -0700
Subject: BulletSim: clean up actor code so routines use the same coding
 pattern. Fix a few enabling problems.

---
 .../Physics/BulletSPlugin/BSActorAvatarMove.cs     |  22 ++---
 .../Region/Physics/BulletSPlugin/BSActorHover.cs   |   6 +-
 .../Physics/BulletSPlugin/BSActorLockAxis.cs       | 105 ++++++++++-----------
 .../Physics/BulletSPlugin/BSActorMoveToTarget.cs   |  12 +--
 .../Physics/BulletSPlugin/BSActorSetForce.cs       |   2 +-
 .../Physics/BulletSPlugin/BSActorSetTorque.cs      |   4 +-
 OpenSim/Region/Physics/BulletSPlugin/BSActors.cs   |  49 +++++++---
 .../Region/Physics/BulletSPlugin/BSCharacter.cs    |   3 +
 .../Region/Physics/BulletSPlugin/BSPhysObject.cs   |  35 +++----
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     |  22 ++---
 10 files changed, 137 insertions(+), 123 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
index 634a898..8416740 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -67,14 +67,6 @@ public class BSActorAvatarMove : BSActor
     {
         m_physicsScene.DetailLog("{0},BSActorAvatarMove,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},BSActorAvatarMove,refresh,notAvatarMove,removing={1}", m_controllingPrim.LocalID, ActorName);
-            m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
-            return;
-        }
-
         // If the object is physically active, add the hoverer prestep action
         if (isActive)
         {
@@ -95,14 +87,19 @@ public class BSActorAvatarMove : BSActor
         // 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()
         {
-            m_velocityMotor.Reset();
-            m_velocityMotor.SetTarget(targ);
-            m_velocityMotor.SetCurrent(vel);
-            m_velocityMotor.Enabled = true;
+            if (m_velocityMotor != null)
+            {
+                m_velocityMotor.Reset();
+                m_velocityMotor.SetTarget(targ);
+                m_velocityMotor.SetCurrent(vel);
+                m_velocityMotor.Enabled = true;
+            }
         });
     }
 
@@ -119,6 +116,7 @@ public class BSActorAvatarMove : BSActor
                                                 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;
         }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
index 8dd3700..e8310df 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
@@ -67,12 +67,10 @@ public class BSActorHover : BSActor
     {
         m_physicsScene.DetailLog("{0},BSActorHover,refresh", m_controllingPrim.LocalID);
 
-        // If not active any more, get rid of me (shouldn't ever happen, but just to be safe)
+        // If not active any more, turn me off
         if (!m_controllingPrim.HoverActive)
         {
-            m_physicsScene.DetailLog("{0},BSActorHover,refresh,notHovering,removing={1}", m_controllingPrim.LocalID, ActorName);
-            m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
-            return;
+            SetEnabled(false);
         }
 
         // If the object is physically active, add the hoverer prestep action
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
index c40a499..09ee32b 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
@@ -36,7 +36,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 {
 public class BSActorLockAxis : BSActor
 {
-    bool TryExperimentalLockAxisCode = true;
     BSConstraint LockAxisConstraint = null;
 
     public BSActorLockAxis(BSScene physicsScene, BSPhysObject pObj, string actorName)
@@ -69,18 +68,13 @@ public class BSActorLockAxis : BSActor
         // If all the axis are free, we don't need to exist
         if (m_controllingPrim.LockedAxis == m_controllingPrim.LockedAxisFree)
         {
-            m_physicsScene.DetailLog("{0},BSActorLockAxis,refresh,allAxisFree,removing={1}", m_controllingPrim.LocalID, ActorName);
-            m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
-            return;
+            Enabled = false;
         }
+
         // If the object is physically active, add the axis locking constraint
-        if (Enabled
-                && m_controllingPrim.IsPhysicallyActive
-                && TryExperimentalLockAxisCode
-                && m_controllingPrim.LockedAxis != m_controllingPrim.LockedAxisFree)
+        if (isActive)
         {
-            if (LockAxisConstraint == null)
-                AddAxisLockConstraint();
+            AddAxisLockConstraint();
         }
         else
         {
@@ -108,58 +102,61 @@ public class BSActorLockAxis : BSActor
 
     private void AddAxisLockConstraint()
     {
-        // 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
+        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();
+            // 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);
+            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.
+            // 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;
-        axisConstrainer.SetLinearLimits(linearLow, linearHigh);
+            // Free to move linearly in the region
+            OMV.Vector3 linearLow = OMV.Vector3.Zero;
+            OMV.Vector3 linearHigh = m_physicsScene.TerrainManager.DefaultRegionSize;
+            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.LockedAxis.X != 1f)
-        {
-            angularLow.X = 0f;
-            angularHigh.X = 0f;
-        }
-        if (m_controllingPrim.LockedAxis.Y != 1f)
-        {
-            angularLow.Y = 0f;
-            angularHigh.Y = 0f;
-        }
-        if (m_controllingPrim.LockedAxis.Z != 1f)
-        {
-            angularLow.Z = 0f;
-            angularHigh.Z = 0f;
-        }
-        if (!axisConstrainer.SetAngularLimits(angularLow, angularHigh))
-        {
-            m_physicsScene.DetailLog("{0},BSActorLockAxis.AddAxisLockConstraint,failedSetAngularLimits", m_controllingPrim.LocalID);
-        }
+            // 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.LockedAxis.X != 1f)
+            {
+                angularLow.X = 0f;
+                angularHigh.X = 0f;
+            }
+            if (m_controllingPrim.LockedAxis.Y != 1f)
+            {
+                angularLow.Y = 0f;
+                angularHigh.Y = 0f;
+            }
+            if (m_controllingPrim.LockedAxis.Z != 1f)
+            {
+                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);
+            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);
+            // 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);
+            axisConstrainer.RecomputeConstraintVariables(m_controllingPrim.RawMass);
+        }
     }
 
     private void RemoveAxisLockConstraint()
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
index 3517ef2..16c2b14 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
@@ -67,15 +67,12 @@ public class BSActorMoveToTarget : BSActor
     {
         m_physicsScene.DetailLog("{0},BSActorMoveToTarget,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.HoverActive)
+        // If not active any more...
+        if (!m_controllingPrim.MoveToTargetActive)
         {
-            m_physicsScene.DetailLog("{0},BSActorMoveToTarget,refresh,notMoveToTarget,removing={1}", m_controllingPrim.LocalID, ActorName);
-            m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
-            return;
+            Enabled = false;
         }
 
-        // If the object is physically active, add the hoverer prestep action
         if (isActive)
         {
             ActivateMoveToTarget();
@@ -92,7 +89,7 @@ public class BSActorMoveToTarget : BSActor
     // BSActor.RemoveBodyDependencies()
     public override void RemoveBodyDependencies()
     {
-        // Nothing to do for the hoverer since it is all software at pre-step action time.
+        // 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.
@@ -144,7 +141,6 @@ public class BSActorMoveToTarget : BSActor
             m_physicsScene.DetailLog("{0},BSPrim.PIDTarget,zeroMovement,movePos={1},pos={2},mass={3}",
                                     m_controllingPrim.LocalID, movePosition, m_controllingPrim.RawPosition, m_controllingPrim.Mass);
             m_controllingPrim.ForcePosition = m_targetMotor.TargetValue;
-            m_targetMotor.Enabled = false;
         }
         else
         {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
index d942490..3ad138d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
@@ -71,7 +71,7 @@ public class BSActorSetForce : BSActor
         if (m_controllingPrim.RawForce == OMV.Vector3.Zero)
         {
             m_physicsScene.DetailLog("{0},BSActorSetForce,refresh,notSetForce,removing={1}", m_controllingPrim.LocalID, ActorName);
-            m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
+            Enabled = false;
             return;
         }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
index e0f719f..159a3a8 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
@@ -70,8 +70,8 @@ public class BSActorSetTorque : BSActor
         // 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,removing={1}", m_controllingPrim.LocalID, ActorName);
-            m_controllingPrim.PhysicalActors.RemoveAndRelease(ActorName);
+            m_physicsScene.DetailLog("{0},BSActorSetTorque,refresh,notSetTorque,disabling={1}", m_controllingPrim.LocalID, ActorName);
+            Enabled = false;
             return;
         }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
index fb4d452..12a8817 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
@@ -42,24 +42,36 @@ public class BSActorCollection
     }
     public void Add(string name, BSActor actor)
     {
-        m_actors[name] = actor;
+        lock (m_actors)
+        {
+            if (!m_actors.ContainsKey(name))
+            {
+                m_actors[name] = actor;
+            }
+        }
     }
     public bool RemoveAndRelease(string name)
     {
         bool ret = false;
-        if (m_actors.ContainsKey(name))
+        lock (m_actors)
         {
-            BSActor beingRemoved = m_actors[name];
-            beingRemoved.Dispose();
-            m_actors.Remove(name);
-            ret = true;
+            if (m_actors.ContainsKey(name))
+            {
+                BSActor beingRemoved = m_actors[name];
+                m_actors.Remove(name);
+                beingRemoved.Dispose();
+                ret = true;
+            }
         }
         return ret;
     }
     public void Clear()
     {
-        Release();
-        m_actors.Clear();
+        lock (m_actors)
+        {
+            Release();
+            m_actors.Clear();
+        }
     }
     public void Dispose()
     {
@@ -69,15 +81,22 @@ public class BSActorCollection
     {
         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)
     {
-        foreach (KeyValuePair<string, BSActor> kvp in m_actors)
-            act(kvp.Value);
+        lock (m_actors)
+        {
+            foreach (KeyValuePair<string, BSActor> kvp in m_actors)
+                act(kvp.Value);
+        }
     }
 
     public void Enable(bool enabl)
     {
-        ForEachActor(a => a.Enable(enabl));
+        ForEachActor(a => a.SetEnabled(enabl));
     }
     public void Release()
     {
@@ -106,7 +125,7 @@ public abstract class BSActor
 {
     protected BSScene m_physicsScene { get; private set; }
     protected BSPhysObject m_controllingPrim { get; private set; }
-    protected bool Enabled { get; set; }
+    public virtual bool Enabled { get; set; }
     public string ActorName { get; private set; }
 
     public BSActor(BSScene physicsScene, BSPhysObject pObj, string actorName)
@@ -122,8 +141,10 @@ public abstract class BSActor
     {
         get { return Enabled; }
     }
-    // Turn the actor on an off.
-    public virtual void Enable(bool setEnabled)
+
+    // 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;
     }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 09c9b16..a0d58d3 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -160,6 +160,9 @@ public sealed class BSCharacter : BSPhysObject
         // Make so capsule does not fall over
         PhysicsScene.PE.SetAngularFactorV(PhysBody, OMV.Vector3.Zero);
 
+        // The avatar mover sets some parameters.
+        PhysicalActors.Refresh();
+
         PhysicsScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.CF_CHARACTER_OBJECT);
 
         PhysicsScene.PE.AddObjectToWorld(PhysicsScene.World, PhysBody);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 644bc7e..64bf395 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -282,30 +282,31 @@ public abstract class BSPhysObject : PhysicsActor
 
     // '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 CreateRemoveActor(bool createRemove, string actorName, bool inTaintTime, CreateActor creator)
+    public void EnableActor(bool enableActor, string actorName, CreateActor creator)
     {
-        if (createRemove)
+        lock (PhysicalActors)
         {
-            PhysicsScene.TaintedObject(inTaintTime, "BSPrim.CreateRemoveActor:" + actorName, delegate()
+            BSActor theActor;
+            if (PhysicalActors.TryGetActor(actorName, out theActor))
             {
-                if (!PhysicalActors.HasActor(actorName))
-                {
-                    DetailLog("{0},BSPrim.CreateRemoveActor,taint,registerActor,a={1}", LocalID, actorName);
-                    PhysicalActors.Add(actorName, creator());
-                }
-            });
-        }
-        else
-        {
-            PhysicsScene.TaintedObject(inTaintTime, "BSPrim.CreateRemoveActor:" + actorName, delegate()
+                // The actor already exists so just turn it on or off
+                theActor.Enabled = enableActor;
+            }
+            else
             {
-                if (PhysicalActors.HasActor(actorName))
+                // The actor does not exist. If it should, create it.
+                if (enableActor)
                 {
-                    DetailLog("{0},BSPrim.CreateRemoveActor,taint,unregisterActor,a={1}", LocalID, actorName);
-                    PhysicalActors.RemoveAndRelease(actorName);
+                    theActor = creator();
+                    PhysicalActors.Add(actorName, theActor);
+                    theActor.Enabled = true;
                 }
-            });
+            }
         }
     }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 71fea59..16c7a90 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -95,6 +95,7 @@ public class BSPrim : BSPhysObject
         _isPhysical = pisPhysical;
         _isVolumeDetect = false;
 
+        // We keep a handle to the vehicle actor so we can set vehicle parameters later.
         VehicleActor = new BSDynamics(PhysicsScene, this, VehicleActorName);
         PhysicalActors.Add(VehicleActorName, VehicleActor);
 
@@ -264,7 +265,7 @@ public class BSPrim : BSPhysObject
         if (axis.Z != 1) locking.Z = 0f;
         LockedAxis = locking;
 
-        CreateRemoveActor(LockedAxis != LockedAxisFree /* creatActor */, LockedAxisActorName, false /* inTaintTime */, delegate()
+        EnableActor(LockedAxis != LockedAxisFree, LockedAxisActorName, delegate()
         {
             return new BSActorLockAxis(PhysicsScene, this, LockedAxisActorName);
         });
@@ -501,7 +502,7 @@ public class BSPrim : BSPhysObject
         get { return RawForce; }
         set {
             RawForce = value;
-            CreateRemoveActor(RawForce == OMV.Vector3.Zero, SetForceActorName, false /* inTaintTime */, delegate()
+            EnableActor(RawForce != OMV.Vector3.Zero, SetForceActorName, delegate()
             {
                 return new BSActorSetForce(PhysicsScene, this, SetForceActorName);
             });
@@ -510,14 +511,13 @@ public class BSPrim : BSPhysObject
 
     public override int VehicleType {
         get {
-            return (int)VehicleActor.Type;   // if we are a vehicle, return that type
+            return (int)VehicleActor.Type;
         }
         set {
             Vehicle type = (Vehicle)value;
 
             PhysicsScene.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.
                 VehicleActor.ProcessTypeChange(type);
                 ActivateIfPhysical(false);
@@ -669,11 +669,11 @@ public class BSPrim : BSPhysObject
         get { return RawTorque; }
         set {
             RawTorque = value;
-            CreateRemoveActor(RawTorque == OMV.Vector3.Zero, SetTorqueActorName, false /* inTaintTime */, delegate()
+            EnableActor(RawTorque != OMV.Vector3.Zero, SetTorqueActorName, delegate()
             {
                 return new BSActorSetTorque(PhysicsScene, this, SetTorqueActorName);
             });
-            // DetailLog("{0},BSPrim.SetTorque,call,torque={1}", LocalID, _torque);
+            DetailLog("{0},BSPrim.SetTorque,call,torque={1}", LocalID, RawTorque);
         }
     }
     public override OMV.Vector3 Acceleration {
@@ -786,7 +786,6 @@ public class BSPrim : BSPhysObject
         MakeDynamic(IsStatic);
 
         // Update vehicle specific parameters (after MakeDynamic() so can change physical parameters)
-        VehicleActor.Refresh();
         PhysicalActors.Refresh();
 
         // Arrange for collision events if the simulator wants them
@@ -1037,7 +1036,7 @@ public class BSPrim : BSPhysObject
     public override bool PIDActive {
         set {
             base.MoveToTargetActive = value;
-            CreateRemoveActor(MoveToTargetActive, MoveToTargetActorName, false /* inTaintTime */, delegate()
+            EnableActor(MoveToTargetActive, MoveToTargetActorName, delegate()
             {
                 return new BSActorMoveToTarget(PhysicsScene, this, MoveToTargetActorName);
             });
@@ -1049,7 +1048,7 @@ public class BSPrim : BSPhysObject
     public override bool PIDHoverActive {
         set {
             base.HoverActive = value;
-            CreateRemoveActor(HoverActive /* creatActor */, HoverActorName, false /* inTaintTime */, delegate()
+            EnableActor(HoverActive, HoverActorName, delegate()
             {
                 return new BSActorHover(PhysicsScene, this, HoverActorName);
             });
@@ -1458,7 +1457,7 @@ 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.
+        // Ignore 'forceRebuild'. 'GetBodyAndShape' makes the right choices and changes of necessary.
         PhysicsScene.Shapes.GetBodyAndShape(false /*forceRebuild */, PhysicsScene.World, this, null, delegate(BulletBody dBody)
         {
             // Called if the current prim body is about to be destroyed.
@@ -1472,9 +1471,9 @@ public class BSPrim : BSPhysObject
         return;
     }
 
+    // Called at taint-time
     protected virtual void RemoveBodyDependencies()
     {
-        VehicleActor.RemoveBodyDependencies();
         PhysicalActors.RemoveBodyDependencies();
     }
 
@@ -1482,6 +1481,7 @@ public class BSPrim : BSPhysObject
     // the world that things have changed.
     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);
 
         // DetailLog("{0},BSPrim.UpdateProperties,entry,entprop={1}", LocalID, entprop);   // DEBUG DEBUG
-- 
cgit v1.1


From 99f39836a1879a807bb7d6bf5bf793c3a99584c4 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 8 Apr 2013 06:27:01 -0700
Subject: BulletSim: moving comments around. No functional change.

---
 OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs |  2 +-
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs           | 10 +---------
 OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs   |  9 +++++++++
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
index 159a3a8..7a791ec 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
@@ -65,7 +65,7 @@ public class BSActorSetTorque : BSActor
     // BSActor.Refresh()
     public override void Refresh()
     {
-        m_physicsScene.DetailLog("{0},BSActorSetTorque,refresh", m_controllingPrim.LocalID);
+        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)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 16c7a90..3423d2e 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -1514,16 +1514,8 @@ public class BSPrim : BSPhysObject
         LastEntityProperties = CurrentEntityProperties;
         CurrentEntityProperties = entprop;
 
+        // Note that BSPrim can be overloaded by BSPrimLinkable which controls updates from root and children prims.
         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);
-        }
-             */
     }
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index d65d407..28242d4 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -163,6 +163,15 @@ 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);
     }
-- 
cgit v1.1


From f68b963596e7df2c28761af4584b4dcb17d550eb Mon Sep 17 00:00:00 2001
From: Jon Cundill
Date: Sun, 7 Apr 2013 12:31:49 +0100
Subject: fixed bullet config for osx

Signed-off-by: Robert Adams <Robert.Adams@intel.com>
---
 bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config | 2 ++
 1 file changed, 2 insertions(+)

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>
-- 
cgit v1.1


From 4d2203ff5298ffe40902ce018c1be1b4096c936d Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 8 Apr 2013 09:15:20 -0700
Subject: BulletSim: Add dylib for BulletSim and add he who figured out
 building BulletSim on a Mac to the CONTRIBUTORS file.

---
 CONTRIBUTORS.txt             |   1 +
 bin/lib32/libBulletSim.dylib | Bin 0 -> 1181656 bytes
 2 files changed, 1 insertion(+)
 create mode 100755 bin/lib32/libBulletSim.dylib

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 8ff55df..36b17be 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -101,6 +101,7 @@ what it is today.
 * jhurliman
 * John R Sohn (XenReborn)
 * jonc
+* Jon Cundill
 * Junta Kohime
 * Kayne
 * Kevin Cozens
diff --git a/bin/lib32/libBulletSim.dylib b/bin/lib32/libBulletSim.dylib
new file mode 100755
index 0000000..02f8a7f
Binary files /dev/null and b/bin/lib32/libBulletSim.dylib differ
-- 
cgit v1.1


From 8e04c752fc2bc1f27fce224d2aec3ea72edbc2cc Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 9 Apr 2013 22:38:47 +0100
Subject: If OpenSimulator is writing a PID file and finds the file already
 present on startup, logging an error since this is commonly due to an unclean
 shutdown.

Unclean shutdown can cause constantly moving objects to disappear if an OAR has just been loaded and they have not reached persistence time threshold, among other problems.
---
 OpenSim/Framework/Servers/ServerBase.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 657444c..2c4a687 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -76,6 +76,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();
-- 
cgit v1.1


From 8690a08881d41c285dd830b4b1646eb116ad098d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 9 Apr 2013 23:02:11 +0100
Subject: minor: Log an exception if we aren't able to delete a script state
 file rather than simply ignoring it.

This should never normally happen but if it does then it can be valuable diagonstic information.
---
 OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index bf19a42..1e6db43 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -520,8 +520,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  ", 
+                        ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name), 
+                    e);
             }
         }
 
-- 
cgit v1.1


From 659c741ff5a3d13b4462d3ce906c6785bb296322 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 9 Apr 2013 23:15:01 +0100
Subject: Add more notes to async_call_method relating to 
 UnsafeQueueUserWorkItem

UnsafeQueueUserWorkItem is so called because it allows the calling code to escalate its security privileges.
However, since we must already trust this code anyway in OpenSimulator this is not an issue.
---
 bin/OpenSimDefaults.ini | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 1d2c0cf..28c1db2 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
-- 
cgit v1.1


From 06068444e2486cb761d266c6831c54fc27d7d5c2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 9 Apr 2013 23:21:13 +0100
Subject: Comment out rez perms logging I accidentally left in at 7f07023 (Sat
 Apr 6 02:34:51 2013)

---
 OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 77299be..f8e93e1 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -1453,7 +1453,7 @@ 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);
+//            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;
-- 
cgit v1.1


From e20b0d5695dc583d161b39fa26bfd56e63c7b30e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 10 Apr 2013 00:03:37 +0100
Subject: minor: Make exceptions thrown by MySQLAssetData more consistent.

---
 OpenSim/Data/MySQL/MySQLAssetData.cs | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index cf80b3d..21362b9 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);
                         }
                     }
                 }
@@ -209,8 +210,11 @@ namespace OpenSim.Data.MySQL
                         }
                         catch (Exception e)
                         {
-                            m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}",
-                                asset.FullID, asset.Name, e.Message);
+                            m_log.Error(
+                                string.Format(
+                                    "[ASSET DB]: MySQL failure creating asset {0} with name {1}.  Exception  ",
+                                    asset.FullID, asset.Name)
+                                , e);
                         }
                     }
                 }
@@ -241,10 +245,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);
                         }
                     }
                 }
@@ -284,8 +289,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);
                         }
                     }
                 }
@@ -344,7 +349,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);
                         }
                     }
                 }
-- 
cgit v1.1


From 29e28f4b84677fa1e1b138d0ede610c55add12f2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 10 Apr 2013 00:05:03 +0100
Subject: minor: remove mono compiler warnings in InventoryAccessModule

---
 .../CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index f796ec9..e0009bb 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -353,7 +353,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)
             {
@@ -936,8 +936,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 }
             }
 
-            int primcount = 0;
-            for(int i = 0; i < objlist.Count; i++)
+            for (int i = 0; i < objlist.Count; i++)
             {
                 SceneObjectGroup g = objlist[i];
 
-- 
cgit v1.1


From 148e46563f9f95e43a460780592deceed3dd5d14 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 10 Apr 2013 00:07:58 +0100
Subject: minor: fix mono compiler warning in ScriptsHttpRequests.cs

---
 OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index ebf56cd..6793fc8 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -395,7 +395,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;
-- 
cgit v1.1


From 17fd075f39df71d628db08b7c280150f231f8a26 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 9 Apr 2013 11:55:29 -0700
Subject: BulletSim: fix problem where large sets of mega-regions weren't
 registering all the terrain with the base region.

---
 OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
index cd15850..5240ad8 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
@@ -213,13 +213,13 @@ public sealed class BSTerrainManager : IDisposable
         });
     }
 
-    // Another region is calling this region passing a terrain.
+    // 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.
-        PhysicsScene.PostTaintObject("TerrainManager.AddMegaRegionChild" + m_worldOffset.ToString(), 0, delegate()
+        PhysicsScene.PostTaintObject("TerrainManager.AddMegaRegionChild" + minCoords.ToString(), id, delegate()
         {
             UpdateTerrain(id, heightMap, minCoords, maxCoords);
         });
@@ -306,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);
 
-- 
cgit v1.1


From 59135c9a31875dc514b3ea2fe14021571807701d Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 9 Apr 2013 16:32:54 -0700
Subject: BulletSim: add Bullet HACD library invocation. Turned off by default
 as not totally debugged. Updated DLLs and SOs with more debugged HACD library
 code.

---
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs    |  53 ++++-
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs    |   1 +
 .../Physics/BulletSPlugin/BSShapeCollection.cs     | 223 ++++++++++++---------
 bin/lib32/BulletSim.dll                            | Bin 570880 -> 1008640 bytes
 bin/lib32/libBulletSim.so                          | Bin 1762207 -> 2093987 bytes
 bin/lib64/BulletSim.dll                            | Bin 721920 -> 1140224 bytes
 bin/lib64/libBulletSim.so                          | Bin 1920169 -> 2258808 bytes
 7 files changed, 183 insertions(+), 94 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 385ed9e..06df85e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -86,6 +86,7 @@ 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 float TerrainImplementation { get; private set; }
     public static int TerrainMeshMagnification { get; private set; }
@@ -149,6 +150,15 @@ 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; }
@@ -325,6 +335,10 @@ public static class BSParam
             true,
             (s) => { return ShouldRemoveZeroWidthTriangles; },
             (s,v) => { ShouldRemoveZeroWidthTriangles = v; } ),
+        new ParameterDefn<bool>("ShouldUseBulletHACD", "If true, use the Bullet version of HACD",
+            false,
+            (s) => { return ShouldUseBulletHACD; },
+            (s,v) => { ShouldUseBulletHACD = v; } ),
 
         new ParameterDefn<int>("CrossingFailuresBeforeOutOfBounds", "How forgiving we are about getting into adjactent regions",
             5,
@@ -663,10 +677,47 @@ public static class BSParam
             (s) => { return CSHullMaxVertices; },
             (s,v) => { CSHullMaxVertices = v; } ),
 	    new ParameterDefn<float>("CSHullMaxSkinWidth", "CS impl: skin width to apply to output hulls.",
-            0,
+            0f,
             (s) => { return CSHullMaxSkinWidth; },
             (s,v) => { CSHullMaxSkinWidth = v; } ),
 
+	    new ParameterDefn<float>("BHullMaxVerticesPerHull", "Bullet impl: max number of vertices per created hull",
+            100f,
+            (s) => { return BHullMaxVerticesPerHull; },
+            (s,v) => { BHullMaxVerticesPerHull = v; } ),
+	    new ParameterDefn<float>("BHullMinClusters", "Bullet impl: minimum number of hulls to create per mesh",
+            2f,
+            (s) => { return BHullMinClusters; },
+            (s,v) => { BHullMinClusters = v; } ),
+	    new ParameterDefn<float>("BHullCompacityWeight", "Bullet impl: weight factor for how compact to make hulls",
+            2f,
+            (s) => { return BHullCompacityWeight; },
+            (s,v) => { BHullCompacityWeight = v; } ),
+	    new ParameterDefn<float>("BHullVolumeWeight", "Bullet impl: weight factor for volume in created hull",
+            0.1f,
+            (s) => { return BHullVolumeWeight; },
+            (s,v) => { BHullVolumeWeight = v; } ),
+	    new ParameterDefn<float>("BHullConcavity", "Bullet impl: weight factor for how convex a created hull can be",
+            100f,
+            (s) => { return BHullConcavity; },
+            (s,v) => { BHullConcavity = v; } ),
+	    new ParameterDefn<bool>("BHullAddExtraDistPoints", "Bullet impl: whether to add extra vertices for long distance vectors",
+            false,
+            (s) => { return BHullAddExtraDistPoints; },
+            (s,v) => { BHullAddExtraDistPoints = v; } ),
+	    new ParameterDefn<bool>("BHullAddNeighboursDistPoints", "Bullet impl: whether to add extra vertices between neighbor hulls",
+            false,
+            (s) => { return BHullAddNeighboursDistPoints; },
+            (s,v) => { BHullAddNeighboursDistPoints = v; } ),
+	    new ParameterDefn<bool>("BHullAddFacesPoints", "Bullet impl: whether to add extra vertices to break up hull faces",
+            false,
+            (s) => { return BHullAddFacesPoints; },
+            (s,v) => { BHullAddFacesPoints = v; } ),
+	    new ParameterDefn<bool>("BHullShouldAdjustCollisionMargin", "Bullet impl: whether to shrink resulting hulls to account for collision margin",
+            false,
+            (s) => { return BHullShouldAdjustCollisionMargin; },
+            (s,v) => { BHullShouldAdjustCollisionMargin = v; } ),
+
 	    new ParameterDefn<float>("LinksetImplementation", "Type of linkset implementation (0=Constraint, 1=Compound, 2=Manual)",
             (float)BSLinkset.LinksetImplementation.Compound,
             (s) => { return LinksetImplementation; },
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 9818b05..8e05b58 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -316,6 +316,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
                 break;
             case "bulletxna":
                 ret = new BSAPIXNA(engineName, this);
+                BSParam.ShouldUseBulletHACD = false;
                 break;
         }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index b6ac23d..bfa69b2 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -720,7 +720,7 @@ public sealed class BSShapeCollection : IDisposable
         // Remove usage of the previous shape.
         DereferenceShape(prim.PhysShape, shapeCallback);
 
-        newShape = CreatePhysicalHull(prim.PhysObjectName, newHullKey, prim.BaseShape, prim.Size, lod);
+        newShape = CreatePhysicalHull(prim, newHullKey, prim.BaseShape, prim.Size, lod);
         // It might not have been created if we're waiting for an asset.
         newShape = VerifyMeshCreated(newShape, prim);
 
@@ -731,7 +731,7 @@ public sealed class BSShapeCollection : IDisposable
     }
 
     List<ConvexResult> m_hulls;
-    private BulletShape CreatePhysicalHull(string objName, System.UInt64 newHullKey, PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
+    private BulletShape CreatePhysicalHull(BSPhysObject prim, System.UInt64 newHullKey, PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
     {
 
         BulletShape newShape = new BulletShape();
@@ -745,116 +745,153 @@ public sealed class BSShapeCollection : IDisposable
         }
         else
         {
-            // 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 /* isPhysical */, false /* shouldCache */);
-            if (meshData != null)
+            if (BSParam.ShouldUseBulletHACD)
             {
-
-                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++)
+                DetailLog("{0},BSShapeCollection.CreatePhysicalHull,shouldUseBulletHACD,entry", prim.LocalID);
+                MeshDesc meshDesc;
+                if (!Meshes.TryGetValue(newHullKey, out meshDesc))
                 {
-                    convIndices.Add(indices[ii]);
+                    // That's odd because the mesh should have been created before the hull
+                    //     but, since it doesn't exist, create it.
+                    newShape = CreatePhysicalMesh(prim, newHullKey, prim.BaseShape, prim.Size, lod);
+                    DetailLog("{0},BSShapeCollection.CreatePhysicalHull,noMeshBuiltNew,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
+
+                    if (newShape.HasPhysicalShape)
+                    {
+                        ReferenceShape(newShape);
+                        Meshes.TryGetValue(newHullKey, out meshDesc);
+                    }
                 }
-                foreach (OMV.Vector3 vv in vertices)
+                if (meshDesc.shape.HasPhysicalShape)
                 {
-                    convVertices.Add(new float3(vv.X, vv.Y, vv.Z));
+                    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);
+
+                    DetailLog("{0},BSShapeCollection.CreatePhysicalHull,hullFromMesh,beforeCall", prim.LocalID, newShape.HasPhysicalShape);
+                    newShape = PhysicsScene.PE.BuildHullShapeFromMesh(PhysicsScene.World, meshDesc.shape, parms);
+                    DetailLog("{0},BSShapeCollection.CreatePhysicalHull,hullFromMesh,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
                 }
-
-                uint maxDepthSplit = (uint)BSParam.CSHullMaxDepthSplit;
-                if (BSParam.CSHullMaxDepthSplit != BSParam.CSHullMaxDepthSplitForSimpleShapes)
+                DetailLog("{0},BSShapeCollection.CreatePhysicalHull,shouldUseBulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
+            }
+            if (!newShape.HasPhysicalShape)
+            {
+                // 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(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */);
+                if (meshData != null)
                 {
-                    // 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))
+                    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++)
                     {
-                        maxDepthSplit = (uint)BSParam.CSHullMaxDepthSplitForSimpleShapes;
+                        convIndices.Add(indices[ii]);
+                    }
+                    foreach (OMV.Vector3 vv in vertices)
+                    {
+                        convVertices.Add(new float3(vv.X, vv.Y, vv.Z));
                     }
-                }
 
-                // 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];
+                    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;
+                        }
+                    }
 
-                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)
+                    // 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)
                     {
-                        verts[kk++] = ff;
+                        totalVertices += 4;                         // add four for the vertex count and centroid
+                        totalVertices += cr.HullIndices.Count * 3;  // we pass just triangles
                     }
+                    float[] convHulls = new float[totalVertices];
 
-                    // 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[0] = (float)hullCount;
+                    int jj = 1;
+                    foreach (ConvexResult cr in m_hulls)
                     {
-                        convHulls[jj++] = verts[ind].x;
-                        convHulls[jj++] = verts[ind].y;
-                        convHulls[jj++] = verts[ind].z;
+                        // 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);
                 }
-                // create the hull data structure in Bullet
-                newShape = PhysicsScene.PE.CreateHullShape(PhysicsScene.World, hullCount, convHulls);
             }
+            newShape.shapeKey = newHullKey;
         }
 
-        newShape.shapeKey = newHullKey;
-
         return newShape;
     }
 
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 5432813..618d4bd 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 286d930..e3b40fb 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index dca7116..491ac22 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index b63feb3..a8ad533 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1


From 9cc41d511872fcd74a074ab484db2b981f3f5676 Mon Sep 17 00:00:00 2001
From: Vegaslon
Date: Tue, 9 Apr 2013 17:23:50 -0400
Subject: Another algorithm for AngularVerticalAttraction. This one Takes into
 account all rotations before it and makes the corrections more close to the
 time that sl does.

Signed-off-by: Robert Adams <Robert.Adams@intel.com>
---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 0fd1f73..723be0b 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1358,6 +1358,28 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             // If vertical attaction timescale is reasonable
             if (enableAngularVerticalAttraction && m_verticalAttractionTimescale < m_verticalAttractionCutoff)
             {
+                //Another formula to try got from :
+                //http://answers.unity3d.com/questions/10425/how-to-stabilize-angular-motion-alignment-of-hover.html
+                Vector3 VehicleUpAxis = Vector3.UnitZ *VehicleOrientation;
+                //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;
+                //making a prediction of where the up axis will be when this is applied rather then where it is now 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);
+                //Scaling 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,UpAxis={1},PredictedUp={2},torqueVector={3},contrib={4}",
+                                ControllingPrim.LocalID,
+                                VehicleUpAxis,
+                                predictedUp,
+                                torqueVector,
+                                vertContributionV);
+                //=====================================================================
+                /*
                 // Possible solution derived from a discussion at:
                 // http://stackoverflow.com/questions/14939657/computing-vector-from-quaternion-works-computing-quaternion-from-vector-does-no
 
@@ -1392,6 +1414,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                                 differenceAngle,
                                 correctionRotation,
                                 vertContributionV);
+                 */
 
                 // ===================================================================
                 /*
-- 
cgit v1.1


From b53713cdda3c4e49913a6a82239da35d62f74e68 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 9 Apr 2013 17:14:15 -0700
Subject: BulletSim: some formatting changes.

---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 27 ++++++++++++++--------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 723be0b..612c68b 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1360,19 +1360,26 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             {
                 //Another formula to try got from :
                 //http://answers.unity3d.com/questions/10425/how-to-stabilize-angular-motion-alignment-of-hover.html
-                Vector3 VehicleUpAxis = Vector3.UnitZ *VehicleOrientation;
-                //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;
-                //making a prediction of where the up axis will be when this is applied rather then where it is now this makes for a smoother
-                //adjustment and less fighting between the various forces
+
+                Vector3 VehicleUpAxis = Vector3.UnitZ * VehicleOrientation;
+
+                // 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.
+
+                // 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);
-                //Scaling vector by our timescale since it is an acceleration it is r/s^2 or radians a timescale squared
-                Vector3 vertContributionV=torqueVector * VerticalAttractionSpeed *VerticalAttractionSpeed;
+
+                // 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,UpAxis={1},PredictedUp={2},torqueVector={3},contrib={4}",
+
+                VDetailLog("{0},  MoveAngular,verticalAttraction,UpAxis={1},PredictedUp={2},torqueVector={3},contrib={4}",
                                 ControllingPrim.LocalID,
                                 VehicleUpAxis,
                                 predictedUp,
-- 
cgit v1.1


From 5f2cbfc0fd27198f8f05f4a9a4e2908d8b11752e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 9 Apr 2013 17:53:18 -0700
Subject: BulletSim: fixing problems with llMoveToTarget. Not all fixed yet.

---
 OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs     |  2 +-
 .../Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs  | 16 +++++++++++-----
 OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs     |  6 ++++++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
index e8310df..92ace66 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
@@ -50,7 +50,7 @@ public class BSActorHover : BSActor
     // BSActor.isActive
     public override bool isActive
     {
-        get { return Enabled && m_controllingPrim.IsPhysicallyActive; }
+        get { return Enabled; }
     }
 
     // Release any connections and resources used by the actor.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
index 16c2b14..56aacc5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
@@ -50,7 +50,7 @@ public class BSActorMoveToTarget : BSActor
     // BSActor.isActive
     public override bool isActive
     {
-        get { return Enabled && m_controllingPrim.IsPhysicallyActive; }
+        get { return Enabled; }
     }
 
     // Release any connections and resources used by the actor.
@@ -65,7 +65,9 @@ public class BSActorMoveToTarget : BSActor
     // BSActor.Refresh()
     public override void Refresh()
     {
-        m_physicsScene.DetailLog("{0},BSActorMoveToTarget,refresh", m_controllingPrim.LocalID);
+        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)
@@ -100,7 +102,7 @@ public class BSActorMoveToTarget : BSActor
             // We're taking over after this.
             m_controllingPrim.ZeroMotion(true);
 
-            m_targetMotor = new BSVMotor("BSPrim.PIDTarget",
+            m_targetMotor = new BSVMotor("BSActorMoveToTargget.Activate",
                                         m_controllingPrim.MoveToTargetTau,                    // timeScale
                                         BSMotor.Infinite,           // decay time scale
                                         BSMotor.InfiniteVector,     // friction timescale
@@ -138,15 +140,19 @@ public class BSActorMoveToTarget : BSActor
         // If we are very close to our target, turn off the movement motor.
         if (m_targetMotor.ErrorIsZero())
         {
-            m_physicsScene.DetailLog("{0},BSPrim.PIDTarget,zeroMovement,movePos={1},pos={2},mass={3}",
+            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;
+            // 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},BSPrim.PIDTarget,move,fromPos={1},movePos={2}", m_controllingPrim.LocalID, origPosition, movePosition);
+        m_physicsScene.DetailLog("{0},BSActorMoveToTarget.Mover,move,fromPos={1},movePos={2}", m_controllingPrim.LocalID, origPosition, movePosition);
     }
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 64bf395..98eb4ca 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -295,6 +295,7 @@ public abstract class BSPhysObject : PhysicsActor
             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
@@ -302,10 +303,15 @@ public abstract class BSPhysObject : PhysicsActor
                 // 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);
+                }
             }
         }
     }
-- 
cgit v1.1


From c5de9840b05514eb659696239593e51e636398b8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 16 Apr 2013 21:58:24 +0100
Subject: refactor: Remove IClientNetworkServer.NetworkStop() in favour of
 existing Stop().

This was an undocumented interface which I think was for long defunct region load balancing experiments.
Also adds method doc for some IClientNetworkServer methods.
---
 OpenSim/Region/Application/OpenSimBase.cs            |  2 +-
 OpenSim/Region/ClientStack/IClientNetworkServer.cs   | 15 +++++++++++++--
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs |  5 -----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index c555915..d86eefe 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -737,7 +737,7 @@ namespace OpenSim
 
             if (foundClientServer)
             {
-                m_clientServers[clientServerElement].NetworkStop();
+                m_clientServers[clientServerElement].Stop();
                 m_clientServers.RemoveAt(clientServerElement);
             }
         }
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/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 72516cd..985aa4d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -62,11 +62,6 @@ 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);
-- 
cgit v1.1


From d4fa2c69ed2895dcab76e0df1b26252246883c07 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Wed, 17 Apr 2013 21:31:18 -0700
Subject: update libomv to git master which adds support for MaterialID in
 TextureEntry

---
 bin/CSJ2K.dll                                     |   Bin 502784 -> 495616 bytes
 bin/OpenMetaverse.StructuredData.XML              |    28 +-
 bin/OpenMetaverse.StructuredData.dll              |   Bin 114688 -> 102400 bytes
 bin/OpenMetaverse.XML                             | 36629 ++++++++++----------
 bin/OpenMetaverse.dll                             |   Bin 1925120 -> 1785856 bytes
 bin/OpenMetaverse.dll.config                      |     8 +-
 bin/OpenMetaverseTypes.XML                        |  1462 +-
 bin/OpenMetaverseTypes.dll                        |   Bin 122880 -> 114688 bytes
 bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-i686.so   |   Bin 0 -> 140028 bytes
 bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64.so |   Bin 0 -> 149368 bytes
 bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1.dylib     |   Bin 0 -> 130560 bytes
 11 files changed, 19633 insertions(+), 18494 deletions(-)
 create mode 100644 bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-i686.so
 create mode 100644 bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64.so
 create mode 100644 bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1.dylib

diff --git a/bin/CSJ2K.dll b/bin/CSJ2K.dll
index 238291f..581e410 100755
Binary files a/bin/CSJ2K.dll and b/bin/CSJ2K.dll differ
diff --git a/bin/OpenMetaverse.StructuredData.XML b/bin/OpenMetaverse.StructuredData.XML
index 897a330..3999d99 100644
--- a/bin/OpenMetaverse.StructuredData.XML
+++ b/bin/OpenMetaverse.StructuredData.XML
@@ -31,17 +31,33 @@
         </member>
         <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinary(OpenMetaverse.StructuredData.OSD)">
             <summary>
-            
+            Serializes OSD to binary format. It does no prepend header
             </summary>
-            <param name="osd"></param>
-            <returns></returns>
+            <param name="osd">OSD to serialize</param>
+            <returns>Serialized data</returns>
+        </member>
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinary(OpenMetaverse.StructuredData.OSD,System.Boolean)">
+            <summary>
+            Serializes OSD to binary format
+            </summary>
+            <param name="osd">OSD to serialize</param>
+            <param name="prependHeader"></param>
+            <returns>Serialized data</returns>
         </member>
         <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinaryStream(OpenMetaverse.StructuredData.OSD)">
             <summary>
-            
+            Serializes OSD to binary format. It does no prepend header
             </summary>
-            <param name="data"></param>
-            <returns></returns>
+            <param name="data">OSD to serialize</param>
+            <returns>Serialized data</returns>
+        </member>
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinaryStream(OpenMetaverse.StructuredData.OSD,System.Boolean)">
+            <summary>
+            Serializes OSD to binary format
+            </summary>
+            <param name="data">OSD to serialize</param>
+            <param name="prependHeader"></param>
+            <returns>Serialized data</returns>
         </member>
         <member name="M:OpenMetaverse.StructuredData.OSDParser.SkipWhiteSpace(System.IO.Stream)">
             <summary>
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index c7216ce..4df771a 100755
Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ
diff --git a/bin/OpenMetaverse.XML b/bin/OpenMetaverse.XML
index 6e57fed..abd4cd5 100644
--- a/bin/OpenMetaverse.XML
+++ b/bin/OpenMetaverse.XML
@@ -4,9695 +4,8916 @@
         <name>OpenMetaverse</name>
     </assembly>
     <members>
-        <member name="F:OpenMetaverse.Http.EventQueueClient.REQUEST_TIMEOUT">
-            <summary>=</summary>
-        </member>
-        <member name="F:OpenMetaverse.Http.EventQueueClient._errorCount">
-            <summary>Number of times we've received an unknown CAPS exception in series.</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.StartDaemon(System.String,System.String)">
+            <summary>
+            Starts a thread that keeps the daemon running
+            </summary>
+            <param name="path"></param>
+            <param name="args"></param>
         </member>
-        <member name="F:OpenMetaverse.Http.EventQueueClient._random">
-            <summary>For exponential backoff on error.</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.StopDaemon">
+            <summary>
+            Stops the daemon and the thread keeping it running
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.Packets.PacketDecoder.AddCallback(System.String,OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectToDaemon(System.String,System.Int32)">
             <summary>
-            Add a custom decoder callback
+            
             </summary>
-            <param name="key">The key of the field to decode</param>
-            <param name="customPacketHandler">The custom decode handler</param>
+            <param name="address"></param>
+            <param name="port"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Packets.PacketDecoder.RemoveCustomHandler(System.String,OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionCreate(System.String,System.String,System.String,System.String,System.Boolean,System.Boolean,System.String)">
             <summary>
-            Remove a custom decoder callback
+            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="key">The key of the field to decode</param>
-            <param name="customPacketHandler">The custom decode handler</param>
+            <param name="AccountHandle">Handle returned from successful Connector ‘create’ request</param>
+            <param name="URI">This is the URI of the terminating point of the session (ie who/what is being called)</param>
+            <param name="Name">This is the display name of the entity being called (user or channel)</param>
+            <param name="Password">Only needs to be supplied when the target URI is password protected</param>
+            <param name="PasswordHashAlgorithm">This indicates the format of the password as passed in. This can either be
+            “ClearText” or “SHA1UserName”. If this element does not exist, it is assumed to be “ClearText”. If it is
+            “SHA1UserName”, the password as passed in is the SHA1 hash of the password and username concatenated together,
+            then base64 encoded, with the final “=” character stripped off.</param>
+            <param name="JoinAudio"></param>
+            <param name="JoinText"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Packets.PacketDecoder.PacketToString(OpenMetaverse.Packets.Packet)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionConnect(System.String,System.String)">
             <summary>
-            Creates a formatted string containing the values of a Packet
+            Used to accept a call
             </summary>
-            <param name="packet">The Packet</param>
-            <returns>A formatted string of values of the nested items in the Packet object</returns>
+            <param name="SessionHandle">SessionHandle such as received from SessionNewEvent</param>
+            <param name="AudioMedia">"default"</param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Packets.PacketDecoder.MessageToString(System.Object,System.Int32)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionRenderAudioStart(System.String,System.Boolean)">
             <summary>
-            Decode an IMessage object into a beautifully formatted string
+            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="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>
+            <param name="SoundFilePath">The fully qualified path to the sound file.</param>
+            <param name="Loop">True if the file is to be played continuously and false if it is should be played once.</param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionRenderAudioStop(System.String)">
             <summary>
-            A custom decoder callback
+            This command is used to stop the audio render process.
             </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>
+            <param name="SoundFilePath">The fully qualified path to the sound file issued in the start render command.</param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.DirectoryManager">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionTerminate(System.String)">
             <summary>
-            Access to the data server which allows searching for land, events, people, etc
+            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.DirectoryManager.m_EventInfoReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionSet3DPosition(System.String,OpenMetaverse.Voice.VoicePosition,OpenMetaverse.Voice.VoicePosition)">
+            <summary>
+            Set the combined speaking and listening position in 3D space.
+            </summary>
+            <param name="SessionHandle">Handle returned from successful Session ‘create’ request or a SessionNewEvent</param>
+            <param name="SpeakerPosition">Speaking position</param>
+            <param name="ListenerPosition">Listening position</param>
+            <returns></returns>
         </member>
-        <member name="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 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.DirectoryManager.m_EventDetailLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxGetCaptureDevices">
+            <summary>
+            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.DirectoryManager.m_DirEvents">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxGetRenderDevices">
+            <summary>
+            This is used to get a list of audio devices that can be used for render (playback) of voice.
+            </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 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.DirectoryManager.m_DirEventsLock">
-            <summary>Thread sync lock object</summary>
+        <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.DirectoryManager.m_Places">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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="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 name="M:OpenMetaverse.Voice.VoiceGateway.AuxCaptureAudioStop">
+            <summary>
+            This command is used to stop the audio capture process.
+            </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_PlacesLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxSetMicLevel(System.Int32)">
+            <summary>
+            This command is used to set the mic volume while in the audio tuning process.
+            Once an acceptable mic level is attained, the application must issue a
+            connector set mic volume command to have that level be used while on voice
+            calls.
+            </summary>
+            <param name="Level">the microphone volume (-100 to 100 inclusive)</param>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirPlaces">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxSetSpeakerLevel(System.Int32)">
+            <summary>
+            This command is used to set the speaker volume while in the audio tuning
+            process. Once an acceptable speaker level is attained, the application must
+            issue a connector set speaker volume command to have that level be used while
+            on voice calls.
+            </summary>
+            <param name="Level">the speaker volume (-100 to 100 inclusive)</param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.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 name="M:OpenMetaverse.Voice.VoiceGateway.Start">
+            <summary>
+            Start up the Voice service.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirPlacesLock">
-            <summary>Thread sync lock object</summary>
+        <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.DirectoryManager.m_DirClassifieds">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.Dispose">
+            <summary>
+            Cleanup oject resources
+            </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 name="M:OpenMetaverse.Voice.VoiceGateway.Network_EventQueueRunning(System.Object,OpenMetaverse.EventQueueRunningEventArgs)">
+            <summary>
+            Request voice cap when changing regions
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirClassifiedsLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnSessionStateChangeEvent(System.Object,OpenMetaverse.Voice.VoiceGateway.SessionStateChangeEventArgs)">
+            <summary>
+            Handle a change in session state
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirGroups">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.CloseSession(System.String)">
+            <summary>
+            Close a voice session
+            </summary>
+            <param name="sessionHandle"></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 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.DirectoryManager.m_DirGroupsLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.cClient_OnComplete(OpenMetaverse.Http.CapsClient,OpenMetaverse.StructuredData.OSD,System.Exception)">
+            <summary>
+            Handle completion of main voice cap request.
+            </summary>
+            <param name="client"></param>
+            <param name="result"></param>
+            <param name="error"></param>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirPeople">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnDaemonRunning">
+            <summary>
+            Daemon has started so connect to it.
+            </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 name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnDaemonConnected">
+            <summary>
+            The daemon TCP connection is open.
+            </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="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)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnConnectorCreateResponse(System.Object,OpenMetaverse.Voice.VoiceGateway.VoiceConnectorEventArgs)">
             <summary>
-            Constructs a new instance of the DirectoryManager class
+            Handle creation of the Connector.
             </summary>
-            <param name="client">An instance of GridClient</param>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartClassifiedSearch(System.String)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnAuxGetRenderDevicesResponse(System.Object,OpenMetaverse.Voice.VoiceGateway.VoiceDevicesEventArgs)">
             <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
+            Handle response to audio output device query
             </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)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnAuxGetCaptureDevicesResponse(System.Object,OpenMetaverse.Voice.VoiceGateway.VoiceDevicesEventArgs)">
             <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
+            Handle response to audio input device query
             </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)
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.ParcelChanged">
+             <summary>
+             Set voice channel for new parcel
+             </summary>
             
-            The <see cref="!:OnDirPlacesReply"/> event is raised when a response is received from the simulator
+        </member>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.RequestParcelInfo(System.Uri)">
+            <summary>
+            Request info from a parcel capability Uri.
             </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>
+            <param name="cap"></param>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.ParcelCategory,System.Int32)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.pCap_OnComplete(OpenMetaverse.Http.CapsClient,OpenMetaverse.StructuredData.OSD,System.Exception)">
             <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
+            Receive parcel voice cap
             </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>
+            <param name="client"></param>
+            <param name="result"></param>
+            <param name="error"></param>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartLandSearch(OpenMetaverse.DirectoryManager.SearchTypeFlags)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.UpdatePosition(OpenMetaverse.AgentManager)">
             <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
+            Tell Vivox where we are standing
             </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>
+            <remarks>This has to be called when we move or turn.</remarks>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartLandSearch(OpenMetaverse.DirectoryManager.SearchTypeFlags,System.Int32,System.Int32,System.Int32)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.PosUpdating(System.Boolean)">
             <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
+            Start and stop updating out position.
             </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>
+            <param name="go"></param>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartLandSearch(OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.DirectoryManager.SearchTypeFlags,System.Int32,System.Int32,System.Int32)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorCreate(System.String,System.String,System.UInt16,System.UInt16,OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings)">
             <summary>
-            Send a request to the data server for land sales listings
+            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="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>
+            <param name="ClientName">A string value indicting the Application name</param>
+            <param name="AccountManagementServer">URL for the management server</param>
+            <param name="Logging">LoggingSettings</param>
+            <param name="MaximumPort"></param>
+            <param name="MinimumPort"></param>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorInitiateShutdown(System.String)">
             <summary>
-            Search for Groups
+            Shutdown Connector -- Should be called when the application is shutting down
+            to gracefully release resources
             </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>
+            <param name="ConnectorHandle">Handle returned from successful Connector ‘create’ request</param>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32,OpenMetaverse.DirectoryManager.DirFindFlags)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorMuteLocalMic(System.String,System.Boolean)">
             <summary>
-            Search for Groups
+            Mute or unmute the microphone
             </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>
+            <param name="ConnectorHandle">Handle returned from successful Connector ‘create’ request</param>
+            <param name="Mute">true (mute) or false (unmute)</param>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartPeopleSearch(System.String,System.Int32)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorMuteLocalSpeaker(System.String,System.Boolean)">
             <summary>
-            Search the People directory for other avatars
+            Mute or unmute the speaker
             </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>
+            <param name="ConnectorHandle">Handle returned from successful Connector ‘create’ request</param>
+            <param name="Mute">true (mute) or false (unmute)</param>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartPlacesSearch">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorSetLocalMicVolume(System.String,System.Int32)">
             <summary>
-            Search Places for parcels of land you personally own
+            Set microphone volume
             </summary>
+            <param name="ConnectorHandle">Handle returned from successful Connector ‘create’ request</param>
+            <param name="Value">The level of the audio, a number between -100 and 100 where
+            0 represents ‘normal’ speaking volume</param>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartPlacesSearch(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorSetLocalSpeakerVolume(System.String,System.Int32)">
             <summary>
-            Searches Places for land owned by the specified group
+            Set local speaker volume
             </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>
+            <param name="ConnectorHandle">Handle returned from successful Connector ‘create’ request</param>
+            <param name="Value">The level of the audio, a number between -100 and 100 where
+            0 represents ‘normal’ speaking volume</param>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartPlacesSearch(System.String)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AccountLogin(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Boolean)">
             <summary>
-            Search the Places directory for parcels that are listed in search and contain the specified keywords
+            This is used to login a specific user account(s). It may only be called after
+            Connector initialization has completed successfully
             </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>
+            <param name="ConnectorHandle">Handle returned from successful Connector ‘create’ request</param>
+            <param name="AccountName">User's account name</param>
+            <param name="AccountPassword">User's account password</param>
+            <param name="AudioSessionAnswerMode">Values may be “AutoAnswer” or “VerifyAnswer”</param>
+            <param name="AccountURI">""</param>
+            <param name="ParticipantPropertyFrequency">This is an integer that specifies how often
+            the daemon will send participant property events while in a channel. If this is not set
+            the default will be “on state change”, which means that the events will be sent when
+            the participant starts talking, stops talking, is muted, is unmuted.
+            The valid values are:
+            0 – Never
+            5 – 10 times per second
+            10 – 5 times per second
+            50 – 1 time per second
+            100 – on participant state change (this is the default)</param>
+            <param name="EnableBuddiesAndPresence">false</param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartPlacesSearch(OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.ParcelCategory,System.String,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AccountLogout(System.String)">
             <summary>
-            Search Places - All Options
+            This is used to logout a user session. It should only be called with a valid AccountHandle.
             </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>
+            <param name="AccountHandle">Handle returned from successful Connector ‘login’ request</param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,System.UInt32)">
+        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnVoiceResponse">
             <summary>
-            Search All Events with specifid searchText in all categories, includes PG, Mature and Adult
+            Event for most mundane request reposnses.
             </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 name="E:OpenMetaverse.Voice.VoiceGateway.OnConnectorCreateResponse">
+            <summary>Response to Connector.Create request</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.EventInfoRequest(System.UInt32)">
-            <summary>Requests Event Details</summary>
-            <param name="eventID">ID of Event returned from the <see cref="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,System.UInt32)"/> method</param>
+        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnAuxGetCaptureDevicesResponse">
+            <summary>Response to Aux.GetCaptureDevices request</summary>
         </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 name="E:OpenMetaverse.Voice.VoiceGateway.OnAuxGetRenderDevicesResponse">
+            <summary>Response to Aux.GetRenderDevices request</summary>
         </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 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="M:OpenMetaverse.DirectoryManager.DirLandReplyEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
-            <summary>Process an incoming <see cref="T:OpenMetaverse.Messages.Linden.DirLandReplyMessage"/> event message</summary>
-            <param name="capsKey">The Unique Capabilities Key</param>
-            <param name="message">The <see cref="T:OpenMetaverse.Messages.Linden.DirLandReplyMessage"/> event message containing the data</param>
-            <param name="simulator">The simulator the message originated from</param>
+        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnAccountLoginResponse">
+            <summary>Response to Account.Login request</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.DirPeopleReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="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="M:OpenMetaverse.DirectoryManager.DirGroupsReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="P:OpenMetaverse.Voice.VoiceGateway.CaptureDevices">
+            <summary>
+            List of audio input devices
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.PlacesReplyEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
-            <summary>Process an incoming <see cref="T:OpenMetaverse.Messages.Linden.PlacesReplyMessage"/> event message</summary>
-            <param name="capsKey">The Unique Capabilities Key</param>
-            <param name="message">The <see cref="T:OpenMetaverse.Messages.Linden.PlacesReplyMessage"/> event message containing the data</param>
-            <param name="simulator">The simulator the message originated from</param>
+        <member name="P:OpenMetaverse.Voice.VoiceGateway.PlaybackDevices">
+            <summary>
+            List of audio output devices
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.PlacesReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="P:OpenMetaverse.Voice.VoiceGateway.TestMode">
+            <summary>
+            Set audio test mode
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.EventsReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.Enabled">
+            <summary>Enable logging</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.EventInfoReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.Folder">
+            <summary>The folder where any logs will be created</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.DirPlacesReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.FileNamePrefix">
+            <summary>This will be prepended to beginning of each log file</summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.EventInfoReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.EventInfoRequest(System.UInt32)"/> request.</summary>
+        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.FileNameSuffix">
+            <summary>The suffix or extension to be appended to each log file</summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.DirEventsReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,System.UInt32)"/> request.</summary>
+        <member name="F:OpenMetaverse.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="E:OpenMetaverse.DirectoryManager.PlacesReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartPlacesSearch"/> request.</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.#ctor">
+            <summary>
+            Constructor for default logging settings
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.DirPlacesReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,System.Int32)"/> request.</summary>
+        <member name="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.DirectoryManager.DirClassifiedsReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartClassifiedSearch(System.String,OpenMetaverse.DirectoryManager.ClassifiedCategories,System.Boolean)"/> request.</summary>
+        <member name="F:OpenMetaverse.Voice.VoicePosition.Position">
+            <summary>Positional vector of the users position</summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.DirGroupsReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32)"/> request.</summary>
+        <member name="F:OpenMetaverse.Voice.VoicePosition.Velocity">
+            <summary>Velocity vector of the position</summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.DirPeopleReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartPeopleSearch(System.String,System.Int32)"/> request.</summary>
+        <member name="F:OpenMetaverse.Voice.VoicePosition.AtOrientation">
+            <summary>At Orientation (X axis) of the position</summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.DirLandReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartLandSearch(OpenMetaverse.DirectoryManager.SearchTypeFlags)"/> request.</summary>
+        <member name="F:OpenMetaverse.Voice.VoicePosition.UpOrientation">
+            <summary>Up Orientation (Y axis) of the position</summary>
         </member>
-        <member name="T:OpenMetaverse.DirectoryManager.ClassifiedCategories">
-            <summary>Classified Ad categories</summary>
+        <member name="F:OpenMetaverse.Voice.VoicePosition.LeftOrientation">
+            <summary>Left Orientation (Z axis) of the position</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Any">
-            <summary>Classified is listed in the Any category</summary>
+        <member name="T:OpenMetaverse.Assets.AssetNotecard">
+            <summary>
+            Represents a string of characters encoded with specific formatting properties
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Shopping">
-            <summary>Classified is shopping related</summary>
+        <member name="T:OpenMetaverse.Assets.Asset">
+            <summary>
+            Base class for all Asset types
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.LandRental">
-            <summary>Classified is </summary>
+        <member name="F:OpenMetaverse.Assets.Asset.AssetData">
+            <summary>A byte array containing the raw asset data</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.PropertyRental">
-            <summary></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.DirectoryManager.ClassifiedCategories.SpecialAttraction">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Assets.Asset._AssetID">
+            <summary>A unique ID</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.NewProducts">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Assets.Asset.#ctor">
+            <summary>
+            Construct a new Asset object
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Employment">
-            <summary></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.DirectoryManager.ClassifiedCategories.Wanted">
-            <summary></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.DirectoryManager.ClassifiedCategories.Service">
-            <summary></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.DirectoryManager.ClassifiedCategories.Personal">
-            <summary></summary>
+        <member name="P:OpenMetaverse.Assets.Asset.AssetID">
+            <summary>The assets unique ID</summary>
         </member>
-        <member name="T:OpenMetaverse.DirectoryManager.EventCategories">
-            <summary>Event Categories</summary>
+        <member name="P:OpenMetaverse.Assets.Asset.AssetType">
+            <summary>
+            The "type" of asset, Notecard, Animation, etc
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.All">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Assets.AssetNotecard.BodyText">
+            <summary>A text string containing main text of the notecard</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Discussion">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Assets.AssetNotecard.EmbeddedItems">
+            <summary>List of <see cref="T:OpenMetaverse.InventoryItem"/>s embedded on the notecard</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Sports">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Assets.AssetNotecard.#ctor">
+            <summary>Construct an Asset of type Notecard</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.LiveMusic">
-            <summary></summary>
+        <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="F:OpenMetaverse.DirectoryManager.EventCategories.Commercial">
-            <summary></summary>
+        <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="F:OpenMetaverse.DirectoryManager.EventCategories.Nightlife">
-            <summary></summary>
+        <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="F:OpenMetaverse.DirectoryManager.EventCategories.Games">
-            <summary></summary>
+        <member name="P:OpenMetaverse.Assets.AssetNotecard.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Pageants">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Education">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Arts">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Charity">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Miscellaneous">
-            <summary></summary>
-        </member>
-        <member name="T:OpenMetaverse.DirectoryManager.DirFindFlags">
+        <member name="T:OpenMetaverse.SoundManager">
             <summary>
-            Query Flags used in many of the DirectoryManager methods to specify which query to execute and how to return the results.
             
-            Flags can be combined using the | (pipe) character, not all flags are available in all queries
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.People">
-            <summary>Query the People database</summary>
+        <member name="F:OpenMetaverse.SoundManager.m_AttachedSound">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.Online">
-            <summary></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.DirectoryManager.DirFindFlags.Events">
-            <summary></summary>
+        <member name="F:OpenMetaverse.SoundManager.m_AttachedSoundLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.Groups">
-            <summary>Query the Groups database</summary>
+        <member name="F:OpenMetaverse.SoundManager.m_AttachedSoundGainChange">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.DateEvents">
-            <summary>Query the Events database</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.DirectoryManager.DirFindFlags.AgentOwned">
-            <summary>Query the land holdings database for land owned by the currently connected agent</summary>
+        <member name="F:OpenMetaverse.SoundManager.m_AttachedSoundGainChangeLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.ForSale">
-            <summary></summary>
+        <member name="F:OpenMetaverse.SoundManager.m_SoundTrigger">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.GroupOwned">
-            <summary>Query the land holdings database for land which is owned by a Group</summary>
+        <member 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.DirectoryManager.DirFindFlags.DwellSort">
-            <summary>Specifies the query should pre sort the results based upon traffic
-            when searching the Places database</summary>
+        <member name="F:OpenMetaverse.SoundManager.m_SoundTriggerLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PgSimsOnly">
-            <summary></summary>
+        <member name="F:OpenMetaverse.SoundManager.m_PreloadSound">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PicturesOnly">
-            <summary></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.DirectoryManager.DirFindFlags.PgEventsOnly">
-            <summary></summary>
+        <member name="F:OpenMetaverse.SoundManager.m_PreloadSoundLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.MatureSimsOnly">
-            <summary></summary>
+        <member name="M:OpenMetaverse.SoundManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Construct a new instance of the SoundManager class, used for playing and receiving
+            sound assets
+            </summary>
+            <param name="client">A reference to the current GridClient instance</param>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.SortAsc">
-            <summary>Specifies the query should pre sort the results in an ascending order when searching the land sales database. 
-            This flag is only used when searching the land sales database</summary>
+        <member name="M:OpenMetaverse.SoundManager.PlaySound(OpenMetaverse.UUID)">
+            <summary>
+            Plays a sound in the current region at full volume from avatar position
+            </summary>
+            <param name="soundID">UUID of the sound to be played</param>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PricesSort">
-            <summary>Specifies the query should pre sort the results using the SalePrice field when searching the land sales database. 
-            This flag is only used when searching the land sales database</summary>
+        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Vector3)">
+            <summary>
+            Plays a sound in the current region at full volume
+            </summary>
+            <param name="soundID">UUID of the sound to be played.</param>
+            <param name="position">position for the sound to be played at. Normally the avatar.</param>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PerMeterSort">
-            <summary>Specifies the query should pre sort the results by calculating the average price/sq.m (SalePrice / Area) when searching the land sales database. 
-            This flag is only used when searching the land sales database</summary>
+        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Vector3,System.Single)">
+            <summary>
+            Plays a sound in the current region
+            </summary>
+            <param name="soundID">UUID of the sound to be played.</param>
+            <param name="position">position for the sound to be played at. Normally the avatar.</param>
+            <param name="gain">volume of the sound, from 0.0 to 1.0</param>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.AreaSort">
-            <summary>Specifies the query should pre sort the results using the ParcelSize field when searching the land sales database. 
-            This flag is only used when searching the land sales database</summary>
+        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Simulator,OpenMetaverse.Vector3,System.Single)">
+            <summary>
+            Plays a sound in the specified sim
+            </summary>
+            <param name="soundID">UUID of the sound to be played.</param>
+            <param name="sim">UUID of the sound to be played.</param>
+            <param name="position">position for the sound to be played at. Normally the avatar.</param>
+            <param name="gain">volume of the sound, from 0.0 to 1.0</param>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.NameSort">
-            <summary>Specifies the query should pre sort the results using the Name field when searching the land sales database. 
-            This flag is only used when searching the land sales database</summary>
+        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,System.UInt64,OpenMetaverse.Vector3,System.Single)">
+            <summary>
+            Play a sound asset
+            </summary>
+            <param name="soundID">UUID of the sound to be played.</param>
+            <param name="handle">handle id for the sim to be played in.</param>
+            <param name="position">position for the sound to be played at. Normally the avatar.</param>
+            <param name="gain">volume of the sound, from 0.0 to 1.0</param>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.LimitByPrice">
-            <summary>When set, only parcels less than the specified Price will be included when searching the land sales database.
-            This flag is only used when searching the land sales database</summary>
+        <member name="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="F:OpenMetaverse.DirectoryManager.DirFindFlags.LimitByArea">
-            <summary>When set, only parcels greater than the specified Size will be included when searching the land sales database.
-            This flag is only used when searching the land sales database</summary>
+        <member name="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="F:OpenMetaverse.DirectoryManager.DirFindFlags.FilterMature">
-            <summary></summary>
+        <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="F:OpenMetaverse.DirectoryManager.DirFindFlags.PGOnly">
-            <summary></summary>
+        <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="F:OpenMetaverse.DirectoryManager.DirFindFlags.IncludePG">
-            <summary>Include PG land in results. This flag is used when searching both the Groups, Events and Land sales databases</summary>
+        <member name="E:OpenMetaverse.SoundManager.AttachedSound">
+            <summary>Raised when the simulator sends us data containing
+            sound</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.IncludeMature">
-            <summary>Include Mature land in results. This flag is used when searching both the Groups, Events and Land sales databases</summary>
+        <member name="E:OpenMetaverse.SoundManager.AttachedSoundGainChange">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.IncludeAdult">
-            <summary>Include Adult land in results. This flag is used when searching both the Groups, Events and Land sales databases</summary>
+        <member name="E:OpenMetaverse.SoundManager.SoundTrigger">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.AdultOnly">
-            <summary></summary>
+        <member name="E:OpenMetaverse.SoundManager.PreloadSound">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="T:OpenMetaverse.DirectoryManager.SearchTypeFlags">
+        <member name="T:OpenMetaverse.AttachedSoundEventArgs">
+            <summary>Provides data for the <see cref="E:OpenMetaverse.SoundManager.AttachedSound"/> event</summary>
+            <remarks>The <see cref="E:OpenMetaverse.SoundManager.AttachedSound"/> event occurs when the simulator sends
+            the sound data which emits from an agents attachment</remarks>
+            <example>
+            The following code example shows the process to subscribe to the <see cref="E:OpenMetaverse.SoundManager.AttachedSound"/> event
+            and a stub to handle the data passed from the simulator
+            <code>
+                // Subscribe to the AttachedSound event
+                Client.Sound.AttachedSound += Sound_AttachedSound;
+                
+                // process the data raised in the event here
+                private void Sound_AttachedSound(object sender, AttachedSoundEventArgs e)
+                {
+                    // ... Process AttachedSoundEventArgs here ...
+                }
+            </code>
+            </example>
+        </member>
+        <member name="M:OpenMetaverse.AttachedSoundEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Single,OpenMetaverse.SoundFlags)">
             <summary>
-            Land types to search dataserver for
+            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="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Any">
-            <summary>Search Auction, Mainland and Estate</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Auction">
-            <summary>Land which is currently up for auction</summary>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Simulator">
+            <summary>Simulator where the event originated</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Mainland">
-            <summary>Parcels which are on the mainland (Linden owned) continents</summary>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.SoundID">
+            <summary>Get the sound asset id</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Estate">
-            <summary>Parcels which are on privately owned simulators</summary>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.OwnerID">
+            <summary>Get the ID of the owner</summary>
         </member>
-        <member name="T:OpenMetaverse.DirectoryManager.EventFlags">
-            <summary>
-            The content rating of the event
-            </summary>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.ObjectID">
+            <summary>Get the ID of the Object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventFlags.PG">
-            <summary>Event is PG</summary>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Gain">
+            <summary>Get the volume level</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventFlags.Mature">
-            <summary>Event is Mature</summary>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Flags">
+            <summary>Get the <see cref="T:OpenMetaverse.SoundFlags"/></summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventFlags.Adult">
-            <summary>Event is Adult</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="T:OpenMetaverse.DirectoryManager.ClassifiedFlags">
+        <member name="M:OpenMetaverse.AttachedSoundGainChangeEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,System.Single)">
             <summary>
-            Classified Ad Options
+            Construct a new instance of the AttachedSoundGainChangedEventArgs class
             </summary>
-            <remarks>There appear to be two formats the flags are packed in.
-            This set of flags is for the newer style</remarks>
+            <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="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.None">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.Simulator">
+            <summary>Simulator where the event originated</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.Mature">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.Enabled">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.ObjectID">
+            <summary>Get the ID of the Object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.UpdateTime">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.Gain">
+            <summary>Get the volume level</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.AutoRenew">
-            <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="T:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags">
+        <member name="M:OpenMetaverse.SoundTriggerEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Single,System.UInt64,OpenMetaverse.Vector3)">
             <summary>
-            Classified ad query options
+            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="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.All">
-            <summary>Include all ads in results</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.PG">
-            <summary>Include PG ads in results</summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Simulator">
+            <summary>Simulator where the event originated</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.Mature">
-            <summary>Include Mature ads in results</summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.SoundID">
+            <summary>Get the sound asset id</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.Adult">
-            <summary>Include Adult ads in results</summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.OwnerID">
+            <summary>Get the ID of the owner</summary>
         </member>
-        <member name="T:OpenMetaverse.DirectoryManager.PlacesFlags">
-            <summary>
-            The For Sale flag in PlacesReplyData
-            </summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.ObjectID">
+            <summary>Get the ID of the Object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesFlags.NotForSale">
-            <summary>Parcel is not listed for sale</summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.ParentID">
+            <summary>Get the ID of the objects parent</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesFlags.ForSale">
-            <summary>Parcel is For Sale</summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Gain">
+            <summary>Get the volume level</summary>
         </member>
-        <member name="T:OpenMetaverse.DirectoryManager.Classified">
-            <summary>
-            A classified ad on the grid
-            </summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.RegionHandle">
+            <summary>Get the regionhandle</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.Classified.ID">
-            <summary>UUID for this ad, useful for looking up detailed
-            information about it</summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Position">
+            <summary>Get the source position</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.Classified.Name">
-            <summary>The title of this classified ad</summary>
+        <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="F:OpenMetaverse.DirectoryManager.Classified.Flags">
-            <summary>Flags that show certain options applied to the classified</summary>
+        <member name="M:OpenMetaverse.PreloadSoundEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>
+            Construct a new instance of the PreloadSoundEventArgs class
+            </summary>
+            <param name="sim">Simulator where the event originated</param>
+            <param name="soundID">The sound asset id</param>
+            <param name="ownerID">The ID of the owner</param>
+            <param name="objectID">The ID of the object</param>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.Classified.CreationDate">
-            <summary>Creation date of the ad</summary>
+        <member name="P:OpenMetaverse.PreloadSoundEventArgs.Simulator">
+            <summary>Simulator where the event originated</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.Classified.ExpirationDate">
-            <summary>Expiration date of the ad</summary>
+        <member name="P:OpenMetaverse.PreloadSoundEventArgs.SoundID">
+            <summary>Get the sound asset id</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.Classified.Price">
-            <summary>Price that was paid for this ad</summary>
+        <member name="P:OpenMetaverse.PreloadSoundEventArgs.OwnerID">
+            <summary>Get the ID of the owner</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.Classified.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
+        <member name="P:OpenMetaverse.PreloadSoundEventArgs.ObjectID">
+            <summary>Get the ID of the Object</summary>
         </member>
-        <member name="T:OpenMetaverse.DirectoryManager.DirectoryParcel">
+        <member name="T:OpenMetaverse.Caps">
             <summary>
-            A parcel retrieved from the dataserver such as results from the 
-            "For-Sale" listings or "Places" Search
+            Capabilities is the name of the bi-directional HTTP REST protocol
+            used to communicate non real-time transactions such as teleporting or
+            group messaging
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.ID">
-            <summary>The unique dataserver parcel ID</summary>
-            <remarks>This id is used to obtain additional information from the entry
-            by using the <see cref="!:ParcelManager.InfoRequest"/> method</remarks>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.Name">
-            <summary>A string containing the name of the parcel</summary>
+        <member name="F:OpenMetaverse.Caps.Simulator">
+            <summary>Reference to the simulator this system is connected to</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.ActualArea">
-            <summary>The size of the parcel</summary>
-            <remarks>This field is not returned for Places searches</remarks>
+        <member name="M:OpenMetaverse.Caps.#ctor(OpenMetaverse.Simulator,System.String)">
+            <summary>
+            Default constructor
+            </summary>
+            <param name="simulator"></param>
+            <param name="seedcaps"></param>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.SalePrice">
-            <summary>The price of the parcel</summary>
-            <remarks>This field is not returned for Places searches</remarks>
+        <member name="M:OpenMetaverse.Caps.CapabilityURI(System.String)">
+            <summary>
+            Request the URI of a named capability
+            </summary>
+            <param name="capability">Name of the capability to request</param>
+            <returns>The URI of the requested capability, or String.Empty if
+            the capability does not exist</returns>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.Auction">
-            <summary>If True, this parcel is flagged to be auctioned</summary>
+        <member name="M:OpenMetaverse.Caps.EventQueueEventHandler(System.String,OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Process any incoming events, check to see if we have a message created for the event, 
+            </summary>
+            <param name="eventName"></param>
+            <param name="body"></param>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.ForSale">
-            <summary>If true, this parcel is currently set for sale</summary>
+        <member name="P:OpenMetaverse.Caps.SeedCapsURI">
+            <summary>Capabilities URI this system was initialized with</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.Dwell">
-            <summary>Parcel traffic</summary>
+        <member name="P:OpenMetaverse.Caps.IsEventQueueRunning">
+            <summary>Whether the capabilities event queue is connected and
+            listening for incoming events</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.DirectoryParcel.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
+        <member name="T:OpenMetaverse.Caps.EventQueueCallback">
+            <summary>
+            Triggered when an event is received via the EventQueueGet 
+            capability
+            </summary>
+            <param name="capsKey">Event name</param>
+            <param name="message">Decoded event data</param>
+            <param name="simulator">The simulator that generated the event</param>
         </member>
-        <member name="T:OpenMetaverse.DirectoryManager.AgentSearchData">
+        <member name="T:OpenMetaverse.AgentManager">
             <summary>
-            An Avatar returned from the dataserver
+            Manager class for our own avatar
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.Online">
-            <summary>Online status of agent</summary>
-            <remarks>This field appears to be obsolete and always returns false</remarks>
+        <member name="F:OpenMetaverse.AgentManager.m_Chat">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.FirstName">
-            <summary>The agents first name</summary>
+        <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.DirectoryManager.AgentSearchData.LastName">
-            <summary>The agents last name</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ChatLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.AgentID">
-            <summary>The agents <see cref="T:OpenMetaverse.UUID"/></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptDialog">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.AgentSearchData.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
+        <member 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="T:OpenMetaverse.DirectoryManager.GroupSearchData">
-            <summary>
-             Response to a "Groups" Search
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptDialogLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.GroupSearchData.GroupID">
-            <summary>The Group ID</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptQuestion">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.GroupSearchData.GroupName">
-            <summary>The name of the group</summary>
+        <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.DirectoryManager.GroupSearchData.Members">
-            <summary>The current number of members</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptQuestionLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.GroupSearchData.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
+        <member name="F:OpenMetaverse.AgentManager.m_LoadURL">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.DirectoryManager.PlacesSearchData">
-            <summary>
-            Parcel information returned from a <see cref="M:OpenMetaverse.DirectoryManager.StartPlacesSearch"/> request
-            <para>
-            Represents one of the following:
-            A parcel of land on the grid that has its Show In Search flag set
-            A parcel of land owned by the agent making the request
-            A parcel of land owned by a group the agent making the request is a member of
-            </para>
-            <para>
-            In a request for Group Land, the First record will contain an empty record
-            </para>
-            Note: This is not the same as searching the land for sale data source
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.OwnerID">
-            <summary>The ID of the Agent of Group that owns the parcel</summary>
+        <member 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.DirectoryManager.PlacesSearchData.Name">
-            <summary>The name</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_LoadUrlLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Desc">
-            <summary>The description</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_Balance">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.ActualArea">
-            <summary>The Size of the parcel</summary>
+        <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.DirectoryManager.PlacesSearchData.BillableArea">
-            <summary>The billable Size of the parcel, for mainland
-            parcels this will match the ActualArea field. For Group owned land this will be 10 percent smaller
-            than the ActualArea. For Estate land this will always be 0</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_BalanceLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Flags">
-            <summary>Indicates the ForSale status of the parcel</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_MoneyBalance">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.GlobalX">
-            <summary>The Gridwide X position</summary>
+        <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.DirectoryManager.PlacesSearchData.GlobalY">
-            <summary>The Gridwide Y position</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_MoneyBalanceReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.GlobalZ">
-            <summary>The Z position of the parcel, or 0 if no landing point set</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_InstantMessage">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.SimName">
-            <summary>The name of the Region the parcel is located in</summary>
+        <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.DirectoryManager.PlacesSearchData.SnapshotID">
-            <summary>The Asset ID of the parcels Snapshot texture</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_InstantMessageLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Dwell">
-            <summary>The calculated visitor traffic</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_Teleport">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.SKU">
-            <summary>The billing product SKU</summary>
-            <remarks>Known values are:
-            <list type="table">
-            <item><term>023</term><description>Mainland / Full Region</description></item>
-            <item><term>024</term><description>Estate / Full Region</description></item>
-            <item><term>027</term><description>Estate / Openspace</description></item>
-            <item><term>029</term><description>Estate / Homestead</description></item>
-            <item><term>129</term><description>Mainland / Homestead (Linden Owned)</description></item>
-            </list>
-            </remarks>
+        <member 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.DirectoryManager.PlacesSearchData.Price">
-            <summary>No longer used, will always be 0</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_TeleportLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.PlacesSearchData.ToSLurl">
-            <summary>Get a SL URL for the parcel</summary>
-            <returns>A string, containing a standard SLURL</returns>
+        <member name="F:OpenMetaverse.AgentManager.m_AgentData">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.PlacesSearchData.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
+        <member 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="T:OpenMetaverse.DirectoryManager.EventsSearchData">
-            <summary>
-            An "Event" Listing summary
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.m_AgentDataLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Owner">
-            <summary>The ID of the event creator</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_AnimationsChanged">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Name">
-            <summary>The name of the event</summary>
+        <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.DirectoryManager.EventsSearchData.ID">
-            <summary>The events ID</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_AnimationsChangedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Date">
-            <summary>A string containing the short date/time the event will begin</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_MeanCollision">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Time">
-            <summary>The event start time in Unixtime (seconds since epoch)</summary>
+        <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.DirectoryManager.EventsSearchData.Flags">
-            <summary>The events maturity rating</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_MeanCollisionLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.EventsSearchData.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
+        <member name="F:OpenMetaverse.AgentManager.m_RegionCrossed">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.DirectoryManager.EventInfo">
-            <summary>
-            The details of an "Event"
-            </summary>
+        <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.DirectoryManager.EventInfo.ID">
-            <summary>The events ID</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_RegionCrossedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Creator">
-            <summary>The ID of the event creator</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_GroupChatJoined">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Name">
-            <summary>The name of the event</summary>
+        <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.DirectoryManager.EventInfo.Category">
-            <summary>The category</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_GroupChatJoinedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Desc">
-            <summary>The events description</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_AlertMessage">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Date">
-            <summary>The short date/time the event will begin</summary>
+        <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.DirectoryManager.EventInfo.DateUTC">
-            <summary>The event start time in Unixtime (seconds since epoch) UTC adjusted</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_AlertMessageLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Duration">
-            <summary>The length of the event in minutes</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptControl">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Cover">
-            <summary>0 if no cover charge applies</summary>
+        <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.DirectoryManager.EventInfo.Amount">
-            <summary>The cover charge amount in L$ if applicable</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptControlLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.SimName">
-            <summary>The name of the region where the event is being held</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_CameraConstraint">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.GlobalPos">
-            <summary>The gridwide location of the event</summary>
+        <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.DirectoryManager.EventInfo.Flags">
-            <summary>The maturity rating</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_CameraConstraintLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.EventInfo.ToSLurl">
-            <summary>Get a SL URL for the parcel where the event is hosted</summary>
-            <returns>A string, containing a standard SLURL</returns>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptSensorReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.EventInfo.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
+        <member 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="T:OpenMetaverse.EventInfoReplyEventArgs">
-            <summary>Contains the Event data returned from the data server from an EventInfoRequest</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptSensorReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.EventInfoReplyEventArgs.#ctor(OpenMetaverse.DirectoryManager.EventInfo)">
-            <summary>Construct a new instance of the EventInfoReplyEventArgs class</summary>
-            <param name="matchedEvent">A single EventInfo object containing the details of an event</param>
+        <member name="F:OpenMetaverse.AgentManager.m_AvatarSitResponse">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="P:OpenMetaverse.EventInfoReplyEventArgs.MatchedEvent">
-            <summary>
-            A single EventInfo object containing the details of an event
-            </summary>
+        <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="T:OpenMetaverse.DirEventsReplyEventArgs">
-            <summary>Contains the "Event" detail data returned from the data server</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_AvatarSitResponseLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.DirEventsReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.EventsSearchData})">
-            <summary>Construct a new instance of the DirEventsReplyEventArgs class</summary>
-            <param name="queryID">The ID of the query returned by the data server. 
-            This will correlate to the ID returned by the <see cref="!:StartEventsSearch"/> method</param>
-            <param name="matchedEvents">A list containing the "Events" returned by the search query</param>
+        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberAdded">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="P:OpenMetaverse.DirEventsReplyEventArgs.QueryID">
-            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,System.UInt32)"/></summary>
+        <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="P:OpenMetaverse.DirEventsReplyEventArgs.MatchedEvents">
-            <summary>A list of "Events" returned by the data server</summary>
-        </member>
-        <member name="T:OpenMetaverse.PlacesReplyEventArgs">
-            <summary>Contains the "Event" list data returned from the data server</summary>
-        </member>
-        <member name="M:OpenMetaverse.PlacesReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.PlacesSearchData})">
-            <summary>Construct a new instance of PlacesReplyEventArgs class</summary>
-            <param name="queryID">The ID of the query returned by the data server. 
-            This will correlate to the ID returned by the <see cref="!:StartPlacesSearch"/> method</param>
-            <param name="matchedPlaces">A list containing the "Places" returned by the data server query</param>
-        </member>
-        <member name="P:OpenMetaverse.PlacesReplyEventArgs.QueryID">
-            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartPlacesSearch"/></summary>
-        </member>
-        <member name="P:OpenMetaverse.PlacesReplyEventArgs.MatchedPlaces">
-            <summary>A list of "Places" returned by the data server</summary>
-        </member>
-        <member name="T:OpenMetaverse.DirPlacesReplyEventArgs">
-            <summary>Contains the places data returned from the data server</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirPlacesReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.DirectoryParcel})">
-            <summary>Construct a new instance of the DirPlacesReplyEventArgs class</summary>
-            <param name="queryID">The ID of the query returned by the data server. 
-            This will correlate to the ID returned by the <see cref="!:StartDirPlacesSearch"/> method</param>
-            <param name="matchedParcels">A list containing land data returned by the data server</param>
-        </member>
-        <member name="P:OpenMetaverse.DirPlacesReplyEventArgs.QueryID">
-            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,System.Int32)"/></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberAddedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="P:OpenMetaverse.DirPlacesReplyEventArgs.MatchedParcels">
-            <summary>A list containing Places data returned by the data server</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberLeft">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.DirClassifiedsReplyEventArgs">
-            <summary>Contains the classified data returned from the data server</summary>
+        <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="M:OpenMetaverse.DirClassifiedsReplyEventArgs.#ctor(System.Collections.Generic.List{OpenMetaverse.DirectoryManager.Classified})">
-            <summary>Construct a new instance of the DirClassifiedsReplyEventArgs class</summary>
-            <param name="classifieds">A list of classified ad data returned from the data server</param>
+        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberLeftLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="P:OpenMetaverse.DirClassifiedsReplyEventArgs.Classifieds">
-            <summary>A list containing Classified Ads returned by the data server</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_SetDisplayNameReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.DirGroupsReplyEventArgs">
-            <summary>Contains the group data returned from the data server</summary>
+        <member name="M:OpenMetaverse.AgentManager.OnSetDisplayNameReply(OpenMetaverse.SetDisplayNameReplyEventArgs)">
+            <summary>Raises the SetDisplayNameReply Event</summary>
+             <param name="e">A SetDisplayNameReplyEventArgs object containing
+             the data sent from the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.DirGroupsReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.GroupSearchData})">
-            <summary>Construct a new instance of the DirGroupsReplyEventArgs class</summary>
-            <param name="queryID">The ID of the query returned by the data server. 
-            This will correlate to the ID returned by the <see cref="!:StartGroupSearch"/> method</param>
-            <param name="matchedGroups">A list of groups data returned by the data server</param>
+        <member name="F:OpenMetaverse.AgentManager.m_SetDisplayNameReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="P:OpenMetaverse.DirGroupsReplyEventArgs.QueryID">
-            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32)"/></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_MuteListUpdated">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="P:OpenMetaverse.DirGroupsReplyEventArgs.MatchedGroups">
-            <summary>A list containing Groups data returned by the data server</summary>
+        <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="T:OpenMetaverse.DirPeopleReplyEventArgs">
-            <summary>Contains the people data returned from the data server</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_MuteListUpdatedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.DirPeopleReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.AgentSearchData})">
-            <summary>Construct a new instance of the DirPeopleReplyEventArgs class</summary>
-            <param name="queryID">The ID of the query returned by the data server. 
-            This will correlate to the ID returned by the <see cref="!:StartPeopleSearch"/> method</param>
-            <param name="matchedPeople">A list of people data returned by the data server</param>
+        <member name="F:OpenMetaverse.AgentManager.Client">
+            <summary>Reference to the GridClient instance</summary>
         </member>
-        <member name="P:OpenMetaverse.DirPeopleReplyEventArgs.QueryID">
-            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartPeopleSearch(System.String,System.Int32)"/></summary>
+        <member name="F:OpenMetaverse.AgentManager.Movement">
+            <summary>Used for movement and camera tracking</summary>
         </member>
-        <member name="P:OpenMetaverse.DirPeopleReplyEventArgs.MatchedPeople">
-            <summary>A list containing People data returned by the data server</summary>
+        <member name="F:OpenMetaverse.AgentManager.SignaledAnimations">
+            <summary>Currently playing animations for the agent. Can be used to
+            check the current movement status such as walking, hovering, aiming,
+            etc. by checking against system animations found in the Animations class</summary>
         </member>
-        <member name="T:OpenMetaverse.DirLandReplyEventArgs">
-            <summary>Contains the land sales data returned from the data server</summary>
+        <member name="F:OpenMetaverse.AgentManager.GroupChatSessions">
+            <summary>Dictionary containing current Group Chat sessions and members</summary>
         </member>
-        <member name="M:OpenMetaverse.DirLandReplyEventArgs.#ctor(System.Collections.Generic.List{OpenMetaverse.DirectoryManager.DirectoryParcel})">
-            <summary>Construct a new instance of the DirLandReplyEventArgs class</summary>
-            <param name="dirParcels">A list of parcels for sale returned by the data server</param>
+        <member name="F:OpenMetaverse.AgentManager.MuteList">
+            <summary>Dictionary containing mute list keyead on mute name and key</summary>
         </member>
-        <member name="P:OpenMetaverse.DirLandReplyEventArgs.DirParcels">
-            <summary>A list containing land forsale data returned by the data server</summary>
+        <member name="F:OpenMetaverse.AgentManager.AgentStateStatus">
+            <summary>Various abilities and preferences sent by the grid</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.TeleportFinishMessage">
+        <member name="M:OpenMetaverse.AgentManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            Sent to the client to indicate a teleport request has completed
+            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="T:OpenMetaverse.Interfaces.IMessage">
+        <member name="M:OpenMetaverse.AgentManager.Chat(System.String,System.Int32,OpenMetaverse.ChatType)">
             <summary>
-            Interface requirements for Messaging system
+            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="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>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.AgentID">
-            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the agent</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.LocationID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.RegionHandle">
-            <summary>The simulators handle the agent teleported to</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.SeedCapability">
-            <summary>A Uri which contains a list of Capabilities the simulator supports</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.SimAccess">
-            <summary>Indicates the level of access required
-            to access the simulator, or the content rating, or the simulators 
-            map status</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.IP">
-            <summary>The IP Address of the simulator</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Port">
-            <summary>The UDP Port the simulator will listen for UDP traffic on</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Flags">
-            <summary>Status flags indicating the state of the Agent upon arrival, Flying, etc.</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Serialize">
+        <member name="M:OpenMetaverse.AgentManager.RetrieveInstantMessages">
             <summary>
-            Serialize the object
+            Request any instant messages sent while the client was offline to be resent.
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AgentManager.InstantMessage(OpenMetaverse.UUID,System.String)">
             <summary>
-            Deserialize the message
+            Send an Instant Message to another Avatar
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</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="T:OpenMetaverse.Messages.Linden.EstablishAgentCommunicationMessage">
+        <member name="M:OpenMetaverse.AgentManager.InstantMessage(OpenMetaverse.UUID,System.String,OpenMetaverse.UUID)">
             <summary>
-            Sent to the viewer when a neighboring simulator is requesting the agent make a connection to it.
+            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="imSessionID">IM session ID (to differentiate between IM windows)</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EstablishAgentCommunicationMessage.Serialize">
+        <member name="M:OpenMetaverse.AgentManager.InstantMessage(System.String,OpenMetaverse.UUID,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID[])">
             <summary>
-            Serialize the object
+            Send an Instant Message
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="fromName">The name this IM will show up as being from</param>
+            <param name="target">Key of Avatar</param>
+            <param name="message">Text message being sent</param>
+            <param name="imSessionID">IM session ID (to differentiate between IM windows)</param>
+            <param name="conferenceIDs">IDs of sessions for a conference</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EstablishAgentCommunicationMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AgentManager.InstantMessage(System.String,OpenMetaverse.UUID,System.String,OpenMetaverse.UUID,OpenMetaverse.InstantMessageDialog,OpenMetaverse.InstantMessageOnline,OpenMetaverse.Vector3,OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            Deserialize the message
+            Send an Instant Message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <param name="fromName">The name this IM will show up as being from</param>
+            <param name="target">Key of Avatar</param>
+            <param name="message">Text message being sent</param>
+            <param name="imSessionID">IM session ID (to differentiate between IM windows)</param>
+            <param name="dialog">Type of instant message to send</param>
+            <param name="offline">Whether to IM offline avatars as well</param>
+            <param name="position">Senders Position</param>
+            <param name="regionID">RegionID Sender is In</param>
+            <param name="binaryBucket">Packed binary data that is specific to
+            the dialog type</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.CrossedRegionMessage.Serialize">
+        <member name="M:OpenMetaverse.AgentManager.InstantMessageGroup(OpenMetaverse.UUID,System.String)">
             <summary>
-            Serialize the object
+            Send an Instant Message to a group
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <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.Messages.Linden.CrossedRegionMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AgentManager.InstantMessageGroup(System.String,OpenMetaverse.UUID,System.String)">
             <summary>
-            Deserialize the message
+            Send an Instant Message to a group the agent is a member of
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <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="message">Text message being sent</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EnableSimulatorMessage.Serialize">
+        <member name="M:OpenMetaverse.AgentManager.RequestJoinGroupChat(OpenMetaverse.UUID)">
             <summary>
-            Serialize the object
+            Send a request to join a group chat session
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="groupID"><seealso cref="T:OpenMetaverse.UUID"/> of Group to leave</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EnableSimulatorMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AgentManager.RequestLeaveGroupChat(OpenMetaverse.UUID)">
             <summary>
-            Deserialize the message
+            Exit a group chat session. This will stop further Group chat messages
+            from being sent until session is rejoined.
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <param name="groupID"><seealso cref="T:OpenMetaverse.UUID"/> of Group chat session to leave</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.TeleportFailedMessage">
+        <member name="M:OpenMetaverse.AgentManager.ReplyToScriptDialog(System.Int32,System.Int32,System.String,OpenMetaverse.UUID)">
             <summary>
-            A message sent to the client which indicates a teleport request has failed
-            and contains some information on why it failed
+            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)"/>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.ExtraParams">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.MessageKey">
-            <summary>A string key of the reason the teleport failed e.g. CouldntTPCloser
-            Which could be used to look up a value in a dictionary or enum</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.AgentID">
-            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the Agent</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.Reason">
-            <summary>A string human readable message containing the reason </summary>
-            <remarks>An example: Could not teleport closer to destination</remarks>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.TeleportFailedMessage.Serialize">
+        <member name="M:OpenMetaverse.AgentManager.ChatterBoxAcceptInvite(OpenMetaverse.UUID)">
             <summary>
-            Serialize the object
+            Accept invite for to a chatterbox session
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="session_id"><seealso cref="T:OpenMetaverse.UUID"/> of session to accept invite to</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.TeleportFailedMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AgentManager.StartIMConference(System.Collections.Generic.List{OpenMetaverse.UUID},OpenMetaverse.UUID)">
             <summary>
-            Deserialize the message
+            Start a friends conference
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</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.Messages.Linden.LandStatReplyMessage.Serialize">
+        <member name="M:OpenMetaverse.AgentManager.PointAtEffect(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Vector3d,OpenMetaverse.PointAtType,OpenMetaverse.UUID)">
             <summary>
-            Serialize the object
+            Start a particle stream between an agent and an object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <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.Messages.Linden.LandStatReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AgentManager.LookAtEffect(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Vector3d,OpenMetaverse.LookAtType,OpenMetaverse.UUID)">
             <summary>
-            Deserialize the message
+            Start a particle stream between an agent and an object
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</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="T:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage">
+        <member name="M:OpenMetaverse.AgentManager.BeamEffect(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Vector3d,OpenMetaverse.Color4,System.Single,OpenMetaverse.UUID)">
             <summary>
-            Contains a list of prim owner information for a specific parcel in a simulator
+            Create a particle beam between an avatar and an primitive 
             </summary>
-            <remarks>
-            A Simulator will always return at least 1 entry
-            If agent does not have proper permission the OwnerID will be UUID.Zero
-            If agent does not have proper permission OR there are no primitives on parcel
-            the DataBlocksExtended map will not be sent from the simulator
-            </remarks>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwnersBlock">
-            <summary>An Array of <see cref="T:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner"/> objects</summary>
+            <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 
+            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"/>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.Serialize">
+        <member name="M:OpenMetaverse.AgentManager.SphereEffect(OpenMetaverse.Vector3d,OpenMetaverse.Color4,System.Single,OpenMetaverse.UUID)">
             <summary>
-            Serialize the object
+            Create a particle swirl around a target position using a <seealso cref="T:OpenMetaverse.Packets.ViewerEffectPacket"/> packet
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="globalOffset">global offset</param>
+            <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>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AgentManager.RequestSit(OpenMetaverse.UUID,OpenMetaverse.Vector3)">
             <summary>
-            Deserialize the message
+            Sends a request to sit on the specified object
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</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="T:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner">
+        <member name="M:OpenMetaverse.AgentManager.Sit">
             <summary>
-            Prim ownership information for a specified owner on a single parcel
+            Follows a call to <seealso cref="M:OpenMetaverse.AgentManager.RequestSit(OpenMetaverse.UUID,OpenMetaverse.Vector3)"/> to actually sit on the object
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.OwnerID">
-            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the prim owner, 
-            UUID.Zero if agent has no permission to view prim owner information</summary>
+        <member name="M:OpenMetaverse.AgentManager.Stand">
+            <summary>Stands up from sitting on a prim or the ground</summary>
+            <returns>true of AgentUpdate was sent</returns>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.Count">
-            <summary>The total number of prims</summary>
+        <member name="M:OpenMetaverse.AgentManager.SitOnGround">
+            <summary>
+            Does a "ground sit" at the avatar's current position
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.IsGroupOwned">
-            <summary>True if the OwnerID is a <see cref="T:OpenMetaverse.Group"/></summary>
+        <member name="M:OpenMetaverse.AgentManager.Fly(System.Boolean)">
+            <summary>
+            Starts or stops flying
+            </summary>
+            <param name="start">True to start flying, false to stop flying</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.OnlineStatus">
-            <summary>True if the owner is online 
-            <remarks>This is no longer used by the LL Simulators</remarks></summary>
+        <member name="M:OpenMetaverse.AgentManager.Crouch(System.Boolean)">
+            <summary>
+            Starts or stops crouching
+            </summary>
+            <param name="crouching">True to start crouching, false to stop crouching</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.TimeStamp">
-            <summary>The date the most recent prim was rezzed</summary>
+        <member name="M:OpenMetaverse.AgentManager.Jump(System.Boolean)">
+            <summary>
+            Starts a jump (begin holding the jump key)
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage">
+        <member name="M:OpenMetaverse.AgentManager.AutoPilot(System.Double,System.Double,System.Double)">
             <summary>
-            The details of a single parcel in a region, also contains some regionwide globals
+            Use the autopilot sim function to move the avatar to a new
+            position. Uses double precision to get precise movements
             </summary>
+            <remarks>The z value is currently not handled properly by the simulator</remarks>
+            <param name="globalX">Global X coordinate to move to</param>
+            <param name="globalY">Global Y coordinate to move to</param>
+            <param name="z">Z coordinate to move to</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.LocalID">
-            <summary>Simulator-local ID of this parcel</summary>
+        <member name="M:OpenMetaverse.AgentManager.AutoPilot(System.UInt64,System.UInt64,System.Single)">
+            <summary>
+            Use the autopilot sim function to move the avatar to a new position
+            </summary>
+            <remarks>The z value is currently not handled properly by the simulator</remarks>
+            <param name="globalX">Integer value for the global X coordinate to move to</param>
+            <param name="globalY">Integer value for the global Y coordinate to move to</param>
+            <param name="z">Floating-point value for the Z coordinate to move to</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AABBMax">
-            <summary>Maximum corner of the axis-aligned bounding box for this
-            parcel</summary>
+        <member name="M:OpenMetaverse.AgentManager.AutoPilotLocal(System.Int32,System.Int32,System.Single)">
+            <summary>
+            Use the autopilot sim function to move the avatar to a new position
+            </summary>
+            <remarks>The z value is currently not handled properly by the simulator</remarks>
+            <param name="localX">Integer value for the local X coordinate to move to</param>
+            <param name="localY">Integer value for the local Y coordinate to move to</param>
+            <param name="z">Floating-point value for the Z coordinate to move to</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AABBMin">
-            <summary>Minimum corner of the axis-aligned bounding box for this
-            parcel</summary>
+        <member name="M:OpenMetaverse.AgentManager.AutoPilotCancel">
+            <summary>Macro to cancel autopilot sim function</summary>
+            <remarks>Not certain if this is how it is really done</remarks>
+            <returns>true if control flags were set and AgentUpdate was sent to the simulator</returns>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Area">
-            <summary>Total parcel land area</summary>
+        <member name="M:OpenMetaverse.AgentManager.Grab(System.UInt32)">
+            <summary>
+            Grabs an object
+            </summary>
+            <param name="objectLocalID">an unsigned integer of the objects ID within the simulator</param>
+            <seealso cref="F:OpenMetaverse.Simulator.ObjectsPrimitives"/>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AuctionID">
-            <summary></summary>
+        <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="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>
+            <param name="position">The region coordinates of the position to grab</param>
+            <param name="normal">The surface normal of the position to grab (A normal is a vector perpindicular to the surface)</param>
+            <param name="binormal">The surface binormal of the position to grab (A binormal is a vector tangen to the surface
+            pointing along the U direction of the tangent space</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AuthBuyerID">
-            <summary>Key of authorized buyer</summary>
+        <member name="M:OpenMetaverse.AgentManager.GrabUpdate(OpenMetaverse.UUID,OpenMetaverse.Vector3)">
+            <summary>
+            Drag an object
+            </summary>
+            <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="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Bitmap">
-            <summary>Bitmap describing land layout in 4x4m squares across the 
-            entire region</summary>
+        <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="grabPosition">Drag target in region coordinates</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>
+            <param name="position">The region coordinates of the position to grab</param>
+            <param name="normal">The surface normal of the position to grab (A normal is a vector perpindicular to the surface)</param>
+            <param name="binormal">The surface binormal of the position to grab (A binormal is a vector tangen to the surface
+            pointing along the U direction of the tangent space</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Category">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AgentManager.DeGrab(System.UInt32)">
+            <summary>
+            Release a grabbed object
+            </summary>
+            <param name="objectLocalID">The Objects Simulator Local ID</param>
+            <seealso cref="F:OpenMetaverse.Simulator.ObjectsPrimitives"/>
+            <seealso cref="M:OpenMetaverse.AgentManager.Grab(System.UInt32)"/>
+            <seealso cref="M:OpenMetaverse.AgentManager.GrabUpdate(OpenMetaverse.UUID,OpenMetaverse.Vector3)"/>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ClaimDate">
-            <summary>Date land was claimed</summary>
+        <member name="M:OpenMetaverse.AgentManager.DeGrab(System.UInt32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,System.Int32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
+            <summary>
+            Release a grabbed object
+            </summary>
+            <param name="objectLocalID">The Objects Simulator Local ID</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>
+            <param name="position">The region coordinates of the position to grab</param>
+            <param name="normal">The surface normal of the position to grab (A normal is a vector perpindicular to the surface)</param>
+            <param name="binormal">The surface binormal of the position to grab (A binormal is a vector tangen to the surface
+            pointing along the U direction of the tangent space</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ClaimPrice">
-            <summary>Appears to always be zero</summary>
+        <member name="M:OpenMetaverse.AgentManager.Touch(System.UInt32)">
+            <summary>
+            Touches an object
+            </summary>
+            <param name="objectLocalID">an unsigned integer of the objects ID within the simulator</param>
+            <seealso cref="F:OpenMetaverse.Simulator.ObjectsPrimitives"/>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Desc">
-            <summary>Parcel Description</summary>
+        <member name="M:OpenMetaverse.AgentManager.RequestBalance">
+            <summary>
+            Request the current L$ balance
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ParcelFlags">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AgentManager.GiveAvatarMoney(OpenMetaverse.UUID,System.Int32)">
+            <summary>
+            Give Money to destination Avatar
+            </summary>
+            <param name="target">UUID of the Target Avatar</param>
+            <param name="amount">Amount in L$</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.GroupID">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AgentManager.GiveAvatarMoney(OpenMetaverse.UUID,System.Int32,System.String)">
+            <summary>
+            Give Money to destination Avatar
+            </summary>
+            <param name="target">UUID of the Target Avatar</param>
+            <param name="amount">Amount in L$</param>
+            <param name="description">Description that will show up in the
+            recipients transaction history</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.GroupPrims">
-            <summary>Total number of primitives owned by the parcel group on 
-            this parcel</summary>
+        <member name="M:OpenMetaverse.AgentManager.GiveObjectMoney(OpenMetaverse.UUID,System.Int32,System.String)">
+            <summary>
+            Give L$ to an object
+            </summary>
+            <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>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.IsGroupOwned">
-            <summary>Whether the land is deeded to a group or not</summary>
+        <member name="M:OpenMetaverse.AgentManager.GiveGroupMoney(OpenMetaverse.UUID,System.Int32)">
+            <summary>
+            Give L$ to a group
+            </summary>
+            <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="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.LandingType">
-            <summary></summary>
+        <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="amount">amount of L$ to give</param>
+            <param name="description">description of transaction</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MaxPrims">
-            <summary>Maximum number of primitives this parcel supports</summary>
+        <member name="M:OpenMetaverse.AgentManager.PayUploadFee">
+            <summary>
+            Pay texture/animation upload fee
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaID">
-            <summary>The Asset UUID of the Texture which when applied to a 
-            primitive will display the media</summary>
+        <member name="M:OpenMetaverse.AgentManager.PayUploadFee(System.String)">
+            <summary>
+            Pay texture/animation upload fee
+            </summary>
+            <param name="description">description of the transaction</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaURL">
-            <summary>A URL which points to any Quicktime supported media type</summary>
+        <member name="M:OpenMetaverse.AgentManager.GiveMoney(OpenMetaverse.UUID,System.Int32,System.String,OpenMetaverse.MoneyTransactionType,OpenMetaverse.TransactionFlags)">
+            <summary>
+            Give Money to destination Object or Avatar
+            </summary>
+            <param name="target">UUID of the Target Object/Avatar</param>
+            <param name="amount">Amount in L$</param>
+            <param name="description">Reason (Optional normally)</param>
+            <param name="type">The type of transaction</param>
+            <param name="flags">Transaction flags, mostly for identifying group
+            transactions</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaAutoScale">
-            <summary>A byte, if 0x1 viewer should auto scale media to fit object</summary>
+        <member name="M:OpenMetaverse.AgentManager.PlayGesture(OpenMetaverse.UUID)">
+            <summary>
+            Plays a gesture
+            </summary>
+            <param name="gestureID">Asset <seealso cref="T:OpenMetaverse.UUID"/> of the gesture</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MusicURL">
-            <summary>URL For Music Stream</summary>
+        <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>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Name">
-            <summary>Parcel Name</summary>
+        <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>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherCleanTime">
-            <summary>Autoreturn value in minutes for others' objects</summary>
+        <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="reliable">Whether to ensure delivery of this packet or not</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherCount">
-            <summary></summary>
+        <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 
+            currently playing animation to stop playing</param>
+            <param name="reliable">Whether to ensure delivery of this packet or not</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherPrims">
-            <summary>Total number of other primitives on this parcel</summary>
+        <member name="M:OpenMetaverse.AgentManager.Animate(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,System.Boolean},System.Boolean)">
+            <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
+            turn that animation on or off</param>
+            <param name="reliable">Whether to ensure delivery of this packet or not</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OwnerID">
-            <summary>UUID of the owner of this parcel</summary>
+        <member name="M:OpenMetaverse.AgentManager.GoHome">
+            <summary>
+            Teleports agent to their stored home location
+            </summary>
+            <returns>true on successful teleport to home location</returns>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OwnerPrims">
-            <summary>Total number of primitives owned by the parcel owner on 
-            this parcel</summary>
+        <member name="M:OpenMetaverse.AgentManager.Teleport(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>
+            <returns>true on success, false on failure</returns>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ParcelPrimBonus">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AgentManager.Teleport(System.String,OpenMetaverse.Vector3)">
+            <summary>
+            Attempt to look up a simulator name and teleport to the discovered
+            destination
+            </summary>
+            <param name="simName">Region name to look up</param>
+            <param name="position">Position to teleport to</param>
+            <returns>True if the lookup and teleport were successful, otherwise
+            false</returns>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PassHours">
-            <summary>How long is pass valid for</summary>
+        <member name="M:OpenMetaverse.AgentManager.Teleport(System.String,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
+            <summary>
+            Attempt to look up a simulator name and teleport to the discovered
+            destination
+            </summary>
+            <param name="simName">Region name to look up</param>
+            <param name="position">Position to teleport to</param>
+            <param name="lookAt">Target to look at</param>
+            <returns>True if the lookup and teleport were successful, otherwise
+            false</returns>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PassPrice">
-            <summary>Price for a temporary pass</summary>
+        <member name="M:OpenMetaverse.AgentManager.Teleport(System.UInt64,OpenMetaverse.Vector3)">
+            <summary>
+            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>
+            <returns>true on success, false on failure</returns>
+            <remarks>This call is blocking</remarks>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PublicCount">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AgentManager.Teleport(System.UInt64,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
+            <summary>
+            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>
+            <returns>true on success, false on failure</returns>
+            <remarks>This call is blocking</remarks>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyAnonymous">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AgentManager.RequestTeleport(System.UInt64,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>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyIdentified">
-            <summary></summary>
+        <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>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyTransacted">
-            <summary></summary>
+        <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>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyAgeUnverified">
-            <summary>True if the region denies access to age unverified users</summary>
+        <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>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionPushOverride">
-            <summary></summary>
+        <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="message">custom message to send with invitation</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RentPrice">
-            <summary>This field is no longer used</summary>
+        <member name="M:OpenMetaverse.AgentManager.TeleportLureRespond(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
+            <summary>
+            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="accept">true to accept the lure, false to decline it</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RequestResult">
-            The result of a request for parcel properties
+        <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 
+            profile information</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SalePrice">
-            <summary>Sale price of the parcel, only useful if ForSale is set</summary>
-            <remarks>The SalePrice will remain the same after an ownership
-            transfer (sale), so it can be used to see the purchase price after
-            a sale if the new owner has not changed it</remarks>
+        <member 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>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SelectedPrims">
+        <member name="M:OpenMetaverse.AgentManager.SetHeightWidth(System.UInt16,System.UInt16)">
             <summary>
-            Number of primitives your avatar is currently
-            selecting and sitting on in this parcel
+            Set the height and the width of the client window. This is used
+            by the server to build a virtual camera frustum for our avatar
             </summary>
+            <param name="height">New height of the viewer window</param>
+            <param name="width">New width of the viewer window</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SelfCount">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AgentManager.RequestMuteList">
+            <summary>
+            Request the list of muted objects and avatars for this agent
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SequenceID">
+        <member name="M:OpenMetaverse.AgentManager.UpdateMuteListEntry(OpenMetaverse.MuteType,OpenMetaverse.UUID,System.String)">
             <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. 
+            Mute an object, resident, etc.
             </summary>
+            <param name="type">Mute type</param>
+            <param name="id">Mute UUID</param>
+            <param name="name">Mute name</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SimWideMaxPrims">
-            <summary>Maximum primitives across the entire simulator</summary>
+        <member name="M:OpenMetaverse.AgentManager.UpdateMuteListEntry(OpenMetaverse.MuteType,OpenMetaverse.UUID,System.String,OpenMetaverse.MuteFlags)">
+            <summary>
+            Mute an object, resident, etc.
+            </summary>
+            <param name="type">Mute type</param>
+            <param name="id">Mute UUID</param>
+            <param name="name">Mute name</param>
+            <param name="flags">Mute flags</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SimWideTotalPrims">
-            <summary>Total primitives across the entire simulator</summary>
+        <member name="M:OpenMetaverse.AgentManager.RemoveMuteListEntry(OpenMetaverse.UUID,System.String)">
+            <summary>
+            Unmute an object, resident, etc.
+            </summary>
+            <param name="id">Mute UUID</param>
+            <param name="name">Mute name</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SnapSelection">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AgentManager.SetHome">
+            <summary>
+            Sets home location to agents current position
+            </summary>
+            <remarks>will fire an AlertMessage (<seealso cref="E:OpenMetaverse.AgentManager.OnAlertMessage"/>) with 
+            success or failure message</remarks>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SnapshotID">
-            <summary>Key of parcel snapshot</summary>
+        <member name="M:OpenMetaverse.AgentManager.CompleteAgentMovement(OpenMetaverse.Simulator)">
+            <summary>
+            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>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Status">
-            <summary>Parcel ownership status</summary>
+        <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>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.TotalPrims">
-            <summary>Total number of primitives on this parcel</summary>
+        <member name="M:OpenMetaverse.AgentManager.GroupInviteRespond(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
+            <summary>
+            Respond to a group invitation by either accepting or denying it
+            </summary>
+            <param name="groupID">UUID of the group (sent in the AgentID field of the invite message)</param>
+            <param name="imSessionID">IM Session ID from the group invitation message</param>
+            <param name="accept">Accept the group invitation or deny it</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.UserLocation">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.UserLookAt">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaDesc">
-            <summary>A description of the media</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaHeight">
-            <summary>An Integer which represents the height of the media</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaWidth">
-            <summary>An integer which represents the width of the media</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaLoop">
-            <summary>A boolean, if true the viewer should loop the media</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaType">
-            <summary>A string which contains the mime type of the media</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ObscureMedia">
-            <summary>true to obscure (hide) media url</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ObscureMusic">
-            <summary>true to obscure (hide) music url</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Serialize">
+        <member name="M:OpenMetaverse.AgentManager.RequestScriptSensor(System.String,OpenMetaverse.UUID,OpenMetaverse.ScriptSensorTypeFlags,System.Single,System.Single,OpenMetaverse.UUID,OpenMetaverse.Simulator)">
             <summary>
-            Serialize the object
+            Requests script detection of objects and avatars
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="name">name of the object/avatar to search for</param>
+            <param name="searchID">UUID of the object or avatar to search for</param>
+            <param name="type">Type of search from ScriptSensorTypeFlags</param>
+            <param name="range">range of scan (96 max?)</param>
+            <param name="arc">the arc in radians to search within</param>
+            <param name="requestID">an user generated ID to correlate replies with</param>
+            <param name="sim">Simulator to perform search in</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AgentManager.PickInfoUpdate(OpenMetaverse.UUID,System.Boolean,OpenMetaverse.UUID,System.String,OpenMetaverse.Vector3d,OpenMetaverse.UUID,System.String)">
             <summary>
-            Deserialize the message
+            Create or update profile pick
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage">
-            <summary>A message sent from the viewer to the simulator to updated a specific parcels settings</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.AuthBuyerID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the agent authorized to purchase this
-            parcel of land or a NULL <seealso cref="T:OpenMetaverse.UUID"/> if the sale is authorized to anyone</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaAutoScale">
-            <summary>true to enable auto scaling of the parcel media</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Category">
-            <summary>The category of this parcel used when search is enabled to restrict
-            search results</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Desc">
-            <summary>A string containing the description to set</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.GroupID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the <seealso cref="T:OpenMetaverse.Group"/> which allows for additional
-            powers and restrictions.</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Landing">
-            <summary>The <seealso cref="T:OpenMetaverse.LandingType"/> which specifies how avatars which teleport
-            to this parcel are handled</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.LocalID">
-            <summary>The LocalID of the parcel to update settings on</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaDesc">
-            <summary>A string containing the description of the media which can be played
-            to visitors</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaHeight">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaLoop">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaType">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaURL">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaWidth">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MusicURL">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Name">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ObscureMedia">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ObscureMusic">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ParcelFlags">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.PassHours">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.PassPrice">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.SalePrice">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.SnapshotID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.UserLocation">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.UserLookAt">
-            <summary></summary>
+            <param name="pickID">UUID of the pick to update, or random UUID to create a new pick</param>
+            <param name="topPick">Is this a top pick? (typically false)</param>
+            <param name="parcelID">UUID of the parcel (UUID.Zero for the current parcel)</param>
+            <param name="name">Name of the pick</param>
+            <param name="globalPosition">Global position of the pick landmark</param>
+            <param name="textureID">UUID of the image displayed with the pick</param>
+            <param name="description">Long description of the pick</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AgentManager.PickDelete(OpenMetaverse.UUID)">
             <summary>
-            Deserialize the message
+            Delete profile pick
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <param name="pickID">UUID of the pick to delete</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Serialize">
+        <member name="M:OpenMetaverse.AgentManager.UpdateClassifiedInfo(OpenMetaverse.UUID,OpenMetaverse.DirectoryManager.ClassifiedCategories,OpenMetaverse.UUID,System.Int32,OpenMetaverse.Vector3d,System.String,System.String,System.Boolean)">
             <summary>
-            Serialize the object
+            Create or update profile Classified
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestBlock">
-            <summary>Base class used for the RemoteParcelRequest message</summary>
+            <param name="classifiedID">UUID of the classified to update, or random UUID to create a new classified</param>
+            <param name="category">Defines what catagory the classified is in</param>
+            <param name="snapshotID">UUID of the image displayed with the classified</param>
+            <param name="price">Price that the classified will cost to place for a week</param>
+            <param name="position">Global position of the classified landmark</param>
+            <param name="name">Name of the classified</param>
+            <param name="desc">Long description of the classified</param>
+            <param name="autoRenew">if true, auto renew classified after expiration</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest">
+        <member name="M:OpenMetaverse.AgentManager.UpdateClassifiedInfo(OpenMetaverse.UUID,OpenMetaverse.DirectoryManager.ClassifiedCategories,OpenMetaverse.UUID,System.Int32,System.String,System.String,System.Boolean)">
             <summary>
-            A message sent from the viewer to the simulator to request information
-            on a remote parcel
+            Create or update profile Classified
             </summary>
+            <param name="classifiedID">UUID of the classified to update, or random UUID to create a new classified</param>
+            <param name="category">Defines what catagory the classified is in</param>
+            <param name="snapshotID">UUID of the image displayed with the classified</param>
+            <param name="price">Price that the classified will cost to place for a week</param>
+            <param name="name">Name of the classified</param>
+            <param name="desc">Long description of the classified</param>
+            <param name="autoRenew">if true, auto renew classified after expiration</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.Location">
-            <summary>Local sim position of the parcel we are looking up</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.RegionHandle">
-            <summary>Region handle of the parcel we are looking up</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.RegionID">
-            <summary>Region <see cref="T:OpenMetaverse.UUID"/> of the parcel we are looking up</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.Serialize">
+        <member name="M:OpenMetaverse.AgentManager.DeleteClassfied(OpenMetaverse.UUID)">
             <summary>
-            Serialize the object
+            Delete a classified ad
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="classifiedID">The classified ads ID</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AgentManager.GetAttachmentResources(OpenMetaverse.AgentManager.AttachmentResourcesCallback)">
             <summary>
-            Deserialize the message
+            Fetches resource usage by agents attachmetns
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <param name="callback">Called when the requested information is collected</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply">
+        <member name="M:OpenMetaverse.AgentManager.SetDisplayName(System.String,System.String)">
             <summary>
-            A message sent from the simulator to the viewer in response to a <see cref="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest"/> 
-            which will contain parcel information
+            Initates request to set a new display name
             </summary>
+            <param name="oldName">Previous display name</param>
+            <param name="newName">Desired new display name</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply.ParcelID">
-            <summary>The grid-wide unique parcel ID</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply.Serialize">
+        <member name="M:OpenMetaverse.AgentManager.UpdateAgentLanguage(System.String,System.Boolean)">
             <summary>
-            Serialize the object
+            Tells the sim what UI language is used, and if it's ok to share that with scripts
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="language">Two letter language code</param>
+            <param name="isPublic">Share language info with scripts</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AgentManager.InstantMessageHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            Deserialize the message
+            Take an incoming ImprovedInstantMessage packet, auto-parse, and if
+            OnInstantMessage is defined call that with the appropriate arguments
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage">
+        <member name="M:OpenMetaverse.AgentManager.ChatHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            A message containing a request for a remote parcel from a viewer, or a response
-            from the simulator to that request
+            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>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage.Request">
-            <summary>The request or response details block</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage.Serialize">
+        <member name="M:OpenMetaverse.AgentManager.ScriptDialogHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            Serialize the object
+            Used for parsing llDialogs
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AgentManager.ScriptQuestionHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            Deserialize the message
+            Used for parsing llRequestPermissions dialogs
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryMessage.Serialize">
+        <member name="M:OpenMetaverse.AgentManager.ScriptControlChangeHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            Serialize the object
+            Handles Script Control changes when Script with permissions releases or takes a control
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AgentManager.LoadURLHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            Deserialize the message
+            Used for parsing llLoadURL Dialogs
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryVariablePriceMessage.Serialize">
+        <member name="M:OpenMetaverse.AgentManager.MovementCompleteHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            Serialize the object
+            Update client's Position, LookAt and region handle from incoming packet
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>This occurs when after an avatar moves into a new sim</remarks>
         </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>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage">
-            <summary>
-            A message sent from the simulator to an agent which contains
-            the groups the agent is in
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.AgentID">
-            <summary>The Agent receiving the message</summary>
+        <member name="M:OpenMetaverse.AgentManager.HealthHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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.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 name="M:OpenMetaverse.AgentManager.AgentDataUpdateHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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.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 name="M:OpenMetaverse.AgentManager.MoneyBalanceReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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.Messages.Linden.AgentGroupDataUpdateMessage.Serialize">
+        <member name="M:OpenMetaverse.AgentManager.SetDisplayNameReplyEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Serialize the object
+            EQ Message fired with the result of SetDisplayName request
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="capsKey">The message key</param>
+            <param name="message">the IMessage object containing the deserialized data sent from the simulator</param>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> which originated the packet</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AgentManager.TeleportFailedEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Deserialize the message
+            Process TeleportFailed message sent via EventQueue, informs agent its last teleport has failed and why.
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData">
-            <summary>Group Details specific to the agent</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.AcceptNotices">
-            <summary>true of the agent accepts group notices</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.Contribution">
-            <summary>The agents tier contribution to the group</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupID">
-            <summary>The Groups <seealso cref="T:OpenMetaverse.UUID"/></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupInsigniaID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the groups insignia</summary>
+            <param name="messageKey">The Message Key</param>
+            <param name="message">An IMessage object Deserialized from the recieved message event</param>
+            <param name="simulator">The simulator originating the event message</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupName">
-            <summary>The name of the group</summary>
+        <member name="M:OpenMetaverse.AgentManager.TeleportFinishEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
+            <summary>
+            Process TeleportFinish from Event Queue and pass it onto our TeleportHandler
+            </summary>
+            <param name="capsKey">The message system key for this event</param>
+            <param name="message">IMessage object containing decoded data from OSD</param>
+            <param name="simulator">The simulator originating the event message</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupPowers">
-            <summary>The aggregate permissions the agent has in the group for all roles the agent
-            is assigned</summary>
+        <member name="M:OpenMetaverse.AgentManager.TeleportHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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.Messages.Linden.AgentGroupDataUpdateMessage.NewGroupData">
-            <summary>An optional block containing additional agent specific information</summary>
+        <member name="M:OpenMetaverse.AgentManager.AvatarAnimationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.NewGroupData.ListInProfile">
-            <summary>true of the agent allows this group to be
-            listed in their profile</summary>
+        <member name="M:OpenMetaverse.AgentManager.MeanCollisionAlertHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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.Messages.Linden.UpdateAgentLanguageMessage">
+        <member name="M:OpenMetaverse.AgentManager.CrossedRegionEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            A message sent from the viewer to the simulator which 
-            specifies the language and permissions for others to detect
-            the language specified
+            Crossed region handler for message that comes across the EventQueue. Sent to an agent
+            when the agent crosses a sim border into a new region.
             </summary>
+            <param name="capsKey">The message key</param>
+            <param name="message">the IMessage object containing the deserialized data sent from the simulator</param>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> which originated the packet</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.Language">
-            <summary>A string containng the default language 
-            to use for the agent</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.LanguagePublic">
-            <summary>true of others are allowed to
-            know the language setting</summary>
+        <member name="M:OpenMetaverse.AgentManager.CrossedRegionHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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>This packet is now being sent via the EventQueue</remarks>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.Serialize">
+        <member name="M:OpenMetaverse.AgentManager.ChatterBoxSessionEventReplyEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Serialize the object
+            Group Chat event handler
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="capsKey">The capability Key</param>
+            <param name="message">IMessage object containing decoded data from OSD</param>
+            <param name="simulator"></param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AgentManager.ChatterBoxSessionStartReplyEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Deserialize the message
+            Response from request to join a group chat
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <param name="capsKey"></param>
+            <param name="message">IMessage object containing decoded data from OSD</param>
+            <param name="simulator"></param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.AgentDropGroupMessage">
+        <member name="M:OpenMetaverse.AgentManager.ChatterBoxSessionAgentListUpdatesEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            An EventQueue message sent from the simulator to an agent when the agent
-            leaves a group
+            Someone joined or left group chat
             </summary>
+            <param name="capsKey"></param>
+            <param name="message">IMessage object containing decoded data from OSD</param>
+            <param name="simulator"></param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentDataBlock">
+        <member name="M:OpenMetaverse.AgentManager.ChatterBoxInvitationEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            An Array containing the AgentID and GroupID
+            Handle a group chat Invitation
             </summary>
+            <param name="capsKey">Caps Key</param>
+            <param name="message">IMessage object containing decoded data from OSD</param>
+            <param name="simulator">Originating Simulator</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.Serialize">
+        <member name="M:OpenMetaverse.AgentManager.ModerateChatSessions(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.Boolean)">
             <summary>
-            Serialize the object
+            Moderate a chat session
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <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>
-        <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>
+        <member name="M:OpenMetaverse.AgentManager.AlertMessageHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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.Messages.Linden.AgentDropGroupMessage.AgentData">
-            <summary>An object containing the Agents UUID, and the Groups UUID</summary>
+        <member name="M:OpenMetaverse.AgentManager.CameraConstraintHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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.Messages.Linden.AgentDropGroupMessage.AgentData.AgentID">
-            <summary>The ID of the Agent leaving the group</summary>
+        <member name="M:OpenMetaverse.AgentManager.ScriptSensorReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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.Messages.Linden.AgentDropGroupMessage.AgentData.GroupID">
-            <summary>The GroupID the Agent is leaving</summary>
+        <member name="M:OpenMetaverse.AgentManager.AvatarSitResponseHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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.Messages.Linden.AssetUploaderBlock">
-            <summary>Base class for Asset uploads/results via Capabilities</summary>
+        <member name="E:OpenMetaverse.AgentManager.ChatFromSimulator">
+            <summary>Raised when a scripted object or agent within range sends a public message</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AssetUploaderBlock.State">
-            <summary>
-            The request state
-            </summary>
+        <member name="E:OpenMetaverse.AgentManager.ScriptDialog">
+            <summary>Raised when a scripted object sends a dialog box containing possible
+            options an agent can respond to</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AssetUploaderBlock.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="E:OpenMetaverse.AgentManager.ScriptQuestion">
+            <summary>Raised when an object requests a change in the permissions an agent has permitted</summary>
         </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>
+        <member name="E:OpenMetaverse.AgentManager.LoadURL">
+            <summary>Raised when a script requests an agent open the specified URL</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestUpload">
-            <summary>
-            A message sent from the viewer to the simulator to request a temporary upload capability
-            which allows an asset to be uploaded
-            </summary>
+        <member name="E:OpenMetaverse.AgentManager.MoneyBalance">
+            <summary>Raised when an agents currency balance is updated</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestUpload.Url">
-            <summary>The Capability URL sent by the simulator to upload the baked texture to</summary>
+        <member name="E:OpenMetaverse.AgentManager.MoneyBalanceReply">
+            <summary>Raised when a transaction occurs involving currency such as a land purchase</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestComplete">
-            <summary>
-            A message sent from the simulator that will inform the agent the upload is complete, 
-            and the UUID of the uploaded asset
-            </summary>
+        <member name="E:OpenMetaverse.AgentManager.IM">
+            <summary>Raised when an ImprovedInstantMessage packet is recieved from the simulator, this is used for everything from
+            private messaging to friendship offers. The Dialog field defines what type of message has arrived</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestComplete.AssetID">
-            <summary>The uploaded texture asset ID</summary>
+        <member name="E:OpenMetaverse.AgentManager.TeleportProgress">
+            <summary>Raised when an agent has requested a teleport to another location, or when responding to a lure. Raised multiple times
+            for each teleport indicating the progress of the request</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage">
-            <summary>
-            A message sent from the viewer to the simulator to request a temporary
-            capability URI which is used to upload an agents baked appearance textures
-            </summary>
+        <member name="E:OpenMetaverse.AgentManager.AgentDataReply">
+            <summary>Raised when a simulator sends agent specific information for our avatar.</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage.Request">
-            <summary>Object containing request or response</summary>
+        <member name="E:OpenMetaverse.AgentManager.AnimationsChanged">
+            <summary>Raised when our agents animation playlist changes</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="E:OpenMetaverse.AgentManager.MeanCollision">
+            <summary>Raised when an object or avatar forcefully collides with our agent</summary>
         </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>
+        <member name="E:OpenMetaverse.AgentManager.RegionCrossed">
+            <summary>Raised when our agent crosses a region border into another region</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage">
-            <summary>
-            A message sent from the simulator which indicates the minimum version required for 
-            using voice chat
-            </summary>
+        <member name="E:OpenMetaverse.AgentManager.GroupChatJoined">
+            <summary>Raised when our agent succeeds or fails to join a group chat session</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.MajorVersion">
-            <summary>Major Version Required</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.MinorVersion">
-            <summary>Minor version required</summary>
+        <member name="E:OpenMetaverse.AgentManager.AlertMessage">
+            <summary>Raised when a simulator sends an urgent message usually indication the recent failure of
+            another action we have attempted to take such as an attempt to enter a parcel where we are denied access</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.RegionName">
-            <summary>The name of the region sending the version requrements</summary>
+        <member name="E:OpenMetaverse.AgentManager.ScriptControlChange">
+            <summary>Raised when a script attempts to take or release specified controls for our agent</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <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="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>
+        <member name="E:OpenMetaverse.AgentManager.ScriptSensorReply">
+            <summary>Raised when a script sensor reply is received from a simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage">
-            <summary>
-            A message sent from the simulator to the viewer containing the 
-            voice server URI
-            </summary>
+        <member name="E:OpenMetaverse.AgentManager.AvatarSitResponse">
+            <summary>Raised in response to a <see cref="M:OpenMetaverse.AgentManager.RequestSit(OpenMetaverse.UUID,OpenMetaverse.Vector3)"/> request</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.ParcelID">
-            <summary>The Parcel ID which the voice server URI applies</summary>
+        <member name="E:OpenMetaverse.AgentManager.ChatSessionMemberAdded">
+            <summary>Raised when an avatar enters a group chat session we are participating in</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.RegionName">
-            <summary>The name of the region</summary>
+        <member name="E:OpenMetaverse.AgentManager.ChatSessionMemberLeft">
+            <summary>Raised when an agent exits a group chat session we are participating in</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.SipChannelUri">
-            <summary>A uri containing the server/channel information
-            which the viewer can utilize to participate in voice conversations</summary>
+        <member name="E:OpenMetaverse.AgentManager.SetDisplayNameReply">
+            <summary>Raised when the simulator sends us data containing
+            the details of display name change</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="E:OpenMetaverse.AgentManager.MuteListUpdated">
+            <summary>Raised when a scripted object or agent within range sends a public message</summary>
         </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>
+        <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="T:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage">
-            <summary>
-            
-            </summary>
+        <member name="P:OpenMetaverse.AgentManager.SessionID">
+            <summary>Temporary <seealso cref="T:OpenMetaverse.UUID"/> assigned to this session, used for 
+            verifying our identity in packets</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Password">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentManager.SecureSessionID">
+            <summary>Shared secret <seealso cref="T:OpenMetaverse.UUID"/> that is never sent over the wire</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Username">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentManager.LocalID">
+            <summary>Your (client) avatar ID, local to the current region/sim</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>
+        <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="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>
+        <member name="P:OpenMetaverse.AgentManager.AgentAccess">
+            <summary>The access level of this agent, usually M or PG</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage">
-            <summary>
-            A message sent by the viewer to the simulator to request a temporary
-            capability for a script contained with in a Tasks inventory to be updated
-            </summary>
+        <member name="P:OpenMetaverse.AgentManager.CollisionPlane">
+            <summary>The CollisionPlane of Agent</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage.Request">
-            <summary>Object containing request or response</summary>
+        <member name="P:OpenMetaverse.AgentManager.Velocity">
+            <summary>An <seealso cref="T:OpenMetaverse.Vector3"/> representing the velocity of our agent</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="P:OpenMetaverse.AgentManager.Acceleration">
+            <summary>An <seealso cref="T:OpenMetaverse.Vector3"/> representing the acceleration of our agent</summary>
         </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>
+        <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="T:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage">
-            <summary>
-            A message sent from the simulator to the viewer to indicate
-            a Tasks scripts status.
-            </summary>
+        <member name="P:OpenMetaverse.AgentManager.HomePosition">
+            <summary>Position avatar client will goto when login to 'home' or during
+            teleport request to 'home' region.</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.ItemID">
-            <summary>The Asset ID of the script</summary>
+        <member name="P:OpenMetaverse.AgentManager.HomeLookAt">
+            <summary>LookAt point saved/restored with HomePosition</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Mono">
-            <summary>True of the script is compiled/ran using the mono interpreter, false indicates it 
-            uses the older less efficient lsl2 interprter</summary>
+        <member name="P:OpenMetaverse.AgentManager.FirstName">
+            <summary>Avatar First Name (i.e. Philip)</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.ObjectID">
-            <summary>The Task containing the scripts <seealso cref="T:OpenMetaverse.UUID"/></summary>
+        <member name="P:OpenMetaverse.AgentManager.LastName">
+            <summary>Avatar Last Name (i.e. Linden)</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Running">
-            <summary>true of the script is in a running state</summary>
+        <member name="P:OpenMetaverse.AgentManager.Name">
+            <summary>Avatar Full Name (i.e. Philip Linden)</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="P:OpenMetaverse.AgentManager.Health">
+            <summary>Gets the health of the agent</summary>
         </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>
+        <member name="P:OpenMetaverse.AgentManager.Balance">
+            <summary>Gets the current balance of the agent</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage">
-            <summary>
-            A message containing the request/response used for updating a gesture
-            contained with an agents inventory
-            </summary>
+        <member name="P:OpenMetaverse.AgentManager.SittingOn">
+            <summary>Gets the local ID of the prim the agent is sitting on,
+            zero if the avatar is not currently sitting</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage.Request">
-            <summary>Object containing request or response</summary>
+        <member name="P:OpenMetaverse.AgentManager.ActiveGroup">
+            <summary>Gets the <seealso cref="T:OpenMetaverse.UUID"/> of the agents active group.</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="P:OpenMetaverse.AgentManager.ActiveGroupPowers">
+            <summary>Gets the Agents powers in the currently active group</summary>
         </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>
+        <member name="P:OpenMetaverse.AgentManager.TeleportMessage">
+            <summary>Current status message for teleporting</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage">
-            <summary>
-            A message request/response which is used to update a notecard contained within
-            a tasks inventory
-            </summary>
+        <member name="P:OpenMetaverse.AgentManager.RelativePosition">
+            <summary>Current position of the agent as a relative offset from
+            the simulator, or the parent object if we are sitting on something</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.TaskID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the Task containing the notecard asset to update</summary>
+        <member name="P:OpenMetaverse.AgentManager.RelativeRotation">
+            <summary>Current rotation of the agent as a relative rotation from
+            the simulator, or the parent object if we are sitting on something</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.ItemID">
-            <summary>The notecard assets <seealso cref="T:OpenMetaverse.UUID"/> contained in the tasks inventory</summary>
+        <member name="P:OpenMetaverse.AgentManager.SimPosition">
+            <summary>Current position of the agent in the simulator</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.Serialize">
+        <member name="P:OpenMetaverse.AgentManager.SimRotation">
             <summary>
-            Serialize the object
+            A <seealso cref="T:OpenMetaverse.Quaternion"/> representing the agents current rotation
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="P:OpenMetaverse.AgentManager.GlobalPosition">
+            <summary>Returns the global grid position of the avatar</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage">
+        <member name="T:OpenMetaverse.AgentManager.ControlFlags">
             <summary>
-            A reusable class containing a message sent from the viewer to the simulator to request a temporary uploader capability
-            which is used to update an asset in an agents inventory
+            Used to specify movement actions for your agent
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage.ItemID">
-            <summary>
-            The Notecard AssetID to replace
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.NONE">
+            <summary>Empty flag</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_AT_POS">
+            <summary>Move Forward (SL Keybinding: W/Up Arrow)</summary>
         </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>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG">
+            <summary>Move Backward (SL Keybinding: S/Down Arrow)</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage">
-            <summary>
-            A message containing the request/response used for updating a notecard
-            contained with an agents inventory
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS">
+            <summary>Move Left (SL Keybinding: Shift-(A/Left Arrow))</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage.Request">
-            <summary>Object containing request or response</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG">
+            <summary>Move Right (SL Keybinding: Shift-(D/Right Arrow))</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_UP_POS">
+            <summary>Not Flying: Jump/Flying: Move Up (SL Keybinding: E)</summary>
         </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>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG">
+            <summary>Not Flying: Croutch/Flying: Move Down (SL Keybinding: C)</summary>
         </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>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_PITCH_POS">
+            <summary>Unused</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.CopyInventoryFromNotecardMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_PITCH_NEG">
+            <summary>Unused</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UploaderScriptRequestError">
-            <summary>
-            A message sent from the simulator to the viewer which indicates
-            an error occurred while attempting to update a script in an agents or tasks 
-            inventory
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_YAW_POS">
+            <summary>Unused</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploaderScriptRequestError.Compiled">
-            <summary>true of the script was successfully compiled by the simulator</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_YAW_NEG">
+            <summary>Unused</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploaderScriptRequestError.Error">
-            <summary>A string containing the error which occured while trying
-            to update the script</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FAST_AT">
+            <summary>ORed with AGENT_CONTROL_AT_* if the keyboard is being used</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploaderScriptRequestError.AssetID">
-            <summary>A new AssetID assigned to the script</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="T:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage">
-            <summary>
-            A message sent from the viewer to the simulator
-            requesting the update of an existing script contained
-            within a tasks inventory
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FAST_UP">
+            <summary>ORed with AGENT_CONTROL_UP_* if the keyboard is being used</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.ScriptRunning">
-            <summary>if true, set the script mode to running</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FLY">
+            <summary>Fly</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.ItemID">
-            <summary>The scripts InventoryItem ItemID to update</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_STOP">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.Target">
-            <summary>A lowercase string containing either "mono" or "lsl2" which 
-            specifies the script is compiled and ran on the mono runtime, or the older
-            lsl runtime</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FINISH_ANIM">
+            <summary>Finish our current animation</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.TaskID">
-            <summary>The tasks <see cref="T:OpenMetaverse.UUID"/> which contains the script to update</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP">
+            <summary>Stand up from the ground or a prim seat</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>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND">
+            <summary>Sit on the ground at our current location</summary>
         </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>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK">
+            <summary>Whether mouselook is currently enabled</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage">
-            <summary>
-            A message containing either the request or response used in updating a script inside
-            a tasks inventory
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS">
+            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage.Request">
-            <summary>Object containing request or response</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG">
+            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member 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="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member 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="T:OpenMetaverse.Messages.Linden.UploaderRequestScriptComplete">
-            <summary>
-            Response from the simulator to notify the viewer the upload is completed, and
-            the UUID of the script asset and its compiled status
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_POS">
+            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestScriptComplete.AssetID">
-            <summary>The uploaded texture asset ID</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="F:OpenMetaverse.Messages.Linden.UploaderRequestScriptComplete.Compiled">
-            <summary>true of the script was compiled successfully</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage">
-            <summary>
-            A message sent from a viewer to the simulator requesting a temporary uploader capability
-            used to update a script contained in an agents inventory
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage.ItemID">
-            <summary>The existing asset if of the script in the agents inventory to replace</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_AWAY">
+            <summary>Set when the avatar is idled or set to away. Note that the away animation is 
+            activated separately from setting this flag</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage.Target">
-            <summary>The language of the script</summary>
-            <remarks>Defaults to lsl version 2, "mono" might be another possible option</remarks>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_UP">
+            <summary></summary>
         </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>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_DOWN">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage">
-            <summary>
-            A message containing either the request or response used in updating a script inside
-            an agents inventory
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_UP">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage.Request">
-            <summary>Object containing request or response</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="M:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.Camera">
+            <summary>Agent camera controls</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.Flags">
+            <summary>Currently only used for hiding your group title</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.SendPostcardMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.State">
+            <summary>Action state of the avatar, which can currently be
+            typing and editing</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.SendPostcardMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.BodyRotation">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.MapLayerMessageBase">
-            <summary>Base class for Map Layers via Capabilities</summary>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.HeadRotation">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerMessageBase.Flags">
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastBodyRotation">
             <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessageBase.Serialize">
+        <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>
-            Serialize the object
+            Send an AgentUpdate with the camera set at the current agent
+            position and pointing towards the heading specified
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="heading">Camera rotation in radians</param>
+            <param name="reliable">Whether to send the AgentUpdate reliable
+            or not</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessageBase.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.TurnToward(OpenMetaverse.Vector3)">
             <summary>
-            Deserialize the message
+            Rotates the avatar body and camera toward a target position.
+            This will also anchor the camera position on the avatar
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <param name="target">Region coordinates to turn toward</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.MapLayerRequestVariant">
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.TurnToward(OpenMetaverse.Vector3,System.Boolean)">
             <summary>
-            Sent by an agent to the capabilities server to request map layers
+            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.Messages.Linden.MapLayerReplyVariant">
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SendUpdate">
             <summary>
-            A message sent from the simulator to the viewer which contains an array of map images and their grid coordinates
+            Send new AgentUpdate packet to update our current camera 
+            position and rotation
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerDataBlocks">
-            <summary>An array containing LayerData items</summary>
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SendUpdate(System.Boolean)">
+            <summary>
+            Send new AgentUpdate packet to update our current camera 
+            position and rotation
+            </summary>
+            <param name="reliable">Whether to require server acknowledgement
+            of this packet</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.Serialize">
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SendUpdate(System.Boolean,OpenMetaverse.Simulator)">
             <summary>
-            Serialize the object
+            Send new AgentUpdate packet to update our current camera 
+            position and rotation
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="reliable">Whether to require server acknowledgement
+            of this packet</param>
+            <param name="simulator">Simulator to send the update to</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <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>
-            Deserialize the message
+            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="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <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="T:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData">
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SetFOVVerticalAngle(System.Single)">
             <summary>
-            An object containing map location details
+            Sends update of Field of Vision vertical angle to the simulator
             </summary>
+            <param name="angle">Angle in radians</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.ImageID">
-            <summary>The Asset ID of the regions tile overlay</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AtPos">
+            <summary>Move agent positive along the X axis</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Bottom">
-            <summary>The grid location of the southern border of the map tile</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AtNeg">
+            <summary>Move agent negative along the X axis</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Left">
-            <summary>The grid location of the western border of the map tile</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LeftPos">
+            <summary>Move agent positive along the Y axis</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Right">
-            <summary>The grid location of the eastern border of the map tile</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LeftNeg">
+            <summary>Move agent negative along the Y axis</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Top">
-            <summary>The grid location of the northern border of the map tile</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpPos">
+            <summary>Move agent positive along the Z axis</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerMessage.Request">
-            <summary>Object containing request or response</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpNeg">
+            <summary>Move agent negative along the Z axis</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.PitchPos">
+            <summary></summary>
         </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>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.PitchNeg">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ProductInfoRequestMessage">
-            <summary>
-            New as of 1.23 RC1, no details yet.
-            </summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.YawPos">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ProductInfoRequestMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.YawNeg">
+            <summary></summary>
         </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>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastAt">
+            <summary></summary>
         </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>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastLeft">
+            <summary></summary>
         </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>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastUp">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestBlock.Method">
-            <summary>A string containing the method used</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Fly">
+            <summary>Causes simulator to make agent fly</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference">
-            <summary>
-            A request sent from an agent to the Simulator to begin a new conference.
-            Contains a list of Agents which will be included in the conference
-            </summary>    
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Stop">
+            <summary>Stop movement</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.AgentsBlock">
-            <summary>An array containing the <see cref="T:OpenMetaverse.UUID"/> of the agents invited to this conference</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FinishAnim">
+            <summary>Finish animation</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.SessionID">
-            <summary>The conferences Session ID</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.StandUp">
+            <summary>Stand up from a sit</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.SitOnGround">
+            <summary>Tells simulator to sit agent on ground</summary>
         </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>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Mouselook">
+            <summary>Place agent into mouselook mode</summary>
         </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>    
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeAtPos">
+            <summary>Nudge agent positive along the X axis</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.SessionID">
-            <summary>The Session ID</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeAtNeg">
+            <summary>Nudge agent negative along the X axis</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.AgentID">
+        <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="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.RequestKey">
-            <summary>A list containing Key/Value pairs, known valid values:
-            key: text value: true/false - allow/disallow specified agents ability to use text in session
-            key: voice value: true/false - allow/disallow specified agents ability to use voice in session
-            </summary>
-            <remarks>"text" or "voice"</remarks>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.TurnRight">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.RequestValue">
+        <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="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.Serialize">
+        <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>
-            Serialize the object
+            Returns "always run" value, or changes it by sending a SetAlwaysRunPacket
             </summary>
-            <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)">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentControls">
+            <summary>The current value of the agent control flags</summary>
+        </member>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpdateInterval">
+            <summary>Gets or sets the interval in milliseconds at which
+            AgentUpdate packets are sent to the current simulator. Setting
+            this to a non-zero value will also enable the packet sending if
+            it was previously off, and setting it to zero will disable</summary>
+        </member>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpdateEnabled">
+            <summary>Gets or sets whether AgentUpdate packets are sent to
+            the current simulator</summary>
+        </member>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AutoResetControls">
+            <summary>Reset movement controls every time we send an update</summary>
+        </member>
+        <member name="T:OpenMetaverse.AgentManager.AgentMovement.AgentCamera">
             <summary>
-            Deserialize the message
+            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>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation">
+        <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>
-            A message sent from the agent to the simulator which tells the 
-            simulator we've accepted a conference invitation
+            Default constructor
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation.SessionID">
-            <summary>The conference SessionID</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.Position">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation.Serialize">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.AtAxis">
+            <summary></summary>
+        </member>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.LeftAxis">
+            <summary></summary>
+        </member>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.UpAxis">
+            <summary></summary>
+        </member>
+        <member name="T:OpenMetaverse.AgentManager.AttachmentResourcesCallback">
             <summary>
-            Serialize the object
+            Called once attachment resource usage information has been collected
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="success">Indicates if operation was successfull</param>
+            <param name="info">Attachment resource usage information</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="T:OpenMetaverse.Rendering.FacetedMesh">
             <summary>
-            Deserialize the message
+            Contains all mesh faces that belong to a prim
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMessage.Serialize">
+        <member name="F:OpenMetaverse.Rendering.FacetedMesh.Faces">
+            <summary>List of primitive faces</summary>
+        </member>
+        <member name="M:OpenMetaverse.Rendering.FacetedMesh.TryDecodeFromAsset(OpenMetaverse.Primitive,OpenMetaverse.Assets.AssetMesh,OpenMetaverse.Rendering.DetailLevel,OpenMetaverse.Rendering.FacetedMesh@)">
             <summary>
-            Serialize the object
+            Decodes mesh asset into FacetedMesh
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <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.Messages.Linden.ChatSessionRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="T:OpenMetaverse.Imaging.Baker">
             <summary>
-            Deserialize the message
+            A set of textures that are layered on texture of each other and "baked"
+            in to a single texture, for avatar appearances
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterboxSessionEventReplyMessage.Serialize">
+        <member name="F:OpenMetaverse.Imaging.Baker.bakedTexture">
+            <summary>Final baked texture</summary>
+        </member>
+        <member name="F:OpenMetaverse.Imaging.Baker.textures">
+            <summary>Component layers</summary>
+        </member>
+        <member name="F:OpenMetaverse.Imaging.Baker.bakeWidth">
+            <summary>Width of the final baked image and scratchpad</summary>
+        </member>
+        <member name="F:OpenMetaverse.Imaging.Baker.bakeHeight">
+            <summary>Height of the final baked image and scratchpad</summary>
+        </member>
+        <member name="F:OpenMetaverse.Imaging.Baker.bakeType">
+            <summary>Bake type</summary>
+        </member>
+        <member name="M:OpenMetaverse.Imaging.Baker.#ctor(OpenMetaverse.BakeType)">
             <summary>
-            Serialize the object
+            Default constructor
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="bakeType">Bake type</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterboxSessionEventReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Imaging.Baker.AddTexture(OpenMetaverse.AppearanceManager.TextureData)">
             <summary>
-            Deserialize the message
+            Adds layer for baking
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <param name="tdata">TexturaData struct that contains texture and its params</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionStartReplyMessage.Serialize">
+        <member name="M:OpenMetaverse.Imaging.Baker.BakeTypeFor(OpenMetaverse.AvatarTextureIndex)">
             <summary>
-            Serialize the object
+            Converts avatar texture index (face) to Bake type
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="index">Face number (AvatarTextureIndex)</param>
+            <returns>BakeType, layer to which this texture belongs to</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionStartReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Imaging.Baker.SanitizeLayers(OpenMetaverse.Imaging.ManagedImage,OpenMetaverse.Imaging.ManagedImage)">
             <summary>
-            Deserialize the message
+            Make sure images exist, resize source if needed to match the destination
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <param name="dest">Destination image</param>
+            <param name="src">Source image</param>
+            <returns>Sanitization was succefull</returns>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.FromAgentID">
-            <summary>Key of sender</summary>
+        <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="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.FromAgentName">
-            <summary>Name of sender</summary>
+        <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="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.ToAgentID">
-            <summary>Key of destination avatar</summary>
+        <member name="P:OpenMetaverse.Imaging.Baker.BakedTexture">
+            <summary>Final baked texture</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.ParentEstateID">
-            <summary>ID of originating estate</summary>
+        <member name="P:OpenMetaverse.Imaging.Baker.Textures">
+            <summary>Component layers</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.RegionID">
-            <summary>Key of originating region</summary>
+        <member name="P:OpenMetaverse.Imaging.Baker.BakeWidth">
+            <summary>Width of the final baked image and scratchpad</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Position">
-            <summary>Coordinates in originating region</summary>
+        <member name="P:OpenMetaverse.Imaging.Baker.BakeHeight">
+            <summary>Height of the final baked image and scratchpad</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Dialog">
-            <summary>Instant message type</summary>
+        <member name="P:OpenMetaverse.Imaging.Baker.BakeType">
+            <summary>Bake type</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.GroupIM">
-            <summary>Group IM session toggle</summary>
+        <member name="P:OpenMetaverse.Imaging.Baker.IsSkin">
+            <summary>Is this one of the 3 skin bakes</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.IMSessionID">
-            <summary>Key of IM session, for Group Messages, the groups UUID</summary>
+        <member name="T:OpenMetaverse.Assets.AssetWearable">
+            <summary>
+            Represents a Wearable Asset, Clothing, Hair, Skin, Etc
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Timestamp">
-            <summary>Timestamp of the instant message</summary>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Name">
+            <summary>A string containing the name of the asset</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Message">
-            <summary>Instant message text</summary>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Description">
+            <summary>A string containing a short description of the asset</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Offline">
-            <summary>Whether this message is held for offline avatars</summary>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.WearableType">
+            <summary>The Assets WearableType</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.BinaryBucket">
-            <summary>Context specific packed data</summary>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.ForSale">
+            <summary>The For-Sale status of the object</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Voice">
-            <summary>Is this invitation for voice group/conference chat</summary>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.SalePrice">
+            <summary>An Integer representing the purchase price of the asset</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Creator">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the assets creator</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Owner">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the assets current owner</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ChatterBoxSessionAgentListUpdatesMessage">
-            <summary>
-            Sent from the simulator to the viewer.
-            
-            When an agent initially joins a session the AgentUpdatesBlock object will contain a list of session members including
-            a boolean indicating they can use voice chat in this session, a boolean indicating they are allowed to moderate 
-            this session, and lastly a string which indicates another agent is entering the session with the Transition set to "ENTER"
-            
-            During the session lifetime updates on individuals are sent. During the update the booleans sent during the initial join are
-            excluded with the exception of the Transition field. This indicates a new user entering or exiting the session with
-            the string "ENTER" or "LEAVE" respectively.
-            </summary>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.LastOwner">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the assets prior owner</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionAgentListUpdatesMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member 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="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionAgentListUpdatesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member 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="T:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage">
-            <summary>
-            An EventQueue message sent when the agent is forcibly removed from a chatterbox session
-            </summary>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Permissions">
+            <summary>The Permissions mask of the asset</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.Reason">
-            <summary>
-            A string containing the reason the agent was removed
-            </summary>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Params">
+            <summary>A Dictionary containing Key/Value pairs of the objects parameters</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.SessionID">
-            <summary>
-            The ChatterBoxSession's SessionID
-            </summary>
+        <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.Messages.Linden.ForceCloseChatterBoxSessionMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="M:OpenMetaverse.Assets.AssetWearable.#ctor">
+            <summary>Initializes a new instance of an AssetWearable object</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member 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.Messages.Linden.EventQueueAck.Serialize">
+        <member name="M:OpenMetaverse.Assets.AssetWearable.Decode">
             <summary>
-            Serialize the object
+            Decode an assets byte encoded data to a string
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <returns>true if the asset data was decoded successfully</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EventQueueAck.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Assets.AssetWearable.Encode">
             <summary>
-            Deserialize the message
+            Encode the assets string represantion into a format consumable by the asset server
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EventQueueEvent.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="T:OpenMetaverse.AgentDisplayName">
+            <summary> Information about agents display name </summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EventQueueEvent.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.AgentDisplayName.ID">
+            <summary> Agent UUID </summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EventQueueGetMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.AgentDisplayName.UserName">
+            <summary> Username </summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EventQueueGetMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.AgentDisplayName.DisplayName">
+            <summary> Display name </summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ViewerStatsMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.AgentDisplayName.LegacyFirstName">
+            <summary> First name (legacy) </summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ViewerStatsMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.AgentDisplayName.LegacyLastName">
+            <summary> Last name (legacy) </summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.PlacesReplyMessage">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.AgentDisplayName.IsDefaultDisplayName">
+            <summary> Is display name default display name </summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.PlacesReplyMessage.Serialize">
+        <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>
-            Serialize the object
+            Creates AgentDisplayName object from OSD
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="data">Incoming OSD data</param>
+            <returns>AgentDisplayName object</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.PlacesReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AgentDisplayName.GetOSD">
             <summary>
-            Deserialize the message
+            Return object as OSD map
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <returns>OSD containing agent's display name data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInformationMessage.Serialize">
+        <member name="P:OpenMetaverse.AgentDisplayName.LegacyFullName">
+            <summary> Full name (legacy) </summary>
+        </member>
+        <member name="T:OpenMetaverse.AvatarGroup">
             <summary>
-            Serialize the object
+            Holds group information for Avatars such as those you might find in a profile
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInformationMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.DirLandReplyMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.AvatarGroup.AcceptNotices">
+            <summary>true of Avatar accepts group notices</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.DirLandReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupID">
+            <summary>Groups Key</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage">
-            <summary>
-            A message sent from the viewer to the simulator which 
-            specifies that the user has changed current URL
-            of the specific media on a prim face
-            </summary>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupInsigniaID">
+            <summary>Texture Key for groups insignia</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.URL">
-            <summary>
-            New URL
-            </summary>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupName">
+            <summary>Name of the group</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.PrimID">
-            <summary>
-            Prim UUID where navigation occured
-            </summary>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupPowers">
+            <summary>Powers avatar has in the group</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.Face">
-            <summary>
-            Face index
-            </summary>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupTitle">
+            <summary>Avatars Currently selected title</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.AvatarGroup.ListInProfile">
+            <summary>true of Avatar has chosen to list this in their profile</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="T:OpenMetaverse.Animation">
             <summary>
-            Deserialize the message
+            Contains an animation currently being played by an agent
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaBlock">
-            <summary>Base class used for the ObjectMedia message</summary>
+        <member name="F:OpenMetaverse.Animation.AnimationID">
+            <summary>The ID of the animation asset</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaRequest">
-            <summary>
-            Message used to retrive prim media data
-            </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.Messages.Linden.ObjectMediaRequest.PrimID">
-            <summary>
-            Prim UUID
-            </summary>
+        <member name="F:OpenMetaverse.Animation.AnimationSourceObjectID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaRequest.Verb">
+        <member name="T:OpenMetaverse.ProfilePick">
             <summary>
-            Requested operation, either GET or UPDATE
+            Holds group information on an individual profile pick
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaRequest.Serialize">
+        <member name="T:OpenMetaverse.AvatarManager">
             <summary>
-            Serialize object
+            Retrieve friend status notifications, and retrieve avatar names and
+            profiles
             </summary>
-            <returns>Serialized object as OSDMap</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaRequest.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAnimation">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaResponse">
-            <summary>
-            Message used to update prim media data
-            </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.Messages.Linden.ObjectMediaResponse.PrimID">
-            <summary>
-            Prim UUID
-            </summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAnimationLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaResponse.FaceMedia">
-            <summary>
-            Array of media entries indexed by face number
-            </summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAppearance">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaResponse.Version">
-            <summary>
-            Media version string
-            </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="M:OpenMetaverse.Messages.Linden.ObjectMediaResponse.Serialize">
-            <summary>
-            Serialize object
-            </summary>
-            <returns>Serialized object as OSDMap</returns>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAppearanceLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaResponse.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.AvatarManager.m_UUIDNameReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaUpdate">
-            <summary>
-            Message used to update prim media data
-            </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.Messages.Linden.ObjectMediaUpdate.PrimID">
-            <summary>
-            Prim UUID
-            </summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_UUIDNameReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.FaceMedia">
-            <summary>
-            Array of media entries indexed by face number
-            </summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarInterestsReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.Verb">
-            <summary>
-            Requested operation, either GET or UPDATE
-            </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="M:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.Serialize">
-            <summary>
-            Serialize object
-            </summary>
-            <returns>Serialized object as OSDMap</returns>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarInterestsReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPropertiesReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaMessage">
-            <summary>
-            Message for setting or getting per face MediaEntry
-            </summary>
+        <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="F:OpenMetaverse.Messages.Linden.ObjectMediaMessage.Request">
-            <summary>The request or response details block</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPropertiesReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarGroupsReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member 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="T:OpenMetaverse.Messages.Linden.ObjectResourcesDetail">
-            <summary>Details about object resource usage</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarGroupsReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.ID">
-            <summary>Object UUID</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPickerReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Name">
-            <summary>Object name</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.Messages.Linden.ObjectResourcesDetail.GroupOwned">
-            <summary>Indicates if object is group owned</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPickerReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Location">
-            <summary>Locatio of the object</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectPointAt">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.OwnerID">
-            <summary>Object owner</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.Messages.Linden.ObjectResourcesDetail.Resources">
-            <summary>Resource usage, keys are resource names, values are resource usage for that specific resource</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectPointAtLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserializes object from OSD
-            </summary>
-            <param name="obj">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectLookAt">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.FromOSD(OpenMetaverse.StructuredData.OSD)">
-            <summary>
-            Makes an instance based on deserialized data
-            </summary>
-            <param name="osd"><see cref="T:OpenMetaverse.StructuredData.OSD"/> serialized data</param>
-            <returns>Instance containg deserialized data</returns>
+        <member 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="T:OpenMetaverse.Messages.Linden.ParcelResourcesDetail">
-            <summary>Details about parcel resource usage</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectLookAtLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.ID">
-            <summary>Parcel UUID</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.LocalID">
-            <summary>Parcel local ID</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.Name">
-            <summary>Parcel name</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.GroupOwned">
-            <summary>Indicates if parcel is group owned</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffect">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.OwnerID">
-            <summary>Parcel owner</summary>
+        <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="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.Objects">
-            <summary>Array of <see cref="T:OpenMetaverse.Messages.Linden.ObjectResourcesDetail"/> containing per object resource usage</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserializes object from OSD
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPicksReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.FromOSD(OpenMetaverse.StructuredData.OSD)">
-            <summary>
-            Makes an instance based on deserialized data
-            </summary>
-            <param name="osd"><see cref="T:OpenMetaverse.StructuredData.OSD"/> serialized data</param>
-            <returns>Instance containg deserialized data</returns>
+        <member 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="T:OpenMetaverse.Messages.Linden.BaseResourcesInfo">
-            <summary>Resource usage base class, both agent and parcel resource
-            usage contains summary information</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPicksReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.BaseResourcesInfo.SummaryAvailable">
-            <summary>Summary of available resources, keys are resource names,
-            values are resource usage for that specific resource</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_PickInfoReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.BaseResourcesInfo.SummaryUsed">
-            <summary>Summary resource usage, keys are resource names,
-            values are resource usage for that specific resource</summary>
+        <member name="M:OpenMetaverse.AvatarManager.OnPickInfoReply(OpenMetaverse.PickInfoReplyEventArgs)">
+            <summary>Raises the PickInfoReply Event</summary>
+             <param name="e">A PickInfoReplyEventArgs object containing
+             the data sent from the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.BaseResourcesInfo.Serialize">
-            <summary>
-            Serializes object
-            </summary>
-            <returns><see cref="T:OpenMetaverse.StructuredData.OSDMap"/> serialized data</returns>
+        <member name="F:OpenMetaverse.AvatarManager.m_PickInfoReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.BaseResourcesInfo.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserializes object from OSD
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarClassifiedReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage">
-            <summary>Agent resource usage</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="F:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.Attachments">
-            <summary>Per attachment point object resource usage</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarClassifiedReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserializes object from OSD
-            </summary>
-            <param name="osd">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.AvatarManager.m_ClassifiedInfoReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.FromOSD(OpenMetaverse.StructuredData.OSD)">
-            <summary>
-            Makes an instance based on deserialized data
-            </summary>
-            <param name="osd"><see cref="T:OpenMetaverse.StructuredData.OSD"/> serialized data</param>
-            <returns>Instance containg deserialized data</returns>
+        <member name="M:OpenMetaverse.AvatarManager.OnClassifiedInfoReply(OpenMetaverse.ClassifiedInfoReplyEventArgs)">
+            <summary>Raises the ClassifiedInfoReply Event</summary>
+             <param name="e">A ClassifiedInfoReplyEventArgs object containing
+             the data sent from the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.GetMessageHandler(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Detects which class handles deserialization of this message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-            <returns>Object capable of decoding this message</returns>
+        <member name="F:OpenMetaverse.AvatarManager.m_ClassifiedInfoReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.LandResourcesRequest">
-            <summary>Request message for parcel resource usage</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_DisplayNameUpdate">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesRequest.ParcelID">
-            <summary>UUID of the parel to request resource usage info</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="M:OpenMetaverse.Messages.Linden.LandResourcesRequest.Serialize">
-            <summary>
-            Serializes object
-            </summary>
-            <returns><see cref="T:OpenMetaverse.StructuredData.OSDMap"/> serialized data</returns>
+        <member name="F:OpenMetaverse.AvatarManager.m_DisplayNameUpdateLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesRequest.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AvatarManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            Deserializes object from OSD
+            Represents other avatars
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.LandResourcesMessage">
-            <summary>Response message for parcel resource usage</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesMessage.ScriptResourceDetails">
-            <summary>URL where parcel resource usage details can be retrieved</summary>
+            <param name="client"></param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesMessage.ScriptResourceSummary">
-            <summary>URL where parcel resource usage summary can be retrieved</summary>
+        <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.Messages.Linden.LandResourcesMessage.Serialize">
+        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarName(OpenMetaverse.UUID)">
             <summary>
-            Serializes object
+            Request a single avatar name
             </summary>
-            <returns><see cref="T:OpenMetaverse.StructuredData.OSDMap"/> serialized data</returns>
+            <param name="id">The avatar key to retrieve a name for</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarNames(System.Collections.Generic.List{OpenMetaverse.UUID})">
             <summary>
-            Deserializes object from OSD
+            Request a list of avatar names
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <param name="ids">The avatar keys to retrieve names for</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesMessage.GetMessageHandler(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AvatarManager.DisplayNamesAvailable">
             <summary>
-            Detects which class handles deserialization of this message
+            Check if Display Names functionality is available
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-            <returns>Object capable of decoding this message</returns>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.LandResourcesInfo">
-            <summary>Parcel resource usage</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesInfo.Parcels">
-            <summary>Array of <see cref="T:OpenMetaverse.Messages.Linden.ParcelResourcesDetail"/> containing per percal resource usage</summary>
+            <returns>True if Display name functionality is available</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesInfo.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AvatarManager.GetDisplayNames(System.Collections.Generic.List{OpenMetaverse.UUID},OpenMetaverse.AvatarManager.DisplayNamesCallback)">
             <summary>
-            Deserializes object from OSD
+            Request retrieval of display names (max 90 names per request)
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <param name="ids">List of UUIDs to lookup</param>
+            <param name="callback">Callback to report result of the operation</param>
         </member>
-        <member name="T:OpenMetaverse.Assets.GestureStepType">
+        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarProperties(OpenMetaverse.UUID)">
             <summary>
-            Type of gesture step
+            Start a request for Avatar Properties
             </summary>
+            <param name="avatarid"></param>
         </member>
-        <member name="T:OpenMetaverse.Assets.GestureStep">
+        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarNameSearch(System.String,OpenMetaverse.UUID)">
             <summary>
-            Base class for gesture steps
+            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.Assets.GestureStep.GestureStepType">
+        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarPicks(OpenMetaverse.UUID)">
             <summary>
-            Retururns what kind of gesture step this is
+            Start a request for Avatar Picks
             </summary>
+            <param name="avatarid">UUID of the avatar</param>
         </member>
-        <member name="T:OpenMetaverse.Assets.GestureStepAnimation">
+        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarClassified(OpenMetaverse.UUID)">
             <summary>
-            Describes animation step of a gesture
+            Start a request for Avatar Classifieds
             </summary>
+            <param name="avatarid">UUID of the avatar</param>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepAnimation.AnimationStart">
+        <member name="M:OpenMetaverse.AvatarManager.RequestPickInfo(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            If true, this step represents start of animation, otherwise animation stop
+            Start a request for details of a specific profile pick
             </summary>
+            <param name="avatarid">UUID of the avatar</param>
+            <param name="pickid">UUID of the profile pick</param>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepAnimation.ID">
+        <member name="M:OpenMetaverse.AvatarManager.RequestClassifiedInfo(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Animation asset <see cref="T:OpenMetaverse.UUID"/>
+            Start a request for details of a specific profile classified
             </summary>
+            <param name="avatarid">UUID of the avatar</param>
+            <param name="classifiedid">UUID of the profile classified</param>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepAnimation.Name">
-            <summary>
-            Animation inventory name
-            </summary>
+        <member name="M:OpenMetaverse.AvatarManager.UUIDNameReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="P:OpenMetaverse.Assets.GestureStepAnimation.GestureStepType">
-            <summary>
-            Returns what kind of gesture step this is
-            </summary>
+        <member name="M:OpenMetaverse.AvatarManager.AvatarAnimationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="T:OpenMetaverse.Assets.GestureStepSound">
-            <summary>
-            Describes sound step of a gesture
-            </summary>
+        <member name="M:OpenMetaverse.AvatarManager.AvatarAppearanceHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepSound.ID">
-            <summary>
-            Sound asset <see cref="T:OpenMetaverse.UUID"/>
-            </summary>
+        <member name="M:OpenMetaverse.AvatarManager.AvatarPropertiesHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepSound.Name">
-            <summary>
-            Sound inventory name
-            </summary>
+        <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="P:OpenMetaverse.Assets.GestureStepSound.GestureStepType">
+        <member name="M:OpenMetaverse.AvatarManager.DisplayNameUpdateMessageHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Returns what kind of gesture step this is
+            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="T:OpenMetaverse.Assets.GestureStepChat">
+        <member name="M:OpenMetaverse.AvatarManager.AvatarGroupsReplyMessageHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Describes sound step of a gesture
+            Crossed region handler for message that comes across the EventQueue. Sent to an agent
+            when the agent crosses a sim border into a new region.
             </summary>
+            <param name="capsKey">The message key</param>
+            <param name="message">the IMessage object containing the deserialized data sent from the simulator</param>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> which originated the packet</param>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepChat.Text">
-            <summary>
-            Text to output in chat
-            </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.Assets.GestureStepChat.GestureStepType">
-            <summary>
-            Returns what kind of gesture step this is
-            </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="T:OpenMetaverse.Assets.GestureStepWait">
-            <summary>
-            Describes sound step of a gesture
-            </summary>
+        <member name="M:OpenMetaverse.AvatarManager.ViewerEffectHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepWait.WaitForAnimation">
-            <summary>
-            If true in this step we wait for all animations to finish
-            </summary>
+        <member name="M:OpenMetaverse.AvatarManager.AvatarPicksReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepWait.WaitForTime">
-            <summary>
-            If true gesture player should wait for the specified amount of time
-            </summary>
+        <member name="M:OpenMetaverse.AvatarManager.PickInfoReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepWait.WaitTime">
-            <summary>
-            Time in seconds to wait if WaitForAnimation is false
-            </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.Assets.GestureStepWait.GestureStepType">
-            <summary>
-            Returns what kind of gesture step this is
-            </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="T:OpenMetaverse.Assets.GestureStepEOF">
-            <summary>
-            Describes the final step of a gesture
-            </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.Assets.GestureStepEOF.GestureStepType">
-            <summary>
-            Returns what kind of gesture step this is
-            </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="T:OpenMetaverse.Assets.AssetGesture">
-            <summary>
-            Represents a sequence of animations, sounds, and chat actions
-            </summary>
+        <member name="E:OpenMetaverse.AvatarManager.UUIDNameReply">
+            <summary>Raised when the simulator sends us data containing
+            agent names/id values</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.Asset">
-            <summary>
-            Base class for all Asset types
-            </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="F:OpenMetaverse.Assets.Asset.AssetData">
-            <summary>A byte array containing the raw asset data</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="F:OpenMetaverse.Assets.Asset.Temporary">
-            <summary>True if the asset it only stored on the server temporarily</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="F:OpenMetaverse.Assets.Asset._AssetID">
-            <summary>A unique ID</summary>
+        <member name="E:OpenMetaverse.AvatarManager.AvatarPickerReply">
+            <summary>Raised when the simulator sends us data containing
+            name/id pair</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.Asset.#ctor">
-            <summary>
-            Construct a new Asset object
-            </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="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 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="M:OpenMetaverse.Assets.Asset.Encode">
-            <summary>
-            Regenerates the <code>AssetData</code> byte array from the properties 
-            of the derived class.
-            </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="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 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.Assets.Asset.AssetID">
-            <summary>The assets unique ID</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.Assets.Asset.AssetType">
-            <summary>
-            The "type" of asset, Notecard, Animation, etc
-            </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="F:OpenMetaverse.Assets.AssetGesture.TriggerKey">
-            <summary>
-            Keyboard key that triggers the gestyre
-            </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="F:OpenMetaverse.Assets.AssetGesture.TriggerKeyMask">
-            <summary>
-            Modifier to the trigger key
-            </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="F:OpenMetaverse.Assets.AssetGesture.Trigger">
+        <member name="T:OpenMetaverse.AvatarManager.DisplayNamesCallback">
             <summary>
-            String that triggers playing of the gesture sequence
+            Callback giving results when fetching display names
             </summary>
+            <param name="success">If the request was successful</param>
+            <param name="names">Array of display names</param>
+            <param name="badIDs">Array of UUIDs that could not be fetched</param>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetGesture.ReplaceWith">
-            <summary>
-            Text that replaces trigger in chat once gesture is triggered
-            </summary>
+        <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="F:OpenMetaverse.Assets.AssetGesture.Sequence">
+        <member name="M:OpenMetaverse.AvatarAnimationEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.Animation})">
             <summary>
-            Sequence of gesture steps
+            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.Assets.AssetGesture.#ctor">
-            <summary>
-            Constructs guesture asset
-            </summary>
+        <member name="P:OpenMetaverse.AvatarAnimationEventArgs.AvatarID">
+            <summary>Get the ID of the agent</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetGesture.#ctor(OpenMetaverse.UUID,System.Byte[])">
-            <summary>
-            Constructs guesture asset
-            </summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
+        <member name="P:OpenMetaverse.AvatarAnimationEventArgs.Animations">
+            <summary>Get the list of animations to start</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetGesture.Encode">
-            <summary>
-            Encodes gesture asset suitable for uplaod
-            </summary>
+        <member name="T:OpenMetaverse.AvatarAppearanceEventArgs">
+            <summary>Provides data for the <see cref="E:OpenMetaverse.AvatarManager.AvatarAppearance"/> event</summary>
+            <remarks>The <see cref="E:OpenMetaverse.AvatarManager.AvatarAppearance"/> event occurs when the simulator sends
+            the appearance data for an avatar</remarks>
+            <example>
+            The following code example uses the <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.AvatarID"/> and <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams"/>
+            properties to display the selected shape of an avatar on the <see cref="T:System.Console"/> window.
+            <code>
+                // subscribe to the event
+                Client.Avatars.AvatarAppearance += Avatars_AvatarAppearance;
+            
+                // handle the data when the event is raised
+                void Avatars_AvatarAppearance(object sender, AvatarAppearanceEventArgs e)
+                {
+                    Console.WriteLine("The Agent {0} is using a {1} shape.", e.AvatarID, (e.VisualParams[31] &gt; 0) : "male" ? "female")
+                }
+            </code>
+            </example>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetGesture.Decode">
+        <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>
-            Decodes gesture assset into play sequence
+            Construct a new instance of the AvatarAppearanceEventArgs class
             </summary>
-            <returns>true if the asset data was decoded successfully</returns>
+            <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="P:OpenMetaverse.Assets.AssetGesture.AssetType">
-            <summary>
-            Returns asset type
-            </summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.Simulator">
+            <summary>Get the Simulator this request is from of the agent</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetsArchiver">
-            <summary>
-            Archives assets
-            </summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.AvatarID">
+            <summary>Get the ID of the agent</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetsArchiver.m_assets">
-            <summary>
-            Archive assets
-            </summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.IsTrial">
+            <summary>true if the agent is a trial account</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetsArchiver.Archive(OpenMetaverse.Assets.TarArchiveWriter)">
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.DefaultTexture">
+            <summary>Get the default agent texture</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.FaceTextures">
+            <summary>Get the agents appearance layer textures</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams">
+            <summary>Get the <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams"/> for the agent</summary>
+        </member>
+        <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="P:OpenMetaverse.AvatarAppearanceEventArgs.COFVersion">
+            <summary>Version of the Current Outfit Folder the appearance is based on</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.AppearanceFlags">
+            <summary>Appearance flags, introduced with server side baking, currently unused</summary>
+        </member>
+        <member name="T:OpenMetaverse.AvatarInterestsReplyEventArgs">
+            <summary>Represents the interests from the profile of an agent</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarInterestsReplyEventArgs.AvatarID">
+            <summary>Get the ID of the agent</summary>
+        </member>
+        <member name="T:OpenMetaverse.AvatarPropertiesReplyEventArgs">
+            <summary>The properties of an agent</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarPropertiesReplyEventArgs.AvatarID">
+            <summary>Get the ID of the agent</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarGroupsReplyEventArgs.AvatarID">
+            <summary>Get the ID of the agent</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarPicksReplyEventArgs.AvatarID">
+            <summary>Get the ID of the agent</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarClassifiedReplyEventArgs.AvatarID">
+            <summary>Get the ID of the avatar</summary>
+        </member>
+        <member name="T:OpenMetaverse.DisplayNameUpdateEventArgs">
             <summary>
-            Archive the assets given to this archiver to the given archive.
+            Event args class for display name notification messages
             </summary>
-            <param name="archive"></param>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetsArchiver.WriteMetadata(OpenMetaverse.Assets.TarArchiveWriter)">
+        <member name="T:OpenMetaverse.AvatarTextureIndex">
             <summary>
-            Write an assets metadata file to the given archive
+            Index of TextureEntry slots for avatar appearances
             </summary>
-            <param name="archive"></param>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetsArchiver.WriteData(OpenMetaverse.Assets.TarArchiveWriter)">
+        <member name="T:OpenMetaverse.BakeType">
             <summary>
-            Write asset data files to the given archive
+            Bake layers for avatar appearance
             </summary>
-            <param name="archive"></param>
         </member>
-        <member name="T:OpenMetaverse.Assets.ArchiveConstants">
+        <member name="T:OpenMetaverse.AppearanceFlags">
             <summary>
-            Constants for the archiving module
+            Appearance Flags, introdued with server side baking, currently unused
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.CONTROL_FILE_PATH">
+        <member name="F:OpenMetaverse.AppearanceManager.MAX_CONCURRENT_DOWNLOADS">
+            <summary>Maximum number of concurrent downloads for wearable assets and textures</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.MAX_CONCURRENT_UPLOADS">
+            <summary>Maximum number of concurrent uploads for baked textures</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.INVENTORY_TIMEOUT">
+            <summary>Timeout for fetching inventory listings</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_TIMEOUT">
+            <summary>Timeout for fetching a single wearable, or receiving a single packet response</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.TEXTURE_TIMEOUT">
+            <summary>Timeout for fetching a single texture</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.UPLOAD_TIMEOUT">
+            <summary>Timeout for uploading a single baked texture</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.UPLOAD_RETRIES">
+            <summary>Number of times to retry bake upload</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.REBAKE_DELAY">
+            <summary>When changing outfit, kick off rebake after
+            20 seconds has passed since the last change</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_COUNT">
+            <summary>Total number of wearables for each avatar</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.BAKED_TEXTURE_COUNT">
+            <summary>Total number of baked textures on each avatar</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.WEARABLES_PER_LAYER">
+            <summary>Total number of wearables per bake layer</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.ATTACHMENT_ADD">
+            <summary>Mask for multiple attachments</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.BakeIndexToTextureIndex">
+            <summary>Mapping between BakeType and AvatarTextureIndex</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_BAKE_MAP">
+            <summary>Map of what wearables are included in each bake</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.BAKED_TEXTURE_HASH">
+            <summary>Magic values to finalize the cache check hashes for each
+            bake</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.DEFAULT_AVATAR_TEXTURE">
+            <summary>Default avatar texture, used to detect when a custom
+            texture is not set for a face</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.m_AgentWearablesReply">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="M:OpenMetaverse.AppearanceManager.OnAgentWearables(OpenMetaverse.AgentWearablesReplyEventArgs)">
+            <summary>Raises the AgentWearablesReply event</summary>
+            <param name="e">An AgentWearablesReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.m_AgentWearablesLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.m_AgentCachedBakesReply">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="M:OpenMetaverse.AppearanceManager.OnAgentCachedBakes(OpenMetaverse.AgentCachedBakesReplyEventArgs)">
+            <summary>Raises the CachedBakesReply event</summary>
+            <param name="e">An AgentCachedBakesReplyEventArgs object containing the
+            data returned from the data server AgentCachedTextureResponse</param>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.m_AgentCachedBakesLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.m_AppearanceSet">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="M:OpenMetaverse.AppearanceManager.OnAppearanceSet(OpenMetaverse.AppearanceSetEventArgs)">
+            <summary>Raises the AppearanceSet event</summary>
+            <param name="e">An AppearanceSetEventArgs object indicating if the operatin was successfull</param>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.m_AppearanceSetLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.m_RebakeAvatarReply">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="M:OpenMetaverse.AppearanceManager.OnRebakeAvatar(OpenMetaverse.RebakeAvatarTexturesEventArgs)">
+            <summary>Raises the RebakeAvatarRequested event</summary>
+            <param name="e">An RebakeAvatarTexturesEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.m_RebakeAvatarLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.MyVisualParameters">
+            <summary>Visual parameters last sent to the sim</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.MyTextures">
+            <summary>Textures about this client sent to the sim</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.Wearables">
+            <summary>A cache of wearables currently being worn</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.Textures">
+            <summary>A cache of textures currently being worn</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.CacheCheckSerialNum">
+            <summary>Incrementing serial number for AgentCachedTexture packets</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.SetAppearanceSerialNum">
+            <summary>Incrementing serial number for AgentSetAppearance packets</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.GotWearables">
+            <summary>Indicates if WearablesRequest succeeded</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.AppearanceThreadRunning">
+            <summary>Indicates whether or not the appearance thread is currently
+            running, to prevent multiple appearance threads from running
+            simultaneously</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.Client">
+            <summary>Reference to our agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.RebakeScheduleTimer">
             <summary>
-            The location of the archive control file
+            Timer used for delaying rebake on changing outfit
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSETS_PATH">
+        <member name="F:OpenMetaverse.AppearanceManager.AppearanceThread">
             <summary>
-            Path for the assets held in an archive
+            Main appearance thread
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.OBJECTS_PATH">
+        <member name="F:OpenMetaverse.AppearanceManager.ServerBakingDone">
             <summary>
-            Path for the prims file
+            Is server baking complete. It needs doing only once
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.TERRAINS_PATH">
+        <member name="M:OpenMetaverse.AppearanceManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            Path for terrains.  Technically these may be assets, but I think it's quite nice to split them out.
+            Default constructor
             </summary>
+            <param name="client">A reference to our agent</param>
         </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.SETTINGS_PATH">
+        <member name="M:OpenMetaverse.AppearanceManager.SetPreviousAppearance">
             <summary>
-            Path for region settings.
+            Obsolete method for setting appearance. This function no longer does anything.
+            Use RequestSetAppearance() to manually start the appearance thread
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSET_EXTENSION_SEPARATOR">
+        <member name="M:OpenMetaverse.AppearanceManager.SetPreviousAppearance(System.Boolean)">
             <summary>
-            The character the separates the uuid from extension information in an archived asset filename
+            Obsolete method for setting appearance. This function no longer does anything.
+            Use RequestSetAppearance() to manually start the appearance thread
             </summary>
+            <param name="allowBake">Unused parameter</param>
         </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSET_TYPE_TO_EXTENSION">
+        <member name="M:OpenMetaverse.AppearanceManager.RequestSetAppearance">
             <summary>
-            Extensions used for asset types in the archive
+            Starts the appearance setting thread
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Caps">
+        <member name="M:OpenMetaverse.AppearanceManager.RequestSetAppearance(System.Boolean)">
             <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
+            Starts the appearance setting thread
             </summary>
+            <param name="forceRebake">True to force rebaking, otherwise false</param>
         </member>
-        <member name="F:OpenMetaverse.Caps.Simulator">
-            <summary>Reference to the simulator this system is connected to</summary>
-        </member>
-        <member name="M:OpenMetaverse.Caps.#ctor(OpenMetaverse.Simulator,System.String)">
+        <member name="M:OpenMetaverse.AppearanceManager.ServerBakingRegion">
             <summary>
-            Default constructor
+            Check if current region supports server side baking
             </summary>
-            <param name="simulator"></param>
-            <param name="seedcaps"></param>
+            <returns>True if server side baking support is detected</returns>
         </member>
-        <member name="M:OpenMetaverse.Caps.CapabilityURI(System.String)">
+        <member name="M:OpenMetaverse.AppearanceManager.RequestAgentWearables">
             <summary>
-            Request the URI of a named capability
+            Ask the server what textures our agent is currently wearing
             </summary>
-            <param name="capability">Name of the capability to request</param>
-            <returns>The URI of the requested capability, or String.Empty if
-            the capability does not exist</returns>
         </member>
-        <member name="M:OpenMetaverse.Caps.EventQueueEventHandler(System.String,OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.AppearanceManager.RequestCachedBakes">
             <summary>
-            Process any incoming events, check to see if we have a message created for the event, 
+            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>
-            <param name="eventName"></param>
-            <param name="body"></param>
-        </member>
-        <member name="P:OpenMetaverse.Caps.SeedCapsURI">
-            <summary>Capabilities URI this system was initialized with</summary>
-        </member>
-        <member name="P:OpenMetaverse.Caps.IsEventQueueRunning">
-            <summary>Whether the capabilities event queue is connected and
-            listening for incoming events</summary>
         </member>
-        <member name="T:OpenMetaverse.Caps.EventQueueCallback">
+        <member name="M:OpenMetaverse.AppearanceManager.GetWearableAsset(OpenMetaverse.WearableType)">
             <summary>
-            Triggered when an event is received via the EventQueueGet 
-            capability
+            Returns the AssetID of the asset that is currently being worn in a 
+            given WearableType slot
             </summary>
-            <param name="capsKey">Event name</param>
-            <param name="message">Decoded event data</param>
-            <param name="simulator">The simulator that generated the event</param>
+            <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.AgentThrottle">
+        <member name="M:OpenMetaverse.AppearanceManager.AddToOutfit(OpenMetaverse.InventoryItem)">
             <summary>
-            Throttles the network traffic for various different traffic types.
-            Access this class through GridClient.Throttle
+            Add a wearable to the current outfit and set appearance
             </summary>
+            <param name="wearableItem">Wearable to be added to the outfit</param>
         </member>
-        <member name="M:OpenMetaverse.AgentThrottle.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.AppearanceManager.AddToOutfit(OpenMetaverse.InventoryItem,System.Boolean)">
             <summary>
-            Default constructor, uses a default high total of 1500 KBps (1536000)
+            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="M:OpenMetaverse.AgentThrottle.#ctor(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.AppearanceManager.AddToOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
             <summary>
-            Constructor that decodes an existing AgentThrottle packet in to
-            individual values
+            Add a list of wearables to the current outfit and set appearance
             </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>
+            <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="M:OpenMetaverse.AgentThrottle.Set">
+        <member name="M:OpenMetaverse.AppearanceManager.AddToOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem},System.Boolean)">
             <summary>
-            Send an AgentThrottle packet to the current server using the 
-            current values
+            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="M:OpenMetaverse.AgentThrottle.Set(OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.AppearanceManager.RemoveFromOutfit(OpenMetaverse.InventoryItem)">
             <summary>
-            Send an AgentThrottle packet to the specified server using the 
-            current values
+            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="M:OpenMetaverse.AgentThrottle.ToBytes">
+        <member name="M:OpenMetaverse.AppearanceManager.RemoveFromOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
             <summary>
-            Convert the current throttle values to a byte array that can be put
-            in an AgentThrottle packet
+            Removes a list of wearables from the current outfit and set appearance
             </summary>
-            <returns>Byte array containing all the throttle values</returns>
-        </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Resend">
-            <summary>Maximum bits per second for resending unacknowledged packets</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Land">
-            <summary>Maximum bits per second for LayerData terrain</summary>
+            <param name="wearableItems">List of wearable inventory items to
+            be removed from the outfit</param>
         </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Wind">
-            <summary>Maximum bits per second for LayerData wind data</summary>
+        <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="P:OpenMetaverse.AgentThrottle.Cloud">
-            <summary>Maximum bits per second for LayerData clouds</summary>
+        <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="P:OpenMetaverse.AgentThrottle.Task">
-            <summary>Unknown, includes object data</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.IsItemWorn(OpenMetaverse.InventoryItem)">
+            <summary>
+            Checks if an inventory item is currently being worn
+            </summary>
+            <param name="item">The inventory item to check against the agent
+            wearables</param>
+            <returns>The WearableType slot that the item is being worn in,
+            or WearbleType.Invalid if it is not currently being worn</returns>
         </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Texture">
-            <summary>Maximum bits per second for textures</summary>
+        <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="P:OpenMetaverse.AgentThrottle.Asset">
-            <summary>Maximum bits per second for downloaded assets</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.WearOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryBase},System.Boolean)">
+            <summary>
+            Calls either <seealso cref="M:OpenMetaverse.AppearanceManager.ReplaceOutfit(System.Collections.Generic.List{OpenMetaverse.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="P:OpenMetaverse.AgentThrottle.Total">
-            <summary>Maximum bits per second the entire connection, divided up
-            between invidiual streams using default multipliers</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.AddAttachments(System.Collections.Generic.List{OpenMetaverse.InventoryItem},System.Boolean)">
+            <summary>
+            Adds a list of attachments to our agent
+            </summary>
+            <param name="attachments">A List containing the attachments to add</param>
+            <param name="removeExistingFirst">If true, tells simulator to remove existing attachment
+            first</param>
         </member>
-        <member name="T:OpenMetaverse.Primitive">
+        <member name="M:OpenMetaverse.AppearanceManager.AddAttachments(System.Collections.Generic.List{OpenMetaverse.InventoryItem},System.Boolean,System.Boolean)">
             <summary>
-            Particle system specific enumerators, flags and methods.
+            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="F:OpenMetaverse.Primitive.ID">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AppearanceManager.Attach(OpenMetaverse.InventoryItem,OpenMetaverse.AttachmentPoint)">
+            <summary>
+            Attach an item to our agent at a specific attach point
+            </summary>
+            <param name="item">A <seealso cref="T:OpenMetaverse.InventoryItem"/> to attach</param>
+            <param name="attachPoint">the <seealso cref="T:OpenMetaverse.AttachmentPoint"/> on the avatar 
+            to attach the item to</param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.GroupID">
-            <summary></summary>
+        <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="F:OpenMetaverse.Primitive.LocalID">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AppearanceManager.Attach(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.Permissions,System.UInt32,OpenMetaverse.AttachmentPoint)">
+            <summary>
+            Attach an item to our agent specifying attachment details
+            </summary>
+            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID"/> of the item to attach</param>
+            <param name="ownerID">The <seealso cref="T:OpenMetaverse.UUID"/> attachments owner</param>
+            <param name="name">The name of the attachment</param>
+            <param name="description">The description of the attahment</param>
+            <param name="perms">The <seealso cref="T:OpenMetaverse.Permissions"/> to apply when attached</param>
+            <param name="itemFlags">The <seealso cref="T:OpenMetaverse.InventoryItemFlags"/> of the attachment</param>
+            <param name="attachPoint">The <seealso cref="T:OpenMetaverse.AttachmentPoint"/> on the agent
+            to attach the item to</param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParentID">
-            <summary></summary>
+        <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="F:OpenMetaverse.Primitive.RegionHandle">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AppearanceManager.Detach(OpenMetaverse.InventoryItem)">
+            <summary>
+            Detach an item from our agent using an <seealso cref="T:OpenMetaverse.InventoryItem"/> object
+            </summary>
+            <param name="item">An <seealso cref="T:OpenMetaverse.InventoryItem"/> object</param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Flags">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AppearanceManager.Detach(OpenMetaverse.UUID)">
+            <summary>
+            Detach an item from our agent
+            </summary>
+            <param name="itemID">The inventory itemID of the item to detach</param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TreeSpecies">
-            <summary>Foliage type for this primitive. Only applicable if this
-            primitive is foliage</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.SendAgentIsNowWearing">
+            <summary>
+            Inform the sim which wearables are part of our current outfit
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ScratchPad">
-            <summary>Unknown</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.ReplaceOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryWearable})">
+            <summary>
+            Replaces the Wearables collection with a list of new wearable items
+            </summary>
+            <param name="wearableItems">Wearable items to replace the Wearables collection with</param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Position">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AppearanceManager.GetColorFromParams(System.Collections.Generic.List{OpenMetaverse.AppearanceManager.ColorParamInfo})">
+            <summary>
+            Calculates base color/tint for a specific wearable
+            based on its params
+            </summary>
+            <param name="param">All the color info gathered from wearable's VisualParams
+            passed as list of ColorParamInfo tuples</param>
+            <returns>Base color/tint for the wearable</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Scale">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AppearanceManager.GetAgentWearables">
+            <summary>
+            Blocking method to populate the Wearables dictionary
+            </summary>
+            <returns>True on success, otherwise false</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Rotation">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AppearanceManager.GetCachedBakes">
+            <summary>
+            Blocking method to populate the Textures array with cached bakes
+            </summary>
+            <returns>True on success, otherwise false</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Velocity">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AppearanceManager.DecodeWearableParams(OpenMetaverse.AppearanceManager.WearableData)">
+            <summary>
+            Populates textures and visual params from a decoded asset
+            </summary>
+            <param name="wearable">Wearable to decode</param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.AngularVelocity">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AppearanceManager.DownloadWearables">
+            <summary>
+            Blocking method to download and parse currently worn wearable assets
+            </summary>
+            <returns>True on success, otherwise false</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Acceleration">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AppearanceManager.GetTextureDownloadList(OpenMetaverse.BakeType)">
+            <summary>
+            Get a list of all of the textures that need to be downloaded for a
+            single bake layer
+            </summary>
+            <param name="bakeType">Bake layer to get texture AssetIDs for</param>
+            <returns>A list of texture AssetIDs to download</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.CollisionPlane">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AppearanceManager.AddTextureDownload(OpenMetaverse.AvatarTextureIndex,System.Collections.Generic.List{OpenMetaverse.UUID})">
+            <summary>
+            Helper method to lookup the TextureID for a single layer and add it
+            to a list if it is not already present
+            </summary>
+            <param name="index"></param>
+            <param name="textures"></param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Flexible">
-            <summary></summary>
+        <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="F:OpenMetaverse.Primitive.Light">
-            <summary></summary>
+        <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="F:OpenMetaverse.Primitive.Sculpt">
-            <summary></summary>
+        <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="F:OpenMetaverse.Primitive.ClickAction">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.Sound">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.OwnerID">
-            <summary>Identifies the owner if audio or a particle system is
-            active</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.SoundFlags">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.SoundGain">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.SoundRadius">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.Text">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.TextColor">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.MediaURL">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.Joint">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.JointPivot">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.JointAxisOrAnchor">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.NameValues">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.PrimData">
-            <summary></summary>
+        <member 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="F:OpenMetaverse.Primitive.Properties">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AppearanceManager.MakeParamValues">
+            <summary>
+            Creates a dictionary of visual param values from the downloaded wearables
+            </summary>
+            <returns>A dictionary of visual param indices mapping to visual param
+            values for our agent that can be fed to the Baker class</returns>
         </member>
-        <member name="M:OpenMetaverse.Primitive.#ctor">
+        <member name="M:OpenMetaverse.AppearanceManager.UpdateAvatarAppearance">
             <summary>
-            Default constructor
+            Initate server baking process
             </summary>
+            <returns>True if the server baking was successful</returns>
         </member>
-        <member name="M:OpenMetaverse.Primitive.PackPathTwist(System.Single)">
+        <member name="M:OpenMetaverse.AppearanceManager.GetCOF">
             <summary>
-            Packs PathTwist, PathTwistBegin, PathRadiusOffset, and PathSkew
-            parameters in to signed eight bit values
+            Get the latest version of COF
             </summary>
-            <param name="pathTwist">Floating point parameter to pack</param>
-            <returns>Signed eight bit value containing the packed parameter</returns>
+            <returns>Current Outfit Folder (or null if getting the data failed)</returns>
         </member>
-        <member name="M:OpenMetaverse.Primitive.UnpackPathTwist(System.SByte)">
+        <member name="M:OpenMetaverse.AppearanceManager.RequestAgentSetAppearance">
             <summary>
-            Unpacks PathTwist, PathTwistBegin, PathRadiusOffset, and PathSkew
-            parameters from signed eight bit integers to floating point values
+            Create an AgentSetAppearance packet from Wearables data and the 
+            Textures array and send it
             </summary>
-            <param name="pathTwist">Signed eight bit value to unpack</param>
-            <returns>Unpacked floating point value</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSys">
-            <summary></summary>
+        <member 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="F:OpenMetaverse.Primitive.MediaVersion">
+        <member name="M:OpenMetaverse.AppearanceManager.BakeTypeToAgentTextureIndex(OpenMetaverse.BakeType)">
             <summary>
-            Current version of the media data for the prim
+            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="F:OpenMetaverse.Primitive.FaceMedia">
+        <member name="M:OpenMetaverse.AppearanceManager.MorphLayerForBakeType(OpenMetaverse.BakeType)">
             <summary>
-            Array of media entries indexed by face number
+            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="F:OpenMetaverse.Primitive.Textures">
-            <summary></summary>
+        <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="F:OpenMetaverse.Primitive.TextureAnim">
-            <summary></summary>
+        <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="P:OpenMetaverse.Primitive.Type">
-            <summary>Uses basic heuristics to estimate the primitive shape</summary>
+        <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.Primitive.ConstructionData">
+        <member name="E:OpenMetaverse.AppearanceManager.AppearanceSet">
             <summary>
-            Parameters used to construct a visual representation of a primitive
+            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="F:OpenMetaverse.Primitive.ConstructionData.profileCurve">
-            <summary></summary>
+        <member name="E:OpenMetaverse.AppearanceManager.RebakeAvatarRequested">
+            <summary>
+            Triggered when the simulator requests the agent rebake its appearance.
+            </summary>
+            <seealso cref="!:RebakeAvatarRequest"/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathCurve">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AppearanceManager.ManagerBusy">
+            <summary>
+            Returns true if AppearanceManager is busy and trying to set or change appearance will fail
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathEnd">
-            <summary></summary>
+        <member name="T:OpenMetaverse.AppearanceManager.WearableData">
+            <summary>
+            Contains information about a wearable inventory item
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathRadiusOffset">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.ItemID">
+            <summary>Inventory ItemID of the wearable</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathSkew">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.AssetID">
+            <summary>AssetID of the wearable asset</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathScaleX">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.WearableType">
+            <summary>WearableType of the wearable</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathScaleY">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.AssetType">
+            <summary>AssetType of the wearable</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathShearX">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.Asset">
+            <summary>Asset data for the wearable</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathShearY">
-            <summary></summary>
+        <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="F:OpenMetaverse.Primitive.ConstructionData.PathTaperX">
-            <summary></summary>
+        <member name="T:OpenMetaverse.AppearanceManager.TextureData">
+            <summary>
+            Holds a texture assetID and the data needed to bake this layer into
+            an outfit texture. Used to keep track of currently worn textures
+            and baking data
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTaperY">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureID">
+            <summary>A texture AssetID</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathBegin">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.Texture">
+            <summary>Asset data for the texture</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTwist">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.AlphaMasks">
+            <summary>Collection of alpha masks that needs applying</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTwistBegin">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.Color">
+            <summary>Tint that should be applied to the texture</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathRevolutions">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureIndex">
+            <summary>Where on avatar does this texture belong</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileBegin">
-            <summary></summary>
+        <member name="T:OpenMetaverse.AgentWearablesReplyEventArgs">
+            <summary>Contains the Event data returned from the data server from an AgentWearablesRequest</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileEnd">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AgentWearablesReplyEventArgs.#ctor">
+            <summary>Construct a new instance of the AgentWearablesReplyEventArgs class</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileHollow">
-            <summary></summary>
+        <member name="T:OpenMetaverse.AgentCachedBakesReplyEventArgs">
+            <summary>Contains the Event data returned from the data server from an AgentCachedTextureResponse</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.Material">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AgentCachedBakesReplyEventArgs.#ctor">
+            <summary>Construct a new instance of the AgentCachedBakesReplyEventArgs class</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.State">
-            <summary></summary>
+        <member name="T:OpenMetaverse.AppearanceSetEventArgs">
+            <summary>Contains the Event data returned from an AppearanceSetRequest</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PCode">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AppearanceSetEventArgs.#ctor(System.Boolean)">
+            <summary>
+            Triggered when appearance data is sent to the sim and
+            the main appearance thread is done.</summary>
+            <param name="success">Indicates whether appearance setting was successful</param>
         </member>
-        <member name="P:OpenMetaverse.Primitive.ConstructionData.AttachmentPoint">
-            <summary>Attachment point to an avatar</summary>
+        <member name="P:OpenMetaverse.AppearanceSetEventArgs.Success">
+            <summary>Indicates whether appearance setting was successful</summary>
         </member>
-        <member name="P:OpenMetaverse.Primitive.ConstructionData.ProfileCurve">
-            <summary></summary>
+        <member name="T:OpenMetaverse.RebakeAvatarTexturesEventArgs">
+            <summary>Contains the Event data returned from the data server from an RebakeAvatarTextures</summary>
         </member>
-        <member name="P:OpenMetaverse.Primitive.ConstructionData.ProfileHole">
-            <summary></summary>
+        <member name="M:OpenMetaverse.RebakeAvatarTexturesEventArgs.#ctor(OpenMetaverse.UUID)">
+            <summary>
+            Triggered when the simulator sends a request for this agent to rebake
+            its appearance
+            </summary>
+            <param name="textureID">The ID of the Texture Layer to bake</param>
         </member>
-        <member name="P:OpenMetaverse.Primitive.ConstructionData.PathBeginScale">
-            <summary></summary>
+        <member name="P:OpenMetaverse.RebakeAvatarTexturesEventArgs.TextureID">
+            <summary>The ID of the Texture Layer to bake</summary>
         </member>
-        <member name="P:OpenMetaverse.Primitive.ConstructionData.PathEndScale">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Width">
+            <summary>
+            Image width
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Primitive.FlexibleData">
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Height">
             <summary>
-            Information on the flexible properties of a primitive
+            Image height
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Softness">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Channels">
+            <summary>
+            Image channel flags
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Gravity">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Red">
+            <summary>
+            Red channel data
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Drag">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Green">
+            <summary>
+            Green channel data
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Wind">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Blue">
+            <summary>
+            Blue channel data
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Tension">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Alpha">
+            <summary>
+            Alpha channel data
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Force">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Bump">
+            <summary>
+            Bump channel data
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.FlexibleData.#ctor">
+        <member name="M:OpenMetaverse.Imaging.ManagedImage.#ctor(System.Int32,System.Int32,OpenMetaverse.Imaging.ManagedImage.ImageChannels)">
             <summary>
-            Default constructor
+            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.Primitive.FlexibleData.#ctor(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Imaging.ManagedImage.#ctor(System.Drawing.Bitmap)">
             <summary>
             
             </summary>
-            <param name="data"></param>
-            <param name="pos"></param>
+            <param name="bitmap"></param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.FlexibleData.GetBytes">
+        <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>
-            <returns></returns>
+            <param name="channels">new channel flags</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.FlexibleData.GetOSD">
+        <member name="M:OpenMetaverse.Imaging.ManagedImage.ResizeNearestNeighbor(System.Int32,System.Int32)">
             <summary>
-            
+            Resize or stretch the image using nearest neighbor (ugly) resampling
             </summary>
-            <returns></returns>
+            <param name="width">new width</param>
+            <param name="height">new height</param>
         </member>
-        <member name="T:OpenMetaverse.Primitive.LightData">
+        <member name="M:OpenMetaverse.Imaging.ManagedImage.ExportRaw">
             <summary>
-            Information on the light properties of a primitive
+            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="F:OpenMetaverse.Primitive.LightData.Color">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Assets.AssetMutable">
+            <summary>
+            Represents an Animation
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.LightData.Intensity">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Assets.AssetMutable.#ctor(OpenMetaverse.AssetType)">
+            <summary>Default Constructor</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.LightData.Radius">
+        <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="P:OpenMetaverse.Assets.AssetMutable.AssetType">
+            <summary>Override the base classes AssetType</summary>
+        </member>
+        <member name="T:OpenMetaverse.PacketFrequency">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.PacketFrequency.Low">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.LightData.Cutoff">
+        <member name="F:OpenMetaverse.PacketFrequency.Medium">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.LightData.Falloff">
+        <member name="F:OpenMetaverse.PacketFrequency.High">
             <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.LightData.#ctor">
+        <member name="T:OpenMetaverse.Packets.MalformedDataException">
             <summary>
-            Default constructor
+            Thrown when a packet could not be successfully deserialized
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.LightData.#ctor(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Packets.MalformedDataException.#ctor">
             <summary>
-            
+            Default constructor
             </summary>
-            <param name="data"></param>
-            <param name="pos"></param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.LightData.GetBytes">
+        <member name="M:OpenMetaverse.Packets.MalformedDataException.#ctor(System.String)">
             <summary>
-            
+            Constructor that takes an additional error message
             </summary>
-            <returns></returns>
+            <param name="Message">An error message to attach to this exception</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.LightData.ToString">
+        <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>
-            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Primitive.SculptData">
+        <member name="M:OpenMetaverse.Packets.Header.AcksToBytes(System.Byte[],System.Int32@)">
             <summary>
-            Information on the sculpt properties of a sculpted primitive
+            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.Primitive.SculptData.#ctor">
+        <member name="M:OpenMetaverse.Packets.Header.BuildHeader(System.Byte[],System.Int32@,System.Int32@)">
             <summary>
-            Default constructor
+            
             </summary>
+            <param name="bytes"></param>
+            <param name="pos"></param>
+            <param name="packetEnd"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Primitive.SculptData.#ctor(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Packets.Header.CreateAckList(OpenMetaverse.Packets.Header@,System.Byte[],System.Int32@)">
             <summary>
             
             </summary>
-            <param name="data"></param>
-            <param name="pos"></param>
+            <param name="header"></param>
+            <param name="bytes"></param>
+            <param name="packetEnd"></param>
         </member>
-        <member name="P:OpenMetaverse.Primitive.SculptData.Invert">
+        <member name="T:OpenMetaverse.Packets.PacketBlock">
             <summary>
-            Render inside out (inverts the normals).
+            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="P:OpenMetaverse.Primitive.SculptData.Mirror">
+        <member name="M:OpenMetaverse.Packets.PacketBlock.FromBytes(System.Byte[],System.Int32@)">
             <summary>
-            Render an X axis mirror of the sculpty.
+            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>
-        <member name="T:OpenMetaverse.Primitive.ObjectProperties">
+        <member name="M:OpenMetaverse.Packets.PacketBlock.ToBytes(System.Byte[],System.Int32@)">
             <summary>
-            Extended properties to describe an object
+            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="F:OpenMetaverse.Primitive.ObjectProperties.ObjectID">
-            <summary></summary>
+        <member name="P:OpenMetaverse.Packets.PacketBlock.Length">
+            <summary>Current length of the data in this packet</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.CreatorID">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Packets.PacketType.Default">
+            <summary>A generic value, not an actual packet type</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.OwnerID">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Packets.Packet.BuildPacket(System.String,OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Attempts to convert an LLSD structure to a known Packet type
+            </summary>
+            <param name="capsEventName">Event name, this must match an actual
+            packet name for a Packet to be successfully built</param>
+            <param name="body">LLSD to convert to a Packet</param>
+            <returns>A Packet on success, otherwise null</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.GroupID">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TestMessagePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.CreationDate">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TestMessagePacket.TestBlock1Block">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Permissions">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TestMessagePacket.NeighborBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.OwnershipCost">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.UseCircuitCodePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SaleType">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.UseCircuitCodePacket.CircuitCodeBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SalePrice">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TelehubInfoPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePerms">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TelehubInfoPacket.TelehubBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePermTextures">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TelehubInfoPacket.SpawnPointBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePermTexturesOwner">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.EconomyDataRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Category">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.EconomyDataPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.InventorySerial">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.EconomyDataPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.ItemID">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.FolderID">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.FromTaskID">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.LastOwnerID">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Name">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Description">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.TouchName">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SitName">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.TextureIDs">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.TransactionDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Primitive.ObjectProperties.#ctor">
-            <summary>
-            Default constructor
-            </summary>
+        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.QueryDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.PlacesReplyPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Primitive.ParticleSystem">
-            <summary>
-            Complete structure for the particle system
-            </summary>
+        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.PlacesReplyPacket.TransactionDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.Pattern">
-            <summary><seealso cref="T:SourcePattern"/> pattern of particles</summary>
+        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.QueryDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.DirFindQueryPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.DirFindQueryPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.DirFindQueryPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.OuterAngle">
-            <summary>A <see langword="float"/> in radians that specifies where particles will be created</summary>
+        <member name="T:OpenMetaverse.Packets.DirPlacesQueryPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstRate">
-            <summary>A <see langword="float"/> representing the number of seconds between burts.</summary>
+        <member name="T:OpenMetaverse.Packets.DirPlacesQueryPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.DirPlacesQueryPacket.QueryDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.DirPlacesReplyPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstPartCount">
-            <summary>A <see langword="byte"/> representing the maximum number of particles emitted per burst</summary>
+        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.QueryDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.DirPlacesReplyPacket.QueryRepliesBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.DirPlacesReplyPacket.StatusDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.DirPeopleReplyPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.DirPeopleReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartDataFlags">
-            <summary>Flags of particle from <seealso cref="T:ParticleDataFlags"/></summary>
+        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartMaxAge">
-            <summary>Max Age particle system will emit particles for</summary>
+        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.QueryRepliesBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.DirEventsReplyPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.DirEventsReplyPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.DirEventsReplyPacket.QueryDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.DirEventsReplyPacket.QueryRepliesBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.DirEventsReplyPacket.StatusDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.DirGroupsReplyPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Primitive.ParticleSystem.#ctor(System.Byte[],System.Int32)">
-            <summary>
-            Decodes a byte[] array into a ParticleSystem Object
-            </summary>
-            <param name="data">ParticleSystem object</param>
-            <param name="pos">Start position for BitPacker</param>
+        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Primitive.ParticleSystem.GetBytes">
-            <summary>
-            Generate byte[] array from particle data
-            </summary>
-            <returns>Byte array</returns>
+        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Primitive.ParticleSystem.SourcePattern">
-            <summary>
-            Particle source pattern
-            </summary>
+        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.QueryRepliesBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.None">
-            <summary>None</summary>
+        <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Drop">
-            <summary>Drop particles from source position with no force</summary>
+        <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Explode">
-            <summary>"Explode" particles in all directions</summary>
+        <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Angle">
-            <summary>Particles shoot across a 2D area</summary>
+        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.AngleCone">
-            <summary>Particles shoot across a 3D Cone</summary>
+        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.AngleConeEmpty">
-            <summary>Inverse of AngleCone (shoot particles everywhere except the 3D cone defined</summary>
+        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags">
-            <summary>
-            Particle Data Flags
-            </summary>
+        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.QueryRepliesBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.None">
-            <summary>None</summary>
+        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.StatusDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.InterpColor">
-            <summary>Interpolate color and alpha from start to end</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.InterpScale">
-            <summary>Interpolate scale from start to end</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Bounce">
-            <summary>Bounce particles off particle sources Z height</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Wind">
-            <summary>velocity of particles is dampened toward the simulators wind</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.FollowSrc">
-            <summary>Particles follow the source</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.FollowVelocity">
-            <summary>Particles point towards the direction of source's velocity</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.TargetPos">
-            <summary>Target of the particles</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.TargetLinear">
-            <summary>Particles are sent in a straight line</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Emissive">
-            <summary>Particles emit a glow</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Beam">
-            <summary>used for point/grab/touch</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags">
-            <summary>
-            Particle Flags Enum
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags.None">
-            <summary>None</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags.ObjectRelative">
-            <summary>Acceleration and velocity for particles are
-            relative to the object rotation</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags.UseNewAngle">
-            <summary>Particles use new 'correct' angle parameters</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Primitive.TextureAnimMode">
-            <summary>
-            Texture animation mode
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ANIM_OFF">
-            <summary>Disable texture animation</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ANIM_ON">
-            <summary>Enable texture animation</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.LOOP">
-            <summary>Loop when animating textures</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.REVERSE">
-            <summary>Animate in reverse direction</summary>
+        <member name="T:OpenMetaverse.Packets.DirLandQueryPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.PING_PONG">
-            <summary>Animate forward then reverse</summary>
+        <member name="T:OpenMetaverse.Packets.DirLandQueryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.SMOOTH">
-            <summary>Slide texture smoothly instead of frame-stepping</summary>
+        <member name="T:OpenMetaverse.Packets.DirLandQueryPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ROTATE">
-            <summary>Rotate texture instead of using frames</summary>
+        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.SCALE">
-            <summary>Scale texture instead of using frames</summary>
+        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Primitive.TextureEntryFace">
-            <summary>
-            A single textured face. Don't instantiate this class yourself, use the
-            methods in TextureEntry
-            </summary>
+        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntryFace.#ctor(OpenMetaverse.Primitive.TextureEntryFace)">
-            <summary>
-            Contains the definition for individual faces
-            </summary>
-            <param name="defaultTexture"></param>
+        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket.QueryRepliesBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntryFace.ToString">
-            <summary>
-            
-            </summary>
-            <returns></returns>
+        <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.material">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.media">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RGBA">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RepeatU">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RepeatV">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.OffsetU">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket.QueryRepliesBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.OffsetV">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ParcelInfoRequestPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Rotation">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ParcelInfoRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Glow">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ParcelInfoRequestPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Bump">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ParcelInfoReplyPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ParcelInfoReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.TextureID">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ParcelInfoReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Primitive.TextureEntry">
-            <summary>
-            Represents all of the texturable faces for an object
-            </summary>
-            <remarks>Grid objects have infinite faces, with each face
-            using the properties of the default face unless set otherwise. So if
-            you have a TextureEntry with a default texture uuid of X, and face 18
-            has a texture UUID of Y, every face would be textured with X except for
-            face 18 that uses Y. In practice however, primitives utilize a maximum
-            of nine faces</remarks>
+        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureEntry.DefaultTexture">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureEntry.FaceTextures">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(OpenMetaverse.UUID)">
-            <summary>
-            Constructor that takes a default texture UUID
-            </summary>
-            <param name="defaultTextureID">Texture UUID to use as the default texture</param>
+        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersReplyPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(OpenMetaverse.Primitive.TextureEntryFace)">
-            <summary>
-            Constructor that takes a <code>TextureEntryFace</code> for the
-            default face
-            </summary>
-            <param name="defaultFace">Face to use as the default face</param>
+        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(System.Byte[],System.Int32,System.Int32)">
-            <summary>
-            Constructor that creates the TextureEntry class from a byte array
-            </summary>
-            <param name="data">Byte array containing the TextureEntry field</param>
-            <param name="pos">Starting position of the TextureEntry field in 
-            the byte array</param>
-            <param name="length">Length of the TextureEntry field, in bytes</param>
+        <member name="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.CreateFace(System.UInt32)">
-            <summary>
-            This will either create a new face if a custom face for the given
-            index is not defined, or return the custom face for that index if
-            it already exists
-            </summary>
-            <param name="index">The index number of the face to create or 
-            retrieve</param>
-            <returns>A TextureEntryFace containing all the properties for that
-            face</returns>
+        <member name="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetFace(System.UInt32)">
-            <summary>
-            
-            </summary>
-            <param name="index"></param>
-            <returns></returns>
+        <member name="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetOSD">
-            <summary>
-            
-            </summary>
-            <returns></returns>
+        <member name="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetBytes">
-            <summary>
-            
-            </summary>
-            <returns></returns>
+        <member name="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.ToString">
-            <summary>
-            
-            </summary>
-            <returns></returns>
+        <member name="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Primitive.TextureAnimation">
-            <summary>
-            Controls the texture animation of a particular prim
-            </summary>
+        <member name="T:OpenMetaverse.Packets.GroupNoticeRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Flags">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.GroupNoticeRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Face">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.GroupNoticeRequestPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.SizeX">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TeleportRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.SizeY">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TeleportRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Start">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TeleportRequestPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Length">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Rate">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureAnimation.#ctor(System.Byte[],System.Int32)">
-            <summary>
-            
-            </summary>
-            <param name="data"></param>
-            <param name="pos"></param>
+        <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureAnimation.GetBytes">
-            <summary>
-            
-            </summary>
-            <returns></returns>
+        <member name="T:OpenMetaverse.Packets.TeleportLocalPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Imaging.OpenJPEG">
-            <summary>
-            A Wrapper around openjpeg to encode and decode images to and from byte arrays
-            </summary>
+        <member name="T:OpenMetaverse.Packets.TeleportLocalPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Imaging.OpenJPEG.TGA_HEADER_SIZE">
-            <summary>TGA Header size</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportLandmarkRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Imaging.OpenJPEG.OpenJPEGLock">
-            <summary>OpenJPEG is not threadsafe, so this object is used to lock
-            during calls into unmanaged code</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportLandmarkRequestPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Imaging.OpenJPEG.Encode(OpenMetaverse.Imaging.ManagedImage,System.Boolean)">
-            <summary>
-            Encode a <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object into a byte array
-            </summary>
-            <param name="image">The <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object to encode</param>
-            <param name="lossless">true to enable lossless conversion, only useful for small images ie: sculptmaps</param>
-            <returns>A byte array containing the encoded Image object</returns>
+        <member name="T:OpenMetaverse.Packets.TeleportProgressPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Imaging.OpenJPEG.Encode(OpenMetaverse.Imaging.ManagedImage)">
-            <summary>
-            Encode a <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object into a byte array
-            </summary>
-            <param name="image">The <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object to encode</param>
-            <returns>a byte array of the encoded image</returns>
+        <member name="T:OpenMetaverse.Packets.TeleportProgressPacket.AgentDataBlock">
+            <exclude/>
         </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>
-        <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="T:OpenMetaverse.Packets.TeleportProgressPacket.InfoBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.TeleportFinishPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Imaging.OpenJPEG.EncodeFromImage(System.Drawing.Bitmap,System.Boolean)">
-            <summary>
-            Encode a <seealso cref="T:System.Drawing.Bitmap"/> object into a byte array
-            </summary>
-            <param name="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 name="T:OpenMetaverse.Packets.TeleportFinishPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Imaging.OpenJPEG.J2KLayerInfo">
-            <summary>
-            Defines the beginning and ending file positions of a layer in an
-            LRCP-progression JPEG2000 file
-            </summary>
+        <member name="T:OpenMetaverse.Packets.StartLurePacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Imaging.OpenJPEG.MarshalledImage">
-            <summary>
-            This structure is used to marshal both encoded and decoded images.
-            MUST MATCH THE STRUCT IN dotnet.h!
-            </summary>
+        <member name="T:OpenMetaverse.Packets.StartLurePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket">
-            <summary>
-            Information about a single packet in a JPEG2000 stream
-            </summary>
+        <member name="T:OpenMetaverse.Packets.StartLurePacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.start_pos">
-            <summary>Packet start position</summary>
+        <member name="T:OpenMetaverse.Packets.StartLurePacket.TargetDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.end_ph_pos">
-            <summary>Packet header end position</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportLureRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.end_pos">
-            <summary>Packet end position</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportLureRequestPacket.InfoBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.TeleportCancelPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetWearable">
-            <summary>
-            Represents a Wearable Asset, Clothing, Hair, Skin, Etc
-            </summary>
+        <member name="T:OpenMetaverse.Packets.TeleportCancelPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Name">
-            <summary>A string containing the name of the asset</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportStartPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Description">
-            <summary>A string containing a short description of the asset</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportStartPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.WearableType">
-            <summary>The Assets WearableType</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportFailedPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.ForSale">
-            <summary>The For-Sale status of the object</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportFailedPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.SalePrice">
-            <summary>An Integer representing the purchase price of the asset</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportFailedPacket.AlertInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Creator">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the assets creator</summary>
+        <member name="T:OpenMetaverse.Packets.UndoPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Owner">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the assets current owner</summary>
+        <member name="T:OpenMetaverse.Packets.UndoPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.LastOwner">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the assets prior owner</summary>
+        <member name="T:OpenMetaverse.Packets.UndoPacket.ObjectDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.RedoPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.GroupOwned">
-            <summary>True if the asset is owned by a <seealso cref="F:OpenMetaverse.Assets.AssetWearable.Group"/></summary>
+        <member name="T:OpenMetaverse.Packets.RedoPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Permissions">
-            <summary>The Permissions mask of the asset</summary>
+        <member name="T:OpenMetaverse.Packets.RedoPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Params">
-            <summary>A Dictionary containing Key/Value pairs of the objects parameters</summary>
+        <member name="T:OpenMetaverse.Packets.UndoLandPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.UndoLandPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetWearable.#ctor">
-            <summary>Initializes a new instance of an AssetWearable object</summary>
+        <member name="T:OpenMetaverse.Packets.AgentPausePacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetWearable.#ctor(OpenMetaverse.UUID,System.Byte[])">
-            <summary>Initializes a new instance of an AssetWearable object with parameters</summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
+        <member name="T:OpenMetaverse.Packets.AgentPausePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetWearable.Decode">
-            <summary>
-            Decode an assets byte encoded data to a string
-            </summary>
-            <returns>true if the asset data was decoded successfully</returns>
+        <member name="T:OpenMetaverse.Packets.AgentResumePacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetWearable.Encode">
-            <summary>
-            Encode the assets string represantion into a format consumable by the asset server
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AgentResumePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetBodypart.#ctor">
-            <summary>Initializes a new instance of an AssetBodyPart object</summary>
+        <member name="T:OpenMetaverse.Packets.ChatFromViewerPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ChatFromViewerPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetBodypart.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="T:OpenMetaverse.Packets.ChatFromViewerPacket.ChatDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.FieldType">
-            <summary>
-            
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AgentThrottlePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.U8">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentThrottlePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.U16">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentThrottlePacket.ThrottleBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.U32">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentFOVPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.U64">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentFOVPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.S8">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentFOVPacket.FOVBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.S16">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.S32">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.F32">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket.HeightWidthBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.F64">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.UUID">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.BOOL">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.WearableDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Vector3">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Vector3d">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.VisualParamBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Vector4">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Quaternion">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.IPADDR">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket.FuseBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.IPPORT">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ImageNotInDatabasePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Variable">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ImageNotInDatabasePacket.ImageIDBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Fixed">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RebakeAvatarTexturesPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Single">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RebakeAvatarTexturesPacket.TextureDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Multiple">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.SetAlwaysRunPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.MapField">
-            <summary>
-            
-            </summary>
+        <member name="T:OpenMetaverse.Packets.SetAlwaysRunPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MapField.KeywordPosition">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDeletePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MapField.Name">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDeletePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MapField.Type">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDeletePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MapField.Count">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.MapField.CompareTo(System.Object)">
-            <summary>
-            
-            </summary>
-            <param name="obj"></param>
-            <returns></returns>
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.MapBlock">
-            <summary>
-            
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.SharedDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MapBlock.KeywordPosition">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MapBlock.Name">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MapBlock.Count">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MapBlock.Fields">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.MapBlock.CompareTo(System.Object)">
-            <summary>
-            
-            </summary>
-            <param name="obj"></param>
-            <returns></returns>
+        <member name="T:OpenMetaverse.Packets.ObjectScalePacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.MapPacket">
-            <summary>
-            
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectScalePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.ID">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectScalePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.Name">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectRotationPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.Frequency">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectRotationPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.Trusted">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectRotationPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.Encoded">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.Blocks">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ProtocolManager">
-            <summary>
-            
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket.ExtraPhysicsBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ProtocolManager.TypeSizes">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectClickActionPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ProtocolManager.KeywordPositions">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectClickActionPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ProtocolManager.LowMaps">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectClickActionPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ProtocolManager.MediumMaps">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectImagePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ProtocolManager.HighMaps">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectImagePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.#ctor(System.String,OpenMetaverse.GridClient)">
-            <summary>
-            
-            </summary>
-            <param name="mapFile"></param>
-            <param name="client"></param>
+        <member name="T:OpenMetaverse.Packets.ObjectImagePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.Command(System.String)">
-            <summary>
-            
-            </summary>
-            <param name="command"></param>
-            <returns></returns>
+        <member name="T:OpenMetaverse.Packets.ObjectMaterialPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.Command(System.Byte[])">
-            <summary>
-            
-            </summary>
-            <param name="data"></param>
-            <returns></returns>
+        <member name="T:OpenMetaverse.Packets.ObjectMaterialPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.Command(System.UInt16,OpenMetaverse.PacketFrequency)">
-            <summary>
-            
-            </summary>
-            <param name="command"></param>
-            <param name="frequency"></param>
-            <returns></returns>
+        <member name="T:OpenMetaverse.Packets.ObjectMaterialPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.PrintMap">
-            <summary>
-            
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectShapePacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.PrintOneMap(OpenMetaverse.MapPacket[],System.String)">
-            <summary>
-            
-            </summary>
-            <param name="map"></param>
-            <param name="frequency"></param>
+        <member name="T:OpenMetaverse.Packets.ObjectShapePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.DecodeMapFile(System.String,System.String)">
-            <summary>
-            
-            </summary>
-            <param name="mapFile"></param>
-            <param name="outputFile"></param>
+        <member name="T:OpenMetaverse.Packets.ObjectShapePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.LoadMapFile(System.String)">
-            <summary>
-            
-            </summary>
-            <param name="mapFile"></param>
+        <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ScriptPermission">
-            <summary>
-            Permission request flags, asked when a script wants to control an Avatar
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.None">
-            <summary>Placeholder for empty values, shouldn't ever see this</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.Debit">
-            <summary>Script wants ability to take money from you</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.TakeControls">
-            <summary>Script wants to take camera controls for you</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.RemapControls">
-            <summary>Script wants to remap avatars controls</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.HeaderDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.TriggerAnimation">
-            <summary>Script wants to trigger avatar animations</summary>
-            <remarks>This function is not implemented on the grid</remarks>
+        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.Attach">
-            <summary>Script wants to attach or detach the prim or primset to your avatar</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectGroupPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.ReleaseOwnership">
-            <summary>Script wants permission to release ownership</summary>
-            <remarks>This function is not implemented on the grid
-            The concept of "public" objects does not exist anymore.</remarks>
+        <member name="T:OpenMetaverse.Packets.ObjectGroupPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.ChangeLinks">
-            <summary>Script wants ability to link/delink with other prims</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectGroupPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.ChangeJoints">
-            <summary>Script wants permission to change joints</summary>
-            <remarks>This function is not implemented on the grid</remarks>
+        <member name="T:OpenMetaverse.Packets.ObjectBuyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.ChangePermissions">
-            <summary>Script wants permissions to change permissions</summary>
-            <remarks>This function is not implemented on the grid</remarks>
+        <member name="T:OpenMetaverse.Packets.ObjectBuyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.TrackCamera">
-            <summary>Script wants to track avatars camera position and rotation </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectBuyPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.ControlCamera">
-            <summary>Script wants to control your camera</summary>
+        <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.InstantMessageDialog">
-            <summary>
-            Special commands used in Instant Messages
-            </summary>
+        <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.MessageFromAgent">
-            <summary>Indicates a regular IM from another agent</summary>
+        <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.MessageBox">
-            <summary>Simple notification box with an OK button</summary>
+        <member name="T:OpenMetaverse.Packets.DerezContainerPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.DerezContainerPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.InventoryAccepted">
-            <summary>Accepted inventory offer</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.InventoryDeclined">
-            <summary>Declined inventory offer</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupVote">
-            <summary>Group vote</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket.HeaderDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryOffered">
-            <summary>An object is offering its inventory</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryAccepted">
-            <summary>Accept an inventory offer from an object</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSaleInfoPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryDeclined">
-            <summary>Decline an inventory offer from an object</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSaleInfoPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.NewUserDefault">
-            <summary>Unknown</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSaleInfoPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.SessionAdd">
-            <summary>Start a session, or add users to a session</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectNamePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.SessionOfflineAdd">
-            <summary>Start a session, but don't prune offline users</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectNamePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.SessionGroupStart">
-            <summary>Start a session with your group</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectNamePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.SessionCardlessStart">
-            <summary>Start a session without a calling card (finder or objects)</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDescriptionPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.SessionSend">
-            <summary>Send a message to a session</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDescriptionPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.SessionDrop">
-            <summary>Leave a session</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDescriptionPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.MessageFromObject">
-            <summary>Indicates that the IM is from an object</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectCategoryPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.BusyAutoResponse">
-            <summary>Sent an IM to a busy user, this is the auto response</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectCategoryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.ConsoleAndChatHistory">
-            <summary>Shows the message in the console and chat history</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectCategoryPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.RequestTeleport">
-            <summary>Send a teleport lure</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSelectPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.AcceptTeleport">
-            <summary>Response sent to the agent which inititiated a teleport invitation</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSelectPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.DenyTeleport">
-            <summary>Response sent to the agent which inititiated a teleport invitation</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSelectPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GodLikeRequestTeleport">
-            <summary>Only useful if you have Linden permissions</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDeselectPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.CurrentlyUnused">
-            <summary>A placeholder type for future expansion, currently not
-            used</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDeselectPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GotoUrl">
-            <summary>IM to tell the user to go to an URL</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDeselectPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.Session911Start">
-            <summary>IM for help</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectAttachPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.Lure911">
-            <summary>IM sent automatically on call for help, sends a lure 
-            to each Helper reached</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectAttachPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.FromTaskAsAlert">
-            <summary>Like an IM but won't go to email</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectAttachPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNotice">
-            <summary>IM from a group officer to all group members</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDetachPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNoticeInventoryAccepted">
-            <summary>Unknown</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDetachPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNoticeInventoryDeclined">
-            <summary>Unknown</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDetachPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupInvitationAccept">
-            <summary>Accept a group invitation</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDropPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupInvitationDecline">
-            <summary>Decline a group invitation</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDropPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNoticeRequested">
-            <summary>Unknown</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDropPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipOffered">
-            <summary>An avatar is offering you friendship</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectLinkPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipAccepted">
-            <summary>An avatar has accepted your friendship offer</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectLinkPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipDeclined">
-            <summary>An avatar has declined your friendship offer</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectLinkPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.StartTyping">
-            <summary>Indicates that a user has started typing</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDelinkPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.StopTyping">
-            <summary>Indicates that a user has stopped typing</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDelinkPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.InstantMessageOnline">
-            <summary>
-            Flag in Instant Messages, whether the IM should be delivered to
-            offline avatars as well
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDelinkPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageOnline.Online">
-            <summary>Only deliver to online avatars</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectGrabPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageOnline.Offline">
-            <summary>If the avatar is offline the message will be held until
-            they login next, and possibly forwarded to their e-mail account</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectGrabPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ChatType">
-            <summary>
-            Conversion type to denote Chat Packet types in an easier-to-understand format
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectGrabPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ChatType.Whisper">
-            <summary>Whisper (5m radius)</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectGrabPacket.SurfaceInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ChatType.Normal">
-            <summary>Normal chat (10/20m radius), what the official viewer typically sends</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ChatType.Shout">
-            <summary>Shouting! (100m radius)</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ChatType.StartTyping">
-            <summary>Event message when an Avatar has begun to type</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ChatType.StopTyping">
-            <summary>Event message when an Avatar has stopped typing</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.SurfaceInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ChatType.Debug">
-            <summary>Send the message to the debug channel</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ChatType.OwnerSay">
-            <summary>Event message when an object uses llOwnerSay</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ChatType.RegionSay">
-            <summary>Special value to support llRegionSay, never sent to the client</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ChatSourceType">
-            <summary>
-            Identifies the source of a chat message
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket.SurfaceInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ChatSourceType.System">
-            <summary>Chat from the grid or simulator</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSpinStartPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ChatSourceType.Agent">
-            <summary>Chat from another avatar</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSpinStartPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ChatSourceType.Object">
-            <summary>Chat from an object</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSpinStartPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ChatAudibleLevel">
-            <summary>
-            
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSpinUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ChatAudibleLevel.Not">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSpinUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ChatAudibleLevel.Barely">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSpinUpdatePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ChatAudibleLevel.Fully">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSpinStopPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.EffectType">
-            <summary>
-            Effect type used in ViewerEffect packets
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSpinStopPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Text">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSpinStopPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Icon">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectExportSelectedPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Connector">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectExportSelectedPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.EffectType.FlexibleObject">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ObjectExportSelectedPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.EffectType.AnimalControls">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ModifyLandPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.EffectType.AnimationObject">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Cloth">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.ModifyBlockBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ModifyLandPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Glow">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.ModifyBlockExtendedBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Point">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOnPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Trail">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOnPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Sphere">
-            <summary>Create a swirl of particles around an object</summary>
+        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOffPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Spiral">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOffPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Edit">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.StateSavePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.EffectType.LookAt">
-            <summary>Cause an avatar to look at an object</summary>
+        <member name="T:OpenMetaverse.Packets.StateSavePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.EffectType.PointAt">
-            <summary>Cause an avatar to point at an object</summary>
+        <member name="T:OpenMetaverse.Packets.StateSavePacket.DataBlockBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.LookAtType">
-            <summary>
-            The action an avatar is doing when looking at something, used in 
-            ViewerEffect packets for the LookAt effect
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ReportAutosaveCrashPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.None">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ReportAutosaveCrashPacket.AutosaveDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Idle">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.AutoListen">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.FreeLook">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket.DataBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Respond">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TrackAgentPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Hover">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TrackAgentPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Conversation">
-            <summary>Deprecated</summary>
+        <member name="T:OpenMetaverse.Packets.TrackAgentPacket.TargetDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Select">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Focus">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Mouselook">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.DownloadTotalsBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Clear">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.NetStatsBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ViewerStatsPacket.FailStatsBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.PointAtType.None">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.MiscStatsBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.PointAtType.Select">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.PointAtType.Grab">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.PointAtType.Clear">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.MoneyTransactionType">
-            <summary>
-            Money transaction types
-            </summary>
+        <member name="T:OpenMetaverse.Packets.UserReportPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.None">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.UserReportPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.FailSimulatorTimeout">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.UserReportPacket.ReportDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.FailDataserverTimeout">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AlertMessagePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectClaim">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AlertMessagePacket.AlertDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandClaim">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AlertMessagePacket.AlertInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupCreate">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicClaim">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupJoin">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket.AlertDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.TeleportCharge">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.MeanCollisionAlertPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.UploadCharge">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.MeanCollisionAlertPacket.MeanCollisionBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandAuction">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ViewerFrozenMessagePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ClassifiedCharge">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ViewerFrozenMessagePacket.FrozenDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectTax">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.HealthMessagePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandTax">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.HealthMessagePacket.HealthDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LightTax">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ChatFromSimulatorPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ParcelDirFee">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ChatFromSimulatorPacket.ChatDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupTax">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.SimStatsPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ClassifiedRenew">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.SimStatsPacket.RegionBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GiveInventory">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.SimStatsPacket.StatBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectSale">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.SimStatsPacket.PidStatBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.Gift">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.SimStatsPacket.RegionInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandSale">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RequestRegionInfoPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ReferBonus">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RequestRegionInfoPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.InventorySale">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RegionInfoPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.RefundPurchase">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RegionInfoPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandPassSale">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RegionInfoPacket.RegionInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.DwellBonus">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RegionInfoPacket.RegionInfo2Block">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.PayObject">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RegionInfoPacket.RegionInfo3Block">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPays">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupLandDeed">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupObjectDeed">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket.RegionInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupLiability">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket.RegionInfo2Block">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupDividend">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupMembershipDues">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectRelease">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfo2Block">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandRelease">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfo3Block">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectDelete">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfo4Block">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicDecay">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicDelete">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LindenAdjustment">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket.RegionInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LindenGrant">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.SimulatorViewerTimeMessagePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LindenPenalty">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.SimulatorViewerTimeMessagePacket.TimeInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.EventFee">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.EnableSimulatorPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.EventPrize">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.EnableSimulatorPacket.SimulatorInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendBasic">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.DisableSimulatorPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendDeveloper">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TransferRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendAlways">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TransferRequestPacket.TransferInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendDaily">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TransferInfoPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendRating">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TransferInfoPacket.TransferInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendDelta">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TransferAbortPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.TransactionFlags">
-            <summary>
-            
-            </summary>
+        <member name="T:OpenMetaverse.Packets.TransferAbortPacket.TransferInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.None">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RequestXferPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.SourceGroup">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RequestXferPacket.XferIDBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.DestGroup">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AbortXferPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.OwnerGroup">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AbortXferPacket.XferIDBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.SimultaneousContribution">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.ContributionRemoval">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.SenderBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.MeanCollisionType">
-            <summary>
-            
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.None">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.VisualParamBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.Bump">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.AppearanceDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.LLPushObject">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.SelectedObjectCollide">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.ScriptedObjectCollide">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket.CameraPropertyBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.PhysicalObjectCollide">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ClearFollowCamPropertiesPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ScriptControlChange">
-            <summary>
-            Flags sent when a script takes or releases a control
-            </summary>
-            <remarks>NOTE: (need to verify) These might be a subset of the ControlFlags enum in Movement,</remarks>
+        <member name="T:OpenMetaverse.Packets.ClearFollowCamPropertiesPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.None">
-            <summary>No Flags set</summary>
+        <member name="T:OpenMetaverse.Packets.RequestPayPricePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Forward">
-            <summary>Forward (W or up Arrow)</summary>
+        <member name="T:OpenMetaverse.Packets.RequestPayPricePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Back">
-            <summary>Back (S or down arrow)</summary>
+        <member name="T:OpenMetaverse.Packets.PayPriceReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Left">
-            <summary>Move left (shift+A or left arrow)</summary>
+        <member name="T:OpenMetaverse.Packets.PayPriceReplyPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Right">
-            <summary>Move right (shift+D or right arrow)</summary>
+        <member name="T:OpenMetaverse.Packets.PayPriceReplyPacket.ButtonDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Up">
-            <summary>Up (E or PgUp)</summary>
+        <member name="T:OpenMetaverse.Packets.KickUserPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Down">
-            <summary>Down (C or PgDown)</summary>
+        <member name="T:OpenMetaverse.Packets.KickUserPacket.TargetBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.RotateLeft">
-            <summary>Rotate left (A or left arrow)</summary>
+        <member name="T:OpenMetaverse.Packets.KickUserPacket.UserInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.RotateRight">
-            <summary>Rotate right (D or right arrow)</summary>
+        <member name="T:OpenMetaverse.Packets.GodKickUserPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.LeftButton">
-            <summary>Left Mouse Button</summary>
+        <member name="T:OpenMetaverse.Packets.GodKickUserPacket.UserInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.MouseLookLeftButton">
-            <summary>Left Mouse button in MouseLook</summary>
+        <member name="T:OpenMetaverse.Packets.EjectUserPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AgentFlags">
-            <summary>
-            Currently only used to hide your group title
-            </summary>
+        <member name="T:OpenMetaverse.Packets.EjectUserPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentFlags.None">
-            <summary>No flags set</summary>
+        <member name="T:OpenMetaverse.Packets.EjectUserPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentFlags.HideTitle">
-            <summary>Hide your group title</summary>
+        <member name="T:OpenMetaverse.Packets.FreezeUserPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AgentState">
-            <summary>
-            Action state of the avatar, which can currently be typing and
-            editing
-            </summary>
+        <member name="T:OpenMetaverse.Packets.FreezeUserPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentState.None">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.FreezeUserPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentState.Typing">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentState.Editing">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.TeleportStatus">
-            <summary>
-            Current teleport status
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportStatus.None">
-            <summary>Unknown status</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Start">
-            <summary>Teleport initialized</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket.PropertiesDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Progress">
-            <summary>Teleport in progress</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Failed">
-            <summary>Teleport failed</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Finished">
-            <summary>Teleport completed</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket.PropertiesDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Cancelled">
-            <summary>Teleport cancelled</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.TeleportFlags">
-            <summary>
-            
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.Default">
-            <summary>No flags set, or teleport failed</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.SetHomeToTarget">
-            <summary>Set when newbie leaves help island for first time</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.NewGroupDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.SetLastToTarget">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaLure">
-            <summary>Via Lure</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaLandmark">
-            <summary>Via Landmark</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket.PropertiesDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaLocation">
-            <summary>Via Location</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaHome">
-            <summary>Via Home</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaTelehub">
-            <summary>Via Telehub</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket.PropertiesDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaLogin">
-            <summary>Via Login</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaGodlikeLure">
-            <summary>Linden Summoned</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.Godlike">
-            <summary>Linden Forced me</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.NineOneOne">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.DisableCancel">
-            <summary>Agent Teleported Home via Script</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaRegionID">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.IsFlying">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ResetHome">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ForceRedirect">
-            <summary>forced to new location for example when avatar is banned or ejected</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaLure">
-            <summary>Teleport Finished via a Lure</summary>
+        <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaNewSim">
-            <summary>Finished, Sim Changed</summary>
+        <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaSameSim">
-            <summary>Finished, Same Sim</summary>
+        <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket.EventDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.TeleportLureFlags">
-            <summary>
-            
-            </summary>
+        <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportLureFlags.NormalLure">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportLureFlags.GodlikeLure">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket.EventDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TeleportLureFlags.GodlikePursuit">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ScriptSensorTypeFlags">
-            <summary>
-            
-            </summary>
+        <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Agent">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket.EventDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Active">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Passive">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Scripted">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket.EventDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.InstantMessage">
-            <summary>
-            Instant Message
-            </summary>
+        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.FromAgentID">
-            <summary>Key of sender</summary>
+        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.FromAgentName">
-            <summary>Name of sender</summary>
+        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket.EventDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.ToAgentID">
-            <summary>Key of destination avatar</summary>
+        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.ParentEstateID">
-            <summary>ID of originating estate</summary>
+        <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.RegionID">
-            <summary>Key of originating region</summary>
+        <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.Position">
-            <summary>Coordinates in originating region</summary>
+        <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.Dialog">
-            <summary>Instant message type</summary>
+        <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.GroupIM">
-            <summary>Group IM session toggle</summary>
+        <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.IMSessionID">
-            <summary>Key of IM session, for Group Messages, the groups UUID</summary>
+        <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.Timestamp">
-            <summary>Timestamp of the instant message</summary>
+        <member name="T:OpenMetaverse.Packets.PickDeletePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.Message">
-            <summary>Instant message text</summary>
+        <member name="T:OpenMetaverse.Packets.PickDeletePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.Offline">
-            <summary>Whether this message is held for offline avatars</summary>
+        <member name="T:OpenMetaverse.Packets.PickDeletePacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.BinaryBucket">
-            <summary>Context specific packed data</summary>
+        <member name="T:OpenMetaverse.Packets.PickGodDeletePacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.PickGodDeletePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AgentManager">
-            <summary>
-            Manager class for our own avatar
-            </summary>
+        <member name="T:OpenMetaverse.Packets.PickGodDeletePacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_Chat">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptQuestionPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ScriptQuestionPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ChatLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptControlChangePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptDialog">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptControlChangePacket.DataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ScriptDialogPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptDialogLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptDialogPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptQuestion">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptDialogPacket.ButtonsBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ScriptDialogPacket.OwnerDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptQuestionLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptDialogReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_LoadURL">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptDialogReplyPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ScriptDialogReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_LoadUrlLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ForceScriptControlReleasePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_Balance">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ForceScriptControlReleasePacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.RevokePermissionsPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_BalanceLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.RevokePermissionsPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.RevokePermissionsPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_MoneyBalanceReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.LoadURLPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_InstantMessage">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.LoadURLPacket.DataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ScriptTeleportRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_InstantMessageLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptTeleportRequestPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_Teleport">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelOverlayPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ParcelOverlayPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_TeleportLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AgentData">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AgentDataLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AnimationsChanged">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AnimationsChangedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_MeanCollision">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_MeanCollisionLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.TaskIDsBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_RegionCrossed">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.OwnerIDsBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_RegionCrossedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_GroupChatJoined">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket.ParcelDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_GroupChatJoinedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AlertMessage">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.ParcelDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.TaskIDsBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AlertMessageLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.OwnerIDsBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptControl">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptControlLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_CameraConstraint">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.ReturnIDsBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.EstateCovenantRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_CameraConstraintLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.EstateCovenantRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptSensorReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.EstateCovenantReplyPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.EstateCovenantReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptSensorReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ForceObjectSelectPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AvatarSitResponse">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ForceObjectSelectPacket.HeaderBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ForceObjectSelectPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AvatarSitResponseLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelBuyPassPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberAdded">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelBuyPassPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ParcelBuyPassPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberAddedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelDeedToGroupPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberLeft">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelDeedToGroupPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ParcelDeedToGroupPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberLeftLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelReclaimPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.Client">
-            <summary>Reference to the GridClient instance</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelReclaimPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.Movement">
-            <summary>Used for movement and camera tracking</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelReclaimPacket.DataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelClaimPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.GroupChatSessions">
-            <summary>Dictionary containing current Group Chat sessions and members</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelClaimPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelClaimPacket.DataBlock">
+            <exclude/>
         </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="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>
+        <member name="T:OpenMetaverse.Packets.ParcelClaimPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.RetrieveInstantMessages">
-            <summary>
-            Request any instant messages sent while the client was offline to be resent.
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ParcelJoinPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.InstantMessage(OpenMetaverse.UUID,System.String)">
-            <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>
+        <member name="T:OpenMetaverse.Packets.ParcelJoinPacket.AgentDataBlock">
+            <exclude/>
         </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="imSessionID">IM session ID (to differentiate between IM windows)</param>
+        <member name="T:OpenMetaverse.Packets.ParcelJoinPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.InstantMessage(System.String,OpenMetaverse.UUID,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID[])">
-            <summary>
-            Send an Instant Message
-            </summary>
-            <param name="fromName">The name this IM will show up as being from</param>
-            <param name="target">Key of Avatar</param>
-            <param name="message">Text message being sent</param>
-            <param name="imSessionID">IM session ID (to differentiate between IM windows)</param>
-            <param name="conferenceIDs">IDs of sessions for a conference</param>
+        <member name="T:OpenMetaverse.Packets.ParcelDividePacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.InstantMessage(System.String,OpenMetaverse.UUID,System.String,OpenMetaverse.UUID,OpenMetaverse.InstantMessageDialog,OpenMetaverse.InstantMessageOnline,OpenMetaverse.Vector3,OpenMetaverse.UUID,System.Byte[])">
-            <summary>
-            Send an Instant Message
-            </summary>
-            <param name="fromName">The name this IM will show up as being from</param>
-            <param name="target">Key of Avatar</param>
-            <param name="message">Text message being sent</param>
-            <param name="imSessionID">IM session ID (to differentiate between IM windows)</param>
-            <param name="dialog">Type of instant message to send</param>
-            <param name="offline">Whether to IM offline avatars as well</param>
-            <param name="position">Senders Position</param>
-            <param name="regionID">RegionID Sender is In</param>
-            <param name="binaryBucket">Packed binary data that is specific to
-            the dialog type</param>
+        <member name="T:OpenMetaverse.Packets.ParcelDividePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.InstantMessageGroup(OpenMetaverse.UUID,System.String)">
-            <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="message">Text Message being sent.</param>
+        <member name="T:OpenMetaverse.Packets.ParcelDividePacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.InstantMessageGroup(System.String,OpenMetaverse.UUID,System.String)">
-            <summary>
-            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="message">Text message being sent</param>
+        <member name="T:OpenMetaverse.Packets.ParcelReleasePacket">
+            <exclude/>
         </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>
+        <member name="T:OpenMetaverse.Packets.ParcelReleasePacket.AgentDataBlock">
+            <exclude/>
         </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>
+        <member name="T:OpenMetaverse.Packets.ParcelReleasePacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.ReplyToScriptDialog(System.Int32,System.Int32,System.String,OpenMetaverse.UUID)">
-            <summary>
-            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)"/>
+        <member name="T:OpenMetaverse.Packets.ParcelBuyPacket">
+            <exclude/>
         </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>
+        <member name="T:OpenMetaverse.Packets.ParcelBuyPacket.AgentDataBlock">
+            <exclude/>
         </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>
+        <member name="T:OpenMetaverse.Packets.ParcelBuyPacket.DataBlock">
+            <exclude/>
         </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>
+        <member name="T:OpenMetaverse.Packets.ParcelBuyPacket.ParcelDataBlock">
+            <exclude/>
         </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>
+        <member name="T:OpenMetaverse.Packets.ParcelGodForceOwnerPacket">
+            <exclude/>
         </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 
-            </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 
-            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"/>
+        <member name="T:OpenMetaverse.Packets.ParcelGodForceOwnerPacket.AgentDataBlock">
+            <exclude/>
         </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
-            </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 
-            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>
+        <member name="T:OpenMetaverse.Packets.ParcelGodForceOwnerPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.RequestSit(OpenMetaverse.UUID,OpenMetaverse.Vector3)">
-            <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="offset">Sit at offset</param>
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket">
+            <exclude/>
         </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
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Stand">
-            <summary>Stands up from sitting on a prim or the ground</summary>
-            <returns>true of AgentUpdate was sent</returns>
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.SitOnGround">
-            <summary>
-            Does a "ground sit" at the avatar's current position
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Fly(System.Boolean)">
-            <summary>
-            Starts or stops flying
-            </summary>
-            <param name="start">True to start flying, false to stop flying</param>
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Crouch(System.Boolean)">
-            <summary>
-            Starts or stops crouching
-            </summary>
-            <param name="crouching">True to start crouching, false to stop crouching</param>
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket.ListBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Jump(System.Boolean)">
-            <summary>
-            Starts a jump (begin holding the jump key)
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AutoPilot(System.Double,System.Double,System.Double)">
-            <summary>
-            Use the autopilot sim function to move the avatar to a new
-            position. Uses double precision to get precise movements
-            </summary>
-            <remarks>The z value is currently not handled properly by the simulator</remarks>
-            <param name="globalX">Global X coordinate to move to</param>
-            <param name="globalY">Global Y coordinate to move to</param>
-            <param name="z">Z coordinate to move to</param>
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AutoPilot(System.UInt64,System.UInt64,System.Single)">
-            <summary>
-            Use the autopilot sim function to move the avatar to a new position
-            </summary>
-            <remarks>The z value is currently not handled properly by the simulator</remarks>
-            <param name="globalX">Integer value for the global X coordinate to move to</param>
-            <param name="globalY">Integer value for the global Y coordinate to move to</param>
-            <param name="z">Floating-point value for the Z coordinate to move to</param>
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AutoPilotLocal(System.Int32,System.Int32,System.Single)">
-            <summary>
-            Use the autopilot sim function to move the avatar to a new position
-            </summary>
-            <remarks>The z value is currently not handled properly by the simulator</remarks>
-            <param name="localX">Integer value for the local X coordinate to move to</param>
-            <param name="localY">Integer value for the local Y coordinate to move to</param>
-            <param name="z">Floating-point value for the Z coordinate to move to</param>
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.ListBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AutoPilotCancel">
-            <summary>Macro to cancel autopilot sim function</summary>
-            <remarks>Not certain if this is how it is really done</remarks>
-            <returns>true if control flags were set and AgentUpdate was sent to the simulator</returns>
+        <member name="T:OpenMetaverse.Packets.ParcelDwellRequestPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Grab(System.UInt32)">
-            <summary>
-            Grabs an object
-            </summary>
-            <param name="objectLocalID">an unsigned integer of the objects ID within the simulator</param>
-            <seealso cref="F:OpenMetaverse.Simulator.ObjectsPrimitives"/>
+        <member name="T:OpenMetaverse.Packets.ParcelDwellRequestPacket.AgentDataBlock">
+            <exclude/>
         </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="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>
-            <param name="position">The region coordinates of the position to grab</param>
-            <param name="normal">The surface normal of the position to grab (A normal is a vector perpindicular to the surface)</param>
-            <param name="binormal">The surface binormal of the position to grab (A binormal is a vector tangen to the surface
-            pointing along the U direction of the tangent space</param>
+        <member name="T:OpenMetaverse.Packets.ParcelDwellRequestPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.GrabUpdate(OpenMetaverse.UUID,OpenMetaverse.Vector3)">
-            <summary>
-            Drag an object
-            </summary>
-            <param name="objectID"><seealso cref="T:OpenMetaverse.UUID"/> of the object to drag</param>
-            <param name="grabPosition">Drag target in region coordinates</param>
+        <member name="T:OpenMetaverse.Packets.ParcelDwellReplyPacket">
+            <exclude/>
         </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="grabPosition">Drag target in region coordinates</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>
-            <param name="position">The region coordinates of the position to grab</param>
-            <param name="normal">The surface normal of the position to grab (A normal is a vector perpindicular to the surface)</param>
-            <param name="binormal">The surface binormal of the position to grab (A binormal is a vector tangen to the surface
-            pointing along the U direction of the tangent space</param>
+        <member name="T:OpenMetaverse.Packets.ParcelDwellReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.DeGrab(System.UInt32)">
-            <summary>
-            Release a grabbed object
-            </summary>
-            <param name="objectLocalID">The Objects Simulator Local ID</param>
-            <seealso cref="F:OpenMetaverse.Simulator.ObjectsPrimitives"/>
-            <seealso cref="M:OpenMetaverse.AgentManager.Grab(System.UInt32)"/>
-            <seealso cref="M:OpenMetaverse.AgentManager.GrabUpdate(OpenMetaverse.UUID,OpenMetaverse.Vector3)"/>
+        <member name="T:OpenMetaverse.Packets.ParcelDwellReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.DeGrab(System.UInt32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,System.Int32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
-            <summary>
-            Release a grabbed object
-            </summary>
-            <param name="objectLocalID">The Objects Simulator Local ID</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>
-            <param name="position">The region coordinates of the position to grab</param>
-            <param name="normal">The surface normal of the position to grab (A normal is a vector perpindicular to the surface)</param>
-            <param name="binormal">The surface binormal of the position to grab (A binormal is a vector tangen to the surface
-            pointing along the U direction of the tangent space</param>
+        <member name="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Touch(System.UInt32)">
-            <summary>
-            Touches an object
-            </summary>
-            <param name="objectLocalID">an unsigned integer of the objects ID within the simulator</param>
-            <seealso cref="F:OpenMetaverse.Simulator.ObjectsPrimitives"/>
+        <member name="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.RequestBalance">
-            <summary>
-            Request the current L$ balance
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.GiveAvatarMoney(OpenMetaverse.UUID,System.Int32)">
-            <summary>
-            Give Money to destination Avatar
-            </summary>
-            <param name="target">UUID of the Target Avatar</param>
-            <param name="amount">Amount in L$</param>
+        <member name="T:OpenMetaverse.Packets.ViewerStartAuctionPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.GiveAvatarMoney(OpenMetaverse.UUID,System.Int32,System.String)">
-            <summary>
-            Give Money to destination Avatar
-            </summary>
-            <param name="target">UUID of the Target Avatar</param>
-            <param name="amount">Amount in L$</param>
-            <param name="description">Description that will show up in the
-            recipients transaction history</param>
+        <member name="T:OpenMetaverse.Packets.ViewerStartAuctionPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.GiveObjectMoney(OpenMetaverse.UUID,System.Int32,System.String)">
-            <summary>
-            Give L$ to an object
-            </summary>
-            <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 name="T:OpenMetaverse.Packets.ViewerStartAuctionPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.GiveGroupMoney(OpenMetaverse.UUID,System.Int32)">
-            <summary>
-            Give L$ to a group
-            </summary>
-            <param name="target">group <seealso cref="T:OpenMetaverse.UUID"/> to give money to</param>
-            <param name="amount">amount of L$ to give</param>
+        <member name="T:OpenMetaverse.Packets.UUIDNameRequestPacket">
+            <exclude/>
         </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="amount">amount of L$ to give</param>
-            <param name="description">description of transaction</param>
+        <member name="T:OpenMetaverse.Packets.UUIDNameRequestPacket.UUIDNameBlockBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.PayUploadFee">
-            <summary>
-            Pay texture/animation upload fee
-            </summary>
+        <member name="T:OpenMetaverse.Packets.UUIDNameReplyPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.PayUploadFee(System.String)">
-            <summary>
-            Pay texture/animation upload fee
-            </summary>
-            <param name="description">description of the transaction</param>
+        <member name="T:OpenMetaverse.Packets.UUIDNameReplyPacket.UUIDNameBlockBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.GiveMoney(OpenMetaverse.UUID,System.Int32,System.String,OpenMetaverse.MoneyTransactionType,OpenMetaverse.TransactionFlags)">
-            <summary>
-            Give Money to destination Object or Avatar
-            </summary>
-            <param name="target">UUID of the Target Object/Avatar</param>
-            <param name="amount">Amount in L$</param>
-            <param name="description">Reason (Optional normally)</param>
-            <param name="type">The type of transaction</param>
-            <param name="flags">Transaction flags, mostly for identifying group
-            transactions</param>
+        <member name="T:OpenMetaverse.Packets.UUIDGroupNameRequestPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.PlayGesture(OpenMetaverse.UUID)">
-            <summary>
-            Plays a gesture
-            </summary>
-            <param name="gestureID">Asset <seealso cref="T:OpenMetaverse.UUID"/> of the gesture</param>
+        <member name="T:OpenMetaverse.Packets.UUIDGroupNameRequestPacket.UUIDNameBlockBlock">
+            <exclude/>
         </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>
+        <member name="T:OpenMetaverse.Packets.UUIDGroupNameReplyPacket">
+            <exclude/>
         </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>
+        <member name="T:OpenMetaverse.Packets.UUIDGroupNameReplyPacket.UUIDNameBlockBlock">
+            <exclude/>
         </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="reliable">Whether to ensure delivery of this packet or not</param>
+        <member name="T:OpenMetaverse.Packets.ChildAgentDyingPacket">
+            <exclude/>
         </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 
-            currently playing animation to stop playing</param>
-            <param name="reliable">Whether to ensure delivery of this packet or not</param>
+        <member name="T:OpenMetaverse.Packets.ChildAgentDyingPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Animate(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,System.Boolean},System.Boolean)">
-            <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
-            turn that animation on or off</param>
-            <param name="reliable">Whether to ensure delivery of this packet or not</param>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUnknownPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.GoHome">
-            <summary>
-            Teleports agent to their stored home location
-            </summary>
-            <returns>true on successful teleport to home location</returns>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUnknownPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Teleport(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>
-            <returns>true on success, false on failure</returns>
+        <member name="T:OpenMetaverse.Packets.GetScriptRunningPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Teleport(System.String,OpenMetaverse.Vector3)">
-            <summary>
-            Attempt to look up a simulator name and teleport to the discovered
-            destination
-            </summary>
-            <param name="simName">Region name to look up</param>
-            <param name="position">Position to teleport to</param>
-            <returns>True if the lookup and teleport were successful, otherwise
-            false</returns>
+        <member name="T:OpenMetaverse.Packets.GetScriptRunningPacket.ScriptBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Teleport(System.String,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
-            <summary>
-            Attempt to look up a simulator name and teleport to the discovered
-            destination
-            </summary>
-            <param name="simName">Region name to look up</param>
-            <param name="position">Position to teleport to</param>
-            <param name="lookAt">Target to look at</param>
-            <returns>True if the lookup and teleport were successful, otherwise
-            false</returns>
+        <member name="T:OpenMetaverse.Packets.ScriptRunningReplyPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Teleport(System.UInt64,OpenMetaverse.Vector3)">
-            <summary>
-            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>
-            <returns>true on success, false on failure</returns>
-            <remarks>This call is blocking</remarks>
+        <member name="T:OpenMetaverse.Packets.ScriptRunningReplyPacket.ScriptBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Teleport(System.UInt64,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
-            <summary>
-            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>
-            <returns>true on success, false on failure</returns>
-            <remarks>This call is blocking</remarks>
+        <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.RequestTeleport(System.UInt64,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>
+        <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket.AgentDataBlock">
+            <exclude/>
         </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>
+        <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket.ScriptBlock">
+            <exclude/>
         </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>
+        <member name="T:OpenMetaverse.Packets.ScriptResetPacket">
+            <exclude/>
         </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>
+        <member name="T:OpenMetaverse.Packets.ScriptResetPacket.AgentDataBlock">
+            <exclude/>
         </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="message">custom message to send with invitation</param>
+        <member name="T:OpenMetaverse.Packets.ScriptResetPacket.ScriptBlock">
+            <exclude/>
         </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 
-            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="accept">true to accept the lure, false to decline it</param>
+        <member name="T:OpenMetaverse.Packets.ScriptSensorRequestPacket">
+            <exclude/>
         </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 
-            profile information</param>
+        <member name="T:OpenMetaverse.Packets.ScriptSensorRequestPacket.RequesterBlock">
+            <exclude/>
         </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>
+        <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.SetHeightWidth(System.UInt16,System.UInt16)">
-            <summary>
-            Set the height and the width of the client window. This is used
-            by the server to build a virtual camera frustum for our avatar
-            </summary>
-            <param name="height">New height of the viewer window</param>
-            <param name="width">New width of the viewer window</param>
+        <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket.RequesterBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.RequestMuteList">
-            <summary>
-            Request the list of muted objects and avatars for this agent
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket.SensedDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.SetHome">
-            <summary>
-            Sets home location to agents current position
-            </summary>
-            <remarks>will fire an AlertMessage (<seealso cref="E:OpenMetaverse.AgentManager.OnAlertMessage"/>) with 
-            success or failure message</remarks>
+        <member name="T:OpenMetaverse.Packets.CompleteAgentMovementPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.CompleteAgentMovement(OpenMetaverse.Simulator)">
-            <summary>
-            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>
+        <member name="T:OpenMetaverse.Packets.CompleteAgentMovementPacket.AgentDataBlock">
+            <exclude/>
         </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>
+        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.GroupInviteRespond(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
-            <summary>
-            Respond to a group invitation by either accepting or denying it
-            </summary>
-            <param name="groupID">UUID of the group (sent in the AgentID field of the invite message)</param>
-            <param name="imSessionID">IM Session ID from the group invitation message</param>
-            <param name="accept">Accept the group invitation or deny it</param>
+        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.RequestScriptSensor(System.String,OpenMetaverse.UUID,OpenMetaverse.ScriptSensorTypeFlags,System.Single,System.Single,OpenMetaverse.UUID,OpenMetaverse.Simulator)">
-            <summary>
-            Requests script detection of objects and avatars
-            </summary>
-            <param name="name">name of the object/avatar to search for</param>
-            <param name="searchID">UUID of the object or avatar to search for</param>
-            <param name="type">Type of search from ScriptSensorTypeFlags</param>
-            <param name="range">range of scan (96 max?)</param>
-            <param name="arc">the arc in radians to search within</param>
-            <param name="requestID">an user generated ID to correlate replies with</param>
-            <param name="sim">Simulator to perform search in</param>
+        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.PickInfoUpdate(OpenMetaverse.UUID,System.Boolean,OpenMetaverse.UUID,System.String,OpenMetaverse.Vector3d,OpenMetaverse.UUID,System.String)">
-            <summary>
-            Create or update profile pick
-            </summary>
-            <param name="pickID">UUID of the pick to update, or random UUID to create a new pick</param>
-            <param name="topPick">Is this a top pick? (typically false)</param>
-            <param name="parcelID">UUID of the parcel (UUID.Zero for the current parcel)</param>
-            <param name="name">Name of the pick</param>
-            <param name="globalPosition">Global position of the pick landmark</param>
-            <param name="textureID">UUID of the image displayed with the pick</param>
-            <param name="description">Long description of the pick</param>
+        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket.SimDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.PickDelete(OpenMetaverse.UUID)">
-            <summary>
-            Delete profile pick
-            </summary>
-            <param name="pickID">UUID of the pick to delete</param>
+        <member name="T:OpenMetaverse.Packets.LogoutRequestPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.UpdateClassifiedInfo(OpenMetaverse.UUID,OpenMetaverse.DirectoryManager.ClassifiedCategories,OpenMetaverse.UUID,System.Int32,OpenMetaverse.Vector3d,System.String,System.String,System.Boolean)">
-            <summary>
-            Create or update profile Classified
-            </summary>
-            <param name="classifiedID">UUID of the classified to update, or random UUID to create a new classified</param>
-            <param name="category">Defines what catagory the classified is in</param>
-            <param name="snapshotID">UUID of the image displayed with the classified</param>
-            <param name="price">Price that the classified will cost to place for a week</param>
-            <param name="position">Global position of the classified landmark</param>
-            <param name="name">Name of the classified</param>
-            <param name="desc">Long description of the classified</param>
-            <param name="autoRenew">if true, auto renew classified after expiration</param>
+        <member name="T:OpenMetaverse.Packets.LogoutRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.UpdateClassifiedInfo(OpenMetaverse.UUID,OpenMetaverse.DirectoryManager.ClassifiedCategories,OpenMetaverse.UUID,System.Int32,System.String,System.String,System.Boolean)">
-            <summary>
-            Create or update profile Classified
-            </summary>
-            <param name="classifiedID">UUID of the classified to update, or random UUID to create a new classified</param>
-            <param name="category">Defines what catagory the classified is in</param>
-            <param name="snapshotID">UUID of the image displayed with the classified</param>
-            <param name="price">Price that the classified will cost to place for a week</param>
-            <param name="name">Name of the classified</param>
-            <param name="desc">Long description of the classified</param>
-            <param name="autoRenew">if true, auto renew classified after expiration</param>
+        <member name="T:OpenMetaverse.Packets.LogoutReplyPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.DeleteClassfied(OpenMetaverse.UUID)">
-            <summary>
-            Delete a classified ad
-            </summary>
-            <param name="classifiedID">The classified ads ID</param>
+        <member name="T:OpenMetaverse.Packets.LogoutReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.GetAttachmentResources(OpenMetaverse.AgentManager.AttachmentResourcesCallback)">
-            <summary>
-            Fetches resource usage by agents attachmetns
-            </summary>
-            <param name="callback">Called when the requested information is collected</param>
+        <member name="T:OpenMetaverse.Packets.LogoutReplyPacket.InventoryDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.InstantMessageHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>
-            Take an incoming ImprovedInstantMessage packet, auto-parse, and if
-            OnInstantMessage 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>
+        <member name="T:OpenMetaverse.Packets.ImprovedInstantMessagePacket">
+            <exclude/>
         </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.
-            </summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="T:OpenMetaverse.Packets.ImprovedInstantMessagePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.ScriptDialogHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>
-            Used for parsing llDialogs
-            </summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="T:OpenMetaverse.Packets.ImprovedInstantMessagePacket.MessageBlockBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.ScriptQuestionHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>
-            Used for parsing llRequestPermissions dialogs
-            </summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="T:OpenMetaverse.Packets.RetrieveInstantMessagesPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.ScriptControlChangeHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>
-            Handles Script Control changes when Script with permissions releases or takes a control
-            </summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="T:OpenMetaverse.Packets.RetrieveInstantMessagesPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.LoadURLHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>
-            Used for parsing llLoadURL Dialogs
-            </summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="T:OpenMetaverse.Packets.FindAgentPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.MovementCompleteHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>
-            Update client's Position, LookAt and region handle from incoming packet
-            </summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-            <remarks>This occurs when after an avatar moves into a new sim</remarks>
+        <member name="T:OpenMetaverse.Packets.FindAgentPacket.AgentBlockBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.HealthHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming 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.FindAgentPacket.LocationBlockBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentDataUpdateHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming 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.RequestGodlikePowersPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.MoneyBalanceReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming 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.RequestGodlikePowersPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.TeleportFailedEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
-            <summary>
-            Process TeleportFailed message sent via EventQueue, informs agent its last teleport has failed and why.
-            </summary>
-            <param name="messageKey">The Message Key</param>
-            <param name="message">An IMessage object Deserialized from the recieved message event</param>
-            <param name="simulator">The simulator originating the event message</param>
+        <member name="T:OpenMetaverse.Packets.RequestGodlikePowersPacket.RequestBlockBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.TeleportFinishEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
-            <summary>
-            Process TeleportFinish from Event Queue and pass it onto our TeleportHandler
-            </summary>
-            <param name="capsKey">The message system key for this event</param>
-            <param name="message">IMessage object containing decoded data from OSD</param>
-            <param name="simulator">The simulator originating the event message</param>
+        <member name="T:OpenMetaverse.Packets.GrantGodlikePowersPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.TeleportHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming 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.AgentManager.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.GrantGodlikePowersPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.MeanCollisionAlertHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming 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.GrantGodlikePowersPacket.GrantDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.CrossedRegionEventHandler(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.GodlikeMessagePacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.CrossedRegionHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming 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>This packet is now being sent via the EventQueue</remarks>
+        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.ChatterBoxSessionEventReplyEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
-            <summary>
-            Group Chat event handler
-            </summary>
-            <param name="capsKey">The capability Key</param>
-            <param name="message">IMessage object containing decoded data from OSD</param>
-            <param name="simulator"></param>
+        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket.MethodDataBlock">
+            <exclude/>
         </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="message">IMessage object containing decoded data from OSD</param>
-            <param name="simulator"></param>
+        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket.ParamListBlock">
+            <exclude/>
         </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="message">IMessage object containing decoded data from OSD</param>
-            <param name="simulator"></param>
+        <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.ChatterBoxInvitationEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
-            <summary>
-            Handle a group chat Invitation
-            </summary>
-            <param name="capsKey">Caps Key</param>
-            <param name="message">IMessage object containing decoded data from OSD</param>
-            <param name="simulator">Originating Simulator</param>
+        <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.ModerateChatSessions(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.Boolean)">
-            <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="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 name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket.MethodDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AlertMessageHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming 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.EstateOwnerMessagePacket.ParamListBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.CameraConstraintHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming 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.GenericMessagePacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.ScriptSensorReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming 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.GenericMessagePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AvatarSitResponseHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming 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.GenericMessagePacket.MethodDataBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.ChatFromSimulator">
-            <summary>Raised when a scripted object or agent within range sends a public message</summary>
+        <member name="T:OpenMetaverse.Packets.GenericMessagePacket.ParamListBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.MuteListRequestPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.MuteListRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.LoadURL">
-            <summary>Raised when a script requests an agent open the specified URL</summary>
+        <member name="T:OpenMetaverse.Packets.MuteListRequestPacket.MuteDataBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.MoneyBalance">
-            <summary>Raised when an agents currency balance is updated</summary>
+        <member name="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.MoneyBalanceReply">
-            <summary>Raised when a transaction occurs involving currency such as a land purchase</summary>
+        <member name="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket.MuteDataBlock">
+            <exclude/>
         </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.Packets.RemoveMuteListEntryPacket">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.AgentDataReply">
-            <summary>Raised when a simulator sends agent specific information for our avatar.</summary>
+        <member name="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.AnimationsChanged">
-            <summary>Raised when our agents animation playlist changes</summary>
+        <member name="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket.MuteDataBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.MeanCollision">
-            <summary>Raised when an object or avatar forcefully collides with our agent</summary>
+        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.RegionCrossed">
-            <summary>Raised when our agent crosses a region border into another region</summary>
+        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.GroupChatJoined">
-            <summary>Raised when our agent succeeds or fails to join a group chat session</summary>
+        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.NotecardDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.InventoryDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.UpdateInventoryItemPacket">
+            <exclude/>
         </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.Packets.UpdateInventoryItemPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.ScriptSensorReply">
-            <summary>Raised when a script sensor reply is received from a simulator</summary>
+        <member name="T:OpenMetaverse.Packets.UpdateInventoryItemPacket.InventoryDataBlock">
+            <exclude/>
         </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.Packets.UpdateCreateInventoryItemPacket">
+            <exclude/>
         </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.Packets.UpdateCreateInventoryItemPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.ChatSessionMemberLeft">
-            <summary>Raised when an agent exits a group chat session we are participating in</summary>
+        <member name="T:OpenMetaverse.Packets.UpdateCreateInventoryItemPacket.InventoryDataBlock">
+            <exclude/>
         </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.Packets.MoveInventoryItemPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.MoveInventoryItemPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.MoveInventoryItemPacket.InventoryDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.LocalID">
-            <summary>Your (client) avatar ID, local to the current region/sim</summary>
+        <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket">
+            <exclude/>
         </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.Packets.CopyInventoryItemPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentAccess">
-            <summary>The access level of this agent, usually M or PG</summary>
+        <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket.InventoryDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.CollisionPlane">
-            <summary>The CollisionPlane of Agent</summary>
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.Velocity">
-            <summary>An <seealso cref="T:OpenMetaverse.Vector3"/> representing the velocity of our agent</summary>
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.Acceleration">
-            <summary>An <seealso cref="T:OpenMetaverse.Vector3"/> representing the acceleration of our agent</summary>
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket.InventoryDataBlock">
+            <exclude/>
         </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.Packets.ChangeInventoryItemFlagsPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.HomeLookAt">
-            <summary>LookAt point saved/restored with HomePosition</summary>
+        <member name="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket.InventoryDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.FirstName">
-            <summary>Avatar First Name (i.e. Philip)</summary>
+        <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.LastName">
-            <summary>Avatar Last Name (i.e. Linden)</summary>
+        <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.Name">
-            <summary>Avatar Full Name (i.e. Philip Linden)</summary>
+        <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket.InventoryDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.Health">
-            <summary>Gets the health of the agent</summary>
+        <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.Balance">
-            <summary>Gets the current balance of the agent</summary>
+        <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.CreateInventoryFolderPacket.FolderDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.ActiveGroup">
-            <summary>Gets the <seealso cref="T:OpenMetaverse.UUID"/> of the agents active group.</summary>
+        <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.ActiveGroupPowers">
-            <summary>Gets the Agents powers in the currently active group</summary>
+        <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.TeleportMessage">
-            <summary>Current status message for teleporting</summary>
+        <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket.FolderDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.MoveInventoryFolderPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.MoveInventoryFolderPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.SimPosition">
-            <summary>Current position of the agent in the simulator</summary>
+        <member name="T:OpenMetaverse.Packets.MoveInventoryFolderPacket.InventoryDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.SimRotation">
-            <summary>
-            A <seealso cref="T:OpenMetaverse.Quaternion"/> representing the agents current rotation
-            </summary>
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.GlobalPosition">
-            <summary>Returns the global grid position of the avatar</summary>
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AgentManager.AttachmentResourcesCallback">
-            <summary>
-            Called once attachment resource usage information has been collected
-            </summary>
-            <param name="success">Indicates if operation was successfull</param>
-            <param name="info">Attachment resource usage information</param>
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket.FolderDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AgentManager.ControlFlags">
-            <summary>
-            Used to specify movement actions for your agent
-            </summary>
+        <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.NONE">
-            <summary>Empty flag</summary>
+        <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_AT_POS">
-            <summary>Move Forward (SL Keybinding: W/Up Arrow)</summary>
+        <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket.InventoryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG">
-            <summary>Move Backward (SL Keybinding: S/Down Arrow)</summary>
+        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS">
-            <summary>Move Left (SL Keybinding: Shift-(A/Left Arrow))</summary>
+        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG">
-            <summary>Move Right (SL Keybinding: Shift-(D/Right Arrow))</summary>
+        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.FolderDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_UP_POS">
-            <summary>Not Flying: Jump/Flying: Move Up (SL Keybinding: E)</summary>
+        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.ItemDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG">
-            <summary>Not Flying: Croutch/Flying: Move Down (SL Keybinding: C)</summary>
+        <member name="T:OpenMetaverse.Packets.FetchInventoryPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_PITCH_POS">
-            <summary>Unused</summary>
+        <member name="T:OpenMetaverse.Packets.FetchInventoryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_PITCH_NEG">
-            <summary>Unused</summary>
+        <member name="T:OpenMetaverse.Packets.FetchInventoryPacket.InventoryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_YAW_POS">
-            <summary>Unused</summary>
+        <member name="T:OpenMetaverse.Packets.FetchInventoryReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_YAW_NEG">
-            <summary>Unused</summary>
+        <member name="T:OpenMetaverse.Packets.FetchInventoryReplyPacket.AgentDataBlock">
+            <exclude/>
         </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.Packets.FetchInventoryReplyPacket.InventoryDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FLY">
-            <summary>Fly</summary>
+        <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket.FolderDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_STOP">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket.ItemDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FINISH_ANIM">
-            <summary>Finish our current animation</summary>
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket">
+            <exclude/>
         </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.Packets.RemoveInventoryObjectsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND">
-            <summary>Sit on the ground at our current location</summary>
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.FolderDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK">
-            <summary>Whether mouselook is currently enabled</summary>
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.ItemDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket.InventoryDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.UpdateDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.InventoryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket.InventoryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_UP">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.MoveTaskInventoryPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_DOWN">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.MoveTaskInventoryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_UP">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.MoveTaskInventoryPacket.InventoryDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.RequestTaskInventoryPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.Camera">
-            <summary>Agent camera controls</summary>
+        <member name="T:OpenMetaverse.Packets.RequestTaskInventoryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.Flags">
-            <summary>Currently only used for hiding your group title</summary>
+        <member name="T:OpenMetaverse.Packets.RequestTaskInventoryPacket.InventoryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.State">
-            <summary>Action state of the avatar, which can currently be
-            typing and editing</summary>
+        <member name="T:OpenMetaverse.Packets.ReplyTaskInventoryPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.BodyRotation">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ReplyTaskInventoryPacket.InventoryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.HeadRotation">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastBodyRotation">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastHeadRotation">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket.AgentBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraCenter">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraXAxis">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.DeRezAckPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraYAxis">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.DeRezAckPacket.TransactionDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraZAxis">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RezObjectPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastFar">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RezObjectPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.updateTimer">
-            <summary>Timer for sending AgentUpdate packets</summary>
+        <member name="T:OpenMetaverse.Packets.RezObjectPacket.RezDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.#ctor(OpenMetaverse.GridClient)">
-            <summary>Default constructor</summary>
+        <member name="T:OpenMetaverse.Packets.RezObjectPacket.InventoryDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.UpdateFromHeading(System.Double,System.Boolean)">
-            <summary>
-            Send an AgentUpdate with the camera set at the current agent
-            position and pointing towards the heading specified
-            </summary>
-            <param name="heading">Camera rotation in radians</param>
-            <param name="reliable">Whether to send the AgentUpdate reliable
-            or not</param>
+        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket">
+            <exclude/>
         </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.Packets.RezObjectFromNotecardPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SendUpdate">
-            <summary>
-            Send new AgentUpdate packet to update our current camera 
-            position and rotation
-            </summary>
+        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.RezDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.NotecardDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.InventoryDataBlock">
+            <exclude/>
         </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.Packets.AcceptFriendshipPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AtPos">
-            <summary>Move agent positive along the X axis</summary>
+        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AtNeg">
-            <summary>Move agent negative along the X axis</summary>
+        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket.TransactionBlockBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LeftPos">
-            <summary>Move agent positive along the Y axis</summary>
+        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket.FolderDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LeftNeg">
-            <summary>Move agent negative along the Y axis</summary>
+        <member name="T:OpenMetaverse.Packets.DeclineFriendshipPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpPos">
-            <summary>Move agent positive along the Z axis</summary>
+        <member name="T:OpenMetaverse.Packets.DeclineFriendshipPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpNeg">
-            <summary>Move agent negative along the Z axis</summary>
+        <member name="T:OpenMetaverse.Packets.DeclineFriendshipPacket.TransactionBlockBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.PitchPos">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TerminateFriendshipPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.PitchNeg">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TerminateFriendshipPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.YawPos">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.TerminateFriendshipPacket.ExBlockBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.YawNeg">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.OfferCallingCardPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastAt">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.OfferCallingCardPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastLeft">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.OfferCallingCardPacket.AgentBlockBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastUp">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Fly">
-            <summary>Causes simulator to make agent fly</summary>
+        <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Stop">
-            <summary>Stop movement</summary>
+        <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket.TransactionBlockBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FinishAnim">
-            <summary>Finish animation</summary>
+        <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket.FolderDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.StandUp">
-            <summary>Stand up from a sit</summary>
+        <member name="T:OpenMetaverse.Packets.DeclineCallingCardPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.SitOnGround">
-            <summary>Tells simulator to sit agent on ground</summary>
+        <member name="T:OpenMetaverse.Packets.DeclineCallingCardPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Mouselook">
-            <summary>Place agent into mouselook mode</summary>
+        <member name="T:OpenMetaverse.Packets.DeclineCallingCardPacket.TransactionBlockBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeAtPos">
-            <summary>Nudge agent positive along the X axis</summary>
+        <member name="T:OpenMetaverse.Packets.RezScriptPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeAtNeg">
-            <summary>Nudge agent negative along the X axis</summary>
+        <member name="T:OpenMetaverse.Packets.RezScriptPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeLeftPos">
-            <summary>Nudge agent positive along the Y axis</summary>
+        <member name="T:OpenMetaverse.Packets.RezScriptPacket.UpdateBlockBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeLeftNeg">
-            <summary>Nudge agent negative along the Y axis</summary>
+        <member name="T:OpenMetaverse.Packets.RezScriptPacket.InventoryBlockBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeUpPos">
-            <summary>Nudge agent positive along the Z axis</summary>
+        <member name="T:OpenMetaverse.Packets.CreateInventoryItemPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeUpNeg">
-            <summary>Nudge agent negative along the Z axis</summary>
+        <member name="T:OpenMetaverse.Packets.CreateInventoryItemPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.TurnLeft">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.CreateInventoryItemPacket.InventoryBlockBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.TurnRight">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Away">
-            <summary>Tell simulator to mark agent as away</summary>
+        <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LButtonDown">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.EventDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LButtonUp">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.InventoryBlockBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.MLButtonDown">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RegionHandleRequestPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.MLButtonUp">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RegionHandleRequestPacket.RequestBlockBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AlwaysRun">
-            <summary>
-            Returns "always run" value, or changes it by sending a SetAlwaysRunPacket
-            </summary>
+        <member name="T:OpenMetaverse.Packets.RegionIDAndHandleReplyPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentControls">
-            <summary>The current value of the agent control flags</summary>
+        <member name="T:OpenMetaverse.Packets.RegionIDAndHandleReplyPacket.ReplyBlockBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.MoneyTransferRequestPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpdateEnabled">
-            <summary>Gets or sets whether AgentUpdate packets are sent to
-            the current simulator</summary>
+        <member name="T:OpenMetaverse.Packets.MoneyTransferRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AutoResetControls">
-            <summary>Reset movement controls every time we send an update</summary>
+        <member name="T:OpenMetaverse.Packets.MoneyTransferRequestPacket.MoneyDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.Far">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket.MoneyDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.#ctor">
-            <summary>
-            Default constructor
-            </summary>
+        <member name="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.Position">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket.MoneyDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.AtAxis">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket.TransactionInfoBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.LeftAxis">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.UpAxis">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.TargetBlockBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ChatEventArgs">
-            <summary>
-            
-            </summary>
+        <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.MoneyDataBlock">
+            <exclude/>
         </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)">
-            <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 name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.TransactionInfoBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.Simulator">
-            <summary>Get the simulator sending the message</summary>
+        <member name="T:OpenMetaverse.Packets.ActivateGesturesPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.Message">
-            <summary>Get the message sent</summary>
+        <member name="T:OpenMetaverse.Packets.ActivateGesturesPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.AudibleLevel">
-            <summary>Get the audible level of the message</summary>
+        <member name="T:OpenMetaverse.Packets.ActivateGesturesPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.Type">
-            <summary>Get the type of message sent: whisper, shout, etc</summary>
+        <member name="T:OpenMetaverse.Packets.DeactivateGesturesPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.SourceType">
-            <summary>Get the source type of the message sender</summary>
+        <member name="T:OpenMetaverse.Packets.DeactivateGesturesPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.FromName">
-            <summary>Get the name of the agent or object sending the message</summary>
+        <member name="T:OpenMetaverse.Packets.DeactivateGesturesPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.SourceID">
-            <summary>Get the ID of the agent or object sending the message</summary>
+        <member name="T:OpenMetaverse.Packets.MuteListUpdatePacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.MuteListUpdatePacket.MuteDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.Position">
-            <summary>Get the position of the agent or object sending the message</summary>
+        <member name="T:OpenMetaverse.Packets.UseCachedMuteListPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ScriptDialogEventArgs">
-            <summary>Contains the data sent when a primitive opens a dialog with this agent</summary>
+        <member name="T:OpenMetaverse.Packets.UseCachedMuteListPacket.AgentDataBlock">
+            <exclude/>
         </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})">
-            <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>
+        <member name="T:OpenMetaverse.Packets.GrantUserRightsPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptDialogEventArgs.Message">
-            <summary>Get the dialog message</summary>
+        <member name="T:OpenMetaverse.Packets.GrantUserRightsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptDialogEventArgs.ObjectName">
-            <summary>Get the name of the object that sent the dialog request</summary>
+        <member name="T:OpenMetaverse.Packets.GrantUserRightsPacket.RightsBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptDialogEventArgs.ImageID">
-            <summary>Get the ID of the image to be displayed</summary>
+        <member name="T:OpenMetaverse.Packets.ChangeUserRightsPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptDialogEventArgs.ObjectID">
-            <summary>Get the ID of the primitive sending the dialog</summary>
+        <member name="T:OpenMetaverse.Packets.ChangeUserRightsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptDialogEventArgs.FirstName">
-            <summary>Get the first name of the senders owner</summary>
+        <member name="T:OpenMetaverse.Packets.ChangeUserRightsPacket.RightsBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptDialogEventArgs.LastName">
-            <summary>Get the last name of the senders owner</summary>
+        <member name="T:OpenMetaverse.Packets.OnlineNotificationPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.OnlineNotificationPacket.AgentBlockBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptDialogEventArgs.ButtonLabels">
-            <summary>Get the string labels containing the options presented in this dialog</summary>
+        <member name="T:OpenMetaverse.Packets.OfflineNotificationPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.OfflineNotificationPacket.AgentBlockBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.SetStartLocationRequestPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.Simulator">
-            <summary>Get the simulator containing the object sending the request</summary>
+        <member name="T:OpenMetaverse.Packets.SetStartLocationRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.TaskID">
-            <summary>Get the ID of the script making the request</summary>
+        <member name="T:OpenMetaverse.Packets.SetStartLocationRequestPacket.StartLocationDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.ItemID">
-            <summary>Get the ID of the primitive containing the script making the request</summary>
+        <member name="T:OpenMetaverse.Packets.AssetUploadRequestPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.ObjectName">
-            <summary>Get the name of the primitive making the request</summary>
+        <member name="T:OpenMetaverse.Packets.AssetUploadRequestPacket.AssetBlockBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.ObjectOwnerName">
-            <summary>Get the name of the owner of the object making the request</summary>
+        <member name="T:OpenMetaverse.Packets.AssetUploadCompletePacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.Questions">
-            <summary>Get the permissions being requested</summary>
+        <member name="T:OpenMetaverse.Packets.AssetUploadCompletePacket.AssetBlockBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.CreateGroupRequestPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.CreateGroupRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.LoadUrlEventArgs.ObjectName">
-            <summary>Get the name of the object sending the request</summary>
+        <member name="T:OpenMetaverse.Packets.CreateGroupRequestPacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.LoadUrlEventArgs.ObjectID">
-            <summary>Get the ID of the object sending the request</summary>
+        <member name="T:OpenMetaverse.Packets.CreateGroupReplyPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.LoadUrlEventArgs.OwnerID">
-            <summary>Get the ID of the owner of the object sending the request</summary>
+        <member name="T:OpenMetaverse.Packets.CreateGroupReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.LoadUrlEventArgs.OwnerIsGroup">
-            <summary>True if the object is owned by a group</summary>
+        <member name="T:OpenMetaverse.Packets.CreateGroupReplyPacket.ReplyDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.LoadUrlEventArgs.Message">
-            <summary>Get the message sent with the request</summary>
+        <member name="T:OpenMetaverse.Packets.UpdateGroupInfoPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.LoadUrlEventArgs.URL">
-            <summary>Get the URL the object sent</summary>
+        <member name="T:OpenMetaverse.Packets.UpdateGroupInfoPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.InstantMessageEventArgs">
-            <summary>The date received from an ImprovedInstantMessage</summary>
+        <member name="T:OpenMetaverse.Packets.UpdateGroupInfoPacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.GroupRoleChangesPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.InstantMessageEventArgs.IM">
-            <summary>Get the InstantMessage object</summary>
+        <member name="T:OpenMetaverse.Packets.GroupRoleChangesPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.InstantMessageEventArgs.Simulator">
-            <summary>Get the simulator where the InstantMessage origniated</summary>
+        <member name="T:OpenMetaverse.Packets.GroupRoleChangesPacket.RoleChangeBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.BalanceEventArgs">
-            <summary>Contains the currency balance</summary>
+        <member name="T:OpenMetaverse.Packets.JoinGroupRequestPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.BalanceEventArgs.#ctor(System.Int32)">
-            <summary>
-            Construct a new BalanceEventArgs object
-            </summary>
-            <param name="balance">The currenct balance</param>
+        <member name="T:OpenMetaverse.Packets.JoinGroupRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.BalanceEventArgs.Balance">
-            <summary>
-            Get the currenct balance
-            </summary>
+        <member name="T:OpenMetaverse.Packets.JoinGroupRequestPacket.GroupDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.JoinGroupReplyPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.MoneyBalanceReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Boolean,System.Int32,System.Int32,System.Int32,System.String)">
-            <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>
+        <member name="T:OpenMetaverse.Packets.JoinGroupReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.TransactionID">
-            <summary>Get the ID of the transaction</summary>
+        <member name="T:OpenMetaverse.Packets.JoinGroupReplyPacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.Success">
-            <summary>True of the transaction was successful</summary>
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.Balance">
-            <summary>Get the remaining currency balance</summary>
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.MetersCredit">
-            <summary>Get the meters credited</summary>
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.MetersCommitted">
-            <summary>Get the meters comitted</summary>
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket.EjectDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.Description">
-            <summary>Get the description of the transaction</summary>
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AgentDataReplyEventArgs">
-            <summary>Data sent from the simulator containing information about your agent and active group information</summary>
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.FirstName">
-            <summary>Get the agents first name</summary>
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.EjectDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.LastName">
-            <summary>Get the agents last name</summary>
+        <member name="T:OpenMetaverse.Packets.LeaveGroupRequestPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.ActiveGroupID">
-            <summary>Get the active group ID of your agent</summary>
+        <member name="T:OpenMetaverse.Packets.LeaveGroupRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.GroupTitle">
-            <summary>Get the active groups title of your agent</summary>
+        <member name="T:OpenMetaverse.Packets.LeaveGroupRequestPacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.GroupPowers">
-            <summary>Get the combined group powers of your agent</summary>
+        <member name="T:OpenMetaverse.Packets.LeaveGroupReplyPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.GroupName">
-            <summary>Get the active group name of your agent</summary>
+        <member name="T:OpenMetaverse.Packets.LeaveGroupReplyPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.LeaveGroupReplyPacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.InviteGroupRequestPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AnimationsChangedEventArgs.Animations">
-            <summary>Get the dictionary that contains the changed animations</summary>
+        <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.MeanCollisionEventArgs">
-            <summary>
-            Data sent from a simulator indicating a collision with your agent
-            </summary>
+        <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.InviteGroupRequestPacket.InviteDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Type">
-            <summary>Get the Type of collision</summary>
+        <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Aggressor">
-            <summary>Get the ID of the agent or object that collided with your agent</summary>
+        <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Victim">
-            <summary>Get the ID of the agent that was attacked</summary>
+        <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Magnitude">
-            <summary>A value indicating the strength of the collision</summary>
+        <member name="T:OpenMetaverse.Packets.GroupProfileReplyPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Time">
-            <summary>Get the time the collision occurred</summary>
+        <member name="T:OpenMetaverse.Packets.GroupProfileReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.RegionCrossedEventArgs">
-            <summary>Data sent to your agent when it crosses region boundaries</summary>
+        <member name="T:OpenMetaverse.Packets.GroupProfileReplyPacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.RegionCrossedEventArgs.OldSimulator">
-            <summary>Get the simulator your agent just left</summary>
+        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.RegionCrossedEventArgs.NewSimulator">
-            <summary>Get the simulator your agent is now in</summary>
+        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket.MoneyDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.GroupChatJoinedEventArgs">
-            <summary>Data sent from the simulator when your agent joins a group chat session</summary>
+        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.SessionID">
-            <summary>Get the ID of the group chat session</summary>
+        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket.MoneyDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.SessionName">
-            <summary>Get the name of the session</summary>
+        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.TmpSessionID">
-            <summary>Get the temporary session ID used for establishing new sessions</summary>
+        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.Success">
-            <summary>True if your agent successfully joined the session</summary>
+        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket.MoneyDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AlertMessageEventArgs">
-            <summary>Data sent by the simulator containing urgent messages</summary>
+        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AlertMessageEventArgs.Message">
-            <summary>Get the alert message</summary>
+        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.MoneyDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.HistoryDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptControlEventArgs.Pass">
-            <summary>True if the script is passing controls back to the agent</summary>
+        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket.MoneyDataBlock">
+            <exclude/>
         </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.GroupAccountTransactionsReplyPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.CameraConstraintEventArgs">
-            <summary>
-            Data sent from the simulator to an agent to indicate its view limits
-            </summary>
+        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.MoneyDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.CameraConstraintEventArgs.CollidePlane">
-            <summary>Get the collision plane</summary>
+        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.HistoryDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket">
+            <exclude/>
         </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)">
-            <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 name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.RequestorID">
-            <summary>Get the ID of the primitive sending the sensor</summary>
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.GroupID">
-            <summary>Get the ID of the group associated with the primitive</summary>
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.TransactionDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Name">
-            <summary>Get the name of the primitive sending the sensor</summary>
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.ObjectID">
-            <summary>Get the ID of the primitive sending the sensor</summary>
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.AgentDataBlock">
+            <exclude/>
         </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.GroupActiveProposalItemReplyPacket.TransactionDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Position">
-            <summary>Get the position of the primitive sending the sensor</summary>
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.ProposalDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Range">
-            <summary>Get the range the primitive specified to scan</summary>
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Rotation">
-            <summary>Get the rotation of the primitive sending the sensor</summary>
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Type">
-            <summary>Get the type of sensor the primitive sent</summary>
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Velocity">
-            <summary>Get the velocity of the primitive sending the sensor</summary>
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.TransactionDataBlock">
+            <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.GroupVoteHistoryItemReplyPacket">
+            <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.GroupVoteHistoryItemReplyPacket.AgentDataBlock">
+            <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.GroupVoteHistoryItemReplyPacket.TransactionDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.Autopilot">
-            <summary>True if the simulator Autopilot functions were involved</summary>
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.HistoryItemDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.CameraAtOffset">
-            <summary>Get the camera offset of the agent when seated</summary>
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.VoteItemBlock">
+            <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.StartGroupProposalPacket">
+            <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.StartGroupProposalPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.SitPosition">
-            <summary>Get the position of the agent when seated</summary>
+        <member name="T:OpenMetaverse.Packets.StartGroupProposalPacket.ProposalDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.SitRotation">
-            <summary>Get the rotation of the agent when seated</summary>
+        <member name="T:OpenMetaverse.Packets.GroupProposalBallotPacket">
+            <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.GroupProposalBallotPacket.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.GroupProposalBallotPacket.ProposalDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ChatSessionMemberAddedEventArgs.SessionID">
-            <summary>Get the ID of the chat session</summary>
+        <member name="T:OpenMetaverse.Packets.GroupMembersRequestPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ChatSessionMemberAddedEventArgs.AgentID">
-            <summary>Get the ID of the agent that joined</summary>
+        <member name="T:OpenMetaverse.Packets.GroupMembersRequestPacket.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.GroupMembersRequestPacket.GroupDataBlock">
+            <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.GroupMembersReplyPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ChatSessionMemberLeftEventArgs.SessionID">
-            <summary>Get the ID of the chat session</summary>
+        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ChatSessionMemberLeftEventArgs.AgentID">
-            <summary>Get the ID of the agent that left</summary>
+        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.GroupDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.GroupMembersReplyPacket.MemberDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetNotecard">
-            <summary>
-            Represents a string of characters encoded with specific formatting properties
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ActivateGroupPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetNotecard.BodyText">
-            <summary>A text string containing main text of the notecard</summary>
+        <member name="T:OpenMetaverse.Packets.ActivateGroupPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetNotecard.EmbeddedItems">
-            <summary>List of <see cref="T:OpenMetaverse.InventoryItem"/>s embedded on the notecard</summary>
+        <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetNotecard.#ctor">
-            <summary>Construct an Asset of type Notecard</summary>
+        <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.SetGroupContributionPacket.DataBlock">
+            <exclude/>
         </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.Packets.SetGroupAcceptNoticesPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetNotecard.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket.DataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket.NewDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.AGNI_LOGIN_SERVER">
-            <summary>Main grid login server</summary>
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.ADITI_LOGIN_SERVER">
-            <summary>Beta grid login server</summary>
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.ENABLE_INVENTORY_STORE">
-            <summary>
-            InventoryManager requests inventory information on login,
-            GridClient initializes an Inventory store for main inventory.
-            </summary>
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.ENABLE_LIBRARY_STORE">
-            <summary>
-            InventoryManager requests library information on login,
-            GridClient initializes an Inventory store for the library.
-            </summary>
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.PING_INTERVAL">
-            <summary>Number of milliseconds between sending pings to each sim</summary>
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.DEFAULT_AGENT_UPDATE_INTERVAL">
-            <summary>Number of milliseconds between sending camera updates</summary>
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.INTERPOLATION_INTERVAL">
-            <summary>Number of milliseconds between updating the current
-            positions of moving, non-accelerating and non-colliding objects</summary>
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.RoleDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.NETWORK_TICK_INTERVAL">
-            <summary>Millisecond interval between ticks, where all ACKs are 
-            sent out and the age of unACKed packets is checked</summary>
+        <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.PACKET_INBOX_SIZE">
-            <summary>The initial size of the packet inbox, where packets are
-            stored before processing</summary>
+        <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.MAX_PACKET_SIZE">
-            <summary>Maximum size of packet that we want to send over the wire</summary>
+        <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.MAX_SEQUENCE">
-            <summary>The maximum value of a packet sequence number before it
-            rolls over back to one</summary>
+        <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.PACKET_ARCHIVE_SIZE">
-            <summary>The maximum size of the sequence number archive, used to
-            check for resent and/or duplicate packets</summary>
+        <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.RESOURCE_DIR">
-            <summary>The relative directory where external resources are kept</summary>
+        <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket.MemberDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOGIN_SERVER">
-            <summary>Login server to connect to</summary>
+        <member name="T:OpenMetaverse.Packets.GroupTitlesRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.BIND_ADDR">
-            <summary>IP Address the client will bind to</summary>
+        <member name="T:OpenMetaverse.Packets.GroupTitlesRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.USE_LLSD_LOGIN">
-            <summary>Use XML-RPC Login or LLSD Login, default is XML-RPC Login</summary>
+        <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.TRANSFER_TIMEOUT">
-            <summary>Number of milliseconds before an asset transfer will time
-            out</summary>
+        <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.TELEPORT_TIMEOUT">
-            <summary>Number of milliseconds before a teleport attempt will time
-            out</summary>
+        <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOGOUT_TIMEOUT">
-            <summary>Number of milliseconds before NetworkManager.Logout() will
-            time out</summary>
+        <member name="T:OpenMetaverse.Packets.GroupTitleUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.CAPS_TIMEOUT">
-            <summary>Number of milliseconds before a CAPS call will time out</summary>
-            <remarks>Setting this too low will cause web requests time out and
-            possibly retry repeatedly</remarks>
+        <member name="T:OpenMetaverse.Packets.GroupTitleUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOGIN_TIMEOUT">
-            <summary>Number of milliseconds for xml-rpc to timeout</summary>
+        <member name="T:OpenMetaverse.Packets.GroupRoleUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.RESEND_TIMEOUT">
-            <summary>Milliseconds before a packet is assumed lost and resent</summary>
+        <member name="T:OpenMetaverse.Packets.GroupRoleUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.SIMULATOR_TIMEOUT">
-            <summary>Milliseconds without receiving a packet before the 
-            connection to a simulator is assumed lost</summary>
+        <member name="T:OpenMetaverse.Packets.GroupRoleUpdatePacket.RoleDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.MAP_REQUEST_TIMEOUT">
-            <summary>Milliseconds to wait for a simulator info request through
-            the grid interface</summary>
+        <member name="T:OpenMetaverse.Packets.LiveHelpGroupRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.MAX_PENDING_ACKS">
-            <summary>Maximum number of queued ACKs to be sent before SendAcks()
-            is forced</summary>
+        <member name="T:OpenMetaverse.Packets.LiveHelpGroupRequestPacket.RequestDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.STATS_QUEUE_SIZE">
-            <summary>Network stats queue length (seconds)</summary>
+        <member name="T:OpenMetaverse.Packets.LiveHelpGroupReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.STORE_LAND_PATCHES">
-            <summary>Enable/disable storing terrain heightmaps in the 
-            TerrainManager</summary>
+        <member name="T:OpenMetaverse.Packets.LiveHelpGroupReplyPacket.ReplyDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.SEND_AGENT_UPDATES">
-            <summary>Enable/disable sending periodic camera updates</summary>
+        <member name="T:OpenMetaverse.Packets.AgentWearablesRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.SEND_AGENT_APPEARANCE">
-            <summary>Enable/disable automatically setting agent appearance at
-            login and after sim crossing</summary>
+        <member name="T:OpenMetaverse.Packets.AgentWearablesRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.SEND_AGENT_THROTTLE">
-            <summary>Enable/disable automatically setting the bandwidth throttle
-            after connecting to each simulator</summary>
-            <remarks>The default throttle uses the equivalent of the maximum
-            bandwidth setting in the official client. If you do not set a
-            throttle your connection will by default be throttled well below
-            the minimum values and you may experience connection problems</remarks>
+        <member name="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.SEND_PINGS">
-            <summary>Enable/disable the sending of pings to monitor lag and 
-            packet loss</summary>
+        <member name="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket.WearableDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.AgentIsNowWearingPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.AgentIsNowWearingPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.ENABLE_CAPS">
-            <summary>Whether to establish connections to HTTP capabilities
-            servers for simulators</summary>
+        <member name="T:OpenMetaverse.Packets.AgentIsNowWearingPacket.WearableDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.ENABLE_SIMSTATS">
-            <summary>Whether to decode sim stats</summary>
+        <member name="T:OpenMetaverse.Packets.AgentCachedTexturePacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.AgentCachedTexturePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.FETCH_MISSING_INVENTORY">
-            <summary>If true, any reference received for a folder or item
-            the library is not aware of will automatically be fetched</summary>
+        <member name="T:OpenMetaverse.Packets.AgentCachedTexturePacket.WearableDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.DISABLE_AGENT_UPDATE_DUPLICATE_CHECK">
-            <summary>If true, and <code>SEND_AGENT_UPDATES</code> is true,
-            AgentUpdate packets will continuously be sent out to give the bot
-            smoother movement and autopiloting</summary>
+        <member name="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.OBJECT_TRACKING">
-            <summary>If true, currently visible avatars will be stored
-            in dictionaries inside <code>Simulator.ObjectPrimitives</code>.
-            If false, a new Avatar or Primitive object will be created
-            each time an object update packet is received</summary>
+        <member name="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket.WearableDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.AgentDataUpdateRequestPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.AgentDataUpdateRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.PARCEL_TRACKING">
-            <summary>If true, parcel details will be stored in the 
-            <code>Simulator.Parcels</code> dictionary as they are received</summary>
+        <member name="T:OpenMetaverse.Packets.AgentDataUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.ALWAYS_REQUEST_PARCEL_ACL">
-            <summary>
-            If true, an incoming parcel properties reply will automatically send
-            a request for the parcel access list
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AgentDataUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.ALWAYS_REQUEST_PARCEL_DWELL">
-            <summary>
-            if true, an incoming parcel properties reply will automatically send 
-            a request for the traffic count.
-            </summary>
+        <member name="T:OpenMetaverse.Packets.GroupDataUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.USE_ASSET_CACHE">
-            <summary>
-            If true, images, and other assets downloaded from the server 
-            will be cached in a local directory
-            </summary>
+        <member name="T:OpenMetaverse.Packets.GroupDataUpdatePacket.AgentGroupDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.ASSET_CACHE_DIR">
-            <summary>Path to store cached texture data</summary>
+        <member name="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.ASSET_CACHE_MAX_SIZE">
-            <summary>Maximum size cached files are allowed to take on disk (bytes)</summary>
+        <member name="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.DEFAULT_EFFECT_COLOR">
-            <summary>Default color used for viewer particle effects</summary>
+        <member name="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.MAX_RESEND_COUNT">
-            <summary>Maximum number of times to resend a failed packet</summary>
+        <member name="T:OpenMetaverse.Packets.AgentDropGroupPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.THROTTLE_OUTGOING_PACKETS">
-            <summary>Throttle outgoing packet rate</summary>
+        <member name="T:OpenMetaverse.Packets.AgentDropGroupPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.CLIENT_IDENTIFICATION_TAG">
-            <summary>UUID of a texture used by some viewers to indentify type of client used</summary>
+        <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.USE_HTTP_TEXTURES">
-            <summary>
-            Download textures using GetTexture capability when available
-            </summary>
+        <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.MAX_CONCURRENT_TEXTURE_DOWNLOADS">
-            <summary>The maximum number of concurrent texture downloads allowed</summary>
-            <remarks>Increasing this number will not necessarily increase texture retrieval times due to
-            simulator throttles</remarks>
+        <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.PIPELINE_REFRESH_INTERVAL">
-            <summary>
-            The Refresh timer inteval is used to set the delay between checks for stalled texture downloads
-            </summary>
-            <remarks>This is a static variable which applies to all instances</remarks>
+        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.PIPELINE_REQUEST_TIMEOUT">
-            <summary>
-            Textures taking longer than this value will be flagged as timed out and removed from the pipeline
-            </summary>
+        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOG_LEVEL">
-            <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 name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.HeaderDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOG_NAMES">
-            <summary>Attach avatar names to log messages</summary>
+        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOG_RESENDS">
-            <summary>Log packet retransmission info</summary>
+        <member name="T:OpenMetaverse.Packets.DetachAttachmentIntoInvPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Settings.#ctor(OpenMetaverse.GridClient)">
-            <summary>Constructor</summary>
-            <param name="client">Reference to a GridClient object</param>
+        <member name="T:OpenMetaverse.Packets.DetachAttachmentIntoInvPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Settings.EconomyDataHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Settings.UPLOAD_COST">
-            <summary>Cost of uploading an asset</summary>
-            <remarks>Read-only since this value is dynamically fetched at login</remarks>
+        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.NetworkManager">
-            <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>
-            <summary>
-            Login Routines
-            </summary>
+        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.HeaderDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_PacketSent">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnPacketSent(OpenMetaverse.PacketSentEventArgs)">
-            <summary>Raises the PacketSent Event</summary>
-             <param name="e">A PacketSentEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.Packets.UserInfoRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_PacketSentLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.UserInfoRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_LoggedOut">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnLoggedOut(OpenMetaverse.LoggedOutEventArgs)">
-            <summary>Raises the LoggedOut Event</summary>
-             <param name="e">A LoggedOutEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_LoggedOutLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket.UserDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimConnecting">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnSimConnecting(OpenMetaverse.SimConnectingEventArgs)">
-            <summary>Raises the SimConnecting Event</summary>
-             <param name="e">A SimConnectingEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimConnectingLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket.UserDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimConnected">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnSimConnected(OpenMetaverse.SimConnectedEventArgs)">
-            <summary>Raises the SimConnected Event</summary>
-             <param name="e">A SimConnectedEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimConnectedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket.FileDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimDisconnected">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.MapLayerRequestPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnSimDisconnected(OpenMetaverse.SimDisconnectedEventArgs)">
-            <summary>Raises the SimDisconnected Event</summary>
-             <param name="e">A SimDisconnectedEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.Packets.MapLayerRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimDisconnectedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.MapLayerReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_Disconnected">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.MapLayerReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnDisconnected(OpenMetaverse.DisconnectedEventArgs)">
-            <summary>Raises the Disconnected Event</summary>
-             <param name="e">A DisconnectedEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.Packets.MapLayerReplyPacket.LayerDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_DisconnectedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimChanged">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnSimChanged(OpenMetaverse.SimChangedEventArgs)">
-            <summary>Raises the SimChanged Event</summary>
-             <param name="e">A SimChangedEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket.PositionDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimChangedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.MapNameRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_EventQueueRunning">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.MapNameRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnEventQueueRunning(OpenMetaverse.EventQueueRunningEventArgs)">
-            <summary>Raises the EventQueueRunning Event</summary>
-             <param name="e">A EventQueueRunningEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.Packets.MapNameRequestPacket.NameDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_EventQueueRunningLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.Simulators">
-            <summary>All of the simulators we are currently connected to</summary>
+        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.CapsEvents">
-            <summary>Handlers for incoming capability events</summary>
+        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.PacketEvents">
-            <summary>Handlers for incoming packets</summary>
+        <member name="T:OpenMetaverse.Packets.MapItemRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.PacketInbox">
-            <summary>Incoming packets that are awaiting handling</summary>
+        <member name="T:OpenMetaverse.Packets.MapItemRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.PacketOutbox">
-            <summary>Outgoing packets that are awaiting handling</summary>
+        <member name="T:OpenMetaverse.Packets.MapItemRequestPacket.RequestDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Default constructor
-            </summary>
-            <param name="client">Reference to the GridClient object</param>
+        <member name="T:OpenMetaverse.Packets.MapItemReplyPacket">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.MapItemReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.MapItemReplyPacket.RequestDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.MapItemReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.SendPostcardPacket">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.SendPostcardPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ParcelMediaCommandMessagePacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelMediaCommandMessagePacket.CommandBlockBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket.DataBlockBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket.DataBlockExtendedBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.LandStatRequestPacket">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.LandStatRequestPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.LandStatRequestPacket.RequestDataBlock">
+            <exclude/>
         </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>
+        <member name="T:OpenMetaverse.Packets.LandStatReplyPacket">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.LandStatReplyPacket.RequestDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.LandStatReplyPacket.ReportDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ErrorPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ErrorPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ErrorPacket.DataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket.ObjectDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_LoginProgress">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnLoginProgress(OpenMetaverse.LoginProgressEventArgs)">
-            <summary>Raises the LoginProgress Event</summary>
-             <param name="e">A LoginProgressEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket.InventoryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_LoginProgressLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.LoginSeedCapability">
-            <summary>Seed CAPS URL returned from the login server</summary>
+        <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.UDPBlacklist">
-            <summary>A list of packets obtained during the login process which 
-            networkmanager will log but not process</summary>
+        <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket.InventoryBlockBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.PacketAckPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.PacketAckPacket.PacketsBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.OpenCircuitPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.OpenCircuitPacket.CircuitInfoBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.CloseCircuitPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.LoginReplyXmlRpcHandler(Nwc.XmlRpc.XmlRpcResponse,OpenMetaverse.LoginParams)">
-            <summary>
-            Handles response from XML-RPC login replies
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectAddPacket">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectAddPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.GetPlatform">
-            <summary>
-            Get current OS
-            </summary>
-            <returns>Either "Win" or "Linux"</returns>
+        <member name="T:OpenMetaverse.Packets.ObjectAddPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.GetMAC">
-            <summary>
-            Get clients default Mac Address
-            </summary>
-            <returns>A string containing the first found Mac Address</returns>
+        <member name="T:OpenMetaverse.Packets.MultipleObjectUpdatePacket">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.PacketSent">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="T:OpenMetaverse.Packets.MultipleObjectUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.LoggedOut">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="T:OpenMetaverse.Packets.MultipleObjectUpdatePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.SimConnecting">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="T:OpenMetaverse.Packets.RequestMultipleObjectsPacket">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.SimConnected">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="T:OpenMetaverse.Packets.RequestMultipleObjectsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.SimDisconnected">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="T:OpenMetaverse.Packets.RequestMultipleObjectsPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.Disconnected">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectPositionPacket">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.SimChanged">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectPositionPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.EventQueueRunning">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectPositionPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.CircuitCode">
-            <summary>Unique identifier associated with our connections to
-            simulators</summary>
+        <member name="T:OpenMetaverse.Packets.RequestObjectPropertiesFamilyPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.CurrentSim">
-            <summary>The simulator that the logged in avatar is currently 
-            occupying</summary>
+        <member name="T:OpenMetaverse.Packets.RequestObjectPropertiesFamilyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.Connected">
-            <summary>Shows whether the network layer is logged in to the
-            grid or not</summary>
+        <member name="T:OpenMetaverse.Packets.RequestObjectPropertiesFamilyPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.InboxCount">
-            <summary>Number of packets in the incoming queue</summary>
+        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.OutboxCount">
-            <summary>Number of packets in the outgoing queue</summary>
+        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket.LocationBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.LoginProgress">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket.IndexBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.OnLoginResponse">
-            <summary>Called when a reply is received from the login server, the
-            login sequence will block until this event returns</summary>
+        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.LoginStatusCode">
-            <summary>Current state of logging in</summary>
+        <member name="T:OpenMetaverse.Packets.CrossedRegionPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.LoginErrorKey">
-            <summary>Upon login failure, contains a short string key for the
-            type of login error that occurred</summary>
+        <member name="T:OpenMetaverse.Packets.CrossedRegionPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.RawLoginReply">
-            <summary>The raw XML-RPC reply from the login server, exactly as it
-            was received (minus the HTTP header)</summary>
+        <member name="T:OpenMetaverse.Packets.CrossedRegionPacket.RegionDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.LoginMessage">
-            <summary>During login this contains a descriptive version of 
-            LoginStatusCode. After a successful login this will contain the 
-            message of the day, and after a failed login a descriptive error 
-            message will be returned</summary>
+        <member name="T:OpenMetaverse.Packets.CrossedRegionPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.NetworkManager.DisconnectType">
-            <summary>
-            Explains why a simulator or the grid disconnected from us
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ConfirmEnableSimulatorPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.ClientInitiated">
-            <summary>The client requested the logout or simulator disconnect</summary>
+        <member name="T:OpenMetaverse.Packets.ConfirmEnableSimulatorPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.ServerInitiated">
-            <summary>The server notified us that it is disconnecting</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectPropertiesPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.NetworkTimeout">
-            <summary>Either a socket was closed or network traffic timed out</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectPropertiesPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.SimShutdown">
-            <summary>The last active simulator shut down</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectPropertiesFamilyPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ObjectPropertiesFamilyPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.IncomingPacket.Simulator">
-            <summary>Reference to the simulator that this packet came from</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.IncomingPacket.Packet">
-            <summary>Packet that needs to be processed</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ParcelPropertiesRequestPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Simulator">
-            <summary>Reference to the simulator this packet is destined for</summary>
+        <member name="T:OpenMetaverse.Packets.AttachedSoundPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Buffer">
-            <summary>Packet that needs to be sent</summary>
+        <member name="T:OpenMetaverse.Packets.AttachedSoundPacket.DataBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.SequenceNumber">
-            <summary>Sequence number of the wrapped packet</summary>
+        <member name="T:OpenMetaverse.Packets.AttachedSoundGainChangePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.ResendCount">
-            <summary>Number of times this packet has been resent</summary>
+        <member name="T:OpenMetaverse.Packets.AttachedSoundGainChangePacket.DataBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.TickCount">
-            <summary>Environment.TickCount when this packet was last sent over the wire</summary>
+        <member name="T:OpenMetaverse.Packets.PreloadSoundPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.PreloadSoundPacket.DataBlockBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ObjectReturnType">
-            <summary>
-            Type of return to use when returning objects from a parcel
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ViewerEffectPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ObjectReturnType.None">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.ViewerEffectPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ObjectReturnType.Owner">
-            <summary>Return objects owned by parcel owner</summary>
+        <member name="T:OpenMetaverse.Packets.ViewerEffectPacket.EffectBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ObjectReturnType.Group">
-            <summary>Return objects set to group</summary>
+        <member name="T:OpenMetaverse.Packets.StartPingCheckPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ObjectReturnType.Other">
-            <summary>Return objects not owned by parcel owner or set to group</summary>
+        <member name="T:OpenMetaverse.Packets.StartPingCheckPacket.PingIDBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ObjectReturnType.List">
-            <summary>Return a specific list of objects on parcel</summary>
+        <member name="T:OpenMetaverse.Packets.CompletePingCheckPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ObjectReturnType.Sell">
-            <summary>Return objects that are marked for-sale</summary>
+        <member name="T:OpenMetaverse.Packets.CompletePingCheckPacket.PingIDBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ParcelAccessFlags">
-            <summary>
-            Blacklist/Whitelist flags used in parcels Access List
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AgentUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelAccessFlags.NoAccess">
-            <summary>Agent is denied access</summary>
+        <member name="T:OpenMetaverse.Packets.AgentUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelAccessFlags.Access">
-            <summary>Agent is granted access</summary>
+        <member name="T:OpenMetaverse.Packets.AgentAnimationPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ParcelResult">
-            <summary>
-            The result of a request for parcel properties
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AgentAnimationPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelResult.NoData">
-            <summary>No matches were found for the request</summary>
+        <member name="T:OpenMetaverse.Packets.AgentAnimationPacket.AnimationListBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelResult.Single">
-            <summary>Request matched a single parcel</summary>
+        <member name="T:OpenMetaverse.Packets.AgentAnimationPacket.PhysicalAvatarEventListBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelResult.Multiple">
-            <summary>Request matched multiple parcels</summary>
+        <member name="T:OpenMetaverse.Packets.AgentRequestSitPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AccessList">
-            <summary>
-            Flags used in the ParcelAccessListRequest packet to specify whether
-            we want the access list (whitelist), ban list (blacklist), or both
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AgentRequestSitPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AccessList.Access">
-            <summary>Request the access list</summary>
+        <member name="T:OpenMetaverse.Packets.AgentRequestSitPacket.TargetObjectBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AccessList.Ban">
-            <summary>Request the ban list</summary>
+        <member name="T:OpenMetaverse.Packets.AgentSitPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AccessList.Both">
-            <summary>Request both White and Black lists</summary>
+        <member name="T:OpenMetaverse.Packets.AgentSitPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ParcelPropertiesStatus">
-            <summary>
-            Sequence ID in ParcelPropertiesReply packets (sent when avatar
-            tries to cross a parcel border)
-            </summary>
+        <member name="T:OpenMetaverse.Packets.RequestImagePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelPropertiesStatus.ParcelSelected">
-            <summary>Parcel is currently selected</summary>
+        <member name="T:OpenMetaverse.Packets.RequestImagePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelPropertiesStatus.CollisionNotInGroup">
-            <summary>Parcel restricted to a group the avatar is not a
-            member of</summary>
+        <member name="T:OpenMetaverse.Packets.RequestImagePacket.RequestImageBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelPropertiesStatus.CollisionBanned">
-            <summary>Avatar is banned from the parcel</summary>
+        <member name="T:OpenMetaverse.Packets.ImageDataPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelPropertiesStatus.CollisionNotOnAccessList">
-            <summary>Parcel is restricted to an access list that the
-            avatar is not on</summary>
+        <member name="T:OpenMetaverse.Packets.ImageDataPacket.ImageIDBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelPropertiesStatus.HoveredOverParcel">
-            <summary>Response to hovering over a parcel</summary>
+        <member name="T:OpenMetaverse.Packets.ImageDataPacket.ImageDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.TerraformAction">
-            <summary>
-            The tool to use when modifying terrain levels
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ImagePacketPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TerraformAction.Level">
-            <summary>Level the terrain</summary>
+        <member name="T:OpenMetaverse.Packets.ImagePacketPacket.ImageIDBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TerraformAction.Raise">
-            <summary>Raise the terrain</summary>
+        <member name="T:OpenMetaverse.Packets.ImagePacketPacket.ImageDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TerraformAction.Lower">
-            <summary>Lower the terrain</summary>
+        <member name="T:OpenMetaverse.Packets.LayerDataPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TerraformAction.Smooth">
-            <summary>Smooth the terrain</summary>
+        <member name="T:OpenMetaverse.Packets.LayerDataPacket.LayerIDBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TerraformAction.Noise">
-            <summary>Add random noise to the terrain</summary>
+        <member name="T:OpenMetaverse.Packets.LayerDataPacket.LayerDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TerraformAction.Revert">
-            <summary>Revert terrain to simulator default</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdatePacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.TerraformBrushSize">
-            <summary>
-            The tool size to use when changing terrain levels
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.TerraformBrushSize.Small">
-            <summary>Small</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdatePacket.RegionDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TerraformBrushSize.Medium">
-            <summary>Medium</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdatePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TerraformBrushSize.Large">
-            <summary>Large</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AccessDeniedReason">
-            <summary>
-            Reasons agent is denied access to a parcel on the simulator
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket.RegionDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AccessDeniedReason.NotDenied">
-            <summary>Agent is not denied, access is granted</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AccessDeniedReason.NotInGroup">
-            <summary>Agent is not a member of the group set for the parcel, or which owns the parcel</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AccessDeniedReason.NotOnAllowList">
-            <summary>Agent is not on the parcels specific allow list</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket.RegionDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AccessDeniedReason.BannedFromParcel">
-            <summary>Agent is on the parcels ban list</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AccessDeniedReason.NoAccess">
-            <summary>Unknown</summary>
+        <member name="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AccessDeniedReason.NotAgeVerified">
-            <summary>Agent is not age verified and parcel settings deny access to non age verified avatars</summary>
+        <member name="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket.RegionDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ParcelOverlayType">
-            <summary>
-            Parcel overlay type. This is used primarily for highlighting and
-            coloring which is why it is a single integer instead of a set of
-            flags
-            </summary>
-            <remarks>These values seem to be poorly thought out. The first three
-            bits represent a single value, not flags. For example Auction (0x05) is
-            not a combination of OwnedByOther (0x01) and ForSale(0x04). However,
-            the BorderWest and BorderSouth values are bit flags that get attached
-            to the value stored in the first three bits. Bits four, five, and six
-            are unused</remarks>
+        <member name="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.Public">
-            <summary>Public land</summary>
+        <member name="T:OpenMetaverse.Packets.KillObjectPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.OwnedByOther">
-            <summary>Land is owned by another avatar</summary>
+        <member name="T:OpenMetaverse.Packets.KillObjectPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.OwnedByGroup">
-            <summary>Land is owned by a group</summary>
+        <member name="T:OpenMetaverse.Packets.TransferPacketPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.OwnedBySelf">
-            <summary>Land is owned by the current avatar</summary>
+        <member name="T:OpenMetaverse.Packets.TransferPacketPacket.TransferDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.ForSale">
-            <summary>Land is for sale</summary>
+        <member name="T:OpenMetaverse.Packets.SendXferPacketPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.Auction">
-            <summary>Land is being auctioned</summary>
+        <member name="T:OpenMetaverse.Packets.SendXferPacketPacket.XferIDBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.BorderWest">
-            <summary>To the west of this area is a parcel border</summary>
+        <member name="T:OpenMetaverse.Packets.SendXferPacketPacket.DataPacketBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.BorderSouth">
-            <summary>To the south of this area is a parcel border</summary>
+        <member name="T:OpenMetaverse.Packets.ConfirmXferPacketPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ParcelFlags">
-            <summary>
-            Various parcel properties
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ConfirmXferPacketPacket.XferIDBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.None">
-            <summary>No flags set</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowFly">
-            <summary>Allow avatars to fly (a client-side only restriction)</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.SenderBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowOtherScripts">
-            <summary>Allow foreign scripts to run</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.AnimationListBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.ForSale">
-            <summary>This parcel is for sale</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.AnimationSourceListBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowLandmark">
-            <summary>Allow avatars to create a landmark on this parcel</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.PhysicalAvatarEventListBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowTerraform">
-            <summary>Allows all avatars to edit the terrain on this parcel</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarSitResponsePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowDamage">
-            <summary>Avatars have health and can take damage on this parcel.
-            If set, avatars can be killed and sent home here</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarSitResponsePacket.SitObjectBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.CreateObjects">
-            <summary>Foreign avatars can create objects here</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarSitResponsePacket.SitTransformBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.ForSaleObjects">
-            <summary>All objects on this parcel can be purchased</summary>
+        <member name="T:OpenMetaverse.Packets.CameraConstraintPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UseAccessGroup">
-            <summary>Access is restricted to a group</summary>
+        <member name="T:OpenMetaverse.Packets.CameraConstraintPacket.CameraCollidePlaneBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UseAccessList">
-            <summary>Access is restricted to a whitelist</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UseBanList">
-            <summary>Ban blacklist is enabled</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UsePassList">
-            <summary>Unknown</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesPacket.AgeVerificationBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.ShowDirectory">
-            <summary>List this parcel in the search directory</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowDeedToGroup">
-            <summary>Allow personally owned parcels to be deeded to group</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.ContributeWithDeed">
-            <summary>If Deeded, owner contributes required tier to group parcel is deeded to</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.SoundLocal">
-            <summary>Restrict sounds originating on this parcel to the 
-            parcel boundaries</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AnimationDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.SellParcelObjects">
-            <summary>Objects on this parcel are sold when the land is 
-            purchsaed</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.GranterBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowPublish">
-            <summary>Allow this parcel to be published on the web</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.NVPairDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.MaturePublish">
-            <summary>The information for this parcel is mature content</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.VisualParamBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UrlWebPage">
-            <summary>The media URL is an HTML page</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentAccessBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UrlRawHtml">
-            <summary>The media URL is a raw HTML string</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.RestrictPushObject">
-            <summary>Restrict foreign object pushes</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentAlivePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.DenyAnonymous">
-            <summary>Ban all non identified/transacted avatars</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentAlivePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowGroupScripts">
-            <summary>Allow group-owned scripts to run</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentPositionUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.CreateGroupObjects">
-            <summary>Allow object creation by group members or group 
-            objects</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentPositionUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowAPrimitiveEntry">
-            <summary>Allow all objects to enter this parcel</summary>
+        <member name="T:OpenMetaverse.Packets.SoundTriggerPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowGroupObjectEntry">
-            <summary>Only allow group and owner objects to enter this parcel</summary>
+        <member name="T:OpenMetaverse.Packets.SoundTriggerPacket.SoundDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowVoiceChat">
-            <summary>Voice Enabled on this parcel</summary>
+        <member name="T:OpenMetaverse.TextureRequestState">
+            <summary>
+            The current status of a texture request as it moves through the pipeline or final result of a texture request. 
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UseEstateVoiceChan">
-            <summary>Use Estate Voice channel for Voice on this parcel</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="F:OpenMetaverse.ParcelFlags.DenyAgeUnverified">
-            <summary>Deny Age Unverified Users</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="T:OpenMetaverse.ParcelStatus">
-            <summary>
-            Parcel ownership status
-            </summary>
+        <member name="F:OpenMetaverse.TextureRequestState.Progress">
+            <summary>A request that has received one or more packets back from the simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelStatus.None">
-            <summary>Placeholder</summary>
+        <member name="F:OpenMetaverse.TextureRequestState.Finished">
+            <summary>A request that has received all packets back from the simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelStatus.Leased">
-            <summary>Parcel is leased (owned) by an avatar or group</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="F:OpenMetaverse.ParcelStatus.LeasePending">
-            <summary>Parcel is in process of being leased (purchased) by an avatar or group</summary>
+        <member name="F:OpenMetaverse.TextureRequestState.Aborted">
+            <summary>The texture request was aborted by request of the agent</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelStatus.Abandoned">
-            <summary>Parcel has been abandoned back to Governor Linden</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="T:OpenMetaverse.ParcelCategory">
+        <member name="T:OpenMetaverse.TextureDownloadCallback">
             <summary>
-            Category parcel is listed in under search
+            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="F:OpenMetaverse.ParcelCategory.None">
-            <summary>No assigned category</summary>
-        </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Linden">
-            <summary>Linden Infohub or public area</summary>
-        </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Adult">
-            <summary>Adult themed area</summary>
+        <member name="T:OpenMetaverse.TexturePipeline">
+            <summary>
+            Texture request download handler, allows a configurable number of download slots which manage multiple
+            concurrent texture downloads from the <seealso cref="T:OpenMetaverse.Simulator"/>
+            </summary>
+            <remarks>This class makes full use of the internal <seealso cref="!:TextureCache"/> 
+            system for full texture downloads.</remarks>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Arts">
-            <summary>Arts and Culture</summary>
+        <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.ParcelCategory.Business">
-            <summary>Business</summary>
+        <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.ParcelCategory.Educational">
-            <summary>Educational</summary>
+        <member name="F:OpenMetaverse.TexturePipeline.maxTextureRequests">
+            <summary>Maximum concurrent texture requests allowed at a time</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Gaming">
-            <summary>Gaming</summary>
+        <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.ParcelCategory.Hangout">
-            <summary>Hangout or Club</summary>
+        <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.ParcelCategory.Newcomer">
-            <summary>Newcomer friendly</summary>
+        <member name="F:OpenMetaverse.TexturePipeline.downloadMaster">
+            <summary>The primary thread which manages the requests.</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Park">
-            <summary>Parks and Nature</summary>
+        <member name="F:OpenMetaverse.TexturePipeline._Running">
+            <summary>true if the TexturePipeline is currently running</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Residential">
-            <summary>Residential</summary>
+        <member name="F:OpenMetaverse.TexturePipeline.lockerObject">
+            <summary>A synchronization object used by the primary thread</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Shopping">
-            <summary>Shopping</summary>
+        <member name="F:OpenMetaverse.TexturePipeline.RefreshDownloadsTimer">
+            <summary>A refresh timer used to increase the priority of stalled requests</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Stage">
-            <summary>Not Used?</summary>
+        <member name="M:OpenMetaverse.TexturePipeline.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Default constructor, Instantiates a new copy of the TexturePipeline class
+            </summary>
+            <param name="client">Reference to the instantiated <see cref="T:OpenMetaverse.GridClient"/> object</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Other">
-            <summary>Other</summary>
+        <member name="M:OpenMetaverse.TexturePipeline.Startup">
+            <summary>
+            Initialize callbacks required for the TexturePipeline to operate
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Any">
-            <summary>Not an actual category, only used for queries</summary>
+        <member name="M:OpenMetaverse.TexturePipeline.Shutdown">
+            <summary>
+            Shutdown the TexturePipeline and cleanup any callbacks or transfers
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.LandingType">
+        <member name="M:OpenMetaverse.TexturePipeline.RequestTexture(OpenMetaverse.UUID,OpenMetaverse.ImageType,System.Single,System.Int32,System.UInt32,OpenMetaverse.TextureDownloadCallback,System.Boolean)">
             <summary>
-            Type of teleport landing for a parcel
+            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="F:OpenMetaverse.LandingType.None">
-            <summary>Unset, simulator default</summary>
+        <member name="M:OpenMetaverse.TexturePipeline.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,System.Single,System.Int32,System.UInt32)">
+            <summary>
+            Sends the actual request packet to the simulator
+            </summary>
+            <param name="imageID">The image to download</param>
+            <param name="type">Type of the image to download, either a baked
+            avatar texture or a normal texture</param>
+            <param name="priority">Priority level of the download. Default is
+            <c>1,013,000.0f</c></param>
+            <param name="discardLevel">Number of quality layers to discard.
+            This controls the end marker of the data sent</param>
+            <param name="packetNum">Packet number to start the download at.
+            This controls the start marker of the data sent</param>
+            <remarks>Sending a priority of 0 and a discardlevel of -1 aborts
+            download</remarks>
         </member>
-        <member name="F:OpenMetaverse.LandingType.LandingPoint">
-            <summary>Specific landing point set for this parcel</summary>
+        <member name="M:OpenMetaverse.TexturePipeline.AbortTextureRequest(OpenMetaverse.UUID)">
+            <summary>
+            Cancel a pending or in process texture request
+            </summary>
+            <param name="textureID">The texture assets unique ID</param>
         </member>
-        <member name="F:OpenMetaverse.LandingType.Direct">
-            <summary>No landing point set, direct teleports enabled for
-            this parcel</summary>
+        <member name="M:OpenMetaverse.TexturePipeline.DownloadThread">
+            <summary>
+            Master Download Thread, Queues up downloads in the threadpool
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelMediaCommand">
+        <member name="M:OpenMetaverse.TexturePipeline.TextureRequestDoWork(System.Object)">
             <summary>
-            Parcel Media Command used in ParcelMediaCommandMessage
+            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="F:OpenMetaverse.ParcelMediaCommand.Stop">
-            <summary>Stop the media stream and go back to the first frame</summary>
+        <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="F:OpenMetaverse.ParcelMediaCommand.Pause">
-            <summary>Pause the media stream (stop playing but stay on current frame)</summary>
+        <member name="M:OpenMetaverse.TexturePipeline.ImagePacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>
+            Handles the remaining Image data that did not fit in the initial ImageData packet
+            </summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Play">
-            <summary>Start the current media stream playing and stop when the end is reached</summary>
+        <member name="M:OpenMetaverse.TexturePipeline.ImageDataHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>
+            Handle the initial ImageDataPacket sent from the simulator
+            </summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Loop">
-            <summary>Start the current media stream playing, 
-            loop to the beginning when the end is reached and continue to play</summary>
+        <member name="P:OpenMetaverse.TexturePipeline.TransferCount">
+            <summary>Current number of pending and in-process transfers</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Texture">
-            <summary>Specifies the texture to replace with video</summary>
-            <remarks>If passing the key of a texture, it must be explicitly typecast as a key, 
-            not just passed within double quotes.</remarks>
+        <member name="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.ParcelMediaCommand.URL">
-            <summary>Specifies the movie URL (254 characters max)</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="F:OpenMetaverse.ParcelMediaCommand.Time">
-            <summary>Specifies the time index at which to begin playing</summary>
+        <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.ParcelMediaCommand.Agent">
-            <summary>Specifies a single agent to apply the media command to</summary>
+        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.RequestSlot">
+            <summary>The slot this request is occupying in the threadpoolSlots array</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Unload">
-            <summary>Unloads the stream. While the stop command sets the texture to the first frame of the movie, 
-            unload resets it to the real texture that the movie was replacing.</summary>
+        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.Type">
+            <summary>The ImageType of the request.</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.AutoAlign">
-            <summary>Turn on/off the auto align feature, similar to the auto align checkbox in the parcel media properties 
-            (NOT to be confused with the "align" function in the textures view of the editor!) Takes TRUE or FALSE as parameter.</summary>
+        <member name="F:OpenMetaverse.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.ParcelMediaCommand.Type">
-            <summary>Allows a Web page or image to be placed on a prim (1.19.1 RC0 and later only). 
-            Use "text/html" for HTML.</summary>
+        <member name="F:OpenMetaverse.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.ParcelMediaCommand.Size">
-            <summary>Resizes a Web page to fit on x, y pixels (1.19.1 RC0 and later only).</summary>
-            <remarks>This might still not be working</remarks>
+        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.Transfer">
+            <summary>An object that maintains the data of an request thats in-process.</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Desc">
-            <summary>Sets a description for the media being displayed (1.19.1 RC0 and later only).</summary>
+        <member name="M:OpenMetaverse.Packets.PacketDecoder.AddCallback(System.String,OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder)">
+            <summary>
+            Add a custom decoder callback
+            </summary>
+            <param name="key">The key of the field to decode</param>
+            <param name="customPacketHandler">The custom decode handler</param>
         </member>
-        <member name="T:OpenMetaverse.ParcelInfo">
+        <member name="M:OpenMetaverse.Packets.PacketDecoder.RemoveCustomHandler(System.String,OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder)">
             <summary>
-            Some information about a parcel of land returned from a DirectoryManager search
+            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="F:OpenMetaverse.ParcelInfo.ID">
-            <summary>Global Key of record</summary>
+        <member name="M:OpenMetaverse.Packets.PacketDecoder.PacketToString(OpenMetaverse.Packets.Packet)">
+            <summary>
+            Creates a formatted string containing the values of a Packet
+            </summary>
+            <param name="packet">The Packet</param>
+            <returns>A formatted string of values of the nested items in the Packet object</returns>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.OwnerID">
-            <summary>Parcel Owners <seealso cref="T:OpenMetaverse.UUID"/></summary>
+        <member name="M:OpenMetaverse.Packets.PacketDecoder.MessageToString(System.Object,System.Int32)">
+            <summary>
+            Decode an IMessage object into a beautifully formatted string
+            </summary>
+            <param name="message">The IMessage object</param>
+            <param name="recurseLevel">Recursion level (used for indenting)</param>
+            <returns>A formatted string containing the names and values of the source object</returns>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.Name">
-            <summary>Name field of parcel, limited to 128 characters</summary>
+        <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="F:OpenMetaverse.ParcelInfo.Description">
-            <summary>Description field of parcel, limited to 256 characters</summary>
+        <member name="T:OpenMetaverse.LoginStatus">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.ActualArea">
-            <summary>Total Square meters of parcel</summary>
+        <member name="F:OpenMetaverse.LoginStatus.Failed">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.BillableArea">
-            <summary>Total area billable as Tier, for group owned land this will be 10% less than ActualArea</summary>
-        </member>
-        <member name="F:OpenMetaverse.ParcelInfo.Mature">
-            <summary>True of parcel is in Mature simulator</summary>
-        </member>
-        <member name="F:OpenMetaverse.ParcelInfo.GlobalX">
-            <summary>Grid global X position of parcel</summary>
-        </member>
-        <member name="F:OpenMetaverse.ParcelInfo.GlobalY">
-            <summary>Grid global Y position of parcel</summary>
-        </member>
-        <member name="F:OpenMetaverse.ParcelInfo.GlobalZ">
-            <summary>Grid global Z position of parcel (not used)</summary>
+        <member name="F:OpenMetaverse.LoginStatus.None">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.SimName">
-            <summary>Name of simulator parcel is located in</summary>
+        <member name="F:OpenMetaverse.LoginStatus.ConnectingToLogin">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.SnapshotID">
-            <summary>Texture <seealso cref="T:OpenMetaverse.UUID"/> of parcels display picture</summary>
+        <member name="F:OpenMetaverse.LoginStatus.ReadingResponse">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.Dwell">
-            <summary>Float representing calculated traffic based on time spent on parcel by avatars</summary>
+        <member name="F:OpenMetaverse.LoginStatus.ConnectingToSim">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.SalePrice">
-            <summary>Sale price of parcel (not used)</summary>
+        <member name="F:OpenMetaverse.LoginStatus.Redirecting">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.AuctionID">
-            <summary>Auction ID of parcel</summary>
+        <member name="F:OpenMetaverse.LoginStatus.Success">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelMedia">
+        <member name="T:OpenMetaverse.LastExecStatus">
             <summary>
-            Parcel Media Information
+            Status of the last application run.
+            Used for error reporting to the grid login service for statistical purposes.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaAutoScale">
-            <summary>A byte, if 0x1 viewer should auto scale media to fit object</summary>
-        </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaLoop">
-            <summary>A boolean, if true the viewer should loop the media</summary>
-        </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaID">
-            <summary>The Asset UUID of the Texture which when applied to a 
-            primitive will display the media</summary>
+        <member name="F:OpenMetaverse.LastExecStatus.Normal">
+            <summary> Application exited normally </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaURL">
-            <summary>A URL which points to any Quicktime supported media type</summary>
+        <member name="F:OpenMetaverse.LastExecStatus.Froze">
+            <summary> Application froze </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaDesc">
-            <summary>A description of the media</summary>
+        <member name="F:OpenMetaverse.LastExecStatus.ForcedCrash">
+            <summary> Application detected error and exited abnormally </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaHeight">
-            <summary>An Integer which represents the height of the media</summary>
+        <member name="F:OpenMetaverse.LastExecStatus.OtherCrash">
+            <summary> Other crash </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaWidth">
-            <summary>An integer which represents the width of the media</summary>
+        <member name="F:OpenMetaverse.LastExecStatus.LogoutFroze">
+            <summary> Application froze during logout </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaType">
-            <summary>A string which contains the mime type of the media</summary>
+        <member name="F:OpenMetaverse.LastExecStatus.LogoutCrash">
+            <summary> Application crashed during logout </summary>
         </member>
-        <member name="T:OpenMetaverse.Parcel">
+        <member name="T:OpenMetaverse.LoginParams">
             <summary>
-            Parcel of land, a portion of virtual real estate in a simulator
+            Login Request Parameters
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.SelfCount">
-            <summary>The total number of contiguous 4x4 meter blocks your agent owns within this parcel</summary>        
+        <member name="F:OpenMetaverse.LoginParams.URI">
+            <summary>The URL of the Login Server</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.OtherCount">
-            <summary>The total number of contiguous 4x4 meter blocks contained in this parcel owned by a group or agent other than your own</summary>
+        <member name="F:OpenMetaverse.LoginParams.Timeout">
+            <summary>The number of milliseconds to wait before a login is considered
+            failed due to timeout</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.PublicCount">
-            <summary>Deprecated, Value appears to always be 0</summary>
+        <member name="F:OpenMetaverse.LoginParams.MethodName">
+            <summary>The request method</summary>
+            <remarks>login_to_simulator is currently the only supported method</remarks>
         </member>
-        <member name="F:OpenMetaverse.Parcel.LocalID">
-            <summary>Simulator-local ID of this parcel</summary>
+        <member name="F:OpenMetaverse.LoginParams.FirstName">
+            <summary>The Agents First name</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.OwnerID">
-            <summary>UUID of the owner of this parcel</summary>
+        <member name="F:OpenMetaverse.LoginParams.LastName">
+            <summary>The Agents Last name</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.IsGroupOwned">
-            <summary>Whether the land is deeded to a group or not</summary>
+        <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.Parcel.AuctionID">
-            <summary></summary>
+        <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.Parcel.ClaimDate">
-            <summary>Date land was claimed</summary>
+        <member name="F:OpenMetaverse.LoginParams.Channel">
+            <summary>A string containing the client software channel information</summary>
+            <example>Second Life Release</example>
         </member>
-        <member name="F:OpenMetaverse.Parcel.ClaimPrice">
-            <summary>Appears to always be zero</summary>
+        <member name="F:OpenMetaverse.LoginParams.Version">
+            <summary>The client software version information</summary>
+            <remarks>The official viewer uses: Second Life Release n.n.n.n 
+            where n is replaced with the current version of the viewer</remarks>
         </member>
-        <member name="F:OpenMetaverse.Parcel.RentPrice">
-            <summary>This field is no longer used</summary>
+        <member name="F:OpenMetaverse.LoginParams.Platform">
+            <summary>A string containing the platform information the agent is running on</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.AABBMin">
-            <summary>Minimum corner of the axis-aligned bounding box for this
-            parcel</summary>
+        <member name="F:OpenMetaverse.LoginParams.MAC">
+            <summary>A string hash of the network cards Mac Address</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.AABBMax">
-            <summary>Maximum corner of the axis-aligned bounding box for this
-            parcel</summary>
+        <member name="F:OpenMetaverse.LoginParams.ViewerDigest">
+            <summary>Unknown or deprecated</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Bitmap">
-            <summary>Bitmap describing land layout in 4x4m squares across the 
-            entire region</summary>
+        <member name="F:OpenMetaverse.LoginParams.ID0">
+            <summary>A string hash of the first disk drives ID used to identify this clients uniqueness</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Area">
-            <summary>Total parcel land area</summary>
+        <member name="F:OpenMetaverse.LoginParams.UserAgent">
+            <summary>A string containing the viewers Software, this is not directly sent to the login server but 
+            instead is used to generate the Version string</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Status">
-            <summary></summary>
+        <member name="F:OpenMetaverse.LoginParams.Author">
+            <summary>A string representing the software creator. This is not directly sent to the login server but
+            is used by the library to generate the Version information</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.SimWideMaxPrims">
-            <summary>Maximum primitives across the entire simulator owned by the same agent or group that owns this parcel that can be used</summary>
+        <member name="F:OpenMetaverse.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.Parcel.SimWideTotalPrims">
-            <summary>Total primitives across the entire simulator calculated by combining the allowed prim counts for each parcel
-            owned by the agent or group that owns this parcel</summary>
+        <member name="F:OpenMetaverse.LoginParams.ReadCritical">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.MaxPrims">
-            <summary>Maximum number of primitives this parcel supports</summary>
+        <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.Parcel.TotalPrims">
-            <summary>Total number of primitives on this parcel</summary>
+        <member name="F:OpenMetaverse.LoginParams.Options">
+            <summary>An array of string sent to the login server to enable various options</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.OwnerPrims">
-            <summary>For group-owned parcels this indicates the total number of prims deeded to the group,
-            for parcels owned by an individual this inicates the number of prims owned by the individual</summary>
+        <member name="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="F:OpenMetaverse.Parcel.GroupPrims">
-            <summary>Total number of primitives owned by the parcel group on 
-            this parcel, or for parcels owned by an individual with a group set the
-            total number of prims set to that group.</summary>
+        <member name="M:OpenMetaverse.LoginParams.#ctor">
+            <summary>
+            Default constuctor, initializes sane default values
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.OtherPrims">
-            <summary>Total number of prims owned by other avatars that are not set to group, or not the parcel owner</summary>
+        <member 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.Parcel.ParcelPrimBonus">
-            <summary>A bonus multiplier which allows parcel prim counts to go over times this amount, this does not affect
-            the max prims per simulator. e.g: 117 prim parcel limit x 1.5 bonus = 175 allowed</summary>
+        <member name="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.Parcel.OtherCleanTime">
-            <summary>Autoreturn value in minutes for others' objects</summary>
+        <member name="T:OpenMetaverse.LoginResponseData">
+            <summary>
+            The decoded data returned from the login server after a successful login
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Flags">
-            <summary></summary>
+        <member name="F:OpenMetaverse.LoginResponseData.Login">
+            <summary>true, false, indeterminate</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.SalePrice">
-            <summary>Sale price of the parcel, only useful if ForSale is set</summary>
-            <remarks>The SalePrice will remain the same after an ownership
-            transfer (sale), so it can be used to see the purchase price after
-            a sale if the new owner has not changed it</remarks>
+        <member name="F:OpenMetaverse.LoginResponseData.Message">
+            <summary>Login message of the day</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Name">
-            <summary>Parcel Name</summary>
+        <member name="F:OpenMetaverse.LoginResponseData.AgentAccess">
+            <summary>M or PG, also agent_region_access and agent_access_max</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Desc">
-            <summary>Parcel Description</summary>
+        <member name="M:OpenMetaverse.LoginResponseData.Parse(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Parse LLSD Login Reply Data
+            </summary>
+            <param name="reply">An <seealso cref="T:OpenMetaverse.StructuredData.OSDMap"/> 
+            contaning the login response data</param>
+            <remarks>XML-RPC logins do not require this as XML-RPC.NET 
+            automatically populates the struct properly using attributes</remarks>
         </member>
-        <member name="F:OpenMetaverse.Parcel.MusicURL">
-            <summary>URL For Music Stream</summary>
+        <member name="T:OpenMetaverse.NetworkManager">
+            <summary>
+            Login Routines
+            </summary>
+            <summary>
+            NetworkManager is responsible for managing the network layer of 
+            OpenMetaverse. It tracks all the server connections, serializes 
+            outgoing traffic and deserializes incoming traffic, and provides
+            instances of delegates for network-related events.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.GroupID">
-            <summary></summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_LoginProgress">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.PassPrice">
-            <summary>Price for a temporary pass</summary>
+        <member name="M:OpenMetaverse.NetworkManager.OnLoginProgress(OpenMetaverse.LoginProgressEventArgs)">
+            <summary>Raises the LoginProgress Event</summary>
+             <param name="e">A LoginProgressEventArgs object containing
+             the data sent from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.Parcel.PassHours">
-            <summary>How long is pass valid for</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_LoginProgressLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Category">
-            <summary></summary>
+        <member name="F:OpenMetaverse.NetworkManager.LoginSeedCapability">
+            <summary>Seed CAPS URL returned from the login server</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.AuthBuyerID">
-            <summary>Key of authorized buyer</summary>
+        <member name="F:OpenMetaverse.NetworkManager.MaxAgentGroups">
+            <summary>Maximum number of groups an agent can belong to, -1 for unlimited</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.SnapshotID">
-            <summary>Key of parcel snapshot</summary>
+        <member name="F:OpenMetaverse.NetworkManager.AgentAppearanceServiceURL">
+            <summary>Server side baking service URL</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.UserLocation">
-            <summary>The landing point location</summary>
-        </member>
-        <member name="F:OpenMetaverse.Parcel.UserLookAt">
-            <summary>The landing point LookAt</summary>
-        </member>
-        <member name="F:OpenMetaverse.Parcel.Landing">
-            <summary>The type of landing enforced from the <see cref="T:OpenMetaverse.LandingType"/> enum</summary>
-        </member>
-        <member name="F:OpenMetaverse.Parcel.Dwell">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Parcel.RegionDenyAnonymous">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Parcel.RegionPushOverride">
-            <summary></summary>
+        <member 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.Parcel.AccessWhiteList">
-            <summary>Access list of who is whitelisted on this
-            parcel</summary>
+        <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.Parcel.AccessBlackList">
-            <summary>Access list of who is blacklisted on this
-            parcel</summary>
+        <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.Parcel.RegionDenyAgeUnverified">
-            <summary>TRUE of region denies access to age unverified users</summary>
+        <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.Parcel.ObscureMedia">
-            <summary>true to obscure (hide) media url</summary>
+        <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.Parcel.ObscureMusic">
-            <summary>true to obscure (hide) music url</summary>
+        <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.Parcel.Media">
-            <summary>A struct containing media details</summary>
+        <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="M:OpenMetaverse.Parcel.ToString">
+        <member name="M:OpenMetaverse.NetworkManager.LoginReplyXmlRpcHandler(Nwc.XmlRpc.XmlRpcResponse,OpenMetaverse.LoginParams)">
             <summary>
-            Displays a parcel object in string format
+            Handles response from XML-RPC login replies
             </summary>
-            <returns>string containing key=value pairs of a parcel object</returns>
         </member>
-        <member name="M:OpenMetaverse.Parcel.#ctor(System.Int32)">
+        <member name="M:OpenMetaverse.NetworkManager.LoginReplyXmlRpcHandler(OpenMetaverse.LoginResponseData,OpenMetaverse.LoginParams)">
             <summary>
-            Defalt constructor
+            Handles response from XML-RPC login replies with already parsed LoginResponseData
             </summary>
-            <param name="localID">Local ID of this parcel</param>
         </member>
-        <member name="M:OpenMetaverse.Parcel.Update(OpenMetaverse.Simulator,System.Boolean)">
+        <member name="M:OpenMetaverse.NetworkManager.LoginReplyLLSDHandler(OpenMetaverse.Http.CapsClient,OpenMetaverse.StructuredData.OSD,System.Exception)">
             <summary>
-            Update the simulator with any local changes to this Parcel object
+            Handle response from LLSD login replies
             </summary>
-            <param name="simulator">Simulator to send updates to</param>
-            <param name="wantReply">Whether we want the simulator to confirm
-            the update with a reply packet or not</param>
+            <param name="client"></param>
+            <param name="result"></param>
+            <param name="error"></param>
         </member>
-        <member name="M:OpenMetaverse.Parcel.UpdateOtherCleanTime(OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.NetworkManager.GetPlatform">
             <summary>
-            Set Autoreturn time
+            Get current OS
             </summary>
-            <param name="simulator">Simulator to send the update to</param>
+            <returns>Either "Win" or "Linux"</returns>
         </member>
-        <member name="T:OpenMetaverse.ParcelManager">
+        <member name="M:OpenMetaverse.NetworkManager.GetMAC">
             <summary>
-            Parcel (subdivided simulator lots) subsystem
+            Get clients default Mac Address
             </summary>
+            <returns>A string containing the first found Mac Address</returns>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_DwellReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_PacketSent">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnParcelDwellReply(OpenMetaverse.ParcelDwellReplyEventArgs)">
-            <summary>Raises the ParcelDwellReply event</summary>
-            <param name="e">A ParcelDwellReplyEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="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.ParcelManager.m_DwellReplyLock">
+        <member name="F:OpenMetaverse.NetworkManager.m_PacketSentLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelInfo">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_LoggedOut">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnParcelInfoReply(OpenMetaverse.ParcelInfoReplyEventArgs)">
-            <summary>Raises the ParcelInfoReply event</summary>
-            <param name="e">A ParcelInfoReplyEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="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.ParcelManager.m_ParcelInfoLock">
+        <member name="F:OpenMetaverse.NetworkManager.m_LoggedOutLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelProperties">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimConnecting">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnParcelProperties(OpenMetaverse.ParcelPropertiesEventArgs)">
-            <summary>Raises the ParcelProperties event</summary>
-            <param name="e">A ParcelPropertiesEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="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.ParcelManager.m_ParcelPropertiesLock">
+        <member name="F:OpenMetaverse.NetworkManager.m_SimConnectingLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelACL">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimConnected">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnParcelAccessListReply(OpenMetaverse.ParcelAccessListReplyEventArgs)">
-            <summary>Raises the ParcelAccessListReply event</summary>
-            <param name="e">A ParcelAccessListReplyEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="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.ParcelManager.m_ParcelACLLock">
+        <member name="F:OpenMetaverse.NetworkManager.m_SimConnectedLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelObjectOwnersReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimDisconnected">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnParcelObjectOwnersReply(OpenMetaverse.ParcelObjectOwnersReplyEventArgs)">
-            <summary>Raises the ParcelObjectOwnersReply event</summary>
-            <param name="e">A ParcelObjectOwnersReplyEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="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.ParcelManager.m_ParcelObjectOwnersLock">
+        <member name="F:OpenMetaverse.NetworkManager.m_SimDisconnectedLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_SimParcelsDownloaded">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_Disconnected">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnSimParcelsDownloaded(OpenMetaverse.SimParcelsDownloadedEventArgs)">
-            <summary>Raises the SimParcelsDownloaded event</summary>
-            <param name="e">A SimParcelsDownloadedEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="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.ParcelManager.m_SimParcelsDownloadedLock">
+        <member name="F:OpenMetaverse.NetworkManager.m_DisconnectedLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ForceSelectObjects">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimChanged">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnForceSelectObjectsReply(OpenMetaverse.ForceSelectObjectsReplyEventArgs)">
-            <summary>Raises the ForceSelectObjectsReply event</summary>
-            <param name="e">A ForceSelectObjectsReplyEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="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.ParcelManager.m_ForceSelectObjectsLock">
+        <member name="F:OpenMetaverse.NetworkManager.m_SimChangedLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaUpdateReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_EventQueueRunning">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnParcelMediaUpdateReply(OpenMetaverse.ParcelMediaUpdateReplyEventArgs)">
-            <summary>Raises the ParcelMediaUpdateReply event</summary>
-            <param name="e">A ParcelMediaUpdateReplyEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="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.ParcelManager.m_ParcelMediaUpdateReplyLock">
+        <member name="F:OpenMetaverse.NetworkManager.m_EventQueueRunningLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaCommand">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.NetworkManager.Simulators">
+            <summary>All of the simulators we are currently connected to</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnParcelMediaCommand(OpenMetaverse.ParcelMediaCommandEventArgs)">
-            <summary>Raises the ParcelMediaCommand event</summary>
-            <param name="e">A ParcelMediaCommandEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.NetworkManager.CapsEvents">
+            <summary>Handlers for incoming capability events</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaCommandLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.NetworkManager.PacketEvents">
+            <summary>Handlers for incoming packets</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.#ctor(OpenMetaverse.GridClient)">
+        <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">A reference to the GridClient object</param>
+            <param name="client">Reference to the GridClient object</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestParcelInfo(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.NetworkManager.RegisterCallback(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs})">
             <summary>
-            Request basic information for a single parcel
-            </summary>
-            <param name="parcelID">Simulator-local ID of the parcel</param>
-        </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestParcelProperties(OpenMetaverse.Simulator,System.Int32,System.Int32)">
-            <summary>
-            Request properties of a single parcel
+            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="simulator">Simulator containing the parcel</param>
-            <param name="localID">Simulator-local ID of the parcel</param>
-            <param name="sequenceID">An arbitrary integer that will be returned
-            with the ParcelProperties reply, useful for distinguishing between
-            multiple simultaneous requests</param>
+            <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="M:OpenMetaverse.ParcelManager.RequestParcelAccessList(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.AccessList,System.Int32)">
+        <member name="M:OpenMetaverse.NetworkManager.RegisterCallback(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs},System.Boolean)">
             <summary>
-            Request the access list for a single parcel
+            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="simulator">Simulator containing the parcel</param>
-            <param name="localID">Simulator-local ID of the parcel</param>
-            <param name="sequenceID">An arbitrary integer that will be returned
-            with the ParcelAccessList reply, useful for distinguishing between
-            multiple simultaneous requests</param>
-            <param name="flags"></param>
+            <param name="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="M:OpenMetaverse.ParcelManager.RequestParcelProperties(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single,System.Int32,System.Boolean)">
+        <member name="M:OpenMetaverse.NetworkManager.UnregisterCallback(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs})">
             <summary>
-            Request properties of parcels using a bounding box selection
+            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="simulator">Simulator containing the parcel</param>
-            <param name="north">Northern boundary of the parcel selection</param>
-            <param name="east">Eastern boundary of the parcel selection</param>
-            <param name="south">Southern boundary of the parcel selection</param>
-            <param name="west">Western boundary of the parcel selection</param>
-            <param name="sequenceID">An arbitrary integer that will be returned
-            with the ParcelProperties reply, useful for distinguishing between
-            different types of parcel property requests</param>
-            <param name="snapSelection">A boolean that is returned with the
-            ParcelProperties reply, useful for snapping focus to a single
-            parcel</param>
+            <param name="type">Packet type this callback is registered with</param>
+            <param name="callback">Callback to stop firing events for</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestAllSimParcels(OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.NetworkManager.RegisterEventCallback(System.String,OpenMetaverse.Caps.EventQueueCallback)">
             <summary>
-            Request all simulator parcel properties (used for populating the <code>Simulator.Parcels</code> 
-            dictionary)
+            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="simulator">Simulator to request parcels from (must be connected)</param>
+            <param name="capsEvent">Name of the CAPS event to register a handler for</param>
+            <param name="callback">Callback to fire when a CAPS event is received</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestAllSimParcels(OpenMetaverse.Simulator,System.Boolean,System.Int32)">
+        <member name="M:OpenMetaverse.NetworkManager.UnregisterEventCallback(System.String,OpenMetaverse.Caps.EventQueueCallback)">
             <summary>
-            Request all simulator parcel properties (used for populating the <code>Simulator.Parcels</code> 
-            dictionary)
+            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="simulator">Simulator to request parcels from (must be connected)</param>
-            <param name="refresh">If TRUE, will force a full refresh</param>
-            <param name="msDelay">Number of milliseconds to pause in between each request</param>
+            <param name="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="M:OpenMetaverse.ParcelManager.RequestDwell(OpenMetaverse.Simulator,System.Int32)">
+        <member name="M:OpenMetaverse.NetworkManager.SendPacket(OpenMetaverse.Packets.Packet)">
             <summary>
-            Request the dwell value for a parcel
+            Send a packet to the simulator the avatar is currently occupying
             </summary>
-            <param name="simulator">Simulator containing the parcel</param>
-            <param name="localID">Simulator-local ID of the parcel</param>
+            <param name="packet">Packet to send</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.Buy(OpenMetaverse.Simulator,System.Int32,System.Boolean,OpenMetaverse.UUID,System.Boolean,System.Int32,System.Int32)">
+        <member name="M:OpenMetaverse.NetworkManager.SendPacket(OpenMetaverse.Packets.Packet,OpenMetaverse.Simulator)">
             <summary>
-            Send a request to Purchase a parcel of land
+            Send a packet to a specified simulator
             </summary>
-            <param name="simulator">The Simulator the parcel is located in</param>
-            <param name="localID">The parcels region specific local ID</param>
-            <param name="forGroup">true if this parcel is being purchased by a group</param>
-            <param name="groupID">The groups <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="removeContribution">true to remove tier contribution if purchase is successful</param>
-            <param name="parcelArea">The parcels size</param>
-            <param name="parcelPrice">The purchase price of the parcel</param>
-            <returns></returns>
+            <param name="packet">Packet to send</param>
+            <param name="simulator">Simulator to send the packet to</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.Reclaim(OpenMetaverse.Simulator,System.Int32)">
+        <member name="M:OpenMetaverse.NetworkManager.Connect(System.Net.IPAddress,System.UInt16,System.UInt64,System.Boolean,System.String)">
             <summary>
-            Reclaim a parcel of land
+            Connect to a simulator
             </summary>
-            <param name="simulator">The simulator the parcel is in</param>
-            <param name="localID">The parcels region specific local ID</param>
+            <param name="ip">IP address to connect to</param>
+            <param name="port">Port to connect to</param>
+            <param name="handle">Handle for this simulator, to identify its
+            location in the grid</param>
+            <param name="setDefault">Whether to set CurrentSim to this new
+            connection, use this if the avatar is moving in to this simulator</param>
+            <param name="seedcaps">URL of the capabilities server to use for
+            this sim connection</param>
+            <returns>A Simulator object on success, otherwise null</returns>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.DeedToGroup(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.NetworkManager.Connect(System.Net.IPEndPoint,System.UInt64,System.Boolean,System.String)">
             <summary>
-            Deed a parcel to a group
+            Connect to a simulator
             </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="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="M:OpenMetaverse.ParcelManager.RequestObjectOwners(OpenMetaverse.Simulator,System.Int32)">
+        <member name="M:OpenMetaverse.NetworkManager.Logout">
             <summary>
-            Request prim owners of a parcel of land.
+            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>
-            <param name="simulator">Simulator parcel is in</param>
-            <param name="localID">The parcels region specific local ID</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.ReturnObjects(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.ObjectReturnType,System.Collections.Generic.List{OpenMetaverse.UUID})">
+        <member name="M:OpenMetaverse.NetworkManager.RequestLogout">
             <summary>
-            Return objects from a parcel
+            Initiate the logout process. Check if logout succeeded with the
+            <code>OnLogoutReply</code> event, and if this does not fire the
+            <code>Shutdown()</code> function needs to be manually called
             </summary>
-            <param name="simulator">Simulator parcel is in</param>
-            <param name="localID">The parcels region specific local ID</param>
-            <param name="type">the type of objects to return, <seealso cref="T:OpenMetaverse.ObjectReturnType"/></param>
-            <param name="ownerIDs">A list containing object owners <seealso cref="T:OpenMetaverse.UUID"/>s to return</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelSubdivide(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.NetworkManager.DisconnectSim(OpenMetaverse.Simulator,System.Boolean)">
             <summary>
-            Subdivide (split) a parcel
+            Close a connection to the given simulator
             </summary>
             <param name="simulator"></param>
-            <param name="west"></param>
-            <param name="south"></param>
-            <param name="east"></param>
-            <param name="north"></param>
+            <param name="sendCloseCircuit"></param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelJoin(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.NetworkManager.Shutdown(OpenMetaverse.NetworkManager.DisconnectType)">
             <summary>
-            Join two parcels of land creating a single parcel
+            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="simulator"></param>
-            <param name="west"></param>
-            <param name="south"></param>
-            <param name="east"></param>
-            <param name="north"></param>
+            <param name="type">Type of shutdown</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.GetParcelLocalID(OpenMetaverse.Simulator,OpenMetaverse.Vector3)">
+        <member name="M:OpenMetaverse.NetworkManager.Shutdown(OpenMetaverse.NetworkManager.DisconnectType,System.String)">
             <summary>
-            Get a parcels LocalID
+            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="simulator">Simulator parcel is in</param>
-            <param name="position">Vector3 position in simulator (Z not used)</param>
-            <returns>0 on failure, or parcel LocalID on success.</returns>
-            <remarks>A call to <code>Parcels.RequestAllSimParcels</code> is required to populate map and
-            dictionary.</remarks>
+            <param name="type">Type of shutdown</param>
+            <param name="message">Shutdown message</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize)">
+        <member name="M:OpenMetaverse.NetworkManager.FindSimulator(System.Net.IPEndPoint)">
             <summary>
-            Terraform (raise, lower, etc) an area or whole parcel of land
+            Searches through the list of currently connected simulators to find
+            one attached to the given IPEndPoint
             </summary>
-            <param name="simulator">Simulator land area is in.</param>
-            <param name="localID">LocalID of parcel, or -1 if using bounding box</param>
-            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
-            <param name="brushSize">Size of area to modify</param>
-            <returns>true on successful request sent.</returns>
-            <remarks>Settings.STORE_LAND_PATCHES must be true, 
-            Parcel information must be downloaded using <code>RequestAllSimParcels()</code></remarks>
+            <param name="endPoint">IPEndPoint of the Simulator to search for</param>
+            <returns>A Simulator reference on success, otherwise null</returns>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize)">
+        <member name="M:OpenMetaverse.NetworkManager.RaiseConnectedEvent(OpenMetaverse.Simulator)">
             <summary>
-            Terraform (raise, lower, etc) an area or whole parcel of land
+            Fire an event when an event queue connects for capabilities
             </summary>
-            <param name="simulator">Simulator land area is in.</param>
-            <param name="west">west border of area to modify</param>
-            <param name="south">south border of area to modify</param>
-            <param name="east">east border of area to modify</param>
-            <param name="north">north border of area to modify</param>
-            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
-            <param name="brushSize">Size of area to modify</param>
-            <returns>true on successful request sent.</returns>
-            <remarks>Settings.STORE_LAND_PATCHES must be true, 
-            Parcel information must be downloaded using <code>RequestAllSimParcels()</code></remarks>
+            <param name="simulator">Simulator the event queue is attached to</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Int32,System.Single,System.Single,System.Single,System.Single,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize,System.Int32)">
-            <summary>
-            Terraform (raise, lower, etc) an area or whole parcel of land
-            </summary>
-            <param name="simulator">Simulator land area is in.</param>
-            <param name="localID">LocalID of parcel, or -1 if using bounding box</param>
-            <param name="west">west border of area to modify</param>
-            <param name="south">south border of area to modify</param>
-            <param name="east">east border of area to modify</param>
-            <param name="north">north border of area to modify</param>
-            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
-            <param name="brushSize">Size of area to modify</param>
-            <param name="seconds">How many meters + or - to lower, 1 = 1 meter</param>
-            <returns>true on successful request sent.</returns>
-            <remarks>Settings.STORE_LAND_PATCHES must be true, 
-            Parcel information must be downloaded using <code>RequestAllSimParcels()</code></remarks>
+        <member 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.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Int32,System.Single,System.Single,System.Single,System.Single,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize,System.Int32,System.Single)">
-            <summary>
-            Terraform (raise, lower, etc) an area or whole parcel of land
-            </summary>
-            <param name="simulator">Simulator land area is in.</param>
-            <param name="localID">LocalID of parcel, or -1 if using bounding box</param>
-            <param name="west">west border of area to modify</param>
-            <param name="south">south border of area to modify</param>
-            <param name="east">east border of area to modify</param>
-            <param name="north">north border of area to modify</param>
-            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
-            <param name="brushSize">Size of area to modify</param>
-            <param name="seconds">How many meters + or - to lower, 1 = 1 meter</param>
-            <param name="height">Height at which the terraform operation is acting at</param>
+        <member 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.ParcelManager.RequestSelectObjects(System.Int32,OpenMetaverse.ObjectReturnType,OpenMetaverse.UUID)">
-            <summary>
-            Sends a request to the simulator to return a list of objects owned by specific owners
-            </summary>
-            <param name="localID">Simulator local ID of parcel</param>
-            <param name="selectType">Owners, Others, Etc</param>
-            <param name="ownerID">List containing keys of avatars objects to select; 
-            if List is null will return Objects of type <c>selectType</c></param>
-            <remarks>Response data is returned in the event <seealso cref="E:OnParcelSelectedObjects"/></remarks>
-        </member>
-        <member name="M:OpenMetaverse.ParcelManager.EjectUser(OpenMetaverse.UUID,System.Boolean)">
-            <summary>
-            Eject and optionally ban a user from a parcel
-            </summary>
-            <param name="targetID">target key of avatar to eject</param>
-            <param name="ban">true to also ban target</param>
-        </member>
-        <member name="M:OpenMetaverse.ParcelManager.FreezeUser(OpenMetaverse.UUID,System.Boolean)">
-            <summary>
-            Freeze or unfreeze an avatar over your land
-            </summary>
-            <param name="targetID">target key to freeze</param>
-            <param name="freeze">true to freeze, false to unfreeze</param>
-        </member>
-        <member name="M:OpenMetaverse.ParcelManager.ReleaseParcel(OpenMetaverse.Simulator,System.Int32)">
-            <summary>
-            Abandon a parcel of land
-            </summary>
-            <param name="simulator">Simulator parcel is in</param>
-            <param name="localID">Simulator local ID of parcel</param>
-        </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestRemoteParcelID(OpenMetaverse.Vector3,System.UInt64,OpenMetaverse.UUID)">
-            <summary>
-            Requests the UUID of the parcel in a remote region at a specified location
-            </summary>
-            <param name="location">Location of the parcel in the remote region</param>
-            <param name="regionHandle">Remote region handle</param>
-            <param name="regionID">Remote region UUID</param>
-            <returns>If successful UUID of the remote parcel, UUID.Zero otherwise</returns>
-        </member>
-        <member name="M:OpenMetaverse.ParcelManager.GetParcelResouces(OpenMetaverse.UUID,System.Boolean,OpenMetaverse.ParcelManager.LandResourcesCallback)">
-            <summary>
-            Retrieves information on resources used by the parcel
-            </summary>
-            <param name="parcelID">UUID of the parcel</param>
-            <param name="getDetails">Should per object resource usage be requested</param>
-            <param name="callback">Callback invoked when the request is complete</param>
-        </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelDwellReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelDwellReply"/> event</remarks>
-        </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelInfoReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelInfoReply"/> event</remarks>
-        </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelAccessListReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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>
-            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelAccessListReply"/> event</remarks>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.SelectParcelObjectsReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.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>
-            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ForceSelectObjectsReply"/> event</remarks>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelMediaUpdateHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.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>
-            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelMediaUpdateReply"/> event</remarks>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelOverlayHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.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.ParcelManager.ParcelMediaCommandMessagePacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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>
-            <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 name="E:OpenMetaverse.NetworkManager.LoginProgress">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="E:OpenMetaverse.ParcelManager.ParcelInfoReply">
-            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.ParcelManager.RequestParcelInfo(OpenMetaverse.UUID)"/> request</summary>
+        <member name="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.ParcelManager.ParcelProperties">
-            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.ParcelManager.RequestParcelProperties(OpenMetaverse.Simulator,System.Int32,System.Int32)"/> request</summary>
+        <member name="P:OpenMetaverse.NetworkManager.LoginStatusCode">
+            <summary>Current state of logging in</summary>
         </member>
-        <member name="E:OpenMetaverse.ParcelManager.ParcelAccessListReply">
-            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.ParcelManager.RequestParcelAccessList(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.AccessList,System.Int32)"/> request</summary>
+        <member name="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="E:OpenMetaverse.ParcelManager.ParcelObjectOwnersReply">
-            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.ParcelManager.RequestObjectOwners(OpenMetaverse.Simulator,System.Int32)"/> request</summary>
+        <member name="P:OpenMetaverse.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="E:OpenMetaverse.ParcelManager.SimParcelsDownloaded">
-            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.ParcelManager.RequestAllSimParcels(OpenMetaverse.Simulator)"/> request</summary>
+        <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.ParcelManager.ForceSelectObjectsReply">
-            <summary>Raised when the simulator responds to a <see cref="!:RequestForceSelectObjects"/> request</summary>
+        <member name="E:OpenMetaverse.NetworkManager.PacketSent">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="E:OpenMetaverse.ParcelManager.ParcelMediaUpdateReply">
-            <summary>Raised when the simulator responds to a Parcel Update request</summary>
+        <member name="E:OpenMetaverse.NetworkManager.LoggedOut">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="E:OpenMetaverse.ParcelManager.ParcelMediaCommand">
-            <summary>Raised when the parcel your agent is located sends a ParcelMediaCommand</summary>
+        <member name="E:OpenMetaverse.NetworkManager.SimConnecting">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelManager.ParcelAccessEntry">
-            <summary>
-            Parcel Accesslist
-            </summary>
+        <member name="E:OpenMetaverse.NetworkManager.SimConnected">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelAccessEntry.AgentID">
-            <summary>Agents <seealso cref="T:OpenMetaverse.UUID"/></summary>
+        <member name="E:OpenMetaverse.NetworkManager.SimDisconnected">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelAccessEntry.Time">
-            <summary></summary>
+        <member name="E:OpenMetaverse.NetworkManager.Disconnected">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelAccessEntry.Flags">
-            <summary>Flags for specific entry in white/black lists</summary>
+        <member name="E:OpenMetaverse.NetworkManager.SimChanged">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelManager.ParcelPrimOwners">
-            <summary>
-            Owners of primitives on parcel
-            </summary>
+        <member name="E:OpenMetaverse.NetworkManager.EventQueueRunning">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.OwnerID">
-            <summary>Prim Owners <seealso cref="T:OpenMetaverse.UUID"/></summary>
+        <member name="P:OpenMetaverse.NetworkManager.CircuitCode">
+            <summary>Unique identifier associated with our connections to
+            simulators</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.IsGroupOwned">
-            <summary>True of owner is group</summary>
+        <member name="P:OpenMetaverse.NetworkManager.CurrentSim">
+            <summary>The simulator that the logged in avatar is currently 
+            occupying</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.Count">
-            <summary>Total count of prims owned by OwnerID</summary>
+        <member name="P:OpenMetaverse.NetworkManager.Connected">
+            <summary>Shows whether the network layer is logged in to the
+            grid or not</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.OnlineStatus">
-            <summary>true of OwnerID is currently online and is not a group</summary>
+        <member name="P:OpenMetaverse.NetworkManager.InboxCount">
+            <summary>Number of packets in the incoming queue</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.NewestPrim">
-            <summary>The date of the most recent prim left by OwnerID</summary>
+        <member name="P:OpenMetaverse.NetworkManager.OutboxCount">
+            <summary>Number of packets in the outgoing queue</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelManager.LandResourcesCallback">
+        <member name="T:OpenMetaverse.NetworkManager.LoginResponseCallback">
             <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>
+            <param name="loginSuccess"></param>
+            <param name="redirect"></param>
+            <param name="replyData"></param>
+            <param name="message"></param>
+            <param name="reason"></param>
         </member>
-        <member name="M:OpenMetaverse.ParcelDwellReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Int32,System.Single)">
+        <member name="T:OpenMetaverse.NetworkManager.DisconnectType">
             <summary>
-            Construct a new instance of the ParcelDwellReplyEventArgs class
+            Explains why a simulator or the grid disconnected from us
             </summary>
-            <param name="parcelID">The global ID of the parcel</param>
-            <param name="localID">The simulator specific ID of the parcel</param>
-            <param name="dwell">The calculated dwell for the parcel</param>
         </member>
-        <member name="P:OpenMetaverse.ParcelDwellReplyEventArgs.ParcelID">
-            <summary>Get the global ID of the parcel</summary>
+        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.ClientInitiated">
+            <summary>The client requested the logout or simulator disconnect</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelDwellReplyEventArgs.LocalID">
-            <summary>Get the simulator specific ID of the parcel</summary>
+        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.ServerInitiated">
+            <summary>The server notified us that it is disconnecting</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelDwellReplyEventArgs.Dwell">
-            <summary>Get the calculated dwell</summary>
+        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.NetworkTimeout">
+            <summary>Either a socket was closed or network traffic timed out</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelInfoReplyEventArgs">
-            <summary>Contains basic parcel information data returned from the 
-            simulator in response to an <see cref="!:RequestParcelInfo"/> request</summary>
+        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.SimShutdown">
+            <summary>The last active simulator shut down</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelInfoReplyEventArgs.#ctor(OpenMetaverse.ParcelInfo)">
+        <member name="T:OpenMetaverse.NetworkManager.IncomingPacket">
             <summary>
-            Construct a new instance of the ParcelInfoReplyEventArgs class
+            Holds a simulator reference and a decoded packet, these structs are put in
+            the packet inbox for event handling
             </summary>
-            <param name="parcel">The <see cref="T:OpenMetaverse.ParcelInfo"/> object containing basic parcel info</param>
         </member>
-        <member name="P:OpenMetaverse.ParcelInfoReplyEventArgs.Parcel">
-            <summary>Get the <see cref="T:OpenMetaverse.ParcelInfo"/> object containing basic parcel info</summary>
+        <member name="F:OpenMetaverse.NetworkManager.IncomingPacket.Simulator">
+            <summary>Reference to the simulator that this packet came from</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>
+        <member name="F:OpenMetaverse.NetworkManager.IncomingPacket.Packet">
+            <summary>Packet that needs to be processed</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelPropertiesEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Parcel,OpenMetaverse.ParcelResult,System.Int32,System.Int32,System.Boolean)">
+        <member name="T:OpenMetaverse.NetworkManager.OutgoingPacket">
             <summary>
-            Construct a new instance of the ParcelPropertiesEventArgs class
+            Holds a simulator reference and a serialized packet, these structs are put in
+            the packet outbox for sending
             </summary>
-            <param name="simulator">The <see cref="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel"/> object containing the details</param>
-            <param name="parcel">The <see cref="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel"/> object containing the details</param>
-            <param name="result">The result of the request</param>
-            <param name="selectedPrims">The number of primitieves your agent is 
-            currently selecting and or sitting on in this parcel</param>
-            <param name="sequenceID">The user assigned ID used to correlate a request with
-            these results</param>
-            <param name="snapSelection">TODO:</param>
         </member>
-        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.Simulator">
-            <summary>Get the simulator the parcel is located in</summary>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Simulator">
+            <summary>Reference to the simulator this packet is destined for</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel">
-            <summary>Get the <see cref="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel"/> object containing the details</summary>
-            <remarks>If Result is NoData, this object will not contain valid data</remarks>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Buffer">
+            <summary>Packet that needs to be sent</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.Result">
-            <summary>Get the result of the request</summary>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.SequenceNumber">
+            <summary>Sequence number of the wrapped packet</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.SelectedPrims">
-            <summary>Get the number of primitieves your agent is 
-            currently selecting and or sitting on in this parcel</summary>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.ResendCount">
+            <summary>Number of times this packet has been resent</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.SequenceID">
-            <summary>Get the user assigned ID used to correlate a request with
-            these results</summary>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.TickCount">
+            <summary>Environment.TickCount when this packet was last sent over the wire</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.SnapSelection">
-            <summary>TODO:</summary>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Type">
+            <summary>Type of the packet</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelAccessListReplyEventArgs">
-            <summary>Contains blacklist and whitelist data returned from the simulator in response to an <see cref="!:RequestParcelAccesslist"/> request</summary>
-        </member>
-        <member name="M:OpenMetaverse.ParcelAccessListReplyEventArgs.#ctor(OpenMetaverse.Simulator,System.Int32,System.Int32,System.UInt32,System.Collections.Generic.List{OpenMetaverse.ParcelManager.ParcelAccessEntry})">
+        <member name="M:OpenMetaverse.Messages.MessageUtils.DecodeEvent(System.String,OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Construct a new instance of the ParcelAccessListReplyEventArgs class
+            Return a decoded capabilities message as a strongly typed object
             </summary>
-            <param name="simulator">The simulator the parcel is located in</param>
-            <param name="sequenceID">The user assigned ID used to correlate a request with
-            these results</param>
-            <param name="localID">The simulator specific ID of the parcel</param>
-            <param name="flags">TODO:</param>
-            <param name="accessEntries">The list containing the white/blacklisted agents for the parcel</param>
-        </member>
-        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.Simulator">
-            <summary>Get the simulator the parcel is located in</summary>
-        </member>
-        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.SequenceID">
-            <summary>Get the user assigned ID used to correlate a request with
-            these results</summary>
-        </member>
-        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.LocalID">
-            <summary>Get the simulator specific ID of the parcel</summary>
-        </member>
-        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.Flags">
-            <summary>TODO:</summary>
-        </member>
-        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.AccessList">
-            <summary>Get the list containing the white/blacklisted agents for the parcel</summary>
-        </member>
-        <member name="T:OpenMetaverse.ParcelObjectOwnersReplyEventArgs">
-            <summary>Contains blacklist and whitelist data returned from the 
-            simulator in response to an <see cref="!:RequestParcelAccesslist"/> request</summary>
+            <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.ParcelObjectOwnersReplyEventArgs.#ctor(OpenMetaverse.Simulator,System.Collections.Generic.List{OpenMetaverse.ParcelManager.ParcelPrimOwners})">
+        <member name="T:OpenMetaverse.Imaging.LoadTGAClass">
             <summary>
-            Construct a new instance of the ParcelObjectOwnersReplyEventArgs class
+            Capability to load TGAs to Bitmap 
             </summary>
-            <param name="simulator">The simulator the parcel is located in</param>
-            <param name="primOwners">The list containing prim ownership counts</param>
         </member>
-        <member name="P:OpenMetaverse.ParcelObjectOwnersReplyEventArgs.Simulator">
-            <summary>Get the simulator the parcel is located in</summary>
+        <member name="T:OpenMetaverse.Settings">
+            <summary>
+            Class for controlling various system settings.
+            </summary>
+            <remarks>Some values are readonly because they affect things that
+            happen when the GridClient object is initialized, so changing them at 
+            runtime won't do any good. Non-readonly values may affect things that 
+            happen at login or dynamically</remarks>
         </member>
-        <member name="P:OpenMetaverse.ParcelObjectOwnersReplyEventArgs.PrimOwners">
-            <summary>Get the list containing prim ownership counts</summary>
+        <member name="F:OpenMetaverse.Settings.AGNI_LOGIN_SERVER">
+            <summary>Main grid login server</summary>
         </member>
-        <member name="T:OpenMetaverse.SimParcelsDownloadedEventArgs">
-            <summary>Contains the data returned when all parcel data has been retrieved from a simulator</summary>
+        <member name="F:OpenMetaverse.Settings.ADITI_LOGIN_SERVER">
+            <summary>Beta grid login server</summary>
         </member>
-        <member name="M:OpenMetaverse.SimParcelsDownloadedEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.InternalDictionary{System.Int32,OpenMetaverse.Parcel},System.Int32[0:,0:])">
+        <member name="F:OpenMetaverse.Settings.ENABLE_INVENTORY_STORE">
             <summary>
-            Construct a new instance of the SimParcelsDownloadedEventArgs class
+            InventoryManager requests inventory information on login,
+            GridClient initializes an Inventory store for main inventory.
             </summary>
-            <param name="simulator">The simulator the parcel data was retrieved from</param>
-            <param name="simParcels">The dictionary containing the parcel data</param>
-            <param name="parcelMap">The multidimensional array containing a x,y grid mapped
-            to each 64x64 parcel's LocalID.</param>
-        </member>
-        <member name="P:OpenMetaverse.SimParcelsDownloadedEventArgs.Simulator">
-            <summary>Get the simulator the parcel data was retrieved from</summary>
         </member>
-        <member name="P:OpenMetaverse.SimParcelsDownloadedEventArgs.Parcels">
-            <summary>A dictionary containing the parcel data where the key correlates to the ParcelMap entry</summary>
+        <member name="F:OpenMetaverse.Settings.ENABLE_LIBRARY_STORE">
+            <summary>
+            InventoryManager requests library information on login,
+            GridClient initializes an Inventory store for the library.
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.SimParcelsDownloadedEventArgs.ParcelMap">
-            <summary>Get the multidimensional array containing a x,y grid mapped
-            to each 64x64 parcel's LocalID.</summary>
+        <member name="F:OpenMetaverse.Settings.PING_INTERVAL">
+            <summary>Number of milliseconds between sending pings to each sim</summary>
         </member>
-        <member name="T:OpenMetaverse.ForceSelectObjectsReplyEventArgs">
-            <summary>Contains the data returned when a <see cref="!:RequestForceSelectObjects"/> request</summary>
+        <member name="F:OpenMetaverse.Settings.DEFAULT_AGENT_UPDATE_INTERVAL">
+            <summary>Number of milliseconds between sending camera updates</summary>
         </member>
-        <member name="M:OpenMetaverse.ForceSelectObjectsReplyEventArgs.#ctor(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},System.Boolean)">
-            <summary>
-            Construct a new instance of the ForceSelectObjectsReplyEventArgs class
-            </summary>
-            <param name="simulator">The simulator the parcel data was retrieved from</param>
-            <param name="objectIDs">The list of primitive IDs</param>
-            <param name="resetList">true if the list is clean and contains the information
-            only for a given request</param>
+        <member name="F:OpenMetaverse.Settings.INTERPOLATION_INTERVAL">
+            <summary>Number of milliseconds between updating the current
+            positions of moving, non-accelerating and non-colliding objects</summary>
         </member>
-        <member name="P:OpenMetaverse.ForceSelectObjectsReplyEventArgs.Simulator">
-            <summary>Get the simulator the parcel data was retrieved from</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="P:OpenMetaverse.ForceSelectObjectsReplyEventArgs.ObjectIDs">
-            <summary>Get the list of primitive IDs</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="P:OpenMetaverse.ForceSelectObjectsReplyEventArgs.ResetList">
-            <summary>true if the list is clean and contains the information
-            only for a given request</summary>
+        <member name="F:OpenMetaverse.Settings.MAX_PACKET_SIZE">
+            <summary>Maximum size of packet that we want to send over the wire</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelMediaUpdateReplyEventArgs">
-            <summary>Contains data when the media data for a parcel the avatar is on changes</summary>
+        <member name="F:OpenMetaverse.Settings.MAX_SEQUENCE">
+            <summary>The maximum value of a packet sequence number before it
+            rolls over back to one</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelMediaUpdateReplyEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.ParcelMedia)">
-            <summary>
-            Construct a new instance of the ParcelMediaUpdateReplyEventArgs class
-            </summary>
-            <param name="simulator">the simulator the parcel media data was updated in</param>
-            <param name="media">The updated media information</param>
+        <member name="F:OpenMetaverse.Settings.RESOURCE_DIR">
+            <summary>The relative directory where external resources are kept</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelMediaUpdateReplyEventArgs.Simulator">
-            <summary>Get the simulator the parcel media data was updated in</summary>
+        <member name="F:OpenMetaverse.Settings.LOGIN_SERVER">
+            <summary>Login server to connect to</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelMediaUpdateReplyEventArgs.Media">
-            <summary>Get the updated media information</summary>
+        <member name="F:OpenMetaverse.Settings.BIND_ADDR">
+            <summary>IP Address the client will bind to</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelMediaCommandEventArgs">
-            <summary>Contains the media command for a parcel the agent is currently on</summary>
+        <member name="F:OpenMetaverse.Settings.USE_LLSD_LOGIN">
+            <summary>Use XML-RPC Login or LLSD Login, default is XML-RPC Login</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelMediaCommandEventArgs.#ctor(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.ParcelFlags,OpenMetaverse.ParcelMediaCommand,System.Single)">
+        <member name="F:OpenMetaverse.Settings.HTTP_INVENTORY">
             <summary>
-            Construct a new instance of the ParcelMediaCommandEventArgs class
+            Use Caps for fetching inventory where available
             </summary>
-            <param name="simulator">The simulator the parcel media command was issued in</param>
-            <param name="sequence"></param>
-            <param name="flags"></param>
-            <param name="command">The media command that was sent</param>
-            <param name="time"></param>
         </member>
-        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.Simulator">
-            <summary>Get the simulator the parcel media command was issued in</summary>
+        <member name="F:OpenMetaverse.Settings.TRANSFER_TIMEOUT">
+            <summary>Number of milliseconds before an asset transfer will time
+            out</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.Sequence">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Settings.TELEPORT_TIMEOUT">
+            <summary>Number of milliseconds before a teleport attempt will time
+            out</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.ParcelFlags">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Settings.LOGOUT_TIMEOUT">
+            <summary>Number of milliseconds before NetworkManager.Logout() will
+            time out</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.MediaCommand">
-            <summary>Get the media command that was sent</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="P:OpenMetaverse.ParcelMediaCommandEventArgs.Time">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Settings.LOGIN_TIMEOUT">
+            <summary>Number of milliseconds for xml-rpc to timeout</summary>
         </member>
-        <member name="T:OpenMetaverse.DictionaryEventAction">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.Settings.RESEND_TIMEOUT">
+            <summary>Milliseconds before a packet is assumed lost and resent</summary>
         </member>
-        <member name="F:OpenMetaverse.DictionaryEventAction.Add">
-            <summary>
-            
-            </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="F:OpenMetaverse.DictionaryEventAction.Remove">
-            <summary>
-            
-            </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="F:OpenMetaverse.DictionaryEventAction.Change">
-            <summary>
-            
-            </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="T:OpenMetaverse.DictionaryChangeCallback">
-            <summary>
-            
-            </summary>
-            <param name="action"></param>
-            <param name="entry"></param>
+        <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="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 name="F:OpenMetaverse.Settings.STATS_QUEUE_SIZE">
+            <summary>Network stats queue length (seconds)</summary>
         </member>
-        <member name="F:OpenMetaverse.ObservableDictionary`2.Delegates">
+        <member name="F:OpenMetaverse.Settings.CACHE_PRIMITIVES">
             <summary>
-            A dictionary of callbacks to fire when specified action occurs
+            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>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.AddDelegate(OpenMetaverse.DictionaryEventAction,OpenMetaverse.DictionaryChangeCallback)">
+        <member name="F:OpenMetaverse.Settings.POOL_PARCEL_DATA">
             <summary>
-            Register a callback to be fired when an action occurs
+            Pool parcel data between clients (saves on requesting multiple times when all clients may need it)
             </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="F:OpenMetaverse.Settings.SIMULATOR_POOL_TIMEOUT">
             <summary>
-            Unregister a callback
+            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="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)">
-            <summary>
-            
-            </summary>
-            <param name="action"></param>
-            <param name="entry"></param>
+        <member name="F:OpenMetaverse.Settings.STORE_LAND_PATCHES">
+            <summary>Enable/disable storing terrain heightmaps in the 
+            TerrainManager</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 name="F:OpenMetaverse.Settings.SEND_AGENT_UPDATES">
+            <summary>Enable/disable sending periodic camera updates</summary>
         </member>
-        <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 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.ObservableDictionary`2.#ctor(System.Int32)">
-            <summary>
-            Initializes a new instance of the <seealso cref="T:OpenMetaverse.ObservableDictionary"/> Class 
+        <member name="F:OpenMetaverse.Settings.SEND_AGENT_THROTTLE">
+            <summary>Enable/disable automatically setting the bandwidth throttle
+            after connecting to each simulator</summary>
+            <remarks>The default throttle uses the equivalent of the maximum
+            bandwidth setting in the official client. If you do not set a
+            throttle your connection will by default be throttled well below
+            the minimum values and you may experience connection problems</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Settings.SEND_PINGS">
+            <summary>Enable/disable the sending of pings to monitor lag and 
+            packet loss</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.MULTIPLE_SIMS">
+            <summary>Should we connect to multiple sims? This will allow
+            viewing in to neighboring simulators and sim crossings
+            (Experimental)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.ALWAYS_DECODE_OBJECTS">
+            <summary>If true, all object update packets will be decoded in to
+            native objects. If false, only updates for our own agent will be
+            decoded. Registering an event handler will force objects for that
+            type to always be decoded. If this is disabled the object tracking
+            will have missing or partial prim and avatar information</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.ALWAYS_REQUEST_OBJECTS">
+            <summary>If true, when a cached object check is received from the
+            server the full object info will automatically be requested</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.ENABLE_CAPS">
+            <summary>Whether to establish connections to HTTP capabilities
+            servers for simulators</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.ENABLE_SIMSTATS">
+            <summary>Whether to decode sim stats</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.LOG_ALL_CAPS_ERRORS">
+            <summary>The capabilities servers are currently designed to
+            periodically return a 502 error which signals for the client to
+            re-establish a connection. Set this to true to log those 502 errors</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.FETCH_MISSING_INVENTORY">
+            <summary>If true, any reference received for a folder or item
+            the library is not aware of will automatically be fetched</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.DISABLE_AGENT_UPDATE_DUPLICATE_CHECK">
+            <summary>If true, and <code>SEND_AGENT_UPDATES</code> is true,
+            AgentUpdate packets will continuously be sent out to give the bot
+            smoother movement and autopiloting</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.AVATAR_TRACKING">
+            <summary>If true, currently visible avatars will be stored
+            in dictionaries inside <code>Simulator.ObjectAvatars</code>.
+            If false, a new Avatar or Primitive object will be created
+            each time an object update packet is received</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.OBJECT_TRACKING">
+            <summary>If true, currently visible avatars will be stored
+            in dictionaries inside <code>Simulator.ObjectPrimitives</code>.
+            If false, a new Avatar or Primitive object will be created
+            each time an object update packet is received</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.USE_INTERPOLATION_TIMER">
+            <summary>If true, position and velocity will periodically be
+            interpolated (extrapolated, technically) for objects and 
+            avatars that are being tracked by the library. This is
+            necessary to increase the accuracy of speed and position
+            estimates for simulated objects</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.TRACK_UTILIZATION">
+            <summary>
+            If true, utilization statistics will be tracked. There is a minor penalty
+            in CPU time for enabling this option.
+            </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>
+        <member name="F:OpenMetaverse.Settings.ALWAYS_REQUEST_PARCEL_ACL">
+            <summary>
+            If true, an incoming parcel properties reply will automatically send
+            a request for the parcel access list
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.ALWAYS_REQUEST_PARCEL_DWELL">
+            <summary>
+            if true, an incoming parcel properties reply will automatically send 
+            a request for the traffic count.
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.USE_ASSET_CACHE">
+            <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">
+            <summary>
+            Download textures using GetTexture capability when available
+            </summary>
+        </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">
+            <summary>
+            The Refresh timer inteval is used to set the delay between checks for stalled texture downloads
+            </summary>
+            <remarks>This is a static variable which applies to all instances</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Settings.PIPELINE_REQUEST_TIMEOUT">
+            <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">
+            <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="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.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>
+        <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>
+            <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)">
+            <summary>
+            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 ObservableDictionary named testDict with a string as the key and an int as the value, 
+            // 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 ObservableDictionary&lt;string, int&gt; testDict = new ObservableDictionary&lt;string, int&gt;(10);
+            public InternalDictionary&lt;string, int&gt; testDict = new InternalDictionary&lt;string, int&gt;(10);
             </code>
             </example>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.TryGetValue(`0,`1@)">
+        <member name="M:OpenMetaverse.InternalDictionary`2.TryGetValue(`0,`1@)">
             <summary>
-            Try to get entry from the <seealso cref="!:ObservableDictionary"/> with specified key 
+            Try to get entry from <seealso cref="T:OpenMetaverse.InternalDictionary"/> with specified key 
             </summary>
             <param name="key">Key to use for lookup</param>
             <param name="value">Value returned</param>
             <returns><see langword="true"/> if specified key exists,  <see langword="false"/> if not found</returns>
             <example>
             <code>
-            // find your avatar using the Simulator.ObjectsAvatars ObservableDictionary:
+            // 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);
@@ -9700,7 +8921,7 @@
             <seealso cref="F:OpenMetaverse.Simulator.ObjectsAvatars"/>
             </example>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.Find(System.Predicate{`1})">
+        <member name="M:OpenMetaverse.InternalDictionary`2.Find(System.Predicate{`1})">
             <summary>
             Finds the specified match.
             </summary>
@@ -9708,7 +8929,7 @@
             <returns>Matched value</returns>
             <example>
             <code>
-            // use a delegate to find a prim in the ObjectsPrimitives ObservableDictionary
+            // use a delegate to find a prim in the ObjectsPrimitives InternalDictionary
             // with the ID 95683496
             uint findID = 95683496;
             Primitive findPrim = sim.ObjectsPrimitives.Find(
@@ -9716,8 +8937,8 @@
             </code>
             </example>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.FindAll(System.Predicate{`1})">
-             <summary>Find All items in an <seealso cref="T:ObservableDictionary"/></summary>
+        <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>
@@ -9733,8 +8954,8 @@
             </code>
             </example>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.FindAll(System.Predicate{`0})">
-             <summary>Find All items in an <seealso cref="T:ObservableDictionary"/></summary>
+        <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>
@@ -9748,6957 +8969,5955 @@
             </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>
+        <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>
+            Perform an <seealso cref="T:System.Action"/> on each KeyValuePair of an <seealso cref="T:OpenMetaverse.InternalDictionary"/>
+            </summary>
+            <param name="action"><seealso cref="T:System.Action"/> to perform</param>
+        </member>
+        <member name="M:OpenMetaverse.InternalDictionary`2.ContainsKey(`0)">
+            <summary>Check if Key exists in Dictionary</summary>
+            <param name="key">Key to check for</param>
+            <returns><see langword="true"/> if found, <see langword="false"/> otherwise</returns>
+        </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>
+            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="M:OpenMetaverse.InternalDictionary`2.Remove(`0)">
             <summary>
             Removes the specified key, dictionary locking is not performed
             </summary>
             <param name="key">The key.</param>
             <returns><see langword="true"/> if successful, <see langword="false"/> otherwise</returns>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.Clear">
+        <member name="P:OpenMetaverse.InternalDictionary`2.Count">
             <summary>
-            Clear the contents of the dictionary
+            Gets the number of Key/Value pairs contained in the <seealso cref="T:InternalDictionary"/>
             </summary>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.GetEnumerator">
+        <member name="P:OpenMetaverse.InternalDictionary`2.Item(`0)">
             <summary>
-            Enumerator for iterating dictionary entries
+            Indexer for the dictionary
             </summary>
-            <returns></returns>
+            <param name="key">The key</param>
+            <returns>The value</returns>
         </member>
-        <member name="P:OpenMetaverse.ObservableDictionary`2.Count">
+        <member name="T:OpenMetaverse.ProfileFlags">
             <summary>
-            Gets the number of Key/Value pairs contained in the <seealso cref="T:ObservableDictionary"/>
+            Avatar profile flags
             </summary>
         </member>
-        <member name="P:OpenMetaverse.ObservableDictionary`2.Item(`0)">
+        <member name="T:OpenMetaverse.Avatar">
             <summary>
-            Indexer for the dictionary
+            Represents an avatar (other than your own)
             </summary>
-            <param name="key">The key</param>
-            <returns>The value</returns>
         </member>
-        <member name="T:OpenMetaverse.GroupMember">
+        <member name="T:OpenMetaverse.Primitive">
             <summary>
-            Avatar group management
+            Particle system specific enumerators, flags and methods.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupMember.ID">
-            <summary>Key of Group Member</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupMember.Contribution">
-            <summary>Total land contribution</summary>
+        <member name="F:OpenMetaverse.Primitive.Textures">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupMember.OnlineStatus">
-            <summary>Online status information</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnim">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupMember.Powers">
-            <summary>Abilities that the Group Member has</summary>
+        <member name="F:OpenMetaverse.Primitive.ID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupMember.Title">
-            <summary>Current group title</summary>
+        <member name="F:OpenMetaverse.Primitive.GroupID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupMember.IsOwner">
-            <summary>Is a group owner</summary>
+        <member name="F:OpenMetaverse.Primitive.LocalID">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.GroupRole">
-            <summary>
-            Role manager for a group
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ParentID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRole.GroupID">
-            <summary>Key of the group</summary>
+        <member name="F:OpenMetaverse.Primitive.RegionHandle">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRole.ID">
-            <summary>Key of Role</summary>
+        <member name="F:OpenMetaverse.Primitive.Flags">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRole.Name">
-            <summary>Name of Role</summary>
+        <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.GroupRole.Title">
-            <summary>Group Title associated with Role</summary>
+        <member name="F:OpenMetaverse.Primitive.ScratchPad">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRole.Description">
-            <summary>Description of Role</summary>
+        <member name="F:OpenMetaverse.Primitive.Position">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRole.Powers">
-            <summary>Abilities Associated with Role</summary>
+        <member name="F:OpenMetaverse.Primitive.Scale">
+            <summary></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.Primitive.Rotation">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.GroupTitle">
-            <summary>
-            Class to represent Group Title
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.Velocity">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupTitle.GroupID">
-            <summary>Key of the group</summary>
+        <member name="F:OpenMetaverse.Primitive.AngularVelocity">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupTitle.RoleID">
-            <summary>ID of the role title belongs to</summary>
+        <member name="F:OpenMetaverse.Primitive.Acceleration">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupTitle.Title">
-            <summary>Group Title</summary>
+        <member name="F:OpenMetaverse.Primitive.CollisionPlane">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupTitle.Selected">
-            <summary>Whether title is Active</summary>
+        <member name="F:OpenMetaverse.Primitive.Flexible">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.GroupTitle.ToString">
-            <summary>Returns group title</summary>
+        <member name="F:OpenMetaverse.Primitive.Light">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Group">
-            <summary>
-            Represents a group on the grid
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.LightMap">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Group.ID">
-            <summary>Key of Group</summary>
+        <member name="F:OpenMetaverse.Primitive.Sculpt">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Group.InsigniaID">
-            <summary>Key of Group Insignia</summary>
+        <member name="F:OpenMetaverse.Primitive.ClickAction">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Group.FounderID">
-            <summary>Key of Group Founder</summary>
+        <member name="F:OpenMetaverse.Primitive.Sound">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Group.OwnerRole">
-            <summary>Key of Group Role for Owners</summary>
+        <member name="F:OpenMetaverse.Primitive.OwnerID">
+            <summary>Identifies the owner if audio or a particle system is
+            active</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.Name">
-            <summary>Name of Group</summary>
+        <member name="F:OpenMetaverse.Primitive.SoundFlags">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Group.Charter">
-            <summary>Text of Group Charter</summary>
+        <member name="F:OpenMetaverse.Primitive.SoundGain">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Group.MemberTitle">
-            <summary>Title of "everyone" role</summary>
+        <member name="F:OpenMetaverse.Primitive.SoundRadius">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Group.OpenEnrollment">
-            <summary>Is the group open for enrolement to everyone</summary>
+        <member name="F:OpenMetaverse.Primitive.Text">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Group.ShowInList">
-            <summary>Will group show up in search</summary>
+        <member name="F:OpenMetaverse.Primitive.TextColor">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Group.Powers">
+        <member name="F:OpenMetaverse.Primitive.MediaURL">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Group.AcceptNotices">
+        <member name="F:OpenMetaverse.Primitive.Joint">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Group.AllowPublish">
+        <member name="F:OpenMetaverse.Primitive.JointPivot">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Group.MaturePublish">
-            <summary>Is the group Mature</summary>
+        <member name="F:OpenMetaverse.Primitive.JointAxisOrAnchor">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Group.MembershipFee">
-            <summary>Cost of group membership</summary>
+        <member name="F:OpenMetaverse.Primitive.NameValues">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Group.Money">
+        <member name="F:OpenMetaverse.Primitive.PrimData">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Group.Contribution">
+        <member name="F:OpenMetaverse.Primitive.Properties">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Group.GroupMembershipCount">
-            <summary>The total number of current members this group has</summary>
+        <member name="F:OpenMetaverse.Primitive.PhysicsProps">
+            <summary>Objects physics engine propertis</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.GroupRolesCount">
-            <summary>The number of roles this group has configured</summary>
+        <member name="F:OpenMetaverse.Primitive.Tag">
+            <summary>Extra data about primitive</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.ListInProfile">
-            <summary>Show this group in agent's profile</summary>
+        <member name="F:OpenMetaverse.Primitive.IsAttachment">
+            <summary>Indicates if prim is attached to an avatar</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.Primitive.ActiveClients">
+            <summary>Number of clients referencing this prim</summary>
         </member>
-        <member name="T:OpenMetaverse.Vote">
+        <member name="M:OpenMetaverse.Primitive.#ctor">
             <summary>
-            A group Vote
+            Default constructor
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Vote.Candidate">
-            <summary>Key of Avatar who created Vote</summary>
+        <member name="M:OpenMetaverse.Primitive.PackPathTwist(System.Single)">
+            <summary>
+            Packs PathTwist, PathTwistBegin, PathRadiusOffset, and PathSkew
+            parameters in to signed eight bit values
+            </summary>
+            <param name="pathTwist">Floating point parameter to pack</param>
+            <returns>Signed eight bit value containing the packed parameter</returns>
         </member>
-        <member name="F:OpenMetaverse.Vote.VoteString">
-            <summary>Text of the Vote proposal</summary>
+        <member name="M:OpenMetaverse.Primitive.UnpackPathTwist(System.SByte)">
+            <summary>
+            Unpacks PathTwist, PathTwistBegin, PathRadiusOffset, and PathSkew
+            parameters from signed eight bit integers to floating point values
+            </summary>
+            <param name="pathTwist">Signed eight bit value to unpack</param>
+            <returns>Unpacked floating point value</returns>
         </member>
-        <member name="F:OpenMetaverse.Vote.NumVotes">
-            <summary>Total number of votes</summary>
+        <member name="F:OpenMetaverse.Primitive.MediaVersion">
+            <summary>
+            Current version of the media data for the prim
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.GroupProposal">
+        <member name="F:OpenMetaverse.Primitive.FaceMedia">
             <summary>
-            A group proposal
+            Array of media entries indexed by face number
             </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupProposal.VoteText">
-            <summary>The Text of the proposal</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupProposal.Quorum">
-            <summary>The minimum number of members that must vote before proposal passes or failes</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 name="F:OpenMetaverse.Primitive.ParticleSys">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupProposal.Duration">
-            <summary>The duration in days votes are accepted</summary>
+        <member name="P:OpenMetaverse.Primitive.Type">
+            <summary>Uses basic heuristics to estimate the primitive shape</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupAccountSummary">
+        <member name="T:OpenMetaverse.Primitive.TextureAnimMode">
             <summary>
-            
+            Texture animation mode
             </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.IntervalDays">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ANIM_OFF">
+            <summary>Disable texture animation</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.CurrentInterval">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ANIM_ON">
+            <summary>Enable texture animation</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.StartDate">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.LOOP">
+            <summary>Loop when animating textures</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.Balance">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.REVERSE">
+            <summary>Animate in reverse direction</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.TotalCredits">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.PING_PONG">
+            <summary>Animate forward then reverse</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.TotalDebits">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.SMOOTH">
+            <summary>Slide texture smoothly instead of frame-stepping</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.ObjectTaxCurrent">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ROTATE">
+            <summary>Rotate texture instead of using frames</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.LightTaxCurrent">
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.SCALE">
+            <summary>Scale texture instead of using frames</summary>
+        </member>
+        <member name="T:OpenMetaverse.Primitive.TextureEntryFace">
+            <summary>
+            A single textured face. Don't instantiate this class yourself, use the
+            methods in TextureEntry
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Primitive.TextureEntryFace.#ctor(OpenMetaverse.Primitive.TextureEntryFace)">
+            <summary>
+            Contains the definition for individual faces
+            </summary>
+            <param name="defaultTexture"></param>
+        </member>
+        <member name="M:OpenMetaverse.Primitive.TextureEntryFace.ToString">
+            <summary>
+            
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.material">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.LandTaxCurrent">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.media">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.GroupTaxCurrent">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RGBA">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.ParcelDirFeeCurrent">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RepeatU">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.ObjectTaxEstimate">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RepeatV">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.LightTaxEstimate">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.OffsetU">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.LandTaxEstimate">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.OffsetV">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.GroupTaxEstimate">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Rotation">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.ParcelDirFeeEstimate">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Glow">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.NonExemptMembers">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Bump">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.LastTaxDate">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.MediaFlags">
+            <summary>In the future this will specify whether a webpage is
+            attached to this face</summary>
+        </member>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.TextureID">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.TaxDate">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.MaterialID">
             <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.GroupNotice">
+        <member name="T:OpenMetaverse.Primitive.TextureEntry">
             <summary>
-            Struct representing a group notice
+            Represents all of the texturable faces for an object
             </summary>
+            <remarks>Grid objects have infinite faces, with each face
+            using the properties of the default face unless set otherwise. So if
+            you have a TextureEntry with a default texture uuid of X, and face 18
+            has a texture UUID of Y, every face would be textured with X except for
+            face 18 that uses Y. In practice however, primitives utilize a maximum
+            of nine faces</remarks>
         </member>
-        <member name="F:OpenMetaverse.GroupNotice.Subject">
+        <member name="F:OpenMetaverse.Primitive.TextureEntry.DefaultTexture">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupNotice.Message">
+        <member name="F:OpenMetaverse.Primitive.TextureEntry.FaceTextures">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupNotice.AttachmentID">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(OpenMetaverse.UUID)">
+            <summary>
+            Constructor that takes a default texture UUID
+            </summary>
+            <param name="defaultTextureID">Texture UUID to use as the default texture</param>
         </member>
-        <member name="F:OpenMetaverse.GroupNotice.OwnerID">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(OpenMetaverse.Primitive.TextureEntryFace)">
+            <summary>
+            Constructor that takes a <code>TextureEntryFace</code> for the
+            default face
+            </summary>
+            <param name="defaultFace">Face to use as the default face</param>
         </member>
-        <member name="M:OpenMetaverse.GroupNotice.SerializeAttachment">
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            Constructor that creates the TextureEntry class from a byte array
+            </summary>
+            <param name="data">Byte array containing the TextureEntry field</param>
+            <param name="pos">Starting position of the TextureEntry field in 
+            the byte array</param>
+            <param name="length">Length of the TextureEntry field, in bytes</param>
+        </member>
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.CreateFace(System.UInt32)">
+            <summary>
+            This will either create a new face if a custom face for the given
+            index is not defined, or return the custom face for that index if
+            it already exists
+            </summary>
+            <param name="index">The index number of the face to create or 
+            retrieve</param>
+            <returns>A TextureEntryFace containing all the properties for that
+            face</returns>
+        </member>
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetFace(System.UInt32)">
             <summary>
             
             </summary>
+            <param name="index"></param>
             <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.GroupNoticesListEntry">
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetOSD">
             <summary>
-            Struct representing a group notice list entry
+            
             </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.GroupNoticesListEntry.NoticeID">
-            <summary>Notice ID</summary>
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetBytes">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.GroupNoticesListEntry.Timestamp">
-            <summary>Creation timestamp of notice</summary>
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.ToString">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.GroupNoticesListEntry.FromName">
-            <summary>Agent name who created notice</summary>
+        <member name="T:OpenMetaverse.Primitive.TextureAnimation">
+            <summary>
+            Controls the texture animation of a particular prim
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupNoticesListEntry.Subject">
-            <summary>Notice subject</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Flags">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupNoticesListEntry.HasAttachment">
-            <summary>Is there an attachment?</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Face">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupNoticesListEntry.AssetType">
-            <summary>Attachment Type</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.SizeX">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.ChatSessionMember">
-            <summary>
-            Struct representing a member of a group chat session and their settings
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.SizeY">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ChatSessionMember.AvatarKey">
-            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the Avatar</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Start">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ChatSessionMember.CanVoiceChat">
-            <summary>True if user has voice chat enabled</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Length">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ChatSessionMember.IsModerator">
-            <summary>True of Avatar has moderator abilities</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Rate">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ChatSessionMember.MuteText">
-            <summary>True if a moderator has muted this avatars chat</summary>
+        <member name="M:OpenMetaverse.Primitive.TextureAnimation.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            
+            </summary>
+            <param name="data"></param>
+            <param name="pos"></param>
         </member>
-        <member name="F:OpenMetaverse.ChatSessionMember.MuteVoice">
-            <summary>True if a moderator has muted this avatars voice</summary>
+        <member name="M:OpenMetaverse.Primitive.TextureAnimation.GetBytes">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.GroupRoleUpdate">
+        <member name="T:OpenMetaverse.Primitive.ConstructionData">
             <summary>
-            Role update flags
+            Parameters used to construct a visual representation of a primitive
             </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRoleUpdate.NoUpdate">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.profileCurve">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRoleUpdate.UpdateData">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathCurve">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRoleUpdate.UpdatePowers">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathEnd">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRoleUpdate.UpdateAll">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathRadiusOffset">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRoleUpdate.Create">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathSkew">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRoleUpdate.Delete">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathScaleX">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.None">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathScaleY">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.Invite">
-            <summary>Can send invitations to groups default role</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathShearX">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.Eject">
-            <summary>Can eject members from group</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathShearY">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.ChangeOptions">
-            <summary>Can toggle 'Open Enrollment' and change 'Signup fee'</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTaperX">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.MemberVisible">
-            <summary>Member is visible in the public member list</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTaperY">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.CreateRole">
-            <summary>Can create new roles</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathBegin">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.DeleteRole">
-            <summary>Can delete existing roles</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTwist">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.RoleProperties">
-            <summary>Can change Role names, titles and descriptions</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTwistBegin">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.AssignMemberLimited">
-            <summary>Can assign other members to assigners role</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathRevolutions">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.AssignMember">
-            <summary>Can assign other members to any role</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileBegin">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.RemoveMember">
-            <summary>Can remove members from roles</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileEnd">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.ChangeActions">
-            <summary>Can assign and remove abilities in roles</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileHollow">
+            <summary></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 name="F:OpenMetaverse.Primitive.ConstructionData.Material">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandDeed">
-            <summary>Can buy land or deed land to group</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.State">
+            <summary></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 name="F:OpenMetaverse.Primitive.ConstructionData.PCode">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandSetSale">
-            <summary>Can set land for-sale information on group owned parcels</summary>
+        <member name="M:OpenMetaverse.Primitive.ConstructionData.GetHashCode">
+            <summary>
+            Calculdates hash code for prim construction data
+            </summary>
+            <returns>The has</returns>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandDivideJoin">
-            <summary>Can subdivide and join parcels</summary>
+        <member name="P:OpenMetaverse.Primitive.ConstructionData.AttachmentPoint">
+            <summary>Attachment point to an avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.JoinChat">
-            <summary>Can join group chat sessions</summary>
+        <member name="P:OpenMetaverse.Primitive.ConstructionData.ProfileCurve">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.AllowVoiceChat">
-            <summary>Can use voice chat in Group Chat sessions</summary>
+        <member name="P:OpenMetaverse.Primitive.ConstructionData.ProfileHole">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.ModerateChat">
-            <summary>Can moderate group chat sessions</summary>
+        <member name="P:OpenMetaverse.Primitive.ConstructionData.PathBeginScale">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.FindPlaces">
-            <summary>Can toggle "Show in Find Places" and set search category</summary>
+        <member name="P:OpenMetaverse.Primitive.ConstructionData.PathEndScale">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandChangeIdentity">
-            <summary>Can change parcel name, description, and 'Publish on web' settings</summary>
+        <member name="T:OpenMetaverse.Primitive.FlexibleData">
+            <summary>
+            Information on the flexible properties of a primitive
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.SetLandingPoint">
-            <summary>Can set the landing point and teleport routing on group land</summary>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Softness">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.ChangeMedia">
-            <summary>Can change music and media settings</summary>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Gravity">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandEdit">
-            <summary>Can toggle 'Edit Terrain' option in Land settings</summary>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Drag">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandOptions">
-            <summary>Can toggle various About Land > Options settings</summary>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Wind">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.AllowEditLand">
-            <summary>Can always terraform land, even if parcel settings have it turned off</summary>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Tension">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.AllowFly">
-            <summary>Can always fly while over group owned land</summary>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Force">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.AllowRez">
-            <summary>Can always rez objects on group owned land</summary>
+        <member name="M:OpenMetaverse.Primitive.FlexibleData.#ctor">
+            <summary>
+            Default constructor
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.AllowLandmark">
-            <summary>Can always create landmarks for group owned parcels</summary>
+        <member name="M:OpenMetaverse.Primitive.FlexibleData.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            
+            </summary>
+            <param name="data"></param>
+            <param name="pos"></param>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.AllowSetHome">
-            <summary>Can set home location on any group owned parcel</summary>
+        <member name="M:OpenMetaverse.Primitive.FlexibleData.GetBytes">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandManageAllowed">
-            <summary>Can modify public access settings for group owned parcels</summary>
+        <member name="M:OpenMetaverse.Primitive.FlexibleData.GetOSD">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandManageBanned">
-            <summary>Can manager parcel ban lists on group owned land</summary>
+        <member name="T:OpenMetaverse.Primitive.LightData">
+            <summary>
+            Information on the light properties of a primitive
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandManagePasses">
-            <summary>Can manage pass list sales information</summary>
+        <member name="F:OpenMetaverse.Primitive.LightData.Color">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandEjectAndFreeze">
-            <summary>Can eject and freeze other avatars on group owned land</summary>
+        <member name="F:OpenMetaverse.Primitive.LightData.Intensity">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.ReturnGroupSet">
-            <summary>Can return objects set to group</summary>
+        <member name="F:OpenMetaverse.Primitive.LightData.Radius">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.ReturnNonGroup">
-            <summary>Can return non-group owned/set objects</summary>
+        <member name="F:OpenMetaverse.Primitive.LightData.Cutoff">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.ReturnGroupOwned">
-            <summary>Can return group owned objects</summary>
+        <member name="F:OpenMetaverse.Primitive.LightData.Falloff">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandGardening">
-            <summary>Can landscape using Linden plants</summary>
+        <member name="M:OpenMetaverse.Primitive.LightData.#ctor">
+            <summary>
+            Default constructor
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.DeedObject">
-            <summary>Can deed objects to group</summary>
+        <member name="M:OpenMetaverse.Primitive.LightData.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            
+            </summary>
+            <param name="data"></param>
+            <param name="pos"></param>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.ObjectManipulate">
-            <summary>Can move group owned objects</summary>
+        <member name="M:OpenMetaverse.Primitive.LightData.GetBytes">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.ObjectSetForSale">
-            <summary>Can set group owned objects for-sale</summary>
+        <member name="M:OpenMetaverse.Primitive.LightData.ToString">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.Accountable">
-            <summary>Pay group liabilities and receive group dividends</summary>
+        <member name="T:OpenMetaverse.Primitive.LightImage">
+            <summary>
+            Information on the light properties of a primitive as texture map
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.SendNotices">
-            <summary>Can send group notices</summary>
+        <member name="F:OpenMetaverse.Primitive.LightImage.LightTexture">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.ReceiveNotices">
-            <summary>Can receive group notices</summary>
+        <member name="F:OpenMetaverse.Primitive.LightImage.Params">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.StartProposal">
-            <summary>Can create group proposals</summary>
+        <member name="M:OpenMetaverse.Primitive.LightImage.#ctor">
+            <summary>
+            Default constructor
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.VoteOnProposal">
-            <summary>Can vote on group proposals</summary>
+        <member name="M:OpenMetaverse.Primitive.LightImage.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            
+            </summary>
+            <param name="data"></param>
+            <param name="pos"></param>
         </member>
-        <member name="T:OpenMetaverse.GroupManager">
+        <member name="M:OpenMetaverse.Primitive.LightImage.GetBytes">
             <summary>
-            Handles all network traffic related to reading and writing group
-            information
+            
             </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_CurrentGroups">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.Primitive.LightImage.ToString">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </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 name="T:OpenMetaverse.Primitive.SculptData">
+            <summary>
+            Information on the sculpt properties of a sculpted primitive
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_CurrentGroupsLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.Primitive.SculptData.#ctor">
+            <summary>
+            Default constructor
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupNames">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.Primitive.SculptData.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            
+            </summary>
+            <param name="data"></param>
+            <param name="pos"></param>
         </member>
-        <member name="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="P:OpenMetaverse.Primitive.SculptData.Invert">
+            <summary>
+            Render inside out (inverts the normals).
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupNamesLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.Primitive.SculptData.Mirror">
+            <summary>
+            Render an X axis mirror of the sculpty.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupProfile">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Primitive.ObjectProperties">
+            <summary>
+            Extended properties to describe an object
+            </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.Primitive.ObjectProperties.ObjectID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupProfileLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.CreatorID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupMembers">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.OwnerID">
+            <summary></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.Primitive.ObjectProperties.GroupID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupMembersLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.CreationDate">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupRoles">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Permissions">
+            <summary></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.Primitive.ObjectProperties.OwnershipCost">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupRolesLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SaleType">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupRoleMembers">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SalePrice">
+            <summary></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.Primitive.ObjectProperties.AggregatePerms">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupRolesMembersLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePermTextures">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupTitles">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePermTexturesOwner">
+            <summary></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.Primitive.ObjectProperties.Category">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupTitlesLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.InventorySerial">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupAccountSummary">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.ItemID">
+            <summary></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.Primitive.ObjectProperties.FolderID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupAccountSummaryLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.FromTaskID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupCreated">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.LastOwnerID">
+            <summary></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.Primitive.ObjectProperties.Name">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupCreatedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Description">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupJoined">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.TouchName">
+            <summary></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.Primitive.ObjectProperties.SitName">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupJoinedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.TextureIDs">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupLeft">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.Primitive.ObjectProperties.#ctor">
+            <summary>
+            Default constructor
+            </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="M:OpenMetaverse.Primitive.ObjectProperties.SetFamilyProperties(OpenMetaverse.Primitive.ObjectProperties)">
+            <summary>
+            Set the properties that are set in an ObjectPropertiesFamily packet
+            </summary>
+            <param name="props"><seealso cref="T:OpenMetaverse.Primitive.ObjectProperties"/> that has
+            been partially filled by an ObjectPropertiesFamily packet</param>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupLeftLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Primitive.PhysicsProperties">
+            <summary>
+            Describes physics attributes of the prim
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupDropped">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.LocalID">
+            <summary>Primitive's local ID</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.Primitive.PhysicsProperties.Density">
+            <summary>Density (1000 for normal density)</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupDroppedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.Friction">
+            <summary>Friction</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupMemberEjected">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.GravityMultiplier">
+            <summary>Gravity multiplier (1 for normal gravity) </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.Primitive.PhysicsProperties.PhysicsShapeType">
+            <summary>Type of physics representation of this primitive in the simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupMemberEjectedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.Restitution">
+            <summary>Restitution</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupNoticesListReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.Primitive.PhysicsProperties.FromOSD(OpenMetaverse.StructuredData.OSD)">
+            <summary>
+            Creates PhysicsProperties from OSD
+            </summary>
+            <param name="osd">OSDMap with incoming data</param>
+            <returns>Deserialized PhysicsProperties object</returns>
         </member>
-        <member name="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="M:OpenMetaverse.Primitive.PhysicsProperties.GetOSD">
+            <summary>
+            Serializes PhysicsProperties to OSD
+            </summary>
+            <returns>OSDMap with serialized PhysicsProperties data</returns>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupNoticesListReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Primitive.ParticleSystem">
+            <summary>
+            Complete structure for the particle system
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupInvitation">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartFlags">
+            <summary>Particle Flags</summary>
+            <remarks>There appears to be more data packed in to this area
+            for many particle systems. It doesn't appear to be flag values
+            and serialization breaks unless there is a flag for every
+            possible bit so it is left as an unsigned integer</remarks>
         </member>
-        <member name="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.Primitive.ParticleSystem.Pattern">
+            <summary><seealso cref="T:SourcePattern"/> pattern of particles</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupInvitationLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.MaxAge">
+            <summary>A <see langword="float"/> representing the maximimum age (in seconds) particle will be displayed</summary>
+            <remarks>Maximum value is 30 seconds</remarks>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.Client">
-            <summary>A reference to the current <seealso cref="T:OpenMetaverse.GridClient"/> instance</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.StartAge">
+            <summary>A <see langword="float"/> representing the number of seconds, 
+            from when the particle source comes into view, 
+            or the particle system's creation, that the object will emits particles; 
+            after this time period no more particles are emitted</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.GroupMembersRequests">
-            <summary>Currently-active group members requests</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.InnerAngle">
+            <summary>A <see langword="float"/> in radians that specifies where particles will not be created</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.GroupRolesRequests">
-            <summary>Currently-active group roles requests</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.OuterAngle">
+            <summary>A <see langword="float"/> in radians that specifies where particles will be created</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.GroupRolesMembersRequests">
-            <summary>Currently-active group role-member requests</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstRate">
+            <summary>A <see langword="float"/> representing the number of seconds between burts.</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.TempGroupMembers">
-            <summary>Dictionary keeping group members while request is in progress</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstRadius">
+            <summary>A <see langword="float"/> representing the number of meters
+            around the center of the source where particles will be created.</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.TempGroupRolesMembers">
-            <summary>Dictionary keeping mebmer/role mapping while request is in progress</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstSpeedMin">
+            <summary>A <see langword="float"/> representing in seconds, the minimum speed between bursts of new particles 
+            being emitted</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.TempGroupRoles">
-            <summary>Dictionary keeping GroupRole information while request is in progress</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstSpeedMax">
+            <summary>A <see langword="float"/> representing in seconds the maximum speed of new particles being emitted.</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.GroupName2KeyCache">
-            <summary>Caches group name lookups</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstPartCount">
+            <summary>A <see langword="byte"/> representing the maximum number of particles emitted per burst</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Construct a new instance of the GroupManager class
-            </summary>
-            <param name="client">A reference to the current <seealso cref="T:OpenMetaverse.GridClient"/> instance</param>
+        <member name="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.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.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.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 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.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 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.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 name="F:OpenMetaverse.Primitive.ParticleSystem.PartDataFlags">
+            <summary>Flags of particle from <seealso cref="T:ParticleDataFlags"/></summary>
         </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 name="F:OpenMetaverse.Primitive.ParticleSystem.PartMaxAge">
+            <summary>Max Age particle system will emit particles for</summary>
         </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 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.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 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.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 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.GroupManager.ActivateGroup(OpenMetaverse.UUID)">
-            <summary>Set a group as the current active group</summary>
-            <param name="id">group ID (UUID)</param>
+        <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.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 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.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 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.GroupManager.SetGroupAcceptNotices(OpenMetaverse.UUID,System.Boolean,System.Boolean)">
+        <member name="M:OpenMetaverse.Primitive.ParticleSystem.#ctor(System.Byte[],System.Int32)">
             <summary>
-            Save wheather agent wants to accept group notices and list this group in their profile
+            Decodes a byte[] array into a ParticleSystem Object
             </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>
+            <param name="data">ParticleSystem object</param>
+            <param name="pos">Start position for BitPacker</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 name="M:OpenMetaverse.Primitive.ParticleSystem.GetBytes">
+            <summary>
+            Generate byte[] array from particle data
+            </summary>
+            <returns>Byte array</returns>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.RequestCreateGroup(OpenMetaverse.Group)">
+        <member name="T:OpenMetaverse.Primitive.ParticleSystem.SourcePattern">
             <summary>
-            Request to create a new group. If the group is successfully
-            created, L$100 will automatically be deducted
+            Particle source pattern
             </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 name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.None">
+            <summary>None</summary>
         </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 name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Drop">
+            <summary>Drop particles from source position with no force</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.UpdateRole(OpenMetaverse.GroupRole)">
-            <summary>Update role information</summary>
-            <param name="role">Modified role to be updated</param>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Explode">
+            <summary>"Explode" particles in all directions</summary>
         </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 name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Angle">
+            <summary>Particles shoot across a 2D area</summary>
         </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 name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.AngleCone">
+            <summary>Particles shoot across a 3D Cone</summary>
         </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 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.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 name="T:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags">
+            <summary>
+            Particle Data Flags
+            </summary>
         </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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.None">
+            <summary>None</summary>
         </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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.InterpColor">
+            <summary>Interpolate color and alpha from start to end</summary>
         </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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.InterpScale">
+            <summary>Interpolate scale from start to end</summary>
         </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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Bounce">
+            <summary>Bounce particles off particle sources Z height</summary>
         </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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Wind">
+            <summary>velocity of particles is dampened toward the simulators wind</summary>
         </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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.FollowSrc">
+            <summary>Particles follow the source</summary>
         </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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.FollowVelocity">
+            <summary>Particles point towards the direction of source's velocity</summary>
         </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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.TargetPos">
+            <summary>Target of the particles</summary>
         </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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.TargetLinear">
+            <summary>Particles are sent in a straight line</summary>
         </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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Emissive">
+            <summary>Particles emit a glow</summary>
         </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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Beam">
+            <summary>used for point/grab/touch</summary>
         </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 name="T:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags">
+            <summary>
+            Particle Flags Enum
+            </summary>
         </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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags.None">
+            <summary>None</summary>
         </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 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.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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags.UseNewAngle">
+            <summary>Particles use new 'correct' angle parameters</summary>
         </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 name="F:OpenMetaverse.Avatar.Groups">
+            <summary>Groups that this avatar is a member of</summary>
         </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 name="F:OpenMetaverse.Avatar.ProfileStatistics">
+            <summary>Positive and negative ratings</summary>
         </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 name="F:OpenMetaverse.Avatar.ProfileProperties">
+            <summary>Avatar properties including about text, profile URL, image IDs and 
+            publishing settings</summary>
         </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 name="F:OpenMetaverse.Avatar.ProfileInterests">
+            <summary>Avatar interests including spoken languages, skills, and "want to"
+            choices</summary>
         </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 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="E:OpenMetaverse.GroupManager.CurrentGroups">
-            <summary>Raised when the simulator sends us data containing
-            our current group membership</summary>
+        <member name="F:OpenMetaverse.Avatar.VisualParameters">
+            <summary>
+            Contains the visual parameters describing the deformation of the avatar
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupNamesReply">
-            <summary>Raised when the simulator responds to a RequestGroupName 
-            or RequestGroupNames request</summary>
+        <member name="F:OpenMetaverse.Avatar.AppearanceVersion">
+            <summary>
+            Appearance version. Value greater than 0 indicates using server side baking
+            </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 name="F:OpenMetaverse.Avatar.COFVersion">
+            <summary>
+            Version of the Current Outfit Folder that the appearance is based on
+            </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 name="F:OpenMetaverse.Avatar.AppearanceFlags">
+            <summary>
+            Appearance flags. Introduced with server side baking, currently unused.
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupAccountSummaryReply">
-            <summary>Raised when a response to a RequestGroupAccountSummary is returned
-            by the simulator</summary>
+        <member name="F:OpenMetaverse.Avatar.Animations">
+            <summary>
+            List of current avatar animations
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupCreatedReply">
-            <summary>Raised when a request to create a group is successful</summary>
+        <member name="M:OpenMetaverse.Avatar.#ctor">
+            <summary>
+            Default constructor
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupJoinedReply">
-            <summary>Raised when a request to join a group either
-            fails or succeeds</summary>
+        <member name="P:OpenMetaverse.Avatar.FirstName">
+            <summary>First name</summary>
         </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupLeaveReply">
-            <summary>Raised when a request to leave a group either
-            fails or succeeds</summary>
+        <member name="P:OpenMetaverse.Avatar.LastName">
+            <summary>Last name</summary>
         </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupDropped">
-            <summary>Raised when A group is removed from the group server</summary>
+        <member name="P:OpenMetaverse.Avatar.Name">
+            <summary>Full name</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 name="P:OpenMetaverse.Avatar.GroupName">
+            <summary>Active group</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 name="T:OpenMetaverse.Avatar.Statistics">
+            <summary>
+            Positive and negative ratings
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupInvitation">
-            <summary>Raised when another agent invites our avatar to join a group</summary>
+        <member name="F:OpenMetaverse.Avatar.Statistics.BehaviorPositive">
+            <summary>Positive ratings for Behavior</summary>
         </member>
-        <member name="T:OpenMetaverse.CurrentGroupsEventArgs">
-            <summary>Contains the current groups your agent is a member of</summary>
+        <member name="F:OpenMetaverse.Avatar.Statistics.BehaviorNegative">
+            <summary>Negative ratings for Behavior</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 name="F:OpenMetaverse.Avatar.Statistics.AppearancePositive">
+            <summary>Positive ratings for Appearance</summary>
         </member>
-        <member name="P:OpenMetaverse.CurrentGroupsEventArgs.Groups">
-            <summary>Get the current groups your agent is a member of</summary>
+        <member name="F:OpenMetaverse.Avatar.Statistics.AppearanceNegative">
+            <summary>Negative ratings for Appearance</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 name="F:OpenMetaverse.Avatar.Statistics.BuildingPositive">
+            <summary>Positive ratings for Building</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 name="F:OpenMetaverse.Avatar.Statistics.BuildingNegative">
+            <summary>Negative ratings for Building</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupNamesEventArgs.GroupNames">
-            <summary>Get the Group Names dictionary</summary>
+        <member name="F:OpenMetaverse.Avatar.Statistics.GivenPositive">
+            <summary>Positive ratings given by this avatar</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupMembersReplyEventArgs">
-            <summary>Represents the members of a group</summary>
+        <member name="F:OpenMetaverse.Avatar.Statistics.GivenNegative">
+            <summary>Negative ratings given by this avatar</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupMembersReplyEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.GroupMember})">
+        <member name="T:OpenMetaverse.Avatar.AvatarProperties">
             <summary>
-            Construct a new instance of the GroupMembersReplyEventArgs class
+            Avatar properties including about text, profile URL, image IDs and 
+            publishing settings
             </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 name="F:OpenMetaverse.Avatar.AvatarProperties.FirstLifeText">
+            <summary>First Life about text</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupMembersReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.FirstLifeImage">
+            <summary>First Life image ID</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupMembersReplyEventArgs.Members">
-            <summary>Get the dictionary of members</summary>
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.Partner">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.GroupRolesDataReplyEventArgs">
-            <summary>Represents the roles associated with a group</summary>
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.AboutText">
+            <summary></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 name="F:OpenMetaverse.Avatar.AvatarProperties.BornOn">
+            <summary></summary>
         </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 name="F:OpenMetaverse.Avatar.AvatarProperties.CharterMember">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.GroupRolesDataReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.ProfileImage">
+            <summary>Profile image ID</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupRolesDataReplyEventArgs.Roles">
-            <summary>Get the dictionary containing the roles</summary>
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.Flags">
+            <summary>Flags of the profile</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupRolesMembersReplyEventArgs">
-            <summary>Represents the Role to Member mappings for a group</summary>
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.ProfileURL">
+            <summary>Web URL for this profile</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 name="P:OpenMetaverse.Avatar.AvatarProperties.AllowPublish">
+            <summary>Should this profile be published on the web</summary>
         </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 name="P:OpenMetaverse.Avatar.AvatarProperties.Online">
+            <summary>Avatar Online Status</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupRolesMembersReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
+        <member name="P:OpenMetaverse.Avatar.AvatarProperties.MaturePublish">
+            <summary>Is this a mature profile</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupRolesMembersReplyEventArgs.RolesMembers">
-            <summary>Get the member to roles map</summary>
+        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Identified">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.GroupTitlesReplyEventArgs">
-            <summary>Represents the titles for a group</summary>
+        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Transacted">
+            <summary></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 name="T:OpenMetaverse.Avatar.Interests">
+            <summary>
+            Avatar interests including spoken languages, skills, and "want to"
+            choices
+            </summary>
         </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 name="F:OpenMetaverse.Avatar.Interests.LanguagesText">
+            <summary>Languages profile field</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupTitlesReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
+        <member name="F:OpenMetaverse.Avatar.Interests.SkillsMask">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.GroupTitlesReplyEventArgs.Titles">
-            <summary>Get the titles</summary>
+        <member name="F:OpenMetaverse.Avatar.Interests.SkillsText">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.GroupAccountSummaryReplyEventArgs">
-            <summary>Represents the summary data for a group</summary>
+        <member name="F:OpenMetaverse.Avatar.Interests.WantToMask">
+            <summary></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 name="F:OpenMetaverse.Avatar.Interests.WantToText">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.GroupAccountSummaryReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
+        <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="P:OpenMetaverse.GroupAccountSummaryReplyEventArgs.Summary">
-            <summary>Get the summary data</summary>
+        <member name="M:OpenMetaverse.AgentThrottle.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Default constructor, uses a default high total of 1500 KBps (1536000)
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.GroupCreatedReplyEventArgs">
-            <summary>A response to a group create request</summary>
+        <member name="M:OpenMetaverse.AgentThrottle.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            Constructor that decodes an existing AgentThrottle packet in to
+            individual values
+            </summary>
+            <param name="data">Reference to the throttle data in an AgentThrottle
+            packet</param>
+            <param name="pos">Offset position to start reading at in the 
+            throttle data</param>
+            <remarks>This is generally not needed in clients as the server will
+            never send a throttle packet to the client</remarks>
         </member>
-        <member name="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 name="M:OpenMetaverse.AgentThrottle.Set">
+            <summary>
+            Send an AgentThrottle packet to the current server using the 
+            current values
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.GroupCreatedReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
+        <member name="M:OpenMetaverse.AgentThrottle.Set(OpenMetaverse.Simulator)">
+            <summary>
+            Send an AgentThrottle packet to the specified server using the 
+            current values
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.GroupCreatedReplyEventArgs.Success">
-            <summary>true of the  group was created successfully</summary>
+        <member name="M:OpenMetaverse.AgentThrottle.ToBytes">
+            <summary>
+            Convert the current throttle values to a byte array that can be put
+            in an AgentThrottle packet
+            </summary>
+            <returns>Byte array containing all the throttle values</returns>
         </member>
-        <member name="P:OpenMetaverse.GroupCreatedReplyEventArgs.Message">
-            <summary>A string containing the message</summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Resend">
+            <summary>Maximum bits per second for resending unacknowledged packets</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupOperationEventArgs">
-            <summary>Represents a response to a request</summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Land">
+            <summary>Maximum bits per second for LayerData terrain</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 name="P:OpenMetaverse.AgentThrottle.Wind">
+            <summary>Maximum bits per second for LayerData wind data</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupOperationEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Cloud">
+            <summary>Maximum bits per second for LayerData clouds</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupOperationEventArgs.Success">
-            <summary>true of the request was successful</summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Task">
+            <summary>Unknown, includes object data</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupDroppedEventArgs">
-            <summary>Represents your agent leaving a group</summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Texture">
+            <summary>Maximum bits per second for textures</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 name="P:OpenMetaverse.AgentThrottle.Asset">
+            <summary>Maximum bits per second for downloaded assets</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupDroppedEventArgs.GroupID">
-            <summary>Get the ID of the group</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="T:OpenMetaverse.GroupNoticesListReplyEventArgs">
-            <summary>Represents a list of active group notices</summary>
+        <member name="F:OpenMetaverse.Http.EventQueueClient.REQUEST_TIMEOUT">
+            <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.Http.EventQueueClient._errorCount">
+            <summary>Number of times we've received an unknown CAPS exception in series.</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupNoticesListReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
+        <member name="F:OpenMetaverse.Http.EventQueueClient._random">
+            <summary>For exponential backoff on error.</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupNoticesListReplyEventArgs.Notices">
-            <summary>Get the notices list</summary>
+        <member name="T:OpenMetaverse.Assets.AssetMesh">
+            <summary>
+            Represents Mesh asset
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.GroupProfileEventArgs">
-            <summary>Represents the profile of a group</summary>
+        <member name="F:OpenMetaverse.Assets.AssetMesh.MeshData">
+            <summary>
+            Decoded mesh data
+            </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="M:OpenMetaverse.Assets.AssetMesh.#ctor">
+            <summary>Initializes a new instance of an AssetMesh object</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupProfileEventArgs.Group">
-            <summary>Get the group profile</summary>
+        <member name="M:OpenMetaverse.Assets.AssetMesh.#ctor(OpenMetaverse.UUID,System.Byte[])">
+            <summary>Initializes a new instance of an AssetMesh object with parameters</summary>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="T:OpenMetaverse.GroupInvitationEventArgs">
+        <member name="M:OpenMetaverse.Assets.AssetMesh.Encode">
             <summary>
-            Provides notification of a group invitation request sent by another Avatar
+            TODO: Encodes Collada file into LLMesh format
             </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="P:OpenMetaverse.GroupInvitationEventArgs.AgentID">
-            <summary>The ID of the Avatar sending the group invitation</summary>
+        <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="P:OpenMetaverse.GroupInvitationEventArgs.FromName">
-            <summary>The name of the Avatar sending the group invitation</summary>
+        <member name="P:OpenMetaverse.Assets.AssetMesh.AssetType">
+            <summary>Override the base classes AssetType</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.TerrainPatch.X">
+            <summary>X position of this patch</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupInvitationEventArgs.Simulator">
-            <summary>The Simulator</summary>
+        <member name="F:OpenMetaverse.TerrainPatch.Y">
+            <summary>Y position of this patch</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupInvitationEventArgs.Accept">
-            <summary>Set to true to accept invitation, false to decline</summary>
+        <member name="F:OpenMetaverse.TerrainPatch.Data">
+            <summary>A 16x16 array of floats holding decompressed layer data</summary>
         </member>
-        <member name="M:OpenMetaverse.CoordinateFrame.LookDirection(OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
+        <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="at">Looking direction, must be a normalized vector</param>
-            <param name="upDirection">Up direction, must be a normalized vector</param>
+            <param name="heightmap">A 256 * 256 array of floating point values
+            specifying the height at each meter in the simulator</param>
+            <param name="patches">Array of indexes in the 16x16 grid of patches
+            for this simulator. For example if 1 and 17 are specified, patches
+            x=1,y=0 and x=1,y=1 are sent</param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.CoordinateFrame.LookDirection(System.Double)">
+        <member name="M:OpenMetaverse.TerrainCompressor.CreatePatchFromHeightmap(OpenMetaverse.BitPack,System.Single[],System.Int32,System.Int32)">
             <summary>
-            Align the coordinate frame X and Y axis with a given rotation
-            around the Z axis in radians
+            Add a patch of terrain to a BitPacker
             </summary>
-            <param name="heading">Absolute rotation around the Z axis in
-            radians</param>
-        </member>
-        <member name="P:OpenMetaverse.CoordinateFrame.Origin">
-            <summary>Origin position of this coordinate frame</summary>
-        </member>
-        <member name="P:OpenMetaverse.CoordinateFrame.XAxis">
-            <summary>X axis of this coordinate frame, or Forward/At in grid terms</summary>
-        </member>
-        <member name="P:OpenMetaverse.CoordinateFrame.YAxis">
-            <summary>Y axis of this coordinate frame, or Left in grid terms</summary>
-        </member>
-        <member name="P:OpenMetaverse.CoordinateFrame.ZAxis">
-            <summary>Z axis of this coordinate frame, or Up in grid terms</summary>
+            <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.ProfileFlags">
+        <member name="T:OpenMetaverse.ScriptPermission">
             <summary>
-            Avatar profile flags
+            Permission request flags, asked when a script wants to control an Avatar
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Avatar">
-            <summary>
-            Represents an avatar (other than your own)
-            </summary>
+        <member name="F:OpenMetaverse.ScriptPermission.None">
+            <summary>Placeholder for empty values, shouldn't ever see this</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Groups">
-            <summary>Groups that this avatar is a member of</summary>
+        <member name="F:OpenMetaverse.ScriptPermission.Debit">
+            <summary>Script wants ability to take money from you</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.ProfileStatistics">
-            <summary>Positive and negative ratings</summary>
+        <member name="F:OpenMetaverse.ScriptPermission.TakeControls">
+            <summary>Script wants to take camera controls for you</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.ProfileProperties">
-            <summary>Avatar properties including about text, profile URL, image IDs and 
-            publishing settings</summary>
+        <member name="F:OpenMetaverse.ScriptPermission.RemapControls">
+            <summary>Script wants to remap avatars controls</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.ProfileInterests">
-            <summary>Avatar interests including spoken languages, skills, and "want to"
-            choices</summary>
+        <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.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="F:OpenMetaverse.ScriptPermission.Attach">
+            <summary>Script wants to attach or detach the prim or primset to your avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.VisualParameters">
-            <summary>
-            Contains the visual parameters describing the deformation of the avatar
-            </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="M:OpenMetaverse.Avatar.#ctor">
-            <summary>
-            Default constructor
-            </summary>
+        <member name="F:OpenMetaverse.ScriptPermission.ChangeLinks">
+            <summary>Script wants ability to link/delink with other prims</summary>
         </member>
-        <member name="P:OpenMetaverse.Avatar.FirstName">
-            <summary>First name</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.Avatar.LastName">
-            <summary>Last name</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.Avatar.Name">
-            <summary>Full name</summary>
+        <member name="F:OpenMetaverse.ScriptPermission.TrackCamera">
+            <summary>Script wants to track avatars camera position and rotation </summary>
         </member>
-        <member name="P:OpenMetaverse.Avatar.GroupName">
-            <summary>Active group</summary>
+        <member name="F:OpenMetaverse.ScriptPermission.ControlCamera">
+            <summary>Script wants to control your camera</summary>
         </member>
-        <member name="T:OpenMetaverse.Avatar.Statistics">
+        <member name="F:OpenMetaverse.ScriptPermission.Teleport">
+            <summary>Script wants the ability to teleport you</summary>
+        </member>
+        <member name="T:OpenMetaverse.InstantMessageDialog">
             <summary>
-            Positive and negative ratings
+            Special commands used in Instant Messages
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.BehaviorPositive">
-            <summary>Positive ratings for Behavior</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.MessageFromAgent">
+            <summary>Indicates a regular IM from another agent</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.BehaviorNegative">
-            <summary>Negative ratings for Behavior</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.MessageBox">
+            <summary>Simple notification box with an OK button</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.AppearancePositive">
-            <summary>Positive ratings for Appearance</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupInvitation">
+            <summary>You've been invited to join a group.</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.AppearanceNegative">
-            <summary>Negative ratings for Appearance</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.InventoryOffered">
+            <summary>Inventory offer</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.BuildingPositive">
-            <summary>Positive ratings for Building</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.InventoryAccepted">
+            <summary>Accepted inventory offer</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.BuildingNegative">
-            <summary>Negative ratings for Building</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.InventoryDeclined">
+            <summary>Declined inventory offer</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.GivenPositive">
-            <summary>Positive ratings given by this avatar</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupVote">
+            <summary>Group vote</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.GivenNegative">
-            <summary>Negative ratings given by this avatar</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryOffered">
+            <summary>An object is offering its inventory</summary>
         </member>
-        <member name="T:OpenMetaverse.Avatar.AvatarProperties">
-            <summary>
-            Avatar properties including about text, profile URL, image IDs and 
-            publishing settings
-            </summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryAccepted">
+            <summary>Accept an inventory offer from an object</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.FirstLifeText">
-            <summary>First Life about text</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryDeclined">
+            <summary>Decline an inventory offer from an object</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.FirstLifeImage">
-            <summary>First Life image ID</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.NewUserDefault">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.Partner">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionAdd">
+            <summary>Start a session, or add users to a session</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.AboutText">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionOfflineAdd">
+            <summary>Start a session, but don't prune offline users</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.BornOn">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionGroupStart">
+            <summary>Start a session with your group</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.CharterMember">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionCardlessStart">
+            <summary>Start a session without a calling card (finder or objects)</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.ProfileImage">
-            <summary>Profile image ID</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionSend">
+            <summary>Send a message to a session</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.Flags">
-            <summary>Flags of the profile</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionDrop">
+            <summary>Leave a session</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.ProfileURL">
-            <summary>Web URL for this profile</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.MessageFromObject">
+            <summary>Indicates that the IM is from an object</summary>
         </member>
-        <member name="P:OpenMetaverse.Avatar.AvatarProperties.AllowPublish">
-            <summary>Should this profile be published on the web</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.BusyAutoResponse">
+            <summary>Sent an IM to a busy user, this is the auto response</summary>
         </member>
-        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Online">
-            <summary>Avatar Online Status</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.ConsoleAndChatHistory">
+            <summary>Shows the message in the console and chat history</summary>
         </member>
-        <member name="P:OpenMetaverse.Avatar.AvatarProperties.MaturePublish">
-            <summary>Is this a mature profile</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.RequestTeleport">
+            <summary>Send a teleport lure</summary>
         </member>
-        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Identified">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.AcceptTeleport">
+            <summary>Response sent to the agent which inititiated a teleport invitation</summary>
         </member>
-        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Transacted">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.DenyTeleport">
+            <summary>Response sent to the agent which inititiated a teleport invitation</summary>
         </member>
-        <member name="T:OpenMetaverse.Avatar.Interests">
-            <summary>
-            Avatar interests including spoken languages, skills, and "want to"
-            choices
-            </summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GodLikeRequestTeleport">
+            <summary>Only useful if you have Linden permissions</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Interests.LanguagesText">
-            <summary>Languages profile field</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.RequestLure">
+            <summary>Request a teleport lure</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Interests.SkillsMask">
-            <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.Avatar.Interests.SkillsText">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.Session911Start">
+            <summary>IM for help</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Interests.WantToMask">
-            <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.Avatar.Interests.WantToText">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.FromTaskAsAlert">
+            <summary>Like an IM but won't go to email</summary>
         </member>
-        <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 name="F:OpenMetaverse.InstantMessageDialog.GroupNotice">
+            <summary>IM from a group officer to all group members</summary>
         </member>
-        <member name="T:OpenMetaverse.MediaPermission">
-            <summary>
-            Permissions for control of object media
-            </summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNoticeInventoryAccepted">
+            <summary>Unknown</summary>
         </member>
-        <member name="T:OpenMetaverse.MediaControls">
-            <summary>
-            Style of cotrols that shold be displayed to the user
-            </summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNoticeInventoryDeclined">
+            <summary>Unknown</summary>
         </member>
-        <member name="T:OpenMetaverse.MediaEntry">
-            <summary>
-            Class representing media data for a single face
-            </summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupInvitationAccept">
+            <summary>Accept a group invitation</summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.EnableAlterntiveImage">
-            <summary>Is display of the alternative image enabled</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupInvitationDecline">
+            <summary>Decline a group invitation</summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.AutoLoop">
-            <summary>Should media auto loop</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNoticeRequested">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.AutoPlay">
-            <summary>Shoule media be auto played</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipOffered">
+            <summary>An avatar is offering you friendship</summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.AutoScale">
-            <summary>Auto scale media to prim face</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipAccepted">
+            <summary>An avatar has accepted your friendship offer</summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.AutoZoom">
-            <summary>Should viewer automatically zoom in on the face when clicked</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipDeclined">
+            <summary>An avatar has declined your friendship offer</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.InstantMessageDialog.StartTyping">
+            <summary>Indicates that a user has started typing</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.InstantMessageDialog.StopTyping">
+            <summary>Indicates that a user has stopped typing</summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.HomeURL">
-            <summary>Starting URL for the media</summary>
+        <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.MediaEntry.CurrentURL">
-            <summary>Currently navigated URL</summary>
+        <member name="F:OpenMetaverse.InstantMessageOnline.Online">
+            <summary>Only deliver to online avatars</summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.Height">
-            <summary>Media height in pixes</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.MediaEntry.Width">
-            <summary>Media width in pixels</summary>
+        <member name="T:OpenMetaverse.ChatType">
+            <summary>
+            Conversion type to denote Chat Packet types in an easier-to-understand format
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.ControlPermissions">
-            <summary>Who can controls the media</summary>
+        <member name="F:OpenMetaverse.ChatType.Whisper">
+            <summary>Whisper (5m radius)</summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.InteractPermissions">
-            <summary>Who can interact with the media</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.MediaEntry.EnableWhiteList">
-            <summary>Is URL whitelist enabled</summary>
+        <member name="F:OpenMetaverse.ChatType.Shout">
+            <summary>Shouting! (100m radius)</summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.WhiteList">
-            <summary>Array of URLs that are whitelisted</summary>
+        <member name="F:OpenMetaverse.ChatType.StartTyping">
+            <summary>Event message when an Avatar has begun to type</summary>
         </member>
-        <member name="M:OpenMetaverse.MediaEntry.GetOSD">
-            <summary>
-            Serialize to OSD
-            </summary>
-            <returns>OSDMap with the serialized data</returns>
+        <member name="F:OpenMetaverse.ChatType.StopTyping">
+            <summary>Event message when an Avatar has stopped typing</summary>
         </member>
-        <member name="M:OpenMetaverse.MediaEntry.FromOSD(OpenMetaverse.StructuredData.OSD)">
-            <summary>
-            Deserialize from OSD data
-            </summary>
-            <param name="osd">Serialized OSD data</param>
-            <returns>Deserialized object</returns>
+        <member name="F:OpenMetaverse.ChatType.Debug">
+            <summary>Send the message to the debug channel</summary>
         </member>
-        <member name="T:OpenMetaverse.VisualColorOperation">
-            <summary>
-            Operation to apply when applying color to texture
-            </summary>
+        <member name="F:OpenMetaverse.ChatType.OwnerSay">
+            <summary>Event message when an object uses llOwnerSay</summary>
         </member>
-        <member name="T:OpenMetaverse.VisualColorParam">
-            <summary>
-            Information needed to translate visual param value to RGBA color
-            </summary>
+        <member name="F:OpenMetaverse.ChatType.RegionSay">
+            <summary>Special value to support llRegionSay, never sent to the client</summary>
         </member>
-        <member name="M:OpenMetaverse.VisualColorParam.#ctor(OpenMetaverse.VisualColorOperation,OpenMetaverse.Color4[])">
+        <member name="T:OpenMetaverse.ChatSourceType">
             <summary>
-            Construct VisualColorParam
+            Identifies the source of a chat message
             </summary>
-            <param name="operation">Operation to apply when applying color to texture</param>
-            <param name="colors">Colors</param>
         </member>
-        <member name="T:OpenMetaverse.VisualAlphaParam">
+        <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">
             <summary>
-            Represents alpha blending and bump infor for a visual parameter
-            such as sleive length
+            
             </summary>
         </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 name="F:OpenMetaverse.ChatAudibleLevel.Not">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualAlphaParam.SkipIfZero">
-            <summary>Skip blending if parameter value is 0</summary>
+        <member name="F:OpenMetaverse.ChatAudibleLevel.Barely">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualAlphaParam.MultiplyBlend">
-            <summary>Use miltiply insted of alpha blending</summary>
+        <member name="F:OpenMetaverse.ChatAudibleLevel.Fully">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.VisualAlphaParam.#ctor(System.Single,System.String,System.Boolean,System.Boolean)">
+        <member name="T:OpenMetaverse.EffectType">
             <summary>
-            Create new alhpa information for a visual param
+            Effect type used in ViewerEffect packets
             </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="T:OpenMetaverse.VisualParam">
-            <summary>
-            A single visual characteristic of an avatar mesh, such as eyebrow height
-            </summary>
+        <member name="F:OpenMetaverse.EffectType.Text">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.ParamID">
-            <summary>Index of this visual param</summary>
+        <member name="F:OpenMetaverse.EffectType.Icon">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.Name">
-            <summary>Internal name</summary>
+        <member name="F:OpenMetaverse.EffectType.Connector">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.Group">
-            <summary>Group ID this parameter belongs to</summary>
+        <member name="F:OpenMetaverse.EffectType.FlexibleObject">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.Wearable">
-            <summary>Name of the wearable this parameter belongs to</summary>
+        <member name="F:OpenMetaverse.EffectType.AnimalControls">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.Label">
-            <summary>Displayable label of this characteristic</summary>
+        <member name="F:OpenMetaverse.EffectType.AnimationObject">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.LabelMin">
-            <summary>Displayable label for the minimum value of this characteristic</summary>
+        <member name="F:OpenMetaverse.EffectType.Cloth">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.LabelMax">
-            <summary>Displayable label for the maximum value of this characteristic</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.VisualParam.DefaultValue">
-            <summary>Default value</summary>
+        <member name="F:OpenMetaverse.EffectType.Glow">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.MinValue">
-            <summary>Minimum value</summary>
+        <member name="F:OpenMetaverse.EffectType.Point">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.MaxValue">
-            <summary>Maximum value</summary>
+        <member name="F:OpenMetaverse.EffectType.Trail">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.IsBumpAttribute">
-            <summary>Is this param used for creation of bump layer?</summary>
+        <member name="F:OpenMetaverse.EffectType.Sphere">
+            <summary>Create a swirl of particles around an object</summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.AlphaParams">
-            <summary>Alpha blending/bump info</summary>
+        <member name="F:OpenMetaverse.EffectType.Spiral">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.ColorParams">
-            <summary>Color information</summary>
+        <member name="F:OpenMetaverse.EffectType.Edit">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.Drivers">
-            <summary>Array of param IDs that are drivers for this parameter</summary>
+        <member name="F:OpenMetaverse.EffectType.LookAt">
+            <summary>Cause an avatar to look at an object</summary>
         </member>
-        <member name="M:OpenMetaverse.VisualParam.#ctor(System.Int32,System.String,System.Int32,System.String,System.String,System.String,System.String,System.Single,System.Single,System.Single,System.Boolean,System.Int32[],System.Nullable{OpenMetaverse.VisualAlphaParam},System.Nullable{OpenMetaverse.VisualColorParam})">
-            <summary>
-            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 name="F:OpenMetaverse.EffectType.PointAt">
+            <summary>Cause an avatar to point at an object</summary>
         </member>
-        <member name="T:OpenMetaverse.VisualParams">
+        <member name="T:OpenMetaverse.LookAtType">
             <summary>
-            Holds the Params array of all the avatar appearance parameters
+            The action an avatar is doing when looking at something, used in 
+            ViewerEffect packets for the LookAt effect
             </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.LookAtType.None">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InternalDictionary`2.Dictionary">
-            <summary>Internal dictionary that this class wraps around. Do not
-            modify or enumerate the contents of this dictionary without locking
-            on this member</summary>
+        <member name="F:OpenMetaverse.LookAtType.Idle">
+            <summary></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>
-            <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 name="F:OpenMetaverse.LookAtType.AutoListen">
+            <summary></summary>
         </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 name="F:OpenMetaverse.LookAtType.FreeLook">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InternalDictionary`2.#ctor(System.Int32)">
-            <summary>
-            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 name="F:OpenMetaverse.LookAtType.Respond">
+            <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="F:OpenMetaverse.LookAtType.Hover">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InternalDictionary`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 InternalDictionary
-            // with the ID 95683496
-            uint findID = 95683496;
-            Primitive findPrim = sim.ObjectsPrimitives.Find(
-                        delegate(Primitive prim) { return prim.ID == findID; });
-            </code>
-            </example>
+        <member name="F:OpenMetaverse.LookAtType.Conversation">
+            <summary>Deprecated</summary>
         </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.LookAtType.Select">
+            <summary></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.LookAtType.Focus">
+            <summary></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.LookAtType.Mouselook">
+            <summary></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.LookAtType.Clear">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InternalDictionary`2.ForEach(System.Action{System.Collections.Generic.KeyValuePair{`0,`1}})">
+        <member name="T:OpenMetaverse.PointAtType">
             <summary>
-            Perform an <seealso cref="T:System.Action"/> on each KeyValuePair of an <seealso cref="T:OpenMetaverse.InternalDictionary"/>
+            The action an avatar is doing when pointing at something, used in
+            ViewerEffect packets for the PointAt effect
             </summary>
-            <param name="action"><seealso cref="T:System.Action"/> to perform</param>
         </member>
-        <member name="M:OpenMetaverse.InternalDictionary`2.ContainsKey(`0)">
-            <summary>Check if Key exists in Dictionary</summary>
-            <param name="key">Key to check for</param>
-            <returns><see langword="true"/> if found, <see langword="false"/> otherwise</returns>
+        <member name="F:OpenMetaverse.PointAtType.None">
+            <summary></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.PointAtType.Select">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InternalDictionary`2.Add(`0,`1)">
+        <member name="F:OpenMetaverse.PointAtType.Grab">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.PointAtType.Clear">
+            <summary></summary>
+        </member>
+        <member name="T:OpenMetaverse.MoneyTransactionType">
             <summary>
-            Adds the specified key to the dictionary, dictionary locking is not performed, 
-            <see cref="!:SafeAdd"/>
+            Money transaction types
             </summary>
-            <param name="key">The key</param>
-            <param name="value">The value</param>
         </member>
-        <member name="M:OpenMetaverse.InternalDictionary`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 name="F:OpenMetaverse.MoneyTransactionType.None">
+            <summary></summary>
         </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.MoneyTransactionType.FailSimulatorTimeout">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.InternalDictionary`2.Item(`0)">
-            <summary>
-            Indexer for the dictionary
-            </summary>
-            <param name="key">The key</param>
-            <returns>The value</returns>
+        <member name="F:OpenMetaverse.MoneyTransactionType.FailDataserverTimeout">
+            <summary></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.MoneyTransactionType.ObjectClaim">
+            <summary></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.MoneyTransactionType.LandClaim">
+            <summary></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.MoneyTransactionType.GroupCreate">
+            <summary></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.MoneyTransactionType.ObjectPublicClaim">
+            <summary></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.MoneyTransactionType.GroupJoin">
+            <summary></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.MoneyTransactionType.TeleportCharge">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.StartDaemon(System.String,System.String)">
-            <summary>
-            Starts a thread that keeps the daemon running
-            </summary>
-            <param name="path"></param>
-            <param name="args"></param>
+        <member name="F:OpenMetaverse.MoneyTransactionType.UploadCharge">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.StopDaemon">
-            <summary>
-            Stops the daemon and the thread keeping it running
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandAuction">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectToDaemon(System.String,System.Int32)">
-            <summary>
-            
-            </summary>
-            <param name="address"></param>
-            <param name="port"></param>
-            <returns></returns>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ClassifiedCharge">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxGetCaptureDevices">
-            <summary>
-            This is used to get a list of audio devices that can be used for capture (input) of voice.
-            </summary>
-            <returns></returns>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectTax">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxGetRenderDevices">
-            <summary>
-            This is used to get a list of audio devices that can be used for render (playback) of voice.
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandTax">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.MoneyTransactionType.LightTax">
+            <summary></summary>
         </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.MoneyTransactionType.ParcelDirFee">
+            <summary></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.MoneyTransactionType.GroupTax">
+            <summary></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.MoneyTransactionType.ClassifiedRenew">
+            <summary></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.MoneyTransactionType.GiveInventory">
+            <summary></summary>
         </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.MoneyTransactionType.ObjectSale">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.MoneyTransactionType.Gift">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.MoneyTransactionType.LandSale">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.MoneyTransactionType.ReferBonus">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.MoneyTransactionType.InventorySale">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.MoneyTransactionType.RefundPurchase">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.MoneyTransactionType.LandPassSale">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.MoneyTransactionType.DwellBonus">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.Start">
-            <summary>
-            Start up the Voice service.
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.PayObject">
+            <summary></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 name="F:OpenMetaverse.MoneyTransactionType.ObjectPays">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.Dispose">
-            <summary>
-            Cleanup oject resources
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupLandDeed">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.Network_EventQueueRunning(System.Object,OpenMetaverse.EventQueueRunningEventArgs)">
-            <summary>
-            Request voice cap when changing regions
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupObjectDeed">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnSessionStateChangeEvent(System.Object,OpenMetaverse.Voice.VoiceGateway.SessionStateChangeEventArgs)">
-            <summary>
-            Handle a change in session state
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupLiability">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.CloseSession(System.String)">
-            <summary>
-            Close a voice session
-            </summary>
-            <param name="sessionHandle"></param>
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupDividend">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.MoneyTransactionType.GroupMembershipDues">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.MoneyTransactionType.ObjectRelease">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnDaemonRunning">
-            <summary>
-            Daemon has started so connect to it.
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandRelease">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnDaemonConnected">
-            <summary>
-            The daemon TCP connection is open.
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectDelete">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnConnectorCreateResponse(System.Object,OpenMetaverse.Voice.VoiceGateway.VoiceConnectorEventArgs)">
-            <summary>
-            Handle creation of the Connector.
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicDecay">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnAuxGetRenderDevicesResponse(System.Object,OpenMetaverse.Voice.VoiceGateway.VoiceDevicesEventArgs)">
-            <summary>
-            Handle response to audio output device query
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicDelete">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnAuxGetCaptureDevicesResponse(System.Object,OpenMetaverse.Voice.VoiceGateway.VoiceDevicesEventArgs)">
-            <summary>
-            Handle response to audio input device query
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.LindenAdjustment">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.ParcelChanged">
-             <summary>
-             Set voice channel for new parcel
-             </summary>
-            
+        <member name="F:OpenMetaverse.MoneyTransactionType.LindenGrant">
+            <summary></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 name="F:OpenMetaverse.MoneyTransactionType.LindenPenalty">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.MoneyTransactionType.EventFee">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.UpdatePosition(OpenMetaverse.AgentManager)">
-            <summary>
-            Tell Vivox where we are standing
-            </summary>
-            <remarks>This has to be called when we move or turn.</remarks>
+        <member name="F:OpenMetaverse.MoneyTransactionType.EventPrize">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.PosUpdating(System.Boolean)">
-            <summary>
-            Start and stop updating out position.
-            </summary>
-            <param name="go"></param>
+        <member name="F:OpenMetaverse.MoneyTransactionType.StipendBasic">
+            <summary></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.MoneyTransactionType.StipendDeveloper">
+            <summary></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.MoneyTransactionType.StipendAlways">
+            <summary></summary>
         </member>
-        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnVoiceResponse">
+        <member name="F:OpenMetaverse.MoneyTransactionType.StipendDaily">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.MoneyTransactionType.StipendRating">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.MoneyTransactionType.StipendDelta">
+            <summary></summary>
+        </member>
+        <member name="T:OpenMetaverse.TransactionFlags">
             <summary>
-            Event for most mundane request reposnses.
+            
             </summary>
         </member>
-        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnConnectorCreateResponse">
-            <summary>Response to Connector.Create request</summary>
+        <member name="F:OpenMetaverse.TransactionFlags.None">
+            <summary></summary>
         </member>
-        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnAuxGetCaptureDevicesResponse">
-            <summary>Response to Aux.GetCaptureDevices request</summary>
+        <member name="F:OpenMetaverse.TransactionFlags.SourceGroup">
+            <summary></summary>
         </member>
-        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnAuxGetRenderDevicesResponse">
-            <summary>Response to Aux.GetRenderDevices request</summary>
+        <member name="F:OpenMetaverse.TransactionFlags.DestGroup">
+            <summary></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.TransactionFlags.OwnerGroup">
+            <summary></summary>
         </member>
-        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnAccountLoginResponse">
-            <summary>Response to Account.Login request</summary>
+        <member name="F:OpenMetaverse.TransactionFlags.SimultaneousContribution">
+            <summary></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.TransactionFlags.ContributionRemoval">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.Voice.VoiceGateway.CaptureDevices">
+        <member name="T:OpenMetaverse.MeanCollisionType">
             <summary>
-            List of audio input devices
+            
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Voice.VoiceGateway.PlaybackDevices">
-            <summary>
-            List of audio output devices
-            </summary>
+        <member name="F:OpenMetaverse.MeanCollisionType.None">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.Voice.VoiceGateway.TestMode">
-            <summary>
-            Set audio test mode
-            </summary>
+        <member name="F:OpenMetaverse.MeanCollisionType.Bump">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.Enabled">
-            <summary>Enable logging</summary>
+        <member name="F:OpenMetaverse.MeanCollisionType.LLPushObject">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.Folder">
-            <summary>The folder where any logs will be created</summary>
+        <member name="F:OpenMetaverse.MeanCollisionType.SelectedObjectCollide">
+            <summary></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.MeanCollisionType.ScriptedObjectCollide">
+            <summary></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.MeanCollisionType.PhysicalObjectCollide">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.LogLevel">
+        <member name="T:OpenMetaverse.ScriptControlChange">
             <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
+            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="M:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.#ctor">
-            <summary>
-            Constructor for default logging settings
-            </summary>
+        <member name="F:OpenMetaverse.ScriptControlChange.None">
+            <summary>No Flags set</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 name="F:OpenMetaverse.ScriptControlChange.Forward">
+            <summary>Forward (W or up Arrow)</summary>
         </member>
-        <member name="T:OpenMetaverse.Rendering.IRendering">
-            <summary>
-            Abstract base for rendering plugins
-            </summary>
+        <member name="F:OpenMetaverse.ScriptControlChange.Back">
+            <summary>Back (S or down arrow)</summary>
         </member>
-        <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 name="F:OpenMetaverse.ScriptControlChange.Left">
+            <summary>Move left (shift+A or left arrow)</summary>
         </member>
-        <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 name="F:OpenMetaverse.ScriptControlChange.Right">
+            <summary>Move right (shift+D or right arrow)</summary>
         </member>
-        <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 name="F:OpenMetaverse.ScriptControlChange.Up">
+            <summary>Up (E or PgUp)</summary>
         </member>
-        <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 name="F:OpenMetaverse.ScriptControlChange.Down">
+            <summary>Down (C or PgDown)</summary>
+        </member>
+        <member name="F:OpenMetaverse.ScriptControlChange.RotateLeft">
+            <summary>Rotate left (A or left arrow)</summary>
+        </member>
+        <member name="F:OpenMetaverse.ScriptControlChange.RotateRight">
+            <summary>Rotate right (D or right arrow)</summary>
+        </member>
+        <member name="F:OpenMetaverse.ScriptControlChange.LeftButton">
+            <summary>Left Mouse Button</summary>
         </member>
-        <member name="M:OpenMetaverse.Rendering.IRendering.TransformTexCoords(System.Collections.Generic.List{OpenMetaverse.Rendering.Vertex},OpenMetaverse.Vector3,OpenMetaverse.Primitive.TextureEntryFace)">
+        <member name="F:OpenMetaverse.ScriptControlChange.MouseLookLeftButton">
+            <summary>Left Mouse button in MouseLook</summary>
+        </member>
+        <member name="T:OpenMetaverse.AgentFlags">
             <summary>
-            Apply texture coordinate modifications from a
-            <seealso cref="!:TextureEntryFace"/> to a list of vertices
+            Currently only used to hide your group title
             </summary>
-            <param name="vertices">Vertex list to modify texture coordinates for</param>
-            <param name="center">Center-point of the face</param>
-            <param name="teFace">Face texture parameters</param>
         </member>
-        <member name="T:OpenMetaverse.Sounds">
+        <member name="F:OpenMetaverse.AgentFlags.None">
+            <summary>No flags set</summary>
+        </member>
+        <member name="F:OpenMetaverse.AgentFlags.HideTitle">
+            <summary>Hide your group title</summary>
+        </member>
+        <member name="T:OpenMetaverse.AgentState">
             <summary>
-            pre-defined built in sounds
+            Action state of the avatar, which can currently be typing and
+            editing
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.BELL_TING">
+        <member name="F:OpenMetaverse.AgentState.None">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.CLICK">
+        <member name="F:OpenMetaverse.AgentState.Typing">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.HEALTH_REDUCTION_FEMALE">
+        <member name="F:OpenMetaverse.AgentState.Editing">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.HEALTH_REDUCTION_MALE">
-            <summary></summary>
+        <member name="T:OpenMetaverse.TeleportStatus">
+            <summary>
+            Current teleport status
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.IM_START">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TeleportStatus.None">
+            <summary>Unknown status</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.INSTANT_MESSAGE_NOTIFICATION">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TeleportStatus.Start">
+            <summary>Teleport initialized</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.INVALID_OPERATION">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TeleportStatus.Progress">
+            <summary>Teleport in progress</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.KEYBOARD_LOOP">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TeleportStatus.Failed">
+            <summary>Teleport failed</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.MONEY_REDUCTION_COINS">
-            <summary>coins</summary>
+        <member name="F:OpenMetaverse.TeleportStatus.Finished">
+            <summary>Teleport completed</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.MONEY_INCREASE_CASH_REGISTER_BELL">
-            <summary>cash register bell</summary>
+        <member name="F:OpenMetaverse.TeleportStatus.Cancelled">
+            <summary>Teleport cancelled</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.NULL_KEYSTROKE">
-            <summary></summary>
+        <member name="T:OpenMetaverse.TeleportFlags">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION">
+        <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">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_RUBBER">
-            <summary>rubber</summary>
+        <member name="F:OpenMetaverse.TeleportFlags.ViaLure">
+            <summary>Via Lure</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_PLASTIC">
-            <summary>plastic</summary>
+        <member name="F:OpenMetaverse.TeleportFlags.ViaLandmark">
+            <summary>Via Landmark</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_FLESH">
-            <summary>flesh</summary>
+        <member name="F:OpenMetaverse.TeleportFlags.ViaLocation">
+            <summary>Via Location</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_WOOD_SPLINTERING">
-            <summary>wood splintering?</summary>
+        <member name="F:OpenMetaverse.TeleportFlags.ViaHome">
+            <summary>Via Home</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_GLASS_BREAK">
-            <summary>glass break</summary>
+        <member name="F:OpenMetaverse.TeleportFlags.ViaTelehub">
+            <summary>Via Telehub</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_METAL_CLUNK">
-            <summary>metal clunk</summary>
+        <member name="F:OpenMetaverse.TeleportFlags.ViaLogin">
+            <summary>Via Login</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_CREATE_WHOOSH">
-            <summary>whoosh</summary>
+        <member name="F:OpenMetaverse.TeleportFlags.ViaGodlikeLure">
+            <summary>Linden Summoned</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_DELETE_SHAKE">
-            <summary>shake</summary>
+        <member name="F:OpenMetaverse.TeleportFlags.Godlike">
+            <summary>Linden Forced me</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_REZ">
+        <member name="F:OpenMetaverse.TeleportFlags.NineOneOne">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_APPEAR_DING">
-            <summary>ding</summary>
+        <member name="F:OpenMetaverse.TeleportFlags.DisableCancel">
+            <summary>Agent Teleported Home via Script</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT">
+        <member name="F:OpenMetaverse.TeleportFlags.ViaRegionID">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT1">
+        <member name="F:OpenMetaverse.TeleportFlags.IsFlying">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT2">
+        <member name="F:OpenMetaverse.TeleportFlags.ResetHome">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT3">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TeleportFlags.ForceRedirect">
+            <summary>forced to new location for example when avatar is banned or ejected</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT4">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaLure">
+            <summary>Teleport Finished via a Lure</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT5">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaNewSim">
+            <summary>Finished, Sim Changed</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT6">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaSameSim">
+            <summary>Finished, Same Sim</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT7">
+        <member name="T:OpenMetaverse.TeleportLureFlags">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.TeleportLureFlags.NormalLure">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.SNAPSHOT">
+        <member name="F:OpenMetaverse.TeleportLureFlags.GodlikeLure">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.TELEPORT_TEXTURE_APPLY">
+        <member name="F:OpenMetaverse.TeleportLureFlags.GodlikePursuit">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.THUNDER">
+        <member name="T:OpenMetaverse.ScriptSensorTypeFlags">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Agent">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.WINDOW_CLOSE">
+        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Active">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.WINDOW_OPEN">
+        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Passive">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.ZIPPER">
+        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Scripted">
             <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Sounds.ToDictionary">
+        <member name="T:OpenMetaverse.MuteType">
             <summary>
-            A dictionary containing all pre-defined sounds
+            Type of mute entry
             </summary>
-            <returns>A dictionary containing the pre-defined sounds, 
-            where the key is the sounds ID, and the value is a string
-            containing a name to identify the purpose of the sound</returns>
         </member>
-        <member name="T:OpenMetaverse.RegionFlags">
-            <summary>
-            Simulator (region) properties
-            </summary>
+        <member name="F:OpenMetaverse.MuteType.ByName">
+            <summary>Object muted by name</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.None">
-            <summary>No flags set</summary>
+        <member name="F:OpenMetaverse.MuteType.Resident">
+            <summary>Muted residet</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.AllowDamage">
-            <summary>Agents can take damage and be killed</summary>
+        <member name="F:OpenMetaverse.MuteType.Object">
+            <summary>Object muted by UUID</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.AllowLandmark">
-            <summary>Landmarks can be created here</summary>
+        <member name="F:OpenMetaverse.MuteType.Group">
+            <summary>Muted group</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.AllowSetHome">
-            <summary>Home position can be set in this sim</summary>
+        <member name="F:OpenMetaverse.MuteType.External">
+            <summary>Muted external entry</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.ResetHomeOnTeleport">
-            <summary>Home position is reset when an agent teleports away</summary>
+        <member name="T:OpenMetaverse.MuteFlags">
+            <summary>
+            Flags of mute entry
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.SunFixed">
-            <summary>Sun does not move</summary>
+        <member name="F:OpenMetaverse.MuteFlags.Default">
+            <summary>No exceptions</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.TaxFree">
-            <summary>No object, land, etc. taxes</summary>
+        <member name="F:OpenMetaverse.MuteFlags.TextChat">
+            <summary>Don't mute text chat</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.BlockTerraform">
-            <summary>Disable heightmap alterations (agents can still plant
-            foliage)</summary>
+        <member name="F:OpenMetaverse.MuteFlags.VoiceChat">
+            <summary>Don't mute voice chat</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.BlockLandResell">
-            <summary>Land cannot be released, sold, or purchased</summary>
+        <member name="F:OpenMetaverse.MuteFlags.Particles">
+            <summary>Don't mute particles</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.Sandbox">
-            <summary>All content is wiped nightly</summary>
+        <member name="F:OpenMetaverse.MuteFlags.ObjectSounds">
+            <summary>Don't mute sounds</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 name="F:OpenMetaverse.MuteFlags.All">
+            <summary>Don't mute</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 name="T:OpenMetaverse.InstantMessage">
+            <summary>
+            Instant Message
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.SkipUpdateInterestList">
-            <summary>Region does not update agent prim interest lists. Internal debugging option.</summary>
+        <member name="F:OpenMetaverse.InstantMessage.FromAgentID">
+            <summary>Key of sender</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.SkipCollisions">
-            <summary>No collision detection for non-agent objects</summary>
+        <member name="F:OpenMetaverse.InstantMessage.FromAgentName">
+            <summary>Name of sender</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.SkipScripts">
-            <summary>No scripts are ran</summary>
+        <member name="F:OpenMetaverse.InstantMessage.ToAgentID">
+            <summary>Key of destination avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.SkipPhysics">
-            <summary>All physics processing is turned off</summary>
+        <member name="F:OpenMetaverse.InstantMessage.ParentEstateID">
+            <summary>ID of originating estate</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 name="F:OpenMetaverse.InstantMessage.RegionID">
+            <summary>Key of originating region</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.MainlandVisible">
-            <summary>Region can be seen from mainland on world map. (Legacy world map option?) </summary>
+        <member name="F:OpenMetaverse.InstantMessage.Position">
+            <summary>Coordinates in originating region</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 name="F:OpenMetaverse.InstantMessage.Dialog">
+            <summary>Instant message type</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.NoFly">
-            <summary>Flight is disabled (not currently enforced by the sim)</summary>
+        <member name="F:OpenMetaverse.InstantMessage.GroupIM">
+            <summary>Group IM session toggle</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.AllowDirectTeleport">
-            <summary>Allow direct (p2p) teleporting</summary>
+        <member name="F:OpenMetaverse.InstantMessage.IMSessionID">
+            <summary>Key of IM session, for Group Messages, the groups UUID</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.EstateSkipScripts">
-            <summary>Estate owner has temporarily disabled scripting</summary>
+        <member name="F:OpenMetaverse.InstantMessage.Timestamp">
+            <summary>Timestamp of the instant message</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.RestrictPushObject">
-            <summary>Restricts the usage of the LSL llPushObject function, applies to whole region.</summary>
+        <member name="F:OpenMetaverse.InstantMessage.Message">
+            <summary>Instant message text</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.DenyAnonymous">
-            <summary>Deny agents with no payment info on file</summary>
+        <member name="F:OpenMetaverse.InstantMessage.Offline">
+            <summary>Whether this message is held for offline avatars</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.DenyIdentified">
-            <summary>Deny agents with payment info on file</summary>
+        <member name="F:OpenMetaverse.InstantMessage.BinaryBucket">
+            <summary>Context specific packed data</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.DenyTransacted">
-            <summary>Deny agents who have made a monetary transaction</summary>
+        <member name="M:OpenMetaverse.InstantMessage.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.AllowParcelChanges">
-            <summary>Parcels within the region may be joined or divided by anyone, not just estate owners/managers. </summary>
+        <member name="T:OpenMetaverse.MuteEntry">
+            <summary>Represents muted object or resident</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 name="F:OpenMetaverse.MuteEntry.Type">
+            <summary>Type of the mute entry</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.AllowVoice">
-            <summary>Region is Voice Enabled</summary>
+        <member name="F:OpenMetaverse.MuteEntry.ID">
+            <summary>UUID of the mute etnry</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 name="F:OpenMetaverse.MuteEntry.Name">
+            <summary>Mute entry name</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.DenyAgeUnverified">
-            <summary>Deny agents who have not been age verified from entering the region.</summary>
+        <member name="F:OpenMetaverse.MuteEntry.Flags">
+            <summary>Mute flags</summary>
         </member>
-        <member name="T:OpenMetaverse.SimAccess">
-            <summary>
-            Access level for a simulator
-            </summary>
+        <member name="T:OpenMetaverse.TransactionInfo">
+            <summary>Transaction detail sent with MoneyBalanceReply message</summary>
         </member>
-        <member name="F:OpenMetaverse.SimAccess.Unknown">
-            <summary>Unknown or invalid access level</summary>
+        <member name="F:OpenMetaverse.TransactionInfo.TransactionType">
+            <summary>Type of the transaction</summary>
         </member>
-        <member name="F:OpenMetaverse.SimAccess.Trial">
-            <summary>Trial accounts allowed</summary>
+        <member name="F:OpenMetaverse.TransactionInfo.SourceID">
+            <summary>UUID of the transaction source</summary>
         </member>
-        <member name="F:OpenMetaverse.SimAccess.PG">
-            <summary>PG rating</summary>
+        <member name="F:OpenMetaverse.TransactionInfo.IsSourceGroup">
+            <summary>Is the transaction source a group</summary>
         </member>
-        <member name="F:OpenMetaverse.SimAccess.Mature">
-            <summary>Mature rating</summary>
+        <member name="F:OpenMetaverse.TransactionInfo.DestID">
+            <summary>UUID of the transaction destination</summary>
         </member>
-        <member name="F:OpenMetaverse.SimAccess.Adult">
-            <summary>Adult rating</summary>
+        <member name="F:OpenMetaverse.TransactionInfo.IsDestGroup">
+            <summary>Is transaction destination a group</summary>
         </member>
-        <member name="F:OpenMetaverse.SimAccess.Down">
-            <summary>Simulator is offline</summary>
+        <member name="F:OpenMetaverse.TransactionInfo.Amount">
+            <summary>Transaction amount</summary>
         </member>
-        <member name="F:OpenMetaverse.SimAccess.NonExistent">
-            <summary>Simulator does not exist</summary>
+        <member name="F:OpenMetaverse.TransactionInfo.ItemDescription">
+            <summary>Transaction description</summary>
         </member>
-        <member name="T:OpenMetaverse.Simulator">
+        <member name="T:OpenMetaverse.ChatEventArgs">
             <summary>
             
             </summary>
         </member>
-        <member name="T:OpenMetaverse.UDPBase">
+        <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="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="P:OpenMetaverse.ChatEventArgs.Simulator">
+            <summary>Get the simulator sending the message</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="P:OpenMetaverse.ChatEventArgs.Message">
+            <summary>Get the message sent</summary>
         </member>
-        <member name="M:OpenMetaverse.UDPBase.Start">
-            <summary>
-            
-            </summary>
+        <member name="P:OpenMetaverse.ChatEventArgs.AudibleLevel">
+            <summary>Get the audible level of the message</summary>
         </member>
-        <member name="M:OpenMetaverse.UDPBase.Stop">
-            <summary>
-            
-            </summary>
+        <member name="P:OpenMetaverse.ChatEventArgs.Type">
+            <summary>Get the type of message sent: whisper, shout, etc</summary>
         </member>
-        <member name="P:OpenMetaverse.UDPBase.IsRunning">
-            <summary>
-            
-            </summary>
+        <member name="P:OpenMetaverse.ChatEventArgs.SourceType">
+            <summary>Get the source type of the message sender</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.Client">
-            <summary>A public reference to the client that this Simulator object
-            is attached to</summary>
+        <member name="P:OpenMetaverse.ChatEventArgs.FromName">
+            <summary>Get the name of the agent or object sending the message</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.ID">
-            <summary>A Unique Cache identifier for this simulator</summary>
+        <member name="P:OpenMetaverse.ChatEventArgs.SourceID">
+            <summary>Get the ID of the agent or object sending the message</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.Caps">
-            <summary>The capabilities for this simulator</summary>
+        <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="F:OpenMetaverse.Simulator.Handle">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ChatEventArgs.Position">
+            <summary>Get the position of the agent or object sending the message</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimVersion">
-            <summary>The current version of software this simulator is running</summary>
+        <member name="T:OpenMetaverse.ScriptDialogEventArgs">
+            <summary>Contains the data sent when a primitive opens a dialog with this agent</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.Name">
-            <summary></summary>
+        <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="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="P:OpenMetaverse.ScriptDialogEventArgs.Message">
+            <summary>Get the dialog message</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.ParcelOverlaysReceived">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.ObjectName">
+            <summary>Get the name of the object that sent the dialog request</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange00">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.ImageID">
+            <summary>Get the ID of the image to be displayed</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange01">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.ObjectID">
+            <summary>Get the ID of the primitive sending the dialog</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange10">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.FirstName">
+            <summary>Get the first name of the senders owner</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange11">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.LastName">
+            <summary>Get the last name of the senders owner</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight00">
-            <summary></summary>
+        <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="F:OpenMetaverse.Simulator.TerrainStartHeight01">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.ButtonLabels">
+            <summary>Get the string labels containing the options presented in this dialog</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight10">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.OwnerID">
+            <summary>UUID of the scritped object owner</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight11">
-            <summary></summary>
+        <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="F:OpenMetaverse.Simulator.WaterHeight">
-            <summary></summary>
+        <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="F:OpenMetaverse.Simulator.SimOwner">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.Simulator">
+            <summary>Get the simulator containing the object sending the request</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainBase0">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.TaskID">
+            <summary>Get the ID of the script making the request</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainBase1">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.ItemID">
+            <summary>Get the ID of the primitive containing the script making the request</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainBase2">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.ObjectName">
+            <summary>Get the name of the primitive making the request</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainBase3">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.ObjectOwnerName">
+            <summary>Get the name of the owner of the object making the request</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainDetail0">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.Questions">
+            <summary>Get the permissions being requested</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainDetail1">
-            <summary></summary>
+        <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="F:OpenMetaverse.Simulator.TerrainDetail2">
-            <summary></summary>
+        <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="F:OpenMetaverse.Simulator.TerrainDetail3">
-            <summary></summary>
+        <member name="P:OpenMetaverse.LoadUrlEventArgs.ObjectName">
+            <summary>Get the name of the object sending the request</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.IsEstateManager">
-            <summary>true if your agent has Estate Manager rights on this region</summary>
+        <member name="P:OpenMetaverse.LoadUrlEventArgs.ObjectID">
+            <summary>Get the ID of the object sending the request</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.Flags">
-            <summary></summary>
+        <member name="P:OpenMetaverse.LoadUrlEventArgs.OwnerID">
+            <summary>Get the ID of the owner of the object sending the request</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.Access">
-            <summary></summary>
+        <member name="P:OpenMetaverse.LoadUrlEventArgs.OwnerIsGroup">
+            <summary>True if the object is owned by a group</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.BillableFactor">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.Stats">
-            <summary>Statistics information for this simulator and the
-            connection to the simulator, calculated by the simulator itself
-            and the library</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.RegionID">
-            <summary>The regions Unique ID</summary>
+        <member name="P:OpenMetaverse.LoadUrlEventArgs.Message">
+            <summary>Get the message sent with the request</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 name="P:OpenMetaverse.LoadUrlEventArgs.URL">
+            <summary>Get the URL the object sent</summary>
         </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 name="T:OpenMetaverse.InstantMessageEventArgs">
+            <summary>The date received from an ImprovedInstantMessage</summary>
         </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 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="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 name="P:OpenMetaverse.InstantMessageEventArgs.IM">
+            <summary>Get the InstantMessage object</summary>
         </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 name="P:OpenMetaverse.InstantMessageEventArgs.Simulator">
+            <summary>Get the simulator where the InstantMessage origniated</summary>
         </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="T:OpenMetaverse.BalanceEventArgs">
+            <summary>Contains the currency balance</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.ObjectsAvatars">
+        <member name="M:OpenMetaverse.BalanceEventArgs.#ctor(System.Int32)">
             <summary>
-            A thread-safe dictionary containing avatars in a simulator        
+            Construct a new BalanceEventArgs object
             </summary>
+            <param name="balance">The currenct balance</param>
         </member>
-        <member name="F:OpenMetaverse.Simulator.ObjectsPrimitives">
+        <member name="P:OpenMetaverse.BalanceEventArgs.Balance">
             <summary>
-            A thread-safe dictionary containing primitives in a simulator
+            Get the currenct balance
             </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="T:OpenMetaverse.MoneyBalanceReplyEventArgs">
+            <summary>Contains the transaction summary when an item is purchased, 
+            money is given, or land is purchased</summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.IsParcelMapFull">
+        <member name="M:OpenMetaverse.MoneyBalanceReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Boolean,System.Int32,System.Int32,System.Int32,System.String,OpenMetaverse.TransactionInfo)">
             <summary>
-            Checks simulator parcel map to make sure it has downloaded all data successfully
+            Construct a new instance of the MoneyBalanceReplyEventArgs object
             </summary>
-            <returns>true if map is full (contains no 0's)</returns>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.DisconnectCandidate">
-            <summary>Used internally to track sim disconnections</summary>
+            <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="F:OpenMetaverse.Simulator.ConnectedEvent">
-            <summary>Event that is triggered when the simulator successfully
-            establishes a connection</summary>
+        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.TransactionID">
+            <summary>Get the ID of the transaction</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 name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.Success">
+            <summary>True of the transaction was successful</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.avatarPositions">
-            <summary>Coarse locations of avatars in this simulator</summary>
+        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.Balance">
+            <summary>Get the remaining currency balance</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.preyID">
-            <summary>AvatarPositions key representing TrackAgent target</summary>
+        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.MetersCredit">
+            <summary>Get the meters credited</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.PacketArchive">
-            <summary>Sequence numbers of packets we've received
-            (for duplicate checking)</summary>
+        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.MetersCommitted">
+            <summary>Get the meters comitted</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.NeedAck">
-            <summary>Packets we sent out that need ACKs from the simulator</summary>
+        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.Description">
+            <summary>Get the description of the transaction</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.pauseSerial">
-            <summary>Sequence number for pause/resume</summary>
+        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.TransactionInfo">
+            <summary>Detailed transaction information</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.handshakeComplete">
-            <summary>Indicates if UDP connection to the sim is fully established</summary>
+        <member name="T:OpenMetaverse.AgentDataReplyEventArgs">
+            <summary>Data sent from the simulator containing information about your agent and active group information</summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.#ctor(OpenMetaverse.GridClient,System.Net.IPEndPoint,System.UInt64)">
+        <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="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="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="M:OpenMetaverse.Simulator.Dispose">
-            <summary>
-            Called when this Simulator object is being destroyed
-            </summary>
+        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.FirstName">
+            <summary>Get the agents first name</summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Connect(System.Boolean)">
-            <summary>
-            Attempt to connect to this simulator
-            </summary>
-            <param name="moveToSim">Whether to move our agent in to this sim or not</param>
-            <returns>True if the connection succeeded or connection status is
-            unknown, false if there was a failure</returns>
+        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.LastName">
+            <summary>Get the agents last name</summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.UseCircuitCode">
-            <summary>
-            Initiates connection to the simulator
-            </summary>
+        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.ActiveGroupID">
+            <summary>Get the active group ID of your agent</summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Disconnect(System.Boolean)">
-            <summary>
-            Disconnect from this simulator
-            </summary>
+        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.GroupTitle">
+            <summary>Get the active groups title of your agent</summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Pause">
-            <summary>
-            Instructs the simulator to stop sending update (and possibly other) packets
-            </summary>
+        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.GroupPowers">
+            <summary>Get the combined group powers of your agent</summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Resume">
-            <summary>
-            Instructs the simulator to resume sending update packets (unpause)
-            </summary>
+        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.GroupName">
+            <summary>Get the active group name of your agent</summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.TerrainHeightAtPoint(System.Int32,System.Int32,System.Single@)">
-            <summary>
-            Retrieve the terrain height at a given coordinate
-            </summary>
-            <param name="x">Sim X coordinate, valid range is from 0 to 255</param>
-            <param name="y">Sim Y coordinate, valid range is from 0 to 255</param>
-            <param name="height">The terrain height at the given point if the
-            lookup was successful, otherwise 0.0f</param>
-            <returns>True if the lookup was successful, otherwise false</returns>
+        <member name="T:OpenMetaverse.AnimationsChangedEventArgs">
+            <summary>Data sent by the simulator to indicate the active/changed animations
+            applied to your agent</summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.SendPacket(OpenMetaverse.Packets.Packet)">
+        <member name="M:OpenMetaverse.AnimationsChangedEventArgs.#ctor(OpenMetaverse.InternalDictionary{OpenMetaverse.UUID,System.Int32})">
             <summary>
-            Sends a packet
+            Construct a new instance of the AnimationsChangedEventArgs class
             </summary>
-            <param name="packet">Packet to be sent</param>
+            <param name="agentAnimations">The dictionary that contains the changed animations</param>
         </member>
-        <member name="M:OpenMetaverse.Simulator.SendPing">
-            <summary>
-            
-            </summary>
+        <member name="P:OpenMetaverse.AnimationsChangedEventArgs.Animations">
+            <summary>Get the dictionary that contains the changed animations</summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.ToString">
+        <member name="T:OpenMetaverse.MeanCollisionEventArgs">
             <summary>
-            Returns Simulator Name as a String
+            Data sent from a simulator indicating a collision with your agent
             </summary>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Simulator.GetHashCode">
+        <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>
-            <returns></returns>
+            <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="M:OpenMetaverse.Simulator.Equals(System.Object)">
-            <summary>
-            
-            </summary>
-            <param name="obj"></param>
-            <returns></returns>
+        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Type">
+            <summary>Get the Type of collision</summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.SendAcks">
-            <summary>
-            Sends out pending acknowledgements
-            </summary>
-            <returns>Number of ACKs sent</returns>
+        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Aggressor">
+            <summary>Get the ID of the agent or object that collided with your agent</summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.ResendUnacked">
-            <summary>
-            Resend unacknowledged packets
-            </summary>
+        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Victim">
+            <summary>Get the ID of the agent that was attacked</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="P:OpenMetaverse.MeanCollisionEventArgs.Magnitude">
+            <summary>A value indicating the strength of the collision</summary>
         </member>
-        <member name="P:OpenMetaverse.Simulator.IPEndPoint">
-            <summary>The IP address and port of the server</summary>
+        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Time">
+            <summary>Get the time the collision occurred</summary>
         </member>
-        <member name="P:OpenMetaverse.Simulator.Connected">
-            <summary>Whether there is a working connection to the simulator or 
-            not</summary>
-        </member>
-        <member name="P:OpenMetaverse.Simulator.AvatarPositions">
-            <summary>Coarse locations of avatars in this simulator</summary>
-        </member>
-        <member name="P:OpenMetaverse.Simulator.PreyID">
-            <summary>AvatarPositions key representing TrackAgent target</summary>
-        </member>
-        <member name="P:OpenMetaverse.Simulator.HandshakeComplete">
-            <summary>Indicates if UDP connection to the sim is fully established</summary>
+        <member name="T:OpenMetaverse.RegionCrossedEventArgs">
+            <summary>Data sent to your agent when it crosses region boundaries</summary>
         </member>
-        <member name="T:OpenMetaverse.Simulator.SimStats">
+        <member name="M:OpenMetaverse.RegionCrossedEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Simulator)">
             <summary>
-            Simulator Statistics
+            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="F:OpenMetaverse.Simulator.SimStats.SentPackets">
-            <summary>Total number of packets sent by this simulator to this agent</summary>
+        <member name="P:OpenMetaverse.RegionCrossedEventArgs.OldSimulator">
+            <summary>Get the simulator your agent just left</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.RecvPackets">
-            <summary>Total number of packets received by this simulator to this agent</summary>
+        <member name="P:OpenMetaverse.RegionCrossedEventArgs.NewSimulator">
+            <summary>Get the simulator your agent is now in</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.SentBytes">
-            <summary>Total number of bytes sent by this simulator to this agent</summary>
+        <member name="T:OpenMetaverse.GroupChatJoinedEventArgs">
+            <summary>Data sent from the simulator when your agent joins a group chat session</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.RecvBytes">
-            <summary>Total number of bytes received by this simulator to this agent</summary>
+        <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="F:OpenMetaverse.Simulator.SimStats.ConnectTime">
-            <summary>Time in seconds agent has been connected to simulator</summary>
+        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.SessionID">
+            <summary>Get the ID of the group chat session</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ResentPackets">
-            <summary>Total number of packets that have been resent</summary>
+        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.SessionName">
+            <summary>Get the name of the session</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ReceivedResends">
-            <summary>Total number of resent packets recieved</summary>
+        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.TmpSessionID">
+            <summary>Get the temporary session ID used for establishing new sessions</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.SentPings">
-            <summary>Total number of pings sent to this simulator by this agent</summary>
+        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.Success">
+            <summary>True if your agent successfully joined the session</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ReceivedPongs">
-            <summary>Total number of ping replies sent to this agent by this simulator</summary>
+        <member name="T:OpenMetaverse.AlertMessageEventArgs">
+            <summary>Data sent by the simulator containing urgent messages</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.IncomingBPS">
+        <member name="M:OpenMetaverse.AlertMessageEventArgs.#ctor(System.String)">
             <summary>
-            Incoming bytes per second
+            Construct a new instance of the AlertMessageEventArgs class
             </summary>
-            <remarks>It would be nice to have this claculated on the fly, but
-            this is far, far easier</remarks>
+            <param name="message">The alert message</param>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.OutgoingBPS">
+        <member name="P:OpenMetaverse.AlertMessageEventArgs.Message">
+            <summary>Get the alert message</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>
+        <member name="M:OpenMetaverse.ScriptControlEventArgs.#ctor(OpenMetaverse.ScriptControlChange,System.Boolean,System.Boolean)">
             <summary>
-            Outgoing bytes per second
+            Construct a new instance of the ScriptControlEventArgs class
             </summary>
-            <remarks>It would be nice to have this claculated on the fly, but
-            this is far, far easier</remarks>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.LastPingSent">
-            <summary>Time last ping was sent</summary>
+            <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="F:OpenMetaverse.Simulator.SimStats.LastPingID">
-            <summary>ID of last Ping sent</summary>
+        <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="F:OpenMetaverse.Simulator.SimStats.LastLag">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptControlEventArgs.Pass">
+            <summary>True if the script is passing controls back to the agent</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.MissedPings">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptControlEventArgs.Take">
+            <summary>True if the script is requesting controls be released to the script</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.Dilation">
-            <summary>Current time dilation of this simulator</summary>
+        <member name="T:OpenMetaverse.CameraConstraintEventArgs">
+            <summary>
+            Data sent from the simulator to an agent to indicate its view limits
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.FPS">
-            <summary>Current Frames per second of simulator</summary>
+        <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="F:OpenMetaverse.Simulator.SimStats.PhysicsFPS">
-            <summary>Current Physics frames per second of simulator</summary>
+        <member name="P:OpenMetaverse.CameraConstraintEventArgs.CollidePlane">
+            <summary>Get the collision plane</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.AgentUpdates">
-            <summary></summary>
+        <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="F:OpenMetaverse.Simulator.SimStats.FrameTime">
-            <summary></summary>
+        <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="F:OpenMetaverse.Simulator.SimStats.NetTime">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.RequestorID">
+            <summary>Get the ID of the primitive sending the sensor</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.PhysicsTime">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.GroupID">
+            <summary>Get the ID of the group associated with the primitive</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ImageTime">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Name">
+            <summary>Get the name of the primitive sending the sensor</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ScriptTime">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.ObjectID">
+            <summary>Get the ID of the primitive sending the sensor</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.AgentTime">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.OwnerID">
+            <summary>Get the ID of the owner of the primitive sending the sensor</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.OtherTime">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Position">
+            <summary>Get the position of the primitive sending the sensor</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.Objects">
-            <summary>Total number of objects Simulator is simulating</summary>
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Range">
+            <summary>Get the range the primitive specified to scan</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ScriptedObjects">
-            <summary>Total number of Active (Scripted) objects running</summary>
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Rotation">
+            <summary>Get the rotation of the primitive sending the sensor</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.Agents">
-            <summary>Number of agents currently in this simulator</summary>
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Type">
+            <summary>Get the type of sensor the primitive sent</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ChildAgents">
-            <summary>Number of agents in neighbor simulators</summary>
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Velocity">
+            <summary>Get the velocity of the primitive sending the sensor</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ActiveScripts">
-            <summary>Number of Active scripts running in this simulator</summary>
+        <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="F:OpenMetaverse.Simulator.SimStats.LSLIPS">
-            <summary></summary>
+        <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="F:OpenMetaverse.Simulator.SimStats.INPPS">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.ObjectID">
+            <summary>Get the ID of the primitive the agent will be sitting on</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.OUTPPS">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.Autopilot">
+            <summary>True if the simulator Autopilot functions were involved</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.PendingDownloads">
-            <summary>Number of downloads pending</summary>
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.CameraAtOffset">
+            <summary>Get the camera offset of the agent when seated</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.PendingUploads">
-            <summary>Number of uploads pending</summary>
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.CameraEyeOffset">
+            <summary>Get the camera eye offset of the agent when seated</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.VirtualSize">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.ForceMouselook">
+            <summary>True of the agent will be in mouselook mode when seated</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ResidentSize">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.SitPosition">
+            <summary>Get the position of the agent when seated</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.PendingLocalUploads">
-            <summary>Number of local uploads pending</summary>
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.SitRotation">
+            <summary>Get the rotation of the agent when seated</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.UnackedBytes">
-            <summary>Unacknowledged bytes in queue</summary>
+        <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="M:OpenMetaverse.WrappedObject`1.Dispose">
+        <member name="M:OpenMetaverse.ChatSessionMemberAddedEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Checks the instance back into the object pool
+            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="P:OpenMetaverse.WrappedObject`1.Instance">
+        <member name="P:OpenMetaverse.ChatSessionMemberAddedEventArgs.SessionID">
+            <summary>Get the ID of the chat session</summary>
+        </member>
+        <member name="P:OpenMetaverse.ChatSessionMemberAddedEventArgs.AgentID">
+            <summary>Get the ID of the agent that joined</summary>
+        </member>
+        <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="M:OpenMetaverse.ChatSessionMemberLeftEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Returns an instance of the class that has been checked out of the Object Pool.
+            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="M:OpenMetaverse.ObjectPoolBase`1.#ctor">
+        <member name="P:OpenMetaverse.ChatSessionMemberLeftEventArgs.SessionID">
+            <summary>Get the ID of the chat session</summary>
+        </member>
+        <member name="P:OpenMetaverse.ChatSessionMemberLeftEventArgs.AgentID">
+            <summary>Get the ID of the agent that left</summary>
+        </member>
+        <member name="T:OpenMetaverse.SetDisplayNameReplyEventArgs">
+            <summary>Event arguments with the result of setting display name operation</summary>
+        </member>
+        <member name="M:OpenMetaverse.SetDisplayNameReplyEventArgs.#ctor(System.Int32,System.String,OpenMetaverse.AgentDisplayName)">
+            <summary>Default constructor</summary>
+        </member>
+        <member name="P:OpenMetaverse.SetDisplayNameReplyEventArgs.Status">
+            <summary>Status code, 200 indicates settign display name was successful</summary>
+        </member>
+        <member name="P:OpenMetaverse.SetDisplayNameReplyEventArgs.Reason">
+            <summary>Textual description of the status</summary>
+        </member>
+        <member name="P:OpenMetaverse.SetDisplayNameReplyEventArgs.DisplayName">
+            <summary>Details of the newly set display name</summary>
+        </member>
+        <member name="T:OpenMetaverse.Assets.AssetScriptText">
             <summary>
-            Creates a new instance of the ObjectPoolBase class. Initialize MUST be called
-            after using this constructor.
+            Represents an LSL Text object containing a string of UTF encoded characters
             </summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectPoolBase`1.#ctor(System.Int32,System.Int32,System.Boolean,System.Int32)">
+        <member name="F:OpenMetaverse.Assets.AssetScriptText.Source">
+            <summary>A string of characters represting the script contents</summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetScriptText.#ctor">
+            <summary>Initializes a new AssetScriptText object</summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetScriptText.#ctor(OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            Creates a new instance of the ObjectPool Base class.        
+            Initializes a new AssetScriptText object with parameters
             </summary>
-            <param name="itemsPerSegment">The object pool is composed of segments, which 
-            are allocated whenever the size of the pool is exceeded. The number of items
-            in a segment should be large enough that allocating a new segmeng is a rare
-            thing. For example, on a server that will have 10k people logged in at once, 
-            the receive buffer object pool should have segment sizes of at least 1000 
-            byte arrays per segment.
-            </param>
-            <param name="minimumSegmentCount">The minimun number of segments that may exist.</param>
-            <param name="gcOnPoolGrowth">Perform a full GC.Collect whenever a segment is allocated, and then again after allocation to compact the heap.</param>
-            <param name="cleanupFrequenceMS">The frequency which segments are checked to see if they're eligible for cleanup.</param>
+            <param name="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.ObjectPoolBase`1.ForceCleanup">
+        <member name="M:OpenMetaverse.Assets.AssetScriptText.Encode">
             <summary>
-            Forces the segment cleanup algorithm to be run. This method is intended 
-            primarly for use from the Unit Test libraries.
+            Encode a string containing the scripts contents into byte encoded AssetData
             </summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectPoolBase`1.GetObjectInstance">
+        <member name="M:OpenMetaverse.Assets.AssetScriptText.Decode">
             <summary>
-            Responsible for allocate 1 instance of an object that will be stored in a segment. 
+            Decode a byte array containing the scripts contents into a string
             </summary>
-            <returns>An instance of whatever objec the pool is pooling.</returns>
+            <returns>true if decoding is successful</returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectPoolBase`1.CheckIn(OpenMetaverse.ObjectPoolSegment{`0},`0)">
+        <member name="P:OpenMetaverse.Assets.AssetScriptText.AssetType">
+            <summary>Override the base classes AssetType</summary>
+        </member>
+        <member name="T:OpenMetaverse.Assets.GestureStepType">
             <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.
+            Type of gesture step
             </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="T:OpenMetaverse.Assets.GestureStep">
             <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. 
+            Base class for gesture steps
             </summary>
-            <returns>A <c>WrappedObject</c> around the instance of <c>T</c>. To check
-            the instance back into the segment, be sureto dispose the WrappedObject 
-            when finished. </returns>
         </member>
-        <member name="P:OpenMetaverse.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="T:OpenMetaverse.InventoryException">
+        <member name="P:OpenMetaverse.Assets.GestureStepAnimation.GestureStepType">
             <summary>
-            Exception class to identify inventory exceptions
+            Returns what kind of gesture step this is
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Inventory">
+        <member name="T:OpenMetaverse.Assets.GestureStepSound">
             <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.
+            Describes sound step of a gesture
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectUpdated">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.Inventory.OnInventoryObjectUpdated(OpenMetaverse.InventoryObjectUpdatedEventArgs)">
-            <summary>Raises the InventoryObjectUpdated Event</summary>
-             <param name="e">A InventoryObjectUpdatedEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
-        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectUpdatedLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectRemoved">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.Inventory.OnInventoryObjectRemoved(OpenMetaverse.InventoryObjectRemovedEventArgs)">
-            <summary>Raises the InventoryObjectRemoved Event</summary>
-             <param name="e">A InventoryObjectRemovedEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
-        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectRemovedLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectAdded">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.Inventory.OnInventoryObjectAdded(OpenMetaverse.InventoryObjectAddedEventArgs)">
-            <summary>Raises the InventoryObjectAdded Event</summary>
-             <param name="e">A InventoryObjectAddedEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
-        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectAddedLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="M:OpenMetaverse.Inventory.GetContents(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Assets.GestureStepSound.ID">
             <summary>
-            Returns the contents of the specified folder
+            Sound asset <see cref="T:OpenMetaverse.UUID"/>
             </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>
         </member>
-        <member name="M:OpenMetaverse.Inventory.UpdateNodeFor(OpenMetaverse.InventoryBase)">
+        <member name="F:OpenMetaverse.Assets.GestureStepSound.Name">
             <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
+            Sound inventory name
             </summary>
-            <param name="item">The InventoryObject to store</param>
         </member>
-        <member name="M:OpenMetaverse.Inventory.RemoveNodeFor(OpenMetaverse.InventoryBase)">
+        <member name="P:OpenMetaverse.Assets.GestureStepSound.GestureStepType">
             <summary>
-            Removes the InventoryObject and all related node data from Inventory.
+            Returns what kind of gesture step this is
             </summary>
-            <param name="item">The InventoryObject to remove.</param>
         </member>
-        <member name="M:OpenMetaverse.Inventory.Contains(OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.Assets.GestureStepChat">
             <summary>
-            Used to find out if Inventory contains the InventoryObject
-            specified by <code>uuid</code>.
+            Describes sound step of a gesture
             </summary>
-            <param name="uuid">The UUID to check.</param>
-            <returns>true if inventory contains uuid, false otherwise</returns>
         </member>
-        <member name="M:OpenMetaverse.Inventory.SaveToDisk(System.String)">
+        <member name="F:OpenMetaverse.Assets.GestureStepChat.Text">
             <summary>
-            Saves the current inventory structure to a cache file
+            Text to output in chat
             </summary>
-            <param name="filename">Name of the cache file to save to</param>
         </member>
-        <member name="M:OpenMetaverse.Inventory.RestoreFromDisk(System.String)">
+        <member name="P:OpenMetaverse.Assets.GestureStepChat.GestureStepType">
             <summary>
-            Loads in inventory cache file into the inventory structure. Note only valid to call after login has been successful.
+            Returns what kind of gesture step this is
             </summary>
-            <param name="filename">Name of the cache file to load</param>
-            <returns>The number of inventory items sucessfully reconstructed into the inventory node tree</returns>
         </member>
-        <member name="E:OpenMetaverse.Inventory.InventoryObjectUpdated">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="T:OpenMetaverse.Assets.GestureStepWait">
+            <summary>
+            Describes sound step of a gesture
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.Inventory.InventoryObjectRemoved">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.Assets.GestureStepWait.WaitForAnimation">
+            <summary>
+            If true in this step we wait for all animations to finish
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.Inventory.InventoryObjectAdded">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.Assets.GestureStepWait.WaitForTime">
+            <summary>
+            If true gesture player should wait for the specified amount of time
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.Inventory.RootFolder">
+        <member name="F:OpenMetaverse.Assets.GestureStepWait.WaitTime">
             <summary>
-            The root folder of this avatars inventory
+            Time in seconds to wait if WaitForAnimation is false
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Inventory.LibraryFolder">
+        <member name="P:OpenMetaverse.Assets.GestureStepWait.GestureStepType">
             <summary>
-            The default shared library folder
+            Returns what kind of gesture step this is
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Inventory.RootNode">
+        <member name="T:OpenMetaverse.Assets.GestureStepEOF">
             <summary>
-            The root node of the avatars inventory
+            Describes the final step of a gesture
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Inventory.LibraryRootNode">
+        <member name="P:OpenMetaverse.Assets.GestureStepEOF.GestureStepType">
             <summary>
-            The root node of the default shared library
+            Returns what kind of gesture step this is
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Inventory.Item(OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.Assets.AssetGesture">
             <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.
+            Represents a sequence of animations, sounds, and chat actions
             </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>
-        <member name="T:OpenMetaverse.PacketEventDictionary">
+        <member name="F:OpenMetaverse.Assets.AssetGesture.TriggerKey">
             <summary>
-            Registers, unregisters, and fires events generated by incoming packets
+            Keyboard key that triggers the gestyre
             </summary>
         </member>
-        <member name="F:OpenMetaverse.PacketEventDictionary.Client">
-            <summary>Reference to the GridClient object</summary>
+        <member name="F:OpenMetaverse.Assets.AssetGesture.TriggerKeyMask">
+            <summary>
+            Modifier to the trigger key
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.PacketEventDictionary.#ctor(OpenMetaverse.GridClient)">
+        <member name="F:OpenMetaverse.Assets.AssetGesture.Trigger">
             <summary>
-            Default constructor
+            String that triggers playing of the gesture sequence
             </summary>
-            <param name="client"></param>
         </member>
-        <member name="M:OpenMetaverse.PacketEventDictionary.RegisterEvent(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs},System.Boolean)">
+        <member name="F:OpenMetaverse.Assets.AssetGesture.ReplaceWith">
             <summary>
-            Register an event handler
+            Text that replaces trigger in chat once gesture is triggered
             </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="M:OpenMetaverse.PacketEventDictionary.UnregisterEvent(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs})">
+        <member name="F:OpenMetaverse.Assets.AssetGesture.Sequence">
             <summary>
-            Unregister an event handler
+            Sequence of gesture steps
             </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.Assets.AssetGesture.#ctor">
             <summary>
-            Fire the events registered for this packet type
+            Constructs guesture asset
             </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.PacketEventDictionary.PacketCallbackWrapper">
+        <member name="M:OpenMetaverse.Assets.AssetGesture.#ctor(OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            Object that is passed to worker threads in the ThreadPool for
-            firing packet callbacks
+            Constructs guesture asset
             </summary>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="F:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper.Callback">
-            <summary>Callback to fire for this packet</summary>
-        </member>
-        <member name="F:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper.Simulator">
-            <summary>Reference to the simulator that this packet came from</summary>
-        </member>
-        <member name="F:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper.Packet">
-            <summary>The packet that needs to be processed</summary>
-        </member>
-        <member name="T:OpenMetaverse.CapsEventDictionary">
+        <member name="M:OpenMetaverse.Assets.AssetGesture.Encode">
             <summary>
-            Registers, unregisters, and fires events generated by the Capabilities
-            event queue
+            Encodes gesture asset suitable for uplaod
             </summary>
         </member>
-        <member name="F:OpenMetaverse.CapsEventDictionary.Client">
-            <summary>Reference to the GridClient object</summary>
-        </member>
-        <member name="M:OpenMetaverse.CapsEventDictionary.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.Assets.AssetGesture.Decode">
             <summary>
-            Default constructor
+            Decodes gesture assset into play sequence
             </summary>
-            <param name="client">Reference to the GridClient object</param>
+            <returns>true if the asset data was decoded successfully</returns>
         </member>
-        <member name="M:OpenMetaverse.CapsEventDictionary.RegisterEvent(System.String,OpenMetaverse.Caps.EventQueueCallback)">
+        <member name="P:OpenMetaverse.Assets.AssetGesture.AssetType">
             <summary>
-            Register an new event handler for a capabilities event sent via the EventQueue
+            Returns asset type
             </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="M:OpenMetaverse.CapsEventDictionary.UnregisterEvent(System.String,OpenMetaverse.Caps.EventQueueCallback)">
+        <member name="T:OpenMetaverse.Sounds">
             <summary>
-            Unregister a previously registered capabilities handler 
+            pre-defined built in sounds
             </summary>
-            <param name="capsEvent">Capability event name unregister the 
-            handler for</param>
-            <param name="eventHandler">Callback to unregister</param>
         </member>
-        <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 name="F:OpenMetaverse.Sounds.BELL_TING">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.Sounds.CLICK">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper">
-            <summary>
-            Object that is passed to worker threads in the ThreadPool for
-            firing CAPS callbacks
-            </summary>
+        <member name="F:OpenMetaverse.Sounds.HEALTH_REDUCTION_FEMALE">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Callback">
-            <summary>Callback to fire for this packet</summary>
+        <member name="F:OpenMetaverse.Sounds.HEALTH_REDUCTION_MALE">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.CapsEvent">
-            <summary>Name of the CAPS event</summary>
+        <member name="F:OpenMetaverse.Sounds.IM_START">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Message">
-            <summary>Strongly typed decoded data</summary>
+        <member name="F:OpenMetaverse.Sounds.INSTANT_MESSAGE_NOTIFICATION">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Simulator">
-            <summary>Reference to the simulator that generated this event</summary>
+        <member name="F:OpenMetaverse.Sounds.INVALID_OPERATION">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.DownloadRequest">
-            <summary>
-            Represends individual HTTP Download request
-            </summary>
+        <member name="F:OpenMetaverse.Sounds.KEYBOARD_LOOP">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DownloadRequest.Address">
-            <summary>URI of the item to fetch</summary>
+        <member name="F:OpenMetaverse.Sounds.MONEY_REDUCTION_COINS">
+            <summary>coins</summary>
         </member>
-        <member name="F:OpenMetaverse.DownloadRequest.MillisecondsTimeout">
-            <summary>Timout specified in milliseconds</summary>
+        <member name="F:OpenMetaverse.Sounds.MONEY_INCREASE_CASH_REGISTER_BELL">
+            <summary>cash register bell</summary>
         </member>
-        <member name="F:OpenMetaverse.DownloadRequest.DownloadProgressCallback">
-            <summary>Download progress callback</summary>
+        <member name="F:OpenMetaverse.Sounds.NULL_KEYSTROKE">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DownloadRequest.CompletedCallback">
-            <summary>Download completed callback</summary>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DownloadRequest.ContentType">
-            <summary>Accept the following content type</summary>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_RUBBER">
+            <summary>rubber</summary>
         </member>
-        <member name="M:OpenMetaverse.DownloadRequest.#ctor">
-            <summary>Default constructor</summary>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_PLASTIC">
+            <summary>plastic</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 name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_FLESH">
+            <summary>flesh</summary>
         </member>
-        <member name="T:OpenMetaverse.DownloadManager">
-            <summary>
-            Manages async HTTP downloads with a limit on maximum
-            concurrent downloads
-            </summary>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_WOOD_SPLINTERING">
+            <summary>wood splintering?</summary>
         </member>
-        <member name="M:OpenMetaverse.DownloadManager.#ctor">
-            <summary>Default constructor</summary>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_GLASS_BREAK">
+            <summary>glass break</summary>
         </member>
-        <member name="M:OpenMetaverse.DownloadManager.Dispose">
-            <summary>Cleanup method</summary>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_METAL_CLUNK">
+            <summary>metal clunk</summary>
         </member>
-        <member name="M:OpenMetaverse.DownloadManager.SetupRequest(System.Uri,System.String)">
-            <summary>Setup http download request</summary>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_CREATE_WHOOSH">
+            <summary>whoosh</summary>
         </member>
-        <member name="M:OpenMetaverse.DownloadManager.EnqueuePending">
-            <summary>Check the queue for pending work</summary>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_DELETE_SHAKE">
+            <summary>shake</summary>
         </member>
-        <member name="M:OpenMetaverse.DownloadManager.QueueDownlad(OpenMetaverse.DownloadRequest)">
-            <summary>Enqueue a new HTPP download</summary>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_REZ">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.DownloadManager.ParallelDownloads">
-            <summary>Maximum number of parallel downloads from a single endpoint</summary>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_APPEAR_DING">
+            <summary>ding</summary>
         </member>
-        <member name="P:OpenMetaverse.DownloadManager.ClientCert">
-            <summary>Client certificate</summary>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Voice.VoicePosition.Position">
-            <summary>Positional vector of the users position</summary>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT1">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Voice.VoicePosition.Velocity">
-            <summary>Velocity vector of the position</summary>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT2">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Voice.VoicePosition.AtOrientation">
-            <summary>At Orientation (X axis) of the position</summary>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT3">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Voice.VoicePosition.UpOrientation">
-            <summary>Up Orientation (Y axis) of the position</summary>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT4">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Voice.VoicePosition.LeftOrientation">
-            <summary>Left Orientation (Z axis) of the position</summary>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT5">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetMesh">
-            <summary>
-            Represents Mesh asset
-            </summary>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT6">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetMesh.#ctor">
-            <summary>Initializes a new instance of an AssetMesh object</summary>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT7">
+            <summary></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="F:OpenMetaverse.Sounds.SNAPSHOT">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetMesh.Encode">
+        <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>
-            TODO: Encodes a scripts contents into a LSO Bytecode file
+            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.Assets.AssetMesh.Decode">
+        <member name="T:OpenMetaverse.GroupMember">
             <summary>
-            TODO: Decode LSO Bytecode into a string
+            Avatar group management
             </summary>
-            <returns>true</returns>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetMesh.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="F:OpenMetaverse.GroupMember.ID">
+            <summary>Key of Group Member</summary>
         </member>
-        <member name="T:OpenMetaverse.Helpers">
-            <summary>
-            Static helper functions and global variables
-            </summary>
+        <member name="F:OpenMetaverse.GroupMember.Contribution">
+            <summary>Total land contribution</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.GroupMember.OnlineStatus">
+            <summary>Online status information</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.GroupMember.Powers">
+            <summary>Abilities that the Group Member has</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.GroupMember.Title">
+            <summary>Current group title</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.GroupMember.IsOwner">
+            <summary>Is a group owner</summary>
         </member>
-        <member name="M:OpenMetaverse.Helpers.TEOffsetShort(System.Single)">
+        <member name="T:OpenMetaverse.GroupRole">
             <summary>
-            
+            Role manager for a group
             </summary>
-            <param name="offset"></param>
-            <returns></returns>
         </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.GroupRole.GroupID">
+            <summary>Key of the group</summary>
         </member>
-        <member name="M:OpenMetaverse.Helpers.TERotationShort(System.Single)">
-            <summary>
-            
-            </summary>
-            <param name="rotation"></param>
-            <returns></returns>
-        </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.GroupRole.ID">
+            <summary>Key of Role</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.GroupRole.Name">
+            <summary>Name of Role</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.GroupRole.Title">
+            <summary>Group Title associated with Role</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.GroupRole.Description">
+            <summary>Description of Role</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.GroupRole.Powers">
+            <summary>Abilities Associated with Role</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="M:OpenMetaverse.GroupRole.ToString">
+            <summary>Returns the role's title</summary>
+            <returns>The role's title</returns>
         </member>
-        <member name="M:OpenMetaverse.Helpers.InventoryCRC(System.Int32,System.Byte,System.SByte,System.SByte,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Int32,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,System.UInt32,System.UInt32,System.UInt32,System.UInt32,System.UInt32)">
+        <member name="T:OpenMetaverse.GroupTitle">
             <summary>
-            Calculates the CRC (cyclic redundancy check) needed to upload inventory.
+            Class to represent Group Title
             </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="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.GroupTitle.GroupID">
+            <summary>Key of the group</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.GroupTitle.RoleID">
+            <summary>ID of the role title belongs to</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.GroupTitle.Title">
+            <summary>Group Title</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.GroupTitle.Selected">
+            <summary>Whether title is Active</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="M:OpenMetaverse.GroupTitle.ToString">
+            <summary>Returns group title</summary>
         </member>
-        <member name="T:OpenMetaverse.Helpers.LogLevel">
+        <member name="T:OpenMetaverse.Group">
             <summary>
-            Passed to Logger.Log() to identify the severity of a log entry
+            Represents a group on the grid
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Helpers.LogLevel.None">
-            <summary>No logging information will be output</summary>
+        <member name="F:OpenMetaverse.Group.ID">
+            <summary>Key of Group</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.Group.InsigniaID">
+            <summary>Key of Group Insignia</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.Group.FounderID">
+            <summary>Key of Group Founder</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.Group.OwnerRole">
+            <summary>Key of Group Role for Owners</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.Group.Name">
+            <summary>Name of Group</summary>
         </member>
-        <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 name="F:OpenMetaverse.Group.Charter">
+            <summary>Text of Group Charter</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.Baker.bakedTexture">
-            <summary>Final baked texture</summary>
+        <member name="F:OpenMetaverse.Group.MemberTitle">
+            <summary>Title of "everyone" role</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.Baker.textures">
-            <summary>Component layers</summary>
+        <member name="F:OpenMetaverse.Group.OpenEnrollment">
+            <summary>Is the group open for enrolement to everyone</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.Baker.bakeWidth">
-            <summary>Width of the final baked image and scratchpad</summary>
+        <member name="F:OpenMetaverse.Group.ShowInList">
+            <summary>Will group show up in search</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.Baker.bakeHeight">
-            <summary>Height of the final baked image and scratchpad</summary>
+        <member name="F:OpenMetaverse.Group.Powers">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.Baker.bakeType">
-            <summary>Bake type</summary>
+        <member name="F:OpenMetaverse.Group.AcceptNotices">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Imaging.Baker.#ctor(OpenMetaverse.BakeType)">
-            <summary>
-            Default constructor
-            </summary>
-            <param name="bakeType">Bake type</param>
+        <member name="F:OpenMetaverse.Group.AllowPublish">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.Group.MaturePublish">
+            <summary>Is the group Mature</summary>
         </member>
-        <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 name="F:OpenMetaverse.Group.MembershipFee">
+            <summary>Cost of group membership</summary>
         </member>
-        <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 name="F:OpenMetaverse.Group.Money">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.Group.Contribution">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.Group.GroupMembershipCount">
+            <summary>The total number of current members this group has</summary>
         </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.BakedTexture">
-            <summary>Final baked texture</summary>
+        <member name="F:OpenMetaverse.Group.GroupRolesCount">
+            <summary>The number of roles this group has configured</summary>
         </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.Textures">
-            <summary>Component layers</summary>
+        <member name="F:OpenMetaverse.Group.ListInProfile">
+            <summary>Show this group in agent's profile</summary>
         </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.BakeWidth">
-            <summary>Width of the final baked image and scratchpad</summary>
+        <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="P:OpenMetaverse.Imaging.Baker.BakeHeight">
-            <summary>Height of the final baked image and scratchpad</summary>
+        <member name="T:OpenMetaverse.Vote">
+            <summary>
+            A group Vote
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.BakeType">
-            <summary>Bake type</summary>
+        <member name="F:OpenMetaverse.Vote.Candidate">
+            <summary>Key of Avatar who created Vote</summary>
         </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.IsSkin">
-            <summary>Is this one of the 3 skin bakes</summary>
+        <member name="F:OpenMetaverse.Vote.VoteString">
+            <summary>Text of the Vote proposal</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetAnimation">
+        <member name="F:OpenMetaverse.Vote.NumVotes">
+            <summary>Total number of votes</summary>
+        </member>
+        <member name="T:OpenMetaverse.GroupProposal">
             <summary>
-            Represents an Animation
+            A group proposal
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetAnimation.#ctor">
-            <summary>Default Constructor</summary>
+        <member name="F:OpenMetaverse.GroupProposal.VoteText">
+            <summary>The Text of the proposal</summary>
         </member>
-        <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 name="F:OpenMetaverse.GroupProposal.Quorum">
+            <summary>The minimum number of members that must vote before proposal passes or failes</summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetAnimation.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <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.AvatarTextureIndex">
-            <summary>
-            Index of TextureEntry slots for avatar appearances
-            </summary>
+        <member name="F:OpenMetaverse.GroupProposal.Duration">
+            <summary>The duration in days votes are accepted</summary>
         </member>
-        <member name="T:OpenMetaverse.BakeType">
+        <member name="T:OpenMetaverse.GroupAccountSummary">
             <summary>
-            Bake layers for avatar appearance
+            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.MAX_CONCURRENT_DOWNLOADS">
-            <summary>Maximum number of concurrent downloads for wearable assets and textures</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.MAX_CONCURRENT_UPLOADS">
-            <summary>Maximum number of concurrent uploads for baked textures</summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.IntervalDays">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.INVENTORY_TIMEOUT">
-            <summary>Timeout for fetching inventory listings</summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.CurrentInterval">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_TIMEOUT">
-            <summary>Timeout for fetching a single wearable, or receiving a single packet response</summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.StartDate">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TEXTURE_TIMEOUT">
-            <summary>Timeout for fetching a single texture</summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.Balance">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.UPLOAD_TIMEOUT">
-            <summary>Timeout for uploading a single baked texture</summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.TotalCredits">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.UPLOAD_RETRIES">
-            <summary>Number of times to retry bake upload</summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.TotalDebits">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.REBAKE_DELAY">
-            <summary>When changing outfit, kick off rebake after
-            20 seconds has passed since the last change</summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.ObjectTaxCurrent">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_COUNT">
-            <summary>Total number of wearables for each avatar</summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.LightTaxCurrent">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.BAKED_TEXTURE_COUNT">
-            <summary>Total number of baked textures on each avatar</summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.LandTaxCurrent">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WEARABLES_PER_LAYER">
-            <summary>Total number of wearables per bake layer</summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.GroupTaxCurrent">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.BakeIndexToTextureIndex">
-            <summary>Mapping between BakeType and AvatarTextureIndex</summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.ParcelDirFeeCurrent">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_BAKE_MAP">
-            <summary>Map of what wearables are included in each bake</summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.ObjectTaxEstimate">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.BAKED_TEXTURE_HASH">
-            <summary>Magic values to finalize the cache check hashes for each
-            bake</summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.LightTaxEstimate">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.DEFAULT_AVATAR_TEXTURE">
-            <summary>Default avatar texture, used to detect when a custom
-            texture is not set for a face</summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.LandTaxEstimate">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AgentWearablesReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.GroupTaxEstimate">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.OnAgentWearables(OpenMetaverse.AgentWearablesReplyEventArgs)">
-            <summary>Raises the AgentWearablesReply event</summary>
-            <param name="e">An AgentWearablesReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.GroupAccountSummary.ParcelDirFeeEstimate">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AgentWearablesLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.NonExemptMembers">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AgentCachedBakesReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.LastTaxDate">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.OnAgentCachedBakes(OpenMetaverse.AgentCachedBakesReplyEventArgs)">
-            <summary>Raises the CachedBakesReply event</summary>
-            <param name="e">An AgentCachedBakesReplyEventArgs object containing the
-            data returned from the data server AgentCachedTextureResponse</param>
+        <member name="F:OpenMetaverse.GroupAccountSummary.TaxDate">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AgentCachedBakesLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.GroupNotice">
+            <summary>
+            Struct representing a group notice
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AppearanceSet">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.GroupNotice.Subject">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.OnAppearanceSet(OpenMetaverse.AppearanceSetEventArgs)">
-            <summary>Raises the AppearanceSet event</summary>
-            <param name="e">An AppearanceSetEventArgs object indicating if the operatin was successfull</param>
+        <member name="F:OpenMetaverse.GroupNotice.Message">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AppearanceSetLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.GroupNotice.AttachmentID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_RebakeAvatarReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.GroupNotice.OwnerID">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.OnRebakeAvatar(OpenMetaverse.RebakeAvatarTexturesEventArgs)">
-            <summary>Raises the RebakeAvatarRequested event</summary>
-            <param name="e">An RebakeAvatarTexturesEventArgs object containing the
-            data returned from the data server</param>
+        <member name="M:OpenMetaverse.GroupNotice.SerializeAttachment">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_RebakeAvatarLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.GroupNoticesListEntry">
+            <summary>
+            Struct representing a group notice list entry
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.Wearables">
-            <summary>A cache of wearables currently being worn</summary>
+        <member name="F:OpenMetaverse.GroupNoticesListEntry.NoticeID">
+            <summary>Notice ID</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.Textures">
-            <summary>A cache of textures currently being worn</summary>
+        <member name="F:OpenMetaverse.GroupNoticesListEntry.Timestamp">
+            <summary>Creation timestamp of notice</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.CacheCheckSerialNum">
-            <summary>Incrementing serial number for AgentCachedTexture packets</summary>
+        <member name="F:OpenMetaverse.GroupNoticesListEntry.FromName">
+            <summary>Agent name who created notice</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.SetAppearanceSerialNum">
-            <summary>Incrementing serial number for AgentSetAppearance packets</summary>
+        <member name="F:OpenMetaverse.GroupNoticesListEntry.Subject">
+            <summary>Notice subject</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.AppearanceThreadRunning">
-            <summary>Indicates whether or not the appearance thread is currently
-            running, to prevent multiple appearance threads from running
-            simultaneously</summary>
+        <member name="F:OpenMetaverse.GroupNoticesListEntry.HasAttachment">
+            <summary>Is there an attachment?</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.Client">
-            <summary>Reference to our agent</summary>
+        <member name="F:OpenMetaverse.GroupNoticesListEntry.AssetType">
+            <summary>Attachment Type</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.RebakeScheduleTimer">
+        <member name="T:OpenMetaverse.ChatSessionMember">
             <summary>
-            Timer used for delaying rebake on changing outfit
+            Struct representing a member of a group chat session and their settings
             </summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.AppearanceThread">
-            <summary>
-            Main appearance thread
-            </summary>
+        <member name="F:OpenMetaverse.ChatSessionMember.AvatarKey">
+            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the Avatar</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Default constructor
-            </summary>
-            <param name="client">A reference to our agent</param>
+        <member name="F:OpenMetaverse.ChatSessionMember.CanVoiceChat">
+            <summary>True if user has voice chat enabled</summary>
         </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="F:OpenMetaverse.ChatSessionMember.IsModerator">
+            <summary>True of Avatar has moderator abilities</summary>
         </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="F:OpenMetaverse.ChatSessionMember.MuteText">
+            <summary>True if a moderator has muted this avatars chat</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RequestSetAppearance">
-            <summary>
-            Starts the appearance setting thread
-            </summary>
+        <member name="F:OpenMetaverse.ChatSessionMember.MuteVoice">
+            <summary>True if a moderator has muted this avatars voice</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RequestSetAppearance(System.Boolean)">
+        <member name="T:OpenMetaverse.GroupRoleUpdate">
             <summary>
-            Starts the appearance setting thread
+            Role update flags
             </summary>
-            <param name="forceRebake">True to force rebaking, otherwise false</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RequestAgentWearables">
-            <summary>
-            Ask the server what textures our agent is currently wearing
-            </summary>
+        <member name="F:OpenMetaverse.GroupRoleUpdate.NoUpdate">
+            <summary></summary>
         </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="F:OpenMetaverse.GroupRoleUpdate.UpdateData">
+            <summary></summary>
         </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="F:OpenMetaverse.GroupRoleUpdate.UpdatePowers">
+            <summary></summary>
         </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="F:OpenMetaverse.GroupRoleUpdate.UpdateAll">
+            <summary></summary>
         </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="F:OpenMetaverse.GroupRoleUpdate.Create">
+            <summary></summary>
         </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="F:OpenMetaverse.GroupRoleUpdate.Delete">
+            <summary></summary>
         </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="F:OpenMetaverse.GroupPowers.None">
+            <summary></summary>
         </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="F:OpenMetaverse.GroupPowers.Invite">
+            <summary>Can send invitations to groups default role</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.IsItemWorn(OpenMetaverse.InventoryItem)">
-            <summary>
-            Checks if an inventory item is currently being worn
-            </summary>
-            <param name="item">The inventory item to check against the agent
-            wearables</param>
-            <returns>The WearableType slot that the item is being worn in,
-            or WearbleType.Invalid if it is not currently being worn</returns>
+        <member name="F:OpenMetaverse.GroupPowers.Eject">
+            <summary>Can eject members from group</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.GetWearables">
-            <summary>
-            Returns a copy of the agents currently worn wearables
-            </summary>
-            <returns>A copy of the agents currently worn wearables</returns>
-            <remarks>Avoid calling this function multiple times as it will make
-            a copy of all of the wearable data each time</remarks>
+        <member name="F:OpenMetaverse.GroupPowers.ChangeOptions">
+            <summary>Can toggle 'Open Enrollment' and change 'Signup fee'</summary>
         </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.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 name="F:OpenMetaverse.GroupPowers.MemberVisible">
+            <summary>Member is visible in the public member list</summary>
         </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="F:OpenMetaverse.GroupPowers.CreateRole">
+            <summary>Can create new roles</summary>
         </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="F:OpenMetaverse.GroupPowers.DeleteRole">
+            <summary>Can delete existing roles</summary>
         </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="F:OpenMetaverse.GroupPowers.RoleProperties">
+            <summary>Can change Role names, titles and descriptions</summary>
         </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="F:OpenMetaverse.GroupPowers.AssignMemberLimited">
+            <summary>Can assign other members to assigners role</summary>
         </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="F:OpenMetaverse.GroupPowers.AssignMember">
+            <summary>Can assign other members to any role</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.SendAgentIsNowWearing">
-            <summary>
-            Inform the sim which wearables are part of our current outfit
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.RemoveMember">
+            <summary>Can remove members from roles</summary>
         </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="F:OpenMetaverse.GroupPowers.ChangeActions">
+            <summary>Can assign and remove abilities in roles</summary>
         </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="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="M:OpenMetaverse.AppearanceManager.GetAgentWearables">
-            <summary>
-            Blocking method to populate the Wearables dictionary
-            </summary>
-            <returns>True on success, otherwise false</returns>
+        <member name="F:OpenMetaverse.GroupPowers.LandDeed">
+            <summary>Can buy land or deed land to group</summary>
         </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="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="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="F:OpenMetaverse.GroupPowers.LandSetSale">
+            <summary>Can set land for-sale information on group owned parcels</summary>
         </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="F:OpenMetaverse.GroupPowers.LandDivideJoin">
+            <summary>Can subdivide and join parcels</summary>
         </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="F:OpenMetaverse.GroupPowers.JoinChat">
+            <summary>Can join group chat sessions</summary>
         </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="F:OpenMetaverse.GroupPowers.AllowVoiceChat">
+            <summary>Can use voice chat in Group Chat sessions</summary>
         </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="F:OpenMetaverse.GroupPowers.ModerateChat">
+            <summary>Can moderate group chat sessions</summary>
         </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="F:OpenMetaverse.GroupPowers.FindPlaces">
+            <summary>Can toggle "Show in Find Places" and set search category</summary>
         </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="F:OpenMetaverse.GroupPowers.LandChangeIdentity">
+            <summary>Can change parcel name, description, and 'Publish on web' settings</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.UploadBake(System.Byte[])">
-            <summary>
-            Blocking method to upload a baked texture
-            </summary>
-            <param name="textureData">Five channel JPEG2000 texture data to upload</param>
-            <returns>UUID of the newly created asset on success, otherwise UUID.Zero</returns>
+        <member name="F:OpenMetaverse.GroupPowers.SetLandingPoint">
+            <summary>Can set the landing point and teleport routing on group land</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.MakeParamValues">
-            <summary>
-            Creates a dictionary of visual param values from the downloaded wearables
-            </summary>
-            <returns>A dictionary of visual param indices mapping to visual param
-            values for our agent that can be fed to the Baker class</returns>
+        <member name="F:OpenMetaverse.GroupPowers.ChangeMedia">
+            <summary>Can change music and media settings</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RequestAgentSetAppearance">
-            <summary>
-            Create an AgentSetAppearance packet from Wearables data and the 
-            Textures array and send it
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.LandEdit">
+            <summary>Can toggle 'Edit Terrain' option in Land settings</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.WearableTypeToAssetType(OpenMetaverse.WearableType)">
-            <summary>
-            Converts a WearableType to a bodypart or clothing WearableType
-            </summary>
-            <param name="type">A WearableType</param>
-            <returns>AssetType.Bodypart or AssetType.Clothing or AssetType.Unknown</returns>
+        <member name="F:OpenMetaverse.GroupPowers.LandOptions">
+            <summary>Can toggle various About Land > Options settings</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.BakeTypeToAgentTextureIndex(OpenMetaverse.BakeType)">
-            <summary>
-            Converts a BakeType to the corresponding baked texture slot in AvatarTextureIndex
-            </summary>
-            <param name="index">A BakeType</param>
-            <returns>The AvatarTextureIndex slot that holds the given BakeType</returns>
+        <member name="F:OpenMetaverse.GroupPowers.AllowEditLand">
+            <summary>Can always terraform land, even if parcel settings have it turned off</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.MorphLayerForBakeType(OpenMetaverse.BakeType)">
-            <summary>
-            Gives the layer number that is used for morph mask
-            </summary>
-            <param name="bakeType">>A BakeType</param>
-            <returns>Which layer number as defined in BakeTypeToTextures is used for morph mask</returns>
+        <member name="F:OpenMetaverse.GroupPowers.AllowFly">
+            <summary>Can always fly while over group owned land</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.BakeTypeToTextures(OpenMetaverse.BakeType)">
-            <summary>
-            Converts a BakeType to a list of the texture slots that make up that bake
-            </summary>
-            <param name="bakeType">A BakeType</param>
-            <returns>A list of texture slots that are inputs for the given bake</returns>
+        <member name="F:OpenMetaverse.GroupPowers.AllowRez">
+            <summary>Can always rez objects on group owned land</summary>
         </member>
-        <member name="E:OpenMetaverse.AppearanceManager.AgentWearablesReply">
-            <summary>Triggered when an AgentWearablesUpdate packet is received,
-            telling us what our avatar is currently wearing
-            <see cref="M:OpenMetaverse.AppearanceManager.RequestAgentWearables"/> request.</summary>
+        <member name="F:OpenMetaverse.GroupPowers.AllowLandmark">
+            <summary>Can always create landmarks for group owned parcels</summary>
         </member>
-        <member name="E:OpenMetaverse.AppearanceManager.CachedBakesReply">
-            <summary>Raised when an AgentCachedTextureResponse packet is
-            received, giving a list of cached bakes that were found on the
-            simulator
-            <seealso cref="M:OpenMetaverse.AppearanceManager.RequestCachedBakes"/> request.</summary>
+        <member name="F:OpenMetaverse.GroupPowers.AllowSetHome">
+            <summary>Can set home location on any group owned parcel</summary>
         </member>
-        <member name="E:OpenMetaverse.AppearanceManager.AppearanceSet">
-            <summary>
-            Raised when appearance data is sent to the simulator, also indicates
-            the main appearance thread is finished.
-            </summary>
-            <seealso cref="M:OpenMetaverse.AppearanceManager.RequestAgentSetAppearance"/> request.
+        <member name="F:OpenMetaverse.GroupPowers.LandManageAllowed">
+            <summary>Can modify public access settings for group owned parcels</summary>
         </member>
-        <member name="E:OpenMetaverse.AppearanceManager.RebakeAvatarRequested">
-            <summary>
-            Triggered when the simulator requests the agent rebake its appearance.
-            </summary>
-            <seealso cref="!:RebakeAvatarRequest"/>
+        <member name="F:OpenMetaverse.GroupPowers.LandManageBanned">
+            <summary>Can manager parcel ban lists on group owned land</summary>
         </member>
-        <member name="P:OpenMetaverse.AppearanceManager.ManagerBusy">
-            <summary>
-            Returns true if AppearanceManager is busy and trying to set or change appearance will fail
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.LandManagePasses">
+            <summary>Can manage pass list sales information</summary>
         </member>
-        <member name="T:OpenMetaverse.AppearanceManager.WearableData">
-            <summary>
-            Contains information about a wearable inventory item
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.LandEjectAndFreeze">
+            <summary>Can eject and freeze other avatars on group owned land</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.ItemID">
-            <summary>Inventory ItemID of the wearable</summary>
+        <member name="F:OpenMetaverse.GroupPowers.ReturnGroupSet">
+            <summary>Can return objects set to group</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.AssetID">
-            <summary>AssetID of the wearable asset</summary>
+        <member name="F:OpenMetaverse.GroupPowers.ReturnNonGroup">
+            <summary>Can return non-group owned/set objects</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.WearableType">
-            <summary>WearableType of the wearable</summary>
+        <member name="F:OpenMetaverse.GroupPowers.ReturnGroupOwned">
+            <summary>Can return group owned objects</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.AssetType">
-            <summary>AssetType of the wearable</summary>
+        <member name="F:OpenMetaverse.GroupPowers.LandGardening">
+            <summary>Can landscape using Linden plants</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.Asset">
-            <summary>Asset data for the wearable</summary>
+        <member name="F:OpenMetaverse.GroupPowers.DeedObject">
+            <summary>Can deed objects to group</summary>
         </member>
-        <member name="T:OpenMetaverse.AppearanceManager.ColorParamInfo">
-            <summary>
-            Data collected from visual params for each wearable
-            needed for the calculation of the color
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.ObjectManipulate">
+            <summary>Can move group owned objects</summary>
         </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="F:OpenMetaverse.GroupPowers.ObjectSetForSale">
+            <summary>Can set group owned objects for-sale</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureID">
-            <summary>A texture AssetID</summary>
+        <member name="F:OpenMetaverse.GroupPowers.Accountable">
+            <summary>Pay group liabilities and receive group dividends</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.Texture">
-            <summary>Asset data for the texture</summary>
+        <member name="F:OpenMetaverse.GroupPowers.HostEvent">
+            <summary>List and Host group events</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.AlphaMasks">
-            <summary>Collection of alpha masks that needs applying</summary>
+        <member name="F:OpenMetaverse.GroupPowers.SendNotices">
+            <summary>Can send group notices</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.Color">
-            <summary>Tint that should be applied to the texture</summary>
+        <member name="F:OpenMetaverse.GroupPowers.ReceiveNotices">
+            <summary>Can receive group notices</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureIndex">
-            <summary>Where on avatar does this texture belong</summary>
+        <member name="F:OpenMetaverse.GroupPowers.StartProposal">
+            <summary>Can create group proposals</summary>
         </member>
-        <member name="T:OpenMetaverse.AgentWearablesReplyEventArgs">
-            <summary>Contains the Event data returned from the data server from an AgentWearablesRequest</summary>
+        <member name="F:OpenMetaverse.GroupPowers.VoteOnProposal">
+            <summary>Can vote on group proposals</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentWearablesReplyEventArgs.#ctor">
-            <summary>Construct a new instance of the AgentWearablesReplyEventArgs class</summary>
+        <member name="T:OpenMetaverse.GroupManager">
+            <summary>
+            Handles all network traffic related to reading and writing group
+            information
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.AgentCachedBakesReplyEventArgs">
-            <summary>Contains the Event data returned from the data server from an AgentCachedTextureResponse</summary>
+        <member name="F:OpenMetaverse.GroupManager.m_CurrentGroups">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentCachedBakesReplyEventArgs.#ctor">
-            <summary>Construct a new instance of the AgentCachedBakesReplyEventArgs class</summary>
+        <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.AppearanceSetEventArgs">
-            <summary>Contains the Event data returned from an AppearanceSetRequest</summary>
+        <member name="F:OpenMetaverse.GroupManager.m_CurrentGroupsLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceSetEventArgs.#ctor(System.Boolean)">
-            <summary>
-            Triggered when appearance data is sent to the sim and
-            the main appearance thread is done.</summary>
-            <param name="success">Indicates whether appearance setting was successful</param>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupNames">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="P:OpenMetaverse.AppearanceSetEventArgs.Success">
-            <summary>Indicates whether appearance setting was successful</summary>
+        <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.RebakeAvatarTexturesEventArgs">
-            <summary>Contains the Event data returned from the data server from an RebakeAvatarTextures</summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupNamesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.RebakeAvatarTexturesEventArgs.#ctor(OpenMetaverse.UUID)">
-            <summary>
-            Triggered when the simulator sends a request for this agent to rebake
-            its appearance
-            </summary>
-            <param name="textureID">The ID of the Texture Layer to bake</param>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupProfile">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="P:OpenMetaverse.RebakeAvatarTexturesEventArgs.TextureID">
-            <summary>The ID of the Texture Layer to bake</summary>
+        <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.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.GroupManager.m_GroupProfileLock">
+            <summary>Thread sync lock 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.GroupManager.m_GroupMembers">
+            <summary>The event subscribers. null if no subcribers</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="M:OpenMetaverse.GroupManager.OnGroupMembersReply(OpenMetaverse.GroupMembersReplyEventArgs)">
+            <summary>Raises the GroupMembers event</summary>
+            <param name="e">A GroupMembersEventArgs object containing the
+            data returned from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.TextureRequestState.Progress">
-            <summary>A request that has received one or more packets back from the simulator</summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupMembersLock">
+            <summary>Thread sync lock object</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.GroupManager.m_GroupRoles">
+            <summary>The event subscribers. null if no subcribers</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="M:OpenMetaverse.GroupManager.OnGroupRoleDataReply(OpenMetaverse.GroupRolesDataReplyEventArgs)">
+            <summary>Raises the GroupRolesDataReply event</summary>
+            <param name="e">A GroupRolesDataReplyEventArgs object containing the
+            data returned from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.TextureRequestState.Aborted">
-            <summary>The texture request was aborted by request of the agent</summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupRolesLock">
+            <summary>Thread sync lock object</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.GroupManager.m_GroupRoleMembers">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.TextureDownloadCallback">
-            <summary>
-            A callback fired to indicate the status or final state of the requested texture. For progressive 
-            downloads this will fire each time new asset data is returned from the simulator.
-            </summary>
-            <param name="state">The <see cref="T:OpenMetaverse.TextureRequestState"/> indicating either Progress for textures not fully downloaded,
-            or the final result of the request after it has been processed through the TexturePipeline</param>
-            <param name="assetTexture">The <see cref="T:OpenMetaverse.Assets.AssetTexture"/> object containing the Assets ID, raw data
-            and other information. For progressive rendering the <see cref="F:OpenMetaverse.Assets.Asset.AssetData"/> will contain
-            the data from the beginning of the file. For failed, aborted and timed out requests it will contain
-            an empty byte array.</param>
+        <member name="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.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.GroupManager.m_GroupRolesMembersLock">
+            <summary>Thread sync lock object</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 name="F:OpenMetaverse.GroupManager.m_GroupTitles">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline._Client">
-            <summary>Holds the reference to the <see cref="T:OpenMetaverse.GridClient"/> client object</summary>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupTitles(OpenMetaverse.GroupTitlesReplyEventArgs)">
+            <summary>Raises the GroupTitlesReply event</summary>
+            <param name="e">A GroupTitlesReplyEventArgs object containing the
+            data returned from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.maxTextureRequests">
-            <summary>Maximum concurrent texture requests allowed at a time</summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupTitlesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.resetEvents">
-            <summary>An array of <see cref="T:System.Threading.AutoResetEvent"/> objects used to manage worker request threads</summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupAccountSummary">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.threadpoolSlots">
-            <summary>An array of worker slots which shows the availablity status of the slot</summary>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupAccountSummaryReply(OpenMetaverse.GroupAccountSummaryReplyEventArgs)">
+            <summary>Raises the GroupAccountSummary event</summary>
+            <param name="e">A GroupAccountSummaryReplyEventArgs object containing the
+            data returned from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.downloadMaster">
-            <summary>The primary thread which manages the requests.</summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupAccountSummaryLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline._Running">
-            <summary>true if the TexturePipeline is currently running</summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupCreated">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.lockerObject">
-            <summary>A synchronization object used by the primary thread</summary>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupCreatedReply(OpenMetaverse.GroupCreatedReplyEventArgs)">
+            <summary>Raises the GroupCreated event</summary>
+            <param name="e">An GroupCreatedEventArgs object containing the
+            data returned from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.RefreshDownloadsTimer">
-            <summary>A refresh timer used to increase the priority of stalled requests</summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupCreatedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Default constructor, Instantiates a new copy of the TexturePipeline class
-            </summary>
-            <param name="client">Reference to the instantiated <see cref="T:OpenMetaverse.GridClient"/> object</param>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupJoined">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.Startup">
-            <summary>
-            Initialize callbacks required for the TexturePipeline to operate
-            </summary>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupJoinedReply(OpenMetaverse.GroupOperationEventArgs)">
+            <summary>Raises the GroupJoined event</summary>
+            <param name="e">A GroupOperationEventArgs object containing the
+            result of the operation returned from the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.Shutdown">
-            <summary>
-            Shutdown the TexturePipeline and cleanup any callbacks or transfers
-            </summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupJoinedLock">
+            <summary>Thread sync lock object</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.GroupManager.m_GroupLeft">
+            <summary>The event subscribers. null if no subcribers</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="M:OpenMetaverse.GroupManager.OnGroupLeaveReply(OpenMetaverse.GroupOperationEventArgs)">
+            <summary>Raises the GroupLeft event</summary>
+            <param name="e">A GroupOperationEventArgs object containing the
+            result of the operation returned from the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.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.GroupManager.m_GroupLeftLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.DownloadThread">
-            <summary>
-            Master Download Thread, Queues up downloads in the threadpool
-            </summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupDropped">
+            <summary>The event subscribers. null if no subcribers</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="M:OpenMetaverse.GroupManager.OnGroupDropped(OpenMetaverse.GroupDroppedEventArgs)">
+            <summary>Raises the GroupDropped event</summary>
+            <param name="e">An GroupDroppedEventArgs object containing the
+            the group your agent left</param>
         </member>
-        <member name="M:OpenMetaverse.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.GroupManager.m_GroupDroppedLock">
+            <summary>Thread sync lock object</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.GroupManager.m_GroupMemberEjected">
+            <summary>The event subscribers. null if no subcribers</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="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="P:OpenMetaverse.TexturePipeline.TransferCount">
-            <summary>Current number of pending and in-process transfers</summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupMemberEjectedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.TexturePipeline.TaskInfo">
-            <summary>
-            A request task containing information and status of a request as it is processed through the <see cref="T:OpenMetaverse.TexturePipeline"/>
-            </summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupNoticesListReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.State">
-            <summary>The current <seealso cref="T:OpenMetaverse.TextureRequestState"/> which identifies the current status of the request</summary>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupNoticesListReply(OpenMetaverse.GroupNoticesListReplyEventArgs)">
+            <summary>Raises the GroupNoticesListReply event</summary>
+            <param name="e">An GroupNoticesListReplyEventArgs object containing the
+            data returned from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.RequestID">
-            <summary>The Unique Request ID, This is also the Asset ID of the texture being requested</summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupNoticesListReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.RequestSlot">
-            <summary>The slot this request is occupying in the threadpoolSlots array</summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupInvitation">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.Type">
-            <summary>The ImageType of the request.</summary>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupInvitation(OpenMetaverse.GroupInvitationEventArgs)">
+            <summary>Raises the GroupInvitation event</summary>
+            <param name="e">An GroupInvitationEventArgs object containing the
+            data returned from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.Callbacks">
-            <summary>The callback to fire when the request is complete, will include 
-            the <seealso cref="T:OpenMetaverse.TextureRequestState"/> and the <see cref="T:OpenMetaverse.Assets.AssetTexture"/> 
-            object containing the result data</summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupInvitationLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.ReportProgress">
-            <summary>If true, indicates the callback will be fired whenever new data is returned from the simulator.
-            This is used to progressively render textures as portions of the texture are received.</summary>
+        <member name="F:OpenMetaverse.GroupManager.Client">
+            <summary>A reference to the current <seealso cref="T:OpenMetaverse.GridClient"/> instance</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.Transfer">
-            <summary>An object that maintains the data of an request thats in-process.</summary>
+        <member name="F:OpenMetaverse.GroupManager.GroupMembersRequests">
+            <summary>Currently-active group members requests</summary>
         </member>
-        <member name="T:OpenMetaverse.BitPack">
-            <summary>
-            Wrapper around a byte array that allows bit to be packed and unpacked
-            one at a time or by a variable amount. Useful for very tightly packed
-            data like LayerData packets
-            </summary>
+        <member name="F:OpenMetaverse.GroupManager.GroupRolesRequests">
+            <summary>Currently-active group roles requests</summary>
         </member>
-        <member name="F:OpenMetaverse.BitPack.Data">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.GroupRolesMembersRequests">
+            <summary>Currently-active group role-member requests</summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.#ctor(System.Byte[],System.Int32)">
+        <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="M:OpenMetaverse.GroupManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            Default constructor, initialize the bit packer / bit unpacker
-            with a byte array and starting position
+            Construct a new instance of the GroupManager class
             </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="client">A reference to the current <seealso cref="T:OpenMetaverse.GridClient"/> instance</param>
         </member>
-        <member name="M:OpenMetaverse.BitPack.PackFloat(System.Single)">
+        <member name="M:OpenMetaverse.GroupManager.RequestCurrentGroups">
             <summary>
-            Pack a floating point value in to the data
+            Request a current list of groups the avatar is a member of.
             </summary>
-            <param name="data">Floating point value to pack</param>
+            <remarks>CAPS Event Queue must be running for this to work since the results
+            come across CAPS.</remarks>
         </member>
-        <member name="M:OpenMetaverse.BitPack.PackBits(System.Int32,System.Int32)">
+        <member name="M:OpenMetaverse.GroupManager.RequestGroupName(OpenMetaverse.UUID)">
             <summary>
-            Pack part or all of an integer in to the data
+            Lookup name of group based on groupID
             </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="groupID">groupID of group to lookup name for.</param>
         </member>
-        <member name="M:OpenMetaverse.BitPack.PackBits(System.UInt32,System.Int32)">
+        <member name="M:OpenMetaverse.GroupManager.RequestGroupNames(System.Collections.Generic.List{OpenMetaverse.UUID})">
             <summary>
-            Pack part or all of an unsigned integer in to the data
+            Request lookup of multiple group names
             </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="groupIDs">List of group IDs to request.</param>
         </member>
-        <member name="M:OpenMetaverse.BitPack.PackBit(System.Boolean)">
-            <summary>
-            Pack a single bit in to the data
-            </summary>
-            <param name="bit">Bit to pack</param>
+        <member name="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.BitPack.PackFixed(System.Single,System.Boolean,System.Int32,System.Int32)">
-            <summary>
-            
-            </summary>
-            <param name="data"></param>
-            <param name="isSigned"></param>
-            <param name="intBits"></param>
-            <param name="fracBits"></param>
+        <member name="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.BitPack.PackUUID(OpenMetaverse.UUID)">
-            <summary>
-            
-            </summary>
-            <param name="data"></param>
+        <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.BitPack.PackColor(OpenMetaverse.Color4)">
-            <summary>
-            
-            </summary>
-            <param name="data"></param>
+        <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.BitPack.UnpackFloat">
-            <summary>
-            Unpacking a floating point value from the data
-            </summary>
-            <returns>Unpacked floating point value</returns>
+        <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.BitPack.UnpackBits(System.Int32)">
-            <summary>
-            Unpack a variable number of bits from the data in to integer format
-            </summary>
-            <param name="totalCount">Number of bits to unpack</param>
-            <returns>An integer containing the unpacked bits</returns>
-            <remarks>This function is only useful up to 32 bits</remarks>
+        <member name="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.BitPack.UnpackUBits(System.Int32)">
-            <summary>
-            Unpack a variable number of bits from the data in to unsigned 
-            integer format
-            </summary>
-            <param name="totalCount">Number of bits to unpack</param>
-            <returns>An unsigned integer containing the unpacked bits</returns>
-            <remarks>This function is only useful up to 32 bits</remarks>
+        <member name="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.BitPack.UnpackShort">
-            <summary>
-            Unpack a 16-bit signed integer
-            </summary>
-            <returns>16-bit signed integer</returns>
+        <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.BitPack.UnpackUShort">
-            <summary>
-            Unpack a 16-bit unsigned integer
-            </summary>
-            <returns>16-bit unsigned integer</returns>
+        <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.BitPack.UnpackInt">
-            <summary>
-            Unpack a 32-bit signed integer
-            </summary>
-            <returns>32-bit signed integer</returns>
+        <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="M:OpenMetaverse.BitPack.UnpackUInt">
+        <member name="M:OpenMetaverse.GroupManager.SetGroupAcceptNotices(OpenMetaverse.UUID,System.Boolean,System.Boolean)">
             <summary>
-            Unpack a 32-bit unsigned integer
+            Save wheather agent wants to accept group notices and list this group in their profile
             </summary>
-            <returns>32-bit unsigned integer</returns>
-        </member>
-        <member name="P:OpenMetaverse.BitPack.BytePos">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.BitPack.BitPos">
-            <summary></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.AssetCache">
-            <summary>
-            Class that handles the local asset cache
-            </summary>
+        <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.AssetCache.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.GroupManager.RequestCreateGroup(OpenMetaverse.Group)">
             <summary>
-            Default constructor
+            Request to create a new group. If the group is successfully
+            created, L$100 will automatically be deducted
             </summary>
-            <param name="client">A reference to the GridClient object</param>
+            <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.AssetCache.DestroyTimer">
-            <summary>
-            Disposes cleanup timer
-            </summary>
+        <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.AssetCache.SetupTimer">
-            <summary>
-            Only create timer when needed
-            </summary>
+        <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.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="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.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="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.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="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.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="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.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="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.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="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.AssetCache.Clear">
-            <summary>
-            Wipes out entire cache
-            </summary>
+        <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.AssetCache.Prune">
-            <summary>
-            Brings cache size to the 90% of the max size
-            </summary>
+        <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.AssetCache.BeginPrune">
-            <summary>
-            Asynchronously brings cache size to the 90% of the max size
-            </summary>
+        <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.AssetCache.GetFileSize(System.IO.FileInfo[])">
-            <summary>
-            Adds up file sizes passes in a FileInfo array
-            </summary>
+        <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.AssetCache.Operational">
-            <summary>
-            Checks whether caching is enabled
-            </summary>
+        <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.AssetCache.cleanerTimer_Elapsed(System.Object,System.Timers.ElapsedEventArgs)">
-            <summary>
-            Periodically prune the cache
-            </summary>
+        <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.AssetCache.NiceFileSize(System.Int64)">
-            <summary>
-            Nicely formats file sizes
-            </summary>
-            <param name="byteCount">Byte size we want to output</param>
-            <returns>String with humanly readable file size</returns>
+        <member name="M:OpenMetaverse.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="P:OpenMetaverse.AssetCache.AutoPruneEnabled">
-            <summary>
-            Allows setting weather to periodicale prune the cache if it grows too big
-            Default is enabled, when caching is enabled
-            </summary>
+        <member name="M:OpenMetaverse.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="P:OpenMetaverse.AssetCache.AutoPruneInterval">
-            <summary>
-            How long (in ms) between cache checks (default is 5 min.) 
-            </summary>
+        <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.AssetCache.SortFilesByAccesTimeHelper">
-            <summary>
-            Helper class for sorting files by their last accessed time
-            </summary>
+        <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.Imaging.LoadTGAClass">
-            <summary>
-            Capability to load TGAs to Bitmap 
-            </summary>
+        <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.Assets.AssetSound">
-            <summary>
-            Represents a Sound Asset
-            </summary>
+        <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.Assets.AssetSound.#ctor">
-            <summary>Initializes a new instance of an AssetSound object</summary>
+        <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.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="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.Assets.AssetSound.Encode">
-            <summary>
-            TODO: Encodes a sound file
-            </summary>
+        <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.Assets.AssetSound.Decode">
-            <summary>
-            TODO: Decode a sound file
-            </summary>
-            <returns>true</returns>
+        <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="P:OpenMetaverse.Assets.AssetSound.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <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.Assets.AssetScriptText">
-            <summary>
-            Represents an LSL Text object containing a string of UTF encoded characters
-            </summary>
+        <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="F:OpenMetaverse.Assets.AssetScriptText.Source">
-            <summary>A string of characters represting the script contents</summary>
+        <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="M:OpenMetaverse.Assets.AssetScriptText.#ctor">
-            <summary>Initializes a new AssetScriptText object</summary>
+        <member name="E:OpenMetaverse.GroupManager.CurrentGroups">
+            <summary>Raised when the simulator sends us data containing
+            our current group membership</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="E:OpenMetaverse.GroupManager.GroupNamesReply">
+            <summary>Raised when the simulator responds to a RequestGroupName 
+            or RequestGroupNames request</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptText.Encode">
-            <summary>
-            Encode a string containing the scripts contents into byte encoded AssetData
-            </summary>
+        <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="M:OpenMetaverse.Assets.AssetScriptText.Decode">
-            <summary>
-            Decode a byte array containing the scripts contents into a string
-            </summary>
-            <returns>true if decoding is successful</returns>
+        <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="P:OpenMetaverse.Assets.AssetScriptText.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="E:OpenMetaverse.GroupManager.GroupRoleDataReply">
+            <summary>Raised when the simulator responds to a <see cref="!:RequestGroupRoleData"/> request</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetLandmark">
-            <summary>
-            Represents a Landmark with RegionID and Position vector
-            </summary>
+        <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="F:OpenMetaverse.Assets.AssetLandmark.RegionID">
-            <summary>UUID of the Landmark target region</summary>
+        <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="F:OpenMetaverse.Assets.AssetLandmark.Position">
-            <summary> Local position of the target </summary>
+        <member name="E:OpenMetaverse.GroupManager.GroupAccountSummaryReply">
+            <summary>Raised when a response to a RequestGroupAccountSummary is returned
+            by the simulator</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetLandmark.#ctor">
-            <summary>Construct an Asset of type Landmark</summary>
+        <member name="E:OpenMetaverse.GroupManager.GroupCreatedReply">
+            <summary>Raised when a request to create a group is successful</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="E:OpenMetaverse.GroupManager.GroupJoinedReply">
+            <summary>Raised when a request to join a group either
+            fails or succeeds</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="E:OpenMetaverse.GroupManager.GroupLeaveReply">
+            <summary>Raised when a request to leave a group either
+            fails or succeeds</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetLandmark.Decode">
-            <summary>
-            Decode the raw asset data, populating the RegionID and Position
-            </summary>
-            <returns>true if the AssetData was successfully decoded to a UUID and Vector</returns>
+        <member name="E:OpenMetaverse.GroupManager.GroupDropped">
+            <summary>Raised when A group is removed from the group server</summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetLandmark.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <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.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 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="M:OpenMetaverse.Assets.AssetClothing.#ctor">
-            <summary>Initializes a new instance of an AssetScriptBinary object</summary>
+        <member name="E:OpenMetaverse.GroupManager.GroupInvitation">
+            <summary>Raised when another agent invites our avatar to join a group</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 name="T:OpenMetaverse.CurrentGroupsEventArgs">
+            <summary>Contains the current groups your agent is a member of</summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetClothing.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <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.GridClient">
+        <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})">
             <summary>
-            Main class to expose grid functionality to clients. All of the
-            classes needed for sending and receiving data are accessible through 
-            this class.
+            Construct a new instance of the GroupMembersReplyEventArgs 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>
+            <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="F:OpenMetaverse.GridClient.Network">
-            <summary>Networking subsystem</summary>
+        <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="F:OpenMetaverse.GridClient.Settings">
-            <summary>Settings class including constant values and changeable
-            parameters for everything</summary>
+        <member name="P:OpenMetaverse.GroupMembersReplyEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Parcels">
-            <summary>Parcel (subdivided simulator lots) subsystem</summary>
+        <member name="P:OpenMetaverse.GroupMembersReplyEventArgs.Members">
+            <summary>Get the dictionary of members</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Self">
-            <summary>Our own avatars subsystem</summary>
+        <member name="T:OpenMetaverse.GroupRolesDataReplyEventArgs">
+            <summary>Represents the roles associated with a group</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Avatars">
-            <summary>Other avatars subsystem</summary>
+        <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="F:OpenMetaverse.GridClient.Estate">
-            <summary>Estate subsystem</summary>
+        <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="F:OpenMetaverse.GridClient.Friends">
-            <summary>Friends list subsystem</summary>
+        <member name="P:OpenMetaverse.GroupRolesDataReplyEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Grid">
-            <summary>Grid (aka simulator group) subsystem</summary>
+        <member name="P:OpenMetaverse.GroupRolesDataReplyEventArgs.Roles">
+            <summary>Get the dictionary containing the roles</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Objects">
-            <summary>Object subsystem</summary>
+        <member name="T:OpenMetaverse.GroupRolesMembersReplyEventArgs">
+            <summary>Represents the Role to Member mappings for a group</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Groups">
-            <summary>Group subsystem</summary>
+        <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="F:OpenMetaverse.GridClient.Assets">
-            <summary>Asset subsystem</summary>
+        <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="F:OpenMetaverse.GridClient.Appearance">
-            <summary>Appearance subsystem</summary>
+        <member name="P:OpenMetaverse.GroupRolesMembersReplyEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Inventory">
-            <summary>Inventory subsystem</summary>
+        <member name="P:OpenMetaverse.GroupRolesMembersReplyEventArgs.RolesMembers">
+            <summary>Get the member to roles map</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Directory">
-            <summary>Directory searches including classifieds, people, land 
-            sales, etc</summary>
+        <member name="T:OpenMetaverse.GroupTitlesReplyEventArgs">
+            <summary>Represents the titles for a group</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Terrain">
-            <summary>Handles land, wind, and cloud heightmaps</summary>
+        <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="F:OpenMetaverse.GridClient.Sound">
-            <summary>Handles sound-related networking</summary>
+        <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="F:OpenMetaverse.GridClient.Throttle">
-            <summary>Throttling total bandwidth usage, or allocating bandwidth
-            for specific data stream types</summary>
+        <member name="P:OpenMetaverse.GroupTitlesReplyEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="M:OpenMetaverse.GridClient.#ctor">
+        <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>
+        <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="P:OpenMetaverse.GroupNoticesListReplyEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
+        </member>
+        <member name="P:OpenMetaverse.GroupNoticesListReplyEventArgs.Notices">
+            <summary>Get the notices list</summary>
+        </member>
+        <member name="T:OpenMetaverse.GroupProfileEventArgs">
+            <summary>Represents the profile of a group</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>
+        <member name="P:OpenMetaverse.GroupProfileEventArgs.Group">
+            <summary>Get the group profile</summary>
+        </member>
+        <member name="T:OpenMetaverse.GroupInvitationEventArgs">
             <summary>
-            Default constructor
+            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="M:OpenMetaverse.GridClient.ToString">
+        <member name="P:OpenMetaverse.GroupInvitationEventArgs.AgentID">
+            <summary>The ID of the Avatar sending the group invitation</summary>
+        </member>
+        <member name="P:OpenMetaverse.GroupInvitationEventArgs.FromName">
+            <summary>The name of the Avatar sending the group invitation</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>
+        <member name="P:OpenMetaverse.GroupInvitationEventArgs.Simulator">
+            <summary>The Simulator</summary>
+        </member>
+        <member name="P:OpenMetaverse.GroupInvitationEventArgs.Accept">
+            <summary>Set to true to accept invitation, false to decline</summary>
+        </member>
+        <member name="T:OpenMetaverse.Rendering.LindenMesh.LODMesh">
             <summary>
-            Return the full name of this instance
+            Level of Detail mesh
             </summary>
-            <returns>Client avatars full name</returns>
         </member>
-        <member name="M:OpenMetaverse.Packets.Packet.BuildPacket(System.String,OpenMetaverse.StructuredData.OSDMap)">
+        <member name="T:OpenMetaverse.Assets.AssetClothing">
             <summary>
-            Attempts to convert an LLSD structure to a known Packet type
+            Represents an <seealso cref="T:OpenMetaverse.Assets.AssetWearable"/> that can be worn on an avatar
+            such as a Shirt, Pants, etc.
             </summary>
-            <param name="capsEventName">Event name, this must match an actual
-            packet name for a Packet to be successfully built</param>
-            <param name="body">LLSD to convert to a Packet</param>
-            <returns>A Packet on success, otherwise null</returns>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Width">
+        <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.TarArchiveReader">
             <summary>
-            Image width
+            Temporary code to do the bare minimum required to read a tar archive for our purposes
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Height">
+        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_br">
             <summary>
-            Image height
+            Binary reader for the underlying stream
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Channels">
+        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_nullCharArray">
             <summary>
-            Image channel flags
+            Used to trim off null chars
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Red">
+        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_spaceCharArray">
             <summary>
-            Red channel data
+            Used to trim off space chars
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Green">
+        <member name="M:OpenMetaverse.Assets.TarArchiveReader.#ctor(System.IO.Stream)">
             <summary>
-            Green channel data
+            Generate a tar reader which reads from the given stream.
             </summary>
+            <param name="s"></param>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Blue">
+        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadEntry(System.String@,OpenMetaverse.Assets.TarArchiveReader.TarEntryType@)">
             <summary>
-            Blue channel data
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Alpha">
-            <summary>
-            Alpha channel data
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Bump">
-            <summary>
-            Bump channel data
-            </summary>
-        </member>
-        <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.Imaging.ManagedImage.#ctor(System.Drawing.Bitmap)">
-            <summary>
-            
+            Read the next entry in the tar file.
             </summary>
-            <param name="bitmap"></param>
+            <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.Imaging.ManagedImage.ConvertChannels(OpenMetaverse.Imaging.ManagedImage.ImageChannels)">
+        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadHeader">
             <summary>
-            Convert the channels in the image. Channels are created or destroyed as required.
+            Read the next 512 byte chunk of data as a tar header.
             </summary>
-            <param name="channels">new channel flags</param>
+            <returns>A tar header struct.  null if we have reached the end of the archive.</returns>
         </member>
-        <member name="M:OpenMetaverse.Imaging.ManagedImage.ResizeNearestNeighbor(System.Int32,System.Int32)">
+        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadData(System.Int32)">
             <summary>
-            Resize or stretch the image using nearest neighbor (ugly) resampling
+            Read data following a header
             </summary>
-            <param name="width">new width</param>
-            <param name="height">new height</param>
+            <param name="fileSize"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Imaging.ManagedImage.ExportRaw">
+        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ConvertOctalBytesToDecimal(System.Byte[],System.Int32,System.Int32)">
             <summary>
-            Create a byte array containing 32-bit RGBA data with a bottom-left
-            origin, suitable for feeding directly into OpenGL
+            Convert octal bytes to a decimal representation
             </summary>
-            <returns>A byte array containing raw texture data</returns>
+            <param name="bytes"></param>
+            <param name="count"></param>
+            <param name="startIndex"></param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetTexture">
+        <member name="T:OpenMetaverse.ObjectReturnType">
             <summary>
-            Represents a texture
+            Type of return to use when returning objects from a parcel
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetTexture.Image">
-            <summary>A <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object containing image data</summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.AssetTexture.LayerInfo">
+        <member name="F:OpenMetaverse.ObjectReturnType.None">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetTexture.Components">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ObjectReturnType.Owner">
+            <summary>Return objects owned by parcel owner</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetTexture.#ctor">
-            <summary>Initializes a new instance of an AssetTexture object</summary>
+        <member name="F:OpenMetaverse.ObjectReturnType.Group">
+            <summary>Return objects set to group</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 name="F:OpenMetaverse.ObjectReturnType.Other">
+            <summary>Return objects not owned by parcel owner or set to group</summary>
         </member>
-        <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 name="F:OpenMetaverse.ObjectReturnType.List">
+            <summary>Return a specific list of objects on parcel</summary>
         </member>
-        <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 name="F:OpenMetaverse.ObjectReturnType.Sell">
+            <summary>Return objects that are marked for-sale</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetTexture.Decode">
+        <member name="T:OpenMetaverse.ParcelAccessFlags">
             <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"/>
+            Blacklist/Whitelist flags used in parcels Access List
             </summary>
-            <returns>True if the decoding was successful, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetTexture.DecodeLayerBoundaries">
-            <summary>
-            Decodes the begin and end byte positions for each quality layer in
-            the image
-            </summary>
-            <returns></returns>
+        <member name="F:OpenMetaverse.ParcelAccessFlags.NoAccess">
+            <summary>Agent is denied access</summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetTexture.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="F:OpenMetaverse.ParcelAccessFlags.Access">
+            <summary>Agent is granted access</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.TarArchiveReader">
+        <member name="T:OpenMetaverse.ParcelResult">
             <summary>
-            Temporary code to do the bare minimum required to read a tar archive for our purposes
+            The result of a request for parcel properties
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_br">
-            <summary>
-            Binary reader for the underlying stream
-            </summary>
+        <member name="F:OpenMetaverse.ParcelResult.NoData">
+            <summary>No matches were found for the request</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_nullCharArray">
-            <summary>
-            Used to trim off null chars
-            </summary>
+        <member name="F:OpenMetaverse.ParcelResult.Single">
+            <summary>Request matched a single parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_spaceCharArray">
-            <summary>
-            Used to trim off space chars
-            </summary>
+        <member name="F:OpenMetaverse.ParcelResult.Multiple">
+            <summary>Request matched multiple parcels</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveReader.#ctor(System.IO.Stream)">
+        <member name="T:OpenMetaverse.AccessList">
             <summary>
-            Generate a tar reader which reads from the given stream.
+            Flags used in the ParcelAccessListRequest packet to specify whether
+            we want the access list (whitelist), ban list (blacklist), or both
             </summary>
-            <param name="s"></param>
         </member>
-        <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 name="F:OpenMetaverse.AccessList.Access">
+            <summary>Request the access list</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadHeader">
-            <summary>
-            Read the next 512 byte chunk of data as a tar header.
-            </summary>
-            <returns>A tar header struct.  null if we have reached the end of the archive.</returns>
+        <member name="F:OpenMetaverse.AccessList.Ban">
+            <summary>Request the ban list</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadData(System.Int32)">
-            <summary>
-            Read data following a header
-            </summary>
-            <param name="fileSize"></param>
-            <returns></returns>
+        <member name="F:OpenMetaverse.AccessList.Both">
+            <summary>Request both White and Black lists</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ConvertOctalBytesToDecimal(System.Byte[],System.Int32,System.Int32)">
+        <member name="T:OpenMetaverse.ParcelPropertiesStatus">
             <summary>
-            Convert octal bytes to a decimal representation
+            Sequence ID in ParcelPropertiesReply packets (sent when avatar
+            tries to cross a parcel border)
             </summary>
-            <param name="bytes"></param>
-            <param name="count"></param>
-            <param name="startIndex"></param>
-            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.TerrainPatch.X">
-            <summary>X position of this patch</summary>
+        <member name="F:OpenMetaverse.ParcelPropertiesStatus.ParcelSelected">
+            <summary>Parcel is currently selected</summary>
         </member>
-        <member name="F:OpenMetaverse.TerrainPatch.Y">
-            <summary>Y position of this patch</summary>
+        <member name="F:OpenMetaverse.ParcelPropertiesStatus.CollisionNotInGroup">
+            <summary>Parcel restricted to a group the avatar is not a
+            member of</summary>
         </member>
-        <member name="F:OpenMetaverse.TerrainPatch.Data">
-            <summary>A 16x16 array of floats holding decompressed layer data</summary>
+        <member name="F:OpenMetaverse.ParcelPropertiesStatus.CollisionBanned">
+            <summary>Avatar is banned from the parcel</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.ParcelPropertiesStatus.CollisionNotOnAccessList">
+            <summary>Parcel is restricted to an access list that the
+            avatar is not on</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.ParcelPropertiesStatus.HoveredOverParcel">
+            <summary>Response to hovering over a parcel</summary>
         </member>
-        <member name="T:OpenMetaverse.ReportType">
+        <member name="T:OpenMetaverse.TerraformAction">
             <summary>
-            
+            The tool to use when modifying terrain levels
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ReportType.None">
-            <summary>No report</summary>
+        <member name="F:OpenMetaverse.TerraformAction.Level">
+            <summary>Level the terrain</summary>
         </member>
-        <member name="F:OpenMetaverse.ReportType.Unknown">
-            <summary>Unknown report type</summary>
+        <member name="F:OpenMetaverse.TerraformAction.Raise">
+            <summary>Raise the terrain</summary>
         </member>
-        <member name="F:OpenMetaverse.ReportType.Bug">
-            <summary>Bug report</summary>
+        <member name="F:OpenMetaverse.TerraformAction.Lower">
+            <summary>Lower the terrain</summary>
         </member>
-        <member name="F:OpenMetaverse.ReportType.Complaint">
-            <summary>Complaint report</summary>
+        <member name="F:OpenMetaverse.TerraformAction.Smooth">
+            <summary>Smooth the terrain</summary>
         </member>
-        <member name="F:OpenMetaverse.ReportType.CustomerServiceRequest">
-            <summary>Customer service report</summary>
+        <member name="F:OpenMetaverse.TerraformAction.Noise">
+            <summary>Add random noise to the terrain</summary>
         </member>
-        <member name="T:OpenMetaverse.CompressedFlags">
+        <member name="F:OpenMetaverse.TerraformAction.Revert">
+            <summary>Revert terrain to simulator default</summary>
+        </member>
+        <member name="T:OpenMetaverse.TerraformBrushSize">
             <summary>
-            Bitflag field for ObjectUpdateCompressed data blocks, describing 
-            which options are present for each object
+            The tool size to use when changing terrain levels
             </summary>
         </member>
-        <member name="F:OpenMetaverse.CompressedFlags.ScratchPad">
-            <summary>Unknown</summary>
+        <member name="F:OpenMetaverse.TerraformBrushSize.Small">
+            <summary>Small</summary>
         </member>
-        <member name="F:OpenMetaverse.CompressedFlags.Tree">
-            <summary>Whether the object has a TreeSpecies</summary>
+        <member name="F:OpenMetaverse.TerraformBrushSize.Medium">
+            <summary>Medium</summary>
         </member>
-        <member name="F:OpenMetaverse.CompressedFlags.HasText">
-            <summary>Whether the object has floating text ala llSetText</summary>
+        <member name="F:OpenMetaverse.TerraformBrushSize.Large">
+            <summary>Large</summary>
         </member>
-        <member name="F:OpenMetaverse.CompressedFlags.HasParticles">
-            <summary>Whether the object has an active particle system</summary>
+        <member name="T:OpenMetaverse.AccessDeniedReason">
+            <summary>
+            Reasons agent is denied access to a parcel on the simulator
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.CompressedFlags.HasSound">
-            <summary>Whether the object has sound attached to it</summary>
+        <member name="F:OpenMetaverse.AccessDeniedReason.NotDenied">
+            <summary>Agent is not denied, access is granted</summary>
         </member>
-        <member name="F:OpenMetaverse.CompressedFlags.HasParent">
-            <summary>Whether the object is attached to a root object or not</summary>
+        <member name="F:OpenMetaverse.AccessDeniedReason.NotInGroup">
+            <summary>Agent is not a member of the group set for the parcel, or which owns the parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.CompressedFlags.TextureAnimation">
-            <summary>Whether the object has texture animation settings</summary>
+        <member name="F:OpenMetaverse.AccessDeniedReason.NotOnAllowList">
+            <summary>Agent is not on the parcels specific allow list</summary>
         </member>
-        <member name="F:OpenMetaverse.CompressedFlags.HasAngularVelocity">
-            <summary>Whether the object has an angular velocity</summary>
+        <member name="F:OpenMetaverse.AccessDeniedReason.BannedFromParcel">
+            <summary>Agent is on the parcels ban list</summary>
         </member>
-        <member name="F:OpenMetaverse.CompressedFlags.HasNameValues">
-            <summary>Whether the object has a name value pairs string</summary>
+        <member name="F:OpenMetaverse.AccessDeniedReason.NoAccess">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.CompressedFlags.MediaURL">
-            <summary>Whether the object has a Media URL set</summary>
+        <member name="F:OpenMetaverse.AccessDeniedReason.NotAgeVerified">
+            <summary>Agent is not age verified and parcel settings deny access to non age verified avatars</summary>
         </member>
-        <member name="T:OpenMetaverse.UpdateType">
+        <member name="T:OpenMetaverse.ParcelOverlayType">
             <summary>
-            Specific Flags for MultipleObjectUpdate requests
+            Parcel overlay type. This is used primarily for highlighting and
+            coloring which is why it is a single integer instead of a set of
+            flags
             </summary>
+            <remarks>These values seem to be poorly thought out. The first three
+            bits represent a single value, not flags. For example Auction (0x05) is
+            not a combination of OwnedByOther (0x01) and ForSale(0x04). However,
+            the BorderWest and BorderSouth values are bit flags that get attached
+            to the value stored in the first three bits. Bits four, five, and six
+            are unused</remarks>
         </member>
-        <member name="F:OpenMetaverse.UpdateType.None">
-            <summary>None</summary>
+        <member name="F:OpenMetaverse.ParcelOverlayType.Public">
+            <summary>Public land</summary>
         </member>
-        <member name="F:OpenMetaverse.UpdateType.Position">
-            <summary>Change position of prims</summary>
+        <member name="F:OpenMetaverse.ParcelOverlayType.OwnedByOther">
+            <summary>Land is owned by another avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.UpdateType.Rotation">
-            <summary>Change rotation of prims</summary>
+        <member name="F:OpenMetaverse.ParcelOverlayType.OwnedByGroup">
+            <summary>Land is owned by a group</summary>
         </member>
-        <member name="F:OpenMetaverse.UpdateType.Scale">
-            <summary>Change size of prims</summary>
+        <member name="F:OpenMetaverse.ParcelOverlayType.OwnedBySelf">
+            <summary>Land is owned by the current avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.UpdateType.Linked">
-            <summary>Perform operation on link set</summary>
+        <member name="F:OpenMetaverse.ParcelOverlayType.ForSale">
+            <summary>Land is for sale</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 name="F:OpenMetaverse.ParcelOverlayType.Auction">
+            <summary>Land is being auctioned</summary>
         </member>
-        <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 name="F:OpenMetaverse.ParcelOverlayType.Private">
+            <summary>Land is private</summary>
         </member>
-        <member name="F:OpenMetaverse.PayPriceType.Hide">
-            <summary>
-            Indicates that this pay option should be hidden
-            </summary>
+        <member name="F:OpenMetaverse.ParcelOverlayType.BorderWest">
+            <summary>To the west of this area is a parcel border</summary>
         </member>
-        <member name="F:OpenMetaverse.PayPriceType.Default">
-            <summary>
-            Indicates that this pay option should have the default value
-            </summary>
+        <member name="F:OpenMetaverse.ParcelOverlayType.BorderSouth">
+            <summary>To the south of this area is a parcel border</summary>
         </member>
-        <member name="T:OpenMetaverse.ObjectMovementUpdate">
+        <member name="T:OpenMetaverse.ParcelFlags">
             <summary>
-            Contains the variables sent in an object update packet for objects. 
-            Used to track position and movement of prims and avatars
+            Various parcel properties
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.Avatar">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ParcelFlags.None">
+            <summary>No flags set</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.CollisionPlane">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowFly">
+            <summary>Allow avatars to fly (a client-side only restriction)</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.State">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowOtherScripts">
+            <summary>Allow foreign scripts to run</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.LocalID">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ParcelFlags.ForSale">
+            <summary>This parcel is for sale</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.Position">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowLandmark">
+            <summary>Allow avatars to create a landmark on this parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.Velocity">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowTerraform">
+            <summary>Allows all avatars to edit the terrain on this parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.Acceleration">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowDamage">
+            <summary>Avatars have health and can take damage on this parcel.
+            If set, avatars can be killed and sent home here</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.Rotation">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ParcelFlags.CreateObjects">
+            <summary>Foreign avatars can create objects here</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.AngularVelocity">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ParcelFlags.ForSaleObjects">
+            <summary>All objects on this parcel can be purchased</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.Textures">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ParcelFlags.UseAccessGroup">
+            <summary>Access is restricted to a group</summary>
         </member>
-        <member name="T:OpenMetaverse.ObjectManager">
-            <summary>
-            Handles all network traffic related to prims and avatar positions and 
-            movement.
-            </summary>
+        <member name="F:OpenMetaverse.ParcelFlags.UseAccessList">
+            <summary>Access is restricted to a whitelist</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectUpdate">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.UseBanList">
+            <summary>Ban blacklist is enabled</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectUpdateLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.UsePassList">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectProperties">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.ShowDirectory">
+            <summary>List this parcel in the search directory</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnObjectProperties(OpenMetaverse.ObjectPropertiesEventArgs)">
-            <summary>Raises the ObjectProperties Event</summary>
-             <param name="e">A ObjectPropertiesEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowDeedToGroup">
+            <summary>Allow personally owned parcels to be deeded to group</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.ContributeWithDeed">
+            <summary>If Deeded, owner contributes required tier to group parcel is deeded to</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesUpdated">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.SoundLocal">
+            <summary>Restrict sounds originating on this parcel to the 
+            parcel boundaries</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnObjectPropertiesUpdated(OpenMetaverse.ObjectPropertiesUpdatedEventArgs)">
-            <summary>Raises the ObjectPropertiesUpdated Event</summary>
-             <param name="e">A ObjectPropertiesUpdatedEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.ParcelFlags.SellParcelObjects">
+            <summary>Objects on this parcel are sold when the land is 
+            purchsaed</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesUpdatedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowPublish">
+            <summary>Allow this parcel to be published on the web</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesFamily">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.MaturePublish">
+            <summary>The information for this parcel is mature content</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnObjectPropertiesFamily(OpenMetaverse.ObjectPropertiesFamilyEventArgs)">
-            <summary>Raises the ObjectPropertiesFamily Event</summary>
-             <param name="e">A ObjectPropertiesFamilyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.ParcelFlags.UrlWebPage">
+            <summary>The media URL is an HTML page</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesFamilyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.UrlRawHtml">
+            <summary>The media URL is a raw HTML string</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_AvatarUpdate">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.RestrictPushObject">
+            <summary>Restrict foreign object pushes</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnAvatarUpdate(OpenMetaverse.AvatarUpdateEventArgs)">
-            <summary>Raises the AvatarUpdate Event</summary>
-             <param name="e">A AvatarUpdateEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.ParcelFlags.DenyAnonymous">
+            <summary>Ban all non identified/transacted avatars</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_AvatarUpdateLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowGroupScripts">
+            <summary>Allow group-owned scripts to run</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_TerseObjectUpdate">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.CreateGroupObjects">
+            <summary>Allow object creation by group members or group 
+            objects</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_TerseObjectUpdateLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowAPrimitiveEntry">
+            <summary>Allow all objects to enter this parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectDataBlockUpdate">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowGroupObjectEntry">
+            <summary>Only allow group and owner objects to enter this parcel</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnObjectDataBlockUpdate(OpenMetaverse.ObjectDataBlockUpdateEventArgs)">
-            <summary>Raises the ObjectDataBlockUpdate Event</summary>
-             <param name="e">A ObjectDataBlockUpdateEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowVoiceChat">
+            <summary>Voice Enabled on this parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectDataBlockUpdateLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.UseEstateVoiceChan">
+            <summary>Use Estate Voice channel for Voice on this parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_KillObject">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.DenyAgeUnverified">
+            <summary>Deny Age Unverified Users</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnKillObject(OpenMetaverse.KillObjectEventArgs)">
-            <summary>Raises the KillObject Event</summary>
-             <param name="e">A KillObjectEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.ParcelStatus">
+            <summary>
+            Parcel ownership status
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_KillObjectLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.ParcelStatus.None">
+            <summary>Placeholder</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_AvatarSitChanged">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.ParcelStatus.Leased">
+            <summary>Parcel is leased (owned) by an avatar or group</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnAvatarSitChanged(OpenMetaverse.AvatarSitChangedEventArgs)">
-            <summary>Raises the AvatarSitChanged Event</summary>
-             <param name="e">A AvatarSitChangedEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.ParcelStatus.LeasePending">
+            <summary>Parcel is in process of being leased (purchased) by an avatar or group</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_AvatarSitChangedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.ParcelStatus.Abandoned">
+            <summary>Parcel has been abandoned back to Governor Linden</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_PayPriceReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.ParcelCategory">
+            <summary>
+            Category parcel is listed in under search
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnPayPriceReply(OpenMetaverse.PayPriceReplyEventArgs)">
-            <summary>Raises the PayPriceReply Event</summary>
-             <param name="e">A PayPriceReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.ParcelCategory.None">
+            <summary>No assigned category</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_PayPriceReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.ParcelCategory.Linden">
+            <summary>Linden Infohub or public area</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.Client">
-            <summary>Reference to the GridClient object</summary>
+        <member name="F:OpenMetaverse.ParcelCategory.Adult">
+            <summary>Adult themed area</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 name="F:OpenMetaverse.ParcelCategory.Arts">
+            <summary>Arts and Culture</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Construct a new instance of the ObjectManager class
-            </summary>
-            <param name="client">A reference to the <see cref="T:OpenMetaverse.GridClient"/> instance</param>
+        <member name="F:OpenMetaverse.ParcelCategory.Business">
+            <summary>Business</summary>
         </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 name="F:OpenMetaverse.ParcelCategory.Educational">
+            <summary>Educational</summary>
         </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 name="F:OpenMetaverse.ParcelCategory.Gaming">
+            <summary>Gaming</summary>
         </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 name="F:OpenMetaverse.ParcelCategory.Hangout">
+            <summary>Hangout or Club</summary>
         </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 name="F:OpenMetaverse.ParcelCategory.Newcomer">
+            <summary>Newcomer friendly</summary>
         </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 name="F:OpenMetaverse.ParcelCategory.Park">
+            <summary>Parks and Nature</summary>
         </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 name="F:OpenMetaverse.ParcelCategory.Residential">
+            <summary>Residential</summary>
         </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 name="F:OpenMetaverse.ParcelCategory.Shopping">
+            <summary>Shopping</summary>
         </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 name="F:OpenMetaverse.ParcelCategory.Stage">
+            <summary>Not Used?</summary>
         </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 name="F:OpenMetaverse.ParcelCategory.Other">
+            <summary>Other</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetSaleInfo(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.SaleType,System.Int32)">
+        <member name="F:OpenMetaverse.ParcelCategory.Any">
+            <summary>Not an actual category, only used for queries</summary>
+        </member>
+        <member name="T:OpenMetaverse.LandingType">
             <summary>
-            Sets the sale properties of a single object
+            Type of teleport landing for a parcel
             </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 name="F:OpenMetaverse.LandingType.None">
+            <summary>Unset, simulator default</summary>
         </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 name="F:OpenMetaverse.LandingType.LandingPoint">
+            <summary>Specific landing point set for this parcel</summary>
         </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 name="F:OpenMetaverse.LandingType.Direct">
+            <summary>No landing point set, direct teleports enabled for
+            this parcel</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.ClickObject(OpenMetaverse.Simulator,System.UInt32)">
+        <member name="T:OpenMetaverse.ParcelMediaCommand">
             <summary>
-            Perform a click action on an object
+            Parcel Media Command used in ParcelMediaCommandMessage
             </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 name="F:OpenMetaverse.ParcelMediaCommand.Stop">
+            <summary>Stop the media stream and go back to the first frame</summary>
         </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 name="F:OpenMetaverse.ParcelMediaCommand.Pause">
+            <summary>Pause the media stream (stop playing but stay on current frame)</summary>
         </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 name="F:OpenMetaverse.ParcelMediaCommand.Play">
+            <summary>Start the current media stream playing and stop when the end is reached</summary>
         </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 name="F:OpenMetaverse.ParcelMediaCommand.Loop">
+            <summary>Start the current media stream playing, 
+            loop to the beginning when the end is reached and continue to play</summary>
         </member>
-        <member name="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 name="F:OpenMetaverse.ParcelMediaCommand.Texture">
+            <summary>Specifies the texture to replace with video</summary>
+            <remarks>If passing the key of a texture, it must be explicitly typecast as a key, 
+            not just passed within double quotes.</remarks>
         </member>
-        <member name="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 name="F:OpenMetaverse.ParcelMediaCommand.URL">
+            <summary>Specifies the movie URL (254 characters max)</summary>
         </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 name="F:OpenMetaverse.ParcelMediaCommand.Time">
+            <summary>Specifies the time index at which to begin playing</summary>
         </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 name="F:OpenMetaverse.ParcelMediaCommand.Agent">
+            <summary>Specifies a single agent to apply the media command to</summary>
         </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 name="F:OpenMetaverse.ParcelMediaCommand.Unload">
+            <summary>Unloads the stream. While the stop command sets the texture to the first frame of the movie, 
+            unload resets it to the real texture that the movie was replacing.</summary>
         </member>
-        <member name="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 name="F:OpenMetaverse.ParcelMediaCommand.AutoAlign">
+            <summary>Turn on/off the auto align feature, similar to the auto align checkbox in the parcel media properties 
+            (NOT to be confused with the "align" function in the textures view of the editor!) Takes TRUE or FALSE as parameter.</summary>
         </member>
-        <member name="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 name="F:OpenMetaverse.ParcelMediaCommand.Type">
+            <summary>Allows a Web page or image to be placed on a prim (1.19.1 RC0 and later only). 
+            Use "text/html" for HTML.</summary>
         </member>
-        <member name="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 name="F:OpenMetaverse.ParcelMediaCommand.Size">
+            <summary>Resizes a Web page to fit on x, y pixels (1.19.1 RC0 and later only).</summary>
+            <remarks>This might still not be working</remarks>
         </member>
-        <member name="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 name="F:OpenMetaverse.ParcelMediaCommand.Desc">
+            <summary>Sets a description for the media being displayed (1.19.1 RC0 and later only).</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetRotation(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Quaternion)">
+        <member name="T:OpenMetaverse.ParcelInfo">
             <summary>
-            Change the rotation of an object
+            Some information about a parcel of land returned from a DirectoryManager search
             </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 name="F:OpenMetaverse.ParcelInfo.ID">
+            <summary>Global Key of record</summary>
         </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 name="F:OpenMetaverse.ParcelInfo.OwnerID">
+            <summary>Parcel Owners <seealso cref="T:OpenMetaverse.UUID"/></summary>
         </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 name="F:OpenMetaverse.ParcelInfo.Name">
+            <summary>Name field of parcel, limited to 128 characters</summary>
         </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 name="F:OpenMetaverse.ParcelInfo.Description">
+            <summary>Description field of parcel, limited to 256 characters</summary>
         </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 name="F:OpenMetaverse.ParcelInfo.ActualArea">
+            <summary>Total Square meters of parcel</summary>
         </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 name="F:OpenMetaverse.ParcelInfo.BillableArea">
+            <summary>Total area billable as Tier, for group owned land this will be 10% less than ActualArea</summary>
         </member>
-        <member name="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 name="F:OpenMetaverse.ParcelInfo.Mature">
+            <summary>True of parcel is in Mature simulator</summary>
         </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 name="F:OpenMetaverse.ParcelInfo.GlobalX">
+            <summary>Grid global X position of parcel</summary>
         </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 name="F:OpenMetaverse.ParcelInfo.GlobalY">
+            <summary>Grid global Y position of parcel</summary>
         </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 name="F:OpenMetaverse.ParcelInfo.GlobalZ">
+            <summary>Grid global Z position of parcel (not used)</summary>
         </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 name="F:OpenMetaverse.ParcelInfo.SimName">
+            <summary>Name of simulator parcel is located in</summary>
         </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 name="F:OpenMetaverse.ParcelInfo.SnapshotID">
+            <summary>Texture <seealso cref="T:OpenMetaverse.UUID"/> of parcels display picture</summary>
         </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 name="F:OpenMetaverse.ParcelInfo.Dwell">
+            <summary>Float representing calculated traffic based on time spent on parcel by avatars</summary>
         </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 name="F:OpenMetaverse.ParcelInfo.SalePrice">
+            <summary>Sale price of parcel (not used)</summary>
         </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">The new Permissions mark to set</param>
-            <param name="set">TODO: What does this do?</param>
+        <member name="F:OpenMetaverse.ParcelInfo.AuctionID">
+            <summary>Auction ID of parcel</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.RequestObjectPropertiesFamily(OpenMetaverse.Simulator,OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.ParcelMedia">
             <summary>
-            Request additional properties for an object
+            Parcel Media Information
             </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)">
-            <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">Absolute UUID of the object</param>
-            <param name="reliable">Whether to require server acknowledgement of this request</param>
+        <member name="F:OpenMetaverse.ParcelMedia.MediaAutoScale">
+            <summary>A byte, if 0x1 viewer should auto scale media to fit object</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetObjectsGroup(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},OpenMetaverse.UUID)">
-            <summary>
-            Set the ownership of a list of objects to the specified group
-            </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the objects reside</param>
-            <param name="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 name="F:OpenMetaverse.ParcelMedia.MediaLoop">
+            <summary>A boolean, if true the viewer should loop the media</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.NavigateObjectMedia(OpenMetaverse.UUID,System.Int32,System.String,OpenMetaverse.Simulator)">
-            <summary>
-            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 name="F:OpenMetaverse.ParcelMedia.MediaID">
+            <summary>The Asset UUID of the Texture which when applied to a 
+            primitive will display the media</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.UpdateObjectMedia(OpenMetaverse.UUID,OpenMetaverse.MediaEntry[],OpenMetaverse.Simulator)">
-            <summary>
-            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 name="F:OpenMetaverse.ParcelMedia.MediaURL">
+            <summary>A URL which points to any Quicktime supported media type</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.RequestObjectMedia(OpenMetaverse.UUID,OpenMetaverse.Simulator,OpenMetaverse.ObjectManager.ObjectMediaCallback)">
-            <summary>
-            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 name="F:OpenMetaverse.ParcelMedia.MediaDesc">
+            <summary>A description of the media</summary>
         </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>
+        <member name="F:OpenMetaverse.ParcelMedia.MediaHeight">
+            <summary>An Integer which represents the height of the media</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.ImprovedTerseObjectUpdateHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="F:OpenMetaverse.ParcelMedia.MediaWidth">
+            <summary>An integer which represents the width of the media</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMedia.MediaType">
+            <summary>A string which contains the mime type of the media</summary>
+        </member>
+        <member name="T:OpenMetaverse.Parcel">
             <summary>
-            A terse object update, used when a transformation matrix or
-            velocity/acceleration for an object changes but nothing else
-            (scale/position/rotation/acceleration/velocity)
+            Parcel of land, a portion of virtual real estate in a simulator
             </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 name="F:OpenMetaverse.Parcel.SelfCount">
+            <summary>The total number of contiguous 4x4 meter blocks your agent owns within this parcel</summary>        
         </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>
+        <member name="F:OpenMetaverse.Parcel.OtherCount">
+            <summary>The total number of contiguous 4x4 meter blocks contained in this parcel owned by a group or agent other than your own</summary>
         </member>
-        <member name="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 name="F:OpenMetaverse.Parcel.PublicCount">
+            <summary>Deprecated, Value appears to always be 0</summary>
         </member>
-        <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 name="F:OpenMetaverse.Parcel.LocalID">
+            <summary>Simulator-local ID of this parcel</summary>
         </member>
-        <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 name="F:OpenMetaverse.Parcel.OwnerID">
+            <summary>UUID of the owner of this parcel</summary>
         </member>
-        <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 name="F:OpenMetaverse.Parcel.IsGroupOwned">
+            <summary>Whether the land is deeded to a group or not</summary>
         </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 name="F:OpenMetaverse.Parcel.AuctionID">
+            <summary></summary>
         </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 name="F:OpenMetaverse.Parcel.ClaimDate">
+            <summary>Date land was claimed</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.UpdateDilation(OpenMetaverse.Simulator,System.UInt32)">
-            <summary>
-            
-            </summary>
-            <param name="s"></param>
-            <param name="dilation"></param>
+        <member name="F:OpenMetaverse.Parcel.ClaimPrice">
+            <summary>Appears to always be zero</summary>
         </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 name="F:OpenMetaverse.Parcel.RentPrice">
+            <summary>This field is no longer used</summary>
         </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 name="F:OpenMetaverse.Parcel.AABBMin">
+            <summary>Minimum corner of the axis-aligned bounding box for this
+            parcel</summary>
         </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 name="F:OpenMetaverse.Parcel.AABBMax">
+            <summary>Maximum corner of the axis-aligned bounding box for this
+            parcel</summary>
         </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 name="F:OpenMetaverse.Parcel.Bitmap">
+            <summary>Bitmap describing land layout in 4x4m squares across the 
+            entire region</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 name="F:OpenMetaverse.Parcel.Area">
+            <summary>Total parcel land area</summary>
         </member>
-        <member name="E:OpenMetaverse.ObjectManager.ObjectProperties">
-            <summary>Raised when the simulator sends us data containing
-            additional <seea cref="T:OpenMetaverse.Primitive"/> information</summary>
-            <seealso cref="M:OpenMetaverse.ObjectManager.SelectObject(OpenMetaverse.Simulator,System.UInt32)"/>
-            <seealso cref="M:OpenMetaverse.ObjectManager.SelectObjects(OpenMetaverse.Simulator,System.UInt32[],System.Boolean)"/>
+        <member name="F:OpenMetaverse.Parcel.Status">
+            <summary></summary>
         </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 name="F:OpenMetaverse.Parcel.SimWideMaxPrims">
+            <summary>Maximum primitives across the entire simulator owned by the same agent or group that owns this parcel that can be used</summary>
         </member>
-        <member name="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 name="F:OpenMetaverse.Parcel.SimWideTotalPrims">
+            <summary>Total primitives across the entire simulator calculated by combining the allowed prim counts for each parcel
+            owned by the agent or group that owns this parcel</summary>
         </member>
-        <member name="E:OpenMetaverse.ObjectManager.AvatarUpdate">
-            <summary>Raised when the simulator sends us data containing
-            updated information for an <see cref="T:OpenMetaverse.Avatar"/></summary>
+        <member name="F:OpenMetaverse.Parcel.MaxPrims">
+            <summary>Maximum number of primitives this parcel supports</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 name="F:OpenMetaverse.Parcel.TotalPrims">
+            <summary>Total number of primitives on this parcel</summary>
         </member>
-        <member name="E:OpenMetaverse.ObjectManager.ObjectDataBlockUpdate">
-            <summary>Raised when the simulator sends us data containing
-            updates to an Objects DataBlock</summary>
+        <member name="F:OpenMetaverse.Parcel.OwnerPrims">
+            <summary>For group-owned parcels this indicates the total number of prims deeded to the group,
+            for parcels owned by an individual this inicates the number of prims owned by the individual</summary>
         </member>
-        <member name="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 name="F:OpenMetaverse.Parcel.GroupPrims">
+            <summary>Total number of primitives owned by the parcel group on 
+            this parcel, or for parcels owned by an individual with a group set the
+            total number of prims set to that group.</summary>
         </member>
-        <member name="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 name="F:OpenMetaverse.Parcel.OtherPrims">
+            <summary>Total number of prims owned by other avatars that are not set to group, or not the parcel owner</summary>
         </member>
-        <member name="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 name="F:OpenMetaverse.Parcel.ParcelPrimBonus">
+            <summary>A bonus multiplier which allows parcel prim counts to go over times this amount, this does not affect
+            the max prims per simulator. e.g: 117 prim parcel limit x 1.5 bonus = 175 allowed</summary>
         </member>
-        <member name="T:OpenMetaverse.ObjectManager.ObjectMediaCallback">
-            <summary>
-            Callback for getting object media data via CAP
-            </summary>
-            <param name="success">Indicates if the operation was succesfull</param>
-            <param name="version">Object media version string</param>
-            <param name="faceMedia">Array indexed on prim face of media entry data</param>
+        <member name="F:OpenMetaverse.Parcel.OtherCleanTime">
+            <summary>Autoreturn value in minutes for others' objects</summary>
         </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 name="F:OpenMetaverse.Parcel.Flags">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.PrimEventArgs.TimeDilation">
-            <summary>Get the simulator Time Dilation</summary>
+        <member name="F:OpenMetaverse.Parcel.SalePrice">
+            <summary>Sale price of the parcel, only useful if ForSale is set</summary>
+            <remarks>The SalePrice will remain the same after an ownership
+            transfer (sale), so it can be used to see the purchase price after
+            a sale if the new owner has not changed it</remarks>
         </member>
-        <member name="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 name="F:OpenMetaverse.Parcel.Name">
+            <summary>Parcel Name</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarUpdateEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Avatar,System.UInt16,System.Boolean)">
-            <summary>
-            Construct a new instance of the AvatarUpdateEventArgs class
-            </summary>
-            <param name="simulator">The simulator the packet originated from</param>
-            <param name="avatar">The <see cref="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar"/> data</param>
-            <param name="timeDilation">The simulator time dilation</param>
-            <param name="isNew">The avatar was not in the dictionary before this update</param>
+        <member name="F:OpenMetaverse.Parcel.Desc">
+            <summary>Parcel Description</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.Simulator">
-            <summary>Get the simulator the object originated from</summary>
+        <member name="F:OpenMetaverse.Parcel.MusicURL">
+            <summary>URL For Music Stream</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar">
-            <summary>Get the <see cref="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar"/> data</summary>
+        <member name="F:OpenMetaverse.Parcel.GroupID">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.TimeDilation">
-            <summary>Get the simulator time dilation</summary>
+        <member name="F:OpenMetaverse.Parcel.PassPrice">
+            <summary>Price for a temporary pass</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.IsNew">
-            <summary>true if the <see cref="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar"/> did not exist in the dictionary before this update (always true if avatar tracking has been disabled)</summary>
+        <member name="F:OpenMetaverse.Parcel.PassHours">
+            <summary>How long is pass valid for</summary>
         </member>
-        <member name="T:OpenMetaverse.ObjectPropertiesEventArgs">
-            <summary>Provides additional primitive data for the <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties"/> event</summary>
-            <remarks><para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties"/> event occurs when the simulator sends
-            an <see cref="T:OpenMetaverse.Packets.ObjectPropertiesPacket"/> containing additional details for a Primitive, Foliage data or Attachment data</para>
-            <para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties"/> event is also raised when a <see cref="M:OpenMetaverse.ObjectManager.SelectObject(OpenMetaverse.Simulator,System.UInt32)"/> request is
-            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 name="F:OpenMetaverse.Parcel.Category">
+            <summary></summary>
         </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 name="F:OpenMetaverse.Parcel.AuthBuyerID">
+            <summary>Key of authorized buyer</summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectPropertiesEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
+        <member name="F:OpenMetaverse.Parcel.SnapshotID">
+            <summary>Key of parcel snapshot</summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectPropertiesEventArgs.Properties">
-            <summary>Get the primitive properties</summary>
+        <member name="F:OpenMetaverse.Parcel.UserLocation">
+            <summary>The landing point location</summary>
         </member>
-        <member name="T:OpenMetaverse.ObjectPropertiesUpdatedEventArgs">
-            <summary>Provides additional primitive data for the <see cref="E:OpenMetaverse.ObjectManager.ObjectPropertiesUpdated"/> event</summary>
-            <remarks><para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectPropertiesUpdated"/> event occurs when the simulator sends
-            an <see cref="T:OpenMetaverse.Packets.ObjectPropertiesPacket"/> containing additional details for a Primitive or Foliage data that is currently
-            being tracked in the <see cref="!:Simulator.ObjectsPrimitives"/> dictionary</para>
-            <para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectPropertiesUpdated"/> event is also raised when a <see cref="M:OpenMetaverse.ObjectManager.SelectObject(OpenMetaverse.Simulator,System.UInt32)"/> request is
-            made and <see cref="F:OpenMetaverse.Settings.OBJECT_TRACKING"/> is enabled</para>    
-            </remarks>    
+        <member name="F:OpenMetaverse.Parcel.UserLookAt">
+            <summary>The landing point LookAt</summary>
         </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 name="F:OpenMetaverse.Parcel.Landing">
+            <summary>The type of landing enforced from the <see cref="T:OpenMetaverse.LandingType"/> enum</summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectPropertiesUpdatedEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
+        <member name="F:OpenMetaverse.Parcel.Dwell">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectPropertiesUpdatedEventArgs.Prim">
-            <summary>Get the primitive details</summary>
+        <member name="F:OpenMetaverse.Parcel.RegionDenyAnonymous">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectPropertiesUpdatedEventArgs.Properties">
-            <summary>Get the primitive properties</summary>
+        <member name="F:OpenMetaverse.Parcel.RegionPushOverride">
+            <summary></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)"/> request is
-            made, the viewer equivalent is hovering the mouse cursor over an object</para>
-            </remarks>    
+        <member name="F:OpenMetaverse.Parcel.AccessWhiteList">
+            <summary>Access list of who is whitelisted on this
+            parcel</summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectPropertiesFamilyEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
+        <member name="F:OpenMetaverse.Parcel.AccessBlackList">
+            <summary>Access list of who is blacklisted on this
+            parcel</summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectPropertiesFamilyEventArgs.Properties">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Parcel.RegionDenyAgeUnverified">
+            <summary>TRUE of region denies access to age unverified users</summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectPropertiesFamilyEventArgs.Type">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Parcel.ObscureMedia">
+            <summary>true to obscure (hide) media url</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 name="F:OpenMetaverse.Parcel.ObscureMusic">
+            <summary>true to obscure (hide) music url</summary>
         </member>
-        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
+        <member name="F:OpenMetaverse.Parcel.Media">
+            <summary>A struct containing media details</summary>
         </member>
-        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.Prim">
-            <summary>Get the primitive details</summary>
+        <member name="M:OpenMetaverse.Parcel.ToString">
+            <summary>
+            Displays a parcel object in string format
+            </summary>
+            <returns>string containing key=value pairs of a parcel object</returns>
         </member>
-        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.Update">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Parcel.#ctor(System.Int32)">
+            <summary>
+            Defalt constructor
+            </summary>
+            <param name="localID">Local ID of this parcel</param>
         </member>
-        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.TimeDilation">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Parcel.Update(OpenMetaverse.Simulator,System.Boolean)">
+            <summary>
+            Update the simulator with any local changes to this Parcel object
+            </summary>
+            <param name="simulator">Simulator to send updates to</param>
+            <param name="wantReply">Whether we want the simulator to confirm
+            the update with a reply packet or not</param>
         </member>
-        <member name="T:OpenMetaverse.ObjectDataBlockUpdateEventArgs">
+        <member name="M:OpenMetaverse.Parcel.UpdateOtherCleanTime(OpenMetaverse.Simulator)">
             <summary>
-            
+            Set Autoreturn time
             </summary>
+            <param name="simulator">Simulator to send the update to</param>
         </member>
-        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
+        <member name="T:OpenMetaverse.ParcelManager">
+            <summary>
+            Parcel (subdivided simulator lots) subsystem
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Prim">
-            <summary>Get the primitive details</summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_DwellReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.ConstructionData">
-            <summary></summary>
+        <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="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Block">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_DwellReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Update">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelInfo">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.NameValues">
-            <summary></summary>
+        <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="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="F:OpenMetaverse.ParcelManager.m_ParcelInfoLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="P:OpenMetaverse.KillObjectEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelProperties">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="P:OpenMetaverse.KillObjectEventArgs.ObjectLocalID">
-            <summary>The LocalID of the object</summary>
+        <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="T:OpenMetaverse.AvatarSitChangedEventArgs">
-            <summary>
-            Provides updates sit position data
-            </summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelPropertiesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelACL">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.Avatar">
-            <summary></summary>
+        <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="P:OpenMetaverse.AvatarSitChangedEventArgs.SittingOn">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelACLLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.OldSeat">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelObjectOwnersReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.PayPriceReplyEventArgs">
-            <summary>
-            
-            </summary>
+        <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="P:OpenMetaverse.PayPriceReplyEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelObjectOwnersLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.ObjectID">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_SimParcelsDownloaded">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.DefaultPrice">
-            <summary></summary>
+        <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="P:OpenMetaverse.PayPriceReplyEventArgs.ButtonPrices">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_SimParcelsDownloadedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectMediaEventArgs.Success">
+        <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="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>
-            Indicates if the operation was successful
+            Default constructor
             </summary>
+            <param name="client">A reference to the GridClient object</param>
         </member>
-        <member name="P:OpenMetaverse.ObjectMediaEventArgs.Version">
+        <member name="M:OpenMetaverse.ParcelManager.RequestParcelInfo(OpenMetaverse.UUID)">
             <summary>
-            Media version string
+            Request basic information for a single parcel
             </summary>
+            <param name="parcelID">Simulator-local ID of the parcel</param>
         </member>
-        <member name="P:OpenMetaverse.ObjectMediaEventArgs.FaceMedia">
+        <member name="M:OpenMetaverse.ParcelManager.RequestParcelProperties(OpenMetaverse.Simulator,System.Int32,System.Int32)">
             <summary>
-            Array of media entries indexed by face number
+            Request properties of a single parcel
             </summary>
+            <param name="simulator">Simulator containing the parcel</param>
+            <param name="localID">Simulator-local ID of the parcel</param>
+            <param name="sequenceID">An arbitrary integer that will be returned
+            with the ParcelProperties reply, useful for distinguishing between
+            multiple simultaneous requests</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.#ctor">
+        <member name="M:OpenMetaverse.ParcelManager.RequestParcelAccessList(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.AccessList,System.Int32)">
             <summary>
-            
+            Request the access list for a single parcel
             </summary>
+            <param name="simulator">Simulator containing the parcel</param>
+            <param name="localID">Simulator-local ID of the parcel</param>
+            <param name="sequenceID">An arbitrary integer that will be returned
+            with the ParcelAccessList reply, useful for distinguishing between
+            multiple simultaneous requests</param>
+            <param name="flags"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.#ctor(OpenMetaverse.InventoryBase)">
+        <member name="M:OpenMetaverse.ParcelManager.RequestParcelProperties(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single,System.Int32,System.Boolean)">
             <summary>
-            
+            Request properties of parcels using a bounding box selection
             </summary>
-            <param name="data"></param>
+            <param name="simulator">Simulator containing the parcel</param>
+            <param name="north">Northern boundary of the parcel selection</param>
+            <param name="east">Eastern boundary of the parcel selection</param>
+            <param name="south">Southern boundary of the parcel selection</param>
+            <param name="west">Western boundary of the parcel selection</param>
+            <param name="sequenceID">An arbitrary integer that will be returned
+            with the ParcelProperties reply, useful for distinguishing between
+            different types of parcel property requests</param>
+            <param name="snapSelection">A boolean that is returned with the
+            ParcelProperties reply, useful for snapping focus to a single
+            parcel</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.#ctor(OpenMetaverse.InventoryBase,OpenMetaverse.InventoryNode)">
+        <member name="M:OpenMetaverse.ParcelManager.RequestAllSimParcels(OpenMetaverse.Simulator)">
             <summary>
-            De-serialization constructor for the InventoryNode Class
+            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.InventoryNode.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.ParcelManager.RequestAllSimParcels(OpenMetaverse.Simulator,System.Boolean,System.Int32)">
             <summary>
-            Serialization handler for the InventoryNode Class
+            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>
+            <param name="refresh">If TRUE, will force a full refresh</param>
+            <param name="msDelay">Number of milliseconds to pause in between each request</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.ParcelManager.RequestDwell(OpenMetaverse.Simulator,System.Int32)">
             <summary>
-            De-serialization handler for the InventoryNode Class
+            Request the dwell value for a parcel
             </summary>
+            <param name="simulator">Simulator containing the parcel</param>
+            <param name="localID">Simulator-local ID of the parcel</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.ToString">
+        <member name="M:OpenMetaverse.ParcelManager.Buy(OpenMetaverse.Simulator,System.Int32,System.Boolean,OpenMetaverse.UUID,System.Boolean,System.Int32,System.Int32)">
             <summary>
-            
+            Send a request to Purchase a parcel of land
             </summary>
+            <param name="simulator">The Simulator the parcel is located in</param>
+            <param name="localID">The parcels region specific local ID</param>
+            <param name="forGroup">true if this parcel is being purchased by a group</param>
+            <param name="groupID">The groups <seealso cref="T:OpenMetaverse.UUID"/></param>
+            <param name="removeContribution">true to remove tier contribution if purchase is successful</param>
+            <param name="parcelArea">The parcels size</param>
+            <param name="parcelPrice">The purchase price of the parcel</param>
             <returns></returns>
         </member>
-        <member name="P:OpenMetaverse.InventoryNode.Data">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.InventoryNode.Parent">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.InventoryNode.ParentID">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.InventoryNode.Nodes">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.InventoryNode.NeedsUpdate">
+        <member name="M:OpenMetaverse.ParcelManager.Reclaim(OpenMetaverse.Simulator,System.Int32)">
             <summary>
-            For inventory folder nodes specifies weather the folder needs to be
-            refreshed from the server
+            Reclaim a parcel of land
             </summary>
+            <param name="simulator">The simulator the parcel is in</param>
+            <param name="localID">The parcels region specific local ID</param>
         </member>
-        <member name="T:OpenMetaverse.FriendRights">
+        <member name="M:OpenMetaverse.ParcelManager.DeedToGroup(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.UUID)">
             <summary>
-            
+            Deed a parcel to a group
             </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>
         </member>
-        <member name="F:OpenMetaverse.FriendRights.None">
-            <summary>The avatar has no rights</summary>
-        </member>
-        <member name="F:OpenMetaverse.FriendRights.CanSeeOnline">
-            <summary>The avatar can see the online status of the target avatar</summary>
-        </member>
-        <member name="F:OpenMetaverse.FriendRights.CanSeeOnMap">
-            <summary>The avatar can see the location of the target avatar on the map</summary>
-        </member>
-        <member name="F:OpenMetaverse.FriendRights.CanModifyObjects">
-            <summary>The avatar can modify the ojects of the target avatar </summary>
-        </member>
-        <member name="T:OpenMetaverse.FriendInfo">
+        <member name="M:OpenMetaverse.ParcelManager.RequestObjectOwners(OpenMetaverse.Simulator,System.Int32)">
             <summary>
-            This class holds information about an avatar in the friends list.  There are two ways 
-            to interface to this class.  The first is through the set of boolean properties.  This is the typical
-            way clients of this class will use it.  The second interface is through two bitflag properties,
-            TheirFriendsRights and MyFriendsRights
+            Request prim owners of a parcel of land.
             </summary>
+            <param name="simulator">Simulator parcel is in</param>
+            <param name="localID">The parcels region specific local ID</param>
         </member>
-        <member name="M:OpenMetaverse.FriendInfo.#ctor(OpenMetaverse.UUID,OpenMetaverse.FriendRights,OpenMetaverse.FriendRights)">
+        <member name="M:OpenMetaverse.ParcelManager.ReturnObjects(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.ObjectReturnType,System.Collections.Generic.List{OpenMetaverse.UUID})">
             <summary>
-            Used internally when building the initial list of friends at login time
+            Return objects from a parcel
             </summary>
-            <param name="id">System ID of the avatar being prepesented</param>
-            <param name="theirRights">Rights the friend has to see you online and to modify your objects</param>
-            <param name="myRights">Rights you have to see your friend online and to modify their objects</param>
+            <param name="simulator">Simulator parcel is in</param>
+            <param name="localID">The parcels region specific local ID</param>
+            <param name="type">the type of objects to return, <seealso cref="T:OpenMetaverse.ObjectReturnType"/></param>
+            <param name="ownerIDs">A list containing object owners <seealso cref="T:OpenMetaverse.UUID"/>s to return</param>
         </member>
-        <member name="M:OpenMetaverse.FriendInfo.ToString">
+        <member name="M:OpenMetaverse.ParcelManager.ParcelSubdivide(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single)">
             <summary>
-            FriendInfo represented as a string
+            Subdivide (split) a parcel
             </summary>
-            <returns>A string reprentation of both my rights and my friends rights</returns>
+            <param name="simulator"></param>
+            <param name="west"></param>
+            <param name="south"></param>
+            <param name="east"></param>
+            <param name="north"></param>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.UUID">
+        <member name="M:OpenMetaverse.ParcelManager.ParcelJoin(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single)">
             <summary>
-            System ID of the avatar
+            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>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.Name">
+        <member name="M:OpenMetaverse.ParcelManager.GetParcelLocalID(OpenMetaverse.Simulator,OpenMetaverse.Vector3)">
             <summary>
-            full name of the avatar
+            Get a parcels LocalID
             </summary>
+            <param name="simulator">Simulator parcel is in</param>
+            <param name="position">Vector3 position in simulator (Z not used)</param>
+            <returns>0 on failure, or parcel LocalID on success.</returns>
+            <remarks>A call to <code>Parcels.RequestAllSimParcels</code> is required to populate map and
+            dictionary.</remarks>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.IsOnline">
+        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize)">
             <summary>
-            True if the avatar is online
+            Terraform (raise, lower, etc) an area or whole parcel of land
             </summary>
+            <param name="simulator">Simulator land area is in.</param>
+            <param name="localID">LocalID of parcel, or -1 if using bounding box</param>
+            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
+            <param name="brushSize">Size of area to modify</param>
+            <returns>true on successful request sent.</returns>
+            <remarks>Settings.STORE_LAND_PATCHES must be true, 
+            Parcel information must be downloaded using <code>RequestAllSimParcels()</code></remarks>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.CanSeeMeOnline">
+        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize)">
             <summary>
-            True if the friend can see if I am online
+            Terraform (raise, lower, etc) an area or whole parcel of land
             </summary>
+            <param name="simulator">Simulator land area is in.</param>
+            <param name="west">west border of area to modify</param>
+            <param name="south">south border of area to modify</param>
+            <param name="east">east border of area to modify</param>
+            <param name="north">north border of area to modify</param>
+            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
+            <param name="brushSize">Size of area to modify</param>
+            <returns>true on successful request sent.</returns>
+            <remarks>Settings.STORE_LAND_PATCHES must be true, 
+            Parcel information must be downloaded using <code>RequestAllSimParcels()</code></remarks>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.CanSeeMeOnMap">
+        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Int32,System.Single,System.Single,System.Single,System.Single,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize,System.Int32)">
             <summary>
-            True if the friend can see me on the map 
+            Terraform (raise, lower, etc) an area or whole parcel of land
             </summary>
+            <param name="simulator">Simulator land area is in.</param>
+            <param name="localID">LocalID of parcel, or -1 if using bounding box</param>
+            <param name="west">west border of area to modify</param>
+            <param name="south">south border of area to modify</param>
+            <param name="east">east border of area to modify</param>
+            <param name="north">north border of area to modify</param>
+            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
+            <param name="brushSize">Size of area to modify</param>
+            <param name="seconds">How many meters + or - to lower, 1 = 1 meter</param>
+            <returns>true on successful request sent.</returns>
+            <remarks>Settings.STORE_LAND_PATCHES must be true, 
+            Parcel information must be downloaded using <code>RequestAllSimParcels()</code></remarks>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.CanModifyMyObjects">
+        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Int32,System.Single,System.Single,System.Single,System.Single,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize,System.Int32,System.Single)">
             <summary>
-            True if the freind can modify my objects
+            Terraform (raise, lower, etc) an area or whole parcel of land
             </summary>
+            <param name="simulator">Simulator land area is in.</param>
+            <param name="localID">LocalID of parcel, or -1 if using bounding box</param>
+            <param name="west">west border of area to modify</param>
+            <param name="south">south border of area to modify</param>
+            <param name="east">east border of area to modify</param>
+            <param name="north">north border of area to modify</param>
+            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
+            <param name="brushSize">Size of area to modify</param>
+            <param name="seconds">How many meters + or - to lower, 1 = 1 meter</param>
+            <param name="height">Height at which the terraform operation is acting at</param>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.CanSeeThemOnline">
+        <member name="M:OpenMetaverse.ParcelManager.RequestSelectObjects(System.Int32,OpenMetaverse.ObjectReturnType,OpenMetaverse.UUID)">
             <summary>
-            True if I can see if my friend is online
+            Sends a request to the simulator to return a list of objects owned by specific owners
             </summary>
+            <param name="localID">Simulator local ID of parcel</param>
+            <param name="selectType">Owners, Others, Etc</param>
+            <param name="ownerID">List containing keys of avatars objects to select; 
+            if List is null will return Objects of type <c>selectType</c></param>
+            <remarks>Response data is returned in the event <seealso cref="E:ForceSelectObjectsReply"/></remarks>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.CanSeeThemOnMap">
+        <member name="M:OpenMetaverse.ParcelManager.EjectUser(OpenMetaverse.UUID,System.Boolean)">
             <summary>
-            True if I can see if my friend is on the map
+            Eject and optionally ban a user from a parcel
             </summary>
+            <param name="targetID">target key of avatar to eject</param>
+            <param name="ban">true to also ban target</param>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.CanModifyTheirObjects">
+        <member name="M:OpenMetaverse.ParcelManager.FreezeUser(OpenMetaverse.UUID,System.Boolean)">
             <summary>
-            True if I can modify my friend's objects
+            Freeze or unfreeze an avatar over your land
             </summary>
+            <param name="targetID">target key to freeze</param>
+            <param name="freeze">true to freeze, false to unfreeze</param>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.TheirFriendRights">
+        <member name="M:OpenMetaverse.ParcelManager.ReleaseParcel(OpenMetaverse.Simulator,System.Int32)">
             <summary>
-            My friend's rights represented as bitmapped flags
+            Abandon a parcel of land
             </summary>
+            <param name="simulator">Simulator parcel is in</param>
+            <param name="localID">Simulator local ID of parcel</param>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.MyFriendRights">
+        <member name="M:OpenMetaverse.ParcelManager.RequestRemoteParcelID(OpenMetaverse.Vector3,System.UInt64,OpenMetaverse.UUID)">
             <summary>
-            My rights represented as bitmapped flags
+            Requests the UUID of the parcel in a remote region at a specified location
             </summary>
+            <param name="location">Location of the parcel in the remote region</param>
+            <param name="regionHandle">Remote region handle</param>
+            <param name="regionID">Remote region UUID</param>
+            <returns>If successful UUID of the remote parcel, UUID.Zero otherwise</returns>
         </member>
-        <member name="T:OpenMetaverse.FriendsManager">
+        <member name="M:OpenMetaverse.ParcelManager.GetParcelResouces(OpenMetaverse.UUID,System.Boolean,OpenMetaverse.ParcelManager.LandResourcesCallback)">
             <summary>
-            This class is used to add and remove avatars from your friends list and to manage their permission.  
+            Retrieves information on resources used by the parcel
             </summary>
+            <param name="parcelID">UUID of the parcel</param>
+            <param name="getDetails">Should per object resource usage be requested</param>
+            <param name="callback">Callback invoked when the request is complete</param>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendOnline">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.ParcelManager.ParcelDwellReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelDwellReply"/> event</remarks>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnFriendOnline(OpenMetaverse.FriendInfoEventArgs)">
-            <summary>Raises the FriendOnline event</summary>
-            <param name="e">A FriendInfoEventArgs object containing the
-            data returned from the data server</param>
+        <member name="M:OpenMetaverse.ParcelManager.ParcelInfoReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelInfoReply"/> event</remarks>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendOnlineLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.ParcelManager.ParcelAccessListReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelAccessListReply"/> event</remarks>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendOffline">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.ParcelManager.SelectParcelObjectsReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ForceSelectObjectsReply"/> event</remarks>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnFriendOffline(OpenMetaverse.FriendInfoEventArgs)">
-            <summary>Raises the FriendOffline event</summary>
-            <param name="e">A FriendInfoEventArgs object containing the
-            data returned from the data server</param>
+        <member name="M:OpenMetaverse.ParcelManager.ParcelMediaUpdateHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelMediaUpdateReply"/> event</remarks>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendOfflineLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.ParcelManager.ParcelOverlayHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendRights">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.ParcelManager.ParcelMediaCommandMessagePacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelMediaCommand"/> event</remarks>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnFriendRights(OpenMetaverse.FriendInfoEventArgs)">
-            <summary>Raises the FriendRightsUpdate event</summary>
-            <param name="e">A FriendInfoEventArgs object containing the
-            data returned from the data server</param>
+        <member name="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="F:OpenMetaverse.FriendsManager.m_FriendRightsLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.FriendsManager.m_FriendNames">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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="M:OpenMetaverse.FriendsManager.OnFriendNames(OpenMetaverse.FriendNamesEventArgs)">
-            <summary>Raises the FriendNames event</summary>
-            <param name="e">A FriendNamesEventArgs object containing the
-            data returned from the data server</param>
+        <member name="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="F:OpenMetaverse.FriendsManager.m_FriendNamesLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.FriendsManager.m_FriendshipOffered">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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="M:OpenMetaverse.FriendsManager.OnFriendshipOffered(OpenMetaverse.FriendshipOfferedEventArgs)">
-            <summary>Raises the FriendshipOffered event</summary>
-            <param name="e">A FriendshipOfferedEventArgs object containing the
-            data returned from the data server</param>
+        <member name="E:OpenMetaverse.ParcelManager.ForceSelectObjectsReply">
+            <summary>Raised when the simulator responds to a <see cref="!:RequestForceSelectObjects"/> request</summary>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipOfferedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="E:OpenMetaverse.ParcelManager.ParcelMediaUpdateReply">
+            <summary>Raised when the simulator responds to a Parcel Update request</summary>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipResponse">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="E:OpenMetaverse.ParcelManager.ParcelMediaCommand">
+            <summary>Raised when the parcel your agent is located sends a ParcelMediaCommand</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnFriendshipResponse(OpenMetaverse.FriendshipResponseEventArgs)">
-            <summary>Raises the FriendshipResponse event</summary>
-            <param name="e">A FriendshipResponseEventArgs object containing the
-            data returned from the data server</param>
+        <member name="T:OpenMetaverse.ParcelManager.ParcelAccessEntry">
+            <summary>
+            Parcel Accesslist
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipResponseLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelAccessEntry.AgentID">
+            <summary>Agents <seealso cref="T:OpenMetaverse.UUID"/></summary>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipTerminated">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelAccessEntry.Time">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnFriendshipTerminated(OpenMetaverse.FriendshipTerminatedEventArgs)">
-            <summary>Raises the FriendshipTerminated event</summary>
-            <param name="e">A FriendshipTerminatedEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelAccessEntry.Flags">
+            <summary>Flags for specific entry in white/black lists</summary>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipTerminatedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.ParcelManager.ParcelPrimOwners">
+            <summary>
+            Owners of primitives on parcel
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendFound">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.OwnerID">
+            <summary>Prim Owners <seealso cref="T:OpenMetaverse.UUID"/></summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnFriendFoundReply(OpenMetaverse.FriendFoundReplyEventArgs)">
-            <summary>Raises the FriendFoundReply event</summary>
-            <param name="e">A FriendFoundReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.IsGroupOwned">
+            <summary>True of owner is group</summary>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendFoundLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.Count">
+            <summary>Total count of prims owned by OwnerID</summary>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.FriendList">
-            <summary>
-            A dictionary of key/value pairs containing known friends of this avatar. 
-            
-            The Key is the <seealso cref="T:OpenMetaverse.UUID"/> of the friend, the value is a <seealso cref="T:OpenMetaverse.FriendInfo"/>
-            object that contains detailed information including permissions you have and have given to the friend
-            </summary>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.OnlineStatus">
+            <summary>true of OwnerID is currently online and is not a group</summary>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.FriendRequests">
-            <summary>
-            A Dictionary of key/value pairs containing current pending frienship offers.
-            
-            The key is the <seealso cref="T:OpenMetaverse.UUID"/> of the avatar making the request, 
-            the value is the <seealso cref="T:OpenMetaverse.UUID"/> of the request which is used to accept
-            or decline the friendship offer
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.FriendsManager.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Internal constructor
-            </summary>
-            <param name="client">A reference to the GridClient Object</param>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.NewestPrim">
+            <summary>The date of the most recent prim left by OwnerID</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.AcceptFriendship(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.ParcelManager.LandResourcesCallback">
             <summary>
-            Accept a friendship request
+            Called once parcel resource usage information has been collected
             </summary>
-            <param name="fromAgentID">agentID of avatatar to form friendship with</param>
-            <param name="imSessionID">imSessionID of the friendship request message</param>
+            <param name="success">Indicates if operation was successfull</param>
+            <param name="info">Parcel resource usage information</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.DeclineFriendship(OpenMetaverse.UUID,OpenMetaverse.UUID)">
-            <summary>
-            Decline a friendship request
-            </summary>
-            <param name="fromAgentID"><seealso cref="T:OpenMetaverse.UUID"/> of friend</param>
-            <param name="imSessionID">imSessionID of the friendship request message</param>
+        <member name="T:OpenMetaverse.ParcelDwellReplyEventArgs">
+            <summary>Contains a parcels dwell data returned from the simulator in response to an <see cref="!:RequestParcelDwell"/></summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OfferFriendship(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.ParcelDwellReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Int32,System.Single)">
             <summary>
-            Overload: Offer friendship to an avatar.
+            Construct a new instance of the ParcelDwellReplyEventArgs class
             </summary>
-            <param name="agentID">System ID of the avatar you are offering friendship to</param>
+            <param name="parcelID">The global ID of the parcel</param>
+            <param name="localID">The simulator specific ID of the parcel</param>
+            <param name="dwell">The calculated dwell for the parcel</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OfferFriendship(OpenMetaverse.UUID,System.String)">
-            <summary>
-            Offer friendship to an avatar.
-            </summary>
-            <param name="agentID">System ID of the avatar you are offering friendship to</param>
-            <param name="message">A message to send with the request</param>
+        <member name="P:OpenMetaverse.ParcelDwellReplyEventArgs.ParcelID">
+            <summary>Get the global ID of the parcel</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.TerminateFriendship(OpenMetaverse.UUID)">
-            <summary>
-            Terminate a friendship with an avatar
-            </summary>
-            <param name="agentID">System ID of the avatar you are terminating the friendship with</param>
+        <member name="P:OpenMetaverse.ParcelDwellReplyEventArgs.LocalID">
+            <summary>Get the simulator specific ID of the parcel</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.TerminateFriendshipHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="P:OpenMetaverse.ParcelDwellReplyEventArgs.Dwell">
+            <summary>Get the calculated dwell</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.GrantRights(OpenMetaverse.UUID,OpenMetaverse.FriendRights)">
-            <summary>
-            Change the rights of a friend avatar.
-            </summary>
-            <param name="friendID">the <seealso cref="T:OpenMetaverse.UUID"/> of the friend</param>
-            <param name="rights">the new rights to give the friend</param>
-            <remarks>This method will implicitly set the rights to those passed in the rights parameter.</remarks>
+        <member name="T:OpenMetaverse.ParcelInfoReplyEventArgs">
+            <summary>Contains basic parcel information data returned from the 
+            simulator in response to an <see cref="!:RequestParcelInfo"/> request</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.MapFriend(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.ParcelInfoReplyEventArgs.#ctor(OpenMetaverse.ParcelInfo)">
             <summary>
-            Use to map a friends location on the grid.
+            Construct a new instance of the ParcelInfoReplyEventArgs class
             </summary>
-            <param name="friendID">Friends UUID to find</param>
-            <remarks><seealso cref="E:OnFriendFound"/></remarks>
+            <param name="parcel">The <see cref="T:OpenMetaverse.ParcelInfo"/> object containing basic parcel info</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.TrackFriend(OpenMetaverse.UUID)">
-            <summary>
-            Use to track a friends movement on the grid
-            </summary>
-            <param name="friendID">Friends Key</param>
+        <member name="P:OpenMetaverse.ParcelInfoReplyEventArgs.Parcel">
+            <summary>Get the <see cref="T:OpenMetaverse.ParcelInfo"/> object containing basic parcel info</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.RequestOnlineNotification(OpenMetaverse.UUID)">
-            <summary>
-            Ask for a notification of friend's online status
-            </summary>
-            <param name="friendID">Friend's UUID</param>
+        <member name="T:OpenMetaverse.ParcelPropertiesEventArgs">
+            <summary>Contains basic parcel information data returned from the simulator in response to an <see cref="!:RequestParcelInfo"/> request</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.Avatars_OnAvatarNames(System.Object,OpenMetaverse.UUIDNameReplyEventArgs)">
+        <member name="M:OpenMetaverse.ParcelPropertiesEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Parcel,OpenMetaverse.ParcelResult,System.Int32,System.Int32,System.Boolean)">
             <summary>
-            This handles the asynchronous response of a RequestAvatarNames call.
+            Construct a new instance of the ParcelPropertiesEventArgs class
             </summary>
-            <param name="sender"></param>
-            <param name="e">names cooresponding to the the list of IDs sent the the RequestAvatarNames call.</param>
+            <param name="simulator">The <see cref="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel"/> object containing the details</param>
+            <param name="parcel">The <see cref="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel"/> object containing the details</param>
+            <param name="result">The result of the request</param>
+            <param name="selectedPrims">The number of primitieves your agent is 
+            currently selecting and or sitting on in this parcel</param>
+            <param name="sequenceID">The user assigned ID used to correlate a request with
+            these results</param>
+            <param name="snapSelection">TODO:</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnlineNotificationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.Simulator">
+            <summary>Get the simulator the parcel is located in</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OfflineNotificationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel">
+            <summary>Get the <see cref="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel"/> object containing the details</summary>
+            <remarks>If Result is NoData, this object will not contain valid data</remarks>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.ChangeUserRightsHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.Result">
+            <summary>Get the result of the request</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnFindAgentReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.SelectedPrims">
+            <summary>Get the number of primitieves your agent is 
+            currently selecting and or sitting on in this parcel</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.Network_OnLoginResponse(System.Boolean,System.Boolean,System.String,System.String,OpenMetaverse.LoginResponseData)">
-            <summary>
-            Populate FriendList <seealso cref="!:InternalDictionary"/> with data from the login reply
-            </summary>
-            <param name="loginSuccess">true if login was successful</param>
-            <param name="redirect">true if login request is requiring a redirect</param>
-            <param name="message">A string containing the response to the login request</param>
-            <param name="reason">A string containing the reason for the request</param>
-            <param name="replyData">A <seealso cref="T:OpenMetaverse.LoginResponseData"/> object containing the decoded 
-            reply from the login server</param>
+        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.SequenceID">
+            <summary>Get the user assigned ID used to correlate a request with
+            these results</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 name="P:OpenMetaverse.ParcelPropertiesEventArgs.SnapSelection">
+            <summary>TODO:</summary>
         </member>
-        <member name="E:OpenMetaverse.FriendsManager.FriendOffline">
-            <summary>Raised when the simulator sends notification one of the members in our friends list goes offline</summary>
+        <member name="T:OpenMetaverse.ParcelAccessListReplyEventArgs">
+            <summary>Contains blacklist and whitelist data returned from the simulator in response to an <see cref="!:RequestParcelAccesslist"/> request</summary>
         </member>
-        <member name="E:OpenMetaverse.FriendsManager.FriendRightsUpdate">
-            <summary>Raised when the simulator sends notification one of the members in our friends list grants or revokes permissions</summary>
+        <member name="M:OpenMetaverse.ParcelAccessListReplyEventArgs.#ctor(OpenMetaverse.Simulator,System.Int32,System.Int32,System.UInt32,System.Collections.Generic.List{OpenMetaverse.ParcelManager.ParcelAccessEntry})">
+            <summary>
+            Construct a new instance of the ParcelAccessListReplyEventArgs class
+            </summary>
+            <param name="simulator">The simulator the parcel is located in</param>
+            <param name="sequenceID">The user assigned ID used to correlate a request with
+            these results</param>
+            <param name="localID">The simulator specific ID of the parcel</param>
+            <param name="flags">TODO:</param>
+            <param name="accessEntries">The list containing the white/blacklisted agents for the parcel</param>
         </member>
-        <member name="E:OpenMetaverse.FriendsManager.FriendNames">
-            <summary>Raised when the simulator sends us the names on our friends list</summary>
+        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.Simulator">
+            <summary>Get the simulator the parcel is located in</summary>
         </member>
-        <member name="E:OpenMetaverse.FriendsManager.FriendshipOffered">
-            <summary>Raised when the simulator sends notification another agent is offering us friendship</summary>
+        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.SequenceID">
+            <summary>Get the user assigned ID used to correlate a request with
+            these results</summary>
         </member>
-        <member name="E:OpenMetaverse.FriendsManager.FriendshipResponse">
-            <summary>Raised when a request we sent to friend another agent is accepted or declined</summary>
+        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.LocalID">
+            <summary>Get the simulator specific ID of the parcel</summary>
         </member>
-        <member name="E:OpenMetaverse.FriendsManager.FriendshipTerminated">
-            <summary>Raised when the simulator sends notification one of the members in our friends list has terminated 
-            our friendship</summary>
+        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.Flags">
+            <summary>TODO:</summary>
         </member>
-        <member name="E:OpenMetaverse.FriendsManager.FriendFoundReply">
-            <summary>Raised when the simulator sends the location of a friend we have 
-            requested map location info for</summary>
+        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.AccessList">
+            <summary>Get the list containing the white/blacklisted agents for the parcel</summary>
         </member>
-        <member name="T:OpenMetaverse.FriendInfoEventArgs">
-            <summary>Contains information on a member of our friends list</summary>
+        <member name="T:OpenMetaverse.ParcelObjectOwnersReplyEventArgs">
+            <summary>Contains blacklist and whitelist data returned from the 
+            simulator in response to an <see cref="!:RequestParcelAccesslist"/> request</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendInfoEventArgs.#ctor(OpenMetaverse.FriendInfo)">
+        <member name="M:OpenMetaverse.ParcelObjectOwnersReplyEventArgs.#ctor(OpenMetaverse.Simulator,System.Collections.Generic.List{OpenMetaverse.ParcelManager.ParcelPrimOwners})">
             <summary>
-            Construct a new instance of the FriendInfoEventArgs class
+            Construct a new instance of the ParcelObjectOwnersReplyEventArgs class
             </summary>
-            <param name="friend">The FriendInfo</param>
-        </member>
-        <member name="P:OpenMetaverse.FriendInfoEventArgs.Friend">
-            <summary>Get the FriendInfo</summary>
-        </member>
-        <member name="T:OpenMetaverse.FriendNamesEventArgs">
-            <summary>Contains Friend Names</summary>
+            <param name="simulator">The simulator the parcel is located in</param>
+            <param name="primOwners">The list containing prim ownership counts</param>
         </member>
-        <member name="M:OpenMetaverse.FriendNamesEventArgs.#ctor(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,System.String})">
-            <summary>
-            Construct a new instance of the FriendNamesEventArgs class
-            </summary>
-            <param name="names">A dictionary where the Key is the ID of the Agent, 
-            and the Value is a string containing their name</param>
+        <member name="P:OpenMetaverse.ParcelObjectOwnersReplyEventArgs.Simulator">
+            <summary>Get the simulator the parcel is located in</summary>
         </member>
-        <member name="P:OpenMetaverse.FriendNamesEventArgs.Names">
-            <summary>A dictionary where the Key is the ID of the Agent, 
-            and the Value is a string containing their name</summary>
+        <member name="P:OpenMetaverse.ParcelObjectOwnersReplyEventArgs.PrimOwners">
+            <summary>Get the list containing prim ownership counts</summary>
         </member>
-        <member name="T:OpenMetaverse.FriendshipOfferedEventArgs">
-            <summary>Sent when another agent requests a friendship with our agent</summary>
+        <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.FriendshipOfferedEventArgs.#ctor(OpenMetaverse.UUID,System.String,OpenMetaverse.UUID)">
+        <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 FriendshipOfferedEventArgs class
+            Construct a new instance of the SimParcelsDownloadedEventArgs class
             </summary>
-            <param name="agentID">The ID of the agent requesting friendship</param>
-            <param name="agentName">The name of the agent requesting friendship</param>
-            <param name="imSessionID">The ID of the session, used in accepting or declining the 
-            friendship offer</param>
+            <param name="simulator">The simulator the parcel data was retrieved from</param>
+            <param name="simParcels">The dictionary containing the parcel data</param>
+            <param name="parcelMap">The multidimensional array containing a x,y grid mapped
+            to each 64x64 parcel's LocalID.</param>
         </member>
-        <member name="P:OpenMetaverse.FriendshipOfferedEventArgs.AgentID">
-            <summary>Get the ID of the agent requesting friendship</summary>
+        <member name="P:OpenMetaverse.SimParcelsDownloadedEventArgs.Simulator">
+            <summary>Get the simulator the parcel data was retrieved from</summary>
         </member>
-        <member name="P:OpenMetaverse.FriendshipOfferedEventArgs.AgentName">
-            <summary>Get the name of the agent requesting friendship</summary>
+        <member name="P:OpenMetaverse.SimParcelsDownloadedEventArgs.Parcels">
+            <summary>A dictionary containing the parcel data where the key correlates to the ParcelMap entry</summary>
         </member>
-        <member name="P:OpenMetaverse.FriendshipOfferedEventArgs.SessionID">
-            <summary>Get the ID of the session, used in accepting or declining the 
-            friendship offer</summary>
+        <member name="P:OpenMetaverse.SimParcelsDownloadedEventArgs.ParcelMap">
+            <summary>Get the multidimensional array containing a x,y grid mapped
+            to each 64x64 parcel's LocalID.</summary>
         </member>
-        <member name="T:OpenMetaverse.FriendshipResponseEventArgs">
-            <summary>A response containing the results of our request to form a friendship with another agent</summary>
+        <member name="T:OpenMetaverse.ForceSelectObjectsReplyEventArgs">
+            <summary>Contains the data returned when a <see cref="!:RequestForceSelectObjects"/> request</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendshipResponseEventArgs.#ctor(OpenMetaverse.UUID,System.String,System.Boolean)">
+        <member name="M:OpenMetaverse.ForceSelectObjectsReplyEventArgs.#ctor(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},System.Boolean)">
             <summary>
-            Construct a new instance of the FriendShipResponseEventArgs class
+            Construct a new instance of the ForceSelectObjectsReplyEventArgs class
             </summary>
-            <param name="agentID">The ID of the agent we requested a friendship with</param>
-            <param name="agentName">The name of the agent we requested a friendship with</param>
-            <param name="accepted">true if the agent accepted our friendship offer</param>
+            <param name="simulator">The simulator the parcel data was retrieved from</param>
+            <param name="objectIDs">The list of primitive IDs</param>
+            <param name="resetList">true if the list is clean and contains the information
+            only for a given request</param>
         </member>
-        <member name="P:OpenMetaverse.FriendshipResponseEventArgs.AgentID">
-            <summary>Get the ID of the agent we requested a friendship with</summary>
+        <member name="P:OpenMetaverse.ForceSelectObjectsReplyEventArgs.Simulator">
+            <summary>Get the simulator the parcel data was retrieved from</summary>
         </member>
-        <member name="P:OpenMetaverse.FriendshipResponseEventArgs.AgentName">
-            <summary>Get the name of the agent we requested a friendship with</summary>
+        <member name="P:OpenMetaverse.ForceSelectObjectsReplyEventArgs.ObjectIDs">
+            <summary>Get the list of primitive IDs</summary>
         </member>
-        <member name="P:OpenMetaverse.FriendshipResponseEventArgs.Accepted">
-            <summary>true if the agent accepted our friendship offer</summary>
+        <member name="P:OpenMetaverse.ForceSelectObjectsReplyEventArgs.ResetList">
+            <summary>true if the list is clean and contains the information
+            only for a given request</summary>
         </member>
-        <member name="T:OpenMetaverse.FriendshipTerminatedEventArgs">
-            <summary>Contains data sent when a friend terminates a friendship with us</summary>
+        <member name="T:OpenMetaverse.ParcelMediaUpdateReplyEventArgs">
+            <summary>Contains data when the media data for a parcel the avatar is on changes</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendshipTerminatedEventArgs.#ctor(OpenMetaverse.UUID,System.String)">
+        <member name="M:OpenMetaverse.ParcelMediaUpdateReplyEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.ParcelMedia)">
             <summary>
-            Construct a new instance of the FrindshipTerminatedEventArgs class
+            Construct a new instance of the ParcelMediaUpdateReplyEventArgs class
             </summary>
-            <param name="agentID">The ID of the friend who terminated the friendship with us</param>
-            <param name="agentName">The name of the friend who terminated the friendship with us</param>
+            <param name="simulator">the simulator the parcel media data was updated in</param>
+            <param name="media">The updated media information</param>
         </member>
-        <member name="P:OpenMetaverse.FriendshipTerminatedEventArgs.AgentID">
-            <summary>Get the ID of the agent that terminated the friendship with us</summary>
+        <member name="P:OpenMetaverse.ParcelMediaUpdateReplyEventArgs.Simulator">
+            <summary>Get the simulator the parcel media data was updated in</summary>
         </member>
-        <member name="P:OpenMetaverse.FriendshipTerminatedEventArgs.AgentName">
-            <summary>Get the name of the agent that terminated the friendship with us</summary>
+        <member name="P:OpenMetaverse.ParcelMediaUpdateReplyEventArgs.Media">
+            <summary>Get the updated media information</summary>
         </member>
-        <member name="T:OpenMetaverse.FriendFoundReplyEventArgs">
+        <member name="T:OpenMetaverse.ParcelMediaCommandEventArgs">
+            <summary>Contains the media command for a parcel the agent is currently on</summary>
+        </member>
+        <member name="M:OpenMetaverse.ParcelMediaCommandEventArgs.#ctor(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.ParcelFlags,OpenMetaverse.ParcelMediaCommand,System.Single)">
             <summary>
-            Data sent in response to a <see cref="!:FindFriend"/> request which contains the information to allow us to map the friends location
+            Construct a new instance of the ParcelMediaCommandEventArgs class
             </summary>
+            <param name="simulator">The simulator the parcel media command was issued in</param>
+            <param name="sequence"></param>
+            <param name="flags"></param>
+            <param name="command">The media command that was sent</param>
+            <param name="time"></param>
         </member>
-        <member name="M:OpenMetaverse.FriendFoundReplyEventArgs.#ctor(OpenMetaverse.UUID,System.UInt64,OpenMetaverse.Vector3)">
+        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.Simulator">
+            <summary>Get the simulator the parcel media command was issued in</summary>
+        </member>
+        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.Sequence">
+            <summary></summary>
+        </member>
+        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.ParcelFlags">
+            <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.NameValue">
             <summary>
-            Construct a new instance of the FriendFoundReplyEventArgs class
+            A Name Value pair with additional settings, used in the protocol
+            primarily to transmit avatar names and active group in object packets
             </summary>
-            <param name="agentID">The ID of the agent we have requested location information for</param>
-            <param name="regionHandle">The region handle where our friend is located</param>
-            <param name="location">The simulator local position our friend is located</param>
         </member>
-        <member name="P:OpenMetaverse.FriendFoundReplyEventArgs.AgentID">
-            <summary>Get the ID of the agent we have received location information for</summary>
+        <member name="F:OpenMetaverse.NameValue.Name">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.FriendFoundReplyEventArgs.RegionHandle">
-            <summary>Get the region handle where our mapped friend is located</summary>
+        <member name="F:OpenMetaverse.NameValue.Type">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.FriendFoundReplyEventArgs.Location">
-            <summary>Get the simulator local position where our friend is located</summary>
+        <member name="F:OpenMetaverse.NameValue.Class">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.BinBVHAnimationReader">
+        <member name="F:OpenMetaverse.NameValue.Sendto">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.NameValue.Value">
+            <summary></summary>
+        </member>
+        <member name="M:OpenMetaverse.NameValue.#ctor(System.String,OpenMetaverse.NameValue.ValueType,OpenMetaverse.NameValue.ClassType,OpenMetaverse.NameValue.SendtoType,System.Object)">
             <summary>
-            Reads in a byte array of an Animation Asset created by the SecondLife(tm) client.
+            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.BinBVHAnimationReader.rotationkeys">
+        <member name="M:OpenMetaverse.NameValue.#ctor(System.String)">
             <summary>
-            Rotation Keyframe count (used internally)
+            Constructor that takes a single line from a NameValue field
             </summary>
+            <param name="data"></param>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.positionkeys">
+        <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>
-            Position Keyframe count (used internally)
+            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.Priority">
+        <member name="F:OpenMetaverse.NameValue.ClassType.Unknown">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.NameValue.ClassType.ReadOnly">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.NameValue.ClassType.ReadWrite">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.NameValue.ClassType.Callback">
+            <summary></summary>
+        </member>
+        <member name="T:OpenMetaverse.NameValue.SendtoType">
             <summary>
-            Animation Priority
+            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.Length">
+        <member name="F:OpenMetaverse.NameValue.SendtoType.Unknown">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.NameValue.SendtoType.Sim">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.NameValue.SendtoType.DataSim">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.NameValue.SendtoType.SimViewer">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.NameValue.SendtoType.DataSimViewer">
+            <summary></summary>
+        </member>
+        <member name="T:OpenMetaverse.Rendering.IRendering">
             <summary>
-            The animation length in seconds.
+            Abstract base for rendering plugins
             </summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.ExpressionName">
+        <member name="M:OpenMetaverse.Rendering.IRendering.GenerateSimpleMesh(OpenMetaverse.Primitive,OpenMetaverse.Rendering.DetailLevel)">
             <summary>
-            Expression set in the client.  Null if [None] is selected
+            Generates a basic mesh structure from a primitive
             </summary>
+            <param name="prim">Primitive to generate the mesh from</param>
+            <param name="lod">Level of detail to generate the mesh at</param>
+            <returns>The generated mesh</returns>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.InPoint">
+        <member name="M:OpenMetaverse.Rendering.IRendering.GenerateSimpleSculptMesh(OpenMetaverse.Primitive,System.Drawing.Bitmap,OpenMetaverse.Rendering.DetailLevel)">
             <summary>
-            The time in seconds to start the animation
+            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="F:OpenMetaverse.BinBVHAnimationReader.OutPoint">
+        <member name="M:OpenMetaverse.Rendering.IRendering.GenerateFacetedMesh(OpenMetaverse.Primitive,OpenMetaverse.Rendering.DetailLevel)">
             <summary>
-            The time in seconds to end the animation
+            Generates a series of faces, each face containing a mesh and
+            metadata
             </summary>
+            <param name="prim">Primitive to generate the mesh from</param>
+            <param name="lod">Level of detail to generate the mesh at</param>
+            <returns>The generated mesh</returns>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.Loop">
+        <member name="M:OpenMetaverse.Rendering.IRendering.GenerateFacetedSculptMesh(OpenMetaverse.Primitive,System.Drawing.Bitmap,OpenMetaverse.Rendering.DetailLevel)">
             <summary>
-            Loop the animation
+            Generates a series of faces for a sculpted prim, each face 
+            containing a mesh and metadata
             </summary>
+            <param name="prim">Sculpted primitive to generate the mesh from</param>
+            <param name="sculptTexture">Sculpt texture</param>
+            <param name="lod">Level of detail to generate the mesh at</param>
+            <returns>The generated mesh</returns>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.EaseInTime">
+        <member name="M:OpenMetaverse.Rendering.IRendering.TransformTexCoords(System.Collections.Generic.List{OpenMetaverse.Rendering.Vertex},OpenMetaverse.Vector3,OpenMetaverse.Primitive.TextureEntryFace,OpenMetaverse.Vector3)">
             <summary>
-            Meta data. Ease in Seconds.
+            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="F:OpenMetaverse.BinBVHAnimationReader.EaseOutTime">
+        <member name="T:OpenMetaverse.Assets.AssetLandmark">
             <summary>
-            Meta data. Ease out seconds.
+            Represents a Landmark with RegionID and Position vector
             </summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.HandPose">
+        <member name="F:OpenMetaverse.Assets.AssetLandmark.RegionID">
+            <summary>UUID of the Landmark target region</summary>
+        </member>
+        <member name="F:OpenMetaverse.Assets.AssetLandmark.Position">
+            <summary> Local position of the target </summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetLandmark.#ctor">
+            <summary>Construct an Asset of type Landmark</summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetLandmark.#ctor(OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            Meta Data for the Hand Pose
+            Construct an Asset object of type Landmark
             </summary>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.JointCount">
+        <member name="M:OpenMetaverse.Assets.AssetLandmark.Encode">
             <summary>
-            Number of joints defined in the animation
+            Encode the raw contents of a string with the specific Landmark format
             </summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.joints">
+        <member name="M:OpenMetaverse.Assets.AssetLandmark.Decode">
             <summary>
-            Contains an array of joints
+            Decode the raw asset data, populating the RegionID and Position
             </summary>
+            <returns>true if the AssetData was successfully decoded to a UUID and Vector</returns>
         </member>
-        <member name="M:OpenMetaverse.BinBVHAnimationReader.#ctor(System.Byte[])">
+        <member name="P:OpenMetaverse.Assets.AssetLandmark.AssetType">
+            <summary>Override the base classes AssetType</summary>
+        </member>
+        <member name="T:OpenMetaverse.Assets.TarArchiveWriter">
             <summary>
-            Searialize an animation asset into it's joints/keyframes/meta data
+            Temporary code to produce a tar archive in tar v7 format
             </summary>
-            <param name="animationdata"></param>
         </member>
-        <member name="M:OpenMetaverse.BinBVHAnimationReader.ReadBytesUntilNull(System.Byte[],System.Int32@)">
+        <member name="F:OpenMetaverse.Assets.TarArchiveWriter.m_bw">
             <summary>
-            Variable length strings seem to be null terminated in the animation asset..    but..   
-            use with caution, home grown.
-            advances the index.
+            Binary writer for the underlying stream
             </summary>
-            <param name="data">The animation asset byte array</param>
-            <param name="i">The offset to start reading</param>
-            <returns>a string</returns>
         </member>
-        <member name="M:OpenMetaverse.BinBVHAnimationReader.readJoint(System.Byte[],System.Int32@)">
+        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteDir(System.String)">
             <summary>
-            Read in a Joint from an animation asset byte array
-            Variable length Joint fields, yay!
-            Advances the index
+            Write a directory entry to the tar archive.  We can only handle one path level right now!
             </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>
+            <param name="dirName"></param>
         </member>
-        <member name="M:OpenMetaverse.BinBVHAnimationReader.readKeys(System.Byte[],System.Int32@,System.Int32,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteFile(System.String,System.String)">
             <summary>
-            Read Keyframes of a certain type
-            advance i
+            Write a file to the tar archive
             </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>
+            <param name="filePath"></param>
+            <param name="data"></param>
         </member>
-        <member name="T:OpenMetaverse.binBVHJoint">
+        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteFile(System.String,System.Byte[])">
             <summary>
-            A Joint and it's associated meta data and keyframes
+            Write a file to the tar archive
             </summary>
+            <param name="filePath"></param>
+            <param name="data"></param>
         </member>
-        <member name="F:OpenMetaverse.binBVHJoint.Name">
+        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.Close">
             <summary>
-            Name of the Joint.  Matches the avatar_skeleton.xml in client distros
+            Finish writing the raw tar archive data to a stream.  The stream will be closed on completion.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.binBVHJoint.Priority">
+        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteEntry(System.String,System.Byte[],System.Char)">
             <summary>
-            Joint Animation Override?   Was the same as the Priority in testing.. 
+            Write a particular entry
             </summary>
+            <param name="filePath"></param>
+            <param name="data"></param>
+            <param name="fileType"></param>
         </member>
-        <member name="F:OpenMetaverse.binBVHJoint.rotationkeys">
+        <member name="T:OpenMetaverse.VisualColorOperation">
             <summary>
-            Array of Rotation Keyframes in order from earliest to latest
+            Operation to apply when applying color to texture
             </summary>
         </member>
-        <member name="F:OpenMetaverse.binBVHJoint.positionkeys">
+        <member name="T:OpenMetaverse.VisualColorParam">
             <summary>
-            Array of Position Keyframes in order from earliest to latest
-            This seems to only be for the Pelvis?
+            Information needed to translate visual param value to RGBA color
             </summary>
         </member>
-        <member name="T:OpenMetaverse.binBVHJointKey">
+        <member name="M:OpenMetaverse.VisualColorParam.#ctor(OpenMetaverse.VisualColorOperation,OpenMetaverse.Color4[])">
             <summary>
-            A Joint Keyframe.  This is either a position or a rotation.
+            Construct VisualColorParam
             </summary>
+            <param name="operation">Operation to apply when applying color to texture</param>
+            <param name="colors">Colors</param>
         </member>
-        <member name="F:OpenMetaverse.binBVHJointKey.key_element">
+        <member name="T:OpenMetaverse.VisualAlphaParam">
             <summary>
-            Either a Vector3 position or a Vector3 Euler rotation
+            Represents alpha blending and bump infor for a visual parameter
+            such as sleive length
             </summary>
         </member>
-        <member name="T:OpenMetaverse.HandPose">
+        <member name="F:OpenMetaverse.VisualAlphaParam.Domain">
+            <summary>Stregth of the alpha to apply</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualAlphaParam.TGAFile">
+            <summary>File containing the alpha channel</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualAlphaParam.SkipIfZero">
+            <summary>Skip blending if parameter value is 0</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualAlphaParam.MultiplyBlend">
+            <summary>Use miltiply insted of alpha blending</summary>
+        </member>
+        <member name="M:OpenMetaverse.VisualAlphaParam.#ctor(System.Single,System.String,System.Boolean,System.Boolean)">
             <summary>
-            Poses set in the animation metadata for the hands.
+            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="T:OpenMetaverse.VisualParam">
+            <summary>
+            A single visual characteristic of an avatar mesh, such as eyebrow height
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.ParamID">
+            <summary>Index of this visual param</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.Name">
+            <summary>Internal name</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.Group">
+            <summary>Group ID this parameter belongs to</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.Wearable">
+            <summary>Name of the wearable this parameter belongs to</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.Label">
+            <summary>Displayable label of this characteristic</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.LabelMin">
+            <summary>Displayable label for the minimum value of this characteristic</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.LabelMax">
+            <summary>Displayable label for the maximum value of this characteristic</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.DefaultValue">
+            <summary>Default value</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.MinValue">
+            <summary>Minimum value</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.MaxValue">
+            <summary>Maximum value</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.IsBumpAttribute">
+            <summary>Is this param used for creation of bump layer?</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.AlphaParams">
+            <summary>Alpha blending/bump info</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.ColorParams">
+            <summary>Color information</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.Drivers">
+            <summary>Array of param IDs that are drivers for this parameter</summary>
+        </member>
+        <member name="M:OpenMetaverse.VisualParam.#ctor(System.Int32,System.String,System.Int32,System.String,System.String,System.String,System.String,System.Single,System.Single,System.Single,System.Boolean,System.Int32[],System.Nullable{OpenMetaverse.VisualAlphaParam},System.Nullable{OpenMetaverse.VisualColorParam})">
+            <summary>
+            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="T:OpenMetaverse.VisualParams">
+            <summary>
+            Holds the Params array of all the avatar appearance parameters
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.UDPBase">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.UDPBase.#ctor(System.Int32)">
+            <summary>
+            Initialize the UDP packet handler in server mode
+            </summary>
+            <param name="port">Port to listening for incoming UDP packets on</param>
+        </member>
+        <member name="M:OpenMetaverse.UDPBase.#ctor(System.Net.IPEndPoint)">
+            <summary>
+            Initialize the UDP packet handler in client mode
+            </summary>
+            <param name="endPoint">Remote UDP server to connect to</param>
+        </member>
+        <member name="M:OpenMetaverse.UDPBase.Start">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.UDPBase.Stop">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.UDPBase.IsRunning">
+            <summary>
+            
             </summary>
         </member>
         <member name="T:OpenMetaverse.Bumpiness">
@@ -16833,6313 +15052,8678 @@
         <member name="F:OpenMetaverse.TextureAttributes.Glow">
             <summary></summary>
         </member>
+        <member name="F:OpenMetaverse.TextureAttributes.MaterialID">
+            <summary></summary>
+        </member>
         <member name="F:OpenMetaverse.TextureAttributes.All">
             <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetScriptBinary">
+        <member name="T:OpenMetaverse.Assets.AssetAnimation">
             <summary>
-            Represents an AssetScriptBinary object containing the 
-            LSO compiled bytecode of an LSL script
+            Represents an Animation
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.#ctor">
-            <summary>Initializes a new instance of an AssetScriptBinary object</summary>
+        <member name="M:OpenMetaverse.Assets.AssetAnimation.#ctor">
+            <summary>Default Constructor</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>
+        <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="M:OpenMetaverse.Assets.AssetScriptBinary.Encode">
-            <summary>
-            TODO: Encodes a scripts contents into a LSO Bytecode file
-            </summary>
+        <member name="P:OpenMetaverse.Assets.AssetAnimation.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.Decode">
+        <member name="T:OpenMetaverse.Helpers">
             <summary>
-            TODO: Decode LSO Bytecode into a string
+            Static helper functions and global variables
             </summary>
-            <returns>true</returns>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetScriptBinary.AssetType">
-            <summary>Override the base classes AssetType</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="T:OpenMetaverse.Assets.TarArchiveWriter">
-            <summary>
-            Temporary code to produce a tar archive in tar v7 format
-            </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.Assets.TarArchiveWriter.m_bw">
+        <member name="F:OpenMetaverse.Helpers.MSG_RELIABLE">
+            <summary>This header flags signals that an ACK is expected for this packet</summary>
+        </member>
+        <member name="F:OpenMetaverse.Helpers.MSG_ZEROCODED">
+            <summary>This header flag signals that the message is compressed using zerocoding</summary>
+        </member>
+        <member name="M:OpenMetaverse.Helpers.TEOffsetShort(System.Single)">
             <summary>
-            Binary writer for the underlying stream
+            
             </summary>
+            <param name="offset"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteDir(System.String)">
+        <member name="M:OpenMetaverse.Helpers.TEOffsetFloat(System.Byte[],System.Int32)">
             <summary>
-            Write a directory entry to the tar archive.  We can only handle one path level right now!
+            
             </summary>
-            <param name="dirName"></param>
+            <param name="bytes"></param>
+            <param name="pos"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteFile(System.String,System.String)">
+        <member name="M:OpenMetaverse.Helpers.TERotationShort(System.Single)">
             <summary>
-            Write a file to the tar archive
+            
             </summary>
-            <param name="filePath"></param>
-            <param name="data"></param>
+            <param name="rotation"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteFile(System.String,System.Byte[])">
+        <member name="M:OpenMetaverse.Helpers.TERotationFloat(System.Byte[],System.Int32)">
             <summary>
-            Write a file to the tar archive
+            
             </summary>
-            <param name="filePath"></param>
-            <param name="data"></param>
+            <param name="bytes"></param>
+            <param name="pos"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.Close">
+        <member name="M:OpenMetaverse.Helpers.GlobalPosToRegionHandle(System.Single,System.Single,System.Single@,System.Single@)">
             <summary>
-            Finish writing the raw tar archive data to a stream.  The stream will be closed on completion.
+            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="M:OpenMetaverse.Assets.TarArchiveWriter.WriteEntry(System.String,System.Byte[],System.Char)">
+        <member name="M:OpenMetaverse.Helpers.FloatToTerseString(System.Single)">
             <summary>
-            Write a particular entry
+            Converts a floating point number to a terse string format used for
+            transmitting numbers in wearable asset files
             </summary>
-            <param name="filePath"></param>
-            <param name="data"></param>
-            <param name="fileType"></param>
+            <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="T:OpenMetaverse.PacketFrequency">
+        <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.PacketFrequency.Low">
-            <summary></summary>
+        <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.PacketFrequency.Medium">
-            <summary></summary>
+        <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.PacketFrequency.High">
-            <summary></summary>
+        <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="T:OpenMetaverse.Packets.MalformedDataException">
+        <member name="M:OpenMetaverse.Helpers.GetResourceStream(System.String)">
             <summary>
-            Thrown when a packet could not be successfully deserialized
+            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="M:OpenMetaverse.Packets.MalformedDataException.#ctor">
+        <member name="M:OpenMetaverse.Helpers.GetResourceStream(System.String,System.String)">
             <summary>
-            Default constructor
+            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="M:OpenMetaverse.Packets.MalformedDataException.#ctor(System.String)">
+        <member name="M:OpenMetaverse.Helpers.PrimListToOSD(System.Collections.Generic.List{OpenMetaverse.Primitive})">
             <summary>
-            Constructor that takes an additional error message
+            Converts a list of primitives to an object that can be serialized
+            with the LLSD system
             </summary>
-            <param name="Message">An error message to attach to this exception</param>
+            <param name="prims">Primitives to convert to a serializable object</param>
+            <returns>An object that can be serialized with LLSD</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.Header">
+        <member name="M:OpenMetaverse.Helpers.OSDToPrimList(OpenMetaverse.StructuredData.OSD)">
             <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
+            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="M:OpenMetaverse.Packets.Header.AcksToBytes(System.Byte[],System.Int32@)">
+        <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="T:OpenMetaverse.Helpers.LogLevel">
             <summary>
-            Convert the AckList to a byte array, used for packet serializing
+            Passed to Logger.Log() to identify the severity of a log entry
             </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.Packets.Header.BuildHeader(System.Byte[],System.Int32@,System.Int32@)">
+        <member name="F:OpenMetaverse.Helpers.LogLevel.None">
+            <summary>No logging information will be output</summary>
+        </member>
+        <member name="F:OpenMetaverse.Helpers.LogLevel.Info">
+            <summary>Non-noisy useful information, may be helpful in 
+            debugging a problem</summary>
+        </member>
+        <member name="F:OpenMetaverse.Helpers.LogLevel.Warning">
+            <summary>A non-critical error occurred. A warning will not 
+            prevent the rest of the library from operating as usual, 
+            although it may be indicative of an underlying issue</summary>
+        </member>
+        <member name="F:OpenMetaverse.Helpers.LogLevel.Error">
+            <summary>A critical error has occurred. Generally this will 
+            be followed by the network layer shutting down, although the 
+            stability of the library after an error is uncertain</summary>
+        </member>
+        <member name="F:OpenMetaverse.Helpers.LogLevel.Debug">
+            <summary>Used for internal testing, this logging level can 
+            generate very noisy (long and/or repetitive) messages. Don't
+            pass this to the Log() function, use DebugLog() instead.
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.WrappedObject`1.Dispose">
             <summary>
-            
+            Checks the instance back into the object pool
             </summary>
-            <param name="bytes"></param>
-            <param name="pos"></param>
-            <param name="packetEnd"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Packets.Header.CreateAckList(OpenMetaverse.Packets.Header@,System.Byte[],System.Int32@)">
+        <member name="P:OpenMetaverse.WrappedObject`1.Instance">
             <summary>
-            
+            Returns an instance of the class that has been checked out of the Object Pool.
             </summary>
-            <param name="header"></param>
-            <param name="bytes"></param>
-            <param name="packetEnd"></param>
         </member>
-        <member name="T:OpenMetaverse.Packets.PacketBlock">
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.#ctor">
             <summary>
-            A block of data in a packet. Packets are composed of one or more blocks,
-            each block containing one or more fields
+            Creates a new instance of the ObjectPoolBase class. Initialize MUST be called
+            after using this constructor.
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Packets.PacketBlock.FromBytes(System.Byte[],System.Int32@)">
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.#ctor(System.Int32,System.Int32,System.Boolean,System.Int32)">
             <summary>
-            Create a block from a byte array
+            Creates a new instance of the ObjectPool Base class.        
             </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>
+            <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="M:OpenMetaverse.Packets.PacketBlock.ToBytes(System.Byte[],System.Int32@)">
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.ForceCleanup">
             <summary>
-            Serialize this block into a byte array
+            Forces the segment cleanup algorithm to be run. This method is intended 
+            primarly for use from the Unit Test libraries.
             </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.Packets.PacketBlock.Length">
-            <summary>Current length of the data in this packet</summary>
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.GetObjectInstance">
+            <summary>
+            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="F:OpenMetaverse.Packets.PacketType.Default">
-            <summary>A generic value, not an actual packet type</summary>
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.CheckIn(OpenMetaverse.ObjectPoolSegment{`0},`0)">
+            <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.
+            </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="T:OpenMetaverse.Packets.TestMessagePacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.CheckOut">
+            <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. 
+            </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.Packets.TestMessagePacket.TestBlock1Block">
-            <exclude/>
-        </member>
-        <member name="T:OpenMetaverse.Packets.TestMessagePacket.NeighborBlockBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.ObjectPoolBase`1.TotalSegments">
+            <summary>
+            The total number of segments created. Intended to be used by the Unit Tests.
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UseCircuitCodePacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.ObjectPoolBase`1.ItemsPerSegment">
+            <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. 
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UseCircuitCodePacket.CircuitCodeBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.ObjectPoolBase`1.MinimumSegmentCount">
+            <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.
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TelehubInfoPacket">
-            <exclude/>
+        <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.Packets.TelehubInfoPacket.TelehubBlockBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.ObjectPoolBase`1.CleanupFrequencyMilliseconds">
+            <summary>
+            The frequence which the cleanup thread runs. This is typically
+            expected to be in the 5 minute range. 
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TelehubInfoPacket.SpawnPointBlockBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.BitPack">
+            <summary>
+            Wrapper around a byte array that allows bit to be packed and unpacked
+            one at a time or by a variable amount. Useful for very tightly packed
+            data like LayerData packets
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EconomyDataRequestPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.BitPack.Data">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EconomyDataPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.BitPack.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            Default constructor, initialize the bit packer / bit unpacker
+            with a byte array and starting position
+            </summary>
+            <param name="data">Byte array to pack bits in to or unpack from</param>
+            <param name="pos">Starting position in the byte array</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.EconomyDataPacket.InfoBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.BitPack.PackFloat(System.Single)">
+            <summary>
+            Pack a floating point value in to the data
+            </summary>
+            <param name="data">Floating point value to pack</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.BitPack.PackBits(System.Int32,System.Int32)">
+            <summary>
+            Pack part or all of an integer in to the data
+            </summary>
+            <param name="data">Integer containing the data to pack</param>
+            <param name="totalCount">Number of bits of the integer to pack</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.BitPack.PackBits(System.UInt32,System.Int32)">
+            <summary>
+            Pack part or all of an unsigned integer in to the data
+            </summary>
+            <param name="data">Unsigned integer containing the data to pack</param>
+            <param name="totalCount">Number of bits of the integer to pack</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket.DataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.BitPack.PackBit(System.Boolean)">
+            <summary>
+            Pack a single bit in to the data
+            </summary>
+            <param name="bit">Bit to pack</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AvatarPickerReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.BitPack.PackUUID(OpenMetaverse.UUID)">
+            <summary>
+            
+            </summary>
+            <param name="data"></param>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket.DataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.BitPack.PackColor(OpenMetaverse.Color4)">
+            <summary>
+            
+            </summary>
+            <param name="data"></param>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.BitPack.UnpackFloat">
+            <summary>
+            Unpacking a floating point value from the data
+            </summary>
+            <returns>Unpacked floating point value</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.BitPack.UnpackBits(System.Int32)">
+            <summary>
+            Unpack a variable number of bits from the data in to integer format
+            </summary>
+            <param name="totalCount">Number of bits to unpack</param>
+            <returns>An integer containing the unpacked bits</returns>
+            <remarks>This function is only useful up to 32 bits</remarks>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.TransactionDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.BitPack.UnpackUBits(System.Int32)">
+            <summary>
+            Unpack a variable number of bits from the data in to unsigned 
+            integer format
+            </summary>
+            <param name="totalCount">Number of bits to unpack</param>
+            <returns>An unsigned integer containing the unpacked bits</returns>
+            <remarks>This function is only useful up to 32 bits</remarks>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.QueryDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.BitPack.UnpackShort">
+            <summary>
+            Unpack a 16-bit signed integer
+            </summary>
+            <returns>16-bit signed integer</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.BitPack.UnpackUShort">
+            <summary>
+            Unpack a 16-bit unsigned integer
+            </summary>
+            <returns>16-bit unsigned integer</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.BitPack.UnpackInt">
+            <summary>
+            Unpack a 32-bit signed integer
+            </summary>
+            <returns>32-bit signed integer</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.TransactionDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.BitPack.UnpackUInt">
+            <summary>
+            Unpack a 32-bit unsigned integer
+            </summary>
+            <returns>32-bit unsigned integer</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.QueryDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.BitPack.BytePos">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirFindQueryPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.BitPack.BitPos">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirFindQueryPacket.AgentDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.Assets.AssetSound">
+            <summary>
+            Represents a Sound Asset
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirFindQueryPacket.QueryDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Assets.AssetSound.#ctor">
+            <summary>Initializes a new instance of an AssetSound object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesQueryPacket">
-            <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.DirPlacesQueryPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Assets.AssetSound.Encode">
+            <summary>
+            TODO: Encodes a sound file
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesQueryPacket.QueryDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Assets.AssetSound.Decode">
+            <summary>
+            TODO: Decode a sound file
+            </summary>
+            <returns>true</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.Assets.AssetSound.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventorySortOrder.ByName">
+            <summary>Sort by name</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.QueryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventorySortOrder.ByDate">
+            <summary>Sort by date</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.QueryRepliesBlock">
-            <exclude/>
+        <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.Packets.DirPlacesReplyPacket.StatusDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventorySortOrder.SystemFoldersToTop">
+            <summary>Place system folders at the top</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.DeRezDestination">
+            <summary>
+            Possible destinations for DeRezObject request
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DeRezDestination.AgentInventorySave">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.QueryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DeRezDestination.AgentInventoryCopy">
+            <summary>Copy from in-world to agent inventory</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.QueryRepliesBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DeRezDestination.TaskInventory">
+            <summary>Derez to TaskInventory</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DeRezDestination.Attachment">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DeRezDestination.AgentInventoryTake">
+            <summary>Take Object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.QueryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DeRezDestination.ForceToGodInventory">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.QueryRepliesBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DeRezDestination.TrashFolder">
+            <summary>Delete Object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.StatusDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DeRezDestination.AttachmentToInventory">
+            <summary>Put an avatar attachment into agent inventory</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DeRezDestination.AttachmentExists">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DeRezDestination.ReturnToOwner">
+            <summary>Return an object back to the owner's inventory</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.QueryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DeRezDestination.ReturnToLastOwner">
+            <summary>Return a deeded object back to the last owner's inventory</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.QueryRepliesBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.InventoryItemFlags">
+            <summary>
+            Upper half of the Flags field for inventory items
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.DirClassifiedQueryPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectSlamSale">
+            <summary>Indicates that the object sale information has been
+            changed</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket.QueryDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.DirClassifiedReplyPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.QueryDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.QueryRepliesBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.StatusDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectHasMultipleItems">
+            <summary>Indicates whether this object is composed of multiple
+            items or not</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket">
-            <exclude/>
+        <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.Packets.AvatarClassifiedReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.InventoryBase">
+            <summary>
+            Base Class for Inventory Items
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryBase.UUID">
+            <summary><seealso cref="T:OpenMetaverse.UUID"/> of item/folder</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryBase.ParentUUID">
+            <summary><seealso cref="T:OpenMetaverse.UUID"/> of parent folder</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryBase.Name">
+            <summary>Name of item/folder</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryBase.OwnerID">
+            <summary>Item/Folder Owners <seealso cref="T:OpenMetaverse.UUID"/></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryBase.#ctor(OpenMetaverse.UUID)">
+            <summary>
+            Constructor, takes an itemID as a parameter
+            </summary>
+            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID"/> of the item</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryBase.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket.DataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryBase.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket.AgentDataBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket.DataBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryBase.GetOSD">
+            <summary>
+            Convert inventory to OSD
+            </summary>
+            <returns>OSD representation</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket.AgentDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.InventoryItem">
+            <summary>
+            An Item in Inventory
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryItem.AssetUUID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of this item</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryItem.Permissions">
+            <summary>The combined <seealso cref="T:OpenMetaverse.Permissions"/> of this item</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryItem.AssetType">
+            <summary>The type of item from <seealso cref="T:OpenMetaverse.AssetType"/></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryItem.InventoryType">
+            <summary>The type of item from the <seealso cref="T:OpenMetaverse.InventoryType"/> enum</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirLandQueryPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryItem.CreatorID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the creator of this item</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirLandQueryPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryItem.Description">
+            <summary>A Description of this item</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirLandQueryPacket.QueryDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.DirLandReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryItem.GroupOwned">
+            <summary>If true, item is owned by a group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryItem.SalePrice">
+            <summary>The price this item can be purchased for</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket.QueryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryItem.SaleType">
+            <summary>The type of sale from the <seealso cref="T:OpenMetaverse.SaleType"/> enum</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket.QueryRepliesBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryItem.Flags">
+            <summary>Combined flags from <seealso cref="T:OpenMetaverse.InventoryItemFlags"/></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.DirPopularQueryPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryItem.TransactionID">
+            <summary>Used to update the AssetID in requests sent to the server</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket.QueryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryItem.LastOwnerID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the previous owner of the item</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.DirPopularReplyPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.DirPopularReplyPacket.QueryDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.DirPopularReplyPacket.QueryRepliesBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryItem.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelInfoRequestPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryItem.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelInfoRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelInfoRequestPacket.DataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelInfoReplyPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelInfoReplyPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelInfoReplyPacket.DataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryItem.GetOSD">
+            <summary>
+            Convert InventoryItem to OSD
+            </summary>
+            <returns>OSD representation of InventoryItem</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.InventoryTexture">
+            <summary>
+            InventoryTexture Class representing a graphical image
+            </summary>
+            <seealso cref="!:ManagedImage"/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket.ParcelDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelObjectOwnersReplyPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelObjectOwnersReplyPacket.DataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.InventorySound">
+            <summary>
+            InventorySound Class representing a playable sound
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket.DataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.InventoryCallingCard">
+            <summary>
+            InventoryCallingCard Class, contains information on another avatar
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket.DataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.InventoryLandmark">
+            <summary>
+            InventoryLandmark Class, contains details on a specific location
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticeRequestPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupNoticeRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupNoticeRequestPacket.DataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.TeleportRequestPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.InventoryObject">
+            <summary>
+            InventoryObject Class contains details on a primitive or coalesced set of primitives
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.TeleportRequestPacket.InfoBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.InventoryObject.ItemFlags">
+            <summary>
+            Gets or sets the upper byte of the Flags value
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.InventoryObject.AttachPoint">
+            <summary>
+            Gets or sets the object attachment point, the lower byte of the Flags value
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket.InfoBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.InventoryNotecard">
+            <summary>
+            InventoryNotecard Class, contains details on an encoded text document
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportLocalPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.TeleportLocalPacket.InfoBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.TeleportLandmarkRequestPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.InventoryCategory">
+            <summary>
+            InventoryCategory Class
+            </summary>
+            <remarks>TODO: Is this even used for anything?</remarks>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportLandmarkRequestPacket.InfoBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.TeleportProgressPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryCategory.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Construct an InventoryCategory object from a serialization stream
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportProgressPacket.AgentDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.InventoryLSL">
+            <summary>
+            InventoryLSL Class, represents a Linden Scripting Language object
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportProgressPacket.InfoBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryLSL.#ctor(OpenMetaverse.UUID)">
+            <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>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportFinishPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryLSL.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Construct an InventoryLSL object from a serialization stream
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportFinishPacket.InfoBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.InventorySnapshot">
+            <summary>
+            InventorySnapshot Class, an image taken with the viewer
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartLurePacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventorySnapshot.#ctor(OpenMetaverse.UUID)">
+            <summary>
+            Construct an InventorySnapshot object
+            </summary>
+            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
+            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartLurePacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.StartLurePacket.InfoBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.InventoryAttachment">
+            <summary>
+            InventoryAttachment Class, contains details on an attachable object
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartLurePacket.TargetDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.TeleportLureRequestPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.TeleportLureRequestPacket.InfoBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.InventoryAttachment.AttachmentPoint">
+            <summary>
+            Get the last AttachmentPoint this object was attached to
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportCancelPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.InventoryWearable">
+            <summary>
+            InventoryWearable Class, details on a clothing item or body part
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportCancelPacket.InfoBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.TeleportStartPacket">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.TeleportStartPacket.InfoBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.InventoryWearable.WearableType">
+            <summary>
+            The <seealso cref="T:OpenMetaverse.WearableType"/>, Skin, Shape, Skirt, Etc
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportFailedPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.InventoryAnimation">
+            <summary>
+            InventoryAnimation Class, A bvh encoded object which animates an avatar
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportFailedPacket.InfoBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.TeleportFailedPacket.AlertInfoBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.UndoPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.InventoryGesture">
+            <summary>
+            InventoryGesture Class, details on a series of animations, sounds, and actions
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UndoPacket.AgentDataBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.UndoPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.RedoPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.RedoPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryFolder.PreferredType">
+            <summary>The Preferred <seealso cref="T:OpenMetaverse.AssetType"/> for a folder.</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RedoPacket.ObjectDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryFolder.Version">
+            <summary>The Version of this folder</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UndoLandPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryFolder.DescendentCount">
+            <summary>Number of child items this folder contains.</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UndoLandPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryFolder.#ctor(OpenMetaverse.UUID)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="itemID">UUID of the folder</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentPausePacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryFolder.ToString">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentPausePacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AgentResumePacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AgentResumePacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryFolder.GetHashCode">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChatFromViewerPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryFolder.Equals(System.Object)">
+            <summary>
+            
+            </summary>
+            <param name="o"></param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChatFromViewerPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryFolder.Equals(OpenMetaverse.InventoryBase)">
+            <summary>
+            
+            </summary>
+            <param name="o"></param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChatFromViewerPacket.ChatDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryFolder.Equals(OpenMetaverse.InventoryFolder)">
+            <summary>
+            
+            </summary>
+            <param name="o"></param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentThrottlePacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AgentThrottlePacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryFolder.GetOSD">
+            <summary>
+            Convert InventoryItem to OSD
+            </summary>
+            <returns>OSD representation of InventoryItem</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentThrottlePacket.ThrottleBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.InventoryManager">
+            <summary>
+            Tools for dealing with agents inventory
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentFOVPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryManager.MAGIC_ID">
+            <summary>Used for converting shadow_id to asset_id</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentFOVPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryManager.m_ItemReceived">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentFOVPacket.FOVBlockBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AgentHeightWidthPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryManager.m_ItemReceivedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryManager.m_FolderUpdated">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket.HeightWidthBlockBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AgentSetAppearancePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryManager.m_FolderUpdatedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryManager.m_InventoryObjectOffered">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.WearableDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AgentSetAppearancePacket.ObjectDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryManager.m_InventoryObjectOfferedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.VisualParamBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryManager.m_TaskItemReceived">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AgentQuitCopyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryManager.m_TaskItemReceivedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket.FuseBlockBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryManager.m_FindObjectByPathReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImageNotInDatabasePacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ImageNotInDatabasePacket.ImageIDBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryManager.m_FindObjectByPathReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RebakeAvatarTexturesPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryManager.m_TaskInventoryReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RebakeAvatarTexturesPacket.TextureDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.SetAlwaysRunPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryManager.m_TaskInventoryReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetAlwaysRunPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryManager.m_SaveAssetToInventory">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeletePacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectDeletePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryManager.m_SaveAssetToInventoryLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeletePacket.ObjectDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryManager.m_ScriptRunningReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectDuplicatePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryManager.m_ScriptRunningReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.SharedDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.InventoryManager._NewFolderNames">
+            <summary>Partial mapping of AssetTypes to folder names</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.ObjectDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Default constructor
+            </summary>
+            <param name="client">Reference to the GridClient object</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectScalePacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectScalePacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectScalePacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectRotationPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectRotationPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectRotationPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectClickActionPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectClickActionPacket.AgentDataBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.ObjectClickActionPacket.ObjectDataBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.ObjectImagePacket">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.ObjectImagePacket.AgentDataBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.ObjectImagePacket.ObjectDataBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.ObjectMaterialPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectMaterialPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectMaterialPacket.ObjectDataBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.ObjectShapePacket">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.ObjectShapePacket.AgentDataBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.ObjectShapePacket.ObjectDataBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryManager.EmptyLostAndFound">
+            <summary>
+            Empty the Lost and Found folder
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket.ObjectDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryManager.EmptyTrash">
+            <summary>
+            Empty the Trash folder
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket">
-            <exclude/>
-        </member>
-        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.AgentDataBlock">
-            <exclude/>
-        </member>
-        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.HeaderDataBlock">
-            <exclude/>
-        </member>
-        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectGroupPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectGroupPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectGroupPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectBuyPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectBuyPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectBuyPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.BuyObjectInventoryPacket">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket.AgentDataBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket.DataBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.DerezContainerPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.DerezContainerPacket.DataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectPermissionsPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectPermissionsPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectPermissionsPacket.HeaderDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItem(OpenMetaverse.InventoryItem)">
+            <summary>
+            
+            </summary>
+            <param name="item"></param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket.ObjectDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItems(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
+            <summary>
+            
+            </summary>
+            <param name="items"></param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSaleInfoPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectSaleInfoPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectSaleInfoPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectNamePacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectNamePacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectNamePacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectDescriptionPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectDescriptionPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectDescriptionPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectCategoryPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectCategoryPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectCategoryPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectSelectPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectSelectPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectSelectPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectDeselectPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectDeselectPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectDeselectPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectAttachPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectAttachPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectAttachPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectDetachPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectDetachPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectDetachPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectDropPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectDropPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectDropPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectLinkPacket">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.ObjectLinkPacket.AgentDataBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.ObjectLinkPacket.ObjectDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryManager.SaveAssetIntoInventoryHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDelinkPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryManager.InventoryDescendentsHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDelinkPacket.AgentDataBlock">
-            <exclude/>
-        </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDelinkPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectGrabPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectGrabPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectGrabPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectGrabPacket.SurfaceInfoBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket">
-            <exclude/>
+        <member name="E:OpenMetaverse.InventoryManager.ItemReceived">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.AgentDataBlock">
-            <exclude/>
+        <member name="E:OpenMetaverse.InventoryManager.FolderUpdated">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.SurfaceInfoBlock">
-            <exclude/>
+        <member name="E:OpenMetaverse.InventoryManager.TaskItemReceived">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket">
-            <exclude/>
+        <member name="E:OpenMetaverse.InventoryManager.FindObjectByPathReply">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket.AgentDataBlock">
-            <exclude/>
+        <member name="E:OpenMetaverse.InventoryManager.TaskInventoryReply">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket.ObjectDataBlock">
-            <exclude/>
+        <member name="E:OpenMetaverse.InventoryManager.SaveAssetToInventory">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket.SurfaceInfoBlock">
-            <exclude/>
+        <member name="E:OpenMetaverse.InventoryManager.ScriptRunningReply">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSpinStartPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.InventoryManager.Store">
+            <summary>
+            Get this agents Inventory data
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSpinStartPacket.AgentDataBlock">
-            <exclude/>
+        <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.Packets.ObjectSpinStartPacket.ObjectDataBlock">
-            <exclude/>
+        <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.Packets.ObjectSpinUpdatePacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.InventoryManager.ItemCopiedCallback">
+            <summary>
+            
+            </summary>
+            <param name="item"></param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSpinUpdatePacket.AgentDataBlock">
-            <exclude/>
+        <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.Packets.ObjectSpinUpdatePacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectSpinStopPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.InventoryObjectOfferedEventArgs.Accept">
+            <summary>Set to true to accept offer, false to decline it</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSpinStopPacket.AgentDataBlock">
-            <exclude/>
+        <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.Packets.ObjectSpinStopPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectExportSelectedPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectExportSelectedPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridClient.Network">
+            <summary>Networking subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectExportSelectedPacket.ObjectDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridClient.Settings">
+            <summary>Settings class including constant values and changeable
+            parameters for everything</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ModifyLandPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridClient.Parcels">
+            <summary>Parcel (subdivided simulator lots) subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridClient.Self">
+            <summary>Our own avatars subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.ModifyBlockBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridClient.Avatars">
+            <summary>Other avatars subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.ParcelDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridClient.Estate">
+            <summary>Estate subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.ModifyBlockExtendedBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridClient.Friends">
+            <summary>Friends list subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOnPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridClient.Grid">
+            <summary>Grid (aka simulator group) subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOnPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridClient.Objects">
+            <summary>Object subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOffPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridClient.Groups">
+            <summary>Group subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOffPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridClient.Assets">
+            <summary>Asset subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.StateSavePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridClient.Appearance">
+            <summary>Appearance subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.StateSavePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridClient.Inventory">
+            <summary>Inventory subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.StateSavePacket.DataBlockBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridClient.Directory">
+            <summary>Directory searches including classifieds, people, land 
+            sales, etc</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ReportAutosaveCrashPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridClient.Terrain">
+            <summary>Handles land, wind, and cloud heightmaps</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ReportAutosaveCrashPacket.AutosaveDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridClient.Sound">
+            <summary>Handles sound-related networking</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridClient.Throttle">
+            <summary>Throttling total bandwidth usage, or allocating bandwidth
+            for specific data stream types</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket.AgentDataBlock">
-            <exclude/>
-        </member>
-        <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket.DataBlockBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.GridClient.#ctor">
+            <summary>
+            Default constructor
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TrackAgentPacket">
-            <exclude/>
+        <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.Packets.TrackAgentPacket.AgentDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.AssetCache">
+            <summary>
+            Class that handles the local asset cache
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TrackAgentPacket.TargetDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.AssetCache.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Default constructor
+            </summary>
+            <param name="client">A reference to the GridClient object</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.AssetCache.DestroyTimer">
+            <summary>
+            Disposes cleanup timer
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.AssetCache.SetupTimer">
+            <summary>
+            Only create timer when needed
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.DownloadTotalsBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.AssetCache.GetCachedAssetBytes(OpenMetaverse.UUID)">
+            <summary>
+            Return bytes read from the local asset cache, null if it does not exist
+            </summary>
+            <param name="assetID">UUID of the asset we want to get</param>
+            <returns>Raw bytes of the asset, or null on failure</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.NetStatsBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.AssetCache.GetCachedImage(OpenMetaverse.UUID)">
+            <summary>
+            Returns ImageDownload object of the
+            image from the local image cache, null if it does not exist
+            </summary>
+            <param name="imageID">UUID of the image we want to get</param>
+            <returns>ImageDownload object containing the image, or null on failure</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.FailStatsBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.AssetCache.FileName(OpenMetaverse.UUID)">
+            <summary>
+            Constructs a file name of the cached asset
+            </summary>
+            <param name="assetID">UUID of the asset</param>
+            <returns>String with the file name of the cahced asset</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.MiscStatsBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.AssetCache.StaticFileName(OpenMetaverse.UUID)">
+            <summary>
+            Constructs a file name of the static cached asset
+            </summary>
+            <param name="assetID">UUID of the asset</param>
+            <returns>String with the file name of the static cached asset</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.AssetCache.SaveAssetToCache(OpenMetaverse.UUID,System.Byte[])">
+            <summary>
+            Saves an asset to the local cache
+            </summary>
+            <param name="assetID">UUID of the asset</param>
+            <param name="assetData">Raw bytes the asset consists of</param>
+            <returns>Weather the operation was successfull</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.AssetCache.AssetFileName(OpenMetaverse.UUID)">
+            <summary>
+            Get the file name of the asset stored with gived UUID
+            </summary>
+            <param name="assetID">UUID of the asset</param>
+            <returns>Null if we don't have that UUID cached on disk, file name if found in the cache folder</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket.DataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.AssetCache.HasAsset(OpenMetaverse.UUID)">
+            <summary>
+            Checks if the asset exists in the local cache
+            </summary>
+            <param name="assetID">UUID of the asset</param>
+            <returns>True is the asset is stored in the cache, otherwise false</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserReportPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.AssetCache.Clear">
+            <summary>
+            Wipes out entire cache
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserReportPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.AssetCache.Prune">
+            <summary>
+            Brings cache size to the 90% of the max size
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserReportPacket.ReportDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.AssetCache.BeginPrune">
+            <summary>
+            Asynchronously brings cache size to the 90% of the max size
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AlertMessagePacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.AssetCache.GetFileSize(System.IO.FileInfo[])">
+            <summary>
+            Adds up file sizes passes in a FileInfo array
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AlertMessagePacket.AlertDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.AssetCache.Operational">
+            <summary>
+            Checks whether caching is enabled
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AlertMessagePacket.AlertInfoBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.AssetCache.cleanerTimer_Elapsed(System.Object,System.Timers.ElapsedEventArgs)">
+            <summary>
+            Periodically prune the cache
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.AssetCache.NiceFileSize(System.Int64)">
+            <summary>
+            Nicely formats file sizes
+            </summary>
+            <param name="byteCount">Byte size we want to output</param>
+            <returns>String with humanly readable file size</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AssetCache.AutoPruneEnabled">
+            <summary>
+            Allows setting weather to periodicale prune the cache if it grows too big
+            Default is enabled, when caching is enabled
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket.AlertDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AssetCache.AutoPruneInterval">
+            <summary>
+            How long (in ms) between cache checks (default is 5 min.) 
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MeanCollisionAlertPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.AssetCache.SortFilesByAccesTimeHelper">
+            <summary>
+            Helper class for sorting files by their last accessed time
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MeanCollisionAlertPacket.MeanCollisionBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.Voice.VoiceSession">
+            <summary>
+            Represents a single Voice Session to the Vivox service.
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerFrozenMessagePacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.Voice.VoiceSession.Close">
+            <summary>
+            Close this session.
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerFrozenMessagePacket.FrozenDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.HealthMessagePacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.DictionaryEventAction">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.HealthMessagePacket.HealthDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DictionaryEventAction.Add">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChatFromSimulatorPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DictionaryEventAction.Remove">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChatFromSimulatorPacket.ChatDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DictionaryEventAction.Change">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimStatsPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.DictionaryChangeCallback">
+            <summary>
+            
+            </summary>
+            <param name="action"></param>
+            <param name="entry"></param>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimStatsPacket.RegionBlock">
-            <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.SimStatsPacket.StatBlock">
-            <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.SimStatsPacket.PidStatBlock">
-            <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.RequestRegionInfoPacket">
-            <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.RequestRegionInfoPacket.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.RegionInfoPacket">
-            <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.RegionInfoPacket.AgentDataBlock">
-            <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.RegionInfoPacket.RegionInfoBlock">
-            <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.RegionInfoPacket.RegionInfo2Block">
-            <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.GodUpdateRegionInfoPacket">
-            <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.GodUpdateRegionInfoPacket.AgentDataBlock">
-            <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.GodUpdateRegionInfoPacket.RegionInfoBlock">
-            <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.RegionHandshakePacket">
-            <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.RegionHandshakePacket.RegionInfoBlock">
-            <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.RegionHandshakePacket.RegionInfo2Block">
-            <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.RegionHandshakePacket.RegionInfo3Block">
-            <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.RegionHandshakeReplyPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.ObservableDictionary`2.Clear">
+            <summary>
+            Clear the contents of the dictionary
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.ObservableDictionary`2.GetEnumerator">
+            <summary>
+            Enumerator for iterating dictionary entries
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket.RegionInfoBlock">
-            <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.SimulatorViewerTimeMessagePacket">
-            <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.SimulatorViewerTimeMessagePacket.TimeInfoBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.BinBVHAnimationReader">
+            <summary>
+            Reads in a byte array of an Animation Asset created by the SecondLife(tm) client.
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EnableSimulatorPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.rotationkeys">
+            <summary>
+            Rotation Keyframe count (used internally)
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EnableSimulatorPacket.SimulatorInfoBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.positionkeys">
+            <summary>
+            Position Keyframe count (used internally)
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DisableSimulatorPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.Priority">
+            <summary>
+            Animation Priority
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferRequestPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.Length">
+            <summary>
+            The animation length in seconds.
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferRequestPacket.TransferInfoBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.ExpressionName">
+            <summary>
+            Expression set in the client.  Null if [None] is selected
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferInfoPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.InPoint">
+            <summary>
+            The time in seconds to start the animation
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferInfoPacket.TransferInfoBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.OutPoint">
+            <summary>
+            The time in seconds to end the animation
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferAbortPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.Loop">
+            <summary>
+            Loop the animation
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferAbortPacket.TransferInfoBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.EaseInTime">
+            <summary>
+            Meta data. Ease in Seconds.
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestXferPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.EaseOutTime">
+            <summary>
+            Meta data. Ease out seconds.
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestXferPacket.XferIDBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.HandPose">
+            <summary>
+            Meta Data for the Hand Pose
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AbortXferPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.JointCount">
+            <summary>
+            Number of joints defined in the animation
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AbortXferPacket.XferIDBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.joints">
+            <summary>
+            Contains an array of joints
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AvatarAppearancePacket.SenderBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.BinBVHAnimationReader.ReadBytesUntilNull(System.Byte[],System.Int32@)">
+            <summary>
+            Variable length strings seem to be null terminated in the animation asset..    but..   
+            use with caution, home grown.
+            advances the index.
+            </summary>
+            <param name="data">The animation asset byte array</param>
+            <param name="i">The offset to start reading</param>
+            <returns>a string</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AvatarAppearancePacket.VisualParamBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket.CameraPropertyBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.binBVHJoint">
+            <summary> 
+            A Joint and it's associated meta data and keyframes
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClearFollowCamPropertiesPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ClearFollowCamPropertiesPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.RequestPayPricePacket">
-            <exclude/>
+        <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.Packets.RequestPayPricePacket.ObjectDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.binBVHJoint.Priority">
+            <summary>
+            Joint Animation Override?   Was the same as the Priority in testing.. 
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PayPriceReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.binBVHJoint.rotationkeys">
+            <summary>
+            Array of Rotation Keyframes in order from earliest to latest
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PayPriceReplyPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.PayPriceReplyPacket.ButtonDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.binBVHJoint.Tag">
+            <summary>
+            Custom application data that can be attached to a joint
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.KickUserPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.binBVHJointKey">
+            <summary>
+            A Joint Keyframe.  This is either a position or a rotation.
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.KickUserPacket.TargetBlockBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.binBVHJointKey.key_element">
+            <summary>
+            Either a Vector3 position or a Vector3 Euler rotation
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.KickUserPacket.UserInfoBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.HandPose">
+            <summary>
+            Poses set in the animation metadata for the hands.
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodKickUserPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.Assets.AssetScriptBinary">
+            <summary>
+            Represents an AssetScriptBinary object containing the 
+            LSO compiled bytecode of an LSL script
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodKickUserPacket.UserInfoBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.#ctor">
+            <summary>Initializes a new instance of an AssetScriptBinary object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EjectUserPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.EjectUserPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.Encode">
+            <summary>
+            TODO: Encodes a scripts contents into a LSO Bytecode file
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EjectUserPacket.DataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.Decode">
+            <summary>
+            TODO: Decode LSO Bytecode into a string
+            </summary>
+            <returns>true</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.FreezeUserPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.Assets.AssetScriptBinary.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FreezeUserPacket.AgentDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.Assets.AssetPrim">
+            <summary>
+            A linkset asset, containing a parent primitive and zero or more children
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FreezeUserPacket.DataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Assets.AssetPrim.#ctor">
+            <summary>Initializes a new instance of an AssetPrim object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesRequestPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AvatarPropertiesRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Assets.AssetPrim.Encode">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.Assets.AssetPrim.Decode">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.Assets.AssetPrim.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket.PropertiesDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.Assets.AssetPrim.ProfileShape">
+            <summary>
+            Only used internally for XML serialization/deserialization
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.Assets.PrimObject">
+            <summary>
+            The deserialized form of a single primitive in a linkset asset
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.FieldType">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket.PropertiesDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.U8">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.U16">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.U32">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.GroupDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.U64">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.NewGroupDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.S8">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.S16">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.S32">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket.PropertiesDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.F32">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.F64">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.UUID">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket.PropertiesDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.BOOL">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.Vector3">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.Vector3d">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.Vector4">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.Quaternion">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.IPADDR">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.IPPORT">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.Variable">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.Fixed">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket.DataBlock">
-            <exclude/>
-        </member>
-        <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket">
-            <exclude/>
-        </member>
-        <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.Single">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket.EventDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.FieldType.Multiple">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.MapField">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.MapField.KeywordPosition">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket.EventDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.MapField.Name">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.MapField.Type">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.MapField.Count">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket.EventDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.MapField.CompareTo(System.Object)">
+            <summary>
+            
+            </summary>
+            <param name="obj"></param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.MapBlock">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.MapBlock.KeywordPosition">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket.EventDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.MapBlock.Name">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.MapBlock.Count">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.MapBlock.Fields">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket.EventDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.MapBlock.CompareTo(System.Object)">
+            <summary>
+            
+            </summary>
+            <param name="obj"></param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket.QueryDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.MapPacket">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.MapPacket.ID">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.MapPacket.Name">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.MapPacket.Frequency">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.MapPacket.Trusted">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.MapPacket.Encoded">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.MapPacket.Blocks">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickDeletePacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.ProtocolManager">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickDeletePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ProtocolManager.TypeSizes">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickDeletePacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ProtocolManager.KeywordPositions">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickGodDeletePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.ProtocolManager.LowMaps">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickGodDeletePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ProtocolManager.MediumMaps">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickGodDeletePacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ProtocolManager.HighMaps">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptQuestionPacket">
-            <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.ScriptQuestionPacket.DataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.ProtocolManager.Command(System.String)">
+            <summary>
+            
+            </summary>
+            <param name="command"></param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptControlChangePacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.ProtocolManager.Command(System.Byte[])">
+            <summary>
+            
+            </summary>
+            <param name="data"></param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptControlChangePacket.DataBlock">
-            <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.ScriptDialogPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.ProtocolManager.PrintMap">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptDialogPacket.DataBlock">
-            <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.ScriptDialogPacket.ButtonsBlock">
-            <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.ScriptDialogReplyPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.ProtocolManager.LoadMapFile(System.String)">
+            <summary>
+            
+            </summary>
+            <param name="mapFile"></param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptDialogReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.PermissionMask">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptDialogReplyPacket.DataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.PermissionWho">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ForceScriptControlReleasePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.PermissionWho.Base">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ForceScriptControlReleasePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.PermissionWho.Owner">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RevokePermissionsPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.PermissionWho.Group">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RevokePermissionsPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.PermissionWho.Everyone">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RevokePermissionsPacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.PermissionWho.NextOwner">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LoadURLPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.PermissionWho.All">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LoadURLPacket.DataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.Permissions">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptTeleportRequestPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.Logger">
+            <summary>
+            Singleton logging class for the entire library
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptTeleportRequestPacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Logger.LogInstance">
+            <summary>log4net logging engine</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelOverlayPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.Logger.#cctor">
+            <summary>
+            Default constructor
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelOverlayPacket.ParcelDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel)">
+            <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="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket.ParcelDataBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.Logger.DebugLog(System.Object)">
+            <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="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket.AgentDataBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket.ParcelDataBlock">
-            <exclude/>
+        <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.Packets.ParcelReturnObjectsPacket">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.AgentDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.Assets.AssetCallingCard">
+            <summary>
+            Represents a Callingcard with AvatarID and Position vector
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.ParcelDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Assets.AssetCallingCard.AvatarID">
+            <summary>UUID of the Callingcard target avatar</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.TaskIDsBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Assets.AssetCallingCard.#ctor">
+            <summary>Construct an Asset of type Callingcard</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.OwnerIDsBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket.AgentDataBlock">
-            <exclude/>
+        <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.Packets.ParcelSetOtherCleanTimePacket.ParcelDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Assets.AssetCallingCard.Decode">
+            <summary>
+            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="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.Assets.AssetCallingCard.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.AgentDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.RegionFlags">
+            <summary>
+            Simulator (region) properties
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.ParcelDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.None">
+            <summary>No flags set</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.TaskIDsBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.AllowDamage">
+            <summary>Agents can take damage and be killed</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.OwnerIDsBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.AllowLandmark">
+            <summary>Landmarks can be created here</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.AllowSetHome">
+            <summary>Home position can be set in this sim</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.ResetHomeOnTeleport">
+            <summary>Home position is reset when an agent teleports away</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.ParcelDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.SunFixed">
+            <summary>Sun does not move</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.ReturnIDsBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.TaxFree">
+            <summary>No object, land, etc. taxes</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateCovenantRequestPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.BlockTerraform">
+            <summary>Disable heightmap alterations (agents can still plant
+            foliage)</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateCovenantRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.BlockLandResell">
+            <summary>Land cannot be released, sold, or purchased</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateCovenantReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.Sandbox">
+            <summary>All content is wiped nightly</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateCovenantReplyPacket.DataBlock">
-            <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.ForceObjectSelectPacket">
-            <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.ForceObjectSelectPacket.HeaderBlock">
-            <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.ForceObjectSelectPacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.SkipCollisions">
+            <summary>No collision detection for non-agent objects</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelBuyPassPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.SkipScripts">
+            <summary>No scripts are ran</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelBuyPassPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.SkipPhysics">
+            <summary>All physics processing is turned off</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelBuyPassPacket.ParcelDataBlock">
-            <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.ParcelDeedToGroupPacket">
-            <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.ParcelDeedToGroupPacket.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.ParcelDeedToGroupPacket.DataBlock">
-            <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.ParcelReclaimPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.NoFly">
+            <summary>Flight is disabled (not currently enforced by the sim)</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReclaimPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.AllowDirectTeleport">
+            <summary>Allow direct (p2p) teleporting</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReclaimPacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.EstateSkipScripts">
+            <summary>Estate owner has temporarily disabled scripting</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelClaimPacket">
-            <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.ParcelClaimPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.DenyAnonymous">
+            <summary>Deny agents with no payment info on file</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelClaimPacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.DenyIdentified">
+            <summary>Deny agents with payment info on file</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelClaimPacket.ParcelDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.DenyTransacted">
+            <summary>Deny agents who have made a monetary transaction</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelJoinPacket">
-            <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.ParcelJoinPacket.AgentDataBlock">
-            <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.ParcelJoinPacket.ParcelDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.RegionFlags.AllowVoice">
+            <summary>Region is Voice Enabled</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDividePacket">
-            <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.ParcelDividePacket.AgentDataBlock">
-            <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.ParcelDividePacket.ParcelDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.RegionProtocols">
+            <summary>
+            Region protocol flags
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReleasePacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.SimAccess">
+            <summary>
+            Access level for a simulator
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReleasePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.SimAccess.Unknown">
+            <summary>Unknown or invalid access level</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReleasePacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.SimAccess.Trial">
+            <summary>Trial accounts allowed</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelBuyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.SimAccess.PG">
+            <summary>PG rating</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelBuyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.SimAccess.Mature">
+            <summary>Mature rating</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelBuyPacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.SimAccess.Adult">
+            <summary>Adult rating</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelBuyPacket.ParcelDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.SimAccess.Down">
+            <summary>Simulator is offline</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelGodForceOwnerPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.SimAccess.NonExistent">
+            <summary>Simulator does not exist</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelGodForceOwnerPacket.AgentDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.Simulator">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelGodForceOwnerPacket.DataBlock">
-            <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.ParcelAccessListRequestPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.ID">
+            <summary>A Unique Cache identifier for this simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.Caps">
+            <summary>The capabilities for this simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.Handle">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimVersion">
+            <summary>The current version of software this simulator is running</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.Name">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket.ListBlock">
-            <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.ParcelAccessListUpdatePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.ParcelOverlaysReceived">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange00">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange01">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.ListBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange10">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDwellRequestPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange11">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDwellRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight00">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDwellRequestPacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight01">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDwellReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight10">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDwellReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight11">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDwellReplyPacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.WaterHeight">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimOwner">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.TerrainBase0">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket.ParcelDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.TerrainBase1">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStartAuctionPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.TerrainBase2">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStartAuctionPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.TerrainBase3">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStartAuctionPacket.ParcelDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.TerrainDetail0">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDNameRequestPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.TerrainDetail1">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDNameRequestPacket.UUIDNameBlockBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.TerrainDetail2">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDNameReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.TerrainDetail3">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDNameReplyPacket.UUIDNameBlockBlock">
-            <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.UUIDGroupNameRequestPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.Flags">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDGroupNameRequestPacket.UUIDNameBlockBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.Access">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDGroupNameReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.BillableFactor">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDGroupNameReplyPacket.UUIDNameBlockBlock">
-            <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.ChildAgentDyingPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.RegionID">
+            <summary>The regions Unique ID</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentDyingPacket.AgentDataBlock">
-            <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.ChildAgentUnknownPacket">
-            <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.ChildAgentUnknownPacket.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.GetScriptRunningPacket">
-            <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.GetScriptRunningPacket.ScriptBlock">
-            <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.ScriptRunningReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.Protocols">
+            <summary>
+            Flags indicating which protocols this region supports
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptRunningReplyPacket.ScriptBlock">
-            <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.SetScriptRunningPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.ObjectsAvatars">
+            <summary>
+            A thread-safe dictionary containing avatars in a simulator        
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.ObjectsPrimitives">
+            <summary>
+            A thread-safe dictionary containing primitives in a simulator
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket.ScriptBlock">
-            <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.ScriptResetPacket">
-            <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.ScriptResetPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.DisconnectCandidate">
+            <summary>Used internally to track sim disconnections</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptResetPacket.ScriptBlock">
-            <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.ScriptSensorRequestPacket">
-            <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.ScriptSensorRequestPacket.RequesterBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.avatarPositions">
+            <summary>Coarse locations of avatars in this simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.preyID">
+            <summary>AvatarPositions key representing TrackAgent target</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket.RequesterBlock">
-            <exclude/>
-        </member>
-        <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket.SensedDataBlock">
-            <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.CompleteAgentMovementPacket">
-            <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.CompleteAgentMovementPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.pauseSerial">
+            <summary>Sequence number for pause/resume</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket">
-            <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.AgentMovementCompletePacket.AgentDataBlock">
-            <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.AgentMovementCompletePacket.DataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Simulator.Dispose">
+            <summary>
+            Called when this Simulator object is being destroyed
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket.SimDataBlock">
-            <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.LogoutRequestPacket">
-            <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.LogoutRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Simulator.Disconnect(System.Boolean)">
+            <summary>
+            Disconnect from this simulator
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LogoutReplyPacket">
-            <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.LogoutReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Simulator.Resume">
+            <summary>
+            Instructs the simulator to resume sending update packets (unpause)
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LogoutReplyPacket.InventoryDataBlock">
-            <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.ImprovedInstantMessagePacket">
-            <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.ImprovedInstantMessagePacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Simulator.SendPing">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImprovedInstantMessagePacket.MessageBlockBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Simulator.ToString">
+            <summary>
+            Returns Simulator Name as a String
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.RetrieveInstantMessagesPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.Simulator.GetHashCode">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.RetrieveInstantMessagesPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Simulator.Equals(System.Object)">
+            <summary>
+            
+            </summary>
+            <param name="obj"></param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.FindAgentPacket">
-            <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.FindAgentPacket.AgentBlockBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Simulator.ResendUnacked">
+            <summary>
+            Resend unacknowledged packets
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FindAgentPacket.LocationBlockBlock">
-            <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.RequestGodlikePowersPacket">
-            <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.RequestGodlikePowersPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.Simulator.IPEndPoint">
+            <summary>The IP address and port of the server</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestGodlikePowersPacket.RequestBlockBlock">
-            <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.GrantGodlikePowersPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.Simulator.AvatarPositions">
+            <summary>Coarse locations of avatars in this simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GrantGodlikePowersPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.Simulator.PreyID">
+            <summary>AvatarPositions key representing TrackAgent target</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GrantGodlikePowersPacket.GrantDataBlock">
-            <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.GodlikeMessagePacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.Simulator.SimStats">
+            <summary>
+            Simulator Statistics
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket.AgentDataBlock">
-            <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.GodlikeMessagePacket.MethodDataBlock">
-            <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.GodlikeMessagePacket.ParamListBlock">
-            <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.EstateOwnerMessagePacket">
-            <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.EstateOwnerMessagePacket.AgentDataBlock">
-            <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.EstateOwnerMessagePacket.MethodDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ResentPackets">
+            <summary>Total number of packets that have been resent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket.ParamListBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ReceivedResends">
+            <summary>Total number of resent packets recieved</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GenericMessagePacket">
-            <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.GenericMessagePacket.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.GenericMessagePacket.MethodDataBlock">
-            <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.GenericMessagePacket.ParamListBlock">
-            <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.MuteListRequestPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.LastPingSent">
+            <summary>Time last ping was sent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MuteListRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.LastPingID">
+            <summary>ID of last Ping sent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MuteListRequestPacket.MuteDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.LastLag">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.MissedPings">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.Dilation">
+            <summary>Current time dilation of this simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket.MuteDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.FPS">
+            <summary>Current Frames per second of simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.PhysicsFPS">
+            <summary>Current Physics frames per second of simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.AgentUpdates">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket.MuteDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.FrameTime">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.NetTime">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.PhysicsTime">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.NotecardDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ImageTime">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.InventoryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ScriptTime">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateInventoryItemPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.AgentTime">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateInventoryItemPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.OtherTime">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateInventoryItemPacket.InventoryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.Objects">
+            <summary>Total number of objects Simulator is simulating</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateCreateInventoryItemPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ScriptedObjects">
+            <summary>Total number of Active (Scripted) objects running</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateCreateInventoryItemPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.Agents">
+            <summary>Number of agents currently in this simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateCreateInventoryItemPacket.InventoryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ChildAgents">
+            <summary>Number of agents in neighbor simulators</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveInventoryItemPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ActiveScripts">
+            <summary>Number of Active scripts running in this simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveInventoryItemPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.LSLIPS">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveInventoryItemPacket.InventoryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.INPPS">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.OUTPPS">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.PendingDownloads">
+            <summary>Number of downloads pending</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket.InventoryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.PendingUploads">
+            <summary>Number of uploads pending</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.VirtualSize">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ResidentSize">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket.InventoryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.PendingLocalUploads">
+            <summary>Number of local uploads pending</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Simulator.SimStats.UnackedBytes">
+            <summary>Unacknowledged bytes in queue</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.SimulatorDataPool.Handle">
+            <summary>
+            Simulator handle
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket.InventoryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.SimulatorDataPool.ActiveClients">
+            <summary>
+            Number of GridClients using this datapool
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.SimulatorDataPool.InactiveSince">
+            <summary>
+            Time that the last client disconnected from the simulator
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket.AgentDataBlock">
-            <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.SaveAssetIntoInventoryPacket.InventoryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.SimulatorDataPool.Parcels">
+            <summary>
+            Shared parcel info only when POOL_PARCEL_DATA == true
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.ReportType">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ReportType.None">
+            <summary>No report</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket.FolderDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ReportType.Unknown">
+            <summary>Unknown report type</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.ReportType.Bug">
+            <summary>Bug report</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ReportType.Complaint">
+            <summary>Complaint report</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket.FolderDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ReportType.CustomerServiceRequest">
+            <summary>Customer service report</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveInventoryFolderPacket">
-            <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.MoveInventoryFolderPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.CompressedFlags.ScratchPad">
+            <summary>Unknown</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveInventoryFolderPacket.InventoryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.CompressedFlags.Tree">
+            <summary>Whether the object has a TreeSpecies</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.CompressedFlags.HasText">
+            <summary>Whether the object has floating text ala llSetText</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.CompressedFlags.HasParticles">
+            <summary>Whether the object has an active particle system</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket.FolderDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.CompressedFlags.HasSound">
+            <summary>Whether the object has sound attached to it</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket">
-            <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.FetchInventoryDescendentsPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.CompressedFlags.TextureAnimation">
+            <summary>Whether the object has texture animation settings</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket.InventoryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.CompressedFlags.HasAngularVelocity">
+            <summary>Whether the object has an angular velocity</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.CompressedFlags.HasNameValues">
+            <summary>Whether the object has a name value pairs string</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.CompressedFlags.MediaURL">
+            <summary>Whether the object has a Media URL set</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.FolderDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.UpdateType">
+            <summary>
+            Specific Flags for MultipleObjectUpdate requests
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.ItemDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.UpdateType.None">
+            <summary>None</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.UpdateType.Position">
+            <summary>Change position of prims</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.UpdateType.Rotation">
+            <summary>Change rotation of prims</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryPacket.InventoryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.UpdateType.Scale">
+            <summary>Change size of prims</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.UpdateType.Linked">
+            <summary>Perform operation on link set</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryReplyPacket.AgentDataBlock">
-            <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.FetchInventoryReplyPacket.InventoryDataBlock">
-            <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.BulkUpdateInventoryPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.PayPriceType.Hide">
+            <summary>
+            Indicates that this pay option should be hidden
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket.AgentDataBlock">
-            <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.BulkUpdateInventoryPacket.FolderDataBlock">
-            <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.BulkUpdateInventoryPacket.ItemDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.Avatar">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.CollisionPlane">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.State">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.FolderDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.LocalID">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.ItemDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.Position">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.Velocity">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.Acceleration">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket.InventoryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.Rotation">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.AngularVelocity">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.Textures">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.UpdateDataBlock">
-            <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.UpdateTaskInventoryPacket.InventoryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectUpdate">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectUpdateLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectProperties">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket.InventoryDataBlock">
-            <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.MoveTaskInventoryPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveTaskInventoryPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesUpdated">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveTaskInventoryPacket.InventoryDataBlock">
-            <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.RequestTaskInventoryPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesUpdatedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestTaskInventoryPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesFamily">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestTaskInventoryPacket.InventoryDataBlock">
-            <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.ReplyTaskInventoryPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesFamilyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ReplyTaskInventoryPacket.InventoryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_AvatarUpdate">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket">
-            <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.DeRezObjectPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_AvatarUpdateLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket.AgentBlockBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_TerseObjectUpdate">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket.ObjectDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_TerseObjectUpdateLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeRezAckPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectDataBlockUpdate">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeRezAckPacket.TransactionDataBlock">
-            <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.RezObjectPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectDataBlockUpdateLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_KillObject">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectPacket.RezDataBlock">
-            <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.RezObjectPacket.InventoryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_KillObjectLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_KillObjects">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.AgentDataBlock">
-            <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.RezObjectFromNotecardPacket.RezDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_KillObjectsLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.NotecardDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_AvatarSitChanged">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.InventoryDataBlock">
-            <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.AcceptFriendshipPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_AvatarSitChangedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_PayPriceReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket.TransactionBlockBlock">
-            <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.AcceptFriendshipPacket.FolderDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_PayPriceReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeclineFriendshipPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_PhysicsProperties">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeclineFriendshipPacket.AgentDataBlock">
-            <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.DeclineFriendshipPacket.TransactionBlockBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.m_PhysicsPropertiesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TerminateFriendshipPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.ObjectManager.Client">
+            <summary>Reference to the GridClient object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TerminateFriendshipPacket.AgentDataBlock">
-            <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.Packets.TerminateFriendshipPacket.ExBlockBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.ObjectManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Construct a new instance of the ObjectManager class
+            </summary>
+            <param name="client">A reference to the <see cref="T:OpenMetaverse.GridClient"/> instance</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.OfferCallingCardPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.OfferCallingCardPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.OfferCallingCardPacket.AgentBlockBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AcceptCallingCardPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AcceptCallingCardPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AcceptCallingCardPacket.TransactionBlockBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AcceptCallingCardPacket.FolderDataBlock">
-            <exclude/>
-        </member>
-        <member name="T:OpenMetaverse.Packets.DeclineCallingCardPacket">
-            <exclude/>
-        </member>
-        <member name="T:OpenMetaverse.Packets.DeclineCallingCardPacket.AgentDataBlock">
-            <exclude/>
+        <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.Packets.DeclineCallingCardPacket.TransactionBlockBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.RezScriptPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.RezScriptPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.RezScriptPacket.UpdateBlockBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.RezScriptPacket.InventoryBlockBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.CreateInventoryItemPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.CreateInventoryItemPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.CreateInventoryItemPacket.InventoryBlockBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.EventDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.InventoryBlockBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.RegionHandleRequestPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.RegionHandleRequestPacket.RequestBlockBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.RegionIDAndHandleReplyPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.RegionIDAndHandleReplyPacket.ReplyBlockBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.MoneyTransferRequestPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.MoneyTransferRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.MoneyTransferRequestPacket.MoneyDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket.MoneyDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket">
-            <exclude/>
-        </member>
-        <member name="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket.MoneyDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.TargetBlockBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.MoneyDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ActivateGesturesPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ActivateGesturesPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ActivateGesturesPacket.DataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.DeactivateGesturesPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.DeactivateGesturesPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.DeactivateGesturesPacket.DataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.MuteListUpdatePacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.MuteListUpdatePacket.MuteDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.UseCachedMuteListPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.UseCachedMuteListPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GrantUserRightsPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GrantUserRightsPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GrantUserRightsPacket.RightsBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.ObjectManager.RequestObjectPropertiesFamily(OpenMetaverse.Simulator,OpenMetaverse.UUID,System.Boolean)">
+            <summary>
+            Request additional properties for an object
+            </summary>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="objectID">Absolute UUID of the object</param>
+            <param name="reliable">Whether to require server acknowledgement of this request</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChangeUserRightsPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.ObjectManager.SetObjectsGroup(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},OpenMetaverse.UUID)">
+            <summary>
+            Set the ownership of a list of objects to the specified group
+            </summary>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the objects reside</param>
+            <param name="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="T:OpenMetaverse.Packets.ChangeUserRightsPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.ObjectManager.NavigateObjectMedia(OpenMetaverse.UUID,System.Int32,System.String,OpenMetaverse.Simulator)">
+            <summary>
+            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.Packets.ChangeUserRightsPacket.RightsBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.ObjectManager.UpdateObjectMedia(OpenMetaverse.UUID,OpenMetaverse.MediaEntry[],OpenMetaverse.Simulator)">
+            <summary>
+            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="T:OpenMetaverse.Packets.OnlineNotificationPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.ObjectManager.RequestObjectMedia(OpenMetaverse.UUID,OpenMetaverse.Simulator,OpenMetaverse.ObjectManager.ObjectMediaCallback)">
+            <summary>
+            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.Packets.OnlineNotificationPacket.AgentBlockBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.OfflineNotificationPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.ObjectManager.ImprovedTerseObjectUpdateHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <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)
+            </summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.OfflineNotificationPacket.AgentBlockBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.SetStartLocationRequestPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.SetStartLocationRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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.Packets.SetStartLocationRequestPacket.StartLocationDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AssetUploadRequestPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AssetUploadRequestPacket.AssetBlockBlock">
-            <exclude/>
+        <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="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 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="T:OpenMetaverse.Packets.JoinGroupRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.JoinGroupRequestPacket.GroupDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.JoinGroupReplyPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.ObjectManager.UpdateDilation(OpenMetaverse.Simulator,System.UInt32)">
+            <summary>
+            
+            </summary>
+            <param name="s"></param>
+            <param name="dilation"></param>
         </member>
-        <member name="T:OpenMetaverse.Packets.JoinGroupReplyPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.JoinGroupReplyPacket.GroupDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.ObjectManager.GetPrimitive(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.UUID,System.Boolean)">
+            <summary>
+            
+            </summary>
+            <param name="simulator"></param>
+            <param name="localID"></param>
+            <param name="fullID"></param>
+            <param name="createIfMissing"></param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket.GroupDataBlock">
-            <exclude/>
+        <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.Packets.EjectGroupMemberRequestPacket.EjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket">
-            <exclude/>
+        <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.Packets.EjectGroupMemberReplyPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.GroupDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.EjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.LeaveGroupRequestPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.LeaveGroupRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="E:OpenMetaverse.ObjectManager.ObjectDataBlockUpdate">
+            <summary>Raised when the simulator sends us data containing
+            updates to an Objects DataBlock</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LeaveGroupRequestPacket.GroupDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.LeaveGroupReplyPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.LeaveGroupReplyPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.LeaveGroupReplyPacket.GroupDataBlock">
-            <exclude/>
+        <member name="E:OpenMetaverse.ObjectManager.PayPriceReply">
+            <summary>Raised when the simulator sends us data containing
+            purchase price information for a <see cref="T:OpenMetaverse.Primitive"/></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.InviteGroupRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.ObjectManager.ObjectMediaCallback">
+            <summary>
+            Callback for getting object media data via CAP
+            </summary>
+            <param name="success">Indicates if the operation was succesfull</param>
+            <param name="version">Object media version string</param>
+            <param name="faceMedia">Array indexed on prim face of media entry data</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket.GroupDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.InviteGroupRequestPacket.InviteDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupProfileRequestPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.PrimEventArgs.Simulator">
+            <summary>Get the simulator the <see cref="T:OpenMetaverse.Primitive"/> originated from</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.PrimEventArgs.Prim">
+            <summary>Get the <see cref="T:OpenMetaverse.Primitive"/> details</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket.GroupDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupProfileReplyPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupProfileReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.PrimEventArgs.TimeDilation">
+            <summary>Get the simulator Time Dilation</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProfileReplyPacket.GroupDataBlock">
-            <exclude/>
-        </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.AvatarUpdateEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Avatar,System.UInt16,System.Boolean)">
+            <summary>
+            Construct a new instance of the AvatarUpdateEventArgs class
+            </summary>
+            <param name="simulator">The simulator the packet originated from</param>
+            <param name="avatar">The <see cref="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar"/> data</param>
+            <param name="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.Packets.GroupAccountSummaryRequestPacket.MoneyDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.Simulator">
+            <summary>Get the simulator the object originated from</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar">
+            <summary>Get the <see cref="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar"/> data</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.TimeDilation">
+            <summary>Get the simulator time dilation</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket.MoneyDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket.MoneyDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.ObjectPropertiesEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.ObjectPropertiesEventArgs.Properties">
+            <summary>Get the primitive properties</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.MoneyDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.HistoryDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.ObjectPropertiesUpdatedEventArgs.Prim">
+            <summary>Get the primitive details</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.ObjectPropertiesFamilyEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket.MoneyDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.ObjectPropertiesFamilyEventArgs.Properties">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.ObjectPropertiesFamilyEventArgs.Type">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.AgentDataBlock">
-            <exclude/>
+        <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.Packets.GroupAccountTransactionsReplyPacket.MoneyDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.HistoryDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.Prim">
+            <summary>Get the primitive details</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.Update">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.TimeDilation">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.GroupDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.ObjectDataBlockUpdateEventArgs">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.TransactionDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Prim">
+            <summary>Get the primitive details</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.ConstructionData">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.TransactionDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Block">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.ProposalDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Update">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.NameValues">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.GroupDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.KillObjectEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.TransactionDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.KillObjectEventArgs.ObjectLocalID">
+            <summary>The LocalID of the object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.KillObjectsEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.TransactionDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.KillObjectsEventArgs.ObjectLocalIDs">
+            <summary>The LocalID of the object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.HistoryItemDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.AvatarSitChangedEventArgs">
+            <summary>
+            Provides updates sit position data
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.VoteItemBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartGroupProposalPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.Avatar">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartGroupProposalPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.SittingOn">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartGroupProposalPacket.ProposalDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.OldSeat">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProposalBallotPacket">
-            <exclude/>
-        </member>
-        <member name="T:OpenMetaverse.Packets.GroupProposalBallotPacket.AgentDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.PayPriceReplyEventArgs">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProposalBallotPacket.ProposalDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersRequestPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.ObjectID">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.DefaultPrice">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersRequestPacket.GroupDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.ButtonPrices">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.ObjectMediaEventArgs.Success">
+            <summary>
+            Indicates if the operation was successful
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.ObjectMediaEventArgs.Version">
+            <summary>
+            Media version string
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.GroupDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.ObjectMediaEventArgs.FaceMedia">
+            <summary>
+            Array of media entries indexed by face number
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.MemberDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.PhysicsPropertiesEventArgs">
+            <summary>
+            Set when simulator sends us infomation on primitive's physical properties
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ActivateGroupPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.PhysicsPropertiesEventArgs.Simulator">
+            <summary>Simulator where the message originated</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ActivateGroupPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.PhysicsPropertiesEventArgs.PhysicsProperties">
+            <summary>Updated physical properties</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryNode.#ctor">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket.DataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryNode.#ctor(OpenMetaverse.InventoryBase)">
+            <summary>
+            
+            </summary>
+            <param name="data"></param>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket">
-            <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.SetGroupAcceptNoticesPacket.AgentDataBlock">
-            <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.SetGroupAcceptNoticesPacket.DataBlock">
-            <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.SetGroupAcceptNoticesPacket.NewDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.InventoryNode.ToString">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.InventoryNode.Data">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.InventoryNode.Parent">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket.GroupDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.InventoryNode.ParentID">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.InventoryNode.Nodes">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.AgentDataBlock">
-            <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.GroupRoleDataReplyPacket.GroupDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.InventoryException">
+            <summary>
+            Exception class to identify inventory exceptions
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.RoleDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.Inventory">
+            <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>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectUpdated">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket.GroupDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectUpdatedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectRemoved">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket.MemberDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectRemovedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupTitlesRequestPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectAdded">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupTitlesRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupTitlesReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectAddedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Inventory.GetContents(OpenMetaverse.UUID)">
+            <summary>
+            Returns the contents of the specified folder
+            </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>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket.GroupDataBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.GroupTitleUpdatePacket">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.GroupTitleUpdatePacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Inventory.Contains(OpenMetaverse.UUID)">
+            <summary>
+            Used to find out if Inventory contains the InventoryObject
+            specified by <code>uuid</code>.
+            </summary>
+            <param name="uuid">The UUID to check.</param>
+            <returns>true if inventory contains uuid, false otherwise</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleUpdatePacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupRoleUpdatePacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.GroupRoleUpdatePacket.RoleDataBlock">
-            <exclude/>
+        <member name="E:OpenMetaverse.Inventory.InventoryObjectUpdated">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LiveHelpGroupRequestPacket">
-            <exclude/>
+        <member name="E:OpenMetaverse.Inventory.InventoryObjectRemoved">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LiveHelpGroupRequestPacket.RequestDataBlock">
-            <exclude/>
+        <member name="E:OpenMetaverse.Inventory.InventoryObjectAdded">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LiveHelpGroupReplyPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.Inventory.RootFolder">
+            <summary>
+            The root folder of this avatars inventory
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LiveHelpGroupReplyPacket.ReplyDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.Inventory.LibraryFolder">
+            <summary>
+            The default shared library folder
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentWearablesRequestPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.Inventory.RootNode">
+            <summary>
+            The root node of the avatars inventory
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentWearablesRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.Inventory.LibraryRootNode">
+            <summary>
+            The root node of the default shared library
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket.AgentDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.GridLayerType">
+            <summary>
+            Map layer request type
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket.WearableDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridLayerType.Objects">
+            <summary>Objects and terrain are shown</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentIsNowWearingPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridLayerType.Terrain">
+            <summary>Only the terrain is shown, no objects</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentIsNowWearingPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridLayerType.LandForSale">
+            <summary>Overlay showing land for sale and for auction</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentIsNowWearingPacket.WearableDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.GridItemType">
+            <summary>
+            Type of grid item, such as telehub, event, populator location, etc.
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentCachedTexturePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridItemType.Telehub">
+            <summary>Telehub</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentCachedTexturePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridItemType.PgEvent">
+            <summary>PG rated event</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentCachedTexturePacket.WearableDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridItemType.MatureEvent">
+            <summary>Mature rated event</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridItemType.Popular">
+            <summary>Popular location</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridItemType.AgentLocations">
+            <summary>Locations of avatar groups in a region</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket.WearableDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridItemType.LandForSale">
+            <summary>Land for sale</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentDataUpdateRequestPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridItemType.Classified">
+            <summary>Classified ad</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentDataUpdateRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridItemType.AdultEvent">
+            <summary>Adult rated event</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentDataUpdatePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridItemType.AdultLandForSale">
+            <summary>Adult land for sale</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentDataUpdatePacket.AgentDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.GridRegion">
+            <summary>
+            Information about a region on the grid map
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupDataUpdatePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridRegion.X">
+            <summary>Sim X position on World Map</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupDataUpdatePacket.AgentGroupDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridRegion.Y">
+            <summary>Sim Y position on World Map</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridRegion.Name">
+            <summary>Sim Name (NOTE: In lowercase!)</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridRegion.Access">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket.GroupDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridRegion.RegionFlags">
+            <summary>Appears to always be zero (None)</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentDropGroupPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridRegion.WaterHeight">
+            <summary>Sim's defined Water Height</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentDropGroupPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridRegion.Agents">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridRegion.MapImageID">
+            <summary>UUID of the World Map image</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridRegion.RegionHandle">
+            <summary>Unique identifier for this region, a combination of the X 
+            and Y position</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket.ObjectDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.GridRegion.ToString">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.GridRegion.GetHashCode">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.GridRegion.Equals(System.Object)">
+            <summary>
+            
+            </summary>
+            <param name="obj"></param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.HeaderDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.GridLayer">
+            <summary>
+            Visual chunk of the grid map
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.ObjectDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.MapItem">
+            <summary>
+            Base class for Map Items
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DetachAttachmentIntoInvPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.MapItem.GlobalX">
+            <summary>The Global X position of the item</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DetachAttachmentIntoInvPacket.ObjectDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.MapItem.GlobalY">
+            <summary>The Global Y position of the item</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.MapItem.LocalX">
+            <summary>Get the Local X position of the item</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.MapItem.LocalY">
+            <summary>Get the Local Y position of the item</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.HeaderDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.MapItem.RegionHandle">
+            <summary>Get the Handle of the region</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.ObjectDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.MapAgentLocation">
+            <summary>
+            Represents an agent or group of agents location
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserInfoRequestPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.MapTelehub">
+            <summary>
+            Represents a Telehub location
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserInfoRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.MapLandForSale">
+            <summary>
+            Represents a non-adult parcel of land for sale
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.MapAdultLandForSale">
+            <summary>
+            Represents an Adult parcel of land for sale
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.MapPGEvent">
+            <summary>
+            Represents a PG Event
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket.UserDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.MapMatureEvent">
+            <summary>
+            Represents a Mature event
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.MapAdultEvent">
+            <summary>
+            Represents an Adult event
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket.AgentDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.GridManager">
+            <summary>
+            Manages grid-wide tasks such as the world map
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket.UserDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridManager.m_CoarseLocationUpdate">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.InitiateDownloadPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridManager.m_CoarseLocationUpdateLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket.FileDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridManager.m_GridRegion">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapLayerRequestPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.MapLayerRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridManager.m_GridRegionLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapLayerReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridManager.m_GridLayer">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapLayerReplyPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.MapLayerReplyPacket.LayerDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridManager.m_GridLayerLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridManager.m_GridItems">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.MapBlockRequestPacket.PositionDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridManager.m_GridItemsLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapNameRequestPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridManager.m_RegionHandleReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapNameRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.MapNameRequestPacket.NameDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridManager.m_RegionHandleReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridManager.Regions">
+            <summary>A dictionary of all the regions, indexed by region name</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.GridManager.RegionsByHandle">
+            <summary>A dictionary of all the regions, indexed by region handle</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket.DataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.MapItemRequestPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.GridManager.RequestMapLayer(OpenMetaverse.GridLayerType)">
+            <summary>
+            
+            </summary>
+            <param name="layer"></param>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapItemRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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.Packets.MapItemRequestPacket.RequestDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.GridManager.RequestMapBlocks(OpenMetaverse.GridLayerType,System.UInt16,System.UInt16,System.UInt16,System.UInt16,System.Boolean)">
+            <summary>
+            
+            </summary>
+            <param name="layer"></param>
+            <param name="minX"></param>
+            <param name="minY"></param>
+            <param name="maxX"></param>
+            <param name="maxY"></param>
+            <param name="returnNonExistent"></param>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapItemReplyPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.MapItemReplyPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.MapItemReplyPacket.RequestDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.GridManager.RequestMainlandSims(OpenMetaverse.GridLayerType)">
+            <summary>
+            Request data for all mainland (Linden managed) simulators
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapItemReplyPacket.DataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.SendPostcardPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.SendPostcardPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelMediaCommandMessagePacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelMediaCommandMessagePacket.CommandBlockBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket.DataBlockBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.GridManager.RegionHandleReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket.DataBlockExtendedBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.LandStatRequestPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.LandStatRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.LandStatRequestPacket.RequestDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.LandStatReplyPacket">
-            <exclude/>
+        <member name="E:OpenMetaverse.GridManager.RegionHandleReply">
+            <summary>Raised in response to a Region lookup</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LandStatReplyPacket.RequestDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.GridManager.SunPhase">
+            <summary>Unknown</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LandStatReplyPacket.ReportDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.GridManager.SunDirection">
+            <summary>Current direction of the sun</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ErrorPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.GridManager.SunAngVelocity">
+            <summary>Current angular velocity of the sun</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ErrorPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.GridManager.TimeOfDay">
+            <summary>Microseconds since the start of SL 4-hour day</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ErrorPacket.DataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.DirectoryManager">
+            <summary>
+            Access to the data server which allows searching for land, events, people, etc
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.m_EventInfoReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket.ObjectDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.m_EventDetailLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirEvents">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.RezRestoreToWorldPacket.InventoryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirEventsLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.m_Places">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.LinkInventoryItemPacket.InventoryBlockBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.m_PlacesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PacketAckPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirPlaces">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PacketAckPacket.PacketsBlock">
-            <exclude/>
+        <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="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 name="F:OpenMetaverse.DirectoryManager.m_DirPlacesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AttachedSoundPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirClassifieds">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AttachedSoundPacket.DataBlockBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AttachedSoundGainChangePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirClassifiedsLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AttachedSoundGainChangePacket.DataBlockBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirGroups">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PreloadSoundPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.PreloadSoundPacket.DataBlockBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirGroupsLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerEffectPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirPeople">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerEffectPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ViewerEffectPacket.EffectBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirPeopleLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartPingCheckPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirLandReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartPingCheckPacket.PingIDBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.CompletePingCheckPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirLandLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CompletePingCheckPacket.PingIDBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AgentUpdatePacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AgentUpdatePacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AgentAnimationPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AgentAnimationPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AgentAnimationPacket.AnimationListBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AgentAnimationPacket.PhysicalAvatarEventListBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AgentRequestSitPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AgentRequestSitPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AgentRequestSitPacket.TargetObjectBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AgentSitPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AgentSitPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.DirectoryManager.StartPlacesSearch">
+            <summary>
+            Search Places for parcels of land you personally own
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestImagePacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.RequestImagePacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.RequestImagePacket.RequestImageBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ImageDataPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ImageDataPacket.ImageIDBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ImageDataPacket.ImageDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ImagePacketPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ImagePacketPacket.ImageIDBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ImagePacketPacket.ImageDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.LayerDataPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.LayerDataPacket.LayerIDBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.LayerDataPacket.LayerDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectUpdatePacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectUpdatePacket.RegionDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectUpdatePacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket">
-            <exclude/>
+        <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.Packets.ObjectUpdateCompressedPacket.RegionDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket.ObjectDataBlock">
-            <exclude/>
+        <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.Packets.ObjectUpdateCachedPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket.RegionDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket.ObjectDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket.RegionDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket.ObjectDataBlock">
-            <exclude/>
+        <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.Packets.KillObjectPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.DirectoryManager.ClassifiedCategories">
+            <summary>Classified Ad categories</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.KillObjectPacket.ObjectDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Any">
+            <summary>Classified is listed in the Any category</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferPacketPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Shopping">
+            <summary>Classified is shopping related</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferPacketPacket.TransferDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.LandRental">
+            <summary>Classified is </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SendXferPacketPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.PropertyRental">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SendXferPacketPacket.XferIDBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.SpecialAttraction">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SendXferPacketPacket.DataPacketBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.NewProducts">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ConfirmXferPacketPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Employment">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ConfirmXferPacketPacket.XferIDBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Wanted">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Service">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.SenderBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Personal">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.AnimationListBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.DirectoryManager.EventCategories">
+            <summary>Event Categories</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.AnimationSourceListBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.All">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.PhysicalAvatarEventListBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Discussion">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarSitResponsePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Sports">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarSitResponsePacket.SitObjectBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.LiveMusic">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarSitResponsePacket.SitTransformBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Commercial">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CameraConstraintPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Nightlife">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CameraConstraintPacket.CameraCollidePlaneBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Games">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Pageants">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesPacket.ParcelDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Education">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesPacket.AgeVerificationBlockBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Arts">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Charity">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Miscellaneous">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.GroupDataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.DirectoryManager.DirFindFlags">
+            <summary>
+            Query Flags used in many of the DirectoryManager methods to specify which query to execute and how to return the results.
+            
+            Flags can be combined using the | (pipe) character, not all flags are available in all queries
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AnimationDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.People">
+            <summary>Query the People database</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.GranterBlockBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.Online">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.NVPairDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.Events">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.VisualParamBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.Groups">
+            <summary>Query the Groups database</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentAccessBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.DateEvents">
+            <summary>Query the Events database</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentInfoBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.AgentOwned">
+            <summary>Query the land holdings database for land owned by the currently connected agent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentAlivePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.ForSale">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentAlivePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.GroupOwned">
+            <summary>Query the land holdings database for land which is owned by a Group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentPositionUpdatePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.DwellSort">
+            <summary>Specifies the query should pre sort the results based upon traffic
+            when searching the Places database</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentPositionUpdatePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PgSimsOnly">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SoundTriggerPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PicturesOnly">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SoundTriggerPacket.SoundDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PgEventsOnly">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Voice.VoiceSession">
-            <summary>
-            Represents a single Voice Session to the Vivox service.
-            </summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.MatureSimsOnly">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceSession.Close">
-            <summary>
-            Close this session.
-            </summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.SortAsc">
+            <summary>Specifies the query should pre sort the results in an ascending order when searching the land sales database. 
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceSession.FindParticipant(System.String)">
-            <summary>
-            Look up an existing Participants in this session
-            </summary>
-            <param name="puri"></param>
-            <returns></returns>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PricesSort">
+            <summary>Specifies the query should pre sort the results using the SalePrice field when searching the land sales database. 
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="T:ThreadUtil">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PerMeterSort">
+            <summary>Specifies the query should pre sort the results by calculating the average price/sq.m (SalePrice / Area) when searching the land sales database. 
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="F: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.DirectoryManager.DirFindFlags.AreaSort">
+            <summary>Specifies the query should pre sort the results using the ParcelSize field when searching the land sales database. 
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="F:ThreadUtil.callback">
-            <summary>
-            Callback used to call EndInvoke on the asynchronously
-            invoked DelegateWrapper
-            </summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.NameSort">
+            <summary>Specifies the query should pre sort the results using the Name field when searching the land sales database. 
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="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.DirectoryManager.DirFindFlags.LimitByPrice">
+            <summary>When set, only parcels less than the specified Price will be included when searching the land sales database.
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="M:ThreadUtil.InvokeWrappedDelegate(System.Delegate,System.Object[])">
-            <summary>
-            Invokes the wrapped delegate synchronously
-            </summary>
-            <param name="d"></param>
-            <param name="args"></param>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.LimitByArea">
+            <summary>When set, only parcels greater than the specified Size will be included when searching the land sales database.
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="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.DirectoryManager.DirFindFlags.FilterMature">
+            <summary></summary>
         </member>
-        <member name="T:ThreadUtil.DelegateWrapper">
-            <summary>
-            Delegate to wrap another delegate and its arguments
-            </summary>
-            <param name="d"></param>
-            <param name="args"></param>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PGOnly">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TerrainManager.m_LandPatchReceivedEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.IncludePG">
+            <summary>Include PG land in results. This flag is used when searching both the Groups, Events and Land sales databases</summary>
         </member>
-        <member name="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.DirectoryManager.DirFindFlags.IncludeMature">
+            <summary>Include Mature land in results. This flag is used when searching both the Groups, Events and Land sales databases</summary>
         </member>
-        <member name="F:OpenMetaverse.TerrainManager.m_LandPatchReceivedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.IncludeAdult">
+            <summary>Include Adult land in results. This flag is used when searching both the Groups, Events and Land sales databases</summary>
         </member>
-        <member name="M:OpenMetaverse.TerrainManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.AdultOnly">
+            <summary></summary>
+        </member>
+        <member name="T:OpenMetaverse.DirectoryManager.SearchTypeFlags">
             <summary>
-            Default constructor
+            Land types to search dataserver for
             </summary>
-            <param name="client"></param>
-        </member>
-        <member name="E:OpenMetaverse.TerrainManager.LandPatchReceived">
-            <summary>Raised when the simulator responds sends </summary>
-        </member>
-        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.Simulator">
-            <summary>Simulator from that sent tha data</summary>
         </member>
-        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.X">
-            <summary>Sim coordinate of the patch</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Any">
+            <summary>Search Auction, Mainland and Estate</summary>
         </member>
-        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.Y">
-            <summary>Sim coordinate of the patch</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Auction">
+            <summary>Land which is currently up for auction</summary>
         </member>
-        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.PatchSize">
-            <summary>Size of tha patch</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Mainland">
+            <summary>Parcels which are on the mainland (Linden owned) continents</summary>
         </member>
-        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.HeightMap">
-            <summary>Heightmap for the patch</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Estate">
+            <summary>Parcels which are on privately owned simulators</summary>
         </member>
-        <member name="T:OpenMetaverse.PermissionMask">
+        <member name="T:OpenMetaverse.DirectoryManager.EventFlags">
             <summary>
-            
+            The content rating of the event
             </summary>
         </member>
-        <member name="T:OpenMetaverse.PermissionWho">
+        <member name="F:OpenMetaverse.DirectoryManager.EventFlags.PG">
+            <summary>Event is PG</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.EventFlags.Mature">
+            <summary>Event is Mature</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.EventFlags.Adult">
+            <summary>Event is Adult</summary>
+        </member>
+        <member name="T:OpenMetaverse.DirectoryManager.ClassifiedFlags">
             <summary>
-            
+            Classified Ad Options
             </summary>
+            <remarks>There appear to be two formats the flags are packed in.
+            This set of flags is for the newer style</remarks>
         </member>
-        <member name="F:OpenMetaverse.PermissionWho.Base">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PermissionWho.Owner">
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.None">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.PermissionWho.Group">
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.Mature">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.PermissionWho.Everyone">
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.Enabled">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.PermissionWho.NextOwner">
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.UpdateTime">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.PermissionWho.All">
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.AutoRenew">
             <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Permissions">
+        <member name="T:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags">
             <summary>
-            
+            Classified ad query options
             </summary>
         </member>
-        <member name="F:OpenMetaverse.UDPPacketBuffer.BUFFER_SIZE">
-            <summary>Size of the byte array used to store raw packet data</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.All">
+            <summary>Include all ads in results</summary>
         </member>
-        <member name="F:OpenMetaverse.UDPPacketBuffer.Data">
-            <summary>Raw packet data buffer</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.PG">
+            <summary>Include PG ads in results</summary>
         </member>
-        <member name="F:OpenMetaverse.UDPPacketBuffer.DataLength">
-            <summary>Length of the data to transmit</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.Mature">
+            <summary>Include Mature ads in results</summary>
         </member>
-        <member name="F:OpenMetaverse.UDPPacketBuffer.RemoteEndPoint">
-            <summary>EndPoint of the remote host</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.Adult">
+            <summary>Include Adult ads in results</summary>
         </member>
-        <member name="M:OpenMetaverse.UDPPacketBuffer.#ctor">
+        <member name="T:OpenMetaverse.DirectoryManager.PlacesFlags">
             <summary>
-            Create an allocated UDP packet buffer for receiving a packet
+            The For Sale flag in PlacesReplyData
             </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="F:OpenMetaverse.DirectoryManager.PlacesFlags.NotForSale">
+            <summary>Parcel is not listed for sale</summary>
         </member>
-        <member name="M:OpenMetaverse.UDPPacketBuffer.#ctor(System.Net.IPEndPoint,System.Int32)">
-            <summary>
-            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 name="F:OpenMetaverse.DirectoryManager.PlacesFlags.ForSale">
+            <summary>Parcel is For Sale</summary>
         </member>
-        <member name="T:OpenMetaverse.PacketBufferPool">
+        <member name="T:OpenMetaverse.DirectoryManager.Classified">
             <summary>
-            Object pool for packet buffers. This is used to allocate memory for all
-            incoming and outgoing packets, and zerocoding buffers for those packets
+            A classified ad on the grid
             </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.DirectoryManager.Classified.ID">
+            <summary>UUID for this ad, useful for looking up detailed
+            information about it</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.DirectoryManager.Classified.Name">
+            <summary>The title of this classified ad</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.DirectoryManager.Classified.Flags">
+            <summary>Flags that show certain options applied to the classified</summary>
         </member>
-        <member name="M:OpenMetaverse.Pool.#cctor">
-            <summary>
-            Default constructor
-            </summary>
+        <member name="F:OpenMetaverse.DirectoryManager.Classified.CreationDate">
+            <summary>Creation date of the ad</summary>
         </member>
-        <member name="M:OpenMetaverse.Pool.CheckOut">
-            <summary>
-            Check a packet buffer out of the pool
-            </summary>
-            <returns>A packet buffer object</returns>
+        <member name="F:OpenMetaverse.DirectoryManager.Classified.ExpirationDate">
+            <summary>Expiration date of the ad</summary>
         </member>
-        <member name="T:OpenMetaverse.Logger">
-            <summary>
-            Singleton logging class for the entire library
-            </summary>
+        <member name="F:OpenMetaverse.DirectoryManager.Classified.Price">
+            <summary>Price that was paid for this ad</summary>
         </member>
-        <member name="F:OpenMetaverse.Logger.LogInstance">
-            <summary>log4net logging engine</summary>
+        <member name="M:OpenMetaverse.DirectoryManager.Classified.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
         </member>
-        <member name="M:OpenMetaverse.Logger.#cctor">
+        <member name="T:OpenMetaverse.DirectoryManager.DirectoryParcel">
             <summary>
-            Default constructor
+            A parcel retrieved from the dataserver such as results from the 
+            "For-Sale" listings or "Places" Search
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel)">
-            <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 name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.ID">
+            <summary>The unique dataserver parcel ID</summary>
+            <remarks>This id is used to obtain additional information from the entry
+            by using the <see cref="!:ParcelManager.InfoRequest"/> method</remarks>
         </member>
-        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel,OpenMetaverse.GridClient)">
+        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.Name">
+            <summary>A string containing the name of the parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.ActualArea">
+            <summary>The size of the parcel</summary>
+            <remarks>This field is not returned for Places searches</remarks>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.SalePrice">
+            <summary>The price of the parcel</summary>
+            <remarks>This field is not returned for Places searches</remarks>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.Auction">
+            <summary>If True, this parcel is flagged to be auctioned</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.ForSale">
+            <summary>If true, this parcel is currently set for sale</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.Dwell">
+            <summary>Parcel traffic</summary>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.DirectoryParcel.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
+        </member>
+        <member name="T:OpenMetaverse.DirectoryManager.AgentSearchData">
             <summary>
-            Send a log message to the logging engine
+            An Avatar returned from the dataserver
             </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="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel,System.Exception)">
+        <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.Online">
+            <summary>Online status of agent</summary>
+            <remarks>This field appears to be obsolete and always returns false</remarks>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.FirstName">
+            <summary>The agents first name</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.LastName">
+            <summary>The agents last name</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.AgentID">
+            <summary>The agents <see cref="T:OpenMetaverse.UUID"/></summary>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.AgentSearchData.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
+        </member>
+        <member name="T:OpenMetaverse.DirectoryManager.GroupSearchData">
             <summary>
-            Send a log message to the logging engine
+             Response to a "Groups" Search
             </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.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.DirectoryManager.GroupSearchData.GroupID">
+            <summary>The Group ID</summary>
         </member>
-        <member name="M:OpenMetaverse.Logger.DebugLog(System.Object)">
-            <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 name="F:OpenMetaverse.DirectoryManager.GroupSearchData.GroupName">
+            <summary>The name of the group</summary>
         </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.DirectoryManager.GroupSearchData.Members">
+            <summary>The current number of members</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="M:OpenMetaverse.DirectoryManager.GroupSearchData.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
         </member>
-        <member name="T:OpenMetaverse.Logger.LogCallback">
+        <member name="T:OpenMetaverse.DirectoryManager.PlacesSearchData">
             <summary>
-            Callback used for client apps to receive log messages from
-            the library
+            Parcel information returned from a <see cref="M:OpenMetaverse.DirectoryManager.StartPlacesSearch"/> request
+            <para>
+            Represents one of the following:
+            A parcel of land on the grid that has its Show In Search flag set
+            A parcel of land owned by the agent making the request
+            A parcel of land owned by a group the agent making the request is a member of
+            </para>
+            <para>
+            In a request for Group Land, the First record will contain an empty record
+            </para>
+            Note: This is not the same as searching the land for sale data source
             </summary>
-            <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="F:OpenMetaverse.InventorySortOrder.ByName">
-            <summary>Sort by name</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.OwnerID">
+            <summary>The ID of the Agent of Group that owns the parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.InventorySortOrder.ByDate">
-            <summary>Sort by date</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Name">
+            <summary>The name</summary>
         </member>
-        <member name="F:OpenMetaverse.InventorySortOrder.FoldersByName">
-            <summary>Sort folders by name, regardless of whether items are
-            sorted by name or date</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Desc">
+            <summary>The description</summary>
         </member>
-        <member name="F:OpenMetaverse.InventorySortOrder.SystemFoldersToTop">
-            <summary>Place system folders at the top</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.ActualArea">
+            <summary>The Size of the parcel</summary>
         </member>
-        <member name="T:OpenMetaverse.DeRezDestination">
-            <summary>
-            Possible destinations for DeRezObject request
-            </summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.BillableArea">
+            <summary>The billable Size of the parcel, for mainland
+            parcels this will match the ActualArea field. For Group owned land this will be 10 percent smaller
+            than the ActualArea. For Estate land this will always be 0</summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.AgentInventorySave">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Flags">
+            <summary>Indicates the ForSale status of the parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.AgentInventoryCopy">
-            <summary>Copy from in-world to agent inventory</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.GlobalX">
+            <summary>The Gridwide X position</summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.TaskInventory">
-            <summary>Derez to TaskInventory</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.GlobalY">
+            <summary>The Gridwide Y position</summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.Attachment">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.GlobalZ">
+            <summary>The Z position of the parcel, or 0 if no landing point set</summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.AgentInventoryTake">
-            <summary>Take Object</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.SimName">
+            <summary>The name of the Region the parcel is located in</summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.ForceToGodInventory">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.SnapshotID">
+            <summary>The Asset ID of the parcels Snapshot texture</summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.TrashFolder">
-            <summary>Delete Object</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Dwell">
+            <summary>The calculated visitor traffic</summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.AttachmentToInventory">
-            <summary>Put an avatar attachment into agent inventory</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.SKU">
+            <summary>The billing product SKU</summary>
+            <remarks>Known values are:
+            <list type="table">
+            <item><term>023</term><description>Mainland / Full Region</description></item>
+            <item><term>024</term><description>Estate / Full Region</description></item>
+            <item><term>027</term><description>Estate / Openspace</description></item>
+            <item><term>029</term><description>Estate / Homestead</description></item>
+            <item><term>129</term><description>Mainland / Homestead (Linden Owned)</description></item>
+            </list>
+            </remarks>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.AttachmentExists">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Price">
+            <summary>No longer used, will always be 0</summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.ReturnToOwner">
-            <summary>Return an object back to the owner's inventory</summary>
+        <member name="M:OpenMetaverse.DirectoryManager.PlacesSearchData.ToSLurl">
+            <summary>Get a SL URL for the parcel</summary>
+            <returns>A string, containing a standard SLURL</returns>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.ReturnToLastOwner">
-            <summary>Return a deeded object back to the last owner's inventory</summary>
+        <member name="M:OpenMetaverse.DirectoryManager.PlacesSearchData.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
         </member>
-        <member name="T:OpenMetaverse.InventoryItemFlags">
+        <member name="T:OpenMetaverse.DirectoryManager.EventsSearchData">
             <summary>
-            Upper half of the Flags field for inventory items
+            An "Event" Listing summary
             </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 name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Owner">
+            <summary>The ID of the event creator</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.DirectoryManager.EventsSearchData.Name">
+            <summary>The name of the event</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.DirectoryManager.EventsSearchData.ID">
+            <summary>The events ID</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.DirectoryManager.EventsSearchData.Date">
+            <summary>A string containing the short date/time the event will begin</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.DirectoryManager.EventsSearchData.Time">
+            <summary>The event start time in Unixtime (seconds since epoch)</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.DirectoryManager.EventsSearchData.Flags">
+            <summary>The events maturity rating</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="M:OpenMetaverse.DirectoryManager.EventsSearchData.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
         </member>
-        <member name="T:OpenMetaverse.InventoryBase">
+        <member name="T:OpenMetaverse.DirectoryManager.EventInfo">
             <summary>
-            Base Class for Inventory Items
+            The details of an "Event"
             </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryBase.UUID">
-            <summary><seealso cref="T:OpenMetaverse.UUID"/> of item/folder</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.ID">
+            <summary>The events ID</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryBase.ParentUUID">
-            <summary><seealso cref="T:OpenMetaverse.UUID"/> of parent folder</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Creator">
+            <summary>The ID of the event creator</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryBase.Name">
-            <summary>Name of item/folder</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Name">
+            <summary>The name of the event</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryBase.OwnerID">
-            <summary>Item/Folder Owners <seealso cref="T:OpenMetaverse.UUID"/></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Category">
+            <summary>The category</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryBase.#ctor(OpenMetaverse.UUID)">
-            <summary>
-            Constructor, takes an itemID as a parameter
-            </summary>
-            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID"/> of the item</param>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Desc">
+            <summary>The events description</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryBase.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            
-            </summary>
-            <returns></returns>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Date">
+            <summary>The short date/time the event will begin</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryBase.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            
-            </summary>
-            <returns></returns>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.DateUTC">
+            <summary>The event start time in Unixtime (seconds since epoch) UTC adjusted</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Duration">
+            <summary>The length of the event in minutes</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Cover">
+            <summary>0 if no cover charge applies</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Amount">
+            <summary>The cover charge amount in L$ if applicable</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.SimName">
+            <summary>The name of the region where the event is being held</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.GlobalPos">
+            <summary>The gridwide location of the event</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Flags">
+            <summary>The maturity rating</summary>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.EventInfo.ToSLurl">
+            <summary>Get a SL URL for the parcel where the event is hosted</summary>
+            <returns>A string, containing a standard SLURL</returns>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.EventInfo.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
         </member>
-        <member name="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="T:OpenMetaverse.EventInfoReplyEventArgs">
+            <summary>Contains the Event data returned from the data server from an EventInfoRequest</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="M:OpenMetaverse.EventInfoReplyEventArgs.#ctor(OpenMetaverse.DirectoryManager.EventInfo)">
+            <summary>Construct a new instance of the EventInfoReplyEventArgs class</summary>
+            <param name="matchedEvent">A single EventInfo object containing the details of an event</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryBase.Equals(OpenMetaverse.InventoryBase)">
+        <member name="P:OpenMetaverse.EventInfoReplyEventArgs.MatchedEvent">
             <summary>
-            Determine whether the specified <seealso cref="T:OpenMetaverse.InventoryBase"/> object is equal to the current object
+            A single EventInfo object containing the details of an event
             </summary>
-            <param name="o">InventoryBase object to compare against</param>
-            <returns>true if objects are the same</returns>
         </member>
-        <member name="T:OpenMetaverse.InventoryItem">
-            <summary>
-            An Item in Inventory
-            </summary>
+        <member name="T:OpenMetaverse.DirEventsReplyEventArgs">
+            <summary>Contains the "Event" detail data returned from the data server</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.AssetUUID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of this item</summary>
+        <member name="M:OpenMetaverse.DirEventsReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.EventsSearchData})">
+            <summary>Construct a new instance of the DirEventsReplyEventArgs class</summary>
+            <param name="queryID">The ID of the query returned by the data server. 
+            This will correlate to the ID returned by the <see cref="!:StartEventsSearch"/> method</param>
+            <param name="matchedEvents">A list containing the "Events" returned by the search query</param>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.Permissions">
-            <summary>The combined <seealso cref="T:OpenMetaverse.Permissions"/> of this item</summary>
+        <member name="P:OpenMetaverse.DirEventsReplyEventArgs.QueryID">
+            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,System.UInt32)"/></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.AssetType">
-            <summary>The type of item from <seealso cref="T:OpenMetaverse.AssetType"/></summary>
+        <member name="P:OpenMetaverse.DirEventsReplyEventArgs.MatchedEvents">
+            <summary>A list of "Events" returned by the data server</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.InventoryType">
-            <summary>The type of item from the <seealso cref="T:OpenMetaverse.InventoryType"/> enum</summary>
+        <member name="T:OpenMetaverse.PlacesReplyEventArgs">
+            <summary>Contains the "Event" list data returned from the data server</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.CreatorID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the creator of this item</summary>
+        <member name="M:OpenMetaverse.PlacesReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.PlacesSearchData})">
+            <summary>Construct a new instance of PlacesReplyEventArgs class</summary>
+            <param name="queryID">The ID of the query returned by the data server. 
+            This will correlate to the ID returned by the <see cref="!:StartPlacesSearch"/> method</param>
+            <param name="matchedPlaces">A list containing the "Places" returned by the data server query</param>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.Description">
-            <summary>A Description of this item</summary>
+        <member name="P:OpenMetaverse.PlacesReplyEventArgs.QueryID">
+            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartPlacesSearch"/></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="P:OpenMetaverse.PlacesReplyEventArgs.MatchedPlaces">
+            <summary>A list of "Places" returned by the data server</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.GroupOwned">
-            <summary>If true, item is owned by a group</summary>
+        <member name="T:OpenMetaverse.DirPlacesReplyEventArgs">
+            <summary>Contains the places data returned from the data server</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.SalePrice">
-            <summary>The price this item can be purchased for</summary>
+        <member name="M:OpenMetaverse.DirPlacesReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.DirectoryParcel})">
+            <summary>Construct a new instance of the DirPlacesReplyEventArgs class</summary>
+            <param name="queryID">The ID of the query returned by the data server. 
+            This will correlate to the ID returned by the <see cref="!:StartDirPlacesSearch"/> method</param>
+            <param name="matchedParcels">A list containing land data returned by the data server</param>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.SaleType">
-            <summary>The type of sale from the <seealso cref="T:OpenMetaverse.SaleType"/> enum</summary>
+        <member name="P:OpenMetaverse.DirPlacesReplyEventArgs.QueryID">
+            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,System.Int32)"/></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.Flags">
-            <summary>Combined flags from <seealso cref="T:OpenMetaverse.InventoryItemFlags"/></summary>
+        <member name="P:OpenMetaverse.DirPlacesReplyEventArgs.MatchedParcels">
+            <summary>A list containing Places data returned by the data server</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="T:OpenMetaverse.DirClassifiedsReplyEventArgs">
+            <summary>Contains the classified data returned from the data server</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.TransactionID">
-            <summary>Used to update the AssetID in requests sent to the server</summary>
+        <member name="M:OpenMetaverse.DirClassifiedsReplyEventArgs.#ctor(System.Collections.Generic.List{OpenMetaverse.DirectoryManager.Classified})">
+            <summary>Construct a new instance of the DirClassifiedsReplyEventArgs class</summary>
+            <param name="classifieds">A list of classified ad data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.LastOwnerID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the previous owner of the item</summary>
+        <member name="P:OpenMetaverse.DirClassifiedsReplyEventArgs.Classifieds">
+            <summary>A list containing Classified Ads returned by the data server</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="T:OpenMetaverse.DirGroupsReplyEventArgs">
+            <summary>Contains the group data returned from the data server</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="M:OpenMetaverse.DirGroupsReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.GroupSearchData})">
+            <summary>Construct a new instance of the DirGroupsReplyEventArgs class</summary>
+            <param name="queryID">The ID of the query returned by the data server. 
+            This will correlate to the ID returned by the <see cref="!:StartGroupSearch"/> method</param>
+            <param name="matchedGroups">A list of groups data returned by the data server</param>
         </member>
-        <member name="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 name="P:OpenMetaverse.DirGroupsReplyEventArgs.QueryID">
+            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32)"/></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            
-            </summary>
-            <returns></returns>
+        <member name="P:OpenMetaverse.DirGroupsReplyEventArgs.MatchedGroups">
+            <summary>A list containing Groups data returned by the data server</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            
-            </summary>
-            <returns></returns>
+        <member name="T:OpenMetaverse.DirPeopleReplyEventArgs">
+            <summary>Contains the people data returned from the data server</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="M:OpenMetaverse.DirPeopleReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.AgentSearchData})">
+            <summary>Construct a new instance of the DirPeopleReplyEventArgs class</summary>
+            <param name="queryID">The ID of the query returned by the data server. 
+            This will correlate to the ID returned by the <see cref="!:StartPeopleSearch"/> method</param>
+            <param name="matchedPeople">A list of people data returned by the data server</param>
         </member>
-        <member name="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.DirPeopleReplyEventArgs.QueryID">
+            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartPeopleSearch(System.String,System.Int32)"/></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.DirPeopleReplyEventArgs.MatchedPeople">
+            <summary>A list containing People data returned by the data server</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="T:OpenMetaverse.DirLandReplyEventArgs">
+            <summary>Contains the land sales data returned from the data server</summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryTexture">
-            <summary>
-            InventoryTexture Class representing a graphical image
-            </summary>
-            <seealso cref="!:ManagedImage"/>
+        <member name="M:OpenMetaverse.DirLandReplyEventArgs.#ctor(System.Collections.Generic.List{OpenMetaverse.DirectoryManager.DirectoryParcel})">
+            <summary>Construct a new instance of the DirLandReplyEventArgs class</summary>
+            <param name="dirParcels">A list of parcels for sale returned by the data server</param>
         </member>
-        <member name="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="P:OpenMetaverse.DirLandReplyEventArgs.DirParcels">
+            <summary>A list containing land forsale data returned by the data server</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryTexture.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="T:OpenMetaverse.Messages.Linden.TeleportFinishMessage">
             <summary>
-            Construct an InventoryTexture object from a serialization stream
+            Sent to the client to indicate a teleport request has completed
             </summary>
         </member>
-        <member name="T:OpenMetaverse.InventorySound">
+        <member name="T:OpenMetaverse.Interfaces.IMessage">
             <summary>
-            InventorySound Class representing a playable sound
+            Interface requirements for Messaging system
             </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.Messages.Linden.TeleportFinishMessage.AgentID">
+            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the agent</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.Messages.Linden.TeleportFinishMessage.LocationID">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryCallingCard">
-            <summary>
-            InventoryCallingCard Class, contains information on another avatar
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.RegionHandle">
+            <summary>The simulators handle the agent teleported to</summary>
         </member>
-        <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 name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.SeedCapability">
+            <summary>A Uri which contains a list of Capabilities the simulator supports</summary>
         </member>
-        <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 name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.SimAccess">
+            <summary>Indicates the level of access required
+            to access the simulator, or the content rating, or the simulators 
+            map status</summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryLandmark">
-            <summary>
-            InventoryLandmark Class, contains details on a specific location
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.IP">
+            <summary>The IP Address of the simulator</summary>
         </member>
-        <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 name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Port">
+            <summary>The UDP Port the simulator will listen for UDP traffic on</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryLandmark.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Flags">
+            <summary>Status flags indicating the state of the Agent upon arrival, Flying, etc.</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Serialize">
             <summary>
-            Construct an InventoryLandmark object from a serialization stream
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="P:OpenMetaverse.InventoryLandmark.LandmarkVisited">
+        <member name="M:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Landmarks use the InventoryItemFlags struct and will have a flag of 1 set if they have been visited
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.InventoryObject">
+        <member name="T:OpenMetaverse.Messages.Linden.EstablishAgentCommunicationMessage">
             <summary>
-            InventoryObject Class contains details on a primitive or coalesced set of primitives
+            Sent to the viewer when a neighboring simulator is requesting the agent make a connection to it.
             </summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryObject.#ctor(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Messages.Linden.EstablishAgentCommunicationMessage.Serialize">
             <summary>
-            Construct an InventoryObject object
+            Serialize the object
             </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
-            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryObject.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Messages.Linden.EstablishAgentCommunicationMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Construct an InventoryObject object from a serialization stream
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="P:OpenMetaverse.InventoryObject.ItemFlags">
+        <member name="M:OpenMetaverse.Messages.Linden.CrossedRegionMessage.Serialize">
             <summary>
-            Gets or sets the upper byte of the Flags value
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="P:OpenMetaverse.InventoryObject.AttachPoint">
+        <member name="M:OpenMetaverse.Messages.Linden.CrossedRegionMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Gets or sets the object attachment point, the lower byte of the Flags value
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.InventoryNotecard">
+        <member name="M:OpenMetaverse.Messages.Linden.EnableSimulatorMessage.Serialize">
             <summary>
-            InventoryNotecard Class, contains details on an encoded text document
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryNotecard.#ctor(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Messages.Linden.EnableSimulatorMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Construct an InventoryNotecard object
+            Deserialize the message
             </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
-            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryNotecard.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="T:OpenMetaverse.Messages.Linden.TeleportFailedMessage">
             <summary>
-            Construct an InventoryNotecard object from a serialization stream
+            A message sent to the client which indicates a teleport request has failed
+            and contains some information on why it failed
             </summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryCategory">
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.ExtraParams">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.MessageKey">
+            <summary>A string key of the reason the teleport failed e.g. CouldntTPCloser
+            Which could be used to look up a value in a dictionary or enum</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.AgentID">
+            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the Agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.Reason">
+            <summary>A string human readable message containing the reason </summary>
+            <remarks>An example: Could not teleport closer to destination</remarks>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.TeleportFailedMessage.Serialize">
             <summary>
-            InventoryCategory Class
+            Serialize the object
             </summary>
-            <remarks>TODO: Is this even used for anything?</remarks>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryCategory.#ctor(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Messages.Linden.TeleportFailedMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Construct an InventoryCategory object
+            Deserialize the message
             </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
-            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryCategory.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Messages.Linden.LandStatReplyMessage.Serialize">
             <summary>
-            Construct an InventoryCategory object from a serialization stream
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.InventoryLSL">
+        <member name="M:OpenMetaverse.Messages.Linden.LandStatReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            InventoryLSL Class, represents a Linden Scripting Language object
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryLSL.#ctor(OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage">
             <summary>
-            Construct an InventoryLSL object
+            Contains a list of prim owner information for a specific parcel in a simulator
             </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
-            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
+            <remarks>
+            A Simulator will always return at least 1 entry
+            If agent does not have proper permission the OwnerID will be UUID.Zero
+            If agent does not have proper permission OR there are no primitives on parcel
+            the DataBlocksExtended map will not be sent from the simulator
+            </remarks>
         </member>
-        <member name="M:OpenMetaverse.InventoryLSL.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <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>
-            Construct an InventoryLSL object from a serialization stream
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.InventorySnapshot">
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            InventorySnapshot Class, an image taken with the viewer
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventorySnapshot.#ctor(OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner">
             <summary>
-            Construct an InventorySnapshot object
+            Prim ownership information for a specified owner on a single parcel
             </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="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.OwnerID">
+            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the prim owner, 
+            UUID.Zero if agent has no permission to view prim owner information</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.Count">
+            <summary>The total number of prims</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.IsGroupOwned">
+            <summary>True if the OwnerID is a <see cref="T:OpenMetaverse.Group"/></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.OnlineStatus">
+            <summary>True if the owner is online 
+            <remarks>This is no longer used by the LL Simulators</remarks></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.TimeStamp">
+            <summary>The date the most recent prim was rezzed</summary>
+        </member>
+        <member name="T:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage">
             <summary>
-            Construct an InventorySnapshot object from a serialization stream
+            The details of a single parcel in a region, also contains some regionwide globals
             </summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryAttachment">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.LocalID">
+            <summary>Simulator-local ID of this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AABBMax">
+            <summary>Maximum corner of the axis-aligned bounding box for this
+            parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AABBMin">
+            <summary>Minimum corner of the axis-aligned bounding box for this
+            parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Area">
+            <summary>Total parcel land area</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AuctionID">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AuthBuyerID">
+            <summary>Key of authorized buyer</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Bitmap">
+            <summary>Bitmap describing land layout in 4x4m squares across the 
+            entire region</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Category">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ClaimDate">
+            <summary>Date land was claimed</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ClaimPrice">
+            <summary>Appears to always be zero</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Desc">
+            <summary>Parcel Description</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ParcelFlags">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.GroupID">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.GroupPrims">
+            <summary>Total number of primitives owned by the parcel group on 
+            this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.IsGroupOwned">
+            <summary>Whether the land is deeded to a group or not</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.LandingType">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MaxPrims">
+            <summary>Maximum number of primitives this parcel supports</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaID">
+            <summary>The Asset UUID of the Texture which when applied to a 
+            primitive will display the media</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaURL">
+            <summary>A URL which points to any Quicktime supported media type</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaAutoScale">
+            <summary>A byte, if 0x1 viewer should auto scale media to fit object</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MusicURL">
+            <summary>URL For Music Stream</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Name">
+            <summary>Parcel Name</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherCleanTime">
+            <summary>Autoreturn value in minutes for others' objects</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherCount">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherPrims">
+            <summary>Total number of other primitives on this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OwnerID">
+            <summary>UUID of the owner of this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OwnerPrims">
+            <summary>Total number of primitives owned by the parcel owner on 
+            this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ParcelPrimBonus">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PassHours">
+            <summary>How long is pass valid for</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PassPrice">
+            <summary>Price for a temporary pass</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PublicCount">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.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>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyIdentified">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyTransacted">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyAgeUnverified">
+            <summary>True if the region denies access to age unverified users</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionPushOverride">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RentPrice">
+            <summary>This field is no longer used</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RequestResult">
+            The result of a request for parcel properties
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SalePrice">
+            <summary>Sale price of the parcel, only useful if ForSale is set</summary>
+            <remarks>The SalePrice will remain the same after an ownership
+            transfer (sale), so it can be used to see the purchase price after
+            a sale if the new owner has not changed it</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SelectedPrims">
             <summary>
-            InventoryAttachment Class, contains details on an attachable object
+            Number of primitives your avatar is currently
+            selecting and sitting on in this parcel
             </summary>
         </member>
-        <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 name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SelfCount">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryAttachment.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SequenceID">
             <summary>
-            Construct an InventoryAttachment object from a serialization stream
+            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="P:OpenMetaverse.InventoryAttachment.AttachmentPoint">
-            <summary>
-            Get the last AttachmentPoint this object was attached to
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SimWideMaxPrims">
+            <summary>Maximum primitives across the entire simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryWearable">
-            <summary>
-            InventoryWearable Class, details on a clothing item or body part
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SimWideTotalPrims">
+            <summary>Total primitives across the entire simulator</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.Messages.Linden.ParcelPropertiesMessage.SnapSelection">
+            <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.Messages.Linden.ParcelPropertiesMessage.SnapshotID">
+            <summary>Key of parcel snapshot</summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryWearable.WearableType">
-            <summary>
-            The <seealso cref="T:OpenMetaverse.WearableType"/>, Skin, Shape, Skirt, Etc
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Status">
+            <summary>Parcel ownership status</summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryAnimation">
-            <summary>
-            InventoryAnimation Class, A bvh encoded object which animates an avatar
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.TotalPrims">
+            <summary>Total number of primitives on this parcel</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.Messages.Linden.ParcelPropertiesMessage.UserLocation">
+            <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.Messages.Linden.ParcelPropertiesMessage.UserLookAt">
+            <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.Messages.Linden.ParcelPropertiesMessage.MediaDesc">
+            <summary>A description of the media</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.Messages.Linden.ParcelPropertiesMessage.MediaHeight">
+            <summary>An Integer which represents the height of the media</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.Messages.Linden.ParcelPropertiesMessage.MediaWidth">
+            <summary>An integer which represents the width of the media</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.Messages.Linden.ParcelPropertiesMessage.MediaLoop">
+            <summary>A boolean, if true the viewer should loop the media</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryFolder.PreferredType">
-            <summary>The Preferred <seealso cref="T:OpenMetaverse.AssetType"/> for a folder.</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaType">
+            <summary>A string which contains the mime type of the media</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryFolder.Version">
-            <summary>The Version of this folder</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ObscureMedia">
+            <summary>true to obscure (hide) media url</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryFolder.DescendentCount">
-            <summary>Number of child items this folder contains.</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ObscureMusic">
+            <summary>true to obscure (hide) music url</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.#ctor(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Serialize">
             <summary>
-            Constructor
+            Serialize the object
             </summary>
-            <param name="itemID">UUID of the folder</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.ToString">
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserialize the message
             </summary>
-            <returns></returns>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            Get Serilization data for this InventoryFolder object
-            </summary>
+        <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="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.Messages.Linden.ParcelPropertiesUpdateMessage.AuthBuyerID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the agent authorized to purchase this
+            parcel of land or a NULL <seealso cref="T:OpenMetaverse.UUID"/> if the sale is authorized to anyone</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.GetHashCode">
-            <summary>
-            
-            </summary>
-            <returns></returns>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaAutoScale">
+            <summary>true to enable auto scaling of the parcel media</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.Equals(System.Object)">
-            <summary>
-            
-            </summary>
-            <param name="o"></param>
-            <returns></returns>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Category">
+            <summary>The category of this parcel used when search is enabled to restrict
+            search results</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.Equals(OpenMetaverse.InventoryBase)">
-            <summary>
-            
-            </summary>
-            <param name="o"></param>
-            <returns></returns>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Desc">
+            <summary>A string containing the description to set</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.Equals(OpenMetaverse.InventoryFolder)">
-            <summary>
-            
-            </summary>
-            <param name="o"></param>
-            <returns></returns>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.GroupID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the <seealso cref="T:OpenMetaverse.Group"/> which allows for additional
+            powers and restrictions.</summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryManager">
-            <summary>
-            Tools for dealing with agents inventory
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Landing">
+            <summary>The <seealso cref="T:OpenMetaverse.LandingType"/> which specifies how avatars which teleport
+            to this parcel are handled</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.MAGIC_ID">
-            <summary>Used for converting shadow_id to asset_id</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.LocalID">
+            <summary>The LocalID of the parcel to update settings on</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_ItemReceived">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaDesc">
+            <summary>A string containing the description of the media which can be played
+            to visitors</summary>
         </member>
-        <member name="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 name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaHeight">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_ItemReceivedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaLoop">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_FolderUpdated">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaID">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.OnFolderUpdated(OpenMetaverse.FolderUpdatedEventArgs)">
-            <summary>Raises the FolderUpdated Event</summary>
-             <param name="e">A FolderUpdatedEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaType">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_FolderUpdatedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaURL">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_InventoryObjectOffered">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaWidth">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.OnInventoryObjectOffered(OpenMetaverse.InventoryObjectOfferedEventArgs)">
-            <summary>Raises the InventoryObjectOffered Event</summary>
-             <param name="e">A InventoryObjectOfferedEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MusicURL">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_InventoryObjectOfferedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Name">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_TaskItemReceived">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ObscureMedia">
+            <summary></summary>
         </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.Messages.Linden.ParcelPropertiesUpdateMessage.ObscureMusic">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_TaskItemReceivedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ParcelFlags">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_FindObjectByPathReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.PassHours">
+            <summary></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.Messages.Linden.ParcelPropertiesUpdateMessage.PassPrice">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_FindObjectByPathReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Privacy">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.SalePrice">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_TaskInventoryReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.SnapshotID">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.OnTaskInventoryReply(OpenMetaverse.TaskInventoryReplyEventArgs)">
-            <summary>Raises the TaskInventoryReply Event</summary>
-             <param name="e">A TaskInventoryReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.UserLocation">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_TaskInventoryReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.UserLookAt">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_SaveAssetToInventory">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <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>
         </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="M:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_SaveAssetToInventoryLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestBlock">
+            <summary>Base class used for the RemoteParcelRequest message</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_ScriptRunningReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest">
+            <summary>
+            A message sent from the viewer to the simulator to request information
+            on a remote parcel
+            </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.Messages.Linden.RemoteParcelRequestRequest.Location">
+            <summary>Local sim position of the parcel we are looking up</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_ScriptRunningReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.RegionHandle">
+            <summary>Region handle of the parcel we are looking up</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager._NewFolderNames">
-            <summary>Partial mapping of AssetTypes to folder names</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.RegionID">
+            <summary>Region <see cref="T:OpenMetaverse.UUID"/> of the parcel we are looking up</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.Serialize">
             <summary>
-            Default constructor
+            Serialize the object
             </summary>
-            <param name="client">Reference to the GridClient object</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.FetchItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Int32)">
+        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Fetch an inventory item from the dataserver
+            Deserialize the message
             </summary>
-            <param name="itemID">The items <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="ownerID">The item Owners <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="timeoutMS">a integer representing the number of milliseconds to wait for results</param>
-            <returns>An <seealso cref="T:OpenMetaverse.InventoryItem"/> object on success, or null if no item was found</returns>
-            <remarks>Items will also be sent to the <seealso cref="M:OpenMetaverse.InventoryManager.OnItemReceived(OpenMetaverse.ItemReceivedEventArgs)"/> event</remarks>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestFetchInventory(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply">
             <summary>
-            Request A single inventory item
+            A message sent from the simulator to the viewer in response to a <see cref="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest"/> 
+            which will contain parcel information
             </summary>
-            <param name="itemID">The items <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="ownerID">The item Owners <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <seealso cref="M:OpenMetaverse.InventoryManager.OnItemReceived(OpenMetaverse.ItemReceivedEventArgs)"/>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestFetchInventory(System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{OpenMetaverse.UUID})">
+        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply.ParcelID">
+            <summary>The grid-wide unique parcel ID</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply.Serialize">
             <summary>
-            Request inventory items
+            Serialize the object
             </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>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.FolderContents(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder,System.Int32)">
+        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Get contents of a folder
+            Deserialize the message
             </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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestFolderContents(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder)">
+        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage">
             <summary>
-            Request the contents of an inventory folder
+            A message containing a request for a remote parcel from a viewer, or a response
+            from the simulator to that request
             </summary>
-            <param name="folder">The folder to search</param>
-            <param name="owner">The folder owners <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="folders">true to return <seealso cref="!:InventoryManager.InventoryFolder"/>s contained in folder</param>
-            <param name="items">true to return <seealso cref="!:InventoryManager.InventoryItem"/>s containd in folder</param>
-            <param name="order">the sort order to return items in</param>
-            <seealso cref="M:OpenMetaverse.InventoryManager.FolderContents(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder,System.Int32)"/>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.FindFolderForType(OpenMetaverse.AssetType)">
+        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage.Request">
+            <summary>The request or response details block</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage.Serialize">
             <summary>
-            Returns the UUID of the folder (category) that defaults to
-            containing 'type'. The folder is not necessarily only for that
-            type
+            Serialize the object
             </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>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.FindObjectByPath(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.Int32)">
+        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Find an object in inventory using a specific path to search
+            Deserialize the message
             </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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestFindObjectByPath(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String)">
+        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryMessage.Serialize">
             <summary>
-            Find inventory items by path
+            Serialize the object
             </summary>
-            <param name="baseFolder">The folder to begin the search in</param>
-            <param name="inventoryOwner">The object owners <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="path">A string path to search, folders/objects separated by a '/'</param>
-            <remarks>Results are sent to the <seealso cref="!:InventoryManager.OnFindObjectByPath"/> event</remarks>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.LocalFind(OpenMetaverse.UUID,System.String[],System.Int32,System.Boolean)">
+        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Search inventory Store object for an item or folder
+            Deserialize the message
             </summary>
-            <param name="baseFolder">The folder to begin the search in</param>
-            <param name="path">An array which creates a path to search</param>
-            <param name="level">Number of levels below baseFolder to conduct searches</param>
-            <param name="firstOnly">if True, will stop searching after first match is found</param>
-            <returns>A list of inventory items found</returns>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.Move(OpenMetaverse.InventoryBase,OpenMetaverse.InventoryFolder)">
+        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryVariablePriceMessage.Serialize">
             <summary>
-            Move an inventory item or folder to a new location
+            Serialize the object
             </summary>
-            <param name="item">The <seealso cref="T:InventoryBase"/> item or folder to move</param>
-            <param name="newParent">The <seealso cref="T:InventoryFolder"/> to move item or folder to</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.Move(OpenMetaverse.InventoryBase,OpenMetaverse.InventoryFolder,System.String)">
+        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryVariablePriceMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Move an inventory item or folder to a new location and change its name
+            Deserialize the message
             </summary>
-            <param name="item">The <seealso cref="T:InventoryBase"/> item or folder to move</param>
-            <param name="newParent">The <seealso cref="T:InventoryFolder"/> to move item or folder to</param>
-            <param name="newName">The name to change the item or folder to</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveFolder(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String)">
+        <member name="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage">
             <summary>
-            Move and rename a folder
+            A message sent from the simulator to an agent which contains
+            the groups the agent is in
             </summary>
-            <param name="folderID">The source folders <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="newparentID">The destination folders <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="newName">The name to change the folder to</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.UpdateFolderProperties(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType)">
+        <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>
-            Update folder properties
+            Serialize the object
             </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>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveFolder(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Move a folder
+            Deserialize the message
             </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="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveFolders(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.UUID})">
+        <member name="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData">
+            <summary>Group Details specific to the agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.AcceptNotices">
+            <summary>true of the agent accepts group notices</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.Contribution">
+            <summary>The agents tier contribution to the group</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupID">
+            <summary>The Groups <seealso cref="T:OpenMetaverse.UUID"/></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupInsigniaID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the groups insignia</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupName">
+            <summary>The name of the group</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupPowers">
+            <summary>The aggregate permissions the agent has in the group for all roles the agent
+            is assigned</summary>
+        </member>
+        <member name="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.NewGroupData">
+            <summary>An optional block containing additional agent specific information</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.NewGroupData.ListInProfile">
+            <summary>true of the agent allows this group to be
+            listed in their profile</summary>
+        </member>
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage">
             <summary>
-            Move multiple folders, the keys in the Dictionary parameter,
-            to a new parents, the value of that folder's key.
+            A message sent from the viewer to the simulator which 
+            specifies the language and permissions for others to detect
+            the language specified
             </summary>
-            <param name="foldersNewParents">A Dictionary containing the 
-            <seealso cref="T:OpenMetaverse.UUID"/> of the source as the key, and the 
-            <seealso cref="T:OpenMetaverse.UUID"/> of the destination as the value</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveItem(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.Language">
+            <summary>A string containng the default language 
+            to use for the agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.LanguagePublic">
+            <summary>true of others are allowed to
+            know the language setting</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.Serialize">
             <summary>
-            Move an inventory item to a new folder
+            Serialize the object
             </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>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String)">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Move and rename an inventory item
+            Deserialize the message
             </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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveItems(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.UUID})">
+        <member name="T:OpenMetaverse.Messages.Linden.AgentDropGroupMessage">
             <summary>
-            Move multiple inventory items to new locations
+            An EventQueue message sent from the simulator to an agent when the agent
+            leaves a group
             </summary>
-            <param name="itemsNewParents">A Dictionary containing the 
-            <seealso cref="T:OpenMetaverse.UUID"/> of the source item as the key, and the 
-            <seealso cref="T:OpenMetaverse.UUID"/> of the destination folder as the value</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RemoveDescendants(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentDataBlock">
             <summary>
-            Remove descendants of a folder
+            An Array containing the AgentID and GroupID
             </summary>
-            <param name="folder">The <seealso cref="T:OpenMetaverse.UUID"/> of the folder</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RemoveItem(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.Serialize">
             <summary>
-            Remove a single item from inventory
+            Serialize the object
             </summary>
-            <param name="item">The <seealso cref="T:OpenMetaverse.UUID"/> of the inventory item to remove</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RemoveFolder(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Remove a folder from inventory
+            Deserialize the message
             </summary>
-            <param name="folder">The <seealso cref="T:OpenMetaverse.UUID"/> of the folder to remove</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.Remove(System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{OpenMetaverse.UUID})">
+        <member name="T:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentData">
+            <summary>An object containing the Agents UUID, and the Groups UUID</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentData.AgentID">
+            <summary>The ID of the Agent leaving the group</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentData.GroupID">
+            <summary>The GroupID the Agent is leaving</summary>
+        </member>
+        <member name="T:OpenMetaverse.Messages.Linden.AssetUploaderBlock">
+            <summary>Base class for Asset uploads/results via Capabilities</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AssetUploaderBlock.State">
             <summary>
-            Remove multiple items or folders from inventory
+            The request state
             </summary>
-            <param name="items">A List containing the <seealso cref="T:OpenMetaverse.UUID"/>s of items to remove</param>
-            <param name="folders">A List containing the <seealso cref="T:OpenMetaverse.UUID"/>s of the folders to remove</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.EmptyLostAndFound">
+        <member name="M:OpenMetaverse.Messages.Linden.AssetUploaderBlock.Serialize">
             <summary>
-            Empty the Lost and Found folder
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.EmptyTrash">
+        <member name="M:OpenMetaverse.Messages.Linden.AssetUploaderBlock.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Empty the Trash folder
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItem(OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,OpenMetaverse.InventoryType,OpenMetaverse.PermissionMask,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
+        <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestUpload">
             <summary>
-            
+            A message sent from the viewer to the simulator to request a temporary upload capability
+            which allows an asset to be uploaded
             </summary>
-            <param name="parentFolder"></param>
-            <param name="name"></param>
-            <param name="description"></param>
-            <param name="type"></param>
-            <param name="assetTransactionID">Proper use is to upload the inventory's asset first, then provide the Asset's TransactionID here.</param>
-            <param name="invType"></param>
-            <param name="nextOwnerMask"></param>
-            <param name="callback"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItem(OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,OpenMetaverse.InventoryType,OpenMetaverse.WearableType,OpenMetaverse.PermissionMask,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestUpload.Url">
+            <summary>The Capability URL sent by the simulator to upload the baked texture to</summary>
+        </member>
+        <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestComplete">
             <summary>
-            
+            A message sent from the simulator that will inform the agent the upload is complete, 
+            and the UUID of the uploaded asset
             </summary>
-            <param name="parentFolder"></param>
-            <param name="name"></param>
-            <param name="description"></param>
-            <param name="type"></param>
-            <param name="assetTransactionID">Proper use is to upload the inventory's asset first, then provide the Asset's TransactionID here.</param>
-            <param name="invType"></param>
-            <param name="wearableType"></param>
-            <param name="nextOwnerMask"></param>
-            <param name="callback"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateFolder(OpenMetaverse.UUID,System.String)">
+        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestComplete.AssetID">
+            <summary>The uploaded texture asset ID</summary>
+        </member>
+        <member name="T:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage">
             <summary>
-            Creates a new inventory folder
+            A message sent from the viewer to the simulator to request a temporary
+            capability URI which is used to upload an agents baked appearance textures
             </summary>
-            <param name="parentID">ID of the folder to put this folder in</param>
-            <param name="name">Name of the folder to create</param>
-            <returns>The UUID of the newly created folder</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateFolder(OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType)">
+        <member name="F:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage.Request">
+            <summary>Object containing request or response</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage.Serialize">
             <summary>
-            Creates a new inventory folder
+            Serialize the 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>
-            <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>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</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="M:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Create an inventory item and upload asset data
+            Deserialize the message
             </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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItemFromAsset(System.Byte[],System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.InventoryType,OpenMetaverse.UUID,OpenMetaverse.Permissions,OpenMetaverse.InventoryManager.ItemCreatedFromAssetCallback)">
+        <member name="T:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage">
             <summary>
-            Create an inventory item and upload asset data
+            A message sent from the simulator which indicates the minimum version required for 
+            using voice chat
             </summary>
-            <param name="data">Asset data</param>
-            <param name="name">Inventory item name</param>
-            <param name="description">Inventory item description</param>
-            <param name="assetType">Asset type</param>
-            <param name="invType">Inventory type</param>
-            <param name="folderID">Put newly created inventory in this folder</param>
-            <param name="permissions">Permission of the newly created item 
-            (EveryoneMask, GroupMask, and NextOwnerMask of Permissions struct are supported)</param>
-            <param name="callback">Delegate that will receive feedback on success or failure</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.InventoryBase,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.MajorVersion">
+            <summary>Major Version Required</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.MinorVersion">
+            <summary>Minor version required</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.RegionName">
+            <summary>The name of the region sending the version requrements</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.Serialize">
             <summary>
-            Creates inventory link to another inventory item or folder
+            Serialize the object
             </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>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.InventoryItem,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
+        <member name="M:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Creates inventory link to another inventory item
+            Deserialize the message
             </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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.InventoryFolder,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
+        <member name="T:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage">
             <summary>
-            Creates inventory link to another inventory folder
+            A message sent from the simulator to the viewer containing the 
+            voice server URI
             </summary>
-            <param name="folderID">Put newly created link in folder with this UUID</param>
-            <param name="folder">Original inventory folder</param>
-            <param name="callback">Method to call upon creation of the link</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.InventoryType,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.ParcelID">
+            <summary>The Parcel ID which the voice server URI applies</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.RegionName">
+            <summary>The name of the region</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.SipChannelUri">
+            <summary>A uri containing the server/channel information
+            which the viewer can utilize to participate in voice conversations</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.Serialize">
             <summary>
-            Creates inventory link to another inventory item or folder
+            Serialize the object
             </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>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserialize the message
             </summary>
-            <param name="item"></param>
-            <param name="newParent"></param>
-            <param name="newName"></param>
-            <param name="callback"></param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
+        <member name="T:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage">
             <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="M:OpenMetaverse.InventoryManager.RequestCopyItems(System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{System.String},OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Password">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Username">
+            <summary></summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Serialize">
             <summary>
-            
+            Serialize the object
             </summary>
-            <param name="items"></param>
-            <param name="targetFolders"></param>
-            <param name="newNames"></param>
-            <param name="oldOwnerID"></param>
-            <param name="callback"></param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItemFromNotecard(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
+        <member name="M:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Request a copy of an asset embedded within a notecard
+            Deserialize the message
             </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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItem(OpenMetaverse.InventoryItem)">
+        <member name="T:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage">
             <summary>
-            
+            A message sent by the viewer to the simulator to request a temporary
+            capability for a script contained with in a Tasks inventory to be updated
             </summary>
-            <param name="item"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItems(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
+        <member name="F:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage.Request">
+            <summary>Object containing request or response</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage.Serialize">
             <summary>
-            
+            Serialize the object
             </summary>
-            <param name="items"></param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItems(System.Collections.Generic.List{OpenMetaverse.InventoryItem},OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserialize the message
             </summary>
-            <param name="items"></param>
-            <param name="transactionID"></param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUploadNotecardAsset(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback)">
+        <member name="T:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage">
             <summary>
-            
+            A message sent from the simulator to the viewer to indicate
+            a Tasks scripts status.
             </summary>
-            <param name="data"></param>
-            <param name="notecardID"></param>
-            <param name="callback"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateNotecardTask(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.ItemID">
+            <summary>The Asset ID of the script</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Mono">
+            <summary>True of the script is compiled/ran using the mono interpreter, false indicates it 
+            uses the older less efficient lsl2 interprter</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.ObjectID">
+            <summary>The Task containing the scripts <seealso cref="T:OpenMetaverse.UUID"/></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Running">
+            <summary>true of the script is in a running state</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Serialize">
             <summary>
-            Save changes to notecard embedded in object contents
+            Serialize the object
             </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>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUploadGestureAsset(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback)">
+        <member name="M:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Upload new gesture asset for an inventory gesture item
+            Deserialize the message
             </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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateScriptAgentInventory(System.Byte[],OpenMetaverse.UUID,System.Boolean,OpenMetaverse.InventoryManager.ScriptUpdatedCallback)">
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage">
             <summary>
-            Update an existing script in an agents Inventory
+            A message containing the request/response used for updating a gesture
+            contained with an agents inventory
             </summary>
-            <param name="data">A byte[] array containing the encoded scripts contents</param>
-            <param name="itemID">the itemID of the script</param>
-            <param name="mono">if true, sets the script content to run on the mono interpreter</param>
-            <param name="callback"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateScriptTask(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventoryManager.ScriptUpdatedCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage.Request">
+            <summary>Object containing request or response</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage.Serialize">
             <summary>
-            Update an existing script in an task Inventory
+            Serialize the object
             </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>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.InventoryItem)">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Rez an object from inventory
+            Deserialize the message
             </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="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.InventoryItem,OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage">
             <summary>
-            Rez an object from inventory
+            A message request/response which is used to update a notecard contained within
+            a tasks inventory
             </summary>
-            <param name="simulator">Simulator to place object in</param>
-            <param name="rotation">Rotation of the object when rezzed</param>
-            <param name="position">Vector of where to place object</param>
-            <param name="item">InventoryItem object containing item details</param>
-            <param name="groupOwner">UUID of group to own the object</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.InventoryItem,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.TaskID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the Task containing the notecard asset to update</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.ItemID">
+            <summary>The notecard assets <seealso cref="T:OpenMetaverse.UUID"/> contained in the tasks inventory</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.Serialize">
             <summary>
-            Rez an object from inventory
+            Serialize the object
             </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>        
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestDeRezToInventory(System.UInt32)">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            DeRez an object from the simulator to the agents Objects folder in the agents Inventory
+            Deserialize the message
             </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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestDeRezToInventory(System.UInt32,OpenMetaverse.DeRezDestination,OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage">
             <summary>
-            DeRez an object from the simulator and return to inventory
+            A reusable class containing a message sent from the viewer to the simulator to request a temporary uploader capability
+            which is used to update an asset in an agents inventory
             </summary>
-            <param name="objectLocalID">The simulator Local ID of the object</param>
-            <param name="destType">The type of destination from the <seealso cref="T:OpenMetaverse.DeRezDestination"/> enum</param>
-            <param name="destFolder">The destination inventory folders <seealso cref="T:OpenMetaverse.UUID"/> -or- 
-            if DeRezzing object to a tasks Inventory, the Tasks <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="transactionID">The transaction ID for this request which
-            can be used to correlate this request with other packets</param>
-            <remarks>If objectLocalID is a child primitive in a linkset, the entire linkset will be derezzed</remarks>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestRestoreRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.InventoryItem,OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage.ItemID">
             <summary>
-            Rez an item from inventory to its previous simulator location
+            The Notecard AssetID to replace
             </summary>
-            <param name="simulator"></param>
-            <param name="item"></param>
-            <param name="queryID"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.GiveItem(OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,System.Boolean)">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage.Serialize">
             <summary>
-            Give an inventory item to another avatar
+            Serialize the object
             </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>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.GiveFolder(OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,System.Boolean)">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Give an inventory Folder with contents to another avatar
+            Deserialize the message
             </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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.UpdateTaskInventory(System.UInt32,OpenMetaverse.InventoryItem)">
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage">
             <summary>
-            Copy or move an <see cref="T:OpenMetaverse.InventoryItem"/> from agent inventory to a task (primitive) inventory
+            A message containing the request/response used for updating a notecard
+            contained with an agents 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="M:OpenMetaverse.InventoryManager.GetTaskInventory(OpenMetaverse.UUID,System.UInt32,System.Int32)">
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage.Request">
+            <summary>Object containing request or response</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage.Serialize">
             <summary>
-            Retrieve a listing of the items contained in a task (Primitive)
+            Serialize the object
             </summary>
-            <param name="objectID">The tasks <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="objectLocalID">The tasks simulator local ID</param>
-            <param name="timeoutMS">milliseconds to wait for reply from simulator</param>
-            <returns>A list containing the inventory items inside the task or null
-            if a timeout occurs</returns>
-            <remarks>This request blocks until the response from the simulator arrives 
-            or timeoutMS is exceeded</remarks>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestTaskInventory(System.UInt32)">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Request the contents of a tasks (primitives) inventory from the 
-            current simulator
+            Deserialize the message
             </summary>
-            <param name="objectLocalID">The LocalID of the object</param>
-            <seealso cref="E:OpenMetaverse.InventoryManager.TaskInventoryReply"/>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestTaskInventory(System.UInt32,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.Messages.Linden.CopyInventoryFromNotecardMessage.Serialize">
             <summary>
-            Request the contents of a tasks (primitives) inventory
+            Serialize the object
             </summary>
-            <param name="objectLocalID">The simulator Local ID of the object</param>
-            <param name="simulator">A reference to the simulator object that contains the object</param>
-            <seealso cref="E:OpenMetaverse.InventoryManager.TaskInventoryReply"/>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveTaskInventory(System.UInt32,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.Messages.Linden.CopyInventoryFromNotecardMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Move an item from a tasks (Primitive) inventory to the specified folder in the avatars inventory
+            Deserialize the message
             </summary>
-            <param name="objectLocalID">LocalID of the object in the simulator</param>
-            <param name="taskItemID">UUID of the task item to move</param>
-            <param name="inventoryFolderID">The ID of the destination folder in this agents inventory</param>
-            <param name="simulator">Simulator Object</param>
-            <remarks>Raises the <see cref="M:OpenMetaverse.InventoryManager.OnTaskItemReceived(OpenMetaverse.TaskItemReceivedEventArgs)"/> event</remarks>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RemoveTaskInventory(System.UInt32,OpenMetaverse.UUID,OpenMetaverse.Simulator)">
+        <member name="T:OpenMetaverse.Messages.Linden.UploaderScriptRequestError">
             <summary>
-            Remove an item from an objects (Prim) Inventory
+            A message sent from the simulator to the viewer which indicates
+            an error occurred while attempting to update a script in an agents or tasks 
+            inventory
             </summary>
-            <param name="objectLocalID">LocalID of the object in the simulator</param>
-            <param name="taskItemID">UUID of the task item to remove</param>
-            <param name="simulator">Simulator Object</param>
-            <remarks>You can confirm the removal by comparing the tasks inventory serial before and after the 
-            request with the <see cref="M:OpenMetaverse.InventoryManager.RequestTaskInventory(System.UInt32)"/> request combined with
-            the <seealso cref="E:OpenMetaverse.InventoryManager.TaskInventoryReply"/> event</remarks>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CopyScriptToTask(System.UInt32,OpenMetaverse.InventoryItem,System.Boolean)">
-             <summary>
-             Copy an InventoryScript item from the Agents Inventory into a primitives task inventory
-             </summary>
-             <param name="objectLocalID">An unsigned integer representing a primitive being simulated</param>
-             <param name="item">An <seealso cref="T:OpenMetaverse.InventoryItem"/> which represents a script object from the agents inventory</param>
-             <param name="enableScript">true to set the scripts running state to enabled</param>
-             <returns>A Unique Transaction ID</returns>
-             <example>
-             The following example shows the basic steps necessary to copy a script from the agents inventory into a tasks inventory
-             and assumes the script exists in the agents inventory.
-             <code>
-                uint primID = 95899503; // Fake prim ID
-                UUID scriptID = UUID.Parse("92a7fe8a-e949-dd39-a8d8-1681d8673232"); // Fake Script UUID in Inventory
-            
-                Client.Inventory.FolderContents(Client.Inventory.FindFolderForType(AssetType.LSLText), Client.Self.AgentID, 
-                    false, true, InventorySortOrder.ByName, 10000);
-            
-                Client.Inventory.RezScript(primID, (InventoryItem)Client.Inventory.Store[scriptID]);
-             </code>
-             </example>
+        <member name="F:OpenMetaverse.Messages.Linden.UploaderScriptRequestError.Compiled">
+            <summary>true of the script was successfully compiled by the simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.UploaderScriptRequestError.Error">
+            <summary>A string containing the error which occured while trying
+            to update the script</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.UploaderScriptRequestError.AssetID">
+            <summary>A new AssetID assigned to the script</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestGetScriptRunning(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage">
             <summary>
-            Request the running status of a script contained in a task (primitive) inventory
+            A message sent from the viewer to the simulator
+            requesting the update of an existing script contained
+            within a tasks 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="M:OpenMetaverse.InventoryManager.RequestSetScriptRunning(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.ScriptRunning">
+            <summary>if true, set the script mode to running</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.ItemID">
+            <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 
+            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>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.Serialize">
             <summary>
-            Send a request to set the running state of a script contained in a task (primitive) inventory
+            Serialize the object
             </summary>
-            <param name="objectID">The ID of the primitive containing the script</param>
-            <param name="scriptID">The ID of the script</param>
-            <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>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.ItemCRC(OpenMetaverse.InventoryItem)">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Create a CRC from an InventoryItem
+            Deserialize the message
             </summary>
-            <param name="iitem">The source InventoryItem</param>
-            <returns>A uint representing the source InventoryItem as a CRC</returns>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.DecryptShadowID(OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage">
             <summary>
-            Reverses a cheesy XORing with a fixed UUID to convert a shadow_id to an asset_id
+            A message containing either the request or response used in updating a script inside
+            a tasks inventory
             </summary>
-            <param name="shadowID">Obfuscated shadow_id value</param>
-            <returns>Deobfuscated asset_id value</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.EncryptAssetID(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage.Request">
+            <summary>Object containing request or response</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage.Serialize">
             <summary>
-            Does a cheesy XORing with a fixed UUID to convert an asset_id to a shadow_id
+            Serialize the object
             </summary>
-            <param name="assetID">asset_id value to obfuscate</param>
-            <returns>Obfuscated shadow_id value</returns>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateInventoryItem(OpenMetaverse.InventoryType,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Wrapper for creating a new <seealso cref="T:OpenMetaverse.InventoryItem"/> object
+            Deserialize the message
             </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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.ParseTaskInventory(System.String)">
+        <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestScriptComplete">
             <summary>
-            Parse the results of a RequestTaskInventory() response
+            Response from the simulator to notify the viewer the upload is completed, and
+            the UUID of the script asset and its compiled status
             </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>
-        <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="F:OpenMetaverse.Messages.Linden.UploaderRequestScriptComplete.AssetID">
+            <summary>The uploaded texture asset ID</summary>
         </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.Messages.Linden.UploaderRequestScriptComplete.Compiled">
+            <summary>true of the script was compiled successfully</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.UpdateCreateInventoryItemHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage">
             <summary>
-            UpdateCreateInventoryItem packets are received when a new inventory item 
-            is created. This may occur when an object that's rezzed in world is
-            taken into inventory, when an item is created using the CreateInventoryItem
-            packet, or when an object is purchased
+            A message sent from a viewer to the simulator requesting a temporary uploader capability
+            used to update a script contained in an agents inventory
             </summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveInventoryItemHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <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 name="F:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage.ItemID">
+            <summary>The existing asset if of the script in the agents inventory to replace</summary>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.TaskItemReceived">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage.Target">
+            <summary>The language of the script</summary>
+            <remarks>Defaults to lsl version 2, "mono" might be another possible option</remarks>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.FindObjectByPathReply">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.TaskInventoryReply">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <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>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.SaveAssetToInventory">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage">
+            <summary>
+            A message containing either the request or response used in updating a script inside
+            an agents inventory
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.ScriptRunningReply">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage.Request">
+            <summary>Object containing request or response</summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryManager.Store">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage.Serialize">
             <summary>
-            Get this agents Inventory data
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.InventoryManager.ItemCreatedCallback">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Callback for inventory item creation finishing
+            Deserialize the message
             </summary>
-            <param name="success">Whether the request to create an inventory
-            item succeeded or not</param>
-            <param name="item">Inventory item being created. If success is
-            false this will be null</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.InventoryManager.ItemCreatedFromAssetCallback">
+        <member name="M:OpenMetaverse.Messages.Linden.SendPostcardMessage.Serialize">
             <summary>
-            Callback for an inventory item being create from an uploaded asset
+            Serialize the object
             </summary>
-            <param name="success">true if inventory item creation was successful</param>
-            <param name="status"></param>
-            <param name="itemID"></param>
-            <param name="assetID"></param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.InventoryManager.ItemCopiedCallback">
+        <member name="M:OpenMetaverse.Messages.Linden.SendPostcardMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserialize the message
             </summary>
-            <param name="item"></param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback">
+        <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>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessageBase.Serialize">
             <summary>
-            Reply received when uploading an inventory asset
+            Serialize the object
             </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>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.InventoryManager.ScriptUpdatedCallback">
+        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessageBase.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Delegate that is invoked when script upload is completed
+            Deserialize the message
             </summary>
-            <param name="uploadSuccess">Has upload succeded (note, there still might be compile errors)</param>
-            <param name="uploadStatus">Upload status message</param>
-            <param name="compileSuccess">Is compilation successful</param>
-            <param name="compileMessages">If compilation failed, list of error messages, null on compilation success</param>
-            <param name="itemID">Script inventory UUID</param>
-            <param name="assetID">Script's new asset UUID</param>
-        </member>
-        <member name="P:OpenMetaverse.InventoryObjectOfferedEventArgs.Accept">
-            <summary>Set to true to accept offer, false to decline it</summary>
-        </member>
-        <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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.TaskItemReceivedEventArgs">
+        <member name="T:OpenMetaverse.Messages.Linden.MapLayerRequestVariant">
             <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.
+            Sent by an agent to the capabilities server to request map layers
             </summary>
         </member>
-        <member name="T:OpenMetaverse.GridLayerType">
+        <member name="T:OpenMetaverse.Messages.Linden.MapLayerReplyVariant">
             <summary>
-            Map layer request type
+            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.GridLayerType.Objects">
-            <summary>Objects and terrain are shown</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerDataBlocks">
+            <summary>An array containing LayerData items</summary>
         </member>
-        <member name="F:OpenMetaverse.GridLayerType.Terrain">
-            <summary>Only the terrain is shown, no objects</summary>
+        <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="F:OpenMetaverse.GridLayerType.LandForSale">
-            <summary>Overlay showing land for sale and for auction</summary>
+        <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.GridItemType">
+        <member name="T:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData">
             <summary>
-            Type of grid item, such as telehub, event, populator location, etc.
+            An object containing map location details
             </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 name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.ImageID">
+            <summary>The Asset ID of the regions tile overlay</summary>
         </member>
-        <member name="F:OpenMetaverse.GridItemType.Popular">
-            <summary>Popular location</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Bottom">
+            <summary>The grid location of the southern border of the map tile</summary>
         </member>
-        <member name="F:OpenMetaverse.GridItemType.AgentLocations">
-            <summary>Locations of avatar groups in a region</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Left">
+            <summary>The grid location of the western border of the map tile</summary>
         </member>
-        <member name="F:OpenMetaverse.GridItemType.LandForSale">
-            <summary>Land for sale</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Right">
+            <summary>The grid location of the eastern border of the map tile</summary>
         </member>
-        <member name="F:OpenMetaverse.GridItemType.Classified">
-            <summary>Classified ad</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Top">
+            <summary>The grid location of the northern border of the map tile</summary>
         </member>
-        <member name="F:OpenMetaverse.GridItemType.AdultEvent">
-            <summary>Adult rated event</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.MapLayerMessage.Request">
+            <summary>Object containing request or response</summary>
         </member>
-        <member name="F:OpenMetaverse.GridItemType.AdultLandForSale">
-            <summary>Adult land for sale</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.GridRegion">
+        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Information about a region on the grid map
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.X">
-            <summary>Sim X position on World Map</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.ProductInfoRequestMessage">
+            <summary>
+            New as of 1.23 RC1, no details yet.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.Y">
-            <summary>Sim Y position on World Map</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ProductInfoRequestMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.Name">
-            <summary>Sim Name (NOTE: In lowercase!)</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ProductInfoRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.Access">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Messages.Linden.SearchStatRequestMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.RegionFlags">
-            <summary>Appears to always be zero (None)</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.SearchStatRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.WaterHeight">
-            <summary>Sim's defined Water Height</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestBlock.Method">
+            <summary>A string containing the method used</summary>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.Agents">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference">
+            <summary>
+            A request sent from an agent to the Simulator to begin a new conference.
+            Contains a list of Agents which will be included in the conference
+            </summary>    
         </member>
-        <member name="F:OpenMetaverse.GridRegion.MapImageID">
-            <summary>UUID of the World Map image</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.AgentsBlock">
+            <summary>An array containing the <see cref="T:OpenMetaverse.UUID"/> of the agents invited to this conference</summary>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.RegionHandle">
-            <summary>Unique identifier for this region, a combination of the X 
-            and Y position</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.SessionID">
+            <summary>The conferences Session ID</summary>
         </member>
-        <member name="M:OpenMetaverse.GridRegion.ToString">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.Serialize">
             <summary>
-            
+            Serialize the object
             </summary>
-            <returns></returns>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.GridRegion.GetHashCode">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserialize the message
             </summary>
-            <returns></returns>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.GridRegion.Equals(System.Object)">
+        <member name="T:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate">
             <summary>
-            
+            A moderation request sent from a conference moderator
+            Contains an agent and an optional action to take
+            </summary>    
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.SessionID">
+            <summary>The Session ID</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.AgentID">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.RequestKey">
+            <summary>A list containing Key/Value pairs, known valid values:
+            key: text value: true/false - allow/disallow specified agents ability to use text in session
+            key: voice value: true/false - allow/disallow specified agents ability to use voice in session
             </summary>
-            <param name="obj"></param>
-            <returns></returns>
+            <remarks>"text" or "voice"</remarks>
         </member>
-        <member name="T:OpenMetaverse.GridLayer">
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.RequestValue">
+            <summary></summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.Serialize">
             <summary>
-            Visual chunk of the grid map
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.MapItem">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Base class for Map Items
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.MapItem.GlobalX">
-            <summary>The Global X position of the item</summary>
-        </member>
-        <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 name="T:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation">
+            <summary>
+            A message sent from the agent to the simulator which tells the 
+            simulator we've accepted a conference invitation
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.MapItem.RegionHandle">
-            <summary>Get the Handle of the region</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation.SessionID">
+            <summary>The conference SessionID</summary>
         </member>
-        <member name="T:OpenMetaverse.MapAgentLocation">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation.Serialize">
             <summary>
-            Represents an agent or group of agents location
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.MapTelehub">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Represents a Telehub location
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.MapLandForSale">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMessage.Serialize">
             <summary>
-            Represents a non-adult parcel of land for sale
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.MapAdultLandForSale">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Represents an Adult parcel of land for sale
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.MapPGEvent">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterboxSessionEventReplyMessage.Serialize">
             <summary>
-            Represents a PG Event
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.MapMatureEvent">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterboxSessionEventReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Represents a Mature event
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.MapAdultEvent">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionStartReplyMessage.Serialize">
             <summary>
-            Represents an Adult event
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.GridManager">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionStartReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Manages grid-wide tasks such as the world map
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_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 name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.FromAgentID">
+            <summary>Key of sender</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridRegion">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.FromAgentName">
+            <summary>Name of sender</summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.OnGridRegion(OpenMetaverse.GridRegionEventArgs)">
-            <summary>Raises the GridRegion event</summary>
-            <param name="e">A GridRegionEventArgs object containing the
-            data sent by simulator</param>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.ToAgentID">
+            <summary>Key of destination avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridRegionLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.ParentEstateID">
+            <summary>ID of originating estate</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridLayer">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.RegionID">
+            <summary>Key of originating region</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.Messages.Linden.ChatterBoxInvitationMessage.Position">
+            <summary>Coordinates in originating region</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridLayerLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Dialog">
+            <summary>Instant message type</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridItems">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.GroupIM">
+            <summary>Group IM session toggle</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.Messages.Linden.ChatterBoxInvitationMessage.IMSessionID">
+            <summary>Key of IM session, for Group Messages, the groups UUID</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridItemsLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Timestamp">
+            <summary>Timestamp of the instant message</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_RegionHandleReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Message">
+            <summary>Instant message text</summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.OnRegionHandleReply(OpenMetaverse.RegionHandleReplyEventArgs)">
-            <summary>Raises the RegionHandleReply event</summary>
-            <param name="e">A RegionHandleReplyEventArgs object containing the
-            data sent by simulator</param>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Offline">
+            <summary>Whether this message is held for offline avatars</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_RegionHandleReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.BinaryBucket">
+            <summary>Context specific packed data</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.Regions">
-            <summary>A dictionary of all the regions, indexed by region name</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Voice">
+            <summary>Is this invitation for voice group/conference chat</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.RegionsByHandle">
-            <summary>A dictionary of all the regions, indexed by region handle</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.GridManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Constructor
+            Deserialize the message
             </summary>
-            <param name="client">Instance of GridClient object to associate with this GridManager instance</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestMapLayer(OpenMetaverse.GridLayerType)">
+        <member name="T:OpenMetaverse.Messages.Linden.ChatterBoxSessionAgentListUpdatesMessage">
             <summary>
+            Sent from the simulator to the viewer.
+            
+            When an agent initially joins a session the AgentUpdatesBlock object will contain a list of session members including
+            a boolean indicating they can use voice chat in this session, a boolean indicating they are allowed to moderate 
+            this session, and lastly a string which indicates another agent is entering the session with the Transition set to "ENTER"
             
+            During the session lifetime updates on individuals are sent. During the update the booleans sent during the initial join are
+            excluded with the exception of the Transition field. This indicates a new user entering or exiting the session with
+            the string "ENTER" or "LEAVE" respectively.
             </summary>
-            <param name="layer"></param>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestMapRegion(System.String,OpenMetaverse.GridLayerType)">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionAgentListUpdatesMessage.Serialize">
             <summary>
-            Request a map layer
+            Serialize the object
             </summary>
-            <param name="regionName">The name of the region</param>
-            <param name="layer">The type of layer</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestMapBlocks(OpenMetaverse.GridLayerType,System.UInt16,System.UInt16,System.UInt16,System.UInt16,System.Boolean)">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionAgentListUpdatesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserialize the message
             </summary>
-            <param name="layer"></param>
-            <param name="minX"></param>
-            <param name="minY"></param>
-            <param name="maxX"></param>
-            <param name="maxY"></param>
-            <param name="returnNonExistent"></param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.GridManager.MapItems(System.UInt64,OpenMetaverse.GridItemType,OpenMetaverse.GridLayerType,System.Int32)">
+        <member name="T:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage">
             <summary>
-            
+            An EventQueue message sent when the agent is forcibly removed from a chatterbox session
             </summary>
-            <param name="regionHandle"></param>
-            <param name="item"></param>
-            <param name="layer"></param>
-            <param name="timeoutMS"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestMapItems(System.UInt64,OpenMetaverse.GridItemType,OpenMetaverse.GridLayerType)">
+        <member name="F:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.Reason">
             <summary>
-            
+            A string containing the reason the agent was removed
             </summary>
-            <param name="regionHandle"></param>
-            <param name="item"></param>
-            <param name="layer"></param>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestMainlandSims(OpenMetaverse.GridLayerType)">
+        <member name="F:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.SessionID">
             <summary>
-            Request data for all mainland (Linden managed) simulators
+            The ChatterBoxSession's SessionID
             </summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestRegionHandle(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.Serialize">
             <summary>
-            Request the region handle for the specified region UUID
+            Serialize the object
             </summary>
-            <param name="regionID">UUID of the region to look up</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.GridManager.GetGridRegion(System.String,OpenMetaverse.GridLayerType,OpenMetaverse.GridRegion@)">
+        <member name="M:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Get grid region information using the region name, this function
-            will block until it can find the region or gives up
+            Deserialize the message
             </summary>
-            <param name="name">Name of sim you're looking for</param>
-            <param name="layer">Layer that you are requesting</param>
-            <param name="region">Will contain a GridRegion for the sim you're
-            looking for if successful, otherwise an empty structure</param>
-            <returns>True if the GridRegion was successfully fetched, otherwise
-            false</returns>
-        </member>
-        <member name="M:OpenMetaverse.GridManager.MapBlockReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="M:OpenMetaverse.GridManager.MapItemReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="M:OpenMetaverse.GridManager.SimulatorViewerTimeMessageHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="M:OpenMetaverse.GridManager.CoarseLocationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="M:OpenMetaverse.GridManager.RegionHandleReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </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="M:OpenMetaverse.Messages.Linden.EventQueueAck.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="E:OpenMetaverse.GridManager.GridLayer">
-            <summary>Raised when the simulator sends GridLayer object containing
-            a map tile coordinates and texture information</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.EventQueueAck.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="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="M:OpenMetaverse.Messages.Linden.EventQueueEvent.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="E:OpenMetaverse.GridManager.RegionHandleReply">
-            <summary>Raised in response to a Region lookup</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.EventQueueEvent.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="P:OpenMetaverse.GridManager.SunPhase">
-            <summary>Unknown</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.EventQueueGetMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="P:OpenMetaverse.GridManager.SunDirection">
-            <summary>Current direction of the sun</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.EventQueueGetMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="P:OpenMetaverse.GridManager.SunAngVelocity">
-            <summary>Current angular velocity of the sun</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ViewerStatsMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="P:OpenMetaverse.GridManager.WorldTime">
-            <summary>Current world time</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ViewerStatsMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.LoginStatus">
+        <member name="T:OpenMetaverse.Messages.Linden.PlacesReplyMessage">
             <summary>
             
             </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.Failed">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Messages.Linden.PlacesReplyMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.None">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Messages.Linden.PlacesReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.ConnectingToLogin">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInformationMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.ReadingResponse">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInformationMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.ConnectingToSim">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Messages.Linden.DirLandReplyMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.Redirecting">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Messages.Linden.DirLandReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.Success">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectPhysicsPropertiesMessage">
+            <summary>
+            Event Queue message describing physics engine attributes of a list of objects
+            Sim sends these when object is selected
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.LoginParams">
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectPhysicsPropertiesMessage.ObjectPhysicsProperties">
+            <summary> Array with the list of physics properties</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectPhysicsPropertiesMessage.Serialize">
             <summary>
-            Login Request Parameters
+            Serializes the message
             </summary>
+            <returns>Serialized OSD</returns>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.URI">
-            <summary>The URL of the Login Server</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectPhysicsPropertiesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deseializes the message
+            </summary>
+            <param name="map">Incoming data to deserialize</param>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Timeout">
-            <summary>The number of milliseconds to wait before a login is considered
-            failed due to timeout</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage">
+            <summary>
+            A message sent from the viewer to the simulator which 
+            specifies that the user has changed current URL
+            of the specific media on a prim face
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.MethodName">
-            <summary>The request method</summary>
-            <remarks>login_to_simulator is currently the only supported method</remarks>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.URL">
+            <summary>
+            New URL
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.FirstName">
-            <summary>The Agents First name</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.PrimID">
+            <summary>
+            Prim UUID where navigation occured
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.LastName">
-            <summary>The Agents Last name</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.Face">
+            <summary>
+            Face index
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Password">
-            <summary>A md5 hashed password</summary>
-            <remarks>plaintext password will be automatically hashed</remarks>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Start">
-            <summary>The agents starting location once logged in</summary>
-            <remarks>Either "last", "home", or a string encoded URI 
-            containing the simulator name and x/y/z coordinates e.g: uri:hooper&amp;128&amp;152&amp;17</remarks>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Channel">
-            <summary>A string containing the client software channel information</summary>
-            <example>Second Life Release</example>
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaBlock">
+            <summary>Base class used for the ObjectMedia message</summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Version">
-            <summary>The client software version information</summary>
-            <remarks>The official viewer uses: Second Life Release n.n.n.n 
-            where n is replaced with the current version of the viewer</remarks>
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaRequest">
+            <summary>
+            Message used to retrive prim media data
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Platform">
-            <summary>A string containing the platform information the agent is running on</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaRequest.PrimID">
+            <summary>
+            Prim UUID
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.MAC">
-            <summary>A string hash of the network cards Mac Address</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaRequest.Verb">
+            <summary>
+            Requested operation, either GET or UPDATE
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.ViewerDigest">
-            <summary>Unknown or deprecated</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaRequest.Serialize">
+            <summary>
+            Serialize object
+            </summary>
+            <returns>Serialized object as OSDMap</returns>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.ID0">
-            <summary>A string hash of the first disk drives ID used to identify this clients uniqueness</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaRequest.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.UserAgent">
-            <summary>A string containing the viewers Software, this is not directly sent to the login server but 
-            instead is used to generate the Version string</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaResponse">
+            <summary>
+            Message used to update prim media data
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Author">
-            <summary>A string representing the software creator. This is not directly sent to the login server but
-            is used by the library to generate the Version information</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaResponse.PrimID">
+            <summary>
+            Prim UUID
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.AgreeToTos">
-            <summary>If true, this agent agrees to the Terms of Service of the grid its connecting to</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaResponse.FaceMedia">
+            <summary>
+            Array of media entries indexed by face number
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.ReadCritical">
-            <summary>Unknown</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaResponse.Version">
+            <summary>
+            Media version string
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Options">
-            <summary>An array of string sent to the login server to enable various options</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaResponse.Serialize">
+            <summary>
+            Serialize object
+            </summary>
+            <returns>Serialized object as OSDMap</returns>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.LoginID">
-            <summary>A randomly generated ID to distinguish between login attempts. This value is only used
-            internally in the library and is never sent over the wire</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaResponse.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.LoginParams.#ctor">
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaUpdate">
             <summary>
-            Default constuctor, initializes sane default values
+            Message used to update prim media data
             </summary>
         </member>
-        <member name="M:OpenMetaverse.LoginParams.#ctor(OpenMetaverse.GridClient,System.String,System.String,System.String,System.String,System.String)">
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.PrimID">
             <summary>
-            Instantiates new LoginParams object and fills in the values
+            Prim UUID
             </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="M:OpenMetaverse.LoginParams.#ctor(OpenMetaverse.GridClient,System.String,System.String,System.String,System.String,System.String,System.String)">
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.FaceMedia">
             <summary>
-            Instantiates new LoginParams object and fills in the values
+            Array of media entries indexed by face number
             </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="T:OpenMetaverse.LoginResponseData">
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.Verb">
             <summary>
-            The decoded data returned from the login server after a successful login
+            Requested operation, either GET or UPDATE
             </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginResponseData.Login">
-            <summary>true, false, indeterminate</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.Serialize">
+            <summary>
+            Serialize object
+            </summary>
+            <returns>Serialized object as OSDMap</returns>
         </member>
-        <member name="F:OpenMetaverse.LoginResponseData.Message">
-            <summary>Login message of the day</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.LoginResponseData.AgentAccess">
-            <summary>M or PG, also agent_region_access and agent_access_max</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaMessage">
+            <summary>
+            Message for setting or getting per face MediaEntry
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.LoginResponseData.Parse(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaMessage.Request">
+            <summary>The request or response details block</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaMessage.Serialize">
             <summary>
-            Parse LLSD Login Reply Data
+            Serialize the object
             </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>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.StatusCode">
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.StatusCode.OK">
-            <summary>OK</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectResourcesDetail">
+            <summary>Details about object resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.StatusCode.Done">
-            <summary>Transfer completed</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.ID">
+            <summary>Object UUID</summary>
         </member>
-        <member name="F:OpenMetaverse.StatusCode.Skip">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Name">
+            <summary>Object name</summary>
         </member>
-        <member name="F:OpenMetaverse.StatusCode.Abort">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.GroupOwned">
+            <summary>Indicates if object is group owned</summary>
         </member>
-        <member name="F:OpenMetaverse.StatusCode.Error">
-            <summary>Unknown error occurred</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Location">
+            <summary>Locatio of the object</summary>
         </member>
-        <member name="F:OpenMetaverse.StatusCode.UnknownSource">
-            <summary>Equivalent to a 404 error</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.OwnerID">
+            <summary>Object owner</summary>
         </member>
-        <member name="F:OpenMetaverse.StatusCode.InsufficientPermissions">
-            <summary>Client does not have permission for that resource</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Resources">
+            <summary>Resource usage, keys are resource names, values are resource usage for that specific resource</summary>
         </member>
-        <member name="F:OpenMetaverse.StatusCode.Unknown">
-            <summary>Unknown status</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserializes object from OSD
+            </summary>
+            <param name="obj">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.ChannelType">
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.FromOSD(OpenMetaverse.StructuredData.OSD)">
             <summary>
-            
+            Makes an instance based on deserialized data
             </summary>
+            <param name="osd"><see cref="T:OpenMetaverse.StructuredData.OSD"/> serialized data</param>
+            <returns>Instance containg deserialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.ChannelType.Unknown">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Messages.Linden.ParcelResourcesDetail">
+            <summary>Details about parcel resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.ChannelType.Misc">
-            <summary>Unknown</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.ID">
+            <summary>Parcel UUID</summary>
         </member>
-        <member name="F:OpenMetaverse.ChannelType.Asset">
-            <summary>Virtually all asset transfers use this channel</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.LocalID">
+            <summary>Parcel local ID</summary>
         </member>
-        <member name="T:OpenMetaverse.SourceType">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.Name">
+            <summary>Parcel name</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.GroupOwned">
+            <summary>Indicates if parcel is group owned</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.OwnerID">
+            <summary>Parcel owner</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.Objects">
+            <summary>Array of <see cref="T:OpenMetaverse.Messages.Linden.ObjectResourcesDetail"/> containing per object resource usage</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserializes object from OSD
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.SourceType.Unknown">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.FromOSD(OpenMetaverse.StructuredData.OSD)">
+            <summary>
+            Makes an instance based on deserialized data
+            </summary>
+            <param name="osd"><see cref="T:OpenMetaverse.StructuredData.OSD"/> serialized data</param>
+            <returns>Instance containg deserialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.SourceType.Asset">
-            <summary>Asset from the asset server</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.BaseResourcesInfo">
+            <summary>Resource usage base class, both agent and parcel resource
+            usage contains summary information</summary>
         </member>
-        <member name="F:OpenMetaverse.SourceType.SimInventoryItem">
-            <summary>Inventory item</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.BaseResourcesInfo.SummaryAvailable">
+            <summary>Summary of available resources, keys are resource names,
+            values are resource usage for that specific resource</summary>
         </member>
-        <member name="F:OpenMetaverse.SourceType.SimEstate">
-            <summary>Estate asset, such as an estate covenant</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.BaseResourcesInfo.SummaryUsed">
+            <summary>Summary resource usage, keys are resource names,
+            values are resource usage for that specific resource</summary>
         </member>
-        <member name="T:OpenMetaverse.TargetType">
+        <member name="M:OpenMetaverse.Messages.Linden.BaseResourcesInfo.Serialize">
             <summary>
-            
+            Serializes object
             </summary>
+            <returns><see cref="T:OpenMetaverse.StructuredData.OSDMap"/> serialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.TargetType.Unknown">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Messages.Linden.BaseResourcesInfo.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserializes object from OSD
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.TargetType.File">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage">
+            <summary>Agent resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.TargetType.VFile">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.Attachments">
+            <summary>Per attachment point object resource usage</summary>
         </member>
-        <member name="T:OpenMetaverse.ImageType">
+        <member name="M:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserializes object from OSD
             </summary>
+            <param name="osd">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.ImageType.Normal">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.ImageType.Baked">
-            <summary></summary>
-        </member>
-        <member name="T:OpenMetaverse.ImageCodec">
+        <member name="M:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.FromOSD(OpenMetaverse.StructuredData.OSD)">
             <summary>
-            Image file format
+            Makes an instance based on deserialized data
             </summary>
+            <param name="osd"><see cref="T:OpenMetaverse.StructuredData.OSD"/> serialized data</param>
+            <returns>Instance containg deserialized data</returns>
         </member>
-        <member name="T:OpenMetaverse.Transfer">
+        <member name="M:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.GetMessageHandler(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Detects which class handles deserialization of this message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <returns>Object capable of decoding this message</returns>
         </member>
-        <member name="P:OpenMetaverse.Transfer.TimeSinceLastPacket">
-            <summary>Number of milliseconds passed since the last transfer
-            packet was received</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.LandResourcesRequest">
+            <summary>Request message for parcel resource usage</summary>
         </member>
-        <member name="T:OpenMetaverse.AssetDownload">
+        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesRequest.ParcelID">
+            <summary>UUID of the parel to request resource usage info</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesRequest.Serialize">
             <summary>
-            
+            Serializes object
             </summary>
+            <returns><see cref="T:OpenMetaverse.StructuredData.OSDMap"/> serialized data</returns>
         </member>
-        <member name="T:OpenMetaverse.XferDownload">
+        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesRequest.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserializes object from OSD
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.ImageDownload">
+        <member name="T:OpenMetaverse.Messages.Linden.LandResourcesMessage">
+            <summary>Response message for parcel resource usage</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesMessage.ScriptResourceDetails">
+            <summary>URL where parcel resource usage details can be retrieved</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesMessage.ScriptResourceSummary">
+            <summary>URL where parcel resource usage summary can be retrieved</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesMessage.Serialize">
             <summary>
-            
+            Serializes object
             </summary>
+            <returns><see cref="T:OpenMetaverse.StructuredData.OSDMap"/> serialized data</returns>
         </member>
-        <member name="T:OpenMetaverse.AssetUpload">
+        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserializes object from OSD
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.ImageRequest">
+        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesMessage.GetMessageHandler(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Detects which class handles deserialization of this message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <returns>Object capable of decoding this message</returns>
         </member>
-        <member name="M:OpenMetaverse.ImageRequest.#ctor(OpenMetaverse.UUID,OpenMetaverse.ImageType,System.Single,System.Int32)">
+        <member name="T:OpenMetaverse.Messages.Linden.LandResourcesInfo">
+            <summary>Parcel resource usage</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesInfo.Parcels">
+            <summary>Array of <see cref="T:OpenMetaverse.Messages.Linden.ParcelResourcesDetail"/> containing per percal resource usage</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesInfo.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserializes object from OSD
             </summary>
-            <param name="imageid"></param>
-            <param name="type"></param>
-            <param name="priority"></param>
-            <param name="discardLevel"></param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.AssetManager">
+        <member name="T:OpenMetaverse.Messages.Linden.GetDisplayNamesMessage">
             <summary>
-            
+            Reply to request for bunch if display names
             </summary>
         </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="F:OpenMetaverse.Messages.Linden.GetDisplayNamesMessage.Agents">
+            <summary> Current display name </summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_XferReceivedEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.GetDisplayNamesMessage.BadIDs">
+            <summary> Following UUIDs failed to return a valid display name </summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.OnXferReceived(OpenMetaverse.XferReceivedEventArgs)">
-            <summary>Raises the XferReceived event</summary>
-            <param name="e">A XferReceivedEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="M:OpenMetaverse.Messages.Linden.GetDisplayNamesMessage.Serialize">
+            <summary>
+            Serializes the message
+            </summary>
+            <returns>OSD containting the messaage</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_XferReceivedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.SetDisplayNameMessage">
+            <summary>
+            Message sent when requesting change of the display name
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_AssetUploadedEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameMessage.OldDisplayName">
+            <summary> Current display name </summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.OnAssetUploaded(OpenMetaverse.AssetUploadEventArgs)">
-            <summary>Raises the AssetUploaded event</summary>
-            <param name="e">A AssetUploadedEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameMessage.NewDisplayName">
+            <summary> Desired new display name </summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_AssetUploadedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.SetDisplayNameMessage.Serialize">
+            <summary>
+            Serializes the message
+            </summary>
+            <returns>OSD containting the messaage</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_UploadProgressEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage">
+            <summary>
+            Message recieved in response to request to change display name
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.OnUploadProgress(OpenMetaverse.AssetUploadEventArgs)">
-            <summary>Raises the UploadProgress event</summary>
-            <param name="e">A UploadProgressEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage.DisplayName">
+            <summary> New display name </summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_UploadProgressLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage.Reason">
+            <summary> String message indicating the result of the operation </summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_InitiateDownloadEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage.Status">
+            <summary> Numerical code of the result, 200 indicates success </summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.OnInitiateDownload(OpenMetaverse.InitiateDownloadEventArgs)">
-            <summary>Raises the InitiateDownload event</summary>
-            <param name="e">A InitiateDownloadEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="M:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage.Serialize">
+            <summary>
+            Serializes the message
+            </summary>
+            <returns>OSD containting the messaage</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_InitiateDownloadLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.DisplayNameUpdateMessage">
+            <summary>
+            Message recieved when someone nearby changes their display name
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_ImageReceiveProgressEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.DisplayNameUpdateMessage.OldDisplayName">
+            <summary> Previous display name, empty string if default </summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.OnImageReceiveProgress(OpenMetaverse.ImageReceiveProgressEventArgs)">
-            <summary>Raises the ImageReceiveProgress event</summary>
-            <param name="e">A ImageReceiveProgressEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.Messages.Linden.DisplayNameUpdateMessage.DisplayName">
+            <summary> New display name </summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_ImageReceiveProgressLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.DisplayNameUpdateMessage.Serialize">
+            <summary>
+            Serializes the message
+            </summary>
+            <returns>OSD containting the messaage</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.Cache">
-            <summary>Texture download cache</summary>
+        <member name="T:OpenMetaverse.Assets.AssetsArchiver">
+            <summary>
+            Archives assets
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="F:OpenMetaverse.Assets.AssetsArchiver.m_assets">
             <summary>
-            Default constructor
+            Archive assets
             </summary>
-            <param name="client">A reference to the GridClient object</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.AssetManager.AssetReceivedCallback)">
+        <member name="M:OpenMetaverse.Assets.AssetsArchiver.Archive(OpenMetaverse.Assets.TarArchiveWriter)">
             <summary>
-            Request an asset download
+            Archive the assets given to this archiver to the given archive.
             </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>
+            <param name="archive"></param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.SourceType,OpenMetaverse.AssetManager.AssetReceivedCallback)">
+        <member name="M:OpenMetaverse.Assets.AssetsArchiver.WriteMetadata(OpenMetaverse.Assets.TarArchiveWriter)">
             <summary>
-            Request an asset download
+            Write an assets metadata file to the given archive
             </summary>
-            <param name="assetID">Asset UUID</param>
-            <param name="type">Asset type, must be correct for the transfer to succeed</param>
-            <param name="priority">Whether to give this transfer an elevated priority</param>
-            <param name="sourceType">Source location of the requested asset</param>
-            <param name="callback">The callback to fire when the simulator responds with the asset data</param>
+            <param name="archive"></param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.SourceType,OpenMetaverse.UUID,OpenMetaverse.AssetManager.AssetReceivedCallback)">
+        <member name="M:OpenMetaverse.Assets.AssetsArchiver.WriteData(OpenMetaverse.Assets.TarArchiveWriter)">
             <summary>
-            Request an asset download
+            Write asset data files to the given archive
             </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>
+            <param name="archive"></param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestAssetXfer(System.String,System.Boolean,System.Boolean,OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean)">
+        <member name="T:OpenMetaverse.Assets.ArchiveConstants">
             <summary>
-            Request an asset download through the almost deprecated Xfer system
+            Constants for the archiving module
             </summary>
-            <param name="filename">Filename of the asset to request</param>
-            <param name="deleteOnCompletion">Whether or not to delete the asset
-            off the server after it is retrieved</param>
-            <param name="useBigPackets">Use large transfer packets or not</param>
-            <param name="vFileID">UUID of the file to request, if filename is
-            left empty</param>
-            <param name="vFileType">Asset type of <code>vFileID</code>, or
-            <code>AssetType.Unknown</code> if filename is not empty</param>
-            <param name="fromCache">Sets the FilePath in the request to Cache
-            (4) if true, otherwise Unknown (0) is used</param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestInventoryAsset(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.AssetManager.AssetReceivedCallback)">
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.CONTROL_FILE_PATH">
             <summary>
-            
+            The location of the archive control file
             </summary>
-            <param name="assetID">Use UUID.Zero if you do not have the 
-            asset ID but have all the necessary permissions</param>
-            <param name="itemID">The item ID of this asset in the inventory</param>
-            <param name="taskID">Use UUID.Zero if you are not requesting an 
-            asset from an object inventory</param>
-            <param name="ownerID">The owner of this asset</param>
-            <param name="type">Asset type</param>
-            <param name="priority">Whether to prioritize this asset download or not</param>
-            <param name="callback"></param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.SetPendingAssetUploadData(OpenMetaverse.AssetUpload)">
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSETS_PATH">
             <summary>
-            Used to force asset data into the PendingUpload property, ie: for raw terrain uploads
+            Path for the assets held in an archive
             </summary>
-            <param name="assetData">An AssetUpload object containing the data to upload to the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.Assets.Asset,System.Boolean)">
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.OBJECTS_PATH">
             <summary>
-            Request an asset be uploaded to the simulator
+            Path for the prims file
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.TERRAINS_PATH">
+            <summary>
+            Path for terrains.  Technically these may be assets, but I think it's quite nice to split them out.
             </summary>
-            <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.AssetManager.RequestUpload(OpenMetaverse.AssetType,System.Byte[],System.Boolean)">
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.SETTINGS_PATH">
             <summary>
-            Request an asset be uploaded to the simulator
+            Path for region settings.
             </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>
-        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.UUID@,OpenMetaverse.AssetType,System.Byte[],System.Boolean)">
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSET_EXTENSION_SEPARATOR">
             <summary>
-            Request an asset be uploaded to the simulator
+            The character the separates the uuid from extension information in an archived asset filename
             </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>
-        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.UUID@,OpenMetaverse.AssetType,System.Byte[],System.Boolean,OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSET_TYPE_TO_EXTENSION">
             <summary>
-            Initiate an asset upload
+            Extensions used for asset types in the archive
             </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>
-        <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;
+        <member name="T:ThreadUtil">
+            <summary>
             
-                     if (state == TextureRequestState.Finished)
-                     {
-                         OpenJPEG.DecodeToImage(assetTexture.AssetData, out imgData, out bitmap);
-                         picInsignia.Image = bitmap;
-                     }               
-                 }
-             }
-             </code>
-             </example>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.TextureDownloadCallback)">
+        <member name="F:ThreadUtil.wrapperInstance">
             <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
+            An instance of DelegateWrapper which calls InvokeWrappedDelegate,
+            which in turn calls the DynamicInvoke method of the wrapped
+            delegate
             </summary>
-            <param name="textureID">The <see cref="T:OpenMetaverse.UUID"/> of the texture asset to download</param>
-            <param name="callback">The <see cref="T:OpenMetaverse.TextureDownloadCallback"/> callback to fire when the image is retrieved. The callback
-            will contain the result of the request and the texture asset data</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,OpenMetaverse.TextureDownloadCallback)">
+        <member name="F:ThreadUtil.callback">
             <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
+            Callback used to call EndInvoke on the asynchronously
+            invoked DelegateWrapper
             </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>
-        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,OpenMetaverse.TextureDownloadCallback,System.Boolean)">
+        <member name="M:ThreadUtil.FireAndForget(System.Delegate,System.Object[])">
             <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
+            Executes the specified delegate with the specified arguments
+            asynchronously on a thread pool thread
             </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>
+            <param name="d"></param>
+            <param name="args"></param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestImageCancel(OpenMetaverse.UUID)">
+        <member name="M:ThreadUtil.InvokeWrappedDelegate(System.Delegate,System.Object[])">
             <summary>
-            Cancel a texture request
+            Invokes the wrapped delegate synchronously
             </summary>
-            <param name="textureID">The texture assets <see cref="T:OpenMetaverse.UUID"/></param>
+            <param name="d"></param>
+            <param name="args"></param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestMesh(OpenMetaverse.UUID,OpenMetaverse.AssetManager.MeshDownloadCallback)">
+        <member name="M:ThreadUtil.EndWrapperInvoke(System.IAsyncResult)">
             <summary>
-            Requests download of a mesh asset
+            Calls EndInvoke on the wrapper and Close on the resulting WaitHandle
+            to prevent resource leaks
             </summary>
-            <param name="meshID">UUID of the mesh asset</param>
-            <param name="callback">Callback when the request completes</param>
+            <param name="ar"></param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.FireImageProgressEvent(OpenMetaverse.UUID,System.Int32,System.Int32)">
+        <member name="T:ThreadUtil.DelegateWrapper">
             <summary>
-            Lets TexturePipeline class fire the progress event
+            Delegate to wrap another delegate and its arguments
             </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>
-        <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.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.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>
+            <param name="d"></param>
+            <param name="args"></param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestXferHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.UDPPacketBuffer.BUFFER_SIZE">
+            <summary>Size of the byte array used to store raw packet data</summary>
         </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="F:OpenMetaverse.UDPPacketBuffer.Data">
+            <summary>Raw packet data buffer</summary>
         </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="F:OpenMetaverse.UDPPacketBuffer.DataLength">
+            <summary>Length of the data to transmit</summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.SendXferPacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.UDPPacketBuffer.RemoteEndPoint">
+            <summary>EndPoint of the remote host</summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.AbortXferHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.UDPPacketBuffer.#ctor">
+            <summary>
+            Create an allocated UDP packet buffer for receiving a packet
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.AssetManager.XferReceived">
-            <summary>Raised when the simulator responds sends </summary>
+        <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>
-        <member name="E:OpenMetaverse.AssetManager.AssetUploaded">
-            <summary>Raised during upload completes</summary>
+        <member name="M:OpenMetaverse.UDPPacketBuffer.#ctor(System.Net.IPEndPoint,System.Int32)">
+            <summary>
+            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="E:OpenMetaverse.AssetManager.UploadProgress">
-            <summary>Raised during upload with progres update</summary>
+        <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>
-        <member name="E:OpenMetaverse.AssetManager.InitiateDownload">
-            <summary>Fired when the simulator sends an InitiateDownloadPacket, used to download terrain .raw files</summary>
+        <member name="M:OpenMetaverse.PacketBufferPool.#ctor(System.Net.IPEndPoint,System.Int32,System.Int32)">
+            <summary>
+            Initialize the object pool in client mode
+            </summary>
+            <param name="endPoint">Server to connect to</param>
+            <param name="itemsPerSegment"></param>
+            <param name="minSegments"></param>
         </member>
-        <member name="E:OpenMetaverse.AssetManager.ImageReceiveProgress">
-            <summary>Fired when a texture is in the process of being downloaded by the TexturePipeline class</summary>
+        <member name="M:OpenMetaverse.PacketBufferPool.#ctor(System.Int32,System.Int32)">
+            <summary>
+            Initialize the object pool in server mode
+            </summary>
+            <param name="itemsPerSegment"></param>
+            <param name="minSegments"></param>
         </member>
-        <member name="T:OpenMetaverse.AssetManager.AssetReceivedCallback">
+        <member name="M:OpenMetaverse.PacketBufferPool.GetObjectInstance">
             <summary>
-            Callback used for various asset download requests
+            Returns a packet buffer with EndPoint set if the buffer is in
+            client mode, or with EndPoint set to null in server mode
             </summary>
-            <param name="transfer">Transfer information</param>
-            <param name="asset">Downloaded asset, null on fail</param>
+            <returns>Initialized UDPPacketBuffer object</returns>
         </member>
-        <member name="T:OpenMetaverse.AssetManager.BakedTextureUploadedCallback">
+        <member name="M:OpenMetaverse.Pool.#cctor">
             <summary>
-            Callback used upon competition of baked texture upload
+            Default constructor
             </summary>
-            <param name="newAssetID">Asset UUID of the newly uploaded baked texture</param>
         </member>
-        <member name="T:OpenMetaverse.AssetManager.MeshDownloadCallback">
+        <member name="M:OpenMetaverse.Pool.CheckOut">
             <summary>
-            A callback that fires upon the completition of the RequestMesh call
+            Check a packet buffer out of the pool
             </summary>
-            <param name="success">Was the download successfull</param>
-            <param name="assetMesh">Resulting mesh or null on problems</param>
-        </member>
-        <member name="P:OpenMetaverse.XferReceivedEventArgs.Xfer">
-            <summary>Xfer data</summary>
+            <returns>A packet buffer object</returns>
         </member>
-        <member name="P:OpenMetaverse.AssetUploadEventArgs.Upload">
-            <summary>Upload data</summary>
+        <member name="M:OpenMetaverse.CoordinateFrame.LookDirection(OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
+            <summary>
+            
+            </summary>
+            <param name="at">Looking direction, must be a normalized vector</param>
+            <param name="upDirection">Up direction, must be a normalized vector</param>
         </member>
-        <member name="P:OpenMetaverse.InitiateDownloadEventArgs.SimFileName">
-            <summary>Filename used on the simulator</summary>
+        <member name="M:OpenMetaverse.CoordinateFrame.LookDirection(System.Double)">
+            <summary>
+            Align the coordinate frame X and Y axis with a given rotation
+            around the Z axis in radians
+            </summary>
+            <param name="heading">Absolute rotation around the Z axis in
+            radians</param>
         </member>
-        <member name="P:OpenMetaverse.InitiateDownloadEventArgs.ViewerFileName">
-            <summary>Filename used by the client</summary>
+        <member name="P:OpenMetaverse.CoordinateFrame.Origin">
+            <summary>Origin position of this coordinate frame</summary>
         </member>
-        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.ImageID">
-            <summary>UUID of the image that is in progress</summary>
+        <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.ImageReceiveProgressEventArgs.Received">
-            <summary>Number of bytes received so far</summary>
+        <member name="P:OpenMetaverse.CoordinateFrame.YAxis">
+            <summary>Y axis of this coordinate frame, or Left in grid terms</summary>
         </member>
-        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.Total">
-            <summary>Image size in bytes</summary>
+        <member name="P:OpenMetaverse.CoordinateFrame.ZAxis">
+            <summary>Z axis of this coordinate frame, or Up in grid terms</summary>
         </member>
         <member name="T:OpenMetaverse.Animations">
             <summary>
@@ -23401,1668 +23985,2153 @@
         <member name="F:OpenMetaverse.Animations.PUNCH_RIGHT">
             <summary>Agent punching with right hand</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.REPULSED">
-            <summary>Agent acting repulsed</summary>
+        <member name="F:OpenMetaverse.Animations.REPULSED">
+            <summary>Agent acting repulsed</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.ROUNDHOUSE_KICK">
+            <summary>Agent trying to be Chuck Norris</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.RPS_COUNTDOWN">
+            <summary>Rocks, Paper, Scissors 1, 2, 3</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.RPS_PAPER">
+            <summary>Agent with hand flat over other hand</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.RPS_ROCK">
+            <summary>Agent with fist over other hand</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.RPS_SCISSORS">
+            <summary>Agent with two fingers spread over other hand</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.RUN">
+            <summary>Agent running</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SAD">
+            <summary>Agent appearing sad</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SALUTE">
+            <summary>Agent saluting</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SHOOT_BOW_L">
+            <summary>Agent shooting bow (left handed)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SHOUT">
+            <summary>Agent cupping mouth as if shouting</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SHRUG">
+            <summary>Agent shrugging shoulders</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SIT">
+            <summary>Agent in sit position</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SIT_FEMALE">
+            <summary>Agent in sit position (feminine)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SIT_GENERIC">
+            <summary>Agent in sit position (generic)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SIT_GROUND">
+            <summary>Agent sitting on ground</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SIT_GROUND_staticRAINED">
+            <summary>Agent sitting on ground</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SIT_TO_STAND">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SLEEP">
+            <summary>Agent sleeping on side</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SMOKE_IDLE">
+            <summary>Agent smoking</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SMOKE_INHALE">
+            <summary>Agent inhaling smoke</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SMOKE_THROW_DOWN">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SNAPSHOT">
+            <summary>Agent taking a picture</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.STAND">
+            <summary>Agent standing</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.STANDUP">
+            <summary>Agent standing up</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.STAND_1">
+            <summary>Agent standing</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.STAND_2">
+            <summary>Agent standing</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.STAND_3">
+            <summary>Agent standing</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.STAND_4">
+            <summary>Agent standing</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.STRETCH">
+            <summary>Agent stretching</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.STRIDE">
+            <summary>Agent in stride (fast walk)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SURF">
+            <summary>Agent surfing</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SURPRISE">
+            <summary>Agent acting surprised</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SWORD_STRIKE">
+            <summary>Agent striking with a sword</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.TALK">
+            <summary>Agent talking (lips moving)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.TANTRUM">
+            <summary>Agent throwing a tantrum</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.THROW_R">
+            <summary>Agent throwing an object (right handed)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.TRYON_SHIRT">
+            <summary>Agent trying on a shirt</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.TURNLEFT">
+            <summary>Agent turning to the left</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.TURNRIGHT">
+            <summary>Agent turning to the right</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.TYPE">
+            <summary>Agent typing</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.WALK">
+            <summary>Agent walking</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.WHISPER">
+            <summary>Agent whispering</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.WHISTLE">
+            <summary>Agent whispering with fingers in mouth</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.WINK">
+            <summary>Agent winking</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.WINK_HOLLYWOOD">
+            <summary>Agent winking</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.WORRY">
+            <summary>Agent worried</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.YES">
+            <summary>Agent nodding yes</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.YES_HAPPY">
+            <summary>Agent nodding yes with happy face</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.YOGA_FLOAT">
+            <summary>Agent floating with legs and arms crossed</summary>
+        </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>
+        <member name="M:OpenMetaverse.Voice.VoiceParticipant.IDFromName(System.String)">
+            <summary>
+            Extract the avatar UUID encoded in a SIP URI
+            </summary>
+            <param name="inName"></param>
+            <returns></returns>
+        </member>
+        <member name="T:OpenMetaverse.MediaPermission">
+            <summary>
+            Permissions for control of object media
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.MediaControls">
+            <summary>
+            Style of cotrols that shold be displayed to the user
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.MediaEntry">
+            <summary>
+            Class representing media data for a single face
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.EnableAlterntiveImage">
+            <summary>Is display of the alternative image enabled</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.AutoLoop">
+            <summary>Should media auto loop</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.AutoPlay">
+            <summary>Shoule media be auto played</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.AutoScale">
+            <summary>Auto scale media to prim face</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.AutoZoom">
+            <summary>Should viewer automatically zoom in on the face when clicked</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.InteractOnFirstClick">
+            <summary>Should viewer interpret first click as interaction with the media
+            or when false should the first click be treated as zoom in commadn</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.Controls">
+            <summary>Style of controls viewer should display when
+            viewer media on this face</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.ROUNDHOUSE_KICK">
-            <summary>Agent trying to be Chuck Norris</summary>
+        <member name="F:OpenMetaverse.MediaEntry.HomeURL">
+            <summary>Starting URL for the media</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.RPS_COUNTDOWN">
-            <summary>Rocks, Paper, Scissors 1, 2, 3</summary>
+        <member name="F:OpenMetaverse.MediaEntry.CurrentURL">
+            <summary>Currently navigated URL</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.RPS_PAPER">
-            <summary>Agent with hand flat over other hand</summary>
+        <member name="F:OpenMetaverse.MediaEntry.Height">
+            <summary>Media height in pixes</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.RPS_ROCK">
-            <summary>Agent with fist over other hand</summary>
+        <member name="F:OpenMetaverse.MediaEntry.Width">
+            <summary>Media width in pixels</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.RPS_SCISSORS">
-            <summary>Agent with two fingers spread over other hand</summary>
+        <member name="F:OpenMetaverse.MediaEntry.ControlPermissions">
+            <summary>Who can controls the media</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.RUN">
-            <summary>Agent running</summary>
+        <member name="F:OpenMetaverse.MediaEntry.InteractPermissions">
+            <summary>Who can interact with the media</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SAD">
-            <summary>Agent appearing sad</summary>
+        <member name="F:OpenMetaverse.MediaEntry.EnableWhiteList">
+            <summary>Is URL whitelist enabled</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SALUTE">
-            <summary>Agent saluting</summary>
+        <member name="F:OpenMetaverse.MediaEntry.WhiteList">
+            <summary>Array of URLs that are whitelisted</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SHOOT_BOW_L">
-            <summary>Agent shooting bow (left handed)</summary>
+        <member name="M:OpenMetaverse.MediaEntry.GetOSD">
+            <summary>
+            Serialize to OSD
+            </summary>
+            <returns>OSDMap with the serialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.SHOUT">
-            <summary>Agent cupping mouth as if shouting</summary>
+        <member name="M:OpenMetaverse.MediaEntry.FromOSD(OpenMetaverse.StructuredData.OSD)">
+            <summary>
+            Deserialize from OSD data
+            </summary>
+            <param name="osd">Serialized OSD data</param>
+            <returns>Deserialized object</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.SHRUG">
-            <summary>Agent shrugging shoulders</summary>
+        <member name="T:OpenMetaverse.Imaging.OpenJPEG">
+            <summary>
+            A Wrapper around openjpeg to encode and decode images to and from byte arrays
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT">
-            <summary>Agent in sit position</summary>
+        <member name="F:OpenMetaverse.Imaging.OpenJPEG.TGA_HEADER_SIZE">
+            <summary>TGA Header size</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT_FEMALE">
-            <summary>Agent in sit position (feminine)</summary>
+        <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="F:OpenMetaverse.Animations.SIT_GENERIC">
-            <summary>Agent in sit position (generic)</summary>
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.Encode(OpenMetaverse.Imaging.ManagedImage,System.Boolean)">
+            <summary>
+            Encode a <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object into a byte array
+            </summary>
+            <param name="image">The <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object to encode</param>
+            <param name="lossless">true to enable lossless conversion, only useful for small images ie: sculptmaps</param>
+            <returns>A byte array containing the encoded Image object</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT_GROUND">
-            <summary>Agent sitting on ground</summary>
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.Encode(OpenMetaverse.Imaging.ManagedImage)">
+            <summary>
+            Encode a <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object into a byte array
+            </summary>
+            <param name="image">The <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object to encode</param>
+            <returns>a byte array of the encoded image</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT_GROUND_staticRAINED">
-            <summary>Agent sitting on ground</summary>
+        <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>
-        <member name="F:OpenMetaverse.Animations.SIT_TO_STAND">
-            <summary></summary>
+        <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>
-        <member name="F:OpenMetaverse.Animations.SLEEP">
-            <summary>Agent sleeping on side</summary>
+        <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>
-        <member name="F:OpenMetaverse.Animations.SMOKE_IDLE">
-            <summary>Agent smoking</summary>
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.EncodeFromImage(System.Drawing.Bitmap,System.Boolean)">
+            <summary>
+            Encode a <seealso cref="T:System.Drawing.Bitmap"/> object into a byte array
+            </summary>
+            <param name="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="F:OpenMetaverse.Animations.SMOKE_INHALE">
-            <summary>Agent inhaling smoke</summary>
+        <member name="T:OpenMetaverse.Imaging.OpenJPEG.J2KLayerInfo">
+            <summary>
+            Defines the beginning and ending file positions of a layer in an
+            LRCP-progression JPEG2000 file
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SMOKE_THROW_DOWN">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Imaging.OpenJPEG.MarshalledImage">
+            <summary>
+            This structure is used to marshal both encoded and decoded images.
+            MUST MATCH THE STRUCT IN dotnet.h!
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SNAPSHOT">
-            <summary>Agent taking a picture</summary>
+        <member name="T:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket">
+            <summary>
+            Information about a single packet in a JPEG2000 stream
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.STAND">
-            <summary>Agent standing</summary>
+        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.start_pos">
+            <summary>Packet start position</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.STANDUP">
-            <summary>Agent standing up</summary>
+        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.end_ph_pos">
+            <summary>Packet header end position</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.STAND_1">
-            <summary>Agent standing</summary>
+        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.end_pos">
+            <summary>Packet end position</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.STAND_2">
-            <summary>Agent standing</summary>
+        <member name="T:OpenMetaverse.Assets.AssetTexture">
+            <summary>
+            Represents a texture
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.STAND_3">
-            <summary>Agent standing</summary>
+        <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.Animations.STAND_4">
-            <summary>Agent standing</summary>
+        <member name="F:OpenMetaverse.Assets.AssetTexture.LayerInfo">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.STRETCH">
-            <summary>Agent stretching</summary>
+        <member name="F:OpenMetaverse.Assets.AssetTexture.Components">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.STRIDE">
-            <summary>Agent in stride (fast walk)</summary>
+        <member name="M:OpenMetaverse.Assets.AssetTexture.#ctor">
+            <summary>Initializes a new instance of an AssetTexture object</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SURF">
-            <summary>Agent surfing</summary>
+        <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.Animations.SURPRISE">
-            <summary>Agent acting surprised</summary>
+        <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.Animations.SWORD_STRIKE">
-            <summary>Agent striking with a sword</summary>
+        <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.Animations.TALK">
-            <summary>Agent talking (lips moving)</summary>
+        <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="F:OpenMetaverse.Animations.TANTRUM">
-            <summary>Agent throwing a tantrum</summary>
+        <member name="M:OpenMetaverse.Assets.AssetTexture.DecodeLayerBoundaries">
+            <summary>
+            Decodes the begin and end byte positions for each quality layer in
+            the image
+            </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.THROW_R">
-            <summary>Agent throwing an object (right handed)</summary>
+        <member name="P:OpenMetaverse.Assets.AssetTexture.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.TRYON_SHIRT">
-            <summary>Agent trying on a shirt</summary>
+        <member name="T:OpenMetaverse.Assets.AssetBodypart">
+            <summary>
+            Represents an <seealso cref="T:OpenMetaverse.Assets.AssetWearable"/> that represents an avatars body ie: Hair, Etc.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.TURNLEFT">
-            <summary>Agent turning to the left</summary>
+        <member name="M:OpenMetaverse.Assets.AssetBodypart.#ctor">
+            <summary>Initializes a new instance of an AssetBodyPart object</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.TURNRIGHT">
-            <summary>Agent turning to the right</summary>
+        <member name="M:OpenMetaverse.Assets.AssetBodypart.#ctor(OpenMetaverse.UUID,System.Byte[])">
+            <summary>Initializes a new instance of an AssetBodyPart object with parameters</summary>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.TYPE">
-            <summary>Agent typing</summary>
+        <member name="P:OpenMetaverse.Assets.AssetBodypart.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.WALK">
-            <summary>Agent walking</summary>
+        <member name="T:OpenMetaverse.FriendRights">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.WHISPER">
-            <summary>Agent whispering</summary>
+        <member name="F:OpenMetaverse.FriendRights.None">
+            <summary>The avatar has no rights</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.WHISTLE">
-            <summary>Agent whispering with fingers in mouth</summary>
+        <member name="F:OpenMetaverse.FriendRights.CanSeeOnline">
+            <summary>The avatar can see the online status of the target avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.WINK">
-            <summary>Agent winking</summary>
+        <member name="F:OpenMetaverse.FriendRights.CanSeeOnMap">
+            <summary>The avatar can see the location of the target avatar on the map</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.WINK_HOLLYWOOD">
-            <summary>Agent winking</summary>
+        <member name="F:OpenMetaverse.FriendRights.CanModifyObjects">
+            <summary>The avatar can modify the ojects of the target avatar </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.WORRY">
-            <summary>Agent worried</summary>
+        <member name="T:OpenMetaverse.FriendInfo">
+            <summary>
+            This class holds information about an avatar in the friends list.  There are two ways 
+            to interface to this class.  The first is through the set of boolean properties.  This is the typical
+            way clients of this class will use it.  The second interface is through two bitflag properties,
+            TheirFriendsRights and MyFriendsRights
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.YES">
-            <summary>Agent nodding yes</summary>
+        <member name="M:OpenMetaverse.FriendInfo.#ctor(OpenMetaverse.UUID,OpenMetaverse.FriendRights,OpenMetaverse.FriendRights)">
+            <summary>
+            Used internally when building the initial list of friends at login time
+            </summary>
+            <param name="id">System ID of the avatar being prepesented</param>
+            <param name="theirRights">Rights the friend has to see you online and to modify your objects</param>
+            <param name="myRights">Rights you have to see your friend online and to modify their objects</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.YES_HAPPY">
-            <summary>Agent nodding yes with happy face</summary>
+        <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="F:OpenMetaverse.Animations.YOGA_FLOAT">
-            <summary>Agent floating with legs and arms crossed</summary>
+        <member name="P:OpenMetaverse.FriendInfo.UUID">
+            <summary>
+            System ID of the avatar
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.Animations.ToDictionary">
+        <member name="P:OpenMetaverse.FriendInfo.Name">
             <summary>
-            A dictionary containing all pre-defined animations
+            full name of the avatar
             </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="T:OpenMetaverse.Rendering.LindenMesh.LODMesh">
+        <member name="P:OpenMetaverse.FriendInfo.IsOnline">
             <summary>
-            Level of Detail mesh
+            True if the avatar is online
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetPrim">
+        <member name="P:OpenMetaverse.FriendInfo.CanSeeMeOnline">
             <summary>
-            A linkset asset, containing a parent primitive and zero or more children
+            True if the friend can see if I am online
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetPrim.#ctor">
-            <summary>Initializes a new instance of an AssetPrim object</summary>
+        <member name="P:OpenMetaverse.FriendInfo.CanSeeMeOnMap">
+            <summary>
+            True if the friend can see me on the map 
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetPrim.#ctor(OpenMetaverse.UUID,System.Byte[])">
+        <member name="P:OpenMetaverse.FriendInfo.CanModifyMyObjects">
             <summary>
-            Initializes a new instance of an AssetPrim object
+            True if the freind can modify my objects
             </summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetPrim.Encode">
+        <member name="P:OpenMetaverse.FriendInfo.CanSeeThemOnline">
             <summary>
-            
+            True if I can see if my friend is online
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetPrim.Decode">
+        <member name="P:OpenMetaverse.FriendInfo.CanSeeThemOnMap">
             <summary>
-            
+            True if I can see if my friend is on the map
             </summary>
-            <returns></returns>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetPrim.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="P:OpenMetaverse.FriendInfo.CanModifyTheirObjects">
+            <summary>
+            True if I can modify my friend's objects
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetPrim.ProfileShape">
+        <member name="P:OpenMetaverse.FriendInfo.TheirFriendRights">
             <summary>
-            Only used internally for XML serialization/deserialization
+            My friend's rights represented as bitmapped flags
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.PrimObject">
+        <member name="P:OpenMetaverse.FriendInfo.MyFriendRights">
             <summary>
-            The deserialized form of a single primitive in a linkset asset
+            My rights represented as bitmapped flags
             </summary>
         </member>
-        <member name="T:OpenMetaverse.SoundManager">
+        <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="F:OpenMetaverse.SoundManager.m_AttachedSound">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendOnline">
+            <summary>The event subscribers. null if no subcribers</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 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.SoundManager.m_AttachedSoundLock">
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendOnlineLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.SoundManager.m_AttachedSoundGainChange">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendOffline">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.OnAttachedSoundGainChange(OpenMetaverse.AttachedSoundGainChangeEventArgs)">
-            <summary>Raises the AttachedSoundGainChange Event</summary>
-             <param name="e">A AttachedSoundGainChangeEventArgs object containing
-             the data sent from the simulator</param>
+        <member 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.SoundManager.m_AttachedSoundGainChangeLock">
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendOfflineLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.SoundManager.m_SoundTrigger">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendRights">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.OnSoundTrigger(OpenMetaverse.SoundTriggerEventArgs)">
-            <summary>Raises the SoundTrigger Event</summary>
-             <param name="e">A SoundTriggerEventArgs object containing
-             the data sent from the simulator</param>
+        <member 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.SoundManager.m_SoundTriggerLock">
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendRightsLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.SoundManager.m_PreloadSound">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendNames">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.OnPreloadSound(OpenMetaverse.PreloadSoundEventArgs)">
-            <summary>Raises the PreloadSound Event</summary>
-             <param name="e">A PreloadSoundEventArgs object containing
-             the data sent from the simulator</param>
+        <member 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.SoundManager.m_PreloadSoundLock">
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendNamesLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.#ctor(OpenMetaverse.GridClient)">
+        <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>
-            Construct a new instance of the SoundManager class, used for playing and receiving
-            sound assets
+            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>
-            <param name="client">A reference to the current GridClient instance</param>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.PlaySound(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.FriendsManager.FriendRequests">
             <summary>
-            Plays a sound in the current region at full volume from avatar position
+            A Dictionary of key/value pairs containing current pending frienship offers.
+            
+            The key is the <seealso cref="T:OpenMetaverse.UUID"/> of the avatar making the request, 
+            the value is the <seealso cref="T:OpenMetaverse.UUID"/> of the request which is used to accept
+            or decline the friendship offer
+            </summary>
+        </member>
+        <member name="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>
+            Accept a friendship request
+            </summary>
+            <param name="fromAgentID">agentID of avatatar to form friendship with</param>
+            <param name="imSessionID">imSessionID of the friendship request message</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.DeclineFriendship(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>
+            Decline a friendship request
+            </summary>
+            <param name="fromAgentID"><seealso cref="T:OpenMetaverse.UUID"/> of friend</param>
+            <param name="imSessionID">imSessionID of the friendship request message</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.OfferFriendship(OpenMetaverse.UUID)">
+            <summary>
+            Overload: Offer friendship to an avatar.
+            </summary>
+            <param name="agentID">System ID of the avatar you are offering friendship to</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.OfferFriendship(OpenMetaverse.UUID,System.String)">
+            <summary>
+            Offer friendship to an avatar.
+            </summary>
+            <param name="agentID">System ID of the avatar you are offering friendship to</param>
+            <param name="message">A message to send with the request</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.TerminateFriendship(OpenMetaverse.UUID)">
+            <summary>
+            Terminate a friendship with an avatar
+            </summary>
+            <param name="agentID">System ID of the avatar you are terminating the friendship with</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.TerminateFriendshipHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.GrantRights(OpenMetaverse.UUID,OpenMetaverse.FriendRights)">
+            <summary>
+            Change the rights of a friend avatar.
             </summary>
-            <param name="soundID">UUID of the sound to be played</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>
-        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Vector3)">
+        <member name="M:OpenMetaverse.FriendsManager.MapFriend(OpenMetaverse.UUID)">
             <summary>
-            Plays a sound in the current region at full volume
+            Use to map a friends location on the grid.
             </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="friendID">Friends UUID to find</param>
+            <remarks><seealso cref="E:OnFriendFound"/></remarks>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Vector3,System.Single)">
+        <member name="M:OpenMetaverse.FriendsManager.TrackFriend(OpenMetaverse.UUID)">
             <summary>
-            Plays a sound in the current region
+            Use to track a friends movement on the grid
             </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>
+            <param name="friendID">Friends Key</param>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Simulator,OpenMetaverse.Vector3,System.Single)">
+        <member name="M:OpenMetaverse.FriendsManager.RequestOnlineNotification(OpenMetaverse.UUID)">
             <summary>
-            Plays a sound in the specified sim
+            Ask for a notification of friend's online status
             </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>
+            <param name="friendID">Friend's UUID</param>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,System.UInt64,OpenMetaverse.Vector3,System.Single)">
+        <member name="M:OpenMetaverse.FriendsManager.Avatars_OnAvatarNames(System.Object,OpenMetaverse.UUIDNameReplyEventArgs)">
             <summary>
-            Play a sound asset
+            This handles the asynchronous response of a RequestAvatarNames call.
             </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>
+            <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.SoundManager.AttachedSoundHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.FriendsManager.OnlineNotificationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.AttachedSoundGainChangeHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.FriendsManager.OfflineNotificationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.PreloadSoundHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.FriendsManager.ChangeUserRightsHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.SoundTriggerHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.FriendsManager.OnFindAgentReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="E:OpenMetaverse.SoundManager.AttachedSound">
-            <summary>Raised when the simulator sends us data containing
-            sound</summary>
-        </member>
-        <member name="E:OpenMetaverse.SoundManager.AttachedSoundGainChange">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="E:OpenMetaverse.SoundManager.SoundTrigger">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="E:OpenMetaverse.SoundManager.PreloadSound">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="T:OpenMetaverse.AttachedSoundEventArgs">
-            <summary>Provides data for the <see cref="E:OpenMetaverse.SoundManager.AttachedSound"/> event</summary>
-            <remarks>The <see cref="E:OpenMetaverse.SoundManager.AttachedSound"/> event occurs when the simulator sends
-            the sound data which emits from an agents attachment</remarks>
-            <example>
-            The following code example shows the process to subscribe to the <see cref="E:OpenMetaverse.SoundManager.AttachedSound"/> event
-            and a stub to handle the data passed from the simulator
-            <code>
-                // Subscribe to the AttachedSound event
-                Client.Sound.AttachedSound += Sound_AttachedSound;
-                
-                // process the data raised in the event here
-                private void Sound_AttachedSound(object sender, AttachedSoundEventArgs e)
-                {
-                    // ... Process AttachedSoundEventArgs here ...
-                }
-            </code>
-            </example>
-        </member>
-        <member name="M:OpenMetaverse.AttachedSoundEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Single,OpenMetaverse.SoundFlags)">
+        <member name="M:OpenMetaverse.FriendsManager.Network_OnLoginResponse(System.Boolean,System.Boolean,System.String,System.String,OpenMetaverse.LoginResponseData)">
             <summary>
-            Construct a new instance of the SoundTriggerEventArgs class
+            Populate FriendList <seealso cref="!:InternalDictionary"/> with data from the login reply
             </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>
+            <param name="loginSuccess">true if login was successful</param>
+            <param name="redirect">true if login request is requiring a redirect</param>
+            <param name="message">A string containing the response to the login request</param>
+            <param name="reason">A string containing the reason for the request</param>
+            <param name="replyData">A <seealso cref="T:OpenMetaverse.LoginResponseData"/> object containing the decoded 
+            reply from the login server</param>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Simulator">
-            <summary>Simulator where the event originated</summary>
+        <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="P:OpenMetaverse.AttachedSoundEventArgs.SoundID">
-            <summary>Get the sound asset id</summary>
+        <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="P:OpenMetaverse.AttachedSoundEventArgs.OwnerID">
-            <summary>Get the ID of the owner</summary>
+        <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="P:OpenMetaverse.AttachedSoundEventArgs.ObjectID">
-            <summary>Get the ID of the Object</summary>
+        <member name="E:OpenMetaverse.FriendsManager.FriendNames">
+            <summary>Raised when the simulator sends us the names on our friends list</summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Gain">
-            <summary>Get the volume level</summary>
+        <member name="E:OpenMetaverse.FriendsManager.FriendshipOffered">
+            <summary>Raised when the simulator sends notification another agent is offering us friendship</summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Flags">
-            <summary>Get the <see cref="T:OpenMetaverse.SoundFlags"/></summary>
+        <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="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="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="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 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="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.Simulator">
-            <summary>Simulator where the event originated</summary>
+        <member name="T:OpenMetaverse.FriendInfoEventArgs">
+            <summary>Contains information on a member of our friends list</summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.ObjectID">
-            <summary>Get the ID of the Object</summary>
+        <member name="M:OpenMetaverse.FriendInfoEventArgs.#ctor(OpenMetaverse.FriendInfo)">
+            <summary>
+            Construct a new instance of the FriendInfoEventArgs class
+            </summary>
+            <param name="friend">The FriendInfo</param>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.Gain">
-            <summary>Get the volume level</summary>
+        <member name="P:OpenMetaverse.FriendInfoEventArgs.Friend">
+            <summary>Get the FriendInfo</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="T:OpenMetaverse.FriendNamesEventArgs">
+            <summary>Contains Friend Names</summary>
         </member>
-        <member name="M:OpenMetaverse.SoundTriggerEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Single,System.UInt64,OpenMetaverse.Vector3)">
+        <member name="M:OpenMetaverse.FriendNamesEventArgs.#ctor(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,System.String})">
             <summary>
-            Construct a new instance of the SoundTriggerEventArgs class
+            Construct a new instance of the FriendNamesEventArgs class
             </summary>
-            <param name="sim">Simulator where the event originated</param>
-            <param name="soundID">The sound asset id</param>
-            <param name="ownerID">The ID of the owner</param>
-            <param name="objectID">The ID of the object</param>
-            <param name="parentID">The ID of the objects parent</param>
-            <param name="gain">The volume level</param>
-            <param name="regionHandle">The regionhandle</param>
-            <param name="position">The source position</param>
-        </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Simulator">
-            <summary>Simulator where the event originated</summary>
-        </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.SoundID">
-            <summary>Get the sound asset id</summary>
+            <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.SoundTriggerEventArgs.OwnerID">
-            <summary>Get the ID of the owner</summary>
+        <member name="P:OpenMetaverse.FriendNamesEventArgs.Names">
+            <summary>A dictionary where the Key is the ID of the Agent, 
+            and the Value is a string containing their name</summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.ObjectID">
-            <summary>Get the ID of the Object</summary>
+        <member name="T:OpenMetaverse.FriendshipOfferedEventArgs">
+            <summary>Sent when another agent requests a friendship with our agent</summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.ParentID">
-            <summary>Get the ID of the objects parent</summary>
+        <member name="M:OpenMetaverse.FriendshipOfferedEventArgs.#ctor(OpenMetaverse.UUID,System.String,OpenMetaverse.UUID)">
+            <summary>
+            Construct a new instance of the FriendshipOfferedEventArgs class
+            </summary>
+            <param name="agentID">The ID of the agent requesting friendship</param>
+            <param name="agentName">The name of the agent requesting friendship</param>
+            <param name="imSessionID">The ID of the session, used in accepting or declining the 
+            friendship offer</param>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Gain">
-            <summary>Get the volume level</summary>
+        <member name="P:OpenMetaverse.FriendshipOfferedEventArgs.AgentID">
+            <summary>Get the ID of the agent requesting friendship</summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.RegionHandle">
-            <summary>Get the regionhandle</summary>
+        <member name="P:OpenMetaverse.FriendshipOfferedEventArgs.AgentName">
+            <summary>Get the name of the agent requesting friendship</summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Position">
-            <summary>Get the source position</summary>
+        <member name="P:OpenMetaverse.FriendshipOfferedEventArgs.SessionID">
+            <summary>Get the ID of the session, used in accepting or declining the 
+            friendship offer</summary>
         </member>
-        <member name="T:OpenMetaverse.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="T:OpenMetaverse.FriendshipResponseEventArgs">
+            <summary>A response containing the results of our request to form a friendship with another agent</summary>
         </member>
-        <member name="M:OpenMetaverse.PreloadSoundEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.FriendshipResponseEventArgs.#ctor(OpenMetaverse.UUID,System.String,System.Boolean)">
             <summary>
-            Construct a new instance of the PreloadSoundEventArgs class
+            Construct a new instance of the FriendShipResponseEventArgs 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="agentID">The ID of the agent we requested a friendship with</param>
+            <param name="agentName">The name of the agent we requested a friendship with</param>
+            <param name="accepted">true if the agent accepted our friendship offer</param>
         </member>
-        <member name="P:OpenMetaverse.PreloadSoundEventArgs.Simulator">
-            <summary>Simulator where the event originated</summary>
+        <member name="P:OpenMetaverse.FriendshipResponseEventArgs.AgentID">
+            <summary>Get the ID of the agent we requested a friendship with</summary>
         </member>
-        <member name="P:OpenMetaverse.PreloadSoundEventArgs.SoundID">
-            <summary>Get the sound asset id</summary>
+        <member name="P:OpenMetaverse.FriendshipResponseEventArgs.AgentName">
+            <summary>Get the name of the agent we requested a friendship with</summary>
         </member>
-        <member name="P:OpenMetaverse.PreloadSoundEventArgs.OwnerID">
-            <summary>Get the ID of the owner</summary>
+        <member name="P:OpenMetaverse.FriendshipResponseEventArgs.Accepted">
+            <summary>true if the agent accepted our friendship offer</summary>
         </member>
-        <member name="P:OpenMetaverse.PreloadSoundEventArgs.ObjectID">
-            <summary>Get the ID of the Object</summary>
+        <member name="T:OpenMetaverse.FriendshipTerminatedEventArgs">
+            <summary>Contains data sent when a friend terminates a friendship with us</summary>
         </member>
-        <member name="T:OpenMetaverse.NameValue">
+        <member name="M:OpenMetaverse.FriendshipTerminatedEventArgs.#ctor(OpenMetaverse.UUID,System.String)">
             <summary>
-            A Name Value pair with additional settings, used in the protocol
-            primarily to transmit avatar names and active group in object packets
+            Construct a new instance of the FrindshipTerminatedEventArgs class
             </summary>
+            <param name="agentID">The ID of the friend who terminated the friendship with us</param>
+            <param name="agentName">The name of the friend who terminated the friendship with us</param>
         </member>
-        <member name="F:OpenMetaverse.NameValue.Name">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.NameValue.Type">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.NameValue.Class">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.NameValue.Sendto">
-            <summary></summary>
+        <member name="P:OpenMetaverse.FriendshipTerminatedEventArgs.AgentID">
+            <summary>Get the ID of the agent that terminated the friendship with us</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.Value">
-            <summary></summary>
+        <member name="P:OpenMetaverse.FriendshipTerminatedEventArgs.AgentName">
+            <summary>Get the name of the agent that terminated the friendship with us</summary>
         </member>
-        <member name="M:OpenMetaverse.NameValue.#ctor(System.String,OpenMetaverse.NameValue.ValueType,OpenMetaverse.NameValue.ClassType,OpenMetaverse.NameValue.SendtoType,System.Object)">
+        <member name="T:OpenMetaverse.FriendFoundReplyEventArgs">
             <summary>
-            Constructor that takes all the fields as parameters
+            Data sent in response to a <see cref="!:FindFriend"/> request which contains the information to allow us to map the friends location
             </summary>
-            <param name="name"></param>
-            <param name="valueType"></param>
-            <param name="classType"></param>
-            <param name="sendtoType"></param>
-            <param name="value"></param>
         </member>
-        <member name="M:OpenMetaverse.NameValue.#ctor(System.String)">
+        <member name="M:OpenMetaverse.FriendFoundReplyEventArgs.#ctor(OpenMetaverse.UUID,System.UInt64,OpenMetaverse.Vector3)">
             <summary>
-            Constructor that takes a single line from a NameValue field
+            Construct a new instance of the FriendFoundReplyEventArgs class
             </summary>
-            <param name="data"></param>
+            <param name="agentID">The ID of the agent we have requested location information for</param>
+            <param name="regionHandle">The region handle where our friend is located</param>
+            <param name="location">The simulator local position our friend is located</param>
         </member>
-        <member name="T:OpenMetaverse.NameValue.ValueType">
-            <summary>Type of the value</summary>
+        <member name="P:OpenMetaverse.FriendFoundReplyEventArgs.AgentID">
+            <summary>Get the ID of the agent we have received location information for</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.Unknown">
-            <summary>Unknown</summary>
+        <member name="P:OpenMetaverse.FriendFoundReplyEventArgs.RegionHandle">
+            <summary>Get the region handle where our mapped friend is located</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.String">
-            <summary>String value</summary>
+        <member name="P:OpenMetaverse.FriendFoundReplyEventArgs.Location">
+            <summary>Get the simulator local position where our friend is located</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.F32">
-            <summary></summary>
+        <member name="T:OpenMetaverse.StatusCode">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.S32">
-            <summary></summary>
+        <member name="F:OpenMetaverse.StatusCode.OK">
+            <summary>OK</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.VEC3">
+        <member name="F:OpenMetaverse.StatusCode.Done">
+            <summary>Transfer completed</summary>
+        </member>
+        <member name="F:OpenMetaverse.StatusCode.Skip">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.U32">
+        <member name="F:OpenMetaverse.StatusCode.Abort">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.CAMERA">
-            <summary>Deprecated</summary>
+        <member name="F:OpenMetaverse.StatusCode.Error">
+            <summary>Unknown error occurred</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.Asset">
-            <summary>String value, but designated as an asset</summary>
+        <member name="F:OpenMetaverse.StatusCode.UnknownSource">
+            <summary>Equivalent to a 404 error</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.U64">
-            <summary></summary>
+        <member name="F:OpenMetaverse.StatusCode.InsufficientPermissions">
+            <summary>Client does not have permission for that resource</summary>
         </member>
-        <member name="T:OpenMetaverse.NameValue.ClassType">
+        <member name="F:OpenMetaverse.StatusCode.Unknown">
+            <summary>Unknown status</summary>
+        </member>
+        <member name="T:OpenMetaverse.ChannelType">
             <summary>
             
             </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ClassType.Unknown">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.NameValue.ClassType.ReadOnly">
+        <member name="F:OpenMetaverse.ChannelType.Unknown">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ClassType.ReadWrite">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ChannelType.Misc">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ClassType.Callback">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ChannelType.Asset">
+            <summary>Virtually all asset transfers use this channel</summary>
         </member>
-        <member name="T:OpenMetaverse.NameValue.SendtoType">
+        <member name="T:OpenMetaverse.SourceType">
             <summary>
             
             </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.SendtoType.Unknown">
+        <member name="F:OpenMetaverse.SourceType.Unknown">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.SendtoType.Sim">
-            <summary></summary>
+        <member name="F:OpenMetaverse.SourceType.Asset">
+            <summary>Asset from the asset server</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.SendtoType.DataSim">
-            <summary></summary>
+        <member name="F:OpenMetaverse.SourceType.SimInventoryItem">
+            <summary>Inventory item</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.SendtoType.SimViewer">
+        <member name="F:OpenMetaverse.SourceType.SimEstate">
+            <summary>Estate asset, such as an estate covenant</summary>
+        </member>
+        <member name="T:OpenMetaverse.TargetType">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.TargetType.Unknown">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.SendtoType.DataSimViewer">
+        <member name="F:OpenMetaverse.TargetType.File">
             <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTask">
-            <summary>Describes tasks returned in LandStatReply</summary>
+        <member name="F:OpenMetaverse.TargetType.VFile">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools">
+        <member name="T:OpenMetaverse.ImageType">
             <summary>
-            Estate level administration and utilities
+            When requesting image download, type of the image requested
             </summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.GroundTextures">
-            <summary>Textures for each of the four terrain height levels</summary>
+        <member name="F:OpenMetaverse.ImageType.Normal">
+            <summary>Normal in-world object texture</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.GroundTextureLimits">
-            <summary>Upper/lower texture boundaries for each corner of the sim</summary>
+        <member name="F:OpenMetaverse.ImageType.Baked">
+            <summary>Avatar texture</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.#ctor(OpenMetaverse.GridClient)">
+        <member name="F:OpenMetaverse.ImageType.ServerBaked">
+            <summary>Server baked avatar texture</summary>
+        </member>
+        <member name="T:OpenMetaverse.ImageCodec">
             <summary>
-            Constructor for EstateTools class
+            Image file format
             </summary>
-            <param name="client"></param>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_TopCollidersReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Transfer">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.OnTopCollidersReply(OpenMetaverse.TopCollidersReplyEventArgs)">
-            <summary>Raises the TopCollidersReply event</summary>
-            <param name="e">A TopCollidersReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="P:OpenMetaverse.Transfer.TimeSinceLastPacket">
+            <summary>Number of milliseconds passed since the last transfer
+            packet was received</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_TopCollidersReply_Lock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.AssetDownload">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_TopScriptsReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.XferDownload">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.OnTopScriptsReply(OpenMetaverse.TopScriptsReplyEventArgs)">
-            <summary>Raises the TopScriptsReply event</summary>
-            <param name="e">A TopScriptsReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="T:OpenMetaverse.ImageDownload">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_TopScriptsReply_Lock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.AssetUpload">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateUsersReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.ImageRequest">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.OnEstateUsersReply(OpenMetaverse.EstateUsersReplyEventArgs)">
-            <summary>Raises the EstateUsersReply event</summary>
-            <param name="e">A EstateUsersReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="M:OpenMetaverse.ImageRequest.#ctor(OpenMetaverse.UUID,OpenMetaverse.ImageType,System.Single,System.Int32)">
+            <summary>
+            
+            </summary>
+            <param name="imageid"></param>
+            <param name="type"></param>
+            <param name="priority"></param>
+            <param name="discardLevel"></param>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateUsersReply_Lock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.AssetManager">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateGroupsReply">
+        <member name="F:OpenMetaverse.AssetManager.TRANSFER_HEADER_TIMEOUT">
+            <summary>Number of milliseconds to wait for a transfer header packet if out of order data was received</summary>
+        </member>
+        <member name="F:OpenMetaverse.AssetManager.m_XferReceivedEvent">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="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.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.EstateTools.m_EstateGroupsReply_Lock">
+        <member name="F:OpenMetaverse.AssetManager.m_XferReceivedLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateManagersReply">
+        <member name="F:OpenMetaverse.AssetManager.m_AssetUploadedEvent">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.OnEstateManagersReply(OpenMetaverse.EstateManagersReplyEventArgs)">
-            <summary>Raises the EstateManagersReply event</summary>
-            <param name="e">A EstateManagersReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="M:OpenMetaverse.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.EstateTools.m_EstateManagersReply_Lock">
+        <member name="F:OpenMetaverse.AssetManager.m_AssetUploadedLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateBansReply">
+        <member name="F:OpenMetaverse.AssetManager.m_UploadProgressEvent">
             <summary>The event subscribers. null if no subcribers</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.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.EstateTools.m_EstateBansReply_Lock">
+        <member name="F:OpenMetaverse.AssetManager.m_UploadProgressLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateCovenantReply">
+        <member name="F:OpenMetaverse.AssetManager.m_InitiateDownloadEvent">
             <summary>The event subscribers. null if no subcribers</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.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.EstateTools.m_EstateCovenantReply_Lock">
+        <member name="F:OpenMetaverse.AssetManager.m_InitiateDownloadLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateUpdateInfoReply">
+        <member name="F:OpenMetaverse.AssetManager.m_ImageReceiveProgressEvent">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.OnEstateUpdateInfoReply(OpenMetaverse.EstateUpdateInfoReplyEventArgs)">
-            <summary>Raises the EstateUpdateInfoReply event</summary>
-            <param name="e">A EstateUpdateInfoReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="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="F:OpenMetaverse.EstateTools.m_EstateUpdateInfoReply_Lock">
+        <member name="F:OpenMetaverse.AssetManager.m_ImageReceiveProgressLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)">
+        <member name="F:OpenMetaverse.AssetManager.Cache">
+            <summary>Texture download cache</summary>
+        </member>
+        <member name="M:OpenMetaverse.AssetManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            Requests estate information such as top scripts and colliders
+            Default constructor
             </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>
+            <param name="client">A reference to the GridClient object</param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.RequestTopScripts">
-            <summary>Requests the "Top Scripts" list for the current region</summary>
+        <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>
-        <member name="M:OpenMetaverse.EstateTools.RequestTopColliders">
-            <summary>Requests the "Top Colliders" list for the current region</summary>
+        <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>
-        <member name="M:OpenMetaverse.EstateTools.SetTerrainVariables(System.Single,System.Single,System.Single,System.Boolean,System.Boolean,System.Single)">
+        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.SourceType,OpenMetaverse.UUID,OpenMetaverse.AssetManager.AssetReceivedCallback)">
             <summary>
-            Set several estate specific configuration variables
+            Request an asset download
             </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">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.EstateTools.SimWideReturn(OpenMetaverse.UUID,OpenMetaverse.EstateTools.EstateReturnFlags,System.Boolean)">
+        <member name="M:OpenMetaverse.AssetManager.RequestAssetXfer(System.String,System.Boolean,System.Boolean,OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean)">
             <summary>
-            Request return of objects owned by specified avatar 
+            Request an asset download through the almost deprecated Xfer system
             </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>
+            <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.EstateTools.EstateOwnerMessage(System.String,System.String)">
-            <summary></summary>
-            <param name="method"></param>
-            <param name="param"></param>
+        <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>
-        <member name="M:OpenMetaverse.EstateTools.EstateOwnerMessage(System.String,System.Collections.Generic.List{System.String})">
+        <member name="M:OpenMetaverse.AssetManager.SetPendingAssetUploadData(OpenMetaverse.AssetUpload)">
             <summary>
-            Used for setting and retrieving various estate panel settings
+            Used to force asset data into the PendingUpload property, ie: for raw terrain uploads
             </summary>
-            <param name="method">EstateOwnerMessage Method field</param>
-            <param name="listParams">List of parameters to include</param>
+            <param name="assetData">An AssetUpload object containing the data to upload to the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.KickUser(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.Assets.Asset,System.Boolean)">
             <summary>
-            Kick an avatar from an estate
+            Request an asset be uploaded to the simulator
             </summary>
-            <param name="userID">Key of Agent to remove</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.EstateTools.BanUser(OpenMetaverse.UUID,System.Boolean)">
+        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.AssetType,System.Byte[],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>
+            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>
-        <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 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>
-        <member name="M:OpenMetaverse.EstateTools.EstateMessage(System.String)">
+        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.UUID@,OpenMetaverse.AssetType,System.Byte[],System.Boolean,OpenMetaverse.UUID)">
             <summary>
-            Send a message dialog to everyone in an entire estate
+            Initiate an asset upload
             </summary>
-            <param name="message">Message to send all users in the estate</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.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.EstateTools.SimulatorMessage(System.String)">
+        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.TextureDownloadCallback)">
             <summary>
-            Send a message dialog to everyone in 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="message">Message to send all users in the simulator</param>
+            <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.EstateTools.TeleportHomeUser(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,OpenMetaverse.TextureDownloadCallback)">
             <summary>
-            Send an avatar back to their home location
+            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="pest">Key of avatar to send home</param>
+            <param name="textureID">The <see cref="T:OpenMetaverse.UUID"/> of the texture asset to download</param>
+            <param name="imageType">The <see cref="T:OpenMetaverse.ImageType"/> of the texture asset. 
+            Use <see cref="F:OpenMetaverse.ImageType.Normal"/> for most textures, or <see cref="F:OpenMetaverse.ImageType.Baked"/> for baked layer texture assets</param>
+            <param name="callback">The <see cref="T:OpenMetaverse.TextureDownloadCallback"/> callback to fire when the image is retrieved. The callback
+            will contain the result of the request and the texture asset data</param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.RestartRegion">
+        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,OpenMetaverse.TextureDownloadCallback,System.Boolean)">
             <summary>
-            Begin the region restart process
+            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.EstateTools.CancelRestart">
+        <member name="M:OpenMetaverse.AssetManager.RequestImageCancel(OpenMetaverse.UUID)">
             <summary>
-            Cancels a region restart
+            Cancel a texture request
             </summary>
+            <param name="textureID">The texture assets <see cref="T:OpenMetaverse.UUID"/></param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.SetRegionInfo(System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.Single,System.Single,System.Boolean)">
-            <summary>Estate panel "Region" tab settings</summary>
-        </member>
-        <member name="M:OpenMetaverse.EstateTools.SetRegionDebug(System.Boolean,System.Boolean,System.Boolean)">
-            <summary>Estate panel "Debug" tab settings</summary>
-        </member>
-        <member name="M:OpenMetaverse.EstateTools.SetRegionTerrain(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID)">
-            <summary>Used for setting the region's terrain textures for its four height levels</summary>
-            <param name="low"></param>
-            <param name="midLow"></param>
-            <param name="midHigh"></param>
-            <param name="high"></param>
-        </member>
-        <member name="M:OpenMetaverse.EstateTools.SetRegionTerrainHeights(System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)">
-            <summary>Used for setting sim terrain texture heights</summary> 
-        </member>
-        <member name="M:OpenMetaverse.EstateTools.RequestCovenant">
-            <summary>Requests the estate covenant</summary>
-        </member>
-        <member name="M:OpenMetaverse.EstateTools.UploadTerrain(System.Byte[],System.String)">
+        <member name="M:OpenMetaverse.AssetManager.RequestMesh(OpenMetaverse.UUID,OpenMetaverse.AssetManager.MeshDownloadCallback)">
             <summary>
-            Upload a terrain RAW file
+            Requests download of a mesh asset
             </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>
+            <param name="meshID">UUID of the mesh asset</param>
+            <param name="callback">Callback when the request completes</param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.TeleportHomeAllUsers">
+        <member name="M:OpenMetaverse.AssetManager.RequestServerBakedImage(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.TextureDownloadCallback)">
             <summary>
-            Teleports all users home in current Estate
+            Fetach avatar texture on a grid capable of server side baking
             </summary>
+            <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.EstateTools.RemoveEstateManager(OpenMetaverse.UUID,System.Boolean)">
+        <member name="M:OpenMetaverse.AssetManager.FireImageProgressEvent(OpenMetaverse.UUID,System.Int32,System.Int32)">
             <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>
+            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>
-        <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 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.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="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.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="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.EstateTools.AddAllowedGroup(OpenMetaverse.UUID,System.Boolean)">
-            
-             <summary>
-             Add's a group to the estate Allowed list</summary>
-             <param name="groupID">Key of Group to Add</param>
-             <param name="allEstates">Add Group as an allowed group to All estates if true</param>
+        <member name="M:OpenMetaverse.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.EstateTools.RemoveAllowedGroup(OpenMetaverse.UUID,System.Boolean)">
-            
-             <summary>
-             Removes a group from the estate Allowed list</summary>
-             <param name="groupID">Key of Group to Remove</param>
-             <param name="allEstates">Removes Group as an allowed Group from All estates if true</param>
+        <member name="M:OpenMetaverse.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.EstateTools.EstateCovenantReplyHandler(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.EstateTools.EstateOwnerMessageHandler(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="M:OpenMetaverse.EstateTools.LandStatReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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="E:OpenMetaverse.EstateTools.TopCollidersReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)"/> request.</summary>
+        <member name="E:OpenMetaverse.AssetManager.XferReceived">
+            <summary>Raised when the simulator responds sends </summary>
         </member>
-        <member name="E:OpenMetaverse.EstateTools.TopScriptsReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)"/> request.</summary>
+        <member name="E:OpenMetaverse.AssetManager.AssetUploaded">
+            <summary>Raised during upload completes</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 name="E:OpenMetaverse.AssetManager.UploadProgress">
+            <summary>Raised during upload with progres update</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="E:OpenMetaverse.AssetManager.InitiateDownload">
+            <summary>Fired when the simulator sends an InitiateDownloadPacket, used to download terrain .raw files</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="E:OpenMetaverse.AssetManager.ImageReceiveProgress">
+            <summary>Fired when a texture is in the process of being downloaded by the TexturePipeline class</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="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="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="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="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="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="T:OpenMetaverse.EstateTools.LandStatReportType">
-            <summary>Used in the ReportType field of a LandStatRequest</summary>
+        <member name="P:OpenMetaverse.XferReceivedEventArgs.Xfer">
+            <summary>Xfer data</summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools.EstateAccessDelta">
-            <summary>Used by EstateOwnerMessage packets</summary>
+        <member name="P:OpenMetaverse.AssetUploadEventArgs.Upload">
+            <summary>Upload data</summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools.EstateAccessReplyDelta">
-            <summary>Used by EstateOwnerMessage packets</summary>
+        <member name="P:OpenMetaverse.InitiateDownloadEventArgs.SimFileName">
+            <summary>Filename used on the simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools.EstateReturnFlags">
+        <member name="P:OpenMetaverse.InitiateDownloadEventArgs.ViewerFileName">
+            <summary>Filename used by the client</summary>
+        </member>
+        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.ImageID">
+            <summary>UUID of the image that is in progress</summary>
+        </member>
+        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.Received">
+            <summary>Number of bytes received so far</summary>
+        </member>
+        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.Total">
+            <summary>Image size in bytes</summary>
+        </member>
+        <member name="F:OpenMetaverse.TerrainManager.m_LandPatchReceivedEvent">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="M:OpenMetaverse.TerrainManager.OnLandPatchReceived(OpenMetaverse.LandPatchReceivedEventArgs)">
+            <summary>Raises the LandPatchReceived event</summary>
+            <param name="e">A LandPatchReceivedEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="F:OpenMetaverse.TerrainManager.m_LandPatchReceivedLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="M:OpenMetaverse.TerrainManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            
+            Default constructor
             </summary>
+            <param name="client"></param>
         </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 name="E:OpenMetaverse.TerrainManager.LandPatchReceived">
+            <summary>Raised when the simulator responds sends </summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnOnOthersLand">
-            <summary>Only return targets objects if on others land</summary>
+        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.Simulator">
+            <summary>Simulator from that sent tha data</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnScriptedAndOnOthers">
-            <summary>Returns target's scripted objects and objects on other parcels</summary>
+        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.X">
+            <summary>Sim coordinate of the patch</summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools.GroundTextureSettings">
-            <summary>Ground texture settings for each corner of the region</summary>
+        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.Y">
+            <summary>Sim coordinate of the patch</summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools.GroundTextureHeight">
-            <summary>Used by GroundTextureHeightSettings</summary>
+        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.PatchSize">
+            <summary>Size of tha patch</summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools.GroundTextureHeightSettings">
-            <summary>The high and low texture thresholds for each corner of the sim</summary>
+        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.HeightMap">
+            <summary>Heightmap for the patch</summary>
         </member>
-        <member name="T:OpenMetaverse.TopCollidersReplyEventArgs">
-            <summary>Raised on LandStatReply when the report type is for "top colliders"</summary>
+        <member name="T:OpenMetaverse.PacketEventDictionary">
+            <summary>
+            Registers, unregisters, and fires events generated by incoming packets
+            </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.PacketEventDictionary.Client">
+            <summary>Reference to the GridClient object</summary>
         </member>
-        <member name="P:OpenMetaverse.TopCollidersReplyEventArgs.ObjectCount">
+        <member name="M:OpenMetaverse.PacketEventDictionary.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            The number of returned items in LandStatReply
+            Default constructor
             </summary>
+            <param name="client"></param>
         </member>
-        <member name="P:OpenMetaverse.TopCollidersReplyEventArgs.Tasks">
+        <member name="M:OpenMetaverse.PacketEventDictionary.RegisterEvent(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs},System.Boolean)">
             <summary>
-            A Dictionary of Object UUIDs to tasks returned in LandStatReply
+            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="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 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="P:OpenMetaverse.TopScriptsReplyEventArgs.ObjectCount">
+        <member name="M:OpenMetaverse.PacketEventDictionary.RaiseEvent(OpenMetaverse.Packets.PacketType,OpenMetaverse.Packets.Packet,OpenMetaverse.Simulator)">
             <summary>
-            The number of scripts returned in LandStatReply
+            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="P:OpenMetaverse.TopScriptsReplyEventArgs.Tasks">
+        <member name="T:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper">
             <summary>
-            A Dictionary of Object UUIDs to tasks returned in LandStatReply
+            Object that is passed to worker threads in the ThreadPool for
+            firing packet callbacks
             </summary>
         </member>
-        <member name="T:OpenMetaverse.EstateBansReplyEventArgs">
-            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
+        <member name="F:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper.Callback">
+            <summary>Callback to fire for this packet</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateBansReplyEventArgs.#ctor(System.UInt32,System.Int32,System.Collections.Generic.List{OpenMetaverse.UUID})">
-            <summary>Construct a new instance of the EstateBansReplyEventArgs class</summary>
-            <param name="estateID">The estate's identifier on the grid</param>
-            <param name="count">The number of returned items in LandStatReply</param>
-            <param name="banned">User UUIDs banned</param>
+        <member name="F:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper.Simulator">
+            <summary>Reference to the simulator that this packet came from</summary>
         </member>
-        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.EstateID">
+        <member name="F:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper.Packet">
+            <summary>The packet that needs to be processed</summary>
+        </member>
+        <member name="T:OpenMetaverse.CapsEventDictionary">
             <summary>
-            The identifier of the estate
+            Registers, unregisters, and fires events generated by the Capabilities
+            event queue
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.Count">
+        <member name="F:OpenMetaverse.CapsEventDictionary.Client">
+            <summary>Reference to the GridClient object</summary>
+        </member>
+        <member name="M:OpenMetaverse.CapsEventDictionary.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            The number of returned itmes
+            Default constructor
             </summary>
+            <param name="client">Reference to the GridClient object</param>
         </member>
-        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.Banned">
+        <member name="M:OpenMetaverse.CapsEventDictionary.RegisterEvent(System.String,OpenMetaverse.Caps.EventQueueCallback)">
             <summary>
-            List of UUIDs of Banned Users
+            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="T:OpenMetaverse.EstateUsersReplyEventArgs">
-            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
-        </member>
-        <member name="M:OpenMetaverse.EstateUsersReplyEventArgs.#ctor(System.UInt32,System.Int32,System.Collections.Generic.List{OpenMetaverse.UUID})">
-            <summary>Construct a new instance of the EstateUsersReplyEventArgs class</summary>
-            <param name="estateID">The estate's identifier on the grid</param>
-            <param name="count">The number of users</param>
-            <param name="allowedUsers">Allowed users UUIDs</param>
+        <member 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="P:OpenMetaverse.EstateUsersReplyEventArgs.EstateID">
+        <member name="M:OpenMetaverse.CapsEventDictionary.RaiseEvent(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            The identifier of the estate
+            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="P:OpenMetaverse.EstateUsersReplyEventArgs.Count">
+        <member name="M:OpenMetaverse.CapsEventDictionary.BeginRaiseEvent(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            The number of returned items
+            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="P:OpenMetaverse.EstateUsersReplyEventArgs.AllowedUsers">
+        <member name="T:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper">
             <summary>
-            List of UUIDs of Allowed Users
+            Object that is passed to worker threads in the ThreadPool for
+            firing CAPS callbacks
             </summary>
         </member>
-        <member name="T:OpenMetaverse.EstateGroupsReplyEventArgs">
-            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
+        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Callback">
+            <summary>Callback to fire for this packet</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.CapsEventDictionary.CapsCallbackWrapper.CapsEvent">
+            <summary>Name of the CAPS event</summary>
         </member>
-        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.EstateID">
-            <summary>
-            The identifier of the estate
-            </summary>
+        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Message">
+            <summary>Strongly typed decoded data</summary>
         </member>
-        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.Count">
+        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Simulator">
+            <summary>Reference to the simulator that generated this event</summary>
+        </member>
+        <member name="T:OpenMetaverse.EstateTask">
+            <summary>Describes tasks returned in LandStatReply</summary>
+        </member>
+        <member name="T:OpenMetaverse.EstateTools">
             <summary>
-            The number of returned items
+            Estate level administration and utilities
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.AllowedGroups">
+        <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>
-            List of UUIDs of Allowed Groups
+            Constructor for EstateTools class
             </summary>
+            <param name="client"></param>
         </member>
-        <member name="T:OpenMetaverse.EstateManagersReplyEventArgs">
-            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
+        <member name="F:OpenMetaverse.EstateTools.m_TopCollidersReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateManagersReplyEventArgs.#ctor(System.UInt32,System.Int32,System.Collections.Generic.List{OpenMetaverse.UUID})">
-            <summary>Construct a new instance of the EstateManagersReplyEventArgs class</summary>
-            <param name="estateID">The estate's identifier on the grid</param>
-            <param name="count">The number of Managers</param>
-            <param name="managers"> Managers UUIDs</param>
+        <member name="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="P:OpenMetaverse.EstateManagersReplyEventArgs.EstateID">
+        <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="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.EstateTools.m_EstateUsersReply">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.OnEstateUsersReply(OpenMetaverse.EstateUsersReplyEventArgs)">
+            <summary>Raises the EstateUsersReply event</summary>
+            <param name="e">A EstateUsersReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <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="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.EstateTools.m_EstateManagersReply">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.OnEstateManagersReply(OpenMetaverse.EstateManagersReplyEventArgs)">
+            <summary>Raises the EstateManagersReply event</summary>
+            <param name="e">A EstateManagersReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <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="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.EstateTools.m_EstateCovenantReply">
+            <summary>The event subscribers. null if no subcribers</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>
+        <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="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="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)">
             <summary>
-            The identifier of the estate
+            Requests estate information such as top scripts and colliders
             </summary>
+            <param name="parcelLocalID"></param>
+            <param name="reportType"></param>
+            <param name="requestFlags"></param>
+            <param name="filter"></param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.RequestInfo">
+            <summary>Requests estate settings, including estate manager and access/ban lists</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.RequestTopScripts">
+            <summary>Requests the "Top Scripts" list for the current region</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.RequestTopColliders">
+            <summary>Requests the "Top Colliders" list for the current region</summary>
         </member>
-        <member name="P:OpenMetaverse.EstateManagersReplyEventArgs.Count">
+        <member name="M:OpenMetaverse.EstateTools.SetTerrainVariables(System.Single,System.Single,System.Single,System.Boolean,System.Boolean,System.Single)">
             <summary>
-            The number of returned items
+            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="P:OpenMetaverse.EstateManagersReplyEventArgs.Managers">
+        <member name="M:OpenMetaverse.EstateTools.SimWideReturn(OpenMetaverse.UUID,OpenMetaverse.EstateTools.EstateReturnFlags,System.Boolean)">
             <summary>
-            List of UUIDs of the Estate's Managers
+            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="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 name="M:OpenMetaverse.EstateTools.EstateOwnerMessage(System.String,System.String)">
+            <summary></summary>
+            <param name="method"></param>
+            <param name="param"></param>
         </member>
-        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.CovenantID">
+        <member name="M:OpenMetaverse.EstateTools.EstateOwnerMessage(System.String,System.Collections.Generic.List{System.String})">
             <summary>
-            The Covenant
+            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="P:OpenMetaverse.EstateCovenantReplyEventArgs.Timestamp">
+        <member name="M:OpenMetaverse.EstateTools.KickUser(OpenMetaverse.UUID)">
             <summary>
-            The timestamp
+            Kick an avatar from an estate
             </summary>
+            <param name="userID">Key of Agent to remove</param>
         </member>
-        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.EstateName">
+        <member name="M:OpenMetaverse.EstateTools.BanUser(OpenMetaverse.UUID,System.Boolean)">
             <summary>
-            The Estate name
-            </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="P:OpenMetaverse.EstateCovenantReplyEventArgs.EstateOwnerID">
+        <member name="M:OpenMetaverse.EstateTools.UnbanUser(OpenMetaverse.UUID,System.Boolean)">
+            <summary>Unban an avatar from an estate</summary>
+            <param name="userID">Key of Agent to remove</param>
+             /// <param name="allEstates">Unban user from this estate and all others owned by the estate owner</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.EstateMessage(System.String)">
             <summary>
-            The Estate Owner's ID (can be a GroupID)
+            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="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="M:OpenMetaverse.EstateTools.SimulatorMessage(System.String)">
             <summary>
-            The estate's name
+            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="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.EstateOwner">
+        <member name="M:OpenMetaverse.EstateTools.TeleportHomeUser(OpenMetaverse.UUID)">
             <summary>
-            The Estate Owner's ID (can be a GroupID)
+            Send an avatar back to their home location
             </summary>
+            <param name="pest">Key of avatar to send home</param>
         </member>
-        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.EstateID">
+        <member name="M:OpenMetaverse.EstateTools.RestartRegion">
             <summary>
-            The identifier of the estate on the grid
+            Begin the region restart process
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.DenyNoPaymentInfo">
-            <summary></summary>
-        </member>
-        <member name="T:OpenMetaverse.AvatarGroup">
+        <member name="M:OpenMetaverse.EstateTools.CancelRestart">
             <summary>
-            Holds group information for Avatars such as those you might find in a profile
+            Cancels a region restart
             </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarGroup.AcceptNotices">
-            <summary>true of Avatar accepts group notices</summary>
-        </member>
-        <member name="F:OpenMetaverse.AvatarGroup.GroupID">
-            <summary>Groups Key</summary>
-        </member>
-        <member name="F:OpenMetaverse.AvatarGroup.GroupInsigniaID">
-            <summary>Texture Key for groups insignia</summary>
+        <member 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.AvatarGroup.GroupName">
-            <summary>Name of the group</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.AvatarGroup.GroupPowers">
-            <summary>Powers avatar has in the group</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.AvatarGroup.GroupTitle">
-            <summary>Avatars Currently selected title</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.AvatarGroup.ListInProfile">
-            <summary>true of Avatar has chosen to list this in their profile</summary>
+        <member name="M:OpenMetaverse.EstateTools.RequestCovenant">
+            <summary>Requests the estate covenant</summary>
         </member>
-        <member name="T:OpenMetaverse.Animation">
+        <member name="M:OpenMetaverse.EstateTools.UploadTerrain(System.Byte[],System.String)">
             <summary>
-            Contains an animation currently being played by an agent
+            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.Animation.AnimationID">
-            <summary>The ID of the animation asset</summary>
-        </member>
-        <member name="F:OpenMetaverse.Animation.AnimationSequence">
-            <summary>A number to indicate start order of currently playing animations</summary>
-            <remarks>On Linden Grids this number is unique per region, with OpenSim it is per client</remarks>
-        </member>
-        <member name="F:OpenMetaverse.Animation.AnimationSourceObjectID">
-            <summary></summary>
-        </member>
-        <member name="T:OpenMetaverse.ProfilePick">
+        <member name="M:OpenMetaverse.EstateTools.TeleportHomeAllUsers">
             <summary>
-            Holds group information on an individual profile pick
+            Teleports all users home in current Estate
             </summary>
         </member>
-        <member name="T:OpenMetaverse.AvatarManager">
+        <member name="M:OpenMetaverse.EstateTools.RemoveEstateManager(OpenMetaverse.UUID,System.Boolean)">
             <summary>
-            Retrieve friend status notifications, and retrieve avatar names and
-            profiles
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAnimation">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <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.AvatarManager.m_AvatarAnimationLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAppearance">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="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.AvatarManager.m_AvatarAppearanceLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_UUIDNameReply">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="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.AvatarManager.m_UUIDNameReplyLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarInterestsReply">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="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.AvatarManager.m_AvatarInterestsReplyLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPropertiesReply">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="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="F:OpenMetaverse.AvatarManager.m_AvatarPropertiesReplyLock">
-            <summary>Thread sync lock object</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.AvatarManager.m_AvatarGroupsReply">
-            <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="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="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.AvatarManager.m_AvatarGroupsReplyLock">
-            <summary>Thread sync lock object</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.AvatarManager.m_AvatarPickerReply">
-            <summary>The event subscribers, null of no subscribers</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="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="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.AvatarManager.m_AvatarPickerReplyLock">
-            <summary>Thread sync lock object</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.AvatarManager.m_ViewerEffectPointAt">
-            <summary>The event subscribers, null of no subscribers</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="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="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.AvatarManager.m_ViewerEffectPointAtLock">
-            <summary>Thread sync lock object</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="F:OpenMetaverse.AvatarManager.m_ViewerEffectLookAt">
-            <summary>The event subscribers, null of no subscribers</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="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="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="F:OpenMetaverse.AvatarManager.m_ViewerEffectLookAtLock">
-            <summary>Thread sync lock object</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="F:OpenMetaverse.AvatarManager.m_ViewerEffect">
-            <summary>The event subscribers, null of no subscribers</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="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="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="F:OpenMetaverse.AvatarManager.m_ViewerEffectLock">
-            <summary>Thread sync lock object</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="F:OpenMetaverse.AvatarManager.m_AvatarPicksReply">
-            <summary>The event subscribers, null of no subscribers</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="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.EstateTools.LandStatReportType">
+            <summary>Used in the ReportType field of a LandStatRequest</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPicksReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.EstateTools.EstateAccessDelta">
+            <summary>Used by EstateOwnerMessage packets</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_PickInfoReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.EstateTools.EstateAccessReplyDelta">
+            <summary>Used by EstateOwnerMessage packets</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnPickInfoReply(OpenMetaverse.PickInfoReplyEventArgs)">
-            <summary>Raises the PickInfoReply Event</summary>
-             <param name="e">A PickInfoReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.EstateTools.EstateReturnFlags">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_PickInfoReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.None">
+            <summary>No flags set</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarClassifiedReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnScripted">
+            <summary>Only return targets scripted objects</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnAvatarClassifiedReply(OpenMetaverse.AvatarClassifiedReplyEventArgs)">
-            <summary>Raises the AvatarClassifiedReply Event</summary>
-             <param name="e">A AvatarClassifiedReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnOnOthersLand">
+            <summary>Only return targets objects if on others land</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarClassifiedReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnScriptedAndOnOthers">
+            <summary>Returns target's scripted objects and objects on other parcels</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ClassifiedInfoReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.EstateTools.GroundTextureSettings">
+            <summary>Ground texture settings for each corner of the region</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnClassifiedInfoReply(OpenMetaverse.ClassifiedInfoReplyEventArgs)">
-            <summary>Raises the ClassifiedInfoReply Event</summary>
-             <param name="e">A ClassifiedInfoReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.EstateTools.GroundTextureHeight">
+            <summary>Used by GroundTextureHeightSettings</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ClassifiedInfoReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.EstateTools.GroundTextureHeightSettings">
+            <summary>The high and low texture thresholds for each corner of the sim</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Represents other avatars
-            </summary>
-            <param name="client"></param>
+        <member name="T:OpenMetaverse.TopCollidersReplyEventArgs">
+            <summary>Raised on LandStatReply when the report type is for "top colliders"</summary>
         </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="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="M:OpenMetaverse.AvatarManager.RequestAvatarName(OpenMetaverse.UUID)">
+        <member name="P:OpenMetaverse.TopCollidersReplyEventArgs.ObjectCount">
             <summary>
-            Request a single avatar name
+            The number of returned items in LandStatReply
             </summary>
-            <param name="id">The avatar key to retrieve a name for</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarNames(System.Collections.Generic.List{OpenMetaverse.UUID})">
+        <member name="P:OpenMetaverse.TopCollidersReplyEventArgs.Tasks">
             <summary>
-            Request a list of avatar names
+            A Dictionary of Object UUIDs to tasks returned in LandStatReply
             </summary>
-            <param name="ids">The avatar keys to retrieve names for</param>
         </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.TopScriptsReplyEventArgs">
+            <summary>Raised on LandStatReply when the report type is for "top Scripts"</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarNameSearch(System.String,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.TopScriptsReplyEventArgs.#ctor(System.Int32,System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.EstateTask})">
+            <summary>Construct a new instance of the TopScriptsReplyEventArgs class</summary>
+            <param name="objectCount">The number of returned items in LandStatReply</param>
+            <param name="tasks">Dictionary of Object UUIDs to tasks returned in LandStatReply</param>
+        </member>
+        <member name="P:OpenMetaverse.TopScriptsReplyEventArgs.ObjectCount">
             <summary>
-            Search for an avatar (first name, last name)
+            The number of scripts returned in LandStatReply
             </summary>
-            <param name="name">The name to search for</param>
-            <param name="queryID">An ID to associate with this query</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarPicks(OpenMetaverse.UUID)">
+        <member name="P:OpenMetaverse.TopScriptsReplyEventArgs.Tasks">
             <summary>
-            Start a request for Avatar Picks
+            A Dictionary of Object UUIDs to tasks returned in LandStatReply
             </summary>
-            <param name="avatarid">UUID of the avatar</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarClassified(OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.EstateBansReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateBansReplyEventArgs.#ctor(System.UInt32,System.Int32,System.Collections.Generic.List{OpenMetaverse.UUID})">
+            <summary>Construct a new instance of the EstateBansReplyEventArgs class</summary>
+            <param name="estateID">The estate's identifier on the grid</param>
+            <param name="count">The number of returned items in LandStatReply</param>
+            <param name="banned">User UUIDs banned</param>
+        </member>
+        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.EstateID">
             <summary>
-            Start a request for Avatar Classifieds
+            The identifier of the estate
             </summary>
-            <param name="avatarid">UUID of the avatar</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestPickInfo(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.Count">
             <summary>
-            Start a request for details of a specific profile pick
+            The number of returned itmes
             </summary>
-            <param name="avatarid">UUID of the avatar</param>
-            <param name="pickid">UUID of the profile pick</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestClassifiedInfo(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.Banned">
             <summary>
-            Start a request for details of a specific profile classified
+            List of UUIDs of Banned Users
             </summary>
-            <param name="avatarid">UUID of the avatar</param>
-            <param name="classifiedid">UUID of the profile classified</param>
-        </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>
-        <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 name="T:OpenMetaverse.EstateUsersReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.AvatarInterestsHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.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="M:OpenMetaverse.AvatarManager.AvatarGroupsReplyMessageHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
+        <member name="P:OpenMetaverse.EstateUsersReplyEventArgs.EstateID">
             <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.
+            The identifier of the estate
             </summary>
-            <param name="capsKey">The message key</param>
-            <param name="message">the IMessage object containing the deserialized data sent from the simulator</param>
-            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> which originated the packet</param>
-        </member>
-        <member name="M:OpenMetaverse.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="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="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="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="P:OpenMetaverse.EstateUsersReplyEventArgs.Count">
+            <summary>
+            The number of returned items
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.PickInfoReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="P:OpenMetaverse.EstateUsersReplyEventArgs.AllowedUsers">
+            <summary>
+            List of UUIDs of Allowed Users
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.AvatarClassifiedReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="T:OpenMetaverse.EstateGroupsReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.ClassifiedInfoReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.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="E:OpenMetaverse.AvatarManager.AvatarAnimation">
-            <summary>Raised when the simulator sends us data containing
-            an agents animation playlist</summary>
+        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.EstateID">
+            <summary>
+            The identifier of the estate
+            </summary>
         </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="P:OpenMetaverse.EstateGroupsReplyEventArgs.Count">
+            <summary>
+            The number of returned items
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.UUIDNameReply">
-            <summary>Raised when the simulator sends us data containing
-            agent names/id values</summary>
+        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.AllowedGroups">
+            <summary>
+            List of UUIDs of Allowed Groups
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarInterestsReply">
-            <summary>Raised when the simulator sends us data containing
-            the interests listed in an agents profile</summary>
+        <member name="T:OpenMetaverse.EstateManagersReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarPropertiesReply">
-            <summary>Raised when the simulator sends us data containing
-            profile property information for an agent</summary>
+        <member name="M:OpenMetaverse.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="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="P:OpenMetaverse.EstateManagersReplyEventArgs.EstateID">
+            <summary>
+            The identifier of the estate
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarPickerReply">
-            <summary>Raised when the simulator sends us data containing
-            name/id pair</summary>
+        <member name="P:OpenMetaverse.EstateManagersReplyEventArgs.Count">
+            <summary>
+            The number of returned items
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.ViewerEffectPointAt">
-            <summary>Raised when the simulator sends us data containing
-            the objects and effect when an agent is pointing at</summary>
+        <member name="P:OpenMetaverse.EstateManagersReplyEventArgs.Managers">
+            <summary>
+            List of UUIDs of the Estate's Managers
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.ViewerEffectLookAt">
-            <summary>Raised when the simulator sends us data containing
-            the objects and effect when an agent is looking at</summary>
+        <member name="T:OpenMetaverse.EstateCovenantReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.ViewerEffect">
-            <summary>Raised when the simulator sends us data containing
-            an agents viewer effect information</summary>
+        <member name="M:OpenMetaverse.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="E:OpenMetaverse.AvatarManager.AvatarPicksReply">
-            <summary>Raised when the simulator sends us data containing
-            the top picks from an agents profile</summary>
+        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.CovenantID">
+            <summary>
+            The Covenant
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.PickInfoReply">
-            <summary>Raised when the simulator sends us data containing
-            the Pick details</summary>
+        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.Timestamp">
+            <summary>
+            The timestamp
+            </summary>
         </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="P:OpenMetaverse.EstateCovenantReplyEventArgs.EstateName">
+            <summary>
+            The Estate name
+            </summary>
         </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="P:OpenMetaverse.EstateCovenantReplyEventArgs.EstateOwnerID">
+            <summary>
+            The Estate Owner's ID (can be a GroupID)
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.AvatarAnimationEventArgs">
-             <summary>Provides data for the <see cref="E:OpenMetaverse.AvatarManager.AvatarAnimation"/> event</summary>
-             <remarks>The <see cref="E:OpenMetaverse.AvatarManager.AvatarAnimation"/> event occurs when the simulator sends
-             the animation playlist for an agent</remarks>
-             <example>
-             The following code example uses the <see cref="P:OpenMetaverse.AvatarAnimationEventArgs.AvatarID"/> and <see cref="P:OpenMetaverse.AvatarAnimationEventArgs.Animations"/>
-             properties to display the animation playlist of an avatar on the <see cref="T:System.Console"/> window.
-             <code>
-                 // subscribe to the event
-                 Client.Avatars.AvatarAnimation += Avatars_AvatarAnimation;
-                 
-                 private void Avatars_AvatarAnimation(object sender, AvatarAnimationEventArgs e)
-                 {
-                     // create a dictionary of "known" animations from the Animations class using System.Reflection
-                     Dictionary&lt;UUID, string&gt; systemAnimations = new Dictionary&lt;UUID, string&gt;();
-                     Type type = typeof(Animations);
-                     System.Reflection.FieldInfo[] fields = type.GetFields(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static);
-                     foreach (System.Reflection.FieldInfo field in fields)
-                     {
-                         systemAnimations.Add((UUID)field.GetValue(type), field.Name);
-                     }
-            
-                     // find out which animations being played are known animations and which are assets
-                     foreach (Animation animation in e.Animations)
-                     {
-                         if (systemAnimations.ContainsKey(animation.AnimationID))
-                         {
-                             Console.WriteLine("{0} is playing {1} ({2}) sequence {3}", e.AvatarID,
-                                 systemAnimations[animation.AnimationID], animation.AnimationSequence);
-                         }
-                         else
-                         {
-                             Console.WriteLine("{0} is playing {1} (Asset) sequence {2}", e.AvatarID,
-                                 animation.AnimationID, animation.AnimationSequence);
-                         }
-                     }
-                 }
-             </code>
-             </example>
+        <member name="T:OpenMetaverse.EstateUpdateInfoReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarAnimationEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.Animation})">
+        <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>
-            Construct a new instance of the AvatarAnimationEventArgs class
+            The estate's name
             </summary>
-            <param name="avatarID">The ID of the agent</param>
-            <param name="anims">The list of animations to start</param>
         </member>
-        <member name="P:OpenMetaverse.AvatarAnimationEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.EstateOwner">
+            <summary>
+            The Estate Owner's ID (can be a GroupID)
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarAnimationEventArgs.Animations">
-            <summary>Get the list of animations to start</summary>
+        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.EstateID">
+            <summary>
+            The identifier of the estate on the grid
+            </summary>
         </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="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.DenyNoPaymentInfo">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarAppearanceEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,System.Boolean,OpenMetaverse.Primitive.TextureEntryFace,OpenMetaverse.Primitive.TextureEntryFace[],System.Collections.Generic.List{System.Byte})">
+        <member name="T:OpenMetaverse.DownloadRequest">
             <summary>
-            Construct a new instance of the AvatarAppearanceEventArgs class
+            Represends individual HTTP Download request
             </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="P:OpenMetaverse.AvatarAppearanceEventArgs.Simulator">
-            <summary>Get the Simulator this request is from of the agent</summary>
+        <member name="F:OpenMetaverse.DownloadRequest.Address">
+            <summary>URI of the item to fetch</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="F:OpenMetaverse.DownloadRequest.MillisecondsTimeout">
+            <summary>Timout specified in milliseconds</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.IsTrial">
-            <summary>true if the agent is a trial account</summary>
+        <member name="F:OpenMetaverse.DownloadRequest.DownloadProgressCallback">
+            <summary>Download progress callback</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.DefaultTexture">
-            <summary>Get the default agent texture</summary>
+        <member name="F:OpenMetaverse.DownloadRequest.CompletedCallback">
+            <summary>Download completed callback</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.FaceTextures">
-            <summary>Get the agents appearance layer textures</summary>
+        <member name="F:OpenMetaverse.DownloadRequest.ContentType">
+            <summary>Accept the following content type</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams">
-            <summary>Get the <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams"/> for the agent</summary>
+        <member name="F:OpenMetaverse.DownloadRequest.Retries">
+            <summary>How many times will this request be retried</summary>
         </member>
-        <member name="T:OpenMetaverse.AvatarInterestsReplyEventArgs">
-            <summary>Represents the interests from the profile of an agent</summary>
+        <member name="F:OpenMetaverse.DownloadRequest.Attempt">
+            <summary>Current fetch attempt</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarInterestsReplyEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="M:OpenMetaverse.DownloadRequest.#ctor">
+            <summary>Default constructor</summary>
         </member>
-        <member name="T:OpenMetaverse.AvatarPropertiesReplyEventArgs">
-            <summary>The properties of an agent</summary>
+        <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="P:OpenMetaverse.AvatarPropertiesReplyEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="T:OpenMetaverse.DownloadManager">
+            <summary>
+            Manages async HTTP downloads with a limit on maximum
+            concurrent downloads
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarGroupsReplyEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="M:OpenMetaverse.DownloadManager.#ctor">
+            <summary>Default constructor</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarPicksReplyEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="M:OpenMetaverse.DownloadManager.Dispose">
+            <summary>Cleanup method</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarClassifiedReplyEventArgs.AvatarID">
-            <summary>Get the ID of the avatar</summary>
+        <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>
     </members>
 </doc>
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 3e210ba..9054a99 100755
Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ
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 befc8d4..7d00b1b 100644
--- a/bin/OpenMetaverseTypes.XML
+++ b/bin/OpenMetaverseTypes.XML
@@ -4,114 +4,65 @@
         <name>OpenMetaverseTypes</name>
     </assembly>
     <members>
-        <member name="T:OpenMetaverse.Vector3d">
+        <member name="T:OpenMetaverse.LocklessQueue`1">
             <summary>
-            A three-dimensional vector with doubleing-point values
+            A thread-safe lockless queue that supports multiple readers and 
+            multiple writers
             </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 name="F:OpenMetaverse.LocklessQueue`1.head">
+            <summary>Queue head</summary>
         </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 name="F:OpenMetaverse.LocklessQueue`1.tail">
+            <summary>Queue tail</summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.CompareTo(OpenMetaverse.Vector3d)">
-            <summary>
-            IComparable.CompareTo implementation
-            </summary>
+        <member name="F:OpenMetaverse.LocklessQueue`1.count">
+            <summary>Queue item count</summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.IsFinite">
+        <member name="M:OpenMetaverse.LocklessQueue`1.#ctor">
             <summary>
-            Test if this vector is composed of all finite numbers
+            Constructor
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.FromBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.LocklessQueue`1.Enqueue(`0)">
             <summary>
-            Builds a vector from a byte array
+            Enqueue an item
             </summary>
-            <param name="byteArray">Byte array containing a 24 byte vector</param>
-            <param name="pos">Beginning position in the byte array</param>
+            <param name="item">Item to enqeue</param>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.GetBytes">
+        <member name="M:OpenMetaverse.LocklessQueue`1.TryDequeue(`0@)">
             <summary>
-            Returns the raw bytes for this vector
+            Try to dequeue an item
             </summary>
-            <returns>A 24 byte array containing X, Y, and Z</returns>
+            <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.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 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.Vector3d.Parse(System.String)">
+        <member name="T:OpenMetaverse.LocklessQueue`1.SingleLinkNode">
             <summary>
-            Parse a vector from a string
+            Provides a node container for data in a singly linked list
             </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 name="F:OpenMetaverse.LocklessQueue`1.SingleLinkNode.Next">
+            <summary>Pointer to the next node in list</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 name="F:OpenMetaverse.LocklessQueue`1.SingleLinkNode.Item">
+            <summary>The data contained by the node</summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.ToRawString">
+        <member name="M:OpenMetaverse.LocklessQueue`1.SingleLinkNode.#ctor">
             <summary>
-            Get a string representation of the vector elements with up to three
-            decimal digits and separated by spaces only
+            Constructor
             </summary>
-            <returns>Raw string representation of the vector</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.op_Modulus(OpenMetaverse.Vector3d,OpenMetaverse.Vector3d)">
+        <member name="M:OpenMetaverse.LocklessQueue`1.SingleLinkNode.#ctor(`0)">
             <summary>
-            Cross product between two vectors
+            Constructor
             </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>
-        </member>
         <member name="T:OpenMetaverse.EnumInfoAttribute">
             <summary>
             Attribute class that allows extra attributes to be attached to ENUMs
@@ -235,6 +186,15 @@
         <member name="F:OpenMetaverse.AssetType.Mesh">
             <summary>Linden mesh format</summary>
         </member>
+        <member name="F:OpenMetaverse.AssetType.Inbox">
+            <summary>Marketplace direct delivery inbox ("Received Items")</summary>
+        </member>
+        <member name="F:OpenMetaverse.AssetType.Outbox">
+            <summary>Marketplace direct delivery outbox</summary>
+        </member>
+        <member name="F:OpenMetaverse.AssetType.BasicRoot">
+            <summary></summary>
+        </member>
         <member name="T:OpenMetaverse.InventoryType">
             <summary>
             Inventory Item Types, eg Script, Notecard, Folder, etc
@@ -355,292 +315,259 @@
         <member name="F:OpenMetaverse.WearableType.Tattoo">
             <summary>Tattoo</summary>
         </member>
+        <member name="F:OpenMetaverse.WearableType.Physics">
+            <summary>Physics</summary>
+        </member>
         <member name="F:OpenMetaverse.WearableType.Invalid">
             <summary>Invalid wearable asset</summary>
         </member>
-        <member name="T:OpenMetaverse.TokenBucket">
+        <member name="T:OpenMetaverse.Color4">
             <summary>
-            A hierarchical token bucket for bandwidth throttling. See
-            http://en.wikipedia.org/wiki/Token_bucket for more information
+            An 8-bit color structure including an alpha channel
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TokenBucket.parent">
-            <summary>Parent bucket to this bucket, or null if this is a root
-            bucket</summary>
+        <member name="F:OpenMetaverse.Color4.R">
+            <summary>Red</summary>
         </member>
-        <member name="F:OpenMetaverse.TokenBucket.maxBurst">
-            <summary>Size of the bucket in bytes. If zero, the bucket has 
-            infinite capacity</summary>
+        <member name="F:OpenMetaverse.Color4.G">
+            <summary>Green</summary>
         </member>
-        <member name="F:OpenMetaverse.TokenBucket.tokensPerMS">
-            <summary>Rate that the bucket fills, in bytes per millisecond. If
-            zero, the bucket always remains full</summary>
+        <member name="F:OpenMetaverse.Color4.B">
+            <summary>Blue</summary>
         </member>
-        <member name="F:OpenMetaverse.TokenBucket.content">
-            <summary>Number of tokens currently in the bucket</summary>
+        <member name="F:OpenMetaverse.Color4.A">
+            <summary>Alpha</summary>
         </member>
-        <member name="F:OpenMetaverse.TokenBucket.lastDrip">
-            <summary>Time of the last drip, in system ticks</summary>
+        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte,System.Byte,System.Byte,System.Byte)">
+            <summary>
+            
+            </summary>
+            <param name="r"></param>
+            <param name="g"></param>
+            <param name="b"></param>
+            <param name="a"></param>
         </member>
-        <member name="M:OpenMetaverse.TokenBucket.#ctor(OpenMetaverse.TokenBucket,System.Int32,System.Int32)">
+        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte[],System.Int32,System.Boolean)">
             <summary>
-            Default constructor
+            Builds a color from a byte array
             </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>
+            <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.TokenBucket.RemoveTokens(System.Int32)">
+        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte[],System.Int32,System.Boolean,System.Boolean)">
             <summary>
-            Remove a given number of tokens from the bucket
+            Returns the raw bytes for this vector
             </summary>
-            <param name="amount">Number of tokens to remove from the bucket</param>
-            <returns>True if the requested number of tokens were removed from
-            the bucket, otherwise false</returns>
+            <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.TokenBucket.RemoveTokens(System.Int32,System.Boolean@)">
+        <member name="M:OpenMetaverse.Color4.#ctor(OpenMetaverse.Color4)">
             <summary>
-            Remove a given number of tokens from the bucket
+            Copy constructor
             </summary>
-            <param name="amount">Number of tokens to remove from the bucket</param>
-            <param name="dripSucceeded">True if tokens were added to the bucket
-            during this call, otherwise false</param>
-            <returns>True if the requested number of tokens were removed from
-            the bucket, otherwise false</returns>
+            <param name="color">Color to copy</param>
         </member>
-        <member name="M:OpenMetaverse.TokenBucket.Drip">
+        <member name="M:OpenMetaverse.Color4.CompareTo(OpenMetaverse.Color4)">
             <summary>
-            Add tokens to the bucket over time. The number of tokens added each
-            call depends on the length of time that has passed since the last 
-            call to Drip
+            IComparable.CompareTo implementation
             </summary>
-            <returns>True if tokens were added to the bucket, otherwise false</returns>
+            <remarks>Sorting ends up like this: |--Grayscale--||--Color--|.
+            Alpha is only used when the colors are otherwise equivalent</remarks>
         </member>
-        <member name="P:OpenMetaverse.TokenBucket.Parent">
+        <member name="M:OpenMetaverse.Color4.FromBytes(System.Byte[],System.Int32,System.Boolean,System.Boolean)">
             <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
+            Builds a color from a byte array
             </summary>
+            <param name="byteArray">Byte array containing a 16 byte color</param>
+            <param name="pos">Beginning position in the byte array</param>
+            <param name="inverted">True if the byte array stores inverted values,
+            otherwise false. For example the color black (fully opaque) inverted
+            would be 0xFF 0xFF 0xFF 0x00</param>
+            <param name="alphaInverted">True if the alpha value is inverted in
+            addition to whatever the inverted parameter is. Setting inverted true
+            and alphaInverted true will flip the alpha value back to non-inverted,
+            but keep the other color bytes inverted</param>
         </member>
-        <member name="P:OpenMetaverse.TokenBucket.MaxBurst">
+        <member name="M:OpenMetaverse.Color4.ToBytes(System.Byte[],System.Int32)">
             <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
+            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="P:OpenMetaverse.TokenBucket.DripRate">
+        <member name="M:OpenMetaverse.Color4.ToBytes(System.Byte[],System.Int32,System.Boolean)">
             <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
+            Serializes this color into four bytes in a byte array
             </summary>
-            <remarks>Tokens are added to the bucket any time 
-            <seealso cref="M:OpenMetaverse.TokenBucket.RemoveTokens(System.Int32)"/> is called, at the granularity of
-            the system tick interval (typically around 15-22ms)</remarks>
+            <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="P:OpenMetaverse.TokenBucket.Content">
+        <member name="M:OpenMetaverse.Color4.ToFloatBytes(System.Byte[],System.Int32)">
             <summary>
-            The number of bytes that can be sent at this moment. This is the
-            current number of tokens in the bucket
-            <remarks>If this bucket has a parent bucket that does not have
-            enough tokens for a request, <seealso cref="M:OpenMetaverse.TokenBucket.RemoveTokens(System.Int32)"/> will 
-            return false regardless of the content of this bucket</remarks>
+            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="T:OpenMetaverse.LocklessQueue`1">
+        <member name="M:OpenMetaverse.Color4.ClampValues">
             <summary>
-            A thread-safe lockless queue that supports multiple readers and 
-            multiple writers
+            Ensures that values are in range 0-1
             </summary>
         </member>
-        <member name="F:OpenMetaverse.LocklessQueue`1.head">
-            <summary>Queue head</summary>
-        </member>
-        <member name="F:OpenMetaverse.LocklessQueue`1.tail">
-            <summary>Queue tail</summary>
-        </member>
-        <member name="F:OpenMetaverse.LocklessQueue`1.count">
-            <summary>Queue item count</summary>
-        </member>
-        <member name="M:OpenMetaverse.LocklessQueue`1.#ctor">
+        <member name="M:OpenMetaverse.Color4.FromHSV(System.Double,System.Double,System.Double)">
             <summary>
-            Constructor
+            Create an RGB color from a hue, saturation, value combination
             </summary>
+            <param name="hue">Hue</param>
+            <param name="saturation">Saturation</param>
+            <param name="value">Value</param>
+            <returns>An fully opaque RGB color (alpha is 1.0)</returns>
         </member>
-        <member name="M:OpenMetaverse.LocklessQueue`1.Enqueue(`0)">
+        <member name="M:OpenMetaverse.Color4.Lerp(OpenMetaverse.Color4,OpenMetaverse.Color4,System.Single)">
             <summary>
-            Enqueue an item
+            Performs linear interpolation between two colors
             </summary>
-            <param name="item">Item to enqeue</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.LocklessQueue`1.TryDequeue(`0@)">
-            <summary>
-            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 name="F:OpenMetaverse.Color4.Black">
+            <summary>A Color4 with zero RGB values and fully opaque (alpha 1.0)</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.White">
+            <summary>A Color4 with full RGB values (1.0) and fully opaque (alpha 1.0)</summary>
         </member>
-        <member name="T:OpenMetaverse.LocklessQueue`1.SingleLinkNode">
+        <member name="T:OpenMetaverse.Vector3d">
             <summary>
-            Provides a node container for data in a singly linked list
+            A three-dimensional vector with doubleing-point values
             </summary>
         </member>
-        <member name="F:OpenMetaverse.LocklessQueue`1.SingleLinkNode.Next">
-            <summary>Pointer to the next node in list</summary>
+        <member name="F:OpenMetaverse.Vector3d.X">
+            <summary>X value</summary>
         </member>
-        <member name="F:OpenMetaverse.LocklessQueue`1.SingleLinkNode.Item">
-            <summary>The data contained by the node</summary>
+        <member name="F:OpenMetaverse.Vector3d.Y">
+            <summary>Y value</summary>
         </member>
-        <member name="M:OpenMetaverse.LocklessQueue`1.SingleLinkNode.#ctor">
+        <member name="F:OpenMetaverse.Vector3d.Z">
+            <summary>Z value</summary>
+        </member>
+        <member name="M:OpenMetaverse.Vector3d.#ctor(System.Byte[],System.Int32)">
             <summary>
-            Constructor
+            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.LocklessQueue`1.SingleLinkNode.#ctor(`0)">
+        <member name="M:OpenMetaverse.Vector3d.ApproxEquals(OpenMetaverse.Vector3d,System.Double)">
             <summary>
-            Constructor
+            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="T:OpenMetaverse.Color4">
+        <member name="M:OpenMetaverse.Vector3d.CompareTo(OpenMetaverse.Vector3d)">
             <summary>
-            An 8-bit color structure including an alpha channel
+            IComparable.CompareTo implementation
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Color4.R">
-            <summary>Red</summary>
-        </member>
-        <member name="F:OpenMetaverse.Color4.G">
-            <summary>Green</summary>
-        </member>
-        <member name="F:OpenMetaverse.Color4.B">
-            <summary>Blue</summary>
-        </member>
-        <member name="F:OpenMetaverse.Color4.A">
-            <summary>Alpha</summary>
-        </member>
-        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte,System.Byte,System.Byte,System.Byte)">
+        <member name="M:OpenMetaverse.Vector3d.IsFinite">
             <summary>
-            
+            Test if this vector is composed of all finite numbers
             </summary>
-            <param name="r"></param>
-            <param name="g"></param>
-            <param name="b"></param>
-            <param name="a"></param>
         </member>
-        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte[],System.Int32,System.Boolean)">
+        <member name="M:OpenMetaverse.Vector3d.FromBytes(System.Byte[],System.Int32)">
             <summary>
-            Builds a color from a byte array
+            Builds a vector from a byte array
             </summary>
-            <param name="byteArray">Byte array containing a 16 byte color</param>
+            <param name="byteArray">Byte array containing a 24 byte vector</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.Color4.#ctor(System.Byte[],System.Int32,System.Boolean,System.Boolean)">
+        <member name="M:OpenMetaverse.Vector3d.GetBytes">
             <summary>
             Returns the raw bytes for this vector
             </summary>
-            <param name="byteArray">Byte array containing a 16 byte color</param>
-            <param name="pos">Beginning position in the byte array</param>
-            <param name="inverted">True if the byte array stores inverted values,
-            otherwise false. For example the color black (fully opaque) inverted
-            would be 0xFF 0xFF 0xFF 0x00</param>
-            <param name="alphaInverted">True if the alpha value is inverted in
-            addition to whatever the inverted parameter is. Setting inverted true
-            and alphaInverted true will flip the alpha value back to non-inverted,
-            but keep the other color bytes inverted</param>
-            <returns>A 16 byte array containing R, G, B, and A</returns>
+            <returns>A 24 byte array containing X, Y, and Z</returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.#ctor(OpenMetaverse.Color4)">
+        <member name="M:OpenMetaverse.Vector3d.ToBytes(System.Byte[],System.Int32)">
             <summary>
-            Copy constructor
+            Writes the raw bytes for this vector to a byte array
             </summary>
-            <param name="color">Color to copy</param>
+            <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.Color4.CompareTo(OpenMetaverse.Color4)">
+        <member name="M:OpenMetaverse.Vector3d.Parse(System.String)">
             <summary>
-            IComparable.CompareTo implementation
+            Parse a vector from a string
             </summary>
-            <remarks>Sorting ends up like this: |--Grayscale--||--Color--|.
-            Alpha is only used when the colors are otherwise equivalent</remarks>
+            <param name="val">A string representation of a 3D vector, enclosed 
+            in arrow brackets and separated by commas</param>
         </member>
-        <member name="M:OpenMetaverse.Color4.FromBytes(System.Byte[],System.Int32,System.Boolean,System.Boolean)">
+        <member name="M:OpenMetaverse.Vector3d.SmoothStep(OpenMetaverse.Vector3d,OpenMetaverse.Vector3d,System.Double)">
             <summary>
-            Builds a color from a byte array
+            Interpolates between two vectors using a cubic equation
             </summary>
-            <param name="byteArray">Byte array containing a 16 byte color</param>
-            <param name="pos">Beginning position in the byte array</param>
-            <param name="inverted">True if the byte array stores inverted values,
-            otherwise false. For example the color black (fully opaque) inverted
-            would be 0xFF 0xFF 0xFF 0x00</param>
-            <param name="alphaInverted">True if the alpha value is inverted in
-            addition to whatever the inverted parameter is. Setting inverted true
-            and alphaInverted true will flip the alpha value back to non-inverted,
-            but keep the other color bytes inverted</param>
         </member>
-        <member name="M:OpenMetaverse.Color4.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Vector3d.ToString">
             <summary>
-            Writes the raw bytes for this color to a byte array
+            Get a formatted string representation of the vector
             </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>
+            <returns>A string representation of the vector</returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.ToBytes(System.Byte[],System.Int32,System.Boolean)">
+        <member name="M:OpenMetaverse.Vector3d.ToRawString">
             <summary>
-            Serializes this color into four bytes in a byte array
+            Get a string representation of the vector elements with up to three
+            decimal digits and separated by spaces only
             </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>
+            <returns>Raw string representation of the vector</returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.ToFloatBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Vector3d.op_Modulus(OpenMetaverse.Vector3d,OpenMetaverse.Vector3d)">
             <summary>
-            Writes the raw bytes for this color to a byte array
+            Cross product between two vectors
             </summary>
-            <param name="dest">Destination byte array</param>
-            <param name="pos">Position in the destination array to start
-            writing. Must be at least 16 bytes before the end of the array</param>
         </member>
-        <member name="M:OpenMetaverse.Color4.ClampValues">
+        <member name="M:OpenMetaverse.Vector3d.op_Implicit(OpenMetaverse.Vector3)~OpenMetaverse.Vector3d">
             <summary>
-            Ensures that values are in range 0-1
+            Implicit casting for Vector3 > Vector3d
             </summary>
+            <param name="value"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.FromHSV(System.Double,System.Double,System.Double)">
-            <summary>
-            Create an RGB color from a hue, saturation, value combination
-            </summary>
-            <param name="hue">Hue</param>
-            <param name="saturation">Saturation</param>
-            <param name="value">Value</param>
-            <returns>An fully opaque RGB color (alpha is 1.0)</returns>
+        <member name="F:OpenMetaverse.Vector3d.Zero">
+            <summary>A vector with a value of 0,0,0</summary>
         </member>
-        <member name="M:OpenMetaverse.Color4.Lerp(OpenMetaverse.Color4,OpenMetaverse.Color4,System.Single)">
-            <summary>
-            Performs linear interpolation between two colors
-            </summary>
-            <param name="value1">Color to start at</param>
-            <param name="value2">Color to end at</param>
-            <param name="amount">Amount to interpolate</param>
-            <returns>The interpolated color</returns>
+        <member name="F:OpenMetaverse.Vector3d.One">
+            <summary>A vector with a value of 1,1,1</summary>
         </member>
-        <member name="F:OpenMetaverse.Color4.Black">
-            <summary>A Color4 with zero RGB values and fully opaque (alpha 1.0)</summary>
+        <member name="F:OpenMetaverse.Vector3d.UnitX">
+            <summary>A unit vector facing forward (X axis), value of 1,0,0</summary>
         </member>
-        <member name="F:OpenMetaverse.Color4.White">
-            <summary>A Color4 with full RGB values (1.0) and fully opaque (alpha 1.0)</summary>
+        <member name="F:OpenMetaverse.Vector3d.UnitY">
+            <summary>A unit vector facing left (Y axis), value of 0,1,0</summary>
+        </member>
+        <member name="F:OpenMetaverse.Vector3d.UnitZ">
+            <summary>A unit vector facing up (Z axis), value of 0,0,1</summary>
         </member>
         <member name="M:OpenMetaverse.ReaderWriterLockSlim.ExitAndWakeUpAppropriateWaiters">
             <summary>
@@ -661,193 +588,218 @@
             Before the wait 'numWaiters' is incremented and is restored before leaving this routine.
             </summary>
         </member>
-        <member name="M:OpenMetaverse.CircularQueue`1.#ctor(OpenMetaverse.CircularQueue{`0})">
+        <member name="F:OpenMetaverse.Quaternion.X">
+            <summary>X value</summary>
+        </member>
+        <member name="F:OpenMetaverse.Quaternion.Y">
+            <summary>Y value</summary>
+        </member>
+        <member name="F:OpenMetaverse.Quaternion.Z">
+            <summary>Z value</summary>
+        </member>
+        <member name="F:OpenMetaverse.Quaternion.W">
+            <summary>W value</summary>
+        </member>
+        <member name="M:OpenMetaverse.Quaternion.#ctor(System.Single,System.Single,System.Single)">
             <summary>
-            Copy constructor
+            Build a quaternion from normalized float values
             </summary>
-            <param name="queue">Circular queue to copy</param>
+            <param name="x">X value from -1.0 to 1.0</param>
+            <param name="y">Y value from -1.0 to 1.0</param>
+            <param name="z">Z value from -1.0 to 1.0</param>
         </member>
-        <member name="T:OpenMetaverse.UUID">
+        <member name="M:OpenMetaverse.Quaternion.#ctor(System.Byte[],System.Int32,System.Boolean)">
             <summary>
-            A 128-bit Universally Unique Identifier, used throughout the Second
-            Life networking protocol
+            Constructor, builds a quaternion object from a byte array
             </summary>
+            <param name="byteArray">Byte array containing four four-byte floats</param>
+            <param name="pos">Offset in the byte array to start reading at</param>
+            <param name="normalized">Whether the source data is normalized or
+            not. If this is true 12 bytes will be read, otherwise 16 bytes will
+            be read.</param>
         </member>
-        <member name="F:OpenMetaverse.UUID.Guid">
-            <summary>The System.Guid object this struct wraps around</summary>
+        <member name="M:OpenMetaverse.Quaternion.Normalize">
+            <summary>
+            Normalizes the quaternion
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.UUID.#ctor(System.String)">
+        <member name="M:OpenMetaverse.Quaternion.FromBytes(System.Byte[],System.Int32,System.Boolean)">
             <summary>
-            Constructor that takes a string UUID representation
+            Builds a quaternion object from a byte array
             </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>
+            <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.#ctor(System.Guid)">
+        <member name="M:OpenMetaverse.Quaternion.GetBytes">
             <summary>
-            Constructor that takes a System.Guid object
+            Normalize this quaternion and serialize it to a byte array
             </summary>
-            <param name="val">A Guid object that contains the unique identifier
-            to be represented by this UUID</param>
+            <returns>A 12 byte array containing normalized X, Y, and Z floating
+            point values in order using little endian byte ordering</returns>
         </member>
-        <member name="M:OpenMetaverse.UUID.#ctor(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Quaternion.ToBytes(System.Byte[],System.Int32)">
             <summary>
-            Constructor that takes a byte array containing a UUID
+            Writes the raw bytes for this quaternion to a byte array
             </summary>
-            <param name="source">Byte array containing a 16 byte UUID</param>
-            <param name="pos">Beginning offset in the array</param>
+            <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.#ctor(System.UInt64)">
+        <member name="M:OpenMetaverse.Quaternion.GetEulerAngles(System.Single@,System.Single@,System.Single@)">
             <summary>
-            Constructor that takes an unsigned 64-bit unsigned integer to 
-            convert to a UUID
+            Convert this quaternion to euler angles
             </summary>
-            <param name="val">64-bit unsigned integer to convert to a UUID</param>
+            <param name="roll">X euler angle</param>
+            <param name="pitch">Y euler angle</param>
+            <param name="yaw">Z euler angle</param>
         </member>
-        <member name="M:OpenMetaverse.UUID.#ctor(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Quaternion.GetAxisAngle(OpenMetaverse.Vector3@,System.Single@)">
             <summary>
-            Copy constructor
+            Convert this quaternion to an angle around an axis
             </summary>
-            <param name="val">UUID to copy</param>
+            <param name="axis">Unit vector describing the axis</param>
+            <param name="angle">Angle around the axis, in radians</param>
         </member>
-        <member name="M:OpenMetaverse.UUID.CompareTo(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Quaternion.Conjugate(OpenMetaverse.Quaternion)">
             <summary>
-            IComparable.CompareTo implementation
+            Returns the conjugate (spatial inverse) of a quaternion
             </summary>
         </member>
-        <member name="M:OpenMetaverse.UUID.FromBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Quaternion.CreateFromAxisAngle(System.Single,System.Single,System.Single,System.Single)">
             <summary>
-            Assigns this UUID from 16 bytes out of a byte array
+            Build a quaternion from an axis and an angle of rotation around
+            that axis
             </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>
         </member>
-        <member name="M:OpenMetaverse.UUID.GetBytes">
+        <member name="M:OpenMetaverse.Quaternion.CreateFromAxisAngle(OpenMetaverse.Vector3,System.Single)">
             <summary>
-            Returns a copy of the raw bytes for this UUID
+            Build a quaternion from an axis and an angle of rotation around
+            that axis
             </summary>
-            <returns>A 16 byte array containing this UUID</returns>
+            <param name="axis">Axis of rotation</param>
+            <param name="angle">Angle of rotation</param>
         </member>
-        <member name="M:OpenMetaverse.UUID.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Quaternion.CreateFromEulers(OpenMetaverse.Vector3)">
             <summary>
-            Writes the raw bytes for this UUID to a byte array
+            Creates a quaternion from a vector containing roll, pitch, and yaw
+            in radians
             </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="eulers">Vector representation of the euler angles in
+            radians</param>
+            <returns>Quaternion representation of the euler angles</returns>
         </member>
-        <member name="M:OpenMetaverse.UUID.CRC">
+        <member name="M:OpenMetaverse.Quaternion.CreateFromEulers(System.Single,System.Single,System.Single)">
             <summary>
-            Calculate an LLCRC (cyclic redundancy check) for this UUID
+            Creates a quaternion from roll, pitch, and yaw euler angles in
+            radians
             </summary>
-            <returns>The CRC checksum for this UUID</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.GetULong">
+        <member name="M:OpenMetaverse.Quaternion.Inverse(OpenMetaverse.Quaternion)">
             <summary>
-            Create a 64-bit integer representation from the second half of this UUID
+            Conjugates and renormalizes a vector
             </summary>
-            <returns>An integer created from the last eight bytes of this UUID</returns>
         </member>
-        <member name="M:OpenMetaverse.UUID.Parse(System.String)">
+        <member name="M:OpenMetaverse.Quaternion.Slerp(OpenMetaverse.Quaternion,OpenMetaverse.Quaternion,System.Single)">
             <summary>
-            Generate a UUID from a string
+            Spherical linear interpolation between two quaternions
             </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.UUID.TryParse(System.String,OpenMetaverse.UUID@)">
+        <member name="M:OpenMetaverse.Quaternion.ToRawString">
             <summary>
-            Generate a UUID from a string
+            Get a string representation of the quaternion elements with up to three
+            decimal digits and separated by spaces only
             </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>
+            <returns>Raw string representation of the quaternion</returns>
         </member>
-        <member name="M:OpenMetaverse.UUID.Combine(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Quaternion.Identity">
+            <summary>A quaternion with a value of 0,0,0,1</summary>
+        </member>
+        <member name="M:OpenMetaverse.CircularQueue`1.#ctor(OpenMetaverse.CircularQueue{`0})">
             <summary>
-            Combine two UUIDs together by taking the MD5 hash of a byte array
-            containing both UUIDs
+            Copy constructor
             </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>
+            <param name="queue">Circular queue to copy</param>
         </member>
-        <member name="M:OpenMetaverse.UUID.Random">
+        <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>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.UUID.GetHashCode">
+        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor(System.Collections.Generic.IEnumerable{`0})">
             <summary>
-            Return a hash code for this UUID, used by .NET for hash tables
+            Create new BlockingQueue.
             </summary>
-            <returns>An integer composed of all the UUID bytes XORed together</returns>
+            <param name="col">The System.Collections.ICollection to copy elements from</param>
         </member>
-        <member name="M:OpenMetaverse.UUID.Equals(System.Object)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor(System.Int32)">
             <summary>
-            Comparison function
+            Create new BlockingQueue.
             </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="capacity">The initial number of elements that the queue can contain</param>
         </member>
-        <member name="M:OpenMetaverse.UUID.Equals(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor">
             <summary>
-            Comparison function
+            Create new BlockingQueue.
             </summary>
-            <param name="uuid">UUID to compare to</param>
-            <returns>True if the UUIDs are equal, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.UUID.ToString">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Finalize">
+            <summary>
+            BlockingQueue Destructor (Close queue, resume any waiting thread).
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.BlockingQueue`1.Clear">
+            <summary>
+            Remove all objects from the Queue.
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.BlockingQueue`1.Close">
+            <summary>
+            Remove all objects from the Queue, resume all dequeue threads.
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue">
+            <summary>
+            Removes and returns the object at the beginning of the Queue.
+            </summary>
+            <returns>Object in queue.</returns>
+        </member>
+        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue(System.TimeSpan)">
             <summary>
-            Get a hyphenated string representation of this UUID
+            Removes and returns the object at the beginning of the Queue.
             </summary>
-            <returns>A string representation of this UUID, lowercase and 
-            with hyphens</returns>
-            <example>11f8aa9c-b071-4242-836b-13b7abe0d489</example>
+            <param name="timeout">time to wait before returning</param>
+            <returns>Object in queue.</returns>
         </member>
-        <member name="M:OpenMetaverse.UUID.op_Equality(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue(System.Int32)">
             <summary>
-            Equals operator
+            Removes and returns the object at the beginning of the Queue.
             </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>
+            <param name="timeout">time to wait before returning (in milliseconds)</param>
+            <returns>Object in queue.</returns>
         </member>
-        <member name="M:OpenMetaverse.UUID.op_Inequality(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Enqueue(`0)">
             <summary>
-            Not equals operator
+            Adds an object to the end of the Queue
             </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>
+            <param name="obj">Object to put in queue</param>
         </member>
-        <member name="M:OpenMetaverse.UUID.op_ExclusiveOr(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Open">
             <summary>
-            XOR operator
+            Open Queue.
             </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>
-        <member name="M:OpenMetaverse.UUID.op_Explicit(System.String)~OpenMetaverse.UUID">
+        <member name="P:OpenMetaverse.BlockingQueue`1.Closed">
             <summary>
-            String typecasting operator
+            Gets flag indicating if queue has been closed.
             </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="F:OpenMetaverse.UUID.Zero">
-            <summary>An UUID with a value of all zeroes</summary>
-        </member>
-        <member name="F:OpenMetaverse.UUID.ZeroString">
-            <summary>A cache of UUID.Zero as a string to optimize a common path</summary>
         </member>
         <member name="F:OpenMetaverse.Utils.DEG_TO_RAD">
             <summary>Used for converting degrees to radians</summary>
@@ -1378,284 +1330,122 @@
             <returns>A DateTime object containing the same time specified in
             the given timestamp</returns>
         </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>
-        <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="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="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="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="T:OpenMetaverse.Utils.Platform">
-            <summary>
-            Operating system
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Utils.Platform.Unknown">
-            <summary>Unknown</summary>
-        </member>
-        <member name="F:OpenMetaverse.Utils.Platform.Windows">
-            <summary>Microsoft Windows</summary>
-        </member>
-        <member name="F:OpenMetaverse.Utils.Platform.WindowsCE">
-            <summary>Microsoft Windows CE</summary>
-        </member>
-        <member name="F:OpenMetaverse.Utils.Platform.Linux">
-            <summary>Linux</summary>
-        </member>
-        <member name="F:OpenMetaverse.Utils.Platform.OSX">
-            <summary>Apple OSX</summary>
-        </member>
-        <member name="T:OpenMetaverse.Utils.Runtime">
-            <summary>
-            Runtime platform
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Utils.Runtime.Windows">
-            <summary>.NET runtime</summary>
-        </member>
-        <member name="F:OpenMetaverse.Utils.Runtime.Mono">
-            <summary>Mono runtime: http://www.mono-project.com/</summary>
-        </member>
-        <member name="F:OpenMetaverse.Quaternion.X">
-            <summary>X value</summary>
-        </member>
-        <member name="F:OpenMetaverse.Quaternion.Y">
-            <summary>Y value</summary>
-        </member>
-        <member name="F:OpenMetaverse.Quaternion.Z">
-            <summary>Z value</summary>
-        </member>
-        <member name="F:OpenMetaverse.Quaternion.W">
-            <summary>W value</summary>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.#ctor(System.Single,System.Single,System.Single)">
-            <summary>
-            Build a quaternion from normalized float values
-            </summary>
-            <param name="x">X value from -1.0 to 1.0</param>
-            <param name="y">Y value from -1.0 to 1.0</param>
-            <param name="z">Z value from -1.0 to 1.0</param>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.#ctor(System.Byte[],System.Int32,System.Boolean)">
-            <summary>
-            Constructor, builds a quaternion object from a byte array
-            </summary>
-            <param name="byteArray">Byte array containing four four-byte floats</param>
-            <param name="pos">Offset in the byte array to start reading at</param>
-            <param name="normalized">Whether the source data is normalized or
-            not. If this is true 12 bytes will be read, otherwise 16 bytes will
-            be read.</param>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.Normalize">
-            <summary>
-            Normalizes the quaternion
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.FromBytes(System.Byte[],System.Int32,System.Boolean)">
-            <summary>
-            Builds a quaternion object from a byte array
-            </summary>
-            <param name="byteArray">The source byte array</param>
-            <param name="pos">Offset in the byte array to start reading at</param>
-            <param name="normalized">Whether the source data is normalized or
-            not. If this is true 12 bytes will be read, otherwise 16 bytes will
-            be read.</param>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.GetBytes">
-            <summary>
-            Normalize this quaternion and serialize it to a byte array
-            </summary>
-            <returns>A 12 byte array containing normalized X, Y, and Z floating
-            point values in order using little endian byte ordering</returns>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.ToBytes(System.Byte[],System.Int32)">
-            <summary>
-            Writes the raw bytes for this quaternion to a byte array
-            </summary>
-            <param name="dest">Destination byte array</param>
-            <param name="pos">Position in the destination array to start
-            writing. Must be at least 12 bytes before the end of the array</param>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.GetEulerAngles(System.Single@,System.Single@,System.Single@)">
-            <summary>
-            Convert this quaternion to euler angles
-            </summary>
-            <param name="roll">X euler angle</param>
-            <param name="pitch">Y euler angle</param>
-            <param name="yaw">Z euler angle</param>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.GetAxisAngle(OpenMetaverse.Vector3@,System.Single@)">
-            <summary>
-            Convert this quaternion to an angle around an axis
-            </summary>
-            <param name="axis">Unit vector describing the axis</param>
-            <param name="angle">Angle around the axis, in radians</param>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.Conjugate(OpenMetaverse.Quaternion)">
-            <summary>
-            Returns the conjugate (spatial inverse) of a quaternion
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.CreateFromAxisAngle(System.Single,System.Single,System.Single,System.Single)">
-            <summary>
-            Build a quaternion from an axis and an angle of rotation around
-            that axis
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.CreateFromAxisAngle(OpenMetaverse.Vector3,System.Single)">
-            <summary>
-            Build a quaternion from an axis and an angle of rotation around
-            that axis
-            </summary>
-            <param name="axis">Axis of rotation</param>
-            <param name="angle">Angle of rotation</param>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.CreateFromEulers(OpenMetaverse.Vector3)">
-            <summary>
-            Creates a quaternion from a vector containing roll, pitch, and yaw
-            in radians
-            </summary>
-            <param name="eulers">Vector representation of the euler angles in
-            radians</param>
-            <returns>Quaternion representation of the euler angles</returns>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.CreateFromEulers(System.Single,System.Single,System.Single)">
-            <summary>
-            Creates a quaternion from roll, pitch, and yaw euler angles in
-            radians
-            </summary>
-            <param name="roll">X angle in radians</param>
-            <param name="pitch">Y angle in radians</param>
-            <param name="yaw">Z angle in radians</param>
-            <returns>Quaternion representation of the euler angles</returns>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.Inverse(OpenMetaverse.Quaternion)">
-            <summary>
-            Conjugates and renormalizes a vector
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.Slerp(OpenMetaverse.Quaternion,OpenMetaverse.Quaternion,System.Single)">
-            <summary>
-            Spherical linear interpolation between two quaternions
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.ToRawString">
-            <summary>
-            Get a string representation of the quaternion elements with up to three
-            decimal digits and separated by spaces only
-            </summary>
-            <returns>Raw string representation of the quaternion</returns>
-        </member>
-        <member name="F:OpenMetaverse.Quaternion.Identity">
-            <summary>A quaternion with a value of 0,0,0,1</summary>
-        </member>
-        <member name="T:OpenMetaverse.BlockingQueue`1">
-            <summary>
-            Same as Queue except Dequeue function blocks until there is an object to return.
-            Note: This class does not need to be synchronized
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor(System.Collections.Generic.IEnumerable{`0})">
+        <member name="M:OpenMetaverse.Utils.DateTimeToUnixTime(System.DateTime)">
             <summary>
-            Create new BlockingQueue.
+            Convert a native DateTime object to a UNIX timestamp
             </summary>
-            <param name="col">The System.Collections.ICollection to copy elements from</param>
+            <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="M:OpenMetaverse.BlockingQueue`1.#ctor(System.Int32)">
+        <member name="M:OpenMetaverse.Utils.Swap``1(``0@,``0@)">
             <summary>
-            Create new BlockingQueue.
+            Swap two values
             </summary>
-            <param name="capacity">The initial number of elements that the queue can contain</param>
+            <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="M:OpenMetaverse.BlockingQueue`1.#ctor">
+        <member name="M:OpenMetaverse.Utils.EnumTryParse``1(System.String,``0@)">
             <summary>
-            Create new BlockingQueue.
+            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="M:OpenMetaverse.BlockingQueue`1.Finalize">
+        <member name="M:OpenMetaverse.Utils.SwapWords(System.Byte)">
             <summary>
-            BlockingQueue Destructor (Close queue, resume any waiting thread).
+            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="M:OpenMetaverse.BlockingQueue`1.Clear">
+        <member name="M:OpenMetaverse.Utils.HostnameToIPv4(System.String)">
             <summary>
-            Remove all objects from the Queue.
+            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="M:OpenMetaverse.BlockingQueue`1.Close">
+        <member name="T:OpenMetaverse.Utils.Platform">
             <summary>
-            Remove all objects from the Queue, resume all dequeue threads.
+            Operating system
             </summary>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue">
+        <member name="F:OpenMetaverse.Utils.Platform.Unknown">
+            <summary>Unknown</summary>
+        </member>
+        <member name="F:OpenMetaverse.Utils.Platform.Windows">
+            <summary>Microsoft Windows</summary>
+        </member>
+        <member name="F:OpenMetaverse.Utils.Platform.WindowsCE">
+            <summary>Microsoft Windows CE</summary>
+        </member>
+        <member name="F:OpenMetaverse.Utils.Platform.Linux">
+            <summary>Linux</summary>
+        </member>
+        <member name="F:OpenMetaverse.Utils.Platform.OSX">
+            <summary>Apple OSX</summary>
+        </member>
+        <member name="T:OpenMetaverse.Utils.Runtime">
             <summary>
-            Removes and returns the object at the beginning of the Queue.
+            Runtime platform
             </summary>
-            <returns>Object in queue.</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue(System.TimeSpan)">
+        <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.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>
-            Removes and returns the object at the beginning of the Queue.
+            Purges expired objects from the cache. Called automatically by the purge timer.
             </summary>
-            <param name="timeout">time to wait before returning</param>
-            <returns>Object in queue.</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue(System.Int32)">
+        <member name="M:OpenMetaverse.Matrix4.GetEulerAngles(System.Single@,System.Single@,System.Single@)">
             <summary>
-            Removes and returns the object at the beginning of the Queue.
+            Convert this matrix to euler rotations
             </summary>
-            <param name="timeout">time to wait before returning (in milliseconds)</param>
-            <returns>Object in queue.</returns>
+            <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.BlockingQueue`1.Enqueue(`0)">
+        <member name="M:OpenMetaverse.Matrix4.GetQuaternion">
             <summary>
-            Adds an object to the end of the Queue
+            Convert this matrix to a quaternion rotation
             </summary>
-            <param name="obj">Object to put in queue</param>
+            <returns>A quaternion representation of this rotation matrix</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Open">
+        <member name="M:OpenMetaverse.Matrix4.CreateFromEulers(System.Single,System.Single,System.Single)">
             <summary>
-            Open Queue.
+            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="P:OpenMetaverse.BlockingQueue`1.Closed">
+        <member name="M:OpenMetaverse.Matrix4.ToString">
             <summary>
-            Gets flag indicating if queue has been closed.
+            Get a formatted string representation of the vector
             </summary>
+            <returns>A string representation of the vector</returns>
+        </member>
+        <member name="F:OpenMetaverse.Matrix4.Zero">
+            <summary>A 4x4 matrix containing all zeroes</summary>
+        </member>
+        <member name="F:OpenMetaverse.Matrix4.Identity">
+            <summary>A 4x4 identity matrix</summary>
         </member>
         <member name="T:OpenMetaverse.Parallel">
             <summary>
@@ -1709,136 +1499,273 @@
             <param name="threadCount">The number of concurrent execution threads to run</param>
             <param name="actions">A series of method bodies to execute</param>
         </member>
-        <member name="M:OpenMetaverse.Matrix4.GetEulerAngles(System.Single@,System.Single@,System.Single@)">
+        <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="M:OpenMetaverse.Vector4.#ctor(System.Byte[],System.Int32)">
             <summary>
-            Convert this matrix to euler rotations
+            Constructor, builds a vector from a byte array
             </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 four four-byte floats</param>
+            <param name="pos">Beginning position in the byte array</param>
         </member>
-        <member name="M:OpenMetaverse.Matrix4.GetQuaternion">
+        <member name="M:OpenMetaverse.Vector4.ApproxEquals(OpenMetaverse.Vector4,System.Single)">
             <summary>
-            Convert this matrix to a quaternion rotation
+            Test if this vector is equal to another vector, within a given
+            tolerance range
             </summary>
-            <returns>A quaternion representation of this rotation matrix</returns>
+            <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.Matrix4.CreateFromEulers(System.Single,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.Vector4.CompareTo(OpenMetaverse.Vector4)">
             <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>
         </member>
-        <member name="M:OpenMetaverse.Matrix4.ToString">
+        <member name="M:OpenMetaverse.Vector4.IsFinite">
             <summary>
-            Get a formatted string representation of the vector
+            Test if this vector is composed of all finite numbers
             </summary>
-            <returns>A string representation of the vector</returns>
         </member>
-        <member name="F:OpenMetaverse.Matrix4.Zero">
-            <summary>A 4x4 matrix containing all zeroes</summary>
+        <member 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.Matrix4.Identity">
-            <summary>A 4x4 identity matrix</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.Vector4.X">
-            <summary>X value</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.Vector4.Y">
-            <summary>Y value</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.Vector4.Z">
-            <summary>Z value</summary>
+        <member name="F:OpenMetaverse.Vector4.Zero">
+            <summary>A vector with a value of 0,0,0,0</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector4.W">
-            <summary>W value</summary>
+        <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>
+        </member>
+        <member name="T:OpenMetaverse.UUID">
+            <summary>
+            A 128-bit Universally Unique Identifier, used throughout the Second
+            Life networking protocol
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.UUID.Guid">
+            <summary>The System.Guid object this struct wraps around</summary>
+        </member>
+        <member name="M:OpenMetaverse.UUID.#ctor(System.String)">
+            <summary>
+            Constructor that takes a string UUID representation
+            </summary>
+            <param name="val">A string representation of a UUID, case 
+            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)">
+            <summary>
+            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.UUID.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            Constructor that takes a byte array containing a UUID
+            </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.UUID.#ctor(System.UInt64)">
+            <summary>
+            Constructor that takes an unsigned 64-bit unsigned integer to 
+            convert to a UUID
+            </summary>
+            <param name="val">64-bit unsigned integer to convert to a UUID</param>
+        </member>
+        <member name="M:OpenMetaverse.UUID.#ctor(OpenMetaverse.UUID)">
+            <summary>
+            Copy constructor
+            </summary>
+            <param name="val">UUID to copy</param>
+        </member>
+        <member name="M:OpenMetaverse.UUID.CompareTo(OpenMetaverse.UUID)">
+            <summary>
+            IComparable.CompareTo implementation
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector4.#ctor(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.UUID.FromBytes(System.Byte[],System.Int32)">
             <summary>
-            Constructor, 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 four four-byte floats</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.Vector4.ApproxEquals(OpenMetaverse.Vector4,System.Single)">
+        <member name="M:OpenMetaverse.UUID.GetBytes">
             <summary>
-            Test if this vector is equal to another vector, within a given
-            tolerance range
+            Returns a copy of the raw bytes for this 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>
+            <returns>A 16 byte array containing this UUID</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector4.CompareTo(OpenMetaverse.Vector4)">
+        <member name="M:OpenMetaverse.UUID.ToBytes(System.Byte[],System.Int32)">
             <summary>
-            IComparable.CompareTo implementation
+            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 16 bytes before the end of the array</param>
         </member>
-        <member name="M:OpenMetaverse.Vector4.IsFinite">
+        <member name="M:OpenMetaverse.UUID.CRC">
             <summary>
-            Test if this vector is composed of all finite numbers
+            Calculate an LLCRC (cyclic redundancy check) for this UUID
             </summary>
+            <returns>The CRC checksum for this UUID</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector4.FromBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.UUID.GetULong">
             <summary>
-            Builds a vector from a byte array
+            Create a 64-bit integer representation from the second half of this UUID
             </summary>
-            <param name="byteArray">Byte array containing a 16 byte vector</param>
-            <param name="pos">Beginning position in the byte array</param>
+            <returns>An integer created from the last eight bytes of this UUID</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector4.GetBytes">
+        <member name="M:OpenMetaverse.UUID.Parse(System.String)">
             <summary>
-            Returns the raw bytes for this vector
+            Generate a UUID from a string
             </summary>
-            <returns>A 16 byte array containing X, Y, Z, and W</returns>
+            <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.Vector4.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.UUID.TryParse(System.String,OpenMetaverse.UUID@)">
             <summary>
-            Writes the raw bytes for this vector to a byte array
+            Generate a UUID from a string
             </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">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.Vector4.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="F:OpenMetaverse.Vector4.Zero">
-            <summary>A vector with a value of 0,0,0,0</summary>
+        <member name="M:OpenMetaverse.UUID.Random">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Vector4.One">
-            <summary>A vector with a value of 1,1,1,1</summary>
+        <member name="M:OpenMetaverse.UUID.GetHashCode">
+            <summary>
+            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="F:OpenMetaverse.Vector4.UnitX">
-            <summary>A vector with a value of 1,0,0,0</summary>
+        <member name="M:OpenMetaverse.UUID.Equals(System.Object)">
+            <summary>
+            Comparison function
+            </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="F:OpenMetaverse.Vector4.UnitY">
-            <summary>A vector with a value of 0,1,0,0</summary>
+        <member name="M:OpenMetaverse.UUID.Equals(OpenMetaverse.UUID)">
+            <summary>
+            Comparison function
+            </summary>
+            <param name="uuid">UUID to compare to</param>
+            <returns>True if the UUIDs are equal, otherwise false</returns>
         </member>
-        <member name="F:OpenMetaverse.Vector4.UnitZ">
-            <summary>A vector with a value of 0,0,1,0</summary>
+        <member name="M:OpenMetaverse.UUID.ToString">
+            <summary>
+            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="F:OpenMetaverse.Vector4.UnitW">
-            <summary>A vector with a value of 0,0,0,1</summary>
+        <member name="M:OpenMetaverse.UUID.op_Equality(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>
+            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="F:OpenMetaverse.ExpiringCache`2.syncRoot">
-            <summary>For thread safety</summary>
+        <member name="M:OpenMetaverse.UUID.op_Inequality(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>
+            Not 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 not equal, otherwise true</returns>
         </member>
-        <member name="F:OpenMetaverse.ExpiringCache`2.isPurging">
-            <summary>For thread safety</summary>
+        <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>
-        <member name="M:OpenMetaverse.ExpiringCache`2.PurgeCache(System.Object,System.Timers.ElapsedEventArgs)">
+        <member name="M:OpenMetaverse.UUID.op_Explicit(System.String)~OpenMetaverse.UUID">
             <summary>
-            Purges expired objects from the cache. Called automatically by the purge timer.
+            String typecasting operator
             </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="F:OpenMetaverse.UUID.Zero">
+            <summary>An UUID with a value of all zeroes</summary>
+        </member>
+        <member name="F:OpenMetaverse.UUID.ZeroString">
+            <summary>A cache of UUID.Zero as a string to optimize a common path</summary>
         </member>
         <member name="T:OpenMetaverse.Vector3">
             <summary>
@@ -1940,6 +1867,13 @@
             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>
@@ -1955,6 +1889,98 @@
         <member name="F:OpenMetaverse.Vector3.UnitZ">
             <summary>A unit vector facing up (Z axis), value 0,0,1</summary>
         </member>
+        <member name="T:OpenMetaverse.TokenBucket">
+            <summary>
+            A hierarchical token bucket for bandwidth throttling. See
+            http://en.wikipedia.org/wiki/Token_bucket for more information
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.TokenBucket.parent">
+            <summary>Parent bucket to this bucket, or null if this is a root
+            bucket</summary>
+        </member>
+        <member name="F:OpenMetaverse.TokenBucket.maxBurst">
+            <summary>Size of the bucket in bytes. If zero, the bucket has 
+            infinite capacity</summary>
+        </member>
+        <member name="F:OpenMetaverse.TokenBucket.tokensPerMS">
+            <summary>Rate that the bucket fills, in bytes per millisecond. If
+            zero, the bucket always remains full</summary>
+        </member>
+        <member name="F:OpenMetaverse.TokenBucket.content">
+            <summary>Number of tokens currently in the bucket</summary>
+        </member>
+        <member name="F:OpenMetaverse.TokenBucket.lastDrip">
+            <summary>Time of the last drip, in system ticks</summary>
+        </member>
+        <member name="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="M:OpenMetaverse.TokenBucket.RemoveTokens(System.Int32)">
+            <summary>
+            Remove a given number of tokens from the bucket
+            </summary>
+            <param name="amount">Number of tokens to remove from the bucket</param>
+            <returns>True if the requested number of tokens were removed from
+            the bucket, otherwise false</returns>
+        </member>
+        <member name="M:OpenMetaverse.TokenBucket.RemoveTokens(System.Int32,System.Boolean@)">
+            <summary>
+            Remove a given number of tokens from the bucket
+            </summary>
+            <param name="amount">Number of tokens to remove from the bucket</param>
+            <param name="dripSucceeded">True if tokens were added to the bucket
+            during this call, otherwise false</param>
+            <returns>True if the requested number of tokens were removed from
+            the bucket, otherwise false</returns>
+        </member>
+        <member name="M:OpenMetaverse.TokenBucket.Drip">
+            <summary>
+            Add tokens to the bucket over time. The number of tokens added each
+            call depends on the length of time that has passed since the last 
+            call to Drip
+            </summary>
+            <returns>True if tokens were added to the bucket, otherwise false</returns>
+        </member>
+        <member name="P:OpenMetaverse.TokenBucket.Parent">
+            <summary>
+            The parent bucket of this bucket, or null if this bucket has no
+            parent. The parent bucket will limit the aggregate bandwidth of all
+            of its children buckets
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.TokenBucket.MaxBurst">
+            <summary>
+            Maximum burst rate in bytes per second. This is the maximum number
+            of tokens that can accumulate in the bucket at any one time
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.TokenBucket.DripRate">
+            <summary>
+            The speed limit of this bucket in bytes per second. This is the
+            number of tokens that are added to the bucket per second
+            </summary>
+            <remarks>Tokens are added to the bucket any time 
+            <seealso cref="M:OpenMetaverse.TokenBucket.RemoveTokens(System.Int32)"/> 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)"/> will 
+            return false regardless of the content of this bucket</remarks>
+            </summary>
+        </member>
         <member name="T:OpenMetaverse.PCode">
             <summary>
             Identifier code for primitive types
@@ -2165,6 +2191,12 @@
         <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>
             
@@ -2391,6 +2423,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
@@ -2508,6 +2546,20 @@
         <member name="F:OpenMetaverse.ClickAction.OpenMedia">
             <summary>Open parcel media</summary>
         </member>
+        <member name="T:OpenMetaverse.PhysicsShapeType">
+            <summary>
+            Type of physics representation used for this prim in the simulator
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.PhysicsShapeType.Prim">
+            <summary>Use prim physics form this object</summary>
+        </member>
+        <member name="F:OpenMetaverse.PhysicsShapeType.None">
+            <summary>No physics, prim doesn't collide</summary>
+        </member>
+        <member name="F:OpenMetaverse.PhysicsShapeType.ConvexHull">
+            <summary>Use convex hull represantion of this prim</summary>
+        </member>
         <member name="T:OpenMetaverse.Vector2">
             <summary>
             A two-dimensional vector with floating-point values
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index 6cc4c5a..00397a9 100755
Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ
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
Binary files /dev/null and b/bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-i686.so differ
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
Binary files /dev/null and b/bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64.so differ
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
Binary files /dev/null and b/bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1.dylib differ
-- 
cgit v1.1


From ce043c5141dde0ffed39d548bf680885a73e2908 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Wed, 17 Apr 2013 22:41:12 -0700
Subject: Allow changes to TextureEntry to propagate to viewers when MaterialID
 changes

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 93d4da0..0e85b87 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4571,6 +4571,8 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (oldFace.TextureID != newFace.TextureID)
                     changeFlags |= Changed.TEXTURE;
+                if (oldFace.MaterialID != newFace.MaterialID)
+                    changeFlags |= Changed.TEXTURE;
 
                 // Max change, skip the rest of testing
                 if (changeFlags == (Changed.TEXTURE | Changed.COLOR))
-- 
cgit v1.1


From 53122fad400e2d5bac5f02a3e153b6e76c9112b3 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Wed, 17 Apr 2013 23:10:02 -0700
Subject: Thanks lkalif for a fix to SendRegionHandshake() which fixes a
 potential crash with Server-side baking enabled viewers

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 110e50e..02b326e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -791,11 +791,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             handshake.RegionInfo3.ColoName = Utils.EmptyBytes;
             handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType);
             handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes;
-            handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[0];
-            
+
+            handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[1];
+            handshake.RegionInfo4[0].RegionFlagsExtended = args.regionFlags;
+            handshake.RegionInfo4[0].RegionProtocols = 0; // 1 here would indicate that SSB is supported
+
             OutPacket(handshake, ThrottleOutPacketType.Task);
         }
 
+
         public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
         {
             AgentMovementCompletePacket mov = (AgentMovementCompletePacket)PacketPool.Instance.GetPacket(PacketType.AgentMovementComplete);
-- 
cgit v1.1


From 7c839f176fab8166d4787ddbdffdda5f8d9e55ca Mon Sep 17 00:00:00 2001
From: dahlia
Date: Wed, 17 Apr 2013 23:14:28 -0700
Subject: amend previous commit, a line was left out

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 02b326e..1609012 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -793,6 +793,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes;
 
             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
 
-- 
cgit v1.1


From d5419f0a463d67ef40c2212484fc95ca0a4b3b5b Mon Sep 17 00:00:00 2001
From: dahlia
Date: Thu, 18 Apr 2013 01:03:19 -0700
Subject: Initial experimental support for materials-capable viewers. This is
 in a very early stage and this module is disabled by default and should only
 be used by developers for testing as this module could cause data corruption
 and/or viewer crashes. No materials are persisted yet.

---
 .../Materials/MaterialsDemoModule.cs               | 382 +++++++++++++++++++++
 prebuild.xml                                       |   1 +
 2 files changed, 383 insertions(+)
 create mode 100644 OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
new file mode 100644
index 0000000..de2c3fc
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -0,0 +1,382 @@
+/*
+ * 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("MyModule", "1.0")]
+//[assembly: AddinDependency("OpenSim", "0.5")]
+
+namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
+{
+    /// <summary>
+    ///
+    //   #    #    ##    #####   #    #     #    #    #   ####
+    //   #    #   #  #   #    #  ##   #     #    ##   #  #    #
+    //   #    #  #    #  #    #  # #  #     #    # #  #  #
+    //   # ## #  ######  #####   #  # #     #    #  # #  #  ###
+    //   ##  ##  #    #  #   #   #   ##     #    #   ##  #    #
+    //   #    #  #    #  #    #  #    #     #    #    #   ####
+    //
+    //
+    //
+    //////////////  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.
+    /// 
+    /// CURRENTLY NO MATERIALS ARE PERSISTED ACROSS SIMULATOR RESTARTS OR ARE STORED IN ANY INVENTORY OR ASSETS
+    /// This may change in future implementations.
+    /// 
+    /// 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 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 += new EventManager.RegisterCapsEvent(OnRegisterCaps);
+        }
+
+        void OnRegisterCaps(OpenMetaverse.UUID agentID, OpenSim.Framework.Capabilities.Caps caps)
+        {
+            string capsBase = "/CAPS/" + caps.CapsObjectPath;
+
+            IRequestHandler renderMaterialsPostHandler = new RestStreamHandler("POST", capsBase + "/", RenderMaterialsPostCap);
+            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);
+            MainServer.Instance.AddStreamHandler(renderMaterialsGetHandler); 
+        }
+        
+        public void RemoveRegion(Scene scene)
+        {
+            if (!m_enabled)
+                return;
+
+            m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
+        }        
+        
+        public void RegionLoaded(Scene scene)
+        {
+            if (!m_enabled)
+                return;
+            m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} LOADED", scene.RegionInfo.RegionName);
+        }
+
+        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;
+
+            if (req.ContainsKey("Zipped"))
+            {
+                OSD osd = null;
+
+                byte[] inBytes = req["Zipped"].AsBinary();
+
+                try 
+                {
+                    osd = ZDecompressBytesToOsd(inBytes);
+
+                    if (osd != null && osd is OSDMap)
+                    {
+                        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);
+                                        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 = sop.Shape.Textures;
+
+                                            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
+                                                        {
+                                                            if (te.DefaultTexture.MaterialID == null)
+                                                                m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture.MaterialID 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());
+
+                                                sop.UpdateTextureEntry(te);
+                                            }
+                                        }
+                                    }
+                                }
+                                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());
+            }
+
+
+            string response = OSDParser.SerializeLLSDXmlString(resp);
+
+            m_log.Debug("[MaterialsDemoModule]: cap request: " + request);
+            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();
+
+            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);
+        }
+
+        public Dictionary<UUID, OSDMap> m_knownMaterials = new Dictionary<UUID, OSDMap>();
+
+        /// <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 = true)
+        {
+            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();
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/prebuild.xml b/prebuild.xml
index 050fe0f..2d35529 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1635,6 +1635,7 @@
       <Reference name="System.Xml"/>
       <Reference name="System.Drawing"/>
       <Reference name="System.Web"/>
+      <Reference name="Ionic.Zip"/>
       <Reference name="NDesk.Options" path="../../../bin/"/>
       <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
       <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
-- 
cgit v1.1


From 06829c4082ba10fc9d3b4b37f42f01ab005c5e23 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Thu, 18 Apr 2013 01:29:50 -0700
Subject: remove default parameter value that apparently mono cant handle

---
 OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index de2c3fc..74a4ea7 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -327,7 +327,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                     return new UUID(md5.ComputeHash(ms), 0);
         }
 
-        public static OSD ZCompressOSD(OSD inOsd, bool useHeader = true)
+        public static OSD ZCompressOSD(OSD inOsd, bool useHeader)
         {
             OSD osd = null;
 
-- 
cgit v1.1


From 9ae24cac2fcf5ac00ec8e4ccae5e58e9ff90db74 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Fri, 19 Apr 2013 00:35:06 -0700
Subject: Materials-capable viewers send ImageUpdate packets when updating
 materials that are normally sent via RenderMaterials CAP. This can cause a
 race condition for updating TextureEntry fields. Therefore filter any
 TextureEntry updates so they only update if something actually changed.

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 46 ++++++++++++++++------
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 0e85b87..347a2b5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4549,6 +4549,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++)
             {
 
@@ -4571,24 +4579,40 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (oldFace.TextureID != newFace.TextureID)
                     changeFlags |= Changed.TEXTURE;
-                if (oldFace.MaterialID != newFace.MaterialID)
-                    changeFlags |= Changed.TEXTURE;
 
                 // 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();
+            }
         }
 
         public void aggregateScriptEvents()
-- 
cgit v1.1


From 258804cc043530927f442cd76337a3dab4ec742b Mon Sep 17 00:00:00 2001
From: dahlia
Date: Fri, 19 Apr 2013 22:19:57 -0700
Subject: RenderMaterials POST Cap now return material entries when invoked
 with an OSDArray of MaterialIDs

---
 .../Materials/MaterialsDemoModule.cs               | 169 +++++++++++++--------
 1 file changed, 108 insertions(+), 61 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 74a4ea7..7002e66 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -48,7 +48,7 @@ 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("MyModule", "1.0")]
+//[assembly: Addin("MaterialsDemoModule", "1.0")]
 //[assembly: AddinDependency("OpenSim", "0.5")]
 
 namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
@@ -159,6 +159,8 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
 
             OSDMap materialsFromViewer = null;
 
+            OSDArray respArr = new OSDArray();
+
             if (req.ContainsKey("Zipped"))
             {
                 OSD osd = null;
@@ -169,101 +171,145 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                 {
                     osd = ZDecompressBytesToOsd(inBytes);
 
-                    if (osd != null && osd is OSDMap)
+                    if (osd != null)
                     {
-                        materialsFromViewer = osd as OSDMap;
-
-                        if (materialsFromViewer.ContainsKey("FullMaterialsPerFace"))
+                        if (osd is OSDArray) // assume array of MaterialIDs designating requested material entries
                         {
-                            OSD matsOsd = materialsFromViewer["FullMaterialsPerFace"];
-                            if (matsOsd is OSDArray)
+                            foreach (OSD elem in (OSDArray)osd)
                             {
-                                OSDArray matsArr = matsOsd as OSDArray;
 
                                 try
                                 {
-                                    foreach (OSDMap matsMap in matsArr)
+                                    UUID id = new UUID(elem.AsBinary(), 0);
+                                    
+                                    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
                                     {
-                                        m_log.Debug("[MaterialsDemoModule]: processing matsMap: " + OSDParser.SerializeJsonString(matsMap));
+                                        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());
+                                            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));
+                                            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);
-                                        m_knownMaterials[id] = mat;
+                                            UUID id = HashOsd(mat);
+                                            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 = sop.Shape.Textures;
-
-                                            if (te == null)
-                                            {
-                                                m_log.Debug("[MaterialsDemoModule]: null TextureEntry for localId: " + matLocalID.ToString());
-                                            }
+                                            var sop = m_scene.GetSceneObjectPart(matLocalID);
+                                            if (sop == null)
+                                                m_log.Debug("[MaterialsDemoModule]: null SOP for localId: " + matLocalID.ToString());
                                             else
                                             {
-                                                int face = -1;
+                                                //var te = sop.Shape.Textures;
+                                                var te = new Primitive.TextureEntry(sop.Shape.TextureEntry, 0, sop.Shape.TextureEntry.Length);
 
-                                                if (matsMap.ContainsKey("Face"))
+                                                if (te == null)
+                                                {
+                                                    m_log.Debug("[MaterialsDemoModule]: null TextureEntry for localId: " + matLocalID.ToString());
+                                                }
+                                                else
                                                 {
-                                                    face = matsMap["Face"].AsInteger();
-                                                    if (te.FaceTextures == null) // && face == 0)
+                                                    int face = -1;
+
+                                                    if (matsMap.ContainsKey("Face"))
                                                     {
-                                                        if (te.DefaultTexture == null)
-                                                            m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture is null");
-                                                        else
+                                                        face = matsMap["Face"].AsInteger();
+                                                        if (te.FaceTextures == null) // && face == 0)
                                                         {
-                                                            if (te.DefaultTexture.MaterialID == null)
-                                                                m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture.MaterialID is null");
+                                                            if (te.DefaultTexture == null)
+                                                                m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture is null");
                                                             else
                                                             {
-                                                                te.DefaultTexture.MaterialID = id;
+                                                                if (te.DefaultTexture.MaterialID == null)
+                                                                    m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture.MaterialID 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.FaceTextures.Length >= face - 1)
-                                                        {
-                                                            if (te.FaceTextures[face] == null)
-                                                                te.DefaultTexture.MaterialID = id;
-                                                            else
-                                                                te.FaceTextures[face].MaterialID = id;
-                                                        }
+                                                        if (te.DefaultTexture != null)
+                                                            te.DefaultTexture.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());
+                                                    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
 
-                                                sop.UpdateTextureEntry(te);
+                                                    if (sop.ParentGroup != null)
+                                                    {
+                                                        sop.Shape.TextureEntry = te.GetBytes();
+                                                        sop.TriggerScriptChangedEvent(Changed.TEXTURE);
+                                                        sop.UpdateFlag = UpdateRequired.FULL;
+                                                        sop.ParentGroup.HasGroupChanged = true;
+
+                                                        sop.ScheduleFullUpdate();
+
+                                                    }
+                                                }
                                             }
                                         }
                                     }
-                                }
-                                catch (Exception e)
-                                {
-                                    m_log.Warn("[MaterialsDemoModule]: exception processing received material: " + e.Message);
+                                    catch (Exception e)
+                                    {
+                                        m_log.Warn("[MaterialsDemoModule]: exception processing received material: " + e.Message);
+                                    }
                                 }
                             }
                         }
                     }
+
                 }
                 catch (Exception e)
                 {
@@ -273,7 +319,8 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                 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);
-- 
cgit v1.1


From 233f76177997cbe12aa100a3511d45bc1e9ccc5f Mon Sep 17 00:00:00 2001
From: dahlia
Date: Sat, 20 Apr 2013 02:08:22 -0700
Subject: handle PUT verb for RenderMaterials Cap

---
 OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 7002e66..4501dad 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -130,7 +130,11 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             // handler normally and then add a GET handler via MainServer
 
             IRequestHandler renderMaterialsGetHandler = new RestStreamHandler("GET", capsBase + "/", RenderMaterialsGetCap);
-            MainServer.Instance.AddStreamHandler(renderMaterialsGetHandler); 
+            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);
+            MainServer.Instance.AddStreamHandler(renderMaterialsPutHandler);
         }
         
         public void RemoveRegion(Scene scene)
-- 
cgit v1.1


From f40abc493a34ce959bdc55d4e52b5381083935b6 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sat, 20 Apr 2013 11:54:05 -0400
Subject: Small fix to prebuild xml for building with mono tools

---
 prebuild.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prebuild.xml b/prebuild.xml
index 2d35529..29d7c90 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1635,7 +1635,7 @@
       <Reference name="System.Xml"/>
       <Reference name="System.Drawing"/>
       <Reference name="System.Web"/>
-      <Reference name="Ionic.Zip"/>
+      <Reference name="Ionic.Zip" path="../../../bin/"/>
       <Reference name="NDesk.Options" path="../../../bin/"/>
       <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
       <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
-- 
cgit v1.1


From 855c88a9c0f419566ad63e440c0696dabf32313f Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sat, 20 Apr 2013 11:57:11 -0400
Subject: Fix spelling

---
 bin/Robust.ini.example | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index d932ce7..b98132e 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -18,13 +18,13 @@
 	; 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 
+	; 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 hvae R/W access to the location 
+	; The Robust.exe process must have R/W access to the location 
 	ConfigDirectory = "/home/opensim/etc/Configs"
 
 [ServiceList]
-- 
cgit v1.1


From 69f07fdb349a2671fe86f96f119c0ea1276faacb Mon Sep 17 00:00:00 2001
From: dahlia
Date: Sat, 20 Apr 2013 23:39:07 -0700
Subject: Materials persistence via SceneObjectPart.dynAttrs. This appears to
 work across region restarts and taking objects into inventory, but probably
 will not work across archiving via OAR or IAR as materials texture assets may
 not be adequately referenced to trigger archiving.

---
 .../Materials/MaterialsDemoModule.cs               | 162 ++++++++++++++++++++-
 1 file changed, 154 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 4501dad..4ab6609 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -62,15 +62,21 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
     //   ##  ##  #    #  #   #   #   ##     #    #   ##  #    #
     //   #    #  #    #  #    #  #    #     #    #    #   ####
     //
-    //
+    //   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.
     /// 
-    /// CURRENTLY NO MATERIALS ARE PERSISTED ACROSS SIMULATOR RESTARTS OR ARE STORED IN ANY INVENTORY OR ASSETS
-    /// This may change in future implementations.
+    /// 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]
@@ -89,6 +95,8 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
 
         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)
         {
@@ -97,7 +105,6 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                 return;
 
             m_log.DebugFormat("[MaterialsDemoModule]: INITIALIZED MODULE");
-
         }
         
         public void Close()
@@ -116,6 +123,14 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} ADDED", scene.RegionInfo.RegionName);
             m_scene = scene;
             m_scene.EventManager.OnRegisterCaps += new EventManager.RegisterCapsEvent(OnRegisterCaps);
+            m_scene.EventManager.OnObjectAddedToScene += new Action<SceneObjectGroup>(EventManager_OnObjectAddedToScene);
+        }
+
+        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)
@@ -147,11 +162,130 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
         
         public void RegionLoaded(Scene scene)
         {
-            if (!m_enabled)
+        }
+
+        OSDMap GetMaterial(UUID id)
+        {
+            OSDMap map = null;
+            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)
+        { 
+            OSDMap OSMaterials = null;
+            OSDArray matsArr = null;
+
+            if (part.DynAttrs == null)
+            {
+                m_log.Warn("[MaterialsDemoModule]: NULL DYNATTRS :( ");
+            }
+
+            lock (part.DynAttrs)
+            {
+                if (part.DynAttrs.ContainsKey("OS:Materials"))
+                    OSMaterials = part.DynAttrs["OS:Materials"];
+                if (OSMaterials != null && OSMaterials.ContainsKey("Materials"))
+                {
+
+                    OSD osd = OSMaterials["Materials"];
+                    if (osd is OSDArray)
+                        matsArr = osd as OSDArray;
+                }
+            }
+
+            if (OSMaterials == null)
                 return;
-            m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} LOADED", scene.RegionInfo.RegionName);
+
+            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
+                        {
+                            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)
+                {
+                    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)
+                        {
+                            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["OS: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)
@@ -300,6 +434,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
 
                                                         sop.ScheduleFullUpdate();
 
+                                                        StoreMaterialsForPart(sop);
                                                     }
                                                 }
                                             }
@@ -327,7 +462,8 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             resp["Zipped"] = ZCompressOSD(respArr, false);
             string response = OSDParser.SerializeLLSDXmlString(resp);
 
-            m_log.Debug("[MaterialsDemoModule]: cap request: " + request);
+            //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;
         }
@@ -364,7 +500,17 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             return OSDParser.SerializeLLSDXmlString(resp);
         }
 
-        public Dictionary<UUID, OSDMap> m_knownMaterials = new Dictionary<UUID, OSDMap>();
+        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
-- 
cgit v1.1


From 6ddc39a676916009e60d38ab24e7353b9646994e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 21 Apr 2013 16:56:18 -0700
Subject: Clean up unused config and config comments.

---
 bin/config-include/StandaloneCommon.ini.example | 14 +++++++-------
 bin/config-include/StandaloneHypergrid.ini      |  5 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index f80044e..2547244 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -85,7 +85,7 @@
     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 +94,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"    
@@ -240,7 +240,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 +297,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 +318,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 +337,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"
 
 
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 195e780..ba92030 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -55,8 +55,6 @@
     HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
 
 [InventoryService]
-    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:XInventoryService"
-
     ; For HGInventoryBroker
     LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
@@ -147,6 +145,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
-- 
cgit v1.1


From 293a024c141d3567d42169f625bc449b89a1b59d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 22 Apr 2013 22:24:41 +0200
Subject: Allow callers to set the invoice parameter for GenericMessage

---
 OpenSim/Framework/IClientAPI.cs                            |  4 ++--
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs      | 14 ++++++++++++--
 .../CoreModules/World/LightShare/LightShareModule.cs       |  4 ++--
 .../Agent/InternetRelayClientView/Server/IRCClientView.cs  |  4 ++--
 OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs      |  4 ++--
 OpenSim/Tests/Common/Mock/TestClient.cs                    |  4 ++--
 6 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index f6b7689..10ead39 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1116,8 +1116,8 @@ namespace OpenSim.Framework
 
         void SendInstantMessage(GridInstantMessage im);
 
-        void SendGenericMessage(string method, List<string> message);
-        void SendGenericMessage(string method, List<byte[]> message);
+        void SendGenericMessage(string method, UUID invoice, List<string> message);
+        void SendGenericMessage(string method, UUID invoice, List<byte[]> message);
 
         void SendLayerData(float[] map);
         void SendLayerData(int px, int py, float[] map);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 1609012..1eb953c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -900,9 +900,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
-        public void SendGenericMessage(string method, List<string> message)
+        public void SendGenericMessage(string method, UUID invoice, List<string> message)
         {
             GenericMessagePacket gmp = new GenericMessagePacket();
+
+            gmp.AgentData.AgentID = AgentId;
+            gmp.AgentData.SessionID = m_sessionId;
+            gmp.AgentData.TransactionID = invoice;
+
             gmp.MethodData.Method = Util.StringToBytes256(method);
             gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count];
             int i = 0;
@@ -915,9 +920,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutPacket(gmp, ThrottleOutPacketType.Task);
         }
 
-        public void SendGenericMessage(string method, List<byte[]> message)
+        public void SendGenericMessage(string method, UUID invoice, List<byte[]> message)
         {
             GenericMessagePacket gmp = new GenericMessagePacket();
+
+            gmp.AgentData.AgentID = AgentId;
+            gmp.AgentData.SessionID = m_sessionId;
+            gmp.AgentData.TransactionID = invoice;
+
             gmp.MethodData.Method = Util.StringToBytes256(method);
             gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count];
             int i = 0;
diff --git a/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
index 4e20196..89f3280 100644
--- a/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
+++ b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
@@ -195,12 +195,12 @@ namespace OpenSim.Region.CoreModules.World.LightShare
                 if (m_scene.RegionInfo.WindlightSettings.valid)
                 {
                     List<byte[]> param = compileWindlightSettings(wl);
-                    client.SendGenericMessage("Windlight", param);
+                    client.SendGenericMessage("Windlight", UUID.Random(), param);
                 }
                 else
                 {
                     List<byte[]> param = new List<byte[]>();
-                    client.SendGenericMessage("WindlightReset", param);
+                    client.SendGenericMessage("WindlightReset", UUID.Random(), param);
                 }
             }
         }
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 0ac56fa..915ebd8 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -971,12 +971,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
             // TODO
         }
 
-        public void SendGenericMessage(string method, List<string> message)
+        public void SendGenericMessage(string method, UUID invoice, List<string> message)
         {
 
         }
 
-        public void SendGenericMessage(string method, List<byte[]> message)
+        public void SendGenericMessage(string method, UUID invoice, List<byte[]> message)
         {
             
         }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 6bd27f0..0ee00e9 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -620,12 +620,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC
             
         }
 
-        public void SendGenericMessage(string method, List<string> message)
+        public void SendGenericMessage(string method, UUID invoice, List<string> message)
         {
 
         }
 
-        public void SendGenericMessage(string method, List<byte[]> message)
+        public void SendGenericMessage(string method, UUID invoice, List<byte[]> message)
         {
 
         }
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 2d4fef1..d26e3f7 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -541,12 +541,12 @@ namespace OpenSim.Tests.Common.Mock
 
         }
 
-        public void SendGenericMessage(string method, List<string> message)
+        public void SendGenericMessage(string method, UUID invoice, List<string> message)
         {
 
         }
 
-        public void SendGenericMessage(string method, List<byte[]> message)
+        public void SendGenericMessage(string method, UUID invoice, List<byte[]> message)
         {
 
         }
-- 
cgit v1.1


From e1ac68315491a0962bd4d089f7190e1b82607f43 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 21 Apr 2013 15:59:39 -0700
Subject: BulletSim: fix crash when deleting llVolumeDetect enabled objects.
 Bullet's check for an object being linked into the world does not work for
 Bullet's ghost objects so BulletSim was deleting the object while it was
 still linked into the physical world structures.

---
 OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index bfa69b2..1976c42 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -162,11 +162,8 @@ public sealed class BSShapeCollection : IDisposable
             // 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);
-            }
+            // Removing an object not in the world is a NOOP
+            PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, body);
 
             // Zero any reference to the shape so it is not freed when the body is deleted.
             PhysicsScene.PE.SetCollisionShape(PhysicsScene.World, body, null);
-- 
cgit v1.1


From 115e0aaf830d31530680b38afd705380be3f284a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 23 Apr 2013 21:54:32 +0100
Subject: Fix issue in ConciergeModule where UpdateBroker was sending malformed
 XML if any number of avatars other than 1 was in the region.

I don't know how well the rest of ConiergeModule works since I've practically never looked at this code.
Addresses http://opensimulator.org/mantis/view.php?id=6605
---
 OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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
-- 
cgit v1.1


From ed2201464664c2f923201414bd42b5998fbc96f9 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Tue, 23 Apr 2013 15:01:20 -0700
Subject: revert CSJ2K.dll to version in use prior to commit
 d4fa2c69ed2895dcab76e0df1b26252246883c07

---
 bin/CSJ2K.dll | Bin 495616 -> 502784 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/CSJ2K.dll b/bin/CSJ2K.dll
index 581e410..238291f 100755
Binary files a/bin/CSJ2K.dll and b/bin/CSJ2K.dll differ
-- 
cgit v1.1


From 522ab85045066cb58bb76881032adab7cc6a2d68 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 23 Apr 2013 18:31:12 -0700
Subject: BulletSim: improve avatar stair walking up. Add more parameters to
 control force of both position change and up force that move avatars over
 barrier. Default parameters are for steps up to 0.5m in height.

---
 .../Physics/BulletSPlugin/BSActorAvatarMove.cs     | 103 +++++++++++++++++----
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs    |  15 ++-
 .../Region/Physics/BulletSPlugin/BSPhysObject.cs   |  22 ++++-
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     |   5 +
 .../Region/Physics/BulletSPlugin/BulletSimTODO.txt |   3 +
 5 files changed, 123 insertions(+), 25 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
index 8416740..bd5ee0b1 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -40,10 +40,16 @@ 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;
+    float m_lastStepUp;
+
     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);
     }
 
@@ -119,6 +125,8 @@ public class BSActorAvatarMove : BSActor
             SetVelocityAndTarget(m_controllingPrim.RawVelocity, m_controllingPrim.TargetVelocity, true /* inTaintTime */);
 
             m_physicsScene.BeforeStep += Mover;
+
+            m_walkingUpStairs = 0;
         }
     }
 
@@ -216,8 +224,6 @@ public class BSActorAvatarMove : BSActor
             // '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;
 
-            // 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();
 
@@ -233,24 +239,33 @@ public class BSActorAvatarMove : BSActor
     {
         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);
         // 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 (m_controllingPrim.IsColliding && !m_controllingPrim.Flying && m_controllingPrim.TargetVelocitySpeed > 0.1f /* && ForwardSpeed < 0.1f */)
+        // 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;
+            // 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
+            // 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)
                 {
                     OMV.Vector3 touchPosition = kvp.Value.Position;
-                    // DetailLog("{0},BSCharacter.WalkUpStairs,min={1},max={2},touch={3}",
-                    //                 LocalID, nearFeetHeightMin, nearFeetHeightMax, touchPosition);
+                    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.
@@ -261,24 +276,76 @@ public class BSActorAvatarMove : BSActor
                         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) * m_controllingPrim.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);
-                            m_controllingPrim.ForcePosition = m_controllingPrim.RawPosition + displacement;
+                            if (highestTouchPosition.Z < touchPosition.Z)
+                                highestTouchPosition = touchPosition;
                         }
-                        m_physicsScene.DetailLog("{0},BSCharacter.WalkUpStairs,touchPos={1},nearFeetMin={2},faceDir={3},norm={4},diff={5},ret={6}",
-                                m_controllingPrim.LocalID, touchPosition, nearFeetHeightMin, directionFacing, touchNormal, diff, ret);
                     }
                 }
             }
+            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/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 06df85e..980d405 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -128,6 +128,8 @@ public static class BSParam
 	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; }
@@ -234,6 +236,7 @@ public static class BSParam
             objectSet = pObjSetter;
         }
         /* Wish I could simplify using this definition but CLR doesn't store references so closure around delegates of references won't work
+         * TODO: Maybe use reflection and the name of the variable to create a reference for the getter/setter.
         public ParameterDefn(string pName, string pDesc, T pDefault, ref T loc)
             : base(pName, pDesc)
         {
@@ -561,7 +564,7 @@ public static class BSParam
             (s) => { return AvatarBelowGroundUpCorrectionMeters; },
             (s,v) => { AvatarBelowGroundUpCorrectionMeters = v; } ),
 	    new ParameterDefn<float>("AvatarStepHeight", "Height of a step obstacle to consider step correction",
-            0.3f,
+            0.6f,
             (s) => { return AvatarStepHeight; },
             (s,v) => { AvatarStepHeight = v; } ),
 	    new ParameterDefn<float>("AvatarStepApproachFactor", "Factor to control angle of approach to step (0=straight on)",
@@ -569,9 +572,17 @@ public static class BSParam
             (s) => { return AvatarStepApproachFactor; },
             (s,v) => { AvatarStepApproachFactor = v; } ),
 	    new ParameterDefn<float>("AvatarStepForceFactor", "Controls the amount of force up applied to step up onto a step",
-            2.0f,
+            1.0f,
             (s) => { return AvatarStepForceFactor; },
             (s,v) => { AvatarStepForceFactor = v; } ),
+	    new ParameterDefn<float>("AvatarStepUpCorrectionFactor", "Multiplied by height of step collision to create up movement at step",
+            1.0f,
+            (s) => { return AvatarStepUpCorrectionFactor; },
+            (s,v) => { AvatarStepUpCorrectionFactor = v; } ),
+	    new ParameterDefn<int>("AvatarStepSmoothingSteps", "Number of frames after a step collision that we continue walking up stairs",
+            2,
+            (s) => { return AvatarStepSmoothingSteps; },
+            (s,v) => { AvatarStepSmoothingSteps = v; } ),
 
         new ParameterDefn<float>("VehicleMaxLinearVelocity", "Maximum velocity magnitude that can be assigned to a vehicle",
             1000.0f,
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 98eb4ca..309d004 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -96,7 +96,7 @@ public abstract class BSPhysObject : PhysicsActor
         SetMaterial((int)MaterialAttributes.Material.Wood);
 
         CollisionCollection = new CollisionEventUpdate();
-        CollisionsLastTick = CollisionCollection;
+        CollisionsLastReported = CollisionCollection;
         SubscribedEventsMs = 0;
         CollidingStep = 0;
         CollidingGroundStep = 0;
@@ -368,11 +368,14 @@ public abstract class BSPhysObject : PhysicsActor
         }
     }
 
-    // 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).
     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.
@@ -399,6 +402,15 @@ public abstract class BSPhysObject : PhysicsActor
         // For movement tests, remember if we are colliding with an object that is moving.
         ColliderIsMoving = collidee != null ? (collidee.RawVelocity != OMV.Vector3.Zero) : 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 != PhysicsScene.SimulationStep)
+        {
+            CollisionsLastTick = new CollisionEventUpdate();
+            CollisionsLastTickStep = PhysicsScene.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()) {
             CollisionCollection.AddCollider(collidingWith, new ContactPoint(contactPoint, contactNormal, pentrationDepth));
@@ -419,7 +431,7 @@ 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))
@@ -438,7 +450,7 @@ 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.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 3423d2e..4bc266b 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -69,12 +69,17 @@ public class BSPrim : BSPhysObject
 
     private int CrossingFailures { get; set; }
 
+    // Keep a handle to the vehicle actor so it is easy to set parameters on same.
     public BSDynamics VehicleActor;
     public const string VehicleActorName = "BasicVehicle";
 
+    // Parameters for the hover actor
     public const string HoverActorName = "HoverActor";
+    // Parameters for the axis lock actor
     public const String LockedAxisActorName = "BSPrim.LockedAxis";
+    // Parameters for the move to target actor
     public const string MoveToTargetActorName = "MoveToTargetActor";
+    // Parameters for the setForce and setTorque actors
     public const string SetForceActorName = "SetForceActor";
     public const string SetTorqueActorName = "SetTorqueActor";
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
index a0131c7..1284ae7 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
@@ -42,6 +42,8 @@ One sided meshes? Should terrain be built into a closed shape?
 
 VEHICLES TODO LIST:
 =================================================
+UBit improvements to remove rubber-banding of avatars sitting on vehicle child prims:
+	https://github.com/UbitUmarov/Ubit-opensim
 Border crossing with linked vehicle causes crash
 	20121129.1411: editting/moving phys object across region boundries causes crash
 	    getPos-> btRigidBody::upcast -> getBodyType -> BOOM
@@ -167,6 +169,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
-- 
cgit v1.1


From e324f6f3f0f8d894190cd7a9733687ac4308b2c1 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 24 Apr 2013 08:03:45 -0700
Subject: BulletSim: update DLLs and SOs to they have no dependencies on newer
 glibc (2.14) since that is not yet in some Linux distributions. Add unmanaged
 API calls and code for creating single convex hull shapes.

---
 OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs |  27 +++++++++++++++++++++
 OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs   |  10 ++++++++
 .../Region/Physics/BulletSPlugin/BSApiTemplate.cs  |   7 ++++++
 bin/lib32/BulletSim.dll                            | Bin 1008640 -> 1010176 bytes
 bin/lib32/libBulletSim.so                          | Bin 2093987 -> 2096572 bytes
 bin/lib64/BulletSim.dll                            | Bin 1140224 -> 1142272 bytes
 bin/lib64/libBulletSim.so                          | Bin 2258808 -> 2265980 bytes
 7 files changed, 44 insertions(+)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
index f5b84d4..fdf2cb9 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
@@ -268,6 +268,25 @@ public override BulletShape BuildHullShapeFromMesh(BulletWorld world, BulletShap
                     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;
@@ -1414,6 +1433,14 @@ public static extern IntPtr CreateHullShape2(IntPtr world,
 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);
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
index f6b4359..b37265a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
@@ -1778,6 +1778,16 @@ private sealed class BulletConstraintXNA : BulletConstraint
         /* 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);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index d0d9f34..bfeec24 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -70,6 +70,7 @@ public enum BSPhysicsShapeType
 	SHAPE_COMPOUND  = 22,
 	SHAPE_HEIGHTMAP = 23,
     SHAPE_AVATAR    = 24,
+    SHAPE_CONVEXHULL= 25,
 };
 
 // The native shapes have predefined shape hash keys
@@ -325,6 +326,12 @@ public abstract BulletShape CreateHullShape(BulletWorld world,
 
 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);
 
 public abstract bool IsNativeShape(BulletShape shape);
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 618d4bd..1e94d05 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index e3b40fb..d79896a 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 491ac22..68cfcc4 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index a8ad533..08c00af 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1


From c22a2ab7d21803050317527476c2e18aa2edb40f Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 24 Apr 2013 08:05:42 -0700
Subject: BulletSim: partial addition of BSShape class code preparing for
 different physical mesh representations (simplified convex meshes) and avatar
 mesh.

---
 .../Physics/BulletSPlugin/BSShapeCollection.cs     |  28 +--
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs   | 215 +++++++++++++++++----
 2 files changed, 191 insertions(+), 52 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index 1976c42..bc26460 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -612,7 +612,7 @@ public sealed class BSShapeCollection : IDisposable
 
         newShape = CreatePhysicalMesh(prim, newMeshKey, prim.BaseShape, prim.Size, lod);
         // Take evasive action if the mesh was not constructed.
-        newShape = VerifyMeshCreated(newShape, prim);
+        newShape = VerifyMeshCreated(PhysicsScene, newShape, prim);
 
         ReferenceShape(newShape);
 
@@ -719,7 +719,7 @@ public sealed class BSShapeCollection : IDisposable
 
         newShape = CreatePhysicalHull(prim, newHullKey, prim.BaseShape, prim.Size, lod);
         // It might not have been created if we're waiting for an asset.
-        newShape = VerifyMeshCreated(newShape, prim);
+        newShape = VerifyMeshCreated(PhysicsScene, newShape, prim);
 
         ReferenceShape(newShape);
 
@@ -923,7 +923,7 @@ public sealed class BSShapeCollection : IDisposable
 
     // 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)
+    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;
@@ -944,7 +944,7 @@ public sealed class BSShapeCollection : IDisposable
         return pbs.GetMeshKey(size, lod);
     }
     // For those who don't want the LOD
-    private System.UInt64 ComputeShapeKey(OMV.Vector3 size, PrimitiveBaseShape pbs)
+    public static System.UInt64 ComputeShapeKey(OMV.Vector3 size, PrimitiveBaseShape pbs)
     {
         float lod;
         return ComputeShapeKey(size, pbs, out lod);
@@ -957,7 +957,7 @@ public sealed class BSShapeCollection : IDisposable
     //     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)
+    public static BulletShape VerifyMeshCreated(BSScene physicsScene, BulletShape newShape, BSPhysObject prim)
     {
         // If the shape was successfully created, nothing more to do
         if (newShape.HasPhysicalShape)
@@ -969,7 +969,7 @@ public sealed class BSShapeCollection : IDisposable
         if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Fetched)
         {
             prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
-            PhysicsScene.Logger.WarnFormat("{0} Fetched asset would not mesh. {1}, texture={2}",
+            physicsScene.Logger.WarnFormat("{0} Fetched asset would not mesh. {1}, texture={2}",
                                             LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
         }
         else
@@ -981,14 +981,14 @@ public sealed class BSShapeCollection : IDisposable
                 && prim.BaseShape.SculptTexture != OMV.UUID.Zero
                 )
             {
-                DetailLog("{0},BSShapeCollection.VerifyMeshCreated,fetchAsset", prim.LocalID);
+                physicsScene.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;
+                        RequestAssetDelegate assetProvider = physicsScene.RequestAssetMethod;
                         if (assetProvider != null)
                         {
                             BSPhysObject yprim = xprim; // probably not necessary, but, just in case.
@@ -1016,7 +1016,7 @@ public sealed class BSShapeCollection : IDisposable
                                     yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Fetched;
                                 else
                                     yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
-                                DetailLog("{0},BSShapeCollection,fetchAssetCallback,found={1},isSculpt={2},ids={3}",
+                                physicsScene.DetailLog("{0},BSShapeCollection,fetchAssetCallback,found={1},isSculpt={2},ids={3}",
                                             yprim.LocalID, assetFound, yprim.BaseShape.SculptEntry, mismatchIDs );
 
                             });
@@ -1024,8 +1024,8 @@ public sealed class BSShapeCollection : IDisposable
                         else
                         {
                             xprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
-                            PhysicsScene.Logger.ErrorFormat("{0} Physical object requires asset but no asset provider. Name={1}",
-                                                        LogHeader, PhysicsScene.Name);
+                            physicsScene.Logger.ErrorFormat("{0} Physical object requires asset but no asset provider. Name={1}",
+                                                        LogHeader, physicsScene.Name);
                         }
                     });
             }
@@ -1033,15 +1033,15 @@ public sealed class BSShapeCollection : IDisposable
             {
                 if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Failed)
                 {
-                    PhysicsScene.Logger.WarnFormat("{0} Mesh failed to fetch asset. obj={1}, texture={2}",
+                    physicsScene.Logger.WarnFormat("{0} Mesh failed to fetch asset. obj={1}, texture={2}",
                                                 LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
                 }
             }
         }
 
         // 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);
+        BulletShape fillinShape = physicsScene.Shapes.BuildPhysicalNativeShape(prim, BSPhysicsShapeType.SHAPE_BOX, FixedShapeKey.KEY_BOX);
+        physicsScene.DetailLog("{0},BSShapeCollection.VerifyMeshCreated,boxTempShape", prim.LocalID);
 
         return fillinShape;
     }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index ee18379..dd5ae1a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -29,6 +29,9 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
+using OpenSim.Framework;
+using OpenSim.Region.Physics.Manager;
+
 using OMV = OpenMetaverse;
 
 namespace OpenSim.Region.Physics.BulletSPlugin
@@ -37,11 +40,19 @@ public abstract class BSShape
 {
     public int referenceCount { get; set; }
     public DateTime lastReferenced { get; set; }
+    public BulletShape physShapeInfo { get; set; }
 
     public BSShape()
     {
         referenceCount = 0;
         lastReferenced = DateTime.Now;
+        physShapeInfo = new BulletShape();
+    }
+    public BSShape(BulletShape pShape)
+    {
+        referenceCount = 0;
+        lastReferenced = DateTime.Now;
+        physShapeInfo = pShape;
     }
 
     // Get a reference to a physical shape. Create if it doesn't exist
@@ -79,21 +90,30 @@ public abstract class BSShape
 
         return ret;
     }
-    public static BSShape GetShapeReferenceNonSpecial(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
+    private static BSShape GetShapeReferenceNonSpecial(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
     {
+        BSShapeMesh.GetReference(physicsScene, forceRebuild, prim);
+        BSShapeHull.GetReference(physicsScene, forceRebuild, prim);
         return null;
     }
-    public static BSShape GetShapeReferenceNonNative(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
+
+    // Called when this shape is being used again.
+    public virtual void IncrementReference()
     {
-        return null;
+        referenceCount++;
+        lastReferenced = DateTime.Now;
+    }
+
+    // Called when this shape is being used again.
+    public virtual void DecrementReference()
+    {
+        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();
-
     // Returns a string for debugging that uniquily identifies the memory used by this instance
     public virtual string AddrString
     {
@@ -112,6 +132,7 @@ public abstract class BSShape
     }
 }
 
+// ============================================================================================================
 public class BSShapeNull : BSShape
 {
     public BSShapeNull() : base()
@@ -121,23 +142,39 @@ public class BSShapeNull : BSShape
     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) 
+                                            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)
+    // 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
+        if (physShapeInfo.HasPhysicalShape)
+        {
+            physicsScene.DetailLog("{0},BSShapeNative.DereferenceShape,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,63 +183,164 @@ 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.type = 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 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 = BSShapeCollection.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
+
+        physicsScene.DetailLog("{0},BSShapeMesh,create,oldKey={1},newKey={2},size={3},lod={4}",
+                                prim.LocalID, prim.PhysShape.shapeKey.ToString("X"), newMeshKey.ToString("X"), prim.Size, lod);
+
+        BSShapeMesh retMesh;
+        lock (Meshes)
+        {
+            if (Meshes.TryGetValue(newMeshKey, out retMesh))
+            {
+                // The mesh has already been created. Return a new reference to same.
+                retMesh.IncrementReference();
+            }
+            else
+            {
+                // An instance of this mesh has not been created. Build and remember same.
+                BulletShape newShape = CreatePhysicalMesh(physicsScene, prim, newMeshKey, prim.BaseShape, prim.Size, lod);
+                // Take evasive action if the mesh was not constructed.
+                newShape = BSShapeCollection.VerifyMeshCreated(physicsScene, newShape, prim);
+
+                retMesh = new BSShapeMesh(newShape);
+
+                Meshes.Add(newMeshKey, retMesh);
+            }
+        }
+        return retMesh;
+    }
+    public override void Dereference(BSScene physicsScene)
+    {
+        lock (Meshes)
+        {
+            this.DecrementReference();
+            // TODO: schedule aging and destruction of unused meshes.
+        }
+    }
+
+    private static BulletShape CreatePhysicalMesh(BSScene physicsScene, BSPhysObject prim, System.UInt64 newMeshKey,
+                                            PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
+    {
+        BulletShape newShape = null;
+
+        IMesh 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
+                                        );
+
+        if (meshData != null)
+        {
+
+            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},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);
+            }
+        }
+        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 BSShapeHull() : base()
+    public BSShapeHull(BulletShape pShape) : base(pShape)
+    {
+    }
+    public static BSShape GetReference(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
+    {
+        return new BSShapeNull();
+    }
+    public override void Dereference(BSScene physicsScene)
     {
     }
-    public static BSShape GetReference() { return new BSShapeNull();  }
-    public override void Dereference(BSScene physicsScene) { }
 }
 
+// ============================================================================================================
 public class BSShapeCompound : BSShape
 {
     private static string LogHeader = "[BULLETSIM SHAPE COMPOUND]";
@@ -216,6 +354,7 @@ public class BSShapeCompound : BSShape
     public override void Dereference(BSScene physicsScene) { }
 }
 
+// ============================================================================================================
 public class BSShapeAvatar : BSShape
 {
     private static string LogHeader = "[BULLETSIM SHAPE AVATAR]";
-- 
cgit v1.1


From 70081a40a4892b5d3e58218a8cd15a689d875ad0 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 24 Apr 2013 12:45:19 -0700
Subject: Bug fix: compare tolower. This should fix the issue where HG visitors
 currently in the region were not being found by the avatar picker window.

---
 .../Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 77e8b00..7b823ba 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -200,7 +200,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             // 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)))
+                    (data.FirstName.ToLower().StartsWith(query.ToLower()) || data.LastName.ToLower().StartsWith(query.ToLower())))
                     users.Add(data);
 
             AddAdditionalUsers(avatarID, query, users);
-- 
cgit v1.1


From 1593d795ea72bb87f18c8ed2d1bec87871974ec5 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 24 Apr 2013 15:01:11 -0700
Subject: BulletSim: version of libBulletSim.so for 32 bit systems that doesn't
 crash on startup. Doesn't yet solve the new glibcxx dependencies.

---
 bin/lib32/libBulletSim.so | Bin 2096572 -> 2096576 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index d79896a..6216a65 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
-- 
cgit v1.1


From 6f3c905744e674f3cca555a4d36ede2139fcb9d7 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 25 Apr 2013 00:24:48 +0100
Subject: Add Avination's support for parcel eject and freeze

---
 .../CoreModules/World/Land/LandManagementModule.cs | 85 ++++++++++++++++++++++
 OpenSim/Region/Framework/Scenes/Scene.cs           | 40 ++++++----
 2 files changed, 110 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index dbf5138..693de1d 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -210,6 +210,9 @@ namespace OpenSim.Region.CoreModules.World.Land
             client.OnParcelInfoRequest += ClientOnParcelInfoRequest;
             client.OnParcelDeedToGroup += ClientOnParcelDeedToGroup;
             client.OnPreAgentUpdate += ClientOnPreAgentUpdate;
+            client.OnParcelEjectUser += ClientOnParcelEjectUser;
+            client.OnParcelFreezeUser += ClientOnParcelFreezeUser;
+
 
             EntityBase presenceEntity;
             if (m_scene.Entities.TryGetValue(client.AgentId, out presenceEntity) && presenceEntity is ScenePresence)
@@ -1738,6 +1741,88 @@ namespace OpenSim.Region.CoreModules.World.Land
             UpdateLandObject(localID, land.LandData);
         }
         
+        Dictionary<UUID, System.Threading.Timer> Timers = new Dictionary<UUID, System.Threading.Timer>();
+
+        public void ClientOnParcelFreezeUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
+        {
+            ScenePresence targetAvatar = null;
+            ((Scene)client.Scene).TryGetScenePresence(target, out targetAvatar);
+            ScenePresence parcelManager = null;
+            ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out parcelManager);
+            System.Threading.Timer Timer;
+
+            if (targetAvatar.UserLevel == 0)
+            {
+                ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
+                if (!((Scene)client.Scene).Permissions.CanEditParcelProperties(client.AgentId, land, GroupPowers.LandEjectAndFreeze))
+                    return;
+                if (flags == 0)
+                {
+                    targetAvatar.AllowMovement = false;
+                    targetAvatar.ControllingClient.SendAlertMessage(parcelManager.Firstname + " " + parcelManager.Lastname + " has frozen you for 30 seconds.  You cannot move or interact with the world.");
+                    parcelManager.ControllingClient.SendAlertMessage("Avatar Frozen.");
+                    System.Threading.TimerCallback timeCB = new System.Threading.TimerCallback(OnEndParcelFrozen);
+                    Timer = new System.Threading.Timer(timeCB, targetAvatar, 30000, 0);
+                    Timers.Add(targetAvatar.UUID, Timer);
+                }
+                else
+                {
+                    targetAvatar.AllowMovement = true;
+                    targetAvatar.ControllingClient.SendAlertMessage(parcelManager.Firstname + " " + parcelManager.Lastname + " has unfrozen you.");
+                    parcelManager.ControllingClient.SendAlertMessage("Avatar Unfrozen.");
+                    Timers.TryGetValue(targetAvatar.UUID, out Timer);
+                    Timers.Remove(targetAvatar.UUID);
+                    Timer.Dispose();
+                }
+            }
+        }
+
+        private void OnEndParcelFrozen(object avatar)
+        {
+            ScenePresence targetAvatar = (ScenePresence)avatar;
+            targetAvatar.AllowMovement = true;
+            System.Threading.Timer Timer;
+            Timers.TryGetValue(targetAvatar.UUID, out Timer);
+            Timers.Remove(targetAvatar.UUID);
+            targetAvatar.ControllingClient.SendAgentAlertMessage("The freeze has worn off; you may go about your business.", false);
+        }
+
+        public void ClientOnParcelEjectUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
+        {
+            ScenePresence targetAvatar = null;
+            ScenePresence parcelManager = null;
+
+            // Must have presences
+            if (!m_scene.TryGetScenePresence(target, out targetAvatar) ||
+                !m_scene.TryGetScenePresence(client.AgentId, out parcelManager))
+                return;
+
+            // Cannot eject estate managers or gods
+            if (m_scene.Permissions.IsAdministrator(target))
+                return;
+
+            // Check if you even have permission to do this
+            ILandObject land = m_scene.LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
+            if (!m_scene.Permissions.CanEditParcelProperties(client.AgentId, land, GroupPowers.LandEjectAndFreeze) &&
+                !m_scene.Permissions.IsAdministrator(client.AgentId))
+                return;
+            Vector3 pos = m_scene.GetNearestAllowedPosition(targetAvatar, land);
+
+            targetAvatar.TeleportWithMomentum(pos, null);
+            targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
+            parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
+
+            if ((flags & 1) != 0) // Ban TODO: Remove magic number
+            {
+                LandAccessEntry entry = new LandAccessEntry();
+                entry.AgentID = targetAvatar.UUID;
+                entry.Flags = AccessList.Ban;
+                entry.Expires = 0; // Perm
+
+                land.LandData.ParcelAccessList.Add(entry);
+            }
+        }
+
         protected void InstallInterfaces()
         {
             Command clearCommand
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f50d3cd..69fe137 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5138,9 +5138,14 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_allowScriptCrossings; }
         }
 
-        public Vector3? GetNearestAllowedPosition(ScenePresence avatar)
+        public Vector3 GetNearestAllowedPosition(ScenePresence avatar)
         {
-            ILandObject nearestParcel = GetNearestAllowedParcel(avatar.UUID, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+            return GetNearestAllowedPosition(avatar, null);
+        }
+
+        public Vector3 GetNearestAllowedPosition(ScenePresence avatar, ILandObject excludeParcel)
+        {
+            ILandObject nearestParcel = GetNearestAllowedParcel(avatar.UUID, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, excludeParcel);
 
             if (nearestParcel != null)
             {
@@ -5149,10 +5154,7 @@ namespace OpenSim.Region.Framework.Scenes
                 Vector3? nearestPoint = GetNearestPointInParcelAlongDirectionFromPoint(avatar.AbsolutePosition, dir, nearestParcel);
                 if (nearestPoint != null)
                 {
-//                    m_log.DebugFormat(
-//                        "[SCENE]: Found a sane previous position based on velocity for {0}, sending them to {1} in {2}",
-//                        avatar.Name, nearestPoint, nearestParcel.LandData.Name);
-
+                    Debug.WriteLine("Found a sane previous position based on velocity, sending them to: " + nearestPoint.ToString());
                     return nearestPoint.Value;
                 }
 
@@ -5162,24 +5164,27 @@ namespace OpenSim.Region.Framework.Scenes
                 nearestPoint = GetNearestPointInParcelAlongDirectionFromPoint(avatar.AbsolutePosition, dir, nearestParcel);
                 if (nearestPoint != null)
                 {
-//                    m_log.DebugFormat(
-//                        "[SCENE]: {0} had a zero velocity, sending them to {1}", avatar.Name, nearestPoint);
-
+                    Debug.WriteLine("They had a zero velocity, sending them to: " + nearestPoint.ToString());
                     return nearestPoint.Value;
                 }
 
-                //Ultimate backup if we have no idea where they are
-//                m_log.DebugFormat(
-//                    "[SCENE]: No idea where {0} is, sending them to {1}", avatar.Name, avatar.lastKnownAllowedPosition);
+                ILandObject dest = LandChannel.GetLandObject(avatar.lastKnownAllowedPosition.X, avatar.lastKnownAllowedPosition.Y);
+                if (dest !=  excludeParcel)
+                {
+                    // Ultimate backup if we have no idea where they are and
+                    // the last allowed position was in another parcel
+                    Debug.WriteLine("Have no idea where they are, sending them to: " + avatar.lastKnownAllowedPosition.ToString());
+                    return avatar.lastKnownAllowedPosition;
+                }
 
-                return avatar.lastKnownAllowedPosition;
+                // else fall through to region edge
             }
 
             //Go to the edge, this happens in teleporting to a region with no available parcels
             Vector3 nearestRegionEdgePoint = GetNearestRegionEdgePosition(avatar);
 
             //Debug.WriteLine("They are really in a place they don't belong, sending them to: " + nearestRegionEdgePoint.ToString());
-            
+
             return nearestRegionEdgePoint;
         }
 
@@ -5206,13 +5211,18 @@ namespace OpenSim.Region.Framework.Scenes
 
         public ILandObject GetNearestAllowedParcel(UUID avatarId, float x, float y)
         {
+            return GetNearestAllowedParcel(avatarId, x, y, null);
+        }
+
+        public ILandObject GetNearestAllowedParcel(UUID avatarId, float x, float y, ILandObject excludeParcel)
+        {
             List<ILandObject> all = AllParcels();
             float minParcelDistance = float.MaxValue;
             ILandObject nearestParcel = null;
 
             foreach (var parcel in all)
             {
-                if (!parcel.IsEitherBannedOrRestricted(avatarId))
+                if (!parcel.IsEitherBannedOrRestricted(avatarId) && parcel != excludeParcel)
                 {
                     float parcelDistance = GetParcelDistancefromPoint(parcel, x, y);
                     if (parcelDistance < minParcelDistance)
-- 
cgit v1.1


From 5cd77a460ca434f50c231ba261647e82e9f033dc Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 25 Apr 2013 00:51:57 +0100
Subject: Commit Avination's God Kick feature.

---
 .../Region/CoreModules/Avatar/Gods/GodsModule.cs   | 199 ++++++++++++++-------
 1 file changed, 137 insertions(+), 62 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index 5a7446f..d9badcd 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -32,14 +32,35 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
+using System;
+using System.Reflection;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Reflection;
+using System.IO;
+using System.Web;
+using System.Xml;
+using log4net;
 
 using Mono.Addins;
 
+using OpenMetaverse.Messages.Linden;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+using OSDArray = OpenMetaverse.StructuredData.OSDArray;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
+
 namespace OpenSim.Region.CoreModules.Avatar.Gods
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GodsModule")]
     public class GodsModule : INonSharedRegionModule, IGodsModule
     {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         /// <summary>Special UUID for actions that apply to all agents</summary>
         private static readonly UUID ALL_AGENTS = new UUID("44e87126-e794-4ded-05b3-7c42da3d5cdb");
 
@@ -65,6 +86,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             m_scene = scene;
             m_scene.RegisterModuleInterface<IGodsModule>(this);
             m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
+            m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
+            scene.EventManager.OnIncomingInstantMessage +=
+                    OnIncomingInstantMessage;
         }
 
         public void RemoveRegion(Scene scene)
@@ -98,6 +122,47 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             client.OnRequestGodlikePowers -= RequestGodlikePowers;
         }
         
+        private void OnRegisterCaps(UUID agentID, Caps caps)
+        {
+            string uri = "/CAPS/" + UUID.Random();
+
+            caps.RegisterHandler("UntrustedSimulatorMessage",
+                    new RestStreamHandler("POST", uri,
+                    HandleUntrustedSimulatorMessage));
+        }
+
+        private string HandleUntrustedSimulatorMessage(string request,
+                string path, string param, IOSHttpRequest httpRequest,
+                IOSHttpResponse httpResponse)
+        {
+            OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(request);
+
+            string message = osd["message"].AsString();
+
+            if (message == "GodKickUser")
+            {
+                OSDMap body = (OSDMap)osd["body"];
+                OSDArray userInfo = (OSDArray)body["UserInfo"];
+                OSDMap userData = (OSDMap)userInfo[0];
+
+                UUID agentID = userData["AgentID"].AsUUID();
+                UUID godID = userData["GodID"].AsUUID();
+                UUID godSessionID = userData["GodSessionID"].AsUUID();
+                uint kickFlags = userData["KickFlags"].AsUInteger();
+                string reason = userData["Reason"].AsString();
+                ScenePresence god = m_scene.GetScenePresence(godID);
+                if (god == null || god.ControllingClient.SessionId != godSessionID)
+                    return String.Empty;
+
+                KickUser(godID, godSessionID, agentID, kickFlags, Util.StringToBytes1024(reason));
+            }
+            else
+            {
+                m_log.ErrorFormat("[GOD]: Unhandled UntrustedSimulatorMessage: {0}", message);
+            }
+            return String.Empty;
+        }
+
         public void RequestGodlikePowers(
             UUID agentID, UUID sessionID, UUID token, bool godLike, IClientAPI controllingClient)
         {
@@ -146,76 +211,86 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
         /// <param name="reason">The message to send to the user after it's been turned into a field</param>
         public void KickUser(UUID godID, UUID sessionID, UUID agentID, uint kickflags, byte[] reason)
         {
-            UUID kickUserID = ALL_AGENTS;
-            
+            if (!m_scene.Permissions.IsGod(godID))
+                return;
+
             ScenePresence sp = m_scene.GetScenePresence(agentID);
 
-            if (sp != null || agentID == kickUserID)
+            if (sp == null && agentID != ALL_AGENTS)
             {
-                if (m_scene.Permissions.IsGod(godID))
+                IMessageTransferModule transferModule =
+                        m_scene.RequestModuleInterface<IMessageTransferModule>();
+                if (transferModule != null)
                 {
-                    if (kickflags == 0)
-                    {
-                        if (agentID == kickUserID)
-                        {
-                            string reasonStr = Utils.BytesToString(reason);
-
-                            m_scene.ForEachClient(
-                                delegate(IClientAPI controller)
-                                {
-                                    if (controller.AgentId != godID)
-                                        controller.Kick(reasonStr);
-                                }
-                            );
-
-                            // This is a bit crude. It seems the client will be null before it actually stops the thread
-                            // The thread will kill itself eventually :/
-                            // Is there another way to make sure *all* clients get this 'inter region' message?
-                            m_scene.ForEachRootClient(
-                                delegate(IClientAPI client)
-                                {
-                                    if (client.AgentId != godID)
-                                    {
-                                        client.Close();
-                                    }
-                                }
-                            );
-                        }
-                        else
-                        {
-                            m_scene.SceneGraph.removeUserCount(!sp.IsChildAgent);
+                    m_log.DebugFormat("[GODS]: Sending nonlocal kill for agent {0}", agentID);
+                    transferModule.SendInstantMessage(new GridInstantMessage(
+                            m_scene, godID, "God", agentID, (byte)250, false,
+                            Utils.BytesToString(reason), UUID.Zero, true,
+                            new Vector3(), new byte[] {(byte)kickflags}, true),
+                            delegate(bool success) {} );
+                }
+                return;
+            }
 
-                            sp.ControllingClient.Kick(Utils.BytesToString(reason));
-                            sp.ControllingClient.Close();
-                        }
-                    }
-                    
-                    if (kickflags == 1)
-                    {
-                        sp.AllowMovement = false;
-                        if (DialogModule != null)
-                        {
-                            DialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
-                            DialogModule.SendAlertToUser(godID, "User Frozen");
-                        }
-                    }
-                    
-                    if (kickflags == 2)
-                    {
-                        sp.AllowMovement = true;
-                        if (DialogModule != null)
-                        {
-                            DialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
-                            DialogModule.SendAlertToUser(godID, "User Unfrozen");
-                        }
-                    }
+            switch (kickflags)
+            {
+            case 0:
+                if (sp != null)
+                {
+                    KickPresence(sp, Utils.BytesToString(reason));
                 }
-                else
+                else if (agentID == ALL_AGENTS)
                 {
-                    if (DialogModule != null)
-                        DialogModule.SendAlertToUser(godID, "Kick request denied");
+                    m_scene.ForEachRootScenePresence(
+                            delegate(ScenePresence p)
+                            {
+                                if (p.UUID != godID && (!m_scene.Permissions.IsGod(p.UUID)))
+                                    KickPresence(p, Utils.BytesToString(reason));
+                            }
+                    );
                 }
+                break;
+            case 1:
+                if (sp != null)
+                {
+                    sp.AllowMovement = false;
+                    m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
+                    m_dialogModule.SendAlertToUser(godID, "User Frozen");
+                }
+                break;
+            case 2:
+                if (sp != null)
+                {
+                    sp.AllowMovement = true;
+                    m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
+                    m_dialogModule.SendAlertToUser(godID, "User Unfrozen");
+                }
+                break;
+            default:
+                break;
+            }
+        }
+
+        private void KickPresence(ScenePresence sp, string reason)
+        {
+            if (sp.IsChildAgent)
+                return;
+            sp.ControllingClient.Kick(reason);
+            sp.MakeChildAgent();
+            sp.ControllingClient.Close();
+        }
+
+        private void OnIncomingInstantMessage(GridInstantMessage msg)
+        {
+            if (msg.dialog == (uint)250) // Nonlocal kick
+            {
+                UUID agentID = new UUID(msg.toAgentID);
+                string reason = msg.message;
+                UUID godID = new UUID(msg.fromAgentID);
+                uint kickMode = (uint)msg.binaryBucket[0];
+
+                KickUser(godID, UUID.Zero, agentID, kickMode, Util.StringToBytes1024(reason));
             }
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1


From ec4f981f1d371b329d227e17cb2f5aaaba364fad Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 25 Apr 2013 01:39:22 +0200
Subject: Adding the dynamic menu module which allows registering new menu
 options in compliant viewers

---
 .../Framework/Interfaces/IDynamicMenuModule.cs     |  57 +++++
 .../ViewerSupport/DynamicMenuModule.cs             | 282 +++++++++++++++++++++
 2 files changed, 339 insertions(+)
 create mode 100644 OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
 create mode 100644 OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs

diff --git a/OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs b/OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
new file mode 100644
index 0000000..08b71e4
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System.Collections.Generic;
+using OpenMetaverse;
+using OpenSim.Framework;
+
+namespace OpenSim.Region.Framework.Interfaces
+{
+    public enum InsertLocation : int
+    {
+        Agent = 1,
+        World = 2,
+        Tools = 3,
+        Advanced = 4,
+        Admin = 5
+    }
+
+    public enum UserMode : int
+    {
+        Normal = 0,
+        God = 3
+    }
+
+    public delegate void CustomMenuHandler(string action, UUID agentID, List<uint> selection);
+
+    public interface IDynamicMenuModule
+    {
+        void AddMenuItem(UUID agentID, string title, InsertLocation location, UserMode mode, CustomMenuHandler handler);
+        void AddMenuItem(string title, InsertLocation location, UserMode mode, CustomMenuHandler handler);
+        void RemoveMenuItem(string action);
+    }
+}
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
new file mode 100644
index 0000000..917911f
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
@@ -0,0 +1,282 @@
+// ******************************************************************
+// Copyright (c) 2008, 2009 Melanie Thielker
+//
+// All rights reserved
+//
+
+using System;
+using System.IO;
+using System.Reflection;
+using System.Text;
+using System.Collections.Generic;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim;
+using OpenSim.Region;
+using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Framework;
+//using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using Nini.Config;
+using log4net;
+using Mono.Addins;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
+
+namespace OpenSim.Region.OptionalModules.ViewerSupport
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DynamicMenu")]
+    public class DynamicMenuModule : INonSharedRegionModule, IDynamicMenuModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private class MenuItemData
+        {
+            public string Title;
+            public UUID AgentID;
+            public InsertLocation Location;
+            public UserMode Mode;
+            public CustomMenuHandler Handler;
+        }
+
+        private Dictionary<UUID, List<MenuItemData>> m_menuItems =
+                new Dictionary<UUID, List<MenuItemData>>();
+
+        private Scene m_scene;
+
+        public string Name
+        {
+            get { return "DynamicMenuModule"; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public void Initialise(IConfigSource config)
+        {
+        }
+
+        public void Close()
+        {
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            m_scene = scene;
+            scene.EventManager.OnRegisterCaps += OnRegisterCaps;
+            m_scene.RegisterModuleInterface<IDynamicMenuModule>(this);
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface<ISimulatorFeaturesModule>();
+
+            if (featuresModule != null)
+                featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest;
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+        }
+
+        private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
+        {
+            OSD menus = new OSDMap();
+            if (features.ContainsKey("menus"))
+                menus = features["menus"];
+
+            OSDMap agent = new OSDMap();
+            OSDMap world = new OSDMap();
+            OSDMap tools = new OSDMap();
+            OSDMap advanced = new OSDMap();
+            OSDMap admin = new OSDMap();
+            if (((OSDMap)menus).ContainsKey("agent"))
+                agent = (OSDMap)((OSDMap)menus)["agent"];
+            if (((OSDMap)menus).ContainsKey("world"))
+                world = (OSDMap)((OSDMap)menus)["world"];
+            if (((OSDMap)menus).ContainsKey("tools"))
+                tools = (OSDMap)((OSDMap)menus)["tools"];
+            if (((OSDMap)menus).ContainsKey("advanced"))
+                advanced = (OSDMap)((OSDMap)menus)["advanced"];
+            if (((OSDMap)menus).ContainsKey("admin"))
+                admin = (OSDMap)((OSDMap)menus)["admin"];
+
+            if (m_menuItems.ContainsKey(UUID.Zero))
+            {
+                foreach (MenuItemData d in m_menuItems[UUID.Zero])
+                {
+                    if (d.Mode == UserMode.God && (!m_scene.Permissions.IsGod(agentID)))
+                        continue;
+
+                    OSDMap loc = null;
+                    switch (d.Location)
+                    {
+                    case InsertLocation.Agent:
+                        loc = agent;
+                        break;
+                    case InsertLocation.World:
+                        loc = world;
+                        break;
+                    case InsertLocation.Tools:
+                        loc = tools;
+                        break;
+                    case InsertLocation.Advanced:
+                        loc = advanced;
+                        break;
+                    case InsertLocation.Admin:
+                        loc = admin;
+                        break;
+                    }
+
+                    if (loc == null)
+                        continue;
+                    
+                    loc[d.Title] = OSD.FromString(d.Title);
+                }
+            }
+
+            if (m_menuItems.ContainsKey(agentID))
+            {
+                foreach (MenuItemData d in m_menuItems[agentID])
+                {
+                    if (d.Mode == UserMode.God && (!m_scene.Permissions.IsGod(agentID)))
+                        continue;
+
+                    OSDMap loc = null;
+                    switch (d.Location)
+                    {
+                    case InsertLocation.Agent:
+                        loc = agent;
+                        break;
+                    case InsertLocation.World:
+                        loc = world;
+                        break;
+                    case InsertLocation.Tools:
+                        loc = tools;
+                        break;
+                    case InsertLocation.Advanced:
+                        loc = advanced;
+                        break;
+                    case InsertLocation.Admin:
+                        loc = admin;
+                        break;
+                    }
+
+                    if (loc == null)
+                        continue;
+                    
+                    loc[d.Title] = OSD.FromString(d.Title);
+                }
+            }
+
+
+            ((OSDMap)menus)["agent"] = agent;
+            ((OSDMap)menus)["world"] = world;
+            ((OSDMap)menus)["tools"] = tools;
+            ((OSDMap)menus)["advanced"] = advanced;
+            ((OSDMap)menus)["admin"] = admin;
+
+            features["menus"] = menus;
+        }
+
+        private void OnRegisterCaps(UUID agentID, Caps caps)
+        {
+            string capUrl = "/CAPS/" + UUID.Random() + "/";
+
+            capUrl = "/CAPS/" + UUID.Random() + "/";
+            caps.RegisterHandler("CustomMenuAction", new MenuActionHandler(capUrl, "CustomMenuAction", agentID, this, m_scene));
+        }
+
+        internal void HandleMenuSelection(string action, UUID agentID, List<uint> selection)
+        {
+            if (m_menuItems.ContainsKey(agentID))
+            {
+                foreach (MenuItemData d in m_menuItems[agentID])
+                {
+                    if (d.Title == action)
+                        d.Handler(action, agentID, selection);
+                }
+            }
+
+            if (m_menuItems.ContainsKey(UUID.Zero))
+            {
+                foreach (MenuItemData d in m_menuItems[UUID.Zero])
+                {
+                    if (d.Title == action)
+                        d.Handler(action, agentID, selection);
+                }
+            }
+        }
+
+        public void AddMenuItem(string title, InsertLocation location, UserMode mode, CustomMenuHandler handler)
+        {
+            AddMenuItem(UUID.Zero, title, location, mode, handler);
+        }
+
+        public void AddMenuItem(UUID agentID, string title, InsertLocation location, UserMode mode, CustomMenuHandler handler)
+        {
+            if (!m_menuItems.ContainsKey(agentID))
+                m_menuItems[agentID] = new List<MenuItemData>();
+
+            m_menuItems[agentID].Add(new MenuItemData() { Title = title, AgentID = agentID, Location = location, Mode = mode, Handler = handler });
+        }
+
+        public void RemoveMenuItem(string action)
+        {
+            foreach (KeyValuePair<UUID,List< MenuItemData>> kvp in m_menuItems)
+            {
+                List<MenuItemData> pendingDeletes = new List<MenuItemData>();
+                foreach (MenuItemData d in kvp.Value)
+                {
+                    if (d.Title == action)
+                        pendingDeletes.Add(d);
+                }
+
+                foreach (MenuItemData d in pendingDeletes)
+                    kvp.Value.Remove(d);
+            }
+        }
+    }
+
+    public class MenuActionHandler : BaseStreamHandler
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private UUID m_agentID;
+        private Scene m_scene;
+        private DynamicMenuModule m_module;
+
+        public MenuActionHandler(string path, string name, UUID agentID, DynamicMenuModule module, Scene scene)
+                :base("POST", path, name, agentID.ToString())
+        {
+            m_agentID = agentID;
+            m_scene = scene;
+            m_module = module;
+        }
+
+        public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            StreamReader reader = new StreamReader(request);
+            string requestBody = reader.ReadToEnd();
+
+            OSD osd = OSDParser.DeserializeLLSDXml(requestBody);
+
+            string action = ((OSDMap)osd)["action"].AsString();
+            OSDArray selection = (OSDArray)((OSDMap)osd)["selection"];
+            List<uint> sel = new List<uint>();
+            for (int i = 0 ; i < selection.Count ; i++)
+                sel.Add(selection[i].AsUInteger());
+
+            Util.FireAndForget(x => { m_module.HandleMenuSelection(action, m_agentID, sel); });
+
+            Encoding encoding = Encoding.UTF8;
+            return encoding.GetBytes(OSDParser.SerializeLLSDXmlString(new OSD()));
+        }
+    }
+}
-- 
cgit v1.1


From 0e22021c650a84ae1b9ed86d7c8df3beeb6e54ed Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 24 Apr 2013 19:00:41 -0700
Subject: Make the kicked user's avie truly disappear when it's god-kicked.

---
 OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index d9badcd..16673ec 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -276,8 +276,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             if (sp.IsChildAgent)
                 return;
             sp.ControllingClient.Kick(reason);
-            sp.MakeChildAgent();
-            sp.ControllingClient.Close();
+            sp.Scene.IncomingCloseAgent(sp.UUID, true); 
         }
 
         private void OnIncomingInstantMessage(GridInstantMessage msg)
-- 
cgit v1.1


From c10405330d0fa5855c3f8180fdc8347cb87fed4f Mon Sep 17 00:00:00 2001
From: dahlia
Date: Wed, 24 Apr 2013 20:43:15 -0700
Subject: UUIDGatherer now includes UUIDs which reference texture assets used
 as materials

---
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 66 +++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index ad33607..0e83781 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;
@@ -184,6 +185,9 @@ namespace OpenSim.Region.Framework.Scenes
                         if (!assetUuids.ContainsKey(tii.AssetID))
                             GatherAssetUuids(tii.AssetID, (AssetType)tii.Type, assetUuids);
                     }
+
+                    // get any texture UUIDs used for materials such as normal and specular maps
+                    GatherMaterialsUuids(part, assetUuids);
                 }
                 catch (Exception e)
                 {
@@ -208,6 +212,68 @@ 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
+            OSDMap OSMaterials = null;
+
+            lock (part.DynAttrs)
+            {
+                if (part.DynAttrs.ContainsKey("OS:Materials"))
+                    OSMaterials = part.DynAttrs["OS:Materials"];
+                if (OSMaterials != null && OSMaterials.ContainsKey("Materials"))
+                {
+                    OSD osd = OSMaterials["Materials"];
+                    //m_log.Info("[UUID Gatherer]: found Materials: " + OSDParser.SerializeJsonString(osd));
+
+                    if (osd is OSDArray)
+                    {
+                        OSDArray matsArr = osd 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.
-- 
cgit v1.1


From 3bc801746466cbd401f481295876b357fa27125b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 25 Apr 2013 09:23:15 -0700
Subject: Recover a lost "virtual". Downstream projects need this.

---
 OpenSim/Data/MySQL/MySQLSimulationData.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 9cc6f40..2d20eaf 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Data.MySQL
         private string m_connectionString;
         private object m_dbLock = new object();
 
-        protected Assembly Assembly
+        protected virtual Assembly Assembly
         {
             get { return GetType().Assembly; }
         }
-- 
cgit v1.1


From 5d0a8ff39149a41d332dc40ae0bb1dc0972d0512 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 25 Apr 2013 20:48:12 +0100
Subject: Change copyright notice on DynamicMenuModule to proper BSD

---
 .../ViewerSupport/DynamicMenuModule.cs             | 31 ++++++++++++++++++----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
index 917911f..1ea1c20 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
@@ -1,8 +1,29 @@
-// ******************************************************************
-// Copyright (c) 2008, 2009 Melanie Thielker
-//
-// All rights reserved
-//
+/*
+ * 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;
-- 
cgit v1.1


From 03c9d8ae4fa9a47cda66814177071c258f5b4437 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 25 Apr 2013 21:35:18 +0100
Subject: Change EconomyDataRequest signature to use an IClientAPI rather than
 UUID. This is needed because recent LL viewer codebases call this earlier in
 login when the client is not yet established in the sim and can't be found by
 UUID. Sending the reply requires having the IClientAPI.

---
 OpenSim/Framework/IClientAPI.cs                         |  2 +-
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs   |  2 +-
 .../World/MoneyModule/SampleMoneyModule.cs              | 17 ++++++-----------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 10ead39..4d5ec3a 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -313,7 +313,7 @@ namespace OpenSim.Framework
     public delegate void ObjectPermissions(
         IClientAPI controller, UUID agentID, UUID sessionID, byte field, uint localId, uint mask, byte set);
 
-    public delegate void EconomyDataRequest(UUID agentID);
+    public delegate void EconomyDataRequest(IClientAPI client);
 
     public delegate void ObjectIncludeInSearch(IClientAPI remoteClient, bool IncludeInSearch, uint localID);
 
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 1eb953c..bede379 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -9682,7 +9682,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             EconomyDataRequest handlerEconomoyDataRequest = OnEconomyDataRequest;
             if (handlerEconomoyDataRequest != null)
             {
-                handlerEconomoyDataRequest(AgentId);
+                handlerEconomoyDataRequest(this);
             }
             return true;
         }
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 7bbf500..37af8c7 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -688,19 +688,14 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         /// Event called Economy Data Request handler.
         /// </summary>
         /// <param name="agentId"></param>
-        public void EconomyDataRequestHandler(UUID agentId)
+        public void EconomyDataRequestHandler(IClientAPI user)
         {
-            IClientAPI user = LocateClientObject(agentId);
+            Scene s = LocateSceneClientIn(user.AgentId);
 
-            if (user != null)
-            {
-                Scene s = LocateSceneClientIn(user.AgentId);
-
-                user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
-                                     PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor,
-                                     PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload,
-                                     TeleportMinPrice, TeleportPriceExponent);
-            }
+            user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
+                                 PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor,
+                                 PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload,
+                                 TeleportMinPrice, TeleportPriceExponent);
         }
 
         private void ValidateLandBuy(Object osender, EventManager.LandBuyArgs e)
-- 
cgit v1.1


From 0e162511cf0e2b507a94ad91a5e36be76eda18ef Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 25 Apr 2013 17:01:57 -0700
Subject: Groups: make some methods protected.

---
 OpenSim/Addons/Groups/Service/GroupsService.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs
index 0668870..6a4348b 100644
--- a/OpenSim/Addons/Groups/Service/GroupsService.cs
+++ b/OpenSim/Addons/Groups/Service/GroupsService.cs
@@ -723,12 +723,12 @@ namespace OpenSim.Groups
 
         #region Actions without permission checks
 
-        private void _AddAgentToGroup(string RequestingAgentID, string AgentID, UUID GroupID, UUID RoleID)
+        protected void _AddAgentToGroup(string RequestingAgentID, string AgentID, UUID GroupID, UUID RoleID)
         {
             _AddAgentToGroup(RequestingAgentID, AgentID, GroupID, RoleID, string.Empty);
         }
 
-        public void _RemoveAgentFromGroup(string RequestingAgentID, string AgentID, UUID GroupID)
+        protected void _RemoveAgentFromGroup(string RequestingAgentID, string AgentID, UUID GroupID)
         {
             // 1. Delete membership
             m_Database.DeleteMember(GroupID, AgentID);
@@ -780,7 +780,7 @@ namespace OpenSim.Groups
 
         }
 
-        private bool _AddOrUpdateGroupRole(string RequestingAgentID, UUID groupID, UUID roleID, string name, string description, string title, ulong powers, bool add)
+        protected bool _AddOrUpdateGroupRole(string RequestingAgentID, UUID groupID, UUID roleID, string name, string description, string title, ulong powers, bool add)
         {
             RoleData data = m_Database.RetrieveRole(groupID, roleID);
 
@@ -810,12 +810,12 @@ namespace OpenSim.Groups
             return m_Database.StoreRole(data);
         }
 
-        private void _RemoveGroupRole(UUID groupID, UUID roleID)
+        protected void _RemoveGroupRole(UUID groupID, UUID roleID)
         {
             m_Database.DeleteRole(groupID, roleID);
         }
 
-        private void _AddAgentToGroupRole(string RequestingAgentID, string AgentID, UUID GroupID, UUID RoleID)
+        protected void _AddAgentToGroupRole(string RequestingAgentID, string AgentID, UUID GroupID, UUID RoleID)
         {
             RoleMembershipData data = m_Database.RetrieveRoleMember(GroupID, RoleID, AgentID);
             if (data != null)
@@ -840,7 +840,7 @@ namespace OpenSim.Groups
 
         }
 
-        private List<GroupRolesData> _GetGroupRoles(UUID groupID)
+        protected List<GroupRolesData> _GetGroupRoles(UUID groupID)
         {
             List<GroupRolesData> roles = new List<GroupRolesData>();
 
@@ -865,7 +865,7 @@ namespace OpenSim.Groups
             return roles;
         }
 
-        private List<ExtendedGroupRoleMembersData> _GetGroupRoleMembers(UUID GroupID, bool isInGroup)
+        protected List<ExtendedGroupRoleMembersData> _GetGroupRoleMembers(UUID GroupID, bool isInGroup)
         {
             List<ExtendedGroupRoleMembersData> rmembers = new List<ExtendedGroupRoleMembersData>();
 
-- 
cgit v1.1


From ef08ab68a7a8870e4ec300a0da5533ea097a9577 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 27 Apr 2013 17:42:54 +0100
Subject: Small oversight in EconomyDataRequest - this would have affected
 everyone NOT using a money module.

---
 OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 37af8c7..5863379 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -690,8 +690,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         /// <param name="agentId"></param>
         public void EconomyDataRequestHandler(IClientAPI user)
         {
-            Scene s = LocateSceneClientIn(user.AgentId);
-
             user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
                                  PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor,
                                  PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload,
-- 
cgit v1.1


From cbb3bb62dae548917a899171bd69972e85a1642d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 27 Apr 2013 17:56:39 +0100
Subject: Unbreak the sample money module

---
 OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 5863379..35f44d0 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -690,6 +690,8 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         /// <param name="agentId"></param>
         public void EconomyDataRequestHandler(IClientAPI user)
         {
+            Scene s = (Scene)user.Scene;
+
             user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
                                  PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor,
                                  PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload,
-- 
cgit v1.1


From f675d465b27bfecab59213bd19c6e070a6482f88 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 27 Apr 2013 10:34:13 -0700
Subject: Make method virtual

---
 OpenSim/Services/UserAccountService/GridUserService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index 43fa04b..8388180 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Services.UserAccountService
             return info;
         }
 
-        public GridUserInfo[] GetGridUserInfo(string[] userIDs)
+        public virtual GridUserInfo[] GetGridUserInfo(string[] userIDs)
         {
             List<GridUserInfo> ret = new List<GridUserInfo>();
 
-- 
cgit v1.1


From 90a6891a7d5af39013efc49f12dc69a8d7b240de Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 27 Apr 2013 10:34:23 -0700
Subject: Better error reporting

---
 OpenSim/Server/Base/ServerUtils.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 210a314..25957d3 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}", dllName, e.Message);
                                 return null;
                             }
 
-- 
cgit v1.1


From 222f530411eccf43279ff0d789c1f5c3bc4530eb Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 27 Apr 2013 21:23:29 -0700
Subject: Added an interface to an external ban service. With this commit, the
 interface is used only in Hypergrided worlds (Gatekeeper), although in those,
 it applies to both local and foreign users. The Ban service itself is not in
 core; it is to be provided externally.

---
 .../Services/HypergridService/GatekeeperService.cs | 25 +++++++++--
 OpenSim/Services/Interfaces/IBansService.cs        | 48 ++++++++++++++++++++++
 2 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 OpenSim/Services/Interfaces/IBansService.cs

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 97a0afc..0cf1c14 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;
@@ -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 is OK");
+
             bool isFirstLogin = false;
             //
             // Login the presence, if it's not there yet (by the login service)
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);
+    }
+
+}
-- 
cgit v1.1


From a517e597f5960e5ce5eeea89e9087ac32a42bf06 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 28 Apr 2013 09:03:09 -0700
Subject: Fix wrong sql statement in offline im.

---
 OpenSim/Data/MySQL/MySQLOfflineIMData.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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);
             }
 
-- 
cgit v1.1


From 3ff7391495271fed152aadc7a588ae976e09bafc Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 29 Apr 2013 00:55:34 +0100
Subject: Some more pieces of Avination's ban system - if an avatar isn't
 allowed on any parcel in the sim, keep them out entirely.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 95 +++++++++++++++++++++++++++++---
 1 file changed, 88 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 69fe137..829a7e9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3693,7 +3693,7 @@ namespace OpenSim.Region.Framework.Scenes
                 //On login test land permisions
                 if (vialogin)
                 {
-                    if (land != null && !TestLandRestrictions(agent, land, out reason))
+                    if (land != null && !TestLandRestrictions(agent.AgentID, out reason, ref agent.startpos.X, ref agent.startpos.Y))
                     {
                         return false;
                     }
@@ -3868,20 +3868,37 @@ namespace OpenSim.Region.Framework.Scenes
             return true;
         }
 
-        private bool TestLandRestrictions(AgentCircuitData agent, ILandObject land,  out string reason)
+        public bool TestLandRestrictions(UUID agentID, out string reason, ref float posX, ref float posY)
         {
-            bool banned = land.IsBannedFromLand(agent.AgentID);
-            bool restricted = land.IsRestrictedFromLand(agent.AgentID);
+            if (posX < 0)
+                posX = 0;
+            else if (posX >= 256)
+                posX = 255.999f;
+            if (posY < 0)
+                posY = 0;
+            else if (posY >= 256)
+                posY = 255.999f;
+
+            reason = String.Empty;
+            if (Permissions.IsGod(agentID))
+                return true;
+
+            ILandObject land = LandChannel.GetLandObject(posX, posY);
+            if (land == null)
+                return false;
+
+            bool banned = land.IsBannedFromLand(agentID);
+            bool restricted = land.IsRestrictedFromLand(agentID);
 
             if (banned || restricted)
             {
-                ILandObject nearestParcel = GetNearestAllowedParcel(agent.AgentID, agent.startpos.X, agent.startpos.Y);
+                ILandObject nearestParcel = GetNearestAllowedParcel(agentID, posX, posY);
                 if (nearestParcel != null)
                 {
                     //Move agent to nearest allowed
                     Vector3 newPosition = GetParcelCenterAtGround(nearestParcel);
-                    agent.startpos.X = newPosition.X;
-                    agent.startpos.Y = newPosition.Y;
+                    posX = newPosition.X;
+                    posY = newPosition.Y;
                 }
                 else
                 {
@@ -5466,6 +5483,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         public bool QueryAccess(UUID agentID, Vector3 position, out string reason)
         {
+            reason = "You are banned from the region";
+
             if (EntityTransferModule.IsInTransit(agentID))
             {
                 reason = "Agent is still in transit from this region";
@@ -5477,6 +5496,12 @@ namespace OpenSim.Region.Framework.Scenes
                 return false;
             }
 
+            if (Permissions.IsGod(agentID))
+            {
+                reason = String.Empty;
+                return true;
+            }
+
             // FIXME: Root agent count is currently known to be inaccurate.  This forces a recount before we check.
             // However, the long term fix is to make sure root agent count is always accurate.
             m_sceneGraph.RecalculateStats();
@@ -5497,6 +5522,41 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
+            ScenePresence presence = GetScenePresence(agentID);
+            IClientAPI client = null;
+            AgentCircuitData aCircuit = null;
+
+            if (presence != null)
+            {
+                client = presence.ControllingClient;
+                if (client != null)
+                    aCircuit = client.RequestClientInfo();
+            }
+
+            // We may be called before there is a presence or a client.
+            // Fake AgentCircuitData to keep IAuthorizationModule smiling
+            if (client == null)
+            {
+                aCircuit = new AgentCircuitData();
+                aCircuit.AgentID = agentID;
+                aCircuit.firstname = String.Empty;
+                aCircuit.lastname = String.Empty;
+            }
+
+            try
+            {
+                if (!AuthorizeUser(aCircuit, out reason))
+                {
+                    // m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID);
+                    return false;
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[SCENE]: Exception authorizing agent: {0} "+ e.StackTrace, e.Message);
+                return false;
+            }
+
             if (position == Vector3.Zero) // Teleport
             {
                 if (!RegionInfo.EstateSettings.AllowDirectTeleport)
@@ -5530,6 +5590,27 @@ namespace OpenSim.Region.Framework.Scenes
                         }
                     }
                 }
+
+                float posX = 128.0f;
+                float posY = 128.0f;
+
+                if (!TestLandRestrictions(agentID, out reason, ref posX, ref posY))
+                {
+                    // m_log.DebugFormat("[SCENE]: Denying {0} because they are banned on all parcels", agentID);
+                    return false;
+                }
+            }
+            else // Walking
+            {
+                ILandObject land = LandChannel.GetLandObject(position.X, position.Y);
+                if (land == null)
+                    return false;
+
+                bool banned = land.IsBannedFromLand(agentID);
+                bool restricted = land.IsRestrictedFromLand(agentID);
+
+                if (banned || restricted)
+                    return false;
             }
 
             reason = String.Empty;
-- 
cgit v1.1


From 890cb6a29373a54dde2d06b13e42d07676710dc2 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 27 Apr 2013 14:00:58 -0700
Subject: BulletSim: complete BSShape classes.

---
 .../Physics/BulletSPlugin/BSShapeCollection.cs     |   2 +-
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs   | 327 ++++++++++++++++++++-
 .../Region/Physics/BulletSPlugin/BulletSimTODO.txt |   6 +-
 3 files changed, 316 insertions(+), 19 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index bc26460..0f9b3c3 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -499,7 +499,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
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index dd5ae1a..e427dbc 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -31,6 +31,7 @@ using System.Text;
 
 using OpenSim.Framework;
 using OpenSim.Region.Physics.Manager;
+using OpenSim.Region.Physics.ConvexDecompositionDotNet;
 
 using OMV = OpenMetaverse;
 
@@ -73,7 +74,7 @@ public abstract class BSShape
         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);
+            ret = BSShapeCompound.GetReference(physicsScene, prim);
             physicsScene.DetailLog("{0},BSShapeCollection.CreateGeom,compoundShape,shape={1}", prim.LocalID, ret);
         }
 
@@ -92,6 +93,7 @@ public abstract class BSShape
     }
     private static BSShape GetShapeReferenceNonSpecial(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
     {
+        // TODO: work needed here!!
         BSShapeMesh.GetReference(physicsScene, forceRebuild, prim);
         BSShapeHull.GetReference(physicsScene, forceRebuild, prim);
         return null;
@@ -209,7 +211,7 @@ public class BSShapeNative : BSShape
 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(BulletShape pShape) : base(pShape)
     {
@@ -219,10 +221,10 @@ public class BSShapeMesh : BSShape
         float lod;
         System.UInt64 newMeshKey = BSShapeCollection.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
 
-        physicsScene.DetailLog("{0},BSShapeMesh,create,oldKey={1},newKey={2},size={3},lod={4}",
+        physicsScene.DetailLog("{0},BSShapeMesh,getReference,oldKey={1},newKey={2},size={3},lod={4}",
                                 prim.LocalID, prim.PhysShape.shapeKey.ToString("X"), newMeshKey.ToString("X"), prim.Size, lod);
 
-        BSShapeMesh retMesh;
+        BSShapeMesh retMesh = new BSShapeMesh(new BulletShape());
         lock (Meshes)
         {
             if (Meshes.TryGetValue(newMeshKey, out retMesh))
@@ -233,13 +235,17 @@ public class BSShapeMesh : BSShape
             else
             {
                 // An instance of this mesh has not been created. Build and remember same.
-                BulletShape newShape = CreatePhysicalMesh(physicsScene, prim, newMeshKey, prim.BaseShape, prim.Size, lod);
-                // Take evasive action if the mesh was not constructed.
-                newShape = BSShapeCollection.VerifyMeshCreated(physicsScene, newShape, prim);
+                BulletShape newShape = retMesh.CreatePhysicalMesh(physicsScene, prim, newMeshKey, prim.BaseShape, prim.Size, lod);
 
-                retMesh = new BSShapeMesh(newShape);
+                // Check to see if mesh was created (might require an asset).
+                newShape = BSShapeCollection.VerifyMeshCreated(physicsScene, newShape, prim);
+                if (newShape.type == BSPhysicsShapeType.SHAPE_MESH)
+                {
+                    // If a mesh was what was created, remember the built shape for later sharing.
+                    Meshes.Add(newMeshKey, retMesh);
+                }
 
-                Meshes.Add(newMeshKey, retMesh);
+                retMesh.physShapeInfo = newShape;
             }
         }
         return retMesh;
@@ -252,8 +258,28 @@ public class BSShapeMesh : BSShape
             // 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;
+                }
 
-    private static BulletShape CreatePhysicalMesh(BSScene physicsScene, BSPhysObject prim, System.UInt64 newMeshKey,
+            }
+        }
+        outMesh = foundDesc;
+        return ret;
+    }
+    private BulletShape CreatePhysicalMesh(BSScene physicsScene, BSPhysObject prim, System.UInt64 newMeshKey,
                                             PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
     {
         BulletShape newShape = null;
@@ -326,32 +352,301 @@ public class BSShapeMesh : BSShape
 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(BulletShape pShape) : base(pShape)
     {
     }
     public static BSShape GetReference(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
     {
-        return new BSShapeNull();
+        float lod;
+        System.UInt64 newHullKey = BSShapeCollection.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
+
+        physicsScene.DetailLog("{0},BSShapeHull,getReference,oldKey={1},newKey={2},size={3},lod={4}",
+                                prim.LocalID, prim.PhysShape.shapeKey.ToString("X"), newHullKey.ToString("X"), prim.Size, lod);
+
+        BSShapeHull retHull = new BSShapeHull(new BulletShape());
+        lock (Hulls)
+        {
+            if (Hulls.TryGetValue(newHullKey, out retHull))
+            {
+                // The mesh has already been created. Return a new reference to same.
+                retHull.IncrementReference();
+            }
+            else
+            {
+                // 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 mesh was created (might require an asset).
+                newShape = BSShapeCollection.VerifyMeshCreated(physicsScene, newShape, prim);
+                if (newShape.type == BSPhysicsShapeType.SHAPE_MESH)
+                {
+                    // If a mesh was what was created, remember the built shape for later sharing.
+                    Hulls.Add(newHullKey, retHull);
+                }
+
+                retHull = new BSShapeHull(newShape);
+                retHull.physShapeInfo = newShape;
+            }
+        }
+        return retHull;
     }
     public override void Dereference(BSScene physicsScene)
     {
     }
+    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();
+        IntPtr hullPtr = IntPtr.Zero;
+
+        if (BSParam.ShouldUseBulletHACD)
+        {
+            physicsScene.DetailLog("{0},BSShapeCollection.CreatePhysicalHull,shouldUseBulletHACD,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},BSShapeCollection.CreatePhysicalHull,hullFromMesh,beforeCall", prim.LocalID, newShape.HasPhysicalShape);
+                newShape = physicsScene.PE.BuildHullShapeFromMesh(physicsScene.World, meshShape.physShapeInfo, parms);
+                physicsScene.DetailLog("{0},BSShapeCollection.CreatePhysicalHull,hullFromMesh,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
+            }
+            // Now done with the mesh shape.
+            meshShape.DecrementReference();
+            physicsScene.DetailLog("{0},BSShapeCollection.CreatePhysicalHull,shouldUseBulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
+        }
+        if (!newShape.HasPhysicalShape)
+        {
+            // 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(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */);
+            if (meshData != null)
+            {
+                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) 
+    public static BSShape GetReference(BSScene physicsScene, BSPhysObject prim) 
     { 
-        return new BSShapeNull();
+        // Compound shapes are not shared so a new one is created every time.
+        return new BSShapeCompound(CreatePhysicalCompoundShape(physicsScene, prim));
+    }
+    // Dereferencing a compound shape releases the hold on all the child shapes.
+    public override void Dereference(BSScene physicsScene)
+    {
+        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.type, physShapeInfo.AddrString);
+            physicsScene.DetailLog("{0},BSShapeCollection.DereferenceCompound,notACompoundShape,type={1},ptr={2}",
+                                        BSScene.DetailLogZero, physShapeInfo.type, 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, BSPhysObject prim)
+    {
+        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)
+    {
+        BSShapeMesh meshDesc;
+        if (BSShapeMesh.TryGetMeshByPtr(pShape, out meshDesc))
+        {
+            meshDesc.Dereference(physicsScene);
+        }
+        else
+        {
+            BSShapeHull hullDesc;
+            if (BSShapeHull.TryGetHullByPtr(pShape, out hullDesc))
+            {
+                hullDesc.Dereference(physicsScene);
+            }
+            else
+            {
+                if (physicsScene.PE.IsCompound(pShape))
+                {
+                    BSShapeCompound recursiveCompound = new BSShapeCompound(pShape);
+                    recursiveCompound.Dereference(physicsScene);
+                }
+                else
+                {
+                    if (physicsScene.PE.IsNativeShape(pShape))
+                    {
+                        BSShapeNative nativeShape = new BSShapeNative(pShape);
+                        nativeShape.Dereference(physicsScene);
+                    }
+                }
+            }
+        }
     }
-    public override void Dereference(BSScene physicsScene) { }
 }
 
 // ============================================================================================================
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
index 1284ae7..c67081a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
@@ -11,6 +11,8 @@ Deleting a linkset while standing on the root will leave the physical shape of t
 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.
+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
 Vehicle angular vertical attraction
 vehicle angular banking
 Center-of-gravity
@@ -27,14 +29,13 @@ 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)
+	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)
 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
 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.
@@ -347,4 +348,5 @@ Angular motion around Z moves the vehicle in world Z and not vehicle Z in ODE.
 	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)
 
-- 
cgit v1.1


From e5582939fd8d78b61c6f1eeda6de45d94f4b4926 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 28 Apr 2013 14:44:21 -0700
Subject: BulletSim: massive refactor of shape classes. Removed shape specific
 code from BSShapeCollection. Using BSShape* classes to hold references to
 shape. Simplified shape dependency callbacks. Remove 'PreferredShape' methods
 and have each class specify shape type. Disable compound shape linkset for a
 later commit that will simplify linkset implementation.

---
 OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs |   6 +-
 OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs   |   4 +-
 .../Physics/BulletSPlugin/BSActorAvatarMove.cs     |   4 +-
 .../Region/Physics/BulletSPlugin/BSActorHover.cs   |   4 +-
 .../Physics/BulletSPlugin/BSActorLockAxis.cs       |   4 +-
 .../Physics/BulletSPlugin/BSActorMoveToTarget.cs   |   4 +-
 .../Physics/BulletSPlugin/BSActorSetForce.cs       |   4 +-
 .../Physics/BulletSPlugin/BSActorSetTorque.cs      |   4 +-
 OpenSim/Region/Physics/BulletSPlugin/BSActors.cs   |   6 +-
 .../Region/Physics/BulletSPlugin/BSCharacter.cs    |  19 +-
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs |   4 +-
 OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs  |   9 +-
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     |  35 +-
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  |   4 +-
 .../Region/Physics/BulletSPlugin/BSPhysObject.cs   |  11 +-
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     |  34 +-
 .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs |   9 +-
 .../Physics/BulletSPlugin/BSShapeCollection.cs     | 966 ++-------------------
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs   | 203 +++--
 .../Region/Physics/BulletSPlugin/BulletSimData.cs  |   6 +-
 20 files changed, 290 insertions(+), 1050 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
index fdf2cb9..8a22bc7 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
@@ -79,7 +79,7 @@ private sealed class BulletShapeUnman : BulletShape
         : 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)
     {
@@ -375,7 +375,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)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
index b37265a..1ef8b17 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
@@ -85,7 +85,7 @@ private sealed class BulletShapeXNA : BulletShape
         : 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)
     {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
index bd5ee0b1..ac05979 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -87,8 +87,8 @@ public class BSActorAvatarMove : BSActor
     // 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.RemoveBodyDependencies()
-    public override void RemoveBodyDependencies()
+    // BSActor.RemoveDependencies()
+    public override void RemoveDependencies()
     {
         // Nothing to do for the hoverer since it is all software at pre-step action time.
     }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
index 92ace66..3630ca8 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
@@ -87,8 +87,8 @@ public class BSActorHover : BSActor
     // 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.RemoveBodyDependencies()
-    public override void RemoveBodyDependencies()
+    // BSActor.RemoveDependencies()
+    public override void RemoveDependencies()
     {
         // Nothing to do for the hoverer since it is all software at pre-step action time.
     }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
index 09ee32b..6059af5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
@@ -85,8 +85,8 @@ public class BSActorLockAxis : BSActor
     // 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.RemoveBodyDependencies()
-    public override void RemoveBodyDependencies()
+    // BSActor.RemoveDependencies()
+    public override void RemoveDependencies()
     {
         if (LockAxisConstraint != null)
         {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
index 56aacc5..1b598fd 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
@@ -88,8 +88,8 @@ public class BSActorMoveToTarget : BSActor
     // 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.RemoveBodyDependencies()
-    public override void RemoveBodyDependencies()
+    // BSActor.RemoveDependencies()
+    public override void RemoveDependencies()
     {
         // Nothing to do for the moveToTarget since it is all software at pre-step action time.
     }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
index 3ad138d..c0f40fd 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
@@ -89,8 +89,8 @@ public class BSActorSetForce : BSActor
     // 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.RemoveBodyDependencies()
-    public override void RemoveBodyDependencies()
+    // BSActor.RemoveDependencies()
+    public override void RemoveDependencies()
     {
         // Nothing to do for the hoverer since it is all software at pre-step action time.
     }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
index 7a791ec..b3806e1 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
@@ -89,8 +89,8 @@ public class BSActorSetTorque : BSActor
     // 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.RemoveBodyDependencies()
-    public override void RemoveBodyDependencies()
+    // BSActor.RemoveDependencies()
+    public override void RemoveDependencies()
     {
         // Nothing to do for the hoverer since it is all software at pre-step action time.
     }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
index 12a8817..5e3f1c4 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
@@ -106,9 +106,9 @@ public class BSActorCollection
     {
         ForEachActor(a => a.Refresh());
     }
-    public void RemoveBodyDependencies()
+    public void RemoveDependencies()
     {
-        ForEachActor(a => a.RemoveBodyDependencies());
+        ForEachActor(a => a.RemoveDependencies());
     }
 }
 
@@ -154,7 +154,7 @@ public abstract class BSActor
     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 RemoveBodyDependencies();
+    public abstract void RemoveDependencies();
 
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index a0d58d3..da23a262 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -123,8 +123,8 @@ public sealed class BSCharacter : BSPhysObject
         {
             PhysicsScene.Shapes.DereferenceBody(PhysBody, null /* bodyCallback */);
             PhysBody.Clear();
-            PhysicsScene.Shapes.DereferenceShape(PhysShape, null /* bodyCallback */);
-            PhysShape.Clear();
+            PhysShape.Dereference(PhysicsScene);
+            PhysShape = new BSShapeNull();
         });
     }
 
@@ -146,8 +146,8 @@ public sealed class BSCharacter : BSPhysObject
         Flying = _flying;
 
         PhysicsScene.PE.SetRestitution(PhysBody, BSParam.AvatarRestitution);
-        PhysicsScene.PE.SetMargin(PhysShape, PhysicsScene.Params.collisionMargin);
-        PhysicsScene.PE.SetLocalScaling(PhysShape, Scale);
+        PhysicsScene.PE.SetMargin(PhysShape.physShapeInfo, PhysicsScene.Params.collisionMargin);
+        PhysicsScene.PE.SetLocalScaling(PhysShape.physShapeInfo, Scale);
         PhysicsScene.PE.SetContactProcessingThreshold(PhysBody, BSParam.ContactProcessingThreshold);
         if (BSParam.CcdMotionThreshold > 0f)
         {
@@ -205,9 +205,9 @@ public sealed class BSCharacter : BSPhysObject
 
             PhysicsScene.TaintedObject("BSCharacter.setSize", delegate()
             {
-                if (PhysBody.HasPhysicalBody && PhysShape.HasPhysicalShape)
+                if (PhysBody.HasPhysicalBody && PhysShape.physShapeInfo.HasPhysicalShape)
                 {
-                    PhysicsScene.PE.SetLocalScaling(PhysShape, Scale);
+                    PhysicsScene.PE.SetLocalScaling(PhysShape.physShapeInfo, Scale);
                     UpdatePhysicalMassProperties(RawMass, true);
                     // Make sure this change appears as a property update event
                     PhysicsScene.PE.PushUpdate(PhysBody);
@@ -221,11 +221,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; }
@@ -381,7 +376,7 @@ public sealed class BSCharacter : BSPhysObject
     }
     public override void UpdatePhysicalMassProperties(float physMass, bool inWorld)
     {
-        OMV.Vector3 localInertia = PhysicsScene.PE.CalculateLocalInertia(PhysShape, physMass);
+        OMV.Vector3 localInertia = PhysicsScene.PE.CalculateLocalInertia(PhysShape.physShapeInfo, physMass);
         PhysicsScene.PE.SetMassProps(PhysBody, physMass, localInertia);
     }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 612c68b..e2e807e 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -625,7 +625,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 // Vehicles report collision events so we know when it's on the ground
                 m_physicsScene.PE.AddToCollisionFlags(ControllingPrim.PhysBody, CollisionFlags.BS_VEHICLE_COLLISIONS);
 
-                ControllingPrim.Inertia = m_physicsScene.PE.CalculateLocalInertia(ControllingPrim.PhysShape, m_vehicleMass);
+                ControllingPrim.Inertia = m_physicsScene.PE.CalculateLocalInertia(ControllingPrim.PhysShape.physShapeInfo, m_vehicleMass);
                 m_physicsScene.PE.SetMassProps(ControllingPrim.PhysBody, m_vehicleMass, ControllingPrim.Inertia);
                 m_physicsScene.PE.UpdateInertiaTensor(ControllingPrim.PhysBody);
 
@@ -649,7 +649,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         }
 
         // BSActor.RemoveBodyDependencies
-        public override void RemoveBodyDependencies()
+        public override void RemoveDependencies()
         {
             Refresh();
         }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 4ece1eb..df1dd34 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -93,13 +93,6 @@ public abstract class BSLinkset
     //    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; }
 
@@ -263,7 +256,7 @@ 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);
 
     // ================================================================
     protected virtual float ComputeLinksetMass()
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index e05562a..a20bbc3 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -98,19 +98,6 @@ public sealed class BSLinksetCompound : BSLinkset
     {
     }
 
-    // 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;
-    }
-
     // When physical properties are changed the linkset needs to recalculate
     //   its internal properties.
     public override void Refresh(BSPrimLinkable requestor)
@@ -218,22 +205,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 && 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 = PhysicsScene.PE.GetNumberOfCompoundChildren(LinksetRoot.PhysShape.physShapeInfo);
                     if (updated.LinksetChildIndex < numLinksetChildren)
                     {
-                        BulletShape linksetChildShape = PhysicsScene.PE.GetChildShapeFromCompoundShapeIndex(LinksetRoot.PhysShape, updated.LinksetChildIndex);
+                        BulletShape linksetChildShape = 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,
+                            PhysicsScene.PE.UpdateChildTransform(LinksetRoot.PhysShape.physShapeInfo, updated.LinksetChildIndex,
                                                                         updated.RawPosition - LinksetRoot.RawPosition,
                                                                         updated.RawOrientation * OMV.Quaternion.Inverse(LinksetRoot.RawOrientation),
                                                                         true /* shouldRecalculateLocalAabb */);
@@ -278,7 +265,7 @@ public sealed class BSLinksetCompound : BSLinkset
     // Since we don't keep in world relationships, do nothing unless it's a child changing.
     // 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;
 
@@ -404,11 +391,12 @@ public sealed class BSLinksetCompound : BSLinkset
     {
         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 */);
+            LinksetRoot.ForceBodyShapeRebuild(true /* inTaintTime );
 
             // 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.
@@ -430,10 +418,10 @@ public sealed class BSLinksetCompound : BSLinkset
             LinksetRoot.ForcePosition = LinksetRoot.RawPosition;
 
             // 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 */,
+            PhysicsScene.PE.UpdateChildTransform(LinksetRoot.PhysShape.physShapeInfo, 0 /* childIndex ,
                                                 -centerDisplacement,
                                                 OMV.Quaternion.Identity, // LinksetRoot.RawOrientation,
-                                                false /* shouldRecalculateLocalAabb (is done later after linkset built) */);
+                                                false /* shouldRecalculateLocalAabb (is done later after linkset built) );
 
             DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,COM,com={1},rootPos={2},centerDisp={3}",
                                     LinksetRoot.LocalID, centerOfMassW, LinksetRoot.RawPosition, centerDisplacement);
@@ -501,6 +489,7 @@ public sealed class BSLinksetCompound : BSLinkset
 
             // 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);
+            */
         }
         finally
         {
@@ -508,7 +497,7 @@ public sealed class BSLinksetCompound : BSLinkset
         }
 
         // See that the Aabb surrounds the new shape
-        PhysicsScene.PE.RecalculateCompoundShapeLocalAabb(LinksetRoot.PhysShape);
+        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..1811772 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -93,11 +93,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)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 309d004..b6eb619 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -88,7 +88,7 @@ public abstract class BSPhysObject : PhysicsActor
 
         // We don't have any physical representation yet.
         PhysBody = new BulletBody(localID);
-        PhysShape = new BulletShape();
+        PhysShape = new BSShapeNull();
 
         PrimAssetState = PrimAssetCondition.Unknown;
 
@@ -138,7 +138,7 @@ 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'.
@@ -151,13 +151,6 @@ public abstract class BSPhysObject : PhysicsActor
     // 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.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 4bc266b..5d12338 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -134,8 +134,8 @@ public class BSPrim : BSPhysObject
             // If there are physical body and shape, release my use of same.
             PhysicsScene.Shapes.DereferenceBody(PhysBody, null);
             PhysBody.Clear();
-            PhysicsScene.Shapes.DereferenceShape(PhysShape, null);
-            PhysShape.Clear();
+            PhysShape.Dereference(PhysicsScene);
+            PhysShape = new BSShapeNull();
         });
     }
 
@@ -161,25 +161,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)
+        PhysicsScene.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 {
@@ -462,7 +450,7 @@ public class BSPrim : BSPhysObject
                 Gravity = ComputeGravity(Buoyancy);
                 PhysicsScene.PE.SetGravity(PhysBody, Gravity);
 
-                Inertia = PhysicsScene.PE.CalculateLocalInertia(PhysShape, physMass);
+                Inertia = PhysicsScene.PE.CalculateLocalInertia(PhysShape.physShapeInfo, physMass);
                 PhysicsScene.PE.SetMassProps(PhysBody, physMass, Inertia);
                 PhysicsScene.PE.UpdateInertiaTensor(PhysBody);
 
@@ -805,7 +793,8 @@ public class BSPrim : BSPhysObject
         PhysicsScene.PE.UpdateSingleAabb(PhysicsScene.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.
@@ -1463,12 +1452,13 @@ 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'. 'GetBodyAndShape' makes the right choices and changes of necessary.
-        PhysicsScene.Shapes.GetBodyAndShape(false /*forceRebuild */, PhysicsScene.World, this, null, delegate(BulletBody dBody)
+        PhysicsScene.Shapes.GetBodyAndShape(false /*forceRebuild */, PhysicsScene.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
@@ -1477,9 +1467,9 @@ public class BSPrim : BSPhysObject
     }
 
     // Called at taint-time
-    protected virtual void RemoveBodyDependencies()
+    protected virtual void RemoveDependencies()
     {
-        PhysicalActors.RemoveBodyDependencies();
+        PhysicalActors.RemoveDependencies();
     }
 
     // The physics engine says that properties have updated. Update same and inform
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 28242d4..81104ec 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -61,9 +61,6 @@ 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;
@@ -149,10 +146,10 @@ public class BSPrimLinkable : BSPrimDisplaced
     }
 
     // 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();
     }
 
     public override void UpdateProperties(EntityProperties entprop)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index 0f9b3c3..3c23509 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,271 +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);
-
-            // Removing an object not in the world is a NOOP
-            PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, 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;
-    }
-
-    // Release the usage of a shape.
-    public void DereferenceShape(BulletShape shape, ShapeDestructionCallback 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))
-        {
-            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);
-
-        }
+        return GetBodyAndShape(forceRebuild, sim, prim, null);
     }
 
-    // Count down the reference count for a hull shape
-    // Called at taint-time.
-    private void DereferenceHull(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)
     {
-        HullDesc hullDesc;
-        if (Hulls.TryGetValue(shape.shapeKey, out hullDesc))
+        if (prim.PhysShape.HasPhysicalShape)
         {
-            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.
@@ -402,40 +124,7 @@ 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)
-    {
-        bool ret = false;
-        bool haveShape = false;
-
-        if (!haveShape && prim.PreferredPhysicalShape == BSPhysicsShapeType.SHAPE_CAPSULE)
-        {
-            // 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);
-            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)
+    private bool CreateGeom(bool forceRebuild, BSPhysObject prim, PhysicalDestructionCallback shapeCallback)
     {
         bool ret = false;
         bool haveShape = false;
@@ -443,19 +132,21 @@ public sealed class BSShapeCollection : IDisposable
         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)
@@ -463,26 +154,28 @@ 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);
                 }
                 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);
                 }
                 if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,box,force={1},rebuilt={2},shape={3}",
                                         prim.LocalID, forceRebuild, ret, prim.PhysShape);
@@ -511,7 +204,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;
@@ -520,537 +213,70 @@ public sealed class BSShapeCollection : IDisposable
         if (prim.IsPhysical && BSParam.ShouldUseHullsForPhysicalObjects)
         {
             // Update prim.BSShape to reference a hull of this shape.
-            ret = GetReferenceToHull(prim, shapeCallback);
+            DereferenceExistingShape(prim, shapeCallback);
+            prim.PhysShape = BSShapeMesh.GetReference(m_physicsScene, false /*forceRebuild*/, prim);
             if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,hull,shape={1},key={2}",
-                                    prim.LocalID, prim.PhysShape, prim.PhysShape.shapeKey.ToString("X"));
+                                    prim.LocalID, prim.PhysShape, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"));
         }
         else
         {
-            ret = GetReferenceToMesh(prim, shapeCallback);
+            // Update prim.BSShape to reference a mesh of this shape.
+            DereferenceExistingShape(prim, shapeCallback);
+            prim.PhysShape = BSShapeHull.GetReference(m_physicsScene, false /*forceRebuild*/, prim);
             if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,mesh,shape={1},key={2}",
-                                    prim.LocalID, prim.PhysShape, prim.PhysShape.shapeKey.ToString("X"));
+                                    prim.LocalID, prim.PhysShape, prim.PhysShape.physShapeInfo.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)
-        {
-
-            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(PhysicsScene, 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)
+    // 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();
-
-        MeshDesc meshDesc;
-        if (Meshes.TryGetValue(newMeshKey, out meshDesc))
-        {
-            // If the mesh has already been built just use it.
-            newShape = meshDesc.shape.Clone();
-        }
-        else
+        lock (m_collectionActivityLock)
         {
-            IMesh 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
-                                        );
-
-            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();
-                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);
-                }
+                m_physicsScene.PE.AddObjectToWorld(m_physicsScene.World, body);
+                if (DDetail) DetailLog("{0},BSShapeCollection.ReferenceBody,addedToWorld,ref={1}", body.ID, body);
             }
         }
-        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, newHullKey, prim.BaseShape, prim.Size, lod);
-        // It might not have been created if we're waiting for an asset.
-        newShape = VerifyMeshCreated(PhysicsScene, newShape, prim);
-
-        ReferenceShape(newShape);
-
-        prim.PhysShape = newShape;
-        return true;        // 'true' means a new shape has been added to this prim
     }
 
-    List<ConvexResult> m_hulls;
-    private BulletShape CreatePhysicalHull(BSPhysObject prim, System.UInt64 newHullKey, PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
+    // 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 )
     {
+        if (!body.HasPhysicalBody)
+            return;
 
-        BulletShape newShape = new BulletShape();
-        IntPtr hullPtr = IntPtr.Zero;
+        m_physicsScene.AssertInTaintTime("BSShapeCollection.DereferenceBody");
 
-        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)
         {
-            if (BSParam.ShouldUseBulletHACD)
-            {
-                DetailLog("{0},BSShapeCollection.CreatePhysicalHull,shouldUseBulletHACD,entry", prim.LocalID);
-                MeshDesc meshDesc;
-                if (!Meshes.TryGetValue(newHullKey, out meshDesc))
-                {
-                    // That's odd because the mesh should have been created before the hull
-                    //     but, since it doesn't exist, create it.
-                    newShape = CreatePhysicalMesh(prim, newHullKey, prim.BaseShape, prim.Size, lod);
-                    DetailLog("{0},BSShapeCollection.CreatePhysicalHull,noMeshBuiltNew,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
-
-                    if (newShape.HasPhysicalShape)
-                    {
-                        ReferenceShape(newShape);
-                        Meshes.TryGetValue(newHullKey, out meshDesc);
-                    }
-                }
-                if (meshDesc.shape.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);
-
-                    DetailLog("{0},BSShapeCollection.CreatePhysicalHull,hullFromMesh,beforeCall", prim.LocalID, newShape.HasPhysicalShape);
-                    newShape = PhysicsScene.PE.BuildHullShapeFromMesh(PhysicsScene.World, meshDesc.shape, parms);
-                    DetailLog("{0},BSShapeCollection.CreatePhysicalHull,hullFromMesh,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
-                }
-                DetailLog("{0},BSShapeCollection.CreatePhysicalHull,shouldUseBulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
-            }
-            if (!newShape.HasPhysicalShape)
-            {
-                // 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(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */);
-                if (meshData != null)
-                {
-                    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);
-                }
-            }
-            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.
-    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;
-
-        // 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
-    public static System.UInt64 ComputeShapeKey(OMV.Vector3 size, PrimitiveBaseShape pbs)
-    {
-        float lod;
-        return ComputeShapeKey(size, pbs, out 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;
+            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);
 
-        // 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
-        {
-            // 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
-                )
-            {
-                physicsScene.DetailLog("{0},BSShapeCollection.VerifyMeshCreated,fetchAsset", prim.LocalID);
-                // Multiple requestors will know we're waiting for this asset
-                prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Waiting;
+            // Removing an object not in the world is a NOOP
+            m_physicsScene.PE.RemoveObjectFromWorld(m_physicsScene.World, body);
 
-                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;
-                                physicsScene.DetailLog("{0},BSShapeCollection,fetchAssetCallback,found={1},isSculpt={2},ids={3}",
-                                            yprim.LocalID, assetFound, yprim.BaseShape.SculptEntry, mismatchIDs );
+            // 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);
 
-                            });
-                        }
-                        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);
-                }
-            }
+            m_physicsScene.PE.DestroyObject(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 = physicsScene.Shapes.BuildPhysicalNativeShape(prim, BSPhysicsShapeType.SHAPE_BOX, FixedShapeKey.KEY_BOX);
-        physicsScene.DetailLog("{0},BSShapeCollection.VerifyMeshCreated,boxTempShape", prim.LocalID);
-
-        return fillinShape;
     }
 
     // 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;
 
@@ -1061,7 +287,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)
             {
@@ -1079,12 +305,12 @@ public sealed class BSShapeCollection : IDisposable
             BulletBody aBody;
             if (prim.IsSolid)
             {
-                aBody = PhysicsScene.PE.CreateBodyFromShape(sim, prim.PhysShape, prim.LocalID, prim.RawPosition, prim.RawOrientation);
+                aBody = m_physicsScene.PE.CreateBodyFromShape(sim, prim.PhysShape.physShapeInfo, prim.LocalID, prim.RawPosition, prim.RawOrientation);
                 if (DDetail) DetailLog("{0},BSShapeCollection.CreateBody,mesh,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);
             }
 
@@ -1098,46 +324,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 e427dbc..a7b3f02 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -39,6 +39,8 @@ 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; }
@@ -56,49 +58,6 @@ public abstract class BSShape
         physShapeInfo = pShape;
     }
 
-    // Get a reference to a physical shape. Create if it doesn't exist
-    public static BSShape GetShapeReference(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
-    {
-        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(physicsScene, 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);
-        }
-
-        if (ret == null)
-            ret = GetShapeReferenceNonSpecial(physicsScene, forceRebuild, prim);
-
-        return ret;
-    }
-    private static BSShape GetShapeReferenceNonSpecial(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
-    {
-        // TODO: work needed here!!
-        BSShapeMesh.GetReference(physicsScene, forceRebuild, prim);
-        BSShapeHull.GetReference(physicsScene, forceRebuild, prim);
-        return null;
-    }
-
     // Called when this shape is being used again.
     public virtual void IncrementReference()
     {
@@ -116,6 +75,27 @@ public abstract class BSShape
     // Release the use of a physical shape.
     public abstract void Dereference(BSScene physicsScene);
 
+    // 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
     {
@@ -132,6 +112,119 @@ public abstract class BSShape
         buff.Append(">");
         return buff.ToString();
     }
+
+    // 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.Failed;
+            physicsScene.Logger.WarnFormat("{0} Fetched asset would not mesh. {1}, texture={2}",
+                                            LogHeader, prim.PhysObjectName, 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.Failed
+                && prim.PrimAssetState != BSPhysObject.PrimAssetCondition.Waiting
+                && prim.BaseShape.SculptTexture != OMV.UUID.Zero
+                )
+            {
+                physicsScene.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;
+                                physicsScene.DetailLog("{0},BSShapeCollection,fetchAssetCallback,found={1},isSculpt={2},ids={3}",
+                                            yprim.LocalID, assetFound, yprim.BaseShape.SculptEntry, mismatchIDs );
+                            });
+                        }
+                        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);
+                }
+            }
+         }
+
+        // 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},BSShapeCollection.VerifyMeshCreated,boxTempShape", prim.LocalID);
+
+        return fillShape.physShapeInfo;
+     }
+
 }
 
 // ============================================================================================================
@@ -199,7 +292,7 @@ public class BSShapeNative : BSShape
             physicsScene.Logger.ErrorFormat("{0} BuildPhysicalNativeShape failed. ID={1}, shape={2}",
                                     LogHeader, prim.LocalID, shapeType);
         }
-        newShape.type = shapeType;
+        newShape.shapeType = shapeType;
         newShape.isNativeShape = true;
         newShape.shapeKey = (UInt64)shapeKey;
         return newShape;
@@ -219,10 +312,11 @@ public class BSShapeMesh : BSShape
     public static BSShape GetReference(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
     {
         float lod;
-        System.UInt64 newMeshKey = BSShapeCollection.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
+        System.UInt64 newMeshKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
 
         physicsScene.DetailLog("{0},BSShapeMesh,getReference,oldKey={1},newKey={2},size={3},lod={4}",
-                                prim.LocalID, prim.PhysShape.shapeKey.ToString("X"), newMeshKey.ToString("X"), prim.Size, lod);
+                                prim.LocalID, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"),
+                                newMeshKey.ToString("X"), prim.Size, lod);
 
         BSShapeMesh retMesh = new BSShapeMesh(new BulletShape());
         lock (Meshes)
@@ -238,8 +332,8 @@ public class BSShapeMesh : BSShape
                 BulletShape newShape = retMesh.CreatePhysicalMesh(physicsScene, prim, newMeshKey, prim.BaseShape, prim.Size, lod);
 
                 // Check to see if mesh was created (might require an asset).
-                newShape = BSShapeCollection.VerifyMeshCreated(physicsScene, newShape, prim);
-                if (newShape.type == BSPhysicsShapeType.SHAPE_MESH)
+                newShape = VerifyMeshCreated(physicsScene, newShape, prim);
+                if (newShape.shapeType == BSPhysicsShapeType.SHAPE_MESH)
                 {
                     // If a mesh was what was created, remember the built shape for later sharing.
                     Meshes.Add(newMeshKey, retMesh);
@@ -360,10 +454,10 @@ public class BSShapeHull : BSShape
     public static BSShape GetReference(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
     {
         float lod;
-        System.UInt64 newHullKey = BSShapeCollection.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
+        System.UInt64 newHullKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
 
         physicsScene.DetailLog("{0},BSShapeHull,getReference,oldKey={1},newKey={2},size={3},lod={4}",
-                                prim.LocalID, prim.PhysShape.shapeKey.ToString("X"), newHullKey.ToString("X"), prim.Size, lod);
+                                prim.LocalID, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"), newHullKey.ToString("X"), prim.Size, lod);
 
         BSShapeHull retHull = new BSShapeHull(new BulletShape());
         lock (Hulls)
@@ -379,8 +473,8 @@ public class BSShapeHull : BSShape
                 BulletShape newShape = retHull.CreatePhysicalHull(physicsScene, prim, newHullKey, prim.BaseShape, prim.Size, lod);
 
                 // Check to see if mesh was created (might require an asset).
-                newShape = BSShapeCollection.VerifyMeshCreated(physicsScene, newShape, prim);
-                if (newShape.type == BSPhysicsShapeType.SHAPE_MESH)
+                newShape = VerifyMeshCreated(physicsScene, newShape, prim);
+                if (newShape.shapeType == BSPhysicsShapeType.SHAPE_MESH)
                 {
                     // If a mesh was what was created, remember the built shape for later sharing.
                     Hulls.Add(newHullKey, retHull);
@@ -569,7 +663,6 @@ public class BSShapeHull : BSShape
     }
 }
 
-
 // ============================================================================================================
 public class BSShapeCompound : BSShape
 {
@@ -589,9 +682,9 @@ public class BSShapeCompound : BSShape
         {
             // Failed the sanity check!!
             physicsScene.Logger.ErrorFormat("{0} Attempt to free a compound shape that is not compound!! type={1}, ptr={2}",
-                                        LogHeader, physShapeInfo.type, physShapeInfo.AddrString);
+                                        LogHeader, physShapeInfo.shapeType, physShapeInfo.AddrString);
             physicsScene.DetailLog("{0},BSShapeCollection.DereferenceCompound,notACompoundShape,type={1},ptr={2}",
-                                        BSScene.DetailLogZero, physShapeInfo.type, physShapeInfo.AddrString);
+                                        BSScene.DetailLogZero, physShapeInfo.shapeType, physShapeInfo.AddrString);
             return;
         }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
index 8012d91..906e4f9 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=");
-- 
cgit v1.1


From 2da8e60b6deec472bc979ec33e99c16c5baf0b01 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 28 Apr 2013 14:55:46 -0700
Subject: BulletSim: code for creating the avatar capsule shape.

---
 OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index 3c23509..19855da 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -131,6 +131,17 @@ public sealed class BSShapeCollection : IDisposable
         bool nativeShapePossible = true;
         PrimitiveBaseShape pbs = prim.BaseShape;
 
+        // Kludge to create the capsule for the avatar.
+        BSCharacter theChar = prim as BSCharacter;
+        if (theChar != null)
+        {
+            DereferenceExistingShape(prim, shapeCallback);
+            prim.PhysShape = BSShapeNative.GetReference(m_physicsScene, prim,
+                                            BSPhysicsShapeType.SHAPE_CAPSULE, FixedShapeKey.KEY_CAPSULE);
+            ret = true;
+            haveShape = true;
+        }
+
         // 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
@@ -160,6 +171,7 @@ public sealed class BSShapeCollection : IDisposable
                     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);
@@ -176,6 +188,7 @@ public sealed class BSShapeCollection : IDisposable
                     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);
-- 
cgit v1.1


From f2d408829ba66792b0763aaf51492e7a0037c2d6 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 28 Apr 2013 17:03:03 -0700
Subject: BulletSim: fix crash when creating new hull.

---
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 27 ++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index a7b3f02..bfc7ae7 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -161,7 +161,7 @@ public abstract class BSShape
                 && prim.BaseShape.SculptTexture != OMV.UUID.Zero
                 )
             {
-                physicsScene.DetailLog("{0},BSShapeCollection.VerifyMeshCreated,fetchAsset", prim.LocalID);
+                physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,fetchAsset", prim.LocalID);
                 // Multiple requestors will know we're waiting for this asset
                 prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Waiting;
  
@@ -196,7 +196,7 @@ public abstract class BSShape
                                     yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Fetched;
                                 else
                                     yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
-                                physicsScene.DetailLog("{0},BSShapeCollection,fetchAssetCallback,found={1},isSculpt={2},ids={3}",
+                                physicsScene.DetailLog("{0},BSShape,fetchAssetCallback,found={1},isSculpt={2},ids={3}",
                                             yprim.LocalID, assetFound, yprim.BaseShape.SculptEntry, mismatchIDs );
                             });
                         }
@@ -220,7 +220,7 @@ public abstract class BSShape
 
         // 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},BSShapeCollection.VerifyMeshCreated,boxTempShape", prim.LocalID);
+        physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,boxTempShape", prim.LocalID);
 
         return fillShape.physShapeInfo;
      }
@@ -318,7 +318,7 @@ public class BSShapeMesh : BSShape
                                 prim.LocalID, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"),
                                 newMeshKey.ToString("X"), prim.Size, lod);
 
-        BSShapeMesh retMesh = new BSShapeMesh(new BulletShape());
+        BSShapeMesh retMesh = null;
         lock (Meshes)
         {
             if (Meshes.TryGetValue(newMeshKey, out retMesh))
@@ -328,6 +328,7 @@ public class BSShapeMesh : BSShape
             }
             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);
 
@@ -422,7 +423,7 @@ public class BSShapeMesh : BSShape
                     }
                 }
             }
-            physicsScene.DetailLog("{0},BSShapeCollection.CreatePhysicalMesh,origTri={1},realTri={2},numVerts={3}",
+            physicsScene.DetailLog("{0},BSShapeMesh.CreatePhysicalMesh,origTri={1},realTri={2},numVerts={3}",
                         BSScene.DetailLogZero, indices.Length / 3, realIndicesIndex / 3, verticesAsFloats.Length / 3);
 
             if (realIndicesIndex != 0)
@@ -459,7 +460,7 @@ public class BSShapeHull : BSShape
         physicsScene.DetailLog("{0},BSShapeHull,getReference,oldKey={1},newKey={2},size={3},lod={4}",
                                 prim.LocalID, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"), newHullKey.ToString("X"), prim.Size, lod);
 
-        BSShapeHull retHull = new BSShapeHull(new BulletShape());
+        BSShapeHull retHull = null;
         lock (Hulls)
         {
             if (Hulls.TryGetValue(newHullKey, out retHull))
@@ -469,18 +470,18 @@ public class BSShapeHull : BSShape
             }
             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 mesh was created (might require an asset).
+                // Check to see if hull was created (might require an asset).
                 newShape = VerifyMeshCreated(physicsScene, newShape, prim);
-                if (newShape.shapeType == BSPhysicsShapeType.SHAPE_MESH)
+                if (newShape.shapeType == BSPhysicsShapeType.SHAPE_HULL)
                 {
                     // If a mesh was what was created, remember the built shape for later sharing.
                     Hulls.Add(newHullKey, retHull);
                 }
 
-                retHull = new BSShapeHull(newShape);
                 retHull.physShapeInfo = newShape;
             }
         }
@@ -498,7 +499,7 @@ public class BSShapeHull : BSShape
 
         if (BSParam.ShouldUseBulletHACD)
         {
-            physicsScene.DetailLog("{0},BSShapeCollection.CreatePhysicalHull,shouldUseBulletHACD,entry", prim.LocalID);
+            physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,shouldUseBulletHACD,entry", prim.LocalID);
             BSShape meshShape = BSShapeMesh.GetReference(physicsScene, true, prim);
 
             if (meshShape.physShapeInfo.HasPhysicalShape)
@@ -514,13 +515,13 @@ public class BSShapeHull : BSShape
                 parms.addFacesPoints = BSParam.NumericBool(BSParam.BHullAddFacesPoints);
                 parms.shouldAdjustCollisionMargin = BSParam.NumericBool(BSParam.BHullShouldAdjustCollisionMargin);
 
-                physicsScene.DetailLog("{0},BSShapeCollection.CreatePhysicalHull,hullFromMesh,beforeCall", prim.LocalID, newShape.HasPhysicalShape);
+                physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,hullFromMesh,beforeCall", prim.LocalID, newShape.HasPhysicalShape);
                 newShape = physicsScene.PE.BuildHullShapeFromMesh(physicsScene.World, meshShape.physShapeInfo, parms);
-                physicsScene.DetailLog("{0},BSShapeCollection.CreatePhysicalHull,hullFromMesh,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
+                physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,hullFromMesh,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
             }
             // Now done with the mesh shape.
             meshShape.DecrementReference();
-            physicsScene.DetailLog("{0},BSShapeCollection.CreatePhysicalHull,shouldUseBulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
+            physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,shouldUseBulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
         }
         if (!newShape.HasPhysicalShape)
         {
-- 
cgit v1.1


From 21ec4346884d6cc02f67bbbdafa49f3b5db5426e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 28 Apr 2013 21:44:06 -0700
Subject: BulletSim: first cut at new linksetCompound shape building.

---
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     | 90 +++++++---------------
 1 file changed, 27 insertions(+), 63 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index a20bbc3..be01808 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -93,9 +93,12 @@ public sealed class BSLinksetCompound : BSLinkset
 {
     private static string LogHeader = "[BULLETSIM LINKSET COMPOUND]";
 
+    private BSShape LinksetShape;
+
     public BSLinksetCompound(BSScene scene, BSPrimLinkable parent)
         : base(scene, parent)
     {
+        LinksetShape = new BSShapeNull();
     }
 
     // When physical properties are changed the linkset needs to recalculate
@@ -391,22 +394,21 @@ public sealed class BSLinksetCompound : BSLinkset
     {
         try
         {
-            /*
-            // Suppress rebuilding while rebuilding. (We know rebuilding is on only one thread.)
-            Rebuilding = true;
+            // This replaces the physical shape of the root prim with a compound shape made up of the root
+            // shape and all the children.
+
+            // RootPrim.PhysShape is the shape of the root prim.
+            // Here we build the compound shape made up of all the children.
+
+            // Free up any shape we'd previously built.
+            LinksetShape.Dereference(PhysicsScene);
 
-            // Cause the root shape to be rebuilt as a compound object with just the root in it
-            LinksetRoot.ForceBodyShapeRebuild(true /* inTaintTime );
+            LinksetShape = BSShapeCompound.GetReference(PhysicsScene, LinksetRoot);
 
             // 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
-            {
-                // Compute a center-of-mass in world coordinates.
-                centerOfMassW = ComputeLinksetCenterOfMass();
-            }
+            OMV.Vector3 centerOfMassW = ComputeLinksetCenterOfMass();
 
             OMV.Quaternion invRootOrientation = OMV.Quaternion.Inverse(LinksetRoot.RawOrientation);
 
@@ -414,20 +416,7 @@ public sealed class BSLinksetCompound : BSLinkset
             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;
-
-            // 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.physShapeInfo, 0 /* childIndex ,
-                                                -centerDisplacement,
-                                                OMV.Quaternion.Identity, // LinksetRoot.RawOrientation,
-                                                false /* shouldRecalculateLocalAabb (is done later after linkset built) );
-
-            DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,COM,com={1},rootPos={2},centerDisp={3}",
-                                    LinksetRoot.LocalID, centerOfMassW, LinksetRoot.RawPosition, centerDisplacement);
-
-            DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,start,rBody={1},rShape={2},numChildren={3}",
-                            LinksetRoot.LocalID, LinksetRoot.PhysBody, LinksetRoot.PhysShape, NumberOfChildren);
+            // TODO: add phantom root shape to be the center-of-mass
 
             // Add a shape for each of the other children in the linkset
             int memberIndex = 1;
@@ -440,56 +429,31 @@ public sealed class BSLinksetCompound : BSLinkset
                 else
                 {
                     cPrim.LinksetChildIndex = 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}",
+                BSShape childShape = cPrim.PhysShape;
+                childShape.IncrementReference();
+                OMV.Vector3 offsetPos = (cPrim.RawPosition - LinksetRoot.RawPosition) * invRootOrientation - centerDisplacement;
+                OMV.Quaternion offsetRot = cPrim.RawOrientation * invRootOrientation;
+                PhysicsScene.PE.AddChildShapeToCompoundShape(LinksetShape.physShapeInfo, childShape.physShapeInfo, offsetPos, offsetRot);
+                DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addChild,indx={1},rShape={2},cShape={3},offPos={4},offRot={5}",
                                     LinksetRoot.LocalID, memberIndex, LinksetRoot.PhysShape, cPrim.PhysShape, offsetPos, offsetRot);
 
-                    }
-                    memberIndex++;
-                }
+                memberIndex++;
+
                 return false;   // 'false' says to move onto the next child in the list
             });
 
+            // Sneak the built compound shape in as the shape of the root prim.
+            // Note this doesn't touch the root prim's PhysShape so be sure the manage the difference.
+            PhysicsScene.PE.SetCollisionShape(PhysicsScene.World, LinksetRoot.PhysBody, LinksetShape.physShapeInfo);
+
             // 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);
-            */
         }
         finally
         {
-- 
cgit v1.1


From ad1787770ed02f71feaa002ab689467e187803bb Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 28 Apr 2013 21:50:47 -0700
Subject: BulletSim: rename variable 'PhysicsScene' to be either 'PhysScene' or
 'm_physicsScene' to match coding conventions and reduce confusion.

---
 .../Region/Physics/BulletSPlugin/BSCharacter.cs    | 112 ++++++------
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs |   8 +-
 OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs  |  10 +-
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     |  34 ++--
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  |  16 +-
 .../Region/Physics/BulletSPlugin/BSPhysObject.cs   |  52 +++---
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     | 188 ++++++++++-----------
 .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs |   8 +-
 .../Physics/BulletSPlugin/BSTerrainHeightmap.cs    |  28 +--
 .../Physics/BulletSPlugin/BSTerrainManager.cs      |  56 +++---
 .../Region/Physics/BulletSPlugin/BSTerrainMesh.cs  |  52 +++---
 11 files changed, 282 insertions(+), 282 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index da23a262..e12fc8e 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -95,18 +95,18 @@ public sealed class BSCharacter : BSPhysObject
         //    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(PhysicsScene, this, AvatarMoveActorName);
+        m_moveActor = new BSActorAvatarMove(PhysScene, this, AvatarMoveActorName);
         PhysicalActors.Add(AvatarMoveActorName, m_moveActor);
 
         DetailLog("{0},BSCharacter.create,call,size={1},scale={2},density={3},volume={4},mass={5}",
                             LocalID, _size, Scale, Density, _avatarVolume, RawMass);
 
         // 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);
 
             SetPhysicalProperties();
         });
@@ -119,18 +119,18 @@ public sealed class BSCharacter : BSPhysObject
         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();
-            PhysShape.Dereference(PhysicsScene);
+            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;
@@ -145,35 +145,35 @@ public sealed class BSCharacter : BSPhysObject
         // 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.physShapeInfo, PhysicsScene.Params.collisionMargin);
-        PhysicsScene.PE.SetLocalScaling(PhysShape.physShapeInfo, 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);
+        PhysBody.ApplyCollisionMask(PhysScene);
     }
 
 
@@ -203,14 +203,14 @@ 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.physShapeInfo.HasPhysicalShape)
                 {
-                    PhysicsScene.PE.SetLocalScaling(PhysShape.physShapeInfo, Scale);
+                    PhysScene.PE.SetLocalScaling(PhysShape.physShapeInfo, Scale);
                     UpdatePhysicalMassProperties(RawMass, true);
                     // Make sure this change appears as a property update event
-                    PhysicsScene.PE.PushUpdate(PhysBody);
+                    PhysScene.PE.PushUpdate(PhysBody);
                 }
             });
 
@@ -247,24 +247,24 @@ public sealed class BSCharacter : BSPhysObject
         _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);
             }
         });
     }
@@ -286,7 +286,7 @@ public sealed class BSCharacter : BSPhysObject
         set {
             _position = value;
 
-            PhysicsScene.TaintedObject("BSCharacter.setPosition", delegate()
+            PhysScene.TaintedObject("BSCharacter.setPosition", delegate()
             {
                 DetailLog("{0},BSCharacter.SetPosition,taint,pos={1},orient={2}", LocalID, _position, _orientation);
                 PositionSanityCheck();
@@ -296,14 +296,14 @@ public sealed class BSCharacter : BSPhysObject
     }
     public override OMV.Vector3 ForcePosition {
         get {
-            _position = PhysicsScene.PE.GetPosition(PhysBody);
+            _position = PhysScene.PE.GetPosition(PhysBody);
             return _position;
         }
         set {
             _position = value;
             if (PhysBody.HasPhysicalBody)
             {
-                PhysicsScene.PE.SetTranslation(PhysBody, _position, _orientation);
+                PhysScene.PE.SetTranslation(PhysBody, _position, _orientation);
             }
         }
     }
@@ -317,18 +317,18 @@ 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);
@@ -337,7 +337,7 @@ public sealed class BSCharacter : BSPhysObject
         }
         if ((CurrentCollisionFlags & CollisionFlags.BS_FLOATS_ON_WATER) != 0)
         {
-            float waterHeight = PhysicsScene.TerrainManager.GetWaterLevelAtXYZ(_position);
+            float waterHeight = PhysScene.TerrainManager.GetWaterLevelAtXYZ(_position);
             if (Position.Z < waterHeight)
             {
                 _position.Z = waterHeight;
@@ -358,7 +358,7 @@ 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;
@@ -376,8 +376,8 @@ public sealed class BSCharacter : BSPhysObject
     }
     public override void UpdatePhysicalMassProperties(float physMass, bool inWorld)
     {
-        OMV.Vector3 localInertia = PhysicsScene.PE.CalculateLocalInertia(PhysShape.physShapeInfo, 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 {
@@ -385,11 +385,11 @@ public sealed class BSCharacter : BSPhysObject
         set {
             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, RawForce);
                 if (PhysBody.HasPhysicalBody)
-                    PhysicsScene.PE.SetObjectForce(PhysBody, RawForce);
+                    PhysScene.PE.SetObjectForce(PhysBody, RawForce);
             });
         }
     }
@@ -432,7 +432,7 @@ public sealed class BSCharacter : BSPhysObject
         set {
             RawVelocity = value;
             // m_log.DebugFormat("{0}: set velocity = {1}", LogHeader, RawVelocity);
-            PhysicsScene.TaintedObject("BSCharacter.setVelocity", delegate()
+            PhysScene.TaintedObject("BSCharacter.setVelocity", delegate()
             {
                 if (m_moveActor != null)
                     m_moveActor.SetVelocityAndTarget(RawVelocity, RawVelocity, true /* inTaintTime */);
@@ -445,11 +445,11 @@ public sealed class BSCharacter : BSPhysObject
     public override OMV.Vector3 ForceVelocity {
         get { return RawVelocity; }
         set {
-            PhysicsScene.AssertInTaintTime("BSCharacter.ForceVelocity");
+            PhysScene.AssertInTaintTime("BSCharacter.ForceVelocity");
 
             RawVelocity = value;
-            PhysicsScene.PE.SetLinearVelocity(PhysBody, RawVelocity);
-            PhysicsScene.PE.Activate(PhysBody, true);
+            PhysScene.PE.SetLinearVelocity(PhysBody, RawVelocity);
+            PhysScene.PE.Activate(PhysBody, true);
         }
     }
     public override OMV.Vector3 Torque {
@@ -479,7 +479,7 @@ public sealed class BSCharacter : BSPhysObject
             if (_orientation != value)
             {
                 _orientation = value;
-                PhysicsScene.TaintedObject("BSCharacter.setOrientation", delegate()
+                PhysScene.TaintedObject("BSCharacter.setOrientation", delegate()
                 {
                     ForceOrientation = _orientation;
                 });
@@ -491,7 +491,7 @@ public sealed class BSCharacter : BSPhysObject
     {
         get
         {
-            _orientation = PhysicsScene.PE.GetOrientation(PhysBody);
+            _orientation = PhysScene.PE.GetOrientation(PhysBody);
             return _orientation;
         }
         set
@@ -500,7 +500,7 @@ public sealed class BSCharacter : BSPhysObject
             if (PhysBody.HasPhysicalBody)
             {
                 // _position = PhysicsScene.PE.GetPosition(BSBody);
-                PhysicsScene.PE.SetTranslation(PhysBody, _position, _orientation);
+                PhysScene.PE.SetTranslation(PhysBody, _position, _orientation);
             }
         }
     }
@@ -549,14 +549,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);
                 }
             });
         }
@@ -577,7 +577,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;
@@ -587,7 +587,7 @@ public sealed class BSCharacter : BSPhysObject
     public override float ForceBuoyancy {
         get { return _buoyancy; }
         set { 
-            PhysicsScene.AssertInTaintTime("BSCharacter.ForceBuoyancy");
+            PhysScene.AssertInTaintTime("BSCharacter.ForceBuoyancy");
 
             _buoyancy = value;
             DetailLog("{0},BSCharacter.setForceBuoyancy,taint,buoy={1}", LocalID, _buoyancy);
@@ -595,7 +595,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);
         }
     }
 
@@ -613,7 +613,7 @@ public sealed class BSCharacter : BSPhysObject
     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) {
@@ -622,13 +622,13 @@ public sealed class BSCharacter : BSPhysObject
             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);
                 }
             });
         }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index e2e807e..56d2415 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -789,7 +789,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             if ((m_knownHas & m_knownChangedTerrainHeight) == 0 || pos != lastRememberedHeightPos)
             {
                 lastRememberedHeightPos = pos;
-                m_knownTerrainHeight = ControllingPrim.PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(pos);
+                m_knownTerrainHeight = ControllingPrim.PhysScene.TerrainManager.GetTerrainHeightAtXYZ(pos);
                 m_knownHas |= m_knownChangedTerrainHeight;
             }
             return m_knownTerrainHeight;
@@ -801,7 +801,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         {
             if ((m_knownHas & m_knownChangedWaterLevel) == 0)
             {
-                m_knownWaterLevel = ControllingPrim.PhysicsScene.TerrainManager.GetWaterLevelAtXYZ(pos);
+                m_knownWaterLevel = ControllingPrim.PhysScene.TerrainManager.GetWaterLevelAtXYZ(pos);
                 m_knownHas |= m_knownChangedWaterLevel;
             }
             return (float)m_knownWaterLevel;
@@ -1637,8 +1637,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 (ControllingPrim.PhysicsScene.VehicleLoggingEnabled)
-                ControllingPrim.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 df1dd34..6d0d0eb 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -80,7 +80,7 @@ public abstract class BSLinkset
 
     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; }
@@ -115,7 +115,7 @@ 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>();
         LinksetMass = parent.RawMass;
@@ -158,7 +158,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
@@ -316,8 +316,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 be01808..01ada3f 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -121,7 +121,7 @@ public sealed class BSLinksetCompound : BSLinkset
         //    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();
@@ -147,10 +147,10 @@ public sealed class BSLinksetCompound : BSLinkset
         {
             // 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);
+            m_physicsScene.PE.AddToCollisionFlags(child.PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
+            m_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);
+            m_physicsScene.PE.RemoveFromCollisionFlags(child.PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
 
             child.PhysBody.collisionType = CollisionType.LinksetChild;
 
@@ -175,12 +175,12 @@ public sealed class BSLinksetCompound : BSLinkset
         else
         {
             // The non-physical children can come back to life.
-            PhysicsScene.PE.RemoveFromCollisionFlags(child.PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
+            m_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);
+            m_physicsScene.PE.Activate(child.PhysBody, false);
             ret = true;
         }
         return ret;
@@ -196,7 +196,7 @@ public sealed class BSLinksetCompound : BSLinkset
         //    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.
@@ -209,21 +209,21 @@ public sealed class BSLinksetCompound : BSLinkset
             if ((whichUpdated & ~(UpdatedProperties.Position | UpdatedProperties.Orientation)) == 0)
             {
                 // Find the physical instance of the child 
-                if (LinksetRoot.PhysShape.HasPhysicalShape && PhysicsScene.PE.IsCompound(LinksetRoot.PhysShape.physShapeInfo))
+                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.physShapeInfo);
+                    int numLinksetChildren = m_physicsScene.PE.GetNumberOfCompoundChildren(LinksetRoot.PhysShape.physShapeInfo);
                     if (updated.LinksetChildIndex < numLinksetChildren)
                     {
-                        BulletShape linksetChildShape = PhysicsScene.PE.GetChildShapeFromCompoundShapeIndex(LinksetRoot.PhysShape.physShapeInfo, 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.physShapeInfo, updated.LinksetChildIndex,
+                            m_physicsScene.PE.UpdateChildTransform(LinksetRoot.PhysShape.physShapeInfo, updated.LinksetChildIndex,
                                                                         updated.RawPosition - LinksetRoot.RawPosition,
                                                                         updated.RawOrientation * OMV.Quaternion.Inverse(LinksetRoot.RawOrientation),
                                                                         true /* shouldRecalculateLocalAabb */);
@@ -401,9 +401,9 @@ public sealed class BSLinksetCompound : BSLinkset
             // Here we build the compound shape made up of all the children.
 
             // Free up any shape we'd previously built.
-            LinksetShape.Dereference(PhysicsScene);
+            LinksetShape.Dereference(m_physicsScene);
 
-            LinksetShape = BSShapeCompound.GetReference(PhysicsScene, LinksetRoot);
+            LinksetShape = BSShapeCompound.GetReference(m_physicsScene, LinksetRoot);
 
             // 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.
@@ -435,7 +435,7 @@ public sealed class BSLinksetCompound : BSLinkset
                 childShape.IncrementReference();
                 OMV.Vector3 offsetPos = (cPrim.RawPosition - LinksetRoot.RawPosition) * invRootOrientation - centerDisplacement;
                 OMV.Quaternion offsetRot = cPrim.RawOrientation * invRootOrientation;
-                PhysicsScene.PE.AddChildShapeToCompoundShape(LinksetShape.physShapeInfo, childShape.physShapeInfo, offsetPos, offsetRot);
+                m_physicsScene.PE.AddChildShapeToCompoundShape(LinksetShape.physShapeInfo, childShape.physShapeInfo, offsetPos, offsetRot);
                 DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addChild,indx={1},rShape={2},cShape={3},offPos={4},offRot={5}",
                                     LinksetRoot.LocalID, memberIndex, LinksetRoot.PhysShape, cPrim.PhysShape, offsetPos, offsetRot);
 
@@ -446,14 +446,14 @@ public sealed class BSLinksetCompound : BSLinkset
 
             // Sneak the built compound shape in as the shape of the root prim.
             // Note this doesn't touch the root prim's PhysShape so be sure the manage the difference.
-            PhysicsScene.PE.SetCollisionShape(PhysicsScene.World, LinksetRoot.PhysBody, LinksetShape.physShapeInfo);
+            m_physicsScene.PE.SetCollisionShape(m_physicsScene.World, LinksetRoot.PhysBody, LinksetShape.physShapeInfo);
 
             // 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);
+            m_physicsScene.PE.AddToCollisionFlags(LinksetRoot.PhysBody, CollisionFlags.BS_RETURN_ROOT_COMPOUND_SHAPE);
         }
         finally
         {
@@ -461,7 +461,7 @@ public sealed class BSLinksetCompound : BSLinkset
         }
 
         // See that the Aabb surrounds the new shape
-        PhysicsScene.PE.RecalculateCompoundShapeLocalAabb(LinksetRoot.PhysShape.physShapeInfo);
+        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 1811772..a06a44d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -51,7 +51,7 @@ public sealed class BSLinksetConstraints : BSLinkset
         if (HasAnyChildren && IsRoot(requestor))
         {
             // 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))
                         RecomputeLinksetConstraints();
@@ -142,7 +142,7 @@ 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);
             });
@@ -187,7 +187,7 @@ public sealed class BSLinksetConstraints : BSLinkset
         // http://bulletphysics.org/Bullet/phpBB3/viewtopic.php?t=4818
 
         BSConstraint6Dof constrain = new BSConstraint6Dof(
-                            PhysicsScene.World, rootPrim.PhysBody, childPrim.PhysBody, midPoint, true, true );
+                            m_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.
@@ -216,7 +216,7 @@ public sealed class BSLinksetConstraints : BSLinkset
         // ==================================================================================
         */
 
-        PhysicsScene.Constraints.AddConstraint(constrain);
+        m_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);
@@ -248,10 +248,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 +265,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
@@ -289,7 +289,7 @@ public sealed class BSLinksetConstraints : BSLinkset
             child.UpdatePhysicalMassProperties(linksetMass, true);
 
             BSConstraint constrain;
-            if (!PhysicsScene.Constraints.TryGetConstraint(LinksetRoot.PhysBody, child.PhysBody, out constrain))
+            if (!m_physicsScene.Constraints.TryGetConstraint(LinksetRoot.PhysBody, child.PhysBody, out constrain))
             {
                 // If constraint doesn't exist yet, create it.
                 constrain = BuildConstraint(LinksetRoot, child);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index b6eb619..6a3ada2 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -72,14 +72,14 @@ public abstract class BSPhysObject : PhysicsActor
     }
     protected BSPhysObject(BSScene parentScene, uint localID, string name, string typeName)
     {
-        PhysicsScene = parentScene;
+        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(PhysicsScene);
+        PhysicalActors = new BSActorCollection(PhysScene);
 
         // Initialize variables kept in base.
         GravModifier = 1.0f;
@@ -112,13 +112,13 @@ public abstract class BSPhysObject : PhysicsActor
     public virtual void Destroy()
     {
         PhysicalActors.Enable(false);
-        PhysicsScene.TaintedObject("BSPhysObject.Destroy", delegate()
+        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; }
@@ -270,7 +270,7 @@ public abstract class BSPhysObject : PhysicsActor
     public void ActivateIfPhysical(bool forceIt)
     {
         if (IsPhysical && PhysBody.HasPhysicalBody)
-            PhysicsScene.PE.Activate(PhysBody, forceIt);
+            PhysScene.PE.Activate(PhysBody, forceIt);
     }
 
     // 'actors' act on the physical object to change or constrain its motion. These can range from
@@ -333,29 +333,29 @@ public abstract class BSPhysObject : PhysicsActor
     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;
             }
     }
     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;
         }
     }
     public override bool CollidingObj {
-        get { return (CollidingObjectStep == PhysicsScene.SimulationStep); }
+        get { return (CollidingObjectStep == PhysScene.SimulationStep); }
         set { 
             if (value)
-                CollidingObjectStep = PhysicsScene.SimulationStep;
+                CollidingObjectStep = PhysScene.SimulationStep;
             else
                 CollidingObjectStep = 0;
         }
@@ -380,14 +380,14 @@ public abstract class BSPhysObject : PhysicsActor
         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++;
@@ -397,10 +397,10 @@ public abstract class BSPhysObject : PhysicsActor
 
         // 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 != PhysicsScene.SimulationStep)
+        if (CollisionsLastTickStep != PhysScene.SimulationStep)
         {
             CollisionsLastTick = new CollisionEventUpdate();
-            CollisionsLastTickStep = PhysicsScene.SimulationStep;
+            CollisionsLastTickStep = PhysScene.SimulationStep;
         }
         CollisionsLastTick.AddCollider(collidingWith, new ContactPoint(contactPoint, contactNormal, pentrationDepth));
 
@@ -427,9 +427,9 @@ public abstract class BSPhysObject : PhysicsActor
         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.
@@ -464,10 +464,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
@@ -479,11 +479,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
@@ -497,7 +497,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; }
@@ -524,8 +524,8 @@ public abstract class BSPhysObject : PhysicsActor
     // 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 5d12338..0d45579 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -101,21 +101,21 @@ public class BSPrim : BSPhysObject
         _isVolumeDetect = false;
 
         // We keep a handle to the vehicle actor so we can set vehicle parameters later.
-        VehicleActor = new BSDynamics(PhysicsScene, this, VehicleActorName);
+        VehicleActor = new BSDynamics(PhysScene, this, VehicleActorName);
         PhysicalActors.Add(VehicleActorName, VehicleActor);
 
         _mass = CalculateMass();
 
         // 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);
         });
     }
 
@@ -128,13 +128,13 @@ public class BSPrim : BSPhysObject
         // 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();
-            PhysShape.Dereference(PhysicsScene);
+            PhysShape.Dereference(PhysScene);
             PhysShape = new BSShapeNull();
         });
     }
@@ -163,7 +163,7 @@ public class BSPrim : BSPhysObject
     }
     public override bool ForceBodyShapeRebuild(bool inTaintTime)
     {
-        PhysicsScene.TaintedObject(inTaintTime, "BSPrim.ForceBodyShapeRebuild", delegate()
+        PhysScene.TaintedObject(inTaintTime, "BSPrim.ForceBodyShapeRebuild", delegate()
         {
             _mass = CalculateMass();   // changing the shape changes the mass
             CreateGeomAndObject(true);
@@ -180,7 +180,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);
@@ -226,23 +226,23 @@ public class BSPrim : BSPhysObject
         _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);
             }
         });
     }
@@ -260,11 +260,11 @@ public class BSPrim : BSPhysObject
 
         EnableActor(LockedAxis != LockedAxisFree, LockedAxisActorName, delegate()
         {
-            return new BSActorLockAxis(PhysicsScene, this, LockedAxisActorName);
+            return new BSActorLockAxis(PhysScene, this, LockedAxisActorName);
         });
 
         // Update parameters so the new actor's Refresh() action is called at the right time.
-        PhysicsScene.TaintedObject("BSPrim.LockAngularMotion", delegate()
+        PhysScene.TaintedObject("BSPrim.LockAngularMotion", delegate()
         {
             UpdatePhysicalParameters();
         });
@@ -294,7 +294,7 @@ public class BSPrim : BSPhysObject
             _position = 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;
@@ -304,14 +304,14 @@ public class BSPrim : BSPhysObject
 
     public override OMV.Vector3 ForcePosition {
         get {
-            _position = PhysicsScene.PE.GetPosition(PhysBody);
+            _position = PhysScene.PE.GetPosition(PhysBody);
             return _position;
         }
         set {
             _position = value;
             if (PhysBody.HasPhysicalBody)
             {
-                PhysicsScene.PE.SetTranslation(PhysBody, _position, _orientation);
+                PhysScene.PE.SetTranslation(PhysBody, _position, _orientation);
                 ActivateIfPhysical(false);
             }
         }
@@ -328,7 +328,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
@@ -336,7 +336,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)
@@ -357,7 +357,7 @@ public class BSPrim : BSPhysObject
 
         if ((CurrentCollisionFlags & CollisionFlags.BS_FLOATS_ON_WATER) != 0)
         {
-            float waterHeight = PhysicsScene.TerrainManager.GetWaterLevelAtXYZ(_position);
+            float waterHeight = PhysScene.TerrainManager.GetWaterLevelAtXYZ(_position);
             // TODO: a floating motor so object will bob in the water
             if (Math.Abs(RawPosition.Z - waterHeight) > 0.1f)
             {
@@ -365,7 +365,7 @@ public class BSPrim : BSPhysObject
                 upForce.Z = (waterHeight - RawPosition.Z) * 1f;
 
                 // Apply upforce and overcome gravity.
-                OMV.Vector3 correctionForce = upForce - PhysicsScene.DefaultGravity;
+                OMV.Vector3 correctionForce = upForce - PhysScene.DefaultGravity;
                 DetailLog("{0},BSPrim.PositionSanityCheck,applyForce,pos={1},upForce={2},correctionForce={3}", LocalID, _position, upForce, correctionForce);
                 AddForce(correctionForce, false, inTaintTime);
                 ret = true;
@@ -431,10 +431,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
             {
@@ -443,16 +443,16 @@ 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.physShapeInfo, physMass);
-                PhysicsScene.PE.SetMassProps(PhysBody, physMass, Inertia);
-                PhysicsScene.PE.UpdateInertiaTensor(PhysBody);
+                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);
@@ -468,7 +468,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)
         {
@@ -497,7 +497,7 @@ public class BSPrim : BSPhysObject
             RawForce = value;
             EnableActor(RawForce != OMV.Vector3.Zero, SetForceActorName, delegate()
             {
-                return new BSActorSetForce(PhysicsScene, this, SetForceActorName);
+                return new BSActorSetForce(PhysScene, this, SetForceActorName);
             });
         }
     }
@@ -509,7 +509,7 @@ public class BSPrim : BSPhysObject
         set {
             Vehicle type = (Vehicle)value;
 
-            PhysicsScene.TaintedObject("setVehicleType", delegate()
+            PhysScene.TaintedObject("setVehicleType", delegate()
             {
                 // Vehicle code changes the parameters for this vehicle type.
                 VehicleActor.ProcessTypeChange(type);
@@ -519,7 +519,7 @@ public class BSPrim : BSPhysObject
     }
     public override void VehicleFloatParam(int param, float value)
     {
-        PhysicsScene.TaintedObject("BSPrim.VehicleFloatParam", delegate()
+        PhysScene.TaintedObject("BSPrim.VehicleFloatParam", delegate()
         {
             VehicleActor.ProcessFloatVehicleParam((Vehicle)param, value);
             ActivateIfPhysical(false);
@@ -527,7 +527,7 @@ public class BSPrim : BSPhysObject
     }
     public override void VehicleVectorParam(int param, OMV.Vector3 value)
     {
-        PhysicsScene.TaintedObject("BSPrim.VehicleVectorParam", delegate()
+        PhysScene.TaintedObject("BSPrim.VehicleVectorParam", delegate()
         {
             VehicleActor.ProcessVectorVehicleParam((Vehicle)param, value);
             ActivateIfPhysical(false);
@@ -535,7 +535,7 @@ public class BSPrim : BSPhysObject
     }
     public override void VehicleRotationParam(int param, OMV.Quaternion rotation)
     {
-        PhysicsScene.TaintedObject("BSPrim.VehicleRotationParam", delegate()
+        PhysScene.TaintedObject("BSPrim.VehicleRotationParam", delegate()
         {
             VehicleActor.ProcessRotationVehicleParam((Vehicle)param, rotation);
             ActivateIfPhysical(false);
@@ -543,7 +543,7 @@ public class BSPrim : BSPhysObject
     }
     public override void VehicleFlags(int param, bool remove)
     {
-        PhysicsScene.TaintedObject("BSPrim.VehicleFlags", delegate()
+        PhysScene.TaintedObject("BSPrim.VehicleFlags", delegate()
         {
             VehicleActor.ProcessVehicleFlags(param, remove);
         });
@@ -555,7 +555,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);
@@ -566,7 +566,7 @@ public class BSPrim : BSPhysObject
     public override void SetMaterial(int material)
     {
         base.SetMaterial(material);
-        PhysicsScene.TaintedObject("BSPrim.SetMaterial", delegate()
+        PhysScene.TaintedObject("BSPrim.SetMaterial", delegate()
         {
             UpdatePhysicalParameters();
         });
@@ -579,7 +579,7 @@ public class BSPrim : BSPhysObject
             if (base.Friction != value)
             {
                 base.Friction = value;
-                PhysicsScene.TaintedObject("BSPrim.setFriction", delegate()
+                PhysScene.TaintedObject("BSPrim.setFriction", delegate()
                 {
                     UpdatePhysicalParameters();
                 });
@@ -594,7 +594,7 @@ public class BSPrim : BSPhysObject
             if (base.Restitution != value)
             {
                 base.Restitution = value;
-                PhysicsScene.TaintedObject("BSPrim.setRestitution", delegate()
+                PhysScene.TaintedObject("BSPrim.setRestitution", delegate()
                 {
                     UpdatePhysicalParameters();
                 });
@@ -611,7 +611,7 @@ public class BSPrim : BSPhysObject
             if (base.Density != value)
             {
                 base.Density = value;
-                PhysicsScene.TaintedObject("BSPrim.setDensity", delegate()
+                PhysScene.TaintedObject("BSPrim.setDensity", delegate()
                 {
                     UpdatePhysicalParameters();
                 });
@@ -626,7 +626,7 @@ public class BSPrim : BSPhysObject
             if (base.GravModifier != value)
             {
                 base.GravModifier = value;
-                PhysicsScene.TaintedObject("BSPrim.setGravityModifier", delegate()
+                PhysScene.TaintedObject("BSPrim.setGravityModifier", delegate()
                 {
                     UpdatePhysicalParameters();
                 });
@@ -637,7 +637,7 @@ public class BSPrim : BSPhysObject
         get { return RawVelocity; }
         set {
             RawVelocity = value;
-            PhysicsScene.TaintedObject("BSPrim.setVelocity", delegate()
+            PhysScene.TaintedObject("BSPrim.setVelocity", delegate()
             {
                 // DetailLog("{0},BSPrim.SetVelocity,taint,vel={1}", LocalID, RawVelocity);
                 ForceVelocity = RawVelocity;
@@ -647,13 +647,13 @@ public class BSPrim : BSPhysObject
     public override OMV.Vector3 ForceVelocity {
         get { return RawVelocity; }
         set {
-            PhysicsScene.AssertInTaintTime("BSPrim.ForceVelocity");
+            PhysScene.AssertInTaintTime("BSPrim.ForceVelocity");
 
             RawVelocity = Util.ClampV(value, BSParam.MaxLinearVelocity);
             if (PhysBody.HasPhysicalBody)
             {
                 DetailLog("{0},BSPrim.ForceVelocity,taint,vel={1}", LocalID, RawVelocity);
-                PhysicsScene.PE.SetLinearVelocity(PhysBody, RawVelocity);
+                PhysScene.PE.SetLinearVelocity(PhysBody, RawVelocity);
                 ActivateIfPhysical(false);
             }
         }
@@ -664,7 +664,7 @@ public class BSPrim : BSPhysObject
             RawTorque = value;
             EnableActor(RawTorque != OMV.Vector3.Zero, SetTorqueActorName, delegate()
             {
-                return new BSActorSetTorque(PhysicsScene, this, SetTorqueActorName);
+                return new BSActorSetTorque(PhysScene, this, SetTorqueActorName);
             });
             DetailLog("{0},BSPrim.SetTorque,call,torque={1}", LocalID, RawTorque);
         }
@@ -687,7 +687,7 @@ public class BSPrim : BSPhysObject
                 return;
             _orientation = value;
 
-            PhysicsScene.TaintedObject("BSPrim.setOrientation", delegate()
+            PhysScene.TaintedObject("BSPrim.setOrientation", delegate()
             {
                 ForceOrientation = _orientation;
             });
@@ -698,14 +698,14 @@ public class BSPrim : BSPhysObject
     {
         get
         {
-            _orientation = PhysicsScene.PE.GetOrientation(PhysBody);
+            _orientation = PhysScene.PE.GetOrientation(PhysBody);
             return _orientation;
         }
         set
         {
             _orientation = value;
             if (PhysBody.HasPhysicalBody)
-                PhysicsScene.PE.SetTranslation(PhysBody, _position, _orientation);
+                PhysScene.PE.SetTranslation(PhysBody, _position, _orientation);
         }
     }
     public override int PhysicsActorType {
@@ -718,7 +718,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);
@@ -773,7 +773,7 @@ public class BSPrim : BSPhysObject
 
         // 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);
@@ -790,7 +790,7 @@ 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(),
@@ -807,28 +807,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;
@@ -836,11 +836,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
@@ -858,22 +858,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);
         }
     }
 
@@ -883,7 +883,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.
@@ -891,7 +891,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
         {
@@ -899,7 +899,7 @@ 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;
@@ -911,11 +911,11 @@ public class BSPrim : BSPhysObject
     {
         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);
         }
     }
 
@@ -926,7 +926,7 @@ public class BSPrim : BSPhysObject
     {
         if (PhysBody.HasPhysicalBody)
         {
-            PhysicsScene.PE.AddObjectToWorld(PhysicsScene.World, PhysBody);
+            PhysScene.PE.AddObjectToWorld(PhysScene.World, PhysBody);
         }
         else
         {
@@ -961,12 +961,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);
             });
         }
     }
@@ -978,7 +978,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;
             });
@@ -993,7 +993,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);
             }
@@ -1009,7 +1009,7 @@ public class BSPrim : BSPhysObject
         get { return _buoyancy; }
         set {
             _buoyancy = value;
-            PhysicsScene.TaintedObject("BSPrim.setBuoyancy", delegate()
+            PhysScene.TaintedObject("BSPrim.setBuoyancy", delegate()
             {
                 ForceBuoyancy = _buoyancy;
             });
@@ -1032,7 +1032,7 @@ public class BSPrim : BSPhysObject
             base.MoveToTargetActive = value;
             EnableActor(MoveToTargetActive, MoveToTargetActorName, delegate()
             {
-                return new BSActorMoveToTarget(PhysicsScene, this, MoveToTargetActorName);
+                return new BSActorMoveToTarget(PhysScene, this, MoveToTargetActorName);
             });
         }
     }
@@ -1044,7 +1044,7 @@ public class BSPrim : BSPhysObject
             base.HoverActive = value;
             EnableActor(HoverActive, HoverActorName, delegate()
             {
-                return new BSActorHover(PhysicsScene, this, HoverActorName);
+                return new BSActorHover(PhysScene, this, HoverActorName);
             });
         }
     }
@@ -1054,7 +1054,7 @@ public class BSPrim : BSPhysObject
         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 */);
     }
 
@@ -1069,13 +1069,13 @@ 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
                     DetailLog("{0},BSPrim.addForce,taint,force={1}", LocalID, addForce);
                     if (PhysBody.HasPhysicalBody)
                     {
-                        PhysicsScene.PE.ApplyCentralForce(PhysBody, addForce);
+                        PhysScene.PE.ApplyCentralForce(PhysBody, addForce);
                         ActivateIfPhysical(false);
                     }
                 });
@@ -1097,13 +1097,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);
                     }
                 });
@@ -1122,12 +1122,12 @@ public class BSPrim : BSPhysObject
         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);
                 }
             });
@@ -1146,11 +1146,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);
             }
         });
@@ -1452,7 +1452,7 @@ 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'. 'GetBodyAndShape' makes the right choices and changes of necessary.
-        PhysicsScene.Shapes.GetBodyAndShape(false /*forceRebuild */, PhysicsScene.World, this, delegate(BulletBody pBody, BulletShape pShape)
+        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.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 81104ec..5236909 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -47,9 +47,9 @@ public class BSPrimLinkable : BSPrimDisplaced
                        OMV.Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical)
         : base(localID, primName, parent_scene, pos, size, rotation, pbs, pisPhysical)
     {
-        Linkset = BSLinkset.Factory(PhysicsScene, this);
+        Linkset = BSLinkset.Factory(PhysScene, this);
 
-        PhysicsScene.TaintedObject("BSPrimLinksetCompound.Refresh", delegate()
+        PhysScene.TaintedObject("BSPrimLinksetCompound.Refresh", delegate()
         {
             Linkset.Refresh(this);
         });
@@ -99,7 +99,7 @@ public class BSPrimLinkable : BSPrimDisplaced
         set
         {
             base.Position = value;
-            PhysicsScene.TaintedObject("BSPrimLinkset.setPosition", delegate()
+            PhysScene.TaintedObject("BSPrimLinkset.setPosition", delegate()
             {
                 Linkset.UpdateProperties(UpdatedProperties.Position, this);
             });
@@ -113,7 +113,7 @@ public class BSPrimLinkable : BSPrimDisplaced
         set
         {
             base.Orientation = value;
-            PhysicsScene.TaintedObject("BSPrimLinkset.setOrientation", delegate()
+            PhysScene.TaintedObject("BSPrimLinkset.setOrientation", delegate()
             {
                 Linkset.UpdateProperties(UpdatedProperties.Orientation, this);
             });
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
index e4fecc3..5a19797 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
@@ -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 5240ad8..0d16eda 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)
             {
@@ -219,7 +219,7 @@ public sealed class BSTerrainManager : IDisposable
     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.
-        PhysicsScene.PostTaintObject("TerrainManager.AddMegaRegionChild" + minCoords.ToString(), id, delegate()
+        m_physicsScene.PostTaintObject("TerrainManager.AddMegaRegionChild" + minCoords.ToString(), id, delegate()
         {
             UpdateTerrain(id, heightMap, minCoords, maxCoords);
         });
@@ -318,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}",
+                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;
@@ -429,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);
         }
@@ -451,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;
     }
@@ -564,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..ee2a1f2 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
@@ -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().
-- 
cgit v1.1


From 92ee288d666963aae2a058cc964be009a504f084 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 29 Apr 2013 07:54:50 -0700
Subject: BulletSim: remove trailing white space to make git happier. No
 functional changes.

---
 OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs |   6 +-
 OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs   | 138 ++++++++++-----------
 .../Physics/BulletSPlugin/BSActorAvatarMove.cs     |   2 +-
 .../Physics/BulletSPlugin/BSActorLockAxis.cs       |   2 +-
 OpenSim/Region/Physics/BulletSPlugin/BSActors.cs   |   2 +-
 .../Region/Physics/BulletSPlugin/BSApiTemplate.cs  |   6 +-
 .../Region/Physics/BulletSPlugin/BSCharacter.cs    |   6 +-
 .../Physics/BulletSPlugin/BSConstraintHinge.cs     |   2 +-
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs |  22 ++--
 OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs  |   2 +-
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     |   4 +-
 OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs   |  12 +-
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs    |   6 +-
 .../Region/Physics/BulletSPlugin/BSPhysObject.cs   |   8 +-
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     |   2 +-
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs   |  20 +--
 .../Physics/BulletSPlugin/BSTerrainHeightmap.cs    |   6 +-
 .../Physics/BulletSPlugin/BSTerrainManager.cs      |  10 +-
 .../Region/Physics/BulletSPlugin/BSTerrainMesh.cs  |   6 +-
 .../Region/Physics/BulletSPlugin/BulletSimData.cs  |  42 +++----
 20 files changed, 152 insertions(+), 152 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
index 8a22bc7..231f0f8 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
@@ -75,7 +75,7 @@ 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;
@@ -255,7 +255,7 @@ public override BulletShape CreateHullShape(BulletWorld world, int hullCount, fl
 {
     BulletWorldUnman worldu = world as BulletWorldUnman;
     return new BulletShapeUnman(
-                    BSAPICPP.CreateHullShape2(worldu.ptr, hullCount, hulls), 
+                    BSAPICPP.CreateHullShape2(worldu.ptr, hullCount, hulls),
                     BSPhysicsShapeType.SHAPE_HULL);
 }
 
@@ -1503,7 +1503,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 1ef8b17..59780ae 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
@@ -81,7 +81,7 @@ 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;
@@ -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);
 
@@ -1263,7 +1263,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
             }
         }
         return ret;
-        
+
     }
 
     public override float GetAngularMotionDisc(BulletShape pShape)
@@ -1353,10 +1353,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 +1447,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 +1456,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
         BulletShape retShape = new BulletShapeXNA(shape, BSShapeTypeFromBroadPhaseNativeType(shape.GetShapeType()));
 
 
-        return retShape; 
+        return retShape;
     }
 
     public BSPhysicsShapeType BSShapeTypeFromBroadPhaseNativeType(BroadphaseNativeTypes pin)
@@ -1598,8 +1598,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 +1745,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 +1761,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,7 +1769,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
             compoundshape.AddChildShape(ref childTrans, convexShape);
             ii += (vertexCount*3 + 4);
         }
-        
+
         return new BulletShapeXNA(compoundshape, BSPhysicsShapeType.SHAPE_HULL);
     }
 
@@ -1791,13 +1791,13 @@ private sealed class BulletConstraintXNA : BulletConstraint
     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);
@@ -1811,7 +1811,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);
@@ -1822,7 +1822,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
     }
     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);
@@ -1848,7 +1848,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");
         }
 
@@ -1870,7 +1870,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);
 
@@ -1901,7 +1901,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;
@@ -1943,14 +1943,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)
     {
@@ -1959,24 +1959,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)
         {
@@ -2033,7 +2033,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
 
             collidersCount = LastCollisionDesc;
             colliders = UpdatedCollisions;
-                
+
 
         }
         else
@@ -2041,15 +2041,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;
     }
@@ -2057,7 +2057,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;
@@ -2069,7 +2069,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
         ManifoldPoint pt;
 
         int numPairs = pairs.Count;
-        
+
         for (int i = 0; i < numPairs; i++)
         {
             manifoldArray.Clear();
@@ -2078,7 +2078,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++)
             {
@@ -2101,7 +2101,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)
@@ -2171,11 +2171,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)
                     )
                 {
@@ -2191,9 +2191,9 @@ private sealed class BulletConstraintXNA : BulletConstraint
         return false;
     }
 }
-  
 
-   
+
+
 
     public class SimMotionState : DefaultMotionState
     {
@@ -2286,12 +2286,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)
@@ -2314,7 +2314,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
index ac05979..4e067b5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -115,7 +115,7 @@ public class BSActorAvatarMove : BSActor
         if (m_velocityMotor == null)
         {
             // Infinite decay and timescale values so motor only changes current to target values.
-            m_velocityMotor = new BSVMotor("BSCharacter.Velocity", 
+            m_velocityMotor = new BSVMotor("BSCharacter.Velocity",
                                                 0.2f,                       // time scale
                                                 BSMotor.Infinite,           // decay time scale
                                                 BSMotor.InfiniteVector,     // friction timescale
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
index 6059af5..7801d8e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
@@ -63,7 +63,7 @@ public class BSActorLockAxis : BSActor
     // BSActor.Refresh()
     public override void Refresh()
     {
-        m_physicsScene.DetailLog("{0},BSActorLockAxis,refresh,lockedAxis={1},enabled={2},pActive={3}", 
+        m_physicsScene.DetailLog("{0},BSActorLockAxis,refresh,lockedAxis={1},enabled={2},pActive={3}",
                                     m_controllingPrim.LocalID, m_controllingPrim.LockedAxis, Enabled, m_controllingPrim.IsPhysicallyActive);
         // If all the axis are free, we don't need to exist
         if (m_controllingPrim.LockedAxis == m_controllingPrim.LockedAxisFree)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
index 5e3f1c4..fff63e4 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
@@ -117,7 +117,7 @@ public class BSActorCollection
 /// 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>
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index bfeec24..3378c93 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -298,7 +298,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,
@@ -373,7 +373,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);
 
 // =====================================================================================
@@ -388,7 +388,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 e12fc8e..542f732 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -371,7 +371,7 @@ 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)
@@ -586,7 +586,7 @@ public sealed class BSCharacter : BSPhysObject
     }
     public override float ForceBuoyancy {
         get { return _buoyancy; }
-        set { 
+        set {
             PhysScene.AssertInTaintTime("BSCharacter.ForceBuoyancy");
 
             _buoyancy = value;
@@ -647,7 +647,7 @@ 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 number we pass in for 'scaling' is the multiplier to get that base
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 56d2415..f535e50 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1019,7 +1019,7 @@ 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}", 
+                VDetailLog("{0},  MoveLinear,clampMax,origVelW={1},lenSq={2},maxVelSq={3},,newVelW={4}",
                             ControllingPrim.LocalID, origVelW, newVelocityLengthSq, BSParam.VehicleMaxLinearVelocitySquared, VehicleVelocity);
             }
             else if (newVelocityLengthSq < 0.001f)
@@ -1094,7 +1094,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                     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)
@@ -1188,7 +1188,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.
@@ -1254,7 +1254,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
             VehicleAddForce(appliedGravity);
 
-            VDetailLog("{0},  MoveLinear,applyGravity,vehGrav={1},collid={2},fudge={3},mass={4},appliedForce={3}", 
+            VDetailLog("{0},  MoveLinear,applyGravity,vehGrav={1},collid={2},fudge={3},mass={4},appliedForce={3}",
                             ControllingPrim.LocalID, m_VehicleGravity,
                             ControllingPrim.IsColliding, BSParam.VehicleGroundGravityFudge, m_vehicleMass, appliedGravity);
         }
@@ -1330,7 +1330,7 @@ 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?
@@ -1463,7 +1463,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 VehicleRotationalVelocity += (vertContributionV * VehicleOrientation);
 
                 VDetailLog("{0},  MoveAngular,verticalAttraction,,origRotVW={1},vertError={2},unscaledV={3},eff={4},ts={5},vertContribV={6}",
-                                Prim.LocalID, origRotVelW, verticalError, unscaledContribVerticalErrorV, 
+                                Prim.LocalID, origRotVelW, verticalError, unscaledContribVerticalErrorV,
                                 m_verticalAttractionEfficiency, m_verticalAttractionTimescale, vertContributionV);
                 */
             }
@@ -1530,13 +1530,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
@@ -1548,11 +1548,11 @@ 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)
@@ -1581,7 +1581,7 @@ 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}",
                             ControllingPrim.LocalID, rollComponents, VehicleForwardSpeed, rollComponents, yawAngle, mixedYawAngle, bankingContributionV);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 6d0d0eb..76c2187 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -214,7 +214,7 @@ public abstract class BSLinkset
     // 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);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 01ada3f..1fd541f 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -114,7 +114,7 @@ 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.
@@ -208,7 +208,7 @@ 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 
+                // 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
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
index 9501e2d..0128d8d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
@@ -102,7 +102,7 @@ public class BSVMotor : BSMotor
         return ErrorIsZero(LastError);
     }
     public virtual bool ErrorIsZero(Vector3 err)
-    { 
+    {
         return (err == Vector3.Zero || err.ApproxEquals(Vector3.Zero, ErrorZeroThreshold));
     }
 
@@ -115,7 +115,7 @@ public class BSVMotor : BSMotor
         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, Vector3 frictionTimeScale, float efficiency)
         : this(useName)
     {
         TimeScale = timeScale;
@@ -237,7 +237,7 @@ public class BSVMotor : BSMotor
         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}",
                                 BSScene.DetailLogZero, UseName,
-                                TimeScale, TargetValueDecayTimeScale, FrictionTimescale, Efficiency, 
+                                TimeScale, TargetValueDecayTimeScale, FrictionTimescale, Efficiency,
                                 CurrentValue, TargetValue);
 
         LastError = BSMotor.InfiniteVector;
@@ -248,7 +248,7 @@ public class BSVMotor : BSMotor
                             BSScene.DetailLogZero, UseName, CurrentValue, TargetValue, LastError, lastStep);
         }
         MDetailLog("{0},BSVMotor.Test,{1},===================================== END Test Output", BSScene.DetailLogZero, UseName);
-        
+
 
     }
 
@@ -279,7 +279,7 @@ public class BSFMotor : BSMotor
         return ErrorIsZero(LastError);
     }
     public virtual bool ErrorIsZero(float err)
-    { 
+    {
         return (err >= -ErrorZeroThreshold && err <= ErrorZeroThreshold);
     }
 
@@ -410,7 +410,7 @@ 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 
+    //      to
     public Vector3 FactorMix;
 
     // Arbritrary factor range.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 980d405..5ebeace 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -37,7 +37,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 +51,7 @@ 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:
 
     // Level of Detail values kept as float because that's what the Meshmerizer wants
     public static float MeshLOD { get; private set; }
@@ -636,7 +636,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,
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 6a3ada2..28d4bd7 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -38,7 +38,7 @@ 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
@@ -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.
@@ -353,7 +353,7 @@ public abstract class BSPhysObject : PhysicsActor
     }
     public override bool CollidingObj {
         get { return (CollidingObjectStep == PhysScene.SimulationStep); }
-        set { 
+        set {
             if (value)
                 CollidingObjectStep = PhysScene.SimulationStep;
             else
@@ -447,7 +447,7 @@ public abstract class BSPhysObject : PhysicsActor
 
             // 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();
         }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 0d45579..7e2af78 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -420,7 +420,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.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index bfc7ae7..5c58ad5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -142,7 +142,7 @@ public abstract class BSShape
         // 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.
@@ -155,7 +155,7 @@ public abstract class BSShape
         else
         {
             // If this mesh has an underlying asset and we have not failed getting it before, fetch the asset
-            if (prim.BaseShape.SculptEntry 
+            if (prim.BaseShape.SculptEntry
                 && prim.PrimAssetState != BSPhysObject.PrimAssetCondition.Failed
                 && prim.PrimAssetState != BSPhysObject.PrimAssetCondition.Waiting
                 && prim.BaseShape.SculptTexture != OMV.UUID.Zero
@@ -164,7 +164,7 @@ public abstract class BSShape
                 physicsScene.DetailLog("{0},BSShape.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
                     {
@@ -245,8 +245,8 @@ public class BSShapeNative : BSShape
     {
     }
 
-    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(CreatePhysicalNativeShape(physicsScene, prim, shapeType, shapeKey));
@@ -379,7 +379,7 @@ public class BSShapeMesh : BSShape
     {
         BulletShape newShape = null;
 
-        IMesh meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, 
+        IMesh 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
                                         );
@@ -671,8 +671,8 @@ public class BSShapeCompound : BSShape
     public BSShapeCompound(BulletShape pShape) : base(pShape)
     {
     }
-    public static BSShape GetReference(BSScene physicsScene, BSPhysObject prim) 
-    { 
+    public static BSShape GetReference(BSScene physicsScene, BSPhysObject prim)
+    {
         // Compound shapes are not shared so a new one is created every time.
         return new BSShapeCompound(CreatePhysicalCompoundShape(physicsScene, prim));
     }
@@ -750,8 +750,8 @@ public class BSShapeAvatar : BSShape
     public BSShapeAvatar() : base()
     {
     }
-    public static BSShape GetReference(BSPhysObject prim) 
-    { 
+    public static BSShape GetReference(BSPhysObject prim)
+    {
         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 5a19797..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 = m_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,7 +103,7 @@ 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 = m_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
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
index 0d16eda..c4807c4 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
@@ -135,7 +135,7 @@ public sealed class BSTerrainManager : IDisposable
         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 = m_physicsScene.PE.CreateGroundPlaneShape(BSScene.GROUNDPLANE_ID, 1f, BSParam.TerrainCollisionMargin);
-        m_groundPlane = m_physicsScene.PE.CreateBodyWithDefaultMotionState(groundPlaneShape, 
+        m_groundPlane = m_physicsScene.PE.CreateBodyWithDefaultMotionState(groundPlaneShape,
                                         BSScene.GROUNDPLANE_ID, Vector3.Zero, Quaternion.Identity);
 
         m_physicsScene.PE.AddObjectToWorld(m_physicsScene.World, m_groundPlane);
@@ -318,8 +318,8 @@ 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)
     {
-        m_physicsScene.Logger.DebugFormat("{0} Terrain for {1}/{2} created with {3}", 
-                                            LogHeader, m_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)
@@ -334,8 +334,8 @@ public sealed class BSTerrainManager : IDisposable
                 break;
             default:
                 m_physicsScene.Logger.ErrorFormat("{0} Bad terrain implementation specified. Type={1}/{2},Region={3}/{4}",
-                                            LogHeader, 
-                                            (int)BSParam.TerrainImplementation, 
+                                            LogHeader,
+                                            (int)BSParam.TerrainImplementation,
                                             BSParam.TerrainImplementation,
                                             m_physicsScene.RegionName, terrainRegionBase);
                 break;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
index ee2a1f2..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)
     {
@@ -104,7 +104,7 @@ public sealed class BSTerrainMesh : BSTerrainPhys
             return;
         }
 
-        m_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 = m_physicsScene.PE.CreateMeshShape(m_physicsScene.World, indicesCount, indices, verticesCount, vertices);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
index 906e4f9..d5060e3 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
@@ -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))
     },
-- 
cgit v1.1


From 12054aaa9ff66cc785d2018526ff6f3e94f86915 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 29 Apr 2013 17:14:44 +0100
Subject: Fix bug where an agent that declined an inventory offer and
 subsequently emptied their trash would make the item invalid in the giver's
 inventory

This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy.
---
 .../Avatar/Inventory/Transfer/InventoryTransferModule.cs       | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index bcb7f42..e1ada97 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -213,7 +213,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                         user.ControllingClient.SendBulkUpdateInventory(folderCopy);
 
                     // HACK!!
-                    im.imSessionID = folderID.Guid;
+                    // Insert the ID of the copied item 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;
                 }
                 else
                 {
@@ -243,7 +246,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                         user.ControllingClient.SendBulkUpdateInventory(itemCopy);
 
                     // HACK!!
-                    im.imSessionID = itemID.Guid;
+                    // Insert the ID of the copied item 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;
                 }
 
                 // Send the IM to the recipient. The item is already
-- 
cgit v1.1


From a7cbb9edc98fabc6d2705d69310f4356e84c7596 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 29 Apr 2013 20:50:49 +0100
Subject: Add regression test for offer, accept and subsequent receiver delete
 of an item offered via instant message.

---
 .../Inventory/Transfer/InventoryTransferModule.cs  | 83 +---------------------
 OpenSim/Tests/Common/Mock/TestClient.cs            | 12 ++++
 prebuild.xml                                       |  1 +
 3 files changed, 16 insertions(+), 80 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index e1ada97..c292700 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)
         {
@@ -460,70 +447,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/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index d26e3f7..b7a7463 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -484,6 +484,18 @@ namespace OpenSim.Tests.Common.Mock
             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)
         {
         }
diff --git a/prebuild.xml b/prebuild.xml
index 29d7c90..9fbe08b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -3055,6 +3055,7 @@
         <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="Scripting/VectorRender/Tests" pattern="*.cs" recurse="true"/>
         <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/>
-- 
cgit v1.1


From 0beccf23c0c2e7b2420f4f150d5f2566f0d63370 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 29 Apr 2013 21:11:44 +0100
Subject: Add regression test for inventory item give, reject and subsequent
 trash folder purge by receiver.

This commit also actually adds the InventoryTransferModuleTests file which I previously forgot
---
 .../Transfer/Tests/InventoryTransferModuleTests.cs | 256 +++++++++++++++++++++
 OpenSim/Tests/Common/Mock/TestClient.cs            |   4 +-
 2 files changed, 259 insertions(+), 1 deletion(-)
 create mode 100644 OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs

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..b07d38c
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.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 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);
+        }  
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index b7a7463..41402a4 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -61,6 +61,7 @@ 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 Action<GridInstantMessage> OnReceivedInstantMessage;
 
 // disable warning: public events, part of the public API
 #pragma warning disable 67
@@ -550,7 +551,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)
-- 
cgit v1.1


From 67789201c3ae40bd4697f3479eb183599baa3658 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 29 Apr 2013 22:14:13 +0100
Subject: Add TestRejectGivenFolder() and TestAcceptGivenFolder() regression
 tests

---
 .../Inventory/Transfer/InventoryTransferModule.cs  |  10 +-
 .../Transfer/Tests/InventoryTransferModuleTests.cs | 193 +++++++++++++++++++++
 .../Tests/Common/Helpers/UserInventoryHelpers.cs   |  41 ++++-
 .../Tests/Common/Mock/TestXInventoryDataPlugin.cs  |  28 ++-
 4 files changed, 262 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index c292700..1417a19 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -175,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(receipientID, client.AgentId, folderID, UUID.Zero);
@@ -200,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;
@@ -396,7 +396,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;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
index b07d38c..162a0c3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
@@ -252,5 +252,198 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
 
             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/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/TestXInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
index ccbdf81..30b1f38 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(); }
     }
-- 
cgit v1.1


From 537b243360a69f63210003371d1e6ef9f9c3716c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 29 Apr 2013 22:18:11 +0100
Subject: minor: Eliminate warning in LLimageManagerTests by properly calling
 through to OpenSimTestCase.SetUp()

---
 OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
index 7d9f581..a0e0078 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
@@ -75,6 +75,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         [SetUp]
         public void SetUp()
         {
+            base.SetUp();
+
             UUID userId = TestHelpers.ParseTail(0x3);
 
             J2KDecoderModule j2kdm = new J2KDecoderModule();
-- 
cgit v1.1


From 3ce198165c3533d416148a9f4ffa056bf22c602d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 29 Apr 2013 22:21:57 +0100
Subject: minor: remove some mono compiler warnings in ServicesServerBase

---
 OpenSim/Server/Base/ServicesServerBase.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 7c8e6b7..b13c87d 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -171,11 +171,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);
-- 
cgit v1.1


From 15a3f80e2eb82c5e4726d5cd93cfed32da5d6768 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 29 Apr 2013 17:30:38 -0700
Subject: BulletSim: LinksetCompound work to disable collision for root and
 child prims so compound shape can do all collisions. Don't try to build a
 compound linkset for non-physical linksets. Remove and replace root body when
 compound shape is added so collision cache is rebuilt.

---
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     | 44 +++++++++++++++-------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 1fd541f..e967dfc 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -143,19 +143,18 @@ 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.
-            m_physicsScene.PE.AddToCollisionFlags(child.PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
-            m_physicsScene.PE.ForceActivationState(child.PhysBody, ActivationState.DISABLE_SIMULATION);
-            // We don't want collisions from the old linkset children.
-            m_physicsScene.PE.RemoveFromCollisionFlags(child.PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
 
-            child.PhysBody.collisionType = CollisionType.LinksetChild;
+        // The origional prims are removed from the world as the shape of the root compound
+        //     shape takes over.
+        m_physicsScene.PE.AddToCollisionFlags(child.PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
+        m_physicsScene.PE.ForceActivationState(child.PhysBody, ActivationState.DISABLE_SIMULATION);
+        // We don't want collisions from the old linkset children.
+        m_physicsScene.PE.RemoveFromCollisionFlags(child.PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
+
+        child.PhysBody.collisionType = CollisionType.LinksetChild;
+
+        ret = true;
 
-            ret = true;
-        }
         return ret;
     }
 
@@ -190,6 +189,13 @@ 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
@@ -392,6 +398,13 @@ public sealed class BSLinksetCompound : BSLinkset
     private bool disableCOM = true;     // DEBUG DEBUG: disable until we get this debugged
     private void RecomputeLinksetCompound()
     {
+        if (!LinksetRoot.IsPhysicallyActive)
+        {
+            // There is no reason to build all this physical stuff for a non-physical linkset
+            DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,notPhysical", LinksetRoot.LocalID);
+            return;
+        }
+
         try
         {
             // This replaces the physical shape of the root prim with a compound shape made up of the root
@@ -403,7 +416,8 @@ public sealed class BSLinksetCompound : BSLinkset
             // Free up any shape we'd previously built.
             LinksetShape.Dereference(m_physicsScene);
 
-            LinksetShape = BSShapeCompound.GetReference(m_physicsScene, LinksetRoot);
+            // Get a new compound shape to build the linkset shape in.
+            LinksetShape = BSShapeCompound.GetReference(m_physicsScene);
 
             // 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.
@@ -431,8 +445,7 @@ public sealed class BSLinksetCompound : BSLinkset
                     cPrim.LinksetChildIndex = memberIndex;
                 }
 
-                BSShape childShape = cPrim.PhysShape;
-                childShape.IncrementReference();
+                BSShape childShape = cPrim.PhysShape.GetReference(m_physicsScene, cPrim);
                 OMV.Vector3 offsetPos = (cPrim.RawPosition - LinksetRoot.RawPosition) * invRootOrientation - centerDisplacement;
                 OMV.Quaternion offsetRot = cPrim.RawOrientation * invRootOrientation;
                 m_physicsScene.PE.AddChildShapeToCompoundShape(LinksetShape.physShapeInfo, childShape.physShapeInfo, offsetPos, offsetRot);
@@ -446,7 +459,10 @@ public sealed class BSLinksetCompound : BSLinkset
 
             // Sneak the built compound shape in as the shape of the root prim.
             // Note this doesn't touch the root prim's PhysShape so be sure the manage the difference.
+            // Object removed and added to world to get collision cache rebuilt for new shape.
+            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);
 
             // With all of the linkset packed into the root prim, it has the mass of everyone.
             LinksetMass = ComputeLinksetMass();
-- 
cgit v1.1


From d322625f9062d7748a1a896b6fd37c51f7f41435 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 29 Apr 2013 17:30:54 -0700
Subject: BulletSim: Add non-static BSShape.GetReference for getting another
 reference to an existing shape instance. BSShapeNative rebuilds shape for all
 references. BSShapeCompound returns another reference copy if the compound
 shape already exists (for linksets).

---
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs   | 125 +++++++++++++++------
 .../Region/Physics/BulletSPlugin/BulletSimTODO.txt |   9 ++
 2 files changed, 102 insertions(+), 32 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 5c58ad5..f0c9fd5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -47,26 +47,31 @@ public abstract class BSShape
 
     public BSShape()
     {
-        referenceCount = 0;
+        referenceCount = 1;
         lastReferenced = DateTime.Now;
         physShapeInfo = new BulletShape();
     }
     public BSShape(BulletShape pShape)
     {
-        referenceCount = 0;
+        referenceCount = 1;
         lastReferenced = DateTime.Now;
         physShapeInfo = pShape;
     }
 
+    // Get another reference to this shape.
+    public abstract BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim);
+
     // Called when this shape is being used again.
-    public virtual void IncrementReference()
+    // Used internally. External callers should call instance.GetReference() to properly copy/reference
+    //       the shape.
+    protected virtual void IncrementReference()
     {
         referenceCount++;
         lastReferenced = DateTime.Now;
     }
 
     // Called when this shape is being used again.
-    public virtual void DecrementReference()
+    protected virtual void DecrementReference()
     {
         referenceCount--;
         lastReferenced = DateTime.Now;
@@ -99,12 +104,19 @@ public abstract class BSShape
     // 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("<t=");
+        buff.Append(ShapeType.ToString());
         buff.Append("<p=");
         buff.Append(AddrString);
         buff.Append(",c=");
@@ -113,6 +125,7 @@ public abstract class BSShape
         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)
     {
@@ -225,6 +238,7 @@ public abstract class BSShape
         return fillShape.physShapeInfo;
      }
 
+    #endregion // Common shape routines
 }
 
 // ============================================================================================================
@@ -234,6 +248,7 @@ public class BSShapeNull : BSShape
     {
     }
     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 */ }
 }
 
@@ -252,17 +267,27 @@ public class BSShapeNative : BSShape
         return new BSShapeNative(CreatePhysicalNativeShape(physicsScene, prim, shapeType, shapeKey));
     }
 
+    public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim)
+    {
+        // Native shapes are not shared so we return a new shape.
+        return new BSShapeNative(CreatePhysicalNativeShape(pPhysicsScene, pPrim,
+                                    physShapeInfo.shapeType, (FixedShapeKey)physShapeInfo.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
-        if (physShapeInfo.HasPhysicalShape)
+        lock (physShapeInfo)
         {
-            physicsScene.DetailLog("{0},BSShapeNative.DereferenceShape,deleteNativeShape,shape={1}", BSScene.DetailLogZero, this);
-            physicsScene.PE.DeleteCollisionShape(physicsScene.World, physShapeInfo);
+            if (physShapeInfo.HasPhysicalShape)
+            {
+                physicsScene.DetailLog("{0},BSShapeNative.DereferenceShape,deleteNativeShape,shape={1}", BSScene.DetailLogZero, this);
+                physicsScene.PE.DeleteCollisionShape(physicsScene.World, physShapeInfo);
+            }
+            physShapeInfo.Clear();
+            // Garbage collection will free up this instance.
         }
-        physShapeInfo.Clear();
-        // Garbage collection will free up this instance.
     }
 
     private static BulletShape CreatePhysicalNativeShape(BSScene physicsScene, BSPhysObject prim,
@@ -345,6 +370,12 @@ public class BSShapeMesh : BSShape
         }
         return retMesh;
     }
+    public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim)
+    {
+        // Another reference to this shape is just counted.
+        IncrementReference();
+        return this;
+    }
     public override void Dereference(BSScene physicsScene)
     {
         lock (Meshes)
@@ -487,8 +518,19 @@ public class BSShapeHull : BSShape
         }
         return retHull;
     }
+    public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim)
+    {
+        // Another reference to this shape is just counted.
+        IncrementReference();
+        return this;
+    }
     public override void Dereference(BSScene physicsScene)
     {
+        lock (Hulls)
+        {
+            this.DecrementReference();
+            // TODO: schedule aging and destruction of unused meshes.
+        }
     }
     List<ConvexResult> m_hulls;
     private BulletShape CreatePhysicalHull(BSScene physicsScene, BSPhysObject prim, System.UInt64 newHullKey,
@@ -520,7 +562,7 @@ public class BSShapeHull : BSShape
                 physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,hullFromMesh,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
             }
             // Now done with the mesh shape.
-            meshShape.DecrementReference();
+            meshShape.Dereference(physicsScene);
             physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,shouldUseBulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
         }
         if (!newShape.HasPhysicalShape)
@@ -671,37 +713,52 @@ public class BSShapeCompound : BSShape
     public BSShapeCompound(BulletShape pShape) : base(pShape)
     {
     }
-    public static BSShape GetReference(BSScene physicsScene, BSPhysObject prim)
+    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)
     {
-        // Compound shapes are not shared so a new one is created every time.
-        return new BSShapeCompound(CreatePhysicalCompoundShape(physicsScene, 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)
     {
-        if (!physicsScene.PE.IsCompound(physShapeInfo))
+        lock (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;
-        }
+            Dereference(physicsScene);
+            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);
+                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);
+                // 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);
+            }
         }
-        physicsScene.PE.DeleteCollisionShape(physicsScene.World, physShapeInfo);
     }
-    private static BulletShape CreatePhysicalCompoundShape(BSScene physicsScene, BSPhysObject prim)
+    private static BulletShape CreatePhysicalCompoundShape(BSScene physicsScene)
     {
         BulletShape cShape = physicsScene.PE.CreateCompoundShape(physicsScene.World, false);
         return cShape;
@@ -754,6 +811,10 @@ public class BSShapeAvatar : BSShape
     {
         return new BSShapeNull();
     }
+    public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim)
+    {
+        return new BSShapeNull();
+    }
     public override void Dereference(BSScene physicsScene) { }
 
     // From the front:
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
index c67081a..559a73f 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
@@ -1,3 +1,12 @@
+PROBLEMS TO LOOK INTO
+=================================================
+Nebadon 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.
+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
+Two of Nebadon vehicles in a sim max the CPU. This is new.
+A sitting, active vehicle bobs up and down a small amount.
+
 CURRENT PRIORITIES
 =================================================
 Use the HACD convex hull routine in Bullet rather than the C# version.	
-- 
cgit v1.1


From 7cdb07b386ffe88749fcc6cabadd9851f254699d Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 30 Apr 2013 11:42:11 -0700
Subject: BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all
 working yet.

---
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     | 37 ++++++++++++++++------
 .../Region/Physics/BulletSPlugin/BSPhysObject.cs   |  3 +-
 .../Physics/BulletSPlugin/BSPrimDisplaced.cs       | 22 ++++++++++---
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs   |  2 +-
 .../Region/Physics/BulletSPlugin/BulletSimTODO.txt |  3 ++
 5 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index e967dfc..e3ce7fb 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -395,7 +395,8 @@ 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;
+    private bool disableCOM = true; // For basic linkset debugging, turn off the center-of-mass setting
     private void RecomputeLinksetCompound()
     {
         if (!LinksetRoot.IsPhysicallyActive)
@@ -428,11 +429,19 @@ public sealed class BSLinksetCompound : BSLinkset
 
             // 'centerDisplacement' is the value to subtract from children to give physical offset position
             OMV.Vector3 centerDisplacement = (centerOfMassW - LinksetRoot.RawPosition) * invRootOrientation;
-            LinksetRoot.SetEffectiveCenterOfMassW(centerDisplacement);
-
-            // TODO: add phantom root shape to be the center-of-mass
+            if (UseBulletSimRootOffsetHack || disableCOM)
+            {
+                centerDisplacement = OMV.Vector3.Zero;
+                LinksetRoot.ClearDisplacement();
+            }
+            else
+            {
+                LinksetRoot.SetEffectiveCenterOfMassDisplacement(centerDisplacement);
+            }
+            DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,COM,rootPos={1},com={2},comDisp={3}",
+                                LinksetRoot.LocalID, LinksetRoot.RawPosition, centerOfMassW, centerDisplacement);
 
-            // 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)
             {
@@ -449,8 +458,8 @@ public sealed class BSLinksetCompound : BSLinkset
                 OMV.Vector3 offsetPos = (cPrim.RawPosition - LinksetRoot.RawPosition) * invRootOrientation - centerDisplacement;
                 OMV.Quaternion offsetRot = cPrim.RawOrientation * invRootOrientation;
                 m_physicsScene.PE.AddChildShapeToCompoundShape(LinksetShape.physShapeInfo, childShape.physShapeInfo, offsetPos, offsetRot);
-                DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addChild,indx={1},rShape={2},cShape={3},offPos={4},offRot={5}",
-                                    LinksetRoot.LocalID, memberIndex, LinksetRoot.PhysShape, cPrim.PhysShape, offsetPos, offsetRot);
+                DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addChild,indx={1}cShape={2},offPos={3},offRot={4}",
+                                    LinksetRoot.LocalID, memberIndex, cPrim.PhysShape, offsetPos, offsetRot);
 
                 memberIndex++;
 
@@ -463,13 +472,21 @@ public sealed class BSLinksetCompound : BSLinkset
             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
-            m_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 eleviates the need to offset the returned physical position by the
+                //     center-of-mass offset.
+                m_physicsScene.PE.AddToCollisionFlags(LinksetRoot.PhysBody, CollisionFlags.BS_RETURN_ROOT_COMPOUND_SHAPE);
+            }
         }
         finally
         {
@@ -477,7 +494,7 @@ public sealed class BSLinksetCompound : BSLinkset
         }
 
         // See that the Aabb surrounds the new shape
-        m_physicsScene.PE.RecalculateCompoundShapeLocalAabb(LinksetRoot.PhysShape.physShapeInfo);
+        m_physicsScene.PE.RecalculateCompoundShapeLocalAabb(LinksetShape.physShapeInfo);
     }
 }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 28d4bd7..7eba851 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -259,7 +259,8 @@ 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 LockedAxis { get; set; } // zero means locked. one means free.
     public readonly OMV.Vector3 LockedAxisFree = new OMV.Vector3(1f, 1f, 1f);  // All axis are free
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
index f1c3b5c..f5ee671 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
@@ -78,14 +78,16 @@ public class BSPrimDisplaced : BSPrim
     // 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)
+    public virtual void SetEffectiveCenterOfMassDisplacement(Vector3 centerOfMassDisplacement)
     {
         Vector3 comDisp;
-        if (UserSetCenterOfMass.HasValue)
-            comDisp = (OMV.Vector3)UserSetCenterOfMass;
+        if (UserSetCenterOfMassDisplacement.HasValue)
+            comDisp = (OMV.Vector3)UserSetCenterOfMassDisplacement;
         else
             comDisp = centerOfMassDisplacement;
 
+        DetailLog("{0},BSPrimDisplaced.SetEffectiveCenterOfMassDisplacement,userSet={1},comDisp={2}",
+                                    LocalID, UserSetCenterOfMassDisplacement.HasValue, comDisp);
         if (comDisp == Vector3.Zero)
         {
             // If there is no diplacement. Things get reset.
@@ -107,9 +109,15 @@ public class BSPrimDisplaced : BSPrim
         set
         {
             if (PositionDisplacement != OMV.Vector3.Zero)
-                base.ForcePosition = value - (PositionDisplacement * RawOrientation);
+            {
+                OMV.Vector3 displacedPos = value - (PositionDisplacement * RawOrientation);
+                DetailLog("{0},BSPrimDisplaced.ForcePosition,val={1},disp={2},newPos={3}", LocalID, value, PositionDisplacement, displacedPos);
+                base.ForcePosition = displacedPos;
+            }
             else
+            {
                 base.ForcePosition = value;
+            }
         }
     }
 
@@ -118,6 +126,7 @@ public class BSPrimDisplaced : BSPrim
         get { return base.ForceOrientation; }
         set
         {
+            // TODO:
             base.ForceOrientation = value;
         }
     }
@@ -143,7 +152,10 @@ public class BSPrimDisplaced : BSPrim
         {
             // Correct for any rotation around the center-of-mass
             // TODO!!!
-            entprop.Position = entprop.Position + (PositionDisplacement * entprop.Rotation);
+            
+            OMV.Vector3 displacedPos = entprop.Position + (PositionDisplacement * entprop.Rotation);
+            DetailLog("{0},BSPrimDisplaced.ForcePosition,physPos={1},disp={2},newPos={3}", LocalID, entprop.Position, PositionDisplacement, displacedPos);
+            entprop.Position = displacedPos;
             // entprop.Rotation = something;
         }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index f0c9fd5..3faa484 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -117,7 +117,7 @@ public abstract class BSShape
         StringBuilder buff = new StringBuilder();
         buff.Append("<t=");
         buff.Append(ShapeType.ToString());
-        buff.Append("<p=");
+        buff.Append(",p=");
         buff.Append(AddrString);
         buff.Append(",c=");
         buff.Append(referenceCount.ToString());
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
index 559a73f..5792ae6 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
@@ -52,6 +52,9 @@ One sided meshes? Should terrain be built into a closed shape?
 
 VEHICLES TODO LIST:
 =================================================
+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
 Border crossing with linked vehicle causes crash
-- 
cgit v1.1


From 46ae84cfba4b3256119422dd5dfba84da5d07165 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 30 Apr 2013 13:10:15 -0700
Subject: BulletSim: fix error messages created while an avatar has no initial
 collisions. Usually happens when logging in an avatar that had been
 previously flying. Uninitialized variable.

---
 OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 309d004..f047176 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -97,6 +97,9 @@ public abstract class BSPhysObject : PhysicsActor
 
         CollisionCollection = new CollisionEventUpdate();
         CollisionsLastReported = CollisionCollection;
+        CollisionsLastTick = new CollisionEventUpdate();
+        CollisionsLastTickStep = -1;
+
         SubscribedEventsMs = 0;
         CollidingStep = 0;
         CollidingGroundStep = 0;
-- 
cgit v1.1


From ac135c649c55fefc73e2f5f654a5ff65f45d50c0 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 30 Apr 2013 23:35:59 +0200
Subject: Fix CAPS to work like they should - do not send caps to the viewer if
 they're not in the requested caps list. The previous wrong behavior caused
 the debug setting "UseHTTPInventory" to fail on all viewers when turned off.
 UDB inventory would not be correctly used in that case.

---
 OpenSim/Capabilities/CapsHandlers.cs                        |  7 +++++--
 .../ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs      | 13 ++++++++++++-
 .../Region/CoreModules/Framework/Caps/CapabilitiesModule.cs |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Capabilities/CapsHandlers.cs b/OpenSim/Capabilities/CapsHandlers.cs
index 1709f46..458272d 100644
--- a/OpenSim/Capabilities/CapsHandlers.cs
+++ b/OpenSim/Capabilities/CapsHandlers.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Framework.Capabilities
         /// capabilities and their handler details.
         /// </summary>
         /// <param name="excludeSeed">If true, then exclude the seed cap.</param>
-        public Hashtable GetCapsDetails(bool excludeSeed)
+        public Hashtable GetCapsDetails(bool excludeSeed, List<string> requestedCaps)
         {
             Hashtable caps = new Hashtable();
             string protocol = "http://";
@@ -175,6 +175,9 @@ namespace OpenSim.Framework.Capabilities
                     if (excludeSeed && "SEED" == capsName)
                         continue;
 
+                    if (requestedCaps != null && !requestedCaps.Contains(capsName))
+                        continue;
+
                     caps[capsName] = baseUrl + m_capsHandlers[capsName].Path;
                 }
             }
@@ -182,4 +185,4 @@ namespace OpenSim.Framework.Capabilities
             return caps;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 8752404..a46c24a 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -273,11 +273,22 @@ namespace OpenSim.Region.ClientStack.Linden
                 return string.Empty;
             }
 
-            Hashtable caps = m_HostCapsObj.CapsHandlers.GetCapsDetails(true);
+            OSDArray capsRequested = (OSDArray)OSDParser.DeserializeLLSDXml(request);
+            List<string> validCaps = new List<string>();
+
+            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);
 
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index 8329af0..6ae9448 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -240,7 +240,7 @@ namespace OpenSim.Region.CoreModules.Framework
             {
                 caps.AppendFormat("** User {0}:\n", kvp.Key);
 
-                for (IDictionaryEnumerator kvp2 = kvp.Value.CapsHandlers.GetCapsDetails(false).GetEnumerator(); kvp2.MoveNext(); )
+                for (IDictionaryEnumerator kvp2 = kvp.Value.CapsHandlers.GetCapsDetails(false, null).GetEnumerator(); kvp2.MoveNext(); )
                 {
                     Uri uri = new Uri(kvp2.Value.ToString());
                     caps.AppendFormat(m_showCapsCommandFormat, kvp2.Key, uri.PathAndQuery);
-- 
cgit v1.1


From 206fb306a7820cf593570e35ddfa8e7c5a10e449 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 1 May 2013 19:01:43 +0100
Subject: Update SmartThreadPool to latest version 2.2.3 with a major and minor
 change.

SmartThreadPool code comes from http://www.codeproject.com/Articles/7933/Smart-Thread-Pool
This version implements thread abort (via WorkItem.Cancel(true)), threadpool naming, max thread stack, etc. so we no longer need to manually patch those.
However, two changes have been made to stock 2.2.3.
Major change: WorkItem.Cancel(bool abortExecution) in our version does not succeed if the work item was in progress and thread abort was not specified.
This is to match previous behaviour where we handle co-operative termination via another mechanism rather than checking WorkItem.IsCanceled.
Minor change: Did not add STP's StopWatch implementation as this is only used WinCE and Silverlight and causes a build clash with System.Diagnostics.StopWatch
The reason for updating is to see if this improves http://opensimulator.org/mantis/view.php?id=6557 and http://opensimulator.org/mantis/view.php?id=6586
---
 OpenSim/Framework/Util.cs                          |   20 +-
 .../ScriptEngine/Interfaces/IScriptInstance.cs     |    2 +-
 .../ScriptEngine/Shared/Instance/ScriptInstance.cs |    9 +-
 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs     |    4 +-
 OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs   |    6 +-
 ThirdParty/SmartThreadPool/AssemblyInfo.cs         |   61 -
 ThirdParty/SmartThreadPool/CallerThreadContext.cs  |  361 +--
 .../SmartThreadPool/CanceledWorkItemsGroup.cs      |   14 +
 ThirdParty/SmartThreadPool/EventWaitHandle.cs      |  104 +
 .../SmartThreadPool/EventWaitHandleFactory.cs      |   82 +
 ThirdParty/SmartThreadPool/Exceptions.cs           |  192 +-
 ThirdParty/SmartThreadPool/Interfaces.cs           |  899 ++++--
 ThirdParty/SmartThreadPool/InternalInterfaces.cs   |   27 +
 ThirdParty/SmartThreadPool/PriorityQueue.cs        |  479 ++-
 .../SmartThreadPool/Properties/AssemblyInfo.cs     |   23 +
 ThirdParty/SmartThreadPool/SLExt.cs                |   16 +
 ThirdParty/SmartThreadPool/STPEventWaitHandle.cs   |   62 +
 .../SmartThreadPool/STPPerformanceCounter.cs       |  802 ++---
 ThirdParty/SmartThreadPool/STPStartInfo.cs         |  325 +-
 .../SmartThreadPool/SmartThreadPool.ThreadEntry.cs |   60 +
 ThirdParty/SmartThreadPool/SmartThreadPool.cs      | 3180 +++++++++++---------
 .../SmartThreadPool/SynchronizedDictionary.cs      |   89 +
 ThirdParty/SmartThreadPool/WIGStartInfo.cs         |  270 +-
 .../SmartThreadPool/WorkItem.WorkItemResult.cs     |  190 ++
 ThirdParty/SmartThreadPool/WorkItem.cs             |  649 ++--
 ThirdParty/SmartThreadPool/WorkItemFactory.cs      |  676 +++--
 ThirdParty/SmartThreadPool/WorkItemInfo.cs         |  171 +-
 .../SmartThreadPool/WorkItemResultTWrapper.cs      |  128 +
 ThirdParty/SmartThreadPool/WorkItemsGroup.cs       |  873 +++---
 ThirdParty/SmartThreadPool/WorkItemsGroupBase.cs   |  471 +++
 ThirdParty/SmartThreadPool/WorkItemsQueue.cs       | 1245 ++++----
 31 files changed, 6688 insertions(+), 4802 deletions(-)
 delete mode 100644 ThirdParty/SmartThreadPool/AssemblyInfo.cs
 create mode 100644 ThirdParty/SmartThreadPool/CanceledWorkItemsGroup.cs
 create mode 100644 ThirdParty/SmartThreadPool/EventWaitHandle.cs
 create mode 100644 ThirdParty/SmartThreadPool/EventWaitHandleFactory.cs
 create mode 100644 ThirdParty/SmartThreadPool/InternalInterfaces.cs
 create mode 100644 ThirdParty/SmartThreadPool/Properties/AssemblyInfo.cs
 create mode 100644 ThirdParty/SmartThreadPool/SLExt.cs
 create mode 100644 ThirdParty/SmartThreadPool/STPEventWaitHandle.cs
 create mode 100644 ThirdParty/SmartThreadPool/SmartThreadPool.ThreadEntry.cs
 create mode 100644 ThirdParty/SmartThreadPool/SynchronizedDictionary.cs
 create mode 100644 ThirdParty/SmartThreadPool/WorkItem.WorkItemResult.cs
 create mode 100644 ThirdParty/SmartThreadPool/WorkItemResultTWrapper.cs
 create mode 100644 ThirdParty/SmartThreadPool/WorkItemsGroupBase.cs

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index bde4673..a3602e9 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1840,7 +1840,7 @@ namespace OpenSim.Framework
                 case FireAndForgetMethod.SmartThreadPool:
                     if (m_ThreadPool == null)
                         InitThreadPool(15); 
-                    m_ThreadPool.QueueWorkItem(SmartThreadPoolCallback, new object[] { realCallback, obj });
+                    m_ThreadPool.QueueWorkItem((cb, o) => cb(o), realCallback, obj);
                     break;
                 case FireAndForgetMethod.Thread:
                     Thread thread = new Thread(delegate(object o) { realCallback(o); });
@@ -1910,15 +1910,15 @@ namespace OpenSim.Framework
             return sb.ToString();
         }
 
-        private static object SmartThreadPoolCallback(object o)
-        {
-            object[] array = (object[])o;
-            WaitCallback callback = (WaitCallback)array[0];
-            object obj = array[1];
-
-            callback(obj);
-            return null;
-        }
+//        private static object SmartThreadPoolCallback(object o)
+//        {
+//            object[] array = (object[])o;
+//            WaitCallback callback = (WaitCallback)array[0];
+//            object obj = array[1];
+//
+//            callback(obj);
+//            return null;
+//        }
 
         #endregion FireAndForget Threading Pattern
 
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/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 1e6db43..f9d3afc 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -564,9 +564,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;
 
@@ -627,6 +628,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 }
             }
 
+            Console.WriteLine("Here9");
+
             lock (EventQueue)
             {
                 workItem = m_CurrentWorkItem;
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 0d9babb..5804aa8 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -483,7 +483,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;
@@ -1517,7 +1517,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/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..2177241 100644
--- a/ThirdParty/SmartThreadPool/CallerThreadContext.cs
+++ b/ThirdParty/SmartThreadPool/CallerThreadContext.cs
@@ -1,223 +1,138 @@
-using System;
-using System.Diagnostics;
-using System.Threading;
-using System.Reflection;
-using System.Web;
-using System.Runtime.Remoting.Messaging;
-
-
-namespace Amib.Threading
-{
-    #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);
-
-        private static string HttpContextSlotName = GetHttpContextSlotName();
-
-        private static string GetHttpContextSlotName()
-        {
-            FieldInfo fi = typeof(HttpContext).GetField("CallContextSlotName", BindingFlags.Static | BindingFlags.NonPublic);
-
-            if( fi != null )
-                return (string)fi.GetValue(null);
-            else // Use the default "HttpContext" slot name
-                return "HttpContext";
-        }
-
-        #endregion
-
-        #region Private fields
-
-        private HttpContext _httpContext = null;
-        private LogicalCallContext _callContext = null;
-
-        #endregion
-
-        /// <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)
-            {
-                CallContext.SetData(HttpContextSlotName, callerThreadContext._httpContext);
-            }
-        }
-    }
-
-    #endregion
-
-}
-
-
-/*
-// Ami Bar
-// amibar@gmail.com
-
-using System;
-using System.Threading;
-using System.Globalization;
-using System.Security.Principal;
-using System.Reflection;
-using System.Runtime.Remoting.Contexts;
-
-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);
-            }
-* /            
-        }
-    }
-
-    #endregion
-}
-*/
-
+
+#if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Reflection;
+using System.Web;
+using System.Runtime.Remoting.Messaging;
+
+
+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 readonly MethodInfo getLogicalCallContextMethodInfo =
+			typeof(Thread).GetMethod("GetLogicalCallContext", BindingFlags.Instance | BindingFlags.NonPublic);
+
+		private static readonly MethodInfo setLogicalCallContextMethodInfo =
+			typeof(Thread).GetMethod("SetLogicalCallContext", BindingFlags.Instance | BindingFlags.NonPublic);
+
+		private static string HttpContextSlotName = GetHttpContextSlotName();
+
+		private static string GetHttpContextSlotName()
+		{
+			FieldInfo fi = typeof(HttpContext).GetField("CallContextSlotName", BindingFlags.Static | BindingFlags.NonPublic);
+
+            if (fi != null)
+            {
+                return (string) fi.GetValue(null);
+            }
+
+		    return "HttpContext";
+		}
+
+        #endregion
+
+#region Private fields
+
+		private HttpContext _httpContext;
+		private LogicalCallContext _callContext;
+
+        #endregion
+
+		/// <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..4a2a3e7
--- /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..70a1a29
--- /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..2f8c55b
--- /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..8e66ce9 100644
--- a/ThirdParty/SmartThreadPool/Exceptions.cs
+++ b/ThirdParty/SmartThreadPool/Exceptions.cs
@@ -1,81 +1,111 @@
-// Ami Bar
-// amibar@gmail.com
-
-using System;
-using System.Runtime.Serialization;
-
-namespace Amib.Threading
-{
-    #region Exceptions
-
-    /// <summary>
-    /// Represents an exception in case IWorkItemResult.GetResult has been canceled
-    /// </summary>
-    [Serializable]
-    public sealed class WorkItemCancelException : ApplicationException
-    {
-        public WorkItemCancelException() : base()
-        {
-        }
-
-        public WorkItemCancelException(string message) : base(message)
-        {
-        }
-
-        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>
-    [Serializable]
-    public sealed class WorkItemTimeoutException : ApplicationException
-    {
-        public WorkItemTimeoutException() : base()
-        {
-        }
-
-        public WorkItemTimeoutException(string message) : base(message)
-        {
-        }
-
-        public WorkItemTimeoutException(string message, Exception e) : base(message, e)
-        {
-        }
-
-        public WorkItemTimeoutException(SerializationInfo si, StreamingContext sc) : base(si, sc)
-        {
-        }
-    }
-
-    /// <summary>
-    /// Represents an exception in case IWorkItemResult.GetResult has been timed out
-    /// </summary>
-    [Serializable]
-    public sealed class WorkItemResultException : ApplicationException
-    {
-        public WorkItemResultException() : base()
-        {
-        }
-
-        public WorkItemResultException(string message) : base(message)
-        {
-        }
-
-        public WorkItemResultException(string message, Exception e) : base(message, e)
-        {
-        }
-
-        public WorkItemResultException(SerializationInfo si, StreamingContext sc) : base(si, sc)
-        {
-        }
-    }
-
-    #endregion
-}
+using System;
+#if !(_WINDOWS_CE)
+using System.Runtime.Serialization;
+#endif
+
+namespace Amib.Threading
+{
+    #region Exceptions
+
+    /// <summary>
+    /// Represents an exception in case IWorkItemResult.GetResult has been canceled
+    /// </summary>
+    public sealed partial class WorkItemCancelException : Exception
+    {
+        public WorkItemCancelException()
+        {
+        }
+
+        public WorkItemCancelException(string message)
+            : base(message)
+        {
+        }
+
+        public WorkItemCancelException(string message, Exception e)
+            : base(message, e)
+        {
+        }
+    }
+
+    /// <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)
+        {
+        }
+    }
+
+    /// <summary>
+    /// Represents an exception in case IWorkItemResult.GetResult has been timed out
+    /// </summary>
+    public sealed partial class WorkItemResultException : Exception
+    {
+        public WorkItemResultException()
+        {
+        }
+
+        public WorkItemResultException(string message)
+            : base(message)
+        {
+        }
+
+        public WorkItemResultException(string message, Exception e)
+            : base(message, e)
+        {
+        }
+    }
+
+
+#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)
+        {
+        }
+    }
+
+    /// <summary>
+    /// Represents an exception in case IWorkItemResult.GetResult has been timed out
+    /// </summary>
+    [Serializable]
+    public sealed partial class WorkItemTimeoutException
+    {
+        public WorkItemTimeoutException(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..29c8a3e 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
-
-    /// <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 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);
-
-    #endregion
-
-    #region WorkItem Priority
-
-    public enum WorkItemPriority
-    {
-        Lowest,
-        BelowNormal,
-        Normal,
-        AboveNormal,
-        Highest,
-    }
-
-    #endregion
-
-    #region IHasWorkItemPriority interface 
-
-    public interface IHasWorkItemPriority
-    {
-        WorkItemPriority WorkItemPriority { get; }
-    }
-
-    #endregion
-
-    #region IWorkItemsGroup interface 
-
-    /// <summary>
-    /// IWorkItemsGroup interface
-    /// </summary>
-    public interface IWorkItemsGroup
-    {
-        /// <summary>
-        /// Get/Set the name of the WorkItemsGroup
-        /// </summary>
-        string Name { get; set; }
-
-        IWorkItemResult QueueWorkItem(WorkItemCallback callback);
-        IWorkItemResult QueueWorkItem(WorkItemCallback callback, WorkItemPriority workItemPriority);
-        IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state);
-        IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state, WorkItemPriority workItemPriority);
-        IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state, PostExecuteWorkItemCallback postExecuteWorkItemCallback);
-        IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state, PostExecuteWorkItemCallback postExecuteWorkItemCallback, WorkItemPriority workItemPriority);
-        IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state, PostExecuteWorkItemCallback postExecuteWorkItemCallback, CallToPostExecute callToPostExecute);
-        IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state, PostExecuteWorkItemCallback postExecuteWorkItemCallback, CallToPostExecute callToPostExecute, WorkItemPriority workItemPriority);
-
-        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();
-    }
-
-    #endregion
-
-    #region CallToPostExecute enumerator
-
-    [Flags]
-    public enum CallToPostExecute
-    {
-        Never                    = 0x00,
-        WhenWorkItemCanceled     = 0x01,
-        WhenWorkItemNotCanceled  = 0x02,
-        Always                   = WhenWorkItemCanceled | WhenWorkItemNotCanceled,
-    }
-
-    #endregion
-
-    #region IWorkItemResult interface
-
-    /// <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.
-        /// </summary>
-        /// <returns>The result of the work item</returns>
-        object 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
-        object 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
-        object GetResult(            
-            TimeSpan timeout,
-            bool exitContext);
-
-        void Abort();
-
-        /// <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
-        object 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
-        object 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>
-        object 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="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);
-
-        /// <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="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);
-
-        /// <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
-        object 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="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);
-
-        /// <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 a user-defined object that qualifies or contains information about an asynchronous operation.
-        /// </summary>
-        object State { get; }
-
-        /// <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>
-        bool Cancel();
-
-        /// <summary>
-        /// Get the work item's priority
-        /// </summary>
-        WorkItemPriority WorkItemPriority { get; }
-
-        /// <summary>
-        /// Return the result, same as GetResult()
-        /// </summary>
-        object Result { get; }
-
-        /// <summary>
-        /// Returns the exception if occured otherwise returns null.
-        /// </summary>
-        object Exception { get; }
-    }
-
-    #endregion
-}
+using System;
+using System.Threading;
+
+namespace Amib.Threading
+{
+	#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 to call after the WorkItemCallback completed
+    /// </summary>
+    /// <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 a thread is created, but before 
+    /// it's first use.
+    /// </summary>
+    public delegate void ThreadInitializationHandler();
+
+    /// <summary>
+    /// A delegate to call when a thread is about to exit, after 
+    /// it is no longer belong to the pool.
+    /// </summary>
+    public delegate void ThreadTerminationHandler();
+
+	#endregion
+
+	#region WorkItem Priority
+
+    /// <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; }
+
+        /// <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; }
+
+        /// <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();
+
+        /// <summary>
+        /// Get the WorkItemsGroup start information
+        /// </summary>
+        WIGStartInfo WIGStartInfo { get; }
+
+        /// <summary>
+        /// Starts to execute work items
+        /// </summary>
+        void Start();
+
+        /// <summary>
+        /// Cancel all the work items.
+        /// Same as Cancel(false)
+        /// </summary>
+        void Cancel();
+
+        /// <summary>
+        /// Cancel all work items using thread abortion
+        /// </summary>
+        /// <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);
+
+        /// <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
+
+        #region QueueWorkItem(Action<...>)
+
+        /// <summary>
+        /// Queue a work item.
+        /// </summary>
+        /// <returns>Returns a IWorkItemResult object, but its GetResult() will always return null</returns>
+        IWorkItemResult QueueWorkItem(Action action);
+
+        /// <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);
+
+        /// <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>
+        /// 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);
+
+        /// <summary>
+        /// Queue a work item.
+        /// </summary>
+        /// <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>
+        /// Queue a work item.
+        /// </summary>
+        /// <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);
+
+        /// <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>
+        /// 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, WorkItemPriority priority);
+
+        /// <summary>
+        /// Queue a work item.
+        /// </summary>
+        /// <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>
+        /// Queue a work item.
+        /// </summary>
+        /// <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>
+        /// Queue a work item.
+        /// </summary>
+        /// <returns>Returns a IWorkItemResult&lt;TResult&gt; object. 
+        /// its GetResult() returns a TResult object</returns>
+        IWorkItemResult<TResult> QueueWorkItem<TResult>(Func<TResult> func);
+
+        /// <summary>
+        /// Queue a work item.
+        /// </summary>
+        /// <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>
+        /// Queue a work item.
+        /// </summary>
+        /// <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>
+        /// Queue a work item.
+        /// </summary>
+        /// <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>
+        /// Queue a work item.
+        /// </summary>
+        /// <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>
+        /// Never call to the PostExecute call back
+        /// </summary>
+		Never                    = 0x00,
+
+        /// <summary>
+        /// Call to the PostExecute only when the work item is cancelled
+        /// </summary>
+		WhenWorkItemCanceled     = 0x01,
+
+        /// <summary>
+        /// Call to the PostExecute only when the work item is not cancelled
+        /// </summary>
+		WhenWorkItemNotCanceled  = 0x02,
+
+        /// <summary>
+        /// Always call to the PostExecute
+        /// </summary>
+		Always                   = WhenWorkItemCanceled | WhenWorkItemNotCanceled,
+	}
+
+	#endregion
+
+	#region IWorkItemResult interface
+
+    /// <summary>
+    /// The common interface of IWorkItemResult and IWorkItemResult&lt;T&gt;
+    /// </summary>
+    public interface IWaitableResult
+    {
+        /// <summary>
+        /// This method intent is for internal use.
+        /// </summary>
+        /// <returns></returns>
+        IWorkItemResult GetWorkItemResult();
+
+        /// <summary>
+        /// This method intent is for internal use.
+        /// </summary>
+        /// <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..8be7161
--- /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..6245fd8 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.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
-}
+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 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..1651e78
--- /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..fafff19
--- /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..3b92645
--- /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..2508661 100644
--- a/ThirdParty/SmartThreadPool/STPPerformanceCounter.cs
+++ b/ThirdParty/SmartThreadPool/STPPerformanceCounter.cs
@@ -1,354 +1,448 @@
-using System;
-using System.Diagnostics;
-
-namespace Amib.Threading.Internal
-{
-    internal enum STPPerformanceCounterType
-    {
-        // Fields
-        ActiveThreads                = 0,
-        InUseThreads                = 1,
-        OverheadThreads                = 2,
-        OverheadThreadsPercent        = 3,
-        OverheadThreadsPercentBase    = 4,
-
-        WorkItems                    = 5,
-        WorkItemsInQueue            = 6,
-        WorkItemsProcessed            = 7,
-
-        WorkItemsQueuedPerSecond    = 8,
-        WorkItemsProcessedPerSecond    = 9,
-
-        AvgWorkItemWaitTime            = 10,
-        AvgWorkItemWaitTimeBase        = 11,
-
-        AvgWorkItemProcessTime        = 12,
-        AvgWorkItemProcessTimeBase    = 13,
-
-        WorkItemsGroups                = 14,
-
-        LastCounter                    = 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);
-
-            counterData.Add(counterCreationData);
-        }
- 
-        // Properties
-        public string Name
-        {
-            get
-            {
-                return _counterName;
-            }
-        }
-    }
-
-    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();
-        }
- 
-        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);
-                }
-
-
-                // *********** 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
-            }
-        }
- 
-        // Properties
-        public static STPPerformanceCounters Instance
-        {
-            get
-            {
-                return _instance;
-            }
-        }
-     }
-
-    internal class STPInstancePerformanceCounter : IDisposable
-    {
-        // Fields
-        private PerformanceCounter _pcs;
-
-        // Methods
-        protected STPInstancePerformanceCounter()
-        {
-        }
-
-        public STPInstancePerformanceCounter(
-            string instance, 
-            STPPerformanceCounterType spcType)
-        {
-            STPPerformanceCounters counters = STPPerformanceCounters.Instance;
-            _pcs = new PerformanceCounter(
-                STPPerformanceCounters._stpCategoryName, 
-                counters._stpPerformanceCounters[(int) spcType].Name, 
-                instance, 
-                false);
-            _pcs.RawValue = _pcs.RawValue;
-        }
-
-        ~STPInstancePerformanceCounter()
-        {
-            Close();
-        }
-
-        public void Close()
-        {
-            if (_pcs != null)
-            {
-                _pcs.RemoveInstance();
-                _pcs.Close();
-                _pcs = null;
-            }
-        }
- 
-        public void Dispose()
-        {
-            Close();
-            GC.SuppressFinalize(this);
-        }
- 
-        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 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);
-    }
-
-
-    internal class STPInstancePerformanceCounters : ISTPInstancePerformanceCounters, IDisposable
-    {
-        // Fields
-        private STPInstancePerformanceCounter[] _pcs;
-        private static STPInstancePerformanceCounter _stpInstanceNullPerformanceCounter;
-
-        // Methods
-        static STPInstancePerformanceCounters()
-        {
-            _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;
-                }
-            }
-        }
- 
-
-        public void Close()
-        {
-            if (null != _pcs)
-            {
-                for (int i = 0; i < _pcs.Length; i++)
-                {
-                    if (null != _pcs[i])
-                    {
-                        _pcs[i].Close();
-                    }
-                }
-                _pcs = null;
-            }
-        }
-
-        ~STPInstancePerformanceCounters()
-        {
-            Close();
-        }
-
-        public void Dispose()
-        {
-            Close();
-            GC.SuppressFinalize(this);
-        }
- 
-        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();
-        }
-    }
-
-    internal class NullSTPInstancePerformanceCounters : ISTPInstancePerformanceCounters, IDisposable
-    {
-        static NullSTPInstancePerformanceCounters()
-        {
-        }
-
-        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) {}
-    }
-
-}
+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 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);
+    }
+#if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+
+    internal enum STPPerformanceCounterType
+	{
+		// Fields
+		ActiveThreads				= 0,
+		InUseThreads				= 1,
+		OverheadThreads				= 2,
+		OverheadThreadsPercent		= 3,
+		OverheadThreadsPercentBase	= 4,
+
+		WorkItems					= 5,
+		WorkItemsInQueue			= 6,
+		WorkItemsProcessed			= 7,
+
+		WorkItemsQueuedPerSecond	= 8,
+		WorkItemsProcessedPerSecond	= 9,
+
+		AvgWorkItemWaitTime			= 10,
+		AvgWorkItemWaitTimeBase		= 11,
+
+		AvgWorkItemProcessTime		= 12,
+		AvgWorkItemProcessTimeBase	= 13,
+
+		WorkItemsGroups				= 14,
+
+		LastCounter					= 14,
+	}
+ 
+
+	/// <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 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)
+        {
+            if (!_isDisposed)
+            {
+                if (disposing)
+                {
+                    Close();
+                }
+            }
+            _isDisposed = true;
+        }
+ 
+		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;
+				}
+			}
+		}
+ 
+
+		public void Close()
+		{
+			if (null != _pcs)
+			{
+				for (int i = 0; i < _pcs.Length; i++)
+				{
+                    if (null != _pcs[i])
+                    {
+                        _pcs[i].Dispose();
+                    }
+				}
+				_pcs = null;
+			}
+		}
+
+		public void Dispose()
+		{
+            Dispose(true);
+		}
+
+        public virtual void Dispose(bool disposing)
+        {
+            if (!_isDisposed)
+            {
+                if (disposing)
+                {
+                    Close();
+                }
+            }
+            _isDisposed = true;
+        }
+ 
+		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 NullSTPInstancePerformanceCounters : ISTPInstancePerformanceCounters, ISTPPerformanceCountersReader
+	{
+		private static readonly NullSTPInstancePerformanceCounters _instance = new NullSTPInstancePerformanceCounters();
+
+		public static NullSTPInstancePerformanceCounters Instance
+		{
+			get { return _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) {}
+        public long InUseThreads
+        {
+            get { return 0; }
+        }
+
+        public long ActiveThreads
+        {
+            get { return 0; }
+        }
+
+        public long WorkItemsQueued
+        {
+            get { return 0; }
+        }
+
+        public long WorkItemsProcessed
+        {
+            get { return 0; }
+        }
+	}
+
+    internal class LocalSTPInstancePerformanceCounters : ISTPInstancePerformanceCounters, ISTPPerformanceCountersReader
+    {
+        public void Close() { }
+        public void Dispose() { }
+
+        private long _activeThreads;
+        private long _inUseThreads;
+        private long _workItemsQueued;
+        private long _workItemsProcessed;
+
+        public long InUseThreads
+        {
+            get { return _inUseThreads; }
+        }
+
+        public long ActiveThreads
+        {
+            get { return _activeThreads; }
+        }
+
+        public long WorkItemsQueued
+        {
+            get { return _workItemsQueued; }
+        }
+
+        public long WorkItemsProcessed
+        {
+            get { return _workItemsProcessed; }
+        }
+
+        public void SampleThreads(long activeThreads, long inUseThreads)
+        {
+            _activeThreads = activeThreads;
+            _inUseThreads = inUseThreads;
+        }
+
+        public void SampleWorkItems(long workItemsQueued, long workItemsProcessed)
+        {
+            _workItemsQueued = workItemsQueued;
+            _workItemsProcessed = workItemsProcessed;
+        }
+
+        public void SampleWorkItemsWaitTime(TimeSpan workItemWaitTime)
+        {
+            // Not supported
+        }
+
+        public void SampleWorkItemsProcessTime(TimeSpan workItemProcessTime)
+        {
+            // Not supported
+        }
+    }
+}
diff --git a/ThirdParty/SmartThreadPool/STPStartInfo.cs b/ThirdParty/SmartThreadPool/STPStartInfo.cs
index fa9ceb4..2ec8dc6 100644
--- a/ThirdParty/SmartThreadPool/STPStartInfo.cs
+++ b/ThirdParty/SmartThreadPool/STPStartInfo.cs
@@ -1,113 +1,212 @@
-// Ami Bar
-// amibar@gmail.com
-
-using System.Threading;
-
-namespace Amib.Threading
-{
-    /// <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()
-        {
-            _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)
-        {
-            _idleTimeout = stpStartInfo._idleTimeout;
-            _minWorkerThreads = stpStartInfo._minWorkerThreads;
-            _maxWorkerThreads = stpStartInfo._maxWorkerThreads;
-            _threadPriority = stpStartInfo._threadPriority;
-            _threadPoolName = stpStartInfo._threadPoolName;
-            _pcInstanceName = stpStartInfo._pcInstanceName;
-            _stackSize = stpStartInfo._stackSize;
-        }
-
-        public int IdleTimeout
-        {
-            get { return _idleTimeout; }
-            set { _idleTimeout = value; }
-        }
-
-        public int MinWorkerThreads
-        {
-            get { return _minWorkerThreads; }
-            set { _minWorkerThreads = value; }
-        }
-
-        public int MaxWorkerThreads
-        {
-            get { return _maxWorkerThreads; }
-            set { _maxWorkerThreads = value; }
-        }
-
-        public ThreadPriority ThreadPriority
-        {
-            get { return _threadPriority; }
-            set { _threadPriority = value; }
-        }
-
-        public virtual string ThreadPoolName
-        {
-            get { return _threadPoolName; }
-            set { _threadPoolName = value; }
-        }
-
-
-        public string PerformanceCounterInstanceName
-        {
-            get { return _pcInstanceName; }
-            set { _pcInstanceName = value; }
-        }
-
-        public int StackSize
-        {
-            get { return _stackSize; }
-            set { _stackSize = value; }
-        }
-    }
-}
+using System;
+using System.Threading;
+
+namespace Amib.Threading
+{
+	/// <summary>
+	/// Summary description for STPStartInfo.
+	/// </summary>
+    public class STPStartInfo : WIGStartInfo
+    {
+        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;
+        }
+
+	    public STPStartInfo(STPStartInfo stpStartInfo)
+            : base(stpStartInfo)
+        {
+            _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;
+            _areThreadsBackground = stpStartInfo.AreThreadsBackground;
+#if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+            _apartmentState = stpStartInfo._apartmentState;
+#endif
+        }
+	  
+	    /// <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;
+            }
+        }
+
+	    /// <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; 
+            }
+	    }
+
+        /// <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; 
+			}
+	    }
+
+        /// <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()
+        {
+            return new STPStartInfo(this) { _readOnly = true };
+        }
+
+#if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+
+        private ApartmentState _apartmentState = SmartThreadPool.DefaultApartmentState;
+
+        /// <summary>
+        /// Get/Set the apartment state of threads in the thread pool
+        /// </summary>
+        public ApartmentState ApartmentState
+        {
+            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 _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..ba7d73f
--- /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 19a0007..9256777 100644
--- a/ThirdParty/SmartThreadPool/SmartThreadPool.cs
+++ b/ThirdParty/SmartThreadPool/SmartThreadPool.cs
@@ -1,1448 +1,1732 @@
-// Ami Bar
-// amibar@gmail.com
-//
-// Smart thread pool in C#.
-// 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.
-// 26 Dec 2004 - Changes:
-//        - 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. 
-//        The SmartThreadPool.WaitAny() is still limited by the .NET Framework.
-//        - 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
-// 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. 
-//
-// 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
-//
-// 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.
-
-using System;
-using System.Security;
-using System.Threading;
-using System.Collections;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-
-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)
-        /// </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
-        /// </summary>
-        public const CallToPostExecute DefaultCallToPostExecute = CallToPostExecute.Always;
-
-        /// <summary>
-        /// The default post execute method to run. 
-        /// When null it means not to call it.
-        /// </summary>
-        public static readonly PostExecuteWorkItemCallback DefaultPostExecuteWorkItemCallback = null;
-
-        /// <summary>
-        /// The default work item priority
-        /// </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.
-        /// </summary>
-        public const bool DefaultStartSuspended = false;
-
-        /// <summary>
-        /// The default is not to use the performance counters
-        /// </summary>
-        public static readonly string DefaultPerformanceCounterInstanceName = null;
-
-        public static readonly int DefaultStackSize = 0;
-
-        /// <summary>
-        /// The default thread priority
-        /// </summary>
-        public const ThreadPriority DefaultThreadPriority = ThreadPriority.Normal;
-
-        /// <summary>
-        /// The default thread pool name
-        /// </summary>
-        public const string DefaultThreadPoolName = "SmartThreadPool";
-
-        #endregion
-
-        #region Member Variables
-
-        /// <summary>
-        /// Contains the name of this instance of SmartThreadPool.
-        /// Can be changed by the user.
-        /// </summary>
-        private string _name = DefaultThreadPoolName;
-
-        /// <summary>
-        /// Hashtable of all the threads in the thread pool.
-        /// </summary>
-        private Hashtable _workerThreads = Hashtable.Synchronized(new Hashtable());
-
-        /// <summary>
-        /// Queue of work items.
-        /// </summary>
-        private WorkItemsQueue _workItemsQueue = new WorkItemsQueue();
-
-        /// <summary>
-        /// Count the work items handled.
-        /// Used by the performance counter.
-        /// </summary>
-        private long _workItemsProcessed = 0;
-
-        /// <summary>
-        /// Number of threads that currently work (not idle).
-        /// </summary>
-        private int _inUseWorkerThreads = 0;
-
-        /// <summary>
-        /// Start information to use. 
-        /// It is simpler than providing many constructors.
-        /// </summary>
-        private STPStartInfo _stpStartInfo = new STPStartInfo();
-
-        /// <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 = 0;
-
-        /// <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);
-
-        /// <summary>
-        /// An event to signal all the threads to quit immediately.
-        /// </summary>
-        private ManualResetEvent _shuttingDownEvent = new ManualResetEvent(false);
-
-        /// <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;
-
-        /// <summary>
-        /// Indicate that the SmartThreadPool has been disposed
-        /// </summary>
-        private bool _isDisposed = false;
-
-        /// <summary>
-        /// Event to send that the thread pool is idle
-        /// </summary>
-        private event EventHandler _stpIdle;
-
-        /// <summary>
-        /// On idle event
-        /// </summary>
-        //private event WorkItemsGroupIdleHandler _onIdle;
-
-        /// <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());
-
-        /// <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;
-
-        /// <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;
-
-        #endregion
-
-        #region Construction and Finalization
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        public SmartThreadPool()
-        {
-            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>
-        /// <param name="maxWorkerThreads">Upper limit of threads in the pool</param>
-        public SmartThreadPool(
-            int idleTimeout,
-            int maxWorkerThreads)
-        {
-            _stpStartInfo.IdleTimeout = idleTimeout;
-            _stpStartInfo.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.IdleTimeout = idleTimeout;
-            _stpStartInfo.MaxWorkerThreads = maxWorkerThreads;
-            _stpStartInfo.MinWorkerThreads = minWorkerThreads;
-            Initialize();
-        }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        public SmartThreadPool(STPStartInfo stpStartInfo)
-        {
-            _stpStartInfo = new STPStartInfo(stpStartInfo);
-            Initialize();
-        }
-
-        private void Initialize()
-        {
-            Name = _stpStartInfo.ThreadPoolName;
-            ValidateSTPStartInfo();
-
-            if (null != _stpStartInfo.PerformanceCounterInstanceName)
-            {
-                try
-                {
-                    _pcs = new STPInstancePerformanceCounters(_stpStartInfo.PerformanceCounterInstanceName);
-                }
-                catch(Exception e)
-                {
-                    Debug.WriteLine("Unable to create Performance Counters: " + e.ToString());
-                    _pcs = NullSTPInstancePerformanceCounters.Instance;
-                }
-            }
-
-            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)
-            {
-                throw new ArgumentOutOfRangeException(
-                    "MaxWorkerThreads", "MaxWorkerThreads must be greater than zero");
-            }
-
-            if (_stpStartInfo.MinWorkerThreads > _stpStartInfo.MaxWorkerThreads)
-            {
-                throw new ArgumentOutOfRangeException(
-                    "MinWorkerThreads, maxWorkerThreads", 
-                    "MaxWorkerThreads must be greater or equal to MinWorkerThreads");
-            }
-        }
-
-        private 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");
-                _isIdleWaitHandle.Reset();
-            }
-        }
-
-        private void DecrementWorkItemsCount()
-        {
-            ++_workItemsProcessed;
-
-            // The counter counts even if the work item was cancelled
-            _pcs.SampleWorkItems(_workItemsQueue.Count, _workItemsProcessed);
-
-            int count = Interlocked.Decrement(ref _currentWorkItemsCount);
-            //Trace.WriteLine("WorkItemsCount = " + _currentWorkItemsCount.ToString());
-            if (count == 0) 
-            {
-                //Trace.WriteLine("STP is idle");
-                _isIdleWaitHandle.Set();
-            }
-        }
-
-        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 hashtable
-            if (_workerThreads.Contains(Thread.CurrentThread))
-            {
-                _workerThreads.Remove(Thread.CurrentThread);
-                _pcs.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 (_stpStartInfo.StartSuspended)
-            {
-                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;
-                    }
-
-                    // 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;
-                    workerThread.Priority = _stpStartInfo.ThreadPriority;
-                    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)
-                {
-                    // Update the last time this thread was seen alive.
-                    // It's good for debugging.
-                    _workerThreads[Thread.CurrentThread] = DateTime.Now;
-
-                    // Wait for a work item, shutdown, or timeout
-                    WorkItem workItem = Dequeue();
-
-                    // Update the last time this thread was seen alive.
-                    // It's good for debugging.
-                    _workerThreads[Thread.CurrentThread] = DateTime.Now;
-
-                    // On timeout or shut down.
-                    if (null == workItem)
-                    {
-                        // 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;
-
-                        // 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);
-                        _pcs.SampleThreads(_workerThreads.Count, inUseWorkerThreads);
-
-                        // 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)
-                    {
-                        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)
-            {
-                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;
-            }
-            finally
-            {
-                _pcs.SampleWorkItemsProcessTime(workItem.ProcessTime);
-            }
-        }
-
-
-        #endregion
-
-        #region Public Methods
-
-        /// <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)
-        {
-            ValidateNotDisposed();
-            ValidateCallback(callback);
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _stpStartInfo, 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)
-        {
-            ValidateNotDisposed();
-            ValidateCallback(callback);
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _stpStartInfo, 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)
-        {
-            ValidateNotDisposed();
-            ValidateCallback(callback);
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _stpStartInfo, 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)
-        {
-            ValidateNotDisposed();
-            ValidateCallback(callback);
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _stpStartInfo, 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)
-        {
-            ValidateNotDisposed();
-            ValidateCallback(callback);
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _stpStartInfo, 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)
-        {
-            ValidateNotDisposed();
-            ValidateCallback(callback);
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _stpStartInfo, 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)
-        {
-            ValidateNotDisposed();
-            ValidateCallback(callback);
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _stpStartInfo, 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)
-        {
-            ValidateNotDisposed();
-            ValidateCallback(callback);
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _stpStartInfo, 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)
-        {
-            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)
-        {
-            ValidateNotDisposed();
-            ValidateCallback(callback);
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _stpStartInfo, callback, state, postExecuteWorkItemCallback, callToPostExecute, workItemPriority);
-            Enqueue(workItem);
-            return workItem.GetWorkItemResult();
-        }
-
-        /// <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);
-        }
-
-        /// <summary>
-        /// Wait for the thread pool to be idle
-        /// </summary>
-        public bool WaitForIdle(int millisecondsTimeout)
-        {
-            ValidateWaitForIdle();
-            return _isIdleWaitHandle.WaitOne(millisecondsTimeout, false);
-        }
-
-        private void ValidateWaitForIdle()
-        {
-            if(_smartThreadPool == this)
-            {
-                throw new NotSupportedException(
-                    "WaitForIdle cannot be called from a thread on its SmartThreadPool, it will cause may cause a deadlock");
-            }
-        }
-
-        internal void ValidateWorkItemsGroupWaitForIdle(IWorkItemsGroup workItemsGroup)
-        {
-            ValidateWorkItemsGroupWaitForIdleImpl(workItemsGroup, SmartThreadPool._currentWorkItem);
-            if ((null != workItemsGroup) && 
-                (null != SmartThreadPool._currentWorkItem) &&
-                SmartThreadPool._currentWorkItem.WasQueuedBy(workItemsGroup))
-            {
-                throw new NotSupportedException("WaitForIdle cannot be called from a thread on its SmartThreadPool, it will cause may cause a deadlock");
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private 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 will cause may cause a deadlock");
-            }
-        }
-
-
-
-        /// <summary>
-        /// Force the SmartThreadPool to shutdown
-        /// </summary>
-        public void Shutdown()
-        {
-            Shutdown(true, 0);
-        }
-
-        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 = _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();
-
-                // Make a copy of the threads' references in the pool
-                threads = new Thread [_workerThreads.Count];
-                _workerThreads.Keys.CopyTo(threads, 0);
-            }
-
-            int millisecondsLeft = millisecondsTimeout;
-            DateTime start = DateTime.Now;
-            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.Now - start;
-                    millisecondsLeft = millisecondsTimeout - (int)ts.TotalMilliseconds;
-                }
-            }
-
-            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.
-                        }
-                    }
-                }
-            }
-
-            // 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)
-        {
-            return WaitAll(workItemResults, Timeout.Infinite, true);
-        }
-
-        /// <summary>
-        /// Wait for all work items to complete
-        /// </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);
-        }
-
-        /// <summary>
-        /// Wait for all work items to complete
-        /// </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)
-        {
-            return WaitAll(workItemResults, (int)timeout.TotalMilliseconds, exitContext, cancelWaitHandle);
-        }
-
-        /// <summary>
-        /// Wait for all work items to complete
-        /// </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)
-        {
-            return WorkItem.WaitAll(workItemResults, millisecondsTimeout, exitContext, null);
-        }
-
-        /// <summary>
-        /// Wait for all work items to complete
-        /// </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)
-        {
-            return WorkItem.WaitAll(workItemResults, millisecondsTimeout, exitContext, cancelWaitHandle);
-        }
-
-
-        /// <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);
-        }
-
-        /// <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>
-        /// <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)
-        {
-            return WaitAny(workItemResults, (int)timeout.TotalMilliseconds, exitContext);
-        }
-
-        /// <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);
-        }
-
-        /// <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="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)
-        {
-            return WorkItem.WaitAny(workItemResults, millisecondsTimeout, exitContext, null);
-        }
-
-        /// <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="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
-        {
-            add
-            {
-                throw new NotImplementedException("This event is not implemented in the SmartThreadPool class. Please create a WorkItemsGroup in order to use this feature.");
-                //_onIdle += value;
-            }
-            remove
-            {
-                throw new NotImplementedException("This event is not implemented in the SmartThreadPool class. Please create a WorkItemsGroup in order to use this feature.");
-                //_onIdle -= value;
-            }
-        }
-
-        public void Cancel()
-        {
-            ICollection workItemsGroups = _workItemsGroups.Values;
-            foreach(WorkItemsGroup workItemsGroup in workItemsGroups)
-            {
-                workItemsGroup.Cancel();
-            }
-        }
-
-        public void Start()
-        {
-            lock (this)
-            {
-                if (!this._stpStartInfo.StartSuspended)
-                {
-                    return;
-                }
-                _stpStartInfo.StartSuspended = false;
-            }
-            
-            ICollection workItemsGroups = _workItemsGroups.Values;
-            foreach(WorkItemsGroup workItemsGroup in workItemsGroups)
-            {
-                workItemsGroup.OnSTPIsStarting();
-            }
-
-            StartOptimalNumberOfThreads();
-        }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Get/Set the name of the SmartThreadPool instance
-        /// </summary>
-        public string Name 
-        { 
-            get
-            {
-                return _name;
-            }
-
-            set
-            {
-                _name = value;
-            }
-        }
-
-        /// <summary>
-        /// Get the lower limit of threads in the pool.
-        /// </summary>
-        public int MinThreads 
-        { 
-            get 
-            {
-                ValidateNotDisposed();
-                return _stpStartInfo.MinWorkerThreads; 
-            }
-        }
-
-        /// <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.
-        /// </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>
-        /// Get the number of work items in the queue.
-        /// </summary>
-        public int WaitingCallbacks 
-        { 
-            get 
-            { 
-                ValidateNotDisposed();
-                return _workItemsQueue.Count;
-            } 
-        }
-
-
-        public event EventHandler Idle
-        {
-            add
-            {
-                _stpIdle += value;
-            }
-
-            remove
-            {
-                _stpIdle -= value;
-            }
-        }
-
-        #endregion
-
-        #region IDisposable Members
-
-//        ~SmartThreadPool()
-//        {
-//            Dispose();
-//        }
-
-        public void Dispose()
-        {
-            if (!_isDisposed)
-            {
-                if (!_shutdown)
-                {
-                    Shutdown();
-                }
-
-                if (null != _shuttingDownEvent)
-                {
-                    _shuttingDownEvent.Close();
-                    _shuttingDownEvent = null;
-                }
-                _workerThreads.Clear();
-                _isDisposed = true;
-                GC.SuppressFinalize(this);
-            }
-        }
-
-        private void ValidateNotDisposed()
-        {
-            if(_isDisposed)
-            {
-                throw new ObjectDisposedException(GetType().ToString(), "The SmartThreadPool has been shutdown");
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
+#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.
+//
+// 26 Dec 2004 - Changes:
+//		- 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. 
+//        The SmartThreadPool.WaitAny() is still limited by the .NET Framework.
+//		- 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
+//
+// 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. 
+//
+// 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
+//
+// 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.
+//
+// 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;
+
+using Amib.Threading.Internal;
+
+namespace Amib.Threading
+{
+	#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 string DefaultThreadPoolName = "SmartThreadPool";
+
+        /// <summary>
+        /// The default Max Stack Size. (SmartThreadPool)
+        /// </summary>
+        public static readonly int? DefaultMaxStackSize = null;
+
+        /// <summary>
+        /// The default fill state with params. (false)
+        /// It is relevant only to QueueWorkItem of Action&lt;...&gt;/Func&lt;...&gt;
+        /// </summary>
+        public const bool DefaultFillStateWithArgs = false;
+
+        /// <summary>
+        /// The default thread backgroundness. (true)
+        /// </summary>
+        public const bool DefaultAreThreadsBackground = true;
+
+#if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+        /// <summary>
+        /// 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 ApartmentState DefaultApartmentState = ApartmentState.Unknown;
+#endif
+
+		#endregion
+
+        #region Member Variables
+
+		/// <summary>
+		/// Dictionary of all the threads in the thread pool.
+		/// </summary>
+        private readonly SynchronizedDictionary<Thread, ThreadEntry> _workerThreads = new SynchronizedDictionary<Thread, ThreadEntry>();
+
+		/// <summary>
+		/// Queue of work items.
+		/// </summary>
+		private readonly WorkItemsQueue _workItemsQueue = new WorkItemsQueue();
+
+		/// <summary>
+		/// Count the work items handled.
+		/// Used by the performance counter.
+		/// </summary>
+		private int _workItemsProcessed;
+
+		/// <summary>
+		/// Number of threads that currently work (not idle).
+		/// </summary>
+		private int _inUseWorkerThreads;
+
+        /// <summary>
+        /// Stores a copy of the original STPStartInfo.
+        /// It is used to change the MinThread and MaxThreads
+        /// </summary>
+        private STPStartInfo _stpStartInfo;
+
+		/// <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;
+
+		/// <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>
+		/// An event to signal all the threads to quit immediately.
+		/// </summary>
+		//private ManualResetEvent _shuttingDownEvent = new ManualResetEvent(false);
+		private ManualResetEvent _shuttingDownEvent = EventWaitHandleFactory.CreateManualResetEvent(false);
+
+        /// <summary>
+        /// A flag to indicate if the Smart Thread Pool is now suspended.
+        /// </summary>
+        private bool _isSuspended;
+
+		/// <summary>
+		/// A flag to indicate the threads to quit.
+		/// </summary>
+		private bool _shutdown;
+
+		/// <summary>
+		/// Counts the threads created in the pool.
+		/// It is used to name the threads.
+		/// </summary>
+		private int _threadCounter;
+
+		/// <summary>
+		/// Indicate that the SmartThreadPool has been disposed
+		/// </summary>
+		private bool _isDisposed;
+
+		/// <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>
+        /// A common object for all the work items int the STP
+        /// so we can mark them to cancel in O(1)
+        /// </summary>
+        private CanceledWorkItemsGroup _canceledSmartThreadPool = new CanceledWorkItemsGroup();
+
+        /// <summary>
+        /// Windows STP performance counters
+        /// </summary>
+        private ISTPInstancePerformanceCounters _windowsPCs = NullSTPInstancePerformanceCounters.Instance;
+
+        /// <summary>
+        /// Local STP performance counters
+        /// </summary>
+        private ISTPInstancePerformanceCounters _localPCs = NullSTPInstancePerformanceCounters.Instance;
+
+
+#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;
+
+#endif
+
+        /// <summary>
+        /// An event to call after a thread is created, but before 
+        /// it's first use.
+        /// </summary>
+        private event ThreadInitializationHandler _onThreadInitialization;
+
+        /// <summary>
+        /// An event to call when a thread is about to exit, after 
+        /// it is no longer belong to the pool.
+        /// </summary>
+        private event ThreadTerminationHandler _onThreadTermination;
+
+        #endregion
+
+        #region Per thread properties
+
+        /// <summary>
+        /// A reference to the current work item a thread from the thread pool 
+        /// is executing.
+        /// </summary>
+        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()
+		{
+            _stpStartInfo = new STPStartInfo();
+            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="stpStartInfo">A SmartThreadPool configuration that overrides the default behavior</param>
+		public SmartThreadPool(STPStartInfo stpStartInfo)
+		{
+			_stpStartInfo = new STPStartInfo(stpStartInfo);
+			Initialize();
+		}
+
+		private void Initialize()
+		{
+            Name = _stpStartInfo.ThreadPoolName;
+			ValidateSTPStartInfo();
+
+            // _stpStartInfoRW stores a read/write copy of the STPStartInfo.
+            // Actually only MaxWorkerThreads and MinWorkerThreads are overwritten
+
+            _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
+                {
+                    _windowsPCs = new STPInstancePerformanceCounters(_stpStartInfo.PerformanceCounterInstanceName);
+                }
+                catch (Exception e)
+                {
+                    Debug.WriteLine("Unable to create Performance Counters: " + e);
+                    _windowsPCs = NullSTPInstancePerformanceCounters.Instance;
+                }
+            }
+#endif
+
+            if (_stpStartInfo.EnableLocalPerformanceCounters)
+            {
+                _localPCs = new LocalSTPInstancePerformanceCounters();
+            }
+
+		    // If the STP is not started suspended then start the threads.
+            if (!_isSuspended)
+            {
+                StartOptimalNumberOfThreads();
+            }
+		}
+
+		private void StartOptimalNumberOfThreads()
+		{
+			int threadsCount = Math.Max(_workItemsQueue.Count, _stpStartInfo.MinWorkerThreads);
+            threadsCount = Math.Min(threadsCount, _stpStartInfo.MaxWorkerThreads);
+            threadsCount -= _workerThreads.Count;
+            if (threadsCount > 0)
+            {
+                StartThreads(threadsCount);
+            }
+		}
+
+		private void ValidateSTPStartInfo()
+		{
+            if (_stpStartInfo.MinWorkerThreads < 0)
+			{
+				throw new ArgumentOutOfRangeException(
+					"MinWorkerThreads", "MinWorkerThreads cannot be negative");
+			}
+
+            if (_stpStartInfo.MaxWorkerThreads <= 0)
+			{
+				throw new ArgumentOutOfRangeException(
+					"MaxWorkerThreads", "MaxWorkerThreads must be greater than zero");
+			}
+
+            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>
+		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()
+		{
+            int count = Interlocked.Decrement(ref _currentWorkItemsCount);
+            //Trace.WriteLine("WorkItemsCount = " + _currentWorkItemsCount.ToString());
+            if (count == 0)
+            {
+                IsIdle = true;
+                _isIdleWaitHandle.Set();
+            }
+
+            Interlocked.Increment(ref _workItemsProcessed);
+
+            if (!_shutdown)
+            {
+			    // The counter counts even if the work item was cancelled
+			    _windowsPCs.SampleWorkItems(_workItemsQueue.Count, _workItemsProcessed);
+                _localPCs.SampleWorkItems(_workItemsQueue.Count, _workItemsProcessed);
+            }
+
+		}
+
+		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;
+					}
+
+                    // Create a new thread
+
+#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)
+                    {
+                        workerThread.SetApartmentState(_stpStartInfo.ApartmentState);
+                    }
+#endif
+
+#if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+                    workerThread.Priority = _stpStartInfo.ThreadPriority;
+#endif
+                    workerThread.Start();
+					++_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)
+                    {
+                        lock (_workerThreads.SyncRoot)
+                        {
+                            if (_workerThreads.Count > _stpStartInfo.MaxWorkerThreads)
+                            {
+                                // 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;
+                            }
+                        }
+                    }
+
+					// Wait for a work item, shutdown, or timeout
+					WorkItem workItem = Dequeue();
+
+					// Update the last time this thread was seen alive.
+					// It's good for debugging.
+                    CurrentThreadEntry.IAmAlive();
+
+					// 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
+					{
+						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.
+#if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+				Thread.ResetAbort();
+#endif
+            }
+			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)
+            {
+                return;
+            }
+
+            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>
+        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>
+        /// Creates a new WorkItemsGroup.
+        /// </summary>
+        /// <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;
+		}
+
+        #region Fire Thread's Events
+
+        private void FireOnThreadInitialization()
+        {
+            if (null != _onThreadInitialization)
+            {
+                foreach (ThreadInitializationHandler tih in _onThreadInitialization.GetInvocationList())
+                {
+                    try
+                    {
+                        tih();
+                    }
+                    catch (Exception e)
+                    {
+                        e.GetHashCode();
+                        Debug.Assert(false);
+                        throw;
+                    }
+                }
+            }
+        }
+
+        private void FireOnThreadTermination()
+        {
+            if (null != _onThreadTermination)
+            {
+                foreach (ThreadTerminationHandler tth in _onThreadTermination.GetInvocationList())
+                {
+                    try
+                    {
+                        tth();
+                    }
+                    catch (Exception e)
+                    {
+                        e.GetHashCode();
+                        Debug.Assert(false);
+                        throw;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// This event is fired when a thread is created.
+        /// Use it to initialize a thread before the work items use it.
+        /// </summary>
+        public event ThreadInitializationHandler OnThreadInitialization
+        {
+            add { _onThreadInitialization += value; }
+            remove { _onThreadInitialization -= value; }
+        }
+
+        /// <summary>
+        /// This event is fired when a thread is terminating.
+        /// Use it for cleanup.
+        /// </summary>
+        public event ThreadTerminationHandler OnThreadTermination
+        {
+            add { _onThreadTermination += value; }
+            remove { _onThreadTermination -= value; }
+        }
+
+
+        internal void CancelAbortWorkItemsGroup(WorkItemsGroup wig)
+        {
+            foreach (ThreadEntry threadEntry in _workerThreads.Values)
+            {
+                WorkItem workItem = threadEntry.CurrentWorkItem;
+                if (null != workItem &&
+                    workItem.WasQueuedBy(wig) &&
+                    !workItem.IsCanceled)
+                {
+                    threadEntry.CurrentWorkItem.GetWorkItemResult().Cancel(true);
+                }
+            }
+        }
+
+        
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Get/Set the lower limit of threads in the pool.
+		/// </summary>
+		public int MinThreads 
+		{ 
+			get 
+			{
+				ValidateNotDisposed();
+                return _stpStartInfo.MinWorkerThreads; 
+			}
+            set
+            {
+                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; 
+			} 
+
+			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
+        {
+            get
+            {
+                return CurrentThreadEntry.CurrentWorkItem.IsCanceled;
+            }
+        } 
+        
+        /// <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 (IsWorkItemCanceled)
+            {
+                Thread.CurrentThread.Abort();
+            }
+        }
+
+        /// <summary>
+        /// Thread Pool start information (readonly)
+        /// </summary>
+        public STPStartInfo STPStartInfo
+        {
+            get 
+            {
+                return _stpStartInfo.AsReadOnly(); 
+            }
+        }
+
+	    public bool IsShuttingdown
+	    {
+            get { return _shutdown;  }
+	    }
+
+        /// <summary>
+        /// Return the local calculated performance counters
+        /// Available only if STPStartInfo.EnableLocalPerformanceCounters is true.
+        /// </summary>
+        public ISTPPerformanceCountersReader PerformanceCountersReader
+        {
+            get { return (ISTPPerformanceCountersReader)_localPCs; }
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            if (!_isDisposed)
+            {
+                if (!_shutdown)
+                {
+                    Shutdown();
+                }
+
+                if (null != _shuttingDownEvent)
+                {
+                    _shuttingDownEvent.Close();
+                    _shuttingDownEvent = null;
+                }
+                _workerThreads.Clear();
+                
+                if (null != _isIdleWaitHandle)
+                {
+                    _isIdleWaitHandle.Close();
+                    _isIdleWaitHandle = null;
+                }
+
+                _isDisposed = true;
+            }
+        }
+
+        private void ValidateNotDisposed()
+        {
+            if(_isDisposed)
+            {
+                throw new ObjectDisposedException(GetType().ToString(), "The SmartThreadPool has been shutdown");
+            }
+        }
+        #endregion
+
+        #region WorkItemsGroupBase Overrides
+
+        /// <summary>
+        /// Get/Set the maximum number of work items that execute cocurrency on the thread pool
+        /// </summary>
+        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>
+        /// Get an array with all the state objects of the currently running items.
+        /// The array represents a snap shot and impact performance.
+        /// </summary>
+        public override object[] GetStates()
+        {
+            object[] states = _workItemsQueue.GetStates();
+            return states;
+        }
+
+        /// <summary>
+        /// WorkItemsGroup start information (readonly)
+        /// </summary>
+        public override WIGStartInfo WIGStartInfo
+        {
+            get { return _stpStartInfo.AsReadOnly(); }
+        }
+
+	    /// <summary>
+        /// Start the thread pool if it was started suspended.
+        /// If it is already running, this method is ignored.
+        /// </summary>
+        public override void Start()
+        {
+            if (!_isSuspended)
+            {
+                return;
+            }
+            _isSuspended = false;
+
+            ICollection workItemsGroups = _workItemsGroups.Values;
+            foreach (WorkItemsGroup workItemsGroup in workItemsGroups)
+            {
+                workItemsGroup.OnSTPIsStarting();
+            }
+
+            StartOptimalNumberOfThreads();
+        }
+
+        /// <summary>
+        /// Cancel all work items using thread abortion
+        /// </summary>
+        /// <param name="abortExecution">True to stop work items by raising ThreadAbortException</param>
+        public override void Cancel(bool abortExecution)
+        {
+            _canceledSmartThreadPool.IsCanceled = true;
+            _canceledSmartThreadPool = new CanceledWorkItemsGroup();
+
+            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>
+        /// Wait for the thread pool to be idle
+        /// </summary>
+        public override bool WaitForIdle(int millisecondsTimeout)
+        {
+            ValidateWaitForIdle();
+            return STPEventWaitHandle.WaitOne(_isIdleWaitHandle, millisecondsTimeout, false);
+        }
+
+        /// <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>
+        public override event WorkItemsGroupIdleHandler OnIdle
+        {
+            add
+            {
+                throw new NotImplementedException("This event is not implemented in the SmartThreadPool class. Please create a WorkItemsGroup in order to use this feature.");
+                //_onIdle += value;
+            }
+            remove
+            {
+                throw new NotImplementedException("This event is not implemented in the SmartThreadPool class. Please create a WorkItemsGroup in order to use this feature.");
+                //_onIdle -= value;
+            }
+        }
+
+	    internal override void PreQueueWorkItem()
+        {
+            ValidateNotDisposed();   
+        }
+
+        #endregion
+
+        #region Join, Choice, Pipe, etc.
+
+        /// <summary>
+        /// Executes all actions in parallel.
+        /// Returns when they all finish.
+        /// </summary>
+        /// <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)
+            {
+                workItemsGroup.QueueWorkItem(action);
+            }
+            workItemsGroup.Start();
+            workItemsGroup.WaitForIdle();
+        }
+
+        /// <summary>
+        /// Executes all actions in parallel.
+        /// Returns when they all finish.
+        /// </summary>
+        /// <param name="actions">Actions to execute</param>
+        public void Join(params Action[] actions)
+        {
+            Join((IEnumerable<Action>)actions);
+        }
+
+        private class ChoiceIndex
+        {
+            public int _index = -1;
+        }
+
+        /// <summary>
+        /// Executes all actions in parallel
+        /// Returns when the first one completes
+        /// </summary>
+        /// <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);
+
+            ChoiceIndex choiceIndex = new ChoiceIndex();
+            
+            int i = 0;
+            foreach (Action action in actions)
+            {
+                Action act = action;
+                int value = i;
+                workItemsGroup.QueueWorkItem(() => { act(); Interlocked.CompareExchange(ref choiceIndex._index, value, -1); anActionCompleted.Set(); });
+                ++i;
+            }
+	        workItemsGroup.Start();
+            anActionCompleted.WaitOne();
+
+            return choiceIndex._index;
+        }
+
+        /// <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);
+        }
+
+        /// <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)
+        {
+            WIGStartInfo wigStartInfo = new WIGStartInfo { StartSuspended = true };
+            IWorkItemsGroup workItemsGroup = CreateWorkItemsGroup(1, wigStartInfo);
+            foreach (Action<T> action in actions)
+            {
+                Action<T> act = action;
+                workItemsGroup.QueueWorkItem(() => act(pipeState));
+            }
+            workItemsGroup.Start();
+            workItemsGroup.WaitForIdle();
+        }
+
+        /// <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)
+        {
+            Pipe(pipeState, (IEnumerable<Action<T>>)actions);
+        }
+        #endregion
+	}
+	#endregion
+}
diff --git a/ThirdParty/SmartThreadPool/SynchronizedDictionary.cs b/ThirdParty/SmartThreadPool/SynchronizedDictionary.cs
new file mode 100644
index 0000000..3532cca
--- /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..e5ff150 100644
--- a/ThirdParty/SmartThreadPool/WIGStartInfo.cs
+++ b/ThirdParty/SmartThreadPool/WIGStartInfo.cs
@@ -1,99 +1,171 @@
-// Ami Bar
-// amibar@gmail.com
-
-namespace Amib.Threading
-{
-    /// <summary>
-    /// Summary description for WIGStartInfo.
-    /// </summary>
-    public class WIGStartInfo
-    {
-        /// <summary>
-        /// Use the caller's security context
-        /// </summary>
-        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;
-
-        public WIGStartInfo()
-        {
-            _useCallerCallContext = SmartThreadPool.DefaultUseCallerCallContext;
-            _useCallerHttpContext = SmartThreadPool.DefaultUseCallerHttpContext;
-            _disposeOfStateObjects = SmartThreadPool.DefaultDisposeOfStateObjects;
-            _callToPostExecute = SmartThreadPool.DefaultCallToPostExecute;
-            _postExecuteWorkItemCallback = SmartThreadPool.DefaultPostExecuteWorkItemCallback;
-            _startSuspended = SmartThreadPool.DefaultStartSuspended;
-        }
-
-        public WIGStartInfo(WIGStartInfo wigStartInfo)
-        {
-            _useCallerCallContext = wigStartInfo._useCallerCallContext;
-            _useCallerHttpContext = wigStartInfo._useCallerHttpContext;
-            _disposeOfStateObjects = wigStartInfo._disposeOfStateObjects;
-            _callToPostExecute = wigStartInfo._callToPostExecute;
-            _postExecuteWorkItemCallback = wigStartInfo._postExecuteWorkItemCallback;
-            _startSuspended = wigStartInfo._startSuspended;
-        }
-
-        public bool UseCallerCallContext
-        {
-            get { return _useCallerCallContext; }
-            set { _useCallerCallContext = value; }
-        }
-
-        public bool UseCallerHttpContext
-        {
-            get { return _useCallerHttpContext; }
-            set { _useCallerHttpContext = value; }
-        }
-
-        public bool DisposeOfStateObjects
-        {
-            get { return _disposeOfStateObjects; }
-            set { _disposeOfStateObjects = value; }
-        }
-
-        public CallToPostExecute CallToPostExecute
-        {
-            get { return _callToPostExecute; }
-            set { _callToPostExecute = value; }
-        }
-
-        public PostExecuteWorkItemCallback PostExecuteWorkItemCallback
-        {
-            get { return _postExecuteWorkItemCallback; }
-            set { _postExecuteWorkItemCallback = value; }
-        }
-
-        public bool StartSuspended
-        {
-            get { return _startSuspended; }
-            set { _startSuspended = value; }
-        }
-    }
-}
+using System;
+
+namespace Amib.Threading
+{
+	/// <summary>
+	/// Summary description for WIGStartInfo.
+	/// </summary>
+	public class WIGStartInfo
+	{
+        private bool _useCallerCallContext;
+        private bool _useCallerHttpContext;
+        private bool _disposeOfStateObjects;
+        private CallToPostExecute _callToPostExecute;
+        private PostExecuteWorkItemCallback _postExecuteWorkItemCallback;
+        private bool _startSuspended;
+        private WorkItemPriority _workItemPriority;
+        private bool _fillStateWithArgs;
+
+        protected bool _readOnly;
+
+	    public WIGStartInfo()
+        {
+	        _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)
+        {
+            _useCallerCallContext = wigStartInfo.UseCallerCallContext;
+            _useCallerHttpContext = wigStartInfo.UseCallerHttpContext;
+            _disposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
+            _callToPostExecute = wigStartInfo.CallToPostExecute;
+            _postExecuteWorkItemCallback = wigStartInfo.PostExecuteWorkItemCallback;
+            _workItemPriority = wigStartInfo.WorkItemPriority;
+            _startSuspended = wigStartInfo.StartSuspended;
+            _fillStateWithArgs = wigStartInfo.FillStateWithArgs;
+        }
+
+        protected void ThrowIfReadOnly()
+        {
+            if (_readOnly)
+            {
+                throw new NotSupportedException("This is a readonly instance and set is not supported");
+            }
+        }
+
+	    /// <summary>
+	    /// Get/Set if to use the caller's security context
+	    /// </summary>
+	    public virtual bool UseCallerCallContext
+	    {
+	        get { return _useCallerCallContext; }
+            set 
+            { 
+                ThrowIfReadOnly();  
+                _useCallerCallContext = value; 
+            }
+	    }
+
+
+	    /// <summary>
+	    /// Get/Set if to use the caller's HTTP context
+	    /// </summary>
+	    public virtual bool UseCallerHttpContext
+	    {
+	        get { return _useCallerHttpContext; }
+            set 
+            { 
+                ThrowIfReadOnly();  
+                _useCallerHttpContext = 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..5745c15
--- /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..f229d1f 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,83 @@ 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
+                        {
+                            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 +786,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 +827,7 @@ namespace Amib.Threading.Internal
             {
                 WaitHandle wh = GetWaitHandle();
 
-                bool timeout = !wh.WaitOne(millisecondsTimeout, exitContext);
+                bool timeout = !STPEventWaitHandle.WaitOne(wh, millisecondsTimeout, exitContext);
 
                 ReleaseWaitHandle();
 
@@ -706,10 +839,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 +850,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 +878,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 +891,7 @@ namespace Amib.Threading.Internal
 
         private void ReleaseWaitHandle()
         {
-            lock(this)
+            lock (this)
             {
                 if (null != _workItemCompleted)
                 {
@@ -779,10 +912,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 +928,7 @@ namespace Amib.Threading.Internal
         {
             get
             {
-                lock(this)
+                lock (this)
                 {
                     return (GetWorkItemState() == WorkItemState.Canceled);
                 }
@@ -843,172 +976,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 +988,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..2d6601e 100644
--- a/ThirdParty/SmartThreadPool/WorkItemFactory.cs
+++ b/ThirdParty/SmartThreadPool/WorkItemFactory.cs
@@ -1,333 +1,343 @@
-// Ami Bar
-// amibar@gmail.com
-
-using System;
-
-namespace Amib.Threading.Internal
-{
-    #region WorkItemFactory class 
-
-    public class WorkItemFactory
-    {
-        /// <summary>
-        /// Create a new work item
-        /// </summary>
-        /// <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="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="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>
-        public static WorkItem CreateWorkItem(
-            IWorkItemsGroup workItemsGroup,
-            WIGStartInfo wigStartInfo,
-            WorkItemInfo workItemInfo, 
-            WorkItemCallback callback, 
-            object state)
-        {
-            ValidateCallback(callback);
-            ValidateCallback(workItemInfo.PostExecuteWorkItemCallback);
-
-            WorkItem workItem = new WorkItem(
-                workItemsGroup,
-                new WorkItemInfo(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>
-        /// <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
-}
+using System;
+
+namespace Amib.Threading.Internal
+{
+	#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>
+		/// <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="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;
+            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,
+            object state)
+        {
+            ValidateCallback(callback);
+            ValidateCallback(workItemInfo.PostExecuteWorkItemCallback);
+
+            WorkItem workItem = new WorkItem(
+                workItemsGroup,
+                new WorkItemInfo(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>
+		/// <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..5fbceb8 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;
-
-        /// <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;
-
-        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;
-        }
-
-        public bool UseCallerCallContext
-        {
-            get { return _useCallerCallContext; }
-            set { _useCallerCallContext = value; }
-        }
-
-        public bool UseCallerHttpContext
-        {
-            get { return _useCallerHttpContext; }
-            set { _useCallerHttpContext = value; }
-        }
-
-        public bool DisposeOfStateObjects
-        {
-            get { return _disposeOfStateObjects; }
-            set { _disposeOfStateObjects = value; }
-        }
-
-        public CallToPostExecute CallToPostExecute
-        {
-            get { return _callToPostExecute; }
-            set { _callToPostExecute = value; }
-        }
-
-        public PostExecuteWorkItemCallback PostExecuteWorkItemCallback
-        {
-            get { return _postExecuteWorkItemCallback; }
-            set { _postExecuteWorkItemCallback = value; }
-        }
-
-        public WorkItemPriority WorkItemPriority
-        {
-            get { return _workItemPriority; }
-            set { _workItemPriority = value; }
-        }
-    }
-
-    #endregion
-}
+namespace Amib.Threading
+{
+	#region WorkItemInfo class
+
+	/// <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(WorkItemInfo workItemInfo)
+		{
+			UseCallerCallContext = workItemInfo.UseCallerCallContext;
+			UseCallerHttpContext = workItemInfo.UseCallerHttpContext;
+			DisposeOfStateObjects = workItemInfo.DisposeOfStateObjects;
+			CallToPostExecute = workItemInfo.CallToPostExecute;
+			PostExecuteWorkItemCallback = workItemInfo.PostExecuteWorkItemCallback;
+			WorkItemPriority = workItemInfo.WorkItemPriority;
+            Timeout = workItemInfo.Timeout;
+		}
+
+	    /// <summary>
+	    /// Get/Set if to use the caller's security context
+	    /// </summary>
+	    public bool UseCallerCallContext { get; set; }
+
+	    /// <summary>
+	    /// Get/Set if to use the caller's HTTP context
+	    /// </summary>
+	    public bool UseCallerHttpContext { get; set; }
+
+	    /// <summary>
+	    /// Get/Set if to dispose of the state object of a work item
+	    /// </summary>
+	    public bool DisposeOfStateObjects { get; set; }
+
+	    /// <summary>
+	    /// Get/Set the run the post execute options
+	    /// </summary>
+        public CallToPostExecute CallToPostExecute { get; set; }
+
+	    /// <summary>
+	    /// Get/Set the post execute callback
+	    /// </summary>
+        public PostExecuteWorkItemCallback PostExecuteWorkItemCallback { get; set; }
+
+	    /// <summary>
+	    /// Get/Set the work item's priority
+	    /// </summary>
+	    public WorkItemPriority WorkItemPriority { get; set; }
+
+	    /// <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
+}
diff --git a/ThirdParty/SmartThreadPool/WorkItemResultTWrapper.cs b/ThirdParty/SmartThreadPool/WorkItemResultTWrapper.cs
new file mode 100644
index 0000000..a0bf8b8
--- /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..67dcbdd 100644
--- a/ThirdParty/SmartThreadPool/WorkItemsGroup.cs
+++ b/ThirdParty/SmartThreadPool/WorkItemsGroup.cs
@@ -1,512 +1,361 @@
-// Ami Bar
-// amibar@gmail.com
-
-using System;
-using System.Threading;
-using System.Runtime.CompilerServices;
-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;
-
-        /// <summary>
-        /// Priority queue to hold work items before they are passed 
-        /// to the SmartThreadPool.
-        /// </summary>
-        private 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 WIGStartInfo _workItemsGroupStartInfo;
-
-        /// <summary>
-        /// Signaled when all of the WorkItemsGroup's work item completed.
-        /// </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)
-        {
-            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;
-            }
-
-            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();
-        }
-
-        /// <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();
-        }
-
-        /// <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)
-        {
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _workItemsGroupStartInfo, callback, state, postExecuteWorkItemCallback, callToPostExecute, workItemPriority);
-            EnqueueToSTPNextWorkItem(workItem);
-            return workItem.GetWorkItemResult();
-        }
-
-        /// <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);
-        }
-
-        /// <summary>
-        /// Wait for the thread pool to be idle
-        /// </summary>
-        public bool WaitForIdle(int millisecondsTimeout)
-        {
-            _stp.ValidateWorkItemsGroupWaitForIdle(this);
-            return _isIdleWaitHandle.WaitOne(millisecondsTimeout, false);
-        }
-
-        public int WaitingCallbacks
-        {
-            get
-            {
-                return _workItemsQueue.Count;
-            }
-        }
-
-        public event WorkItemsGroupIdleHandler OnIdle
-        {
-            add
-            {
-                _onIdle += value;
-            }
-            remove
-            {
-                _onIdle -= value;
-            }
-        }
-
-        public void Cancel()
-        {
-            lock(_lock)
-            {
-                _canceledWorkItemsGroup.IsCanceled = true;
-                _workItemsQueue.Clear();
-                _workItemsInStpQueue = 0;
-                _canceledWorkItemsGroup = new CanceledWorkItemsGroup();
-            }
-        }
-
-        public void Start()
-        {
-            lock (this)
-            {
-                if (!_workItemsGroupStartInfo.StartSuspended)
-                {
-                    return;
-                }
-                _workItemsGroupStartInfo.StartSuspended = false;
-            }
-            
-            for(int i = 0; i < _concurrency; ++i)
-            {
-                EnqueueToSTPNextWorkItem(null, false);
-            }
-        }
-
-        #endregion 
-
-        #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)
-            {
-                return;
-            }
-
-            Delegate[] delegates = onIdle.GetInvocationList();
-            foreach(WorkItemsGroupIdleHandler eh in delegates)
-            {
-                try
-                {
-                    eh(this);
-                }
-                    // Ignore exceptions
-                catch{} 
-            }
-        }
-
-        private void OnWorkItemStartedCallback(WorkItem workItem)
-        {
-            lock(_lock)
-            {
-                ++_workItemsExecutingInStp;
-            }
-        }
-
-        private void OnWorkItemCompletedCallback(WorkItem workItem)
-        {
-            EnqueueToSTPNextWorkItem(null, true);
-        }
-
-        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);
-                        Trace.WriteLine("WorkItemsGroup " + Name + " is NOT idle");
-                        _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");
-                        _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
-    }
-
-    #endregion
-}
+using System;
+using System.Threading;
+using System.Runtime.CompilerServices;
+using System.Diagnostics;
+
+namespace Amib.Threading.Internal
+{
+
+	#region WorkItemsGroup class 
+
+	/// <summary>
+	/// Summary description for WorkItemsGroup.
+	/// </summary>
+	public class WorkItemsGroup : WorkItemsGroupBase
+	{
+		#region Private members
+
+		private readonly object _lock = new object();
+
+		/// <summary>
+		/// A reference to the SmartThreadPool instance that created this 
+		/// WorkItemsGroup.
+		/// </summary>
+		private readonly SmartThreadPool _stp;
+
+		/// <summary>
+		/// The OnIdle event
+		/// </summary>
+		private event WorkItemsGroupIdleHandler _onIdle;
+
+        /// <summary>
+        /// A flag to indicate if the Work Items Group is now suspended.
+        /// </summary>
+        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
+        {
+            get { return _concurrency; }
+            set
+            {
+                Debug.Assert(value > 0);
+
+                int diff = value - _concurrency;
+                _concurrency = value;
+                if (diff > 0)
+                {
+                    EnqueueToSTPNextNWorkItem(diff);
+                }
+            }
+        }
+
+        public override int WaitingCallbacks
+        {
+            get { return _workItemsQueue.Count; }
+        }
+
+        public override object[] GetStates()
+        {
+            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>
+        /// WorkItemsGroup start information
+        /// </summary>
+        public override WIGStartInfo WIGStartInfo
+        {
+            get { return _workItemsGroupStartInfo; }
+        }
+
+	    /// <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 override bool WaitForIdle(int millisecondsTimeout)
+        {
+            SmartThreadPool.ValidateWorkItemsGroupWaitForIdle(this);
+            return STPEventWaitHandle.WaitOne(_isIdleWaitHandle, millisecondsTimeout, false);
+        }
+
+	    public override event WorkItemsGroupIdleHandler OnIdle
+		{
+			add { _onIdle += value; }
+			remove { _onIdle -= value; }
+		}
+
+	    #endregion 
+
+		#region Private methods
+
+	    private void RegisterToWorkItemCompletion(IWorkItemResult wir)
+		{
+			IInternalWorkItemResult iwir = (IInternalWorkItemResult)wir;
+			iwir.OnWorkItemStarted += OnWorkItemStartedCallback;
+			iwir.OnWorkItemCompleted += OnWorkItemCompletedCallback;
+		}
+
+	    public void OnSTPIsStarting()
+		{
+            if (_isSuspended)
+            {
+                return;
+            }
+			
+            EnqueueToSTPNextNWorkItem(_concurrency);
+		}
+
+	    public void EnqueueToSTPNextNWorkItem(int count)
+        {
+            for (int i = 0; i < count; ++i)
+            {
+                EnqueueToSTPNextWorkItem(null, false);
+            }
+        }
+
+		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);
+        }
+
+	    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);
+                        IsIdle = true;
+                        _isIdleWaitHandle.Set();
+                        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
+}
diff --git a/ThirdParty/SmartThreadPool/WorkItemsGroupBase.cs b/ThirdParty/SmartThreadPool/WorkItemsGroupBase.cs
new file mode 100644
index 0000000..429de12
--- /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..156a131 100644
--- a/ThirdParty/SmartThreadPool/WorkItemsQueue.cs
+++ b/ThirdParty/SmartThreadPool/WorkItemsQueue.cs
@@ -1,600 +1,645 @@
-// Ami Bar
-// amibar@gmail.com
-
-using System;
-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();
-
-        /// <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;
-
-        #endregion
-
-        #region Public properties
-
-        /// <summary>
-        /// Returns the current number of work items in the queue
-        /// </summary>
-        public int Count
-        {
-            get
-            {
-                lock(this)
-                {
-                    ValidateNotDisposed();
-                    return _workItems.Count;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Returns the current number of waiters
-        /// </summary>
-        public int WaitersCount
-        {
-            get
-            {
-                lock(this)
-                {
-                    ValidateNotDisposed();
-                    return _waitersCount;
-                }
-            }
-        }
-
-
-        #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)
-                {
-                    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);
-                }
-            }
-            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)
-            {
-                ValidateNotDisposed();
-
-                // If there are waiting work items then take one and return.
-                if (_workItems.Count > 0)
-                {
-                    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;
-        }
-
-        /// <summary>
-        /// Cleanup the work items queue, hence no more work 
-        /// items are allowed to be queue
-        /// </summary>
-        protected virtual void Cleanup()
-        {
-            lock(this)
-            {
-                // Deactivate only once
-                if (!_isWorkItemsQueueActive)
-                {
-                    return;
-                }
-
-                // Don't queue more work items
-                _isWorkItemsQueueActive = false;
-
-                foreach(WorkItem workItem in _workItems)
-                {
-                    workItem.DisposeOfState();
-                }
-
-                // Clear the work items that are already queued
-                _workItems.Clear();
-
-                // Note: 
-                // I don't iterate over the queue and dispose of work items's states, 
-                // since if a work item has a state object that is still in use in the 
-                // application then I must not dispose it.
-
-                // 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();
-                }
-            }
-        }
-
-        #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()
-        {
-            if (null == _waiterEntry)
-            {
-                _waiterEntry = new WaiterEntry();
-            }
-            _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;
-
-                // 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;
-
-            /// <summary>
-            /// A work item that passed directly to the waiter withou going 
-            /// through the queue
-            /// </summary>
-            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)
-                {
-                    // 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()
-            {
-                if (!_isDisposed)
-                {
-                    Close();
-                    _isDisposed = true;
-                }
-            }
-
-            ~WaiterEntry()
-            {
-                Dispose();
-            }
-
-            #endregion
-        }
-
-        #endregion
-
-        #region IDisposable Members
-
-        public void Dispose()
-        {
-            if (!_isDisposed)
-            {
-                Cleanup();
-                _isDisposed = true;
-                GC.SuppressFinalize(this);
-            }
-        }
-
-        ~WorkItemsQueue()
-        {
-            Cleanup();
-        }
-
-        private void ValidateNotDisposed()
-        {
-            if(_isDisposed)
-            {
-                throw new ObjectDisposedException(GetType().ToString(), "The SmartThreadPool has been shutdown");
-            }
-        }
-
-        #endregion
-    }
-
-    #endregion
-}
-
+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 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;
+
+
+#if (WINDOWS_PHONE) 
+        private static readonly Dictionary<int, WaiterEntry> _waiterEntries = new Dictionary<int, WaiterEntry>();
+#elif (_WINDOWS_CE)
+        private static LocalDataStoreSlot _waiterEntrySlot = Thread.AllocateDataSlot();
+#else
+
+        [ThreadStatic]
+        private static WaiterEntry _waiterEntry;
+#endif
+
+
+        /// <summary>
+        /// Each thread in the thread pool keeps its own waiter entry.
+        /// </summary>
+        private static WaiterEntry CurrentWaiterEntry
+        {
+#if (WINDOWS_PHONE) 
+            get
+            {
+                lock (_waiterEntries)
+                {
+                    WaiterEntry waiterEntry;
+                    if (_waiterEntries.TryGetValue(Thread.CurrentThread.ManagedThreadId, out waiterEntry))
+                    {
+                        return waiterEntry;
+                    }
+                }
+                return null;
+            }
+            set
+            {
+                lock (_waiterEntries)
+                {
+                    _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
+
+		#region Public properties
+
+        /// <summary>
+        /// Returns the current number of work items in the queue
+        /// </summary>
+		public int Count
+		{
+			get
+			{
+                return _workItems.Count;
+			}
+		}
+
+		/// <summary>
+		/// Returns the current number of waiters
+		/// </summary>
+		public int WaitersCount
+		{
+			get
+			{
+				return _waitersCount;
+			}
+		}
+
+
+        #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)
+                {
+                    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);
+				}
+			}
+            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 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.
+                if (_workItems.Count > 0)
+                {
+                    workItem = _workItems.Dequeue() as WorkItem;
+                    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>
+        private void Cleanup()
+        {
+            lock(this)
+            {
+                // Deactivate only once
+                if (!_isWorkItemsQueueActive)
+                {
+                    return;
+                }
+
+                // Don't queue more work items
+                _isWorkItemsQueueActive = false;
+
+                foreach(WorkItem workItem in _workItems)
+                {
+                    workItem.DisposeOfState();
+                }
+
+                // Clear the work items that are already queued
+                _workItems.Clear();
+
+                // Note: 
+                // I don't iterate over the queue and dispose of work items's states, 
+                // since if a work item has a state object that is still in use in the 
+                // application then I must not dispose it.
+
+                // 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();
+				}
+            }
+        }
+
+        public object[] GetStates()
+        {
+            lock (this)
+            {
+                object[] states = new object[_workItems.Count];
+                int i = 0;
+                foreach (WorkItem workItem in _workItems)
+                {
+                    states[i] = workItem.GetWorkItemResult().State;
+                    ++i;
+                }
+                return states;
+            }
+        }
+
+		#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 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 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
+				{
+					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)
+                {
+                    if (!_isDisposed)
+                    {
+                        Close();
+                    }
+                    _isDisposed = true;
+                }
+            }
+
+			#endregion
+		}
+
+		#endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            if (!_isDisposed)
+            {
+                Cleanup();
+            }
+            _isDisposed = true;
+        }
+
+        private void ValidateNotDisposed()
+        {
+            if(_isDisposed)
+            {
+                throw new ObjectDisposedException(GetType().ToString(), "The SmartThreadPool has been shutdown");
+            }
+        }
+
+        #endregion
+    }
+
+	#endregion
+}
+
-- 
cgit v1.1


From 8d3250cee4d16113e955c42d3cce02b0024bea55 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 1 May 2013 19:15:05 +0100
Subject: Add information about creating a PID file for robust to the
 Robust.ini and Robust.HG.ini example files

---
 bin/Robust.HG.ini.example | 27 +++++++++++++++------------
 bin/Robust.ini.example    | 28 +++++++++++++++-------------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 581c31d..d74f205 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 = "/home/opensim/etc/Configs"
 
 [ServiceList]
 
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index b98132e..b7b2524 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 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 = "/home/opensim/etc/Configs"
 
 [ServiceList]
 AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"
-- 
cgit v1.1


From 81a90e30c637f84e6ef5d1cf7c188c1f6db12eb3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 1 May 2013 19:29:46 +0100
Subject: Add in-code exaplanation for the change in cancellation signalling in
 STP 2.2.3.  Remove left in Console.WriteLine accidentally inserted in recent
 206fb306

---
 OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs |  2 --
 ThirdParty/SmartThreadPool/WorkItem.cs                        | 10 ++++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index f9d3afc..887a317 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -628,8 +628,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 }
             }
 
-            Console.WriteLine("Here9");
-
             lock (EventQueue)
             {
                 workItem = m_CurrentWorkItem;
diff --git a/ThirdParty/SmartThreadPool/WorkItem.cs b/ThirdParty/SmartThreadPool/WorkItem.cs
index f229d1f..185f10c 100644
--- a/ThirdParty/SmartThreadPool/WorkItem.cs
+++ b/ThirdParty/SmartThreadPool/WorkItem.cs
@@ -753,6 +753,16 @@ namespace Amib.Threading.Internal
                         }
                         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;
                         }
-- 
cgit v1.1


From b26276c8c48a8cf4edb468b2fd428815034a6320 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 1 May 2013 21:35:50 +0100
Subject: Fix the long standing bug of items being delivered to lost and found
 or trash when takig copy. This bug was recently aggravated through the perms
 changes required for the export permission.

---
 .../CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index e0009bb..eb37626 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -646,11 +646,12 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     }
                     else
                     {
-                        if (remoteClient == null || so.OwnerID != remoteClient.AgentId)
+                        if (remoteClient == null || so.RootPart.OwnerID != remoteClient.AgentId)
                         {
                             // Taking copy of another person's item. Take to
                             // Objects folder.
                             folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object);
+                            so.FromFolderID = UUID.Zero;
                         }
                         else
                         {
@@ -666,7 +667,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 //
                 if (action == DeRezAction.Take || action == DeRezAction.TakeCopy)
                 {
-                    if (so.FromFolderID != UUID.Zero && userID == remoteClient.AgentId)
+                    if (so.FromFolderID != UUID.Zero && so.RootPart.OwnerID == remoteClient.AgentId)
                     {
                         InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID);
                         folder = m_Scene.InventoryService.GetFolder(f);
-- 
cgit v1.1


From 854dcd1abddc3eef33da953592deb61133e5e7ed Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 1 May 2013 23:00:46 +0100
Subject: Fix SmartThreadPool line endings in recent update from dos to unix

---
 ThirdParty/SmartThreadPool/CallerThreadContext.cs  |  276 +-
 .../SmartThreadPool/CanceledWorkItemsGroup.cs      |   26 +-
 ThirdParty/SmartThreadPool/EventWaitHandle.cs      |  206 +-
 .../SmartThreadPool/EventWaitHandleFactory.cs      |  164 +-
 ThirdParty/SmartThreadPool/Exceptions.cs           |  222 +-
 ThirdParty/SmartThreadPool/Interfaces.cs           | 1256 +++----
 ThirdParty/SmartThreadPool/InternalInterfaces.cs   |   54 +-
 ThirdParty/SmartThreadPool/PriorityQueue.cs        |  478 +--
 .../SmartThreadPool/Properties/AssemblyInfo.cs     |   46 +-
 ThirdParty/SmartThreadPool/SLExt.cs                |   32 +-
 ThirdParty/SmartThreadPool/STPEventWaitHandle.cs   |  122 +-
 .../SmartThreadPool/STPPerformanceCounter.cs       |  896 ++---
 ThirdParty/SmartThreadPool/STPStartInfo.cs         |  424 +--
 .../SmartThreadPool/SmartThreadPool.ThreadEntry.cs |  118 +-
 ThirdParty/SmartThreadPool/SmartThreadPool.cs      | 3464 ++++++++++----------
 .../SmartThreadPool/SynchronizedDictionary.cs      |  178 +-
 ThirdParty/SmartThreadPool/WIGStartInfo.cs         |  342 +-
 .../SmartThreadPool/WorkItem.WorkItemResult.cs     |  380 +--
 ThirdParty/SmartThreadPool/WorkItemFactory.cs      |  686 ++--
 ThirdParty/SmartThreadPool/WorkItemInfo.cs         |  138 +-
 .../SmartThreadPool/WorkItemResultTWrapper.cs      |  256 +-
 ThirdParty/SmartThreadPool/WorkItemsGroup.cs       |  722 ++--
 ThirdParty/SmartThreadPool/WorkItemsGroupBase.cs   |  940 +++---
 ThirdParty/SmartThreadPool/WorkItemsQueue.cs       | 1290 ++++----
 24 files changed, 6358 insertions(+), 6358 deletions(-)

diff --git a/ThirdParty/SmartThreadPool/CallerThreadContext.cs b/ThirdParty/SmartThreadPool/CallerThreadContext.cs
index 2177241..e63add5 100644
--- a/ThirdParty/SmartThreadPool/CallerThreadContext.cs
+++ b/ThirdParty/SmartThreadPool/CallerThreadContext.cs
@@ -1,138 +1,138 @@
-
-#if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
-
-using System;
-using System.Diagnostics;
-using System.Threading;
-using System.Reflection;
-using System.Web;
-using System.Runtime.Remoting.Messaging;
-
-
-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 readonly MethodInfo getLogicalCallContextMethodInfo =
-			typeof(Thread).GetMethod("GetLogicalCallContext", BindingFlags.Instance | BindingFlags.NonPublic);
-
-		private static readonly MethodInfo setLogicalCallContextMethodInfo =
-			typeof(Thread).GetMethod("SetLogicalCallContext", BindingFlags.Instance | BindingFlags.NonPublic);
-
-		private static string HttpContextSlotName = GetHttpContextSlotName();
-
-		private static string GetHttpContextSlotName()
-		{
-			FieldInfo fi = typeof(HttpContext).GetField("CallContextSlotName", BindingFlags.Static | BindingFlags.NonPublic);
-
-            if (fi != null)
-            {
-                return (string) fi.GetValue(null);
-            }
-
-		    return "HttpContext";
-		}
-
-        #endregion
-
-#region Private fields
-
-		private HttpContext _httpContext;
-		private LogicalCallContext _callContext;
-
-        #endregion
-
-		/// <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
+
+#if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Reflection;
+using System.Web;
+using System.Runtime.Remoting.Messaging;
+
+
+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 readonly MethodInfo getLogicalCallContextMethodInfo =
+			typeof(Thread).GetMethod("GetLogicalCallContext", BindingFlags.Instance | BindingFlags.NonPublic);
+
+		private static readonly MethodInfo setLogicalCallContextMethodInfo =
+			typeof(Thread).GetMethod("SetLogicalCallContext", BindingFlags.Instance | BindingFlags.NonPublic);
+
+		private static string HttpContextSlotName = GetHttpContextSlotName();
+
+		private static string GetHttpContextSlotName()
+		{
+			FieldInfo fi = typeof(HttpContext).GetField("CallContextSlotName", BindingFlags.Static | BindingFlags.NonPublic);
+
+            if (fi != null)
+            {
+                return (string) fi.GetValue(null);
+            }
+
+		    return "HttpContext";
+		}
+
+        #endregion
+
+#region Private fields
+
+		private HttpContext _httpContext;
+		private LogicalCallContext _callContext;
+
+        #endregion
+
+		/// <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
index 4a2a3e7..5752957 100644
--- a/ThirdParty/SmartThreadPool/CanceledWorkItemsGroup.cs
+++ b/ThirdParty/SmartThreadPool/CanceledWorkItemsGroup.cs
@@ -1,14 +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; }
-    }
+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
index 70a1a29..25be07a 100644
--- a/ThirdParty/SmartThreadPool/EventWaitHandle.cs
+++ b/ThirdParty/SmartThreadPool/EventWaitHandle.cs
@@ -1,104 +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
-    }
-}
+#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
index 2f8c55b..3c9c849 100644
--- a/ThirdParty/SmartThreadPool/EventWaitHandleFactory.cs
+++ b/ThirdParty/SmartThreadPool/EventWaitHandleFactory.cs
@@ -1,82 +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
-
-    }
-}
+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 8e66ce9..6c6a88b 100644
--- a/ThirdParty/SmartThreadPool/Exceptions.cs
+++ b/ThirdParty/SmartThreadPool/Exceptions.cs
@@ -1,111 +1,111 @@
-using System;
-#if !(_WINDOWS_CE)
-using System.Runtime.Serialization;
-#endif
-
-namespace Amib.Threading
-{
-    #region Exceptions
-
-    /// <summary>
-    /// Represents an exception in case IWorkItemResult.GetResult has been canceled
-    /// </summary>
-    public sealed partial class WorkItemCancelException : Exception
-    {
-        public WorkItemCancelException()
-        {
-        }
-
-        public WorkItemCancelException(string message)
-            : base(message)
-        {
-        }
-
-        public WorkItemCancelException(string message, Exception e)
-            : base(message, e)
-        {
-        }
-    }
-
-    /// <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)
-        {
-        }
-    }
-
-    /// <summary>
-    /// Represents an exception in case IWorkItemResult.GetResult has been timed out
-    /// </summary>
-    public sealed partial class WorkItemResultException : Exception
-    {
-        public WorkItemResultException()
-        {
-        }
-
-        public WorkItemResultException(string message)
-            : base(message)
-        {
-        }
-
-        public WorkItemResultException(string message, Exception e)
-            : base(message, e)
-        {
-        }
-    }
-
-
-#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)
-        {
-        }
-    }
-
-    /// <summary>
-    /// Represents an exception in case IWorkItemResult.GetResult has been timed out
-    /// </summary>
-    [Serializable]
-    public sealed partial class WorkItemTimeoutException
-    {
-        public WorkItemTimeoutException(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
-}
+using System;
+#if !(_WINDOWS_CE)
+using System.Runtime.Serialization;
+#endif
+
+namespace Amib.Threading
+{
+    #region Exceptions
+
+    /// <summary>
+    /// Represents an exception in case IWorkItemResult.GetResult has been canceled
+    /// </summary>
+    public sealed partial class WorkItemCancelException : Exception
+    {
+        public WorkItemCancelException()
+        {
+        }
+
+        public WorkItemCancelException(string message)
+            : base(message)
+        {
+        }
+
+        public WorkItemCancelException(string message, Exception e)
+            : base(message, e)
+        {
+        }
+    }
+
+    /// <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)
+        {
+        }
+    }
+
+    /// <summary>
+    /// Represents an exception in case IWorkItemResult.GetResult has been timed out
+    /// </summary>
+    public sealed partial class WorkItemResultException : Exception
+    {
+        public WorkItemResultException()
+        {
+        }
+
+        public WorkItemResultException(string message)
+            : base(message)
+        {
+        }
+
+        public WorkItemResultException(string message, Exception e)
+            : base(message, e)
+        {
+        }
+    }
+
+
+#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)
+        {
+        }
+    }
+
+    /// <summary>
+    /// Represents an exception in case IWorkItemResult.GetResult has been timed out
+    /// </summary>
+    [Serializable]
+    public sealed partial class WorkItemTimeoutException
+    {
+        public WorkItemTimeoutException(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 29c8a3e..513422f 100644
--- a/ThirdParty/SmartThreadPool/Interfaces.cs
+++ b/ThirdParty/SmartThreadPool/Interfaces.cs
@@ -1,628 +1,628 @@
-using System;
-using System.Threading;
-
-namespace Amib.Threading
-{
-	#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 to call after the WorkItemCallback completed
-    /// </summary>
-    /// <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 a thread is created, but before 
-    /// it's first use.
-    /// </summary>
-    public delegate void ThreadInitializationHandler();
-
-    /// <summary>
-    /// A delegate to call when a thread is about to exit, after 
-    /// it is no longer belong to the pool.
-    /// </summary>
-    public delegate void ThreadTerminationHandler();
-
-	#endregion
-
-	#region WorkItem Priority
-
-    /// <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; }
-
-        /// <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; }
-
-        /// <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();
-
-        /// <summary>
-        /// Get the WorkItemsGroup start information
-        /// </summary>
-        WIGStartInfo WIGStartInfo { get; }
-
-        /// <summary>
-        /// Starts to execute work items
-        /// </summary>
-        void Start();
-
-        /// <summary>
-        /// Cancel all the work items.
-        /// Same as Cancel(false)
-        /// </summary>
-        void Cancel();
-
-        /// <summary>
-        /// Cancel all work items using thread abortion
-        /// </summary>
-        /// <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);
-
-        /// <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
-
-        #region QueueWorkItem(Action<...>)
-
-        /// <summary>
-        /// Queue a work item.
-        /// </summary>
-        /// <returns>Returns a IWorkItemResult object, but its GetResult() will always return null</returns>
-        IWorkItemResult QueueWorkItem(Action action);
-
-        /// <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);
-
-        /// <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>
-        /// 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);
-
-        /// <summary>
-        /// Queue a work item.
-        /// </summary>
-        /// <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>
-        /// Queue a work item.
-        /// </summary>
-        /// <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);
-
-        /// <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>
-        /// 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, WorkItemPriority priority);
-
-        /// <summary>
-        /// Queue a work item.
-        /// </summary>
-        /// <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>
-        /// Queue a work item.
-        /// </summary>
-        /// <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>
-        /// Queue a work item.
-        /// </summary>
-        /// <returns>Returns a IWorkItemResult&lt;TResult&gt; object. 
-        /// its GetResult() returns a TResult object</returns>
-        IWorkItemResult<TResult> QueueWorkItem<TResult>(Func<TResult> func);
-
-        /// <summary>
-        /// Queue a work item.
-        /// </summary>
-        /// <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>
-        /// Queue a work item.
-        /// </summary>
-        /// <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>
-        /// Queue a work item.
-        /// </summary>
-        /// <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>
-        /// Queue a work item.
-        /// </summary>
-        /// <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>
-        /// Never call to the PostExecute call back
-        /// </summary>
-		Never                    = 0x00,
-
-        /// <summary>
-        /// Call to the PostExecute only when the work item is cancelled
-        /// </summary>
-		WhenWorkItemCanceled     = 0x01,
-
-        /// <summary>
-        /// Call to the PostExecute only when the work item is not cancelled
-        /// </summary>
-		WhenWorkItemNotCanceled  = 0x02,
-
-        /// <summary>
-        /// Always call to the PostExecute
-        /// </summary>
-		Always                   = WhenWorkItemCanceled | WhenWorkItemNotCanceled,
-	}
-
-	#endregion
-
-	#region IWorkItemResult interface
-
-    /// <summary>
-    /// The common interface of IWorkItemResult and IWorkItemResult&lt;T&gt;
-    /// </summary>
-    public interface IWaitableResult
-    {
-        /// <summary>
-        /// This method intent is for internal use.
-        /// </summary>
-        /// <returns></returns>
-        IWorkItemResult GetWorkItemResult();
-
-        /// <summary>
-        /// This method intent is for internal use.
-        /// </summary>
-        /// <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
-}
+using System;
+using System.Threading;
+
+namespace Amib.Threading
+{
+	#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 to call after the WorkItemCallback completed
+    /// </summary>
+    /// <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 a thread is created, but before 
+    /// it's first use.
+    /// </summary>
+    public delegate void ThreadInitializationHandler();
+
+    /// <summary>
+    /// A delegate to call when a thread is about to exit, after 
+    /// it is no longer belong to the pool.
+    /// </summary>
+    public delegate void ThreadTerminationHandler();
+
+	#endregion
+
+	#region WorkItem Priority
+
+    /// <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; }
+
+        /// <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; }
+
+        /// <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();
+
+        /// <summary>
+        /// Get the WorkItemsGroup start information
+        /// </summary>
+        WIGStartInfo WIGStartInfo { get; }
+
+        /// <summary>
+        /// Starts to execute work items
+        /// </summary>
+        void Start();
+
+        /// <summary>
+        /// Cancel all the work items.
+        /// Same as Cancel(false)
+        /// </summary>
+        void Cancel();
+
+        /// <summary>
+        /// Cancel all work items using thread abortion
+        /// </summary>
+        /// <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);
+
+        /// <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
+
+        #region QueueWorkItem(Action<...>)
+
+        /// <summary>
+        /// Queue a work item.
+        /// </summary>
+        /// <returns>Returns a IWorkItemResult object, but its GetResult() will always return null</returns>
+        IWorkItemResult QueueWorkItem(Action action);
+
+        /// <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);
+
+        /// <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>
+        /// 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);
+
+        /// <summary>
+        /// Queue a work item.
+        /// </summary>
+        /// <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>
+        /// Queue a work item.
+        /// </summary>
+        /// <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);
+
+        /// <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>
+        /// 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, WorkItemPriority priority);
+
+        /// <summary>
+        /// Queue a work item.
+        /// </summary>
+        /// <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>
+        /// Queue a work item.
+        /// </summary>
+        /// <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>
+        /// Queue a work item.
+        /// </summary>
+        /// <returns>Returns a IWorkItemResult&lt;TResult&gt; object. 
+        /// its GetResult() returns a TResult object</returns>
+        IWorkItemResult<TResult> QueueWorkItem<TResult>(Func<TResult> func);
+
+        /// <summary>
+        /// Queue a work item.
+        /// </summary>
+        /// <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>
+        /// Queue a work item.
+        /// </summary>
+        /// <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>
+        /// Queue a work item.
+        /// </summary>
+        /// <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>
+        /// Queue a work item.
+        /// </summary>
+        /// <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>
+        /// Never call to the PostExecute call back
+        /// </summary>
+		Never                    = 0x00,
+
+        /// <summary>
+        /// Call to the PostExecute only when the work item is cancelled
+        /// </summary>
+		WhenWorkItemCanceled     = 0x01,
+
+        /// <summary>
+        /// Call to the PostExecute only when the work item is not cancelled
+        /// </summary>
+		WhenWorkItemNotCanceled  = 0x02,
+
+        /// <summary>
+        /// Always call to the PostExecute
+        /// </summary>
+		Always                   = WhenWorkItemCanceled | WhenWorkItemNotCanceled,
+	}
+
+	#endregion
+
+	#region IWorkItemResult interface
+
+    /// <summary>
+    /// The common interface of IWorkItemResult and IWorkItemResult&lt;T&gt;
+    /// </summary>
+    public interface IWaitableResult
+    {
+        /// <summary>
+        /// This method intent is for internal use.
+        /// </summary>
+        /// <returns></returns>
+        IWorkItemResult GetWorkItemResult();
+
+        /// <summary>
+        /// This method intent is for internal use.
+        /// </summary>
+        /// <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
index 8be7161..0072e10 100644
--- a/ThirdParty/SmartThreadPool/InternalInterfaces.cs
+++ b/ThirdParty/SmartThreadPool/InternalInterfaces.cs
@@ -1,27 +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; }
-    }
-}
+
+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 6245fd8..409c879 100644
--- a/ThirdParty/SmartThreadPool/PriorityQueue.cs
+++ b/ThirdParty/SmartThreadPool/PriorityQueue.cs
@@ -1,239 +1,239 @@
-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 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
-}
+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 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
index 1651e78..4728c1f 100644
--- a/ThirdParty/SmartThreadPool/Properties/AssemblyInfo.cs
+++ b/ThirdParty/SmartThreadPool/Properties/AssemblyInfo.cs
@@ -1,23 +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
-
-
+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
index fafff19..23a60bc 100644
--- a/ThirdParty/SmartThreadPool/SLExt.cs
+++ b/ThirdParty/SmartThreadPool/SLExt.cs
@@ -1,16 +1,16 @@
-#if _SILVERLIGHT
-
-using System.Threading;
-
-namespace Amib.Threading
-{
-    public enum ThreadPriority
-    {
-        Lowest,
-        BelowNormal,
-        Normal,
-        AboveNormal,
-        Highest,
-    }
-}
-#endif
+#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
index 3b92645..9b17f69 100644
--- a/ThirdParty/SmartThreadPool/STPEventWaitHandle.cs
+++ b/ThirdParty/SmartThreadPool/STPEventWaitHandle.cs
@@ -1,62 +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
-
-}
-
+#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 2508661..0663d1d 100644
--- a/ThirdParty/SmartThreadPool/STPPerformanceCounter.cs
+++ b/ThirdParty/SmartThreadPool/STPPerformanceCounter.cs
@@ -1,448 +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 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);
-    }
-#if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
-
-    internal enum STPPerformanceCounterType
-	{
-		// Fields
-		ActiveThreads				= 0,
-		InUseThreads				= 1,
-		OverheadThreads				= 2,
-		OverheadThreadsPercent		= 3,
-		OverheadThreadsPercentBase	= 4,
-
-		WorkItems					= 5,
-		WorkItemsInQueue			= 6,
-		WorkItemsProcessed			= 7,
-
-		WorkItemsQueuedPerSecond	= 8,
-		WorkItemsProcessedPerSecond	= 9,
-
-		AvgWorkItemWaitTime			= 10,
-		AvgWorkItemWaitTimeBase		= 11,
-
-		AvgWorkItemProcessTime		= 12,
-		AvgWorkItemProcessTimeBase	= 13,
-
-		WorkItemsGroups				= 14,
-
-		LastCounter					= 14,
-	}
- 
-
-	/// <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 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)
-        {
-            if (!_isDisposed)
-            {
-                if (disposing)
-                {
-                    Close();
-                }
-            }
-            _isDisposed = true;
-        }
- 
-		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;
-				}
-			}
-		}
- 
-
-		public void Close()
-		{
-			if (null != _pcs)
-			{
-				for (int i = 0; i < _pcs.Length; i++)
-				{
-                    if (null != _pcs[i])
-                    {
-                        _pcs[i].Dispose();
-                    }
-				}
-				_pcs = null;
-			}
-		}
-
-		public void Dispose()
-		{
-            Dispose(true);
-		}
-
-        public virtual void Dispose(bool disposing)
-        {
-            if (!_isDisposed)
-            {
-                if (disposing)
-                {
-                    Close();
-                }
-            }
-            _isDisposed = true;
-        }
- 
-		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 NullSTPInstancePerformanceCounters : ISTPInstancePerformanceCounters, ISTPPerformanceCountersReader
-	{
-		private static readonly NullSTPInstancePerformanceCounters _instance = new NullSTPInstancePerformanceCounters();
-
-		public static NullSTPInstancePerformanceCounters Instance
-		{
-			get { return _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) {}
-        public long InUseThreads
-        {
-            get { return 0; }
-        }
-
-        public long ActiveThreads
-        {
-            get { return 0; }
-        }
-
-        public long WorkItemsQueued
-        {
-            get { return 0; }
-        }
-
-        public long WorkItemsProcessed
-        {
-            get { return 0; }
-        }
-	}
-
-    internal class LocalSTPInstancePerformanceCounters : ISTPInstancePerformanceCounters, ISTPPerformanceCountersReader
-    {
-        public void Close() { }
-        public void Dispose() { }
-
-        private long _activeThreads;
-        private long _inUseThreads;
-        private long _workItemsQueued;
-        private long _workItemsProcessed;
-
-        public long InUseThreads
-        {
-            get { return _inUseThreads; }
-        }
-
-        public long ActiveThreads
-        {
-            get { return _activeThreads; }
-        }
-
-        public long WorkItemsQueued
-        {
-            get { return _workItemsQueued; }
-        }
-
-        public long WorkItemsProcessed
-        {
-            get { return _workItemsProcessed; }
-        }
-
-        public void SampleThreads(long activeThreads, long inUseThreads)
-        {
-            _activeThreads = activeThreads;
-            _inUseThreads = inUseThreads;
-        }
-
-        public void SampleWorkItems(long workItemsQueued, long workItemsProcessed)
-        {
-            _workItemsQueued = workItemsQueued;
-            _workItemsProcessed = workItemsProcessed;
-        }
-
-        public void SampleWorkItemsWaitTime(TimeSpan workItemWaitTime)
-        {
-            // Not supported
-        }
-
-        public void SampleWorkItemsProcessTime(TimeSpan workItemProcessTime)
-        {
-            // Not supported
-        }
-    }
-}
+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 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);
+    }
+#if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+
+    internal enum STPPerformanceCounterType
+	{
+		// Fields
+		ActiveThreads				= 0,
+		InUseThreads				= 1,
+		OverheadThreads				= 2,
+		OverheadThreadsPercent		= 3,
+		OverheadThreadsPercentBase	= 4,
+
+		WorkItems					= 5,
+		WorkItemsInQueue			= 6,
+		WorkItemsProcessed			= 7,
+
+		WorkItemsQueuedPerSecond	= 8,
+		WorkItemsProcessedPerSecond	= 9,
+
+		AvgWorkItemWaitTime			= 10,
+		AvgWorkItemWaitTimeBase		= 11,
+
+		AvgWorkItemProcessTime		= 12,
+		AvgWorkItemProcessTimeBase	= 13,
+
+		WorkItemsGroups				= 14,
+
+		LastCounter					= 14,
+	}
+ 
+
+	/// <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 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)
+        {
+            if (!_isDisposed)
+            {
+                if (disposing)
+                {
+                    Close();
+                }
+            }
+            _isDisposed = true;
+        }
+ 
+		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;
+				}
+			}
+		}
+ 
+
+		public void Close()
+		{
+			if (null != _pcs)
+			{
+				for (int i = 0; i < _pcs.Length; i++)
+				{
+                    if (null != _pcs[i])
+                    {
+                        _pcs[i].Dispose();
+                    }
+				}
+				_pcs = null;
+			}
+		}
+
+		public void Dispose()
+		{
+            Dispose(true);
+		}
+
+        public virtual void Dispose(bool disposing)
+        {
+            if (!_isDisposed)
+            {
+                if (disposing)
+                {
+                    Close();
+                }
+            }
+            _isDisposed = true;
+        }
+ 
+		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 NullSTPInstancePerformanceCounters : ISTPInstancePerformanceCounters, ISTPPerformanceCountersReader
+	{
+		private static readonly NullSTPInstancePerformanceCounters _instance = new NullSTPInstancePerformanceCounters();
+
+		public static NullSTPInstancePerformanceCounters Instance
+		{
+			get { return _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) {}
+        public long InUseThreads
+        {
+            get { return 0; }
+        }
+
+        public long ActiveThreads
+        {
+            get { return 0; }
+        }
+
+        public long WorkItemsQueued
+        {
+            get { return 0; }
+        }
+
+        public long WorkItemsProcessed
+        {
+            get { return 0; }
+        }
+	}
+
+    internal class LocalSTPInstancePerformanceCounters : ISTPInstancePerformanceCounters, ISTPPerformanceCountersReader
+    {
+        public void Close() { }
+        public void Dispose() { }
+
+        private long _activeThreads;
+        private long _inUseThreads;
+        private long _workItemsQueued;
+        private long _workItemsProcessed;
+
+        public long InUseThreads
+        {
+            get { return _inUseThreads; }
+        }
+
+        public long ActiveThreads
+        {
+            get { return _activeThreads; }
+        }
+
+        public long WorkItemsQueued
+        {
+            get { return _workItemsQueued; }
+        }
+
+        public long WorkItemsProcessed
+        {
+            get { return _workItemsProcessed; }
+        }
+
+        public void SampleThreads(long activeThreads, long inUseThreads)
+        {
+            _activeThreads = activeThreads;
+            _inUseThreads = inUseThreads;
+        }
+
+        public void SampleWorkItems(long workItemsQueued, long workItemsProcessed)
+        {
+            _workItemsQueued = workItemsQueued;
+            _workItemsProcessed = workItemsProcessed;
+        }
+
+        public void SampleWorkItemsWaitTime(TimeSpan workItemWaitTime)
+        {
+            // Not supported
+        }
+
+        public void SampleWorkItemsProcessTime(TimeSpan workItemProcessTime)
+        {
+            // Not supported
+        }
+    }
+}
diff --git a/ThirdParty/SmartThreadPool/STPStartInfo.cs b/ThirdParty/SmartThreadPool/STPStartInfo.cs
index 2ec8dc6..96fa094 100644
--- a/ThirdParty/SmartThreadPool/STPStartInfo.cs
+++ b/ThirdParty/SmartThreadPool/STPStartInfo.cs
@@ -1,212 +1,212 @@
-using System;
-using System.Threading;
-
-namespace Amib.Threading
-{
-	/// <summary>
-	/// Summary description for STPStartInfo.
-	/// </summary>
-    public class STPStartInfo : WIGStartInfo
-    {
-        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;
-        }
-
-	    public STPStartInfo(STPStartInfo stpStartInfo)
-            : base(stpStartInfo)
-        {
-            _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;
-            _areThreadsBackground = stpStartInfo.AreThreadsBackground;
-#if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
-            _apartmentState = stpStartInfo._apartmentState;
-#endif
-        }
-	  
-	    /// <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;
-            }
-        }
-
-	    /// <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; 
-            }
-	    }
-
-        /// <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; 
-			}
-	    }
-
-        /// <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()
-        {
-            return new STPStartInfo(this) { _readOnly = true };
-        }
-
-#if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
-
-        private ApartmentState _apartmentState = SmartThreadPool.DefaultApartmentState;
-
-        /// <summary>
-        /// Get/Set the apartment state of threads in the thread pool
-        /// </summary>
-        public ApartmentState ApartmentState
-        {
-            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 _maxStackSize; }
-            set
-            {
-                ThrowIfReadOnly();
-                if (value.HasValue && value.Value < 0)
-                {
-                    throw new ArgumentOutOfRangeException("value", "Value must be greater than 0.");
-                }
-                _maxStackSize = value;
-            }
-        }
-#endif
-
-#endif
-    }
-}
+using System;
+using System.Threading;
+
+namespace Amib.Threading
+{
+	/// <summary>
+	/// Summary description for STPStartInfo.
+	/// </summary>
+    public class STPStartInfo : WIGStartInfo
+    {
+        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;
+        }
+
+	    public STPStartInfo(STPStartInfo stpStartInfo)
+            : base(stpStartInfo)
+        {
+            _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;
+            _areThreadsBackground = stpStartInfo.AreThreadsBackground;
+#if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+            _apartmentState = stpStartInfo._apartmentState;
+#endif
+        }
+	  
+	    /// <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;
+            }
+        }
+
+	    /// <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; 
+            }
+	    }
+
+        /// <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; 
+			}
+	    }
+
+        /// <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()
+        {
+            return new STPStartInfo(this) { _readOnly = true };
+        }
+
+#if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+
+        private ApartmentState _apartmentState = SmartThreadPool.DefaultApartmentState;
+
+        /// <summary>
+        /// Get/Set the apartment state of threads in the thread pool
+        /// </summary>
+        public ApartmentState ApartmentState
+        {
+            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 _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
index ba7d73f..d9502bb 100644
--- a/ThirdParty/SmartThreadPool/SmartThreadPool.ThreadEntry.cs
+++ b/ThirdParty/SmartThreadPool/SmartThreadPool.ThreadEntry.cs
@@ -1,60 +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
-    }
+
+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 9256777..a4f4ce5 100644
--- a/ThirdParty/SmartThreadPool/SmartThreadPool.cs
+++ b/ThirdParty/SmartThreadPool/SmartThreadPool.cs
@@ -1,1732 +1,1732 @@
-#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.
-//
-// 26 Dec 2004 - Changes:
-//		- 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. 
-//        The SmartThreadPool.WaitAny() is still limited by the .NET Framework.
-//		- 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
-//
-// 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. 
-//
-// 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
-//
-// 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.
-//
-// 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;
-
-using Amib.Threading.Internal;
-
-namespace Amib.Threading
-{
-	#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 string DefaultThreadPoolName = "SmartThreadPool";
-
-        /// <summary>
-        /// The default Max Stack Size. (SmartThreadPool)
-        /// </summary>
-        public static readonly int? DefaultMaxStackSize = null;
-
-        /// <summary>
-        /// The default fill state with params. (false)
-        /// It is relevant only to QueueWorkItem of Action&lt;...&gt;/Func&lt;...&gt;
-        /// </summary>
-        public const bool DefaultFillStateWithArgs = false;
-
-        /// <summary>
-        /// The default thread backgroundness. (true)
-        /// </summary>
-        public const bool DefaultAreThreadsBackground = true;
-
-#if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
-        /// <summary>
-        /// 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 ApartmentState DefaultApartmentState = ApartmentState.Unknown;
-#endif
-
-		#endregion
-
-        #region Member Variables
-
-		/// <summary>
-		/// Dictionary of all the threads in the thread pool.
-		/// </summary>
-        private readonly SynchronizedDictionary<Thread, ThreadEntry> _workerThreads = new SynchronizedDictionary<Thread, ThreadEntry>();
-
-		/// <summary>
-		/// Queue of work items.
-		/// </summary>
-		private readonly WorkItemsQueue _workItemsQueue = new WorkItemsQueue();
-
-		/// <summary>
-		/// Count the work items handled.
-		/// Used by the performance counter.
-		/// </summary>
-		private int _workItemsProcessed;
-
-		/// <summary>
-		/// Number of threads that currently work (not idle).
-		/// </summary>
-		private int _inUseWorkerThreads;
-
-        /// <summary>
-        /// Stores a copy of the original STPStartInfo.
-        /// It is used to change the MinThread and MaxThreads
-        /// </summary>
-        private STPStartInfo _stpStartInfo;
-
-		/// <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;
-
-		/// <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>
-		/// An event to signal all the threads to quit immediately.
-		/// </summary>
-		//private ManualResetEvent _shuttingDownEvent = new ManualResetEvent(false);
-		private ManualResetEvent _shuttingDownEvent = EventWaitHandleFactory.CreateManualResetEvent(false);
-
-        /// <summary>
-        /// A flag to indicate if the Smart Thread Pool is now suspended.
-        /// </summary>
-        private bool _isSuspended;
-
-		/// <summary>
-		/// A flag to indicate the threads to quit.
-		/// </summary>
-		private bool _shutdown;
-
-		/// <summary>
-		/// Counts the threads created in the pool.
-		/// It is used to name the threads.
-		/// </summary>
-		private int _threadCounter;
-
-		/// <summary>
-		/// Indicate that the SmartThreadPool has been disposed
-		/// </summary>
-		private bool _isDisposed;
-
-		/// <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>
-        /// A common object for all the work items int the STP
-        /// so we can mark them to cancel in O(1)
-        /// </summary>
-        private CanceledWorkItemsGroup _canceledSmartThreadPool = new CanceledWorkItemsGroup();
-
-        /// <summary>
-        /// Windows STP performance counters
-        /// </summary>
-        private ISTPInstancePerformanceCounters _windowsPCs = NullSTPInstancePerformanceCounters.Instance;
-
-        /// <summary>
-        /// Local STP performance counters
-        /// </summary>
-        private ISTPInstancePerformanceCounters _localPCs = NullSTPInstancePerformanceCounters.Instance;
-
-
-#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;
-
-#endif
-
-        /// <summary>
-        /// An event to call after a thread is created, but before 
-        /// it's first use.
-        /// </summary>
-        private event ThreadInitializationHandler _onThreadInitialization;
-
-        /// <summary>
-        /// An event to call when a thread is about to exit, after 
-        /// it is no longer belong to the pool.
-        /// </summary>
-        private event ThreadTerminationHandler _onThreadTermination;
-
-        #endregion
-
-        #region Per thread properties
-
-        /// <summary>
-        /// A reference to the current work item a thread from the thread pool 
-        /// is executing.
-        /// </summary>
-        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()
-		{
-            _stpStartInfo = new STPStartInfo();
-            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="stpStartInfo">A SmartThreadPool configuration that overrides the default behavior</param>
-		public SmartThreadPool(STPStartInfo stpStartInfo)
-		{
-			_stpStartInfo = new STPStartInfo(stpStartInfo);
-			Initialize();
-		}
-
-		private void Initialize()
-		{
-            Name = _stpStartInfo.ThreadPoolName;
-			ValidateSTPStartInfo();
-
-            // _stpStartInfoRW stores a read/write copy of the STPStartInfo.
-            // Actually only MaxWorkerThreads and MinWorkerThreads are overwritten
-
-            _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
-                {
-                    _windowsPCs = new STPInstancePerformanceCounters(_stpStartInfo.PerformanceCounterInstanceName);
-                }
-                catch (Exception e)
-                {
-                    Debug.WriteLine("Unable to create Performance Counters: " + e);
-                    _windowsPCs = NullSTPInstancePerformanceCounters.Instance;
-                }
-            }
-#endif
-
-            if (_stpStartInfo.EnableLocalPerformanceCounters)
-            {
-                _localPCs = new LocalSTPInstancePerformanceCounters();
-            }
-
-		    // If the STP is not started suspended then start the threads.
-            if (!_isSuspended)
-            {
-                StartOptimalNumberOfThreads();
-            }
-		}
-
-		private void StartOptimalNumberOfThreads()
-		{
-			int threadsCount = Math.Max(_workItemsQueue.Count, _stpStartInfo.MinWorkerThreads);
-            threadsCount = Math.Min(threadsCount, _stpStartInfo.MaxWorkerThreads);
-            threadsCount -= _workerThreads.Count;
-            if (threadsCount > 0)
-            {
-                StartThreads(threadsCount);
-            }
-		}
-
-		private void ValidateSTPStartInfo()
-		{
-            if (_stpStartInfo.MinWorkerThreads < 0)
-			{
-				throw new ArgumentOutOfRangeException(
-					"MinWorkerThreads", "MinWorkerThreads cannot be negative");
-			}
-
-            if (_stpStartInfo.MaxWorkerThreads <= 0)
-			{
-				throw new ArgumentOutOfRangeException(
-					"MaxWorkerThreads", "MaxWorkerThreads must be greater than zero");
-			}
-
-            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>
-		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()
-		{
-            int count = Interlocked.Decrement(ref _currentWorkItemsCount);
-            //Trace.WriteLine("WorkItemsCount = " + _currentWorkItemsCount.ToString());
-            if (count == 0)
-            {
-                IsIdle = true;
-                _isIdleWaitHandle.Set();
-            }
-
-            Interlocked.Increment(ref _workItemsProcessed);
-
-            if (!_shutdown)
-            {
-			    // The counter counts even if the work item was cancelled
-			    _windowsPCs.SampleWorkItems(_workItemsQueue.Count, _workItemsProcessed);
-                _localPCs.SampleWorkItems(_workItemsQueue.Count, _workItemsProcessed);
-            }
-
-		}
-
-		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;
-					}
-
-                    // Create a new thread
-
-#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)
-                    {
-                        workerThread.SetApartmentState(_stpStartInfo.ApartmentState);
-                    }
-#endif
-
-#if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
-                    workerThread.Priority = _stpStartInfo.ThreadPriority;
-#endif
-                    workerThread.Start();
-					++_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)
-                    {
-                        lock (_workerThreads.SyncRoot)
-                        {
-                            if (_workerThreads.Count > _stpStartInfo.MaxWorkerThreads)
-                            {
-                                // 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;
-                            }
-                        }
-                    }
-
-					// Wait for a work item, shutdown, or timeout
-					WorkItem workItem = Dequeue();
-
-					// Update the last time this thread was seen alive.
-					// It's good for debugging.
-                    CurrentThreadEntry.IAmAlive();
-
-					// 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
-					{
-						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.
-#if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
-				Thread.ResetAbort();
-#endif
-            }
-			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)
-            {
-                return;
-            }
-
-            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>
-        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>
-        /// Creates a new WorkItemsGroup.
-        /// </summary>
-        /// <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;
-		}
-
-        #region Fire Thread's Events
-
-        private void FireOnThreadInitialization()
-        {
-            if (null != _onThreadInitialization)
-            {
-                foreach (ThreadInitializationHandler tih in _onThreadInitialization.GetInvocationList())
-                {
-                    try
-                    {
-                        tih();
-                    }
-                    catch (Exception e)
-                    {
-                        e.GetHashCode();
-                        Debug.Assert(false);
-                        throw;
-                    }
-                }
-            }
-        }
-
-        private void FireOnThreadTermination()
-        {
-            if (null != _onThreadTermination)
-            {
-                foreach (ThreadTerminationHandler tth in _onThreadTermination.GetInvocationList())
-                {
-                    try
-                    {
-                        tth();
-                    }
-                    catch (Exception e)
-                    {
-                        e.GetHashCode();
-                        Debug.Assert(false);
-                        throw;
-                    }
-                }
-            }
-        }
-
-        #endregion
-
-        /// <summary>
-        /// This event is fired when a thread is created.
-        /// Use it to initialize a thread before the work items use it.
-        /// </summary>
-        public event ThreadInitializationHandler OnThreadInitialization
-        {
-            add { _onThreadInitialization += value; }
-            remove { _onThreadInitialization -= value; }
-        }
-
-        /// <summary>
-        /// This event is fired when a thread is terminating.
-        /// Use it for cleanup.
-        /// </summary>
-        public event ThreadTerminationHandler OnThreadTermination
-        {
-            add { _onThreadTermination += value; }
-            remove { _onThreadTermination -= value; }
-        }
-
-
-        internal void CancelAbortWorkItemsGroup(WorkItemsGroup wig)
-        {
-            foreach (ThreadEntry threadEntry in _workerThreads.Values)
-            {
-                WorkItem workItem = threadEntry.CurrentWorkItem;
-                if (null != workItem &&
-                    workItem.WasQueuedBy(wig) &&
-                    !workItem.IsCanceled)
-                {
-                    threadEntry.CurrentWorkItem.GetWorkItemResult().Cancel(true);
-                }
-            }
-        }
-
-        
-
-		#endregion
-
-		#region Properties
-
-		/// <summary>
-		/// Get/Set the lower limit of threads in the pool.
-		/// </summary>
-		public int MinThreads 
-		{ 
-			get 
-			{
-				ValidateNotDisposed();
-                return _stpStartInfo.MinWorkerThreads; 
-			}
-            set
-            {
-                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; 
-			} 
-
-			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
-        {
-            get
-            {
-                return CurrentThreadEntry.CurrentWorkItem.IsCanceled;
-            }
-        } 
-        
-        /// <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 (IsWorkItemCanceled)
-            {
-                Thread.CurrentThread.Abort();
-            }
-        }
-
-        /// <summary>
-        /// Thread Pool start information (readonly)
-        /// </summary>
-        public STPStartInfo STPStartInfo
-        {
-            get 
-            {
-                return _stpStartInfo.AsReadOnly(); 
-            }
-        }
-
-	    public bool IsShuttingdown
-	    {
-            get { return _shutdown;  }
-	    }
-
-        /// <summary>
-        /// Return the local calculated performance counters
-        /// Available only if STPStartInfo.EnableLocalPerformanceCounters is true.
-        /// </summary>
-        public ISTPPerformanceCountersReader PerformanceCountersReader
-        {
-            get { return (ISTPPerformanceCountersReader)_localPCs; }
-        }
-
-        #endregion
-
-        #region IDisposable Members
-
-        public void Dispose()
-        {
-            if (!_isDisposed)
-            {
-                if (!_shutdown)
-                {
-                    Shutdown();
-                }
-
-                if (null != _shuttingDownEvent)
-                {
-                    _shuttingDownEvent.Close();
-                    _shuttingDownEvent = null;
-                }
-                _workerThreads.Clear();
-                
-                if (null != _isIdleWaitHandle)
-                {
-                    _isIdleWaitHandle.Close();
-                    _isIdleWaitHandle = null;
-                }
-
-                _isDisposed = true;
-            }
-        }
-
-        private void ValidateNotDisposed()
-        {
-            if(_isDisposed)
-            {
-                throw new ObjectDisposedException(GetType().ToString(), "The SmartThreadPool has been shutdown");
-            }
-        }
-        #endregion
-
-        #region WorkItemsGroupBase Overrides
-
-        /// <summary>
-        /// Get/Set the maximum number of work items that execute cocurrency on the thread pool
-        /// </summary>
-        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>
-        /// Get an array with all the state objects of the currently running items.
-        /// The array represents a snap shot and impact performance.
-        /// </summary>
-        public override object[] GetStates()
-        {
-            object[] states = _workItemsQueue.GetStates();
-            return states;
-        }
-
-        /// <summary>
-        /// WorkItemsGroup start information (readonly)
-        /// </summary>
-        public override WIGStartInfo WIGStartInfo
-        {
-            get { return _stpStartInfo.AsReadOnly(); }
-        }
-
-	    /// <summary>
-        /// Start the thread pool if it was started suspended.
-        /// If it is already running, this method is ignored.
-        /// </summary>
-        public override void Start()
-        {
-            if (!_isSuspended)
-            {
-                return;
-            }
-            _isSuspended = false;
-
-            ICollection workItemsGroups = _workItemsGroups.Values;
-            foreach (WorkItemsGroup workItemsGroup in workItemsGroups)
-            {
-                workItemsGroup.OnSTPIsStarting();
-            }
-
-            StartOptimalNumberOfThreads();
-        }
-
-        /// <summary>
-        /// Cancel all work items using thread abortion
-        /// </summary>
-        /// <param name="abortExecution">True to stop work items by raising ThreadAbortException</param>
-        public override void Cancel(bool abortExecution)
-        {
-            _canceledSmartThreadPool.IsCanceled = true;
-            _canceledSmartThreadPool = new CanceledWorkItemsGroup();
-
-            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>
-        /// Wait for the thread pool to be idle
-        /// </summary>
-        public override bool WaitForIdle(int millisecondsTimeout)
-        {
-            ValidateWaitForIdle();
-            return STPEventWaitHandle.WaitOne(_isIdleWaitHandle, millisecondsTimeout, false);
-        }
-
-        /// <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>
-        public override event WorkItemsGroupIdleHandler OnIdle
-        {
-            add
-            {
-                throw new NotImplementedException("This event is not implemented in the SmartThreadPool class. Please create a WorkItemsGroup in order to use this feature.");
-                //_onIdle += value;
-            }
-            remove
-            {
-                throw new NotImplementedException("This event is not implemented in the SmartThreadPool class. Please create a WorkItemsGroup in order to use this feature.");
-                //_onIdle -= value;
-            }
-        }
-
-	    internal override void PreQueueWorkItem()
-        {
-            ValidateNotDisposed();   
-        }
-
-        #endregion
-
-        #region Join, Choice, Pipe, etc.
-
-        /// <summary>
-        /// Executes all actions in parallel.
-        /// Returns when they all finish.
-        /// </summary>
-        /// <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)
-            {
-                workItemsGroup.QueueWorkItem(action);
-            }
-            workItemsGroup.Start();
-            workItemsGroup.WaitForIdle();
-        }
-
-        /// <summary>
-        /// Executes all actions in parallel.
-        /// Returns when they all finish.
-        /// </summary>
-        /// <param name="actions">Actions to execute</param>
-        public void Join(params Action[] actions)
-        {
-            Join((IEnumerable<Action>)actions);
-        }
-
-        private class ChoiceIndex
-        {
-            public int _index = -1;
-        }
-
-        /// <summary>
-        /// Executes all actions in parallel
-        /// Returns when the first one completes
-        /// </summary>
-        /// <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);
-
-            ChoiceIndex choiceIndex = new ChoiceIndex();
-            
-            int i = 0;
-            foreach (Action action in actions)
-            {
-                Action act = action;
-                int value = i;
-                workItemsGroup.QueueWorkItem(() => { act(); Interlocked.CompareExchange(ref choiceIndex._index, value, -1); anActionCompleted.Set(); });
-                ++i;
-            }
-	        workItemsGroup.Start();
-            anActionCompleted.WaitOne();
-
-            return choiceIndex._index;
-        }
-
-        /// <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);
-        }
-
-        /// <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)
-        {
-            WIGStartInfo wigStartInfo = new WIGStartInfo { StartSuspended = true };
-            IWorkItemsGroup workItemsGroup = CreateWorkItemsGroup(1, wigStartInfo);
-            foreach (Action<T> action in actions)
-            {
-                Action<T> act = action;
-                workItemsGroup.QueueWorkItem(() => act(pipeState));
-            }
-            workItemsGroup.Start();
-            workItemsGroup.WaitForIdle();
-        }
-
-        /// <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)
-        {
-            Pipe(pipeState, (IEnumerable<Action<T>>)actions);
-        }
-        #endregion
-	}
-	#endregion
-}
+#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.
+//
+// 26 Dec 2004 - Changes:
+//		- 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. 
+//        The SmartThreadPool.WaitAny() is still limited by the .NET Framework.
+//		- 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
+//
+// 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. 
+//
+// 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
+//
+// 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.
+//
+// 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;
+
+using Amib.Threading.Internal;
+
+namespace Amib.Threading
+{
+	#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 string DefaultThreadPoolName = "SmartThreadPool";
+
+        /// <summary>
+        /// The default Max Stack Size. (SmartThreadPool)
+        /// </summary>
+        public static readonly int? DefaultMaxStackSize = null;
+
+        /// <summary>
+        /// The default fill state with params. (false)
+        /// It is relevant only to QueueWorkItem of Action&lt;...&gt;/Func&lt;...&gt;
+        /// </summary>
+        public const bool DefaultFillStateWithArgs = false;
+
+        /// <summary>
+        /// The default thread backgroundness. (true)
+        /// </summary>
+        public const bool DefaultAreThreadsBackground = true;
+
+#if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+        /// <summary>
+        /// 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 ApartmentState DefaultApartmentState = ApartmentState.Unknown;
+#endif
+
+		#endregion
+
+        #region Member Variables
+
+		/// <summary>
+		/// Dictionary of all the threads in the thread pool.
+		/// </summary>
+        private readonly SynchronizedDictionary<Thread, ThreadEntry> _workerThreads = new SynchronizedDictionary<Thread, ThreadEntry>();
+
+		/// <summary>
+		/// Queue of work items.
+		/// </summary>
+		private readonly WorkItemsQueue _workItemsQueue = new WorkItemsQueue();
+
+		/// <summary>
+		/// Count the work items handled.
+		/// Used by the performance counter.
+		/// </summary>
+		private int _workItemsProcessed;
+
+		/// <summary>
+		/// Number of threads that currently work (not idle).
+		/// </summary>
+		private int _inUseWorkerThreads;
+
+        /// <summary>
+        /// Stores a copy of the original STPStartInfo.
+        /// It is used to change the MinThread and MaxThreads
+        /// </summary>
+        private STPStartInfo _stpStartInfo;
+
+		/// <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;
+
+		/// <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>
+		/// An event to signal all the threads to quit immediately.
+		/// </summary>
+		//private ManualResetEvent _shuttingDownEvent = new ManualResetEvent(false);
+		private ManualResetEvent _shuttingDownEvent = EventWaitHandleFactory.CreateManualResetEvent(false);
+
+        /// <summary>
+        /// A flag to indicate if the Smart Thread Pool is now suspended.
+        /// </summary>
+        private bool _isSuspended;
+
+		/// <summary>
+		/// A flag to indicate the threads to quit.
+		/// </summary>
+		private bool _shutdown;
+
+		/// <summary>
+		/// Counts the threads created in the pool.
+		/// It is used to name the threads.
+		/// </summary>
+		private int _threadCounter;
+
+		/// <summary>
+		/// Indicate that the SmartThreadPool has been disposed
+		/// </summary>
+		private bool _isDisposed;
+
+		/// <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>
+        /// A common object for all the work items int the STP
+        /// so we can mark them to cancel in O(1)
+        /// </summary>
+        private CanceledWorkItemsGroup _canceledSmartThreadPool = new CanceledWorkItemsGroup();
+
+        /// <summary>
+        /// Windows STP performance counters
+        /// </summary>
+        private ISTPInstancePerformanceCounters _windowsPCs = NullSTPInstancePerformanceCounters.Instance;
+
+        /// <summary>
+        /// Local STP performance counters
+        /// </summary>
+        private ISTPInstancePerformanceCounters _localPCs = NullSTPInstancePerformanceCounters.Instance;
+
+
+#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;
+
+#endif
+
+        /// <summary>
+        /// An event to call after a thread is created, but before 
+        /// it's first use.
+        /// </summary>
+        private event ThreadInitializationHandler _onThreadInitialization;
+
+        /// <summary>
+        /// An event to call when a thread is about to exit, after 
+        /// it is no longer belong to the pool.
+        /// </summary>
+        private event ThreadTerminationHandler _onThreadTermination;
+
+        #endregion
+
+        #region Per thread properties
+
+        /// <summary>
+        /// A reference to the current work item a thread from the thread pool 
+        /// is executing.
+        /// </summary>
+        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()
+		{
+            _stpStartInfo = new STPStartInfo();
+            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="stpStartInfo">A SmartThreadPool configuration that overrides the default behavior</param>
+		public SmartThreadPool(STPStartInfo stpStartInfo)
+		{
+			_stpStartInfo = new STPStartInfo(stpStartInfo);
+			Initialize();
+		}
+
+		private void Initialize()
+		{
+            Name = _stpStartInfo.ThreadPoolName;
+			ValidateSTPStartInfo();
+
+            // _stpStartInfoRW stores a read/write copy of the STPStartInfo.
+            // Actually only MaxWorkerThreads and MinWorkerThreads are overwritten
+
+            _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
+                {
+                    _windowsPCs = new STPInstancePerformanceCounters(_stpStartInfo.PerformanceCounterInstanceName);
+                }
+                catch (Exception e)
+                {
+                    Debug.WriteLine("Unable to create Performance Counters: " + e);
+                    _windowsPCs = NullSTPInstancePerformanceCounters.Instance;
+                }
+            }
+#endif
+
+            if (_stpStartInfo.EnableLocalPerformanceCounters)
+            {
+                _localPCs = new LocalSTPInstancePerformanceCounters();
+            }
+
+		    // If the STP is not started suspended then start the threads.
+            if (!_isSuspended)
+            {
+                StartOptimalNumberOfThreads();
+            }
+		}
+
+		private void StartOptimalNumberOfThreads()
+		{
+			int threadsCount = Math.Max(_workItemsQueue.Count, _stpStartInfo.MinWorkerThreads);
+            threadsCount = Math.Min(threadsCount, _stpStartInfo.MaxWorkerThreads);
+            threadsCount -= _workerThreads.Count;
+            if (threadsCount > 0)
+            {
+                StartThreads(threadsCount);
+            }
+		}
+
+		private void ValidateSTPStartInfo()
+		{
+            if (_stpStartInfo.MinWorkerThreads < 0)
+			{
+				throw new ArgumentOutOfRangeException(
+					"MinWorkerThreads", "MinWorkerThreads cannot be negative");
+			}
+
+            if (_stpStartInfo.MaxWorkerThreads <= 0)
+			{
+				throw new ArgumentOutOfRangeException(
+					"MaxWorkerThreads", "MaxWorkerThreads must be greater than zero");
+			}
+
+            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>
+		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()
+		{
+            int count = Interlocked.Decrement(ref _currentWorkItemsCount);
+            //Trace.WriteLine("WorkItemsCount = " + _currentWorkItemsCount.ToString());
+            if (count == 0)
+            {
+                IsIdle = true;
+                _isIdleWaitHandle.Set();
+            }
+
+            Interlocked.Increment(ref _workItemsProcessed);
+
+            if (!_shutdown)
+            {
+			    // The counter counts even if the work item was cancelled
+			    _windowsPCs.SampleWorkItems(_workItemsQueue.Count, _workItemsProcessed);
+                _localPCs.SampleWorkItems(_workItemsQueue.Count, _workItemsProcessed);
+            }
+
+		}
+
+		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;
+					}
+
+                    // Create a new thread
+
+#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)
+                    {
+                        workerThread.SetApartmentState(_stpStartInfo.ApartmentState);
+                    }
+#endif
+
+#if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+                    workerThread.Priority = _stpStartInfo.ThreadPriority;
+#endif
+                    workerThread.Start();
+					++_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)
+                    {
+                        lock (_workerThreads.SyncRoot)
+                        {
+                            if (_workerThreads.Count > _stpStartInfo.MaxWorkerThreads)
+                            {
+                                // 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;
+                            }
+                        }
+                    }
+
+					// Wait for a work item, shutdown, or timeout
+					WorkItem workItem = Dequeue();
+
+					// Update the last time this thread was seen alive.
+					// It's good for debugging.
+                    CurrentThreadEntry.IAmAlive();
+
+					// 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
+					{
+						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.
+#if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+				Thread.ResetAbort();
+#endif
+            }
+			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)
+            {
+                return;
+            }
+
+            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>
+        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>
+        /// Creates a new WorkItemsGroup.
+        /// </summary>
+        /// <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;
+		}
+
+        #region Fire Thread's Events
+
+        private void FireOnThreadInitialization()
+        {
+            if (null != _onThreadInitialization)
+            {
+                foreach (ThreadInitializationHandler tih in _onThreadInitialization.GetInvocationList())
+                {
+                    try
+                    {
+                        tih();
+                    }
+                    catch (Exception e)
+                    {
+                        e.GetHashCode();
+                        Debug.Assert(false);
+                        throw;
+                    }
+                }
+            }
+        }
+
+        private void FireOnThreadTermination()
+        {
+            if (null != _onThreadTermination)
+            {
+                foreach (ThreadTerminationHandler tth in _onThreadTermination.GetInvocationList())
+                {
+                    try
+                    {
+                        tth();
+                    }
+                    catch (Exception e)
+                    {
+                        e.GetHashCode();
+                        Debug.Assert(false);
+                        throw;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// This event is fired when a thread is created.
+        /// Use it to initialize a thread before the work items use it.
+        /// </summary>
+        public event ThreadInitializationHandler OnThreadInitialization
+        {
+            add { _onThreadInitialization += value; }
+            remove { _onThreadInitialization -= value; }
+        }
+
+        /// <summary>
+        /// This event is fired when a thread is terminating.
+        /// Use it for cleanup.
+        /// </summary>
+        public event ThreadTerminationHandler OnThreadTermination
+        {
+            add { _onThreadTermination += value; }
+            remove { _onThreadTermination -= value; }
+        }
+
+
+        internal void CancelAbortWorkItemsGroup(WorkItemsGroup wig)
+        {
+            foreach (ThreadEntry threadEntry in _workerThreads.Values)
+            {
+                WorkItem workItem = threadEntry.CurrentWorkItem;
+                if (null != workItem &&
+                    workItem.WasQueuedBy(wig) &&
+                    !workItem.IsCanceled)
+                {
+                    threadEntry.CurrentWorkItem.GetWorkItemResult().Cancel(true);
+                }
+            }
+        }
+
+        
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Get/Set the lower limit of threads in the pool.
+		/// </summary>
+		public int MinThreads 
+		{ 
+			get 
+			{
+				ValidateNotDisposed();
+                return _stpStartInfo.MinWorkerThreads; 
+			}
+            set
+            {
+                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; 
+			} 
+
+			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
+        {
+            get
+            {
+                return CurrentThreadEntry.CurrentWorkItem.IsCanceled;
+            }
+        } 
+        
+        /// <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 (IsWorkItemCanceled)
+            {
+                Thread.CurrentThread.Abort();
+            }
+        }
+
+        /// <summary>
+        /// Thread Pool start information (readonly)
+        /// </summary>
+        public STPStartInfo STPStartInfo
+        {
+            get 
+            {
+                return _stpStartInfo.AsReadOnly(); 
+            }
+        }
+
+	    public bool IsShuttingdown
+	    {
+            get { return _shutdown;  }
+	    }
+
+        /// <summary>
+        /// Return the local calculated performance counters
+        /// Available only if STPStartInfo.EnableLocalPerformanceCounters is true.
+        /// </summary>
+        public ISTPPerformanceCountersReader PerformanceCountersReader
+        {
+            get { return (ISTPPerformanceCountersReader)_localPCs; }
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            if (!_isDisposed)
+            {
+                if (!_shutdown)
+                {
+                    Shutdown();
+                }
+
+                if (null != _shuttingDownEvent)
+                {
+                    _shuttingDownEvent.Close();
+                    _shuttingDownEvent = null;
+                }
+                _workerThreads.Clear();
+                
+                if (null != _isIdleWaitHandle)
+                {
+                    _isIdleWaitHandle.Close();
+                    _isIdleWaitHandle = null;
+                }
+
+                _isDisposed = true;
+            }
+        }
+
+        private void ValidateNotDisposed()
+        {
+            if(_isDisposed)
+            {
+                throw new ObjectDisposedException(GetType().ToString(), "The SmartThreadPool has been shutdown");
+            }
+        }
+        #endregion
+
+        #region WorkItemsGroupBase Overrides
+
+        /// <summary>
+        /// Get/Set the maximum number of work items that execute cocurrency on the thread pool
+        /// </summary>
+        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>
+        /// Get an array with all the state objects of the currently running items.
+        /// The array represents a snap shot and impact performance.
+        /// </summary>
+        public override object[] GetStates()
+        {
+            object[] states = _workItemsQueue.GetStates();
+            return states;
+        }
+
+        /// <summary>
+        /// WorkItemsGroup start information (readonly)
+        /// </summary>
+        public override WIGStartInfo WIGStartInfo
+        {
+            get { return _stpStartInfo.AsReadOnly(); }
+        }
+
+	    /// <summary>
+        /// Start the thread pool if it was started suspended.
+        /// If it is already running, this method is ignored.
+        /// </summary>
+        public override void Start()
+        {
+            if (!_isSuspended)
+            {
+                return;
+            }
+            _isSuspended = false;
+
+            ICollection workItemsGroups = _workItemsGroups.Values;
+            foreach (WorkItemsGroup workItemsGroup in workItemsGroups)
+            {
+                workItemsGroup.OnSTPIsStarting();
+            }
+
+            StartOptimalNumberOfThreads();
+        }
+
+        /// <summary>
+        /// Cancel all work items using thread abortion
+        /// </summary>
+        /// <param name="abortExecution">True to stop work items by raising ThreadAbortException</param>
+        public override void Cancel(bool abortExecution)
+        {
+            _canceledSmartThreadPool.IsCanceled = true;
+            _canceledSmartThreadPool = new CanceledWorkItemsGroup();
+
+            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>
+        /// Wait for the thread pool to be idle
+        /// </summary>
+        public override bool WaitForIdle(int millisecondsTimeout)
+        {
+            ValidateWaitForIdle();
+            return STPEventWaitHandle.WaitOne(_isIdleWaitHandle, millisecondsTimeout, false);
+        }
+
+        /// <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>
+        public override event WorkItemsGroupIdleHandler OnIdle
+        {
+            add
+            {
+                throw new NotImplementedException("This event is not implemented in the SmartThreadPool class. Please create a WorkItemsGroup in order to use this feature.");
+                //_onIdle += value;
+            }
+            remove
+            {
+                throw new NotImplementedException("This event is not implemented in the SmartThreadPool class. Please create a WorkItemsGroup in order to use this feature.");
+                //_onIdle -= value;
+            }
+        }
+
+	    internal override void PreQueueWorkItem()
+        {
+            ValidateNotDisposed();   
+        }
+
+        #endregion
+
+        #region Join, Choice, Pipe, etc.
+
+        /// <summary>
+        /// Executes all actions in parallel.
+        /// Returns when they all finish.
+        /// </summary>
+        /// <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)
+            {
+                workItemsGroup.QueueWorkItem(action);
+            }
+            workItemsGroup.Start();
+            workItemsGroup.WaitForIdle();
+        }
+
+        /// <summary>
+        /// Executes all actions in parallel.
+        /// Returns when they all finish.
+        /// </summary>
+        /// <param name="actions">Actions to execute</param>
+        public void Join(params Action[] actions)
+        {
+            Join((IEnumerable<Action>)actions);
+        }
+
+        private class ChoiceIndex
+        {
+            public int _index = -1;
+        }
+
+        /// <summary>
+        /// Executes all actions in parallel
+        /// Returns when the first one completes
+        /// </summary>
+        /// <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);
+
+            ChoiceIndex choiceIndex = new ChoiceIndex();
+            
+            int i = 0;
+            foreach (Action action in actions)
+            {
+                Action act = action;
+                int value = i;
+                workItemsGroup.QueueWorkItem(() => { act(); Interlocked.CompareExchange(ref choiceIndex._index, value, -1); anActionCompleted.Set(); });
+                ++i;
+            }
+	        workItemsGroup.Start();
+            anActionCompleted.WaitOne();
+
+            return choiceIndex._index;
+        }
+
+        /// <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);
+        }
+
+        /// <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)
+        {
+            WIGStartInfo wigStartInfo = new WIGStartInfo { StartSuspended = true };
+            IWorkItemsGroup workItemsGroup = CreateWorkItemsGroup(1, wigStartInfo);
+            foreach (Action<T> action in actions)
+            {
+                Action<T> act = action;
+                workItemsGroup.QueueWorkItem(() => act(pipeState));
+            }
+            workItemsGroup.Start();
+            workItemsGroup.WaitForIdle();
+        }
+
+        /// <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)
+        {
+            Pipe(pipeState, (IEnumerable<Action<T>>)actions);
+        }
+        #endregion
+	}
+	#endregion
+}
diff --git a/ThirdParty/SmartThreadPool/SynchronizedDictionary.cs b/ThirdParty/SmartThreadPool/SynchronizedDictionary.cs
index 3532cca..0cce19f 100644
--- a/ThirdParty/SmartThreadPool/SynchronizedDictionary.cs
+++ b/ThirdParty/SmartThreadPool/SynchronizedDictionary.cs
@@ -1,89 +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();
-            }
-        }
-    }
-}
+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 e5ff150..8af195b 100644
--- a/ThirdParty/SmartThreadPool/WIGStartInfo.cs
+++ b/ThirdParty/SmartThreadPool/WIGStartInfo.cs
@@ -1,171 +1,171 @@
-using System;
-
-namespace Amib.Threading
-{
-	/// <summary>
-	/// Summary description for WIGStartInfo.
-	/// </summary>
-	public class WIGStartInfo
-	{
-        private bool _useCallerCallContext;
-        private bool _useCallerHttpContext;
-        private bool _disposeOfStateObjects;
-        private CallToPostExecute _callToPostExecute;
-        private PostExecuteWorkItemCallback _postExecuteWorkItemCallback;
-        private bool _startSuspended;
-        private WorkItemPriority _workItemPriority;
-        private bool _fillStateWithArgs;
-
-        protected bool _readOnly;
-
-	    public WIGStartInfo()
-        {
-	        _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)
-        {
-            _useCallerCallContext = wigStartInfo.UseCallerCallContext;
-            _useCallerHttpContext = wigStartInfo.UseCallerHttpContext;
-            _disposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
-            _callToPostExecute = wigStartInfo.CallToPostExecute;
-            _postExecuteWorkItemCallback = wigStartInfo.PostExecuteWorkItemCallback;
-            _workItemPriority = wigStartInfo.WorkItemPriority;
-            _startSuspended = wigStartInfo.StartSuspended;
-            _fillStateWithArgs = wigStartInfo.FillStateWithArgs;
-        }
-
-        protected void ThrowIfReadOnly()
-        {
-            if (_readOnly)
-            {
-                throw new NotSupportedException("This is a readonly instance and set is not supported");
-            }
-        }
-
-	    /// <summary>
-	    /// Get/Set if to use the caller's security context
-	    /// </summary>
-	    public virtual bool UseCallerCallContext
-	    {
-	        get { return _useCallerCallContext; }
-            set 
-            { 
-                ThrowIfReadOnly();  
-                _useCallerCallContext = value; 
-            }
-	    }
-
-
-	    /// <summary>
-	    /// Get/Set if to use the caller's HTTP context
-	    /// </summary>
-	    public virtual bool UseCallerHttpContext
-	    {
-	        get { return _useCallerHttpContext; }
-            set 
-            { 
-                ThrowIfReadOnly();  
-                _useCallerHttpContext = 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 };
-	    }
-    }
-}
+using System;
+
+namespace Amib.Threading
+{
+	/// <summary>
+	/// Summary description for WIGStartInfo.
+	/// </summary>
+	public class WIGStartInfo
+	{
+        private bool _useCallerCallContext;
+        private bool _useCallerHttpContext;
+        private bool _disposeOfStateObjects;
+        private CallToPostExecute _callToPostExecute;
+        private PostExecuteWorkItemCallback _postExecuteWorkItemCallback;
+        private bool _startSuspended;
+        private WorkItemPriority _workItemPriority;
+        private bool _fillStateWithArgs;
+
+        protected bool _readOnly;
+
+	    public WIGStartInfo()
+        {
+	        _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)
+        {
+            _useCallerCallContext = wigStartInfo.UseCallerCallContext;
+            _useCallerHttpContext = wigStartInfo.UseCallerHttpContext;
+            _disposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
+            _callToPostExecute = wigStartInfo.CallToPostExecute;
+            _postExecuteWorkItemCallback = wigStartInfo.PostExecuteWorkItemCallback;
+            _workItemPriority = wigStartInfo.WorkItemPriority;
+            _startSuspended = wigStartInfo.StartSuspended;
+            _fillStateWithArgs = wigStartInfo.FillStateWithArgs;
+        }
+
+        protected void ThrowIfReadOnly()
+        {
+            if (_readOnly)
+            {
+                throw new NotSupportedException("This is a readonly instance and set is not supported");
+            }
+        }
+
+	    /// <summary>
+	    /// Get/Set if to use the caller's security context
+	    /// </summary>
+	    public virtual bool UseCallerCallContext
+	    {
+	        get { return _useCallerCallContext; }
+            set 
+            { 
+                ThrowIfReadOnly();  
+                _useCallerCallContext = value; 
+            }
+	    }
+
+
+	    /// <summary>
+	    /// Get/Set if to use the caller's HTTP context
+	    /// </summary>
+	    public virtual bool UseCallerHttpContext
+	    {
+	        get { return _useCallerHttpContext; }
+            set 
+            { 
+                ThrowIfReadOnly();  
+                _useCallerHttpContext = 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
index 5745c15..435a14b 100644
--- a/ThirdParty/SmartThreadPool/WorkItem.WorkItemResult.cs
+++ b/ThirdParty/SmartThreadPool/WorkItem.WorkItemResult.cs
@@ -1,190 +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
-
-    }
-}
+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/WorkItemFactory.cs b/ThirdParty/SmartThreadPool/WorkItemFactory.cs
index 2d6601e..16ccd81 100644
--- a/ThirdParty/SmartThreadPool/WorkItemFactory.cs
+++ b/ThirdParty/SmartThreadPool/WorkItemFactory.cs
@@ -1,343 +1,343 @@
-using System;
-
-namespace Amib.Threading.Internal
-{
-	#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>
-		/// <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="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;
-            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,
-            object state)
-        {
-            ValidateCallback(callback);
-            ValidateCallback(workItemInfo.PostExecuteWorkItemCallback);
-
-            WorkItem workItem = new WorkItem(
-                workItemsGroup,
-                new WorkItemInfo(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>
-		/// <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
-}
+using System;
+
+namespace Amib.Threading.Internal
+{
+	#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>
+		/// <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="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;
+            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,
+            object state)
+        {
+            ValidateCallback(callback);
+            ValidateCallback(workItemInfo.PostExecuteWorkItemCallback);
+
+            WorkItem workItem = new WorkItem(
+                workItemsGroup,
+                new WorkItemInfo(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>
+		/// <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 5fbceb8..0d7fc85 100644
--- a/ThirdParty/SmartThreadPool/WorkItemInfo.cs
+++ b/ThirdParty/SmartThreadPool/WorkItemInfo.cs
@@ -1,69 +1,69 @@
-namespace Amib.Threading
-{
-	#region WorkItemInfo class
-
-	/// <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(WorkItemInfo workItemInfo)
-		{
-			UseCallerCallContext = workItemInfo.UseCallerCallContext;
-			UseCallerHttpContext = workItemInfo.UseCallerHttpContext;
-			DisposeOfStateObjects = workItemInfo.DisposeOfStateObjects;
-			CallToPostExecute = workItemInfo.CallToPostExecute;
-			PostExecuteWorkItemCallback = workItemInfo.PostExecuteWorkItemCallback;
-			WorkItemPriority = workItemInfo.WorkItemPriority;
-            Timeout = workItemInfo.Timeout;
-		}
-
-	    /// <summary>
-	    /// Get/Set if to use the caller's security context
-	    /// </summary>
-	    public bool UseCallerCallContext { get; set; }
-
-	    /// <summary>
-	    /// Get/Set if to use the caller's HTTP context
-	    /// </summary>
-	    public bool UseCallerHttpContext { get; set; }
-
-	    /// <summary>
-	    /// Get/Set if to dispose of the state object of a work item
-	    /// </summary>
-	    public bool DisposeOfStateObjects { get; set; }
-
-	    /// <summary>
-	    /// Get/Set the run the post execute options
-	    /// </summary>
-        public CallToPostExecute CallToPostExecute { get; set; }
-
-	    /// <summary>
-	    /// Get/Set the post execute callback
-	    /// </summary>
-        public PostExecuteWorkItemCallback PostExecuteWorkItemCallback { get; set; }
-
-	    /// <summary>
-	    /// Get/Set the work item's priority
-	    /// </summary>
-	    public WorkItemPriority WorkItemPriority { get; set; }
-
-	    /// <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
-}
+namespace Amib.Threading
+{
+	#region WorkItemInfo class
+
+	/// <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(WorkItemInfo workItemInfo)
+		{
+			UseCallerCallContext = workItemInfo.UseCallerCallContext;
+			UseCallerHttpContext = workItemInfo.UseCallerHttpContext;
+			DisposeOfStateObjects = workItemInfo.DisposeOfStateObjects;
+			CallToPostExecute = workItemInfo.CallToPostExecute;
+			PostExecuteWorkItemCallback = workItemInfo.PostExecuteWorkItemCallback;
+			WorkItemPriority = workItemInfo.WorkItemPriority;
+            Timeout = workItemInfo.Timeout;
+		}
+
+	    /// <summary>
+	    /// Get/Set if to use the caller's security context
+	    /// </summary>
+	    public bool UseCallerCallContext { get; set; }
+
+	    /// <summary>
+	    /// Get/Set if to use the caller's HTTP context
+	    /// </summary>
+	    public bool UseCallerHttpContext { get; set; }
+
+	    /// <summary>
+	    /// Get/Set if to dispose of the state object of a work item
+	    /// </summary>
+	    public bool DisposeOfStateObjects { get; set; }
+
+	    /// <summary>
+	    /// Get/Set the run the post execute options
+	    /// </summary>
+        public CallToPostExecute CallToPostExecute { get; set; }
+
+	    /// <summary>
+	    /// Get/Set the post execute callback
+	    /// </summary>
+        public PostExecuteWorkItemCallback PostExecuteWorkItemCallback { get; set; }
+
+	    /// <summary>
+	    /// Get/Set the work item's priority
+	    /// </summary>
+	    public WorkItemPriority WorkItemPriority { get; set; }
+
+	    /// <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
+}
diff --git a/ThirdParty/SmartThreadPool/WorkItemResultTWrapper.cs b/ThirdParty/SmartThreadPool/WorkItemResultTWrapper.cs
index a0bf8b8..d1eff95 100644
--- a/ThirdParty/SmartThreadPool/WorkItemResultTWrapper.cs
+++ b/ThirdParty/SmartThreadPool/WorkItemResultTWrapper.cs
@@ -1,128 +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
-
-}
+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 67dcbdd..d9d34ac 100644
--- a/ThirdParty/SmartThreadPool/WorkItemsGroup.cs
+++ b/ThirdParty/SmartThreadPool/WorkItemsGroup.cs
@@ -1,361 +1,361 @@
-using System;
-using System.Threading;
-using System.Runtime.CompilerServices;
-using System.Diagnostics;
-
-namespace Amib.Threading.Internal
-{
-
-	#region WorkItemsGroup class 
-
-	/// <summary>
-	/// Summary description for WorkItemsGroup.
-	/// </summary>
-	public class WorkItemsGroup : WorkItemsGroupBase
-	{
-		#region Private members
-
-		private readonly object _lock = new object();
-
-		/// <summary>
-		/// A reference to the SmartThreadPool instance that created this 
-		/// WorkItemsGroup.
-		/// </summary>
-		private readonly SmartThreadPool _stp;
-
-		/// <summary>
-		/// The OnIdle event
-		/// </summary>
-		private event WorkItemsGroupIdleHandler _onIdle;
-
-        /// <summary>
-        /// A flag to indicate if the Work Items Group is now suspended.
-        /// </summary>
-        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
-        {
-            get { return _concurrency; }
-            set
-            {
-                Debug.Assert(value > 0);
-
-                int diff = value - _concurrency;
-                _concurrency = value;
-                if (diff > 0)
-                {
-                    EnqueueToSTPNextNWorkItem(diff);
-                }
-            }
-        }
-
-        public override int WaitingCallbacks
-        {
-            get { return _workItemsQueue.Count; }
-        }
-
-        public override object[] GetStates()
-        {
-            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>
-        /// WorkItemsGroup start information
-        /// </summary>
-        public override WIGStartInfo WIGStartInfo
-        {
-            get { return _workItemsGroupStartInfo; }
-        }
-
-	    /// <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 override bool WaitForIdle(int millisecondsTimeout)
-        {
-            SmartThreadPool.ValidateWorkItemsGroupWaitForIdle(this);
-            return STPEventWaitHandle.WaitOne(_isIdleWaitHandle, millisecondsTimeout, false);
-        }
-
-	    public override event WorkItemsGroupIdleHandler OnIdle
-		{
-			add { _onIdle += value; }
-			remove { _onIdle -= value; }
-		}
-
-	    #endregion 
-
-		#region Private methods
-
-	    private void RegisterToWorkItemCompletion(IWorkItemResult wir)
-		{
-			IInternalWorkItemResult iwir = (IInternalWorkItemResult)wir;
-			iwir.OnWorkItemStarted += OnWorkItemStartedCallback;
-			iwir.OnWorkItemCompleted += OnWorkItemCompletedCallback;
-		}
-
-	    public void OnSTPIsStarting()
-		{
-            if (_isSuspended)
-            {
-                return;
-            }
-			
-            EnqueueToSTPNextNWorkItem(_concurrency);
-		}
-
-	    public void EnqueueToSTPNextNWorkItem(int count)
-        {
-            for (int i = 0; i < count; ++i)
-            {
-                EnqueueToSTPNextWorkItem(null, false);
-            }
-        }
-
-		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);
-        }
-
-	    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);
-                        IsIdle = true;
-                        _isIdleWaitHandle.Set();
-                        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
-}
+using System;
+using System.Threading;
+using System.Runtime.CompilerServices;
+using System.Diagnostics;
+
+namespace Amib.Threading.Internal
+{
+
+	#region WorkItemsGroup class 
+
+	/// <summary>
+	/// Summary description for WorkItemsGroup.
+	/// </summary>
+	public class WorkItemsGroup : WorkItemsGroupBase
+	{
+		#region Private members
+
+		private readonly object _lock = new object();
+
+		/// <summary>
+		/// A reference to the SmartThreadPool instance that created this 
+		/// WorkItemsGroup.
+		/// </summary>
+		private readonly SmartThreadPool _stp;
+
+		/// <summary>
+		/// The OnIdle event
+		/// </summary>
+		private event WorkItemsGroupIdleHandler _onIdle;
+
+        /// <summary>
+        /// A flag to indicate if the Work Items Group is now suspended.
+        /// </summary>
+        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
+        {
+            get { return _concurrency; }
+            set
+            {
+                Debug.Assert(value > 0);
+
+                int diff = value - _concurrency;
+                _concurrency = value;
+                if (diff > 0)
+                {
+                    EnqueueToSTPNextNWorkItem(diff);
+                }
+            }
+        }
+
+        public override int WaitingCallbacks
+        {
+            get { return _workItemsQueue.Count; }
+        }
+
+        public override object[] GetStates()
+        {
+            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>
+        /// WorkItemsGroup start information
+        /// </summary>
+        public override WIGStartInfo WIGStartInfo
+        {
+            get { return _workItemsGroupStartInfo; }
+        }
+
+	    /// <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 override bool WaitForIdle(int millisecondsTimeout)
+        {
+            SmartThreadPool.ValidateWorkItemsGroupWaitForIdle(this);
+            return STPEventWaitHandle.WaitOne(_isIdleWaitHandle, millisecondsTimeout, false);
+        }
+
+	    public override event WorkItemsGroupIdleHandler OnIdle
+		{
+			add { _onIdle += value; }
+			remove { _onIdle -= value; }
+		}
+
+	    #endregion 
+
+		#region Private methods
+
+	    private void RegisterToWorkItemCompletion(IWorkItemResult wir)
+		{
+			IInternalWorkItemResult iwir = (IInternalWorkItemResult)wir;
+			iwir.OnWorkItemStarted += OnWorkItemStartedCallback;
+			iwir.OnWorkItemCompleted += OnWorkItemCompletedCallback;
+		}
+
+	    public void OnSTPIsStarting()
+		{
+            if (_isSuspended)
+            {
+                return;
+            }
+			
+            EnqueueToSTPNextNWorkItem(_concurrency);
+		}
+
+	    public void EnqueueToSTPNextNWorkItem(int count)
+        {
+            for (int i = 0; i < count; ++i)
+            {
+                EnqueueToSTPNextWorkItem(null, false);
+            }
+        }
+
+		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);
+        }
+
+	    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);
+                        IsIdle = true;
+                        _isIdleWaitHandle.Set();
+                        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
+}
diff --git a/ThirdParty/SmartThreadPool/WorkItemsGroupBase.cs b/ThirdParty/SmartThreadPool/WorkItemsGroupBase.cs
index 429de12..27fae5e 100644
--- a/ThirdParty/SmartThreadPool/WorkItemsGroupBase.cs
+++ b/ThirdParty/SmartThreadPool/WorkItemsGroupBase.cs
@@ -1,471 +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
-    }
+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 156a131..e0bc916 100644
--- a/ThirdParty/SmartThreadPool/WorkItemsQueue.cs
+++ b/ThirdParty/SmartThreadPool/WorkItemsQueue.cs
@@ -1,645 +1,645 @@
-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 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;
-
-
-#if (WINDOWS_PHONE) 
-        private static readonly Dictionary<int, WaiterEntry> _waiterEntries = new Dictionary<int, WaiterEntry>();
-#elif (_WINDOWS_CE)
-        private static LocalDataStoreSlot _waiterEntrySlot = Thread.AllocateDataSlot();
-#else
-
-        [ThreadStatic]
-        private static WaiterEntry _waiterEntry;
-#endif
-
-
-        /// <summary>
-        /// Each thread in the thread pool keeps its own waiter entry.
-        /// </summary>
-        private static WaiterEntry CurrentWaiterEntry
-        {
-#if (WINDOWS_PHONE) 
-            get
-            {
-                lock (_waiterEntries)
-                {
-                    WaiterEntry waiterEntry;
-                    if (_waiterEntries.TryGetValue(Thread.CurrentThread.ManagedThreadId, out waiterEntry))
-                    {
-                        return waiterEntry;
-                    }
-                }
-                return null;
-            }
-            set
-            {
-                lock (_waiterEntries)
-                {
-                    _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
-
-		#region Public properties
-
-        /// <summary>
-        /// Returns the current number of work items in the queue
-        /// </summary>
-		public int Count
-		{
-			get
-			{
-                return _workItems.Count;
-			}
-		}
-
-		/// <summary>
-		/// Returns the current number of waiters
-		/// </summary>
-		public int WaitersCount
-		{
-			get
-			{
-				return _waitersCount;
-			}
-		}
-
-
-        #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)
-                {
-                    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);
-				}
-			}
-            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 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.
-                if (_workItems.Count > 0)
-                {
-                    workItem = _workItems.Dequeue() as WorkItem;
-                    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>
-        private void Cleanup()
-        {
-            lock(this)
-            {
-                // Deactivate only once
-                if (!_isWorkItemsQueueActive)
-                {
-                    return;
-                }
-
-                // Don't queue more work items
-                _isWorkItemsQueueActive = false;
-
-                foreach(WorkItem workItem in _workItems)
-                {
-                    workItem.DisposeOfState();
-                }
-
-                // Clear the work items that are already queued
-                _workItems.Clear();
-
-                // Note: 
-                // I don't iterate over the queue and dispose of work items's states, 
-                // since if a work item has a state object that is still in use in the 
-                // application then I must not dispose it.
-
-                // 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();
-				}
-            }
-        }
-
-        public object[] GetStates()
-        {
-            lock (this)
-            {
-                object[] states = new object[_workItems.Count];
-                int i = 0;
-                foreach (WorkItem workItem in _workItems)
-                {
-                    states[i] = workItem.GetWorkItemResult().State;
-                    ++i;
-                }
-                return states;
-            }
-        }
-
-		#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 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 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
-				{
-					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)
-                {
-                    if (!_isDisposed)
-                    {
-                        Close();
-                    }
-                    _isDisposed = true;
-                }
-            }
-
-			#endregion
-		}
-
-		#endregion
-
-        #region IDisposable Members
-
-        public void Dispose()
-        {
-            if (!_isDisposed)
-            {
-                Cleanup();
-            }
-            _isDisposed = true;
-        }
-
-        private void ValidateNotDisposed()
-        {
-            if(_isDisposed)
-            {
-                throw new ObjectDisposedException(GetType().ToString(), "The SmartThreadPool has been shutdown");
-            }
-        }
-
-        #endregion
-    }
-
-	#endregion
-}
-
+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 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;
+
+
+#if (WINDOWS_PHONE) 
+        private static readonly Dictionary<int, WaiterEntry> _waiterEntries = new Dictionary<int, WaiterEntry>();
+#elif (_WINDOWS_CE)
+        private static LocalDataStoreSlot _waiterEntrySlot = Thread.AllocateDataSlot();
+#else
+
+        [ThreadStatic]
+        private static WaiterEntry _waiterEntry;
+#endif
+
+
+        /// <summary>
+        /// Each thread in the thread pool keeps its own waiter entry.
+        /// </summary>
+        private static WaiterEntry CurrentWaiterEntry
+        {
+#if (WINDOWS_PHONE) 
+            get
+            {
+                lock (_waiterEntries)
+                {
+                    WaiterEntry waiterEntry;
+                    if (_waiterEntries.TryGetValue(Thread.CurrentThread.ManagedThreadId, out waiterEntry))
+                    {
+                        return waiterEntry;
+                    }
+                }
+                return null;
+            }
+            set
+            {
+                lock (_waiterEntries)
+                {
+                    _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
+
+		#region Public properties
+
+        /// <summary>
+        /// Returns the current number of work items in the queue
+        /// </summary>
+		public int Count
+		{
+			get
+			{
+                return _workItems.Count;
+			}
+		}
+
+		/// <summary>
+		/// Returns the current number of waiters
+		/// </summary>
+		public int WaitersCount
+		{
+			get
+			{
+				return _waitersCount;
+			}
+		}
+
+
+        #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)
+                {
+                    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);
+				}
+			}
+            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 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.
+                if (_workItems.Count > 0)
+                {
+                    workItem = _workItems.Dequeue() as WorkItem;
+                    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>
+        private void Cleanup()
+        {
+            lock(this)
+            {
+                // Deactivate only once
+                if (!_isWorkItemsQueueActive)
+                {
+                    return;
+                }
+
+                // Don't queue more work items
+                _isWorkItemsQueueActive = false;
+
+                foreach(WorkItem workItem in _workItems)
+                {
+                    workItem.DisposeOfState();
+                }
+
+                // Clear the work items that are already queued
+                _workItems.Clear();
+
+                // Note: 
+                // I don't iterate over the queue and dispose of work items's states, 
+                // since if a work item has a state object that is still in use in the 
+                // application then I must not dispose it.
+
+                // 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();
+				}
+            }
+        }
+
+        public object[] GetStates()
+        {
+            lock (this)
+            {
+                object[] states = new object[_workItems.Count];
+                int i = 0;
+                foreach (WorkItem workItem in _workItems)
+                {
+                    states[i] = workItem.GetWorkItemResult().State;
+                    ++i;
+                }
+                return states;
+            }
+        }
+
+		#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 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 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
+				{
+					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)
+                {
+                    if (!_isDisposed)
+                    {
+                        Close();
+                    }
+                    _isDisposed = true;
+                }
+            }
+
+			#endregion
+		}
+
+		#endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            if (!_isDisposed)
+            {
+                Cleanup();
+            }
+            _isDisposed = true;
+        }
+
+        private void ValidateNotDisposed()
+        {
+            if(_isDisposed)
+            {
+                throw new ObjectDisposedException(GetType().ToString(), "The SmartThreadPool has been shutdown");
+            }
+        }
+
+        #endregion
+    }
+
+	#endregion
+}
+
-- 
cgit v1.1


From e3d9d5566a799fdbb4261010b97b8b04dbd7da1e Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Wed, 1 May 2013 18:46:57 -0400
Subject: Fix inventory issue

  Fix issue where objects rezzed from Trash or Lost And Found then be placed back in the respective folder when taking the object or a copy back into inventory.
---
 .../CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index eb37626..e6d6cbf 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -671,6 +671,12 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     {
                         InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID);
                         folder = m_Scene.InventoryService.GetFolder(f);
+
+                        if(folder.Type == 14 || folder.Type == 16)
+                        {
+                            // folder.Type = 6;
+                            folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object);
+                        }
                     }
                 }
 
-- 
cgit v1.1


From 0378baed350b846132b2f501c74bd39a2675e41d Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 1 May 2013 17:15:54 -0700
Subject: BulletSim: rework LinksetCompound to work with new BSShape system.
 Not all working yet.

---
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     | 146 ++++++---------------
 1 file changed, 40 insertions(+), 106 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index e3ce7fb..20eb871 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -35,6 +35,7 @@ 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.
@@ -88,17 +89,15 @@ sealed class BSLinksetCompoundInfo : BSLinksetInfo
         return buff.ToString();
     }
 };
+     */
 
 public sealed class BSLinksetCompound : BSLinkset
 {
     private static string LogHeader = "[BULLETSIM LINKSET COMPOUND]";
 
-    private BSShape LinksetShape;
-
     public BSLinksetCompound(BSScene scene, BSPrimLinkable parent)
         : base(scene, parent)
     {
-        LinksetShape = new BSShapeNull();
     }
 
     // When physical properties are changed the linkset needs to recalculate
@@ -143,25 +142,11 @@ public sealed class BSLinksetCompound : BSLinkset
             // The root is going dynamic. Rebuild the linkset so parts and mass get computed properly.
             ScheduleRebuild(LinksetRoot);
         }
-
-        // The origional prims are removed from the world as the shape of the root compound
-        //     shape takes over.
-        m_physicsScene.PE.AddToCollisionFlags(child.PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
-        m_physicsScene.PE.ForceActivationState(child.PhysBody, ActivationState.DISABLE_SIMULATION);
-        // We don't want collisions from the old linkset children.
-        m_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)
     {
@@ -169,19 +154,9 @@ public sealed class BSLinksetCompound : BSLinkset
         DetailLog("{0},BSLinksetCompound.MakeStatic,call,IsRoot={1}", child.LocalID, IsRoot(child));
         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.
-            m_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.
-            m_physicsScene.PE.Activate(child.PhysBody, false);
-            ret = true;
-        }
         return ret;
     }
 
@@ -283,9 +258,6 @@ public sealed class BSLinksetCompound : BSLinkset
 
         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;
         }
 
@@ -296,50 +268,6 @@ public sealed class BSLinksetCompound : BSLinkset
         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.
@@ -372,7 +300,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);
 
@@ -399,26 +326,27 @@ public sealed class BSLinksetCompound : BSLinkset
     private bool disableCOM = true; // For basic linkset debugging, turn off the center-of-mass setting
     private void RecomputeLinksetCompound()
     {
-        if (!LinksetRoot.IsPhysicallyActive)
-        {
-            // There is no reason to build all this physical stuff for a non-physical linkset
-            DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,notPhysical", LinksetRoot.LocalID);
-            return;
-        }
-
         try
         {
-            // This replaces the physical shape of the root prim with a compound shape made up of the root
-            // shape and all the children.
+            Rebuilding = true;
+
+            // 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.
+            LinksetRoot.ForceBodyShapeRebuild(true);
 
-            // RootPrim.PhysShape is the shape of the root prim.
-            // Here we build the compound shape made up of all the children.
+            // There is no reason to build all this physical stuff for a non-physical linkset.
+            if (!LinksetRoot.IsPhysicallyActive)
+            {
+                // Clean up any old linkset shape and make sure the root shape is set to the root object.
+                DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,notPhysical", LinksetRoot.LocalID);
 
-            // Free up any shape we'd previously built.
-            LinksetShape.Dereference(m_physicsScene);
+                return; // Note the 'finally' clause at the botton which will get executed.
+            }
 
             // Get a new compound shape to build the linkset shape in.
-            LinksetShape = BSShapeCompound.GetReference(m_physicsScene);
+            BSShape linksetShape = BSShapeCompound.GetReference(m_physicsScene);
 
             // 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.
@@ -445,35 +373,41 @@ public sealed class BSLinksetCompound : BSLinkset
             int memberIndex = 1;
             ForEachMember(delegate(BSPrimLinkable cPrim)
             {
-                if (IsRoot(cPrim))
-                {
-                    cPrim.LinksetChildIndex = 0;
-                }
-                else
-                {
-                    cPrim.LinksetChildIndex = memberIndex;
-                }
+                // Root shape is always index zero.
+                cPrim.LinksetChildIndex = IsRoot(cPrim) ? 0 : memberIndex;
 
+                // Get a reference to the shape of the child and add that shape to the linkset compound shape
                 BSShape childShape = cPrim.PhysShape.GetReference(m_physicsScene, cPrim);
                 OMV.Vector3 offsetPos = (cPrim.RawPosition - LinksetRoot.RawPosition) * invRootOrientation - centerDisplacement;
                 OMV.Quaternion offsetRot = cPrim.RawOrientation * invRootOrientation;
-                m_physicsScene.PE.AddChildShapeToCompoundShape(LinksetShape.physShapeInfo, childShape.physShapeInfo, offsetPos, offsetRot);
-                DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addChild,indx={1}cShape={2},offPos={3},offRot={4}",
+                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, memberIndex, cPrim.PhysShape, 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;
+                }
+
                 memberIndex++;
 
                 return false;   // 'false' says to move onto the next child in the list
             });
 
-            // Sneak the built compound shape in as the shape of the root prim.
-            // Note this doesn't touch the root prim's PhysShape so be sure the manage the difference.
+            // 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.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);
+                                        LinksetRoot.LocalID, LinksetRoot.PhysBody, linksetShape);
 
             // With all of the linkset packed into the root prim, it has the mass of everyone.
             LinksetMass = ComputeLinksetMass();
@@ -494,7 +428,7 @@ public sealed class BSLinksetCompound : BSLinkset
         }
 
         // See that the Aabb surrounds the new shape
-        m_physicsScene.PE.RecalculateCompoundShapeLocalAabb(LinksetShape.physShapeInfo);
+        m_physicsScene.PE.RecalculateCompoundShapeLocalAabb(LinksetRoot.PhysShape.physShapeInfo);
     }
 }
 }
\ No newline at end of file
-- 
cgit v1.1


From ed46b42feae4659653ba54a9290dddede6f24f2e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 1 May 2013 17:16:46 -0700
Subject: BulletSim: fix crash when mesh asset wasn't available when meshing
 the first time. Debugging added for mesh/hull asset fetch.

---
 .../Physics/BulletSPlugin/BSShapeCollection.cs     |  1 +
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs   | 28 ++++++++++++++--------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index 19855da..a4250be 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -132,6 +132,7 @@ public sealed class BSShapeCollection : IDisposable
         PrimitiveBaseShape pbs = prim.BaseShape;
 
         // Kludge to create the capsule for the avatar.
+        // TDOD: Remove/redo this when BSShapeAvatar is working!!
         BSCharacter theChar = prim as BSCharacter;
         if (theChar != null)
         {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 3faa484..2962249 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -164,6 +164,8 @@ public abstract class BSShape
             prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
             physicsScene.Logger.WarnFormat("{0} Fetched asset would not mesh. {1}, texture={2}",
                                             LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
+            physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,setFailed,objNam={1},tex={2}",
+                                            prim.LocalID, prim.PhysObjectName, prim.BaseShape.SculptTexture);
         }
         else
         {
@@ -174,29 +176,33 @@ public abstract class BSShape
                 && prim.BaseShape.SculptTexture != OMV.UUID.Zero
                 )
             {
-                physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,fetchAsset", prim.LocalID);
+                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;
+                                        yprim.BaseShape.SculptData = (byte[])asset.Data.Clone();
                                         // 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;
                                     }
@@ -205,11 +211,11 @@ public abstract class BSShape
                                         mismatchIDs = yprim.BaseShape.SculptTexture.ToString() + "/" + asset.ID;
                                     }
                                 }
-                                if (assetFound)
-                                    yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Fetched;
-                                else
+                                if (!assetFound)
+                                {
                                     yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
-                                physicsScene.DetailLog("{0},BSShape,fetchAssetCallback,found={1},isSculpt={2},ids={3}",
+                                }
+                                physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,fetchAssetCallback,found={1},isSculpt={2},ids={3}",
                                             yprim.LocalID, assetFound, yprim.BaseShape.SculptEntry, mismatchIDs );
                             });
                         }
@@ -227,6 +233,8 @@ public abstract class BSShape
                 {
                     physicsScene.Logger.WarnFormat("{0} Mesh failed to fetch asset. obj={1}, texture={2}",
                                                 LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
+                    physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,wasFailed,objNam={1},tex={2}",
+                                                prim.LocalID, prim.PhysObjectName, prim.BaseShape.SculptTexture);
                 }
             }
          }
@@ -359,7 +367,7 @@ public class BSShapeMesh : BSShape
 
                 // Check to see if mesh was created (might require an asset).
                 newShape = VerifyMeshCreated(physicsScene, newShape, prim);
-                if (newShape.shapeType == BSPhysicsShapeType.SHAPE_MESH)
+                if (!newShape.isNativeShape)
                 {
                     // If a mesh was what was created, remember the built shape for later sharing.
                     Meshes.Add(newMeshKey, retMesh);
@@ -408,7 +416,7 @@ public class BSShapeMesh : BSShape
     private BulletShape CreatePhysicalMesh(BSScene physicsScene, BSPhysObject prim, System.UInt64 newMeshKey,
                                             PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
     {
-        BulletShape newShape = null;
+        BulletShape newShape = new BulletShape();
 
         IMesh meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod,
                                         false,  // say it is not physical so a bounding box is not built
@@ -507,7 +515,7 @@ public class BSShapeHull : BSShape
 
                 // Check to see if hull was created (might require an asset).
                 newShape = VerifyMeshCreated(physicsScene, newShape, prim);
-                if (newShape.shapeType == BSPhysicsShapeType.SHAPE_HULL)
+                if (!newShape.isNativeShape)
                 {
                     // If a mesh was what was created, remember the built shape for later sharing.
                     Hulls.Add(newHullKey, retHull);
@@ -731,7 +739,7 @@ public class BSShapeCompound : BSShape
     {
         lock (physShapeInfo)
         {
-            Dereference(physicsScene);
+            this.DecrementReference();
             if (referenceCount <= 0)
             {
                 if (!physicsScene.PE.IsCompound(physShapeInfo))
-- 
cgit v1.1


From 4cb73192a78f0c8d15c2eb052c7c632bb678ce5f Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Wed, 1 May 2013 23:01:33 -0400
Subject: Make default config directory "."

---
 bin/Robust.HG.ini.example | 2 +-
 bin/Robust.ini.example    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index d74f205..fee2a87 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -35,7 +35,7 @@
   ; 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"
+  ConfigDirectory = "."
 
 [ServiceList]
 
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index b7b2524..2d5aa8c 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -27,7 +27,7 @@
   ; 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"
+  ConfigDirectory = "."
 
 [ServiceList]
 AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"
-- 
cgit v1.1


From d9c3947824feccd3522c70a72b75c72a84bab3e0 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 2 May 2013 10:06:12 -0700
Subject: BulletSim: Rebuild physical body if physical shape changes for mesh
 and hull. Properly rebuilds collision caches. Release asset data fetched when
 building mesh or hulls.

---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs |  1 +
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     |  2 +-
 .../Physics/BulletSPlugin/BSShapeCollection.cs     | 35 +++++++++++--
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs   | 59 +++++++++++++++-------
 4 files changed, 73 insertions(+), 24 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index f535e50..b9bd909 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -596,6 +596,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         public override void Refresh()
         {
             // If asking for a refresh, reset the physical parameters before the next simulation step.
+            // 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();
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 7e2af78..3d68d7f 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -767,7 +767,7 @@ public class BSPrim : BSPhysObject
         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;
         }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index a4250be..809435d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -227,16 +227,41 @@ public sealed class BSShapeCollection : IDisposable
         if (prim.IsPhysical && BSParam.ShouldUseHullsForPhysicalObjects)
         {
             // Update prim.BSShape to reference a hull of this shape.
-            DereferenceExistingShape(prim, shapeCallback);
-            prim.PhysShape = BSShapeMesh.GetReference(m_physicsScene, false /*forceRebuild*/, prim);
+            BSShape potentialHull = BSShapeHull.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
+                        || potentialHull.ShapeType != prim.PhysShape.ShapeType
+                        || potentialHull.physShapeInfo.shapeKey != prim.PhysShape.physShapeInfo.shapeKey)
+            {
+                DereferenceExistingShape(prim, shapeCallback);
+                prim.PhysShape = potentialHull;
+                ret = true;
+            }
+            else
+            {
+                potentialHull.Dereference(m_physicsScene);
+            }
             if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,hull,shape={1},key={2}",
                                     prim.LocalID, prim.PhysShape, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"));
         }
         else
         {
             // Update prim.BSShape to reference a mesh of this shape.
-            DereferenceExistingShape(prim, shapeCallback);
-            prim.PhysShape = BSShapeHull.GetReference(m_physicsScene, false /*forceRebuild*/, prim);
+            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)
+            {
+                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},key={2}",
                                     prim.LocalID, prim.PhysShape, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"));
         }
@@ -320,7 +345,7 @@ public sealed class BSShapeCollection : IDisposable
             if (prim.IsSolid)
             {
                 aBody = m_physicsScene.PE.CreateBodyFromShape(sim, prim.PhysShape.physShapeInfo, prim.LocalID, prim.RawPosition, prim.RawOrientation);
-                if (DDetail) DetailLog("{0},BSShapeCollection.CreateBody,mesh,body={1}", prim.LocalID, aBody);
+                if (DDetail) DetailLog("{0},BSShapeCollection.CreateBody,rigid,body={1}", prim.LocalID, aBody);
             }
             else
             {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 2962249..3346626 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -115,10 +115,15 @@ public abstract class BSShape
     public override string ToString()
     {
         StringBuilder buff = new StringBuilder();
-        buff.Append("<t=");
-        buff.Append(ShapeType.ToString());
-        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(">");
@@ -184,21 +189,21 @@ public abstract class BSShape
                 BSPhysObject xprim = prim;
                 Util.FireAndForget(delegate
                     {
-                        physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,inFireAndForget", xprim.LocalID);
+                        // 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);
+                                // 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 = (byte[])asset.Data.Clone();
+                                        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.
@@ -290,7 +295,7 @@ public class BSShapeNative : BSShape
         {
             if (physShapeInfo.HasPhysicalShape)
             {
-                physicsScene.DetailLog("{0},BSShapeNative.DereferenceShape,deleteNativeShape,shape={1}", BSScene.DetailLogZero, this);
+                physicsScene.DetailLog("{0},BSShapeNative.Dereference,deleteNativeShape,shape={1}", BSScene.DetailLogZero, this);
                 physicsScene.PE.DeleteCollisionShape(physicsScene.World, physShapeInfo);
             }
             physShapeInfo.Clear();
@@ -347,9 +352,8 @@ public class BSShapeMesh : BSShape
         float lod;
         System.UInt64 newMeshKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
 
-        physicsScene.DetailLog("{0},BSShapeMesh,getReference,oldKey={1},newKey={2},size={3},lod={4}",
-                                prim.LocalID, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"),
-                                newMeshKey.ToString("X"), prim.Size, lod);
+        physicsScene.DetailLog("{0},BSShapeMesh,getReference,newKey={1},size={2},lod={3}",
+                                prim.LocalID, newMeshKey.ToString("X"), prim.Size, lod);
 
         BSShapeMesh retMesh = null;
         lock (Meshes)
@@ -389,6 +393,7 @@ public class BSShapeMesh : BSShape
         lock (Meshes)
         {
             this.DecrementReference();
+            physicsScene.DetailLog("{0},BSShapeMesh.Dereference,shape={1}", BSScene.DetailLogZero, this);
             // TODO: schedule aging and destruction of unused meshes.
         }
     }
@@ -425,6 +430,12 @@ public class BSShapeMesh : BSShape
 
         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;
@@ -462,8 +473,8 @@ public class BSShapeMesh : BSShape
                     }
                 }
             }
-            physicsScene.DetailLog("{0},BSShapeMesh.CreatePhysicalMesh,origTri={1},realTri={2},numVerts={3}",
-                        BSScene.DetailLogZero, indices.Length / 3, realIndicesIndex / 3, verticesAsFloats.Length / 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)
             {
@@ -496,8 +507,8 @@ public class BSShapeHull : BSShape
         float lod;
         System.UInt64 newHullKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
 
-        physicsScene.DetailLog("{0},BSShapeHull,getReference,oldKey={1},newKey={2},size={3},lod={4}",
-                                prim.LocalID, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"), newHullKey.ToString("X"), prim.Size, lod);
+        physicsScene.DetailLog("{0},BSShapeHull,getReference,newKey={1},size={2},lod={3}",
+                                prim.LocalID, newHullKey.ToString("X"), prim.Size, lod);
 
         BSShapeHull retHull = null;
         lock (Hulls)
@@ -537,6 +548,7 @@ public class BSShapeHull : BSShape
         lock (Hulls)
         {
             this.DecrementReference();
+            physicsScene.DetailLog("{0},BSShapeHull.Dereference,shape={1}", BSScene.DetailLogZero, this);
             // TODO: schedule aging and destruction of unused meshes.
         }
     }
@@ -549,6 +561,8 @@ public class BSShapeHull : BSShape
 
         if (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,shouldUseBulletHACD,entry", prim.LocalID);
             BSShape meshShape = BSShapeMesh.GetReference(physicsScene, true, prim);
 
@@ -568,18 +582,26 @@ public class BSShapeHull : BSShape
                 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,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
+
+                // Now done with the mesh shape.
+                meshShape.Dereference(physicsScene);
             }
-            // Now done with the mesh shape.
-            meshShape.Dereference(physicsScene);
             physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,shouldUseBulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
         }
         if (!newShape.HasPhysicalShape)
         {
-            // Build a new hull in the physical world.
+            // Build a new hull in the physical world using the C# HACD algorigthm.
             // Pass true for physicalness as this prevents the creation of bounding box which is not needed
             IMesh meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */);
             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();
                 List<OMV.Vector3> vertices = meshData.getVertexList();
 
@@ -740,6 +762,7 @@ public class BSShapeCompound : BSShape
         lock (physShapeInfo)
         {
             this.DecrementReference();
+            physicsScene.DetailLog("{0},BSShapeCompound.Dereference,shape={1}", BSScene.DetailLogZero, this);
             if (referenceCount <= 0)
             {
                 if (!physicsScene.PE.IsCompound(physShapeInfo))
-- 
cgit v1.1


From 4042c82a7293c40955a14d04d9e5ae05d35ef7cf Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 2 May 2013 12:27:30 -0700
Subject: BulletSim: prims with no cuts created with single convex hull shape.
 Parameter added to enable/disable this feature.

---
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs    |  5 ++
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs    |  3 +
 .../Physics/BulletSPlugin/BSShapeCollection.cs     | 19 +++++-
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs   | 74 ++++++++++++++++++++++
 4 files changed, 99 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 5ebeace..2ac68e3 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -87,6 +87,7 @@ public static class BSParam
     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 float TerrainImplementation { get; private set; }
     public static int TerrainMeshMagnification { get; private set; }
@@ -342,6 +343,10 @@ public static class BSParam
             false,
             (s) => { return ShouldUseBulletHACD; },
             (s,v) => { ShouldUseBulletHACD = v; } ),
+        new ParameterDefn<bool>("ShouldUseSingleConvexHullForPrims", "If true, use a single convex hull shape for physical prims",
+            true,
+            (s) => { return ShouldUseSingleConvexHullForPrims; },
+            (s,v) => { ShouldUseSingleConvexHullForPrims = v; } ),
 
         new ParameterDefn<int>("CrossingFailuresBeforeOutOfBounds", "How forgiving we are about getting into adjactent regions",
             5,
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 8e05b58..a4a8794 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -316,7 +316,10 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
                 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);
                 BSParam.ShouldUseBulletHACD = false;
+                BSParam.ShouldUseSingleConvexHullForPrims = false;
                 break;
         }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index 809435d..794857c 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -226,8 +226,23 @@ 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.
-            BSShape potentialHull = BSShapeHull.GetReference(m_physicsScene, false /*forceRebuild*/, prim);
+            // Use a simple, single mesh convex hull shape if the object is simple enough
+            BSShape potentialHull = null;
+
+            PrimitiveBaseShape pbs = prim.BaseShape;
+            if (BSParam.ShouldUseSingleConvexHullForPrims
+                && pbs != null
+                && !pbs.SculptEntry
+                && PrimHasNoCuts(pbs)
+                )
+            {
+                potentialHull = BSShapeConvexHull.GetReference(m_physicsScene, false /* forceRebuild */, prim);
+            }
+            else
+            {
+                potentialHull = BSShapeHull.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
                         || potentialHull.ShapeType != prim.PhysShape.ShapeType
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 3346626..9ef2923 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -832,6 +832,80 @@ public class BSShapeCompound : BSShape
 }
 
 // ============================================================================================================
+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},BSShapeMesh,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.
+        }
+    }
+}
+
+// ============================================================================================================
 public class BSShapeAvatar : BSShape
 {
     private static string LogHeader = "[BULLETSIM SHAPE AVATAR]";
-- 
cgit v1.1


From 304c5d4a8b8a1137bac18f7f6443ea85cec86184 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 3 May 2013 18:48:50 +0100
Subject: On startup, start scenes after we're set up all local scenes, rather
 than starting scenes before others have been created.

This aims to avoid a race condition where scenes could look to inform neighbours that they were up before those neighbours had been created.
http://opensimulator.org/mantis/view.php?id=6618
---
 .../LoadRegions/LoadRegionsPlugin.cs               | 23 ++++++++++++++--------
 .../RemoteController/RemoteAdminPlugin.cs          |  1 +
 OpenSim/Framework/IScene.cs                        |  7 ++++++-
 OpenSim/Region/Application/OpenSimBase.cs          |  4 +---
 OpenSim/Region/Framework/Scenes/Scene.cs           | 16 +++++++++++++--
 OpenSim/Region/Framework/Scenes/SceneBase.cs       |  4 ++++
 6 files changed, 41 insertions(+), 14 deletions(-)

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 d19b8b6..355f7b3 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -700,6 +700,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.
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/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index d86eefe..f9e0cf1 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -425,9 +425,6 @@ namespace OpenSim
 
             mscene = scene;
 
-            scene.Start();
-            scene.StartScripts();
-
             return clientServers;
         }
 
@@ -751,6 +748,7 @@ namespace OpenSim
             ShutdownClientServer(whichRegion);
             IScene scene;
             CreateRegion(whichRegion, true, out scene);
+            scene.Start();
         }
 
         # region Setup methods
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 829a7e9..4f674a3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -389,10 +389,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;
                 }
             }
@@ -1331,10 +1333,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;
 
@@ -1353,6 +1363,8 @@ namespace OpenSim.Region.Framework.Scenes
             m_heartbeatThread
                 = Watchdog.StartThread(
                     Heartbeat, string.Format("Heartbeat ({0})", RegionInfo.RegionName), ThreadPriority.Normal, false, false);
+
+            StartScripts();
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index d3e968e..d2097ea 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -561,6 +561,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
-- 
cgit v1.1


From 5d93c99e8cf188b29b4c5265619eb4a4d3eeacf6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 3 May 2013 18:56:58 +0100
Subject: Fix possible race condition with local region cache if a region was
 added after startup.

---
 .../Grid/LocalGridServiceConnector.cs              | 43 ++++++++++++++--------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index c0c2ca7..c32820e 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -142,10 +142,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 +156,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 +197,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;
+                    }
                 }
             }
 
@@ -245,12 +255,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());
-- 
cgit v1.1


From 5d25bb3084937d266375cba61b3a2c802bd57717 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 3 May 2013 14:23:53 -0700
Subject: BulletSim: zero vehicle motion when changing vehicle type. Rebuild
 compound linkset of any child in the linkset changes shape. Comments and
 better detailed logging messages.

---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs       |  6 +++---
 .../Region/Physics/BulletSPlugin/BSLinksetCompound.cs    | 16 +++++-----------
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs           |  2 +-
 OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs   |  4 ++++
 .../Region/Physics/BulletSPlugin/BSShapeCollection.cs    |  7 +++----
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs         |  9 ++-------
 6 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index b9bd909..c5bee6d 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -559,9 +559,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                     break;
             }
 
-            // Update any physical parameters based on this type.
-            Refresh();
-
             m_linearMotor = new BSVMotor("LinearMotor", m_linearMotorTimescale,
                                 m_linearMotorDecayTimescale, m_linearFrictionTimescale,
                                 1f);
@@ -589,6 +586,9 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             {
                 RegisterForSceneEvents();
             }
+
+            // Update any physical parameters based on this type.
+            Refresh();
         }
         #endregion // Vehicle parameter setting
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 20eb871..1f16cc8 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -246,7 +246,8 @@ 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 RemoveDependencies(BSPrimLinkable child)
@@ -256,14 +257,7 @@ public sealed class BSLinksetCompound : BSLinkset
         DetailLog("{0},BSLinksetCompound.RemoveBodyDependencies,refreshIfChild,rID={1},rBody={2},isRoot={3}",
                         child.LocalID, LinksetRoot.LocalID, LinksetRoot.PhysBody, IsRoot(child));
 
-        if (!IsRoot(child))
-        {
-            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;
     }
@@ -322,7 +316,7 @@ 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 UseBulletSimRootOffsetHack = false;
+    private bool UseBulletSimRootOffsetHack = false;    // Attempt to have Bullet track the coords of root compound shape
     private bool disableCOM = true; // For basic linkset debugging, turn off the center-of-mass setting
     private void RecomputeLinksetCompound()
     {
@@ -382,7 +376,7 @@ public sealed class BSLinksetCompound : BSLinkset
                 OMV.Quaternion offsetRot = cPrim.RawOrientation * invRootOrientation;
                 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, memberIndex, cPrim.PhysShape, offsetPos, offsetRot);
+                                    LinksetRoot.LocalID, memberIndex, childShape, offsetPos, offsetRot);
 
                 // Since we are borrowing the shape of the child, disable the origional child body
                 if (!IsRoot(cPrim))
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 3d68d7f..d3f3475 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -511,7 +511,7 @@ public class BSPrim : BSPhysObject
 
             PhysScene.TaintedObject("setVehicleType", delegate()
             {
-                // Vehicle code changes the parameters for this vehicle type.
+                ZeroMotion(true /* inTaintTime */);
                 VehicleActor.ProcessTypeChange(type);
                 ActivateIfPhysical(false);
             });
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 5236909..235da78 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -182,6 +182,10 @@ public class BSPrimLinkable : BSPrimDisplaced
         {
             return false;
         }
+
+        // TODO: handle collisions of other objects with with children of linkset.
+        //    This is a problem for LinksetCompound since the children are packed into the root.
+
         return base.Collide(collidingWith, collidee, contactPoint, contactNormal, pentrationDepth);
     }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index 794857c..64aaa15 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -254,10 +254,10 @@ public sealed class BSShapeCollection : IDisposable
             }
             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},key={2}",
-                                    prim.LocalID, prim.PhysShape, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"));
+            if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,hull,shape={1}", prim.LocalID, prim.PhysShape);
         }
         else
         {
@@ -277,8 +277,7 @@ public sealed class BSShapeCollection : IDisposable
                 // 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},key={2}",
-                                    prim.LocalID, prim.PhysShape, prim.PhysShape.physShapeInfo.shapeKey.ToString("X"));
+            if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,mesh,shape={1}", prim.LocalID, prim.PhysShape);
         }
         return ret;
     }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 9ef2923..3e4ee5a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -352,9 +352,6 @@ public class BSShapeMesh : BSShape
         float lod;
         System.UInt64 newMeshKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
 
-        physicsScene.DetailLog("{0},BSShapeMesh,getReference,newKey={1},size={2},lod={3}",
-                                prim.LocalID, newMeshKey.ToString("X"), prim.Size, lod);
-
         BSShapeMesh retMesh = null;
         lock (Meshes)
         {
@@ -380,6 +377,7 @@ public class BSShapeMesh : BSShape
                 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)
@@ -507,9 +505,6 @@ public class BSShapeHull : BSShape
         float lod;
         System.UInt64 newHullKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
 
-        physicsScene.DetailLog("{0},BSShapeHull,getReference,newKey={1},size={2},lod={3}",
-                                prim.LocalID, newHullKey.ToString("X"), prim.Size, lod);
-
         BSShapeHull retHull = null;
         lock (Hulls)
         {
@@ -531,10 +526,10 @@ public class BSShapeHull : BSShape
                     // 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)
-- 
cgit v1.1


From ad00466483c0bcdb5d05759130f35870c6a7a177 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 6 May 2013 09:17:54 -0700
Subject: Minor reordering of operations on NewUserConnection. The agent
 circuit needs to be added earlier for some of the checks to work correctly.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 69fe137..ff7e5ed 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3687,14 +3687,21 @@ namespace OpenSim.Region.Framework.Scenes
                     sp.ControllingClient.Close(true);
                     sp = null;
                 }
-    
+
+                // 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.
+                agent.teleportFlags = teleportFlags;
+                m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
+
                 land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
     
-                //On login test land permisions
+                // On login test land permisions
                 if (vialogin)
                 {
                     if (land != null && !TestLandRestrictions(agent, land, out reason))
                     {
+                        m_authenticateHandler.RemoveCircuit(agent.circuitcode);
                         return false;
                     }
                 }
@@ -3706,13 +3713,17 @@ namespace OpenSim.Region.Framework.Scenes
                         try
                         {
                             if (!VerifyUserPresence(agent, out reason))
+                            {
+                                m_authenticateHandler.RemoveCircuit(agent.circuitcode);
                                 return false;
+                            }
                         }
                         catch (Exception e)
                         {
                             m_log.ErrorFormat(
                                 "[SCENE]: Exception verifying presence {0}{1}", e.Message, e.StackTrace);
 
+                            m_authenticateHandler.RemoveCircuit(agent.circuitcode);
                             return false;
                         }
                     }
@@ -3720,13 +3731,17 @@ namespace OpenSim.Region.Framework.Scenes
                     try
                     {
                         if (!AuthorizeUser(agent, out reason))
+                        {
+                            m_authenticateHandler.RemoveCircuit(agent.circuitcode);
                             return false;
+                        }
                     }
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
                             "[SCENE]: Exception authorizing user {0}{1}", e.Message, e.StackTrace);
 
+                        m_authenticateHandler.RemoveCircuit(agent.circuitcode);
                         return false;
                     }
     
@@ -3761,9 +3776,6 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
-            // 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);
 
             if (vialogin)
             {
-- 
cgit v1.1


From 90f03ccd42a045bb30f33ed866feb38677ed7780 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 6 May 2013 11:47:55 -0700
Subject: Added new method to Remote Admin for reloading the estate settings.
 This is meant to be called when some other program has changed the data on
 the backend.

---
 .../RemoteController/RemoteAdminPlugin.cs               | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 355f7b3..ad683b8 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -157,6 +157,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);
 
                     // Either enable full remote functionality or just selected features
                     string enabledMethods = m_config.GetString("enabled_methods", "all");
@@ -1762,6 +1763,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;
-- 
cgit v1.1


From f9fb1484aa00f8bfadead06ce71d004502fb564e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 3 May 2013 15:46:35 -0700
Subject: BulletSim: extend BSActorLockAxis to allow locking linear movement in
 addition to angular movement. Not enabled by anything yet.

---
 .../Physics/BulletSPlugin/BSActorLockAxis.cs       | 25 +++++++++++++++++-----
 .../Region/Physics/BulletSPlugin/BSPhysObject.cs   |  9 +++++---
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     |  4 ++--
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
index 7801d8e..8b0fdeb 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
@@ -64,9 +64,9 @@ public class BSActorLockAxis : BSActor
     public override void Refresh()
     {
         m_physicsScene.DetailLog("{0},BSActorLockAxis,refresh,lockedAxis={1},enabled={2},pActive={3}",
-                                    m_controllingPrim.LocalID, m_controllingPrim.LockedAxis, Enabled, m_controllingPrim.IsPhysicallyActive);
+                                    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.LockedAxis == m_controllingPrim.LockedAxisFree)
+        if (m_controllingPrim.LockedAngularAxis == m_controllingPrim.LockedAxisFree)
         {
             Enabled = false;
         }
@@ -123,23 +123,38 @@ public class BSActorLockAxis : BSActor
             // 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.LockedAxis.X != 1f)
+            if (m_controllingPrim.LockedAngularAxis.X != BSPhysObject.FreeAxis)
             {
                 angularLow.X = 0f;
                 angularHigh.X = 0f;
             }
-            if (m_controllingPrim.LockedAxis.Y != 1f)
+            if (m_controllingPrim.LockedAngularAxis.Y != BSPhysObject.FreeAxis)
             {
                 angularLow.Y = 0f;
                 angularHigh.Y = 0f;
             }
-            if (m_controllingPrim.LockedAxis.Z != 1f)
+            if (m_controllingPrim.LockedAngularAxis.Z != BSPhysObject.FreeAxis)
             {
                 angularLow.Z = 0f;
                 angularHigh.Z = 0f;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index e796804..cca887a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -108,7 +108,8 @@ public abstract class BSPhysObject : PhysicsActor
         CollisionScore = 0;
 
         // All axis free.
-        LockedAxis = LockedAxisFree;
+        LockedLinearAxis = LockedAxisFree;
+        LockedAngularAxis = LockedAxisFree;
     }
 
     // Tell the object to clean up.
@@ -265,8 +266,10 @@ public abstract class BSPhysObject : PhysicsActor
     // 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 LockedAxis { get; set; } // zero means locked. one means free.
-    public readonly OMV.Vector3 LockedAxisFree = new OMV.Vector3(1f, 1f, 1f);  // All axis are free
+    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.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index d3f3475..f5b0361 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -256,9 +256,9 @@ public class BSPrim : BSPhysObject
         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;
 
-        EnableActor(LockedAxis != LockedAxisFree, LockedAxisActorName, delegate()
+        EnableActor(LockedAngularAxis != LockedAxisFree, LockedAxisActorName, delegate()
         {
             return new BSActorLockAxis(PhysScene, this, LockedAxisActorName);
         });
-- 
cgit v1.1


From bf318969836bf38dbd0325f24fa3d1bd12f34d77 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 3 May 2013 17:14:31 -0700
Subject: BulletSim: simplify parameter specification by reducing the number of
 specifications required for simple properties with defaults.

---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs |   2 +-
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs    | 283 +++++++--------------
 2 files changed, 94 insertions(+), 191 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index c5bee6d..0dd2aa5 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             enableAngularVerticalAttraction = true;
             enableAngularDeflection = false;
             enableAngularBanking = true;
-            if (BSParam.VehicleDebuggingEnabled)
+            if (BSParam.VehicleDebuggingEnable)
             {
                 enableAngularVerticalAttraction = true;
                 enableAngularDeflection = false;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 2ac68e3..3ca7e16 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;
@@ -144,7 +145,7 @@ public static class BSParam
     public static Vector3 VehicleAngularFactor { 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 VehicleDebuggingEnable { get; private set; }
 
     // Convex Hulls
     public static int CSHullMaxDepthSplit { get; private set; }
@@ -236,17 +237,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
-         * TODO: Maybe use reflection and the name of the variable to create a reference for the getter/setter.
-        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);
@@ -336,26 +361,16 @@ 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,
-            (s) => { return ShouldUseBulletHACD; },
-            (s,v) => { ShouldUseBulletHACD = v; } ),
+            false ),
         new ParameterDefn<bool>("ShouldUseSingleConvexHullForPrims", "If true, use a single convex hull shape for physical prims",
-            true,
-            (s) => { return ShouldUseSingleConvexHullForPrims; },
-            (s,v) => { ShouldUseSingleConvexHullForPrims = v; } ),
+            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,
@@ -422,18 +437,12 @@ public static class BSParam
             (s,v) => { MaxAddForceMagnitude = v; MaxAddForceMagnitudeSquared = v * v; } ),
         // Density is passed around as 100kg/m3. This scales that to 1kg/m3.
         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,
@@ -500,94 +509,50 @@ 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; } ),
+            1.3f ),
         new ParameterDefn<float>("AvatarDensity", "Density of an avatar. Changed on avatar recreation.",
-            3.5f,
-            (s) => { return AvatarDensity; },
-            (s,v) => { AvatarDensity = v; } ),
+            3.5f) ,
         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>("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<float>("AvatarStepHeight", "Height of a step obstacle to consider step correction",
-            0.6f,
-            (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",
-            1.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,
-            (s) => { return AvatarStepUpCorrectionFactor; },
-            (s,v) => { AvatarStepUpCorrectionFactor = v; } ),
+            1.0f ),
 	    new ParameterDefn<int>("AvatarStepSmoothingSteps", "Number of frames after a step collision that we continue walking up stairs",
-            2,
-            (s) => { return AvatarStepSmoothingSteps; },
-            (s,v) => { AvatarStepSmoothingSteps = v; } ),
+            2 ),
 
         new ParameterDefn<float>("VehicleMaxLinearVelocity", "Maximum velocity magnitude that can be assigned to a vehicle",
             1000.0f,
@@ -598,37 +563,21 @@ 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<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; } ),
+            60.0f ),
         new ParameterDefn<bool>("VehicleDebuggingEnable", "Turn on/off vehicle debugging",
-            false,
-            (s) => { return VehicleDebuggingEnabled; },
-            (s,v) => { VehicleDebuggingEnabled = v; } ),
+            false ),
 
 	    new ParameterDefn<float>("MaxPersistantManifoldPoolSize", "Number of manifolds pooled (0 means default of 4096)",
             0f,
@@ -673,99 +622,53 @@ 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.",
-            0f,
-            (s) => { return CSHullMaxSkinWidth; },
-            (s,v) => { CSHullMaxSkinWidth = v; } ),
+            0f ),
 
 	    new ParameterDefn<float>("BHullMaxVerticesPerHull", "Bullet impl: max number of vertices per created hull",
-            100f,
-            (s) => { return BHullMaxVerticesPerHull; },
-            (s,v) => { BHullMaxVerticesPerHull = v; } ),
+            100f ),
 	    new ParameterDefn<float>("BHullMinClusters", "Bullet impl: minimum number of hulls to create per mesh",
-            2f,
-            (s) => { return BHullMinClusters; },
-            (s,v) => { BHullMinClusters = v; } ),
+            2f ),
 	    new ParameterDefn<float>("BHullCompacityWeight", "Bullet impl: weight factor for how compact to make hulls",
-            2f,
-            (s) => { return BHullCompacityWeight; },
-            (s,v) => { BHullCompacityWeight = v; } ),
+            0.1f ),
 	    new ParameterDefn<float>("BHullVolumeWeight", "Bullet impl: weight factor for volume in created hull",
-            0.1f,
-            (s) => { return BHullVolumeWeight; },
-            (s,v) => { BHullVolumeWeight = v; } ),
+            0f ),
 	    new ParameterDefn<float>("BHullConcavity", "Bullet impl: weight factor for how convex a created hull can be",
-            100f,
-            (s) => { return BHullConcavity; },
-            (s,v) => { BHullConcavity = v; } ),
+            100f ),
 	    new ParameterDefn<bool>("BHullAddExtraDistPoints", "Bullet impl: whether to add extra vertices for long distance vectors",
-            false,
-            (s) => { return BHullAddExtraDistPoints; },
-            (s,v) => { BHullAddExtraDistPoints = v; } ),
+            false ),
 	    new ParameterDefn<bool>("BHullAddNeighboursDistPoints", "Bullet impl: whether to add extra vertices between neighbor hulls",
-            false,
-            (s) => { return BHullAddNeighboursDistPoints; },
-            (s,v) => { BHullAddNeighboursDistPoints = v; } ),
+            false ),
 	    new ParameterDefn<bool>("BHullAddFacesPoints", "Bullet impl: whether to add extra vertices to break up hull faces",
-            false,
-            (s) => { return BHullAddFacesPoints; },
-            (s,v) => { BHullAddFacesPoints = v; } ),
+            false ),
 	    new ParameterDefn<bool>("BHullShouldAdjustCollisionMargin", "Bullet impl: whether to shrink resulting hulls to account for collision margin",
-            false,
-            (s) => { return BHullShouldAdjustCollisionMargin; },
-            (s,v) => { BHullShouldAdjustCollisionMargin = v; } ),
+            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>("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,
-- 
cgit v1.1


From 045aaa838ac0a6e129ff1d8ec65053508df1d51a Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 6 May 2013 13:29:19 -0700
Subject: BulletSim: remove friction calcuation from BSMotor and move linear
 and angular friction computation into linear and angular movement code. The
 friction wasn't being applied properly. This will make it so vehicles don't
 drift as much and the drift is tunable by changing the friction timescales.

---
 .../Physics/BulletSPlugin/BSActorAvatarMove.cs     |  1 -
 .../Region/Physics/BulletSPlugin/BSActorHover.cs   |  1 -
 .../Physics/BulletSPlugin/BSActorMoveToTarget.cs   |  1 -
 .../Physics/BulletSPlugin/BSActorSetForce.cs       |  2 +-
 .../Physics/BulletSPlugin/BSActorSetTorque.cs      |  2 +-
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 44 ++++++++++-----
 OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs   | 63 +++++-----------------
 7 files changed, 47 insertions(+), 67 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
index 4e067b5..ac8c30c 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -118,7 +118,6 @@ public class BSActorAvatarMove : BSActor
             m_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.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
index 3630ca8..8a79809 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
@@ -102,7 +102,6 @@ public class BSActorHover : BSActor
             m_hoverMotor = new BSFMotor("BSActorHover",
                                         m_controllingPrim.HoverTau,               // timeScale
                                         BSMotor.Infinite,           // decay time scale
-                                        BSMotor.Infinite,           // friction timescale
                                         1f                          // efficiency
             );
             m_hoverMotor.SetTarget(ComputeCurrentHoverHeight());
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
index 1b598fd..75ff24e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
@@ -105,7 +105,6 @@ public class BSActorMoveToTarget : BSActor
             m_targetMotor = new BSVMotor("BSActorMoveToTargget.Activate",
                                         m_controllingPrim.MoveToTargetTau,                    // timeScale
                                         BSMotor.Infinite,           // decay time scale
-                                        BSMotor.InfiniteVector,     // friction timescale
                                         1f                          // efficiency
             );
             m_targetMotor.PhysicsScene = m_physicsScene; // DEBUG DEBUG so motor will output detail log messages.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
index c0f40fd..96fa0b6 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
@@ -101,7 +101,7 @@ public class BSActorSetForce : BSActor
         if (m_forceMotor == null)
         {
             // A fake motor that might be used someday
-            m_forceMotor = new BSFMotor("setForce", 1f, 1f, 1f, 1f);
+            m_forceMotor = new BSFMotor("setForce", 1f, 1f, 1f);
 
             m_physicsScene.BeforeStep += Mover;
         }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
index b3806e1..65098e1 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
@@ -101,7 +101,7 @@ public class BSActorSetTorque : BSActor
         if (m_torqueMotor == null)
         {
             // A fake motor that might be used someday
-            m_torqueMotor = new BSFMotor("setTorque", 1f, 1f, 1f, 1f);
+            m_torqueMotor = new BSFMotor("setTorque", 1f, 1f, 1f);
 
             m_physicsScene.BeforeStep += Mover;
         }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 0dd2aa5..272a162 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -235,7 +235,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);
@@ -244,7 +243,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);
@@ -265,7 +263,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             {
                 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
@@ -278,7 +275,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);
@@ -559,14 +555,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                     break;
             }
 
-            m_linearMotor = new BSVMotor("LinearMotor", m_linearMotorTimescale,
-                                m_linearMotorDecayTimescale, m_linearFrictionTimescale,
-                                1f);
+            m_linearMotor = new BSVMotor("LinearMotor", m_linearMotorTimescale, m_linearMotorDecayTimescale, 1f);
             m_linearMotor.PhysicsScene = m_physicsScene;  // DEBUG DEBUG DEBUG (enables detail logging)
 
-            m_angularMotor = new BSVMotor("AngularMotor", m_angularMotorTimescale,
-                                m_angularMotorDecayTimescale, m_angularFrictionTimescale,
-                                1f);
+            m_angularMotor = new BSVMotor("AngularMotor", m_angularMotorTimescale, m_angularMotorDecayTimescale, 1f);
             m_angularMotor.PhysicsScene = m_physicsScene;  // DEBUG DEBUG DEBUG (enables detail logging)
 
             /*  Not implemented
@@ -574,7 +566,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                                 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)
              */
 
@@ -1050,8 +1041,13 @@ 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}",
-                        ControllingPrim.LocalID, origVelW, currentVelV, linearMotorCorrectionV, linearMotorVelocityW, VehicleVelocity);
+            // Friction reduces vehicle motion
+            Vector3 frictionFactor = ComputeFrictionFactor(m_linearFrictionTimescale, pTimestep);
+            VehicleVelocity -= (VehicleVelocity * frictionFactor);
+
+            VDetailLog("{0},  MoveLinear,velocity,origVelW={1},velV={2},correctV={3},correctW={4},newVelW={5},fricFact={6}",
+                        ControllingPrim.LocalID, origVelW, currentVelV, linearMotorCorrectionV,
+                        linearMotorVelocityW, VehicleVelocity, frictionFactor);
         }
 
         public void ComputeLinearTerrainHeightCorrection(float pTimestep)
@@ -1342,6 +1338,11 @@ namespace OpenSim.Region.Physics.BulletSPlugin
           //  }
 
             VehicleRotationalVelocity += angularMotorContributionV * VehicleOrientation;
+
+            // Reduce any velocity by friction.
+            Vector3 frictionFactor = ComputeFrictionFactor(m_angularFrictionTimescale, pTimestep);
+            VehicleRotationalVelocity -= (VehicleRotationalVelocity * frictionFactor);
+
             VDetailLog("{0},  MoveAngular,angularTurning,angularMotorContrib={1}", ControllingPrim.LocalID, angularMotorContributionV);
         }
 
@@ -1629,6 +1630,23 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
         }
 
+        // 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 ClampInRange(float low, float val, float high)
         {
             return Math.Max(low, Math.Min(val, high));
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
index 0128d8d..ef662b5 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; }
@@ -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;
     }
@@ -165,26 +160,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
         {
@@ -235,9 +215,9 @@ 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;
@@ -254,8 +234,8 @@ public class BSVMotor : 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);
     }
 }
 
@@ -265,7 +245,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; }
@@ -283,12 +262,11 @@ public class BSFMotor : BSMotor
         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;
     }
@@ -331,24 +309,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
         {
@@ -390,8 +355,8 @@ 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);
     }
 
 }
-- 
cgit v1.1


From 93e1986d690cda415c9cce639a2656bc773a9a29 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 6 May 2013 16:48:01 -0700
Subject: BulletSim: apply linear and angular friction in vehicle coordinates
 and not world coordinates.

---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 272a162..04ea289 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1042,12 +1042,12 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             VehicleVelocity += linearMotorVelocityW;
 
             // Friction reduces vehicle motion
-            Vector3 frictionFactor = ComputeFrictionFactor(m_linearFrictionTimescale, pTimestep);
-            VehicleVelocity -= (VehicleVelocity * frictionFactor);
+            Vector3 frictionFactorW = ComputeFrictionFactor(m_linearFrictionTimescale, pTimestep) * VehicleOrientation;
+            VehicleVelocity -= (VehicleVelocity * frictionFactorW);
 
             VDetailLog("{0},  MoveLinear,velocity,origVelW={1},velV={2},correctV={3},correctW={4},newVelW={5},fricFact={6}",
                         ControllingPrim.LocalID, origVelW, currentVelV, linearMotorCorrectionV,
-                        linearMotorVelocityW, VehicleVelocity, frictionFactor);
+                        linearMotorVelocityW, VehicleVelocity, frictionFactorW);
         }
 
         public void ComputeLinearTerrainHeightCorrection(float pTimestep)
@@ -1340,10 +1340,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             VehicleRotationalVelocity += angularMotorContributionV * VehicleOrientation;
 
             // Reduce any velocity by friction.
-            Vector3 frictionFactor = ComputeFrictionFactor(m_angularFrictionTimescale, pTimestep);
-            VehicleRotationalVelocity -= (VehicleRotationalVelocity * frictionFactor);
+            Vector3 frictionFactorW = ComputeFrictionFactor(m_angularFrictionTimescale, pTimestep) * VehicleOrientation;
+            VehicleRotationalVelocity -= (VehicleRotationalVelocity * frictionFactorW);
 
-            VDetailLog("{0},  MoveAngular,angularTurning,angularMotorContrib={1}", ControllingPrim.LocalID, angularMotorContributionV);
+            VDetailLog("{0},  MoveAngular,angularTurning,angContribV={1}", ControllingPrim.LocalID, angularMotorContributionV);
         }
 
         // From http://wiki.secondlife.com/wiki/Linden_Vehicle_Tutorial:
-- 
cgit v1.1


From 4c83b5e719ad288b1250fbed3f74698fa34eff21 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 7 May 2013 00:31:11 +0100
Subject: Step one of estate settings sharing - port the Avination Estate
 module (complete module) as changes are too extensive to apply manually

---
 .../EntityTransfer/EntityTransferModule.cs         | 13 +++--
 .../EntityTransfer/HGEntityTransferModule.cs       | 21 +++++---
 .../World/Estate/EstateManagementModule.cs         | 57 +++++++++++++++++-----
 .../Framework/Interfaces/IEntityTransferModule.cs  |  2 +-
 OpenSim/Region/Framework/Scenes/Scene.cs           |  5 +-
 5 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index ca0cef1..eac0da7 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -243,7 +243,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         protected virtual void OnNewClient(IClientAPI client)
         {
-            client.OnTeleportHomeRequest += TeleportHome;
+            client.OnTeleportHomeRequest += TriggerTeleportHome;
             client.OnTeleportLandmarkRequest += RequestTeleportLandmark;
 
             if (!DisableInterRegionTeleportCancellation)
@@ -1071,7 +1071,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         #region Teleport Home
 
-        public virtual void TeleportHome(UUID id, IClientAPI client)
+        public virtual void TriggerTeleportHome(UUID id, IClientAPI client)     
+        {                                                                       
+            TeleportHome(id, client);                                           
+        }                                                                       
+                          
+        public virtual bool TeleportHome(UUID id, IClientAPI client)
         {
             m_log.DebugFormat(
                 "[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.Name, client.AgentId);
@@ -1086,7 +1091,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 {
                     // can't find the Home region: Tell viewer and abort
                     client.SendTeleportFailed("Your home region could not be found.");
-                    return;
+                    return false;
                 }
                 
                 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Home region of {0} is {1} ({2}-{3})",
@@ -1096,6 +1101,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 ((Scene)(client.Scene)).RequestTeleportLocation(
                     client, regionInfo.RegionHandle, uinfo.HomePosition, uinfo.HomeLookAt,
                     (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
+                return true;
             }
             else
             {
@@ -1103,6 +1109,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     "[ENTITY TRANSFER MODULE]: No grid user information found for {0} {1}.  Cannot send home.",
                     client.Name, client.AgentId);
             }
+            return false;
         }
 
         #endregion
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 33ea063..02ed1a0 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -184,7 +184,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         protected override void OnNewClient(IClientAPI client)
         {
-            client.OnTeleportHomeRequest += TeleportHome;
+            client.OnTeleportHomeRequest += TriggerTeleportHome;
             client.OnTeleportLandmarkRequest += RequestTeleportLandmark;
             client.OnConnectionClosed += new Action<IClientAPI>(OnConnectionClosed);
         }
@@ -409,7 +409,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         //    return base.UpdateAgent(reg, finalDestination, agentData, sp);
         //}
 
-        public override void TeleportHome(UUID id, IClientAPI client)
+        public virtual void TriggerTeleportHome(UUID id, IClientAPI client)     
+        {                                                                       
+            TeleportHome(id, client);                                           
+        }                                                                       
+                          
+        public override bool TeleportHome(UUID id, IClientAPI client)
         {
             m_log.DebugFormat(
                 "[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.Name, client.AgentId);
@@ -420,8 +425,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 // local grid user
                 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: User is local");
-                base.TeleportHome(id, client);
-                return;
+                return base.TeleportHome(id, client);
             }
 
             // Foreign user wants to go home
@@ -431,7 +435,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 client.SendTeleportFailed("Your information has been lost");
                 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Unable to locate agent's gateway information");
-                return;
+                return false;
             }
 
             IUserAgentService userAgentService = new UserAgentServiceConnector(aCircuit.ServiceURLs["HomeURI"].ToString());
@@ -441,7 +445,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 client.SendTeleportFailed("Your home region could not be found");
                 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Agent's home region not found");
-                return;
+                return false;
             }
 
             ScenePresence sp = ((Scene)(client.Scene)).GetScenePresence(client.AgentId);
@@ -449,7 +453,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 client.SendTeleportFailed("Internal error");
                 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Agent not found in the scene where it is supposed to be");
-                return;
+                return false;
             }
 
             GridRegion homeGatekeeper = MakeRegion(aCircuit);
@@ -460,6 +464,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             DoTeleport(
                 sp, homeGatekeeper, finalDestination,
                 position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
+            return true;
         }
 
         /// <summary>
@@ -586,4 +591,4 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             return region;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 60f6739..91f6501 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -32,6 +32,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Security;
+using System.Timers;
 using log4net;
 using Mono.Addins;
 using Nini.Config;
@@ -48,6 +49,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        private Timer m_regionChangeTimer = new Timer();
         public Scene Scene { get; private set; }
         public IUserManagement UserManager { get; private set; }
         
@@ -65,6 +67,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
         public event ChangeDelegate OnEstateInfoChange;
         public event MessageDelegate OnEstateMessage;
 
+        private int m_delayCount = 0;
+
         #region Region Module interface
         
         public string Name { get { return "EstateManagementModule"; } }
@@ -114,6 +118,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         #region Packet Data Responders
 
+        private void clientSendDetailedEstateData(IClientAPI remote_client, UUID invoice)
+        {
+            sendDetailedEstateData(remote_client, invoice);
+            sendEstateLists(remote_client, invoice);
+        }
+
         private void sendDetailedEstateData(IClientAPI remote_client, UUID invoice)
         {
             uint sun = 0;
@@ -136,7 +146,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     (uint) Scene.RegionInfo.RegionSettings.CovenantChangedDateTime,
                     Scene.RegionInfo.EstateSettings.AbuseEmail,
                     estateOwner);
+        }
 
+        private void sendEstateLists(IClientAPI remote_client, UUID invoice)
+        {
             remote_client.SendEstateList(invoice,
                     (int)Constants.EstateAccessCodex.EstateManagers,
                     Scene.RegionInfo.EstateSettings.EstateManagers,
@@ -330,7 +343,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                         timeInSeconds -= 15;
                 }
 
-                restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), true);
+                restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), false);
 
                 m_log.InfoFormat(
                     "User {0} requested restart of region {1} in {2} seconds", 
@@ -546,7 +559,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
                         {
                             if (!s.IsChildAgent)
                             {
-                                Scene.TeleportClientHome(user, s.ControllingClient);
+                                if (!Scene.TeleportClientHome(user, s.ControllingClient))
+                                {
+                                    s.ControllingClient.Kick("Your access to the region was revoked and TP home failed - you have been logged out.");
+                                    s.ControllingClient.Close();
+                                }
                             }
                         }
 
@@ -555,7 +572,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     {
                         remote_client.SendAlertMessage("User is already on the region ban list");
                     }
-                    //m_scene.RegionInfo.regionBanlist.Add(Manager(user);
+                    //Scene.RegionInfo.regionBanlist.Add(Manager(user);
                     remote_client.SendBannedUserList(invoice, Scene.RegionInfo.EstateSettings.EstateBans, Scene.RegionInfo.EstateSettings.EstateID);
                 }
                 else
@@ -611,7 +628,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                         remote_client.SendAlertMessage("User is not on the region ban list");
                     }
                     
-                    //m_scene.RegionInfo.regionBanlist.Add(Manager(user);
+                    //Scene.RegionInfo.regionBanlist.Add(Manager(user);
                     remote_client.SendBannedUserList(invoice, Scene.RegionInfo.EstateSettings.EstateBans, Scene.RegionInfo.EstateSettings.EstateID);
                 }
                 else
@@ -777,7 +794,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 ScenePresence s = Scene.GetScenePresence(prey);
                 if (s != null)
                 {
-                    Scene.TeleportClientHome(prey, s.ControllingClient);
+                    if (!Scene.TeleportClientHome(prey, s.ControllingClient))
+                    {
+                        s.ControllingClient.Kick("You were teleported home by the region owner, but the TP failed - you have been logged out.");
+                        s.ControllingClient.Close();
+                    }
                 }
             }
         }
@@ -795,7 +816,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     // Also make sure they are actually in the region
                     ScenePresence p;
                     if(Scene.TryGetScenePresence(client.AgentId, out p))
-                        Scene.TeleportClientHome(p.UUID, p.ControllingClient);
+                    {
+                        if (!Scene.TeleportClientHome(p.UUID, p.ControllingClient))
+                        {
+                            p.ControllingClient.Kick("You were teleported home by the region owner, but the TP failed - you have been logged out.");
+                            p.ControllingClient.Close();
+                        }
+                    }
                 }
             });
         }
@@ -1170,7 +1197,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         private void EventManager_OnNewClient(IClientAPI client)
         {
-            client.OnDetailedEstateDataRequest += sendDetailedEstateData;
+            client.OnDetailedEstateDataRequest += clientSendDetailedEstateData;
             client.OnSetEstateFlagsRequest += estateSetRegionInfoHandler;
 //            client.OnSetEstateTerrainBaseTexture += setEstateTerrainBaseTexture;
             client.OnSetEstateTerrainDetailTexture += setEstateTerrainBaseTexture;
@@ -1218,8 +1245,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 flags |= RegionFlags.NoFly;
             if (Scene.RegionInfo.RegionSettings.RestrictPushing)
                 flags |= RegionFlags.RestrictPushObject;
-            if (Scene.RegionInfo.RegionSettings.AllowLandJoinDivide)
-                flags |= RegionFlags.AllowParcelChanges;
             if (Scene.RegionInfo.RegionSettings.BlockShowInSearch)
                 flags |= RegionFlags.BlockParcelSearch;
 
@@ -1229,11 +1254,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 flags |= RegionFlags.Sandbox;
             if (Scene.RegionInfo.EstateSettings.AllowVoice)
                 flags |= RegionFlags.AllowVoice;
+            if (Scene.RegionInfo.EstateSettings.BlockDwell)
+                flags |= RegionFlags.BlockDwell;
+            if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport)
+                flags |= RegionFlags.ResetHomeOnTeleport;
 
-            // Fudge these to always on, so the menu options activate
-            //
-            flags |= RegionFlags.AllowLandmark;
-            flags |= RegionFlags.AllowSetHome;
 
             // TODO: SkipUpdateInterestList
 
@@ -1294,6 +1319,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         public void TriggerRegionInfoChange()
         {
+            m_regionChangeTimer.Stop();
+            m_regionChangeTimer.Start();
+        }
+
+        protected void RaiseRegionInfoChange(object sender, ElapsedEventArgs e)
+        {
             ChangeDelegate change = OnRegionInfoChange;
 
             if (change != null)
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 69be83e..1c43a25 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         /// <param name='id'></param>
         /// <param name='client'></param>
-        void TeleportHome(UUID id, IClientAPI client);
+        bool TeleportHome(UUID id, IClientAPI client);
 
         /// <summary>
         /// Show whether the given agent is being teleported.
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 8fe2d72..2aba2dd 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3230,17 +3230,18 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="agentId">The avatar's Unique ID</param>
         /// <param name="client">The IClientAPI for the client</param>
-        public virtual void TeleportClientHome(UUID agentId, IClientAPI client)
+        public virtual bool TeleportClientHome(UUID agentId, IClientAPI client)
         {
             if (EntityTransferModule != null)
             {
-                EntityTransferModule.TeleportHome(agentId, client);
+                return EntityTransferModule.TeleportHome(agentId, client);
             }
             else
             {
                 m_log.DebugFormat("[SCENE]: Unable to teleport user home: no AgentTransferModule is active");
                 client.SendTeleportFailed("Unable to perform teleports on this simulator.");
             }
+            return false;
         }
 
         /// <summary>
-- 
cgit v1.1


From 5d5edde4290030345bc25841a25d23552e533972 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 7 May 2013 00:37:45 +0100
Subject: Step 2: commit the IEstateModuleInterface changes needed

---
 OpenSim/Region/Framework/Interfaces/IEstateModule.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index 1983984..d49b24e 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -40,11 +40,12 @@ 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>
         void sendRegionHandshakeToAll();
+        void TriggerEstateInfoChange();
 
         /// <summary>
         /// Fires the OnRegionInfoChange event.
-- 
cgit v1.1


From 1c6b8293d7b9e312c5b1fb544a1de7fd3b145670 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 7 May 2013 00:52:40 +0100
Subject: Step 3: Commit the Avination XEstate estate comms handler This adds
 estate-wide Teleport Home and Teleport All User Home as well

---
 .../CoreModules/World/Estate/XEstateConnector.cs   | 215 +++++++++++++++
 .../CoreModules/World/Estate/XEstateModule.cs      | 254 ++++++++++++++++++
 .../World/Estate/XEstateRequestHandler.cs          | 298 +++++++++++++++++++++
 3 files changed, 767 insertions(+)
 create mode 100644 OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
 create mode 100644 OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs
 create mode 100644 OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs

diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs b/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
new file mode 100644
index 0000000..948c893
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
@@ -0,0 +1,215 @@
+/*
+ * 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
+            //
+            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..1f099c6
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs
@@ -0,0 +1,254 @@
+/*
+ * 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)
+        {
+            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;
+
+            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..eb74cda
--- /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;
+        }
+
+        public override byte[] Handle(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();
+        }
+    }
+}
-- 
cgit v1.1


From 84118c5735f49bb38ded2ccc72b1bd7d39c09010 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 6 May 2013 18:05:37 -0700
Subject: BulletSim: properly free references to simple convex hull shapes.
 Didn't loose memory since shapes are shared but did mess up usage accounting.

---
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 45 +++++++++++++++++++-----
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 3e4ee5a..9d47657 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -117,11 +117,11 @@ public abstract class BSShape
         StringBuilder buff = new StringBuilder();
         if (physShapeInfo == null)
         {
-            buff.Append(",noPhys");
+            buff.Append("<noPhys");
         }
         else
         {
-            buff.Append(",phy=");
+            buff.Append("<phy=");
             buff.Append(physShapeInfo.ToString());
         }
         buff.Append(",c=");
@@ -808,17 +808,25 @@ public class BSShapeCompound : BSShape
             }
             else
             {
-                if (physicsScene.PE.IsCompound(pShape))
+                BSShapeConvexHull chullDesc;
+                if (BSShapeConvexHull.TryGetHullByPtr(pShape, out chullDesc))
                 {
-                    BSShapeCompound recursiveCompound = new BSShapeCompound(pShape);
-                    recursiveCompound.Dereference(physicsScene);
+                    chullDesc.Dereference(physicsScene);
                 }
                 else
                 {
-                    if (physicsScene.PE.IsNativeShape(pShape))
+                    if (physicsScene.PE.IsCompound(pShape))
                     {
-                        BSShapeNative nativeShape = new BSShapeNative(pShape);
-                        nativeShape.Dereference(physicsScene);
+                        BSShapeCompound recursiveCompound = new BSShapeCompound(pShape);
+                        recursiveCompound.Dereference(physicsScene);
+                    }
+                    else
+                    {
+                        if (physicsScene.PE.IsNativeShape(pShape))
+                        {
+                            BSShapeNative nativeShape = new BSShapeNative(pShape);
+                            nativeShape.Dereference(physicsScene);
+                        }
                     }
                 }
             }
@@ -898,6 +906,27 @@ public class BSShapeConvexHull : BSShape
             // 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;
+    }
 }
 
 // ============================================================================================================
-- 
cgit v1.1


From ddd97cb78eb0f8dccd132c952239bd3211a7aba0 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 6 May 2013 18:06:34 -0700
Subject: BulletSim: normalize quaternian rotations when building compound
 linksets. Attempt to fix vehicles being twisted off the ground when they go
 physical.

---
 OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 1f16cc8..350a5d1 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -347,21 +347,21 @@ public sealed class BSLinksetCompound : BSLinkset
             // Bullet presumes an object's origin (relative <0,0,0>) is its center-of-mass
             OMV.Vector3 centerOfMassW = ComputeLinksetCenterOfMass();
 
-            OMV.Quaternion invRootOrientation = OMV.Quaternion.Inverse(LinksetRoot.RawOrientation);
+            OMV.Quaternion invRootOrientation = OMV.Quaternion.Normalize(OMV.Quaternion.Inverse(LinksetRoot.RawOrientation));
 
             // 'centerDisplacement' is the value to subtract from children to give physical offset position
-            OMV.Vector3 centerDisplacement = (centerOfMassW - LinksetRoot.RawPosition) * invRootOrientation;
+            OMV.Vector3 centerDisplacementV = (centerOfMassW - LinksetRoot.RawPosition) * invRootOrientation;
             if (UseBulletSimRootOffsetHack || disableCOM)
             {
-                centerDisplacement = OMV.Vector3.Zero;
+                centerDisplacementV = OMV.Vector3.Zero;
                 LinksetRoot.ClearDisplacement();
             }
             else
             {
-                LinksetRoot.SetEffectiveCenterOfMassDisplacement(centerDisplacement);
+                LinksetRoot.SetEffectiveCenterOfMassDisplacement(centerDisplacementV);
             }
             DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,COM,rootPos={1},com={2},comDisp={3}",
-                                LinksetRoot.LocalID, LinksetRoot.RawPosition, centerOfMassW, centerDisplacement);
+                                LinksetRoot.LocalID, LinksetRoot.RawPosition, centerOfMassW, centerDisplacementV);
 
             // Add the shapes of all the components of the linkset
             int memberIndex = 1;
@@ -372,8 +372,8 @@ public sealed class BSLinksetCompound : BSLinkset
 
                 // Get a reference to the shape of the child and add that shape to the linkset compound shape
                 BSShape childShape = cPrim.PhysShape.GetReference(m_physicsScene, cPrim);
-                OMV.Vector3 offsetPos = (cPrim.RawPosition - LinksetRoot.RawPosition) * invRootOrientation - centerDisplacement;
-                OMV.Quaternion offsetRot = cPrim.RawOrientation * invRootOrientation;
+                OMV.Vector3 offsetPos = (cPrim.RawPosition - LinksetRoot.RawPosition) * invRootOrientation - centerDisplacementV;
+                OMV.Quaternion offsetRot = OMV.Quaternion.Normalize(cPrim.RawOrientation) * invRootOrientation;
                 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, memberIndex, childShape, offsetPos, offsetRot);
-- 
cgit v1.1


From f247ae1a7511f6bd5f31366bc301089434e73e3f Mon Sep 17 00:00:00 2001
From: Vegaslon
Date: Mon, 6 May 2013 21:10:02 -0400
Subject: BulletSim: Another way to create vehicle framed friction.

Signed-off-by: Robert Adams <Robert.Adams@intel.com>
---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 04ea289..e93dbd7 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1028,6 +1028,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             Vector3 currentVelV = VehicleVelocity * Quaternion.Inverse(VehicleOrientation);
             Vector3 linearMotorCorrectionV = m_linearMotor.Step(pTimestep, currentVelV);
 
+            // Friction reduces vehicle motion
+            Vector3 frictionFactorW = ComputeFrictionFactor(m_linearFrictionTimescale, pTimestep);
+            linearMotorCorrectionV -= (currentVelV * frictionFactorW);
+
             // Motor is vehicle coordinates. Rotate it to world coordinates
             Vector3 linearMotorVelocityW = linearMotorCorrectionV * VehicleOrientation;
 
@@ -1041,9 +1045,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             // Add this correction to the velocity to make it faster/slower.
             VehicleVelocity += linearMotorVelocityW;
 
-            // Friction reduces vehicle motion
-            Vector3 frictionFactorW = ComputeFrictionFactor(m_linearFrictionTimescale, pTimestep) * VehicleOrientation;
-            VehicleVelocity -= (VehicleVelocity * frictionFactorW);
+
 
             VDetailLog("{0},  MoveLinear,velocity,origVelW={1},velV={2},correctV={3},correctW={4},newVelW={5},fricFact={6}",
                         ControllingPrim.LocalID, origVelW, currentVelV, linearMotorCorrectionV,
-- 
cgit v1.1


From ac6dcd35fb77f118fc6c3d72cb029591306c7e99 Mon Sep 17 00:00:00 2001
From: Vegaslon
Date: Mon, 6 May 2013 21:19:48 -0400
Subject: Bulletsim: and the rotational friction.

Signed-off-by: Robert Adams <Robert.Adams@intel.com>
---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index e93dbd7..c16b7d3 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1339,11 +1339,13 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             //    angularMotorContributionV.Y = 0f;
           //  }
 
+            // Reduce any velocity by friction.
+            Vector3 frictionFactorW = ComputeFrictionFactor(m_angularFrictionTimescale, pTimestep);
+            angularMotorContributionV -= (currentAngularV * frictionFactorW);
+
             VehicleRotationalVelocity += angularMotorContributionV * VehicleOrientation;
 
-            // Reduce any velocity by friction.
-            Vector3 frictionFactorW = ComputeFrictionFactor(m_angularFrictionTimescale, pTimestep) * VehicleOrientation;
-            VehicleRotationalVelocity -= (VehicleRotationalVelocity * frictionFactorW);
+
 
             VDetailLog("{0},  MoveAngular,angularTurning,angContribV={1}", ControllingPrim.LocalID, angularMotorContributionV);
         }
-- 
cgit v1.1


From e92c05ebbdc44084326c3dcfa0a2ca0958e4b5e6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 7 May 2013 18:01:48 -0700
Subject: Added AvatarPickerSearch capability handler.

---
 .../AvatarPickerSearchHandler.cs                   | 116 +++++++++++++++++
 OpenSim/Capabilities/LLSDAvatarPicker.cs           |  51 ++++++++
 OpenSim/Framework/IPeople.cs                       |  47 +++++++
 .../Linden/Caps/AvatarPickerSearchModule.cs        | 140 +++++++++++++++++++++
 .../UserManagement/HGUserManagementModule.cs       |   2 +-
 .../UserManagement/UserManagementModule.cs         |  72 ++++++-----
 bin/OpenSim.ini.example                            |   4 +-
 bin/OpenSimDefaults.ini                            |   4 +
 8 files changed, 400 insertions(+), 36 deletions(-)
 create mode 100644 OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs
 create mode 100644 OpenSim/Capabilities/LLSDAvatarPicker.cs
 create mode 100644 OpenSim/Framework/IPeople.cs
 create mode 100644 OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs

diff --git a/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs b/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs
new file mode 100644
index 0000000..4dca592
--- /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;
+        }
+
+        public override byte[] Handle(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/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/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/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
new file mode 100644
index 0000000..d7af1f2
--- /dev/null
+++ b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
@@ -0,0 +1,140 @@
+/*
+ * 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);
+            m_log.DebugFormat("[XXX]: Cap_AvatarPickerSearch = {0}", m_URL);
+            // 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/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
index 8ce20e9..fac93e6 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
@@ -70,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/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 7b823ba..6847e57 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -46,17 +46,8 @@ using Mono.Addins;
 
 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);
 
@@ -101,6 +92,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);
             }
@@ -181,29 +173,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.ToLower().StartsWith(query.ToLower()) || data.LastName.ToLower().StartsWith(query.ToLower())))
-                    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 +219,46 @@ 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
+            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);
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index ce2e600..5e486d4 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -507,8 +507,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 = ""
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 28c1db2..7666243 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -609,6 +609,10 @@
     Cap_WebFetchInventoryDescendents = ""
     Cap_FetchInventoryDescendents2 = "localhost"
     Cap_FetchInventory2 = "localhost"
+
+	; Capability for searching for people
+	Cap_AvatarPickerSearch = "localhost"
+
     
 
 [Chat]
-- 
cgit v1.1


From 601aa9116348a88e8fe4d33f7dd7408ddc6fee28 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 7 May 2013 19:16:42 -0700
Subject: Delete "" entry for AvatarPicker cap.

---
 bin/OpenSimDefaults.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 7666243..0e35c63 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -545,7 +545,6 @@
     ;; in OpenSim.ini
     ;;
     Cap_AttachmentResources = ""
-    Cap_AvatarPickerSearch = ""
     Cap_ChatSessionRequest = ""
     Cap_CopyInventoryFromNotecard = "localhost"
     Cap_DispatchRegionInfo = ""
-- 
cgit v1.1


From 33aaa40bee37ca4d8a3afa10fbbea7c1be3a1d58 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Wed, 8 May 2013 13:13:51 -0700
Subject: Adds an event and a method so that handling of the CachedTexture
 packet can be pulled out of LLClientView and moved to AvatarFactory. The
 first pass at reusing textures (turned off by default) is included. When
 reusing textures, if the baked textures from a previous login are still in
 the asset service (which generally means that they are in the simulator's
 cache) then the avatar will not need to rebake. This is both a performance
 improvement (specifically that an avatars baked textures do not need to be
 sent to other users who have the old textures cached) and a resource
 improvement (don't have to deal with duplicate bakes in the asset service
 cache).

---
 OpenSim/Framework/CachedTextureEventArg.cs         | 46 +++++++++++++++++
 OpenSim/Framework/IClientAPI.cs                    |  5 ++
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  | 58 +++++++++++++++------
 .../Avatar/AvatarFactory/AvatarFactoryModule.cs    | 59 ++++++++++++++++++++++
 .../Server/IRCClientView.cs                        |  6 +++
 .../Region/OptionalModules/World/NPC/NPCAvatar.cs  |  6 +++
 OpenSim/Tests/Common/Mock/TestClient.cs            |  6 +++
 bin/OpenSimDefaults.ini                            |  3 ++
 8 files changed, 174 insertions(+), 15 deletions(-)
 create mode 100644 OpenSim/Framework/CachedTextureEventArg.cs

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/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 4d5ec3a..cfb36fe 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -64,6 +64,8 @@ namespace OpenSim.Framework
 
     public delegate void NetworkStats(int inPackets, int outPackets, int unAckedBytes);
 
+    public delegate void CachedTextureRequest(IClientAPI remoteClient, int serial, List<CachedTextureRequestArg> cachedTextureRequest);
+
     public delegate void SetAppearance(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams);
 
     public delegate void StartAnim(IClientAPI remoteClient, UUID animID);
@@ -780,6 +782,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;
@@ -1087,6 +1090,8 @@ 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>
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index bede379..47dd842 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;
@@ -321,7 +322,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private readonly byte[] m_channelVersion = Utils.EmptyBytes;
         private readonly IGroupsModule m_GroupsModule;
 
-        private int m_cachedTextureSerial;
         private PriorityQueue m_entityUpdates;
         private PriorityQueue m_entityProps;
         private Prioritizer m_prioritizer;
@@ -11462,8 +11462,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.
@@ -11473,33 +11471,63 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <returns></returns>
         protected bool HandleAgentTextureCached(IClientAPI simclient, Packet packet)
         {
-            //m_log.Debug("texture cached: " + packet.ToString());
             AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet;
-            AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse);
 
             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;
+        }
+        
+        /// <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 = AgentId;
+            cachedresp.AgentData.AgentID = m_agentId;
             cachedresp.AgentData.SessionID = m_sessionId;
-            cachedresp.AgentData.SerialNum = m_cachedTextureSerial;
-            m_cachedTextureSerial++;
-            cachedresp.WearableData =
-                new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length];
+            cachedresp.AgentData.SerialNum = serial;
+            cachedresp.WearableData = new AgentCachedTextureResponsePacket.WearableDataBlock[cachedTextures.Count];
 
-            for (int i = 0; i < cachedtex.WearableData.Length; i++)
+            for (int i = 0; i < cachedTextures.Count; i++)
             {
                 cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
-                cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
-                cachedresp.WearableData[i].TextureID = UUID.Zero;
+                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);
-
-            return true;
         }
 
         protected bool HandleMultipleObjUpdate(IClientAPI simClient, Packet packet)
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index c7ac7c4..b640b48 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
@@ -671,6 +675,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/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 915ebd8..3644856 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;
@@ -938,7 +939,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
         {
             
         }
+        
+        public void SendCachedTextureResponse(ISceneEntity avatar, int serial, List<CachedTextureResponseArg> cachedTextures)
+        {
 
+        }
+        
         public void SendStartPingCheck(byte seq)
         {
             
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 0ee00e9..8aae300 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -391,6 +391,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;
@@ -569,6 +570,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         {
         }
 
+        public void SendCachedTextureResponse(ISceneEntity avatar, int serial, List<CachedTextureResponseArg> cachedTextures)
+        {
+
+        }
+
         public virtual void Kick(string message)
         {
         }
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 41402a4..664ecb6 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -196,6 +196,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;
 
@@ -509,6 +510,11 @@ namespace OpenSim.Tests.Common.Mock
         {
         }
 
+        public void SendCachedTextureResponse(ISceneEntity avatar, int serial, List<CachedTextureResponseArg> cachedTextures)
+        {
+
+        }
+
         public virtual void Kick(string message)
         {
         }
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 0e35c63..81843b1 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -683,6 +683,9 @@
     ; 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.
-- 
cgit v1.1


From 543d1fe70b54fb26d7ce19b397468c66269f0e20 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 8 May 2013 21:14:52 +0100
Subject: Guard the scene list when estates are updated

---
 .../Region/CoreModules/World/Estate/XEstateConnector.cs | 17 ++++++++++-------
 .../Region/CoreModules/World/Estate/XEstateModule.cs    |  6 ++++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs b/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
index 948c893..73e706c 100644
--- a/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
@@ -136,15 +136,18 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
             // Handle local regions locally
             //
-            foreach (Scene s in m_EstateModule.Scenes)
+            lock (m_EstateModule.Scenes)
             {
-                if (regions.Contains(s.RegionInfo.RegionID))
+                foreach (Scene s in m_EstateModule.Scenes)
                 {
-                    // All regions in one estate are in the same scope.
-                    // Use that scope.
-                    //
-                    ScopeID = s.RegionInfo.ScopeID;
-                    regions.Remove(s.RegionInfo.RegionID);
+                    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);
+                    }
                 }
             }
 
diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs b/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs
index 1f099c6..f54ab2c 100644
--- a/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs
@@ -93,7 +93,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         public void AddRegion(Scene scene)
         {
-            m_Scenes.Add(scene);
+            lock (m_Scenes)
+                m_Scenes.Add(scene);
 
             scene.EventManager.OnNewClient += OnNewClient;
         }
@@ -111,7 +112,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
         {
             scene.EventManager.OnNewClient -= OnNewClient;
 
-            m_Scenes.Remove(scene);
+            lock (m_Scenes)
+                m_Scenes.Remove(scene);
         }
 
         public string Name
-- 
cgit v1.1


From 182ea00cb30042d8ff7f6184f480d7c39e2be8a1 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 9 May 2013 10:46:37 -0400
Subject: Application support:

  Adding some viwer supported url settings for destination guide and avatar picker apps. URL for the destinations should be: "secondlife:///app/teleport/slurl"
---
 OpenSim/Services/LLLoginService/LLLoginResponse.cs | 20 +++++++++++++++++++-
 OpenSim/Services/LLLoginService/LLLoginService.cs  |  7 ++++++-
 bin/Robust.HG.ini.example                          |  6 ++++++
 bin/Robust.ini.example                             |  6 ++++++
 4 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 9ec744f..400f303 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -227,7 +227,7 @@ namespace OpenSim.Services.LLLoginService
             GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
             string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
             GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency,
-            string DSTZone)
+            string DSTZone, string destinationsURL, string avatarsURL)
             : this()
         {
             FillOutInventoryData(invSkel, libService);
@@ -246,6 +246,8 @@ namespace OpenSim.Services.LLLoginService
             MapTileURL = mapTileURL;
             ProfileURL = profileURL;
             OpenIDURL = openIDURL;
+            DestinationsURL = destinationsURL;
+            AvatarsURL = avatarsURL;
 
             SearchURL = searchURL;
             Currency = currency;
@@ -533,6 +535,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;
@@ -1056,6 +1064,16 @@ namespace OpenSim.Services.LLLoginService
             set { currency = 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 53a22d4..abda98f 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -78,6 +78,8 @@ namespace OpenSim.Services.LLLoginService
         protected string m_OpenIDURL;
         protected string m_SearchURL;
         protected string m_Currency;
+        protected string m_DestinationGuide;
+        protected string m_AvatarPicker;
 
         protected string m_AllowedClients;
         protected string m_DeniedClients;
@@ -117,6 +119,8 @@ 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_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);
@@ -453,7 +457,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);
+                        m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone,
+                        m_DestinationGuide, m_AvatarPicker);
 
                 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName);
 
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index fee2a87..bc2b4cf 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -325,6 +325,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
     
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 2d5aa8c..1d66b7f 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -288,6 +288,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
 
-- 
cgit v1.1


From 641c636790f3e4421e089a44e6b00fed338726eb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 9 May 2013 16:43:16 +0100
Subject: minor: Simplify test setup in SceneObjectDeRezTests since permissions
 module doesn't need different configuration anymore

---
 .../Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index 52ad538..bde15cd 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -59,15 +59,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestDeRezSceneObject()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
                         
             UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
             
             TestScene scene = new SceneHelpers().SetupScene();
-            IConfigSource configSource = new IniConfigSource();
-            IConfig config = configSource.AddConfig("Startup");
-            config.Set("serverside_object_permissions", true);
-            SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() });
+            SceneHelpers.SetupSceneModules(scene, new object[] { new PermissionsModule() });
             IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
             
             // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
@@ -97,8 +93,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         /// <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()
         {
@@ -109,10 +106,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001");
             
             TestScene scene = new SceneHelpers().SetupScene();
-            IConfigSource configSource = new IniConfigSource();
-            IConfig config = configSource.AddConfig("Startup");
-            config.Set("serverside_object_permissions", true);
-            SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() });            
+            SceneHelpers.SetupSceneModules(scene, new object[] { new PermissionsModule() });            
             IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
             
             // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
-- 
cgit v1.1


From 2cb2f1d7e30fa583a9f43ddd6b420deb8e9b56bd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 9 May 2013 18:02:19 +0100
Subject: Fix issue where objects removed via llDie() would not disappear for
 users looking in from neighbouring sims.

This was because this particular code path (unlike user delete) only sent kills to root presences, for no apparent good reason.
Added regression test for this case.
This fixes http://opensimulator.org/mantis/view.php?id=6627
---
 .../Attachments/Tests/AttachmentsModuleTests.cs    |  4 +-
 .../Region/Framework/Scenes/SceneObjectGroup.cs    | 14 ++--
 .../Scenes/Tests/SceneObjectDeRezTests.cs          | 78 +++++++++++++++++++++-
 .../Scenes/Tests/ScenePresenceCrossingTests.cs     |  4 +-
 .../Scenes/Tests/ScenePresenceTeleportTests.cs     | 14 ++--
 .../Tests/Common/Helpers/EntityTransferHelpers.cs  |  2 +-
 OpenSim/Tests/Common/Helpers/SceneHelpers.cs       | 54 +--------------
 OpenSim/Tests/Common/Mock/TestClient.cs            | 20 ++----
 8 files changed, 102 insertions(+), 88 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index 25444e5..508743c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -833,11 +833,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             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);
 
-            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);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 9e7a986..3b2f537 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1221,11 +1221,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)
         {
@@ -1234,10 +1234,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)
                     {
@@ -1245,9 +1245,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(m_regionHandle, new List<uint> { part.LocalId });
                         }
                     }
                 });
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index bde15cd..f738ff1 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>
@@ -63,7 +83,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
             
             TestScene scene = new SceneHelpers().SetupScene();
-            SceneHelpers.SetupSceneModules(scene, new object[] { new PermissionsModule() });
+            SceneHelpers.SetupSceneModules(scene, new PermissionsModule());
             IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
             
             // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
@@ -87,7 +107,59 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             sogd.InventoryDeQueueAndDelete();
             
             SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId);
-            Assert.That(retrievedPart2, Is.Null);
+            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.SetUpInformClientOfNeighbour(clientB, childClientsB);
+
+            SceneHelpers.AddScenePresence(sceneB, clientB, acd);
+
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(sceneA);
+            uint soLocalId = so.LocalId;
+
+            sceneA.DeleteSceneObject(so, false);
+
+            Assert.That(clientA.ReceivedKills.Count, Is.EqualTo(1));
+            Assert.That(clientA.ReceivedKills[0], Is.EqualTo(soLocalId));
+
+            Assert.That(childClientsB[0].ReceivedKills.Count, Is.EqualTo(1));
+            Assert.That(childClientsB[0].ReceivedKills[0], Is.EqualTo(soLocalId));
         }
         
         /// <summary>
@@ -106,7 +178,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001");
             
             TestScene scene = new SceneHelpers().SetupScene();
-            SceneHelpers.SetupSceneModules(scene, new object[] { new PermissionsModule() });            
+            SceneHelpers.SetupSceneModules(scene, new PermissionsModule());            
             IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
             
             // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
index 8775949..5a72239 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);
 
-            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;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
index de4458d..297c66b 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
@@ -139,7 +139,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 = new Vector3(30, 31, 32);
 
             List<TestClient> destinationTestClients = new List<TestClient>();
@@ -224,7 +224,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 +300,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 +389,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(
@@ -428,7 +428,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestSameSimulatorNeighbouringRegions()
         {
             TestHelpers.InMethod();
-            TestHelpers.EnableLogging();
+//            TestHelpers.EnableLogging();
 
             UUID userId = TestHelpers.ParseTail(0x1);
 
@@ -458,11 +458,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             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);
 
-            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);
diff --git a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
index 6cc7ff2..1b960b1 100644
--- a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Tests.Common
                 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);
             };
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/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 664ecb6..3f9690f 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; }
@@ -434,33 +434,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>();
@@ -534,11 +522,13 @@ namespace OpenSim.Tests.Common.Mock
 
         public virtual void SendKillObject(ulong regionHandle, List<uint> localID)
         {
+            ReceivedKills.AddRange(localID);
         }
 
         public virtual void SetChildAgentThrottle(byte[] throttle)
         {
         }
+
         public byte[] GetThrottlesPacked(float multiplier)
         {
             return new byte[0];
-- 
cgit v1.1


From 3290cd09d3ecd45c52bd131ada2a793c48fd99dc Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 9 May 2013 18:12:17 +0100
Subject: remove pointless region handle paramter from
 IClientAPI.SendKillObject()

---
 OpenSim/Framework/IClientAPI.cs                                      | 3 +--
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs                | 5 ++---
 OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs   | 2 +-
 OpenSim/Region/Framework/Scenes/Scene.cs                             | 5 +++--
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs                  | 2 +-
 .../Agent/InternetRelayClientView/Server/IRCClientView.cs            | 2 +-
 OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs                | 2 +-
 OpenSim/Tests/Common/Mock/TestClient.cs                              | 4 +---
 8 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index cfb36fe..59ce2c4 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1097,9 +1097,8 @@ namespace OpenSim.Framework
         /// <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);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 47dd842..e014471 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1588,7 +1588,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutPacket(pc, ThrottleOutPacketType.Unknown);
         }
 
-        public void SendKillObject(ulong regionHandle, List<uint> localIDs)
+        public void SendKillObject(List<uint> localIDs)
         {
 //            m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle);
 
@@ -11555,8 +11555,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
                     {
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 7d16635..f69ec21 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -776,7 +776,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 });
                             });
                 }
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2aba2dd..8cdde3f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3480,7 +3480,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) { }
                             });
                     }
@@ -3560,7 +3560,8 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 deleteIDs.Add(localID);
             }
-            ForEachClient(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, deleteIDs); });
+
+            ForEachClient(c => c.SendKillObject(deleteIDs));
         }
 
         #endregion
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 3b2f537..38fa26a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1247,7 +1247,7 @@ namespace OpenSim.Region.Framework.Scenes
                             if (!IsAttachment
                                 || AttachedAvatar == sp.UUID
                                 || !HasPrivateAttachmentPoint)
-                                sp.ControllingClient.SendKillObject(m_regionHandle, new List<uint> { part.LocalId });
+                                sp.ControllingClient.SendKillObject(new List<uint> { part.LocalId });
                         }
                     }
                 });
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 3644856..384eb1f 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -950,7 +950,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
             
         }
 
-        public void SendKillObject(ulong regionHandle, List<uint> localID)
+        public void SendKillObject(List<uint> localID)
         {
             
         }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 8aae300..553443f 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -592,7 +592,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
 
         }
 
-        public virtual void SendKillObject(ulong regionHandle, List<uint> localID)
+        public virtual void SendKillObject(List<uint> localID)
         {
         }
 
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 3f9690f..09e751a 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -517,10 +517,9 @@ 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);
         }
@@ -534,7 +533,6 @@ namespace OpenSim.Tests.Common.Mock
             return new byte[0];
         }
 
-
         public virtual void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId, UUID[] objectIDs)
         {
         }
-- 
cgit v1.1


From b4a6f2195d6d1a3a5f91715f7badf4cc983f7689 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 9 May 2013 18:53:34 +0100
Subject: Only send one kill object to the deleter when they derez an object
 rather than two.

Extend regression test to check this.
---
 .../Framework/Scenes/AsyncSceneObjectGroupDeleter.cs  | 10 ++--------
 .../Framework/Scenes/Tests/SceneObjectDeRezTests.cs   | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 17 deletions(-)

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/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index f738ff1..d670dad 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -84,30 +84,31 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             
             TestScene scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(scene, new PermissionsModule());
-            IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
+            TestClient client = (TestClient)SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
             
             // 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);
+            SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
             Assert.That(retrievedPart2, Is.Null);              
+
+            Assert.That(client.ReceivedKills.Count, Is.EqualTo(1));
+            Assert.That(client.ReceivedKills[0], Is.EqualTo(soLocalId));
         }
 
         /// <summary>
-- 
cgit v1.1


From 9978f36d9f4edf89168093c0cd9b15281e02dc2a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 9 May 2013 22:43:16 +0100
Subject: Don't send BulkUpdateInventory at the end up of
 UpdateInventoryItemAsset().

This is causing editing of worn clothes to fail frequently, possibly due to a race condition with a transaction.
This looks to address http://opensimulator.org/mantis/view.php?id=6600
---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 8ddaa60..80581dc 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -490,7 +490,10 @@ namespace OpenSim.Region.Framework.Scenes
                     item.SaleType = itemUpd.SaleType;
 
                     InventoryService.UpdateItem(item);
-                    remoteClient.SendBulkUpdateInventory(item);
+
+                    // We cannot send out a bulk update here, since this will cause editing of clothing to start 
+                    // failing frequently.  Possibly this is a race with a separate transaction that uploads the asset.
+//                    remoteClient.SendBulkUpdateInventory(item);
                 }
 
                 if (UUID.Zero != transactionID)
-- 
cgit v1.1


From 0e6ad9482919bb551427003d76fe924bd8b7bde7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 9 May 2013 22:44:45 +0100
Subject: minor: Remove mono compiler warning in RemoteAdminPlugin

---
 OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index ad683b8..3abf40b 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1768,7 +1768,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             m_log.Info("[RADMIN]: Received Estate Reload Request");
 
             Hashtable responseData = (Hashtable)response.Value;
-            Hashtable requestData = (Hashtable)request.Params[0];
+//            Hashtable requestData = (Hashtable)request.Params[0];
 
             m_application.SceneManager.ForEachScene(s => 
                 s.RegionInfo.EstateSettings = m_application.EstateDataService.LoadEstateSettings(s.RegionInfo.RegionID, false)                
-- 
cgit v1.1


From 292a6037add00c9e8f817c733d8fc375806caf99 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 9 May 2013 22:48:10 +0100
Subject: minor: Remove unnecessary code that was generating warning in
 TestXInventoryDataPlugin

---
 OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
index 30b1f38..2be5524 100644
--- a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
@@ -118,8 +118,8 @@ namespace OpenSim.Tests.Common.Mock
 
             folder.parentFolderID = new UUID(newParent);
 
-            XInventoryFolder[] newParentFolders 
-                = GetFolders(new string[] { "folderID" }, new string[] { folder.parentFolderID.ToString() });
+//            XInventoryFolder[] newParentFolders 
+//                = GetFolders(new string[] { "folderID" }, new string[] { folder.parentFolderID.ToString() });
 
 //            Console.WriteLine(
 //                "Moved folder {0} {1}, to {2} {3}", 
-- 
cgit v1.1


From ff0332730d54cf23c53795a9e6bac0262b6c86c3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 9 May 2013 23:11:37 +0100
Subject: Implement delete key for local console

---
 OpenSim/Framework/Console/LocalConsole.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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;
-- 
cgit v1.1


From a1031772ebc240a3cda9cb8dcf581678be4b2143 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 10 May 2013 08:09:26 -0700
Subject: Delete debug message

---
 OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
index d7af1f2..9f2aed0 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
@@ -71,7 +71,6 @@ namespace OpenSim.Region.ClientStack.Linden
                 return;
 
             m_URL = config.GetString("Cap_AvatarPickerSearch", string.Empty);
-            m_log.DebugFormat("[XXX]: Cap_AvatarPickerSearch = {0}", m_URL);
             // Cap doesn't exist
             if (m_URL != string.Empty)
                 m_Enabled = true;
-- 
cgit v1.1


From a42bb799cca27c0dddbecbd2edd2bd5e6d379472 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 10 May 2013 14:48:52 -0700
Subject: BulletSim: fix CPU loop that occurs when any 'degenerate' sculptie is
 in a region. This fixes the high CPU usage for regions with nothing else
 going on.

---
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 9d47657..262d734 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -368,9 +368,10 @@ public class BSShapeMesh : BSShape
 
                 // Check to see if mesh was created (might require an asset).
                 newShape = VerifyMeshCreated(physicsScene, newShape, prim);
-                if (!newShape.isNativeShape)
+                if (!newShape.isNativeShape || prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Failed)
                 {
                     // 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);
                 }
 
@@ -481,8 +482,11 @@ public class BSShapeMesh : BSShape
             }
             else
             {
+                // Force the asset condition to 'failed' so we won't try to keep fetching and processing this mesh.
+                prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
                 physicsScene.Logger.DebugFormat("{0} All mesh triangles degenerate. Prim {1} at {2} in {3}",
                                     LogHeader, prim.PhysObjectName, prim.RawPosition, physicsScene.Name);
+                physicsScene.DetailLog("{0},BSShapeMesh.CreatePhysicalMesh,allDegenerate,key={1}", prim.LocalID, newMeshKey);
             }
         }
         newShape.shapeKey = newMeshKey;
@@ -521,7 +525,7 @@ public class BSShapeHull : BSShape
 
                 // Check to see if hull was created (might require an asset).
                 newShape = VerifyMeshCreated(physicsScene, newShape, prim);
-                if (!newShape.isNativeShape)
+                if (!newShape.isNativeShape || prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Failed)
                 {
                     // If a mesh was what was created, remember the built shape for later sharing.
                     Hulls.Add(newHullKey, retHull);
-- 
cgit v1.1


From 81d8deb1a830765ec64948db5ec3902894761f24 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 11 May 2013 01:27:37 +0100
Subject: Send up the part missing from the Avination Estate commit. Warning -
 contains a small migration.

---
 .../Data/MySQL/Resources/EstateStore.migrations    |  6 ++++
 .../Data/SQLite/Resources/EstateStore.migrations   |  9 ++++++
 OpenSim/Framework/EstateSettings.cs                | 34 +++++++++++++++++++++-
 .../World/Estate/EstateManagementModule.cs         | 12 ++++++++
 OpenSim/Region/Framework/Scenes/Scene.cs           |  2 --
 5 files changed, 60 insertions(+), 3 deletions(-)

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/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/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index a92abbf..a02993d 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -58,6 +58,30 @@ namespace OpenSim.Framework
             set { m_EstateName = value; }
         }
 
+        private bool m_AllowLandmark = true;
+
+        public bool AllowLandmark
+        {
+            get { return m_AllowLandmark; }
+            set { m_AllowLandmark = value; }
+        }
+
+        private bool m_AllowParcelChanges = true;
+
+        public bool AllowParcelChanges
+        {
+            get { return m_AllowParcelChanges; }
+            set { m_AllowParcelChanges = value; }
+        }
+
+        private bool m_AllowSetHome = true;
+
+        public bool AllowSetHome
+        {
+            get { return m_AllowSetHome; }
+            set { m_AllowSetHome = value; }
+        }
+
         private uint m_ParentEstateID = 1;
 
         public uint ParentEstateID
@@ -374,10 +398,18 @@ namespace OpenSim.Framework
             return l_EstateAccess.Contains(user);
         }
 
+        public void SetFromFlags(ulong regionFlags)
+        {
+            ResetHomeOnTeleport = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.ResetHomeOnTeleport) == (ulong)OpenMetaverse.RegionFlags.ResetHomeOnTeleport);
+            BlockDwell = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.BlockDwell) == (ulong)OpenMetaverse.RegionFlags.BlockDwell);
+            AllowLandmark = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.AllowLandmark) == (ulong)OpenMetaverse.RegionFlags.AllowLandmark);
+            AllowParcelChanges = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.AllowParcelChanges) == (ulong)OpenMetaverse.RegionFlags.AllowParcelChanges);
+            AllowSetHome = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.AllowSetHome) == (ulong)OpenMetaverse.RegionFlags.AllowSetHome);
+        }
+
         public bool GroupAccess(UUID groupID)
         {
             return l_EstateGroups.Contains(groupID);
         }
-
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 91f6501..121b2aa 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -1245,6 +1245,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 flags |= RegionFlags.NoFly;
             if (Scene.RegionInfo.RegionSettings.RestrictPushing)
                 flags |= RegionFlags.RestrictPushObject;
+            if (Scene.RegionInfo.RegionSettings.AllowLandJoinDivide)
+                flags |= RegionFlags.AllowParcelChanges;
             if (Scene.RegionInfo.RegionSettings.BlockShowInSearch)
                 flags |= RegionFlags.BlockParcelSearch;
 
@@ -1254,6 +1256,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 flags |= RegionFlags.Sandbox;
             if (Scene.RegionInfo.EstateSettings.AllowVoice)
                 flags |= RegionFlags.AllowVoice;
+            if (Scene.RegionInfo.EstateSettings.AllowLandmark)
+                flags |= RegionFlags.AllowLandmark;
+            if (Scene.RegionInfo.EstateSettings.AllowSetHome)
+                flags |= RegionFlags.AllowSetHome;
             if (Scene.RegionInfo.EstateSettings.BlockDwell)
                 flags |= RegionFlags.BlockDwell;
             if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport)
@@ -1299,6 +1305,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 flags |= RegionFlags.ResetHomeOnTeleport;
             if (Scene.RegionInfo.EstateSettings.TaxFree)
                 flags |= RegionFlags.TaxFree;
+            if (Scene.RegionInfo.EstateSettings.AllowLandmark)
+                flags |= RegionFlags.AllowLandmark;
+            if (Scene.RegionInfo.EstateSettings.AllowParcelChanges)
+                flags |= RegionFlags.AllowParcelChanges;
+            if (Scene.RegionInfo.EstateSettings.AllowSetHome)
+                flags |= RegionFlags.AllowSetHome;
             if (Scene.RegionInfo.EstateSettings.DenyMinors)
                 flags |= (RegionFlags)(1 << 30);
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2aba2dd..1fa2fc7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4188,8 +4188,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
-
             // TODO: This check should probably be in QueryAccess().
             ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2);
             if (nearestParcel == null)
-- 
cgit v1.1


From 48f8b884c33ba5f5b7991d1047f4f2f988eb7415 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 11 May 2013 07:15:09 -0700
Subject: Handle SetHome properly

---
 .../CoreModules/World/Land/LandManagementModule.cs | 59 ++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 693de1d..c295f3a 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -74,6 +74,8 @@ namespace OpenSim.Region.CoreModules.World.Land
         
         protected IUserManagement m_userManager;
         protected IPrimCountModule m_primCountModule;
+        protected IDialogModule m_Dialog;
+        protected IGroupsModule m_Groups;
 
         // Minimum for parcels to work is 64m even if we don't actually use them.
         #pragma warning disable 0429
@@ -153,6 +155,8 @@ namespace OpenSim.Region.CoreModules.World.Land
         {
              m_userManager = m_scene.RequestModuleInterface<IUserManagement>();         
              m_primCountModule = m_scene.RequestModuleInterface<IPrimCountModule>();
+             m_Dialog = m_scene.RequestModuleInterface<IDialogModule>();
+             m_Groups = m_scene.RequestModuleInterface<IGroupsModule>();
         }
 
         public void RemoveRegion(Scene scene)
@@ -212,6 +216,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             client.OnPreAgentUpdate += ClientOnPreAgentUpdate;
             client.OnParcelEjectUser += ClientOnParcelEjectUser;
             client.OnParcelFreezeUser += ClientOnParcelFreezeUser;
+            client.OnSetStartLocationRequest += ClientOnSetHome;
 
 
             EntityBase presenceEntity;
@@ -1823,6 +1828,60 @@ namespace OpenSim.Region.CoreModules.World.Land
             }
         }
 
+        /// <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)
+        {
+            m_log.DebugFormat("[XXX]: SetHome");
+            // 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;
+            }
+
+            // Can the user set home here?
+            bool canSetHome = false;
+            // (a) land owners can set home
+            if (remoteClient.AgentId == land.LandData.OwnerID)
+                canSetHome = true;
+            // (b) members of land-owned group in roles that can set home
+            if (land.LandData.IsGroupOwned && m_Groups != null)
+            {
+                ulong gpowers = remoteClient.GetGroupPowers(land.LandData.GroupID);
+                m_log.DebugFormat("[XXX]: GroupPowers 0x{0:x16}", gpowers);
+                if ((gpowers & (ulong)GroupPowers.AllowSetHome) == 1)
+                    canSetHome = true;
+            }
+            // (c) parcels with telehubs can be the home of anyone
+            if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero)
+            {
+                // If the telehub in this parcel?
+                SceneObjectGroup telehub = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject);
+                if (telehub != null && land.ContainsPoint((int)telehub.AbsolutePosition.X, (int)telehub.AbsolutePosition.Y))
+                    canSetHome = true;
+            }
+
+            if (canSetHome)
+            {
+                if (m_scene.GridUserService != null && 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
-- 
cgit v1.1


From a4431381fa8a4f759a9c7eb9e30ae915504d4fdc Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 11 May 2013 07:58:14 -0700
Subject: Finalize the logic for SetHome. See comments in
 Land/LandManagementModule.cs about who has permission to set home where.

---
 .../CoreModules/World/Land/LandManagementModule.cs | 47 +++++++++-------------
 .../Region/CoreModules/World/Land/LandObject.cs    |  7 ----
 OpenSim/Region/Framework/Scenes/Scene.cs           | 19 ---------
 3 files changed, 19 insertions(+), 54 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index c295f3a..1789d6d 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -75,7 +75,6 @@ namespace OpenSim.Region.CoreModules.World.Land
         protected IUserManagement m_userManager;
         protected IPrimCountModule m_primCountModule;
         protected IDialogModule m_Dialog;
-        protected IGroupsModule m_Groups;
 
         // Minimum for parcels to work is 64m even if we don't actually use them.
         #pragma warning disable 0429
@@ -156,7 +155,6 @@ namespace OpenSim.Region.CoreModules.World.Land
              m_userManager = m_scene.RequestModuleInterface<IUserManagement>();         
              m_primCountModule = m_scene.RequestModuleInterface<IPrimCountModule>();
              m_Dialog = m_scene.RequestModuleInterface<IDialogModule>();
-             m_Groups = m_scene.RequestModuleInterface<IGroupsModule>();
         }
 
         public void RemoveRegion(Scene scene)
@@ -1838,44 +1836,37 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// <param name="flags"></param>
         public virtual void ClientOnSetHome(IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags)
         {
-            m_log.DebugFormat("[XXX]: SetHome");
             // 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.");
+                m_Dialog.SendAlertToUser(remoteClient, "Set Home request failed.");
                 return;
             }
 
-            // Can the user set home here?
-            bool canSetHome = false;
-            // (a) land owners can set home
-            if (remoteClient.AgentId == land.LandData.OwnerID)
-                canSetHome = true;
-            // (b) members of land-owned group in roles that can set home
-            if (land.LandData.IsGroupOwned && m_Groups != null)
-            {
-                ulong gpowers = remoteClient.GetGroupPowers(land.LandData.GroupID);
-                m_log.DebugFormat("[XXX]: GroupPowers 0x{0:x16}", gpowers);
-                if ((gpowers & (ulong)GroupPowers.AllowSetHome) == 1)
-                    canSetHome = true;
-            }
-            // (c) parcels with telehubs can be the home of anyone
+            // Gather some data
+            ulong gpowers = remoteClient.GetGroupPowers(land.LandData.GroupID);
+            SceneObjectGroup telehub = null;
             if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero)
-            {
-                // If the telehub in this parcel?
-                SceneObjectGroup telehub = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject);
-                if (telehub != null && land.ContainsPoint((int)telehub.AbsolutePosition.X, (int)telehub.AbsolutePosition.Y))
-                    canSetHome = true;
-            }
+                // Does the telehub exist in the scene?
+                telehub = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject);
 
-            if (canSetHome)
-            {
-                if (m_scene.GridUserService != null && m_scene.GridUserService.SetHome(remoteClient.AgentId.ToString(), land.RegionUUID, position, lookAt))
+            // 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.");
+                    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.");
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 5969d45..8406442 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -228,13 +228,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/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 80c4922..6bbcbd7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3090,7 +3090,6 @@ namespace OpenSim.Region.Framework.Scenes
         {
             //client.OnNameFromUUIDRequest += HandleUUIDNameRequest;
             client.OnMoneyTransferRequest += ProcessMoneyTransferRequest;
-            client.OnSetStartLocationRequest += SetHomeRezPoint;
             client.OnRegionHandleRequest += RegionHandleRequest;
         }
         
@@ -3215,7 +3214,6 @@ namespace OpenSim.Region.Framework.Scenes
         {
             //client.OnNameFromUUIDRequest -= HandleUUIDNameRequest;
             client.OnMoneyTransferRequest -= ProcessMoneyTransferRequest;
-            client.OnSetStartLocationRequest -= SetHomeRezPoint;
             client.OnRegionHandleRequest -= RegionHandleRequest;
         }
 
@@ -3342,23 +3340,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)
-        {
-            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>
-- 
cgit v1.1


From 25fea820490603227432639dde1305957555abb2 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 13 May 2013 07:29:17 -0700
Subject: Fixes mantis #6636 -- Groups

---
 OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | 1 -
 OpenSim/Addons/Groups/Service/GroupsService.cs                    | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
index f670272..7e0b112 100644
--- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
@@ -186,7 +186,6 @@ namespace OpenSim.Groups
         public UUID CreateGroup(UUID RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, 
             bool allowPublish, bool maturePublish, UUID founderID, out string reason)
         {
-            m_log.DebugFormat("[Groups]: Creating group {0}", name);
             reason = string.Empty;
             if (m_UserManagement.IsLocalGridUser(RequestingAgentID))
                 return m_LocalGroupsConnector.CreateGroup(RequestingAgentID, name, charter, showInList, insigniaID, 
diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs
index 6a4348b..a2ef13a 100644
--- a/OpenSim/Addons/Groups/Service/GroupsService.cs
+++ b/OpenSim/Addons/Groups/Service/GroupsService.cs
@@ -130,6 +130,13 @@ namespace OpenSim.Groups
         {
             reason = string.Empty;
 
+            // Check if the group already exists
+            if (m_Database.RetrieveGroup(name) != null)
+            {
+                reason = "A group with that name already exists";
+                return UUID.Zero;
+            }
+
             // Create the group
             GroupData data = new GroupData();
             data.GroupID = UUID.Random();
-- 
cgit v1.1


From af1fa958756a2c76810847a2059befa071956d09 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 13 May 2013 11:36:17 -0700
Subject: Groups: Improve error handling on remote connector.

---
 .../Addons/Groups/Remote/GroupsServiceRobustConnector.cs    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
index f991d01..28f7acc 100644
--- a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
+++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
@@ -170,11 +170,16 @@ namespace OpenSim.Groups
 
                 }
 
-                grec = m_GroupsService.GetGroupRecord(RequestingAgentID, grec.GroupID);
-                if (grec == null)
-                    NullResult(result, "Internal Error");
+                if (grec.GroupID != UUID.Zero)
+                {
+                    grec = m_GroupsService.GetGroupRecord(RequestingAgentID, grec.GroupID);
+                    if (grec == null)
+                        NullResult(result, "Internal Error");
+                    else
+                        result["RESULT"] = GroupsDataUtils.GroupRecord(grec);
+                }
                 else
-                    result["RESULT"] = GroupsDataUtils.GroupRecord(grec);
+                    NullResult(result, reason);
             }
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
-- 
cgit v1.1


From 4194d935ecd21a922859a640cb28acec7e5bae45 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 13 May 2013 13:07:39 -0700
Subject: Fixed mantis #6609 -- LoadPlugin error messages on Robust.

---
 OpenSim/Server/Base/ServerUtils.cs                               | 2 +-
 OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs   | 8 ++++++--
 .../Server/Handlers/Hypergrid/InstantMessageServerConnector.cs   | 7 ++++++-
 OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs    | 7 ++++++-
 OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs       | 9 +++++++--
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 25957d3..08ba50d 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -286,7 +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}", dllName, e.Message);
+                                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/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/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..b20f467 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)
         {
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"];
-- 
cgit v1.1


From 45f37e11ad6e9a9917a6ea07ec52dec9058393f0 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 13 May 2013 08:40:24 -0700
Subject: BulletSim: use heightmap terrain when using BulletXNA. Output
 messages on features disabled when using BulletXNA.

---
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 2 +-
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 3ca7e16..5504478 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -90,7 +90,7 @@ public static class BSParam
     public static bool ShouldUseBulletHACD { get; set; }
     public static bool ShouldUseSingleConvexHullForPrims { 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; }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index a4a8794..3f407ce 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -318,8 +318,12 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
                 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}    Setting terrain implimentation to Heightmap", LogHeader);
+                BSParam.TerrainImplementation = (float)BSTerrainPhys.TerrainImplementation.Heightmap;
                 break;
         }
 
-- 
cgit v1.1


From 15360cbb6ba83e40f474cca84082c908af49c58e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 13 May 2013 13:03:13 -0700
Subject: BulletSim: add adjustment for avatar capsule height scaling. Makes
 avatar standing on ground view better and enables tuning.

---
 .../Region/Physics/BulletSPlugin/BSCharacter.cs    | 27 ++++++++++++++++++----
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs    |  9 ++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 542f732..3671fc2 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.
  *
@@ -649,12 +649,12 @@ public sealed class BSCharacter : BSPhysObject
         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.
 
@@ -662,8 +662,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;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 5504478..d33292f 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -125,6 +125,9 @@ 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 float AvatarBelowGroundUpCorrectionMeters { get; private set; }
 	public static float AvatarStepHeight { get; private set; }
@@ -539,6 +542,12 @@ public static class BSParam
             0.45f ),
         new ParameterDefn<float>("AvatarCapsuleHeight", "Default height of space around avatar",
             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.1f ),
+        new ParameterDefn<float>("AvatarHeightHighFudge", "A fudge factor to make tall avatars stand on the ground",
+            0.1f ),
 	    new ParameterDefn<float>("AvatarContactProcessingThreshold", "Distance from capsule to check for collisions",
             0.1f ),
 	    new ParameterDefn<float>("AvatarBelowGroundUpCorrectionMeters", "Meters to move avatar up if it seems to be below ground",
-- 
cgit v1.1


From c86e828dbfed8b9cf72c7e7e8d1dad0c0e9f8940 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 13 May 2013 13:05:27 -0700
Subject: BulletSim: add a lock to try and catch a native shape
 creation/destruction race condition.

---
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 262d734..72d039b 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -283,8 +283,13 @@ public class BSShapeNative : BSShape
     public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim)
     {
         // Native shapes are not shared so we return a new shape.
-        return new BSShapeNative(CreatePhysicalNativeShape(pPhysicsScene, pPrim,
-                                    physShapeInfo.shapeType, (FixedShapeKey)physShapeInfo.shapeKey) );
+        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.
-- 
cgit v1.1


From f32a21d96707f87ecbdaf42c0059f8494a119d31 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 14 May 2013 08:12:01 -0700
Subject: HGTP-mesh bug: the mesh download requests were going to the departing
 sims for a little while. This was also true for local TPs. BUt for local TPs
 the assets are on the same server, so it doesn't matter. For HGTPs, it
 matters. This potential fix moves sending the initial data to later, after
 the client has completed the movement into the region. Fingers crossed that
 it doesn't mess other things up!

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 3 ---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs     | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 985aa4d..0fa1c0e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1371,9 +1371,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // circuit code to the existing child agent.  This is not particularly obvious.
                     SendAckImmediate(endPoint, uccp.Header.Sequence);
             
-                    // 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();
                 }
                 else
                 {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 215a689..be78bd0 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1348,6 +1348,8 @@ namespace OpenSim.Region.Framework.Scenes
             // Create child agents in neighbouring regions
             if (openChildAgents && !IsChildAgent)
             {
+                SendInitialDataToMe();
+
                 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
                 if (m_agentTransfer != null)
                     Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); });
@@ -1355,6 +1357,7 @@ namespace OpenSim.Region.Framework.Scenes
                 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
                 if (friendsModule != null)
                     friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
+
             }
 
             // XXX: If we force an update here, then multiple attachments do appear correctly on a destination region
-- 
cgit v1.1


From 645da54f25bb034eb76151daa9723763eae13303 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 14 May 2013 08:47:18 -0700
Subject: Revert "HGTP-mesh bug: the mesh download requests were going to the
 departing sims for a little while. This was also true for local TPs. BUt for
 local TPs the assets are on the same server, so it doesn't matter. For HGTPs,
 it matters. This potential fix moves sending the initial data to later, after
 the client has completed the movement into the region. Fingers crossed that
 it doesn't mess other things up!"

This reverts commit f32a21d96707f87ecbdaf42c0059f8494a119d31.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 3 +++
 OpenSim/Region/Framework/Scenes/ScenePresence.cs     | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 0fa1c0e..985aa4d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1371,6 +1371,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // circuit code to the existing child agent.  This is not particularly obvious.
                     SendAckImmediate(endPoint, uccp.Header.Sequence);
             
+                    // 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();
                 }
                 else
                 {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index be78bd0..215a689 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1348,8 +1348,6 @@ namespace OpenSim.Region.Framework.Scenes
             // Create child agents in neighbouring regions
             if (openChildAgents && !IsChildAgent)
             {
-                SendInitialDataToMe();
-
                 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
                 if (m_agentTransfer != null)
                     Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); });
@@ -1357,7 +1355,6 @@ namespace OpenSim.Region.Framework.Scenes
                 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
                 if (friendsModule != null)
                     friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
-
             }
 
             // XXX: If we force an update here, then multiple attachments do appear correctly on a destination region
-- 
cgit v1.1


From b135f1d58a1f3532cb198bf25680864e335d4cb1 Mon Sep 17 00:00:00 2001
From: Vegaslon
Date: Thu, 9 May 2013 10:25:44 -0400
Subject: BulletSim: Fix for mantis 6487, also minor adjustment to fix flying
 while you are running.

Signed-off-by: Robert Adams <Robert.Adams@intel.com>
---
 OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 3671fc2..ff5b6ab 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -419,7 +419,7 @@ public sealed class BSCharacter : BSPhysObject
             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);
 
             if (m_moveActor != null)
@@ -481,7 +481,10 @@ public sealed class BSCharacter : BSPhysObject
                 _orientation = 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 keeps us from flipping the capsule over which the veiwer does not understand.
+                    ForceOrientation = new OMV.Quaternion(0, 0, _orientation.Z,0);
                 });
             }
         }
-- 
cgit v1.1


From 91091c3e5453088242e05a682283fc7f9f5c7ae3 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 14 May 2013 09:06:58 -0700
Subject: Second take at HGTP-mesh bug: delay sending the initial data only for
 agents that are coming via TP (root agents)

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 8 +++++++-
 OpenSim/Region/Framework/Scenes/ScenePresence.cs     | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 985aa4d..8eb2e06 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1373,7 +1373,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 meshes from
+                        if (!tp)
+                            client.SceneAgent.SendInitialDataToMe();
+                    }
                 }
                 else
                 {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 215a689..2a265db 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1348,6 +1348,7 @@ namespace OpenSim.Region.Framework.Scenes
             // Create child agents in neighbouring regions
             if (openChildAgents && !IsChildAgent)
             {
+                SendInitialDataToMe();
                 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
                 if (m_agentTransfer != null)
                     Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); });
-- 
cgit v1.1


From e9847a4dbd5657c16b11835301167a98e7ca7e55 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 14 May 2013 19:44:41 +0100
Subject: Comment out some debugging item permission messages since these are
 highly noisy on the console.

Please re-enable when required
---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 80581dc..6c79b13 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -422,13 +422,13 @@ namespace OpenSim.Region.Framework.Scenes
                     // 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
@@ -452,7 +452,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);
                         }
                     }
-- 
cgit v1.1


From df2a0fec5f2b0d7e9938c1bc1bdc965b767ec25f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 14 May 2013 20:11:58 +0100
Subject: Comment out log message about looking for asset data in remove asset
 service for now, in order to reduce log levels in a test region with many hg
 origin avatars

---
 OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
index afbe56b..a168bfe 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
@@ -426,7 +426,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     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;
                 }
-- 
cgit v1.1


From 23ebae1828a540a7754dafae1794467582fe35d5 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 14 May 2013 13:40:07 -0700
Subject: Eliminate race condition where SimStatsReporter starts reporting
 stats before the region is completely initialized.

---
 OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index b9d615e..95f9caf 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -289,6 +289,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         private void statsHeartBeat(object sender, EventArgs e)
         {
+            if (!m_scene.Active)
+                return;
+
             SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[22];
             SimStatsPacket.RegionBlock rb = new SimStatsPacket.RegionBlock();
             
-- 
cgit v1.1


From 177a53fbcf521767f7277ccccabad689d7674953 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 15 May 2013 22:04:38 +0100
Subject: Fix issue where osMakeNotecard() would fail if given a list
 containing vectors or quaternions.

http://opensimulator.org/mantis/view.php?id=6640
---
 OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 60 ++++++++++++-------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 44fdd1a..9ca5ca9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -544,21 +544,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)
@@ -589,26 +601,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)
-- 
cgit v1.1


From 12289c4fd1f06371b317453f69283f1de11a9781 Mon Sep 17 00:00:00 2001
From: Latif Khalifa
Date: Thu, 16 May 2013 00:02:28 +0200
Subject: Removed obsolete libopenmetaverse file

---
 bin/OpenMetaverse.Http.XML | 57 ----------------------------------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 bin/OpenMetaverse.Http.XML

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>
-- 
cgit v1.1


From 71a5cc204146b33e291bae60a68b9913751d6c8c Mon Sep 17 00:00:00 2001
From: Latif Khalifa
Date: Thu, 16 May 2013 00:07:55 +0200
Subject: Updated libopenmetaverse to a5ad7f200e9bd2e91604ba921d1db3768108686b

---
 bin/OpenMetaverse.Rendering.Meshmerizer.dll |   Bin 24576 -> 24576 bytes
 bin/OpenMetaverse.StructuredData.XML        |   234 +-
 bin/OpenMetaverse.StructuredData.dll        |   Bin 102400 -> 102400 bytes
 bin/OpenMetaverse.XML                       | 34510 +++++++++++++-------------
 bin/OpenMetaverse.dll                       |   Bin 1785856 -> 1785856 bytes
 bin/OpenMetaverseTypes.XML                  |  3596 +--
 bin/OpenMetaverseTypes.dll                  |   Bin 114688 -> 114688 bytes
 7 files changed, 19170 insertions(+), 19170 deletions(-)

diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index 30b9c7b..100916c 100755
Binary files a/bin/OpenMetaverse.Rendering.Meshmerizer.dll and b/bin/OpenMetaverse.Rendering.Meshmerizer.dll differ
diff --git a/bin/OpenMetaverse.StructuredData.XML b/bin/OpenMetaverse.StructuredData.XML
index 3999d99..789ad5b 100644
--- a/bin/OpenMetaverse.StructuredData.XML
+++ b/bin/OpenMetaverse.StructuredData.XML
@@ -4,6 +4,123 @@
         <name>OpenMetaverse.StructuredData</name>
     </assembly>
     <members>
+        <member name="T:OpenMetaverse.StructuredData.OSDType">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Unknown">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Boolean">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Integer">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Real">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.String">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.UUID">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Date">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.URI">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Binary">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Map">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Array">
+            <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)">
+            <summary>
+            Uses reflection to create an SDMap from all of the SD
+            serializable types in an object
+            </summary>
+            <param name="obj">Class or struct containing serializable types</param>
+            <returns>An SDMap holding the serialized values from the
+            container object</returns>
+        </member>
+        <member name="M:OpenMetaverse.StructuredData.OSD.DeserializeMembers(System.Object@,OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Uses reflection to deserialize member variables in an object from
+            an SDMap
+            </summary>
+            <param name="obj">Reference to an object to fill with deserialized
+            values</param>
+            <param name="serialized">Serialized values to put in the target
+            object</param>
+        </member>
+        <member name="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>
             
@@ -228,122 +345,5 @@
             <param name="c"></param>
             <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.StructuredData.OSDType">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Unknown">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Boolean">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Integer">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Real">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.String">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.UUID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Date">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.URI">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Binary">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Map">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Array">
-            <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)">
-            <summary>
-            Uses reflection to create an SDMap from all of the SD
-            serializable types in an object
-            </summary>
-            <param name="obj">Class or struct containing serializable types</param>
-            <returns>An SDMap holding the serialized values from the
-            container object</returns>
-        </member>
-        <member name="M:OpenMetaverse.StructuredData.OSD.DeserializeMembers(System.Object@,OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Uses reflection to deserialize member variables in an object from
-            an SDMap
-            </summary>
-            <param name="obj">Reference to an object to fill with deserialized
-            values</param>
-            <param name="serialized">Serialized values to put in the target
-            object</param>
-        </member>
-        <member name="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>
     </members>
 </doc>
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index 4df771a..bb16ed0 100755
Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ
diff --git a/bin/OpenMetaverse.XML b/bin/OpenMetaverse.XML
index abd4cd5..457cbe1 100644
--- a/bin/OpenMetaverse.XML
+++ b/bin/OpenMetaverse.XML
@@ -24,6 +24,65 @@
             <param name="port"></param>
             <returns></returns>
         </member>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxGetCaptureDevices">
+            <summary>
+            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="M:OpenMetaverse.Voice.VoiceGateway.AuxGetRenderDevices">
+            <summary>
+            This is used to get a list of audio devices that can be used for render (playback) of voice.
+            </summary>
+        </member>
+        <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="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="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="M:OpenMetaverse.Voice.VoiceGateway.AuxCaptureAudioStop">
+            <summary>
+            This command is used to stop the audio capture process.
+            </summary>
+            <returns></returns>
+        </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>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxSetSpeakerLevel(System.Int32)">
+            <summary>
+            This command is used to set the speaker volume while in the audio tuning
+            process. Once an acceptable speaker level is attained, the application must
+            issue a connector set speaker volume command to have that level be used while
+            on voice calls.
+            </summary>
+            <param name="Level">the speaker volume (-100 to 100 inclusive)</param>
+            <returns></returns>
+        </member>
         <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionCreate(System.String,System.String,System.String,System.String,System.Boolean,System.Boolean,System.String)">
             <summary>
             Create a Session
@@ -97,65 +156,6 @@
             <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="M:OpenMetaverse.Voice.VoiceGateway.AuxGetCaptureDevices">
-            <summary>
-            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="M:OpenMetaverse.Voice.VoiceGateway.AuxGetRenderDevices">
-            <summary>
-            This is used to get a list of audio devices that can be used for render (playback) of voice.
-            </summary>
-        </member>
-        <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="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="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="M:OpenMetaverse.Voice.VoiceGateway.AuxCaptureAudioStop">
-            <summary>
-            This command is used to stop the audio capture process.
-            </summary>
-            <returns></returns>
-        </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>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxSetSpeakerLevel(System.Int32)">
-            <summary>
-            This command is used to set the speaker volume while in the audio tuning
-            process. Once an acceptable speaker level is attained, the application must
-            issue a connector set speaker volume command to have that level be used while
-            on voice calls.
-            </summary>
-            <param name="Level">the speaker volume (-100 to 100 inclusive)</param>
-            <returns></returns>
-        </member>
         <member name="M:OpenMetaverse.Voice.VoiceGateway.Start">
             <summary>
             Start up the Voice service.
@@ -261,6 +261,36 @@
             </summary>
             <param name="go"></param>
         </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>
+        <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="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
@@ -311,36 +341,6 @@
             <param name="Value">The level of the audio, a number between -100 and 100 where
             0 represents ‘normal’ speaking volume</param>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.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="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="E:OpenMetaverse.Voice.VoiceGateway.OnVoiceResponse">
             <summary>
             Event for most mundane request reposnses.
@@ -410,25728 +410,25728 @@
         <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="F:OpenMetaverse.Voice.VoicePosition.Position">
-            <summary>Positional vector of the users position</summary>
+        <member name="T:OpenMetaverse.LoginStatus">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Voice.VoicePosition.Velocity">
-            <summary>Velocity vector of the position</summary>
+        <member name="F:OpenMetaverse.LoginStatus.Failed">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Voice.VoicePosition.AtOrientation">
-            <summary>At Orientation (X axis) of the position</summary>
+        <member name="F:OpenMetaverse.LoginStatus.None">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Voice.VoicePosition.UpOrientation">
-            <summary>Up Orientation (Y axis) of the position</summary>
+        <member name="F:OpenMetaverse.LoginStatus.ConnectingToLogin">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Voice.VoicePosition.LeftOrientation">
-            <summary>Left Orientation (Z axis) of the position</summary>
+        <member name="F:OpenMetaverse.LoginStatus.ReadingResponse">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetNotecard">
-            <summary>
-            Represents a string of characters encoded with specific formatting properties
-            </summary>
+        <member name="F:OpenMetaverse.LoginStatus.ConnectingToSim">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.Asset">
+        <member name="F:OpenMetaverse.LoginStatus.Redirecting">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.LoginStatus.Success">
+            <summary></summary>
+        </member>
+        <member name="T:OpenMetaverse.LastExecStatus">
             <summary>
-            Base class for all Asset types
+            Status of the last application run.
+            Used for error reporting to the grid login service for statistical purposes.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.Asset.AssetData">
-            <summary>A byte array containing the raw asset data</summary>
+        <member name="F:OpenMetaverse.LastExecStatus.Normal">
+            <summary> Application exited normally </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.Asset.Temporary">
-            <summary>True if the asset it only stored on the server temporarily</summary>
+        <member name="F:OpenMetaverse.LastExecStatus.Froze">
+            <summary> Application froze </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.Asset._AssetID">
-            <summary>A unique ID</summary>
+        <member name="F:OpenMetaverse.LastExecStatus.ForcedCrash">
+            <summary> Application detected error and exited abnormally </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.Asset.#ctor">
-            <summary>
-            Construct a new Asset object
-            </summary>
+        <member name="F:OpenMetaverse.LastExecStatus.OtherCrash">
+            <summary> Other crash </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.Asset.#ctor(OpenMetaverse.UUID,System.Byte[])">
-            <summary>
-            Construct a new Asset object
-            </summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
+        <member name="F:OpenMetaverse.LastExecStatus.LogoutFroze">
+            <summary> Application froze during logout </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.Asset.Encode">
-            <summary>
-            Regenerates the <code>AssetData</code> byte array from the properties 
-            of the derived class.
-            </summary>
+        <member name="F:OpenMetaverse.LastExecStatus.LogoutCrash">
+            <summary> Application crashed during logout </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.Asset.Decode">
+        <member name="T:OpenMetaverse.LoginParams">
             <summary>
-            Decodes the AssetData, placing it in appropriate properties of the derived
-            class.
+            Login Request Parameters
             </summary>
-            <returns>True if the asset decoding succeeded, otherwise false</returns>
         </member>
-        <member name="P:OpenMetaverse.Assets.Asset.AssetID">
-            <summary>The assets unique ID</summary>
+        <member name="F:OpenMetaverse.LoginParams.URI">
+            <summary>The URL of the Login Server</summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.Asset.AssetType">
-            <summary>
-            The "type" of asset, Notecard, Animation, etc
-            </summary>
+        <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.Assets.AssetNotecard.BodyText">
-            <summary>A text string containing main text of the notecard</summary>
+        <member name="F:OpenMetaverse.LoginParams.MethodName">
+            <summary>The request method</summary>
+            <remarks>login_to_simulator is currently the only supported method</remarks>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetNotecard.EmbeddedItems">
-            <summary>List of <see cref="T:OpenMetaverse.InventoryItem"/>s embedded on the notecard</summary>
+        <member name="F:OpenMetaverse.LoginParams.FirstName">
+            <summary>The Agents First name</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetNotecard.#ctor">
-            <summary>Construct an Asset of type Notecard</summary>
+        <member name="F:OpenMetaverse.LoginParams.LastName">
+            <summary>The Agents Last name</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetNotecard.#ctor(OpenMetaverse.UUID,System.Byte[])">
+        <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>
-            Construct an Asset object of type Notecard
+            Default constuctor, initializes sane default values
             </summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetNotecard.Encode">
+        <member name="M:OpenMetaverse.LoginParams.#ctor(OpenMetaverse.GridClient,System.String,System.String,System.String,System.String,System.String)">
             <summary>
-            Encode the raw contents of a string with the specific Linden Text properties
+            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="M:OpenMetaverse.Assets.AssetNotecard.Decode">
+        <member name="M:OpenMetaverse.LoginParams.#ctor(OpenMetaverse.GridClient,System.String,System.String,System.String,System.String,System.String,System.String)">
             <summary>
-            Decode the raw asset data including the Linden Text properties
+            Instantiates new LoginParams object and fills in the values
             </summary>
-            <returns>true if the AssetData was successfully decoded</returns>
-        </member>
-        <member name="P:OpenMetaverse.Assets.AssetNotecard.AssetType">
-            <summary>Override the base classes AssetType</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="T:OpenMetaverse.SoundManager">
+        <member name="T:OpenMetaverse.LoginResponseData">
             <summary>
-            
+            The decoded data returned from the login server after a successful login
             </summary>
         </member>
-        <member name="F:OpenMetaverse.SoundManager.m_AttachedSound">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.SoundManager.OnAttachedSound(OpenMetaverse.AttachedSoundEventArgs)">
-            <summary>Raises the AttachedSound Event</summary>
-             <param name="e">A AttachedSoundEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.LoginResponseData.Login">
+            <summary>true, false, indeterminate</summary>
         </member>
-        <member name="F:OpenMetaverse.SoundManager.m_AttachedSoundLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.LoginResponseData.Message">
+            <summary>Login message of the day</summary>
         </member>
-        <member name="F:OpenMetaverse.SoundManager.m_AttachedSoundGainChange">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.LoginResponseData.AgentAccess">
+            <summary>M or PG, also agent_region_access and agent_access_max</summary>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.OnAttachedSoundGainChange(OpenMetaverse.AttachedSoundGainChangeEventArgs)">
-            <summary>Raises the AttachedSoundGainChange Event</summary>
-             <param name="e">A AttachedSoundGainChangeEventArgs object containing
-             the data sent from the simulator</param>
+        <member 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.SoundManager.m_AttachedSoundGainChangeLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.NetworkManager">
+            <summary>
+            Login Routines
+            </summary>
+            <summary>
+            NetworkManager is responsible for managing the network layer of 
+            OpenMetaverse. It tracks all the server connections, serializes 
+            outgoing traffic and deserializes incoming traffic, and provides
+            instances of delegates for network-related events.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.SoundManager.m_SoundTrigger">
+        <member name="F:OpenMetaverse.NetworkManager.m_LoginProgress">
             <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.OnSoundTrigger(OpenMetaverse.SoundTriggerEventArgs)">
-            <summary>Raises the SoundTrigger Event</summary>
-             <param name="e">A SoundTriggerEventArgs object containing
+        <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.SoundManager.m_SoundTriggerLock">
+        <member name="F:OpenMetaverse.NetworkManager.m_LoginProgressLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.SoundManager.m_PreloadSound">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.NetworkManager.LoginSeedCapability">
+            <summary>Seed CAPS URL returned from the login server</summary>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.OnPreloadSound(OpenMetaverse.PreloadSoundEventArgs)">
-            <summary>Raises the PreloadSound Event</summary>
-             <param name="e">A PreloadSoundEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.NetworkManager.MaxAgentGroups">
+            <summary>Maximum number of groups an agent can belong to, -1 for unlimited</summary>
         </member>
-        <member name="F:OpenMetaverse.SoundManager.m_PreloadSoundLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.NetworkManager.AgentAppearanceServiceURL">
+            <summary>Server side baking service URL</summary>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.#ctor(OpenMetaverse.GridClient)">
+        <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>
-            Construct a new instance of the SoundManager class, used for playing and receiving
-            sound assets
+            Generate sane default values for a login request
             </summary>
-            <param name="client">A reference to the current GridClient instance</param>
+            <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="M:OpenMetaverse.SoundManager.PlaySound(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.NetworkManager.Login(System.String,System.String,System.String,System.String,System.String)">
             <summary>
-            Plays a sound in the current region at full volume from avatar position
+            Simplified login that takes the most common and required fields
             </summary>
-            <param name="soundID">UUID of the sound to be played</param>
+            <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="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Vector3)">
+        <member name="M:OpenMetaverse.NetworkManager.Login(System.String,System.String,System.String,System.String,System.String,System.String)">
             <summary>
-            Plays a sound in the current region at full volume
+            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="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="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="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Vector3,System.Single)">
+        <member name="M:OpenMetaverse.NetworkManager.Login(OpenMetaverse.LoginParams)">
             <summary>
-            Plays a sound in the current region
+            Login that takes a struct of all the values that will be passed to
+            the login server
             </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>
+            <param name="loginParams">The values that will be passed to the login
+            server, all fields must be set even if they are String.Empty</param>
+            <returns>Whether the login was successful or not. On failure the
+            LoginErrorKey string will contain the error code and LoginMessage
+            will contain a description of the error</returns>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Simulator,OpenMetaverse.Vector3,System.Single)">
+        <member name="M:OpenMetaverse.NetworkManager.StartLocation(System.String,System.Int32,System.Int32,System.Int32)">
             <summary>
-            Plays a sound in the specified sim
+            Build a start location URI for passing to the Login function
             </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>
+            <param name="sim">Name of the simulator to start in</param>
+            <param name="x">X coordinate to start at</param>
+            <param name="y">Y coordinate to start at</param>
+            <param name="z">Z coordinate to start at</param>
+            <returns>String with a URI that can be used to login to a specified
+            location</returns>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,System.UInt64,OpenMetaverse.Vector3,System.Single)">
+        <member name="M:OpenMetaverse.NetworkManager.RemoteLoginHandler(OpenMetaverse.LoginResponseData,OpenMetaverse.LoginParams)">
             <summary>
-            Play a sound asset
+            LoginParams and the initial login XmlRpcRequest were made on a remote machine.
+            This method now initializes libomv with the results.
             </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="M:OpenMetaverse.NetworkManager.LoginReplyXmlRpcHandler(Nwc.XmlRpc.XmlRpcResponse,OpenMetaverse.LoginParams)">
+            <summary>
+            Handles response from XML-RPC login replies
+            </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="M:OpenMetaverse.NetworkManager.LoginReplyXmlRpcHandler(OpenMetaverse.LoginResponseData,OpenMetaverse.LoginParams)">
+            <summary>
+            Handles response from XML-RPC login replies with already parsed LoginResponseData
+            </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="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="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="M:OpenMetaverse.NetworkManager.GetPlatform">
+            <summary>
+            Get current OS
+            </summary>
+            <returns>Either "Win" or "Linux"</returns>
         </member>
-        <member name="E:OpenMetaverse.SoundManager.AttachedSound">
-            <summary>Raised when the simulator sends us data containing
-            sound</summary>
+        <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="E:OpenMetaverse.SoundManager.AttachedSoundGainChange">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_PacketSent">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="E:OpenMetaverse.SoundManager.SoundTrigger">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="M:OpenMetaverse.NetworkManager.OnPacketSent(OpenMetaverse.PacketSentEventArgs)">
+            <summary>Raises the PacketSent Event</summary>
+             <param name="e">A PacketSentEventArgs object containing
+             the data sent from the simulator</param>
         </member>
-        <member name="E:OpenMetaverse.SoundManager.PreloadSound">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_PacketSentLock">
+            <summary>Thread sync lock object</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.NetworkManager.m_LoggedOut">
+            <summary>The event subscribers, null of no subscribers</summary>
         </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="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="P:OpenMetaverse.AttachedSoundEventArgs.Simulator">
-            <summary>Simulator where the event originated</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_LoggedOutLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundEventArgs.SoundID">
-            <summary>Get the sound asset id</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimConnecting">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundEventArgs.OwnerID">
-            <summary>Get the ID of the owner</summary>
+        <member name="M:OpenMetaverse.NetworkManager.OnSimConnecting(OpenMetaverse.SimConnectingEventArgs)">
+            <summary>Raises the SimConnecting Event</summary>
+             <param name="e">A SimConnectingEventArgs object containing
+             the data sent from the simulator</param>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundEventArgs.ObjectID">
-            <summary>Get the ID of the Object</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimConnectingLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Gain">
-            <summary>Get the volume level</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimConnected">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Flags">
-            <summary>Get the <see cref="T:OpenMetaverse.SoundFlags"/></summary>
+        <member name="M:OpenMetaverse.NetworkManager.OnSimConnected(OpenMetaverse.SimConnectedEventArgs)">
+            <summary>Raises the SimConnected Event</summary>
+             <param name="e">A SimConnectedEventArgs object containing
+             the data sent from the simulator</param>
         </member>
-        <member name="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.NetworkManager.m_SimConnectedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.AttachedSoundGainChangeEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,System.Single)">
-            <summary>
-            Construct a new instance of the AttachedSoundGainChangedEventArgs class
-            </summary>
-            <param name="sim">Simulator where the event originated</param>
-            <param name="objectID">The ID of the Object</param>
-            <param name="gain">The new volume level</param>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimDisconnected">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.Simulator">
-            <summary>Simulator where the event originated</summary>
+        <member name="M:OpenMetaverse.NetworkManager.OnSimDisconnected(OpenMetaverse.SimDisconnectedEventArgs)">
+            <summary>Raises the SimDisconnected Event</summary>
+             <param name="e">A SimDisconnectedEventArgs object containing
+             the data sent from the simulator</param>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.ObjectID">
-            <summary>Get the ID of the Object</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimDisconnectedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.Gain">
-            <summary>Get the volume level</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_Disconnected">
+            <summary>The event subscribers, null of no subscribers</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="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.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.NetworkManager.m_DisconnectedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Simulator">
-            <summary>Simulator where the event originated</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimChanged">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.SoundID">
-            <summary>Get the sound asset id</summary>
+        <member name="M:OpenMetaverse.NetworkManager.OnSimChanged(OpenMetaverse.SimChangedEventArgs)">
+            <summary>Raises the SimChanged Event</summary>
+             <param name="e">A SimChangedEventArgs object containing
+             the data sent from the simulator</param>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.OwnerID">
-            <summary>Get the ID of the owner</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimChangedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.ObjectID">
-            <summary>Get the ID of the Object</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_EventQueueRunning">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.ParentID">
-            <summary>Get the ID of the objects parent</summary>
+        <member name="M:OpenMetaverse.NetworkManager.OnEventQueueRunning(OpenMetaverse.EventQueueRunningEventArgs)">
+            <summary>Raises the EventQueueRunning Event</summary>
+             <param name="e">A EventQueueRunningEventArgs object containing
+             the data sent from the simulator</param>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Gain">
-            <summary>Get the volume level</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_EventQueueRunningLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.RegionHandle">
-            <summary>Get the regionhandle</summary>
+        <member name="F:OpenMetaverse.NetworkManager.Simulators">
+            <summary>All of the simulators we are currently connected to</summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Position">
-            <summary>Get the source position</summary>
+        <member name="F:OpenMetaverse.NetworkManager.CapsEvents">
+            <summary>Handlers for incoming capability events</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.NetworkManager.PacketEvents">
+            <summary>Handlers for incoming packets</summary>
         </member>
-        <member name="M:OpenMetaverse.PreloadSoundEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <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>
-            Construct a new instance of the PreloadSoundEventArgs class
+            Default constructor
             </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="client">Reference to the GridClient object</param>
         </member>
-        <member name="P:OpenMetaverse.PreloadSoundEventArgs.Simulator">
-            <summary>Simulator where the event originated</summary>
+        <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="P:OpenMetaverse.PreloadSoundEventArgs.SoundID">
-            <summary>Get the sound asset id</summary>
+        <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="P:OpenMetaverse.PreloadSoundEventArgs.OwnerID">
-            <summary>Get the ID of the owner</summary>
+        <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="P:OpenMetaverse.PreloadSoundEventArgs.ObjectID">
-            <summary>Get the ID of the Object</summary>
+        <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="T:OpenMetaverse.Caps">
+        <member name="M:OpenMetaverse.NetworkManager.UnregisterEventCallback(System.String,OpenMetaverse.Caps.EventQueueCallback)">
             <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
+            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.Caps.Simulator">
-            <summary>Reference to the simulator this system is connected to</summary>
+        <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="M:OpenMetaverse.Caps.#ctor(OpenMetaverse.Simulator,System.String)">
+        <member name="M:OpenMetaverse.NetworkManager.SendPacket(OpenMetaverse.Packets.Packet,OpenMetaverse.Simulator)">
             <summary>
-            Default constructor
+            Send a packet to a specified simulator
             </summary>
-            <param name="simulator"></param>
-            <param name="seedcaps"></param>
+            <param name="packet">Packet to send</param>
+            <param name="simulator">Simulator to send the packet to</param>
         </member>
-        <member name="M:OpenMetaverse.Caps.CapabilityURI(System.String)">
+        <member name="M:OpenMetaverse.NetworkManager.Connect(System.Net.IPAddress,System.UInt16,System.UInt64,System.Boolean,System.String)">
             <summary>
-            Request the URI of a named capability
+            Connect to a simulator
             </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>
+            <param name="ip">IP address to connect to</param>
+            <param name="port">Port to connect to</param>
+            <param name="handle">Handle for this simulator, to identify its
+            location in the grid</param>
+            <param name="setDefault">Whether to set CurrentSim to this new
+            connection, use this if the avatar is moving in to this simulator</param>
+            <param name="seedcaps">URL of the capabilities server to use for
+            this sim connection</param>
+            <returns>A Simulator object on success, otherwise null</returns>
         </member>
-        <member name="M:OpenMetaverse.Caps.EventQueueEventHandler(System.String,OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.NetworkManager.Connect(System.Net.IPEndPoint,System.UInt64,System.Boolean,System.String)">
             <summary>
-            Process any incoming events, check to see if we have a message created for the event, 
+            Connect to a simulator
             </summary>
-            <param name="eventName"></param>
-            <param name="body"></param>
+            <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="P:OpenMetaverse.Caps.SeedCapsURI">
-            <summary>Capabilities URI this system was initialized with</summary>
+        <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="P:OpenMetaverse.Caps.IsEventQueueRunning">
-            <summary>Whether the capabilities event queue is connected and
-            listening for incoming events</summary>
+        <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="T:OpenMetaverse.Caps.EventQueueCallback">
+        <member name="M:OpenMetaverse.NetworkManager.DisconnectSim(OpenMetaverse.Simulator,System.Boolean)">
             <summary>
-            Triggered when an event is received via the EventQueueGet 
-            capability
+            Close a connection to the given simulator
             </summary>
-            <param name="capsKey">Event name</param>
-            <param name="message">Decoded event data</param>
-            <param name="simulator">The simulator that generated the event</param>
+            <param name="simulator"></param>
+            <param name="sendCloseCircuit"></param>
         </member>
-        <member name="T:OpenMetaverse.AgentManager">
+        <member name="M:OpenMetaverse.NetworkManager.Shutdown(OpenMetaverse.NetworkManager.DisconnectType)">
             <summary>
-            Manager class for our own avatar
+            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.AgentManager.m_Chat">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.NetworkManager.Shutdown(OpenMetaverse.NetworkManager.DisconnectType,System.String)">
+            <summary>
+            Shutdown will disconnect all the sims except for the current sim
+            first, and then kill the connection to CurrentSim. This should only
+            be called if the logout process times out on <code>RequestLogout</code>
+            </summary>
+            <param name="type">Type of shutdown</param>
+            <param name="message">Shutdown message</param>
         </member>
-        <member name="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 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.AgentManager.m_ChatLock">
-            <summary>Thread sync lock object</summary>
+        <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.AgentManager.m_ScriptDialog">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.NetworkManager.LogoutReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="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 name="M:OpenMetaverse.NetworkManager.StartPingCheckHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptDialogLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.NetworkManager.CompletePingCheckHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptQuestion">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.NetworkManager.SimStatsHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.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 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="F:OpenMetaverse.AgentManager.m_ScriptQuestionLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.NetworkManager.DisableSimulatorHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_LoadURL">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.NetworkManager.KickUserHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="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 name="E:OpenMetaverse.NetworkManager.LoginProgress">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_LoadUrlLock">
-            <summary>Thread sync lock object</summary>
+        <member name="E:OpenMetaverse.NetworkManager.OnLoginResponse">
+            <summary>Called when a reply is received from the login server, the
+            login sequence will block until this event returns</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_Balance">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="P:OpenMetaverse.NetworkManager.LoginStatusCode">
+            <summary>Current state of logging in</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 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="F:OpenMetaverse.AgentManager.m_BalanceLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.AgentManager.m_MoneyBalance">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="P:OpenMetaverse.NetworkManager.LoginMessage">
+            <summary>During login this contains a descriptive version of 
+            LoginStatusCode. After a successful login this will contain the 
+            message of the day, and after a failed login a descriptive error 
+            message will be returned</summary>
         </member>
-        <member name="M:OpenMetaverse.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 name="E:OpenMetaverse.NetworkManager.PacketSent">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_MoneyBalanceReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="E:OpenMetaverse.NetworkManager.LoggedOut">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_InstantMessage">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="E:OpenMetaverse.NetworkManager.SimConnecting">
+            <summary>Raised when the simulator sends us data containing
+            ...</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 name="E:OpenMetaverse.NetworkManager.SimConnected">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_InstantMessageLock">
-            <summary>Thread sync lock object</summary>
+        <member name="E:OpenMetaverse.NetworkManager.SimDisconnected">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_Teleport">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="E:OpenMetaverse.NetworkManager.Disconnected">
+            <summary>Raised when the simulator sends us data containing
+            ...</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 name="E:OpenMetaverse.NetworkManager.SimChanged">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_TeleportLock">
-            <summary>Thread sync lock object</summary>
+        <member name="E:OpenMetaverse.NetworkManager.EventQueueRunning">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AgentData">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="P:OpenMetaverse.NetworkManager.CircuitCode">
+            <summary>Unique identifier associated with our connections to
+            simulators</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 name="P:OpenMetaverse.NetworkManager.CurrentSim">
+            <summary>The simulator that the logged in avatar is currently 
+            occupying</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AgentDataLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.NetworkManager.Connected">
+            <summary>Shows whether the network layer is logged in to the
+            grid or not</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AnimationsChanged">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="P:OpenMetaverse.NetworkManager.InboxCount">
+            <summary>Number of packets in the incoming queue</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 name="P:OpenMetaverse.NetworkManager.OutboxCount">
+            <summary>Number of packets in the outgoing queue</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AnimationsChangedLock">
-            <summary>Thread sync lock object</summary>
+        <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.AgentManager.m_MeanCollision">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.NetworkManager.DisconnectType">
+            <summary>
+            Explains why a simulator or the grid disconnected from us
+            </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 name="F:OpenMetaverse.NetworkManager.DisconnectType.ClientInitiated">
+            <summary>The client requested the logout or simulator disconnect</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_MeanCollisionLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.ServerInitiated">
+            <summary>The server notified us that it is disconnecting</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_RegionCrossed">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.NetworkTimeout">
+            <summary>Either a socket was closed or network traffic timed out</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 name="F:OpenMetaverse.NetworkManager.DisconnectType.SimShutdown">
+            <summary>The last active simulator shut down</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_RegionCrossedLock">
-            <summary>Thread sync lock object</summary>
+        <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.AgentManager.m_GroupChatJoined">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.NetworkManager.IncomingPacket.Simulator">
+            <summary>Reference to the simulator that this packet came from</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 name="F:OpenMetaverse.NetworkManager.IncomingPacket.Packet">
+            <summary>Packet that needs to be processed</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_GroupChatJoinedLock">
-            <summary>Thread sync lock object</summary>
+        <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.AgentManager.m_AlertMessage">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Simulator">
+            <summary>Reference to the simulator this packet is destined for</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 name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Buffer">
+            <summary>Packet that needs to be sent</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AlertMessageLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.SequenceNumber">
+            <summary>Sequence number of the wrapped packet</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptControl">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.ResendCount">
+            <summary>Number of times this packet has been resent</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 name="F:OpenMetaverse.NetworkManager.OutgoingPacket.TickCount">
+            <summary>Environment.TickCount when this packet was last sent over the wire</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptControlLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Type">
+            <summary>Type of the packet</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_CameraConstraint">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.PacketEventDictionary">
+            <summary>
+            Registers, unregisters, and fires events generated by incoming packets
+            </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 name="F:OpenMetaverse.PacketEventDictionary.Client">
+            <summary>Reference to the GridClient object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_CameraConstraintLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.PacketEventDictionary.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Default constructor
+            </summary>
+            <param name="client"></param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptSensorReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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="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 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.AgentManager.m_ScriptSensorReplyLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.AgentManager.m_AvatarSitResponse">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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="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 name="F:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper.Callback">
+            <summary>Callback to fire for this packet</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AvatarSitResponseLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper.Simulator">
+            <summary>Reference to the simulator that this packet came from</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberAdded">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper.Packet">
+            <summary>The packet that needs to be processed</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 name="T:OpenMetaverse.CapsEventDictionary">
+            <summary>
+            Registers, unregisters, and fires events generated by the Capabilities
+            event queue
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberAddedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.CapsEventDictionary.Client">
+            <summary>Reference to the GridClient object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberLeft">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.CapsEventDictionary.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Default constructor
+            </summary>
+            <param name="client">Reference to the GridClient object</param>
         </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 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.AgentManager.m_ChatSessionMemberLeftLock">
-            <summary>Thread sync lock object</summary>
+        <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.AgentManager.m_SetDisplayNameReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <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="M:OpenMetaverse.AgentManager.OnSetDisplayNameReply(OpenMetaverse.SetDisplayNameReplyEventArgs)">
-            <summary>Raises the SetDisplayNameReply Event</summary>
-             <param name="e">A SetDisplayNameReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member 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="F:OpenMetaverse.AgentManager.m_SetDisplayNameReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper">
+            <summary>
+            Object that is passed to worker threads in the ThreadPool for
+            firing CAPS callbacks
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_MuteListUpdated">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Callback">
+            <summary>Callback to fire for this packet</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 name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.CapsEvent">
+            <summary>Name of the CAPS event</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_MuteListUpdatedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Message">
+            <summary>Strongly typed decoded data</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.Client">
-            <summary>Reference to the GridClient instance</summary>
+        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Simulator">
+            <summary>Reference to the simulator that generated this event</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.Movement">
-            <summary>Used for movement and camera tracking</summary>
+        <member name="T:OpenMetaverse.DownloadRequest">
+            <summary>
+            Represends individual HTTP Download request
+            </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 name="F:OpenMetaverse.DownloadRequest.Address">
+            <summary>URI of the item to fetch</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.GroupChatSessions">
-            <summary>Dictionary containing current Group Chat sessions and members</summary>
+        <member name="F:OpenMetaverse.DownloadRequest.MillisecondsTimeout">
+            <summary>Timout specified in milliseconds</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.MuteList">
-            <summary>Dictionary containing mute list keyead on mute name and key</summary>
+        <member name="F:OpenMetaverse.DownloadRequest.DownloadProgressCallback">
+            <summary>Download progress callback</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentStateStatus">
-            <summary>Various abilities and preferences sent by the grid</summary>
+        <member name="F:OpenMetaverse.DownloadRequest.CompletedCallback">
+            <summary>Download completed callback</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="F:OpenMetaverse.DownloadRequest.ContentType">
+            <summary>Accept the following content type</summary>
+        </member>
+        <member name="F:OpenMetaverse.DownloadRequest.Retries">
+            <summary>How many times will this request be retried</summary>
+        </member>
+        <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>
-            Constructor, setup callbacks for packets related to our avatar
+            Manages async HTTP downloads with a limit on maximum
+            concurrent downloads
             </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)">
+        <member name="M:OpenMetaverse.DownloadManager.#ctor">
+            <summary>Default constructor</summary>
+        </member>
+        <member name="M:OpenMetaverse.DownloadManager.Dispose">
+            <summary>Cleanup method</summary>
+        </member>
+        <member name="M:OpenMetaverse.DownloadManager.SetupRequest(System.Uri,System.String)">
+            <summary>Setup http download request</summary>
+        </member>
+        <member name="M:OpenMetaverse.DownloadManager.EnqueuePending">
+            <summary>Check the queue for pending work</summary>
+        </member>
+        <member name="M:OpenMetaverse.DownloadManager.QueueDownlad(OpenMetaverse.DownloadRequest)">
+            <summary>Enqueue a new HTPP download</summary>
+        </member>
+        <member name="P:OpenMetaverse.DownloadManager.ParallelDownloads">
+            <summary>Maximum number of parallel downloads from a single endpoint</summary>
+        </member>
+        <member name="P:OpenMetaverse.DownloadManager.ClientCert">
+            <summary>Client certificate</summary>
+        </member>
+        <member name="T:OpenMetaverse.BinBVHAnimationReader">
             <summary>
-            Send a text message from the Agent to the Simulator
+            Reads in a byte array of an Animation Asset created by the SecondLife(tm) client.
             </summary>
-            <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>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.RetrieveInstantMessages">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.rotationkeys">
             <summary>
-            Request any instant messages sent while the client was offline to be resent.
+            Rotation Keyframe count (used internally)
             </summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.InstantMessage(OpenMetaverse.UUID,System.String)">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.positionkeys">
             <summary>
-            Send an Instant Message to another Avatar
+            Position Keyframe count (used internally)
             </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>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.InstantMessage(OpenMetaverse.UUID,System.String,OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.Priority">
             <summary>
-            Send an Instant Message to an existing group chat or conference chat
+            Animation Priority
             </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="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[])">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.Length">
             <summary>
-            Send an Instant Message
+            The animation length in seconds.
             </summary>
-            <param name="fromName">The name this IM will show up as being from</param>
-            <param name="target">Key of Avatar</param>
-            <param name="message">Text message being sent</param>
-            <param name="imSessionID">IM session ID (to differentiate between IM windows)</param>
-            <param name="conferenceIDs">IDs of sessions for a conference</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.InstantMessage(System.String,OpenMetaverse.UUID,System.String,OpenMetaverse.UUID,OpenMetaverse.InstantMessageDialog,OpenMetaverse.InstantMessageOnline,OpenMetaverse.Vector3,OpenMetaverse.UUID,System.Byte[])">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.ExpressionName">
             <summary>
-            Send an Instant Message
+            Expression set in the client.  Null if [None] is selected
             </summary>
-            <param name="fromName">The name this IM will show up as being from</param>
-            <param name="target">Key of Avatar</param>
-            <param name="message">Text message being sent</param>
-            <param name="imSessionID">IM session ID (to differentiate between IM windows)</param>
-            <param name="dialog">Type of instant message to send</param>
-            <param name="offline">Whether to IM offline avatars as well</param>
-            <param name="position">Senders Position</param>
-            <param name="regionID">RegionID Sender is In</param>
-            <param name="binaryBucket">Packed binary data that is specific to
-            the dialog type</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.InstantMessageGroup(OpenMetaverse.UUID,System.String)">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.InPoint">
             <summary>
-            Send an Instant Message to a group
+            The time in seconds to start the animation
             </summary>
-            <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)">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.OutPoint">
             <summary>
-            Send an Instant Message to a group the agent is a member of
+            The time in seconds to end the animation
             </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="message">Text message being sent</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.RequestJoinGroupChat(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.Loop">
             <summary>
-            Send a request to join a group chat session
+            Loop the animation
             </summary>
-            <param name="groupID"><seealso cref="T:OpenMetaverse.UUID"/> of Group to leave</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.RequestLeaveGroupChat(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.EaseInTime">
             <summary>
-            Exit a group chat session. This will stop further Group chat messages
-            from being sent until session is rejoined.
+            Meta data. Ease in Seconds.
             </summary>
-            <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)">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.EaseOutTime">
             <summary>
-            Reply to script dialog questions. 
+            Meta data. Ease out seconds.
             </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)"/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.ChatterBoxAcceptInvite(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.HandPose">
             <summary>
-            Accept invite for to a chatterbox session
+            Meta Data for the Hand Pose
             </summary>
-            <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)">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.JointCount">
             <summary>
-            Start a friends conference
+            Number of joints defined in the animation
             </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>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.PointAtEffect(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Vector3d,OpenMetaverse.PointAtType,OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.joints">
             <summary>
-            Start a particle stream between an agent and an object
+            Contains an array of joints
             </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>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.LookAtEffect(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Vector3d,OpenMetaverse.LookAtType,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.BinBVHAnimationReader.#ctor(System.Byte[])">
             <summary>
-            Start a particle stream between an agent and an object
+            Searialize an animation asset into it's joints/keyframes/meta data
             </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="animationdata"></param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.BeamEffect(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Vector3d,OpenMetaverse.Color4,System.Single,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.BinBVHAnimationReader.ReadBytesUntilNull(System.Byte[],System.Int32@)">
             <summary>
-            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 
-            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"/>
-        </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
+            Variable length strings seem to be null terminated in the animation asset..    but..   
+            use with caution, home grown.
+            advances the index.
             </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 
-            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>
+            <param name="data">The animation asset byte array</param>
+            <param name="i">The offset to start reading</param>
+            <returns>a string</returns>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.RequestSit(OpenMetaverse.UUID,OpenMetaverse.Vector3)">
+        <member name="M:OpenMetaverse.BinBVHAnimationReader.readJoint(System.Byte[],System.Int32@)">
             <summary>
-            Sends a request to sit on the specified object
+            Read in a Joint from an animation asset byte array
+            Variable length Joint fields, yay!
+            Advances the index
             </summary>
-            <param name="targetID"><seealso cref="T:OpenMetaverse.UUID"/> of the object to sit on</param>
-            <param name="offset">Sit at offset</param>
+            <param name="data">animation asset byte array</param>
+            <param name="i">Byte Offset of the start of the joint</param>
+            <returns>The Joint data serialized into the binBVHJoint structure</returns>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Sit">
+        <member name="M:OpenMetaverse.BinBVHAnimationReader.readKeys(System.Byte[],System.Int32@,System.Int32,System.Single,System.Single)">
             <summary>
-            Follows a call to <seealso cref="M:OpenMetaverse.AgentManager.RequestSit(OpenMetaverse.UUID,OpenMetaverse.Vector3)"/> to actually sit on the object
+            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.AgentManager.Stand">
-            <summary>Stands up from sitting on a prim or the ground</summary>
-            <returns>true of AgentUpdate was sent</returns>
+        <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.AgentManager.SitOnGround">
+        <member name="M:OpenMetaverse.BinBVHAnimationReader.GetHashCode">
             <summary>
-            Does a "ground sit" at the avatar's current position
-            </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="M:OpenMetaverse.AgentManager.Fly(System.Boolean)">
-            <summary>
-            Starts or stops flying
+        <member name="T:OpenMetaverse.binBVHJoint">
+            <summary> 
+            A Joint and it's associated meta data and keyframes
             </summary>
-            <param name="start">True to start flying, false to stop flying</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Crouch(System.Boolean)">
-            <summary>
-            Starts or stops crouching
-            </summary>
-            <param name="crouching">True to start crouching, false to stop crouching</param>
+        <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.AgentManager.Jump(System.Boolean)">
-            <summary>
-            Starts a jump (begin holding the jump key)
-            </summary>
+        <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="M:OpenMetaverse.AgentManager.AutoPilot(System.Double,System.Double,System.Double)">
+        <member name="F:OpenMetaverse.binBVHJoint.Name">
             <summary>
-            Use the autopilot sim function to move the avatar to a new
-            position. Uses double precision to get precise movements
+            Name of the Joint.  Matches the avatar_skeleton.xml in client distros
             </summary>
-            <remarks>The z value is currently not handled properly by the simulator</remarks>
-            <param name="globalX">Global X coordinate to move to</param>
-            <param name="globalY">Global Y coordinate to move to</param>
-            <param name="z">Z coordinate to move to</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AutoPilot(System.UInt64,System.UInt64,System.Single)">
+        <member name="F:OpenMetaverse.binBVHJoint.Priority">
             <summary>
-            Use the autopilot sim function to move the avatar to a new position
+            Joint Animation Override?   Was the same as the Priority in testing.. 
             </summary>
-            <remarks>The z value is currently not handled properly by the simulator</remarks>
-            <param name="globalX">Integer value for the global X coordinate to move to</param>
-            <param name="globalY">Integer value for the global Y coordinate to move to</param>
-            <param name="z">Floating-point value for the Z coordinate to move to</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AutoPilotLocal(System.Int32,System.Int32,System.Single)">
+        <member name="F:OpenMetaverse.binBVHJoint.rotationkeys">
             <summary>
-            Use the autopilot sim function to move the avatar to a new position
+            Array of Rotation Keyframes in order from earliest to latest
             </summary>
-            <remarks>The z value is currently not handled properly by the simulator</remarks>
-            <param name="localX">Integer value for the local X coordinate to move to</param>
-            <param name="localY">Integer value for the local Y coordinate to move to</param>
-            <param name="z">Floating-point value for the Z coordinate to move to</param>
-        </member>
-        <member name="M:OpenMetaverse.AgentManager.AutoPilotCancel">
-            <summary>Macro to cancel autopilot sim function</summary>
-            <remarks>Not certain if this is how it is really done</remarks>
-            <returns>true if control flags were set and AgentUpdate was sent to the simulator</returns>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Grab(System.UInt32)">
+        <member name="F:OpenMetaverse.binBVHJoint.positionkeys">
             <summary>
-            Grabs an object
+            Array of Position Keyframes in order from earliest to latest
+            This seems to only be for the Pelvis?
             </summary>
-            <param name="objectLocalID">an unsigned integer of the objects ID within the simulator</param>
-            <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)">
+        <member name="F:OpenMetaverse.binBVHJoint.Tag">
             <summary>
-            Overload: Grab a simulated object
+            Custom application data that can be attached to a joint
             </summary>
-            <param name="objectLocalID">an unsigned integer of the objects ID within the simulator</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>
-            <param name="position">The region coordinates of the position to grab</param>
-            <param name="normal">The surface normal of the position to grab (A normal is a vector perpindicular to the surface)</param>
-            <param name="binormal">The surface binormal of the position to grab (A binormal is a vector tangen to the surface
-            pointing along the U direction of the tangent space</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.GrabUpdate(OpenMetaverse.UUID,OpenMetaverse.Vector3)">
+        <member name="T:OpenMetaverse.binBVHJointKey">
             <summary>
-            Drag an object
+            A Joint Keyframe.  This is either a position or a rotation.
             </summary>
-            <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)">
+        <member name="F:OpenMetaverse.binBVHJointKey.key_element">
             <summary>
-            Overload: Drag an object
+            Either a Vector3 position or a Vector3 Euler rotation
             </summary>
-            <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="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>
-            <param name="position">The region coordinates of the position to grab</param>
-            <param name="normal">The surface normal of the position to grab (A normal is a vector perpindicular to the surface)</param>
-            <param name="binormal">The surface binormal of the position to grab (A binormal is a vector tangen to the surface
-            pointing along the U direction of the tangent space</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.DeGrab(System.UInt32)">
+        <member name="T:OpenMetaverse.HandPose">
             <summary>
-            Release a grabbed object
+            Poses set in the animation metadata for the hands.
             </summary>
-            <param name="objectLocalID">The Objects Simulator Local ID</param>
-            <seealso cref="F:OpenMetaverse.Simulator.ObjectsPrimitives"/>
-            <seealso cref="M:OpenMetaverse.AgentManager.Grab(System.UInt32)"/>
-            <seealso cref="M:OpenMetaverse.AgentManager.GrabUpdate(OpenMetaverse.UUID,OpenMetaverse.Vector3)"/>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.DeGrab(System.UInt32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,System.Int32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
-            <summary>
-            Release a grabbed object
-            </summary>
-            <param name="objectLocalID">The Objects Simulator Local ID</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>
-            <param name="position">The region coordinates of the position to grab</param>
-            <param name="normal">The surface normal of the position to grab (A normal is a vector perpindicular to the surface)</param>
-            <param name="binormal">The surface binormal of the position to grab (A binormal is a vector tangen to the surface
-            pointing along the U direction of the tangent space</param>
+        <member name="T:OpenMetaverse.AgentDisplayName">
+            <summary> Information about agents display name </summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Touch(System.UInt32)">
-            <summary>
-            Touches an object
-            </summary>
-            <param name="objectLocalID">an unsigned integer of the objects ID within the simulator</param>
-            <seealso cref="F:OpenMetaverse.Simulator.ObjectsPrimitives"/>
+        <member name="F:OpenMetaverse.AgentDisplayName.ID">
+            <summary> Agent UUID </summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.RequestBalance">
-            <summary>
-            Request the current L$ balance
-            </summary>
+        <member name="F:OpenMetaverse.AgentDisplayName.UserName">
+            <summary> Username </summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.GiveAvatarMoney(OpenMetaverse.UUID,System.Int32)">
-            <summary>
-            Give Money to destination Avatar
-            </summary>
-            <param name="target">UUID of the Target Avatar</param>
-            <param name="amount">Amount in L$</param>
+        <member name="F:OpenMetaverse.AgentDisplayName.DisplayName">
+            <summary> Display name </summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.GiveAvatarMoney(OpenMetaverse.UUID,System.Int32,System.String)">
+        <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>
-            Give Money to destination Avatar
+            Creates AgentDisplayName object from OSD
             </summary>
-            <param name="target">UUID of the Target Avatar</param>
-            <param name="amount">Amount in L$</param>
-            <param name="description">Description that will show up in the
-            recipients transaction history</param>
+            <param name="data">Incoming OSD data</param>
+            <returns>AgentDisplayName object</returns>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.GiveObjectMoney(OpenMetaverse.UUID,System.Int32,System.String)">
+        <member name="M:OpenMetaverse.AgentDisplayName.GetOSD">
             <summary>
-            Give L$ to an object
+            Return object as OSD map
             </summary>
-            <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>
+            <returns>OSD containing agent's display name data</returns>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.GiveGroupMoney(OpenMetaverse.UUID,System.Int32)">
+        <member name="P:OpenMetaverse.AgentDisplayName.LegacyFullName">
+            <summary> Full name (legacy) </summary>
+        </member>
+        <member name="T:OpenMetaverse.AvatarGroup">
             <summary>
-            Give L$ to a group
+            Holds group information for Avatars such as those you might find in a profile
             </summary>
-            <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="amount">amount of L$ to give</param>
-            <param name="description">description of transaction</param>
+        <member name="F:OpenMetaverse.AvatarGroup.AcceptNotices">
+            <summary>true of Avatar accepts group notices</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.PayUploadFee">
-            <summary>
-            Pay texture/animation upload fee
-            </summary>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupID">
+            <summary>Groups Key</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.PayUploadFee(System.String)">
-            <summary>
-            Pay texture/animation upload fee
-            </summary>
-            <param name="description">description of the transaction</param>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupInsigniaID">
+            <summary>Texture Key for groups insignia</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.GiveMoney(OpenMetaverse.UUID,System.Int32,System.String,OpenMetaverse.MoneyTransactionType,OpenMetaverse.TransactionFlags)">
-            <summary>
-            Give Money to destination Object or Avatar
-            </summary>
-            <param name="target">UUID of the Target Object/Avatar</param>
-            <param name="amount">Amount in L$</param>
-            <param name="description">Reason (Optional normally)</param>
-            <param name="type">The type of transaction</param>
-            <param name="flags">Transaction flags, mostly for identifying group
-            transactions</param>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupName">
+            <summary>Name of the group</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.PlayGesture(OpenMetaverse.UUID)">
-            <summary>
-            Plays a gesture
-            </summary>
-            <param name="gestureID">Asset <seealso cref="T:OpenMetaverse.UUID"/> of the gesture</param>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupPowers">
+            <summary>Powers avatar has in the group</summary>
         </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>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupTitle">
+            <summary>Avatars Currently selected title</summary>
         </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>
+        <member name="F:OpenMetaverse.AvatarGroup.ListInProfile">
+            <summary>true of Avatar has chosen to list this in their profile</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AnimationStart(OpenMetaverse.UUID,System.Boolean)">
+        <member name="T:OpenMetaverse.Animation">
             <summary>
-            Send an AgentAnimation packet that toggles a single animation on
+            Contains an animation currently being played by an agent
             </summary>
-            <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 
-            currently playing animation to stop playing</param>
-            <param name="reliable">Whether to ensure delivery of this packet or not</param>
+        <member name="F:OpenMetaverse.Animation.AnimationID">
+            <summary>The ID of the animation asset</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Animate(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,System.Boolean},System.Boolean)">
-            <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
-            turn that animation on or off</param>
-            <param name="reliable">Whether to ensure delivery of this packet or not</param>
+        <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="M:OpenMetaverse.AgentManager.GoHome">
-            <summary>
-            Teleports agent to their stored home location
-            </summary>
-            <returns>true on successful teleport to home location</returns>
+        <member name="F:OpenMetaverse.Animation.AnimationSourceObjectID">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Teleport(OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.ProfilePick">
             <summary>
-            Teleport agent to a landmark
+            Holds group information on an individual profile pick
             </summary>
-            <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)">
+        <member name="T:OpenMetaverse.AvatarManager">
             <summary>
-            Attempt to look up a simulator name and teleport to the discovered
-            destination
+            Retrieve friend status notifications, and retrieve avatar names and
+            profiles
             </summary>
-            <param name="simName">Region name to look up</param>
-            <param name="position">Position to teleport to</param>
-            <returns>True if the lookup and teleport were successful, otherwise
-            false</returns>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Teleport(System.String,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
-            <summary>
-            Attempt to look up a simulator name and teleport to the discovered
-            destination
-            </summary>
-            <param name="simName">Region name to look up</param>
-            <param name="position">Position to teleport to</param>
-            <param name="lookAt">Target to look at</param>
-            <returns>True if the lookup and teleport were successful, otherwise
-            false</returns>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAnimation">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.Teleport(System.UInt64,OpenMetaverse.Vector3)">
-            <summary>
-            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>
-            <returns>true on success, false on failure</returns>
-            <remarks>This call is blocking</remarks>
+        <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="M:OpenMetaverse.AgentManager.Teleport(System.UInt64,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
-            <summary>
-            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>
-            <returns>true on success, false on failure</returns>
-            <remarks>This call is blocking</remarks>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAnimationLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.RequestTeleport(System.UInt64,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>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAppearance">
+            <summary>The event subscribers, null of no subscribers</summary>
         </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>
+        <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="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>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAppearanceLock">
+            <summary>Thread sync lock object</summary>
         </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>
+        <member name="F:OpenMetaverse.AvatarManager.m_UUIDNameReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </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="message">custom message to send with invitation</param>
+        <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="M:OpenMetaverse.AgentManager.TeleportLureRespond(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
-            <summary>
-            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="accept">true to accept the lure, false to decline it</param>
+        <member name="F:OpenMetaverse.AvatarManager.m_UUIDNameReplyLock">
+            <summary>Thread sync lock object</summary>
         </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 
-            profile information</param>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarInterestsReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </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>
+        <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="M:OpenMetaverse.AgentManager.SetHeightWidth(System.UInt16,System.UInt16)">
-            <summary>
-            Set the height and the width of the client window. This is used
-            by the server to build a virtual camera frustum for our avatar
-            </summary>
-            <param name="height">New height of the viewer window</param>
-            <param name="width">New width of the viewer window</param>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarInterestsReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.RequestMuteList">
-            <summary>
-            Request the list of muted objects and avatars for this agent
-            </summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPropertiesReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.UpdateMuteListEntry(OpenMetaverse.MuteType,OpenMetaverse.UUID,System.String)">
-            <summary>
-            Mute an object, resident, etc.
-            </summary>
-            <param name="type">Mute type</param>
-            <param name="id">Mute UUID</param>
-            <param name="name">Mute name</param>
+        <member name="M:OpenMetaverse.AvatarManager.OnAvatarPropertiesReply(OpenMetaverse.AvatarPropertiesReplyEventArgs)">
+            <summary>Raises the AvatarPropertiesReply Event</summary>
+             <param name="e">A AvatarPropertiesReplyEventArgs object containing
+             the data sent from the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.UpdateMuteListEntry(OpenMetaverse.MuteType,OpenMetaverse.UUID,System.String,OpenMetaverse.MuteFlags)">
-            <summary>
-            Mute an object, resident, etc.
-            </summary>
-            <param name="type">Mute type</param>
-            <param name="id">Mute UUID</param>
-            <param name="name">Mute name</param>
-            <param name="flags">Mute flags</param>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPropertiesReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.RemoveMuteListEntry(OpenMetaverse.UUID,System.String)">
-            <summary>
-            Unmute an object, resident, etc.
-            </summary>
-            <param name="id">Mute UUID</param>
-            <param name="name">Mute name</param>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarGroupsReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.SetHome">
-            <summary>
-            Sets home location to agents current position
-            </summary>
-            <remarks>will fire an AlertMessage (<seealso cref="E:OpenMetaverse.AgentManager.OnAlertMessage"/>) with 
-            success or failure message</remarks>
+        <member name="M:OpenMetaverse.AvatarManager.OnAvatarGroupsReply(OpenMetaverse.AvatarGroupsReplyEventArgs)">
+            <summary>Raises the AvatarGroupsReply Event</summary>
+             <param name="e">A AvatarGroupsReplyEventArgs object containing
+             the data sent from the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.CompleteAgentMovement(OpenMetaverse.Simulator)">
-            <summary>
-            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>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarGroupsReplyLock">
+            <summary>Thread sync lock object</summary>
         </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>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPickerReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.GroupInviteRespond(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
+        <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.AvatarManager.m_AvatarPickerReplyLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectPointAt">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="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.AvatarManager.m_ViewerEffectPointAtLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectLookAt">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="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.AvatarManager.m_ViewerEffectLookAtLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffect">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="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="F:OpenMetaverse.AvatarManager.m_ViewerEffectLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPicksReply">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="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="F:OpenMetaverse.AvatarManager.m_AvatarPicksReplyLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_PickInfoReply">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="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="F:OpenMetaverse.AvatarManager.m_PickInfoReplyLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarClassifiedReply">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="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="F:OpenMetaverse.AvatarManager.m_AvatarClassifiedReplyLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_ClassifiedInfoReply">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="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.AvatarManager.m_ClassifiedInfoReplyLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_DisplayNameUpdate">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="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.AvatarManager.m_DisplayNameUpdateLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="M:OpenMetaverse.AvatarManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            Respond to a group invitation by either accepting or denying it
+            Represents other avatars
             </summary>
-            <param name="groupID">UUID of the group (sent in the AgentID field of the invite message)</param>
-            <param name="imSessionID">IM Session ID from the group invitation message</param>
-            <param name="accept">Accept the group invitation or deny it</param>
+            <param name="client"></param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.RequestScriptSensor(System.String,OpenMetaverse.UUID,OpenMetaverse.ScriptSensorTypeFlags,System.Single,System.Single,OpenMetaverse.UUID,OpenMetaverse.Simulator)">
+        <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>
-            Requests script detection of objects and avatars
+            Request a single avatar name
             </summary>
-            <param name="name">name of the object/avatar to search for</param>
-            <param name="searchID">UUID of the object or avatar to search for</param>
-            <param name="type">Type of search from ScriptSensorTypeFlags</param>
-            <param name="range">range of scan (96 max?)</param>
-            <param name="arc">the arc in radians to search within</param>
-            <param name="requestID">an user generated ID to correlate replies with</param>
-            <param name="sim">Simulator to perform search in</param>
+            <param name="id">The avatar key to retrieve a name for</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.PickInfoUpdate(OpenMetaverse.UUID,System.Boolean,OpenMetaverse.UUID,System.String,OpenMetaverse.Vector3d,OpenMetaverse.UUID,System.String)">
+        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarNames(System.Collections.Generic.List{OpenMetaverse.UUID})">
             <summary>
-            Create or update profile pick
+            Request a list of avatar names
             </summary>
-            <param name="pickID">UUID of the pick to update, or random UUID to create a new pick</param>
-            <param name="topPick">Is this a top pick? (typically false)</param>
-            <param name="parcelID">UUID of the parcel (UUID.Zero for the current parcel)</param>
-            <param name="name">Name of the pick</param>
-            <param name="globalPosition">Global position of the pick landmark</param>
-            <param name="textureID">UUID of the image displayed with the pick</param>
-            <param name="description">Long description of the pick</param>
+            <param name="ids">The avatar keys to retrieve names for</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.PickDelete(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.AvatarManager.DisplayNamesAvailable">
             <summary>
-            Delete profile pick
+            Check if Display Names functionality is available
             </summary>
-            <param name="pickID">UUID of the pick to delete</param>
+            <returns>True if Display name functionality is available</returns>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.UpdateClassifiedInfo(OpenMetaverse.UUID,OpenMetaverse.DirectoryManager.ClassifiedCategories,OpenMetaverse.UUID,System.Int32,OpenMetaverse.Vector3d,System.String,System.String,System.Boolean)">
+        <member name="M:OpenMetaverse.AvatarManager.GetDisplayNames(System.Collections.Generic.List{OpenMetaverse.UUID},OpenMetaverse.AvatarManager.DisplayNamesCallback)">
             <summary>
-            Create or update profile Classified
+            Request retrieval of display names (max 90 names per request)
             </summary>
-            <param name="classifiedID">UUID of the classified to update, or random UUID to create a new classified</param>
-            <param name="category">Defines what catagory the classified is in</param>
-            <param name="snapshotID">UUID of the image displayed with the classified</param>
-            <param name="price">Price that the classified will cost to place for a week</param>
-            <param name="position">Global position of the classified landmark</param>
-            <param name="name">Name of the classified</param>
-            <param name="desc">Long description of the classified</param>
-            <param name="autoRenew">if true, auto renew classified after expiration</param>
+            <param name="ids">List of UUIDs to lookup</param>
+            <param name="callback">Callback to report result of the operation</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.UpdateClassifiedInfo(OpenMetaverse.UUID,OpenMetaverse.DirectoryManager.ClassifiedCategories,OpenMetaverse.UUID,System.Int32,System.String,System.String,System.Boolean)">
+        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarProperties(OpenMetaverse.UUID)">
             <summary>
-            Create or update profile Classified
+            Start a request for Avatar Properties
             </summary>
-            <param name="classifiedID">UUID of the classified to update, or random UUID to create a new classified</param>
-            <param name="category">Defines what catagory the classified is in</param>
-            <param name="snapshotID">UUID of the image displayed with the classified</param>
-            <param name="price">Price that the classified will cost to place for a week</param>
-            <param name="name">Name of the classified</param>
-            <param name="desc">Long description of the classified</param>
-            <param name="autoRenew">if true, auto renew classified after expiration</param>
+            <param name="avatarid"></param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.DeleteClassfied(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarNameSearch(System.String,OpenMetaverse.UUID)">
             <summary>
-            Delete a classified ad
+            Search for an avatar (first name, last name)
             </summary>
-            <param name="classifiedID">The classified ads ID</param>
+            <param name="name">The name to search for</param>
+            <param name="queryID">An ID to associate with this query</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.GetAttachmentResources(OpenMetaverse.AgentManager.AttachmentResourcesCallback)">
+        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarPicks(OpenMetaverse.UUID)">
             <summary>
-            Fetches resource usage by agents attachmetns
+            Start a request for Avatar Picks
             </summary>
-            <param name="callback">Called when the requested information is collected</param>
+            <param name="avatarid">UUID of the avatar</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.SetDisplayName(System.String,System.String)">
+        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarClassified(OpenMetaverse.UUID)">
             <summary>
-            Initates request to set a new display name
+            Start a request for Avatar Classifieds
             </summary>
-            <param name="oldName">Previous display name</param>
-            <param name="newName">Desired new display name</param>
+            <param name="avatarid">UUID of the avatar</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.UpdateAgentLanguage(System.String,System.Boolean)">
+        <member name="M:OpenMetaverse.AvatarManager.RequestPickInfo(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Tells the sim what UI language is used, and if it's ok to share that with scripts
+            Start a request for details of a specific profile pick
             </summary>
-            <param name="language">Two letter language code</param>
-            <param name="isPublic">Share language info with scripts</param>
+            <param name="avatarid">UUID of the avatar</param>
+            <param name="pickid">UUID of the profile pick</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.InstantMessageHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.AvatarManager.RequestClassifiedInfo(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Take an incoming ImprovedInstantMessage packet, auto-parse, and if
-            OnInstantMessage is defined call that with the appropriate arguments
+            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="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.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.
-            </summary>
+        <member name="M:OpenMetaverse.AvatarManager.AvatarAnimationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.ScriptDialogHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>
-            Used for parsing llDialogs
-            </summary>
+        <member name="M:OpenMetaverse.AvatarManager.AvatarAppearanceHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.ScriptQuestionHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>
-            Used for parsing llRequestPermissions dialogs
-            </summary>
+        <member name="M:OpenMetaverse.AvatarManager.AvatarPropertiesHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.ScriptControlChangeHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>
-            Handles Script Control changes when Script with permissions releases or takes a control
-            </summary>
+        <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.AgentManager.LoadURLHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.AvatarManager.DisplayNameUpdateMessageHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Used for parsing llLoadURL Dialogs
-            </summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="M:OpenMetaverse.AgentManager.MovementCompleteHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>
-            Update client's Position, LookAt and region handle from incoming packet
-            </summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-            <remarks>This occurs when after an avatar moves into a new sim</remarks>
-        </member>
-        <member name="M:OpenMetaverse.AgentManager.HealthHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming 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.AgentManager.AgentDataUpdateHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming 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.AgentManager.MoneyBalanceReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming 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.AgentManager.SetDisplayNameReplyEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
-            <summary>
-            EQ Message fired with the result of SetDisplayName request
+            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="M:OpenMetaverse.AgentManager.TeleportFailedEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
-            <summary>
-            Process TeleportFailed message sent via EventQueue, informs agent its last teleport has failed and why.
-            </summary>
-            <param name="messageKey">The Message Key</param>
-            <param name="message">An IMessage object Deserialized from the recieved message event</param>
-            <param name="simulator">The simulator originating the event message</param>
-        </member>
-        <member name="M:OpenMetaverse.AgentManager.TeleportFinishEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.AvatarManager.AvatarGroupsReplyMessageHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Process TeleportFinish from Event Queue and pass it onto our TeleportHandler
+            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 system key for this event</param>
-            <param name="message">IMessage object containing decoded data from OSD</param>
-            <param name="simulator">The simulator originating the event message</param>
-        </member>
-        <member name="M:OpenMetaverse.AgentManager.TeleportHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming 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="capsKey">The message key</param>
+            <param name="message">the IMessage object containing the deserialized data sent from the simulator</param>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> which originated the packet</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AvatarAnimationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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="M:OpenMetaverse.AgentManager.MeanCollisionAlertHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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="M:OpenMetaverse.AgentManager.CrossedRegionEventHandler(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="M:OpenMetaverse.AgentManager.CrossedRegionHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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>
-            <remarks>This packet is now being sent via the EventQueue</remarks>
-        </member>
-        <member name="M:OpenMetaverse.AgentManager.ChatterBoxSessionEventReplyEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
-            <summary>
-            Group Chat event handler
-            </summary>
-            <param name="capsKey">The capability Key</param>
-            <param name="message">IMessage object containing decoded data from OSD</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="message">IMessage object containing decoded data from OSD</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="message">IMessage object containing decoded data from OSD</param>
-            <param name="simulator"></param>
-        </member>
-        <member name="M:OpenMetaverse.AgentManager.ChatterBoxInvitationEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
-            <summary>
-            Handle a group chat Invitation
-            </summary>
-            <param name="capsKey">Caps Key</param>
-            <param name="message">IMessage object containing decoded data from OSD</param>
-            <param name="simulator">Originating Simulator</param>
-        </member>
-        <member name="M:OpenMetaverse.AgentManager.ModerateChatSessions(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.Boolean)">
-            <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="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>
-        <member name="M:OpenMetaverse.AgentManager.AlertMessageHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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="M:OpenMetaverse.AgentManager.CameraConstraintHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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="M:OpenMetaverse.AgentManager.ScriptSensorReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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="M:OpenMetaverse.AgentManager.AvatarSitResponseHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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="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 name="E:OpenMetaverse.AvatarManager.AvatarAnimation">
+            <summary>Raised when the simulator sends us data containing
+            an agents animation playlist</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="E:OpenMetaverse.AvatarManager.AvatarAppearance">
+            <summary>Raised when the simulator sends us data containing
+            the appearance information for an agent</summary>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.AgentDataReply">
-            <summary>Raised when a simulator sends agent specific information for our avatar.</summary>
+        <member name="E:OpenMetaverse.AvatarManager.UUIDNameReply">
+            <summary>Raised when the simulator sends us data containing
+            agent names/id values</summary>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.AnimationsChanged">
-            <summary>Raised when our agents animation playlist changes</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="E:OpenMetaverse.AgentManager.MeanCollision">
-            <summary>Raised when an object or avatar forcefully collides with our agent</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="E:OpenMetaverse.AgentManager.RegionCrossed">
-            <summary>Raised when our agent crosses a region border into another region</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="E:OpenMetaverse.AgentManager.GroupChatJoined">
-            <summary>Raised when our agent succeeds or fails to join a group chat session</summary>
+        <member name="E:OpenMetaverse.AvatarManager.AvatarPickerReply">
+            <summary>Raised when the simulator sends us data containing
+            name/id pair</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="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="E:OpenMetaverse.AgentManager.ScriptControlChange">
-            <summary>Raised when a script attempts to take or release specified controls for our agent</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="E:OpenMetaverse.AgentManager.CameraConstraint">
-            <summary>Raised when the simulator detects our agent is trying to view something
-            beyond its limits</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="E:OpenMetaverse.AgentManager.ScriptSensorReply">
-            <summary>Raised when a script sensor reply is received from a simulator</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="E:OpenMetaverse.AgentManager.AvatarSitResponse">
-            <summary>Raised in response to a <see cref="M:OpenMetaverse.AgentManager.RequestSit(OpenMetaverse.UUID,OpenMetaverse.Vector3)"/> request</summary>
+        <member name="E:OpenMetaverse.AvatarManager.PickInfoReply">
+            <summary>Raised when the simulator sends us data containing
+            the Pick details</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="E:OpenMetaverse.AvatarManager.AvatarClassifiedReply">
+            <summary>Raised when the simulator sends us data containing
+            the classified ads an agent has placed</summary>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.ChatSessionMemberLeft">
-            <summary>Raised when an agent exits a group chat session we are participating in</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="E:OpenMetaverse.AgentManager.SetDisplayNameReply">
+        <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="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 name="T:OpenMetaverse.AvatarManager.DisplayNamesCallback">
+            <summary>
+            Callback giving results when fetching display names
+            </summary>
+            <param name="success">If the request was successful</param>
+            <param name="names">Array of display names</param>
+            <param name="badIDs">Array of UUIDs that could not be fetched</param>
         </member>
-        <member name="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.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="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.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>
-        <member name="P:OpenMetaverse.AgentManager.HomeLookAt">
-            <summary>LookAt point saved/restored with HomePosition</summary>
+        <member name="P:OpenMetaverse.AvatarAnimationEventArgs.AvatarID">
+            <summary>Get the ID of the agent</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.FirstName">
-            <summary>Avatar First Name (i.e. Philip)</summary>
+        <member name="P:OpenMetaverse.AvatarAnimationEventArgs.Animations">
+            <summary>Get the list of animations to start</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.LastName">
-            <summary>Avatar Last Name (i.e. Linden)</summary>
+        <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="P:OpenMetaverse.AgentManager.Name">
-            <summary>Avatar Full Name (i.e. Philip Linden)</summary>
+        <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>
+            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="P:OpenMetaverse.AgentManager.Health">
-            <summary>Gets the health of the agent</summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.Simulator">
+            <summary>Get the Simulator this request is from of the agent</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.Balance">
-            <summary>Gets the current balance of the agent</summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.AvatarID">
+            <summary>Get the ID 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 name="P:OpenMetaverse.AvatarAppearanceEventArgs.IsTrial">
+            <summary>true if the agent is a trial account</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.AvatarAppearanceEventArgs.DefaultTexture">
+            <summary>Get the default agent texture</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.ActiveGroupPowers">
-            <summary>Gets the Agents powers in the currently active group</summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.FaceTextures">
+            <summary>Get the agents appearance layer textures</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.TeleportMessage">
-            <summary>Current status message for teleporting</summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams">
+            <summary>Get the <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams"/> for the agent</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 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="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.AvatarAppearanceEventArgs.COFVersion">
+            <summary>Version of the Current Outfit Folder the appearance is based on</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.SimPosition">
-            <summary>Current position of the agent in the simulator</summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.AppearanceFlags">
+            <summary>Appearance flags, introduced with server side baking, currently unused</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.SimRotation">
-            <summary>
-            A <seealso cref="T:OpenMetaverse.Quaternion"/> representing the agents current rotation
-            </summary>
+        <member name="T:OpenMetaverse.AvatarInterestsReplyEventArgs">
+            <summary>Represents the interests from the profile of an agent</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.GlobalPosition">
-            <summary>Returns the global grid position of the avatar</summary>
+        <member name="P:OpenMetaverse.AvatarInterestsReplyEventArgs.AvatarID">
+            <summary>Get the ID of the agent</summary>
         </member>
-        <member name="T:OpenMetaverse.AgentManager.ControlFlags">
-            <summary>
-            Used to specify movement actions for your agent
-            </summary>
+        <member name="T:OpenMetaverse.AvatarPropertiesReplyEventArgs">
+            <summary>The properties of an agent</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.NONE">
-            <summary>Empty flag</summary>
+        <member name="P:OpenMetaverse.AvatarPropertiesReplyEventArgs.AvatarID">
+            <summary>Get the ID 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.AvatarGroupsReplyEventArgs.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.AvatarPicksReplyEventArgs.AvatarID">
+            <summary>Get the ID of the agent</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.AvatarClassifiedReplyEventArgs.AvatarID">
+            <summary>Get the ID of the avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG">
-            <summary>Move Right (SL Keybinding: Shift-(D/Right Arrow))</summary>
+        <member name="T:OpenMetaverse.DisplayNameUpdateEventArgs">
+            <summary>
+            Event args class for display name notification messages
+            </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="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_UP_NEG">
-            <summary>Not Flying: Croutch/Flying: Move Down (SL Keybinding: C)</summary>
+        <member name="T:OpenMetaverse.Assets.Asset">
+            <summary>
+            Base class for all Asset types
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_PITCH_POS">
-            <summary>Unused</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_PITCH_NEG">
-            <summary>Unused</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_YAW_POS">
-            <summary>Unused</summary>
+        <member name="F:OpenMetaverse.Assets.Asset._AssetID">
+            <summary>A unique ID</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_YAW_NEG">
-            <summary>Unused</summary>
+        <member name="M:OpenMetaverse.Assets.Asset.#ctor">
+            <summary>
+            Construct a new Asset object
+            </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="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_FAST_LEFT">
-            <summary>ORed with AGENT_CONTROL_LEFT_* if the keyboard is being used</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_FAST_UP">
-            <summary>ORed with AGENT_CONTROL_UP_* if the keyboard is being used</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_FLY">
-            <summary>Fly</summary>
+        <member name="P:OpenMetaverse.Assets.Asset.AssetID">
+            <summary>The assets unique ID</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_STOP">
-            <summary></summary>
+        <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_FINISH_ANIM">
-            <summary>Finish our current animation</summary>
+        <member name="M:OpenMetaverse.Assets.AssetPrim.#ctor">
+            <summary>Initializes a new instance of an AssetPrim object</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="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_SIT_ON_GROUND">
-            <summary>Sit on the ground at our current location</summary>
+        <member name="M:OpenMetaverse.Assets.AssetPrim.Encode">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK">
-            <summary>Whether mouselook is currently enabled</summary>
+        <member name="M:OpenMetaverse.Assets.AssetPrim.Decode">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </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="P:OpenMetaverse.Assets.AssetPrim.AssetType">
+            <summary>Override the base classes AssetType</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="T:OpenMetaverse.Assets.AssetPrim.ProfileShape">
+            <summary>
+            Only used internally for XML serialization/deserialization
+            </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="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_NUDGE_LEFT_NEG">
-            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
+        <member name="T:OpenMetaverse.EstateTask">
+            <summary>Describes tasks returned in LandStatReply</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="T:OpenMetaverse.EstateTools">
+            <summary>
+            Estate level administration and utilities
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG">
-            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
+        <member name="F:OpenMetaverse.EstateTools.GroundTextures">
+            <summary>Textures for each of the four terrain height levels</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT">
-            <summary></summary>
+        <member name="F:OpenMetaverse.EstateTools.GroundTextureLimits">
+            <summary>Upper/lower texture boundaries for each corner of the sim</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT">
-            <summary></summary>
+        <member name="M:OpenMetaverse.EstateTools.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Constructor for EstateTools class
+            </summary>
+            <param name="client"></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="F:OpenMetaverse.EstateTools.m_TopCollidersReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN">
-            <summary></summary>
+        <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.AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_UP">
-            <summary></summary>
+        <member name="F:OpenMetaverse.EstateTools.m_TopCollidersReply_Lock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_DOWN">
-            <summary></summary>
+        <member name="F:OpenMetaverse.EstateTools.m_TopScriptsReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_UP">
-            <summary></summary>
+        <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="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.EstateTools.m_TopScriptsReply_Lock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.Camera">
-            <summary>Agent camera controls</summary>
+        <member name="F:OpenMetaverse.EstateTools.m_EstateUsersReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.Flags">
-            <summary>Currently only used for hiding your group title</summary>
+        <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.AgentManager.AgentMovement.State">
-            <summary>Action state of the avatar, which can currently be
-            typing and editing</summary>
+        <member name="F:OpenMetaverse.EstateTools.m_EstateUsersReply_Lock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.BodyRotation">
-            <summary></summary>
+        <member name="F:OpenMetaverse.EstateTools.m_EstateGroupsReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.HeadRotation">
-            <summary></summary>
+        <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.AgentManager.AgentMovement.LastBodyRotation">
-            <summary></summary>
+        <member name="F:OpenMetaverse.EstateTools.m_EstateGroupsReply_Lock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastHeadRotation">
-            <summary></summary>
+        <member name="F:OpenMetaverse.EstateTools.m_EstateManagersReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraCenter">
-            <summary></summary>
+        <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.AgentManager.AgentMovement.LastCameraXAxis">
-            <summary></summary>
+        <member name="F:OpenMetaverse.EstateTools.m_EstateManagersReply_Lock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraYAxis">
-            <summary></summary>
+        <member name="F:OpenMetaverse.EstateTools.m_EstateBansReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraZAxis">
-            <summary></summary>
+        <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.AgentManager.AgentMovement.LastFar">
-            <summary></summary>
+        <member name="F:OpenMetaverse.EstateTools.m_EstateBansReply_Lock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.updateTimer">
-            <summary>Timer for sending AgentUpdate packets</summary>
+        <member name="F:OpenMetaverse.EstateTools.m_EstateCovenantReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.#ctor(OpenMetaverse.GridClient)">
-            <summary>Default constructor</summary>
+        <member name="M:OpenMetaverse.EstateTools.OnEstateCovenantReply(OpenMetaverse.EstateCovenantReplyEventArgs)">
+            <summary>Raises the EstateCovenantReply event</summary>
+            <param name="e">A EstateCovenantReplyEventArgs object containing the
+            data returned from the data server</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.UpdateFromHeading(System.Double,System.Boolean)">
+        <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="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="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)">
             <summary>
-            Send an AgentUpdate with the camera set at the current agent
-            position and pointing towards the heading specified
+            Requests estate information such as top scripts and colliders
             </summary>
-            <param name="heading">Camera rotation in radians</param>
-            <param name="reliable">Whether to send the AgentUpdate reliable
-            or not</param>
+            <param name="parcelLocalID"></param>
+            <param name="reportType"></param>
+            <param name="requestFlags"></param>
+            <param name="filter"></param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.TurnToward(OpenMetaverse.Vector3)">
+        <member name="M:OpenMetaverse.EstateTools.RequestInfo">
+            <summary>Requests estate settings, including estate manager and access/ban lists</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.RequestTopScripts">
+            <summary>Requests the "Top Scripts" list for the current region</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.RequestTopColliders">
+            <summary>Requests the "Top Colliders" list for the current region</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.SetTerrainVariables(System.Single,System.Single,System.Single,System.Boolean,System.Boolean,System.Single)">
             <summary>
-            Rotates the avatar body and camera toward a target position.
-            This will also anchor the camera position on the avatar
+            Set several estate specific configuration variables
             </summary>
-            <param name="target">Region coordinates to turn toward</param>
+            <param name="WaterHeight">The Height of the waterlevel over the entire estate. Defaults to 20</param>
+            <param name="TerrainRaiseLimit">The maximum height change allowed above the baked terrain. Defaults to 4</param>
+            <param name="TerrainLowerLimit">The minimum height change allowed below the baked terrain. Defaults to -4</param>
+            <param name="UseEstateSun">true to use</param>
+            <param name="FixedSun">if True forces the sun position to the position in SunPosition</param>
+            <param name="SunPosition">The current position of the sun on the estate, or when FixedSun is true the static position
+            the sun will remain. <remarks>6.0 = Sunrise, 30.0 = Sunset</remarks></param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.TurnToward(OpenMetaverse.Vector3,System.Boolean)">
+        <member name="M:OpenMetaverse.EstateTools.SimWideReturn(OpenMetaverse.UUID,OpenMetaverse.EstateTools.EstateReturnFlags,System.Boolean)">
             <summary>
-            Rotates the avatar body and camera toward a target position.
-            This will also anchor the camera position on the avatar
+            Request return of objects owned by specified avatar 
             </summary>
-            <param name="target">Region coordinates to turn toward</param>
-            <param name="sendUpdate">whether to send update or not</param>
+            <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.AgentManager.AgentMovement.SendUpdate">
+        <member name="M:OpenMetaverse.EstateTools.EstateOwnerMessage(System.String,System.String)">
+            <summary></summary>
+            <param name="method"></param>
+            <param name="param"></param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.EstateOwnerMessage(System.String,System.Collections.Generic.List{System.String})">
             <summary>
-            Send new AgentUpdate packet to update our current camera 
-            position and rotation
+            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.AgentManager.AgentMovement.SendUpdate(System.Boolean)">
+        <member name="M:OpenMetaverse.EstateTools.KickUser(OpenMetaverse.UUID)">
             <summary>
-            Send new AgentUpdate packet to update our current camera 
-            position and rotation
+            Kick an avatar from an estate
             </summary>
-            <param name="reliable">Whether to require server acknowledgement
-            of this packet</param>
+            <param name="userID">Key of Agent to remove</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SendUpdate(System.Boolean,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.EstateTools.BanUser(OpenMetaverse.UUID,System.Boolean)">
             <summary>
-            Send new AgentUpdate packet to update our current camera 
-            position and rotation
+            Ban an avatar from an estate</summary>
+            <param name="userID">Key of Agent to remove</param>
+            <param name="allEstates">Ban user from this estate and all others owned by the estate owner</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.UnbanUser(OpenMetaverse.UUID,System.Boolean)">
+            <summary>Unban an avatar from an estate</summary>
+            <param name="userID">Key of Agent to remove</param>
+             /// <param name="allEstates">Unban user from this estate and all others owned by the estate owner</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.EstateMessage(System.String)">
+            <summary>
+            Send a message dialog to everyone in an entire estate
             </summary>
-            <param name="reliable">Whether to require server acknowledgement
-            of this packet</param>
-            <param name="simulator">Simulator to send the update to</param>
+            <param name="message">Message to send all users in the estate</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SendManualUpdate(OpenMetaverse.AgentManager.ControlFlags,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Quaternion,OpenMetaverse.Quaternion,System.Single,OpenMetaverse.AgentFlags,OpenMetaverse.AgentState,System.Boolean)">
+        <member name="M:OpenMetaverse.EstateTools.SimulatorMessage(System.String)">
             <summary>
-            Builds an AgentUpdate packet entirely from parameters. This
-            will not touch the state of Self.Movement or
-            Self.Movement.Camera in any way
+            Send a message dialog to everyone in a simulator
             </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>
+            <param name="message">Message to send all users in the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SetFOVVerticalAngle(System.Single)">
+        <member name="M:OpenMetaverse.EstateTools.TeleportHomeUser(OpenMetaverse.UUID)">
             <summary>
-            Sends update of Field of Vision vertical angle to the simulator
+            Send an avatar back to their home location
             </summary>
-            <param name="angle">Angle in radians</param>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AtPos">
-            <summary>Move agent positive along the X axis</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AtNeg">
-            <summary>Move agent negative along the X axis</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LeftPos">
-            <summary>Move agent positive along the Y axis</summary>
+            <param name="pest">Key of avatar to send home</param>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LeftNeg">
-            <summary>Move agent negative along the Y axis</summary>
+        <member name="M:OpenMetaverse.EstateTools.RestartRegion">
+            <summary>
+            Begin the region restart process
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpPos">
-            <summary>Move agent positive along the Z axis</summary>
+        <member name="M:OpenMetaverse.EstateTools.CancelRestart">
+            <summary>
+            Cancels a region restart
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpNeg">
-            <summary>Move agent negative along the Z axis</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="P:OpenMetaverse.AgentManager.AgentMovement.PitchPos">
-            <summary></summary>
+        <member name="M:OpenMetaverse.EstateTools.SetRegionDebug(System.Boolean,System.Boolean,System.Boolean)">
+            <summary>Estate panel "Debug" tab settings</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.PitchNeg">
-            <summary></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="P:OpenMetaverse.AgentManager.AgentMovement.YawPos">
-            <summary></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="P:OpenMetaverse.AgentManager.AgentMovement.YawNeg">
-            <summary></summary>
+        <member name="M:OpenMetaverse.EstateTools.RequestCovenant">
+            <summary>Requests the estate covenant</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastAt">
-            <summary></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="P:OpenMetaverse.AgentManager.AgentMovement.FastLeft">
-            <summary></summary>
+        <member name="M:OpenMetaverse.EstateTools.TeleportHomeAllUsers">
+            <summary>
+            Teleports all users home in current Estate
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastUp">
-            <summary></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="P:OpenMetaverse.AgentManager.AgentMovement.Fly">
-            <summary>Causes simulator to make agent fly</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="P:OpenMetaverse.AgentManager.AgentMovement.Stop">
-            <summary>Stop movement</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="P:OpenMetaverse.AgentManager.AgentMovement.FinishAnim">
-            <summary>Finish animation</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="P:OpenMetaverse.AgentManager.AgentMovement.StandUp">
-            <summary>Stand up from a sit</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="P:OpenMetaverse.AgentManager.AgentMovement.SitOnGround">
-            <summary>Tells simulator to sit agent on ground</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="P:OpenMetaverse.AgentManager.AgentMovement.Mouselook">
-            <summary>Place agent into mouselook mode</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="P:OpenMetaverse.AgentManager.AgentMovement.NudgeAtPos">
-            <summary>Nudge agent positive along the X axis</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="P:OpenMetaverse.AgentManager.AgentMovement.NudgeAtNeg">
-            <summary>Nudge agent negative along the X axis</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="P:OpenMetaverse.AgentManager.AgentMovement.NudgeLeftPos">
-            <summary>Nudge agent positive along the Y axis</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="P:OpenMetaverse.AgentManager.AgentMovement.NudgeLeftNeg">
-            <summary>Nudge agent negative along the Y axis</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="P:OpenMetaverse.AgentManager.AgentMovement.NudgeUpPos">
-            <summary>Nudge agent positive along the Z axis</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="P:OpenMetaverse.AgentManager.AgentMovement.NudgeUpNeg">
-            <summary>Nudge agent negative along the Z axis</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="P:OpenMetaverse.AgentManager.AgentMovement.TurnLeft">
-            <summary></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="P:OpenMetaverse.AgentManager.AgentMovement.TurnRight">
-            <summary></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="P:OpenMetaverse.AgentManager.AgentMovement.Away">
-            <summary>Tell simulator to mark agent as away</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="P:OpenMetaverse.AgentManager.AgentMovement.LButtonDown">
-            <summary></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="P:OpenMetaverse.AgentManager.AgentMovement.LButtonUp">
-            <summary></summary>
+        <member name="T:OpenMetaverse.EstateTools.LandStatReportType">
+            <summary>Used in the ReportType field of a LandStatRequest</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.MLButtonDown">
-            <summary></summary>
+        <member name="T:OpenMetaverse.EstateTools.EstateAccessDelta">
+            <summary>Used by EstateOwnerMessage packets</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.MLButtonUp">
-            <summary></summary>
+        <member name="T:OpenMetaverse.EstateTools.EstateAccessReplyDelta">
+            <summary>Used by EstateOwnerMessage packets</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AlwaysRun">
+        <member name="T:OpenMetaverse.EstateTools.EstateReturnFlags">
             <summary>
-            Returns "always run" value, or changes it by sending a SetAlwaysRunPacket
+            
             </summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentControls">
-            <summary>The current value of the agent control flags</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpdateInterval">
-            <summary>Gets or sets the interval in milliseconds at which
-            AgentUpdate packets are sent to the current simulator. Setting
-            this to a non-zero value will also enable the packet sending if
-            it was previously off, and setting it to zero will disable</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpdateEnabled">
-            <summary>Gets or sets whether AgentUpdate packets are sent to
-            the current simulator</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AutoResetControls">
-            <summary>Reset movement controls every time we send an update</summary>
+        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.None">
+            <summary>No flags set</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="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnScripted">
+            <summary>Only return targets scripted objects</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.Far">
-            <summary></summary>
+        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnOnOthersLand">
+            <summary>Only return targets objects if on others land</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="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnScriptedAndOnOthers">
+            <summary>Returns target's scripted objects and objects on other parcels</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.#ctor">
-            <summary>
-            Default constructor
-            </summary>
+        <member name="T:OpenMetaverse.EstateTools.GroundTextureSettings">
+            <summary>Ground texture settings for each corner of the region</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.Position">
-            <summary></summary>
+        <member name="T:OpenMetaverse.EstateTools.GroundTextureHeight">
+            <summary>Used by GroundTextureHeightSettings</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.AtAxis">
-            <summary></summary>
+        <member name="T:OpenMetaverse.EstateTools.GroundTextureHeightSettings">
+            <summary>The high and low texture thresholds for each corner of the sim</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.LeftAxis">
-            <summary></summary>
+        <member name="T:OpenMetaverse.TopCollidersReplyEventArgs">
+            <summary>Raised on LandStatReply when the report type is for "top colliders"</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.UpAxis">
-            <summary></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="T:OpenMetaverse.AgentManager.AttachmentResourcesCallback">
+        <member name="P:OpenMetaverse.TopCollidersReplyEventArgs.ObjectCount">
             <summary>
-            Called once attachment resource usage information has been collected
+            The number of returned items in LandStatReply
             </summary>
-            <param name="success">Indicates if operation was successfull</param>
-            <param name="info">Attachment resource usage information</param>
         </member>
-        <member name="T:OpenMetaverse.Rendering.FacetedMesh">
+        <member name="P:OpenMetaverse.TopCollidersReplyEventArgs.Tasks">
             <summary>
-            Contains all mesh faces that belong to a prim
+            A Dictionary of Object UUIDs to tasks returned in LandStatReply
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Rendering.FacetedMesh.Faces">
-            <summary>List of primitive faces</summary>
+        <member name="T:OpenMetaverse.TopScriptsReplyEventArgs">
+            <summary>Raised on LandStatReply when the report type is for "top Scripts"</summary>
         </member>
-        <member name="M:OpenMetaverse.Rendering.FacetedMesh.TryDecodeFromAsset(OpenMetaverse.Primitive,OpenMetaverse.Assets.AssetMesh,OpenMetaverse.Rendering.DetailLevel,OpenMetaverse.Rendering.FacetedMesh@)">
-            <summary>
-            Decodes mesh asset into FacetedMesh
-            </summary>
-            <param name="prim">Mesh primitive</param>
-            <param name="meshAsset">Asset retrieved from the asset server</param>
-            <param name="LOD">Level of detail</param>
-            <param name="mesh">Resulting decoded FacetedMesh</param>
-            <returns>True if mesh asset decoding was successful</returns>
+        <member 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="T:OpenMetaverse.Imaging.Baker">
+        <member name="P:OpenMetaverse.TopScriptsReplyEventArgs.ObjectCount">
             <summary>
-            A set of textures that are layered on texture of each other and "baked"
-            in to a single texture, for avatar appearances
+            The number of scripts returned in LandStatReply
             </summary>
         </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 name="P:OpenMetaverse.TopScriptsReplyEventArgs.Tasks">
+            <summary>
+            A Dictionary of Object UUIDs to tasks returned in LandStatReply
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.Baker.bakeHeight">
-            <summary>Height of the final baked image and scratchpad</summary>
+        <member name="T:OpenMetaverse.EstateBansReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.Baker.bakeType">
-            <summary>Bake type</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="M:OpenMetaverse.Imaging.Baker.#ctor(OpenMetaverse.BakeType)">
+        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.EstateID">
             <summary>
-            Default constructor
+            The identifier of the estate
             </summary>
-            <param name="bakeType">Bake type</param>
         </member>
-        <member name="M:OpenMetaverse.Imaging.Baker.AddTexture(OpenMetaverse.AppearanceManager.TextureData)">
+        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.Count">
             <summary>
-            Adds layer for baking
+            The number of returned itmes
             </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.EstateBansReplyEventArgs.Banned">
             <summary>
-            Converts avatar texture index (face) to Bake type
+            List of UUIDs of Banned Users
             </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="T:OpenMetaverse.EstateUsersReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateUsersReplyEventArgs.#ctor(System.UInt32,System.Int32,System.Collections.Generic.List{OpenMetaverse.UUID})">
+            <summary>Construct a new instance of the EstateUsersReplyEventArgs class</summary>
+            <param name="estateID">The estate's identifier on the grid</param>
+            <param name="count">The number of users</param>
+            <param name="allowedUsers">Allowed users UUIDs</param>
+        </member>
+        <member name="P:OpenMetaverse.EstateUsersReplyEventArgs.EstateID">
             <summary>
-            Make sure images exist, resize source if needed to match the destination
+            The identifier of the estate
             </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.EstateUsersReplyEventArgs.Count">
             <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 number of returned items
             </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.EstateUsersReplyEventArgs.AllowedUsers">
             <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
+            List of UUIDs of Allowed Users
             </summary>
-            <param name="r">Red value</param>
-            <param name="g">Green value</param>
-            <param name="b">Blue value</param>
-        </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.BakedTexture">
-            <summary>Final baked texture</summary>
-        </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.Textures">
-            <summary>Component layers</summary>
-        </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.BakeWidth">
-            <summary>Width of the final baked image and scratchpad</summary>
-        </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.BakeHeight">
-            <summary>Height of the final baked image and scratchpad</summary>
         </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.BakeType">
-            <summary>Bake type</summary>
+        <member name="T:OpenMetaverse.EstateGroupsReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
         </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.IsSkin">
-            <summary>Is this one of the 3 skin bakes</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="T:OpenMetaverse.Assets.AssetWearable">
+        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.EstateID">
             <summary>
-            Represents a Wearable Asset, Clothing, Hair, Skin, Etc
+            The identifier of the estate
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Name">
-            <summary>A string containing the name of the asset</summary>
+        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.Count">
+            <summary>
+            The number of returned items
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Description">
-            <summary>A string containing a short description of the asset</summary>
+        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.AllowedGroups">
+            <summary>
+            List of UUIDs of Allowed Groups
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.WearableType">
-            <summary>The Assets WearableType</summary>
+        <member name="T:OpenMetaverse.EstateManagersReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.ForSale">
-            <summary>The For-Sale status of the object</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="F:OpenMetaverse.Assets.AssetWearable.SalePrice">
-            <summary>An Integer representing the purchase price of the asset</summary>
+        <member name="P:OpenMetaverse.EstateManagersReplyEventArgs.EstateID">
+            <summary>
+            The identifier of the estate
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Creator">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the assets creator</summary>
+        <member name="P:OpenMetaverse.EstateManagersReplyEventArgs.Count">
+            <summary>
+            The number of returned items
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Owner">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the assets current owner</summary>
+        <member name="P:OpenMetaverse.EstateManagersReplyEventArgs.Managers">
+            <summary>
+            List of UUIDs of the Estate's Managers
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.LastOwner">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the assets prior owner</summary>
+        <member name="T:OpenMetaverse.EstateCovenantReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</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.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="F:OpenMetaverse.Assets.AssetWearable.GroupOwned">
-            <summary>True if the asset is owned by a <seealso cref="F:OpenMetaverse.Assets.AssetWearable.Group"/></summary>
+        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.CovenantID">
+            <summary>
+            The Covenant
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Permissions">
-            <summary>The Permissions mask of the asset</summary>
+        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.Timestamp">
+            <summary>
+            The timestamp
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Params">
-            <summary>A Dictionary containing Key/Value pairs of the objects parameters</summary>
+        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.EstateName">
+            <summary>
+            The Estate name
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Textures">
-            <summary>A Dictionary containing Key/Value pairs where the Key is the textures Index and the Value is the Textures <seealso cref="T:OpenMetaverse.UUID"/></summary>
+        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.EstateOwnerID">
+            <summary>
+            The Estate Owner's ID (can be a GroupID)
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetWearable.#ctor">
-            <summary>Initializes a new instance of an AssetWearable object</summary>
+        <member name="T:OpenMetaverse.EstateUpdateInfoReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetWearable.#ctor(OpenMetaverse.UUID,System.Byte[])">
-            <summary>Initializes a new instance of an AssetWearable object with parameters</summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
+        <member name="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="M:OpenMetaverse.Assets.AssetWearable.Decode">
+        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.EstateName">
             <summary>
-            Decode an assets byte encoded data to a string
+            The estate's name
             </summary>
-            <returns>true if the asset data was decoded successfully</returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetWearable.Encode">
+        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.EstateOwner">
             <summary>
-            Encode the assets string represantion into a format consumable by the asset server
+            The Estate Owner's ID (can be a GroupID)
             </summary>
         </member>
-        <member name="T:OpenMetaverse.AgentDisplayName">
-            <summary> Information about agents display name </summary>
+        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.EstateID">
+            <summary>
+            The identifier of the estate on the grid
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentDisplayName.ID">
-            <summary> Agent UUID </summary>
+        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.DenyNoPaymentInfo">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AgentDisplayName.UserName">
-            <summary> Username </summary>
+        <member name="T:OpenMetaverse.AgentManager">
+            <summary>
+            Manager class for our own avatar
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentDisplayName.DisplayName">
-            <summary> Display name </summary>
+        <member name="F:OpenMetaverse.AgentManager.m_Chat">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentDisplayName.LegacyFirstName">
-            <summary> First name (legacy) </summary>
+        <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.AgentDisplayName.LegacyLastName">
-            <summary> Last name (legacy) </summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ChatLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentDisplayName.IsDefaultDisplayName">
-            <summary> Is display name default display name </summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptDialog">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentDisplayName.NextUpdate">
-            <summary> Cache display name until </summary>
+        <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.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="M:OpenMetaverse.AgentDisplayName.GetOSD">
-            <summary>
-            Return object as OSD map
-            </summary>
-            <returns>OSD containing agent's display name data</returns>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptDialogLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentDisplayName.LegacyFullName">
-            <summary> Full name (legacy) </summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptQuestion">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.AvatarGroup">
-            <summary>
-            Holds group information for Avatars such as those you might find in a profile
-            </summary>
+        <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.AvatarGroup.AcceptNotices">
-            <summary>true of Avatar accepts group notices</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptQuestionLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarGroup.GroupID">
-            <summary>Groups Key</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_LoadURL">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarGroup.GroupInsigniaID">
-            <summary>Texture Key for groups insignia</summary>
+        <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.AvatarGroup.GroupName">
-            <summary>Name of the group</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_LoadUrlLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarGroup.GroupPowers">
-            <summary>Powers avatar has in the group</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_Balance">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarGroup.GroupTitle">
-            <summary>Avatars Currently selected title</summary>
+        <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.AvatarGroup.ListInProfile">
-            <summary>true of Avatar has chosen to list this in their profile</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_BalanceLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Animation">
-            <summary>
-            Contains an animation currently being played by an agent
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.m_MoneyBalance">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Animation.AnimationID">
-            <summary>The ID of the animation asset</summary>
+        <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.Animation.AnimationSequence">
-            <summary>A number to indicate start order of currently playing animations</summary>
-            <remarks>On Linden Grids this number is unique per region, with OpenSim it is per client</remarks>
+        <member name="F:OpenMetaverse.AgentManager.m_MoneyBalanceReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Animation.AnimationSourceObjectID">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_InstantMessage">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.ProfilePick">
-            <summary>
-            Holds group information on an individual profile pick
-            </summary>
+        <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="T:OpenMetaverse.AvatarManager">
-            <summary>
-            Retrieve friend status notifications, and retrieve avatar names and
-            profiles
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.m_InstantMessageLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAnimation">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_Teleport">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnAvatarAnimation(OpenMetaverse.AvatarAnimationEventArgs)">
-            <summary>Raises the AvatarAnimation Event</summary>
-             <param name="e">An AvatarAnimationEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="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.AvatarManager.m_AvatarAnimationLock">
+        <member name="F:OpenMetaverse.AgentManager.m_TeleportLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAppearance">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_AgentData">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnAvatarAppearance(OpenMetaverse.AvatarAppearanceEventArgs)">
-            <summary>Raises the AvatarAppearance Event</summary>
-             <param name="e">A AvatarAppearanceEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="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.AvatarManager.m_AvatarAppearanceLock">
+        <member name="F:OpenMetaverse.AgentManager.m_AgentDataLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_UUIDNameReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_AnimationsChanged">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnUUIDNameReply(OpenMetaverse.UUIDNameReplyEventArgs)">
-            <summary>Raises the UUIDNameReply Event</summary>
-             <param name="e">A UUIDNameReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="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.AvatarManager.m_UUIDNameReplyLock">
+        <member name="F:OpenMetaverse.AgentManager.m_AnimationsChangedLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarInterestsReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_MeanCollision">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnAvatarInterestsReply(OpenMetaverse.AvatarInterestsReplyEventArgs)">
-            <summary>Raises the AvatarInterestsReply Event</summary>
-             <param name="e">A AvatarInterestsReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="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.AvatarManager.m_AvatarInterestsReplyLock">
+        <member name="F:OpenMetaverse.AgentManager.m_MeanCollisionLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPropertiesReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_RegionCrossed">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnAvatarPropertiesReply(OpenMetaverse.AvatarPropertiesReplyEventArgs)">
-            <summary>Raises the AvatarPropertiesReply Event</summary>
-             <param name="e">A AvatarPropertiesReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="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.AvatarManager.m_AvatarPropertiesReplyLock">
+        <member name="F:OpenMetaverse.AgentManager.m_RegionCrossedLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarGroupsReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_GroupChatJoined">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnAvatarGroupsReply(OpenMetaverse.AvatarGroupsReplyEventArgs)">
-            <summary>Raises the AvatarGroupsReply Event</summary>
-             <param name="e">A AvatarGroupsReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="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.AvatarManager.m_AvatarGroupsReplyLock">
+        <member name="F:OpenMetaverse.AgentManager.m_GroupChatJoinedLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPickerReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_AlertMessage">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnAvatarPickerReply(OpenMetaverse.AvatarPickerReplyEventArgs)">
-            <summary>Raises the AvatarPickerReply Event</summary>
-             <param name="e">A AvatarPickerReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="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.AvatarManager.m_AvatarPickerReplyLock">
+        <member name="F:OpenMetaverse.AgentManager.m_AlertMessageLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectPointAt">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptControl">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnViewerEffectPointAt(OpenMetaverse.ViewerEffectPointAtEventArgs)">
-            <summary>Raises the ViewerEffectPointAt Event</summary>
-             <param name="e">A ViewerEffectPointAtEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="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.AvatarManager.m_ViewerEffectPointAtLock">
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptControlLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectLookAt">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_CameraConstraint">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnViewerEffectLookAt(OpenMetaverse.ViewerEffectLookAtEventArgs)">
-            <summary>Raises the ViewerEffectLookAt Event</summary>
-             <param name="e">A ViewerEffectLookAtEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="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.AvatarManager.m_ViewerEffectLookAtLock">
+        <member name="F:OpenMetaverse.AgentManager.m_CameraConstraintLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffect">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptSensorReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnViewerEffect(OpenMetaverse.ViewerEffectEventArgs)">
-            <summary>Raises the ViewerEffect Event</summary>
-             <param name="e">A ViewerEffectEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="M:OpenMetaverse.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.AvatarManager.m_ViewerEffectLock">
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptSensorReplyLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPicksReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_AvatarSitResponse">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnAvatarPicksReply(OpenMetaverse.AvatarPicksReplyEventArgs)">
-            <summary>Raises the AvatarPicksReply Event</summary>
-             <param name="e">A AvatarPicksReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="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.AvatarManager.m_AvatarPicksReplyLock">
+        <member name="F:OpenMetaverse.AgentManager.m_AvatarSitResponseLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_PickInfoReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberAdded">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnPickInfoReply(OpenMetaverse.PickInfoReplyEventArgs)">
-            <summary>Raises the PickInfoReply Event</summary>
-             <param name="e">A PickInfoReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="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.AvatarManager.m_PickInfoReplyLock">
+        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberAddedLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarClassifiedReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberLeft">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnAvatarClassifiedReply(OpenMetaverse.AvatarClassifiedReplyEventArgs)">
-            <summary>Raises the AvatarClassifiedReply Event</summary>
-             <param name="e">A AvatarClassifiedReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="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.AvatarManager.m_AvatarClassifiedReplyLock">
+        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberLeftLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ClassifiedInfoReply">
+        <member name="F:OpenMetaverse.AgentManager.m_SetDisplayNameReply">
             <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnClassifiedInfoReply(OpenMetaverse.ClassifiedInfoReplyEventArgs)">
-            <summary>Raises the ClassifiedInfoReply Event</summary>
-             <param name="e">A ClassifiedInfoReplyEventArgs object containing
+        <member name="M:OpenMetaverse.AgentManager.OnSetDisplayNameReply(OpenMetaverse.SetDisplayNameReplyEventArgs)">
+            <summary>Raises the SetDisplayNameReply Event</summary>
+             <param name="e">A SetDisplayNameReplyEventArgs object containing
              the data sent from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ClassifiedInfoReplyLock">
+        <member name="F:OpenMetaverse.AgentManager.m_SetDisplayNameReplyLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_DisplayNameUpdate">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_MuteListUpdated">
+            <summary>The event subscribers. null if no subcribers</summary>
         </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="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.AvatarManager.m_DisplayNameUpdateLock">
+        <member name="F:OpenMetaverse.AgentManager.m_MuteListUpdatedLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.#ctor(OpenMetaverse.GridClient)">
+        <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>
-            Represents other avatars
+            Constructor, setup callbacks for packets related to our avatar
             </summary>
-            <param name="client"></param>
+            <param name="client">A reference to the <seealso cref="T:OpenMetaverse.GridClient"/> Class</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestTrackAgent(OpenMetaverse.UUID)">
-            <summary>Tracks the specified avatar on your map</summary>
-            <param name="preyID">Avatar ID to track</param>
+        <member name="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="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>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarName(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.AgentManager.RetrieveInstantMessages">
             <summary>
-            Request a single avatar name
+            Request any instant messages sent while the client was offline to be resent.
             </summary>
-            <param name="id">The avatar key to retrieve a name for</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarNames(System.Collections.Generic.List{OpenMetaverse.UUID})">
+        <member name="M:OpenMetaverse.AgentManager.InstantMessage(OpenMetaverse.UUID,System.String)">
             <summary>
-            Request a list of avatar names
+            Send an Instant Message to another Avatar
             </summary>
-            <param name="ids">The avatar keys to retrieve names for</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.AvatarManager.DisplayNamesAvailable">
+        <member name="M:OpenMetaverse.AgentManager.InstantMessage(OpenMetaverse.UUID,System.String,OpenMetaverse.UUID)">
             <summary>
-            Check if Display Names functionality is available
+            Send an Instant Message to an existing group chat or conference chat
             </summary>
-            <returns>True if Display name functionality is available</returns>
+            <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.AvatarManager.GetDisplayNames(System.Collections.Generic.List{OpenMetaverse.UUID},OpenMetaverse.AvatarManager.DisplayNamesCallback)">
+        <member name="M:OpenMetaverse.AgentManager.InstantMessage(System.String,OpenMetaverse.UUID,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID[])">
             <summary>
-            Request retrieval of display names (max 90 names per request)
+            Send an Instant Message
             </summary>
-            <param name="ids">List of UUIDs to lookup</param>
-            <param name="callback">Callback to report result of the operation</param>
+            <param name="fromName">The name this IM will show up as being from</param>
+            <param name="target">Key of Avatar</param>
+            <param name="message">Text message being sent</param>
+            <param name="imSessionID">IM session ID (to differentiate between IM windows)</param>
+            <param name="conferenceIDs">IDs of sessions for a conference</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarProperties(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.AgentManager.InstantMessage(System.String,OpenMetaverse.UUID,System.String,OpenMetaverse.UUID,OpenMetaverse.InstantMessageDialog,OpenMetaverse.InstantMessageOnline,OpenMetaverse.Vector3,OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            Start a request for Avatar Properties
+            Send an Instant Message
             </summary>
-            <param name="avatarid"></param>
+            <param name="fromName">The name this IM will show up as being from</param>
+            <param name="target">Key of Avatar</param>
+            <param name="message">Text message being sent</param>
+            <param name="imSessionID">IM session ID (to differentiate between IM windows)</param>
+            <param name="dialog">Type of instant message to send</param>
+            <param name="offline">Whether to IM offline avatars as well</param>
+            <param name="position">Senders Position</param>
+            <param name="regionID">RegionID Sender is In</param>
+            <param name="binaryBucket">Packed binary data that is specific to
+            the dialog type</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarNameSearch(System.String,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.AgentManager.InstantMessageGroup(OpenMetaverse.UUID,System.String)">
             <summary>
-            Search for an avatar (first name, last name)
+            Send an Instant Message to a group
             </summary>
-            <param name="name">The name to search for</param>
-            <param name="queryID">An ID to associate with this query</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.AvatarManager.RequestAvatarPicks(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.AgentManager.InstantMessageGroup(System.String,OpenMetaverse.UUID,System.String)">
             <summary>
-            Start a request for Avatar Picks
+            Send an Instant Message to a group the agent is a member of
             </summary>
-            <param name="avatarid">UUID of the avatar</param>
+            <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="message">Text message being sent</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarClassified(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.AgentManager.RequestJoinGroupChat(OpenMetaverse.UUID)">
             <summary>
-            Start a request for Avatar Classifieds
+            Send a request to join a group chat session
             </summary>
-            <param name="avatarid">UUID of the avatar</param>
+            <param name="groupID"><seealso cref="T:OpenMetaverse.UUID"/> of Group to leave</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestPickInfo(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.AgentManager.RequestLeaveGroupChat(OpenMetaverse.UUID)">
             <summary>
-            Start a request for details of a specific profile pick
+            Exit a group chat session. This will stop further Group chat messages
+            from being sent until session is rejoined.
             </summary>
-            <param name="avatarid">UUID of the avatar</param>
-            <param name="pickid">UUID of the profile pick</param>
+            <param name="groupID"><seealso cref="T:OpenMetaverse.UUID"/> of Group chat session to leave</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestClassifiedInfo(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.AgentManager.ReplyToScriptDialog(System.Int32,System.Int32,System.String,OpenMetaverse.UUID)">
             <summary>
-            Start a request for details of a specific profile classified
+            Reply to script dialog questions. 
             </summary>
-            <param name="avatarid">UUID of the avatar</param>
-            <param name="classifiedid">UUID of the profile classified</param>
+            <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)"/>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.UUIDNameReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.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>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.AvatarAnimationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.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>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.AvatarAppearanceHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.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>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.AvatarPropertiesHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.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>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.AvatarInterestsHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.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 
+            </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 
+            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"/>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.DisplayNameUpdateMessageHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.AgentManager.SphereEffect(OpenMetaverse.Vector3d,OpenMetaverse.Color4,System.Single,OpenMetaverse.UUID)">
             <summary>
-            EQ Message fired when someone nearby changes their display name
+            Create a particle swirl around a target position using a <seealso cref="T:OpenMetaverse.Packets.ViewerEffectPacket"/> packet
             </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="globalOffset">global offset</param>
+            <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>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.AvatarGroupsReplyMessageHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.AgentManager.RequestSit(OpenMetaverse.UUID,OpenMetaverse.Vector3)">
             <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.
+            Sends a request to sit on the specified object
             </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="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.AvatarManager.AvatarGroupsReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.AgentManager.Sit">
+            <summary>
+            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.AvatarManager.AvatarPickerReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.AgentManager.Stand">
+            <summary>Stands up from sitting on a prim or the ground</summary>
+            <returns>true of AgentUpdate was sent</returns>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.ViewerEffectHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.AgentManager.SitOnGround">
+            <summary>
+            Does a "ground sit" at the avatar's current position
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.AvatarPicksReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.AgentManager.Fly(System.Boolean)">
+            <summary>
+            Starts or stops flying
+            </summary>
+            <param name="start">True to start flying, false to stop flying</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.PickInfoReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.AgentManager.Crouch(System.Boolean)">
+            <summary>
+            Starts or stops crouching
+            </summary>
+            <param name="crouching">True to start crouching, false to stop crouching</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.AvatarClassifiedReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.AgentManager.Jump(System.Boolean)">
+            <summary>
+            Starts a jump (begin holding the jump key)
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.ClassifiedInfoReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.AgentManager.AutoPilot(System.Double,System.Double,System.Double)">
+            <summary>
+            Use the autopilot sim function to move the avatar to a new
+            position. Uses double precision to get precise movements
+            </summary>
+            <remarks>The z value is currently not handled properly by the simulator</remarks>
+            <param name="globalX">Global X coordinate to move to</param>
+            <param name="globalY">Global Y coordinate to move to</param>
+            <param name="z">Z coordinate to move to</param>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarAnimation">
-            <summary>Raised when the simulator sends us data containing
-            an agents animation playlist</summary>
+        <member name="M:OpenMetaverse.AgentManager.AutoPilot(System.UInt64,System.UInt64,System.Single)">
+            <summary>
+            Use the autopilot sim function to move the avatar to a new position
+            </summary>
+            <remarks>The z value is currently not handled properly by the simulator</remarks>
+            <param name="globalX">Integer value for the global X coordinate to move to</param>
+            <param name="globalY">Integer value for the global Y coordinate to move to</param>
+            <param name="z">Floating-point value for the Z coordinate to move to</param>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarAppearance">
-            <summary>Raised when the simulator sends us data containing
-            the appearance information for an agent</summary>
+        <member name="M:OpenMetaverse.AgentManager.AutoPilotLocal(System.Int32,System.Int32,System.Single)">
+            <summary>
+            Use the autopilot sim function to move the avatar to a new position
+            </summary>
+            <remarks>The z value is currently not handled properly by the simulator</remarks>
+            <param name="localX">Integer value for the local X coordinate to move to</param>
+            <param name="localY">Integer value for the local Y coordinate to move to</param>
+            <param name="z">Floating-point value for the Z coordinate to move to</param>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.UUIDNameReply">
-            <summary>Raised when the simulator sends us data containing
-            agent names/id values</summary>
+        <member name="M:OpenMetaverse.AgentManager.AutoPilotCancel">
+            <summary>Macro to cancel autopilot sim function</summary>
+            <remarks>Not certain if this is how it is really done</remarks>
+            <returns>true if control flags were set and AgentUpdate was sent to the simulator</returns>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarInterestsReply">
-            <summary>Raised when the simulator sends us data containing
-            the interests listed in an agents profile</summary>
+        <member name="M:OpenMetaverse.AgentManager.Grab(System.UInt32)">
+            <summary>
+            Grabs an object
+            </summary>
+            <param name="objectLocalID">an unsigned integer of the objects ID within the simulator</param>
+            <seealso cref="F:OpenMetaverse.Simulator.ObjectsPrimitives"/>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarPropertiesReply">
-            <summary>Raised when the simulator sends us data containing
-            profile property information for an agent</summary>
+        <member name="M:OpenMetaverse.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="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>
+            <param name="position">The region coordinates of the position to grab</param>
+            <param name="normal">The surface normal of the position to grab (A normal is a vector perpindicular to the surface)</param>
+            <param name="binormal">The surface binormal of the position to grab (A binormal is a vector tangen to the surface
+            pointing along the U direction of the tangent space</param>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarGroupsReply">
-            <summary>Raised when the simulator sends us data containing
-            the group membership an agent is a member of</summary>
+        <member name="M:OpenMetaverse.AgentManager.GrabUpdate(OpenMetaverse.UUID,OpenMetaverse.Vector3)">
+            <summary>
+            Drag an object
+            </summary>
+            <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="E:OpenMetaverse.AvatarManager.AvatarPickerReply">
-            <summary>Raised when the simulator sends us data containing
-            name/id pair</summary>
+        <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="grabPosition">Drag target in region coordinates</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>
+            <param name="position">The region coordinates of the position to grab</param>
+            <param name="normal">The surface normal of the position to grab (A normal is a vector perpindicular to the surface)</param>
+            <param name="binormal">The surface binormal of the position to grab (A binormal is a vector tangen to the surface
+            pointing along the U direction of the tangent space</param>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.ViewerEffectPointAt">
-            <summary>Raised when the simulator sends us data containing
-            the objects and effect when an agent is pointing at</summary>
+        <member name="M:OpenMetaverse.AgentManager.DeGrab(System.UInt32)">
+            <summary>
+            Release a grabbed object
+            </summary>
+            <param name="objectLocalID">The Objects Simulator Local ID</param>
+            <seealso cref="F:OpenMetaverse.Simulator.ObjectsPrimitives"/>
+            <seealso cref="M:OpenMetaverse.AgentManager.Grab(System.UInt32)"/>
+            <seealso cref="M:OpenMetaverse.AgentManager.GrabUpdate(OpenMetaverse.UUID,OpenMetaverse.Vector3)"/>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.ViewerEffectLookAt">
-            <summary>Raised when the simulator sends us data containing
-            the objects and effect when an agent is looking at</summary>
+        <member name="M:OpenMetaverse.AgentManager.DeGrab(System.UInt32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,System.Int32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
+            <summary>
+            Release a grabbed object
+            </summary>
+            <param name="objectLocalID">The Objects Simulator Local ID</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>
+            <param name="position">The region coordinates of the position to grab</param>
+            <param name="normal">The surface normal of the position to grab (A normal is a vector perpindicular to the surface)</param>
+            <param name="binormal">The surface binormal of the position to grab (A binormal is a vector tangen to the surface
+            pointing along the U direction of the tangent space</param>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.ViewerEffect">
-            <summary>Raised when the simulator sends us data containing
-            an agents viewer effect information</summary>
+        <member name="M:OpenMetaverse.AgentManager.Touch(System.UInt32)">
+            <summary>
+            Touches an object
+            </summary>
+            <param name="objectLocalID">an unsigned integer of the objects ID within the simulator</param>
+            <seealso cref="F:OpenMetaverse.Simulator.ObjectsPrimitives"/>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarPicksReply">
-            <summary>Raised when the simulator sends us data containing
-            the top picks from an agents profile</summary>
+        <member name="M:OpenMetaverse.AgentManager.RequestBalance">
+            <summary>
+            Request the current L$ balance
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.PickInfoReply">
-            <summary>Raised when the simulator sends us data containing
-            the Pick details</summary>
+        <member name="M:OpenMetaverse.AgentManager.GiveAvatarMoney(OpenMetaverse.UUID,System.Int32)">
+            <summary>
+            Give Money to destination Avatar
+            </summary>
+            <param name="target">UUID of the Target Avatar</param>
+            <param name="amount">Amount in L$</param>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarClassifiedReply">
-            <summary>Raised when the simulator sends us data containing
-            the classified ads an agent has placed</summary>
+        <member name="M:OpenMetaverse.AgentManager.GiveAvatarMoney(OpenMetaverse.UUID,System.Int32,System.String)">
+            <summary>
+            Give Money to destination Avatar
+            </summary>
+            <param name="target">UUID of the Target Avatar</param>
+            <param name="amount">Amount in L$</param>
+            <param name="description">Description that will show up in the
+            recipients transaction history</param>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.ClassifiedInfoReply">
-            <summary>Raised when the simulator sends us data containing
-            the details of a classified ad</summary>
+        <member name="M:OpenMetaverse.AgentManager.GiveObjectMoney(OpenMetaverse.UUID,System.Int32,System.String)">
+            <summary>
+            Give L$ to an object
+            </summary>
+            <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>
-        <member name="E:OpenMetaverse.AvatarManager.DisplayNameUpdate">
-            <summary>Raised when the simulator sends us data containing
-            the details of display name change</summary>
+        <member name="M:OpenMetaverse.AgentManager.GiveGroupMoney(OpenMetaverse.UUID,System.Int32)">
+            <summary>
+            Give L$ to a group
+            </summary>
+            <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="T:OpenMetaverse.AvatarManager.DisplayNamesCallback">
+        <member name="M:OpenMetaverse.AgentManager.GiveGroupMoney(OpenMetaverse.UUID,System.Int32,System.String)">
             <summary>
-            Callback giving results when fetching display names
+            Give L$ to a group
             </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>
+            <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>
-        <member name="T:OpenMetaverse.AvatarAnimationEventArgs">
-             <summary>Provides data for the <see cref="E:OpenMetaverse.AvatarManager.AvatarAnimation"/> event</summary>
-             <remarks>The <see cref="E:OpenMetaverse.AvatarManager.AvatarAnimation"/> event occurs when the simulator sends
-             the animation playlist for an agent</remarks>
-             <example>
-             The following code example uses the <see cref="P:OpenMetaverse.AvatarAnimationEventArgs.AvatarID"/> and <see cref="P:OpenMetaverse.AvatarAnimationEventArgs.Animations"/>
-             properties to display the animation playlist of an avatar on the <see cref="T:System.Console"/> window.
-             <code>
-                 // subscribe to the event
-                 Client.Avatars.AvatarAnimation += Avatars_AvatarAnimation;
-                 
-                 private void Avatars_AvatarAnimation(object sender, AvatarAnimationEventArgs e)
-                 {
-                     // create a dictionary of "known" animations from the Animations class using System.Reflection
-                     Dictionary&lt;UUID, string&gt; systemAnimations = new Dictionary&lt;UUID, string&gt;();
-                     Type type = typeof(Animations);
-                     System.Reflection.FieldInfo[] fields = type.GetFields(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static);
-                     foreach (System.Reflection.FieldInfo field in fields)
-                     {
-                         systemAnimations.Add((UUID)field.GetValue(type), field.Name);
-                     }
-            
-                     // find out which animations being played are known animations and which are assets
-                     foreach (Animation animation in e.Animations)
-                     {
-                         if (systemAnimations.ContainsKey(animation.AnimationID))
-                         {
-                             Console.WriteLine("{0} is playing {1} ({2}) sequence {3}", e.AvatarID,
-                                 systemAnimations[animation.AnimationID], animation.AnimationSequence);
-                         }
-                         else
-                         {
-                             Console.WriteLine("{0} is playing {1} (Asset) sequence {2}", e.AvatarID,
-                                 animation.AnimationID, animation.AnimationSequence);
-                         }
-                     }
-                 }
-             </code>
-             </example>
+        <member name="M:OpenMetaverse.AgentManager.PayUploadFee">
+            <summary>
+            Pay texture/animation upload fee
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarAnimationEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.Animation})">
+        <member name="M:OpenMetaverse.AgentManager.PayUploadFee(System.String)">
             <summary>
-            Construct a new instance of the AvatarAnimationEventArgs class
+            Pay texture/animation upload fee
             </summary>
-            <param name="avatarID">The ID of the agent</param>
-            <param name="anims">The list of animations to start</param>
+            <param name="description">description of the transaction</param>
         </member>
-        <member name="P:OpenMetaverse.AvatarAnimationEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="M:OpenMetaverse.AgentManager.GiveMoney(OpenMetaverse.UUID,System.Int32,System.String,OpenMetaverse.MoneyTransactionType,OpenMetaverse.TransactionFlags)">
+            <summary>
+            Give Money to destination Object or Avatar
+            </summary>
+            <param name="target">UUID of the Target Object/Avatar</param>
+            <param name="amount">Amount in L$</param>
+            <param name="description">Reason (Optional normally)</param>
+            <param name="type">The type of transaction</param>
+            <param name="flags">Transaction flags, mostly for identifying group
+            transactions</param>
         </member>
-        <member name="P:OpenMetaverse.AvatarAnimationEventArgs.Animations">
-            <summary>Get the list of animations to start</summary>
+        <member name="M:OpenMetaverse.AgentManager.PlayGesture(OpenMetaverse.UUID)">
+            <summary>
+            Plays a gesture
+            </summary>
+            <param name="gestureID">Asset <seealso cref="T:OpenMetaverse.UUID"/> of the gesture</param>
         </member>
-        <member name="T:OpenMetaverse.AvatarAppearanceEventArgs">
-            <summary>Provides data for the <see cref="E:OpenMetaverse.AvatarManager.AvatarAppearance"/> event</summary>
-            <remarks>The <see cref="E:OpenMetaverse.AvatarManager.AvatarAppearance"/> event occurs when the simulator sends
-            the appearance data for an avatar</remarks>
-            <example>
-            The following code example uses the <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.AvatarID"/> and <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams"/>
-            properties to display the selected shape of an avatar on the <see cref="T:System.Console"/> window.
-            <code>
-                // subscribe to the event
-                Client.Avatars.AvatarAppearance += Avatars_AvatarAppearance;
-            
-                // handle the data when the event is raised
-                void Avatars_AvatarAppearance(object sender, AvatarAppearanceEventArgs e)
-                {
-                    Console.WriteLine("The Agent {0} is using a {1} shape.", e.AvatarID, (e.VisualParams[31] &gt; 0) : "male" ? "female")
-                }
-            </code>
-            </example>
+        <member name="M:OpenMetaverse.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>
         </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},System.Byte,System.Int32,OpenMetaverse.AppearanceFlags)">
+        <member name="M:OpenMetaverse.AgentManager.DeactivateGesture(OpenMetaverse.UUID)">
             <summary>
-            Construct a new instance of the AvatarAppearanceEventArgs class
+            Mark gesture inactive
             </summary>
-            <param name="sim">The simulator request was from</param>
-            <param name="avatarID">The ID of the agent</param>
-            <param name="isTrial">true of the agent is a trial account</param>
-            <param name="defaultTexture">The default agent texture</param>
-            <param name="faceTextures">The agents appearance layer textures</param>
-            <param name="visualParams">The <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams"/> for the agent</param>
+            <param name="invID">Inventory <seealso cref="T:OpenMetaverse.UUID"/> of the gesture</param>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.Simulator">
-            <summary>Get the Simulator this request is from of the agent</summary>
+        <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="reliable">Whether to ensure delivery of this packet or not</param>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <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 
+            currently playing animation to stop playing</param>
+            <param name="reliable">Whether to ensure delivery of this packet or not</param>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.IsTrial">
-            <summary>true if the agent is a trial account</summary>
+        <member name="M:OpenMetaverse.AgentManager.Animate(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,System.Boolean},System.Boolean)">
+            <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
+            turn that animation on or off</param>
+            <param name="reliable">Whether to ensure delivery of this packet or not</param>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.DefaultTexture">
-            <summary>Get the default agent texture</summary>
+        <member name="M:OpenMetaverse.AgentManager.GoHome">
+            <summary>
+            Teleports agent to their stored home location
+            </summary>
+            <returns>true on successful teleport to home location</returns>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.FaceTextures">
-            <summary>Get the agents appearance layer textures</summary>
+        <member name="M:OpenMetaverse.AgentManager.Teleport(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>
+            <returns>true on success, false on failure</returns>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams">
-            <summary>Get the <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams"/> for the agent</summary>
+        <member name="M:OpenMetaverse.AgentManager.Teleport(System.String,OpenMetaverse.Vector3)">
+            <summary>
+            Attempt to look up a simulator name and teleport to the discovered
+            destination
+            </summary>
+            <param name="simName">Region name to look up</param>
+            <param name="position">Position to teleport to</param>
+            <returns>True if the lookup and teleport were successful, otherwise
+            false</returns>
         </member>
-        <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 name="M:OpenMetaverse.AgentManager.Teleport(System.String,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
+            <summary>
+            Attempt to look up a simulator name and teleport to the discovered
+            destination
+            </summary>
+            <param name="simName">Region name to look up</param>
+            <param name="position">Position to teleport to</param>
+            <param name="lookAt">Target to look at</param>
+            <returns>True if the lookup and teleport were successful, otherwise
+            false</returns>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.COFVersion">
-            <summary>Version of the Current Outfit Folder the appearance is based on</summary>
+        <member name="M:OpenMetaverse.AgentManager.Teleport(System.UInt64,OpenMetaverse.Vector3)">
+            <summary>
+            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>
+            <returns>true on success, false on failure</returns>
+            <remarks>This call is blocking</remarks>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.AppearanceFlags">
-            <summary>Appearance flags, introduced with server side baking, currently unused</summary>
+        <member name="M:OpenMetaverse.AgentManager.Teleport(System.UInt64,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
+            <summary>
+            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>
+            <returns>true on success, false on failure</returns>
+            <remarks>This call is blocking</remarks>
         </member>
-        <member name="T:OpenMetaverse.AvatarInterestsReplyEventArgs">
-            <summary>Represents the interests from the profile of an agent</summary>
+        <member name="M:OpenMetaverse.AgentManager.RequestTeleport(System.UInt64,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>
         </member>
-        <member name="P:OpenMetaverse.AvatarInterestsReplyEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <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>
         </member>
-        <member name="T:OpenMetaverse.AvatarPropertiesReplyEventArgs">
-            <summary>The properties of an agent</summary>
+        <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>
         </member>
-        <member name="P:OpenMetaverse.AvatarPropertiesReplyEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <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>
         </member>
-        <member name="P:OpenMetaverse.AvatarGroupsReplyEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <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="message">custom message to send with invitation</param>
         </member>
-        <member name="P:OpenMetaverse.AvatarPicksReplyEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="M:OpenMetaverse.AgentManager.TeleportLureRespond(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
+            <summary>
+            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="accept">true to accept the lure, false to decline it</param>
         </member>
-        <member name="P:OpenMetaverse.AvatarClassifiedReplyEventArgs.AvatarID">
-            <summary>Get the ID of the avatar</summary>
+        <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 
+            profile information</param>
         </member>
-        <member name="T:OpenMetaverse.DisplayNameUpdateEventArgs">
+        <member name="M:OpenMetaverse.AgentManager.UpdateInterests(OpenMetaverse.Avatar.Interests)">
             <summary>
-            Event args class for display name notification messages
+            Update agents profile interests
             </summary>
+            <param name="interests">selection of interests from <seealso cref="T:OpenMetaverse.Avatar.Interests"/> struct</param>
         </member>
-        <member name="T:OpenMetaverse.AvatarTextureIndex">
+        <member name="M:OpenMetaverse.AgentManager.SetHeightWidth(System.UInt16,System.UInt16)">
             <summary>
-            Index of TextureEntry slots for avatar appearances
+            Set the height and the width of the client window. This is used
+            by the server to build a virtual camera frustum for our avatar
             </summary>
+            <param name="height">New height of the viewer window</param>
+            <param name="width">New width of the viewer window</param>
         </member>
-        <member name="T:OpenMetaverse.BakeType">
+        <member name="M:OpenMetaverse.AgentManager.RequestMuteList">
             <summary>
-            Bake layers for avatar appearance
+            Request the list of muted objects and avatars for this agent
             </summary>
         </member>
-        <member name="T:OpenMetaverse.AppearanceFlags">
+        <member name="M:OpenMetaverse.AgentManager.UpdateMuteListEntry(OpenMetaverse.MuteType,OpenMetaverse.UUID,System.String)">
             <summary>
-            Appearance Flags, introdued with server side baking, currently unused
+            Mute an object, resident, etc.
             </summary>
+            <param name="type">Mute type</param>
+            <param name="id">Mute UUID</param>
+            <param name="name">Mute name</param>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.MAX_CONCURRENT_DOWNLOADS">
-            <summary>Maximum number of concurrent downloads for wearable assets and textures</summary>
+        <member name="M:OpenMetaverse.AgentManager.UpdateMuteListEntry(OpenMetaverse.MuteType,OpenMetaverse.UUID,System.String,OpenMetaverse.MuteFlags)">
+            <summary>
+            Mute an object, resident, etc.
+            </summary>
+            <param name="type">Mute type</param>
+            <param name="id">Mute UUID</param>
+            <param name="name">Mute name</param>
+            <param name="flags">Mute flags</param>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.MAX_CONCURRENT_UPLOADS">
-            <summary>Maximum number of concurrent uploads for baked textures</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.INVENTORY_TIMEOUT">
-            <summary>Timeout for fetching inventory listings</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_TIMEOUT">
-            <summary>Timeout for fetching a single wearable, or receiving a single packet response</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TEXTURE_TIMEOUT">
-            <summary>Timeout for fetching a single texture</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.UPLOAD_TIMEOUT">
-            <summary>Timeout for uploading a single baked texture</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.UPLOAD_RETRIES">
-            <summary>Number of times to retry bake upload</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.REBAKE_DELAY">
-            <summary>When changing outfit, kick off rebake after
-            20 seconds has passed since the last change</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_COUNT">
-            <summary>Total number of wearables for each avatar</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.BAKED_TEXTURE_COUNT">
-            <summary>Total number of baked textures on each avatar</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WEARABLES_PER_LAYER">
-            <summary>Total number of wearables per bake layer</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.ATTACHMENT_ADD">
-            <summary>Mask for multiple attachments</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.BakeIndexToTextureIndex">
-            <summary>Mapping between BakeType and AvatarTextureIndex</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_BAKE_MAP">
-            <summary>Map of what wearables are included in each bake</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.BAKED_TEXTURE_HASH">
-            <summary>Magic values to finalize the cache check hashes for each
-            bake</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.DEFAULT_AVATAR_TEXTURE">
-            <summary>Default avatar texture, used to detect when a custom
-            texture is not set for a face</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AgentWearablesReply">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.AppearanceManager.OnAgentWearables(OpenMetaverse.AgentWearablesReplyEventArgs)">
-            <summary>Raises the AgentWearablesReply event</summary>
-            <param name="e">An AgentWearablesReplyEventArgs object containing the
-            data returned from the data server</param>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AgentWearablesLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AgentCachedBakesReply">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.AppearanceManager.OnAgentCachedBakes(OpenMetaverse.AgentCachedBakesReplyEventArgs)">
-            <summary>Raises the CachedBakesReply event</summary>
-            <param name="e">An AgentCachedBakesReplyEventArgs object containing the
-            data returned from the data server AgentCachedTextureResponse</param>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AgentCachedBakesLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AppearanceSet">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.AppearanceManager.OnAppearanceSet(OpenMetaverse.AppearanceSetEventArgs)">
-            <summary>Raises the AppearanceSet event</summary>
-            <param name="e">An AppearanceSetEventArgs object indicating if the operatin was successfull</param>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AppearanceSetLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_RebakeAvatarReply">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.AppearanceManager.OnRebakeAvatar(OpenMetaverse.RebakeAvatarTexturesEventArgs)">
-            <summary>Raises the RebakeAvatarRequested event</summary>
-            <param name="e">An RebakeAvatarTexturesEventArgs object containing the
-            data returned from the data server</param>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_RebakeAvatarLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.MyVisualParameters">
-            <summary>Visual parameters last sent to the sim</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.MyTextures">
-            <summary>Textures about this client sent to the sim</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.Wearables">
-            <summary>A cache of wearables currently being worn</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.Textures">
-            <summary>A cache of textures currently being worn</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.CacheCheckSerialNum">
-            <summary>Incrementing serial number for AgentCachedTexture packets</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.SetAppearanceSerialNum">
-            <summary>Incrementing serial number for AgentSetAppearance packets</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.GotWearables">
-            <summary>Indicates if WearablesRequest succeeded</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.AppearanceThreadRunning">
-            <summary>Indicates whether or not the appearance thread is currently
-            running, to prevent multiple appearance threads from running
-            simultaneously</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.Client">
-            <summary>Reference to our agent</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.RebakeScheduleTimer">
+        <member name="M:OpenMetaverse.AgentManager.RemoveMuteListEntry(OpenMetaverse.UUID,System.String)">
             <summary>
-            Timer used for delaying rebake on changing outfit
+            Unmute an object, resident, etc.
             </summary>
+            <param name="id">Mute UUID</param>
+            <param name="name">Mute name</param>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.AppearanceThread">
+        <member name="M:OpenMetaverse.AgentManager.SetHome">
             <summary>
-            Main appearance thread
+            Sets home location to agents current position
             </summary>
+            <remarks>will fire an AlertMessage (<seealso cref="E:OpenMetaverse.AgentManager.OnAlertMessage"/>) with 
+            success or failure message</remarks>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.ServerBakingDone">
+        <member name="M:OpenMetaverse.AgentManager.CompleteAgentMovement(OpenMetaverse.Simulator)">
             <summary>
-            Is server baking complete. It needs doing only once
+            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>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.AgentManager.ScriptQuestionReply(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.ScriptPermission)">
             <summary>
-            Default constructor
+            Reply to script permissions request
             </summary>
-            <param name="client">A reference to our agent</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.AppearanceManager.SetPreviousAppearance">
+        <member name="M:OpenMetaverse.AgentManager.GroupInviteRespond(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
             <summary>
-            Obsolete method for setting appearance. This function no longer does anything.
-            Use RequestSetAppearance() to manually start the appearance thread
+            Respond to a group invitation by either accepting or denying it
             </summary>
+            <param name="groupID">UUID of the group (sent in the AgentID field of the invite message)</param>
+            <param name="imSessionID">IM Session ID from the group invitation message</param>
+            <param name="accept">Accept the group invitation or deny it</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.SetPreviousAppearance(System.Boolean)">
+        <member name="M:OpenMetaverse.AgentManager.RequestScriptSensor(System.String,OpenMetaverse.UUID,OpenMetaverse.ScriptSensorTypeFlags,System.Single,System.Single,OpenMetaverse.UUID,OpenMetaverse.Simulator)">
             <summary>
-            Obsolete method for setting appearance. This function no longer does anything.
-            Use RequestSetAppearance() to manually start the appearance thread
+            Requests script detection of objects and avatars
             </summary>
-            <param name="allowBake">Unused parameter</param>
+            <param name="name">name of the object/avatar to search for</param>
+            <param name="searchID">UUID of the object or avatar to search for</param>
+            <param name="type">Type of search from ScriptSensorTypeFlags</param>
+            <param name="range">range of scan (96 max?)</param>
+            <param name="arc">the arc in radians to search within</param>
+            <param name="requestID">an user generated ID to correlate replies with</param>
+            <param name="sim">Simulator to perform search in</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RequestSetAppearance">
+        <member name="M:OpenMetaverse.AgentManager.PickInfoUpdate(OpenMetaverse.UUID,System.Boolean,OpenMetaverse.UUID,System.String,OpenMetaverse.Vector3d,OpenMetaverse.UUID,System.String)">
             <summary>
-            Starts the appearance setting thread
+            Create or update profile pick
             </summary>
+            <param name="pickID">UUID of the pick to update, or random UUID to create a new pick</param>
+            <param name="topPick">Is this a top pick? (typically false)</param>
+            <param name="parcelID">UUID of the parcel (UUID.Zero for the current parcel)</param>
+            <param name="name">Name of the pick</param>
+            <param name="globalPosition">Global position of the pick landmark</param>
+            <param name="textureID">UUID of the image displayed with the pick</param>
+            <param name="description">Long description of the pick</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RequestSetAppearance(System.Boolean)">
+        <member name="M:OpenMetaverse.AgentManager.PickDelete(OpenMetaverse.UUID)">
             <summary>
-            Starts the appearance setting thread
+            Delete profile pick
             </summary>
-            <param name="forceRebake">True to force rebaking, otherwise false</param>
+            <param name="pickID">UUID of the pick to delete</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.ServerBakingRegion">
+        <member name="M:OpenMetaverse.AgentManager.UpdateClassifiedInfo(OpenMetaverse.UUID,OpenMetaverse.DirectoryManager.ClassifiedCategories,OpenMetaverse.UUID,System.Int32,OpenMetaverse.Vector3d,System.String,System.String,System.Boolean)">
             <summary>
-            Check if current region supports server side baking
+            Create or update profile Classified
             </summary>
-            <returns>True if server side baking support is detected</returns>
+            <param name="classifiedID">UUID of the classified to update, or random UUID to create a new classified</param>
+            <param name="category">Defines what catagory the classified is in</param>
+            <param name="snapshotID">UUID of the image displayed with the classified</param>
+            <param name="price">Price that the classified will cost to place for a week</param>
+            <param name="position">Global position of the classified landmark</param>
+            <param name="name">Name of the classified</param>
+            <param name="desc">Long description of the classified</param>
+            <param name="autoRenew">if true, auto renew classified after expiration</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RequestAgentWearables">
+        <member name="M:OpenMetaverse.AgentManager.UpdateClassifiedInfo(OpenMetaverse.UUID,OpenMetaverse.DirectoryManager.ClassifiedCategories,OpenMetaverse.UUID,System.Int32,System.String,System.String,System.Boolean)">
             <summary>
-            Ask the server what textures our agent is currently wearing
+            Create or update profile Classified
             </summary>
+            <param name="classifiedID">UUID of the classified to update, or random UUID to create a new classified</param>
+            <param name="category">Defines what catagory the classified is in</param>
+            <param name="snapshotID">UUID of the image displayed with the classified</param>
+            <param name="price">Price that the classified will cost to place for a week</param>
+            <param name="name">Name of the classified</param>
+            <param name="desc">Long description of the classified</param>
+            <param name="autoRenew">if true, auto renew classified after expiration</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RequestCachedBakes">
+        <member name="M:OpenMetaverse.AgentManager.DeleteClassfied(OpenMetaverse.UUID)">
             <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
+            Delete a classified ad
             </summary>
+            <param name="classifiedID">The classified ads ID</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.GetWearableAsset(OpenMetaverse.WearableType)">
+        <member name="M:OpenMetaverse.AgentManager.GetAttachmentResources(OpenMetaverse.AgentManager.AttachmentResourcesCallback)">
             <summary>
-            Returns the AssetID of the asset that is currently being worn in a 
-            given WearableType slot
+            Fetches resource usage by agents attachmetns
             </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>
+            <param name="callback">Called when the requested information is collected</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.AddToOutfit(OpenMetaverse.InventoryItem)">
+        <member name="M:OpenMetaverse.AgentManager.SetDisplayName(System.String,System.String)">
             <summary>
-            Add a wearable to the current outfit and set appearance
+            Initates request to set a new display name
             </summary>
-            <param name="wearableItem">Wearable to be added to the outfit</param>
+            <param name="oldName">Previous display name</param>
+            <param name="newName">Desired new display name</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.AddToOutfit(OpenMetaverse.InventoryItem,System.Boolean)">
+        <member name="M:OpenMetaverse.AgentManager.UpdateAgentLanguage(System.String,System.Boolean)">
             <summary>
-            Add a wearable to the current outfit and set appearance
+            Tells the sim what UI language is used, and if it's ok to share that with scripts
             </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>
+            <param name="language">Two letter language code</param>
+            <param name="isPublic">Share language info with scripts</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.AddToOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
+        <member name="M:OpenMetaverse.AgentManager.InstantMessageHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            Add a list of wearables to the current outfit and set appearance
+            Take an incoming ImprovedInstantMessage packet, auto-parse, and if
+            OnInstantMessage is defined call that with the appropriate arguments
             </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>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.AddToOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem},System.Boolean)">
+        <member name="M:OpenMetaverse.AgentManager.ChatHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            Add a list of wearables to the current outfit and set appearance
+            Take an incoming Chat packet, auto-parse, and if OnChat is defined call 
+              that with the appropriate arguments.
             </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>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RemoveFromOutfit(OpenMetaverse.InventoryItem)">
+        <member name="M:OpenMetaverse.AgentManager.ScriptDialogHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            Remove a wearable from the current outfit and set appearance
+            Used for parsing llDialogs
             </summary>
-            <param name="wearableItem">Wearable to be removed from the outfit</param>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RemoveFromOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
+        <member name="M:OpenMetaverse.AgentManager.ScriptQuestionHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            Removes a list of wearables from the current outfit and set appearance
+            Used for parsing llRequestPermissions dialogs
             </summary>
-            <param name="wearableItems">List of wearable inventory items to
-            be removed from the outfit</param>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.ReplaceOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
+        <member name="M:OpenMetaverse.AgentManager.ScriptControlChangeHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            Replace the current outfit with a list of wearables and set appearance
+            Handles Script Control changes when Script with permissions releases or takes a control
             </summary>
-            <param name="wearableItems">List of wearable inventory items that
-            define a new outfit</param>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.ReplaceOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem},System.Boolean)">
+        <member name="M:OpenMetaverse.AgentManager.LoadURLHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            Replace the current outfit with a list of wearables and set appearance
+            Used for parsing llLoadURL Dialogs
             </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>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.IsItemWorn(OpenMetaverse.InventoryItem)">
+        <member name="M:OpenMetaverse.AgentManager.MovementCompleteHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            Checks if an inventory item is currently being worn
+            Update client's Position, LookAt and region handle from incoming packet
             </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>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>This occurs when after an avatar moves into a new sim</remarks>
         </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="M:OpenMetaverse.AgentManager.HealthHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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.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 name="M:OpenMetaverse.AgentManager.AgentDataUpdateHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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.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="M:OpenMetaverse.AgentManager.MoneyBalanceReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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.AppearanceManager.AddAttachments(System.Collections.Generic.List{OpenMetaverse.InventoryItem},System.Boolean,System.Boolean)">
+        <member name="M:OpenMetaverse.AgentManager.SetDisplayNameReplyEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Adds a list of attachments to our agent
+            EQ Message fired with the result of SetDisplayName request
             </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>
+            <param name="capsKey">The message key</param>
+            <param name="message">the IMessage object containing the deserialized data sent from the simulator</param>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> which originated the packet</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.Attach(OpenMetaverse.InventoryItem,OpenMetaverse.AttachmentPoint)">
+        <member name="M:OpenMetaverse.AgentManager.TeleportFailedEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Attach an item to our agent at a specific attach point
+            Process TeleportFailed message sent via EventQueue, informs agent its last teleport has failed and why.
             </summary>
-            <param name="item">A <seealso cref="T:OpenMetaverse.InventoryItem"/> to attach</param>
-            <param name="attachPoint">the <seealso cref="T:OpenMetaverse.AttachmentPoint"/> on the avatar 
-            to attach the item to</param>
+            <param name="messageKey">The Message Key</param>
+            <param name="message">An IMessage object Deserialized from the recieved message event</param>
+            <param name="simulator">The simulator originating the event message</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.Attach(OpenMetaverse.InventoryItem,OpenMetaverse.AttachmentPoint,System.Boolean)">
+        <member name="M:OpenMetaverse.AgentManager.TeleportFinishEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Attach an item to our agent at a specific attach point
+            Process TeleportFinish from Event Queue and pass it onto our TeleportHandler
             </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>
+            <param name="capsKey">The message system key for this event</param>
+            <param name="message">IMessage object containing decoded data from OSD</param>
+            <param name="simulator">The simulator originating the event message</param>
         </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="M:OpenMetaverse.AgentManager.TeleportHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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.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 name="M:OpenMetaverse.AgentManager.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.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="M:OpenMetaverse.AgentManager.MeanCollisionAlertHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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.AppearanceManager.Detach(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.AgentManager.CrossedRegionEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Detach an item from our agent
+            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="itemID">The inventory itemID of the item to detach</param>
+            <param name="capsKey">The message key</param>
+            <param name="message">the IMessage object containing the deserialized data sent from the simulator</param>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> which originated the packet</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.SendAgentIsNowWearing">
-            <summary>
-            Inform the sim which wearables are part of our current outfit
-            </summary>
+        <member name="M:OpenMetaverse.AgentManager.CrossedRegionHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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>This packet is now being sent via the EventQueue</remarks>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.ReplaceOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryWearable})">
+        <member name="M:OpenMetaverse.AgentManager.ChatterBoxSessionEventReplyEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Replaces the Wearables collection with a list of new wearable items
+            Group Chat event handler
             </summary>
-            <param name="wearableItems">Wearable items to replace the Wearables collection with</param>
+            <param name="capsKey">The capability Key</param>
+            <param name="message">IMessage object containing decoded data from OSD</param>
+            <param name="simulator"></param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.GetColorFromParams(System.Collections.Generic.List{OpenMetaverse.AppearanceManager.ColorParamInfo})">
+        <member name="M:OpenMetaverse.AgentManager.ChatterBoxSessionStartReplyEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Calculates base color/tint for a specific wearable
-            based on its params
+            Response from request to join a group chat
             </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>
+            <param name="capsKey"></param>
+            <param name="message">IMessage object containing decoded data from OSD</param>
+            <param name="simulator"></param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.GetAgentWearables">
+        <member name="M:OpenMetaverse.AgentManager.ChatterBoxSessionAgentListUpdatesEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Blocking method to populate the Wearables dictionary
+            Someone joined or left group chat
             </summary>
-            <returns>True on success, otherwise false</returns>
+            <param name="capsKey"></param>
+            <param name="message">IMessage object containing decoded data from OSD</param>
+            <param name="simulator"></param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.GetCachedBakes">
+        <member name="M:OpenMetaverse.AgentManager.ChatterBoxInvitationEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Blocking method to populate the Textures array with cached bakes
+            Handle a group chat Invitation
             </summary>
-            <returns>True on success, otherwise false</returns>
+            <param name="capsKey">Caps Key</param>
+            <param name="message">IMessage object containing decoded data from OSD</param>
+            <param name="simulator">Originating Simulator</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.DecodeWearableParams(OpenMetaverse.AppearanceManager.WearableData)">
+        <member name="M:OpenMetaverse.AgentManager.ModerateChatSessions(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.Boolean)">
             <summary>
-            Populates textures and visual params from a decoded asset
+            Moderate a chat session
             </summary>
-            <param name="wearable">Wearable to decode</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>
-        <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="M:OpenMetaverse.AgentManager.AlertMessageHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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.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="M:OpenMetaverse.AgentManager.CameraConstraintHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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.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="M:OpenMetaverse.AgentManager.ScriptSensorReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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.AppearanceManager.DownloadTextures(System.Collections.Generic.List{OpenMetaverse.BakeType})">
-            <summary>
-            Blocking method to download all of the textures needed for baking 
-            the given bake layers
-            </summary>
-            <param name="bakeLayers">A list of layers that need baking</param>
-            <remarks>No return value is given because the baking will happen
-            whether or not all textures are successfully downloaded</remarks>
-        </member>
-        <member name="M:OpenMetaverse.AppearanceManager.CreateBakes">
-            <summary>
-            Blocking method to create and upload baked textures for all of the
-            missing bakes
-            </summary>
-            <returns>True on success, otherwise false</returns>
+        <member name="M:OpenMetaverse.AgentManager.AvatarSitResponseHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming 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.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="E:OpenMetaverse.AgentManager.ChatFromSimulator">
+            <summary>Raised when a scripted object or agent within range sends a public message</summary>
         </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="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="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="E:OpenMetaverse.AgentManager.ScriptQuestion">
+            <summary>Raised when an object requests a change in the permissions an agent has permitted</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.UpdateAvatarAppearance">
-            <summary>
-            Initate server baking process
-            </summary>
-            <returns>True if the server baking was successful</returns>
+        <member name="E:OpenMetaverse.AgentManager.LoadURL">
+            <summary>Raised when a script requests an agent open the specified URL</summary>
         </member>
-        <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 name="E:OpenMetaverse.AgentManager.MoneyBalance">
+            <summary>Raised when an agents currency balance is updated</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RequestAgentSetAppearance">
-            <summary>
-            Create an AgentSetAppearance packet from Wearables data and the 
-            Textures array and send it
-            </summary>
+        <member name="E:OpenMetaverse.AgentManager.MoneyBalanceReply">
+            <summary>Raised when a transaction occurs involving currency such as a land purchase</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.WearableTypeToAssetType(OpenMetaverse.WearableType)">
-            <summary>
-            Converts a WearableType to a bodypart or clothing WearableType
-            </summary>
-            <param name="type">A WearableType</param>
-            <returns>AssetType.Bodypart or AssetType.Clothing or AssetType.Unknown</returns>
+        <member 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="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="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="M:OpenMetaverse.AppearanceManager.MorphLayerForBakeType(OpenMetaverse.BakeType)">
-            <summary>
-            Gives the layer number that is used for morph mask
-            </summary>
-            <param name="bakeType">>A BakeType</param>
-            <returns>Which layer number as defined in BakeTypeToTextures is used for morph mask</returns>
+        <member name="E:OpenMetaverse.AgentManager.AgentDataReply">
+            <summary>Raised when a simulator sends agent specific information for our avatar.</summary>
         </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="E:OpenMetaverse.AgentManager.AnimationsChanged">
+            <summary>Raised when our agents animation playlist changes</summary>
         </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="E:OpenMetaverse.AgentManager.MeanCollision">
+            <summary>Raised when an object or avatar forcefully collides with our agent</summary>
         </member>
-        <member name="E:OpenMetaverse.AppearanceManager.CachedBakesReply">
-            <summary>Raised when an AgentCachedTextureResponse packet is
-            received, giving a list of cached bakes that were found on the
-            simulator
-            <seealso cref="M:OpenMetaverse.AppearanceManager.RequestCachedBakes"/> request.</summary>
+        <member name="E:OpenMetaverse.AgentManager.RegionCrossed">
+            <summary>Raised when our agent crosses a region border into another region</summary>
         </member>
-        <member name="E:OpenMetaverse.AppearanceManager.AppearanceSet">
-            <summary>
-            Raised when appearance data is sent to the simulator, also indicates
-            the main appearance thread is finished.
-            </summary>
-            <seealso cref="M:OpenMetaverse.AppearanceManager.RequestAgentSetAppearance"/> request.
+        <member name="E:OpenMetaverse.AgentManager.GroupChatJoined">
+            <summary>Raised when our agent succeeds or fails to join a group chat session</summary>
         </member>
-        <member name="E:OpenMetaverse.AppearanceManager.RebakeAvatarRequested">
-            <summary>
-            Triggered when the simulator requests the agent rebake its appearance.
-            </summary>
-            <seealso cref="!:RebakeAvatarRequest"/>
+        <member name="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="P:OpenMetaverse.AppearanceManager.ManagerBusy">
-            <summary>
-            Returns true if AppearanceManager is busy and trying to set or change appearance will fail
-            </summary>
+        <member name="E:OpenMetaverse.AgentManager.ScriptControlChange">
+            <summary>Raised when a script attempts to take or release specified controls for our agent</summary>
         </member>
-        <member name="T:OpenMetaverse.AppearanceManager.WearableData">
-            <summary>
-            Contains information about a wearable inventory item
-            </summary>
+        <member name="E:OpenMetaverse.AgentManager.CameraConstraint">
+            <summary>Raised when the simulator detects our agent is trying to view something
+            beyond its limits</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.ItemID">
-            <summary>Inventory ItemID of the wearable</summary>
+        <member name="E:OpenMetaverse.AgentManager.ScriptSensorReply">
+            <summary>Raised when a script sensor reply is received from a simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.AssetID">
-            <summary>AssetID of the wearable asset</summary>
+        <member name="E:OpenMetaverse.AgentManager.AvatarSitResponse">
+            <summary>Raised in response to a <see cref="M:OpenMetaverse.AgentManager.RequestSit(OpenMetaverse.UUID,OpenMetaverse.Vector3)"/> request</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.WearableType">
-            <summary>WearableType of the wearable</summary>
+        <member name="E:OpenMetaverse.AgentManager.ChatSessionMemberAdded">
+            <summary>Raised when an avatar enters a group chat session we are participating in</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.AssetType">
-            <summary>AssetType of the wearable</summary>
+        <member name="E:OpenMetaverse.AgentManager.ChatSessionMemberLeft">
+            <summary>Raised when an agent exits a group chat session we are participating in</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.Asset">
-            <summary>Asset data for the wearable</summary>
+        <member name="E:OpenMetaverse.AgentManager.SetDisplayNameReply">
+            <summary>Raised when the simulator sends us data containing
+            the details of display name change</summary>
         </member>
-        <member name="T:OpenMetaverse.AppearanceManager.ColorParamInfo">
-            <summary>
-            Data collected from visual params for each wearable
-            needed for the calculation of the color
-            </summary>
+        <member name="E:OpenMetaverse.AgentManager.MuteListUpdated">
+            <summary>Raised when a scripted object or agent within range sends a public message</summary>
         </member>
-        <member name="T:OpenMetaverse.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="P:OpenMetaverse.AgentManager.AgentID">
+            <summary>Your (client) avatars <see cref="T:OpenMetaverse.UUID"/></summary>
+            <remarks>"client", "agent", and "avatar" all represent the same thing</remarks>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureID">
-            <summary>A texture AssetID</summary>
+        <member name="P:OpenMetaverse.AgentManager.SessionID">
+            <summary>Temporary <seealso cref="T:OpenMetaverse.UUID"/> assigned to this session, used for 
+            verifying our identity in packets</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.Texture">
-            <summary>Asset data for the texture</summary>
+        <member name="P:OpenMetaverse.AgentManager.SecureSessionID">
+            <summary>Shared secret <seealso cref="T:OpenMetaverse.UUID"/> that is never sent over the wire</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.AlphaMasks">
-            <summary>Collection of alpha masks that needs applying</summary>
+        <member name="P:OpenMetaverse.AgentManager.LocalID">
+            <summary>Your (client) avatar ID, local to the current region/sim</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.Color">
-            <summary>Tint that should be applied to the texture</summary>
+        <member name="P:OpenMetaverse.AgentManager.StartLocation">
+            <summary>Where the avatar started at login. Can be "last", "home" 
+            or a login <seealso cref="T:OpenMetaverse.URI"/></summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureIndex">
-            <summary>Where on avatar does this texture belong</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentAccess">
+            <summary>The access level of this agent, usually M or PG</summary>
         </member>
-        <member name="T:OpenMetaverse.AgentWearablesReplyEventArgs">
-            <summary>Contains the Event data returned from the data server from an AgentWearablesRequest</summary>
+        <member name="P:OpenMetaverse.AgentManager.CollisionPlane">
+            <summary>The CollisionPlane of Agent</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentWearablesReplyEventArgs.#ctor">
-            <summary>Construct a new instance of the AgentWearablesReplyEventArgs class</summary>
+        <member name="P:OpenMetaverse.AgentManager.Velocity">
+            <summary>An <seealso cref="T:OpenMetaverse.Vector3"/> representing the velocity of our agent</summary>
         </member>
-        <member name="T:OpenMetaverse.AgentCachedBakesReplyEventArgs">
-            <summary>Contains the Event data returned from the data server from an AgentCachedTextureResponse</summary>
+        <member name="P:OpenMetaverse.AgentManager.Acceleration">
+            <summary>An <seealso cref="T:OpenMetaverse.Vector3"/> representing the acceleration of our agent</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentCachedBakesReplyEventArgs.#ctor">
-            <summary>Construct a new instance of the AgentCachedBakesReplyEventArgs class</summary>
+        <member name="P:OpenMetaverse.AgentManager.AngularVelocity">
+            <summary>A <seealso cref="T:OpenMetaverse.Vector3"/> which specifies the angular speed, and axis about which an Avatar is rotating.</summary>
         </member>
-        <member name="T:OpenMetaverse.AppearanceSetEventArgs">
-            <summary>Contains the Event data returned from an AppearanceSetRequest</summary>
+        <member name="P:OpenMetaverse.AgentManager.HomePosition">
+            <summary>Position avatar client will goto when login to 'home' or during
+            teleport request to 'home' region.</summary>
         </member>
-        <member name="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="P:OpenMetaverse.AgentManager.HomeLookAt">
+            <summary>LookAt point saved/restored with HomePosition</summary>
         </member>
-        <member name="P:OpenMetaverse.AppearanceSetEventArgs.Success">
-            <summary>Indicates whether appearance setting was successful</summary>
+        <member name="P:OpenMetaverse.AgentManager.FirstName">
+            <summary>Avatar First Name (i.e. Philip)</summary>
         </member>
-        <member name="T:OpenMetaverse.RebakeAvatarTexturesEventArgs">
-            <summary>Contains the Event data returned from the data server from an RebakeAvatarTextures</summary>
+        <member name="P:OpenMetaverse.AgentManager.LastName">
+            <summary>Avatar Last Name (i.e. Linden)</summary>
         </member>
-        <member name="M:OpenMetaverse.RebakeAvatarTexturesEventArgs.#ctor(OpenMetaverse.UUID)">
-            <summary>
-            Triggered when the simulator sends a request for this agent to rebake
-            its appearance
-            </summary>
-            <param name="textureID">The ID of the Texture Layer to bake</param>
+        <member name="P:OpenMetaverse.AgentManager.Name">
+            <summary>Avatar Full Name (i.e. Philip Linden)</summary>
         </member>
-        <member name="P:OpenMetaverse.RebakeAvatarTexturesEventArgs.TextureID">
-            <summary>The ID of the Texture Layer to bake</summary>
+        <member name="P:OpenMetaverse.AgentManager.Health">
+            <summary>Gets the health of the agent</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Width">
-            <summary>
-            Image width
-            </summary>
+        <member name="P:OpenMetaverse.AgentManager.Balance">
+            <summary>Gets the current balance of the agent</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Height">
-            <summary>
-            Image height
-            </summary>
+        <member name="P:OpenMetaverse.AgentManager.SittingOn">
+            <summary>Gets the local ID of the prim the agent is sitting on,
+            zero if the avatar is not currently sitting</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Channels">
-            <summary>
-            Image channel flags
-            </summary>
+        <member name="P:OpenMetaverse.AgentManager.ActiveGroup">
+            <summary>Gets the <seealso cref="T:OpenMetaverse.UUID"/> of the agents active group.</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Red">
-            <summary>
-            Red channel data
-            </summary>
+        <member name="P:OpenMetaverse.AgentManager.ActiveGroupPowers">
+            <summary>Gets the Agents powers in the currently active group</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Green">
-            <summary>
-            Green channel data
-            </summary>
+        <member name="P:OpenMetaverse.AgentManager.TeleportMessage">
+            <summary>Current status message for teleporting</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Blue">
-            <summary>
-            Blue channel data
-            </summary>
+        <member name="P:OpenMetaverse.AgentManager.RelativePosition">
+            <summary>Current position of the agent as a relative offset from
+            the simulator, or the parent object if we are sitting on something</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Alpha">
-            <summary>
-            Alpha channel data
-            </summary>
+        <member name="P:OpenMetaverse.AgentManager.RelativeRotation">
+            <summary>Current rotation of the agent as a relative rotation from
+            the simulator, or the parent object if we are sitting on something</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Bump">
-            <summary>
-            Bump channel data
-            </summary>
+        <member name="P:OpenMetaverse.AgentManager.SimPosition">
+            <summary>Current position of the agent in the simulator</summary>
         </member>
-        <member name="M:OpenMetaverse.Imaging.ManagedImage.#ctor(System.Int32,System.Int32,OpenMetaverse.Imaging.ManagedImage.ImageChannels)">
+        <member name="P:OpenMetaverse.AgentManager.SimRotation">
             <summary>
-            Create a new blank image
+            A <seealso cref="T:OpenMetaverse.Quaternion"/> representing the agents current rotation
             </summary>
-            <param name="width">width</param>
-            <param name="height">height</param>
-            <param name="channels">channel flags</param>
         </member>
-        <member name="M:OpenMetaverse.Imaging.ManagedImage.#ctor(System.Drawing.Bitmap)">
-            <summary>
-            
-            </summary>
-            <param name="bitmap"></param>
+        <member name="P:OpenMetaverse.AgentManager.GlobalPosition">
+            <summary>Returns the global grid position of the avatar</summary>
         </member>
-        <member name="M:OpenMetaverse.Imaging.ManagedImage.ConvertChannels(OpenMetaverse.Imaging.ManagedImage.ImageChannels)">
+        <member name="T:OpenMetaverse.AgentManager.ControlFlags">
             <summary>
-            Convert the channels in the image. Channels are created or destroyed as required.
+            Used to specify movement actions for your agent
             </summary>
-            <param name="channels">new channel flags</param>
         </member>
-        <member name="M:OpenMetaverse.Imaging.ManagedImage.ResizeNearestNeighbor(System.Int32,System.Int32)">
-            <summary>
-            Resize or stretch the image using nearest neighbor (ugly) resampling
-            </summary>
-            <param name="width">new width</param>
-            <param name="height">new height</param>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.NONE">
+            <summary>Empty flag</summary>
         </member>
-        <member name="M:OpenMetaverse.Imaging.ManagedImage.ExportRaw">
-            <summary>
-            Create a byte array containing 32-bit RGBA data with a bottom-left
-            origin, suitable for feeding directly into OpenGL
-            </summary>
-            <returns>A byte array containing raw texture data</returns>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_AT_POS">
+            <summary>Move Forward (SL Keybinding: W/Up Arrow)</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetMutable">
-            <summary>
-            Represents an Animation
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG">
+            <summary>Move Backward (SL Keybinding: S/Down Arrow)</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetMutable.#ctor(OpenMetaverse.AssetType)">
-            <summary>Default Constructor</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS">
+            <summary>Move Left (SL Keybinding: Shift-(A/Left Arrow))</summary>
         </member>
-        <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 name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG">
+            <summary>Move Right (SL Keybinding: Shift-(D/Right Arrow))</summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetMutable.AssetType">
-            <summary>Override the base classes AssetType</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="T:OpenMetaverse.PacketFrequency">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG">
+            <summary>Not Flying: Croutch/Flying: Move Down (SL Keybinding: C)</summary>
         </member>
-        <member name="F:OpenMetaverse.PacketFrequency.Low">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_PITCH_POS">
+            <summary>Unused</summary>
         </member>
-        <member name="F:OpenMetaverse.PacketFrequency.Medium">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_PITCH_NEG">
+            <summary>Unused</summary>
         </member>
-        <member name="F:OpenMetaverse.PacketFrequency.High">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_YAW_POS">
+            <summary>Unused</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MalformedDataException">
-            <summary>
-            Thrown when a packet could not be successfully deserialized
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_YAW_NEG">
+            <summary>Unused</summary>
         </member>
-        <member name="M:OpenMetaverse.Packets.MalformedDataException.#ctor">
-            <summary>
-            Default constructor
-            </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="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.AgentManager.ControlFlags.AGENT_CONTROL_FAST_LEFT">
+            <summary>ORed with AGENT_CONTROL_LEFT_* if the keyboard is being used</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.AgentManager.ControlFlags.AGENT_CONTROL_FAST_UP">
+            <summary>ORed with AGENT_CONTROL_UP_* if the keyboard is being used</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.AgentManager.ControlFlags.AGENT_CONTROL_FLY">
+            <summary>Fly</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.AgentManager.ControlFlags.AGENT_CONTROL_STOP">
+            <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.AgentManager.ControlFlags.AGENT_CONTROL_FINISH_ANIM">
+            <summary>Finish our current animation</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.AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP">
+            <summary>Stand up from the ground or a prim seat</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.AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND">
+            <summary>Sit on the ground at our current location</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.AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK">
+            <summary>Whether mouselook is currently enabled</summary>
         </member>
-        <member name="P:OpenMetaverse.Packets.PacketBlock.Length">
-            <summary>Current length of the data in this packet</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS">
+            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
         </member>
-        <member name="F:OpenMetaverse.Packets.PacketType.Default">
-            <summary>A generic value, not an actual packet type</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG">
+            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
         </member>
-        <member name="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="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_POS">
+            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TestMessagePacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.TestMessagePacket.TestBlock1Block">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.TestMessagePacket.NeighborBlockBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG">
+            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UseCircuitCodePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UseCircuitCodePacket.CircuitCodeBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TelehubInfoPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_AWAY">
+            <summary>Set when the avatar is idled or set to away. Note that the away animation is 
+            activated separately from setting this flag</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TelehubInfoPacket.TelehubBlockBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TelehubInfoPacket.SpawnPointBlockBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_UP">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EconomyDataRequestPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_DOWN">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EconomyDataPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_UP">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EconomyDataPacket.InfoBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.AvatarPickerRequestPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.Camera">
+            <summary>Agent camera controls</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.Flags">
+            <summary>Currently only used for hiding your group title</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.State">
+            <summary>Action state of the avatar, which can currently be
+            typing and editing</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.BodyRotation">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.HeadRotation">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastBodyRotation">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastHeadRotation">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraCenter">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.TransactionDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraXAxis">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.QueryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraYAxis">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraZAxis">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastFar">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.TransactionDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.updateTimer">
+            <summary>Timer for sending AgentUpdate packets</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.QueryDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.#ctor(OpenMetaverse.GridClient)">
+            <summary>Default constructor</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirFindQueryPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.UpdateFromHeading(System.Double,System.Boolean)">
+            <summary>
+            Send an AgentUpdate with the camera set at the current agent
+            position and pointing towards the heading specified
+            </summary>
+            <param name="heading">Camera rotation in radians</param>
+            <param name="reliable">Whether to send the AgentUpdate reliable
+            or not</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirFindQueryPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.DirFindQueryPacket.QueryDataBlock">
-            <exclude/>
+        <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.Packets.DirPlacesQueryPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SendUpdate">
+            <summary>
+            Send new AgentUpdate packet to update our current camera 
+            position and rotation
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesQueryPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SendUpdate(System.Boolean)">
+            <summary>
+            Send new AgentUpdate packet to update our current camera 
+            position and rotation
+            </summary>
+            <param name="reliable">Whether to require server acknowledgement
+            of this packet</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesQueryPacket.QueryDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SendUpdate(System.Boolean,OpenMetaverse.Simulator)">
+            <summary>
+            Send new AgentUpdate packet to update our current camera 
+            position and rotation
+            </summary>
+            <param name="reliable">Whether to require server acknowledgement
+            of this packet</param>
+            <param name="simulator">Simulator to send the update to</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.DirPlacesReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SetFOVVerticalAngle(System.Single)">
+            <summary>
+            Sends update of Field of Vision vertical angle to the simulator
+            </summary>
+            <param name="angle">Angle in radians</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.QueryDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AtPos">
+            <summary>Move agent positive along the X axis</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.QueryRepliesBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AtNeg">
+            <summary>Move agent negative along the X axis</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.StatusDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LeftPos">
+            <summary>Move agent positive along the Y axis</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LeftNeg">
+            <summary>Move agent negative along the Y axis</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpPos">
+            <summary>Move agent positive along the Z axis</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.QueryDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpNeg">
+            <summary>Move agent negative along the Z axis</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.QueryRepliesBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.PitchPos">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.PitchNeg">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.YawPos">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.QueryDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.YawNeg">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.QueryRepliesBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastAt">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.StatusDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastLeft">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastUp">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Fly">
+            <summary>Causes simulator to make agent fly</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.QueryDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Stop">
+            <summary>Stop movement</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.QueryRepliesBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FinishAnim">
+            <summary>Finish animation</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.StandUp">
+            <summary>Stand up from a sit</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.SitOnGround">
+            <summary>Tells simulator to sit agent on ground</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket.QueryDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Mouselook">
+            <summary>Place agent into mouselook mode</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeAtPos">
+            <summary>Nudge agent positive along the X axis</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeAtNeg">
+            <summary>Nudge agent negative along the X axis</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.QueryDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeLeftPos">
+            <summary>Nudge agent positive along the Y axis</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.QueryRepliesBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeLeftNeg">
+            <summary>Nudge agent negative along the Y axis</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.StatusDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeUpPos">
+            <summary>Nudge agent positive along the Z axis</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeUpNeg">
+            <summary>Nudge agent negative along the Z axis</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.TurnLeft">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket.DataBlock">
-            <exclude/>
-        </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.TurnRight">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Away">
+            <summary>Tell simulator to mark agent as away</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket.DataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LButtonDown">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LButtonUp">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.MLButtonDown">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket.DataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.MLButtonUp">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AlwaysRun">
+            <summary>
+            Returns "always run" value, or changes it by sending a SetAlwaysRunPacket
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentControls">
+            <summary>The current value of the agent control flags</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket.DataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ClassifiedDeletePacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpdateEnabled">
+            <summary>Gets or sets whether AgentUpdate packets are sent to
+            the current simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AutoResetControls">
+            <summary>Reset movement controls every time we send an update</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket.DataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.AgentManager.AgentMovement.AgentCamera">
+            <summary>
+            Camera controls for the agent, mostly a thin wrapper around
+            CoordinateFrame. This class is only responsible for state
+            tracking and math, it does not send any packets
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.Far">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.Frame">
+            <summary>The camera is a local frame of reference inside of
+            the larger grid space. This is where the math happens</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket.DataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.#ctor">
+            <summary>
+            Default constructor
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirLandQueryPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.Position">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirLandQueryPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.AtAxis">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirLandQueryPacket.QueryDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.LeftAxis">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket">
-            <exclude/>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.UpAxis">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket.AgentDataBlock">
-            <exclude/>
+        <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.Packets.DirLandReplyPacket.QueryDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.DirLandReplyPacket.QueryRepliesBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.Assets.AssetWearable">
+            <summary>
+            Represents a Wearable Asset, Clothing, Hair, Skin, Etc
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Name">
+            <summary>A string containing the name of the asset</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Description">
+            <summary>A string containing a short description of the asset</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket.QueryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.WearableType">
+            <summary>The Assets WearableType</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.ForSale">
+            <summary>The For-Sale status of the object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.SalePrice">
+            <summary>An Integer representing the purchase price of the asset</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket.QueryDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Creator">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the assets creator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket.QueryRepliesBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Owner">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the assets current owner</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelInfoRequestPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.LastOwner">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the assets prior owner</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelInfoRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelInfoRequestPacket.DataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelInfoReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Permissions">
+            <summary>The Permissions mask of the asset</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelInfoReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Params">
+            <summary>A Dictionary containing Key/Value pairs of the objects parameters</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelInfoReplyPacket.DataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket">
-            <exclude/>
+        <member name="M:OpenMetaverse.Assets.AssetWearable.#ctor">
+            <summary>Initializes a new instance of an AssetWearable object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket.ParcelDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Assets.AssetWearable.Decode">
+            <summary>
+            Decode an assets byte encoded data to a string
+            </summary>
+            <returns>true if the asset data was decoded successfully</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersReplyPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.ParcelObjectOwnersReplyPacket.DataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Assets.AssetClothing.#ctor">
+            <summary>Initializes a new instance of an AssetScriptBinary object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket">
-            <exclude/>
+        <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.Packets.GroupNoticesListRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.Assets.AssetClothing.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket.DataBlock">
-            <exclude/>
+        <member name="T:OpenMetaverse.PacketFrequency">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.PacketFrequency.Low">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket.AgentDataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.PacketFrequency.Medium">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket.DataBlock">
-            <exclude/>
+        <member name="F:OpenMetaverse.PacketFrequency.High">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticeRequestPacket">
-            <exclude/>
+        <member name="T:OpenMetaverse.Packets.MalformedDataException">
+            <summary>
+            Thrown when a packet could not be successfully deserialized
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticeRequestPacket.AgentDataBlock">
-            <exclude/>
+        <member name="M:OpenMetaverse.Packets.MalformedDataException.#ctor">
+            <summary>
+            Default constructor
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticeRequestPacket.DataBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.TeleportRequestPacket">
-            <exclude/>
+        <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.Packets.TeleportRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.TeleportRequestPacket.InfoBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket">
-            <exclude/>
+        <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.Packets.TeleportLocationRequestPacket.AgentDataBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket.InfoBlock">
-            <exclude/>
+        <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>
-        <member name="T:OpenMetaverse.Packets.TeleportLocalPacket">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.TeleportLocalPacket.InfoBlock">
-            <exclude/>
+        <member name="P:OpenMetaverse.Packets.PacketBlock.Length">
+            <summary>Current length of the data in this packet</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportLandmarkRequestPacket">
-            <exclude/>
+        <member name="F:OpenMetaverse.Packets.PacketType.Default">
+            <summary>A generic value, not an actual packet type</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportLandmarkRequestPacket.InfoBlock">
-            <exclude/>
+        <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="T:OpenMetaverse.Packets.TeleportProgressPacket">
+        <member name="T:OpenMetaverse.Packets.TestMessagePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportProgressPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.TestMessagePacket.TestBlock1Block">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportProgressPacket.InfoBlock">
+        <member name="T:OpenMetaverse.Packets.TestMessagePacket.NeighborBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportFinishPacket">
+        <member name="T:OpenMetaverse.Packets.UseCircuitCodePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportFinishPacket.InfoBlock">
+        <member name="T:OpenMetaverse.Packets.UseCircuitCodePacket.CircuitCodeBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartLurePacket">
+        <member name="T:OpenMetaverse.Packets.TelehubInfoPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartLurePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.TelehubInfoPacket.TelehubBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartLurePacket.InfoBlock">
+        <member name="T:OpenMetaverse.Packets.TelehubInfoPacket.SpawnPointBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartLurePacket.TargetDataBlock">
+        <member name="T:OpenMetaverse.Packets.EconomyDataRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportLureRequestPacket">
+        <member name="T:OpenMetaverse.Packets.EconomyDataPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportLureRequestPacket.InfoBlock">
+        <member name="T:OpenMetaverse.Packets.EconomyDataPacket.InfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportCancelPacket">
+        <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportCancelPacket.InfoBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportStartPacket">
+        <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportStartPacket.InfoBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportFailedPacket">
+        <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportFailedPacket.InfoBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportFailedPacket.AlertInfoBlock">
+        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UndoPacket">
+        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UndoPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.TransactionDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UndoPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.QueryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RedoPacket">
+        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RedoPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RedoPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.TransactionDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UndoLandPacket">
+        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.QueryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UndoLandPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirFindQueryPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentPausePacket">
+        <member name="T:OpenMetaverse.Packets.DirFindQueryPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentPausePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirFindQueryPacket.QueryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentResumePacket">
+        <member name="T:OpenMetaverse.Packets.DirPlacesQueryPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentResumePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirPlacesQueryPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChatFromViewerPacket">
+        <member name="T:OpenMetaverse.Packets.DirPlacesQueryPacket.QueryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChatFromViewerPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChatFromViewerPacket.ChatDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentThrottlePacket">
+        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.QueryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentThrottlePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.QueryRepliesBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentThrottlePacket.ThrottleBlock">
+        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.StatusDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentFOVPacket">
+        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentFOVPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentFOVPacket.FOVBlockBlock">
+        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.QueryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket">
+        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.QueryRepliesBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket.HeightWidthBlockBlock">
+        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket">
+        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.QueryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.QueryRepliesBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.WearableDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.StatusDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.VisualParamBlock">
+        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket">
+        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.QueryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.QueryRepliesBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket.FuseBlockBlock">
+        <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImageNotInDatabasePacket">
+        <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImageNotInDatabasePacket.ImageIDBlock">
+        <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket.QueryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RebakeAvatarTexturesPacket">
+        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RebakeAvatarTexturesPacket.TextureDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetAlwaysRunPacket">
+        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.QueryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetAlwaysRunPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.QueryRepliesBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeletePacket">
+        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.StatusDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeletePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeletePacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket">
+        <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.SharedDataBlock">
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket">
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectScalePacket">
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectScalePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectScalePacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectRotationPacket">
+        <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectRotationPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectRotationPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket.ExtraPhysicsBlock">
+        <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectClickActionPacket">
+        <member name="T:OpenMetaverse.Packets.DirLandQueryPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectClickActionPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirLandQueryPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectClickActionPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirLandQueryPacket.QueryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectImagePacket">
+        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectImagePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectImagePacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket.QueryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectMaterialPacket">
+        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket.QueryRepliesBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectMaterialPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectMaterialPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectShapePacket">
+        <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket.QueryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectShapePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectShapePacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket">
+        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket.QueryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket.QueryRepliesBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelInfoRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelInfoRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelInfoRequestPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.HeaderDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelInfoReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelInfoReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGroupPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelInfoReplyPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGroupPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGroupPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectBuyPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket.ParcelDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectBuyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectBuyPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersReplyPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket">
+        <member name="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DerezContainerPacket">
+        <member name="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DerezContainerPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket">
+        <member name="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupNoticeRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket.HeaderDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupNoticeRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupNoticeRequestPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSaleInfoPacket">
+        <member name="T:OpenMetaverse.Packets.TeleportRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSaleInfoPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.TeleportRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSaleInfoPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.TeleportRequestPacket.InfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectNamePacket">
+        <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectNamePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectNamePacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket.InfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDescriptionPacket">
+        <member name="T:OpenMetaverse.Packets.TeleportLocalPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDescriptionPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.TeleportLocalPacket.InfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDescriptionPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.TeleportLandmarkRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectCategoryPacket">
+        <member name="T:OpenMetaverse.Packets.TeleportLandmarkRequestPacket.InfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectCategoryPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.TeleportProgressPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectCategoryPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.TeleportProgressPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSelectPacket">
+        <member name="T:OpenMetaverse.Packets.TeleportProgressPacket.InfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSelectPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.TeleportFinishPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSelectPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.TeleportFinishPacket.InfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeselectPacket">
+        <member name="T:OpenMetaverse.Packets.StartLurePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeselectPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.StartLurePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeselectPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.StartLurePacket.InfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectAttachPacket">
+        <member name="T:OpenMetaverse.Packets.StartLurePacket.TargetDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectAttachPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.TeleportLureRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectAttachPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.TeleportLureRequestPacket.InfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDetachPacket">
+        <member name="T:OpenMetaverse.Packets.TeleportCancelPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDetachPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.TeleportCancelPacket.InfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDetachPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.TeleportStartPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDropPacket">
+        <member name="T:OpenMetaverse.Packets.TeleportStartPacket.InfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDropPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.TeleportFailedPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDropPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.TeleportFailedPacket.InfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectLinkPacket">
+        <member name="T:OpenMetaverse.Packets.TeleportFailedPacket.AlertInfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectLinkPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.UndoPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectLinkPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.UndoPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDelinkPacket">
+        <member name="T:OpenMetaverse.Packets.UndoPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDelinkPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RedoPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDelinkPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.RedoPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGrabPacket">
+        <member name="T:OpenMetaverse.Packets.RedoPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGrabPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.UndoLandPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGrabPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.UndoLandPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGrabPacket.SurfaceInfoBlock">
+        <member name="T:OpenMetaverse.Packets.AgentPausePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.AgentPausePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentResumePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentResumePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.SurfaceInfoBlock">
+        <member name="T:OpenMetaverse.Packets.ChatFromViewerPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket">
+        <member name="T:OpenMetaverse.Packets.ChatFromViewerPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ChatFromViewerPacket.ChatDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentThrottlePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket.SurfaceInfoBlock">
+        <member name="T:OpenMetaverse.Packets.AgentThrottlePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSpinStartPacket">
+        <member name="T:OpenMetaverse.Packets.AgentThrottlePacket.ThrottleBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSpinStartPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentFOVPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSpinStartPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentFOVPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSpinUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.AgentFOVPacket.FOVBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSpinUpdatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSpinUpdatePacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSpinStopPacket">
+        <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket.HeightWidthBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSpinStopPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSpinStopPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectExportSelectedPacket">
+        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.WearableDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectExportSelectedPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectExportSelectedPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.VisualParamBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ModifyLandPacket">
+        <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.ModifyBlockBlock">
+        <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket.FuseBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.ParcelDataBlock">
+        <member name="T:OpenMetaverse.Packets.ImageNotInDatabasePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.ModifyBlockExtendedBlock">
+        <member name="T:OpenMetaverse.Packets.ImageNotInDatabasePacket.ImageIDBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOnPacket">
+        <member name="T:OpenMetaverse.Packets.RebakeAvatarTexturesPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOnPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RebakeAvatarTexturesPacket.TextureDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOffPacket">
+        <member name="T:OpenMetaverse.Packets.SetAlwaysRunPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOffPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.SetAlwaysRunPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.StateSavePacket">
+        <member name="T:OpenMetaverse.Packets.ObjectDeletePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.StateSavePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectDeletePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.StateSavePacket.DataBlockBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectDeletePacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ReportAutosaveCrashPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ReportAutosaveCrashPacket.AutosaveDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.SharedDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket.DataBlockBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TrackAgentPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TrackAgentPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TrackAgentPacket.TargetDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectScalePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectScalePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectScalePacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.DownloadTotalsBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectRotationPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.NetStatsBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectRotationPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.FailStatsBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectRotationPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.MiscStatsBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket.ExtraPhysicsBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectClickActionPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserReportPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectClickActionPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserReportPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectClickActionPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserReportPacket.ReportDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectImagePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AlertMessagePacket">
+        <member name="T:OpenMetaverse.Packets.ObjectImagePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AlertMessagePacket.AlertDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectImagePacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AlertMessagePacket.AlertInfoBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectMaterialPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket">
+        <member name="T:OpenMetaverse.Packets.ObjectMaterialPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectMaterialPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket.AlertDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectShapePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MeanCollisionAlertPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectShapePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MeanCollisionAlertPacket.MeanCollisionBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectShapePacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerFrozenMessagePacket">
+        <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerFrozenMessagePacket.FrozenDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.HealthMessagePacket">
+        <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.HealthMessagePacket.HealthDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChatFromSimulatorPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChatFromSimulatorPacket.ChatDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.HeaderDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimStatsPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimStatsPacket.RegionBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectGroupPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimStatsPacket.StatBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectGroupPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimStatsPacket.PidStatBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectGroupPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimStatsPacket.RegionInfoBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectBuyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestRegionInfoPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectBuyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestRegionInfoPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectBuyPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionInfoPacket">
+        <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionInfoPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionInfoPacket.RegionInfoBlock">
+        <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionInfoPacket.RegionInfo2Block">
+        <member name="T:OpenMetaverse.Packets.DerezContainerPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionInfoPacket.RegionInfo3Block">
+        <member name="T:OpenMetaverse.Packets.DerezContainerPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket.RegionInfoBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket.HeaderDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket.RegionInfo2Block">
+        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket">
+        <member name="T:OpenMetaverse.Packets.ObjectSaleInfoPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfoBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectSaleInfoPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfo2Block">
+        <member name="T:OpenMetaverse.Packets.ObjectSaleInfoPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfo3Block">
+        <member name="T:OpenMetaverse.Packets.ObjectNamePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfo4Block">
+        <member name="T:OpenMetaverse.Packets.ObjectNamePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectNamePacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectDescriptionPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket.RegionInfoBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectDescriptionPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimulatorViewerTimeMessagePacket">
+        <member name="T:OpenMetaverse.Packets.ObjectDescriptionPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimulatorViewerTimeMessagePacket.TimeInfoBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectCategoryPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EnableSimulatorPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectCategoryPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EnableSimulatorPacket.SimulatorInfoBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectCategoryPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DisableSimulatorPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectSelectPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferRequestPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectSelectPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferRequestPacket.TransferInfoBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectSelectPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferInfoPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectDeselectPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferInfoPacket.TransferInfoBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectDeselectPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferAbortPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectDeselectPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferAbortPacket.TransferInfoBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectAttachPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestXferPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectAttachPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestXferPacket.XferIDBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectAttachPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AbortXferPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectDetachPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AbortXferPacket.XferIDBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectDetachPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket">
+        <member name="T:OpenMetaverse.Packets.ObjectDetachPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.SenderBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectDropPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectDropPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.VisualParamBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectDropPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.AppearanceDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectLinkPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectLinkPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectLinkPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket.CameraPropertyBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectDelinkPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClearFollowCamPropertiesPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectDelinkPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClearFollowCamPropertiesPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectDelinkPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestPayPricePacket">
+        <member name="T:OpenMetaverse.Packets.ObjectGrabPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestPayPricePacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectGrabPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PayPriceReplyPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectGrabPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PayPriceReplyPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectGrabPacket.SurfaceInfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PayPriceReplyPacket.ButtonDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.KickUserPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.KickUserPacket.TargetBlockBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.KickUserPacket.UserInfoBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.SurfaceInfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodKickUserPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodKickUserPacket.UserInfoBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EjectUserPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EjectUserPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket.SurfaceInfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EjectUserPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectSpinStartPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.FreezeUserPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectSpinStartPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.FreezeUserPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectSpinStartPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.FreezeUserPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectSpinUpdatePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesRequestPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectSpinUpdatePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectSpinUpdatePacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectSpinStopPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectSpinStopPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket.PropertiesDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectSpinStopPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket">
+        <member name="T:OpenMetaverse.Packets.ObjectExportSelectedPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectExportSelectedPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket.PropertiesDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectExportSelectedPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket">
+        <member name="T:OpenMetaverse.Packets.ModifyLandPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.ModifyBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.NewGroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.ParcelDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.ModifyBlockExtendedBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOnPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket.PropertiesDataBlock">
+        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOnPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOffPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOffPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket.PropertiesDataBlock">
+        <member name="T:OpenMetaverse.Packets.StateSavePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket">
+        <member name="T:OpenMetaverse.Packets.StateSavePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.StateSavePacket.DataBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.ReportAutosaveCrashPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.ReportAutosaveCrashPacket.AutosaveDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket">
+        <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket.DataBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.TrackAgentPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.TrackAgentPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket">
+        <member name="T:OpenMetaverse.Packets.TrackAgentPacket.TargetDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket.EventDataBlock">
+        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket">
+        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.DownloadTotalsBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.NetStatsBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket.EventDataBlock">
+        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.FailStatsBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket">
+        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.MiscStatsBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket.EventDataBlock">
+        <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket">
+        <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.UserReportPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket.EventDataBlock">
+        <member name="T:OpenMetaverse.Packets.UserReportPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket">
+        <member name="T:OpenMetaverse.Packets.UserReportPacket.ReportDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AlertMessagePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket.EventDataBlock">
+        <member name="T:OpenMetaverse.Packets.AlertMessagePacket.AlertDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket.QueryDataBlock">
+        <member name="T:OpenMetaverse.Packets.AlertMessagePacket.AlertInfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket">
+        <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket.AlertDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.MeanCollisionAlertPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.MeanCollisionAlertPacket.MeanCollisionBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.ViewerFrozenMessagePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickDeletePacket">
+        <member name="T:OpenMetaverse.Packets.ViewerFrozenMessagePacket.FrozenDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickDeletePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.HealthMessagePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickDeletePacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.HealthMessagePacket.HealthDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickGodDeletePacket">
+        <member name="T:OpenMetaverse.Packets.ChatFromSimulatorPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickGodDeletePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ChatFromSimulatorPacket.ChatDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickGodDeletePacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.SimStatsPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptQuestionPacket">
+        <member name="T:OpenMetaverse.Packets.SimStatsPacket.RegionBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptQuestionPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.SimStatsPacket.StatBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptControlChangePacket">
+        <member name="T:OpenMetaverse.Packets.SimStatsPacket.PidStatBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptControlChangePacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.SimStatsPacket.RegionInfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptDialogPacket">
+        <member name="T:OpenMetaverse.Packets.RequestRegionInfoPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptDialogPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.RequestRegionInfoPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptDialogPacket.ButtonsBlock">
+        <member name="T:OpenMetaverse.Packets.RegionInfoPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptDialogPacket.OwnerDataBlock">
+        <member name="T:OpenMetaverse.Packets.RegionInfoPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptDialogReplyPacket">
+        <member name="T:OpenMetaverse.Packets.RegionInfoPacket.RegionInfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptDialogReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RegionInfoPacket.RegionInfo2Block">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptDialogReplyPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.RegionInfoPacket.RegionInfo3Block">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ForceScriptControlReleasePacket">
+        <member name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ForceScriptControlReleasePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RevokePermissionsPacket">
+        <member name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket.RegionInfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RevokePermissionsPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket.RegionInfo2Block">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RevokePermissionsPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LoadURLPacket">
+        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LoadURLPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfo2Block">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptTeleportRequestPacket">
+        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfo3Block">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptTeleportRequestPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfo4Block">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelOverlayPacket">
+        <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelOverlayPacket.ParcelDataBlock">
+        <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket">
+        <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket.RegionInfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.SimulatorViewerTimeMessagePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket.ParcelDataBlock">
+        <member name="T:OpenMetaverse.Packets.SimulatorViewerTimeMessagePacket.TimeInfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.EnableSimulatorPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.EnableSimulatorPacket.SimulatorInfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket.ParcelDataBlock">
+        <member name="T:OpenMetaverse.Packets.DisableSimulatorPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket">
+        <member name="T:OpenMetaverse.Packets.TransferRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.TransferRequestPacket.TransferInfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.ParcelDataBlock">
+        <member name="T:OpenMetaverse.Packets.TransferInfoPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.TaskIDsBlock">
+        <member name="T:OpenMetaverse.Packets.TransferInfoPacket.TransferInfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.OwnerIDsBlock">
+        <member name="T:OpenMetaverse.Packets.TransferAbortPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket">
+        <member name="T:OpenMetaverse.Packets.TransferAbortPacket.TransferInfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RequestXferPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket.ParcelDataBlock">
+        <member name="T:OpenMetaverse.Packets.RequestXferPacket.XferIDBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket">
+        <member name="T:OpenMetaverse.Packets.AbortXferPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AbortXferPacket.XferIDBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.ParcelDataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.TaskIDsBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.SenderBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.OwnerIDsBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket">
+        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.VisualParamBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.AppearanceDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.ParcelDataBlock">
+        <member name="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.ReturnIDsBlock">
+        <member name="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateCovenantRequestPacket">
+        <member name="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket.CameraPropertyBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateCovenantRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ClearFollowCamPropertiesPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateCovenantReplyPacket">
+        <member name="T:OpenMetaverse.Packets.ClearFollowCamPropertiesPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateCovenantReplyPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.RequestPayPricePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ForceObjectSelectPacket">
+        <member name="T:OpenMetaverse.Packets.RequestPayPricePacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ForceObjectSelectPacket.HeaderBlock">
+        <member name="T:OpenMetaverse.Packets.PayPriceReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ForceObjectSelectPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.PayPriceReplyPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelBuyPassPacket">
+        <member name="T:OpenMetaverse.Packets.PayPriceReplyPacket.ButtonDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelBuyPassPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.KickUserPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelBuyPassPacket.ParcelDataBlock">
+        <member name="T:OpenMetaverse.Packets.KickUserPacket.TargetBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDeedToGroupPacket">
+        <member name="T:OpenMetaverse.Packets.KickUserPacket.UserInfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDeedToGroupPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GodKickUserPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDeedToGroupPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.GodKickUserPacket.UserInfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReclaimPacket">
+        <member name="T:OpenMetaverse.Packets.EjectUserPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReclaimPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.EjectUserPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReclaimPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.EjectUserPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelClaimPacket">
+        <member name="T:OpenMetaverse.Packets.FreezeUserPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelClaimPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.FreezeUserPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelClaimPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.FreezeUserPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelClaimPacket.ParcelDataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelJoinPacket">
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelJoinPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelJoinPacket.ParcelDataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDividePacket">
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket.PropertiesDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDividePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDividePacket.ParcelDataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReleasePacket">
+        <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket.PropertiesDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReleasePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReleasePacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelBuyPacket">
+        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelBuyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.NewGroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelBuyPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelBuyPacket.ParcelDataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelGodForceOwnerPacket">
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket.PropertiesDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelGodForceOwnerPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelGodForceOwnerPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket">
+        <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket.PropertiesDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket">
+        <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket.ListBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.ListBlock">
+        <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDwellRequestPacket">
+        <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDwellRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDwellRequestPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket.EventDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDwellReplyPacket">
+        <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDwellReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDwellReplyPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket.EventDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket">
+        <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket.ParcelDataBlock">
+        <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket.EventDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStartAuctionPacket">
+        <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStartAuctionPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStartAuctionPacket.ParcelDataBlock">
+        <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket.EventDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDNameRequestPacket">
+        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDNameRequestPacket.UUIDNameBlockBlock">
+        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDNameReplyPacket">
+        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket.EventDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDNameReplyPacket.UUIDNameBlockBlock">
+        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket.QueryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDGroupNameRequestPacket">
+        <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDGroupNameRequestPacket.UUIDNameBlockBlock">
+        <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDGroupNameReplyPacket">
+        <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDGroupNameReplyPacket.UUIDNameBlockBlock">
+        <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentDyingPacket">
+        <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentDyingPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUnknownPacket">
+        <member name="T:OpenMetaverse.Packets.PickDeletePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUnknownPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.PickDeletePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GetScriptRunningPacket">
+        <member name="T:OpenMetaverse.Packets.PickDeletePacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GetScriptRunningPacket.ScriptBlock">
+        <member name="T:OpenMetaverse.Packets.PickGodDeletePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptRunningReplyPacket">
+        <member name="T:OpenMetaverse.Packets.PickGodDeletePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptRunningReplyPacket.ScriptBlock">
+        <member name="T:OpenMetaverse.Packets.PickGodDeletePacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket">
+        <member name="T:OpenMetaverse.Packets.ScriptQuestionPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ScriptQuestionPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket.ScriptBlock">
+        <member name="T:OpenMetaverse.Packets.ScriptControlChangePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptResetPacket">
+        <member name="T:OpenMetaverse.Packets.ScriptControlChangePacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptResetPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ScriptDialogPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptResetPacket.ScriptBlock">
+        <member name="T:OpenMetaverse.Packets.ScriptDialogPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptSensorRequestPacket">
+        <member name="T:OpenMetaverse.Packets.ScriptDialogPacket.ButtonsBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptSensorRequestPacket.RequesterBlock">
+        <member name="T:OpenMetaverse.Packets.ScriptDialogPacket.OwnerDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket">
+        <member name="T:OpenMetaverse.Packets.ScriptDialogReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket.RequesterBlock">
+        <member name="T:OpenMetaverse.Packets.ScriptDialogReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket.SensedDataBlock">
+        <member name="T:OpenMetaverse.Packets.ScriptDialogReplyPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CompleteAgentMovementPacket">
+        <member name="T:OpenMetaverse.Packets.ForceScriptControlReleasePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CompleteAgentMovementPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ForceScriptControlReleasePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket">
+        <member name="T:OpenMetaverse.Packets.RevokePermissionsPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RevokePermissionsPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.RevokePermissionsPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket.SimDataBlock">
+        <member name="T:OpenMetaverse.Packets.LoadURLPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LogoutRequestPacket">
+        <member name="T:OpenMetaverse.Packets.LoadURLPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LogoutRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ScriptTeleportRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LogoutReplyPacket">
+        <member name="T:OpenMetaverse.Packets.ScriptTeleportRequestPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LogoutReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelOverlayPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LogoutReplyPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelOverlayPacket.ParcelDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImprovedInstantMessagePacket">
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImprovedInstantMessagePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImprovedInstantMessagePacket.MessageBlockBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket.ParcelDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RetrieveInstantMessagesPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RetrieveInstantMessagesPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.FindAgentPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket.ParcelDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.FindAgentPacket.AgentBlockBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.FindAgentPacket.LocationBlockBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestGodlikePowersPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.ParcelDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestGodlikePowersPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.TaskIDsBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestGodlikePowersPacket.RequestBlockBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.OwnerIDsBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GrantGodlikePowersPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GrantGodlikePowersPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GrantGodlikePowersPacket.GrantDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket.ParcelDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket">
+        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket.MethodDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.ParcelDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket.ParamListBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.TaskIDsBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket">
+        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.OwnerIDsBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket.MethodDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket.ParamListBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.ParcelDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GenericMessagePacket">
+        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.ReturnIDsBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GenericMessagePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.EstateCovenantRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GenericMessagePacket.MethodDataBlock">
+        <member name="T:OpenMetaverse.Packets.EstateCovenantRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GenericMessagePacket.ParamListBlock">
+        <member name="T:OpenMetaverse.Packets.EstateCovenantReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MuteListRequestPacket">
+        <member name="T:OpenMetaverse.Packets.EstateCovenantReplyPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MuteListRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ForceObjectSelectPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MuteListRequestPacket.MuteDataBlock">
+        <member name="T:OpenMetaverse.Packets.ForceObjectSelectPacket.HeaderBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket">
+        <member name="T:OpenMetaverse.Packets.ForceObjectSelectPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelBuyPassPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket.MuteDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelBuyPassPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelBuyPassPacket.ParcelDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelDeedToGroupPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket.MuteDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelDeedToGroupPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelDeedToGroupPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelReclaimPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.NotecardDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelReclaimPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelReclaimPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateInventoryItemPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelClaimPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateInventoryItemPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelClaimPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateInventoryItemPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelClaimPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateCreateInventoryItemPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelClaimPacket.ParcelDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateCreateInventoryItemPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelJoinPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateCreateInventoryItemPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelJoinPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveInventoryItemPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelJoinPacket.ParcelDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveInventoryItemPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelDividePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveInventoryItemPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelDividePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelDividePacket.ParcelDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelReleasePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelReleasePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelReleasePacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelBuyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelBuyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelBuyPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelBuyPacket.ParcelDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelGodForceOwnerPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelGodForceOwnerPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelGodForceOwnerPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket.FolderDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket.ListBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket.FolderDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveInventoryFolderPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveInventoryFolderPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveInventoryFolderPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.ListBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelDwellRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelDwellRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket.FolderDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelDwellRequestPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelDwellReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelDwellReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelDwellReplyPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket">
+        <member name="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.FolderDataBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket.ParcelDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.ItemDataBlock">
+        <member name="T:OpenMetaverse.Packets.ViewerStartAuctionPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryPacket">
+        <member name="T:OpenMetaverse.Packets.ViewerStartAuctionPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ViewerStartAuctionPacket.ParcelDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.UUIDNameRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryReplyPacket">
+        <member name="T:OpenMetaverse.Packets.UUIDNameRequestPacket.UUIDNameBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.UUIDNameReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryReplyPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.UUIDNameReplyPacket.UUIDNameBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket">
+        <member name="T:OpenMetaverse.Packets.UUIDGroupNameRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.UUIDGroupNameRequestPacket.UUIDNameBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket.FolderDataBlock">
+        <member name="T:OpenMetaverse.Packets.UUIDGroupNameReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket.ItemDataBlock">
+        <member name="T:OpenMetaverse.Packets.UUIDGroupNameReplyPacket.UUIDNameBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket">
+        <member name="T:OpenMetaverse.Packets.ChildAgentDyingPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ChildAgentDyingPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.FolderDataBlock">
+        <member name="T:OpenMetaverse.Packets.ChildAgentUnknownPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.ItemDataBlock">
+        <member name="T:OpenMetaverse.Packets.ChildAgentUnknownPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket">
+        <member name="T:OpenMetaverse.Packets.GetScriptRunningPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GetScriptRunningPacket.ScriptBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.ScriptRunningReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket">
+        <member name="T:OpenMetaverse.Packets.ScriptRunningReplyPacket.ScriptBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.UpdateDataBlock">
+        <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket.ScriptBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket">
+        <member name="T:OpenMetaverse.Packets.ScriptResetPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ScriptResetPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.ScriptResetPacket.ScriptBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveTaskInventoryPacket">
+        <member name="T:OpenMetaverse.Packets.ScriptSensorRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveTaskInventoryPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ScriptSensorRequestPacket.RequesterBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveTaskInventoryPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestTaskInventoryPacket">
+        <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket.RequesterBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestTaskInventoryPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket.SensedDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestTaskInventoryPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.CompleteAgentMovementPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ReplyTaskInventoryPacket">
+        <member name="T:OpenMetaverse.Packets.CompleteAgentMovementPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ReplyTaskInventoryPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket">
+        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket.AgentBlockBlock">
+        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket.SimDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.LogoutRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeRezAckPacket">
+        <member name="T:OpenMetaverse.Packets.LogoutRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeRezAckPacket.TransactionDataBlock">
+        <member name="T:OpenMetaverse.Packets.LogoutReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectPacket">
+        <member name="T:OpenMetaverse.Packets.LogoutReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.LogoutReplyPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectPacket.RezDataBlock">
+        <member name="T:OpenMetaverse.Packets.ImprovedInstantMessagePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.ImprovedInstantMessagePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket">
+        <member name="T:OpenMetaverse.Packets.ImprovedInstantMessagePacket.MessageBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RetrieveInstantMessagesPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.RezDataBlock">
+        <member name="T:OpenMetaverse.Packets.RetrieveInstantMessagesPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.NotecardDataBlock">
+        <member name="T:OpenMetaverse.Packets.FindAgentPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.FindAgentPacket.AgentBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket">
+        <member name="T:OpenMetaverse.Packets.FindAgentPacket.LocationBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RequestGodlikePowersPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket.TransactionBlockBlock">
+        <member name="T:OpenMetaverse.Packets.RequestGodlikePowersPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket.FolderDataBlock">
+        <member name="T:OpenMetaverse.Packets.RequestGodlikePowersPacket.RequestBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeclineFriendshipPacket">
+        <member name="T:OpenMetaverse.Packets.GrantGodlikePowersPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeclineFriendshipPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GrantGodlikePowersPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeclineFriendshipPacket.TransactionBlockBlock">
+        <member name="T:OpenMetaverse.Packets.GrantGodlikePowersPacket.GrantDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TerminateFriendshipPacket">
+        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TerminateFriendshipPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TerminateFriendshipPacket.ExBlockBlock">
+        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket.MethodDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.OfferCallingCardPacket">
+        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket.ParamListBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.OfferCallingCardPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.OfferCallingCardPacket.AgentBlockBlock">
+        <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket">
+        <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket.MethodDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket.ParamListBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket.TransactionBlockBlock">
+        <member name="T:OpenMetaverse.Packets.GenericMessagePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket.FolderDataBlock">
+        <member name="T:OpenMetaverse.Packets.GenericMessagePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeclineCallingCardPacket">
+        <member name="T:OpenMetaverse.Packets.GenericMessagePacket.MethodDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeclineCallingCardPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GenericMessagePacket.ParamListBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeclineCallingCardPacket.TransactionBlockBlock">
+        <member name="T:OpenMetaverse.Packets.MuteListRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezScriptPacket">
+        <member name="T:OpenMetaverse.Packets.MuteListRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezScriptPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.MuteListRequestPacket.MuteDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezScriptPacket.UpdateBlockBlock">
+        <member name="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezScriptPacket.InventoryBlockBlock">
+        <member name="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateInventoryItemPacket">
+        <member name="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket.MuteDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateInventoryItemPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateInventoryItemPacket.InventoryBlockBlock">
+        <member name="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket">
+        <member name="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket.MuteDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.EventDataBlock">
+        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.InventoryBlockBlock">
+        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.NotecardDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionHandleRequestPacket">
+        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionHandleRequestPacket.RequestBlockBlock">
+        <member name="T:OpenMetaverse.Packets.UpdateInventoryItemPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionIDAndHandleReplyPacket">
+        <member name="T:OpenMetaverse.Packets.UpdateInventoryItemPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionIDAndHandleReplyPacket.ReplyBlockBlock">
+        <member name="T:OpenMetaverse.Packets.UpdateInventoryItemPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoneyTransferRequestPacket">
+        <member name="T:OpenMetaverse.Packets.UpdateCreateInventoryItemPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoneyTransferRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.UpdateCreateInventoryItemPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoneyTransferRequestPacket.MoneyDataBlock">
+        <member name="T:OpenMetaverse.Packets.UpdateCreateInventoryItemPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket">
+        <member name="T:OpenMetaverse.Packets.MoveInventoryItemPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.MoveInventoryItemPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket.MoneyDataBlock">
+        <member name="T:OpenMetaverse.Packets.MoveInventoryItemPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket">
+        <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket.MoneyDataBlock">
+        <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket.TransactionInfoBlock">
+        <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket">
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.TargetBlockBlock">
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.MoneyDataBlock">
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.TransactionInfoBlock">
+        <member name="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ActivateGesturesPacket">
+        <member name="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ActivateGesturesPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ActivateGesturesPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeactivateGesturesPacket">
+        <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeactivateGesturesPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeactivateGesturesPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MuteListUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MuteListUpdatePacket.MuteDataBlock">
+        <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket.FolderDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UseCachedMuteListPacket">
+        <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UseCachedMuteListPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GrantUserRightsPacket">
+        <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket.FolderDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GrantUserRightsPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.MoveInventoryFolderPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GrantUserRightsPacket.RightsBlock">
+        <member name="T:OpenMetaverse.Packets.MoveInventoryFolderPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChangeUserRightsPacket">
+        <member name="T:OpenMetaverse.Packets.MoveInventoryFolderPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChangeUserRightsPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChangeUserRightsPacket.RightsBlock">
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.OnlineNotificationPacket">
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket.FolderDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.OnlineNotificationPacket.AgentBlockBlock">
+        <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.OfflineNotificationPacket">
+        <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.OfflineNotificationPacket.AgentBlockBlock">
+        <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetStartLocationRequestPacket">
+        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetStartLocationRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetStartLocationRequestPacket.StartLocationDataBlock">
+        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.FolderDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AssetUploadRequestPacket">
+        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.ItemDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AssetUploadRequestPacket.AssetBlockBlock">
+        <member name="T:OpenMetaverse.Packets.FetchInventoryPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AssetUploadCompletePacket">
+        <member name="T:OpenMetaverse.Packets.FetchInventoryPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AssetUploadCompletePacket.AssetBlockBlock">
+        <member name="T:OpenMetaverse.Packets.FetchInventoryPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateGroupRequestPacket">
+        <member name="T:OpenMetaverse.Packets.FetchInventoryReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateGroupRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.FetchInventoryReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateGroupRequestPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.FetchInventoryReplyPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateGroupReplyPacket">
+        <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateGroupReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateGroupReplyPacket.ReplyDataBlock">
+        <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket.FolderDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateGroupInfoPacket">
+        <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket.ItemDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateGroupInfoPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateGroupInfoPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleChangesPacket">
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.FolderDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleChangesPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.ItemDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleChangesPacket.RoleChangeBlock">
+        <member name="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.JoinGroupRequestPacket">
+        <member name="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.JoinGroupRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.JoinGroupRequestPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.JoinGroupReplyPacket">
+        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.JoinGroupReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.UpdateDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.JoinGroupReplyPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket">
+        <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket.EjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.MoveTaskInventoryPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket">
+        <member name="T:OpenMetaverse.Packets.MoveTaskInventoryPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.MoveTaskInventoryPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.RequestTaskInventoryPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.EjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.RequestTaskInventoryPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LeaveGroupRequestPacket">
+        <member name="T:OpenMetaverse.Packets.RequestTaskInventoryPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LeaveGroupRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ReplyTaskInventoryPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LeaveGroupRequestPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.ReplyTaskInventoryPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LeaveGroupReplyPacket">
+        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LeaveGroupReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LeaveGroupReplyPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket.AgentBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket">
+        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DeRezAckPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.DeRezAckPacket.TransactionDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket.InviteDataBlock">
+        <member name="T:OpenMetaverse.Packets.RezObjectPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket">
+        <member name="T:OpenMetaverse.Packets.RezObjectPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RezObjectPacket.RezDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.RezObjectPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProfileReplyPacket">
+        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProfileReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProfileReplyPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.RezDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket">
+        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.NotecardDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket.MoneyDataBlock">
+        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket">
+        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket.TransactionBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket.MoneyDataBlock">
+        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket.FolderDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket">
+        <member name="T:OpenMetaverse.Packets.DeclineFriendshipPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DeclineFriendshipPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket.MoneyDataBlock">
+        <member name="T:OpenMetaverse.Packets.DeclineFriendshipPacket.TransactionBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket">
+        <member name="T:OpenMetaverse.Packets.TerminateFriendshipPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.TerminateFriendshipPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.MoneyDataBlock">
+        <member name="T:OpenMetaverse.Packets.TerminateFriendshipPacket.ExBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.HistoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.OfferCallingCardPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket">
+        <member name="T:OpenMetaverse.Packets.OfferCallingCardPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.OfferCallingCardPacket.AgentBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket.MoneyDataBlock">
+        <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket">
+        <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket.TransactionBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.MoneyDataBlock">
+        <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket.FolderDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.HistoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.DeclineCallingCardPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket">
+        <member name="T:OpenMetaverse.Packets.DeclineCallingCardPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DeclineCallingCardPacket.TransactionBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.RezScriptPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.TransactionDataBlock">
+        <member name="T:OpenMetaverse.Packets.RezScriptPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket">
+        <member name="T:OpenMetaverse.Packets.RezScriptPacket.UpdateBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RezScriptPacket.InventoryBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.TransactionDataBlock">
+        <member name="T:OpenMetaverse.Packets.CreateInventoryItemPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.ProposalDataBlock">
+        <member name="T:OpenMetaverse.Packets.CreateInventoryItemPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket">
+        <member name="T:OpenMetaverse.Packets.CreateInventoryItemPacket.InventoryBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.TransactionDataBlock">
+        <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.EventDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket">
+        <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.InventoryBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RegionHandleRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.TransactionDataBlock">
+        <member name="T:OpenMetaverse.Packets.RegionHandleRequestPacket.RequestBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.HistoryItemDataBlock">
+        <member name="T:OpenMetaverse.Packets.RegionIDAndHandleReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.VoteItemBlock">
+        <member name="T:OpenMetaverse.Packets.RegionIDAndHandleReplyPacket.ReplyBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartGroupProposalPacket">
+        <member name="T:OpenMetaverse.Packets.MoneyTransferRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartGroupProposalPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.MoneyTransferRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartGroupProposalPacket.ProposalDataBlock">
+        <member name="T:OpenMetaverse.Packets.MoneyTransferRequestPacket.MoneyDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProposalBallotPacket">
+        <member name="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProposalBallotPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProposalBallotPacket.ProposalDataBlock">
+        <member name="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket.MoneyDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersRequestPacket">
+        <member name="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket.MoneyDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersRequestPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket.TransactionInfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket">
+        <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.TargetBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.MoneyDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.MemberDataBlock">
+        <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.TransactionInfoBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ActivateGroupPacket">
+        <member name="T:OpenMetaverse.Packets.ActivateGesturesPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ActivateGroupPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ActivateGesturesPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket">
+        <member name="T:OpenMetaverse.Packets.ActivateGesturesPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DeactivateGesturesPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.DeactivateGesturesPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket">
+        <member name="T:OpenMetaverse.Packets.DeactivateGesturesPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.MuteListUpdatePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.MuteListUpdatePacket.MuteDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket.NewDataBlock">
+        <member name="T:OpenMetaverse.Packets.UseCachedMuteListPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket">
+        <member name="T:OpenMetaverse.Packets.UseCachedMuteListPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GrantUserRightsPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.GrantUserRightsPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket">
+        <member name="T:OpenMetaverse.Packets.GrantUserRightsPacket.RightsBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ChangeUserRightsPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.ChangeUserRightsPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.RoleDataBlock">
+        <member name="T:OpenMetaverse.Packets.ChangeUserRightsPacket.RightsBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket">
+        <member name="T:OpenMetaverse.Packets.OnlineNotificationPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.OnlineNotificationPacket.AgentBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.OfflineNotificationPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket">
+        <member name="T:OpenMetaverse.Packets.OfflineNotificationPacket.AgentBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.SetStartLocationRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket.MemberDataBlock">
+        <member name="T:OpenMetaverse.Packets.SetStartLocationRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupTitlesRequestPacket">
+        <member name="T:OpenMetaverse.Packets.SetStartLocationRequestPacket.StartLocationDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupTitlesRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AssetUploadRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket">
+        <member name="T:OpenMetaverse.Packets.AssetUploadRequestPacket.AssetBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AssetUploadCompletePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.AssetUploadCompletePacket.AssetBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupTitleUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.CreateGroupRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupTitleUpdatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.CreateGroupRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.CreateGroupRequestPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleUpdatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.CreateGroupReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleUpdatePacket.RoleDataBlock">
+        <member name="T:OpenMetaverse.Packets.CreateGroupReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LiveHelpGroupRequestPacket">
+        <member name="T:OpenMetaverse.Packets.CreateGroupReplyPacket.ReplyDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LiveHelpGroupRequestPacket.RequestDataBlock">
+        <member name="T:OpenMetaverse.Packets.UpdateGroupInfoPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LiveHelpGroupReplyPacket">
+        <member name="T:OpenMetaverse.Packets.UpdateGroupInfoPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LiveHelpGroupReplyPacket.ReplyDataBlock">
+        <member name="T:OpenMetaverse.Packets.UpdateGroupInfoPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentWearablesRequestPacket">
+        <member name="T:OpenMetaverse.Packets.GroupRoleChangesPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentWearablesRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupRoleChangesPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.GroupRoleChangesPacket.RoleChangeBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.JoinGroupRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket.WearableDataBlock">
+        <member name="T:OpenMetaverse.Packets.JoinGroupRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentIsNowWearingPacket">
+        <member name="T:OpenMetaverse.Packets.JoinGroupRequestPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentIsNowWearingPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.JoinGroupReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentIsNowWearingPacket.WearableDataBlock">
+        <member name="T:OpenMetaverse.Packets.JoinGroupReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentCachedTexturePacket">
+        <member name="T:OpenMetaverse.Packets.JoinGroupReplyPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentCachedTexturePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentCachedTexturePacket.WearableDataBlock">
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket">
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket.EjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket.WearableDataBlock">
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentDataUpdateRequestPacket">
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentDataUpdateRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentDataUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.EjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentDataUpdatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.LeaveGroupRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupDataUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.LeaveGroupRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupDataUpdatePacket.AgentGroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.LeaveGroupRequestPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.LeaveGroupReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.LeaveGroupReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.LeaveGroupReplyPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentDropGroupPacket">
+        <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentDropGroupPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket">
+        <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket.InviteDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket">
+        <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.HeaderDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupProfileReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupProfileReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DetachAttachmentIntoInvPacket">
+        <member name="T:OpenMetaverse.Packets.GroupProfileReplyPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.DetachAttachmentIntoInvPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket">
+        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket.MoneyDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.HeaderDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserInfoRequestPacket">
+        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket.MoneyDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserInfoRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket">
+        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket.MoneyDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket.UserDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket">
+        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.MoneyDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket.UserDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.HistoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket">
+        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket.FileDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket.MoneyDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapLayerRequestPacket">
+        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapLayerRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapLayerReplyPacket">
+        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.MoneyDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapLayerReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.HistoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapLayerReplyPacket.LayerDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket">
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket.PositionDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.TransactionDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapNameRequestPacket">
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapNameRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapNameRequestPacket.NameDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.TransactionDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket">
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.ProposalDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapItemRequestPacket">
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapItemRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.TransactionDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapItemRequestPacket.RequestDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapItemReplyPacket">
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapItemReplyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.TransactionDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapItemReplyPacket.RequestDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.HistoryItemDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapItemReplyPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.VoteItemBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SendPostcardPacket">
+        <member name="T:OpenMetaverse.Packets.StartGroupProposalPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SendPostcardPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.StartGroupProposalPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelMediaCommandMessagePacket">
+        <member name="T:OpenMetaverse.Packets.StartGroupProposalPacket.ProposalDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelMediaCommandMessagePacket.CommandBlockBlock">
+        <member name="T:OpenMetaverse.Packets.GroupProposalBallotPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.GroupProposalBallotPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket.DataBlockBlock">
+        <member name="T:OpenMetaverse.Packets.GroupProposalBallotPacket.ProposalDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket.DataBlockExtendedBlock">
+        <member name="T:OpenMetaverse.Packets.GroupMembersRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LandStatRequestPacket">
+        <member name="T:OpenMetaverse.Packets.GroupMembersRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LandStatRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupMembersRequestPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LandStatRequestPacket.RequestDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LandStatReplyPacket">
+        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LandStatReplyPacket.RequestDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LandStatReplyPacket.ReportDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.MemberDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ErrorPacket">
+        <member name="T:OpenMetaverse.Packets.ActivateGroupPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ErrorPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ActivateGroupPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ErrorPacket.DataBlock">
+        <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket">
+        <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket">
+        <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket.InventoryDataBlock">
+        <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket.NewDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket">
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket.InventoryBlockBlock">
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PacketAckPacket">
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PacketAckPacket.PacketsBlock">
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.OpenCircuitPacket">
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.OpenCircuitPacket.CircuitInfoBlock">
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.RoleDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CloseCircuitPacket">
+        <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectAddPacket">
+        <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectAddPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectAddPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MultipleObjectUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MultipleObjectUpdatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket.MemberDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MultipleObjectUpdatePacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupTitlesRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestMultipleObjectsPacket">
+        <member name="T:OpenMetaverse.Packets.GroupTitlesRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestMultipleObjectsPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestMultipleObjectsPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPositionPacket">
+        <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPositionPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupTitleUpdatePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPositionPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupTitleUpdatePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestObjectPropertiesFamilyPacket">
+        <member name="T:OpenMetaverse.Packets.GroupRoleUpdatePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestObjectPropertiesFamilyPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupRoleUpdatePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestObjectPropertiesFamilyPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.GroupRoleUpdatePacket.RoleDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.LiveHelpGroupRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket.LocationBlock">
+        <member name="T:OpenMetaverse.Packets.LiveHelpGroupRequestPacket.RequestDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket.IndexBlock">
+        <member name="T:OpenMetaverse.Packets.LiveHelpGroupReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.LiveHelpGroupReplyPacket.ReplyDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CrossedRegionPacket">
+        <member name="T:OpenMetaverse.Packets.AgentWearablesRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CrossedRegionPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentWearablesRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CrossedRegionPacket.RegionDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CrossedRegionPacket.InfoBlock">
+        <member name="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ConfirmEnableSimulatorPacket">
+        <member name="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket.WearableDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ConfirmEnableSimulatorPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentIsNowWearingPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPropertiesPacket">
+        <member name="T:OpenMetaverse.Packets.AgentIsNowWearingPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPropertiesPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentIsNowWearingPacket.WearableDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPropertiesFamilyPacket">
+        <member name="T:OpenMetaverse.Packets.AgentCachedTexturePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPropertiesFamilyPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentCachedTexturePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestPacket">
+        <member name="T:OpenMetaverse.Packets.AgentCachedTexturePacket.WearableDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestPacket.ParcelDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AttachedSoundPacket">
+        <member name="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket.WearableDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AttachedSoundPacket.DataBlockBlock">
+        <member name="T:OpenMetaverse.Packets.AgentDataUpdateRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AttachedSoundGainChangePacket">
+        <member name="T:OpenMetaverse.Packets.AgentDataUpdateRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AttachedSoundGainChangePacket.DataBlockBlock">
+        <member name="T:OpenMetaverse.Packets.AgentDataUpdatePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PreloadSoundPacket">
+        <member name="T:OpenMetaverse.Packets.AgentDataUpdatePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PreloadSoundPacket.DataBlockBlock">
+        <member name="T:OpenMetaverse.Packets.GroupDataUpdatePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerEffectPacket">
+        <member name="T:OpenMetaverse.Packets.GroupDataUpdatePacket.AgentGroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerEffectPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerEffectPacket.EffectBlock">
+        <member name="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartPingCheckPacket">
+        <member name="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket.GroupDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartPingCheckPacket.PingIDBlock">
+        <member name="T:OpenMetaverse.Packets.AgentDropGroupPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CompletePingCheckPacket">
+        <member name="T:OpenMetaverse.Packets.AgentDropGroupPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CompletePingCheckPacket.PingIDBlock">
+        <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentUpdatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentAnimationPacket">
+        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentAnimationPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentAnimationPacket.AnimationListBlock">
+        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.HeaderDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentAnimationPacket.PhysicalAvatarEventListBlock">
+        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentRequestSitPacket">
+        <member name="T:OpenMetaverse.Packets.DetachAttachmentIntoInvPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentRequestSitPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.DetachAttachmentIntoInvPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentRequestSitPacket.TargetObjectBlock">
+        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentSitPacket">
+        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentSitPacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.HeaderDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestImagePacket">
+        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestImagePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.UserInfoRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestImagePacket.RequestImageBlock">
+        <member name="T:OpenMetaverse.Packets.UserInfoRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImageDataPacket">
+        <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImageDataPacket.ImageIDBlock">
+        <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImageDataPacket.ImageDataBlock">
+        <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket.UserDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImagePacketPacket">
+        <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImagePacketPacket.ImageIDBlock">
+        <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImagePacketPacket.ImageDataBlock">
+        <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket.UserDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LayerDataPacket">
+        <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LayerDataPacket.LayerIDBlock">
+        <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.LayerDataPacket.LayerDataBlock">
+        <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket.FileDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.MapLayerRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectUpdatePacket.RegionDataBlock">
+        <member name="T:OpenMetaverse.Packets.MapLayerRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectUpdatePacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.MapLayerReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket">
+        <member name="T:OpenMetaverse.Packets.MapLayerReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket.RegionDataBlock">
+        <member name="T:OpenMetaverse.Packets.MapLayerReplyPacket.LayerDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket">
+        <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket.RegionDataBlock">
+        <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket.PositionDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.MapNameRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.MapNameRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket.RegionDataBlock">
+        <member name="T:OpenMetaverse.Packets.MapNameRequestPacket.NameDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.KillObjectPacket">
+        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.KillObjectPacket.ObjectDataBlock">
+        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferPacketPacket">
+        <member name="T:OpenMetaverse.Packets.MapItemRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferPacketPacket.TransferDataBlock">
+        <member name="T:OpenMetaverse.Packets.MapItemRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SendXferPacketPacket">
+        <member name="T:OpenMetaverse.Packets.MapItemRequestPacket.RequestDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SendXferPacketPacket.XferIDBlock">
+        <member name="T:OpenMetaverse.Packets.MapItemReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SendXferPacketPacket.DataPacketBlock">
+        <member name="T:OpenMetaverse.Packets.MapItemReplyPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ConfirmXferPacketPacket">
+        <member name="T:OpenMetaverse.Packets.MapItemReplyPacket.RequestDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ConfirmXferPacketPacket.XferIDBlock">
+        <member name="T:OpenMetaverse.Packets.MapItemReplyPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket">
+        <member name="T:OpenMetaverse.Packets.SendPostcardPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.SenderBlock">
+        <member name="T:OpenMetaverse.Packets.SendPostcardPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.AnimationListBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelMediaCommandMessagePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.AnimationSourceListBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelMediaCommandMessagePacket.CommandBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.PhysicalAvatarEventListBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarSitResponsePacket">
+        <member name="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket.DataBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarSitResponsePacket.SitObjectBlock">
+        <member name="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket.DataBlockExtendedBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarSitResponsePacket.SitTransformBlock">
+        <member name="T:OpenMetaverse.Packets.LandStatRequestPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CameraConstraintPacket">
+        <member name="T:OpenMetaverse.Packets.LandStatRequestPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.CameraConstraintPacket.CameraCollidePlaneBlock">
+        <member name="T:OpenMetaverse.Packets.LandStatRequestPacket.RequestDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesPacket">
+        <member name="T:OpenMetaverse.Packets.LandStatReplyPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesPacket.ParcelDataBlock">
+        <member name="T:OpenMetaverse.Packets.LandStatReplyPacket.RequestDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesPacket.AgeVerificationBlockBlock">
+        <member name="T:OpenMetaverse.Packets.LandStatReplyPacket.ReportDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.ErrorPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.ErrorPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.GroupDataBlock">
+        <member name="T:OpenMetaverse.Packets.ErrorPacket.DataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AnimationDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.GranterBlockBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.NVPairDataBlock">
+        <member name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket.ObjectDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.VisualParamBlock">
+        <member name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentAccessBlock">
+        <member name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentInfoBlock">
+        <member name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket.InventoryDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentAlivePacket">
+        <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentAlivePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket.AgentDataBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentPositionUpdatePacket">
+        <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket.InventoryBlockBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentPositionUpdatePacket.AgentDataBlock">
+        <member name="T:OpenMetaverse.Packets.PacketAckPacket">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SoundTriggerPacket">
+        <member name="T:OpenMetaverse.Packets.PacketAckPacket.PacketsBlock">
             <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.SoundTriggerPacket.SoundDataBlock">
+        <member name="T:OpenMetaverse.Packets.OpenCircuitPacket">
             <exclude/>
         </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="T:OpenMetaverse.Packets.OpenCircuitPacket.CircuitInfoBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.CloseCircuitPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ObjectAddPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TextureRequestState.Progress">
-            <summary>A request that has received one or more packets back from the simulator</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectAddPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TextureRequestState.Finished">
-            <summary>A request that has received all packets back from the simulator</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectAddPacket.ObjectDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.MultipleObjectUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TextureRequestState.Aborted">
-            <summary>The texture request was aborted by request of the agent</summary>
+        <member name="T:OpenMetaverse.Packets.MultipleObjectUpdatePacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.MultipleObjectUpdatePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.TextureDownloadCallback">
-            <summary>
-            A callback fired to indicate the status or final state of the requested texture. For progressive 
-            downloads this will fire each time new asset data is returned from the simulator.
-            </summary>
-            <param name="state">The <see cref="T:OpenMetaverse.TextureRequestState"/> indicating either Progress for textures not fully downloaded,
-            or the final result of the request after it has been processed through the TexturePipeline</param>
-            <param name="assetTexture">The <see cref="T:OpenMetaverse.Assets.AssetTexture"/> object containing the Assets ID, raw data
-            and other information. For progressive rendering the <see cref="F:OpenMetaverse.Assets.Asset.AssetData"/> will contain
-            the data from the beginning of the file. For failed, aborted and timed out requests it will contain
-            an empty byte array.</param>
+        <member name="T:OpenMetaverse.Packets.RequestMultipleObjectsPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.RequestMultipleObjectsPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.RequestMultipleObjectsPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline._Client">
-            <summary>Holds the reference to the <see cref="T:OpenMetaverse.GridClient"/> client object</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectPositionPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.maxTextureRequests">
-            <summary>Maximum concurrent texture requests allowed at a time</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectPositionPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.resetEvents">
-            <summary>An array of <see cref="T:System.Threading.AutoResetEvent"/> objects used to manage worker request threads</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectPositionPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.threadpoolSlots">
-            <summary>An array of worker slots which shows the availablity status of the slot</summary>
+        <member name="T:OpenMetaverse.Packets.RequestObjectPropertiesFamilyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.downloadMaster">
-            <summary>The primary thread which manages the requests.</summary>
+        <member name="T:OpenMetaverse.Packets.RequestObjectPropertiesFamilyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline._Running">
-            <summary>true if the TexturePipeline is currently running</summary>
+        <member name="T:OpenMetaverse.Packets.RequestObjectPropertiesFamilyPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.lockerObject">
-            <summary>A synchronization object used by the primary thread</summary>
+        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.RefreshDownloadsTimer">
-            <summary>A refresh timer used to increase the priority of stalled requests</summary>
+        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket.LocationBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Default constructor, Instantiates a new copy of the TexturePipeline class
-            </summary>
-            <param name="client">Reference to the instantiated <see cref="T:OpenMetaverse.GridClient"/> object</param>
+        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket.IndexBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.Startup">
-            <summary>
-            Initialize callbacks required for the TexturePipeline to operate
-            </summary>
+        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.Shutdown">
-            <summary>
-            Shutdown the TexturePipeline and cleanup any callbacks or transfers
-            </summary>
+        <member name="T:OpenMetaverse.Packets.CrossedRegionPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.CrossedRegionPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.CrossedRegionPacket.RegionDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.CrossedRegionPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.DownloadThread">
-            <summary>
-            Master Download Thread, Queues up downloads in the threadpool
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ConfirmEnableSimulatorPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ConfirmEnableSimulatorPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ObjectPropertiesPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ObjectPropertiesPacket.ObjectDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ObjectPropertiesFamilyPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.TexturePipeline.TransferCount">
-            <summary>Current number of pending and in-process transfers</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectPropertiesFamilyPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.TexturePipeline.TaskInfo">
-            <summary>
-            A request task containing information and status of a request as it is processed through the <see cref="T:OpenMetaverse.TexturePipeline"/>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.State">
-            <summary>The current <seealso cref="T:OpenMetaverse.TextureRequestState"/> which identifies the current status of the request</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.RequestID">
-            <summary>The Unique Request ID, This is also the Asset ID of the texture being requested</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.RequestSlot">
-            <summary>The slot this request is occupying in the threadpoolSlots array</summary>
+        <member name="T:OpenMetaverse.Packets.AttachedSoundPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.Type">
-            <summary>The ImageType of the request.</summary>
+        <member name="T:OpenMetaverse.Packets.AttachedSoundPacket.DataBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.Callbacks">
-            <summary>The callback to fire when the request is complete, will include 
-            the <seealso cref="T:OpenMetaverse.TextureRequestState"/> and the <see cref="T:OpenMetaverse.Assets.AssetTexture"/> 
-            object containing the result data</summary>
+        <member name="T:OpenMetaverse.Packets.AttachedSoundGainChangePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.ReportProgress">
-            <summary>If true, indicates the callback will be fired whenever new data is returned from the simulator.
-            This is used to progressively render textures as portions of the texture are received.</summary>
+        <member name="T:OpenMetaverse.Packets.AttachedSoundGainChangePacket.DataBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.Transfer">
-            <summary>An object that maintains the data of an request thats in-process.</summary>
+        <member name="T:OpenMetaverse.Packets.PreloadSoundPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Packets.PacketDecoder.AddCallback(System.String,OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder)">
-            <summary>
-            Add a custom decoder callback
-            </summary>
-            <param name="key">The key of the field to decode</param>
-            <param name="customPacketHandler">The custom decode handler</param>
+        <member name="T:OpenMetaverse.Packets.PreloadSoundPacket.DataBlockBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Packets.PacketDecoder.RemoveCustomHandler(System.String,OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder)">
-            <summary>
-            Remove a custom decoder callback
-            </summary>
-            <param name="key">The key of the field to decode</param>
-            <param name="customPacketHandler">The custom decode handler</param>
+        <member name="T:OpenMetaverse.Packets.ViewerEffectPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Packets.PacketDecoder.PacketToString(OpenMetaverse.Packets.Packet)">
-            <summary>
-            Creates a formatted string containing the values of a Packet
-            </summary>
-            <param name="packet">The Packet</param>
-            <returns>A formatted string of values of the nested items in the Packet object</returns>
+        <member name="T:OpenMetaverse.Packets.ViewerEffectPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Packets.PacketDecoder.MessageToString(System.Object,System.Int32)">
-            <summary>
-            Decode an IMessage object into a beautifully formatted string
-            </summary>
-            <param name="message">The IMessage object</param>
-            <param name="recurseLevel">Recursion level (used for indenting)</param>
-            <returns>A formatted string containing the names and values of the source object</returns>
+        <member name="T:OpenMetaverse.Packets.ViewerEffectPacket.EffectBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder">
-            <summary>
-            A custom decoder callback
-            </summary>
-            <param name="fieldName">The key of the object</param>
-            <param name="fieldData">the data to decode</param>
-            <returns>A string represending the fieldData</returns>
+        <member name="T:OpenMetaverse.Packets.StartPingCheckPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.LoginStatus">
-            <summary>
-            
-            </summary>
+        <member name="T:OpenMetaverse.Packets.StartPingCheckPacket.PingIDBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.Failed">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.CompletePingCheckPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.None">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.CompletePingCheckPacket.PingIDBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.ConnectingToLogin">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.ReadingResponse">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.ConnectingToSim">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentAnimationPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.Redirecting">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentAnimationPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.Success">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Packets.AgentAnimationPacket.AnimationListBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.AgentAnimationPacket.PhysicalAvatarEventListBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LastExecStatus.Normal">
-            <summary> Application exited normally </summary>
+        <member name="T:OpenMetaverse.Packets.AgentRequestSitPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LastExecStatus.Froze">
-            <summary> Application froze </summary>
+        <member name="T:OpenMetaverse.Packets.AgentRequestSitPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LastExecStatus.ForcedCrash">
-            <summary> Application detected error and exited abnormally </summary>
+        <member name="T:OpenMetaverse.Packets.AgentRequestSitPacket.TargetObjectBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LastExecStatus.OtherCrash">
-            <summary> Other crash </summary>
+        <member name="T:OpenMetaverse.Packets.AgentSitPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LastExecStatus.LogoutFroze">
-            <summary> Application froze during logout </summary>
+        <member name="T:OpenMetaverse.Packets.AgentSitPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LastExecStatus.LogoutCrash">
-            <summary> Application crashed during logout </summary>
+        <member name="T:OpenMetaverse.Packets.RequestImagePacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.LoginParams">
-            <summary>
-            Login Request Parameters
-            </summary>
+        <member name="T:OpenMetaverse.Packets.RequestImagePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.URI">
-            <summary>The URL of the Login Server</summary>
+        <member name="T:OpenMetaverse.Packets.RequestImagePacket.RequestImageBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Timeout">
-            <summary>The number of milliseconds to wait before a login is considered
-            failed due to timeout</summary>
+        <member name="T:OpenMetaverse.Packets.ImageDataPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.MethodName">
-            <summary>The request method</summary>
-            <remarks>login_to_simulator is currently the only supported method</remarks>
+        <member name="T:OpenMetaverse.Packets.ImageDataPacket.ImageIDBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.FirstName">
-            <summary>The Agents First name</summary>
+        <member name="T:OpenMetaverse.Packets.ImageDataPacket.ImageDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.LastName">
-            <summary>The Agents Last name</summary>
+        <member name="T:OpenMetaverse.Packets.ImagePacketPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Password">
-            <summary>A md5 hashed password</summary>
-            <remarks>plaintext password will be automatically hashed</remarks>
+        <member name="T:OpenMetaverse.Packets.ImagePacketPacket.ImageIDBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Start">
-            <summary>The agents starting location once logged in</summary>
-            <remarks>Either "last", "home", or a string encoded URI 
-            containing the simulator name and x/y/z coordinates e.g: uri:hooper&amp;128&amp;152&amp;17</remarks>
+        <member name="T:OpenMetaverse.Packets.ImagePacketPacket.ImageDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Channel">
-            <summary>A string containing the client software channel information</summary>
-            <example>Second Life Release</example>
+        <member name="T:OpenMetaverse.Packets.LayerDataPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Version">
-            <summary>The client software version information</summary>
-            <remarks>The official viewer uses: Second Life Release n.n.n.n 
-            where n is replaced with the current version of the viewer</remarks>
+        <member name="T:OpenMetaverse.Packets.LayerDataPacket.LayerIDBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Platform">
-            <summary>A string containing the platform information the agent is running on</summary>
+        <member name="T:OpenMetaverse.Packets.LayerDataPacket.LayerDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.MAC">
-            <summary>A string hash of the network cards Mac Address</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.ViewerDigest">
-            <summary>Unknown or deprecated</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdatePacket.RegionDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.ID0">
-            <summary>A string hash of the first disk drives ID used to identify this clients uniqueness</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdatePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.UserAgent">
-            <summary>A string containing the viewers Software, this is not directly sent to the login server but 
-            instead is used to generate the Version string</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Author">
-            <summary>A string representing the software creator. This is not directly sent to the login server but
-            is used by the library to generate the Version information</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket.RegionDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.AgreeToTos">
-            <summary>If true, this agent agrees to the Terms of Service of the grid its connecting to</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.ReadCritical">
-            <summary>Unknown</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket.RegionDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Options">
-            <summary>An array of string sent to the login server to enable various options</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.LoginID">
-            <summary>A randomly generated ID to distinguish between login attempts. This value is only used
-            internally in the library and is never sent over the wire</summary>
+        <member name="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.LoginParams.#ctor">
-            <summary>
-            Default constuctor, initializes sane default values
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket.RegionDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.KillObjectPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.LoginResponseData">
-            <summary>
-            The decoded data returned from the login server after a successful login
-            </summary>
+        <member name="T:OpenMetaverse.Packets.KillObjectPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginResponseData.Login">
-            <summary>true, false, indeterminate</summary>
+        <member name="T:OpenMetaverse.Packets.TransferPacketPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginResponseData.Message">
-            <summary>Login message of the day</summary>
+        <member name="T:OpenMetaverse.Packets.TransferPacketPacket.TransferDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.LoginResponseData.AgentAccess">
-            <summary>M or PG, also agent_region_access and agent_access_max</summary>
+        <member name="T:OpenMetaverse.Packets.SendXferPacketPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.SendXferPacketPacket.XferIDBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.NetworkManager">
-            <summary>
-            Login Routines
-            </summary>
-            <summary>
-            NetworkManager is responsible for managing the network layer of 
-            OpenMetaverse. It tracks all the server connections, serializes 
-            outgoing traffic and deserializes incoming traffic, and provides
-            instances of delegates for network-related events.
-            </summary>
+        <member name="T:OpenMetaverse.Packets.SendXferPacketPacket.DataPacketBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_LoginProgress">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.ConfirmXferPacketPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnLoginProgress(OpenMetaverse.LoginProgressEventArgs)">
-            <summary>Raises the LoginProgress Event</summary>
-             <param name="e">A LoginProgressEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.Packets.ConfirmXferPacketPacket.XferIDBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_LoginProgressLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.LoginSeedCapability">
-            <summary>Seed CAPS URL returned from the login server</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.SenderBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.MaxAgentGroups">
-            <summary>Maximum number of groups an agent can belong to, -1 for unlimited</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.AnimationListBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.AgentAppearanceServiceURL">
-            <summary>Server side baking service URL</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.AnimationSourceListBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.UDPBlacklist">
-            <summary>A list of packets obtained during the login process which 
-            networkmanager will log but not process</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.PhysicalAvatarEventListBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.AvatarSitResponsePacket">
+            <exclude/>
         </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="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 name="T:OpenMetaverse.Packets.AvatarSitResponsePacket.SitObjectBlock">
+            <exclude/>
         </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="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 name="T:OpenMetaverse.Packets.AvatarSitResponsePacket.SitTransformBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.CameraConstraintPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.CameraConstraintPacket.CameraCollidePlaneBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelPropertiesPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.LoginReplyXmlRpcHandler(Nwc.XmlRpc.XmlRpcResponse,OpenMetaverse.LoginParams)">
-            <summary>
-            Handles response from XML-RPC login replies
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.LoginReplyXmlRpcHandler(OpenMetaverse.LoginResponseData,OpenMetaverse.LoginParams)">
-            <summary>
-            Handles response from XML-RPC login replies with already parsed LoginResponseData
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesPacket.AgeVerificationBlockBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.GetPlatform">
-            <summary>
-            Get current OS
-            </summary>
-            <returns>Either "Win" or "Linux"</returns>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.GetMAC">
-            <summary>
-            Get clients default Mac Address
-            </summary>
-            <returns>A string containing the first found Mac Address</returns>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_PacketSent">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AnimationDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnPacketSent(OpenMetaverse.PacketSentEventArgs)">
-            <summary>Raises the PacketSent Event</summary>
-             <param name="e">A PacketSentEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.GranterBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_PacketSentLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.NVPairDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_LoggedOut">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.VisualParamBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnLoggedOut(OpenMetaverse.LoggedOutEventArgs)">
-            <summary>Raises the LoggedOut Event</summary>
-             <param name="e">A LoggedOutEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentAccessBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_LoggedOutLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimConnecting">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentAlivePacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnSimConnecting(OpenMetaverse.SimConnectingEventArgs)">
-            <summary>Raises the SimConnecting Event</summary>
-             <param name="e">A SimConnectingEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.Packets.ChildAgentAlivePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimConnectingLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentPositionUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimConnected">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentPositionUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnSimConnected(OpenMetaverse.SimConnectedEventArgs)">
-            <summary>Raises the SimConnected Event</summary>
-             <param name="e">A SimConnectedEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.Packets.SoundTriggerPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimConnectedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.SoundTriggerPacket.SoundDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimDisconnected">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="M:OpenMetaverse.Packets.PacketDecoder.AddCallback(System.String,OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder)">
+            <summary>
+            Add a custom decoder callback
+            </summary>
+            <param name="key">The key of the field to decode</param>
+            <param name="customPacketHandler">The custom decode handler</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnSimDisconnected(OpenMetaverse.SimDisconnectedEventArgs)">
-            <summary>Raises the SimDisconnected Event</summary>
-             <param name="e">A SimDisconnectedEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="M:OpenMetaverse.Packets.PacketDecoder.RemoveCustomHandler(System.String,OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder)">
+            <summary>
+            Remove a custom decoder callback
+            </summary>
+            <param name="key">The key of the field to decode</param>
+            <param name="customPacketHandler">The custom decode handler</param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimDisconnectedLock">
+        <member name="M:OpenMetaverse.Packets.PacketDecoder.PacketToString(OpenMetaverse.Packets.Packet)">
+            <summary>
+            Creates a formatted string containing the values of a Packet
+            </summary>
+            <param name="packet">The Packet</param>
+            <returns>A formatted string of values of the nested items in the Packet object</returns>
+        </member>
+        <member name="M:OpenMetaverse.Packets.PacketDecoder.MessageToString(System.Object,System.Int32)">
+            <summary>
+            Decode an IMessage object into a beautifully formatted string
+            </summary>
+            <param name="message">The IMessage object</param>
+            <param name="recurseLevel">Recursion level (used for indenting)</param>
+            <returns>A formatted string containing the names and values of the source object</returns>
+        </member>
+        <member name="T:OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder">
+            <summary>
+            A custom decoder callback
+            </summary>
+            <param name="fieldName">The key of the object</param>
+            <param name="fieldData">the data to decode</param>
+            <returns>A string represending the fieldData</returns>
+        </member>
+        <member name="T:OpenMetaverse.DirectoryManager">
+            <summary>
+            Access to the data server which allows searching for land, events, people, etc
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.m_EventInfoReply">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.OnEventInfo(OpenMetaverse.EventInfoReplyEventArgs)">
+            <summary>Raises the EventInfoReply event</summary>
+            <param name="e">An EventInfoReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.m_EventDetailLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_Disconnected">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirEvents">
+            <summary>The event subscribers. null if no subcribers</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 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.NetworkManager.m_DisconnectedLock">
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirEventsLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimChanged">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.m_Places">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnSimChanged(OpenMetaverse.SimChangedEventArgs)">
-            <summary>Raises the SimChanged Event</summary>
-             <param name="e">A SimChangedEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="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.NetworkManager.m_SimChangedLock">
+        <member name="F:OpenMetaverse.DirectoryManager.m_PlacesLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_EventQueueRunning">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirPlaces">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnEventQueueRunning(OpenMetaverse.EventQueueRunningEventArgs)">
-            <summary>Raises the EventQueueRunning Event</summary>
-             <param name="e">A EventQueueRunningEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="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.NetworkManager.m_EventQueueRunningLock">
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirPlacesLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.Simulators">
-            <summary>All of the simulators we are currently connected to</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirClassifieds">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.CapsEvents">
-            <summary>Handlers for incoming capability events</summary>
+        <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.NetworkManager.PacketEvents">
-            <summary>Handlers for incoming packets</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirClassifiedsLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.PacketInbox">
-            <summary>Incoming packets that are awaiting handling</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirGroups">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.PacketOutbox">
-            <summary>Outgoing packets that are awaiting handling</summary>
+        <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.NetworkManager.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Default constructor
-            </summary>
-            <param name="client">Reference to the GridClient object</param>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirGroupsLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <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 name="F:OpenMetaverse.DirectoryManager.m_DirPeople">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <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 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.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 name="F:OpenMetaverse.DirectoryManager.m_DirPeopleLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <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 name="F:OpenMetaverse.DirectoryManager.m_DirLandReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.UnregisterEventCallback(System.String,OpenMetaverse.Caps.EventQueueCallback)">
+        <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>
-            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
+            Constructs a new instance of the DirectoryManager class
             </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="client">An instance of GridClient</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.SendPacket(OpenMetaverse.Packets.Packet)">
+        <member name="M:OpenMetaverse.DirectoryManager.StartClassifiedSearch(System.String)">
             <summary>
-            Send a packet to the simulator the avatar is currently occupying
+            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="packet">Packet to send</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.NetworkManager.SendPacket(OpenMetaverse.Packets.Packet,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.DirectoryManager.StartClassifiedSearch(System.String,OpenMetaverse.DirectoryManager.ClassifiedCategories,OpenMetaverse.DirectoryManager.ClassifiedQueryFlags)">
             <summary>
-            Send a packet to a specified simulator
+            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="packet">Packet to send</param>
-            <param name="simulator">Simulator to send the packet to</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.NetworkManager.Connect(System.Net.IPAddress,System.UInt16,System.UInt64,System.Boolean,System.String)">
+        <member name="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,System.Int32)">
             <summary>
-            Connect to a simulator
+            Starts search for places (Overloaded)
+            
+            The <see cref="!:OnDirPlacesReply"/> event is raised when a response is 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="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.NetworkManager.Connect(System.Net.IPEndPoint,System.UInt64,System.Boolean,System.String)">
+        <member name="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.ParcelCategory,System.Int32)">
             <summary>
-            Connect to a simulator
+            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="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="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.NetworkManager.Logout">
+        <member name="M:OpenMetaverse.DirectoryManager.StartLandSearch(OpenMetaverse.DirectoryManager.SearchTypeFlags)">
             <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
+            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.NetworkManager.RequestLogout">
+        <member name="M:OpenMetaverse.DirectoryManager.StartLandSearch(OpenMetaverse.DirectoryManager.SearchTypeFlags,System.Int32,System.Int32,System.Int32)">
             <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
+            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.NetworkManager.DisconnectSim(OpenMetaverse.Simulator,System.Boolean)">
+        <member name="M:OpenMetaverse.DirectoryManager.StartLandSearch(OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.DirectoryManager.SearchTypeFlags,System.Int32,System.Int32,System.Int32)">
             <summary>
-            Close a connection to the given simulator
+            Send a request to the data server for land sales listings
             </summary>
-            <param name="simulator"></param>
-            <param name="sendCloseCircuit"></param>
+            
+            <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.NetworkManager.Shutdown(OpenMetaverse.NetworkManager.DisconnectType)">
+        <member name="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32)">
             <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>
+            Search for Groups
             </summary>
-            <param name="type">Type of shutdown</param>
+            <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.NetworkManager.Shutdown(OpenMetaverse.NetworkManager.DisconnectType,System.String)">
+        <member name="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32,OpenMetaverse.DirectoryManager.DirFindFlags)">
             <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>
+            Search for Groups
             </summary>
-            <param name="type">Type of shutdown</param>
-            <param name="message">Shutdown message</param>
+            <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.NetworkManager.FindSimulator(System.Net.IPEndPoint)">
+        <member name="M:OpenMetaverse.DirectoryManager.StartPeopleSearch(System.String,System.Int32)">
             <summary>
-            Searches through the list of currently connected simulators to find
-            one attached to the given IPEndPoint
+            Search the People directory for other avatars
             </summary>
-            <param name="endPoint">IPEndPoint of the Simulator to search for</param>
-            <returns>A Simulator reference on success, otherwise null</returns>
+            <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.NetworkManager.RaiseConnectedEvent(OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.DirectoryManager.StartPlacesSearch">
             <summary>
-            Fire an event when an event queue connects for capabilities
+            Search Places for parcels of land you personally own
             </summary>
-            <param name="simulator">Simulator the event queue is attached to</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.LogoutReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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,System.UInt32)"/> method</param>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.DirClassifiedReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.StartPingCheckHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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.NetworkManager.CompletePingCheckHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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.NetworkManager.SimStatsHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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.NetworkManager.RegionHandshakeHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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.NetworkManager.DisableSimulatorHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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.NetworkManager.KickUserHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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="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 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="P:OpenMetaverse.NetworkManager.LoginStatusCode">
-            <summary>Current state of logging in</summary>
+        <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="P:OpenMetaverse.NetworkManager.LoginErrorKey">
-            <summary>Upon login failure, contains a short string key for the
-            type of login error that occurred</summary>
+        <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="P:OpenMetaverse.NetworkManager.RawLoginReply">
-            <summary>The raw XML-RPC reply from the login server, exactly as it
-            was received (minus the HTTP header)</summary>
+        <member name="E:OpenMetaverse.DirectoryManager.PlacesReply">
+            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartPlacesSearch"/> request.</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 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.NetworkManager.LoggedOut">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <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.NetworkManager.SimConnecting">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <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.NetworkManager.SimConnected">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <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.NetworkManager.SimDisconnected">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <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="E:OpenMetaverse.NetworkManager.Disconnected">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="T:OpenMetaverse.DirectoryManager.ClassifiedCategories">
+            <summary>Classified Ad categories</summary>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.SimChanged">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Any">
+            <summary>Classified is listed in the Any category</summary>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.EventQueueRunning">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Shopping">
+            <summary>Classified is shopping related</summary>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.CircuitCode">
-            <summary>Unique identifier associated with our connections to
-            simulators</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.LandRental">
+            <summary>Classified is </summary>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.CurrentSim">
-            <summary>The simulator that the logged in avatar is currently 
-            occupying</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.PropertyRental">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.Connected">
-            <summary>Shows whether the network layer is logged in to the
-            grid or not</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.SpecialAttraction">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.InboxCount">
-            <summary>Number of packets in the incoming queue</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.NewProducts">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.OutboxCount">
-            <summary>Number of packets in the outgoing queue</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Employment">
+            <summary></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 name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Wanted">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.NetworkManager.DisconnectType">
-            <summary>
-            Explains why a simulator or the grid disconnected from us
-            </summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Service">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.ClientInitiated">
-            <summary>The client requested the logout or simulator disconnect</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Personal">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.ServerInitiated">
-            <summary>The server notified us that it is disconnecting</summary>
+        <member name="T:OpenMetaverse.DirectoryManager.EventCategories">
+            <summary>Event Categories</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.NetworkTimeout">
-            <summary>Either a socket was closed or network traffic timed out</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.All">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.SimShutdown">
-            <summary>The last active simulator shut down</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Discussion">
+            <summary></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 name="F:OpenMetaverse.DirectoryManager.EventCategories.Sports">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.IncomingPacket.Simulator">
-            <summary>Reference to the simulator that this packet came from</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.LiveMusic">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.IncomingPacket.Packet">
-            <summary>Packet that needs to be processed</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Commercial">
+            <summary></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 name="F:OpenMetaverse.DirectoryManager.EventCategories.Nightlife">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Simulator">
-            <summary>Reference to the simulator this packet is destined for</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Games">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Buffer">
-            <summary>Packet that needs to be sent</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Pageants">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.SequenceNumber">
-            <summary>Sequence number of the wrapped packet</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Education">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.ResendCount">
-            <summary>Number of times this packet has been resent</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Arts">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.TickCount">
-            <summary>Environment.TickCount when this packet was last sent over the wire</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Charity">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Type">
-            <summary>Type of the packet</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Miscellaneous">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.MessageUtils.DecodeEvent(System.String,OpenMetaverse.StructuredData.OSDMap)">
+        <member name="T:OpenMetaverse.DirectoryManager.DirFindFlags">
             <summary>
-            Return a decoded capabilities message as a strongly typed object
+            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>
-            <param name="eventName">A string containing the name of the capabilities message key</param>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> to decode</param>
-            <returns>A strongly typed object containing the decoded information from the capabilities message, or null
-            if no existing Message object exists for the specified event</returns>
         </member>
-        <member name="T:OpenMetaverse.Imaging.LoadTGAClass">
-            <summary>
-            Capability to load TGAs to Bitmap 
-            </summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.People">
+            <summary>Query the People database</summary>
         </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.DirectoryManager.DirFindFlags.Online">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.AGNI_LOGIN_SERVER">
-            <summary>Main grid login server</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.Events">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ADITI_LOGIN_SERVER">
-            <summary>Beta grid login server</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.Groups">
+            <summary>Query the Groups database</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ENABLE_INVENTORY_STORE">
-            <summary>
-            InventoryManager requests inventory information on login,
-            GridClient initializes an Inventory store for main inventory.
-            </summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.DateEvents">
+            <summary>Query the Events database</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ENABLE_LIBRARY_STORE">
-            <summary>
-            InventoryManager requests library information on login,
-            GridClient initializes an Inventory store for the library.
-            </summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.AgentOwned">
+            <summary>Query the land holdings database for land owned by the currently connected agent</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.PING_INTERVAL">
-            <summary>Number of milliseconds between sending pings to each sim</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.ForSale">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.DEFAULT_AGENT_UPDATE_INTERVAL">
-            <summary>Number of milliseconds between sending camera updates</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.GroupOwned">
+            <summary>Query the land holdings database for land which is owned by a Group</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.INTERPOLATION_INTERVAL">
-            <summary>Number of milliseconds between updating the current
-            positions of moving, non-accelerating and non-colliding objects</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.DwellSort">
+            <summary>Specifies the query should pre sort the results based upon traffic
+            when searching the Places database</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.NETWORK_TICK_INTERVAL">
-            <summary>Millisecond interval between ticks, where all ACKs are 
-            sent out and the age of unACKed packets is checked</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PgSimsOnly">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.PACKET_INBOX_SIZE">
-            <summary>The initial size of the packet inbox, where packets are
-            stored before processing</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PicturesOnly">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.MAX_PACKET_SIZE">
-            <summary>Maximum size of packet that we want to send over the wire</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PgEventsOnly">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.MAX_SEQUENCE">
-            <summary>The maximum value of a packet sequence number before it
-            rolls over back to one</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.MatureSimsOnly">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.RESOURCE_DIR">
-            <summary>The relative directory where external resources are kept</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.SortAsc">
+            <summary>Specifies the query should pre sort the results in an ascending order when searching the land sales database. 
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOGIN_SERVER">
-            <summary>Login server to connect to</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PricesSort">
+            <summary>Specifies the query should pre sort the results using the SalePrice field when searching the land sales database. 
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.BIND_ADDR">
-            <summary>IP Address the client will bind to</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PerMeterSort">
+            <summary>Specifies the query should pre sort the results by calculating the average price/sq.m (SalePrice / Area) when searching the land sales database. 
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.USE_LLSD_LOGIN">
-            <summary>Use XML-RPC Login or LLSD Login, default is XML-RPC Login</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.AreaSort">
+            <summary>Specifies the query should pre sort the results using the ParcelSize field when searching the land sales database. 
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.HTTP_INVENTORY">
-            <summary>
-            Use Caps for fetching inventory where available
-            </summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.NameSort">
+            <summary>Specifies the query should pre sort the results using the Name field when searching the land sales database. 
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.TRANSFER_TIMEOUT">
-            <summary>Number of milliseconds before an asset transfer will time
-            out</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.LimitByPrice">
+            <summary>When set, only parcels less than the specified Price will be included when searching the land sales database.
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.TELEPORT_TIMEOUT">
-            <summary>Number of milliseconds before a teleport attempt will time
-            out</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.LimitByArea">
+            <summary>When set, only parcels greater than the specified Size will be included when searching the land sales database.
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOGOUT_TIMEOUT">
-            <summary>Number of milliseconds before NetworkManager.Logout() will
-            time out</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.FilterMature">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.CAPS_TIMEOUT">
-            <summary>Number of milliseconds before a CAPS call will time out</summary>
-            <remarks>Setting this too low will cause web requests time out and
-            possibly retry repeatedly</remarks>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PGOnly">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOGIN_TIMEOUT">
-            <summary>Number of milliseconds for xml-rpc to timeout</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.IncludePG">
+            <summary>Include PG land in results. This flag is used when searching both the Groups, Events and Land sales databases</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.RESEND_TIMEOUT">
-            <summary>Milliseconds before a packet is assumed lost and resent</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.IncludeMature">
+            <summary>Include Mature land in results. This flag is used when searching both the Groups, Events and Land sales databases</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.SIMULATOR_TIMEOUT">
-            <summary>Milliseconds without receiving a packet before the 
-            connection to a simulator is assumed lost</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.IncludeAdult">
+            <summary>Include Adult land in results. This flag is used when searching both the Groups, Events and Land sales databases</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.MAP_REQUEST_TIMEOUT">
-            <summary>Milliseconds to wait for a simulator info request through
-            the grid interface</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.AdultOnly">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.PACKET_ARCHIVE_SIZE">
-            <summary>The maximum size of the sequence number archive, used to
-            check for resent and/or duplicate packets</summary>
+        <member name="T:OpenMetaverse.DirectoryManager.SearchTypeFlags">
+            <summary>
+            Land types to search dataserver for
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.MAX_PENDING_ACKS">
-            <summary>Maximum number of queued ACKs to be sent before SendAcks()
-            is forced</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Any">
+            <summary>Search Auction, Mainland and Estate</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.STATS_QUEUE_SIZE">
-            <summary>Network stats queue length (seconds)</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Auction">
+            <summary>Land which is currently up for auction</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.CACHE_PRIMITIVES">
-            <summary>
-            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>
+        <member name="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Mainland">
+            <summary>Parcels which are on the mainland (Linden owned) continents</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.POOL_PARCEL_DATA">
-            <summary>
-            Pool parcel data between clients (saves on requesting multiple times when all clients may need it)
-            </summary>
+        <member name="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Estate">
+            <summary>Parcels which are on privately owned simulators</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.SIMULATOR_POOL_TIMEOUT">
+        <member name="T:OpenMetaverse.DirectoryManager.EventFlags">
             <summary>
-            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
+            The content rating of the event
             </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 name="F:OpenMetaverse.DirectoryManager.EventFlags.PG">
+            <summary>Event is PG</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.SEND_AGENT_THROTTLE">
-            <summary>Enable/disable automatically setting the bandwidth throttle
-            after connecting to each simulator</summary>
-            <remarks>The default throttle uses the equivalent of the maximum
-            bandwidth setting in the official client. If you do not set a
-            throttle your connection will by default be throttled well below
-            the minimum values and you may experience connection problems</remarks>
+        <member name="F:OpenMetaverse.DirectoryManager.EventFlags.Mature">
+            <summary>Event is Mature</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.SEND_PINGS">
-            <summary>Enable/disable the sending of pings to monitor lag and 
-            packet loss</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventFlags.Adult">
+            <summary>Event is Adult</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="T:OpenMetaverse.DirectoryManager.ClassifiedFlags">
+            <summary>
+            Classified Ad Options
+            </summary>
+            <remarks>There appear to be two formats the flags are packed in.
+            This set of flags is for the newer style</remarks>
         </member>
-        <member name="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.DirectoryManager.ClassifiedFlags.None">
+            <summary></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.DirectoryManager.ClassifiedFlags.Mature">
+            <summary></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.DirectoryManager.ClassifiedFlags.Enabled">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ENABLE_SIMSTATS">
-            <summary>Whether to decode sim stats</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.UpdateTime">
+            <summary></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.DirectoryManager.ClassifiedFlags.AutoRenew">
+            <summary></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="T:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags">
+            <summary>
+            Classified ad query options
+            </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.DirectoryManager.ClassifiedQueryFlags.All">
+            <summary>Include all ads in results</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.DirectoryManager.ClassifiedQueryFlags.PG">
+            <summary>Include PG ads in results</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.DirectoryManager.ClassifiedQueryFlags.Mature">
+            <summary>Include Mature ads in results</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.DirectoryManager.ClassifiedQueryFlags.Adult">
+            <summary>Include Adult ads in results</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.TRACK_UTILIZATION">
+        <member name="T:OpenMetaverse.DirectoryManager.PlacesFlags">
             <summary>
-            If true, utilization statistics will be tracked. There is a minor penalty
-            in CPU time for enabling this option.
+            The For Sale flag in PlacesReplyData
             </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.DirectoryManager.PlacesFlags.NotForSale">
+            <summary>Parcel is not listed for sale</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ALWAYS_REQUEST_PARCEL_ACL">
-            <summary>
-            If true, an incoming parcel properties reply will automatically send
-            a request for the parcel access list
-            </summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesFlags.ForSale">
+            <summary>Parcel is For Sale</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ALWAYS_REQUEST_PARCEL_DWELL">
+        <member name="T:OpenMetaverse.DirectoryManager.Classified">
             <summary>
-            if true, an incoming parcel properties reply will automatically send 
-            a request for the traffic count.
+            A classified ad on the grid
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.USE_ASSET_CACHE">
-            <summary>
-            If true, images, and other assets downloaded from the server 
-            will be cached in a local directory
-            </summary>
+        <member name="F:OpenMetaverse.DirectoryManager.Classified.ID">
+            <summary>UUID for this ad, useful for looking up detailed
+            information about it</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ASSET_CACHE_DIR">
-            <summary>Path to store cached texture data</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.Classified.Name">
+            <summary>The title of this classified ad</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ASSET_CACHE_MAX_SIZE">
-            <summary>Maximum size cached files are allowed to take on disk (bytes)</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.Classified.Flags">
+            <summary>Flags that show certain options applied to the classified</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.DEFAULT_EFFECT_COLOR">
-            <summary>Default color used for viewer particle effects</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.Classified.CreationDate">
+            <summary>Creation date of the ad</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.MAX_RESEND_COUNT">
-            <summary>Maximum number of times to resend a failed packet</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.Classified.ExpirationDate">
+            <summary>Expiration date of the ad</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.THROTTLE_OUTGOING_PACKETS">
-            <summary>Throttle outgoing packet rate</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.Classified.Price">
+            <summary>Price that was paid for this ad</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 name="M:OpenMetaverse.DirectoryManager.Classified.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
         </member>
-        <member name="F:OpenMetaverse.Settings.USE_HTTP_TEXTURES">
+        <member name="T:OpenMetaverse.DirectoryManager.DirectoryParcel">
             <summary>
-            Download textures using GetTexture capability when available
+            A parcel retrieved from the dataserver such as results from the 
+            "For-Sale" listings or "Places" Search
             </summary>
         </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">
-            <summary>
-            The Refresh timer inteval is used to set the delay between checks for stalled texture downloads
-            </summary>
-            <remarks>This is a static variable which applies to all instances</remarks>
+        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.ID">
+            <summary>The unique dataserver parcel ID</summary>
+            <remarks>This id is used to obtain additional information from the entry
+            by using the <see cref="!:ParcelManager.InfoRequest"/> method</remarks>
         </member>
-        <member name="F:OpenMetaverse.Settings.PIPELINE_REQUEST_TIMEOUT">
-            <summary>
-            Textures taking longer than this value will be flagged as timed out and removed from the pipeline
-            </summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.Name">
+            <summary>A string containing the name of the parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOG_LEVEL">
-            <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 name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.ActualArea">
+            <summary>The size of the parcel</summary>
+            <remarks>This field is not returned for Places searches</remarks>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOG_RESENDS">
-            <summary>Log packet retransmission info</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.SalePrice">
+            <summary>The price of the parcel</summary>
+            <remarks>This field is not returned for Places searches</remarks>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOG_DISKCACHE">
-            <summary>Log disk cache misses and other info</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.Auction">
+            <summary>If True, this parcel is flagged to be auctioned</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.DirectoryManager.DirectoryParcel.ForSale">
+            <summary>If true, this parcel is currently set for sale</summary>
         </member>
-        <member name="M:OpenMetaverse.Settings.EconomyDataHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.Dwell">
+            <summary>Parcel traffic</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 name="M:OpenMetaverse.DirectoryManager.DirectoryParcel.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
         </member>
-        <member name="T:OpenMetaverse.InternalDictionary`2">
+        <member name="T:OpenMetaverse.DirectoryManager.AgentSearchData">
             <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.
-            
+            An Avatar returned from the dataserver
             </summary>
-            <typeparam name="TKey">Key <see langword="Tkey"/></typeparam>
-            <typeparam name="TValue">Value <see langword="TValue"/></typeparam>
         </member>
-        <member name="F:OpenMetaverse.InternalDictionary`2.Dictionary">
-            <summary>Internal dictionary that this class wraps around. Do not
-            modify or enumerate the contents of this dictionary without locking
-            on this member</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.Online">
+            <summary>Online status of agent</summary>
+            <remarks>This field appears to be obsolete and always returns false</remarks>
         </member>
-        <member name="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>
-            <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 name="F:OpenMetaverse.DirectoryManager.AgentSearchData.FirstName">
+            <summary>The agents first name</summary>
         </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 name="F:OpenMetaverse.DirectoryManager.AgentSearchData.LastName">
+            <summary>The agents last name</summary>
         </member>
-        <member name="M:OpenMetaverse.InternalDictionary`2.#ctor(System.Int32)">
-            <summary>
-            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 name="F:OpenMetaverse.DirectoryManager.AgentSearchData.AgentID">
+            <summary>The agents <see cref="T:OpenMetaverse.UUID"/></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="M:OpenMetaverse.DirectoryManager.AgentSearchData.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
         </member>
-        <member name="M:OpenMetaverse.InternalDictionary`2.Find(System.Predicate{`1})">
+        <member name="T:OpenMetaverse.DirectoryManager.GroupSearchData">
             <summary>
-            Finds the specified match.
+             Response to a "Groups" Search
             </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.DirectoryManager.GroupSearchData.GroupID">
+            <summary>The Group ID</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.DirectoryManager.GroupSearchData.GroupName">
+            <summary>The name of the group</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.DirectoryManager.GroupSearchData.Members">
+            <summary>The current number of members</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="M:OpenMetaverse.DirectoryManager.GroupSearchData.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
         </member>
-        <member name="M:OpenMetaverse.InternalDictionary`2.ForEach(System.Action{System.Collections.Generic.KeyValuePair{`0,`1}})">
+        <member name="T:OpenMetaverse.DirectoryManager.PlacesSearchData">
             <summary>
-            Perform an <seealso cref="T:System.Action"/> on each KeyValuePair of an <seealso cref="T:OpenMetaverse.InternalDictionary"/>
+            Parcel information returned from a <see cref="M:OpenMetaverse.DirectoryManager.StartPlacesSearch"/> request
+            <para>
+            Represents one of the following:
+            A parcel of land on the grid that has its Show In Search flag set
+            A parcel of land owned by the agent making the request
+            A parcel of land owned by a group the agent making the request is a member of
+            </para>
+            <para>
+            In a request for Group Land, the First record will contain an empty record
+            </para>
+            Note: This is not the same as searching the land for sale data source
             </summary>
-            <param name="action"><seealso cref="T:System.Action"/> to perform</param>
         </member>
-        <member name="M:OpenMetaverse.InternalDictionary`2.ContainsKey(`0)">
-            <summary>Check if Key exists in Dictionary</summary>
-            <param name="key">Key to check for</param>
-            <returns><see langword="true"/> if found, <see langword="false"/> otherwise</returns>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.OwnerID">
+            <summary>The ID of the Agent of Group that owns the parcel</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.DirectoryManager.PlacesSearchData.Name">
+            <summary>The name</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.DirectoryManager.PlacesSearchData.Desc">
+            <summary>The description</summary>
         </member>
-        <member name="M:OpenMetaverse.InternalDictionary`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 name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.ActualArea">
+            <summary>The Size of the parcel</summary>
         </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.DirectoryManager.PlacesSearchData.BillableArea">
+            <summary>The billable Size of the parcel, for mainland
+            parcels this will match the ActualArea field. For Group owned land this will be 10 percent smaller
+            than the ActualArea. For Estate land this will always be 0</summary>
         </member>
-        <member name="P:OpenMetaverse.InternalDictionary`2.Item(`0)">
-            <summary>
-            Indexer for the dictionary
-            </summary>
-            <param name="key">The key</param>
-            <returns>The value</returns>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Flags">
+            <summary>Indicates the ForSale status of the parcel</summary>
         </member>
-        <member name="T:OpenMetaverse.ProfileFlags">
-            <summary>
-            Avatar profile flags
-            </summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.GlobalX">
+            <summary>The Gridwide X position</summary>
         </member>
-        <member name="T:OpenMetaverse.Avatar">
-            <summary>
-            Represents an avatar (other than your own)
-            </summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.GlobalY">
+            <summary>The Gridwide Y position</summary>
         </member>
-        <member name="T:OpenMetaverse.Primitive">
-            <summary>
-            Particle system specific enumerators, flags and methods.
-            </summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.GlobalZ">
+            <summary>The Z position of the parcel, or 0 if no landing point set</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Textures">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.SimName">
+            <summary>The name of the Region the parcel is located in</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnim">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.SnapshotID">
+            <summary>The Asset ID of the parcels Snapshot texture</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ID">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Dwell">
+            <summary>The calculated visitor traffic</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.GroupID">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.SKU">
+            <summary>The billing product SKU</summary>
+            <remarks>Known values are:
+            <list type="table">
+            <item><term>023</term><description>Mainland / Full Region</description></item>
+            <item><term>024</term><description>Estate / Full Region</description></item>
+            <item><term>027</term><description>Estate / Openspace</description></item>
+            <item><term>029</term><description>Estate / Homestead</description></item>
+            <item><term>129</term><description>Mainland / Homestead (Linden Owned)</description></item>
+            </list>
+            </remarks>
         </member>
-        <member name="F:OpenMetaverse.Primitive.LocalID">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Price">
+            <summary>No longer used, will always be 0</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParentID">
-            <summary></summary>
+        <member name="M:OpenMetaverse.DirectoryManager.PlacesSearchData.ToSLurl">
+            <summary>Get a SL URL for the parcel</summary>
+            <returns>A string, containing a standard SLURL</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.RegionHandle">
-            <summary></summary>
+        <member name="M:OpenMetaverse.DirectoryManager.PlacesSearchData.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Flags">
-            <summary></summary>
+        <member name="T:OpenMetaverse.DirectoryManager.EventsSearchData">
+            <summary>
+            An "Event" Listing summary
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TreeSpecies">
-            <summary>Foliage type for this primitive. Only applicable if this
-            primitive is foliage</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Owner">
+            <summary>The ID of the event creator</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ScratchPad">
-            <summary>Unknown</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Name">
+            <summary>The name of the event</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Position">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.ID">
+            <summary>The events ID</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Scale">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Date">
+            <summary>A string containing the short date/time the event will begin</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Rotation">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Time">
+            <summary>The event start time in Unixtime (seconds since epoch)</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Velocity">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Flags">
+            <summary>The events maturity rating</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.AngularVelocity">
-            <summary></summary>
+        <member name="M:OpenMetaverse.DirectoryManager.EventsSearchData.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Acceleration">
-            <summary></summary>
+        <member name="T:OpenMetaverse.DirectoryManager.EventInfo">
+            <summary>
+            The details of an "Event"
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.CollisionPlane">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.ID">
+            <summary>The events ID</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Flexible">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Creator">
+            <summary>The ID of the event creator</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Light">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Name">
+            <summary>The name of the event</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.LightMap">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Category">
+            <summary>The category</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Sculpt">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Desc">
+            <summary>The events description</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ClickAction">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Date">
+            <summary>The short date/time the event will begin</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Sound">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.DateUTC">
+            <summary>The event start time in Unixtime (seconds since epoch) UTC adjusted</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.OwnerID">
-            <summary>Identifies the owner if audio or a particle system is
-            active</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Duration">
+            <summary>The length of the event in minutes</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.SoundFlags">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Cover">
+            <summary>0 if no cover charge applies</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.SoundGain">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Amount">
+            <summary>The cover charge amount in L$ if applicable</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.SoundRadius">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.SimName">
+            <summary>The name of the region where the event is being held</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Text">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.GlobalPos">
+            <summary>The gridwide location of the event</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextColor">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Flags">
+            <summary>The maturity rating</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.MediaURL">
-            <summary></summary>
+        <member name="M:OpenMetaverse.DirectoryManager.EventInfo.ToSLurl">
+            <summary>Get a SL URL for the parcel where the event is hosted</summary>
+            <returns>A string, containing a standard SLURL</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Joint">
-            <summary></summary>
+        <member name="M:OpenMetaverse.DirectoryManager.EventInfo.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.JointPivot">
-            <summary></summary>
+        <member name="T:OpenMetaverse.EventInfoReplyEventArgs">
+            <summary>Contains the Event data returned from the data server from an EventInfoRequest</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.JointAxisOrAnchor">
-            <summary></summary>
+        <member name="M:OpenMetaverse.EventInfoReplyEventArgs.#ctor(OpenMetaverse.DirectoryManager.EventInfo)">
+            <summary>Construct a new instance of the EventInfoReplyEventArgs class</summary>
+            <param name="matchedEvent">A single EventInfo object containing the details of an event</param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.NameValues">
-            <summary></summary>
+        <member name="P:OpenMetaverse.EventInfoReplyEventArgs.MatchedEvent">
+            <summary>
+            A single EventInfo object containing the details of an event
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.PrimData">
-            <summary></summary>
+        <member name="T:OpenMetaverse.DirEventsReplyEventArgs">
+            <summary>Contains the "Event" detail data returned from the data server</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Properties">
-            <summary></summary>
+        <member name="M:OpenMetaverse.DirEventsReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.EventsSearchData})">
+            <summary>Construct a new instance of the DirEventsReplyEventArgs class</summary>
+            <param name="queryID">The ID of the query returned by the data server. 
+            This will correlate to the ID returned by the <see cref="!:StartEventsSearch"/> method</param>
+            <param name="matchedEvents">A list containing the "Events" returned by the search query</param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.PhysicsProps">
-            <summary>Objects physics engine propertis</summary>
+        <member name="P:OpenMetaverse.DirEventsReplyEventArgs.QueryID">
+            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,System.UInt32)"/></summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Tag">
-            <summary>Extra data about primitive</summary>
+        <member name="P:OpenMetaverse.DirEventsReplyEventArgs.MatchedEvents">
+            <summary>A list of "Events" returned by the data server</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.IsAttachment">
-            <summary>Indicates if prim is attached to an avatar</summary>
+        <member name="T:OpenMetaverse.PlacesReplyEventArgs">
+            <summary>Contains the "Event" list data returned from the data server</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ActiveClients">
-            <summary>Number of clients referencing this prim</summary>
+        <member name="M:OpenMetaverse.PlacesReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.PlacesSearchData})">
+            <summary>Construct a new instance of PlacesReplyEventArgs class</summary>
+            <param name="queryID">The ID of the query returned by the data server. 
+            This will correlate to the ID returned by the <see cref="!:StartPlacesSearch"/> method</param>
+            <param name="matchedPlaces">A list containing the "Places" returned by the data server query</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.#ctor">
-            <summary>
-            Default constructor
-            </summary>
+        <member name="P:OpenMetaverse.PlacesReplyEventArgs.QueryID">
+            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartPlacesSearch"/></summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.PackPathTwist(System.Single)">
-            <summary>
-            Packs PathTwist, PathTwistBegin, PathRadiusOffset, and PathSkew
-            parameters in to signed eight bit values
-            </summary>
-            <param name="pathTwist">Floating point parameter to pack</param>
-            <returns>Signed eight bit value containing the packed parameter</returns>
+        <member name="P:OpenMetaverse.PlacesReplyEventArgs.MatchedPlaces">
+            <summary>A list of "Places" returned by the data server</summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.UnpackPathTwist(System.SByte)">
-            <summary>
-            Unpacks PathTwist, PathTwistBegin, PathRadiusOffset, and PathSkew
-            parameters from signed eight bit integers to floating point values
-            </summary>
-            <param name="pathTwist">Signed eight bit value to unpack</param>
-            <returns>Unpacked floating point value</returns>
+        <member name="T:OpenMetaverse.DirPlacesReplyEventArgs">
+            <summary>Contains the places data returned from the data server</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.MediaVersion">
-            <summary>
-            Current version of the media data for the prim
-            </summary>
+        <member name="M:OpenMetaverse.DirPlacesReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.DirectoryParcel})">
+            <summary>Construct a new instance of the DirPlacesReplyEventArgs class</summary>
+            <param name="queryID">The ID of the query returned by the data server. 
+            This will correlate to the ID returned by the <see cref="!:StartDirPlacesSearch"/> method</param>
+            <param name="matchedParcels">A list containing land data returned by the data server</param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FaceMedia">
-            <summary>
-            Array of media entries indexed by face number
-            </summary>
+        <member name="P:OpenMetaverse.DirPlacesReplyEventArgs.QueryID">
+            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,System.Int32)"/></summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSys">
-            <summary></summary>
+        <member name="P:OpenMetaverse.DirPlacesReplyEventArgs.MatchedParcels">
+            <summary>A list containing Places data returned by the data server</summary>
         </member>
-        <member name="P:OpenMetaverse.Primitive.Type">
-            <summary>Uses basic heuristics to estimate the primitive shape</summary>
+        <member name="T:OpenMetaverse.DirClassifiedsReplyEventArgs">
+            <summary>Contains the classified data returned from the data server</summary>
         </member>
-        <member name="T:OpenMetaverse.Primitive.TextureAnimMode">
-            <summary>
-            Texture animation mode
-            </summary>
+        <member name="M:OpenMetaverse.DirClassifiedsReplyEventArgs.#ctor(System.Collections.Generic.List{OpenMetaverse.DirectoryManager.Classified})">
+            <summary>Construct a new instance of the DirClassifiedsReplyEventArgs class</summary>
+            <param name="classifieds">A list of classified ad data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ANIM_OFF">
-            <summary>Disable texture animation</summary>
+        <member name="P:OpenMetaverse.DirClassifiedsReplyEventArgs.Classifieds">
+            <summary>A list containing Classified Ads returned by the data server</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ANIM_ON">
-            <summary>Enable texture animation</summary>
+        <member name="T:OpenMetaverse.DirGroupsReplyEventArgs">
+            <summary>Contains the group data returned from the data server</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.LOOP">
-            <summary>Loop when animating textures</summary>
+        <member name="M:OpenMetaverse.DirGroupsReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.GroupSearchData})">
+            <summary>Construct a new instance of the DirGroupsReplyEventArgs class</summary>
+            <param name="queryID">The ID of the query returned by the data server. 
+            This will correlate to the ID returned by the <see cref="!:StartGroupSearch"/> method</param>
+            <param name="matchedGroups">A list of groups data returned by the data server</param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.REVERSE">
-            <summary>Animate in reverse direction</summary>
+        <member name="P:OpenMetaverse.DirGroupsReplyEventArgs.QueryID">
+            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32)"/></summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.PING_PONG">
-            <summary>Animate forward then reverse</summary>
+        <member name="P:OpenMetaverse.DirGroupsReplyEventArgs.MatchedGroups">
+            <summary>A list containing Groups data returned by the data server</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.SMOOTH">
-            <summary>Slide texture smoothly instead of frame-stepping</summary>
+        <member name="T:OpenMetaverse.DirPeopleReplyEventArgs">
+            <summary>Contains the people data returned from the data server</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ROTATE">
-            <summary>Rotate texture instead of using frames</summary>
+        <member name="M:OpenMetaverse.DirPeopleReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.AgentSearchData})">
+            <summary>Construct a new instance of the DirPeopleReplyEventArgs class</summary>
+            <param name="queryID">The ID of the query returned by the data server. 
+            This will correlate to the ID returned by the <see cref="!:StartPeopleSearch"/> method</param>
+            <param name="matchedPeople">A list of people data returned by the data server</param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.SCALE">
-            <summary>Scale texture instead of using frames</summary>
+        <member name="P:OpenMetaverse.DirPeopleReplyEventArgs.QueryID">
+            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartPeopleSearch(System.String,System.Int32)"/></summary>
         </member>
-        <member name="T:OpenMetaverse.Primitive.TextureEntryFace">
+        <member name="P:OpenMetaverse.DirPeopleReplyEventArgs.MatchedPeople">
+            <summary>A list containing People data returned by the data server</summary>
+        </member>
+        <member name="T:OpenMetaverse.DirLandReplyEventArgs">
+            <summary>Contains the land sales data returned from the data server</summary>
+        </member>
+        <member name="M:OpenMetaverse.DirLandReplyEventArgs.#ctor(System.Collections.Generic.List{OpenMetaverse.DirectoryManager.DirectoryParcel})">
+            <summary>Construct a new instance of the DirLandReplyEventArgs class</summary>
+            <param name="dirParcels">A list of parcels for sale returned by the data server</param>
+        </member>
+        <member name="P:OpenMetaverse.DirLandReplyEventArgs.DirParcels">
+            <summary>A list containing land forsale data returned by the data server</summary>
+        </member>
+        <member name="T:OpenMetaverse.Interfaces.IMessage">
             <summary>
-            A single textured face. Don't instantiate this class yourself, use the
-            methods in TextureEntry
+            Interface requirements for Messaging system
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntryFace.#ctor(OpenMetaverse.Primitive.TextureEntryFace)">
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Width">
             <summary>
-            Contains the definition for individual faces
+            Image width
             </summary>
-            <param name="defaultTexture"></param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntryFace.ToString">
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Height">
             <summary>
-            
+            Image height
             </summary>
-            <returns></returns>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.material">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.media">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RGBA">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RepeatU">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RepeatV">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.OffsetU">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.OffsetV">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Rotation">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Glow">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Bump">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.MediaFlags">
-            <summary>In the future this will specify whether a webpage is
-            attached to this face</summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.TextureID">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.MaterialID">
-            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Primitive.TextureEntry">
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Channels">
             <summary>
-            Represents all of the texturable faces for an object
+            Image channel flags
             </summary>
-            <remarks>Grid objects have infinite faces, with each face
-            using the properties of the default face unless set otherwise. So if
-            you have a TextureEntry with a default texture uuid of X, and face 18
-            has a texture UUID of Y, every face would be textured with X except for
-            face 18 that uses Y. In practice however, primitives utilize a maximum
-            of nine faces</remarks>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureEntry.DefaultTexture">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Red">
+            <summary>
+            Red channel data
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureEntry.FaceTextures">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Green">
+            <summary>
+            Green channel data
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Blue">
             <summary>
-            Constructor that takes a default texture UUID
+            Blue channel data
             </summary>
-            <param name="defaultTextureID">Texture UUID to use as the default texture</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(OpenMetaverse.Primitive.TextureEntryFace)">
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Alpha">
             <summary>
-            Constructor that takes a <code>TextureEntryFace</code> for the
-            default face
+            Alpha channel data
             </summary>
-            <param name="defaultFace">Face to use as the default face</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(System.Byte[],System.Int32,System.Int32)">
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Bump">
             <summary>
-            Constructor that creates the TextureEntry class from a byte array
+            Bump channel data
             </summary>
-            <param name="data">Byte array containing the TextureEntry field</param>
-            <param name="pos">Starting position of the TextureEntry field in 
-            the byte array</param>
-            <param name="length">Length of the TextureEntry field, in bytes</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.CreateFace(System.UInt32)">
+        <member name="M:OpenMetaverse.Imaging.ManagedImage.#ctor(System.Int32,System.Int32,OpenMetaverse.Imaging.ManagedImage.ImageChannels)">
             <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
+            Create a new blank image
             </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="width">width</param>
+            <param name="height">height</param>
+            <param name="channels">channel flags</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetFace(System.UInt32)">
+        <member name="M:OpenMetaverse.Imaging.ManagedImage.#ctor(System.Drawing.Bitmap)">
             <summary>
             
             </summary>
-            <param name="index"></param>
-            <returns></returns>
+            <param name="bitmap"></param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetOSD">
+        <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>
-            <returns></returns>
+            <param name="channels">new channel flags</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetBytes">
+        <member name="M:OpenMetaverse.Imaging.ManagedImage.ResizeNearestNeighbor(System.Int32,System.Int32)">
             <summary>
-            
+            Resize or stretch the image using nearest neighbor (ugly) resampling
             </summary>
-            <returns></returns>
+            <param name="width">new width</param>
+            <param name="height">new height</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.ToString">
+        <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></returns>
+            <returns>A byte array containing raw texture data</returns>
         </member>
-        <member name="T:OpenMetaverse.Primitive.TextureAnimation">
+        <member name="T:OpenMetaverse.Assets.AssetMutable">
             <summary>
-            Controls the texture animation of a particular prim
+            Represents an Animation
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Flags">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Assets.AssetMutable.#ctor(OpenMetaverse.AssetType)">
+            <summary>Default Constructor</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Face">
-            <summary></summary>
+        <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="F:OpenMetaverse.Primitive.TextureAnimation.SizeX">
-            <summary></summary>
+        <member name="P:OpenMetaverse.Assets.AssetMutable.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.SizeY">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Assets.AssetLandmark">
+            <summary>
+            Represents a Landmark with RegionID and Position vector
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Start">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Assets.AssetLandmark.RegionID">
+            <summary>UUID of the Landmark target region</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Length">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Assets.AssetLandmark.Position">
+            <summary> Local position of the target </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Rate">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Assets.AssetLandmark.#ctor">
+            <summary>Construct an Asset of type Landmark</summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureAnimation.#ctor(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Assets.AssetLandmark.#ctor(OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            
+            Construct an Asset object of type Landmark
             </summary>
-            <param name="data"></param>
-            <param name="pos"></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.Primitive.TextureAnimation.GetBytes">
+        <member name="M:OpenMetaverse.Assets.AssetLandmark.Encode">
             <summary>
-            
+            Encode the raw contents of a string with the specific Landmark format
             </summary>
-            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Primitive.ConstructionData">
+        <member name="M:OpenMetaverse.Assets.AssetLandmark.Decode">
             <summary>
-            Parameters used to construct a visual representation of a primitive
+            Decode the raw asset data, populating the RegionID and Position
             </summary>
+            <returns>true if the AssetData was successfully decoded to a UUID and Vector</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.profileCurve">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathCurve">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathEnd">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathRadiusOffset">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathSkew">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathScaleX">
-            <summary></summary>
+        <member name="P:OpenMetaverse.Assets.AssetLandmark.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathScaleY">
-            <summary></summary>
+        <member name="T:ThreadUtil">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathShearX">
-            <summary></summary>
+        <member name="F:ThreadUtil.wrapperInstance">
+            <summary>
+            An instance of DelegateWrapper which calls InvokeWrappedDelegate,
+            which in turn calls the DynamicInvoke method of the wrapped
+            delegate
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathShearY">
-            <summary></summary>
+        <member name="F:ThreadUtil.callback">
+            <summary>
+            Callback used to call EndInvoke on the asynchronously
+            invoked DelegateWrapper
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTaperX">
-            <summary></summary>
+        <member name="M:ThreadUtil.FireAndForget(System.Delegate,System.Object[])">
+            <summary>
+            Executes the specified delegate with the specified arguments
+            asynchronously on a thread pool thread
+            </summary>
+            <param name="d"></param>
+            <param name="args"></param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTaperY">
-            <summary></summary>
+        <member name="M:ThreadUtil.InvokeWrappedDelegate(System.Delegate,System.Object[])">
+            <summary>
+            Invokes the wrapped delegate synchronously
+            </summary>
+            <param name="d"></param>
+            <param name="args"></param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathBegin">
-            <summary></summary>
+        <member name="M:ThreadUtil.EndWrapperInvoke(System.IAsyncResult)">
+            <summary>
+            Calls EndInvoke on the wrapper and Close on the resulting WaitHandle
+            to prevent resource leaks
+            </summary>
+            <param name="ar"></param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTwist">
-            <summary></summary>
+        <member name="T:ThreadUtil.DelegateWrapper">
+            <summary>
+            Delegate to wrap another delegate and its arguments
+            </summary>
+            <param name="d"></param>
+            <param name="args"></param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTwistBegin">
-            <summary></summary>
+        <member name="T:OpenMetaverse.TextureRequestState">
+            <summary>
+            The current status of a texture request as it moves through the pipeline or final result of a texture request. 
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathRevolutions">
-            <summary></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="F:OpenMetaverse.Primitive.ConstructionData.ProfileBegin">
-            <summary></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="F:OpenMetaverse.Primitive.ConstructionData.ProfileEnd">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TextureRequestState.Progress">
+            <summary>A request that has received one or more packets back from the simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileHollow">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TextureRequestState.Finished">
+            <summary>A request that has received all packets back from the simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.Material">
-            <summary></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="F:OpenMetaverse.Primitive.ConstructionData.State">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TextureRequestState.Aborted">
+            <summary>The texture request was aborted by request of the agent</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PCode">
-            <summary></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.Primitive.ConstructionData.GetHashCode">
+        <member name="T:OpenMetaverse.TextureDownloadCallback">
             <summary>
-            Calculdates hash code for prim construction data
+            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>
-            <returns>The has</returns>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.ConstructionData.AttachmentPoint">
-            <summary>Attachment point to an avatar</summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.ConstructionData.ProfileCurve">
-            <summary></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="P:OpenMetaverse.Primitive.ConstructionData.ProfileHole">
-            <summary></summary>
+        <member name="T:OpenMetaverse.TexturePipeline">
+            <summary>
+            Texture request download handler, allows a configurable number of download slots which manage multiple
+            concurrent texture downloads from the <seealso cref="T:OpenMetaverse.Simulator"/>
+            </summary>
+            <remarks>This class makes full use of the internal <seealso cref="!:TextureCache"/> 
+            system for full texture downloads.</remarks>
         </member>
-        <member name="P:OpenMetaverse.Primitive.ConstructionData.PathBeginScale">
-            <summary></summary>
+        <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="P:OpenMetaverse.Primitive.ConstructionData.PathEndScale">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TexturePipeline._Client">
+            <summary>Holds the reference to the <see cref="T:OpenMetaverse.GridClient"/> client object</summary>
         </member>
-        <member name="T:OpenMetaverse.Primitive.FlexibleData">
-            <summary>
-            Information on the flexible properties of a primitive
-            </summary>
+        <member name="F:OpenMetaverse.TexturePipeline.maxTextureRequests">
+            <summary>Maximum concurrent texture requests allowed at a time</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Softness">
-            <summary></summary>
+        <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.Primitive.FlexibleData.Gravity">
-            <summary></summary>
+        <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.Primitive.FlexibleData.Drag">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TexturePipeline.downloadMaster">
+            <summary>The primary thread which manages the requests.</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Wind">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TexturePipeline._Running">
+            <summary>true if the TexturePipeline is currently running</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Tension">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TexturePipeline.lockerObject">
+            <summary>A synchronization object used by the primary thread</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Force">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TexturePipeline.RefreshDownloadsTimer">
+            <summary>A refresh timer used to increase the priority of stalled requests</summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.FlexibleData.#ctor">
+        <member name="M:OpenMetaverse.TexturePipeline.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            Default constructor
+            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="M:OpenMetaverse.Primitive.FlexibleData.#ctor(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.TexturePipeline.Startup">
             <summary>
-            
+            Initialize callbacks required for the TexturePipeline to operate
             </summary>
-            <param name="data"></param>
-            <param name="pos"></param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.FlexibleData.GetBytes">
+        <member name="M:OpenMetaverse.TexturePipeline.Shutdown">
             <summary>
-            
+            Shutdown the TexturePipeline and cleanup any callbacks or transfers
             </summary>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Primitive.FlexibleData.GetOSD">
+        <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>
-            <returns></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="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.Primitive.LightData">
+        <member name="M:OpenMetaverse.TexturePipeline.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,System.Single,System.Int32,System.UInt32)">
             <summary>
-            Information on the light properties of a primitive
+            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="F:OpenMetaverse.Primitive.LightData.Color">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.LightData.Intensity">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.LightData.Radius">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.LightData.Cutoff">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.LightData.Falloff">
-            <summary></summary>
-        </member>
-        <member name="M:OpenMetaverse.Primitive.LightData.#ctor">
+        <member name="M:OpenMetaverse.TexturePipeline.AbortTextureRequest(OpenMetaverse.UUID)">
             <summary>
-            Default constructor
+            Cancel a pending or in process texture request
             </summary>
+            <param name="textureID">The texture assets unique ID</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.LightData.#ctor(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.TexturePipeline.DownloadThread">
             <summary>
-            
+            Master Download Thread, Queues up downloads in the threadpool
             </summary>
-            <param name="data"></param>
-            <param name="pos"></param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.LightData.GetBytes">
+        <member name="M:OpenMetaverse.TexturePipeline.TextureRequestDoWork(System.Object)">
             <summary>
-            
+            The worker thread that sends the request and handles timeouts
             </summary>
-            <returns></returns>
+            <param name="threadContext">A <see cref="T:OpenMetaverse.TexturePipeline.TaskInfo"/> object containing the request details</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.LightData.ToString">
+        <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>
-            <returns></returns>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="T:OpenMetaverse.Primitive.LightImage">
+        <member name="M:OpenMetaverse.TexturePipeline.ImagePacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            Information on the light properties of a primitive as texture map
+            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="F:OpenMetaverse.Primitive.LightImage.LightTexture">
-            <summary></summary>
+        <member name="M:OpenMetaverse.TexturePipeline.ImageDataHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>
+            Handle the initial ImageDataPacket sent from the simulator
+            </summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.LightImage.Params">
-            <summary></summary>
+        <member name="P:OpenMetaverse.TexturePipeline.TransferCount">
+            <summary>Current number of pending and in-process transfers</summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.LightImage.#ctor">
+        <member name="T:OpenMetaverse.TexturePipeline.TaskInfo">
             <summary>
-            Default constructor
+            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="M:OpenMetaverse.Primitive.LightImage.#ctor(System.Byte[],System.Int32)">
+        <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.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>
-            
+            Create an allocated UDP packet buffer for receiving a packet
             </summary>
-            <param name="data"></param>
-            <param name="pos"></param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.LightImage.GetBytes">
+        <member name="M:OpenMetaverse.UDPPacketBuffer.#ctor(System.Net.IPEndPoint)">
             <summary>
-            
+            Create an allocated UDP packet buffer for sending a packet
             </summary>
-            <returns></returns>
+            <param name="endPoint">EndPoint of the remote host</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.LightImage.ToString">
+        <member name="M:OpenMetaverse.UDPPacketBuffer.#ctor(System.Net.IPEndPoint,System.Int32)">
             <summary>
-            
+            Create an allocated UDP packet buffer for sending a packet
             </summary>
-            <returns></returns>
+            <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.Primitive.SculptData">
+        <member name="T:OpenMetaverse.PacketBufferPool">
             <summary>
-            Information on the sculpt properties of a sculpted primitive
+            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="M:OpenMetaverse.Primitive.SculptData.#ctor">
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.#ctor">
             <summary>
-            Default constructor
+            Creates a new instance of the ObjectPoolBase class. Initialize MUST be called
+            after using this constructor.
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.SculptData.#ctor(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.#ctor(System.Int32,System.Int32,System.Boolean,System.Int32)">
             <summary>
-            
+            Creates a new instance of the ObjectPool Base class.        
             </summary>
-            <param name="data"></param>
-            <param name="pos"></param>
+            <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.Primitive.SculptData.Invert">
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.ForceCleanup">
             <summary>
-            Render inside out (inverts the normals).
+            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.Primitive.SculptData.Mirror">
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.GetObjectInstance">
             <summary>
-            Render an X axis mirror of the sculpty.
+            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="T:OpenMetaverse.Primitive.ObjectProperties">
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.CheckIn(OpenMetaverse.ObjectPoolSegment{`0},`0)">
             <summary>
-            Extended properties to describe an object
+            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="F:OpenMetaverse.Primitive.ObjectProperties.ObjectID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.CreatorID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.OwnerID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.GroupID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.CreationDate">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Permissions">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.OwnershipCost">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SaleType">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SalePrice">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePerms">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePermTextures">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePermTexturesOwner">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Category">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.InventorySerial">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.ItemID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.FolderID">
-            <summary></summary>
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.CheckOut">
+            <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. 
+            </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="F:OpenMetaverse.Primitive.ObjectProperties.FromTaskID">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ObjectPoolBase`1.TotalSegments">
+            <summary>
+            The total number of segments created. Intended to be used by the Unit Tests.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.LastOwnerID">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ObjectPoolBase`1.ItemsPerSegment">
+            <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. 
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Name">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ObjectPoolBase`1.MinimumSegmentCount">
+            <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.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Description">
-            <summary></summary>
+        <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="F:OpenMetaverse.Primitive.ObjectProperties.TouchName">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ObjectPoolBase`1.CleanupFrequencyMilliseconds">
+            <summary>
+            The frequence which the cleanup thread runs. This is typically
+            expected to be in the 5 minute range. 
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SitName">
-            <summary></summary>
+        <member name="M:OpenMetaverse.PacketBufferPool.#ctor(System.Net.IPEndPoint,System.Int32,System.Int32)">
+            <summary>
+            Initialize the object pool in client mode
+            </summary>
+            <param name="endPoint">Server to connect to</param>
+            <param name="itemsPerSegment"></param>
+            <param name="minSegments"></param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.TextureIDs">
-            <summary></summary>
+        <member name="M:OpenMetaverse.PacketBufferPool.#ctor(System.Int32,System.Int32)">
+            <summary>
+            Initialize the object pool in server mode
+            </summary>
+            <param name="itemsPerSegment"></param>
+            <param name="minSegments"></param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.ObjectProperties.#ctor">
+        <member name="M:OpenMetaverse.PacketBufferPool.GetObjectInstance">
             <summary>
-            Default constructor
+            Returns a packet buffer with EndPoint set if the buffer is in
+            client mode, or with EndPoint set to null in server mode
             </summary>
+            <returns>Initialized UDPPacketBuffer object</returns>
         </member>
-        <member name="M:OpenMetaverse.Primitive.ObjectProperties.SetFamilyProperties(OpenMetaverse.Primitive.ObjectProperties)">
+        <member name="M:OpenMetaverse.Pool.#cctor">
             <summary>
-            Set the properties that are set in an ObjectPropertiesFamily packet
+            Default constructor
             </summary>
-            <param name="props"><seealso cref="T:OpenMetaverse.Primitive.ObjectProperties"/> that has
-            been partially filled by an ObjectPropertiesFamily packet</param>
         </member>
-        <member name="T:OpenMetaverse.Primitive.PhysicsProperties">
+        <member name="M:OpenMetaverse.Pool.CheckOut">
             <summary>
-            Describes physics attributes of the prim
+            Check a packet buffer out of the pool
             </summary>
+            <returns>A packet buffer object</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.LocalID">
-            <summary>Primitive's local ID</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.Density">
-            <summary>Density (1000 for normal density)</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.Friction">
-            <summary>Friction</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.GravityMultiplier">
-            <summary>Gravity multiplier (1 for normal gravity) </summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.PhysicsShapeType">
-            <summary>Type of physics representation of this primitive in the simulator</summary>
+        <member name="T:OpenMetaverse.Logger">
+            <summary>
+            Singleton logging class for the entire library
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.Restitution">
-            <summary>Restitution</summary>
+        <member name="F:OpenMetaverse.Logger.LogInstance">
+            <summary>log4net logging engine</summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.PhysicsProperties.FromOSD(OpenMetaverse.StructuredData.OSD)">
+        <member name="M:OpenMetaverse.Logger.#cctor">
             <summary>
-            Creates PhysicsProperties from OSD
+            Default constructor
             </summary>
-            <param name="osd">OSDMap with incoming data</param>
-            <returns>Deserialized PhysicsProperties object</returns>
         </member>
-        <member name="M:OpenMetaverse.Primitive.PhysicsProperties.GetOSD">
+        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel)">
             <summary>
-            Serializes PhysicsProperties to OSD
+            Send a log message to the logging engine
             </summary>
-            <returns>OSDMap with serialized PhysicsProperties data</returns>
+            <param name="message">The log message</param>
+            <param name="level">The severity of the log entry</param>
         </member>
-        <member name="T:OpenMetaverse.Primitive.ParticleSystem">
+        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel,OpenMetaverse.GridClient)">
             <summary>
-            Complete structure for the particle system
+            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.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 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="F:OpenMetaverse.Primitive.ParticleSystem.Pattern">
-            <summary><seealso cref="T:SourcePattern"/> pattern of particles</summary>
+        <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>
-        <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 name="M:OpenMetaverse.Logger.DebugLog(System.Object)">
+            <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="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 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>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.InnerAngle">
-            <summary>A <see langword="float"/> in radians that specifies where particles will not be created</summary>
+        <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="F:OpenMetaverse.Primitive.ParticleSystem.OuterAngle">
-            <summary>A <see langword="float"/> in radians that specifies where particles will be created</summary>
+        <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>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstRate">
-            <summary>A <see langword="float"/> representing the number of seconds between burts.</summary>
+        <member name="T:OpenMetaverse.FriendRights">
+            <summary>
+            
+            </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 name="F:OpenMetaverse.FriendRights.None">
+            <summary>The avatar has no rights</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 name="F:OpenMetaverse.FriendRights.CanSeeOnline">
+            <summary>The avatar can see the online status of the target avatar</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 name="F:OpenMetaverse.FriendRights.CanSeeOnMap">
+            <summary>The avatar can see the location of the target avatar on the map</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstPartCount">
-            <summary>A <see langword="byte"/> representing the maximum number of particles emitted per burst</summary>
+        <member name="F:OpenMetaverse.FriendRights.CanModifyObjects">
+            <summary>The avatar can modify the ojects of the target avatar </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="T:OpenMetaverse.FriendInfo">
+            <summary>
+            This class holds information about an avatar in the friends list.  There are two ways 
+            to interface to this class.  The first is through the set of boolean properties.  This is the typical
+            way clients of this class will use it.  The second interface is through two bitflag properties,
+            TheirFriendsRights and MyFriendsRights
+            </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="M:OpenMetaverse.FriendInfo.#ctor(OpenMetaverse.UUID,OpenMetaverse.FriendRights,OpenMetaverse.FriendRights)">
+            <summary>
+            Used internally when building the initial list of friends at login time
+            </summary>
+            <param name="id">System ID of the avatar being prepesented</param>
+            <param name="theirRights">Rights the friend has to see you online and to modify your objects</param>
+            <param name="myRights">Rights you have to see your friend online and to modify their objects</param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.Texture">
-            <summary>The <see cref="T:UUID"/> Key of the texture displayed on the particle</summary>
+        <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="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="P:OpenMetaverse.FriendInfo.UUID">
+            <summary>
+            System ID of the avatar
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartDataFlags">
-            <summary>Flags of particle from <seealso cref="T:ParticleDataFlags"/></summary>
+        <member name="P:OpenMetaverse.FriendInfo.Name">
+            <summary>
+            full name of the avatar
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartMaxAge">
-            <summary>Max Age particle system will emit particles for</summary>
+        <member name="P:OpenMetaverse.FriendInfo.IsOnline">
+            <summary>
+            True if the avatar is online
+            </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="P:OpenMetaverse.FriendInfo.CanSeeMeOnline">
+            <summary>
+            True if the friend can see if I am online
+            </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="P:OpenMetaverse.FriendInfo.CanSeeMeOnMap">
+            <summary>
+            True if the friend can see me on the map 
+            </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="P:OpenMetaverse.FriendInfo.CanModifyMyObjects">
+            <summary>
+            True if the freind can modify my objects
+            </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="P:OpenMetaverse.FriendInfo.CanSeeThemOnline">
+            <summary>
+            True if I can see if my friend is online
+            </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="P:OpenMetaverse.FriendInfo.CanSeeThemOnMap">
+            <summary>
+            True if I can see if my friend is on the map
+            </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="P:OpenMetaverse.FriendInfo.CanModifyTheirObjects">
+            <summary>
+            True if I can modify my friend's objects
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.ParticleSystem.#ctor(System.Byte[],System.Int32)">
+        <member name="P:OpenMetaverse.FriendInfo.TheirFriendRights">
             <summary>
-            Decodes a byte[] array into a ParticleSystem Object
+            My friend's rights represented as bitmapped flags
             </summary>
-            <param name="data">ParticleSystem object</param>
-            <param name="pos">Start position for BitPacker</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.ParticleSystem.GetBytes">
+        <member name="P:OpenMetaverse.FriendInfo.MyFriendRights">
             <summary>
-            Generate byte[] array from particle data
+            My rights represented as bitmapped flags
             </summary>
-            <returns>Byte array</returns>
         </member>
-        <member name="T:OpenMetaverse.Primitive.ParticleSystem.SourcePattern">
+        <member name="T:OpenMetaverse.FriendsManager">
             <summary>
-            Particle source pattern
+            This class is used to add and remove avatars from your friends list and to manage their permission.  
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.None">
-            <summary>None</summary>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendOnline">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Drop">
-            <summary>Drop particles from source position with no force</summary>
+        <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.Primitive.ParticleSystem.SourcePattern.Explode">
-            <summary>"Explode" particles in all directions</summary>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendOnlineLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Angle">
-            <summary>Particles shoot across a 2D area</summary>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendOffline">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.AngleCone">
-            <summary>Particles shoot across a 3D Cone</summary>
+        <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.Primitive.ParticleSystem.SourcePattern.AngleConeEmpty">
-            <summary>Inverse of AngleCone (shoot particles everywhere except the 3D cone defined</summary>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendOfflineLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags">
-            <summary>
-            Particle Data Flags
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.None">
-            <summary>None</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.InterpColor">
-            <summary>Interpolate color and alpha from start to end</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.InterpScale">
-            <summary>Interpolate scale from start to end</summary>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendRights">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Bounce">
-            <summary>Bounce particles off particle sources Z height</summary>
+        <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.Primitive.ParticleSystem.ParticleDataFlags.Wind">
-            <summary>velocity of particles is dampened toward the simulators wind</summary>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendRightsLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.FollowSrc">
-            <summary>Particles follow the source</summary>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendNames">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.FollowVelocity">
-            <summary>Particles point towards the direction of source's velocity</summary>
+        <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.Primitive.ParticleSystem.ParticleDataFlags.TargetPos">
-            <summary>Target of the particles</summary>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendNamesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.TargetLinear">
-            <summary>Particles are sent in a straight line</summary>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipOffered">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Emissive">
-            <summary>Particles emit a glow</summary>
+        <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.Primitive.ParticleSystem.ParticleDataFlags.Beam">
-            <summary>used for point/grab/touch</summary>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipOfferedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags">
-            <summary>
-            Particle Flags Enum
-            </summary>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipResponse">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags.None">
-            <summary>None</summary>
+        <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.Primitive.ParticleSystem.ParticleFlags.ObjectRelative">
-            <summary>Acceleration and velocity for particles are
-            relative to the object rotation</summary>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipResponseLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags.UseNewAngle">
-            <summary>Particles use new 'correct' angle parameters</summary>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipTerminated">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Groups">
-            <summary>Groups that this avatar is a member of</summary>
+        <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.Avatar.ProfileStatistics">
-            <summary>Positive and negative ratings</summary>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipTerminatedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.ProfileProperties">
-            <summary>Avatar properties including about text, profile URL, image IDs and 
-            publishing settings</summary>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendFound">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.ProfileInterests">
-            <summary>Avatar interests including spoken languages, skills, and "want to"
-            choices</summary>
+        <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.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="F:OpenMetaverse.FriendsManager.m_FriendFoundLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.VisualParameters">
+        <member name="F:OpenMetaverse.FriendsManager.FriendList">
             <summary>
-            Contains the visual parameters describing the deformation of the avatar
+            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.Avatar.AppearanceVersion">
+        <member name="F:OpenMetaverse.FriendsManager.FriendRequests">
             <summary>
-            Appearance version. Value greater than 0 indicates using server side baking
+            A Dictionary of key/value pairs containing current pending frienship offers.
+            
+            The key is the <seealso cref="T:OpenMetaverse.UUID"/> of the avatar making the request, 
+            the value is the <seealso cref="T:OpenMetaverse.UUID"/> of the request which is used to accept
+            or decline the friendship offer
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.COFVersion">
+        <member name="M:OpenMetaverse.FriendsManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            Version of the Current Outfit Folder that the appearance is based on
+            Internal constructor
             </summary>
+            <param name="client">A reference to the GridClient Object</param>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AppearanceFlags">
+        <member name="M:OpenMetaverse.FriendsManager.AcceptFriendship(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Appearance flags. Introduced with server side baking, currently unused.
+            Accept a friendship request
             </summary>
+            <param name="fromAgentID">agentID of avatatar to form friendship with</param>
+            <param name="imSessionID">imSessionID of the friendship request message</param>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Animations">
+        <member name="M:OpenMetaverse.FriendsManager.DeclineFriendship(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            List of current avatar animations
+            Decline a friendship request
             </summary>
+            <param name="fromAgentID"><seealso cref="T:OpenMetaverse.UUID"/> of friend</param>
+            <param name="imSessionID">imSessionID of the friendship request message</param>
         </member>
-        <member name="M:OpenMetaverse.Avatar.#ctor">
+        <member name="M:OpenMetaverse.FriendsManager.OfferFriendship(OpenMetaverse.UUID)">
             <summary>
-            Default constructor
+            Overload: Offer friendship to an avatar.
             </summary>
+            <param name="agentID">System ID of the avatar you are offering friendship to</param>
         </member>
-        <member name="P:OpenMetaverse.Avatar.FirstName">
-            <summary>First name</summary>
-        </member>
-        <member name="P:OpenMetaverse.Avatar.LastName">
-            <summary>Last name</summary>
+        <member name="M:OpenMetaverse.FriendsManager.OfferFriendship(OpenMetaverse.UUID,System.String)">
+            <summary>
+            Offer friendship to an avatar.
+            </summary>
+            <param name="agentID">System ID of the avatar you are offering friendship to</param>
+            <param name="message">A message to send with the request</param>
         </member>
-        <member name="P:OpenMetaverse.Avatar.Name">
-            <summary>Full name</summary>
+        <member name="M:OpenMetaverse.FriendsManager.TerminateFriendship(OpenMetaverse.UUID)">
+            <summary>
+            Terminate a friendship with an avatar
+            </summary>
+            <param name="agentID">System ID of the avatar you are terminating the friendship with</param>
         </member>
-        <member name="P:OpenMetaverse.Avatar.GroupName">
-            <summary>Active group</summary>
+        <member name="M:OpenMetaverse.FriendsManager.TerminateFriendshipHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="T:OpenMetaverse.Avatar.Statistics">
+        <member name="M:OpenMetaverse.FriendsManager.GrantRights(OpenMetaverse.UUID,OpenMetaverse.FriendRights)">
             <summary>
-            Positive and negative ratings
+            Change the rights of a friend avatar.
             </summary>
+            <param name="friendID">the <seealso cref="T:OpenMetaverse.UUID"/> of the friend</param>
+            <param name="rights">the new rights to give the friend</param>
+            <remarks>This method will implicitly set the rights to those passed in the rights parameter.</remarks>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.BehaviorPositive">
-            <summary>Positive ratings for Behavior</summary>
+        <member name="M:OpenMetaverse.FriendsManager.MapFriend(OpenMetaverse.UUID)">
+            <summary>
+            Use to map a friends location on the grid.
+            </summary>
+            <param name="friendID">Friends UUID to find</param>
+            <remarks><seealso cref="E:OnFriendFound"/></remarks>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.BehaviorNegative">
-            <summary>Negative ratings for Behavior</summary>
+        <member name="M:OpenMetaverse.FriendsManager.TrackFriend(OpenMetaverse.UUID)">
+            <summary>
+            Use to track a friends movement on the grid
+            </summary>
+            <param name="friendID">Friends Key</param>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.AppearancePositive">
-            <summary>Positive ratings for Appearance</summary>
+        <member name="M:OpenMetaverse.FriendsManager.RequestOnlineNotification(OpenMetaverse.UUID)">
+            <summary>
+            Ask for a notification of friend's online status
+            </summary>
+            <param name="friendID">Friend's UUID</param>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.AppearanceNegative">
-            <summary>Negative ratings for Appearance</summary>
+        <member name="M:OpenMetaverse.FriendsManager.Avatars_OnAvatarNames(System.Object,OpenMetaverse.UUIDNameReplyEventArgs)">
+            <summary>
+            This handles the asynchronous response of a RequestAvatarNames call.
+            </summary>
+            <param name="sender"></param>
+            <param name="e">names cooresponding to the the list of IDs sent the the RequestAvatarNames call.</param>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.BuildingPositive">
-            <summary>Positive ratings for Building</summary>
+        <member name="M:OpenMetaverse.FriendsManager.OnlineNotificationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.BuildingNegative">
-            <summary>Negative ratings for Building</summary>
+        <member name="M:OpenMetaverse.FriendsManager.OfflineNotificationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.GivenPositive">
-            <summary>Positive ratings given by this avatar</summary>
+        <member name="M:OpenMetaverse.FriendsManager.ChangeUserRightsHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.GivenNegative">
-            <summary>Negative ratings given by this avatar</summary>
+        <member name="M:OpenMetaverse.FriendsManager.OnFindAgentReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="T:OpenMetaverse.Avatar.AvatarProperties">
+        <member name="M:OpenMetaverse.FriendsManager.Network_OnLoginResponse(System.Boolean,System.Boolean,System.String,System.String,OpenMetaverse.LoginResponseData)">
             <summary>
-            Avatar properties including about text, profile URL, image IDs and 
-            publishing settings
+            Populate FriendList <seealso cref="!:InternalDictionary"/> with data from the login reply
             </summary>
+            <param name="loginSuccess">true if login was successful</param>
+            <param name="redirect">true if login request is requiring a redirect</param>
+            <param name="message">A string containing the response to the login request</param>
+            <param name="reason">A string containing the reason for the request</param>
+            <param name="replyData">A <seealso cref="T:OpenMetaverse.LoginResponseData"/> object containing the decoded 
+            reply from the login server</param>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.FirstLifeText">
-            <summary>First Life about text</summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.FirstLifeImage">
-            <summary>First Life image ID</summary>
+        <member 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="F:OpenMetaverse.Avatar.AvatarProperties.Partner">
-            <summary></summary>
+        <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="F:OpenMetaverse.Avatar.AvatarProperties.AboutText">
-            <summary></summary>
+        <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="F:OpenMetaverse.Avatar.AvatarProperties.BornOn">
-            <summary></summary>
+        <member name="E:OpenMetaverse.FriendsManager.FriendNames">
+            <summary>Raised when the simulator sends us the names on our friends list</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.CharterMember">
-            <summary></summary>
+        <member name="E:OpenMetaverse.FriendsManager.FriendshipOffered">
+            <summary>Raised when the simulator sends notification another agent is offering us friendship</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.ProfileImage">
-            <summary>Profile image ID</summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.Flags">
-            <summary>Flags of the profile</summary>
+        <member name="E:OpenMetaverse.FriendsManager.FriendshipResponse">
+            <summary>Raised when a request we sent to friend another agent is accepted or declined</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.ProfileURL">
-            <summary>Web URL for this profile</summary>
+        <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="P:OpenMetaverse.Avatar.AvatarProperties.AllowPublish">
-            <summary>Should this profile be published on the web</summary>
+        <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="P:OpenMetaverse.Avatar.AvatarProperties.Online">
-            <summary>Avatar Online Status</summary>
+        <member name="T:OpenMetaverse.FriendInfoEventArgs">
+            <summary>Contains information on a member of our friends list</summary>
         </member>
-        <member name="P:OpenMetaverse.Avatar.AvatarProperties.MaturePublish">
-            <summary>Is this a mature profile</summary>
+        <member name="M:OpenMetaverse.FriendInfoEventArgs.#ctor(OpenMetaverse.FriendInfo)">
+            <summary>
+            Construct a new instance of the FriendInfoEventArgs class
+            </summary>
+            <param name="friend">The FriendInfo</param>
         </member>
-        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Identified">
-            <summary></summary>
+        <member name="P:OpenMetaverse.FriendInfoEventArgs.Friend">
+            <summary>Get the FriendInfo</summary>
         </member>
-        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Transacted">
-            <summary></summary>
+        <member name="T:OpenMetaverse.FriendNamesEventArgs">
+            <summary>Contains Friend Names</summary>
         </member>
-        <member name="T:OpenMetaverse.Avatar.Interests">
+        <member name="M:OpenMetaverse.FriendNamesEventArgs.#ctor(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,System.String})">
             <summary>
-            Avatar interests including spoken languages, skills, and "want to"
-            choices
+            Construct a new instance of the FriendNamesEventArgs class
             </summary>
+            <param name="names">A dictionary where the Key is the ID of the Agent, 
+            and the Value is a string containing their name</param>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Interests.LanguagesText">
-            <summary>Languages profile field</summary>
+        <member name="P:OpenMetaverse.FriendNamesEventArgs.Names">
+            <summary>A dictionary where the Key is the ID of the Agent, 
+            and the Value is a string containing their name</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Interests.SkillsMask">
-            <summary></summary>
+        <member name="T:OpenMetaverse.FriendshipOfferedEventArgs">
+            <summary>Sent when another agent requests a friendship with our agent</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Interests.SkillsText">
-            <summary></summary>
+        <member name="M:OpenMetaverse.FriendshipOfferedEventArgs.#ctor(OpenMetaverse.UUID,System.String,OpenMetaverse.UUID)">
+            <summary>
+            Construct a new instance of the FriendshipOfferedEventArgs class
+            </summary>
+            <param name="agentID">The ID of the agent requesting friendship</param>
+            <param name="agentName">The name of the agent requesting friendship</param>
+            <param name="imSessionID">The ID of the session, used in accepting or declining the 
+            friendship offer</param>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Interests.WantToMask">
-            <summary></summary>
+        <member name="P:OpenMetaverse.FriendshipOfferedEventArgs.AgentID">
+            <summary>Get the ID of the agent requesting friendship</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Interests.WantToText">
-            <summary></summary>
+        <member name="P:OpenMetaverse.FriendshipOfferedEventArgs.AgentName">
+            <summary>Get the name of the agent requesting friendship</summary>
         </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="P:OpenMetaverse.FriendshipOfferedEventArgs.SessionID">
+            <summary>Get the ID of the session, used in accepting or declining the 
+            friendship offer</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentThrottle.#ctor(OpenMetaverse.GridClient)">
+        <member name="T:OpenMetaverse.FriendshipResponseEventArgs">
+            <summary>A response containing the results of our request to form a friendship with another agent</summary>
+        </member>
+        <member name="M:OpenMetaverse.FriendshipResponseEventArgs.#ctor(OpenMetaverse.UUID,System.String,System.Boolean)">
             <summary>
-            Default constructor, uses a default high total of 1500 KBps (1536000)
+            Construct a new instance of the FriendShipResponseEventArgs class
             </summary>
+            <param name="agentID">The ID of the agent we requested a friendship with</param>
+            <param name="agentName">The name of the agent we requested a friendship with</param>
+            <param name="accepted">true if the agent accepted our friendship offer</param>
         </member>
-        <member name="M:OpenMetaverse.AgentThrottle.#ctor(System.Byte[],System.Int32)">
+        <member name="P:OpenMetaverse.FriendshipResponseEventArgs.AgentID">
+            <summary>Get the ID of the agent we requested a friendship with</summary>
+        </member>
+        <member name="P:OpenMetaverse.FriendshipResponseEventArgs.AgentName">
+            <summary>Get the name of the agent we requested a friendship with</summary>
+        </member>
+        <member name="P:OpenMetaverse.FriendshipResponseEventArgs.Accepted">
+            <summary>true if the agent accepted our friendship offer</summary>
+        </member>
+        <member name="T:OpenMetaverse.FriendshipTerminatedEventArgs">
+            <summary>Contains data sent when a friend terminates a friendship with us</summary>
+        </member>
+        <member name="M:OpenMetaverse.FriendshipTerminatedEventArgs.#ctor(OpenMetaverse.UUID,System.String)">
             <summary>
-            Constructor that decodes an existing AgentThrottle packet in to
-            individual values
+            Construct a new instance of the FrindshipTerminatedEventArgs class
             </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>
+            <param name="agentID">The ID of the friend who terminated the friendship with us</param>
+            <param name="agentName">The name of the friend who terminated the friendship with us</param>
         </member>
-        <member name="M:OpenMetaverse.AgentThrottle.Set">
+        <member name="P:OpenMetaverse.FriendshipTerminatedEventArgs.AgentID">
+            <summary>Get the ID of the agent that terminated the friendship with us</summary>
+        </member>
+        <member name="P:OpenMetaverse.FriendshipTerminatedEventArgs.AgentName">
+            <summary>Get the name of the agent that terminated the friendship with us</summary>
+        </member>
+        <member name="T:OpenMetaverse.FriendFoundReplyEventArgs">
             <summary>
-            Send an AgentThrottle packet to the current server using the 
-            current values
+            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.AgentThrottle.Set(OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.FriendFoundReplyEventArgs.#ctor(OpenMetaverse.UUID,System.UInt64,OpenMetaverse.Vector3)">
             <summary>
-            Send an AgentThrottle packet to the specified server using the 
-            current values
+            Construct a new instance of the FriendFoundReplyEventArgs class
             </summary>
+            <param name="agentID">The ID of the agent we have requested location information for</param>
+            <param name="regionHandle">The region handle where our friend is located</param>
+            <param name="location">The simulator local position our friend is located</param>
         </member>
-        <member name="M:OpenMetaverse.AgentThrottle.ToBytes">
+        <member name="P:OpenMetaverse.FriendFoundReplyEventArgs.AgentID">
+            <summary>Get the ID of the agent we have received location information for</summary>
+        </member>
+        <member name="P:OpenMetaverse.FriendFoundReplyEventArgs.RegionHandle">
+            <summary>Get the region handle where our mapped friend is located</summary>
+        </member>
+        <member name="P:OpenMetaverse.FriendFoundReplyEventArgs.Location">
+            <summary>Get the simulator local position where our friend is located</summary>
+        </member>
+        <member name="T:OpenMetaverse.Animations">
             <summary>
-            Convert the current throttle values to a byte array that can be put
-            in an AgentThrottle packet
+            Static pre-defined animations available to all agents
             </summary>
-            <returns>Byte array containing all the throttle values</returns>
         </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Resend">
-            <summary>Maximum bits per second for resending unacknowledged packets</summary>
+        <member name="F:OpenMetaverse.Animations.AFRAID">
+            <summary>Agent with afraid expression on face</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Land">
-            <summary>Maximum bits per second for LayerData terrain</summary>
+        <member name="F:OpenMetaverse.Animations.AIM_BAZOOKA_R">
+            <summary>Agent aiming a bazooka (right handed)</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Wind">
-            <summary>Maximum bits per second for LayerData wind data</summary>
+        <member name="F:OpenMetaverse.Animations.AIM_BOW_L">
+            <summary>Agent aiming a bow (left handed)</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Cloud">
-            <summary>Maximum bits per second for LayerData clouds</summary>
+        <member name="F:OpenMetaverse.Animations.AIM_HANDGUN_R">
+            <summary>Agent aiming a hand gun (right handed)</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Task">
-            <summary>Unknown, includes object data</summary>
+        <member name="F:OpenMetaverse.Animations.AIM_RIFLE_R">
+            <summary>Agent aiming a rifle (right handed)</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Texture">
-            <summary>Maximum bits per second for textures</summary>
+        <member name="F:OpenMetaverse.Animations.ANGRY">
+            <summary>Agent with angry expression on face</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Asset">
-            <summary>Maximum bits per second for downloaded assets</summary>
+        <member name="F:OpenMetaverse.Animations.AWAY">
+            <summary>Agent hunched over (away)</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Total">
-            <summary>Maximum bits per second the entire connection, divided up
-            between invidiual streams using default multipliers</summary>
+        <member name="F:OpenMetaverse.Animations.BACKFLIP">
+            <summary>Agent doing a backflip</summary>
         </member>
-        <member name="F:OpenMetaverse.Http.EventQueueClient.REQUEST_TIMEOUT">
-            <summary>=</summary>
+        <member name="F:OpenMetaverse.Animations.BELLY_LAUGH">
+            <summary>Agent laughing while holding belly</summary>
         </member>
-        <member name="F:OpenMetaverse.Http.EventQueueClient._errorCount">
-            <summary>Number of times we've received an unknown CAPS exception in series.</summary>
+        <member name="F:OpenMetaverse.Animations.BLOW_KISS">
+            <summary>Agent blowing a kiss</summary>
         </member>
-        <member name="F:OpenMetaverse.Http.EventQueueClient._random">
-            <summary>For exponential backoff on error.</summary>
+        <member name="F:OpenMetaverse.Animations.BORED">
+            <summary>Agent with bored expression on face</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetMesh">
-            <summary>
-            Represents Mesh asset
-            </summary>
+        <member name="F:OpenMetaverse.Animations.BOW">
+            <summary>Agent bowing to audience</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetMesh.MeshData">
-            <summary>
-            Decoded mesh data
-            </summary>
+        <member name="F:OpenMetaverse.Animations.BRUSH">
+            <summary>Agent brushing himself/herself off</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetMesh.#ctor">
-            <summary>Initializes a new instance of an AssetMesh object</summary>
+        <member name="F:OpenMetaverse.Animations.BUSY">
+            <summary>Agent in busy mode</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="F:OpenMetaverse.Animations.CLAP">
+            <summary>Agent clapping hands</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetMesh.Encode">
-            <summary>
-            TODO: Encodes Collada file into LLMesh format
-            </summary>
+        <member name="F:OpenMetaverse.Animations.COURTBOW">
+            <summary>Agent doing a curtsey bow</summary>
         </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="F:OpenMetaverse.Animations.CROUCH">
+            <summary>Agent crouching</summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetMesh.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="F:OpenMetaverse.Animations.CROUCHWALK">
+            <summary>Agent crouching while walking</summary>
         </member>
-        <member name="F:OpenMetaverse.TerrainPatch.X">
-            <summary>X position of this patch</summary>
+        <member name="F:OpenMetaverse.Animations.CRY">
+            <summary>Agent crying</summary>
         </member>
-        <member name="F:OpenMetaverse.TerrainPatch.Y">
-            <summary>Y position of this patch</summary>
+        <member name="F:OpenMetaverse.Animations.CUSTOMIZE">
+            <summary>Agent unanimated with arms out (e.g. setting appearance)</summary>
         </member>
-        <member name="F:OpenMetaverse.TerrainPatch.Data">
-            <summary>A 16x16 array of floats holding decompressed layer data</summary>
+        <member name="F:OpenMetaverse.Animations.CUSTOMIZE_DONE">
+            <summary>Agent re-animated after set appearance finished</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.Animations.DANCE1">
+            <summary>Agent dancing</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.Animations.DANCE2">
+            <summary>Agent dancing</summary>
         </member>
-        <member name="T:OpenMetaverse.ScriptPermission">
-            <summary>
-            Permission request flags, asked when a script wants to control an Avatar
-            </summary>
+        <member name="F:OpenMetaverse.Animations.DANCE3">
+            <summary>Agent dancing</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.None">
-            <summary>Placeholder for empty values, shouldn't ever see this</summary>
+        <member name="F:OpenMetaverse.Animations.DANCE4">
+            <summary>Agent dancing</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.Debit">
-            <summary>Script wants ability to take money from you</summary>
+        <member name="F:OpenMetaverse.Animations.DANCE5">
+            <summary>Agent dancing</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.TakeControls">
-            <summary>Script wants to take camera controls for you</summary>
+        <member name="F:OpenMetaverse.Animations.DANCE6">
+            <summary>Agent dancing</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.RemapControls">
-            <summary>Script wants to remap avatars controls</summary>
+        <member name="F:OpenMetaverse.Animations.DANCE7">
+            <summary>Agent dancing</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.TriggerAnimation">
-            <summary>Script wants to trigger avatar animations</summary>
-            <remarks>This function is not implemented on the grid</remarks>
+        <member name="F:OpenMetaverse.Animations.DANCE8">
+            <summary>Agent dancing</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.Attach">
-            <summary>Script wants to attach or detach the prim or primset to your avatar</summary>
+        <member name="F:OpenMetaverse.Animations.DEAD">
+            <summary>Agent on ground unanimated</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.ReleaseOwnership">
-            <summary>Script wants permission to release ownership</summary>
-            <remarks>This function is not implemented on the grid
-            The concept of "public" objects does not exist anymore.</remarks>
+        <member name="F:OpenMetaverse.Animations.DRINK">
+            <summary>Agent boozing it up</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.ChangeLinks">
-            <summary>Script wants ability to link/delink with other prims</summary>
+        <member name="F:OpenMetaverse.Animations.EMBARRASSED">
+            <summary>Agent with embarassed expression on face</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.ChangeJoints">
-            <summary>Script wants permission to change joints</summary>
-            <remarks>This function is not implemented on the grid</remarks>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_AFRAID">
+            <summary>Agent with afraid expression on face</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.ChangePermissions">
-            <summary>Script wants permissions to change permissions</summary>
-            <remarks>This function is not implemented on the grid</remarks>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_ANGER">
+            <summary>Agent with angry expression on face</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.TrackCamera">
-            <summary>Script wants to track avatars camera position and rotation </summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_BORED">
+            <summary>Agent with bored expression on face</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.ControlCamera">
-            <summary>Script wants to control your camera</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_CRY">
+            <summary>Agent crying</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.Teleport">
-            <summary>Script wants the ability to teleport you</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_DISDAIN">
+            <summary>Agent showing disdain (dislike) for something</summary>
         </member>
-        <member name="T:OpenMetaverse.InstantMessageDialog">
-            <summary>
-            Special commands used in Instant Messages
-            </summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_EMBARRASSED">
+            <summary>Agent with embarassed expression on face</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.MessageFromAgent">
-            <summary>Indicates a regular IM from another agent</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_FROWN">
+            <summary>Agent with frowning expression on face</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.MessageBox">
-            <summary>Simple notification box with an OK button</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_KISS">
+            <summary>Agent with kissy face</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupInvitation">
-            <summary>You've been invited to join a group.</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_LAUGH">
+            <summary>Agent expressing laughgter</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.InventoryOffered">
-            <summary>Inventory offer</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_OPEN_MOUTH">
+            <summary>Agent with open mouth</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.InventoryAccepted">
-            <summary>Accepted inventory offer</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_REPULSED">
+            <summary>Agent with repulsed expression on face</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.InventoryDeclined">
-            <summary>Declined inventory offer</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_SAD">
+            <summary>Agent expressing sadness</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupVote">
-            <summary>Group vote</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_SHRUG">
+            <summary>Agent shrugging shoulders</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryOffered">
-            <summary>An object is offering its inventory</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_SMILE">
+            <summary>Agent with a smile</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryAccepted">
-            <summary>Accept an inventory offer from an object</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_SURPRISE">
+            <summary>Agent expressing surprise</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryDeclined">
-            <summary>Decline an inventory offer from an object</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_TONGUE_OUT">
+            <summary>Agent sticking tongue out</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.NewUserDefault">
-            <summary>Unknown</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_TOOTHSMILE">
+            <summary>Agent with big toothy smile</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.SessionAdd">
-            <summary>Start a session, or add users to a session</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_WINK">
+            <summary>Agent winking</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.SessionOfflineAdd">
-            <summary>Start a session, but don't prune offline users</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_WORRY">
+            <summary>Agent expressing worry</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.SessionGroupStart">
-            <summary>Start a session with your group</summary>
+        <member name="F:OpenMetaverse.Animations.FALLDOWN">
+            <summary>Agent falling down</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.SessionCardlessStart">
-            <summary>Start a session without a calling card (finder or objects)</summary>
+        <member name="F:OpenMetaverse.Animations.FEMALE_WALK">
+            <summary>Agent walking (feminine version)</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.SessionSend">
-            <summary>Send a message to a session</summary>
+        <member name="F:OpenMetaverse.Animations.FINGER_WAG">
+            <summary>Agent wagging finger (disapproval)</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.SessionDrop">
-            <summary>Leave a session</summary>
+        <member name="F:OpenMetaverse.Animations.FIST_PUMP">
+            <summary>I'm not sure I want to know</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.MessageFromObject">
-            <summary>Indicates that the IM is from an object</summary>
+        <member name="F:OpenMetaverse.Animations.FLY">
+            <summary>Agent in superman position</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.BusyAutoResponse">
-            <summary>Sent an IM to a busy user, this is the auto response</summary>
+        <member name="F:OpenMetaverse.Animations.FLYSLOW">
+            <summary>Agent in superman position</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.ConsoleAndChatHistory">
-            <summary>Shows the message in the console and chat history</summary>
+        <member name="F:OpenMetaverse.Animations.HELLO">
+            <summary>Agent greeting another</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.RequestTeleport">
-            <summary>Send a teleport lure</summary>
+        <member name="F:OpenMetaverse.Animations.HOLD_BAZOOKA_R">
+            <summary>Agent holding bazooka (right handed)</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.AcceptTeleport">
-            <summary>Response sent to the agent which inititiated a teleport invitation</summary>
+        <member name="F:OpenMetaverse.Animations.HOLD_BOW_L">
+            <summary>Agent holding a bow (left handed)</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.DenyTeleport">
-            <summary>Response sent to the agent which inititiated a teleport invitation</summary>
+        <member name="F:OpenMetaverse.Animations.HOLD_HANDGUN_R">
+            <summary>Agent holding a handgun (right handed)</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GodLikeRequestTeleport">
-            <summary>Only useful if you have Linden permissions</summary>
+        <member name="F:OpenMetaverse.Animations.HOLD_RIFLE_R">
+            <summary>Agent holding a rifle (right handed)</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.RequestLure">
-            <summary>Request a teleport lure</summary>
+        <member name="F:OpenMetaverse.Animations.HOLD_THROW_R">
+            <summary>Agent throwing an object (right handed)</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GotoUrl">
-            <summary>IM to tell the user to go to an URL</summary>
+        <member name="F:OpenMetaverse.Animations.HOVER">
+            <summary>Agent in static hover</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.Session911Start">
-            <summary>IM for help</summary>
+        <member name="F:OpenMetaverse.Animations.HOVER_DOWN">
+            <summary>Agent hovering downward</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 name="F:OpenMetaverse.Animations.HOVER_UP">
+            <summary>Agent hovering upward</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.FromTaskAsAlert">
-            <summary>Like an IM but won't go to email</summary>
+        <member name="F:OpenMetaverse.Animations.IMPATIENT">
+            <summary>Agent being impatient</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNotice">
-            <summary>IM from a group officer to all group members</summary>
+        <member name="F:OpenMetaverse.Animations.JUMP">
+            <summary>Agent jumping</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNoticeInventoryAccepted">
-            <summary>Unknown</summary>
+        <member name="F:OpenMetaverse.Animations.JUMP_FOR_JOY">
+            <summary>Agent jumping with fervor</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNoticeInventoryDeclined">
-            <summary>Unknown</summary>
+        <member name="F:OpenMetaverse.Animations.KISS_MY_BUTT">
+            <summary>Agent point to lips then rear end</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupInvitationAccept">
-            <summary>Accept a group invitation</summary>
+        <member name="F:OpenMetaverse.Animations.LAND">
+            <summary>Agent landing from jump, finished flight, etc</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupInvitationDecline">
-            <summary>Decline a group invitation</summary>
+        <member name="F:OpenMetaverse.Animations.LAUGH_SHORT">
+            <summary>Agent laughing</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNoticeRequested">
-            <summary>Unknown</summary>
+        <member name="F:OpenMetaverse.Animations.MEDIUM_LAND">
+            <summary>Agent landing from jump, finished flight, etc</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipOffered">
-            <summary>An avatar is offering you friendship</summary>
+        <member name="F:OpenMetaverse.Animations.MOTORCYCLE_SIT">
+            <summary>Agent sitting on a motorcycle</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipAccepted">
-            <summary>An avatar has accepted your friendship offer</summary>
+        <member name="F:OpenMetaverse.Animations.MUSCLE_BEACH">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipDeclined">
-            <summary>An avatar has declined your friendship offer</summary>
+        <member name="F:OpenMetaverse.Animations.NO">
+            <summary>Agent moving head side to side</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.StartTyping">
-            <summary>Indicates that a user has started typing</summary>
+        <member name="F:OpenMetaverse.Animations.NO_UNHAPPY">
+            <summary>Agent moving head side to side with unhappy expression</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.StopTyping">
-            <summary>Indicates that a user has stopped typing</summary>
+        <member name="F:OpenMetaverse.Animations.NYAH_NYAH">
+            <summary>Agent taunting another</summary>
         </member>
-        <member name="T:OpenMetaverse.InstantMessageOnline">
-            <summary>
-            Flag in Instant Messages, whether the IM should be delivered to
-            offline avatars as well
-            </summary>
+        <member name="F:OpenMetaverse.Animations.ONETWO_PUNCH">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageOnline.Online">
-            <summary>Only deliver to online avatars</summary>
+        <member name="F:OpenMetaverse.Animations.PEACE">
+            <summary>Agent giving peace sign</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">
-            <summary>
-            Conversion type to denote Chat Packet types in an easier-to-understand format
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.ChatType.Whisper">
-            <summary>Whisper (5m radius)</summary>
+        <member name="F:OpenMetaverse.Animations.POINT_ME">
+            <summary>Agent pointing at self</summary>
         </member>
-        <member name="F:OpenMetaverse.ChatType.Normal">
-            <summary>Normal chat (10/20m radius), what the official viewer typically sends</summary>
+        <member name="F:OpenMetaverse.Animations.POINT_YOU">
+            <summary>Agent pointing at another</summary>
         </member>
-        <member name="F:OpenMetaverse.ChatType.Shout">
-            <summary>Shouting! (100m radius)</summary>
+        <member name="F:OpenMetaverse.Animations.PRE_JUMP">
+            <summary>Agent preparing for jump (bending knees)</summary>
         </member>
-        <member name="F:OpenMetaverse.ChatType.StartTyping">
-            <summary>Event message when an Avatar has begun to type</summary>
+        <member name="F:OpenMetaverse.Animations.PUNCH_LEFT">
+            <summary>Agent punching with left hand</summary>
         </member>
-        <member name="F:OpenMetaverse.ChatType.StopTyping">
-            <summary>Event message when an Avatar has stopped typing</summary>
+        <member name="F:OpenMetaverse.Animations.PUNCH_RIGHT">
+            <summary>Agent punching with right hand</summary>
         </member>
-        <member name="F:OpenMetaverse.ChatType.Debug">
-            <summary>Send the message to the debug channel</summary>
+        <member name="F:OpenMetaverse.Animations.REPULSED">
+            <summary>Agent acting repulsed</summary>
         </member>
-        <member name="F:OpenMetaverse.ChatType.OwnerSay">
-            <summary>Event message when an object uses llOwnerSay</summary>
+        <member name="F:OpenMetaverse.Animations.ROUNDHOUSE_KICK">
+            <summary>Agent trying to be Chuck Norris</summary>
         </member>
-        <member name="F:OpenMetaverse.ChatType.RegionSay">
-            <summary>Special value to support llRegionSay, never sent to the client</summary>
+        <member name="F:OpenMetaverse.Animations.RPS_COUNTDOWN">
+            <summary>Rocks, Paper, Scissors 1, 2, 3</summary>
         </member>
-        <member name="T:OpenMetaverse.ChatSourceType">
-            <summary>
-            Identifies the source of a chat message
-            </summary>
+        <member name="F:OpenMetaverse.Animations.RPS_PAPER">
+            <summary>Agent with hand flat over other hand</summary>
         </member>
-        <member name="F:OpenMetaverse.ChatSourceType.System">
-            <summary>Chat from the grid or simulator</summary>
+        <member name="F:OpenMetaverse.Animations.RPS_ROCK">
+            <summary>Agent with fist over other hand</summary>
         </member>
-        <member name="F:OpenMetaverse.ChatSourceType.Agent">
-            <summary>Chat from another avatar</summary>
+        <member name="F:OpenMetaverse.Animations.RPS_SCISSORS">
+            <summary>Agent with two fingers spread over other hand</summary>
         </member>
-        <member name="F:OpenMetaverse.ChatSourceType.Object">
-            <summary>Chat from an object</summary>
+        <member name="F:OpenMetaverse.Animations.RUN">
+            <summary>Agent running</summary>
         </member>
-        <member name="T:OpenMetaverse.ChatAudibleLevel">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.Animations.SAD">
+            <summary>Agent appearing sad</summary>
         </member>
-        <member name="F:OpenMetaverse.ChatAudibleLevel.Not">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.SALUTE">
+            <summary>Agent saluting</summary>
         </member>
-        <member name="F:OpenMetaverse.ChatAudibleLevel.Barely">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.SHOOT_BOW_L">
+            <summary>Agent shooting bow (left handed)</summary>
         </member>
-        <member name="F:OpenMetaverse.ChatAudibleLevel.Fully">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.SHOUT">
+            <summary>Agent cupping mouth as if shouting</summary>
         </member>
-        <member name="T:OpenMetaverse.EffectType">
-            <summary>
-            Effect type used in ViewerEffect packets
-            </summary>
+        <member name="F:OpenMetaverse.Animations.SHRUG">
+            <summary>Agent shrugging shoulders</summary>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Text">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.SIT">
+            <summary>Agent in sit position</summary>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Icon">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.SIT_FEMALE">
+            <summary>Agent in sit position (feminine)</summary>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Connector">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.SIT_GENERIC">
+            <summary>Agent in sit position (generic)</summary>
         </member>
-        <member name="F:OpenMetaverse.EffectType.FlexibleObject">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.SIT_GROUND">
+            <summary>Agent sitting on ground</summary>
         </member>
-        <member name="F:OpenMetaverse.EffectType.AnimalControls">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.SIT_GROUND_staticRAINED">
+            <summary>Agent sitting on ground</summary>
         </member>
-        <member name="F:OpenMetaverse.EffectType.AnimationObject">
+        <member name="F:OpenMetaverse.Animations.SIT_TO_STAND">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Cloth">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.SLEEP">
+            <summary>Agent sleeping on side</summary>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Beam">
-            <summary>Project a beam from a source to a destination, such as
-            the one used when editing an object</summary>
+        <member name="F:OpenMetaverse.Animations.SMOKE_IDLE">
+            <summary>Agent smoking</summary>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Glow">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.SMOKE_INHALE">
+            <summary>Agent inhaling smoke</summary>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Point">
+        <member name="F:OpenMetaverse.Animations.SMOKE_THROW_DOWN">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Trail">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.SNAPSHOT">
+            <summary>Agent taking a picture</summary>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Sphere">
-            <summary>Create a swirl of particles around an object</summary>
+        <member name="F:OpenMetaverse.Animations.STAND">
+            <summary>Agent standing</summary>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Spiral">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.STANDUP">
+            <summary>Agent standing up</summary>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Edit">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.STAND_1">
+            <summary>Agent standing</summary>
         </member>
-        <member name="F:OpenMetaverse.EffectType.LookAt">
-            <summary>Cause an avatar to look at an object</summary>
+        <member name="F:OpenMetaverse.Animations.STAND_2">
+            <summary>Agent standing</summary>
         </member>
-        <member name="F:OpenMetaverse.EffectType.PointAt">
-            <summary>Cause an avatar to point at an object</summary>
+        <member name="F:OpenMetaverse.Animations.STAND_3">
+            <summary>Agent standing</summary>
         </member>
-        <member name="T:OpenMetaverse.LookAtType">
-            <summary>
-            The action an avatar is doing when looking at something, used in 
-            ViewerEffect packets for the LookAt effect
-            </summary>
+        <member name="F:OpenMetaverse.Animations.STAND_4">
+            <summary>Agent standing</summary>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.None">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.STRETCH">
+            <summary>Agent stretching</summary>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Idle">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.STRIDE">
+            <summary>Agent in stride (fast walk)</summary>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.AutoListen">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.SURF">
+            <summary>Agent surfing</summary>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.FreeLook">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.SURPRISE">
+            <summary>Agent acting surprised</summary>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Respond">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.SWORD_STRIKE">
+            <summary>Agent striking with a sword</summary>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Hover">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.TALK">
+            <summary>Agent talking (lips moving)</summary>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Conversation">
-            <summary>Deprecated</summary>
+        <member name="F:OpenMetaverse.Animations.TANTRUM">
+            <summary>Agent throwing a tantrum</summary>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Select">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.THROW_R">
+            <summary>Agent throwing an object (right handed)</summary>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Focus">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.TRYON_SHIRT">
+            <summary>Agent trying on a shirt</summary>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Mouselook">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.TURNLEFT">
+            <summary>Agent turning to the left</summary>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Clear">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.TURNRIGHT">
+            <summary>Agent turning to the right</summary>
         </member>
-        <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 name="F:OpenMetaverse.Animations.TYPE">
+            <summary>Agent typing</summary>
         </member>
-        <member name="F:OpenMetaverse.PointAtType.None">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.WALK">
+            <summary>Agent walking</summary>
         </member>
-        <member name="F:OpenMetaverse.PointAtType.Select">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.WHISPER">
+            <summary>Agent whispering</summary>
         </member>
-        <member name="F:OpenMetaverse.PointAtType.Grab">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.WHISTLE">
+            <summary>Agent whispering with fingers in mouth</summary>
         </member>
-        <member name="F:OpenMetaverse.PointAtType.Clear">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.WINK">
+            <summary>Agent winking</summary>
         </member>
-        <member name="T:OpenMetaverse.MoneyTransactionType">
-            <summary>
-            Money transaction types
-            </summary>
+        <member name="F:OpenMetaverse.Animations.WINK_HOLLYWOOD">
+            <summary>Agent winking</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.None">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.WORRY">
+            <summary>Agent worried</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.FailSimulatorTimeout">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.YES">
+            <summary>Agent nodding yes</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.FailDataserverTimeout">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.YES_HAPPY">
+            <summary>Agent nodding yes with happy face</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectClaim">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Animations.YOGA_FLOAT">
+            <summary>Agent floating with legs and arms crossed</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandClaim">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Animations.ToDictionary">
+            <summary>
+            A dictionary containing all pre-defined animations
+            </summary>
+            <returns>A dictionary containing the pre-defined animations, 
+            where the key is the animations ID, and the value is a string
+            containing a name to identify the purpose of the animation</returns>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupCreate">
-            <summary></summary>
+        <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.MoneyTransactionType.ObjectPublicClaim">
-            <summary></summary>
+        <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.MoneyTransactionType.GroupJoin">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AgentThrottle.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            Constructor that decodes an existing AgentThrottle packet in to
+            individual values
+            </summary>
+            <param name="data">Reference to the throttle data in an AgentThrottle
+            packet</param>
+            <param name="pos">Offset position to start reading at in the 
+            throttle data</param>
+            <remarks>This is generally not needed in clients as the server will
+            never send a throttle packet to the client</remarks>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.TeleportCharge">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AgentThrottle.Set">
+            <summary>
+            Send an AgentThrottle packet to the current server using the 
+            current values
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.UploadCharge">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AgentThrottle.Set(OpenMetaverse.Simulator)">
+            <summary>
+            Send an AgentThrottle packet to the specified server using the 
+            current values
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandAuction">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AgentThrottle.ToBytes">
+            <summary>
+            Convert the current throttle values to a byte array that can be put
+            in an AgentThrottle packet
+            </summary>
+            <returns>Byte array containing all the throttle values</returns>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ClassifiedCharge">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Resend">
+            <summary>Maximum bits per second for resending unacknowledged packets</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectTax">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Land">
+            <summary>Maximum bits per second for LayerData terrain</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandTax">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Wind">
+            <summary>Maximum bits per second for LayerData wind data</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LightTax">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Cloud">
+            <summary>Maximum bits per second for LayerData clouds</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ParcelDirFee">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Task">
+            <summary>Unknown, includes object data</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupTax">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Texture">
+            <summary>Maximum bits per second for textures</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ClassifiedRenew">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Asset">
+            <summary>Maximum bits per second for downloaded assets</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GiveInventory">
-            <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.MoneyTransactionType.ObjectSale">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Voice.VoiceSession">
+            <summary>
+            Represents a single Voice Session to the Vivox service.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.Gift">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Voice.VoiceSession.Close">
+            <summary>
+            Close this session.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandSale">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Voice.VoiceSession.FindParticipant(System.String)">
+            <summary>
+            Look up an existing Participants in this session
+            </summary>
+            <param name="puri"></param>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ReferBonus">
+        <member name="M:OpenMetaverse.Voice.VoiceParticipant.IDFromName(System.String)">
+            <summary>
+            Extract the avatar UUID encoded in a SIP URI
+            </summary>
+            <param name="inName"></param>
+            <returns></returns>
+        </member>
+        <member name="T:OpenMetaverse.MediaPermission">
+            <summary>
+            Permissions for control of object media
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.MediaControls">
+            <summary>
+            Style of cotrols that shold be displayed to the user
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.MediaEntry">
+            <summary>
+            Class representing media data for a single face
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.EnableAlterntiveImage">
+            <summary>Is display of the alternative image enabled</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.AutoLoop">
+            <summary>Should media auto loop</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.AutoPlay">
+            <summary>Shoule media be auto played</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.AutoScale">
+            <summary>Auto scale media to prim face</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.AutoZoom">
+            <summary>Should viewer automatically zoom in on the face when clicked</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.InteractOnFirstClick">
+            <summary>Should viewer interpret first click as interaction with the media
+            or when false should the first click be treated as zoom in commadn</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.Controls">
+            <summary>Style of controls viewer should display when
+            viewer media on this face</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.HomeURL">
+            <summary>Starting URL for the media</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.CurrentURL">
+            <summary>Currently navigated URL</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.Height">
+            <summary>Media height in pixes</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.Width">
+            <summary>Media width in pixels</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.ControlPermissions">
+            <summary>Who can controls the media</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.InteractPermissions">
+            <summary>Who can interact with the media</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.EnableWhiteList">
+            <summary>Is URL whitelist enabled</summary>
+        </member>
+        <member name="F:OpenMetaverse.MediaEntry.WhiteList">
+            <summary>Array of URLs that are whitelisted</summary>
+        </member>
+        <member name="M:OpenMetaverse.MediaEntry.GetOSD">
+            <summary>
+            Serialize to OSD
+            </summary>
+            <returns>OSDMap with the serialized data</returns>
+        </member>
+        <member name="M:OpenMetaverse.MediaEntry.FromOSD(OpenMetaverse.StructuredData.OSD)">
+            <summary>
+            Deserialize from OSD data
+            </summary>
+            <param name="osd">Serialized OSD data</param>
+            <returns>Deserialized object</returns>
+        </member>
+        <member name="T:OpenMetaverse.Primitive">
+            <summary>
+            Particle system specific enumerators, flags and methods.
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.MediaVersion">
+            <summary>
+            Current version of the media data for the prim
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.FaceMedia">
+            <summary>
+            Array of media entries indexed by face number
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.Textures">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.InventorySale">
+        <member name="F:OpenMetaverse.Primitive.TextureAnim">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.RefundPurchase">
+        <member name="F:OpenMetaverse.Primitive.ID">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandPassSale">
+        <member name="F:OpenMetaverse.Primitive.GroupID">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.DwellBonus">
+        <member name="F:OpenMetaverse.Primitive.LocalID">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.PayObject">
+        <member name="F:OpenMetaverse.Primitive.ParentID">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPays">
+        <member name="F:OpenMetaverse.Primitive.RegionHandle">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupLandDeed">
+        <member name="F:OpenMetaverse.Primitive.Flags">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupObjectDeed">
+        <member name="F:OpenMetaverse.Primitive.TreeSpecies">
+            <summary>Foliage type for this primitive. Only applicable if this
+            primitive is foliage</summary>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.ScratchPad">
+            <summary>Unknown</summary>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.Position">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupLiability">
+        <member name="F:OpenMetaverse.Primitive.Scale">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupDividend">
+        <member name="F:OpenMetaverse.Primitive.Rotation">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupMembershipDues">
+        <member name="F:OpenMetaverse.Primitive.Velocity">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectRelease">
+        <member name="F:OpenMetaverse.Primitive.AngularVelocity">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandRelease">
+        <member name="F:OpenMetaverse.Primitive.Acceleration">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectDelete">
+        <member name="F:OpenMetaverse.Primitive.CollisionPlane">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicDecay">
+        <member name="F:OpenMetaverse.Primitive.Flexible">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicDelete">
+        <member name="F:OpenMetaverse.Primitive.Light">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LindenAdjustment">
+        <member name="F:OpenMetaverse.Primitive.LightMap">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LindenGrant">
+        <member name="F:OpenMetaverse.Primitive.Sculpt">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LindenPenalty">
+        <member name="F:OpenMetaverse.Primitive.ClickAction">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.EventFee">
+        <member name="F:OpenMetaverse.Primitive.Sound">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.EventPrize">
+        <member name="F:OpenMetaverse.Primitive.OwnerID">
+            <summary>Identifies the owner if audio or a particle system is
+            active</summary>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.SoundFlags">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendBasic">
+        <member name="F:OpenMetaverse.Primitive.SoundGain">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendDeveloper">
+        <member name="F:OpenMetaverse.Primitive.SoundRadius">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendAlways">
+        <member name="F:OpenMetaverse.Primitive.Text">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendDaily">
+        <member name="F:OpenMetaverse.Primitive.TextColor">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendRating">
+        <member name="F:OpenMetaverse.Primitive.MediaURL">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendDelta">
+        <member name="F:OpenMetaverse.Primitive.Joint">
             <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.TransactionFlags">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.TransactionFlags.None">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.TransactionFlags.SourceGroup">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.TransactionFlags.DestGroup">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.TransactionFlags.OwnerGroup">
+        <member name="F:OpenMetaverse.Primitive.JointPivot">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.SimultaneousContribution">
+        <member name="F:OpenMetaverse.Primitive.JointAxisOrAnchor">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.ContributionRemoval">
+        <member name="F:OpenMetaverse.Primitive.NameValues">
             <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.MeanCollisionType">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.None">
+        <member name="F:OpenMetaverse.Primitive.PrimData">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.Bump">
+        <member name="F:OpenMetaverse.Primitive.Properties">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.LLPushObject">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.PhysicsProps">
+            <summary>Objects physics engine propertis</summary>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.SelectedObjectCollide">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.Tag">
+            <summary>Extra data about primitive</summary>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.ScriptedObjectCollide">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.IsAttachment">
+            <summary>Indicates if prim is attached to an avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.PhysicalObjectCollide">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.ActiveClients">
+            <summary>Number of clients referencing this prim</summary>
         </member>
-        <member name="T:OpenMetaverse.ScriptControlChange">
+        <member name="M:OpenMetaverse.Primitive.#ctor">
             <summary>
-            Flags sent when a script takes or releases a control
+            Default constructor
             </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>
-        <member name="F:OpenMetaverse.ScriptControlChange.Forward">
-            <summary>Forward (W or up Arrow)</summary>
-        </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Back">
-            <summary>Back (S or down arrow)</summary>
-        </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Left">
-            <summary>Move left (shift+A or left arrow)</summary>
-        </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Right">
-            <summary>Move right (shift+D or right arrow)</summary>
-        </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Up">
-            <summary>Up (E or PgUp)</summary>
-        </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Down">
-            <summary>Down (C or PgDown)</summary>
-        </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.RotateLeft">
-            <summary>Rotate left (A or left arrow)</summary>
-        </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.RotateRight">
-            <summary>Rotate right (D or right arrow)</summary>
-        </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.LeftButton">
-            <summary>Left Mouse Button</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.MouseLookLeftButton">
-            <summary>Left Mouse button in MouseLook</summary>
-        </member>
-        <member name="T:OpenMetaverse.AgentFlags">
+        <member name="M:OpenMetaverse.Primitive.PackPathTwist(System.Single)">
             <summary>
-            Currently only used to hide your group title
+            Packs PathTwist, PathTwistBegin, PathRadiusOffset, and PathSkew
+            parameters in to signed eight bit values
             </summary>
+            <param name="pathTwist">Floating point parameter to pack</param>
+            <returns>Signed eight bit value containing the packed parameter</returns>
         </member>
-        <member name="F:OpenMetaverse.AgentFlags.None">
-            <summary>No flags set</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentFlags.HideTitle">
-            <summary>Hide your group title</summary>
-        </member>
-        <member name="T:OpenMetaverse.AgentState">
+        <member name="M:OpenMetaverse.Primitive.UnpackPathTwist(System.SByte)">
             <summary>
-            Action state of the avatar, which can currently be typing and
-            editing
+            Unpacks PathTwist, PathTwistBegin, PathRadiusOffset, and PathSkew
+            parameters from signed eight bit integers to floating point values
             </summary>
+            <param name="pathTwist">Signed eight bit value to unpack</param>
+            <returns>Unpacked floating point value</returns>
         </member>
-        <member name="F:OpenMetaverse.AgentState.None">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentState.Typing">
+        <member name="F:OpenMetaverse.Primitive.ParticleSys">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AgentState.Editing">
-            <summary></summary>
+        <member name="P:OpenMetaverse.Primitive.Type">
+            <summary>Uses basic heuristics to estimate the primitive shape</summary>
         </member>
-        <member name="T:OpenMetaverse.TeleportStatus">
+        <member name="T:OpenMetaverse.Primitive.TextureAnimMode">
             <summary>
-            Current teleport status
+            Texture animation mode
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportStatus.None">
-            <summary>Unknown status</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ANIM_OFF">
+            <summary>Disable texture animation</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Start">
-            <summary>Teleport initialized</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ANIM_ON">
+            <summary>Enable texture animation</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Progress">
-            <summary>Teleport in progress</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.LOOP">
+            <summary>Loop when animating textures</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Failed">
-            <summary>Teleport failed</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.REVERSE">
+            <summary>Animate in reverse direction</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Finished">
-            <summary>Teleport completed</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.PING_PONG">
+            <summary>Animate forward then reverse</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Cancelled">
-            <summary>Teleport cancelled</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.SMOOTH">
+            <summary>Slide texture smoothly instead of frame-stepping</summary>
         </member>
-        <member name="T:OpenMetaverse.TeleportFlags">
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ROTATE">
+            <summary>Rotate texture instead of using frames</summary>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.SCALE">
+            <summary>Scale texture instead of using frames</summary>
+        </member>
+        <member name="T:OpenMetaverse.Primitive.TextureEntryFace">
             <summary>
-            
+            A single textured face. Don't instantiate this class yourself, use the
+            methods in TextureEntry
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.Default">
-            <summary>No flags set, or teleport failed</summary>
+        <member name="M:OpenMetaverse.Primitive.TextureEntryFace.#ctor(OpenMetaverse.Primitive.TextureEntryFace)">
+            <summary>
+            Contains the definition for individual faces
+            </summary>
+            <param name="defaultTexture"></param>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.SetHomeToTarget">
-            <summary>Set when newbie leaves help island for first time</summary>
+        <member name="M:OpenMetaverse.Primitive.TextureEntryFace.ToString">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.SetLastToTarget">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.material">
             <summary></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>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaTelehub">
-            <summary>Via Telehub</summary>
-        </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaLogin">
-            <summary>Via Login</summary>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.media">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaGodlikeLure">
-            <summary>Linden Summoned</summary>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RGBA">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.Godlike">
-            <summary>Linden Forced me</summary>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RepeatU">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.NineOneOne">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RepeatV">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.DisableCancel">
-            <summary>Agent Teleported Home via Script</summary>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.OffsetU">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaRegionID">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.OffsetV">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.IsFlying">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Rotation">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ResetHome">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Glow">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ForceRedirect">
-            <summary>forced to new location for example when avatar is banned or ejected</summary>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Bump">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaLure">
-            <summary>Teleport Finished via a Lure</summary>
+        <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="F:OpenMetaverse.TeleportFlags.FinishedViaNewSim">
-            <summary>Finished, Sim Changed</summary>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.TextureID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaSameSim">
-            <summary>Finished, Same Sim</summary>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.MaterialID">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.TeleportLureFlags">
+        <member name="T:OpenMetaverse.Primitive.TextureEntry">
             <summary>
-            
+            Represents all of the texturable faces for an object
             </summary>
+            <remarks>Grid objects have infinite faces, with each face
+            using the properties of the default face unless set otherwise. So if
+            you have a TextureEntry with a default texture uuid of X, and face 18
+            has a texture UUID of Y, every face would be textured with X except for
+            face 18 that uses Y. In practice however, primitives utilize a maximum
+            of nine faces</remarks>
         </member>
-        <member name="F:OpenMetaverse.TeleportLureFlags.NormalLure">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.TeleportLureFlags.GodlikeLure">
+        <member name="F:OpenMetaverse.Primitive.TextureEntry.DefaultTexture">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportLureFlags.GodlikePursuit">
+        <member name="F:OpenMetaverse.Primitive.TextureEntry.FaceTextures">
             <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.ScriptSensorTypeFlags">
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(OpenMetaverse.UUID)">
             <summary>
-            
+            Constructor that takes a default texture UUID
             </summary>
+            <param name="defaultTextureID">Texture UUID to use as the default texture</param>
         </member>
-        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Agent">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(OpenMetaverse.Primitive.TextureEntryFace)">
+            <summary>
+            Constructor that takes a <code>TextureEntryFace</code> for the
+            default face
+            </summary>
+            <param name="defaultFace">Face to use as the default face</param>
         </member>
-        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Active">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Passive">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Scripted">
-            <summary></summary>
-        </member>
-        <member name="T:OpenMetaverse.MuteType">
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(System.Byte[],System.Int32,System.Int32)">
             <summary>
-            Type of mute entry
+            Constructor that creates the TextureEntry class from a byte array
             </summary>
+            <param name="data">Byte array containing the TextureEntry field</param>
+            <param name="pos">Starting position of the TextureEntry field in 
+            the byte array</param>
+            <param name="length">Length of the TextureEntry field, in bytes</param>
         </member>
-        <member name="F:OpenMetaverse.MuteType.ByName">
-            <summary>Object muted by name</summary>
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.CreateFace(System.UInt32)">
+            <summary>
+            This will either create a new face if a custom face for the given
+            index is not defined, or return the custom face for that index if
+            it already exists
+            </summary>
+            <param name="index">The index number of the face to create or 
+            retrieve</param>
+            <returns>A TextureEntryFace containing all the properties for that
+            face</returns>
         </member>
-        <member name="F:OpenMetaverse.MuteType.Resident">
-            <summary>Muted residet</summary>
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetFace(System.UInt32)">
+            <summary>
+            
+            </summary>
+            <param name="index"></param>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.MuteType.Object">
-            <summary>Object muted by UUID</summary>
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetOSD">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.MuteType.Group">
-            <summary>Muted group</summary>
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetBytes">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.MuteType.External">
-            <summary>Muted external entry</summary>
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.ToString">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.MuteFlags">
+        <member name="T:OpenMetaverse.Primitive.TextureAnimation">
             <summary>
-            Flags of mute entry
+            Controls the texture animation of a particular prim
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MuteFlags.Default">
-            <summary>No exceptions</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Flags">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MuteFlags.TextChat">
-            <summary>Don't mute text chat</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Face">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MuteFlags.VoiceChat">
-            <summary>Don't mute voice chat</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.SizeX">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MuteFlags.Particles">
-            <summary>Don't mute particles</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.SizeY">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MuteFlags.ObjectSounds">
-            <summary>Don't mute sounds</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Start">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MuteFlags.All">
-            <summary>Don't mute</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Length">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InstantMessage">
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Rate">
+            <summary></summary>
+        </member>
+        <member name="M:OpenMetaverse.Primitive.TextureAnimation.#ctor(System.Byte[],System.Int32)">
             <summary>
-            Instant Message
+            
             </summary>
+            <param name="data"></param>
+            <param name="pos"></param>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.FromAgentID">
-            <summary>Key of sender</summary>
+        <member name="M:OpenMetaverse.Primitive.TextureAnimation.GetBytes">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.FromAgentName">
-            <summary>Name of sender</summary>
+        <member name="T:OpenMetaverse.Primitive.ConstructionData">
+            <summary>
+            Parameters used to construct a visual representation of a primitive
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.ToAgentID">
-            <summary>Key of destination avatar</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.profileCurve">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.ParentEstateID">
-            <summary>ID of originating estate</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathCurve">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.RegionID">
-            <summary>Key of originating region</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathEnd">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.Position">
-            <summary>Coordinates in originating region</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathRadiusOffset">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.Dialog">
-            <summary>Instant message type</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathSkew">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.GroupIM">
-            <summary>Group IM session toggle</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathScaleX">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.IMSessionID">
-            <summary>Key of IM session, for Group Messages, the groups UUID</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathScaleY">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.Timestamp">
-            <summary>Timestamp of the instant message</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathShearX">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.Message">
-            <summary>Instant message text</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathShearY">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.Offline">
-            <summary>Whether this message is held for offline avatars</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTaperX">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.BinaryBucket">
-            <summary>Context specific packed data</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTaperY">
+            <summary></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="F:OpenMetaverse.Primitive.ConstructionData.PathBegin">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.MuteEntry">
-            <summary>Represents muted object or resident</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTwist">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MuteEntry.Type">
-            <summary>Type of the mute entry</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTwistBegin">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MuteEntry.ID">
-            <summary>UUID of the mute etnry</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathRevolutions">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MuteEntry.Name">
-            <summary>Mute entry name</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileBegin">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MuteEntry.Flags">
-            <summary>Mute flags</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileEnd">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.TransactionInfo">
-            <summary>Transaction detail sent with MoneyBalanceReply message</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileHollow">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionInfo.TransactionType">
-            <summary>Type of the transaction</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.Material">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionInfo.SourceID">
-            <summary>UUID of the transaction source</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.State">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionInfo.IsSourceGroup">
-            <summary>Is the transaction source a group</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PCode">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionInfo.DestID">
-            <summary>UUID of the transaction destination</summary>
+        <member name="M:OpenMetaverse.Primitive.ConstructionData.GetHashCode">
+            <summary>
+            Calculdates hash code for prim construction data
+            </summary>
+            <returns>The has</returns>
         </member>
-        <member name="F:OpenMetaverse.TransactionInfo.IsDestGroup">
-            <summary>Is transaction destination a group</summary>
+        <member name="P:OpenMetaverse.Primitive.ConstructionData.AttachmentPoint">
+            <summary>Attachment point to an avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionInfo.Amount">
-            <summary>Transaction amount</summary>
+        <member name="P:OpenMetaverse.Primitive.ConstructionData.ProfileCurve">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionInfo.ItemDescription">
-            <summary>Transaction description</summary>
+        <member name="P:OpenMetaverse.Primitive.ConstructionData.ProfileHole">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.ChatEventArgs">
-            <summary>
-            
-            </summary>
+        <member name="P:OpenMetaverse.Primitive.ConstructionData.PathBeginScale">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ChatEventArgs.#ctor(OpenMetaverse.Simulator,System.String,OpenMetaverse.ChatAudibleLevel,OpenMetaverse.ChatType,OpenMetaverse.ChatSourceType,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Vector3)">
+        <member name="P:OpenMetaverse.Primitive.ConstructionData.PathEndScale">
+            <summary></summary>
+        </member>
+        <member name="T:OpenMetaverse.Primitive.FlexibleData">
             <summary>
-            Construct a new instance of the ChatEventArgs object
+            Information on the flexible properties of a primitive
             </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.Primitive.FlexibleData.Softness">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.Message">
-            <summary>Get the message sent</summary>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Gravity">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.AudibleLevel">
-            <summary>Get the audible level of the message</summary>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Drag">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.Type">
-            <summary>Get the type of message sent: whisper, shout, etc</summary>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Wind">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.SourceType">
-            <summary>Get the source type of the message sender</summary>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Tension">
+            <summary></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.Primitive.FlexibleData.Force">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.SourceID">
-            <summary>Get the ID of the agent or object sending the message</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>
-        <member name="P:OpenMetaverse.ChatEventArgs.Position">
-            <summary>Get the position of the agent or object sending the message</summary>
-        </member>
-        <member name="T:OpenMetaverse.ScriptDialogEventArgs">
-            <summary>Contains the data sent when a primitive opens a dialog with this agent</summary>
-        </member>
-        <member name="M:OpenMetaverse.ScriptDialogEventArgs.#ctor(System.String,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.String,System.Int32,System.Collections.Generic.List{System.String},OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Primitive.FlexibleData.#ctor">
             <summary>
-            Construct a new instance of the ScriptDialogEventArgs
+            Default constructor
             </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="P:OpenMetaverse.ScriptDialogEventArgs.Message">
-            <summary>Get the dialog message</summary>
-        </member>
-        <member name="P:OpenMetaverse.ScriptDialogEventArgs.ObjectName">
-            <summary>Get the name of the object that sent the dialog request</summary>
-        </member>
-        <member name="P:OpenMetaverse.ScriptDialogEventArgs.ImageID">
-            <summary>Get the ID of the image to be displayed</summary>
-        </member>
-        <member name="P:OpenMetaverse.ScriptDialogEventArgs.ObjectID">
-            <summary>Get the ID of the primitive sending the dialog</summary>
-        </member>
-        <member name="P:OpenMetaverse.ScriptDialogEventArgs.FirstName">
-            <summary>Get the first name of the senders owner</summary>
-        </member>
-        <member name="P:OpenMetaverse.ScriptDialogEventArgs.LastName">
-            <summary>Get the last name of the senders owner</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>
-        <member name="P:OpenMetaverse.ScriptDialogEventArgs.ButtonLabels">
-            <summary>Get the string labels containing the options presented in this dialog</summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptDialogEventArgs.OwnerID">
-            <summary>UUID of the scritped object owner</summary>
+        <member name="M:OpenMetaverse.Primitive.FlexibleData.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            
+            </summary>
+            <param name="data"></param>
+            <param name="pos"></param>
         </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="M:OpenMetaverse.Primitive.FlexibleData.GetBytes">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.ScriptQuestionEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.ScriptPermission)">
+        <member name="M:OpenMetaverse.Primitive.FlexibleData.GetOSD">
             <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>
+            <returns></returns>
         </member>
-        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.Simulator">
-            <summary>Get the simulator containing the object sending the request</summary>
+        <member name="T:OpenMetaverse.Primitive.LightData">
+            <summary>
+            Information on the light properties of a primitive
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.TaskID">
-            <summary>Get the ID of the script making the request</summary>
+        <member name="F:OpenMetaverse.Primitive.LightData.Color">
+            <summary></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.Primitive.LightData.Intensity">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.ObjectName">
-            <summary>Get the name of the primitive making the request</summary>
+        <member name="F:OpenMetaverse.Primitive.LightData.Radius">
+            <summary></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.Primitive.LightData.Cutoff">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.Questions">
-            <summary>Get the permissions being requested</summary>
+        <member name="F:OpenMetaverse.Primitive.LightData.Falloff">
+            <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="M:OpenMetaverse.Primitive.LightData.#ctor">
+            <summary>
+            Default constructor
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.LoadUrlEventArgs.#ctor(System.String,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.String,System.String)">
+        <member name="M:OpenMetaverse.Primitive.LightData.#ctor(System.Byte[],System.Int32)">
             <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>
+            <param name="data"></param>
+            <param name="pos"></param>
         </member>
-        <member name="P:OpenMetaverse.LoadUrlEventArgs.ObjectName">
-            <summary>Get the name of the object sending the request</summary>
+        <member name="M:OpenMetaverse.Primitive.LightData.GetBytes">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="P:OpenMetaverse.LoadUrlEventArgs.ObjectID">
-            <summary>Get the ID of the object sending the request</summary>
+        <member name="M:OpenMetaverse.Primitive.LightData.ToString">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="P:OpenMetaverse.LoadUrlEventArgs.OwnerID">
-            <summary>Get the ID of the owner of the object sending the request</summary>
+        <member name="T:OpenMetaverse.Primitive.LightImage">
+            <summary>
+            Information on the light properties of a primitive as texture map
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.LoadUrlEventArgs.OwnerIsGroup">
-            <summary>True if the object is owned by a group</summary>
+        <member name="F:OpenMetaverse.Primitive.LightImage.LightTexture">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.LoadUrlEventArgs.Message">
-            <summary>Get the message sent with the request</summary>
+        <member name="F:OpenMetaverse.Primitive.LightImage.Params">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.LoadUrlEventArgs.URL">
-            <summary>Get the URL the object sent</summary>
+        <member name="M:OpenMetaverse.Primitive.LightImage.#ctor">
+            <summary>
+            Default constructor
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.InstantMessageEventArgs">
-            <summary>The date received from an ImprovedInstantMessage</summary>
+        <member name="M:OpenMetaverse.Primitive.LightImage.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            
+            </summary>
+            <param name="data"></param>
+            <param name="pos"></param>
         </member>
-        <member name="M:OpenMetaverse.InstantMessageEventArgs.#ctor(OpenMetaverse.InstantMessage,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.Primitive.LightImage.GetBytes">
             <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>
+            <returns></returns>
         </member>
-        <member name="P:OpenMetaverse.InstantMessageEventArgs.IM">
-            <summary>Get the InstantMessage object</summary>
+        <member name="M:OpenMetaverse.Primitive.LightImage.ToString">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="P:OpenMetaverse.InstantMessageEventArgs.Simulator">
-            <summary>Get the simulator where the InstantMessage origniated</summary>
+        <member name="T:OpenMetaverse.Primitive.SculptData">
+            <summary>
+            Information on the sculpt properties of a sculpted primitive
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.BalanceEventArgs">
-            <summary>Contains the currency balance</summary>
+        <member name="M:OpenMetaverse.Primitive.SculptData.#ctor">
+            <summary>
+            Default constructor
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.BalanceEventArgs.#ctor(System.Int32)">
+        <member name="M:OpenMetaverse.Primitive.SculptData.#ctor(System.Byte[],System.Int32)">
             <summary>
-            Construct a new BalanceEventArgs object
+            
             </summary>
-            <param name="balance">The currenct balance</param>
+            <param name="data"></param>
+            <param name="pos"></param>
         </member>
-        <member name="P:OpenMetaverse.BalanceEventArgs.Balance">
+        <member name="P:OpenMetaverse.Primitive.SculptData.Invert">
             <summary>
-            Get the currenct balance
+            Render inside out (inverts the normals).
             </summary>
         </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="P:OpenMetaverse.Primitive.SculptData.Mirror">
+            <summary>
+            Render an X axis mirror of the sculpty.
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.MoneyBalanceReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Boolean,System.Int32,System.Int32,System.Int32,System.String,OpenMetaverse.TransactionInfo)">
+        <member name="T:OpenMetaverse.Primitive.ObjectProperties">
             <summary>
-            Construct a new instance of the MoneyBalanceReplyEventArgs object
+            Extended properties to describe an 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="P:OpenMetaverse.MoneyBalanceReplyEventArgs.TransactionID">
-            <summary>Get the ID of the transaction</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.ObjectID">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.Success">
-            <summary>True of the transaction was successful</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.CreatorID">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.Balance">
-            <summary>Get the remaining currency balance</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.OwnerID">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.MetersCredit">
-            <summary>Get the meters credited</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.GroupID">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.MetersCommitted">
-            <summary>Get the meters comitted</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.CreationDate">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.Description">
-            <summary>Get the description of the transaction</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Permissions">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.TransactionInfo">
-            <summary>Detailed transaction information</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.OwnershipCost">
+            <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="F:OpenMetaverse.Primitive.ObjectProperties.SaleType">
+            <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>
-        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.FirstName">
-            <summary>Get the agents first name</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.LastName">
-            <summary>Get the agents last name</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.ActiveGroupID">
-            <summary>Get the active group ID of your agent</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SalePrice">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.GroupTitle">
-            <summary>Get the active groups title of your agent</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePerms">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.GroupPowers">
-            <summary>Get the combined group powers of your agent</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePermTextures">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.GroupName">
-            <summary>Get the active group name of your agent</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePermTexturesOwner">
+            <summary></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="F:OpenMetaverse.Primitive.ObjectProperties.Category">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.Primitive.ObjectProperties.InventorySerial">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.AnimationsChangedEventArgs.Animations">
-            <summary>Get the dictionary that contains the changed animations</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.ItemID">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.MeanCollisionEventArgs">
-            <summary>
-            Data sent from a simulator indicating a collision with your agent
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.FolderID">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.Primitive.ObjectProperties.FromTaskID">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Type">
-            <summary>Get the Type of collision</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.LastOwnerID">
+            <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="F:OpenMetaverse.Primitive.ObjectProperties.Name">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Victim">
-            <summary>Get the ID of the agent that was attacked</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Description">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Magnitude">
-            <summary>A value indicating the strength of the collision</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.TouchName">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Time">
-            <summary>Get the time the collision occurred</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SitName">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.RegionCrossedEventArgs">
-            <summary>Data sent to your agent when it crosses region boundaries</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.TextureIDs">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.RegionCrossedEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.Primitive.ObjectProperties.#ctor">
             <summary>
-            Construct a new instance of the RegionCrossedEventArgs class
+            Default constructor
             </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>
-        <member name="P:OpenMetaverse.RegionCrossedEventArgs.NewSimulator">
-            <summary>Get the simulator your agent is now in</summary>
-        </member>
-        <member name="T:OpenMetaverse.GroupChatJoinedEventArgs">
-            <summary>Data sent from the simulator when your agent joins a group chat session</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupChatJoinedEventArgs.#ctor(OpenMetaverse.UUID,System.String,OpenMetaverse.UUID,System.Boolean)">
+        <member name="M:OpenMetaverse.Primitive.ObjectProperties.SetFamilyProperties(OpenMetaverse.Primitive.ObjectProperties)">
             <summary>
-            Construct a new instance of the GroupChatJoinedEventArgs class
+            Set the properties that are set in an ObjectPropertiesFamily packet
             </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>
-        </member>
-        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.SessionName">
-            <summary>Get the name of the session</summary>
-        </member>
-        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.TmpSessionID">
-            <summary>Get the temporary session ID used for establishing new sessions</summary>
-        </member>
-        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.Success">
-            <summary>True if your agent successfully joined the session</summary>
-        </member>
-        <member name="T:OpenMetaverse.AlertMessageEventArgs">
-            <summary>Data sent by the simulator containing urgent messages</summary>
+            <param name="props"><seealso cref="T:OpenMetaverse.Primitive.ObjectProperties"/> that has
+            been partially filled by an ObjectPropertiesFamily packet</param>
         </member>
-        <member name="M:OpenMetaverse.AlertMessageEventArgs.#ctor(System.String)">
+        <member name="T:OpenMetaverse.Primitive.PhysicsProperties">
             <summary>
-            Construct a new instance of the AlertMessageEventArgs class
+            Describes physics attributes of the prim
             </summary>
-            <param name="message">The alert message</param>
-        </member>
-        <member name="P:OpenMetaverse.AlertMessageEventArgs.Message">
-            <summary>Get the alert message</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.Primitive.PhysicsProperties.LocalID">
+            <summary>Primitive's local ID</summary>
         </member>
-        <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 name="F:OpenMetaverse.Primitive.PhysicsProperties.Density">
+            <summary>Density (1000 for normal density)</summary>
         </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="F:OpenMetaverse.Primitive.PhysicsProperties.Friction">
+            <summary>Friction</summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptControlEventArgs.Pass">
-            <summary>True if the script is passing controls back to the agent</summary>
+        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.GravityMultiplier">
+            <summary>Gravity multiplier (1 for normal gravity) </summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptControlEventArgs.Take">
-            <summary>True if the script is requesting controls be released to the script</summary>
+        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.PhysicsShapeType">
+            <summary>Type of physics representation of this primitive in the simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.CameraConstraintEventArgs">
-            <summary>
-            Data sent from the simulator to an agent to indicate its view limits
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.Restitution">
+            <summary>Restitution</summary>
         </member>
-        <member name="M:OpenMetaverse.CameraConstraintEventArgs.#ctor(OpenMetaverse.Vector4)">
+        <member name="M:OpenMetaverse.Primitive.PhysicsProperties.FromOSD(OpenMetaverse.StructuredData.OSD)">
             <summary>
-            Construct a new instance of the CameraConstraintEventArgs class
+            Creates PhysicsProperties from OSD
             </summary>
-            <param name="collidePlane">The collision plane</param>
-        </member>
-        <member name="P:OpenMetaverse.CameraConstraintEventArgs.CollidePlane">
-            <summary>Get the collision plane</summary>
+            <param name="osd">OSDMap with incoming data</param>
+            <returns>Deserialized PhysicsProperties object</returns>
         </member>
-        <member name="T:OpenMetaverse.ScriptSensorReplyEventArgs">
+        <member name="M:OpenMetaverse.Primitive.PhysicsProperties.GetOSD">
             <summary>
-            Data containing script sensor requests which allow an agent to know the specific details
-            of a primitive sending script sensor requests
+            Serializes PhysicsProperties to OSD
             </summary>
+            <returns>OSDMap with serialized PhysicsProperties data</returns>
         </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="T:OpenMetaverse.Primitive.ParticleSystem">
             <summary>
-            Construct a new instance of the ScriptSensorReplyEventArgs
+            Complete structure for the particle system
             </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="P:OpenMetaverse.ScriptSensorReplyEventArgs.RequestorID">
-            <summary>Get the ID of the primitive sending the sensor</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartFlags">
+            <summary>Particle Flags</summary>
+            <remarks>There appears to be more data packed in to this area
+            for many particle systems. It doesn't appear to be flag values
+            and serialization breaks unless there is a flag for every
+            possible bit so it is left as an unsigned integer</remarks>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.GroupID">
-            <summary>Get the ID of the group associated with the primitive</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.Pattern">
+            <summary><seealso cref="T:SourcePattern"/> pattern of particles</summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Name">
-            <summary>Get the name of the primitive sending the sensor</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.MaxAge">
+            <summary>A <see langword="float"/> representing the maximimum age (in seconds) particle will be displayed</summary>
+            <remarks>Maximum value is 30 seconds</remarks>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.ObjectID">
-            <summary>Get the ID of the primitive sending the sensor</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.StartAge">
+            <summary>A <see langword="float"/> representing the number of seconds, 
+            from when the particle source comes into view, 
+            or the particle system's creation, that the object will emits particles; 
+            after this time period no more particles are emitted</summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.OwnerID">
-            <summary>Get the ID of the owner of the primitive sending the sensor</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.InnerAngle">
+            <summary>A <see langword="float"/> in radians that specifies where particles will not be created</summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Position">
-            <summary>Get the position of the primitive sending the sensor</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.OuterAngle">
+            <summary>A <see langword="float"/> in radians that specifies where particles will be created</summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Range">
-            <summary>Get the range the primitive specified to scan</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstRate">
+            <summary>A <see langword="float"/> representing the number of seconds between burts.</summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Rotation">
-            <summary>Get the rotation of the primitive sending the sensor</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstRadius">
+            <summary>A <see langword="float"/> representing the number of meters
+            around the center of the source where particles will be created.</summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Type">
-            <summary>Get the type of sensor the primitive sent</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstSpeedMin">
+            <summary>A <see langword="float"/> representing in seconds, the minimum speed between bursts of new particles 
+            being emitted</summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Velocity">
-            <summary>Get the velocity of the primitive sending the sensor</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstSpeedMax">
+            <summary>A <see langword="float"/> representing in seconds the maximum speed of new particles being emitted.</summary>
         </member>
-        <member name="T:OpenMetaverse.AvatarSitResponseEventArgs">
-            <summary>Contains the response data returned from the simulator in response to a <see cref="!:RequestSit"/></summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstPartCount">
+            <summary>A <see langword="byte"/> representing the maximum number of particles emitted per burst</summary>
         </member>
-        <member name="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="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="P:OpenMetaverse.AvatarSitResponseEventArgs.ObjectID">
-            <summary>Get the ID of the primitive the agent will be sitting on</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartAcceleration">
+            <summary>A <see cref="T:Vector3"/> which represents the Acceleration from the source which particles are emitted</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.Autopilot">
-            <summary>True if the simulator Autopilot functions were involved</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.Texture">
+            <summary>The <see cref="T:UUID"/> Key of the texture displayed on the particle</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.CameraAtOffset">
-            <summary>Get the camera offset of the agent when seated</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.Target">
+            <summary>The <see cref="T:UUID"/> Key of the specified target object or avatar particles will follow</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.CameraEyeOffset">
-            <summary>Get the camera eye offset of the agent when seated</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartDataFlags">
+            <summary>Flags of particle from <seealso cref="T:ParticleDataFlags"/></summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.ForceMouselook">
-            <summary>True of the agent will be in mouselook mode when seated</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartMaxAge">
+            <summary>Max Age particle system will emit particles for</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.SitPosition">
-            <summary>Get the position of the agent when seated</summary>
+        <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="P:OpenMetaverse.AvatarSitResponseEventArgs.SitRotation">
-            <summary>Get the rotation of the agent when seated</summary>
+        <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="T:OpenMetaverse.ChatSessionMemberAddedEventArgs">
-            <summary>Data sent when an agent joins a chat session your agent is currently participating in</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.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="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="P:OpenMetaverse.ChatSessionMemberAddedEventArgs.SessionID">
-            <summary>Get the ID of the chat session</summary>
+        <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="P:OpenMetaverse.ChatSessionMemberAddedEventArgs.AgentID">
-            <summary>Get the ID of the agent that joined</summary>
+        <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="T:OpenMetaverse.ChatSessionMemberLeftEventArgs">
-            <summary>Data sent when an agent exits a chat session your agent is currently participating in</summary>
+        <member name="M:OpenMetaverse.Primitive.ParticleSystem.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            Decodes a byte[] array into a ParticleSystem Object
+            </summary>
+            <param name="data">ParticleSystem object</param>
+            <param name="pos">Start position for BitPacker</param>
         </member>
-        <member name="M:OpenMetaverse.ChatSessionMemberLeftEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Primitive.ParticleSystem.GetBytes">
             <summary>
-            Construct a new instance of the ChatSessionMemberLeftEventArgs object
+            Generate byte[] array from particle data
             </summary>
-            <param name="sessionID">The ID of the chat session</param>
-            <param name="agentID">The ID of the Agent that left</param>
+            <returns>Byte array</returns>
         </member>
-        <member name="P:OpenMetaverse.ChatSessionMemberLeftEventArgs.SessionID">
-            <summary>Get the ID of the chat session</summary>
+        <member name="T:OpenMetaverse.Primitive.ParticleSystem.SourcePattern">
+            <summary>
+            Particle source pattern
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.ChatSessionMemberLeftEventArgs.AgentID">
-            <summary>Get the ID of the agent that left</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.None">
+            <summary>None</summary>
         </member>
-        <member name="T:OpenMetaverse.SetDisplayNameReplyEventArgs">
-            <summary>Event arguments with the result of setting display name operation</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Drop">
+            <summary>Drop particles from source position with no force</summary>
         </member>
-        <member name="M:OpenMetaverse.SetDisplayNameReplyEventArgs.#ctor(System.Int32,System.String,OpenMetaverse.AgentDisplayName)">
-            <summary>Default constructor</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Explode">
+            <summary>"Explode" particles in all directions</summary>
         </member>
-        <member name="P:OpenMetaverse.SetDisplayNameReplyEventArgs.Status">
-            <summary>Status code, 200 indicates settign display name was successful</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Angle">
+            <summary>Particles shoot across a 2D area</summary>
         </member>
-        <member name="P:OpenMetaverse.SetDisplayNameReplyEventArgs.Reason">
-            <summary>Textual description of the status</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.AngleCone">
+            <summary>Particles shoot across a 3D Cone</summary>
         </member>
-        <member name="P:OpenMetaverse.SetDisplayNameReplyEventArgs.DisplayName">
-            <summary>Details of the newly set display name</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.AngleConeEmpty">
+            <summary>Inverse of AngleCone (shoot particles everywhere except the 3D cone defined</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetScriptText">
+        <member name="T:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags">
             <summary>
-            Represents an LSL Text object containing a string of UTF encoded characters
+            Particle Data Flags
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetScriptText.Source">
-            <summary>A string of characters represting the script contents</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.None">
+            <summary>None</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptText.#ctor">
-            <summary>Initializes a new AssetScriptText object</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.InterpColor">
+            <summary>Interpolate color and alpha from start to end</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="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.InterpScale">
+            <summary>Interpolate scale from start to end</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptText.Encode">
-            <summary>
-            Encode a string containing the scripts contents into byte encoded AssetData
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Bounce">
+            <summary>Bounce particles off particle sources Z height</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptText.Decode">
-            <summary>
-            Decode a byte array containing the scripts contents into a string
-            </summary>
-            <returns>true if decoding is successful</returns>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Wind">
+            <summary>velocity of particles is dampened toward the simulators wind</summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetScriptText.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.FollowSrc">
+            <summary>Particles follow the source</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.GestureStepType">
-            <summary>
-            Type of gesture step
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.FollowVelocity">
+            <summary>Particles point towards the direction of source's velocity</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.GestureStep">
-            <summary>
-            Base class for gesture steps
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.TargetPos">
+            <summary>Target of the particles</summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.GestureStep.GestureStepType">
-            <summary>
-            Retururns what kind of gesture step this is
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.TargetLinear">
+            <summary>Particles are sent in a straight line</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.GestureStepAnimation">
-            <summary>
-            Describes animation step of a gesture
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Emissive">
+            <summary>Particles emit a glow</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepAnimation.AnimationStart">
-            <summary>
-            If true, this step represents start of animation, otherwise animation stop
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Beam">
+            <summary>used for point/grab/touch</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepAnimation.ID">
+        <member name="T:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags">
             <summary>
-            Animation asset <see cref="T:OpenMetaverse.UUID"/>
+            Particle Flags Enum
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepAnimation.Name">
-            <summary>
-            Animation inventory name
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags.None">
+            <summary>None</summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.GestureStepAnimation.GestureStepType">
+        <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="M:OpenMetaverse.Messages.MessageUtils.DecodeEvent(System.String,OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Returns what kind of gesture step this is
+            Return a decoded capabilities message as a strongly typed object
             </summary>
+            <param name="eventName">A string containing the name of the capabilities message key</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> to decode</param>
+            <returns>A strongly typed object containing the decoded information from the capabilities message, or null
+            if no existing Message object exists for the specified event</returns>
         </member>
-        <member name="T:OpenMetaverse.Assets.GestureStepSound">
+        <member name="T:OpenMetaverse.Imaging.OpenJPEG">
             <summary>
-            Describes sound step of a gesture
+            A Wrapper around openjpeg to encode and decode images to and from byte arrays
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepSound.ID">
+        <member name="F:OpenMetaverse.Imaging.OpenJPEG.TGA_HEADER_SIZE">
+            <summary>TGA Header size</summary>
+        </member>
+        <member name="F:OpenMetaverse.Imaging.OpenJPEG.OpenJPEGLock">
+            <summary>OpenJPEG is not threadsafe, so this object is used to lock
+            during calls into unmanaged code</summary>
+        </member>
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.Encode(OpenMetaverse.Imaging.ManagedImage,System.Boolean)">
             <summary>
-            Sound asset <see cref="T:OpenMetaverse.UUID"/>
+            Encode a <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object into a byte array
             </summary>
+            <param name="image">The <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object to encode</param>
+            <param name="lossless">true to enable lossless conversion, only useful for small images ie: sculptmaps</param>
+            <returns>A byte array containing the encoded Image object</returns>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepSound.Name">
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.Encode(OpenMetaverse.Imaging.ManagedImage)">
             <summary>
-            Sound inventory name
+            Encode a <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object into a byte array
             </summary>
+            <param name="image">The <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object to encode</param>
+            <returns>a byte array of the encoded image</returns>
         </member>
-        <member name="P:OpenMetaverse.Assets.GestureStepSound.GestureStepType">
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(System.Byte[],OpenMetaverse.Imaging.ManagedImage@,System.Drawing.Image@)">
             <summary>
-            Returns what kind of gesture step this is
+            Decode JPEG2000 data to an <seealso cref="T:System.Drawing.Image"/> and
+            <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/>
             </summary>
+            <param name="encoded">JPEG2000 encoded data</param>
+            <param name="managedImage">ManagedImage object to decode to</param>
+            <param name="image">Image object to decode to</param>
+            <returns>True if the decode succeeds, otherwise false</returns>
         </member>
-        <member name="T:OpenMetaverse.Assets.GestureStepChat">
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(System.Byte[],OpenMetaverse.Imaging.ManagedImage@)">
             <summary>
-            Describes sound step of a gesture
+            
             </summary>
+            <param name="encoded"></param>
+            <param name="managedImage"></param>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepChat.Text">
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.DecodeLayerBoundaries(System.Byte[],OpenMetaverse.Imaging.OpenJPEG.J2KLayerInfo[]@,System.Int32@)">
             <summary>
-            Text to output in chat
+            
             </summary>
+            <param name="encoded"></param>
+            <param name="layerInfo"></param>
+            <param name="components"></param>
+            <returns></returns>
         </member>
-        <member name="P:OpenMetaverse.Assets.GestureStepChat.GestureStepType">
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.EncodeFromImage(System.Drawing.Bitmap,System.Boolean)">
             <summary>
-            Returns what kind of gesture step this is
+            Encode a <seealso cref="T:System.Drawing.Bitmap"/> object into a byte array
             </summary>
+            <param name="bitmap">The source <seealso cref="T:System.Drawing.Bitmap"/> object to encode</param>
+            <param name="lossless">true to enable lossless decoding</param>
+            <returns>A byte array containing the source Bitmap object</returns>
         </member>
-        <member name="T:OpenMetaverse.Assets.GestureStepWait">
+        <member name="T:OpenMetaverse.Imaging.OpenJPEG.J2KLayerInfo">
             <summary>
-            Describes sound step of a gesture
+            Defines the beginning and ending file positions of a layer in an
+            LRCP-progression JPEG2000 file
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepWait.WaitForAnimation">
+        <member name="T:OpenMetaverse.Imaging.OpenJPEG.MarshalledImage">
             <summary>
-            If true in this step we wait for all animations to finish
+            This structure is used to marshal both encoded and decoded images.
+            MUST MATCH THE STRUCT IN dotnet.h!
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepWait.WaitForTime">
+        <member name="T:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket">
             <summary>
-            If true gesture player should wait for the specified amount of time
+            Information about a single packet in a JPEG2000 stream
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepWait.WaitTime">
-            <summary>
-            Time in seconds to wait if WaitForAnimation is false
-            </summary>
+        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.start_pos">
+            <summary>Packet start position</summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.GestureStepWait.GestureStepType">
-            <summary>
-            Returns what kind of gesture step this is
-            </summary>
+        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.end_ph_pos">
+            <summary>Packet header end position</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.GestureStepEOF">
-            <summary>
-            Describes the final step of a gesture
-            </summary>
+        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.end_pos">
+            <summary>Packet end position</summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.GestureStepEOF.GestureStepType">
-            <summary>
-            Returns what kind of gesture step this is
-            </summary>
+        <member name="F:OpenMetaverse.TerrainManager.m_LandPatchReceivedEvent">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetGesture">
-            <summary>
-            Represents a sequence of animations, sounds, and chat actions
-            </summary>
+        <member name="M:OpenMetaverse.TerrainManager.OnLandPatchReceived(OpenMetaverse.LandPatchReceivedEventArgs)">
+            <summary>Raises the LandPatchReceived event</summary>
+            <param name="e">A LandPatchReceivedEventArgs object containing the
+            data returned from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetGesture.TriggerKey">
-            <summary>
-            Keyboard key that triggers the gestyre
-            </summary>
+        <member name="F:OpenMetaverse.TerrainManager.m_LandPatchReceivedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetGesture.TriggerKeyMask">
+        <member name="M:OpenMetaverse.TerrainManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            Modifier to the trigger key
+            Default constructor
             </summary>
+            <param name="client"></param>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetGesture.Trigger">
-            <summary>
-            String that triggers playing of the gesture sequence
-            </summary>
+        <member name="E:OpenMetaverse.TerrainManager.LandPatchReceived">
+            <summary>Raised when the simulator responds sends </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetGesture.ReplaceWith">
-            <summary>
-            Text that replaces trigger in chat once gesture is triggered
-            </summary>
+        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.Simulator">
+            <summary>Simulator from that sent tha data</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetGesture.Sequence">
-            <summary>
-            Sequence of gesture steps
-            </summary>
+        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.X">
+            <summary>Sim coordinate of the patch</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetGesture.#ctor">
-            <summary>
-            Constructs guesture asset
-            </summary>
+        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.Y">
+            <summary>Sim coordinate of the patch</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetGesture.#ctor(OpenMetaverse.UUID,System.Byte[])">
-            <summary>
-            Constructs guesture asset
-            </summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
+        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.PatchSize">
+            <summary>Size of tha patch</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetGesture.Encode">
+        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.HeightMap">
+            <summary>Heightmap for the patch</summary>
+        </member>
+        <member name="T:OpenMetaverse.Caps">
             <summary>
-            Encodes gesture asset suitable for uplaod
+            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.Assets.AssetGesture.Decode">
+        <member name="F:OpenMetaverse.Caps.Simulator">
+            <summary>Reference to the simulator this system is connected to</summary>
+        </member>
+        <member name="M:OpenMetaverse.Caps.#ctor(OpenMetaverse.Simulator,System.String)">
             <summary>
-            Decodes gesture assset into play sequence
+            Default constructor
             </summary>
-            <returns>true if the asset data was decoded successfully</returns>
+            <param name="simulator"></param>
+            <param name="seedcaps"></param>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetGesture.AssetType">
+        <member name="M:OpenMetaverse.Caps.CapabilityURI(System.String)">
             <summary>
-            Returns asset type
+            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="T:OpenMetaverse.Sounds">
+        <member name="M:OpenMetaverse.Caps.EventQueueEventHandler(System.String,OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            pre-defined built in sounds
+            Process any incoming events, check to see if we have a message created for the event, 
             </summary>
+            <param name="eventName"></param>
+            <param name="body"></param>
         </member>
-        <member name="F:OpenMetaverse.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 name="P:OpenMetaverse.Caps.SeedCapsURI">
+            <summary>Capabilities URI this system was initialized with</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.INSTANT_MESSAGE_NOTIFICATION">
-            <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="F:OpenMetaverse.Sounds.INVALID_OPERATION">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Caps.EventQueueCallback">
+            <summary>
+            Triggered when an event is received via the EventQueueGet 
+            capability
+            </summary>
+            <param name="capsKey">Event name</param>
+            <param name="message">Decoded event data</param>
+            <param name="simulator">The simulator that generated the event</param>
         </member>
-        <member name="F:OpenMetaverse.Sounds.KEYBOARD_LOOP">
-            <summary></summary>
+        <member name="T:OpenMetaverse.StatusCode">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.MONEY_REDUCTION_COINS">
-            <summary>coins</summary>
+        <member name="F:OpenMetaverse.StatusCode.OK">
+            <summary>OK</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.MONEY_INCREASE_CASH_REGISTER_BELL">
-            <summary>cash register bell</summary>
+        <member name="F:OpenMetaverse.StatusCode.Done">
+            <summary>Transfer completed</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.NULL_KEYSTROKE">
+        <member name="F:OpenMetaverse.StatusCode.Skip">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION">
+        <member name="F:OpenMetaverse.StatusCode.Abort">
             <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 name="F:OpenMetaverse.StatusCode.Error">
+            <summary>Unknown error occurred</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_GLASS_BREAK">
-            <summary>glass break</summary>
+        <member name="F:OpenMetaverse.StatusCode.UnknownSource">
+            <summary>Equivalent to a 404 error</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_METAL_CLUNK">
-            <summary>metal clunk</summary>
+        <member name="F:OpenMetaverse.StatusCode.InsufficientPermissions">
+            <summary>Client does not have permission for that resource</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_CREATE_WHOOSH">
-            <summary>whoosh</summary>
+        <member name="F:OpenMetaverse.StatusCode.Unknown">
+            <summary>Unknown status</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_DELETE_SHAKE">
-            <summary>shake</summary>
+        <member name="T:OpenMetaverse.ChannelType">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_REZ">
+        <member name="F:OpenMetaverse.ChannelType.Unknown">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_APPEAR_DING">
-            <summary>ding</summary>
+        <member name="F:OpenMetaverse.ChannelType.Misc">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ChannelType.Asset">
+            <summary>Virtually all asset transfers use this channel</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT1">
-            <summary></summary>
+        <member name="T:OpenMetaverse.SourceType">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT2">
+        <member name="F:OpenMetaverse.SourceType.Unknown">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT3">
-            <summary></summary>
+        <member name="F:OpenMetaverse.SourceType.Asset">
+            <summary>Asset from the asset server</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT4">
-            <summary></summary>
+        <member name="F:OpenMetaverse.SourceType.SimInventoryItem">
+            <summary>Inventory item</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT5">
-            <summary></summary>
+        <member name="F:OpenMetaverse.SourceType.SimEstate">
+            <summary>Estate asset, such as an estate covenant</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT6">
-            <summary></summary>
+        <member name="T:OpenMetaverse.TargetType">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT7">
+        <member name="F:OpenMetaverse.TargetType.Unknown">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.SNAPSHOT">
+        <member name="F:OpenMetaverse.TargetType.File">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.TELEPORT_TEXTURE_APPLY">
+        <member name="F:OpenMetaverse.TargetType.VFile">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.THUNDER">
-            <summary></summary>
+        <member name="T:OpenMetaverse.ImageType">
+            <summary>
+            When requesting image download, type of the image requested
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.WINDOW_CLOSE">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ImageType.Normal">
+            <summary>Normal in-world object texture</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.WINDOW_OPEN">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ImageType.Baked">
+            <summary>Avatar texture</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.ZIPPER">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ImageType.ServerBaked">
+            <summary>Server baked avatar texture</summary>
         </member>
-        <member name="M:OpenMetaverse.Sounds.ToDictionary">
+        <member name="T:OpenMetaverse.ImageCodec">
             <summary>
-            A dictionary containing all pre-defined sounds
+            Image file format
             </summary>
-            <returns>A dictionary containing the pre-defined sounds, 
-            where the key is the sounds ID, and the value is a string
-            containing a name to identify the purpose of the sound</returns>
         </member>
-        <member name="T:OpenMetaverse.GroupMember">
+        <member name="T:OpenMetaverse.Transfer">
             <summary>
-            Avatar group management
+            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupMember.ID">
-            <summary>Key of Group Member</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupMember.Contribution">
-            <summary>Total land contribution</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupMember.OnlineStatus">
-            <summary>Online status information</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupMember.Powers">
-            <summary>Abilities that the Group Member has</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupMember.Title">
-            <summary>Current group title</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupMember.IsOwner">
-            <summary>Is a group owner</summary>
+        <member name="P:OpenMetaverse.Transfer.TimeSinceLastPacket">
+            <summary>Number of milliseconds passed since the last transfer
+            packet was received</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupRole">
+        <member name="T:OpenMetaverse.AssetDownload">
             <summary>
-            Role manager for a group
+            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRole.GroupID">
-            <summary>Key of the group</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupRole.ID">
-            <summary>Key of Role</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupRole.Name">
-            <summary>Name of Role</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupRole.Title">
-            <summary>Group Title associated with Role</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupRole.Description">
-            <summary>Description of Role</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupRole.Powers">
-            <summary>Abilities Associated with Role</summary>
-        </member>
-        <member name="M:OpenMetaverse.GroupRole.ToString">
-            <summary>Returns the role's title</summary>
-            <returns>The role's title</returns>
-        </member>
-        <member name="T:OpenMetaverse.GroupTitle">
+        <member name="T:OpenMetaverse.XferDownload">
             <summary>
-            Class to represent Group Title
+            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupTitle.GroupID">
-            <summary>Key of the group</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupTitle.RoleID">
-            <summary>ID of the role title belongs to</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupTitle.Title">
-            <summary>Group Title</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupTitle.Selected">
-            <summary>Whether title is Active</summary>
-        </member>
-        <member name="M:OpenMetaverse.GroupTitle.ToString">
-            <summary>Returns group title</summary>
+        <member name="T:OpenMetaverse.ImageDownload">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Group">
+        <member name="T:OpenMetaverse.AssetUpload">
             <summary>
-            Represents a group on the grid
+            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Group.ID">
-            <summary>Key of Group</summary>
+        <member name="T:OpenMetaverse.ImageRequest">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Group.InsigniaID">
-            <summary>Key of Group Insignia</summary>
+        <member name="M:OpenMetaverse.ImageRequest.#ctor(OpenMetaverse.UUID,OpenMetaverse.ImageType,System.Single,System.Int32)">
+            <summary>
+            
+            </summary>
+            <param name="imageid"></param>
+            <param name="type"></param>
+            <param name="priority"></param>
+            <param name="discardLevel"></param>
         </member>
-        <member name="F:OpenMetaverse.Group.FounderID">
-            <summary>Key of Group Founder</summary>
+        <member name="T:OpenMetaverse.AssetManager">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Group.OwnerRole">
-            <summary>Key of Group Role for Owners</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.Group.Name">
-            <summary>Name of Group</summary>
+        <member name="F:OpenMetaverse.AssetManager.m_XferReceivedEvent">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.Charter">
-            <summary>Text of Group Charter</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.Group.MemberTitle">
-            <summary>Title of "everyone" role</summary>
+        <member name="F:OpenMetaverse.AssetManager.m_XferReceivedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.OpenEnrollment">
-            <summary>Is the group open for enrolement to everyone</summary>
+        <member name="F:OpenMetaverse.AssetManager.m_AssetUploadedEvent">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.ShowInList">
-            <summary>Will group show up in search</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.Group.Powers">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetManager.m_AssetUploadedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.AcceptNotices">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetManager.m_UploadProgressEvent">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.AllowPublish">
-            <summary></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.Group.MaturePublish">
-            <summary>Is the group Mature</summary>
+        <member name="F:OpenMetaverse.AssetManager.m_UploadProgressLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.MembershipFee">
-            <summary>Cost of group membership</summary>
+        <member name="F:OpenMetaverse.AssetManager.m_InitiateDownloadEvent">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.Money">
-            <summary></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.Group.Contribution">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetManager.m_InitiateDownloadLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.GroupMembershipCount">
-            <summary>The total number of current members this group has</summary>
+        <member name="F:OpenMetaverse.AssetManager.m_ImageReceiveProgressEvent">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.GroupRolesCount">
-            <summary>The number of roles this group has configured</summary>
+        <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="F:OpenMetaverse.Group.ListInProfile">
-            <summary>Show this group in agent's profile</summary>
+        <member name="F:OpenMetaverse.AssetManager.m_ImageReceiveProgressLock">
+            <summary>Thread sync lock object</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.AssetManager.Cache">
+            <summary>Texture download cache</summary>
         </member>
-        <member name="T:OpenMetaverse.Vote">
+        <member name="M:OpenMetaverse.AssetManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            A group Vote
+            Default constructor
             </summary>
+            <param name="client">A reference to the GridClient object</param>
         </member>
-        <member name="F:OpenMetaverse.Vote.Candidate">
-            <summary>Key of Avatar who created Vote</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vote.VoteString">
-            <summary>Text of the Vote proposal</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vote.NumVotes">
-            <summary>Total number of votes</summary>
-        </member>
-        <member name="T:OpenMetaverse.GroupProposal">
+        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.AssetManager.AssetReceivedCallback)">
             <summary>
-            A group proposal
+            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="F:OpenMetaverse.GroupProposal.VoteText">
-            <summary>The Text of the proposal</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="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>
-        <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 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>
-        <member name="F:OpenMetaverse.GroupProposal.Duration">
-            <summary>The duration in days votes are accepted</summary>
+        <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>
-        <member name="T:OpenMetaverse.GroupAccountSummary">
+        <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>
-        <member name="F:OpenMetaverse.GroupAccountSummary.IntervalDays">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.CurrentInterval">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.StartDate">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.Balance">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.TotalCredits">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.TotalDebits">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.ObjectTaxCurrent">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.LightTaxCurrent">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.LandTaxCurrent">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.GroupTaxCurrent">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.ParcelDirFeeCurrent">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.ObjectTaxEstimate">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.LightTaxEstimate">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.LandTaxEstimate">
-            <summary></summary>
+        <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>
-        <member name="F:OpenMetaverse.GroupAccountSummary.GroupTaxEstimate">
-            <summary></summary>
+        <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>
-        <member name="F:OpenMetaverse.GroupAccountSummary.ParcelDirFeeEstimate">
-            <summary></summary>
+        <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>
-        <member name="F:OpenMetaverse.GroupAccountSummary.NonExemptMembers">
-            <summary></summary>
+        <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>
-        <member name="F:OpenMetaverse.GroupAccountSummary.LastTaxDate">
-            <summary></summary>
+        <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>
-        <member name="F:OpenMetaverse.GroupAccountSummary.TaxDate">
-            <summary></summary>
+        <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="T:OpenMetaverse.GroupNotice">
+        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.TextureDownloadCallback)">
             <summary>
-            Struct representing a group notice
+            Overload: Request a texture asset from the simulator using the <see cref="T:OpenMetaverse.TexturePipeline"/> system to 
+            manage the requests and re-assemble the image from the packets received from the simulator
             </summary>
+            <param name="textureID">The <see cref="T:OpenMetaverse.UUID"/> of the texture asset to download</param>
+            <param name="callback">The <see cref="T:OpenMetaverse.TextureDownloadCallback"/> callback to fire when the image is retrieved. The callback
+            will contain the result of the request and the texture asset data</param>
         </member>
-        <member name="F:OpenMetaverse.GroupNotice.Subject">
-            <summary></summary>
+        <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>
-        <member name="F:OpenMetaverse.GroupNotice.Message">
-            <summary></summary>
+        <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>
-        <member name="F:OpenMetaverse.GroupNotice.AttachmentID">
-            <summary></summary>
+        <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>
-        <member name="F:OpenMetaverse.GroupNotice.OwnerID">
-            <summary></summary>
+        <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>
-        <member name="M:OpenMetaverse.GroupNotice.SerializeAttachment">
+        <member name="M:OpenMetaverse.AssetManager.RequestServerBakedImage(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.TextureDownloadCallback)">
             <summary>
-            
+            Fetach avatar texture on a grid capable of server side baking
             </summary>
-            <returns></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="T:OpenMetaverse.GroupNoticesListEntry">
+        <member name="M:OpenMetaverse.AssetManager.FireImageProgressEvent(OpenMetaverse.UUID,System.Int32,System.Int32)">
             <summary>
-            Struct representing a group notice list entry
+            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>
-        <member name="F:OpenMetaverse.GroupNoticesListEntry.NoticeID">
-            <summary>Notice ID</summary>
+        <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="F:OpenMetaverse.GroupNoticesListEntry.Timestamp">
-            <summary>Creation timestamp of notice</summary>
+        <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="F:OpenMetaverse.GroupNoticesListEntry.FromName">
-            <summary>Agent name who created notice</summary>
+        <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="F:OpenMetaverse.GroupNoticesListEntry.Subject">
-            <summary>Notice subject</summary>
+        <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="F:OpenMetaverse.GroupNoticesListEntry.HasAttachment">
-            <summary>Is there an attachment?</summary>
+        <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="F:OpenMetaverse.GroupNoticesListEntry.AssetType">
-            <summary>Attachment Type</summary>
+        <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="T:OpenMetaverse.ChatSessionMember">
-            <summary>
-            Struct representing a member of a group chat session and their settings
-            </summary>
+        <member name="M:OpenMetaverse.AssetManager.SendXferPacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.ChatSessionMember.AvatarKey">
-            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the Avatar</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.ChatSessionMember.CanVoiceChat">
-            <summary>True if user has voice chat enabled</summary>
+        <member name="E:OpenMetaverse.AssetManager.XferReceived">
+            <summary>Raised when the simulator responds sends </summary>
         </member>
-        <member name="F:OpenMetaverse.ChatSessionMember.IsModerator">
-            <summary>True of Avatar has moderator abilities</summary>
+        <member name="E:OpenMetaverse.AssetManager.AssetUploaded">
+            <summary>Raised during upload completes</summary>
         </member>
-        <member name="F:OpenMetaverse.ChatSessionMember.MuteText">
-            <summary>True if a moderator has muted this avatars chat</summary>
+        <member name="E:OpenMetaverse.AssetManager.UploadProgress">
+            <summary>Raised during upload with progres update</summary>
         </member>
-        <member name="F:OpenMetaverse.ChatSessionMember.MuteVoice">
-            <summary>True if a moderator has muted this avatars voice</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.GroupRoleUpdate">
+        <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="T:OpenMetaverse.AssetManager.AssetReceivedCallback">
             <summary>
-            Role update flags
+            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.GroupRoleUpdate.NoUpdate">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupRoleUpdate.UpdateData">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupRoleUpdate.UpdatePowers">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupRoleUpdate.UpdateAll">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupRoleUpdate.Create">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupRoleUpdate.Delete">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.None">
-            <summary></summary>
+        <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.GroupPowers.Invite">
-            <summary>Can send invitations to groups default role</summary>
+        <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.GroupPowers.Eject">
-            <summary>Can eject members from group</summary>
+        <member name="P:OpenMetaverse.XferReceivedEventArgs.Xfer">
+            <summary>Xfer data</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.ChangeOptions">
-            <summary>Can toggle 'Open Enrollment' and change 'Signup fee'</summary>
+        <member name="P:OpenMetaverse.AssetUploadEventArgs.Upload">
+            <summary>Upload data</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.MemberVisible">
-            <summary>Member is visible in the public member list</summary>
+        <member name="P:OpenMetaverse.InitiateDownloadEventArgs.SimFileName">
+            <summary>Filename used on the simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.CreateRole">
-            <summary>Can create new roles</summary>
+        <member name="P:OpenMetaverse.InitiateDownloadEventArgs.ViewerFileName">
+            <summary>Filename used by the client</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.DeleteRole">
-            <summary>Can delete existing roles</summary>
+        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.ImageID">
+            <summary>UUID of the image that is in progress</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.RoleProperties">
-            <summary>Can change Role names, titles and descriptions</summary>
+        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.Received">
+            <summary>Number of bytes received so far</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.AssignMemberLimited">
-            <summary>Can assign other members to assigners role</summary>
+        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.Total">
+            <summary>Image size in bytes</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.AssignMember">
-            <summary>Can assign other members to any role</summary>
+        <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.GroupPowers.RemoveMember">
-            <summary>Can remove members from roles</summary>
+        <member name="F:OpenMetaverse.Assets.AssetScriptText.Source">
+            <summary>A string of characters represting the script contents</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.ChangeActions">
-            <summary>Can assign and remove abilities in roles</summary>
+        <member name="M:OpenMetaverse.Assets.AssetScriptText.#ctor">
+            <summary>Initializes a new AssetScriptText object</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 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>
-        <member name="F:OpenMetaverse.GroupPowers.LandDeed">
-            <summary>Can buy land or deed land to group</summary>
+        <member name="M:OpenMetaverse.Assets.AssetScriptText.Encode">
+            <summary>
+            Encode a string containing the scripts contents into byte encoded AssetData
+            </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 name="M:OpenMetaverse.Assets.AssetScriptText.Decode">
+            <summary>
+            Decode a byte array containing the scripts contents into a string
+            </summary>
+            <returns>true if decoding is successful</returns>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandSetSale">
-            <summary>Can set land for-sale information on group owned parcels</summary>
+        <member name="P:OpenMetaverse.Assets.AssetScriptText.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandDivideJoin">
-            <summary>Can subdivide and join parcels</summary>
+        <member name="T:OpenMetaverse.Assets.AssetScriptBinary">
+            <summary>
+            Represents an AssetScriptBinary object containing the 
+            LSO compiled bytecode of an LSL script
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.JoinChat">
-            <summary>Can join group chat sessions</summary>
+        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.#ctor">
+            <summary>Initializes a new instance of an AssetScriptBinary object</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.AllowVoiceChat">
-            <summary>Can use voice chat in Group Chat sessions</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.GroupPowers.ModerateChat">
-            <summary>Can moderate group chat sessions</summary>
+        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.Encode">
+            <summary>
+            TODO: Encodes a scripts contents into a LSO Bytecode file
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.FindPlaces">
-            <summary>Can toggle "Show in Find Places" and set search category</summary>
+        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.Decode">
+            <summary>
+            TODO: Decode LSO Bytecode into a string
+            </summary>
+            <returns>true</returns>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandChangeIdentity">
-            <summary>Can change parcel name, description, and 'Publish on web' settings</summary>
+        <member name="P:OpenMetaverse.Assets.AssetScriptBinary.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.SetLandingPoint">
-            <summary>Can set the landing point and teleport routing on group land</summary>
+        <member name="T:OpenMetaverse.Assets.AssetCallingCard">
+            <summary>
+            Represents a Callingcard with AvatarID and Position vector
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.ChangeMedia">
-            <summary>Can change music and media settings</summary>
+        <member name="F:OpenMetaverse.Assets.AssetCallingCard.AvatarID">
+            <summary>UUID of the Callingcard target avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandEdit">
-            <summary>Can toggle 'Edit Terrain' option in Land settings</summary>
+        <member name="M:OpenMetaverse.Assets.AssetCallingCard.#ctor">
+            <summary>Construct an Asset of type Callingcard</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandOptions">
-            <summary>Can toggle various About Land > Options settings</summary>
+        <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.GroupPowers.AllowEditLand">
-            <summary>Can always terraform land, even if parcel settings have it turned off</summary>
+        <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.GroupPowers.AllowFly">
-            <summary>Can always fly while over group owned land</summary>
+        <member name="M:OpenMetaverse.Assets.AssetCallingCard.Encode">
+            <summary>
+            Encode the raw contents of a string with the specific Callingcard format
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.AllowRez">
-            <summary>Can always rez objects on group owned land</summary>
+        <member name="M:OpenMetaverse.Assets.AssetCallingCard.Decode">
+            <summary>
+            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="F:OpenMetaverse.GroupPowers.AllowLandmark">
-            <summary>Can always create landmarks for group owned parcels</summary>
+        <member name="P:OpenMetaverse.Assets.AssetCallingCard.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.AllowSetHome">
-            <summary>Can set home location on any group owned parcel</summary>
+        <member name="T:OpenMetaverse.SoundManager">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandManageAllowed">
-            <summary>Can modify public access settings for group owned parcels</summary>
+        <member name="F:OpenMetaverse.SoundManager.m_AttachedSound">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandManageBanned">
-            <summary>Can manager parcel ban lists on group owned land</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.GroupPowers.LandManagePasses">
-            <summary>Can manage pass list sales information</summary>
+        <member name="F:OpenMetaverse.SoundManager.m_AttachedSoundLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandEjectAndFreeze">
-            <summary>Can eject and freeze other avatars on group owned land</summary>
+        <member name="F:OpenMetaverse.SoundManager.m_AttachedSoundGainChange">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.ReturnGroupSet">
-            <summary>Can return objects set to group</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.GroupPowers.ReturnNonGroup">
-            <summary>Can return non-group owned/set objects</summary>
+        <member name="F:OpenMetaverse.SoundManager.m_AttachedSoundGainChangeLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.ReturnGroupOwned">
-            <summary>Can return group owned objects</summary>
+        <member name="F:OpenMetaverse.SoundManager.m_SoundTrigger">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandGardening">
-            <summary>Can landscape using Linden plants</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.GroupPowers.DeedObject">
-            <summary>Can deed objects to group</summary>
+        <member name="F:OpenMetaverse.SoundManager.m_SoundTriggerLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.ObjectManipulate">
-            <summary>Can move group owned objects</summary>
+        <member name="F:OpenMetaverse.SoundManager.m_PreloadSound">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.ObjectSetForSale">
-            <summary>Can set group owned objects for-sale</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.GroupPowers.Accountable">
-            <summary>Pay group liabilities and receive group dividends</summary>
+        <member name="F:OpenMetaverse.SoundManager.m_PreloadSoundLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.HostEvent">
-            <summary>List and Host group events</summary>
+        <member name="M:OpenMetaverse.SoundManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Construct a new instance of the SoundManager class, used for playing and receiving
+            sound assets
+            </summary>
+            <param name="client">A reference to the current GridClient instance</param>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.SendNotices">
-            <summary>Can send group notices</summary>
+        <member name="M:OpenMetaverse.SoundManager.PlaySound(OpenMetaverse.UUID)">
+            <summary>
+            Plays a sound in the current region at full volume from avatar position
+            </summary>
+            <param name="soundID">UUID of the sound to be played</param>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.ReceiveNotices">
-            <summary>Can receive group notices</summary>
+        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Vector3)">
+            <summary>
+            Plays a sound in the current region at full volume
+            </summary>
+            <param name="soundID">UUID of the sound to be played.</param>
+            <param name="position">position for the sound to be played at. Normally the avatar.</param>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.StartProposal">
-            <summary>Can create group proposals</summary>
+        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Vector3,System.Single)">
+            <summary>
+            Plays a sound in the current region
+            </summary>
+            <param name="soundID">UUID of the sound to be played.</param>
+            <param name="position">position for the sound to be played at. Normally the avatar.</param>
+            <param name="gain">volume of the sound, from 0.0 to 1.0</param>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.VoteOnProposal">
-            <summary>Can vote on group proposals</summary>
+        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Simulator,OpenMetaverse.Vector3,System.Single)">
+            <summary>
+            Plays a sound in the specified sim
+            </summary>
+            <param name="soundID">UUID of the sound to be played.</param>
+            <param name="sim">UUID of the sound to be played.</param>
+            <param name="position">position for the sound to be played at. Normally the avatar.</param>
+            <param name="gain">volume of the sound, from 0.0 to 1.0</param>
         </member>
-        <member name="T:OpenMetaverse.GroupManager">
+        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,System.UInt64,OpenMetaverse.Vector3,System.Single)">
             <summary>
-            Handles all network traffic related to reading and writing group
-            information
+            Play a sound asset
             </summary>
+            <param name="soundID">UUID of the sound to be played.</param>
+            <param name="handle">handle id for the sim to be played in.</param>
+            <param name="position">position for the sound to be played at. Normally the avatar.</param>
+            <param name="gain">volume of the sound, from 0.0 to 1.0</param>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_CurrentGroups">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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.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 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="F:OpenMetaverse.GroupManager.m_CurrentGroupsLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.GroupManager.m_GroupNames">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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.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="E:OpenMetaverse.SoundManager.AttachedSound">
+            <summary>Raised when the simulator sends us data containing
+            sound</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupNamesLock">
-            <summary>Thread sync lock object</summary>
+        <member name="E:OpenMetaverse.SoundManager.AttachedSoundGainChange">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupProfile">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="E:OpenMetaverse.SoundManager.SoundTrigger">
+            <summary>Raised when the simulator sends us data containing
+            ...</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="E:OpenMetaverse.SoundManager.PreloadSound">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupProfileLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.AttachedSoundEventArgs">
+            <summary>Provides data for the <see cref="E:OpenMetaverse.SoundManager.AttachedSound"/> event</summary>
+            <remarks>The <see cref="E:OpenMetaverse.SoundManager.AttachedSound"/> event occurs when the simulator sends
+            the sound data which emits from an agents attachment</remarks>
+            <example>
+            The following code example shows the process to subscribe to the <see cref="E:OpenMetaverse.SoundManager.AttachedSound"/> event
+            and a stub to handle the data passed from the simulator
+            <code>
+                // Subscribe to the AttachedSound event
+                Client.Sound.AttachedSound += Sound_AttachedSound;
+                
+                // process the data raised in the event here
+                private void Sound_AttachedSound(object sender, AttachedSoundEventArgs e)
+                {
+                    // ... Process AttachedSoundEventArgs here ...
+                }
+            </code>
+            </example>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupMembers">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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="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="P:OpenMetaverse.AttachedSoundEventArgs.Simulator">
+            <summary>Simulator where the event originated</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupMembersLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.SoundID">
+            <summary>Get the sound asset id</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupRoles">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.OwnerID">
+            <summary>Get the ID of the owner</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="P:OpenMetaverse.AttachedSoundEventArgs.ObjectID">
+            <summary>Get the ID of the Object</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupRolesLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Gain">
+            <summary>Get the volume level</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupRoleMembers">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Flags">
+            <summary>Get the <see cref="T:OpenMetaverse.SoundFlags"/></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="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="F:OpenMetaverse.GroupManager.m_GroupRolesMembersLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.GroupManager.m_GroupTitles">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.Simulator">
+            <summary>Simulator where the event originated</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="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.ObjectID">
+            <summary>Get the ID of the Object</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupTitlesLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.Gain">
+            <summary>Get the volume level</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupAccountSummary">
-            <summary>The event subscribers. null if no subcribers</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="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="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="F:OpenMetaverse.GroupManager.m_GroupAccountSummaryLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Simulator">
+            <summary>Simulator where the event originated</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupCreated">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.SoundID">
+            <summary>Get the sound asset id</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="P:OpenMetaverse.SoundTriggerEventArgs.OwnerID">
+            <summary>Get the ID of the owner</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupCreatedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.ObjectID">
+            <summary>Get the ID of the Object</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupJoined">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.ParentID">
+            <summary>Get the ID of the objects parent</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="P:OpenMetaverse.SoundTriggerEventArgs.Gain">
+            <summary>Get the volume level</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupJoinedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.RegionHandle">
+            <summary>Get the regionhandle</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupLeft">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Position">
+            <summary>Get the source position</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="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="F:OpenMetaverse.GroupManager.m_GroupLeftLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.PreloadSoundEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>
+            Construct a new instance of the PreloadSoundEventArgs class
+            </summary>
+            <param name="sim">Simulator where the event originated</param>
+            <param name="soundID">The sound asset id</param>
+            <param name="ownerID">The ID of the owner</param>
+            <param name="objectID">The ID of the object</param>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupDropped">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="P:OpenMetaverse.PreloadSoundEventArgs.Simulator">
+            <summary>Simulator where the event originated</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="P:OpenMetaverse.PreloadSoundEventArgs.SoundID">
+            <summary>Get the sound asset id</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupDroppedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.PreloadSoundEventArgs.OwnerID">
+            <summary>Get the ID of the owner</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupMemberEjected">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="P:OpenMetaverse.PreloadSoundEventArgs.ObjectID">
+            <summary>Get the ID of the Object</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.Voice.VoicePosition.Position">
+            <summary>Positional vector of the users position</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupMemberEjectedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Voice.VoicePosition.Velocity">
+            <summary>Velocity vector of the position</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupNoticesListReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Voice.VoicePosition.AtOrientation">
+            <summary>At Orientation (X axis) of the position</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.Voice.VoicePosition.UpOrientation">
+            <summary>Up Orientation (Y axis) of the position</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupNoticesListReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Voice.VoicePosition.LeftOrientation">
+            <summary>Left Orientation (Z axis) of the position</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupInvitation">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Rendering.FacetedMesh">
+            <summary>
+            Contains all mesh faces that belong to a prim
+            </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.Rendering.FacetedMesh.Faces">
+            <summary>List of primitive faces</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.m_GroupInvitationLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.Rendering.FacetedMesh.TryDecodeFromAsset(OpenMetaverse.Primitive,OpenMetaverse.Assets.AssetMesh,OpenMetaverse.Rendering.DetailLevel,OpenMetaverse.Rendering.FacetedMesh@)">
+            <summary>
+            Decodes mesh asset into FacetedMesh
+            </summary>
+            <param name="prim">Mesh primitive</param>
+            <param name="meshAsset">Asset retrieved from the asset server</param>
+            <param name="LOD">Level of detail</param>
+            <param name="mesh">Resulting decoded FacetedMesh</param>
+            <returns>True if mesh asset decoding was successful</returns>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.Client">
-            <summary>A reference to the current <seealso cref="T:OpenMetaverse.GridClient"/> instance</summary>
+        <member name="T:OpenMetaverse.Assets.GestureStepType">
+            <summary>
+            Type of gesture step
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.GroupMembersRequests">
-            <summary>Currently-active group members requests</summary>
+        <member name="T:OpenMetaverse.Assets.GestureStep">
+            <summary>
+            Base class for gesture steps
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.GroupRolesRequests">
-            <summary>Currently-active group roles requests</summary>
+        <member name="P:OpenMetaverse.Assets.GestureStep.GestureStepType">
+            <summary>
+            Retururns what kind of gesture step this is
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.GroupRolesMembersRequests">
-            <summary>Currently-active group role-member requests</summary>
+        <member name="T:OpenMetaverse.Assets.GestureStepAnimation">
+            <summary>
+            Describes animation step of a gesture
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.TempGroupMembers">
-            <summary>Dictionary keeping group members while request is in progress</summary>
+        <member name="F:OpenMetaverse.Assets.GestureStepAnimation.AnimationStart">
+            <summary>
+            If true, this step represents start of animation, otherwise animation stop
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.TempGroupRolesMembers">
-            <summary>Dictionary keeping mebmer/role mapping while request is in progress</summary>
+        <member name="F:OpenMetaverse.Assets.GestureStepAnimation.ID">
+            <summary>
+            Animation asset <see cref="T:OpenMetaverse.UUID"/>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.TempGroupRoles">
-            <summary>Dictionary keeping GroupRole information while request is in progress</summary>
+        <member name="F:OpenMetaverse.Assets.GestureStepAnimation.Name">
+            <summary>
+            Animation inventory name
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupManager.GroupName2KeyCache">
-            <summary>Caches group name lookups</summary>
+        <member name="P:OpenMetaverse.Assets.GestureStepAnimation.GestureStepType">
+            <summary>
+            Returns what kind of gesture step this is
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="T:OpenMetaverse.Assets.GestureStepSound">
+            <summary>
+            Describes sound step of a gesture
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Assets.GestureStepSound.ID">
             <summary>
-            Construct a new instance of the GroupManager class
+            Sound asset <see cref="T:OpenMetaverse.UUID"/>
             </summary>
-            <param name="client">A reference to the current <seealso cref="T:OpenMetaverse.GridClient"/> instance</param>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.RequestCurrentGroups">
+        <member name="F:OpenMetaverse.Assets.GestureStepSound.Name">
             <summary>
-            Request a current list of groups the avatar is a member of.
+            Sound inventory name
             </summary>
-            <remarks>CAPS Event Queue must be running for this to work since the results
-            come across CAPS.</remarks>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.RequestGroupName(OpenMetaverse.UUID)">
+        <member name="P:OpenMetaverse.Assets.GestureStepSound.GestureStepType">
             <summary>
-            Lookup name of group based on groupID
+            Returns what kind of gesture step this is
             </summary>
-            <param name="groupID">groupID of group to lookup name for.</param>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.RequestGroupNames(System.Collections.Generic.List{OpenMetaverse.UUID})">
+        <member name="T:OpenMetaverse.Assets.GestureStepChat">
             <summary>
-            Request lookup of multiple group names
+            Describes sound step of a gesture
             </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 name="F:OpenMetaverse.Assets.GestureStepChat.Text">
+            <summary>
+            Text to output in chat
+            </summary>
         </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 name="P:OpenMetaverse.Assets.GestureStepChat.GestureStepType">
+            <summary>
+            Returns what kind of gesture step this is
+            </summary>
         </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 name="T:OpenMetaverse.Assets.GestureStepWait">
+            <summary>
+            Describes sound step of a gesture
+            </summary>
         </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 name="F:OpenMetaverse.Assets.GestureStepWait.WaitForAnimation">
+            <summary>
+            If true in this step we wait for all animations to finish
+            </summary>
         </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 name="F:OpenMetaverse.Assets.GestureStepWait.WaitForTime">
+            <summary>
+            If true gesture player should wait for the specified amount of time
+            </summary>
         </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 name="F:OpenMetaverse.Assets.GestureStepWait.WaitTime">
+            <summary>
+            Time in seconds to wait if WaitForAnimation is false
+            </summary>
         </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 name="P:OpenMetaverse.Assets.GestureStepWait.GestureStepType">
+            <summary>
+            Returns what kind of gesture step this is
+            </summary>
         </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 name="T:OpenMetaverse.Assets.GestureStepEOF">
+            <summary>
+            Describes the final step of a gesture
+            </summary>
         </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 name="P:OpenMetaverse.Assets.GestureStepEOF.GestureStepType">
+            <summary>
+            Returns what kind of gesture step this is
+            </summary>
         </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>
+        <member name="T:OpenMetaverse.Assets.AssetGesture">
+            <summary>
+            Represents a sequence of animations, sounds, and chat actions
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.SetGroupAcceptNotices(OpenMetaverse.UUID,System.Boolean,System.Boolean)">
+        <member name="F:OpenMetaverse.Assets.AssetGesture.TriggerKey">
             <summary>
-            Save wheather agent wants to accept group notices and list this group in their profile
+            Keyboard key that triggers the gestyre
             </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 name="F:OpenMetaverse.Assets.AssetGesture.TriggerKeyMask">
+            <summary>
+            Modifier to the trigger key
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.RequestCreateGroup(OpenMetaverse.Group)">
+        <member name="F:OpenMetaverse.Assets.AssetGesture.Trigger">
             <summary>
-            Request to create a new group. If the group is successfully
-            created, L$100 will automatically be deducted
+            String that triggers playing of the gesture sequence
             </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 name="F:OpenMetaverse.Assets.AssetGesture.ReplaceWith">
+            <summary>
+            Text that replaces trigger in chat once gesture is triggered
+            </summary>
         </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 name="F:OpenMetaverse.Assets.AssetGesture.Sequence">
+            <summary>
+            Sequence of gesture steps
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.UpdateRole(OpenMetaverse.GroupRole)">
-            <summary>Update role information</summary>
-            <param name="role">Modified role to be updated</param>
+        <member name="M:OpenMetaverse.Assets.AssetGesture.#ctor">
+            <summary>
+            Constructs guesture asset
+            </summary>
         </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 name="M:OpenMetaverse.Assets.AssetGesture.#ctor(OpenMetaverse.UUID,System.Byte[])">
+            <summary>
+            Constructs guesture asset
+            </summary>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="M:OpenMetaverse.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 name="M:OpenMetaverse.Assets.AssetGesture.Encode">
+            <summary>
+            Encodes gesture asset suitable for uplaod
+            </summary>
         </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 name="M:OpenMetaverse.Assets.AssetGesture.Decode">
+            <summary>
+            Decodes gesture assset into play sequence
+            </summary>
+            <returns>true if the asset data was decoded successfully</returns>
         </member>
-        <member name="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 name="P:OpenMetaverse.Assets.AssetGesture.AssetType">
+            <summary>
+            Returns asset type
+            </summary>
         </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 name="T:OpenMetaverse.ObjectReturnType">
+            <summary>
+            Type of return to use when returning objects from a parcel
+            </summary>
         </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 name="F:OpenMetaverse.ObjectReturnType.None">
+            <summary></summary>
         </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 name="F:OpenMetaverse.ObjectReturnType.Owner">
+            <summary>Return objects owned by parcel owner</summary>
         </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 name="F:OpenMetaverse.ObjectReturnType.Group">
+            <summary>Return objects set to group</summary>
         </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 name="F:OpenMetaverse.ObjectReturnType.Other">
+            <summary>Return objects not owned by parcel owner or set to group</summary>
         </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 name="F:OpenMetaverse.ObjectReturnType.List">
+            <summary>Return a specific list of objects on parcel</summary>
         </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 name="F:OpenMetaverse.ObjectReturnType.Sell">
+            <summary>Return objects that are marked for-sale</summary>
         </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 name="T:OpenMetaverse.ParcelAccessFlags">
+            <summary>
+            Blacklist/Whitelist flags used in parcels Access List
+            </summary>
         </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 name="F:OpenMetaverse.ParcelAccessFlags.NoAccess">
+            <summary>Agent is denied access</summary>
         </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 name="F:OpenMetaverse.ParcelAccessFlags.Access">
+            <summary>Agent is granted access</summary>
         </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 name="T:OpenMetaverse.ParcelResult">
+            <summary>
+            The result of a request for parcel properties
+            </summary>
         </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 name="F:OpenMetaverse.ParcelResult.NoData">
+            <summary>No matches were found for the request</summary>
         </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 name="F:OpenMetaverse.ParcelResult.Single">
+            <summary>Request matched a single parcel</summary>
         </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 name="F:OpenMetaverse.ParcelResult.Multiple">
+            <summary>Request matched multiple parcels</summary>
         </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 name="T:OpenMetaverse.AccessList">
+            <summary>
+            Flags used in the ParcelAccessListRequest packet to specify whether
+            we want the access list (whitelist), ban list (blacklist), or both
+            </summary>
         </member>
-        <member name="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 name="F:OpenMetaverse.AccessList.Access">
+            <summary>Request the access list</summary>
         </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 name="F:OpenMetaverse.AccessList.Ban">
+            <summary>Request the ban list</summary>
         </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 name="F:OpenMetaverse.AccessList.Both">
+            <summary>Request both White and Black lists</summary>
         </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 name="T:OpenMetaverse.ParcelPropertiesStatus">
+            <summary>
+            Sequence ID in ParcelPropertiesReply packets (sent when avatar
+            tries to cross a parcel border)
+            </summary>
         </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 name="F:OpenMetaverse.ParcelPropertiesStatus.ParcelSelected">
+            <summary>Parcel is currently selected</summary>
         </member>
-        <member name="E:OpenMetaverse.GroupManager.CurrentGroups">
-            <summary>Raised when the simulator sends us data containing
-            our current group membership</summary>
+        <member name="F:OpenMetaverse.ParcelPropertiesStatus.CollisionNotInGroup">
+            <summary>Parcel restricted to a group the avatar is not a
+            member of</summary>
         </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupNamesReply">
-            <summary>Raised when the simulator responds to a RequestGroupName 
-            or RequestGroupNames request</summary>
+        <member name="F:OpenMetaverse.ParcelPropertiesStatus.CollisionBanned">
+            <summary>Avatar is banned from the parcel</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 name="F:OpenMetaverse.ParcelPropertiesStatus.CollisionNotOnAccessList">
+            <summary>Parcel is restricted to an access list that the
+            avatar is not on</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 name="F:OpenMetaverse.ParcelPropertiesStatus.HoveredOverParcel">
+            <summary>Response to hovering over a parcel</summary>
         </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupRoleDataReply">
-            <summary>Raised when the simulator responds to a <see cref="!:RequestGroupRoleData"/> request</summary>
+        <member name="T:OpenMetaverse.TerraformAction">
+            <summary>
+            The tool to use when modifying terrain levels
+            </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 name="F:OpenMetaverse.TerraformAction.Level">
+            <summary>Level the terrain</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 name="F:OpenMetaverse.TerraformAction.Raise">
+            <summary>Raise the terrain</summary>
         </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupAccountSummaryReply">
-            <summary>Raised when a response to a RequestGroupAccountSummary is returned
-            by the simulator</summary>
+        <member name="F:OpenMetaverse.TerraformAction.Lower">
+            <summary>Lower the terrain</summary>
         </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupCreatedReply">
-            <summary>Raised when a request to create a group is successful</summary>
+        <member name="F:OpenMetaverse.TerraformAction.Smooth">
+            <summary>Smooth the terrain</summary>
         </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupJoinedReply">
-            <summary>Raised when a request to join a group either
-            fails or succeeds</summary>
+        <member name="F:OpenMetaverse.TerraformAction.Noise">
+            <summary>Add random noise to the terrain</summary>
         </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupLeaveReply">
-            <summary>Raised when a request to leave a group either
-            fails or succeeds</summary>
+        <member name="F:OpenMetaverse.TerraformAction.Revert">
+            <summary>Revert terrain to simulator default</summary>
         </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupDropped">
-            <summary>Raised when A group is removed from the group server</summary>
+        <member name="T:OpenMetaverse.TerraformBrushSize">
+            <summary>
+            The tool size to use when changing terrain levels
+            </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 name="F:OpenMetaverse.TerraformBrushSize.Small">
+            <summary>Small</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 name="F:OpenMetaverse.TerraformBrushSize.Medium">
+            <summary>Medium</summary>
         </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupInvitation">
-            <summary>Raised when another agent invites our avatar to join a group</summary>
+        <member name="F:OpenMetaverse.TerraformBrushSize.Large">
+            <summary>Large</summary>
         </member>
-        <member name="T:OpenMetaverse.CurrentGroupsEventArgs">
-            <summary>Contains the current groups your agent is a member of</summary>
+        <member name="T:OpenMetaverse.AccessDeniedReason">
+            <summary>
+            Reasons agent is denied access to a parcel on the simulator
+            </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 name="F:OpenMetaverse.AccessDeniedReason.NotDenied">
+            <summary>Agent is not denied, access is granted</summary>
         </member>
-        <member name="P:OpenMetaverse.CurrentGroupsEventArgs.Groups">
-            <summary>Get the current groups your agent is a member of</summary>
+        <member name="F:OpenMetaverse.AccessDeniedReason.NotInGroup">
+            <summary>Agent is not a member of the group set for the parcel, or which owns the parcel</summary>
         </member>
-        <member name="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 name="F:OpenMetaverse.AccessDeniedReason.NotOnAllowList">
+            <summary>Agent is not on the parcels specific allow list</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 name="F:OpenMetaverse.AccessDeniedReason.BannedFromParcel">
+            <summary>Agent is on the parcels ban list</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupNamesEventArgs.GroupNames">
-            <summary>Get the Group Names dictionary</summary>
+        <member name="F:OpenMetaverse.AccessDeniedReason.NoAccess">
+            <summary>Unknown</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupMembersReplyEventArgs">
-            <summary>Represents the members of a group</summary>
+        <member name="F:OpenMetaverse.AccessDeniedReason.NotAgeVerified">
+            <summary>Agent is not age verified and parcel settings deny access to non age verified avatars</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupMembersReplyEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.GroupMember})">
+        <member name="T:OpenMetaverse.ParcelOverlayType">
             <summary>
-            Construct a new instance of the GroupMembersReplyEventArgs class
+            Parcel overlay type. This is used primarily for highlighting and
+            coloring which is why it is a single integer instead of a set of
+            flags
             </summary>
-            <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>
+            <remarks>These values seem to be poorly thought out. The first three
+            bits represent a single value, not flags. For example Auction (0x05) is
+            not a combination of OwnedByOther (0x01) and ForSale(0x04). However,
+            the BorderWest and BorderSouth values are bit flags that get attached
+            to the value stored in the first three bits. Bits four, five, and six
+            are unused</remarks>
         </member>
-        <member name="P:OpenMetaverse.GroupMembersReplyEventArgs.RequestID">
-            <summary>Get the ID as returned by the request to correlate
-            this result set and the request</summary>
+        <member name="F:OpenMetaverse.ParcelOverlayType.Public">
+            <summary>Public land</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupMembersReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
+        <member name="F:OpenMetaverse.ParcelOverlayType.OwnedByOther">
+            <summary>Land is owned by another avatar</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupMembersReplyEventArgs.Members">
-            <summary>Get the dictionary of members</summary>
+        <member name="F:OpenMetaverse.ParcelOverlayType.OwnedByGroup">
+            <summary>Land is owned by a group</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupRolesDataReplyEventArgs">
-            <summary>Represents the roles associated with a group</summary>
+        <member name="F:OpenMetaverse.ParcelOverlayType.OwnedBySelf">
+            <summary>Land is owned by the current avatar</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 name="F:OpenMetaverse.ParcelOverlayType.ForSale">
+            <summary>Land is for sale</summary>
         </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 name="F:OpenMetaverse.ParcelOverlayType.Auction">
+            <summary>Land is being auctioned</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupRolesDataReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
+        <member name="F:OpenMetaverse.ParcelOverlayType.Private">
+            <summary>Land is private</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupRolesDataReplyEventArgs.Roles">
-            <summary>Get the dictionary containing the roles</summary>
+        <member name="F:OpenMetaverse.ParcelOverlayType.BorderWest">
+            <summary>To the west of this area is a parcel border</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupRolesMembersReplyEventArgs">
-            <summary>Represents the Role to Member mappings for a group</summary>
+        <member name="F:OpenMetaverse.ParcelOverlayType.BorderSouth">
+            <summary>To the south of this area is a parcel border</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 name="T:OpenMetaverse.ParcelFlags">
+            <summary>
+            Various parcel properties
+            </summary>
         </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 name="F:OpenMetaverse.ParcelFlags.None">
+            <summary>No flags set</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupRolesMembersReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowFly">
+            <summary>Allow avatars to fly (a client-side only restriction)</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowOtherScripts">
+            <summary>Allow foreign scripts to run</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.ForSale">
+            <summary>This parcel is for sale</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowLandmark">
+            <summary>Allow avatars to create a landmark on this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowTerraform">
+            <summary>Allows all avatars to edit the terrain on this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowDamage">
+            <summary>Avatars have health and can take damage on this parcel.
+            If set, avatars can be killed and sent home here</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupRolesMembersReplyEventArgs.RolesMembers">
-            <summary>Get the member to roles map</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.CreateObjects">
+            <summary>Foreign avatars can create objects here</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupTitlesReplyEventArgs">
-            <summary>Represents the titles for a group</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.ForSaleObjects">
+            <summary>All objects on this parcel can be purchased</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 name="F:OpenMetaverse.ParcelFlags.UseAccessGroup">
+            <summary>Access is restricted to a group</summary>
         </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 name="F:OpenMetaverse.ParcelFlags.UseAccessList">
+            <summary>Access is restricted to a whitelist</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupTitlesReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.UseBanList">
+            <summary>Ban blacklist is enabled</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupTitlesReplyEventArgs.Titles">
-            <summary>Get the titles</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.UsePassList">
+            <summary>Unknown</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupAccountSummaryReplyEventArgs">
-            <summary>Represents the summary data for a group</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.ShowDirectory">
+            <summary>List this parcel in the search directory</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 name="F:OpenMetaverse.ParcelFlags.AllowDeedToGroup">
+            <summary>Allow personally owned parcels to be deeded to group</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupAccountSummaryReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.ContributeWithDeed">
+            <summary>If Deeded, owner contributes required tier to group parcel is deeded to</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupAccountSummaryReplyEventArgs.Summary">
-            <summary>Get the summary data</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.SoundLocal">
+            <summary>Restrict sounds originating on this parcel to the 
+            parcel boundaries</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupCreatedReplyEventArgs">
-            <summary>A response to a group create request</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.SellParcelObjects">
+            <summary>Objects on this parcel are sold when the land is 
+            purchsaed</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 name="F:OpenMetaverse.ParcelFlags.AllowPublish">
+            <summary>Allow this parcel to be published on the web</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupCreatedReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.MaturePublish">
+            <summary>The information for this parcel is mature content</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupCreatedReplyEventArgs.Success">
-            <summary>true of the  group was created successfully</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.UrlWebPage">
+            <summary>The media URL is an HTML page</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupCreatedReplyEventArgs.Message">
-            <summary>A string containing the message</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.UrlRawHtml">
+            <summary>The media URL is a raw HTML string</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupOperationEventArgs">
-            <summary>Represents a response to a request</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.RestrictPushObject">
+            <summary>Restrict foreign object pushes</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 name="F:OpenMetaverse.ParcelFlags.DenyAnonymous">
+            <summary>Ban all non identified/transacted avatars</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupOperationEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowGroupScripts">
+            <summary>Allow group-owned scripts to run</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupOperationEventArgs.Success">
-            <summary>true of the request was successful</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.CreateGroupObjects">
+            <summary>Allow object creation by group members or group 
+            objects</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupDroppedEventArgs">
-            <summary>Represents your agent leaving a group</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowAPrimitiveEntry">
+            <summary>Allow all objects to enter this parcel</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 name="F:OpenMetaverse.ParcelFlags.AllowGroupObjectEntry">
+            <summary>Only allow group and owner objects to enter this parcel</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupDroppedEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowVoiceChat">
+            <summary>Voice Enabled on this parcel</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupNoticesListReplyEventArgs">
-            <summary>Represents a list of active group notices</summary>
+        <member name="F:OpenMetaverse.ParcelFlags.UseEstateVoiceChan">
+            <summary>Use Estate Voice channel for Voice on this parcel</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.ParcelFlags.DenyAgeUnverified">
+            <summary>Deny Age Unverified Users</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupNoticesListReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
+        <member name="T:OpenMetaverse.ParcelStatus">
+            <summary>
+            Parcel ownership status
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.GroupNoticesListReplyEventArgs.Notices">
-            <summary>Get the notices list</summary>
+        <member name="F:OpenMetaverse.ParcelStatus.None">
+            <summary>Placeholder</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupProfileEventArgs">
-            <summary>Represents the profile of a group</summary>
+        <member name="F:OpenMetaverse.ParcelStatus.Leased">
+            <summary>Parcel is leased (owned) by an avatar or group</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.ParcelStatus.LeasePending">
+            <summary>Parcel is in process of being leased (purchased) by an avatar or group</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupProfileEventArgs.Group">
-            <summary>Get the group profile</summary>
+        <member name="F:OpenMetaverse.ParcelStatus.Abandoned">
+            <summary>Parcel has been abandoned back to Governor Linden</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupInvitationEventArgs">
+        <member name="T:OpenMetaverse.ParcelCategory">
             <summary>
-            Provides notification of a group invitation request sent by another Avatar
+            Category parcel is listed in under search
             </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="P:OpenMetaverse.GroupInvitationEventArgs.AgentID">
-            <summary>The ID of the Avatar sending the group invitation</summary>
+        <member name="F:OpenMetaverse.ParcelCategory.None">
+            <summary>No assigned category</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupInvitationEventArgs.FromName">
-            <summary>The name of the Avatar sending the group invitation</summary>
+        <member name="F:OpenMetaverse.ParcelCategory.Linden">
+            <summary>Linden Infohub or public area</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.ParcelCategory.Adult">
+            <summary>Adult themed area</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupInvitationEventArgs.Simulator">
-            <summary>The Simulator</summary>
+        <member name="F:OpenMetaverse.ParcelCategory.Arts">
+            <summary>Arts and Culture</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupInvitationEventArgs.Accept">
-            <summary>Set to true to accept invitation, false to decline</summary>
+        <member name="F:OpenMetaverse.ParcelCategory.Business">
+            <summary>Business</summary>
         </member>
-        <member name="T:OpenMetaverse.Rendering.LindenMesh.LODMesh">
-            <summary>
-            Level of Detail mesh
-            </summary>
+        <member name="F:OpenMetaverse.ParcelCategory.Educational">
+            <summary>Educational</summary>
         </member>
-        <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 name="F:OpenMetaverse.ParcelCategory.Gaming">
+            <summary>Gaming</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetClothing.#ctor">
-            <summary>Initializes a new instance of an AssetScriptBinary object</summary>
+        <member name="F:OpenMetaverse.ParcelCategory.Hangout">
+            <summary>Hangout or Club</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 name="F:OpenMetaverse.ParcelCategory.Newcomer">
+            <summary>Newcomer friendly</summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetClothing.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="F:OpenMetaverse.ParcelCategory.Park">
+            <summary>Parks and Nature</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.TarArchiveReader">
-            <summary>
-            Temporary code to do the bare minimum required to read a tar archive for our purposes
-            </summary>
+        <member name="F:OpenMetaverse.ParcelCategory.Residential">
+            <summary>Residential</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_br">
-            <summary>
-            Binary reader for the underlying stream
-            </summary>
+        <member name="F:OpenMetaverse.ParcelCategory.Shopping">
+            <summary>Shopping</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_nullCharArray">
-            <summary>
-            Used to trim off null chars
-            </summary>
+        <member name="F:OpenMetaverse.ParcelCategory.Stage">
+            <summary>Not Used?</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_spaceCharArray">
-            <summary>
-            Used to trim off space chars
-            </summary>
+        <member name="F:OpenMetaverse.ParcelCategory.Other">
+            <summary>Other</summary>
         </member>
-        <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 name="F:OpenMetaverse.ParcelCategory.Any">
+            <summary>Not an actual category, only used for queries</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadEntry(System.String@,OpenMetaverse.Assets.TarArchiveReader.TarEntryType@)">
+        <member name="T:OpenMetaverse.LandingType">
             <summary>
-            Read the next entry in the tar file.
+            Type of teleport landing for a parcel
             </summary>
-            <param name="filePath"></param>
-            <param name="entryType"></param>
-            <returns>the data for the entry.  Returns null if there are no more entries</returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadHeader">
-            <summary>
-            Read the next 512 byte chunk of data as a tar header.
-            </summary>
-            <returns>A tar header struct.  null if we have reached the end of the archive.</returns>
+        <member name="F:OpenMetaverse.LandingType.None">
+            <summary>Unset, simulator default</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadData(System.Int32)">
-            <summary>
-            Read data following a header
-            </summary>
-            <param name="fileSize"></param>
-            <returns></returns>
+        <member name="F:OpenMetaverse.LandingType.LandingPoint">
+            <summary>Specific landing point set for this parcel</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ConvertOctalBytesToDecimal(System.Byte[],System.Int32,System.Int32)">
-            <summary>
-            Convert octal bytes to a decimal representation
-            </summary>
-            <param name="bytes"></param>
-            <param name="count"></param>
-            <param name="startIndex"></param>
-            <returns></returns>
+        <member name="F:OpenMetaverse.LandingType.Direct">
+            <summary>No landing point set, direct teleports enabled for
+            this parcel</summary>
         </member>
-        <member name="T:OpenMetaverse.ObjectReturnType">
+        <member name="T:OpenMetaverse.ParcelMediaCommand">
             <summary>
-            Type of return to use when returning objects from a parcel
+            Parcel Media Command used in ParcelMediaCommandMessage
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectReturnType.None">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Stop">
+            <summary>Stop the media stream and go back to the first frame</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectReturnType.Owner">
-            <summary>Return objects owned by parcel owner</summary>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Pause">
+            <summary>Pause the media stream (stop playing but stay on current frame)</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectReturnType.Group">
-            <summary>Return objects set to group</summary>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Play">
+            <summary>Start the current media stream playing and stop when the end is reached</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectReturnType.Other">
-            <summary>Return objects not owned by parcel owner or set to group</summary>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Loop">
+            <summary>Start the current media stream playing, 
+            loop to the beginning when the end is reached and continue to play</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectReturnType.List">
-            <summary>Return a specific list of objects on parcel</summary>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Texture">
+            <summary>Specifies the texture to replace with video</summary>
+            <remarks>If passing the key of a texture, it must be explicitly typecast as a key, 
+            not just passed within double quotes.</remarks>
         </member>
-        <member name="F:OpenMetaverse.ObjectReturnType.Sell">
-            <summary>Return objects that are marked for-sale</summary>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.URL">
+            <summary>Specifies the movie URL (254 characters max)</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelAccessFlags">
-            <summary>
-            Blacklist/Whitelist flags used in parcels Access List
-            </summary>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Time">
+            <summary>Specifies the time index at which to begin playing</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelAccessFlags.NoAccess">
-            <summary>Agent is denied access</summary>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Agent">
+            <summary>Specifies a single agent to apply the media command to</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelAccessFlags.Access">
-            <summary>Agent is granted access</summary>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Unload">
+            <summary>Unloads the stream. While the stop command sets the texture to the first frame of the movie, 
+            unload resets it to the real texture that the movie was replacing.</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelResult">
-            <summary>
-            The result of a request for parcel properties
-            </summary>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.AutoAlign">
+            <summary>Turn on/off the auto align feature, similar to the auto align checkbox in the parcel media properties 
+            (NOT to be confused with the "align" function in the textures view of the editor!) Takes TRUE or FALSE as parameter.</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelResult.NoData">
-            <summary>No matches were found for the request</summary>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Type">
+            <summary>Allows a Web page or image to be placed on a prim (1.19.1 RC0 and later only). 
+            Use "text/html" for HTML.</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelResult.Single">
-            <summary>Request matched a single parcel</summary>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Size">
+            <summary>Resizes a Web page to fit on x, y pixels (1.19.1 RC0 and later only).</summary>
+            <remarks>This might still not be working</remarks>
         </member>
-        <member name="F:OpenMetaverse.ParcelResult.Multiple">
-            <summary>Request matched multiple parcels</summary>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Desc">
+            <summary>Sets a description for the media being displayed (1.19.1 RC0 and later only).</summary>
         </member>
-        <member name="T:OpenMetaverse.AccessList">
+        <member name="T:OpenMetaverse.ParcelInfo">
             <summary>
-            Flags used in the ParcelAccessListRequest packet to specify whether
-            we want the access list (whitelist), ban list (blacklist), or both
+            Some information about a parcel of land returned from a DirectoryManager search
             </summary>
         </member>
-        <member name="F:OpenMetaverse.AccessList.Access">
-            <summary>Request the access list</summary>
-        </member>
-        <member name="F:OpenMetaverse.AccessList.Ban">
-            <summary>Request the ban list</summary>
+        <member name="F:OpenMetaverse.ParcelInfo.ID">
+            <summary>Global Key of record</summary>
         </member>
-        <member name="F:OpenMetaverse.AccessList.Both">
-            <summary>Request both White and Black lists</summary>
+        <member name="F:OpenMetaverse.ParcelInfo.OwnerID">
+            <summary>Parcel Owners <seealso cref="T:OpenMetaverse.UUID"/></summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelPropertiesStatus">
-            <summary>
-            Sequence ID in ParcelPropertiesReply packets (sent when avatar
-            tries to cross a parcel border)
-            </summary>
+        <member name="F:OpenMetaverse.ParcelInfo.Name">
+            <summary>Name field of parcel, limited to 128 characters</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelPropertiesStatus.ParcelSelected">
-            <summary>Parcel is currently selected</summary>
+        <member name="F:OpenMetaverse.ParcelInfo.Description">
+            <summary>Description field of parcel, limited to 256 characters</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelPropertiesStatus.CollisionNotInGroup">
-            <summary>Parcel restricted to a group the avatar is not a
-            member of</summary>
+        <member name="F:OpenMetaverse.ParcelInfo.ActualArea">
+            <summary>Total Square meters of parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelPropertiesStatus.CollisionBanned">
-            <summary>Avatar is banned from the parcel</summary>
+        <member name="F:OpenMetaverse.ParcelInfo.BillableArea">
+            <summary>Total area billable as Tier, for group owned land this will be 10% less than ActualArea</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelPropertiesStatus.CollisionNotOnAccessList">
-            <summary>Parcel is restricted to an access list that the
-            avatar is not on</summary>
+        <member name="F:OpenMetaverse.ParcelInfo.Mature">
+            <summary>True of parcel is in Mature simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelPropertiesStatus.HoveredOverParcel">
-            <summary>Response to hovering over a parcel</summary>
+        <member name="F:OpenMetaverse.ParcelInfo.GlobalX">
+            <summary>Grid global X position of parcel</summary>
         </member>
-        <member name="T:OpenMetaverse.TerraformAction">
-            <summary>
-            The tool to use when modifying terrain levels
-            </summary>
+        <member name="F:OpenMetaverse.ParcelInfo.GlobalY">
+            <summary>Grid global Y position of parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.TerraformAction.Level">
-            <summary>Level the terrain</summary>
+        <member name="F:OpenMetaverse.ParcelInfo.GlobalZ">
+            <summary>Grid global Z position of parcel (not used)</summary>
         </member>
-        <member name="F:OpenMetaverse.TerraformAction.Raise">
-            <summary>Raise the terrain</summary>
+        <member name="F:OpenMetaverse.ParcelInfo.SimName">
+            <summary>Name of simulator parcel is located in</summary>
         </member>
-        <member name="F:OpenMetaverse.TerraformAction.Lower">
-            <summary>Lower the terrain</summary>
+        <member name="F:OpenMetaverse.ParcelInfo.SnapshotID">
+            <summary>Texture <seealso cref="T:OpenMetaverse.UUID"/> of parcels display picture</summary>
         </member>
-        <member name="F:OpenMetaverse.TerraformAction.Smooth">
-            <summary>Smooth the terrain</summary>
+        <member name="F:OpenMetaverse.ParcelInfo.Dwell">
+            <summary>Float representing calculated traffic based on time spent on parcel by avatars</summary>
         </member>
-        <member name="F:OpenMetaverse.TerraformAction.Noise">
-            <summary>Add random noise to the terrain</summary>
+        <member name="F:OpenMetaverse.ParcelInfo.SalePrice">
+            <summary>Sale price of parcel (not used)</summary>
         </member>
-        <member name="F:OpenMetaverse.TerraformAction.Revert">
-            <summary>Revert terrain to simulator default</summary>
+        <member name="F:OpenMetaverse.ParcelInfo.AuctionID">
+            <summary>Auction ID of parcel</summary>
         </member>
-        <member name="T:OpenMetaverse.TerraformBrushSize">
+        <member name="T:OpenMetaverse.ParcelMedia">
             <summary>
-            The tool size to use when changing terrain levels
+            Parcel Media Information
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TerraformBrushSize.Small">
-            <summary>Small</summary>
-        </member>
-        <member name="F:OpenMetaverse.TerraformBrushSize.Medium">
-            <summary>Medium</summary>
-        </member>
-        <member name="F:OpenMetaverse.TerraformBrushSize.Large">
-            <summary>Large</summary>
+        <member name="F:OpenMetaverse.ParcelMedia.MediaAutoScale">
+            <summary>A byte, if 0x1 viewer should auto scale media to fit object</summary>
         </member>
-        <member name="T:OpenMetaverse.AccessDeniedReason">
-            <summary>
-            Reasons agent is denied access to a parcel on the simulator
-            </summary>
+        <member name="F:OpenMetaverse.ParcelMedia.MediaLoop">
+            <summary>A boolean, if true the viewer should loop the media</summary>
         </member>
-        <member name="F:OpenMetaverse.AccessDeniedReason.NotDenied">
-            <summary>Agent is not denied, access is granted</summary>
+        <member name="F:OpenMetaverse.ParcelMedia.MediaID">
+            <summary>The Asset UUID of the Texture which when applied to a 
+            primitive will display the media</summary>
         </member>
-        <member name="F:OpenMetaverse.AccessDeniedReason.NotInGroup">
-            <summary>Agent is not a member of the group set for the parcel, or which owns the parcel</summary>
+        <member name="F:OpenMetaverse.ParcelMedia.MediaURL">
+            <summary>A URL which points to any Quicktime supported media type</summary>
         </member>
-        <member name="F:OpenMetaverse.AccessDeniedReason.NotOnAllowList">
-            <summary>Agent is not on the parcels specific allow list</summary>
+        <member name="F:OpenMetaverse.ParcelMedia.MediaDesc">
+            <summary>A description of the media</summary>
         </member>
-        <member name="F:OpenMetaverse.AccessDeniedReason.BannedFromParcel">
-            <summary>Agent is on the parcels ban list</summary>
+        <member name="F:OpenMetaverse.ParcelMedia.MediaHeight">
+            <summary>An Integer which represents the height of the media</summary>
         </member>
-        <member name="F:OpenMetaverse.AccessDeniedReason.NoAccess">
-            <summary>Unknown</summary>
+        <member name="F:OpenMetaverse.ParcelMedia.MediaWidth">
+            <summary>An integer which represents the width of the media</summary>
         </member>
-        <member name="F:OpenMetaverse.AccessDeniedReason.NotAgeVerified">
-            <summary>Agent is not age verified and parcel settings deny access to non age verified avatars</summary>
+        <member name="F:OpenMetaverse.ParcelMedia.MediaType">
+            <summary>A string which contains the mime type of the media</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelOverlayType">
+        <member name="T:OpenMetaverse.Parcel">
             <summary>
-            Parcel overlay type. This is used primarily for highlighting and
-            coloring which is why it is a single integer instead of a set of
-            flags
+            Parcel of land, a portion of virtual real estate in a simulator
             </summary>
-            <remarks>These values seem to be poorly thought out. The first three
-            bits represent a single value, not flags. For example Auction (0x05) is
-            not a combination of OwnedByOther (0x01) and ForSale(0x04). However,
-            the BorderWest and BorderSouth values are bit flags that get attached
-            to the value stored in the first three bits. Bits four, five, and six
-            are unused</remarks>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.Public">
-            <summary>Public land</summary>
+        <member name="F:OpenMetaverse.Parcel.SelfCount">
+            <summary>The total number of contiguous 4x4 meter blocks your agent owns within this parcel</summary>        
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.OwnedByOther">
-            <summary>Land is owned by another avatar</summary>
+        <member name="F:OpenMetaverse.Parcel.OtherCount">
+            <summary>The total number of contiguous 4x4 meter blocks contained in this parcel owned by a group or agent other than your own</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.OwnedByGroup">
-            <summary>Land is owned by a group</summary>
+        <member name="F:OpenMetaverse.Parcel.PublicCount">
+            <summary>Deprecated, Value appears to always be 0</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.OwnedBySelf">
-            <summary>Land is owned by the current avatar</summary>
+        <member name="F:OpenMetaverse.Parcel.LocalID">
+            <summary>Simulator-local ID of this parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.ForSale">
-            <summary>Land is for sale</summary>
+        <member name="F:OpenMetaverse.Parcel.OwnerID">
+            <summary>UUID of the owner of this parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.Auction">
-            <summary>Land is being auctioned</summary>
+        <member name="F:OpenMetaverse.Parcel.IsGroupOwned">
+            <summary>Whether the land is deeded to a group or not</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.Private">
-            <summary>Land is private</summary>
+        <member name="F:OpenMetaverse.Parcel.AuctionID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.BorderWest">
-            <summary>To the west of this area is a parcel border</summary>
+        <member name="F:OpenMetaverse.Parcel.ClaimDate">
+            <summary>Date land was claimed</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.BorderSouth">
-            <summary>To the south of this area is a parcel border</summary>
+        <member name="F:OpenMetaverse.Parcel.ClaimPrice">
+            <summary>Appears to always be zero</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelFlags">
-            <summary>
-            Various parcel properties
-            </summary>
+        <member name="F:OpenMetaverse.Parcel.RentPrice">
+            <summary>This field is no longer used</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.None">
-            <summary>No flags set</summary>
+        <member name="F:OpenMetaverse.Parcel.AABBMin">
+            <summary>Minimum corner of the axis-aligned bounding box for this
+            parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowFly">
-            <summary>Allow avatars to fly (a client-side only restriction)</summary>
+        <member name="F:OpenMetaverse.Parcel.AABBMax">
+            <summary>Maximum corner of the axis-aligned bounding box for this
+            parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.Bitmap">
+            <summary>Bitmap describing land layout in 4x4m squares across the 
+            entire region</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowOtherScripts">
-            <summary>Allow foreign scripts to run</summary>
+        <member name="F:OpenMetaverse.Parcel.Area">
+            <summary>Total parcel land area</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.ForSale">
-            <summary>This parcel is for sale</summary>
+        <member name="F:OpenMetaverse.Parcel.Status">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowLandmark">
-            <summary>Allow avatars to create a landmark on this parcel</summary>
+        <member name="F:OpenMetaverse.Parcel.SimWideMaxPrims">
+            <summary>Maximum primitives across the entire simulator owned by the same agent or group that owns this parcel that can be used</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowTerraform">
-            <summary>Allows all avatars to edit the terrain on this parcel</summary>
+        <member name="F:OpenMetaverse.Parcel.SimWideTotalPrims">
+            <summary>Total primitives across the entire simulator calculated by combining the allowed prim counts for each parcel
+            owned by the agent or group that owns this parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowDamage">
-            <summary>Avatars have health and can take damage on this parcel.
-            If set, avatars can be killed and sent home here</summary>
+        <member name="F:OpenMetaverse.Parcel.MaxPrims">
+            <summary>Maximum number of primitives this parcel supports</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.CreateObjects">
-            <summary>Foreign avatars can create objects here</summary>
+        <member name="F:OpenMetaverse.Parcel.TotalPrims">
+            <summary>Total number of primitives on this parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.ForSaleObjects">
-            <summary>All objects on this parcel can be purchased</summary>
+        <member name="F:OpenMetaverse.Parcel.OwnerPrims">
+            <summary>For group-owned parcels this indicates the total number of prims deeded to the group,
+            for parcels owned by an individual this inicates the number of prims owned by the individual</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UseAccessGroup">
-            <summary>Access is restricted to a group</summary>
+        <member name="F:OpenMetaverse.Parcel.GroupPrims">
+            <summary>Total number of primitives owned by the parcel group on 
+            this parcel, or for parcels owned by an individual with a group set the
+            total number of prims set to that group.</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UseAccessList">
-            <summary>Access is restricted to a whitelist</summary>
+        <member name="F:OpenMetaverse.Parcel.OtherPrims">
+            <summary>Total number of prims owned by other avatars that are not set to group, or not the parcel owner</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UseBanList">
-            <summary>Ban blacklist is enabled</summary>
+        <member name="F:OpenMetaverse.Parcel.ParcelPrimBonus">
+            <summary>A bonus multiplier which allows parcel prim counts to go over times this amount, this does not affect
+            the max prims per simulator. e.g: 117 prim parcel limit x 1.5 bonus = 175 allowed</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UsePassList">
-            <summary>Unknown</summary>
+        <member name="F:OpenMetaverse.Parcel.OtherCleanTime">
+            <summary>Autoreturn value in minutes for others' objects</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.ShowDirectory">
-            <summary>List this parcel in the search directory</summary>
+        <member name="F:OpenMetaverse.Parcel.Flags">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowDeedToGroup">
-            <summary>Allow personally owned parcels to be deeded to group</summary>
+        <member name="F:OpenMetaverse.Parcel.SalePrice">
+            <summary>Sale price of the parcel, only useful if ForSale is set</summary>
+            <remarks>The SalePrice will remain the same after an ownership
+            transfer (sale), so it can be used to see the purchase price after
+            a sale if the new owner has not changed it</remarks>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.ContributeWithDeed">
-            <summary>If Deeded, owner contributes required tier to group parcel is deeded to</summary>
+        <member name="F:OpenMetaverse.Parcel.Name">
+            <summary>Parcel Name</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.SoundLocal">
-            <summary>Restrict sounds originating on this parcel to the 
-            parcel boundaries</summary>
+        <member name="F:OpenMetaverse.Parcel.Desc">
+            <summary>Parcel Description</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.SellParcelObjects">
-            <summary>Objects on this parcel are sold when the land is 
-            purchsaed</summary>
+        <member name="F:OpenMetaverse.Parcel.MusicURL">
+            <summary>URL For Music Stream</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowPublish">
-            <summary>Allow this parcel to be published on the web</summary>
+        <member name="F:OpenMetaverse.Parcel.GroupID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.MaturePublish">
-            <summary>The information for this parcel is mature content</summary>
+        <member name="F:OpenMetaverse.Parcel.PassPrice">
+            <summary>Price for a temporary pass</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UrlWebPage">
-            <summary>The media URL is an HTML page</summary>
+        <member name="F:OpenMetaverse.Parcel.PassHours">
+            <summary>How long is pass valid for</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UrlRawHtml">
-            <summary>The media URL is a raw HTML string</summary>
+        <member name="F:OpenMetaverse.Parcel.Category">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.RestrictPushObject">
-            <summary>Restrict foreign object pushes</summary>
+        <member name="F:OpenMetaverse.Parcel.AuthBuyerID">
+            <summary>Key of authorized buyer</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.DenyAnonymous">
-            <summary>Ban all non identified/transacted avatars</summary>
+        <member name="F:OpenMetaverse.Parcel.SnapshotID">
+            <summary>Key of parcel snapshot</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowGroupScripts">
-            <summary>Allow group-owned scripts to run</summary>
+        <member name="F:OpenMetaverse.Parcel.UserLocation">
+            <summary>The landing point location</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.CreateGroupObjects">
-            <summary>Allow object creation by group members or group 
-            objects</summary>
+        <member name="F:OpenMetaverse.Parcel.UserLookAt">
+            <summary>The landing point LookAt</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowAPrimitiveEntry">
-            <summary>Allow all objects to enter this parcel</summary>
+        <member name="F:OpenMetaverse.Parcel.Landing">
+            <summary>The type of landing enforced from the <see cref="T:OpenMetaverse.LandingType"/> enum</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowGroupObjectEntry">
-            <summary>Only allow group and owner objects to enter this parcel</summary>
+        <member name="F:OpenMetaverse.Parcel.Dwell">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowVoiceChat">
-            <summary>Voice Enabled on this parcel</summary>
+        <member name="F:OpenMetaverse.Parcel.RegionDenyAnonymous">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UseEstateVoiceChan">
-            <summary>Use Estate Voice channel for Voice on this parcel</summary>
+        <member name="F:OpenMetaverse.Parcel.RegionPushOverride">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.DenyAgeUnverified">
-            <summary>Deny Age Unverified Users</summary>
+        <member name="F:OpenMetaverse.Parcel.AccessWhiteList">
+            <summary>Access list of who is whitelisted on this
+            parcel</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelStatus">
-            <summary>
-            Parcel ownership status
-            </summary>
+        <member name="F:OpenMetaverse.Parcel.AccessBlackList">
+            <summary>Access list of who is blacklisted on this
+            parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelStatus.None">
-            <summary>Placeholder</summary>
+        <member name="F:OpenMetaverse.Parcel.RegionDenyAgeUnverified">
+            <summary>TRUE of region denies access to age unverified users</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelStatus.Leased">
-            <summary>Parcel is leased (owned) by an avatar or group</summary>
+        <member name="F:OpenMetaverse.Parcel.ObscureMedia">
+            <summary>true to obscure (hide) media url</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelStatus.LeasePending">
-            <summary>Parcel is in process of being leased (purchased) by an avatar or group</summary>
+        <member name="F:OpenMetaverse.Parcel.ObscureMusic">
+            <summary>true to obscure (hide) music url</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelStatus.Abandoned">
-            <summary>Parcel has been abandoned back to Governor Linden</summary>
+        <member name="F:OpenMetaverse.Parcel.Media">
+            <summary>A struct containing media details</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelCategory">
+        <member name="M:OpenMetaverse.Parcel.ToString">
             <summary>
-            Category parcel is listed in under search
+            Displays a parcel object in string format
             </summary>
+            <returns>string containing key=value pairs of a parcel object</returns>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.None">
-            <summary>No assigned category</summary>
+        <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.ParcelCategory.Linden">
-            <summary>Linden Infohub or public area</summary>
+        <member name="M:OpenMetaverse.Parcel.Update(OpenMetaverse.Simulator,System.Boolean)">
+            <summary>
+            Update the simulator with any local changes to this Parcel object
+            </summary>
+            <param name="simulator">Simulator to send updates to</param>
+            <param name="wantReply">Whether we want the simulator to confirm
+            the update with a reply packet or not</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Adult">
-            <summary>Adult themed area</summary>
+        <member name="M:OpenMetaverse.Parcel.UpdateOtherCleanTime(OpenMetaverse.Simulator)">
+            <summary>
+            Set Autoreturn time
+            </summary>
+            <param name="simulator">Simulator to send the update to</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Arts">
-            <summary>Arts and Culture</summary>
+        <member name="T:OpenMetaverse.ParcelManager">
+            <summary>
+            Parcel (subdivided simulator lots) subsystem
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Business">
-            <summary>Business</summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_DwellReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Educational">
-            <summary>Educational</summary>
+        <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.ParcelCategory.Gaming">
-            <summary>Gaming</summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_DwellReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Hangout">
-            <summary>Hangout or Club</summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelInfo">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Newcomer">
-            <summary>Newcomer friendly</summary>
+        <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.ParcelCategory.Park">
-            <summary>Parks and Nature</summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelInfoLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Residential">
-            <summary>Residential</summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelProperties">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Shopping">
-            <summary>Shopping</summary>
+        <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.ParcelCategory.Stage">
-            <summary>Not Used?</summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelPropertiesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Other">
-            <summary>Other</summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelACL">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Any">
-            <summary>Not an actual category, only used for queries</summary>
+        <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="T:OpenMetaverse.LandingType">
-            <summary>
-            Type of teleport landing for a parcel
-            </summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelACLLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.LandingType.None">
-            <summary>Unset, simulator default</summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelObjectOwnersReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.LandingType.LandingPoint">
-            <summary>Specific landing point set for this parcel</summary>
+        <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.LandingType.Direct">
-            <summary>No landing point set, direct teleports enabled for
-            this parcel</summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_SimParcelsDownloaded">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelMediaCommand">
-            <summary>
-            Parcel Media Command used in ParcelMediaCommandMessage
-            </summary>
+        <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.ParcelMediaCommand.Stop">
-            <summary>Stop the media stream and go back to the first frame</summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_SimParcelsDownloadedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Pause">
-            <summary>Pause the media stream (stop playing but stay on current frame)</summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_ForceSelectObjects">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Play">
-            <summary>Start the current media stream playing and stop when the end is reached</summary>
+        <member name="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.ParcelMediaCommand.Loop">
-            <summary>Start the current media stream playing, 
-            loop to the beginning when the end is reached and continue to play</summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_ForceSelectObjectsLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Texture">
-            <summary>Specifies the texture to replace with video</summary>
-            <remarks>If passing the key of a texture, it must be explicitly typecast as a key, 
-            not just passed within double quotes.</remarks>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaUpdateReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.URL">
-            <summary>Specifies the movie URL (254 characters max)</summary>
+        <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.ParcelMediaCommand.Time">
-            <summary>Specifies the time index at which to begin playing</summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaUpdateReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Agent">
-            <summary>Specifies a single agent to apply the media command to</summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaCommand">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Unload">
-            <summary>Unloads the stream. While the stop command sets the texture to the first frame of the movie, 
-            unload resets it to the real texture that the movie was replacing.</summary>
+        <member name="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.ParcelMediaCommand.AutoAlign">
-            <summary>Turn on/off the auto align feature, similar to the auto align checkbox in the parcel media properties 
-            (NOT to be confused with the "align" function in the textures view of the editor!) Takes TRUE or FALSE as parameter.</summary>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaCommandLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Type">
-            <summary>Allows a Web page or image to be placed on a prim (1.19.1 RC0 and later only). 
-            Use "text/html" for HTML.</summary>
+        <member name="M:OpenMetaverse.ParcelManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Default constructor
+            </summary>
+            <param name="client">A reference to the GridClient object</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Size">
-            <summary>Resizes a Web page to fit on x, y pixels (1.19.1 RC0 and later only).</summary>
-            <remarks>This might still not be working</remarks>
+        <member name="M:OpenMetaverse.ParcelManager.RequestParcelInfo(OpenMetaverse.UUID)">
+            <summary>
+            Request basic information for a single parcel
+            </summary>
+            <param name="parcelID">Simulator-local ID of the parcel</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Desc">
-            <summary>Sets a description for the media being displayed (1.19.1 RC0 and later only).</summary>
+        <member name="M:OpenMetaverse.ParcelManager.RequestParcelProperties(OpenMetaverse.Simulator,System.Int32,System.Int32)">
+            <summary>
+            Request properties of a single parcel
+            </summary>
+            <param name="simulator">Simulator containing the parcel</param>
+            <param name="localID">Simulator-local ID of the parcel</param>
+            <param name="sequenceID">An arbitrary integer that will be returned
+            with the ParcelProperties reply, useful for distinguishing between
+            multiple simultaneous requests</param>
         </member>
-        <member name="T:OpenMetaverse.ParcelInfo">
+        <member name="M:OpenMetaverse.ParcelManager.RequestParcelAccessList(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.AccessList,System.Int32)">
             <summary>
-            Some information about a parcel of land returned from a DirectoryManager search
+            Request the access list for a single parcel
             </summary>
+            <param name="simulator">Simulator containing the parcel</param>
+            <param name="localID">Simulator-local ID of the parcel</param>
+            <param name="sequenceID">An arbitrary integer that will be returned
+            with the ParcelAccessList reply, useful for distinguishing between
+            multiple simultaneous requests</param>
+            <param name="flags"></param>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.ID">
-            <summary>Global Key of record</summary>
+        <member name="M:OpenMetaverse.ParcelManager.RequestParcelProperties(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single,System.Int32,System.Boolean)">
+            <summary>
+            Request properties of parcels using a bounding box selection
+            </summary>
+            <param name="simulator">Simulator containing the parcel</param>
+            <param name="north">Northern boundary of the parcel selection</param>
+            <param name="east">Eastern boundary of the parcel selection</param>
+            <param name="south">Southern boundary of the parcel selection</param>
+            <param name="west">Western boundary of the parcel selection</param>
+            <param name="sequenceID">An arbitrary integer that will be returned
+            with the ParcelProperties reply, useful for distinguishing between
+            different types of parcel property requests</param>
+            <param name="snapSelection">A boolean that is returned with the
+            ParcelProperties reply, useful for snapping focus to a single
+            parcel</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.OwnerID">
-            <summary>Parcel Owners <seealso cref="T:OpenMetaverse.UUID"/></summary>
+        <member name="M:OpenMetaverse.ParcelManager.RequestAllSimParcels(OpenMetaverse.Simulator)">
+            <summary>
+            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="F:OpenMetaverse.ParcelInfo.Name">
-            <summary>Name field of parcel, limited to 128 characters</summary>
+        <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> 
+            dictionary)
+            </summary>
+            <param name="simulator">Simulator to request parcels from (must be connected)</param>
+            <param name="refresh">If TRUE, will force a full refresh</param>
+            <param name="msDelay">Number of milliseconds to pause in between each request</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.Description">
-            <summary>Description field of parcel, limited to 256 characters</summary>
+        <member name="M:OpenMetaverse.ParcelManager.RequestDwell(OpenMetaverse.Simulator,System.Int32)">
+            <summary>
+            Request the dwell value for a parcel
+            </summary>
+            <param name="simulator">Simulator containing the parcel</param>
+            <param name="localID">Simulator-local ID of the parcel</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.ActualArea">
-            <summary>Total Square meters of parcel</summary>
+        <member name="M:OpenMetaverse.ParcelManager.Buy(OpenMetaverse.Simulator,System.Int32,System.Boolean,OpenMetaverse.UUID,System.Boolean,System.Int32,System.Int32)">
+            <summary>
+            Send a request to Purchase a parcel of land
+            </summary>
+            <param name="simulator">The Simulator the parcel is located in</param>
+            <param name="localID">The parcels region specific local ID</param>
+            <param name="forGroup">true if this parcel is being purchased by a group</param>
+            <param name="groupID">The groups <seealso cref="T:OpenMetaverse.UUID"/></param>
+            <param name="removeContribution">true to remove tier contribution if purchase is successful</param>
+            <param name="parcelArea">The parcels size</param>
+            <param name="parcelPrice">The purchase price of the parcel</param>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.BillableArea">
-            <summary>Total area billable as Tier, for group owned land this will be 10% less than ActualArea</summary>
+        <member name="M:OpenMetaverse.ParcelManager.Reclaim(OpenMetaverse.Simulator,System.Int32)">
+            <summary>
+            Reclaim a parcel of land
+            </summary>
+            <param name="simulator">The simulator the parcel is in</param>
+            <param name="localID">The parcels region specific local ID</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.Mature">
-            <summary>True of parcel is in Mature simulator</summary>
+        <member name="M:OpenMetaverse.ParcelManager.DeedToGroup(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.UUID)">
+            <summary>
+            Deed a parcel to a group
+            </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>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.GlobalX">
-            <summary>Grid global X position of parcel</summary>
+        <member name="M:OpenMetaverse.ParcelManager.RequestObjectOwners(OpenMetaverse.Simulator,System.Int32)">
+            <summary>
+            Request prim owners of a parcel of land.
+            </summary>
+            <param name="simulator">Simulator parcel is in</param>
+            <param name="localID">The parcels region specific local ID</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.GlobalY">
-            <summary>Grid global Y position of parcel</summary>
+        <member name="M:OpenMetaverse.ParcelManager.ReturnObjects(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.ObjectReturnType,System.Collections.Generic.List{OpenMetaverse.UUID})">
+            <summary>
+            Return objects from a parcel
+            </summary>
+            <param name="simulator">Simulator parcel is in</param>
+            <param name="localID">The parcels region specific local ID</param>
+            <param name="type">the type of objects to return, <seealso cref="T:OpenMetaverse.ObjectReturnType"/></param>
+            <param name="ownerIDs">A list containing object owners <seealso cref="T:OpenMetaverse.UUID"/>s to return</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.GlobalZ">
-            <summary>Grid global Z position of parcel (not used)</summary>
+        <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>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.SimName">
-            <summary>Name of simulator parcel is located in</summary>
+        <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>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.SnapshotID">
-            <summary>Texture <seealso cref="T:OpenMetaverse.UUID"/> of parcels display picture</summary>
+        <member name="M:OpenMetaverse.ParcelManager.GetParcelLocalID(OpenMetaverse.Simulator,OpenMetaverse.Vector3)">
+            <summary>
+            Get a parcels LocalID
+            </summary>
+            <param name="simulator">Simulator parcel is in</param>
+            <param name="position">Vector3 position in simulator (Z not used)</param>
+            <returns>0 on failure, or parcel LocalID on success.</returns>
+            <remarks>A call to <code>Parcels.RequestAllSimParcels</code> is required to populate map and
+            dictionary.</remarks>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.Dwell">
-            <summary>Float representing calculated traffic based on time spent on parcel by avatars</summary>
+        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize)">
+            <summary>
+            Terraform (raise, lower, etc) an area or whole parcel of land
+            </summary>
+            <param name="simulator">Simulator land area is in.</param>
+            <param name="localID">LocalID of parcel, or -1 if using bounding box</param>
+            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
+            <param name="brushSize">Size of area to modify</param>
+            <returns>true on successful request sent.</returns>
+            <remarks>Settings.STORE_LAND_PATCHES must be true, 
+            Parcel information must be downloaded using <code>RequestAllSimParcels()</code></remarks>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.SalePrice">
-            <summary>Sale price of parcel (not used)</summary>
+        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize)">
+            <summary>
+            Terraform (raise, lower, etc) an area or whole parcel of land
+            </summary>
+            <param name="simulator">Simulator land area is in.</param>
+            <param name="west">west border of area to modify</param>
+            <param name="south">south border of area to modify</param>
+            <param name="east">east border of area to modify</param>
+            <param name="north">north border of area to modify</param>
+            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
+            <param name="brushSize">Size of area to modify</param>
+            <returns>true on successful request sent.</returns>
+            <remarks>Settings.STORE_LAND_PATCHES must be true, 
+            Parcel information must be downloaded using <code>RequestAllSimParcels()</code></remarks>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.AuctionID">
-            <summary>Auction ID of parcel</summary>
+        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Int32,System.Single,System.Single,System.Single,System.Single,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize,System.Int32)">
+            <summary>
+            Terraform (raise, lower, etc) an area or whole parcel of land
+            </summary>
+            <param name="simulator">Simulator land area is in.</param>
+            <param name="localID">LocalID of parcel, or -1 if using bounding box</param>
+            <param name="west">west border of area to modify</param>
+            <param name="south">south border of area to modify</param>
+            <param name="east">east border of area to modify</param>
+            <param name="north">north border of area to modify</param>
+            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
+            <param name="brushSize">Size of area to modify</param>
+            <param name="seconds">How many meters + or - to lower, 1 = 1 meter</param>
+            <returns>true on successful request sent.</returns>
+            <remarks>Settings.STORE_LAND_PATCHES must be true, 
+            Parcel information must be downloaded using <code>RequestAllSimParcels()</code></remarks>
         </member>
-        <member name="T:OpenMetaverse.ParcelMedia">
+        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Int32,System.Single,System.Single,System.Single,System.Single,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize,System.Int32,System.Single)">
             <summary>
-            Parcel Media Information
+            Terraform (raise, lower, etc) an area or whole parcel of land
             </summary>
+            <param name="simulator">Simulator land area is in.</param>
+            <param name="localID">LocalID of parcel, or -1 if using bounding box</param>
+            <param name="west">west border of area to modify</param>
+            <param name="south">south border of area to modify</param>
+            <param name="east">east border of area to modify</param>
+            <param name="north">north border of area to modify</param>
+            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
+            <param name="brushSize">Size of area to modify</param>
+            <param name="seconds">How many meters + or - to lower, 1 = 1 meter</param>
+            <param name="height">Height at which the terraform operation is acting at</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaAutoScale">
-            <summary>A byte, if 0x1 viewer should auto scale media to fit object</summary>
+        <member name="M:OpenMetaverse.ParcelManager.RequestSelectObjects(System.Int32,OpenMetaverse.ObjectReturnType,OpenMetaverse.UUID)">
+            <summary>
+            Sends a request to the simulator to return a list of objects owned by specific owners
+            </summary>
+            <param name="localID">Simulator local ID of parcel</param>
+            <param name="selectType">Owners, Others, Etc</param>
+            <param name="ownerID">List containing keys of avatars objects to select; 
+            if List is null will return Objects of type <c>selectType</c></param>
+            <remarks>Response data is returned in the event <seealso cref="E:ForceSelectObjectsReply"/></remarks>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaLoop">
-            <summary>A boolean, if true the viewer should loop the media</summary>
+        <member name="M:OpenMetaverse.ParcelManager.EjectUser(OpenMetaverse.UUID,System.Boolean)">
+            <summary>
+            Eject and optionally ban a user from a parcel
+            </summary>
+            <param name="targetID">target key of avatar to eject</param>
+            <param name="ban">true to also ban target</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaID">
-            <summary>The Asset UUID of the Texture which when applied to a 
-            primitive will display the media</summary>
+        <member name="M:OpenMetaverse.ParcelManager.FreezeUser(OpenMetaverse.UUID,System.Boolean)">
+            <summary>
+            Freeze or unfreeze an avatar over your land
+            </summary>
+            <param name="targetID">target key to freeze</param>
+            <param name="freeze">true to freeze, false to unfreeze</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaURL">
-            <summary>A URL which points to any Quicktime supported media type</summary>
+        <member name="M:OpenMetaverse.ParcelManager.ReleaseParcel(OpenMetaverse.Simulator,System.Int32)">
+            <summary>
+            Abandon a parcel of land
+            </summary>
+            <param name="simulator">Simulator parcel is in</param>
+            <param name="localID">Simulator local ID of parcel</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaDesc">
-            <summary>A description of the media</summary>
+        <member name="M:OpenMetaverse.ParcelManager.RequestRemoteParcelID(OpenMetaverse.Vector3,System.UInt64,OpenMetaverse.UUID)">
+            <summary>
+            Requests the UUID of the parcel in a remote region at a specified location
+            </summary>
+            <param name="location">Location of the parcel in the remote region</param>
+            <param name="regionHandle">Remote region handle</param>
+            <param name="regionID">Remote region UUID</param>
+            <returns>If successful UUID of the remote parcel, UUID.Zero otherwise</returns>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaHeight">
-            <summary>An Integer which represents the height of the media</summary>
+        <member name="M:OpenMetaverse.ParcelManager.GetParcelResouces(OpenMetaverse.UUID,System.Boolean,OpenMetaverse.ParcelManager.LandResourcesCallback)">
+            <summary>
+            Retrieves information on resources used by the parcel
+            </summary>
+            <param name="parcelID">UUID of the parcel</param>
+            <param name="getDetails">Should per object resource usage be requested</param>
+            <param name="callback">Callback invoked when the request is complete</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaWidth">
-            <summary>An integer which represents the width of the media</summary>
+        <member name="M:OpenMetaverse.ParcelManager.ParcelDwellReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelDwellReply"/> event</remarks>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaType">
-            <summary>A string which contains the mime type of the media</summary>
+        <member name="M:OpenMetaverse.ParcelManager.ParcelInfoReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelInfoReply"/> event</remarks>
         </member>
-        <member name="T:OpenMetaverse.Parcel">
-            <summary>
-            Parcel of land, a portion of virtual real estate in a simulator
-            </summary>
+        <member name="M:OpenMetaverse.ParcelManager.ParcelAccessListReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelAccessListReply"/> event</remarks>
         </member>
-        <member name="F:OpenMetaverse.Parcel.SelfCount">
-            <summary>The total number of contiguous 4x4 meter blocks your agent owns within this parcel</summary>        
+        <member name="M:OpenMetaverse.ParcelManager.SelectParcelObjectsReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ForceSelectObjectsReply"/> event</remarks>
         </member>
-        <member name="F:OpenMetaverse.Parcel.OtherCount">
-            <summary>The total number of contiguous 4x4 meter blocks contained in this parcel owned by a group or agent other than your own</summary>
+        <member name="M:OpenMetaverse.ParcelManager.ParcelMediaUpdateHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelMediaUpdateReply"/> event</remarks>
         </member>
-        <member name="F:OpenMetaverse.Parcel.PublicCount">
-            <summary>Deprecated, Value appears to always be 0</summary>
+        <member name="M:OpenMetaverse.ParcelManager.ParcelOverlayHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.Parcel.LocalID">
-            <summary>Simulator-local ID of this parcel</summary>
+        <member name="M:OpenMetaverse.ParcelManager.ParcelMediaCommandMessagePacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelMediaCommand"/> event</remarks>
         </member>
-        <member name="F:OpenMetaverse.Parcel.OwnerID">
-            <summary>UUID of the owner of this parcel</summary>
+        <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="F:OpenMetaverse.Parcel.IsGroupOwned">
-            <summary>Whether the land is deeded to a group or not</summary>
+        <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="F:OpenMetaverse.Parcel.AuctionID">
-            <summary></summary>
+        <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="F:OpenMetaverse.Parcel.ClaimDate">
-            <summary>Date land was claimed</summary>
+        <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="F:OpenMetaverse.Parcel.ClaimPrice">
-            <summary>Appears to always be zero</summary>
+        <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="F:OpenMetaverse.Parcel.RentPrice">
-            <summary>This field is no longer used</summary>
+        <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="F:OpenMetaverse.Parcel.AABBMin">
-            <summary>Minimum corner of the axis-aligned bounding box for this
-            parcel</summary>
+        <member name="E:OpenMetaverse.ParcelManager.ForceSelectObjectsReply">
+            <summary>Raised when the simulator responds to a <see cref="!:RequestForceSelectObjects"/> request</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.AABBMax">
-            <summary>Maximum corner of the axis-aligned bounding box for this
-            parcel</summary>
+        <member name="E:OpenMetaverse.ParcelManager.ParcelMediaUpdateReply">
+            <summary>Raised when the simulator responds to a Parcel Update request</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Bitmap">
-            <summary>Bitmap describing land layout in 4x4m squares across the 
-            entire region</summary>
+        <member name="E:OpenMetaverse.ParcelManager.ParcelMediaCommand">
+            <summary>Raised when the parcel your agent is located sends a ParcelMediaCommand</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Area">
-            <summary>Total parcel land area</summary>
+        <member name="T:OpenMetaverse.ParcelManager.ParcelAccessEntry">
+            <summary>
+            Parcel Accesslist
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Status">
+        <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.Parcel.SimWideMaxPrims">
-            <summary>Maximum primitives across the entire simulator owned by the same agent or group that owns this parcel that can be used</summary>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelAccessEntry.Flags">
+            <summary>Flags for specific entry in white/black lists</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.SimWideTotalPrims">
-            <summary>Total primitives across the entire simulator calculated by combining the allowed prim counts for each parcel
-            owned by the agent or group that owns this parcel</summary>
+        <member name="T:OpenMetaverse.ParcelManager.ParcelPrimOwners">
+            <summary>
+            Owners of primitives on parcel
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.MaxPrims">
-            <summary>Maximum number of primitives this parcel supports</summary>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.OwnerID">
+            <summary>Prim Owners <seealso cref="T:OpenMetaverse.UUID"/></summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.TotalPrims">
-            <summary>Total number of primitives on this parcel</summary>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.IsGroupOwned">
+            <summary>True of owner is group</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.OwnerPrims">
-            <summary>For group-owned parcels this indicates the total number of prims deeded to the group,
-            for parcels owned by an individual this inicates the number of prims owned by the individual</summary>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.Count">
+            <summary>Total count of prims owned by OwnerID</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.GroupPrims">
-            <summary>Total number of primitives owned by the parcel group on 
-            this parcel, or for parcels owned by an individual with a group set the
-            total number of prims set to that group.</summary>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.OnlineStatus">
+            <summary>true of OwnerID is currently online and is not a group</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.OtherPrims">
-            <summary>Total number of prims owned by other avatars that are not set to group, or not the parcel owner</summary>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.NewestPrim">
+            <summary>The date of the most recent prim left by OwnerID</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.ParcelPrimBonus">
-            <summary>A bonus multiplier which allows parcel prim counts to go over times this amount, this does not affect
-            the max prims per simulator. e.g: 117 prim parcel limit x 1.5 bonus = 175 allowed</summary>
+        <member name="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.Parcel.OtherCleanTime">
-            <summary>Autoreturn value in minutes for others' objects</summary>
+        <member name="T:OpenMetaverse.ParcelDwellReplyEventArgs">
+            <summary>Contains a parcels dwell data returned from the simulator in response to an <see cref="!:RequestParcelDwell"/></summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Flags">
-            <summary></summary>
+        <member name="M:OpenMetaverse.ParcelDwellReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Int32,System.Single)">
+            <summary>
+            Construct a new instance of the ParcelDwellReplyEventArgs class
+            </summary>
+            <param name="parcelID">The global ID of the parcel</param>
+            <param name="localID">The simulator specific ID of the parcel</param>
+            <param name="dwell">The calculated dwell for the parcel</param>
         </member>
-        <member name="F:OpenMetaverse.Parcel.SalePrice">
-            <summary>Sale price of the parcel, only useful if ForSale is set</summary>
-            <remarks>The SalePrice will remain the same after an ownership
-            transfer (sale), so it can be used to see the purchase price after
-            a sale if the new owner has not changed it</remarks>
+        <member name="P:OpenMetaverse.ParcelDwellReplyEventArgs.ParcelID">
+            <summary>Get the global ID of the parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Name">
-            <summary>Parcel Name</summary>
+        <member name="P:OpenMetaverse.ParcelDwellReplyEventArgs.LocalID">
+            <summary>Get the simulator specific ID of the parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Desc">
-            <summary>Parcel Description</summary>
+        <member name="P:OpenMetaverse.ParcelDwellReplyEventArgs.Dwell">
+            <summary>Get the calculated dwell</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.MusicURL">
-            <summary>URL For Music Stream</summary>
+        <member name="T:OpenMetaverse.ParcelInfoReplyEventArgs">
+            <summary>Contains basic parcel information data returned from the 
+            simulator in response to an <see cref="!:RequestParcelInfo"/> request</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.GroupID">
-            <summary></summary>
+        <member name="M:OpenMetaverse.ParcelInfoReplyEventArgs.#ctor(OpenMetaverse.ParcelInfo)">
+            <summary>
+            Construct a new instance of the ParcelInfoReplyEventArgs class
+            </summary>
+            <param name="parcel">The <see cref="T:OpenMetaverse.ParcelInfo"/> object containing basic parcel info</param>
         </member>
-        <member name="F:OpenMetaverse.Parcel.PassPrice">
-            <summary>Price for a temporary pass</summary>
+        <member name="P:OpenMetaverse.ParcelInfoReplyEventArgs.Parcel">
+            <summary>Get the <see cref="T:OpenMetaverse.ParcelInfo"/> object containing basic parcel info</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.PassHours">
-            <summary>How long is pass valid for</summary>
+        <member name="T:OpenMetaverse.ParcelPropertiesEventArgs">
+            <summary>Contains basic parcel information data returned from the simulator in response to an <see cref="!:RequestParcelInfo"/> request</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Category">
-            <summary></summary>
+        <member name="M:OpenMetaverse.ParcelPropertiesEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Parcel,OpenMetaverse.ParcelResult,System.Int32,System.Int32,System.Boolean)">
+            <summary>
+            Construct a new instance of the ParcelPropertiesEventArgs class
+            </summary>
+            <param name="simulator">The <see cref="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel"/> object containing the details</param>
+            <param name="parcel">The <see cref="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel"/> object containing the details</param>
+            <param name="result">The result of the request</param>
+            <param name="selectedPrims">The number of primitieves your agent is 
+            currently selecting and or sitting on in this parcel</param>
+            <param name="sequenceID">The user assigned ID used to correlate a request with
+            these results</param>
+            <param name="snapSelection">TODO:</param>
         </member>
-        <member name="F:OpenMetaverse.Parcel.AuthBuyerID">
-            <summary>Key of authorized buyer</summary>
+        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.Simulator">
+            <summary>Get the simulator the parcel is located in</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.SnapshotID">
-            <summary>Key of parcel snapshot</summary>
+        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel">
+            <summary>Get the <see cref="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel"/> object containing the details</summary>
+            <remarks>If Result is NoData, this object will not contain valid data</remarks>
         </member>
-        <member name="F:OpenMetaverse.Parcel.UserLocation">
-            <summary>The landing point location</summary>
+        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.Result">
+            <summary>Get the result of the request</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.UserLookAt">
-            <summary>The landing point LookAt</summary>
+        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.SelectedPrims">
+            <summary>Get the number of primitieves your agent is 
+            currently selecting and or sitting on in this parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Landing">
-            <summary>The type of landing enforced from the <see cref="T:OpenMetaverse.LandingType"/> enum</summary>
+        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.SequenceID">
+            <summary>Get the user assigned ID used to correlate a request with
+            these results</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Dwell">
-            <summary></summary>
+        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.SnapSelection">
+            <summary>TODO:</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.RegionDenyAnonymous">
-            <summary></summary>
+        <member name="T:OpenMetaverse.ParcelAccessListReplyEventArgs">
+            <summary>Contains blacklist and whitelist data returned from the simulator in response to an <see cref="!:RequestParcelAccesslist"/> request</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.RegionPushOverride">
-            <summary></summary>
+        <member name="M:OpenMetaverse.ParcelAccessListReplyEventArgs.#ctor(OpenMetaverse.Simulator,System.Int32,System.Int32,System.UInt32,System.Collections.Generic.List{OpenMetaverse.ParcelManager.ParcelAccessEntry})">
+            <summary>
+            Construct a new instance of the ParcelAccessListReplyEventArgs class
+            </summary>
+            <param name="simulator">The simulator the parcel is located in</param>
+            <param name="sequenceID">The user assigned ID used to correlate a request with
+            these results</param>
+            <param name="localID">The simulator specific ID of the parcel</param>
+            <param name="flags">TODO:</param>
+            <param name="accessEntries">The list containing the white/blacklisted agents for the parcel</param>
         </member>
-        <member name="F:OpenMetaverse.Parcel.AccessWhiteList">
-            <summary>Access list of who is whitelisted on this
-            parcel</summary>
+        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.Simulator">
+            <summary>Get the simulator the parcel is located in</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.AccessBlackList">
-            <summary>Access list of who is blacklisted on this
-            parcel</summary>
+        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.SequenceID">
+            <summary>Get the user assigned ID used to correlate a request with
+            these results</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.RegionDenyAgeUnverified">
-            <summary>TRUE of region denies access to age unverified users</summary>
+        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.LocalID">
+            <summary>Get the simulator specific ID of the parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.ObscureMedia">
-            <summary>true to obscure (hide) media url</summary>
+        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.Flags">
+            <summary>TODO:</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.ObscureMusic">
-            <summary>true to obscure (hide) music url</summary>
+        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.AccessList">
+            <summary>Get the list containing the white/blacklisted agents for the parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Media">
-            <summary>A struct containing media details</summary>
+        <member name="T:OpenMetaverse.ParcelObjectOwnersReplyEventArgs">
+            <summary>Contains blacklist and whitelist data returned from the 
+            simulator in response to an <see cref="!:RequestParcelAccesslist"/> request</summary>
         </member>
-        <member name="M:OpenMetaverse.Parcel.ToString">
+        <member name="M:OpenMetaverse.ParcelObjectOwnersReplyEventArgs.#ctor(OpenMetaverse.Simulator,System.Collections.Generic.List{OpenMetaverse.ParcelManager.ParcelPrimOwners})">
             <summary>
-            Displays a parcel object in string format
+            Construct a new instance of the ParcelObjectOwnersReplyEventArgs class
             </summary>
-            <returns>string containing key=value pairs of a parcel object</returns>
+            <param name="simulator">The simulator the parcel is located in</param>
+            <param name="primOwners">The list containing prim ownership counts</param>
         </member>
-        <member name="M:OpenMetaverse.Parcel.#ctor(System.Int32)">
-            <summary>
-            Defalt constructor
-            </summary>
-            <param name="localID">Local ID of this parcel</param>
+        <member name="P:OpenMetaverse.ParcelObjectOwnersReplyEventArgs.Simulator">
+            <summary>Get the simulator the parcel is located in</summary>
         </member>
-        <member name="M:OpenMetaverse.Parcel.Update(OpenMetaverse.Simulator,System.Boolean)">
-            <summary>
-            Update the simulator with any local changes to this Parcel object
-            </summary>
-            <param name="simulator">Simulator to send updates to</param>
-            <param name="wantReply">Whether we want the simulator to confirm
-            the update with a reply packet or not</param>
+        <member name="P:OpenMetaverse.ParcelObjectOwnersReplyEventArgs.PrimOwners">
+            <summary>Get the list containing prim ownership counts</summary>
         </member>
-        <member name="M:OpenMetaverse.Parcel.UpdateOtherCleanTime(OpenMetaverse.Simulator)">
-            <summary>
-            Set Autoreturn time
-            </summary>
-            <param name="simulator">Simulator to send the update to</param>
+        <member name="T:OpenMetaverse.SimParcelsDownloadedEventArgs">
+            <summary>Contains the data returned when all parcel data has been retrieved from a simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelManager">
+        <member name="M:OpenMetaverse.SimParcelsDownloadedEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.InternalDictionary{System.Int32,OpenMetaverse.Parcel},System.Int32[0:,0:])">
             <summary>
-            Parcel (subdivided simulator lots) subsystem
+            Construct a new instance of the SimParcelsDownloadedEventArgs class
             </summary>
+            <param name="simulator">The simulator the parcel data was retrieved from</param>
+            <param name="simParcels">The dictionary containing the parcel data</param>
+            <param name="parcelMap">The multidimensional array containing a x,y grid mapped
+            to each 64x64 parcel's LocalID.</param>
         </member>
-        <member name="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 name="P:OpenMetaverse.SimParcelsDownloadedEventArgs.Simulator">
+            <summary>Get the simulator the parcel data was retrieved from</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelInfo">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="P:OpenMetaverse.SimParcelsDownloadedEventArgs.Parcels">
+            <summary>A dictionary containing the parcel data where the key correlates to the ParcelMap entry</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnParcelInfoReply(OpenMetaverse.ParcelInfoReplyEventArgs)">
-            <summary>Raises the ParcelInfoReply event</summary>
-            <param name="e">A ParcelInfoReplyEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="P:OpenMetaverse.SimParcelsDownloadedEventArgs.ParcelMap">
+            <summary>Get the multidimensional array containing a x,y grid mapped
+            to each 64x64 parcel's LocalID.</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelInfoLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.ForceSelectObjectsReplyEventArgs">
+            <summary>Contains the data returned when a <see cref="!:RequestForceSelectObjects"/> request</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelProperties">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.ForceSelectObjectsReplyEventArgs.#ctor(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},System.Boolean)">
+            <summary>
+            Construct a new instance of the ForceSelectObjectsReplyEventArgs class
+            </summary>
+            <param name="simulator">The simulator the parcel data was retrieved from</param>
+            <param name="objectIDs">The list of primitive IDs</param>
+            <param name="resetList">true if the list is clean and contains the information
+            only for a given request</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnParcelProperties(OpenMetaverse.ParcelPropertiesEventArgs)">
-            <summary>Raises the ParcelProperties event</summary>
-            <param name="e">A ParcelPropertiesEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="P:OpenMetaverse.ForceSelectObjectsReplyEventArgs.Simulator">
+            <summary>Get the simulator the parcel data was retrieved from</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelPropertiesLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.ForceSelectObjectsReplyEventArgs.ObjectIDs">
+            <summary>Get the list of primitive IDs</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelACL">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="P:OpenMetaverse.ForceSelectObjectsReplyEventArgs.ResetList">
+            <summary>true if the list is clean and contains the information
+            only for a given request</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnParcelAccessListReply(OpenMetaverse.ParcelAccessListReplyEventArgs)">
-            <summary>Raises the ParcelAccessListReply event</summary>
-            <param name="e">A ParcelAccessListReplyEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="T:OpenMetaverse.ParcelMediaUpdateReplyEventArgs">
+            <summary>Contains data when the media data for a parcel the avatar is on changes</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelACLLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.ParcelMediaUpdateReplyEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.ParcelMedia)">
+            <summary>
+            Construct a new instance of the ParcelMediaUpdateReplyEventArgs class
+            </summary>
+            <param name="simulator">the simulator the parcel media data was updated in</param>
+            <param name="media">The updated media information</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelObjectOwnersReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="P:OpenMetaverse.ParcelMediaUpdateReplyEventArgs.Simulator">
+            <summary>Get the simulator the parcel media data was updated in</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnParcelObjectOwnersReply(OpenMetaverse.ParcelObjectOwnersReplyEventArgs)">
-            <summary>Raises the ParcelObjectOwnersReply event</summary>
-            <param name="e">A ParcelObjectOwnersReplyEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="P:OpenMetaverse.ParcelMediaUpdateReplyEventArgs.Media">
+            <summary>Get the updated media information</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelObjectOwnersLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.ParcelMediaCommandEventArgs">
+            <summary>Contains the media command for a parcel the agent is currently on</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_SimParcelsDownloaded">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.ParcelMediaCommandEventArgs.#ctor(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.ParcelFlags,OpenMetaverse.ParcelMediaCommand,System.Single)">
+            <summary>
+            Construct a new instance of the ParcelMediaCommandEventArgs class
+            </summary>
+            <param name="simulator">The simulator the parcel media command was issued in</param>
+            <param name="sequence"></param>
+            <param name="flags"></param>
+            <param name="command">The media command that was sent</param>
+            <param name="time"></param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnSimParcelsDownloaded(OpenMetaverse.SimParcelsDownloadedEventArgs)">
-            <summary>Raises the SimParcelsDownloaded event</summary>
-            <param name="e">A SimParcelsDownloadedEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.Simulator">
+            <summary>Get the simulator the parcel media command was issued in</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_SimParcelsDownloadedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.Sequence">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ForceSelectObjects">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.ParcelFlags">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnForceSelectObjectsReply(OpenMetaverse.ForceSelectObjectsReplyEventArgs)">
-            <summary>Raises the ForceSelectObjectsReply event</summary>
-            <param name="e">A ForceSelectObjectsReplyEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.MediaCommand">
+            <summary>Get the media command that was sent</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ForceSelectObjectsLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.Time">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaUpdateReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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.ParcelManager.OnParcelMediaUpdateReply(OpenMetaverse.ParcelMediaUpdateReplyEventArgs)">
-            <summary>Raises the ParcelMediaUpdateReply event</summary>
-            <param name="e">A ParcelMediaUpdateReplyEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.NameValue.Name">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaUpdateReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.NameValue.Type">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaCommand">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.NameValue.Class">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnParcelMediaCommand(OpenMetaverse.ParcelMediaCommandEventArgs)">
-            <summary>Raises the ParcelMediaCommand event</summary>
-            <param name="e">A ParcelMediaCommandEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.NameValue.Sendto">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaCommandLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.NameValue.Value">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.NameValue.#ctor(System.String,OpenMetaverse.NameValue.ValueType,OpenMetaverse.NameValue.ClassType,OpenMetaverse.NameValue.SendtoType,System.Object)">
             <summary>
-            Default constructor
+            Constructor that takes all the fields as parameters
             </summary>
-            <param name="client">A reference to the GridClient object</param>
+            <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.ParcelManager.RequestParcelInfo(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.NameValue.#ctor(System.String)">
             <summary>
-            Request basic information for a single parcel
+            Constructor that takes a single line from a NameValue field
             </summary>
-            <param name="parcelID">Simulator-local ID of the parcel</param>
+            <param name="data"></param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestParcelProperties(OpenMetaverse.Simulator,System.Int32,System.Int32)">
-            <summary>
-            Request properties of a single parcel
-            </summary>
-            <param name="simulator">Simulator containing the parcel</param>
-            <param name="localID">Simulator-local ID of the parcel</param>
-            <param name="sequenceID">An arbitrary integer that will be returned
-            with the ParcelProperties reply, useful for distinguishing between
-            multiple simultaneous requests</param>
+        <member name="T:OpenMetaverse.NameValue.ValueType">
+            <summary>Type of the value</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestParcelAccessList(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.AccessList,System.Int32)">
-            <summary>
-            Request the access list for a single parcel
-            </summary>
-            <param name="simulator">Simulator containing the parcel</param>
-            <param name="localID">Simulator-local ID of the parcel</param>
-            <param name="sequenceID">An arbitrary integer that will be returned
-            with the ParcelAccessList reply, useful for distinguishing between
-            multiple simultaneous requests</param>
-            <param name="flags"></param>
+        <member name="F:OpenMetaverse.NameValue.ValueType.Unknown">
+            <summary>Unknown</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestParcelProperties(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single,System.Int32,System.Boolean)">
-            <summary>
-            Request properties of parcels using a bounding box selection
-            </summary>
-            <param name="simulator">Simulator containing the parcel</param>
-            <param name="north">Northern boundary of the parcel selection</param>
-            <param name="east">Eastern boundary of the parcel selection</param>
-            <param name="south">Southern boundary of the parcel selection</param>
-            <param name="west">Western boundary of the parcel selection</param>
-            <param name="sequenceID">An arbitrary integer that will be returned
-            with the ParcelProperties reply, useful for distinguishing between
-            different types of parcel property requests</param>
-            <param name="snapSelection">A boolean that is returned with the
-            ParcelProperties reply, useful for snapping focus to a single
-            parcel</param>
+        <member name="F:OpenMetaverse.NameValue.ValueType.String">
+            <summary>String value</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestAllSimParcels(OpenMetaverse.Simulator)">
-            <summary>
-            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 name="F:OpenMetaverse.NameValue.ValueType.F32">
+            <summary></summary>
         </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> 
-            dictionary)
-            </summary>
-            <param name="simulator">Simulator to request parcels from (must be connected)</param>
-            <param name="refresh">If TRUE, will force a full refresh</param>
-            <param name="msDelay">Number of milliseconds to pause in between each request</param>
+        <member name="F:OpenMetaverse.NameValue.ValueType.S32">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestDwell(OpenMetaverse.Simulator,System.Int32)">
-            <summary>
-            Request the dwell value for a parcel
-            </summary>
-            <param name="simulator">Simulator containing the parcel</param>
-            <param name="localID">Simulator-local ID of the parcel</param>
+        <member name="F:OpenMetaverse.NameValue.ValueType.VEC3">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.Buy(OpenMetaverse.Simulator,System.Int32,System.Boolean,OpenMetaverse.UUID,System.Boolean,System.Int32,System.Int32)">
-            <summary>
-            Send a request to Purchase a parcel of land
-            </summary>
-            <param name="simulator">The Simulator the parcel is located in</param>
-            <param name="localID">The parcels region specific local ID</param>
-            <param name="forGroup">true if this parcel is being purchased by a group</param>
-            <param name="groupID">The groups <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="removeContribution">true to remove tier contribution if purchase is successful</param>
-            <param name="parcelArea">The parcels size</param>
-            <param name="parcelPrice">The purchase price of the parcel</param>
-            <returns></returns>
+        <member name="F:OpenMetaverse.NameValue.ValueType.U32">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.Reclaim(OpenMetaverse.Simulator,System.Int32)">
-            <summary>
-            Reclaim a parcel of land
-            </summary>
-            <param name="simulator">The simulator the parcel is in</param>
-            <param name="localID">The parcels region specific local ID</param>
+        <member name="F:OpenMetaverse.NameValue.ValueType.CAMERA">
+            <summary>Deprecated</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.DeedToGroup(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.UUID)">
-            <summary>
-            Deed a parcel to a group
-            </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>
+        <member name="F:OpenMetaverse.NameValue.ValueType.Asset">
+            <summary>String value, but designated as an asset</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestObjectOwners(OpenMetaverse.Simulator,System.Int32)">
-            <summary>
-            Request prim owners of a parcel of land.
-            </summary>
-            <param name="simulator">Simulator parcel is in</param>
-            <param name="localID">The parcels region specific local ID</param>
+        <member name="F:OpenMetaverse.NameValue.ValueType.U64">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.ReturnObjects(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.ObjectReturnType,System.Collections.Generic.List{OpenMetaverse.UUID})">
+        <member name="T:OpenMetaverse.NameValue.ClassType">
             <summary>
-            Return objects from a parcel
+            
             </summary>
-            <param name="simulator">Simulator parcel is in</param>
-            <param name="localID">The parcels region specific local ID</param>
-            <param name="type">the type of objects to return, <seealso cref="T:OpenMetaverse.ObjectReturnType"/></param>
-            <param name="ownerIDs">A list containing object owners <seealso cref="T:OpenMetaverse.UUID"/>s to return</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelSubdivide(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single)">
-            <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>
+        <member name="F:OpenMetaverse.NameValue.ClassType.Unknown">
+            <summary></summary>
         </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>
+        <member name="F:OpenMetaverse.NameValue.ClassType.ReadOnly">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.GetParcelLocalID(OpenMetaverse.Simulator,OpenMetaverse.Vector3)">
-            <summary>
-            Get a parcels LocalID
-            </summary>
-            <param name="simulator">Simulator parcel is in</param>
-            <param name="position">Vector3 position in simulator (Z not used)</param>
-            <returns>0 on failure, or parcel LocalID on success.</returns>
-            <remarks>A call to <code>Parcels.RequestAllSimParcels</code> is required to populate map and
-            dictionary.</remarks>
+        <member name="F:OpenMetaverse.NameValue.ClassType.ReadWrite">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize)">
-            <summary>
-            Terraform (raise, lower, etc) an area or whole parcel of land
-            </summary>
-            <param name="simulator">Simulator land area is in.</param>
-            <param name="localID">LocalID of parcel, or -1 if using bounding box</param>
-            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
-            <param name="brushSize">Size of area to modify</param>
-            <returns>true on successful request sent.</returns>
-            <remarks>Settings.STORE_LAND_PATCHES must be true, 
-            Parcel information must be downloaded using <code>RequestAllSimParcels()</code></remarks>
+        <member name="F:OpenMetaverse.NameValue.ClassType.Callback">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize)">
+        <member name="T:OpenMetaverse.NameValue.SendtoType">
             <summary>
-            Terraform (raise, lower, etc) an area or whole parcel of land
+            
             </summary>
-            <param name="simulator">Simulator land area is in.</param>
-            <param name="west">west border of area to modify</param>
-            <param name="south">south border of area to modify</param>
-            <param name="east">east border of area to modify</param>
-            <param name="north">north border of area to modify</param>
-            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
-            <param name="brushSize">Size of area to modify</param>
-            <returns>true on successful request sent.</returns>
-            <remarks>Settings.STORE_LAND_PATCHES must be true, 
-            Parcel information must be downloaded using <code>RequestAllSimParcels()</code></remarks>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Int32,System.Single,System.Single,System.Single,System.Single,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize,System.Int32)">
-            <summary>
-            Terraform (raise, lower, etc) an area or whole parcel of land
-            </summary>
-            <param name="simulator">Simulator land area is in.</param>
-            <param name="localID">LocalID of parcel, or -1 if using bounding box</param>
-            <param name="west">west border of area to modify</param>
-            <param name="south">south border of area to modify</param>
-            <param name="east">east border of area to modify</param>
-            <param name="north">north border of area to modify</param>
-            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
-            <param name="brushSize">Size of area to modify</param>
-            <param name="seconds">How many meters + or - to lower, 1 = 1 meter</param>
-            <returns>true on successful request sent.</returns>
-            <remarks>Settings.STORE_LAND_PATCHES must be true, 
-            Parcel information must be downloaded using <code>RequestAllSimParcels()</code></remarks>
+        <member name="F:OpenMetaverse.NameValue.SendtoType.Unknown">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Int32,System.Single,System.Single,System.Single,System.Single,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize,System.Int32,System.Single)">
+        <member name="F:OpenMetaverse.NameValue.SendtoType.Sim">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.NameValue.SendtoType.DataSim">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.NameValue.SendtoType.SimViewer">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.NameValue.SendtoType.DataSimViewer">
+            <summary></summary>
+        </member>
+        <member name="T:OpenMetaverse.Rendering.LindenMesh.LODMesh">
             <summary>
-            Terraform (raise, lower, etc) an area or whole parcel of land
+            Level of Detail mesh
             </summary>
-            <param name="simulator">Simulator land area is in.</param>
-            <param name="localID">LocalID of parcel, or -1 if using bounding box</param>
-            <param name="west">west border of area to modify</param>
-            <param name="south">south border of area to modify</param>
-            <param name="east">east border of area to modify</param>
-            <param name="north">north border of area to modify</param>
-            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
-            <param name="brushSize">Size of area to modify</param>
-            <param name="seconds">How many meters + or - to lower, 1 = 1 meter</param>
-            <param name="height">Height at which the terraform operation is acting at</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestSelectObjects(System.Int32,OpenMetaverse.ObjectReturnType,OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.Assets.TarArchiveWriter">
             <summary>
-            Sends a request to the simulator to return a list of objects owned by specific owners
+            Temporary code to produce a tar archive in tar v7 format
             </summary>
-            <param name="localID">Simulator local ID of parcel</param>
-            <param name="selectType">Owners, Others, Etc</param>
-            <param name="ownerID">List containing keys of avatars objects to select; 
-            if List is null will return Objects of type <c>selectType</c></param>
-            <remarks>Response data is returned in the event <seealso cref="E:ForceSelectObjectsReply"/></remarks>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.EjectUser(OpenMetaverse.UUID,System.Boolean)">
+        <member name="F:OpenMetaverse.Assets.TarArchiveWriter.m_bw">
             <summary>
-            Eject and optionally ban a user from a parcel
+            Binary writer for the underlying stream
             </summary>
-            <param name="targetID">target key of avatar to eject</param>
-            <param name="ban">true to also ban target</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.FreezeUser(OpenMetaverse.UUID,System.Boolean)">
+        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteDir(System.String)">
             <summary>
-            Freeze or unfreeze an avatar over your land
+            Write a directory entry to the tar archive.  We can only handle one path level right now!
             </summary>
-            <param name="targetID">target key to freeze</param>
-            <param name="freeze">true to freeze, false to unfreeze</param>
+            <param name="dirName"></param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.ReleaseParcel(OpenMetaverse.Simulator,System.Int32)">
+        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteFile(System.String,System.String)">
             <summary>
-            Abandon a parcel of land
+            Write a file to the tar archive
             </summary>
-            <param name="simulator">Simulator parcel is in</param>
-            <param name="localID">Simulator local ID of parcel</param>
+            <param name="filePath"></param>
+            <param name="data"></param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestRemoteParcelID(OpenMetaverse.Vector3,System.UInt64,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteFile(System.String,System.Byte[])">
             <summary>
-            Requests the UUID of the parcel in a remote region at a specified location
+            Write a file to the tar archive
             </summary>
-            <param name="location">Location of the parcel in the remote region</param>
-            <param name="regionHandle">Remote region handle</param>
-            <param name="regionID">Remote region UUID</param>
-            <returns>If successful UUID of the remote parcel, UUID.Zero otherwise</returns>
+            <param name="filePath"></param>
+            <param name="data"></param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.GetParcelResouces(OpenMetaverse.UUID,System.Boolean,OpenMetaverse.ParcelManager.LandResourcesCallback)">
+        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.Close">
             <summary>
-            Retrieves information on resources used by the parcel
+            Finish writing the raw tar archive data to a stream.  The stream will be closed on completion.
             </summary>
-            <param name="parcelID">UUID of the parcel</param>
-            <param name="getDetails">Should per object resource usage be requested</param>
-            <param name="callback">Callback invoked when the request is complete</param>
-        </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelDwellReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelDwellReply"/> event</remarks>
-        </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelInfoReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelInfoReply"/> event</remarks>
-        </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelAccessListReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelAccessListReply"/> event</remarks>
-        </member>
-        <member name="M:OpenMetaverse.ParcelManager.SelectParcelObjectsReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ForceSelectObjectsReply"/> event</remarks>
-        </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelMediaUpdateHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelMediaUpdateReply"/> event</remarks>
-        </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelOverlayHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelMediaCommandMessagePacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-            <remarks>Raises the <see cref="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 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="T:OpenMetaverse.ParcelManager.ParcelAccessEntry">
+        <member name="T:OpenMetaverse.Assets.TarArchiveReader">
             <summary>
-            Parcel Accesslist
+            Temporary code to do the bare minimum required to read a tar archive for our purposes
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelAccessEntry.AgentID">
-            <summary>Agents <seealso cref="T:OpenMetaverse.UUID"/></summary>
+        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_br">
+            <summary>
+            Binary reader for the underlying stream
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelAccessEntry.Time">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_nullCharArray">
+            <summary>
+            Used to trim off null chars
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelAccessEntry.Flags">
-            <summary>Flags for specific entry in white/black lists</summary>
+        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_spaceCharArray">
+            <summary>
+            Used to trim off space chars
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelManager.ParcelPrimOwners">
+        <member name="M:OpenMetaverse.Assets.TarArchiveReader.#ctor(System.IO.Stream)">
             <summary>
-            Owners of primitives on parcel
+            Generate a tar reader which reads from the given stream.
             </summary>
+            <param name="s"></param>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.OwnerID">
-            <summary>Prim Owners <seealso cref="T:OpenMetaverse.UUID"/></summary>
+        <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="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.IsGroupOwned">
-            <summary>True of owner is group</summary>
+        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadHeader">
+            <summary>
+            Read the next 512 byte chunk of data as a tar header.
+            </summary>
+            <returns>A tar header struct.  null if we have reached the end of the archive.</returns>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.Count">
-            <summary>Total count of prims owned by OwnerID</summary>
+        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadData(System.Int32)">
+            <summary>
+            Read data following a header
+            </summary>
+            <param name="fileSize"></param>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.OnlineStatus">
-            <summary>true of OwnerID is currently online and is not a group</summary>
+        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ConvertOctalBytesToDecimal(System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            Convert octal bytes to a decimal representation
+            </summary>
+            <param name="bytes"></param>
+            <param name="count"></param>
+            <param name="startIndex"></param>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.NewestPrim">
-            <summary>The date of the most recent prim left by OwnerID</summary>
+        <member name="T:OpenMetaverse.VisualColorOperation">
+            <summary>
+            Operation to apply when applying color to texture
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelManager.LandResourcesCallback">
+        <member name="T:OpenMetaverse.VisualColorParam">
             <summary>
-            Called once parcel resource usage information has been collected
+            Information needed to translate visual param value to RGBA color
             </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>
+        <member name="M:OpenMetaverse.VisualColorParam.#ctor(OpenMetaverse.VisualColorOperation,OpenMetaverse.Color4[])">
+            <summary>
+            Construct VisualColorParam
+            </summary>
+            <param name="operation">Operation to apply when applying color to texture</param>
+            <param name="colors">Colors</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelDwellReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Int32,System.Single)">
+        <member name="T:OpenMetaverse.VisualAlphaParam">
             <summary>
-            Construct a new instance of the ParcelDwellReplyEventArgs class
+            Represents alpha blending and bump infor for a visual parameter
+            such as sleive length
             </summary>
-            <param name="parcelID">The global ID of the parcel</param>
-            <param name="localID">The simulator specific ID of the parcel</param>
-            <param name="dwell">The calculated dwell for the parcel</param>
         </member>
-        <member name="P:OpenMetaverse.ParcelDwellReplyEventArgs.ParcelID">
-            <summary>Get the global ID of the parcel</summary>
+        <member name="F:OpenMetaverse.VisualAlphaParam.Domain">
+            <summary>Stregth of the alpha to apply</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelDwellReplyEventArgs.LocalID">
-            <summary>Get the simulator specific ID of the parcel</summary>
+        <member name="F:OpenMetaverse.VisualAlphaParam.TGAFile">
+            <summary>File containing the alpha channel</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelDwellReplyEventArgs.Dwell">
-            <summary>Get the calculated dwell</summary>
+        <member name="F:OpenMetaverse.VisualAlphaParam.SkipIfZero">
+            <summary>Skip blending if parameter value is 0</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelInfoReplyEventArgs">
-            <summary>Contains basic parcel information data returned from the 
-            simulator in response to an <see cref="!:RequestParcelInfo"/> request</summary>
+        <member name="F:OpenMetaverse.VisualAlphaParam.MultiplyBlend">
+            <summary>Use miltiply insted of alpha blending</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelInfoReplyEventArgs.#ctor(OpenMetaverse.ParcelInfo)">
+        <member name="M:OpenMetaverse.VisualAlphaParam.#ctor(System.Single,System.String,System.Boolean,System.Boolean)">
             <summary>
-            Construct a new instance of the ParcelInfoReplyEventArgs class
+            Create new alhpa information for a visual param
             </summary>
-            <param name="parcel">The <see cref="T:OpenMetaverse.ParcelInfo"/> object containing basic parcel info</param>
-        </member>
-        <member name="P:OpenMetaverse.ParcelInfoReplyEventArgs.Parcel">
-            <summary>Get the <see cref="T:OpenMetaverse.ParcelInfo"/> object containing basic parcel info</summary>
-        </member>
-        <member name="T:OpenMetaverse.ParcelPropertiesEventArgs">
-            <summary>Contains basic parcel information data returned from the simulator in response to an <see cref="!:RequestParcelInfo"/> request</summary>
+            <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="M:OpenMetaverse.ParcelPropertiesEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Parcel,OpenMetaverse.ParcelResult,System.Int32,System.Int32,System.Boolean)">
+        <member name="T:OpenMetaverse.VisualParam">
             <summary>
-            Construct a new instance of the ParcelPropertiesEventArgs class
+            A single visual characteristic of an avatar mesh, such as eyebrow height
             </summary>
-            <param name="simulator">The <see cref="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel"/> object containing the details</param>
-            <param name="parcel">The <see cref="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel"/> object containing the details</param>
-            <param name="result">The result of the request</param>
-            <param name="selectedPrims">The number of primitieves your agent is 
-            currently selecting and or sitting on in this parcel</param>
-            <param name="sequenceID">The user assigned ID used to correlate a request with
-            these results</param>
-            <param name="snapSelection">TODO:</param>
         </member>
-        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.Simulator">
-            <summary>Get the simulator the parcel is located in</summary>
+        <member name="F:OpenMetaverse.VisualParam.ParamID">
+            <summary>Index of this visual param</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel">
-            <summary>Get the <see cref="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel"/> object containing the details</summary>
-            <remarks>If Result is NoData, this object will not contain valid data</remarks>
+        <member name="F:OpenMetaverse.VisualParam.Name">
+            <summary>Internal name</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.Result">
-            <summary>Get the result of the request</summary>
+        <member name="F:OpenMetaverse.VisualParam.Group">
+            <summary>Group ID this parameter belongs to</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.SelectedPrims">
-            <summary>Get the number of primitieves your agent is 
-            currently selecting and or sitting on in this parcel</summary>
+        <member name="F:OpenMetaverse.VisualParam.Wearable">
+            <summary>Name of the wearable this parameter belongs to</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.SequenceID">
-            <summary>Get the user assigned ID used to correlate a request with
-            these results</summary>
+        <member name="F:OpenMetaverse.VisualParam.Label">
+            <summary>Displayable label of this characteristic</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.SnapSelection">
-            <summary>TODO:</summary>
+        <member name="F:OpenMetaverse.VisualParam.LabelMin">
+            <summary>Displayable label for the minimum value of this characteristic</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelAccessListReplyEventArgs">
-            <summary>Contains blacklist and whitelist data returned from the simulator in response to an <see cref="!:RequestParcelAccesslist"/> request</summary>
+        <member name="F:OpenMetaverse.VisualParam.LabelMax">
+            <summary>Displayable label for the maximum value of this characteristic</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelAccessListReplyEventArgs.#ctor(OpenMetaverse.Simulator,System.Int32,System.Int32,System.UInt32,System.Collections.Generic.List{OpenMetaverse.ParcelManager.ParcelAccessEntry})">
-            <summary>
-            Construct a new instance of the ParcelAccessListReplyEventArgs class
-            </summary>
-            <param name="simulator">The simulator the parcel is located in</param>
-            <param name="sequenceID">The user assigned ID used to correlate a request with
-            these results</param>
-            <param name="localID">The simulator specific ID of the parcel</param>
-            <param name="flags">TODO:</param>
-            <param name="accessEntries">The list containing the white/blacklisted agents for the parcel</param>
+        <member name="F:OpenMetaverse.VisualParam.DefaultValue">
+            <summary>Default value</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.Simulator">
-            <summary>Get the simulator the parcel is located in</summary>
+        <member name="F:OpenMetaverse.VisualParam.MinValue">
+            <summary>Minimum value</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.SequenceID">
-            <summary>Get the user assigned ID used to correlate a request with
-            these results</summary>
+        <member name="F:OpenMetaverse.VisualParam.MaxValue">
+            <summary>Maximum value</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.LocalID">
-            <summary>Get the simulator specific ID of the parcel</summary>
+        <member name="F:OpenMetaverse.VisualParam.IsBumpAttribute">
+            <summary>Is this param used for creation of bump layer?</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.Flags">
-            <summary>TODO:</summary>
+        <member name="F:OpenMetaverse.VisualParam.AlphaParams">
+            <summary>Alpha blending/bump info</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.AccessList">
-            <summary>Get the list containing the white/blacklisted agents for the parcel</summary>
+        <member name="F:OpenMetaverse.VisualParam.ColorParams">
+            <summary>Color information</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelObjectOwnersReplyEventArgs">
-            <summary>Contains blacklist and whitelist data returned from the 
-            simulator in response to an <see cref="!:RequestParcelAccesslist"/> request</summary>
+        <member name="F:OpenMetaverse.VisualParam.Drivers">
+            <summary>Array of param IDs that are drivers for this parameter</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelObjectOwnersReplyEventArgs.#ctor(OpenMetaverse.Simulator,System.Collections.Generic.List{OpenMetaverse.ParcelManager.ParcelPrimOwners})">
+        <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>
-            Construct a new instance of the ParcelObjectOwnersReplyEventArgs class
+            Set all the values through the constructor
             </summary>
-            <param name="simulator">The simulator the parcel is located in</param>
-            <param name="primOwners">The list containing prim ownership counts</param>
-        </member>
-        <member name="P:OpenMetaverse.ParcelObjectOwnersReplyEventArgs.Simulator">
-            <summary>Get the simulator the parcel is located in</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="P:OpenMetaverse.ParcelObjectOwnersReplyEventArgs.PrimOwners">
-            <summary>Get the list containing prim ownership counts</summary>
+        <member name="T:OpenMetaverse.VisualParams">
+            <summary>
+            Holds the Params array of all the avatar appearance parameters
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.SimParcelsDownloadedEventArgs">
-            <summary>Contains the data returned when all parcel data has been retrieved from a simulator</summary>
+        <member name="T:OpenMetaverse.UDPBase">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.SimParcelsDownloadedEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.InternalDictionary{System.Int32,OpenMetaverse.Parcel},System.Int32[0:,0:])">
+        <member name="M:OpenMetaverse.UDPBase.#ctor(System.Int32)">
             <summary>
-            Construct a new instance of the SimParcelsDownloadedEventArgs class
+            Initialize the UDP packet handler in server mode
             </summary>
-            <param name="simulator">The simulator the parcel data was retrieved from</param>
-            <param name="simParcels">The dictionary containing the parcel data</param>
-            <param name="parcelMap">The multidimensional array containing a x,y grid mapped
-            to each 64x64 parcel's LocalID.</param>
+            <param name="port">Port to listening for incoming UDP packets on</param>
         </member>
-        <member name="P:OpenMetaverse.SimParcelsDownloadedEventArgs.Simulator">
-            <summary>Get the simulator the parcel data was retrieved from</summary>
+        <member name="M:OpenMetaverse.UDPBase.#ctor(System.Net.IPEndPoint)">
+            <summary>
+            Initialize the UDP packet handler in client mode
+            </summary>
+            <param name="endPoint">Remote UDP server to connect to</param>
         </member>
-        <member name="P:OpenMetaverse.SimParcelsDownloadedEventArgs.Parcels">
-            <summary>A dictionary containing the parcel data where the key correlates to the ParcelMap entry</summary>
+        <member name="M:OpenMetaverse.UDPBase.Start">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.SimParcelsDownloadedEventArgs.ParcelMap">
-            <summary>Get the multidimensional array containing a x,y grid mapped
-            to each 64x64 parcel's LocalID.</summary>
+        <member name="M:OpenMetaverse.UDPBase.Stop">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.ForceSelectObjectsReplyEventArgs">
-            <summary>Contains the data returned when a <see cref="!:RequestForceSelectObjects"/> request</summary>
+        <member name="P:OpenMetaverse.UDPBase.IsRunning">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.ForceSelectObjectsReplyEventArgs.#ctor(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},System.Boolean)">
+        <member name="T:OpenMetaverse.Helpers">
             <summary>
-            Construct a new instance of the ForceSelectObjectsReplyEventArgs class
+            Static helper functions and global variables
             </summary>
-            <param name="simulator">The simulator the parcel data was retrieved from</param>
-            <param name="objectIDs">The list of primitive IDs</param>
-            <param name="resetList">true if the list is clean and contains the information
-            only for a given request</param>
         </member>
-        <member name="P:OpenMetaverse.ForceSelectObjectsReplyEventArgs.Simulator">
-            <summary>Get the simulator the parcel data was retrieved from</summary>
+        <member name="F:OpenMetaverse.Helpers.MSG_APPENDED_ACKS">
+            <summary>This header flag signals that ACKs are appended to the packet</summary>
         </member>
-        <member name="P:OpenMetaverse.ForceSelectObjectsReplyEventArgs.ObjectIDs">
-            <summary>Get the list of primitive IDs</summary>
+        <member name="F:OpenMetaverse.Helpers.MSG_RESENT">
+            <summary>This header flag signals that this packet has been sent before</summary>
         </member>
-        <member name="P:OpenMetaverse.ForceSelectObjectsReplyEventArgs.ResetList">
-            <summary>true if the list is clean and contains the information
-            only for a given request</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.ParcelMediaUpdateReplyEventArgs">
-            <summary>Contains data when the media data for a parcel the avatar is on changes</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.ParcelMediaUpdateReplyEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.ParcelMedia)">
+        <member name="M:OpenMetaverse.Helpers.TEOffsetShort(System.Single)">
             <summary>
-            Construct a new instance of the ParcelMediaUpdateReplyEventArgs class
+            
             </summary>
-            <param name="simulator">the simulator the parcel media data was updated in</param>
-            <param name="media">The updated media information</param>
-        </member>
-        <member name="P:OpenMetaverse.ParcelMediaUpdateReplyEventArgs.Simulator">
-            <summary>Get the simulator the parcel media data was updated in</summary>
-        </member>
-        <member name="P:OpenMetaverse.ParcelMediaUpdateReplyEventArgs.Media">
-            <summary>Get the updated media information</summary>
-        </member>
-        <member name="T:OpenMetaverse.ParcelMediaCommandEventArgs">
-            <summary>Contains the media command for a parcel the agent is currently on</summary>
+            <param name="offset"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.ParcelMediaCommandEventArgs.#ctor(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.ParcelFlags,OpenMetaverse.ParcelMediaCommand,System.Single)">
+        <member name="M:OpenMetaverse.Helpers.TEOffsetFloat(System.Byte[],System.Int32)">
             <summary>
-            Construct a new instance of the ParcelMediaCommandEventArgs class
+            
             </summary>
-            <param name="simulator">The simulator the parcel media command was issued in</param>
-            <param name="sequence"></param>
-            <param name="flags"></param>
-            <param name="command">The media command that was sent</param>
-            <param name="time"></param>
+            <param name="bytes"></param>
+            <param name="pos"></param>
+            <returns></returns>
         </member>
-        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.Simulator">
-            <summary>Get the simulator the parcel media command was issued in</summary>
+        <member name="M:OpenMetaverse.Helpers.TERotationShort(System.Single)">
+            <summary>
+            
+            </summary>
+            <param name="rotation"></param>
+            <returns></returns>
         </member>
-        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.Sequence">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Helpers.TERotationFloat(System.Byte[],System.Int32)">
+            <summary>
+            
+            </summary>
+            <param name="bytes"></param>
+            <param name="pos"></param>
+            <returns></returns>
         </member>
-        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.ParcelFlags">
-            <summary></summary>
+        <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="P:OpenMetaverse.ParcelMediaCommandEventArgs.MediaCommand">
-            <summary>Get the media command that was sent</summary>
+        <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="P:OpenMetaverse.ParcelMediaCommandEventArgs.Time">
-            <summary></summary>
+        <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="T:OpenMetaverse.NameValue">
+        <member name="M:OpenMetaverse.Helpers.ZeroDecode(System.Byte[],System.Int32,System.Byte[])">
             <summary>
-            A Name Value pair with additional settings, used in the protocol
-            primarily to transmit avatar names and active group in object packets
+            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.NameValue.Name">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.NameValue.Type">
-            <summary></summary>
+        <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.NameValue.Class">
-            <summary></summary>
+        <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.NameValue.Sendto">
-            <summary></summary>
+        <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.NameValue.Value">
-            <summary></summary>
+        <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="M:OpenMetaverse.NameValue.#ctor(System.String,OpenMetaverse.NameValue.ValueType,OpenMetaverse.NameValue.ClassType,OpenMetaverse.NameValue.SendtoType,System.Object)">
+        <member name="M:OpenMetaverse.Helpers.PrimListToOSD(System.Collections.Generic.List{OpenMetaverse.Primitive})">
             <summary>
-            Constructor that takes all the fields as parameters
+            Converts a list of primitives to an object that can be serialized
+            with the LLSD system
             </summary>
-            <param name="name"></param>
-            <param name="valueType"></param>
-            <param name="classType"></param>
-            <param name="sendtoType"></param>
-            <param name="value"></param>
+            <param name="prims">Primitives to convert to a serializable object</param>
+            <returns>An object that can be serialized with LLSD</returns>
         </member>
-        <member name="M:OpenMetaverse.NameValue.#ctor(System.String)">
+        <member name="M:OpenMetaverse.Helpers.OSDToPrimList(OpenMetaverse.StructuredData.OSD)">
             <summary>
-            Constructor that takes a single line from a NameValue field
+            Deserializes OSD in to a list of primitives
             </summary>
-            <param name="data"></param>
+            <param name="osd">Structure holding the serialized primitive list,
+            must be of the SDMap type</param>
+            <returns>A list of deserialized primitives</returns>
         </member>
-        <member name="T:OpenMetaverse.NameValue.ValueType">
-            <summary>Type of the value</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.NameValue.ValueType.Unknown">
-            <summary>Unknown</summary>
+        <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.NameValue.ValueType.String">
-            <summary>String value</summary>
+        <member name="F:OpenMetaverse.Helpers.LogLevel.None">
+            <summary>No logging information will be output</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.F32">
-            <summary></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.NameValue.ValueType.S32">
-            <summary></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.NameValue.ValueType.VEC3">
-            <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.NameValue.ValueType.U32">
-            <summary></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.NameValue.ValueType.CAMERA">
-            <summary>Deprecated</summary>
+        <member name="F:OpenMetaverse.Http.EventQueueClient.REQUEST_TIMEOUT">
+            <summary>=</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.Asset">
-            <summary>String value, but designated as an asset</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.NameValue.ValueType.U64">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Http.EventQueueClient._random">
+            <summary>For exponential backoff on error.</summary>
         </member>
-        <member name="T:OpenMetaverse.NameValue.ClassType">
+        <member name="T:OpenMetaverse.Bumpiness">
             <summary>
-            
+            The type of bump-mapping applied to a face
             </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ClassType.Unknown">
+        <member name="F:OpenMetaverse.Bumpiness.None">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ClassType.ReadOnly">
+        <member name="F:OpenMetaverse.Bumpiness.Brightness">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ClassType.ReadWrite">
+        <member name="F:OpenMetaverse.Bumpiness.Darkness">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ClassType.Callback">
+        <member name="F:OpenMetaverse.Bumpiness.Woodgrain">
             <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.NameValue.SendtoType">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.NameValue.SendtoType.Unknown">
+        <member name="F:OpenMetaverse.Bumpiness.Bark">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.SendtoType.Sim">
+        <member name="F:OpenMetaverse.Bumpiness.Bricks">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.SendtoType.DataSim">
+        <member name="F:OpenMetaverse.Bumpiness.Checker">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.SendtoType.SimViewer">
+        <member name="F:OpenMetaverse.Bumpiness.Concrete">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.SendtoType.DataSimViewer">
+        <member name="F:OpenMetaverse.Bumpiness.Crustytile">
             <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Rendering.IRendering">
-            <summary>
-            Abstract base for rendering plugins
-            </summary>
-        </member>
-        <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="M:OpenMetaverse.Rendering.IRendering.GenerateSimpleSculptMesh(OpenMetaverse.Primitive,System.Drawing.Bitmap,OpenMetaverse.Rendering.DetailLevel)">
-            <summary>
-            Generates a basic mesh structure from a sculpted primitive and
-            texture
-            </summary>
-            <param name="prim">Sculpted primitive to generate the mesh from</param>
-            <param name="sculptTexture">Sculpt texture</param>
-            <param name="lod">Level of detail to generate the mesh at</param>
-            <returns>The generated mesh</returns>
-        </member>
-        <member name="M:OpenMetaverse.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="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="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 name="F:OpenMetaverse.Bumpiness.Cutstone">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetLandmark">
-            <summary>
-            Represents a Landmark with RegionID and Position vector
-            </summary>
+        <member name="F:OpenMetaverse.Bumpiness.Discs">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetLandmark.RegionID">
-            <summary>UUID of the Landmark target region</summary>
+        <member name="F:OpenMetaverse.Bumpiness.Gravel">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetLandmark.Position">
-            <summary> Local position of the target </summary>
+        <member name="F:OpenMetaverse.Bumpiness.Petridish">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetLandmark.#ctor">
-            <summary>Construct an Asset of type Landmark</summary>
+        <member name="F:OpenMetaverse.Bumpiness.Siding">
+            <summary></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="F:OpenMetaverse.Bumpiness.Stonetile">
+            <summary></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="F:OpenMetaverse.Bumpiness.Stucco">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetLandmark.Decode">
-            <summary>
-            Decode the raw asset data, populating the RegionID and Position
-            </summary>
-            <returns>true if the AssetData was successfully decoded to a UUID and Vector</returns>
+        <member name="F:OpenMetaverse.Bumpiness.Suction">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetLandmark.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="F:OpenMetaverse.Bumpiness.Weave">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.TarArchiveWriter">
+        <member name="T:OpenMetaverse.Shininess">
             <summary>
-            Temporary code to produce a tar archive in tar v7 format
+            The level of shininess applied to a face
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.TarArchiveWriter.m_bw">
-            <summary>
-            Binary writer for the underlying stream
-            </summary>
+        <member name="F:OpenMetaverse.Shininess.None">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.Shininess.Low">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.Shininess.Medium">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.Shininess.High">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.Close">
+        <member name="T:OpenMetaverse.MappingType">
             <summary>
-            Finish writing the raw tar archive data to a stream.  The stream will be closed on completion.
+            The texture mapping style used for a face
             </summary>
         </member>
-        <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 name="F:OpenMetaverse.MappingType.Default">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.VisualColorOperation">
-            <summary>
-            Operation to apply when applying color to texture
-            </summary>
+        <member name="F:OpenMetaverse.MappingType.Planar">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.VisualColorParam">
-            <summary>
-            Information needed to translate visual param value to RGBA color
-            </summary>
+        <member name="F:OpenMetaverse.MappingType.Spherical">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.VisualColorParam.#ctor(OpenMetaverse.VisualColorOperation,OpenMetaverse.Color4[])">
-            <summary>
-            Construct VisualColorParam
-            </summary>
-            <param name="operation">Operation to apply when applying color to texture</param>
-            <param name="colors">Colors</param>
+        <member name="F:OpenMetaverse.MappingType.Cylindrical">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.VisualAlphaParam">
+        <member name="T:OpenMetaverse.TextureAttributes">
             <summary>
-            Represents alpha blending and bump infor for a visual parameter
-            such as sleive length
+            Flags in the TextureEntry block that describe which properties are 
+            set
             </summary>
         </member>
-        <member name="F:OpenMetaverse.VisualAlphaParam.Domain">
-            <summary>Stregth of the alpha to apply</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.None">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualAlphaParam.TGAFile">
-            <summary>File containing the alpha channel</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.TextureID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualAlphaParam.SkipIfZero">
-            <summary>Skip blending if parameter value is 0</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.RGBA">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualAlphaParam.MultiplyBlend">
-            <summary>Use miltiply insted of alpha blending</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.RepeatU">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.VisualAlphaParam.#ctor(System.Single,System.String,System.Boolean,System.Boolean)">
-            <summary>
-            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 name="F:OpenMetaverse.TextureAttributes.RepeatV">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.VisualParam">
-            <summary>
-            A single visual characteristic of an avatar mesh, such as eyebrow height
-            </summary>
+        <member name="F:OpenMetaverse.TextureAttributes.OffsetU">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.ParamID">
-            <summary>Index of this visual param</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.OffsetV">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.Name">
-            <summary>Internal name</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.Rotation">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.Group">
-            <summary>Group ID this parameter belongs to</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.Material">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.Wearable">
-            <summary>Name of the wearable this parameter belongs to</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.Media">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.Label">
-            <summary>Displayable label of this characteristic</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.Glow">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.LabelMin">
-            <summary>Displayable label for the minimum value of this characteristic</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.MaterialID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.LabelMax">
-            <summary>Displayable label for the maximum value of this characteristic</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.All">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.DefaultValue">
-            <summary>Default value</summary>
+        <member name="T:OpenMetaverse.BitPack">
+            <summary>
+            Wrapper around a byte array that allows bit to be packed and unpacked
+            one at a time or by a variable amount. Useful for very tightly packed
+            data like LayerData packets
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.MinValue">
-            <summary>Minimum value</summary>
+        <member name="F:OpenMetaverse.BitPack.Data">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.MaxValue">
-            <summary>Maximum value</summary>
+        <member name="M:OpenMetaverse.BitPack.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            Default constructor, initialize the bit packer / bit unpacker
+            with a byte array and starting position
+            </summary>
+            <param name="data">Byte array to pack bits in to or unpack from</param>
+            <param name="pos">Starting position in the byte array</param>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.IsBumpAttribute">
-            <summary>Is this param used for creation of bump layer?</summary>
+        <member name="M:OpenMetaverse.BitPack.PackFloat(System.Single)">
+            <summary>
+            Pack a floating point value in to the data
+            </summary>
+            <param name="data">Floating point value to pack</param>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.AlphaParams">
-            <summary>Alpha blending/bump info</summary>
+        <member name="M:OpenMetaverse.BitPack.PackBits(System.Int32,System.Int32)">
+            <summary>
+            Pack part or all of an integer in to the data
+            </summary>
+            <param name="data">Integer containing the data to pack</param>
+            <param name="totalCount">Number of bits of the integer to pack</param>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.ColorParams">
-            <summary>Color information</summary>
+        <member name="M:OpenMetaverse.BitPack.PackBits(System.UInt32,System.Int32)">
+            <summary>
+            Pack part or all of an unsigned integer in to the data
+            </summary>
+            <param name="data">Unsigned integer containing the data to pack</param>
+            <param name="totalCount">Number of bits of the integer to pack</param>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.Drivers">
-            <summary>Array of param IDs that are drivers for this parameter</summary>
+        <member name="M:OpenMetaverse.BitPack.PackBit(System.Boolean)">
+            <summary>
+            Pack a single bit in to the data
+            </summary>
+            <param name="bit">Bit to pack</param>
         </member>
-        <member name="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.BitPack.PackFixed(System.Single,System.Boolean,System.Int32,System.Int32)">
             <summary>
-            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>
+            <param name="data"></param>
+            <param name="isSigned"></param>
+            <param name="intBits"></param>
+            <param name="fracBits"></param>
         </member>
-        <member name="T:OpenMetaverse.VisualParams">
+        <member name="M:OpenMetaverse.BitPack.PackUUID(OpenMetaverse.UUID)">
             <summary>
-            Holds the Params array of all the avatar appearance parameters
+            
             </summary>
+            <param name="data"></param>
         </member>
-        <member name="T:OpenMetaverse.UDPBase">
+        <member name="M:OpenMetaverse.BitPack.PackColor(OpenMetaverse.Color4)">
             <summary>
             
             </summary>
+            <param name="data"></param>
         </member>
-        <member name="M:OpenMetaverse.UDPBase.#ctor(System.Int32)">
+        <member name="M:OpenMetaverse.BitPack.UnpackFloat">
             <summary>
-            Initialize the UDP packet handler in server mode
+            Unpacking a floating point value from the data
+            </summary>
+            <returns>Unpacked floating point value</returns>
+        </member>
+        <member name="M:OpenMetaverse.BitPack.UnpackBits(System.Int32)">
+            <summary>
+            Unpack a variable number of bits from the data in to integer format
             </summary>
-            <param name="port">Port to listening for incoming UDP packets on</param>
+            <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.UDPBase.#ctor(System.Net.IPEndPoint)">
+        <member name="M:OpenMetaverse.BitPack.UnpackUBits(System.Int32)">
             <summary>
-            Initialize the UDP packet handler in client mode
+            Unpack a variable number of bits from the data in to unsigned 
+            integer format
             </summary>
-            <param name="endPoint">Remote UDP server to connect to</param>
+            <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="M:OpenMetaverse.UDPBase.Start">
+        <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.UDPBase.Stop">
+        <member name="M:OpenMetaverse.BitPack.UnpackUShort">
             <summary>
-            
+            Unpack a 16-bit unsigned integer
             </summary>
+            <returns>16-bit unsigned integer</returns>
         </member>
-        <member name="P:OpenMetaverse.UDPBase.IsRunning">
+        <member name="M:OpenMetaverse.BitPack.UnpackInt">
             <summary>
-            
+            Unpack a 32-bit signed integer
             </summary>
+            <returns>32-bit signed integer</returns>
         </member>
-        <member name="T:OpenMetaverse.Bumpiness">
+        <member name="M:OpenMetaverse.BitPack.UnpackUInt">
             <summary>
-            The type of bump-mapping applied to a face
+            Unpack a 32-bit unsigned integer
             </summary>
+            <returns>32-bit unsigned integer</returns>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.None">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Bumpiness.Brightness">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Bumpiness.Darkness">
+        <member name="P:OpenMetaverse.BitPack.BytePos">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Woodgrain">
+        <member name="P:OpenMetaverse.BitPack.BitPos">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Bark">
-            <summary></summary>
+        <member name="T:OpenMetaverse.ScriptPermission">
+            <summary>
+            Permission request flags, asked when a script wants to control an Avatar
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Bricks">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ScriptPermission.None">
+            <summary>Placeholder for empty values, shouldn't ever see this</summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Checker">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ScriptPermission.Debit">
+            <summary>Script wants ability to take money from you</summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Concrete">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ScriptPermission.TakeControls">
+            <summary>Script wants to take camera controls for you</summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Crustytile">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ScriptPermission.RemapControls">
+            <summary>Script wants to remap avatars controls</summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Cutstone">
-            <summary></summary>
+        <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.Bumpiness.Discs">
-            <summary></summary>
+        <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.Bumpiness.Gravel">
-            <summary></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="F:OpenMetaverse.Bumpiness.Petridish">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ScriptPermission.ChangeLinks">
+            <summary>Script wants ability to link/delink with other prims</summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Siding">
-            <summary></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="F:OpenMetaverse.Bumpiness.Stonetile">
-            <summary></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="F:OpenMetaverse.Bumpiness.Stucco">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ScriptPermission.TrackCamera">
+            <summary>Script wants to track avatars camera position and rotation </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Suction">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ScriptPermission.ControlCamera">
+            <summary>Script wants to control your camera</summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Weave">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ScriptPermission.Teleport">
+            <summary>Script wants the ability to teleport you</summary>
         </member>
-        <member name="T:OpenMetaverse.Shininess">
+        <member name="T:OpenMetaverse.InstantMessageDialog">
             <summary>
-            The level of shininess applied to a face
+            Special commands used in Instant Messages
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Shininess.None">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.MessageFromAgent">
+            <summary>Indicates a regular IM from another agent</summary>
         </member>
-        <member name="F:OpenMetaverse.Shininess.Low">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.MessageBox">
+            <summary>Simple notification box with an OK button</summary>
         </member>
-        <member name="F:OpenMetaverse.Shininess.Medium">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupInvitation">
+            <summary>You've been invited to join a group.</summary>
         </member>
-        <member name="F:OpenMetaverse.Shininess.High">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.InventoryOffered">
+            <summary>Inventory offer</summary>
         </member>
-        <member name="T:OpenMetaverse.MappingType">
-            <summary>
-            The texture mapping style used for a face
-            </summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.InventoryAccepted">
+            <summary>Accepted inventory offer</summary>
         </member>
-        <member name="F:OpenMetaverse.MappingType.Default">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.InventoryDeclined">
+            <summary>Declined inventory offer</summary>
         </member>
-        <member name="F:OpenMetaverse.MappingType.Planar">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupVote">
+            <summary>Group vote</summary>
         </member>
-        <member name="F:OpenMetaverse.MappingType.Spherical">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryOffered">
+            <summary>An object is offering its inventory</summary>
         </member>
-        <member name="F:OpenMetaverse.MappingType.Cylindrical">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryAccepted">
+            <summary>Accept an inventory offer from an object</summary>
         </member>
-        <member name="T:OpenMetaverse.TextureAttributes">
-            <summary>
-            Flags in the TextureEntry block that describe which properties are 
-            set
-            </summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryDeclined">
+            <summary>Decline an inventory offer from an object</summary>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.None">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.NewUserDefault">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.TextureID">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionAdd">
+            <summary>Start a session, or add users to a session</summary>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.RGBA">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionOfflineAdd">
+            <summary>Start a session, but don't prune offline users</summary>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.RepeatU">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionGroupStart">
+            <summary>Start a session with your group</summary>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.RepeatV">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionCardlessStart">
+            <summary>Start a session without a calling card (finder or objects)</summary>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.OffsetU">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionSend">
+            <summary>Send a message to a session</summary>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.OffsetV">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionDrop">
+            <summary>Leave a session</summary>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.Rotation">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.MessageFromObject">
+            <summary>Indicates that the IM is from an object</summary>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.Material">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.BusyAutoResponse">
+            <summary>Sent an IM to a busy user, this is the auto response</summary>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.Media">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.ConsoleAndChatHistory">
+            <summary>Shows the message in the console and chat history</summary>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.Glow">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.RequestTeleport">
+            <summary>Send a teleport lure</summary>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.MaterialID">
-            <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.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.RequestLure">
+            <summary>Request a teleport lure</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.TextureAttributes.All">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.StopTyping">
+            <summary>Indicates that a user has stopped typing</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetAnimation">
+        <member name="T:OpenMetaverse.InstantMessageOnline">
             <summary>
-            Represents an Animation
+            Flag in Instant Messages, whether the IM should be delivered to
+            offline avatars as well
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetAnimation.#ctor">
-            <summary>Default Constructor</summary>
+        <member name="F:OpenMetaverse.InstantMessageOnline.Online">
+            <summary>Only deliver to online avatars</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetAnimation.#ctor(OpenMetaverse.UUID,System.Byte[])">
+        <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">
             <summary>
-            Construct an Asset object of type Animation
+            Conversion type to denote Chat Packet types in an easier-to-understand format
             </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.AssetAnimation.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="F:OpenMetaverse.ChatType.Whisper">
+            <summary>Whisper (5m radius)</summary>
         </member>
-        <member name="T:OpenMetaverse.Helpers">
-            <summary>
-            Static helper functions and global variables
-            </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.Helpers.MSG_APPENDED_ACKS">
-            <summary>This header flag signals that ACKs are appended to the packet</summary>
+        <member name="F:OpenMetaverse.ChatType.Shout">
+            <summary>Shouting! (100m radius)</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.ChatType.StartTyping">
+            <summary>Event message when an Avatar has begun to type</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.ChatType.StopTyping">
+            <summary>Event message when an Avatar has stopped typing</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.ChatType.Debug">
+            <summary>Send the message to the debug channel</summary>
         </member>
-        <member name="M:OpenMetaverse.Helpers.TEOffsetShort(System.Single)">
-            <summary>
-            
-            </summary>
-            <param name="offset"></param>
-            <returns></returns>
+        <member name="F:OpenMetaverse.ChatType.OwnerSay">
+            <summary>Event message when an object uses llOwnerSay</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.ChatType.RegionSay">
+            <summary>Special value to support llRegionSay, never sent to the client</summary>
         </member>
-        <member name="M:OpenMetaverse.Helpers.TERotationShort(System.Single)">
+        <member name="T:OpenMetaverse.ChatSourceType">
             <summary>
-            
+            Identifies the source of a chat message
             </summary>
-            <param name="rotation"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Helpers.TERotationFloat(System.Byte[],System.Int32)">
+        <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">
             <summary>
             
             </summary>
-            <param name="bytes"></param>
-            <param name="pos"></param>
-            <returns></returns>
         </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.ChatAudibleLevel.Not">
+            <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.ChatAudibleLevel.Barely">
+            <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.ChatAudibleLevel.Fully">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Helpers.ZeroDecode(System.Byte[],System.Int32,System.Byte[])">
+        <member name="T:OpenMetaverse.EffectType">
             <summary>
-            Decode a zerocoded byte array, used to decompress packets marked
-            with the zerocoded flag
+            Effect type used in ViewerEffect packets
             </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="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.EffectType.Text">
+            <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.EffectType.Icon">
+            <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.EffectType.Connector">
+            <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.EffectType.FlexibleObject">
+            <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.EffectType.AnimalControls">
+            <summary></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.EffectType.AnimationObject">
+            <summary></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.EffectType.Cloth">
+            <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.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.Helpers.LogLevel.None">
-            <summary>No logging information will be output</summary>
+        <member name="F:OpenMetaverse.EffectType.Glow">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.EffectType.Point">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.EffectType.Trail">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.EffectType.Sphere">
+            <summary>Create a swirl of particles around an object</summary>
         </member>
-        <member name="F:OpenMetaverse.Helpers.LogLevel.Info">
-            <summary>Non-noisy useful information, may be helpful in 
-            debugging a problem</summary>
+        <member name="F:OpenMetaverse.EffectType.Spiral">
+            <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.EffectType.Edit">
+            <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.EffectType.LookAt">
+            <summary>Cause an avatar to look at an object</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.EffectType.PointAt">
+            <summary>Cause an avatar to point at an object</summary>
         </member>
-        <member name="M:OpenMetaverse.WrappedObject`1.Dispose">
+        <member name="T:OpenMetaverse.LookAtType">
             <summary>
-            Checks the instance back into the object pool
+            The action an avatar is doing when looking at something, used in 
+            ViewerEffect packets for the LookAt effect
             </summary>
         </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.LookAtType.None">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectPoolBase`1.#ctor">
-            <summary>
-            Creates a new instance of the ObjectPoolBase class. Initialize MUST be called
-            after using this constructor.
-            </summary>
+        <member name="F:OpenMetaverse.LookAtType.Idle">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectPoolBase`1.#ctor(System.Int32,System.Int32,System.Boolean,System.Int32)">
-            <summary>
-            Creates a new instance of the ObjectPool Base class.        
-            </summary>
-            <param name="itemsPerSegment">The object pool is composed of segments, which 
-            are allocated whenever the size of the pool is exceeded. The number of items
-            in a segment should be large enough that allocating a new segmeng is a rare
-            thing. For example, on a server that will have 10k people logged in at once, 
-            the receive buffer object pool should have segment sizes of at least 1000 
-            byte arrays per segment.
-            </param>
-            <param name="minimumSegmentCount">The minimun number of segments that may exist.</param>
-            <param name="gcOnPoolGrowth">Perform a full GC.Collect whenever a segment is allocated, and then again after allocation to compact the heap.</param>
-            <param name="cleanupFrequenceMS">The frequency which segments are checked to see if they're eligible for cleanup.</param>
+        <member name="F:OpenMetaverse.LookAtType.AutoListen">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectPoolBase`1.ForceCleanup">
-            <summary>
-            Forces the segment cleanup algorithm to be run. This method is intended 
-            primarly for use from the Unit Test libraries.
-            </summary>
+        <member name="F:OpenMetaverse.LookAtType.FreeLook">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectPoolBase`1.GetObjectInstance">
-            <summary>
-            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 name="F:OpenMetaverse.LookAtType.Respond">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectPoolBase`1.CheckIn(OpenMetaverse.ObjectPoolSegment{`0},`0)">
-            <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.
-            </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 name="F:OpenMetaverse.LookAtType.Hover">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectPoolBase`1.CheckOut">
-            <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. 
-            </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 name="F:OpenMetaverse.LookAtType.Conversation">
+            <summary>Deprecated</summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectPoolBase`1.TotalSegments">
-            <summary>
-            The total number of segments created. Intended to be used by the Unit Tests.
-            </summary>
+        <member name="F:OpenMetaverse.LookAtType.Select">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectPoolBase`1.ItemsPerSegment">
-            <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. 
-            </summary>
+        <member name="F:OpenMetaverse.LookAtType.Focus">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectPoolBase`1.MinimumSegmentCount">
-            <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.
-            </summary>
+        <member name="F:OpenMetaverse.LookAtType.Mouselook">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.LookAtType.Clear">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectPoolBase`1.CleanupFrequencyMilliseconds">
+        <member name="T:OpenMetaverse.PointAtType">
             <summary>
-            The frequence which the cleanup thread runs. This is typically
-            expected to be in the 5 minute range. 
+            The action an avatar is doing when pointing at something, used in
+            ViewerEffect packets for the PointAt effect
             </summary>
         </member>
-        <member name="T:OpenMetaverse.BitPack">
-            <summary>
-            Wrapper around a byte array that allows bit to be packed and unpacked
-            one at a time or by a variable amount. Useful for very tightly packed
-            data like LayerData packets
-            </summary>
+        <member name="F:OpenMetaverse.PointAtType.None">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.BitPack.Data">
+        <member name="F:OpenMetaverse.PointAtType.Select">
             <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.#ctor(System.Byte[],System.Int32)">
-            <summary>
-            Default constructor, initialize the bit packer / bit unpacker
-            with a byte array and starting position
-            </summary>
-            <param name="data">Byte array to pack bits in to or unpack from</param>
-            <param name="pos">Starting position in the byte array</param>
+        <member name="F:OpenMetaverse.PointAtType.Grab">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.PackFloat(System.Single)">
-            <summary>
-            Pack a floating point value in to the data
-            </summary>
-            <param name="data">Floating point value to pack</param>
+        <member name="F:OpenMetaverse.PointAtType.Clear">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.PackBits(System.Int32,System.Int32)">
+        <member name="T:OpenMetaverse.MoneyTransactionType">
             <summary>
-            Pack part or all of an integer in to the data
+            Money transaction types
             </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.BitPack.PackBits(System.UInt32,System.Int32)">
-            <summary>
-            Pack part or all of an unsigned integer in to the data
-            </summary>
-            <param name="data">Unsigned integer containing the data to pack</param>
-            <param name="totalCount">Number of bits of the integer to pack</param>
+        <member name="F:OpenMetaverse.MoneyTransactionType.None">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.PackBit(System.Boolean)">
-            <summary>
-            Pack a single bit in to the data
-            </summary>
-            <param name="bit">Bit to pack</param>
+        <member name="F:OpenMetaverse.MoneyTransactionType.FailSimulatorTimeout">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.PackFixed(System.Single,System.Boolean,System.Int32,System.Int32)">
-            <summary>
-            
-            </summary>
-            <param name="data"></param>
-            <param name="isSigned"></param>
-            <param name="intBits"></param>
-            <param name="fracBits"></param>
+        <member name="F:OpenMetaverse.MoneyTransactionType.FailDataserverTimeout">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.PackUUID(OpenMetaverse.UUID)">
-            <summary>
-            
-            </summary>
-            <param name="data"></param>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectClaim">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.PackColor(OpenMetaverse.Color4)">
-            <summary>
-            
-            </summary>
-            <param name="data"></param>
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandClaim">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.UnpackFloat">
-            <summary>
-            Unpacking a floating point value from the data
-            </summary>
-            <returns>Unpacked floating point value</returns>
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupCreate">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.UnpackBits(System.Int32)">
-            <summary>
-            Unpack a variable number of bits from the data in to integer format
-            </summary>
-            <param name="totalCount">Number of bits to unpack</param>
-            <returns>An integer containing the unpacked bits</returns>
-            <remarks>This function is only useful up to 32 bits</remarks>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicClaim">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.UnpackUBits(System.Int32)">
-            <summary>
-            Unpack a variable number of bits from the data in to unsigned 
-            integer format
-            </summary>
-            <param name="totalCount">Number of bits to unpack</param>
-            <returns>An unsigned integer containing the unpacked bits</returns>
-            <remarks>This function is only useful up to 32 bits</remarks>
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupJoin">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.UnpackShort">
-            <summary>
-            Unpack a 16-bit signed integer
-            </summary>
-            <returns>16-bit signed integer</returns>
+        <member name="F:OpenMetaverse.MoneyTransactionType.TeleportCharge">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.UnpackUShort">
-            <summary>
-            Unpack a 16-bit unsigned integer
-            </summary>
-            <returns>16-bit unsigned integer</returns>
+        <member name="F:OpenMetaverse.MoneyTransactionType.UploadCharge">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.UnpackInt">
-            <summary>
-            Unpack a 32-bit signed integer
-            </summary>
-            <returns>32-bit signed integer</returns>
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandAuction">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ClassifiedCharge">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectTax">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandTax">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.MoneyTransactionType.LightTax">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.UnpackUInt">
-            <summary>
-            Unpack a 32-bit unsigned integer
-            </summary>
-            <returns>32-bit unsigned integer</returns>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ParcelDirFee">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.BitPack.BytePos">
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupTax">
             <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.BitPack.BitPos">
+        <member name="F:OpenMetaverse.MoneyTransactionType.ClassifiedRenew">
             <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetSound">
-            <summary>
-            Represents a Sound Asset
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.GiveInventory">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetSound.#ctor">
-            <summary>Initializes a new instance of an AssetSound object</summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectSale">
+            <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="F:OpenMetaverse.MoneyTransactionType.Gift">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetSound.Encode">
-            <summary>
-            TODO: Encodes a sound file
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandSale">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetSound.Decode">
-            <summary>
-            TODO: Decode a sound file
-            </summary>
-            <returns>true</returns>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ReferBonus">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetSound.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.InventorySale">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventorySortOrder.ByName">
-            <summary>Sort by name</summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.RefundPurchase">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventorySortOrder.ByDate">
-            <summary>Sort by date</summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandPassSale">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventorySortOrder.FoldersByName">
-            <summary>Sort folders by name, regardless of whether items are
-            sorted by name or date</summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.DwellBonus">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventorySortOrder.SystemFoldersToTop">
-            <summary>Place system folders at the top</summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.PayObject">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.DeRezDestination">
-            <summary>
-            Possible destinations for DeRezObject request
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPays">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.AgentInventorySave">
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupLandDeed">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.AgentInventoryCopy">
-            <summary>Copy from in-world to agent inventory</summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupObjectDeed">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.TaskInventory">
-            <summary>Derez to TaskInventory</summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupLiability">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.Attachment">
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupDividend">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.AgentInventoryTake">
-            <summary>Take Object</summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupMembershipDues">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.ForceToGodInventory">
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectRelease">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.TrashFolder">
-            <summary>Delete Object</summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandRelease">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.AttachmentToInventory">
-            <summary>Put an avatar attachment into agent inventory</summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectDelete">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.AttachmentExists">
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicDecay">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.ReturnToOwner">
-            <summary>Return an object back to the owner's inventory</summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicDelete">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.ReturnToLastOwner">
-            <summary>Return a deeded object back to the last owner's inventory</summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.LindenAdjustment">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryItemFlags">
-            <summary>
-            Upper half of the Flags field for inventory items
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.LindenGrant">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectSlamPerm">
-            <summary>Indicates that the NextOwner permission will be set to the
-            most restrictive set of permissions found in the object set
-            (including linkset items and object inventory items) on next rez</summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.LindenPenalty">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectSlamSale">
-            <summary>Indicates that the object sale information has been
-            changed</summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.EventFee">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectOverwriteBase">
-            <summary>If set, and a slam bit is set, indicates BaseMask will be overwritten on Rez</summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.EventPrize">
+            <summary></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.MoneyTransactionType.StipendBasic">
+            <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.MoneyTransactionType.StipendDeveloper">
+            <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.MoneyTransactionType.StipendAlways">
+            <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.MoneyTransactionType.StipendDaily">
+            <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.MoneyTransactionType.StipendRating">
+            <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.MoneyTransactionType.StipendDelta">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryBase">
+        <member name="T:OpenMetaverse.TransactionFlags">
             <summary>
-            Base Class for Inventory Items
+            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryBase.UUID">
-            <summary><seealso cref="T:OpenMetaverse.UUID"/> of item/folder</summary>
+        <member name="F:OpenMetaverse.TransactionFlags.None">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryBase.ParentUUID">
-            <summary><seealso cref="T:OpenMetaverse.UUID"/> of parent folder</summary>
+        <member name="F:OpenMetaverse.TransactionFlags.SourceGroup">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryBase.Name">
-            <summary>Name of item/folder</summary>
+        <member name="F:OpenMetaverse.TransactionFlags.DestGroup">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryBase.OwnerID">
-            <summary>Item/Folder Owners <seealso cref="T:OpenMetaverse.UUID"/></summary>
+        <member name="F:OpenMetaverse.TransactionFlags.OwnerGroup">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryBase.#ctor(OpenMetaverse.UUID)">
-            <summary>
-            Constructor, takes an itemID as a parameter
-            </summary>
-            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID"/> of the item</param>
+        <member name="F:OpenMetaverse.TransactionFlags.SimultaneousContribution">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryBase.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            
-            </summary>
-            <returns></returns>
+        <member name="F:OpenMetaverse.TransactionFlags.ContributionRemoval">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryBase.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="T:OpenMetaverse.MeanCollisionType">
             <summary>
             
             </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>
-        <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>
-        <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.MeanCollisionType.None">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryBase.GetOSD">
-            <summary>
-            Convert inventory to OSD
-            </summary>
-            <returns>OSD representation</returns>
+        <member name="F:OpenMetaverse.MeanCollisionType.Bump">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryItem">
-            <summary>
-            An Item in Inventory
-            </summary>
+        <member name="F:OpenMetaverse.MeanCollisionType.LLPushObject">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.AssetUUID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of this item</summary>
+        <member name="F:OpenMetaverse.MeanCollisionType.SelectedObjectCollide">
+            <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.MeanCollisionType.ScriptedObjectCollide">
+            <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.MeanCollisionType.PhysicalObjectCollide">
+            <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="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="F:OpenMetaverse.InventoryItem.CreatorID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the creator of this item</summary>
+        <member name="F:OpenMetaverse.ScriptControlChange.None">
+            <summary>No Flags set</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.Description">
-            <summary>A Description of this item</summary>
+        <member name="F:OpenMetaverse.ScriptControlChange.Forward">
+            <summary>Forward (W or up Arrow)</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.ScriptControlChange.Back">
+            <summary>Back (S or down arrow)</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.GroupOwned">
-            <summary>If true, item is owned by a group</summary>
+        <member name="F:OpenMetaverse.ScriptControlChange.Left">
+            <summary>Move left (shift+A or left arrow)</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.SalePrice">
-            <summary>The price this item can be purchased for</summary>
+        <member name="F:OpenMetaverse.ScriptControlChange.Right">
+            <summary>Move right (shift+D or right arrow)</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.ScriptControlChange.Up">
+            <summary>Up (E or PgUp)</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.Flags">
-            <summary>Combined flags from <seealso cref="T:OpenMetaverse.InventoryItemFlags"/></summary>
+        <member name="F:OpenMetaverse.ScriptControlChange.Down">
+            <summary>Down (C or PgDown)</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.ScriptControlChange.RotateLeft">
+            <summary>Rotate left (A or left arrow)</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.ScriptControlChange.RotateRight">
+            <summary>Rotate right (D or right arrow)</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.ScriptControlChange.LeftButton">
+            <summary>Left Mouse Button</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.ScriptControlChange.MouseLookLeftButton">
+            <summary>Left Mouse button in MouseLook</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.#ctor(OpenMetaverse.InventoryType,OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.AgentFlags">
             <summary>
-            Construct a new InventoryItem object of a specific Type
+            Currently only used to hide your group title
             </summary>
-            <param name="type">The type of item from <seealso cref="T:OpenMetaverse.InventoryType"/></param>
-            <param name="itemID"><seealso cref="T:OpenMetaverse.UUID"/> of the item</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.IsLink">
-            <summary>
-            Indicates inventory item is a link
-            </summary>
-            <returns>True if inventory item is a link to another inventory item</returns>
+        <member name="F:OpenMetaverse.AgentFlags.None">
+            <summary>No flags set</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            
-            </summary>
-            <returns></returns>
+        <member name="F:OpenMetaverse.AgentFlags.HideTitle">
+            <summary>Hide your group title</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="T:OpenMetaverse.AgentState">
             <summary>
-            
+            Action state of the avatar, which can currently be typing and
+            editing
             </summary>
-            <returns></returns>
         </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="F:OpenMetaverse.AgentState.None">
+            <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="F:OpenMetaverse.AgentState.Typing">
+            <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="F:OpenMetaverse.AgentState.Editing">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.Equals(OpenMetaverse.InventoryItem)">
+        <member name="T:OpenMetaverse.TeleportStatus">
             <summary>
-            Determine whether the specified <seealso cref="T:OpenMetaverse.InventoryItem"/> object is equal to the current object
+            Current teleport status
             </summary>
-            <param name="o">The <seealso cref="T:OpenMetaverse.InventoryItem"/> object to compare against</param>
-            <returns>true if objects are the same</returns>
         </member>
-        <member name="M:OpenMetaverse.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 name="F:OpenMetaverse.TeleportStatus.None">
+            <summary>Unknown status</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.GetOSD">
-            <summary>
-            Convert InventoryItem to OSD
-            </summary>
-            <returns>OSD representation of InventoryItem</returns>
+        <member name="F:OpenMetaverse.TeleportStatus.Start">
+            <summary>Teleport initialized</summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryTexture">
-            <summary>
-            InventoryTexture Class representing a graphical image
-            </summary>
-            <seealso cref="!:ManagedImage"/>
+        <member name="F:OpenMetaverse.TeleportStatus.Progress">
+            <summary>Teleport in progress</summary>
         </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.TeleportStatus.Failed">
+            <summary>Teleport failed</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.TeleportStatus.Finished">
+            <summary>Teleport completed</summary>
         </member>
-        <member name="T:OpenMetaverse.InventorySound">
-            <summary>
-            InventorySound Class representing a playable sound
-            </summary>
+        <member name="F:OpenMetaverse.TeleportStatus.Cancelled">
+            <summary>Teleport cancelled</summary>
         </member>
-        <member name="M:OpenMetaverse.InventorySound.#ctor(OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.TeleportFlags">
             <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="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.TeleportFlags.Default">
+            <summary>No flags set, or teleport failed</summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryCallingCard">
-            <summary>
-            InventoryCallingCard Class, contains information on another avatar
-            </summary>
+        <member name="F:OpenMetaverse.TeleportFlags.SetHomeToTarget">
+            <summary>Set when newbie leaves help island for first time</summary>
         </member>
-        <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 name="F:OpenMetaverse.TeleportFlags.SetLastToTarget">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.TeleportFlags.ViaLure">
+            <summary>Via Lure</summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryLandmark">
-            <summary>
-            InventoryLandmark Class, contains details on a specific location
-            </summary>
+        <member name="F:OpenMetaverse.TeleportFlags.ViaLandmark">
+            <summary>Via Landmark</summary>
         </member>
-        <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 name="F:OpenMetaverse.TeleportFlags.ViaLocation">
+            <summary>Via Location</summary>
         </member>
-        <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 name="F:OpenMetaverse.TeleportFlags.ViaHome">
+            <summary>Via Home</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.TeleportFlags.ViaTelehub">
+            <summary>Via Telehub</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.TeleportFlags.ViaLogin">
+            <summary>Via Login</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.TeleportFlags.ViaGodlikeLure">
+            <summary>Linden Summoned</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.TeleportFlags.Godlike">
+            <summary>Linden Forced me</summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryObject.ItemFlags">
-            <summary>
-            Gets or sets the upper byte of the Flags value
-            </summary>
+        <member name="F:OpenMetaverse.TeleportFlags.NineOneOne">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryObject.AttachPoint">
-            <summary>
-            Gets or sets the object attachment point, the lower byte of the Flags value
-            </summary>
+        <member name="F:OpenMetaverse.TeleportFlags.DisableCancel">
+            <summary>Agent Teleported Home via Script</summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryNotecard">
-            <summary>
-            InventoryNotecard Class, contains details on an encoded text document
-            </summary>
+        <member name="F:OpenMetaverse.TeleportFlags.ViaRegionID">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.TeleportFlags.IsFlying">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.TeleportFlags.ResetHome">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.TeleportFlags.ForceRedirect">
+            <summary>forced to new location for example when avatar is banned or ejected</summary>
+        </member>
+        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaLure">
+            <summary>Teleport Finished via a Lure</summary>
+        </member>
+        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaNewSim">
+            <summary>Finished, Sim Changed</summary>
+        </member>
+        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaSameSim">
+            <summary>Finished, Same Sim</summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryCategory">
+        <member name="T:OpenMetaverse.TeleportLureFlags">
             <summary>
-            InventoryCategory Class
+            
             </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.TeleportLureFlags.NormalLure">
+            <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.TeleportLureFlags.GodlikeLure">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryLSL">
-            <summary>
-            InventoryLSL Class, represents a Linden Scripting Language object
-            </summary>
+        <member name="F:OpenMetaverse.TeleportLureFlags.GodlikePursuit">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryLSL.#ctor(OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.ScriptSensorTypeFlags">
             <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>
         </member>
-        <member name="M:OpenMetaverse.InventoryLSL.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            Construct an InventoryLSL object from a serialization stream
-            </summary>
+        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Agent">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InventorySnapshot">
-            <summary>
-            InventorySnapshot Class, an image taken with the viewer
-            </summary>
+        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Active">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventorySnapshot.#ctor(OpenMetaverse.UUID)">
-            <summary>
-            Construct an InventorySnapshot object
-            </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
-            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
+        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Passive">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.ScriptSensorTypeFlags.Scripted">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryAttachment">
+        <member name="T:OpenMetaverse.MuteType">
             <summary>
-            InventoryAttachment Class, contains details on an attachable object
+            Type of mute entry
             </summary>
         </member>
-        <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 name="F:OpenMetaverse.MuteType.ByName">
+            <summary>Object muted by name</summary>
         </member>
-        <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 name="F:OpenMetaverse.MuteType.Resident">
+            <summary>Muted residet</summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryAttachment.AttachmentPoint">
-            <summary>
-            Get the last AttachmentPoint this object was attached to
-            </summary>
+        <member name="F:OpenMetaverse.MuteType.Object">
+            <summary>Object muted by UUID</summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryWearable">
-            <summary>
-            InventoryWearable Class, details on a clothing item or body part
-            </summary>
+        <member name="F:OpenMetaverse.MuteType.Group">
+            <summary>Muted group</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.MuteType.External">
+            <summary>Muted external entry</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryWearable.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="T:OpenMetaverse.MuteFlags">
             <summary>
-            Construct an InventoryWearable object from a serialization stream
+            Flags of mute entry
             </summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryWearable.WearableType">
-            <summary>
-            The <seealso cref="T:OpenMetaverse.WearableType"/>, Skin, Shape, Skirt, Etc
-            </summary>
+        <member name="F:OpenMetaverse.MuteFlags.Default">
+            <summary>No exceptions</summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryAnimation">
-            <summary>
-            InventoryAnimation Class, A bvh encoded object which animates an avatar
-            </summary>
+        <member name="F:OpenMetaverse.MuteFlags.TextChat">
+            <summary>Don't mute text chat</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.MuteFlags.VoiceChat">
+            <summary>Don't mute voice chat</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.MuteFlags.Particles">
+            <summary>Don't mute particles</summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryGesture">
-            <summary>
-            InventoryGesture Class, details on a series of animations, sounds, and actions
-            </summary>
+        <member name="F:OpenMetaverse.MuteFlags.ObjectSounds">
+            <summary>Don't mute sounds</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.MuteFlags.All">
+            <summary>Don't mute</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryGesture.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="T:OpenMetaverse.InstantMessage">
             <summary>
-            Construct an InventoryGesture object from a serialization stream
+            Instant Message
             </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.InstantMessage.FromAgentID">
+            <summary>Key of sender</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryFolder.PreferredType">
-            <summary>The Preferred <seealso cref="T:OpenMetaverse.AssetType"/> for a folder.</summary>
+        <member name="F:OpenMetaverse.InstantMessage.FromAgentName">
+            <summary>Name of sender</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryFolder.Version">
-            <summary>The Version of this folder</summary>
+        <member name="F:OpenMetaverse.InstantMessage.ToAgentID">
+            <summary>Key of destination avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryFolder.DescendentCount">
-            <summary>Number of child items this folder contains.</summary>
+        <member name="F:OpenMetaverse.InstantMessage.ParentEstateID">
+            <summary>ID of originating estate</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.InstantMessage.RegionID">
+            <summary>Key of originating region</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.ToString">
-            <summary>
-            
-            </summary>
-            <returns></returns>
+        <member name="F:OpenMetaverse.InstantMessage.Position">
+            <summary>Coordinates in originating region</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.InstantMessage.Dialog">
+            <summary>Instant message type</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.InstantMessage.GroupIM">
+            <summary>Group IM session toggle</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.GetHashCode">
-            <summary>
-            
-            </summary>
-            <returns></returns>
+        <member name="F:OpenMetaverse.InstantMessage.IMSessionID">
+            <summary>Key of IM session, for Group Messages, the groups UUID</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.Equals(System.Object)">
-            <summary>
-            
-            </summary>
-            <param name="o"></param>
-            <returns></returns>
+        <member name="F:OpenMetaverse.InstantMessage.Timestamp">
+            <summary>Timestamp of the instant message</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.Equals(OpenMetaverse.InventoryBase)">
-            <summary>
-            
-            </summary>
-            <param name="o"></param>
-            <returns></returns>
+        <member name="F:OpenMetaverse.InstantMessage.Message">
+            <summary>Instant message text</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.Equals(OpenMetaverse.InventoryFolder)">
-            <summary>
-            
-            </summary>
-            <param name="o"></param>
-            <returns></returns>
+        <member name="F:OpenMetaverse.InstantMessage.Offline">
+            <summary>Whether this message is held for offline avatars</summary>
         </member>
-        <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 name="F:OpenMetaverse.InstantMessage.BinaryBucket">
+            <summary>Context specific packed data</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.GetOSD">
-            <summary>
-            Convert InventoryItem to OSD
-            </summary>
-            <returns>OSD representation of InventoryItem</returns>
+        <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.MuteEntry">
+            <summary>Represents muted object or resident</summary>
+        </member>
+        <member name="F:OpenMetaverse.MuteEntry.Type">
+            <summary>Type of the mute entry</summary>
+        </member>
+        <member name="F:OpenMetaverse.MuteEntry.ID">
+            <summary>UUID of the mute etnry</summary>
+        </member>
+        <member name="F:OpenMetaverse.MuteEntry.Name">
+            <summary>Mute entry name</summary>
+        </member>
+        <member name="F:OpenMetaverse.MuteEntry.Flags">
+            <summary>Mute flags</summary>
+        </member>
+        <member name="T:OpenMetaverse.TransactionInfo">
+            <summary>Transaction detail sent with MoneyBalanceReply message</summary>
+        </member>
+        <member name="F:OpenMetaverse.TransactionInfo.TransactionType">
+            <summary>Type of the transaction</summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryManager">
-            <summary>
-            Tools for dealing with agents inventory
-            </summary>
+        <member name="F:OpenMetaverse.TransactionInfo.SourceID">
+            <summary>UUID of the transaction source</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.MAGIC_ID">
-            <summary>Used for converting shadow_id to asset_id</summary>
+        <member name="F:OpenMetaverse.TransactionInfo.IsSourceGroup">
+            <summary>Is the transaction source a group</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_ItemReceived">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.TransactionInfo.DestID">
+            <summary>UUID of the transaction destination</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 name="F:OpenMetaverse.TransactionInfo.IsDestGroup">
+            <summary>Is transaction destination a group</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_ItemReceivedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.TransactionInfo.Amount">
+            <summary>Transaction amount</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_FolderUpdated">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.TransactionInfo.ItemDescription">
+            <summary>Transaction description</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.OnFolderUpdated(OpenMetaverse.FolderUpdatedEventArgs)">
-            <summary>Raises the FolderUpdated Event</summary>
-             <param name="e">A FolderUpdatedEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.ChatEventArgs">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_FolderUpdatedLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.InventoryManager.m_InventoryObjectOffered">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="P:OpenMetaverse.ChatEventArgs.Simulator">
+            <summary>Get the simulator sending the message</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.OnInventoryObjectOffered(OpenMetaverse.InventoryObjectOfferedEventArgs)">
-            <summary>Raises the InventoryObjectOffered Event</summary>
-             <param name="e">A InventoryObjectOfferedEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="P:OpenMetaverse.ChatEventArgs.Message">
+            <summary>Get the message sent</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_InventoryObjectOfferedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.ChatEventArgs.AudibleLevel">
+            <summary>Get the audible level of the message</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_TaskItemReceived">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="P:OpenMetaverse.ChatEventArgs.Type">
+            <summary>Get the type of message sent: whisper, shout, etc</summary>
         </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="P:OpenMetaverse.ChatEventArgs.SourceType">
+            <summary>Get the source type of the message sender</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_TaskItemReceivedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.ChatEventArgs.FromName">
+            <summary>Get the name of the agent or object sending the message</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_FindObjectByPathReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="P:OpenMetaverse.ChatEventArgs.SourceID">
+            <summary>Get the ID of the agent or object sending the message</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="P:OpenMetaverse.ChatEventArgs.OwnerID">
+            <summary>Get the ID of the object owner, or the agent ID sending the message</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_FindObjectByPathReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.ChatEventArgs.Position">
+            <summary>Get the position of the agent or object sending the message</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_TaskInventoryReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.ScriptDialogEventArgs">
+            <summary>Contains the data sent when a primitive opens a dialog with this agent</summary>
         </member>
-        <member name="M:OpenMetaverse.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="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="F:OpenMetaverse.InventoryManager.m_TaskInventoryReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.Message">
+            <summary>Get the dialog message</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_SaveAssetToInventory">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.ObjectName">
+            <summary>Get the name of the object that sent the dialog request</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="P:OpenMetaverse.ScriptDialogEventArgs.ImageID">
+            <summary>Get the ID of the image to be displayed</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_SaveAssetToInventoryLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.ObjectID">
+            <summary>Get the ID of the primitive sending the dialog</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_ScriptRunningReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.FirstName">
+            <summary>Get the first name of the senders owner</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="P:OpenMetaverse.ScriptDialogEventArgs.LastName">
+            <summary>Get the last name of the senders owner</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_ScriptRunningReplyLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.InventoryManager._NewFolderNames">
-            <summary>Partial mapping of AssetTypes to folder names</summary>
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.ButtonLabels">
+            <summary>Get the string labels containing the options presented in this dialog</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Default constructor
-            </summary>
-            <param name="client">Reference to the GridClient object</param>
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.OwnerID">
+            <summary>UUID of the scritped object owner</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="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="M:OpenMetaverse.InventoryManager.RequestFetchInventory(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.ScriptQuestionEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.ScriptPermission)">
             <summary>
-            Request A single inventory item
+            Construct a new instance of the ScriptQuestionEventArgs
             </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="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="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 name="P:OpenMetaverse.ScriptQuestionEventArgs.Simulator">
+            <summary>Get the simulator containing the object sending the request</summary>
         </member>
-        <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 name="P:OpenMetaverse.ScriptQuestionEventArgs.TaskID">
+            <summary>Get the ID of the script making the request</summary>
         </member>
-        <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 name="P:OpenMetaverse.ScriptQuestionEventArgs.ItemID">
+            <summary>Get the ID of the primitive containing the script making the request</summary>
         </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="P:OpenMetaverse.ScriptQuestionEventArgs.ObjectName">
+            <summary>Get the name of the primitive making the request</summary>
         </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="P:OpenMetaverse.ScriptQuestionEventArgs.ObjectOwnerName">
+            <summary>Get the name of the owner of the object making the request</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="P:OpenMetaverse.ScriptQuestionEventArgs.Questions">
+            <summary>Get the permissions being requested</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>
-        <member name="M:OpenMetaverse.InventoryManager.FindObjectByPath(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.Int32)">
+        <member name="M:OpenMetaverse.LoadUrlEventArgs.#ctor(System.String,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.String,System.String)">
             <summary>
-            Find an object in inventory using a specific path to search
+            Construct a new instance of the LoadUrlEventArgs
             </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>
+            <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="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="P:OpenMetaverse.LoadUrlEventArgs.ObjectName">
+            <summary>Get the name of the object sending the request</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="P:OpenMetaverse.LoadUrlEventArgs.ObjectID">
+            <summary>Get the ID of the object sending the request</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="P:OpenMetaverse.LoadUrlEventArgs.OwnerID">
+            <summary>Get the ID of the owner of the object sending the request</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="P:OpenMetaverse.LoadUrlEventArgs.OwnerIsGroup">
+            <summary>True if the object is owned by a group</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="P:OpenMetaverse.LoadUrlEventArgs.Message">
+            <summary>Get the message sent with the request</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="P:OpenMetaverse.LoadUrlEventArgs.URL">
+            <summary>Get the URL the object sent</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="T:OpenMetaverse.InstantMessageEventArgs">
+            <summary>The date received from an ImprovedInstantMessage</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveFolders(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.UUID})">
+        <member name="M:OpenMetaverse.InstantMessageEventArgs.#ctor(OpenMetaverse.InstantMessage,OpenMetaverse.Simulator)">
             <summary>
-            Move multiple folders, the keys in the Dictionary parameter,
-            to a new parents, the value of that folder's key.
+            Construct a new instance of the InstantMessageEventArgs object
             </summary>
-            <param name="foldersNewParents">A Dictionary containing the 
-            <seealso cref="T:OpenMetaverse.UUID"/> of the source as the key, and the 
-            <seealso cref="T:OpenMetaverse.UUID"/> of the destination as the value</param>
+            <param name="im">the InstantMessage object</param>
+            <param name="simulator">the simulator where the InstantMessage origniated</param>
         </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="P:OpenMetaverse.InstantMessageEventArgs.IM">
+            <summary>Get the InstantMessage object</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="P:OpenMetaverse.InstantMessageEventArgs.Simulator">
+            <summary>Get the simulator where the InstantMessage origniated</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="T:OpenMetaverse.BalanceEventArgs">
+            <summary>Contains the currency balance</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RemoveDescendants(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.BalanceEventArgs.#ctor(System.Int32)">
             <summary>
-            Remove descendants of a folder
+            Construct a new BalanceEventArgs object
             </summary>
-            <param name="folder">The <seealso cref="T:OpenMetaverse.UUID"/> of the folder</param>
+            <param name="balance">The currenct balance</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RemoveItem(OpenMetaverse.UUID)">
+        <member name="P:OpenMetaverse.BalanceEventArgs.Balance">
             <summary>
-            Remove a single item from inventory
+            Get the currenct balance
             </summary>
-            <param name="item">The <seealso cref="T:OpenMetaverse.UUID"/> of the inventory item to remove</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RemoveFolder(OpenMetaverse.UUID)">
-            <summary>
-            Remove a folder from inventory
-            </summary>
-            <param name="folder">The <seealso cref="T:OpenMetaverse.UUID"/> of the folder to remove</param>
+        <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="M:OpenMetaverse.InventoryManager.Remove(System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{OpenMetaverse.UUID})">
+        <member name="M:OpenMetaverse.MoneyBalanceReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Boolean,System.Int32,System.Int32,System.Int32,System.String,OpenMetaverse.TransactionInfo)">
             <summary>
-            Remove multiple items or folders from inventory
+            Construct a new instance of the MoneyBalanceReplyEventArgs object
             </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>
+            <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="M:OpenMetaverse.InventoryManager.EmptyLostAndFound">
-            <summary>
-            Empty the Lost and Found folder
-            </summary>
+        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.TransactionID">
+            <summary>Get the ID of the transaction</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.EmptyTrash">
-            <summary>
-            Empty the Trash folder
-            </summary>
+        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.Success">
+            <summary>True of the transaction was successful</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItem(OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,OpenMetaverse.InventoryType,OpenMetaverse.PermissionMask,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
-            <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="P:OpenMetaverse.MoneyBalanceReplyEventArgs.Balance">
+            <summary>Get the remaining currency balance</summary>
         </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="P:OpenMetaverse.MoneyBalanceReplyEventArgs.MetersCredit">
+            <summary>Get the meters credited</summary>
         </member>
-        <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 name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.MetersCommitted">
+            <summary>Get the meters comitted</summary>
         </member>
-        <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 name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.Description">
+            <summary>Get the description of the transaction</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItemFromAsset(System.Byte[],System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.InventoryType,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCreatedFromAssetCallback)">
+        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.TransactionInfo">
+            <summary>Detailed transaction information</summary>
+        </member>
+        <member name="T:OpenMetaverse.AgentDataReplyEventArgs">
+            <summary>Data sent from the simulator containing information about your agent and active group information</summary>
+        </member>
+        <member name="M:OpenMetaverse.AgentDataReplyEventArgs.#ctor(System.String,System.String,OpenMetaverse.UUID,System.String,OpenMetaverse.GroupPowers,System.String)">
             <summary>
-            Create an inventory item and upload asset data
+            Construct a new instance of the AgentDataReplyEventArgs object
             </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>
+            <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="P:OpenMetaverse.AgentDataReplyEventArgs.FirstName">
+            <summary>Get the agents first name</summary>
+        </member>
+        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.LastName">
+            <summary>Get the agents last name</summary>
+        </member>
+        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.ActiveGroupID">
+            <summary>Get the active group ID of your agent</summary>
+        </member>
+        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.GroupTitle">
+            <summary>Get the active groups title of your agent</summary>
+        </member>
+        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.GroupPowers">
+            <summary>Get the combined group powers of your agent</summary>
+        </member>
+        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.GroupName">
+            <summary>Get the active group name of your agent</summary>
         </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="T:OpenMetaverse.AnimationsChangedEventArgs">
+            <summary>Data sent by the simulator to indicate the active/changed animations
+            applied to your agent</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.InventoryBase,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
+        <member name="M:OpenMetaverse.AnimationsChangedEventArgs.#ctor(OpenMetaverse.InternalDictionary{OpenMetaverse.UUID,System.Int32})">
             <summary>
-            Creates inventory link to another inventory item or folder
+            Construct a new instance of the AnimationsChangedEventArgs class
             </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>
+            <param name="agentAnimations">The dictionary that contains the changed animations</param>
         </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="P:OpenMetaverse.AnimationsChangedEventArgs.Animations">
+            <summary>Get the dictionary that contains the changed animations</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.InventoryFolder,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
+        <member name="T:OpenMetaverse.MeanCollisionEventArgs">
             <summary>
-            Creates inventory link to another inventory folder
+            Data sent from a simulator indicating a collision with your agent
             </summary>
-            <param name="folderID">Put newly created link in folder with this UUID</param>
-            <param name="folder">Original inventory folder</param>
-            <param name="callback">Method to call upon creation of the link</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.InventoryType,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
+        <member name="M:OpenMetaverse.MeanCollisionEventArgs.#ctor(OpenMetaverse.MeanCollisionType,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Single,System.DateTime)">
             <summary>
-            Creates inventory link to another inventory item or folder
+            Construct a new instance of the MeanCollisionEventArgs class
             </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>
+            <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="M:OpenMetaverse.InventoryManager.RequestCopyItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
+        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Type">
+            <summary>Get the Type of collision</summary>
+        </member>
+        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Aggressor">
+            <summary>Get the ID of the agent or object that collided with your agent</summary>
+        </member>
+        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Victim">
+            <summary>Get the ID of the agent that was attacked</summary>
+        </member>
+        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Magnitude">
+            <summary>A value indicating the strength of the collision</summary>
+        </member>
+        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Time">
+            <summary>Get the time the collision occurred</summary>
+        </member>
+        <member name="T:OpenMetaverse.RegionCrossedEventArgs">
+            <summary>Data sent to your agent when it crosses region boundaries</summary>
+        </member>
+        <member name="M:OpenMetaverse.RegionCrossedEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Simulator)">
             <summary>
-            
+            Construct a new instance of the RegionCrossedEventArgs class
             </summary>
-            <param name="item"></param>
-            <param name="newParent"></param>
-            <param name="newName"></param>
-            <param name="callback"></param>
+            <param name="oldSim">The simulator your agent just left</param>
+            <param name="newSim">The simulator your agent is now in</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
+        <member name="P:OpenMetaverse.RegionCrossedEventArgs.OldSimulator">
+            <summary>Get the simulator your agent just left</summary>
+        </member>
+        <member name="P:OpenMetaverse.RegionCrossedEventArgs.NewSimulator">
+            <summary>Get the simulator your agent is now in</summary>
+        </member>
+        <member name="T:OpenMetaverse.GroupChatJoinedEventArgs">
+            <summary>Data sent from the simulator when your agent joins a group chat session</summary>
+        </member>
+        <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="item"></param>
-            <param name="newParent"></param>
-            <param name="newName"></param>
-            <param name="oldOwnerID"></param>
-            <param name="callback"></param>
+            <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="M:OpenMetaverse.InventoryManager.RequestCopyItems(System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{System.String},OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
+        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.SessionID">
+            <summary>Get the ID of the group chat session</summary>
+        </member>
+        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.SessionName">
+            <summary>Get the name of the session</summary>
+        </member>
+        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.TmpSessionID">
+            <summary>Get the temporary session ID used for establishing new sessions</summary>
+        </member>
+        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.Success">
+            <summary>True if your agent successfully joined the session</summary>
+        </member>
+        <member name="T:OpenMetaverse.AlertMessageEventArgs">
+            <summary>Data sent by the simulator containing urgent messages</summary>
+        </member>
+        <member name="M:OpenMetaverse.AlertMessageEventArgs.#ctor(System.String)">
             <summary>
-            
+            Construct a new instance of the AlertMessageEventArgs class
             </summary>
-            <param name="items"></param>
-            <param name="targetFolders"></param>
-            <param name="newNames"></param>
-            <param name="oldOwnerID"></param>
-            <param name="callback"></param>
+            <param name="message">The alert message</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItemFromNotecard(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
+        <member name="P:OpenMetaverse.AlertMessageEventArgs.Message">
+            <summary>Get the alert message</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>
+        <member name="M:OpenMetaverse.ScriptControlEventArgs.#ctor(OpenMetaverse.ScriptControlChange,System.Boolean,System.Boolean)">
             <summary>
-            Request a copy of an asset embedded within a notecard
+            Construct a new instance of the ScriptControlEventArgs class
             </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>
+            <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="M:OpenMetaverse.InventoryManager.RequestUpdateItem(OpenMetaverse.InventoryItem)">
+        <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="P:OpenMetaverse.ScriptControlEventArgs.Pass">
+            <summary>True if the script is passing controls back to the agent</summary>
+        </member>
+        <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.CameraConstraintEventArgs">
             <summary>
-            
+            Data sent from the simulator to an agent to indicate its view limits
             </summary>
-            <param name="item"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItems(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
+        <member name="M:OpenMetaverse.CameraConstraintEventArgs.#ctor(OpenMetaverse.Vector4)">
             <summary>
-            
+            Construct a new instance of the CameraConstraintEventArgs class
             </summary>
-            <param name="items"></param>
+            <param name="collidePlane">The collision plane</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItems(System.Collections.Generic.List{OpenMetaverse.InventoryItem},OpenMetaverse.UUID)">
+        <member name="P:OpenMetaverse.CameraConstraintEventArgs.CollidePlane">
+            <summary>Get the collision plane</summary>
+        </member>
+        <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>
-            <param name="items"></param>
-            <param name="transactionID"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUploadNotecardAsset(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback)">
+        <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="data"></param>
-            <param name="notecardID"></param>
-            <param name="callback"></param>
+            <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="P:OpenMetaverse.ScriptSensorReplyEventArgs.RequestorID">
+            <summary>Get the ID of the primitive sending the sensor</summary>
+        </member>
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.GroupID">
+            <summary>Get the ID of the group associated with the primitive</summary>
+        </member>
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Name">
+            <summary>Get the name of the primitive sending the sensor</summary>
+        </member>
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.ObjectID">
+            <summary>Get the ID of the primitive sending the sensor</summary>
+        </member>
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.OwnerID">
+            <summary>Get the ID of the owner of the primitive sending the sensor</summary>
+        </member>
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Position">
+            <summary>Get the position of the primitive sending the sensor</summary>
+        </member>
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Range">
+            <summary>Get the range the primitive specified to scan</summary>
+        </member>
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Rotation">
+            <summary>Get the rotation of the primitive sending the sensor</summary>
+        </member>
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Type">
+            <summary>Get the type of sensor the primitive sent</summary>
+        </member>
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Velocity">
+            <summary>Get the velocity of the primitive sending the sensor</summary>
+        </member>
+        <member name="T:OpenMetaverse.AvatarSitResponseEventArgs">
+            <summary>Contains the response data returned from the simulator in response to a <see cref="!:RequestSit"/></summary>
+        </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>
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.ObjectID">
+            <summary>Get the ID of the primitive the agent will be sitting on</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.Autopilot">
+            <summary>True if the simulator Autopilot functions were involved</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.CameraAtOffset">
+            <summary>Get the camera offset of the agent when seated</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.CameraEyeOffset">
+            <summary>Get the camera eye offset of the agent when seated</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.ForceMouselook">
+            <summary>True of the agent will be in mouselook mode when seated</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.SitPosition">
+            <summary>Get the position of the agent when seated</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.SitRotation">
+            <summary>Get the rotation of the agent when seated</summary>
+        </member>
+        <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="M:OpenMetaverse.InventoryManager.RequestUpdateNotecardTask(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback)">
+        <member name="M:OpenMetaverse.ChatSessionMemberAddedEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Save changes to notecard embedded in object contents
+            Construct a new instance of the ChatSessionMemberAddedEventArgs object
             </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>
+            <param name="sessionID">The ID of the chat session</param>
+            <param name="agentID">The ID of the agent joining</param>
         </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="P:OpenMetaverse.ChatSessionMemberAddedEventArgs.SessionID">
+            <summary>Get the ID of the chat session</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="P:OpenMetaverse.ChatSessionMemberAddedEventArgs.AgentID">
+            <summary>Get the ID of the agent that joined</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="T:OpenMetaverse.ChatSessionMemberLeftEventArgs">
+            <summary>Data sent when an agent exits a chat session your agent is currently participating in</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.InventoryItem)">
+        <member name="M:OpenMetaverse.ChatSessionMemberLeftEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Rez an object from inventory
+            Construct a new instance of the ChatSessionMemberLeftEventArgs object
             </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="sessionID">The ID of the chat session</param>
+            <param name="agentID">The ID of the Agent that left</param>
         </member>
-        <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 name="P:OpenMetaverse.ChatSessionMemberLeftEventArgs.SessionID">
+            <summary>Get the ID of the chat session</summary>
         </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="P:OpenMetaverse.ChatSessionMemberLeftEventArgs.AgentID">
+            <summary>Get the ID of the agent that left</summary>
         </member>
-        <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 name="T:OpenMetaverse.SetDisplayNameReplyEventArgs">
+            <summary>Event arguments with the result of setting display name operation</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="M:OpenMetaverse.SetDisplayNameReplyEventArgs.#ctor(System.Int32,System.String,OpenMetaverse.AgentDisplayName)">
+            <summary>Default constructor</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="P:OpenMetaverse.SetDisplayNameReplyEventArgs.Status">
+            <summary>Status code, 200 indicates settign display name was successful</summary>
         </member>
-        <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 name="P:OpenMetaverse.SetDisplayNameReplyEventArgs.Reason">
+            <summary>Textual description of the status</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.GiveItem(OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,System.Boolean)">
+        <member name="P:OpenMetaverse.SetDisplayNameReplyEventArgs.DisplayName">
+            <summary>Details of the newly set display name</summary>
+        </member>
+        <member name="T:OpenMetaverse.Rendering.IRendering">
             <summary>
-            Give an inventory item to another avatar
+            Abstract base for rendering plugins
             </summary>
-            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID"/> of the item to give</param>
-            <param name="itemName">The name of the item</param>
-            <param name="assetType">The type of the item from the <seealso cref="T:OpenMetaverse.AssetType"/> enum</param>
-            <param name="recipient">The <seealso cref="T:OpenMetaverse.UUID"/> of the recipient</param>
-            <param name="doEffect">true to generate a beameffect during transfer</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.GiveFolder(OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,System.Boolean)">
+        <member name="M:OpenMetaverse.Rendering.IRendering.GenerateSimpleMesh(OpenMetaverse.Primitive,OpenMetaverse.Rendering.DetailLevel)">
             <summary>
-            Give an inventory Folder with contents to another avatar
+            Generates a basic mesh structure from a primitive
             </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>
+            <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.InventoryManager.UpdateTaskInventory(System.UInt32,OpenMetaverse.InventoryItem)">
+        <member name="M:OpenMetaverse.Rendering.IRendering.GenerateSimpleSculptMesh(OpenMetaverse.Primitive,System.Drawing.Bitmap,OpenMetaverse.Rendering.DetailLevel)">
             <summary>
-            Copy or move an <see cref="T:OpenMetaverse.InventoryItem"/> from agent inventory to a task (primitive) inventory
+            Generates a basic mesh structure from a sculpted primitive and
+            texture
             </summary>
-            <param name="objectLocalID">The target object</param>
-            <param name="item">The item to copy or move from inventory</param>
-            <returns></returns>
-            <remarks>For items with copy permissions a copy of the item is placed in the tasks inventory,
-            for no-copy items the object is moved to the tasks inventory</remarks>
+            <param name="prim">Sculpted primitive to generate the mesh from</param>
+            <param name="sculptTexture">Sculpt texture</param>
+            <param name="lod">Level of detail to generate the mesh at</param>
+            <returns>The generated mesh</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.GetTaskInventory(OpenMetaverse.UUID,System.UInt32,System.Int32)">
+        <member name="M:OpenMetaverse.Rendering.IRendering.GenerateFacetedMesh(OpenMetaverse.Primitive,OpenMetaverse.Rendering.DetailLevel)">
             <summary>
-            Retrieve a listing of the items contained in a task (Primitive)
+            Generates a series of faces, each face containing a mesh and
+            metadata
             </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="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.InventoryManager.RequestTaskInventory(System.UInt32)">
+        <member name="M:OpenMetaverse.Rendering.IRendering.GenerateFacetedSculptMesh(OpenMetaverse.Primitive,System.Drawing.Bitmap,OpenMetaverse.Rendering.DetailLevel)">
             <summary>
-            Request the contents of a tasks (primitives) inventory from the 
-            current simulator
+            Generates a series of faces for a sculpted prim, each face 
+            containing a mesh and metadata
             </summary>
-            <param name="objectLocalID">The LocalID of the object</param>
-            <seealso cref="E:OpenMetaverse.InventoryManager.TaskInventoryReply"/>
+            <param name="prim">Sculpted primitive to generate the mesh from</param>
+            <param name="sculptTexture">Sculpt texture</param>
+            <param name="lod">Level of detail to generate the mesh at</param>
+            <returns>The generated mesh</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestTaskInventory(System.UInt32,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.Rendering.IRendering.TransformTexCoords(System.Collections.Generic.List{OpenMetaverse.Rendering.Vertex},OpenMetaverse.Vector3,OpenMetaverse.Primitive.TextureEntryFace,OpenMetaverse.Vector3)">
             <summary>
-            Request the contents of a tasks (primitives) inventory
+            Apply texture coordinate modifications from a
+            <seealso cref="!:TextureEntryFace"/> to a list of vertices
             </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="vertices">Vertex list to modify texture coordinates for</param>
+            <param name="center">Center-point of the face</param>
+            <param name="teFace">Face texture parameters</param>
+            <param name="primScale">Scale of the prim</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveTaskInventory(System.UInt32,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Simulator)">
+        <member name="T:OpenMetaverse.Assets.AssetMesh">
             <summary>
-            Move an item from a tasks (Primitive) inventory to the specified folder in the avatars inventory
+            Represents Mesh asset
             </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="M:OpenMetaverse.InventoryManager.RemoveTaskInventory(System.UInt32,OpenMetaverse.UUID,OpenMetaverse.Simulator)">
+        <member name="F:OpenMetaverse.Assets.AssetMesh.MeshData">
             <summary>
-            Remove an item from an objects (Prim) Inventory
+            Decoded mesh data
             </summary>
-            <param name="objectLocalID">LocalID of the object in the simulator</param>
-            <param name="taskItemID">UUID of the task item to remove</param>
-            <param name="simulator">Simulator Object</param>
-            <remarks>You can confirm the removal by comparing the tasks inventory serial before and after the 
-            request with the <see cref="M:OpenMetaverse.InventoryManager.RequestTaskInventory(System.UInt32)"/> request combined with
-            the <seealso cref="E:OpenMetaverse.InventoryManager.TaskInventoryReply"/> event</remarks>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CopyScriptToTask(System.UInt32,OpenMetaverse.InventoryItem,System.Boolean)">
-             <summary>
-             Copy an InventoryScript item from the Agents Inventory into a primitives task inventory
-             </summary>
-             <param name="objectLocalID">An unsigned integer representing a primitive being simulated</param>
-             <param name="item">An <seealso cref="T:OpenMetaverse.InventoryItem"/> which represents a script object from the agents inventory</param>
-             <param name="enableScript">true to set the scripts running state to enabled</param>
-             <returns>A Unique Transaction ID</returns>
-             <example>
-             The following example shows the basic steps necessary to copy a script from the agents inventory into a tasks inventory
-             and assumes the script exists in the agents inventory.
-             <code>
-                uint primID = 95899503; // Fake prim ID
-                UUID scriptID = UUID.Parse("92a7fe8a-e949-dd39-a8d8-1681d8673232"); // Fake Script UUID in Inventory
-            
-                Client.Inventory.FolderContents(Client.Inventory.FindFolderForType(AssetType.LSLText), Client.Self.AgentID, 
-                    false, true, InventorySortOrder.ByName, 10000);
-            
-                Client.Inventory.RezScript(primID, (InventoryItem)Client.Inventory.Store[scriptID]);
-             </code>
-             </example>
+        <member name="M:OpenMetaverse.Assets.AssetMesh.#ctor">
+            <summary>Initializes a new instance of an AssetMesh object</summary>
         </member>
-        <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 name="M:OpenMetaverse.Assets.AssetMesh.#ctor(OpenMetaverse.UUID,System.Byte[])">
+            <summary>Initializes a new instance of an AssetMesh object with parameters</summary>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestSetScriptRunning(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
+        <member name="M:OpenMetaverse.Assets.AssetMesh.Encode">
             <summary>
-            Send a request to set the running state of a script contained in a task (primitive) inventory
+            TODO: Encodes Collada file into LLMesh format
             </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="M:OpenMetaverse.Assets.AssetMesh.Decode">
             <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>
+            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="M:OpenMetaverse.InventoryManager.DecryptShadowID(OpenMetaverse.UUID)">
+        <member name="P:OpenMetaverse.Assets.AssetMesh.AssetType">
+            <summary>Override the base classes AssetType</summary>
+        </member>
+        <member name="T:OpenMetaverse.Assets.AssetsArchiver">
             <summary>
-            Reverses a cheesy XORing with a fixed UUID to convert a shadow_id to an asset_id
+            Archives assets
             </summary>
-            <param name="shadowID">Obfuscated shadow_id value</param>
-            <returns>Deobfuscated asset_id value</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.EncryptAssetID(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Assets.AssetsArchiver.m_assets">
             <summary>
-            Does a cheesy XORing with a fixed UUID to convert an asset_id to a shadow_id
+            Archive assets
             </summary>
-            <param name="assetID">asset_id value to obfuscate</param>
-            <returns>Obfuscated shadow_id value</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateInventoryItem(OpenMetaverse.InventoryType,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Assets.AssetsArchiver.Archive(OpenMetaverse.Assets.TarArchiveWriter)">
             <summary>
-            Wrapper for creating a new <seealso cref="T:OpenMetaverse.InventoryItem"/> object
+            Archive the assets given to this archiver to the given archive.
             </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>
+            <param name="archive"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.ParseTaskInventory(System.String)">
+        <member name="M:OpenMetaverse.Assets.AssetsArchiver.WriteMetadata(OpenMetaverse.Assets.TarArchiveWriter)">
             <summary>
-            Parse the results of a RequestTaskInventory() response
+            Write an assets metadata file to the given archive
             </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>
-        <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>
+            <param name="archive"></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="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="M:OpenMetaverse.InventoryManager.UpdateCreateInventoryItemHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="T:OpenMetaverse.GroupMember">
             <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
+            Avatar group management
             </summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveInventoryItemHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.GroupMember.ID">
+            <summary>Key of Group Member</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.BulkUpdateInventoryHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.GroupMember.Contribution">
+            <summary>Total land contribution</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.FetchInventoryReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.GroupMember.OnlineStatus">
+            <summary>Online status information</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.ReplyTaskInventoryHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.GroupMember.Powers">
+            <summary>Abilities that the Group Member has</summary>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.ItemReceived">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.GroupMember.Title">
+            <summary>Current group title</summary>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.FolderUpdated">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.GroupMember.IsOwner">
+            <summary>Is a group owner</summary>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.InventoryObjectOffered">
-            <summary>Raised when the simulator sends us data containing
-            an inventory object sent by another avatar or primitive</summary>
+        <member name="T:OpenMetaverse.GroupRole">
+            <summary>
+            Role manager for a group
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.TaskItemReceived">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.GroupRole.GroupID">
+            <summary>Key of the group</summary>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.FindObjectByPathReply">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.GroupRole.ID">
+            <summary>Key of Role</summary>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.TaskInventoryReply">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.GroupRole.Name">
+            <summary>Name of Role</summary>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.SaveAssetToInventory">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.GroupRole.Title">
+            <summary>Group Title associated with Role</summary>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.ScriptRunningReply">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.GroupRole.Description">
+            <summary>Description of Role</summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryManager.Store">
-            <summary>
-            Get this agents Inventory data
-            </summary>
+        <member name="F:OpenMetaverse.GroupRole.Powers">
+            <summary>Abilities Associated with Role</summary>
         </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 name="M:OpenMetaverse.GroupRole.ToString">
+            <summary>Returns the role's title</summary>
+            <returns>The role's title</returns>
         </member>
-        <member name="T:OpenMetaverse.InventoryManager.ItemCreatedFromAssetCallback">
+        <member name="T:OpenMetaverse.GroupTitle">
             <summary>
-            Callback for an inventory item being create from an uploaded asset
+            Class to represent Group Title
             </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 name="F:OpenMetaverse.GroupTitle.GroupID">
+            <summary>Key of the group</summary>
         </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 name="F:OpenMetaverse.GroupTitle.RoleID">
+            <summary>ID of the role title belongs to</summary>
         </member>
-        <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 name="F:OpenMetaverse.GroupTitle.Title">
+            <summary>Group Title</summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryObjectOfferedEventArgs.Accept">
-            <summary>Set to true to accept offer, false to decline it</summary>
+        <member name="F:OpenMetaverse.GroupTitle.Selected">
+            <summary>Whether title is Active</summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryObjectOfferedEventArgs.FolderID">
-            <summary>The folder to accept the inventory into, if null default folder for <see cref="P:OpenMetaverse.InventoryObjectOfferedEventArgs.AssetType"/> will be used</summary>
+        <member name="M:OpenMetaverse.GroupTitle.ToString">
+            <summary>Returns group title</summary>
         </member>
-        <member name="T:OpenMetaverse.TaskItemReceivedEventArgs">
+        <member name="T:OpenMetaverse.Group">
             <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.
+            Represents a group on the grid
             </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 name="F:OpenMetaverse.Group.ID">
+            <summary>Key of Group</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Network">
-            <summary>Networking subsystem</summary>
+        <member name="F:OpenMetaverse.Group.InsigniaID">
+            <summary>Key of Group Insignia</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Settings">
-            <summary>Settings class including constant values and changeable
-            parameters for everything</summary>
+        <member name="F:OpenMetaverse.Group.FounderID">
+            <summary>Key of Group Founder</summary>
+        </member>
+        <member name="F:OpenMetaverse.Group.OwnerRole">
+            <summary>Key of Group Role for Owners</summary>
+        </member>
+        <member name="F:OpenMetaverse.Group.Name">
+            <summary>Name of Group</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Parcels">
-            <summary>Parcel (subdivided simulator lots) subsystem</summary>
+        <member name="F:OpenMetaverse.Group.Charter">
+            <summary>Text of Group Charter</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Self">
-            <summary>Our own avatars subsystem</summary>
+        <member name="F:OpenMetaverse.Group.MemberTitle">
+            <summary>Title of "everyone" role</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Avatars">
-            <summary>Other avatars subsystem</summary>
+        <member name="F:OpenMetaverse.Group.OpenEnrollment">
+            <summary>Is the group open for enrolement to everyone</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Estate">
-            <summary>Estate subsystem</summary>
+        <member name="F:OpenMetaverse.Group.ShowInList">
+            <summary>Will group show up in search</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Friends">
-            <summary>Friends list subsystem</summary>
+        <member name="F:OpenMetaverse.Group.Powers">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Grid">
-            <summary>Grid (aka simulator group) subsystem</summary>
+        <member name="F:OpenMetaverse.Group.AcceptNotices">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Objects">
-            <summary>Object subsystem</summary>
+        <member name="F:OpenMetaverse.Group.AllowPublish">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Groups">
-            <summary>Group subsystem</summary>
+        <member name="F:OpenMetaverse.Group.MaturePublish">
+            <summary>Is the group Mature</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Assets">
-            <summary>Asset subsystem</summary>
+        <member name="F:OpenMetaverse.Group.MembershipFee">
+            <summary>Cost of group membership</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Appearance">
-            <summary>Appearance subsystem</summary>
+        <member name="F:OpenMetaverse.Group.Money">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Inventory">
-            <summary>Inventory subsystem</summary>
+        <member name="F:OpenMetaverse.Group.Contribution">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Directory">
-            <summary>Directory searches including classifieds, people, land 
-            sales, etc</summary>
+        <member name="F:OpenMetaverse.Group.GroupMembershipCount">
+            <summary>The total number of current members this group has</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Terrain">
-            <summary>Handles land, wind, and cloud heightmaps</summary>
+        <member name="F:OpenMetaverse.Group.GroupRolesCount">
+            <summary>The number of roles this group has configured</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Sound">
-            <summary>Handles sound-related networking</summary>
+        <member name="F:OpenMetaverse.Group.ListInProfile">
+            <summary>Show this group in agent's profile</summary>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Throttle">
-            <summary>Throttling total bandwidth usage, or allocating bandwidth
-            for specific data stream types</summary>
+        <member name="M:OpenMetaverse.Group.ToString">
+            <summary>Returns the name of the group</summary>
+            <returns>A string containing the name of the group</returns>
         </member>
-        <member name="M:OpenMetaverse.GridClient.#ctor">
+        <member name="T:OpenMetaverse.Vote">
             <summary>
-            Default constructor
+            A group Vote
             </summary>
         </member>
-        <member name="M:OpenMetaverse.GridClient.ToString">
-            <summary>
-            Return the full name of this instance
-            </summary>
-            <returns>Client avatars full name</returns>
+        <member name="F:OpenMetaverse.Vote.Candidate">
+            <summary>Key of Avatar who created Vote</summary>
         </member>
-        <member name="T:OpenMetaverse.AssetCache">
-            <summary>
-            Class that handles the local asset cache
-            </summary>
+        <member name="F:OpenMetaverse.Vote.VoteString">
+            <summary>Text of the Vote proposal</summary>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Default constructor
-            </summary>
-            <param name="client">A reference to the GridClient object</param>
+        <member name="F:OpenMetaverse.Vote.NumVotes">
+            <summary>Total number of votes</summary>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.DestroyTimer">
+        <member name="T:OpenMetaverse.GroupProposal">
             <summary>
-            Disposes cleanup timer
+            A group proposal
             </summary>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.SetupTimer">
-            <summary>
-            Only create timer when needed
-            </summary>
+        <member name="F:OpenMetaverse.GroupProposal.VoteText">
+            <summary>The Text of the proposal</summary>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.GetCachedAssetBytes(OpenMetaverse.UUID)">
-            <summary>
-            Return bytes read from the local asset cache, null if it does not exist
-            </summary>
-            <param name="assetID">UUID of the asset we want to get</param>
-            <returns>Raw bytes of the asset, or null on failure</returns>
+        <member name="F:OpenMetaverse.GroupProposal.Quorum">
+            <summary>The minimum number of members that must vote before proposal passes or failes</summary>
         </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="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="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="F:OpenMetaverse.GroupProposal.Duration">
+            <summary>The duration in days votes are accepted</summary>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.StaticFileName(OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.GroupAccountSummary">
             <summary>
-            Constructs a file name of the static cached asset
+            
             </summary>
-            <param name="assetID">UUID of the asset</param>
-            <returns>String with the file name of the static cached asset</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.SaveAssetToCache(OpenMetaverse.UUID,System.Byte[])">
-            <summary>
-            Saves an asset to the local cache
-            </summary>
-            <param name="assetID">UUID of the asset</param>
-            <param name="assetData">Raw bytes the asset consists of</param>
-            <returns>Weather the operation was successfull</returns>
+        <member name="F:OpenMetaverse.GroupAccountSummary.IntervalDays">
+            <summary></summary>
         </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="F:OpenMetaverse.GroupAccountSummary.CurrentInterval">
+            <summary></summary>
         </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="F:OpenMetaverse.GroupAccountSummary.StartDate">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.Clear">
-            <summary>
-            Wipes out entire cache
-            </summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.Balance">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.Prune">
-            <summary>
-            Brings cache size to the 90% of the max size
-            </summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.TotalCredits">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.BeginPrune">
-            <summary>
-            Asynchronously brings cache size to the 90% of the max size
-            </summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.TotalDebits">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.GetFileSize(System.IO.FileInfo[])">
-            <summary>
-            Adds up file sizes passes in a FileInfo array
-            </summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.ObjectTaxCurrent">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.Operational">
-            <summary>
-            Checks whether caching is enabled
-            </summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.LightTaxCurrent">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.cleanerTimer_Elapsed(System.Object,System.Timers.ElapsedEventArgs)">
-            <summary>
-            Periodically prune the cache
-            </summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.LandTaxCurrent">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.NiceFileSize(System.Int64)">
-            <summary>
-            Nicely formats file sizes
-            </summary>
-            <param name="byteCount">Byte size we want to output</param>
-            <returns>String with humanly readable file size</returns>
+        <member name="F:OpenMetaverse.GroupAccountSummary.GroupTaxCurrent">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.AssetCache.AutoPruneEnabled">
-            <summary>
-            Allows setting weather to periodicale prune the cache if it grows too big
-            Default is enabled, when caching is enabled
-            </summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.ParcelDirFeeCurrent">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.AssetCache.AutoPruneInterval">
-            <summary>
-            How long (in ms) between cache checks (default is 5 min.) 
-            </summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.ObjectTaxEstimate">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.AssetCache.SortFilesByAccesTimeHelper">
-            <summary>
-            Helper class for sorting files by their last accessed time
-            </summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.LightTaxEstimate">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Voice.VoiceSession">
-            <summary>
-            Represents a single Voice Session to the Vivox service.
-            </summary>
+        <member name="F:OpenMetaverse.GroupAccountSummary.LandTaxEstimate">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceSession.Close">
+        <member name="F:OpenMetaverse.GroupAccountSummary.GroupTaxEstimate">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.GroupAccountSummary.ParcelDirFeeEstimate">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.GroupAccountSummary.NonExemptMembers">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.GroupAccountSummary.LastTaxDate">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.GroupAccountSummary.TaxDate">
+            <summary></summary>
+        </member>
+        <member name="T:OpenMetaverse.GroupNotice">
             <summary>
-            Close this session.
+            Struct representing a group notice
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceSession.FindParticipant(System.String)">
+        <member name="F:OpenMetaverse.GroupNotice.Subject">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.GroupNotice.Message">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.GroupNotice.AttachmentID">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.GroupNotice.OwnerID">
+            <summary></summary>
+        </member>
+        <member name="M:OpenMetaverse.GroupNotice.SerializeAttachment">
             <summary>
-            Look up an existing Participants in this session
+            
             </summary>
-            <param name="puri"></param>
             <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.DictionaryEventAction">
+        <member name="T:OpenMetaverse.GroupNoticesListEntry">
             <summary>
-            
+            Struct representing a group notice list entry
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DictionaryEventAction.Add">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.GroupNoticesListEntry.NoticeID">
+            <summary>Notice ID</summary>
         </member>
-        <member name="F:OpenMetaverse.DictionaryEventAction.Remove">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.GroupNoticesListEntry.Timestamp">
+            <summary>Creation timestamp of notice</summary>
         </member>
-        <member name="F:OpenMetaverse.DictionaryEventAction.Change">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.GroupNoticesListEntry.FromName">
+            <summary>Agent name who created notice</summary>
         </member>
-        <member name="T:OpenMetaverse.DictionaryChangeCallback">
-            <summary>
-            
-            </summary>
-            <param name="action"></param>
-            <param name="entry"></param>
+        <member name="F:OpenMetaverse.GroupNoticesListEntry.Subject">
+            <summary>Notice subject</summary>
         </member>
-        <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 name="F:OpenMetaverse.GroupNoticesListEntry.HasAttachment">
+            <summary>Is there an attachment?</summary>
         </member>
-        <member name="F:OpenMetaverse.ObservableDictionary`2.Delegates">
-            <summary>
-            A dictionary of callbacks to fire when specified action occurs
-            </summary>
+        <member name="F:OpenMetaverse.GroupNoticesListEntry.AssetType">
+            <summary>Attachment Type</summary>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.AddDelegate(OpenMetaverse.DictionaryEventAction,OpenMetaverse.DictionaryChangeCallback)">
+        <member name="T:OpenMetaverse.ChatSessionMember">
             <summary>
-            Register a callback to be fired when an action occurs
+            Struct representing a member of a group chat session and their settings
             </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)">
-            <summary>
-            Unregister a callback
-            </summary>
-            <param name="action">The action</param>
-            <param name="callback">The callback to fire</param>
+        <member name="F:OpenMetaverse.ChatSessionMember.AvatarKey">
+            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the Avatar</summary>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.FireChangeEvent(OpenMetaverse.DictionaryEventAction,System.Collections.DictionaryEntry)">
-            <summary>
-            
-            </summary>
-            <param name="action"></param>
-            <param name="entry"></param>
+        <member name="F:OpenMetaverse.ChatSessionMember.CanVoiceChat">
+            <summary>True if user has voice chat enabled</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 name="F:OpenMetaverse.ChatSessionMember.IsModerator">
+            <summary>True of Avatar has moderator abilities</summary>
         </member>
-        <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 name="F:OpenMetaverse.ChatSessionMember.MuteText">
+            <summary>True if a moderator has muted this avatars chat</summary>
         </member>
-        <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 name="F:OpenMetaverse.ChatSessionMember.MuteVoice">
+            <summary>True if a moderator has muted this avatars voice</summary>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.TryGetValue(`0,`1@)">
+        <member name="T:OpenMetaverse.GroupRoleUpdate">
             <summary>
-            Try to get entry from the <seealso cref="!:ObservableDictionary"/> with specified key 
+            Role update flags
             </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})">
-            <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 name="F:OpenMetaverse.GroupRoleUpdate.NoUpdate">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.FindAll(System.Predicate{`1})">
-             <summary>Find All items in an <seealso cref="T:ObservableDictionary"/></summary>
-             <param name="match">return matching items.</param>
-             <returns>a <seealso cref="T:System.Collections.Generic.List"/> containing found items.</returns>
-             <example>
-             Find All prims within 20 meters and store them in a List
-             <code>
-             int radius = 20;
-             List&lt;Primitive&gt; prims = Client.Network.CurrentSim.ObjectsPrimitives.FindAll(
-                     delegate(Primitive prim) {
-                         Vector3 pos = prim.Position;
-                         return ((prim.ParentID == 0) &amp;&amp; (pos != Vector3.Zero) &amp;&amp; (Vector3.Distance(pos, location) &lt; radius));
-                     }
-                ); 
-            </code>
-            </example>
+        <member name="F:OpenMetaverse.GroupRoleUpdate.UpdateData">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.FindAll(System.Predicate{`0})">
-             <summary>Find All items in an <seealso cref="T:ObservableDictionary"/></summary>
-             <param name="match">return matching keys.</param>
-             <returns>a <seealso cref="T:System.Collections.Generic.List"/> containing found keys.</returns>
-             <example>
-             Find All keys which also exist in another dictionary
-             <code>
-             List&lt;UUID&gt; matches = myDict.FindAll(
-                     delegate(UUID id) {
-                         return myOtherDict.ContainsKey(id);
-                     }
-                ); 
-            </code>
-            </example>
+        <member name="F:OpenMetaverse.GroupRoleUpdate.UpdatePowers">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.ContainsKey(`0)">
-            <summary>Check if Key exists in Dictionary</summary>
-            <param name="key">Key to check for</param>
-            <returns><see langword="true"/> if found, <see langword="false"/> otherwise</returns>
+        <member name="F:OpenMetaverse.GroupRoleUpdate.UpdateAll">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.ContainsValue(`1)">
-            <summary>Check if Value exists in Dictionary</summary>
-            <param name="value">Value to check for</param>
-            <returns><see langword="true"/> if found, <see langword="false"/> otherwise</returns>
+        <member name="F:OpenMetaverse.GroupRoleUpdate.Create">
+            <summary></summary>
         </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 name="F:OpenMetaverse.GroupRoleUpdate.Delete">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.Remove(`0)">
-            <summary>
-            Removes the specified key, dictionary locking is not performed
-            </summary>
-            <param name="key">The key.</param>
-            <returns><see langword="true"/> if successful, <see langword="false"/> otherwise</returns>
+        <member name="F:OpenMetaverse.GroupPowers.None">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.Clear">
-            <summary>
-            Clear the contents of the dictionary
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.Invite">
+            <summary>Can send invitations to groups default role</summary>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.GetEnumerator">
-            <summary>
-            Enumerator for iterating dictionary entries
-            </summary>
-            <returns></returns>
+        <member name="F:OpenMetaverse.GroupPowers.Eject">
+            <summary>Can eject members from group</summary>
         </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 name="F:OpenMetaverse.GroupPowers.ChangeOptions">
+            <summary>Can toggle 'Open Enrollment' and change 'Signup fee'</summary>
         </member>
-        <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 name="F:OpenMetaverse.GroupPowers.MemberVisible">
+            <summary>Member is visible in the public member list</summary>
         </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="F:OpenMetaverse.GroupPowers.CreateRole">
+            <summary>Can create new roles</summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.rotationkeys">
-            <summary>
-            Rotation Keyframe count (used internally)
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.DeleteRole">
+            <summary>Can delete existing roles</summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.positionkeys">
-            <summary>
-            Position Keyframe count (used internally)
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.RoleProperties">
+            <summary>Can change Role names, titles and descriptions</summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.Priority">
-            <summary>
-            Animation Priority
-            </summary>
+        <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.BinBVHAnimationReader.Length">
-            <summary>
-            The animation length in seconds.
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.RemoveMember">
+            <summary>Can remove members from roles</summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.ExpressionName">
-            <summary>
-            Expression set in the client.  Null if [None] is selected
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.ChangeActions">
+            <summary>Can assign and remove abilities in roles</summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.InPoint">
-            <summary>
-            The time in seconds to start the animation
-            </summary>
+        <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.BinBVHAnimationReader.OutPoint">
-            <summary>
-            The time in seconds to end the animation
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.LandDeed">
+            <summary>Can buy land or deed land to group</summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.Loop">
-            <summary>
-            Loop the animation
-            </summary>
+        <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.BinBVHAnimationReader.EaseInTime">
-            <summary>
-            Meta data. Ease in Seconds.
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.LandSetSale">
+            <summary>Can set land for-sale information on group owned parcels</summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.EaseOutTime">
-            <summary>
-            Meta data. Ease out seconds.
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.LandDivideJoin">
+            <summary>Can subdivide and join parcels</summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.HandPose">
-            <summary>
-            Meta Data for the Hand Pose
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.JoinChat">
+            <summary>Can join group chat sessions</summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.JointCount">
-            <summary>
-            Number of joints defined in the animation
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.AllowVoiceChat">
+            <summary>Can use voice chat in Group Chat sessions</summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.joints">
-            <summary>
-            Contains an array of joints
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.ModerateChat">
+            <summary>Can moderate group chat sessions</summary>
         </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="F:OpenMetaverse.GroupPowers.FindPlaces">
+            <summary>Can toggle "Show in Find Places" and set search category</summary>
         </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="F:OpenMetaverse.GroupPowers.LandChangeIdentity">
+            <summary>Can change parcel name, description, and 'Publish on web' settings</summary>
         </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="F:OpenMetaverse.GroupPowers.SetLandingPoint">
+            <summary>Can set the landing point and teleport routing on group land</summary>
         </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="F:OpenMetaverse.GroupPowers.ChangeMedia">
+            <summary>Can change music and media settings</summary>
         </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 name="F:OpenMetaverse.GroupPowers.LandEdit">
+            <summary>Can toggle 'Edit Terrain' option in Land settings</summary>
         </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 name="F:OpenMetaverse.GroupPowers.LandOptions">
+            <summary>Can toggle various About Land > Options settings</summary>
         </member>
-        <member name="T:OpenMetaverse.binBVHJoint">
-            <summary> 
-            A Joint and it's associated meta data and keyframes
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.AllowEditLand">
+            <summary>Can always terraform land, even if parcel settings have it turned off</summary>
         </member>
-        <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 name="F:OpenMetaverse.GroupPowers.AllowFly">
+            <summary>Can always fly while over group owned land</summary>
         </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 name="F:OpenMetaverse.GroupPowers.AllowRez">
+            <summary>Can always rez objects on group owned land</summary>
         </member>
-        <member name="F:OpenMetaverse.binBVHJoint.Name">
-            <summary>
-            Name of the Joint.  Matches the avatar_skeleton.xml in client distros
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.AllowLandmark">
+            <summary>Can always create landmarks for group owned parcels</summary>
         </member>
-        <member name="F:OpenMetaverse.binBVHJoint.Priority">
-            <summary>
-            Joint Animation Override?   Was the same as the Priority in testing.. 
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.AllowSetHome">
+            <summary>Can set home location on any group owned parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.binBVHJoint.rotationkeys">
-            <summary>
-            Array of Rotation Keyframes in order from earliest to latest
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.LandManageAllowed">
+            <summary>Can modify public access settings for group owned parcels</summary>
         </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="F:OpenMetaverse.GroupPowers.LandManageBanned">
+            <summary>Can manager parcel ban lists on group owned land</summary>
         </member>
-        <member name="F:OpenMetaverse.binBVHJoint.Tag">
-            <summary>
-            Custom application data that can be attached to a joint
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.LandManagePasses">
+            <summary>Can manage pass list sales information</summary>
         </member>
-        <member name="T:OpenMetaverse.binBVHJointKey">
-            <summary>
-            A Joint Keyframe.  This is either a position or a rotation.
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.LandEjectAndFreeze">
+            <summary>Can eject and freeze other avatars on group owned land</summary>
         </member>
-        <member name="F:OpenMetaverse.binBVHJointKey.key_element">
-            <summary>
-            Either a Vector3 position or a Vector3 Euler rotation
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.ReturnGroupSet">
+            <summary>Can return objects set to group</summary>
         </member>
-        <member name="T:OpenMetaverse.HandPose">
-            <summary>
-            Poses set in the animation metadata for the hands.
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.ReturnNonGroup">
+            <summary>Can return non-group owned/set objects</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="F:OpenMetaverse.GroupPowers.ReturnGroupOwned">
+            <summary>Can return group owned objects</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.#ctor">
-            <summary>Initializes a new instance of an AssetScriptBinary object</summary>
+        <member name="F:OpenMetaverse.GroupPowers.LandGardening">
+            <summary>Can landscape using Linden plants</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.#ctor(OpenMetaverse.UUID,System.Byte[])">
-            <summary>Initializes a new instance of an AssetScriptBinary object with parameters</summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
+        <member name="F:OpenMetaverse.GroupPowers.DeedObject">
+            <summary>Can deed objects to group</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.Encode">
-            <summary>
-            TODO: Encodes a scripts contents into a LSO Bytecode file
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.ObjectManipulate">
+            <summary>Can move group owned objects</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.Decode">
-            <summary>
-            TODO: Decode LSO Bytecode into a string
-            </summary>
-            <returns>true</returns>
+        <member name="F:OpenMetaverse.GroupPowers.ObjectSetForSale">
+            <summary>Can set group owned objects for-sale</summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetScriptBinary.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="F:OpenMetaverse.GroupPowers.Accountable">
+            <summary>Pay group liabilities and receive group dividends</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetPrim">
-            <summary>
-            A linkset asset, containing a parent primitive and zero or more children
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.HostEvent">
+            <summary>List and Host group events</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetPrim.#ctor">
-            <summary>Initializes a new instance of an AssetPrim object</summary>
+        <member name="F:OpenMetaverse.GroupPowers.SendNotices">
+            <summary>Can send group notices</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="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="M:OpenMetaverse.Assets.AssetPrim.Encode">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.GroupPowers.VoteOnProposal">
+            <summary>Can vote on group proposals</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetPrim.Decode">
+        <member name="T:OpenMetaverse.GroupManager">
             <summary>
-            
+            Handles all network traffic related to reading and writing group
+            information
             </summary>
-            <returns></returns>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetPrim.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="F:OpenMetaverse.GroupManager.m_CurrentGroups">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetPrim.ProfileShape">
-            <summary>
-            Only used internally for XML serialization/deserialization
-            </summary>
+        <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.Assets.PrimObject">
-            <summary>
-            The deserialized form of a single primitive in a linkset asset
-            </summary>
+        <member name="F:OpenMetaverse.GroupManager.m_CurrentGroupsLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.FieldType">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupNames">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.U8">
-            <summary></summary>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupNamesReply(OpenMetaverse.GroupNamesEventArgs)">
+            <summary>Raises the GroupNamesReply event</summary>
+            <param name="e">A GroupNamesEventArgs object containing the
+            data response from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.FieldType.U16">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupNamesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.U32">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupProfile">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.U64">
-            <summary></summary>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupProfile(OpenMetaverse.GroupProfileEventArgs)">
+            <summary>Raises the GroupProfile event</summary>
+            <param name="e">An GroupProfileEventArgs object containing the
+            data returned from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.FieldType.S8">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupProfileLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.S16">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupMembers">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.S32">
-            <summary></summary>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupMembersReply(OpenMetaverse.GroupMembersReplyEventArgs)">
+            <summary>Raises the GroupMembers event</summary>
+            <param name="e">A GroupMembersEventArgs object containing the
+            data returned from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.FieldType.F32">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupMembersLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.F64">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupRoles">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.UUID">
-            <summary></summary>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupRoleDataReply(OpenMetaverse.GroupRolesDataReplyEventArgs)">
+            <summary>Raises the GroupRolesDataReply event</summary>
+            <param name="e">A GroupRolesDataReplyEventArgs object containing the
+            data returned from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.FieldType.BOOL">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupRolesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Vector3">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupRoleMembers">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Vector3d">
-            <summary></summary>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupRoleMembers(OpenMetaverse.GroupRolesMembersReplyEventArgs)">
+            <summary>Raises the GroupRoleMembersReply event</summary>
+            <param name="e">A GroupRolesRoleMembersReplyEventArgs object containing the
+            data returned from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Vector4">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupRolesMembersLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Quaternion">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupTitles">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.IPADDR">
-            <summary></summary>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupTitles(OpenMetaverse.GroupTitlesReplyEventArgs)">
+            <summary>Raises the GroupTitlesReply event</summary>
+            <param name="e">A GroupTitlesReplyEventArgs object containing the
+            data returned from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.FieldType.IPPORT">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupTitlesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Variable">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupAccountSummary">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Fixed">
-            <summary></summary>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupAccountSummaryReply(OpenMetaverse.GroupAccountSummaryReplyEventArgs)">
+            <summary>Raises the GroupAccountSummary event</summary>
+            <param name="e">A GroupAccountSummaryReplyEventArgs object containing the
+            data returned from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Single">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupAccountSummaryLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Multiple">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupCreated">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.MapField">
-            <summary>
-            
-            </summary>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupCreatedReply(OpenMetaverse.GroupCreatedReplyEventArgs)">
+            <summary>Raises the GroupCreated event</summary>
+            <param name="e">An GroupCreatedEventArgs object containing the
+            data returned from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.MapField.KeywordPosition">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupCreatedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.MapField.Name">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupJoined">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.MapField.Type">
-            <summary></summary>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupJoinedReply(OpenMetaverse.GroupOperationEventArgs)">
+            <summary>Raises the GroupJoined event</summary>
+            <param name="e">A GroupOperationEventArgs object containing the
+            result of the operation returned from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.MapField.Count">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupJoinedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.MapField.CompareTo(System.Object)">
-            <summary>
-            
-            </summary>
-            <param name="obj"></param>
-            <returns></returns>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupLeft">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.MapBlock">
-            <summary>
-            
-            </summary>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupLeaveReply(OpenMetaverse.GroupOperationEventArgs)">
+            <summary>Raises the GroupLeft event</summary>
+            <param name="e">A GroupOperationEventArgs object containing the
+            result of the operation returned from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.MapBlock.KeywordPosition">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupLeftLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.MapBlock.Name">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupDropped">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.MapBlock.Count">
-            <summary></summary>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupDropped(OpenMetaverse.GroupDroppedEventArgs)">
+            <summary>Raises the GroupDropped event</summary>
+            <param name="e">An GroupDroppedEventArgs object containing the
+            the group your agent left</param>
         </member>
-        <member name="F:OpenMetaverse.MapBlock.Fields">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupDroppedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.MapBlock.CompareTo(System.Object)">
-            <summary>
-            
-            </summary>
-            <param name="obj"></param>
-            <returns></returns>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupMemberEjected">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.MapPacket">
-            <summary>
-            
-            </summary>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupMemberEjected(OpenMetaverse.GroupOperationEventArgs)">
+            <summary>Raises the GroupMemberEjected event</summary>
+            <param name="e">An GroupMemberEjectedEventArgs object containing the
+            data returned from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.ID">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupMemberEjectedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.Name">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupNoticesListReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.Frequency">
-            <summary></summary>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupNoticesListReply(OpenMetaverse.GroupNoticesListReplyEventArgs)">
+            <summary>Raises the GroupNoticesListReply event</summary>
+            <param name="e">An GroupNoticesListReplyEventArgs object containing the
+            data returned from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.Trusted">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupNoticesListReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.Encoded">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupInvitation">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.Blocks">
-            <summary></summary>
+        <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.ProtocolManager">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.GroupManager.m_GroupInvitationLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ProtocolManager.TypeSizes">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.Client">
+            <summary>A reference to the current <seealso cref="T:OpenMetaverse.GridClient"/> instance</summary>
         </member>
-        <member name="F:OpenMetaverse.ProtocolManager.KeywordPositions">
-            <summary></summary>
+        <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.ProtocolManager.LowMaps">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.GroupRolesMembersRequests">
+            <summary>Currently-active group role-member requests</summary>
         </member>
-        <member name="F:OpenMetaverse.ProtocolManager.MediumMaps">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.TempGroupMembers">
+            <summary>Dictionary keeping group members while request is in progress</summary>
         </member>
-        <member name="F:OpenMetaverse.ProtocolManager.HighMaps">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GroupManager.TempGroupRolesMembers">
+            <summary>Dictionary keeping mebmer/role mapping while request is in progress</summary>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.#ctor(System.String,OpenMetaverse.GridClient)">
-            <summary>
-            
-            </summary>
-            <param name="mapFile"></param>
-            <param name="client"></param>
+        <member name="F:OpenMetaverse.GroupManager.TempGroupRoles">
+            <summary>Dictionary keeping GroupRole information while request is in progress</summary>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.Command(System.String)">
-            <summary>
-            
-            </summary>
-            <param name="command"></param>
-            <returns></returns>
+        <member name="F:OpenMetaverse.GroupManager.GroupName2KeyCache">
+            <summary>Caches group name lookups</summary>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.Command(System.Byte[])">
+        <member name="M:OpenMetaverse.GroupManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            
+            Construct a new instance of the GroupManager class
             </summary>
-            <param name="data"></param>
-            <returns></returns>
+            <param name="client">A reference to the current <seealso cref="T:OpenMetaverse.GridClient"/> instance</param>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.Command(System.UInt16,OpenMetaverse.PacketFrequency)">
+        <member name="M:OpenMetaverse.GroupManager.RequestCurrentGroups">
             <summary>
-            
+            Request a current list of groups the avatar is a member of.
             </summary>
-            <param name="command"></param>
-            <param name="frequency"></param>
-            <returns></returns>
+            <remarks>CAPS Event Queue must be running for this to work since the results
+            come across CAPS.</remarks>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.PrintMap">
+        <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="M:OpenMetaverse.ProtocolManager.PrintOneMap(OpenMetaverse.MapPacket[],System.String)">
+        <member name="M:OpenMetaverse.GroupManager.RequestGroupNames(System.Collections.Generic.List{OpenMetaverse.UUID})">
             <summary>
-            
+            Request lookup of multiple group names
             </summary>
-            <param name="map"></param>
-            <param name="frequency"></param>
+            <param name="groupIDs">List of group IDs to request.</param>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.DecodeMapFile(System.String,System.String)">
-            <summary>
-            
-            </summary>
-            <param name="mapFile"></param>
-            <param name="outputFile"></param>
+        <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.ProtocolManager.LoadMapFile(System.String)">
-            <summary>
-            
-            </summary>
-            <param name="mapFile"></param>
+        <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.PermissionMask">
-            <summary>
-            
-            </summary>
+        <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.PermissionWho">
-            <summary>
-            
-            </summary>
+        <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="F:OpenMetaverse.PermissionWho.Base">
-            <summary></summary>
+        <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="F:OpenMetaverse.PermissionWho.Owner">
-            <summary></summary>
+        <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="F:OpenMetaverse.PermissionWho.Group">
-            <summary></summary>
+        <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="F:OpenMetaverse.PermissionWho.Everyone">
-            <summary></summary>
+        <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="F:OpenMetaverse.PermissionWho.NextOwner">
-            <summary></summary>
+        <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="F:OpenMetaverse.PermissionWho.All">
-            <summary></summary>
+        <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.Permissions">
+        <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.Logger">
+        <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)">
             <summary>
-            Singleton logging class for the entire library
+            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="F:OpenMetaverse.Logger.LogInstance">
-            <summary>log4net logging engine</summary>
+        <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.Logger.#cctor">
-            <summary>
-            Default constructor
-            </summary>
+        <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.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel)">
-            <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 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.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="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.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="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.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="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.Logger.DebugLog(System.Object)">
-            <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 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.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="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="E:OpenMetaverse.Logger.OnLogMessage">
-            <summary>Triggered whenever a message is logged. If this is left
-            null, log messages will go to the console</summary>
+        <member name="M:OpenMetaverse.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.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="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.Assets.AssetCallingCard">
-            <summary>
-            Represents a Callingcard with AvatarID and Position vector
-            </summary>
+        <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="F:OpenMetaverse.Assets.AssetCallingCard.AvatarID">
-            <summary>UUID of the Callingcard target avatar</summary>
+        <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.Assets.AssetCallingCard.#ctor">
-            <summary>Construct an Asset of type Callingcard</summary>
+        <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.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 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.Assets.AssetCallingCard.#ctor(OpenMetaverse.UUID)">
-            <summary>
-            Constuct an asset of type Callingcard
-            </summary>
-            <param name="avatarID">UUID of the target avatar</param>
+        <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.Assets.AssetCallingCard.Encode">
-            <summary>
-            Encode the raw contents of a string with the specific Callingcard format
-            </summary>
+        <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.Assets.AssetCallingCard.Decode">
-            <summary>
-            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 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="P:OpenMetaverse.Assets.AssetCallingCard.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <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.RegionFlags">
-            <summary>
-            Simulator (region) properties
-            </summary>
+        <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="F:OpenMetaverse.RegionFlags.None">
-            <summary>No flags set</summary>
+        <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="F:OpenMetaverse.RegionFlags.AllowDamage">
-            <summary>Agents can take damage and be killed</summary>
+        <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="F:OpenMetaverse.RegionFlags.AllowLandmark">
-            <summary>Landmarks can be created here</summary>
+        <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="F:OpenMetaverse.RegionFlags.AllowSetHome">
-            <summary>Home position can be set in this sim</summary>
+        <member name="E:OpenMetaverse.GroupManager.CurrentGroups">
+            <summary>Raised when the simulator sends us data containing
+            our current group membership</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.ResetHomeOnTeleport">
-            <summary>Home position is reset when an agent teleports away</summary>
+        <member name="E:OpenMetaverse.GroupManager.GroupNamesReply">
+            <summary>Raised when the simulator responds to a RequestGroupName 
+            or RequestGroupNames request</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.SunFixed">
-            <summary>Sun does not move</summary>
+        <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="F:OpenMetaverse.RegionFlags.TaxFree">
-            <summary>No object, land, etc. taxes</summary>
+        <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="F:OpenMetaverse.RegionFlags.BlockTerraform">
-            <summary>Disable heightmap alterations (agents can still plant
-            foliage)</summary>
+        <member name="E:OpenMetaverse.GroupManager.GroupRoleDataReply">
+            <summary>Raised when the simulator responds to a <see cref="!:RequestGroupRoleData"/> request</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.BlockLandResell">
-            <summary>Land cannot be released, sold, or purchased</summary>
+        <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="F:OpenMetaverse.RegionFlags.Sandbox">
-            <summary>All content is wiped nightly</summary>
+        <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="F:OpenMetaverse.RegionFlags.NullLayer">
-            <summary>Unknown: Related to the availability of an overview world map tile.(Think mainland images when zoomed out.)</summary>
+        <member name="E:OpenMetaverse.GroupManager.GroupAccountSummaryReply">
+            <summary>Raised when a response to a RequestGroupAccountSummary is returned
+            by the simulator</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 name="E:OpenMetaverse.GroupManager.GroupCreatedReply">
+            <summary>Raised when a request to create a group is successful</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.SkipUpdateInterestList">
-            <summary>Region does not update agent prim interest lists. Internal debugging option.</summary>
+        <member name="E:OpenMetaverse.GroupManager.GroupJoinedReply">
+            <summary>Raised when a request to join a group either
+            fails or succeeds</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.SkipCollisions">
-            <summary>No collision detection for non-agent objects</summary>
+        <member name="E:OpenMetaverse.GroupManager.GroupLeaveReply">
+            <summary>Raised when a request to leave a group either
+            fails or succeeds</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.SkipScripts">
-            <summary>No scripts are ran</summary>
+        <member name="E:OpenMetaverse.GroupManager.GroupDropped">
+            <summary>Raised when A group is removed from the group server</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.SkipPhysics">
-            <summary>All physics processing is turned off</summary>
+        <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="F:OpenMetaverse.RegionFlags.ExternallyVisible">
-            <summary>Region can be seen from other regions on world map. (Legacy world map option?) </summary>
+        <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="F:OpenMetaverse.RegionFlags.MainlandVisible">
-            <summary>Region can be seen from mainland on world map. (Legacy world map option?) </summary>
+        <member name="E:OpenMetaverse.GroupManager.GroupInvitation">
+            <summary>Raised when another agent invites our avatar to join a group</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.PublicAllowed">
-            <summary>Agents not explicitly on the access list can visit the region. </summary>
+        <member name="T:OpenMetaverse.CurrentGroupsEventArgs">
+            <summary>Contains the current groups your agent is a member of</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.BlockDwell">
-            <summary>Traffic calculations are not run across entire region, overrides parcel settings. </summary>
+        <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="F:OpenMetaverse.RegionFlags.NoFly">
-            <summary>Flight is disabled (not currently enforced by the sim)</summary>
+        <member name="P:OpenMetaverse.CurrentGroupsEventArgs.Groups">
+            <summary>Get the current groups your agent is a member of</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.AllowDirectTeleport">
-            <summary>Allow direct (p2p) teleporting</summary>
+        <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="F:OpenMetaverse.RegionFlags.EstateSkipScripts">
-            <summary>Estate owner has temporarily disabled scripting</summary>
+        <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="F:OpenMetaverse.RegionFlags.RestrictPushObject">
-            <summary>Restricts the usage of the LSL llPushObject function, applies to whole region.</summary>
+        <member name="P:OpenMetaverse.GroupNamesEventArgs.GroupNames">
+            <summary>Get the Group Names dictionary</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.DenyAnonymous">
-            <summary>Deny agents with no payment info on file</summary>
+        <member name="T:OpenMetaverse.GroupMembersReplyEventArgs">
+            <summary>Represents the members of a group</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.DenyIdentified">
-            <summary>Deny agents with payment info on file</summary>
+        <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="F:OpenMetaverse.RegionFlags.DenyTransacted">
-            <summary>Deny agents who have made a monetary transaction</summary>
+        <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="F:OpenMetaverse.RegionFlags.AllowParcelChanges">
-            <summary>Parcels within the region may be joined or divided by anyone, not just estate owners/managers. </summary>
+        <member name="P:OpenMetaverse.GroupMembersReplyEventArgs.GroupID">
+            <summary>Get the ID of the group</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 name="P:OpenMetaverse.GroupMembersReplyEventArgs.Members">
+            <summary>Get the dictionary of members</summary>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.AllowVoice">
-            <summary>Region is Voice Enabled</summary>
+        <member name="T:OpenMetaverse.GroupRolesDataReplyEventArgs">
+            <summary>Represents the roles associated with a group</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 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="F:OpenMetaverse.RegionFlags.DenyAgeUnverified">
-            <summary>Deny agents who have not been age verified from entering the region.</summary>
+        <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.RegionProtocols">
-            <summary>
-            Region protocol flags
-            </summary>
+        <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.SimAccess">
-            <summary>
-            Access level for a simulator
-            </summary>
+        <member name="T:OpenMetaverse.GroupRolesMembersReplyEventArgs">
+            <summary>Represents the Role to Member mappings for a group</summary>
         </member>
-        <member name="F:OpenMetaverse.SimAccess.Unknown">
-            <summary>Unknown or invalid access level</summary>
+        <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="F:OpenMetaverse.SimAccess.Trial">
-            <summary>Trial accounts allowed</summary>
+        <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="F:OpenMetaverse.SimAccess.PG">
-            <summary>PG rating</summary>
+        <member name="P:OpenMetaverse.GroupRolesMembersReplyEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="F:OpenMetaverse.SimAccess.Mature">
-            <summary>Mature rating</summary>
+        <member name="P:OpenMetaverse.GroupRolesMembersReplyEventArgs.RolesMembers">
+            <summary>Get the member to roles map</summary>
         </member>
-        <member name="F:OpenMetaverse.SimAccess.Adult">
-            <summary>Adult rating</summary>
+        <member name="T:OpenMetaverse.GroupTitlesReplyEventArgs">
+            <summary>Represents the titles for a group</summary>
         </member>
-        <member name="F:OpenMetaverse.SimAccess.Down">
-            <summary>Simulator is offline</summary>
+        <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="F:OpenMetaverse.SimAccess.NonExistent">
-            <summary>Simulator does not exist</summary>
+        <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.Simulator">
-            <summary>
-            
-            </summary>
+        <member name="P:OpenMetaverse.GroupTitlesReplyEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.Client">
-            <summary>A public reference to the client that this Simulator object
-            is attached to</summary>
+        <member name="P:OpenMetaverse.GroupTitlesReplyEventArgs.Titles">
+            <summary>Get the titles</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.ID">
-            <summary>A Unique Cache identifier for this simulator</summary>
+        <member name="T:OpenMetaverse.GroupAccountSummaryReplyEventArgs">
+            <summary>Represents the summary data for a group</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.Caps">
-            <summary>The capabilities for this simulator</summary>
+        <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="F:OpenMetaverse.Simulator.Handle">
-            <summary></summary>
+        <member name="P:OpenMetaverse.GroupAccountSummaryReplyEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimVersion">
-            <summary>The current version of software this simulator is running</summary>
+        <member name="P:OpenMetaverse.GroupAccountSummaryReplyEventArgs.Summary">
+            <summary>Get the summary data</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.Name">
-            <summary></summary>
+        <member name="T:OpenMetaverse.GroupCreatedReplyEventArgs">
+            <summary>A response to a group create request</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="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="F:OpenMetaverse.Simulator.ParcelOverlaysReceived">
-            <summary></summary>
+        <member name="P:OpenMetaverse.GroupCreatedReplyEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange00">
-            <summary></summary>
+        <member name="P:OpenMetaverse.GroupCreatedReplyEventArgs.Success">
+            <summary>true of the  group was created successfully</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange01">
-            <summary></summary>
+        <member name="P:OpenMetaverse.GroupCreatedReplyEventArgs.Message">
+            <summary>A string containing the message</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange10">
-            <summary></summary>
+        <member name="T:OpenMetaverse.GroupOperationEventArgs">
+            <summary>Represents a response to a request</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange11">
-            <summary></summary>
+        <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="F:OpenMetaverse.Simulator.TerrainStartHeight00">
-            <summary></summary>
+        <member name="P:OpenMetaverse.GroupOperationEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight01">
-            <summary></summary>
+        <member name="P:OpenMetaverse.GroupOperationEventArgs.Success">
+            <summary>true of the request was successful</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight10">
-            <summary></summary>
+        <member name="T:OpenMetaverse.GroupDroppedEventArgs">
+            <summary>Represents your agent leaving a group</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight11">
-            <summary></summary>
+        <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="F:OpenMetaverse.Simulator.WaterHeight">
-            <summary></summary>
+        <member name="P:OpenMetaverse.GroupDroppedEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimOwner">
-            <summary></summary>
+        <member name="T:OpenMetaverse.GroupNoticesListReplyEventArgs">
+            <summary>Represents a list of active group notices</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainBase0">
-            <summary></summary>
+        <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="F:OpenMetaverse.Simulator.TerrainBase1">
-            <summary></summary>
+        <member name="P:OpenMetaverse.GroupNoticesListReplyEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainBase2">
-            <summary></summary>
+        <member name="P:OpenMetaverse.GroupNoticesListReplyEventArgs.Notices">
+            <summary>Get the notices list</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainBase3">
-            <summary></summary>
+        <member name="T:OpenMetaverse.GroupProfileEventArgs">
+            <summary>Represents the profile of a group</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainDetail0">
-            <summary></summary>
+        <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="F:OpenMetaverse.Simulator.TerrainDetail1">
-            <summary></summary>
+        <member name="P:OpenMetaverse.GroupProfileEventArgs.Group">
+            <summary>Get the group profile</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainDetail2">
-            <summary></summary>
+        <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="F:OpenMetaverse.Simulator.TerrainDetail3">
-            <summary></summary>
+        <member name="P:OpenMetaverse.GroupInvitationEventArgs.AgentID">
+            <summary>The ID of the Avatar sending the group invitation</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.IsEstateManager">
-            <summary>true if your agent has Estate Manager rights on this region</summary>
+        <member name="P:OpenMetaverse.GroupInvitationEventArgs.FromName">
+            <summary>The name of the Avatar sending the group invitation</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.Flags">
-            <summary></summary>
+        <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="F:OpenMetaverse.Simulator.Access">
-            <summary></summary>
+        <member name="P:OpenMetaverse.GroupInvitationEventArgs.Simulator">
+            <summary>The Simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.BillableFactor">
-            <summary></summary>
+        <member name="P:OpenMetaverse.GroupInvitationEventArgs.Accept">
+            <summary>Set to true to accept invitation, false to decline</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 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="F:OpenMetaverse.Simulator.RegionID">
-            <summary>The regions Unique ID</summary>
+        <member name="F:OpenMetaverse.Imaging.Baker.bakedTexture">
+            <summary>Final baked texture</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 name="F:OpenMetaverse.Imaging.Baker.textures">
+            <summary>Component layers</summary>
         </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 name="F:OpenMetaverse.Imaging.Baker.bakeWidth">
+            <summary>Width of the final baked image and scratchpad</summary>
         </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 name="F:OpenMetaverse.Imaging.Baker.bakeHeight">
+            <summary>Height of the final baked image and scratchpad</summary>
         </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 name="F:OpenMetaverse.Imaging.Baker.bakeType">
+            <summary>Bake type</summary>
         </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 name="M:OpenMetaverse.Imaging.Baker.#ctor(OpenMetaverse.BakeType)">
+            <summary>
+            Default constructor
+            </summary>
+            <param name="bakeType">Bake type</param>
         </member>
-        <member name="F:OpenMetaverse.Simulator.Protocols">
+        <member name="M:OpenMetaverse.Imaging.Baker.AddTexture(OpenMetaverse.AppearanceManager.TextureData)">
             <summary>
-            Flags indicating which protocols this region supports
+            Adds layer for baking
             </summary>
+            <param name="tdata">TexturaData struct that contains texture and its params</param>
         </member>
-        <member name="F:OpenMetaverse.Simulator.Sequence">
-            <summary>The current sequence number for packets sent to this
-            simulator. Must be Interlocked before modifying. Only
-            useful for applications manipulating sequence numbers</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.ObjectsAvatars">
+        <member name="M:OpenMetaverse.Imaging.Baker.BakeTypeFor(OpenMetaverse.AvatarTextureIndex)">
             <summary>
-            A thread-safe dictionary containing avatars in a simulator        
+            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="F:OpenMetaverse.Simulator.ObjectsPrimitives">
+        <member name="M:OpenMetaverse.Imaging.Baker.SanitizeLayers(OpenMetaverse.Imaging.ManagedImage,OpenMetaverse.Imaging.ManagedImage)">
             <summary>
-            A thread-safe dictionary containing primitives in a simulator
+            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="M:OpenMetaverse.Simulator.IsParcelMapFull">
+        <member name="M:OpenMetaverse.Imaging.Baker.InitBakedLayerColor(OpenMetaverse.Color4)">
             <summary>
-            Checks simulator parcel map to make sure it has downloaded all data successfully
+            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>
-            <returns>true if map is full (contains no 0's)</returns>
+            <param name="color">Color of the base of this layer</param>
         </member>
-        <member name="F:OpenMetaverse.Simulator.AgentMovementComplete">
+        <member name="M:OpenMetaverse.Imaging.Baker.InitBakedLayerColor(System.Single,System.Single,System.Single)">
             <summary>
-            Is it safe to send agent updates to this sim
-            AgentMovementComplete message received
+            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="F:OpenMetaverse.Simulator.DisconnectCandidate">
-            <summary>Used internally to track sim disconnections</summary>
+        <member name="P:OpenMetaverse.Imaging.Baker.BakedTexture">
+            <summary>Final baked texture</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.ConnectedEvent">
-            <summary>Event that is triggered when the simulator successfully
-            establishes a connection</summary>
+        <member name="P:OpenMetaverse.Imaging.Baker.Textures">
+            <summary>Component layers</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 name="P:OpenMetaverse.Imaging.Baker.BakeWidth">
+            <summary>Width of the final baked image and scratchpad</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.avatarPositions">
-            <summary>Coarse locations of avatars in this simulator</summary>
+        <member name="P:OpenMetaverse.Imaging.Baker.BakeHeight">
+            <summary>Height of the final baked image and scratchpad</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.preyID">
-            <summary>AvatarPositions key representing TrackAgent target</summary>
+        <member name="P:OpenMetaverse.Imaging.Baker.BakeType">
+            <summary>Bake type</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.PacketArchive">
-            <summary>Sequence numbers of packets we've received
-            (for duplicate checking)</summary>
+        <member name="P:OpenMetaverse.Imaging.Baker.IsSkin">
+            <summary>Is this one of the 3 skin bakes</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.NeedAck">
-            <summary>Packets we sent out that need ACKs from the simulator</summary>
+        <member name="T:OpenMetaverse.Assets.AssetSound">
+            <summary>
+            Represents a Sound Asset
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.pauseSerial">
-            <summary>Sequence number for pause/resume</summary>
+        <member name="M:OpenMetaverse.Assets.AssetSound.#ctor">
+            <summary>Initializes a new instance of an AssetSound object</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.handshakeComplete">
-            <summary>Indicates if UDP connection to the sim is fully established</summary>
+        <member name="M:OpenMetaverse.Assets.AssetSound.#ctor(OpenMetaverse.UUID,System.Byte[])">
+            <summary>Initializes a new instance of an AssetSound object with parameters</summary>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="M:OpenMetaverse.Simulator.#ctor(OpenMetaverse.GridClient,System.Net.IPEndPoint,System.UInt64)">
+        <member name="M:OpenMetaverse.Assets.AssetSound.Encode">
             <summary>
-            
+            TODO: Encodes a sound file
             </summary>
-            <param name="client">Reference to the GridClient object</param>
-            <param name="address">IPEndPoint of the simulator</param>
-            <param name="handle">handle of the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Dispose">
+        <member name="M:OpenMetaverse.Assets.AssetSound.Decode">
             <summary>
-            Called when this Simulator object is being destroyed
+            TODO: Decode a sound file
             </summary>
+            <returns>true</returns>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Connect(System.Boolean)">
-            <summary>
-            Attempt to connect to this simulator
-            </summary>
-            <param name="moveToSim">Whether to move our agent in to this sim or not</param>
-            <returns>True if the connection succeeded or connection status is
-            unknown, false if there was a failure</returns>
+        <member name="P:OpenMetaverse.Assets.AssetSound.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.UseCircuitCode(System.Boolean)">
+        <member name="T:OpenMetaverse.Assets.AssetBodypart">
             <summary>
-            Initiates connection to the simulator
+            Represents an <seealso cref="T:OpenMetaverse.Assets.AssetWearable"/> that represents an avatars body ie: Hair, Etc.
             </summary>
-            <param name="waitForAck">Should we block until ack for this packet is recieved</param>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Disconnect(System.Boolean)">
-            <summary>
-            Disconnect from this simulator
-            </summary>
+        <member name="M:OpenMetaverse.Assets.AssetBodypart.#ctor">
+            <summary>Initializes a new instance of an AssetBodyPart object</summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Pause">
-            <summary>
-            Instructs the simulator to stop sending update (and possibly other) packets
-            </summary>
+        <member name="M:OpenMetaverse.Assets.AssetBodypart.#ctor(OpenMetaverse.UUID,System.Byte[])">
+            <summary>Initializes a new instance of an AssetBodyPart object with parameters</summary>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Resume">
-            <summary>
-            Instructs the simulator to resume sending update packets (unpause)
-            </summary>
+        <member name="P:OpenMetaverse.Assets.AssetBodypart.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.TerrainHeightAtPoint(System.Int32,System.Int32,System.Single@)">
+        <member name="T:OpenMetaverse.ProfileFlags">
             <summary>
-            Retrieve the terrain height at a given coordinate
+            Avatar profile flags
             </summary>
-            <param name="x">Sim X coordinate, valid range is from 0 to 255</param>
-            <param name="y">Sim Y coordinate, valid range is from 0 to 255</param>
-            <param name="height">The terrain height at the given point if the
-            lookup was successful, otherwise 0.0f</param>
-            <returns>True if the lookup was successful, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.Simulator.SendPacket(OpenMetaverse.Packets.Packet)">
+        <member name="T:OpenMetaverse.Avatar">
             <summary>
-            Sends a packet
+            Represents an avatar (other than your own)
             </summary>
-            <param name="packet">Packet to be sent</param>
         </member>
-        <member name="M:OpenMetaverse.Simulator.SendPing">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.Avatar.Groups">
+            <summary>Groups that this avatar is a member of</summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.ToString">
-            <summary>
-            Returns Simulator Name as a String
-            </summary>
-            <returns></returns>
+        <member name="F:OpenMetaverse.Avatar.ProfileStatistics">
+            <summary>Positive and negative ratings</summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.GetHashCode">
-            <summary>
-            
-            </summary>
-            <returns></returns>
+        <member name="F:OpenMetaverse.Avatar.ProfileProperties">
+            <summary>Avatar properties including about text, profile URL, image IDs and 
+            publishing settings</summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Equals(System.Object)">
+        <member name="F:OpenMetaverse.Avatar.ProfileInterests">
+            <summary>Avatar interests including spoken languages, skills, and "want to"
+            choices</summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.ControlFlags">
+            <summary>Movement control flags for avatars. Typically not set or used by
+            clients. To move your avatar, use Client.Self.Movement instead</summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.VisualParameters">
             <summary>
-            
+            Contains the visual parameters describing the deformation of the avatar
             </summary>
-            <param name="obj"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Simulator.SendAcks">
+        <member name="F:OpenMetaverse.Avatar.AppearanceVersion">
             <summary>
-            Sends out pending acknowledgements
+            Appearance version. Value greater than 0 indicates using server side baking
             </summary>
-            <returns>Number of ACKs sent</returns>
         </member>
-        <member name="M:OpenMetaverse.Simulator.ResendUnacked">
+        <member name="F:OpenMetaverse.Avatar.COFVersion">
             <summary>
-            Resend unacknowledged packets
+            Version of the Current Outfit Folder that the appearance is based on
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Simulator.Parcels">
+        <member name="F:OpenMetaverse.Avatar.AppearanceFlags">
             <summary>
-            Provides access to an internal thread-safe dictionary containing parcel
-            information found in this simulator
+            Appearance flags. Introduced with server side baking, currently unused.
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Simulator.ParcelMap">
+        <member name="F:OpenMetaverse.Avatar.Animations">
             <summary>
-            Provides access to an internal thread-safe multidimensional array containing a x,y grid mapped
-            to each 64x64 parcel's LocalID.
+            List of current avatar animations
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Simulator.IPEndPoint">
-            <summary>The IP address and port of the server</summary>
-        </member>
-        <member name="P:OpenMetaverse.Simulator.Connected">
-            <summary>Whether there is a working connection to the simulator or 
-            not</summary>
-        </member>
-        <member name="P:OpenMetaverse.Simulator.AvatarPositions">
-            <summary>Coarse locations of avatars in this simulator</summary>
-        </member>
-        <member name="P:OpenMetaverse.Simulator.PreyID">
-            <summary>AvatarPositions key representing TrackAgent target</summary>
-        </member>
-        <member name="P:OpenMetaverse.Simulator.HandshakeComplete">
-            <summary>Indicates if UDP connection to the sim is fully established</summary>
-        </member>
-        <member name="T:OpenMetaverse.Simulator.SimStats">
+        <member name="M:OpenMetaverse.Avatar.#ctor">
             <summary>
-            Simulator Statistics
+            Default constructor
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.SentPackets">
-            <summary>Total number of packets sent by this simulator to this agent</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.RecvPackets">
-            <summary>Total number of packets received by this simulator to this agent</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.SentBytes">
-            <summary>Total number of bytes sent by this simulator to this agent</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.RecvBytes">
-            <summary>Total number of bytes received by this simulator to this agent</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ConnectTime">
-            <summary>Time in seconds agent has been connected to simulator</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ResentPackets">
-            <summary>Total number of packets that have been resent</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ReceivedResends">
-            <summary>Total number of resent packets recieved</summary>
+        <member name="P:OpenMetaverse.Avatar.FirstName">
+            <summary>First name</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.SentPings">
-            <summary>Total number of pings sent to this simulator by this agent</summary>
+        <member name="P:OpenMetaverse.Avatar.LastName">
+            <summary>Last name</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ReceivedPongs">
-            <summary>Total number of ping replies sent to this agent by this simulator</summary>
+        <member name="P:OpenMetaverse.Avatar.Name">
+            <summary>Full name</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.IncomingBPS">
-            <summary>
-            Incoming bytes per second
-            </summary>
-            <remarks>It would be nice to have this claculated on the fly, but
-            this is far, far easier</remarks>
+        <member name="P:OpenMetaverse.Avatar.GroupName">
+            <summary>Active group</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.OutgoingBPS">
+        <member name="T:OpenMetaverse.Avatar.Statistics">
             <summary>
-            Outgoing bytes per second
+            Positive and negative ratings
             </summary>
-            <remarks>It would be nice to have this claculated on the fly, but
-            this is far, far easier</remarks>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.LastPingSent">
-            <summary>Time last ping was sent</summary>
+        <member name="F:OpenMetaverse.Avatar.Statistics.BehaviorPositive">
+            <summary>Positive ratings for Behavior</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.LastPingID">
-            <summary>ID of last Ping sent</summary>
+        <member name="F:OpenMetaverse.Avatar.Statistics.BehaviorNegative">
+            <summary>Negative ratings for Behavior</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.LastLag">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Avatar.Statistics.AppearancePositive">
+            <summary>Positive ratings for Appearance</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.MissedPings">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Avatar.Statistics.AppearanceNegative">
+            <summary>Negative ratings for Appearance</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.Dilation">
-            <summary>Current time dilation of this simulator</summary>
+        <member name="F:OpenMetaverse.Avatar.Statistics.BuildingPositive">
+            <summary>Positive ratings for Building</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.FPS">
-            <summary>Current Frames per second of simulator</summary>
+        <member name="F:OpenMetaverse.Avatar.Statistics.BuildingNegative">
+            <summary>Negative ratings for Building</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.PhysicsFPS">
-            <summary>Current Physics frames per second of simulator</summary>
+        <member name="F:OpenMetaverse.Avatar.Statistics.GivenPositive">
+            <summary>Positive ratings given by this avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.AgentUpdates">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Avatar.Statistics.GivenNegative">
+            <summary>Negative ratings given by this avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.FrameTime">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Avatar.AvatarProperties">
+            <summary>
+            Avatar properties including about text, profile URL, image IDs and 
+            publishing settings
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.NetTime">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.FirstLifeText">
+            <summary>First Life about text</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.PhysicsTime">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.FirstLifeImage">
+            <summary>First Life image ID</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ImageTime">
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.Partner">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ScriptTime">
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.AboutText">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.AgentTime">
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.BornOn">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.OtherTime">
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.CharterMember">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.Objects">
-            <summary>Total number of objects Simulator is simulating</summary>
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.ProfileImage">
+            <summary>Profile image ID</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ScriptedObjects">
-            <summary>Total number of Active (Scripted) objects running</summary>
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.Flags">
+            <summary>Flags of the profile</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.Agents">
-            <summary>Number of agents currently in this simulator</summary>
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.ProfileURL">
+            <summary>Web URL for this profile</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ChildAgents">
-            <summary>Number of agents in neighbor simulators</summary>
+        <member name="P:OpenMetaverse.Avatar.AvatarProperties.AllowPublish">
+            <summary>Should this profile be published on the web</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ActiveScripts">
-            <summary>Number of Active scripts running in this simulator</summary>
+        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Online">
+            <summary>Avatar Online Status</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.LSLIPS">
-            <summary></summary>
+        <member name="P:OpenMetaverse.Avatar.AvatarProperties.MaturePublish">
+            <summary>Is this a mature profile</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.INPPS">
+        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Identified">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.OUTPPS">
+        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Transacted">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.PendingDownloads">
-            <summary>Number of downloads pending</summary>
+        <member name="T:OpenMetaverse.Avatar.Interests">
+            <summary>
+            Avatar interests including spoken languages, skills, and "want to"
+            choices
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.PendingUploads">
-            <summary>Number of uploads pending</summary>
+        <member name="F:OpenMetaverse.Avatar.Interests.LanguagesText">
+            <summary>Languages profile field</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.VirtualSize">
+        <member name="F:OpenMetaverse.Avatar.Interests.SkillsMask">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ResidentSize">
+        <member name="F:OpenMetaverse.Avatar.Interests.SkillsText">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.PendingLocalUploads">
-            <summary>Number of local uploads pending</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.UnackedBytes">
-            <summary>Unacknowledged bytes in queue</summary>
-        </member>
-        <member name="F:OpenMetaverse.SimulatorDataPool.Handle">
-            <summary>
-            Simulator handle
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.SimulatorDataPool.ActiveClients">
-            <summary>
-            Number of GridClients using this datapool
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.SimulatorDataPool.InactiveSince">
-            <summary>
-            Time that the last client disconnected from the simulator
-            </summary>
+        <member name="F:OpenMetaverse.Avatar.Interests.WantToMask">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.SimulatorDataPool.PrimCache">
-            <summary>
-            The cache of prims used and unused in this simulator
-            </summary>
+        <member name="F:OpenMetaverse.Avatar.Interests.WantToText">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.SimulatorDataPool.Parcels">
+        <member name="T:OpenMetaverse.AvatarTextureIndex">
             <summary>
-            Shared parcel info only when POOL_PARCEL_DATA == true
+            Index of TextureEntry slots for avatar appearances
             </summary>
         </member>
-        <member name="T:OpenMetaverse.ReportType">
+        <member name="T:OpenMetaverse.BakeType">
             <summary>
-            
+            Bake layers for avatar appearance
             </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>
-        <member name="F:OpenMetaverse.ReportType.CustomerServiceRequest">
-            <summary>Customer service report</summary>
-        </member>
-        <member name="T:OpenMetaverse.CompressedFlags">
+        <member name="T:OpenMetaverse.AppearanceFlags">
             <summary>
-            Bitflag field for ObjectUpdateCompressed data blocks, describing 
-            which options are present for each object
+            Appearance Flags, introdued with server side baking, currently unused
             </summary>
         </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 name="F:OpenMetaverse.AppearanceManager.MAX_CONCURRENT_DOWNLOADS">
+            <summary>Maximum number of concurrent downloads for wearable assets and textures</summary>
         </member>
-        <member name="F:OpenMetaverse.CompressedFlags.HasNameValues">
-            <summary>Whether the object has a name value pairs string</summary>
+        <member name="F:OpenMetaverse.AppearanceManager.MAX_CONCURRENT_UPLOADS">
+            <summary>Maximum number of concurrent uploads for baked textures</summary>
         </member>
-        <member name="F:OpenMetaverse.CompressedFlags.MediaURL">
-            <summary>Whether the object has a Media URL set</summary>
+        <member name="F:OpenMetaverse.AppearanceManager.INVENTORY_TIMEOUT">
+            <summary>Timeout for fetching inventory listings</summary>
         </member>
-        <member name="T:OpenMetaverse.UpdateType">
-            <summary>
-            Specific Flags for MultipleObjectUpdate requests
-            </summary>
+        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_TIMEOUT">
+            <summary>Timeout for fetching a single wearable, or receiving a single packet response</summary>
         </member>
-        <member name="F:OpenMetaverse.UpdateType.None">
-            <summary>None</summary>
+        <member name="F:OpenMetaverse.AppearanceManager.TEXTURE_TIMEOUT">
+            <summary>Timeout for fetching a single texture</summary>
         </member>
-        <member name="F:OpenMetaverse.UpdateType.Position">
-            <summary>Change position of prims</summary>
+        <member name="F:OpenMetaverse.AppearanceManager.UPLOAD_TIMEOUT">
+            <summary>Timeout for uploading a single baked texture</summary>
         </member>
-        <member name="F:OpenMetaverse.UpdateType.Rotation">
-            <summary>Change rotation of prims</summary>
+        <member name="F:OpenMetaverse.AppearanceManager.UPLOAD_RETRIES">
+            <summary>Number of times to retry bake upload</summary>
         </member>
-        <member name="F:OpenMetaverse.UpdateType.Scale">
-            <summary>Change size of prims</summary>
+        <member name="F:OpenMetaverse.AppearanceManager.REBAKE_DELAY">
+            <summary>When changing outfit, kick off rebake after
+            20 seconds has passed since the last change</summary>
         </member>
-        <member name="F:OpenMetaverse.UpdateType.Linked">
-            <summary>Perform operation on link set</summary>
+        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_COUNT">
+            <summary>Total number of wearables for each avatar</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 name="F:OpenMetaverse.AppearanceManager.BAKED_TEXTURE_COUNT">
+            <summary>Total number of baked textures on each avatar</summary>
         </member>
-        <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 name="F:OpenMetaverse.AppearanceManager.WEARABLES_PER_LAYER">
+            <summary>Total number of wearables per bake layer</summary>
         </member>
-        <member name="F:OpenMetaverse.PayPriceType.Hide">
-            <summary>
-            Indicates that this pay option should be hidden
-            </summary>
+        <member name="F:OpenMetaverse.AppearanceManager.ATTACHMENT_ADD">
+            <summary>Mask for multiple attachments</summary>
         </member>
-        <member name="F:OpenMetaverse.PayPriceType.Default">
-            <summary>
-            Indicates that this pay option should have the default value
-            </summary>
+        <member name="F:OpenMetaverse.AppearanceManager.BakeIndexToTextureIndex">
+            <summary>Mapping between BakeType and AvatarTextureIndex</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="F:OpenMetaverse.AppearanceManager.WEARABLE_BAKE_MAP">
+            <summary>Map of what wearables are included in each bake</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.Avatar">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AppearanceManager.BAKED_TEXTURE_HASH">
+            <summary>Magic values to finalize the cache check hashes for each
+            bake</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.CollisionPlane">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AppearanceManager.DEFAULT_AVATAR_TEXTURE">
+            <summary>Default avatar texture, used to detect when a custom
+            texture is not set for a face</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.State">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AppearanceManager.m_AgentWearablesReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.LocalID">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AppearanceManager.OnAgentWearables(OpenMetaverse.AgentWearablesReplyEventArgs)">
+            <summary>Raises the AgentWearablesReply event</summary>
+            <param name="e">An AgentWearablesReplyEventArgs object containing the
+            data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.Position">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AppearanceManager.m_AgentWearablesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.Velocity">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AppearanceManager.m_AgentCachedBakesReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.Acceleration">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AppearanceManager.OnAgentCachedBakes(OpenMetaverse.AgentCachedBakesReplyEventArgs)">
+            <summary>Raises the CachedBakesReply event</summary>
+            <param name="e">An AgentCachedBakesReplyEventArgs object containing the
+            data returned from the data server AgentCachedTextureResponse</param>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.Rotation">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AppearanceManager.m_AgentCachedBakesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.AngularVelocity">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AppearanceManager.m_AppearanceSet">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.Textures">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AppearanceManager.OnAppearanceSet(OpenMetaverse.AppearanceSetEventArgs)">
+            <summary>Raises the AppearanceSet event</summary>
+            <param name="e">An AppearanceSetEventArgs object indicating if the operatin was successfull</param>
         </member>
-        <member name="T:OpenMetaverse.ObjectManager">
-            <summary>
-            Handles all network traffic related to prims and avatar positions and 
-            movement.
-            </summary>
+        <member name="F:OpenMetaverse.AppearanceManager.m_AppearanceSetLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectUpdate">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AppearanceManager.m_RebakeAvatarReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectUpdateLock">
+        <member name="M:OpenMetaverse.AppearanceManager.OnRebakeAvatar(OpenMetaverse.RebakeAvatarTexturesEventArgs)">
+            <summary>Raises the RebakeAvatarRequested event</summary>
+            <param name="e">An RebakeAvatarTexturesEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.m_RebakeAvatarLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectProperties">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AppearanceManager.MyVisualParameters">
+            <summary>Visual parameters last sent to the sim</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnObjectProperties(OpenMetaverse.ObjectPropertiesEventArgs)">
-            <summary>Raises the ObjectProperties Event</summary>
-             <param name="e">A ObjectPropertiesEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.AppearanceManager.MyTextures">
+            <summary>Textures about this client sent to the sim</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.AppearanceManager.Wearables">
+            <summary>A cache of wearables currently being worn</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesUpdated">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AppearanceManager.Textures">
+            <summary>A cache of textures currently being worn</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnObjectPropertiesUpdated(OpenMetaverse.ObjectPropertiesUpdatedEventArgs)">
-            <summary>Raises the ObjectPropertiesUpdated Event</summary>
-             <param name="e">A ObjectPropertiesUpdatedEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.AppearanceManager.CacheCheckSerialNum">
+            <summary>Incrementing serial number for AgentCachedTexture packets</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesUpdatedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.AppearanceManager.SetAppearanceSerialNum">
+            <summary>Incrementing serial number for AgentSetAppearance packets</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesFamily">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AppearanceManager.GotWearables">
+            <summary>Indicates if WearablesRequest succeeded</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnObjectPropertiesFamily(OpenMetaverse.ObjectPropertiesFamilyEventArgs)">
-            <summary>Raises the ObjectPropertiesFamily Event</summary>
-             <param name="e">A ObjectPropertiesFamilyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.AppearanceManager.AppearanceThreadRunning">
+            <summary>Indicates whether or not the appearance thread is currently
+            running, to prevent multiple appearance threads from running
+            simultaneously</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesFamilyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.AppearanceManager.Client">
+            <summary>Reference to our agent</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_AvatarUpdate">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AppearanceManager.RebakeScheduleTimer">
+            <summary>
+            Timer used for delaying rebake on changing outfit
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnAvatarUpdate(OpenMetaverse.AvatarUpdateEventArgs)">
-            <summary>Raises the AvatarUpdate Event</summary>
-             <param name="e">A AvatarUpdateEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.AppearanceManager.AppearanceThread">
+            <summary>
+            Main appearance thread
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_AvatarUpdateLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.AppearanceManager.ServerBakingDone">
+            <summary>
+            Is server baking complete. It needs doing only once
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_TerseObjectUpdate">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Default constructor
+            </summary>
+            <param name="client">A reference to our agent</param>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_TerseObjectUpdateLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.SetPreviousAppearance">
+            <summary>
+            Obsolete method for setting appearance. This function no longer does anything.
+            Use RequestSetAppearance() to manually start the appearance thread
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectDataBlockUpdate">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <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="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 name="M:OpenMetaverse.AppearanceManager.RequestSetAppearance">
+            <summary>
+            Starts the appearance setting thread
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectDataBlockUpdateLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.ObjectManager.m_KillObject">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <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="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 name="M:OpenMetaverse.AppearanceManager.RequestAgentWearables">
+            <summary>
+            Ask the server what textures our agent is currently wearing
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_KillObjectLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.ObjectManager.m_KillObjects">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.GetWearableAsset(OpenMetaverse.WearableType)">
+            <summary>
+            Returns the AssetID of the asset that is currently being worn in a 
+            given WearableType slot
+            </summary>
+            <param name="type">WearableType slot to get the AssetID for</param>
+            <returns>The UUID of the asset being worn in the given slot, or
+            UUID.Zero if no wearable is attached to the given slot or wearables
+            have not been downloaded yet</returns>
         </member>
-        <member name="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 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="F:OpenMetaverse.ObjectManager.m_KillObjectsLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.ObjectManager.m_AvatarSitChanged">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <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="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 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="F:OpenMetaverse.ObjectManager.m_AvatarSitChangedLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.ObjectManager.m_PayPriceReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <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="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 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="F:OpenMetaverse.ObjectManager.m_PayPriceReplyLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.ObjectManager.m_PhysicsProperties">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.IsItemWorn(OpenMetaverse.InventoryItem)">
+            <summary>
+            Checks if an inventory item is currently being worn
+            </summary>
+            <param name="item">The inventory item to check against the agent
+            wearables</param>
+            <returns>The WearableType slot that the item is being worn in,
+            or WearbleType.Invalid if it is not currently being worn</returns>
         </member>
-        <member name="M:OpenMetaverse.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 name="M:OpenMetaverse.AppearanceManager.GetWearables">
+            <summary>
+            Returns a copy of the agents currently worn wearables
+            </summary>
+            <returns>A copy of the agents currently worn wearables</returns>
+            <remarks>Avoid calling this function multiple times as it will make
+            a copy of all of the wearable data each time</remarks>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_PhysicsPropertiesLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.WearOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryBase},System.Boolean)">
+            <summary>
+            Calls either <seealso cref="M:OpenMetaverse.AppearanceManager.ReplaceOutfit(System.Collections.Generic.List{OpenMetaverse.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="F:OpenMetaverse.ObjectManager.Client">
-            <summary>Reference to the GridClient object</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.AddAttachments(System.Collections.Generic.List{OpenMetaverse.InventoryItem},System.Boolean)">
+            <summary>
+            Adds a list of attachments to our agent
+            </summary>
+            <param name="attachments">A List containing the attachments to add</param>
+            <param name="removeExistingFirst">If true, tells simulator to remove existing attachment
+            first</param>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.InterpolationTimer">
-            <summary>Does periodic dead reckoning calculation to convert
-            velocity and acceleration to new positions for objects</summary>
+        <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="M:OpenMetaverse.ObjectManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.AppearanceManager.Attach(OpenMetaverse.InventoryItem,OpenMetaverse.AttachmentPoint)">
             <summary>
-            Construct a new instance of the ObjectManager class
+            Attach an item to our agent at a specific attach point
             </summary>
-            <param name="client">A reference to the <see cref="T:OpenMetaverse.GridClient"/> instance</param>
+            <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="M:OpenMetaverse.ObjectManager.RequestObject(OpenMetaverse.Simulator,System.UInt32)">
+        <member name="M:OpenMetaverse.AppearanceManager.Attach(OpenMetaverse.InventoryItem,OpenMetaverse.AttachmentPoint,System.Boolean)">
             <summary>
-            Request information for a single object from a <see cref="T:OpenMetaverse.Simulator"/> 
-            you are currently connected to
+            Attach an item to our agent at a specific attach point
             </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="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="M:OpenMetaverse.ObjectManager.RequestObjects(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32})">
+        <member name="M:OpenMetaverse.AppearanceManager.Attach(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.Permissions,System.UInt32,OpenMetaverse.AttachmentPoint)">
             <summary>
-            Request information for multiple objects contained in
-            the same simulator
+            Attach an item to our agent specifying attachment details
             </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="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="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 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="M:OpenMetaverse.ObjectManager.RequestPayPrice(OpenMetaverse.Simulator,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.AppearanceManager.Detach(OpenMetaverse.InventoryItem)">
             <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
+            Detach an item from our agent using an <seealso cref="T:OpenMetaverse.InventoryItem"/> object
             </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>
+            <param name="item">An <seealso cref="T:OpenMetaverse.InventoryItem"/> object</param>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SelectObject(OpenMetaverse.Simulator,System.UInt32)">
+        <member name="M:OpenMetaverse.AppearanceManager.Detach(OpenMetaverse.UUID)">
             <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
+            Detach an item from our agent
             </summary>
-            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> the object is located</param>        
-            <param name="localID">The Local ID of the object</param>        
-            <seealso cref="T:OpenMetaverse.ObjectPropertiesFamilyEventArgs"/>
+            <param name="itemID">The inventory itemID of the item to detach</param>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SelectObject(OpenMetaverse.Simulator,System.UInt32,System.Boolean)">
+        <member name="M:OpenMetaverse.AppearanceManager.SendAgentIsNowWearing">
             <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
+            Inform the sim which wearables are part of our current outfit
             </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)">
+        <member name="M:OpenMetaverse.AppearanceManager.ReplaceOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryWearable})">
             <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"/>
+            Replaces the Wearables collection with a list of new wearable items
+            </summary>
+            <param name="wearableItems">Wearable items to replace the Wearables collection with</param>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SelectObjects(OpenMetaverse.Simulator,System.UInt32[])">
+        <member name="M:OpenMetaverse.AppearanceManager.GetColorFromParams(System.Collections.Generic.List{OpenMetaverse.AppearanceManager.ColorParamInfo})">
             <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"/>
+            Calculates base color/tint for a specific wearable
+            based on its params
+            </summary>
+            <param name="param">All the color info gathered from wearable's VisualParams
+            passed as list of ColorParamInfo tuples</param>
+            <returns>Base color/tint for the wearable</returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetFlags(OpenMetaverse.Simulator,System.UInt32,System.Boolean,System.Boolean,System.Boolean,System.Boolean)">
+        <member name="M:OpenMetaverse.AppearanceManager.GetAgentWearables">
             <summary>
-            Update the properties of an object
+            Blocking method to populate the Wearables dictionary
             </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>
+            <returns>True on success, otherwise false</returns>
         </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)">
+        <member name="M:OpenMetaverse.AppearanceManager.GetCachedBakes">
             <summary>
-            Update the properties of an object
+            Blocking method to populate the Textures array with cached bakes
             </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>
+            <returns>True on success, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetSaleInfo(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.SaleType,System.Int32)">
+        <member name="M:OpenMetaverse.AppearanceManager.DecodeWearableParams(OpenMetaverse.AppearanceManager.WearableData)">
             <summary>
-            Sets the sale properties of a single object
+            Populates textures and visual params from a decoded asset
             </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>
+            <param name="wearable">Wearable to decode</param>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetSaleInfo(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},OpenMetaverse.SaleType,System.Int32)">
+        <member name="M:OpenMetaverse.AppearanceManager.DownloadWearables">
             <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>
+            Blocking method to download and parse currently worn wearable assets
+            </summary>
+            <returns>True on success, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.DeselectObject(OpenMetaverse.Simulator,System.UInt32)">
+        <member name="M:OpenMetaverse.AppearanceManager.GetTextureDownloadList(OpenMetaverse.BakeType)">
             <summary>
-            Deselect a single object
+            Get a list of all of the textures that need to be downloaded for a
+            single bake layer
             </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="bakeType">Bake layer to get texture AssetIDs for</param>
+            <returns>A list of texture AssetIDs to download</returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.DeselectObjects(OpenMetaverse.Simulator,System.UInt32[])">
+        <member name="M:OpenMetaverse.AppearanceManager.AddTextureDownload(OpenMetaverse.AvatarTextureIndex,System.Collections.Generic.List{OpenMetaverse.UUID})">
             <summary>
-            Deselect multiple objects.
+            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="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="index"></param>
+            <param name="textures"></param>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.ClickObject(OpenMetaverse.Simulator,System.UInt32)">
+        <member name="M:OpenMetaverse.AppearanceManager.DownloadTextures(System.Collections.Generic.List{OpenMetaverse.BakeType})">
             <summary>
-            Perform a click action on an object
+            Blocking method to download all of the textures needed for baking 
+            the given bake layers
             </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="bakeLayers">A list of layers that need baking</param>
+            <remarks>No return value is given because the baking will happen
+            whether or not all textures are successfully downloaded</remarks>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.ClickObject(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,System.Int32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
+        <member name="M:OpenMetaverse.AppearanceManager.CreateBakes">
             <summary>
-            Perform a click action (Grab) on a single object
+            Blocking method to create and upload baked textures for all of the
+            missing bakes
             </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>
+            <returns>True on success, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.AddPrim(OpenMetaverse.Simulator,OpenMetaverse.Primitive.ConstructionData,OpenMetaverse.UUID,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Quaternion)">
+        <member name="M:OpenMetaverse.AppearanceManager.CreateBake(OpenMetaverse.BakeType)">
             <summary>
-            Create (rez) a new prim object in a simulator
+            Blocking method to create and upload a baked texture for a single 
+            bake layer
             </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>
+            <param name="bakeType">Layer to bake</param>
+            <returns>True on success, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.AddPrim(OpenMetaverse.Simulator,OpenMetaverse.Primitive.ConstructionData,OpenMetaverse.UUID,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Quaternion,OpenMetaverse.PrimFlags)">
+        <member name="M:OpenMetaverse.AppearanceManager.UploadBake(System.Byte[])">
             <summary>
-            Create (rez) a new prim object in a simulator
+            Blocking method to upload a baked texture
             </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>
+            <param name="textureData">Five channel JPEG2000 texture data to upload</param>
+            <returns>UUID of the newly created asset on success, otherwise UUID.Zero</returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.AddTree(OpenMetaverse.Simulator,OpenMetaverse.Vector3,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.Tree,OpenMetaverse.UUID,System.Boolean)">
+        <member name="M:OpenMetaverse.AppearanceManager.MakeParamValues">
             <summary>
-            Rez a Linden tree
+            Creates a dictionary of visual param values from the downloaded wearables
             </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>
+            <returns>A dictionary of visual param indices mapping to visual param
+            values for our agent that can be fed to the Baker class</returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.AddGrass(OpenMetaverse.Simulator,OpenMetaverse.Vector3,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.Grass,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.AppearanceManager.UpdateAvatarAppearance">
             <summary>
-            Rez grass and ground cover
+            Initate server baking process
             </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>
+            <returns>True if the server baking was successful</returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetTextures(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Primitive.TextureEntry)">
+        <member name="M:OpenMetaverse.AppearanceManager.GetCOF">
             <summary>
-            Set the textures to apply to the faces of an object
+            Get the latest version of COF
             </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>
+            <returns>Current Outfit Folder (or null if getting the data failed)</returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetTextures(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Primitive.TextureEntry,System.String)">
+        <member name="M:OpenMetaverse.AppearanceManager.RequestAgentSetAppearance">
             <summary>
-            Set the textures to apply to the faces of an object
+            Create an AgentSetAppearance packet from Wearables data and the 
+            Textures array and send it
             </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)">
+        <member name="M:OpenMetaverse.AppearanceManager.WearableTypeToAssetType(OpenMetaverse.WearableType)">
             <summary>
-            Set the Light data on an object
+            Converts a WearableType to a bodypart or clothing WearableType
             </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>
+            <param name="type">A WearableType</param>
+            <returns>AssetType.Bodypart or AssetType.Clothing or AssetType.Unknown</returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetFlexible(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Primitive.FlexibleData)">
+        <member name="M:OpenMetaverse.AppearanceManager.BakeTypeToAgentTextureIndex(OpenMetaverse.BakeType)">
             <summary>
-            Set the flexible data on an object
+            Converts a BakeType to the corresponding baked texture slot in AvatarTextureIndex
             </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>
+            <param name="index">A BakeType</param>
+            <returns>The AvatarTextureIndex slot that holds the given BakeType</returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetSculpt(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Primitive.SculptData)">
+        <member name="M:OpenMetaverse.AppearanceManager.MorphLayerForBakeType(OpenMetaverse.BakeType)">
             <summary>
-            Set the sculptie texture and data on an object
+            Gives the layer number that is used for morph mask
             </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>
+            <param name="bakeType">>A BakeType</param>
+            <returns>Which layer number as defined in BakeTypeToTextures is used for morph mask</returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetExtraParamOff(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.ExtraParamType)">
+        <member name="M:OpenMetaverse.AppearanceManager.BakeTypeToTextures(OpenMetaverse.BakeType)">
             <summary>
-            Unset additional primitive parameters on an object
+            Converts a BakeType to a list of the texture slots that make up that bake
             </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>
+            <param name="bakeType">A BakeType</param>
+            <returns>A list of texture slots that are inputs for the given bake</returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.LinkPrims(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32})">
+        <member name="E:OpenMetaverse.AppearanceManager.AgentWearablesReply">
+            <summary>Triggered when an AgentWearablesUpdate packet is received,
+            telling us what our avatar is currently wearing
+            <see cref="M:OpenMetaverse.AppearanceManager.RequestAgentWearables"/> request.</summary>
+        </member>
+        <member name="E:OpenMetaverse.AppearanceManager.CachedBakesReply">
+            <summary>Raised when an AgentCachedTextureResponse packet is
+            received, giving a list of cached bakes that were found on the
+            simulator
+            <seealso cref="M:OpenMetaverse.AppearanceManager.RequestCachedBakes"/> request.</summary>
+        </member>
+        <member name="E:OpenMetaverse.AppearanceManager.AppearanceSet">
             <summary>
-            Link multiple prims into a linkset
+            Raised when appearance data is sent to the simulator, also indicates
+            the main appearance thread is finished.
             </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>
+            <seealso cref="M:OpenMetaverse.AppearanceManager.RequestAgentSetAppearance"/> request.
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.DelinkPrims(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32})">
+        <member name="E:OpenMetaverse.AppearanceManager.RebakeAvatarRequested">
             <summary>
-            Delink/Unlink multiple prims from a linkset
+            Triggered when the simulator requests the agent rebake its appearance.
             </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>
+            <seealso cref="!:RebakeAvatarRequest"/>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetRotation(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Quaternion)">
+        <member name="P:OpenMetaverse.AppearanceManager.ManagerBusy">
             <summary>
-            Change the rotation of an object
+            Returns true if AppearanceManager is busy and trying to set or change appearance will fail
             </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)">
+        <member name="T:OpenMetaverse.AppearanceManager.WearableData">
             <summary>
-            Set the name of an object
+            Contains information about a wearable inventory item
             </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[])">
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.ItemID">
+            <summary>Inventory ItemID of the wearable</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.AssetID">
+            <summary>AssetID of the wearable asset</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.WearableType">
+            <summary>WearableType of the wearable</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.AssetType">
+            <summary>AssetType of the wearable</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.Asset">
+            <summary>Asset data for the wearable</summary>
+        </member>
+        <member name="T:OpenMetaverse.AppearanceManager.ColorParamInfo">
             <summary>
-            Set the name of multiple objects
+            Data collected from visual params for each wearable
+            needed for the calculation of the color
             </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)">
+        <member name="T:OpenMetaverse.AppearanceManager.TextureData">
             <summary>
-            Set the description of an object
+            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>
-            <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[])">
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureID">
+            <summary>A texture AssetID</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.Texture">
+            <summary>Asset data for the texture</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.AlphaMasks">
+            <summary>Collection of alpha masks that needs applying</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.Color">
+            <summary>Tint that should be applied to the texture</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureIndex">
+            <summary>Where on avatar does this texture belong</summary>
+        </member>
+        <member name="T:OpenMetaverse.AgentWearablesReplyEventArgs">
+            <summary>Contains the Event data returned from the data server from an AgentWearablesRequest</summary>
+        </member>
+        <member name="M:OpenMetaverse.AgentWearablesReplyEventArgs.#ctor">
+            <summary>Construct a new instance of the AgentWearablesReplyEventArgs class</summary>
+        </member>
+        <member name="T:OpenMetaverse.AgentCachedBakesReplyEventArgs">
+            <summary>Contains the Event data returned from the data server from an AgentCachedTextureResponse</summary>
+        </member>
+        <member name="M:OpenMetaverse.AgentCachedBakesReplyEventArgs.#ctor">
+            <summary>Construct a new instance of the AgentCachedBakesReplyEventArgs class</summary>
+        </member>
+        <member name="T:OpenMetaverse.AppearanceSetEventArgs">
+            <summary>Contains the Event data returned from an AppearanceSetRequest</summary>
+        </member>
+        <member name="M:OpenMetaverse.AppearanceSetEventArgs.#ctor(System.Boolean)">
             <summary>
-            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>
+            Triggered when appearance data is sent to the sim and
+            the main appearance thread is done.</summary>
+            <param name="success">Indicates whether appearance setting was successful</param>
+        </member>
+        <member name="P:OpenMetaverse.AppearanceSetEventArgs.Success">
+            <summary>Indicates whether appearance setting was successful</summary>
         </member>
-        <member name="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 name="T:OpenMetaverse.RebakeAvatarTexturesEventArgs">
+            <summary>Contains the Event data returned from the data server from an RebakeAvatarTextures</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.DropObject(OpenMetaverse.Simulator,System.UInt32)">
+        <member name="M:OpenMetaverse.RebakeAvatarTexturesEventArgs.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Drop an attached object from this avatar
+            Triggered when the simulator sends a request for this agent to rebake
+            its appearance
             </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>
+            <param name="textureID">The ID of the Texture Layer to bake</param>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.DetachObjects(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32})">
+        <member name="P:OpenMetaverse.RebakeAvatarTexturesEventArgs.TextureID">
+            <summary>The ID of the Texture Layer to bake</summary>
+        </member>
+        <member name="T:OpenMetaverse.Assets.AssetAnimation">
             <summary>
-            Detach an object from yourself
+            Represents an Animation
             </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)">
+        <member name="M:OpenMetaverse.Assets.AssetAnimation.#ctor">
+            <summary>Default Constructor</summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetAnimation.#ctor(OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            Change the position of an object, Will change position of entire linkset
+            Construct an Asset object of type Animation
             </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="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.ObjectManager.SetPosition(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Vector3,System.Boolean)">
+        <member name="P:OpenMetaverse.Assets.AssetAnimation.AssetType">
+            <summary>Override the base classes AssetType</summary>
+        </member>
+        <member name="T:OpenMetaverse.DictionaryEventAction">
             <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)">
+        <member name="F:OpenMetaverse.DictionaryEventAction.Add">
             <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)">
+        <member name="F:OpenMetaverse.DictionaryEventAction.Remove">
             <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)">
+        <member name="F:OpenMetaverse.DictionaryEventAction.Change">
             <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)">
+        <member name="T:OpenMetaverse.DictionaryChangeCallback">
             <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>
+            <param name="action"></param>
+            <param name="entry"></param>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.DeedObjects(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.ObservableDictionary`2">
             <summary>
-            Deed multiple objects (prims) to a group, Objects must be shared with group which
-            can be accomplished with SetPermissions()
+            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>
-            <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>
+            <typeparam name="TKey">Key <see langword="Tkey"/></typeparam>
+            <typeparam name="TValue">Value <see langword="TValue"/></typeparam>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetPermissions(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},OpenMetaverse.PermissionWho,OpenMetaverse.PermissionMask,System.Boolean)">
+        <member name="F:OpenMetaverse.ObservableDictionary`2.Delegates">
             <summary>
-            Set the permissions on multiple objects
+            A dictionary of callbacks to fire when specified action occurs
             </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)">
+        <member name="M:OpenMetaverse.ObservableDictionary`2.AddDelegate(OpenMetaverse.DictionaryEventAction,OpenMetaverse.DictionaryChangeCallback)">
             <summary>
-            Request additional properties for an object
+            Register a callback to be fired when an action occurs
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
-            <param name="objectID"></param>
+            <param name="action">The action</param>
+            <param name="callback">The callback to fire</param>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.RequestObjectPropertiesFamily(OpenMetaverse.Simulator,OpenMetaverse.UUID,System.Boolean)">
+        <member name="M:OpenMetaverse.ObservableDictionary`2.RemoveDelegate(OpenMetaverse.DictionaryEventAction,OpenMetaverse.DictionaryChangeCallback)">
             <summary>
-            Request additional properties for an object
+            Unregister a callback
             </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="action">The action</param>
+            <param name="callback">The callback to fire</param>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetObjectsGroup(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.ObservableDictionary`2.FireChangeEvent(OpenMetaverse.DictionaryEventAction,System.Collections.DictionaryEntry)">
             <summary>
-            Set the ownership of a list of objects to the specified group
+            
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the objects reside</param>
-            <param name="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="action"></param>
+            <param name="entry"></param>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.NavigateObjectMedia(OpenMetaverse.UUID,System.Int32,System.String,OpenMetaverse.Simulator)">
+        <member name="F:OpenMetaverse.ObservableDictionary`2.Dictionary">
+            <summary>Internal dictionary that this class wraps around. Do not
+            modify or enumerate the contents of this dictionary without locking</summary>
+        </member>
+        <member name="M:OpenMetaverse.ObservableDictionary`2.#ctor">
             <summary>
-            Update current URL of the previously set prim media
+            Initializes a new instance of the <seealso cref="T:ObservableDictionary"/> Class 
+            with the specified key/value, has the default initial capacity.
             </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>
+            <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.ObjectManager.UpdateObjectMedia(OpenMetaverse.UUID,OpenMetaverse.MediaEntry[],OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.ObservableDictionary`2.#ctor(System.Int32)">
             <summary>
-            Set object media
+            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="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="capacity">Initial size of dictionary</param>
+            <example>
+            <code>
+            // initialize a new ObservableDictionary named testDict with a string as the key and an int as the value, 
+            // initially allocated room for 10 entries.
+            public ObservableDictionary&lt;string, int&gt; testDict = new ObservableDictionary&lt;string, int&gt;(10);
+            </code>
+            </example>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.RequestObjectMedia(OpenMetaverse.UUID,OpenMetaverse.Simulator,OpenMetaverse.ObjectManager.ObjectMediaCallback)">
+        <member name="M:OpenMetaverse.ObservableDictionary`2.TryGetValue(`0,`1@)">
             <summary>
-            Retrieve information about object media
+            Try to get entry from the <seealso cref="!:ObservableDictionary"/> with specified key 
             </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="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.ObjectManager.ImprovedTerseObjectUpdateHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.ObservableDictionary`2.Find(System.Predicate{`1})">
             <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)
+            Finds the specified match.
             </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="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.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 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.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 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.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 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.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 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.ObjectManager.ObjectPhysicsPropertiesHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
+        <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="capsKey"></param>
-            <param name="message"></param>
-            <param name="simulator"></param>
+            <param name="key">The key</param>
+            <param name="value">The value</param>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.BuildBasicShape(OpenMetaverse.PrimType)">
+        <member name="M:OpenMetaverse.ObservableDictionary`2.Remove(`0)">
             <summary>
-            Setup construction data for a basic primitive shape
+            Removes the specified key, dictionary locking is not performed
             </summary>
-            <param name="type">Primitive shape to construct</param>
-            <returns>Construction data that can be plugged into a <seealso cref="T:OpenMetaverse.Primitive"/></returns>
+            <param name="key">The key.</param>
+            <returns><see langword="true"/> if successful, <see langword="false"/> otherwise</returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetAvatarSittingOn(OpenMetaverse.Simulator,OpenMetaverse.Avatar,System.UInt32,System.UInt32)">
+        <member name="M:OpenMetaverse.ObservableDictionary`2.Clear">
             <summary>
-            
+            Clear the contents of the dictionary
             </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)">
+        <member name="M:OpenMetaverse.ObservableDictionary`2.GetEnumerator">
             <summary>
-            
+            Enumerator for iterating dictionary entries
             </summary>
-            <param name="s"></param>
-            <param name="dilation"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetShape(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Primitive.ConstructionData)">
+        <member name="P:OpenMetaverse.ObservableDictionary`2.Count">
             <summary>
-            Set the Shape data of an object
+            Gets the number of Key/Value pairs contained in the <seealso cref="T:ObservableDictionary"/>
             </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)">
+        <member name="P:OpenMetaverse.ObservableDictionary`2.Item(`0)">
             <summary>
-            Set the Material data of an object
+            Indexer for the dictionary
             </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>
+            <param name="key">The key</param>
+            <returns>The value</returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.GetPrimitive(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.InventoryNode.#ctor">
             <summary>
             
             </summary>
-            <param name="simulator"></param>
-            <param name="localID"></param>
-            <param name="fullID"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.GetPrimitive(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.UUID,System.Boolean)">
+        <member name="M:OpenMetaverse.InventoryNode.#ctor(OpenMetaverse.InventoryBase)">
             <summary>
             
             </summary>
-            <param name="simulator"></param>
-            <param name="localID"></param>
-            <param name="fullID"></param>
-            <param name="createIfMissing"></param>
-            <returns></returns>
+            <param name="data"></param>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.GetAvatar(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.InventoryNode.#ctor(OpenMetaverse.InventoryBase,OpenMetaverse.InventoryNode)">
             <summary>
-            
+            De-serialization constructor for the InventoryNode Class
             </summary>
-            <param name="simulator"></param>
-            <param name="localID"></param>
-            <param name="fullID"></param>
-            <returns></returns>
-        </member>
-        <member name="E:OpenMetaverse.ObjectManager.ObjectUpdate">
-            <summary>Raised when the simulator sends us data containing
-            A <see cref="T:OpenMetaverse.Primitive"/>, Foliage or Attachment</summary>
-            <seealso cref="M:OpenMetaverse.ObjectManager.RequestObject(OpenMetaverse.Simulator,System.UInt32)"/>
-            <seealso cref="M:OpenMetaverse.ObjectManager.RequestObjects(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32})"/>
-        </member>
-        <member name="E:OpenMetaverse.ObjectManager.ObjectProperties">
-            <summary>Raised when the simulator sends us data containing
-            additional <seea cref="T:OpenMetaverse.Primitive"/> information</summary>
-            <seealso cref="M:OpenMetaverse.ObjectManager.SelectObject(OpenMetaverse.Simulator,System.UInt32)"/>
-            <seealso cref="M:OpenMetaverse.ObjectManager.SelectObjects(OpenMetaverse.Simulator,System.UInt32[],System.Boolean)"/>
-        </member>
-        <member name="E:OpenMetaverse.ObjectManager.ObjectPropertiesUpdated">
-            <summary>Raised when the simulator sends us data containing
-            Primitive.ObjectProperties for an object we are currently tracking</summary>
-        </member>
-        <member name="E:OpenMetaverse.ObjectManager.ObjectPropertiesFamily">
-            <summary>Raised when the simulator sends us data containing
-            additional <seea cref="T:OpenMetaverse.Primitive"/> and <see cref="T:OpenMetaverse.Avatar"/> details</summary>
-            <seealso cref="M:OpenMetaverse.ObjectManager.RequestObjectPropertiesFamily(OpenMetaverse.Simulator,OpenMetaverse.UUID)"/>
-        </member>
-        <member name="E:OpenMetaverse.ObjectManager.AvatarUpdate">
-            <summary>Raised when the simulator sends us data containing
-            updated information for an <see cref="T:OpenMetaverse.Avatar"/></summary>
-        </member>
-        <member name="E:OpenMetaverse.ObjectManager.TerseObjectUpdate">
-            <summary>Raised when the simulator sends us data containing
-            <see cref="T:OpenMetaverse.Primitive"/> and <see cref="T:OpenMetaverse.Avatar"/> movement changes</summary>
-        </member>
-        <member name="E:OpenMetaverse.ObjectManager.ObjectDataBlockUpdate">
-            <summary>Raised when the simulator sends us data containing
-            updates to an Objects DataBlock</summary>
         </member>
-        <member name="E:OpenMetaverse.ObjectManager.KillObject">
-            <summary>Raised when the simulator informs us an <see cref="T:OpenMetaverse.Primitive"/>
-            or <see cref="T:OpenMetaverse.Avatar"/> is no longer within view</summary>
-        </member>
-        <member name="E:OpenMetaverse.ObjectManager.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="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="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.ObjectManager.ObjectMediaCallback">
+        <member name="M:OpenMetaverse.InventoryNode.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Callback for getting object media data via CAP
+            Serialization handler for the InventoryNode Class
             </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="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)">
+        <member name="M:OpenMetaverse.InventoryNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Construct a new instance of the PrimEventArgs class
+            De-serialization handler for the InventoryNode 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)">
+        <member name="M:OpenMetaverse.InventoryNode.ToString">
             <summary>
-            Construct a new instance of the AvatarUpdateEventArgs class
+            
             </summary>
-            <param name="simulator">The simulator the packet originated from</param>
-            <param name="avatar">The <see cref="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar"/> data</param>
-            <param name="timeDilation">The simulator time dilation</param>
-            <param name="isNew">The avatar was not in the dictionary before this update</param>
+            <returns></returns>
         </member>
-        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.Simulator">
-            <summary>Get the simulator the object originated from</summary>
+        <member name="P:OpenMetaverse.InventoryNode.Data">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar">
-            <summary>Get the <see cref="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar"/> data</summary>
+        <member name="P:OpenMetaverse.InventoryNode.Parent">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.TimeDilation">
-            <summary>Get the simulator time dilation</summary>
+        <member name="P:OpenMetaverse.InventoryNode.ParentID">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.IsNew">
-            <summary>true if the <see cref="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar"/> did not exist in the dictionary before this update (always true if avatar tracking has been disabled)</summary>
+        <member name="P:OpenMetaverse.InventoryNode.Nodes">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.ObjectPropertiesEventArgs">
-            <summary>Provides additional primitive data for the <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties"/> event</summary>
-            <remarks><para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties"/> event occurs when the simulator sends
-            an <see cref="T:OpenMetaverse.Packets.ObjectPropertiesPacket"/> containing additional details for a Primitive, Foliage data or Attachment data</para>
-            <para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties"/> event is also raised when a <see cref="M:OpenMetaverse.ObjectManager.SelectObject(OpenMetaverse.Simulator,System.UInt32)"/> request is
-            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 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="M:OpenMetaverse.ObjectPropertiesEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Primitive.ObjectProperties)">
+        <member name="T:OpenMetaverse.Imaging.LoadTGAClass">
             <summary>
-            Construct a new instance of the ObjectPropertiesEventArgs class
+            Capability to load TGAs to Bitmap 
             </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 name="T:OpenMetaverse.Assets.AssetNotecard">
+            <summary>
+            Represents a string of characters encoded with specific formatting properties
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectPropertiesEventArgs.Properties">
-            <summary>Get the primitive properties</summary>
+        <member name="F:OpenMetaverse.Assets.AssetNotecard.BodyText">
+            <summary>A text string containing main text of the notecard</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)"/> request is
-            made and <see cref="F:OpenMetaverse.Settings.OBJECT_TRACKING"/> is enabled</para>    
-            </remarks>    
+        <member name="F:OpenMetaverse.Assets.AssetNotecard.EmbeddedItems">
+            <summary>List of <see cref="T:OpenMetaverse.InventoryItem"/>s embedded on the notecard</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectPropertiesUpdatedEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Primitive,OpenMetaverse.Primitive.ObjectProperties)">
+        <member name="M:OpenMetaverse.Assets.AssetNotecard.#ctor">
+            <summary>Construct an Asset of type Notecard</summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetNotecard.#ctor(OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            Construct 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>
+            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="P:OpenMetaverse.ObjectPropertiesUpdatedEventArgs.Prim">
-            <summary>Get the primitive details</summary>
+        <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.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 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="P:OpenMetaverse.ObjectPropertiesFamilyEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
+        <member name="P:OpenMetaverse.Assets.AssetNotecard.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectPropertiesFamilyEventArgs.Properties">
-            <summary></summary>
+        <member name="T:OpenMetaverse.RegionFlags">
+            <summary>
+            Simulator (region) properties
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectPropertiesFamilyEventArgs.Type">
-            <summary></summary>
+        <member name="F:OpenMetaverse.RegionFlags.None">
+            <summary>No flags set</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 name="F:OpenMetaverse.RegionFlags.AllowDamage">
+            <summary>Agents can take damage and be killed</summary>
         </member>
-        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
+        <member name="F:OpenMetaverse.RegionFlags.AllowLandmark">
+            <summary>Landmarks can be created here</summary>
         </member>
-        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.Prim">
-            <summary>Get the primitive details</summary>
+        <member name="F:OpenMetaverse.RegionFlags.AllowSetHome">
+            <summary>Home position can be set in this sim</summary>
         </member>
-        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.Update">
-            <summary></summary>
+        <member name="F:OpenMetaverse.RegionFlags.ResetHomeOnTeleport">
+            <summary>Home position is reset when an agent teleports away</summary>
         </member>
-        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.TimeDilation">
-            <summary></summary>
+        <member name="F:OpenMetaverse.RegionFlags.SunFixed">
+            <summary>Sun does not move</summary>
         </member>
-        <member name="T:OpenMetaverse.ObjectDataBlockUpdateEventArgs">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.RegionFlags.TaxFree">
+            <summary>No object, land, etc. taxes</summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
+        <member name="F:OpenMetaverse.RegionFlags.BlockTerraform">
+            <summary>Disable heightmap alterations (agents can still plant
+            foliage)</summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Prim">
-            <summary>Get the primitive details</summary>
+        <member name="F:OpenMetaverse.RegionFlags.BlockLandResell">
+            <summary>Land cannot be released, sold, or purchased</summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.ConstructionData">
-            <summary></summary>
+        <member name="F:OpenMetaverse.RegionFlags.Sandbox">
+            <summary>All content is wiped nightly</summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Block">
-            <summary></summary>
+        <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="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Update">
-            <summary></summary>
+        <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="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.NameValues">
-            <summary></summary>
+        <member name="F:OpenMetaverse.RegionFlags.SkipUpdateInterestList">
+            <summary>Region does not update agent prim interest lists. Internal debugging option.</summary>
         </member>
-        <member name="T:OpenMetaverse.KillObjectEventArgs">
-            <summary>Provides notification when an Avatar, Object or Attachment is DeRezzed or moves out of the avatars view for the 
-            <see cref="E:OpenMetaverse.ObjectManager.KillObject"/> event</summary>
+        <member name="F:OpenMetaverse.RegionFlags.SkipCollisions">
+            <summary>No collision detection for non-agent objects</summary>
         </member>
-        <member name="P:OpenMetaverse.KillObjectEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
+        <member name="F:OpenMetaverse.RegionFlags.SkipScripts">
+            <summary>No scripts are ran</summary>
         </member>
-        <member name="P:OpenMetaverse.KillObjectEventArgs.ObjectLocalID">
-            <summary>The LocalID of the object</summary>
+        <member name="F:OpenMetaverse.RegionFlags.SkipPhysics">
+            <summary>All physics processing is turned off</summary>
         </member>
-        <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 name="F:OpenMetaverse.RegionFlags.ExternallyVisible">
+            <summary>Region can be seen from other regions on world map. (Legacy world map option?) </summary>
         </member>
-        <member name="P:OpenMetaverse.KillObjectsEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
+        <member name="F:OpenMetaverse.RegionFlags.MainlandVisible">
+            <summary>Region can be seen from mainland on world map. (Legacy world map option?) </summary>
         </member>
-        <member name="P:OpenMetaverse.KillObjectsEventArgs.ObjectLocalIDs">
-            <summary>The LocalID of the object</summary>
+        <member name="F:OpenMetaverse.RegionFlags.PublicAllowed">
+            <summary>Agents not explicitly on the access list can visit the region. </summary>
         </member>
-        <member name="T:OpenMetaverse.AvatarSitChangedEventArgs">
-            <summary>
-            Provides updates sit position data
-            </summary>
+        <member name="F:OpenMetaverse.RegionFlags.BlockDwell">
+            <summary>Traffic calculations are not run across entire region, overrides parcel settings. </summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
+        <member name="F:OpenMetaverse.RegionFlags.NoFly">
+            <summary>Flight is disabled (not currently enforced by the sim)</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.Avatar">
-            <summary></summary>
+        <member name="F:OpenMetaverse.RegionFlags.AllowDirectTeleport">
+            <summary>Allow direct (p2p) teleporting</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.SittingOn">
-            <summary></summary>
+        <member name="F:OpenMetaverse.RegionFlags.EstateSkipScripts">
+            <summary>Estate owner has temporarily disabled scripting</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.OldSeat">
-            <summary></summary>
+        <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.PayPriceReplyEventArgs">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.RegionFlags.DenyAnonymous">
+            <summary>Deny agents with no payment info on file</summary>
         </member>
-        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
+        <member name="F:OpenMetaverse.RegionFlags.DenyIdentified">
+            <summary>Deny agents with payment info on file</summary>
         </member>
-        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.ObjectID">
-            <summary></summary>
+        <member name="F:OpenMetaverse.RegionFlags.DenyTransacted">
+            <summary>Deny agents who have made a monetary transaction</summary>
         </member>
-        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.DefaultPrice">
-            <summary></summary>
+        <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="P:OpenMetaverse.PayPriceReplyEventArgs.ButtonPrices">
-            <summary></summary>
+        <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="P:OpenMetaverse.ObjectMediaEventArgs.Success">
+        <member name="T:OpenMetaverse.RegionProtocols">
             <summary>
-            Indicates if the operation was successful
+            Region protocol flags
             </summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectMediaEventArgs.Version">
+        <member name="T:OpenMetaverse.SimAccess">
             <summary>
-            Media version string
+            Access level for a simulator
             </summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectMediaEventArgs.FaceMedia">
-            <summary>
-            Array of media entries indexed by face number
-            </summary>
+        <member name="F:OpenMetaverse.SimAccess.Unknown">
+            <summary>Unknown or invalid access level</summary>
         </member>
-        <member name="T:OpenMetaverse.PhysicsPropertiesEventArgs">
-            <summary>
-            Set when simulator sends us infomation on primitive's physical properties
-            </summary>
+        <member name="F:OpenMetaverse.SimAccess.Trial">
+            <summary>Trial accounts allowed</summary>
         </member>
-        <member name="F:OpenMetaverse.PhysicsPropertiesEventArgs.Simulator">
-            <summary>Simulator where the message originated</summary>
+        <member name="F:OpenMetaverse.SimAccess.PG">
+            <summary>PG rating</summary>
         </member>
-        <member name="F:OpenMetaverse.PhysicsPropertiesEventArgs.PhysicsProperties">
-            <summary>Updated physical properties</summary>
+        <member name="F:OpenMetaverse.SimAccess.Mature">
+            <summary>Mature rating</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="F:OpenMetaverse.SimAccess.Adult">
+            <summary>Adult rating</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.#ctor">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.SimAccess.Down">
+            <summary>Simulator is offline</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.#ctor(OpenMetaverse.InventoryBase)">
+        <member name="F:OpenMetaverse.SimAccess.NonExistent">
+            <summary>Simulator does not exist</summary>
+        </member>
+        <member name="T:OpenMetaverse.Simulator">
             <summary>
             
             </summary>
-            <param name="data"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.#ctor(OpenMetaverse.InventoryBase,OpenMetaverse.InventoryNode)">
-            <summary>
-            De-serialization constructor for the InventoryNode Class
-            </summary>
+        <member name="F:OpenMetaverse.Simulator.Client">
+            <summary>A public reference to the client that this Simulator object
+            is attached to</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.Simulator.ID">
+            <summary>A Unique Cache identifier for this simulator</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            De-serialization handler for the InventoryNode Class
-            </summary>
+        <member name="F:OpenMetaverse.Simulator.Caps">
+            <summary>The capabilities for this simulator</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.ToString">
-            <summary>
-            
-            </summary>
-            <returns></returns>
+        <member name="F:OpenMetaverse.Simulator.Handle">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryNode.Data">
+        <member name="F:OpenMetaverse.Simulator.SimVersion">
+            <summary>The current version of software this simulator is running</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.Name">
             <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryNode.Parent">
+        <member name="F:OpenMetaverse.Simulator.ParcelOverlay">
+            <summary>A 64x64 grid of parcel coloring values. The values stored 
+            in this array are of the <seealso cref="!:ParcelArrayType"/> type</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.ParcelOverlaysReceived">
             <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryNode.ParentID">
+        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange00">
             <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryNode.Nodes">
+        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange01">
             <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.Simulator.TerrainHeightRange10">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryException">
-            <summary>
-            Exception class to identify inventory exceptions
-            </summary>
+        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange11">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Inventory">
-            <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>
+        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight00">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectUpdated">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight01">
+            <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="F:OpenMetaverse.Simulator.TerrainStartHeight10">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectUpdatedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight11">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectRemoved">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.Simulator.WaterHeight">
+            <summary></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="F:OpenMetaverse.Simulator.SimOwner">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectRemovedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Simulator.TerrainBase0">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectAdded">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.Simulator.TerrainBase1">
+            <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="F:OpenMetaverse.Simulator.TerrainBase2">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectAddedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Simulator.TerrainBase3">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Inventory.GetContents(OpenMetaverse.UUID)">
-            <summary>
-            Returns the contents of the specified folder
-            </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>
+        <member name="F:OpenMetaverse.Simulator.TerrainDetail0">
+            <summary></summary>
         </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.Simulator.TerrainDetail1">
+            <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.Simulator.TerrainDetail2">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Inventory.Contains(OpenMetaverse.UUID)">
-            <summary>
-            Used to find out if Inventory contains the InventoryObject
-            specified by <code>uuid</code>.
-            </summary>
-            <param name="uuid">The UUID to check.</param>
-            <returns>true if inventory contains uuid, false otherwise</returns>
+        <member name="F:OpenMetaverse.Simulator.TerrainDetail3">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.Simulator.IsEstateManager">
+            <summary>true if your agent has Estate Manager rights on this region</summary>
         </member>
-        <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 name="F:OpenMetaverse.Simulator.Flags">
+            <summary></summary>
         </member>
-        <member name="E:OpenMetaverse.Inventory.InventoryObjectUpdated">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.Simulator.Access">
+            <summary></summary>
         </member>
-        <member name="E:OpenMetaverse.Inventory.InventoryObjectRemoved">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.Simulator.BillableFactor">
+            <summary></summary>
         </member>
-        <member name="E:OpenMetaverse.Inventory.InventoryObjectAdded">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <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="P:OpenMetaverse.Inventory.RootFolder">
-            <summary>
-            The root folder of this avatars inventory
-            </summary>
+        <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="P:OpenMetaverse.Inventory.LibraryFolder">
+        <member name="F:OpenMetaverse.Simulator.Protocols">
             <summary>
-            The default shared library folder
+            Flags indicating which protocols this region supports
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Inventory.RootNode">
-            <summary>
-            The root node of the avatars inventory
-            </summary>
+        <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="P:OpenMetaverse.Inventory.LibraryRootNode">
+        <member name="F:OpenMetaverse.Simulator.ObjectsAvatars">
             <summary>
-            The root node of the default shared library
+            A thread-safe dictionary containing avatars in a simulator        
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Inventory.Item(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Simulator.ObjectsPrimitives">
             <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.
+            A thread-safe dictionary containing primitives in a simulator
             </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>
-        <member name="T:OpenMetaverse.GridLayerType">
+        <member name="M:OpenMetaverse.Simulator.IsParcelMapFull">
             <summary>
-            Map layer request type
+            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="F:OpenMetaverse.GridLayerType.Objects">
-            <summary>Objects and terrain are shown</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridLayerType.Terrain">
-            <summary>Only the terrain is shown, no objects</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridLayerType.LandForSale">
-            <summary>Overlay showing land for sale and for auction</summary>
-        </member>
-        <member name="T:OpenMetaverse.GridItemType">
+        <member name="F:OpenMetaverse.Simulator.AgentMovementComplete">
             <summary>
-            Type of grid item, such as telehub, event, populator location, etc.
+            Is it safe to send agent updates to this sim
+            AgentMovementComplete message received
             </summary>
         </member>
-        <member name="F:OpenMetaverse.GridItemType.Telehub">
-            <summary>Telehub</summary>
+        <member name="F:OpenMetaverse.Simulator.DisconnectCandidate">
+            <summary>Used internally to track sim disconnections</summary>
         </member>
-        <member name="F:OpenMetaverse.GridItemType.PgEvent">
-            <summary>PG rated event</summary>
+        <member name="F:OpenMetaverse.Simulator.ConnectedEvent">
+            <summary>Event that is triggered when the simulator successfully
+            establishes a connection</summary>
         </member>
-        <member name="F:OpenMetaverse.GridItemType.MatureEvent">
-            <summary>Mature rated event</summary>
+        <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.GridItemType.Popular">
-            <summary>Popular location</summary>
+        <member name="F:OpenMetaverse.Simulator.avatarPositions">
+            <summary>Coarse locations of avatars in this simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.GridItemType.AgentLocations">
-            <summary>Locations of avatar groups in a region</summary>
+        <member name="F:OpenMetaverse.Simulator.preyID">
+            <summary>AvatarPositions key representing TrackAgent target</summary>
         </member>
-        <member name="F:OpenMetaverse.GridItemType.LandForSale">
-            <summary>Land for sale</summary>
+        <member name="F:OpenMetaverse.Simulator.PacketArchive">
+            <summary>Sequence numbers of packets we've received
+            (for duplicate checking)</summary>
         </member>
-        <member name="F:OpenMetaverse.GridItemType.Classified">
-            <summary>Classified ad</summary>
+        <member name="F:OpenMetaverse.Simulator.NeedAck">
+            <summary>Packets we sent out that need ACKs from the simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.GridItemType.AdultEvent">
-            <summary>Adult rated event</summary>
+        <member name="F:OpenMetaverse.Simulator.pauseSerial">
+            <summary>Sequence number for pause/resume</summary>
         </member>
-        <member name="F:OpenMetaverse.GridItemType.AdultLandForSale">
-            <summary>Adult land for sale</summary>
+        <member name="F:OpenMetaverse.Simulator.handshakeComplete">
+            <summary>Indicates if UDP connection to the sim is fully established</summary>
         </member>
-        <member name="T:OpenMetaverse.GridRegion">
+        <member name="M:OpenMetaverse.Simulator.#ctor(OpenMetaverse.GridClient,System.Net.IPEndPoint,System.UInt64)">
             <summary>
-            Information about a region on the grid map
+            
             </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="F:OpenMetaverse.GridRegion.X">
-            <summary>Sim X position on World Map</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridRegion.Y">
-            <summary>Sim Y position on World Map</summary>
+        <member name="M:OpenMetaverse.Simulator.Dispose">
+            <summary>
+            Called when this Simulator object is being destroyed
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.Name">
-            <summary>Sim Name (NOTE: In lowercase!)</summary>
+        <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="F:OpenMetaverse.GridRegion.Access">
-            <summary></summary>
+        <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="F:OpenMetaverse.GridRegion.RegionFlags">
-            <summary>Appears to always be zero (None)</summary>
+        <member name="M:OpenMetaverse.Simulator.Disconnect(System.Boolean)">
+            <summary>
+            Disconnect from this simulator
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.WaterHeight">
-            <summary>Sim's defined Water Height</summary>
+        <member name="M:OpenMetaverse.Simulator.Pause">
+            <summary>
+            Instructs the simulator to stop sending update (and possibly other) packets
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.Agents">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Simulator.Resume">
+            <summary>
+            Instructs the simulator to resume sending update packets (unpause)
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.MapImageID">
-            <summary>UUID of the World Map image</summary>
+        <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="F:OpenMetaverse.GridRegion.RegionHandle">
-            <summary>Unique identifier for this region, a combination of the X 
-            and Y position</summary>
+        <member name="M:OpenMetaverse.Simulator.SendPacket(OpenMetaverse.Packets.Packet)">
+            <summary>
+            Sends a packet
+            </summary>
+            <param name="packet">Packet to be sent</param>
         </member>
-        <member name="M:OpenMetaverse.GridRegion.ToString">
+        <member name="M:OpenMetaverse.Simulator.SendPing">
             <summary>
             
             </summary>
+        </member>
+        <member name="M:OpenMetaverse.Simulator.ToString">
+            <summary>
+            Returns Simulator Name as a String
+            </summary>
             <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.GridRegion.GetHashCode">
+        <member name="M:OpenMetaverse.Simulator.GetHashCode">
             <summary>
             
             </summary>
             <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.GridRegion.Equals(System.Object)">
+        <member name="M:OpenMetaverse.Simulator.Equals(System.Object)">
             <summary>
             
             </summary>
             <param name="obj"></param>
             <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.GridLayer">
+        <member name="M:OpenMetaverse.Simulator.SendAcks">
             <summary>
-            Visual chunk of the grid map
+            Sends out pending acknowledgements
             </summary>
+            <returns>Number of ACKs sent</returns>
         </member>
-        <member name="T:OpenMetaverse.MapItem">
+        <member name="M:OpenMetaverse.Simulator.ResendUnacked">
             <summary>
-            Base class for Map Items
+            Resend unacknowledged packets
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MapItem.GlobalX">
-            <summary>The Global X position of the item</summary>
+        <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="F:OpenMetaverse.MapItem.GlobalY">
-            <summary>The Global Y position of the item</summary>
+        <member name="P:OpenMetaverse.Simulator.ParcelMap">
+            <summary>
+            Provides access to an internal thread-safe multidimensional array containing a x,y grid mapped
+            to each 64x64 parcel's LocalID.
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.MapItem.LocalX">
-            <summary>Get the Local X position of the item</summary>
+        <member name="P:OpenMetaverse.Simulator.IPEndPoint">
+            <summary>The IP address and port of the server</summary>
         </member>
-        <member name="P:OpenMetaverse.MapItem.LocalY">
-            <summary>Get the Local Y position of the item</summary>
+        <member name="P:OpenMetaverse.Simulator.Connected">
+            <summary>Whether there is a working connection to the simulator or 
+            not</summary>
         </member>
-        <member name="P:OpenMetaverse.MapItem.RegionHandle">
-            <summary>Get the Handle of the region</summary>
+        <member name="P:OpenMetaverse.Simulator.AvatarPositions">
+            <summary>Coarse locations of avatars in this simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.MapAgentLocation">
+        <member name="P:OpenMetaverse.Simulator.PreyID">
+            <summary>AvatarPositions key representing TrackAgent target</summary>
+        </member>
+        <member name="P:OpenMetaverse.Simulator.HandshakeComplete">
+            <summary>Indicates if UDP connection to the sim is fully established</summary>
+        </member>
+        <member name="T:OpenMetaverse.Simulator.SimStats">
             <summary>
-            Represents an agent or group of agents location
+            Simulator Statistics
             </summary>
         </member>
-        <member name="T:OpenMetaverse.MapTelehub">
+        <member name="F:OpenMetaverse.Simulator.SimStats.SentPackets">
+            <summary>Total number of packets sent by this simulator to this agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.RecvPackets">
+            <summary>Total number of packets received by this simulator to this agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.SentBytes">
+            <summary>Total number of bytes sent by this simulator to this agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.RecvBytes">
+            <summary>Total number of bytes received by this simulator to this agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ConnectTime">
+            <summary>Time in seconds agent has been connected to simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ResentPackets">
+            <summary>Total number of packets that have been resent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ReceivedResends">
+            <summary>Total number of resent packets recieved</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.SentPings">
+            <summary>Total number of pings sent to this simulator by this agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ReceivedPongs">
+            <summary>Total number of ping replies sent to this agent by this simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.IncomingBPS">
             <summary>
-            Represents a Telehub location
+            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.MapLandForSale">
+        <member name="F:OpenMetaverse.Simulator.SimStats.OutgoingBPS">
             <summary>
-            Represents a non-adult parcel of land for sale
+            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.MapAdultLandForSale">
-            <summary>
-            Represents an Adult parcel of land for sale
-            </summary>
+        <member name="F:OpenMetaverse.Simulator.SimStats.LastPingSent">
+            <summary>Time last ping was sent</summary>
         </member>
-        <member name="T:OpenMetaverse.MapPGEvent">
-            <summary>
-            Represents a PG Event
-            </summary>
+        <member name="F:OpenMetaverse.Simulator.SimStats.LastPingID">
+            <summary>ID of last Ping sent</summary>
         </member>
-        <member name="T:OpenMetaverse.MapMatureEvent">
-            <summary>
-            Represents a Mature event
-            </summary>
+        <member name="F:OpenMetaverse.Simulator.SimStats.LastLag">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.MapAdultEvent">
-            <summary>
-            Represents an Adult event
-            </summary>
+        <member name="F:OpenMetaverse.Simulator.SimStats.MissedPings">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.GridManager">
-            <summary>
-            Manages grid-wide tasks such as the world map
-            </summary>
+        <member name="F:OpenMetaverse.Simulator.SimStats.Dilation">
+            <summary>Current time dilation of this simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_CoarseLocationUpdate">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Simulator.SimStats.FPS">
+            <summary>Current Frames per second of simulator</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.Simulator.SimStats.PhysicsFPS">
+            <summary>Current Physics frames per second of simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_CoarseLocationUpdateLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Simulator.SimStats.AgentUpdates">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridRegion">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Simulator.SimStats.FrameTime">
+            <summary></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.Simulator.SimStats.NetTime">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridRegionLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Simulator.SimStats.PhysicsTime">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridLayer">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ImageTime">
+            <summary></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.Simulator.SimStats.ScriptTime">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridLayerLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Simulator.SimStats.AgentTime">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridItems">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Simulator.SimStats.OtherTime">
+            <summary></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.Simulator.SimStats.Objects">
+            <summary>Total number of objects Simulator is simulating</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridItemsLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ScriptedObjects">
+            <summary>Total number of Active (Scripted) objects running</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_RegionHandleReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Simulator.SimStats.Agents">
+            <summary>Number of agents currently in this simulator</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.Simulator.SimStats.ChildAgents">
+            <summary>Number of agents in neighbor simulators</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_RegionHandleReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ActiveScripts">
+            <summary>Number of Active scripts running in this simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.Regions">
-            <summary>A dictionary of all the regions, indexed by region name</summary>
+        <member name="F:OpenMetaverse.Simulator.SimStats.LSLIPS">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.RegionsByHandle">
-            <summary>A dictionary of all the regions, indexed by region handle</summary>
+        <member name="F:OpenMetaverse.Simulator.SimStats.INPPS">
+            <summary></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.Simulator.SimStats.OUTPPS">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestMapLayer(OpenMetaverse.GridLayerType)">
-            <summary>
-            
-            </summary>
-            <param name="layer"></param>
+        <member name="F:OpenMetaverse.Simulator.SimStats.PendingDownloads">
+            <summary>Number of downloads pending</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.Simulator.SimStats.PendingUploads">
+            <summary>Number of uploads pending</summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestMapBlocks(OpenMetaverse.GridLayerType,System.UInt16,System.UInt16,System.UInt16,System.UInt16,System.Boolean)">
+        <member name="F:OpenMetaverse.Simulator.SimStats.VirtualSize">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ResidentSize">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.PendingLocalUploads">
+            <summary>Number of local uploads pending</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.UnackedBytes">
+            <summary>Unacknowledged bytes in queue</summary>
+        </member>
+        <member name="F:OpenMetaverse.SimulatorDataPool.Handle">
             <summary>
-            
+            Simulator handle
             </summary>
-            <param name="layer"></param>
-            <param name="minX"></param>
-            <param name="minY"></param>
-            <param name="maxX"></param>
-            <param name="maxY"></param>
-            <param name="returnNonExistent"></param>
         </member>
-        <member name="M:OpenMetaverse.GridManager.MapItems(System.UInt64,OpenMetaverse.GridItemType,OpenMetaverse.GridLayerType,System.Int32)">
+        <member name="F:OpenMetaverse.SimulatorDataPool.ActiveClients">
             <summary>
-            
+            Number of GridClients using this datapool
             </summary>
-            <param name="regionHandle"></param>
-            <param name="item"></param>
-            <param name="layer"></param>
-            <param name="timeoutMS"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestMapItems(System.UInt64,OpenMetaverse.GridItemType,OpenMetaverse.GridLayerType)">
+        <member name="F:OpenMetaverse.SimulatorDataPool.InactiveSince">
             <summary>
-            
+            Time that the last client disconnected from the simulator
             </summary>
-            <param name="regionHandle"></param>
-            <param name="item"></param>
-            <param name="layer"></param>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestMainlandSims(OpenMetaverse.GridLayerType)">
+        <member name="F:OpenMetaverse.SimulatorDataPool.PrimCache">
             <summary>
-            Request data for all mainland (Linden managed) simulators
+            The cache of prims used and unused in this simulator
             </summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestRegionHandle(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.SimulatorDataPool.Parcels">
             <summary>
-            Request the region handle for the specified region UUID
+            Shared parcel info only when POOL_PARCEL_DATA == true
             </summary>
-            <param name="regionID">UUID of the region to look up</param>
         </member>
-        <member name="M:OpenMetaverse.GridManager.GetGridRegion(System.String,OpenMetaverse.GridLayerType,OpenMetaverse.GridRegion@)">
+        <member name="T:OpenMetaverse.FieldType">
             <summary>
-            Get grid region information using the region name, this function
-            will block until it can find the region or gives up
+            
             </summary>
-            <param name="name">Name of sim you're looking for</param>
-            <param name="layer">Layer that you are requesting</param>
-            <param name="region">Will contain a GridRegion for the sim you're
-            looking for if successful, otherwise an empty structure</param>
-            <returns>True if the GridRegion was successfully fetched, otherwise
-            false</returns>
-        </member>
-        <member name="M:OpenMetaverse.GridManager.MapBlockReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="M:OpenMetaverse.GridManager.MapItemReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="M:OpenMetaverse.GridManager.SimulatorViewerTimeMessageHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="M:OpenMetaverse.GridManager.CoarseLocationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="M:OpenMetaverse.GridManager.RegionHandleReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="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 name="F:OpenMetaverse.FieldType.U8">
+            <summary></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.FieldType.U16">
+            <summary></summary>
         </member>
-        <member name="E:OpenMetaverse.GridManager.RegionHandleReply">
-            <summary>Raised in response to a Region lookup</summary>
+        <member name="F:OpenMetaverse.FieldType.U32">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.GridManager.SunPhase">
-            <summary>Unknown</summary>
+        <member name="F:OpenMetaverse.FieldType.U64">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.GridManager.SunDirection">
-            <summary>Current direction of the sun</summary>
+        <member name="F:OpenMetaverse.FieldType.S8">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.GridManager.SunAngVelocity">
-            <summary>Current angular velocity of the sun</summary>
+        <member name="F:OpenMetaverse.FieldType.S16">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.GridManager.TimeOfDay">
-            <summary>Microseconds since the start of SL 4-hour day</summary>
+        <member name="F:OpenMetaverse.FieldType.S32">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.DirectoryManager">
-            <summary>
-            Access to the data server which allows searching for land, events, people, etc
-            </summary>
+        <member name="F:OpenMetaverse.FieldType.F32">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_EventInfoReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.FieldType.F64">
+            <summary></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 name="F:OpenMetaverse.FieldType.UUID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_EventDetailLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.FieldType.BOOL">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirEvents">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.FieldType.Vector3">
+            <summary></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 name="F:OpenMetaverse.FieldType.Vector3d">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirEventsLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.FieldType.Vector4">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_Places">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.FieldType.Quaternion">
+            <summary></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 name="F:OpenMetaverse.FieldType.IPADDR">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_PlacesLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.FieldType.IPPORT">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirPlaces">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.FieldType.Variable">
+            <summary></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 name="F:OpenMetaverse.FieldType.Fixed">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirPlacesLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.FieldType.Single">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirClassifieds">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.FieldType.Multiple">
+            <summary></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 name="T:OpenMetaverse.MapField">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirClassifiedsLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.MapField.KeywordPosition">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirGroups">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.MapField.Name">
+            <summary></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 name="F:OpenMetaverse.MapField.Type">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirGroupsLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.MapField.Count">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirPeople">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.MapField.CompareTo(System.Object)">
+            <summary>
+            
+            </summary>
+            <param name="obj"></param>
+            <returns></returns>
         </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 name="T:OpenMetaverse.MapBlock">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirPeopleLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.MapBlock.KeywordPosition">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirLandReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.MapBlock.Name">
+            <summary></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 name="F:OpenMetaverse.MapBlock.Count">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirLandLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.MapBlock.Fields">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.MapBlock.CompareTo(System.Object)">
             <summary>
-            Constructs a new instance of the DirectoryManager class
+            
             </summary>
-            <param name="client">An instance of GridClient</param>
+            <param name="obj"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartClassifiedSearch(System.String)">
+        <member name="T:OpenMetaverse.MapPacket">
             <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
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.MapPacket.ID">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.MapPacket.Name">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.MapPacket.Frequency">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.MapPacket.Trusted">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.MapPacket.Encoded">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.MapPacket.Blocks">
+            <summary></summary>
+        </member>
+        <member name="T:OpenMetaverse.ProtocolManager">
+            <summary>
             
-            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)">
+        <member name="F:OpenMetaverse.ProtocolManager.TypeSizes">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.ProtocolManager.KeywordPositions">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.ProtocolManager.LowMaps">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.ProtocolManager.MediumMaps">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.ProtocolManager.HighMaps">
+            <summary></summary>
+        </member>
+        <member name="M:OpenMetaverse.ProtocolManager.#ctor(System.String,OpenMetaverse.GridClient)">
             <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>
+            <param name="mapFile"></param>
+            <param name="client"></param>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,System.Int32)">
+        <member name="M:OpenMetaverse.ProtocolManager.Command(System.String)">
             <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>
+            <param name="command"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.ParcelCategory,System.Int32)">
+        <member name="M:OpenMetaverse.ProtocolManager.Command(System.Byte[])">
             <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>
+            <param name="data"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartLandSearch(OpenMetaverse.DirectoryManager.SearchTypeFlags)">
+        <member name="M:OpenMetaverse.ProtocolManager.Command(System.UInt16,OpenMetaverse.PacketFrequency)">
             <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>
+            <param name="command"></param>
+            <param name="frequency"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartLandSearch(OpenMetaverse.DirectoryManager.SearchTypeFlags,System.Int32,System.Int32,System.Int32)">
+        <member name="M:OpenMetaverse.ProtocolManager.PrintMap">
             <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)">
+        <member name="M:OpenMetaverse.ProtocolManager.PrintOneMap(OpenMetaverse.MapPacket[],System.String)">
             <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>
+            </summary>
+            <param name="map"></param>
+            <param name="frequency"></param>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32)">
+        <member name="M:OpenMetaverse.ProtocolManager.DecodeMapFile(System.String,System.String)">
             <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>
+            <param name="mapFile"></param>
+            <param name="outputFile"></param>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32,OpenMetaverse.DirectoryManager.DirFindFlags)">
+        <member name="M:OpenMetaverse.ProtocolManager.LoadMapFile(System.String)">
             <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>
+            <param name="mapFile"></param>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartPeopleSearch(System.String,System.Int32)">
+        <member name="T:OpenMetaverse.ReportType">
             <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">
+        <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>
+        <member name="F:OpenMetaverse.ReportType.CustomerServiceRequest">
+            <summary>Customer service report</summary>
+        </member>
+        <member name="T:OpenMetaverse.CompressedFlags">
             <summary>
-            Search Places for parcels of land you personally own
+            Bitflag field for ObjectUpdateCompressed data blocks, describing 
+            which options are present for each object
             </summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartPlacesSearch(OpenMetaverse.UUID)">
+        <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">
             <summary>
-            Searches Places for land owned by the specified group
+            Specific Flags for MultipleObjectUpdate requests
             </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)">
+        <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">
             <summary>
-            Search the Places directory for parcels that are listed in search and contain the specified keywords
+            Special values in PayPriceReply. If the price is not one of these
+            literal value of the price should be use
             </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)">
+        <member name="F:OpenMetaverse.PayPriceType.Hide">
             <summary>
-            Search Places - All Options
+            Indicates that this pay option should be hidden
             </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)">
+        <member name="F:OpenMetaverse.PayPriceType.Default">
             <summary>
-            Search All Events with specifid searchText in all categories, includes PG, Mature and Adult
+            Indicates that this pay option should have the default value
             </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)">
+        <member name="T:OpenMetaverse.ObjectMovementUpdate">
             <summary>
-            Search Events
+            Contains the variables sent in an object update packet for objects. 
+            Used to track position and movement of prims and avatars
             </summary>
-            <param name="searchText">A string containing a list of keywords to search for separated by a space character</param>
-            <param name="queryFlags">One or more of the following flags: DateEvents, IncludePG, IncludeMature, IncludeAdult
-            from the <see cref="T:OpenMetaverse.DirectoryManager.DirFindFlags"/> Enum
-            
-            Multiple flags can be combined by separating the flags with the | (pipe) character</param>
-            <param name="eventDay">"u" for in-progress and upcoming events, -or- number of days since/until event is scheduled
-            For example "0" = Today, "1" = tomorrow, "2" = following day, "-1" = yesterday, etc.</param>
-            <param name="queryStart">Each request is limited to 100 entries
-            being returned. To get the first group of entries of a request use 0,
-            from 100-199 use 100, 200-299 use 200, etc.</param>
-            <param name="category">EventCategory event is listed under.</param>
-            <returns>UUID of query to correlate results in callback.</returns>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.EventInfoRequest(System.UInt32)">
-            <summary>Requests Event Details</summary>
-            <param name="eventID">ID of Event returned from the <see cref="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,System.UInt32)"/> method</param>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.DirClassifiedReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.Avatar">
+            <summary></summary>
         </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 name="F:OpenMetaverse.ObjectMovementUpdate.CollisionPlane">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.DirLandReplyEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
-            <summary>Process an incoming <see cref="T:OpenMetaverse.Messages.Linden.DirLandReplyMessage"/> event message</summary>
-            <param name="capsKey">The Unique Capabilities Key</param>
-            <param name="message">The <see cref="T:OpenMetaverse.Messages.Linden.DirLandReplyMessage"/> event message containing the data</param>
-            <param name="simulator">The simulator the message originated from</param>
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.State">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.DirPeopleReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.LocalID">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.DirGroupsReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.Position">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.PlacesReplyEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
-            <summary>Process an incoming <see cref="T:OpenMetaverse.Messages.Linden.PlacesReplyMessage"/> event message</summary>
-            <param name="capsKey">The Unique Capabilities Key</param>
-            <param name="message">The <see cref="T:OpenMetaverse.Messages.Linden.PlacesReplyMessage"/> event message containing the data</param>
-            <param name="simulator">The simulator the message originated from</param>
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.Velocity">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.PlacesReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.Acceleration">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.EventsReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.Rotation">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.EventInfoReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.AngularVelocity">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.DirPlacesReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.Textures">
+            <summary></summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.EventInfoReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.EventInfoRequest(System.UInt32)"/> request.</summary>
+        <member name="T:OpenMetaverse.ObjectManager">
+            <summary>
+            Handles all network traffic related to prims and avatar positions and 
+            movement.
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.DirEventsReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,System.UInt32)"/> request.</summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectUpdate">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.PlacesReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartPlacesSearch"/> request.</summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectUpdateLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.DirPlacesReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,System.Int32)"/> request.</summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectProperties">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.DirClassifiedsReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartClassifiedSearch(System.String,OpenMetaverse.DirectoryManager.ClassifiedCategories,System.Boolean)"/> request.</summary>
+        <member name="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="E:OpenMetaverse.DirectoryManager.DirGroupsReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32)"/> request.</summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.DirPeopleReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartPeopleSearch(System.String,System.Int32)"/> request.</summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesUpdated">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.DirLandReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartLandSearch(OpenMetaverse.DirectoryManager.SearchTypeFlags)"/> request.</summary>
+        <member name="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.DirectoryManager.ClassifiedCategories">
-            <summary>Classified Ad categories</summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesUpdatedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Any">
-            <summary>Classified is listed in the Any category</summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesFamily">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Shopping">
-            <summary>Classified is shopping related</summary>
+        <member name="M:OpenMetaverse.ObjectManager.OnObjectPropertiesFamily(OpenMetaverse.ObjectPropertiesFamilyEventArgs)">
+            <summary>Raises the ObjectPropertiesFamily Event</summary>
+             <param name="e">A ObjectPropertiesFamilyEventArgs object containing
+             the data sent from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.LandRental">
-            <summary>Classified is </summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesFamilyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.PropertyRental">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_AvatarUpdate">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.SpecialAttraction">
-            <summary></summary>
+        <member name="M:OpenMetaverse.ObjectManager.OnAvatarUpdate(OpenMetaverse.AvatarUpdateEventArgs)">
+            <summary>Raises the AvatarUpdate Event</summary>
+             <param name="e">A AvatarUpdateEventArgs object containing
+             the data sent from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.NewProducts">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_AvatarUpdateLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Employment">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_TerseObjectUpdate">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Wanted">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_TerseObjectUpdateLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Service">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectDataBlockUpdate">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Personal">
-            <summary></summary>
+        <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.DirectoryManager.EventCategories">
-            <summary>Event Categories</summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectDataBlockUpdateLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.All">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_KillObject">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Discussion">
-            <summary></summary>
+        <member name="M:OpenMetaverse.ObjectManager.OnKillObject(OpenMetaverse.KillObjectEventArgs)">
+            <summary>Raises the KillObject Event</summary>
+             <param name="e">A KillObjectEventArgs object containing
+             the data sent from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Sports">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_KillObjectLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.LiveMusic">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_KillObjects">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Commercial">
-            <summary></summary>
+        <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="F:OpenMetaverse.DirectoryManager.EventCategories.Nightlife">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_KillObjectsLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Games">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_AvatarSitChanged">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Pageants">
-            <summary></summary>
+        <member name="M:OpenMetaverse.ObjectManager.OnAvatarSitChanged(OpenMetaverse.AvatarSitChangedEventArgs)">
+            <summary>Raises the AvatarSitChanged Event</summary>
+             <param name="e">A AvatarSitChangedEventArgs object containing
+             the data sent from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Education">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_AvatarSitChangedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Arts">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_PayPriceReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Charity">
-            <summary></summary>
+        <member name="M:OpenMetaverse.ObjectManager.OnPayPriceReply(OpenMetaverse.PayPriceReplyEventArgs)">
+            <summary>Raises the PayPriceReply Event</summary>
+             <param name="e">A PayPriceReplyEventArgs object containing
+             the data sent from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Miscellaneous">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_PayPriceReplyLock">
+            <summary>Thread sync lock object</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 name="F:OpenMetaverse.ObjectManager.m_PhysicsProperties">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.People">
-            <summary>Query the People database</summary>
+        <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="F:OpenMetaverse.DirectoryManager.DirFindFlags.Online">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ObjectManager.m_PhysicsPropertiesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.Events">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ObjectManager.Client">
+            <summary>Reference to the GridClient object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.Groups">
-            <summary>Query the Groups database</summary>
+        <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="F:OpenMetaverse.DirectoryManager.DirFindFlags.DateEvents">
-            <summary>Query the Events database</summary>
+        <member name="M:OpenMetaverse.ObjectManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Construct a new instance of the ObjectManager class
+            </summary>
+            <param name="client">A reference to the <see cref="T:OpenMetaverse.GridClient"/> instance</param>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.AgentOwned">
-            <summary>Query the land holdings database for land owned by the currently connected agent</summary>
+        <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="F:OpenMetaverse.DirectoryManager.DirFindFlags.ForSale">
-            <summary></summary>
+        <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="F:OpenMetaverse.DirectoryManager.DirFindFlags.GroupOwned">
-            <summary>Query the land holdings database for land which is owned by a Group</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="F:OpenMetaverse.DirectoryManager.DirFindFlags.DwellSort">
-            <summary>Specifies the query should pre sort the results based upon traffic
-            when searching the Places database</summary>
+        <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="F:OpenMetaverse.DirectoryManager.DirFindFlags.PgSimsOnly">
-            <summary></summary>
+        <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="F:OpenMetaverse.DirectoryManager.DirFindFlags.PicturesOnly">
-            <summary></summary>
+        <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="F:OpenMetaverse.DirectoryManager.DirFindFlags.PgEventsOnly">
-            <summary></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="F:OpenMetaverse.DirectoryManager.DirFindFlags.MatureSimsOnly">
-            <summary></summary>
+        <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="F:OpenMetaverse.DirectoryManager.DirFindFlags.SortAsc">
-            <summary>Specifies the query should pre sort the results in an ascending order when searching the land sales database. 
-            This flag is only used when searching the land sales database</summary>
+        <member 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="F:OpenMetaverse.DirectoryManager.DirFindFlags.PricesSort">
-            <summary>Specifies the query should pre sort the results using the SalePrice field when searching the land sales database. 
-            This flag is only used when searching the land sales database</summary>
+        <member 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="F:OpenMetaverse.DirectoryManager.DirFindFlags.PerMeterSort">
-            <summary>Specifies the query should pre sort the results by calculating the average price/sq.m (SalePrice / Area) when searching the land sales database. 
-            This flag is only used when searching the land sales database</summary>
+        <member name="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="F:OpenMetaverse.DirectoryManager.DirFindFlags.AreaSort">
-            <summary>Specifies the query should pre sort the results using the ParcelSize field when searching the land sales database. 
-            This flag is only used when searching the land sales database</summary>
+        <member name="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="F:OpenMetaverse.DirectoryManager.DirFindFlags.NameSort">
-            <summary>Specifies the query should pre sort the results using the Name field when searching the land sales database. 
-            This flag is only used when searching the land sales database</summary>
+        <member name="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="F:OpenMetaverse.DirectoryManager.DirFindFlags.LimitByPrice">
-            <summary>When set, only parcels less than the specified Price will be included when searching the land sales database.
-            This flag is only used when searching the land sales database</summary>
+        <member name="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="F:OpenMetaverse.DirectoryManager.DirFindFlags.LimitByArea">
-            <summary>When set, only parcels greater than the specified Size will be included when searching the land sales database.
-            This flag is only used when searching the land sales database</summary>
+        <member name="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="F:OpenMetaverse.DirectoryManager.DirFindFlags.FilterMature">
-            <summary></summary>
+        <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="F:OpenMetaverse.DirectoryManager.DirFindFlags.PGOnly">
-            <summary></summary>
+        <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="F:OpenMetaverse.DirectoryManager.DirFindFlags.IncludePG">
-            <summary>Include PG land in results. This flag is used when searching both the Groups, Events and Land sales databases</summary>
+        <member name="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="F:OpenMetaverse.DirectoryManager.DirFindFlags.IncludeMature">
-            <summary>Include Mature land in results. This flag is used when searching both the Groups, Events and Land sales databases</summary>
+        <member name="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="F:OpenMetaverse.DirectoryManager.DirFindFlags.IncludeAdult">
-            <summary>Include Adult land in results. This flag is used when searching both the Groups, Events and Land sales databases</summary>
+        <member name="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="F:OpenMetaverse.DirectoryManager.DirFindFlags.AdultOnly">
-            <summary></summary>
+        <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="T:OpenMetaverse.DirectoryManager.SearchTypeFlags">
+        <member name="M:OpenMetaverse.ObjectManager.SetTextures(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Primitive.TextureEntry,System.String)">
             <summary>
-            Land types to search dataserver for
+            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="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Any">
-            <summary>Search Auction, Mainland and Estate</summary>
+        <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="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Auction">
-            <summary>Land which is currently up for auction</summary>
+        <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="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Mainland">
-            <summary>Parcels which are on the mainland (Linden owned) continents</summary>
+        <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="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Estate">
-            <summary>Parcels which are on privately owned simulators</summary>
+        <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="T:OpenMetaverse.DirectoryManager.EventFlags">
+        <member name="M:OpenMetaverse.ObjectManager.LinkPrims(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32})">
             <summary>
-            The content rating of the event
+            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="F:OpenMetaverse.DirectoryManager.EventFlags.PG">
-            <summary>Event is PG</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventFlags.Mature">
-            <summary>Event is Mature</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventFlags.Adult">
-            <summary>Event is Adult</summary>
-        </member>
-        <member name="T:OpenMetaverse.DirectoryManager.ClassifiedFlags">
+        <member name="M:OpenMetaverse.ObjectManager.DelinkPrims(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32})">
             <summary>
-            Classified Ad Options
+            Delink/Unlink multiple prims from a linkset
             </summary>
-            <remarks>There appear to be two formats the flags are packed in.
-            This set of flags is for the newer style</remarks>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.None">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.Mature">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.Enabled">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.UpdateTime">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.AutoRenew">
-            <summary></summary>
+            <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="T:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags">
+        <member name="M:OpenMetaverse.ObjectManager.SetRotation(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Quaternion)">
             <summary>
-            Classified ad query options
+            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="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.All">
-            <summary>Include all ads in results</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.PG">
-            <summary>Include PG ads in results</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.Mature">
-            <summary>Include Mature ads in results</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.Adult">
-            <summary>Include Adult ads in results</summary>
-        </member>
-        <member name="T:OpenMetaverse.DirectoryManager.PlacesFlags">
+        <member name="M:OpenMetaverse.ObjectManager.SetName(OpenMetaverse.Simulator,System.UInt32,System.String)">
             <summary>
-            The For Sale flag in PlacesReplyData
+            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.DirectoryManager.PlacesFlags.NotForSale">
-            <summary>Parcel is not listed for sale</summary>
+        <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="F:OpenMetaverse.DirectoryManager.PlacesFlags.ForSale">
-            <summary>Parcel is For Sale</summary>
+        <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="T:OpenMetaverse.DirectoryManager.Classified">
+        <member name="M:OpenMetaverse.ObjectManager.SetDescriptions(OpenMetaverse.Simulator,System.UInt32[],System.String[])">
             <summary>
-            A classified ad on the grid
+            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="F:OpenMetaverse.DirectoryManager.Classified.ID">
-            <summary>UUID for this ad, useful for looking up detailed
-            information about it</summary>
+        <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="F:OpenMetaverse.DirectoryManager.Classified.Name">
-            <summary>The title of this classified ad</summary>
+        <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="F:OpenMetaverse.DirectoryManager.Classified.Flags">
-            <summary>Flags that show certain options applied to the classified</summary>
+        <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="F:OpenMetaverse.DirectoryManager.Classified.CreationDate">
-            <summary>Creation date of the ad</summary>
+        <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="F:OpenMetaverse.DirectoryManager.Classified.ExpirationDate">
-            <summary>Expiration date of the ad</summary>
+        <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="F:OpenMetaverse.DirectoryManager.Classified.Price">
-            <summary>Price that was paid for this ad</summary>
+        <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.DirectoryManager.Classified.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.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="T:OpenMetaverse.DirectoryManager.DirectoryParcel">
+        <member name="M:OpenMetaverse.ObjectManager.UpdateObject(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Vector3,OpenMetaverse.UpdateType)">
             <summary>
-            A parcel retrieved from the dataserver such as results from the 
-            "For-Sale" listings or "Places" Search
+            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="F:OpenMetaverse.DirectoryManager.DirectoryParcel.ID">
-            <summary>The unique dataserver parcel ID</summary>
-            <remarks>This id is used to obtain additional information from the entry
-            by using the <see cref="!:ParcelManager.InfoRequest"/> method</remarks>
+        <member 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="F:OpenMetaverse.DirectoryManager.DirectoryParcel.Name">
-            <summary>A string containing the name of the parcel</summary>
+        <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="F:OpenMetaverse.DirectoryManager.DirectoryParcel.ActualArea">
-            <summary>The size of the parcel</summary>
-            <remarks>This field is not returned for Places searches</remarks>
+        <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="F:OpenMetaverse.DirectoryManager.DirectoryParcel.SalePrice">
-            <summary>The price of the parcel</summary>
-            <remarks>This field is not returned for Places searches</remarks>
+        <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="F:OpenMetaverse.DirectoryManager.DirectoryParcel.Auction">
-            <summary>If True, this parcel is flagged to be auctioned</summary>
+        <member name="M:OpenMetaverse.ObjectManager.RequestObjectPropertiesFamily(OpenMetaverse.Simulator,OpenMetaverse.UUID,System.Boolean)">
+            <summary>
+            Request additional properties for an object
+            </summary>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="objectID">Absolute UUID of the object</param>
+            <param name="reliable">Whether to require server acknowledgement of this request</param>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.ForSale">
-            <summary>If true, this parcel is currently set for sale</summary>
+        <member name="M:OpenMetaverse.ObjectManager.SetObjectsGroup(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},OpenMetaverse.UUID)">
+            <summary>
+            Set the ownership of a list of objects to the specified group
+            </summary>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the objects reside</param>
+            <param name="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="F:OpenMetaverse.DirectoryManager.DirectoryParcel.Dwell">
-            <summary>Parcel traffic</summary>
+        <member name="M:OpenMetaverse.ObjectManager.NavigateObjectMedia(OpenMetaverse.UUID,System.Int32,System.String,OpenMetaverse.Simulator)">
+            <summary>
+            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="M:OpenMetaverse.DirectoryManager.DirectoryParcel.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
+        <member name="M:OpenMetaverse.ObjectManager.UpdateObjectMedia(OpenMetaverse.UUID,OpenMetaverse.MediaEntry[],OpenMetaverse.Simulator)">
+            <summary>
+            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="T:OpenMetaverse.DirectoryManager.AgentSearchData">
+        <member name="M:OpenMetaverse.ObjectManager.RequestObjectMedia(OpenMetaverse.UUID,OpenMetaverse.Simulator,OpenMetaverse.ObjectManager.ObjectMediaCallback)">
             <summary>
-            An Avatar returned from the dataserver
+            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="F:OpenMetaverse.DirectoryManager.AgentSearchData.Online">
-            <summary>Online status of agent</summary>
-            <remarks>This field appears to be obsolete and always returns false</remarks>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.FirstName">
-            <summary>The agents first name</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.LastName">
-            <summary>The agents last name</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.AgentID">
-            <summary>The agents <see cref="T:OpenMetaverse.UUID"/></summary>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.AgentSearchData.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
+        <member 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="T:OpenMetaverse.DirectoryManager.GroupSearchData">
+        <member name="M:OpenMetaverse.ObjectManager.ImprovedTerseObjectUpdateHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-             Response to a "Groups" Search
+            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.DirectoryManager.GroupSearchData.GroupID">
-            <summary>The Group ID</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.GroupSearchData.GroupName">
-            <summary>The name of the group</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.GroupSearchData.Members">
-            <summary>The current number of members</summary>
+        <member 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.DirectoryManager.GroupSearchData.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.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="T:OpenMetaverse.DirectoryManager.PlacesSearchData">
-            <summary>
-            Parcel information returned from a <see cref="M:OpenMetaverse.DirectoryManager.StartPlacesSearch"/> request
-            <para>
-            Represents one of the following:
-            A parcel of land on the grid that has its Show In Search flag set
-            A parcel of land owned by the agent making the request
-            A parcel of land owned by a group the agent making the request is a member of
-            </para>
-            <para>
-            In a request for Group Land, the First record will contain an empty record
-            </para>
-            Note: This is not the same as searching the land for sale data source
-            </summary>
+        <member 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="F:OpenMetaverse.DirectoryManager.PlacesSearchData.OwnerID">
-            <summary>The ID of the Agent of Group that owns the parcel</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.DirectoryManager.PlacesSearchData.Name">
-            <summary>The name</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.DirectoryManager.PlacesSearchData.Desc">
-            <summary>The description</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="F:OpenMetaverse.DirectoryManager.PlacesSearchData.ActualArea">
-            <summary>The Size of the parcel</summary>
+        <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="F:OpenMetaverse.DirectoryManager.PlacesSearchData.BillableArea">
-            <summary>The billable Size of the parcel, for mainland
-            parcels this will match the ActualArea field. For Group owned land this will be 10 percent smaller
-            than the ActualArea. For Estate land this will always be 0</summary>
+        <member 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="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Flags">
-            <summary>Indicates the ForSale status of the parcel</summary>
+        <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="F:OpenMetaverse.DirectoryManager.PlacesSearchData.GlobalX">
-            <summary>The Gridwide X position</summary>
+        <member name="M:OpenMetaverse.ObjectManager.UpdateDilation(OpenMetaverse.Simulator,System.UInt32)">
+            <summary>
+            
+            </summary>
+            <param name="s"></param>
+            <param name="dilation"></param>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.GlobalY">
-            <summary>The Gridwide Y position</summary>
+        <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="F:OpenMetaverse.DirectoryManager.PlacesSearchData.GlobalZ">
-            <summary>The Z position of the parcel, or 0 if no landing point set</summary>
+        <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="F:OpenMetaverse.DirectoryManager.PlacesSearchData.SimName">
-            <summary>The name of the Region the parcel is located in</summary>
+        <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="F:OpenMetaverse.DirectoryManager.PlacesSearchData.SnapshotID">
-            <summary>The Asset ID of the parcels Snapshot texture</summary>
+        <member name="M:OpenMetaverse.ObjectManager.GetPrimitive(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.UUID,System.Boolean)">
+            <summary>
+            
+            </summary>
+            <param name="simulator"></param>
+            <param name="localID"></param>
+            <param name="fullID"></param>
+            <param name="createIfMissing"></param>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Dwell">
-            <summary>The calculated visitor traffic</summary>
+        <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="F:OpenMetaverse.DirectoryManager.PlacesSearchData.SKU">
-            <summary>The billing product SKU</summary>
-            <remarks>Known values are:
-            <list type="table">
-            <item><term>023</term><description>Mainland / Full Region</description></item>
-            <item><term>024</term><description>Estate / Full Region</description></item>
-            <item><term>027</term><description>Estate / Openspace</description></item>
-            <item><term>029</term><description>Estate / Homestead</description></item>
-            <item><term>129</term><description>Mainland / Homestead (Linden Owned)</description></item>
-            </list>
-            </remarks>
+        <member 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="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Price">
-            <summary>No longer used, will always be 0</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="M:OpenMetaverse.DirectoryManager.PlacesSearchData.ToSLurl">
-            <summary>Get a SL URL for the parcel</summary>
-            <returns>A string, containing a standard SLURL</returns>
+        <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.DirectoryManager.PlacesSearchData.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
+        <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="T:OpenMetaverse.DirectoryManager.EventsSearchData">
-            <summary>
-            An "Event" Listing summary
-            </summary>
+        <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.DirectoryManager.EventsSearchData.Owner">
-            <summary>The ID of the event creator</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.DirectoryManager.EventsSearchData.Name">
-            <summary>The name of the event</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.DirectoryManager.EventsSearchData.ID">
-            <summary>The events ID</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.DirectoryManager.EventsSearchData.Date">
-            <summary>A string containing the short date/time the event will begin</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.DirectoryManager.EventsSearchData.Time">
-            <summary>The event start time in Unixtime (seconds since epoch)</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="F:OpenMetaverse.DirectoryManager.EventsSearchData.Flags">
-            <summary>The events maturity rating</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.DirectoryManager.EventsSearchData.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
+        <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="T:OpenMetaverse.DirectoryManager.EventInfo">
+        <member name="T:OpenMetaverse.ObjectManager.ObjectMediaCallback">
             <summary>
-            The details of an "Event"
+            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.DirectoryManager.EventInfo.ID">
-            <summary>The events ID</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Creator">
-            <summary>The ID of the event creator</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Name">
-            <summary>The name of the event</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Category">
-            <summary>The category</summary>
+        <member 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="F:OpenMetaverse.DirectoryManager.EventInfo.Desc">
-            <summary>The events description</summary>
+        <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="F:OpenMetaverse.DirectoryManager.EventInfo.Date">
-            <summary>The short date/time the event will begin</summary>
+        <member name="P:OpenMetaverse.PrimEventArgs.Simulator">
+            <summary>Get the simulator the <see cref="T:OpenMetaverse.Primitive"/> originated from</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.DateUTC">
-            <summary>The event start time in Unixtime (seconds since epoch) UTC adjusted</summary>
+        <member name="P:OpenMetaverse.PrimEventArgs.Prim">
+            <summary>Get the <see cref="T:OpenMetaverse.Primitive"/> details</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Duration">
-            <summary>The length of the event in minutes</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.DirectoryManager.EventInfo.Cover">
-            <summary>0 if no cover charge applies</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="F:OpenMetaverse.DirectoryManager.EventInfo.Amount">
-            <summary>The cover charge amount in L$ if applicable</summary>
+        <member name="P:OpenMetaverse.PrimEventArgs.TimeDilation">
+            <summary>Get the simulator Time Dilation</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.SimName">
-            <summary>The name of the region where the event is being held</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="F:OpenMetaverse.DirectoryManager.EventInfo.GlobalPos">
-            <summary>The gridwide location of the event</summary>
+        <member name="M:OpenMetaverse.AvatarUpdateEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Avatar,System.UInt16,System.Boolean)">
+            <summary>
+            Construct a new instance of the AvatarUpdateEventArgs class
+            </summary>
+            <param name="simulator">The simulator the packet originated from</param>
+            <param name="avatar">The <see cref="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar"/> data</param>
+            <param name="timeDilation">The simulator time dilation</param>
+            <param name="isNew">The avatar was not in the dictionary before this update</param>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Flags">
-            <summary>The maturity rating</summary>
+        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.Simulator">
+            <summary>Get the simulator the object originated from</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.EventInfo.ToSLurl">
-            <summary>Get a SL URL for the parcel where the event is hosted</summary>
-            <returns>A string, containing a standard SLURL</returns>
+        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar">
+            <summary>Get the <see cref="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar"/> data</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.EventInfo.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
+        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.TimeDilation">
+            <summary>Get the simulator time dilation</summary>
         </member>
-        <member name="T:OpenMetaverse.EventInfoReplyEventArgs">
-            <summary>Contains the Event data returned from the data server from an EventInfoRequest</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="M:OpenMetaverse.EventInfoReplyEventArgs.#ctor(OpenMetaverse.DirectoryManager.EventInfo)">
-            <summary>Construct a new instance of the EventInfoReplyEventArgs class</summary>
-            <param name="matchedEvent">A single EventInfo object containing the details of an event</param>
+        <member 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="P:OpenMetaverse.EventInfoReplyEventArgs.MatchedEvent">
+        <member name="M:OpenMetaverse.ObjectPropertiesEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Primitive.ObjectProperties)">
             <summary>
-            A single EventInfo object containing the details of an event
+            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="T:OpenMetaverse.DirEventsReplyEventArgs">
-            <summary>Contains the "Event" detail data returned from the data server</summary>
+        <member name="P:OpenMetaverse.ObjectPropertiesEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="M:OpenMetaverse.DirEventsReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.EventsSearchData})">
-            <summary>Construct a new instance of the DirEventsReplyEventArgs class</summary>
-            <param name="queryID">The ID of the query returned by the data server. 
-            This will correlate to the ID returned by the <see cref="!:StartEventsSearch"/> method</param>
-            <param name="matchedEvents">A list containing the "Events" returned by the search query</param>
+        <member name="P:OpenMetaverse.ObjectPropertiesEventArgs.Properties">
+            <summary>Get the primitive properties</summary>
         </member>
-        <member name="P:OpenMetaverse.DirEventsReplyEventArgs.QueryID">
-            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,System.UInt32)"/></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="P:OpenMetaverse.DirEventsReplyEventArgs.MatchedEvents">
-            <summary>A list of "Events" returned by the data server</summary>
+        <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="T:OpenMetaverse.PlacesReplyEventArgs">
-            <summary>Contains the "Event" list data returned from the data server</summary>
+        <member name="P:OpenMetaverse.ObjectPropertiesUpdatedEventArgs.Prim">
+            <summary>Get the primitive details</summary>
         </member>
-        <member name="M:OpenMetaverse.PlacesReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.PlacesSearchData})">
-            <summary>Construct a new instance of PlacesReplyEventArgs class</summary>
-            <param name="queryID">The ID of the query returned by the data server. 
-            This will correlate to the ID returned by the <see cref="!:StartPlacesSearch"/> method</param>
-            <param name="matchedPlaces">A list containing the "Places" returned by the data server query</param>
+        <member 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="P:OpenMetaverse.PlacesReplyEventArgs.QueryID">
-            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartPlacesSearch"/></summary>
+        <member name="P:OpenMetaverse.ObjectPropertiesFamilyEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="P:OpenMetaverse.PlacesReplyEventArgs.MatchedPlaces">
-            <summary>A list of "Places" returned by the data server</summary>
+        <member name="P:OpenMetaverse.ObjectPropertiesFamilyEventArgs.Properties">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.DirPlacesReplyEventArgs">
-            <summary>Contains the places data returned from the data server</summary>
+        <member name="P:OpenMetaverse.ObjectPropertiesFamilyEventArgs.Type">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.DirPlacesReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.DirectoryParcel})">
-            <summary>Construct a new instance of the DirPlacesReplyEventArgs class</summary>
-            <param name="queryID">The ID of the query returned by the data server. 
-            This will correlate to the ID returned by the <see cref="!:StartDirPlacesSearch"/> method</param>
-            <param name="matchedParcels">A list containing land data returned by the data server</param>
+        <member 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.DirPlacesReplyEventArgs.QueryID">
-            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,System.Int32)"/></summary>
+        <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.DirPlacesReplyEventArgs.MatchedParcels">
-            <summary>A list containing Places data returned by the data server</summary>
+        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.Update">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.DirClassifiedsReplyEventArgs">
-            <summary>Contains the classified data returned from the data server</summary>
+        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.TimeDilation">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.DirClassifiedsReplyEventArgs.#ctor(System.Collections.Generic.List{OpenMetaverse.DirectoryManager.Classified})">
-            <summary>Construct a new instance of the DirClassifiedsReplyEventArgs class</summary>
-            <param name="classifieds">A list of classified ad data returned from the data server</param>
+        <member name="T:OpenMetaverse.ObjectDataBlockUpdateEventArgs">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.DirClassifiedsReplyEventArgs.Classifieds">
-            <summary>A list containing Classified Ads returned by the data server</summary>
+        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="T:OpenMetaverse.DirGroupsReplyEventArgs">
-            <summary>Contains the group data returned from the data server</summary>
+        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Prim">
+            <summary>Get the primitive details</summary>
         </member>
-        <member name="M:OpenMetaverse.DirGroupsReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.GroupSearchData})">
-            <summary>Construct a new instance of the DirGroupsReplyEventArgs class</summary>
-            <param name="queryID">The ID of the query returned by the data server. 
-            This will correlate to the ID returned by the <see cref="!:StartGroupSearch"/> method</param>
-            <param name="matchedGroups">A list of groups data returned by the data server</param>
+        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.ConstructionData">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.DirGroupsReplyEventArgs.QueryID">
-            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32)"/></summary>
+        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Block">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.DirGroupsReplyEventArgs.MatchedGroups">
-            <summary>A list containing Groups data returned by the data server</summary>
+        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Update">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.DirPeopleReplyEventArgs">
-            <summary>Contains the people data returned from the data server</summary>
+        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.NameValues">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.DirPeopleReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.AgentSearchData})">
-            <summary>Construct a new instance of the DirPeopleReplyEventArgs class</summary>
-            <param name="queryID">The ID of the query returned by the data server. 
-            This will correlate to the ID returned by the <see cref="!:StartPeopleSearch"/> method</param>
-            <param name="matchedPeople">A list of people data returned by the data server</param>
+        <member 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="P:OpenMetaverse.DirPeopleReplyEventArgs.QueryID">
-            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartPeopleSearch(System.String,System.Int32)"/></summary>
+        <member name="P:OpenMetaverse.KillObjectEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="P:OpenMetaverse.DirPeopleReplyEventArgs.MatchedPeople">
-            <summary>A list containing People data returned by the data server</summary>
+        <member name="P:OpenMetaverse.KillObjectEventArgs.ObjectLocalID">
+            <summary>The LocalID of the object</summary>
         </member>
-        <member name="T:OpenMetaverse.DirLandReplyEventArgs">
-            <summary>Contains the land sales data returned from the data server</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="M:OpenMetaverse.DirLandReplyEventArgs.#ctor(System.Collections.Generic.List{OpenMetaverse.DirectoryManager.DirectoryParcel})">
-            <summary>Construct a new instance of the DirLandReplyEventArgs class</summary>
-            <param name="dirParcels">A list of parcels for sale returned by the data server</param>
+        <member name="P:OpenMetaverse.KillObjectsEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="P:OpenMetaverse.DirLandReplyEventArgs.DirParcels">
-            <summary>A list containing land forsale data returned by the data server</summary>
+        <member name="P:OpenMetaverse.KillObjectsEventArgs.ObjectLocalIDs">
+            <summary>The LocalID of the object</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.TeleportFinishMessage">
+        <member name="T:OpenMetaverse.AvatarSitChangedEventArgs">
             <summary>
-            Sent to the client to indicate a teleport request has completed
+            Provides updates sit position data
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Interfaces.IMessage">
+        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.Avatar">
+            <summary></summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.SittingOn">
+            <summary></summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.OldSeat">
+            <summary></summary>
+        </member>
+        <member name="T:OpenMetaverse.PayPriceReplyEventArgs">
             <summary>
-            Interface requirements for Messaging system
+            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.AgentID">
-            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the agent</summary>
+        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.LocationID">
+        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.ObjectID">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.RegionHandle">
-            <summary>The simulators handle the agent teleported to</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.SeedCapability">
-            <summary>A Uri which contains a list of Capabilities the simulator supports</summary>
+        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.DefaultPrice">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.SimAccess">
-            <summary>Indicates the level of access required
-            to access the simulator, or the content rating, or the simulators 
-            map status</summary>
+        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.ButtonPrices">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.IP">
-            <summary>The IP Address of the simulator</summary>
+        <member name="P:OpenMetaverse.ObjectMediaEventArgs.Success">
+            <summary>
+            Indicates if the operation was successful
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Port">
-            <summary>The UDP Port the simulator will listen for UDP traffic on</summary>
+        <member name="P:OpenMetaverse.ObjectMediaEventArgs.Version">
+            <summary>
+            Media version string
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Flags">
-            <summary>Status flags indicating the state of the Agent upon arrival, Flying, etc.</summary>
+        <member name="P:OpenMetaverse.ObjectMediaEventArgs.FaceMedia">
+            <summary>
+            Array of media entries indexed by face number
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Serialize">
+        <member name="T:OpenMetaverse.PhysicsPropertiesEventArgs">
             <summary>
-            Serialize the object
+            Set when simulator sends us infomation on primitive's physical properties
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.PhysicsPropertiesEventArgs.Simulator">
+            <summary>Simulator where the message originated</summary>
+        </member>
+        <member name="F:OpenMetaverse.PhysicsPropertiesEventArgs.PhysicsProperties">
+            <summary>Updated physical properties</summary>
+        </member>
+        <member name="M:OpenMetaverse.PhysicsPropertiesEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Primitive.PhysicsProperties)">
             <summary>
-            Deserialize the message
+            Constructor
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <param name="sim">Simulator where the message originated</param>
+            <param name="props">Updated physical properties</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.EstablishAgentCommunicationMessage">
+        <member name="T:OpenMetaverse.InventoryException">
             <summary>
-            Sent to the viewer when a neighboring simulator is requesting the agent make a connection to it.
+            Exception class to identify inventory exceptions
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EstablishAgentCommunicationMessage.Serialize">
+        <member name="T:OpenMetaverse.Inventory">
             <summary>
-            Serialize the object
+            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>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EstablishAgentCommunicationMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectUpdated">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="M:OpenMetaverse.Inventory.OnInventoryObjectUpdated(OpenMetaverse.InventoryObjectUpdatedEventArgs)">
+            <summary>Raises the InventoryObjectUpdated Event</summary>
+             <param name="e">A InventoryObjectUpdatedEventArgs object containing
+             the data sent from the simulator</param>
+        </member>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectUpdatedLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectRemoved">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="M:OpenMetaverse.Inventory.OnInventoryObjectRemoved(OpenMetaverse.InventoryObjectRemovedEventArgs)">
+            <summary>Raises the InventoryObjectRemoved Event</summary>
+             <param name="e">A InventoryObjectRemovedEventArgs object containing
+             the data sent from the simulator</param>
+        </member>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectRemovedLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectAdded">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="M:OpenMetaverse.Inventory.OnInventoryObjectAdded(OpenMetaverse.InventoryObjectAddedEventArgs)">
+            <summary>Raises the InventoryObjectAdded Event</summary>
+             <param name="e">A InventoryObjectAddedEventArgs object containing
+             the data sent from the simulator</param>
+        </member>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectAddedLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="M:OpenMetaverse.Inventory.GetContents(OpenMetaverse.UUID)">
             <summary>
-            Deserialize the message
+            Returns the contents of the specified folder
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <param name="folder">A folder's UUID</param>
+            <returns>The contents of the folder corresponding to <code>folder</code></returns>
+            <exception cref="T:OpenMetaverse.InventoryException">When <code>folder</code> does not exist in the inventory</exception>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.CrossedRegionMessage.Serialize">
+        <member name="M:OpenMetaverse.Inventory.UpdateNodeFor(OpenMetaverse.InventoryBase)">
             <summary>
-            Serialize the object
+            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>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="item">The InventoryObject to store</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.CrossedRegionMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Inventory.RemoveNodeFor(OpenMetaverse.InventoryBase)">
             <summary>
-            Deserialize the message
+            Removes the InventoryObject and all related node data from Inventory.
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <param name="item">The InventoryObject to remove.</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EnableSimulatorMessage.Serialize">
+        <member name="M:OpenMetaverse.Inventory.Contains(OpenMetaverse.UUID)">
             <summary>
-            Serialize the object
+            Used to find out if Inventory contains the InventoryObject
+            specified by <code>uuid</code>.
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <param name="uuid">The UUID to check.</param>
+            <returns>true if inventory contains uuid, false otherwise</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EnableSimulatorMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Inventory.SaveToDisk(System.String)">
             <summary>
-            Deserialize the message
+            Saves the current inventory structure to a cache file
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <param name="filename">Name of the cache file to save to</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.TeleportFailedMessage">
+        <member name="M:OpenMetaverse.Inventory.RestoreFromDisk(System.String)">
             <summary>
-            A message sent to the client which indicates a teleport request has failed
-            and contains some information on why it failed
+            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="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.ExtraParams">
-            <summary></summary>
+        <member name="E:OpenMetaverse.Inventory.InventoryObjectUpdated">
+            <summary>Raised when the simulator sends us data containing
+            ...</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 name="E:OpenMetaverse.Inventory.InventoryObjectRemoved">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.AgentID">
-            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the Agent</summary>
+        <member name="E:OpenMetaverse.Inventory.InventoryObjectAdded">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.Reason">
-            <summary>A string human readable message containing the reason </summary>
-            <remarks>An example: Could not teleport closer to destination</remarks>
+        <member name="P:OpenMetaverse.Inventory.RootFolder">
+            <summary>
+            The root folder of this avatars inventory
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.TeleportFailedMessage.Serialize">
+        <member name="P:OpenMetaverse.Inventory.LibraryFolder">
             <summary>
-            Serialize the object
+            The default shared library folder
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.TeleportFailedMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="P:OpenMetaverse.Inventory.RootNode">
             <summary>
-            Deserialize the message
+            The root node of the avatars inventory
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandStatReplyMessage.Serialize">
+        <member name="P:OpenMetaverse.Inventory.LibraryRootNode">
             <summary>
-            Serialize the object
+            The root node of the default shared library
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandStatReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="P:OpenMetaverse.Inventory.Item(OpenMetaverse.UUID)">
             <summary>
-            Deserialize the message
+            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="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</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="T:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage">
+        <member name="T:OpenMetaverse.InternalDictionary`2">
             <summary>
-            Contains a list of prim owner information for a specific parcel in a simulator
+            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>
-            <remarks>
-            A Simulator will always return at least 1 entry
-            If agent does not have proper permission the OwnerID will be UUID.Zero
-            If agent does not have proper permission OR there are no primitives on parcel
-            the DataBlocksExtended map will not be sent from the simulator
-            </remarks>
+            <typeparam name="TKey">Key <see langword="Tkey"/></typeparam>
+            <typeparam name="TValue">Value <see langword="TValue"/></typeparam>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwnersBlock">
-            <summary>An Array of <see cref="T:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner"/> objects</summary>
+        <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.Messages.Linden.ParcelObjectOwnersReplyMessage.Serialize">
+        <member name="M:OpenMetaverse.InternalDictionary`2.#ctor">
             <summary>
-            Serialize the object
+            Initializes a new instance of the <seealso cref="T:InternalDictionary"/> Class 
+            with the specified key/value, has the default initial capacity.
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <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.Messages.Linden.ParcelObjectOwnersReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.InternalDictionary`2.#ctor(System.Collections.Generic.IDictionary{`0,`1})">
             <summary>
-            Deserialize the message
+            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="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <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="T:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner">
+        <member name="M:OpenMetaverse.InternalDictionary`2.#ctor(System.Int32)">
             <summary>
-            Prim ownership information for a specified owner on a single parcel
+            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.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.OwnerID">
-            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the prim owner, 
-            UUID.Zero if agent has no permission to view prim owner information</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.Count">
-            <summary>The total number of prims</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.IsGroupOwned">
-            <summary>True if the OwnerID is a <see cref="T:OpenMetaverse.Group"/></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.OnlineStatus">
-            <summary>True if the owner is online 
-            <remarks>This is no longer used by the LL Simulators</remarks></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.TimeStamp">
-            <summary>The date the most recent prim was rezzed</summary>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage">
+        <member name="M:OpenMetaverse.InternalDictionary`2.TryGetValue(`0,`1@)">
             <summary>
-            The details of a single parcel in a region, also contains some regionwide globals
+            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.Messages.Linden.ParcelPropertiesMessage.LocalID">
-            <summary>Simulator-local ID of this parcel</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AABBMax">
-            <summary>Maximum corner of the axis-aligned bounding box for this
-            parcel</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AABBMin">
-            <summary>Minimum corner of the axis-aligned bounding box for this
-            parcel</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Area">
-            <summary>Total parcel land area</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AuctionID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AuthBuyerID">
-            <summary>Key of authorized buyer</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Bitmap">
-            <summary>Bitmap describing land layout in 4x4m squares across the 
-            entire region</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Category">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ClaimDate">
-            <summary>Date land was claimed</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ClaimPrice">
-            <summary>Appears to always be zero</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Desc">
-            <summary>Parcel Description</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ParcelFlags">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.GroupID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.GroupPrims">
-            <summary>Total number of primitives owned by the parcel group on 
-            this parcel</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.IsGroupOwned">
-            <summary>Whether the land is deeded to a group or not</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.LandingType">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MaxPrims">
-            <summary>Maximum number of primitives this parcel supports</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaID">
-            <summary>The Asset UUID of the Texture which when applied to a 
-            primitive will display the media</summary>
+        <member name="M:OpenMetaverse.InternalDictionary`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 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.Messages.Linden.ParcelPropertiesMessage.MediaURL">
-            <summary>A URL which points to any Quicktime supported media type</summary>
+        <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="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaAutoScale">
-            <summary>A byte, if 0x1 viewer should auto scale media to fit object</summary>
+        <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="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MusicURL">
-            <summary>URL For Music Stream</summary>
+        <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="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Name">
-            <summary>Parcel Name</summary>
+        <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="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherCleanTime">
-            <summary>Autoreturn value in minutes for others' objects</summary>
+        <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>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherCount">
-            <summary></summary>
+        <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="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherPrims">
-            <summary>Total number of other primitives on this parcel</summary>
+        <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="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OwnerID">
-            <summary>UUID of the owner of this parcel</summary>
+        <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>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OwnerPrims">
-            <summary>Total number of primitives owned by the parcel owner on 
-            this parcel</summary>
+        <member name="M:OpenMetaverse.InternalDictionary`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="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ParcelPrimBonus">
-            <summary></summary>
+        <member name="P:OpenMetaverse.InternalDictionary`2.Count">
+            <summary>
+            Gets the number of Key/Value pairs contained in the <seealso cref="T:InternalDictionary"/>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PassHours">
-            <summary>How long is pass valid for</summary>
+        <member name="P:OpenMetaverse.InternalDictionary`2.Item(`0)">
+            <summary>
+            Indexer for the dictionary
+            </summary>
+            <param name="key">The key</param>
+            <returns>The value</returns>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PassPrice">
-            <summary>Price for a temporary pass</summary>
+        <member name="T:OpenMetaverse.Assets.ArchiveConstants">
+            <summary>
+            Constants for the archiving module
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PublicCount">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.CONTROL_FILE_PATH">
+            <summary>
+            The location of the archive control file
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Privacy">
-            <summary>Disallows people outside the parcel from being able to see in</summary>
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSETS_PATH">
+            <summary>
+            Path for the assets held in an archive
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyAnonymous">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.OBJECTS_PATH">
+            <summary>
+            Path for the prims file
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyIdentified">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.TERRAINS_PATH">
+            <summary>
+            Path for terrains.  Technically these may be assets, but I think it's quite nice to split them out.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyTransacted">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.SETTINGS_PATH">
+            <summary>
+            Path for region settings.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyAgeUnverified">
-            <summary>True if the region denies access to age unverified users</summary>
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSET_EXTENSION_SEPARATOR">
+            <summary>
+            The character the separates the uuid from extension information in an archived asset filename
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionPushOverride">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSET_TYPE_TO_EXTENSION">
+            <summary>
+            Extensions used for asset types in the archive
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RentPrice">
-            <summary>This field is no longer used</summary>
+        <member name="F:OpenMetaverse.TerrainPatch.X">
+            <summary>X position of this patch</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RequestResult">
-            The result of a request for parcel properties
+        <member name="F:OpenMetaverse.TerrainPatch.Y">
+            <summary>Y position of this patch</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SalePrice">
-            <summary>Sale price of the parcel, only useful if ForSale is set</summary>
-            <remarks>The SalePrice will remain the same after an ownership
-            transfer (sale), so it can be used to see the purchase price after
-            a sale if the new owner has not changed it</remarks>
+        <member name="F:OpenMetaverse.TerrainPatch.Data">
+            <summary>A 16x16 array of floats holding decompressed layer data</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SelectedPrims">
+        <member name="M:OpenMetaverse.TerrainCompressor.CreateLandPacket(System.Single[],System.Int32[])">
             <summary>
-            Number of primitives your avatar is currently
-            selecting and sitting on in this parcel
+            Creates a LayerData packet for compressed land data given a full
+            simulator heightmap and an array of indices of patches to compress
             </summary>
+            <param name="heightmap">A 256 * 256 array of floating point values
+            specifying the height at each meter in the simulator</param>
+            <param name="patches">Array of indexes in the 16x16 grid of patches
+            for this simulator. For example if 1 and 17 are specified, patches
+            x=1,y=0 and x=1,y=1 are sent</param>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SelfCount">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SequenceID">
+        <member name="M:OpenMetaverse.TerrainCompressor.CreatePatchFromHeightmap(OpenMetaverse.BitPack,System.Single[],System.Int32,System.Int32)">
             <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. 
+            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="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SimWideMaxPrims">
-            <summary>Maximum primitives across the entire simulator</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SimWideTotalPrims">
-            <summary>Total primitives across the entire simulator</summary>
+        <member name="T:OpenMetaverse.Sounds">
+            <summary>
+            pre-defined built in sounds
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SnapSelection">
+        <member name="F:OpenMetaverse.Sounds.BELL_TING">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SnapshotID">
-            <summary>Key of parcel snapshot</summary>
+        <member name="F:OpenMetaverse.Sounds.CLICK">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Status">
-            <summary>Parcel ownership status</summary>
+        <member name="F:OpenMetaverse.Sounds.HEALTH_REDUCTION_FEMALE">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.TotalPrims">
-            <summary>Total number of primitives on this parcel</summary>
+        <member name="F:OpenMetaverse.Sounds.HEALTH_REDUCTION_MALE">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.UserLocation">
+        <member name="F:OpenMetaverse.Sounds.IM_START">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.UserLookAt">
+        <member name="F:OpenMetaverse.Sounds.INSTANT_MESSAGE_NOTIFICATION">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaDesc">
-            <summary>A description of the media</summary>
+        <member name="F:OpenMetaverse.Sounds.INVALID_OPERATION">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaHeight">
-            <summary>An Integer which represents the height of the media</summary>
+        <member name="F:OpenMetaverse.Sounds.KEYBOARD_LOOP">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaWidth">
-            <summary>An integer which represents the width of the media</summary>
+        <member name="F:OpenMetaverse.Sounds.MONEY_REDUCTION_COINS">
+            <summary>coins</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaLoop">
-            <summary>A boolean, if true the viewer should loop the media</summary>
+        <member name="F:OpenMetaverse.Sounds.MONEY_INCREASE_CASH_REGISTER_BELL">
+            <summary>cash register bell</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaType">
-            <summary>A string which contains the mime type of the media</summary>
+        <member name="F:OpenMetaverse.Sounds.NULL_KEYSTROKE">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ObscureMedia">
-            <summary>true to obscure (hide) media url</summary>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ObscureMusic">
-            <summary>true to obscure (hide) music url</summary>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_RUBBER">
+            <summary>rubber</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_PLASTIC">
+            <summary>plastic</summary>
         </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>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_FLESH">
+            <summary>flesh</summary>
         </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 name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_WOOD_SPLINTERING">
+            <summary>wood splintering?</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.AuthBuyerID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the agent authorized to purchase this
-            parcel of land or a NULL <seealso cref="T:OpenMetaverse.UUID"/> if the sale is authorized to anyone</summary>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_GLASS_BREAK">
+            <summary>glass break</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaAutoScale">
-            <summary>true to enable auto scaling of the parcel media</summary>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_METAL_CLUNK">
+            <summary>metal clunk</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Category">
-            <summary>The category of this parcel used when search is enabled to restrict
-            search results</summary>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_CREATE_WHOOSH">
+            <summary>whoosh</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Desc">
-            <summary>A string containing the description to set</summary>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_DELETE_SHAKE">
+            <summary>shake</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.GroupID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the <seealso cref="T:OpenMetaverse.Group"/> which allows for additional
-            powers and restrictions.</summary>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_REZ">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Landing">
-            <summary>The <seealso cref="T:OpenMetaverse.LandingType"/> which specifies how avatars which teleport
-            to this parcel are handled</summary>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_APPEAR_DING">
+            <summary>ding</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.LocalID">
-            <summary>The LocalID of the parcel to update settings on</summary>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaDesc">
-            <summary>A string containing the description of the media which can be played
-            to visitors</summary>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT1">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaHeight">
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT2">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaLoop">
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT3">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaID">
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT4">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaType">
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT5">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaURL">
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT6">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaWidth">
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT7">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MusicURL">
+        <member name="F:OpenMetaverse.Sounds.SNAPSHOT">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Name">
+        <member name="F:OpenMetaverse.Sounds.TELEPORT_TEXTURE_APPLY">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ObscureMedia">
+        <member name="F:OpenMetaverse.Sounds.THUNDER">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ObscureMusic">
+        <member name="F:OpenMetaverse.Sounds.WINDOW_CLOSE">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ParcelFlags">
+        <member name="F:OpenMetaverse.Sounds.WINDOW_OPEN">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.PassHours">
+        <member name="F:OpenMetaverse.Sounds.ZIPPER">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.PassPrice">
+        <member name="M:OpenMetaverse.Sounds.ToDictionary">
+            <summary>
+            A dictionary containing all pre-defined sounds
+            </summary>
+            <returns>A dictionary containing the pre-defined sounds, 
+            where the key is the sounds ID, and the value is a string
+            containing a name to identify the purpose of the sound</returns>
+        </member>
+        <member name="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.Messages.Linden.ParcelPropertiesUpdateMessage.Privacy">
+        <member name="F:OpenMetaverse.PermissionWho.Owner">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.SalePrice">
+        <member name="F:OpenMetaverse.PermissionWho.Group">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.SnapshotID">
+        <member name="F:OpenMetaverse.PermissionWho.Everyone">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.UserLocation">
+        <member name="F:OpenMetaverse.PermissionWho.NextOwner">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.UserLookAt">
+        <member name="F:OpenMetaverse.PermissionWho.All">
             <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="T:OpenMetaverse.Permissions">
             <summary>
-            Deserialize the message
+            
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Serialize">
+        <member name="M:OpenMetaverse.WrappedObject`1.Dispose">
             <summary>
-            Serialize the object
+            Checks the instance back into the object pool
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestBlock">
-            <summary>Base class used for the RemoteParcelRequest message</summary>
+        <member name="P:OpenMetaverse.WrappedObject`1.Instance">
+            <summary>
+            Returns an instance of the class that has been checked out of the Object Pool.
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest">
+        <member name="T:OpenMetaverse.Messages.Linden.TeleportFinishMessage">
             <summary>
-            A message sent from the viewer to the simulator to request information
-            on a remote parcel
+            Sent to the client to indicate a teleport request has completed
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.Location">
-            <summary>Local sim position of the parcel we are looking up</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.AgentID">
+            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the agent</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.RegionHandle">
-            <summary>Region handle of the parcel we are looking up</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.LocationID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.RegionID">
-            <summary>Region <see cref="T:OpenMetaverse.UUID"/> of the parcel we are looking up</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.RegionHandle">
+            <summary>The simulators handle the agent teleported to</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.Serialize">
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.SeedCapability">
+            <summary>A Uri which contains a list of Capabilities the simulator supports</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.SimAccess">
+            <summary>Indicates the level of access required
+            to access the simulator, or the content rating, or the simulators 
+            map status</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.IP">
+            <summary>The IP Address of the simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Port">
+            <summary>The UDP Port the simulator will listen for UDP traffic on</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Flags">
+            <summary>Status flags indicating the state of the Agent upon arrival, Flying, etc.</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
             <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
             Deserialize the message
             </summary>
             <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply">
+        <member name="T:OpenMetaverse.Messages.Linden.EstablishAgentCommunicationMessage">
             <summary>
-            A message sent from the simulator to the viewer in response to a <see cref="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest"/> 
-            which will contain parcel information
+            Sent to the viewer when a neighboring simulator is requesting the agent make a connection to it.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply.ParcelID">
-            <summary>The grid-wide unique parcel ID</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.EstablishAgentCommunicationMessage.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.RemoteParcelRequestReply.Serialize">
+        <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>
+        </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>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <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>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage">
+        <member name="M:OpenMetaverse.Messages.Linden.EnableSimulatorMessage.Serialize">
             <summary>
-            A message containing a request for a remote parcel from a viewer, or a response
-            from the simulator to that request
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage.Request">
-            <summary>The request or response details block</summary>
+        <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>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage.Serialize">
+        <member name="T:OpenMetaverse.Messages.Linden.TeleportFailedMessage">
+            <summary>
+            A message sent to the client which indicates a teleport request has failed
+            and contains some information on why it failed
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.ExtraParams">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.MessageKey">
+            <summary>A string key of the reason the teleport failed e.g. CouldntTPCloser
+            Which could be used to look up a value in a dictionary or enum</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.AgentID">
+            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the Agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.Reason">
+            <summary>A string human readable message containing the reason </summary>
+            <remarks>An example: Could not teleport closer to destination</remarks>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.TeleportFailedMessage.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.RemoteParcelRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <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>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryMessage.Serialize">
+        <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>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <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>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryVariablePriceMessage.Serialize">
+        <member name="T:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage">
+            <summary>
+            Contains a list of prim owner information for a specific parcel in a simulator
+            </summary>
+            <remarks>
+            A Simulator will always return at least 1 entry
+            If agent does not have proper permission the OwnerID will be UUID.Zero
+            If agent does not have proper permission OR there are no primitives on parcel
+            the DataBlocksExtended map will not be sent from the simulator
+            </remarks>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwnersBlock">
+            <summary>An Array of <see cref="T:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner"/> objects</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
             <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryVariablePriceMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="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.AgentGroupDataUpdateMessage">
+        <member name="T:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner">
             <summary>
-            A message sent from the simulator to an agent which contains
-            the groups the agent is in
+            Prim ownership information for a specified owner on a single parcel
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.OwnerID">
+            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the prim owner, 
+            UUID.Zero if agent has no permission to view prim owner information</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.Count">
+            <summary>The total number of prims</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.IsGroupOwned">
+            <summary>True if the OwnerID is a <see cref="T:OpenMetaverse.Group"/></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.OnlineStatus">
+            <summary>True if the owner is online 
+            <remarks>This is no longer used by the LL Simulators</remarks></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.TimeStamp">
+            <summary>The date the most recent prim was rezzed</summary>
+        </member>
+        <member name="T:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage">
+            <summary>
+            The details of a single parcel in a region, also contains some regionwide globals
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.AgentID">
-            <summary>The Agent receiving the message</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.LocalID">
+            <summary>Simulator-local ID of this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AABBMax">
+            <summary>Maximum corner of the axis-aligned bounding box for this
+            parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AABBMin">
+            <summary>Minimum corner of the axis-aligned bounding box for this
+            parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Area">
+            <summary>Total parcel land area</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AuctionID">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AuthBuyerID">
+            <summary>Key of authorized buyer</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Bitmap">
+            <summary>Bitmap describing land layout in 4x4m squares across the 
+            entire region</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Category">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ClaimDate">
+            <summary>Date land was claimed</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ClaimPrice">
+            <summary>Appears to always be zero</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.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 name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Desc">
+            <summary>Parcel Description</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 name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ParcelFlags">
+            <summary></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 name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.GroupID">
+            <summary></summary>
         </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 name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.GroupPrims">
+            <summary>Total number of primitives owned by the parcel group on 
+            this parcel</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData">
-            <summary>Group Details specific to the agent</summary>
+        <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.AgentGroupDataUpdateMessage.GroupData.AcceptNotices">
-            <summary>true of the agent accepts group notices</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.LandingType">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.Contribution">
-            <summary>The agents tier contribution to the group</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MaxPrims">
+            <summary>Maximum number of primitives this parcel supports</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupID">
-            <summary>The Groups <seealso cref="T:OpenMetaverse.UUID"/></summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaID">
+            <summary>The Asset UUID of the Texture which when applied to a 
+            primitive will display the media</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupInsigniaID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the groups insignia</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaURL">
+            <summary>A URL which points to any Quicktime supported media type</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupName">
-            <summary>The name of the group</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaAutoScale">
+            <summary>A byte, if 0x1 viewer should auto scale media to fit object</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupPowers">
-            <summary>The aggregate permissions the agent has in the group for all roles the agent
-            is assigned</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MusicURL">
+            <summary>URL For Music Stream</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.NewGroupData">
-            <summary>An optional block containing additional agent specific information</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Name">
+            <summary>Parcel Name</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.NewGroupData.ListInProfile">
-            <summary>true of the agent allows this group to be
-            listed in their profile</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherCleanTime">
+            <summary>Autoreturn value in minutes for others' objects</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage">
-            <summary>
-            A message sent from the viewer to the simulator which 
-            specifies the language and permissions for others to detect
-            the language specified
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherCount">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.Language">
-            <summary>A string containng the default language 
-            to use for the agent</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherPrims">
+            <summary>Total number of other primitives on this parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.LanguagePublic">
-            <summary>true of others are allowed to
-            know the language setting</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OwnerID">
+            <summary>UUID of the owner of this parcel</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OwnerPrims">
+            <summary>Total number of primitives owned by the parcel owner on 
+            this parcel</summary>
         </member>
-        <member name="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>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ParcelPrimBonus">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.AgentDropGroupMessage">
-            <summary>
-            An EventQueue message sent from the simulator to an agent when the agent
-            leaves a group
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PassHours">
+            <summary>How long is pass valid for</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentDataBlock">
-            <summary>
-            An Array containing the AgentID and GroupID
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PassPrice">
+            <summary>Price for a temporary pass</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PublicCount">
+            <summary></summary>
         </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>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Privacy">
+            <summary>Disallows people outside the parcel from being able to see in</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentData">
-            <summary>An object containing the Agents UUID, and the Groups UUID</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyAnonymous">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentData.AgentID">
-            <summary>The ID of the Agent leaving the group</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyIdentified">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentData.GroupID">
-            <summary>The GroupID the Agent is leaving</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyTransacted">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.AssetUploaderBlock">
-            <summary>Base class for Asset uploads/results via Capabilities</summary>
+        <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.AssetUploaderBlock.State">
-            <summary>
-            The request state
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionPushOverride">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AssetUploaderBlock.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RentPrice">
+            <summary>This field is no longer used</summary>
         </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>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RequestResult">
+            The result of a request for parcel properties
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestUpload">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SalePrice">
+            <summary>Sale price of the parcel, only useful if ForSale is set</summary>
+            <remarks>The SalePrice will remain the same after an ownership
+            transfer (sale), so it can be used to see the purchase price after
+            a sale if the new owner has not changed it</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SelectedPrims">
             <summary>
-            A message sent from the viewer to the simulator to request a temporary upload capability
-            which allows an asset to be uploaded
+            Number of primitives your avatar is currently
+            selecting and sitting on in this parcel
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestUpload.Url">
-            <summary>The Capability URL sent by the simulator to upload the baked texture to</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SelfCount">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestComplete">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SequenceID">
             <summary>
-            A message sent from the simulator that will inform the agent the upload is complete, 
-            and the UUID of the uploaded asset
+            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.UploaderRequestComplete.AssetID">
-            <summary>The uploaded texture asset ID</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SimWideMaxPrims">
+            <summary>Maximum primitives across the entire simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage">
-            <summary>
-            A message sent from the viewer to the simulator to request a temporary
-            capability URI which is used to upload an agents baked appearance textures
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SimWideTotalPrims">
+            <summary>Total primitives across the entire simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage.Request">
-            <summary>Object containing request or response</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SnapSelection">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SnapshotID">
+            <summary>Key of parcel snapshot</summary>
         </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>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Status">
+            <summary>Parcel ownership status</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage">
-            <summary>
-            A message sent from the simulator which indicates the minimum version required for 
-            using voice chat
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.TotalPrims">
+            <summary>Total number of primitives on this parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.MajorVersion">
-            <summary>Major Version Required</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.UserLocation">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.MinorVersion">
-            <summary>Minor version required</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.UserLookAt">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.RegionName">
-            <summary>The name of the region sending the version requrements</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaDesc">
+            <summary>A description of the media</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaHeight">
+            <summary>An Integer which represents the height of the media</summary>
         </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>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaWidth">
+            <summary>An integer which represents the width of the media</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage">
-            <summary>
-            A message sent from the simulator to the viewer containing the 
-            voice server URI
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaLoop">
+            <summary>A boolean, if true the viewer should loop the media</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.ParcelID">
-            <summary>The Parcel ID which the voice server URI applies</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaType">
+            <summary>A string which contains the mime type of the media</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.RegionName">
-            <summary>The name of the region</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ObscureMedia">
+            <summary>true to obscure (hide) media url</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.SipChannelUri">
-            <summary>A uri containing the server/channel information
-            which the viewer can utilize to participate in voice conversations</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ObscureMusic">
+            <summary>true to obscure (hide) music url</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.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.ParcelVoiceInfoRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <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>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage">
-            <summary>
-            
-            </summary>
+        <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.ProvisionVoiceAccountRequestMessage.Password">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.AuthBuyerID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the agent authorized to purchase this
+            parcel of land or a NULL <seealso cref="T:OpenMetaverse.UUID"/> if the sale is authorized to anyone</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaAutoScale">
+            <summary>true to enable auto scaling of the parcel media</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Category">
+            <summary>The category of this parcel used when search is enabled to restrict
+            search results</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Desc">
+            <summary>A string containing the description to set</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.GroupID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the <seealso cref="T:OpenMetaverse.Group"/> which allows for additional
+            powers and restrictions.</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Landing">
+            <summary>The <seealso cref="T:OpenMetaverse.LandingType"/> which specifies how avatars which teleport
+            to this parcel are handled</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.LocalID">
+            <summary>The LocalID of the parcel to update settings on</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaDesc">
+            <summary>A string containing the description of the media which can be played
+            to visitors</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaHeight">
             <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Username">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaLoop">
             <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>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaID">
+            <summary></summary>
         </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>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaType">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage">
-            <summary>
-            A message sent by the viewer to the simulator to request a temporary
-            capability for a script contained with in a Tasks inventory to be updated
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaURL">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage.Request">
-            <summary>Object containing request or response</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaWidth">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MusicURL">
+            <summary></summary>
         </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>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Name">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage">
-            <summary>
-            A message sent from the simulator to the viewer to indicate
-            a Tasks scripts status.
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ObscureMedia">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.ItemID">
-            <summary>The Asset ID of the script</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ObscureMusic">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Mono">
-            <summary>True of the script is compiled/ran using the mono interpreter, false indicates it 
-            uses the older less efficient lsl2 interprter</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ParcelFlags">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.ObjectID">
-            <summary>The Task containing the scripts <seealso cref="T:OpenMetaverse.UUID"/></summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.PassHours">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Running">
-            <summary>true of the script is in a running state</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.PassPrice">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Privacy">
+            <summary></summary>
         </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>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.SalePrice">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage">
-            <summary>
-            A message containing the request/response used for updating a gesture
-            contained with an agents inventory
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.SnapshotID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage.Request">
-            <summary>Object containing request or response</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.UserLocation">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.UserLookAt">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <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>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage">
-            <summary>
-            A message request/response which is used to update a notecard contained within
-            a tasks inventory
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.TaskID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the Task containing the notecard asset to update</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.ItemID">
-            <summary>The notecard assets <seealso cref="T:OpenMetaverse.UUID"/> contained in the tasks inventory</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.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.UpdateNotecardTaskInventoryMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestBlock">
+            <summary>Base class used for the RemoteParcelRequest message</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage">
+        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest">
             <summary>
-            A reusable class containing a message sent from the viewer to the simulator to request a temporary uploader capability
-            which is used to update an asset in an agents inventory
+            A message sent from the viewer to the simulator to request information
+            on a remote parcel
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage.ItemID">
-            <summary>
-            The Notecard AssetID to replace
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.Location">
+            <summary>Local sim position of the parcel we are looking up</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage.Serialize">
+        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.RegionHandle">
+            <summary>Region handle of the parcel we are looking up</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.RegionID">
+            <summary>Region <see cref="T:OpenMetaverse.UUID"/> of the parcel we are looking up</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.Serialize">
             <summary>
             Serialize the object
             </summary>
             <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="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>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage">
-            <summary>
-            A message containing the request/response used for updating a notecard
-            contained with an agents inventory
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage.Request">
-            <summary>Object containing request or response</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage.Serialize">
+        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply">
             <summary>
-            Serialize the object
+            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>
-            <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>
+        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply.ParcelID">
+            <summary>The grid-wide unique parcel ID</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.CopyInventoryFromNotecardMessage.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply.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.CopyInventoryFromNotecardMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <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>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UploaderScriptRequestError">
-            <summary>
-            A message sent from the simulator to the viewer which indicates
-            an error occurred while attempting to update a script in an agents or tasks 
-            inventory
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploaderScriptRequestError.Compiled">
-            <summary>true of the script was successfully compiled by the simulator</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploaderScriptRequestError.Error">
-            <summary>A string containing the error which occured while trying
-            to update the script</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploaderScriptRequestError.AssetID">
-            <summary>A new AssetID assigned to the script</summary>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage">
+        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage">
             <summary>
-            A message sent from the viewer to the simulator
-            requesting the update of an existing script contained
-            within a tasks inventory
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.ScriptRunning">
-            <summary>if true, set the script mode to running</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.ItemID">
-            <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 
-            specifies the script is compiled and ran on the mono runtime, or the older
-            lsl runtime</summary>
+            A message containing a request for a remote parcel from a viewer, or a response
+            from the simulator to that request
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.TaskID">
-            <summary>The tasks <see cref="T:OpenMetaverse.UUID"/> which contains the script to update</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage.Request">
+            <summary>The request or response details block</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage.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.UpdateScriptTaskUpdateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <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>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage">
+        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryMessage.Serialize">
             <summary>
-            A message containing either the request or response used in updating a script inside
-            a tasks inventory
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage.Request">
-            <summary>Object containing request or response</summary>
+        <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>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryVariablePriceMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
             <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryVariablePriceMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
             Deserialize the message
             </summary>
             <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestScriptComplete">
+        <member name="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage">
             <summary>
-            Response from the simulator to notify the viewer the upload is completed, and
-            the UUID of the script asset and its compiled status
+            A message sent from the simulator to an agent which contains
+            the groups the agent is in
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestScriptComplete.AssetID">
-            <summary>The uploaded texture asset ID</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestScriptComplete.Compiled">
-            <summary>true of the script was compiled successfully</summary>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage">
-            <summary>
-            A message sent from a viewer to the simulator requesting a temporary uploader capability
-            used to update a script contained in an agents inventory
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.AgentID">
+            <summary>The Agent receiving the message</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage.ItemID">
-            <summary>The existing asset if of the script in the agents inventory to replace</summary>
+        <member name="F:OpenMetaverse.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.UpdateScriptAgentRequestMessage.Target">
-            <summary>The language of the script</summary>
-            <remarks>Defaults to lsl version 2, "mono" might be another possible option</remarks>
+        <member name="F:OpenMetaverse.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.UpdateScriptAgentRequestMessage.Serialize">
+        <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.UpdateScriptAgentRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <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.UpdateScriptAgentMessage">
+        <member name="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData">
+            <summary>Group Details specific to the agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.AcceptNotices">
+            <summary>true of the agent accepts group notices</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.Contribution">
+            <summary>The agents tier contribution to the group</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupID">
+            <summary>The Groups <seealso cref="T:OpenMetaverse.UUID"/></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupInsigniaID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the groups insignia</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupName">
+            <summary>The name of the group</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupPowers">
+            <summary>The aggregate permissions the agent has in the group for all roles the agent
+            is assigned</summary>
+        </member>
+        <member name="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.NewGroupData">
+            <summary>An optional block containing additional agent specific information</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.NewGroupData.ListInProfile">
+            <summary>true of the agent allows this group to be
+            listed in their profile</summary>
+        </member>
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage">
             <summary>
-            A message containing either the request or response used in updating a script inside
-            an agents inventory
+            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.UpdateScriptAgentMessage.Request">
-            <summary>Object containing request or response</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.Language">
+            <summary>A string containng the default language 
+            to use for the agent</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage.Serialize">
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.LanguagePublic">
+            <summary>true of others are allowed to
+            know the language setting</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
             <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)">
+        <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>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.SendPostcardMessage.Serialize">
+        <member name="T:OpenMetaverse.Messages.Linden.AgentDropGroupMessage">
+            <summary>
+            An EventQueue message sent from the simulator to an agent when the agent
+            leaves a group
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentDataBlock">
+            <summary>
+            An Array containing the AgentID and GroupID
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.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.SendPostcardMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <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>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.MapLayerMessageBase">
-            <summary>Base class for Map Layers via Capabilities</summary>
+        <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.MapLayerMessageBase.Flags">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentData.AgentID">
+            <summary>The ID of the Agent leaving the group</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessageBase.Serialize">
+        <member name="F:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentData.GroupID">
+            <summary>The GroupID the Agent is leaving</summary>
+        </member>
+        <member name="T:OpenMetaverse.Messages.Linden.AssetUploaderBlock">
+            <summary>Base class for Asset uploads/results via Capabilities</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AssetUploaderBlock.State">
+            <summary>
+            The request state
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.AssetUploaderBlock.Serialize">
             <summary>
             Serialize the object
             </summary>
             <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessageBase.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.AssetUploaderBlock.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
             Deserialize the message
             </summary>
             <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.MapLayerRequestVariant">
+        <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestUpload">
             <summary>
-            Sent by an agent to the capabilities server to request map layers
+            A message sent from the viewer to the simulator to request a temporary upload capability
+            which allows an asset to be uploaded
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.MapLayerReplyVariant">
+        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestUpload.Url">
+            <summary>The Capability URL sent by the simulator to upload the baked texture to</summary>
+        </member>
+        <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestComplete">
             <summary>
-            A message sent from the simulator to the viewer which contains an array of map images and their grid coordinates
+            A message sent from the simulator that will inform the agent the upload is complete, 
+            and the UUID of the uploaded asset
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerDataBlocks">
-            <summary>An array containing LayerData items</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestComplete.AssetID">
+            <summary>The uploaded texture asset ID</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.Serialize">
+        <member name="T:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage">
+            <summary>
+            A message sent from the viewer to the simulator to request a temporary
+            capability URI which is used to upload an agents baked appearance textures
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage.Request">
+            <summary>Object containing request or response</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage.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)">
+        <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>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData">
+        <member name="T:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage">
             <summary>
-            An object containing map location details
+            A message sent from the simulator which indicates the minimum version required for 
+            using voice chat
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.ImageID">
-            <summary>The Asset ID of the regions tile overlay</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Bottom">
-            <summary>The grid location of the southern border of the map tile</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Left">
-            <summary>The grid location of the western border of the map tile</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Right">
-            <summary>The grid location of the eastern border of the map tile</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.MajorVersion">
+            <summary>Major Version Required</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Top">
-            <summary>The grid location of the northern border of the map tile</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.MinorVersion">
+            <summary>Minor version required</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerMessage.Request">
-            <summary>Object containing request or response</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.RegionName">
+            <summary>The name of the region sending the version requrements</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessage.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.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.MapLayerMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <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>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ProductInfoRequestMessage">
+        <member name="T:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage">
             <summary>
-            New as of 1.23 RC1, no details yet.
+            A message sent from the simulator to the viewer containing the 
+            voice server URI
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ProductInfoRequestMessage.Serialize">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.ParcelID">
+            <summary>The Parcel ID which the voice server URI applies</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.RegionName">
+            <summary>The name of the region</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.SipChannelUri">
+            <summary>A uri containing the server/channel information
+            which the viewer can utilize to participate in voice conversations</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
             <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ProductInfoRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="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>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.SearchStatRequestMessage.Serialize">
+        <member name="T:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Password">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Username">
+            <summary></summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
             <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.SearchStatRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="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>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestBlock.Method">
-            <summary>A string containing the method used</summary>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference">
+        <member name="T:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage">
             <summary>
-            A request sent from an agent to the Simulator to begin a new conference.
-            Contains a list of Agents which will be included in the conference
-            </summary>    
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.AgentsBlock">
-            <summary>An array containing the <see cref="T:OpenMetaverse.UUID"/> of the agents invited to this conference</summary>
+            A message sent by the viewer to the simulator to request a temporary
+            capability for a script contained with in a Tasks inventory to be updated
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.SessionID">
-            <summary>The conferences Session ID</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage.Request">
+            <summary>Object containing request or response</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage.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.ChatSessionRequestStartConference.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
             Deserialize the message
             </summary>
             <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate">
+        <member name="T:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage">
             <summary>
-            A moderation request sent from a conference moderator
-            Contains an agent and an optional action to take
-            </summary>    
+            A message sent from the simulator to the viewer to indicate
+            a Tasks scripts status.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.SessionID">
-            <summary>The Session ID</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.ItemID">
+            <summary>The Asset ID of the script</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.AgentID">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Mono">
+            <summary>True of the script is compiled/ran using the mono interpreter, false indicates it 
+            uses the older less efficient lsl2 interprter</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.RequestKey">
-            <summary>A list containing Key/Value pairs, known valid values:
-            key: text value: true/false - allow/disallow specified agents ability to use text in session
-            key: voice value: true/false - allow/disallow specified agents ability to use voice in session
-            </summary>
-            <remarks>"text" or "voice"</remarks>
+        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.ObjectID">
+            <summary>The Task containing the scripts <seealso cref="T:OpenMetaverse.UUID"/></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.RequestValue">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Running">
+            <summary>true of the script is in a running state</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
             <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
             Deserialize the message
             </summary>
             <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation">
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage">
             <summary>
-            A message sent from the agent to the simulator which tells the 
-            simulator we've accepted a conference invitation
+            A message containing the request/response used for updating a gesture
+            contained with an agents inventory
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation.SessionID">
-            <summary>The conference SessionID</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage.Request">
+            <summary>Object containing request or response</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
             <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
             Deserialize the message
             </summary>
             <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMessage.Serialize">
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage">
+            <summary>
+            A message request/response which is used to update a notecard contained within
+            a tasks inventory
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.TaskID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the Task containing the notecard asset to update</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.ItemID">
+            <summary>The notecard assets <seealso cref="T:OpenMetaverse.UUID"/> contained in the tasks inventory</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.Serialize">
             <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.ChatSessionRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
             Deserialize the message
             </summary>
             <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterboxSessionEventReplyMessage.Serialize">
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage">
             <summary>
-            Serialize the object
+            A reusable class containing a message sent from the viewer to the simulator to request a temporary uploader capability
+            which is used to update an asset in an agents inventory
             </summary>
-            <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)">
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage.ItemID">
             <summary>
-            Deserialize the message
+            The Notecard AssetID to replace
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionStartReplyMessage.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage.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.ChatterBoxSessionStartReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <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>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.FromAgentID">
-            <summary>Key of sender</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.FromAgentName">
-            <summary>Name of sender</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.ToAgentID">
-            <summary>Key of destination avatar</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.ParentEstateID">
-            <summary>ID of originating estate</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.RegionID">
-            <summary>Key of originating region</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Position">
-            <summary>Coordinates in originating region</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Dialog">
-            <summary>Instant message type</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.GroupIM">
-            <summary>Group IM session toggle</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.IMSessionID">
-            <summary>Key of IM session, for Group Messages, the groups UUID</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Timestamp">
-            <summary>Timestamp of the instant message</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Message">
-            <summary>Instant message text</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Offline">
-            <summary>Whether this message is held for offline avatars</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.BinaryBucket">
-            <summary>Context specific packed data</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage">
+            <summary>
+            A message containing the request/response used for updating a notecard
+            contained with an agents inventory
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Voice">
-            <summary>Is this invitation for voice group/conference chat</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage.Request">
+            <summary>Object containing request or response</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
             <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <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>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ChatterBoxSessionAgentListUpdatesMessage">
-            <summary>
-            Sent from the simulator to the viewer.
-            
-            When an agent initially joins a session the AgentUpdatesBlock object will contain a list of session members including
-            a boolean indicating they can use voice chat in this session, a boolean indicating they are allowed to moderate 
-            this session, and lastly a string which indicates another agent is entering the session with the Transition set to "ENTER"
-            
-            During the session lifetime updates on individuals are sent. During the update the booleans sent during the initial join are
-            excluded with the exception of the Transition field. This indicates a new user entering or exiting the session with
-            the string "ENTER" or "LEAVE" respectively.
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionAgentListUpdatesMessage.Serialize">
+        <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>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionAgentListUpdatesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.CopyInventoryFromNotecardMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
             Deserialize the message
             </summary>
             <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage">
+        <member name="T:OpenMetaverse.Messages.Linden.UploaderScriptRequestError">
             <summary>
-            An EventQueue message sent when the agent is forcibly removed from a chatterbox session
+            A message sent from the simulator to the viewer which indicates
+            an error occurred while attempting to update a script in an agents or tasks 
+            inventory
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.Reason">
-            <summary>
-            A string containing the reason the agent was removed
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UploaderScriptRequestError.Compiled">
+            <summary>true of the script was successfully compiled by the simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.SessionID">
+        <member name="F:OpenMetaverse.Messages.Linden.UploaderScriptRequestError.Error">
+            <summary>A string containing the error which occured while trying
+            to update the script</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.UploaderScriptRequestError.AssetID">
+            <summary>A new AssetID assigned to the script</summary>
+        </member>
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage">
             <summary>
-            The ChatterBoxSession's SessionID
+            A message sent from the viewer to the simulator
+            requesting the update of an existing script contained
+            within a tasks inventory
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.Serialize">
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.ScriptRunning">
+            <summary>if true, set the script mode to running</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.ItemID">
+            <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 
+            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>
+        </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>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
             Deserialize the message
             </summary>
             <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EventQueueAck.Serialize">
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage">
             <summary>
-            Serialize the object
+            A message containing either the request or response used in updating a script inside
+            a tasks inventory
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EventQueueAck.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage.Request">
+            <summary>Object containing request or response</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EventQueueEvent.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
             <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EventQueueEvent.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
             Deserialize the message
             </summary>
             <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EventQueueGetMessage.Serialize">
+        <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestScriptComplete">
             <summary>
-            Serialize the object
+            Response from the simulator to notify the viewer the upload is completed, and
+            the UUID of the script asset and its compiled status
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EventQueueGetMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestScriptComplete.AssetID">
+            <summary>The uploaded texture asset ID</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestScriptComplete.Compiled">
+            <summary>true of the script was compiled successfully</summary>
+        </member>
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage">
             <summary>
-            Deserialize the message
+            A message sent from a viewer to the simulator requesting a temporary uploader capability
+            used to update a script contained in an agents inventory
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ViewerStatsMessage.Serialize">
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage.ItemID">
+            <summary>The existing asset if of the script in the agents inventory to replace</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage.Target">
+            <summary>The language of the script</summary>
+            <remarks>Defaults to lsl version 2, "mono" might be another possible option</remarks>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
             <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ViewerStatsMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <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>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.PlacesReplyMessage">
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage">
             <summary>
-            
+            A message containing either the request or response used in updating a script inside
+            an agents inventory
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.PlacesReplyMessage.Serialize">
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage.Request">
+            <summary>Object containing request or response</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
             <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.PlacesReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
             Deserialize the message
             </summary>
             <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInformationMessage.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.SendPostcardMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
             <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInformationMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.SendPostcardMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
             Deserialize the message
             </summary>
             <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.DirLandReplyMessage.Serialize">
+        <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>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessageBase.Serialize">
             <summary>
             Serialize the object
             </summary>
             <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.DirLandReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessageBase.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
             Deserialize the message
             </summary>
             <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectPhysicsPropertiesMessage">
+        <member name="T:OpenMetaverse.Messages.Linden.MapLayerRequestVariant">
             <summary>
-            Event Queue message describing physics engine attributes of a list of objects
-            Sim sends these when object is selected
+            Sent by an agent to the capabilities server to request map layers
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectPhysicsPropertiesMessage.ObjectPhysicsProperties">
-            <summary> Array with the list of physics properties</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectPhysicsPropertiesMessage.Serialize">
+        <member name="T:OpenMetaverse.Messages.Linden.MapLayerReplyVariant">
             <summary>
-            Serializes the message
+            A message sent from the simulator to the viewer which contains an array of map images and their grid coordinates
             </summary>
-            <returns>Serialized OSD</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectPhysicsPropertiesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deseializes the message
-            </summary>
-            <param name="map">Incoming data to deserialize</param>
+        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerDataBlocks">
+            <summary>An array containing LayerData items</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage">
+        <member name="M:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.Serialize">
             <summary>
-            A message sent from the viewer to the simulator which 
-            specifies that the user has changed current URL
-            of the specific media on a prim face
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.URL">
+        <member name="M:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            New URL
+            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.ObjectMediaNavigateMessage.PrimID">
+        <member name="T:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData">
             <summary>
-            Prim UUID where navigation occured
+            An object containing map location details
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.Face">
-            <summary>
-            Face index
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.ImageID">
+            <summary>The Asset ID of the regions tile overlay</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.Serialize">
+        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Bottom">
+            <summary>The grid location of the southern border of the map tile</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Left">
+            <summary>The grid location of the western border of the map tile</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Right">
+            <summary>The grid location of the eastern border of the map tile</summary>
+        </member>
+        <member name="F:OpenMetaverse.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.MapLayerMessage.Request">
+            <summary>Object containing request or response</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
             <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <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>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaBlock">
-            <summary>Base class used for the ObjectMedia message</summary>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaRequest">
+        <member name="T:OpenMetaverse.Messages.Linden.ProductInfoRequestMessage">
             <summary>
-            Message used to retrive prim media data
+            New as of 1.23 RC1, no details yet.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaRequest.PrimID">
+        <member name="M:OpenMetaverse.Messages.Linden.ProductInfoRequestMessage.Serialize">
             <summary>
-            Prim UUID
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaRequest.Verb">
+        <member name="M:OpenMetaverse.Messages.Linden.ProductInfoRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Requested operation, either GET or UPDATE
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaRequest.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.SearchStatRequestMessage.Serialize">
             <summary>
-            Serialize object
+            Serialize the object
             </summary>
-            <returns>Serialized object as OSDMap</returns>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaRequest.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.SearchStatRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
             Deserialize the message
             </summary>
             <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaResponse">
-            <summary>
-            Message used to update prim media data
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestBlock.Method">
+            <summary>A string containing the method used</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaResponse.PrimID">
+        <member name="T:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference">
             <summary>
-            Prim UUID
-            </summary>
+            A request sent from an agent to the Simulator to begin a new conference.
+            Contains a list of Agents which will be included in the conference
+            </summary>    
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaResponse.FaceMedia">
-            <summary>
-            Array of media entries indexed by face number
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.AgentsBlock">
+            <summary>An array containing the <see cref="T:OpenMetaverse.UUID"/> of the agents invited to this conference</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaResponse.Version">
-            <summary>
-            Media version string
-            </summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.SessionID">
+            <summary>The conferences Session ID</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaResponse.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.Serialize">
             <summary>
-            Serialize object
+            Serialize the object
             </summary>
-            <returns>Serialized object as OSDMap</returns>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaResponse.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
             Deserialize the message
             </summary>
             <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaUpdate">
+        <member name="T:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate">
             <summary>
-            Message used to update prim media data
+            A moderation request sent from a conference moderator
+            Contains an agent and an optional action to take
+            </summary>    
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.SessionID">
+            <summary>The Session ID</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.AgentID">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.RequestKey">
+            <summary>A list containing Key/Value pairs, known valid values:
+            key: text value: true/false - allow/disallow specified agents ability to use text in session
+            key: voice value: true/false - allow/disallow specified agents ability to use voice in session
             </summary>
+            <remarks>"text" or "voice"</remarks>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.PrimID">
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.RequestValue">
+            <summary></summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.Serialize">
             <summary>
-            Prim UUID
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.FaceMedia">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Array of media entries indexed by face number
+            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.ObjectMediaUpdate.Verb">
+        <member name="T:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation">
             <summary>
-            Requested operation, either GET or UPDATE
+            A message sent from the agent to the simulator which tells the 
+            simulator we've accepted a conference invitation
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.Serialize">
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation.SessionID">
+            <summary>The conference SessionID</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation.Serialize">
             <summary>
-            Serialize object
+            Serialize the object
             </summary>
-            <returns>Serialized object as OSDMap</returns>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
             Deserialize the message
             </summary>
             <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaMessage">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMessage.Serialize">
             <summary>
-            Message for setting or getting per face MediaEntry
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaMessage.Request">
-            <summary>The request or response details block</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaMessage.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterboxSessionEventReplyMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
             <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterboxSessionEventReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
             Deserialize the message
             </summary>
             <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectResourcesDetail">
-            <summary>Details about object resource usage</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.ID">
-            <summary>Object UUID</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Name">
-            <summary>Object name</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.GroupOwned">
-            <summary>Indicates if object is group owned</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Location">
-            <summary>Locatio of the object</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.OwnerID">
-            <summary>Object owner</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Resources">
-            <summary>Resource usage, keys are resource names, values are resource usage for that specific resource</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionStartReplyMessage.Serialize">
             <summary>
-            Deserializes object from OSD
+            Serialize the object
             </summary>
-            <param name="obj">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.FromOSD(OpenMetaverse.StructuredData.OSD)">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionStartReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Makes an instance based on deserialized data
+            Deserialize the message
             </summary>
-            <param name="osd"><see cref="T:OpenMetaverse.StructuredData.OSD"/> serialized data</param>
-            <returns>Instance containg deserialized data</returns>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ParcelResourcesDetail">
-            <summary>Details about parcel resource usage</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.FromAgentID">
+            <summary>Key of sender</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.ID">
-            <summary>Parcel UUID</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.FromAgentName">
+            <summary>Name of sender</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.LocalID">
-            <summary>Parcel local ID</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.ToAgentID">
+            <summary>Key of destination avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.Name">
-            <summary>Parcel name</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.ParentEstateID">
+            <summary>ID of originating estate</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.GroupOwned">
-            <summary>Indicates if parcel is group owned</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.RegionID">
+            <summary>Key of originating region</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Position">
+            <summary>Coordinates in originating region</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Dialog">
+            <summary>Instant message type</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.OwnerID">
-            <summary>Parcel owner</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.GroupIM">
+            <summary>Group IM session toggle</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.Objects">
-            <summary>Array of <see cref="T:OpenMetaverse.Messages.Linden.ObjectResourcesDetail"/> containing per object resource usage</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.IMSessionID">
+            <summary>Key of IM session, for Group Messages, the groups UUID</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserializes object from OSD
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Timestamp">
+            <summary>Timestamp of the instant message</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.FromOSD(OpenMetaverse.StructuredData.OSD)">
-            <summary>
-            Makes an instance based on deserialized data
-            </summary>
-            <param name="osd"><see cref="T:OpenMetaverse.StructuredData.OSD"/> serialized data</param>
-            <returns>Instance containg deserialized data</returns>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Message">
+            <summary>Instant message text</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.BaseResourcesInfo">
-            <summary>Resource usage base class, both agent and parcel resource
-            usage contains summary information</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Offline">
+            <summary>Whether this message is held for offline avatars</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.BaseResourcesInfo.SummaryAvailable">
-            <summary>Summary of available resources, keys are resource names,
-            values are resource usage for that specific resource</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.BinaryBucket">
+            <summary>Context specific packed data</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.BaseResourcesInfo.SummaryUsed">
-            <summary>Summary resource usage, keys are resource names,
-            values are resource usage for that specific resource</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Voice">
+            <summary>Is this invitation for voice group/conference chat</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.BaseResourcesInfo.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Serialize">
             <summary>
-            Serializes object
+            Serialize the object
             </summary>
-            <returns><see cref="T:OpenMetaverse.StructuredData.OSDMap"/> serialized data</returns>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.BaseResourcesInfo.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Deserializes object from OSD
+            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.AttachmentResourcesMessage">
-            <summary>Agent resource usage</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.Attachments">
-            <summary>Per attachment point object resource usage</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="T:OpenMetaverse.Messages.Linden.ChatterBoxSessionAgentListUpdatesMessage">
             <summary>
-            Deserializes object from OSD
+            Sent from the simulator to the viewer.
+            
+            When an agent initially joins a session the AgentUpdatesBlock object will contain a list of session members including
+            a boolean indicating they can use voice chat in this session, a boolean indicating they are allowed to moderate 
+            this session, and lastly a string which indicates another agent is entering the session with the Transition set to "ENTER"
+            
+            During the session lifetime updates on individuals are sent. During the update the booleans sent during the initial join are
+            excluded with the exception of the Transition field. This indicates a new user entering or exiting the session with
+            the string "ENTER" or "LEAVE" respectively.
             </summary>
-            <param name="osd">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.FromOSD(OpenMetaverse.StructuredData.OSD)">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionAgentListUpdatesMessage.Serialize">
             <summary>
-            Makes an instance based on deserialized data
+            Serialize the object
             </summary>
-            <param name="osd"><see cref="T:OpenMetaverse.StructuredData.OSD"/> serialized data</param>
-            <returns>Instance containg deserialized data</returns>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.GetMessageHandler(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionAgentListUpdatesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Detects which class handles deserialization of this message
+            Deserialize the message
             </summary>
             <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-            <returns>Object capable of decoding this message</returns>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.LandResourcesRequest">
-            <summary>Request message for parcel resource usage</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesRequest.ParcelID">
-            <summary>UUID of the parel to request resource usage info</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesRequest.Serialize">
+        <member name="T:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage">
             <summary>
-            Serializes object
+            An EventQueue message sent when the agent is forcibly removed from a chatterbox session
             </summary>
-            <returns><see cref="T:OpenMetaverse.StructuredData.OSDMap"/> serialized data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesRequest.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.Reason">
             <summary>
-            Deserializes object from OSD
+            A string containing the reason the agent was removed
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.LandResourcesMessage">
-            <summary>Response message for parcel resource usage</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesMessage.ScriptResourceDetails">
-            <summary>URL where parcel resource usage details can be retrieved</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesMessage.ScriptResourceSummary">
-            <summary>URL where parcel resource usage summary can be retrieved</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesMessage.Serialize">
+        <member name="F:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.SessionID">
             <summary>
-            Serializes object
+            The ChatterBoxSession's SessionID
             </summary>
-            <returns><see cref="T:OpenMetaverse.StructuredData.OSDMap"/> serialized data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.Serialize">
             <summary>
-            Deserializes object from OSD
+            Serialize the object
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesMessage.GetMessageHandler(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Detects which class handles deserialization of this message
+            Deserialize the message
             </summary>
             <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-            <returns>Object capable of decoding this message</returns>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.LandResourcesInfo">
-            <summary>Parcel resource usage</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesInfo.Parcels">
-            <summary>Array of <see cref="T:OpenMetaverse.Messages.Linden.ParcelResourcesDetail"/> containing per percal resource usage</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.EventQueueAck.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesInfo.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.Messages.Linden.EventQueueAck.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Deserializes object from OSD
+            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.GetDisplayNamesMessage">
+        <member name="M:OpenMetaverse.Messages.Linden.EventQueueEvent.Serialize">
             <summary>
-            Reply to request for bunch if display names
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.GetDisplayNamesMessage.Agents">
-            <summary> Current display name </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.GetDisplayNamesMessage.BadIDs">
-            <summary> Following UUIDs failed to return a valid display name </summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.GetDisplayNamesMessage.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.EventQueueEvent.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Serializes the message
+            Deserialize the message
             </summary>
-            <returns>OSD containting the messaage</returns>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.SetDisplayNameMessage">
+        <member name="M:OpenMetaverse.Messages.Linden.EventQueueGetMessage.Serialize">
             <summary>
-            Message sent when requesting change of the display name
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameMessage.OldDisplayName">
-            <summary> Current display name </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameMessage.NewDisplayName">
-            <summary> Desired new display name </summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.SetDisplayNameMessage.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.EventQueueGetMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Serializes the message
+            Deserialize the message
             </summary>
-            <returns>OSD containting the messaage</returns>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage">
+        <member name="M:OpenMetaverse.Messages.Linden.ViewerStatsMessage.Serialize">
             <summary>
-            Message recieved in response to request to change display name
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage.DisplayName">
-            <summary> New display name </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage.Reason">
-            <summary> String message indicating the result of the operation </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage.Status">
-            <summary> Numerical code of the result, 200 indicates success </summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.ViewerStatsMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Serializes the message
+            Deserialize the message
             </summary>
-            <returns>OSD containting the messaage</returns>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.DisplayNameUpdateMessage">
+        <member name="T:OpenMetaverse.Messages.Linden.PlacesReplyMessage">
             <summary>
-            Message recieved when someone nearby changes their display name
+            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.DisplayNameUpdateMessage.OldDisplayName">
-            <summary> Previous display name, empty string if default </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.DisplayNameUpdateMessage.DisplayName">
-            <summary> New display name </summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.DisplayNameUpdateMessage.Serialize">
+        <member name="M:OpenMetaverse.Messages.Linden.PlacesReplyMessage.Serialize">
             <summary>
-            Serializes the message
+            Serialize the object
             </summary>
-            <returns>OSD containting the messaage</returns>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetsArchiver">
+        <member name="M:OpenMetaverse.Messages.Linden.PlacesReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Archives assets
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetsArchiver.m_assets">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInformationMessage.Serialize">
             <summary>
-            Archive assets
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetsArchiver.Archive(OpenMetaverse.Assets.TarArchiveWriter)">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInformationMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Archive the assets given to this archiver to the given archive.
+            Deserialize the message
             </summary>
-            <param name="archive"></param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetsArchiver.WriteMetadata(OpenMetaverse.Assets.TarArchiveWriter)">
+        <member name="M:OpenMetaverse.Messages.Linden.DirLandReplyMessage.Serialize">
             <summary>
-            Write an assets metadata file to the given archive
+            Serialize the object
             </summary>
-            <param name="archive"></param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetsArchiver.WriteData(OpenMetaverse.Assets.TarArchiveWriter)">
+        <member name="M:OpenMetaverse.Messages.Linden.DirLandReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Write asset data files to the given archive
+            Deserialize the message
             </summary>
-            <param name="archive"></param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Assets.ArchiveConstants">
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectPhysicsPropertiesMessage">
             <summary>
-            Constants for the archiving module
+            Event Queue message describing physics engine attributes of a list of objects
+            Sim sends these when object is selected
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.CONTROL_FILE_PATH">
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectPhysicsPropertiesMessage.ObjectPhysicsProperties">
+            <summary> Array with the list of physics properties</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectPhysicsPropertiesMessage.Serialize">
             <summary>
-            The location of the archive control file
+            Serializes the message
             </summary>
+            <returns>Serialized OSD</returns>
         </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSETS_PATH">
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectPhysicsPropertiesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Path for the assets held in an archive
+            Deseializes the message
             </summary>
+            <param name="map">Incoming data to deserialize</param>
         </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.OBJECTS_PATH">
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage">
             <summary>
-            Path for the prims file
+            A message sent from the viewer to the simulator which 
+            specifies that the user has changed current URL
+            of the specific media on a prim face
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.TERRAINS_PATH">
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.URL">
             <summary>
-            Path for terrains.  Technically these may be assets, but I think it's quite nice to split them out.
+            New URL
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.SETTINGS_PATH">
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.PrimID">
             <summary>
-            Path for region settings.
+            Prim UUID where navigation occured
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSET_EXTENSION_SEPARATOR">
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.Face">
             <summary>
-            The character the separates the uuid from extension information in an archived asset filename
+            Face index
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSET_TYPE_TO_EXTENSION">
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.Serialize">
             <summary>
-            Extensions used for asset types in the archive
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="T:ThreadUtil">
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:ThreadUtil.wrapperInstance">
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaBlock">
+            <summary>Base class used for the ObjectMedia message</summary>
+        </member>
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaRequest">
             <summary>
-            An instance of DelegateWrapper which calls InvokeWrappedDelegate,
-            which in turn calls the DynamicInvoke method of the wrapped
-            delegate
+            Message used to retrive prim media data
             </summary>
         </member>
-        <member name="F:ThreadUtil.callback">
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaRequest.PrimID">
             <summary>
-            Callback used to call EndInvoke on the asynchronously
-            invoked DelegateWrapper
+            Prim UUID
             </summary>
         </member>
-        <member name="M:ThreadUtil.FireAndForget(System.Delegate,System.Object[])">
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaRequest.Verb">
             <summary>
-            Executes the specified delegate with the specified arguments
-            asynchronously on a thread pool thread
+            Requested operation, either GET or UPDATE
             </summary>
-            <param name="d"></param>
-            <param name="args"></param>
         </member>
-        <member name="M:ThreadUtil.InvokeWrappedDelegate(System.Delegate,System.Object[])">
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaRequest.Serialize">
             <summary>
-            Invokes the wrapped delegate synchronously
+            Serialize object
             </summary>
-            <param name="d"></param>
-            <param name="args"></param>
+            <returns>Serialized object as OSDMap</returns>
         </member>
-        <member name="M:ThreadUtil.EndWrapperInvoke(System.IAsyncResult)">
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaRequest.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Calls EndInvoke on the wrapper and Close on the resulting WaitHandle
-            to prevent resource leaks
+            Deserialize the message
             </summary>
-            <param name="ar"></param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:ThreadUtil.DelegateWrapper">
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaResponse">
             <summary>
-            Delegate to wrap another delegate and its arguments
+            Message used to update prim media data
             </summary>
-            <param name="d"></param>
-            <param name="args"></param>
-        </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">
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaResponse.PrimID">
             <summary>
-            Create an allocated UDP packet buffer for receiving a packet
+            Prim UUID
             </summary>
         </member>
-        <member name="M:OpenMetaverse.UDPPacketBuffer.#ctor(System.Net.IPEndPoint)">
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaResponse.FaceMedia">
             <summary>
-            Create an allocated UDP packet buffer for sending a packet
+            Array of media entries indexed by face number
             </summary>
-            <param name="endPoint">EndPoint of the remote host</param>
         </member>
-        <member name="M:OpenMetaverse.UDPPacketBuffer.#ctor(System.Net.IPEndPoint,System.Int32)">
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaResponse.Version">
             <summary>
-            Create an allocated UDP packet buffer for sending a packet
+            Media version string
             </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.PacketBufferPool">
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaResponse.Serialize">
             <summary>
-            Object pool for packet buffers. This is used to allocate memory for all
-            incoming and outgoing packets, and zerocoding buffers for those packets
+            Serialize object
             </summary>
+            <returns>Serialized object as OSDMap</returns>
         </member>
-        <member name="M:OpenMetaverse.PacketBufferPool.#ctor(System.Net.IPEndPoint,System.Int32,System.Int32)">
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaResponse.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Initialize the object pool in client mode
+            Deserialize the message
             </summary>
-            <param name="endPoint">Server to connect to</param>
-            <param name="itemsPerSegment"></param>
-            <param name="minSegments"></param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.PacketBufferPool.#ctor(System.Int32,System.Int32)">
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaUpdate">
             <summary>
-            Initialize the object pool in server mode
+            Message used to update prim media data
             </summary>
-            <param name="itemsPerSegment"></param>
-            <param name="minSegments"></param>
         </member>
-        <member name="M:OpenMetaverse.PacketBufferPool.GetObjectInstance">
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.PrimID">
             <summary>
-            Returns a packet buffer with EndPoint set if the buffer is in
-            client mode, or with EndPoint set to null in server mode
+            Prim UUID
             </summary>
-            <returns>Initialized UDPPacketBuffer object</returns>
         </member>
-        <member name="M:OpenMetaverse.Pool.#cctor">
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.FaceMedia">
             <summary>
-            Default constructor
+            Array of media entries indexed by face number
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Pool.CheckOut">
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.Verb">
             <summary>
-            Check a packet buffer out of the pool
+            Requested operation, either GET or UPDATE
             </summary>
-            <returns>A packet buffer object</returns>
         </member>
-        <member name="M:OpenMetaverse.CoordinateFrame.LookDirection(OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.Serialize">
             <summary>
-            
+            Serialize object
             </summary>
-            <param name="at">Looking direction, must be a normalized vector</param>
-            <param name="upDirection">Up direction, must be a normalized vector</param>
+            <returns>Serialized object as OSDMap</returns>
         </member>
-        <member name="M:OpenMetaverse.CoordinateFrame.LookDirection(System.Double)">
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Align the coordinate frame X and Y axis with a given rotation
-            around the Z axis in radians
+            Deserialize the message
             </summary>
-            <param name="heading">Absolute rotation around the Z axis in
-            radians</param>
-        </member>
-        <member name="P:OpenMetaverse.CoordinateFrame.Origin">
-            <summary>Origin position of this coordinate frame</summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the 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="T:OpenMetaverse.Messages.Linden.ObjectMediaMessage">
+            <summary>
+            Message for setting or getting per face MediaEntry
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.CoordinateFrame.YAxis">
-            <summary>Y axis of this coordinate frame, or Left in grid terms</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaMessage.Request">
+            <summary>The request or response details block</summary>
         </member>
-        <member name="P:OpenMetaverse.CoordinateFrame.ZAxis">
-            <summary>Z axis of this coordinate frame, or Up in grid terms</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.Animations">
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Static pre-defined animations available to all agents
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.AFRAID">
-            <summary>Agent with afraid expression on face</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectResourcesDetail">
+            <summary>Details about object resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.AIM_BAZOOKA_R">
-            <summary>Agent aiming a bazooka (right handed)</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.ID">
+            <summary>Object UUID</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.AIM_BOW_L">
-            <summary>Agent aiming a bow (left handed)</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Name">
+            <summary>Object name</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.AIM_HANDGUN_R">
-            <summary>Agent aiming a hand gun (right handed)</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.GroupOwned">
+            <summary>Indicates if object is group owned</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.AIM_RIFLE_R">
-            <summary>Agent aiming a rifle (right handed)</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Location">
+            <summary>Locatio of the object</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.ANGRY">
-            <summary>Agent with angry expression on face</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.OwnerID">
+            <summary>Object owner</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.AWAY">
-            <summary>Agent hunched over (away)</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Resources">
+            <summary>Resource usage, keys are resource names, values are resource usage for that specific resource</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.BACKFLIP">
-            <summary>Agent doing a backflip</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserializes object from OSD
+            </summary>
+            <param name="obj">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.BELLY_LAUGH">
-            <summary>Agent laughing while holding belly</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.FromOSD(OpenMetaverse.StructuredData.OSD)">
+            <summary>
+            Makes an instance based on deserialized data
+            </summary>
+            <param name="osd"><see cref="T:OpenMetaverse.StructuredData.OSD"/> serialized data</param>
+            <returns>Instance containg deserialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.BLOW_KISS">
-            <summary>Agent blowing a kiss</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.ParcelResourcesDetail">
+            <summary>Details about parcel resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.BORED">
-            <summary>Agent with bored expression on face</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.ID">
+            <summary>Parcel UUID</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.BOW">
-            <summary>Agent bowing to audience</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.LocalID">
+            <summary>Parcel local ID</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.BRUSH">
-            <summary>Agent brushing himself/herself off</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.Name">
+            <summary>Parcel name</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.BUSY">
-            <summary>Agent in busy mode</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.GroupOwned">
+            <summary>Indicates if parcel is group owned</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.CLAP">
-            <summary>Agent clapping hands</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.OwnerID">
+            <summary>Parcel owner</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.COURTBOW">
-            <summary>Agent doing a curtsey bow</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.Objects">
+            <summary>Array of <see cref="T:OpenMetaverse.Messages.Linden.ObjectResourcesDetail"/> containing per object resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.CROUCH">
-            <summary>Agent crouching</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserializes object from OSD
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.CROUCHWALK">
-            <summary>Agent crouching while walking</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.FromOSD(OpenMetaverse.StructuredData.OSD)">
+            <summary>
+            Makes an instance based on deserialized data
+            </summary>
+            <param name="osd"><see cref="T:OpenMetaverse.StructuredData.OSD"/> serialized data</param>
+            <returns>Instance containg deserialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.CRY">
-            <summary>Agent crying</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.BaseResourcesInfo">
+            <summary>Resource usage base class, both agent and parcel resource
+            usage contains summary information</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.CUSTOMIZE">
-            <summary>Agent unanimated with arms out (e.g. setting appearance)</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.BaseResourcesInfo.SummaryAvailable">
+            <summary>Summary of available resources, keys are resource names,
+            values are resource usage for that specific resource</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.CUSTOMIZE_DONE">
-            <summary>Agent re-animated after set appearance finished</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.BaseResourcesInfo.SummaryUsed">
+            <summary>Summary resource usage, keys are resource names,
+            values are resource usage for that specific resource</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE1">
-            <summary>Agent dancing</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.BaseResourcesInfo.Serialize">
+            <summary>
+            Serializes object
+            </summary>
+            <returns><see cref="T:OpenMetaverse.StructuredData.OSDMap"/> serialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE2">
-            <summary>Agent dancing</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.BaseResourcesInfo.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserializes object from OSD
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE3">
-            <summary>Agent dancing</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage">
+            <summary>Agent resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE4">
-            <summary>Agent dancing</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.Attachments">
+            <summary>Per attachment point object resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE5">
-            <summary>Agent dancing</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserializes object from OSD
+            </summary>
+            <param name="osd">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE6">
-            <summary>Agent dancing</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.FromOSD(OpenMetaverse.StructuredData.OSD)">
+            <summary>
+            Makes an instance based on deserialized data
+            </summary>
+            <param name="osd"><see cref="T:OpenMetaverse.StructuredData.OSD"/> serialized data</param>
+            <returns>Instance containg deserialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE7">
-            <summary>Agent dancing</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.GetMessageHandler(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Detects which class handles deserialization of this message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <returns>Object capable of decoding this message</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE8">
-            <summary>Agent dancing</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.LandResourcesRequest">
+            <summary>Request message for parcel resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.DEAD">
-            <summary>Agent on ground unanimated</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesRequest.ParcelID">
+            <summary>UUID of the parel to request resource usage info</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.DRINK">
-            <summary>Agent boozing it up</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesRequest.Serialize">
+            <summary>
+            Serializes object
+            </summary>
+            <returns><see cref="T:OpenMetaverse.StructuredData.OSDMap"/> serialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.EMBARRASSED">
-            <summary>Agent with embarassed expression on face</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesRequest.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserializes object from OSD
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_AFRAID">
-            <summary>Agent with afraid expression on face</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.LandResourcesMessage">
+            <summary>Response message for parcel resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_ANGER">
-            <summary>Agent with angry expression on face</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesMessage.ScriptResourceDetails">
+            <summary>URL where parcel resource usage details can be retrieved</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_BORED">
-            <summary>Agent with bored expression on face</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesMessage.ScriptResourceSummary">
+            <summary>URL where parcel resource usage summary can be retrieved</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_CRY">
-            <summary>Agent crying</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesMessage.Serialize">
+            <summary>
+            Serializes object
+            </summary>
+            <returns><see cref="T:OpenMetaverse.StructuredData.OSDMap"/> serialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_DISDAIN">
-            <summary>Agent showing disdain (dislike) for something</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserializes object from OSD
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_EMBARRASSED">
-            <summary>Agent with embarassed expression on face</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesMessage.GetMessageHandler(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Detects which class handles deserialization of this message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+            <returns>Object capable of decoding this message</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_FROWN">
-            <summary>Agent with frowning expression on face</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.LandResourcesInfo">
+            <summary>Parcel resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_KISS">
-            <summary>Agent with kissy face</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesInfo.Parcels">
+            <summary>Array of <see cref="T:OpenMetaverse.Messages.Linden.ParcelResourcesDetail"/> containing per percal resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_LAUGH">
-            <summary>Agent expressing laughgter</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesInfo.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserializes object from OSD
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_OPEN_MOUTH">
-            <summary>Agent with open mouth</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.GetDisplayNamesMessage">
+            <summary>
+            Reply to request for bunch if display names
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_REPULSED">
-            <summary>Agent with repulsed expression on face</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.GetDisplayNamesMessage.Agents">
+            <summary> Current display name </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_SAD">
-            <summary>Agent expressing sadness</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.GetDisplayNamesMessage.BadIDs">
+            <summary> Following UUIDs failed to return a valid display name </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_SHRUG">
-            <summary>Agent shrugging shoulders</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.GetDisplayNamesMessage.Serialize">
+            <summary>
+            Serializes the message
+            </summary>
+            <returns>OSD containting the messaage</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_SMILE">
-            <summary>Agent with a smile</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.SetDisplayNameMessage">
+            <summary>
+            Message sent when requesting change of the display name
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_SURPRISE">
-            <summary>Agent expressing surprise</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameMessage.OldDisplayName">
+            <summary> Current display name </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_TONGUE_OUT">
-            <summary>Agent sticking tongue out</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameMessage.NewDisplayName">
+            <summary> Desired new display name </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_TOOTHSMILE">
-            <summary>Agent with big toothy smile</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.SetDisplayNameMessage.Serialize">
+            <summary>
+            Serializes the message
+            </summary>
+            <returns>OSD containting the messaage</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_WINK">
-            <summary>Agent winking</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage">
+            <summary>
+            Message recieved in response to request to change display name
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_WORRY">
-            <summary>Agent expressing worry</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage.DisplayName">
+            <summary> New display name </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.FALLDOWN">
-            <summary>Agent falling down</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage.Reason">
+            <summary> String message indicating the result of the operation </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.FEMALE_WALK">
-            <summary>Agent walking (feminine version)</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage.Status">
+            <summary> Numerical code of the result, 200 indicates success </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.FINGER_WAG">
-            <summary>Agent wagging finger (disapproval)</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage.Serialize">
+            <summary>
+            Serializes the message
+            </summary>
+            <returns>OSD containting the messaage</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.FIST_PUMP">
-            <summary>I'm not sure I want to know</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.DisplayNameUpdateMessage">
+            <summary>
+            Message recieved when someone nearby changes their display name
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.FLY">
-            <summary>Agent in superman position</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.DisplayNameUpdateMessage.OldDisplayName">
+            <summary> Previous display name, empty string if default </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.FLYSLOW">
-            <summary>Agent in superman position</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.DisplayNameUpdateMessage.DisplayName">
+            <summary> New display name </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.HELLO">
-            <summary>Agent greeting another</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.DisplayNameUpdateMessage.Serialize">
+            <summary>
+            Serializes the message
+            </summary>
+            <returns>OSD containting the messaage</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOLD_BAZOOKA_R">
-            <summary>Agent holding bazooka (right handed)</summary>
+        <member name="F:OpenMetaverse.InventorySortOrder.ByName">
+            <summary>Sort by name</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOLD_BOW_L">
-            <summary>Agent holding a bow (left handed)</summary>
+        <member name="F:OpenMetaverse.InventorySortOrder.ByDate">
+            <summary>Sort by date</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOLD_HANDGUN_R">
-            <summary>Agent holding a handgun (right handed)</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="F:OpenMetaverse.Animations.HOLD_RIFLE_R">
-            <summary>Agent holding a rifle (right handed)</summary>
+        <member name="F:OpenMetaverse.InventorySortOrder.SystemFoldersToTop">
+            <summary>Place system folders at the top</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOLD_THROW_R">
-            <summary>Agent throwing an object (right handed)</summary>
+        <member name="T:OpenMetaverse.DeRezDestination">
+            <summary>
+            Possible destinations for DeRezObject request
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOVER">
-            <summary>Agent in static hover</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.AgentInventorySave">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOVER_DOWN">
-            <summary>Agent hovering downward</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.AgentInventoryCopy">
+            <summary>Copy from in-world to agent inventory</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOVER_UP">
-            <summary>Agent hovering upward</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.TaskInventory">
+            <summary>Derez to TaskInventory</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.IMPATIENT">
-            <summary>Agent being impatient</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.Attachment">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.JUMP">
-            <summary>Agent jumping</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.AgentInventoryTake">
+            <summary>Take Object</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.JUMP_FOR_JOY">
-            <summary>Agent jumping with fervor</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.ForceToGodInventory">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.KISS_MY_BUTT">
-            <summary>Agent point to lips then rear end</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.TrashFolder">
+            <summary>Delete Object</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.LAND">
-            <summary>Agent landing from jump, finished flight, etc</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.AttachmentToInventory">
+            <summary>Put an avatar attachment into agent inventory</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.LAUGH_SHORT">
-            <summary>Agent laughing</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.AttachmentExists">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.MEDIUM_LAND">
-            <summary>Agent landing from jump, finished flight, etc</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.ReturnToOwner">
+            <summary>Return an object back to the owner's inventory</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.MOTORCYCLE_SIT">
-            <summary>Agent sitting on a motorcycle</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.Animations.MUSCLE_BEACH">
-            <summary></summary>
+        <member name="T:OpenMetaverse.InventoryItemFlags">
+            <summary>
+            Upper half of the Flags field for inventory items
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.NO">
-            <summary>Agent moving head side to side</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.Animations.NO_UNHAPPY">
-            <summary>Agent moving head side to side with unhappy expression</summary>
+        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectSlamSale">
+            <summary>Indicates that the object sale information has been
+            changed</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.NYAH_NYAH">
-            <summary>Agent taunting another</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="F:OpenMetaverse.Animations.ONETWO_PUNCH">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectOverwriteOwner">
+            <summary>If set, and a slam bit is set, indicates OwnerMask will be overwritten on Rez</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.PEACE">
-            <summary>Agent giving peace sign</summary>
+        <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.Animations.POINT_ME">
-            <summary>Agent pointing at self</summary>
+        <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.Animations.POINT_YOU">
-            <summary>Agent pointing at another</summary>
+        <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.Animations.PRE_JUMP">
-            <summary>Agent preparing for jump (bending knees)</summary>
+        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectHasMultipleItems">
+            <summary>Indicates whether this object is composed of multiple
+            items or not</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.PUNCH_LEFT">
-            <summary>Agent punching with left hand</summary>
+        <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="F:OpenMetaverse.Animations.PUNCH_RIGHT">
-            <summary>Agent punching with right hand</summary>
+        <member name="T:OpenMetaverse.InventoryBase">
+            <summary>
+            Base Class for Inventory Items
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.REPULSED">
-            <summary>Agent acting repulsed</summary>
+        <member name="F:OpenMetaverse.InventoryBase.UUID">
+            <summary><seealso cref="T:OpenMetaverse.UUID"/> of item/folder</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.ROUNDHOUSE_KICK">
-            <summary>Agent trying to be Chuck Norris</summary>
+        <member name="F:OpenMetaverse.InventoryBase.ParentUUID">
+            <summary><seealso cref="T:OpenMetaverse.UUID"/> of parent folder</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.RPS_COUNTDOWN">
-            <summary>Rocks, Paper, Scissors 1, 2, 3</summary>
+        <member name="F:OpenMetaverse.InventoryBase.Name">
+            <summary>Name of item/folder</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.RPS_PAPER">
-            <summary>Agent with hand flat over other hand</summary>
+        <member name="F:OpenMetaverse.InventoryBase.OwnerID">
+            <summary>Item/Folder Owners <seealso cref="T:OpenMetaverse.UUID"/></summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.RPS_ROCK">
-            <summary>Agent with fist over other hand</summary>
+        <member name="M:OpenMetaverse.InventoryBase.#ctor(OpenMetaverse.UUID)">
+            <summary>
+            Constructor, takes an itemID as a parameter
+            </summary>
+            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID"/> of the item</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.RPS_SCISSORS">
-            <summary>Agent with two fingers spread over other hand</summary>
+        <member name="M:OpenMetaverse.InventoryBase.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.RUN">
-            <summary>Agent running</summary>
+        <member name="M:OpenMetaverse.InventoryBase.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.SAD">
-            <summary>Agent appearing sad</summary>
+        <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>
-        <member name="F:OpenMetaverse.Animations.SALUTE">
-            <summary>Agent saluting</summary>
+        <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>
-        <member name="F:OpenMetaverse.Animations.SHOOT_BOW_L">
-            <summary>Agent shooting bow (left handed)</summary>
+        <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>
-        <member name="F:OpenMetaverse.Animations.SHOUT">
-            <summary>Agent cupping mouth as if shouting</summary>
+        <member name="M:OpenMetaverse.InventoryBase.GetOSD">
+            <summary>
+            Convert inventory to OSD
+            </summary>
+            <returns>OSD representation</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.SHRUG">
-            <summary>Agent shrugging shoulders</summary>
+        <member name="T:OpenMetaverse.InventoryItem">
+            <summary>
+            An Item in Inventory
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT">
-            <summary>Agent in sit position</summary>
+        <member name="F:OpenMetaverse.InventoryItem.AssetUUID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of this item</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT_FEMALE">
-            <summary>Agent in sit position (feminine)</summary>
+        <member name="F:OpenMetaverse.InventoryItem.Permissions">
+            <summary>The combined <seealso cref="T:OpenMetaverse.Permissions"/> of this item</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT_GENERIC">
-            <summary>Agent in sit position (generic)</summary>
+        <member name="F:OpenMetaverse.InventoryItem.AssetType">
+            <summary>The type of item from <seealso cref="T:OpenMetaverse.AssetType"/></summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT_GROUND">
-            <summary>Agent sitting on ground</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.Animations.SIT_GROUND_staticRAINED">
-            <summary>Agent sitting on ground</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.Animations.SIT_TO_STAND">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InventoryItem.Description">
+            <summary>A Description of this item</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SLEEP">
-            <summary>Agent sleeping on side</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.Animations.SMOKE_IDLE">
-            <summary>Agent smoking</summary>
+        <member name="F:OpenMetaverse.InventoryItem.GroupOwned">
+            <summary>If true, item is owned by a group</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SMOKE_INHALE">
-            <summary>Agent inhaling smoke</summary>
+        <member name="F:OpenMetaverse.InventoryItem.SalePrice">
+            <summary>The price this item can be purchased for</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SMOKE_THROW_DOWN">
-            <summary></summary>
+        <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.Animations.SNAPSHOT">
-            <summary>Agent taking a picture</summary>
+        <member name="F:OpenMetaverse.InventoryItem.Flags">
+            <summary>Combined flags from <seealso cref="T:OpenMetaverse.InventoryItemFlags"/></summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.STAND">
-            <summary>Agent standing</summary>
+        <member name="F:OpenMetaverse.InventoryItem.CreationDate">
+            <summary>Time and date this inventory item was created, stored as
+            UTC (Coordinated Universal Time)</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.STANDUP">
-            <summary>Agent standing up</summary>
+        <member name="F:OpenMetaverse.InventoryItem.TransactionID">
+            <summary>Used to update the AssetID in requests sent to the server</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.STAND_1">
-            <summary>Agent standing</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.Animations.STAND_2">
-            <summary>Agent standing</summary>
+        <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.Animations.STAND_3">
-            <summary>Agent standing</summary>
+        <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.Animations.STAND_4">
-            <summary>Agent standing</summary>
+        <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.Animations.STRETCH">
-            <summary>Agent stretching</summary>
+        <member name="M:OpenMetaverse.InventoryItem.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.STRIDE">
-            <summary>Agent in stride (fast walk)</summary>
+        <member name="M:OpenMetaverse.InventoryItem.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.SURF">
-            <summary>Agent surfing</summary>
+        <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.Animations.SURPRISE">
-            <summary>Agent acting surprised</summary>
+        <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.Animations.SWORD_STRIKE">
-            <summary>Agent striking with a sword</summary>
+        <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.Animations.TALK">
-            <summary>Agent talking (lips moving)</summary>
+        <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.Animations.TANTRUM">
-            <summary>Agent throwing a tantrum</summary>
+        <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.Animations.THROW_R">
-            <summary>Agent throwing an object (right handed)</summary>
+        <member name="M:OpenMetaverse.InventoryItem.GetOSD">
+            <summary>
+            Convert InventoryItem to OSD
+            </summary>
+            <returns>OSD representation of InventoryItem</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.TRYON_SHIRT">
-            <summary>Agent trying on a shirt</summary>
+        <member name="T:OpenMetaverse.InventoryTexture">
+            <summary>
+            InventoryTexture Class representing a graphical image
+            </summary>
+            <seealso cref="!:ManagedImage"/>
         </member>
-        <member name="F:OpenMetaverse.Animations.TURNLEFT">
-            <summary>Agent turning to the left</summary>
+        <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.Animations.TURNRIGHT">
-            <summary>Agent turning to the right</summary>
+        <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.Animations.TYPE">
-            <summary>Agent typing</summary>
+        <member name="T:OpenMetaverse.InventorySound">
+            <summary>
+            InventorySound Class representing a playable sound
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.WALK">
-            <summary>Agent walking</summary>
+        <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.Animations.WHISPER">
-            <summary>Agent whispering</summary>
+        <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.Animations.WHISTLE">
-            <summary>Agent whispering with fingers in mouth</summary>
+        <member name="T:OpenMetaverse.InventoryCallingCard">
+            <summary>
+            InventoryCallingCard Class, contains information on another avatar
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.WINK">
-            <summary>Agent winking</summary>
+        <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.Animations.WINK_HOLLYWOOD">
-            <summary>Agent winking</summary>
+        <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.Animations.WORRY">
-            <summary>Agent worried</summary>
+        <member name="T:OpenMetaverse.InventoryLandmark">
+            <summary>
+            InventoryLandmark Class, contains details on a specific location
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.YES">
-            <summary>Agent nodding yes</summary>
+        <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="F:OpenMetaverse.Animations.YES_HAPPY">
-            <summary>Agent nodding yes with happy face</summary>
+        <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="F:OpenMetaverse.Animations.YOGA_FLOAT">
-            <summary>Agent floating with legs and arms crossed</summary>
+        <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="M:OpenMetaverse.Animations.ToDictionary">
+        <member name="T:OpenMetaverse.InventoryObject">
             <summary>
-            A dictionary containing all pre-defined animations
+            InventoryObject Class contains details on a primitive or coalesced set of primitives
             </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="M:OpenMetaverse.Voice.VoiceParticipant.IDFromName(System.String)">
+        <member name="M:OpenMetaverse.InventoryObject.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Extract the avatar UUID encoded in a SIP URI
+            Construct an InventoryObject object
             </summary>
-            <param name="inName"></param>
-            <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.MediaPermission">
+        <member name="M:OpenMetaverse.InventoryObject.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Permissions for control of object media
+            Construct an InventoryObject object from a serialization stream
             </summary>
         </member>
-        <member name="T:OpenMetaverse.MediaControls">
+        <member name="P:OpenMetaverse.InventoryObject.ItemFlags">
             <summary>
-            Style of cotrols that shold be displayed to the user
+            Gets or sets the upper byte of the Flags value
             </summary>
         </member>
-        <member name="T:OpenMetaverse.MediaEntry">
+        <member name="P:OpenMetaverse.InventoryObject.AttachPoint">
             <summary>
-            Class representing media data for a single face
+            Gets or sets the object attachment point, the lower byte of the Flags value
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.EnableAlterntiveImage">
-            <summary>Is display of the alternative image enabled</summary>
+        <member name="T:OpenMetaverse.InventoryNotecard">
+            <summary>
+            InventoryNotecard Class, contains details on an encoded text document
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.AutoLoop">
-            <summary>Should media auto loop</summary>
+        <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.MediaEntry.AutoPlay">
-            <summary>Shoule media be auto played</summary>
+        <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.MediaEntry.AutoScale">
-            <summary>Auto scale media to prim face</summary>
+        <member name="T:OpenMetaverse.InventoryCategory">
+            <summary>
+            InventoryCategory Class
+            </summary>
+            <remarks>TODO: Is this even used for anything?</remarks>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.AutoZoom">
-            <summary>Should viewer automatically zoom in on the face when clicked</summary>
+        <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.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="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="F:OpenMetaverse.MediaEntry.Controls">
-            <summary>Style of controls viewer should display when
-            viewer media on this face</summary>
+        <member name="T:OpenMetaverse.InventoryLSL">
+            <summary>
+            InventoryLSL Class, represents a Linden Scripting Language object
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.HomeURL">
-            <summary>Starting URL for the media</summary>
+        <member name="M:OpenMetaverse.InventoryLSL.#ctor(OpenMetaverse.UUID)">
+            <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>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.CurrentURL">
-            <summary>Currently navigated URL</summary>
+        <member name="M:OpenMetaverse.InventoryLSL.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Construct an InventoryLSL object from a serialization stream
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.Height">
-            <summary>Media height in pixes</summary>
+        <member name="T:OpenMetaverse.InventorySnapshot">
+            <summary>
+            InventorySnapshot Class, an image taken with the viewer
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.Width">
-            <summary>Media width in pixels</summary>
+        <member name="M:OpenMetaverse.InventorySnapshot.#ctor(OpenMetaverse.UUID)">
+            <summary>
+            Construct an InventorySnapshot object
+            </summary>
+            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
+            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.ControlPermissions">
-            <summary>Who can controls the media</summary>
+        <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.MediaEntry.InteractPermissions">
-            <summary>Who can interact with the media</summary>
+        <member name="T:OpenMetaverse.InventoryAttachment">
+            <summary>
+            InventoryAttachment Class, contains details on an attachable object
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.EnableWhiteList">
-            <summary>Is URL whitelist enabled</summary>
+        <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.MediaEntry.WhiteList">
-            <summary>Array of URLs that are whitelisted</summary>
+        <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="M:OpenMetaverse.MediaEntry.GetOSD">
+        <member name="P:OpenMetaverse.InventoryAttachment.AttachmentPoint">
             <summary>
-            Serialize to OSD
+            Get the last AttachmentPoint this object was attached to
             </summary>
-            <returns>OSDMap with the serialized data</returns>
         </member>
-        <member name="M:OpenMetaverse.MediaEntry.FromOSD(OpenMetaverse.StructuredData.OSD)">
+        <member name="T:OpenMetaverse.InventoryWearable">
             <summary>
-            Deserialize from OSD data
+            InventoryWearable Class, details on a clothing item or body part
             </summary>
-            <param name="osd">Serialized OSD data</param>
-            <returns>Deserialized object</returns>
         </member>
-        <member name="T:OpenMetaverse.Imaging.OpenJPEG">
+        <member name="M:OpenMetaverse.InventoryWearable.#ctor(OpenMetaverse.UUID)">
             <summary>
-            A Wrapper around openjpeg to encode and decode images to and from byte arrays
+            Construct an InventoryWearable object
             </summary>
+            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
+            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
         </member>
-        <member name="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="M:OpenMetaverse.InventoryWearable.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Encode a <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object into a byte array
+            Construct an InventoryWearable object from a serialization stream
             </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="P:OpenMetaverse.InventoryWearable.WearableType">
             <summary>
-            Encode a <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object into a byte array
+            The <seealso cref="T:OpenMetaverse.WearableType"/>, Skin, Shape, Skirt, Etc
             </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@)">
+        <member name="T:OpenMetaverse.InventoryAnimation">
             <summary>
-            Decode JPEG2000 data to an <seealso cref="T:System.Drawing.Image"/> and
-            <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/>
+            InventoryAnimation Class, A bvh encoded object which animates an avatar
             </summary>
-            <param name="encoded">JPEG2000 encoded data</param>
-            <param name="managedImage">ManagedImage object to decode to</param>
-            <param name="image">Image object to decode to</param>
-            <returns>True if the decode succeeds, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(System.Byte[],OpenMetaverse.Imaging.ManagedImage@)">
+        <member name="M:OpenMetaverse.InventoryAnimation.#ctor(OpenMetaverse.UUID)">
             <summary>
-            
+            Construct an InventoryAnimation object
             </summary>
-            <param name="encoded"></param>
-            <param name="managedImage"></param>
-            <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="M:OpenMetaverse.Imaging.OpenJPEG.DecodeLayerBoundaries(System.Byte[],OpenMetaverse.Imaging.OpenJPEG.J2KLayerInfo[]@,System.Int32@)">
+        <member name="M:OpenMetaverse.InventoryAnimation.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            
+            Construct an InventoryAnimation object from a serialization stream
             </summary>
-            <param name="encoded"></param>
-            <param name="layerInfo"></param>
-            <param name="components"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Imaging.OpenJPEG.EncodeFromImage(System.Drawing.Bitmap,System.Boolean)">
+        <member name="T:OpenMetaverse.InventoryGesture">
             <summary>
-            Encode a <seealso cref="T:System.Drawing.Bitmap"/> object into a byte array
+            InventoryGesture Class, details on a series of animations, sounds, and actions
             </summary>
-            <param name="bitmap">The source <seealso cref="T:System.Drawing.Bitmap"/> object to encode</param>
-            <param name="lossless">true to enable lossless decoding</param>
-            <returns>A byte array containing the source Bitmap object</returns>
         </member>
-        <member name="T:OpenMetaverse.Imaging.OpenJPEG.J2KLayerInfo">
+        <member name="M:OpenMetaverse.InventoryGesture.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Defines the beginning and ending file positions of a layer in an
-            LRCP-progression JPEG2000 file
+            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="T:OpenMetaverse.Imaging.OpenJPEG.MarshalledImage">
+        <member name="M:OpenMetaverse.InventoryGesture.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            This structure is used to marshal both encoded and decoded images.
-            MUST MATCH THE STRUCT IN dotnet.h!
+            Construct an InventoryGesture object from a serialization stream
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket">
+        <member name="T:OpenMetaverse.InventoryFolder">
             <summary>
-            Information about a single packet in a JPEG2000 stream
+            A folder contains <seealso cref="T:OpenMetaverse.InventoryItem"/>s and has certain attributes specific 
+            to itself
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.start_pos">
-            <summary>Packet start position</summary>
+        <member name="F:OpenMetaverse.InventoryFolder.PreferredType">
+            <summary>The Preferred <seealso cref="T:OpenMetaverse.AssetType"/> for a folder.</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.end_ph_pos">
-            <summary>Packet header end position</summary>
+        <member name="F:OpenMetaverse.InventoryFolder.Version">
+            <summary>The Version of this folder</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.end_pos">
-            <summary>Packet end position</summary>
+        <member name="F:OpenMetaverse.InventoryFolder.DescendentCount">
+            <summary>Number of child items this folder contains.</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetTexture">
+        <member name="M:OpenMetaverse.InventoryFolder.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Represents a texture
+            Constructor
             </summary>
+            <param name="itemID">UUID of the folder</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">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.AssetTexture.Components">
-            <summary></summary>
+        <member name="M:OpenMetaverse.InventoryFolder.ToString">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetTexture.#ctor">
-            <summary>Initializes a new instance of an AssetTexture object</summary>
+        <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="M:OpenMetaverse.Assets.AssetTexture.#ctor(OpenMetaverse.UUID,System.Byte[])">
+        <member name="M:OpenMetaverse.InventoryFolder.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Initializes a new instance of an AssetTexture object
+            Construct an InventoryFolder object from a serialization stream
             </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="M:OpenMetaverse.InventoryFolder.GetHashCode">
             <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>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetTexture.Encode">
+        <member name="M:OpenMetaverse.InventoryFolder.Equals(System.Object)">
             <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>
+            <param name="o"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetTexture.Decode">
+        <member name="M:OpenMetaverse.InventoryFolder.Equals(OpenMetaverse.InventoryBase)">
             <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>
+            <param name="o"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetTexture.DecodeLayerBoundaries">
+        <member name="M:OpenMetaverse.InventoryFolder.Equals(OpenMetaverse.InventoryFolder)">
             <summary>
-            Decodes the begin and end byte positions for each quality layer in
-            the image
+            
             </summary>
+            <param name="o"></param>
             <returns></returns>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetTexture.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <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="T:OpenMetaverse.Assets.AssetBodypart">
+        <member name="M:OpenMetaverse.InventoryFolder.GetOSD">
             <summary>
-            Represents an <seealso cref="T:OpenMetaverse.Assets.AssetWearable"/> that represents an avatars body ie: Hair, Etc.
+            Convert InventoryItem to OSD
             </summary>
+            <returns>OSD representation of InventoryItem</returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetBodypart.#ctor">
-            <summary>Initializes a new instance of an AssetBodyPart object</summary>
+        <member name="T:OpenMetaverse.InventoryManager">
+            <summary>
+            Tools for dealing with agents inventory
+            </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 name="F:OpenMetaverse.InventoryManager.MAGIC_ID">
+            <summary>Used for converting shadow_id to asset_id</summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetBodypart.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_ItemReceived">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.FriendRights">
-            <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.InventoryManager.m_ItemReceivedLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryManager.m_FolderUpdated">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="M:OpenMetaverse.InventoryManager.OnFolderUpdated(OpenMetaverse.FolderUpdatedEventArgs)">
+            <summary>Raises the FolderUpdated Event</summary>
+             <param name="e">A FolderUpdatedEventArgs object containing
+             the data sent from the simulator</param>
+        </member>
+        <member name="F:OpenMetaverse.InventoryManager.m_FolderUpdatedLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryManager.m_InventoryObjectOffered">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="M:OpenMetaverse.InventoryManager.OnInventoryObjectOffered(OpenMetaverse.InventoryObjectOfferedEventArgs)">
+            <summary>Raises the InventoryObjectOffered Event</summary>
+             <param name="e">A InventoryObjectOfferedEventArgs object containing
+             the data sent from the simulator</param>
+        </member>
+        <member name="F:OpenMetaverse.InventoryManager.m_InventoryObjectOfferedLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryManager.m_TaskItemReceived">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </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>
+        <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="M:OpenMetaverse.InventoryManager.OnFindObjectByPathReply(OpenMetaverse.FindObjectByPathReplyEventArgs)">
+            <summary>Raises the FindObjectByPath Event</summary>
+             <param name="e">A FindObjectByPathEventArgs object containing
+             the data sent from the simulator</param>
+        </member>
+        <member name="F:OpenMetaverse.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="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.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="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.FriendRights.None">
-            <summary>The avatar has no rights</summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_SaveAssetToInventoryLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.FriendRights.CanSeeOnline">
-            <summary>The avatar can see the online status of the target avatar</summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_ScriptRunningReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.FriendRights.CanSeeOnMap">
-            <summary>The avatar can see the location of the target avatar on the map</summary>
+        <member name="M:OpenMetaverse.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.FriendRights.CanModifyObjects">
-            <summary>The avatar can modify the ojects of the target avatar </summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_ScriptRunningReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.FriendInfo">
+        <member name="F:OpenMetaverse.InventoryManager._NewFolderNames">
+            <summary>Partial mapping of AssetTypes to folder names</summary>
+        </member>
+        <member name="M:OpenMetaverse.InventoryManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            This class holds information about an avatar in the friends list.  There are two ways 
-            to interface to this class.  The first is through the set of boolean properties.  This is the typical
-            way clients of this class will use it.  The second interface is through two bitflag properties,
-            TheirFriendsRights and MyFriendsRights
+            Default constructor
             </summary>
+            <param name="client">Reference to the GridClient object</param>
         </member>
-        <member name="M:OpenMetaverse.FriendInfo.#ctor(OpenMetaverse.UUID,OpenMetaverse.FriendRights,OpenMetaverse.FriendRights)">
+        <member name="M:OpenMetaverse.InventoryManager.FetchItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Int32)">
             <summary>
-            Used internally when building the initial list of friends at login time
+            Fetch an inventory item from the dataserver
             </summary>
-            <param name="id">System ID of the avatar being prepesented</param>
-            <param name="theirRights">Rights the friend has to see you online and to modify your objects</param>
-            <param name="myRights">Rights you have to see your friend online and to modify their objects</param>
+            <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="M:OpenMetaverse.FriendInfo.ToString">
+        <member name="M:OpenMetaverse.InventoryManager.RequestFetchInventory(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            FriendInfo represented as a string
+            Request A single inventory item
             </summary>
-            <returns>A string reprentation of both my rights and my friends rights</returns>
+            <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.FriendInfo.UUID">
+        <member name="M:OpenMetaverse.InventoryManager.RequestFetchInventory(System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{OpenMetaverse.UUID})">
             <summary>
-            System ID of the avatar
+            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.FriendInfo.Name">
+        <member name="M:OpenMetaverse.InventoryManager.RequestFetchInventoryCap(System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{OpenMetaverse.UUID})">
             <summary>
-            full name of the avatar
+            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.FriendInfo.IsOnline">
+        <member name="M:OpenMetaverse.InventoryManager.FolderContents(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder,System.Int32)">
             <summary>
-            True if the avatar is online
+            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.FriendInfo.CanSeeMeOnline">
+        <member name="M:OpenMetaverse.InventoryManager.RequestFolderContents(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder)">
             <summary>
-            True if the friend can see if I am online
+            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.FriendInfo.CanSeeMeOnMap">
+        <member name="M:OpenMetaverse.InventoryManager.RequestFolderContentsCap(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder)">
             <summary>
-            True if the friend can see me on the map 
+            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.FriendInfo.CanModifyMyObjects">
+        <member name="M:OpenMetaverse.InventoryManager.FindFolderForType(OpenMetaverse.AssetType)">
             <summary>
-            True if the freind can modify my objects
+            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.FriendInfo.CanSeeThemOnline">
+        <member name="M:OpenMetaverse.InventoryManager.FindObjectByPath(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.Int32)">
             <summary>
-            True if I can see if my friend is online
+            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.FriendInfo.CanSeeThemOnMap">
+        <member name="M:OpenMetaverse.InventoryManager.RequestFindObjectByPath(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String)">
             <summary>
-            True if I can see if my friend is on the map
+            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.FriendInfo.CanModifyTheirObjects">
+        <member name="M:OpenMetaverse.InventoryManager.LocalFind(OpenMetaverse.UUID,System.String[],System.Int32,System.Boolean)">
             <summary>
-            True if I can modify my friend's objects
+            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.FriendInfo.TheirFriendRights">
+        <member name="M:OpenMetaverse.InventoryManager.Move(OpenMetaverse.InventoryBase,OpenMetaverse.InventoryFolder)">
             <summary>
-            My friend's rights represented as bitmapped flags
+            Move an inventory item or folder to a new location
             </summary>
+            <param name="item">The <seealso cref="T:InventoryBase"/> item or folder to move</param>
+            <param name="newParent">The <seealso cref="T:InventoryFolder"/> to move item or folder to</param>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.MyFriendRights">
+        <member name="M:OpenMetaverse.InventoryManager.Move(OpenMetaverse.InventoryBase,OpenMetaverse.InventoryFolder,System.String)">
             <summary>
-            My rights represented as bitmapped flags
+            Move an inventory item or folder to a new location and change its name
             </summary>
+            <param name="item">The <seealso cref="T:InventoryBase"/> item or folder to move</param>
+            <param name="newParent">The <seealso cref="T:InventoryFolder"/> to move item or folder to</param>
+            <param name="newName">The name to change the item or folder to</param>
         </member>
-        <member name="T:OpenMetaverse.FriendsManager">
+        <member name="M:OpenMetaverse.InventoryManager.MoveFolder(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String)">
             <summary>
-            This class is used to add and remove avatars from your friends list and to manage their permission.  
+            Move and rename a folder
             </summary>
+            <param name="folderID">The source folders <seealso cref="T:OpenMetaverse.UUID"/></param>
+            <param name="newparentID">The destination folders <seealso cref="T:OpenMetaverse.UUID"/></param>
+            <param name="newName">The name to change the folder to</param>
         </member>
-        <member name="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">
+        <member name="M:OpenMetaverse.InventoryManager.UpdateFolderProperties(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType)">
             <summary>
-            A dictionary of key/value pairs containing known friends of this avatar. 
-            
-            The Key is the <seealso cref="T:OpenMetaverse.UUID"/> of the friend, the value is a <seealso cref="T:OpenMetaverse.FriendInfo"/>
-            object that contains detailed information including permissions you have and have given to the friend
+            Update folder properties
             </summary>
+            <param name="folderID"><seealso cref="T:OpenMetaverse.UUID"/> of the folder to update</param>
+            <param name="parentID">Sets folder's parent to <seealso cref="T:OpenMetaverse.UUID"/></param>
+            <param name="name">Folder name</param>
+            <param name="type">Folder type</param>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.FriendRequests">
+        <member name="M:OpenMetaverse.InventoryManager.MoveFolder(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            A Dictionary of key/value pairs containing current pending frienship offers.
-            
-            The key is the <seealso cref="T:OpenMetaverse.UUID"/> of the avatar making the request, 
-            the value is the <seealso cref="T:OpenMetaverse.UUID"/> of the request which is used to accept
-            or decline the friendship offer
+            Move a folder
             </summary>
+            <param name="folderID">The source folders <seealso cref="T:OpenMetaverse.UUID"/></param>
+            <param name="newParentID">The destination folders <seealso cref="T:OpenMetaverse.UUID"/></param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.InventoryManager.MoveFolders(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.UUID})">
             <summary>
-            Internal constructor
+            Move multiple folders, the keys in the Dictionary parameter,
+            to a new parents, the value of that folder's key.
             </summary>
-            <param name="client">A reference to the GridClient Object</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="M:OpenMetaverse.FriendsManager.AcceptFriendship(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.InventoryManager.MoveItem(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Accept a friendship request
+            Move an inventory item to a new folder
             </summary>
-            <param name="fromAgentID">agentID of avatatar to form friendship with</param>
-            <param name="imSessionID">imSessionID of the friendship request message</param>
+            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID"/> of the source item to move</param>
+            <param name="folderID">The <seealso cref="T:OpenMetaverse.UUID"/> of the destination folder</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.DeclineFriendship(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.InventoryManager.MoveItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String)">
             <summary>
-            Decline a friendship request
+            Move and rename an inventory item
             </summary>
-            <param name="fromAgentID"><seealso cref="T:OpenMetaverse.UUID"/> of friend</param>
-            <param name="imSessionID">imSessionID of the friendship request message</param>
+            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID"/> of the source item to move</param>
+            <param name="folderID">The <seealso cref="T:OpenMetaverse.UUID"/> of the destination folder</param>
+            <param name="newName">The name to change the folder to</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OfferFriendship(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.InventoryManager.MoveItems(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.UUID})">
             <summary>
-            Overload: Offer friendship to an avatar.
+            Move multiple inventory items to new locations
             </summary>
-            <param name="agentID">System ID of the avatar you are offering friendship to</param>
+            <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.FriendsManager.OfferFriendship(OpenMetaverse.UUID,System.String)">
+        <member name="M:OpenMetaverse.InventoryManager.RemoveDescendants(OpenMetaverse.UUID)">
             <summary>
-            Offer friendship to an avatar.
+            Remove descendants of a folder
             </summary>
-            <param name="agentID">System ID of the avatar you are offering friendship to</param>
-            <param name="message">A message to send with the request</param>
+            <param name="folder">The <seealso cref="T:OpenMetaverse.UUID"/> of the folder</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.TerminateFriendship(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.InventoryManager.RemoveItem(OpenMetaverse.UUID)">
             <summary>
-            Terminate a friendship with an avatar
+            Remove a single item from inventory
             </summary>
-            <param name="agentID">System ID of the avatar you are terminating the friendship with</param>
-        </member>
-        <member name="M:OpenMetaverse.FriendsManager.TerminateFriendshipHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+            <param name="item">The <seealso cref="T:OpenMetaverse.UUID"/> of the inventory item to remove</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.GrantRights(OpenMetaverse.UUID,OpenMetaverse.FriendRights)">
+        <member name="M:OpenMetaverse.InventoryManager.RemoveFolder(OpenMetaverse.UUID)">
             <summary>
-            Change the rights of a friend avatar.
+            Remove a folder from inventory
             </summary>
-            <param name="friendID">the <seealso cref="T:OpenMetaverse.UUID"/> of the friend</param>
-            <param name="rights">the new rights to give the friend</param>
-            <remarks>This method will implicitly set the rights to those passed in the rights parameter.</remarks>
+            <param name="folder">The <seealso cref="T:OpenMetaverse.UUID"/> of the folder to remove</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.MapFriend(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.InventoryManager.Remove(System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{OpenMetaverse.UUID})">
             <summary>
-            Use to map a friends location on the grid.
+            Remove multiple items or folders from inventory
             </summary>
-            <param name="friendID">Friends UUID to find</param>
-            <remarks><seealso cref="E:OnFriendFound"/></remarks>
+            <param name="items">A List containing the <seealso cref="T:OpenMetaverse.UUID"/>s of items to remove</param>
+            <param name="folders">A List containing the <seealso cref="T:OpenMetaverse.UUID"/>s of the folders to remove</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.TrackFriend(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.InventoryManager.EmptyLostAndFound">
             <summary>
-            Use to track a friends movement on the grid
+            Empty the Lost and Found folder
             </summary>
-            <param name="friendID">Friends Key</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.RequestOnlineNotification(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.InventoryManager.EmptyTrash">
             <summary>
-            Ask for a notification of friend's online status
+            Empty the Trash folder
             </summary>
-            <param name="friendID">Friend's UUID</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.Avatars_OnAvatarNames(System.Object,OpenMetaverse.UUIDNameReplyEventArgs)">
+        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItem(OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,OpenMetaverse.InventoryType,OpenMetaverse.PermissionMask,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
             <summary>
-            This handles the asynchronous response of a RequestAvatarNames call.
+            
             </summary>
-            <param name="sender"></param>
-            <param name="e">names cooresponding to the the list of IDs sent the the RequestAvatarNames call.</param>
-        </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnlineNotificationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="M:OpenMetaverse.FriendsManager.OfflineNotificationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="M:OpenMetaverse.FriendsManager.ChangeUserRightsHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnFindAgentReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+            <param name="parentFolder"></param>
+            <param name="name"></param>
+            <param name="description"></param>
+            <param name="type"></param>
+            <param name="assetTransactionID">Proper use is to upload the inventory's asset first, then provide the Asset's TransactionID here.</param>
+            <param name="invType"></param>
+            <param name="nextOwnerMask"></param>
+            <param name="callback"></param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.Network_OnLoginResponse(System.Boolean,System.Boolean,System.String,System.String,OpenMetaverse.LoginResponseData)">
+        <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>
-            Populate FriendList <seealso cref="!:InternalDictionary"/> with data from the login reply
+            
             </summary>
-            <param name="loginSuccess">true if login was successful</param>
-            <param name="redirect">true if login request is requiring a redirect</param>
-            <param name="message">A string containing the response to the login request</param>
-            <param name="reason">A string containing the reason for the request</param>
-            <param name="replyData">A <seealso cref="T:OpenMetaverse.LoginResponseData"/> object containing the decoded 
-            reply from the login server</param>
-        </member>
-        <member name="E:OpenMetaverse.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>
+            <param name="parentFolder"></param>
+            <param name="name"></param>
+            <param name="description"></param>
+            <param name="type"></param>
+            <param name="assetTransactionID">Proper use is to upload the inventory's asset first, then provide the Asset's TransactionID here.</param>
+            <param name="invType"></param>
+            <param name="wearableType"></param>
+            <param name="nextOwnerMask"></param>
+            <param name="callback"></param>
         </member>
-        <member name="M:OpenMetaverse.FriendInfoEventArgs.#ctor(OpenMetaverse.FriendInfo)">
+        <member name="M:OpenMetaverse.InventoryManager.CreateFolder(OpenMetaverse.UUID,System.String)">
             <summary>
-            Construct a new instance of the FriendInfoEventArgs class
+            Creates a new inventory folder
             </summary>
-            <param name="friend">The FriendInfo</param>
-        </member>
-        <member name="P:OpenMetaverse.FriendInfoEventArgs.Friend">
-            <summary>Get the FriendInfo</summary>
-        </member>
-        <member name="T:OpenMetaverse.FriendNamesEventArgs">
-            <summary>Contains Friend Names</summary>
+            <param name="parentID">ID of the folder to put this folder in</param>
+            <param name="name">Name of the folder to create</param>
+            <returns>The UUID of the newly created folder</returns>
         </member>
-        <member name="M:OpenMetaverse.FriendNamesEventArgs.#ctor(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,System.String})">
+        <member name="M:OpenMetaverse.InventoryManager.CreateFolder(OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType)">
             <summary>
-            Construct a new instance of the FriendNamesEventArgs class
+            Creates a new inventory folder
             </summary>
-            <param name="names">A dictionary where the Key is the ID of the Agent, 
-            and the Value is a string containing their name</param>
-        </member>
-        <member name="P:OpenMetaverse.FriendNamesEventArgs.Names">
-            <summary>A dictionary where the Key is the ID of the Agent, 
-            and the Value is a string containing their name</summary>
-        </member>
-        <member name="T:OpenMetaverse.FriendshipOfferedEventArgs">
-            <summary>Sent when another agent requests a friendship with our agent</summary>
+            <param name="parentID">ID of the folder to put this folder in</param>
+            <param name="name">Name of the folder to create</param>
+            <param name="preferredType">Sets this folder as the default folder
+            for new assets of the specified type. Use <code>AssetType.Unknown</code>
+            to create a normal folder, otherwise it will likely create a
+            duplicate of an existing folder type</param>
+            <returns>The UUID of the newly created folder</returns>
+            <remarks>If you specify a preferred type of <code>AsseType.Folder</code>
+            it will create a new root folder which may likely cause all sorts
+            of strange problems</remarks>
         </member>
-        <member name="M:OpenMetaverse.FriendshipOfferedEventArgs.#ctor(OpenMetaverse.UUID,System.String,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItemFromAsset(System.Byte[],System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.InventoryType,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCreatedFromAssetCallback)">
             <summary>
-            Construct a new instance of the FriendshipOfferedEventArgs class
+            Create an inventory item and upload asset data
             </summary>
-            <param name="agentID">The ID of the agent requesting friendship</param>
-            <param name="agentName">The name of the agent requesting friendship</param>
-            <param name="imSessionID">The ID of the session, used in accepting or declining the 
-            friendship offer</param>
-        </member>
-        <member name="P:OpenMetaverse.FriendshipOfferedEventArgs.AgentID">
-            <summary>Get the ID of the agent requesting friendship</summary>
-        </member>
-        <member name="P:OpenMetaverse.FriendshipOfferedEventArgs.AgentName">
-            <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 
-            friendship offer</summary>
-        </member>
-        <member name="T:OpenMetaverse.FriendshipResponseEventArgs">
-            <summary>A response containing the results of our request to form a friendship with another agent</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.FriendshipResponseEventArgs.#ctor(OpenMetaverse.UUID,System.String,System.Boolean)">
+        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItemFromAsset(System.Byte[],System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.InventoryType,OpenMetaverse.UUID,OpenMetaverse.Permissions,OpenMetaverse.InventoryManager.ItemCreatedFromAssetCallback)">
             <summary>
-            Construct a new instance of the FriendShipResponseEventArgs class
+            Create an inventory item and upload asset data
             </summary>
-            <param name="agentID">The ID of the agent we requested a friendship with</param>
-            <param name="agentName">The name of the agent we requested a friendship with</param>
-            <param name="accepted">true if the agent accepted our friendship offer</param>
-        </member>
-        <member name="P:OpenMetaverse.FriendshipResponseEventArgs.AgentID">
-            <summary>Get the ID of the agent we requested a friendship with</summary>
-        </member>
-        <member name="P:OpenMetaverse.FriendshipResponseEventArgs.AgentName">
-            <summary>Get the name of the agent we requested a friendship with</summary>
-        </member>
-        <member name="P:OpenMetaverse.FriendshipResponseEventArgs.Accepted">
-            <summary>true if the agent accepted our friendship offer</summary>
-        </member>
-        <member name="T:OpenMetaverse.FriendshipTerminatedEventArgs">
-            <summary>Contains data sent when a friend terminates a friendship with us</summary>
+            <param name="data">Asset data</param>
+            <param name="name">Inventory item name</param>
+            <param name="description">Inventory item description</param>
+            <param name="assetType">Asset type</param>
+            <param name="invType">Inventory type</param>
+            <param name="folderID">Put newly created inventory in this folder</param>
+            <param name="permissions">Permission of the newly created item 
+            (EveryoneMask, GroupMask, and NextOwnerMask of Permissions struct are supported)</param>
+            <param name="callback">Delegate that will receive feedback on success or failure</param>
         </member>
-        <member name="M:OpenMetaverse.FriendshipTerminatedEventArgs.#ctor(OpenMetaverse.UUID,System.String)">
+        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.InventoryBase,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
             <summary>
-            Construct a new instance of the FrindshipTerminatedEventArgs class
+            Creates inventory link to another inventory item or folder
             </summary>
-            <param name="agentID">The ID of the friend who terminated the friendship with us</param>
-            <param name="agentName">The name of the friend who terminated the friendship with us</param>
+            <param name="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="P:OpenMetaverse.FriendshipTerminatedEventArgs.AgentID">
-            <summary>Get the ID of the agent that terminated the friendship with us</summary>
+        <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>
-        <member name="P:OpenMetaverse.FriendshipTerminatedEventArgs.AgentName">
-            <summary>Get the name of the agent that terminated the friendship with us</summary>
+        <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>
-        <member name="T:OpenMetaverse.FriendFoundReplyEventArgs">
+        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.InventoryType,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
             <summary>
-            Data sent in response to a <see cref="!:FindFriend"/> request which contains the information to allow us to map the friends location
+            Creates inventory link to another inventory item or folder
             </summary>
+            <param name="folderID">Put newly created link in folder with this UUID</param>
+            <param name="itemID">Original item's UUID</param>
+            <param name="name">Name</param>
+            <param name="description">Description</param>
+            <param name="assetType">Asset Type</param>
+            <param name="invType">Inventory Type</param>
+            <param name="transactionID">Transaction UUID</param>
+            <param name="callback">Method to call upon creation of the link</param>
         </member>
-        <member name="M:OpenMetaverse.FriendFoundReplyEventArgs.#ctor(OpenMetaverse.UUID,System.UInt64,OpenMetaverse.Vector3)">
+        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
             <summary>
-            Construct a new instance of the FriendFoundReplyEventArgs class
+            
             </summary>
-            <param name="agentID">The ID of the agent we have requested location information for</param>
-            <param name="regionHandle">The region handle where our friend is located</param>
-            <param name="location">The simulator local position our friend is located</param>
+            <param name="item"></param>
+            <param name="newParent"></param>
+            <param name="newName"></param>
+            <param name="callback"></param>
         </member>
-        <member name="P:OpenMetaverse.FriendFoundReplyEventArgs.AgentID">
-            <summary>Get the ID of the agent we have received location information for</summary>
+        <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="P:OpenMetaverse.FriendFoundReplyEventArgs.RegionHandle">
-            <summary>Get the region handle where our mapped friend is located</summary>
+        <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="P:OpenMetaverse.FriendFoundReplyEventArgs.Location">
-            <summary>Get the simulator local position where our friend is located</summary>
+        <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="T:OpenMetaverse.StatusCode">
+        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItem(OpenMetaverse.InventoryItem)">
             <summary>
             
             </summary>
+            <param name="item"></param>
         </member>
-        <member name="F:OpenMetaverse.StatusCode.OK">
-            <summary>OK</summary>
-        </member>
-        <member name="F:OpenMetaverse.StatusCode.Done">
-            <summary>Transfer completed</summary>
+        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItems(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
+            <summary>
+            
+            </summary>
+            <param name="items"></param>
         </member>
-        <member name="F:OpenMetaverse.StatusCode.Skip">
-            <summary></summary>
+        <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.StatusCode.Abort">
-            <summary></summary>
+        <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.StatusCode.Error">
-            <summary>Unknown error occurred</summary>
+        <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.StatusCode.UnknownSource">
-            <summary>Equivalent to a 404 error</summary>
+        <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.StatusCode.InsufficientPermissions">
-            <summary>Client does not have permission for that resource</summary>
+        <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.StatusCode.Unknown">
-            <summary>Unknown status</summary>
+        <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="T:OpenMetaverse.ChannelType">
+        <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.ChannelType.Unknown">
-            <summary></summary>
+        <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.ChannelType.Misc">
-            <summary>Unknown</summary>
+        <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.ChannelType.Asset">
-            <summary>Virtually all asset transfers use this channel</summary>
+        <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="T:OpenMetaverse.SourceType">
+        <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.SourceType.Unknown">
-            <summary></summary>
+        <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.SourceType.Asset">
-            <summary>Asset from the asset server</summary>
+        <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.SourceType.SimInventoryItem">
-            <summary>Inventory item</summary>
+        <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.SourceType.SimEstate">
-            <summary>Estate asset, such as an estate covenant</summary>
+        <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="T:OpenMetaverse.TargetType">
+        <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.TargetType.Unknown">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.TargetType.File">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.TargetType.VFile">
-            <summary></summary>
-        </member>
-        <member name="T:OpenMetaverse.ImageType">
+        <member name="M:OpenMetaverse.InventoryManager.GetTaskInventory(OpenMetaverse.UUID,System.UInt32,System.Int32)">
             <summary>
-            When requesting image download, type of the image requested
+            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.ImageType.Normal">
-            <summary>Normal in-world object texture</summary>
-        </member>
-        <member name="F:OpenMetaverse.ImageType.Baked">
-            <summary>Avatar texture</summary>
+        <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.ImageType.ServerBaked">
-            <summary>Server baked avatar texture</summary>
+        <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="T:OpenMetaverse.ImageCodec">
+        <member name="M:OpenMetaverse.InventoryManager.MoveTaskInventory(System.UInt32,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Simulator)">
             <summary>
-            Image file format
+            Move an item from a tasks (Primitive) inventory to the specified folder in the avatars inventory
             </summary>
+            <param name="objectLocalID">LocalID of the object in the simulator</param>
+            <param name="taskItemID">UUID of the task item to move</param>
+            <param name="inventoryFolderID">The ID of the destination folder in this agents inventory</param>
+            <param name="simulator">Simulator Object</param>
+            <remarks>Raises the <see cref="M:OpenMetaverse.InventoryManager.OnTaskItemReceived(OpenMetaverse.TaskItemReceivedEventArgs)"/> event</remarks>
         </member>
-        <member name="T:OpenMetaverse.Transfer">
+        <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="P:OpenMetaverse.Transfer.TimeSinceLastPacket">
-            <summary>Number of milliseconds passed since the last transfer
-            packet was received</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="T:OpenMetaverse.AssetDownload">
+        <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="T:OpenMetaverse.XferDownload">
+        <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="T:OpenMetaverse.ImageDownload">
+        <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="T:OpenMetaverse.AssetUpload">
+        <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="T:OpenMetaverse.ImageRequest">
+        <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="M:OpenMetaverse.ImageRequest.#ctor(OpenMetaverse.UUID,OpenMetaverse.ImageType,System.Single,System.Int32)">
+        <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="imageid"></param>
-            <param name="type"></param>
-            <param name="priority"></param>
-            <param name="discardLevel"></param>
+            <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="T:OpenMetaverse.AssetManager">
+        <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>
-        <member name="F:OpenMetaverse.AssetManager.TRANSFER_HEADER_TIMEOUT">
-            <summary>Number of milliseconds to wait for a transfer header packet if out of order data was received</summary>
-        </member>
-        <member name="F:OpenMetaverse.AssetManager.m_XferReceivedEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="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="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.AssetManager.m_XferReceivedLock">
-            <summary>Thread sync lock object</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.AssetManager.m_AssetUploadedEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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="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="M:OpenMetaverse.InventoryManager.MoveInventoryItemHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_AssetUploadedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.InventoryManager.BulkUpdateInventoryHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_UploadProgressEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.InventoryManager.FetchInventoryReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="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="M:OpenMetaverse.InventoryManager.ReplyTaskInventoryHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_UploadProgressLock">
-            <summary>Thread sync lock object</summary>
+        <member name="E:OpenMetaverse.InventoryManager.ItemReceived">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_InitiateDownloadEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="E:OpenMetaverse.InventoryManager.FolderUpdated">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.OnInitiateDownload(OpenMetaverse.InitiateDownloadEventArgs)">
-            <summary>Raises the InitiateDownload event</summary>
-            <param name="e">A InitiateDownloadEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="E:OpenMetaverse.InventoryManager.InventoryObjectOffered">
+            <summary>Raised when the simulator sends us data containing
+            an inventory object sent by another avatar or primitive</summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_InitiateDownloadLock">
-            <summary>Thread sync lock object</summary>
+        <member name="E:OpenMetaverse.InventoryManager.TaskItemReceived">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_ImageReceiveProgressEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="E:OpenMetaverse.InventoryManager.FindObjectByPathReply">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.OnImageReceiveProgress(OpenMetaverse.ImageReceiveProgressEventArgs)">
-            <summary>Raises the ImageReceiveProgress event</summary>
-            <param name="e">A ImageReceiveProgressEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="E:OpenMetaverse.InventoryManager.TaskInventoryReply">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_ImageReceiveProgressLock">
-            <summary>Thread sync lock object</summary>
+        <member name="E:OpenMetaverse.InventoryManager.SaveAssetToInventory">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.Cache">
-            <summary>Texture download cache</summary>
+        <member name="E:OpenMetaverse.InventoryManager.ScriptRunningReply">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="P:OpenMetaverse.InventoryManager.Store">
             <summary>
-            Default constructor
+            Get this agents Inventory data
             </summary>
-            <param name="client">A reference to the GridClient object</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.AssetManager.AssetReceivedCallback)">
+        <member name="T:OpenMetaverse.InventoryManager.ItemCreatedCallback">
             <summary>
-            Request an asset download
+            Callback for inventory item creation finishing
             </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>
+            <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="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.SourceType,OpenMetaverse.AssetManager.AssetReceivedCallback)">
+        <member name="T:OpenMetaverse.InventoryManager.ItemCreatedFromAssetCallback">
             <summary>
-            Request an asset download
+            Callback for an inventory item being create from an uploaded asset
             </summary>
-            <param name="assetID">Asset UUID</param>
-            <param name="type">Asset type, must be correct for the transfer to succeed</param>
-            <param name="priority">Whether to give this transfer an elevated priority</param>
-            <param name="sourceType">Source location of the requested asset</param>
-            <param name="callback">The callback to fire when the simulator responds with the asset data</param>
+            <param name="success">true if inventory item creation was successful</param>
+            <param name="status"></param>
+            <param name="itemID"></param>
+            <param name="assetID"></param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.SourceType,OpenMetaverse.UUID,OpenMetaverse.AssetManager.AssetReceivedCallback)">
+        <member name="T:OpenMetaverse.InventoryManager.ItemCopiedCallback">
             <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>
+            <param name="item"></param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestAssetXfer(System.String,System.Boolean,System.Boolean,OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean)">
+        <member name="T:OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback">
             <summary>
-            Request an asset download through the almost deprecated Xfer system
+            Reply received when uploading an inventory asset
             </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>
+            <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="M:OpenMetaverse.AssetManager.RequestInventoryAsset(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.AssetManager.AssetReceivedCallback)">
+        <member name="T:OpenMetaverse.InventoryManager.ScriptUpdatedCallback">
             <summary>
-            
+            Delegate that is invoked when script upload is completed
             </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>
+            <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="M:OpenMetaverse.AssetManager.SetPendingAssetUploadData(OpenMetaverse.AssetUpload)">
+        <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>
-            Used to force asset data into the PendingUpload property, ie: for raw terrain uploads
+            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>
-            <param name="assetData">An AssetUpload object containing the data to upload to the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.Assets.Asset,System.Boolean)">
+        <member name="T:OpenMetaverse.GridLayerType">
             <summary>
-            Request an asset be uploaded to the simulator
+            Map layer request type
             </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>
-        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.AssetType,System.Byte[],System.Boolean)">
+        <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>
-            Request an asset be uploaded to the simulator
+            Type of grid item, such as telehub, event, populator location, etc.
             </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>
-        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.UUID@,OpenMetaverse.AssetType,System.Byte[],System.Boolean)">
+        <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>
-            Request an asset be uploaded to the simulator
+            Information about a region on the grid map
             </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>
-        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.UUID@,OpenMetaverse.AssetType,System.Byte[],System.Boolean,OpenMetaverse.UUID)">
+        <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>
-            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>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,System.Single,System.Int32,System.UInt32,OpenMetaverse.TextureDownloadCallback,System.Boolean)">
-             <summary>
-             Request a texture asset from the simulator using the <see cref="T:OpenMetaverse.TexturePipeline"/> system to 
-             manage the requests and re-assemble the image from the packets received from the simulator
-             </summary>
-             <param name="textureID">The <see cref="T:OpenMetaverse.UUID"/> of the texture asset to download</param>
-             <param name="imageType">The <see cref="T:OpenMetaverse.ImageType"/> of the texture asset. 
-             Use <see cref="F:OpenMetaverse.ImageType.Normal"/> for most textures, or <see cref="F:OpenMetaverse.ImageType.Baked"/> for baked layer texture assets</param>
-             <param name="priority">A float indicating the requested priority for the transfer. Higher priority values tell the simulator
-             to prioritize the request before lower valued requests. An image already being transferred using the <see cref="T:OpenMetaverse.TexturePipeline"/> can have
-             its priority changed by resending the request with the new priority value</param>
-             <param name="discardLevel">Number of quality layers to discard.
-             This controls the end marker of the data sent. Sending with value -1 combined with priority of 0 cancels an in-progress
-             transfer.</param>
-             <remarks>A bug exists in the Linden Simulator where a -1 will occasionally be sent with a non-zero priority
-             indicating an off-by-one error.</remarks>
-             <param name="packetStart">The packet number to begin the request at. A value of 0 begins the request
-             from the start of the asset texture</param>
-             <param name="callback">The <see cref="T:OpenMetaverse.TextureDownloadCallback"/> callback to fire when the image is retrieved. The callback
-             will contain the result of the request and the texture asset data</param>
-             <param name="progress">If true, the callback will be fired for each chunk of the downloaded image. 
-             The callback asset parameter will contain all previously received chunks of the texture asset starting 
-             from the beginning of the request</param>
-             <example>
-             Request an image and fire a callback when the request is complete
-             <code>
-             Client.Assets.RequestImage(UUID.Parse("c307629f-e3a1-4487-5e88-0d96ac9d4965"), ImageType.Normal, TextureDownloader_OnDownloadFinished);
-             
-             private void TextureDownloader_OnDownloadFinished(TextureRequestState state, AssetTexture asset)
-             {
-                 if(state == TextureRequestState.Finished)
-                 {
-                   Console.WriteLine("Texture {0} ({1} bytes) has been successfully downloaded", 
-                     asset.AssetID,
-                     asset.AssetData.Length); 
-                 }
-             }
-             </code>
-             Request an image and use an inline anonymous method to handle the downloaded texture data
-             <code>
-             Client.Assets.RequestImage(UUID.Parse("c307629f-e3a1-4487-5e88-0d96ac9d4965"), ImageType.Normal, delegate(TextureRequestState state, AssetTexture asset) 
-                                                     {
-                                                         if(state == TextureRequestState.Finished)
-                                                         {
-                                                             Console.WriteLine("Texture {0} ({1} bytes) has been successfully downloaded", 
-                                                             asset.AssetID,
-                                                             asset.AssetData.Length); 
-                                                         }
-                                                     }
-             );
-             </code>
-             Request a texture, decode the texture to a bitmap image and apply it to a imagebox 
-             <code>
-             Client.Assets.RequestImage(UUID.Parse("c307629f-e3a1-4487-5e88-0d96ac9d4965"), ImageType.Normal, TextureDownloader_OnDownloadFinished);
-             
-             private void TextureDownloader_OnDownloadFinished(TextureRequestState state, AssetTexture asset)
-             {
-                 if(state == TextureRequestState.Finished)
-                 {
-                     ManagedImage imgData;
-                     Image bitmap;
+        <member name="M:OpenMetaverse.GridRegion.GetHashCode">
+            <summary>
             
-                     if (state == TextureRequestState.Finished)
-                     {
-                         OpenJPEG.DecodeToImage(assetTexture.AssetData, out imgData, out bitmap);
-                         picInsignia.Image = bitmap;
-                     }               
-                 }
-             }
-             </code>
-             </example>
+            </summary>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.TextureDownloadCallback)">
+        <member name="M:OpenMetaverse.GridRegion.Equals(System.Object)">
             <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>
+            <param name="obj"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,OpenMetaverse.TextureDownloadCallback)">
+        <member name="T:OpenMetaverse.GridLayer">
             <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
+            Visual chunk of the grid map
             </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>
-        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,OpenMetaverse.TextureDownloadCallback,System.Boolean)">
+        <member name="T:OpenMetaverse.MapItem">
             <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
+            Base class for Map Items
             </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.AssetManager.RequestImageCancel(OpenMetaverse.UUID)">
+        <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>
-            Cancel a texture request
+            Represents an agent or group of agents location
             </summary>
-            <param name="textureID">The texture assets <see cref="T:OpenMetaverse.UUID"/></param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestMesh(OpenMetaverse.UUID,OpenMetaverse.AssetManager.MeshDownloadCallback)">
+        <member name="T:OpenMetaverse.MapTelehub">
             <summary>
-            Requests download of a mesh asset
+            Represents a Telehub location
             </summary>
-            <param name="meshID">UUID of the mesh asset</param>
-            <param name="callback">Callback when the request completes</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestServerBakedImage(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.TextureDownloadCallback)">
+        <member name="T:OpenMetaverse.MapLandForSale">
             <summary>
-            Fetach avatar texture on a grid capable of server side baking
+            Represents a non-adult parcel of land for sale
             </summary>
-            <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.AssetManager.FireImageProgressEvent(OpenMetaverse.UUID,System.Int32,System.Int32)">
+        <member name="T:OpenMetaverse.MapAdultLandForSale">
             <summary>
-            Lets TexturePipeline class fire the progress event
+            Represents an Adult parcel of land for sale
             </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>
-        <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.MapPGEvent">
+            <summary>
+            Represents a PG Event
+            </summary>
         </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.MapMatureEvent">
+            <summary>
+            Represents a Mature event
+            </summary>
         </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.MapAdultEvent">
+            <summary>
+            Represents an Adult event
+            </summary>
         </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.GridManager">
+            <summary>
+            Manages grid-wide tasks such as the world map
+            </summary>
         </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="F:OpenMetaverse.GridManager.m_CoarseLocationUpdate">
+            <summary>The event subscribers. null if no subcribers</summary>
         </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="M:OpenMetaverse.GridManager.OnCoarseLocationUpdate(OpenMetaverse.CoarseLocationUpdateEventArgs)">
+            <summary>Raises the CoarseLocationUpdate event</summary>
+            <param name="e">A CoarseLocationUpdateEventArgs object containing the
+            data sent by simulator</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.SendXferPacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.GridManager.m_CoarseLocationUpdateLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.AbortXferHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.GridManager.m_GridRegion">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="E:OpenMetaverse.AssetManager.XferReceived">
-            <summary>Raised when the simulator responds sends </summary>
+        <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="E:OpenMetaverse.AssetManager.AssetUploaded">
-            <summary>Raised during upload completes</summary>
+        <member name="F:OpenMetaverse.GridManager.m_GridRegionLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="E:OpenMetaverse.AssetManager.UploadProgress">
-            <summary>Raised during upload with progres update</summary>
+        <member name="F:OpenMetaverse.GridManager.m_GridLayer">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="E:OpenMetaverse.AssetManager.InitiateDownload">
-            <summary>Fired when the simulator sends an InitiateDownloadPacket, used to download terrain .raw files</summary>
+        <member name="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="E:OpenMetaverse.AssetManager.ImageReceiveProgress">
-            <summary>Fired when a texture is in the process of being downloaded by the TexturePipeline class</summary>
+        <member name="F:OpenMetaverse.GridManager.m_GridLayerLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.AssetManager.AssetReceivedCallback">
+        <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>
-            Callback used for various asset download requests
+            Constructor
             </summary>
-            <param name="transfer">Transfer information</param>
-            <param name="asset">Downloaded asset, null on fail</param>
+            <param name="client">Instance of GridClient object to associate with this GridManager instance</param>
         </member>
-        <member name="T:OpenMetaverse.AssetManager.BakedTextureUploadedCallback">
+        <member name="M:OpenMetaverse.GridManager.RequestMapLayer(OpenMetaverse.GridLayerType)">
             <summary>
-            Callback used upon competition of baked texture upload
+            
             </summary>
-            <param name="newAssetID">Asset UUID of the newly uploaded baked texture</param>
+            <param name="layer"></param>
+        </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>
+        <member name="M:OpenMetaverse.GridManager.RequestMapBlocks(OpenMetaverse.GridLayerType,System.UInt16,System.UInt16,System.UInt16,System.UInt16,System.Boolean)">
+            <summary>
+            
+            </summary>
+            <param name="layer"></param>
+            <param name="minX"></param>
+            <param name="minY"></param>
+            <param name="maxX"></param>
+            <param name="maxY"></param>
+            <param name="returnNonExistent"></param>
+        </member>
+        <member name="M:OpenMetaverse.GridManager.MapItems(System.UInt64,OpenMetaverse.GridItemType,OpenMetaverse.GridLayerType,System.Int32)">
+            <summary>
+            
+            </summary>
+            <param name="regionHandle"></param>
+            <param name="item"></param>
+            <param name="layer"></param>
+            <param name="timeoutMS"></param>
+            <returns></returns>
+        </member>
+        <member name="M:OpenMetaverse.GridManager.RequestMapItems(System.UInt64,OpenMetaverse.GridItemType,OpenMetaverse.GridLayerType)">
+            <summary>
+            
+            </summary>
+            <param name="regionHandle"></param>
+            <param name="item"></param>
+            <param name="layer"></param>
+        </member>
+        <member name="M:OpenMetaverse.GridManager.RequestMainlandSims(OpenMetaverse.GridLayerType)">
+            <summary>
+            Request data for all mainland (Linden managed) simulators
+            </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>
-        <member name="T:OpenMetaverse.AssetManager.MeshDownloadCallback">
+        <member name="M:OpenMetaverse.GridManager.GetGridRegion(System.String,OpenMetaverse.GridLayerType,OpenMetaverse.GridRegion@)">
             <summary>
-            A callback that fires upon the completition of the RequestMesh call
+            Get grid region information using the region name, this function
+            will block until it can find the region or gives up
             </summary>
-            <param name="success">Was the download successfull</param>
-            <param name="assetMesh">Resulting mesh or null on problems</param>
-        </member>
-        <member name="P:OpenMetaverse.XferReceivedEventArgs.Xfer">
-            <summary>Xfer data</summary>
-        </member>
-        <member name="P:OpenMetaverse.AssetUploadEventArgs.Upload">
-            <summary>Upload data</summary>
-        </member>
-        <member name="P:OpenMetaverse.InitiateDownloadEventArgs.SimFileName">
-            <summary>Filename used on the simulator</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="P:OpenMetaverse.InitiateDownloadEventArgs.ViewerFileName">
-            <summary>Filename used by the client</summary>
+        <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="P:OpenMetaverse.ImageReceiveProgressEventArgs.ImageID">
-            <summary>UUID of the image that is in progress</summary>
+        <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="P:OpenMetaverse.ImageReceiveProgressEventArgs.Received">
-            <summary>Number of bytes received so far</summary>
+        <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="P:OpenMetaverse.ImageReceiveProgressEventArgs.Total">
-            <summary>Image size in bytes</summary>
+        <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="F:OpenMetaverse.TerrainManager.m_LandPatchReceivedEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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="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="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="F:OpenMetaverse.TerrainManager.m_LandPatchReceivedLock">
-            <summary>Thread sync lock object</summary>
+        <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="M:OpenMetaverse.TerrainManager.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Default constructor
-            </summary>
-            <param name="client"></param>
+        <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.TerrainManager.LandPatchReceived">
-            <summary>Raised when the simulator responds sends </summary>
+        <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="P:OpenMetaverse.LandPatchReceivedEventArgs.Simulator">
-            <summary>Simulator from that sent tha data</summary>
+        <member name="E:OpenMetaverse.GridManager.RegionHandleReply">
+            <summary>Raised in response to a Region lookup</summary>
         </member>
-        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.X">
-            <summary>Sim coordinate of the patch</summary>
+        <member name="P:OpenMetaverse.GridManager.SunPhase">
+            <summary>Unknown</summary>
         </member>
-        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.Y">
-            <summary>Sim coordinate of the patch</summary>
+        <member name="P:OpenMetaverse.GridManager.SunDirection">
+            <summary>Current direction of the sun</summary>
         </member>
-        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.PatchSize">
-            <summary>Size of tha patch</summary>
+        <member name="P:OpenMetaverse.GridManager.SunAngVelocity">
+            <summary>Current angular velocity of the sun</summary>
         </member>
-        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.HeightMap">
-            <summary>Heightmap for the patch</summary>
+        <member name="P:OpenMetaverse.GridManager.TimeOfDay">
+            <summary>Microseconds since the start of SL 4-hour day</summary>
         </member>
-        <member name="T:OpenMetaverse.PacketEventDictionary">
+        <member name="M:OpenMetaverse.CoordinateFrame.LookDirection(OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
             <summary>
-            Registers, unregisters, and fires events generated by incoming packets
+            
             </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.PacketEventDictionary.Client">
-            <summary>Reference to the GridClient object</summary>
-        </member>
-        <member name="M:OpenMetaverse.PacketEventDictionary.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.CoordinateFrame.LookDirection(System.Double)">
             <summary>
-            Default constructor
+            Align the coordinate frame X and Y axis with a given rotation
+            around the Z axis in radians
             </summary>
-            <param name="client"></param>
+            <param name="heading">Absolute rotation around the Z axis in
+            radians</param>
         </member>
-        <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 name="P:OpenMetaverse.CoordinateFrame.Origin">
+            <summary>Origin position of this coordinate frame</summary>
         </member>
-        <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 name="P:OpenMetaverse.CoordinateFrame.XAxis">
+            <summary>X axis of this coordinate frame, or Forward/At in grid terms</summary>
         </member>
-        <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 name="P:OpenMetaverse.CoordinateFrame.YAxis">
+            <summary>Y axis of this coordinate frame, or Left in grid terms</summary>
         </member>
-        <member name="T:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper">
+        <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>
-            Object that is passed to worker threads in the ThreadPool for
-            firing packet callbacks
+            Represents a texture
             </summary>
         </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 name="F:OpenMetaverse.Assets.AssetTexture.Image">
+            <summary>A <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object containing image data</summary>
         </member>
-        <member name="T:OpenMetaverse.CapsEventDictionary">
-            <summary>
-            Registers, unregisters, and fires events generated by the Capabilities
-            event queue
-            </summary>
+        <member name="F:OpenMetaverse.Assets.AssetTexture.LayerInfo">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.CapsEventDictionary.Client">
-            <summary>Reference to the GridClient object</summary>
+        <member name="F:OpenMetaverse.Assets.AssetTexture.Components">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.CapsEventDictionary.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Default constructor
-            </summary>
-            <param name="client">Reference to the GridClient object</param>
+        <member name="M:OpenMetaverse.Assets.AssetTexture.#ctor">
+            <summary>Initializes a new instance of an AssetTexture object</summary>
         </member>
-        <member name="M:OpenMetaverse.CapsEventDictionary.RegisterEvent(System.String,OpenMetaverse.Caps.EventQueueCallback)">
+        <member name="M:OpenMetaverse.Assets.AssetTexture.#ctor(OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            Register an new event handler for a capabilities event sent via the EventQueue
+            Initializes a new instance of an AssetTexture object
             </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="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.CapsEventDictionary.UnregisterEvent(System.String,OpenMetaverse.Caps.EventQueueCallback)">
+        <member name="M:OpenMetaverse.Assets.AssetTexture.#ctor(OpenMetaverse.Imaging.ManagedImage)">
             <summary>
-            Unregister a previously registered capabilities handler 
+            Initializes a new instance of an AssetTexture object
             </summary>
-            <param name="capsEvent">Capability event name unregister the 
-            handler for</param>
-            <param name="eventHandler">Callback to unregister</param>
+            <param name="image">A <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object containing texture data</param>
         </member>
-        <member name="M:OpenMetaverse.CapsEventDictionary.RaiseEvent(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.Assets.AssetTexture.Encode">
             <summary>
-            Fire the events registered for this event type synchronously
+            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>
-            <param name="capsEvent">Capability name</param>
-            <param name="message">Decoded event body</param>
-            <param name="simulator">Reference to the simulator that 
-            generated this event</param>
         </member>
-        <member name="M:OpenMetaverse.CapsEventDictionary.BeginRaiseEvent(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.Assets.AssetTexture.Decode">
             <summary>
-            Fire the events registered for this event type asynchronously
+            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>
-            <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>
+            <returns>True if the decoding was successful, otherwise false</returns>
         </member>
-        <member name="T:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper">
+        <member name="M:OpenMetaverse.Assets.AssetTexture.DecodeLayerBoundaries">
             <summary>
-            Object that is passed to worker threads in the ThreadPool for
-            firing CAPS callbacks
+            Decodes the begin and end byte positions for each quality layer in
+            the image
             </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Callback">
-            <summary>Callback to fire for this packet</summary>
-        </member>
-        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.CapsEvent">
-            <summary>Name of the CAPS event</summary>
-        </member>
-        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Message">
-            <summary>Strongly typed decoded data</summary>
-        </member>
-        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Simulator">
-            <summary>Reference to the simulator that generated this event</summary>
-        </member>
-        <member name="T:OpenMetaverse.EstateTask">
-            <summary>Describes tasks returned in LandStatReply</summary>
+        <member name="P:OpenMetaverse.Assets.AssetTexture.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools">
+        <member name="T:OpenMetaverse.Settings">
             <summary>
-            Estate level administration and utilities
+            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.EstateTools.GroundTextures">
-            <summary>Textures for each of the four terrain height levels</summary>
+        <member name="F:OpenMetaverse.Settings.AGNI_LOGIN_SERVER">
+            <summary>Main grid login server</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.GroundTextureLimits">
-            <summary>Upper/lower texture boundaries for each corner of the sim</summary>
+        <member name="F:OpenMetaverse.Settings.ADITI_LOGIN_SERVER">
+            <summary>Beta grid login server</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.#ctor(OpenMetaverse.GridClient)">
+        <member name="F:OpenMetaverse.Settings.ENABLE_INVENTORY_STORE">
             <summary>
-            Constructor for EstateTools class
+            InventoryManager requests inventory information on login,
+            GridClient initializes an Inventory store for main inventory.
             </summary>
-            <param name="client"></param>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_TopCollidersReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Settings.ENABLE_LIBRARY_STORE">
+            <summary>
+            InventoryManager requests library information on login,
+            GridClient initializes an Inventory store for the library.
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.OnTopCollidersReply(OpenMetaverse.TopCollidersReplyEventArgs)">
-            <summary>Raises the TopCollidersReply event</summary>
-            <param name="e">A TopCollidersReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.Settings.PING_INTERVAL">
+            <summary>Number of milliseconds between sending pings to each sim</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_TopCollidersReply_Lock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Settings.DEFAULT_AGENT_UPDATE_INTERVAL">
+            <summary>Number of milliseconds between sending camera updates</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_TopScriptsReply">
-            <summary>The event subscribers. null if no subcribers</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="M:OpenMetaverse.EstateTools.OnTopScriptsReply(OpenMetaverse.TopScriptsReplyEventArgs)">
-            <summary>Raises the TopScriptsReply event</summary>
-            <param name="e">A TopScriptsReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.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.EstateTools.m_TopScriptsReply_Lock">
-            <summary>Thread sync lock object</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="F:OpenMetaverse.EstateTools.m_EstateUsersReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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="M:OpenMetaverse.EstateTools.OnEstateUsersReply(OpenMetaverse.EstateUsersReplyEventArgs)">
-            <summary>Raises the EstateUsersReply event</summary>
-            <param name="e">A EstateUsersReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.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.EstateTools.m_EstateUsersReply_Lock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Settings.RESOURCE_DIR">
+            <summary>The relative directory where external resources are kept</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateGroupsReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Settings.LOGIN_SERVER">
+            <summary>Login server to connect to</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.OnEstateGroupsReply(OpenMetaverse.EstateGroupsReplyEventArgs)">
-            <summary>Raises the EstateGroupsReply event</summary>
-            <param name="e">A EstateGroupsReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.Settings.BIND_ADDR">
+            <summary>IP Address the client will bind to</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateGroupsReply_Lock">
-            <summary>Thread sync lock object</summary>
+        <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.EstateTools.m_EstateManagersReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Settings.HTTP_INVENTORY">
+            <summary>
+            Use Caps for fetching inventory where available
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.OnEstateManagersReply(OpenMetaverse.EstateManagersReplyEventArgs)">
-            <summary>Raises the EstateManagersReply event</summary>
-            <param name="e">A EstateManagersReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.Settings.TRANSFER_TIMEOUT">
+            <summary>Number of milliseconds before an asset transfer will time
+            out</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateManagersReply_Lock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Settings.TELEPORT_TIMEOUT">
+            <summary>Number of milliseconds before a teleport attempt will time
+            out</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateBansReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Settings.LOGOUT_TIMEOUT">
+            <summary>Number of milliseconds before NetworkManager.Logout() will
+            time out</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.OnEstateBansReply(OpenMetaverse.EstateBansReplyEventArgs)">
-            <summary>Raises the EstateBansReply event</summary>
-            <param name="e">A EstateBansReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.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.EstateTools.m_EstateBansReply_Lock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Settings.LOGIN_TIMEOUT">
+            <summary>Number of milliseconds for xml-rpc to timeout</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateCovenantReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Settings.RESEND_TIMEOUT">
+            <summary>Milliseconds before a packet is assumed lost and resent</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.OnEstateCovenantReply(OpenMetaverse.EstateCovenantReplyEventArgs)">
-            <summary>Raises the EstateCovenantReply event</summary>
-            <param name="e">A EstateCovenantReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.Settings.SIMULATOR_TIMEOUT">
+            <summary>Milliseconds without receiving a packet before the 
+            connection to a simulator is assumed lost</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateCovenantReply_Lock">
-            <summary>Thread sync lock object</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="F:OpenMetaverse.EstateTools.m_EstateUpdateInfoReply">
-            <summary>The event subscribers. null if no subcribers</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.EstateTools.OnEstateUpdateInfoReply(OpenMetaverse.EstateUpdateInfoReplyEventArgs)">
-            <summary>Raises the EstateUpdateInfoReply event</summary>
-            <param name="e">A EstateUpdateInfoReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.Settings.MAX_PENDING_ACKS">
+            <summary>Maximum number of queued ACKs to be sent before SendAcks()
+            is forced</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateUpdateInfoReply_Lock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Settings.STATS_QUEUE_SIZE">
+            <summary>Network stats queue length (seconds)</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)">
+        <member name="F:OpenMetaverse.Settings.CACHE_PRIMITIVES">
             <summary>
-            Requests estate information such as top scripts and colliders
+            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>
-            <param name="parcelLocalID"></param>
-            <param name="reportType"></param>
-            <param name="requestFlags"></param>
-            <param name="filter"></param>
-        </member>
-        <member name="M:OpenMetaverse.EstateTools.RequestInfo">
-            <summary>Requests estate settings, including estate manager and access/ban lists</summary>
-        </member>
-        <member name="M:OpenMetaverse.EstateTools.RequestTopScripts">
-            <summary>Requests the "Top Scripts" list for the current region</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.RequestTopColliders">
-            <summary>Requests the "Top Colliders" list for the current region</summary>
-        </member>
-        <member name="M:OpenMetaverse.EstateTools.SetTerrainVariables(System.Single,System.Single,System.Single,System.Boolean,System.Boolean,System.Single)">
+        <member name="F:OpenMetaverse.Settings.POOL_PARCEL_DATA">
             <summary>
-            Set several estate specific configuration variables
+            Pool parcel data between clients (saves on requesting multiple times when all clients may need it)
             </summary>
-            <param name="WaterHeight">The Height of the waterlevel over the entire estate. Defaults to 20</param>
-            <param name="TerrainRaiseLimit">The maximum height change allowed above the baked terrain. Defaults to 4</param>
-            <param name="TerrainLowerLimit">The minimum height change allowed below the baked terrain. Defaults to -4</param>
-            <param name="UseEstateSun">true to use</param>
-            <param name="FixedSun">if True forces the sun position to the position in SunPosition</param>
-            <param name="SunPosition">The current position of the sun on the estate, or when FixedSun is true the static position
-            the sun will remain. <remarks>6.0 = Sunrise, 30.0 = Sunset</remarks></param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.SimWideReturn(OpenMetaverse.UUID,OpenMetaverse.EstateTools.EstateReturnFlags,System.Boolean)">
+        <member name="F:OpenMetaverse.Settings.SIMULATOR_POOL_TIMEOUT">
             <summary>
-            Request return of objects owned by specified avatar 
+            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="Target">The Agents <see cref="T:OpenMetaverse.UUID"/> owning the primitives to return</param>
-            <param name="flag">specify the coverage and type of objects to be included in the return</param>
-            <param name="EstateWide">true to perform return on entire estate</param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.EstateOwnerMessage(System.String,System.String)">
-            <summary></summary>
-            <param name="method"></param>
-            <param name="param"></param>
+        <member name="F:OpenMetaverse.Settings.STORE_LAND_PATCHES">
+            <summary>Enable/disable storing terrain heightmaps in the 
+            TerrainManager</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.EstateOwnerMessage(System.String,System.Collections.Generic.List{System.String})">
-            <summary>
-            Used for setting and retrieving various estate panel settings
-            </summary>
-            <param name="method">EstateOwnerMessage Method field</param>
-            <param name="listParams">List of parameters to include</param>
+        <member name="F:OpenMetaverse.Settings.SEND_AGENT_UPDATES">
+            <summary>Enable/disable sending periodic camera updates</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.KickUser(OpenMetaverse.UUID)">
-            <summary>
-            Kick an avatar from an estate
-            </summary>
-            <param name="userID">Key of Agent to remove</param>
+        <member 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.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 name="F:OpenMetaverse.Settings.SEND_AGENT_THROTTLE">
+            <summary>Enable/disable automatically setting the bandwidth throttle
+            after connecting to each simulator</summary>
+            <remarks>The default throttle uses the equivalent of the maximum
+            bandwidth setting in the official client. If you do not set a
+            throttle your connection will by default be throttled well below
+            the minimum values and you may experience connection problems</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Settings.SEND_PINGS">
+            <summary>Enable/disable the sending of pings to monitor lag and 
+            packet loss</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.MULTIPLE_SIMS">
+            <summary>Should we connect to multiple sims? This will allow
+            viewing in to neighboring simulators and sim crossings
+            (Experimental)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.ALWAYS_DECODE_OBJECTS">
+            <summary>If true, all object update packets will be decoded in to
+            native objects. If false, only updates for our own agent will be
+            decoded. Registering an event handler will force objects for that
+            type to always be decoded. If this is disabled the object tracking
+            will have missing or partial prim and avatar information</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.ALWAYS_REQUEST_OBJECTS">
+            <summary>If true, when a cached object check is received from the
+            server the full object info will automatically be requested</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.ENABLE_CAPS">
+            <summary>Whether to establish connections to HTTP capabilities
+            servers for simulators</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.ENABLE_SIMSTATS">
+            <summary>Whether to decode sim stats</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.LOG_ALL_CAPS_ERRORS">
+            <summary>The capabilities servers are currently designed to
+            periodically return a 502 error which signals for the client to
+            re-establish a connection. Set this to true to log those 502 errors</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.FETCH_MISSING_INVENTORY">
+            <summary>If true, any reference received for a folder or item
+            the library is not aware of will automatically be fetched</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.DISABLE_AGENT_UPDATE_DUPLICATE_CHECK">
+            <summary>If true, and <code>SEND_AGENT_UPDATES</code> is true,
+            AgentUpdate packets will continuously be sent out to give the bot
+            smoother movement and autopiloting</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.AVATAR_TRACKING">
+            <summary>If true, currently visible avatars will be stored
+            in dictionaries inside <code>Simulator.ObjectAvatars</code>.
+            If false, a new Avatar or Primitive object will be created
+            each time an object update packet is received</summary>
         </member>
-        <member name="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 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="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 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="M:OpenMetaverse.EstateTools.SimulatorMessage(System.String)">
+        <member name="F:OpenMetaverse.Settings.TRACK_UTILIZATION">
             <summary>
-            Send a message dialog to everyone in a simulator
+            If true, utilization statistics will be tracked. There is a minor penalty
+            in CPU time for enabling this option.
             </summary>
-            <param name="message">Message to send all users in the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.TeleportHomeUser(OpenMetaverse.UUID)">
+        <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>
-            Send an avatar back to their home location
+            If true, an incoming parcel properties reply will automatically send
+            a request for the parcel access list
             </summary>
-            <param name="pest">Key of avatar to send home</param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.RestartRegion">
+        <member name="F:OpenMetaverse.Settings.ALWAYS_REQUEST_PARCEL_DWELL">
             <summary>
-            Begin the region restart process
+            if true, an incoming parcel properties reply will automatically send 
+            a request for the traffic count.
             </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.CancelRestart">
+        <member name="F:OpenMetaverse.Settings.USE_ASSET_CACHE">
             <summary>
-            Cancels a region restart
+            If true, images, and other assets downloaded from the server 
+            will be cached in a local directory
             </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.Settings.ASSET_CACHE_DIR">
+            <summary>Path to store cached texture data</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.Settings.ASSET_CACHE_MAX_SIZE">
+            <summary>Maximum size cached files are allowed to take on disk (bytes)</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.Settings.DEFAULT_EFFECT_COLOR">
+            <summary>Default color used for viewer particle effects</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.Settings.MAX_RESEND_COUNT">
+            <summary>Maximum number of times to resend a failed packet</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.RequestCovenant">
-            <summary>Requests the estate covenant</summary>
+        <member name="F:OpenMetaverse.Settings.THROTTLE_OUTGOING_PACKETS">
+            <summary>Throttle outgoing packet rate</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.Settings.CLIENT_IDENTIFICATION_TAG">
+            <summary>UUID of a texture used by some viewers to indentify type of client used</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.TeleportHomeAllUsers">
+        <member name="F:OpenMetaverse.Settings.USE_HTTP_TEXTURES">
             <summary>
-            Teleports all users home in current Estate
+            Download textures using GetTexture capability when available
             </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.RemoveEstateManager(OpenMetaverse.UUID,System.Boolean)">
-            <summary>
-            Remove estate manager</summary>
-            <param name="userID">Key of Agent to Remove</param>
-            <param name="allEstates">removes manager to this estate and all others owned by the estate owner</param>
+        <member 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="M:OpenMetaverse.EstateTools.AddEstateManager(OpenMetaverse.UUID,System.Boolean)">
+        <member name="F:OpenMetaverse.Settings.PIPELINE_REFRESH_INTERVAL">
             <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>
+            The Refresh timer inteval is used to set the delay between checks for stalled texture downloads
+            </summary>
+            <remarks>This is a static variable which applies to all instances</remarks>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.AddAllowedUser(OpenMetaverse.UUID,System.Boolean)">
+        <member name="F:OpenMetaverse.Settings.PIPELINE_REQUEST_TIMEOUT">
             <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>
+            Textures taking longer than this value will be flagged as timed out and removed from the pipeline
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.RemoveAllowedUser(OpenMetaverse.UUID,System.Boolean)">
+        <member name="F:OpenMetaverse.Settings.LOG_LEVEL">
             <summary>
-            Removes an agent from the estate Allowed list</summary>
-            <param name="userID">Key of Agent to Remove</param>
-            <param name="allEstates">Removes agent as an allowed reisdent from All estates if true</param>
-        </member>
-        <member name="M:OpenMetaverse.EstateTools.AddAllowedGroup(OpenMetaverse.UUID,System.Boolean)">
+            Get or set the minimum log level to output to the console by default
             
-             <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>
+            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.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.Settings.LOG_NAMES">
+            <summary>Attach avatar names to log messages</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.Settings.LOG_RESENDS">
+            <summary>Log packet retransmission info</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.Settings.LOG_DISKCACHE">
+            <summary>Log disk cache misses and other info</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.LandStatReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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="E:OpenMetaverse.EstateTools.TopCollidersReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)"/> request.</summary>
-        </member>
-        <member name="E:OpenMetaverse.EstateTools.TopScriptsReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)"/> request.</summary>
-        </member>
-        <member name="E:OpenMetaverse.EstateTools.EstateUsersReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)"/> request.</summary>
-        </member>
-        <member name="E:OpenMetaverse.EstateTools.EstateGroupsReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)"/> request.</summary>
-        </member>
-        <member name="E:OpenMetaverse.EstateTools.EstateManagersReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)"/> request.</summary>
-        </member>
-        <member name="E:OpenMetaverse.EstateTools.EstateBansReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)"/> request.</summary>
-        </member>
-        <member name="E:OpenMetaverse.EstateTools.EstateCovenantReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)"/> request.</summary>
+        <member 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="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="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="T:OpenMetaverse.EstateTools.LandStatReportType">
-            <summary>Used in the ReportType field of a LandStatRequest</summary>
+        <member name="F:OpenMetaverse.GridClient.Network">
+            <summary>Networking subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools.EstateAccessDelta">
-            <summary>Used by EstateOwnerMessage packets</summary>
+        <member name="F:OpenMetaverse.GridClient.Settings">
+            <summary>Settings class including constant values and changeable
+            parameters for everything</summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools.EstateAccessReplyDelta">
-            <summary>Used by EstateOwnerMessage packets</summary>
+        <member name="F:OpenMetaverse.GridClient.Parcels">
+            <summary>Parcel (subdivided simulator lots) subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools.EstateReturnFlags">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.GridClient.Self">
+            <summary>Our own avatars subsystem</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.None">
-            <summary>No flags set</summary>
+        <member name="F:OpenMetaverse.GridClient.Avatars">
+            <summary>Other avatars subsystem</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnScripted">
-            <summary>Only return targets scripted objects</summary>
+        <member name="F:OpenMetaverse.GridClient.Estate">
+            <summary>Estate subsystem</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnOnOthersLand">
-            <summary>Only return targets objects if on others land</summary>
+        <member name="F:OpenMetaverse.GridClient.Friends">
+            <summary>Friends list subsystem</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnScriptedAndOnOthers">
-            <summary>Returns target's scripted objects and objects on other parcels</summary>
+        <member name="F:OpenMetaverse.GridClient.Grid">
+            <summary>Grid (aka simulator group) subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools.GroundTextureSettings">
-            <summary>Ground texture settings for each corner of the region</summary>
+        <member name="F:OpenMetaverse.GridClient.Objects">
+            <summary>Object subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools.GroundTextureHeight">
-            <summary>Used by GroundTextureHeightSettings</summary>
+        <member name="F:OpenMetaverse.GridClient.Groups">
+            <summary>Group subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools.GroundTextureHeightSettings">
-            <summary>The high and low texture thresholds for each corner of the sim</summary>
+        <member name="F:OpenMetaverse.GridClient.Assets">
+            <summary>Asset subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.TopCollidersReplyEventArgs">
-            <summary>Raised on LandStatReply when the report type is for "top colliders"</summary>
+        <member name="F:OpenMetaverse.GridClient.Appearance">
+            <summary>Appearance subsystem</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.GridClient.Inventory">
+            <summary>Inventory subsystem</summary>
         </member>
-        <member name="P:OpenMetaverse.TopCollidersReplyEventArgs.ObjectCount">
-            <summary>
-            The number of returned items in LandStatReply
-            </summary>
+        <member name="F:OpenMetaverse.GridClient.Directory">
+            <summary>Directory searches including classifieds, people, land 
+            sales, etc</summary>
         </member>
-        <member name="P:OpenMetaverse.TopCollidersReplyEventArgs.Tasks">
-            <summary>
-            A Dictionary of Object UUIDs to tasks returned in LandStatReply
-            </summary>
+        <member name="F:OpenMetaverse.GridClient.Terrain">
+            <summary>Handles land, wind, and cloud heightmaps</summary>
         </member>
-        <member name="T:OpenMetaverse.TopScriptsReplyEventArgs">
-            <summary>Raised on LandStatReply when the report type is for "top Scripts"</summary>
+        <member name="F:OpenMetaverse.GridClient.Sound">
+            <summary>Handles sound-related networking</summary>
         </member>
-        <member name="M:OpenMetaverse.TopScriptsReplyEventArgs.#ctor(System.Int32,System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.EstateTask})">
-            <summary>Construct a new instance of the TopScriptsReplyEventArgs class</summary>
-            <param name="objectCount">The number of returned items in LandStatReply</param>
-            <param name="tasks">Dictionary of Object UUIDs to tasks returned in LandStatReply</param>
+        <member name="F:OpenMetaverse.GridClient.Throttle">
+            <summary>Throttling total bandwidth usage, or allocating bandwidth
+            for specific data stream types</summary>
         </member>
-        <member name="P:OpenMetaverse.TopScriptsReplyEventArgs.ObjectCount">
+        <member name="M:OpenMetaverse.GridClient.#ctor">
             <summary>
-            The number of scripts returned in LandStatReply
+            Default constructor
             </summary>
         </member>
-        <member name="P:OpenMetaverse.TopScriptsReplyEventArgs.Tasks">
+        <member name="M:OpenMetaverse.GridClient.ToString">
             <summary>
-            A Dictionary of Object UUIDs to tasks returned in LandStatReply
+            Return the full name of this instance
             </summary>
+            <returns>Client avatars full name</returns>
         </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="T:OpenMetaverse.AssetCache">
             <summary>
-            The identifier of the estate
+            Class that handles the local asset cache
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.Count">
+        <member name="M:OpenMetaverse.AssetCache.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            The number of returned itmes
+            Default constructor
             </summary>
+            <param name="client">A reference to the GridClient object</param>
         </member>
-        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.Banned">
+        <member name="M:OpenMetaverse.AssetCache.DestroyTimer">
             <summary>
-            List of UUIDs of Banned Users
+            Disposes cleanup timer
             </summary>
         </member>
-        <member name="T:OpenMetaverse.EstateUsersReplyEventArgs">
-            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
-        </member>
-        <member name="M:OpenMetaverse.EstateUsersReplyEventArgs.#ctor(System.UInt32,System.Int32,System.Collections.Generic.List{OpenMetaverse.UUID})">
-            <summary>Construct a new instance of the EstateUsersReplyEventArgs class</summary>
-            <param name="estateID">The estate's identifier on the grid</param>
-            <param name="count">The number of users</param>
-            <param name="allowedUsers">Allowed users UUIDs</param>
-        </member>
-        <member name="P:OpenMetaverse.EstateUsersReplyEventArgs.EstateID">
+        <member name="M:OpenMetaverse.AssetCache.SetupTimer">
             <summary>
-            The identifier of the estate
+            Only create timer when needed
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateUsersReplyEventArgs.Count">
+        <member name="M:OpenMetaverse.AssetCache.GetCachedAssetBytes(OpenMetaverse.UUID)">
             <summary>
-            The number of returned items
+            Return bytes read from the local asset cache, null if it does not exist
             </summary>
+            <param name="assetID">UUID of the asset we want to get</param>
+            <returns>Raw bytes of the asset, or null on failure</returns>
         </member>
-        <member name="P:OpenMetaverse.EstateUsersReplyEventArgs.AllowedUsers">
+        <member name="M:OpenMetaverse.AssetCache.GetCachedImage(OpenMetaverse.UUID)">
             <summary>
-            List of UUIDs of Allowed Users
+            Returns ImageDownload object of the
+            image from the local image cache, null if it does not exist
             </summary>
+            <param name="imageID">UUID of the image we want to get</param>
+            <returns>ImageDownload object containing the image, or null on failure</returns>
         </member>
-        <member name="T:OpenMetaverse.EstateGroupsReplyEventArgs">
-            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
-        </member>
-        <member name="M:OpenMetaverse.EstateGroupsReplyEventArgs.#ctor(System.UInt32,System.Int32,System.Collections.Generic.List{OpenMetaverse.UUID})">
-            <summary>Construct a new instance of the EstateGroupsReplyEventArgs class</summary>
-            <param name="estateID">The estate's identifier on the grid</param>
-            <param name="count">The number of Groups</param>
-            <param name="allowedGroups">Allowed Groups UUIDs</param>
-        </member>
-        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.EstateID">
+        <member name="M:OpenMetaverse.AssetCache.FileName(OpenMetaverse.UUID)">
             <summary>
-            The identifier of the estate
+            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="P:OpenMetaverse.EstateGroupsReplyEventArgs.Count">
+        <member name="M:OpenMetaverse.AssetCache.StaticFileName(OpenMetaverse.UUID)">
             <summary>
-            The number of returned items
+            Constructs a file name of the static cached asset
             </summary>
+            <param name="assetID">UUID of the asset</param>
+            <returns>String with the file name of the static cached asset</returns>
         </member>
-        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.AllowedGroups">
+        <member name="M:OpenMetaverse.AssetCache.SaveAssetToCache(OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            List of UUIDs of Allowed Groups
+            Saves an asset to the local cache
             </summary>
+            <param name="assetID">UUID of the asset</param>
+            <param name="assetData">Raw bytes the asset consists of</param>
+            <returns>Weather the operation was successfull</returns>
         </member>
-        <member name="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="M:OpenMetaverse.AssetCache.AssetFileName(OpenMetaverse.UUID)">
             <summary>
-            The identifier of the estate
+            Get the file name of the asset stored with gived UUID
             </summary>
+            <param name="assetID">UUID of the asset</param>
+            <returns>Null if we don't have that UUID cached on disk, file name if found in the cache folder</returns>
         </member>
-        <member name="P:OpenMetaverse.EstateManagersReplyEventArgs.Count">
+        <member name="M:OpenMetaverse.AssetCache.HasAsset(OpenMetaverse.UUID)">
             <summary>
-            The number of returned items
+            Checks if the asset exists in the local cache
             </summary>
+            <param name="assetID">UUID of the asset</param>
+            <returns>True is the asset is stored in the cache, otherwise false</returns>
         </member>
-        <member name="P:OpenMetaverse.EstateManagersReplyEventArgs.Managers">
+        <member name="M:OpenMetaverse.AssetCache.Clear">
             <summary>
-            List of UUIDs of the Estate's Managers
+            Wipes out entire cache
             </summary>
         </member>
-        <member name="T:OpenMetaverse.EstateCovenantReplyEventArgs">
-            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
-        </member>
-        <member name="M:OpenMetaverse.EstateCovenantReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Int64,System.String,OpenMetaverse.UUID)">
-            <summary>Construct a new instance of the EstateCovenantReplyEventArgs class</summary>
-            <param name="covenantID">The Covenant ID</param>
-            <param name="timestamp">The timestamp</param>
-            <param name="estateName">The estate's name</param>
-            <param name="estateOwnerID">The Estate Owner's ID (can be a GroupID)</param>
-        </member>
-        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.CovenantID">
+        <member name="M:OpenMetaverse.AssetCache.Prune">
             <summary>
-            The Covenant
+            Brings cache size to the 90% of the max size
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.Timestamp">
+        <member name="M:OpenMetaverse.AssetCache.BeginPrune">
             <summary>
-            The timestamp
+            Asynchronously brings cache size to the 90% of the max size
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.EstateName">
+        <member name="M:OpenMetaverse.AssetCache.GetFileSize(System.IO.FileInfo[])">
             <summary>
-            The Estate name
+            Adds up file sizes passes in a FileInfo array
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.EstateOwnerID">
+        <member name="M:OpenMetaverse.AssetCache.Operational">
             <summary>
-            The Estate Owner's ID (can be a GroupID)
+            Checks whether caching is enabled
             </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">
+        <member name="M:OpenMetaverse.AssetCache.cleanerTimer_Elapsed(System.Object,System.Timers.ElapsedEventArgs)">
             <summary>
-            The estate's name
+            Periodically prune the cache
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.EstateOwner">
+        <member name="M:OpenMetaverse.AssetCache.NiceFileSize(System.Int64)">
             <summary>
-            The Estate Owner's ID (can be a GroupID)
+            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="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.EstateID">
+        <member name="P:OpenMetaverse.AssetCache.AutoPruneEnabled">
             <summary>
-            The identifier of the estate on the grid
+            Allows setting weather to periodicale prune the cache if it grows too big
+            Default is enabled, when caching is enabled
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.DenyNoPaymentInfo">
-            <summary></summary>
-        </member>
-        <member name="T:OpenMetaverse.DownloadRequest">
+        <member name="P:OpenMetaverse.AssetCache.AutoPruneInterval">
             <summary>
-            Represends individual HTTP Download request
+            How long (in ms) between cache checks (default is 5 min.) 
             </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="F:OpenMetaverse.DownloadRequest.Retries">
-            <summary>How many times will this request be retried</summary>
-        </member>
-        <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">
+        <member name="T:OpenMetaverse.AssetCache.SortFilesByAccesTimeHelper">
             <summary>
-            Manages async HTTP downloads with a limit on maximum
-            concurrent downloads
+            Helper class for sorting files by their last accessed time
             </summary>
         </member>
-        <member name="M:OpenMetaverse.DownloadManager.#ctor">
-            <summary>Default constructor</summary>
-        </member>
-        <member name="M:OpenMetaverse.DownloadManager.Dispose">
-            <summary>Cleanup method</summary>
-        </member>
-        <member name="M:OpenMetaverse.DownloadManager.SetupRequest(System.Uri,System.String)">
-            <summary>Setup http download request</summary>
-        </member>
-        <member name="M:OpenMetaverse.DownloadManager.EnqueuePending">
-            <summary>Check the queue for pending work</summary>
-        </member>
-        <member name="M:OpenMetaverse.DownloadManager.QueueDownlad(OpenMetaverse.DownloadRequest)">
-            <summary>Enqueue a new HTPP download</summary>
-        </member>
-        <member name="P:OpenMetaverse.DownloadManager.ParallelDownloads">
-            <summary>Maximum number of parallel downloads from a single endpoint</summary>
-        </member>
-        <member name="P:OpenMetaverse.DownloadManager.ClientCert">
-            <summary>Client certificate</summary>
-        </member>
     </members>
 </doc>
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 9054a99..59e8083 100755
Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ
diff --git a/bin/OpenMetaverseTypes.XML b/bin/OpenMetaverseTypes.XML
index 7d00b1b..56e3ac7 100644
--- a/bin/OpenMetaverseTypes.XML
+++ b/bin/OpenMetaverseTypes.XML
@@ -4,478 +4,735 @@
         <name>OpenMetaverseTypes</name>
     </assembly>
     <members>
-        <member name="T:OpenMetaverse.LocklessQueue`1">
-            <summary>
-            A thread-safe lockless queue that supports multiple readers and 
-            multiple writers
-            </summary>
+        <member name="F:OpenMetaverse.Utils.DEG_TO_RAD">
+            <summary>Used for converting degrees to radians</summary>
         </member>
-        <member name="F:OpenMetaverse.LocklessQueue`1.head">
-            <summary>Queue head</summary>
+        <member name="F:OpenMetaverse.Utils.RAD_TO_DEG">
+            <summary>Used for converting radians to degrees</summary>
         </member>
-        <member name="F:OpenMetaverse.LocklessQueue`1.tail">
-            <summary>Queue tail</summary>
+        <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>
-        <member name="F:OpenMetaverse.LocklessQueue`1.count">
-            <summary>Queue item count</summary>
+        <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>
-        <member name="M:OpenMetaverse.LocklessQueue`1.#ctor">
+        <member name="M:OpenMetaverse.Utils.BytesToInt(System.Byte[],System.Int32)">
             <summary>
-            Constructor
+            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>
-        <member name="M:OpenMetaverse.LocklessQueue`1.Enqueue(`0)">
+        <member name="M:OpenMetaverse.Utils.BytesToInt(System.Byte[])">
             <summary>
-            Enqueue an item
+            Convert the first four bytes of the given array in little endian
+            ordering to a signed integer
             </summary>
-            <param name="item">Item to enqeue</param>
+            <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="M:OpenMetaverse.LocklessQueue`1.TryDequeue(`0@)">
+        <member name="M:OpenMetaverse.Utils.BytesToInt64(System.Byte[])">
             <summary>
-            Try to dequeue an item
+            Convert the first eight bytes of the given array in little endian
+            ordering to a signed long integer
             </summary>
-            <param name="item">Dequeued item if the dequeue was successful</param>
-            <returns>True if an item was successfully deqeued, otherwise false</returns>
+            <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="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="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>
-        <member name="T:OpenMetaverse.LocklessQueue`1.SingleLinkNode">
+        <member name="M:OpenMetaverse.Utils.BytesToUInt16(System.Byte[],System.Int32)">
             <summary>
-            Provides a node container for data in a singly linked list
+            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="F:OpenMetaverse.LocklessQueue`1.SingleLinkNode.Next">
-            <summary>Pointer to the next node in list</summary>
+        <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>
-        <member name="F:OpenMetaverse.LocklessQueue`1.SingleLinkNode.Item">
-            <summary>The data contained by the node</summary>
+        <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>
-        <member name="M:OpenMetaverse.LocklessQueue`1.SingleLinkNode.#ctor">
+        <member name="M:OpenMetaverse.Utils.BytesToUInt(System.Byte[])">
             <summary>
-            Constructor
+            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>
-        <member name="M:OpenMetaverse.LocklessQueue`1.SingleLinkNode.#ctor(`0)">
+        <member name="M:OpenMetaverse.Utils.BytesToUInt64(System.Byte[])">
             <summary>
-            Constructor
+            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>
-        <member name="T:OpenMetaverse.EnumInfoAttribute">
+        <member name="M:OpenMetaverse.Utils.BytesToFloat(System.Byte[],System.Int32)">
             <summary>
-            Attribute class that allows extra attributes to be attached to ENUMs
+            Convert four bytes in little endian ordering to a floating point
+            value
             </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="F:OpenMetaverse.EnumInfoAttribute.Text">
-            <summary>Text used when presenting ENUM to user</summary>
+        <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>
-        <member name="M:OpenMetaverse.EnumInfoAttribute.#ctor">
-            <summary>Default initializer</summary>
+        <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>
-        <member name="M:OpenMetaverse.EnumInfoAttribute.#ctor(System.String)">
-            <summary>Text used when presenting ENUM to user</summary>
+        <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>
-        <member name="T:OpenMetaverse.AssetType">
+        <member name="M:OpenMetaverse.Utils.UInt64ToBytes(System.UInt64)">
             <summary>
-            The different types of grid assets
+            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>
-        <member name="F:OpenMetaverse.AssetType.Unknown">
-            <summary>Unknown asset type</summary>
+        <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>
-        <member name="F:OpenMetaverse.AssetType.Texture">
-            <summary>Texture asset, stores in JPEG2000 J2C stream format</summary>
+        <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>
-        <member name="F:OpenMetaverse.AssetType.Sound">
-            <summary>Sound asset</summary>
+        <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>
-        <member name="F:OpenMetaverse.AssetType.CallingCard">
-            <summary>Calling card for another avatar</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.AssetType.Landmark">
-            <summary>Link to a location in world</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.AssetType.Clothing">
-            <summary>Collection of textures and parameters that can be 
-            worn by an avatar</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.AssetType.Object">
-            <summary>Primitive that can contain textures, sounds, 
-            scripts and more</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.AssetType.Notecard">
-            <summary>Notecard asset</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.AssetType.Folder">
-            <summary>Holds a collection of inventory items</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="F:OpenMetaverse.AssetType.RootFolder">
-            <summary>Root inventory folder</summary>
+        <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>
-        <member name="F:OpenMetaverse.AssetType.LSLText">
-            <summary>Linden scripting language script</summary>
-        </member>
-        <member name="F:OpenMetaverse.AssetType.LSLBytecode">
-            <summary>LSO bytecode for a script</summary>
-        </member>
-        <member name="F:OpenMetaverse.AssetType.TextureTGA">
-            <summary>Uncompressed TGA texture</summary>
-        </member>
-        <member name="F:OpenMetaverse.AssetType.Bodypart">
-            <summary>Collection of textures and shape parameters that can
-            be worn</summary>
-        </member>
-        <member name="F:OpenMetaverse.AssetType.TrashFolder">
-            <summary>Trash folder</summary>
-        </member>
-        <member name="F:OpenMetaverse.AssetType.SnapshotFolder">
-            <summary>Snapshot folder</summary>
-        </member>
-        <member name="F:OpenMetaverse.AssetType.LostAndFoundFolder">
-            <summary>Lost and found folder</summary>
-        </member>
-        <member name="F:OpenMetaverse.AssetType.SoundWAV">
-            <summary>Uncompressed sound</summary>
-        </member>
-        <member name="F:OpenMetaverse.AssetType.ImageTGA">
-            <summary>Uncompressed TGA non-square image, not to be used as a
-            texture</summary>
-        </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.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>
-        <member name="F:OpenMetaverse.AssetType.Animation">
-            <summary>Animation</summary>
+        <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>
-        <member name="F:OpenMetaverse.AssetType.Gesture">
-            <summary>Sequence of animations, sounds, chat, and pauses</summary>
+        <member name="M:OpenMetaverse.Utils.TryParseSingle(System.String,System.Single@)">
+            <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>
-        <member name="F:OpenMetaverse.AssetType.Simstate">
-            <summary>Simstate file</summary>
+        <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>
-        <member name="F:OpenMetaverse.AssetType.FavoriteFolder">
-            <summary>Contains landmarks for favorites</summary>
+        <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>
-        <member name="F:OpenMetaverse.AssetType.Link">
-            <summary>Asset is a link to another inventory item</summary>
+        <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>
-        <member name="F:OpenMetaverse.AssetType.LinkFolder">
-            <summary>Asset is a link to another inventory folder</summary>
+        <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>
-        <member name="F:OpenMetaverse.AssetType.EnsembleStart">
-            <summary>Beginning of the range reserved for ensembles</summary>
+        <member name="M:OpenMetaverse.Utils.StringToAssetType(System.String)">
+            <summary>
+            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="F:OpenMetaverse.AssetType.EnsembleEnd">
-            <summary>End of the range reserved for ensembles</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="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.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.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.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="F:OpenMetaverse.AssetType.MyOutfitsFolder">
-            <summary>Root folder for the folders of type OutfitFolder</summary>
+        <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>
-        <member name="F:OpenMetaverse.AssetType.Mesh">
-            <summary>Linden mesh format</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.Inbox">
-            <summary>Marketplace direct delivery inbox ("Received Items")</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.Outbox">
-            <summary>Marketplace direct delivery outbox</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.BasicRoot">
-            <summary></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="T:OpenMetaverse.InventoryType">
+        <member name="M:OpenMetaverse.Utils.IPToUInt(System.Net.IPAddress)">
             <summary>
-            Inventory Item Types, eg Script, Notecard, Folder, etc
+            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.InventoryType.Unknown">
-            <summary>Unknown</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.InventoryType.Texture">
-            <summary>Texture</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.InventoryType.Sound">
-            <summary>Sound</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.InventoryType.CallingCard">
-            <summary>Calling Card</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.InventoryType.Landmark">
-            <summary>Landmark</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.InventoryType.Notecard">
-            <summary>Notecard</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.InventoryType.Category">
-            <summary></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.InventoryType.Folder">
-            <summary>Folder</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.InventoryType.RootCategory">
-            <summary></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.InventoryType.LSL">
-            <summary>an LSL Script</summary>
+        <member name="F:OpenMetaverse.Utils.Epoch">
+            <summary>UNIX epoch in DateTime format</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryType.Snapshot">
-            <summary></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.InventoryType.Attachment">
-            <summary></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.InventoryType.Wearable">
-            <summary></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.InventoryType.Animation">
-            <summary></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.InventoryType.Gesture">
-            <summary></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.InventoryType.Mesh">
-            <summary></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="T:OpenMetaverse.SaleType">
+        <member name="M:OpenMetaverse.Utils.Round(System.Single)">
             <summary>
-            Item Sale Status
+            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.SaleType.Not">
-            <summary>Not for sale</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.SaleType.Original">
-            <summary>The original is for sale</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.SaleType.Copy">
-            <summary>Copies are for sale</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.SaleType.Contents">
-            <summary>The contents of the object are for sale</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="T:OpenMetaverse.WearableType">
+        <member name="M:OpenMetaverse.Utils.SHA1(System.Byte[])">
             <summary>
-            Types of wearable assets
+            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.WearableType.Shape">
-            <summary>Body shape</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.WearableType.Skin">
-            <summary>Skin textures and attributes</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.WearableType.Hair">
-            <summary>Hair</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.WearableType.Eyes">
-            <summary>Eyes</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.WearableType.Shirt">
-            <summary>Shirt</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="F:OpenMetaverse.WearableType.Pants">
-            <summary>Pants</summary>
+        <member name="M:OpenMetaverse.Utils.RandomDouble">
+            <summary>
+            Generate a random double precision floating point value
+            </summary>
+            <returns>Random value of type double</returns>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Shoes">
-            <summary>Shoes</summary>
+        <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="F:OpenMetaverse.WearableType.Socks">
-            <summary>Socks</summary>
+        <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="F:OpenMetaverse.WearableType.Jacket">
-            <summary>Jacket</summary>
+        <member name="T:OpenMetaverse.Utils.Platform">
+            <summary>
+            Operating system
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Gloves">
-            <summary>Gloves</summary>
+        <member name="F:OpenMetaverse.Utils.Platform.Unknown">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Undershirt">
-            <summary>Undershirt</summary>
+        <member name="F:OpenMetaverse.Utils.Platform.Windows">
+            <summary>Microsoft Windows</summary>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Underpants">
-            <summary>Underpants</summary>
+        <member name="F:OpenMetaverse.Utils.Platform.WindowsCE">
+            <summary>Microsoft Windows CE</summary>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Skirt">
-            <summary>Skirt</summary>
+        <member name="F:OpenMetaverse.Utils.Platform.Linux">
+            <summary>Linux</summary>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Alpha">
-            <summary>Alpha mask to hide parts of the avatar</summary>
+        <member name="F:OpenMetaverse.Utils.Platform.OSX">
+            <summary>Apple OSX</summary>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Tattoo">
-            <summary>Tattoo</summary>
+        <member name="T:OpenMetaverse.Utils.Runtime">
+            <summary>
+            Runtime platform
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Physics">
-            <summary>Physics</summary>
+        <member name="F:OpenMetaverse.Utils.Runtime.Windows">
+            <summary>.NET runtime</summary>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Invalid">
-            <summary>Invalid wearable asset</summary>
+        <member name="F:OpenMetaverse.Utils.Runtime.Mono">
+            <summary>Mono runtime: http://www.mono-project.com/</summary>
         </member>
-        <member name="T:OpenMetaverse.Color4">
+        <member name="M:OpenMetaverse.Matrix4.GetEulerAngles(System.Single@,System.Single@,System.Single@)">
             <summary>
-            An 8-bit color structure including an alpha channel
+            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.Color4.R">
-            <summary>Red</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.Color4.G">
-            <summary>Green</summary>
+        <member name="M:OpenMetaverse.Matrix4.CreateFromEulers(System.Single,System.Single,System.Single)">
+            <summary>
+            Construct a matrix from euler rotation values in radians
+            </summary>
+            <param name="roll">X euler angle in radians</param>
+            <param name="pitch">Y euler angle in radians</param>
+            <param name="yaw">Z euler angle in radians</param>
         </member>
-        <member name="F:OpenMetaverse.Color4.B">
-            <summary>Blue</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.Color4.A">
-            <summary>Alpha</summary>
+        <member name="F:OpenMetaverse.Matrix4.Zero">
+            <summary>A 4x4 matrix containing all zeroes</summary>
         </member>
-        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte,System.Byte,System.Byte,System.Byte)">
+        <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>
-            <param name="r"></param>
-            <param name="g"></param>
-            <param name="b"></param>
-            <param name="a"></param>
         </member>
-        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte[],System.Int32,System.Boolean)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor(System.Collections.Generic.IEnumerable{`0})">
             <summary>
-            Builds a color from a byte array
+            Create new BlockingQueue.
             </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="col">The System.Collections.ICollection to copy elements from</param>
         </member>
-        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte[],System.Int32,System.Boolean,System.Boolean)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor(System.Int32)">
             <summary>
-            Returns the raw bytes for this vector
+            Create new BlockingQueue.
             </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="capacity">The initial number of elements that the queue can contain</param>
         </member>
-        <member name="M:OpenMetaverse.Color4.#ctor(OpenMetaverse.Color4)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor">
             <summary>
-            Copy constructor
+            Create new BlockingQueue.
             </summary>
-            <param name="color">Color to copy</param>
         </member>
-        <member name="M:OpenMetaverse.Color4.CompareTo(OpenMetaverse.Color4)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Finalize">
             <summary>
-            IComparable.CompareTo implementation
+            BlockingQueue Destructor (Close queue, resume any waiting thread).
             </summary>
-            <remarks>Sorting ends up like this: |--Grayscale--||--Color--|.
-            Alpha is only used when the colors are otherwise equivalent</remarks>
         </member>
-        <member name="M:OpenMetaverse.Color4.FromBytes(System.Byte[],System.Int32,System.Boolean,System.Boolean)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Clear">
             <summary>
-            Builds a color from a byte array
+            Remove all objects from the Queue.
             </summary>
-            <param name="byteArray">Byte array containing a 16 byte color</param>
-            <param name="pos">Beginning position in the byte array</param>
-            <param name="inverted">True if the byte array stores inverted values,
-            otherwise false. For example the color black (fully opaque) inverted
-            would be 0xFF 0xFF 0xFF 0x00</param>
-            <param name="alphaInverted">True if the alpha value is inverted in
-            addition to whatever the inverted parameter is. Setting inverted true
-            and alphaInverted true will flip the alpha value back to non-inverted,
-            but keep the other color bytes inverted</param>
         </member>
-        <member name="M:OpenMetaverse.Color4.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Close">
             <summary>
-            Writes the raw bytes for this color to a byte array
+            Remove all objects from the Queue, resume all dequeue threads.
             </summary>
-            <param name="dest">Destination byte array</param>
-            <param name="pos">Position in the destination array to start
-            writing. Must be at least 16 bytes before the end of the array</param>
         </member>
-        <member name="M:OpenMetaverse.Color4.ToBytes(System.Byte[],System.Int32,System.Boolean)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue">
             <summary>
-            Serializes this color into four bytes in a byte array
+            Removes and returns the object at the beginning of the Queue.
             </summary>
-            <param name="dest">Destination byte array</param>
-            <param name="pos">Position in the destination array to start
-            writing. Must be at least 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>
+            <returns>Object in queue.</returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.ToFloatBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue(System.TimeSpan)">
             <summary>
-            Writes the raw bytes for this color to a byte array
+            Removes and returns the object at the beginning of the Queue.
             </summary>
-            <param name="dest">Destination byte array</param>
-            <param name="pos">Position in the destination array to start
-            writing. Must be at least 16 bytes before the end of the array</param>
+            <param name="timeout">time to wait before returning</param>
+            <returns>Object in queue.</returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.ClampValues">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue(System.Int32)">
             <summary>
-            Ensures that values are in range 0-1
+            Removes and returns the object at the beginning of the Queue.
             </summary>
+            <param name="timeout">time to wait before returning (in milliseconds)</param>
+            <returns>Object in queue.</returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.FromHSV(System.Double,System.Double,System.Double)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Enqueue(`0)">
             <summary>
-            Create an RGB color from a hue, saturation, value combination
+            Adds an object to the end of the Queue
             </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="obj">Object to put in queue</param>
         </member>
-        <member name="M:OpenMetaverse.Color4.Lerp(OpenMetaverse.Color4,OpenMetaverse.Color4,System.Single)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Open">
             <summary>
-            Performs linear interpolation between two colors
+            Open Queue.
             </summary>
-            <param name="value1">Color to start at</param>
-            <param name="value2">Color to end at</param>
-            <param name="amount">Amount to interpolate</param>
-            <returns>The interpolated color</returns>
-        </member>
-        <member name="F:OpenMetaverse.Color4.Black">
-            <summary>A Color4 with zero RGB values and fully opaque (alpha 1.0)</summary>
-        </member>
-        <member name="F:OpenMetaverse.Color4.White">
-            <summary>A Color4 with full RGB values (1.0) and fully opaque (alpha 1.0)</summary>
         </member>
-        <member name="T:OpenMetaverse.Vector3d">
+        <member name="P:OpenMetaverse.BlockingQueue`1.Closed">
             <summary>
-            A three-dimensional vector with doubleing-point values
+            Gets flag indicating if queue has been closed.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Vector3d.X">
+        <member name="F:OpenMetaverse.Vector4.X">
             <summary>X value</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector3d.Y">
+        <member name="F:OpenMetaverse.Vector4.Y">
             <summary>Y value</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector3d.Z">
+        <member name="F:OpenMetaverse.Vector4.Z">
             <summary>Z value</summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.#ctor(System.Byte[],System.Int32)">
+        <member name="F:OpenMetaverse.Vector4.W">
+            <summary>W value</summary>
+        </member>
+        <member name="M:OpenMetaverse.Vector4.#ctor(System.Byte[],System.Int32)">
             <summary>
             Constructor, builds a vector from a byte array
             </summary>
-            <param name="byteArray">Byte array containing three eight-byte doubles</param>
+            <param name="byteArray">Byte array containing four four-byte floats</param>
             <param name="pos">Beginning position in the byte array</param>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.ApproxEquals(OpenMetaverse.Vector3d,System.Double)">
+        <member name="M:OpenMetaverse.Vector4.ApproxEquals(OpenMetaverse.Vector4,System.Single)">
             <summary>
             Test if this vector is equal to another vector, within a given
             tolerance range
@@ -486,1309 +743,1023 @@
             <returns>True if the magnitude of difference between the two vectors
             is less than the given tolerance, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.CompareTo(OpenMetaverse.Vector3d)">
+        <member name="M:OpenMetaverse.Vector4.CompareTo(OpenMetaverse.Vector4)">
             <summary>
             IComparable.CompareTo implementation
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.IsFinite">
+        <member name="M:OpenMetaverse.Vector4.IsFinite">
             <summary>
             Test if this vector is composed of all finite numbers
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.FromBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Vector4.FromBytes(System.Byte[],System.Int32)">
             <summary>
             Builds a vector from a byte array
             </summary>
-            <param name="byteArray">Byte array containing a 24 byte vector</param>
+            <param name="byteArray">Byte array containing a 16 byte vector</param>
             <param name="pos">Beginning position in the byte array</param>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.GetBytes">
+        <member name="M:OpenMetaverse.Vector4.GetBytes">
             <summary>
             Returns the raw bytes for this vector
             </summary>
-            <returns>A 24 byte array containing X, Y, and Z</returns>
+            <returns>A 16 byte array containing X, Y, Z, and W</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Vector4.ToBytes(System.Byte[],System.Int32)">
             <summary>
             Writes the raw bytes for this vector to a byte array
             </summary>
             <param name="dest">Destination byte array</param>
             <param name="pos">Position in the destination array to start
-            writing. Must be at least 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>
+            writing. Must be at least 16 bytes before the end of the array</param>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.ToRawString">
+        <member name="M:OpenMetaverse.Vector4.ToRawString">
             <summary>
             Get a string representation of the vector elements with up to three
             decimal digits and separated by spaces only
             </summary>
             <returns>Raw string representation of the vector</returns>
         </member>
-        <member name="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 name="F:OpenMetaverse.Vector4.Zero">
+            <summary>A vector with a value of 0,0,0,0</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector3d.UnitX">
-            <summary>A unit vector facing forward (X axis), value of 1,0,0</summary>
+        <member name="F:OpenMetaverse.Vector4.One">
+            <summary>A vector with a value of 1,1,1,1</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector3d.UnitY">
-            <summary>A unit vector facing left (Y axis), value of 0,1,0</summary>
+        <member name="F:OpenMetaverse.Vector4.UnitX">
+            <summary>A vector with a value of 1,0,0,0</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector3d.UnitZ">
-            <summary>A unit vector facing up (Z axis), value of 0,0,1</summary>
+        <member name="F:OpenMetaverse.Vector4.UnitY">
+            <summary>A vector with a value of 0,1,0,0</summary>
         </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.Vector4.UnitZ">
+            <summary>A vector with a value of 0,0,1,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.Vector4.UnitW">
+            <summary>A vector with a value of 0,0,0,1</summary>
         </member>
-        <member name="M:OpenMetaverse.ReaderWriterLockSlim.WaitOnEvent(System.Threading.EventWaitHandle,System.UInt32@,System.Int32)">
+        <member name="T:OpenMetaverse.Vector3d">
             <summary>
-            Waits on 'waitEvent' with a timeout of 'millisceondsTimeout.  
-            Before the wait 'numWaiters' is incremented and is restored before leaving this routine.
+            A three-dimensional vector with doubleing-point values
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Quaternion.X">
+        <member name="F:OpenMetaverse.Vector3d.X">
             <summary>X value</summary>
         </member>
-        <member name="F:OpenMetaverse.Quaternion.Y">
+        <member name="F:OpenMetaverse.Vector3d.Y">
             <summary>Y value</summary>
         </member>
-        <member name="F:OpenMetaverse.Quaternion.Z">
+        <member name="F:OpenMetaverse.Vector3d.Z">
             <summary>Z value</summary>
         </member>
-        <member name="F:OpenMetaverse.Quaternion.W">
-            <summary>W value</summary>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.#ctor(System.Single,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.Vector3d.#ctor(System.Byte[],System.Int32)">
             <summary>
-            Build a quaternion from normalized float values
+            Constructor, builds a vector from a byte array
             </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>
+            <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.Quaternion.#ctor(System.Byte[],System.Int32,System.Boolean)">
+        <member name="M:OpenMetaverse.Vector3d.ApproxEquals(OpenMetaverse.Vector3d,System.Double)">
             <summary>
-            Constructor, builds a quaternion object from a byte array
+            Test if this vector is equal to another vector, within a given
+            tolerance range
             </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>
+            <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.Normalize">
+        <member name="M:OpenMetaverse.Vector3d.CompareTo(OpenMetaverse.Vector3d)">
             <summary>
-            Normalizes the quaternion
+            IComparable.CompareTo implementation
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.FromBytes(System.Byte[],System.Int32,System.Boolean)">
+        <member name="M:OpenMetaverse.Vector3d.IsFinite">
             <summary>
-            Builds a quaternion object from a byte array
+            Test if this vector is composed of all finite numbers
             </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">
+        <member name="M:OpenMetaverse.Vector3d.FromBytes(System.Byte[],System.Int32)">
             <summary>
-            Normalize this quaternion and serialize it to a byte array
+            Builds a vector from 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>
+            <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.Quaternion.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Vector3d.GetBytes">
             <summary>
-            Writes the raw bytes for this quaternion to a byte array
+            Returns the raw bytes for this vector
             </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>
+            <returns>A 24 byte array containing X, Y, and Z</returns>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.GetEulerAngles(System.Single@,System.Single@,System.Single@)">
+        <member name="M:OpenMetaverse.Vector3d.ToBytes(System.Byte[],System.Int32)">
             <summary>
-            Convert this quaternion to euler angles
+            Writes the raw bytes for this vector to a byte array
             </summary>
-            <param name="roll">X euler angle</param>
-            <param name="pitch">Y euler angle</param>
-            <param name="yaw">Z euler angle</param>
+            <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.Quaternion.GetAxisAngle(OpenMetaverse.Vector3@,System.Single@)">
+        <member name="M:OpenMetaverse.Vector3d.Parse(System.String)">
             <summary>
-            Convert this quaternion to an angle around an axis
+            Parse a vector from a string
             </summary>
-            <param name="axis">Unit vector describing the axis</param>
-            <param name="angle">Angle around the axis, in radians</param>
+            <param name="val">A string representation of a 3D vector, enclosed 
+            in arrow brackets and separated by commas</param>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.Conjugate(OpenMetaverse.Quaternion)">
+        <member name="M:OpenMetaverse.Vector3d.SmoothStep(OpenMetaverse.Vector3d,OpenMetaverse.Vector3d,System.Double)">
             <summary>
-            Returns the conjugate (spatial inverse) of a quaternion
+            Interpolates between two vectors using a cubic equation
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.CreateFromAxisAngle(System.Single,System.Single,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.Vector3d.ToString">
             <summary>
-            Build a quaternion from an axis and an angle of rotation around
-            that axis
+            Get a formatted string representation of the vector
             </summary>
+            <returns>A string representation of the vector</returns>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.CreateFromAxisAngle(OpenMetaverse.Vector3,System.Single)">
+        <member name="M:OpenMetaverse.Vector3d.ToRawString">
             <summary>
-            Build a quaternion from an axis and an angle of rotation around
-            that axis
+            Get a string representation of the vector elements with up to three
+            decimal digits and separated by spaces only
             </summary>
-            <param name="axis">Axis of rotation</param>
-            <param name="angle">Angle of rotation</param>
+            <returns>Raw string representation of the vector</returns>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.CreateFromEulers(OpenMetaverse.Vector3)">
+        <member name="M:OpenMetaverse.Vector3d.op_Modulus(OpenMetaverse.Vector3d,OpenMetaverse.Vector3d)">
             <summary>
-            Creates a quaternion from a vector containing roll, pitch, and yaw
-            in radians
+            Cross product between two vectors
             </summary>
-            <param name="eulers">Vector representation of the euler angles in
-            radians</param>
-            <returns>Quaternion representation of the euler angles</returns>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.CreateFromEulers(System.Single,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.Vector3d.op_Implicit(OpenMetaverse.Vector3)~OpenMetaverse.Vector3d">
             <summary>
-            Creates a quaternion from roll, pitch, and yaw euler angles in
-            radians
+            Implicit casting for Vector3 > Vector3d
             </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="value"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.Inverse(OpenMetaverse.Quaternion)">
+        <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>
-            Conjugates and renormalizes a vector
+            A three-dimensional vector with floating-point values
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.Slerp(OpenMetaverse.Quaternion,OpenMetaverse.Quaternion,System.Single)">
+        <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>
-            Spherical linear interpolation between two quaternions
+            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.Quaternion.ToRawString">
+        <member name="M:OpenMetaverse.Vector3.ApproxEquals(OpenMetaverse.Vector3,System.Single)">
             <summary>
-            Get a string representation of the quaternion elements with up to three
-            decimal digits and separated by spaces only
+            Test if this vector is equal to another vector, within a given
+            tolerance range
             </summary>
-            <returns>Raw string representation of the quaternion</returns>
-        </member>
-        <member name="F:OpenMetaverse.Quaternion.Identity">
-            <summary>A quaternion with a value of 0,0,0,1</summary>
+            <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.CircularQueue`1.#ctor(OpenMetaverse.CircularQueue{`0})">
+        <member name="M:OpenMetaverse.Vector3.CompareTo(OpenMetaverse.Vector3)">
             <summary>
-            Copy constructor
+            IComparable.CompareTo implementation
             </summary>
-            <param name="queue">Circular queue to copy</param>
         </member>
-        <member name="T:OpenMetaverse.BlockingQueue`1">
+        <member name="M:OpenMetaverse.Vector3.IsFinite">
             <summary>
-            Same as Queue except Dequeue function blocks until there is an object to return.
-            Note: This class does not need to be synchronized
+            Test if this vector is composed of all finite numbers
             </summary>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor(System.Collections.Generic.IEnumerable{`0})">
+        <member name="M:OpenMetaverse.Vector3.FromBytes(System.Byte[],System.Int32)">
             <summary>
-            Create new BlockingQueue.
+            Builds a vector from a byte array
             </summary>
-            <param name="col">The System.Collections.ICollection to copy elements from</param>
+            <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.BlockingQueue`1.#ctor(System.Int32)">
+        <member name="M:OpenMetaverse.Vector3.GetBytes">
             <summary>
-            Create new BlockingQueue.
+            Returns the raw bytes for this vector
             </summary>
-            <param name="capacity">The initial number of elements that the queue can contain</param>
+            <returns>A 12 byte array containing X, Y, and Z</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor">
+        <member name="M:OpenMetaverse.Vector3.ToBytes(System.Byte[],System.Int32)">
             <summary>
-            Create new BlockingQueue.
+            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.BlockingQueue`1.Finalize">
+        <member name="M:OpenMetaverse.Vector3.Parse(System.String)">
             <summary>
-            BlockingQueue Destructor (Close queue, resume any waiting thread).
+            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.BlockingQueue`1.Clear">
+        <member name="M:OpenMetaverse.Vector3.RotationBetween(OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
             <summary>
-            Remove all objects from the Queue.
+            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.BlockingQueue`1.Close">
+        <member name="M:OpenMetaverse.Vector3.SmoothStep(OpenMetaverse.Vector3,OpenMetaverse.Vector3,System.Single)">
             <summary>
-            Remove all objects from the Queue, resume all dequeue threads.
+            Interpolates between two vectors using a cubic equation
             </summary>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue">
+        <member name="M:OpenMetaverse.Vector3.ToString">
             <summary>
-            Removes and returns the object at the beginning of the Queue.
+            Get a formatted string representation of the vector
             </summary>
-            <returns>Object in queue.</returns>
+            <returns>A string representation of the vector</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue(System.TimeSpan)">
+        <member name="M:OpenMetaverse.Vector3.ToRawString">
             <summary>
-            Removes and returns the object at the beginning of the Queue.
+            Get a string representation of the vector elements with up to three
+            decimal digits and separated by spaces only
             </summary>
-            <param name="timeout">time to wait before returning</param>
-            <returns>Object in queue.</returns>
+            <returns>Raw string representation of the vector</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue(System.Int32)">
+        <member name="M:OpenMetaverse.Vector3.op_Modulus(OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
             <summary>
-            Removes and returns the object at the beginning of the Queue.
+            Cross product between two vectors
             </summary>
-            <param name="timeout">time to wait before returning (in milliseconds)</param>
-            <returns>Object in queue.</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Enqueue(`0)">
+        <member name="M:OpenMetaverse.Vector3.op_Explicit(OpenMetaverse.Vector3d)~OpenMetaverse.Vector3">
             <summary>
-            Adds an object to the end of the Queue
+            Explicit casting for Vector3d > Vector3
             </summary>
-            <param name="obj">Object to put in queue</param>
+            <param name="value"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Open">
+        <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>
-            Open Queue.
+            Identifier code for primitive types
             </summary>
         </member>
-        <member name="P:OpenMetaverse.BlockingQueue`1.Closed">
+        <member name="F:OpenMetaverse.PCode.None">
+            <summary>None</summary>
+        </member>
+        <member name="F:OpenMetaverse.PCode.Prim">
+            <summary>A Primitive</summary>
+        </member>
+        <member name="F:OpenMetaverse.PCode.Avatar">
+            <summary>A Avatar</summary>
+        </member>
+        <member name="F:OpenMetaverse.PCode.Grass">
+            <summary>Linden grass</summary>
+        </member>
+        <member name="F:OpenMetaverse.PCode.NewTree">
+            <summary>Linden tree</summary>
+        </member>
+        <member name="F:OpenMetaverse.PCode.ParticleSystem">
+            <summary>A primitive that acts as the source for a particle stream</summary>
+        </member>
+        <member name="F:OpenMetaverse.PCode.Tree">
+            <summary>A Linden tree</summary>
+        </member>
+        <member name="T:OpenMetaverse.PrimFlags">
             <summary>
-            Gets flag indicating if queue has been closed.
+            Primary parameters for primitives such as Physics Enabled or Phantom
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Utils.DEG_TO_RAD">
-            <summary>Used for converting degrees to radians</summary>
+        <member name="F:OpenMetaverse.PrimFlags.None">
+            <summary>Deprecated</summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.Physics">
+            <summary>Whether physics are enabled for this object</summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.CreateSelected">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.ObjectModify">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.ObjectCopy">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.ObjectAnyOwner">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.ObjectYouOwner">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.Scripted">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.Touch">
+            <summary>Whether this object contains an active touch script</summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.ObjectMove">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.Money">
+            <summary>Whether this object can receive payments</summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.Phantom">
+            <summary>Whether this object is phantom (no collisions)</summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.InventoryEmpty">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.JointHinge">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.JointP2P">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.JointLP2P">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.JointWheel">
+            <summary>Deprecated</summary>
         </member>
-        <member name="F:OpenMetaverse.Utils.RAD_TO_DEG">
-            <summary>Used for converting radians to degrees</summary>
+        <member name="F:OpenMetaverse.PrimFlags.AllowInventoryDrop">
+            <summary></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.PrimFlags.ObjectTransfer">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Utils.Epoch">
-            <summary>UNIX epoch in DateTime format</summary>
+        <member name="F:OpenMetaverse.PrimFlags.ObjectGroupOwned">
+            <summary></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.PrimFlags.ObjectYouOfficer">
+            <summary>Deprecated</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.PrimFlags.CameraDecoupled">
+            <summary></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.PrimFlags.AnimSource">
+            <summary></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.PrimFlags.CameraSource">
+            <summary></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.PrimFlags.CastShadows">
+            <summary></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.PrimFlags.DieAtEdge">
+            <summary>Server flag, will not be sent to clients. Specifies that
+            the object is destroyed when it touches a simulator edge</summary>
         </member>
-        <member name="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.PrimFlags.ReturnAtEdge">
+            <summary>Server flag, will not be sent to clients. Specifies that
+            the object will be returned to the owner's inventory when it
+            touches a simulator edge</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.IsFinite(System.Single)">
-            <summary>
-            Test if a single precision float is a finite number
-            </summary>
+        <member name="F:OpenMetaverse.PrimFlags.Sandbox">
+            <summary>Server flag, will not be sent to clients.</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.PrimFlags.Flying">
+            <summary>Server flag, will not be sent to client. Specifies that
+            the object is hovering/flying</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.PrimFlags.ObjectOwnerModify">
+            <summary></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.PrimFlags.TemporaryOnRez">
+            <summary></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.PrimFlags.Temporary">
+            <summary></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.PrimFlags.ZlibCompressed">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.SHA256(System.Byte[])">
+        <member name="T:OpenMetaverse.SoundFlags">
             <summary>
-            Compute the SHA256 hash for a byte array
+            Sound flags for sounds attached to primitives
             </summary>
-            <param name="data">Byte array to compute the hash for</param>
-            <returns>SHA256 hash of the input data</returns>
         </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.SoundFlags.None">
+            <summary></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.SoundFlags.Loop">
+            <summary></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.SoundFlags.SyncMaster">
+            <summary></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.SoundFlags.SyncSlave">
+            <summary></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.SoundFlags.SyncPending">
+            <summary></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.SoundFlags.Queue">
+            <summary></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.SoundFlags.Stop">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToInt16(System.Byte[],System.Int32)">
+        <member name="T:OpenMetaverse.Material">
             <summary>
-            Convert the first two bytes starting at the given position in
-            little endian ordering to a signed short integer
+            Material type for a primitive
             </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>
-        <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.Material.Stone">
+            <summary></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.Material.Metal">
+            <summary></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.Material.Glass">
+            <summary></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.Material.Wood">
+            <summary></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.Material.Flesh">
+            <summary></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.Material.Plastic">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.Material.Rubber">
+            <summary></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.Material.Light">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToUInt(System.Byte[])">
+        <member name="T:OpenMetaverse.PrimType">
             <summary>
-            Convert the first four bytes of the given array in little endian
-            ordering to an unsigned integer
+            Used in a helper function to roughly determine prim shape
             </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>
-        <member name="M:OpenMetaverse.Utils.BytesToUInt64(System.Byte[])">
+        <member name="T:OpenMetaverse.ExtraParamType">
             <summary>
-            Convert the first eight bytes of the given array in little endian
-            ordering to an unsigned 64-bit integer
+            Extra parameters for primitives, these flags are for features that have
+            been added after the original ObjectFlags that has all eight bits 
+            reserved already
             </summary>
-            <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.Utils.BytesToFloat(System.Byte[],System.Int32)">
-            <summary>
-            Convert four bytes in little endian ordering to a floating point
-            value
-            </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 name="F:OpenMetaverse.ExtraParamType.Flexible">
+            <summary>Whether this object has flexible parameters</summary>
         </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.ExtraParamType.Light">
+            <summary>Whether this object has light parameters</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.ExtraParamType.Sculpt">
+            <summary>Whether this object is a sculpted prim</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.ExtraParamType.LightImage">
+            <summary>Whether this object is a light image map</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.ExtraParamType.Mesh">
+            <summary>Whether this object is a mesh</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.FloatToBytes(System.Single)">
+        <member name="T:OpenMetaverse.JointType">
             <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>
-        <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.JointType.Invalid">
+            <summary></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.JointType.Hinge">
+            <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.JointType.Point">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToHexString(System.Byte[],System.Int32,System.String)">
+        <member name="T:OpenMetaverse.SculptType">
             <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="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.SculptType.None">
+            <summary></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.SculptType.Sphere">
+            <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.SculptType.Torus">
+            <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.SculptType.Plane">
+            <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.SculptType.Cylinder">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.ByteToFloat(System.Byte[],System.Int32,System.Single,System.Single)">
+        <member name="F:OpenMetaverse.SculptType.Mesh">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.SculptType.Invert">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.SculptType.Mirror">
+            <summary></summary>
+        </member>
+        <member name="T:OpenMetaverse.FaceType">
             <summary>
-            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>
-        <member name="M:OpenMetaverse.Utils.ByteToFloat(System.Byte,System.Single,System.Single)">
+        <member name="F:OpenMetaverse.FaceType.PathBegin">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.FaceType.PathEnd">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.FaceType.InnerSide">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.FaceType.ProfileBegin">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.FaceType.ProfileEnd">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.FaceType.OuterSide0">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.FaceType.OuterSide1">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.FaceType.OuterSide2">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.FaceType.OuterSide3">
+            <summary></summary>
+        </member>
+        <member name="T:OpenMetaverse.ObjectCategory">
             <summary>
-            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>
-        <member name="M:OpenMetaverse.Utils.TryParseSingle(System.String,System.Single@)">
-            <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.ObjectCategory.Invalid">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectCategory.None">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectCategory.Owner">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectCategory.Group">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectCategory.Other">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectCategory.Selected">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectCategory.Temporary">
+            <summary></summary>
+        </member>
+        <member name="T:OpenMetaverse.AttachmentPoint">
+             <summary>
+             Attachment points for objects on avatar bodies
+             </summary>
+             <remarks>
+             Both InventoryObject and InventoryAttachment types can be attached
+            </remarks>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.Default">
+            <summary>Right hand if object was not previously attached</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.Chest">
+            <summary>Chest</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.Skull">
+            <summary>Skull</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.LeftShoulder">
+            <summary>Left shoulder</summary>
         </member>
-        <member name="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.AttachmentPoint.RightShoulder">
+            <summary>Right shoulder</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.AttachmentPoint.LeftHand">
+            <summary>Left hand</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.AttachmentPoint.RightHand">
+            <summary>Right hand</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.AttachmentPoint.LeftFoot">
+            <summary>Left foot</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.StringToAssetType(System.String)">
-            <summary>
-            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 name="F:OpenMetaverse.AttachmentPoint.RightFoot">
+            <summary>Right foot</summary>
         </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.AttachmentPoint.Spine">
+            <summary>Spine</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.AttachmentPoint.Pelvis">
+            <summary>Pelvis</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.AttachmentPoint.Mouth">
+            <summary>Mouth</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.AttachmentPoint.Chin">
+            <summary>Chin</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.AttachmentPoint.LeftEar">
+            <summary>Left ear</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.AttachmentPoint.RightEar">
+            <summary>Right ear</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.AttachmentPoint.LeftEyeball">
+            <summary>Left eyeball</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.AttachmentPoint.RightEyeball">
+            <summary>Right eyeball</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.AttachmentPoint.Nose">
+            <summary>Nose</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.AttachmentPoint.RightUpperArm">
+            <summary>Right upper arm</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.AttachmentPoint.RightForearm">
+            <summary>Right forearm</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.AttachmentPoint.LeftUpperArm">
+            <summary>Left upper arm</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.AttachmentPoint.LeftForearm">
+            <summary>Left forearm</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.AttachmentPoint.RightHip">
+            <summary>Right hip</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.AttachmentPoint.RightUpperLeg">
+            <summary>Right upper leg</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.AttachmentPoint.RightLowerLeg">
+            <summary>Right lower leg</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.AttachmentPoint.LeftHip">
+            <summary>Left hip</summary>
         </member>
-        <member name="T:OpenMetaverse.Utils.Platform">
-            <summary>
-            Operating system
-            </summary>
+        <member name="F:OpenMetaverse.AttachmentPoint.LeftUpperLeg">
+            <summary>Left upper leg</summary>
         </member>
-        <member name="F:OpenMetaverse.Utils.Platform.Unknown">
-            <summary>Unknown</summary>
+        <member name="F:OpenMetaverse.AttachmentPoint.LeftLowerLeg">
+            <summary>Left lower leg</summary>
         </member>
-        <member name="F:OpenMetaverse.Utils.Platform.Windows">
-            <summary>Microsoft Windows</summary>
+        <member name="F:OpenMetaverse.AttachmentPoint.Stomach">
+            <summary>Stomach</summary>
         </member>
-        <member name="F:OpenMetaverse.Utils.Platform.WindowsCE">
-            <summary>Microsoft Windows CE</summary>
+        <member name="F:OpenMetaverse.AttachmentPoint.LeftPec">
+            <summary>Left pectoral</summary>
         </member>
-        <member name="F:OpenMetaverse.Utils.Platform.Linux">
-            <summary>Linux</summary>
+        <member name="F:OpenMetaverse.AttachmentPoint.RightPec">
+            <summary>Right pectoral</summary>
         </member>
-        <member name="F:OpenMetaverse.Utils.Platform.OSX">
-            <summary>Apple OSX</summary>
+        <member name="F:OpenMetaverse.AttachmentPoint.HUDCenter2">
+            <summary>HUD Center position 2</summary>
         </member>
-        <member name="T:OpenMetaverse.Utils.Runtime">
-            <summary>
-            Runtime platform
-            </summary>
+        <member name="F:OpenMetaverse.AttachmentPoint.HUDTopRight">
+            <summary>HUD Top-right</summary>
         </member>
-        <member name="F:OpenMetaverse.Utils.Runtime.Windows">
-            <summary>.NET runtime</summary>
+        <member name="F:OpenMetaverse.AttachmentPoint.HUDTop">
+            <summary>HUD Top</summary>
         </member>
-        <member name="F:OpenMetaverse.Utils.Runtime.Mono">
-            <summary>Mono runtime: http://www.mono-project.com/</summary>
+        <member name="F:OpenMetaverse.AttachmentPoint.HUDTopLeft">
+            <summary>HUD Top-left</summary>
         </member>
-        <member name="F:OpenMetaverse.ExpiringCache`2.syncRoot">
-            <summary>For thread safety</summary>
+        <member name="F:OpenMetaverse.AttachmentPoint.HUDCenter">
+            <summary>HUD Center</summary>
         </member>
-        <member name="F:OpenMetaverse.ExpiringCache`2.isPurging">
-            <summary>For thread safety</summary>
+        <member name="F:OpenMetaverse.AttachmentPoint.HUDBottomLeft">
+            <summary>HUD Bottom-left</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 name="F:OpenMetaverse.AttachmentPoint.HUDBottom">
+            <summary>HUD Bottom</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 name="F:OpenMetaverse.AttachmentPoint.HUDBottomRight">
+            <summary>HUD Bottom-right</summary>
         </member>
-        <member name="M:OpenMetaverse.Matrix4.GetQuaternion">
-            <summary>
-            Convert this matrix to a quaternion rotation
-            </summary>
-            <returns>A quaternion representation of this rotation matrix</returns>
+        <member name="F:OpenMetaverse.AttachmentPoint.Neck">
+            <summary>Neck</summary>
         </member>
-        <member name="M:OpenMetaverse.Matrix4.CreateFromEulers(System.Single,System.Single,System.Single)">
-            <summary>
-            Construct a matrix from euler rotation values in radians
-            </summary>
-            <param name="roll">X euler angle in radians</param>
-            <param name="pitch">Y euler angle in radians</param>
-            <param name="yaw">Z euler angle in radians</param>
+        <member name="F:OpenMetaverse.AttachmentPoint.Root">
+            <summary>Avatar Center</summary>
         </member>
-        <member name="M:OpenMetaverse.Matrix4.ToString">
+        <member name="T:OpenMetaverse.Tree">
             <summary>
-            Get a formatted string representation of the vector
+            Tree foliage types
             </summary>
-            <returns>A string representation of the vector</returns>
         </member>
-        <member name="F:OpenMetaverse.Matrix4.Zero">
-            <summary>A 4x4 matrix containing all zeroes</summary>
+        <member name="F:OpenMetaverse.Tree.Pine1">
+            <summary>Pine1 tree</summary>
         </member>
-        <member name="F:OpenMetaverse.Matrix4.Identity">
-            <summary>A 4x4 identity matrix</summary>
+        <member name="F:OpenMetaverse.Tree.Oak">
+            <summary>Oak tree</summary>
         </member>
-        <member name="T:OpenMetaverse.Parallel">
-            <summary>
-            Provides helper methods for parallelizing loops
-            </summary>
+        <member name="F:OpenMetaverse.Tree.TropicalBush1">
+            <summary>Tropical Bush1</summary>
         </member>
-        <member name="M:OpenMetaverse.Parallel.For(System.Int32,System.Int32,System.Action{System.Int32})">
-            <summary>
-            Executes a for loop in which iterations may run in parallel
-            </summary>
-            <param name="fromInclusive">The loop will be started at this index</param>
-            <param name="toExclusive">The loop will be terminated before this index is reached</param>
-            <param name="body">Method body to run for each iteration of the loop</param>
+        <member name="F:OpenMetaverse.Tree.Palm1">
+            <summary>Palm1 tree</summary>
         </member>
-        <member name="M:OpenMetaverse.Parallel.For(System.Int32,System.Int32,System.Int32,System.Action{System.Int32})">
-            <summary>
-            Executes a for loop in which iterations may run in parallel
-            </summary>
-            <param name="threadCount">The number of concurrent execution threads to run</param>
-            <param name="fromInclusive">The loop will be started at this index</param>
-            <param name="toExclusive">The loop will be terminated before this index is reached</param>
-            <param name="body">Method body to run for each iteration of the loop</param>
+        <member name="F:OpenMetaverse.Tree.Dogwood">
+            <summary>Dogwood tree</summary>
         </member>
-        <member name="M:OpenMetaverse.Parallel.ForEach``1(System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
-            <summary>
-            Executes a foreach loop in which iterations may run in parallel
-            </summary>
-            <typeparam name="T">Object type that the collection wraps</typeparam>
-            <param name="enumerable">An enumerable collection to iterate over</param>
-            <param name="body">Method body to run for each object in the collection</param>
+        <member name="F:OpenMetaverse.Tree.TropicalBush2">
+            <summary>Tropical Bush2</summary>
         </member>
-        <member name="M:OpenMetaverse.Parallel.ForEach``1(System.Int32,System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
-            <summary>
-            Executes a foreach loop in which iterations may run in parallel
-            </summary>
-            <typeparam name="T">Object type that the collection wraps</typeparam>
-            <param name="threadCount">The number of concurrent execution threads to run</param>
-            <param name="enumerable">An enumerable collection to iterate over</param>
-            <param name="body">Method body to run for each object in the collection</param>
+        <member name="F:OpenMetaverse.Tree.Palm2">
+            <summary>Palm2 tree</summary>
         </member>
-        <member name="M:OpenMetaverse.Parallel.Invoke(System.Action[])">
-            <summary>
-            Executes a series of tasks in parallel
-            </summary>
-            <param name="actions">A series of method bodies to execute</param>
+        <member name="F:OpenMetaverse.Tree.Cypress1">
+            <summary>Cypress1 tree</summary>
         </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.Tree.Cypress2">
+            <summary>Cypress2 tree</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector4.X">
-            <summary>X value</summary>
+        <member name="F:OpenMetaverse.Tree.Pine2">
+            <summary>Pine2 tree</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector4.Y">
-            <summary>Y value</summary>
+        <member name="F:OpenMetaverse.Tree.Plumeria">
+            <summary>Plumeria</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector4.Z">
-            <summary>Z value</summary>
+        <member name="F:OpenMetaverse.Tree.WinterPine1">
+            <summary>Winter pinetree1</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector4.W">
-            <summary>W value</summary>
+        <member name="F:OpenMetaverse.Tree.WinterAspen">
+            <summary>Winter Aspen tree</summary>
         </member>
-        <member name="M:OpenMetaverse.Vector4.#ctor(System.Byte[],System.Int32)">
-            <summary>
-            Constructor, builds a vector from a byte array
-            </summary>
-            <param name="byteArray">Byte array containing four four-byte floats</param>
-            <param name="pos">Beginning position in the byte array</param>
+        <member name="F:OpenMetaverse.Tree.WinterPine2">
+            <summary>Winter pinetree2</summary>
         </member>
-        <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 name="F:OpenMetaverse.Tree.Eucalyptus">
+            <summary>Eucalyptus tree</summary>
         </member>
-        <member name="M:OpenMetaverse.Vector4.CompareTo(OpenMetaverse.Vector4)">
-            <summary>
-            IComparable.CompareTo implementation
-            </summary>
+        <member name="F:OpenMetaverse.Tree.Fern">
+            <summary>Fern</summary>
         </member>
-        <member name="M:OpenMetaverse.Vector4.IsFinite">
-            <summary>
-            Test if this vector is composed of all finite numbers
-            </summary>
+        <member name="F:OpenMetaverse.Tree.Eelgrass">
+            <summary>Eelgrass</summary>
         </member>
-        <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 name="F:OpenMetaverse.Tree.SeaSword">
+            <summary>Sea Sword</summary>
         </member>
-        <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 name="F:OpenMetaverse.Tree.Kelp1">
+            <summary>Kelp1 plant</summary>
         </member>
-        <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 name="F:OpenMetaverse.Tree.BeachGrass1">
+            <summary>Beach grass</summary>
         </member>
-        <member name="M:OpenMetaverse.Vector4.ToRawString">
+        <member name="F:OpenMetaverse.Tree.Kelp2">
+            <summary>Kelp2 plant</summary>
+        </member>
+        <member name="T:OpenMetaverse.Grass">
             <summary>
-            Get a string representation of the vector elements with up to three
-            decimal digits and separated by spaces only
+            Grass foliage types
             </summary>
-            <returns>Raw string representation of the vector</returns>
         </member>
-        <member name="F:OpenMetaverse.Vector4.Zero">
-            <summary>A vector with a value of 0,0,0,0</summary>
+        <member name="F:OpenMetaverse.Grass.Grass0">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Vector4.One">
-            <summary>A vector with a value of 1,1,1,1</summary>
+        <member name="F:OpenMetaverse.Grass.Grass1">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Vector4.UnitX">
-            <summary>A vector with a value of 1,0,0,0</summary>
+        <member name="F:OpenMetaverse.Grass.Grass2">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Vector4.UnitY">
-            <summary>A vector with a value of 0,1,0,0</summary>
+        <member name="F:OpenMetaverse.Grass.Grass3">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Vector4.UnitZ">
-            <summary>A vector with a value of 0,0,1,0</summary>
+        <member name="F:OpenMetaverse.Grass.Grass4">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Vector4.UnitW">
-            <summary>A vector with a value of 0,0,0,1</summary>
+        <member name="F:OpenMetaverse.Grass.Undergrowth1">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.UUID">
+        <member name="T:OpenMetaverse.ClickAction">
             <summary>
-            A 128-bit Universally Unique Identifier, used throughout the Second
-            Life networking protocol
+            Action associated with clicking on an object
             </summary>
         </member>
-        <member name="F:OpenMetaverse.UUID.Guid">
-            <summary>The System.Guid object this struct wraps around</summary>
+        <member name="F:OpenMetaverse.ClickAction.Touch">
+            <summary>Touch object</summary>
         </member>
-        <member name="M:OpenMetaverse.UUID.#ctor(System.String)">
-            <summary>
-            Constructor that takes a string UUID representation
-            </summary>
-            <param name="val">A string representation of a UUID, case 
-            insensitive and can either be hyphenated or non-hyphenated</param>
-            <example>UUID("11f8aa9c-b071-4242-836b-13b7abe0d489")</example>
+        <member name="F:OpenMetaverse.ClickAction.Sit">
+            <summary>Sit on object</summary>
         </member>
-        <member name="M:OpenMetaverse.UUID.#ctor(System.Guid)">
-            <summary>
-            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 name="F:OpenMetaverse.ClickAction.Buy">
+            <summary>Purchase object or contents</summary>
         </member>
-        <member name="M:OpenMetaverse.UUID.#ctor(System.Byte[],System.Int32)">
-            <summary>
-            Constructor that takes a byte array containing a UUID
-            </summary>
-            <param name="source">Byte array containing a 16 byte UUID</param>
-            <param name="pos">Beginning offset in the array</param>
+        <member name="F:OpenMetaverse.ClickAction.Pay">
+            <summary>Pay the object</summary>
         </member>
-        <member name="M:OpenMetaverse.UUID.#ctor(System.UInt64)">
-            <summary>
-            Constructor that takes an unsigned 64-bit unsigned integer to 
-            convert to a UUID
-            </summary>
-            <param name="val">64-bit unsigned integer to convert to a UUID</param>
+        <member name="F:OpenMetaverse.ClickAction.OpenTask">
+            <summary>Open task inventory</summary>
         </member>
-        <member name="M:OpenMetaverse.UUID.#ctor(OpenMetaverse.UUID)">
-            <summary>
-            Copy constructor
-            </summary>
-            <param name="val">UUID to copy</param>
+        <member name="F:OpenMetaverse.ClickAction.PlayMedia">
+            <summary>Play parcel media</summary>
         </member>
-        <member name="M:OpenMetaverse.UUID.CompareTo(OpenMetaverse.UUID)">
-            <summary>
-            IComparable.CompareTo implementation
-            </summary>
+        <member name="F:OpenMetaverse.ClickAction.OpenMedia">
+            <summary>Open parcel media</summary>
         </member>
-        <member name="M:OpenMetaverse.UUID.FromBytes(System.Byte[],System.Int32)">
+        <member name="T:OpenMetaverse.PhysicsShapeType">
             <summary>
-            Assigns this UUID from 16 bytes out of a byte array
+            Type of physics representation used for this prim in the simulator
             </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>
         </member>
-        <member name="M:OpenMetaverse.UUID.GetBytes">
-            <summary>
-            Returns a copy of the raw bytes for this UUID
-            </summary>
-            <returns>A 16 byte array containing this UUID</returns>
+        <member name="F:OpenMetaverse.PhysicsShapeType.Prim">
+            <summary>Use prim physics form this object</summary>
         </member>
-        <member name="M:OpenMetaverse.UUID.ToBytes(System.Byte[],System.Int32)">
-            <summary>
-            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 16 bytes before the end of the array</param>
+        <member name="F:OpenMetaverse.PhysicsShapeType.None">
+            <summary>No physics, prim doesn't collide</summary>
         </member>
-        <member name="M:OpenMetaverse.UUID.CRC">
-            <summary>
-            Calculate an LLCRC (cyclic redundancy check) for this UUID
-            </summary>
-            <returns>The CRC checksum for this UUID</returns>
+        <member name="F:OpenMetaverse.PhysicsShapeType.ConvexHull">
+            <summary>Use convex hull represantion of this prim</summary>
         </member>
-        <member name="M:OpenMetaverse.UUID.GetULong">
+        <member name="T:OpenMetaverse.Color4">
             <summary>
-            Create a 64-bit integer representation from the second half of this UUID
+            An 8-bit color structure including an alpha channel
             </summary>
-            <returns>An integer created from the last eight bytes of this UUID</returns>
         </member>
-        <member name="M:OpenMetaverse.UUID.Parse(System.String)">
+        <member name="F:OpenMetaverse.Color4.R">
+            <summary>Red</summary>
+        </member>
+        <member name="F:OpenMetaverse.Color4.G">
+            <summary>Green</summary>
+        </member>
+        <member name="F:OpenMetaverse.Color4.B">
+            <summary>Blue</summary>
+        </member>
+        <member name="F:OpenMetaverse.Color4.A">
+            <summary>Alpha</summary>
+        </member>
+        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte,System.Byte,System.Byte,System.Byte)">
             <summary>
-            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>
+            <param name="r"></param>
+            <param name="g"></param>
+            <param name="b"></param>
+            <param name="a"></param>
         </member>
-        <member name="M:OpenMetaverse.UUID.TryParse(System.String,OpenMetaverse.UUID@)">
+        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte[],System.Int32,System.Boolean)">
             <summary>
-            Generate a UUID from a string
+            Builds a color from a byte array
             </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="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.UUID.Combine(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte[],System.Int32,System.Boolean,System.Boolean)">
             <summary>
-            Combine two UUIDs together by taking the MD5 hash of a byte array
-            containing both UUIDs
+            Returns the raw bytes for this vector
             </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>
+            <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.UUID.Random">
+        <member name="M:OpenMetaverse.Color4.#ctor(OpenMetaverse.Color4)">
             <summary>
-            
+            Copy constructor
             </summary>
-            <returns></returns>
+            <param name="color">Color to copy</param>
         </member>
-        <member name="M:OpenMetaverse.UUID.GetHashCode">
+        <member name="M:OpenMetaverse.Color4.CompareTo(OpenMetaverse.Color4)">
             <summary>
-            Return a hash code for this UUID, used by .NET for hash tables
+            IComparable.CompareTo implementation
             </summary>
-            <returns>An integer composed of all the UUID bytes XORed together</returns>
+            <remarks>Sorting ends up like this: |--Grayscale--||--Color--|.
+            Alpha is only used when the colors are otherwise equivalent</remarks>
         </member>
-        <member name="M:OpenMetaverse.UUID.Equals(System.Object)">
+        <member name="M:OpenMetaverse.Color4.FromBytes(System.Byte[],System.Int32,System.Boolean,System.Boolean)">
             <summary>
-            Comparison function
+            Builds a color from a byte array
             </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="byteArray">Byte array containing a 16 byte color</param>
+            <param name="pos">Beginning position in the byte array</param>
+            <param name="inverted">True if the byte array stores inverted values,
+            otherwise false. For example the color black (fully opaque) inverted
+            would be 0xFF 0xFF 0xFF 0x00</param>
+            <param name="alphaInverted">True if the alpha value is inverted in
+            addition to whatever the inverted parameter is. Setting inverted true
+            and alphaInverted true will flip the alpha value back to non-inverted,
+            but keep the other color bytes inverted</param>
         </member>
-        <member name="M:OpenMetaverse.UUID.Equals(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Color4.ToBytes(System.Byte[],System.Int32)">
             <summary>
-            Comparison function
+            Writes the raw bytes for this color to a byte array
             </summary>
-            <param name="uuid">UUID to compare to</param>
-            <returns>True if the UUIDs are equal, otherwise false</returns>
+            <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.UUID.ToString">
+        <member name="M:OpenMetaverse.Color4.ToBytes(System.Byte[],System.Int32,System.Boolean)">
             <summary>
-            Get a hyphenated string representation of this UUID
+            Serializes this color into four bytes in a byte array
             </summary>
-            <returns>A string representation of this UUID, lowercase and 
-            with hyphens</returns>
-            <example>11f8aa9c-b071-4242-836b-13b7abe0d489</example>
+            <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.UUID.op_Equality(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Color4.ToFloatBytes(System.Byte[],System.Int32)">
             <summary>
-            Equals operator
+            Writes the raw bytes for this color to a byte array
             </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>
+            <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.UUID.op_Inequality(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Color4.ClampValues">
             <summary>
-            Not equals operator
+            Ensures that values are in range 0-1
             </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>
         </member>
-        <member name="M:OpenMetaverse.UUID.op_ExclusiveOr(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Color4.FromHSV(System.Double,System.Double,System.Double)">
             <summary>
-            XOR operator
+            Create an RGB color from a hue, saturation, value combination
             </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>
+            <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.UUID.op_Explicit(System.String)~OpenMetaverse.UUID">
+        <member name="M:OpenMetaverse.Color4.Lerp(OpenMetaverse.Color4,OpenMetaverse.Color4,System.Single)">
             <summary>
-            String typecasting operator
+            Performs linear interpolation between two colors
             </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>
+            <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="F:OpenMetaverse.UUID.Zero">
-            <summary>An UUID with a value of all zeroes</summary>
+        <member name="F:OpenMetaverse.Color4.Black">
+            <summary>A Color4 with zero RGB values and fully opaque (alpha 1.0)</summary>
         </member>
-        <member name="F:OpenMetaverse.UUID.ZeroString">
-            <summary>A cache of UUID.Zero as a string to optimize a common path</summary>
+        <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="T:OpenMetaverse.Vector3">
+        <member name="T:OpenMetaverse.Vector2">
             <summary>
-            A three-dimensional vector with floating-point values
+            A two-dimensional vector with floating-point values
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Vector3.X">
+        <member name="F:OpenMetaverse.Vector2.X">
             <summary>X value</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector3.Y">
+        <member name="F:OpenMetaverse.Vector2.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)">
+        <member name="M:OpenMetaverse.Vector2.ApproxEquals(OpenMetaverse.Vector2,System.Single)">
             <summary>
             Test if this vector is equal to another vector, within a given
             tolerance range
@@ -1799,95 +1770,73 @@
             <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)">
+        <member name="M:OpenMetaverse.Vector2.IsFinite">
             <summary>
-            IComparable.CompareTo implementation
+            Test if this vector is composed of all finite numbers
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3.IsFinite">
+        <member name="M:OpenMetaverse.Vector2.CompareTo(OpenMetaverse.Vector2)">
             <summary>
-            Test if this vector is composed of all finite numbers
+            IComparable.CompareTo implementation
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3.FromBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Vector2.FromBytes(System.Byte[],System.Int32)">
             <summary>
             Builds a vector from a byte array
             </summary>
-            <param name="byteArray">Byte array containing a 12 byte vector</param>
+            <param name="byteArray">Byte array containing two four-byte floats</param>
             <param name="pos">Beginning position in the byte array</param>
         </member>
-        <member name="M:OpenMetaverse.Vector3.GetBytes">
+        <member name="M:OpenMetaverse.Vector2.GetBytes">
             <summary>
             Returns the raw bytes for this vector
             </summary>
-            <returns>A 12 byte array containing X, Y, and Z</returns>
+            <returns>An eight-byte array containing X and Y</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Vector2.ToBytes(System.Byte[],System.Int32)">
             <summary>
             Writes the raw bytes for this vector to a byte array
             </summary>
             <param name="dest">Destination byte array</param>
             <param name="pos">Position in the destination array to start
-            writing. Must be at least 12 bytes before the end of the array</param>
+            writing. Must be at least 8 bytes before the end of the array</param>
         </member>
-        <member name="M:OpenMetaverse.Vector3.Parse(System.String)">
+        <member name="M:OpenMetaverse.Vector2.Parse(System.String)">
             <summary>
             Parse a vector from a string
             </summary>
-            <param name="val">A string representation of a 3D vector, enclosed 
+            <param name="val">A string representation of a 2D 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)">
+        <member name="M:OpenMetaverse.Vector2.SmoothStep(OpenMetaverse.Vector2,OpenMetaverse.Vector2,System.Single)">
             <summary>
             Interpolates between two vectors using a cubic equation
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3.ToString">
+        <member name="M:OpenMetaverse.Vector2.ToString">
             <summary>
             Get a formatted string representation of the vector
             </summary>
             <returns>A string representation of the vector</returns>
         </member>
-        <member name="M:OpenMetaverse.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">
+        <member name="M:OpenMetaverse.Vector2.ToRawString">
             <summary>
-            Explicit casting for Vector3d > Vector3
+            Get a string representation of the vector elements with up to three
+            decimal digits and separated by spaces only
             </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>
+            <returns>Raw string representation of the vector</returns>
         </member>
-        <member name="F:OpenMetaverse.Vector3.One">
-            <summary>A vector with a value of 1,1,1</summary>
+        <member name="F:OpenMetaverse.Vector2.Zero">
+            <summary>A vector with a value of 0,0</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector3.UnitX">
-            <summary>A unit vector facing forward (X axis), value 1,0,0</summary>
+        <member name="F:OpenMetaverse.Vector2.One">
+            <summary>A vector with a value of 1,1</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector3.UnitY">
-            <summary>A unit vector facing left (Y axis), value 0,1,0</summary>
+        <member name="F:OpenMetaverse.Vector2.UnitX">
+            <summary>A vector with a value of 1,0</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector3.UnitZ">
-            <summary>A unit vector facing up (Z axis), value 0,0,1</summary>
+        <member name="F:OpenMetaverse.Vector2.UnitY">
+            <summary>A vector with a value of 0,1</summary>
         </member>
         <member name="T:OpenMetaverse.TokenBucket">
             <summary>
@@ -1981,674 +1930,725 @@
             return false regardless of the content of this bucket</remarks>
             </summary>
         </member>
-        <member name="T:OpenMetaverse.PCode">
-            <summary>
-            Identifier code for primitive types
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.PCode.None">
-            <summary>None</summary>
-        </member>
-        <member name="F:OpenMetaverse.PCode.Prim">
-            <summary>A Primitive</summary>
-        </member>
-        <member name="F:OpenMetaverse.PCode.Avatar">
-            <summary>A Avatar</summary>
-        </member>
-        <member name="F:OpenMetaverse.PCode.Grass">
-            <summary>Linden grass</summary>
+        <member name="F:OpenMetaverse.Quaternion.X">
+            <summary>X value</summary>
         </member>
-        <member name="F:OpenMetaverse.PCode.NewTree">
-            <summary>Linden tree</summary>
+        <member name="F:OpenMetaverse.Quaternion.Y">
+            <summary>Y value</summary>
         </member>
-        <member name="F:OpenMetaverse.PCode.ParticleSystem">
-            <summary>A primitive that acts as the source for a particle stream</summary>
+        <member name="F:OpenMetaverse.Quaternion.Z">
+            <summary>Z value</summary>
         </member>
-        <member name="F:OpenMetaverse.PCode.Tree">
-            <summary>A Linden tree</summary>
+        <member name="F:OpenMetaverse.Quaternion.W">
+            <summary>W value</summary>
         </member>
-        <member name="T:OpenMetaverse.PrimFlags">
+        <member name="M:OpenMetaverse.Quaternion.#ctor(System.Single,System.Single,System.Single)">
             <summary>
-            Primary parameters for primitives such as Physics Enabled or Phantom
+            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="F:OpenMetaverse.PrimFlags.None">
-            <summary>Deprecated</summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.Physics">
-            <summary>Whether physics are enabled for this object</summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.CreateSelected">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.ObjectModify">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.ObjectCopy">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.ObjectAnyOwner">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.ObjectYouOwner">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.Scripted">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.Touch">
-            <summary>Whether this object contains an active touch script</summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.ObjectMove">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.Money">
-            <summary>Whether this object can receive payments</summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.Phantom">
-            <summary>Whether this object is phantom (no collisions)</summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.InventoryEmpty">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.JointHinge">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.JointP2P">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.JointLP2P">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.JointWheel">
-            <summary>Deprecated</summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.AllowInventoryDrop">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.ObjectTransfer">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.ObjectGroupOwned">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.ObjectYouOfficer">
-            <summary>Deprecated</summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.CameraDecoupled">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.AnimSource">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.CameraSource">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.CastShadows">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.DieAtEdge">
-            <summary>Server flag, will not be sent to clients. Specifies that
-            the object is destroyed when it touches a simulator edge</summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.ReturnAtEdge">
-            <summary>Server flag, will not be sent to clients. Specifies that
-            the object will be returned to the owner's inventory when it
-            touches a simulator edge</summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.Sandbox">
-            <summary>Server flag, will not be sent to clients.</summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.Flying">
-            <summary>Server flag, will not be sent to client. Specifies that
-            the object is hovering/flying</summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.ObjectOwnerModify">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Quaternion.#ctor(System.Byte[],System.Int32,System.Boolean)">
+            <summary>
+            Constructor, builds a quaternion object from a byte array
+            </summary>
+            <param name="byteArray">Byte array containing four four-byte floats</param>
+            <param name="pos">Offset in the byte array to start reading at</param>
+            <param name="normalized">Whether the source data is normalized or
+            not. If this is true 12 bytes will be read, otherwise 16 bytes will
+            be read.</param>
         </member>
-        <member name="F:OpenMetaverse.PrimFlags.TemporaryOnRez">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Quaternion.Normalize">
+            <summary>
+            Normalizes the quaternion
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.PrimFlags.Temporary">
-            <summary></summary>
+        <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="F:OpenMetaverse.PrimFlags.ZlibCompressed">
-            <summary></summary>
+        <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="T:OpenMetaverse.SoundFlags">
+        <member name="M:OpenMetaverse.Quaternion.ToBytes(System.Byte[],System.Int32)">
             <summary>
-            Sound flags for sounds attached to primitives
+            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="F:OpenMetaverse.SoundFlags.None">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Quaternion.GetEulerAngles(System.Single@,System.Single@,System.Single@)">
+            <summary>
+            Convert this quaternion to euler angles
+            </summary>
+            <param name="roll">X euler angle</param>
+            <param name="pitch">Y euler angle</param>
+            <param name="yaw">Z euler angle</param>
         </member>
-        <member name="F:OpenMetaverse.SoundFlags.Loop">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Quaternion.GetAxisAngle(OpenMetaverse.Vector3@,System.Single@)">
+            <summary>
+            Convert this quaternion to an angle around an axis
+            </summary>
+            <param name="axis">Unit vector describing the axis</param>
+            <param name="angle">Angle around the axis, in radians</param>
         </member>
-        <member name="F:OpenMetaverse.SoundFlags.SyncMaster">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Quaternion.Conjugate(OpenMetaverse.Quaternion)">
+            <summary>
+            Returns the conjugate (spatial inverse) of a quaternion
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.SoundFlags.SyncSlave">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Quaternion.CreateFromAxisAngle(System.Single,System.Single,System.Single,System.Single)">
+            <summary>
+            Build a quaternion from an axis and an angle of rotation around
+            that axis
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.SoundFlags.SyncPending">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Quaternion.CreateFromAxisAngle(OpenMetaverse.Vector3,System.Single)">
+            <summary>
+            Build a quaternion from an axis and an angle of rotation around
+            that axis
+            </summary>
+            <param name="axis">Axis of rotation</param>
+            <param name="angle">Angle of rotation</param>
         </member>
-        <member name="F:OpenMetaverse.SoundFlags.Queue">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Quaternion.CreateFromEulers(OpenMetaverse.Vector3)">
+            <summary>
+            Creates a quaternion from a vector containing roll, pitch, and yaw
+            in radians
+            </summary>
+            <param name="eulers">Vector representation of the euler angles in
+            radians</param>
+            <returns>Quaternion representation of the euler angles</returns>
         </member>
-        <member name="F:OpenMetaverse.SoundFlags.Stop">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Quaternion.CreateFromEulers(System.Single,System.Single,System.Single)">
+            <summary>
+            Creates a quaternion from roll, pitch, and yaw euler angles in
+            radians
+            </summary>
+            <param name="roll">X angle in radians</param>
+            <param name="pitch">Y angle in radians</param>
+            <param name="yaw">Z angle in radians</param>
+            <returns>Quaternion representation of the euler angles</returns>
         </member>
-        <member name="T:OpenMetaverse.Material">
+        <member name="M:OpenMetaverse.Quaternion.Inverse(OpenMetaverse.Quaternion)">
             <summary>
-            Material type for a primitive
+            Conjugates and renormalizes a vector
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Material.Stone">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Material.Metal">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Material.Glass">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Material.Wood">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Quaternion.Slerp(OpenMetaverse.Quaternion,OpenMetaverse.Quaternion,System.Single)">
+            <summary>
+            Spherical linear interpolation between two quaternions
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Material.Flesh">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Quaternion.ToRawString">
+            <summary>
+            Get a string representation of the quaternion elements with up to three
+            decimal digits and separated by spaces only
+            </summary>
+            <returns>Raw string representation of the quaternion</returns>
         </member>
-        <member name="F:OpenMetaverse.Material.Plastic">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Quaternion.Identity">
+            <summary>A quaternion with a value of 0,0,0,1</summary>
         </member>
-        <member name="F:OpenMetaverse.Material.Rubber">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ExpiringCache`2.syncRoot">
+            <summary>For thread safety</summary>
         </member>
-        <member name="F:OpenMetaverse.Material.Light">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ExpiringCache`2.isPurging">
+            <summary>For thread safety</summary>
         </member>
-        <member name="T:OpenMetaverse.PrimType">
+        <member name="M:OpenMetaverse.ExpiringCache`2.PurgeCache(System.Object,System.Timers.ElapsedEventArgs)">
             <summary>
-            Used in a helper function to roughly determine prim shape
+            Purges expired objects from the cache. Called automatically by the purge timer.
             </summary>
         </member>
-        <member name="T:OpenMetaverse.ExtraParamType">
+        <member name="T:OpenMetaverse.EnumInfoAttribute">
             <summary>
-            Extra parameters for primitives, these flags are for features that have
-            been added after the original ObjectFlags that has all eight bits 
-            reserved already
+            Attribute class that allows extra attributes to be attached to ENUMs
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ExtraParamType.Flexible">
-            <summary>Whether this object has flexible parameters</summary>
-        </member>
-        <member name="F:OpenMetaverse.ExtraParamType.Light">
-            <summary>Whether this object has light parameters</summary>
-        </member>
-        <member name="F:OpenMetaverse.ExtraParamType.Sculpt">
-            <summary>Whether this object is a sculpted prim</summary>
+        <member name="F:OpenMetaverse.EnumInfoAttribute.Text">
+            <summary>Text used when presenting ENUM to user</summary>
         </member>
-        <member name="F:OpenMetaverse.ExtraParamType.LightImage">
-            <summary>Whether this object is a light image map</summary>
+        <member name="M:OpenMetaverse.EnumInfoAttribute.#ctor">
+            <summary>Default initializer</summary>
         </member>
-        <member name="F:OpenMetaverse.ExtraParamType.Mesh">
-            <summary>Whether this object is a mesh</summary>
+        <member name="M:OpenMetaverse.EnumInfoAttribute.#ctor(System.String)">
+            <summary>Text used when presenting ENUM to user</summary>
         </member>
-        <member name="T:OpenMetaverse.JointType">
+        <member name="T:OpenMetaverse.AssetType">
             <summary>
-            
+            The different types of grid assets
             </summary>
         </member>
-        <member name="F:OpenMetaverse.JointType.Invalid">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.Unknown">
+            <summary>Unknown asset type</summary>
         </member>
-        <member name="F:OpenMetaverse.JointType.Hinge">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.Texture">
+            <summary>Texture asset, stores in JPEG2000 J2C stream format</summary>
         </member>
-        <member name="F:OpenMetaverse.JointType.Point">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.Sound">
+            <summary>Sound asset</summary>
         </member>
-        <member name="T:OpenMetaverse.SculptType">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.AssetType.CallingCard">
+            <summary>Calling card for another avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.SculptType.None">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.Landmark">
+            <summary>Link to a location in world</summary>
         </member>
-        <member name="F:OpenMetaverse.SculptType.Sphere">
-            <summary></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.SculptType.Torus">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.Object">
+            <summary>Primitive that can contain textures, sounds, 
+            scripts and more</summary>
         </member>
-        <member name="F:OpenMetaverse.SculptType.Plane">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.Notecard">
+            <summary>Notecard asset</summary>
         </member>
-        <member name="F:OpenMetaverse.SculptType.Cylinder">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.Folder">
+            <summary>Holds a collection of inventory items</summary>
         </member>
-        <member name="F:OpenMetaverse.SculptType.Mesh">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.RootFolder">
+            <summary>Root inventory folder</summary>
         </member>
-        <member name="F:OpenMetaverse.SculptType.Invert">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.LSLText">
+            <summary>Linden scripting language script</summary>
         </member>
-        <member name="F:OpenMetaverse.SculptType.Mirror">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.LSLBytecode">
+            <summary>LSO bytecode for a script</summary>
         </member>
-        <member name="T:OpenMetaverse.FaceType">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.AssetType.TextureTGA">
+            <summary>Uncompressed TGA texture</summary>
         </member>
-        <member name="F:OpenMetaverse.FaceType.PathBegin">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.Bodypart">
+            <summary>Collection of textures and shape parameters that can
+            be worn</summary>
         </member>
-        <member name="F:OpenMetaverse.FaceType.PathEnd">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.TrashFolder">
+            <summary>Trash folder</summary>
         </member>
-        <member name="F:OpenMetaverse.FaceType.InnerSide">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.SnapshotFolder">
+            <summary>Snapshot folder</summary>
         </member>
-        <member name="F:OpenMetaverse.FaceType.ProfileBegin">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.LostAndFoundFolder">
+            <summary>Lost and found folder</summary>
         </member>
-        <member name="F:OpenMetaverse.FaceType.ProfileEnd">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.SoundWAV">
+            <summary>Uncompressed sound</summary>
         </member>
-        <member name="F:OpenMetaverse.FaceType.OuterSide0">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.ImageTGA">
+            <summary>Uncompressed TGA non-square image, not to be used as a
+            texture</summary>
         </member>
-        <member name="F:OpenMetaverse.FaceType.OuterSide1">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.ImageJPEG">
+            <summary>Compressed JPEG non-square image, not to be used as a
+            texture</summary>
         </member>
-        <member name="F:OpenMetaverse.FaceType.OuterSide2">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.Animation">
+            <summary>Animation</summary>
         </member>
-        <member name="F:OpenMetaverse.FaceType.OuterSide3">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.Gesture">
+            <summary>Sequence of animations, sounds, chat, and pauses</summary>
         </member>
-        <member name="T:OpenMetaverse.ObjectCategory">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.AssetType.Simstate">
+            <summary>Simstate file</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectCategory.Invalid">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.FavoriteFolder">
+            <summary>Contains landmarks for favorites</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectCategory.None">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.Link">
+            <summary>Asset is a link to another inventory item</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectCategory.Owner">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.LinkFolder">
+            <summary>Asset is a link to another inventory folder</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectCategory.Group">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.EnsembleStart">
+            <summary>Beginning of the range reserved for ensembles</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectCategory.Other">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AssetType.EnsembleEnd">
+            <summary>End of the range reserved for ensembles</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectCategory.Selected">
-            <summary></summary>
+        <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="F:OpenMetaverse.ObjectCategory.Temporary">
-            <summary></summary>
+        <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="T:OpenMetaverse.AttachmentPoint">
-             <summary>
-             Attachment points for objects on avatar bodies
-             </summary>
-             <remarks>
-             Both InventoryObject and InventoryAttachment types can be attached
-            </remarks>
+        <member name="F:OpenMetaverse.AssetType.MyOutfitsFolder">
+            <summary>Root folder for the folders of type OutfitFolder</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Default">
-            <summary>Right hand if object was not previously attached</summary>
+        <member name="F:OpenMetaverse.AssetType.Mesh">
+            <summary>Linden mesh format</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Chest">
-            <summary>Chest</summary>
+        <member name="F:OpenMetaverse.AssetType.Inbox">
+            <summary>Marketplace direct delivery inbox ("Received Items")</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Skull">
-            <summary>Skull</summary>
+        <member name="F:OpenMetaverse.AssetType.Outbox">
+            <summary>Marketplace direct delivery outbox</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftShoulder">
-            <summary>Left shoulder</summary>
+        <member name="F:OpenMetaverse.AssetType.BasicRoot">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightShoulder">
-            <summary>Right shoulder</summary>
+        <member name="T:OpenMetaverse.InventoryType">
+            <summary>
+            Inventory Item Types, eg Script, Notecard, Folder, etc
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftHand">
-            <summary>Left hand</summary>
+        <member name="F:OpenMetaverse.InventoryType.Unknown">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightHand">
-            <summary>Right hand</summary>
+        <member name="F:OpenMetaverse.InventoryType.Texture">
+            <summary>Texture</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftFoot">
-            <summary>Left foot</summary>
+        <member name="F:OpenMetaverse.InventoryType.Sound">
+            <summary>Sound</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightFoot">
-            <summary>Right foot</summary>
+        <member name="F:OpenMetaverse.InventoryType.CallingCard">
+            <summary>Calling Card</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Spine">
-            <summary>Spine</summary>
+        <member name="F:OpenMetaverse.InventoryType.Landmark">
+            <summary>Landmark</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Pelvis">
-            <summary>Pelvis</summary>
+        <member name="F:OpenMetaverse.InventoryType.Notecard">
+            <summary>Notecard</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Mouth">
-            <summary>Mouth</summary>
+        <member name="F:OpenMetaverse.InventoryType.Category">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Chin">
-            <summary>Chin</summary>
+        <member name="F:OpenMetaverse.InventoryType.Folder">
+            <summary>Folder</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftEar">
-            <summary>Left ear</summary>
+        <member name="F:OpenMetaverse.InventoryType.RootCategory">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightEar">
-            <summary>Right ear</summary>
+        <member name="F:OpenMetaverse.InventoryType.LSL">
+            <summary>an LSL Script</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftEyeball">
-            <summary>Left eyeball</summary>
+        <member name="F:OpenMetaverse.InventoryType.Snapshot">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightEyeball">
-            <summary>Right eyeball</summary>
+        <member name="F:OpenMetaverse.InventoryType.Attachment">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Nose">
-            <summary>Nose</summary>
+        <member name="F:OpenMetaverse.InventoryType.Wearable">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightUpperArm">
-            <summary>Right upper arm</summary>
+        <member name="F:OpenMetaverse.InventoryType.Animation">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightForearm">
-            <summary>Right forearm</summary>
+        <member name="F:OpenMetaverse.InventoryType.Gesture">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftUpperArm">
-            <summary>Left upper arm</summary>
+        <member name="F:OpenMetaverse.InventoryType.Mesh">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftForearm">
-            <summary>Left forearm</summary>
+        <member name="T:OpenMetaverse.SaleType">
+            <summary>
+            Item Sale Status
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightHip">
-            <summary>Right hip</summary>
+        <member name="F:OpenMetaverse.SaleType.Not">
+            <summary>Not for sale</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightUpperLeg">
-            <summary>Right upper leg</summary>
+        <member name="F:OpenMetaverse.SaleType.Original">
+            <summary>The original is for sale</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightLowerLeg">
-            <summary>Right lower leg</summary>
+        <member name="F:OpenMetaverse.SaleType.Copy">
+            <summary>Copies are for sale</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftHip">
-            <summary>Left hip</summary>
+        <member name="F:OpenMetaverse.SaleType.Contents">
+            <summary>The contents of the object are for sale</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftUpperLeg">
-            <summary>Left upper leg</summary>
+        <member name="T:OpenMetaverse.WearableType">
+            <summary>
+            Types of wearable assets
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftLowerLeg">
-            <summary>Left lower leg</summary>
+        <member name="F:OpenMetaverse.WearableType.Shape">
+            <summary>Body shape</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Stomach">
-            <summary>Stomach</summary>
+        <member name="F:OpenMetaverse.WearableType.Skin">
+            <summary>Skin textures and attributes</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftPec">
-            <summary>Left pectoral</summary>
+        <member name="F:OpenMetaverse.WearableType.Hair">
+            <summary>Hair</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightPec">
-            <summary>Right pectoral</summary>
+        <member name="F:OpenMetaverse.WearableType.Eyes">
+            <summary>Eyes</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.HUDCenter2">
-            <summary>HUD Center position 2</summary>
+        <member name="F:OpenMetaverse.WearableType.Shirt">
+            <summary>Shirt</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.HUDTopRight">
-            <summary>HUD Top-right</summary>
+        <member name="F:OpenMetaverse.WearableType.Pants">
+            <summary>Pants</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.HUDTop">
-            <summary>HUD Top</summary>
+        <member name="F:OpenMetaverse.WearableType.Shoes">
+            <summary>Shoes</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.HUDTopLeft">
-            <summary>HUD Top-left</summary>
+        <member name="F:OpenMetaverse.WearableType.Socks">
+            <summary>Socks</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.HUDCenter">
-            <summary>HUD Center</summary>
+        <member name="F:OpenMetaverse.WearableType.Jacket">
+            <summary>Jacket</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.HUDBottomLeft">
-            <summary>HUD Bottom-left</summary>
+        <member name="F:OpenMetaverse.WearableType.Gloves">
+            <summary>Gloves</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.HUDBottom">
-            <summary>HUD Bottom</summary>
+        <member name="F:OpenMetaverse.WearableType.Undershirt">
+            <summary>Undershirt</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.HUDBottomRight">
-            <summary>HUD Bottom-right</summary>
+        <member name="F:OpenMetaverse.WearableType.Underpants">
+            <summary>Underpants</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Neck">
-            <summary>Neck</summary>
+        <member name="F:OpenMetaverse.WearableType.Skirt">
+            <summary>Skirt</summary>
         </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Root">
-            <summary>Avatar Center</summary>
+        <member name="F:OpenMetaverse.WearableType.Alpha">
+            <summary>Alpha mask to hide parts of the avatar</summary>
         </member>
-        <member name="T:OpenMetaverse.Tree">
-            <summary>
-            Tree foliage types
-            </summary>
+        <member name="F:OpenMetaverse.WearableType.Tattoo">
+            <summary>Tattoo</summary>
         </member>
-        <member name="F:OpenMetaverse.Tree.Pine1">
-            <summary>Pine1 tree</summary>
+        <member name="F:OpenMetaverse.WearableType.Physics">
+            <summary>Physics</summary>
         </member>
-        <member name="F:OpenMetaverse.Tree.Oak">
-            <summary>Oak tree</summary>
+        <member name="F:OpenMetaverse.WearableType.Invalid">
+            <summary>Invalid wearable asset</summary>
         </member>
-        <member name="F:OpenMetaverse.Tree.TropicalBush1">
-            <summary>Tropical Bush1</summary>
+        <member name="T:OpenMetaverse.LocklessQueue`1">
+            <summary>
+            A thread-safe lockless queue that supports multiple readers and 
+            multiple writers
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Tree.Palm1">
-            <summary>Palm1 tree</summary>
+        <member name="F:OpenMetaverse.LocklessQueue`1.head">
+            <summary>Queue head</summary>
         </member>
-        <member name="F:OpenMetaverse.Tree.Dogwood">
-            <summary>Dogwood tree</summary>
+        <member name="F:OpenMetaverse.LocklessQueue`1.tail">
+            <summary>Queue tail</summary>
         </member>
-        <member name="F:OpenMetaverse.Tree.TropicalBush2">
-            <summary>Tropical Bush2</summary>
+        <member name="F:OpenMetaverse.LocklessQueue`1.count">
+            <summary>Queue item count</summary>
         </member>
-        <member name="F:OpenMetaverse.Tree.Palm2">
-            <summary>Palm2 tree</summary>
+        <member name="M:OpenMetaverse.LocklessQueue`1.#ctor">
+            <summary>
+            Constructor
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Tree.Cypress1">
-            <summary>Cypress1 tree</summary>
+        <member name="M:OpenMetaverse.LocklessQueue`1.Enqueue(`0)">
+            <summary>
+            Enqueue an item
+            </summary>
+            <param name="item">Item to enqeue</param>
         </member>
-        <member name="F:OpenMetaverse.Tree.Cypress2">
-            <summary>Cypress2 tree</summary>
+        <member name="M:OpenMetaverse.LocklessQueue`1.TryDequeue(`0@)">
+            <summary>
+            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="F:OpenMetaverse.Tree.Pine2">
-            <summary>Pine2 tree</summary>
+        <member name="P:OpenMetaverse.LocklessQueue`1.Count">
+            <summary>Gets the current number of items in the queue. Since this
+            is a lockless collection this value should be treated as a close
+            estimate</summary>
         </member>
-        <member name="F:OpenMetaverse.Tree.Plumeria">
-            <summary>Plumeria</summary>
+        <member name="T:OpenMetaverse.LocklessQueue`1.SingleLinkNode">
+            <summary>
+            Provides a node container for data in a singly linked list
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Tree.WinterPine1">
-            <summary>Winter pinetree1</summary>
+        <member name="F:OpenMetaverse.LocklessQueue`1.SingleLinkNode.Next">
+            <summary>Pointer to the next node in list</summary>
         </member>
-        <member name="F:OpenMetaverse.Tree.WinterAspen">
-            <summary>Winter Aspen tree</summary>
+        <member name="F:OpenMetaverse.LocklessQueue`1.SingleLinkNode.Item">
+            <summary>The data contained by the node</summary>
         </member>
-        <member name="F:OpenMetaverse.Tree.WinterPine2">
-            <summary>Winter pinetree2</summary>
+        <member name="M:OpenMetaverse.LocklessQueue`1.SingleLinkNode.#ctor">
+            <summary>
+            Constructor
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Tree.Eucalyptus">
-            <summary>Eucalyptus tree</summary>
+        <member name="M:OpenMetaverse.LocklessQueue`1.SingleLinkNode.#ctor(`0)">
+            <summary>
+            Constructor
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Tree.Fern">
-            <summary>Fern</summary>
+        <member name="T:OpenMetaverse.UUID">
+            <summary>
+            A 128-bit Universally Unique Identifier, used throughout the Second
+            Life networking protocol
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Tree.Eelgrass">
-            <summary>Eelgrass</summary>
+        <member name="F:OpenMetaverse.UUID.Guid">
+            <summary>The System.Guid object this struct wraps around</summary>
         </member>
-        <member name="F:OpenMetaverse.Tree.SeaSword">
-            <summary>Sea Sword</summary>
+        <member name="M:OpenMetaverse.UUID.#ctor(System.String)">
+            <summary>
+            Constructor that takes a string UUID representation
+            </summary>
+            <param name="val">A string representation of a UUID, case 
+            insensitive and can either be hyphenated or non-hyphenated</param>
+            <example>UUID("11f8aa9c-b071-4242-836b-13b7abe0d489")</example>
         </member>
-        <member name="F:OpenMetaverse.Tree.Kelp1">
-            <summary>Kelp1 plant</summary>
+        <member name="M:OpenMetaverse.UUID.#ctor(System.Guid)">
+            <summary>
+            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="F:OpenMetaverse.Tree.BeachGrass1">
-            <summary>Beach grass</summary>
+        <member name="M:OpenMetaverse.UUID.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            Constructor that takes a byte array containing a UUID
+            </summary>
+            <param name="source">Byte array containing a 16 byte UUID</param>
+            <param name="pos">Beginning offset in the array</param>
         </member>
-        <member name="F:OpenMetaverse.Tree.Kelp2">
-            <summary>Kelp2 plant</summary>
+        <member name="M:OpenMetaverse.UUID.#ctor(System.UInt64)">
+            <summary>
+            Constructor that takes an unsigned 64-bit unsigned integer to 
+            convert to a UUID
+            </summary>
+            <param name="val">64-bit unsigned integer to convert to a UUID</param>
         </member>
-        <member name="T:OpenMetaverse.Grass">
+        <member name="M:OpenMetaverse.UUID.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Grass foliage types
+            Copy constructor
             </summary>
+            <param name="val">UUID to copy</param>
         </member>
-        <member name="F:OpenMetaverse.Grass.Grass0">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Grass.Grass1">
-            <summary></summary>
+        <member name="M:OpenMetaverse.UUID.CompareTo(OpenMetaverse.UUID)">
+            <summary>
+            IComparable.CompareTo implementation
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Grass.Grass2">
-            <summary></summary>
+        <member name="M:OpenMetaverse.UUID.FromBytes(System.Byte[],System.Int32)">
+            <summary>
+            Assigns this UUID from 16 bytes out of 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>
         </member>
-        <member name="F:OpenMetaverse.Grass.Grass3">
-            <summary></summary>
+        <member name="M:OpenMetaverse.UUID.GetBytes">
+            <summary>
+            Returns a copy of the raw bytes for this UUID
+            </summary>
+            <returns>A 16 byte array containing this UUID</returns>
         </member>
-        <member name="F:OpenMetaverse.Grass.Grass4">
-            <summary></summary>
+        <member name="M:OpenMetaverse.UUID.ToBytes(System.Byte[],System.Int32)">
+            <summary>
+            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 16 bytes before the end of the array</param>
         </member>
-        <member name="F:OpenMetaverse.Grass.Undergrowth1">
-            <summary></summary>
+        <member name="M:OpenMetaverse.UUID.CRC">
+            <summary>
+            Calculate an LLCRC (cyclic redundancy check) for this UUID
+            </summary>
+            <returns>The CRC checksum for this UUID</returns>
         </member>
-        <member name="T:OpenMetaverse.ClickAction">
+        <member name="M:OpenMetaverse.UUID.GetULong">
             <summary>
-            Action associated with clicking on an object
+            Create a 64-bit integer representation from the second half of this UUID
             </summary>
+            <returns>An integer created from the last eight bytes of this UUID</returns>
         </member>
-        <member name="F:OpenMetaverse.ClickAction.Touch">
-            <summary>Touch object</summary>
+        <member name="M:OpenMetaverse.UUID.Parse(System.String)">
+            <summary>
+            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="F:OpenMetaverse.ClickAction.Sit">
-            <summary>Sit on object</summary>
+        <member name="M:OpenMetaverse.UUID.TryParse(System.String,OpenMetaverse.UUID@)">
+            <summary>
+            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>
+            <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="F:OpenMetaverse.ClickAction.Buy">
-            <summary>Purchase object or contents</summary>
+        <member name="M:OpenMetaverse.UUID.Combine(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>
+            Combine two UUIDs together by taking the MD5 hash of a byte array
+            containing both UUIDs
+            </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="F:OpenMetaverse.ClickAction.Pay">
-            <summary>Pay the object</summary>
+        <member name="M:OpenMetaverse.UUID.Random">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.ClickAction.OpenTask">
-            <summary>Open task inventory</summary>
+        <member name="M:OpenMetaverse.UUID.GetHashCode">
+            <summary>
+            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="F:OpenMetaverse.ClickAction.PlayMedia">
-            <summary>Play parcel media</summary>
+        <member name="M:OpenMetaverse.UUID.Equals(System.Object)">
+            <summary>
+            Comparison function
+            </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="F:OpenMetaverse.ClickAction.OpenMedia">
-            <summary>Open parcel media</summary>
+        <member name="M:OpenMetaverse.UUID.Equals(OpenMetaverse.UUID)">
+            <summary>
+            Comparison function
+            </summary>
+            <param name="uuid">UUID to compare to</param>
+            <returns>True if the UUIDs are equal, otherwise false</returns>
         </member>
-        <member name="T:OpenMetaverse.PhysicsShapeType">
+        <member name="M:OpenMetaverse.UUID.ToString">
             <summary>
-            Type of physics representation used for this prim in the simulator
+            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="F:OpenMetaverse.PhysicsShapeType.Prim">
-            <summary>Use prim physics form this object</summary>
+        <member name="M:OpenMetaverse.UUID.op_Equality(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>
+            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="F:OpenMetaverse.PhysicsShapeType.None">
-            <summary>No physics, prim doesn't collide</summary>
+        <member name="M:OpenMetaverse.UUID.op_Inequality(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>
+            Not 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 not equal, otherwise true</returns>
         </member>
-        <member name="F:OpenMetaverse.PhysicsShapeType.ConvexHull">
-            <summary>Use convex hull represantion of this prim</summary>
+        <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>
-        <member name="T:OpenMetaverse.Vector2">
+        <member name="M:OpenMetaverse.UUID.op_Explicit(System.String)~OpenMetaverse.UUID">
             <summary>
-            A two-dimensional vector with floating-point values
+            String typecasting operator
             </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="F:OpenMetaverse.Vector2.X">
-            <summary>X value</summary>
+        <member name="F:OpenMetaverse.UUID.Zero">
+            <summary>An UUID with a value of all zeroes</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector2.Y">
-            <summary>Y value</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.Vector2.ApproxEquals(OpenMetaverse.Vector2,System.Single)">
+        <member name="T:OpenMetaverse.Parallel">
             <summary>
-            Test if this vector is equal to another vector, within a given
-            tolerance range
+            Provides helper methods for parallelizing loops
             </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.Parallel.For(System.Int32,System.Int32,System.Action{System.Int32})">
             <summary>
-            Test if this vector is composed of all finite numbers
+            Executes a for loop in which iterations may run in parallel
             </summary>
+            <param name="fromInclusive">The loop will be started at this index</param>
+            <param name="toExclusive">The loop will be terminated before this index is reached</param>
+            <param name="body">Method body to run for each iteration of the loop</param>
         </member>
-        <member name="M:OpenMetaverse.Vector2.CompareTo(OpenMetaverse.Vector2)">
+        <member name="M:OpenMetaverse.Parallel.For(System.Int32,System.Int32,System.Int32,System.Action{System.Int32})">
             <summary>
-            IComparable.CompareTo implementation
+            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.Vector2.FromBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Parallel.ForEach``1(System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
             <summary>
-            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 two four-byte floats</param>
-            <param name="pos">Beginning position in the byte array</param>
+            <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.Vector2.GetBytes">
+        <member name="M:OpenMetaverse.Parallel.ForEach``1(System.Int32,System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
             <summary>
-            Returns the raw bytes for this vector
+            Executes a foreach loop in which iterations may run in parallel
             </summary>
-            <returns>An eight-byte array containing X and Y</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.Vector2.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Parallel.Invoke(System.Action[])">
             <summary>
-            Writes the raw bytes for this vector to a byte array
+            Executes a series of tasks in parallel
             </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>
+            <param name="actions">A series of method bodies to execute</param>
         </member>
-        <member name="M:OpenMetaverse.Vector2.Parse(System.String)">
+        <member name="M:OpenMetaverse.Parallel.Invoke(System.Int32,System.Action[])">
             <summary>
-            Parse a vector from a string
+            Executes a series of tasks in parallel
             </summary>
-            <param name="val">A string representation of a 2D vector, enclosed 
-            in arrow brackets and separated by commas</param>
+            <param name="threadCount">The number of concurrent execution threads to run</param>
+            <param name="actions">A series of method bodies to execute</param>
         </member>
-        <member name="M:OpenMetaverse.Vector2.SmoothStep(OpenMetaverse.Vector2,OpenMetaverse.Vector2,System.Single)">
+        <member name="M:OpenMetaverse.CircularQueue`1.#ctor(OpenMetaverse.CircularQueue{`0})">
             <summary>
-            Interpolates between two vectors using a cubic equation
+            Copy constructor
             </summary>
+            <param name="queue">Circular queue to copy</param>
         </member>
-        <member name="M:OpenMetaverse.Vector2.ToString">
+        <member name="M:OpenMetaverse.ReaderWriterLockSlim.ExitAndWakeUpAppropriateWaiters">
             <summary>
-            Get a formatted string representation of the vector
+            Determines the appropriate events to set, leaves the locks, and sets the events. 
             </summary>
-            <returns>A string representation of the vector</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector2.ToRawString">
+        <member name="M:OpenMetaverse.ReaderWriterLockSlim.LazyCreateEvent(System.Threading.EventWaitHandle@,System.Boolean)">
             <summary>
-            Get a string representation of the vector elements with up to three
-            decimal digits and separated by spaces only
+            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>
-            <returns>Raw string representation of the vector</returns>
         </member>
-        <member name="F:OpenMetaverse.Vector2.Zero">
-            <summary>A vector with a value of 0,0</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector2.One">
-            <summary>A vector with a value of 1,1</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector2.UnitX">
-            <summary>A vector with a value of 1,0</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector2.UnitY">
-            <summary>A vector with a value of 0,1</summary>
+        <member 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>
     </members>
 </doc>
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index 00397a9..7ee907b 100755
Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ
-- 
cgit v1.1


From 46eb8465a01b7dd923b962035562c953d4eb78e4 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Wed, 15 May 2013 17:12:17 -0700
Subject: fall back to using a display mesh for physics proxy if no
 physics_mesh entry was wound in a mesh asset

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 8145d61..2d102de 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -358,6 +358,10 @@ namespace OpenSim.Region.Physics.Meshing
                     physicsParms = (OSDMap)map["physics_shape"]; // old asset format
                 else if (map.ContainsKey("physics_mesh"))
                     physicsParms = (OSDMap)map["physics_mesh"]; // new asset format
+                else if (map.ContainsKey("medium_lod"))
+                    physicsParms = (OSDMap)map["medium_lod"]; // if no physics mesh, try to fall back to medium LOD display mesh
+                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 (physicsParms == null)
                 {
-- 
cgit v1.1


From bd31821792a940709ff1355a91b9b60302cc1a17 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 16 May 2013 16:37:21 +0100
Subject: On logout, send close child agent requests to neighbours
 asynchronously, so user is not prevented from relogging if many neighbours
 are present but not responsive.

The symptom here is that previous user connections are still present but are labelled active == false
---
 OpenSim/Region/Framework/Scenes/Scene.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 6bbcbd7..50bea6f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3435,16 +3435,13 @@ namespace OpenSim.Region.Framework.Scenes
                     if (closeChildAgents && CapsModule != null)
                         CapsModule.RemoveCaps(agentID);
     
-//                    // 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);
+
+                        // We must do this asynchronously so that a logout isn't held up where there are many present but unresponsive neighbours.
+                        Util.FireAndForget(delegate { m_sceneGridService.SendCloseChildAgentConnections(agentID, regions); });
                     }
     
                     m_eventManager.TriggerClientClosed(agentID, this);
-- 
cgit v1.1


From d214e2d0c4b8e1ea5e0d69e2ba94cd668be610bd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 16 May 2013 17:12:02 +0100
Subject: On closing child agents, send separate asynchronous requests to each
 neighbour rather than sending all closes concurrently on a separate thread.

This is to reduce race conditions where neighbours may be responding erratically, thus mixing up create and close agent requests in time.
This mirrors OpenSimulator behaviour on enabling child agents where each region is contacted separately.
---
 OpenSim/Region/Framework/Scenes/Scene.cs                     | 4 ++--
 OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 4 +---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs             | 6 ++----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 50bea6f..8fe9b66 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3440,8 +3440,8 @@ namespace OpenSim.Region.Framework.Scenes
                         List<ulong> regions = avatar.KnownRegionHandles;
                         regions.Remove(RegionInfo.RegionHandle);
 
-                        // We must do this asynchronously so that a logout isn't held up where there are many present but unresponsive neighbours.
-                        Util.FireAndForget(delegate { 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, regions);
                     }
     
                     m_eventManager.TriggerClientClosed(agentID, this);
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 305f8a4..8c84c98 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -222,9 +222,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void SendCloseChildAgentConnections(UUID agentID, List<ulong> regionslst)
         {
             foreach (ulong handle in regionslst)
-            {
-                SendCloseChildAgent(agentID, handle);
-            }
+                Util.FireAndForget(delegate { SendCloseChildAgent(agentID, handle); });
         }
        
         public List<GridRegion> RequestNamedRegions(string name, int maxNumber)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 2a265db..9e9089b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3135,10 +3135,8 @@ 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); 
-                });
+
+                m_scene.SceneGridService.SendCloseChildAgentConnections(ControllingClient.AgentId, byebyeRegions); 
             }
             
             foreach (ulong handle in byebyeRegions)
-- 
cgit v1.1


From 3bc8cf65a4e933cfdd0597affc1685c74fb29dba Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 16 May 2013 17:30:30 +0100
Subject: Where this is not already happening, trigger asychoronous calls to
 CloseChildAgent() above the LocalSimulationConnector level.

This is so that other callers (such as SceneCommunicationService.SendCloseChildAgentConnections() can perform all closes asynchronously without pointlessly firing another thread for local closes).
No functional change apart from elimination of unnecessary chaining of new threads.
---
 .../Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 1 +
 .../ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs         | 2 +-
 OpenSim/Server/Handlers/Simulation/AgentHandlers.cs                     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index eac0da7..9579449 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -937,6 +937,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             EnableChildAgents(sp);
 
             // Finally, kill the agent we just created at the destination.
+            // XXX: Possibly this should be done asynchronously.
             Scene.SimulationService.CloseAgent(finalDestination, sp.UUID);
         }
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index a413546..9427961 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -317,7 +317,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);
                 return true;
             }
 
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 012b14e..ae37ca7 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -218,7 +218,7 @@ 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); });
 
             responsedata["int_response_code"] = HttpStatusCode.OK;
             responsedata["str_response_string"] = "OpenSim agent " + id.ToString();
-- 
cgit v1.1


From 61f4ab667447da953018b9e63821777ec5f144b0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 16 May 2013 18:25:04 +0100
Subject: minor: Remove completely unused IClientAPI.RequestClientInfo() call
 from EntityTransferModule.CrossAgentToNewRegionAsync()

---
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 9579449..4f693c6 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1482,9 +1482,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     return agent;
                 }
 
-                //AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo();
-                agent.ControllingClient.RequestClientInfo();
-
                 //m_log.Debug("BEFORE CROSS");
                 //Scene.DumpChildrenSeeds(UUID);
                 //DumpKnownRegions();
-- 
cgit v1.1


From ec818a506bd125b1a89b2ff04f15108521a0f2e9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 16 May 2013 18:26:22 +0100
Subject: minor: remove long commented out scene cache clearing code in
 EntityTransferModule.CrossAgentToNewRegionAsync()

---
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 4f693c6..f58a24f 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1541,15 +1541,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 agent.CloseChildAgents(neighbourx, neighboury);
 
                 AgentHasMovedAway(agent, false);
-
-//                // the user may change their profile information in other region,
-//                // so the userinfo in UserProfileCache is not reliable any more, delete it
-//                // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE!
-//                if (agent.Scene.NeedSceneCacheClear(agent.UUID))
-//                {
-//                    m_log.DebugFormat(
-//                        "[ENTITY TRANSFER MODULE]: User {0} is going to another region", agent.UUID);
-//                }
     
                 //m_log.Debug("AFTER CROSS");
                 //Scene.DumpChildrenSeeds(UUID);
-- 
cgit v1.1


From 214bae14799c05c12595b067ff2eb0e2e5b4eeb2 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 17 May 2013 14:43:53 -0700
Subject: BulletSim: fix BulletSim crashing if there is no [BulletSim] section
 in any INI file. Update TODO list.

---
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs        |  6 ++++++
 OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt | 14 ++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 3f407ce..9ed2d06 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -268,6 +268,12 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
                 // Do any replacements in the parameters
                 m_physicsLoggingPrefix = m_physicsLoggingPrefix.Replace("%REGIONNAME%", RegionName);
             }
+            else
+            {
+                BulletEngineName = "BulletUnmanaged";
+                m_physicsLoggingEnabled = false;
+                VehicleLoggingEnabled = false;
+            }
 
             // The material characteristics.
             BSMaterials.InitializeFromDefaults(Params);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
index 5792ae6..df1da63 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
@@ -1,16 +1,12 @@
-PROBLEMS TO LOOK INTO
+CURRENT PROBLEMS TO FIX AND/OR LOOK AT
 =================================================
-Nebadon vehicle ride, get up, ride again. Second time vehicle does not act correctly.
+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.
+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.
 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
 Two of Nebadon vehicles in a sim max the CPU. This is new.
-A sitting, active vehicle bobs up and down a small amount.
-
-CURRENT PRIORITIES
-=================================================
-Use the HACD convex hull routine in Bullet rather than the C# version.	
-	Speed up hullifying large meshes.
 Enable vehicle border crossings (at least as poorly as ODE)
 	Terrain skirts
 	Avatar created in previous region and not new region when crossing border
@@ -361,4 +357,6 @@ Angular motion around Z moves the vehicle in world Z and not vehicle Z in ODE.
 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)
 
-- 
cgit v1.1


From fa8f5bafb225624fe4a0df88acf1f4c227632fe0 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Sat, 18 May 2013 01:23:09 -0700
Subject: add prototype code to decode convex hulls from mesh assets. Please do
 not use yet; the interface will be defined in a later commit.

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 131 +++++++++++++++++++++-----
 1 file changed, 110 insertions(+), 21 deletions(-)

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 2d102de..825e622 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -79,6 +79,8 @@ 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 Dictionary<ulong, Mesh> m_uniqueMeshes = new Dictionary<ulong, Mesh>();
 
         public Meshmerizer(IConfigSource config)
@@ -363,6 +365,57 @@ namespace OpenSim.Region.Physics.Meshing
                 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 (map.ContainsKey("physics_convex"))
+                { // pull this out also in case physics engine can use it
+                    try
+                    {
+                        OSDMap convexBlock = (OSDMap)map["physics_convex"];
+                        if (convexBlock.ContainsKey("HullList"))
+                        {
+                            byte[] hullList = convexBlock["HullList"].AsBinary();
+                            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();
+
+                            // decompress and decode hull points
+                            byte[] posBytes = DecompressOsd(convexBlock["Positions"].AsBinary()).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 < cnt; 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) * size.X,
+                                        Utils.UInt16ToFloat(uY, min.Y, max.Y) * size.Y,
+                                        Utils.UInt16ToFloat(uZ, min.Z, max.Z) * size.Z
+                                    );
+
+                                    hull.Add(pos);
+                                }
+
+                                hulls.Add(hull);
+                            }
+
+                            mConvexHulls = hulls;
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.WarnFormat("[MESH]: exception decoding convex block: {0}", e.Message);
+                    }
+                }
+
                 if (physicsParms == null)
                 {
                     m_log.WarnFormat("[MESH]: No recognized physics mesh found in mesh asset for {0}", primName);
@@ -381,27 +434,7 @@ namespace OpenSim.Region.Physics.Meshing
 //                        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)
                 {
@@ -428,6 +461,41 @@ namespace OpenSim.Region.Physics.Meshing
             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>
@@ -704,6 +772,27 @@ 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 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);
+            }
+
+            return hulls;
+        }
+
         public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod)
         {
             return CreateMesh(primName, primShape, size, lod, false, true);
-- 
cgit v1.1


From 477bee6468f35ca9264fc8f752a9124e32503901 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Sat, 18 May 2013 11:15:05 -0700
Subject: remove duplicate hull scaling

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 825e622..a57146c 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -396,9 +396,9 @@ namespace OpenSim.Region.Physics.Meshing
                                     ushort uZ = Utils.BytesToUInt16(posBytes, posNdx); posNdx += 2;
 
                                     Vector3 pos = new Vector3(
-                                        Utils.UInt16ToFloat(uX, min.X, max.X) * size.X,
-                                        Utils.UInt16ToFloat(uY, min.Y, max.Y) * size.Y,
-                                        Utils.UInt16ToFloat(uZ, min.Z, max.Z) * size.Z
+                                        Utils.UInt16ToFloat(uX, min.X, max.X),
+                                        Utils.UInt16ToFloat(uY, min.Y, max.Y),
+                                        Utils.UInt16ToFloat(uZ, min.Z, max.Z)
                                     );
 
                                     hull.Add(pos);
-- 
cgit v1.1


From e65d1e459eb875cb2d0d5f9aa6042c640daa19fd Mon Sep 17 00:00:00 2001
From: dahlia
Date: Sat, 18 May 2013 13:11:22 -0700
Subject: fix error in hull point indexing

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index a57146c..79edc12 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -389,7 +389,7 @@ namespace OpenSim.Region.Physics.Meshing
                                 int count = cnt == 0 ? 256 : cnt;
                                 List<Vector3> hull = new List<Vector3>();
                                 
-                                for (int i = 0; i < cnt; i++)
+                                for (int i = 0; i < count; i++)
                                 {
                                     ushort uX = Utils.BytesToUInt16(posBytes, posNdx); posNdx += 2;
                                     ushort uY = Utils.BytesToUInt16(posBytes, posNdx); posNdx += 2;
-- 
cgit v1.1


From 26904cc5a16d0bbbd9984bfc36354680b0ee27fb Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 20 May 2013 09:25:50 -0700
Subject: Add comment

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 2a265db..1b81985 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1348,7 +1348,9 @@ namespace OpenSim.Region.Framework.Scenes
             // Create child agents in neighbouring regions
             if (openChildAgents && !IsChildAgent)
             {
+                // Remember in HandleUseCircuitCode, we delayed this to here
                 SendInitialDataToMe();
+
                 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
                 if (m_agentTransfer != null)
                     Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); });
-- 
cgit v1.1


From 6ae426c96ba0bfdad9e884364f5b6be5b4cd61a9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 21 May 2013 17:25:06 +0100
Subject: Lock m_UserCache whilst iterating over it in
 UserManagementModule.GetUserData() to avoid concurrency exceptions

---
 .../Framework/UserManagement/UserManagementModule.cs        | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 6847e57..d99c8eb 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -246,10 +246,15 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             }
 
             // 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.ToLower().StartsWith(query.ToLower()) || data.LastName.ToLower().StartsWith(query.ToLower())))
-                    users.Add(data);
+            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);
 
-- 
cgit v1.1


From c47de9878dd8af19fa9b4322a8a49646712ebf9b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 21 May 2013 17:45:15 +0100
Subject: Log when "Unknown User" is sent to a user because the UMM had no
 binding for that UUID and when a binding replaces a previous "Unknown User"
 entry.

This is a temporary measure to hunt down issues where some but not all users see others as "Unknown user" in text chat, etc.
http://opensimulator.org/mantis/view.php?id=6625
---
 .../UserManagement/UserManagementModule.cs         | 49 ++++++++++++++--------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index d99c8eb..06f1712 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -157,13 +157,16 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             }
             else
             {
-                string[] names = GetUserNames(uuid);
+                string[] names;
+                bool foundRealName = TryGetUserNames(uuid, out names);
+
                 if (names.Length == 2)
                 {
-                    //m_log.DebugFormat("[XXX] HandleUUIDNameRequest {0} is {1} {2}", uuid, names[0], names[1]);
+                    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, remote_client.Name);
+
                     remote_client.SendNameReply(uuid, names[0], names[1]);
                 }
-
             }
         }
 
@@ -277,17 +280,24 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             }
         }
 
-        private string[] GetUserNames(UUID uuid)
+        /// <summary>
+        /// Try to get the names bound to the given uuid.
+        /// </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 TryGetUserNames(UUID uuid, out string[] names)
         {
-            string[] returnstring = new string[2];
+            names = new string[2];
 
             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;
                 }
             }
 
@@ -295,8 +305,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
             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;
@@ -304,14 +314,16 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
                 lock (m_UserCache)
                     m_UserCache[uuid] = user;
+
+                return true;
             }
             else
             {
-                returnstring[0] = "Unknown";
-                returnstring[1] = "User";
-            }
+                names[0] = "Unknown";
+                names[1] = "User";
 
-            return returnstring;
+                return false;
+            }
         }
 
         #region IUserManagement
@@ -347,15 +359,17 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         public string GetUserName(UUID uuid)
         {
-            string[] names = GetUserNames(uuid);
+            string[] names;
+            TryGetUserNames(uuid, out names);
+
             if (names.Length == 2)
             {
                 string firstname = names[0];
                 string lastname = names[1];
 
                 return firstname + " " + lastname;
-
             }
+
             return "(hippos)";
         }
 
@@ -471,12 +485,13 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                         //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);
+                        m_log.DebugFormat("[USER MANAGEMENT MODULE]: Re-adding user with id {0}, creatorData [{1}] and old HomeURL {2}", id, creatorData, oldUser.HomeURL);
                     }
                     else
                     {
-- 
cgit v1.1


From 6edecd5d94949873411b0625928b4f0ad0e01f9a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 21 May 2013 18:00:41 +0100
Subject: Add "show name" console command to make it possible to show a single
 binding of a UUID to a name.

---
 .../UserManagement/UserManagementModule.cs         | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 06f1712..48ec12f 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -568,6 +568,13 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
         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",
@@ -575,6 +582,33 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 HandleShowUsers);
         }
 
+        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;
+            if (!TryGetUserNames(userId, out names))
+            {
+                MainConsole.Instance.OutputFormat("No name known for user with id {0}", userId);
+                return;
+            }
+
+            ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+            cdt.AddColumn("UUID", 36);
+            cdt.AddColumn("Name", 60);
+            cdt.AddRow(userId, string.Join(" ", names));
+
+            MainConsole.Instance.Output(cdt.ToString());
+        }
+
         private void HandleShowUsers(string module, string[] cmd)
         {
             lock (m_UserCache)
-- 
cgit v1.1


From 5c8d38d6cf00ea8e53ff52ac5eafde40ee94b68e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 21 May 2013 18:10:42 +0100
Subject: minor: Change "show names" command to use consistent console display
 table

---
 .../UserManagement/UserManagementModule.cs         | 24 ++++++++--------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 48ec12f..d75a85f 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -603,7 +603,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
             ConsoleDisplayTable cdt = new ConsoleDisplayTable();
             cdt.AddColumn("UUID", 36);
-            cdt.AddColumn("Name", 60);
+            cdt.AddColumn("Name", 30);
             cdt.AddRow(userId, string.Join(" ", names));
 
             MainConsole.Instance.Output(cdt.ToString());
@@ -611,24 +611,18 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         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)
             {
-                if (m_UserCache.Count == 0)
-                {
-                    MainConsole.Instance.Output("No users found");
-                    return;
-                }
-    
-                MainConsole.Instance.Output("UUID                                 User Name");
-                MainConsole.Instance.Output("-----------------------------------------------------------------------------");
                 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
-- 
cgit v1.1


From 434c3cf83b09fbbf4b3d20b079597a40d63bae2f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 21 May 2013 18:15:22 +0100
Subject: Make "show name" command display HomeURL like "show names"

---
 .../Framework/UserManagement/UserManagementModule.cs      | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index d75a85f..f8f4235 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -595,16 +595,23 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 return;
 
             string[] names;
-            if (!TryGetUserNames(userId, out names))
+
+            UserData ud;
+
+            lock (m_UserCache)
             {
-                MainConsole.Instance.OutputFormat("No name known for user with id {0}", userId);
-                return;
+                if (!m_UserCache.TryGetValue(userId, out ud))
+                {
+                    MainConsole.Instance.OutputFormat("No name known for user with id {0}", userId);
+                    return;
+                }
             }
 
             ConsoleDisplayTable cdt = new ConsoleDisplayTable();
             cdt.AddColumn("UUID", 36);
             cdt.AddColumn("Name", 30);
-            cdt.AddRow(userId, string.Join(" ", names));
+            cdt.AddColumn("HomeURL", 40);
+            cdt.AddRow(userId, string.Join(" ", ud.FirstName, ud.LastName), ud.HomeURL);
 
             MainConsole.Instance.Output(cdt.ToString());
         }
-- 
cgit v1.1


From ba6a6b2d4021160a68dec906b3a0b3930e870a51 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 21 May 2013 18:18:16 +0100
Subject: Fix compile failure from recent git master 434c3cf

---
 .../Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index f8f4235..806f5e5 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -611,7 +611,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             cdt.AddColumn("UUID", 36);
             cdt.AddColumn("Name", 30);
             cdt.AddColumn("HomeURL", 40);
-            cdt.AddRow(userId, string.Join(" ", ud.FirstName, ud.LastName), ud.HomeURL);
+            cdt.AddRow(userId, string.Format("{0} {1}", ud.FirstName, ud.LastName), ud.HomeURL);
 
             MainConsole.Instance.Output(cdt.ToString());
         }
-- 
cgit v1.1


From 06ab16889744ab3f3cef7d698b19408368711194 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 21 May 2013 22:26:15 +0100
Subject: To further help with tracking down the apperance of too much "Unknown
 User" in chatlogs, etc. temporarily change each instance of this in
 OpenSimulator so we can identify where it's coming from

For instance, the "Unknown User" in Util.ParseUniversalUserIdenitifer becaomes "Unknown UserUPUUI (class initials + method initials)
This is to help with http://opensimulator.org/mantis/view.php?id=6625
---
 OpenSim/Framework/Util.cs                                             | 2 +-
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs            | 4 ++--
 OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs          | 2 +-
 .../CoreModules/Framework/UserManagement/UserManagementModule.cs      | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index a3602e9..ada4e89 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -2136,7 +2136,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)
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 8056030..4613344 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;
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index bf5c0bb..b3e3aa2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -293,7 +293,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;
 
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 806f5e5..a720d7b 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -320,7 +320,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             else
             {
                 names[0] = "Unknown";
-                names[1] = "User";
+                names[1] = "UserUMMTGUN";
 
                 return false;
             }
@@ -536,7 +536,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     else
                     {
                         user.FirstName = "Unknown";
-                        user.LastName = "User";
+                        user.LastName = "UserUMMAU";
                     }
 
                     AddUserInternal (user);
-- 
cgit v1.1


From 9de3979f5b91ae4bf9b05b89ec59999c43514f90 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 17 May 2013 21:17:54 -0700
Subject: BulletSim: add gImpact shape type. Add logic to use gImpact shape for
 prims that have cuts or holes. Default logic to 'off' as it needs debugging.

---
 OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs |  15 +++
 OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs   |  11 +-
 .../Region/Physics/BulletSPlugin/BSApiTemplate.cs  |   5 +
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs    |   3 +
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs    |   2 +
 .../Physics/BulletSPlugin/BSShapeCollection.cs     |  15 ++-
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs   | 130 +++++++++++++++++++--
 7 files changed, 167 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
index 231f0f8..12a0c17 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
@@ -251,6 +251,16 @@ 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;
@@ -1426,6 +1436,11 @@ 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);
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
index 59780ae..6db5f5e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
@@ -1475,7 +1475,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 +1503,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 +1547,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:
@@ -1820,6 +1820,11 @@ 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 )
     {
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index 3378c93..6cdc112 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -71,6 +71,7 @@ public enum BSPhysicsShapeType
 	SHAPE_HEIGHTMAP = 23,
     SHAPE_AVATAR    = 24,
     SHAPE_CONVEXHULL= 25,
+    SHAPE_GIMPACT   = 26,
 };
 
 // The native shapes have predefined shape hash keys
@@ -321,6 +322,10 @@ 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);
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index d33292f..9a9e527 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -89,6 +89,7 @@ public static class BSParam
     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 float TerrainImplementation { get; set; }
     public static int TerrainMeshMagnification { get; private set; }
@@ -369,6 +370,8 @@ public static class BSParam
             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<int>("CrossingFailuresBeforeOutOfBounds", "How forgiving we are about getting into adjactent regions",
             5 ),
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 9ed2d06..39f5b0a 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -328,6 +328,8 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
                 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;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index 64aaa15..32bbc8f 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -230,6 +230,7 @@ public sealed class BSShapeCollection : IDisposable
             BSShape potentialHull = null;
 
             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
@@ -238,7 +239,17 @@ public sealed class BSShapeCollection : IDisposable
             {
                 potentialHull = BSShapeConvexHull.GetReference(m_physicsScene, false /* forceRebuild */, prim);
             }
-            else
+            // 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);
             }
@@ -261,7 +272,7 @@ public sealed class BSShapeCollection : IDisposable
         }
         else
         {
-            // Update prim.BSShape to reference a mesh of this shape.
+            // 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
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 72d039b..0152233 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -422,9 +422,22 @@ public class BSShapeMesh : BSShape
         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 = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod,
@@ -482,8 +495,7 @@ public class BSShapeMesh : BSShape
 
             if (realIndicesIndex != 0)
             {
-                newShape = physicsScene.PE.CreateMeshShape(physicsScene.World,
-                                    realIndicesIndex, indices, verticesAsFloats.Length / 3, verticesAsFloats);
+                newShape = makeShape(physicsScene.World, realIndicesIndex, indices, verticesAsFloats.Length / 3, verticesAsFloats);
             }
             else
             {
@@ -803,6 +815,7 @@ public class BSShapeCompound : BSShape
     // 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))
         {
@@ -824,17 +837,25 @@ public class BSShapeCompound : BSShape
                 }
                 else
                 {
-                    if (physicsScene.PE.IsCompound(pShape))
+                    BSShapeGImpact gImpactDesc;
+                    if (BSShapeGImpact.TryGetGImpactByPtr(pShape, out gImpactDesc))
                     {
-                        BSShapeCompound recursiveCompound = new BSShapeCompound(pShape);
-                        recursiveCompound.Dereference(physicsScene);
+                        gImpactDesc.Dereference(physicsScene);
                     }
                     else
                     {
-                        if (physicsScene.PE.IsNativeShape(pShape))
+                        if (physicsScene.PE.IsCompound(pShape))
+                        {
+                            BSShapeCompound recursiveCompound = new BSShapeCompound(pShape);
+                            recursiveCompound.Dereference(physicsScene);
+                        }
+                        else
                         {
-                            BSShapeNative nativeShape = new BSShapeNative(pShape);
-                            nativeShape.Dereference(physicsScene);
+                            if (physicsScene.PE.IsNativeShape(pShape))
+                            {
+                                BSShapeNative nativeShape = new BSShapeNative(pShape);
+                                nativeShape.Dereference(physicsScene);
+                            }
                         }
                     }
                 }
@@ -857,7 +878,7 @@ public class BSShapeConvexHull : BSShape
         float lod;
         System.UInt64 newMeshKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
 
-        physicsScene.DetailLog("{0},BSShapeMesh,getReference,newKey={1},size={2},lod={3}",
+        physicsScene.DetailLog("{0},BSShapeConvexHull,getReference,newKey={1},size={2},lod={3}",
                                 prim.LocalID, newMeshKey.ToString("X"), prim.Size, lod);
 
         BSShapeConvexHull retConvexHull = null;
@@ -937,6 +958,97 @@ public class BSShapeConvexHull : BSShape
         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);
+                if (!newShape.isNativeShape || prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Failed)
+                {
+                    // 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 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 (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
-- 
cgit v1.1


From 2fd8819a043269f9308cb46c71893e6eb35a426e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 21 May 2013 21:32:30 -0700
Subject: BulletSim: add code to experimentally use asset hull data. Default to
 'off' as it needs debugging.

---
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs  |  3 ++
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 55 ++++++++++++++++++++++--
 prebuild.xml                                     |  1 +
 3 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 9a9e527..5cff668 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -90,6 +90,7 @@ public static class BSParam
     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; set; }
     public static int TerrainMeshMagnification { get; private set; }
@@ -372,6 +373,8 @@ public static class BSParam
             true ),
         new ParameterDefn<bool>("ShouldUseGImpactShapeForPrims", "If true, use a GImpact shape for prims with cuts and twists",
             false ),
+        new ParameterDefn<bool>("UseAssetHulls", "If true, use hull if specified in the mesh asset info",
+            false ),
 
         new ParameterDefn<int>("CrossingFailuresBeforeOutOfBounds", "How forgiving we are about getting into adjactent regions",
             5 ),
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 0152233..b7f7e6c 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -31,6 +31,7 @@ using System.Text;
 
 using OpenSim.Framework;
 using OpenSim.Region.Physics.Manager;
+using OpenSim.Region.Physics.Meshing;
 using OpenSim.Region.Physics.ConvexDecompositionDotNet;
 
 using OMV = OpenMetaverse;
@@ -573,9 +574,56 @@ public class BSShapeHull : BSShape
                                             PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
     {
         BulletShape newShape = new BulletShape();
-        IntPtr hullPtr = IntPtr.Zero;
+        newShape.shapeKey = newHullKey;
 
-        if (BSParam.ShouldUseBulletHACD)
+        // Pass true for physicalness as this prevents the creation of bounding box which is not needed
+        IMesh meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */);
+
+        // If there is hull data in the mesh asset, build the hull from that
+        if (meshData != null && BSParam.ShouldUseAssetHulls)
+        {
+            Meshmerizer realMesher = physicsScene.mesher as Meshmerizer;
+            if (realMesher != null)
+            {
+                List<List<OMV.Vector3>> allHulls = realMesher.GetConvexHulls(size);
+                if (allHulls != null)
+                {
+                    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);
+                }
+            }
+        }
+        // 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.
@@ -604,11 +652,10 @@ public class BSShapeHull : BSShape
             }
             physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,shouldUseBulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
         }
+        // If no hull specified, use our HACD hull approximation.
         if (!newShape.HasPhysicalShape)
         {
             // Build a new hull in the physical world using the C# HACD algorigthm.
-            // Pass true for physicalness as this prevents the creation of bounding box which is not needed
-            IMesh meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */);
             if (meshData != null)
             {
                 if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Fetched)
diff --git a/prebuild.xml b/prebuild.xml
index 9fbe08b..f51e8f0 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1753,6 +1753,7 @@
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.Physics.Meshing"/>
       <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
       <Reference name="BulletXNA.dll" path="../../../../bin/"/>
       <Reference name="log4net.dll" path="../../../../bin/"/>
-- 
cgit v1.1


From 10097f13aa21356a08fcf60a4e36c4c6471167ef Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 21 May 2013 21:40:26 -0700
Subject: BulletSim: update DLLs and SOs with version containing gImpact code.

---
 bin/lib32/BulletSim.dll   | Bin 1010176 -> 982528 bytes
 bin/lib32/libBulletSim.so | Bin 2096576 -> 2271520 bytes
 bin/lib64/BulletSim.dll   | Bin 1142272 -> 1222656 bytes
 bin/lib64/libBulletSim.so | Bin 2265980 -> 2454504 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 1e94d05..d63ee1d 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 6216a65..03de631 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 68cfcc4..e155f0e 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 08c00af..ac64a40 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1


From 6596a1de806d1ec509f3a570a0944ab9aff5947c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 21 May 2013 22:16:18 -0700
Subject: Revert "BulletSim: add code to experimentally use asset hull data."

This reverts commit 2fd8819a043269f9308cb46c71893e6eb35a426e.

Remove this code until I can figure out why the references that are
clearly in prebuild.xml doesn't work for the
'using OpenSim.Region.Physics.Meshing' in BSShape.cs.
---
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs  |  3 --
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 55 ++----------------------
 prebuild.xml                                     |  1 -
 3 files changed, 4 insertions(+), 55 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 5cff668..9a9e527 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -90,7 +90,6 @@ public static class BSParam
     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; set; }
     public static int TerrainMeshMagnification { get; private set; }
@@ -373,8 +372,6 @@ public static class BSParam
             true ),
         new ParameterDefn<bool>("ShouldUseGImpactShapeForPrims", "If true, use a GImpact shape for prims with cuts and twists",
             false ),
-        new ParameterDefn<bool>("UseAssetHulls", "If true, use hull if specified in the mesh asset info",
-            false ),
 
         new ParameterDefn<int>("CrossingFailuresBeforeOutOfBounds", "How forgiving we are about getting into adjactent regions",
             5 ),
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index b7f7e6c..0152233 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -31,7 +31,6 @@ using System.Text;
 
 using OpenSim.Framework;
 using OpenSim.Region.Physics.Manager;
-using OpenSim.Region.Physics.Meshing;
 using OpenSim.Region.Physics.ConvexDecompositionDotNet;
 
 using OMV = OpenMetaverse;
@@ -574,56 +573,9 @@ public class BSShapeHull : BSShape
                                             PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
     {
         BulletShape newShape = new BulletShape();
-        newShape.shapeKey = newHullKey;
+        IntPtr hullPtr = IntPtr.Zero;
 
-        // Pass true for physicalness as this prevents the creation of bounding box which is not needed
-        IMesh meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */);
-
-        // If there is hull data in the mesh asset, build the hull from that
-        if (meshData != null && BSParam.ShouldUseAssetHulls)
-        {
-            Meshmerizer realMesher = physicsScene.mesher as Meshmerizer;
-            if (realMesher != null)
-            {
-                List<List<OMV.Vector3>> allHulls = realMesher.GetConvexHulls(size);
-                if (allHulls != null)
-                {
-                    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);
-                }
-            }
-        }
-        // If no hull specified in the asset and we should use Bullet's HACD approximation...
-        if (!newShape.HasPhysicalShape && BSParam.ShouldUseBulletHACD)
+        if (BSParam.ShouldUseBulletHACD)
         {
             // Build the hull shape from an existing mesh shape.
             // The mesh should have already been created in Bullet.
@@ -652,10 +604,11 @@ public class BSShapeHull : BSShape
             }
             physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,shouldUseBulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
         }
-        // If no hull specified, use our HACD hull approximation.
         if (!newShape.HasPhysicalShape)
         {
             // Build a new hull in the physical world using the C# HACD algorigthm.
+            // Pass true for physicalness as this prevents the creation of bounding box which is not needed
+            IMesh meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */);
             if (meshData != null)
             {
                 if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Fetched)
diff --git a/prebuild.xml b/prebuild.xml
index f51e8f0..9fbe08b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1753,7 +1753,6 @@
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
-      <Reference name="OpenSim.Region.Physics.Meshing"/>
       <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
       <Reference name="BulletXNA.dll" path="../../../../bin/"/>
       <Reference name="log4net.dll" path="../../../../bin/"/>
-- 
cgit v1.1


From 7d38f4940c39b217bcf6b90b7811933099916de9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 22 May 2013 20:01:57 +0100
Subject: Implement llSetSoundQueueing().

This is controlled by the viewer, not the server.
So as per http://wiki.secondlife.com/wiki/LlSetSoundQueueing, only two sounds can be queued per prim.
You probably need to use llPreloadSound() for best results
---
 OpenSim/Region/CoreModules/World/Sound/SoundModule.cs        |  9 +++++++++
 OpenSim/Region/Framework/Interfaces/ISoundModule.cs          |  8 +++++++-
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs           | 10 +++++++++-
 .../Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 12 ++++++++----
 4 files changed, 33 insertions(+), 6 deletions(-)

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/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/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 347a2b5..b1c1cbb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -219,6 +219,14 @@ 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;
 
         public uint TimeStampLastActivity; // Will be used for AutoReturn
@@ -2429,7 +2437,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if (soundModule != null)
                 {
                     soundModule.SendSound(UUID, CollisionSound,
-                            CollisionSoundVolume, true, (byte)0, 0, false,
+                            CollisionSoundVolume, true, 0, 0, false,
                             false);
                 }
             }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 969243c..0b4b043 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2474,9 +2474,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);
             }
         }
 
@@ -11822,7 +11824,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llSetSoundQueueing(int queue)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llSetSoundQueueing");
+
+            if (m_SoundModule != null)
+                m_SoundModule.SetSoundQueueing(m_host.UUID, queue == ScriptBaseClass.TRUE.value);
         }
 
         public void llCollisionSprite(string impact_sprite)
-- 
cgit v1.1


From 61cdf9390d8dc124b0ef3afabb5bcb63328686eb Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 22 May 2013 16:06:06 -0700
Subject: BulletSim: fix problem with walking up stairs that are oriented in
 certain directions. The problem was really that the avatar capsule
 orientation was being set incorrectly.

---
 OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index ff5b6ab..48f842e 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -483,8 +483,15 @@ public sealed class BSCharacter : BSPhysObject
                 {
                     // 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 keeps us from flipping the capsule over which the veiwer does not understand.
-                    ForceOrientation = new OMV.Quaternion(0, 0, _orientation.Z,0);
+                    // 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;
+                    _orientation.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, _orientation, OMV.Vector3.UnitX * _orientation,
+                    //                 trimmedOrientation, OMV.Vector3.UnitX * trimmedOrientation);
+                    ForceOrientation = trimmedOrientation;
                 });
             }
         }
-- 
cgit v1.1


From ffc9b3dda766c15e053b9296d15356533f7e99f8 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 21 May 2013 21:32:30 -0700
Subject: BulletSim: add code to experimentally use asset hull data. Default to
 'off' as it needs debugging.

---
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs  |  3 ++
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 55 ++++++++++++++++++++++--
 prebuild.xml                                     |  1 +
 3 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 9a9e527..5cff668 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -90,6 +90,7 @@ public static class BSParam
     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; set; }
     public static int TerrainMeshMagnification { get; private set; }
@@ -372,6 +373,8 @@ public static class BSParam
             true ),
         new ParameterDefn<bool>("ShouldUseGImpactShapeForPrims", "If true, use a GImpact shape for prims with cuts and twists",
             false ),
+        new ParameterDefn<bool>("UseAssetHulls", "If true, use hull if specified in the mesh asset info",
+            false ),
 
         new ParameterDefn<int>("CrossingFailuresBeforeOutOfBounds", "How forgiving we are about getting into adjactent regions",
             5 ),
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 0152233..b7f7e6c 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -31,6 +31,7 @@ using System.Text;
 
 using OpenSim.Framework;
 using OpenSim.Region.Physics.Manager;
+using OpenSim.Region.Physics.Meshing;
 using OpenSim.Region.Physics.ConvexDecompositionDotNet;
 
 using OMV = OpenMetaverse;
@@ -573,9 +574,56 @@ public class BSShapeHull : BSShape
                                             PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
     {
         BulletShape newShape = new BulletShape();
-        IntPtr hullPtr = IntPtr.Zero;
+        newShape.shapeKey = newHullKey;
 
-        if (BSParam.ShouldUseBulletHACD)
+        // Pass true for physicalness as this prevents the creation of bounding box which is not needed
+        IMesh meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */);
+
+        // If there is hull data in the mesh asset, build the hull from that
+        if (meshData != null && BSParam.ShouldUseAssetHulls)
+        {
+            Meshmerizer realMesher = physicsScene.mesher as Meshmerizer;
+            if (realMesher != null)
+            {
+                List<List<OMV.Vector3>> allHulls = realMesher.GetConvexHulls(size);
+                if (allHulls != null)
+                {
+                    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);
+                }
+            }
+        }
+        // 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.
@@ -604,11 +652,10 @@ public class BSShapeHull : BSShape
             }
             physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,shouldUseBulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
         }
+        // If no hull specified, use our HACD hull approximation.
         if (!newShape.HasPhysicalShape)
         {
             // Build a new hull in the physical world using the C# HACD algorigthm.
-            // Pass true for physicalness as this prevents the creation of bounding box which is not needed
-            IMesh meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */);
             if (meshData != null)
             {
                 if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Fetched)
diff --git a/prebuild.xml b/prebuild.xml
index 9fbe08b..f51e8f0 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1753,6 +1753,7 @@
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.Physics.Meshing"/>
       <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
       <Reference name="BulletXNA.dll" path="../../../../bin/"/>
       <Reference name="log4net.dll" path="../../../../bin/"/>
-- 
cgit v1.1


From f4905220821671f91cb830e9932a0b9ed5d3da49 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 22 May 2013 21:09:37 -0700
Subject: BulletSim: specify directory for OpenSim.Region.Physics.Meshing DLL
 file in prebuild.xml since that file ends up in bin/Physics directory.

---
 prebuild.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prebuild.xml b/prebuild.xml
index f51e8f0..25c287e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1753,7 +1753,7 @@
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
-      <Reference name="OpenSim.Region.Physics.Meshing"/>
+      <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/"/>
-- 
cgit v1.1


From 5efce21abc92fa1005fa8651a5622fe72cf83ff3 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 22 May 2013 21:57:07 -0700
Subject: BulletSim: correct errors caused by misspelled INI parameter spec.
 Add debugging messages for hull asset use.

---
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs  | 2 +-
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 5cff668..c19eda1 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -373,7 +373,7 @@ public static class BSParam
             true ),
         new ParameterDefn<bool>("ShouldUseGImpactShapeForPrims", "If true, use a GImpact shape for prims with cuts and twists",
             false ),
-        new ParameterDefn<bool>("UseAssetHulls", "If true, use hull if specified in the mesh asset info",
+        new ParameterDefn<bool>("ShouldUseAssetHulls", "If true, use hull if specified in the mesh asset info",
             false ),
 
         new ParameterDefn<int>("CrossingFailuresBeforeOutOfBounds", "How forgiving we are about getting into adjactent regions",
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index b7f7e6c..6729d6b 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -619,6 +619,9 @@ public class BSShapeHull : BSShape
 
                     // 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);
                 }
             }
         }
@@ -627,7 +630,7 @@ public class BSShapeHull : BSShape
         {
             // Build the hull shape from an existing mesh shape.
             // The mesh should have already been created in Bullet.
-            physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,shouldUseBulletHACD,entry", prim.LocalID);
+            physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,bulletHACD,entry", prim.LocalID);
             BSShape meshShape = BSShapeMesh.GetReference(physicsScene, true, prim);
 
             if (meshShape.physShapeInfo.HasPhysicalShape)
@@ -645,12 +648,12 @@ public class BSShapeHull : BSShape
 
                 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,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
+                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,shouldUseBulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
+            physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,bulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
         }
         // If no hull specified, use our HACD hull approximation.
         if (!newShape.HasPhysicalShape)
-- 
cgit v1.1


From 29b3b44fab46a44f911e582ab284025086cf3692 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 23 May 2013 14:40:16 -0700
Subject: BulletSim: add locking around Meshmerizer use to eliminate possible
 race condition when extracting the convex hulls.

---
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 302 ++++++++++++-----------
 1 file changed, 157 insertions(+), 145 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 6729d6b..48f1394 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -441,10 +441,14 @@ public class BSShapeMesh : BSShape
     {
         BulletShape newShape = new BulletShape();
 
-        IMesh 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
-                                        );
+        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
+                                            );
+        }
 
         if (meshData != null)
         {
@@ -576,55 +580,67 @@ public class BSShapeHull : BSShape
         BulletShape newShape = new BulletShape();
         newShape.shapeKey = newHullKey;
 
-        // Pass true for physicalness as this prevents the creation of bounding box which is not needed
-        IMesh meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */);
-
-        // If there is hull data in the mesh asset, build the hull from that
-        if (meshData != null && BSParam.ShouldUseAssetHulls)
+        IMesh meshData = null;
+        List<List<OMV.Vector3>> allHulls = null;
+        lock (physicsScene.mesher)
         {
-            Meshmerizer realMesher = physicsScene.mesher as Meshmerizer;
-            if (realMesher != null)
+            // 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 */);
+
+            // If we should use the asset's hull info, fetch it out of the locked mesher
+            if (meshData != null && BSParam.ShouldUseAssetHulls)
             {
-                List<List<OMV.Vector3>> allHulls = realMesher.GetConvexHulls(size);
-                if (allHulls != null)
+                Meshmerizer realMesher = physicsScene.mesher as Meshmerizer;
+                if (realMesher != null)
                 {
-                    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;
-                        }
-                    }
+                    allHulls = realMesher.GetConvexHulls(size);
+                }
+                if (allHulls == null)
+                {
+                    physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,assetHulls,noAssetHull", prim.LocalID);
+                }
+            }
+        }
 
-                    // create the hull data structure in Bullet
-                    newShape = physicsScene.PE.CreateHullShape(physicsScene.World, hullCount, convHulls);
+        // 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];
 
-                    physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,assetHulls,hulls={1},totVert={2},shape={3}",
-                                                prim.LocalID, hullCount, totalVertices, newShape);
+            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)
         {
@@ -655,120 +671,116 @@ public class BSShapeHull : BSShape
             }
             physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,bulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
         }
-        // If no hull specified, use our HACD hull approximation.
-        if (!newShape.HasPhysicalShape)
+
+        // If no other hull specifications, use our HACD hull approximation.
+        if (!newShape.HasPhysicalShape && meshData != null)
         {
-            // Build a new hull in the physical world using the C# HACD algorigthm.
-            if (meshData != null)
+            if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Fetched)
             {
-                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;
-                }
+                // 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();
+            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));
-                }
+            //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)
+            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))
                 {
-                    // 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;
-                    }
+                    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];
 
-                // 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)
+            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)
                 {
-                    totalVertices += 4;                         // add four for the vertex count and centroid
-                    totalVertices += cr.HullIndices.Count * 3;  // we pass just triangles
+                    verts[kk++] = ff;
                 }
-                float[] convHulls = new float[totalVertices];
 
-                convHulls[0] = (float)hullCount;
-                int jj = 1;
-                foreach (ConvexResult cr in m_hulls)
+                // 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)
                 {
-                    // 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;
-                    }
+                    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;
+            // create the hull data structure in Bullet
+            newShape = physicsScene.PE.CreateHullShape(physicsScene.World, hullCount, convHulls);
         }
         return newShape;
     }
-- 
cgit v1.1


From 0e002e369339719204f26c07157713bfc40fecca Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 23 May 2013 14:41:05 -0700
Subject: Add DEBUG level logging in Meshmerizer for mesh parsing. There is a
 compile time variable to turn this logging off if it is too spammy.

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 79edc12..adc0dc9 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 = true;
 
         private bool cacheSculptMaps = true;
         private string decodedSculptMapPath = null;
@@ -357,13 +360,25 @@ 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
@@ -408,11 +423,16 @@ namespace OpenSim.Region.Physics.Meshing
                             }
 
                             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("[MESH]: exception decoding convex block: {0}", e.Message);
+                        m_log.WarnFormat("{0} exception decoding convex block: {1}", LogHeader, e);
                     }
                 }
 
@@ -438,7 +458,7 @@ namespace OpenSim.Region.Physics.Meshing
                 }
                 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;
                 }
 
@@ -455,6 +475,9 @@ 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);
                 }
             }
 
-- 
cgit v1.1


From 28548ab347487b1ed4e6cf50af30a6eacf963f7d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 23 May 2013 23:05:56 +0100
Subject: Fix bug where both ordinary UserManagementModule and
 HGUserManagementModules were being added to scenes if no UserManagementModule
 was specified.

Without explicit config non-hg UMM is used - this is in common with other HG modules.
This was causing a non-HG module to unpredictably use the UMM or HGUMM, though lack of bug reports suggest either UMM was always used or it didn't matter in this case.
---
 .../CoreModules/Framework/UserManagement/HGUserManagementModule.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
index fac93e6..ad3cf15 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         public new void Initialise(IConfigSource config)
         {
-            string umanmod = config.Configs["Modules"].GetString("UserManagementModule", Name);
+            string umanmod = config.Configs["Modules"].GetString("UserManagementModule", null);
             if (umanmod == Name)
             {
                 m_Enabled = true;
-- 
cgit v1.1


From c5549d27306c71cd5ed96e7cba68bd28d5e6d9b0 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Thu, 23 May 2013 15:47:47 -0700
Subject: add decoder for bounding convex hull

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 57 +++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index adc0dc9..fd45efe 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -83,6 +83,7 @@ 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>();
 
@@ -324,6 +325,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
@@ -385,13 +389,41 @@ namespace OpenSim.Region.Physics.Meshing
                     try
                     {
                         OSDMap convexBlock = (OSDMap)map["physics_convex"];
+
+                        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"))
+                        {
+                            // decompress and decode bounding hull points
+                            byte[] boundingVertsBytes = DecompressOsd(convexBlock["BoundingVerts"].AsBinary()).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. nHulls={2}", LogHeader, primName, mBoundingHull.Count);
+                        }
+
                         if (convexBlock.ContainsKey("HullList"))
                         {
                             byte[] hullList = convexBlock["HullList"].AsBinary();
-                            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();
 
                             // decompress and decode hull points
                             byte[] posBytes = DecompressOsd(convexBlock["Positions"].AsBinary()).AsBinary();
@@ -799,6 +831,23 @@ namespace OpenSim.Region.Physics.Meshing
         /// 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)
         {
-- 
cgit v1.1


From 9b56f993261954fe9918bd0c9205a41e058183a1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 23 May 2013 23:52:07 +0100
Subject: Fix bug where a cloned object would report the wrong
 llGetNumberOfPrims() when avatars had been sitting on the original and a
 different avatar sat on the copy within the same opensim session.

This was because the sitting avatars list was being cloned rather than reset.
Addresses http://opensimulator.org/mantis/view.php?id=6649
---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 38fa26a..2d4218d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1500,6 +1500,7 @@ namespace OpenSim.Region.Framework.Scenes
                 dupe.IsAttachment = true;
 
             dupe.AbsolutePosition = new Vector3(AbsolutePosition.X, AbsolutePosition.Y, AbsolutePosition.Z);
+            dupe.m_sittingAvatars = new List<UUID>();
 
             if (!userExposed)
             {
-- 
cgit v1.1


From 02fe05f346f3c4acad0116e702ed197a52b3fb4d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 24 May 2013 00:41:47 +0100
Subject: Fix issue where llSetPayPrice on either one of a clone prim in the
 same OpenSimulator session would change the prices on both prims.

This is because the PayPrice array refernence was being memberwise cloned and not the array itself.
Addresses http://opensimulator.org/mantis/view.php?id=6639
---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index b1c1cbb..ea8c3c5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1799,6 +1799,8 @@ namespace OpenSim.Region.Framework.Scenes
             Array.Copy(Shape.ExtraParams, extraP, extraP.Length);
             dupe.Shape.ExtraParams = extraP;
 
+            dupe.PayPrice = (int[])PayPrice.Clone();
+
             dupe.DynAttrs.CopyFrom(DynAttrs);
             
             if (userExposed)
-- 
cgit v1.1


From eb2bd9d203dbc9d202ae62594fcbdb53d38031ac Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 24 May 2013 00:46:58 +0100
Subject: minor: Remove unnecessary duplication of AbsolutePosition Vector3 in
 SOG.Copy()

As a struct, Vector3 has already been cloned by MemberwiseClone()
---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 2d4218d..df23cc5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1499,7 +1499,6 @@ 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)
-- 
cgit v1.1


From 0cdea5c2f302ece2d37357b7e7b8c1d3f6ed8f94 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Fri, 24 May 2013 01:53:37 -0700
Subject: correct some errors in decoding of mesh asset convex decomposition
 data

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 136 ++++++++++++++++----------
 1 file changed, 83 insertions(+), 53 deletions(-)

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index fd45efe..3e2b663 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -386,61 +386,57 @@ namespace OpenSim.Region.Physics.Meshing
 
                 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"];
-
-                        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"))
                         {
-                            // decompress and decode bounding hull points
-                            byte[] boundingVertsBytes = DecompressOsd(convexBlock["BoundingVerts"].AsBinary()).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)
-                                );
+                            int convexOffset = convexBlock["offset"].AsInteger() + (int)start;
+                            int convexSize = convexBlock["size"].AsInteger();
 
-                                boundingHull.Add(pos);
+                            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;
                             }
-
-                            mBoundingHull = boundingHull;
-                            if (debugDetail) m_log.DebugFormat("{0} prim='{1}': parsed bounding hull. nHulls={2}", LogHeader, primName, mBoundingHull.Count);
                         }
-
-                        if (convexBlock.ContainsKey("HullList"))
+                        
+                        if (convexBlockOsd != null && convexBlockOsd is OSDMap)
                         {
-                            byte[] hullList = convexBlock["HullList"].AsBinary();
+                            convexBlock = convexBlockOsd as OSDMap;
 
-                            // decompress and decode hull points
-                            byte[] posBytes = DecompressOsd(convexBlock["Positions"].AsBinary()).AsBinary();
-                            
-                            List<List<Vector3>> hulls = new List<List<Vector3>>();
-                            int posNdx = 0;
+                            if (debugDetail)
+                            {
+                                string keys = "[MESH]: keys found in convexBlock: ";
+                                foreach (KeyValuePair<string, OSD> kvp in convexBlock)
+                                    keys += "'" + kvp.Key + "' ";
+                                m_log.Info(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;
 
-                            foreach (byte cnt in hullList)
+                            if (convexBlock.ContainsKey("BoundingVerts"))
                             {
-                                int count = cnt == 0 ? 256 : cnt;
-                                List<Vector3> hull = new List<Vector3>();
-                                
-                                for (int i = 0; i < count; i++)
+                                byte[] boundingVertsBytes = convexBlock["BoundingVerts"].AsBinary();
+                                boundingHull = new List<Vector3>();
+                                for (int i = 0; i < boundingVertsBytes.Length; )
                                 {
-                                    ushort uX = Utils.BytesToUInt16(posBytes, posNdx); posNdx += 2;
-                                    ushort uY = Utils.BytesToUInt16(posBytes, posNdx); posNdx += 2;
-                                    ushort uZ = Utils.BytesToUInt16(posBytes, posNdx); posNdx += 2;
+                                    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),
@@ -448,18 +444,52 @@ namespace OpenSim.Region.Physics.Meshing
                                         Utils.UInt16ToFloat(uZ, min.Z, max.Z)
                                     );
 
-                                    hull.Add(pos);
+                                    boundingHull.Add(pos);
                                 }
 
-                                hulls.Add(hull);
+                                mBoundingHull = boundingHull;
+                                if (debugDetail) m_log.DebugFormat("{0} prim='{1}': parsed bounding hull. nVerts={2}", LogHeader, primName, mBoundingHull.Count);
                             }
 
-                            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);
+                            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)
@@ -483,7 +513,7 @@ 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
                 {
                     decodedMeshOsd = DecompressOsd(meshBytes);
@@ -499,7 +529,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)
-- 
cgit v1.1


From 440905ad14d4261df9da0fd2ce7e20a350982af1 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Fri, 24 May 2013 10:31:14 -0700
Subject: change a hull debugging message to Debug instead of Info

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 3e2b663..2c10568 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -418,7 +418,7 @@ namespace OpenSim.Region.Physics.Meshing
                                 string keys = "[MESH]: keys found in convexBlock: ";
                                 foreach (KeyValuePair<string, OSD> kvp in convexBlock)
                                     keys += "'" + kvp.Key + "' ";
-                                m_log.Info(keys);
+                                m_log.Debug(keys);
                             }
 
                             Vector3 min = new Vector3(-0.5f, -0.5f, -0.5f);
-- 
cgit v1.1


From 681fbda4b6b9700421b82dc639f954c60871542e Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Fri, 24 May 2013 13:18:16 -0700
Subject: This is an experimental patch that adds support for comparing texture
 hashes for the purpose of accurately responding to AgentTextureCached
 packets. There is a change to IClientAPI to report the wearbles hashes that
 come in through the SetAppearance packet. Added storage of the texture hashes
 in the appearance. While these are added to the Pack/Unpack (with support for
 missing values) routines (which means Simian will store them properly), they
 are not currently persisted in Robust.

---
 OpenSim/Framework/AvatarAppearance.cs              |  98 +++++++++++++-------
 OpenSim/Framework/IClientAPI.cs                    |   2 +-
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  |  27 +++++-
 .../Avatar/AvatarFactory/AvatarFactoryModule.cs    | 102 ++++++++++++---------
 .../Server/IRCClientView.cs                        |   2 +-
 5 files changed, 147 insertions(+), 84 deletions(-)

diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 494ae5e..157feb5 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -53,6 +53,7 @@ namespace OpenSim.Framework
         protected AvatarWearable[] m_wearables;
         protected Dictionary<int, List<AvatarAttachment>> m_attachments;
         protected float m_avatarHeight = 0;
+        protected UUID[] m_texturehashes;
 
         public virtual int Serial
         {
@@ -98,6 +99,8 @@ namespace OpenSim.Framework
             SetDefaultParams();
             SetHeight();
             m_attachments = new Dictionary<int, List<AvatarAttachment>>();
+
+            ResetTextureHashes();
         }
 
         public AvatarAppearance(OSDMap map)
@@ -108,32 +111,6 @@ namespace OpenSim.Framework
             SetHeight();
         }
 
-        public AvatarAppearance(AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams)
-        {
-//            m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance");
-
-            m_serial = 0;
-
-            if (wearables != null)
-                m_wearables = wearables;
-            else
-                SetDefaultWearables();
-
-            if (textureEntry != null)
-                m_texture = textureEntry;
-            else
-                SetDefaultTexture();
-
-            if (visualParams != null)
-                m_visualparams = visualParams;
-            else
-                SetDefaultParams();
-
-            SetHeight();
-
-            m_attachments = new Dictionary<int, List<AvatarAttachment>>();
-        }
-
         public AvatarAppearance(AvatarAppearance appearance) : this(appearance, true)
         {
         }
@@ -151,6 +128,8 @@ namespace OpenSim.Framework
                 SetHeight();
                 m_attachments = new Dictionary<int, List<AvatarAttachment>>();
 
+                ResetTextureHashes();
+                
                 return;
             }
 
@@ -166,6 +145,10 @@ namespace OpenSim.Framework
                     SetWearable(i,appearance.Wearables[i]);
             }
 
+            m_texturehashes = new UUID[AvatarAppearance.TEXTURE_COUNT];
+            for (int i = 0; i < AvatarAppearance.TEXTURE_COUNT; i++)
+                m_texturehashes[i] = new UUID(appearance.m_texturehashes[i]);
+
             m_texture = null;
             if (appearance.Texture != null)
             {
@@ -200,6 +183,37 @@ namespace OpenSim.Framework
             }
         }
 
+        public void ResetTextureHashes()
+        {
+            m_texturehashes = new UUID[AvatarAppearance.TEXTURE_COUNT];
+            for (uint i = 0; i < AvatarAppearance.TEXTURE_COUNT; i++)
+                m_texturehashes[i] = UUID.Zero;
+        }
+                
+        public UUID GetTextureHash(int textureIndex)
+        {
+            return m_texturehashes[NormalizeBakedTextureIndex(textureIndex)];
+        }
+        
+        public void SetTextureHash(int textureIndex, UUID textureHash)
+        {
+            m_texturehashes[NormalizeBakedTextureIndex(textureIndex)] = new UUID(textureHash);
+        }
+        
+        /// <summary>
+        /// Normalizes the texture index to the actual bake index, this is done to
+        /// accommodate older viewers that send the BAKE_INDICES index rather than
+        /// the actual texture index
+        /// </summary>
+        private int NormalizeBakedTextureIndex(int textureIndex)
+        {
+            // Earlier viewer send the index into the baked index array, just trying to be careful here
+            if (textureIndex < BAKE_INDICES.Length)
+                return BAKE_INDICES[textureIndex];
+            
+            return textureIndex;
+        }
+        
         public void ClearWearables()
         {
             m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES];
@@ -223,12 +237,7 @@ namespace OpenSim.Framework
             m_serial = 0;
 
             SetDefaultTexture();
-            
-            //for (int i = 0; i < BAKE_INDICES.Length; i++)
-            // {
-            //     int idx = BAKE_INDICES[i];
-            //     m_texture.FaceTextures[idx].TextureID = UUID.Zero;
-            // }
+            ResetTextureHashes();
         }
         
         protected virtual void SetDefaultParams()
@@ -598,6 +607,12 @@ namespace OpenSim.Framework
             data["serial"] = OSD.FromInteger(m_serial);
             data["height"] = OSD.FromReal(m_avatarHeight);
 
+            // Hashes
+            OSDArray hashes = new OSDArray(AvatarAppearance.TEXTURE_COUNT);
+            for (uint i = 0; i < AvatarAppearance.TEXTURE_COUNT; i++)
+                hashes.Add(OSD.FromUUID(m_texturehashes[i]));
+            data["hashes"] = hashes;
+
             // Wearables
             OSDArray wears = new OSDArray(AvatarWearable.MAX_WEARABLES);
             for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
@@ -642,6 +657,25 @@ namespace OpenSim.Framework
 
             try
             {
+                // Hashes
+                m_texturehashes = new UUID[AvatarAppearance.TEXTURE_COUNT];
+                if ((data != null) && (data["hashes"] != null) && (data["hashes"]).Type == OSDType.Array)
+                {
+                    OSDArray hashes = (OSDArray)(data["hashes"]);
+                    for (int i = 0; i < AvatarAppearance.TEXTURE_COUNT; i++)
+                    {
+                        UUID hashID = UUID.Zero;
+                        if (i < hashes.Count && hashes[i] != null)
+                            hashID = hashes[i].AsUUID();
+                        m_texturehashes[i] = hashID;
+                    }
+                }
+                else
+                {
+                    for (uint i = 0; i < AvatarAppearance.TEXTURE_COUNT; i++)
+                        m_texturehashes[i] = UUID.Zero;
+                }
+                
                 // Wearables
                 SetDefaultWearables();
                 if ((data != null) && (data["wearables"] != null) && (data["wearables"]).Type == OSDType.Array)
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 59ce2c4..1fffeff 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Framework
 
     public delegate void CachedTextureRequest(IClientAPI remoteClient, int serial, List<CachedTextureRequestArg> cachedTextureRequest);
 
-    public delegate void SetAppearance(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams);
+    public delegate void SetAppearance(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams, List<CachedTextureRequestArg> cachedTextureData);
 
     public delegate void StartAnim(IClientAPI remoteClient, UUID animID);
 
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index e014471..dd8ef9c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -6214,7 +6214,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     if (appear.ObjectData.TextureEntry.Length > 1)
                         te = new Primitive.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length);
 
-                    handlerSetAppearance(sender, te, visualparams);
+                    List<CachedTextureRequestArg> hashes = new List<CachedTextureRequestArg>();
+                    for (int i = 0; i < appear.WearableData.Length; i++)
+                    {
+                        CachedTextureRequestArg arg = new CachedTextureRequestArg();
+                        arg.BakedTextureIndex = appear.WearableData[i].TextureIndex;
+                        arg.WearableHashID = appear.WearableData[i].CacheID;
+                        hashes.Add(arg);
+                    }
+
+                    handlerSetAppearance(sender, te, visualparams, hashes);
                 }
                 catch (Exception e)
                 {
@@ -11487,12 +11496,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 requestArgs.Add(arg);
             }
 
-            CachedTextureRequest handlerCachedTextureRequest = OnCachedTextureRequest;
-            if (handlerCachedTextureRequest != null)
+            try
+            {
+                CachedTextureRequest handlerCachedTextureRequest = OnCachedTextureRequest;
+                if (handlerCachedTextureRequest != null)
+                {
+                    handlerCachedTextureRequest(simclient,cachedtex.AgentData.SerialNum,requestArgs);
+                }
+            }
+            catch (Exception e)
             {
-                handlerCachedTextureRequest(simclient,cachedtex.AgentData.SerialNum,requestArgs);
+                m_log.ErrorFormat("[CLIENT VIEW]: AgentTextureCached packet handler threw an exception, {0}", e);
+                return false;
             }
-
+            
             return true;
         }
         
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index b640b48..482bf6f 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -147,7 +147,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         /// <param name="visualParam"></param>
         public void SetAppearance(IScenePresence sp, AvatarAppearance appearance)
         {
-            SetAppearance(sp, appearance.Texture, appearance.VisualParams);
+            DoSetAppearance(sp, appearance.Texture, appearance.VisualParams, new List<CachedTextureRequestArg>());
         }
 
         /// <summary>
@@ -158,9 +158,20 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         /// <param name="visualParam"></param>
         public void SetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams)
         {
-//            m_log.DebugFormat(
-//                "[AVFACTORY]: start SetAppearance for {0}, te {1}, visualParams {2}",
-//                sp.Name, textureEntry, visualParams);
+            DoSetAppearance(sp, textureEntry, visualParams, new List<CachedTextureRequestArg>());
+        }
+        
+        /// <summary>
+        /// Set appearance data (texture asset IDs and slider settings) 
+        /// </summary>
+        /// <param name="sp"></param>
+        /// <param name="texture"></param>
+        /// <param name="visualParam"></param>
+        protected void DoSetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams, List<CachedTextureRequestArg> hashes)
+        {
+            // m_log.DebugFormat(
+            //     "[AVFACTORY]: start SetAppearance for {0}, te {1}, visualParams {2}",
+            //     sp.Name, textureEntry, visualParams);
 
             // TODO: This is probably not necessary any longer, just assume the
             // textureEntry set implies that the appearance transaction is complete
@@ -190,18 +201,22 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 // Process the baked texture array
                 if (textureEntry != null)
                 {
-//                    m_log.DebugFormat("[AVFACTORY]: Received texture update for {0} {1}", sp.Name, sp.UUID);
-
-//                    WriteBakedTexturesReport(sp, m_log.DebugFormat);
+                    // m_log.DebugFormat("[AVFACTORY]: Received texture update for {0} {1}", sp.Name, sp.UUID); 
+                    // WriteBakedTexturesReport(sp, m_log.DebugFormat);
 
                     changed = sp.Appearance.SetTextureEntries(textureEntry) || changed;
 
-//                    WriteBakedTexturesReport(sp, m_log.DebugFormat);
+                    // WriteBakedTexturesReport(sp, m_log.DebugFormat);
 
                     // If bake textures are missing and this is not an NPC, request a rebake from client
                     if (!ValidateBakedTextureCache(sp) && (((ScenePresence)sp).PresenceType != PresenceType.Npc))
                         RequestRebake(sp, true);
 
+                    // Save the wearble hashes in the appearance
+                    sp.Appearance.ResetTextureHashes();
+                    foreach (CachedTextureRequestArg arg in hashes)
+                        sp.Appearance.SetTextureHash(arg.BakedTextureIndex,arg.WearableHashID);
+                        
                     // This appears to be set only in the final stage of the appearance
                     // update transaction. In theory, we should be able to do an immediate
                     // appearance send and save here.
@@ -235,13 +250,13 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
         public bool SendAppearance(UUID agentId)
         {
-//            m_log.DebugFormat("[AVFACTORY]: Sending appearance for {0}", agentId);
+            // m_log.DebugFormat("[AVFACTORY]: Sending appearance for {0}", agentId);
 
             ScenePresence sp = m_scene.GetScenePresence(agentId);
             if (sp == null)
             {
                 // This is expected if the user has gone away.
-//                m_log.DebugFormat("[AVFACTORY]: Agent {0} no longer in the scene", agentId);
+                // m_log.DebugFormat("[AVFACTORY]: Agent {0} no longer in the scene", agentId);
                 return false;
             }
 
@@ -318,7 +333,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         /// <param name="agentId"></param>
         public void QueueAppearanceSend(UUID agentid)
         {
-//            m_log.DebugFormat("[AVFACTORY]: Queue appearance send for {0}", agentid);
+            // m_log.DebugFormat("[AVFACTORY]: Queue appearance send for {0}", agentid);
 
             // 10000 ticks per millisecond, 1000 milliseconds per second
             long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_sendtime * 1000 * 10000);
@@ -331,7 +346,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
         public void QueueAppearanceSave(UUID agentid)
         {
-//            m_log.DebugFormat("[AVFACTORY]: Queueing appearance save for {0}", agentid);
+            // m_log.DebugFormat("[AVFACTORY]: Queueing appearance save for {0}", agentid);
 
             // 10000 ticks per millisecond, 1000 milliseconds per second
             long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_savetime * 1000 * 10000);
@@ -356,9 +371,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 if (face == null)
                     continue;
 
-//                m_log.DebugFormat(
-//                    "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}",
-//                    face.TextureID, idx, client.Name, client.AgentId);
+                // m_log.DebugFormat(
+                //     "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}",
+                //     face.TextureID, idx, client.Name, client.AgentId);
 
                 // if the texture is one of the "defaults" then skip it
                 // this should probably be more intelligent (skirt texture doesnt matter
@@ -373,7 +388,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                     return false;
             }
 
-//            m_log.DebugFormat("[AVFACTORY]: Completed texture check for {0} {1}", sp.Name, sp.UUID);
+            // m_log.DebugFormat("[AVFACTORY]: Completed texture check for {0} {1}", sp.Name, sp.UUID);
 
             // If we only found default textures, then the appearance is not cached
             return (defonly ? false : true);
@@ -392,9 +407,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 if (face == null)
                     continue;
 
-//                m_log.DebugFormat(
-//                    "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}",
-//                    face.TextureID, idx, client.Name, client.AgentId);
+                // m_log.DebugFormat(
+                //     "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}",
+                //     face.TextureID, idx, client.Name, client.AgentId);
 
                 // if the texture is one of the "defaults" then skip it
                 // this should probably be more intelligent (skirt texture doesnt matter
@@ -458,9 +473,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 if (bakeType == BakeType.Unknown)
                     continue;
 
-//                m_log.DebugFormat(
-//                    "[AVFACTORY]: NPC avatar {0} has texture id {1} : {2}",
-//                    acd.AgentID, i, acd.Appearance.Texture.FaceTextures[i]);
+                // m_log.DebugFormat(
+                //     "[AVFACTORY]: NPC avatar {0} has texture id {1} : {2}",
+                //     acd.AgentID, i, acd.Appearance.Texture.FaceTextures[i]);
 
                 int ftIndex = (int)AppearanceManager.BakeTypeToAgentTextureIndex(bakeType);
                 Primitive.TextureEntryFace texture = faceTextures[ftIndex];    // this will be null if there's no such baked texture
@@ -484,7 +499,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                     UUID avatarID = kvp.Key;
                     long sendTime = kvp.Value;
 
-//                    m_log.DebugFormat("[AVFACTORY]: Handling queued appearance updates for {0}, update delta to now is {1}", avatarID, sendTime - now);
+                    // m_log.DebugFormat("[AVFACTORY]: Handling queued appearance updates for {0}, update delta to now is {1}", avatarID, sendTime - now);
 
                     if (sendTime < now)
                     {
@@ -530,11 +545,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             if (sp == null)
             {
                 // This is expected if the user has gone away.
-//                m_log.DebugFormat("[AVFACTORY]: Agent {0} no longer in the scene", agentid);
+                // m_log.DebugFormat("[AVFACTORY]: Agent {0} no longer in the scene", agentid);
                 return;
             }
 
-//            m_log.DebugFormat("[AVFACTORY]: Saving appearance for avatar {0}", agentid);
+            // m_log.DebugFormat("[AVFACTORY]: Saving appearance for avatar {0}", agentid);
 
             // This could take awhile since it needs to pull inventory
             // We need to do it at the point of save so that there is a sufficient delay for any upload of new body part/shape
@@ -622,12 +637,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         /// <param name="client"></param>
         /// <param name="texture"></param>
         /// <param name="visualParam"></param>
-        private void Client_OnSetAppearance(IClientAPI client, Primitive.TextureEntry textureEntry, byte[] visualParams)
+        private void Client_OnSetAppearance(IClientAPI client, Primitive.TextureEntry textureEntry, byte[] visualParams, List<CachedTextureRequestArg> hashes)
         {
             // m_log.WarnFormat("[AVFACTORY]: Client_OnSetAppearance called for {0} ({1})", client.Name, client.AgentId);
             ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
             if (sp != null)
-                SetAppearance(sp, textureEntry, visualParams);
+                DoSetAppearance(sp, textureEntry, visualParams, hashes);
             else
                 m_log.WarnFormat("[AVFACTORY]: Client_OnSetAppearance unable to find presence for {0}", client.AgentId);
         }
@@ -684,7 +699,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         /// <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);
+            // m_log.DebugFormat("[AVFACTORY]: Client_OnCachedTextureRequest called for {0} ({1})", client.Name, client.AgentId);
             ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
 
             List<CachedTextureResponseArg> cachedTextureResponse = new List<CachedTextureResponseArg>();
@@ -695,23 +710,20 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 
                 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);
+                    if (sp.Appearance.GetTextureHash(index) == request.WearableHashID)
+                    {
+                        Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[index];
+                        if (face != null)
+                            texture = face.TextureID;
+                    }
+                    else
+                    {
+                        // We know that that hash is wrong, null it out
+                        // and wait for the setappearance call
+                        sp.Appearance.SetTextureHash(index,UUID.Zero);
+                    }
+
+                    // m_log.WarnFormat("[AVFACTORY]: use texture {0} for index {1}; hash={2}",texture,index,request.WearableHashID);
                 }
                 
                 CachedTextureResponseArg response = new CachedTextureResponseArg();
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 384eb1f..118635d 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -907,7 +907,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
             // Mimicking LLClientView which gets always set appearance from client.
             AvatarAppearance appearance;
             m_scene.GetAvatarAppearance(this, out appearance);
-            OnSetAppearance(this, appearance.Texture, (byte[])appearance.VisualParams.Clone());
+            OnSetAppearance(this, appearance.Texture, (byte[])appearance.VisualParams.Clone(), new List<CachedTextureRequestArg>());
         }
 
         public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args)
-- 
cgit v1.1


From bb0ea250907e24fe22490406e855cdcd958ba148 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Fri, 24 May 2013 13:25:25 -0700
Subject: Protect one more update of the baked texture hashes.

---
 .../Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 482bf6f..aea768e 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -214,8 +214,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
                     // Save the wearble hashes in the appearance
                     sp.Appearance.ResetTextureHashes();
-                    foreach (CachedTextureRequestArg arg in hashes)
-                        sp.Appearance.SetTextureHash(arg.BakedTextureIndex,arg.WearableHashID);
+                    if (m_reusetextures)
+                    {
+                        foreach (CachedTextureRequestArg arg in hashes)
+                            sp.Appearance.SetTextureHash(arg.BakedTextureIndex,arg.WearableHashID);
+                    }
                         
                     // This appears to be set only in the final stage of the appearance
                     // update transaction. In theory, we should be able to do an immediate
-- 
cgit v1.1


From a087dbed7f57f3ec431782dd51ba43110a0f4ae3 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Fri, 24 May 2013 13:26:07 -0700
Subject: One more appearance change: drop sending the SendAppearance packet to
 avatar when it becomes root. This packet shows up in the viewer logs as an
 error and appears to cause problems for completing the texture rebake process
 for v1 viewers in some cases.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 9e9089b..e1a8941 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2711,7 +2711,9 @@ namespace OpenSim.Region.Framework.Scenes
             // again here... this comes after the cached appearance check because the avatars
             // appearance goes into the avatar update packet
             SendAvatarDataToAllAgents();
-            SendAppearanceToAgent(this);
+
+            // This invocation always shows up in the viewer logs as an error.
+            // SendAppearanceToAgent(this);
 
             // If we are using the the cached appearance then send it out to everyone
             if (cachedappearance)
-- 
cgit v1.1


From 81a6c397811c587cd97b5bb0f186fe6e799f865b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 24 May 2013 16:20:26 -0700
Subject: Meshmerizer: add INI parameter to enable DEBUG mesh detail logging.
 Default to off. To turn mesh parsing DEBUG detail logging on, add     [Mesh] 
        LogMeshDetail=true to the INI file.

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 2c10568..1b499d0 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Physics.Meshing
         private const string baseDir = null; //"rawFiles";
 #endif
         // If 'true', lots of DEBUG logging of asset parsing details
-        private bool debugDetail = true;
+        private bool debugDetail = false;
 
         private bool cacheSculptMaps = true;
         private string decodedSculptMapPath = null;
@@ -94,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
             {
@@ -415,7 +418,7 @@ namespace OpenSim.Region.Physics.Meshing
 
                             if (debugDetail)
                             {
-                                string keys = "[MESH]: keys found in convexBlock: ";
+                                string keys = LogHeader + " keys found in convexBlock: ";
                                 foreach (KeyValuePair<string, OSD> kvp in convexBlock)
                                     keys += "'" + kvp.Key + "' ";
                                 m_log.Debug(keys);
-- 
cgit v1.1


From 4979940def5561015cb56bc660c6ec721722b9fc Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 24 May 2013 16:23:10 -0700
Subject: BulletSim: properly set mesh hash key in use tracking structure.
 Shouldn't see any functional difference.

---
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 48f1394..81edc12 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -578,7 +578,6 @@ public class BSShapeHull : BSShape
                                             PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
     {
         BulletShape newShape = new BulletShape();
-        newShape.shapeKey = newHullKey;
 
         IMesh meshData = null;
         List<List<OMV.Vector3>> allHulls = null;
@@ -782,6 +781,7 @@ public class BSShapeHull : BSShape
             // 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.
@@ -906,6 +906,7 @@ public class BSShapeCompound : BSShape
                     }
                     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);
@@ -913,6 +914,7 @@ public class BSShapeCompound : BSShape
                         }
                         else
                         {
+                            // If none of the above, maybe it is a simple native shape.
                             if (physicsScene.PE.IsNativeShape(pShape))
                             {
                                 BSShapeNative nativeShape = new BSShapeNative(pShape);
@@ -1052,6 +1054,7 @@ public class BSShapeGImpact : BSShape
 
                 // 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.Failed)
                 {
                     // If a mesh was what was created, remember the built shape for later sharing.
-- 
cgit v1.1


From 5f1f5ea5ab5badf5944471fefe0a45f7b4f41b91 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 24 May 2013 16:24:16 -0700
Subject: BulletSim: add VehicleInertiaFactor to allow modifying inertia.
 Another parameter for vehicle operation tuning. Default to <1,1,1> which
 means nothing is different under normal use.

---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 3 ++-
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs    | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index c16b7d3..311cf4f 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -617,7 +617,8 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 // Vehicles report collision events so we know when it's on the ground
                 m_physicsScene.PE.AddToCollisionFlags(ControllingPrim.PhysBody, CollisionFlags.BS_VEHICLE_COLLISIONS);
 
-                ControllingPrim.Inertia = m_physicsScene.PE.CalculateLocalInertia(ControllingPrim.PhysShape.physShapeInfo, m_vehicleMass);
+                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);
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index c19eda1..e98a7fb 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -148,6 +148,7 @@ 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 VehicleDebuggingEnable { get; private set; }
@@ -583,6 +584,8 @@ public static class BSParam
             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) ),
+        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 ),
         new ParameterDefn<float>("VehicleRestitution", "Bouncyness factor for vehicles (0.0 - 1.0)",
-- 
cgit v1.1


From 182137263412fb23f9bdb250afbe1b1509280aac Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 24 May 2013 16:32:19 -0700
Subject: Meshmerizer: remember to add the copied hull verts to the list of
 hulls.

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 1b499d0..fc679e7 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -893,6 +893,7 @@ namespace OpenSim.Region.Physics.Meshing
                 List<Vector3> verts = new List<Vector3>();
                 foreach (var vert in hull)
                     verts.Add(vert * size);
+                hulls.Add(verts);
             }
 
             return hulls;
-- 
cgit v1.1


From 533bbf033df88fd231eb0e7d2b0aa5a0058163ea Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 25 May 2013 02:08:54 +0100
Subject: Update the money framework to allow sending the new style linden
 "serverside is now viewerside" messages regarding currency This will require
 all money modules to be refactored!

---
 OpenSim/Addons/Groups/GroupsModule.cs              |  2 +-
 OpenSim/Framework/IClientAPI.cs                    |  5 ++--
 OpenSim/Framework/IMoneyModule.cs                  |  3 ++-
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  | 30 ++++++++++------------
 .../Server/IRCClientView.cs                        |  7 +----
 .../Avatar/XmlRpcGroups/GroupsModule.cs            |  2 +-
 .../World/MoneyModule/SampleMoneyModule.cs         | 13 +++++++---
 .../Region/OptionalModules/World/NPC/NPCAvatar.cs  |  7 +----
 OpenSim/Tests/Common/Mock/TestClient.cs            |  7 +----
 9 files changed, 32 insertions(+), 44 deletions(-)

diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index 10bfa8f..f805d69 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -766,7 +766,7 @@ namespace OpenSim.Groups
                     remoteClient.SendCreateGroupReply(UUID.Zero, false, "Insufficient funds to create a group.");
                     return UUID.Zero;
                 }
-                money.ApplyCharge(remoteClient.AgentId, money.GroupCreationCharge, "Group Creation");
+                money.ApplyCharge(remoteClient.AgentId, money.GroupCreationCharge, MoneyTransactionType.GroupCreate);
             }
             string reason = string.Empty;
             UUID groupID = m_groupData.CreateGroup(remoteClient.AgentId, name, charter, showInList, insigniaID, membershipFee, openEnrollment, 
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 1fffeff..65f8395 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1159,7 +1159,8 @@ namespace OpenSim.Framework
         void SendTeleportStart(uint flags);
         void SendTeleportProgress(uint flags, string message);
 
-        void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance);
+        void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance, int transactionType, UUID sourceID, bool sourceIsGroup, UUID destID, bool destIsGroup, int amount, string item);
+
         void SendPayPrice(UUID objectID, int[] payPrice);
 
         void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations);
@@ -1254,8 +1255,6 @@ namespace OpenSim.Framework
         void SendDialog(string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch,
                         string[] buttonlabels);
 
-        bool AddMoney(int debit);
-
         /// <summary>
         /// Update the client as to where the sun is currently located.
         /// </summary>
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 1e09728..52f3e83 100644
--- a/OpenSim/Framework/IMoneyModule.cs
+++ b/OpenSim/Framework/IMoneyModule.cs
@@ -38,7 +38,8 @@ namespace OpenSim.Framework
         int GetBalance(UUID agentID);
         bool UploadCovered(UUID agentID, int amount);
         bool AmountCovered(UUID agentID, int amount);
-        void ApplyCharge(UUID agentID, int amount, string text);
+        void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type);
+        void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type, string extraData);
         void ApplyUploadCharge(UUID agentID, int amount, string text);
 
         int UploadCharge { get; }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index dd8ef9c..e47397d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -345,7 +345,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
 //        protected HashSet<uint> m_attachmentsSent;
 
-        private int m_moneyBalance;
         private int m_animationSequenceNumber = 1;
         private bool m_SendLogoutPacketWhenClosing = true;
 
@@ -420,7 +419,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public string Name { get { return FirstName + " " + LastName; } }
 
         public uint CircuitCode { get { return m_circuitCode; } }
-        public int MoneyBalance { get { return m_moneyBalance; } }
         public int NextAnimationSequenceNumber { get { return m_animationSequenceNumber++; } }
 
         /// <summary>
@@ -483,7 +481,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_firstName = sessionInfo.LoginInfo.First;
             m_lastName = sessionInfo.LoginInfo.Last;
             m_startpos = sessionInfo.LoginInfo.StartPos;
-            m_moneyBalance = 1000;
 
             m_udpServer = udpServer;
             m_udpClient = udpClient;
@@ -1538,7 +1535,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutPacket(tpProgress, ThrottleOutPacketType.Unknown);
         }
 
-        public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance)
+        public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance, int transactionType, UUID sourceID, bool sourceIsGroup, UUID destID, bool destIsGroup, int amount, string item)
         {
             MoneyBalanceReplyPacket money = (MoneyBalanceReplyPacket)PacketPool.Instance.GetPacket(PacketType.MoneyBalanceReply);
             money.MoneyData.AgentID = AgentId;
@@ -1546,7 +1543,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             money.MoneyData.TransactionSuccess = success;
             money.MoneyData.Description = description;
             money.MoneyData.MoneyBalance = balance;
-            money.TransactionInfo.ItemDescription = Util.StringToBytes256("NONE");
+            money.TransactionInfo.TransactionType = transactionType;
+            money.TransactionInfo.SourceID = sourceID;
+            money.TransactionInfo.IsSourceGroup = sourceIsGroup;
+            money.TransactionInfo.DestID = destID;
+            money.TransactionInfo.IsDestGroup = destIsGroup;
+            money.TransactionInfo.Amount = amount;
+            money.TransactionInfo.ItemDescription = Util.StringToBytes256(item);
+
             OutPacket(money, ThrottleOutPacketType.Task);
         }
 
@@ -2279,6 +2283,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <returns></returns>
         public AgentAlertMessagePacket BuildAgentAlertPacket(string message, bool modal)
         {
+            // Prepend a slash to make the message come up in the top right
+            // again.
+            // Allow special formats to be sent from aware modules.
+            if (!modal && !message.StartsWith("ALERT: ") && !message.StartsWith("NOTIFY: ") && message != "Home position set." && message != "You died and have been teleported to your home location")
+                message = "/" + message;
             AgentAlertMessagePacket alertPack = (AgentAlertMessagePacket)PacketPool.Instance.GetPacket(PacketType.AgentAlertMessage);
             alertPack.AgentData.AgentID = AgentId;
             alertPack.AlertData.Message = Util.StringToBytes256(message);
@@ -11933,17 +11942,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting, method);
         }
 
-        public bool AddMoney(int debit)
-        {
-            if (m_moneyBalance + debit >= 0)
-            {
-                m_moneyBalance += debit;
-                SendMoneyBalance(UUID.Zero, true, Util.StringToBytes256("Poof Poof!"), m_moneyBalance);
-                return true;
-            }
-            return false;
-        }
-
         protected void HandleAutopilot(Object sender, string method, List<String> args)
         {
             float locx = 0;
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 118635d..3726191 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1056,7 +1056,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
         {
         }
 
-        public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance)
+        public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance, int transactionType, UUID sourceID, bool sourceIsGroup, UUID destID, bool destIsGroup, int amount, string item)
         {
             
         }
@@ -1196,11 +1196,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
             
         }
 
-        public bool AddMoney(int debit)
-        {
-            return true;
-        }
-
         public void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear, float OrbitalPosition)
         {
             
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 29f9591..32fb54b 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -764,7 +764,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     remoteClient.SendCreateGroupReply(UUID.Zero, false, "You have got insufficient funds to create a group.");
                     return UUID.Zero;
                 }
-                money.ApplyCharge(GetRequestingAgentID(remoteClient), money.GroupCreationCharge, "Group Creation");
+                money.ApplyCharge(GetRequestingAgentID(remoteClient), money.GroupCreationCharge, MoneyTransactionType.GroupCreate);
             }
             UUID groupID = m_groupData.CreateGroup(GetRequestingAgentID(remoteClient), name, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish, GetRequestingAgentID(remoteClient));
 
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 35f44d0..1345db9 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -191,9 +191,14 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         // Please do not refactor these to be just one method
         // Existing implementations need the distinction
         //
-        public void ApplyCharge(UUID agentID, int amount, string text)
+        public void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type, string extraData)
         {
         }
+
+        public void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type)
+        {
+        }
+
         public void ApplyUploadCharge(UUID agentID, int amount, string text)
         {
         }
@@ -322,7 +327,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
                     client.SendAlertMessage(e.Message + " ");
                 }
 
-                client.SendMoneyBalance(TransactionID, true, new byte[0], returnfunds);
+                client.SendMoneyBalance(TransactionID, true, new byte[0], returnfunds, 0, UUID.Zero, false, UUID.Zero, false, 0, String.Empty);
             }
             else
             {
@@ -385,12 +390,12 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
             {
                 if (sender != null)
                 {
-                    sender.SendMoneyBalance(UUID.Random(), transactionresult, Utils.StringToBytes(description), GetFundsForAgentID(senderID));
+                    sender.SendMoneyBalance(UUID.Random(), transactionresult, Utils.StringToBytes(description), GetFundsForAgentID(senderID), 0, UUID.Zero, false, UUID.Zero, false, 0, String.Empty);
                 }
 
                 if (receiver != null)
                 {
-                    receiver.SendMoneyBalance(UUID.Random(), transactionresult, Utils.StringToBytes(description), GetFundsForAgentID(receiverID));
+                    receiver.SendMoneyBalance(UUID.Random(), transactionresult, Utils.StringToBytes(description), GetFundsForAgentID(receiverID), 0, UUID.Zero, false, UUID.Zero, false, 0, String.Empty);
                 }
             }
         }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 553443f..592e4e1 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -694,7 +694,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         {
         }
 
-        public virtual void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance)
+        public virtual void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance, int transactionType, UUID sourceID, bool sourceIsGroup, UUID destID, bool destIsGroup, int amount, string item)
         {
         }
 
@@ -866,11 +866,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         {
         }
 
-        public bool AddMoney(int debit)
-        {
-            return false;
-        }
-
         public void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong time, uint dlen, uint ylen, float phase)
         {
         }
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 09e751a..c660501 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -651,7 +651,7 @@ namespace OpenSim.Tests.Common.Mock
         {
         }
 
-        public virtual void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance)
+        public virtual void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance, int transactionType, UUID sourceID, bool sourceIsGroup, UUID destID, bool destIsGroup, int amount, string item)
         {
         }
 
@@ -875,11 +875,6 @@ namespace OpenSim.Tests.Common.Mock
 
         }
 
-        public bool AddMoney(int debit)
-        {
-            return false;
-        }
-
         public void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong time, uint dlen, uint ylen, float phase)
         {
         }
-- 
cgit v1.1


From 0c35d28933ddb2cae7b4f095b35ed4e386a1b71b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 26 May 2013 17:35:12 -0700
Subject: BulletSim: enable GImpact shape for prims with cuts. Include DLLs and
 SOs which recompute GImpact shape bounding box after creation as Bullet
 doesn't do that itself (something it does for nearly every other shape).

Now, physical prims without cuts become single mesh convex meshes. Physical
prims with cuts become GImpact meshes. Meshes become a set of convex
hulls approximated from the mesh unless the hulls are specified in the
mesh asset data. The use of GImpact shapes should make some mechanical
physics more stable.
---
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs |   2 +-
 bin/lib32/BulletSim.dll                         | Bin 982528 -> 982528 bytes
 bin/lib32/libBulletSim.so                       | Bin 2271520 -> 2271724 bytes
 bin/lib64/BulletSim.dll                         | Bin 1222656 -> 1222656 bytes
 bin/lib64/libBulletSim.so                       | Bin 2454504 -> 2454796 bytes
 5 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index e98a7fb..0f0a494 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -373,7 +373,7 @@ public static class BSParam
         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 ),
+            true ),
         new ParameterDefn<bool>("ShouldUseAssetHulls", "If true, use hull if specified in the mesh asset info",
             false ),
 
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index d63ee1d..bc0e222 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 03de631..e09dd27 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index e155f0e..5fc09f6 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index ac64a40..925269d 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1


From 7c3a46cceaf9dac694b1c387f37adc2c51c6ee40 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 27 May 2013 14:38:59 -0700
Subject: BulletSim: default using mesh asset hulls to 'true'. This means that,
 if the mesh asset specifies physics hulls, BulletSim will fetch and use same
 rather than approximating the hulls. If physics hulls are not specified, the
 representation will fall back to the regular physics mesh.

---
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 0f0a494..2651e3b 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -373,9 +373,9 @@ public static class BSParam
         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",
-            true ),
-        new ParameterDefn<bool>("ShouldUseAssetHulls", "If true, use hull if specified in the mesh asset info",
             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 ),
-- 
cgit v1.1


From ae0d6ab28a03ec23c91eaf6a8ac94b890916a1ca Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 28 May 2013 09:19:08 -0700
Subject: BulletSim: don't zero motion when changing vehicle type.

Some vehicle scripts change type on the fly as an easy way of setting
all the parameters (like a plane changing to a car when on the ground).
---
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index f5b0361..e11e365 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -511,7 +511,10 @@ public class BSPrim : BSPhysObject
 
             PhysScene.TaintedObject("setVehicleType", delegate()
             {
-                ZeroMotion(true /* inTaintTime */);
+                // 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 */);
                 VehicleActor.ProcessTypeChange(type);
                 ActivateIfPhysical(false);
             });
-- 
cgit v1.1


From 7e1c7f54c719910145a88bfebf16435b9f142901 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 28 May 2013 20:59:25 -0700
Subject: First change in Vivox for ages! -- added a lock to serialize calls to
 vivox servers. This may ameliorate things when lots of avies arrive in a sim
 at about the same time. Turns out that there are 4 http requests per avie to
 Vivox.

---
 .../Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs    | 39 ++++++++++++++--------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index cb69411..db4869d 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
@@ -1111,25 +1115,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
-- 
cgit v1.1


From 4898f18f89c104e74fa37793671231118d75e3ae Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 29 May 2013 21:28:38 +0100
Subject: Add HG regression TestCachedUserNameForNewAgent()

---
 .../Tests/HGUserManagementModuleTests.cs           | 76 ++++++++++++++++++++++
 prebuild.xml                                       |  1 +
 2 files changed, 77 insertions(+)
 create mode 100644 OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs

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..9259a83
--- /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/prebuild.xml b/prebuild.xml
index 25c287e..5967ef6 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -3058,6 +3058,7 @@
         <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/VectorRender/Tests" pattern="*.cs" recurse="true"/>
         <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/>
         <Match buildAction="EmbeddedResource" path="World/Archiver/Tests/Resources" pattern="*"/>
-- 
cgit v1.1


From cc7aa88b264cd5fa35591b9768ebc230b1814824 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 29 May 2013 23:08:54 +0100
Subject: Try caching the user name for a new agent earlier on in the process
 of establishing a connection, to see if this helps with "Unknown UserUMMTGUN"
 issues.

The UMMTGUN form of Unknown User seems to appear because a viewer sometimes sends a UUIDNameRequest UDP request that fails to find a binding.
However, in theory the incoming agent should have made that binding before any such request is triggered.
So moving this binding to an earlier point in the process to see if this makes a difference.
Unknown user name is also updated to UserUMMTGUN2 - if you see the old name then you need to clear your viewer cache.
This relates to http://opensimulator.org/mantis/view.php?id=6625
---
 .../UserManagement/Tests/HGUserManagementModuleTests.cs      |  2 +-
 .../Framework/UserManagement/UserManagementModule.cs         |  2 +-
 OpenSim/Region/Framework/Scenes/Scene.cs                     | 12 +++++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs
index 9259a83..9d36aa5 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement.Tests
         public void TestCachedUserNameForNewAgent()
         {
             TestHelpers.InMethod();
-            TestHelpers.EnableLogging();
+//            TestHelpers.EnableLogging();
 
             HGUserManagementModule hgumm = new HGUserManagementModule();
             UUID userId = TestHelpers.ParseStem("11");
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index a720d7b..1e70b84 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -320,7 +320,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             else
             {
                 names[0] = "Unknown";
-                names[1] = "UserUMMTGUN";
+                names[1] = "UserUMMTGUN2";
 
                 return false;
             }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 8fe9b66..5dea634 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2847,7 +2847,9 @@ namespace OpenSim.Region.Framework.Scenes
                 // 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);
@@ -2871,7 +2873,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);
                 }
@@ -3766,8 +3768,12 @@ namespace OpenSim.Region.Framework.Scenes
                             CapsModule.SetAgentCapsSeeds(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, agent);
+            }
 
             if (vialogin)
             {
-- 
cgit v1.1


From 8f9a726465c5bb7528d6ae7d74f20818d4ee3094 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 30 May 2013 19:27:20 +0100
Subject: If on a sit request we sit the avatar on a different prim in a
 linkset for some reason (e.g. because it has a sit target), then send the
 actual sit prim UUID to the viewer rather than the requested one.

This purports to fix the issue described in http://opensimulator.org/mantis/view.php?id=6653 where the camera can end up following the requested sit prim rather than the actual.
The original spot was by Vegaslon, this commit just goes about it in a slightly different way
This commit also makes m_requestedSitTargetUUID to be the actual UUID, which is consistent with m_requestedSitTargetID which was already doing this.
However, this adjustment has no practical effect since we only currently need to know that there's any requested sit UUID at all, not which one it is.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ab7fd5b..e8aa52e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2138,9 +2138,9 @@ namespace OpenSim.Region.Framework.Scenes
                 forceMouselook = part.GetForceMouselook();
 
                 ControllingClient.SendSitResponse(
-                    targetID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
+                    part.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
 
-                m_requestedSitTargetUUID = targetID;
+                m_requestedSitTargetUUID = part.UUID;
 
                 HandleAgentSit(ControllingClient, UUID);
 
@@ -2165,7 +2165,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (part != null)
             {
                 m_requestedSitTargetID = part.LocalId;
-                m_requestedSitTargetUUID = targetID;
+                m_requestedSitTargetUUID = part.UUID;
 
 //                m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset);
 
-- 
cgit v1.1


From 12a3b855619735b2e36a67ab99027029c8b57260 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 30 May 2013 22:20:02 +0100
Subject: Fix passing of voice distance attenuation to the Vivox voice server.

Because of a typo, this wasn't being done at all - now the 'default' value as described in OpenSimDefaults.ini of 10m is passed (vivox_channel_clamping_distance)
Thanks to Ai Austin for spotting this.
---
 .../Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index db4869d..2d65530 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -836,7 +836,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))
-- 
cgit v1.1


From 6b88a665d3a3196288b5aa16eb23f7673c2433ac Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 30 May 2013 22:43:52 +0100
Subject: minor: fix warnings in GodsModule that were due to duplicate using
 statements

---
 OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index 16673ec..a542d62 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -26,29 +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;
-- 
cgit v1.1


From 328883700a15e4216bf7b251ac099d38f413375e Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Mon, 13 May 2013 22:11:28 -0400
Subject: UserProfiles

  UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
---
 OpenSim/Data/IProfilesData.cs                      |   29 +
 OpenSim/Data/MySQL/MySQLUserProfilesData.cs        | 1023 +++++++++++++++
 .../Data/MySQL/Resources/UserProfiles.migrations   |   83 ++
 OpenSim/Framework/UserProfiles.cs                  |   90 ++
 .../Avatar/Profile/BasicProfileModule.cs           |  176 ---
 .../Avatar/UserProfiles/UserProfileModule.cs       | 1386 ++++++++++++++++++++
 .../LocalUserProfilesServiceConnector.cs           |  226 ++++
 .../Grid/LocalGridServiceConnector.cs              |    1 +
 .../Handlers/Profiles/UserProfilesConnector.cs     |   92 ++
 .../Handlers/Profiles/UserProfilesHandlers.cs      |  434 ++++++
 .../Services/Interfaces/IUserProfilesService.cs    |   48 +
 .../UserProfilesService/UserProfilesService.cs     |  160 +++
 .../UserProfilesService/UserProfilesServiceBase.cs |   59 +
 bin/OpenSim.ini.example                            |    6 +
 bin/OpenSimDefaults.ini                            |   13 +
 bin/Robust.HG.ini.example                          |   12 +-
 bin/Robust.ini.example                             |   11 +
 bin/config-include/StandaloneCommon.ini.example    |   16 +
 bin/config-include/StandaloneHypergrid.ini         |    2 +-
 prebuild.xml                                       |   38 +
 20 files changed, 3727 insertions(+), 178 deletions(-)
 create mode 100644 OpenSim/Data/IProfilesData.cs
 create mode 100644 OpenSim/Data/MySQL/MySQLUserProfilesData.cs
 create mode 100644 OpenSim/Data/MySQL/Resources/UserProfiles.migrations
 create mode 100644 OpenSim/Framework/UserProfiles.cs
 delete mode 100644 OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
 create mode 100644 OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
 create mode 100644 OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
 create mode 100644 OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
 create mode 100644 OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
 create mode 100644 OpenSim/Services/Interfaces/IUserProfilesService.cs
 create mode 100644 OpenSim/Services/UserProfilesService/UserProfilesService.cs
 create mode 100644 OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs

diff --git a/OpenSim/Data/IProfilesData.cs b/OpenSim/Data/IProfilesData.cs
new file mode 100644
index 0000000..eeccbf6
--- /dev/null
+++ b/OpenSim/Data/IProfilesData.cs
@@ -0,0 +1,29 @@
+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/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
new file mode 100644
index 0000000..09bd448
--- /dev/null
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -0,0 +1,1023 @@
+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;
+
+                                query = "INSERT INTO userprofile (`useruuid`) VALUES (?userId)";
+
+                                dbcon.Close();
+                                dbcon.Open();
+
+                                using (MySqlCommand put = new MySqlCommand(query, dbcon))
+                                {
+                                    put.Parameters.AddWithValue("?userId", props.UserId.ToString());
+                                    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 += "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("?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/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/Framework/UserProfiles.cs b/OpenSim/Framework/UserProfiles.cs
new file mode 100644
index 0000000..aabbb84
--- /dev/null
+++ b/OpenSim/Framework/UserProfiles.cs
@@ -0,0 +1,90 @@
+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/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
deleted file mode 100644
index bf24030..0000000
--- a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Reflection;
-
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using Mono.Addins;
-
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Services.Interfaces;
-
-namespace OpenSim.Region.CoreModules.Avatar.Profile
-{
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BasicProfileModule")]
-    public class BasicProfileModule : IProfileModule, ISharedRegionModule
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        //
-        // Module vars
-        //
-        private List<Scene> m_Scenes = new List<Scene>();
-        private bool m_Enabled = false;
-
-        #region ISharedRegionModule
-
-        public void Initialise(IConfigSource config)
-        {
-            m_log.DebugFormat("[PROFILE MODULE]: Basic Profile Module enabled");
-            m_Enabled = true;
-        }
-
-        public void AddRegion(Scene scene)
-        {
-            if (!m_Enabled)
-                return;
-            
-            lock (m_Scenes)
-            {
-                if (!m_Scenes.Contains(scene))
-                {
-                    m_Scenes.Add(scene);
-                    // Hook up events
-                    scene.EventManager.OnNewClient += OnNewClient;
-                    scene.RegisterModuleInterface<IProfileModule>(this);
-                }
-            }
-        }
-
-        public void RegionLoaded(Scene scene)
-        {
-            if (!m_Enabled)
-                return;
-        }
-
-        public void RemoveRegion(Scene scene)
-        {
-            if (!m_Enabled)
-                return;
-
-            lock (m_Scenes)
-            {
-                m_Scenes.Remove(scene);
-            }
-        }
-
-        public void PostInitialise()
-        {
-        }
-
-        public void Close()
-        {
-        }
-
-        public string Name
-        {
-            get { return "BasicProfileModule"; }
-        }
-
-        public Type ReplaceableInterface
-        {
-            get { return typeof(IProfileModule); }
-        }
-
-        #endregion
-
-        /// New Client Event Handler
-        private void OnNewClient(IClientAPI client)
-        {
-            //Profile
-            client.OnRequestAvatarProperties += RequestAvatarProperties;
-        }
-
-        public void RequestAvatarProperties(IClientAPI remoteClient, UUID avatarID)
-        {
-            IScene s = remoteClient.Scene;
-            if (!(s is Scene))
-                return;
-
-//            Scene scene = (Scene)s;
-
-            string profileUrl = String.Empty;
-            string aboutText = String.Empty;
-            string firstLifeAboutText = String.Empty;
-            UUID image = UUID.Zero;
-            UUID firstLifeImage = UUID.Zero;
-            UUID partner = UUID.Zero;
-            uint wantMask = 0;
-            string wantText = String.Empty;
-            uint skillsMask = 0;
-            string skillsText = String.Empty;
-            string languages = String.Empty;
-
-            UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, avatarID);
-
-            string name = "Avatar";
-            int created = 0;
-            if (account != null)
-            {
-                name = account.FirstName + " " + account.LastName;
-                created = account.Created;
-            }
-            Byte[] charterMember = Utils.StringToBytes(name);
-
-            profileUrl = "No profile data";
-            aboutText = string.Empty;
-            firstLifeAboutText = string.Empty;
-            image = UUID.Zero;
-            firstLifeImage = UUID.Zero;
-            partner = UUID.Zero;
-
-            remoteClient.SendAvatarProperties(avatarID, aboutText,
-                        Util.ToDateTime(created).ToString(
-                                "M/d/yyyy", CultureInfo.InvariantCulture),
-                        charterMember, firstLifeAboutText,
-                        (uint)(0 & 0xff),
-                        firstLifeImage, image, profileUrl, partner);
-
-            //Viewer expects interest data when it asks for properties.
-            remoteClient.SendAvatarInterestsReply(avatarID, wantMask, wantText,
-                                                    skillsMask, skillsText, languages);
-        }
-
-    }
-}
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
new file mode 100644
index 0000000..563617d
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -0,0 +1,1386 @@
+/*
+ * 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> classifiedCache = new Dictionary<UUID, UUID>();
+        Dictionary<UUID,int> 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="BlueWall.SlipStream.ProfileModule.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;
+
+            IConfig profileConfig = Config.Configs["Profile"];
+
+            if (profileConfig == null)
+            {
+                Enabled = false;
+                return;
+            }
+
+            // If we find ProfileURL then we configure for FULL support
+            // else we setup for BASIC support
+            ProfileServerUri = profileConfig.GetString("ProfileURL", "");
+            if (ProfileServerUri == "")
+            {
+                m_log.Info("[PROFILES] UserProfiles module is activated in BASIC mode");
+                Enabled = false;
+                return;
+            }
+            else
+            {
+                m_log.Info("[PROFILES] UserProfiles module is activated in FULL mode");
+                Enabled = true;
+            }
+        }
+
+        /// <summary>
+        /// Adds the region.
+        /// </summary>
+        /// <param name='scene'>
+        /// Scene.
+        /// </param>
+        public void AddRegion(Scene scene)
+        {
+            Scene = scene;
+            Scene.RegisterModuleInterface<IProfileModule>(this);
+            Scene.EventManager.OnNewClient += OnNewClient;
+            Scene.EventManager.OnMakeRootAgent += HandleOnMakeRootAgent;
+
+            UserManagementModule = Scene.RequestModuleInterface<IUserManagement>();
+        }
+
+        void HandleOnMakeRootAgent (ScenePresence obj)
+        {
+            GetImageAssets(((IScenePresence)obj).UUID);
+        }
+
+        /// <summary>
+        /// Removes the region.
+        /// </summary>
+        /// <param name='scene'>
+        /// Scene.
+        /// </param>
+        public void RemoveRegion(Scene scene)
+        {
+        }
+
+        /// <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)
+        {
+        }
+
+        /// <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 { return typeof(IProfileModule); }
+        }
+
+        /// <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)
+        {
+            // Basic or Full module?
+            if(!Enabled)
+            {
+                client.OnRequestAvatarProperties += BasicRequestProperties;
+                return;
+            }
+
+            //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;
+            bool foreign = GetUserProfileServerURI(targetID, out serverURI);
+            UUID creatorId = UUID.Zero;
+
+            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()))
+            {
+                // Error Handling here!
+                // if(parameters.ContainsKey("message")
+            }
+
+            parameters = (OSDMap)Params;
+
+            OSDArray list = (OSDArray)parameters["result"];
+
+            Dictionary<UUID, string> classifieds = new Dictionary<UUID, string>();
+
+            foreach(OSD map in list)
+            {
+                OSDMap m = (OSDMap)map;
+                UUID cid = m["classifieduuid"].AsUUID();
+                string name = m["name"].AsString();
+
+                classifieds[cid] = name;
+                
+                if(!classifiedCache.ContainsKey(cid))
+                {
+                    classifiedCache.Add(cid,creatorId);
+                    classifiedInterest.Add(cid, 0);
+                }
+
+                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;
+
+            if(classifiedCache.ContainsKey(queryClassifiedID))
+            {
+                target = classifiedCache[queryClassifiedID];
+
+                if(classifiedInterest[queryClassifiedID] -- == 0)
+                {
+                    lock(classifiedCache)
+                    {
+                        lock(classifiedInterest)
+                        {
+                            classifiedInterest.Remove(queryClassifiedID);
+                        }
+                        classifiedCache.Remove(queryClassifiedID);
+                    }
+                }
+            }            
+
+            
+            string serverURI = string.Empty;
+            bool foreign = 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);
+            Vector3 avaPos = p.AbsolutePosition;
+            
+            string serverURI = string.Empty;
+            bool foreign = 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 X = 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;
+            bool foreign = 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;
+            bool foreign = GetUserProfileServerURI(targetId, out serverURI);
+
+            OSDMap parameters= new OSDMap();
+            parameters.Add("creatorId", OSD.FromUUID(targetId));
+            OSD Params = (OSD)parameters;
+            if(!JsonRpcRequest(ref Params, "avatarpicksrequest", serverURI, UUID.Random().ToString()))
+            {
+                remoteClient.SendAgentAlertMessage(
+                        "Error requesting picks", false);
+                return;
+            }
+
+            parameters = (OSDMap)Params;
+
+            OSDArray list = (OSDArray)parameters["result"];
+
+            Dictionary<UUID, string> picks = new Dictionary<UUID, string>();
+
+            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;
+            bool foreign = 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;
+            bool foreign = 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;
+            bool foreign = 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;
+            bool foreign = 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.SendAgentAlertMessage(
+                        "Error requesting note", false);
+            }
+            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;
+            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+
+            object Note = note;
+            if(!JsonRpcRequest(ref Note, "avatar_notes_update", serverURI, UUID.Random().ToString()))
+            {
+                remoteClient.SendAgentAlertMessage(
+                        "Error updating note", false);
+            }
+        }
+        #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;
+            bool foreign = 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 BasicRequestProperties(IClientAPI remoteClient, UUID avatarID)
+        {
+            IScene s = remoteClient.Scene;
+            if (!(s is Scene))
+                return;
+
+            string profileUrl = String.Empty;
+            string aboutText = String.Empty;
+            string firstLifeAboutText = String.Empty;
+            UUID image = UUID.Zero;
+            UUID firstLifeImage = UUID.Zero;
+            UUID partner = UUID.Zero;
+            uint wantMask = 0;
+            string wantText = String.Empty;
+            uint skillsMask = 0;
+            string skillsText = String.Empty;
+            string languages = String.Empty;
+            
+            UserAccount account = Scene.UserAccountService.GetUserAccount(Scene.RegionInfo.ScopeID, avatarID);
+            
+            string name = "Avatar";
+            int created = 0;
+            if (account != null)
+            {
+                name = account.FirstName + " " + account.LastName;
+                created = account.Created;
+            }
+            Byte[] charterMember = Utils.StringToBytes(name);
+            
+            profileUrl = "No profile data";
+            aboutText = string.Empty;
+            firstLifeAboutText = string.Empty;
+            image = UUID.Zero;
+            firstLifeImage = UUID.Zero;
+            partner = UUID.Zero;
+            
+            remoteClient.SendAvatarProperties(avatarID, aboutText,
+                                              Util.ToDateTime(created).ToString(
+                "M/d/yyyy", CultureInfo.InvariantCulture),
+                                              charterMember, firstLifeAboutText,
+                                              (uint)(0 & 0xff),
+                                              firstLifeImage, image, profileUrl, partner);
+            
+            //Viewer expects interest data when it asks for properties.
+            remoteClient.SendAvatarInterestsReply(avatarID, wantMask, wantText,
+                                                  skillsMask, skillsText, languages);
+        }
+
+        /// <summary>
+        /// Requests the avatar properties.
+        /// </summary>
+        /// <param name='remoteClient'>
+        /// Remote client.
+        /// </param>
+        /// <param name='avatarID'>
+        /// Avatar I.
+        /// </param>
+        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;
+                bool foreign = 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;
+            bool foreign = 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()))
+            {
+                // Error Handling here!
+                // if(parameters.ContainsKey("message")
+                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()), this, 
+                    delegate (string assetID, Object s, AssetBase a)
+                    {
+                        // m_log.DebugFormat("[PROFILES]: Getting Image Assets {0}", assetID); 
+                        return;
+                    });
+            }
+            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));
+            // Experiment
+            json.Add("params", OSD.SerializeMembers(parameters));
+
+            string jsonRequestData = OSDParser.SerializeJsonString(json);
+            byte[] content = Encoding.UTF8.GetBytes(jsonRequestData);
+
+            HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(uri);
+            // webRequest.Credentials = new NetworkCredential(rpcUser, rpcPass);
+            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;
+            }
+
+            byte[] buf = new byte[8192];
+            Stream rstream = webResponse.GetResponseStream();
+            OSDMap mret = (OSDMap)OSDParser.DeserializeJson(rstream);
+
+            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;
+            }
+
+            byte[] buf = new byte[8192];
+            Stream rstream = webResponse.GetResponseStream();
+
+            OSDMap response = new OSDMap();
+            response = (OSDMap)OSDParser.DeserializeJson(rstream);
+            if(response.ContainsKey("error"))
+            {
+                data = response["error"];
+                return false;
+            }
+
+            data = response;
+
+            return true;
+        }
+        #endregion Web Util
+    }
+}
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/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index c32820e..3849a3f 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)
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
new file mode 100644
index 0000000..4ad7297
--- /dev/null
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
@@ -0,0 +1,92 @@
+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_preferences_request", handler.UserPreferencesRequest);
+//            Server.AddJsonRPCHandler("user_preferences_update", handler.UserPreferencesUpdate);
+//            Server.AddJsonRPCHandler("user_account_create", handler.UserAccountCreate);
+//            Server.AddJsonRPCHandler("user_account_auth", handler.UserAccountAuth);
+//            Server.AddJsonRPCHandler("user_account_test", handler.UserAccountTest);
+            Server.AddJsonRPCHandler("user_data_request", handler.RequestUserAppData);
+            Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData);
+        }
+    }
+}
+
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
new file mode 100644
index 0000000..93da102
--- /dev/null
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
@@ -0,0 +1,434 @@
+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/Services/Interfaces/IUserProfilesService.cs b/OpenSim/Services/Interfaces/IUserProfilesService.cs
new file mode 100644
index 0000000..12fc986
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IUserProfilesService.cs
@@ -0,0 +1,48 @@
+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/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
new file mode 100644
index 0000000..959c661
--- /dev/null
+++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
@@ -0,0 +1,160 @@
+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..dc0be03
--- /dev/null
+++ b/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
@@ -0,0 +1,59 @@
+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/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 5e486d4..38e2a07 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1032,6 +1032,12 @@
     ;# {InitialTerrain} {} {Initial terrain type} {pinhead-island flat} pinhead-island
     ; InitialTerrain = "pinhead-island"
 
+[Profile]
+  ;# {ProfileURL} {} {Set url to UserProfilesService} {}
+  ;; Set the value of the url to your UserProfilesService
+  ;; If un-set / "" the module is disabled
+  ;; ProfileURL = 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 81843b1..237f684 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -377,6 +377,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
 
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index bc2b4cf..d9f1ca1 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -71,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
 ; *
@@ -595,4 +597,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.ini.example b/bin/Robust.ini.example
index 1d66b7f..7d6492b 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -51,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
@@ -391,4 +393,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/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 2547244..8c23c41 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -352,3 +352,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 ba92030..39c33e8 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -19,6 +19,7 @@
     GridUserServices        = "LocalGridUserServicesConnector"
     SimulationServices		= "RemoteSimulationConnectorModule"
     AvatarServices			= "LocalAvatarServicesConnector"
+    UserProfilesServices    = "LocalUserProfilesServicesConnector"
 	MapImageService			= "MapImageServiceModule"
     EntityTransferModule	= "HGEntityTransferModule"
     InventoryAccessModule	= "HGInventoryAccessModule"
@@ -184,7 +185,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/prebuild.xml b/prebuild.xml
index 5967ef6..03cac76 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -281,6 +281,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/"/>
@@ -1239,6 +1240,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>
@@ -1977,6 +2014,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"/>
-- 
cgit v1.1


From 46335b103e1f993c6aa77e46f89e5ee0d6d7497e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 30 May 2013 23:51:35 +0100
Subject: If an exception occurs in the AsyncCommandManager loop, spit it out
 to log rather than silently swallowing it.

This might help diagnose the cause of http://opensimulator.org/mantis/view.php?id=6651 where sometimes scripts fail to start on region start.
---
 .../Shared/Api/Implementation/AsyncCommandManager.cs       | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index 1c59624..352e316 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
     /// </summary>
     public class AsyncCommandManager
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private static Thread cmdHandlerThread;
         private static int cmdHandlerThreadCycleSleepms;
@@ -183,17 +183,15 @@ 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);
                 }
             }
         }
-- 
cgit v1.1


From 3aa2fb99289162b4338b7550a39411bebd74d97b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 30 May 2013 09:19:42 -0700
Subject: BulletSim: remove unuseful BulletSim parameters from
 OpenSimDefaults.ini and replace with things someone might actually want to
 tune (avatar height, ...).

---
 bin/OpenSimDefaults.ini | 57 ++++++++++++++++++++++---------------------------
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 81843b1..6cdf146 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -921,56 +921,49 @@
     ;force_simple_prim_meshing = true
 
 [BulletSim]
-    ; World parameters
+    ; 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..   the c++ is much faster.
-
+    ; 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
+    ; Terrain Implementation
+    TerrainImplementation = 1   ; 0=Heightfield, 1=mesh
+    ; 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
 
-    AvatarFriction = 0.2
-    AvatarStandingFriction = 0.95
-    AvatarRestitution = 0.0
-    AvatarDensity = 3.5
-    AvatarCapsuleWidth = 0.6
-    AvatarCapsuleDepth = 0.45
-    AvatarCapsuleHeight = 1.5
-    AvatarContactProcessingThreshold = 0.1
+    ; 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
 
-    MaxObjectMass = 10000.01
-
-    CollisionMargin = 0.04
-
-    ; Linkset implmentation
+    ; 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', 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
-- 
cgit v1.1


From 439f11cc3cf2ab8f7fdc1d8746f1d8ab44c911eb Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 30 May 2013 09:21:58 -0700
Subject: Add region heartbeat start event to complement heartbeat end event.
 This allows object modification before the usual heartbeat operation.

---
 OpenSim/Region/Framework/Scenes/EventManager.cs | 23 +++++++++++++++++++++++
 OpenSim/Region/Framework/Scenes/Scene.cs        |  2 ++
 2 files changed, 25 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 59d0148..a246319 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -969,6 +969,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;
 
@@ -3068,6 +3070,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;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 5dea634..0743ce7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1517,6 +1517,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)
                     {
-- 
cgit v1.1


From 48a175eff760e04f8096acd404058755d7c2919c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 30 May 2013 14:30:45 -0700
Subject: Add methods to Animation and AnimationSet for easier manipulation and
 display of groups of animations (Equal(), ToString(), FromOSDArray(), ...).
 No functional change to animations.

---
 OpenSim/Framework/Animation.cs                     |  20 ++++
 .../Framework/Scenes/Animation/AnimationSet.cs     | 110 +++++++++++++++++++++
 .../Scenes/Animation/DefaultAvatarAnimations.cs    |  26 +++++
 3 files changed, 156 insertions(+)

diff --git a/OpenSim/Framework/Animation.cs b/OpenSim/Framework/Animation.cs
index 232f5a1..8bdf8f4 100644
--- a/OpenSim/Framework/Animation.cs
+++ b/OpenSim/Framework/Animation.cs
@@ -120,5 +120,25 @@ 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 == this.AnimID
+                        && other.SequenceNum == this.SequenceNum
+                        && other.ObjectID == this.ObjectID);
+            }
+
+            return base.Equals(obj);
+        }
+
+        public override string ToString()
+        {
+            return "AnimID=" + AnimID.ToString()
+                + "/seq=" + SequenceNum.ToString()
+                + "/objID=" + ObjectID.ToString();
+        }
+
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
index 66edfed..5dee64d 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,106 @@ 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 == ImplicitDefaultAnimation)
+                buff.Append("same");
+            else
+                buff.Append(ImplicitDefaultAnimation.ToString());
+            if (m_animations.Count > 0)
+            {
+                buff.Append(",anims=");
+                foreach (OpenSim.Framework.Animation anim in m_animations)
+                {
+                    buff.Append("<");
+                    buff.Append(anim.ToString());
+                    buff.Append(">,");
+                }
+            }
+            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
-- 
cgit v1.1


From 4d32ca19bf27048105aeb01c67f0f9647ed3e700 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 30 May 2013 19:15:14 -0700
Subject: Trigger OnScenePresenceUpdated when the avatar's animations change.

---
 .../Framework/Scenes/Animation/ScenePresenceAnimator.cs | 17 ++++++++++++++---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs        |  8 +++++++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index e92a087..a701a79 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -92,7 +92,9 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                     GetAnimName(animID), animID, m_scenePresence.Name);
 
             if (m_animations.Add(animID, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, objectID))
+            {
                 SendAnimPack();
+            }
         }
 
         // Called from scripts
@@ -131,7 +133,9 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                     GetAnimName(animID), animID, m_scenePresence.Name);
 
             if (m_animations.Remove(animID, allowNoDefault))
+            {
                 SendAnimPack();
+            }
         }
 
         // Called from scripts
@@ -163,8 +167,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(
@@ -181,6 +187,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                     // 16384 is CHANGED_ANIMATION
                     m_scenePresence.SendScriptEventToAttachments("changed", new Object[] { (int)Changed.ANIMATION});
                     SendAnimPack();
+                    ret = true;
                 }
             }
             else
@@ -189,6 +196,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>
@@ -422,8 +430,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();
@@ -437,9 +447,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/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index e8aa52e..b8ff7f7 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2039,6 +2039,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             Animator.TrySetMovementAnimation("STAND");
+            TriggerScenePresenceUpdated();
         }
 
         private SceneObjectPart FindNextAvailableSitTarget(UUID targetID)
@@ -2432,6 +2433,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 Animator.TrySetMovementAnimation(sitAnimation);
                 SendAvatarDataToAllAgents();
+                TriggerScenePresenceUpdated();
             }
         }
 
@@ -2440,6 +2442,7 @@ namespace OpenSim.Region.Framework.Scenes
 //            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();
         }
@@ -2456,11 +2459,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();
         }
 
         /// <summary>
@@ -3465,7 +3470,8 @@ namespace OpenSim.Region.Framework.Scenes
 
 //                if (m_updateCount > 0)
 //                {
-            Animator.UpdateMovementAnimations();
+            if (Animator.UpdateMovementAnimations())
+                TriggerScenePresenceUpdated();
 //                    m_updateCount--;
 //                }
 
-- 
cgit v1.1


From 5b3a443125e19d9cda0b6ce5f8b6a44116c9d50a Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 30 May 2013 22:52:17 -0400
Subject: Trigger Jenkins build

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

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.
 
+
-- 
cgit v1.1


From bf035233232885b798a56a1687319ba167e4bf60 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Fri, 31 May 2013 10:40:47 -0400
Subject: Fill in fields with default values on profile creation

---
 OpenSim/Data/MySQL/MySQLUserProfilesData.cs | 50 +++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index 09bd448..5d7149b 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -622,7 +622,7 @@ namespace OpenSim.Data.MySQL
                             {
                                 m_log.DebugFormat("[PROFILES_DATA]" +
                                                  ": No data for {0}", props.UserId);
-                                
+                               
                                 props.WebUrl = string.Empty;
                                 props.ImageId = UUID.Zero;
                                 props.AboutText = string.Empty;
@@ -634,8 +634,38 @@ namespace OpenSim.Data.MySQL
                                 props.SkillsMask = 0;
                                 props.SkillsText = string.Empty;
                                 props.Language = string.Empty;
+                                props.PublishProfile = false;
+                                props.PublishMature = false;
 
-                                query = "INSERT INTO userprofile (`useruuid`) VALUES (?userId)";
+                                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();
@@ -643,6 +673,20 @@ namespace OpenSim.Data.MySQL
                                 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();
                                 }
                             }
@@ -665,6 +709,7 @@ namespace OpenSim.Data.MySQL
             string query = string.Empty;
             
             query += "UPDATE userprofile SET ";
+            query += "profilePartner=?profilePartner, ";
             query += "profileURL=?profileURL, ";
             query += "profileImage=?image, ";
             query += "profileAboutText=?abouttext,";
@@ -680,6 +725,7 @@ namespace OpenSim.Data.MySQL
                     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());
-- 
cgit v1.1


From 00c1586ff8cd0abb2270a109087857adefe3b5c2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 31 May 2013 18:12:36 +0100
Subject: refactor: Remove unused AsyncCommandManager.PleaseShutdown

---
 .../Shared/Api/Implementation/AsyncCommandManager.cs | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index 352e316..c71b571 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -377,23 +377,5 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
             }
         }
-
-        #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;
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1


From 921ad8704e08fccc994f7907e7cb1e9372e355b9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 31 May 2013 22:50:15 +0100
Subject: Lock areas of AsyncCommandManager where multiple threads could try to
 access/update the same static structures simultaneously.

This is possible where there is more than one scene (multiple copies of the same script engine) and/or more than one script engine being used.
These operations are not thread safe and could be leading to the exceptions/problems seen in http://opensimulator.org/mantis/view.php?id=6651
This also prevents a small race condition where more than one AsyncLSLCmdHandlerThread could be started.
---
 .../Api/Implementation/AsyncCommandManager.cs      | 288 +++++++++++++--------
 1 file changed, 177 insertions(+), 111 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index c71b571..72e8415 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -52,6 +52,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         private static Thread cmdHandlerThread;
         private static int cmdHandlerThreadCycleSleepms;
 
+        /// <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<IScene> m_Scenes = new List<IScene>();
         private static List<IScriptEngine> m_ScriptEngines =
                 new List<IScriptEngine>();
@@ -74,37 +83,65 @@ 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)
@@ -112,29 +149,36 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             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_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();
+            }
         }
 
         private static void StartThread()
@@ -198,25 +242,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         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();
+                }
             }
         }
 
@@ -229,32 +276,33 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
 //            m_log.DebugFormat("[ASYNC COMMAND MANAGER]: Removing facilities for script {0}", itemID);
 
-            // Remove a specific script
+            lock (staticLock)
+            {
+                // Remove dataserver events
+                m_Dataserver[engine].RemoveEvents(localID, itemID);
 
-            // 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.StopHttpRequestsForScript(itemID);
 
-            // Remove from: HttpRequest
-            IHttpRequestModule iHttpReq = engine.World.RequestModuleInterface<IHttpRequestModule>();
-            if (iHttpReq != null)
-                iHttpReq.StopHttpRequestsForScript(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>
@@ -264,10 +312,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>
@@ -277,10 +328,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>
@@ -290,10 +344,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>
@@ -303,38 +360,44 @@ 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 Object[] GetSerializationData(IScriptEngine engine, UUID itemID)
         {
             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();
@@ -359,20 +422,23 @@ 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;
+                        }
                     }
                 }
             }
-- 
cgit v1.1


From 217c7d11401dbf15ada3de750e7ad0df85a02894 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 31 May 2013 23:00:10 +0100
Subject: Remove unnecessary m_scenes and m_scene from AsyncCommandManager.

These were private and the sole point of use (to know when to load config for the first time) can be done by looking at script engines instead.
---
 .../ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs  | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index 72e8415..998f40b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -61,12 +61,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// </remarks>
         private static object staticLock = new object();
 
-        private static List<IScene> m_Scenes = new List<IScene>();
         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>();
@@ -147,7 +145,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public AsyncCommandManager(IScriptEngine _ScriptEngine)
         {
             m_ScriptEngine = _ScriptEngine;
-            m_Scene = m_ScriptEngine.World;
 
             // 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
@@ -155,11 +152,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // race conditions such as the later check of cmdHandlerThread == null.
             lock (staticLock)
             {
-                if (m_Scenes.Count == 0)
+                if (m_ScriptEngines.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);
 
-- 
cgit v1.1


From ba2f13db63a58698ca47e9ba51a1a1509b838a77 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Fri, 31 May 2013 18:48:01 -0400
Subject: Adding back the BasicProfileModule

---
 .../Avatar/Profile/BasicProfileModule.cs           | 176 +++++++++++++++++++++
 .../Avatar/UserProfiles/UserProfileModule.cs       |  88 ++---------
 bin/OpenSim.ini.example                            |   4 +-
 3 files changed, 193 insertions(+), 75 deletions(-)
 create mode 100644 OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs

diff --git a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
new file mode 100644
index 0000000..bf24030
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
@@ -0,0 +1,176 @@
+/*
+ * 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.Globalization;
+using System.Reflection;
+
+using OpenMetaverse;
+using log4net;
+using Nini.Config;
+using Mono.Addins;
+
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+
+namespace OpenSim.Region.CoreModules.Avatar.Profile
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BasicProfileModule")]
+    public class BasicProfileModule : IProfileModule, ISharedRegionModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        //
+        // Module vars
+        //
+        private List<Scene> m_Scenes = new List<Scene>();
+        private bool m_Enabled = false;
+
+        #region ISharedRegionModule
+
+        public void Initialise(IConfigSource config)
+        {
+            m_log.DebugFormat("[PROFILE MODULE]: Basic Profile Module enabled");
+            m_Enabled = true;
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+            
+            lock (m_Scenes)
+            {
+                if (!m_Scenes.Contains(scene))
+                {
+                    m_Scenes.Add(scene);
+                    // Hook up events
+                    scene.EventManager.OnNewClient += OnNewClient;
+                    scene.RegisterModuleInterface<IProfileModule>(this);
+                }
+            }
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            lock (m_Scenes)
+            {
+                m_Scenes.Remove(scene);
+            }
+        }
+
+        public void PostInitialise()
+        {
+        }
+
+        public void Close()
+        {
+        }
+
+        public string Name
+        {
+            get { return "BasicProfileModule"; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return typeof(IProfileModule); }
+        }
+
+        #endregion
+
+        /// New Client Event Handler
+        private void OnNewClient(IClientAPI client)
+        {
+            //Profile
+            client.OnRequestAvatarProperties += RequestAvatarProperties;
+        }
+
+        public void RequestAvatarProperties(IClientAPI remoteClient, UUID avatarID)
+        {
+            IScene s = remoteClient.Scene;
+            if (!(s is Scene))
+                return;
+
+//            Scene scene = (Scene)s;
+
+            string profileUrl = String.Empty;
+            string aboutText = String.Empty;
+            string firstLifeAboutText = String.Empty;
+            UUID image = UUID.Zero;
+            UUID firstLifeImage = UUID.Zero;
+            UUID partner = UUID.Zero;
+            uint wantMask = 0;
+            string wantText = String.Empty;
+            uint skillsMask = 0;
+            string skillsText = String.Empty;
+            string languages = String.Empty;
+
+            UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, avatarID);
+
+            string name = "Avatar";
+            int created = 0;
+            if (account != null)
+            {
+                name = account.FirstName + " " + account.LastName;
+                created = account.Created;
+            }
+            Byte[] charterMember = Utils.StringToBytes(name);
+
+            profileUrl = "No profile data";
+            aboutText = string.Empty;
+            firstLifeAboutText = string.Empty;
+            image = UUID.Zero;
+            firstLifeImage = UUID.Zero;
+            partner = UUID.Zero;
+
+            remoteClient.SendAvatarProperties(avatarID, aboutText,
+                        Util.ToDateTime(created).ToString(
+                                "M/d/yyyy", CultureInfo.InvariantCulture),
+                        charterMember, firstLifeAboutText,
+                        (uint)(0 & 0xff),
+                        firstLifeImage, image, profileUrl, partner);
+
+            //Viewer expects interest data when it asks for properties.
+            remoteClient.SendAvatarInterestsReply(avatarID, wantMask, wantText,
+                                                    skillsMask, skillsText, languages);
+        }
+
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 563617d..5b228ee 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -124,8 +124,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         public void Initialise(IConfigSource source)
         {
             Config = source;
+            ReplaceableInterface = typeof(IProfileModule);
 
-            IConfig profileConfig = Config.Configs["Profile"];
+            IConfig profileConfig = Config.Configs["UserProfiles"];
 
             if (profileConfig == null)
             {
@@ -135,18 +136,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
             // If we find ProfileURL then we configure for FULL support
             // else we setup for BASIC support
-            ProfileServerUri = profileConfig.GetString("ProfileURL", "");
+            ProfileServerUri = profileConfig.GetString("ProfileServiceURL", "");
             if (ProfileServerUri == "")
             {
-                m_log.Info("[PROFILES] UserProfiles module is activated in BASIC mode");
                 Enabled = false;
                 return;
             }
-            else
-            {
-                m_log.Info("[PROFILES] UserProfiles module is activated in FULL mode");
-                Enabled = true;
-            }
+                
+            m_log.Debug("[PROFILES]: Full Profiles Enabled");
+            ReplaceableInterface = null;
+            Enabled = true;
         }
 
         /// <summary>
@@ -157,6 +156,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         /// </param>
         public void AddRegion(Scene scene)
         {
+            if(!Enabled)
+                return;
+
             Scene = scene;
             Scene.RegisterModuleInterface<IProfileModule>(this);
             Scene.EventManager.OnNewClient += OnNewClient;
@@ -178,6 +180,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         /// </param>
         public void RemoveRegion(Scene scene)
         {
+            if(!Enabled)
+                return;
         }
 
         /// <summary>
@@ -191,6 +195,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         /// </param>
         public void RegionLoaded(Scene scene)
         {
+            if(!Enabled)
+                return;
         }
 
         /// <summary>
@@ -206,7 +212,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         /// </value>
         public Type ReplaceableInterface
         {
-            get { return typeof(IProfileModule); }
+            get; private set;
         }
 
         /// <summary>
@@ -237,13 +243,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         /// </param>
         void OnNewClient(IClientAPI client)
         {
-            // Basic or Full module?
-            if(!Enabled)
-            {
-                client.OnRequestAvatarProperties += BasicRequestProperties;
-                return;
-            }
-
             //Profile
             client.OnRequestAvatarProperties += RequestAvatarProperties;
             client.OnUpdateAvatarProperties += AvatarPropertiesUpdate;
@@ -839,63 +838,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             }
         }
 
-        public void BasicRequestProperties(IClientAPI remoteClient, UUID avatarID)
-        {
-            IScene s = remoteClient.Scene;
-            if (!(s is Scene))
-                return;
-
-            string profileUrl = String.Empty;
-            string aboutText = String.Empty;
-            string firstLifeAboutText = String.Empty;
-            UUID image = UUID.Zero;
-            UUID firstLifeImage = UUID.Zero;
-            UUID partner = UUID.Zero;
-            uint wantMask = 0;
-            string wantText = String.Empty;
-            uint skillsMask = 0;
-            string skillsText = String.Empty;
-            string languages = String.Empty;
-            
-            UserAccount account = Scene.UserAccountService.GetUserAccount(Scene.RegionInfo.ScopeID, avatarID);
-            
-            string name = "Avatar";
-            int created = 0;
-            if (account != null)
-            {
-                name = account.FirstName + " " + account.LastName;
-                created = account.Created;
-            }
-            Byte[] charterMember = Utils.StringToBytes(name);
-            
-            profileUrl = "No profile data";
-            aboutText = string.Empty;
-            firstLifeAboutText = string.Empty;
-            image = UUID.Zero;
-            firstLifeImage = UUID.Zero;
-            partner = UUID.Zero;
-            
-            remoteClient.SendAvatarProperties(avatarID, aboutText,
-                                              Util.ToDateTime(created).ToString(
-                "M/d/yyyy", CultureInfo.InvariantCulture),
-                                              charterMember, firstLifeAboutText,
-                                              (uint)(0 & 0xff),
-                                              firstLifeImage, image, profileUrl, partner);
-            
-            //Viewer expects interest data when it asks for properties.
-            remoteClient.SendAvatarInterestsReply(avatarID, wantMask, wantText,
-                                                  skillsMask, skillsText, languages);
-        }
-
-        /// <summary>
-        /// Requests the avatar properties.
-        /// </summary>
-        /// <param name='remoteClient'>
-        /// Remote client.
-        /// </param>
-        /// <param name='avatarID'>
-        /// Avatar I.
-        /// </param>
         public void RequestAvatarProperties(IClientAPI remoteClient, UUID avatarID)
         {
             if ( String.IsNullOrEmpty(avatarID.ToString()) || String.IsNullOrEmpty(remoteClient.AgentId.ToString()))
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 38e2a07..3015c08 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1032,11 +1032,11 @@
     ;# {InitialTerrain} {} {Initial terrain type} {pinhead-island flat} pinhead-island
     ; InitialTerrain = "pinhead-island"
 
-[Profile]
+[UserProfiles]
   ;# {ProfileURL} {} {Set url to UserProfilesService} {}
   ;; Set the value of the url to your UserProfilesService
   ;; If un-set / "" the module is disabled
-  ;; ProfileURL = http://127.0.0.1:8002
+  ;; 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
-- 
cgit v1.1


From d7fa9f671eefebd49c0e8f56e56088b0c0b3d93c Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Fri, 31 May 2013 22:03:27 -0400
Subject: Adding standard OpenSim header to source files

---
 OpenSim/Data/IProfilesData.cs                      | 27 ++++++++++++++++++++++
 OpenSim/Data/MySQL/MySQLUserProfilesData.cs        | 27 ++++++++++++++++++++++
 OpenSim/Framework/UserProfiles.cs                  | 27 ++++++++++++++++++++++
 .../Handlers/Profiles/UserProfilesConnector.cs     | 27 ++++++++++++++++++++++
 .../Handlers/Profiles/UserProfilesHandlers.cs      | 27 ++++++++++++++++++++++
 .../Services/Interfaces/IUserProfilesService.cs    | 27 ++++++++++++++++++++++
 .../UserProfilesService/UserProfilesService.cs     | 27 ++++++++++++++++++++++
 .../UserProfilesService/UserProfilesServiceBase.cs | 27 ++++++++++++++++++++++
 8 files changed, 216 insertions(+)

diff --git a/OpenSim/Data/IProfilesData.cs b/OpenSim/Data/IProfilesData.cs
index eeccbf6..0de7f68 100644
--- a/OpenSim/Data/IProfilesData.cs
+++ b/OpenSim/Data/IProfilesData.cs
@@ -1,3 +1,30 @@
+/*
+ * 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;
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index 5d7149b..4c6c8e3 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -1,3 +1,30 @@
+/*
+ * 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;
diff --git a/OpenSim/Framework/UserProfiles.cs b/OpenSim/Framework/UserProfiles.cs
index aabbb84..6133591 100644
--- a/OpenSim/Framework/UserProfiles.cs
+++ b/OpenSim/Framework/UserProfiles.cs
@@ -1,3 +1,30 @@
+/*
+ * 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;
 
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
index 4ad7297..5a24ee3 100644
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
@@ -1,3 +1,30 @@
+/*
+ * 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;
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
index 93da102..f5f0794 100644
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
@@ -1,3 +1,30 @@
+/*
+ * 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;
diff --git a/OpenSim/Services/Interfaces/IUserProfilesService.cs b/OpenSim/Services/Interfaces/IUserProfilesService.cs
index 12fc986..319d307 100644
--- a/OpenSim/Services/Interfaces/IUserProfilesService.cs
+++ b/OpenSim/Services/Interfaces/IUserProfilesService.cs
@@ -1,3 +1,30 @@
+/*
+ * 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;
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
index 959c661..d00f34d 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
@@ -1,3 +1,30 @@
+/*
+ * 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;
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs b/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
index dc0be03..927f7c9 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
@@ -1,3 +1,30 @@
+/*
+ * 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;
-- 
cgit v1.1


From 07058b044be59b6e07efedeca36b2b464e984195 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 1 Jun 2013 14:52:44 -0700
Subject: BulletSim: experimental movement of physics execution off of
 heartbeat thread. Off by default until more testing.

Setting "[BulletSim]UseSeparatePhysicsThread=true" causes the physics
engine to be called on its own thread and the heartbeat thread only
handles the reporting of property updates and collisions. Physics frame
rate is about right but physics execution time goes to zero as accounted
by the heartbeat loop.
---
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs |   8 +
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs  |   3 +-
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 271 +++++++++++++++++-------
 3 files changed, 209 insertions(+), 73 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 2651e3b..afd547a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -54,6 +54,9 @@ public static class BSParam
     // ===================
     // 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; }
     public static float MeshCircularLOD { get; private set; }
@@ -354,6 +357,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.1f ),
+
         new ParameterDefn<bool>("MeshSculptedPrim", "Whether to create meshes for sculpties",
             true,
             (s) => { return ShouldMeshSculptedPrim; },
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index e11e365..95bdc7b 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -1513,7 +1513,8 @@ public class BSPrim : BSPhysObject
         CurrentEntityProperties = entprop;
 
         // Note that BSPrim can be overloaded by BSPrimLinkable which controls updates from root and children prims.
-        base.RequestPhysicsterseUpdate();
+        
+        PhysScene.PostUpdate(this);
     }
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 39f5b0a..423c389 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -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,19 @@ 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; }
+
+    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 +108,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 +206,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];
 
@@ -227,10 +248,20 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         TerrainManager = new BSTerrainManager(this);
         TerrainManager.CreateInitialGroundPlaneAndTerrain();
 
+        // Put some informational messages into the log file.
         m_log.WarnFormat("{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
@@ -270,6 +301,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
             }
             else
             {
+                // Nothing in the configuration INI file so assume unmanaged and other defaults.
                 BulletEngineName = "BulletUnmanaged";
                 m_physicsLoggingEnabled = false;
                 VehicleLoggingEnabled = false;
@@ -317,6 +349,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
 
         switch (selectionName)
         {
+            case "bullet":
             case "bulletunmanaged":
                 ret = new BSAPIUnman(engineName, this);
                 break;
@@ -494,25 +527,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
@@ -535,18 +584,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)
         {
@@ -558,77 +597,62 @@ 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))
+                    {
+                        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,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);
+        }
+
         // 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)
@@ -637,7 +661,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
@@ -656,7 +757,7 @@ 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);
 
@@ -664,13 +765,39 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
 
         if (collider.Collide(collidingWith, collidee, collidePoint, collideNormal, penetration))
         {
-            // If a collision was posted, remember to send it to the simulator
+            // 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.
+                DetailLog("{0},BulletSPluginPhysicsThread,sleeping={1}", BSScene.DetailLogZero, simulationTimeVsRealtimeDifferenceMS);
+                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() { }
-- 
cgit v1.1


From 43d804b998e6f37bbae771711af0ae1ffcc84cbd Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 4 Jun 2013 12:27:22 -0700
Subject: New HttpServer_OpenSim.dll with increased limits on number of
 connections, requests, etc.

---
 bin/HttpServer_OpenSim.dll | Bin 119808 -> 116224 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/HttpServer_OpenSim.dll b/bin/HttpServer_OpenSim.dll
index e15493d..38a4cb7 100755
Binary files a/bin/HttpServer_OpenSim.dll and b/bin/HttpServer_OpenSim.dll differ
-- 
cgit v1.1


From 0c971d148cbee691136a8e6f6c0b3dd40ba4e78a Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 5 Jun 2013 07:09:43 -0700
Subject: BulletSim: fix corner case when rebuilding a compound linkset while a
 mesh/hull while a mesh or hull is being rebuilt when its asset is fetched.
 This fixes a 'pure virtual function' crash when changing physical state of
 complex linksets that include many meshes.

---
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 57 +++++++++++++++++++-----
 1 file changed, 46 insertions(+), 11 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 81edc12..867d2ab 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -389,9 +389,21 @@ public class BSShapeMesh : BSShape
     }
     public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim)
     {
-        // Another reference to this shape is just counted.
-        IncrementReference();
-        return this;
+        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)
     {
@@ -560,9 +572,21 @@ public class BSShapeHull : BSShape
     }
     public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim)
     {
-        // Another reference to this shape is just counted.
-        IncrementReference();
-        return this;
+        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)
     {
@@ -1075,12 +1099,23 @@ public class BSShapeGImpact : BSShape
                             (w, iC, i, vC, v) => physicsScene.PE.CreateGImpactShape(w, iC, i, vC, v) );
     }
 
-    public override BSShape GetReference(BSScene physicsScene, BSPhysObject prim)
+    public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim)
     {
-        // Calling this reference means we want another handle to an existing shape
-        //     (usually linksets) so return this copy.
-        IncrementReference();
-        return this;
+        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)
-- 
cgit v1.1


From b5d0ac4c42629812523f5af4384f61dee00ef495 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 5 Jun 2013 07:12:14 -0700
Subject: BulletSim: default PhysicsTimeStep to same as the simulator's
 heartbeat timestep when running the physics engine on a separate thread. This
 reduces the occurance of heartbeats that happen when there is no physics step
 which is seen as vehicle jerkyness.

---
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index afd547a..aad1108 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -360,7 +360,7 @@ public static class BSParam
         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.1f ),
+            0.089f ),
 
         new ParameterDefn<bool>("MeshSculptedPrim", "Whether to create meshes for sculpties",
             true,
-- 
cgit v1.1


From b4f472c4fab5c1b3fda0f86bba330d5bf0800e22 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Wed, 5 Jun 2013 15:08:25 -0400
Subject: Make locking more uniform

---
 .../Avatar/UserProfiles/UserProfileModule.cs       | 33 +++++++++++++---------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 5b228ee..7165cb6 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -62,6 +62,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         // count. The entries are removed when the interest count reaches 0.
         Dictionary<UUID,UUID> classifiedCache = new Dictionary<UUID, UUID>();
         Dictionary<UUID,int> classifiedInterest = new Dictionary<UUID, int>();
+        Object classifiedLock;
 
         public Scene Scene
         {
@@ -326,14 +327,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
                 string name = m["name"].AsString();
 
                 classifieds[cid] = name;
-                
+
                 if(!classifiedCache.ContainsKey(cid))
                 {
-                    classifiedCache.Add(cid,creatorId);
-                    classifiedInterest.Add(cid, 0);
+//                    lock(classifiedLock)
+//                    {
+                    lock(classifiedCache)
+                        classifiedCache.Add(cid,creatorId);
+                    lock(classifiedInterest)
+                        classifiedInterest.Add(cid, 0);
+//                    }
                 }
 
-                classifiedInterest[cid] ++;
+                lock(classifiedInterest)
+                    classifiedInterest[cid] ++;
             }
 
             remoteClient.SendAvatarClassifiedReply(new UUID(args[0]), classifieds);
@@ -346,22 +353,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             ad.ClassifiedId = queryClassifiedID;
 
             if(classifiedCache.ContainsKey(queryClassifiedID))
-            {
+            {   
                 target = classifiedCache[queryClassifiedID];
 
-                if(classifiedInterest[queryClassifiedID] -- == 0)
+                lock(classifiedInterest)
+                    classifiedInterest[queryClassifiedID] --;
+
+                if(classifiedInterest[queryClassifiedID] == 0)
                 {
+                    lock(classifiedInterest)
+                        classifiedInterest.Remove(queryClassifiedID);
                     lock(classifiedCache)
-                    {
-                        lock(classifiedInterest)
-                        {
-                            classifiedInterest.Remove(queryClassifiedID);
-                        }
                         classifiedCache.Remove(queryClassifiedID);
-                    }
                 }
-            }            
-
+            }
             
             string serverURI = string.Empty;
             bool foreign = GetUserProfileServerURI(target, out serverURI);
-- 
cgit v1.1


From 10572b78f8d726ff07fd37dca4bb4f27f38563cb Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Wed, 5 Jun 2013 15:10:53 -0400
Subject: Remove a couple of orphaned lines

---
 OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 7165cb6..13f0167 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -330,13 +330,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
                 if(!classifiedCache.ContainsKey(cid))
                 {
-//                    lock(classifiedLock)
-//                    {
                     lock(classifiedCache)
                         classifiedCache.Add(cid,creatorId);
                     lock(classifiedInterest)
                         classifiedInterest.Add(cid, 0);
-//                    }
                 }
 
                 lock(classifiedInterest)
-- 
cgit v1.1


From f41fc4eb25ade48a358511564f3911a4605c1c31 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 5 Jun 2013 22:20:48 +0100
Subject: Avoid a deadlock where a script can attempt to take a
 ScriptInstance.m_Scripts lock then a lock on SP.m_attachments whilst
 SP.MakeRootAgent() attempts to take in the opposite order.

This is because scripts (at least on XEngine) start unsuspended - deceptively the ResumeScripts() calls in various places in the code are actually completely redundant (and useless).
The solution chosen here is to use a copy of the SP attachments and not have the list locked whilst creating the scripts when an avatar enters the region.
This looks to address http://opensimulator.org/mantis/view.php?id=6557
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 32 ++++++++++++++++--------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b8ff7f7..bab14dd 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -121,6 +121,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// <remarks>
         /// TODO: For some reason, we effectively have a list both here and in Appearance.  Need to work out if this is
         /// necessary.
+        /// NOTE: To avoid deadlocks, do not lock m_attachments and then perform other tasks under that lock.  Take a copy
+        /// of the list and act on that instead.
         /// </remarks>
         private List<SceneObjectGroup> m_attachments = new List<SceneObjectGroup>();
 
@@ -971,19 +973,27 @@ namespace OpenSim.Region.Framework.Scenes
                 // and CHANGED_REGION) when the attachments have been rezzed in the new region.  This cannot currently
                 // be done in AttachmentsModule.CopyAttachments(AgentData ad, IScenePresence sp) itself since we are
                 // not transporting the required data.
-                lock (m_attachments)
+                //
+                // We must take a copy of the attachments list here (rather than locking) to avoid a deadlock where a script in one of 
+                // the attachments may start processing an event (which locks ScriptInstance.m_Script) that then calls a method here
+                // which needs to lock m_attachments.  ResumeScripts() needs to take a ScriptInstance.m_Script lock to try to unset the Suspend status.
+                //
+                // FIXME: In theory, this deadlock should not arise since scripts should not be processing events until ResumeScripts().
+                // But XEngine starts all scripts unsuspended.  Starting them suspended will not currently work because script rezzing
+                // is placed in an asynchronous queue in XEngine and so the ResumeScripts() call will almost certainly execute before the 
+                // script is rezzed.  This means the ResumeScripts() does absolutely nothing when using XEngine.
+                List<SceneObjectGroup> attachments = GetAttachments();
+
+                if (attachments.Count > 0)
                 {
-                    if (HasAttachments())
-                    {
-                        m_log.DebugFormat(
-                            "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name);
+                    m_log.DebugFormat(
+                        "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name);
 
-                        // Resume scripts
-                        foreach (SceneObjectGroup sog in m_attachments)
-                        {
-                            sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource());
-                            sog.ResumeScripts();
-                        }
+                    // Resume scripts
+                    foreach (SceneObjectGroup sog in attachments)
+                    {
+                        sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource());
+                        sog.ResumeScripts();
                     }
                 }
             }
-- 
cgit v1.1


From cd64da87461937b2a46ff6f5e8250ee9a8d15889 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Wed, 5 Jun 2013 18:41:55 -0400
Subject: Cleanup

---
 OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
index 5a24ee3..f9a520a 100644
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
@@ -106,11 +106,6 @@ namespace OpenSim.Server.Handlers.Profiles
             Server.AddJsonRPCHandler("avatar_properties_update", handler.AvatarPropertiesUpdate);
             Server.AddJsonRPCHandler("avatar_interests_update", handler.AvatarInterestsUpdate);
             Server.AddJsonRPCHandler("image_assets_request", handler.AvatarImageAssetsRequest);
-//            Server.AddJsonRPCHandler("user_preferences_request", handler.UserPreferencesRequest);
-//            Server.AddJsonRPCHandler("user_preferences_update", handler.UserPreferencesUpdate);
-//            Server.AddJsonRPCHandler("user_account_create", handler.UserAccountCreate);
-//            Server.AddJsonRPCHandler("user_account_auth", handler.UserAccountAuth);
-//            Server.AddJsonRPCHandler("user_account_test", handler.UserAccountTest);
             Server.AddJsonRPCHandler("user_data_request", handler.RequestUserAppData);
             Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData);
         }
-- 
cgit v1.1


From e449950030decf7e65e7d9b334ddaed25c1bd629 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Wed, 5 Jun 2013 18:42:15 -0400
Subject: Prevent processing for Npc

---
 OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 13f0167..a97c9b4 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -62,7 +62,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         // count. The entries are removed when the interest count reaches 0.
         Dictionary<UUID,UUID> classifiedCache = new Dictionary<UUID, UUID>();
         Dictionary<UUID,int> classifiedInterest = new Dictionary<UUID, int>();
-        Object classifiedLock;
 
         public Scene Scene
         {
@@ -170,6 +169,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
         void HandleOnMakeRootAgent (ScenePresence obj)
         {
+            if(obj.PresenceType == PresenceType.Npc)
+                return;
+
             GetImageAssets(((IScenePresence)obj).UUID);
         }
 
-- 
cgit v1.1


From a7dbafb0e383ca5043a71284cdc35569acc5e2be Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 5 Jun 2013 23:42:50 +0100
Subject: Port Avination's inventory send throttling

---
 OpenSim/Framework/Util.cs                          | 108 +++++++++
 .../Linden/Caps/WebFetchInvDescModule.cs           | 265 +++++++++++++++++----
 prebuild.xml                                       |   1 +
 3 files changed, 322 insertions(+), 52 deletions(-)

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index ada4e89..7f0850f 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -2233,4 +2233,112 @@ namespace OpenSim.Framework
             return str.Replace("_", "\\_").Replace("%", "\\%");
         }
     }
+
+    public class DoubleQueue<T> where T:class
+    {
+        private Queue<T> m_lowQueue = new Queue<T>();
+        private Queue<T> m_highQueue = new Queue<T>();
+
+        private object m_syncRoot = new object();
+        private Semaphore m_s = new Semaphore(0, 1);
+
+        public DoubleQueue()
+        {
+        }
+
+        public virtual int Count
+        {
+            get { return m_highQueue.Count + m_lowQueue.Count; }
+        }
+
+        public virtual void Enqueue(T data)
+        {
+            Enqueue(m_lowQueue, data);
+        }
+
+        public virtual void EnqueueLow(T data)
+        {
+            Enqueue(m_lowQueue, data);
+        }
+
+        public virtual void EnqueueHigh(T data)
+        {
+            Enqueue(m_highQueue, data);
+        }
+
+        private void Enqueue(Queue<T> q, T data)
+        {
+            lock (m_syncRoot)
+            {
+                m_lowQueue.Enqueue(data);
+                m_s.WaitOne(0);
+                m_s.Release();
+            }
+        }
+
+        public virtual T Dequeue()
+        {
+            return Dequeue(Timeout.Infinite);
+        }
+
+        public virtual T Dequeue(int tmo)
+        {
+            return Dequeue(TimeSpan.FromMilliseconds(tmo));
+        }
+
+        public virtual T Dequeue(TimeSpan wait)
+        {
+            T res = null;
+
+            if (!Dequeue(wait, ref res))
+                return null;
+
+            return res;
+        }
+
+        public bool Dequeue(int timeout, ref T res)
+        {
+            return Dequeue(TimeSpan.FromMilliseconds(timeout), ref res);
+        }
+
+        public bool Dequeue(TimeSpan wait, ref T res)
+        {
+            if (!m_s.WaitOne(wait))
+                return false;
+
+            lock (m_syncRoot)
+            {
+                if (m_highQueue.Count > 0)
+                    res = m_highQueue.Dequeue();
+                else
+                    res = m_lowQueue.Dequeue();
+
+                if (m_highQueue.Count == 0 && m_lowQueue.Count == 0)
+                    return true;
+
+                try
+                {
+                    m_s.Release();
+                }
+                catch
+                {
+                }
+
+                return true;
+            }
+        }
+
+        public virtual void Clear()
+        {
+
+            lock (m_syncRoot)
+            {
+                // Make sure sem count is 0
+                m_s.WaitOne(0);
+
+                m_lowQueue.Clear();
+                m_highQueue.Clear();
+            }
+        }
+    }
 }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 6890f4a..7dd9770 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -27,18 +27,25 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Reflection;
+using System.Threading;
 using log4net;
 using Nini.Config;
 using Mono.Addins;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Monitoring;
+using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Framework.Capabilities;
 using OpenSim.Services.Interfaces;
 using Caps = OpenSim.Framework.Capabilities.Caps;
 using OpenSim.Capabilities.Handlers;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 
 namespace OpenSim.Region.ClientStack.Linden
 {
@@ -48,67 +55,74 @@ namespace OpenSim.Region.ClientStack.Linden
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "WebFetchInvDescModule")]
     public class WebFetchInvDescModule : INonSharedRegionModule
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        class aPollRequest
+        {
+            public PollServiceInventoryEventArgs thepoll;
+            public UUID reqID;
+            public Hashtable request;
+            public ScenePresence presence;
+            public List<UUID> folders;
+        }
+
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private Scene m_scene;
 
         private IInventoryService m_InventoryService;
         private ILibraryService m_LibraryService;
 
-        private bool m_Enabled;
+        private static WebFetchInvDescHandler m_webFetchHandler;
 
-        private string m_fetchInventoryDescendents2Url;
-        private string m_webFetchInventoryDescendentsUrl;
+        private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>();
+        private static Thread[] m_workerThreads = null;
 
-        private WebFetchInvDescHandler m_webFetchHandler;
+        private static DoubleQueue<aPollRequest> m_queue =
+                new DoubleQueue<aPollRequest>();
 
         #region ISharedRegionModule Members
 
         public void Initialise(IConfigSource source)
         {
-            IConfig config = source.Configs["ClientStack.LindenCaps"];
-            if (config == null)
-                return;
-
-            m_fetchInventoryDescendents2Url = config.GetString("Cap_FetchInventoryDescendents2", string.Empty);
-            m_webFetchInventoryDescendentsUrl = config.GetString("Cap_WebFetchInventoryDescendents", string.Empty);
-
-            if (m_fetchInventoryDescendents2Url != string.Empty || m_webFetchInventoryDescendentsUrl != string.Empty)
-            {
-                m_Enabled = true;
-            }
         }
 
         public void AddRegion(Scene s)
         {
-            if (!m_Enabled)
-                return;
-
             m_scene = s;
         }
 
         public void RemoveRegion(Scene s)
         {
-            if (!m_Enabled)
-                return;
-
             m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
+            m_scene.EventManager.OnDeregisterCaps -= DeregisterCaps;
             m_scene = null;
         }
 
         public void RegionLoaded(Scene s)
         {
-            if (!m_Enabled)
-                return;
-
             m_InventoryService = m_scene.InventoryService;
             m_LibraryService = m_scene.LibraryService;
 
             // We'll reuse the same handler for all requests.
-            if (m_fetchInventoryDescendents2Url == "localhost" || m_webFetchInventoryDescendentsUrl == "localhost")
-                m_webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService);
+            m_webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService);
 
             m_scene.EventManager.OnRegisterCaps += RegisterCaps;
+            m_scene.EventManager.OnDeregisterCaps += DeregisterCaps;
+
+            if (m_workerThreads == null)
+            {
+                m_workerThreads = new Thread[2];
+
+                for (uint i = 0; i < 2; i++)
+                {
+                    m_workerThreads[i] = Watchdog.StartThread(DoInventoryRequests,
+                            String.Format("InventoryWorkerThread{0}", i),
+                            ThreadPriority.Normal,
+                            false,
+                            true,
+                            null,
+                            int.MaxValue);
+                }
+            }
         }
 
         public void PostInitialise()
@@ -126,43 +140,190 @@ namespace OpenSim.Region.ClientStack.Linden
 
         #endregion
 
-        private void RegisterCaps(UUID agentID, Caps caps)
+        ~WebFetchInvDescModule()
         {
-            if (m_webFetchInventoryDescendentsUrl != "")
-                RegisterFetchCap(agentID, caps, "WebFetchInventoryDescendents", m_webFetchInventoryDescendentsUrl);
-
-            if (m_fetchInventoryDescendents2Url != "")
-                RegisterFetchCap(agentID, caps, "FetchInventoryDescendents2", m_fetchInventoryDescendents2Url);
+            foreach (Thread t in m_workerThreads)
+                Watchdog.AbortThread(t.ManagedThreadId);               
         }
 
-        private void RegisterFetchCap(UUID agentID, Caps caps, string capName, string url)
+        private class PollServiceInventoryEventArgs : PollServiceEventArgs
         {
-            string capUrl;
+            private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+            private Dictionary<UUID, Hashtable> responses =
+                    new Dictionary<UUID, Hashtable>();
+
+            private Scene m_scene;
 
-            if (url == "localhost")
+            public PollServiceInventoryEventArgs(Scene scene, UUID pId) :
+                    base(null, null, null, null, pId)
             {
-                capUrl = "/CAPS/" + UUID.Random();
+                m_scene = scene;
+
+                HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); };
+                GetEvents = (x, y, z) =>
+                {
+                    lock (responses)
+                    {
+                        try
+                        {
+                            return responses[x];
+                        }
+                        finally
+                        {
+                            responses.Remove(x);
+                        }
+                    }
+                };
+
+                Request = (x, y) =>
+                {
+                    ScenePresence sp = m_scene.GetScenePresence(Id);
+                    if (sp == null)
+                    {
+                        m_log.ErrorFormat("[INVENTORY]: Unable to find ScenePresence for {0}", Id);
+                        return;
+                    }
+
+                    aPollRequest reqinfo = new aPollRequest();
+                    reqinfo.thepoll = this;
+                    reqinfo.reqID = x;
+                    reqinfo.request = y;
+                    reqinfo.presence = sp;
+                    reqinfo.folders = new List<UUID>();
+
+                    // Decode the request here
+                    string request = y["body"].ToString();
+
+                    request = request.Replace("<string>00000000-0000-0000-0000-000000000000</string>", "<uuid>00000000-0000-0000-0000-000000000000</uuid>");
+
+                    request = request.Replace("<key>fetch_folders</key><integer>0</integer>", "<key>fetch_folders</key><boolean>0</boolean>");
+                    request = request.Replace("<key>fetch_folders</key><integer>1</integer>", "<key>fetch_folders</key><boolean>1</boolean>");
+
+                    Hashtable hash = new Hashtable();
+                    try
+                    {
+                        hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request));
+                    }
+                    catch (LLSD.LLSDParseException e)
+                    {
+                        m_log.ErrorFormat("[INVENTORY]: Fetch error: {0}{1}" + e.Message, e.StackTrace);
+                        m_log.Error("Request: " + request);
+                        return;
+                    }
+                    catch (System.Xml.XmlException)
+                    {
+                        m_log.ErrorFormat("[INVENTORY]: XML Format error");
+                    }
+
+                    ArrayList foldersrequested = (ArrayList)hash["folders"];
+
+                    bool highPriority = false;
+
+                    for (int i = 0; i < foldersrequested.Count; i++)
+                    {
+                        Hashtable inventoryhash = (Hashtable)foldersrequested[i];
+                        string folder = inventoryhash["folder_id"].ToString();
+                        UUID folderID;
+                        if (UUID.TryParse(folder, out folderID))
+                        {
+                            if (!reqinfo.folders.Contains(folderID))
+                            {
+                                //TODO: Port COF handling from Avination
+                                reqinfo.folders.Add(folderID);
+                            }
+                        }
+                    }
+
+                    if (highPriority)
+                        m_queue.EnqueueHigh(reqinfo);
+                    else
+                        m_queue.EnqueueLow(reqinfo);
+                };
+
+                NoEvents = (x, y) =>
+                {
+/*
+                    lock (requests)
+                    {
+                        Hashtable request = requests.Find(id => id["RequestID"].ToString() == x.ToString());
+                        requests.Remove(request);
+                    }
+*/
+                    Hashtable response = new Hashtable();
+
+                    response["int_response_code"] = 500;
+                    response["str_response_string"] = "Script timeout";
+                    response["content_type"] = "text/plain";
+                    response["keepalive"] = false;
+                    response["reusecontext"] = false;
+
+                    return response;
+                };
+            }
 
-                IRequestHandler reqHandler
-                    = new RestStreamHandler(
-                        "POST",
-                        capUrl,
-                        m_webFetchHandler.FetchInventoryDescendentsRequest,
-                        "FetchInventoryDescendents2",
-                        agentID.ToString());
+            public void Process(aPollRequest requestinfo)
+            {
+                UUID requestID = requestinfo.reqID;
+
+                Hashtable response = new Hashtable();
+
+                response["int_response_code"] = 200;
+                response["content_type"] = "text/plain";
+                response["keepalive"] = false;
+                response["reusecontext"] = false;
 
-                caps.RegisterHandler(capName, reqHandler);
+                response["str_response_string"] = m_webFetchHandler.FetchInventoryDescendentsRequest(
+                        requestinfo.request["body"].ToString(), String.Empty, String.Empty, null, null);
+
+                lock (responses)
+                    responses[requestID] = response; 
             }
-            else
+        }
+
+        private void RegisterCaps(UUID agentID, Caps caps)
+        {
+            string capUrl = "/CAPS/" + UUID.Random() + "/";
+
+            // Register this as a poll service          
+            PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(m_scene, agentID);
+            
+            MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
+
+            string hostName = m_scene.RegionInfo.ExternalHostName;
+            uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port;
+            string protocol = "http";
+            
+            if (MainServer.Instance.UseSSL)
             {
-                capUrl = url;
+                hostName = MainServer.Instance.SSLCommonName;
+                port = MainServer.Instance.SSLPort;
+                protocol = "https";
+            }
+            caps.RegisterHandler("FetchInventoryDescendents2", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
+
+            m_capsDict[agentID] = capUrl;
+        }
 
-                caps.RegisterHandler(capName, capUrl);
+        private void DeregisterCaps(UUID agentID, Caps caps)
+        {
+            string capUrl;
+
+            if (m_capsDict.TryGetValue(agentID, out capUrl))
+            {
+                MainServer.Instance.RemoveHTTPHandler("", capUrl);
+                m_capsDict.Remove(agentID);
             }
+        }
 
-//            m_log.DebugFormat(
-//                "[WEB FETCH INV DESC MODULE]: Registered capability {0} at {1} in region {2} for {3}",
-//                capName, capUrl, m_scene.RegionInfo.RegionName, agentID);
+        private void DoInventoryRequests()
+        {
+            while (true)
+            {
+                aPollRequest poolreq = m_queue.Dequeue();
+
+                poolreq.thepoll.Process(poolreq);
+            }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/prebuild.xml b/prebuild.xml
index 03cac76..5531558 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1531,6 +1531,7 @@
       <Reference name="OpenSim.Capabilities"/>
       <Reference name="OpenSim.Capabilities.Handlers"/>
       <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Framework.Console"/>
-- 
cgit v1.1


From e1d98c9e4c579c9feb6bcc4e7473e2372f496fdb Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 6 Jun 2013 02:25:19 +0100
Subject: Committing Avination's Keyframe module. This is not hooked up yet and
 will do nothing. More commits to follow.

---
 OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 766 ++++++++++++++++++++++
 1 file changed, 766 insertions(+)
 create mode 100644 OpenSim/Region/Framework/Scenes/KeyframeMotion.cs

diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
new file mode 100644
index 0000000..d773ee7
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -0,0 +1,766 @@
+// Proprietary code of Avination Virtual Limited
+// (c) 2012 Melanie Thielker
+//
+
+using System;
+using System.Timers;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Diagnostics;
+using System.Reflection;
+using System.Threading;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Physics.Manager;
+using OpenSim.Region.Framework.Scenes.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Runtime.Serialization;
+using Timer = System.Timers.Timer;
+using log4net;
+
+namespace OpenSim.Region.Framework.Scenes
+{
+    public class KeyframeTimer
+    {
+        private static Dictionary<Scene, KeyframeTimer>m_timers =
+                new Dictionary<Scene, KeyframeTimer>();
+
+        private Timer m_timer;
+        private Dictionary<KeyframeMotion, object> m_motions = new Dictionary<KeyframeMotion, object>();
+        private object m_lockObject = new object();
+        private object m_timerLock = new object();
+        private const double m_tickDuration = 50.0;
+        private Scene m_scene;
+
+        public double TickDuration
+        {
+            get { return m_tickDuration; }
+        }
+
+        public KeyframeTimer(Scene scene)
+        {
+            m_timer = new Timer();
+            m_timer.Interval = TickDuration;
+            m_timer.AutoReset = true;
+            m_timer.Elapsed += OnTimer;
+
+            m_scene = scene;
+
+            m_timer.Start();
+        }
+
+        private void OnTimer(object sender, ElapsedEventArgs ea)
+        {
+            if (!Monitor.TryEnter(m_timerLock))
+                return;
+
+            try
+            {
+                List<KeyframeMotion> motions;
+
+                lock (m_lockObject)
+                {
+                    motions = new List<KeyframeMotion>(m_motions.Keys);
+                }
+
+                foreach (KeyframeMotion m in motions)
+                {
+                    try
+                    {
+                        m.OnTimer(TickDuration);
+                    }
+                    catch (Exception inner)
+                    {
+                        // Don't stop processing
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                // Keep running no matter what
+            }
+            finally
+            {
+                Monitor.Exit(m_timerLock);
+            }
+        }
+
+        public static void Add(KeyframeMotion motion)
+        {
+            KeyframeTimer timer;
+
+            if (motion.Scene == null)
+                return;
+
+            lock (m_timers)
+            {
+                if (!m_timers.TryGetValue(motion.Scene, out timer))
+                {
+                    timer = new KeyframeTimer(motion.Scene);
+                    m_timers[motion.Scene] = timer;
+                }
+            }
+
+            lock (timer.m_lockObject)
+            {
+                timer.m_motions[motion] = null;
+            }
+        }
+
+        public static void Remove(KeyframeMotion motion)
+        {
+            KeyframeTimer timer;
+
+            if (motion.Scene == null)
+                return;
+
+            lock (m_timers)
+            {
+                if (!m_timers.TryGetValue(motion.Scene, out timer))
+                {
+                    return;
+                }
+            }
+
+            lock (timer.m_lockObject)
+            {
+                timer.m_motions.Remove(motion);
+            }
+        }
+    }
+
+    [Serializable]
+    public class KeyframeMotion
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public enum PlayMode : int
+        {
+            Forward = 0,
+            Reverse = 1,
+            Loop = 2,
+            PingPong = 3
+        };
+
+        [Flags]
+        public enum DataFormat : int
+        {
+            Translation = 2,
+            Rotation = 1
+        }
+
+        [Serializable]
+        public struct Keyframe
+        {
+            public Vector3? Position;
+            public Quaternion? Rotation;
+            public Quaternion StartRotation;
+            public int TimeMS;
+            public int TimeTotal;
+            public Vector3 AngularVelocity;
+        };
+
+        private Vector3 m_serializedPosition;
+        private Vector3 m_basePosition;
+        private Quaternion m_baseRotation;
+
+        private Keyframe m_currentFrame;
+
+        private List<Keyframe> m_frames = new List<Keyframe>();
+
+        private Keyframe[] m_keyframes;
+
+        // skip timer events.
+        //timer.stop doesn't assure there aren't event threads still being fired
+        [NonSerialized()]
+        private bool m_timerStopped;
+
+        [NonSerialized()]
+        private bool m_isCrossing;
+
+        [NonSerialized()]
+        private bool m_waitingCrossing;
+
+        // retry position for cross fail
+        [NonSerialized()]
+        private Vector3 m_nextPosition;
+
+        [NonSerialized()]
+        private SceneObjectGroup m_group;
+
+        private PlayMode m_mode = PlayMode.Forward;
+        private DataFormat m_data = DataFormat.Translation | DataFormat.Rotation;
+
+        private bool m_running = false;
+
+        [NonSerialized()]
+        private bool m_selected = false;
+
+        private int m_iterations = 0;
+
+        private int m_skipLoops = 0;
+
+        [NonSerialized()]
+        private Scene m_scene;
+
+        public Scene Scene
+        {
+            get { return m_scene; }
+        }
+
+        public DataFormat Data
+        {
+            get { return m_data; }
+        }
+
+        public bool Selected
+        {
+            set
+            {
+                if (m_group != null)
+                {
+                    if (!value)
+                    {
+                        // Once we're let go, recompute positions
+                        if (m_selected)
+                            UpdateSceneObject(m_group);
+                    }
+                    else
+                    {
+                        // Save selection position in case we get moved
+                        if (!m_selected)
+                        {
+                            StopTimer();
+                            m_serializedPosition = m_group.AbsolutePosition;
+                        }
+                    }
+                }
+                m_isCrossing = false;
+                m_waitingCrossing = false;
+                m_selected = value;
+            }
+        }
+
+        private void StartTimer()
+        {
+            KeyframeTimer.Add(this);
+            m_timerStopped = false;
+        }
+
+        private void StopTimer()
+        {
+            m_timerStopped = true;
+            KeyframeTimer.Remove(this);
+        }
+
+        public static KeyframeMotion FromData(SceneObjectGroup grp, Byte[] data)
+        {
+            KeyframeMotion newMotion = null;
+
+            try
+            {
+                MemoryStream ms = new MemoryStream(data);
+                BinaryFormatter fmt = new BinaryFormatter();
+
+                newMotion = (KeyframeMotion)fmt.Deserialize(ms);
+
+                newMotion.m_group = grp;
+
+                if (grp != null)
+                {
+                    newMotion.m_scene = grp.Scene;
+                    if (grp.IsSelected)
+                        newMotion.m_selected = true;
+                }
+
+                newMotion.m_timerStopped = false;
+                newMotion.m_running = true;
+                newMotion.m_isCrossing = false;
+                newMotion.m_waitingCrossing = false;
+            }
+            catch
+            {
+                newMotion = null;
+            }
+
+            return newMotion;
+        }
+
+        public void UpdateSceneObject(SceneObjectGroup grp)
+        {
+            m_isCrossing = false;
+            m_waitingCrossing = false;
+            StopTimer();
+
+            if (grp == null)
+                return;
+
+            m_group = grp;
+            m_scene = grp.Scene;
+
+            Vector3 grppos = grp.AbsolutePosition;
+            Vector3 offset = grppos - m_serializedPosition;
+            // avoid doing it more than once
+            // current this will happen draging a prim to other region
+            m_serializedPosition = grppos;
+
+            m_basePosition += offset;
+            m_currentFrame.Position += offset;
+
+            m_nextPosition += offset;
+
+            for (int i = 0; i < m_frames.Count; i++)
+            {
+                Keyframe k = m_frames[i];
+                k.Position += offset;
+                m_frames[i]=k;
+            }
+
+            if (m_running)
+                Start();
+        }
+
+        public KeyframeMotion(SceneObjectGroup grp, PlayMode mode, DataFormat data)
+        {
+            m_mode = mode;
+            m_data = data;
+
+            m_group = grp;
+            if (grp != null)
+            {
+                m_basePosition = grp.AbsolutePosition;
+                m_baseRotation = grp.GroupRotation;
+                m_scene = grp.Scene;
+            }
+
+            m_timerStopped = true;
+            m_isCrossing = false;
+            m_waitingCrossing = false;
+        }
+
+        public void SetKeyframes(Keyframe[] frames)
+        {
+            m_keyframes = frames;
+        }
+
+        public KeyframeMotion Copy(SceneObjectGroup newgrp)
+        {
+            StopTimer();
+
+            KeyframeMotion newmotion = new KeyframeMotion(null, m_mode, m_data);
+
+            newmotion.m_group = newgrp;
+            newmotion.m_scene = newgrp.Scene;
+
+            if (m_keyframes != null)
+            {
+                newmotion.m_keyframes = new Keyframe[m_keyframes.Length];
+                m_keyframes.CopyTo(newmotion.m_keyframes, 0);
+            }
+
+            newmotion.m_frames = new List<Keyframe>(m_frames);
+
+            newmotion.m_basePosition = m_basePosition;
+            newmotion.m_baseRotation = m_baseRotation;
+
+            if (m_selected)
+                newmotion.m_serializedPosition = m_serializedPosition;
+            else
+            {
+                if (m_group != null)
+                    newmotion.m_serializedPosition = m_group.AbsolutePosition;
+                else
+                    newmotion.m_serializedPosition = m_serializedPosition;
+            }
+
+            newmotion.m_currentFrame = m_currentFrame;
+
+            newmotion.m_iterations = m_iterations;
+            newmotion.m_running = m_running;
+
+            if (m_running && !m_waitingCrossing)
+                StartTimer();
+
+            return newmotion;
+        }
+
+        public void Delete()
+        {
+            m_running = false;
+            StopTimer();
+            m_isCrossing = false;
+            m_waitingCrossing = false;
+            m_frames.Clear();
+            m_keyframes = null;
+        }
+
+        public void Start()
+        {
+            m_isCrossing = false;
+            m_waitingCrossing = false;
+            if (m_keyframes != null && m_group != null && m_keyframes.Length > 0)
+            {
+                StartTimer();
+                m_running = true;
+            }
+            else
+            {
+                m_running = false;
+                StopTimer();
+            }
+        }
+
+        public void Stop()
+        {
+            m_running = false;
+            m_isCrossing = false;
+            m_waitingCrossing = false;
+
+            StopTimer();
+
+            m_basePosition = m_group.AbsolutePosition;
+            m_baseRotation = m_group.GroupRotation;
+
+            m_group.RootPart.Velocity = Vector3.Zero;
+            m_group.RootPart.AngularVelocity = Vector3.Zero;
+            m_group.SendGroupRootTerseUpdate();
+//            m_group.RootPart.ScheduleTerseUpdate();
+            m_frames.Clear();
+        }
+
+        public void Pause()
+        {
+            m_running = false;
+            StopTimer();
+
+            m_group.RootPart.Velocity = Vector3.Zero;
+            m_group.RootPart.AngularVelocity = Vector3.Zero;
+            m_group.SendGroupRootTerseUpdate();
+//            m_group.RootPart.ScheduleTerseUpdate();
+
+        }
+
+        private void GetNextList()
+        {
+            m_frames.Clear();
+            Vector3 pos = m_basePosition;
+            Quaternion rot = m_baseRotation;
+
+            if (m_mode == PlayMode.Loop || m_mode == PlayMode.PingPong || m_iterations == 0)
+            {
+                int direction = 1;
+                if (m_mode == PlayMode.Reverse || ((m_mode == PlayMode.PingPong) && ((m_iterations & 1) != 0)))
+                    direction = -1;
+
+                int start = 0;
+                int end = m_keyframes.Length;
+
+                if (direction < 0)
+                {
+                    start = m_keyframes.Length - 1;
+                    end = -1;
+                }
+
+                for (int i = start; i != end ; i += direction)
+                {
+                    Keyframe k = m_keyframes[i];
+
+                    if (k.Position.HasValue)
+                    {
+                        k.Position = (k.Position * direction);
+//                        k.Velocity = (Vector3)k.Position / (k.TimeMS / 1000.0f);
+                        k.Position += pos;
+                    }
+                    else
+                    {
+                        k.Position = pos;
+//                        k.Velocity = Vector3.Zero;
+                    }
+
+                    k.StartRotation = rot;
+                    if (k.Rotation.HasValue)
+                    {
+                        if (direction == -1)
+                            k.Rotation = Quaternion.Conjugate((Quaternion)k.Rotation);
+                        k.Rotation = rot * k.Rotation;
+                    }
+                    else
+                    {
+                        k.Rotation = rot;
+                    }
+
+/* ang vel not in use for now
+
+                    float angle = 0;
+
+                    float aa = k.StartRotation.X * k.StartRotation.X + k.StartRotation.Y * k.StartRotation.Y + k.StartRotation.Z * k.StartRotation.Z + k.StartRotation.W * k.StartRotation.W;
+                    float bb = ((Quaternion)k.Rotation).X * ((Quaternion)k.Rotation).X + ((Quaternion)k.Rotation).Y * ((Quaternion)k.Rotation).Y + ((Quaternion)k.Rotation).Z * ((Quaternion)k.Rotation).Z + ((Quaternion)k.Rotation).W * ((Quaternion)k.Rotation).W;
+                    float aa_bb = aa * bb;
+
+                    if (aa_bb == 0)
+                    {
+                        angle = 0;
+                    }
+                    else
+                    {
+                        float ab = k.StartRotation.X * ((Quaternion)k.Rotation).X +
+                                   k.StartRotation.Y * ((Quaternion)k.Rotation).Y +
+                                   k.StartRotation.Z * ((Quaternion)k.Rotation).Z +
+                                   k.StartRotation.W * ((Quaternion)k.Rotation).W;
+                        float q = (ab * ab) / aa_bb;
+
+                        if (q > 1.0f)
+                        {
+                            angle = 0;
+                        }
+                        else
+                        {
+                            angle = (float)Math.Acos(2 * q - 1);
+                        }
+                    }
+
+                    k.AngularVelocity = (new Vector3(0, 0, 1) * (Quaternion)k.Rotation) * (angle / (k.TimeMS / 1000));
+ */
+                    k.TimeTotal = k.TimeMS;
+
+                    m_frames.Add(k);
+
+                    pos = (Vector3)k.Position;
+                    rot = (Quaternion)k.Rotation;
+                }
+
+                m_basePosition = pos;
+                m_baseRotation = rot;
+
+                m_iterations++;
+            }
+        }
+
+        public void OnTimer(double tickDuration)
+        {
+            if (m_skipLoops > 0)
+            {
+                m_skipLoops--;
+                return;
+            }
+
+            if (m_timerStopped) // trap events still in air even after a timer.stop
+                return;
+
+            if (m_group == null)
+                return;
+
+            bool update = false;
+
+            if (m_selected)
+            {
+                if (m_group.RootPart.Velocity != Vector3.Zero)
+                {
+                    m_group.RootPart.Velocity = Vector3.Zero;
+                    m_group.SendGroupRootTerseUpdate();
+
+                }
+                return;
+            }
+
+            if (m_isCrossing)
+            {
+                // if crossing and timer running then cross failed
+                // wait some time then
+                // retry to set the position that evtually caused the outbound
+                // if still outside region this will call startCrossing below
+                m_isCrossing = false;
+                m_group.AbsolutePosition = m_nextPosition;
+                if (!m_isCrossing)
+                {
+                    StopTimer();
+                    StartTimer();
+                }
+                return;
+            }
+
+            if (m_frames.Count == 0)
+            {
+                GetNextList();
+
+                if (m_frames.Count == 0)
+                {
+                    Stop();
+                    Scene scene = m_group.Scene;
+
+                    IScriptModule[] scriptModules = scene.RequestModuleInterfaces<IScriptModule>();
+                    foreach (IScriptModule m in scriptModules)
+                    {
+                        if (m == null)
+                            continue;
+                        m.PostObjectEvent(m_group.RootPart.UUID, "moving_end", new object[0]);
+                    }
+
+                    return;
+                }
+
+                m_currentFrame = m_frames[0];
+                m_currentFrame.TimeMS += (int)tickDuration;
+
+                //force a update on a keyframe transition
+                update = true;
+            }
+
+            m_currentFrame.TimeMS -= (int)tickDuration;
+
+            // Do the frame processing
+            double steps = (double)m_currentFrame.TimeMS / tickDuration;
+
+            if (steps <= 0.0)
+            {
+                m_group.RootPart.Velocity = Vector3.Zero;
+                m_group.RootPart.AngularVelocity = Vector3.Zero;
+
+                m_nextPosition = (Vector3)m_currentFrame.Position;
+                m_group.AbsolutePosition = m_nextPosition;
+
+                // we are sending imediate updates, no doing force a extra terseUpdate
+                // m_group.UpdateGroupRotationR((Quaternion)m_currentFrame.Rotation);
+
+                m_group.RootPart.RotationOffset = (Quaternion)m_currentFrame.Rotation;
+                m_frames.RemoveAt(0);
+                if (m_frames.Count > 0)
+                    m_currentFrame = m_frames[0];
+
+                update = true;
+            }
+            else
+            {
+                float complete = ((float)m_currentFrame.TimeTotal - (float)m_currentFrame.TimeMS) / (float)m_currentFrame.TimeTotal;
+
+                Vector3 v = (Vector3)m_currentFrame.Position - m_group.AbsolutePosition;
+                Vector3 motionThisFrame = v / (float)steps;
+                v = v * 1000 / m_currentFrame.TimeMS;
+
+                if (Vector3.Mag(motionThisFrame) >= 0.05f)
+                {
+                    // m_group.AbsolutePosition += motionThisFrame;
+                    m_nextPosition = m_group.AbsolutePosition + motionThisFrame;
+                    m_group.AbsolutePosition = m_nextPosition;
+
+                    //m_group.RootPart.Velocity = v;
+                    update = true;
+                }
+
+                if ((Quaternion)m_currentFrame.Rotation != m_group.GroupRotation)
+                {
+                    Quaternion current = m_group.GroupRotation;
+
+                    Quaternion step = Quaternion.Slerp(m_currentFrame.StartRotation, (Quaternion)m_currentFrame.Rotation, complete);
+                    step.Normalize();
+/* use simpler change detection
+* float angle = 0;
+
+                    float aa = current.X * current.X + current.Y * current.Y + current.Z * current.Z + current.W * current.W;
+                    float bb = step.X * step.X + step.Y * step.Y + step.Z * step.Z + step.W * step.W;
+                    float aa_bb = aa * bb;
+
+                    if (aa_bb == 0)
+                    {
+                        angle = 0;
+                    }
+                    else
+                    {
+                        float ab = current.X * step.X +
+                                   current.Y * step.Y +
+                                   current.Z * step.Z +
+                                   current.W * step.W;
+                        float q = (ab * ab) / aa_bb;
+
+                        if (q > 1.0f)
+                        {
+                            angle = 0;
+                        }
+                        else
+                        {
+                            angle = (float)Math.Acos(2 * q - 1);
+                        }
+                    }
+
+                    if (angle > 0.01f)
+*/
+                    if(Math.Abs(step.X - current.X) > 0.001f 
+                        || Math.Abs(step.Y - current.Y) > 0.001f 
+                        || Math.Abs(step.Z - current.Z) > 0.001f)
+                        // assuming w is a dependente var
+
+                    {
+//                                m_group.UpdateGroupRotationR(step);
+                        m_group.RootPart.RotationOffset = step;
+
+                        //m_group.RootPart.UpdateAngularVelocity(m_currentFrame.AngularVelocity / 2);
+                        update = true;
+                    }
+                }
+            }
+
+            if (update)
+            {
+                m_group.SendGroupRootTerseUpdate();
+            }
+        }
+
+        public Byte[] Serialize()
+        {
+            StopTimer();
+            MemoryStream ms = new MemoryStream();
+
+            BinaryFormatter fmt = new BinaryFormatter();
+            SceneObjectGroup tmp = m_group;
+            m_group = null;
+            if (!m_selected && tmp != null)
+                m_serializedPosition = tmp.AbsolutePosition;
+            fmt.Serialize(ms, this);
+            m_group = tmp;
+            if (m_running && !m_waitingCrossing)
+                StartTimer();
+
+            return ms.ToArray();
+        }
+
+        public void StartCrossingCheck()
+        {
+            // timer will be restart by crossingFailure
+            // or never since crossing worked and this 
+            // should be deleted
+            StopTimer();
+           
+            m_isCrossing = true;
+            m_waitingCrossing = true;
+
+            // to remove / retune to smoth crossings
+            if (m_group.RootPart.Velocity != Vector3.Zero)
+            {
+                m_group.RootPart.Velocity = Vector3.Zero;
+                m_group.SendGroupRootTerseUpdate();
+//                m_group.RootPart.ScheduleTerseUpdate();
+            }
+        }
+
+        public void CrossingFailure()
+        {
+            m_waitingCrossing = false;
+
+            if (m_group != null)
+            {
+                m_group.RootPart.Velocity = Vector3.Zero;
+                m_group.SendGroupRootTerseUpdate();
+//                m_group.RootPart.ScheduleTerseUpdate();
+
+                if (m_running)
+                {
+                    StopTimer();
+                    m_skipLoops = 1200; // 60 seconds
+                    StartTimer();
+                }
+            }
+        }
+    }
+}
-- 
cgit v1.1


From 81ad9255b5f44d988bf37cfaf6dc59b05fd744b7 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 6 Jun 2013 03:03:05 +0100
Subject: Hook up Keyframe motion to almost everything. Failing to cross a sim
 border may yield unexpected results in some cases. No database persistence
 yet,

---
 .../EntityTransfer/EntityTransferModule.cs         |   3 +
 .../InventoryAccess/InventoryAccessModule.cs       |   3 +
 OpenSim/Region/Framework/Scenes/Scene.cs           |   9 ++
 OpenSim/Region/Framework/Scenes/SceneGraph.cs      |  11 ++
 .../Region/Framework/Scenes/SceneObjectGroup.cs    |  13 ++
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs |  15 +++
 .../Scenes/Serialization/SceneObjectSerializer.cs  |  16 +++
 .../Shared/Api/Implementation/LSL_Api.cs           | 140 +++++++++++++++++++++
 .../ScriptEngine/Shared/Api/Interface/ILSL_Api.cs  |   1 +
 .../Shared/Api/Runtime/LSL_Constants.cs            |  13 ++
 .../ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs    |   5 +
 11 files changed, 229 insertions(+)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index f58a24f..85d26f3 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -2247,6 +2247,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 // move out of the region creating an infinite loop of failed attempts to cross
                 grp.UpdatePrimFlags(grp.RootPart.LocalId,false,grp.IsTemporary,grp.IsPhantom,false);
 
+                if (grp.RootPart.KeyframeMotion != null)
+                    grp.RootPart.KeyframeMotion.CrossingFailure();
+
                 grp.ScheduleGroupForFullUpdate();
             }
         }
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index e6d6cbf..880205a 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -357,6 +357,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
             foreach (SceneObjectGroup objectGroup in objlist)
             {
+                if (objectGroup.RootPart.KeyframeMotion != null)
+                    objectGroup.RootPart.KeyframeMotion.Stop();
+                objectGroup.RootPart.KeyframeMotion = null;
 //                Vector3 inventoryStoredPosition = new Vector3
 //                            (((objectGroup.AbsolutePosition.X > (int)Constants.RegionSize)
 //                                  ? 250
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0743ce7..a9f8a85 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2364,6 +2364,12 @@ namespace OpenSim.Region.Framework.Scenes
 
             foreach (SceneObjectPart part in partList)
             {
+                if (part.KeyframeMotion != null)
+                {
+                    part.KeyframeMotion.Delete();
+                    part.KeyframeMotion = null;
+                }
+
                 if (part.IsJoint() && ((part.Flags & PrimFlags.Physics) != 0))
                 {
                     PhysicsScene.RequestJointDeletion(part.Name); // FIXME: what if the name changed?
@@ -2705,6 +2711,9 @@ namespace OpenSim.Region.Framework.Scenes
                 // before we restart the scripts, or else some functions won't work.
                 newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject));
                 newObject.ResumeScripts();
+
+                if (newObject.RootPart.KeyframeMotion != null)
+                    newObject.RootPart.KeyframeMotion.UpdateSceneObject(newObject);
             }
 
             // Do this as late as possible so that listeners have full access to the incoming object
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index a84f6d3..bb7ae7f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1645,6 +1645,12 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="childPrims"></param>
         protected internal void LinkObjects(SceneObjectPart root, List<SceneObjectPart> children)
         {
+            if (root.KeyframeMotion != null)
+            {
+                root.KeyframeMotion.Stop();
+                root.KeyframeMotion = null;
+            }
+
             SceneObjectGroup parentGroup = root.ParentGroup;
             if (parentGroup == null) return;
 
@@ -1722,6 +1728,11 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     if (part != null)
                     {
+                        if (part.KeyframeMotion != null)
+                        {
+                            part.KeyframeMotion.Stop();
+                            part.KeyframeMotion = null;
+                        }
                         if (part.ParentGroup.PrimCount != 1) // Skip single
                         {
                             if (part.LinkNum < 2) // Root
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index df23cc5..da80e4f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -455,6 +455,9 @@ namespace OpenSim.Region.Framework.Scenes
                             || Scene.TestBorderCross(val, Cardinals.S))
                         && !IsAttachmentCheckFull() && (!Scene.LoadingPrims))
                     {
+                        if (m_rootPart.KeyframeMotion != null)
+                            m_rootPart.KeyframeMotion.StartCrossingCheck();
+
                         m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
                     }
                 }
@@ -578,6 +581,8 @@ namespace OpenSim.Region.Framework.Scenes
                             childPa.Selected = value;
                     }
                 }
+                if (RootPart.KeyframeMotion != null)
+                    RootPart.KeyframeMotion.Selected = value;
             }
         }
 
@@ -1551,6 +1556,8 @@ namespace OpenSim.Region.Framework.Scenes
     
                     newPart.DoPhysicsPropertyUpdate(originalPartPa.IsPhysical, true);
                 }
+                if (part.KeyframeMotion != null)
+                    newPart.KeyframeMotion = part.KeyframeMotion.Copy(dupe);
             }
             
             if (userExposed)
@@ -1578,6 +1585,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void ScriptSetPhysicsStatus(bool usePhysics)
         {
+            if (usePhysics)
+            {
+                if (RootPart.KeyframeMotion != null)
+                    RootPart.KeyframeMotion.Stop();
+                RootPart.KeyframeMotion = null;
+            }
             UpdatePrimFlags(RootPart.LocalId, usePhysics, IsTemporary, IsPhantom, IsVolumeDetect);
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ea8c3c5..ff3f738 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -354,6 +354,13 @@ namespace OpenSim.Region.Framework.Scenes
         private UUID m_collisionSound;
         private float m_collisionSoundVolume;
 
+        private KeyframeMotion m_keyframeMotion = null;
+
+        public KeyframeMotion KeyframeMotion
+        {
+            get; set;
+        }
+
         #endregion Fields
 
 //        ~SceneObjectPart()
@@ -1799,6 +1806,8 @@ namespace OpenSim.Region.Framework.Scenes
             Array.Copy(Shape.ExtraParams, extraP, extraP.Length);
             dupe.Shape.ExtraParams = extraP;
 
+            // safeguard  actual copy is done in sog.copy
+            dupe.KeyframeMotion = null;
             dupe.PayPrice = (int[])PayPrice.Clone();
 
             dupe.DynAttrs.CopyFrom(DynAttrs);
@@ -2001,6 +2010,9 @@ namespace OpenSim.Region.Framework.Scenes
                         {
                             if (UsePhysics)
                             {
+                                if (ParentGroup.RootPart.KeyframeMotion != null)
+                                    ParentGroup.RootPart.KeyframeMotion.Stop();
+                                ParentGroup.RootPart.KeyframeMotion = null;
                                 ParentGroup.Scene.AddPhysicalPrim(1);
 
                                 pa.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate;
@@ -4327,6 +4339,9 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (isPhysical)
                 {
+                    if (ParentGroup.RootPart.KeyframeMotion != null)
+                        ParentGroup.RootPart.KeyframeMotion.Stop();
+                    ParentGroup.RootPart.KeyframeMotion = null;
                     ParentGroup.Scene.AddPhysicalPrim(1);
 
                     pa.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate;
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 39420a6..3882b45 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -262,6 +262,12 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     sr.Close();
                 }
 
+                XmlNodeList keymotion = doc.GetElementsByTagName("KeyframeMotion");
+                if (keymotion.Count > 0)
+                    sceneObject.RootPart.KeyframeMotion = KeyframeMotion.FromData(sceneObject, Convert.FromBase64String(keymotion[0].InnerText));
+                else
+                    sceneObject.RootPart.KeyframeMotion = null;
+
                 // Script state may, or may not, exist. Not having any, is NOT
                 // ever a problem.
                 sceneObject.LoadScriptState(doc);
@@ -1182,6 +1188,16 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             });
 
             writer.WriteEndElement();
+
+            if (sog.RootPart.KeyframeMotion != null)
+            {
+                Byte[] data = sog.RootPart.KeyframeMotion.Serialize();
+
+                writer.WriteStartElement(String.Empty, "KeyframeMotion", String.Empty);
+                writer.WriteBase64(data, 0, data.Length);
+                writer.WriteEndElement();
+            }
+
             writer.WriteEndElement();
         }
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 0b4b043..cd6092d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7296,6 +7296,146 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
+        public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
+        {
+            SceneObjectGroup group = m_host.ParentGroup;
+
+            if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical)
+                return;
+            if (group.IsAttachment)
+                return;
+
+            if (frames.Data.Length > 0) // We are getting a new motion
+            {
+                if (group.RootPart.KeyframeMotion != null)
+                    group.RootPart.KeyframeMotion.Delete();
+                group.RootPart.KeyframeMotion = null;
+
+                int idx = 0;
+
+                KeyframeMotion.PlayMode mode = KeyframeMotion.PlayMode.Forward;
+                KeyframeMotion.DataFormat data = KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation;
+
+                while (idx < options.Data.Length)
+                {
+                    int option = (int)options.GetLSLIntegerItem(idx++);
+                    int remain = options.Data.Length - idx;
+
+                    switch (option)
+                    {
+                        case ScriptBaseClass.KFM_MODE:
+                            if (remain < 1)
+                                break;
+                            int modeval = (int)options.GetLSLIntegerItem(idx++);
+                            switch(modeval)
+                            {
+                                case ScriptBaseClass.KFM_FORWARD:
+                                    mode = KeyframeMotion.PlayMode.Forward;
+                                    break;
+                                case ScriptBaseClass.KFM_REVERSE:
+                                    mode = KeyframeMotion.PlayMode.Reverse;
+                                    break;
+                                case ScriptBaseClass.KFM_LOOP:
+                                    mode = KeyframeMotion.PlayMode.Loop;
+                                    break;
+                                case ScriptBaseClass.KFM_PING_PONG:
+                                    mode = KeyframeMotion.PlayMode.PingPong;
+                                    break;
+                            }
+                            break;
+                        case ScriptBaseClass.KFM_DATA:
+                            if (remain < 1)
+                                break;
+                            int dataval = (int)options.GetLSLIntegerItem(idx++);
+                            data = (KeyframeMotion.DataFormat)dataval;
+                            break;
+                    }
+                }
+
+                group.RootPart.KeyframeMotion = new KeyframeMotion(group, mode, data);
+
+                idx = 0;
+
+                int elemLength = 2;
+                if (data == (KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation))
+                    elemLength = 3;
+
+                List<KeyframeMotion.Keyframe> keyframes = new List<KeyframeMotion.Keyframe>();
+                while (idx < frames.Data.Length)
+                {
+                    int remain = frames.Data.Length - idx;
+
+                    if (remain < elemLength)
+                        break;
+
+                    KeyframeMotion.Keyframe frame = new KeyframeMotion.Keyframe();
+                    frame.Position = null;
+                    frame.Rotation = null;
+
+                    if ((data & KeyframeMotion.DataFormat.Translation) != 0)
+                    {
+                        LSL_Types.Vector3 tempv = frames.GetVector3Item(idx++);
+                        frame.Position = new Vector3((float)tempv.x, (float)tempv.y, (float)tempv.z);
+                    }
+                    if ((data & KeyframeMotion.DataFormat.Rotation) != 0)
+                    {
+                        LSL_Types.Quaternion tempq = frames.GetQuaternionItem(idx++);
+                        Quaternion q = new Quaternion((float)tempq.x, (float)tempq.y, (float)tempq.z, (float)tempq.s);
+                        q.Normalize();
+                        frame.Rotation = q;
+                    }
+
+                    float tempf = (float)frames.GetLSLFloatItem(idx++);
+                    frame.TimeMS = (int)(tempf * 1000.0f);
+
+                    keyframes.Add(frame);
+                }
+
+                group.RootPart.KeyframeMotion.SetKeyframes(keyframes.ToArray());
+                group.RootPart.KeyframeMotion.Start();
+            }
+            else
+            {
+                if (group.RootPart.KeyframeMotion == null)
+                    return;
+
+                if (options.Data.Length == 0)
+                {
+                    group.RootPart.KeyframeMotion.Stop();
+                    return;
+                }
+
+                int code = (int)options.GetLSLIntegerItem(0);
+
+                int idx = 0;
+
+                while (idx < options.Data.Length)
+                {
+                    int option = (int)options.GetLSLIntegerItem(idx++);
+                    int remain = options.Data.Length - idx;
+
+                    switch (option)
+                    {
+                        case ScriptBaseClass.KFM_COMMAND:
+                            int cmd = (int)options.GetLSLIntegerItem(idx++);
+                            switch (cmd)
+                            {
+                                case ScriptBaseClass.KFM_CMD_PLAY:
+                                    group.RootPart.KeyframeMotion.Start();
+                                    break;
+                                case ScriptBaseClass.KFM_CMD_STOP:
+                                    group.RootPart.KeyframeMotion.Stop();
+                                    break;
+                                case ScriptBaseClass.KFM_CMD_PAUSE:
+                                    group.RootPart.KeyframeMotion.Pause();
+                                    break;
+                            }
+                            break;
+                    }
+                }
+            }
+        }
+
         protected LSL_List SetPrimParams(SceneObjectPart part, LSL_List rules, string originFunc, ref uint rulesParsed)
         {
             int idx = 0;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 4ac179a..a6ea88c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -427,6 +427,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
               void print(string str);
 
               void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules, string originFunc);
+              void llSetKeyframedMotion(LSL_List frames, LSL_List options);
           LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index dc5ef13..559068d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -748,6 +748,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public static readonly LSLInteger RCERR_SIM_PERF_LOW = -2;
         public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = 3;
 
+        public const int KFM_MODE = 1;
+        public const int KFM_LOOP = 1;
+        public const int KFM_REVERSE = 3;
+        public const int KFM_FORWARD = 0;
+        public const int KFM_PING_PONG = 2;
+        public const int KFM_DATA = 2;
+        public const int KFM_TRANSLATION = 2;
+        public const int KFM_ROTATION = 1;
+        public const int KFM_COMMAND = 0;
+        public const int KFM_CMD_PLAY = 0;
+        public const int KFM_CMD_STOP = 1;
+        public const int KFM_CMD_PAUSE = 2;
+
         /// <summary>
         /// process name parameter as regex
         /// </summary>
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index c7a7cf6..398c125 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -554,6 +554,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_LSL_Functions.llGetLinkNumberOfSides(link);
         }
 
+        public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
+        {
+            m_LSL_Functions.llSetKeyframedMotion(frames, options);
+        }
+
         public LSL_Integer llGetListEntryType(LSL_List src, int index)
         {
             return m_LSL_Functions.llGetListEntryType(src, index);
-- 
cgit v1.1


From a3210d1cf812554b53afb407fd76dbb67ce2ac28 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 6 Jun 2013 03:17:38 +0100
Subject: Database persistence for keyframes. Contains a Migration.

---
 OpenSim/Data/MySQL/MySQLSimulationData.cs          | 29 +++++++++++++++++++---
 .../Data/MySQL/Resources/RegionStore.migrations    |  7 ++++++
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 2d20eaf..448962a 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -173,9 +173,9 @@ namespace OpenSim.Data.MySQL
                                     "ParticleSystem, ClickAction, Material, " +
                                     "CollisionSound, CollisionSoundVolume, " +
                                     "PassTouches, " +
-                                    "LinkNumber, MediaURL, DynAttrs, " +
+                                    "LinkNumber, MediaURL, KeyframeMotion, " +
                                     "PhysicsShapeType, Density, GravityModifier, " +
-                                    "Friction, Restitution " +
+                                    "Friction, Restitution, DynAttrs " +
                                     ") values (" + "?UUID, " +
                                     "?CreationDate, ?Name, ?Text, " +
                                     "?Description, ?SitName, ?TouchName, " +
@@ -208,9 +208,9 @@ namespace OpenSim.Data.MySQL
                                     "?ColorB, ?ColorA, ?ParticleSystem, " +
                                     "?ClickAction, ?Material, ?CollisionSound, " +
                                     "?CollisionSoundVolume, ?PassTouches, " +
-                                    "?LinkNumber, ?MediaURL, ?DynAttrs, " +
+                                    "?LinkNumber, ?MediaURL, ?KeyframeMotion, " +
                                     "?PhysicsShapeType, ?Density, ?GravityModifier, " +
-                                    "?Friction, ?Restitution)";
+                                    "?Friction, ?Restitution, ?DynAttrs)";
 
                             FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
 
@@ -455,7 +455,11 @@ namespace OpenSim.Data.MySQL
             foreach (SceneObjectPart prim in prims.Values)
             {
                 if (prim.ParentUUID == UUID.Zero)
+                {
                     objects[prim.UUID] = new SceneObjectGroup(prim);
+                    if (prim.KeyframeMotion != null)
+                        prim.KeyframeMotion.UpdateSceneObject(objects[prim.UUID]);
+                }
             }
 
             // Add all of the children objects to the SOGs
@@ -1307,6 +1311,19 @@ namespace OpenSim.Data.MySQL
             else
                 prim.DynAttrs = new DAMap();        
 
+            if (!(row["KeyframeMotion"] is DBNull))
+            {
+                Byte[] data = (byte[])row["KeyframeMotion"];
+                if (data.Length > 0)
+                    prim.KeyframeMotion = KeyframeMotion.FromData(null, data);
+                else
+                    prim.KeyframeMotion = null;
+            }
+            else
+            {
+                prim.KeyframeMotion = null;
+            }
+
             prim.PhysicsShapeType = (byte)Convert.ToInt32(row["PhysicsShapeType"].ToString());
             prim.Density = (float)(double)row["Density"];
             prim.GravityModifier = (float)(double)row["GravityModifier"];
@@ -1659,6 +1676,10 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum);
             cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl);
 
+            if (prim.KeyframeMotion != null)
+                cmd.Parameters.AddWithValue("KeyframeMotion", prim.KeyframeMotion.Serialize());
+            else
+                cmd.Parameters.AddWithValue("KeyframeMotion", new Byte[0]);
 
             if (prim.DynAttrs.Count > 0)
                 cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml());
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index 513c784..70b9558 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -923,3 +923,10 @@ ALTER TABLE prims ADD COLUMN `Restitution` double NOT NULL default '0.5';
 
 COMMIT;
 
+:VERSION 48       #---------------- Keyframes
+
+BEGIN;
+
+ALTER TABLE prims ADD COLUMN `KeyframeMotion` blob;
+
+COMMIT;
-- 
cgit v1.1


From 2ebf70d719e1db2062a9a55bd1037e43c089276e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 5 Jun 2013 20:19:59 -0700
Subject: Strengthen some assumptions.

---
 .../CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs  | 5 +++++
 1 file changed, 5 insertions(+)

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();
-- 
cgit v1.1


From 06012f86753b1d2d688980fae06ad27cea147ddb Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 6 Jun 2013 23:49:02 +0100
Subject: Fix keyframe motion copyright

---
 OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 29 ++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index d773ee7..8a40278 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;
-- 
cgit v1.1


From 664c6191edbbff2a88fccc2c9755c7fa0938dad3 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 7 Jun 2013 08:37:18 -0700
Subject: Mantis #6620 (removed debug message)

---
 OpenSim/Addons/Groups/GroupsModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index f805d69..5b3b9f6 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -347,7 +347,7 @@ namespace OpenSim.Groups
         {
             if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            m_log.DebugFormat("[Groups]: IM From {0} to {1} msg {2} type {3}", im.fromAgentID, im.toAgentID, im.message, (InstantMessageDialog)im.dialog);
+            //m_log.DebugFormat("[Groups]: IM From {0} to {1} msg {2} type {3}", im.fromAgentID, im.toAgentID, im.message, (InstantMessageDialog)im.dialog);
             // Group invitations
             if ((im.dialog == (byte)InstantMessageDialog.GroupInvitationAccept) || (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline))
             {
-- 
cgit v1.1


From 045c26f6265ff4e66f07280da555e10a0dc9e2fa Mon Sep 17 00:00:00 2001
From: Donnie Roberts
Date: Wed, 5 Jun 2013 19:55:18 -0400
Subject: In LocalFriendshipTerminated, send the original client's agentId to
 the friend being removed instead of the friend's own id.

---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs         | 6 +++---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 4613344..41ea2a2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -685,7 +685,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 +827,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..08196f1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
@@ -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();
-- 
cgit v1.1


From f2a4d9b99cfefac622cc3d499cbdc757c4bff527 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 7 Jun 2013 19:13:24 +0100
Subject: Fix regression where multiple close agents could be sent to the wrong
 neighbour region on root agent close.

This was introduced in git master d214e2d0 (Thu May 16 17:12:02 2013)
Caught out by the fact that value types used in iterators act like references and this was dispatched asynchronously.
Should address http://opensimulator.org/mantis/view.php?id=6658
---
 OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 8c84c98..8238e23 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -222,7 +222,12 @@ namespace OpenSim.Region.Framework.Scenes
         public void SendCloseChildAgentConnections(UUID agentID, List<ulong> regionslst)
         {
             foreach (ulong handle in regionslst)
-                Util.FireAndForget(delegate { SendCloseChildAgent(agentID, handle); });
+            {
+                // We must take a copy here since handle is acts like a reference when used in an iterator.
+                // This leads to race conditions if directly passed to SendCloseChildAgent with more than one neighbour region.
+                ulong handleCopy = handle;
+                Util.FireAndForget((o) => { SendCloseChildAgent(agentID, handleCopy); });
+            }
         }
        
         public List<GridRegion> RequestNamedRegions(string name, int maxNumber)
-- 
cgit v1.1


From 346eda27ccffd3890509360697f7e2737ac022fb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 7 Jun 2013 19:26:09 +0100
Subject: minor: add dr0berts to contributors list

---
 CONTRIBUTORS.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 36b17be..7601a50 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -75,11 +75,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
-- 
cgit v1.1


From 454499ff60bf45f77f6f25e9164fcbbfff967bba Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 7 Jun 2013 23:38:23 +0100
Subject: minor: Comment out debug logging (at warn level) about number of
 objects force selected and turn down to debug level

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index e47397d..9784d15 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4828,7 +4828,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;
-- 
cgit v1.1


From 7c0bfca7a03584dd65c5659f177b434ee94ddc9d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 7 Jun 2013 23:43:45 +0100
Subject: Adding Avination's PollService to round out the HTTP inventory
 changes

---
 OpenSim/Framework/Console/RemoteConsole.cs         |   4 +-
 .../Framework/Servers/HttpServer/BaseHttpServer.cs |   3 +-
 .../Servers/HttpServer/PollServiceEventArgs.cs     |  19 +-
 .../HttpServer/PollServiceRequestManager.cs        | 248 ++++++++++++++++-----
 .../Servers/HttpServer/PollServiceWorkerThread.cs  | 165 --------------
 .../Linden/Caps/EventQueue/EventQueueGetModule.cs  |   4 +-
 .../Linden/Caps/WebFetchInvDescModule.cs           |   4 +-
 .../CoreModules/Scripting/LSLHttp/UrlModule.cs     |   8 +-
 prebuild.xml                                       |   1 +
 9 files changed, 220 insertions(+), 236 deletions(-)
 delete mode 100644 OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs

diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index 27edd4b..3e3c2b3 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -234,7 +234,7 @@ namespace OpenSim.Framework.Console
             string uri = "/ReadResponses/" + sessionID.ToString() + "/";
 
             m_Server.AddPollServiceHTTPHandler(
-                uri, new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, sessionID));
+                uri, new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, sessionID,25000)); // 25 secs timeout
 
             XmlDocument xmldoc = new XmlDocument();
             XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
@@ -425,7 +425,7 @@ namespace OpenSim.Framework.Console
             return false;
         }
 
-        private Hashtable GetEvents(UUID RequestID, UUID sessionID, string request)
+        private Hashtable GetEvents(UUID RequestID, UUID sessionID)
         {
             ConsoleConnection c = null;
 
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 96a030b..eb7c578 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1805,7 +1805,6 @@ namespace OpenSim.Framework.Servers.HttpServer
 
                 // Long Poll Service Manager with 3 worker threads a 25 second timeout for no events
                 m_PollServiceManager = new PollServiceRequestManager(this, 3, 25000);
-                m_PollServiceManager.Start();
                 HTTPDRunning = true;
 
                 //HttpListenerContext context;
@@ -1856,7 +1855,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             HTTPDRunning = false;
             try
             {
-                m_PollServiceManager.Stop();
+//                m_PollServiceManager.Stop();
 
                 m_httpListener2.ExceptionThrown -= httpServerException;
                 //m_httpListener2.DisconnectHandler = null;
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index 3089351..c19ac32 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Framework.Servers.HttpServer
     public delegate void RequestMethod(UUID requestID, Hashtable request);
     public delegate bool HasEventsMethod(UUID requestID, UUID pId);
 
-    public delegate Hashtable GetEventsMethod(UUID requestID, UUID pId, string request);
+    public delegate Hashtable GetEventsMethod(UUID requestID, UUID pId);
 
     public delegate Hashtable NoEventsMethod(UUID requestID, UUID pId);
 
@@ -45,17 +45,30 @@ namespace OpenSim.Framework.Servers.HttpServer
         public NoEventsMethod NoEvents;
         public RequestMethod Request;
         public UUID Id;
+        public int TimeOutms;
+        public EventType Type;    
+
+        public enum EventType : int
+        {
+            Normal = 0,
+            LslHttp = 1,
+            Inventory = 2,
+            Texture = 3, 
+            Mesh = 4
+        }
 
         public PollServiceEventArgs(
             RequestMethod pRequest,
             HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents,
-            UUID pId)
+            UUID pId, int pTimeOutms)
         {
             Request = pRequest;
             HasEvents = pHasEvents;
             GetEvents = pGetEvents;
             NoEvents = pNoEvents;
             Id = pId;
+            TimeOutms = pTimeOutms;
+            Type = EventType.Normal;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 3e84c55..a5380c1 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -33,53 +33,56 @@ using log4net;
 using HttpServer;
 using OpenSim.Framework;
 using OpenSim.Framework.Monitoring;
+using Amib.Threading;
+using System.IO;
+using System.Text;
+using System.Collections.Generic;
 
 namespace OpenSim.Framework.Servers.HttpServer
 {
     public class PollServiceRequestManager
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private readonly BaseHttpServer m_server;
-        private static Queue m_requests = Queue.Synchronized(new Queue());
+
+        private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>();
+        private static Queue<PollServiceHttpRequest> m_slowRequests = new Queue<PollServiceHttpRequest>();
+        private static Queue<PollServiceHttpRequest> m_retryRequests = new Queue<PollServiceHttpRequest>();
+
         private uint m_WorkerThreadCount = 0;
         private Thread[] m_workerThreads;
-        private PollServiceWorkerThread[] m_PollServiceWorkerThreads;
-        private volatile bool m_running = true;
-        private int m_pollTimeout;
+        private Thread m_retrysThread;
+
+        private bool m_running = true;
+        private int slowCount = 0;
+
+        private SmartThreadPool m_threadPool = new SmartThreadPool(20000, 12, 2);
+
+//        private int m_timeout = 1000;   //  increase timeout 250; now use the event one
 
         public PollServiceRequestManager(BaseHttpServer pSrv, uint pWorkerThreadCount, int pTimeout)
         {
             m_server = pSrv;
             m_WorkerThreadCount = pWorkerThreadCount;
-            m_pollTimeout = pTimeout;
-        }
-
-        public void Start()
-        {
-            m_running = true;
             m_workerThreads = new Thread[m_WorkerThreadCount];
-            m_PollServiceWorkerThreads = new PollServiceWorkerThread[m_WorkerThreadCount];
 
             //startup worker threads
             for (uint i = 0; i < m_WorkerThreadCount; i++)
             {
-                m_PollServiceWorkerThreads[i] = new PollServiceWorkerThread(m_server, m_pollTimeout);
-                m_PollServiceWorkerThreads[i].ReQueue += ReQueueEvent;
-
                 m_workerThreads[i]
                     = Watchdog.StartThread(
-                        m_PollServiceWorkerThreads[i].ThreadStart,
+                        PoolWorkerJob,
                         String.Format("PollServiceWorkerThread{0}", i),
                         ThreadPriority.Normal,
                         false,
-                        true,
+                        false,
                         null,
                         int.MaxValue);
             }
 
-            Watchdog.StartThread(
-                this.ThreadStart,
+            m_retrysThread = Watchdog.StartThread(
+                this.CheckRetries,
                 "PollServiceWatcherThread",
                 ThreadPriority.Normal,
                 false,
@@ -88,78 +91,211 @@ namespace OpenSim.Framework.Servers.HttpServer
                 1000 * 60 * 10);
         }
 
-        internal void ReQueueEvent(PollServiceHttpRequest req)
+
+        private void ReQueueEvent(PollServiceHttpRequest req)
         {
-            // Do accounting stuff here
-            Enqueue(req);
+            if (m_running)
+            {
+                lock (m_retryRequests)
+                    m_retryRequests.Enqueue(req);
+            }
         }
 
         public void Enqueue(PollServiceHttpRequest req)
         {
-            lock (m_requests)
-                m_requests.Enqueue(req);
+            if (m_running)
+            {
+                if (req.PollServiceArgs.Type != PollServiceEventArgs.EventType.Normal)
+                {
+                    m_requests.Enqueue(req);
+                }
+                else
+                {
+                    lock (m_slowRequests)
+                        m_slowRequests.Enqueue(req);
+                }
+            }
         }
 
-        public void ThreadStart()
+        private void CheckRetries()
         {
             while (m_running)
             {
+                Thread.Sleep(100); // let the world move  .. back to faster rate
                 Watchdog.UpdateThread();
-                ProcessQueuedRequests();
-                Thread.Sleep(1000);
+                lock (m_retryRequests)
+                {
+                    while (m_retryRequests.Count > 0 && m_running)
+                        m_requests.Enqueue(m_retryRequests.Dequeue());
+                }
+                slowCount++;
+                if (slowCount >= 10)
+                {
+                    slowCount = 0;
+
+                    lock (m_slowRequests)
+                    {
+                        while (m_slowRequests.Count > 0 && m_running)
+                            m_requests.Enqueue(m_slowRequests.Dequeue());
+                    }
+                }
             }
         }
 
-        private void ProcessQueuedRequests()
+        ~PollServiceRequestManager()
         {
-            lock (m_requests)
+            m_running = false;
+//            m_timeout = -10000; // cause all to expire
+            Thread.Sleep(1000); // let the world move
+
+            foreach (Thread t in m_workerThreads)
+                    Watchdog.AbortThread(t.ManagedThreadId);
+
+            try
+            {
+                foreach (PollServiceHttpRequest req in m_retryRequests)
+                {
+                   DoHTTPGruntWork(m_server,req,
+                        req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
+                }
+            }
+            catch
+            {
+            }
+
+            PollServiceHttpRequest wreq;
+            m_retryRequests.Clear();
+
+            lock (m_slowRequests)
             {
-                if (m_requests.Count == 0)
-                    return;
+                while (m_slowRequests.Count > 0 && m_running)
+                    m_requests.Enqueue(m_slowRequests.Dequeue());
+            }
 
-//                m_log.DebugFormat("[POLL SERVICE REQUEST MANAGER]: Processing {0} requests", m_requests.Count);
+            while (m_requests.Count() > 0)
+            {
+                try
+                {
+                    wreq = m_requests.Dequeue(0);
+                    DoHTTPGruntWork(m_server,wreq,
+                        wreq.PollServiceArgs.NoEvents(wreq.RequestID, wreq.PollServiceArgs.Id));
+                }
+                catch
+                {
+                }
+            }
 
-                int reqperthread = (int) (m_requests.Count/m_WorkerThreadCount) + 1;
+            m_requests.Clear();
+        }
 
-                // For Each WorkerThread
-                for (int tc = 0; tc < m_WorkerThreadCount && m_requests.Count > 0; tc++)
+        // work threads
+
+        private void PoolWorkerJob()
+        {
+            while (m_running)
+            {
+                PollServiceHttpRequest req = m_requests.Dequeue(5000);
+
+                Watchdog.UpdateThread();
+                if (req != null)
                 {
-                    //Loop over number of requests each thread handles.
-                    for (int i = 0; i < reqperthread && m_requests.Count > 0; i++)
+                    try
                     {
-                        try
+                        if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
                         {
-                            m_PollServiceWorkerThreads[tc].Enqueue((PollServiceHttpRequest)m_requests.Dequeue());
+                            Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id);
+
+                            if (responsedata == null)
+                                continue;
+
+                            if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.Normal) // This is the event queue
+                            {
+                                try
+                                {
+                                    DoHTTPGruntWork(m_server, req, responsedata);
+                                }
+                                catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream
+                                {
+                                    // Ignore it, no need to reply
+                                }
+                            }
+                            else
+                            {
+                                m_threadPool.QueueWorkItem(x =>
+                                {
+                                    try
+                                    {
+                                        DoHTTPGruntWork(m_server, req, responsedata);
+                                    }
+                                    catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream
+                                    {
+                                        // Ignore it, no need to reply
+                                    }
+
+                                    return null;
+                                }, null);
+                            }
                         }
-                        catch (InvalidOperationException)
+                        else
                         {
-                            // The queue is empty, we did our calculations wrong!
-                            return;
+                            if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
+                            {
+                                DoHTTPGruntWork(m_server, req, 
+                                    req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
+                            }
+                            else
+                            {
+                                ReQueueEvent(req);
+                            }
                         }
-                        
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat("Exception in poll service thread: " + e.ToString());
                     }
                 }
             }
-            
         }
 
-        public void Stop()
+        // DoHTTPGruntWork  changed, not sending response
+        // do the same work around as core
+
+        internal static void DoHTTPGruntWork(BaseHttpServer server, PollServiceHttpRequest req, Hashtable responsedata)
         {
-            m_running = false;
+            OSHttpResponse response
+                = new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext);
 
-            foreach (object o in m_requests)
-            {
-                PollServiceHttpRequest req = (PollServiceHttpRequest) o;
-                PollServiceWorkerThread.DoHTTPGruntWork(
-                    m_server, req, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
-            }
+            byte[] buffer = server.DoHTTPGruntWork(responsedata, response);
 
-            m_requests.Clear();
+            response.SendChunked = false;
+            response.ContentLength64 = buffer.Length;
+            response.ContentEncoding = Encoding.UTF8;
 
-            foreach (Thread t in m_workerThreads)
+            try
+            {
+                response.OutputStream.Write(buffer, 0, buffer.Length);
+            }
+            catch (Exception ex)
             {
-                t.Abort();
+                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));
+                }
             }
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
deleted file mode 100644
index 5adbcd1..0000000
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using HttpServer;
-using OpenMetaverse;
-using System.Reflection;
-using log4net;
-using OpenSim.Framework.Monitoring;
-
-namespace OpenSim.Framework.Servers.HttpServer
-{
-    public delegate void ReQueuePollServiceItem(PollServiceHttpRequest req);
-    
-    public class PollServiceWorkerThread
-    {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
-
-        public event ReQueuePollServiceItem ReQueue;
-
-        private readonly BaseHttpServer m_server;
-        private BlockingQueue<PollServiceHttpRequest> m_request;
-        private bool m_running = true;
-        private int m_timeout = 250;
-
-        public PollServiceWorkerThread(BaseHttpServer pSrv, int pTimeout)
-        {
-            m_request = new BlockingQueue<PollServiceHttpRequest>();
-            m_server = pSrv;
-            m_timeout = pTimeout;
-        }
-
-        public void ThreadStart()
-        {
-            Run();
-        }
-
-        public void Run()
-        {
-            while (m_running)
-            {
-                PollServiceHttpRequest req = m_request.Dequeue();
-
-                Watchdog.UpdateThread();
-                
-                try
-                {
-                    if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
-                    {
-                        StreamReader str;
-                        try
-                        {
-                            str = new StreamReader(req.Request.Body);
-                        }
-                        catch (System.ArgumentException)
-                        {
-                            // Stream was not readable means a child agent
-                            // was closed due to logout, leaving the
-                            // Event Queue request orphaned.
-                            continue;
-                        }
-
-                        Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd());
-                        DoHTTPGruntWork(m_server, req, responsedata);
-                    }
-                    else
-                    {
-                        if ((Environment.TickCount - req.RequestTime) > m_timeout)
-                        {
-                            DoHTTPGruntWork(
-                                m_server,
-                                req,
-                                req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
-                        }
-                        else
-                        {
-                            ReQueuePollServiceItem reQueueItem = ReQueue;
-                            if (reQueueItem != null)
-                                reQueueItem(req);
-                        }
-                    }
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("Exception in poll service thread: " + e.ToString());
-                }
-            }
-        }
-
-        internal void Enqueue(PollServiceHttpRequest pPollServiceHttpRequest)
-        {
-            m_request.Enqueue(pPollServiceHttpRequest);
-        }
-
-        /// <summary>
-        /// FIXME: This should be part of BaseHttpServer
-        /// </summary>
-        internal static void DoHTTPGruntWork(BaseHttpServer server, PollServiceHttpRequest req, Hashtable responsedata)
-        {
-            OSHttpResponse response
-                = new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext);
-
-            byte[] buffer = server.DoHTTPGruntWork(responsedata, response);
-
-            response.SendChunked = false;
-            response.ContentLength64 = buffer.Length;
-            response.ContentEncoding = Encoding.UTF8;
-
-            try
-            {
-                response.OutputStream.Write(buffer, 0, buffer.Length);
-            }
-            catch (Exception ex)
-            {
-                m_log.Warn(string.Format("[POLL SERVICE WORKER THREAD]: Error ", ex));
-            }
-            finally
-            {
-                //response.OutputStream.Close();
-                try
-                {
-                    response.OutputStream.Flush();
-                    response.Send();
-
-                    //if (!response.KeepAlive && response.ReuseContext)
-                    //    response.FreeContext();
-                }
-                catch (Exception e)
-                {
-                    m_log.Warn(String.Format("[POLL SERVICE WORKER THREAD]: Error ", e));
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index c7d4283..e73a04a 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -376,7 +376,7 @@ namespace OpenSim.Region.ClientStack.Linden
             // TODO: Add EventQueueGet name/description for diagnostics
             MainServer.Instance.AddPollServiceHTTPHandler(
                 eventQueueGetPath,
-                new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID));
+                new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID, 40000));
 
 //            m_log.DebugFormat(
 //                "[EVENT QUEUE GET MODULE]: Registered EQG handler {0} for {1} in {2}",
@@ -418,7 +418,7 @@ namespace OpenSim.Region.ClientStack.Linden
             }
         }
 
-        public Hashtable GetEvents(UUID requestID, UUID pAgentId, string request)
+        public Hashtable GetEvents(UUID requestID, UUID pAgentId)
         {
             if (DebugLevel >= 2)
                 m_log.DebugFormat("POLLED FOR EQ MESSAGES BY {0} in {1}", pAgentId, m_scene.RegionInfo.RegionName);
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 7dd9770..7e6b027 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -156,12 +156,12 @@ namespace OpenSim.Region.ClientStack.Linden
             private Scene m_scene;
 
             public PollServiceInventoryEventArgs(Scene scene, UUID pId) :
-                    base(null, null, null, null, pId)
+                    base(null, null, null, null, pId, int.MaxValue)
             {
                 m_scene = scene;
 
                 HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); };
-                GetEvents = (x, y, z) =>
+                GetEvents = (x, y) =>
                 {
                     lock (responses)
                     {
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index c9cd412..976ab93 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -237,7 +237,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                
                 m_HttpServer.AddPollServiceHTTPHandler(
                     uri,
-                    new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode));
+                    new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000));
 
                 m_log.DebugFormat(
                     "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}",
@@ -282,7 +282,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                
                 m_HttpsServer.AddPollServiceHTTPHandler(
                     uri,
-                    new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode));
+                    new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000));
 
                 m_log.DebugFormat(
                     "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}",
@@ -516,7 +516,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
             }
         }
 
-        private Hashtable GetEvents(UUID requestID, UUID sessionID, string request)
+        private Hashtable GetEvents(UUID requestID, UUID sessionID)
         {
             Hashtable response;
 
@@ -668,4 +668,4 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
             ScriptRemoved(itemID);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/prebuild.xml b/prebuild.xml
index 5531558..88db6ed 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -191,6 +191,7 @@
       <Reference name="XMLRPC" path="../../../../bin/"/>
       <Reference name="log4net" path="../../../../bin/"/>
       <Reference name="HttpServer_OpenSim" path="../../../../bin/"/>
+      <Reference name="SmartThreadPool"/>
 
       <Files>
         <Match pattern="*.cs" recurse="true">
-- 
cgit v1.1


From 75631e0267dbf58253dfcf6327b4d65f35bbaa6d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 7 Jun 2013 23:55:03 +0100
Subject: Supply proper type information for the various types of requests

---
 OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs |  4 +---
 .../Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs  |  1 +
 OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs    | 12 ++++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index c19ac32..3079a7e 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -52,9 +52,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             Normal = 0,
             LslHttp = 1,
-            Inventory = 2,
-            Texture = 3, 
-            Mesh = 4
+            Inventory = 2
         }
 
         public PollServiceEventArgs(
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 7e6b027..9101fc3 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -288,6 +288,7 @@ namespace OpenSim.Region.ClientStack.Linden
             // Register this as a poll service          
             PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(m_scene, agentID);
             
+            args.Type = PollServiceEventArgs.EventType.Inventory;
             MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
 
             string hostName = m_scene.RegionInfo.ExternalHostName;
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 976ab93..def8162 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -235,9 +235,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 
                 string uri = "/lslhttp/" + urlcode.ToString() + "/";
                
-                m_HttpServer.AddPollServiceHTTPHandler(
-                    uri,
-                    new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000));
+                PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000);
+                args.Type = PollServiceEventArgs.EventType.LslHttp;
+                m_HttpServer.AddPollServiceHTTPHandler(uri, args);
 
                 m_log.DebugFormat(
                     "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}",
@@ -280,9 +280,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 
                 string uri = "/lslhttps/" + urlcode.ToString() + "/";
                
-                m_HttpsServer.AddPollServiceHTTPHandler(
-                    uri,
-                    new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000));
+                PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000);
+                args.Type = PollServiceEventArgs.EventType.LslHttp;
+                m_HttpsServer.AddPollServiceHTTPHandler(uri, args);
 
                 m_log.DebugFormat(
                     "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}",
-- 
cgit v1.1


From 07cc16ff9ccecb4871ae954f2415fb2c5586ec44 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 7 Jun 2013 16:00:32 -0700
Subject: Put the configuration back in FetchInventoryDesc2 cap.

---
 .../Linden/Caps/WebFetchInvDescModule.cs           | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 7dd9770..2586cf0 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -71,6 +71,11 @@ 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>();
@@ -83,15 +88,32 @@ 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;
             m_scene = null;
@@ -99,6 +121,9 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public void RegionLoaded(Scene s)
         {
+            if (!m_Enabled)
+                return;
+
             m_InventoryService = m_scene.InventoryService;
             m_LibraryService = m_scene.LibraryService;
 
@@ -283,6 +308,9 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private void RegisterCaps(UUID agentID, Caps caps)
         {
+            if (m_fetchInventoryDescendents2Url == "")
+                return;
+
             string capUrl = "/CAPS/" + UUID.Random() + "/";
 
             // Register this as a poll service          
@@ -300,6 +328,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 port = MainServer.Instance.SSLPort;
                 protocol = "https";
             }
+
             caps.RegisterHandler("FetchInventoryDescendents2", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
 
             m_capsDict[agentID] = capUrl;
-- 
cgit v1.1


From 138722482175ba7571f8086d9b9172c9975543a6 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Fri, 7 Jun 2013 20:09:10 -0400
Subject: Ensure selected module is the only active one

---
 OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs | 3 +++
 1 file changed, 3 insertions(+)

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;
         }
-- 
cgit v1.1


From 1cb1245d847fad5a088e0bb727433ee1e53d81da Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Fri, 7 Jun 2013 20:14:39 -0400
Subject: SQLite support for UserProfiles

---
 .../Data/SQLite/Resources/UserProfiles.migrations  |  90 ++
 OpenSim/Data/SQLite/SQLiteUserProfilesData.cs      | 904 +++++++++++++++++++++
 .../Avatar/UserProfiles/UserProfileModule.cs       |   1 +
 3 files changed, 995 insertions(+)
 create mode 100644 OpenSim/Data/SQLite/Resources/UserProfiles.migrations
 create mode 100644 OpenSim/Data/SQLite/SQLiteUserProfilesData.cs

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/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/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index a97c9b4..72e557c 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -130,6 +130,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
             if (profileConfig == null)
             {
+                m_log.Debug("[PROFILES]: UserProfiles disabled, no configuration");
                 Enabled = false;
                 return;
             }
-- 
cgit v1.1


From 75e4af9d3959b666b652013d2de4d5f4625f9fa2 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sat, 8 Jun 2013 11:00:05 -0400
Subject: Catch exception triggered by incoming avatars using legacy profiles

---
 .../CoreModules/Avatar/UserProfiles/UserProfileModule.cs      | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 72e557c..322addd 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -1317,7 +1317,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             Stream rstream = webResponse.GetResponseStream();
 
             OSDMap response = new OSDMap();
-            response = (OSDMap)OSDParser.DeserializeJson(rstream);
+            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"];
-- 
cgit v1.1


From d00770d56bf00640f23f462d8ab51f851530234c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 8 Jun 2013 11:00:22 -0700
Subject: Groups V2 -- fix mantis #6666

---
 OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
index 7e0b112..cff7adf 100644
--- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
@@ -684,6 +684,9 @@ namespace OpenSim.Groups
         {
             serviceLocation = string.Empty;
             name = string.Empty;
+            if (groupID.Equals(UUID.Zero))
+                return true;
+
             ExtendedGroupRecord group = m_LocalGroupsConnector.GetGroupRecord(UUID.Zero.ToString(), groupID, string.Empty);
             if (group == null)
             {
-- 
cgit v1.1


From e741e5ebce7759a7ee75c638d73e17c8a5f38394 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 9 Jun 2013 20:20:37 -0700
Subject: More on mantis #6666 -- Groups V2 remote connector.

---
 OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs b/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs
index e7d38c2..79d6fc5 100644
--- a/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs
+++ b/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs
@@ -209,13 +209,10 @@ namespace OpenSim.Groups
         public void SetAgentActiveGroup(string AgentID, GroupMembershipDelegate d)
         {
             GroupMembershipData activeGroup = d();
-            if (activeGroup != null)
-            {
-                string cacheKey = "active-" + AgentID.ToString();
-                lock (m_Cache)
-                    if (m_Cache.Contains(cacheKey))
-                        m_Cache.AddOrUpdate(cacheKey, activeGroup, GROUPS_CACHE_TIMEOUT);
-            }
+            string cacheKey = "active-" + AgentID.ToString();
+            lock (m_Cache)
+                if (m_Cache.Contains(cacheKey))
+                    m_Cache.AddOrUpdate(cacheKey, activeGroup, GROUPS_CACHE_TIMEOUT);
         }
 
         public ExtendedGroupMembershipData GetAgentActiveMembership(string AgentID, GroupMembershipDelegate d)
-- 
cgit v1.1


From 7de0912a979746c1e1301c080c49152ae7cd57b5 Mon Sep 17 00:00:00 2001
From: Talun
Date: Mon, 10 Jun 2013 09:32:14 +0100
Subject: Mantis 5346: llAxisAngle2Rot() should normalize before computing

Corrected to agree with
http://wiki.secondlife.com/wiki/Llaxisangle2rot#Deep_Notes
to normalise the vector before computing the quaternion

Signed-off-by: dahlia <dahlia@nomail>
---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index cd6092d..ec5aa49 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4651,6 +4651,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;
-- 
cgit v1.1


From 57141e34bf415861a8acfdaa0086e0e651c679d9 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Mon, 10 Jun 2013 13:26:19 -0700
Subject: Remove Temporary from use to shortcut asset stores. The Local
 property differentiates between local & grid storage. The Temporary property
 just says that which service handles the it, the asset can be safely removed
 in the future.

---
 OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs           | 1 +
 OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs  | 2 +-
 .../ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs            | 2 +-
 OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs             | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
index b497fde..9f3cc19 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
@@ -189,6 +189,7 @@ namespace OpenSim.Capabilities.Handlers
 
                             newTexture.Flags = AssetFlags.Collectable;
                             newTexture.Temporary = true;
+                            newTexture.Local = true;
                             m_assetService.Store(newTexture);
                             WriteTextureData(httpRequest, httpResponse, newTexture, format);
                             return true;
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/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 2b2f11f..7f7f251 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -251,7 +251,7 @@ namespace OpenSim.Services.Connectors
 
         public string Store(AssetBase asset)
         {
-            if (asset.Temporary || asset.Local)
+            if (asset.Local)
             {
                 if (m_Cache != null)
                     m_Cache.Cache(asset);
-- 
cgit v1.1


From 795acaa6aa8e32ad0281226208a6b1bbc2292bf5 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 10 Jun 2013 14:12:45 -0700
Subject: BulletSim: add failure flag for meshing failure vs asset fetch
 failure so error messages make more sense. Change some BulletSim status log
 messages from WARN to INFO. Update TODO list.

---
 .../Region/Physics/BulletSPlugin/BSPhysObject.cs   |  2 +-
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs    |  4 +-
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs   | 35 ++++++++++++-----
 .../Region/Physics/BulletSPlugin/BulletSimTODO.txt | 44 +++++++++++-----------
 4 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index cca887a..a4c5e08 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -148,7 +148,7 @@ public abstract class BSPhysObject : PhysicsActor
     // 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; }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 423c389..dec6b6f 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -249,7 +249,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         TerrainManager.CreateInitialGroundPlaneAndTerrain();
 
         // Put some informational messages into the log file.
-        m_log.WarnFormat("{0} Linksets implemented with {1}", LogHeader, (BSLinkset.LinksetImplementation)BSParam.LinksetImplementation);
+        m_log.InfoFormat("{0} Linksets implemented with {1}", LogHeader, (BSLinkset.LinksetImplementation)BSParam.LinksetImplementation);
 
         InTaintTime = false;
         m_initialized = true;
@@ -374,7 +374,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;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 867d2ab..202a4ce 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -167,7 +167,7 @@ public abstract class BSShape
         // Prevent trying to keep fetching the mesh by declaring failure.
         if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Fetched)
         {
-            prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
+            prim.PrimAssetState = BSPhysObject.PrimAssetCondition.FailedMeshing;
             physicsScene.Logger.WarnFormat("{0} Fetched asset would not mesh. {1}, texture={2}",
                                             LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
             physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,setFailed,objNam={1},tex={2}",
@@ -177,7 +177,8 @@ public abstract class BSShape
         {
             // 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.FailedAssetFetch
+                && prim.PrimAssetState != BSPhysObject.PrimAssetCondition.FailedMeshing
                 && prim.PrimAssetState != BSPhysObject.PrimAssetCondition.Waiting
                 && prim.BaseShape.SculptTexture != OMV.UUID.Zero
                 )
@@ -219,7 +220,7 @@ public abstract class BSShape
                                 }
                                 if (!assetFound)
                                 {
-                                    yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
+                                    yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.FailedAssetFetch;
                                 }
                                 physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,fetchAssetCallback,found={1},isSculpt={2},ids={3}",
                                             yprim.LocalID, assetFound, yprim.BaseShape.SculptEntry, mismatchIDs );
@@ -227,7 +228,7 @@ public abstract class BSShape
                         }
                         else
                         {
-                            xprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
+                            xprim.PrimAssetState = BSPhysObject.PrimAssetCondition.FailedAssetFetch;
                             physicsScene.Logger.ErrorFormat("{0} Physical object requires asset but no asset provider. Name={1}",
                                                         LogHeader, physicsScene.Name);
                         }
@@ -235,13 +236,20 @@ public abstract class BSShape
             }
             else
             {
-                if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Failed)
+                if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.FailedAssetFetch)
                 {
                     physicsScene.Logger.WarnFormat("{0} Mesh failed to fetch asset. obj={1}, texture={2}",
                                                 LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
                     physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,wasFailed,objNam={1},tex={2}",
                                                 prim.LocalID, prim.PhysObjectName, prim.BaseShape.SculptTexture);
                 }
+                if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.FailedMeshing)
+                {
+                    physicsScene.Logger.WarnFormat("{0} Mesh asset would not mesh. obj={1}, texture={2}",
+                                                LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
+                    physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,wasFailedMeshing,objNam={1},tex={2}",
+                                                prim.LocalID, prim.PhysObjectName, prim.BaseShape.SculptTexture);
+                }
             }
          }
 
@@ -374,7 +382,9 @@ public class BSShapeMesh : BSShape
 
                 // Check to see if mesh was created (might require an asset).
                 newShape = VerifyMeshCreated(physicsScene, newShape, prim);
-                if (!newShape.isNativeShape || prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Failed)
+                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.
@@ -517,7 +527,7 @@ public class BSShapeMesh : BSShape
             else
             {
                 // Force the asset condition to 'failed' so we won't try to keep fetching and processing this mesh.
-                prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
+                prim.PrimAssetState = BSPhysObject.PrimAssetCondition.FailedMeshing;
                 physicsScene.Logger.DebugFormat("{0} All mesh triangles degenerate. Prim {1} at {2} in {3}",
                                     LogHeader, prim.PhysObjectName, prim.RawPosition, physicsScene.Name);
                 physicsScene.DetailLog("{0},BSShapeMesh.CreatePhysicalMesh,allDegenerate,key={1}", prim.LocalID, newMeshKey);
@@ -559,7 +569,9 @@ public class BSShapeHull : BSShape
 
                 // Check to see if hull was created (might require an asset).
                 newShape = VerifyMeshCreated(physicsScene, newShape, prim);
-                if (!newShape.isNativeShape || prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Failed)
+                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);
@@ -1079,10 +1091,13 @@ public class BSShapeGImpact : BSShape
                 // 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.Failed)
+                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.
+                    // 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);
                 }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
index df1da63..1e01526 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
@@ -2,11 +2,6 @@ CURRENT PROBLEMS TO FIX AND/OR LOOK AT
 =================================================
 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.
-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.
-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
-Two of Nebadon vehicles in a sim max the CPU. This is new.
 Enable vehicle border crossings (at least as poorly as ODE)
 	Terrain skirts
 	Avatar created in previous region and not new region when crossing border
@@ -23,24 +18,17 @@ 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) (DONE)
-	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.
 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.
@@ -53,12 +41,8 @@ LINEAR_MOTOR_DIRECTION values should be clamped to reasonable numbers.
 	Same for other velocity settings.
 UBit improvements to remove rubber-banding of avatars sitting on vehicle child prims:
 	https://github.com/UbitUmarov/Ubit-opensim
-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)
 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.
@@ -68,8 +52,6 @@ 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.
@@ -78,11 +60,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.
@@ -359,4 +340,25 @@ 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)
 
-- 
cgit v1.1


From 82e3b9a6e0f0e1731df9080e4de63bc7c7079ec4 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Mon, 10 Jun 2013 15:14:55 -0700
Subject: Fix test for adding temporary assets. Code for non-local temporary
 assets is there but commented out.

---
 .../Asset/Tests/AssetConnectorTests.cs               | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs
index 1982473..7073433 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs
@@ -93,7 +93,9 @@ 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);
@@ -102,6 +104,24 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.Tests
             Assert.That(lasc.GetData(a1.ID), Is.Null);
             Assert.That(lasc.GetMetadata(a1.ID), Is.Null);
 
+            // 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
         }
 
-- 
cgit v1.1


From 32d1e50565787eaf8fac8b5f0bd899b6e3b3b303 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 10 Jun 2013 23:30:35 +0100
Subject: Reinstate explicit starting and stopping of PollServiceRequestManager
 added in 3eee991 but removed in 7c0bfca

Do not rely on destructors to stop things.
These fire at unpredictable times and cause problems such as http://opensimulator.org/mantis/view.php?id=6503
and most probably http://opensimulator.org/mantis/view.php?id=6668
---
 OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs            | 3 ++-
 OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index eb7c578..96a030b 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1805,6 +1805,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
                 // Long Poll Service Manager with 3 worker threads a 25 second timeout for no events
                 m_PollServiceManager = new PollServiceRequestManager(this, 3, 25000);
+                m_PollServiceManager.Start();
                 HTTPDRunning = true;
 
                 //HttpListenerContext context;
@@ -1855,7 +1856,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             HTTPDRunning = false;
             try
             {
-//                m_PollServiceManager.Stop();
+                m_PollServiceManager.Stop();
 
                 m_httpListener2.ExceptionThrown -= httpServerException;
                 //m_httpListener2.DisconnectHandler = null;
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index a5380c1..ef35886 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -66,7 +66,10 @@ 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++)
             {
@@ -91,7 +94,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                 1000 * 60 * 10);
         }
 
-
         private void ReQueueEvent(PollServiceHttpRequest req)
         {
             if (m_running)
@@ -142,14 +144,14 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
 
-        ~PollServiceRequestManager()
+        public void Stop()
         {
             m_running = false;
 //            m_timeout = -10000; // cause all to expire
             Thread.Sleep(1000); // let the world move
 
             foreach (Thread t in m_workerThreads)
-                    Watchdog.AbortThread(t.ManagedThreadId);
+                Watchdog.AbortThread(t.ManagedThreadId);
 
             try
             {
-- 
cgit v1.1


From 7af97f88b7f493b830b46c01acc92934852cabae Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 10 Jun 2013 23:39:17 +0100
Subject: Add port numbers to poll service thread names so that we can tell
 which belong to which HttpServer

---
 OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index ef35886..aee3e3c 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 m_workerThreads[i]
                     = Watchdog.StartThread(
                         PoolWorkerJob,
-                        String.Format("PollServiceWorkerThread{0}", i),
+                        string.Format("PollServiceWorkerThread{0}:{1}", i, m_server.Port),
                         ThreadPriority.Normal,
                         false,
                         false,
@@ -86,7 +86,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             m_retrysThread = Watchdog.StartThread(
                 this.CheckRetries,
-                "PollServiceWatcherThread",
+                string.Format("PollServiceWatcherThread:{0}", m_server.Port),
                 ThreadPriority.Normal,
                 false,
                 true,
-- 
cgit v1.1


From a949556c4ea74c993fc15bcfdcbc672d9f971897 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Mon, 10 Jun 2013 16:42:49 -0700
Subject: add a Normalize() method for LSL_Rotation

---
 OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 9ca5ca9..f6d94a3 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 = 1;
+                    y = 0;
+                    z = 0;
+                    s = 0;
+                }
+                else
+                {
+
+                    double invLength = 1.0 / length;
+                    x *= invLength;
+                    y *= invLength;
+                    z *= invLength;
+                    s *= invLength;
+                }
+
+                return this;
+            }
+            #endregion
+
             #region Overriders
 
             public override int GetHashCode()
-- 
cgit v1.1


From 1c7fbb86c21f79938e4ea9dafef1e8d8f4a29a8d Mon Sep 17 00:00:00 2001
From: teravus
Date: Mon, 10 Jun 2013 18:47:08 -0500
Subject: Check For NaN and Infinity in llRot2Axis/Angle  Fixes mantis #6669

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index ec5aa49..9427061 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4692,7 +4692,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 y = rot.y / s;
                 z = rot.z / s;
             }
-
+            if ((double.IsNaN(x)) || double.IsInfinity(x)) x = 0;
+            if ((double.IsNaN(y)) || double.IsInfinity(y)) y = 0;
+            if ((double.IsNaN(z)) || double.IsInfinity(z)) z = 0;
             return new LSL_Vector(x,y,z);
         }
 
@@ -4714,7 +4716,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
 
             double angle = 2 * Math.Acos(rot.s);
-
+            if ((double.IsNaN(angle)) || double.IsInfinity(angle)) angle = 0;
             return angle;
         }
 
-- 
cgit v1.1


From b242ead6df06f013f507a4a15495a2720ec5d089 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Mon, 10 Jun 2013 17:10:04 -0700
Subject: llRot2Axis now checks absolute value of s rotation component before
 normalizing. Also removed some excessive division and cleaned up a bit

---
 .../Shared/Api/Implementation/LSL_Api.cs           | 28 +++++-----------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 9427061..c48285a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4665,37 +4665,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Vector llRot2Axis(LSL_Rotation rot)
         {
             m_host.AddScriptLPS(1);
-            double x,y,z;
+            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;
+                return new LSL_Vector(rot.x * invS, rot.y * invS, rot.z * invS);
             }
-            if ((double.IsNaN(x)) || double.IsInfinity(x)) x = 0;
-            if ((double.IsNaN(y)) || double.IsInfinity(y)) y = 0;
-            if ((double.IsNaN(z)) || double.IsInfinity(z)) z = 0;
-            return new LSL_Vector(x,y,z);
         }
 
 
-- 
cgit v1.1


From 9d9b9d4938687f97ac82fc22917471f22198ef12 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Mon, 10 Jun 2013 17:11:49 -0700
Subject: llRot2Angle now checks absolute value of s rotation component before
 normalizing

---
 .../ScriptEngine/Shared/Api/Implementation/LSL_Api.cs      | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c48285a..39bac82 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4688,19 +4688,11 @@ 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 ((double.IsNaN(angle)) || double.IsInfinity(angle)) angle = 0;
+
             return angle;
         }
 
-- 
cgit v1.1


From ba84074468e0805e0a378bf31fc580437e7ce015 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Mon, 10 Jun 2013 17:54:14 -0700
Subject: LSL_Rotation.Normalize() now returns 0,0,0,1 for x,y,z,s when
 normalization fails

---
 OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index f6d94a3..50f9377 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -377,10 +377,10 @@ namespace OpenSim.Region.ScriptEngine.Shared
                 double length = Math.Sqrt(x * x + y * y + z * z + s * s);
                 if (length < float.Epsilon)
                 {
-                    x = 1;
+                    x = 0;
                     y = 0;
                     z = 0;
-                    s = 0;
+                    s = 1;
                 }
                 else
                 {
-- 
cgit v1.1


From ed950e6c7444510c7171c1b7829eedbf731e218a Mon Sep 17 00:00:00 2001
From: dahlia
Date: Tue, 11 Jun 2013 00:29:40 -0700
Subject: Adjust output of llRot2Axis and llRot2Angle to match domains SL(tm)
 uses. Addresses Mantis #0006671

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 39bac82..e1630b3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4678,6 +4678,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             else
             {
                 double invS = 1.0 / s;
+                if (rot.s < 0) invS = -invS;
                 return new LSL_Vector(rot.x * invS, rot.y * invS, rot.z * invS);
             }
         }
@@ -4692,6 +4693,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 rot.Normalize();
 
             double angle = 2 * Math.Acos(rot.s);
+            if (angle > Math.PI) 
+                angle = 2 * Math.PI - angle;
 
             return angle;
         }
-- 
cgit v1.1


From d47a18fd09cfa7abc5fbd646a7a8edbec12c870c Mon Sep 17 00:00:00 2001
From: teravus
Date: Tue, 11 Jun 2013 08:56:20 -0500
Subject: * Adds KeyFrameMotion storage support to SQLite,     just a note,
 seems that there's still something wrong with keyframed motion starting when
 the sim starts up, you have to 'select' and 'deselect' the prim again to get
 it to appear to move.   Not sure what this is but maybe melanie_t can comment
 on this. * Has a prim table migration..     that might take a while, hold on
 to your hats. * Fixes a null-ref when shutting down while keyframed motion is
 active.

---
 .../Data/SQLite/Resources/RegionStore.migrations   |  8 ++++++++
 OpenSim/Data/SQLite/SQLiteSimulationData.cs        | 24 ++++++++++++++++++++++
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs |  5 +++--
 3 files changed, 35 insertions(+), 2 deletions(-)

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/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index d4734a6..70b76c9 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -732,6 +732,8 @@ namespace OpenSim.Data.SQLite
                             }
 
                             SceneObjectGroup group = new SceneObjectGroup(prim);
+                            if (prim.KeyframeMotion != null)
+                                prim.KeyframeMotion.UpdateSceneObject(group);
                             createdObjects.Add(group.UUID, group);
                             retvals.Add(group);
                             LoadItems(prim);
@@ -1241,6 +1243,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"] };
 
@@ -1736,6 +1739,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;
         }
 
@@ -2168,6 +2185,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/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ff3f738..482d958 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -779,7 +779,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)
                     {
@@ -892,7 +893,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);
                         //}
                     }
-- 
cgit v1.1


From 26b66c730e85744c365512a8c0a2a3cc64f5695c Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 11 Jun 2013 20:39:09 +0200
Subject: Put the "script saved" and "notecard saved" messages back into the
 bottom right corner.

---
 .../CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 880205a..1203192 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -260,7 +260,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         return UUID.Zero;
                     }
 
-                    remoteClient.SendAgentAlertMessage("Notecard saved", false);
+                    remoteClient.SendAlertMessage("Notecard saved");
                 }
                 else if ((InventoryType)item.InvType == InventoryType.LSL)
                 {
@@ -270,7 +270,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         return UUID.Zero;
                     }
 
-                    remoteClient.SendAgentAlertMessage("Script saved", false);
+                    remoteClient.SendAlertMessage("Script saved");
                 }
 
                 AssetBase asset =
-- 
cgit v1.1


From b33db917f59ecfcab96a2aec45e19987dbcb44a2 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 11 Jun 2013 15:36:27 -0700
Subject: Really bad idea to lock m_UserCache for so long in
 UserManagementModule. Added a special lock object instead, if we really want
 to avoid concurrent executions of that code.

---
 .../UserManagement/UserManagementModule.cs         | 30 ++++++++++++----------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 1e70b84..ac21b53 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -56,6 +56,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         // The cache
         protected Dictionary<UUID, UserData> m_UserCache = new Dictionary<UUID, UserData>();
+        private object m_AddUserLock = new object();
 
         #region ISharedRegionModule
 
@@ -475,9 +476,11 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
             UserData oldUser;
             //lock the whole block - prevent concurrent update
-            lock (m_UserCache)
+            lock (m_AddUserLock)
             {
-                m_UserCache.TryGetValue (id, out oldUser);
+                lock (m_UserCache)
+                    m_UserCache.TryGetValue(id, out oldUser);
+
                 if (oldUser != null)
                 {
                     if (creatorData == null || creatorData == String.Empty)
@@ -488,9 +491,10 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
                     //try update unknown users
                     //and creator's home URL's
-                    if ((oldUser.FirstName == "Unknown" && !creatorData.Contains ("Unknown")) || (oldUser.HomeURL != null && !creatorData.StartsWith (oldUser.HomeURL)))
+                    if ((oldUser.FirstName == "Unknown" && !creatorData.Contains("Unknown")) || (oldUser.HomeURL != null && !creatorData.StartsWith(oldUser.HomeURL)))
                     {
-                        m_UserCache.Remove (id);
+                        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
@@ -500,38 +504,38 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     }
                 }
 
-                UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount (m_Scenes [0].RegionInfo.ScopeID, id);
+                UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, id);
 
                 if (account != null)
                 {
-                    AddUser (id, account.FirstName, account.LastName);
+                    AddUser(id, account.FirstName, account.LastName);
                 }
                 else
                 {
-                    UserData user = new UserData ();
+                    UserData user = new UserData();
                     user.Id = id;
 
                     if (creatorData != null && creatorData != string.Empty)
                     {
                         //creatorData = <endpoint>;<name>
 
-                        string[] parts = creatorData.Split (';');
+                        string[] parts = creatorData.Split(';');
                         if (parts.Length >= 1)
                         {
-                            user.HomeURL = parts [0];
+                            user.HomeURL = parts[0];
                             try
                             {
-                                Uri uri = new Uri (parts [0]);
+                                Uri uri = new Uri(parts[0]);
                                 user.LastName = "@" + uri.Authority;
                             }
                             catch (UriFormatException)
                             {
-                                m_log.DebugFormat ("[SCENE]: Unable to parse Uri {0}", parts [0]);
+                                m_log.DebugFormat("[SCENE]: Unable to parse Uri {0}", parts[0]);
                                 user.LastName = "@unknown";
                             }
                         }
                         if (parts.Length >= 2)
-                            user.FirstName = parts [1].Replace (' ', '.');
+                            user.FirstName = parts[1].Replace(' ', '.');
                     }
                     else
                     {
@@ -539,7 +543,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                         user.LastName = "UserUMMAU";
                     }
 
-                    AddUserInternal (user);
+                    AddUserInternal(user);
                 }
             }
         }
-- 
cgit v1.1


From d8da83b4ff924587c14c888c2a992c56b9b76c80 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 11 Jun 2013 15:50:12 -0700
Subject: Removed the lock entirely

---
 .../UserManagement/UserManagementModule.cs         | 108 ++++++++++-----------
 1 file changed, 52 insertions(+), 56 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index ac21b53..864e181 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -56,7 +56,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         // The cache
         protected Dictionary<UUID, UserData> m_UserCache = new Dictionary<UUID, UserData>();
-        private object m_AddUserLock = new object();
 
         #region ISharedRegionModule
 
@@ -476,75 +475,72 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
             UserData oldUser;
             //lock the whole block - prevent concurrent update
-            lock (m_AddUserLock)
-            {
-                lock (m_UserCache)
-                    m_UserCache.TryGetValue(id, out oldUser);
+            lock (m_UserCache)
+                m_UserCache.TryGetValue(id, out oldUser);
 
-                if (oldUser != null)
+            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)))
-                    {
-                        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
-                    {
-                        //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
+                //and creator's home URL's
+                if ((oldUser.FirstName == "Unknown" && !creatorData.Contains("Unknown")) || (oldUser.HomeURL != null && !creatorData.StartsWith(oldUser.HomeURL)))
                 {
-                    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);
 
-                        string[] parts = creatorData.Split(';');
-                        if (parts.Length >= 1)
+            if (account != null)
+            {
+                AddUser(id, account.FirstName, account.LastName);
+            }
+            else
+            {
+                UserData user = new UserData();
+                user.Id = id;
+
+                if (creatorData != null && creatorData != string.Empty)
+                {
+                    //creatorData = <endpoint>;<name>
+
+                    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 = "UserUMMAU";
                     }
-
-                    AddUserInternal(user);
+                    if (parts.Length >= 2)
+                        user.FirstName = parts[1].Replace(' ', '.');
                 }
+                else
+                {
+                    user.FirstName = "Unknown";
+                    user.LastName = "UserUMMAU";
+                }
+
+                AddUserInternal(user);
             }
         }
 
-- 
cgit v1.1


From 135e10ba09a527d14a2fea0c6398757ce450c9fa Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 11 Jun 2013 23:55:45 +0100
Subject: Uncomment Mic's code and split to create new regression
 TestAddTemporaryAsset() and TestAddTemporaryLocalAsset()

---
 .../Asset/Tests/AssetConnectorTests.cs             | 64 ++++++++++++++--------
 1 file changed, 41 insertions(+), 23 deletions(-)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs
index 7073433..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,10 +92,45 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.Tests
             LocalAssetServicesConnector lasc = new LocalAssetServicesConnector();
             lasc.Initialise(config);
 
-            // If it is local, it should not be stored
+            // 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.Local = true;
-            a1.Temporary = true;
 
             lasc.Store(a1);
 
@@ -104,29 +138,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.Tests
             Assert.That(lasc.GetData(a1.ID), Is.Null);
             Assert.That(lasc.GetMetadata(a1.ID), Is.Null);
 
-            // 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()
+        public void TestAddTemporaryLocalAsset()
         {
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
@@ -141,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);
 
-- 
cgit v1.1


From 7556a0f699f8474b7ac23cbebacc695c93f374fa Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 11 Jun 2013 17:18:12 -0700
Subject: Add TriggerScenePresenceUpdated events when an animation is added or
 removed. Shouldn't impact anyone as only DSG seems to use
 OnScenePresenceUpdated event. Some minor format changes to AnimationSet's
 ToString().

---
 OpenSim/Framework/Animation.cs                                    | 5 ++---
 OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs         | 8 ++++++--
 .../Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs    | 2 ++
 OpenSim/Region/Framework/Scenes/ScenePresence.cs                  | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Framework/Animation.cs b/OpenSim/Framework/Animation.cs
index 8bdf8f4..3425505 100644
--- a/OpenSim/Framework/Animation.cs
+++ b/OpenSim/Framework/Animation.cs
@@ -125,11 +125,10 @@ namespace OpenSim.Framework
             Animation other = obj as Animation;
             if (other != null)
             {
-                return (other.AnimID == this.AnimID
+                return (other.AnimID.Equals(this.AnimID)
                         && other.SequenceNum == this.SequenceNum
-                        && other.ObjectID == this.ObjectID);
+                        && other.ObjectID.Equals(this.ObjectID) );
             }
-
             return base.Equals(obj);
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
index 5dee64d..b7400ea 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
@@ -312,18 +312,22 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             buff.Append("dflt=");
             buff.Append(DefaultAnimation.ToString());
             buff.Append(",iDflt=");
-            if (DefaultAnimation == ImplicitDefaultAnimation)
+            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(">,");
+                    buff.Append(">");
+                    firstTime = false;
                 }
             }
             return buff.ToString();
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index a701a79..3b5a5bd 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -94,6 +94,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             if (m_animations.Add(animID, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, objectID))
             {
                 SendAnimPack();
+                m_scenePresence.TriggerScenePresenceUpdated();
             }
         }
 
@@ -135,6 +136,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             if (m_animations.Remove(animID, allowNoDefault))
             {
                 SendAnimPack();
+                m_scenePresence.TriggerScenePresenceUpdated();
             }
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index bab14dd..774546c 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.Framework.Scenes
 //            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);
-- 
cgit v1.1


From 90097de6c3cf58989698b37c89baa8268895fc86 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Tue, 11 Jun 2013 20:35:25 -0400
Subject: Add option to set minimum fee for classified ads

  Upcoming phoenix-firestorm (4.4.1) adds a configurable option for setting
  the minimum price for publishing a classified ad.

  http://hg.phoenixviewer.com/phoenix-firestorm-lgpl/rev/43415d69b048
---
 bin/Robust.HG.ini.example                       | 8 +++++++-
 bin/Robust.ini.example                          | 6 ++++++
 bin/config-include/StandaloneCommon.ini.example | 3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index d9f1ca1..2afb978 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -1,4 +1,4 @@
-; * Run
+i * Run
 ; * $ Robust.exe -inifile Robust.HG.ini
 ; *
 
@@ -311,6 +311,9 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     ;; Ask co-operative viewers to use a different currency name
     ;Currency = ""
 
+    ;; Minimum fee for creation of classified 
+    ; ClassifiedFee = 0
+
     WelcomeMessage = "Welcome, Avatar!"
     AllowRemoteSetLoginLevel = "false"
 
@@ -436,6 +439,9 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     ; this is the entry point for all user-related HG services
     ; uas = http://127.0.0.1:8002/
 
+    ;; Minimum fee to publish classified add
+    ;  ClassifiedFee = 0
+
 [GatekeeperService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
     ;; for the service
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 7d6492b..3440191 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -274,6 +274,9 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
     ; Ask co-operative viewers to use a different currency name
     ;Currency = ""
 
+    ;; Minimum fee for creation of classified 
+    ; ClassifiedFee = 0
+
     WelcomeMessage = "Welcome, Avatar!"
     AllowRemoteSetLoginLevel = "false"
 
@@ -393,6 +396,9 @@ 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
 
+    ;; Minimum fee to publish classified add
+    ;  ClassifiedFee = 0
+
 [UserProfilesService]
     LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService"
     Enabled = false
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 8c23c41..8ec3daf 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -222,6 +222,9 @@
     ; this is the entry point for all user-related HG services
     ; uas = http://127.0.0.1:9000/
 
+    ;; Minimum fee to publish classified add
+    ;  ClassifiedFee = 0
+
 [MapImageService]
 	; Set this if you want to change the default
 	; TilesStoragePath = "maptiles"
-- 
cgit v1.1


From 3cb65f0d3166f976713a7c095eb37e6de05061d0 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 11 Jun 2013 17:58:08 -0700
Subject: BulletSim: when meshing or asset fetching fails, include position and
 region with the offending object's name in the error message.

---
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs   | 40 ++++++++++++++--------
 .../Region/Physics/BulletSPlugin/BulletSimTODO.txt |  4 +++
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 202a4ce..006a9c1 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -168,10 +168,10 @@ public abstract class BSShape
         if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Fetched)
         {
             prim.PrimAssetState = BSPhysObject.PrimAssetCondition.FailedMeshing;
-            physicsScene.Logger.WarnFormat("{0} Fetched asset would not mesh. {1}, texture={2}",
-                                            LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
-            physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,setFailed,objNam={1},tex={2}",
-                                            prim.LocalID, prim.PhysObjectName, prim.BaseShape.SculptTexture);
+            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
         {
@@ -238,17 +238,17 @@ public abstract class BSShape
             {
                 if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.FailedAssetFetch)
                 {
-                    physicsScene.Logger.WarnFormat("{0} Mesh failed to fetch asset. obj={1}, texture={2}",
-                                                LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
-                    physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,wasFailed,objNam={1},tex={2}",
-                                                prim.LocalID, prim.PhysObjectName, prim.BaseShape.SculptTexture);
+                    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. obj={1}, texture={2}",
-                                                LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
-                    physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,wasFailedMeshing,objNam={1},tex={2}",
-                                                prim.LocalID, prim.PhysObjectName, prim.BaseShape.SculptTexture);
+                    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);
                 }
             }
          }
@@ -260,6 +260,19 @@ public abstract class BSShape
         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
 }
 
@@ -528,8 +541,7 @@ public class BSShapeMesh : BSShape
             {
                 // 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} at {2} in {3}",
-                                    LogHeader, prim.PhysObjectName, prim.RawPosition, physicsScene.Name);
+                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);
             }
         }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
index 1e01526..4357ef1 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
@@ -1,5 +1,9 @@
 CURRENT PROBLEMS TO FIX AND/OR LOOK AT
 =================================================
+Vehicle buoyancy. Computed correctly? Possibly creating very large effective mass.
+    Interaction of llSetBuoyancy and vehicle buoyancy. Should be additive?
+    Negative buoyancy computed correctly
+Computation of mesh mass. How done? How should it be done?
 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.
 Enable vehicle border crossings (at least as poorly as ODE)
-- 
cgit v1.1


From 9fec0faade3979fc6e514b4acde92741aa0e9c16 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Tue, 11 Jun 2013 21:46:40 -0400
Subject: Revert "Add option to set minimum fee for classified ads"

This reverts commit 90097de6c3cf58989698b37c89baa8268895fc86.
---
 bin/Robust.HG.ini.example                       | 8 +-------
 bin/Robust.ini.example                          | 6 ------
 bin/config-include/StandaloneCommon.ini.example | 3 ---
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 2afb978..d9f1ca1 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -1,4 +1,4 @@
-i * Run
+; * Run
 ; * $ Robust.exe -inifile Robust.HG.ini
 ; *
 
@@ -311,9 +311,6 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     ;; Ask co-operative viewers to use a different currency name
     ;Currency = ""
 
-    ;; Minimum fee for creation of classified 
-    ; ClassifiedFee = 0
-
     WelcomeMessage = "Welcome, Avatar!"
     AllowRemoteSetLoginLevel = "false"
 
@@ -439,9 +436,6 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     ; this is the entry point for all user-related HG services
     ; uas = http://127.0.0.1:8002/
 
-    ;; Minimum fee to publish classified add
-    ;  ClassifiedFee = 0
-
 [GatekeeperService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
     ;; for the service
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 3440191..7d6492b 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -274,9 +274,6 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
     ; Ask co-operative viewers to use a different currency name
     ;Currency = ""
 
-    ;; Minimum fee for creation of classified 
-    ; ClassifiedFee = 0
-
     WelcomeMessage = "Welcome, Avatar!"
     AllowRemoteSetLoginLevel = "false"
 
@@ -396,9 +393,6 @@ 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
 
-    ;; Minimum fee to publish classified add
-    ;  ClassifiedFee = 0
-
 [UserProfilesService]
     LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService"
     Enabled = false
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 8ec3daf..8c23c41 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -222,9 +222,6 @@
     ; this is the entry point for all user-related HG services
     ; uas = http://127.0.0.1:9000/
 
-    ;; Minimum fee to publish classified add
-    ;  ClassifiedFee = 0
-
 [MapImageService]
 	; Set this if you want to change the default
 	; TilesStoragePath = "maptiles"
-- 
cgit v1.1


From 47b6e78790be5a4b7d8a0f4c860f1e2f6f87b137 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 12 Jun 2013 21:34:20 +0100
Subject: Implement logging of first 80 characters (debug level 5) or full body
 data (debug level 6) on outgoing requests, depending on debug level

This is set via "debug http out <level>"
This matches the existing debug level behaviours for logging incoming http data
---
 OpenSim/Framework/Servers/MainServer.cs |  8 +++--
 OpenSim/Framework/WebUtil.cs            | 54 +++++++++++++++++++++++++++++++--
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index cfd34bb..d189580 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);
         }
 
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 701fbb0..4599f62 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -151,6 +151,39 @@ namespace OpenSim.Framework
             }
         }
 
+        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)
+            {
+                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)
         {
             int reqnum = RequestNumber++;
@@ -178,7 +211,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)
@@ -357,6 +394,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;
@@ -767,6 +808,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);
@@ -954,6 +998,9 @@ namespace OpenSim.Framework
                     length = (int)obj.Length;
                     request.ContentLength = length;
 
+                    if (WebUtil.DebugLevel >= 5)
+                        WebUtil.LogOutgoingDetail(buffer);
+
                     Stream requestStream = null;
                     try
                     {
@@ -1096,6 +1143,9 @@ namespace OpenSim.Framework
                 int length = (int)buffer.Length;
                 request.ContentLength = length;
 
+                if (WebUtil.DebugLevel >= 5)
+                    WebUtil.LogOutgoingDetail(buffer);
+
                 Stream requestStream = null;
                 try
                 {
@@ -1198,4 +1248,4 @@ namespace OpenSim.Framework
             return deserial;
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1


From 824a4b480873721a4a10598299b185b602e1931d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 12 Jun 2013 23:47:47 +0100
Subject: After calls to GetSuitcaseXFolder() in HGSuitcaseInventoryService,
 consistently check for null return and log warning rather than throw
 exception.

This was being done already in some places.
If an exception is thrown it is now an error rather than debug
---
 .../Handlers/Inventory/XInventoryInConnector.cs    |  2 +-
 .../HypergridService/HGSuitcaseInventoryService.cs | 24 +++++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index 64127c2..9d28dc3 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -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/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index eecf757..410916f 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -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() });
@@ -546,6 +567,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);
-- 
cgit v1.1


From 33573003620674f4a4f6c8fadd969c7aa6576a5d Mon Sep 17 00:00:00 2001
From: teravus
Date: Wed, 12 Jun 2013 18:13:00 -0500
Subject: * This fixes having to select and deselect prim to get keyframemotion
 to start running when pulled from data storage.

---
 OpenSim/Data/MySQL/MySQLSimulationData.cs           | 2 --
 OpenSim/Data/SQLite/SQLiteSimulationData.cs         | 5 +++--
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 5 +++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 448962a..de52623 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -457,8 +457,6 @@ namespace OpenSim.Data.MySQL
                 if (prim.ParentUUID == UUID.Zero)
                 {
                     objects[prim.UUID] = new SceneObjectGroup(prim);
-                    if (prim.KeyframeMotion != null)
-                        prim.KeyframeMotion.UpdateSceneObject(objects[prim.UUID]);
                 }
             }
 
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 70b76c9..c35bba2 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -732,11 +732,12 @@ namespace OpenSim.Data.SQLite
                             }
 
                             SceneObjectGroup group = new SceneObjectGroup(prim);
-                            if (prim.KeyframeMotion != null)
-                                prim.KeyframeMotion.UpdateSceneObject(group);
+                            
                             createdObjects.Add(group.UUID, group);
                             retvals.Add(group);
                             LoadItems(prim);
+
+                           
                         }
                     }
                     catch (Exception e)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index da80e4f..7b5fdcb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -763,6 +763,11 @@ namespace OpenSim.Region.Framework.Scenes
             for (int i = 0; i < parts.Length; i++)
             {
                 SceneObjectPart part = parts[i];
+                if (part.KeyframeMotion != null)
+                {
+                    part.KeyframeMotion.UpdateSceneObject(this);
+                }
+
                 if (Object.ReferenceEquals(part, m_rootPart))
                     continue;
 
-- 
cgit v1.1


From 7759b05dcb39298c0b47da827eda7250db5c2c83 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 13 Jun 2013 00:31:32 +0100
Subject: Make XInventoryServicesConnector properly handle a RESULT = false
 return for methods where this contains failure rather than throwing an
 exception.

Result = False is generated for methods such as GetFolderForType() when the other end wants to signal a failure of the operation in methods such as GetFolderForType()
---
 .../Inventory/XInventoryServicesConnector.cs       | 124 ++++++++++-----------
 1 file changed, 56 insertions(+), 68 deletions(-)

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 =
-- 
cgit v1.1


From 7c00ccb548154c73e9953be19122e4750ef781bd Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 12 Jun 2013 17:48:20 -0700
Subject: DataSnapshot: changed those annoying messages to Debug instead of
 Info.

---
 OpenSim/Region/DataSnapshot/DataRequestHandler.cs |  4 ++--
 OpenSim/Region/DataSnapshot/SnapshotStore.cs      | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

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;
-- 
cgit v1.1


From b2c8d5eec7cc5c6b4685d22921a6e684ce7714b1 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 13 Jun 2013 09:18:27 -0400
Subject: Add Option: ClassifiedFee

  Add option to set minimum fee for publishing classifieds. Many viewers have a
  hard coded minimum of 50, which makes publishing classifieds fail where grids
  have no economy. This allows the grid to set the minimum fee to a suitable
  value for their operation.

  The option is located in the [LoginService] section and defaults to 0. The
  value is sent as "classified_fee" in the login response.
---
 OpenSim/Services/LLLoginService/LLLoginResponse.cs | 18 +++++++++++++++++-
 OpenSim/Services/LLLoginService/LLLoginService.cs  |  4 +++-
 bin/Robust.HG.ini.example                          |  3 +++
 bin/Robust.ini.example                             |  3 +++
 bin/config-include/StandaloneCommon.ini.example    |  3 +++
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 400f303..6ab5258 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -190,6 +190,7 @@ namespace OpenSim.Services.LLLoginService
         private BuddyList m_buddyList = null;
 
         private string currency;
+        private string classifiedFee;
 
         static LLLoginResponse()
         {
@@ -227,7 +228,7 @@ namespace OpenSim.Services.LLLoginService
             GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
             string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
             GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency,
-            string DSTZone, string destinationsURL, string avatarsURL)
+            string DSTZone, string destinationsURL, string avatarsURL, string classifiedFee)
             : this()
         {
             FillOutInventoryData(invSkel, libService);
@@ -251,6 +252,8 @@ namespace OpenSim.Services.LLLoginService
 
             SearchURL = searchURL;
             Currency = currency;
+            ClassifiedFee = classifiedFee;
+
 
             FillOutHomeData(pinfo, home);
             LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z);
@@ -463,6 +466,7 @@ namespace OpenSim.Services.LLLoginService
             searchURL = String.Empty;
 
             currency = String.Empty;
+            ClassifiedFee = "0";
         }
 
 
@@ -555,6 +559,9 @@ namespace OpenSim.Services.LLLoginService
                     // responseData["real_currency"] = currency;
                     responseData["currency"] = currency;
                 }
+                
+                if (ClassifiedFee != String.Empty)
+                    responseData["classified_fee"] = ClassifiedFee;
 
                 responseData["login"] = "true";
 
@@ -659,6 +666,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());
@@ -1064,6 +1074,12 @@ namespace OpenSim.Services.LLLoginService
             set { currency = value; }
         }
 
+        public string ClassifiedFee
+        {
+            get { return classifiedFee; }
+            set { classifiedFee = value; }
+        }
+
         public string DestinationsURL
         {
             get; set;
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index abda98f..10cf90f 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -78,6 +78,7 @@ 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;
 
@@ -119,6 +120,7 @@ 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);
 
@@ -458,7 +460,7 @@ namespace OpenSim.Services.LLLoginService
                         account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
                         where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP,
                         m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone,
-                        m_DestinationGuide, m_AvatarPicker);
+                        m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee);
 
                 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName);
 
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index d9f1ca1..466aed2 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -311,6 +311,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"
 
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 7d6492b..da1b43a 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -274,6 +274,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"
 
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 8c23c41..6b991a8 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -115,6 +115,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.
     ;;
-- 
cgit v1.1


From d412c1b0eb002b9ad5e6fc7aa1e01ea8f3725618 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 14 Jun 2013 23:53:20 +0100
Subject: Don't try to abort worker threads in WebFetchInvDescModule if module
 was not enabled.

This also moves the abort to RemoveRegion() rather than a destructor.
---
 .../Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index d1afff2..2024018 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -116,6 +116,10 @@ namespace OpenSim.Region.ClientStack.Linden
 
             m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
             m_scene.EventManager.OnDeregisterCaps -= DeregisterCaps;
+
+            foreach (Thread t in m_workerThreads)
+                Watchdog.AbortThread(t.ManagedThreadId); 
+
             m_scene = null;
         }
 
@@ -165,12 +169,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);
-- 
cgit v1.1


From fc89bde044bf5805af9a5fe79d6e29e665e133ef Mon Sep 17 00:00:00 2001
From: Talun
Date: Thu, 13 Jun 2013 22:57:09 +0100
Subject: Mantis 6108: ossetprimitiveparams temporary/phantom problem

Corrected to ensure that the target prim is updated by
osSetPrimitiveParams when setting PRIM_TEMP_ON_REZ and/or PRIM_PHANTOM
instead of the prim that the script is in.
---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index e1630b3..d2e9f6c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7725,7 +7725,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                  return null;
 
                              string ph = rules.Data[idx++].ToString();
-                             m_host.ParentGroup.ScriptSetPhantomStatus(ph.Equals("1"));
+                             part.ParentGroup.ScriptSetPhantomStatus(ph.Equals("1"));
 
                              break;
 
@@ -7764,7 +7764,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 return null;
                             string temp = rules.Data[idx++].ToString();
 
-                            m_host.ParentGroup.ScriptSetTemporaryStatus(temp.Equals("1"));
+                            part.ParentGroup.ScriptSetTemporaryStatus(temp.Equals("1"));
 
                             break;
 
-- 
cgit v1.1


From f074739e3381f85a73dfddcb522c0060edede148 Mon Sep 17 00:00:00 2001
From: Talun
Date: Wed, 12 Jun 2013 00:06:08 +0100
Subject: Mantis 6280: llSetContentType(). An implementation.

An implimentation of llSetContentType including all of the new
constants added since the mantis was raised.
---
 .../Shared/Api/Implementation/LSL_Api.cs           | 67 ++++++++++++++++++++++
 .../ScriptEngine/Shared/Api/Interface/ILSL_Api.cs  |  1 +
 .../Shared/Api/Runtime/LSL_Constants.cs            | 11 ++++
 .../ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs    |  5 ++
 4 files changed, 84 insertions(+)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d2e9f6c..733e868 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1480,6 +1480,73 @@ 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)
         {
             Primitive.TextureEntry tex = part.Shape.Textures;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index a6ea88c..ff13ee6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -338,6 +338,7 @@ 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);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 559068d..1137ad8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -359,6 +359,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;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 398c125..87cc342 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -1528,6 +1528,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);
-- 
cgit v1.1


From da3724a904d1edb48b83d7f87b7283fd61c7a273 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 15 Jun 2013 00:11:36 +0100
Subject: minor: remove mono compiler warnings from LSL_Api, properly format
 method doc for llRot2Axis()

---
 .../Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 733e868..256167c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4726,13 +4726,14 @@ 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>
+        /// Converts a Quaternion to X,Y,Z axis rotations
+        /// </summary>
+        /// <returns></returns>
+        /// <param name='rot'></param>
         public LSL_Vector llRot2Axis(LSL_Rotation rot)
         {
             m_host.AddScriptLPS(1);
-            double x, y, z;
 
             if (Math.Abs(rot.s) > 1) // normalization needed
                 rot.Normalize();
@@ -7454,14 +7455,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     return;
                 }
 
-                int code = (int)options.GetLSLIntegerItem(0);
-
                 int idx = 0;
 
                 while (idx < options.Data.Length)
                 {
                     int option = (int)options.GetLSLIntegerItem(idx++);
-                    int remain = options.Data.Length - idx;
 
                     switch (option)
                     {
-- 
cgit v1.1


From 720806b66183dc55589beb9161bdea071ac9c6fa Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 15 Jun 2013 00:34:45 +0100
Subject: Adjust the locking on InventoryCache.  Locking for r/w of the
 ExpiringCache isn't needed since it's thread safe but r/w of contained
 dictionaries isn't thread-safe

---
 .../Inventory/InventoryCache.cs                    | 37 ++++++++++++++--------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
index 1e434b9..dcf33a1 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
@@ -1,11 +1,14 @@
 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 +19,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 +33,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 +56,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 +69,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)
-- 
cgit v1.1


From ecfc6a3f4a44b70c3d7b3b03126f29f246136dfa Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 15 Jun 2013 00:36:04 +0100
Subject: Add the standard OpenSimulator copyright notice to the top of
 InventoryCache.cs

---
 .../Inventory/InventoryCache.cs                    | 29 +++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
index dcf33a1..2fc8ee3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
@@ -1,4 +1,31 @@
-using System;
+/*
+ * 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;
-- 
cgit v1.1


From 9c530d725f13da91caffdbce2759d58a456afff5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 15 Jun 2013 00:41:02 +0100
Subject: refactor: In UserProfileModule, change classifiedCache and
 classifiedInterest to m_classifiedCache and m_classifiedInterest

This is the coding standard name style for private fields.
---
 .../Avatar/UserProfiles/UserProfileModule.cs       | 42 ++++++++++++----------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 322addd..97bb781 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -60,8 +60,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         // 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> classifiedCache = new Dictionary<UUID, UUID>();
-        Dictionary<UUID,int> classifiedInterest = new Dictionary<UUID, int>();
+        Dictionary<UUID,UUID> m_classifiedCache = new Dictionary<UUID, UUID>();
+        Dictionary<UUID,int> m_classifiedInterest = new Dictionary<UUID, int>();
 
         public Scene Scene
         {
@@ -331,16 +331,19 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
                 classifieds[cid] = name;
 
-                if(!classifiedCache.ContainsKey(cid))
+                lock(m_classifiedCache)
                 {
-                    lock(classifiedCache)
-                        classifiedCache.Add(cid,creatorId);
-                    lock(classifiedInterest)
-                        classifiedInterest.Add(cid, 0);
+                    if (!m_classifiedCache.ContainsKey(cid))
+                    {
+                        m_classifiedCache.Add(cid,creatorId);
+
+                        lock(m_classifiedInterest)
+                            m_classifiedInterest.Add(cid, 0);
+                    }
                 }
 
-                lock(classifiedInterest)
-                    classifiedInterest[cid] ++;
+                lock(m_classifiedInterest)
+                    m_classifiedInterest[cid]++;
             }
 
             remoteClient.SendAvatarClassifiedReply(new UUID(args[0]), classifieds);
@@ -352,19 +355,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             UserClassifiedAdd ad = new UserClassifiedAdd();
             ad.ClassifiedId = queryClassifiedID;
 
-            if(classifiedCache.ContainsKey(queryClassifiedID))
+            lock (classifie
+            if (m_classifiedCache.ContainsKey(queryClassifiedID))
             {   
-                target = classifiedCache[queryClassifiedID];
+                target = m_classifiedCache[queryClassifiedID];
 
-                lock(classifiedInterest)
-                    classifiedInterest[queryClassifiedID] --;
+                lock(m_classifiedInterest)
+                    m_classifiedInterest[queryClassifiedID] --;
 
-                if(classifiedInterest[queryClassifiedID] == 0)
+                if(m_classifiedInterest[queryClassifiedID] == 0)
                 {
-                    lock(classifiedInterest)
-                        classifiedInterest.Remove(queryClassifiedID);
-                    lock(classifiedCache)
-                        classifiedCache.Remove(queryClassifiedID);
+                    lock(m_classifiedInterest)
+                        m_classifiedInterest.Remove(queryClassifiedID);
+                    lock(m_classifiedCache)
+                        m_classifiedCache.Remove(queryClassifiedID);
                 }
             }
             
@@ -1339,4 +1343,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         }
         #endregion Web Util
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1


From 42b0c68eabcd79ea1d7d5776b399bcbb46bbbf98 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 15 Jun 2013 00:46:55 +0100
Subject: Correct build break in previous commit 9c530d7

---
 .../Avatar/UserProfiles/UserProfileModule.cs            | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 97bb781..d7ffea8 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -60,8 +60,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         // 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>();
+        Dictionary<UUID, UUID> m_classifiedCache = new Dictionary<UUID, UUID>();
+        Dictionary<UUID, int> m_classifiedInterest = new Dictionary<UUID, int>();
 
         public Scene Scene
         {
@@ -102,7 +102,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
         /// <summary>
         /// Gets or sets a value indicating whether this
-        /// <see cref="BlueWall.SlipStream.ProfileModule.UserProfileModule"/> is enabled.
+        /// <see cref="OpenSim.Region.Coremodules.UserProfiles.UserProfileModule"/> is enabled.
         /// </summary>
         /// <value>
         /// <c>true</c> if enabled; otherwise, <c>false</c>.
@@ -331,15 +331,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
                 classifieds[cid] = name;
 
-                lock(m_classifiedCache)
+                if (!m_classifiedCache.ContainsKey(cid))
                 {
-                    if (!m_classifiedCache.ContainsKey(cid))
-                    {
+                    lock(m_classifiedCache)
                         m_classifiedCache.Add(cid,creatorId);
 
-                        lock(m_classifiedInterest)
-                            m_classifiedInterest.Add(cid, 0);
-                    }
+                    lock(m_classifiedInterest)
+                        m_classifiedInterest.Add(cid, 0);
                 }
 
                 lock(m_classifiedInterest)
@@ -355,7 +353,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             UserClassifiedAdd ad = new UserClassifiedAdd();
             ad.ClassifiedId = queryClassifiedID;
 
-            lock (classifie
             if (m_classifiedCache.ContainsKey(queryClassifiedID))
             {   
                 target = m_classifiedCache[queryClassifiedID];
-- 
cgit v1.1


From e6cb7b47646f8d7a23aca50d92fb57a639bbf702 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 15 Jun 2013 00:52:57 +0100
Subject: Lock m_classifiedCache and m_classifiedInterest dictionary reads in
 UserProfileModule since in the presence of writes these are not thread-safe
 operations.

Simplified locking to m_classifiedCache only since r/w of both dictionaries always occurs together
---
 .../Avatar/UserProfiles/UserProfileModule.cs       | 27 +++++++++++-----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index d7ffea8..161f160 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -331,17 +331,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
                 classifieds[cid] = name;
 
-                if (!m_classifiedCache.ContainsKey(cid))
+                lock (m_classifiedCache)
                 {
-                    lock(m_classifiedCache)
+                    if (!m_classifiedCache.ContainsKey(cid))
+                    {
                         m_classifiedCache.Add(cid,creatorId);
-
-                    lock(m_classifiedInterest)
                         m_classifiedInterest.Add(cid, 0);
-                }
+                    }
 
-                lock(m_classifiedInterest)
                     m_classifiedInterest[cid]++;
+                }
             }
 
             remoteClient.SendAvatarClassifiedReply(new UUID(args[0]), classifieds);
@@ -353,19 +352,19 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             UserClassifiedAdd ad = new UserClassifiedAdd();
             ad.ClassifiedId = queryClassifiedID;
 
-            if (m_classifiedCache.ContainsKey(queryClassifiedID))
-            {   
-                target = m_classifiedCache[queryClassifiedID];
+            lock (m_classifiedCache)
+            {
+                if (m_classifiedCache.ContainsKey(queryClassifiedID))
+                {   
+                    target = m_classifiedCache[queryClassifiedID];
 
-                lock(m_classifiedInterest)
                     m_classifiedInterest[queryClassifiedID] --;
 
-                if(m_classifiedInterest[queryClassifiedID] == 0)
-                {
-                    lock(m_classifiedInterest)
+                    if (m_classifiedInterest[queryClassifiedID] == 0)
+                    {
                         m_classifiedInterest.Remove(queryClassifiedID);
-                    lock(m_classifiedCache)
                         m_classifiedCache.Remove(queryClassifiedID);
+                    }
                 }
             }
             
-- 
cgit v1.1


From 694c4bcbb671338263802457bb5a384c4fe44d26 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Fri, 14 Jun 2013 20:00:20 -0700
Subject: correct method doc for llRot2Axis()

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 256167c..c0b8373 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4727,7 +4727,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         }
 
         /// <summary>
-        /// Converts a Quaternion to X,Y,Z axis rotations
+        /// Returns the axis of rotation for a quaternion
         /// </summary>
         /// <returns></returns>
         /// <param name='rot'></param>
-- 
cgit v1.1


From 0d2fd0d914581f755661455b8db2b9e399154632 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 17 Jun 2013 22:39:00 +0100
Subject: Make general server stats available on the robust console as well as
 the simulator console

This means the "show stats" command is now active on the robust console.
---
 .../Framework/Monitoring/ServerStatsCollector.cs   | 309 +++++++++++++++++++
 OpenSim/Framework/Monitoring/StatsManager.cs       |  72 +++--
 OpenSim/Framework/Servers/BaseOpenSimServer.cs     |  46 +--
 OpenSim/Framework/Servers/ServerBase.cs            |  32 ++
 OpenSim/Region/Application/Application.cs          |   1 +
 OpenSim/Region/Application/OpenSim.cs              |   2 +-
 OpenSim/Region/Application/OpenSimBase.cs          |   7 +-
 .../Framework/Monitoring/ServerStats.cs            | 339 ---------------------
 OpenSim/Server/Base/ServicesServerBase.cs          |  16 +-
 prebuild.xml                                       |   1 +
 10 files changed, 404 insertions(+), 421 deletions(-)
 create mode 100644 OpenSim/Framework/Monitoring/ServerStatsCollector.cs
 delete mode 100644 OpenSim/Region/OptionalModules/Framework/Monitoring/ServerStats.cs

diff --git a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
new file mode 100644
index 0000000..80d0a89
--- /dev/null
+++ b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
@@ -0,0 +1,309 @@
+/*
+ * 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 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)
+        {
+            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/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index 24db6d4..3aee984 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -54,13 +54,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)
         {
@@ -89,10 +89,7 @@ namespace OpenSim.Framework.Monitoring
 
                 if (categoryName == AllSubCommand)
                 {
-                    foreach (var category in RegisteredStats.Values)
-                    {
-                        OutputCategoryStatsToConsole(con, category);
-                    }
+                    OutputAllStatsToConsole(con);
                 }
                 else if (categoryName == ListSubCommand)
                 {
@@ -129,7 +126,18 @@ namespace OpenSim.Framework.Monitoring
             else
             {
                 // Legacy
-                con.Output(SimExtraStats.Report());
+                if (SimExtraStats != null)
+                    con.Output(SimExtraStats.Report());
+                else
+                    OutputAllStatsToConsole(con);
+            }
+        }
+
+        private static void OutputAllStatsToConsole(ICommandConsole con)
+        {
+            foreach (var category in RegisteredStats.Values)
+            {
+                OutputCategoryStatsToConsole(con, category);
             }
         }
 
@@ -150,27 +158,27 @@ namespace OpenSim.Framework.Monitoring
             }
         }
 
-        /// <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>
+//        /// 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.
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 035b3ad..4ab6908 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();
+
+            base.ShutdownSpecific();
 
-            m_console.Commands.AddCommand("General", false, "shutdown",
-                    "shutdown",
-                    "Quit the application", HandleQuit);
+            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>
@@ -143,25 +140,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/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 2c4a687..5358444 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>
@@ -259,6 +261,25 @@ namespace OpenSim.Framework.Servers
                 "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());
+
+            StatsManager.RegisterConsoleCommands(m_console);
+        }
+
+        public void RegisterCommonComponents(IConfigSource configSource)
+        {
+            m_serverStatsCollector = new ServerStatsCollector();
+            m_serverStatsCollector.Initialise(configSource);
+            m_serverStatsCollector.Start();
         }
 
         private void HandleForceGc(string module, string[] args)
@@ -698,5 +719,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() {}
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index c3e7ec2..e451aa8 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -124,6 +124,7 @@ namespace OpenSim
                 workerThreads = workerThreadsMax;
                 m_log.InfoFormat("[OPENSIM MAIN]: Limiting 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)
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 11dd052..9325b12 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -372,7 +372,7 @@ namespace OpenSim
                                           "Unload a module", HandleModules);
         }
 
-        public override void ShutdownSpecific()
+        protected override void ShutdownSpecific()
         {
             if (m_shutdownCommandsFile != String.Empty)
             {
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index f9e0cf1..7ca87a3 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -231,10 +231,7 @@ namespace OpenSim
             }
 
             if (m_console != null)
-            {
-                StatsManager.RegisterConsoleCommands(m_console);
                 AddPluginCommands(m_console);
-            }
         }
 
         protected virtual void AddPluginCommands(ICommandConsole console)
@@ -880,7 +877,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)
             {
@@ -900,6 +897,8 @@ namespace OpenSim
             {
                 m_log.Error("[SHUTDOWN]: Ignoring failure during shutdown - ", e);
             }
+
+            base.ShutdownSpecific();
         }
 
         /// <summary>
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/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index b13c87d..8243900 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -190,16 +190,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
@@ -231,11 +222,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()
@@ -246,4 +238,4 @@ namespace OpenSim.Server.Base
         {
         }
     }
-}
+}
\ No newline at end of file
diff --git a/prebuild.xml b/prebuild.xml
index 88db6ed..29c54c1 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/"/>
-- 
cgit v1.1


From 2c9bb0f9738534732e147c090fac43f3373af1bb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 17 Jun 2013 22:55:25 +0100
Subject: Add server stats for available builtin threadpool and iocp workers

---
 OpenSim/Framework/Monitoring/ServerStatsCollector.cs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
index 80d0a89..fe74ef7 100644
--- a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
@@ -157,6 +157,22 @@ namespace OpenSim.Framework.Monitoring
                 m_log.ErrorFormat("{0} Exception creating 'Process': {1}", LogHeader, e);
             }
 
+            MakeStat("BuiltinThreadpoolWorkerThreadsAvailable", null, "threads", ContainerProcessor, 
+                s => 
+                { 
+                    int workerThreads, iocpThreads; 
+                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads); 
+                    s.Value = workerThreads;
+                });
+
+            MakeStat("BuiltinThreadpoolIOCPThreadsAvailable", null, "threads", ContainerProcessor, 
+                s => 
+                { 
+                    int workerThreads, iocpThreads; 
+                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads); 
+                    s.Value = iocpThreads;
+                });
+
             try
             {
                 List<string> okInterfaceTypes = new List<string>(NetworkInterfaceTypes.Split(','));
-- 
cgit v1.1


From 865d46ae1e0477f957ad674ed2a1a11ef85d885a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 17 Jun 2013 22:56:39 +0100
Subject: Drop server level stats to debug instead of info.

This was the original intention with these stats, as I didn't believe they would be useful to ordinary users if everything is working as it should.
Please amend if this is an issue.
Just for now, levels actually have no impact on what is displayed via the "show stats" command.
---
 OpenSim/Framework/Monitoring/ServerStatsCollector.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
index fe74ef7..c601c17 100644
--- a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
@@ -116,7 +116,7 @@ namespace OpenSim.Framework.Monitoring
             string desc = pDesc;
             if (desc == null)
                 desc = pName;
-            Stat stat = new Stat(pName, pName, desc, pUnit, CategoryServer, pContainer, StatType.Pull, act, StatVerbosity.Info);
+            Stat stat = new Stat(pName, pName, desc, pUnit, CategoryServer, pContainer, StatType.Pull, act, StatVerbosity.Debug);
             StatsManager.RegisterStat(stat);
             RegisteredStats.Add(pName, stat);
         }
-- 
cgit v1.1


From b9dac1f8df3f58cc7b85938f7bbff1e79de371be Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 17 Jun 2013 23:17:55 +0100
Subject: Fix test failure in BasicCircuitTests from previous commit 0d2fd0d9

---
 OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
index 556df30..b47ff54 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>
@@ -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>
-- 
cgit v1.1


From 713a14a6b56188eb0ccf71e2ff78835bd258417e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 17 Jun 2013 23:23:56 +0100
Subject: minor: remove mono compiler warnings in WebFetchInvDescModule

---
 OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 2024018..0e3cd6b 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -34,6 +34,7 @@ using log4net;
 using Nini.Config;
 using Mono.Addins;
 using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
 using OpenSim.Framework.Monitoring;
 using OpenSim.Framework.Servers;
@@ -44,8 +45,6 @@ using OpenSim.Framework.Capabilities;
 using OpenSim.Services.Interfaces;
 using Caps = OpenSim.Framework.Capabilities.Caps;
 using OpenSim.Capabilities.Handlers;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
 
 namespace OpenSim.Region.ClientStack.Linden
 {
@@ -64,7 +63,7 @@ namespace OpenSim.Region.ClientStack.Linden
             public List<UUID> folders;
         }
 
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private Scene m_scene;
 
-- 
cgit v1.1


From c0a00cd7fd887190db61b1c69fb0e8f104a7e438 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 17 Jun 2013 23:34:09 +0100
Subject: Fix bug where no threadpool data would be displayed in the "show
 threads" command if threadpool type was QueueUserWorkItem (Unsafe worked as
 expected)

---
 OpenSim/Framework/Util.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 7f0850f..5e5eb7e 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1880,7 +1880,7 @@ namespace OpenSim.Framework
                 }
             }
             else if (
-                FireAndForgetMethod == FireAndForgetMethod.UnsafeQueueUserWorkItem
+                FireAndForgetMethod == FireAndForgetMethod.QueueUserWorkItem
                     || FireAndForgetMethod == FireAndForgetMethod.UnsafeQueueUserWorkItem)
             {
                 threadPoolUsed = "BuiltInThreadPool";
-- 
cgit v1.1


From b7c9dee033bad425870540c08832058ac86d4ab5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 17 Jun 2013 23:57:10 +0100
Subject: refactor: Move existing code to generate report information on the
 threadpool to the ServerBase rather than being in Util

---
 OpenSim/Framework/Servers/ServerBase.cs |  63 ++++++++++++++++++-
 OpenSim/Framework/Util.cs               | 104 +++++++++++++-------------------
 2 files changed, 103 insertions(+), 64 deletions(-)

diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 5358444..029b848 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -667,7 +667,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();
         }
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 5e5eb7e..ba6cc75 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);
 
@@ -1852,74 +1873,31 @@ 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.QueueUserWorkItem
-                    || 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 (m_ThreadPool == null)
+                return null;
 
-            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");
-            }
+            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;
 
-            return sb.ToString();
+            return stpi;
         }
 
-//        private static object SmartThreadPoolCallback(object o)
-//        {
-//            object[] array = (object[])o;
-//            WaitCallback callback = (WaitCallback)array[0];
-//            object obj = array[1];
-//
-//            callback(obj);
-//            return null;
-//        }
-
         #endregion FireAndForget Threading Pattern
 
         /// <summary>
-- 
cgit v1.1


From a1e32b843745581f7296359427a59e988814106b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 18 Jun 2013 00:10:21 +0100
Subject: If SmartThreadPool is active, display statistical information about
 it in "show stats server"

Also puts these and previous builtin threadpool stats in the "threadpool" stat container rather than "processor"
---
 OpenSim/Framework/Monitoring/ServerStatsCollector.cs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
index c601c17..0ab4b93 100644
--- a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Framework.Monitoring
 
         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";
@@ -157,7 +158,7 @@ namespace OpenSim.Framework.Monitoring
                 m_log.ErrorFormat("{0} Exception creating 'Process': {1}", LogHeader, e);
             }
 
-            MakeStat("BuiltinThreadpoolWorkerThreadsAvailable", null, "threads", ContainerProcessor, 
+            MakeStat("BuiltinThreadpoolWorkerThreadsAvailable", null, "threads", ContainerThreadpool, 
                 s => 
                 { 
                     int workerThreads, iocpThreads; 
@@ -165,7 +166,7 @@ namespace OpenSim.Framework.Monitoring
                     s.Value = workerThreads;
                 });
 
-            MakeStat("BuiltinThreadpoolIOCPThreadsAvailable", null, "threads", ContainerProcessor, 
+            MakeStat("BuiltinThreadpoolIOCPThreadsAvailable", null, "threads", ContainerThreadpool, 
                 s => 
                 { 
                     int workerThreads, iocpThreads; 
@@ -173,6 +174,16 @@ namespace OpenSim.Framework.Monitoring
                     s.Value = iocpThreads;
                 });
 
+            if (Util.FireAndForgetMethod != null && 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);
+            }
+
             try
             {
                 List<string> okInterfaceTypes = new List<string>(NetworkInterfaceTypes.Split(','));
-- 
cgit v1.1


From 0767523834b51772cbdf61002e9c7cbae334ee72 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 18 Jun 2013 21:21:59 +0100
Subject: Fix other places when saving scripts or notecards in prim inventories
 where messages should be transient without an OK button

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 6c79b13..1e4d558 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -326,7 +326,7 @@ namespace OpenSim.Region.Framework.Scenes
             // Update item with new asset
             item.AssetID = asset.FullID;
             if (group.UpdateInventoryItem(item))
-                remoteClient.SendAgentAlertMessage("Script saved", false);
+                remoteClient.SendAlertMessage("Script saved");
             
             part.SendPropertiesToClient(remoteClient);
 
@@ -342,7 +342,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
             else
             {
-                remoteClient.SendAgentAlertMessage("Script saved", false);
+                remoteClient.SendAlertMessage("Script saved");
             }
 
             // Tell anyone managing scripts that a script has been reloaded/changed
@@ -1616,11 +1616,11 @@ namespace OpenSim.Region.Framework.Scenes
                             remoteClient, part, transactionID, currentItem);
 
                         if ((InventoryType)itemInfo.InvType == InventoryType.Notecard)
-                            remoteClient.SendAgentAlertMessage("Notecard saved", false);
+                            remoteClient.SendAlertMessage("Notecard saved");
                         else if ((InventoryType)itemInfo.InvType == InventoryType.LSL)
-                            remoteClient.SendAgentAlertMessage("Script saved", false);
+                            remoteClient.SendAlertMessage("Script saved");
                         else
-                            remoteClient.SendAgentAlertMessage("Item saved", false);
+                            remoteClient.SendAlertMessage("Item saved");
                     }
 
                     // Base ALWAYS has move
-- 
cgit v1.1


From 768e8e363bfb0aedc6edc2e6c1dbf35e1e66b531 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 18 Jun 2013 22:49:49 +0100
Subject: Fix issue where stat samples were accidentally static, so that any
 additional stat with sampling would produce wrong results

---
 OpenSim/Framework/Monitoring/Stats/Stat.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index 2e7665f..69ac0a5 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -95,7 +95,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.
-- 
cgit v1.1


From 9501a583cbc8fd819d2b13db4f9ad76958520ce7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 18 Jun 2013 23:07:18 +0100
Subject: Make number of inbound http requests handled available as a
 httpserver.<port>.IncomingHTTPRequestsProcessed stat

---
 OpenSim/Framework/Monitoring/Stats/Stat.cs         |  7 ++++-
 .../Framework/Servers/HttpServer/BaseHttpServer.cs | 30 ++++++++++++++++++----
 OpenSim/Server/Base/ServicesServerBase.cs          |  4 +++
 prebuild.xml                                       |  1 +
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index 69ac0a5..ca71911 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -27,8 +27,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Text;
-
+using log4net;
 using OpenMetaverse.StructuredData;
 
 namespace OpenSim.Framework.Monitoring
@@ -38,6 +39,8 @@ namespace OpenSim.Framework.Monitoring
     /// </summary>
     public class Stat : IDisposable
     {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         /// <summary>
         /// Category of this stat (e.g. cache, scene, etc).
         /// </summary>
@@ -204,6 +207,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);
             }
         }
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 96a030b..6687441 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;
 
@@ -436,9 +440,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,8 +457,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             
             OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context);
             resp.ReuseContext = true;
-            HandleRequest(req, resp);
-           
+            HandleRequest(req, resp);           
 
             // !!!HACK ALERT!!!
             // There seems to be a bug in the underlying http code that makes subsequent requests
@@ -1824,6 +1826,21 @@ namespace OpenSim.Framework.Servers.HttpServer
                 // useful without inbound HTTP.
                 throw e;
             }
+
+            m_requestsProcessedStat 
+                = new Stat(
+                    "IncomingHTTPRequestsProcessed",
+                    "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)
@@ -1854,6 +1871,9 @@ namespace OpenSim.Framework.Servers.HttpServer
         public void Stop()
         {
             HTTPDRunning = false;
+
+            StatsManager.DeregisterStat(m_requestsProcessedStat);
+
             try
             {
                 m_PollServiceManager.Stop();
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 8243900..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;
@@ -205,6 +206,9 @@ namespace OpenSim.Server.Base
 
         public virtual int Run()
         {
+            Watchdog.Enabled = true;
+            MemoryWatchdog.Enabled = true;
+
             while (m_Running)
             {
                 try
diff --git a/prebuild.xml b/prebuild.xml
index 29c54c1..4cf3b83 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -745,6 +745,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/"/>
-- 
cgit v1.1


From dda44e31e3f649875a7fc7438c4a6880c56dbb31 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 18 Jun 2013 23:10:50 +0100
Subject: minor: tidy up spacing if display a unit for additional stat
 information

---
 OpenSim/Framework/Monitoring/Stats/Stat.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index ca71911..eb5599f 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -258,7 +258,7 @@ namespace OpenSim.Framework.Monitoring
 
                 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);
+                sb.AppendFormat(", {0:0.##} {1}/s", totalChange / divisor / (Watchdog.WATCHDOG_INTERVAL_MS / 1000), UnitName);
             }
         }
     }
-- 
cgit v1.1


From 3fe5e9057f4f45e39c3056742855f580a51c921f Mon Sep 17 00:00:00 2001
From: Kevin Cozens
Date: Mon, 10 Jun 2013 19:59:08 -0400
Subject: Prevent an exception if no offline messages were retrieved.

---
 .../Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index 7d763fa..7f3d0a2 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -182,7 +182,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                         "POST", m_RestURL + "/RetrieveMessages/", client.AgentId);
 
                 if (msglist == null)
+                {
                     m_log.WarnFormat("[OFFLINE MESSAGING]: WARNING null message list.");
+                    return;
+                }
 
                 foreach (GridInstantMessage im in msglist)
                 {
-- 
cgit v1.1


From 1a72f62d7be483cf3a0612528c2b7d7880e0ce0c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 18 Jun 2013 23:52:15 +0100
Subject: minor: remove mono compiler warning in OfflineIMService

---
 OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
-- 
cgit v1.1


From 8a86e29579d654be979bac00c2620d49eb7fb457 Mon Sep 17 00:00:00 2001
From: Talun
Date: Tue, 18 Jun 2013 15:09:55 +0100
Subject: Mantis 6608: Math error in parcel dimensions/borders seen with land
 show command

This patch changes the land show console command to return numbers in the
range 4 to 256 for the "to" coordinates instead of 0 to 252

Also trailing spaces removed from some lines.
---
 OpenSim/Region/CoreModules/World/Land/LandObject.cs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 8406442..e55c9ed 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -81,14 +81,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
@@ -101,11 +101,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
@@ -116,15 +116,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)
-- 
cgit v1.1


From 84af1cab9ba991b2356f1025cab7f58433e2ec19 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 19 Jun 2013 20:48:12 +0100
Subject: Display existing statistic of how many http requests a server is
 making as server.network.HTTPRequestsMade in "show stats all"

---
 .../Framework/Monitoring/ServerStatsCollector.cs    | 21 +++++++++++++++++----
 OpenSim/Framework/Monitoring/Stats/Stat.cs          |  5 +++++
 .../Framework/Servers/HttpServer/BaseHttpServer.cs  |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
index 0ab4b93..07ca14b 100644
--- a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
@@ -114,10 +114,15 @@ namespace OpenSim.Framework.Monitoring
 
         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, act, StatVerbosity.Debug);
+            Stat stat = new Stat(pName, pName, desc, pUnit, CategoryServer, pContainer, StatType.Pull, moi, act, StatVerbosity.Debug);
             StatsManager.RegisterStat(stat);
             RegisteredStats.Add(pName, stat);
         }
@@ -141,7 +146,7 @@ namespace OpenSim.Framework.Monitoring
                 StatsManager.RegisterStat(tempStat);
                 RegisteredStats.Add(tempName, tempStat);
 
-                MakeStat("TotalProcessorTime", null, "sec", ContainerProcessor, 
+                MakeStat("TotalProcessorTime", null, "sec", ContainerProcessor,
                                     (s) => { s.Value = Process.GetCurrentProcess().TotalProcessorTime.TotalSeconds; });
 
                 MakeStat("UserProcessorTime", null, "sec", ContainerProcessor,
@@ -158,7 +163,7 @@ namespace OpenSim.Framework.Monitoring
                 m_log.ErrorFormat("{0} Exception creating 'Process': {1}", LogHeader, e);
             }
 
-            MakeStat("BuiltinThreadpoolWorkerThreadsAvailable", null, "threads", ContainerThreadpool, 
+            MakeStat("BuiltinThreadpoolWorkerThreadsAvailable", null, "threads", ContainerThreadpool,
                 s => 
                 { 
                     int workerThreads, iocpThreads; 
@@ -166,7 +171,7 @@ namespace OpenSim.Framework.Monitoring
                     s.Value = workerThreads;
                 });
 
-            MakeStat("BuiltinThreadpoolIOCPThreadsAvailable", null, "threads", ContainerThreadpool, 
+            MakeStat("BuiltinThreadpoolIOCPThreadsAvailable", null, "threads", ContainerThreadpool,
                 s => 
                 { 
                     int workerThreads, iocpThreads; 
@@ -184,6 +189,14 @@ namespace OpenSim.Framework.Monitoring
                 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(','));
diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index eb5599f..85d1a78 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using System.Text;
 using log4net;
@@ -247,6 +248,10 @@ namespace OpenSim.Framework.Monitoring
 
                 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)
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 6687441..40b8c5c 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1829,7 +1829,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             m_requestsProcessedStat 
                 = new Stat(
-                    "IncomingHTTPRequestsProcessed",
+                    "HTTPRequestsServed",
                     "Number of inbound HTTP requests processed",
                     "",
                     "requests",
-- 
cgit v1.1


From 086fd70a5fdfd9b3a0e56201596f6d6bb20f391e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 20 Jun 2013 00:00:39 +0100
Subject: Make it possible to specify display of stats in a particular
 'container' by separating category and container with a period.

e.g. "show stats server.network"
I failed to realize this had already been implemented without the period in the show stats command (as the command help had not been updated).
However, I would prefer the . approach as it will allow specifying multiple stats, easier wildcarding, etc.
This commit also prevents any stat from having a period in its short name.
---
 OpenSim/Framework/Monitoring/Stats/Stat.cs   |  8 ++++++++
 OpenSim/Framework/Monitoring/StatsManager.cs | 12 +++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index 85d1a78..c57ee0c 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -42,6 +42,8 @@ namespace OpenSim.Framework.Monitoring
     {
 //        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>
@@ -166,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;
diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index 3aee984..af9f5ba 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -68,12 +68,13 @@ 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"
+                    + "If a category container is also specified then only statistics from that category in that container are shown.\n"
                     + "THIS STATS FACILITY IS EXPERIMENTAL AND DOES NOT YET CONTAIN ALL STATS",
                 HandleShowStatsCommand);
         }
@@ -84,8 +85,11 @@ namespace OpenSim.Framework.Monitoring
 
             if (cmd.Length > 2)
             {
-                var categoryName = cmd[2];
-                var containerName = cmd.Length > 3 ? cmd[3] : String.Empty;
+                string name = cmd[2];
+                string[] components = name.Split('.');
+
+                string categoryName = components[0];
+                string containerName = components.Length > 1 ? components[1] : null;
 
                 if (categoryName == AllSubCommand)
                 {
@@ -107,7 +111,9 @@ namespace OpenSim.Framework.Monitoring
                     else
                     {
                         if (String.IsNullOrEmpty(containerName))
+                        {
                             OutputCategoryStatsToConsole(con, category);
+                        }
                         else
                         {
                             SortedDictionary<string, Stat> container;
-- 
cgit v1.1


From 3370e19205352a4ba75e384f8719836a0da0b1df Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 20 Jun 2013 00:17:20 +0100
Subject: minor: fix mono compiler warning in FetchInventory2Handler

---
 .../Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs b/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs
index c0ca1e1..2c91328 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
-- 
cgit v1.1


From d97333255d45da686bb71d85ef492c5631c4dc31 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 20 Jun 2013 00:20:04 +0100
Subject: Fix minor bug where the check whether to display SmartThreadPool
 stats was accidentally != null rather than ==
 FireAndForgetMethod.SmartThreadPool

Due to another check this had no practical effect
---
 OpenSim/Framework/Monitoring/ServerStatsCollector.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
index 07ca14b..5d1c270 100644
--- a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
@@ -179,7 +179,7 @@ namespace OpenSim.Framework.Monitoring
                     s.Value = iocpThreads;
                 });
 
-            if (Util.FireAndForgetMethod != null && Util.GetSmartThreadPoolInfo() != null)
+            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);
-- 
cgit v1.1


From 5b1a9f84fdf4f9938180b403dd002b44e25c6efb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 20 Jun 2013 00:32:12 +0100
Subject: minor: Change "memory churn" terminology in statistics to "heap
 allocation rate" since this is more generally meaningful

---
 OpenSim/Framework/Monitoring/BaseStatsCollector.cs   | 12 ++++++------
 OpenSim/Framework/Monitoring/MemoryWatchdog.cs       |  8 ++++----
 OpenSim/Framework/Monitoring/ServerStatsCollector.cs |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
index be1d02b..20495f6 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.
  *
@@ -45,16 +45,16 @@ namespace OpenSim.Framework.Monitoring
             sb.Append(Environment.NewLine);
 
             sb.AppendFormat(
-                "Allocated to OpenSim objects: {0} MB\n",
+                "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));
 
             sb.AppendFormat(
                 "Process memory              : {0} MB\n",
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
index 5d1c270..b22da1d 100644
--- a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
@@ -242,10 +242,10 @@ namespace OpenSim.Framework.Monitoring
                                 (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); });
+            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: 
-- 
cgit v1.1


From 05790ba1cf7dd07f9f11ce248262041eb300ea49 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 20 Jun 2013 00:45:56 +0100
Subject: Allow more than one stat category to be specified in "show stats"

e.g. "show stats httpserver.9000 server.network"
---
 OpenSim/Framework/Monitoring/StatsManager.cs | 64 +++++++++++++++-------------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index af9f5ba..12d3a75 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 
 namespace OpenSim.Framework.Monitoring
@@ -68,13 +69,14 @@ namespace OpenSim.Framework.Monitoring
                 "General",
                 false,
                 "show stats",
-                "show stats [list|all|<category>[.<container>]",
+                "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"
-                    + "If a category container is also specified then only statistics from that category in that container 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);
         }
@@ -85,45 +87,47 @@ namespace OpenSim.Framework.Monitoring
 
             if (cmd.Length > 2)
             {
-                string name = cmd[2];
-                string[] components = name.Split('.');
+                foreach (string name in cmd.Skip(2))
+                {
+                    string[] components = name.Split('.');
 
-                string categoryName = components[0];
-                string containerName = components.Length > 1 ? components[1] : null;
+                    string categoryName = components[0];
+                    string containerName = components.Length > 1 ? components[1] : null;
 
-                if (categoryName == AllSubCommand)
-                {
-                    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))
+                    if (categoryName == AllSubCommand)
+                    {
+                        OutputAllStatsToConsole(con);
+                    }
+                    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))
+                        SortedDictionary<string, SortedDictionary<string, Stat>> category;
+                        if (!RegisteredStats.TryGetValue(categoryName, out category))
                         {
-                            OutputCategoryStatsToConsole(con, 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);
+                                }
                             }
                         }
                     }
-- 
cgit v1.1


From 085a87060a2ccb4910305b7c5f5374d1cc779d1a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 20 Jun 2013 00:52:39 +0100
Subject: Change "ObjectMemory" stat to "HeapMemory" to align with other stat
 names.  Also round this and ProcessMemory to three decimal places in common
 with other memory stats.

I believe leaving out such minor info makes stats easier to read
---
 OpenSim/Framework/Monitoring/ServerStatsCollector.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
index b22da1d..ac0f0bc 100644
--- a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
@@ -239,9 +239,9 @@ namespace OpenSim.Framework.Monitoring
             }
 
             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; });
+                                (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,
-- 
cgit v1.1


From a33b6eed6d09661445a638efcbb354b0330f9093 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 20 Jun 2013 00:54:19 +0100
Subject: minor: remove mono compiler warnings in WebsocketServerHandler.cs

---
 .../Servers/HttpServer/WebsocketServerHandler.cs     | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

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);
             }
-- 
cgit v1.1


From bbeff4b8ca34a4567f2215ed5e90637a00d8c81e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 20 Jun 2013 09:55:40 -0700
Subject: BulletSim: rework velocity updating when not colliding and not flying
 to prevent infinite jumps. Now jumps last only AvatarJumpFrames long (default
 4) which is about as high as in SL. TODO: jumping should only depend on
 standing (collision with feet) rather than collision anywhere on the avatar.

---
 .../Physics/BulletSPlugin/BSActorAvatarMove.cs     | 44 +++++++++++++++++++---
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs    |  3 ++
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
index ac8c30c..928b350 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -43,8 +43,14 @@ public class BSActorAvatarMove : BSActor
     // 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)
     {
@@ -206,17 +212,45 @@ public class BSActorAvatarMove : BSActor
 
             if (m_controllingPrim.Friction != BSParam.AvatarFriction)
             {
-                // Probably starting up walking. Set friction to moving friction.
+                // 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 falling, we keep the world's downward vector no matter what the other axis specify.
-            // The check for RawVelocity.Z < 0 makes jumping work (temporary upward force).
             if (!m_controllingPrim.Flying && !m_controllingPrim.IsColliding)
             {
-                if (m_controllingPrim.RawVelocity.Z < 0)
+                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);
             }
 
@@ -241,7 +275,7 @@ public class BSActorAvatarMove : BSActor
         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);
-        // This test is done if moving forward, not flying and is colliding with something.
+
         // Check for stairs climbing if colliding, not flying and moving forward
         if ( m_controllingPrim.IsColliding
                     && !m_controllingPrim.Flying
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index aad1108..6437b04 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -134,6 +134,7 @@ public static class BSParam
     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; }
@@ -567,6 +568,8 @@ public static class BSParam
             0.1f ),
 	    new ParameterDefn<float>("AvatarBelowGroundUpCorrectionMeters", "Meters to move avatar up if it seems to be below ground",
             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.6f ) ,
 	    new ParameterDefn<float>("AvatarStepApproachFactor", "Factor to control angle of approach to step (0=straight on)",
-- 
cgit v1.1


From a5de4f692bd0de5faccdcf32a923a72949bb3cca Mon Sep 17 00:00:00 2001
From: Vegaslon
Date: Sat, 15 Jun 2013 17:23:43 -0400
Subject: BulletSim: Implementation of Linear Deflection, it is a partial help
 for the vehicle tuning diffrence between Opensim and Second life.

Signed-off-by: Robert Adams <Robert.Adams@intel.com>
---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 38 +++++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 311cf4f..51207f1 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -209,7 +209,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);
@@ -1029,9 +1029,13 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             Vector3 currentVelV = VehicleVelocity * Quaternion.Inverse(VehicleOrientation);
             Vector3 linearMotorCorrectionV = m_linearMotor.Step(pTimestep, currentVelV);
 
+            //Compute Linear deflection.
+            Vector3 linearDeflectionFactorV = ComputeLinearDeflection(m_linearDeflectionEfficiency, currentVelV, pTimestep);
+            linearMotorCorrectionV += linearDeflectionFactorV;
+
             // Friction reduces vehicle motion
-            Vector3 frictionFactorW = ComputeFrictionFactor(m_linearFrictionTimescale, pTimestep);
-            linearMotorCorrectionV -= (currentVelV * frictionFactorW);
+            Vector3 frictionFactorV = ComputeFrictionFactor(m_linearFrictionTimescale, pTimestep);
+            linearMotorCorrectionV -= (currentVelV * frictionFactorV);
 
             // Motor is vehicle coordinates. Rotate it to world coordinates
             Vector3 linearMotorVelocityW = linearMotorCorrectionV * VehicleOrientation;
@@ -1048,9 +1052,9 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
 
 
-            VDetailLog("{0},  MoveLinear,velocity,origVelW={1},velV={2},correctV={3},correctW={4},newVelW={5},fricFact={6}",
+            VDetailLog("{0},  MoveLinear,velocity,origVelW={1},velV={2},correctV={3},correctW={4},newVelW={5},fricFact={6},LinearDeflec={7}",
                         ControllingPrim.LocalID, origVelW, currentVelV, linearMotorCorrectionV,
-                        linearMotorVelocityW, VehicleVelocity, frictionFactorW);
+                        linearMotorVelocityW, VehicleVelocity, frictionFactorV, linearDeflectionFactorV);
         }
 
         public void ComputeLinearTerrainHeightCorrection(float pTimestep)
@@ -1651,6 +1655,30 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             }
             return frictionFactor;
         }
+        //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 Vector3 ComputeLinearDeflection(float DeflectionEfficiency,Vector3 Velocity,float pTimestep)
+        {
+            Vector3 LinearDeflection = Vector3.Zero;
+            LinearDeflection.Y = SortedClampInRange(0, (Velocity.Y * DeflectionEfficiency) / m_linearDeflectionTimescale, Velocity.Y);
+            LinearDeflection.Z = SortedClampInRange(0, (Velocity.Z * DeflectionEfficiency) / m_linearDeflectionTimescale, Velocity.Z);
+            LinearDeflection.X += Math.Abs(LinearDeflection.Y);
+            LinearDeflection.X += Math.Abs(LinearDeflection.Z);
+            LinearDeflection *= pTimestep;
+                return LinearDeflection*=new Vector3(1,-1,-1);
+
+        }
+        private float SortedClampInRange(float clampa, float val, float clampb)
+        {
+            if (clampa > clampb)
+            {
+                float temp = clampa;
+                clampa = clampb;
+                clampb = temp;
+            }
+           return ClampInRange(clampa, val, clampb);
+
+        }
 
         private float ClampInRange(float low, float val, float high)
         {
-- 
cgit v1.1


From 74539659f6f9be557dbd07fdefa1adae1c59ce87 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 21 Jun 2013 10:46:21 -0700
Subject: BulletSim: move new linear deflection code to own routine. Remove
 VehicleForwardVelocity changed storage since the value will be modified as
 movement is processed.

---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 64 ++++++++++++----------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 51207f1..07e87d1 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -707,7 +707,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;
@@ -719,7 +718,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()
         {
@@ -923,12 +921,7 @@ 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
@@ -981,6 +974,8 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         {
             ComputeLinearVelocity(pTimestep);
 
+            ComputeLinearDeflection(pTimestep);
+
             ComputeLinearTerrainHeightCorrection(pTimestep);
 
             ComputeLinearHover(pTimestep);
@@ -1026,14 +1021,10 @@ 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);
 
-            //Compute Linear deflection.
-            Vector3 linearDeflectionFactorV = ComputeLinearDeflection(m_linearDeflectionEfficiency, currentVelV, pTimestep);
-            linearMotorCorrectionV += linearDeflectionFactorV;
-
-            // Friction reduces vehicle motion
+            // Friction reduces vehicle motion based on absolute speed. Slow vehicle down by friction.
             Vector3 frictionFactorV = ComputeFrictionFactor(m_linearFrictionTimescale, pTimestep);
             linearMotorCorrectionV -= (currentVelV * frictionFactorV);
 
@@ -1050,11 +1041,38 @@ 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},fricFact={6}",
+                        ControllingPrim.LocalID, origVelW, currentVelV, 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;
 
-            VDetailLog("{0},  MoveLinear,velocity,origVelW={1},velV={2},correctV={3},correctW={4},newVelW={5},fricFact={6},LinearDeflec={7}",
-                        ControllingPrim.LocalID, origVelW, currentVelV, linearMotorCorrectionV,
-                        linearMotorVelocityW, VehicleVelocity, frictionFactorV, linearDeflectionFactorV);
+            // 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);
+
+            // Correciont is vehicle relative. Convert to world coordinates and add to the velocity
+            VehicleVelocity += linearDeflectionV * VehicleOrientation;
+
+            VDetailLog("{0},  MoveLinear,LinearDeflection,linDefEff={1},linDefTS={2},linDeflectionV={3}",
+                        ControllingPrim.LocalID, m_linearDeflectionEfficiency, m_linearDeflectionTimescale, linearDeflectionV);
         }
 
         public void ComputeLinearTerrainHeightCorrection(float pTimestep)
@@ -1655,19 +1673,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             }
             return frictionFactor;
         }
-        //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 Vector3 ComputeLinearDeflection(float DeflectionEfficiency,Vector3 Velocity,float pTimestep)
-        {
-            Vector3 LinearDeflection = Vector3.Zero;
-            LinearDeflection.Y = SortedClampInRange(0, (Velocity.Y * DeflectionEfficiency) / m_linearDeflectionTimescale, Velocity.Y);
-            LinearDeflection.Z = SortedClampInRange(0, (Velocity.Z * DeflectionEfficiency) / m_linearDeflectionTimescale, Velocity.Z);
-            LinearDeflection.X += Math.Abs(LinearDeflection.Y);
-            LinearDeflection.X += Math.Abs(LinearDeflection.Z);
-            LinearDeflection *= pTimestep;
-                return LinearDeflection*=new Vector3(1,-1,-1);
 
-        }
         private float SortedClampInRange(float clampa, float val, float clampb)
         {
             if (clampa > clampb)
-- 
cgit v1.1


From 4778d67005c3364ee3f75bdd6640f03ff945d885 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 21 Jun 2013 20:52:46 -0700
Subject: Finally moved HG agent transfers to use agent fatpacks.

---
 .../EntityTransfer/HGEntityTransferModule.cs       |   2 +-
 OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs |   2 +-
 .../Server/Handlers/Hypergrid/HomeAgentHandlers.cs | 200 +++++----------------
 .../Handlers/Hypergrid/UserAgentServerConnector.cs |   2 +-
 .../Server/Handlers/Simulation/AgentHandlers.cs    |  76 +++++---
 .../Hypergrid/GatekeeperServiceConnector.cs        |  68 ++-----
 .../Hypergrid/UserAgentServiceConnector.cs         | 138 ++++----------
 .../Simulation/SimulationServiceConnector.cs       |  29 ++-
 .../Services/HypergridService/UserAgentService.cs  |  12 +-
 OpenSim/Services/Interfaces/IHypergridServices.cs  |   5 +-
 OpenSim/Services/LLLoginService/LLLoginService.cs  |   2 +-
 11 files changed, 171 insertions(+), 365 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 02ed1a0..0715324 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -273,7 +273,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 {
                     string userAgentDriver = agentCircuit.ServiceURLs["HomeURI"].ToString();
                     IUserAgentService connector = new UserAgentServiceConnector(userAgentDriver);
-                    bool success = connector.LoginAgentToGrid(agentCircuit, reg, finalDestination, out reason);
+                    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)
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/HomeAgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
index 968c1e6..df875af 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
@@ -49,191 +49,87 @@ 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 e)
             {
-                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);
-                }
-            }
-
-            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;
+                m_log.WarnFormat("[HOME AGENT HANDLER]: Wrong data type");
 
-            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/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
index b20f467..d9c1bd3 100644
--- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
@@ -108,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)
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index ae37ca7..334d313 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -328,31 +328,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
@@ -373,7 +358,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);
@@ -385,7 +370,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);
@@ -418,7 +432,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)
         {
             return m_SimulationService.CreateAgent(destination, aCircuit, teleportFlags, out reason);
         }
@@ -593,4 +607,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/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index 5bcff48..c9c6c31 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);
                     }
@@ -178,7 +181,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/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 47d0cce..d8a3184 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)
         {
@@ -104,9 +105,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;
 
@@ -117,119 +124,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/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 57f2ffa..e247008 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)
             {
                 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Given destination is null");
@@ -95,12 +111,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();
@@ -110,6 +121,7 @@ namespace OpenSim.Services.Connectors.Simulation
 
                     reason = data["reason"].AsString();
                     success = data["success"].AsBoolean();
+                    myipaddress = data["your_ip"].AsString();
                     return success;
                 }
               
@@ -124,6 +136,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;
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 737e9c9..733993f 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -210,10 +210,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;
 
@@ -265,7 +265,7 @@ namespace OpenSim.Services.HypergridService
             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);
@@ -296,8 +296,8 @@ namespace OpenSim.Services.HypergridService
 
             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();
+            if (fromLogin)
+                m_TravelingAgents[agentCircuit.SessionID].ClientIPAddress = agentCircuit.IPAddress;
             m_TravelingAgents[agentCircuit.SessionID].MyIpAddress = myExternalIP;
 
             return true;
@@ -306,7 +306,7 @@ 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)
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/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 10cf90f..fe43582 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -933,7 +933,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;
         }
-- 
cgit v1.1


From ca3ce6da7349425f117ad1f1a596e7e868fdd4c1 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 22 Jun 2013 08:26:59 -0700
Subject: HG: avoid call on localhost between sim and UAS for standalone.

---
 .../EntityTransfer/HGEntityTransferModule.cs        | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 0715324..630d1c3 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)
@@ -194,7 +204,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             base.RegionLoaded(scene);
 
             if (m_Enabled)
+            {
                 m_GatekeeperConnector = new GatekeeperServiceConnector(scene.AssetService);
+                m_UAS = scene.RequestModuleInterface<IUserAgentService>();
+            }
         }
 
         public override void RemoveRegion(Scene scene)
@@ -272,7 +285,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 if (agentCircuit.ServiceURLs.ContainsKey("HomeURI"))
                 {
                     string userAgentDriver = agentCircuit.ServiceURLs["HomeURI"].ToString();
-                    IUserAgentService connector = new UserAgentServiceConnector(userAgentDriver);
+                    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
 
-- 
cgit v1.1


From 6c7e33fe472014688837b993118fc48878f134ff Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 22 Jun 2013 08:29:06 -0700
Subject: Change IsLocalRegion from using region handle to using regionID. This
 was affecting UpdateAgent and CloseAgent in cases where the foreign region is
 on the same coordinates as *some* local region.

---
 .../Simulation/RemoteSimulationConnector.cs                    | 10 +++++-----
 OpenSim/Server/Handlers/Simulation/AgentHandlers.cs            |  1 -
 .../Connectors/Simulation/SimulationServiceConnector.cs        |  2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index b2a1b23..d120e11 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -194,7 +194,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,7 +206,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);
@@ -224,7 +224,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                 return true;
 
             // else do the remote thing
-            if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
+            if (!m_localBackend.IsLocalRegion(destination.RegionID))
                 return m_remoteConnector.RetrieveAgent(destination, id, out agent);
 
             return false;
@@ -273,7 +273,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                 return true;
 
             // else do the remote thing
-            if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
+            if (!m_localBackend.IsLocalRegion(destination.RegionID))
                 return m_remoteConnector.CloseAgent(destination, id);
             
             return false;
@@ -296,7 +296,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/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 334d313..71a9e6f 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -576,7 +576,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))
             {
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index e247008..f51c809 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -241,7 +241,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 + "/";
-- 
cgit v1.1


From 4bf1afe300c61ac79fee7d794ead2b0100c5687a Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 23 Jun 2013 01:14:07 +0200
Subject: Fix prim locking to behave like SL

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 7b5fdcb..f1036ae 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2699,8 +2699,8 @@ namespace OpenSim.Region.Framework.Scenes
                     part.ClonePermissions(RootPart);
             });
 
-            uint lockMask = ~(uint)PermissionMask.Move;
-            uint lockBit = RootPart.OwnerMask & (uint)PermissionMask.Move;
+            uint lockMask = ~(uint)(PermissionMask.Move | PermissionMask.Modify);
+            uint lockBit = RootPart.OwnerMask & (uint)(PermissionMask.Move | PermissionMask.Modify);
             RootPart.OwnerMask = (RootPart.OwnerMask & lockBit) | ((newOwnerMask | foldedPerms) & lockMask);
             RootPart.ScheduleFullUpdate();
         }
-- 
cgit v1.1


From 4b00203fa5d1ae645cf7bd67d061ee751d5c447b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 25 Jun 2013 00:15:55 +0100
Subject: Tidy up SOG.UpdateRootPosition() to eliminate unnecessary copying of
 Vector3 structs

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index f1036ae..75d0667 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3028,8 +3028,8 @@ 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)
         {
 //            m_log.DebugFormat(
 //                "[SCENE OBJECT GROUP]: Updating root position of {0} {1} to {2}", Name, LocalId, pos);
@@ -3038,16 +3038,10 @@ namespace OpenSim.Region.Framework.Scenes
 //            for (int i = 0; i < parts.Length; i++)
 //                parts[i].StoreUndoState();
 
-            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 = 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++)
-- 
cgit v1.1


From ce9b1320d273890610a2ccd4f1ada39498135049 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 25 Jun 2013 00:41:46 +0100
Subject: Improve situation where editing just the root prim of an attachment
 causes other prims to be set to very far off positions on reattach.

Functionally the same as the patch by tglion in http://opensimulator.org/mantis/view.php?id=5334
However, not yet perfect - after editing just root prim on reattach the position is still wrong, though other prims are not set to far off positions.
---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 75d0667..4b4e4ba 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3038,7 +3038,16 @@ namespace OpenSim.Region.Framework.Scenes
 //            for (int i = 0; i < parts.Length; i++)
 //                parts[i].StoreUndoState();
 
-            Vector3 oldPos = AbsolutePosition + RootPart.OffsetPosition;
+            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;
             Quaternion partRotation = m_rootPart.RotationOffset;
             diff *= Quaternion.Inverse(partRotation);
-- 
cgit v1.1


From f78d2ef166a523397c770858176eff646be4021d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 25 Jun 2013 00:46:15 +0100
Subject: Update temporary "Unknown UserUMMTGUN2" name to "Unknown
 UserUMMTGUN3" to see if Diva's recent HG updates (post 6c7e33f) fix this
 issue.

This string is returned if a UserManagementModule.TryGetUserNames() cannot find a server-side name binding or a user account for a given UUID.
This is only called when the viewer requests a binding via the UDP UUIDNameRequest message
---
 .../Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 864e181..194b591 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -320,7 +320,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             else
             {
                 names[0] = "Unknown";
-                names[1] = "UserUMMTGUN2";
+                names[1] = "UserUMMTGUN3";
 
                 return false;
             }
-- 
cgit v1.1


From f7d09b898ad6df32b3f07cb64657623980178c2f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 27 Jun 2013 23:14:28 +0100
Subject: Make the concept of namespaces explicit in dynamic attributes

This is in order to reduce the likelihood of naming clashes, make it easier to filter in/out attributes, ensure uniformity, etc.
All dynattrs in the opensim distro itself or likely future ones should be in the "OpenSim" namespace.
This does alter the underlying dynattrs data structure.  All data in previous structures may not be available, though old structures should not cause errors.
This is done without notice since this feature has been explicitly labelled as experimental, subject to change and has not been in a release.
However, existing materials data is being preserved by moving it to the "Materials" store in the "OpenSim" namespace.
---
 OpenSim/Data/MSSQL/MSSQLSimulationData.cs          |   2 +-
 OpenSim/Data/MySQL/MySQLSimulationData.cs          |   2 +-
 OpenSim/Data/SQLite/SQLiteSimulationData.cs        |   2 +-
 OpenSim/Framework/DAMap.cs                         | 300 ++++++++++++---------
 OpenSim/Framework/DOMap.cs                         |   8 +-
 .../Framework/DynamicAttributes/DAExampleModule.cs |  17 +-
 .../Framework/DynamicAttributes/DOExampleModule.cs |   8 +-
 .../World/Serialiser/Tests/SerialiserTests.cs      |  44 ++-
 .../Scenes/Serialization/SceneObjectSerializer.cs  |   2 +-
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs    |  18 +-
 .../Materials/MaterialsDemoModule.cs               |  26 +-
 11 files changed, 257 insertions(+), 172 deletions(-)

diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
index 476f57a..5135050 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/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index de52623..cf367ef 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -1679,7 +1679,7 @@ namespace OpenSim.Data.MySQL
             else
                 cmd.Parameters.AddWithValue("KeyframeMotion", new Byte[0]);
 
-            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/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index c35bba2..eba6612 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -2176,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;
diff --git a/OpenSim/Framework/DAMap.cs b/OpenSim/Framework/DAMap.cs
index df4a6bc..a57393b 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,133 @@ 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;
+
+            // Hard-coded special case that needs to be removed in the future.  Normally, modules themselves should
+            // handle reading data from old locations
+            bool osMaterialsMigrationRequired = false;
+
+            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);
+                }
+                else if (key == "OS:Materials")
+                {
+                    osMaterialsMigrationRequired = true;
+                }
+            }
+
+            if (keysToRemove != null)
+            {
+                foreach (string key in keysToRemove)
+                {
+//                    Console.WriteLine ("Removing bad ns {0}", key);
+                    namespacesMap.Remove(key);
+                }
+            }
+
+            // Hard-coded special case that needs to be removed in the future.  Normally, modules themselves should
+            // handle reading data from old locations
+            if (osMaterialsMigrationRequired)
+                daMap.SetStore("OpenSim", "Materials", (OSDMap)namespacesMap["OS:Materials"]);
+
+            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.
-        /// </summary>
-        /// <param name="key">Store name</param>
-        /// <returns></returns>
-        public OSDMap this[string key] 
-        {    
-            get  
-            {                    
-                OSD llsd;
-                
-                lock (this)
+
+        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;
+        }
+
+        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 +258,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);
-        }    
-
-        public void Add(string key, OSDMap store)
-        {
-            ValidateKey(key);
-            lock (this)
-                m_map.Add(key, store);
-        }    
+            OSD namespaceOsd;
 
-        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 +305,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)
+        public bool RemoveStore(string ns, string storeName)
         {
-            throw new NotImplementedException();
-        }
+            OSD namespaceOsd; 
 
-        public bool Remove(KeyValuePair<string, OSDMap> kvp)
-        {
-            lock (this)
-                return m_map.Remove(kvp.Key);
-        }
-
-        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/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/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/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 3882b45..945745e 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1290,7 +1290,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/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 0e83781..586b59d 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -212,7 +212,6 @@ namespace OpenSim.Region.Framework.Scenes
 //            }
 //        }
 
-
         /// <summary>
         /// Gather all of the texture asset UUIDs used to reference "Materials" such as normal and specular maps
         /// </summary>
@@ -221,20 +220,23 @@ namespace OpenSim.Region.Framework.Scenes
         public void GatherMaterialsUuids(SceneObjectPart part, IDictionary<UUID, AssetType> assetUuids)
         {
             // scan thru the dynAttrs map of this part for any textures used as materials
-            OSDMap OSMaterials = null;
+            OSD osdMaterials = null;
 
             lock (part.DynAttrs)
             {
-                if (part.DynAttrs.ContainsKey("OS:Materials"))
-                    OSMaterials = part.DynAttrs["OS:Materials"];
-                if (OSMaterials != null && OSMaterials.ContainsKey("Materials"))
+                if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
+                {
+                    OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+                    materialsStore.TryGetValue("Materials", out osdMaterials);
+                }
+
+                if (osdMaterials != null)
                 {
-                    OSD osd = OSMaterials["Materials"];
                     //m_log.Info("[UUID Gatherer]: found Materials: " + OSDParser.SerializeJsonString(osd));
 
-                    if (osd is OSDArray)
+                    if (osdMaterials is OSDArray)
                     {
-                        OSDArray matsArr = osd as OSDArray;
+                        OSDArray matsArr = osdMaterials as OSDArray;
                         foreach (OSDMap matMap in matsArr)
                         {
                             try
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 4ab6609..5b15a73 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -178,7 +178,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
 
         void GetStoredMaterialsForPart(SceneObjectPart part)
         { 
-            OSDMap OSMaterials = null;
+            OSD OSMaterials = null;
             OSDArray matsArr = null;
 
             if (part.DynAttrs == null)
@@ -188,23 +188,20 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
 
             lock (part.DynAttrs)
             {
-                if (part.DynAttrs.ContainsKey("OS:Materials"))
-                    OSMaterials = part.DynAttrs["OS:Materials"];
-                if (OSMaterials != null && OSMaterials.ContainsKey("Materials"))
+                if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
                 {
-
-                    OSD osd = OSMaterials["Materials"];
-                    if (osd is OSDArray)
-                        matsArr = osd as OSDArray;
+                    OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+                    materialsStore.TryGetValue("Materials", out OSMaterials);
                 }
-            }
 
-            if (OSMaterials == null)
-                return;
+                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 :( ");
@@ -215,7 +212,6 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             {
                 if (elemOsd != null && elemOsd is OSDMap)
                 {
-
                     OSDMap matMap = elemOsd as OSDMap;
                     if (matMap.ContainsKey("ID") && matMap.ContainsKey("Material"))
                     {
@@ -232,7 +228,6 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             }
         }
 
-        
         void StoreMaterialsForPart(SceneObjectPart part)
         {
             try
@@ -277,7 +272,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                 OSMaterials["Materials"] = matsArr;
 
                 lock (part.DynAttrs)
-                    part.DynAttrs["OS:Materials"] = OSMaterials;
+                    part.DynAttrs.SetStore("OpenSim", "Materials", OSMaterials);
             }
             catch (Exception e)
             {
@@ -285,7 +280,6 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             }
         }
 
-
         public string RenderMaterialsPostCap(string request, string path,
                 string param, IOSHttpRequest httpRequest,
                 IOSHttpResponse httpResponse)
-- 
cgit v1.1


From 149487ea0f74a46a70c98b3a31259b667f4d29b2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 27 Jun 2013 23:42:35 +0100
Subject: refactor: Move code for gathering textures referenced by materials
 into MaterialsDemoModule from UuidGatherer

This code is now triggered via EventManager.OnGatherUuids which modules can subscribe to.
---
 OpenSim/Region/Framework/Scenes/EventManager.cs    | 31 ++++++++++
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs    | 69 +--------------------
 .../Materials/MaterialsDemoModule.cs               | 72 +++++++++++++++++++++-
 3 files changed, 103 insertions(+), 69 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index a246319..720bfa9 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -1021,6 +1021,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;
@@ -3237,5 +3247,26 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
         }
+
+        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/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 586b59d..3492813 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -186,8 +186,7 @@ namespace OpenSim.Region.Framework.Scenes
                             GatherAssetUuids(tii.AssetID, (AssetType)tii.Type, assetUuids);
                     }
 
-                    // get any texture UUIDs used for materials such as normal and specular maps
-                    GatherMaterialsUuids(part, assetUuids);
+                    part.ParentGroup.Scene.EventManager.TriggerGatherUuids(part, assetUuids);
                 }
                 catch (Exception e)
                 {
@@ -211,71 +210,7 @@ namespace OpenSim.Region.Framework.Scenes
 //                Monitor.Pulse(this);
 //            }
 //        }
-
-        /// <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");
-                    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.
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 5b15a73..e7b8928 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -121,9 +121,11 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                 return;
 
             m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} ADDED", scene.RegionInfo.RegionName);
+
             m_scene = scene;
-            m_scene.EventManager.OnRegisterCaps += new EventManager.RegisterCapsEvent(OnRegisterCaps);
-            m_scene.EventManager.OnObjectAddedToScene += new Action<SceneObjectGroup>(EventManager_OnObjectAddedToScene);
+            m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
+            m_scene.EventManager.OnObjectAddedToScene += EventManager_OnObjectAddedToScene;
+            m_scene.EventManager.OnGatherUuids += GatherMaterialsUuids;           
         }
 
         void EventManager_OnObjectAddedToScene(SceneObjectGroup obj)
@@ -157,6 +159,10 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             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);
         }        
         
@@ -569,5 +575,67 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             output.Flush();
         }
 
+        /// <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");
+                    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
-- 
cgit v1.1


From c1b8f83dd4ad3e3c811a16b4b096edab7abccf8e Mon Sep 17 00:00:00 2001
From: dahlia
Date: Thu, 27 Jun 2013 17:53:15 -0700
Subject: test for null return from DynAttrs.GetStore()

---
 OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index e7b8928..be2d8da 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -590,6 +590,9 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                 if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
                 {
                     OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+                    if (materialsStore == null)
+                        return;
+                        
                     materialsStore.TryGetValue("Materials", out osdMaterials);
                 }
 
-- 
cgit v1.1


From d47fc48b3230b6d5cb555014d6242960cd397810 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Thu, 27 Jun 2013 18:01:17 -0700
Subject: and yet another check for null returned from DynAttrs.GetStore()

---
 OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index be2d8da..34dc552 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -197,6 +197,10 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                 if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
                 {
                     OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+
+                    if (materialsStore == null)
+                        return;
+
                     materialsStore.TryGetValue("Materials", out OSMaterials);
                 }
 
-- 
cgit v1.1


From 529633d9707ee0df6b32e8dc692ab615e3563b63 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Thu, 27 Jun 2013 18:44:27 -0700
Subject: add method docs for DAMap.GetStore() and DAMap.SetStore()

---
 OpenSim/Framework/DAMap.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/OpenSim/Framework/DAMap.cs b/OpenSim/Framework/DAMap.cs
index a57393b..fd45a11 100644
--- a/OpenSim/Framework/DAMap.cs
+++ b/OpenSim/Framework/DAMap.cs
@@ -216,6 +216,12 @@ namespace OpenSim.Framework
             }
         }
 
+        /// <summary>
+        /// Retrieve 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>
+        /// <returns>an OSDMap representing the stored data, or null if not found</returns>
         public OSDMap GetStore(string ns, string storeName)
         {
             OSD namespaceOsd;
@@ -234,6 +240,12 @@ namespace OpenSim.Framework
             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);
-- 
cgit v1.1


From f6ce87c96d037787963d203346c5cb1a1dd52747 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 28 Jun 2013 18:50:33 +0100
Subject: Reinsert code for gathering uuids reference by materials back
 directly into UuidGatherer for now.

This cannot be triggered as an event from Scene.EventManager since some invocations of UuidGatherer (e.g. IAR saving) use scene objects which are not in scenes.
There needs to be some way for modules to register for events which are not connected with a particular scene.
---
 OpenSim/Region/Framework/Scenes/EventManager.cs    |  58 ++++-----
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs    |  71 ++++++++++-
 .../Materials/MaterialsDemoModule.cs               | 136 +++++++++++----------
 3 files changed, 168 insertions(+), 97 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 720bfa9..61b0ebd 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -1021,15 +1021,15 @@ 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 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
         {
@@ -3248,25 +3248,25 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        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);
-                    }
-                }
-            }
-        }
+//        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/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 3492813..4e5fb8e 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -186,7 +186,13 @@ namespace OpenSim.Region.Framework.Scenes
                             GatherAssetUuids(tii.AssetID, (AssetType)tii.Type, assetUuids);
                     }
 
-                    part.ParentGroup.Scene.EventManager.TriggerGatherUuids(part, 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)
                 {
@@ -210,6 +216,69 @@ namespace OpenSim.Region.Framework.Scenes
 //                Monitor.Pulse(this);
 //            }
 //        }
+
+        /// <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");
+                    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
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 34dc552..1cfbab0 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             m_scene = scene;
             m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
             m_scene.EventManager.OnObjectAddedToScene += EventManager_OnObjectAddedToScene;
-            m_scene.EventManager.OnGatherUuids += GatherMaterialsUuids;           
+//            m_scene.EventManager.OnGatherUuids += GatherMaterialsUuids;           
         }
 
         void EventManager_OnObjectAddedToScene(SceneObjectGroup obj)
@@ -161,7 +161,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
 
             m_scene.EventManager.OnRegisterCaps -= OnRegisterCaps;
             m_scene.EventManager.OnObjectAddedToScene -= EventManager_OnObjectAddedToScene;
-            m_scene.EventManager.OnGatherUuids -= GatherMaterialsUuids; 
+//            m_scene.EventManager.OnGatherUuids -= GatherMaterialsUuids; 
 
             m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
         }        
@@ -579,70 +579,72 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             output.Flush();
         }
 
-        /// <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);
-                            }
-                        }
-                    }
-                }
-            }
-        }
+        // 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
-- 
cgit v1.1


From dc0455e217b8da3fc8bd49e959b57d6021312b77 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 28 Jun 2013 19:11:44 +0100
Subject: In XAssetService, on a delete asset request also delete the asset in
 any chained service.

This eliminates the async migration since it causes a race condition with the "delete asset" console command
---
 OpenSim/Data/MySQL/MySQLXAssetData.cs          | 2 ++
 OpenSim/Services/AssetService/XAssetService.cs | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs
index 8c93825..91389ce 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/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
-- 
cgit v1.1


From e26e8b882965430f66c6459987a8b219d68e5da1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 28 Jun 2013 19:19:38 +0100
Subject: Remove "Asset deletion not supported by database" message from
 "delete asset" robust/standalone console command since it actually was
 implemented and performed.

Improve other associated messages.
---
 OpenSim/Server/Handlers/Asset/AssetServerConnector.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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)
-- 
cgit v1.1


From cbb51227296df9b158430d4a8adfcc96bdd55ed5 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Fri, 28 Jun 2013 14:00:28 -0700
Subject: add some locking to materials storage dictionary

---
 .../Materials/MaterialsDemoModule.cs               | 72 +++++++++++++---------
 1 file changed, 42 insertions(+), 30 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 34dc552..19d8141 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -173,11 +173,14 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
         OSDMap GetMaterial(UUID id)
         {
             OSDMap map = null;
-            if (m_knownMaterials.ContainsKey(id))
+            lock (m_knownMaterials)
             {
-                map = new OSDMap();
-                map["ID"] = OSD.FromBinary(id.GetBytes());
-                map["Material"] = m_knownMaterials[id];
+                if (m_knownMaterials.ContainsKey(id))
+                {
+                    map = new OSDMap();
+                    map["ID"] = OSD.FromBinary(id.GetBytes());
+                    map["Material"] = m_knownMaterials[id];
+                }
             }
             return map;
         }
@@ -227,7 +230,8 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                     {
                         try
                         {
-                            m_knownMaterials[matMap["ID"].AsUUID()] = (OSDMap)matMap["Material"];
+                            lock (m_knownMaterials)
+                                m_knownMaterials[matMap["ID"].AsUUID()] = (OSDMap)matMap["Material"];
                         }
                         catch (Exception e)
                         {
@@ -251,8 +255,11 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
 
                 if (te.DefaultTexture != null)
                 {
-                    if (m_knownMaterials.ContainsKey(te.DefaultTexture.MaterialID))
-                        mats[te.DefaultTexture.MaterialID] = m_knownMaterials[te.DefaultTexture.MaterialID];
+                    lock (m_knownMaterials)
+                    {
+                        if (m_knownMaterials.ContainsKey(te.DefaultTexture.MaterialID))
+                            mats[te.DefaultTexture.MaterialID] = m_knownMaterials[te.DefaultTexture.MaterialID];
+                    }
                 }
 
                 if (te.FaceTextures != null)
@@ -261,8 +268,11 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                     {
                         if (face != null)
                         {
-                            if (m_knownMaterials.ContainsKey(face.MaterialID))
-                                mats[face.MaterialID] = m_knownMaterials[face.MaterialID];
+                            lock (m_knownMaterials)
+                            {
+                                if (m_knownMaterials.ContainsKey(face.MaterialID))
+                                    mats[face.MaterialID] = m_knownMaterials[face.MaterialID];
+                            }
                         }
                     }
                 }
@@ -323,18 +333,21 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                                 try
                                 {
                                     UUID id = new UUID(elem.AsBinary(), 0);
-                                    
-                                    if (m_knownMaterials.ContainsKey(id))
+
+                                    lock (m_knownMaterials)
                                     {
-                                        m_log.Info("[MaterialsDemoModule]: request for known material ID: " + id.ToString());
-                                        OSDMap matMap = new OSDMap();
-                                        matMap["ID"] = OSD.FromBinary(id.GetBytes());
+                                        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);
+                                            matMap["Material"] = m_knownMaterials[id];
+                                            respArr.Add(matMap);
+                                        }
+                                        else
+                                            m_log.Info("[MaterialsDemoModule]: request for UNKNOWN material ID: " + id.ToString());
                                     }
-                                    else
-                                        m_log.Info("[MaterialsDemoModule]: request for UNKNOWN material ID: " + id.ToString());
                                 }
                                 catch (Exception e)
                                 {
@@ -372,7 +385,8 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                                             m_log.Debug("[MaterialsDemoModule]: mat: " + OSDParser.SerializeJsonString(mat));
                                         
                                             UUID id = HashOsd(mat);
-                                            m_knownMaterials[id] = mat;
+                                            lock (m_knownMaterials)
+                                                m_knownMaterials[id] = mat;
                                         
 
                                             var sop = m_scene.GetSceneObjectPart(matLocalID);
@@ -480,24 +494,22 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             m_log.Debug("[MaterialsDemoModule]: GET cap handler");
 
             OSDMap resp = new OSDMap();
-
- 
             int matsCount = 0;
-
             OSDArray allOsd = new OSDArray();
 
-            foreach (KeyValuePair<UUID, OSDMap> kvp in m_knownMaterials)
+            lock (m_knownMaterials)
             {
-                OSDMap matMap = new OSDMap();
-
-                matMap["ID"] = OSD.FromBinary(kvp.Key.GetBytes());
+                foreach (KeyValuePair<UUID, OSDMap> kvp in m_knownMaterials)
+                {
+                    OSDMap matMap = new OSDMap();
 
-                matMap["Material"] = kvp.Value;
-                allOsd.Add(matMap);
-                matsCount++;
+                    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());
 
-- 
cgit v1.1


From 4406f07a84faf2622fb1e238757b2ce2545cc24c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 28 Jun 2013 23:34:16 +0100
Subject: Add IMG_BLOOM1.jp2 to standard asset set, which is used in stars.

This makes stars appear more realistically rather than as massive chunks due to the missing IMG_BLOOM1 asset from the viewer.
Thanks to YoshikoFazuku for supplying the star asset which I then uploaded via a viewer and extracted as JPEG2000.
Thanks also to Ai Austin for helping this process along.
See http://opensimulator.org/mantis/view.php?id=6691 for more details.
---
 CONTRIBUTORS.txt                                 |   5 ++---
 bin/assets/TexturesAssetSet/IMG_BLOOM1.jp2       | Bin 0 -> 11276 bytes
 bin/assets/TexturesAssetSet/TexturesAssetSet.xml |  12 ++++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 bin/assets/TexturesAssetSet/IMG_BLOOM1.jp2

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 7601a50..f621cd3 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -58,7 +58,7 @@ 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
@@ -163,6 +163,7 @@ what it is today.
 * webmage (IBM)
 * Xantor
 * Y. Nitta
+* YoshikoFazuku
 * YZh
 * Zackary Geers aka Kunnis Basiat
 * Zha Ewry
@@ -215,5 +216,3 @@ In addition, we would like to thank:
 * The Mono Project
 * The NANT Developers
 * Microsoft (.NET, MSSQL-Adapters)
-*x
-  
diff --git a/bin/assets/TexturesAssetSet/IMG_BLOOM1.jp2 b/bin/assets/TexturesAssetSet/IMG_BLOOM1.jp2
new file mode 100644
index 0000000..8186d49
Binary files /dev/null and b/bin/assets/TexturesAssetSet/IMG_BLOOM1.jp2 differ
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>
-- 
cgit v1.1


From 371085546d93c610770abe1182e2add1d75cb16e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 28 Jun 2013 23:57:41 +0100
Subject: Add materials store null check into UuidGatherer code.

---
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 4e5fb8e..8f69ce3 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -232,6 +232,10 @@ namespace OpenSim.Region.Framework.Scenes
                 if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
                 {
                     OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+
+                    if (materialsStore == null)
+                        return;
+
                     materialsStore.TryGetValue("Materials", out osdMaterials);
                 }
 
-- 
cgit v1.1


From 3a634c56e344dcaa9bf089168bed185cee4527bf Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 29 Jun 2013 00:23:41 +0100
Subject: Remove hack to migrate previous experimental-level os materials data.

This didn't seem to be working anyway and it's better not to have such hacks in the code for experimental stuff.
---
 OpenSim/Framework/DAMap.cs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/OpenSim/Framework/DAMap.cs b/OpenSim/Framework/DAMap.cs
index fd45a11..5c729e8 100644
--- a/OpenSim/Framework/DAMap.cs
+++ b/OpenSim/Framework/DAMap.cs
@@ -148,10 +148,6 @@ namespace OpenSim.Framework
 
                     keysToRemove.Add(key);
                 }
-                else if (key == "OS:Materials")
-                {
-                    osMaterialsMigrationRequired = true;
-                }
             }
 
             if (keysToRemove != null)
@@ -163,11 +159,6 @@ namespace OpenSim.Framework
                 }
             }
 
-            // Hard-coded special case that needs to be removed in the future.  Normally, modules themselves should
-            // handle reading data from old locations
-            if (osMaterialsMigrationRequired)
-                daMap.SetStore("OpenSim", "Materials", (OSDMap)namespacesMap["OS:Materials"]);
-
             foreach (OSD nsOsd in namespacesMap.Values)
             {
                 OSDMap nsOsdMap = (OSDMap)nsOsd;
-- 
cgit v1.1


From 00093a305d225c98ffe00b656df7943cb50c42b0 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 29 Jun 2013 18:35:23 -0700
Subject: Changed HG status notifications timeout down to 15secs from the
 default 100.

---
 OpenSim/Framework/WebUtil.cs                                   | 10 +++++++++-
 .../Connectors/Hypergrid/HGFriendsServicesConnector.cs         |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 4599f62..6fb1e0c 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -962,11 +962,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++;
 
@@ -980,6 +981,8 @@ namespace OpenSim.Framework
 
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
+            if (timeoutsecs > 0)
+                request.Timeout = timeoutsecs * 1000;
             string respstring = String.Empty;
 
             using (MemoryStream buffer = new MemoryStream())
@@ -1073,6 +1076,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
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)
             {
-- 
cgit v1.1


From ff47cf77ab52d42195fb0f089599618511d4919b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 29 Jun 2013 19:15:25 -0700
Subject: A little more debug for the Unknown User problem mantis #6625

---
 .../Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs           | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs b/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs
index 4dca592..1db4ad0 100644
--- a/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs
+++ b/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs
@@ -103,6 +103,9 @@ namespace OpenSim.Capabilities.Handlers
                 p.username = user.FirstName.ToLower() + "." + user.LastName.ToLower();
             p.id = user.Id;
             p.is_display_name_default = false;
+
+            if (user.FirstName.StartsWith("Unknown") && user.LastName.StartsWith("User"))
+                m_log.DebugFormat("[AVATAR PICKER SEARCH]: Sending {0} {1}", user.FirstName, user.LastName);
             return p;
         }
 
-- 
cgit v1.1


From 0c9702156581cd3948fe07bdae23f3530105d2b5 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 29 Jun 2013 21:05:45 -0700
Subject: More debug for mantis #6625. It looks like the home friends list is
 being fetched on HG TPs.

---
 .../CoreModules/Avatar/Friends/HGFriendsModule.cs  | 41 +++++++++++-----------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index b3e3aa2..ae45b99 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);
                                 }
                             }
@@ -347,31 +348,31 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             return null;
         }
 
-        public override FriendInfo[] GetFriendsFromService(IClientAPI client)
-        {
-//            m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name);
-            Boolean agentIsLocal = true;
-            if (UserManagementModule != null)
-                agentIsLocal = UserManagementModule.IsLocalGridUser(client.AgentId);
+//        public override FriendInfo[] GetFriendsFromService(IClientAPI client)
+//        {
+////            m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name);
+//            Boolean agentIsLocal = true;
+//            if (UserManagementModule != null)
+//                agentIsLocal = UserManagementModule.IsLocalGridUser(client.AgentId);
 
-            if (agentIsLocal)
-                return base.GetFriendsFromService(client);
+//            if (agentIsLocal)
+//                return base.GetFriendsFromService(client);
 
-            FriendInfo[] finfos = new FriendInfo[0];
-            // Foreigner
-            AgentCircuitData agentClientCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode);
-            if (agentClientCircuit != null)
-            {
-                //[XXX] string agentUUI = Util.ProduceUserUniversalIdentifier(agentClientCircuit);
+//            FriendInfo[] finfos = new FriendInfo[0];
+//            // Foreigner
+//            AgentCircuitData agentClientCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode);
+//            if (agentClientCircuit != null)
+//            {
+//                //[XXX] string agentUUI = Util.ProduceUserUniversalIdentifier(agentClientCircuit);
 
-                finfos = FriendsService.GetFriends(client.AgentId.ToString());
-                m_log.DebugFormat("[HGFRIENDS MODULE]: Fetched {0} local friends for visitor {1}", finfos.Length, client.AgentId.ToString());
-            }
+//                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;
-        }
+//            return finfos;
+//        }
 
         protected override bool StoreRights(UUID agentID, UUID friendID, int rights)
         {
-- 
cgit v1.1


From 8fa5d12fcb73ffcc7144009e0147febcfa3ce704 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 29 Jun 2013 21:26:58 -0700
Subject: One more debug mantis #6625

---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 41ea2a2..50371ce 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -292,6 +292,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     friendsData = new UserFriendData();
                     friendsData.PrincipalID = agentID;
                     friendsData.Friends = GetFriendsFromService(client);
+                    m_log.DebugFormat("[FRIENDS MODULE]: User has {1} friends", friendsData.Friends.Length);
                     friendsData.Refcount = 1;
 
                     m_Friends[agentID] = friendsData;
-- 
cgit v1.1


From c462e0a51ce04a580eab49df6c679c20eff74c8d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 29 Jun 2013 21:30:07 -0700
Subject: Fixed previous debug message

---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 50371ce..d9d302c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -292,7 +292,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     friendsData = new UserFriendData();
                     friendsData.PrincipalID = agentID;
                     friendsData.Friends = GetFriendsFromService(client);
-                    m_log.DebugFormat("[FRIENDS MODULE]: User has {1} friends", friendsData.Friends.Length);
+                    m_log.DebugFormat("[FRIENDS MODULE]: User has {0} friends", friendsData.Friends.Length);
                     friendsData.Refcount = 1;
 
                     m_Friends[agentID] = friendsData;
-- 
cgit v1.1


From 20f2cf876982b2c7589b67ce4c8f09d8fff3e9f1 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 29 Jun 2013 21:54:10 -0700
Subject: More debug mantis #6625

---
 OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
index b1dd84e..1e6ff7e 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
@@ -112,6 +112,7 @@ namespace OpenSim.Services.Connectors.Friends
 
             try
             {
+                m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: Calling {0}", uri);
                 string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
                 if (reply != string.Empty)
                 {
-- 
cgit v1.1


From 74e7fac13fcb5d15d469d27694fc89d5f784ade0 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 29 Jun 2013 22:32:26 -0700
Subject: More on mantis #6625

---
 .../ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
index 2d3ba82..70ba944 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -204,7 +204,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);
                     });
             }
 
-- 
cgit v1.1


From 1fc873d09fbc0d29e35d2a8f34c134bb8ac01480 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 30 Jun 2013 07:21:22 -0700
Subject: Same fix to LocalInventoryServiceConnector.cs

---
 .../ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);
                 });
             }
 
-- 
cgit v1.1


From d7775d1e113560307af0170f8d2eab628a5e8acb Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 30 Jun 2013 07:22:27 -0700
Subject: Revert "A little more debug for the Unknown User problem mantis
 #6625"

This reverts commit ff47cf77ab52d42195fb0f089599618511d4919b.
---
 .../Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs           | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs b/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs
index 1db4ad0..4dca592 100644
--- a/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs
+++ b/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs
@@ -103,9 +103,6 @@ namespace OpenSim.Capabilities.Handlers
                 p.username = user.FirstName.ToLower() + "." + user.LastName.ToLower();
             p.id = user.Id;
             p.is_display_name_default = false;
-
-            if (user.FirstName.StartsWith("Unknown") && user.LastName.StartsWith("User"))
-                m_log.DebugFormat("[AVATAR PICKER SEARCH]: Sending {0} {1}", user.FirstName, user.LastName);
             return p;
         }
 
-- 
cgit v1.1


From 1e97972f78a852f24664f730f2e502c3b8a680c8 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 30 Jun 2013 07:25:13 -0700
Subject: Revert "One more debug mantis #6625"

This reverts commit 8fa5d12fcb73ffcc7144009e0147febcfa3ce704.

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index d9d302c..41ea2a2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -292,7 +292,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     friendsData = new UserFriendData();
                     friendsData.PrincipalID = agentID;
                     friendsData.Friends = GetFriendsFromService(client);
-                    m_log.DebugFormat("[FRIENDS MODULE]: User has {0} friends", friendsData.Friends.Length);
                     friendsData.Refcount = 1;
 
                     m_Friends[agentID] = friendsData;
-- 
cgit v1.1


From c7383688466ec61623c709800486de90240fc2d7 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 30 Jun 2013 07:25:46 -0700
Subject: Revert "More debug mantis #6625"

This reverts commit 20f2cf876982b2c7589b67ce4c8f09d8fff3e9f1.
---
 OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
index 1e6ff7e..b1dd84e 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
@@ -112,7 +112,6 @@ namespace OpenSim.Services.Connectors.Friends
 
             try
             {
-                m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: Calling {0}", uri);
                 string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
                 if (reply != string.Empty)
                 {
-- 
cgit v1.1


From e377abcc35c5fb4d47418524ae68364705995915 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 30 Jun 2013 08:39:35 -0700
Subject: Groups V2: charge for group creation only after the group has been
 successfully created

---
 OpenSim/Addons/Groups/GroupsModule.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index 5b3b9f6..5959bac 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -766,14 +766,17 @@ namespace OpenSim.Groups
                     remoteClient.SendCreateGroupReply(UUID.Zero, false, "Insufficient funds to create a group.");
                     return UUID.Zero;
                 }
-                money.ApplyCharge(remoteClient.AgentId, money.GroupCreationCharge, MoneyTransactionType.GroupCreate);
             }
+
             string reason = string.Empty;
             UUID groupID = m_groupData.CreateGroup(remoteClient.AgentId, name, charter, showInList, insigniaID, membershipFee, openEnrollment, 
                 allowPublish, maturePublish, remoteClient.AgentId, out reason);
 
             if (groupID != UUID.Zero)
             {
+                if (money != null)
+                    money.ApplyCharge(remoteClient.AgentId, money.GroupCreationCharge, MoneyTransactionType.GroupCreate);
+
                 remoteClient.SendCreateGroupReply(groupID, true, "Group created successfullly");
 
                 // Update the founder with new group information.
-- 
cgit v1.1


From 2f4a729d408acfd311c8b7bc53d2cbff9d2ddfad Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 29 Jun 2013 06:42:38 -0700
Subject: BulletSim: add inTaintTime parameter to collision cache clear
 function.

---
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 6437b04..d17c8e7 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -706,7 +706,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; },
@@ -792,10 +792,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);
         });
-- 
cgit v1.1


From 23516717e48095011c1c06d64785ef7d91754ff2 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 30 Jun 2013 13:39:58 -0700
Subject: BulletSim: a better version of llMoveToTarget that doesn't go crazy.
 There is still some overshoot but mostly fixes Mantis 6693. Fix bug where
 moveToTarget was active for non-physical objects and while selected. Fix bug
 where move target was not getting changed if the script changed the target
 during a move.

---
 .../Physics/BulletSPlugin/BSActorMoveToTarget.cs   | 80 +++++++++++++++++++---
 .../Region/Physics/BulletSPlugin/BSCharacter.cs    |  2 +-
 OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs   | 15 ++--
 .../Region/Physics/BulletSPlugin/BSPhysObject.cs   |  1 +
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     | 19 ++++-
 5 files changed, 98 insertions(+), 19 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
index 75ff24e..bdf4bc0 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
@@ -50,7 +50,8 @@ public class BSActorMoveToTarget : BSActor
     // BSActor.isActive
     public override bool isActive
     {
-        get { return Enabled; }
+        // MoveToTarget only works on physical prims
+        get { return Enabled && m_controllingPrim.IsPhysicallyActive; }
     }
 
     // Release any connections and resources used by the actor.
@@ -102,16 +103,28 @@ public class BSActorMoveToTarget : BSActor
             // We're taking over after this.
             m_controllingPrim.ZeroMotion(true);
 
-            m_targetMotor = new BSVMotor("BSActorMoveToTargget.Activate",
-                                        m_controllingPrim.MoveToTargetTau,                    // timeScale
-                                        BSMotor.Infinite,           // decay time scale
-                                        1f                          // efficiency
+            /* 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 += 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);
         }
     }
 
@@ -119,12 +132,16 @@ public class BSActorMoveToTarget : BSActor
     {
         if (m_targetMotor != null)
         {
-            m_physicsScene.BeforeStep -= Mover;
+            // m_physicsScene.BeforeStep -= Mover;
+            m_physicsScene.BeforeStep -= Mover2;
             m_targetMotor = null;
         }
     }
 
-    // Called just before the simulation step. Update the vertical position for hoverness.
+    // 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.
@@ -142,6 +159,7 @@ public class BSActorMoveToTarget : BSActor
             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);
         }
@@ -151,7 +169,51 @@ public class BSActorMoveToTarget : BSActor
             // 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);
+        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/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 48f842e..5ef6992 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -626,7 +626,7 @@ public sealed class BSCharacter : BSPhysObject
         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);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
index ef662b5..1214703 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
@@ -144,7 +144,6 @@ public class BSVMotor : BSMotor
 
         Vector3 correction = Vector3.Zero;
         Vector3 error = TargetValue - CurrentValue;
-        LastError = error;
         if (!ErrorIsZero(error))
         {
             correction = StepError(timeStep, error);
@@ -179,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;
     }
@@ -293,7 +293,6 @@ public class BSFMotor : BSMotor
 
         float correction = 0f;
         float error = TargetValue - CurrentValue;
-        LastError = error;
         if (!ErrorIsZero(error))
         {
             correction = StepError(timeStep, error);
@@ -328,6 +327,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;
     }
@@ -363,7 +363,7 @@ public class BSFMotor : BSMotor
 
 // ============================================================================
 // ============================================================================
-// 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
 {
@@ -434,15 +434,14 @@ 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}",
+        MDetailLog("{0},  BSPIDVMotor.step,ts={1},err={2},runnInt={3},deriv={4},ret={5}",
                         BSScene.DetailLogZero, timeStep, error, RunningIntegration, derivitive, ret);
 
         return ret;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index a4c5e08..a0d5c42 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -210,6 +210,7 @@ public abstract class BSPhysObject : PhysicsActor
         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; }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 95bdc7b..90f74df 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -450,6 +450,9 @@ public class BSPrim : BSPhysObject
                 Gravity = ComputeGravity(Buoyancy);
                 PhysScene.PE.SetGravity(PhysBody, Gravity);
 
+                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);
@@ -1040,6 +1043,20 @@ public class BSPrim : BSPhysObject
         }
     }
 
+    public override OMV.Vector3 PIDTarget
+    {
+        set
+        {
+            base.PIDTarget = value;
+            BSActor actor;
+            if (PhysicalActors.TryGetActor(MoveToTargetActorName, out actor))
+            {
+                // 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 {
@@ -1063,7 +1080,7 @@ public class BSPrim : BSPhysObject
 
     // 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)
         {
-- 
cgit v1.1


From 425d2a2a972de34c1853c6049727d4c0eea38af4 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 30 Jun 2013 13:48:27 -0700
Subject: BulletSim: set linkset type to be prim specific rather than a
 simulator wide default. This allows individual prims to differ in the
 underlying linkset implementation.

---
 OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs        | 16 ++++------------
 .../Region/Physics/BulletSPlugin/BSLinksetCompound.cs    |  2 --
 OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs   |  5 ++++-
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 76c2187..ad8e10f 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:
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 350a5d1..308cf13 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -238,7 +238,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);
                 }
             }
@@ -294,7 +293,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
-            child.LinksetInfo = null;
             child.ForceBodyShapeRebuild(false);
 
             if (!HasAnyChildren)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 235da78..87eed98 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -41,12 +41,15 @@ public class BSPrimLinkable : BSPrimDisplaced
     // 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)
     {
+        // Default linkset implementation for this prim
+        LinksetType = (BSLinkset.LinksetImplementation)BSParam.LinksetImplementation;
+
         Linkset = BSLinkset.Factory(PhysScene, this);
 
         PhysScene.TaintedObject("BSPrimLinksetCompound.Refresh", delegate()
-- 
cgit v1.1


From 9d5ae759504f01dceac5d3f859da1e43e28797ad Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 30 Jun 2013 17:06:27 -0700
Subject: BulletSim: remove the handle to the vehicle actor and cause routines
 that need it to look it up.

---
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     | 70 ++++++++++++++++------
 .../Physics/BulletSPlugin/Tests/BasicVehicles.cs   | 32 +++++-----
 2 files changed, 70 insertions(+), 32 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 90f74df..b2947c6 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -70,18 +70,17 @@ public class BSPrim : BSPhysObject
     private int CrossingFailures { get; set; }
 
     // Keep a handle to the vehicle actor so it is easy to set parameters on same.
-    public BSDynamics VehicleActor;
     public const string VehicleActorName = "BasicVehicle";
 
     // Parameters for the hover actor
-    public const string HoverActorName = "HoverActor";
+    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 = "MoveToTargetActor";
+    public const string MoveToTargetActorName = "BSPrim.MoveToTargetActor";
     // Parameters for the setForce and setTorque actors
-    public const string SetForceActorName = "SetForceActor";
-    public const string SetTorqueActorName = "SetTorqueActor";
+    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)
@@ -100,9 +99,8 @@ public class BSPrim : BSPhysObject
         _isPhysical = pisPhysical;
         _isVolumeDetect = false;
 
-        // We keep a handle to the vehicle actor so we can set vehicle parameters later.
-        VehicleActor = new BSDynamics(PhysScene, this, VehicleActorName);
-        PhysicalActors.Add(VehicleActorName, VehicleActor);
+        // Add a dynamic vehicle to our set of actors that can move this prim.
+        PhysicalActors.Add(VehicleActorName, new BSDynamics(PhysScene, this, VehicleActorName));
 
         _mass = CalculateMass();
 
@@ -505,9 +503,25 @@ public class BSPrim : BSPhysObject
         }
     }
 
+        // Find and return a handle to the current vehicle actor.
+        // Return 'null' if there is no vehicle actor.
+    public BSDynamics GetVehicleActor()
+    {
+        BSDynamics ret = null;
+        BSActor actor;
+        if (PhysicalActors.TryGetActor(VehicleActorName, out actor))
+        {
+            ret = actor as BSDynamics;
+        }
+        return ret;
+    }
     public override int VehicleType {
         get {
-            return (int)VehicleActor.Type;
+            int ret = (int)Vehicle.TYPE_NONE;
+            BSDynamics vehicleActor = GetVehicleActor();
+            if (vehicleActor != null)
+                ret = (int)vehicleActor.Type;
+            return ret;
         }
         set {
             Vehicle type = (Vehicle)value;
@@ -518,8 +532,12 @@ public class BSPrim : BSPhysObject
                 //    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 */);
-                VehicleActor.ProcessTypeChange(type);
-                ActivateIfPhysical(false);
+                BSDynamics vehicleActor = GetVehicleActor();
+                if (vehicleActor != null)
+                {
+                    vehicleActor.ProcessTypeChange(type);
+                    ActivateIfPhysical(false);
+                }
             });
         }
     }
@@ -527,31 +545,47 @@ public class BSPrim : BSPhysObject
     {
         PhysScene.TaintedObject("BSPrim.VehicleFloatParam", delegate()
         {
-            VehicleActor.ProcessFloatVehicleParam((Vehicle)param, value);
-            ActivateIfPhysical(false);
+            BSDynamics vehicleActor = GetVehicleActor();
+            if (vehicleActor != null)
+            {
+                vehicleActor.ProcessFloatVehicleParam((Vehicle)param, value);
+                ActivateIfPhysical(false);
+            }
         });
     }
     public override void VehicleVectorParam(int param, OMV.Vector3 value)
     {
         PhysScene.TaintedObject("BSPrim.VehicleVectorParam", delegate()
         {
-            VehicleActor.ProcessVectorVehicleParam((Vehicle)param, value);
-            ActivateIfPhysical(false);
+            BSDynamics vehicleActor = GetVehicleActor();
+            if (vehicleActor != null)
+            {
+                vehicleActor.ProcessVectorVehicleParam((Vehicle)param, value);
+                ActivateIfPhysical(false);
+            }
         });
     }
     public override void VehicleRotationParam(int param, OMV.Quaternion rotation)
     {
         PhysScene.TaintedObject("BSPrim.VehicleRotationParam", delegate()
         {
-            VehicleActor.ProcessRotationVehicleParam((Vehicle)param, rotation);
-            ActivateIfPhysical(false);
+            BSDynamics vehicleActor = GetVehicleActor();
+            if (vehicleActor != null)
+            {
+                vehicleActor.ProcessRotationVehicleParam((Vehicle)param, rotation);
+                ActivateIfPhysical(false);
+            }
         });
     }
     public override void VehicleFlags(int param, bool remove)
     {
         PhysScene.TaintedObject("BSPrim.VehicleFlags", delegate()
         {
-            VehicleActor.ProcessVehicleFlags(param, remove);
+            BSDynamics vehicleActor = GetVehicleActor();
+            if (vehicleActor != null)
+            {
+                vehicleActor.ProcessVehicleFlags(param, remove);
+            }
         });
     }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs b/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs
index b040e21..583c436 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs
@@ -114,21 +114,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.VehicleActor.ProcessFloatVehicleParam(Vehicle.VERTICAL_ATTRACTION_EFFICIENCY, efficiency);
-        TestVehicle.VehicleActor.ProcessFloatVehicleParam(Vehicle.VERTICAL_ATTRACTION_TIMESCALE, timeScale);
-        TestVehicle.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++)
+        BSDynamics vehicleActor = TestVehicle.GetVehicleActor();
+        if (vehicleActor != null)
         {
-            TestVehicle.VehicleActor.ForgetKnownVehicleProperties();
-            TestVehicle.VehicleActor.ComputeAngularVerticalAttraction();
-            TestVehicle.VehicleActor.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;
-- 
cgit v1.1


From c24c99f4bab0ef2e926ebc46235ffed25fdd9add Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 30 Jun 2013 19:08:15 -0700
Subject: BulletSim: fix an occasional crash with flushing log files.

---
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index dec6b6f..155d143 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -223,8 +223,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
         {
@@ -1106,8 +1106,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";
-- 
cgit v1.1


From 8eb86c9ec91ee41699ab455fc5e788a4bff53071 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 30 Jun 2013 19:22:43 -0700
Subject: BulletSim: add the reset of the last commit for flush log file
 problems. Fix small typo in one log message.

---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 2 +-
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 07e87d1..aa247dd 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1276,7 +1276,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
             VehicleAddForce(appliedGravity);
 
-            VDetailLog("{0},  MoveLinear,applyGravity,vehGrav={1},collid={2},fudge={3},mass={4},appliedForce={3}",
+            VDetailLog("{0},  MoveLinear,applyGravity,vehGrav={1},collid={2},fudge={3},mass={4},appliedForce={5}",
                             ControllingPrim.LocalID, m_VehicleGravity,
                             ControllingPrim.IsColliding, BSParam.VehicleGroundGravityFudge, m_vehicleMass, appliedGravity);
         }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 155d143..1645c98 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -223,7 +223,7 @@ 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, m_physicsLoggingDoFlush);
+            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
-- 
cgit v1.1


From 635704b7ef739d553a2354bc1bde6c9588c04cad Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 1 Jul 2013 23:54:04 +0100
Subject: Update debug unknown user name UserUMMTGUN3 to UserUMMTGUN4 and
 UserUMMAU -> UserUMMAU2 to track any new occurences.

This is to see the impact that Diva's fixes related to this issue (last one is currently commit c7383688)
You will need to clear your viewer cache for this to have any effect
Relates to http://opensimulator.org/mantis/view.php?id=6625
---
 .../CoreModules/Framework/UserManagement/UserManagementModule.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 194b591..5da64f7 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -320,7 +320,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             else
             {
                 names[0] = "Unknown";
-                names[1] = "UserUMMTGUN3";
+                names[1] = "UserUMMTGUN4";
 
                 return false;
             }
@@ -537,7 +537,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 else
                 {
                     user.FirstName = "Unknown";
-                    user.LastName = "UserUMMAU";
+                    user.LastName = "UserUMMAU2";
                 }
 
                 AddUserInternal(user);
-- 
cgit v1.1


From ccca0059695e0321ae1aa223c9e8b89cc141b58f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 2 Jul 2013 13:29:44 -0700
Subject: HG: close a loophole by which if something was wrong with the
 ServiceURLs it resulted in never ending asset requests

---
 OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs                | 2 +-
 .../CoreModules/Framework/InventoryAccess/HGAssetMapper.cs       | 9 +++++++++
 .../Framework/InventoryAccess/HGInventoryAccessModule.cs         | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
index a168bfe..4d0568d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
@@ -421,7 +421,7 @@ 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 + "/";
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..64d5f61 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -297,7 +297,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[] { '/' }); 
-- 
cgit v1.1


From e984bfb4c63718d5176b17f6beea46f4512cf304 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 2 Jul 2013 14:31:39 -0700
Subject: This should have a strong effect on the Unknown User issue mantis
 #6625

---
 OpenSim/Data/IGridUserData.cs                        |  1 +
 OpenSim/Data/MSSQL/MSSQLGridUserData.cs              |  7 ++++++-
 OpenSim/Data/MySQL/MySQLGridUserData.cs              |  7 +++++--
 OpenSim/Data/SQLite/SQLiteGridUserData.cs            |  4 ++++
 .../Framework/UserManagement/UserManagementModule.cs | 20 ++++++++++++++++++--
 .../Services/UserAccountService/GridUserService.cs   | 17 ++++++++++++++++-
 6 files changed, 50 insertions(+), 6 deletions(-)

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/MSSQL/MSSQLGridUserData.cs b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
index 9e215f9..df73e5b 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("UserID LIKE {0}%", userID);
+        }
+
     }
 }
diff --git a/OpenSim/Data/MySQL/MySQLGridUserData.cs b/OpenSim/Data/MySQL/MySQLGridUserData.cs
index a9ce94d..df1ecc6 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("UserID LIKE {0}%", userID);
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/SQLiteGridUserData.cs b/OpenSim/Data/SQLite/SQLiteGridUserData.cs
index 1bb5ed8..54cef1a 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("UserID LIKE {0}%", userID);
+        }
 
     }
 }
\ 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 5da64f7..a1343fb 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -319,8 +319,25 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             }
             else
             {
+                // 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);
+
+                        names[0] = m_UserCache[uuid].FirstName;
+                        names[1] = m_UserCache[uuid].LastName;
+
+                        return true;
+                    }
+                }
+
                 names[0] = "Unknown";
-                names[1] = "UserUMMTGUN4";
+                names[1] = "UserUMMTGUN5";
 
                 return false;
             }
@@ -474,7 +491,6 @@ 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);
 
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index 8388180..62b82fe 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -51,7 +51,22 @@ namespace OpenSim.Services.UserAccountService
 
         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;
-- 
cgit v1.1


From 626940ceb83102a6aa0eebb81e10c86f1feb8eff Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 2 Jul 2013 15:39:10 -0700
Subject: More debug messages

---
 .../CoreModules/Framework/UserManagement/UserManagementModule.cs   | 7 ++++++-
 OpenSim/Services/UserAccountService/GridUserService.cs             | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index a1343fb..ff31b67 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -323,6 +323,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 GridUserInfo uInfo = m_Scenes[0].GridUserService.GetGridUserInfo(uuid.ToString());
                 if (uInfo != null)
                 {
+                    m_log.DebugFormat("[USER MANAGEMENT MODULE]: Found grid user {0}", uInfo.UserID);
                     string url, first, last, tmp;
                     UUID u;
                     if (Util.ParseUniversalUserIdentifier(uInfo.UserID, out u, out url, out first, out last, out tmp))
@@ -334,10 +335,14 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
                         return true;
                     }
+                    else
+                        m_log.DebugFormat("[USER MANAGEMENT MODULE]: Unable to parse UUI");
                 }
+                else
+                    m_log.DebugFormat("[USER MANAGEMENT MODULE]: No grid user found");
 
                 names[0] = "Unknown";
-                names[1] = "UserUMMTGUN5";
+                names[1] = "UserUMMTGUN6";
 
                 return false;
             }
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index 62b82fe..af2701d 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -46,7 +46,7 @@ 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");
         }
 
         public virtual GridUserInfo GetGridUserInfo(string userID)
@@ -58,13 +58,17 @@ namespace OpenSim.Services.UserAccountService
             {
                 GridUserData[] ds = m_Database.GetAll(userID);
                 if (ds == null)
+                {
+                    m_log.DebugFormat("[GRID USER SERVICE]: user not found {0}", userID);
                     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;
+                    m_log.DebugFormat("[GRID USER SERVICE]: Found user {0}", d.UserID);
                 }
             }
 
-- 
cgit v1.1


From 2c05caec7fcf14c7e61c2f66854fc24f06d5b480 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 2 Jul 2013 15:47:02 -0700
Subject: Really make it call the method with the query interface

---
 OpenSim/Data/MySQL/MySQLGridUserData.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Data/MySQL/MySQLGridUserData.cs b/OpenSim/Data/MySQL/MySQLGridUserData.cs
index df1ecc6..f476fd2 100644
--- a/OpenSim/Data/MySQL/MySQLGridUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridUserData.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Data.MySQL
 
         public GridUserData[] GetAll(string userID)
         {
-            return base.Get("UserID LIKE {0}%", userID);
+            return base.Get(String.Format("UserID LIKE {0}%", userID));
         }
     }
 }
\ No newline at end of file
-- 
cgit v1.1


From 9725b829d5e476fc6b0894b46520ff1d7aba9936 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 2 Jul 2013 15:48:30 -0700
Subject: Do the same for SQLite and MSSQL

---
 OpenSim/Data/MSSQL/MSSQLGridUserData.cs   | 2 +-
 OpenSim/Data/SQLite/SQLiteGridUserData.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Data/MSSQL/MSSQLGridUserData.cs b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
index df73e5b..7d10955 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Data.MSSQL
 
         public GridUserData[] GetAll(string userID)
         {
-            return base.Get("UserID LIKE {0}%", userID);
+            return base.Get(String.Format("UserID LIKE {0}%", userID));
         }
 
     }
diff --git a/OpenSim/Data/SQLite/SQLiteGridUserData.cs b/OpenSim/Data/SQLite/SQLiteGridUserData.cs
index 54cef1a..799df91 100644
--- a/OpenSim/Data/SQLite/SQLiteGridUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridUserData.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Data.SQLite
 
         public GridUserData[] GetAll(string userID)
         {
-            return base.Get("UserID LIKE {0}%", userID);
+            return base.Get(String.Format("UserID LIKE {0}%", userID));
         }
 
     }
-- 
cgit v1.1


From 316e8f92391f561d459bc6240ccd78b0a98c20c6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 2 Jul 2013 16:10:09 -0700
Subject: Fix SQL statement

---
 OpenSim/Data/MSSQL/MSSQLGridUserData.cs   | 2 +-
 OpenSim/Data/MySQL/MySQLGridUserData.cs   | 2 +-
 OpenSim/Data/SQLite/SQLiteGridUserData.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Data/MSSQL/MSSQLGridUserData.cs b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
index 7d10955..8ec8d49 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Data.MSSQL
 
         public GridUserData[] GetAll(string userID)
         {
-            return base.Get(String.Format("UserID LIKE {0}%", userID));
+            return base.Get(String.Format("UserID LIKE '{0}%'", userID));
         }
 
     }
diff --git a/OpenSim/Data/MySQL/MySQLGridUserData.cs b/OpenSim/Data/MySQL/MySQLGridUserData.cs
index f476fd2..00560c1 100644
--- a/OpenSim/Data/MySQL/MySQLGridUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridUserData.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Data.MySQL
 
         public GridUserData[] GetAll(string userID)
         {
-            return base.Get(String.Format("UserID LIKE {0}%", userID));
+            return base.Get(String.Format("UserID LIKE '{0}%'", userID));
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/SQLiteGridUserData.cs b/OpenSim/Data/SQLite/SQLiteGridUserData.cs
index 799df91..d8c52f8 100644
--- a/OpenSim/Data/SQLite/SQLiteGridUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridUserData.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Data.SQLite
 
         public GridUserData[] GetAll(string userID)
         {
-            return base.Get(String.Format("UserID LIKE {0}%", userID));
+            return base.Get(String.Format("UserID LIKE '{0}%'", userID));
         }
 
     }
-- 
cgit v1.1


From d01b8e163d14ee76c291565b5630d5049cde9b95 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 3 Jul 2013 00:27:22 +0100
Subject: minor: Correct typo of "Descrition" to "Description" in "show object
 *" console commands

Thanks to Ai Austin for pointing this out.
---
 .../Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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));
-- 
cgit v1.1


From 4d24bf75fd695a12683987d9803018c2ec4cae60 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 2 Jul 2013 16:46:35 -0700
Subject: Deleted debug messages. Fixed a null ref exception on the POST
 handler of GridUserServerPostHandler.cs

---
 .../CoreModules/Framework/UserManagement/UserManagementModule.cs    | 5 ++---
 OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs       | 6 ++++--
 OpenSim/Services/UserAccountService/GridUserService.cs              | 5 +----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index ff31b67..90af82e 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -323,7 +323,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 GridUserInfo uInfo = m_Scenes[0].GridUserService.GetGridUserInfo(uuid.ToString());
                 if (uInfo != null)
                 {
-                    m_log.DebugFormat("[USER MANAGEMENT MODULE]: Found grid user {0}", uInfo.UserID);
                     string url, first, last, tmp;
                     UUID u;
                     if (Util.ParseUniversalUserIdentifier(uInfo.UserID, out u, out url, out first, out last, out tmp))
@@ -336,10 +335,10 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                         return true;
                     }
                     else
-                        m_log.DebugFormat("[USER MANAGEMENT MODULE]: Unable to parse UUI");
+                        m_log.DebugFormat("[USER MANAGEMENT MODULE]: Unable to parse UUI {0}", uInfo.UserID);
                 }
                 else
-                    m_log.DebugFormat("[USER MANAGEMENT MODULE]: No grid user found");
+                    m_log.DebugFormat("[USER MANAGEMENT MODULE]: No grid user found {0}", uuid);
 
                 names[0] = "Unknown";
                 names[1] = "UserUMMTGUN6";
diff --git a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
index 687cf8d..7483395 100644
--- a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
@@ -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/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index af2701d..fa9a4a8 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -58,17 +58,14 @@ namespace OpenSim.Services.UserAccountService
             {
                 GridUserData[] ds = m_Database.GetAll(userID);
                 if (ds == null)
-                {
-                    m_log.DebugFormat("[GRID USER SERVICE]: user not found {0}", userID);
                     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;
-                    m_log.DebugFormat("[GRID USER SERVICE]: Found user {0}", d.UserID);
                 }
             }
 
-- 
cgit v1.1


From 119f84fe11586f9abf76325e9466c8cd8f0d1a72 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 2 Jul 2013 17:03:04 -0700
Subject: Squoosh one last opportunity for Unknown Users to creep in.

---
 .../Framework/UserManagement/UserManagementModule.cs         | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 90af82e..e19631e 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -532,7 +532,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 UserData user = new UserData();
                 user.Id = id;
 
-                if (creatorData != null && creatorData != string.Empty)
+                if (!string.IsNullOrEmpty(creatorData))
                 {
                     //creatorData = <endpoint>;<name>
 
@@ -553,14 +553,12 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     }
                     if (parts.Length >= 2)
                         user.FirstName = parts[1].Replace(' ', '.');
+
+                    AddUserInternal(user);
+
                 }
-                else
-                {
-                    user.FirstName = "Unknown";
-                    user.LastName = "UserUMMAU2";
-                }
+                // else don't add the user to the cache, period.
 
-                AddUserInternal(user);
             }
         }
 
-- 
cgit v1.1


From 25889b2d7ef08b27591aa61ab4950bdbc856d7a5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 4 Jul 2013 00:02:53 +0100
Subject: change "debug packet" command to "debug lludp packet" to conform with
 other "debug lludp" options

also moves the implementing code into LLUDPServer.cs along with other debug commands from OpenSim.cs
gets all debug lludp commands to only activate for the set scene if not root
---
 OpenSim/Region/Application/OpenSim.cs              | 51 -------------------
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs   | 59 ++++++++++++++++++++++
 OpenSim/Region/Framework/Scenes/SceneManager.cs    | 23 ---------
 3 files changed, 59 insertions(+), 74 deletions(-)

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 9325b12..6ff7f01 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -226,18 +226,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);
@@ -701,45 +689,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/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 8eb2e06..ff31ef5 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -513,6 +513,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 EnablePoolStats();
 
             MainConsole.Instance.Commands.AddCommand(
+                "Debug", false, "debug lludp packet",
+                 "debug lludp 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",
+                 HandlePacketCommand);
+
+            MainConsole.Instance.Commands.AddCommand(
                 "Debug",
                 false,
                 "debug lludp start",
@@ -553,8 +566,45 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 HandleStatusCommand);
         }
 
+        private void HandlePacketCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
+                return;
+
+            string name = null;
+
+            if (args.Length == 6)
+                name = string.Format("{0} {1}", args[4], args[5]);
+
+            if (args.Length > 3)
+            {
+                int newDebug;
+                if (int.TryParse(args[3], out newDebug))
+                {
+                    m_scene.ForEachScenePresence(sp =>
+                    {
+                        if (name == null || sp.Name == name)
+                        {
+                            m_log.DebugFormat(
+                                "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 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>");
@@ -572,6 +622,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>");
@@ -589,6 +642,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>");
@@ -621,6 +677,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         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");
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 780bd01..28f7896 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -477,29 +477,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>();
-- 
cgit v1.1


From 27cdfb7b840423cf8cee08988dc487eeb34d71c7 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 08:47:45 -0700
Subject: HG Friends: debug an issue where the friends data stored in the DB is
 incomplete.

---
 OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | 1 +
 OpenSim/Services/Friends/FriendsService.cs                   | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index ae45b99..d8f7dc9 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -546,6 +546,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 FriendsService.StoreFriend(agentID.ToString(), theFriendUUID, 1);
                 // and also the converse
                 FriendsService.StoreFriend(theFriendUUID, agentID.ToString(), 1);
+                m_log.DebugFormat("[HGFRIENDS MODULE]: Stored {0} {01}", agentID, theFriendUUID);
 
                 //if (!confirming)
                 //{
diff --git a/OpenSim/Services/Friends/FriendsService.cs b/OpenSim/Services/Friends/FriendsService.cs
index e2033ac..dd3f733 100644
--- a/OpenSim/Services/Friends/FriendsService.cs
+++ b/OpenSim/Services/Friends/FriendsService.cs
@@ -29,6 +29,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using OpenSim.Services.Interfaces;
 using OpenSim.Data;
 using Nini.Config;
@@ -39,7 +40,12 @@ namespace OpenSim.Services.Friends
 {
     public class FriendsService : FriendsServiceBase, IFriendsService
     {
-        public FriendsService(IConfigSource config) : base(config)
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        public FriendsService(IConfigSource config)
+            : base(config)
         {
         }
 
@@ -98,6 +104,7 @@ namespace OpenSim.Services.Friends
             d.Data = new Dictionary<string, string>();
             d.Data["Flags"] = flags.ToString();
 
+            m_log.DebugFormat("[FRIENDS]: Storing {0} {1}", PrincipalID, Friend);
             return m_Database.Store(d);
         }
 
-- 
cgit v1.1


From 5eb78aad96f2dbaf7c4c0e5fa7e678076a2edbfc Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 09:17:01 -0700
Subject: Revert "HG Friends: debug an issue where the friends data stored in
 the DB is incomplete."

This reverts commit 27cdfb7b840423cf8cee08988dc487eeb34d71c7.
---
 OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | 1 -
 OpenSim/Services/Friends/FriendsService.cs                   | 9 +--------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index d8f7dc9..ae45b99 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -546,7 +546,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 FriendsService.StoreFriend(agentID.ToString(), theFriendUUID, 1);
                 // and also the converse
                 FriendsService.StoreFriend(theFriendUUID, agentID.ToString(), 1);
-                m_log.DebugFormat("[HGFRIENDS MODULE]: Stored {0} {01}", agentID, theFriendUUID);
 
                 //if (!confirming)
                 //{
diff --git a/OpenSim/Services/Friends/FriendsService.cs b/OpenSim/Services/Friends/FriendsService.cs
index dd3f733..e2033ac 100644
--- a/OpenSim/Services/Friends/FriendsService.cs
+++ b/OpenSim/Services/Friends/FriendsService.cs
@@ -29,7 +29,6 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using OpenSim.Services.Interfaces;
 using OpenSim.Data;
 using Nini.Config;
@@ -40,12 +39,7 @@ namespace OpenSim.Services.Friends
 {
     public class FriendsService : FriendsServiceBase, IFriendsService
     {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
-
-        public FriendsService(IConfigSource config)
-            : base(config)
+        public FriendsService(IConfigSource config) : base(config)
         {
         }
 
@@ -104,7 +98,6 @@ namespace OpenSim.Services.Friends
             d.Data = new Dictionary<string, string>();
             d.Data["Flags"] = flags.ToString();
 
-            m_log.DebugFormat("[FRIENDS]: Storing {0} {1}", PrincipalID, Friend);
             return m_Database.Store(d);
         }
 
-- 
cgit v1.1


From 16f40c1a15454fd6b093ae901c307670f12602fe Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 4 Jul 2013 17:29:53 +0100
Subject: Add --default option to "debug lludp packet" command to allow packet
 logging to be performed immediately from client start

---
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs   | 69 ++++++++++++++++------
 prebuild.xml                                       |  1 +
 2 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index ff31ef5..82fad11 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;
@@ -102,10 +103,15 @@ 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>
+        /// 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;
@@ -514,7 +520,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             MainConsole.Instance.Commands.AddCommand(
                 "Debug", false, "debug lludp packet",
-                 "debug lludp packet <level> [<avatar-first-name> <avatar-last-name>]",
+                 "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"
@@ -522,7 +528,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                  + "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",
+                 + "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(
@@ -571,31 +579,54 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             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 (args.Length == 6)
-                name = string.Format("{0} {1}", args[4], args[5]);
+            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 (args.Length > 3)
+            if (filteredArgs.Count > 3)
             {
                 int newDebug;
-                if (int.TryParse(args[3], out newDebug))
+                if (int.TryParse(filteredArgs[3], out newDebug))
                 {
-                    m_scene.ForEachScenePresence(sp =>
+                    if (setAsDefaultLevel)
+                    {
+                        DefaultClientPacketDebugLevel = newDebug;
+                        MainConsole.Instance.OutputFormat(
+                            "Debug packet debug for new clients set to {0}", DefaultClientPacketDebugLevel);
+                    }
+                    else
                     {
-                        if (name == null || sp.Name == name)
+                        m_scene.ForEachScenePresence(sp =>
                         {
-                            m_log.DebugFormat(
-                                "Packet debug for {0} ({1}) set to {2} in {3}",
-                                sp.Name, sp.IsChildAgent ? "child" : "root", newDebug, m_scene.Name);
-
-                            sp.ControllingClient.DebugPacketLevel = newDebug;
-                        }
-                    });
+                            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 0..255 [<first-name> <last-name>]");
+                    MainConsole.Instance.Output("Usage: debug lludp packet [--default] 0..255 [<first-name> <last-name>]");
                 }
             }
         }
@@ -687,6 +718,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)
@@ -1533,6 +1567,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;
     
diff --git a/prebuild.xml b/prebuild.xml
index 4cf3b83..3337894 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1482,6 +1482,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/"/>
-- 
cgit v1.1


From 068a3afad9b585399e5422108f8c5074c9e6b33f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 09:51:31 -0700
Subject: HG Friends: migration #3 is failing on some installations of MySql.
 Setting the table to InnoDB seems to fix the problem.

---
 OpenSim/Data/MySQL/Resources/FriendsStore.migrations | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
 
-- 
cgit v1.1


From 98a2fa8e358a6a008eea28161e48e4bfc877e11e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 10:23:20 -0700
Subject: HG Friends: this was commented some commits ago, but it shouldn't
 have been.

---
 .../CoreModules/Avatar/Friends/HGFriendsModule.cs  | 49 +++++++++++-----------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index ae45b99..6d1fd1f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -348,31 +348,30 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             return null;
         }
 
-//        public override FriendInfo[] GetFriendsFromService(IClientAPI client)
-//        {
-////            m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name);
-//            Boolean agentIsLocal = true;
-//            if (UserManagementModule != null)
-//                agentIsLocal = UserManagementModule.IsLocalGridUser(client.AgentId);
-
-//            if (agentIsLocal)
-//                return base.GetFriendsFromService(client);
-
-//            FriendInfo[] finfos = new FriendInfo[0];
-//            // Foreigner
-//            AgentCircuitData agentClientCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode);
-//            if (agentClientCircuit != null)
-//            {
-//                //[XXX] string agentUUI = Util.ProduceUserUniversalIdentifier(agentClientCircuit);
-
-//                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);
-
-//            return finfos;
-//        }
+        public override FriendInfo[] GetFriendsFromService(IClientAPI client)
+        {
+            //            m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name);
+            Boolean agentIsLocal = true;
+            if (UserManagementModule != null)
+                agentIsLocal = UserManagementModule.IsLocalGridUser(client.AgentId);
+
+            if (agentIsLocal)
+                return base.GetFriendsFromService(client);
+
+            FriendInfo[] finfos = new FriendInfo[0];
+            // Foreigner
+            AgentCircuitData agentClientCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode);
+            if (agentClientCircuit != null)
+            {
+                // 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);
+
+            return finfos;
+        }
 
         protected override bool StoreRights(UUID agentID, UUID friendID, int rights)
         {
-- 
cgit v1.1


From ae42c93f9a2c7df4e7c14896df27544f283c8114 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 10:59:21 -0700
Subject: Now trying to find a cause of freeze at login related to friends
 status notifications.

---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 41ea2a2..bc501b7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -526,8 +526,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 if (friendSession.RegionID != UUID.Zero)
                 {
                     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_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", region.RegionName);
+                        m_FriendsSimConnector.StatusNotify(region, userID, friendSession.UserID, online);
+                    }
                 }
             }
         }
-- 
cgit v1.1


From 0cc0a2485c6502df096b9070ff0c8e5584dae2fd Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 11:18:05 -0700
Subject: More debug related to the previous commit

---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index bc501b7..16a2b9b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -526,9 +526,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 if (friendSession.RegionID != UUID.Zero)
                 {
                     GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
+                    m_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", (region == null ? "null" : region.RegionName));
                     if (region != null)
                     {
-                        m_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", region.RegionName);
                         m_FriendsSimConnector.StatusNotify(region, userID, friendSession.UserID, online);
                     }
                 }
-- 
cgit v1.1


From ec9ffbb89a8925cebae29d9950475eaa1b280de4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 11:36:10 -0700
Subject: More debug, same issue

---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs          | 6 ++++--
 .../Framework/InventoryAccess/HGInventoryAccessModule.cs            | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 16a2b9b..ea69abb 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -523,15 +523,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 == null ? "null" : region.RegionName));
                     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");
             }
         }
 
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 64d5f61..1eae0ac 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -244,7 +244,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))
             //{
-- 
cgit v1.1


From bf214122cddf62b46d6074755b08a3b0acef853f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 11:53:22 -0700
Subject: More debug, same issue

---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs   | 2 ++
 OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index ea69abb..6d4c65d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -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)
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index 6d1fd1f..a456009 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -252,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>>();
-- 
cgit v1.1


From fdafc2a16c3c661231d47f0c979438f2500ec131 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 4 Jul 2013 20:39:16 +0100
Subject: With diva's permission, temporarily reinsert Unknown UserUMMAU3 to
 make sure that GUN7 failure has largely disappeared.

Unknown UserUMMAU3 insertion should definitely be removed down the line.
However, I would like a little more time to check the GUN* reduction first, since removing UMMAU3 will make these failures appear as GUN7 instead.
Also bumps GUN6 -> GUN7 and UMMAU2 -> UMMAU3
---
 .../UserManagement/UserManagementModule.cs         | 25 ++++++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index e19631e..461c385 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -135,7 +135,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);
@@ -151,6 +150,10 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_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");
@@ -338,10 +341,12 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                         m_log.DebugFormat("[USER MANAGEMENT MODULE]: Unable to parse UUI {0}", uInfo.UserID);
                 }
                 else
-                    m_log.DebugFormat("[USER MANAGEMENT MODULE]: No grid user found {0}", uuid);
+                {
+                    m_log.DebugFormat("[USER MANAGEMENT MODULE]: No grid user found for {0}", uuid);
+                }
 
                 names[0] = "Unknown";
-                names[1] = "UserUMMTGUN6";
+                names[1] = "UserUMMTGUN7";
 
                 return false;
             }
@@ -553,12 +558,18 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     }
                     if (parts.Length >= 2)
                         user.FirstName = parts[1].Replace(' ', '.');
-
-                    AddUserInternal(user);
-
                 }
-                // else don't add the user to the cache, period.
+                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 = "UserUMMAU3";
+                }
 
+                AddUserInternal(user);
             }
         }
 
-- 
cgit v1.1


From ca380ec0397b28a3d7a3f2c60aeb6eaf1153be31 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 12:41:45 -0700
Subject: Same freeze issue, now checking if it's in estate

---
 OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs b/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
index 73e706c..d23e51a 100644
--- a/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
@@ -130,6 +130,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         private void SendToEstate(uint EstateID, Dictionary<string, object> sendData)
         {
+            m_log.DebugFormat("[XESTATE CONNECTOR]: SendToEstate");
             List<UUID> regions = m_EstateModule.Scenes[0].GetEstateRegions((int)EstateID);
 
             UUID ScopeID = UUID.Zero;
-- 
cgit v1.1


From 38a04ff993052980a2dfbfbdbe0d2853e2d8950e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 13:00:06 -0700
Subject: Revert "Same freeze issue, now checking if it's in estate"

This reverts commit ca380ec0397b28a3d7a3f2c60aeb6eaf1153be31.
---
 OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs b/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
index d23e51a..73e706c 100644
--- a/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
@@ -130,7 +130,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         private void SendToEstate(uint EstateID, Dictionary<string, object> sendData)
         {
-            m_log.DebugFormat("[XESTATE CONNECTOR]: SendToEstate");
             List<UUID> regions = m_EstateModule.Scenes[0].GetEstateRegions((int)EstateID);
 
             UUID ScopeID = UUID.Zero;
-- 
cgit v1.1


From c95a23863ab51810ccc01afd3dd641c18a183305 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 13:13:52 -0700
Subject: WARNING: BRUTE FORCE DEBUG. AVOID USING THIS COMMIT.

---
 OpenSim/Framework/WebUtil.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 6fb1e0c..ece3129 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -1061,6 +1061,7 @@ namespace OpenSim.Framework
 
             int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
             if (tickdiff > WebUtil.LongCallTime)
+            {
                 m_log.InfoFormat(
                     "[FORMS]: Slow request {0} {1} {2} took {3}ms, {4}ms writing, {5}",
                     reqnum,
@@ -1069,6 +1070,9 @@ namespace OpenSim.Framework
                     tickdiff,
                     tickdata,
                     obj.Length > WebUtil.MaxRequestDiagLength ? obj.Remove(WebUtil.MaxRequestDiagLength) : obj);
+                Util.PrintCallStack();
+
+            }
             else if (WebUtil.DebugLevel >= 4)
                 m_log.DebugFormat(
                     "[WEB UTIL]: HTTP OUT {0} took {1}ms, {2}ms writing",
-- 
cgit v1.1


From 33ddb6c246e7a3b8670b759e0799884520b12e9d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 13:25:58 -0700
Subject: Revert "WARNING: BRUTE FORCE DEBUG. AVOID USING THIS COMMIT."

This reverts commit c95a23863ab51810ccc01afd3dd641c18a183305.
---
 OpenSim/Framework/WebUtil.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index ece3129..6fb1e0c 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -1061,7 +1061,6 @@ namespace OpenSim.Framework
 
             int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
             if (tickdiff > WebUtil.LongCallTime)
-            {
                 m_log.InfoFormat(
                     "[FORMS]: Slow request {0} {1} {2} took {3}ms, {4}ms writing, {5}",
                     reqnum,
@@ -1070,9 +1069,6 @@ namespace OpenSim.Framework
                     tickdiff,
                     tickdata,
                     obj.Length > WebUtil.MaxRequestDiagLength ? obj.Remove(WebUtil.MaxRequestDiagLength) : obj);
-                Util.PrintCallStack();
-
-            }
             else if (WebUtil.DebugLevel >= 4)
                 m_log.DebugFormat(
                     "[WEB UTIL]: HTTP OUT {0} took {1}ms, {2}ms writing",
-- 
cgit v1.1


From da3aa441388e589ffcd7a667aadc260f8084854f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 13:27:53 -0700
Subject: Debug the RegionHandle handler (same issue)

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a9f8a85..aa14529 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4889,6 +4889,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void RegionHandleRequest(IClientAPI client, UUID regionID)
         {
+            m_log.DebugFormat("[SCENE]: RegionHandleRequest {0}", regionID);
             ulong handle = 0;
             if (regionID == RegionInfo.RegionID)
                 handle = RegionInfo.RegionHandle;
-- 
cgit v1.1


From d80936bbbb85280623478f3a25d59a4a4da9c3e6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 14:07:25 -0700
Subject: Guard against completely unknown user UUIDs.

---
 .../CoreModules/Framework/UserManagement/UserManagementModule.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 461c385..a7cbc8f 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -332,10 +332,13 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     {
                         AddUser(uuid, first, last, url);
 
-                        names[0] = m_UserCache[uuid].FirstName;
-                        names[1] = m_UserCache[uuid].LastName;
+                        if (m_UserCache.ContainsKey(uuid))
+                        {
+                            names[0] = m_UserCache[uuid].FirstName;
+                            names[1] = m_UserCache[uuid].LastName;
 
-                        return true;
+                            return true;
+                        }
                     }
                     else
                         m_log.DebugFormat("[USER MANAGEMENT MODULE]: Unable to parse UUI {0}", uInfo.UserID);
-- 
cgit v1.1


From f2f33b75776539560e1dbfec12a6559f5b4be05e Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 4 Jul 2013 17:45:17 -0400
Subject: Some consistency fixes for the ini to stop parser breakage

---
 bin/OpenSim.ini.example | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 3015c08..1c53935 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -268,7 +268,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"
@@ -287,7 +287,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.
@@ -474,7 +474,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 
@@ -538,7 +541,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
 
@@ -613,7 +616,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 =
@@ -798,7 +802,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
-- 
cgit v1.1


From 8265a88c4a4b1c18f1bc0accfde250fe47b08c50 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 14:51:18 -0700
Subject: Throttle the viewer's requests for region handles. Apparently Kokua
 is requesting this for all landmarks in inventory. Not sure why. But this
 seems to be the root cause of the login freeze mentioned before. This commit
 adds a blocking queue / process thread pattern.

---
 .../GridServiceThrottleModule.cs                   | 161 +++++++++++++++++++++
 OpenSim/Region/Framework/Scenes/Scene.cs           |  18 ---
 2 files changed, 161 insertions(+), 18 deletions(-)
 create mode 100644 OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs

diff --git a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
new file mode 100644
index 0000000..5511fea
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
@@ -0,0 +1,161 @@
+/*
+ * 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 GridServiceThrottleModule : ISharedRegionModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private readonly List<Scene> m_scenes = new List<Scene>();
+
+        private OpenSim.Framework.BlockingQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<GridRegionRequest>();
+
+        public void Initialise(IConfigSource config)
+        {
+            Watchdog.StartThread(
+                ProcessQueue,
+                "GridServiceRequestThread",
+                ThreadPriority.BelowNormal,
+                true,
+                true);
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            lock (m_scenes)
+            {
+                m_scenes.Add(scene);
+                scene.EventManager.OnNewClient += OnNewClient;
+            }
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            lock (m_scenes)
+            {
+                m_scenes.Remove(scene);
+                scene.EventManager.OnNewClient -= OnNewClient;
+            }
+        }
+
+        void OnNewClient(IClientAPI client)
+        {
+            client.OnRegionHandleRequest += OnRegionHandleRequest;
+        }
+
+        public void PostInitialise()
+        {
+        }
+
+        public void Close()
+        {
+        }
+
+        public string Name
+        {
+            get { return "GridServiceThrottleModule"; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public void OnRegionHandleRequest(IClientAPI client, UUID regionID)
+        {
+            m_log.DebugFormat("[GRIDSERVICE THROTTLE]: RegionHandleRequest {0}", regionID);
+            ulong handle = 0;
+            if (IsLocalRegionHandle(regionID, out handle))
+            {
+                client.SendRegionHandle(regionID, handle);
+                return;
+            }
+
+            GridRegionRequest request = new GridRegionRequest(client, regionID);
+            m_RequestQueue.Enqueue(request);
+
+        }
+
+        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 void ProcessQueue()
+        {
+            while (true)
+            {
+                GridRegionRequest request = m_RequestQueue.Dequeue();
+                GridRegion r = m_scenes[0].GridService.GetRegionByUUID(UUID.Zero, request.regionID);
+
+                if (r != null && r.RegionHandle != 0)
+                    request.client.SendRegionHandle(request.regionID, r.RegionHandle);
+
+            }
+        }
+    }
+
+    class GridRegionRequest
+    {
+        public IClientAPI client;
+        public UUID regionID;
+
+        public GridRegionRequest(IClientAPI c, UUID r)
+        {
+            client = c;
+            regionID = r;
+        }
+    }
+}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index aa14529..355e0ee 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3103,7 +3103,6 @@ namespace OpenSim.Region.Framework.Scenes
         {
             //client.OnNameFromUUIDRequest += HandleUUIDNameRequest;
             client.OnMoneyTransferRequest += ProcessMoneyTransferRequest;
-            client.OnRegionHandleRequest += RegionHandleRequest;
         }
         
         public virtual void SubscribeToClientNetworkEvents(IClientAPI client)
@@ -3227,7 +3226,6 @@ namespace OpenSim.Region.Framework.Scenes
         {
             //client.OnNameFromUUIDRequest -= HandleUUIDNameRequest;
             client.OnMoneyTransferRequest -= ProcessMoneyTransferRequest;
-            client.OnRegionHandleRequest -= RegionHandleRequest;
         }
 
         public virtual void UnSubscribeToClientNetworkEvents(IClientAPI client)
@@ -4887,22 +4885,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         #endregion
 
-        public void RegionHandleRequest(IClientAPI client, UUID regionID)
-        {
-            m_log.DebugFormat("[SCENE]: RegionHandleRequest {0}", 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)
-- 
cgit v1.1


From ca26583e6bfdc9aa62e917a736f52ed5fdac75cd Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 15:17:06 -0700
Subject: Delete some verbose debug messages

---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs        | 8 ++++----
 OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs      | 2 +-
 .../Framework/GridServiceThrottle/GridServiceThrottleModule.cs    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 6d4c65d..b693f2d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -498,7 +498,7 @@ 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);
+            //m_log.DebugFormat("[FRIENDS]: Entering StatusNotify for {0}", userID);
 
             List<string> friendStringIds = friendList.ConvertAll<string>(friend => friend.Friend);
             List<string> remoteFriendStringIds = new List<string>();
@@ -527,15 +527,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 // let's guard against sessions-gone-bad
                 if (friendSession != null && friendSession.RegionID != UUID.Zero)
                 {
-                    m_log.DebugFormat("[FRIENDS]: Get region {0}", friendSession.RegionID);
+                    //m_log.DebugFormat("[FRIENDS]: Get region {0}", friendSession.RegionID);
                     GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
                     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");
+                //else
+                //    m_log.DebugFormat("[FRIENDS]: friend session is null or the region is UUID.Zero");
             }
         }
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index a456009..d00945e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -252,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>>();
diff --git a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
index 5511fea..a662731 100644
--- a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Region.CoreModules.Framework
 
         public void OnRegionHandleRequest(IClientAPI client, UUID regionID)
         {
-            m_log.DebugFormat("[GRIDSERVICE THROTTLE]: RegionHandleRequest {0}", regionID);
+            //m_log.DebugFormat("[GRIDSERVICE THROTTLE]: RegionHandleRequest {0}", regionID);
             ulong handle = 0;
             if (IsLocalRegionHandle(regionID, out handle))
             {
-- 
cgit v1.1


From dd15f954997333e007dbdc81b8a2e0fcd4583aa2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 5 Jul 2013 20:06:27 +0100
Subject: Add very basic regression test
 TestChildAgentSingleRegionCapabilities() which checks for addition and
 removal of capabilities on add/remove of child agent

---
 .../Scenes/Tests/ScenePresenceCapabilityTests.cs   | 88 ++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs

diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
new file mode 100644
index 0000000..5714042
--- /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.
+        }
+    }
+}
\ No newline at end of file
-- 
cgit v1.1


From 5dbdd5f8b4856357340357394edc2f9e229a0582 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 6 Jul 2013 00:12:48 +0100
Subject: refactor: Make stats and sim status simpler by extending
 BaseStreamHandler like other handlers instead of implementing the
 IStreamedRequestHandler interface directly

---
 OpenSim/Region/Application/OpenSimBase.cs          | 74 +++++-----------------
 .../Region/Framework/Scenes/RegionStatsHandler.cs  | 26 ++------
 2 files changed, 23 insertions(+), 77 deletions(-)

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 7ca87a3..841069c 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -759,73 +759,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") {}
+
+            public override byte[] Handle(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,
+            public override byte[] Handle(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>
@@ -834,42 +810,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
+        public 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,
+            public override byte[] Handle(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
diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
index c11174d..726becf 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)
+        public override byte[] Handle(
+            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()
         {
-- 
cgit v1.1


From 67407024a2e0b6e27f526cc2312e93fd867a855b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 6 Jul 2013 00:29:19 +0100
Subject: Update thread watchdog on GridServiceRequestThread periodically and
 turn off alarming

Unfortunately, alarm can spuriously go off if the thread blocks for a long time on an empty queue.
---
 .../Framework/GridServiceThrottle/GridServiceThrottleModule.cs        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
index a662731..f1eb1ad 100644
--- a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.Framework
                 "GridServiceRequestThread",
                 ThreadPriority.BelowNormal,
                 true,
-                true);
+                false);
         }
 
         public void AddRegion(Scene scene)
@@ -137,6 +137,8 @@ namespace OpenSim.Region.CoreModules.Framework
         {
             while (true)
             {
+                Watchdog.UpdateThread();
+
                 GridRegionRequest request = m_RequestQueue.Dequeue();
                 GridRegion r = m_scenes[0].GridService.GetRegionByUUID(UUID.Zero, request.regionID);
 
-- 
cgit v1.1


From a44ad0149213887b284b3fe65b9bddb0b63abff6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 6 Jul 2013 00:32:11 +0100
Subject: Fix build break from recent commit dd15f95 on windows

---
 prebuild.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/prebuild.xml b/prebuild.xml
index 3337894..74cfcb0 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2965,6 +2965,7 @@
       <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
       <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
       <Reference name="XMLRPC" path="../../../bin/"/>
+      <Reference name="OpenSim.Capabilities"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-- 
cgit v1.1


From 55ac8c83c78d3b8d5fd027174328171849f8d1e2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 6 Jul 2013 00:34:22 +0100
Subject: Get InventoryWorkerThreads to update watchdog on processing requests

---
 OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 0e3cd6b..b90df17 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -347,6 +347,8 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             while (true)
             {
+                Watchdog.UpdateThread();
+
                 aPollRequest poolreq = m_queue.Dequeue();
 
                 poolreq.thepoll.Process(poolreq);
-- 
cgit v1.1


From ccceb6d6d2d2359797b78b78f8057b57a6cd8bb4 Mon Sep 17 00:00:00 2001
From: justincc
Date: Sat, 6 Jul 2013 00:52:54 +0100
Subject: Fix windows build break fromrecent dd1f95 for real this time - put
 new dll reference in the wrong place

---
 prebuild.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prebuild.xml b/prebuild.xml
index 74cfcb0..d9e32ea 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2965,7 +2965,6 @@
       <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
       <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
       <Reference name="XMLRPC" path="../../../bin/"/>
-      <Reference name="OpenSim.Capabilities"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
@@ -3197,6 +3196,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"/>
-- 
cgit v1.1


From 98de67d57316a20fc813db853d6175fb8d8783ef Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 6 Jul 2013 00:55:14 +0100
Subject: Fix mono warning in LLImageManagerTests

---
 OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
index a0e0078..83144e3 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         }
 
         [SetUp]
-        public void SetUp()
+        public override void SetUp()
         {
             base.SetUp();
 
-- 
cgit v1.1


From c358d5d168f349cbfbb10c1c4f1e992830b11fa4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 5 Jul 2013 20:17:10 -0700
Subject: Changed a few bits in
 Inventory/Archiver/InventoryArchiveReadRequest.cs to be less dependent on a
 Scene.

---
 .../Archiver/InventoryArchiveReadRequest.cs        | 32 ++++++++++++----------
 .../Inventory/Archiver/InventoryArchiverModule.cs  |  4 +--
 .../Tests/InventoryArchiveLoadPathTests.cs         | 12 ++++----
 .../Archiver/Tests/InventoryArchiveSaveTests.cs    |  2 +-
 .../CoreModules/Framework/Library/LibraryModule.cs |  4 +--
 5 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 98285e9..31c42d8 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 849449b..797097f 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)
                         {
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/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();
                     }
 
-- 
cgit v1.1


From 5f97c6f8f06f0b90ab815a1d44358dc256ec5a50 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 4 Jul 2013 12:16:33 -0700
Subject: BulletSim: non-functional updates. Comments and formatting. Update
 TODO list.

---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 14 +++-
 OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs   | 15 +++--
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     |  6 +-
 .../Region/Physics/BulletSPlugin/BulletSimTODO.txt | 75 +++++++++++++---------
 4 files changed, 67 insertions(+), 43 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index aa247dd..c27d3f0 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -774,7 +774,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
         // 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)
@@ -788,14 +788,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)
             {
+                lastRememberedWaterHeightPos = pos;
                 m_knownWaterLevel = ControllingPrim.PhysScene.TerrainManager.GetWaterLevelAtXYZ(pos);
                 m_knownHas |= m_knownChangedWaterLevel;
             }
-            return (float)m_knownWaterLevel;
+            return m_knownWaterLevel;
         }
 
         private Vector3 VehiclePosition
@@ -991,11 +993,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;
             }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
index 1214703..7693195 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
@@ -188,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;
@@ -221,7 +223,7 @@ public class BSVMotor : BSMotor
                                 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}",
@@ -375,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.
@@ -413,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);
         }
     }
 
@@ -441,8 +442,8 @@ public class BSPIDVMotor : BSVMotor
                         + 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/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index b2947c6..f0858ca 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -1125,7 +1125,9 @@ public class BSPrim : BSPhysObject
                 OMV.Vector3 addForce = force;
                 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)
                     {
@@ -1493,6 +1495,8 @@ public class BSPrim : BSPhysObject
 
         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
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
index 4357ef1..0453376 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
@@ -3,25 +3,21 @@ CURRENT PROBLEMS TO FIX AND/OR LOOK AT
 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?
-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.
 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)
+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.
-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
-Vehicle angular vertical attraction
-vehicle angular banking
-Center-of-gravity
-Vehicle angular deflection
-	Preferred orientation angular correction fix
 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)
@@ -33,10 +29,16 @@ Vehicle script tuning/debugging
 	Avanti speed script
 	Weapon shooter script
 Move material definitions (friction, ...) into simulator.
+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:
 =================================================
@@ -45,14 +47,12 @@ LINEAR_MOTOR_DIRECTION values should be clamped to reasonable numbers.
 	Same for other velocity settings.
 UBit improvements to remove rubber-banding of avatars sitting on vehicle child prims:
 	https://github.com/UbitUmarov/Ubit-opensim
-Vehicles (Move smoothly)
 Some vehicles should not be able to turn if no speed or off ground.
 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.
@@ -93,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)
@@ -127,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
 
 
@@ -172,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
@@ -205,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.
@@ -365,4 +345,35 @@ After getting off a vehicle, the root prim is phantom (can be walked through)
 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)
+
+
 
-- 
cgit v1.1


From 03268d85c41c94e7b35802b9dea1ce08299e5426 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 2 Jun 2013 10:04:15 -0700
Subject: BulletSim: comments and non-functional changes working toward the
 center-of-gravity implementation.

---
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     | 11 +++++----
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs    |  3 +++
 .../Physics/BulletSPlugin/BSPrimDisplaced.cs       | 26 +++++++++++++---------
 .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 19 ++++++++++++----
 4 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 308cf13..30f6c8c 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -315,7 +315,6 @@ public sealed class BSLinksetCompound : BSLinkset
     // Note that this works for rebuilding just the root after a linkset is taken apart.
     // Called at taint time!!
     private bool UseBulletSimRootOffsetHack = false;    // Attempt to have Bullet track the coords of root compound shape
-    private bool disableCOM = true; // For basic linkset debugging, turn off the center-of-mass setting
     private void RecomputeLinksetCompound()
     {
         try
@@ -331,9 +330,7 @@ public sealed class BSLinksetCompound : BSLinkset
             // There is no reason to build all this physical stuff for a non-physical linkset.
             if (!LinksetRoot.IsPhysicallyActive)
             {
-                // Clean up any old linkset shape and make sure the root shape is set to the root object.
                 DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,notPhysical", LinksetRoot.LocalID);
-
                 return; // Note the 'finally' clause at the botton which will get executed.
             }
 
@@ -347,9 +344,9 @@ public sealed class BSLinksetCompound : BSLinkset
 
             OMV.Quaternion invRootOrientation = OMV.Quaternion.Normalize(OMV.Quaternion.Inverse(LinksetRoot.RawOrientation));
 
-            // 'centerDisplacement' is the value to subtract from children to give physical offset position
+            // 'centerDisplacementV' is the value to subtract from children to give physical offset position
             OMV.Vector3 centerDisplacementV = (centerOfMassW - LinksetRoot.RawPosition) * invRootOrientation;
-            if (UseBulletSimRootOffsetHack || disableCOM)
+            if (UseBulletSimRootOffsetHack || !BSParam.LinksetOffsetCenterOfMass)
             {
                 centerDisplacementV = OMV.Vector3.Zero;
                 LinksetRoot.ClearDisplacement();
@@ -357,6 +354,8 @@ public sealed class BSLinksetCompound : BSLinkset
             else
             {
                 LinksetRoot.SetEffectiveCenterOfMassDisplacement(centerDisplacementV);
+                // The actual center-of-mass could have been set by the user.
+                centerDisplacementV = LinksetRoot.PositionDisplacement;
             }
             DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,COM,rootPos={1},com={2},comDisp={3}",
                                 LinksetRoot.LocalID, LinksetRoot.RawPosition, centerOfMassW, centerDisplacementV);
@@ -409,7 +408,7 @@ public sealed class BSLinksetCompound : BSLinkset
             {
                 // 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 eleviates the need to offset the returned physical position by the
+                //     compound shape. This aleviates the need to offset the returned physical position by the
                 //     center-of-mass offset.
                 m_physicsScene.PE.AddToCollisionFlags(LinksetRoot.PhysBody, CollisionFlags.BS_RETURN_ROOT_COMPOUND_SHAPE);
             }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index d17c8e7..0f84bf7 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -176,6 +176,7 @@ public static class BSParam
 
     // 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; }
@@ -684,6 +685,8 @@ public static class BSParam
 
 	    new ParameterDefn<float>("LinksetImplementation", "Type of linkset implementation (0=Constraint, 1=Compound, 2=Manual)",
             (float)BSLinkset.LinksetImplementation.Compound ),
+	    new ParameterDefn<bool>("LinksetOffsetCenterOfMass", "If 'true', compute linkset center-of-mass and offset linkset position to account for same",
+            false ),
 	    new ParameterDefn<bool>("LinkConstraintUseFrameOffset", "For linksets built with constraints, enable frame offsetFor linksets built with constraints, enable frame offset.",
             false ),
 	    new ParameterDefn<bool>("LinkConstraintEnableTransMotor", "Whether to enable translational motor on linkset constraints",
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
index f5ee671..9a05349 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
@@ -44,12 +44,12 @@ 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
     //    adjusting the simulator values (being set) into the physical values.
@@ -61,6 +61,7 @@ public class BSPrimDisplaced : BSPrim
 
     public virtual OMV.Vector3 PositionDisplacement { get; set; }
     public virtual OMV.Quaternion OrientationDisplacement { get; set; }
+    public virtual OMV.Quaternion OrientationDisplacementOrigInv { get; set; }
 
     public BSPrimDisplaced(uint localID, String primName, BSScene parent_scene, OMV.Vector3 pos, OMV.Vector3 size,
                        OMV.Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical)
@@ -99,7 +100,8 @@ public class BSPrimDisplaced : BSPrim
             // Remember the displacement from root as well as the origional rotation of the
             //    new center-of-mass.
             PositionDisplacement = comDisp;
-            OrientationDisplacement = OMV.Quaternion.Identity;
+            OrientationDisplacement = Quaternion.Normalize(RawOrientation);
+            OrientationDisplacementOrigInv = Quaternion.Inverse(OrientationDisplacement);
         }
     }
 
@@ -110,7 +112,7 @@ public class BSPrimDisplaced : BSPrim
         {
             if (PositionDisplacement != OMV.Vector3.Zero)
             {
-                OMV.Vector3 displacedPos = value - (PositionDisplacement * RawOrientation);
+                OMV.Vector3 displacedPos = value - (PositionDisplacement * (OrientationDisplacementOrigInv * RawOrientation));
                 DetailLog("{0},BSPrimDisplaced.ForcePosition,val={1},disp={2},newPos={3}", LocalID, value, PositionDisplacement, displacedPos);
                 base.ForcePosition = displacedPos;
             }
@@ -126,7 +128,8 @@ public class BSPrimDisplaced : BSPrim
         get { return base.ForceOrientation; }
         set
         {
-            // TODO:
+            // Changing orientation also changes the position of the center-of-mass since
+            //    the orientation passed is for a rotation around the root prim's center.
             base.ForceOrientation = value;
         }
     }
@@ -150,10 +153,13 @@ public class BSPrimDisplaced : BSPrim
         // Undo any center-of-mass displacement that might have been done.
         if (PositionDisplacement != OMV.Vector3.Zero || OrientationDisplacement != OMV.Quaternion.Identity)
         {
-            // Correct for any rotation around the center-of-mass
-            // TODO!!!
+            // The origional shape was offset from 'zero' by PositionDisplacement and rotated by OrientationDisplacement.
+            // These physical locations and rotation must be back converted to be centered around the displaced
+            //     root shape.
+
+            // The root position is the reported position displaced by the rotated displacement.
+            OMV.Vector3 displacedPos = entprop.Position + (PositionDisplacement * (entprop.Rotation * OrientationDisplacementOrigInv));
             
-            OMV.Vector3 displacedPos = entprop.Position + (PositionDisplacement * entprop.Rotation);
             DetailLog("{0},BSPrimDisplaced.ForcePosition,physPos={1},disp={2},newPos={3}", LocalID, entprop.Position, PositionDisplacement, displacedPos);
             entprop.Position = displacedPos;
             // entprop.Rotation = something;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 87eed98..6d7de35 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -37,6 +37,12 @@ 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; }
@@ -69,8 +75,8 @@ public class BSPrimLinkable : BSPrimDisplaced
         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);
 
@@ -128,6 +134,7 @@ public class BSPrimLinkable : BSPrimDisplaced
         get { return Linkset.LinksetMass; }
     }
 
+    // Refresh the linkset structure and parameters when the prim's physical parameters are changed.
     public override void UpdatePhysicalParameters()
     {
         base.UpdatePhysicalParameters();
@@ -139,6 +146,7 @@ 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);
@@ -155,6 +163,8 @@ public class BSPrimLinkable : BSPrimDisplaced
         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))
@@ -176,6 +186,7 @@ public class BSPrimLinkable : BSPrimDisplaced
         Linkset.UpdateProperties(UpdatedProperties.EntPropUpdates, this);
     }
 
+    // Called after a simulation step to post a collision with this object.
     public override bool Collide(uint collidingWith, BSPhysObject collidee,
                     OMV.Vector3 contactPoint, OMV.Vector3 contactNormal, float pentrationDepth)
     {
-- 
cgit v1.1


From 97698ae3119e01ecd2c98f7a17ad37204b9bfd9c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 10 Jun 2013 06:40:07 -0700
Subject: BulletSim: More tweaking on center-of-mass. Almost there. Changes
 have no effect if LinksetOffsetCenterOfMass=false (the default).

---
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     | 78 +++++-----------------
 .../Physics/BulletSPlugin/BSPrimDisplaced.cs       | 63 +++++++----------
 .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 10 +++
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs    |  1 -
 4 files changed, 51 insertions(+), 101 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 30f6c8c..96626ca 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -35,62 +35,6 @@ 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 int Index;
-    public OMV.Vector3 OffsetFromRoot;
-    public OMV.Vector3 OffsetFromCenterOfMass;
-    public OMV.Quaternion OffsetRot;
-    public BSLinksetCompoundInfo(int indx, OMV.Vector3 p, OMV.Quaternion r)
-    {
-        Index = indx;
-        OffsetFromRoot = p;
-        OffsetFromCenterOfMass = p;
-        OffsetRot = r;
-    }
-    // '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)
-    {
-        // 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;
-    }
-    public override void Clear()
-    {
-        Index = 0;
-        OffsetFromRoot = OMV.Vector3.Zero;
-        OffsetFromCenterOfMass = OMV.Vector3.Zero;
-        OffsetRot = OMV.Quaternion.Identity;
-    }
-    public override string ToString()
-    {
-        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();
-    }
-};
-     */
-
 public sealed class BSLinksetCompound : BSLinkset
 {
     private static string LogHeader = "[BULLETSIM LINKSET COMPOUND]";
@@ -151,7 +95,9 @@ public sealed class BSLinksetCompound : BSLinkset
     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.
@@ -364,16 +310,28 @@ public sealed class BSLinksetCompound : BSLinkset
             int memberIndex = 1;
             ForEachMember(delegate(BSPrimLinkable cPrim)
             {
-                // Root shape is always index zero.
-                cPrim.LinksetChildIndex = IsRoot(cPrim) ? 0 : memberIndex;
+                if (IsRoot(cPrim))
+                {
+                    // Root shape is always index zero.
+                    cPrim.LinksetChildIndex = 0;
+                }
+                else
+                {
+                    cPrim.LinksetChildIndex = memberIndex;
+                    memberIndex++;
+                }
 
                 // Get a reference to the shape of the child and add that shape to the linkset compound shape
                 BSShape childShape = cPrim.PhysShape.GetReference(m_physicsScene, cPrim);
+
+                // Offset the child shape from the center-of-mass and rotate it to vehicle relative
                 OMV.Vector3 offsetPos = (cPrim.RawPosition - LinksetRoot.RawPosition) * 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, memberIndex, childShape, offsetPos, offsetRot);
+                                    LinksetRoot.LocalID, cPrim.LinksetChildIndex, childShape, offsetPos, offsetRot);
 
                 // Since we are borrowing the shape of the child, disable the origional child body
                 if (!IsRoot(cPrim))
@@ -385,8 +343,6 @@ public sealed class BSLinksetCompound : BSLinkset
                     cPrim.PhysBody.collisionType = CollisionType.LinksetChild;
                 }
 
-                memberIndex++;
-
                 return false;   // 'false' says to move onto the next child in the list
             });
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
index 9a05349..a11bca0 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
@@ -51,7 +51,7 @@ public class BSPrimDisplaced : BSPrim
     //    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).
     //
@@ -60,8 +60,6 @@ public class BSPrimDisplaced : BSPrim
     //    class.
 
     public virtual OMV.Vector3 PositionDisplacement { get; set; }
-    public virtual OMV.Quaternion OrientationDisplacement { get; set; }
-    public virtual OMV.Quaternion OrientationDisplacementOrigInv { get; set; }
 
     public BSPrimDisplaced(uint localID, String primName, BSScene parent_scene, OMV.Vector3 pos, OMV.Vector3 size,
                        OMV.Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical)
@@ -70,15 +68,17 @@ 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;
+        SetEffectiveCenterOfMassDisplacement(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).
+    // Called at taint time.
     public virtual void SetEffectiveCenterOfMassDisplacement(Vector3 centerOfMassDisplacement)
     {
         Vector3 comDisp;
@@ -87,21 +87,17 @@ public class BSPrimDisplaced : BSPrim
         else
             comDisp = centerOfMassDisplacement;
 
+        if (comDisp.ApproxEquals(Vector3.Zero, 0.01f) )
+            comDisp = Vector3.Zero;
+
         DetailLog("{0},BSPrimDisplaced.SetEffectiveCenterOfMassDisplacement,userSet={1},comDisp={2}",
                                     LocalID, UserSetCenterOfMassDisplacement.HasValue, comDisp);
-        if (comDisp == Vector3.Zero)
+        if ( comDisp != PositionDisplacement )
         {
-            // If there is no diplacement. Things get reset.
-            PositionDisplacement = OMV.Vector3.Zero;
-            OrientationDisplacement = OMV.Quaternion.Identity;
-        }
-        else
-        {
-            // 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 = Quaternion.Normalize(RawOrientation);
-            OrientationDisplacementOrigInv = Quaternion.Inverse(OrientationDisplacement);
+            this.ForcePosition = RawPosition;
         }
     }
 
@@ -112,7 +108,11 @@ public class BSPrimDisplaced : BSPrim
         {
             if (PositionDisplacement != OMV.Vector3.Zero)
             {
-                OMV.Vector3 displacedPos = value - (PositionDisplacement * (OrientationDisplacementOrigInv * RawOrientation));
+                // The displacement is always relative to the vehicle so, when setting position,
+                //    the caller means to set the position of the root prim.
+                // This offsets the setting value to the center-of-mass and sends that to the
+                //    physics engine.
+                OMV.Vector3 displacedPos = value - (PositionDisplacement * RawOrientation);
                 DetailLog("{0},BSPrimDisplaced.ForcePosition,val={1},disp={2},newPos={3}", LocalID, value, PositionDisplacement, displacedPos);
                 base.ForcePosition = displacedPos;
             }
@@ -123,26 +123,12 @@ public class BSPrimDisplaced : BSPrim
         }
     }
 
-    public override Quaternion ForceOrientation
-    {
-        get { return base.ForceOrientation; }
-        set
-        {
-            // Changing orientation also changes the position of the center-of-mass since
-            //    the orientation passed is for a rotation around the root prim's center.
-            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; }
@@ -151,18 +137,17 @@ 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)
         {
-            // The origional shape was offset from 'zero' by PositionDisplacement and rotated by OrientationDisplacement.
-            // These physical locations and rotation must be back converted to be centered around the displaced
+            // The origional shape was offset from 'zero' by PositionDisplacement.
+            // These physical location must be back converted to be centered around the displaced
             //     root shape.
 
             // The root position is the reported position displaced by the rotated displacement.
-            OMV.Vector3 displacedPos = entprop.Position + (PositionDisplacement * (entprop.Rotation * OrientationDisplacementOrigInv));
-            
-            DetailLog("{0},BSPrimDisplaced.ForcePosition,physPos={1},disp={2},newPos={3}", LocalID, entprop.Position, PositionDisplacement, displacedPos);
+            OMV.Vector3 displacedPos = entprop.Position + (PositionDisplacement * entprop.Rotation);
+            DetailLog("{0},BSPrimDisplaced.UpdateProperties,physPos={1},disp={2},newPos={3}",
+                                    LocalID, entprop.Position, PositionDisplacement, displacedPos);
             entprop.Position = displacedPos;
-            // entprop.Rotation = something;
         }
 
         base.UpdateProperties(entprop);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 6d7de35..7058646 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -134,6 +134,16 @@ 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()
     {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 1645c98..e56a6f6 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -785,7 +785,6 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
             {
                 // The simulation of the time interval took less than realtime.
                 // Do a sleep for the rest of realtime.
-                DetailLog("{0},BulletSPluginPhysicsThread,sleeping={1}", BSScene.DetailLogZero, simulationTimeVsRealtimeDifferenceMS);
                 Thread.Sleep(simulationTimeVsRealtimeDifferenceMS);
             }
             else
-- 
cgit v1.1


From a65cec3986431f5a2f4f9eb2424157def0d035c8 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 6 Jul 2013 08:22:59 -0700
Subject: BulletSim: implementation of linkset center-of-mass. Default off, for
 the moment, until more testing. Add separate thread and center-of-mass flags
 to OpenSimDefaults.ini. Clean up comments in OpenSimDefaults.ini.

---
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     | 20 +++++---
 .../Region/Physics/BulletSPlugin/BSPhysObject.cs   |  3 ++
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     |  5 +-
 .../Physics/BulletSPlugin/BSPrimDisplaced.cs       | 60 ++++++++++++++++------
 .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 11 ++--
 bin/OpenSimDefaults.ini                            | 56 +++++++++++++-------
 6 files changed, 107 insertions(+), 48 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 96626ca..1d94142 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -271,6 +271,8 @@ public sealed class BSLinksetCompound : BSLinkset
             //     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);
 
             // There is no reason to build all this physical stuff for a non-physical linkset.
@@ -283,28 +285,29 @@ public sealed class BSLinksetCompound : BSLinkset
             // Get a new compound shape to build the linkset shape in.
             BSShape linksetShape = BSShapeCompound.GetReference(m_physicsScene);
 
-            // 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 = ComputeLinksetCenterOfMass();
 
             OMV.Quaternion invRootOrientation = OMV.Quaternion.Normalize(OMV.Quaternion.Inverse(LinksetRoot.RawOrientation));
+            OMV.Vector3 origRootPosition = LinksetRoot.RawPosition;
 
-            // 'centerDisplacementV' is the value to subtract from children to give physical offset position
+            // '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
             {
-                LinksetRoot.SetEffectiveCenterOfMassDisplacement(centerDisplacementV);
                 // The actual center-of-mass could have been set by the user.
-                centerDisplacementV = LinksetRoot.PositionDisplacement;
+                centerDisplacementV = LinksetRoot.SetEffectiveCenterOfMassDisplacement(centerDisplacementV);
             }
+
             DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,COM,rootPos={1},com={2},comDisp={3}",
-                                LinksetRoot.LocalID, LinksetRoot.RawPosition, centerOfMassW, centerDisplacementV);
+                                LinksetRoot.LocalID, origRootPosition, centerOfMassW, centerDisplacementV);
 
             // Add the shapes of all the components of the linkset
             int memberIndex = 1;
@@ -321,11 +324,11 @@ public sealed class BSLinksetCompound : BSLinkset
                     memberIndex++;
                 }
 
-                // Get a reference to the shape of the child and add that shape to the linkset compound shape
+                // 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);
 
-                // Offset the child shape from the center-of-mass and rotate it to vehicle relative
-                OMV.Vector3 offsetPos = (cPrim.RawPosition - LinksetRoot.RawPosition) * invRootOrientation - centerDisplacementV;
+                // 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
@@ -366,6 +369,7 @@ public sealed class BSLinksetCompound : BSLinkset
                 // 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);
             }
         }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index a0d5c42..738e2d0 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -90,6 +90,8 @@ public abstract class BSPhysObject : PhysicsActor
         PhysBody = new BulletBody(localID);
         PhysShape = new BSShapeNull();
 
+        UserSetCenterOfMassDisplacement = null;
+
         PrimAssetState = PrimAssetCondition.Unknown;
 
         // Default material type. Also sets Friction, Restitution and Density.
@@ -180,6 +182,7 @@ 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;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index f0858ca..ce4c3da 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -802,6 +802,7 @@ 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)
@@ -1532,6 +1533,8 @@ public class BSPrim : BSPhysObject
 
     // 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.
@@ -1567,8 +1570,6 @@ public class BSPrim : BSPhysObject
         LastEntityProperties = CurrentEntityProperties;
         CurrentEntityProperties = entprop;
 
-        // Note that BSPrim can be overloaded by BSPrimLinkable which controls updates from root and children prims.
-        
         PhysScene.PostUpdate(this);
     }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
index a11bca0..35d5a08 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
@@ -59,6 +59,7 @@ 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 BSPrimDisplaced(uint localID, String primName, BSScene parent_scene, OMV.Vector3 pos, OMV.Vector3 size,
@@ -72,49 +73,77 @@ public class BSPrimDisplaced : BSPrim
     // Does not clear the displacement set by the user.
     public void ClearDisplacement()
     {
-        SetEffectiveCenterOfMassDisplacement(OMV.Vector3.Zero);
+        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).
+    // Returns the relative offset from the root position to the center-of-mass.
     // Called at taint time.
-    public virtual void SetEffectiveCenterOfMassDisplacement(Vector3 centerOfMassDisplacement)
+    public virtual Vector3 SetEffectiveCenterOfMassDisplacement(Vector3 centerOfMassDisplacement)
     {
+        PhysScene.AssertInTaintTime("BSPrimDisplaced.SetEffectiveCenterOfMassDisplacement");
         Vector3 comDisp;
         if (UserSetCenterOfMassDisplacement.HasValue)
             comDisp = (OMV.Vector3)UserSetCenterOfMassDisplacement;
         else
             comDisp = centerOfMassDisplacement;
 
+        // 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 != PositionDisplacement )
+        if ( !comDisp.ApproxEquals(PositionDisplacement, 0.01f) )
         {
             // Displacement setting is changing.
             // The relationship between the physical object and simulated object must be aligned.
             PositionDisplacement = comDisp;
             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 = base.ForcePosition;
+            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;
+            }
+            return physPosition;
+        }
         set
         {
             if (PositionDisplacement != OMV.Vector3.Zero)
             {
-                // The displacement is always relative to the vehicle so, when setting position,
-                //    the caller means to set the position of the root prim.
-                // This offsets the setting value to the center-of-mass and sends that to the
-                //    physics engine.
-                OMV.Vector3 displacedPos = value - (PositionDisplacement * RawOrientation);
-                DetailLog("{0},BSPrimDisplaced.ForcePosition,val={1},disp={2},newPos={3}", LocalID, value, PositionDisplacement, displacedPos);
-                base.ForcePosition = displacedPos;
+                // 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
             {
@@ -143,10 +172,11 @@ public class BSPrimDisplaced : BSPrim
             // These physical location must be back converted to be centered around the displaced
             //     root shape.
 
-            // The root position is the reported position displaced by the rotated displacement.
-            OMV.Vector3 displacedPos = entprop.Position + (PositionDisplacement * entprop.Rotation);
-            DetailLog("{0},BSPrimDisplaced.UpdateProperties,physPos={1},disp={2},newPos={3}",
-                                    LocalID, entprop.Position, PositionDisplacement, displacedPos);
+            // 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;
         }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 7058646..1fbcfcc 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -160,10 +160,13 @@ public class BSPrimLinkable : BSPrimDisplaced
     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.
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 4a89fe2..4a3104e 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -919,54 +919,72 @@
     ; ## 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]
-    ; 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.
+    ; 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.
+    ; 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
-    TerrainImplementation = 1   ; 0=Heightfield, 1=mesh
-    ; 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.
+    ; 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
+
+    ; 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
+    ; 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.
+    ; '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
 
+	; 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
+    ; If 'false', the Bullet native special case shape is used for square rectangles
+    ;   and even dimensioned spheres.
     ForceSimplePrimMeshing = false
 
     ; 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.
+    ;   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.
-- 
cgit v1.1


From d838f15d97d5ae400af86aa52c9ea68f0ba299bb Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 6 Jul 2013 09:53:30 -0700
Subject: Add implementations for llSetVelocity and llSetAngularVelocity.

---
 .../Shared/Api/Implementation/LSL_Api.cs           | 26 ++++++++++++++++++++++
 .../ScriptEngine/Shared/Api/Interface/ILSL_Api.cs  |  2 ++
 .../ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs    | 10 +++++++++
 3 files changed, 38 insertions(+)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c0b8373..34e2b4d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2382,6 +2382,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return force;
         }
 
+        public void llSetVelocity(LSL_Vector velocity, int local)
+        {
+            m_host.AddScriptLPS(1);
+
+            if (!m_host.ParentGroup.IsDeleted)
+            {
+                if (local != 0)
+                    velocity *= llGetRot();
+
+                m_host.ParentGroup.RootPart.Velocity = velocity;
+            }
+        }
+
+        public void llSetAngularVelocity(LSL_Vector angularVelocity, int local)
+        {
+            m_host.AddScriptLPS(1);
+
+            if (!m_host.ParentGroup.IsDeleted)
+            {
+                if (local != 0)
+                    angularVelocity *= llGetRot();
+
+                m_host.ParentGroup.RootPart.AngularVelocity = angularVelocity;
+            }
+        }
+
         public LSL_Integer llTarget(LSL_Vector position, double range)
         {
             m_host.AddScriptLPS(1);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index ff13ee6..340edb3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -342,6 +342,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
               void llSetDamage(double damage);
               void llSetForce(LSL_Vector force, int local);
               void llSetForceAndTorque(LSL_Vector force, LSL_Vector torque, int local);
+              void llSetVelocity(LSL_Vector velocity, 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);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 87cc342..7cd17e7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -1548,6 +1548,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_LSL_Functions.llSetForceAndTorque(force, torque, local);
         }
 
+        public void llSetVelocity(LSL_Vector force, int local)
+        {
+            m_LSL_Functions.llSetVelocity(force, 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);
-- 
cgit v1.1


From b29a09ab8e4040cc09f8021f638d7604f2372bad Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 6 Jul 2013 15:17:55 -0700
Subject: Simina activity detector was too eager. Disabled it in case simian is
 not being used.

---
 .../Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index 7bb06fb..0a39088 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;
                 }
             }
-- 
cgit v1.1


From 9b75d757241e87408c50b1f92996bf667960c348 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 6 Jul 2013 16:51:14 -0700
Subject: WARNING: BRUTE FORCE DEBUG AGAIN. AVOID USING THIS COMMIT

---
 .../CoreModules/Framework/UserManagement/UserManagementModule.cs      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index a7cbc8f..11227ef 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -521,6 +521,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     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);
+                    Util.PrintCallStack();
+
                 }
                 else
                 {
@@ -555,7 +557,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                         }
                         catch (UriFormatException)
                         {
-                            m_log.DebugFormat("[SCENE]: Unable to parse Uri {0}", parts[0]);
+                            m_log.DebugFormat("[SCENE]: Unable to parse Uri {0} from {1}", parts[0], creatorData);
                             user.LastName = "@unknown";
                         }
                     }
-- 
cgit v1.1


From 1dd3a0bc576b04e8989e8ac16e96aff024c0d6cd Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 6 Jul 2013 17:29:19 -0700
Subject: MORE DEBUG. DON"T USE THIS.

---
 .../Inventory/RemoteXInventoryServiceConnector.cs                   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
index 70ba944..8f41355 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -201,12 +201,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                 List<InventoryItemBase> items = new List<InventoryItemBase>(invCol.Items);
 
                 if (items != null && items.Count > 0)
-                    Util.FireAndForget(delegate
-                    {
+                    //Util.FireAndForget(delegate
+                    //{
                         foreach (InventoryItemBase item in items)
                             if (!string.IsNullOrEmpty(item.CreatorData))
                                 UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
-                    });
+                    //});
             }
 
             return invCol;
-- 
cgit v1.1


From 391633c072792fc36a188d6fa88e994fa150807d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 6 Jul 2013 18:02:17 -0700
Subject: Some more fixes on strange behaviors of Unknown User, esp. related to
 large messy inventories and esp. related to kokua

---
 .../UserManagement/UserManagementModule.cs         |  5 ++--
 .../Inventory/RemoteXInventoryServiceConnector.cs  | 27 +++++++++++-----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 11227ef..74608b3 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -514,9 +514,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     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)))
+                //try update unknown users, but don't update anyone else
+                if (oldUser.FirstName == "Unknown" && !creatorData.Contains("Unknown")) 
                 {
                     lock (m_UserCache)
                         m_UserCache.Remove(id);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
index 8f41355..7f78076 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -195,19 +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)
-                            if (!string.IsNullOrEmpty(item.CreatorData))
-                                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;
         }
-- 
cgit v1.1


From 71e26555bd67b8636cf71f71951cfc2aad68a2ee Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 6 Jul 2013 18:16:27 -0700
Subject: Revert "WARNING: BRUTE FORCE DEBUG AGAIN. AVOID USING THIS COMMIT"

This reverts commit 9b75d757241e87408c50b1f92996bf667960c348.
---
 .../CoreModules/Framework/UserManagement/UserManagementModule.cs      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 74608b3..524d159 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -520,8 +520,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     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);
-                    Util.PrintCallStack();
-
                 }
                 else
                 {
@@ -556,7 +554,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                         }
                         catch (UriFormatException)
                         {
-                            m_log.DebugFormat("[SCENE]: Unable to parse Uri {0} from {1}", parts[0], creatorData);
+                            m_log.DebugFormat("[SCENE]: Unable to parse Uri {0}", parts[0]);
                             user.LastName = "@unknown";
                         }
                     }
-- 
cgit v1.1


From 803e5498b09c241a8bab8e8deeeff3a259766c2d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 6 Jul 2013 18:27:03 -0700
Subject: A little more debug

---
 OpenSim/Services/UserAccountService/GridUserService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index fa9a4a8..b1cdd45 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -156,7 +156,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)
             {
-- 
cgit v1.1


From 128667735291234c4655216af0fdfc6f07355e20 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 6 Jul 2013 18:37:54 -0700
Subject: Try to normalize the creatorData of scene object parts with the
 trailing '/'. What a nightmare this '/' is!

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 482d958..f287a34 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -505,7 +505,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];
 
-- 
cgit v1.1


From 70d24a654b8eb0257ca927327d51bd0e47f85259 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 7 Jul 2013 05:46:24 -0700
Subject: BulletSim: rename position and orientation variables to remove the
 inconsistant use of Raw* and _* conventions.

---
 .../Region/Physics/BulletSPlugin/BSCharacter.cs    | 78 +++++++++-----------
 .../Region/Physics/BulletSPlugin/BSPhysObject.cs   |  4 +-
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     | 84 ++++++++++------------
 3 files changed, 71 insertions(+), 95 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 5ef6992..c9e3ca0 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -43,12 +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 float _collisionScore;
     private OMV.Vector3 _acceleration;
-    private OMV.Quaternion _orientation;
     private int _physicsActorType;
     private bool _isPhysical;
     private bool _flying;
@@ -70,10 +68,10 @@ public sealed class BSCharacter : BSPhysObject
             : base(parent_scene, localID, avName, "BSCharacter")
     {
         _physicsActorType = (int)ActorTypes.Agent;
-        _position = pos;
+        RawPosition = pos;
 
         _flying = isFlying;
-        _orientation = OMV.Quaternion.Identity;
+        RawOrientation = OMV.Quaternion.Identity;
         RawVelocity = OMV.Vector3.Zero;
         _buoyancy = ComputeBuoyancyFromFlying(isFlying);
         Friction = BSParam.AvatarStandingFriction;
@@ -133,7 +131,7 @@ public sealed class BSCharacter : BSPhysObject
         PhysScene.PE.RemoveObjectFromWorld(PhysScene.World, PhysBody);
 
         ZeroMotion(true);
-        ForcePosition = _position;
+        ForcePosition = RawPosition;
 
         // Set the velocity
         if (m_moveActor != null)
@@ -272,38 +270,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;
 
             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 = PhysScene.PE.GetPosition(PhysBody);
-            return _position;
+            RawPosition = PhysScene.PE.GetPosition(PhysBody);
+            return RawPosition;
         }
         set {
-            _position = value;
+            RawPosition = value;
             if (PhysBody.HasPhysicalBody)
             {
-                PhysScene.PE.SetTranslation(PhysBody, _position, _orientation);
+                PhysScene.PE.SetTranslation(PhysBody, RawPosition, RawOrientation);
             }
         }
     }
@@ -331,16 +324,16 @@ public sealed class BSCharacter : BSPhysObject
         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 = PhysScene.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;
             }
         }
@@ -360,8 +353,8 @@ public sealed class BSCharacter : BSPhysObject
             //    just assign to "Position" because of potential call loops.
             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;
         }
@@ -466,19 +459,14 @@ 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;
+                RawOrientation = value;
                 PhysScene.TaintedObject("BSCharacter.setOrientation", delegate()
                 {
                     // Bullet assumes we know what we are doing when forcing orientation
@@ -486,10 +474,10 @@ public sealed class BSCharacter : BSPhysObject
                     // 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;
-                    _orientation.GetEulerAngles(out oRoll, out oPitch, out 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, _orientation, OMV.Vector3.UnitX * _orientation,
+                    //                 LocalID, RawOrientation, OMV.Vector3.UnitX * RawOrientation,
                     //                 trimmedOrientation, OMV.Vector3.UnitX * trimmedOrientation);
                     ForceOrientation = trimmedOrientation;
                 });
@@ -501,16 +489,16 @@ public sealed class BSCharacter : BSPhysObject
     {
         get
         {
-            _orientation = PhysScene.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);
-                PhysScene.PE.SetTranslation(PhysBody, _position, _orientation);
+                // RawPosition = PhysicsScene.PE.GetPosition(BSBody);
+                PhysScene.PE.SetTranslation(PhysBody, RawPosition, RawOrientation);
             }
         }
     }
@@ -723,9 +711,9 @@ public sealed class BSCharacter : BSPhysObject
     {
         // Don't change position if standing on a stationary object.
         if (!IsStationary)
-            _position = entprop.Position;
+            RawPosition = entprop.Position;
 
-        _orientation = entprop.Rotation;
+        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
@@ -740,8 +728,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
@@ -755,7 +743,7 @@ public sealed class BSCharacter : BSPhysObject
         // base.RequestPhysicsterseUpdate();
 
         DetailLog("{0},BSCharacter.UpdateProperties,call,pos={1},orient={2},vel={3},accel={4},rotVel={5}",
-                LocalID, _position, _orientation, RawVelocity, _acceleration, _rotationalVelocity);
+                LocalID, RawPosition, RawOrientation, RawVelocity, _acceleration, _rotationalVelocity);
     }
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 738e2d0..a41eaf8 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -197,10 +197,10 @@ 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 OMV.Vector3 RawVelocity { get; set; }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index ce4c3da..d43448e 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -51,12 +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 _acceleration;
-    private OMV.Quaternion _orientation;
     private int _physicsActorType;
     private bool _isPhysical;
     private bool _flying;
@@ -88,10 +84,10 @@ 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;
         RawVelocity = OMV.Vector3.Zero;
         _rotationalVelocity = OMV.Vector3.Zero;
@@ -270,46 +266,42 @@ public class BSPrim : BSPhysObject
         return;
     }
 
-    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);
 
             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 = PhysScene.PE.GetPosition(PhysBody);
-            return _position;
+            RawPosition = PhysScene.PE.GetPosition(PhysBody);
+            return RawPosition;
         }
         set {
-            _position = value;
+            RawPosition = value;
             if (PhysBody.HasPhysicalBody)
             {
-                PhysScene.PE.SetTranslation(PhysBody, _position, _orientation);
+                PhysScene.PE.SetTranslation(PhysBody, RawPosition, RawOrientation);
                 ActivateIfPhysical(false);
             }
         }
@@ -343,10 +335,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);
@@ -355,7 +347,7 @@ public class BSPrim : BSPhysObject
 
         if ((CurrentCollisionFlags & CollisionFlags.BS_FLOATS_ON_WATER) != 0)
         {
-            float waterHeight = PhysScene.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)
             {
@@ -364,7 +356,7 @@ public class BSPrim : BSPhysObject
 
                 // Apply upforce and overcome gravity.
                 OMV.Vector3 correctionForce = upForce - PhysScene.DefaultGravity;
-                DetailLog("{0},BSPrim.PositionSanityCheck,applyForce,pos={1},upForce={2},correctionForce={3}", LocalID, _position, upForce, correctionForce);
+                DetailLog("{0},BSPrim.PositionSanityCheck,applyForce,pos={1},upForce={2},correctionForce={3}", LocalID, RawPosition, upForce, correctionForce);
                 AddForce(correctionForce, false, inTaintTime);
                 ret = true;
             }
@@ -383,11 +375,11 @@ 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;
         }
@@ -713,23 +705,19 @@ public class BSPrim : 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;
+            return RawOrientation;
         }
         set {
-            if (_orientation == value)
+            if (RawOrientation == value)
                 return;
-            _orientation = value;
+            RawOrientation = value;
 
             PhysScene.TaintedObject("BSPrim.setOrientation", delegate()
             {
-                ForceOrientation = _orientation;
+                ForceOrientation = RawOrientation;
             });
         }
     }
@@ -738,14 +726,14 @@ public class BSPrim : BSPhysObject
     {
         get
         {
-            _orientation = PhysScene.PE.GetOrientation(PhysBody);
-            return _orientation;
+            RawOrientation = PhysScene.PE.GetOrientation(PhysBody);
+            return RawOrientation;
         }
         set
         {
-            _orientation = value;
+            RawOrientation = value;
             if (PhysBody.HasPhysicalBody)
-                PhysScene.PE.SetTranslation(PhysBody, _position, _orientation);
+                PhysScene.PE.SetTranslation(PhysBody, RawPosition, RawOrientation);
         }
     }
     public override int PhysicsActorType {
@@ -889,7 +877,7 @@ public class BSPrim : BSPhysObject
             // PhysicsScene.PE.ClearAllForces(BSBody);
 
             // For good measure, make sure the transform is set through to the motion state
-            ForcePosition = _position;
+            ForcePosition = RawPosition;
             ForceVelocity = RawVelocity;
             ForceRotationalVelocity = _rotationalVelocity;
 
@@ -1543,8 +1531,8 @@ public class BSPrim : BSPhysObject
         // 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(RawVelocity, BSParam.UpdateVelocityChangeThreshold))
@@ -1557,13 +1545,13 @@ public class BSPrim : BSPhysObject
         // The sanity check can change the velocity and/or position.
         if (PositionSanityCheck(true /* inTaintTime */ ))
         {
-            entprop.Position = _position;
+            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
-- 
cgit v1.1


From 6026759406f20cb89cbc62fcfc3af324c61c5ab0 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 7 Jul 2013 05:47:41 -0700
Subject: BulletSim: fix jumping up and down of linksets when center-of-mass
 was enabled. Didn't effect the physical position but the viewer saw the
 linkset jumping between its simulator center and its physical center.

---
 OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
index 35d5a08..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;
@@ -115,7 +110,7 @@ public class BSPrimDisplaced : BSPrim
     public override Vector3 ForcePosition
     {
         get {
-            OMV.Vector3 physPosition = base.ForcePosition;
+            OMV.Vector3 physPosition = PhysScene.PE.GetPosition(PhysBody);
             if (PositionDisplacement != OMV.Vector3.Zero)
             {
                 // If there is some displacement, return the physical position (center-of-mass)
@@ -125,6 +120,7 @@ public class BSPrimDisplaced : BSPrim
                                 LocalID, physPosition, displacement, physPosition - displacement);
                 physPosition -= displacement;
             }
+            RawPosition = physPosition;
             return physPosition;
         }
         set
-- 
cgit v1.1


From bbc40fab620dd61e500d8f74fa1b0d64ecc7c3b6 Mon Sep 17 00:00:00 2001
From: Vegaslon
Date: Sat, 6 Jul 2013 12:53:20 -0400
Subject: BulletSim: Different Implementation of Angular Deflection for
 vehicles, Activates it again and fixes problem with fighting with vertical
 attractor removing wobble of forward axis. Comments on testing welcome, May
 require adjustments of this force or other forces after this commit, exact
 tweaking to come after testing on other hardware.

Signed-off-by: Robert Adams <Robert.Adams@intel.com>
---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 31 +++++++++++-----------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index c27d3f0..82fe267 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         public void SetupVehicleDebugging()
         {
             enableAngularVerticalAttraction = true;
-            enableAngularDeflection = false;
+            enableAngularDeflection = true;
             enableAngularBanking = true;
             if (BSParam.VehicleDebuggingEnable)
             {
@@ -173,7 +173,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             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);
@@ -1512,11 +1512,7 @@ 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)
             {
@@ -1531,10 +1527,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);
@@ -1547,15 +1547,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}",
                     ControllingPrim.LocalID, movingDirection, pointingDirection, deflectionError, deflectContributionV);
-                VDetailLog("{0},  MoveAngular,Deflection,fwdSpd={1},defEff={2},defTS={3}",
-                    ControllingPrim.LocalID, VehicleForwardSpeed, m_angularDeflectionEfficiency, m_angularDeflectionTimescale);
+                VDetailLog("{0},  MoveAngular,Deflection,fwdSpd={1},defEff={2},defTS={3},PredictedPointingDir={4}",
+                    ControllingPrim.LocalID, VehicleForwardSpeed, m_angularDeflectionEfficiency, m_angularDeflectionTimescale, predictedPointingDirection);
             }
         }
 
-- 
cgit v1.1


From bbb9af363de5cabf44dec2b5aba6fb386a1e7fad Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 7 Jul 2013 20:43:42 -0700
Subject: Print out caller IP when unusual requests are received.

---
 OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 71a9e6f..b01de7a 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Server.Handlers.Simulation
             }
             else
             {
-                m_log.InfoFormat("[AGENT HANDLER]: method {0} not supported in agent message", method);
+                m_log.InfoFormat("[AGENT HANDLER]: method {0} not supported in agent message (caller is {1})", method, Util.GetCallerIP(request));
                 responsedata["int_response_code"] = HttpStatusCode.MethodNotAllowed;
                 responsedata["str_response_string"] = "Method not allowed";
 
-- 
cgit v1.1


From c66a9a08e4fed5cc675aac8a7a2999549049d79c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 8 Jul 2013 08:41:18 -0700
Subject: Placed a throttle on UserManagementModule for name lookups.
 Singularity apparently is flooding the sims with name requests.

---
 .../UserManagement/HGUserManagementModule.cs       |  2 +-
 .../UserManagement/UserManagementModule.cs         | 66 ++++++++++++++++++----
 2 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
index ad3cf15..245c808 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
@@ -58,7 +58,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);
             }
         }
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 524d159..a528093 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;
@@ -57,6 +59,10 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
         // The cache
         protected Dictionary<UUID, UserData> m_UserCache = new Dictionary<UUID, UserData>();
 
+        // Throttle the name requests
+        private OpenSim.Framework.BlockingQueue<NameRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<NameRequest>();
+
+
         #region ISharedRegionModule
 
         public void Initialise(IConfigSource config)
@@ -65,7 +71,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);
             }
         }
@@ -160,16 +166,9 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             }
             else
             {
-                string[] names;
-                bool foundRealName = TryGetUserNames(uuid, out names);
+                NameRequest request = new NameRequest(remote_client, uuid);
+                m_RequestQueue.Enqueue(request);
 
-                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, remote_client.Name);
-
-                    remote_client.SendNameReply(uuid, names[0], names[1]);
-                }
             }
         }
 
@@ -596,6 +595,18 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         #endregion IUserManagement
 
+        protected void Init()
+        {
+            RegisterConsoleCmds();
+            Watchdog.StartThread(
+                ProcessQueue,
+                "NameRequestThread",
+                ThreadPriority.BelowNormal,
+                true,
+                false);
+
+        }
+
         protected void RegisterConsoleCmds()
         {
             MainConsole.Instance.Commands.AddCommand("Users", true,
@@ -662,5 +673,40 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
             MainConsole.Instance.Output(cdt.ToString());
         }
+
+        private void ProcessQueue()
+        {
+            while (true)
+            {
+                Watchdog.UpdateThread();
+
+                NameRequest request = m_RequestQueue.Dequeue();
+                string[] names;
+                bool foundRealName = TryGetUserNames(request.uuid, out 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], request.uuid, request.client.Name);
+
+                    request.client.SendNameReply(request.uuid, names[0], names[1]);
+                }
+
+            }
+        }
+
+    }
+
+    class NameRequest
+    {
+        public IClientAPI client;
+        public UUID uuid;
+
+        public NameRequest(IClientAPI c, UUID n)
+        {
+            client = c;
+            uuid = n;
+        }
     }
+
 }
\ No newline at end of file
-- 
cgit v1.1


From a38c2abae4a5262ec0332426c9721b8718d4e85f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 8 Jul 2013 18:07:04 +0100
Subject: Make dictionary read/write locking consistent in CapabilitiesModule,
 rename two dictionary fields to standard m_ format

---
 .../Framework/Caps/CapabilitiesModule.cs           | 130 +++++++++++++--------
 1 file changed, 82 insertions(+), 48 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index 6ae9448..c8b341b 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -57,8 +57,8 @@ namespace OpenSim.Region.CoreModules.Framework
         /// </summary>
         protected Dictionary<UUID, Caps> m_capsObjects = new Dictionary<UUID, 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)
@@ -105,35 +105,42 @@ namespace OpenSim.Region.CoreModules.Framework
             if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId))
                 return;
 
+            Caps caps;
             String capsObjectPath = GetCapsPath(agentId);
 
-            if (m_capsObjects.ContainsKey(agentId))
+            lock (m_capsObjects)
             {
-                Caps oldCaps = m_capsObjects[agentId];
-                
-                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;
-            }
+                if (m_capsObjects.ContainsKey(agentId))
+                {
+                    Caps oldCaps = m_capsObjects[agentId];
+                    
+                    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);
+                caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName,
+                        (MainServer.Instance == null) ? 0: MainServer.Instance.Port,
+                        capsObjectPath, agentId, m_scene.RegionInfo.RegionName);
 
-            m_capsObjects[agentId] = caps;
+                m_capsObjects[agentId] = caps;
+            }
 
             m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps);
         }
 
         public void RemoveCaps(UUID agentId)
         {
-            if (childrenSeeds.ContainsKey(agentId))
+            lock (m_childrenSeeds)
             {
-                childrenSeeds.Remove(agentId);
+                if (m_childrenSeeds.ContainsKey(agentId))
+                {
+                    m_childrenSeeds.Remove(agentId);
+                }
             }
 
             lock (m_capsObjects)
@@ -168,16 +175,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;
@@ -186,17 +199,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);
+                }
             }
         }
 
@@ -204,30 +224,41 @@ 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)
             {
-                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<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);
+                }
             }
         }
 
@@ -236,21 +267,24 @@ namespace OpenSim.Region.CoreModules.Framework
             StringBuilder caps = new StringBuilder();
             caps.AppendFormat("Region {0}:\n", m_scene.RegionInfo.RegionName);
 
-            foreach (KeyValuePair<UUID, Caps> kvp in m_capsObjects)
+            lock (m_capsObjects)
             {
-                caps.AppendFormat("** User {0}:\n", kvp.Key);
-
-                for (IDictionaryEnumerator kvp2 = kvp.Value.CapsHandlers.GetCapsDetails(false, null).GetEnumerator(); kvp2.MoveNext(); )
+                foreach (KeyValuePair<UUID, Caps> kvp in m_capsObjects)
                 {
-                    Uri uri = new Uri(kvp2.Value.ToString());
-                    caps.AppendFormat(m_showCapsCommandFormat, kvp2.Key, uri.PathAndQuery);
-                }
+                    caps.AppendFormat("** User {0}:\n", kvp.Key);
+
+                    for (IDictionaryEnumerator kvp2 = kvp.Value.CapsHandlers.GetCapsDetails(false, null).GetEnumerator(); kvp2.MoveNext(); )
+                    {
+                        Uri uri = new Uri(kvp2.Value.ToString());
+                        caps.AppendFormat(m_showCapsCommandFormat, kvp2.Key, uri.PathAndQuery);
+                    }
 
-                foreach (KeyValuePair<string, string> kvp3 in kvp.Value.ExternalCapsHandlers)
-                    caps.AppendFormat(m_showCapsCommandFormat, kvp3.Key, kvp3.Value);
+                    foreach (KeyValuePair<string, string> kvp3 in kvp.Value.ExternalCapsHandlers)
+                        caps.AppendFormat(m_showCapsCommandFormat, kvp3.Key, kvp3.Value);
+                }
             }
 
             MainConsole.Instance.Output(caps.ToString());
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1


From e19defde36ddbd5ff90d8304c6fe3b57110f8078 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 8 Jul 2013 22:03:07 +0100
Subject: Add "show caps stats by user" and "show caps stats by cap" console
 commands to print various counts of capability invocation by user and by cap

This currently prints caps requests received and handled, so that overload of received compared to handled or deadlock can be detected.
This involves making BaseStreamHandler and BaseOutputStream record the ints, which means inheritors should subclass ProcessRequest() instead of Handle()
However, existing inheriting classes overriding Handle() will still work, albeit without stats recording.
"show caps" becomes "show caps list" to disambiguate between show caps commands
---
 .../Hypergrid/HGGroupsServiceRobustConnector.cs    |   2 +-
 .../Groups/Remote/GroupsServiceRobustConnector.cs  |   2 +-
 .../Remote/OfflineIMServiceRobustConnector.cs      |   2 +-
 OpenSim/Capabilities/CapsHandlers.cs               |  16 +-
 .../AvatarPickerSearchHandler.cs                   |   2 +-
 .../Handlers/GetTexture/GetTextureHandler.cs       |   2 +-
 OpenSim/Capabilities/LLSDStreamHandler.cs          |   2 +-
 .../Servers/HttpServer/BaseRequestHandler.cs       |   4 +
 .../Servers/HttpServer/BaseStreamHandler.cs        |  27 ++-
 .../Servers/HttpServer/BinaryStreamHandler.cs      |   2 +-
 .../HttpServer/Interfaces/IStreamHandler.cs        |  15 +-
 .../Servers/HttpServer/RestDeserialiseHandler.cs   |   4 +-
 .../Servers/HttpServer/RestSessionService.cs       |  13 +-
 .../Servers/HttpServer/RestStreamHandler.cs        |   2 +-
 OpenSim/Region/Application/OpenSimBase.cs          |   8 +-
 .../ClientStack/Linden/Caps/RegionConsoleModule.cs |   2 +-
 .../Avatar/Friends/FriendsRequestHandler.cs        |   2 +-
 .../Framework/Caps/CapabilitiesModule.cs           | 234 ++++++++++++++++++++-
 .../World/Estate/XEstateRequestHandler.cs          |   2 +-
 .../Region/Framework/Scenes/RegionStatsHandler.cs  |   2 +-
 .../ViewerSupport/DynamicMenuModule.cs             |   2 +-
 .../World/WorldView/WorldViewRequestHandler.cs     |   2 +-
 .../Handlers/Asset/AssetServerDeleteHandler.cs     |   2 +-
 .../Server/Handlers/Asset/AssetServerGetHandler.cs |   2 +-
 .../Handlers/Asset/AssetServerPostHandler.cs       |   2 +-
 .../AuthenticationServerPostHandler.cs             |   2 +-
 .../Handlers/Authentication/OpenIdServerHandler.cs |  30 +--
 .../AuthorizationServerPostHandler.cs              |   2 +-
 .../Handlers/Avatar/AvatarServerPostHandler.cs     |   2 +-
 .../Handlers/Friends/FriendsServerPostHandler.cs   |   2 +-
 .../Server/Handlers/Grid/GridServerPostHandler.cs  |   2 +-
 .../Handlers/GridUser/GridUserServerPostHandler.cs |   2 +-
 .../Hypergrid/HGFriendsServerPostHandler.cs        |   2 +-
 .../Handlers/Hypergrid/HeloServerConnector.cs      |   2 +-
 .../Server/Handlers/Hypergrid/HomeAgentHandlers.cs |   1 +
 .../Inventory/InventoryServerMoveItemsHandler.cs   |   2 +-
 .../Handlers/Inventory/XInventoryInConnector.cs    |   2 +-
 .../Server/Handlers/Map/MapAddServerConnector.cs   |   2 +-
 .../Server/Handlers/Map/MapGetServerConnector.cs   |   2 +-
 .../Server/Handlers/Neighbour/NeighbourHandlers.cs |   8 +-
 .../Handlers/Presence/PresenceServerPostHandler.cs |   2 +-
 .../Server/Handlers/Simulation/AgentHandlers.cs    |   4 +-
 .../UserAccounts/UserAccountServerPostHandler.cs   |   2 +-
 43 files changed, 346 insertions(+), 80 deletions(-)

diff --git a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
index 3584f78..67750f5 100644
--- a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
@@ -113,7 +113,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 28f7acc..515b818 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/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
index 4dca592..426174d 100644
--- a/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs
+++ b/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Capabilities.Handlers
             m_PeopleService = peopleService;
         }
 
-        public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        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);
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
index 9f3cc19..789bf2b 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Capabilities.Handlers
             m_assetService = assService;
         }
 
-        public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        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);
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/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/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/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 841069c..f0c088a 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -766,7 +766,7 @@ namespace OpenSim
         {
             public SimStatusHandler() : base("GET", "/simstatus", "SimStatus", "Simulator Status") {}
 
-            public override byte[] Handle(string path, Stream request,
+            protected override byte[] ProcessRequest(string path, Stream request,
                                  IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
             {
                 return Util.UTF8.GetBytes("OK");
@@ -792,7 +792,7 @@ namespace OpenSim
                 m_opensim = sim;
             }
             
-            public override 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));
@@ -810,7 +810,7 @@ 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 : BaseStreamHandler
+        protected class UXSimStatusHandler : BaseStreamHandler
         {
             OpenSimBase m_opensim;
         
@@ -820,7 +820,7 @@ namespace OpenSim
                 m_opensim = sim;                
             }
             
-            public override 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));
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
index 69dd76f..a133a69 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
@@ -176,7 +176,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/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
index 08196f1..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);
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index c8b341b..bd60611 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;
@@ -58,6 +60,7 @@ namespace OpenSim.Region.CoreModules.Framework
         protected Dictionary<UUID, Caps> m_capsObjects = new Dictionary<UUID, Caps>();
         
         protected Dictionary<UUID, string> m_capsPaths = new Dictionary<UUID, string>();
+
         protected Dictionary<UUID, Dictionary<ulong, string>> m_childrenSeeds 
             = new Dictionary<UUID, Dictionary<ulong, string>>();
         
@@ -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 [<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)
@@ -262,8 +280,11 @@ namespace OpenSim.Region.CoreModules.Framework
             }
         }
 
-        private void HandleShowCapsCommand(string module, string[] cmdparams)
+        private void HandleShowCapsListCommand(string module, string[] cmdParams)
         {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
+                return;
+
             StringBuilder caps = new StringBuilder();
             caps.AppendFormat("Region {0}:\n", m_scene.RegionInfo.RegionName);
 
@@ -286,5 +307,210 @@ namespace OpenSim.Region.CoreModules.Framework
 
             MainConsole.Instance.Output(caps.ToString());
         }
+
+        private void HandleShowCapsStatsByCapCommand(string module, string[] cmdParams)
+        {
+            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);
+
+                    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;
+                    }                   
+                }
+            );
+
+            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 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>();
+
+            m_scene.ForEachScenePresence(
+                sp =>
+                {
+                    Caps caps = m_scene.CapsModule.GetCapsForUser(sp.UUID);
+
+                    if (caps == null)
+                        return;
+
+                    Dictionary<string, IRequestHandler> capsHandlers = caps.CapsHandlers.GetCapsHandlers();
+
+                    foreach (IRequestHandler reqHandler in capsHandlers.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, 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;
+
+                BuildDetailedStatsByUserReport(sb, sp);
+            }
+
+            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;
+
+            Dictionary<string, IRequestHandler> capsHandlers = caps.CapsHandlers.GetCapsHandlers();
+
+            foreach (IRequestHandler reqHandler in capsHandlers.Values.OrderByDescending(rh => rh.RequestsReceived))
+            {
+                cdt.AddRow(reqHandler.Name, reqHandler.RequestsReceived, reqHandler.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;
+                    }
+                    
+                    cdt.AddRow(sp.Name, sp.IsChildAgent ? "child" : "root", totalRequestsReceived, totalRequestsHandled);
+                }
+            );
+
+            sb.Append(cdt.ToString());
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs b/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs
index eb74cda..2366767 100644
--- a/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             m_EstateModule = fmodule;
         }
 
-        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/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
index 726becf..f208afb 100644
--- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
+++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Framework.Scenes
             osXStatsURI = Util.SHA1Hash(regionInfo.osSecret);
         }
                     
-        public override byte[] Handle(
+        protected override byte[] ProcessRequest(
             string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             return Util.UTF8.GetBytes(Report());
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
index 1ea1c20..6e0a80a 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
@@ -281,7 +281,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/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/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..89cba8a 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);
diff --git a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
index 7483395..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);
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 df875af..f37f2f1 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
@@ -68,6 +68,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
         {
             return new ExtendedAgentDestinationData();
         }
+
         protected override void UnpackData(OSDMap args, AgentDestinationData d, Hashtable request)
         {
             base.UnpackData(args, d, request);
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 9d28dc3..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);
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 fb85d1c..7bb2f39 100644
--- a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
@@ -80,7 +80,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)
         {
             byte[] result = new byte[0];
 
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/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 71a9e6f..a9fd4ed 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -251,7 +251,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");
@@ -457,7 +457,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");
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);
-- 
cgit v1.1


From b2d4b8b1da10e88d0f2471fb9cd502a8ed7dd095 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 8 Jul 2013 14:12:11 -0700
Subject: BaseHttpServer: if the handler sets the content length, don't
 override it. This happens in HEAD handlers.

---
 OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 40b8c5c..6863e0e 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -688,7 +688,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);
-- 
cgit v1.1


From 013710168b3878fc0a93a92a1c026efb49da9935 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 8 Jul 2013 22:39:07 +0100
Subject: For stat purposes, add names to capability request handlers where
 these were not set

---
 OpenSim/Capabilities/Caps.cs                                  |  1 -
 .../Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 10 ++++++++--
 .../ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs |  3 ++-
 OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs          |  6 +++---
 .../Region/OptionalModules/Materials/MaterialsDemoModule.cs   | 11 +++++++----
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/OpenSim/Capabilities/Caps.cs b/OpenSim/Capabilities/Caps.cs
index bc6f6f9..1bed1a5 100644
--- a/OpenSim/Capabilities/Caps.cs
+++ b/OpenSim/Capabilities/Caps.cs
@@ -144,7 +144,6 @@ namespace OpenSim.Framework.Capabilities
         public void RegisterHandler(string capName, IRequestHandler handler)
         {
             m_capsHandlers[capName] = handler;
-            //m_log.DebugFormat("[CAPS]: Registering handler for \"{0}\": path {1}", capName, handler.Path);
         }
 
         /// <summary>
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index a46c24a..5c6bc1c 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -207,9 +207,15 @@ 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 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(
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index e73a04a..50bfda1 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -366,7 +366,8 @@ namespace OpenSim.Region.ClientStack.Linden
             // 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));
+            caps.RegisterHandler(
+                "EventQueueGet", new RestHTTPHandler("POST", eventQueueGetPath, null, "EventQueueGet", null));
 //                                                       delegate(Hashtable m_dhttpMethod)
 //                                                       {
 //                                                           return ProcessQueue(m_dhttpMethod, agentID, caps);
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index a542d62..0cd495c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -122,9 +122,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/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 3a39971..00504d0 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -139,18 +139,21 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
         {
             string capsBase = "/CAPS/" + caps.CapsObjectPath;
 
-            IRequestHandler renderMaterialsPostHandler = new RestStreamHandler("POST", capsBase + "/", RenderMaterialsPostCap);
-            caps.RegisterHandler("RenderMaterials", renderMaterialsPostHandler);
+            IRequestHandler renderMaterialsPostHandler 
+                = new RestStreamHandler("POST", capsBase + "/", RenderMaterialsPostCap, "RenderMaterialsPost", null);
+            caps.RegisterHandler("RenderMaterialsPost", 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);
+            IRequestHandler renderMaterialsGetHandler 
+                = new RestStreamHandler("GET", capsBase + "/", RenderMaterialsGetCap, "RenderMaterialsGet", 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);
+            IRequestHandler renderMaterialsPutHandler
+                = new RestStreamHandler("PUT", capsBase + "/", RenderMaterialsPostCap, "RenderMaterialsPut", null);
             MainServer.Instance.AddStreamHandler(renderMaterialsPutHandler);
         }
         
-- 
cgit v1.1


From 8be59829d1fcf4c4f42a1a859aef6aa5f4f29073 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 8 Jul 2013 22:41:24 +0100
Subject: minor: Add back commented out logging message in
 Caps.RegisterHandler() that I accidentally removed.

---
 OpenSim/Capabilities/Caps.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenSim/Capabilities/Caps.cs b/OpenSim/Capabilities/Caps.cs
index 1bed1a5..6c95d8b 100644
--- a/OpenSim/Capabilities/Caps.cs
+++ b/OpenSim/Capabilities/Caps.cs
@@ -143,6 +143,7 @@ namespace OpenSim.Framework.Capabilities
         /// <param name="handler"></param>
         public void RegisterHandler(string capName, IRequestHandler handler)
         {
+            //m_log.DebugFormat("[CAPS]: Registering handler for \"{0}\": path {1}", capName, handler.Path);
             m_capsHandlers[capName] = handler;
         }
 
-- 
cgit v1.1


From eccec4f8f654633ee97942a2decf8a7ba3a2b153 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 8 Jul 2013 23:32:19 +0100
Subject: minor: remove now unused migration-hack bool from DAMap

---
 OpenSim/Framework/DAMap.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/OpenSim/Framework/DAMap.cs b/OpenSim/Framework/DAMap.cs
index 5c729e8..4995a92 100644
--- a/OpenSim/Framework/DAMap.cs
+++ b/OpenSim/Framework/DAMap.cs
@@ -132,10 +132,6 @@ namespace OpenSim.Framework
         {
             List<string> keysToRemove = null;
 
-            // Hard-coded special case that needs to be removed in the future.  Normally, modules themselves should
-            // handle reading data from old locations
-            bool osMaterialsMigrationRequired = false;
-
             OSDMap namespacesMap = daMap.m_map;
 
             foreach (string key in namespacesMap.Keys)
-- 
cgit v1.1


From 047ef9c2a5cb573c0a506fecd0f2a7e8dc85c023 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 8 Jul 2013 23:36:57 +0100
Subject: minor: remove some mono compiler warnings in OdePlugin

---
 OpenSim/Region/Physics/OdePlugin/ODEPrim.cs   | 1 -
 OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 0d66496..13c69d6 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;
 
-- 
cgit v1.1


From 2025dd25f6041e276e9ecde6829d0c51a565fae5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 8 Jul 2013 23:50:40 +0100
Subject: Add missing file BaseOutputStreamHandler.cs from recent commit
 e19defd

---
 .../Servers/HttpServer/BaseOutputStreamHandler.cs  | 60 ++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 OpenSim/Framework/Servers/HttpServer/BaseOutputStreamHandler.cs

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
-- 
cgit v1.1


From af9b17c54570a1634d078df0feb8f1b53ffb0726 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 8 Jul 2013 23:52:40 +0100
Subject: minor: remove mono compiler warnings related to keyframe code

---
 OpenSim/Region/Framework/Scenes/KeyframeMotion.cs  | 9 +++------
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 --
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index 8a40278..29652aa 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -55,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
         {
@@ -69,8 +68,6 @@ namespace OpenSim.Region.Framework.Scenes
             m_timer.AutoReset = true;
             m_timer.Elapsed += OnTimer;
 
-            m_scene = scene;
-
             m_timer.Start();
         }
 
@@ -94,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
             }
@@ -157,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/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index f287a34..f361acb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -354,8 +354,6 @@ namespace OpenSim.Region.Framework.Scenes
         private UUID m_collisionSound;
         private float m_collisionSoundVolume;
 
-        private KeyframeMotion m_keyframeMotion = null;
-
         public KeyframeMotion KeyframeMotion
         {
             get; set;
-- 
cgit v1.1


From 83da14008f9a8a4ad0cf0dd5487327e4a319fd5d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 8 Jul 2013 23:57:05 +0100
Subject: minor: remove some mono compiler warnings in new groups code

---
 OpenSim/Addons/Groups/GroupsModule.cs                             | 2 +-
 OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | 1 -
 OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs | 2 --
 OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs      | 4 ----
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index 5959bac..82e2d6f 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -485,7 +485,7 @@ namespace OpenSim.Groups
                     return;
 
                 //// 16 bytes are the UUID. Maybe.
-                UUID folderID = new UUID(im.binaryBucket, 0);
+//                UUID folderID = new UUID(im.binaryBucket, 0);
                 UUID noticeID = new UUID(im.imSessionID);
 
                 GroupNoticeInfo notice = m_groupData.GetGroupNotice(remoteClient.AgentId.ToString(), noticeID);
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
index cff7adf..c3c759e 100644
--- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
@@ -543,7 +543,6 @@ namespace OpenSim.Groups
                     List<string> urls = new List<string>();
                     foreach (GroupMembersData m in members)
                     {
-                        UUID userID = UUID.Zero;
                         if (!m_UserManagement.IsLocalGridUser(m.AgentID))
                         {
                             string gURL = m_UserManagement.GetUserServerURL(m.AgentID, "GroupsServerURI");
diff --git a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
index 67750f5..d2bcba5 100644
--- a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
@@ -47,7 +47,6 @@ namespace OpenSim.Groups
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private HGGroupsService m_GroupsService;
-        private string m_HomeURI = string.Empty;
         private string m_ConfigName = "Groups";
 
         // Called by Robust shell
@@ -209,7 +208,6 @@ namespace OpenSim.Groups
                 UUID groupID = new UUID(request["GroupID"].ToString());
                 string agentID = request["AgentID"].ToString();
                 string token = request["AccessToken"].ToString();
-                string reason = string.Empty;
 
                 m_GroupsService.RemoveAgentFromGroup(agentID, agentID, groupID, token);
             }
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
index 515b818..106c6c4 100644
--- a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
+++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
@@ -269,7 +269,6 @@ namespace OpenSim.Groups
                 UUID groupID = new UUID(request["GroupID"].ToString());
                 string agentID = request["AgentID"].ToString();
                 string requestingAgentID = request["RequestingAgentID"].ToString();
-                string reason = string.Empty;
 
                 m_GroupsService.RemoveAgentFromGroup(requestingAgentID, agentID, groupID);
             }
@@ -500,7 +499,6 @@ namespace OpenSim.Groups
             else
             {
                 string op = request["OP"].ToString();
-                string reason = string.Empty;
 
                 bool success = false;
                 if (op == "ADD")
@@ -568,7 +566,6 @@ namespace OpenSim.Groups
             else
             {
                 string op = request["OP"].ToString();
-                string reason = string.Empty;
 
                 if (op == "GROUP")
                 {
@@ -631,7 +628,6 @@ namespace OpenSim.Groups
             else
             {
                 string op = request["OP"].ToString();
-                string reason = string.Empty;
 
                 if (op == "ADD" && request.ContainsKey("GroupID") && request.ContainsKey("RoleID") && request.ContainsKey("AgentID"))
                 {   
-- 
cgit v1.1


From 5f58b9b5526c401e039d27b8c92603ff02421fb8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 9 Jul 2013 00:04:46 +0100
Subject: minor: remove some mono compiler warnings in UserProfileModule

---
 .../Avatar/UserProfiles/UserProfileModule.cs       | 29 ++++++++++------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 161f160..44edd7f 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -304,7 +304,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             }
 
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(targetID, out serverURI);
+//            bool foreign = GetUserProfileServerURI(targetID, out serverURI);
             UUID creatorId = UUID.Zero;
 
             OSDMap parameters= new OSDMap();
@@ -369,7 +369,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             }
             
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(target, out serverURI);
+//            bool foreign = GetUserProfileServerURI(target, out serverURI);
 
             object Ad = (object)ad;
             if(!JsonRpcRequest(ref Ad, "classifieds_info_query", serverURI, UUID.Random().ToString()))
@@ -438,10 +438,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             Vector3 pos = remoteClient.SceneAgent.AbsolutePosition;
             ILandObject land = s.LandChannel.GetLandObject(pos.X, pos.Y);
             ScenePresence p = FindPresence(remoteClient.AgentId);
-            Vector3 avaPos = p.AbsolutePosition;
             
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+//            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
             if (land == null)
             {
@@ -488,7 +487,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         public void ClassifiedDelete(UUID queryClassifiedID, IClientAPI remoteClient)
         {
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+//            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
             UUID classifiedId;
             OSDMap parameters= new OSDMap();
@@ -538,7 +537,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             }
 
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(targetId, out serverURI);
+//            bool foreign = GetUserProfileServerURI(targetId, out serverURI);
 
             OSDMap parameters= new OSDMap();
             parameters.Add("creatorId", OSD.FromUUID(targetId));
@@ -589,7 +588,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             UUID targetID;
             UUID.TryParse(args[0], out targetID);
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(targetID, out serverURI);
+//            bool foreign = GetUserProfileServerURI(targetID, out serverURI);
             IClientAPI remoteClient = (IClientAPI)sender;
 
             UserProfilePick pick = new UserProfilePick();
@@ -657,7 +656,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             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;
-            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+//            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
             ScenePresence p = FindPresence(remoteClient.AgentId);
 
             Vector3 avaPos = p.AbsolutePosition;
@@ -717,7 +716,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         public void PickDelete(IClientAPI remoteClient, UUID queryPickID)
         {
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+//            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
             OSDMap parameters= new OSDMap();
             parameters.Add("pickId", OSD.FromUUID(queryPickID));
@@ -752,7 +751,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
             IClientAPI remoteClient = (IClientAPI)sender;
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+//            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
             note.TargetId = remoteClient.AgentId;
             UUID.TryParse(args[0], out note.UserId);
 
@@ -788,7 +787,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             note.Notes = queryNotes;
 
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+//            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
             object Note = note;
             if(!JsonRpcRequest(ref Note, "avatar_notes_update", serverURI, UUID.Random().ToString()))
@@ -833,7 +832,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             prop.Language = languages;
 
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+//            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
             object Param = prop;
             if(!JsonRpcRequest(ref Param, "avatar_interests_update", serverURI, UUID.Random().ToString()))
@@ -955,7 +954,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
                 prop.FirstLifeText = newProfile.FirstLifeAboutText;
 
                 string serverURI = string.Empty;
-                bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+//                bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
                 object Prop = prop;
 
@@ -994,7 +993,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             }
 
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(properties.UserId, out serverURI);
+//            bool foreign = GetUserProfileServerURI(properties.UserId, out serverURI);
 
             // This is checking a friend on the home grid
             // Not HG friend
@@ -1247,7 +1246,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
                 return false;
             }
 
-            byte[] buf = new byte[8192];
             Stream rstream = webResponse.GetResponseStream();
             OSDMap mret = (OSDMap)OSDParser.DeserializeJson(rstream);
 
@@ -1313,7 +1311,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
                 return false;
             }
 
-            byte[] buf = new byte[8192];
             Stream rstream = webResponse.GetResponseStream();
 
             OSDMap response = new OSDMap();
-- 
cgit v1.1


From 76b2b20f7e89d521114cea60746212fade90c14c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 9 Jul 2013 00:06:22 +0100
Subject: minor: remove mono compiler warnings from HGSuitcaseInventoryService

---
 OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index 410916f..2567c8f 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);
             }
-- 
cgit v1.1


From fad4241e4ea898b0dca0176cc9b428d03ba44d1c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 8 Jul 2013 16:21:10 -0700
Subject: BulletSim: make all the different angularVerticalAttraction
 algorithms selectable from configuration paramters. Changed default algorithm
 to "1" from previous default as it seems to handle Y axis correction a little
 better. Add config file independent enablement of vehicle angular forces to
 make debugging easier (independent testing of forces).

---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 261 ++++++++++-----------
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs    |  15 +-
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs    |   4 +-
 .../Physics/BulletSPlugin/Tests/BasicVehicles.cs   |   4 +-
 4 files changed, 146 insertions(+), 138 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 82fe267..a5f2e98 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -125,33 +125,12 @@ 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, string actorName)
             : base(myScene, myPrim, actorName)
         {
             ControllingPrim = myPrim;
             Type = Vehicle.TYPE_NONE;
             m_haveRegisteredForSceneEvents = false;
-            SetupVehicleDebugging();
-        }
-
-        // 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 = true;
-            enableAngularBanking = true;
-            if (BSParam.VehicleDebuggingEnable)
-            {
-                enableAngularVerticalAttraction = true;
-                enableAngularDeflection = false;
-                enableAngularBanking = false;
-            }
         }
 
         // Return 'true' if this vehicle is doing vehicle things
@@ -556,10 +535,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             }
 
             m_linearMotor = new BSVMotor("LinearMotor", m_linearMotorTimescale, m_linearMotorDecayTimescale, 1f);
-            m_linearMotor.PhysicsScene = m_physicsScene;  // DEBUG DEBUG DEBUG (enables detail logging)
+            // m_linearMotor.PhysicsScene = m_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)
+            // m_angularMotor.PhysicsScene = m_physicsScene;  // DEBUG DEBUG DEBUG (enables detail logging)
 
             /*  Not implemented
             m_verticalAttractionMotor = new BSVMotor("VerticalAttraction", m_verticalAttractionTimescale,
@@ -1393,116 +1372,134 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         {
 
             // If vertical attaction timescale is reasonable
-            if (enableAngularVerticalAttraction && m_verticalAttractionTimescale < m_verticalAttractionCutoff)
+            if (BSParam.VehicleEnableAngularVerticalAttraction && m_verticalAttractionTimescale < m_verticalAttractionCutoff)
             {
-                //Another formula to try got from :
-                //http://answers.unity3d.com/questions/10425/how-to-stabilize-angular-motion-alignment-of-hover.html
-
-                Vector3 VehicleUpAxis = Vector3.UnitZ * VehicleOrientation;
-
-                // 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,UpAxis={1},PredictedUp={2},torqueVector={3},contrib={4}",
-                                ControllingPrim.LocalID,
-                                VehicleUpAxis,
-                                predictedUp,
-                                torqueVector,
-                                vertContributionV);
-                //=====================================================================
-                /*
-                // 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}",
-                                ControllingPrim.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,upAxis={1},PredictedUp={2},torqueVector={3},contrib={4}",
+                                            ControllingPrim.LocalID,
+                                            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 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,upAxis={1},diffAxis={2},diffAng={3},corrRot={4},contrib={5}",
+                                            ControllingPrim.LocalID,
+                                            vehicleUpAxis,
+                                            differenceAxis,
+                                            differenceAngle,
+                                            correctionRotation,
+                                            vertContributionV);
+                            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);
-                */
             }
         }
 
@@ -1514,7 +1511,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         public void ComputeAngularDeflection()
         {   
 
-            if (enableAngularDeflection && m_angularDeflectionEfficiency != 0 && VehicleForwardSpeed > 0.2)
+            if (BSParam.VehicleEnableAngularDeflection && m_angularDeflectionEfficiency != 0 && VehicleForwardSpeed > 0.2)
             {
                 Vector3 deflectContributionV = Vector3.Zero;
 
@@ -1593,7 +1590,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         //      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;
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 0f84bf7..75c3399 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -155,7 +155,10 @@ public static class BSParam
     public static Vector3 VehicleInertiaFactor { get; private set; }
     public static float VehicleGroundGravityFudge { get; private set; }
     public static float VehicleAngularBankingTimescaleFudge { get; private set; }
-    public static bool VehicleDebuggingEnable { 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; }
@@ -606,8 +609,14 @@ public static class BSParam
             0.2f ),
         new ParameterDefn<float>("VehicleAngularBankingTimescaleFudge", "Factor to multiple angular banking timescale. Tune to increase realism.",
             60.0f ),
-        new ParameterDefn<bool>("VehicleDebuggingEnable", "Turn on/off vehicle debugging",
-            false ),
+        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.",
+            1 ),
+        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,
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index e56a6f6..214271b 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.
  *
@@ -648,7 +648,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         simTime = Util.EnvironmentTickCountSubtract(beforeTime);
         if (PhysicsLogging.Enabled)
         {
-            DetailLog("{0},DoPhysicsStep,call, frame={1}, nTaints={2}, simTime={3}, substeps={4}, updates={5}, colliders={6}, objWColl={7}",
+            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);
         }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs b/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs
index 583c436..48d3742 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();
@@ -119,7 +121,7 @@ public class BasicVehicles : OpenSimTestCase
         {
             vehicleActor.ProcessFloatVehicleParam(Vehicle.VERTICAL_ATTRACTION_EFFICIENCY, efficiency);
             vehicleActor.ProcessFloatVehicleParam(Vehicle.VERTICAL_ATTRACTION_TIMESCALE, timeScale);
-            vehicleActor.enableAngularVerticalAttraction = true;
+            // vehicleActor.enableAngularVerticalAttraction = true;
 
             TestVehicle.IsPhysical = true;
             PhysicsScene.ProcessTaints();
-- 
cgit v1.1


From 33eea62606908ca39ac90eb9c99b0eee3c5f39de Mon Sep 17 00:00:00 2001
From: dahlia
Date: Mon, 8 Jul 2013 17:12:39 -0700
Subject: remove an invalid null UUID check which caused a warning

---
 OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 00504d0..b997d4d 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -416,14 +416,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                                                             if (te.DefaultTexture == null)
                                                                 m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture is null");
                                                             else
-                                                            {
-                                                                if (te.DefaultTexture.MaterialID == null)
-                                                                    m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture.MaterialID is null");
-                                                                else
-                                                                {
-                                                                    te.DefaultTexture.MaterialID = id;
-                                                                }
-                                                            }
+                                                                te.DefaultTexture.MaterialID = id;
                                                         }
                                                         else
                                                         {
-- 
cgit v1.1


From 065f8f56a248724c34d115f77a4d5b1a422f26f4 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Mon, 8 Jul 2013 19:18:01 -0700
Subject: remove some cruft and trigger a rebuild

---
 OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index b997d4d..0a0d65c 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -397,7 +397,6 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                                                 m_log.Debug("[MaterialsDemoModule]: null SOP for localId: " + matLocalID.ToString());
                                             else
                                             {
-                                                //var te = sop.Shape.Textures;
                                                 var te = new Primitive.TextureEntry(sop.Shape.TextureEntry, 0, sop.Shape.TextureEntry.Length);
 
                                                 if (te == null)
-- 
cgit v1.1


From 2c761cef192670a6f54fe10bb5b5894b5371ea7c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 9 Jul 2013 09:33:46 -0700
Subject: BulletSim: add parameter to optionally disable vehicle linear
 deflection. Add parameter to not apply vehicle linear deflection Z forces if
 vehicle is not colliding. This defaults to 'true' so vehicles will fall even
 if there is some linear deflection to apply.

---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 42 ++++++++++++++--------
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs    |  8 ++++-
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index a5f2e98..0204967 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -905,6 +905,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 return VehicleVelocity * Quaternion.Inverse(Quaternion.Normalize(VehicleOrientation));
             }
         }
+
         private float VehicleForwardSpeed
         {
             get
@@ -1040,26 +1041,37 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             Vector3 linearDeflectionV = Vector3.Zero;
             Vector3 velocityV = VehicleForwardVelocity;
 
-            // 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);
+            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);
+                // 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;
+                // 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);
+                // Subtract the sideways and rotational velocity deflection factors while adding the correction forward
+                linearDeflectionV *= new Vector3(1, -1, -1);
 
-            // Correciont is vehicle relative. Convert to world coordinates and add to the velocity
-            VehicleVelocity += linearDeflectionV * VehicleOrientation;
+                // Correction is vehicle relative. Convert to world coordinates.
+                Vector3 linearDeflectionW = linearDeflectionV * VehicleOrientation;
 
-            VDetailLog("{0},  MoveLinear,LinearDeflection,linDefEff={1},linDefTS={2},linDeflectionV={3}",
-                        ControllingPrim.LocalID, m_linearDeflectionEfficiency, m_linearDeflectionTimescale, linearDeflectionV);
+                // Optionally, if not colliding, don't effect world downward velocity. Let falling things fall.
+                if (BSParam.VehicleLinearDeflectionNotCollidingNoZ && !m_controllingPrim.IsColliding)
+                {
+                    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)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 75c3399..dcf1e83 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -155,6 +155,8 @@ public static class BSParam
     public static Vector3 VehicleInertiaFactor { get; private set; }
     public static float VehicleGroundGravityFudge { get; private set; }
     public static float VehicleAngularBankingTimescaleFudge { 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; }
@@ -609,10 +611,14 @@ public static class BSParam
             0.2f ),
         new ParameterDefn<float>("VehicleAngularBankingTimescaleFudge", "Factor to multiple angular banking timescale. Tune to increase realism.",
             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.",
-            1 ),
+            0 ),
         new ParameterDefn<bool>("VehicleEnableAngularDeflection", "Turn on/off vehicle angular deflection effect",
             true ),
         new ParameterDefn<bool>("VehicleEnableAngularBanking", "Turn on/off vehicle angular banking effect",
-- 
cgit v1.1


From 67e500383eb024fe4dd2681d0c5d902f289b65d8 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 9 Jul 2013 14:12:52 -0700
Subject: Put guards on a bunch of exception-inducing code, as seen in logs
 from load test.

---
 .../CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs  | 6 +++---
 .../Framework/InventoryAccess/HGInventoryAccessModule.cs            | 2 +-
 .../CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs   | 5 +++++
 OpenSim/Region/Framework/Scenes/Scene.cs                            | 4 +++-
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs       | 6 ++++++
 OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs         | 3 ++-
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 630d1c3..759155a 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -171,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"))
@@ -183,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)
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 1eae0ac..e0c8ea6 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -135,7 +135,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)
                         {
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/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 355e0ee..54956ee 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3687,7 +3687,9 @@ namespace OpenSim.Region.Framework.Scenes
                         "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting.  Removing existing presence.",
                         sp.Name, sp.UUID, RegionInfo.RegionName);
     
-                    sp.ControllingClient.Close(true);
+                    if (sp.ControllingClient != null)
+                        sp.ControllingClient.Close(true);
+
                     sp = null;
                 }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index dcb62f8..527ca35 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/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 7dba7c8..3f223a3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -553,7 +553,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);
-- 
cgit v1.1


From 095066b1cefa7e25ba5983ead1818727c2d64ccc Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 9 Jul 2013 23:39:29 +0100
Subject: Handle UUIDNameRequest UDP packet processing async instead of within
 the main inbound UDP processing loop, to avoid any chance that this is
 delaying the main udp in loop.

The potential impact of this should be lower now that these requests are being placed on a queue.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 9784d15..bd61c3f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5390,7 +5390,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             AddLocalPacketHandler(PacketType.TeleportLandmarkRequest, HandleTeleportLandmarkRequest);
             AddLocalPacketHandler(PacketType.TeleportCancel, HandleTeleportCancel);
             AddLocalPacketHandler(PacketType.TeleportLocationRequest, HandleTeleportLocationRequest);
-            AddLocalPacketHandler(PacketType.UUIDNameRequest, HandleUUIDNameRequest, false);
+            AddLocalPacketHandler(PacketType.UUIDNameRequest, HandleUUIDNameRequest);
             AddLocalPacketHandler(PacketType.RegionHandleRequest, HandleRegionHandleRequest);
             AddLocalPacketHandler(PacketType.ParcelInfoRequest, HandleParcelInfoRequest);
             AddLocalPacketHandler(PacketType.ParcelAccessListRequest, HandleParcelAccessListRequest, false);
-- 
cgit v1.1


From cec8e6d0f7d073d69166a7bc3594772ae51820e2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 9 Jul 2013 23:52:47 +0100
Subject: If a sensor is in an attachment, avoid throwing an exception if the
 attachee is removed from the scene before we try to retrieve them.

---
 .../Shared/Api/Implementation/Plugins/SensorRepeat.cs          | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 88ab515..6e74227 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;
+
                 q = avatar.GetWorldRotation() * q;
             }
 
@@ -480,6 +485,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;
+
                 q = avatar.GetWorldRotation() * q;
             }
 
-- 
cgit v1.1


From bb6fb65392dfa2249eeade137ea3316b3b3364c9 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 9 Jul 2013 18:24:39 -0700
Subject: Revert "minor: remove some mono compiler warnings in
 UserProfileModule"

Revert until we understand why all the calls to GetUserProfileServerURI were also
commented out.

This reverts commit 5f58b9b5526c401e039d27b8c92603ff02421fb8.
---
 .../Avatar/UserProfiles/UserProfileModule.cs       | 29 ++++++++++++----------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 44edd7f..161f160 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -304,7 +304,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             }
 
             string serverURI = string.Empty;
-//            bool foreign = GetUserProfileServerURI(targetID, out serverURI);
+            bool foreign = GetUserProfileServerURI(targetID, out serverURI);
             UUID creatorId = UUID.Zero;
 
             OSDMap parameters= new OSDMap();
@@ -369,7 +369,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             }
             
             string serverURI = string.Empty;
-//            bool foreign = GetUserProfileServerURI(target, out serverURI);
+            bool foreign = GetUserProfileServerURI(target, out serverURI);
 
             object Ad = (object)ad;
             if(!JsonRpcRequest(ref Ad, "classifieds_info_query", serverURI, UUID.Random().ToString()))
@@ -438,9 +438,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             Vector3 pos = remoteClient.SceneAgent.AbsolutePosition;
             ILandObject land = s.LandChannel.GetLandObject(pos.X, pos.Y);
             ScenePresence p = FindPresence(remoteClient.AgentId);
+            Vector3 avaPos = p.AbsolutePosition;
             
             string serverURI = string.Empty;
-//            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
             if (land == null)
             {
@@ -487,7 +488,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         public void ClassifiedDelete(UUID queryClassifiedID, IClientAPI remoteClient)
         {
             string serverURI = string.Empty;
-//            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
             UUID classifiedId;
             OSDMap parameters= new OSDMap();
@@ -537,7 +538,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             }
 
             string serverURI = string.Empty;
-//            bool foreign = GetUserProfileServerURI(targetId, out serverURI);
+            bool foreign = GetUserProfileServerURI(targetId, out serverURI);
 
             OSDMap parameters= new OSDMap();
             parameters.Add("creatorId", OSD.FromUUID(targetId));
@@ -588,7 +589,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             UUID targetID;
             UUID.TryParse(args[0], out targetID);
             string serverURI = string.Empty;
-//            bool foreign = GetUserProfileServerURI(targetID, out serverURI);
+            bool foreign = GetUserProfileServerURI(targetID, out serverURI);
             IClientAPI remoteClient = (IClientAPI)sender;
 
             UserProfilePick pick = new UserProfilePick();
@@ -656,7 +657,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             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;
-//            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
             ScenePresence p = FindPresence(remoteClient.AgentId);
 
             Vector3 avaPos = p.AbsolutePosition;
@@ -716,7 +717,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         public void PickDelete(IClientAPI remoteClient, UUID queryPickID)
         {
             string serverURI = string.Empty;
-//            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
             OSDMap parameters= new OSDMap();
             parameters.Add("pickId", OSD.FromUUID(queryPickID));
@@ -751,7 +752,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
             IClientAPI remoteClient = (IClientAPI)sender;
             string serverURI = string.Empty;
-//            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
             note.TargetId = remoteClient.AgentId;
             UUID.TryParse(args[0], out note.UserId);
 
@@ -787,7 +788,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             note.Notes = queryNotes;
 
             string serverURI = string.Empty;
-//            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
             object Note = note;
             if(!JsonRpcRequest(ref Note, "avatar_notes_update", serverURI, UUID.Random().ToString()))
@@ -832,7 +833,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             prop.Language = languages;
 
             string serverURI = string.Empty;
-//            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
             object Param = prop;
             if(!JsonRpcRequest(ref Param, "avatar_interests_update", serverURI, UUID.Random().ToString()))
@@ -954,7 +955,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
                 prop.FirstLifeText = newProfile.FirstLifeAboutText;
 
                 string serverURI = string.Empty;
-//                bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+                bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
                 object Prop = prop;
 
@@ -993,7 +994,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             }
 
             string serverURI = string.Empty;
-//            bool foreign = GetUserProfileServerURI(properties.UserId, out serverURI);
+            bool foreign = GetUserProfileServerURI(properties.UserId, out serverURI);
 
             // This is checking a friend on the home grid
             // Not HG friend
@@ -1246,6 +1247,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
                 return false;
             }
 
+            byte[] buf = new byte[8192];
             Stream rstream = webResponse.GetResponseStream();
             OSDMap mret = (OSDMap)OSDParser.DeserializeJson(rstream);
 
@@ -1311,6 +1313,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
                 return false;
             }
 
+            byte[] buf = new byte[8192];
             Stream rstream = webResponse.GetResponseStream();
 
             OSDMap response = new OSDMap();
-- 
cgit v1.1


From 38e6da5522a53c7f65eac64ae7b0af929afb1ae6 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 9 Jul 2013 18:34:24 -0700
Subject: Comment out old inbound UDP throttling hack. This would cause the UDP
 reception thread to sleep for 30ms if the number of available user worker
 threads got low. It doesn't look like any of the UDP packet types are marked
 async so this check is 1) unnecessary and 2) really crazy since it stops up
 the reception thread under heavy load without any indication.

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 82fad11..2aab4f9 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1615,6 +1615,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)
@@ -1622,6 +1623,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         //m_log.Debug("[LLUDPSERVER]: Incoming packet handler is sleeping");
                         Thread.Sleep(30);
                     }
+                     */
 
                     if (packetInbox.Dequeue(100, ref incomingPacket))
                     {
-- 
cgit v1.1


From 59d19f038a3fdac0c347844c7884e813f5c5c136 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 10 Jul 2013 08:55:54 -0700
Subject: Remove a null reference exception in SimianPresenceServiceConnector
 that occurs when GetGridUserInfo cannot find the requested user info.

---
 .../Connectors/SimianGrid/SimianPresenceServiceConnector.cs  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index 0a39088..01163aa 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -315,11 +315,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
             UUID userID = new UUID(user);
             OSDMap userResponse = GetUserData(userID);
-            if (userResponse != null)
-                return ResponseToGridUserInfo(userResponse);
 
-            m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for {0}: {1}",userID,userResponse["Message"].AsString());
-            return null;
+            if (userResponse == null)
+            {
+                m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for {0}", userID);
+            }
+
+            // Note that ResponseToGridUserInfo properly checks for and returns a null if passed a null.
+            return ResponseToGridUserInfo(userResponse);
+
         }
 
         #endregion
-- 
cgit v1.1


From 1b265b213b65076ee346d85f62d2d61a72ea3ca6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 10 Jul 2013 16:09:45 -0700
Subject: Added show client-stats [first last] command to expose what viewers
 are requesting.

---
 OpenSim/Framework/ClientInfo.cs                    |  11 ++-
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  |  18 +++-
 .../Region/ClientStack/Linden/UDP/LLUDPClient.cs   |  27 +++--
 .../Agent/UDP/Linden/LindenUDPInfoModule.cs        | 109 ++++++++++++++++++++-
 4 files changed, 145 insertions(+), 20 deletions(-)

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/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index bd61c3f..3d92705 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -678,12 +678,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);
                 }
             }
@@ -698,6 +708,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);
                 }
             }
@@ -12030,7 +12045,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;
         }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index 621e0fd..7749446 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -159,6 +159,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private int m_defaultRTO = 1000; // 1sec is the recommendation in the RFC
         private int m_maxRTO = 60000;
 
+        private ClientInfo m_info = new ClientInfo();
+
         /// <summary>
         /// Default constructor
         /// </summary>
@@ -240,20 +242,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>
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index 992f38e..b1aec81 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,101 @@ 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 <= 3)
+            {
+                m_log.InfoFormat("[INFO]: {0,-12} {1,20} {2,6} {3,11} {4, 10}", "Region", "Name", "Root", "Time", "Reqs/min");
+                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.Count + cinfo.GenericRequests.Count + cinfo.SyncRequests.Count;
+                                avg_reqs = avg_reqs / ((DateTime.Now - cinfo.StartedTime).Minutes + 1);
+
+                                m_log.InfoFormat("[INFO]: {0,-12} {1,20} {2,4} {3,9}min {4,10}", 
+                                    scene.RegionInfo.RegionName, llClient.Name,
+                                    (llClient.SceneAgent.IsChildAgent ? "N" : "Y"), (DateTime.Now - cinfo.StartedTime).Minutes, avg_reqs);
+                            }
+                        });
+                }
+                return string.Empty;
+            }
+
+            string fname = "", lname = "";
+
+            if (showParams.Length > 2)
+                fname = showParams[2];
+            if (showParams.Length > 3)
+                lname = showParams[3];
+
+            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.Count + cinfo.GenericRequests.Count + cinfo.SyncRequests.Count;
+                                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);
+
+                                m_log.InfoFormat("[INFO]: {0,25}", "TOP ASYNC");
+                                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]:");
+                                sortedDict = (from entry in cinfo.SyncRequests orderby entry.Value descending select entry)
+                                        .ToDictionary(pair => pair.Key, pair => pair.Value);
+                                m_log.InfoFormat("[INFO]: {0,25}", "TOP SYNC");
+                                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]:");
+                                sortedDict = (from entry in cinfo.GenericRequests orderby entry.Value descending select entry)
+                                        .ToDictionary(pair => pair.Key, pair => pair.Value);
+                                m_log.InfoFormat("[INFO]: {0,25}", "TOP GENERIC");
+                                foreach (KeyValuePair<string, int> kvp in sortedDict.Take(12))
+                                    m_log.InfoFormat("[INFO]: {0,25} {1,-6}", kvp.Key, kvp.Value);
+                            }
+                        }
+                    });
+            }
+            return string.Empty;
+        }         
     }
 }
\ No newline at end of file
-- 
cgit v1.1


From bdaeb02863cb56e0d543b1e97eb3356571911f90 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 10 Jul 2013 17:14:20 -0700
Subject: show client stats: Fixed the requests/min. Also changed the spelling
 of the command, not without the dash.

---
 .../Agent/UDP/Linden/LindenUDPInfoModule.cs        | 43 +++++++++++-----------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index b1aec81..79509ab 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -133,8 +133,8 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                 HandleEmergencyMonitoring);
 
             scene.AddCommand(
-                "Comms", this, "show client-stats",
-                "show client-stats [first_name last_name]",
+                "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.",
@@ -609,7 +609,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
             // 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 <= 3)
+            if (showParams.Length <= 4)
             {
                 m_log.InfoFormat("[INFO]: {0,-12} {1,20} {2,6} {3,11} {4, 10}", "Region", "Name", "Root", "Time", "Reqs/min");
                 foreach (Scene scene in m_scenes.Values)
@@ -621,7 +621,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                             {
                                 LLClientView llClient = client as LLClientView;
                                 ClientInfo cinfo = llClient.UDPClient.GetClientInfo();
-                                int avg_reqs = cinfo.AsyncRequests.Count + cinfo.GenericRequests.Count + cinfo.SyncRequests.Count;
+                                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]: {0,-12} {1,20} {2,4} {3,9}min {4,10}", 
@@ -635,10 +635,10 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
 
             string fname = "", lname = "";
 
-            if (showParams.Length > 2)
-                fname = showParams[2];
             if (showParams.Length > 3)
-                lname = showParams[3];
+                fname = showParams[3];
+            if (showParams.Length > 4)
+                lname = showParams[4];
 
             foreach (Scene scene in m_scenes.Values)
             {
@@ -660,7 +660,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                                 if (!llClient.SceneAgent.IsChildAgent)
                                     m_log.InfoFormat("[INFO]: {0} # {1} # {2}", llClient.Name, aCircuit.Viewer, aCircuit.Id0);
 
-                                int avg_reqs = cinfo.AsyncRequests.Count + cinfo.GenericRequests.Count + cinfo.SyncRequests.Count;
+                                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]:");
@@ -669,29 +669,30 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
 
                                 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());
 
-                                m_log.InfoFormat("[INFO]: {0,25}", "TOP ASYNC");
-                                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]:");
                                 sortedDict = (from entry in cinfo.SyncRequests orderby entry.Value descending select entry)
                                         .ToDictionary(pair => pair.Key, pair => pair.Value);
-                                m_log.InfoFormat("[INFO]: {0,25}", "TOP SYNC");
-                                foreach (KeyValuePair<string, int> kvp in sortedDict.Take(12))
-                                    m_log.InfoFormat("[INFO]: {0,25} {1,-6}", kvp.Key, kvp.Value);
+                                PrintRequests("TOP SYNC", sortedDict, cinfo.SyncRequests.Values.Sum());
 
-                                m_log.InfoFormat("[INFO]:");
                                 sortedDict = (from entry in cinfo.GenericRequests orderby entry.Value descending select entry)
                                         .ToDictionary(pair => pair.Key, pair => pair.Value);
-                                m_log.InfoFormat("[INFO]: {0,25}", "TOP GENERIC");
-                                foreach (KeyValuePair<string, int> kvp in sortedDict.Take(12))
-                                    m_log.InfoFormat("[INFO]: {0,25} {1,-6}", kvp.Key, kvp.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
-- 
cgit v1.1


From fe5da43d15506d029be260b2e60a69787686d062 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 10 Jul 2013 19:29:14 -0700
Subject: EXPERIMENTAL: make RequestImage (UDP packet handler) sync instead of
 async. This _shouldn't_ screw things up, given that all this does is to dump
 the request in a queue.

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 3d92705..16e7207 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5373,7 +5373,7 @@ 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.RequestImage, HandleRequestImage, false);
             AddLocalPacketHandler(PacketType.TransferRequest, HandleTransferRequest);
             AddLocalPacketHandler(PacketType.AssetUploadRequest, HandleAssetUploadRequest);
             AddLocalPacketHandler(PacketType.RequestXfer, HandleRequestXfer);
-- 
cgit v1.1


From 9173130fde7dd93d6d9ad5dea317e5f1f0e66b40 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 10 Jul 2013 20:48:13 -0700
Subject: Switched RegionHandshakeReply to Sync, because it's not doing
 anything blocking.

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 16e7207..c5b6ac6 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5312,7 +5312,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);
-- 
cgit v1.1


From 0120e858b7985b0f9571461d036a9099a25af9ad Mon Sep 17 00:00:00 2001
From: dahlia
Date: Wed, 10 Jul 2013 22:30:41 -0700
Subject: remove names from Capability handlers (added by justincc in commit
 013710168b3878fc0a93a92a1c026efb49da9935) as they seem to disable the use of
 multiple access methods for a single Capability in MaterialsDemoModule

---
 .../Region/OptionalModules/Materials/MaterialsDemoModule.cs   | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 0a0d65c..088eb0f 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -139,21 +139,18 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
         {
             string capsBase = "/CAPS/" + caps.CapsObjectPath;
 
-            IRequestHandler renderMaterialsPostHandler 
-                = new RestStreamHandler("POST", capsBase + "/", RenderMaterialsPostCap, "RenderMaterialsPost", null);
-            caps.RegisterHandler("RenderMaterialsPost", renderMaterialsPostHandler);
+            IRequestHandler renderMaterialsPostHandler = new RestStreamHandler("POST", capsBase + "/", RenderMaterialsPostCap);
+            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, "RenderMaterialsGet", null);
+            IRequestHandler renderMaterialsGetHandler = new RestStreamHandler("GET", capsBase + "/", RenderMaterialsGetCap);
             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, "RenderMaterialsPut", null);
+            IRequestHandler renderMaterialsPutHandler = new RestStreamHandler("PUT", capsBase + "/", RenderMaterialsPostCap);
             MainServer.Instance.AddStreamHandler(renderMaterialsPutHandler);
         }
         
-- 
cgit v1.1


From 3b48b6a7927796c3d830a83afe8c8ad558ddf1f8 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 11 Jul 2013 09:44:48 -0700
Subject: Switched TransferRequest (UDP packet handler) to sync. The
 permissions checks may block, so they get a FireAndForget. Everything else is
 non-blocking.

---
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  | 214 +++++++++++----------
 1 file changed, 115 insertions(+), 99 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index c5b6ac6..ef4f190 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5374,7 +5374,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             AddLocalPacketHandler(PacketType.ObjectClickAction, HandleObjectClickAction, false);
             AddLocalPacketHandler(PacketType.ObjectMaterial, HandleObjectMaterial, false);
             AddLocalPacketHandler(PacketType.RequestImage, HandleRequestImage, false);
-            AddLocalPacketHandler(PacketType.TransferRequest, HandleTransferRequest);
+            AddLocalPacketHandler(PacketType.TransferRequest, HandleTransferRequest, false);
             AddLocalPacketHandler(PacketType.AssetUploadRequest, HandleAssetUploadRequest);
             AddLocalPacketHandler(PacketType.RequestXfer, HandleRequestXfer);
             AddLocalPacketHandler(PacketType.SendXferPacket, HandleSendXferPacket);
@@ -7751,129 +7751,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;
-- 
cgit v1.1


From 604967b31e0ce4500587d0b88b81e6eecc4efdae Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 11 Jul 2013 09:47:46 -0700
Subject: Switched UUIDNameRequest and RegionHandleRequest to Sync, because now
 they are also non-blocking handlers.

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index ef4f190..79c80a7 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5405,8 +5405,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             AddLocalPacketHandler(PacketType.TeleportLandmarkRequest, HandleTeleportLandmarkRequest);
             AddLocalPacketHandler(PacketType.TeleportCancel, HandleTeleportCancel);
             AddLocalPacketHandler(PacketType.TeleportLocationRequest, HandleTeleportLocationRequest);
-            AddLocalPacketHandler(PacketType.UUIDNameRequest, HandleUUIDNameRequest);
-            AddLocalPacketHandler(PacketType.RegionHandleRequest, HandleRegionHandleRequest);
+            AddLocalPacketHandler(PacketType.UUIDNameRequest, HandleUUIDNameRequest, false);
+            AddLocalPacketHandler(PacketType.RegionHandleRequest, HandleRegionHandleRequest, false);
             AddLocalPacketHandler(PacketType.ParcelInfoRequest, HandleParcelInfoRequest);
             AddLocalPacketHandler(PacketType.ParcelAccessListRequest, HandleParcelAccessListRequest, false);
             AddLocalPacketHandler(PacketType.ParcelAccessListUpdate, HandleParcelAccessListUpdate, false);
-- 
cgit v1.1


From c4f1ec1fd643ab3748235dfb89bc1e66165558f9 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 11 Jul 2013 10:21:20 -0700
Subject: Changed the UserProfileModule so that it's less greedy in terms of
 thread usage.

---
 .../CoreModules/Avatar/UserProfiles/UserProfileModule.cs     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 161f160..c04098c 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -173,7 +173,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             if(obj.PresenceType == PresenceType.Npc)
                 return;
 
-            GetImageAssets(((IScenePresence)obj).UUID);
+            Util.FireAndForget(delegate
+            {
+                GetImageAssets(((IScenePresence)obj).UUID);
+            });
         }
 
         /// <summary>
@@ -1044,12 +1047,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             {
                 OSDString assetId = (OSDString)asset;
 
-                Scene.AssetService.Get(string.Format("{0}/{1}",assetServerURI, assetId.AsString()), this, 
-                    delegate (string assetID, Object s, AssetBase a)
-                    {
-                        // m_log.DebugFormat("[PROFILES]: Getting Image Assets {0}", assetID); 
-                        return;
-                    });
+                Scene.AssetService.Get(string.Format("{0}/{1}",assetServerURI, assetId.AsString()));
             }
             return true;
         }
-- 
cgit v1.1


From 51d106cff88334e1b9eb3628f7bdb8d6a18af4f6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 11 Jul 2013 14:21:57 -0700
Subject: Added a test for the asset service

---
 OpenSim/Tests/Clients/Assets/AssetsClient.cs | 99 ++++++++++++++++++++++++++++
 prebuild.xml                                 | 27 ++++++++
 2 files changed, 126 insertions(+)
 create mode 100644 OpenSim/Tests/Clients/Assets/AssetsClient.cs

diff --git a/OpenSim/Tests/Clients/Assets/AssetsClient.cs b/OpenSim/Tests/Clients/Assets/AssetsClient.cs
new file mode 100644
index 0000000..dd168a1
--- /dev/null
+++ b/OpenSim/Tests/Clients/Assets/AssetsClient.cs
@@ -0,0 +1,99 @@
+/*
+ * 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);
+            ThreadPool.SetMinThreads(1, 1);
+            ThreadPool.SetMaxThreads(10, 3);
+            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);
+            }
+
+            Thread.Sleep(20 * 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})", id, m_MaxThreadID, max1, max2);
+            m_NReceived++;
+        }
+    }
+}
diff --git a/prebuild.xml b/prebuild.xml
index d9e32ea..c7463e4 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2631,6 +2631,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>
-- 
cgit v1.1


From ee51a9f9c902e1587023b900438331c086680b30 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 11 Jul 2013 14:23:37 -0700
Subject: Added property to make for more flexible testing.

---
 OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 7f7f251..8b04d7f 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -55,6 +55,11 @@ namespace OpenSim.Services.Connectors
         // Maps: Asset ID -> Handlers which will be called when the asset has been loaded
         private Dictionary<string, AssetRetrievedEx> m_AssetHandlers = new Dictionary<string, AssetRetrievedEx>();
 
+        public int MaxAssetRequestConcurrency
+        {
+            get { return m_maxAssetRequestConcurrency; }
+            set { m_maxAssetRequestConcurrency = value; }
+        }
 
         public AssetServicesConnector()
         {
-- 
cgit v1.1


From 44e9849ed1190dbc29ffa97fa5df286dc9794edb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 11 Jul 2013 23:02:30 +0100
Subject: Fix regression where llHTTPRequests which did not get an OK response
 returned 499 and the exception message in the http_response event rather than
 the actual response code and body.

This was a regression since commit 831e4c3 (Thu Apr 4 00:36:15 2013)
This commit also adds a regression test for this case, though this currently only works with Mono
This aims to address http://opensimulator.org/mantis/view.php?id=6704
---
 OpenSim/Framework/Util.cs                          |   7 +-
 .../Scripting/HttpRequest/ScriptsHttpRequests.cs   |  77 ++++----
 .../HttpRequest/Tests/ScriptsHttpRequestsTests.cs  | 201 +++++++++++++++++++++
 prebuild.xml                                       |   1 +
 4 files changed, 245 insertions(+), 41 deletions(-)
 create mode 100644 OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index ba6cc75..cafe103 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -141,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
@@ -1326,7 +1331,7 @@ namespace OpenSim.Framework
                     ru = "OSX/Mono";
                 else
                 {
-                    if (Type.GetType("Mono.Runtime") != null)
+                    if (IsPlatformMono)
                         ru = "Win/Mono";
                     else
                         ru = "Win/.NET";
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 6793fc8..1a62405 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -419,7 +419,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             get { return _reqID; }
             set { _reqID = value; }
         }
-        public HttpWebRequest Request;
+        public WebRequest Request;
         public string ResponseBody;
         public List<string> ResponseMetadata;
         public Dictionary<string, string> ResponseHeaders;
@@ -431,18 +431,11 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             SendRequest();
         }
 
-        /*
-         * TODO: More work on the response codes.  Right now
-         * returning 200 for success or 499 for exception
-         */
-
         public void SendRequest()
         {
-            HttpWebResponse response = null;
-
             try
             {
-                Request = (HttpWebRequest) WebRequest.Create(Url);
+                Request = WebRequest.Create(Url);
                 Request.Method = HttpMethod;
                 Request.ContentType = HttpMIMEType;
 
@@ -480,14 +473,17 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     }
                 }
 
-                foreach (KeyValuePair<string, string> entry in ResponseHeaders)
-                    if (entry.Key.ToLower().Equals("user-agent"))
-                        Request.UserAgent = entry.Value;
-                    else
-                        Request.Headers[entry.Key] = entry.Value;
+                if (ResponseHeaders != null)
+                {
+                    foreach (KeyValuePair<string, string> entry in ResponseHeaders)
+                        if (entry.Key.ToLower().Equals("user-agent") && Request is HttpWebRequest)
+                            ((HttpWebRequest)Request).UserAgent = entry.Value;
+                        else
+                            Request.Headers[entry.Key] = entry.Value;
+                }
 
                 // Encode outbound data
-                if (OutboundBody.Length > 0)
+                if (OutboundBody != null && OutboundBody.Length > 0)
                 {
                     byte[] data = Util.UTF8.GetBytes(OutboundBody);
 
@@ -510,12 +506,19 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     {
                         throw;
                     }
-                    response = (HttpWebResponse)e.Response;
+
+                    HttpWebResponse response = (HttpWebResponse)e.Response;
+
+                    Status = (int)response.StatusCode;
+                    ResponseBody = response.StatusDescription;
                     _finished = true;
                 }
             }
             catch (Exception e)
             {
+//                m_log.Debug(
+//                    string.Format("[SCRIPTS HTTP REQUESTS]: Exception on request to {0} for {1}  ", Url, ItemID), e);
+
                 Status = (int)OSHttpStatusCode.ClientErrorJoker;
                 ResponseBody = e.Message;
                 _finished = true;
@@ -528,33 +531,27 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 
             try
             {
-                response = (HttpWebResponse)Request.EndGetResponse(ar);
-                Status = (int)response.StatusCode;
-
-                Stream resStream = response.GetResponseStream();
-                StringBuilder sb = new StringBuilder();
-                byte[] buf = new byte[8192];
-                string tempString = null;
-                int count = 0;
-
-                do
+                try
                 {
-                    // fill the buffer with data
-                    count = resStream.Read(buf, 0, buf.Length);
-
-                    // make sure we read some data
-                    if (count != 0)
+                    response = (HttpWebResponse)Request.EndGetResponse(ar);
+                }
+                catch (WebException e)
+                {
+                    if (e.Status != WebExceptionStatus.ProtocolError)
                     {
-                        // translate from bytes to ASCII text
-                        tempString = Util.UTF8.GetString(buf, 0, count);
-
-                        // continue building the string
-                        sb.Append(tempString);
+                        throw;
                     }
-                } 
-                while (count > 0); // any more data to read?
 
-                ResponseBody = sb.ToString();         
+                    response = (HttpWebResponse)e.Response;
+                }
+
+                Status = (int)response.StatusCode;
+
+                using (Stream stream = response.GetResponseStream())
+                {
+                    StreamReader reader = new StreamReader(stream, Encoding.UTF8);
+                    ResponseBody = reader.ReadToEnd();
+                } 
             }
             catch (Exception e)
             {
@@ -587,4 +584,4 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                 Request.Abort();
         }
     }
-}
+}
\ No newline at end of file
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..f638f91
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
@@ -0,0 +1,201 @@
+/*
+ * 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();
+
+            while (!hr.Finished)
+                Thread.Sleep(100);
+
+            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/prebuild.xml b/prebuild.xml
index d9e32ea..d32287a 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -3102,6 +3102,7 @@
         <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="*"/>
-- 
cgit v1.1


From e15a15688bbee6b7a76bb29f7879e0c59491449a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 11 Jul 2013 23:11:35 +0100
Subject: minor: Take out unnecessary clumsy sleep at the end of regression
 Test404Response().

This wasn't actually necessary in the end but was accidentally left in.
---
 .../Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs            | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
index f638f91..180a046 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
@@ -191,9 +191,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
             hr.Url = "test://something";
             hr.SendRequest();
 
-            while (!hr.Finished)
-                Thread.Sleep(100);
-
             Assert.That(hr.Status, Is.EqualTo((int)HttpStatusCode.NotFound));
             Assert.That(hr.ResponseBody, Is.EqualTo(rawResponse));
         }
-- 
cgit v1.1


From 7c2e4786ce9b85459b8c8973f658aa9a221925dc Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 11 Jul 2013 23:19:55 +0100
Subject: minor: remove some regression test logging switches accidentally left
 uncommented.

---
 .../CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs | 2 +-
 OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
index 180a046..e812d81 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
@@ -151,7 +151,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
         public void Test404Response()
         {
             TestHelpers.InMethod();
-            TestHelpers.EnableLogging();
+//            TestHelpers.EnableLogging();
 
             if (!Util.IsPlatformMono)
                 Assert.Ignore("Ignoring test since can only currently run on Mono");           
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
index 5714042..b6fb730 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestChildAgentSingleRegionCapabilities()
         {
             TestHelpers.InMethod();
-            TestHelpers.EnableLogging();
+//            TestHelpers.EnableLogging();
 
             UUID spUuid = TestHelpers.ParseTail(0x1);
 
-- 
cgit v1.1


From ba8f9c9d0a7d07b7587663baef9c52293a3ac404 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 11 Jul 2013 23:51:10 +0100
Subject: Try naming the materials handlers again, this time registering the
 POST as RenderMaterials

This was probably the mistake.
The other handlers are named RenderMaterials as well but this actully has no affect apart from on stats, due to a (counterintuitive) disconnect between the registration name and the name  of the request handler.
Will be tested very soon and reverted if this still does not work.
---
 OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 088eb0f..d8f5563 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -139,18 +139,21 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
         {
             string capsBase = "/CAPS/" + caps.CapsObjectPath;
 
-            IRequestHandler renderMaterialsPostHandler = new RestStreamHandler("POST", capsBase + "/", RenderMaterialsPostCap);
+            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);
+            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);
+            IRequestHandler renderMaterialsPutHandler 
+                = new RestStreamHandler("PUT", capsBase + "/", RenderMaterialsPostCap, "RenderMaterials", null);
             MainServer.Instance.AddStreamHandler(renderMaterialsPutHandler);
         }
         
-- 
cgit v1.1


From 83d1680057419229b0708bde59b12159006195cd Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 11 Jul 2013 16:43:43 -0700
Subject: Added a few more thingies to the asset client test to poke the
 threadpool.

---
 OpenSim/Tests/Clients/Assets/AssetsClient.cs | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Tests/Clients/Assets/AssetsClient.cs b/OpenSim/Tests/Clients/Assets/AssetsClient.cs
index dd168a1..26d740b 100644
--- a/OpenSim/Tests/Clients/Assets/AssetsClient.cs
+++ b/OpenSim/Tests/Clients/Assets/AssetsClient.cs
@@ -82,7 +82,16 @@ namespace OpenSim.Tests.Clients.AssetsClient
                 m_log.InfoFormat("[ASSET CLIENT]: [{0}] requested asset {1}", i, uuid);
             }
 
-            Thread.Sleep(20 * 1000);
+            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);
         }
 
@@ -92,8 +101,16 @@ namespace OpenSim.Tests.Clients.AssetsClient
                 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})", id, m_MaxThreadID, max1, 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);
+        }
     }
 }
-- 
cgit v1.1


From 1909ee70f8f3df6558ce2abfc8b1d03fc5565a63 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 11 Jul 2013 16:57:07 -0700
Subject: Centralize duplicated code in SceneObjectPart for subscribing to
 collision events. Improve logic for knowing when to add processing routine to
 physics actor.

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 97 ++++++++++------------
 1 file changed, 43 insertions(+), 54 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index f361acb..830fe31 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4213,31 +4213,12 @@ namespace OpenSim.Region.Framework.Scenes
                     AddToPhysics(UsePhysics, SetPhantom, false);
                     pa = PhysActor;
 
-
                     if (pa != null)
                     {
                         pa.SetMaterial(Material);
                         DoPhysicsPropertyUpdate(UsePhysics, true);
-    
-                        if (
-                            ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
-                            ((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
-                            ((AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
-                            ((AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
-                            ((AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
-                            ((AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
-                            ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision) != 0) ||
-                            ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
-                            ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
-                            ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
-                            ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
-                            ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
-                            (CollisionSound != UUID.Zero)
-                            )
-                        {
-                            pa.OnCollisionUpdate += PhysicsCollision;
-                            pa.SubscribeEvents(1000);
-                        }
+
+                        SubscribeForCollisionEvents();
                     }
                 }
                 else // it already has a physical representation
@@ -4291,6 +4272,46 @@ namespace OpenSim.Region.Framework.Scenes
 //            m_log.DebugFormat("[SCENE OBJECT PART]: Updated PrimFlags on {0} {1} to {2}", Name, LocalId, Flags);
         }
 
+        // Subscribe for physics collision events if needed for scripts and sounds
+        public void SubscribeForCollisionEvents()
+        {
+            if (PhysActor != null)
+            {
+                if (
+                    ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
+                    ((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
+                    ((AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
+                    ((AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
+                    ((AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
+                    ((AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
+                    ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision) != 0) ||
+                    ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
+                    ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
+                    ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
+                    ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
+                    ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
+                    (CollisionSound != UUID.Zero)
+                    )
+                {
+                    if (!PhysActor.SubscribedEvents())
+                    {
+                        // If not already subscribed for event, set up for a collision event.
+                        PhysActor.OnCollisionUpdate += PhysicsCollision;
+                        PhysActor.SubscribeEvents(1000);
+                    }
+                }
+                else
+                {
+                    // There is no need to be subscribed to collisions so, if subscribed, remove subscription
+                    if (PhysActor.SubscribedEvents())
+                    {
+                        PhysActor.OnCollisionUpdate -= PhysicsCollision;
+                        PhysActor.UnSubscribeEvents();
+                    }
+                }
+            }
+        }
+
         /// <summary>
         /// Adds this part to the physics scene.
         /// </summary>
@@ -4680,39 +4701,7 @@ namespace OpenSim.Region.Framework.Scenes
                 objectflagupdate |= (uint) PrimFlags.AllowInventoryDrop;
             }
 
-            PhysicsActor pa = PhysActor;
-
-            if (
-                ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
-                ((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
-                ((AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
-                ((AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
-                ((AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
-                ((AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
-                ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision) != 0) ||
-                ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
-                ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
-                ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
-                ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
-                ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
-                (CollisionSound != UUID.Zero)
-                )
-            {
-                // subscribe to physics updates.
-                if (pa != null)
-                {
-                    pa.OnCollisionUpdate += PhysicsCollision;
-                    pa.SubscribeEvents(1000);
-                }
-            }
-            else
-            {
-                if (pa != null)
-                {
-                    pa.UnSubscribeEvents();
-                    pa.OnCollisionUpdate -= PhysicsCollision;
-                }
-            }
+            SubscribeForCollisionEvents();
 
             //if ((GetEffectiveObjectFlags() & (uint)PrimFlags.Scripted) != 0)
             //{
-- 
cgit v1.1


From 65239b059fc8a92eee1d27655a6f85826c99306b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 11 Jul 2013 20:55:32 -0700
Subject: Enhance NullEstateData to remember stored estate values and return
 them next time asked. This keeps any estate settings from being reset when
 the estate dialog is opened in a region with null estate storage.

---
 OpenSim/Data/Null/NullEstateData.cs | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

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;            
         }
 
-- 
cgit v1.1


From 29f6ae199efd705052422b2fe9dd0e815447b0a8 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 12 Jul 2013 12:53:58 -0700
Subject: Changed UploadBakedTextureModule so that it uses the same pattern as
 the others, in preparation for experiments to direct baked texture uploads to
 a robust instance. No functional or configuration changes -- should work
 exactly as before.

---
 .../Linden/Caps/UploadBakedTextureModule.cs        | 35 +++++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index 3b0ccd7..79a935d 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -63,9 +63,16 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private Scene m_scene;
         private bool m_persistBakedTextures;
+        private string m_URL;
 
         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);
@@ -100,15 +107,27 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public void RegisterCaps(UUID agentID, Caps caps)
         {
-            caps.RegisterHandler(
-                "UploadBakedTexture",
-                new RestStreamHandler(
-                    "POST",
-                    "/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath,
-                    new UploadBakedTextureHandler(
-                        caps, m_scene.AssetService, m_persistBakedTextures).UploadBakedTexture,
+            UUID capID = UUID.Random();
+
+            //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture));
+            if (m_URL == "localhost")
+            {
+                caps.RegisterHandler(
                     "UploadBakedTexture",
-                    agentID.ToString()));
+                    new RestStreamHandler(
+                        "POST",
+                        "/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath,
+                        new UploadBakedTextureHandler(
+                            caps, m_scene.AssetService, m_persistBakedTextures).UploadBakedTexture,
+                        "UploadBakedTexture",
+                        agentID.ToString()));
+                
+            }
+            else
+            {
+                caps.RegisterHandler("UploadBakedTexture", m_URL);
+            }
+
         }
     }
 }
\ No newline at end of file
-- 
cgit v1.1


From fa02f28dbfef9b9dc3621f5bbd6b026c827459a5 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 12 Jul 2013 14:04:14 -0700
Subject: Add ToOSDMap() overrides to the Stat subclass CounterStat. Add a
 GetStatsAsOSDMap method to StatsManager which allows the filtered fetching of
 stats for eventual returning over the internets.

---
 OpenSim/Framework/Monitoring/Stats/CounterStat.cs | 21 ++++++++
 OpenSim/Framework/Monitoring/Stats/Stat.cs        |  1 +
 OpenSim/Framework/Monitoring/StatsManager.cs      | 66 +++++++++++++++++++++++
 3 files changed, 88 insertions(+)

diff --git a/OpenSim/Framework/Monitoring/Stats/CounterStat.cs b/OpenSim/Framework/Monitoring/Stats/CounterStat.cs
index caea30d..04442c3 100755
--- a/OpenSim/Framework/Monitoring/Stats/CounterStat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/CounterStat.cs
@@ -224,5 +224,26 @@ 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)
+        {
+            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/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index c57ee0c..9629b6e 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -242,6 +242,7 @@ namespace OpenSim.Framework.Monitoring
             ret.Add("Description", OSD.FromString(Description));
             ret.Add("UnitName", OSD.FromString(UnitName));
             ret.Add("Value", OSD.FromReal(Value));
+            ret.Add("StatType", "Stat");    // used by overloading classes to denote type of stat
 
             return ret;
         }
diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index 12d3a75..a5b54c9 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -30,6 +30,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
+using OpenMetaverse.StructuredData;
+
 namespace OpenSim.Framework.Monitoring
 {
     /// <summary>
@@ -168,6 +170,70 @@ namespace OpenSim.Framework.Monitoring
             }
         }
 
+        // 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)
+        {
+            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;
+
+                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 assets.
 //        /// Should only be called once.
-- 
cgit v1.1


From 3d118fb580ea0a5e9d9b23f5f876fca80cd17d0e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 12 Jul 2013 18:53:27 +0100
Subject: In co-op termination, extend EventWaitHandle to give this an
 indefinite lifetime in order to avoid a later RemotingException if scripts
 are being loaded into their own domains.

This is necessary because XEngineScriptBase now retains a reference to an EventWaitHandle when co-op termination is active.
Aims to address http://opensimulator.org/mantis/view.php?id=6634
---
 .../ScriptEngine/Shared/Instance/ScriptInstance.cs | 23 ++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 887a317..229180f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -241,7 +241,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);
             }
         }
 
@@ -1201,4 +1201,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
-- 
cgit v1.1


From d06c85ea77f76f4d915081ed6b314d66d6d38fbf Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 13 Jul 2013 00:29:07 +0100
Subject: Reinsert PhysicsActor variable back into
 SOP.SubscribeForCollisionEvents() in order to avoid a race condition.

A separate PhysicsActor variable is used in case some other thread removes the PhysicsActor whilst this code is executing.
If this is now impossible please revert - just adding this now whilst I remember.
Also makes method comment into proper method doc.
---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 830fe31..eb3af42 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4272,10 +4272,14 @@ namespace OpenSim.Region.Framework.Scenes
 //            m_log.DebugFormat("[SCENE OBJECT PART]: Updated PrimFlags on {0} {1} to {2}", Name, LocalId, Flags);
         }
 
-        // Subscribe for physics collision events if needed for scripts and sounds
+        /// <summary>
+        /// Subscribe for physics collision events if needed for scripts and sounds
+        /// </summary>
         public void SubscribeForCollisionEvents()
         {
-            if (PhysActor != null)
+            PhysicsActor pa = PhysActor;
+
+            if (pa != null)
             {
                 if (
                     ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
@@ -4293,20 +4297,20 @@ namespace OpenSim.Region.Framework.Scenes
                     (CollisionSound != UUID.Zero)
                     )
                 {
-                    if (!PhysActor.SubscribedEvents())
+                    if (!pa.SubscribedEvents())
                     {
                         // If not already subscribed for event, set up for a collision event.
-                        PhysActor.OnCollisionUpdate += PhysicsCollision;
-                        PhysActor.SubscribeEvents(1000);
+                        pa.OnCollisionUpdate += PhysicsCollision;
+                        pa.SubscribeEvents(1000);
                     }
                 }
                 else
                 {
                     // There is no need to be subscribed to collisions so, if subscribed, remove subscription
-                    if (PhysActor.SubscribedEvents())
+                    if (pa.SubscribedEvents())
                     {
-                        PhysActor.OnCollisionUpdate -= PhysicsCollision;
-                        PhysActor.UnSubscribeEvents();
+                        pa.OnCollisionUpdate -= PhysicsCollision;
+                        pa.UnSubscribeEvents();
                     }
                 }
             }
-- 
cgit v1.1


From cd64a70c793e746416a7f91e423d52dda4b05722 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 13 Jul 2013 08:31:03 -0700
Subject: Added UploadBakedTexture/UploadBakedTextureServerConnector, so that
 this can eventually be served by a robust instance. NOT FINISHED YET.

---
 .../UploadBakedTextureServerConnector.cs           | 76 ++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs

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
-- 
cgit v1.1


From a412b1d6823141129bef3ab906c6590eb6a81c72 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 13 Jul 2013 09:46:58 -0700
Subject: Moved SendInitialDataToMe to earlier in CompleteMovement. Moved
 TriggerOnMakeRootAgent to the end of CompleteMovement. Justin, if you read
 this, there's a long story here. Some time ago you placed SendInitialDataToMe
 at the very beginning of client creation (in LLUDPServer). That is
 problematic, as we discovered relatively recently: on TPs, as soon as the
 client starts getting data from child agents, it starts requesting resources
 back *from the simulator where its root agent is*. We found this to be the
 problem behind meshes missing on HG TPs (because the viewer was requesting
 the meshes of the receiving sim from the departing grid). But this affects
 much more than meshes and HG TPs. It may also explain cloud avatars after a
 local TP: baked textures are only stored in the simulator, so if a child
 agent receives a UUID of a baked texture in the destination sim and requests
 that texture from the departing sim where the root agent is, it will fail to
 get that texture. Bottom line: we need to delay sending the new simulator
 data to the viewer until we are absolutely sure that the viewer knows that
 its main agent is in a new sim. Hence, moving it to CompleteMovement. Now I
 am trying to tune the initial rez delay that we all experience in the CC. I
 think that when I fixed the issue described above, I may have moved
 SendInitialDataToMe to much later than it should be, so now I'm moving to
 earlier in CompleteMovement.

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs |  2 +-
 OpenSim/Region/Framework/Scenes/ScenePresence.cs     | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 2aab4f9..85270a6 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1469,7 +1469,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     {
                         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 meshes from
+                        // Let's delay this for TP agents, otherwise the viewer doesn't know where to get resources from
                         if (!tp)
                             client.SceneAgent.SendInitialDataToMe();
                     }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 774546c..bd4f68e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1010,7 +1010,9 @@ namespace OpenSim.Region.Framework.Scenes
             // recorded, which stops the input from being processed.
             MovementFlag = 0;
 
-            m_scene.EventManager.TriggerOnMakeRootAgent(this);
+            // DIVA NOTE: I moved TriggerOnMakeRootAgent out of here and into the end of
+            // CompleteMovement. We don't want modules doing heavy computation before CompleteMovement
+            // is over.
         }
 
         public int GetStateSource()
@@ -1327,10 +1329,15 @@ namespace OpenSim.Region.Framework.Scenes
             bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);
             MakeRootAgent(AbsolutePosition, flying);
             ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
+            // Remember in HandleUseCircuitCode, we delayed this to here
+            // This will also send the initial data to clients when TP to a neighboring region. 
+            // Not ideal, but until we know we're TP-ing from a neighboring region, there's not much we can do
+            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
@@ -1358,9 +1365,6 @@ namespace OpenSim.Region.Framework.Scenes
             // Create child agents in neighbouring regions
             if (openChildAgents && !IsChildAgent)
             {
-                // Remember in HandleUseCircuitCode, we delayed this to here
-                SendInitialDataToMe();
-
                 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
                 if (m_agentTransfer != null)
                     Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); });
@@ -1382,6 +1386,11 @@ 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);
+
+            // DIVA NOTE: moved this here from MakeRoot. We don't want modules making heavy
+            // computations before CompleteMovement is over
+            m_scene.EventManager.TriggerOnMakeRootAgent(this);
+
         }
 
         /// <summary>
-- 
cgit v1.1


From ff4ad60207431427e26a365df1ff28aa380faf12 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 13 Jul 2013 10:05:11 -0700
Subject: Same issue as previous commit.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index bd4f68e..fcb841a 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2694,15 +2694,16 @@ namespace OpenSim.Region.Framework.Scenes
                 // we created a new ScenePresence (a new child agent) in a fresh region.
                 // Request info about all the (root) agents in this region
                 // Note: This won't send data *to* other clients in that region (children don't send)
-                SendOtherAgentsAvatarDataToMe();
-                SendOtherAgentsAppearanceToMe();
-
                 EntityBase[] entities = Scene.Entities.GetEntities();
                 foreach(EntityBase e in entities)
                 {
                     if (e != null && e is SceneObjectGroup)
                         ((SceneObjectGroup)e).SendFullUpdateToClient(ControllingClient);
                 }
+
+                SendOtherAgentsAvatarDataToMe();
+                SendOtherAgentsAppearanceToMe();
+
             });
         }
 
-- 
cgit v1.1


From 3a26e366d2829c2f66a8aa22158bd0905f0894de Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 13 Jul 2013 10:35:41 -0700
Subject: This commit effectively reverses the previous one, but it's just to
 log that we found the root of the rez delay: the priority scheme
 BestAvatarResponsiveness, which is currently the default, was the culprit.
 Changing it to FrontBack made the region rez be a lot more natural.
 BestAvatarResponsiveness introduces the region rez delay in cases where the
 region is full of avatars with lots of attachments, which is the case in CC
 load tests. In that case, the inworld prims are sent only after all avatar
 attachments are sent. Not recommended for regions with heavy avatar traffic!

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index fcb841a..9f8ada3 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2694,16 +2694,16 @@ namespace OpenSim.Region.Framework.Scenes
                 // we created a new ScenePresence (a new child agent) in a fresh region.
                 // Request info about all the (root) agents in this region
                 // Note: This won't send data *to* other clients in that region (children don't send)
+                SendOtherAgentsAvatarDataToMe();
+                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);
                 }
 
-                SendOtherAgentsAvatarDataToMe();
-                SendOtherAgentsAppearanceToMe();
-
             });
         }
 
-- 
cgit v1.1


From 682537738008746f0aca22954902f3a4dfbdc95f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 13 Jul 2013 11:11:18 -0700
Subject: Trying to reduce CPU usage on logins and TPs: trying radical
 elimination of all FireAndForgets throughout CompleteMovement. There were 4.

---
 .../Avatar/UserProfiles/UserProfileModule.cs       |  5 +-
 OpenSim/Region/Framework/Scenes/ScenePresence.cs   | 60 ++++++++++------------
 2 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index c04098c..e7216ed 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -173,10 +173,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             if(obj.PresenceType == PresenceType.Npc)
                 return;
 
-            Util.FireAndForget(delegate
-            {
-                GetImageAssets(((IScenePresence)obj).UUID);
-            });
+            GetImageAssets(((IScenePresence)obj).UUID);
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 9f8ada3..4d796fe 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -958,14 +958,7 @@ namespace OpenSim.Region.Framework.Scenes
                 // Viewers which have a current outfit folder will actually rez their own attachments.  However,
                 // viewers without (e.g. v1 viewers) will not, so we still need to make this call.
                 if (Scene.AttachmentsModule != null)
-                    Util.FireAndForget(
-                        o => 
-                        { 
-//                            if (PresenceType != PresenceType.Npc && Util.FireAndForgetMethod != FireAndForgetMethod.None) 
-//                                System.Threading.Thread.Sleep(7000); 
-
-                            Scene.AttachmentsModule.RezAttachments(this); 
-                        });
+                    Scene.AttachmentsModule.RezAttachments(this); 
             }
             else
             {
@@ -1362,18 +1355,6 @@ namespace OpenSim.Region.Framework.Scenes
 
             ValidateAndSendAppearanceAndAgentData();
 
-            // Create child agents in neighbouring regions
-            if (openChildAgents && !IsChildAgent)
-            {
-                IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
-                if (m_agentTransfer != null)
-                    Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); });
-
-                IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
-                if (friendsModule != null)
-                    friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
-            }
-
             // XXX: If we force an update here, then multiple attachments do appear correctly on a destination region
             // If we do it a little bit earlier (e.g. when converting the child to a root agent) then this does not work.
             // This may be due to viewer code or it may be something we're not doing properly simulator side.
@@ -1383,6 +1364,19 @@ namespace OpenSim.Region.Framework.Scenes
                     sog.ScheduleGroupForFullUpdate();
             }
 
+            // Create child agents in neighbouring regions
+            if (openChildAgents && !IsChildAgent)
+            {
+                IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
+                if (friendsModule != null)
+                    friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
+
+                IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
+                if (m_agentTransfer != null)
+                    m_agentTransfer.EnableChildAgents(this); // this can take a while... several seconds
+
+            }
+
 //            m_log.DebugFormat(
 //                "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 
 //                client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
@@ -2689,22 +2683,20 @@ namespace OpenSim.Region.Framework.Scenes
         public void SendInitialDataToMe()
         {
             // Send all scene object to the new client
-            Util.FireAndForget(delegate
+
+            // we created a new ScenePresence (a new child agent) in a fresh region.
+            // Request info about all the (root) agents in this region
+            // Note: This won't send data *to* other clients in that region (children don't send)
+            SendOtherAgentsAvatarDataToMe();
+            SendOtherAgentsAppearanceToMe();
+
+            EntityBase[] entities = Scene.Entities.GetEntities();
+            foreach (EntityBase e in entities)
             {
-                // we created a new ScenePresence (a new child agent) in a fresh region.
-                // Request info about all the (root) agents in this region
-                // Note: This won't send data *to* other clients in that region (children don't send)
-                SendOtherAgentsAvatarDataToMe();
-                SendOtherAgentsAppearanceToMe();
-
-                EntityBase[] entities = Scene.Entities.GetEntities();
-                foreach (EntityBase e in entities)
-                {
-                    if (e != null && e is SceneObjectGroup)
-                        ((SceneObjectGroup)e).SendFullUpdateToClient(ControllingClient);
-                }
+                if (e != null && e is SceneObjectGroup)
+                    ((SceneObjectGroup)e).SendFullUpdateToClient(ControllingClient);
+            }
 
-            });
         }
 
         /// <summary>
-- 
cgit v1.1


From bc405a6a349f4d2be3f79afe7e8a88738339ef1f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 13 Jul 2013 11:30:37 -0700
Subject: That didn't fix the problem.

Revert "Trying to reduce CPU usage on logins and TPs: trying radical elimination of all FireAndForgets throughout CompleteMovement. There were 4."

This reverts commit 682537738008746f0aca22954902f3a4dfbdc95f.
---
 .../Avatar/UserProfiles/UserProfileModule.cs       |  5 +-
 OpenSim/Region/Framework/Scenes/ScenePresence.cs   | 60 ++++++++++++----------
 2 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index e7216ed..c04098c 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -173,7 +173,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             if(obj.PresenceType == PresenceType.Npc)
                 return;
 
-            GetImageAssets(((IScenePresence)obj).UUID);
+            Util.FireAndForget(delegate
+            {
+                GetImageAssets(((IScenePresence)obj).UUID);
+            });
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4d796fe..9f8ada3 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -958,7 +958,14 @@ namespace OpenSim.Region.Framework.Scenes
                 // Viewers which have a current outfit folder will actually rez their own attachments.  However,
                 // viewers without (e.g. v1 viewers) will not, so we still need to make this call.
                 if (Scene.AttachmentsModule != null)
-                    Scene.AttachmentsModule.RezAttachments(this); 
+                    Util.FireAndForget(
+                        o => 
+                        { 
+//                            if (PresenceType != PresenceType.Npc && Util.FireAndForgetMethod != FireAndForgetMethod.None) 
+//                                System.Threading.Thread.Sleep(7000); 
+
+                            Scene.AttachmentsModule.RezAttachments(this); 
+                        });
             }
             else
             {
@@ -1355,26 +1362,25 @@ namespace OpenSim.Region.Framework.Scenes
 
             ValidateAndSendAppearanceAndAgentData();
 
-            // XXX: If we force an update here, then multiple attachments do appear correctly on a destination region
-            // If we do it a little bit earlier (e.g. when converting the child to a root agent) then this does not work.
-            // This may be due to viewer code or it may be something we're not doing properly simulator side.
-            lock (m_attachments)
-            {
-                foreach (SceneObjectGroup sog in m_attachments)
-                    sog.ScheduleGroupForFullUpdate();
-            }
-
             // Create child agents in neighbouring regions
             if (openChildAgents && !IsChildAgent)
             {
+                IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
+                if (m_agentTransfer != null)
+                    Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); });
+
                 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
                 if (friendsModule != null)
                     friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
+            }
 
-                IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
-                if (m_agentTransfer != null)
-                    m_agentTransfer.EnableChildAgents(this); // this can take a while... several seconds
-
+            // XXX: If we force an update here, then multiple attachments do appear correctly on a destination region
+            // If we do it a little bit earlier (e.g. when converting the child to a root agent) then this does not work.
+            // This may be due to viewer code or it may be something we're not doing properly simulator side.
+            lock (m_attachments)
+            {
+                foreach (SceneObjectGroup sog in m_attachments)
+                    sog.ScheduleGroupForFullUpdate();
             }
 
 //            m_log.DebugFormat(
@@ -2683,20 +2689,22 @@ namespace OpenSim.Region.Framework.Scenes
         public void SendInitialDataToMe()
         {
             // Send all scene object to the new client
-
-            // we created a new ScenePresence (a new child agent) in a fresh region.
-            // Request info about all the (root) agents in this region
-            // Note: This won't send data *to* other clients in that region (children don't send)
-            SendOtherAgentsAvatarDataToMe();
-            SendOtherAgentsAppearanceToMe();
-
-            EntityBase[] entities = Scene.Entities.GetEntities();
-            foreach (EntityBase e in entities)
+            Util.FireAndForget(delegate
             {
-                if (e != null && e is SceneObjectGroup)
-                    ((SceneObjectGroup)e).SendFullUpdateToClient(ControllingClient);
-            }
+                // we created a new ScenePresence (a new child agent) in a fresh region.
+                // Request info about all the (root) agents in this region
+                // Note: This won't send data *to* other clients in that region (children don't send)
+                SendOtherAgentsAvatarDataToMe();
+                SendOtherAgentsAppearanceToMe();
+
+                EntityBase[] entities = Scene.Entities.GetEntities();
+                foreach (EntityBase e in entities)
+                {
+                    if (e != null && e is SceneObjectGroup)
+                        ((SceneObjectGroup)e).SendFullUpdateToClient(ControllingClient);
+                }
 
+            });
         }
 
         /// <summary>
-- 
cgit v1.1


From 5a1d6727e15623af4700058d516cabf03fb910ac Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 13 Jul 2013 11:39:17 -0700
Subject: Some more debug to see how many threads are available.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 9f8ada3..11b15a7 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1383,6 +1383,8 @@ namespace OpenSim.Region.Framework.Scenes
                     sog.ScheduleGroupForFullUpdate();
             }
 
+            m_log.DebugFormat("[SCENE PRESENCE]: ({0}) Available threads: {1}", Name, Util.FireAndForgetCount());
+
 //            m_log.DebugFormat(
 //                "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 
 //                client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
-- 
cgit v1.1


From 4d93870fe589ec4d184ee1e4165b7a1bbf18abc6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 13 Jul 2013 17:52:05 -0700
Subject: Gatekeeper: stop bogus agents earlier, here at the Gatekeeper. No
 need to bother the sim.

---
 OpenSim/Services/HypergridService/GatekeeperService.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 0cf1c14..0a3e70b 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -419,6 +419,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();
-- 
cgit v1.1


From 931eb892d92bcd61194655ec02def6264d8b182e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 13 Jul 2013 17:56:42 -0700
Subject: Deleted GET agent all around. Not used.

---
 .../Simulation/LocalSimulationConnector.cs         | 20 -------
 .../Simulation/RemoteSimulationConnector.cs        | 18 -------
 .../Server/Handlers/Simulation/AgentHandlers.cs    | 61 +---------------------
 .../Simulation/SimulationServiceConnector.cs       | 35 -------------
 OpenSim/Services/Interfaces/ISimulationService.cs  |  2 -
 5 files changed, 2 insertions(+), 134 deletions(-)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 9427961..2dc3d2a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -250,26 +250,6 @@ 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";
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index d120e11..4aa2d2a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -212,24 +212,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             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.RegionID))
-                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";
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 40a34c6..17a8ef4 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -90,12 +90,7 @@ namespace OpenSim.Server.Handlers.Simulation
 
             // Next, let's parse the verb
             string method = (string)request["http-method"];
-            if (method.Equals("GET"))
-            {
-                DoAgentGet(request, responsedata, agentID, regionID);
-                return responsedata;
-            }
-            else if (method.Equals("DELETE"))
+            if (method.Equals("DELETE"))
             {
                 DoAgentDelete(request, responsedata, agentID, action, regionID);
                 return responsedata;
@@ -107,7 +102,7 @@ namespace OpenSim.Server.Handlers.Simulation
             }
             else
             {
-                m_log.InfoFormat("[AGENT HANDLER]: method {0} not supported in agent message (caller is {1})", method, Util.GetCallerIP(request));
+                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";
 
@@ -156,58 +151,6 @@ 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)
-        {
-            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 DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID)
         {
             m_log.Debug(" >>> DoDelete action:" + action + "; RegionID:" + regionID);
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index f51c809..7eb8c24 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -271,41 +271,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>
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index b10a85c..c9cbd1a 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>
-- 
cgit v1.1


From b4f1b9acf65f9e782d56602e60c58be6145c5cca Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 13 Jul 2013 21:28:46 -0700
Subject: Guard against unauthorized agent deletes.

---
 .../EntityTransfer/EntityTransferModule.cs         | 14 ++++++------
 .../Simulation/LocalSimulationConnector.cs         |  4 ++--
 .../Simulation/RemoteSimulationConnector.cs        |  6 ++---
 OpenSim/Region/Framework/Scenes/Scene.cs           | 26 +++++++++++++++++-----
 .../Framework/Scenes/SceneCommunicationService.cs  |  8 +++----
 OpenSim/Region/Framework/Scenes/ScenePresence.cs   |  6 ++++-
 .../Server/Handlers/Simulation/AgentHandlers.cs    | 16 ++++++++-----
 .../Simulation/SimulationServiceConnector.cs       |  7 +++---
 OpenSim/Services/Interfaces/ISimulationService.cs  |  2 +-
 9 files changed, 57 insertions(+), 32 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 85d26f3..ef2ed4f 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -817,7 +817,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     "[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.");
+                Fail(sp, finalDestination, logout, Util.Md5Hash(currentAgentCircuit.Id0), "Connection between viewer and destination region could not be established.");
                 return;
             }
 
@@ -829,7 +829,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     "[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, Util.Md5Hash(currentAgentCircuit.Id0), finalDestination);
 
                 return;
             }
@@ -873,7 +873,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     "[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, Util.Md5Hash(currentAgentCircuit.Id0), "Destination region did not signal teleport completion.");
 
                 return;
             }
@@ -927,7 +927,7 @@ 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);
 
@@ -938,7 +938,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             // Finally, kill the agent we just created at the destination.
             // XXX: Possibly this should be done asynchronously.
-            Scene.SimulationService.CloseAgent(finalDestination, sp.UUID);
+            Scene.SimulationService.CloseAgent(finalDestination, sp.UUID, auth_token);
         }
 
         /// <summary>
@@ -948,9 +948,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++;
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 2dc3d2a..6d5039b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -286,7 +286,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return false;
         }
 
-        public bool CloseAgent(GridRegion destination, UUID id)
+        public bool CloseAgent(GridRegion destination, UUID id, string auth_token)
         {
             if (destination == null)
                 return false;
@@ -297,7 +297,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 //                        "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate",
 //                        s.RegionInfo.RegionName, destination.RegionHandle);
 
-                m_scenes[destination.RegionID].IncomingCloseAgent(id, false);
+                m_scenes[destination.RegionID].IncomingCloseAgent(id, false, auth_token);
                 return true;
             }
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index 4aa2d2a..8722b80 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -245,18 +245,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         }
 
 
-        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.RegionID))
-                return m_remoteConnector.CloseAgent(destination, id);
+                return m_remoteConnector.CloseAgent(destination, id, auth_token);
             
             return false;
         }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 54956ee..becea1f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3452,7 +3452,7 @@ namespace OpenSim.Region.Framework.Scenes
                         regions.Remove(RegionInfo.RegionHandle);
 
                         // 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, regions);
+                        m_sceneGridService.SendCloseChildAgentConnections(agentID, Util.Md5Hash(acd.Id0), regions); 
                     }
     
                     m_eventManager.TriggerClientClosed(agentID, this);
@@ -4277,6 +4277,25 @@ 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 && Util.Md5Hash(acd.Id0) == auth_token)
+                return IncomingCloseAgent(agentID, force);
+            else
+                m_log.ErrorFormat("[SCENE]: Request to close agent {0} with invalid authorization token {1}", agentID, auth_token);
+            return false;
+        }
 
         /// <summary>
         /// Tell a single agent to disconnect from the region.
@@ -4292,12 +4311,9 @@ namespace OpenSim.Region.Framework.Scenes
 
             ScenePresence presence = m_sceneGraph.GetScenePresence(agentID);
             if (presence != null)
-            {
                 presence.ControllingClient.Close(force);
-                return true;
-            }
 
-            // Agent not here
+            // Agent not here 
             return false;
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 8238e23..77889fa 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -197,7 +197,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Closes a child agent on a given region
         /// </summary>
-        protected void SendCloseChildAgent(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.
 
@@ -210,7 +210,7 @@ namespace OpenSim.Region.Framework.Scenes
             m_log.DebugFormat(
                 "[SCENE COMMUNICATION SERVICE]: Sending close agent ID {0} to {1}", agentID, destination.RegionName);
 
-            m_scene.SimulationService.CloseAgent(destination, agentID);
+            m_scene.SimulationService.CloseAgent(destination, agentID, auth_token);
         }
 
         /// <summary>
@@ -219,14 +219,14 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="agentID"></param>
         /// <param name="regionslst"></param>
-        public void SendCloseChildAgentConnections(UUID agentID, List<ulong> regionslst)
+        public void SendCloseChildAgentConnections(UUID agentID, string auth_code, List<ulong> regionslst)
         {
             foreach (ulong handle in regionslst)
             {
                 // We must take a copy here since handle is acts like a reference when used in an iterator.
                 // This leads to race conditions if directly passed to SendCloseChildAgent with more than one neighbour region.
                 ulong handleCopy = handle;
-                Util.FireAndForget((o) => { SendCloseChildAgent(agentID, handleCopy); });
+                Util.FireAndForget((o) => { SendCloseChildAgent(agentID, handleCopy, auth_code); });
             }
         }
        
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 11b15a7..5991a34 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3167,7 +3167,11 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_log.Debug("[SCENE PRESENCE]: Closing " + byebyeRegions.Count + " child agents");
 
-                m_scene.SceneGridService.SendCloseChildAgentConnections(ControllingClient.AgentId, byebyeRegions); 
+                AgentCircuitData acd = Scene.AuthenticateHandler.GetAgentCircuitData(UUID);
+                string auth = string.Empty;
+                if (acd != null)
+                    auth = Util.Md5Hash(acd.Id0);
+                m_scene.SceneGridService.SendCloseChildAgentConnections(ControllingClient.AgentId, auth, byebyeRegions); 
             }
             
             foreach (ulong handle in byebyeRegions)
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 17a8ef4..cd172e4 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;
@@ -92,7 +94,11 @@ namespace OpenSim.Server.Handlers.Simulation
             string method = (string)request["http-method"];
             if (method.Equals("DELETE"))
             {
-                DoAgentDelete(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"))
@@ -151,9 +157,9 @@ namespace OpenSim.Server.Handlers.Simulation
 //            Console.WriteLine("str_response_string [{0}]", responsedata["str_response_string"]);
         }
 
-        protected void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID)
+        protected void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID, string auth_token)
         {
-            m_log.Debug(" >>> DoDelete action:" + action + "; RegionID:" + regionID);
+            m_log.DebugFormat("[AGENT HANDLER]: >>> DELETE action: {0}; RegionID: {1}; from: {2}; auth_code: {3}", action, regionID, Util.GetCallerIP(request), auth_token);
 
             GridRegion destination = new GridRegion();
             destination.RegionID = regionID;
@@ -161,12 +167,12 @@ namespace OpenSim.Server.Handlers.Simulation
             if (action.Equals("release"))
                 ReleaseAgent(regionID, id);
             else
-                Util.FireAndForget(delegate { 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)
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 7eb8c24..aca414b 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -367,11 +367,10 @@ namespace OpenSim.Services.Connectors.Simulation
 
         /// <summary>
         /// </summary>
-        public bool CloseAgent(GridRegion destination, UUID id)
+        public bool CloseAgent(GridRegion destination, UUID id, string auth_code)
         {
-//            m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start");
-
-            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
             {
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index c9cbd1a..1c82b3e 100644
--- a/OpenSim/Services/Interfaces/ISimulationService.cs
+++ b/OpenSim/Services/Interfaces/ISimulationService.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Services.Interfaces
         /// <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
 
-- 
cgit v1.1


From a2ee887c6d4cc0756b808353ad0183b1e7e29b74 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 13 Jul 2013 22:32:52 -0700
Subject: Deleted a line too many

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index becea1f..264aaa8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4311,7 +4311,10 @@ namespace OpenSim.Region.Framework.Scenes
 
             ScenePresence presence = m_sceneGraph.GetScenePresence(agentID);
             if (presence != null)
+            {
                 presence.ControllingClient.Close(force);
+                return true;
+            }
 
             // Agent not here 
             return false;
-- 
cgit v1.1


From e4f741f0062dfe948e071a88f643f96931140f67 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 13 Jul 2013 22:52:51 -0700
Subject: This should fix the failing test.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 264aaa8..155054a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3452,7 +3452,7 @@ namespace OpenSim.Region.Framework.Scenes
                         regions.Remove(RegionInfo.RegionHandle);
 
                         // 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, Util.Md5Hash(acd.Id0), regions); 
+                        m_sceneGridService.SendCloseChildAgentConnections(agentID, acd.Id0 != null ? Util.Md5Hash(acd.Id0) : string.Empty, regions);
                     }
     
                     m_eventManager.TriggerClientClosed(agentID, this);
@@ -4308,7 +4308,6 @@ namespace OpenSim.Region.Framework.Scenes
         public bool IncomingCloseAgent(UUID agentID, bool force)
         {
             //m_log.DebugFormat("[SCENE]: Processing incoming close agent for {0}", agentID);
-
             ScenePresence presence = m_sceneGraph.GetScenePresence(agentID);
             if (presence != null)
             {
-- 
cgit v1.1


From fcb0349d565154926be87144d374c7b6d6476eab Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 13 Jul 2013 23:01:41 -0700
Subject: And this fixes the other failing tests. Justin, the thread pool is
 not being initialized in the tests!

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 5991a34..b7ce173 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1383,8 +1383,6 @@ namespace OpenSim.Region.Framework.Scenes
                     sog.ScheduleGroupForFullUpdate();
             }
 
-            m_log.DebugFormat("[SCENE PRESENCE]: ({0}) Available threads: {1}", Name, Util.FireAndForgetCount());
-
 //            m_log.DebugFormat(
 //                "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 
 //                client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
-- 
cgit v1.1


From f3b3e21dea98b4ea974ae7649a63d00b69e6dfed Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 14 Jul 2013 07:28:40 -0700
Subject: Change the auth token to be the user's sessionid.

---
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs    | 6 +++---
 OpenSim/Region/Framework/Scenes/Scene.cs                            | 4 ++--
 OpenSim/Region/Framework/Scenes/ScenePresence.cs                    | 2 +-
 OpenSim/Server/Handlers/Simulation/AgentHandlers.cs                 | 5 ++++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index ef2ed4f..344c8d7 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -817,7 +817,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     "[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, Util.Md5Hash(currentAgentCircuit.Id0), "Connection between viewer and destination region could not be established.");
+                Fail(sp, finalDestination, logout, currentAgentCircuit.SessionID.ToString(), "Connection between viewer and destination region could not be established.");
                 return;
             }
 
@@ -829,7 +829,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     "[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, Util.Md5Hash(currentAgentCircuit.Id0), finalDestination);
+                CleanupFailedInterRegionTeleport(sp, currentAgentCircuit.SessionID.ToString(), finalDestination);
 
                 return;
             }
@@ -873,7 +873,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     "[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, Util.Md5Hash(currentAgentCircuit.Id0), "Destination region did not signal teleport completion.");
+                Fail(sp, finalDestination, logout, currentAgentCircuit.SessionID.ToString(), "Destination region did not signal teleport completion.");
 
                 return;
             }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 155054a..ea7081c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3452,7 +3452,7 @@ namespace OpenSim.Region.Framework.Scenes
                         regions.Remove(RegionInfo.RegionHandle);
 
                         // 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.Id0 != null ? Util.Md5Hash(acd.Id0) : string.Empty, regions);
+                        m_sceneGridService.SendCloseChildAgentConnections(agentID, acd.SessionID.ToString(), regions);
                     }
     
                     m_eventManager.TriggerClientClosed(agentID, this);
@@ -4290,7 +4290,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             // Check that the auth_token is valid
             AgentCircuitData acd = AuthenticateHandler.GetAgentCircuitData(agentID);
-            if (acd != null && Util.Md5Hash(acd.Id0) == auth_token)
+            if (acd != null && acd.SessionID.ToString() == auth_token)
                 return IncomingCloseAgent(agentID, force);
             else
                 m_log.ErrorFormat("[SCENE]: Request to close agent {0} with invalid authorization token {1}", agentID, auth_token);
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b7ce173..c5cca22 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3168,7 +3168,7 @@ namespace OpenSim.Region.Framework.Scenes
                 AgentCircuitData acd = Scene.AuthenticateHandler.GetAgentCircuitData(UUID);
                 string auth = string.Empty;
                 if (acd != null)
-                    auth = Util.Md5Hash(acd.Id0);
+                    auth = acd.SessionID.ToString();
                 m_scene.SceneGridService.SendCloseChildAgentConnections(ControllingClient.AgentId, auth, byebyeRegions); 
             }
             
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index cd172e4..4ac477f 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -159,7 +159,10 @@ namespace OpenSim.Server.Handlers.Simulation
 
         protected void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID, string auth_token)
         {
-            m_log.DebugFormat("[AGENT HANDLER]: >>> DELETE action: {0}; RegionID: {1}; from: {2}; auth_code: {3}", action, regionID, Util.GetCallerIP(request), auth_token);
+            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_log.DebugFormat("[AGENT HANDLER]: Release {0} to RegionID: {1}", id, regionID);
 
             GridRegion destination = new GridRegion();
             destination.RegionID = regionID;
-- 
cgit v1.1


From c61ff917ef99a00d4062f264ed10c2a662585e8a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 14 Jul 2013 09:21:28 -0700
Subject: Authenticate ChildAgentUpdate too.

---
 OpenSim/Framework/ChildAgentDataUpdate.cs        |  3 +-
 OpenSim/Framework/Tests/MundaneFrameworkTests.cs |  2 +-
 OpenSim/Region/Framework/Scenes/Scene.cs         | 42 +++++++++++++++---------
 OpenSim/Region/Framework/Scenes/ScenePresence.cs |  3 +-
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index dfe60aa..9fc048b 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();
diff --git a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
index 1dc8053..3f0a031 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/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index ea7081c..b07faa2 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4202,10 +4202,18 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (childAgentUpdate != null)
             {
-                childAgentUpdate.ChildAgentDataUpdate(cAgentData);
-                return true;
+                if (cAgentData.SessionID == childAgentUpdate.ControllingClient.SessionId)
+                {
+                    childAgentUpdate.ChildAgentDataUpdate(cAgentData);
+                    return true;
+                }
+                else
+                {
+                    m_log.WarnFormat("[SCENE]: Attempt to update agent {0} with invalid session id {1}", childAgentUpdate.UUID, cAgentData.SessionID);
+                    Console.WriteLine(String.Format("[SCENE]: Attempt to update agent {0} ({1}) with invalid session id {2}", 
+                        childAgentUpdate.UUID, childAgentUpdate.ControllingClient.SessionId, cAgentData.SessionID));
+                }
             }
-
             return false;
         }
 
@@ -4221,20 +4229,24 @@ namespace OpenSim.Region.Framework.Scenes
             ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID);
             if (childAgentUpdate != null)
             {
-                // 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)
+                if (childAgentUpdate.ControllingClient.SessionId == cAgentData.SessionID)
                 {
-                    uint rRegionX = (uint)(cAgentData.RegionHandle >> 40);
-                    uint rRegionY = (((uint)(cAgentData.RegionHandle)) >> 8);
-                    uint tRegionX = RegionInfo.RegionLocX;
-                    uint tRegionY = RegionInfo.RegionLocY;
-                    //Send Data to ScenePresence
-                    childAgentUpdate.ChildAgentDataUpdate(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY);
-                    // Not Implemented:
-                    //TODO: Do we need to pass the message on to one of our neighbors?
+                    // 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)
+                    {
+                        uint rRegionX = (uint)(cAgentData.RegionHandle >> 40);
+                        uint rRegionY = (((uint)(cAgentData.RegionHandle)) >> 8);
+                        uint tRegionX = RegionInfo.RegionLocX;
+                        uint tRegionY = RegionInfo.RegionLocY;
+                        //Send Data to ScenePresence
+                        childAgentUpdate.ChildAgentDataUpdate(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY);
+                        // Not Implemented:
+                        //TODO: Do we need to pass the message on to one of our neighbors?
+                    }
                 }
-
+                else
+                    m_log.WarnFormat("[SCENE]: Attempt at updating position of agent {0} with invalid session id {1}", childAgentUpdate.UUID, cAgentData.SessionID);
                 return true;
             }
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c5cca22..990ef6e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2927,7 +2927,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); });
@@ -3266,6 +3266,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;
-- 
cgit v1.1


From 98f59ffed59d33c3737787bff85a72fde545fc94 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 14 Jul 2013 09:22:55 -0700
Subject: Fix broken tests -- the test setup was wrong... sigh.

---
 OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs | 1 +
 OpenSim/Tests/Common/Mock/TestClient.cs                             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
index 5a72239..5df9aba 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
@@ -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/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index c660501..2fc3f0b 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -584,7 +584,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;
-- 
cgit v1.1


From c8dcb8474d0b0698168863328e61a6929bb0770f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 14 Jul 2013 10:26:05 -0700
Subject: Let's go easy on authenticating ChildAgentUpdates, otherwise this
 will be chaotic while ppl are using different versions of opensim. Warning
 only, but no enforcement.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b07faa2..9cfe869 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4202,17 +4202,15 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (childAgentUpdate != null)
             {
-                if (cAgentData.SessionID == childAgentUpdate.ControllingClient.SessionId)
+                if (cAgentData.SessionID != childAgentUpdate.ControllingClient.SessionId)
                 {
-                    childAgentUpdate.ChildAgentDataUpdate(cAgentData);
-                    return true;
-                }
-                else
-                {
-                    m_log.WarnFormat("[SCENE]: Attempt to update agent {0} with invalid session id {1}", childAgentUpdate.UUID, cAgentData.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).", childAgentUpdate.UUID, cAgentData.SessionID);
                     Console.WriteLine(String.Format("[SCENE]: Attempt to update agent {0} ({1}) with invalid session id {2}", 
                         childAgentUpdate.UUID, childAgentUpdate.ControllingClient.SessionId, cAgentData.SessionID));
                 }
+
+                childAgentUpdate.ChildAgentDataUpdate(cAgentData);
+                return true;
             }
             return false;
         }
-- 
cgit v1.1


From 593952903639e51df6faf6c8649a0410c9649184 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 14 Jul 2013 14:29:10 -0700
Subject: Minor typo in log message

---
 OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
             {
-- 
cgit v1.1


From e33ac50388b5b9d6d06c58c45e2ea6f17e9b987f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 14 Jul 2013 14:31:20 -0700
Subject: HG UAS: Moved hg-session data from memory to DB storage. This makes
 it so that traveling info survives Robust resets. It should also eliminate
 the cause of empty IP addresses in agent circuit data that we saw in CC grid.
 MySQL only.

---
 OpenSim/Data/IHGTravelingData.cs                   |  58 ++++++
 OpenSim/Data/MySQL/MySQLHGTravelData.cs            |  70 +++++++
 .../Data/MySQL/Resources/HGTravelStore.migrations  |  17 ++
 .../Services/HypergridService/UserAgentService.cs  | 205 ++++++++++++---------
 .../HypergridService/UserAgentServiceBase.cs       |  84 +++++++++
 5 files changed, 344 insertions(+), 90 deletions(-)
 create mode 100644 OpenSim/Data/IHGTravelingData.cs
 create mode 100644 OpenSim/Data/MySQL/MySQLHGTravelData.cs
 create mode 100644 OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
 create mode 100644 OpenSim/Services/HypergridService/UserAgentServiceBase.cs

diff --git a/OpenSim/Data/IHGTravelingData.cs b/OpenSim/Data/IHGTravelingData.cs
new file mode 100644
index 0000000..dd89935
--- /dev/null
+++ b/OpenSim/Data/IHGTravelingData.cs
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+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);
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/MySQLHGTravelData.cs b/OpenSim/Data/MySQL/MySQLHGTravelData.cs
new file mode 100644
index 0000000..1efbfc3
--- /dev/null
+++ b/OpenSim/Data/MySQL/MySQLHGTravelData.cs
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using 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());
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
new file mode 100644
index 0000000..a0c9ebe
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
@@ -0,0 +1,17 @@
+: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 '',
+    PRIMARY KEY  (`SessionID`),
+	KEY (`UserID`)
+) ENGINE=InnoDB;
+
+COMMIT;
+
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 733993f..b597cb9 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
@@ -260,7 +262,8 @@ 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;
@@ -282,23 +285,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 (fromLogin)
-                m_TravelingAgents[agentCircuit.SessionID].ClientIPAddress = agentCircuit.IPAddress;
-            m_TravelingAgents[agentCircuit.SessionID].MyIpAddress = myExternalIP;
+            travel.MyIpAddress = myExternalIP;
+
+            StoreTravelInfo(travel);
 
             return true;
         }
@@ -309,57 +310,39 @@ namespace OpenSim.Services.HypergridService
             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 +352,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,31 +369,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))
-            {
-                bool result = m_TravelingAgents[sessionID].ClientIPAddress == reportedIP ||
-                    m_TravelingAgents[sessionID].MyIpAddress == reportedIP; // NATed
+            HGTravelingData hgt = m_Database.Get(sessionID);
+            if (hgt == null)
+                return false;
 
-                m_log.DebugFormat("[USER AGENT SERVICE]: Comparing {0} with login IP {1} and MyIP {1}; result is {3}",
-                                    reportedIP, m_TravelingAgents[sessionID].ClientIPAddress, m_TravelingAgents[sessionID].MyIpAddress, result);
+            TravelingAgentInfo travel = new TravelingAgentInfo(hgt);
 
-                return result;
-            }
+            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]
@@ -472,17 +457,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)
@@ -609,16 +594,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;
         }
@@ -689,17 +671,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");
+
+        }
+    }
+}
-- 
cgit v1.1


From b0140383da21de03cb655160a2912d04c5b470e6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 14 Jul 2013 15:47:54 -0700
Subject: Cleanup old hg sessions (older than 2 days)

---
 OpenSim/Data/IHGTravelingData.cs                               |  1 +
 OpenSim/Data/MySQL/MySQLHGTravelData.cs                        | 10 ++++++++++
 OpenSim/Data/MySQL/Resources/HGTravelStore.migrations          |  1 +
 .../Framework/EntityTransfer/HGEntityTransferModule.cs         |  7 +++++--
 OpenSim/Services/HypergridService/UserAgentService.cs          |  3 +++
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Data/IHGTravelingData.cs b/OpenSim/Data/IHGTravelingData.cs
index dd89935..452af7b 100644
--- a/OpenSim/Data/IHGTravelingData.cs
+++ b/OpenSim/Data/IHGTravelingData.cs
@@ -54,5 +54,6 @@ namespace OpenSim.Data
         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/MySQL/MySQLHGTravelData.cs b/OpenSim/Data/MySQL/MySQLHGTravelData.cs
index 1efbfc3..e81b880 100644
--- a/OpenSim/Data/MySQL/MySQLHGTravelData.cs
+++ b/OpenSim/Data/MySQL/MySQLHGTravelData.cs
@@ -66,5 +66,15 @@ namespace OpenSim.Data.MySQL
             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/Resources/HGTravelStore.migrations b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
index a0c9ebe..b4e4422 100644
--- a/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
@@ -9,6 +9,7 @@ CREATE TABLE `hg_traveling_data` (
 	`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;
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 759155a..76dbc72 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -207,6 +207,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 m_GatekeeperConnector = new GatekeeperServiceConnector(scene.AssetService);
                 m_UAS = scene.RequestModuleInterface<IUserAgentService>();
+                if (m_UAS == null)
+                    m_UAS = new UserAgentServiceConnector(m_ThisHomeURI);
+
             }
         }
 
@@ -573,12 +576,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/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index b597cb9..b414aca 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -148,6 +148,9 @@ namespace OpenSim.Services.HypergridService
                 if (!m_GridName.EndsWith("/"))
                     m_GridName = m_GridName + "/";
 
+                // Finally some cleanup
+                m_Database.DeleteOld();
+
             }
         }
 
-- 
cgit v1.1


From af02231a7b334dde1e3dcbea03c93fe11bcc6037 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 14 Jul 2013 16:03:46 -0700
Subject: Added SQLite version of hg travel data store. UNTESTED. Hope it
 works!

---
 .../Data/SQLite/Resources/HGTravelStore.migrations | 18 +++++
 OpenSim/Data/SQLite/SQLiteHGTravelData.cs          | 82 ++++++++++++++++++++++
 2 files changed, 100 insertions(+)
 create mode 100644 OpenSim/Data/SQLite/Resources/HGTravelStore.migrations
 create mode 100644 OpenSim/Data/SQLite/SQLiteHGTravelData.cs

diff --git a/OpenSim/Data/SQLite/Resources/HGTravelStore.migrations b/OpenSim/Data/SQLite/Resources/HGTravelStore.migrations
new file mode 100644
index 0000000..2e73caa
--- /dev/null
+++ b/OpenSim/Data/SQLite/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 DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY  (`SessionID`),
+	KEY (`UserID`)
+) ENGINE=InnoDB;
+
+COMMIT;
+
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
-- 
cgit v1.1


From d48946f9ef368ff72cec00c33bbfb53b6bd35696 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 14 Jul 2013 16:51:07 -0700
Subject: Document obscure Groups config related to the user level required for
 creating groups

---
 bin/OpenSim.ini.example | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 1c53935..4ddefba 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -955,6 +955,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/
-- 
cgit v1.1


From 60325f81d81f41ca6a23465468afa940aae397dd Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 15 Jul 2013 10:29:42 -0700
Subject: This might address the following observed exception:

17:14:28 - [APPLICATION]:
APPLICATION EXCEPTION DETECTED: System.UnhandledExceptionEventArgs
Exception: System.InvalidOperationException: Operation is not valid due to the current state of the object
  at System.Collections.Generic.Queue`1[OpenSim.Region.ClientStack.Linden.WebFetchInvDescModule+aPollRequest].Peek () [0x00011] in /root/install/mono-3.1.0/mono/mcs/class/System/System.Collections.Generic/Queue.cs:158
  at System.Collections.Generic.Queue`1[OpenSim.Region.ClientStack.Linden.WebFetchInvDescModule+aPollRequest].Dequeue () [0x00000] in /root/install/mono-3.1.0/mono/mcs/class/System/System.Collections.Generic/Queue.cs:140
  at OpenSim.Framework.DoubleQueue`1[OpenSim.Region.ClientStack.Linden.WebFetchInvDescModule+aPollRequest].Dequeue (TimeSpan wait, OpenSim.Region.ClientStack.Linden.aPollRequest& res) [0x0004e] in /home/avacon/opensim_2013-07-14/OpenSim/Framework/Util.cs:2297
---
 OpenSim/Framework/Util.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index cafe103..8cfc4d4 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -2293,7 +2293,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)
-- 
cgit v1.1


From ac73e702935dd4607c13aaec3095940fba7932ca Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 15 Jul 2013 11:27:49 -0700
Subject: Trying to hunt the CPU spikes recently experienced. Revert "Comment
 out old inbound UDP throttling hack. This would cause the UDP"

This reverts commit 38e6da5522a53c7f65eac64ae7b0af929afb1ae6.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 85270a6..e20a194 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1615,7 +1615,6 @@ 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)
@@ -1623,7 +1622,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         //m_log.Debug("[LLUDPSERVER]: Incoming packet handler is sleeping");
                         Thread.Sleep(30);
                     }
-                     */
 
                     if (packetInbox.Dequeue(100, ref incomingPacket))
                     {
-- 
cgit v1.1


From fbb01bd28064cde3e00ddf2a0cc4ce87ddd4cb6e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 15 Jul 2013 11:37:49 -0700
Subject: Protect against null requests

---
 .../GridServiceThrottle/GridServiceThrottleModule.cs   | 10 ++++++----
 .../Framework/UserManagement/UserManagementModule.cs   | 18 ++++++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
index f1eb1ad..fd4d48a 100644
--- a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
@@ -140,11 +140,13 @@ namespace OpenSim.Region.CoreModules.Framework
                 Watchdog.UpdateThread();
 
                 GridRegionRequest request = m_RequestQueue.Dequeue();
-                GridRegion r = m_scenes[0].GridService.GetRegionByUUID(UUID.Zero, request.regionID);
-
-                if (r != null && r.RegionHandle != 0)
-                    request.client.SendRegionHandle(request.regionID, r.RegionHandle);
+                if (request != null)
+                {
+                    GridRegion r = m_scenes[0].GridService.GetRegionByUUID(UUID.Zero, request.regionID);
 
+                    if (r != null && r.RegionHandle != 0)
+                        request.client.SendRegionHandle(request.regionID, r.RegionHandle);
+                }
             }
         }
     }
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index a528093..507329e 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -681,17 +681,19 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 Watchdog.UpdateThread();
 
                 NameRequest request = m_RequestQueue.Dequeue();
-                string[] names;
-                bool foundRealName = TryGetUserNames(request.uuid, out names);
-
-                if (names.Length == 2)
+                if (request != null)
                 {
-                    if (!foundRealName)
-                        m_log.DebugFormat("[USER MANAGEMENT MODULE]: Sending {0} {1} for {2} to {3} since no bound name found", names[0], names[1], request.uuid, request.client.Name);
+                    string[] names;
+                    bool foundRealName = TryGetUserNames(request.uuid, out names);
 
-                    request.client.SendNameReply(request.uuid, names[0], names[1]);
-                }
+                    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], request.uuid, request.client.Name);
 
+                        request.client.SendNameReply(request.uuid, names[0], names[1]);
+                    }
+                }
             }
         }
 
-- 
cgit v1.1


From 864f15ce4dfd412df8442a26429b9dd7a2bf9e12 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 15 Jul 2013 11:52:26 -0700
Subject: Revert the revert Revert "Trying to hunt the CPU spikes recently
 experienced."

This reverts commit ac73e702935dd4607c13aaec3095940fba7932ca.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index e20a194..85270a6 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1615,6 +1615,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)
@@ -1622,6 +1623,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         //m_log.Debug("[LLUDPSERVER]: Incoming packet handler is sleeping");
                         Thread.Sleep(30);
                     }
+                     */
 
                     if (packetInbox.Dequeue(100, ref incomingPacket))
                     {
-- 
cgit v1.1


From b060ce96d93a33298b59392210af4d336e0d171b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 15 Jul 2013 12:05:31 -0700
Subject: Puts RequestImage (UDP) back to asyn -- CPU spike hunt

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 79c80a7..f57e069 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5373,7 +5373,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             AddLocalPacketHandler(PacketType.ScriptAnswerYes, HandleScriptAnswerYes, false);
             AddLocalPacketHandler(PacketType.ObjectClickAction, HandleObjectClickAction, false);
             AddLocalPacketHandler(PacketType.ObjectMaterial, HandleObjectMaterial, false);
-            AddLocalPacketHandler(PacketType.RequestImage, HandleRequestImage, false);
+            AddLocalPacketHandler(PacketType.RequestImage, HandleRequestImage);
             AddLocalPacketHandler(PacketType.TransferRequest, HandleTransferRequest, false);
             AddLocalPacketHandler(PacketType.AssetUploadRequest, HandleAssetUploadRequest);
             AddLocalPacketHandler(PacketType.RequestXfer, HandleRequestXfer);
-- 
cgit v1.1


From 687c1a420a6f3c254eb7104fee40a79fc6a39e1d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 15 Jul 2013 12:33:31 -0700
Subject: Guard against null ref

---
 OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index b90df17..5b0859b 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -351,7 +351,8 @@ namespace OpenSim.Region.ClientStack.Linden
 
                 aPollRequest poolreq = m_queue.Dequeue();
 
-                poolreq.thepoll.Process(poolreq);
+                if (poolreq != null && poolreq.thepoll != null)
+                    poolreq.thepoll.Process(poolreq);
             }
         }
     }
-- 
cgit v1.1


From 68fbf7eebb12bcd22c3e3308a838c5c2e9b1c47f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 15 Jul 2013 12:34:10 -0700
Subject: Revert "Puts RequestImage (UDP) back to asyn -- CPU spike hunt"

This reverts commit b060ce96d93a33298b59392210af4d336e0d171b.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index f57e069..79c80a7 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5373,7 +5373,7 @@ 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.RequestImage, HandleRequestImage, false);
             AddLocalPacketHandler(PacketType.TransferRequest, HandleTransferRequest, false);
             AddLocalPacketHandler(PacketType.AssetUploadRequest, HandleAssetUploadRequest);
             AddLocalPacketHandler(PacketType.RequestXfer, HandleRequestXfer);
-- 
cgit v1.1


From 1b7b664c8696531fec26378d1386362d8a3da55e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 15 Jul 2013 23:22:39 +0100
Subject: Add request received/handling stats for caps which are served by http
 poll handlers.

This adds explicit cap poll handler supporting to the Caps classes rather than relying on callers to do the complicated coding.
Other refactoring was required to get logic into the right places to support this.
---
 OpenSim/Capabilities/Caps.cs                       | 93 ++++++++++++++++++++--
 OpenSim/Framework/Console/RemoteConsole.cs         |  2 +-
 .../Framework/Servers/HttpServer/BaseHttpServer.cs |  2 +
 .../Servers/HttpServer/PollServiceEventArgs.cs     | 14 ++++
 .../Servers/HttpServer/PollServiceHttpRequest.cs   | 45 +++++++++++
 .../HttpServer/PollServiceRequestManager.cs        | 58 ++------------
 .../Linden/Caps/BunchOfCaps/BunchOfCaps.cs         | 13 +--
 .../Linden/Caps/EventQueue/EventQueueGetModule.cs  |  2 +-
 .../Linden/Caps/WebFetchInvDescModule.cs           | 66 ++++++++-------
 .../Framework/Caps/CapabilitiesModule.cs           | 92 ++++++++++++++++-----
 .../CoreModules/Scripting/LSLHttp/UrlModule.cs     |  6 +-
 11 files changed, 267 insertions(+), 126 deletions(-)

diff --git a/OpenSim/Capabilities/Caps.cs b/OpenSim/Capabilities/Caps.cs
index 6c95d8b..bbf3b27 100644
--- a/OpenSim/Capabilities/Caps.cs
+++ b/OpenSim/Capabilities/Caps.cs
@@ -63,7 +63,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;
@@ -132,7 +136,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;
         }
 
@@ -147,6 +150,27 @@ namespace OpenSim.Framework.Capabilities
             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>
         /// Register an external handler. The service for this capability is somewhere else
         /// given by the URL.
@@ -163,13 +187,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;
         }
     }
-}
+}
\ No newline at end of file
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/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 6863e0e..c4e569d 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -387,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)
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index 3079a7e..020bfd5 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -55,12 +55,26 @@ namespace OpenSim.Framework.Servers.HttpServer
             Inventory = 2
         }
 
+        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;
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 aee3e3c..1b9010a 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -157,8 +157,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             {
                 foreach (PollServiceHttpRequest req in m_retryRequests)
                 {
-                   DoHTTPGruntWork(m_server,req,
-                        req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
+                   req.DoHTTPGruntWork(m_server, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
                 }
             }
             catch
@@ -179,8 +178,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                 try
                 {
                     wreq = m_requests.Dequeue(0);
-                    DoHTTPGruntWork(m_server,wreq,
-                        wreq.PollServiceArgs.NoEvents(wreq.RequestID, wreq.PollServiceArgs.Id));
+                    wreq.DoHTTPGruntWork(
+                        m_server, wreq.PollServiceArgs.NoEvents(wreq.RequestID, wreq.PollServiceArgs.Id));
                 }
                 catch
                 {
@@ -214,7 +213,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                             {
                                 try
                                 {
-                                    DoHTTPGruntWork(m_server, req, responsedata);
+                                    req.DoHTTPGruntWork(m_server, responsedata);
                                 }
                                 catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream
                                 {
@@ -227,7 +226,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                                 {
                                     try
                                     {
-                                        DoHTTPGruntWork(m_server, req, responsedata);
+                                        req.DoHTTPGruntWork(m_server, responsedata);
                                     }
                                     catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream
                                     {
@@ -242,8 +241,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                         {
                             if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
                             {
-                                DoHTTPGruntWork(m_server, req, 
-                                    req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
+                                req.DoHTTPGruntWork(
+                                    m_server, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
                             }
                             else
                             {
@@ -258,46 +257,5 @@ namespace OpenSim.Framework.Servers.HttpServer
                 }
             }
         }
-
-        // DoHTTPGruntWork  changed, not sending response
-        // do the same work around as core
-
-        internal static void DoHTTPGruntWork(BaseHttpServer server, PollServiceHttpRequest req, Hashtable responsedata)
-        {
-            OSHttpResponse response
-                = new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext);
-
-            byte[] buffer = server.DoHTTPGruntWork(responsedata, response);
-
-            response.SendChunked = false;
-            response.ContentLength64 = buffer.Length;
-            response.ContentEncoding = Encoding.UTF8;
-
-            try
-            {
-                response.OutputStream.Write(buffer, 0, buffer.Length);
-            }
-            catch (Exception ex)
-            {
-                m_log.Warn(string.Format("[POLL SERVICE WORKER THREAD]: Error ", ex));
-            }
-            finally
-            {
-                //response.OutputStream.Close();
-                try
-                {
-                    response.OutputStream.Flush();
-                    response.Send();
-
-                    //if (!response.KeepAlive && response.ReuseContext)
-                    //    response.FreeContext();
-                }
-                catch (Exception e)
-                {
-                    m_log.Warn(String.Format("[POLL SERVICE WORKER THREAD]: Error ", e));
-                }
-            }
-        }
     }
-}
-
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 5c6bc1c..1d4c7f0 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -285,18 +285,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 50bfda1..ca38a97 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -377,7 +377,7 @@ namespace OpenSim.Region.ClientStack.Linden
             // TODO: Add EventQueueGet name/description for diagnostics
             MainServer.Instance.AddPollServiceHTTPHandler(
                 eventQueueGetPath,
-                new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID, 40000));
+                new PollServiceEventArgs(null, eventQueueGetPath, HasEvents, GetEvents, NoEvents, agentID, 40000));
 
 //            m_log.DebugFormat(
 //                "[EVENT QUEUE GET MODULE]: Registered EQG handler {0} for {1} in {2}",
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index b90df17..86a0298 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -77,7 +77,6 @@ namespace OpenSim.Region.ClientStack.Linden
 
         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 =
@@ -114,7 +113,6 @@ namespace OpenSim.Region.ClientStack.Linden
                 return;
 
             m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
-            m_scene.EventManager.OnDeregisterCaps -= DeregisterCaps;
 
             foreach (Thread t in m_workerThreads)
                 Watchdog.AbortThread(t.ManagedThreadId); 
@@ -134,7 +132,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)
             {
@@ -177,8 +174,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;
 
@@ -308,40 +305,39 @@ namespace OpenSim.Region.ClientStack.Linden
             if (m_fetchInventoryDescendents2Url == "")
                 return;
 
-            string capUrl = "/CAPS/" + UUID.Random() + "/";
-
             // 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()
         {
@@ -355,4 +351,4 @@ namespace OpenSim.Region.ClientStack.Linden
             }
         }
     }
-}
+}
\ 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 bd60611..ad1c4ce 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Region.CoreModules.Framework
 
             MainConsole.Instance.Commands.AddCommand(
                 "Comms", false, "show caps stats by user",
-                "show caps stats [<first-name> <last-name>]",
+                "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);
@@ -285,27 +285,31 @@ namespace OpenSim.Region.CoreModules.Framework
             if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
                 return;
 
-            StringBuilder caps = new StringBuilder();
-            caps.AppendFormat("Region {0}:\n", m_scene.RegionInfo.RegionName);
+            StringBuilder capsReport = new StringBuilder();
+            capsReport.AppendFormat("Region {0}:\n", m_scene.RegionInfo.RegionName);
 
             lock (m_capsObjects)
             {
                 foreach (KeyValuePair<UUID, Caps> kvp in m_capsObjects)
                 {
-                    caps.AppendFormat("** User {0}:\n", kvp.Key);
+                    capsReport.AppendFormat("** User {0}:\n", kvp.Key);
+                    Caps caps = kvp.Value;
 
-                    for (IDictionaryEnumerator kvp2 = kvp.Value.CapsHandlers.GetCapsDetails(false, null).GetEnumerator(); kvp2.MoveNext(); )
+                    for (IDictionaryEnumerator kvp2 = caps.CapsHandlers.GetCapsDetails(false, null).GetEnumerator(); kvp2.MoveNext(); )
                     {
                         Uri uri = new Uri(kvp2.Value.ToString());
-                        caps.AppendFormat(m_showCapsCommandFormat, kvp2.Key, uri.PathAndQuery);
+                        capsReport.AppendFormat(m_showCapsCommandFormat, kvp2.Key, uri.PathAndQuery);
                     }
 
-                    foreach (KeyValuePair<string, string> kvp3 in kvp.Value.ExternalCapsHandlers)
-                        caps.AppendFormat(m_showCapsCommandFormat, kvp3.Key, kvp3.Value);
+                    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(caps.ToString());
+            MainConsole.Instance.Output(capsReport.ToString());
         }
 
         private void HandleShowCapsStatsByCapCommand(string module, string[] cmdParams)
@@ -362,7 +366,16 @@ namespace OpenSim.Region.CoreModules.Framework
                     {
                         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;
+                        }
+                    }
                 }
             );
 
@@ -391,11 +404,9 @@ namespace OpenSim.Region.CoreModules.Framework
                     Caps caps = m_scene.CapsModule.GetCapsForUser(sp.UUID);
 
                     if (caps == null)
-                        return;
-
-                    Dictionary<string, IRequestHandler> capsHandlers = caps.CapsHandlers.GetCapsHandlers();
+                        return;            
 
-                    foreach (IRequestHandler reqHandler in capsHandlers.Values)
+                    foreach (IRequestHandler reqHandler in caps.CapsHandlers.GetCapsHandlers().Values)
                     {
                         string reqName = reqHandler.Name ?? "";
 
@@ -410,6 +421,23 @@ namespace OpenSim.Region.CoreModules.Framework
                             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;
+                        }
+                    }
                 }
             );
                     
@@ -468,12 +496,16 @@ namespace OpenSim.Region.CoreModules.Framework
             if (caps == null)
                 return;
 
-            Dictionary<string, IRequestHandler> capsHandlers = caps.CapsHandlers.GetCapsHandlers();
+            List<CapTableRow> capRows = new List<CapTableRow>();
 
-            foreach (IRequestHandler reqHandler in capsHandlers.Values.OrderByDescending(rh => rh.RequestsReceived))
-            {
-                cdt.AddRow(reqHandler.Name, reqHandler.RequestsReceived, reqHandler.RequestsHandled);
-            }
+            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());
         }
@@ -505,6 +537,14 @@ namespace OpenSim.Region.CoreModules.Framework
                         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);
                 }
@@ -512,5 +552,19 @@ namespace OpenSim.Region.CoreModules.Framework
 
             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;
+            }
+        }
     }
 }
\ 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 def8162..99a3122 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -235,7 +235,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);
 
@@ -280,7 +281,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);
 
-- 
cgit v1.1


From e8e073aa97a8f756f42b242dd1cfcd05beb4d8ef Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 16 Jul 2013 00:05:45 +0100
Subject: Simplify EventQueue cap setup so that it is also stat monitored.

Curiously, the number of requests received is always one greater than that shown as handled - needs investigation
---
 .../Linden/Caps/EventQueue/EventQueueGetModule.cs  | 74 +++++++++-------------
 1 file changed, 29 insertions(+), 45 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index ca38a97..1835a72 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -252,29 +252,32 @@ namespace OpenSim.Region.ClientStack.Linden
 
             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);
-                    }
-                }
+                m_AvatarQueueUUIDMapping.Remove(agentID);
 
-                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);
-                }
-            }
+//            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);
+//                }
+//            }
 
             UUID searchval = UUID.Zero;
 
@@ -359,29 +362,10 @@ 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, "EventQueueGet", 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, eventQueueGetPath, 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, 40000));
 
             Random rnd = new Random(Environment.TickCount);
             lock (m_ids)
-- 
cgit v1.1


From 42e2a0d66eaa7e322bce817e9e2cc9a288de167b Mon Sep 17 00:00:00 2001
From: dahlia
Date: Tue, 16 Jul 2013 01:12:56 -0700
Subject: MSDN documentation is unclear about whether exiting a lock() block
 will trigger a Monitor.Wait() to exit, so avoid some locks that don't
 actually affect the state of the internal queues in the BlockingQueue class.

---
 OpenSim/Framework/BlockingQueue.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index 3658161..cc016b0 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);
                 }
@@ -91,6 +91,9 @@ namespace OpenSim.Framework
 
         public bool Contains(T item)
         {
+            if (m_queue.Count < 1 && m_pqueue.Count < 1)
+                return false;
+
             lock (m_queueSync)
             {
                 if (m_pqueue.Contains(item))
@@ -101,14 +104,14 @@ namespace OpenSim.Framework
 
         public int Count()
         {
-            lock (m_queueSync)
-            {
-                return m_queue.Count+m_pqueue.Count;
-            }
+            return m_queue.Count+m_pqueue.Count;
         }
 
         public T[] GetQueueArray()
         {
+            if (m_queue.Count < 1 && m_pqueue.Count < 1)
+                return new T[0];
+
             lock (m_queueSync)
             {
                 return m_queue.ToArray();
-- 
cgit v1.1


From 70aa77f520060a27df1fb7fbdf39685ff866dcf8 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Tue, 16 Jul 2013 01:31:09 -0700
Subject: add locking to internal queue in WebFetchInvDescModule; lack of which
 caused a random crash in a load test yesterday

---
 .../ClientStack/Linden/Caps/WebFetchInvDescModule.cs      | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 164adeb..4ff617f 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -254,10 +254,13 @@ namespace OpenSim.Region.ClientStack.Linden
                         }
                     }
 
-                    if (highPriority)
-                        m_queue.EnqueueHigh(reqinfo);
-                    else
-                        m_queue.EnqueueLow(reqinfo);
+                    lock (m_queue)
+                    {
+                        if (highPriority)
+                            m_queue.EnqueueHigh(reqinfo);
+                        else
+                            m_queue.EnqueueLow(reqinfo);
+                    }
                 };
 
                 NoEvents = (x, y) =>
@@ -345,7 +348,9 @@ namespace OpenSim.Region.ClientStack.Linden
             {
                 Watchdog.UpdateThread();
 
-                aPollRequest poolreq = m_queue.Dequeue();
+                aPollRequest poolreq = null;
+                lock (m_queue)
+                    poolreq = m_queue.Dequeue();
 
                 if (poolreq != null && poolreq.thepoll != null)
                     poolreq.thepoll.Process(poolreq);
-- 
cgit v1.1


From 6dd454240fb962a408c979060701531f0f458e8e Mon Sep 17 00:00:00 2001
From: dahlia
Date: Tue, 16 Jul 2013 02:03:01 -0700
Subject: revert last commit which seems to conflict with DoubleQueue
 internals. The random crash might be in DoubleQueue instead. See
 http://pastebin.com/XhNBNqsc

---
 .../ClientStack/Linden/Caps/WebFetchInvDescModule.cs      | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 4ff617f..164adeb 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -254,13 +254,10 @@ namespace OpenSim.Region.ClientStack.Linden
                         }
                     }
 
-                    lock (m_queue)
-                    {
-                        if (highPriority)
-                            m_queue.EnqueueHigh(reqinfo);
-                        else
-                            m_queue.EnqueueLow(reqinfo);
-                    }
+                    if (highPriority)
+                        m_queue.EnqueueHigh(reqinfo);
+                    else
+                        m_queue.EnqueueLow(reqinfo);
                 };
 
                 NoEvents = (x, y) =>
@@ -348,9 +345,7 @@ namespace OpenSim.Region.ClientStack.Linden
             {
                 Watchdog.UpdateThread();
 
-                aPollRequest poolreq = null;
-                lock (m_queue)
-                    poolreq = m_queue.Dequeue();
+                aPollRequest poolreq = m_queue.Dequeue();
 
                 if (poolreq != null && poolreq.thepoll != null)
                     poolreq.thepoll.Process(poolreq);
-- 
cgit v1.1


From 5a01ffa5150edf4c4f8b4675d8c8c2b2c6ec0684 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 16 Jul 2013 07:15:14 -0700
Subject: High CPU hunt: try a different blocking queue, DoubleQueue

---
 .../Framework/GridServiceThrottle/GridServiceThrottleModule.cs         | 3 ++-
 .../CoreModules/Framework/UserManagement/UserManagementModule.cs       | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
index fd4d48a..a069317 100644
--- a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
@@ -49,7 +49,8 @@ namespace OpenSim.Region.CoreModules.Framework
 
         private readonly List<Scene> m_scenes = new List<Scene>();
 
-        private OpenSim.Framework.BlockingQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<GridRegionRequest>();
+        //private OpenSim.Framework.BlockingQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<GridRegionRequest>();
+        private OpenSim.Framework.DoubleQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.DoubleQueue<GridRegionRequest>();
 
         public void Initialise(IConfigSource config)
         {
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 507329e..ffb8bda 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -60,6 +60,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
         protected Dictionary<UUID, UserData> m_UserCache = new Dictionary<UUID, UserData>();
 
         // Throttle the name requests
+        //private OpenSim.Framework.BlockingQueue<NameRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<NameRequest>();
         private OpenSim.Framework.BlockingQueue<NameRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<NameRequest>();
 
 
-- 
cgit v1.1


From 6da50d34dfb321e71b5242ab8d82a9801da5d05b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 16 Jul 2013 07:19:13 -0700
Subject: Actually use DoubleQueue in UserManagement/UserManagementModule

---
 .../Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index ffb8bda..9f5e4ae 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         // Throttle the name requests
         //private OpenSim.Framework.BlockingQueue<NameRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<NameRequest>();
-        private OpenSim.Framework.BlockingQueue<NameRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<NameRequest>();
+        private OpenSim.Framework.DoubleQueue<NameRequest> m_RequestQueue = new OpenSim.Framework.DoubleQueue<NameRequest>();
 
 
         #region ISharedRegionModule
-- 
cgit v1.1


From e0f0b88dece110ca10208a2f826f9e360a9d7826 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 16 Jul 2013 13:01:39 -0700
Subject: In the pursuit of using less CPU: now trying to avoid blocking queues
 altogether. Instead, this uses a timer. No sure if it's better or worse, but
 worth the try.

---
 .../GridServiceThrottleModule.cs                   | 71 +++++++++++++++++++---
 .../UserManagement/UserManagementModule.cs         | 64 ++++++++++++++++---
 2 files changed, 120 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
index a069317..83be644 100644
--- a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
@@ -48,18 +48,26 @@ namespace OpenSim.Region.CoreModules.Framework
                 MethodBase.GetCurrentMethod().DeclaringType);
 
         private readonly List<Scene> m_scenes = new List<Scene>();
+        private System.Timers.Timer m_timer = new System.Timers.Timer();
 
         //private OpenSim.Framework.BlockingQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<GridRegionRequest>();
-        private OpenSim.Framework.DoubleQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.DoubleQueue<GridRegionRequest>();
+        // private OpenSim.Framework.DoubleQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.DoubleQueue<GridRegionRequest>();
+        private Queue<GridRegionRequest> m_RequestQueue = new Queue<GridRegionRequest>();
 
         public void Initialise(IConfigSource config)
         {
-            Watchdog.StartThread(
-                ProcessQueue,
-                "GridServiceRequestThread",
-                ThreadPriority.BelowNormal,
-                true,
-                false);
+            m_timer = new System.Timers.Timer();
+            m_timer.AutoReset = false;
+            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)
@@ -89,6 +97,16 @@ namespace OpenSim.Region.CoreModules.Framework
             client.OnRegionHandleRequest += OnRegionHandleRequest;
         }
 
+        //void OnMakeRootAgent(ScenePresence obj)
+        //{
+        //    lock (m_timer)
+        //    {
+        //        m_timer.Stop();
+        //        m_timer.Interval = 1000;
+        //        m_timer.Start();
+        //    }
+        //}
+
         public void PostInitialise()
         {
         }
@@ -118,7 +136,8 @@ namespace OpenSim.Region.CoreModules.Framework
             }
 
             GridRegionRequest request = new GridRegionRequest(client, regionID);
-            m_RequestQueue.Enqueue(request);
+            lock (m_RequestQueue)
+                m_RequestQueue.Enqueue(request);
 
         }
 
@@ -134,6 +153,41 @@ namespace OpenSim.Region.CoreModules.Framework
             return false;
         }
 
+        private bool AreThereRootAgents()
+        {
+            foreach (Scene s in m_scenes)
+            {
+                if (s.GetRootAgentCount() > 0)
+                    return true;
+            }
+
+            return false;
+        }
+
+        private void ProcessQueue(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            while (m_RequestQueue.Count > 0)
+            {
+                GridRegionRequest request = null;
+                lock (m_RequestQueue)
+                    request = m_RequestQueue.Dequeue();
+                if (request != null)
+                {
+                    GridRegion r = m_scenes[0].GridService.GetRegionByUUID(UUID.Zero, request.regionID);
+
+                    if (r != null && r.RegionHandle != 0)
+                        request.client.SendRegionHandle(request.regionID, r.RegionHandle);
+                }
+            }
+
+            if (AreThereRootAgents())
+                m_timer.Interval = 1000; // 1 sec
+            else
+                m_timer.Interval = 10000; // 10 secs
+
+            m_timer.Start();
+        }
+
         private void ProcessQueue()
         {
             while (true)
@@ -150,6 +204,7 @@ namespace OpenSim.Region.CoreModules.Framework
                 }
             }
         }
+
     }
 
     class GridRegionRequest
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 9f5e4ae..61c1e70 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -61,8 +61,10 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         // Throttle the name requests
         //private OpenSim.Framework.BlockingQueue<NameRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<NameRequest>();
-        private OpenSim.Framework.DoubleQueue<NameRequest> m_RequestQueue = new OpenSim.Framework.DoubleQueue<NameRequest>();
+        //private OpenSim.Framework.DoubleQueue<NameRequest> m_RequestQueue = new OpenSim.Framework.DoubleQueue<NameRequest>();
+        private Queue<NameRequest> m_RequestQueue = new Queue<NameRequest>();
 
+        private System.Timers.Timer m_timer;
 
         #region ISharedRegionModule
 
@@ -599,12 +601,18 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
         protected void Init()
         {
             RegisterConsoleCmds();
-            Watchdog.StartThread(
-                ProcessQueue,
-                "NameRequestThread",
-                ThreadPriority.BelowNormal,
-                true,
-                false);
+            //Watchdog.StartThread(
+            //    ProcessQueue,
+            //    "NameRequestThread",
+            //    ThreadPriority.BelowNormal,
+            //    true,
+            //    false);
+
+            m_timer = new System.Timers.Timer();
+            m_timer.AutoReset = false;
+            m_timer.Interval = 15000; // 15 secs at first
+            m_timer.Elapsed += ProcessQueue;
+            m_timer.Start();
 
         }
 
@@ -698,6 +706,48 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             }
         }
 
+        private bool AreThereRootAgents()
+        {
+            foreach (Scene s in m_Scenes)
+            {
+                if (s.GetRootAgentCount() > 0)
+                    return true;
+            }
+
+            return false;
+        }
+
+        private void ProcessQueue(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            while (m_RequestQueue.Count > 0)
+            {
+                NameRequest request = null;
+                lock (m_RequestQueue)
+                    request = m_RequestQueue.Dequeue();
+
+                if (request != null)
+                {
+                    string[] names;
+                    bool foundRealName = TryGetUserNames(request.uuid, out 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], request.uuid, request.client.Name);
+
+                        request.client.SendNameReply(request.uuid, names[0], names[1]);
+                    }
+                }
+            }
+
+            if (AreThereRootAgents())
+                m_timer.Interval = 1000; // 1 sec
+            else
+                m_timer.Interval = 10000; // 10 secs
+
+            m_timer.Start();
+
+        }
     }
 
     class NameRequest
-- 
cgit v1.1


From 21a09ad3ad42b24bce4fc04c6bcd6f7d9a80af08 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 16 Jul 2013 21:54:00 +0100
Subject: Revert "MSDN documentation is unclear about whether exiting a lock()
 block will trigger a Monitor.Wait() to exit, so avoid some locks that don't
 actually affect the state of the internal queues in the BlockingQueue class."

This reverts commit 42e2a0d66eaa7e322bce817e9e2cc9a288de167b

Reverting because unfortunately this introduces race conditions because Contains(), Count() and GetQueueArray() may now end up returning the wrong result if another thread performs a simultaneous update on m_queue.
Code such as PollServiceRequestManager.Stop() relies on the count being correct otherwise a request may be lost.
Also, though some of the internal queue methods do not affect state, they are not thread-safe and could return the wrong result generating the same problem
lock() generates Monitor.Enter() and Monitor.Exit() under the covers.  Monitor.Exit() does not cause Monitor.Wait() to exist, only Pulse() and PulseAll() will do this
Reverted with agreement.
---
 OpenSim/Framework/BlockingQueue.cs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index cc016b0..3658161 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework
         {
             lock (m_queueSync)
             {
-                while (m_queue.Count < 1 && m_pqueue.Count < 1)
+                if (m_queue.Count < 1 && m_pqueue.Count < 1)
                 {
                     Monitor.Wait(m_queueSync);
                 }
@@ -91,9 +91,6 @@ namespace OpenSim.Framework
 
         public bool Contains(T item)
         {
-            if (m_queue.Count < 1 && m_pqueue.Count < 1)
-                return false;
-
             lock (m_queueSync)
             {
                 if (m_pqueue.Contains(item))
@@ -104,14 +101,14 @@ namespace OpenSim.Framework
 
         public int Count()
         {
-            return m_queue.Count+m_pqueue.Count;
+            lock (m_queueSync)
+            {
+                return m_queue.Count+m_pqueue.Count;
+            }
         }
 
         public T[] GetQueueArray()
         {
-            if (m_queue.Count < 1 && m_pqueue.Count < 1)
-                return new T[0];
-
             lock (m_queueSync)
             {
                 return m_queue.ToArray();
-- 
cgit v1.1


From 50b8ab60f2d4d8a2cc7024012fc1333be7635276 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 16 Jul 2013 23:00:07 +0100
Subject: Revert "Revert "MSDN documentation is unclear about whether exiting a
 lock() block will trigger a Monitor.Wait() to exit, so avoid some locks that
 don't actually affect the state of the internal queues in the BlockingQueue
 class.""

This reverts commit 21a09ad3ad42b24bce4fc04c6bcd6f7d9a80af08.

After more analysis and discussion, it is apparant that the Count(), Contains() and GetQueueArray() cannot be made thread-safe anyway without external locking
And this change appears to have a positive impact on performance.
I still believe that Monitor.Exit() will not release any thread for Monitor.Wait(), as per http://msdn.microsoft.com/en-gb/library/vstudio/system.threading.monitor.exit%28v=vs.100%29.aspx
so this should in theory make no difference, though mono implementation issues could possibly be coming into play.
---
 OpenSim/Framework/BlockingQueue.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index 3658161..cc016b0 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);
                 }
@@ -91,6 +91,9 @@ namespace OpenSim.Framework
 
         public bool Contains(T item)
         {
+            if (m_queue.Count < 1 && m_pqueue.Count < 1)
+                return false;
+
             lock (m_queueSync)
             {
                 if (m_pqueue.Contains(item))
@@ -101,14 +104,14 @@ namespace OpenSim.Framework
 
         public int Count()
         {
-            lock (m_queueSync)
-            {
-                return m_queue.Count+m_pqueue.Count;
-            }
+            return m_queue.Count+m_pqueue.Count;
         }
 
         public T[] GetQueueArray()
         {
+            if (m_queue.Count < 1 && m_pqueue.Count < 1)
+                return new T[0];
+
             lock (m_queueSync)
             {
                 return m_queue.ToArray();
-- 
cgit v1.1


From cbc3576ee2ee0afc7cbf66d4d782dfaee9bbdcda Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 16 Jul 2013 23:14:53 +0100
Subject: minor: Add warning method doc about possibly inconsistent results
 returned from BlockingQueue.Contains(), Count() and GetQueueArray()

---
 OpenSim/Framework/BlockingQueue.cs | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index cc016b0..aef1192 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -89,6 +89,12 @@ 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)
@@ -102,11 +108,23 @@ 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()
         {
-            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)
-- 
cgit v1.1


From 3fbd2c54bc7357ea61b3a8b0c56473ae6a5a3260 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 16 Jul 2013 17:04:32 -0700
Subject: Eliminated the UserManagement/UserManagementModule throttle thread.
 Made the other one generic, taking any continuation.

---
 .../GridServiceThrottleModule.cs                   | 160 ++++++++++---------
 .../UserManagement/UserManagementModule.cs         | 177 +++++++--------------
 2 files changed, 148 insertions(+), 189 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
index 83be644..d805fd3 100644
--- a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
@@ -42,7 +42,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 namespace OpenSim.Region.CoreModules.Framework
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GridServiceThrottleModule")]
-    public class GridServiceThrottleModule : ISharedRegionModule
+    public class ServiceThrottleModule : ISharedRegionModule, IServiceThrottleModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
@@ -52,12 +52,16 @@ namespace OpenSim.Region.CoreModules.Framework
 
         //private OpenSim.Framework.BlockingQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<GridRegionRequest>();
         // private OpenSim.Framework.DoubleQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.DoubleQueue<GridRegionRequest>();
-        private Queue<GridRegionRequest> m_RequestQueue = new Queue<GridRegionRequest>();
+        //private Queue<GridRegionRequest> m_RequestQueue = new Queue<GridRegionRequest>();
+        private Queue<Action> m_RequestQueue = new Queue<Action>();
+
+        #region ISharedRegionModule
 
         public void Initialise(IConfigSource config)
         {
             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();
@@ -75,7 +79,9 @@ namespace OpenSim.Region.CoreModules.Framework
             lock (m_scenes)
             {
                 m_scenes.Add(scene);
+                scene.RegisterModuleInterface<IServiceThrottleModule>(this);
                 scene.EventManager.OnNewClient += OnNewClient;
+                scene.EventManager.OnMakeRootAgent += OnMakeRootAgent;
             }
         }
 
@@ -92,21 +98,6 @@ namespace OpenSim.Region.CoreModules.Framework
             }
         }
 
-        void OnNewClient(IClientAPI client)
-        {
-            client.OnRegionHandleRequest += OnRegionHandleRequest;
-        }
-
-        //void OnMakeRootAgent(ScenePresence obj)
-        //{
-        //    lock (m_timer)
-        //    {
-        //        m_timer.Stop();
-        //        m_timer.Interval = 1000;
-        //        m_timer.Start();
-        //    }
-        //}
-
         public void PostInitialise()
         {
         }
@@ -117,7 +108,7 @@ namespace OpenSim.Region.CoreModules.Framework
 
         public string Name
         {
-            get { return "GridServiceThrottleModule"; }
+            get { return "ServiceThrottleModule"; }
         }
 
         public Type ReplaceableInterface
@@ -125,9 +116,31 @@ namespace OpenSim.Region.CoreModules.Framework
             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 = 1000;
+                    m_timer.Enabled = true;
+                    m_timer.Start();
+                }
+            }
+        }
+
         public void OnRegionHandleRequest(IClientAPI client, UUID regionID)
         {
-            //m_log.DebugFormat("[GRIDSERVICE THROTTLE]: RegionHandleRequest {0}", regionID);
+            //m_log.DebugFormat("[SERVICE THROTTLE]: RegionHandleRequest {0}", regionID);
             ulong handle = 0;
             if (IsLocalRegionHandle(regionID, out handle))
             {
@@ -135,87 +148,90 @@ namespace OpenSim.Region.CoreModules.Framework
                 return;
             }
 
-            GridRegionRequest request = new GridRegionRequest(client, regionID);
+            Action action = delegate
+            {
+                GridRegion r = m_scenes[0].GridService.GetRegionByUUID(UUID.Zero, regionID);
+
+                if (r != null && r.RegionHandle != 0)
+                    client.SendRegionHandle(regionID, r.RegionHandle);
+            };
+
             lock (m_RequestQueue)
-                m_RequestQueue.Enqueue(request);
+                m_RequestQueue.Enqueue(action);
 
         }
 
-        private bool IsLocalRegionHandle(UUID regionID, out ulong regionHandle)
+        #endregion Events
+
+        #region IServiceThrottleModule
+
+        public void Enqueue(Action continuation)
         {
-            regionHandle = 0;
-            foreach (Scene s in m_scenes)
-                if (s.RegionInfo.RegionID == regionID)
-                {
-                    regionHandle = s.RegionInfo.RegionHandle;
-                    return true;
-                }
-            return false;
+            m_RequestQueue.Enqueue(continuation);
         }
 
-        private bool AreThereRootAgents()
-        {
-            foreach (Scene s in m_scenes)
-            {
-                if (s.GetRootAgentCount() > 0)
-                    return true;
-            }
+        #endregion IServiceThrottleModule
 
-            return false;
-        }
+        #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)
             {
-                GridRegionRequest request = null;
+                Action continuation = null;
                 lock (m_RequestQueue)
-                    request = m_RequestQueue.Dequeue();
-                if (request != null)
-                {
-                    GridRegion r = m_scenes[0].GridService.GetRegionByUUID(UUID.Zero, request.regionID);
+                    continuation = m_RequestQueue.Dequeue();
 
-                    if (r != null && r.RegionHandle != 0)
-                        request.client.SendRegionHandle(request.regionID, r.RegionHandle);
-                }
+                if (continuation != null)
+                    continuation();
             }
 
             if (AreThereRootAgents())
-                m_timer.Interval = 1000; // 1 sec
+            {
+                lock (m_timer)
+                {
+                    m_timer.Interval = 1000; // 1 sec
+                    m_timer.Enabled = true;
+                    m_timer.Start();
+                }
+            }
             else
-                m_timer.Interval = 10000; // 10 secs
+                lock (m_timer)
+                    m_timer.Enabled = false;
 
-            m_timer.Start();
         }
 
-        private void ProcessQueue()
-        {
-            while (true)
-            {
-                Watchdog.UpdateThread();
+        #endregion Process Continuation Queue
 
-                GridRegionRequest request = m_RequestQueue.Dequeue();
-                if (request != null)
-                {
-                    GridRegion r = m_scenes[0].GridService.GetRegionByUUID(UUID.Zero, request.regionID);
+        #region Misc
 
-                    if (r != null && r.RegionHandle != 0)
-                        request.client.SendRegionHandle(request.regionID, r.RegionHandle);
+        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;
         }
 
-    }
-
-    class GridRegionRequest
-    {
-        public IClientAPI client;
-        public UUID regionID;
-
-        public GridRegionRequest(IClientAPI c, UUID r)
+        private bool AreThereRootAgents()
         {
-            client = c;
-            regionID = r;
+            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/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 61c1e70..73b59d3 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -56,16 +56,10 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
         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>();
 
-        // Throttle the name requests
-        //private OpenSim.Framework.BlockingQueue<NameRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<NameRequest>();
-        //private OpenSim.Framework.DoubleQueue<NameRequest> m_RequestQueue = new OpenSim.Framework.DoubleQueue<NameRequest>();
-        private Queue<NameRequest> m_RequestQueue = new Queue<NameRequest>();
-
-        private System.Timers.Timer m_timer;
-
         #region ISharedRegionModule
 
         public void Initialise(IConfigSource config)
@@ -118,6 +112,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()
@@ -157,7 +153,7 @@ 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}", 
@@ -165,12 +161,33 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
             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
             {
-                NameRequest request = new NameRequest(remote_client, uuid);
-                m_RequestQueue.Enqueue(request);
+                string[] names = new string[2];
+                if (TryGetUserNamesFromCache(uuid, names))
+                {
+                    client.SendNameReply(uuid, names[0], names[1]);
+                    return;
+                }
+
+                // Not found in cache, get it from services
+                m_ServiceThrottle.Enqueue(delegate
+                {
+                    m_log.DebugFormat("[YYY]: Name request {0}", uuid);
+                    bool foundRealName = TryGetUserNamesFromServices(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);
+                        else
+                            m_log.DebugFormat("[YYY]: Found user {0} {1} for uuid {2}", names[0], names[1], uuid);
+
+                        client.SendNameReply(uuid, names[0], names[1]);
+                    }
+                });
 
             }
         }
@@ -286,15 +303,27 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
         }
 
         /// <summary>
-        /// Try to get the names bound to the given uuid.
+        /// 
         /// </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 TryGetUserNames(UUID uuid, out string[] names)
+        /// <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)
         {
-            names = 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))
@@ -306,6 +335,17 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 }
             }
 
+            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)
@@ -390,18 +430,11 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         public string GetUserName(UUID uuid)
         {
-            string[] names;
-            TryGetUserNames(uuid, out names);
+            string[] names = new string[2];
+            TryGetUserNames(uuid, names);
 
-            if (names.Length == 2)
-            {
-                string firstname = names[0];
-                string lastname = names[1];
-
-                return firstname + " " + lastname;
-            }
+            return names[0] + " " + names[1];
 
-            return "(hippos)";
         }
 
         public string GetUserHomeURL(UUID userID)
@@ -601,19 +634,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
         protected void Init()
         {
             RegisterConsoleCmds();
-            //Watchdog.StartThread(
-            //    ProcessQueue,
-            //    "NameRequestThread",
-            //    ThreadPriority.BelowNormal,
-            //    true,
-            //    false);
-
-            m_timer = new System.Timers.Timer();
-            m_timer.AutoReset = false;
-            m_timer.Interval = 15000; // 15 secs at first
-            m_timer.Elapsed += ProcessQueue;
-            m_timer.Start();
-
         }
 
         protected void RegisterConsoleCmds()
@@ -683,83 +703,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             MainConsole.Instance.Output(cdt.ToString());
         }
 
-        private void ProcessQueue()
-        {
-            while (true)
-            {
-                Watchdog.UpdateThread();
-
-                NameRequest request = m_RequestQueue.Dequeue();
-                if (request != null)
-                {
-                    string[] names;
-                    bool foundRealName = TryGetUserNames(request.uuid, out 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], request.uuid, request.client.Name);
-
-                        request.client.SendNameReply(request.uuid, names[0], names[1]);
-                    }
-                }
-            }
-        }
-
-        private bool AreThereRootAgents()
-        {
-            foreach (Scene s in m_Scenes)
-            {
-                if (s.GetRootAgentCount() > 0)
-                    return true;
-            }
-
-            return false;
-        }
-
-        private void ProcessQueue(object sender, System.Timers.ElapsedEventArgs e)
-        {
-            while (m_RequestQueue.Count > 0)
-            {
-                NameRequest request = null;
-                lock (m_RequestQueue)
-                    request = m_RequestQueue.Dequeue();
-
-                if (request != null)
-                {
-                    string[] names;
-                    bool foundRealName = TryGetUserNames(request.uuid, out 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], request.uuid, request.client.Name);
-
-                        request.client.SendNameReply(request.uuid, names[0], names[1]);
-                    }
-                }
-            }
-
-            if (AreThereRootAgents())
-                m_timer.Interval = 1000; // 1 sec
-            else
-                m_timer.Interval = 10000; // 10 secs
-
-            m_timer.Start();
-
-        }
-    }
-
-    class NameRequest
-    {
-        public IClientAPI client;
-        public UUID uuid;
-
-        public NameRequest(IClientAPI c, UUID n)
-        {
-            client = c;
-            uuid = n;
-        }
     }
 
 }
\ No newline at end of file
-- 
cgit v1.1


From 99a600753e2013a5e5c4649da78bc5b871461c8e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 16 Jul 2013 17:06:17 -0700
Subject: Changed the name to ServiceThrottle/ServiceThrottleModule in order to
 reflect its more generic nature.

---
 .../GridServiceThrottleModule.cs                   | 237 ---------------------
 .../ServiceThrottle/ServiceThrottleModule.cs       | 237 +++++++++++++++++++++
 2 files changed, 237 insertions(+), 237 deletions(-)
 delete mode 100644 OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
 create mode 100644 OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs

diff --git a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
deleted file mode 100644
index d805fd3..0000000
--- a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using 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 OpenSim.Framework.BlockingQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<GridRegionRequest>();
-        // private OpenSim.Framework.DoubleQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.DoubleQueue<GridRegionRequest>();
-        //private Queue<GridRegionRequest> m_RequestQueue = new Queue<GridRegionRequest>();
-        private Queue<Action> m_RequestQueue = new Queue<Action>();
-
-        #region ISharedRegionModule
-
-        public void Initialise(IConfigSource config)
-        {
-            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 = 1000;
-                    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);
-            };
-
-            lock (m_RequestQueue)
-                m_RequestQueue.Enqueue(action);
-
-        }
-
-        #endregion Events
-
-        #region IServiceThrottleModule
-
-        public void Enqueue(Action continuation)
-        {
-            m_RequestQueue.Enqueue(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/ServiceThrottle/ServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
new file mode 100644
index 0000000..d805fd3
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
@@ -0,0 +1,237 @@
+/*
+ * 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 OpenSim.Framework.BlockingQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<GridRegionRequest>();
+        // private OpenSim.Framework.DoubleQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.DoubleQueue<GridRegionRequest>();
+        //private Queue<GridRegionRequest> m_RequestQueue = new Queue<GridRegionRequest>();
+        private Queue<Action> m_RequestQueue = new Queue<Action>();
+
+        #region ISharedRegionModule
+
+        public void Initialise(IConfigSource config)
+        {
+            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 = 1000;
+                    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);
+            };
+
+            lock (m_RequestQueue)
+                m_RequestQueue.Enqueue(action);
+
+        }
+
+        #endregion Events
+
+        #region IServiceThrottleModule
+
+        public void Enqueue(Action continuation)
+        {
+            m_RequestQueue.Enqueue(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
+    }
+
+}
-- 
cgit v1.1


From a006caabbcfe6e2a2b4a6118d217d3bd9abd4d99 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 16 Jul 2013 17:06:54 -0700
Subject: Added IServiceThrottleModule.cs

---
 OpenSim/Region/Framework/Interfaces/IServiceThrottleModule.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 OpenSim/Region/Framework/Interfaces/IServiceThrottleModule.cs

diff --git a/OpenSim/Region/Framework/Interfaces/IServiceThrottleModule.cs b/OpenSim/Region/Framework/Interfaces/IServiceThrottleModule.cs
new file mode 100644
index 0000000..bb6a8b4
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IServiceThrottleModule.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace OpenSim.Region.Framework.Interfaces
+{
+    public interface IServiceThrottleModule
+    {
+        void Enqueue(Action continuation);
+    }
+
+}
-- 
cgit v1.1


From 9f578cf0c83ba56d5a999df7411f4065fc17d24b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 16 Jul 2013 17:18:11 -0700
Subject: Deleted a couple of verbose messages

---
 .../CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs    | 2 +-
 .../CoreModules/Framework/UserManagement/UserManagementModule.cs      | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
index d805fd3..553e4ca 100644
--- a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
@@ -176,7 +176,7 @@ namespace OpenSim.Region.CoreModules.Framework
 
         private void ProcessQueue(object sender, System.Timers.ElapsedEventArgs e)
         {
-            m_log.DebugFormat("[YYY]: Process queue with {0} continuations", m_RequestQueue.Count);
+            //m_log.DebugFormat("[YYY]: Process queue with {0} continuations", m_RequestQueue.Count);
 
             while (m_RequestQueue.Count > 0)
             {
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 73b59d3..da28a53 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -175,15 +175,13 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 // Not found in cache, get it from services
                 m_ServiceThrottle.Enqueue(delegate
                 {
-                    m_log.DebugFormat("[YYY]: Name request {0}", uuid);
+                    //m_log.DebugFormat("[YYY]: Name request {0}", uuid);
                     bool foundRealName = TryGetUserNamesFromServices(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);
-                        else
-                            m_log.DebugFormat("[YYY]: Found user {0} {1} for uuid {2}", names[0], names[1], uuid);
 
                         client.SendNameReply(uuid, names[0], names[1]);
                     }
-- 
cgit v1.1


From 9f129938c9c75bb4513b0b93248985100fe0e921 Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Tue, 16 Jul 2013 17:43:36 -0700
Subject: Attachments module only registers when enabled. This enables
 alternative attachments module implementations. All calls to
 Scene.AttachmentsModule are checking for null. Ideally, if we support
 disabling attachments then we need a null attachments module to register with
 the scene.

---
 OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs  | 6 ++++--
 OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs               | 6 ++++--
 .../RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs  | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index f69ec21..2f5a76f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -74,10 +74,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         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);
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 7d46d92..69189b3 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>();
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);
             
-- 
cgit v1.1


From d4720bd721b518efbc681df2f4e7d1ca35aa0f3c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 16 Jul 2013 17:53:05 -0700
Subject: Added config var to fiddle with the Interval for the service throttle
 thread

---
 .../CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
index 553e4ca..a3ca6d6 100644
--- a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
@@ -54,11 +54,14 @@ namespace OpenSim.Region.CoreModules.Framework
         // private OpenSim.Framework.DoubleQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.DoubleQueue<GridRegionRequest>();
         //private Queue<GridRegionRequest> m_RequestQueue = new Queue<GridRegionRequest>();
         private Queue<Action> m_RequestQueue = new Queue<Action>();
+        private int m_Interval;
 
         #region ISharedRegionModule
 
         public void Initialise(IConfigSource config)
         {
+            m_Interval = Util.GetConfigVarFromSections<int>(config, "Interval", new string[] { "ServiceThrottle" }, 2000);
+
             m_timer = new System.Timers.Timer();
             m_timer.AutoReset = false;
             m_timer.Enabled = true;
@@ -131,7 +134,7 @@ namespace OpenSim.Region.CoreModules.Framework
             {
                 if (!m_timer.Enabled)
                 {
-                    m_timer.Interval = 1000;
+                    m_timer.Interval = m_Interval;
                     m_timer.Enabled = true;
                     m_timer.Start();
                 }
-- 
cgit v1.1


From 5f27aaa6ddb857dbfbbe0219d0e29c42ad903375 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 16 Jul 2013 18:22:42 -0700
Subject: UserManagementModule: in the continuation, call the method that also
 looks up the cache, because the resource may be here in the meantime

---
 .../CoreModules/Framework/UserManagement/UserManagementModule.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index da28a53..e8bdcc9 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -172,11 +172,11 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     return;
                 }
 
-                // Not found in cache, get it from services
+                // Not found in cache, queue continuation
                 m_ServiceThrottle.Enqueue(delegate
                 {
                     //m_log.DebugFormat("[YYY]: Name request {0}", uuid);
-                    bool foundRealName = TryGetUserNamesFromServices(uuid, names);
+                    bool foundRealName = TryGetUserNames(uuid, names);
 
                     if (names.Length == 2)
                     {
-- 
cgit v1.1


From 9432f3c94d0b0345132e5ff9eaf966b96cf218c2 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 16 Jul 2013 19:04:30 -0700
Subject: Improvements to the ServiceThrottleModule: added a category and an
 itemid to the interface, so that duplicate requests aren't enqueued more than
 once.

---
 .../ServiceThrottle/ServiceThrottleModule.cs       | 35 ++++++++++++++++------
 .../UserManagement/UserManagementModule.cs         |  2 +-
 .../Framework/Interfaces/IServiceThrottleModule.cs | 10 ++++++-
 bin/OpenSimDefaults.ini                            |  4 +++
 4 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
index a3ca6d6..1554b3e 100644
--- a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
@@ -50,17 +50,15 @@ namespace OpenSim.Region.CoreModules.Framework
         private readonly List<Scene> m_scenes = new List<Scene>();
         private System.Timers.Timer m_timer = new System.Timers.Timer();
 
-        //private OpenSim.Framework.BlockingQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<GridRegionRequest>();
-        // private OpenSim.Framework.DoubleQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.DoubleQueue<GridRegionRequest>();
-        //private Queue<GridRegionRequest> m_RequestQueue = new Queue<GridRegionRequest>();
         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" }, 2000);
+            m_Interval = Util.GetConfigVarFromSections<int>(config, "Interval", new string[] { "ServiceThrottle" }, 5000);
 
             m_timer = new System.Timers.Timer();
             m_timer.AutoReset = false;
@@ -159,18 +157,37 @@ namespace OpenSim.Region.CoreModules.Framework
                     client.SendRegionHandle(regionID, r.RegionHandle);
             };
 
-            lock (m_RequestQueue)
-                m_RequestQueue.Enqueue(action);
-
+            Enqueue("region", regionID.ToString(), action);
         }
 
         #endregion Events
 
         #region IServiceThrottleModule
 
-        public void Enqueue(Action continuation)
+        public void Enqueue(string category, string itemid, Action continuation)
         {
-            m_RequestQueue.Enqueue(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
+                {
+                    continuation();
+                    lock (m_RequestQueue)
+                    {
+                        m_Pending[category].Remove(itemid);
+                    }
+                });
+            }
         }
 
         #endregion IServiceThrottleModule
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index e8bdcc9..a91adfa 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 }
 
                 // Not found in cache, queue continuation
-                m_ServiceThrottle.Enqueue(delegate
+                m_ServiceThrottle.Enqueue("name", uuid.ToString(),  delegate
                 {
                     //m_log.DebugFormat("[YYY]: Name request {0}", uuid);
                     bool foundRealName = TryGetUserNames(uuid, names);
diff --git a/OpenSim/Region/Framework/Interfaces/IServiceThrottleModule.cs b/OpenSim/Region/Framework/Interfaces/IServiceThrottleModule.cs
index bb6a8b4..198256f 100644
--- a/OpenSim/Region/Framework/Interfaces/IServiceThrottleModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IServiceThrottleModule.cs
@@ -5,7 +5,15 @@ namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IServiceThrottleModule
     {
-        void Enqueue(Action continuation);
+        /// <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/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 4a3104e..8079632 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1727,5 +1727,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"
-- 
cgit v1.1


From 894554faf61fe8ae02c1348612845ae2553efbd4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 16 Jul 2013 20:28:48 -0700
Subject: Removed the MapItems thread. Redirected the map items requests to the
 services throttle thread. Didn't change anything in how that processor is
 implemented, for better or for worse.

---
 .../ServiceThrottle/ServiceThrottleModule.cs       |  5 +--
 .../CoreModules/World/WorldMap/WorldMapModule.cs   | 49 +++++++++++++++++++---
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
index 1554b3e..a70261e 100644
--- a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
@@ -181,11 +181,10 @@ namespace OpenSim.Region.CoreModules.Framework
 
                 m_RequestQueue.Enqueue(delegate
                 {
-                    continuation();
                     lock (m_RequestQueue)
-                    {
                         m_Pending[category].Remove(itemid);
-                    }
+
+                    continuation();
                 });
             }
         }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index c50ab64..a26a5f0 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -81,6 +81,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         private List<UUID> m_rootAgents = new List<UUID>();
         private volatile bool threadrunning = false;
 
+        private IServiceThrottleModule m_ServiceThrottle;
+
         //private int CacheRegionsDistance = 256;
 
         #region INonSharedRegionModule Members
@@ -131,6 +133,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
         public virtual void RegionLoaded (Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
+            m_ServiceThrottle = scene.RequestModuleInterface<IServiceThrottleModule>();
         }
 
 
@@ -170,13 +176,13 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             m_scene.EventManager.OnMakeRootAgent += MakeRootAgent;
             m_scene.EventManager.OnRegionUp += OnRegionUp;
 
-            StartThread(new object());
+//            StartThread(new object());
         }
 
         // this has to be called with a lock on m_scene
         protected virtual void RemoveHandlers()
         {
-            StopThread();
+//            StopThread();
 
             m_scene.EventManager.OnRegionUp -= OnRegionUp;
             m_scene.EventManager.OnMakeRootAgent -= MakeRootAgent;
@@ -526,7 +532,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         /// </summary>
         public void process()
         {
-            const int MAX_ASYNC_REQUESTS = 20;
+            //const int MAX_ASYNC_REQUESTS = 20;
             try
             {
                 while (true)
@@ -571,13 +577,44 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             Watchdog.RemoveThread();
         }
 
+        const int MAX_ASYNC_REQUESTS = 20;
+
         /// <summary>
-        /// Enqueues the map item request into the processing thread
+        /// Enqueues the map item request into the services throttle processing thread
         /// </summary>
         /// <param name="state"></param>
-        public void EnqueueMapItemRequest(MapRequestState state)
+        public void EnqueueMapItemRequest(MapRequestState st)
         {
-            requests.Enqueue(state);
+
+            m_ServiceThrottle.Enqueue("map-item", st.regionhandle.ToString() + st.agentID.ToString(), delegate
+            {
+                if (st.agentID != UUID.Zero)
+                {
+                    bool dorequest = true;
+                    lock (m_rootAgents)
+                    {
+                        if (!m_rootAgents.Contains(st.agentID))
+                            dorequest = false;
+                    }
+
+                    if (dorequest && !m_blacklistedregions.ContainsKey(st.regionhandle))
+                    {
+                        if (nAsyncRequests >= MAX_ASYNC_REQUESTS) // hit the break
+                        {
+                            // AH!!! Recursive !
+                            // Put this request back in the queue and return
+                            EnqueueMapItemRequest(st);
+                            return;
+                        }
+
+                        RequestMapItemsDelegate d = RequestMapItemsAsync;
+                        d.BeginInvoke(st.agentID, st.flags, st.EstateID, st.godlike, st.itemtype, st.regionhandle, RequestMapItemsCompleted, null);
+                        //OSDMap response = RequestMapItemsAsync(st.agentID, st.flags, st.EstateID, st.godlike, st.itemtype, st.regionhandle);
+                        //RequestMapItemsCompleted(response);
+                        Interlocked.Increment(ref nAsyncRequests);
+                    }
+                }
+            });
         }
 
         /// <summary>
-- 
cgit v1.1


From 2c8bf4aaa66a4cc9fc8fd9f89825e7cd1b43f3d6 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 17 Jul 2013 10:19:44 -0700
Subject: BulletSim: fix small bug where everything looked like it was
 colliding before the first simulator step.

---
 OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 13 +++++++------
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs      |  3 +++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index a41eaf8..fc4545f 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -103,9 +103,10 @@ public abstract class BSPhysObject : PhysicsActor
         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;
 
@@ -349,7 +350,7 @@ public abstract class BSPhysObject : PhysicsActor
             if (value)
                 CollidingStep = PhysScene.SimulationStep;
             else
-                CollidingStep = 0;
+                CollidingStep = BSScene.NotASimulationStep;
             }
     }
     public override bool CollidingGround {
@@ -359,7 +360,7 @@ public abstract class BSPhysObject : PhysicsActor
             if (value)
                 CollidingGroundStep = PhysScene.SimulationStep;
             else
-                CollidingGroundStep = 0;
+                CollidingGroundStep = BSScene.NotASimulationStep;
         }
     }
     public override bool CollidingObj {
@@ -368,7 +369,7 @@ public abstract class BSPhysObject : PhysicsActor
             if (value)
                 CollidingObjectStep = PhysScene.SimulationStep;
             else
-                CollidingObjectStep = 0;
+                CollidingObjectStep = BSScene.NotASimulationStep;
         }
     }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 214271b..41aca3b 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -97,6 +97,9 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
 
     internal long m_simulationStep = 0; // The current simulation step.
     public long SimulationStep { get { return m_simulationStep; } }
+    // 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()
 
-- 
cgit v1.1


From e46459ef21e1ee5ceaeca70365a7c881d33b09ce Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 17 Jul 2013 11:19:36 -0700
Subject: Cleared up much confusion in PollServiceRequestManager. Here's the
 history: When Melanie added the web fetch inventory throttle to core, she
 made the long poll requests (EQs) effectively be handled on an active loop.
 All those requests, if they existed, were being constantly dequeued, checked
 for events (which most often they didn't have), and requeued again. This was
 an active loop thread on a 100ms cycle! This fixes the issue. Now the
 inventory requests, if they aren't ready to be served, are placed directly
 back in the queue, but the long poll requests aren't placed there until there
 are events ready to be sent or timeout has been reached. This puts the
 LongPollServiceWatcherThread back to 1sec cycle, as it was before.

---
 OpenSim/Framework/BlockingQueue.cs                 |  2 +-
 .../Servers/HttpServer/PollServiceEventArgs.cs     |  4 +-
 .../HttpServer/PollServiceRequestManager.cs        | 79 +++++++++-------------
 .../Linden/Caps/EventQueue/EventQueueGetModule.cs  |  8 ++-
 4 files changed, 41 insertions(+), 52 deletions(-)

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index aef1192..e607e64 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -76,7 +76,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, msTimeout);
                 }
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index 020bfd5..9477100 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public enum EventType : int
         {
-            Normal = 0,
+            LongPoll = 0,
             LslHttp = 1,
             Inventory = 2
         }
@@ -80,7 +80,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             NoEvents = pNoEvents;
             Id = pId;
             TimeOutms = pTimeOutms;
-            Type = EventType.Normal;
+            Type = EventType.LongPoll;
         }
     }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 1b9010a..4cb551c 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -47,12 +47,11 @@ namespace OpenSim.Framework.Servers.HttpServer
         private readonly BaseHttpServer m_server;
 
         private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>();
-        private static Queue<PollServiceHttpRequest> m_slowRequests = new Queue<PollServiceHttpRequest>();
-        private static Queue<PollServiceHttpRequest> m_retryRequests = new Queue<PollServiceHttpRequest>();
+        private static Queue<PollServiceHttpRequest> m_longPollRequests = new Queue<PollServiceHttpRequest>();
 
         private uint m_WorkerThreadCount = 0;
         private Thread[] m_workerThreads;
-        private Thread m_retrysThread;
+        private Thread m_longPollThread;
 
         private bool m_running = true;
         private int slowCount = 0;
@@ -84,9 +83,9 @@ namespace OpenSim.Framework.Servers.HttpServer
                         int.MaxValue);
             }
 
-            m_retrysThread = Watchdog.StartThread(
-                this.CheckRetries,
-                string.Format("PollServiceWatcherThread:{0}", m_server.Port),
+            m_longPollThread = Watchdog.StartThread(
+                this.CheckLongPollThreads,
+                string.Format("LongPollServiceWatcherThread:{0}", m_server.Port),
                 ThreadPriority.Normal,
                 false,
                 true,
@@ -97,48 +96,47 @@ namespace OpenSim.Framework.Servers.HttpServer
         private void ReQueueEvent(PollServiceHttpRequest req)
         {
             if (m_running)
-            {
-                lock (m_retryRequests)
-                    m_retryRequests.Enqueue(req);
-            }
+                m_requests.Enqueue(req);
         }
 
         public void Enqueue(PollServiceHttpRequest req)
         {
             if (m_running)
             {
-                if (req.PollServiceArgs.Type != PollServiceEventArgs.EventType.Normal)
+                if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LongPoll)
                 {
-                    m_requests.Enqueue(req);
+                    lock (m_longPollRequests)
+                        m_longPollRequests.Enqueue(req);
                 }
                 else
-                {
-                    lock (m_slowRequests)
-                        m_slowRequests.Enqueue(req);
-                }
+                    m_requests.Enqueue(req);
             }
         }
 
-        private void CheckRetries()
+        private void CheckLongPollThreads()
         {
+            // The only purpose of this thread is to check the EQs for events.
+            // If there are events, that thread will be placed in the "ready-to-serve" queue, m_requests.
+            // If there are no events, that thread will be back to its "waiting" queue, m_longPollRequests.
+            // All other types of tasks (Inventory handlers) don't have the long-poll nature,
+            // so if they aren't ready to be served by a worker thread (no events), they are placed 
+            // directly back in the "ready-to-serve" queue by the worker thread.
             while (m_running)
             {
-                Thread.Sleep(100); // let the world move  .. back to faster rate
+                Thread.Sleep(1000); 
                 Watchdog.UpdateThread();
-                lock (m_retryRequests)
-                {
-                    while (m_retryRequests.Count > 0 && m_running)
-                        m_requests.Enqueue(m_retryRequests.Dequeue());
-                }
-                slowCount++;
-                if (slowCount >= 10)
-                {
-                    slowCount = 0;
 
-                    lock (m_slowRequests)
+                PollServiceHttpRequest req;
+                lock (m_longPollRequests)
+                {
+                    while (m_longPollRequests.Count > 0 && m_running)
                     {
-                        while (m_slowRequests.Count > 0 && m_running)
-                            m_requests.Enqueue(m_slowRequests.Dequeue());
+                        req = m_longPollRequests.Dequeue();
+                        if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id) || // there are events in this EQ
+                            (Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms) // no events, but timeout
+                            m_requests.Enqueue(req);
+                        else
+                            m_longPollRequests.Enqueue(req);
                     }
                 }
             }
@@ -153,24 +151,12 @@ namespace OpenSim.Framework.Servers.HttpServer
             foreach (Thread t in m_workerThreads)
                 Watchdog.AbortThread(t.ManagedThreadId);
 
-            try
-            {
-                foreach (PollServiceHttpRequest req in m_retryRequests)
-                {
-                   req.DoHTTPGruntWork(m_server, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
-                }
-            }
-            catch
-            {
-            }
-
             PollServiceHttpRequest wreq;
-            m_retryRequests.Clear();
 
-            lock (m_slowRequests)
+            lock (m_longPollRequests)
             {
-                while (m_slowRequests.Count > 0 && m_running)
-                    m_requests.Enqueue(m_slowRequests.Dequeue());
+                while (m_longPollRequests.Count > 0 && m_running)
+                    m_requests.Enqueue(m_longPollRequests.Dequeue());
             }
 
             while (m_requests.Count() > 0)
@@ -196,6 +182,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             while (m_running)
             {
                 PollServiceHttpRequest req = m_requests.Dequeue(5000);
+                //m_log.WarnFormat("[YYY]: Dequeued {0}", (req == null ? "null" : req.PollServiceArgs.Type.ToString()));
 
                 Watchdog.UpdateThread();
                 if (req != null)
@@ -209,7 +196,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/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 1835a72..f0445ff 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -364,8 +364,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
             caps.RegisterPollHandler(
                 "EventQueueGet", 
-                new PollServiceEventArgs(
-                    null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, agentID, 40000));
+                new PollServiceEventArgs(null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, agentID, 40000));
 
             Random rnd = new Random(Environment.TickCount);
             lock (m_ids)
@@ -383,7 +382,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;
         }
@@ -406,7 +408,7 @@ namespace OpenSim.Region.ClientStack.Linden
         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.RegionInfo.RegionName);
 
             Queue<OSD> queue = TryGetQueue(pAgentId);
             OSD element;
-- 
cgit v1.1


From 0f5b616fb0ebf9207b3cc81771622ed1290ea7d6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 17 Jul 2013 12:02:00 -0700
Subject: Didn't mean to commit this change in BlockingQueue.cs

---
 OpenSim/Framework/BlockingQueue.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index e607e64..aef1192 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Framework
         {
             lock (m_queueSync)
             {
-                while (m_queue.Count < 1 && m_pqueue.Count < 1)
+                if (m_queue.Count < 1 && m_pqueue.Count < 1)
                 {
                     Monitor.Wait(m_queueSync, msTimeout);
                 }
-- 
cgit v1.1


From f4317dc26d670c853d0ea64b401b00f718f09474 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 17 Jul 2013 12:57:34 -0700
Subject: Putting the requests back in the queue while testing for count >0 is
 not the smartest move...

---
 .../Framework/Servers/HttpServer/PollServiceRequestManager.cs  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 4cb551c..c50df5a 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -126,18 +126,22 @@ namespace OpenSim.Framework.Servers.HttpServer
                 Thread.Sleep(1000); 
                 Watchdog.UpdateThread();
 
-                PollServiceHttpRequest req;
+                List<PollServiceHttpRequest> not_ready = new List<PollServiceHttpRequest>();
                 lock (m_longPollRequests)
                 {
                     while (m_longPollRequests.Count > 0 && m_running)
                     {
-                        req = m_longPollRequests.Dequeue();
+                        PollServiceHttpRequest req = m_longPollRequests.Dequeue();
                         if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id) || // there are events in this EQ
                             (Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms) // no events, but timeout
                             m_requests.Enqueue(req);
                         else
-                            m_longPollRequests.Enqueue(req);
+                            not_ready.Add(req);
                     }
+
+                    foreach (PollServiceHttpRequest req in not_ready)
+                        m_longPollRequests.Enqueue(req);
+
                 }
             }
         }
-- 
cgit v1.1


From af792bc7f2504e9ccf1c8ae7568919785dc397c9 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 17 Jul 2013 13:23:29 -0700
Subject: Do the same trick that dahlia did for Dequeue(timeout)

---
 OpenSim/Framework/BlockingQueue.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index aef1192..fb74a24 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -76,9 +76,10 @@ namespace OpenSim.Framework
         {
             lock (m_queueSync)
             {
-                if (m_queue.Count < 1 && m_pqueue.Count < 1)
+                bool timedout = false;
+                while (m_queue.Count < 1 && m_pqueue.Count < 1 && !timedout)
                 {
-                    Monitor.Wait(m_queueSync, msTimeout);
+                    timedout = Monitor.Wait(m_queueSync, msTimeout);
                 }
 
                 if (m_pqueue.Count > 0)
-- 
cgit v1.1


From 1d3deda10cf85abd68a5f904d6698ae597a67cc0 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 17 Jul 2013 13:26:15 -0700
Subject: I confuse myself. Let's try this variable name instead.

---
 OpenSim/Framework/BlockingQueue.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index fb74a24..3e90fac 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -76,10 +76,10 @@ namespace OpenSim.Framework
         {
             lock (m_queueSync)
             {
-                bool timedout = false;
-                while (m_queue.Count < 1 && m_pqueue.Count < 1 && !timedout)
+                bool success = true;
+                while (m_queue.Count < 1 && m_pqueue.Count < 1 && success)
                 {
-                    timedout = Monitor.Wait(m_queueSync, msTimeout);
+                    success = Monitor.Wait(m_queueSync, msTimeout);
                 }
 
                 if (m_pqueue.Count > 0)
-- 
cgit v1.1


From 5f95f4d78e8c7d17b8ba866907156fe6d4444c04 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 17 Jul 2013 14:09:04 -0700
Subject: Now trying DoubleQueue instead of BlockingQueue for the
 PollServiceRequestManager.

---
 OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index c50df5a..bad28e4 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         private readonly BaseHttpServer m_server;
 
-        private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>();
+        private DoubleQueue<PollServiceHttpRequest> m_requests = new DoubleQueue<PollServiceHttpRequest>();
         private static Queue<PollServiceHttpRequest> m_longPollRequests = new Queue<PollServiceHttpRequest>();
 
         private uint m_WorkerThreadCount = 0;
@@ -163,7 +163,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     m_requests.Enqueue(m_longPollRequests.Dequeue());
             }
 
-            while (m_requests.Count() > 0)
+            while (m_requests.Count > 0)
             {
                 try
                 {
-- 
cgit v1.1


From 5232ab0496eb4fe6903a0fd328974ac69df29ad8 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 17 Jul 2013 14:36:55 -0700
Subject: This is a completely unreasonable thing to do, effectively defying
 the purpose of BlockingQueues. Trying this, to see the effect on CPU.

---
 .../HttpServer/PollServiceRequestManager.cs        | 92 ++++++++++++----------
 1 file changed, 52 insertions(+), 40 deletions(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index bad28e4..b8f5743 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         private readonly BaseHttpServer m_server;
 
-        private DoubleQueue<PollServiceHttpRequest> m_requests = new DoubleQueue<PollServiceHttpRequest>();
+        private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>();
         private static Queue<PollServiceHttpRequest> m_longPollRequests = new Queue<PollServiceHttpRequest>();
 
         private uint m_WorkerThreadCount = 0;
@@ -163,7 +163,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     m_requests.Enqueue(m_longPollRequests.Dequeue());
             }
 
-            while (m_requests.Count > 0)
+            while (m_requests.Count() > 0)
             {
                 try
                 {
@@ -185,35 +185,33 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             while (m_running)
             {
-                PollServiceHttpRequest req = m_requests.Dequeue(5000);
-                //m_log.WarnFormat("[YYY]: Dequeued {0}", (req == null ? "null" : req.PollServiceArgs.Type.ToString()));
-
                 Watchdog.UpdateThread();
-                if (req != null)
+
+                PollServiceHttpRequest req = null;
+                lock (m_requests)
+                {
+                    if (m_requests.Count() > 0)
+                        req = m_requests.Dequeue();
+                }
+                if (req == null)
+                    Thread.Sleep(100);
+                else
                 {
-                    try
+                    //PollServiceHttpRequest req = m_requests.Dequeue(5000);
+                    //m_log.WarnFormat("[YYY]: Dequeued {0}", (req == null ? "null" : req.PollServiceArgs.Type.ToString()));
+
+                    if (req != null)
                     {
-                        if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
+                        try
                         {
-                            Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id);
+                            if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
+                            {
+                                Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id);
 
-                            if (responsedata == null)
-                                continue;
+                                if (responsedata == null)
+                                    continue;
 
-                            if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LongPoll) // This is the event queue
-                            {
-                                try
-                                {
-                                    req.DoHTTPGruntWork(m_server, responsedata);
-                                }
-                                catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream
-                                {
-                                    // Ignore it, no need to reply
-                                }
-                            }
-                            else
-                            {
-                                m_threadPool.QueueWorkItem(x =>
+                                if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LongPoll) // This is the event queue
                                 {
                                     try
                                     {
@@ -223,27 +221,41 @@ namespace OpenSim.Framework.Servers.HttpServer
                                     {
                                         // Ignore it, no need to reply
                                     }
+                                }
+                                else
+                                {
+                                    m_threadPool.QueueWorkItem(x =>
+                                    {
+                                        try
+                                        {
+                                            req.DoHTTPGruntWork(m_server, responsedata);
+                                        }
+                                        catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream
+                                        {
+                                            // Ignore it, no need to reply
+                                        }
 
-                                    return null;
-                                }, null);
-                            }
-                        }
-                        else
-                        {
-                            if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
-                            {
-                                req.DoHTTPGruntWork(
-                                    m_server, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
+                                        return null;
+                                    }, null);
+                                }
                             }
                             else
                             {
-                                ReQueueEvent(req);
+                                if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
+                                {
+                                    req.DoHTTPGruntWork(
+                                        m_server, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
+                                }
+                                else
+                                {
+                                    ReQueueEvent(req);
+                                }
                             }
                         }
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.ErrorFormat("Exception in poll service thread: " + e.ToString());
+                        catch (Exception e)
+                        {
+                            m_log.ErrorFormat("Exception in poll service thread: " + e.ToString());
+                        }
                     }
                 }
             }
-- 
cgit v1.1


From 5c54eb30eddf5ff17769eaa11ab9c5a9ac79caa3 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 17 Jul 2013 15:02:54 -0700
Subject: Revert "This is a completely unreasonable thing to do, effectively
 defying the purpose of BlockingQueues. Trying this, to see the effect on
 CPU."

This reverts commit 5232ab0496eb4fe6903a0fd328974ac69df29ad8.
---
 .../HttpServer/PollServiceRequestManager.cs        | 92 ++++++++++------------
 1 file changed, 40 insertions(+), 52 deletions(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index b8f5743..bad28e4 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         private readonly BaseHttpServer m_server;
 
-        private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>();
+        private DoubleQueue<PollServiceHttpRequest> m_requests = new DoubleQueue<PollServiceHttpRequest>();
         private static Queue<PollServiceHttpRequest> m_longPollRequests = new Queue<PollServiceHttpRequest>();
 
         private uint m_WorkerThreadCount = 0;
@@ -163,7 +163,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     m_requests.Enqueue(m_longPollRequests.Dequeue());
             }
 
-            while (m_requests.Count() > 0)
+            while (m_requests.Count > 0)
             {
                 try
                 {
@@ -185,33 +185,35 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             while (m_running)
             {
-                Watchdog.UpdateThread();
+                PollServiceHttpRequest req = m_requests.Dequeue(5000);
+                //m_log.WarnFormat("[YYY]: Dequeued {0}", (req == null ? "null" : req.PollServiceArgs.Type.ToString()));
 
-                PollServiceHttpRequest req = null;
-                lock (m_requests)
-                {
-                    if (m_requests.Count() > 0)
-                        req = m_requests.Dequeue();
-                }
-                if (req == null)
-                    Thread.Sleep(100);
-                else
+                Watchdog.UpdateThread();
+                if (req != null)
                 {
-                    //PollServiceHttpRequest req = m_requests.Dequeue(5000);
-                    //m_log.WarnFormat("[YYY]: Dequeued {0}", (req == null ? "null" : req.PollServiceArgs.Type.ToString()));
-
-                    if (req != null)
+                    try
                     {
-                        try
+                        if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
                         {
-                            if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
-                            {
-                                Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id);
+                            Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id);
 
-                                if (responsedata == null)
-                                    continue;
+                            if (responsedata == null)
+                                continue;
 
-                                if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LongPoll) // This is the event queue
+                            if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LongPoll) // This is the event queue
+                            {
+                                try
+                                {
+                                    req.DoHTTPGruntWork(m_server, responsedata);
+                                }
+                                catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream
+                                {
+                                    // Ignore it, no need to reply
+                                }
+                            }
+                            else
+                            {
+                                m_threadPool.QueueWorkItem(x =>
                                 {
                                     try
                                     {
@@ -221,41 +223,27 @@ namespace OpenSim.Framework.Servers.HttpServer
                                     {
                                         // Ignore it, no need to reply
                                     }
-                                }
-                                else
-                                {
-                                    m_threadPool.QueueWorkItem(x =>
-                                    {
-                                        try
-                                        {
-                                            req.DoHTTPGruntWork(m_server, responsedata);
-                                        }
-                                        catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream
-                                        {
-                                            // Ignore it, no need to reply
-                                        }
 
-                                        return null;
-                                    }, null);
-                                }
+                                    return null;
+                                }, null);
+                            }
+                        }
+                        else
+                        {
+                            if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
+                            {
+                                req.DoHTTPGruntWork(
+                                    m_server, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
                             }
                             else
                             {
-                                if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
-                                {
-                                    req.DoHTTPGruntWork(
-                                        m_server, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
-                                }
-                                else
-                                {
-                                    ReQueueEvent(req);
-                                }
+                                ReQueueEvent(req);
                             }
                         }
-                        catch (Exception e)
-                        {
-                            m_log.ErrorFormat("Exception in poll service thread: " + e.ToString());
-                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat("Exception in poll service thread: " + e.ToString());
                     }
                 }
             }
-- 
cgit v1.1


From 519dba9a69a02980e09268671c030017001a2cd4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 17 Jul 2013 15:03:16 -0700
Subject: Revert "Now trying DoubleQueue instead of BlockingQueue for the
 PollServiceRequestManager."

This reverts commit 5f95f4d78e8c7d17b8ba866907156fe6d4444c04.
---
 OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index bad28e4..c50df5a 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         private readonly BaseHttpServer m_server;
 
-        private DoubleQueue<PollServiceHttpRequest> m_requests = new DoubleQueue<PollServiceHttpRequest>();
+        private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>();
         private static Queue<PollServiceHttpRequest> m_longPollRequests = new Queue<PollServiceHttpRequest>();
 
         private uint m_WorkerThreadCount = 0;
@@ -163,7 +163,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     m_requests.Enqueue(m_longPollRequests.Dequeue());
             }
 
-            while (m_requests.Count > 0)
+            while (m_requests.Count() > 0)
             {
                 try
                 {
-- 
cgit v1.1


From 52dc7b2a96a28798d55d07d79d003ce5e3d35216 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 17 Jul 2013 15:03:40 -0700
Subject: Revert "I confuse myself. Let's try this variable name instead."

This reverts commit 1d3deda10cf85abd68a5f904d6698ae597a67cc0.
---
 OpenSim/Framework/BlockingQueue.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index 3e90fac..fb74a24 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -76,10 +76,10 @@ namespace OpenSim.Framework
         {
             lock (m_queueSync)
             {
-                bool success = true;
-                while (m_queue.Count < 1 && m_pqueue.Count < 1 && success)
+                bool timedout = false;
+                while (m_queue.Count < 1 && m_pqueue.Count < 1 && !timedout)
                 {
-                    success = Monitor.Wait(m_queueSync, msTimeout);
+                    timedout = Monitor.Wait(m_queueSync, msTimeout);
                 }
 
                 if (m_pqueue.Count > 0)
-- 
cgit v1.1


From 5495df74436d6c0039a1500d979a964b003abfdf Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 17 Jul 2013 15:04:12 -0700
Subject: Revert "Do the same trick that dahlia did for Dequeue(timeout)"

This reverts commit af792bc7f2504e9ccf1c8ae7568919785dc397c9.
---
 OpenSim/Framework/BlockingQueue.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index fb74a24..aef1192 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -76,10 +76,9 @@ namespace OpenSim.Framework
         {
             lock (m_queueSync)
             {
-                bool timedout = false;
-                while (m_queue.Count < 1 && m_pqueue.Count < 1 && !timedout)
+                if (m_queue.Count < 1 && m_pqueue.Count < 1)
                 {
-                    timedout = Monitor.Wait(m_queueSync, msTimeout);
+                    Monitor.Wait(m_queueSync, msTimeout);
                 }
 
                 if (m_pqueue.Count > 0)
-- 
cgit v1.1


From 71278919575b0e0222cdbe3c0cefa5919f9a75bc Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 17 Jul 2013 15:04:27 -0700
Subject: Revert "Putting the requests back in the queue while testing for
 count >0 is not the smartest move..."

This reverts commit f4317dc26d670c853d0ea64b401b00f718f09474.
---
 .../Framework/Servers/HttpServer/PollServiceRequestManager.cs  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index c50df5a..4cb551c 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -126,22 +126,18 @@ namespace OpenSim.Framework.Servers.HttpServer
                 Thread.Sleep(1000); 
                 Watchdog.UpdateThread();
 
-                List<PollServiceHttpRequest> not_ready = new List<PollServiceHttpRequest>();
+                PollServiceHttpRequest req;
                 lock (m_longPollRequests)
                 {
                     while (m_longPollRequests.Count > 0 && m_running)
                     {
-                        PollServiceHttpRequest req = m_longPollRequests.Dequeue();
+                        req = m_longPollRequests.Dequeue();
                         if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id) || // there are events in this EQ
                             (Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms) // no events, but timeout
                             m_requests.Enqueue(req);
                         else
-                            not_ready.Add(req);
+                            m_longPollRequests.Enqueue(req);
                     }
-
-                    foreach (PollServiceHttpRequest req in not_ready)
-                        m_longPollRequests.Enqueue(req);
-
                 }
             }
         }
-- 
cgit v1.1


From fda91d93dad1fa6f901e8db5829aa8b70477c97e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 17 Jul 2013 15:05:16 -0700
Subject: Revert "Didn't mean to commit this change in BlockingQueue.cs"

This reverts commit 0f5b616fb0ebf9207b3cc81771622ed1290ea7d6.
---
 OpenSim/Framework/BlockingQueue.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index aef1192..e607e64 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -76,7 +76,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, msTimeout);
                 }
-- 
cgit v1.1


From f64f07e7c5b115d4005462d976fb60727c6d1cd1 Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Wed, 17 Jul 2013 14:55:48 -0700
Subject: command line kick user now uses exact name match instead of substring
 search to avoid kicking the wrong user or multiple wrong users.

---
 OpenSim/Region/Application/OpenSim.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 6ff7f01..b071df8 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -423,8 +423,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(
@@ -438,6 +438,7 @@ namespace OpenSim
                         presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n");
 
                     presence.Scene.IncomingCloseAgent(presence.UUID, force);
+                    break;
                 }
             }
 
-- 
cgit v1.1


From fa2370b32ee57a07f27501152c3c705a883b13d8 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 17 Jul 2013 15:05:36 -0700
Subject: Revert "Cleared up much confusion in PollServiceRequestManager.
 Here's the history:"

This reverts commit e46459ef21e1ee5ceaeca70365a7c881d33b09ce.
---
 OpenSim/Framework/BlockingQueue.cs                 |  2 +-
 .../Servers/HttpServer/PollServiceEventArgs.cs     |  4 +-
 .../HttpServer/PollServiceRequestManager.cs        | 79 +++++++++++++---------
 .../Linden/Caps/EventQueue/EventQueueGetModule.cs  |  8 +--
 4 files changed, 52 insertions(+), 41 deletions(-)

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index e607e64..aef1192 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Framework
         {
             lock (m_queueSync)
             {
-                while (m_queue.Count < 1 && m_pqueue.Count < 1)
+                if (m_queue.Count < 1 && m_pqueue.Count < 1)
                 {
                     Monitor.Wait(m_queueSync, msTimeout);
                 }
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index 9477100..020bfd5 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public enum EventType : int
         {
-            LongPoll = 0,
+            Normal = 0,
             LslHttp = 1,
             Inventory = 2
         }
@@ -80,7 +80,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             NoEvents = pNoEvents;
             Id = pId;
             TimeOutms = pTimeOutms;
-            Type = EventType.LongPoll;
+            Type = EventType.Normal;
         }
     }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 4cb551c..1b9010a 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -47,11 +47,12 @@ namespace OpenSim.Framework.Servers.HttpServer
         private readonly BaseHttpServer m_server;
 
         private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>();
-        private static Queue<PollServiceHttpRequest> m_longPollRequests = new Queue<PollServiceHttpRequest>();
+        private static Queue<PollServiceHttpRequest> m_slowRequests = new Queue<PollServiceHttpRequest>();
+        private static Queue<PollServiceHttpRequest> m_retryRequests = new Queue<PollServiceHttpRequest>();
 
         private uint m_WorkerThreadCount = 0;
         private Thread[] m_workerThreads;
-        private Thread m_longPollThread;
+        private Thread m_retrysThread;
 
         private bool m_running = true;
         private int slowCount = 0;
@@ -83,9 +84,9 @@ namespace OpenSim.Framework.Servers.HttpServer
                         int.MaxValue);
             }
 
-            m_longPollThread = Watchdog.StartThread(
-                this.CheckLongPollThreads,
-                string.Format("LongPollServiceWatcherThread:{0}", m_server.Port),
+            m_retrysThread = Watchdog.StartThread(
+                this.CheckRetries,
+                string.Format("PollServiceWatcherThread:{0}", m_server.Port),
                 ThreadPriority.Normal,
                 false,
                 true,
@@ -96,47 +97,48 @@ namespace OpenSim.Framework.Servers.HttpServer
         private void ReQueueEvent(PollServiceHttpRequest req)
         {
             if (m_running)
-                m_requests.Enqueue(req);
+            {
+                lock (m_retryRequests)
+                    m_retryRequests.Enqueue(req);
+            }
         }
 
         public void Enqueue(PollServiceHttpRequest req)
         {
             if (m_running)
             {
-                if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LongPoll)
+                if (req.PollServiceArgs.Type != PollServiceEventArgs.EventType.Normal)
                 {
-                    lock (m_longPollRequests)
-                        m_longPollRequests.Enqueue(req);
+                    m_requests.Enqueue(req);
                 }
                 else
-                    m_requests.Enqueue(req);
+                {
+                    lock (m_slowRequests)
+                        m_slowRequests.Enqueue(req);
+                }
             }
         }
 
-        private void CheckLongPollThreads()
+        private void CheckRetries()
         {
-            // The only purpose of this thread is to check the EQs for events.
-            // If there are events, that thread will be placed in the "ready-to-serve" queue, m_requests.
-            // If there are no events, that thread will be back to its "waiting" queue, m_longPollRequests.
-            // All other types of tasks (Inventory handlers) don't have the long-poll nature,
-            // so if they aren't ready to be served by a worker thread (no events), they are placed 
-            // directly back in the "ready-to-serve" queue by the worker thread.
             while (m_running)
             {
-                Thread.Sleep(1000); 
+                Thread.Sleep(100); // let the world move  .. back to faster rate
                 Watchdog.UpdateThread();
-
-                PollServiceHttpRequest req;
-                lock (m_longPollRequests)
+                lock (m_retryRequests)
+                {
+                    while (m_retryRequests.Count > 0 && m_running)
+                        m_requests.Enqueue(m_retryRequests.Dequeue());
+                }
+                slowCount++;
+                if (slowCount >= 10)
                 {
-                    while (m_longPollRequests.Count > 0 && m_running)
+                    slowCount = 0;
+
+                    lock (m_slowRequests)
                     {
-                        req = m_longPollRequests.Dequeue();
-                        if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id) || // there are events in this EQ
-                            (Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms) // no events, but timeout
-                            m_requests.Enqueue(req);
-                        else
-                            m_longPollRequests.Enqueue(req);
+                        while (m_slowRequests.Count > 0 && m_running)
+                            m_requests.Enqueue(m_slowRequests.Dequeue());
                     }
                 }
             }
@@ -151,12 +153,24 @@ namespace OpenSim.Framework.Servers.HttpServer
             foreach (Thread t in m_workerThreads)
                 Watchdog.AbortThread(t.ManagedThreadId);
 
+            try
+            {
+                foreach (PollServiceHttpRequest req in m_retryRequests)
+                {
+                   req.DoHTTPGruntWork(m_server, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
+                }
+            }
+            catch
+            {
+            }
+
             PollServiceHttpRequest wreq;
+            m_retryRequests.Clear();
 
-            lock (m_longPollRequests)
+            lock (m_slowRequests)
             {
-                while (m_longPollRequests.Count > 0 && m_running)
-                    m_requests.Enqueue(m_longPollRequests.Dequeue());
+                while (m_slowRequests.Count > 0 && m_running)
+                    m_requests.Enqueue(m_slowRequests.Dequeue());
             }
 
             while (m_requests.Count() > 0)
@@ -182,7 +196,6 @@ namespace OpenSim.Framework.Servers.HttpServer
             while (m_running)
             {
                 PollServiceHttpRequest req = m_requests.Dequeue(5000);
-                //m_log.WarnFormat("[YYY]: Dequeued {0}", (req == null ? "null" : req.PollServiceArgs.Type.ToString()));
 
                 Watchdog.UpdateThread();
                 if (req != null)
@@ -196,7 +209,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                             if (responsedata == null)
                                 continue;
 
-                            if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LongPoll) // This is the event queue
+                            if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.Normal) // This is the event queue
                             {
                                 try
                                 {
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index f0445ff..1835a72 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -364,7 +364,8 @@ namespace OpenSim.Region.ClientStack.Linden
 
             caps.RegisterPollHandler(
                 "EventQueueGet", 
-                new PollServiceEventArgs(null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, agentID, 40000));
+                new PollServiceEventArgs(
+                    null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, agentID, 40000));
 
             Random rnd = new Random(Environment.TickCount);
             lock (m_ids)
@@ -382,10 +383,7 @@ 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;
         }
@@ -408,7 +406,7 @@ namespace OpenSim.Region.ClientStack.Linden
         public Hashtable GetEvents(UUID requestID, UUID pAgentId)
         {
             if (DebugLevel >= 2)
-                m_log.WarnFormat("POLLED FOR EQ MESSAGES BY {0} in {1}", pAgentId, m_scene.RegionInfo.RegionName);
+                m_log.DebugFormat("POLLED FOR EQ MESSAGES BY {0} in {1}", pAgentId, m_scene.RegionInfo.RegionName);
 
             Queue<OSD> queue = TryGetQueue(pAgentId);
             OSD element;
-- 
cgit v1.1


From 077be8b496f00c82353de02be192d2dcd920d6b3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 18 Jul 2013 01:23:33 +0100
Subject: Fix what apepars to be a bug in DoubleQueue<T>.Enqueue(Queue<T> q, T
 data) where the q parmater is ignored and everyghig is always placed on
 m_lowQueue.

No actual impact presently since nothing ends up calling EnqueueHigh()
---
 OpenSim/Framework/Util.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 8cfc4d4..a39d860 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -2253,7 +2253,7 @@ namespace OpenSim.Framework
         {
             lock (m_syncRoot)
             {
-                m_lowQueue.Enqueue(data);
+                q.Enqueue(data);
                 m_s.WaitOne(0);
                 m_s.Release();
             }
-- 
cgit v1.1


From 6572847518646f3f46959f613e602efc16210dcf Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Thu, 18 Jul 2013 02:28:07 -0700
Subject: Added MinPoolThreads to ini [Startup] section to control
 SmartThreadPool.

---
 OpenSim/Framework/Util.cs             | 8 +++++---
 OpenSim/Region/Application/OpenSim.cs | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 8cfc4d4..27100e6 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1779,10 +1779,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");
 
@@ -1790,7 +1792,7 @@ namespace OpenSim.Framework
             startInfo.ThreadPoolName = "Util";
             startInfo.IdleTimeout = 2000;
             startInfo.MaxWorkerThreads = maxThreads;
-            startInfo.MinWorkerThreads = 2;
+            startInfo.MinWorkerThreads = minThreads;
 
             m_ThreadPool = new SmartThreadPool(startInfo);
         }
@@ -1865,7 +1867,7 @@ namespace OpenSim.Framework
                     break;
                 case FireAndForgetMethod.SmartThreadPool:
                     if (m_ThreadPool == null)
-                        InitThreadPool(15); 
+                        InitThreadPool(2, 15); 
                     m_ThreadPool.QueueWorkItem((cb, o) => cb(o), realCallback, obj);
                     break;
                 case FireAndForgetMethod.Thread:
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index b071df8..9dcc8da 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);
         }
-- 
cgit v1.1


From 9e35b069a43942285214ff485c8f5ffb53e7c5ec Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 18 Jul 2013 12:23:27 -0700
Subject: Reverting the reverts I did yesterday. cpu-branch has now been
 successfully tested, and I'm merging back those changes, which proved to be
 good. Revert "Revert "Cleared up much confusion in PollServiceRequestManager.
 Here's the history:""

This reverts commit fa2370b32ee57a07f27501152c3c705a883b13d8.
---
 OpenSim/Framework/BlockingQueue.cs                 |  2 +-
 .../Servers/HttpServer/PollServiceEventArgs.cs     |  4 +-
 .../HttpServer/PollServiceRequestManager.cs        | 79 +++++++++-------------
 .../Linden/Caps/EventQueue/EventQueueGetModule.cs  |  8 ++-
 4 files changed, 41 insertions(+), 52 deletions(-)

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index aef1192..e607e64 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -76,7 +76,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, msTimeout);
                 }
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index 020bfd5..9477100 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public enum EventType : int
         {
-            Normal = 0,
+            LongPoll = 0,
             LslHttp = 1,
             Inventory = 2
         }
@@ -80,7 +80,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             NoEvents = pNoEvents;
             Id = pId;
             TimeOutms = pTimeOutms;
-            Type = EventType.Normal;
+            Type = EventType.LongPoll;
         }
     }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 1b9010a..4cb551c 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -47,12 +47,11 @@ namespace OpenSim.Framework.Servers.HttpServer
         private readonly BaseHttpServer m_server;
 
         private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>();
-        private static Queue<PollServiceHttpRequest> m_slowRequests = new Queue<PollServiceHttpRequest>();
-        private static Queue<PollServiceHttpRequest> m_retryRequests = new Queue<PollServiceHttpRequest>();
+        private static Queue<PollServiceHttpRequest> m_longPollRequests = new Queue<PollServiceHttpRequest>();
 
         private uint m_WorkerThreadCount = 0;
         private Thread[] m_workerThreads;
-        private Thread m_retrysThread;
+        private Thread m_longPollThread;
 
         private bool m_running = true;
         private int slowCount = 0;
@@ -84,9 +83,9 @@ namespace OpenSim.Framework.Servers.HttpServer
                         int.MaxValue);
             }
 
-            m_retrysThread = Watchdog.StartThread(
-                this.CheckRetries,
-                string.Format("PollServiceWatcherThread:{0}", m_server.Port),
+            m_longPollThread = Watchdog.StartThread(
+                this.CheckLongPollThreads,
+                string.Format("LongPollServiceWatcherThread:{0}", m_server.Port),
                 ThreadPriority.Normal,
                 false,
                 true,
@@ -97,48 +96,47 @@ namespace OpenSim.Framework.Servers.HttpServer
         private void ReQueueEvent(PollServiceHttpRequest req)
         {
             if (m_running)
-            {
-                lock (m_retryRequests)
-                    m_retryRequests.Enqueue(req);
-            }
+                m_requests.Enqueue(req);
         }
 
         public void Enqueue(PollServiceHttpRequest req)
         {
             if (m_running)
             {
-                if (req.PollServiceArgs.Type != PollServiceEventArgs.EventType.Normal)
+                if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LongPoll)
                 {
-                    m_requests.Enqueue(req);
+                    lock (m_longPollRequests)
+                        m_longPollRequests.Enqueue(req);
                 }
                 else
-                {
-                    lock (m_slowRequests)
-                        m_slowRequests.Enqueue(req);
-                }
+                    m_requests.Enqueue(req);
             }
         }
 
-        private void CheckRetries()
+        private void CheckLongPollThreads()
         {
+            // The only purpose of this thread is to check the EQs for events.
+            // If there are events, that thread will be placed in the "ready-to-serve" queue, m_requests.
+            // If there are no events, that thread will be back to its "waiting" queue, m_longPollRequests.
+            // All other types of tasks (Inventory handlers) don't have the long-poll nature,
+            // so if they aren't ready to be served by a worker thread (no events), they are placed 
+            // directly back in the "ready-to-serve" queue by the worker thread.
             while (m_running)
             {
-                Thread.Sleep(100); // let the world move  .. back to faster rate
+                Thread.Sleep(1000); 
                 Watchdog.UpdateThread();
-                lock (m_retryRequests)
-                {
-                    while (m_retryRequests.Count > 0 && m_running)
-                        m_requests.Enqueue(m_retryRequests.Dequeue());
-                }
-                slowCount++;
-                if (slowCount >= 10)
-                {
-                    slowCount = 0;
 
-                    lock (m_slowRequests)
+                PollServiceHttpRequest req;
+                lock (m_longPollRequests)
+                {
+                    while (m_longPollRequests.Count > 0 && m_running)
                     {
-                        while (m_slowRequests.Count > 0 && m_running)
-                            m_requests.Enqueue(m_slowRequests.Dequeue());
+                        req = m_longPollRequests.Dequeue();
+                        if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id) || // there are events in this EQ
+                            (Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms) // no events, but timeout
+                            m_requests.Enqueue(req);
+                        else
+                            m_longPollRequests.Enqueue(req);
                     }
                 }
             }
@@ -153,24 +151,12 @@ namespace OpenSim.Framework.Servers.HttpServer
             foreach (Thread t in m_workerThreads)
                 Watchdog.AbortThread(t.ManagedThreadId);
 
-            try
-            {
-                foreach (PollServiceHttpRequest req in m_retryRequests)
-                {
-                   req.DoHTTPGruntWork(m_server, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
-                }
-            }
-            catch
-            {
-            }
-
             PollServiceHttpRequest wreq;
-            m_retryRequests.Clear();
 
-            lock (m_slowRequests)
+            lock (m_longPollRequests)
             {
-                while (m_slowRequests.Count > 0 && m_running)
-                    m_requests.Enqueue(m_slowRequests.Dequeue());
+                while (m_longPollRequests.Count > 0 && m_running)
+                    m_requests.Enqueue(m_longPollRequests.Dequeue());
             }
 
             while (m_requests.Count() > 0)
@@ -196,6 +182,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             while (m_running)
             {
                 PollServiceHttpRequest req = m_requests.Dequeue(5000);
+                //m_log.WarnFormat("[YYY]: Dequeued {0}", (req == null ? "null" : req.PollServiceArgs.Type.ToString()));
 
                 Watchdog.UpdateThread();
                 if (req != null)
@@ -209,7 +196,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/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 1835a72..f0445ff 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -364,8 +364,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
             caps.RegisterPollHandler(
                 "EventQueueGet", 
-                new PollServiceEventArgs(
-                    null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, agentID, 40000));
+                new PollServiceEventArgs(null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, agentID, 40000));
 
             Random rnd = new Random(Environment.TickCount);
             lock (m_ids)
@@ -383,7 +382,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;
         }
@@ -406,7 +408,7 @@ namespace OpenSim.Region.ClientStack.Linden
         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.RegionInfo.RegionName);
 
             Queue<OSD> queue = TryGetQueue(pAgentId);
             OSD element;
-- 
cgit v1.1


From ad198a714ca4a659110b1aea2e7bb5dea34a7d13 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 18 Jul 2013 12:24:43 -0700
Subject: Revert "Revert "Didn't mean to commit this change in
 BlockingQueue.cs""

This reverts commit fda91d93dad1fa6f901e8db5829aa8b70477c97e.
---
 OpenSim/Framework/BlockingQueue.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index e607e64..aef1192 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Framework
         {
             lock (m_queueSync)
             {
-                while (m_queue.Count < 1 && m_pqueue.Count < 1)
+                if (m_queue.Count < 1 && m_pqueue.Count < 1)
                 {
                     Monitor.Wait(m_queueSync, msTimeout);
                 }
-- 
cgit v1.1


From 552b85d33d4dc465d84fccb0c6e14c2f45213716 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 18 Jul 2013 12:25:04 -0700
Subject: Revert "Revert "Putting the requests back in the queue while testing
 for count >0 is not the smartest move...""

This reverts commit 71278919575b0e0222cdbe3c0cefa5919f9a75bc.
---
 .../Framework/Servers/HttpServer/PollServiceRequestManager.cs  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 4cb551c..c50df5a 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -126,18 +126,22 @@ namespace OpenSim.Framework.Servers.HttpServer
                 Thread.Sleep(1000); 
                 Watchdog.UpdateThread();
 
-                PollServiceHttpRequest req;
+                List<PollServiceHttpRequest> not_ready = new List<PollServiceHttpRequest>();
                 lock (m_longPollRequests)
                 {
                     while (m_longPollRequests.Count > 0 && m_running)
                     {
-                        req = m_longPollRequests.Dequeue();
+                        PollServiceHttpRequest req = m_longPollRequests.Dequeue();
                         if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id) || // there are events in this EQ
                             (Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms) // no events, but timeout
                             m_requests.Enqueue(req);
                         else
-                            m_longPollRequests.Enqueue(req);
+                            not_ready.Add(req);
                     }
+
+                    foreach (PollServiceHttpRequest req in not_ready)
+                        m_longPollRequests.Enqueue(req);
+
                 }
             }
         }
-- 
cgit v1.1


From a22a4db5cec02637b7653870d09b69c810d7dfe9 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 18 Jul 2013 12:25:22 -0700
Subject: Revert "Revert "Do the same trick that dahlia did for
 Dequeue(timeout)""

This reverts commit 5495df74436d6c0039a1500d979a964b003abfdf.
---
 OpenSim/Framework/BlockingQueue.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index aef1192..fb74a24 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -76,9 +76,10 @@ namespace OpenSim.Framework
         {
             lock (m_queueSync)
             {
-                if (m_queue.Count < 1 && m_pqueue.Count < 1)
+                bool timedout = false;
+                while (m_queue.Count < 1 && m_pqueue.Count < 1 && !timedout)
                 {
-                    Monitor.Wait(m_queueSync, msTimeout);
+                    timedout = Monitor.Wait(m_queueSync, msTimeout);
                 }
 
                 if (m_pqueue.Count > 0)
-- 
cgit v1.1


From 71b1511db5c697a2748c87adafe94db8ce408a8d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 18 Jul 2013 12:25:47 -0700
Subject: Revert "Revert "I confuse myself. Let's try this variable name
 instead.""

This reverts commit 52dc7b2a96a28798d55d07d79d003ce5e3d35216.
---
 OpenSim/Framework/BlockingQueue.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index fb74a24..3e90fac 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -76,10 +76,10 @@ namespace OpenSim.Framework
         {
             lock (m_queueSync)
             {
-                bool timedout = false;
-                while (m_queue.Count < 1 && m_pqueue.Count < 1 && !timedout)
+                bool success = true;
+                while (m_queue.Count < 1 && m_pqueue.Count < 1 && success)
                 {
-                    timedout = Monitor.Wait(m_queueSync, msTimeout);
+                    success = Monitor.Wait(m_queueSync, msTimeout);
                 }
 
                 if (m_pqueue.Count > 0)
-- 
cgit v1.1


From d9d995914c5fba00d4ccaf66b899384c8ea3d5eb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 18 Jul 2013 01:17:46 +0100
Subject: try Hacking in an AutoResetEvent to control the outgoing UDP loop
 instead of a continuous loop with sleeps.

Does appear to have a cpu impact but may need further tweaking
---
 .../Region/ClientStack/Linden/UDP/LLClientView.cs    | 20 ++++++++++++++++++++
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 10 ++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 79c80a7..7229d7c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -3776,6 +3776,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>>();
@@ -3788,6 +3799,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)
             {
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 85270a6..54cafb2 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -806,8 +806,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
 
             PacketPool.Instance.ReturnPacket(packet);
+            m_dataPresentEvent.Set();
+
         }
 
+        private AutoResetEvent m_dataPresentEvent = new AutoResetEvent(false);
+
         /// <summary>
         /// Start the process of sending a packet to the client.
         /// </summary>
@@ -1658,6 +1662,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // Action generic every round
             Action<IClientAPI> clientPacketHandler = ClientOutgoingPacketHandler;
 
+//            while (true)
             while (base.IsRunningOutbound)
             {
                 try
@@ -1718,8 +1723,9 @@ 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);
+                    //if (!m_packetSent)
+                    //    Thread.Sleep((int)TickCountResolution);
+                    m_dataPresentEvent.WaitOne(100);
 
                     Watchdog.UpdateThread();
                 }
-- 
cgit v1.1


From b5062ae7ee4067158f255a0d62fb87b8eaf9d1d6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 18 Jul 2013 13:30:04 -0700
Subject: Changed the timoeut of EQ 502s (no events) to 50 secs. The viewer
 post requests timeout in 60 secs. There's plenty of room for improvement in
 handling the EQs. Some other time...

---
 .../Framework/Servers/HttpServer/PollServiceRequestManager.cs |  2 +-
 .../ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index c50df5a..e811079 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -118,7 +118,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             // The only purpose of this thread is to check the EQs for events.
             // If there are events, that thread will be placed in the "ready-to-serve" queue, m_requests.
             // If there are no events, that thread will be back to its "waiting" queue, m_longPollRequests.
-            // All other types of tasks (Inventory handlers) don't have the long-poll nature,
+            // All other types of tasks (Inventory handlers, http-in, etc) don't have the long-poll nature,
             // so if they aren't ready to be served by a worker thread (no events), they are placed 
             // directly back in the "ready-to-serve" queue by the worker thread.
             while (m_running)
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index f0445ff..c5e28ad 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>();
@@ -363,8 +370,8 @@ namespace OpenSim.Region.ClientStack.Linden
             }
 
             caps.RegisterPollHandler(
-                "EventQueueGet", 
-                new PollServiceEventArgs(null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, agentID, 40000));
+                "EventQueueGet",
+                new PollServiceEventArgs(null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, agentID, SERVER_EQ_TIME_NO_EVENTS));
 
             Random rnd = new Random(Environment.TickCount);
             lock (m_ids)
-- 
cgit v1.1


From edef7472d1060435334d7803728517d559a717e7 Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Thu, 18 Jul 2013 13:33:50 -0700
Subject: Enable storing of environment settings in NullSimulationData

---
 OpenSim/Data/Null/NullSimulationData.cs | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs
index 4979cf6..d11ad72 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
 
-- 
cgit v1.1


From 1d65b0d80296a672c8023293aee7d0a01bad4066 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 18 Jul 2013 19:09:55 -0700
Subject: BulletSim: add position resetting for stationary avatars so they
 don't move around when standing on a stationary object. Create proper linkage
 between BSCharacter and its actor by generating a UpdatedProperties event the
 same way BSPrim does.

---
 .../Region/Physics/BulletSPlugin/BSActorAvatarMove.cs   | 17 ++++++++++++++++-
 OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs     |  8 ++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
index 928b350..0f11c4a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -130,6 +130,7 @@ public class BSActorAvatarMove : BSActor
             SetVelocityAndTarget(m_controllingPrim.RawVelocity, m_controllingPrim.TargetVelocity, true /* inTaintTime */);
 
             m_physicsScene.BeforeStep += Mover;
+            m_controllingPrim.OnPreUpdateProperty += Process_OnPreUpdateProperty;
 
             m_walkingUpStairs = 0;
         }
@@ -139,6 +140,7 @@ public class BSActorAvatarMove : BSActor
     {
         if (m_velocityMotor != null)
         {
+            m_controllingPrim.OnPreUpdateProperty -= Process_OnPreUpdateProperty;
             m_physicsScene.BeforeStep -= Mover;
             m_velocityMotor = null;
         }
@@ -197,7 +199,7 @@ public class BSActorAvatarMove : BSActor
             {
                 if (m_controllingPrim.Flying)
                 {
-                    // Flying and not collising and velocity nearly zero.
+                    // Flying and not colliding and velocity nearly zero.
                     m_controllingPrim.ZeroMotion(true /* inTaintTime */);
                 }
             }
@@ -266,6 +268,19 @@ public class BSActorAvatarMove : BSActor
         }
     }
 
+    // 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()
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index c9e3ca0..59e7f5f 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -709,10 +709,10 @@ public sealed class BSCharacter : BSPhysObject
     // the world that things have changed.
     public override void UpdateProperties(EntityProperties entprop)
     {
-        // Don't change position if standing on a stationary object.
-        if (!IsStationary)
-            RawPosition = entprop.Position;
+        // 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
@@ -740,7 +740,7 @@ 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, RawPosition, RawOrientation, RawVelocity, _acceleration, _rotationalVelocity);
-- 
cgit v1.1


From c1705236c7b0fe779c52b56a4531eb036817de89 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 19 Jul 2013 20:24:56 -0700
Subject: Fix HGTravelStore.migrations in SQLite (mantis #6709)

---
 .../Data/SQLite/Resources/HGTravelStore.migrations   | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Data/SQLite/Resources/HGTravelStore.migrations b/OpenSim/Data/SQLite/Resources/HGTravelStore.migrations
index 2e73caa..02612ce 100644
--- a/OpenSim/Data/SQLite/Resources/HGTravelStore.migrations
+++ b/OpenSim/Data/SQLite/Resources/HGTravelStore.migrations
@@ -1,18 +1,18 @@
-:VERSION 1         # -------------------------- 
+:VERSION 2         # -------------------------- 
 
 BEGIN;
 
-CREATE TABLE hg_traveling_data (
+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 DEFAULT CURRENT_TIMESTAMP,
-    PRIMARY KEY  (`SessionID`),
-	KEY (`UserID`)
-) ENGINE=InnoDB;
+    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;
 
-- 
cgit v1.1


From 63c42d66022ea7f1c2805b8f77980af5d4ba1fb4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 18 Jul 2013 21:28:36 +0100
Subject: Do some simple queue empty checks in the main outgoing udp loop
 instead of always performing these on a separate fired thread.

This appears to improve cpu usage since launching a new thread is more expensive than performing a small amount of inline logic.
However, needs testing at scale.
---
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  | 28 +++++++++
 .../ClientStack/Linden/UDP/LLImageManager.cs       |  7 +++
 .../Region/ClientStack/Linden/UDP/LLUDPClient.cs   | 69 ++++++++++++++++------
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs   |  4 +-
 .../ClientStack/Linden/UDP/OpenSimUDPBase.cs       |  6 +-
 5 files changed, 92 insertions(+), 22 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 7229d7c..711a574 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -485,6 +485,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);
@@ -4133,8 +4134,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;
@@ -4160,6 +4167,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();
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 7749446..202cc62 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>
@@ -613,15 +616,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
@@ -631,22 +657,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;
         }
 
         /// <summary>
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 54cafb2..e871ca2 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1662,8 +1662,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // Action generic every round
             Action<IClientAPI> clientPacketHandler = ClientOutgoingPacketHandler;
 
-//            while (true)
-            while (base.IsRunningOutbound)
+            while (true)
+//            while (base.IsRunningOutbound)
             {
                 try
                 {
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
index f143c32..512f60d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
@@ -308,8 +308,8 @@ namespace OpenMetaverse
 
         public void AsyncBeginSend(UDPPacketBuffer buf)
         {
-            if (IsRunningOutbound)
-            {
+//            if (IsRunningOutbound)
+//            {
                 try
                 {
                     m_udpSocket.BeginSendTo(
@@ -323,7 +323,7 @@ namespace OpenMetaverse
                 }
                 catch (SocketException) { }
                 catch (ObjectDisposedException) { }
-            }
+//            }
         }
 
         void AsyncEndSend(IAsyncResult result)
-- 
cgit v1.1


From 98d47ea428cd31b302e33dc6015a889d38bcb267 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 18 Jul 2013 17:17:20 -0700
Subject: Delay the enqueueing of non-longpoll requests for 100ms. No need to
 have these requests actively on the processing queue if it seems they're not
 ready.

---
 .../Servers/HttpServer/PollServiceRequestManager.cs          | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index e811079..727dbe5 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -96,7 +96,17 @@ namespace OpenSim.Framework.Servers.HttpServer
         private void ReQueueEvent(PollServiceHttpRequest req)
         {
             if (m_running)
-                m_requests.Enqueue(req);
+            {
+                // delay the enqueueing for 100ms. There's no need to have the event
+                // actively on the queue
+                Timer t = new Timer(self => {
+                    ((Timer)self).Dispose();
+                    m_requests.Enqueue(req);
+                });
+
+                t.Change(100, Timeout.Infinite);
+
+            }
         }
 
         public void Enqueue(PollServiceHttpRequest req)
-- 
cgit v1.1


From 3a476bf60ce6364f5fd562132625027b73606fea Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 18 Jul 2013 22:42:25 +0100
Subject: Fix up a temporary debugging change from last commit which stopped
 "lludp stop out" from actually doing anything

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index e871ca2..a1085fa 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1662,8 +1662,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // Action generic every round
             Action<IClientAPI> clientPacketHandler = ClientOutgoingPacketHandler;
 
-            while (true)
-//            while (base.IsRunningOutbound)
+            while (base.IsRunningOutbound)
             {
                 try
                 {
-- 
cgit v1.1


From 66048e1a7024f151739fdb0be2309787a76c8403 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 18 Jul 2013 22:54:10 +0100
Subject: minor: provide user feedback in the log for now when udp in/out bound
 threads are started/stopped

---
 OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
index 512f60d..a919141 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
@@ -111,6 +111,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);
@@ -155,6 +157,8 @@ namespace OpenMetaverse
         /// </summary>
         public void StartOutbound()
         {
+            m_log.DebugFormat("[UDPBASE]: Starting outbound UDP loop");
+
             IsRunningOutbound = true;
         }
 
@@ -162,10 +166,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();
             }
@@ -173,6 +175,8 @@ namespace OpenMetaverse
 
         public void StopOutbound()
         {
+            m_log.DebugFormat("[UDPBASE]: Stopping outbound UDP loop");
+
             IsRunningOutbound = false;
         }
 
-- 
cgit v1.1


From 5a2d4d888c02bef984f42eecaec62164a1e58b72 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 18 Jul 2013 23:05:45 +0100
Subject: Hack in console command "debug lludp toggle agentupdate" to allow
 AgentUpdate in packets to be discarded at a very early stage.

Enabling this will stop anybody from moving on a sim, though all other updates should be unaffected.
Appears to make some cpu difference on very basic testing with a static standing avatar (though not all that much).
Need to see the results with much higher av numbers.
---
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs   | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index a1085fa..78d4165 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -572,6 +572,14 @@ 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)
@@ -706,6 +714,19 @@ 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)
@@ -1286,6 +1307,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             LogPacketHeader(true, udpClient.CircuitCode, 0, packet.Type, (ushort)packet.Length);
             #endregion BinaryStats
 
+            if (m_discardAgentUpdates && packet.Type == PacketType.AgentUpdate)
+                return;
+
             #region Ping Check Handling
 
             if (packet.Type == PacketType.StartPingCheck)
-- 
cgit v1.1


From e5c677779b8501c245e5399240ffe3ca2519ec72 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 19 Jul 2013 00:16:09 +0100
Subject: Add measure of number of inbound AgentUpdates that were seen as
 significant to "show client stats" (i.e. sent on for further processing
 instead of being discarded)

Added here since it was the most convenient place
Number is in the last column, "Sig. AgentUpdates" along with percentage of all AgentUpdates
Percentage largely falls over time, most cpu for processing AgentUpdates may be in UDP processing as turning this off even earlier (with "debug lludp toggle agentupdate" results in a big cpu fall
Also tidies up display.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs        |  3 +++
 .../OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs  | 12 +++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 711a574..3145275 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5565,6 +5565,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         #region Packet Handlers
 
+        public int TotalSignificantAgentUpdates { get; private set; }
+
         #region Scene/Avatar
 
         private bool HandleAgentUpdate(IClientAPI sener, Packet packet)
@@ -5614,6 +5616,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (update)
                 {
 //                    m_log.DebugFormat("[LLCLIENTVIEW]: Triggered AgentUpdate for {0}", sener.Name);
+                    TotalSignificantAgentUpdates++;
 
                     m_lastAgentUpdateArgs.AgentID = x.AgentID;
                     m_lastAgentUpdateArgs.BodyRotation = x.BodyRotation;
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index 79509ab..c208b38 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -611,7 +611,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
             //
             if (showParams.Length <= 4)
             {
-                m_log.InfoFormat("[INFO]: {0,-12} {1,20} {2,6} {3,11} {4, 10}", "Region", "Name", "Root", "Time", "Reqs/min");
+                m_log.InfoFormat("[INFO]: {0,-12} {1,-20} {2,-6} {3,-11} {4,-11}     {5,-16}", "Region", "Name", "Root", "Time", "Reqs/min", "Sig. AgentUpdates");
                 foreach (Scene scene in m_scenes.Values)
                 {
                     scene.ForEachClient(
@@ -624,9 +624,15 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                                 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]: {0,-12} {1,20} {2,4} {3,9}min {4,10}", 
+                                m_log.InfoFormat("[INFO]: {0,-12} {1,-20} {2,-6} {3,-11} {4,-11}/min {5,-16}", 
                                     scene.RegionInfo.RegionName, llClient.Name,
-                                    (llClient.SceneAgent.IsChildAgent ? "N" : "Y"), (DateTime.Now - cinfo.StartedTime).Minutes, avg_reqs);
+                                         llClient.SceneAgent.IsChildAgent ? "N" : "Y", 
+                                         (DateTime.Now - cinfo.StartedTime).Minutes,
+                                         avg_reqs, 
+                                         string.Format(
+                                            "{0}, {1}%", 
+                                            llClient.TotalSignificantAgentUpdates, 
+                                            (float)llClient.TotalSignificantAgentUpdates / cinfo.SyncRequests["AgentUpdate"] * 100));
                             }
                         });
                 }
-- 
cgit v1.1


From 61eda1f441092eb12936472de2dc73898e40aa16 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 19 Jul 2013 00:51:13 +0100
Subject: Make the check as to whether any particular inbound AgentUpdate
 packet is significant much earlier in UDP processing (i.e. before we
 pointlessly place such packets on internal queues, etc.)

Appears to have some impact on cpu but needs testing.
---
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  | 170 ++++++++++++++-------
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs   |  17 ++-
 .../Agent/UDP/Linden/LindenUDPInfoModule.cs        |   4 +-
 3 files changed, 131 insertions(+), 60 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 3145275..7e5511f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -357,7 +357,9 @@ 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_lastAgentUpdateArgs = new AgentUpdateArgs();
+
+        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
@@ -5569,80 +5571,136 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         #region Scene/Avatar
 
+        /// <summary>
+        /// This checks the update significance against the last update made.
+        /// </summary>
+        /// <remarks>Can only be called by one thread at a time, and not at the same time as </remarks>
+        /// 
+        /// <returns>/returns>
+        /// <param name='x'></param>
+        public bool CheckAgentUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
+        {
+            bool update = false;
+
+            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.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;
+            }
+
+            if (update)
+            {
+//                    m_log.DebugFormat("[LLCLIENTVIEW]: Triggered AgentUpdate for {0}", sener.Name);
+                TotalSignificantAgentUpdates++;
+
+                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;
+            }
+
+            return update;
+        }
+
         private bool HandleAgentUpdate(IClientAPI sener, Packet packet)
         {
             if (OnAgentUpdate != null)
             {
                 AgentUpdatePacket agentUpdate = (AgentUpdatePacket)packet;
 
-                #region Packet Session and User Check
-                if (agentUpdate.AgentData.SessionID != SessionId || agentUpdate.AgentData.AgentID != AgentId)
-                {
-                    PacketPool.Instance.ReturnPacket(packet);
-                    return false;
-                }
-                #endregion
-
-                bool update = false;
+                // Now done earlier
+//                #region Packet Session and User Check
+//                if (agentUpdate.AgentData.SessionID != SessionId || agentUpdate.AgentData.AgentID != AgentId)
+//                {
+//                    PacketPool.Instance.ReturnPacket(packet);
+//                    return false;
+//                }
+//                #endregion
+//
+//                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.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;
-                }
-
-                if (update)
-                {
-//                    m_log.DebugFormat("[LLCLIENTVIEW]: Triggered AgentUpdate for {0}", sener.Name);
+//
+//                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.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)
+//                       );
+//                }
+//
+//                if (update)
+//                {
+////                    m_log.DebugFormat("[LLCLIENTVIEW]: Triggered AgentUpdate for {0}", sener.Name);
                     TotalSignificantAgentUpdates++;
 
-                    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;
+                    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;
 
                     if (handlerPreAgentUpdate != null)
-                        OnPreAgentUpdate(this, m_lastAgentUpdateArgs);
+                        OnPreAgentUpdate(this, m_thisAgentUpdateArgs);
 
                     if (handlerAgentUpdate != null)
-                        OnAgentUpdate(this, m_lastAgentUpdateArgs);
+                        OnAgentUpdate(this, m_thisAgentUpdateArgs);
 
                     handlerAgentUpdate = null;
                     handlerPreAgentUpdate = null;
-                }
+//                }
             }
 
             PacketPool.Instance.ReturnPacket(packet);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 78d4165..766c2fe 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1307,8 +1307,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             LogPacketHeader(true, udpClient.CircuitCode, 0, packet.Type, (ushort)packet.Length);
             #endregion BinaryStats
 
-            if (m_discardAgentUpdates && packet.Type == PacketType.AgentUpdate)
-                return;
+            if (packet.Type == PacketType.AgentUpdate)
+            {
+                if (m_discardAgentUpdates)
+                    return;
+
+                AgentUpdatePacket agentUpdate = (AgentUpdatePacket)packet;
+
+                if (agentUpdate.AgentData.SessionID != client.SessionId 
+                    || agentUpdate.AgentData.AgentID != client.AgentId
+                    || !((LLClientView)client).CheckAgentUpdateSignificance(agentUpdate.AgentData))
+                {
+                    PacketPool.Instance.ReturnPacket(packet);
+                    return;
+                }
+            }
 
             #region Ping Check Handling
 
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index c208b38..3e6067d 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -611,7 +611,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
             //
             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", "Sig. AgentUpdates");
+                m_log.InfoFormat("[INFO]: {0,-12} {1,-20} {2,-6} {3,-11} {4,-11} {5,-16}", "Region", "Name", "Root", "Time", "Reqs/min", "Sig. AgentUpdates");
                 foreach (Scene scene in m_scenes.Values)
                 {
                     scene.ForEachClient(
@@ -624,7 +624,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                                 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]: {0,-12} {1,-20} {2,-6} {3,-11} {4,-11}/min {5,-16}", 
+                                m_log.InfoFormat("[INFO]: {0,-12} {1,-20} {2,-6} {3,-11} {4,-11} {5,-16}", 
                                     scene.RegionInfo.RegionName, llClient.Name,
                                          llClient.SceneAgent.IsChildAgent ? "N" : "Y", 
                                          (DateTime.Now - cinfo.StartedTime).Minutes,
-- 
cgit v1.1


From 866de5397890edbc0355b1925bf8537b40bab6a3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 19 Jul 2013 00:56:45 +0100
Subject: Remove some pointless code in CheckAgentUpdateSignificance()

---
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  | 50 +++++++++-------------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 7e5511f..c5bb697 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5574,40 +5574,30 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>
         /// This checks the update significance against the last update made.
         /// </summary>
-        /// <remarks>Can only be called by one thread at a time, and not at the same time as </remarks>
-        /// 
+        /// <remarks>Can only be called by one thread at a time</remarks>
         /// <returns>/returns>
         /// <param name='x'></param>
         public bool CheckAgentUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
         {
-            bool update = false;
-
-            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.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;
-            }
+            // These should be ordered from most-likely to
+            // least likely to change. I've made an initial
+            // guess at that.
+            bool 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.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)
+               );
+
 
             if (update)
             {
-- 
cgit v1.1


From 3a6acbcc149fb359c2be2ee2c646c9b15809c01e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 19 Jul 2013 01:00:38 +0100
Subject: furhter shorten CheckAgentUpdateSignificance().  No real perf impact.

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index c5bb697..3d085c3 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5582,8 +5582,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // These should be ordered from most-likely to
             // least likely to change. I've made an initial
             // guess at that.
-            bool update =
-               (
+            if (
                 (x.BodyRotation != m_lastAgentUpdateArgs.BodyRotation) ||
                 (x.CameraAtAxis != m_lastAgentUpdateArgs.CameraAtAxis) ||
                 (x.CameraCenter != m_lastAgentUpdateArgs.CameraCenter) ||
@@ -5596,10 +5595,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 (x.HeadRotation != m_lastAgentUpdateArgs.HeadRotation) ||
                 (x.SessionID != m_lastAgentUpdateArgs.SessionID) ||
                 (x.AgentID != m_lastAgentUpdateArgs.AgentID)
-               );
-
-
-            if (update)
+               )
             {
 //                    m_log.DebugFormat("[LLCLIENTVIEW]: Triggered AgentUpdate for {0}", sener.Name);
                 TotalSignificantAgentUpdates++;
@@ -5616,9 +5612,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 m_lastAgentUpdateArgs.HeadRotation = x.HeadRotation;
                 m_lastAgentUpdateArgs.SessionID = x.SessionID;
                 m_lastAgentUpdateArgs.State = x.State;
+
+                return true;
             }
 
-            return update;
+            return false;
         }
 
         private bool HandleAgentUpdate(IClientAPI sener, Packet packet)
-- 
cgit v1.1


From edafea6ae6dd3617520d989fb2fe748e3f0de1b3 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 19 Jul 2013 13:17:15 -0700
Subject: PollServiceRequestManager: changed the long poll from a Queue to a
 List. No need to dequeue and enqueue items every 1sec.

---
 .../HttpServer/PollServiceRequestManager.cs        | 30 ++++++++++++----------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 727dbe5..309b71f 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         private readonly BaseHttpServer m_server;
 
         private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>();
-        private static Queue<PollServiceHttpRequest> m_longPollRequests = new Queue<PollServiceHttpRequest>();
+        private static List<PollServiceHttpRequest> m_longPollRequests = new List<PollServiceHttpRequest>();
 
         private uint m_WorkerThreadCount = 0;
         private Thread[] m_workerThreads;
@@ -116,7 +116,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LongPoll)
                 {
                     lock (m_longPollRequests)
-                        m_longPollRequests.Enqueue(req);
+                        m_longPollRequests.Add(req);
                 }
                 else
                     m_requests.Enqueue(req);
@@ -139,18 +139,21 @@ namespace OpenSim.Framework.Servers.HttpServer
                 List<PollServiceHttpRequest> not_ready = new List<PollServiceHttpRequest>();
                 lock (m_longPollRequests)
                 {
-                    while (m_longPollRequests.Count > 0 && m_running)
+                    if (m_longPollRequests.Count > 0 && m_running)
                     {
-                        PollServiceHttpRequest req = m_longPollRequests.Dequeue();
-                        if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id) || // there are events in this EQ
+                        List<PollServiceHttpRequest> ready = m_longPollRequests.FindAll(req =>
+                            (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id) || // there are events in this EQ
                             (Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms) // no events, but timeout
-                            m_requests.Enqueue(req);
-                        else
-                            not_ready.Add(req);
-                    }
+                            );
 
-                    foreach (PollServiceHttpRequest req in not_ready)
-                        m_longPollRequests.Enqueue(req);
+                        ready.ForEach(req =>
+                            {
+                                m_log.DebugFormat("[YYY]: --> Enqueuing");
+                                m_requests.Enqueue(req);
+                                m_longPollRequests.Remove(req);
+                            });
+
+                    }
 
                 }
             }
@@ -169,8 +172,8 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             lock (m_longPollRequests)
             {
-                while (m_longPollRequests.Count > 0 && m_running)
-                    m_requests.Enqueue(m_longPollRequests.Dequeue());
+                if (m_longPollRequests.Count > 0 && m_running)
+                    m_longPollRequests.ForEach(req => m_requests.Enqueue(req));
             }
 
             while (m_requests.Count() > 0)
@@ -186,6 +189,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 }
             }
 
+            m_longPollRequests.Clear();
             m_requests.Clear();
         }
 
-- 
cgit v1.1


From 18d5d8f5dd6445e232a571c0e346eb862afcffc3 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 19 Jul 2013 13:19:36 -0700
Subject: Removed verbose debug from previous commit

---
 OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 309b71f..d83daab 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -148,7 +148,6 @@ namespace OpenSim.Framework.Servers.HttpServer
 
                         ready.ForEach(req =>
                             {
-                                m_log.DebugFormat("[YYY]: --> Enqueuing");
                                 m_requests.Enqueue(req);
                                 m_longPollRequests.Remove(req);
                             });
-- 
cgit v1.1


From 174105ad028c5ed318850238d97aa7c3b1d7f207 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 19 Jul 2013 22:11:32 -0700
Subject: Fixed the stats in show client stats. Also left some comments with
 observations about AgentUpdates.

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs  | 18 +++++++++++++-----
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs   |  2 ++
 .../Agent/UDP/Linden/LindenUDPInfoModule.cs            |  8 ++++----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 3d085c3..66a8ea7 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5567,7 +5567,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         #region Packet Handlers
 
-        public int TotalSignificantAgentUpdates { get; private set; }
+        public int TotalAgentUpdates { get; set; }
 
         #region Scene/Avatar
 
@@ -5583,11 +5583,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // least likely to change. I've made an initial
             // guess at that.
             if (
-                (x.BodyRotation != m_lastAgentUpdateArgs.BodyRotation) ||
+                /* These 4 are the worst offenders! We should consider ignoring most of them.
+                 * With Singularity, there is a bug where sometimes the spam on these doesn't stop */
                 (x.CameraAtAxis != m_lastAgentUpdateArgs.CameraAtAxis) ||
                 (x.CameraCenter != m_lastAgentUpdateArgs.CameraCenter) ||
                 (x.CameraLeftAxis != m_lastAgentUpdateArgs.CameraLeftAxis) ||
                 (x.CameraUpAxis != m_lastAgentUpdateArgs.CameraUpAxis) ||
+                 /* */
+                (x.BodyRotation != m_lastAgentUpdateArgs.BodyRotation) ||
                 (x.ControlFlags != m_lastAgentUpdateArgs.ControlFlags) ||
                 (x.Far != m_lastAgentUpdateArgs.Far) ||
                 (x.Flags != m_lastAgentUpdateArgs.Flags) ||
@@ -5597,8 +5600,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 (x.AgentID != m_lastAgentUpdateArgs.AgentID)
                )
             {
-//                    m_log.DebugFormat("[LLCLIENTVIEW]: Triggered AgentUpdate for {0}", sener.Name);
-                TotalSignificantAgentUpdates++;
+                //m_log.DebugFormat("[LLCLIENTVIEW]: Cam1 {0} {1}",
+                //    x.CameraAtAxis, x.CameraCenter);
+                //m_log.DebugFormat("[LLCLIENTVIEW]: Cam2 {0} {1}",
+                //    x.CameraLeftAxis, x.CameraUpAxis);
+                //m_log.DebugFormat("[LLCLIENTVIEW]: Bod {0} {1}",
+                //    x.BodyRotation, x.HeadRotation);
+                //m_log.DebugFormat("[LLCLIENTVIEW]: St {0} {1} {2} {3}",
+                //    x.ControlFlags, x.Flags, x.Far, x.State);
 
                 m_lastAgentUpdateArgs.AgentID = x.AgentID;
                 m_lastAgentUpdateArgs.BodyRotation = x.BodyRotation;
@@ -5662,7 +5671,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //                if (update)
 //                {
 ////                    m_log.DebugFormat("[LLCLIENTVIEW]: Triggered AgentUpdate for {0}", sener.Name);
-                    TotalSignificantAgentUpdates++;
 
                     m_thisAgentUpdateArgs.AgentID = x.AgentID;
                     m_thisAgentUpdateArgs.BodyRotation = x.BodyRotation;
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 766c2fe..32282af 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1312,6 +1312,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (m_discardAgentUpdates)
                     return;
 
+                ((LLClientView)client).TotalAgentUpdates++;
+
                 AgentUpdatePacket agentUpdate = (AgentUpdatePacket)packet;
 
                 if (agentUpdate.AgentData.SessionID != client.SessionId 
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index 3e6067d..15dea17 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -611,7 +611,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
             //
             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", "Sig. AgentUpdates");
+                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(
@@ -630,9 +630,9 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                                          (DateTime.Now - cinfo.StartedTime).Minutes,
                                          avg_reqs, 
                                          string.Format(
-                                            "{0}, {1}%", 
-                                            llClient.TotalSignificantAgentUpdates, 
-                                            (float)llClient.TotalSignificantAgentUpdates / cinfo.SyncRequests["AgentUpdate"] * 100));
+                                            "{0} ({1:0.00}%)", 
+                                            llClient.TotalAgentUpdates, 
+                                            (float)cinfo.SyncRequests["AgentUpdate"] / llClient.TotalAgentUpdates * 100));
                             }
                         });
                 }
-- 
cgit v1.1


From d5a1779465b6d875ebe5822ce6f15df3378b759f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 20 Jul 2013 12:20:35 -0700
Subject: Manage AgentUpdates more sanely: - The existing event to scene has
 been split into 2: OnAgentUpdate and OnAgentCameraUpdate, to better reflect
 the two types of updates that the viewer sends. We can run one without the
 other, which is what happens when the avie is still but the user is camming
 around - Added thresholds (as opposed to equality) to determine whether the
 update is significant or not. I thin these thresholds are ok, but we can play
 with them later - Ignore updates of HeadRotation, which were problematic and
 aren't being used up stream

---
 OpenSim/Framework/IClientAPI.cs                    |   2 +
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  | 214 +++++++++++----------
 OpenSim/Region/Framework/Scenes/ScenePresence.cs   | 110 +++++++----
 .../Server/IRCClientView.cs                        |   1 +
 .../Region/OptionalModules/World/NPC/NPCAvatar.cs  |   1 +
 OpenSim/Tests/Common/Mock/TestClient.cs            |   1 +
 6 files changed, 183 insertions(+), 146 deletions(-)

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 65f8395..f39eb0c 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -825,6 +825,8 @@ namespace OpenSim.Framework
         /// </remarks>
         event UpdateAgent OnAgentUpdate;
 
+        event UpdateAgent OnAgentCameraUpdate;
+
         event AgentRequestSit OnAgentRequestSit;
         event AgentSit OnAgentSit;
         event AvatarPickerRequest OnAvatarPickerRequest;
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 66a8ea7..6c58aac 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -96,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;
@@ -357,9 +358,13 @@ 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 = new AgentUpdateArgs();
-
         private AgentUpdateArgs m_thisAgentUpdateArgs = new AgentUpdateArgs();
+        private float qdelta1;
+        private float qdelta2;
+        private float vdelta1;
+        private float vdelta2;
+        private float vdelta3;
+        private float vdelta4;
 
         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
@@ -5571,57 +5576,75 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         #region Scene/Avatar
 
+        private const float QDELTA = 0.01f;
+        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>
+        /// <returns></returns>
         /// <param name='x'></param>
         public bool CheckAgentUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
         {
-            // These should be ordered from most-likely to
-            // least likely to change. I've made an initial
-            // guess at that.
+            return CheckAgentMovementUpdateSignificance(x) || CheckAgentCameraUpdateSignificance(x);
+        }
+
+        /// <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>
+        public bool CheckAgentMovementUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
+        {
+            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);
+            if (
+                (qdelta1 > QDELTA) ||
+                // Ignoring head rotation altogether, because it's not being used for anything interesting up the stack
+                //(qdelta2 > QDELTA * 10) ||
+                (x.ControlFlags != m_thisAgentUpdateArgs.ControlFlags) ||
+                (x.Far != m_thisAgentUpdateArgs.Far) ||
+                (x.Flags != m_thisAgentUpdateArgs.Flags) ||
+                (x.State != m_thisAgentUpdateArgs.State) 
+               )
+            {
+                //m_log.DebugFormat("[LLCLIENTVIEW]: Bod {0} {1}",
+                //    qdelta1, qdelta2);
+                //m_log.DebugFormat("[LLCLIENTVIEW]: St {0} {1} {2} {3} (Thread {4})",
+                //    x.ControlFlags, x.Flags, x.Far, x.State, Thread.CurrentThread.Name);
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <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>
+        public bool CheckAgentCameraUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
+        {
+            vdelta1 = Vector3.Distance(x.CameraAtAxis, m_thisAgentUpdateArgs.CameraAtAxis);
+            vdelta2 = Vector3.Distance(x.CameraCenter, m_thisAgentUpdateArgs.CameraCenter);
+            vdelta3 = Vector3.Distance(x.CameraLeftAxis, m_thisAgentUpdateArgs.CameraLeftAxis);
+            vdelta4 = Vector3.Distance(x.CameraUpAxis, m_thisAgentUpdateArgs.CameraUpAxis);
             if (
-                /* These 4 are the worst offenders! We should consider ignoring most of them.
+                /* These 4 are the worst offenders! 
                  * With Singularity, there is a bug where sometimes the spam on these doesn't stop */
-                (x.CameraAtAxis != m_lastAgentUpdateArgs.CameraAtAxis) ||
-                (x.CameraCenter != m_lastAgentUpdateArgs.CameraCenter) ||
-                (x.CameraLeftAxis != m_lastAgentUpdateArgs.CameraLeftAxis) ||
-                (x.CameraUpAxis != m_lastAgentUpdateArgs.CameraUpAxis) ||
-                 /* */
-                (x.BodyRotation != m_lastAgentUpdateArgs.BodyRotation) ||
-                (x.ControlFlags != m_lastAgentUpdateArgs.ControlFlags) ||
-                (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)
+                (vdelta1 > VDELTA) ||
+                (vdelta2 > VDELTA) ||
+                (vdelta3 > VDELTA) ||
+                (vdelta4 > VDELTA) 
                )
             {
                 //m_log.DebugFormat("[LLCLIENTVIEW]: Cam1 {0} {1}",
                 //    x.CameraAtAxis, x.CameraCenter);
                 //m_log.DebugFormat("[LLCLIENTVIEW]: Cam2 {0} {1}",
                 //    x.CameraLeftAxis, x.CameraUpAxis);
-                //m_log.DebugFormat("[LLCLIENTVIEW]: Bod {0} {1}",
-                //    x.BodyRotation, x.HeadRotation);
-                //m_log.DebugFormat("[LLCLIENTVIEW]: St {0} {1} {2} {3}",
-                //    x.ControlFlags, x.Flags, x.Far, x.State);
-
-                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;
-
                 return true;
             }
 
@@ -5629,75 +5652,54 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
 
         private bool HandleAgentUpdate(IClientAPI sener, Packet packet)
-        {
-            if (OnAgentUpdate != null)
-            {
-                AgentUpdatePacket agentUpdate = (AgentUpdatePacket)packet;
+        {            
+            // We got here, which means that something in agent update was significant
 
-                // Now done earlier
-//                #region Packet Session and User Check
-//                if (agentUpdate.AgentData.SessionID != SessionId || agentUpdate.AgentData.AgentID != AgentId)
-//                {
-//                    PacketPool.Instance.ReturnPacket(packet);
-//                    return false;
-//                }
-//                #endregion
-//
-//                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.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)
-//                       );
-//                }
-//
-//                if (update)
-//                {
-////                    m_log.DebugFormat("[LLCLIENTVIEW]: Triggered AgentUpdate for {0}", sener.Name);
-
-                    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;
-
-                    if (handlerPreAgentUpdate != null)
-                        OnPreAgentUpdate(this, m_thisAgentUpdateArgs);
-
-                    if (handlerAgentUpdate != null)
-                        OnAgentUpdate(this, m_thisAgentUpdateArgs);
-
-                    handlerAgentUpdate = null;
-                    handlerPreAgentUpdate = null;
-//                }
-            }
+            AgentUpdatePacket agentUpdate = (AgentUpdatePacket)packet;
+            AgentUpdatePacket.AgentDataBlock x = agentUpdate.AgentData;
+
+            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);
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 990ef6e..5543964 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -801,6 +801,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             ControllingClient.OnCompleteMovementToRegion += CompleteMovement;
             ControllingClient.OnAgentUpdate += HandleAgentUpdate;
+            ControllingClient.OnAgentCameraUpdate += HandleAgentCamerasUpdate;
             ControllingClient.OnAgentRequestSit += HandleAgentRequestSit;
             ControllingClient.OnAgentSit += HandleAgentSit;
             ControllingClient.OnSetAlwaysRun += HandleSetAlwaysRun;
@@ -1438,9 +1439,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)
             {
@@ -1448,10 +1449,6 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
             }
 
-            ++m_movementUpdateCount;
-            if (m_movementUpdateCount < 1)
-                m_movementUpdateCount = 1;
-
             #region Sanity Checking
 
             // This is irritating.  Really.
@@ -1482,21 +1479,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 
@@ -1504,12 +1486,6 @@ namespace OpenSim.Region.Framework.Scenes
             // DrawDistance = agentData.Far;
             DrawDistance = Scene.DefaultDrawDistance;
 
-            // Check if Client has camera in 'follow cam' or 'build' mode.
-            Vector3 camdif = (Vector3.One * Rotation - Vector3.One * CameraRotation);
-
-            m_followCamAuto = ((CameraUpAxis.Z > 0.959f && CameraUpAxis.Z < 0.98f)
-               && (Math.Abs(camdif.X) < 0.4f && Math.Abs(camdif.Y) < 0.4f)) ? true : false;
-
             m_mouseLook = (flags & AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0;
             m_leftButtonDown = (flags & AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN) != 0;
 
@@ -1529,17 +1505,6 @@ namespace OpenSim.Region.Framework.Scenes
                 StandUp();
             }
 
-            //m_log.DebugFormat("[FollowCam]: {0}", m_followCamAuto);
-            // Raycast from the avatar's head to the camera to see if there's anything blocking the view
-            if ((m_movementUpdateCount % NumMovementsBetweenRayCast) == 0 && m_scene.PhysicsScene.SupportsRayCast())
-            {
-                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);
-                }
-            }
-
             uint flagsForScripts = (uint)flags;
             flags = RemoveIgnoredControls(flags, IgnoredControls);
 
@@ -1764,9 +1729,74 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             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>
+        public 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>
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 3726191..9b69da3 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -687,6 +687,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;
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 592e4e1..6c38b65 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -258,6 +258,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;
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 2fc3f0b..5d7349a 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -106,6 +106,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;
-- 
cgit v1.1


From 3919c805054e6ce240c72436414ecee18a6c2947 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 20 Jul 2013 13:42:39 -0700
Subject: A couple of small optimizations over the previous commit

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 18 ++++++++++--------
 OpenSim/Region/Framework/Scenes/ScenePresence.cs      |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 6c58aac..2907580 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5587,6 +5587,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name='x'></param>
         public bool CheckAgentUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
         {
+            // Compute these only once, when this function is called from down below
+            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);
+            vdelta1 = Vector3.Distance(x.CameraAtAxis, m_thisAgentUpdateArgs.CameraAtAxis);
+            vdelta2 = Vector3.Distance(x.CameraCenter, m_thisAgentUpdateArgs.CameraCenter);
+            vdelta3 = Vector3.Distance(x.CameraLeftAxis, m_thisAgentUpdateArgs.CameraLeftAxis);
+            vdelta4 = Vector3.Distance(x.CameraUpAxis, m_thisAgentUpdateArgs.CameraUpAxis);
+
             return CheckAgentMovementUpdateSignificance(x) || CheckAgentCameraUpdateSignificance(x);
         }
 
@@ -5596,10 +5604,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <remarks>Can only be called by one thread at a time</remarks>
         /// <returns></returns>
         /// <param name='x'></param>
-        public bool CheckAgentMovementUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
+        private bool CheckAgentMovementUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
         {
-            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);
             if (
                 (qdelta1 > QDELTA) ||
                 // Ignoring head rotation altogether, because it's not being used for anything interesting up the stack
@@ -5626,12 +5632,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <remarks>Can only be called by one thread at a time</remarks>
         /// <returns></returns>
         /// <param name='x'></param>
-        public bool CheckAgentCameraUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
+        private bool CheckAgentCameraUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
         {
-            vdelta1 = Vector3.Distance(x.CameraAtAxis, m_thisAgentUpdateArgs.CameraAtAxis);
-            vdelta2 = Vector3.Distance(x.CameraCenter, m_thisAgentUpdateArgs.CameraCenter);
-            vdelta3 = Vector3.Distance(x.CameraLeftAxis, m_thisAgentUpdateArgs.CameraLeftAxis);
-            vdelta4 = Vector3.Distance(x.CameraUpAxis, m_thisAgentUpdateArgs.CameraUpAxis);
             if (
                 /* These 4 are the worst offenders! 
                  * With Singularity, there is a bug where sometimes the spam on these doesn't stop */
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 5543964..2359f55 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1735,7 +1735,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// This is the event handler for client cameras. If a client is moving, or moving the camera, this event is triggering.
         /// </summary>
-        public void HandleAgentCamerasUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData)
+        private void HandleAgentCamerasUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData)
         {
             //m_log.DebugFormat(
             //    "[SCENE PRESENCE]: In {0} received agent camera update from {1}, flags {2}",
-- 
cgit v1.1


From 032c637c10ee16f5a3b9b690de812701f3badee6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 20 Jul 2013 15:42:01 -0700
Subject: Filter certain viewer effects depending on distance between the
 avatar that is generating the effect and the cameras of the observers. In
 particular, this applies to LookAt (which is really verbose and occurs every
 time users move the mouse) and Beam (which doesn't occur that often, but that
 can be extremely noisy (10.sec) when it happens)

---
 .../Framework/Scenes/Scene.PacketHandlers.cs       | 32 +++++++++++++++++-----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index df43271..998c19e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -390,6 +390,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++)
             {
@@ -401,17 +402,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;
+        }
+
         /// <summary>
         /// Tell the client about the various child items and folders contained in the requested folder.
         /// </summary>
-- 
cgit v1.1


From b5ab0698d6328c90d779c2af29914da840335233 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 20 Jul 2013 17:58:32 -0700
Subject: EDIT BEAMS!!! They had been missing from OpenSim since ever. Thanks
 to lkalif for telling me how to route the information. The viewer effect is
 under the distance filter, so only avatars with cameras < 10m away see the
 beams.

---
 OpenSim/Framework/IClientAPI.cs                    |  2 +-
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  | 27 ++++------------------
 OpenSim/Region/Framework/Scenes/ScenePresence.cs   |  5 +++-
 .../Server/IRCClientView.cs                        |  2 +-
 .../Region/OptionalModules/World/NPC/NPCAvatar.cs  |  2 +-
 OpenSim/Tests/Common/Mock/TestClient.cs            |  2 +-
 6 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index f39eb0c..98358e5 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1476,7 +1476,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/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 2907580..a8759ab 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5016,7 +5016,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 ScenePresence presence = (ScenePresence)entity;
 
-                attachPoint = 0;
+                attachPoint = presence.State;
                 collisionPlane = presence.CollisionPlane;
                 position = presence.OffsetPosition;
                 velocity = presence.Velocity;
@@ -5040,7 +5040,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);
@@ -5068,7 +5068,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;
@@ -12550,7 +12550,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutPacket(dialog, ThrottleOutPacketType.Task);
         }
 
-        public void StopFlying(ISceneEntity p)
+        public void SendAgentTerseUpdate(ISceneEntity p)
         {
             if (p is ScenePresence)
             {
@@ -12564,25 +12564,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 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);
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 2359f55..e06cec8 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1125,7 +1125,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void StopFlying()
         {
-            ControllingClient.StopFlying(this);
+            ControllingClient.SendAgentTerseUpdate(this);
         }
 
         /// <summary>
@@ -1728,6 +1728,9 @@ namespace OpenSim.Region.Framework.Scenes
                 SendControlsToScripts(flagsForScripts);
             }
 
+            if ((State & 0x10) != 0)
+                ControllingClient.SendAgentTerseUpdate(this);
+
             m_scene.EventManager.TriggerOnClientMovement(this);
         }
 
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 9b69da3..23a435d 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1673,7 +1673,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
         {
         }
 
-        public void StopFlying(ISceneEntity presence)
+        public void SendAgentTerseUpdate(ISceneEntity presence)
         {
         }
         
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 6c38b65..9a61702 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -1229,7 +1229,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         {
         }
         
-        public void StopFlying(ISceneEntity presence)
+        public void SendAgentTerseUpdate(ISceneEntity presence)
         {
         }
 
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 5d7349a..f7220d7 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -1256,7 +1256,7 @@ namespace OpenSim.Tests.Common.Mock
         {
         }
 
-        public void StopFlying(ISceneEntity presence)
+        public void SendAgentTerseUpdate(ISceneEntity presence)
         {
         }
 
-- 
cgit v1.1


From 116a449d8945d1d04013860f952841a71df80be7 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 20 Jul 2013 19:20:20 -0700
Subject: The quaternion delta was a bit to high, now that the head rotation is
 out of the equation. (head rotation was the problematic one)

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index a8759ab..021b7c1 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5576,7 +5576,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         #region Scene/Avatar
 
-        private const float QDELTA = 0.01f;
+        private const float QDELTA = 0.000001f;
         private const float VDELTA = 0.01f;
 
         /// <summary>
-- 
cgit v1.1


From 8d18ad2f6f75320dfb605b960f74531c1921b91b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 21 Jul 2013 08:50:52 -0700
Subject: Minor aesthetic change to make things more clear.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index e06cec8..33db88b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1728,7 +1728,8 @@ namespace OpenSim.Region.Framework.Scenes
                 SendControlsToScripts(flagsForScripts);
             }
 
-            if ((State & 0x10) != 0)
+            // 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);
-- 
cgit v1.1


From 99a727600b938383224285d9dad79e2b564cb1fe Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 21 Jul 2013 10:07:35 -0700
Subject: Minor cosmetic changes.

---
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  | 50 ++++++++++------------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 021b7c1..e23e55b 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5595,7 +5595,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             vdelta3 = Vector3.Distance(x.CameraLeftAxis, m_thisAgentUpdateArgs.CameraLeftAxis);
             vdelta4 = Vector3.Distance(x.CameraUpAxis, m_thisAgentUpdateArgs.CameraUpAxis);
 
-            return CheckAgentMovementUpdateSignificance(x) || CheckAgentCameraUpdateSignificance(x);
+            bool significant = CheckAgentMovementUpdateSignificance(x) || CheckAgentCameraUpdateSignificance(x);
+
+            // Emergency debugging
+            //if (significant)
+            //{
+                //m_log.DebugFormat("[LLCLIENTVIEW]: Cam1 {0} {1}",
+                //    x.CameraAtAxis, x.CameraCenter);
+                //m_log.DebugFormat("[LLCLIENTVIEW]: Cam2 {0} {1}",
+                //    x.CameraLeftAxis, x.CameraUpAxis);
+                //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 significant;
+
         }
 
         /// <summary>
@@ -5606,24 +5622,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name='x'></param>
         private bool CheckAgentMovementUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
         {
-            if (
+            return (
                 (qdelta1 > QDELTA) ||
                 // Ignoring head rotation altogether, because it's not being used for anything interesting up the stack
                 //(qdelta2 > QDELTA * 10) ||
                 (x.ControlFlags != m_thisAgentUpdateArgs.ControlFlags) ||
                 (x.Far != m_thisAgentUpdateArgs.Far) ||
                 (x.Flags != m_thisAgentUpdateArgs.Flags) ||
-                (x.State != m_thisAgentUpdateArgs.State) 
-               )
-            {
-                //m_log.DebugFormat("[LLCLIENTVIEW]: Bod {0} {1}",
-                //    qdelta1, qdelta2);
-                //m_log.DebugFormat("[LLCLIENTVIEW]: St {0} {1} {2} {3} (Thread {4})",
-                //    x.ControlFlags, x.Flags, x.Far, x.State, Thread.CurrentThread.Name);
-                return true;
-            }
-
-            return false;
+                (x.State != m_thisAgentUpdateArgs.State)
+               );
         }
 
         /// <summary>
@@ -5634,23 +5641,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name='x'></param>
         private bool CheckAgentCameraUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
         {
-            if (
-                /* These 4 are the worst offenders! 
-                 * With Singularity, there is a bug where sometimes the spam on these doesn't stop */
+            return (
                 (vdelta1 > VDELTA) ||
                 (vdelta2 > VDELTA) ||
                 (vdelta3 > VDELTA) ||
-                (vdelta4 > VDELTA) 
-               )
-            {
-                //m_log.DebugFormat("[LLCLIENTVIEW]: Cam1 {0} {1}",
-                //    x.CameraAtAxis, x.CameraCenter);
-                //m_log.DebugFormat("[LLCLIENTVIEW]: Cam2 {0} {1}",
-                //    x.CameraLeftAxis, x.CameraUpAxis);
-                return true;
-            }
-
-            return false;
+                (vdelta4 > VDELTA)
+               );
         }
 
         private bool HandleAgentUpdate(IClientAPI sener, Packet packet)
-- 
cgit v1.1


From f81e289a1bc28b85d5e05a8549f9796f72d454ac Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 21 Jul 2013 14:34:43 -0700
Subject: Add the Current Outfit folder as an available folder in the
 SuitcaseInventory.

---
 .../HypergridService/HGSuitcaseInventoryService.cs       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index 2567c8f..06c5b89 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -493,6 +493,18 @@ namespace OpenSim.Services.HypergridService
             return null;
         }
 
+        private XInventoryFolder GetCurrentOutfitXFolder(UUID userID)
+        {
+            XInventoryFolder[] folders = m_Database.GetFolders(
+                    new string[] { "agentID", "type" },
+                    new string[] { userID.ToString(), ((int)AssetType.CurrentOutfitFolder).ToString() });
+
+            if (folders.Length == 0)
+                return null;
+
+            return folders[0];
+        }
+
         private XInventoryFolder GetSuitcaseXFolder(UUID principalID)
         {
             // Warp! Root folder for travelers
@@ -531,6 +543,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;
@@ -577,6 +590,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;
-- 
cgit v1.1


From df63bfafefe431faf21ec1c52dbff78977f971e6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 21 Jul 2013 14:39:50 -0700
Subject: Better version of previous commit

---
 OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index 06c5b89..0601ece 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -495,9 +495,13 @@ namespace OpenSim.Services.HypergridService
 
         private XInventoryFolder GetCurrentOutfitXFolder(UUID userID)
         {
+            XInventoryFolder root = GetRootXFolder(userID);
+            if (root == null)
+                return null;
+
             XInventoryFolder[] folders = m_Database.GetFolders(
-                    new string[] { "agentID", "type" },
-                    new string[] { userID.ToString(), ((int)AssetType.CurrentOutfitFolder).ToString() });
+                    new string[] { "agentID", "type", "parentFolderID" },
+                    new string[] { userID.ToString(), ((int)AssetType.CurrentOutfitFolder).ToString(), root.folderID.ToString() });
 
             if (folders.Length == 0)
                 return null;
-- 
cgit v1.1


From 803632f8f32d91bb4aec678d8b45a8430c2703e1 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 9 Jul 2013 16:26:17 -0700
Subject: BulletSim: freshen up the code for constraint based linksets.

---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs |  4 +-
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     |  1 +
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  | 82 ++++++++++++++++------
 3 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 0204967..4c2c1c1 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1029,8 +1029,8 @@ 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},fricFact={6}",
-                        ControllingPrim.LocalID, origVelW, currentVelV, linearMotorCorrectionV,
+            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);
         }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 1d94142..3668456 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -59,6 +59,7 @@ public sealed class BSLinksetCompound : BSLinkset
     {
         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.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index a06a44d..f17d698 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -48,12 +48,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
             m_physicsScene.PostTaintObject("BSLinksetContraints.Refresh", requestor.LocalID, delegate()
                 {
-                    if (HasAnyChildren && IsRoot(requestor))
+                    if (HasAnyChildren)
                         RecomputeLinksetConstraints();
                 });
         }
@@ -67,8 +77,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 +94,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!!
@@ -105,7 +129,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;
     }
@@ -123,7 +147,7 @@ public sealed class BSLinksetConstraints : BSLinkset
             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;
     }
@@ -147,7 +171,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                 PhysicallyUnlinkAChildFromRoot(rootx, childx);
             });
             // See that the linkset parameters are recomputed at the end of the taint time.
-            Refresh(LinksetRoot);
+            ScheduleRebuild(LinksetRoot);
         }
         else
         {
@@ -165,6 +189,7 @@ public sealed class BSLinksetConstraints : BSLinkset
         Refresh(rootPrim);
     }
 
+    // Create a static constraint between the two passed objects
     private BSConstraint BuildConstraint(BSPrimLinkable rootPrim, BSPrimLinkable childPrim)
     {
         // Zero motion for children so they don't interpolate
@@ -281,24 +306,39 @@ 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 (!m_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
-        }
+            foreach (BSPrimLinkable child in m_children)
+            {
+                // 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);
+
+                BSConstraint constrain;
+                if (!m_physicsScene.Constraints.TryGetConstraint(LinksetRoot.PhysBody, child.PhysBody, out constrain))
+                {
+                    // If constraint doesn't exist yet, create it.
+                    constrain = BuildConstraint(LinksetRoot, child);
+                }
+                constrain.RecomputeConstraintVariables(linksetMass);
 
+                // PhysicsScene.PE.DumpConstraint(PhysicsScene.World, constrain.Constraint);    // DEBUG DEBUG
+            }
+        }
+        finally
+        {
+            Rebuilding = false;
+        }
     }
 }
 }
-- 
cgit v1.1


From 13a4a80b3893af13ab748c177b731fed813974ca Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 10 Jul 2013 09:32:26 -0700
Subject: Add experimental stubs for an extension function interface on both
 PhysicsScene and PhysicsActor.

---
 OpenSim/Region/Physics/Manager/PhysicsActor.cs | 6 ++++++
 OpenSim/Region/Physics/Manager/PhysicsScene.cs | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index bd806eb..2500f27 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -313,6 +313,12 @@ namespace OpenSim.Region.Physics.Manager
         public abstract void SubscribeEvents(int ms);
         public abstract void UnSubscribeEvents();
         public abstract bool SubscribedEvents();
+
+        // Extendable interface for new, physics engine specific operations
+        public virtual object Extension(string pFunct, params object[] pParams)
+        {
+            throw new NotImplementedException();
+        }
     }
 
     public class NullPhysicsActor : PhysicsActor
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 290b72e..07a1d36 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;
 
@@ -331,5 +334,11 @@ namespace OpenSim.Region.Physics.Manager
         {
             return false;
         }
+
+        // Extendable interface for new, physics engine specific operations
+        public virtual object Extension(string pFunct, params object[] pParams)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
-- 
cgit v1.1


From b4c3a791aa55390bff071b3fe4bbe70c1d252703 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 11 Jul 2013 14:33:03 -0700
Subject: BulletSim: move collision processing for linksets from BSPrimLinkable
 into the linkset implementation classes. Add HasSomeCollision attribute that
 remembers of any component of    a linkset has a collision. Update vehicle
 code (BSDynamic) to use the HasSomeCollision in place of    IsColliding to
 make constraint based linksets properly notice the ground. Add linkset
 functions to change physical attributes of all the members    of a linkset.

---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 16 ++---
 OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs  | 75 +++++++++++++++++++++-
 .../Region/Physics/BulletSPlugin/BSPhysObject.cs   | 11 ++++
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     |  5 +-
 .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 32 +++++++--
 5 files changed, 121 insertions(+), 18 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 4c2c1c1..1540df1 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1001,7 +1001,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             else if (newVelocityLengthSq < 0.001f)
                 VehicleVelocity = Vector3.Zero;
 
-            VDetailLog("{0},  MoveLinear,done,isColl={1},newVel={2}", ControllingPrim.LocalID, ControllingPrim.IsColliding, VehicleVelocity );
+            VDetailLog("{0},  MoveLinear,done,isColl={1},newVel={2}", ControllingPrim.LocalID, ControllingPrim.HasSomeCollision, VehicleVelocity );
 
         } // end MoveLinear()
 
@@ -1062,7 +1062,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 Vector3 linearDeflectionW = linearDeflectionV * VehicleOrientation;
 
                 // Optionally, if not colliding, don't effect world downward velocity. Let falling things fall.
-                if (BSParam.VehicleLinearDeflectionNotCollidingNoZ && !m_controllingPrim.IsColliding)
+                if (BSParam.VehicleLinearDeflectionNotCollidingNoZ && !m_controllingPrim.HasSomeCollision)
                 {
                     linearDeflectionW.Z = 0f;
                 }
@@ -1222,7 +1222,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);
@@ -1233,12 +1233,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 (!ControllingPrim.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;
@@ -1260,7 +1260,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                     }
                         */
                     VDetailLog("{0},  MoveLinear,limitMotorUp,collide={1},upVel={2},newVel={3}",
-                                    ControllingPrim.LocalID, ControllingPrim.IsColliding, upVelocity, VehicleVelocity);
+                                    ControllingPrim.LocalID, ControllingPrim.HasSomeCollision, upVelocity, VehicleVelocity);
                 }
             }
         }
@@ -1270,14 +1270,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 (ControllingPrim.IsColliding && IsGroundVehicle)
+            if (ControllingPrim.HasSomeCollision && IsGroundVehicle)
                 appliedGravity *= BSParam.VehicleGroundGravityFudge;
 
             VehicleAddForce(appliedGravity);
 
             VDetailLog("{0},  MoveLinear,applyGravity,vehGrav={1},collid={2},fudge={3},mass={4},appliedForce={5}",
                             ControllingPrim.LocalID, m_VehicleGravity,
-                            ControllingPrim.IsColliding, BSParam.VehicleGroundGravityFudge, m_vehicleMass, appliedGravity);
+                            ControllingPrim.HasSomeCollision, BSParam.VehicleGroundGravityFudge, m_vehicleMass, appliedGravity);
         }
 
         // =======================================================================
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index ad8e10f..78c0af7 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -203,6 +203,33 @@ 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);
@@ -251,6 +278,53 @@ public abstract class BSLinkset
     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 ComputeLocalInertia()
+    {
+        ForEachMember((member) =>
+            {
+                if (member.PhysBody.HasPhysicalBody)
+                {
+                    OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(member.PhysShape.physShapeInfo, member.Mass);
+                    member.Inertia = inertia * BSParam.VehicleInertiaFactor;
+                    m_physicsScene.PE.SetMassProps(member.PhysBody, member.Mass, member.Inertia);
+                    m_physicsScene.PE.UpdateInertiaTensor(member.PhysBody);
+                }
+                return false;   // 'false' says to continue looping
+            }
+        );
+    }
+    // ================================================================
     protected virtual float ComputeLinksetMass()
     {
         float mass = LinksetRoot.RawMass;
@@ -311,6 +385,5 @@ public abstract class BSLinkset
         if (m_physicsScene.PhysicsLogging.Enabled)
             m_physicsScene.DetailLog(msg, args);
     }
-
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index fc4545f..d34b797 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -353,6 +353,16 @@ public abstract class BSPhysObject : PhysicsActor
                 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 == PhysScene.SimulationStep); }
         set
@@ -386,6 +396,7 @@ public abstract class BSPhysObject : PhysicsActor
     // 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)
     {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index d43448e..4771934 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -495,8 +495,8 @@ public class BSPrim : BSPhysObject
         }
     }
 
-        // Find and return a handle to the current vehicle actor.
-        // Return 'null' if there is no vehicle actor.
+    // Find and return a handle to the current vehicle actor.
+    // Return 'null' if there is no vehicle actor.
     public BSDynamics GetVehicleActor()
     {
         BSDynamics ret = null;
@@ -507,6 +507,7 @@ public class BSPrim : BSPhysObject
         }
         return ret;
     }
+
     public override int VehicleType {
         get {
             int ret = (int)Vehicle.TYPE_NONE;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 1fbcfcc..2f392da 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -200,20 +200,38 @@ public class BSPrimLinkable : BSPrimDisplaced
     }
 
     // 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))
         {
-            return false;
+            // The linkset didn't handle it so pass the collision through normal processing
+            ret = base.Collide(collidingWith, collidee, contactPoint, contactNormal, pentrationDepth);
         }
+        return ret;
+    }
 
-        // TODO: handle collisions of other objects with with children of linkset.
-        //    This is a problem for LinksetCompound since the children are packed into the root.
+    // 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;
 
-        return base.Collide(collidingWith, collidee, contactPoint, contactNormal, pentrationDepth);
+            base.HasSomeCollision = value;
+        }
     }
 }
 }
-- 
cgit v1.1


From acb7b4a09ad564d1dfae3ad12adbb593ca3942c9 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 16 Jul 2013 09:59:52 -0700
Subject: BulletSim: only create vehicle prim actor when vehicles are enabled.

---
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     | 43 ++++++++++++++++------
 .../Physics/BulletSPlugin/Tests/BasicVehicles.cs   |  2 +-
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 4771934..fdb2925 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -96,7 +96,7 @@ public class BSPrim : BSPhysObject
         _isVolumeDetect = false;
 
         // Add a dynamic vehicle to our set of actors that can move this prim.
-        PhysicalActors.Add(VehicleActorName, new BSDynamics(PhysScene, this, VehicleActorName));
+        // PhysicalActors.Add(VehicleActorName, new BSDynamics(PhysScene, this, VehicleActorName));
 
         _mass = CalculateMass();
 
@@ -497,7 +497,7 @@ public class BSPrim : BSPhysObject
 
     // Find and return a handle to the current vehicle actor.
     // Return 'null' if there is no vehicle actor.
-    public BSDynamics GetVehicleActor()
+    public BSDynamics GetVehicleActor(bool createIfNone)
     {
         BSDynamics ret = null;
         BSActor actor;
@@ -505,13 +505,21 @@ public class BSPrim : BSPhysObject
         {
             ret = actor as BSDynamics;
         }
+        else
+        {
+            if (createIfNone)
+            {
+                ret = new BSDynamics(PhysScene, this, VehicleActorName);
+                PhysicalActors.Add(ret.ActorName, ret);
+            }
+        }
         return ret;
     }
 
     public override int VehicleType {
         get {
             int ret = (int)Vehicle.TYPE_NONE;
-            BSDynamics vehicleActor = GetVehicleActor();
+            BSDynamics vehicleActor = GetVehicleActor(false /* createIfNone */);
             if (vehicleActor != null)
                 ret = (int)vehicleActor.Type;
             return ret;
@@ -525,11 +533,24 @@ public class BSPrim : BSPhysObject
                 //    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 */);
-                BSDynamics vehicleActor = GetVehicleActor();
-                if (vehicleActor != null)
+                if (type == Vehicle.TYPE_NONE)
                 {
-                    vehicleActor.ProcessTypeChange(type);
-                    ActivateIfPhysical(false);
+                    // 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
+                {
+                    // 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);
+                    }
                 }
             });
         }
@@ -538,7 +559,7 @@ public class BSPrim : BSPhysObject
     {
         PhysScene.TaintedObject("BSPrim.VehicleFloatParam", delegate()
         {
-            BSDynamics vehicleActor = GetVehicleActor();
+            BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
             if (vehicleActor != null)
             {
                 vehicleActor.ProcessFloatVehicleParam((Vehicle)param, value);
@@ -550,7 +571,7 @@ public class BSPrim : BSPhysObject
     {
         PhysScene.TaintedObject("BSPrim.VehicleVectorParam", delegate()
         {
-            BSDynamics vehicleActor = GetVehicleActor();
+            BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
             if (vehicleActor != null)
             {
                 vehicleActor.ProcessVectorVehicleParam((Vehicle)param, value);
@@ -562,7 +583,7 @@ public class BSPrim : BSPhysObject
     {
         PhysScene.TaintedObject("BSPrim.VehicleRotationParam", delegate()
         {
-            BSDynamics vehicleActor = GetVehicleActor();
+            BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
             if (vehicleActor != null)
             {
                 vehicleActor.ProcessRotationVehicleParam((Vehicle)param, rotation);
@@ -574,7 +595,7 @@ public class BSPrim : BSPhysObject
     {
         PhysScene.TaintedObject("BSPrim.VehicleFlags", delegate()
         {
-            BSDynamics vehicleActor = GetVehicleActor();
+            BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
             if (vehicleActor != null)
             {
                 vehicleActor.ProcessVehicleFlags(param, remove);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs b/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs
index 48d3742..48e74eb 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs
@@ -116,7 +116,7 @@ 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.
-        BSDynamics vehicleActor = TestVehicle.GetVehicleActor();
+        BSDynamics vehicleActor = TestVehicle.GetVehicleActor(true /* createIfNone */);
         if (vehicleActor != null)
         {
             vehicleActor.ProcessFloatVehicleParam(Vehicle.VERTICAL_ATTRACTION_EFFICIENCY, efficiency);
-- 
cgit v1.1


From d0d654e2186c8b81c1150da89a549e4f7162a2b4 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 16 Jul 2013 10:01:03 -0700
Subject: BulletSim: change BSDynamics to expect to be passed a BSPrimLinkable
 and start changing the logic to handle the base prim as a complex object (ie,
 a linkset).

---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 1540df1..82d7c44 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         private static string LogHeader = "[BULLETSIM VEHICLE]";
 
         // the prim this dynamic controller belongs to
-        private BSPrim ControllingPrim { get; set; }
+        private BSPrimLinkable ControllingPrim { get; set; }
 
         private bool m_haveRegisteredForSceneEvents;
 
@@ -128,9 +128,15 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         public BSDynamics(BSScene myScene, BSPrim myPrim, string actorName)
             : base(myScene, myPrim, actorName)
         {
-            ControllingPrim = myPrim;
             Type = Vehicle.TYPE_NONE;
             m_haveRegisteredForSceneEvents = false;
+
+            ControllingPrim = myPrim as BSPrimLinkable;
+            if (ControllingPrim == null)
+            {
+                // THIS CANNOT HAPPEN!!
+            }
+            VDetailLog("{0},Creation", ControllingPrim.LocalID);
         }
 
         // Return 'true' if this vehicle is doing vehicle things
@@ -585,6 +591,8 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 // Friction affects are handled by this vehicle code
                 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.
@@ -595,17 +603,20 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
                 // Vehicles report collision events so we know when it's on the ground
                 m_physicsScene.PE.AddToCollisionFlags(ControllingPrim.PhysBody, CollisionFlags.BS_VEHICLE_COLLISIONS);
+                // ControllingPrim.Linkset.SetPhysicalCollisionFlags(CollisionFlags.BS_VEHICLE_COLLISIONS);
 
                 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.ComputeLocalInertia(BSParam.VehicleInertiaFactor);
 
                 // Set the gravity for the vehicle depending on the buoyancy
                 // TODO: what should be done if prim and vehicle buoyancy differ?
                 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.
                 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}",
                         ControllingPrim.LocalID, m_vehicleMass, ControllingPrim.Inertia, m_VehicleGravity,
@@ -617,6 +628,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             {
                 if (ControllingPrim.PhysBody.HasPhysicalBody)
                     m_physicsScene.PE.RemoveFromCollisionFlags(ControllingPrim.PhysBody, CollisionFlags.BS_VEHICLE_COLLISIONS);
+                // ControllingPrim.Linkset.RemoveFromPhysicalCollisionFlags(CollisionFlags.BS_VEHICLE_COLLISIONS);
             }
         }
 
@@ -629,6 +641,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         // BSActor.Release()
         public override void Dispose()
         {
+            VDetailLog("{0},Dispose", ControllingPrim.LocalID);
             UnregisterForSceneEvents();
             Type = Vehicle.TYPE_NONE;
             Enabled = false;
-- 
cgit v1.1


From b44f0e1a00eba7f76401692322e48a3b23a81164 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 16 Jul 2013 10:02:14 -0700
Subject: BulletSim: Add logic to linksets to change physical properties for
 whole linkset. Override physical property setting for BSLinksetCompound as
 there are not children to the compound spape.

---
 OpenSim/Region/Physics/BulletSPlugin/BSActors.cs   |  6 +---
 OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs  | 24 +++++++++++++--
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     | 36 ++++++++++++++++++++++
 3 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
index fff63e4..e0ccc50 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
@@ -69,7 +69,7 @@ public class BSActorCollection
     {
         lock (m_actors)
         {
-            Release();
+            ForEachActor(a => a.Dispose());
             m_actors.Clear();
         }
     }
@@ -98,10 +98,6 @@ public class BSActorCollection
     {
         ForEachActor(a => a.SetEnabled(enabl));
     }
-    public void Release()
-    {
-        ForEachActor(a => a.Dispose());
-    }
     public void Refresh()
     {
         ForEachActor(a => a.Refresh());
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 78c0af7..960c0b4 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -309,14 +309,14 @@ public abstract class BSLinkset
             }
         );
     }
-    public virtual void ComputeLocalInertia()
+    public virtual void ComputeLocalInertia(OMV.Vector3 inertiaFactor)
     {
         ForEachMember((member) =>
             {
                 if (member.PhysBody.HasPhysicalBody)
                 {
                     OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(member.PhysShape.physShapeInfo, member.Mass);
-                    member.Inertia = inertia * BSParam.VehicleInertiaFactor;
+                    member.Inertia = inertia * inertiaFactor;
                     m_physicsScene.PE.SetMassProps(member.PhysBody, member.Mass, member.Inertia);
                     m_physicsScene.PE.UpdateInertiaTensor(member.PhysBody);
                 }
@@ -324,6 +324,26 @@ public abstract class BSLinkset
             }
         );
     }
+    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 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()
     {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 3668456..33ae5a5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -44,6 +44,42 @@ public sealed class BSLinksetCompound : BSLinkset
     {
     }
 
+    // ================================================================
+    // Changing the physical property of the linkset only needs to change the root
+    public override void SetPhysicalFriction(float friction)
+    {
+        if (LinksetRoot.PhysBody.HasPhysicalBody)
+            m_physicsScene.PE.SetFriction(LinksetRoot.PhysBody, friction);
+    }
+    public override void SetPhysicalRestitution(float restitution)
+    {
+        if (LinksetRoot.PhysBody.HasPhysicalBody)
+            m_physicsScene.PE.SetRestitution(LinksetRoot.PhysBody, restitution);
+    }
+    public override void SetPhysicalGravity(OMV.Vector3 gravity)
+    {
+        if (LinksetRoot.PhysBody.HasPhysicalBody)
+            m_physicsScene.PE.SetGravity(LinksetRoot.PhysBody, gravity);
+    }
+    public override void ComputeLocalInertia(OMV.Vector3 inertiaFactor)
+    {
+        OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(LinksetRoot.PhysShape.physShapeInfo, LinksetRoot.Mass);
+        LinksetRoot.Inertia = inertia * inertiaFactor;
+        m_physicsScene.PE.SetMassProps(LinksetRoot.PhysBody, LinksetRoot.Mass, LinksetRoot.Inertia);
+        m_physicsScene.PE.UpdateInertiaTensor(LinksetRoot.PhysBody);
+    }
+    public override void SetPhysicalCollisionFlags(CollisionFlags collFlags)
+    {
+        if (LinksetRoot.PhysBody.HasPhysicalBody)
+            m_physicsScene.PE.SetCollisionFlags(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.
     public override void Refresh(BSPrimLinkable requestor)
-- 
cgit v1.1


From 84d0699761b8da546f9faef084240d7b15f16321 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 22 Jul 2013 12:07:42 -0700
Subject: Revert "BulletSim: Add logic to linksets to change physical
 properties for" The changes don't seem to be ready for prime time.

This reverts commit b44f0e1a00eba7f76401692322e48a3b23a81164.
---
 OpenSim/Region/Physics/BulletSPlugin/BSActors.cs   |  6 +++-
 OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs  | 24 ++-------------
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     | 36 ----------------------
 3 files changed, 7 insertions(+), 59 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
index e0ccc50..fff63e4 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
@@ -69,7 +69,7 @@ public class BSActorCollection
     {
         lock (m_actors)
         {
-            ForEachActor(a => a.Dispose());
+            Release();
             m_actors.Clear();
         }
     }
@@ -98,6 +98,10 @@ public class BSActorCollection
     {
         ForEachActor(a => a.SetEnabled(enabl));
     }
+    public void Release()
+    {
+        ForEachActor(a => a.Dispose());
+    }
     public void Refresh()
     {
         ForEachActor(a => a.Refresh());
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 960c0b4..78c0af7 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -309,14 +309,14 @@ public abstract class BSLinkset
             }
         );
     }
-    public virtual void ComputeLocalInertia(OMV.Vector3 inertiaFactor)
+    public virtual void ComputeLocalInertia()
     {
         ForEachMember((member) =>
             {
                 if (member.PhysBody.HasPhysicalBody)
                 {
                     OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(member.PhysShape.physShapeInfo, member.Mass);
-                    member.Inertia = inertia * inertiaFactor;
+                    member.Inertia = inertia * BSParam.VehicleInertiaFactor;
                     m_physicsScene.PE.SetMassProps(member.PhysBody, member.Mass, member.Inertia);
                     m_physicsScene.PE.UpdateInertiaTensor(member.PhysBody);
                 }
@@ -324,26 +324,6 @@ public abstract class BSLinkset
             }
         );
     }
-    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 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()
     {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 33ae5a5..3668456 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -44,42 +44,6 @@ public sealed class BSLinksetCompound : BSLinkset
     {
     }
 
-    // ================================================================
-    // Changing the physical property of the linkset only needs to change the root
-    public override void SetPhysicalFriction(float friction)
-    {
-        if (LinksetRoot.PhysBody.HasPhysicalBody)
-            m_physicsScene.PE.SetFriction(LinksetRoot.PhysBody, friction);
-    }
-    public override void SetPhysicalRestitution(float restitution)
-    {
-        if (LinksetRoot.PhysBody.HasPhysicalBody)
-            m_physicsScene.PE.SetRestitution(LinksetRoot.PhysBody, restitution);
-    }
-    public override void SetPhysicalGravity(OMV.Vector3 gravity)
-    {
-        if (LinksetRoot.PhysBody.HasPhysicalBody)
-            m_physicsScene.PE.SetGravity(LinksetRoot.PhysBody, gravity);
-    }
-    public override void ComputeLocalInertia(OMV.Vector3 inertiaFactor)
-    {
-        OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(LinksetRoot.PhysShape.physShapeInfo, LinksetRoot.Mass);
-        LinksetRoot.Inertia = inertia * inertiaFactor;
-        m_physicsScene.PE.SetMassProps(LinksetRoot.PhysBody, LinksetRoot.Mass, LinksetRoot.Inertia);
-        m_physicsScene.PE.UpdateInertiaTensor(LinksetRoot.PhysBody);
-    }
-    public override void SetPhysicalCollisionFlags(CollisionFlags collFlags)
-    {
-        if (LinksetRoot.PhysBody.HasPhysicalBody)
-            m_physicsScene.PE.SetCollisionFlags(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.
     public override void Refresh(BSPrimLinkable requestor)
-- 
cgit v1.1


From 7b187deb19517aa7c880458894643a5448566a94 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 22 Jul 2013 12:08:25 -0700
Subject: Revert "BulletSim: change BSDynamics to expect to be passed a
 BSPrimLinkable" The changes don't seem to be ready for prime time.

This reverts commit d0d654e2186c8b81c1150da89a549e4f7162a2b4.
---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 82d7c44..1540df1 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         private static string LogHeader = "[BULLETSIM VEHICLE]";
 
         // the prim this dynamic controller belongs to
-        private BSPrimLinkable ControllingPrim { get; set; }
+        private BSPrim ControllingPrim { get; set; }
 
         private bool m_haveRegisteredForSceneEvents;
 
@@ -128,15 +128,9 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         public BSDynamics(BSScene myScene, BSPrim myPrim, string actorName)
             : base(myScene, myPrim, actorName)
         {
+            ControllingPrim = myPrim;
             Type = Vehicle.TYPE_NONE;
             m_haveRegisteredForSceneEvents = false;
-
-            ControllingPrim = myPrim as BSPrimLinkable;
-            if (ControllingPrim == null)
-            {
-                // THIS CANNOT HAPPEN!!
-            }
-            VDetailLog("{0},Creation", ControllingPrim.LocalID);
         }
 
         // Return 'true' if this vehicle is doing vehicle things
@@ -591,8 +585,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 // Friction affects are handled by this vehicle code
                 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.
@@ -603,20 +595,17 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
                 // Vehicles report collision events so we know when it's on the ground
                 m_physicsScene.PE.AddToCollisionFlags(ControllingPrim.PhysBody, CollisionFlags.BS_VEHICLE_COLLISIONS);
-                // ControllingPrim.Linkset.SetPhysicalCollisionFlags(CollisionFlags.BS_VEHICLE_COLLISIONS);
 
                 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.ComputeLocalInertia(BSParam.VehicleInertiaFactor);
 
                 // Set the gravity for the vehicle depending on the buoyancy
                 // TODO: what should be done if prim and vehicle buoyancy differ?
                 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.
                 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}",
                         ControllingPrim.LocalID, m_vehicleMass, ControllingPrim.Inertia, m_VehicleGravity,
@@ -628,7 +617,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             {
                 if (ControllingPrim.PhysBody.HasPhysicalBody)
                     m_physicsScene.PE.RemoveFromCollisionFlags(ControllingPrim.PhysBody, CollisionFlags.BS_VEHICLE_COLLISIONS);
-                // ControllingPrim.Linkset.RemoveFromPhysicalCollisionFlags(CollisionFlags.BS_VEHICLE_COLLISIONS);
             }
         }
 
@@ -641,7 +629,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         // BSActor.Release()
         public override void Dispose()
         {
-            VDetailLog("{0},Dispose", ControllingPrim.LocalID);
             UnregisterForSceneEvents();
             Type = Vehicle.TYPE_NONE;
             Enabled = false;
-- 
cgit v1.1


From 5f7b2ea81b95a60e882bc65b663a2c9fe134f92a Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 22 Jul 2013 12:08:49 -0700
Subject: Revert "BulletSim: only create vehicle prim actor when vehicles are
 enabled." The changes don't seem to be ready for prime time.

This reverts commit acb7b4a09ad564d1dfae3ad12adbb593ca3942c9.
---
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     | 43 ++++++----------------
 .../Physics/BulletSPlugin/Tests/BasicVehicles.cs   |  2 +-
 2 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index fdb2925..4771934 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -96,7 +96,7 @@ public class BSPrim : BSPhysObject
         _isVolumeDetect = false;
 
         // Add a dynamic vehicle to our set of actors that can move this prim.
-        // PhysicalActors.Add(VehicleActorName, new BSDynamics(PhysScene, this, VehicleActorName));
+        PhysicalActors.Add(VehicleActorName, new BSDynamics(PhysScene, this, VehicleActorName));
 
         _mass = CalculateMass();
 
@@ -497,7 +497,7 @@ public class BSPrim : BSPhysObject
 
     // Find and return a handle to the current vehicle actor.
     // Return 'null' if there is no vehicle actor.
-    public BSDynamics GetVehicleActor(bool createIfNone)
+    public BSDynamics GetVehicleActor()
     {
         BSDynamics ret = null;
         BSActor actor;
@@ -505,21 +505,13 @@ public class BSPrim : BSPhysObject
         {
             ret = actor as BSDynamics;
         }
-        else
-        {
-            if (createIfNone)
-            {
-                ret = new BSDynamics(PhysScene, this, VehicleActorName);
-                PhysicalActors.Add(ret.ActorName, ret);
-            }
-        }
         return ret;
     }
 
     public override int VehicleType {
         get {
             int ret = (int)Vehicle.TYPE_NONE;
-            BSDynamics vehicleActor = GetVehicleActor(false /* createIfNone */);
+            BSDynamics vehicleActor = GetVehicleActor();
             if (vehicleActor != null)
                 ret = (int)vehicleActor.Type;
             return ret;
@@ -533,24 +525,11 @@ public class BSPrim : BSPhysObject
                 //    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)
-                {
-                    // 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
+                BSDynamics vehicleActor = GetVehicleActor();
+                if (vehicleActor != null)
                 {
-                    // 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);
-                    }
+                    vehicleActor.ProcessTypeChange(type);
+                    ActivateIfPhysical(false);
                 }
             });
         }
@@ -559,7 +538,7 @@ public class BSPrim : BSPhysObject
     {
         PhysScene.TaintedObject("BSPrim.VehicleFloatParam", delegate()
         {
-            BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
+            BSDynamics vehicleActor = GetVehicleActor();
             if (vehicleActor != null)
             {
                 vehicleActor.ProcessFloatVehicleParam((Vehicle)param, value);
@@ -571,7 +550,7 @@ public class BSPrim : BSPhysObject
     {
         PhysScene.TaintedObject("BSPrim.VehicleVectorParam", delegate()
         {
-            BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
+            BSDynamics vehicleActor = GetVehicleActor();
             if (vehicleActor != null)
             {
                 vehicleActor.ProcessVectorVehicleParam((Vehicle)param, value);
@@ -583,7 +562,7 @@ public class BSPrim : BSPhysObject
     {
         PhysScene.TaintedObject("BSPrim.VehicleRotationParam", delegate()
         {
-            BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
+            BSDynamics vehicleActor = GetVehicleActor();
             if (vehicleActor != null)
             {
                 vehicleActor.ProcessRotationVehicleParam((Vehicle)param, rotation);
@@ -595,7 +574,7 @@ public class BSPrim : BSPhysObject
     {
         PhysScene.TaintedObject("BSPrim.VehicleFlags", delegate()
         {
-            BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
+            BSDynamics vehicleActor = GetVehicleActor();
             if (vehicleActor != null)
             {
                 vehicleActor.ProcessVehicleFlags(param, remove);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs b/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs
index 48e74eb..48d3742 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs
@@ -116,7 +116,7 @@ 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.
-        BSDynamics vehicleActor = TestVehicle.GetVehicleActor(true /* createIfNone */);
+        BSDynamics vehicleActor = TestVehicle.GetVehicleActor();
         if (vehicleActor != null)
         {
             vehicleActor.ProcessFloatVehicleParam(Vehicle.VERTICAL_ATTRACTION_EFFICIENCY, efficiency);
-- 
cgit v1.1


From c45659863d8821a48a32e5b687c7b2a6d90b0300 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 22 Jul 2013 12:09:17 -0700
Subject: Revert "BulletSim: move collision processing for linksets from
 BSPrimLinkable" The changes don't seem to be ready for prime time.

This reverts commit b4c3a791aa55390bff071b3fe4bbe70c1d252703.
---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 16 ++---
 OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs  | 75 +---------------------
 .../Region/Physics/BulletSPlugin/BSPhysObject.cs   | 11 ----
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     |  5 +-
 .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 32 ++-------
 5 files changed, 18 insertions(+), 121 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 1540df1..4c2c1c1 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1001,7 +1001,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             else if (newVelocityLengthSq < 0.001f)
                 VehicleVelocity = Vector3.Zero;
 
-            VDetailLog("{0},  MoveLinear,done,isColl={1},newVel={2}", ControllingPrim.LocalID, ControllingPrim.HasSomeCollision, VehicleVelocity );
+            VDetailLog("{0},  MoveLinear,done,isColl={1},newVel={2}", ControllingPrim.LocalID, ControllingPrim.IsColliding, VehicleVelocity );
 
         } // end MoveLinear()
 
@@ -1062,7 +1062,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 Vector3 linearDeflectionW = linearDeflectionV * VehicleOrientation;
 
                 // Optionally, if not colliding, don't effect world downward velocity. Let falling things fall.
-                if (BSParam.VehicleLinearDeflectionNotCollidingNoZ && !m_controllingPrim.HasSomeCollision)
+                if (BSParam.VehicleLinearDeflectionNotCollidingNoZ && !m_controllingPrim.IsColliding)
                 {
                     linearDeflectionW.Z = 0f;
                 }
@@ -1222,7 +1222,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.HasSomeCollision)
+                if (!Prim.IsColliding)
                 {
                     // downForce = new Vector3(0, 0, -distanceAboveGround / m_bankingTimescale);
                     VehicleVelocity += new Vector3(0, 0, -distanceAboveGround);
@@ -1233,12 +1233,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.HasSomeCollision, ret);
+                                Prim.LocalID, distanceAboveGround, Prim.IsColliding, 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 (!ControllingPrim.HasSomeCollision && VehicleVelocity.Z > 0.1)
+                if (!ControllingPrim.IsColliding && VehicleVelocity.Z > 0.1)
                 {
                     // Get rid of any of the velocity vector that is pushing us up.
                     float upVelocity = VehicleVelocity.Z;
@@ -1260,7 +1260,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                     }
                         */
                     VDetailLog("{0},  MoveLinear,limitMotorUp,collide={1},upVel={2},newVel={3}",
-                                    ControllingPrim.LocalID, ControllingPrim.HasSomeCollision, upVelocity, VehicleVelocity);
+                                    ControllingPrim.LocalID, ControllingPrim.IsColliding, upVelocity, VehicleVelocity);
                 }
             }
         }
@@ -1270,14 +1270,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 (ControllingPrim.HasSomeCollision && IsGroundVehicle)
+            if (ControllingPrim.IsColliding && IsGroundVehicle)
                 appliedGravity *= BSParam.VehicleGroundGravityFudge;
 
             VehicleAddForce(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);
+                            ControllingPrim.IsColliding, BSParam.VehicleGroundGravityFudge, m_vehicleMass, appliedGravity);
         }
 
         // =======================================================================
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 78c0af7..ad8e10f 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -203,33 +203,6 @@ 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);
@@ -278,53 +251,6 @@ public abstract class BSLinkset
     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 ComputeLocalInertia()
-    {
-        ForEachMember((member) =>
-            {
-                if (member.PhysBody.HasPhysicalBody)
-                {
-                    OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(member.PhysShape.physShapeInfo, member.Mass);
-                    member.Inertia = inertia * BSParam.VehicleInertiaFactor;
-                    m_physicsScene.PE.SetMassProps(member.PhysBody, member.Mass, member.Inertia);
-                    m_physicsScene.PE.UpdateInertiaTensor(member.PhysBody);
-                }
-                return false;   // 'false' says to continue looping
-            }
-        );
-    }
-    // ================================================================
     protected virtual float ComputeLinksetMass()
     {
         float mass = LinksetRoot.RawMass;
@@ -385,5 +311,6 @@ public abstract class BSLinkset
         if (m_physicsScene.PhysicsLogging.Enabled)
             m_physicsScene.DetailLog(msg, args);
     }
+
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index d34b797..fc4545f 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -353,16 +353,6 @@ public abstract class BSPhysObject : PhysicsActor
                 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 == PhysScene.SimulationStep); }
         set
@@ -396,7 +386,6 @@ public abstract class BSPhysObject : PhysicsActor
     // 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)
     {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 4771934..d43448e 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -495,8 +495,8 @@ public class BSPrim : BSPhysObject
         }
     }
 
-    // Find and return a handle to the current vehicle actor.
-    // Return 'null' if there is no vehicle actor.
+        // Find and return a handle to the current vehicle actor.
+        // Return 'null' if there is no vehicle actor.
     public BSDynamics GetVehicleActor()
     {
         BSDynamics ret = null;
@@ -507,7 +507,6 @@ public class BSPrim : BSPhysObject
         }
         return ret;
     }
-
     public override int VehicleType {
         get {
             int ret = (int)Vehicle.TYPE_NONE;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 2f392da..1fbcfcc 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -200,38 +200,20 @@ public class BSPrimLinkable : BSPrimDisplaced
     }
 
     // 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)
     {
-        bool ret = false;
-        // Ask the linkset if it wants to handle the collision
-        if (!Linkset.HandleCollide(collidingWith, collidee, contactPoint, contactNormal, 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))
         {
-            // The linkset didn't handle it so pass the collision through normal processing
-            ret = base.Collide(collidingWith, collidee, contactPoint, contactNormal, pentrationDepth);
+            return false;
         }
-        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;
+        // TODO: handle collisions of other objects with with children of linkset.
+        //    This is a problem for LinksetCompound since the children are packed into the root.
 
-            base.HasSomeCollision = value;
-        }
+        return base.Collide(collidingWith, collidee, contactPoint, contactNormal, pentrationDepth);
     }
 }
 }
-- 
cgit v1.1


From 89857378ce79f93a265bc1eb151e17742032abfa Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 22 Jul 2013 12:09:55 -0700
Subject: Revert "Add experimental stubs for an extension function interface on
 both" The changes don't seem to be ready for prime time.

This reverts commit 13a4a80b3893af13ab748c177b731fed813974ca.
---
 OpenSim/Region/Physics/Manager/PhysicsActor.cs | 6 ------
 OpenSim/Region/Physics/Manager/PhysicsScene.cs | 9 ---------
 2 files changed, 15 deletions(-)

diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 2500f27..bd806eb 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -313,12 +313,6 @@ namespace OpenSim.Region.Physics.Manager
         public abstract void SubscribeEvents(int ms);
         public abstract void UnSubscribeEvents();
         public abstract bool SubscribedEvents();
-
-        // Extendable interface for new, physics engine specific operations
-        public virtual object Extension(string pFunct, params object[] pParams)
-        {
-            throw new NotImplementedException();
-        }
     }
 
     public class NullPhysicsActor : PhysicsActor
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 07a1d36..290b72e 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -25,13 +25,10 @@
  * 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;
 
@@ -334,11 +331,5 @@ namespace OpenSim.Region.Physics.Manager
         {
             return false;
         }
-
-        // Extendable interface for new, physics engine specific operations
-        public virtual object Extension(string pFunct, params object[] pParams)
-        {
-            throw new NotImplementedException();
-        }
     }
 }
-- 
cgit v1.1


From 44543ebe638f391fc1c7ff532fe4470006dec55a Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 22 Jul 2013 12:10:23 -0700
Subject: Revert "BulletSim: freshen up the code for constraint based
 linksets." The changes don't seem to be ready for prime time.

This reverts commit 803632f8f32d91bb4aec678d8b45a8430c2703e1.
---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs |  4 +-
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     |  1 -
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  | 82 ++++++----------------
 3 files changed, 23 insertions(+), 64 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 4c2c1c1..0204967 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1029,8 +1029,8 @@ 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},tgt={3},correctV={4},correctW={5},newVelW={6},fricFact={7}",
-                        ControllingPrim.LocalID, origVelW, currentVelV, m_linearMotor.TargetValue, linearMotorCorrectionV,
+            VDetailLog("{0},  MoveLinear,velocity,origVelW={1},velV={2},correctV={3},correctW={4},newVelW={5},fricFact={6}",
+                        ControllingPrim.LocalID, origVelW, currentVelV, linearMotorCorrectionV,
                         linearMotorVelocityW, VehicleVelocity, frictionFactorV);
         }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 3668456..1d94142 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -59,7 +59,6 @@ public sealed class BSLinksetCompound : BSLinkset
     {
         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.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index f17d698..a06a44d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -48,22 +48,12 @@ public sealed class BSLinksetConstraints : BSLinkset
     {
         base.Refresh(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)
+        if (HasAnyChildren && IsRoot(requestor))
         {
             // Queue to happen after all the other taint processing
             m_physicsScene.PostTaintObject("BSLinksetContraints.Refresh", requestor.LocalID, delegate()
                 {
-                    if (HasAnyChildren)
+                    if (HasAnyChildren && IsRoot(requestor))
                         RecomputeLinksetConstraints();
                 });
         }
@@ -77,14 +67,8 @@ public sealed class BSLinksetConstraints : BSLinkset
     // Called at taint-time!
     public override bool MakeDynamic(BSPrimLinkable child)
     {
-        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;
+        // What is done for each object in BSPrim is what we want.
+        return false;
     }
 
     // The object is going static (non-physical). Do any setup necessary for a static linkset.
@@ -94,16 +78,8 @@ public sealed class BSLinksetConstraints : BSLinkset
     // Called at taint-time!
     public override bool MakeStatic(BSPrimLinkable child)
     {
-        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;
+        // What is done for each object in BSPrim is what we want.
+        return false;
     }
 
     // Called at taint-time!!
@@ -129,7 +105,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.
-            ScheduleRebuild(LinksetRoot);
+            Refresh(LinksetRoot);
         }
         return ret;
     }
@@ -147,7 +123,7 @@ public sealed class BSLinksetConstraints : BSLinkset
             DetailLog("{0},BSLinksetConstraints.AddChildToLinkset,call,child={1}", LinksetRoot.LocalID, child.LocalID);
 
             // Cause constraints and assorted properties to be recomputed before the next simulation step.
-            ScheduleRebuild(LinksetRoot);
+            Refresh(LinksetRoot);
         }
         return;
     }
@@ -171,7 +147,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                 PhysicallyUnlinkAChildFromRoot(rootx, childx);
             });
             // See that the linkset parameters are recomputed at the end of the taint time.
-            ScheduleRebuild(LinksetRoot);
+            Refresh(LinksetRoot);
         }
         else
         {
@@ -189,7 +165,6 @@ public sealed class BSLinksetConstraints : BSLinkset
         Refresh(rootPrim);
     }
 
-    // Create a static constraint between the two passed objects
     private BSConstraint BuildConstraint(BSPrimLinkable rootPrim, BSPrimLinkable childPrim)
     {
         // Zero motion for children so they don't interpolate
@@ -306,39 +281,24 @@ public sealed class BSLinksetConstraints : BSLinkset
         DetailLog("{0},BSLinksetConstraint.RecomputeLinksetConstraints,set,rBody={1},linksetMass={2}",
                             LinksetRoot.LocalID, LinksetRoot.PhysBody.AddrString, linksetMass);
 
-        try
+        foreach (BSPrimLinkable child in m_children)
         {
-            Rebuilding = true;
+            // 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);
 
-            // There is no reason to build all this physical stuff for a non-physical linkset.
-            if (!LinksetRoot.IsPhysicallyActive)
+            BSConstraint constrain;
+            if (!m_physicsScene.Constraints.TryGetConstraint(LinksetRoot.PhysBody, child.PhysBody, out constrain))
             {
-                DetailLog("{0},BSLinksetConstraint.RecomputeLinksetCompound,notPhysical", LinksetRoot.LocalID);
-                return; // Note the 'finally' clause at the botton which will get executed.
+                // If constraint doesn't exist yet, create it.
+                constrain = BuildConstraint(LinksetRoot, child);
             }
+            constrain.RecomputeConstraintVariables(linksetMass);
 
-            foreach (BSPrimLinkable child in m_children)
-            {
-                // 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);
-
-                BSConstraint constrain;
-                if (!m_physicsScene.Constraints.TryGetConstraint(LinksetRoot.PhysBody, child.PhysBody, out constrain))
-                {
-                    // If constraint doesn't exist yet, create it.
-                    constrain = BuildConstraint(LinksetRoot, child);
-                }
-                constrain.RecomputeConstraintVariables(linksetMass);
-
-                // PhysicsScene.PE.DumpConstraint(PhysicsScene.World, constrain.Constraint);    // DEBUG DEBUG
-            }
-        }
-        finally
-        {
-            Rebuilding = false;
+            // PhysicsScene.PE.DumpConstraint(PhysicsScene.World, constrain.Constraint);    // DEBUG DEBUG
         }
+
     }
 }
 }
-- 
cgit v1.1


From e6b6af62dd677077664fdc8801b3a7e894a2b8da Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 22 Jul 2013 15:41:14 -0700
Subject: Added check for user movement specification before discarding an
 incoming AgentUpdate packet. This fixes the problem with vehicles not moving
 forward after the first up-arrow. Code to fix a potential exception when
 using different IClientAPIs.

---
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  | 81 +++++++++++-----------
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs   |  3 +-
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index e23e55b..32549c8 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -359,12 +359,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// cannot retain a reference to it outside of that method.
         /// </remarks>
         private AgentUpdateArgs m_thisAgentUpdateArgs = new AgentUpdateArgs();
-        private float qdelta1;
-        private float qdelta2;
-        private float vdelta1;
-        private float vdelta2;
-        private float vdelta3;
-        private float vdelta4;
 
         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
@@ -5576,7 +5570,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         #region Scene/Avatar
 
+        // 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>
@@ -5587,31 +5583,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name='x'></param>
         public bool CheckAgentUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
         {
-            // Compute these only once, when this function is called from down below
-            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);
-            vdelta1 = Vector3.Distance(x.CameraAtAxis, m_thisAgentUpdateArgs.CameraAtAxis);
-            vdelta2 = Vector3.Distance(x.CameraCenter, m_thisAgentUpdateArgs.CameraCenter);
-            vdelta3 = Vector3.Distance(x.CameraLeftAxis, m_thisAgentUpdateArgs.CameraLeftAxis);
-            vdelta4 = Vector3.Distance(x.CameraUpAxis, m_thisAgentUpdateArgs.CameraUpAxis);
-
-            bool significant = CheckAgentMovementUpdateSignificance(x) || CheckAgentCameraUpdateSignificance(x);
-
-            // Emergency debugging
-            //if (significant)
-            //{
-                //m_log.DebugFormat("[LLCLIENTVIEW]: Cam1 {0} {1}",
-                //    x.CameraAtAxis, x.CameraCenter);
-                //m_log.DebugFormat("[LLCLIENTVIEW]: Cam2 {0} {1}",
-                //    x.CameraLeftAxis, x.CameraUpAxis);
-                //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 significant;
-
+            return CheckAgentMovementUpdateSignificance(x) || CheckAgentCameraUpdateSignificance(x);
         }
 
         /// <summary>
@@ -5622,15 +5594,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name='x'></param>
         private bool CheckAgentMovementUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
         {
-            return (
-                (qdelta1 > QDELTA) ||
+            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) ||
-                (x.ControlFlags != m_thisAgentUpdateArgs.ControlFlags) ||
-                (x.Far != m_thisAgentUpdateArgs.Far) ||
-                (x.Flags != m_thisAgentUpdateArgs.Flags) ||
-                (x.State != m_thisAgentUpdateArgs.State)
-               );
+                // || (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;
         }
 
         /// <summary>
@@ -5641,12 +5625,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name='x'></param>
         private bool CheckAgentCameraUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
         {
-            return (
+            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);
+
+            bool cameraSignificant =
                 (vdelta1 > VDELTA) ||
                 (vdelta2 > VDELTA) ||
                 (vdelta3 > VDELTA) ||
                 (vdelta4 > VDELTA)
-               );
+            ;
+
+            //if (cameraSignificant)
+            //{
+                //m_log.DebugFormat("[LLCLIENTVIEW]: Cam1 {0} {1}",
+                //    x.CameraAtAxis, x.CameraCenter);
+                //m_log.DebugFormat("[LLCLIENTVIEW]: Cam2 {0} {1}",
+                //    x.CameraLeftAxis, x.CameraUpAxis);
+            //}
+
+            return cameraSignificant;
         }
 
         private bool HandleAgentUpdate(IClientAPI sener, Packet packet)
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 32282af..f5c0b05 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1316,9 +1316,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 AgentUpdatePacket agentUpdate = (AgentUpdatePacket)packet;
 
+                LLClientView llClient = client as LLClientView;
                 if (agentUpdate.AgentData.SessionID != client.SessionId 
                     || agentUpdate.AgentData.AgentID != client.AgentId
-                    || !((LLClientView)client).CheckAgentUpdateSignificance(agentUpdate.AgentData))
+                    || !(llClient == null || llClient.CheckAgentUpdateSignificance(agentUpdate.AgentData)) )
                 {
                     PacketPool.Instance.ReturnPacket(packet);
                     return;
-- 
cgit v1.1


From bf517899a7a63278d4ed22d5485c37d61d47bb58 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 22 Jul 2013 23:30:09 +0100
Subject: Add AverageUDPProcessTime stat to try and get a handle on how long
 we're taking on the initial processing of a UDP packet.

If we're not receiving packets with multiple threads (m_asyncPacketHandling) then this is critical since it will limit the number of incoming UDP requests that the region can handle and affects packet loss.
If m_asyncPacketHandling then this is less critical though a long process will increase the scope for threads to race.
This is an experimental stat which may be changed.
---
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs   | 19 +++++++++--
 .../ClientStack/Linden/UDP/OpenSimUDPBase.cs       | 39 ++++++++++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index f5c0b05..d3823f3 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -70,8 +70,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             StatsManager.RegisterStat(
                 new Stat(
                     "IncomingPacketsProcessedCount",
-                    "Number of inbound UDP packets processed",
-                    "Number of inbound UDP packets processed",
+                    "Number of inbound LL protocol packets processed",
+                    "Number of inbound LL protocol packets processed",
                     "",
                     "clientstack",
                     scene.Name,
@@ -79,6 +79,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     MeasuresOfInterest.AverageChangeOverTime,
                     stat => stat.Value = m_udpServer.IncomingPacketsProcessed,
                     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)
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
index a919141..46a3261 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
@@ -78,6 +78,26 @@ namespace OpenMetaverse
         public bool IsRunningOutbound { 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>
@@ -286,6 +306,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);
@@ -293,6 +315,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) { }
-- 
cgit v1.1


From 8396f1bd42cf42d412c09e769c491930aaa8bfea Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 22 Jul 2013 23:58:45 +0100
Subject: Record raw number of UDP receives as
 clientstack.IncomingUDPReceivesCount

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs    | 13 +++++++++++++
 OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs |  8 +++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index d3823f3..5300b1e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -69,6 +69,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             StatsManager.RegisterStat(
                 new Stat(
+                    "IncomingUDPReceivesCount",
+                    "Number of inbound LL protocol packets processed",
+                    "Number of inbound LL protocol packets processed",
+                    "",
+                    "clientstack",
+                    scene.Name,
+                    StatType.Pull,
+                    MeasuresOfInterest.AverageChangeOverTime,
+                    stat => stat.Value = m_udpServer.UdpReceives,
+                    StatVerbosity.Debug));
+
+            StatsManager.RegisterStat(
+                new Stat(
                     "IncomingPacketsProcessedCount",
                     "Number of inbound LL protocol packets processed",
                     "Number of inbound LL protocol packets processed",
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
index 46a3261..b4044b5 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
@@ -78,6 +78,11 @@ namespace OpenMetaverse
         public bool IsRunningOutbound { get; private set; }
 
         /// <summary>
+        /// Number of UDP receives.
+        /// </summary>
+        public int UdpReceives { get; private set; }
+
+        /// <summary>
         /// Number of receives over which to establish a receive time average.
         /// </summary>
         private readonly static int s_receiveTimeSamples = 500;
@@ -295,6 +300,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)
@@ -345,7 +352,6 @@ namespace OpenMetaverse
                     if (!m_asyncPacketHandling)
                         AsyncBeginReceive();
                 }
-
             }
         }
 
-- 
cgit v1.1


From 60732c96efd149bbb0484b327b00463dc5b81aff Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 23 Jul 2013 00:15:58 +0100
Subject: Add clientstack.OutgoingUDPSendsCount stat to show number of outbound
 UDP packets sent by a region per second

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs   | 18 +++++++++++++++---
 .../Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs    |  7 +++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 5300b1e..cc4de10 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -70,8 +70,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             StatsManager.RegisterStat(
                 new Stat(
                     "IncomingUDPReceivesCount",
-                    "Number of inbound LL protocol packets processed",
-                    "Number of inbound LL protocol packets processed",
+                    "Number of UDP receives performed",
+                    "Number of UDP receives performed",
                     "",
                     "clientstack",
                     scene.Name,
@@ -95,6 +95,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             StatsManager.RegisterStat(
                 new Stat(
+                    "OutgoingUDPSendsCount",
+                    "Number of UDP sends performed",
+                    "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.",
@@ -856,7 +869,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             PacketPool.Instance.ReturnPacket(packet);
             m_dataPresentEvent.Set();
-
         }
 
         private AutoResetEvent m_dataPresentEvent = new AutoResetEvent(false);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
index b4044b5..d0ed7e8 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
@@ -83,6 +83,11 @@ namespace OpenMetaverse
         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;
@@ -381,6 +386,8 @@ namespace OpenMetaverse
             {
 //                UDPPacketBuffer buf = (UDPPacketBuffer)result.AsyncState;
                 m_udpSocket.EndSendTo(result);
+
+                UdpSends++;
             }
             catch (SocketException) { }
             catch (ObjectDisposedException) { }
-- 
cgit v1.1


From 9fb9da1b6c86e10b229706fe06f2875c8a63a52f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 23 Jul 2013 00:31:57 +0100
Subject: Add clientstack.InboxPacketsCount stat.  This records the number of
 packets waiting to be processed at the second stage (after initial UDP
 processing)

If this consistently increases then this is a problem since it means the simulator is receiving more requests than it can distribute to other parts of the code.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index cc4de10..0e9f1b7 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -500,6 +500,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(
-- 
cgit v1.1


From a57a472ab8edf70430a8391909e6078b9ae0f26d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 23 Jul 2013 00:51:59 +0100
Subject: Add proper method doc and comments to m_dataPresentEvent (from
 d9d9959)

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 0e9f1b7..37fd252 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -223,6 +223,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>Flag to signal when clients should send pings</summary>
         protected bool m_sendPing;
 
+        /// <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>
@@ -881,11 +890,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
 
             PacketPool.Instance.ReturnPacket(packet);
+
             m_dataPresentEvent.Set();
         }
 
-        private AutoResetEvent m_dataPresentEvent = new AutoResetEvent(false);
-
         /// <summary>
         /// Start the process of sending a packet to the client.
         /// </summary>
@@ -1817,6 +1825,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // 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.
                     m_dataPresentEvent.WaitOne(100);
 
                     Watchdog.UpdateThread();
-- 
cgit v1.1


From 90528c23d991cd1fc77823be49e4135cf412b92e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 23 Jul 2013 01:13:13 +0100
Subject: For stats which can show average change over time, show the last
 sample as well as the average.

This is somewhat cryptic at the moment, need to improve documentation.
---
 OpenSim/Framework/Monitoring/Stats/Stat.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index 9629b6e..cc2c947 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -253,6 +253,8 @@ namespace OpenSim.Framework.Monitoring
                 == MeasuresOfInterest.AverageChangeOverTime)
             {
                 double totalChange = 0;
+                double lastChangeOverTime = 0;
+                double? penultimateSample = null;
                 double? lastSample = null;
 
                 lock (m_samples)
@@ -266,13 +268,21 @@ namespace OpenSim.Framework.Monitoring
                         if (lastSample != null)
                             totalChange += s - (double)lastSample;
 
+                        penultimateSample = lastSample;
                         lastSample = s;
                     }
                 }
 
+                if (lastSample != null && penultimateSample != null)
+                    lastChangeOverTime = (double)lastSample - (double)penultimateSample;
+
                 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);
+                double averageChangeOverTime = totalChange / divisor / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);
+
+                sb.AppendFormat(
+                    ", {0:0.##} {1}/s, {2:0.##} {3}/s", 
+                    lastChangeOverTime, UnitName, averageChangeOverTime, UnitName);
             }
         }
     }
-- 
cgit v1.1


From af9deed13593a85aef64205f9ca616a06711963c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 23 Jul 2013 08:11:21 -0700
Subject: Revert "Revert "BulletSim: freshen up the code for constraint based
 linksets."" Found that the vehicle movement problem was not caused by these
 physics changes.

This reverts commit 44543ebe638f391fc1c7ff532fe4470006dec55a.
---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs |  4 +-
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     |  1 +
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  | 82 ++++++++++++++++------
 3 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 0204967..4c2c1c1 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1029,8 +1029,8 @@ 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},fricFact={6}",
-                        ControllingPrim.LocalID, origVelW, currentVelV, linearMotorCorrectionV,
+            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);
         }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 1d94142..3668456 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -59,6 +59,7 @@ public sealed class BSLinksetCompound : BSLinkset
     {
         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.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index a06a44d..f17d698 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -48,12 +48,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
             m_physicsScene.PostTaintObject("BSLinksetContraints.Refresh", requestor.LocalID, delegate()
                 {
-                    if (HasAnyChildren && IsRoot(requestor))
+                    if (HasAnyChildren)
                         RecomputeLinksetConstraints();
                 });
         }
@@ -67,8 +77,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 +94,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!!
@@ -105,7 +129,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;
     }
@@ -123,7 +147,7 @@ public sealed class BSLinksetConstraints : BSLinkset
             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;
     }
@@ -147,7 +171,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                 PhysicallyUnlinkAChildFromRoot(rootx, childx);
             });
             // See that the linkset parameters are recomputed at the end of the taint time.
-            Refresh(LinksetRoot);
+            ScheduleRebuild(LinksetRoot);
         }
         else
         {
@@ -165,6 +189,7 @@ public sealed class BSLinksetConstraints : BSLinkset
         Refresh(rootPrim);
     }
 
+    // Create a static constraint between the two passed objects
     private BSConstraint BuildConstraint(BSPrimLinkable rootPrim, BSPrimLinkable childPrim)
     {
         // Zero motion for children so they don't interpolate
@@ -281,24 +306,39 @@ 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 (!m_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
-        }
+            foreach (BSPrimLinkable child in m_children)
+            {
+                // 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);
+
+                BSConstraint constrain;
+                if (!m_physicsScene.Constraints.TryGetConstraint(LinksetRoot.PhysBody, child.PhysBody, out constrain))
+                {
+                    // If constraint doesn't exist yet, create it.
+                    constrain = BuildConstraint(LinksetRoot, child);
+                }
+                constrain.RecomputeConstraintVariables(linksetMass);
 
+                // PhysicsScene.PE.DumpConstraint(PhysicsScene.World, constrain.Constraint);    // DEBUG DEBUG
+            }
+        }
+        finally
+        {
+            Rebuilding = false;
+        }
     }
 }
 }
-- 
cgit v1.1


From 401c2e2f2ec7c6001387df505665b19477afd4cf Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 23 Jul 2013 08:12:34 -0700
Subject: Revert "Revert "Add experimental stubs for an extension function
 interface on both"" Found that the vehicle movement problem was not caused by
 these physics changes.

This reverts commit 89857378ce79f93a265bc1eb151e17742032abfa.
---
 OpenSim/Region/Physics/Manager/PhysicsActor.cs | 6 ++++++
 OpenSim/Region/Physics/Manager/PhysicsScene.cs | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index bd806eb..2500f27 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -313,6 +313,12 @@ namespace OpenSim.Region.Physics.Manager
         public abstract void SubscribeEvents(int ms);
         public abstract void UnSubscribeEvents();
         public abstract bool SubscribedEvents();
+
+        // Extendable interface for new, physics engine specific operations
+        public virtual object Extension(string pFunct, params object[] pParams)
+        {
+            throw new NotImplementedException();
+        }
     }
 
     public class NullPhysicsActor : PhysicsActor
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 290b72e..07a1d36 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;
 
@@ -331,5 +334,11 @@ namespace OpenSim.Region.Physics.Manager
         {
             return false;
         }
+
+        // Extendable interface for new, physics engine specific operations
+        public virtual object Extension(string pFunct, params object[] pParams)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
-- 
cgit v1.1


From aec8852af793699a4c1093a38b992daf2dbd97f3 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 23 Jul 2013 08:13:01 -0700
Subject: Revert "Revert "BulletSim: move collision processing for linksets
 from BSPrimLinkable"" Found that the vehicle movement problem was not caused
 by these physics changes.

This reverts commit c45659863d8821a48a32e5b687c7b2a6d90b0300.
---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 16 ++---
 OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs  | 75 +++++++++++++++++++++-
 .../Region/Physics/BulletSPlugin/BSPhysObject.cs   | 11 ++++
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     |  5 +-
 .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 32 +++++++--
 5 files changed, 121 insertions(+), 18 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 4c2c1c1..1540df1 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1001,7 +1001,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             else if (newVelocityLengthSq < 0.001f)
                 VehicleVelocity = Vector3.Zero;
 
-            VDetailLog("{0},  MoveLinear,done,isColl={1},newVel={2}", ControllingPrim.LocalID, ControllingPrim.IsColliding, VehicleVelocity );
+            VDetailLog("{0},  MoveLinear,done,isColl={1},newVel={2}", ControllingPrim.LocalID, ControllingPrim.HasSomeCollision, VehicleVelocity );
 
         } // end MoveLinear()
 
@@ -1062,7 +1062,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 Vector3 linearDeflectionW = linearDeflectionV * VehicleOrientation;
 
                 // Optionally, if not colliding, don't effect world downward velocity. Let falling things fall.
-                if (BSParam.VehicleLinearDeflectionNotCollidingNoZ && !m_controllingPrim.IsColliding)
+                if (BSParam.VehicleLinearDeflectionNotCollidingNoZ && !m_controllingPrim.HasSomeCollision)
                 {
                     linearDeflectionW.Z = 0f;
                 }
@@ -1222,7 +1222,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);
@@ -1233,12 +1233,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 (!ControllingPrim.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;
@@ -1260,7 +1260,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                     }
                         */
                     VDetailLog("{0},  MoveLinear,limitMotorUp,collide={1},upVel={2},newVel={3}",
-                                    ControllingPrim.LocalID, ControllingPrim.IsColliding, upVelocity, VehicleVelocity);
+                                    ControllingPrim.LocalID, ControllingPrim.HasSomeCollision, upVelocity, VehicleVelocity);
                 }
             }
         }
@@ -1270,14 +1270,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 (ControllingPrim.IsColliding && IsGroundVehicle)
+            if (ControllingPrim.HasSomeCollision && IsGroundVehicle)
                 appliedGravity *= BSParam.VehicleGroundGravityFudge;
 
             VehicleAddForce(appliedGravity);
 
             VDetailLog("{0},  MoveLinear,applyGravity,vehGrav={1},collid={2},fudge={3},mass={4},appliedForce={5}",
                             ControllingPrim.LocalID, m_VehicleGravity,
-                            ControllingPrim.IsColliding, BSParam.VehicleGroundGravityFudge, m_vehicleMass, appliedGravity);
+                            ControllingPrim.HasSomeCollision, BSParam.VehicleGroundGravityFudge, m_vehicleMass, appliedGravity);
         }
 
         // =======================================================================
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index ad8e10f..78c0af7 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -203,6 +203,33 @@ 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);
@@ -251,6 +278,53 @@ public abstract class BSLinkset
     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 ComputeLocalInertia()
+    {
+        ForEachMember((member) =>
+            {
+                if (member.PhysBody.HasPhysicalBody)
+                {
+                    OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(member.PhysShape.physShapeInfo, member.Mass);
+                    member.Inertia = inertia * BSParam.VehicleInertiaFactor;
+                    m_physicsScene.PE.SetMassProps(member.PhysBody, member.Mass, member.Inertia);
+                    m_physicsScene.PE.UpdateInertiaTensor(member.PhysBody);
+                }
+                return false;   // 'false' says to continue looping
+            }
+        );
+    }
+    // ================================================================
     protected virtual float ComputeLinksetMass()
     {
         float mass = LinksetRoot.RawMass;
@@ -311,6 +385,5 @@ public abstract class BSLinkset
         if (m_physicsScene.PhysicsLogging.Enabled)
             m_physicsScene.DetailLog(msg, args);
     }
-
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index fc4545f..d34b797 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -353,6 +353,16 @@ public abstract class BSPhysObject : PhysicsActor
                 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 == PhysScene.SimulationStep); }
         set
@@ -386,6 +396,7 @@ public abstract class BSPhysObject : PhysicsActor
     // 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)
     {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index d43448e..4771934 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -495,8 +495,8 @@ public class BSPrim : BSPhysObject
         }
     }
 
-        // Find and return a handle to the current vehicle actor.
-        // Return 'null' if there is no vehicle actor.
+    // Find and return a handle to the current vehicle actor.
+    // Return 'null' if there is no vehicle actor.
     public BSDynamics GetVehicleActor()
     {
         BSDynamics ret = null;
@@ -507,6 +507,7 @@ public class BSPrim : BSPhysObject
         }
         return ret;
     }
+
     public override int VehicleType {
         get {
             int ret = (int)Vehicle.TYPE_NONE;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 1fbcfcc..2f392da 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -200,20 +200,38 @@ public class BSPrimLinkable : BSPrimDisplaced
     }
 
     // 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))
         {
-            return false;
+            // The linkset didn't handle it so pass the collision through normal processing
+            ret = base.Collide(collidingWith, collidee, contactPoint, contactNormal, pentrationDepth);
         }
+        return ret;
+    }
 
-        // TODO: handle collisions of other objects with with children of linkset.
-        //    This is a problem for LinksetCompound since the children are packed into the root.
+    // 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;
 
-        return base.Collide(collidingWith, collidee, contactPoint, contactNormal, pentrationDepth);
+            base.HasSomeCollision = value;
+        }
     }
 }
 }
-- 
cgit v1.1


From b14156aa6317b2c0ca6801730beb7c51eed97244 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 23 Jul 2013 08:13:29 -0700
Subject: Revert "Revert "BulletSim: only create vehicle prim actor when
 vehicles are enabled."" Found that the vehicle movement problem was not
 caused by these physics changes.

This reverts commit 5f7b2ea81b95a60e882bc65b663a2c9fe134f92a.
---
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     | 43 ++++++++++++++++------
 .../Physics/BulletSPlugin/Tests/BasicVehicles.cs   |  2 +-
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 4771934..fdb2925 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -96,7 +96,7 @@ public class BSPrim : BSPhysObject
         _isVolumeDetect = false;
 
         // Add a dynamic vehicle to our set of actors that can move this prim.
-        PhysicalActors.Add(VehicleActorName, new BSDynamics(PhysScene, this, VehicleActorName));
+        // PhysicalActors.Add(VehicleActorName, new BSDynamics(PhysScene, this, VehicleActorName));
 
         _mass = CalculateMass();
 
@@ -497,7 +497,7 @@ public class BSPrim : BSPhysObject
 
     // Find and return a handle to the current vehicle actor.
     // Return 'null' if there is no vehicle actor.
-    public BSDynamics GetVehicleActor()
+    public BSDynamics GetVehicleActor(bool createIfNone)
     {
         BSDynamics ret = null;
         BSActor actor;
@@ -505,13 +505,21 @@ public class BSPrim : BSPhysObject
         {
             ret = actor as BSDynamics;
         }
+        else
+        {
+            if (createIfNone)
+            {
+                ret = new BSDynamics(PhysScene, this, VehicleActorName);
+                PhysicalActors.Add(ret.ActorName, ret);
+            }
+        }
         return ret;
     }
 
     public override int VehicleType {
         get {
             int ret = (int)Vehicle.TYPE_NONE;
-            BSDynamics vehicleActor = GetVehicleActor();
+            BSDynamics vehicleActor = GetVehicleActor(false /* createIfNone */);
             if (vehicleActor != null)
                 ret = (int)vehicleActor.Type;
             return ret;
@@ -525,11 +533,24 @@ public class BSPrim : BSPhysObject
                 //    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 */);
-                BSDynamics vehicleActor = GetVehicleActor();
-                if (vehicleActor != null)
+                if (type == Vehicle.TYPE_NONE)
                 {
-                    vehicleActor.ProcessTypeChange(type);
-                    ActivateIfPhysical(false);
+                    // 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
+                {
+                    // 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);
+                    }
                 }
             });
         }
@@ -538,7 +559,7 @@ public class BSPrim : BSPhysObject
     {
         PhysScene.TaintedObject("BSPrim.VehicleFloatParam", delegate()
         {
-            BSDynamics vehicleActor = GetVehicleActor();
+            BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
             if (vehicleActor != null)
             {
                 vehicleActor.ProcessFloatVehicleParam((Vehicle)param, value);
@@ -550,7 +571,7 @@ public class BSPrim : BSPhysObject
     {
         PhysScene.TaintedObject("BSPrim.VehicleVectorParam", delegate()
         {
-            BSDynamics vehicleActor = GetVehicleActor();
+            BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
             if (vehicleActor != null)
             {
                 vehicleActor.ProcessVectorVehicleParam((Vehicle)param, value);
@@ -562,7 +583,7 @@ public class BSPrim : BSPhysObject
     {
         PhysScene.TaintedObject("BSPrim.VehicleRotationParam", delegate()
         {
-            BSDynamics vehicleActor = GetVehicleActor();
+            BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
             if (vehicleActor != null)
             {
                 vehicleActor.ProcessRotationVehicleParam((Vehicle)param, rotation);
@@ -574,7 +595,7 @@ public class BSPrim : BSPhysObject
     {
         PhysScene.TaintedObject("BSPrim.VehicleFlags", delegate()
         {
-            BSDynamics vehicleActor = GetVehicleActor();
+            BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
             if (vehicleActor != null)
             {
                 vehicleActor.ProcessVehicleFlags(param, remove);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs b/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs
index 48d3742..48e74eb 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs
@@ -116,7 +116,7 @@ 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.
-        BSDynamics vehicleActor = TestVehicle.GetVehicleActor();
+        BSDynamics vehicleActor = TestVehicle.GetVehicleActor(true /* createIfNone */);
         if (vehicleActor != null)
         {
             vehicleActor.ProcessFloatVehicleParam(Vehicle.VERTICAL_ATTRACTION_EFFICIENCY, efficiency);
-- 
cgit v1.1


From 75686e0e49308a21ca013d246544f88cd8e90cbd Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 23 Jul 2013 08:13:56 -0700
Subject: Revert "Revert "BulletSim: change BSDynamics to expect to be passed a
 BSPrimLinkable"" Found that the vehicle movement problem was not caused by
 these physics changes.

This reverts commit 7b187deb19517aa7c880458894643a5448566a94.
---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 1540df1..82d7c44 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         private static string LogHeader = "[BULLETSIM VEHICLE]";
 
         // the prim this dynamic controller belongs to
-        private BSPrim ControllingPrim { get; set; }
+        private BSPrimLinkable ControllingPrim { get; set; }
 
         private bool m_haveRegisteredForSceneEvents;
 
@@ -128,9 +128,15 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         public BSDynamics(BSScene myScene, BSPrim myPrim, string actorName)
             : base(myScene, myPrim, actorName)
         {
-            ControllingPrim = myPrim;
             Type = Vehicle.TYPE_NONE;
             m_haveRegisteredForSceneEvents = false;
+
+            ControllingPrim = myPrim as BSPrimLinkable;
+            if (ControllingPrim == null)
+            {
+                // THIS CANNOT HAPPEN!!
+            }
+            VDetailLog("{0},Creation", ControllingPrim.LocalID);
         }
 
         // Return 'true' if this vehicle is doing vehicle things
@@ -585,6 +591,8 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 // Friction affects are handled by this vehicle code
                 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.
@@ -595,17 +603,20 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
                 // Vehicles report collision events so we know when it's on the ground
                 m_physicsScene.PE.AddToCollisionFlags(ControllingPrim.PhysBody, CollisionFlags.BS_VEHICLE_COLLISIONS);
+                // ControllingPrim.Linkset.SetPhysicalCollisionFlags(CollisionFlags.BS_VEHICLE_COLLISIONS);
 
                 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.ComputeLocalInertia(BSParam.VehicleInertiaFactor);
 
                 // Set the gravity for the vehicle depending on the buoyancy
                 // TODO: what should be done if prim and vehicle buoyancy differ?
                 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.
                 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}",
                         ControllingPrim.LocalID, m_vehicleMass, ControllingPrim.Inertia, m_VehicleGravity,
@@ -617,6 +628,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             {
                 if (ControllingPrim.PhysBody.HasPhysicalBody)
                     m_physicsScene.PE.RemoveFromCollisionFlags(ControllingPrim.PhysBody, CollisionFlags.BS_VEHICLE_COLLISIONS);
+                // ControllingPrim.Linkset.RemoveFromPhysicalCollisionFlags(CollisionFlags.BS_VEHICLE_COLLISIONS);
             }
         }
 
@@ -629,6 +641,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         // BSActor.Release()
         public override void Dispose()
         {
+            VDetailLog("{0},Dispose", ControllingPrim.LocalID);
             UnregisterForSceneEvents();
             Type = Vehicle.TYPE_NONE;
             Enabled = false;
-- 
cgit v1.1


From f499b328c44ef29d92aa2ef8102aad6ff5cbe336 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 23 Jul 2013 08:14:20 -0700
Subject: Revert "Revert "BulletSim: Add logic to linksets to change physical
 properties for"" Found that the vehicle movement problem was not caused by
 these physics changes.

This reverts commit 84d0699761b8da546f9faef084240d7b15f16321.
---
 OpenSim/Region/Physics/BulletSPlugin/BSActors.cs   |  6 +---
 OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs  | 24 +++++++++++++--
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     | 36 ++++++++++++++++++++++
 3 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
index fff63e4..e0ccc50 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
@@ -69,7 +69,7 @@ public class BSActorCollection
     {
         lock (m_actors)
         {
-            Release();
+            ForEachActor(a => a.Dispose());
             m_actors.Clear();
         }
     }
@@ -98,10 +98,6 @@ public class BSActorCollection
     {
         ForEachActor(a => a.SetEnabled(enabl));
     }
-    public void Release()
-    {
-        ForEachActor(a => a.Dispose());
-    }
     public void Refresh()
     {
         ForEachActor(a => a.Refresh());
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 78c0af7..960c0b4 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -309,14 +309,14 @@ public abstract class BSLinkset
             }
         );
     }
-    public virtual void ComputeLocalInertia()
+    public virtual void ComputeLocalInertia(OMV.Vector3 inertiaFactor)
     {
         ForEachMember((member) =>
             {
                 if (member.PhysBody.HasPhysicalBody)
                 {
                     OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(member.PhysShape.physShapeInfo, member.Mass);
-                    member.Inertia = inertia * BSParam.VehicleInertiaFactor;
+                    member.Inertia = inertia * inertiaFactor;
                     m_physicsScene.PE.SetMassProps(member.PhysBody, member.Mass, member.Inertia);
                     m_physicsScene.PE.UpdateInertiaTensor(member.PhysBody);
                 }
@@ -324,6 +324,26 @@ public abstract class BSLinkset
             }
         );
     }
+    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 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()
     {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 3668456..33ae5a5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -44,6 +44,42 @@ public sealed class BSLinksetCompound : BSLinkset
     {
     }
 
+    // ================================================================
+    // Changing the physical property of the linkset only needs to change the root
+    public override void SetPhysicalFriction(float friction)
+    {
+        if (LinksetRoot.PhysBody.HasPhysicalBody)
+            m_physicsScene.PE.SetFriction(LinksetRoot.PhysBody, friction);
+    }
+    public override void SetPhysicalRestitution(float restitution)
+    {
+        if (LinksetRoot.PhysBody.HasPhysicalBody)
+            m_physicsScene.PE.SetRestitution(LinksetRoot.PhysBody, restitution);
+    }
+    public override void SetPhysicalGravity(OMV.Vector3 gravity)
+    {
+        if (LinksetRoot.PhysBody.HasPhysicalBody)
+            m_physicsScene.PE.SetGravity(LinksetRoot.PhysBody, gravity);
+    }
+    public override void ComputeLocalInertia(OMV.Vector3 inertiaFactor)
+    {
+        OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(LinksetRoot.PhysShape.physShapeInfo, LinksetRoot.Mass);
+        LinksetRoot.Inertia = inertia * inertiaFactor;
+        m_physicsScene.PE.SetMassProps(LinksetRoot.PhysBody, LinksetRoot.Mass, LinksetRoot.Inertia);
+        m_physicsScene.PE.UpdateInertiaTensor(LinksetRoot.PhysBody);
+    }
+    public override void SetPhysicalCollisionFlags(CollisionFlags collFlags)
+    {
+        if (LinksetRoot.PhysBody.HasPhysicalBody)
+            m_physicsScene.PE.SetCollisionFlags(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.
     public override void Refresh(BSPrimLinkable requestor)
-- 
cgit v1.1


From aec8d1e6be43422b0f93de47d6e46cc3e17399cc Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 23 Jul 2013 09:09:25 -0700
Subject: BulletSim: Turn on center-of-mass calculation by default. Reduce
 object density by factor of 100 to bring physical mass computations into a
 range better suited for Bullet.

---
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 8 +++++---
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs  | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index dcf1e83..0bdb5f1 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -461,8 +461,9 @@ 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 ),
+            0.0001f ),
 
         new ParameterDefn<float>("PID_D", "Derivitive factor for motion smoothing",
             2200f ),
@@ -607,8 +608,9 @@ public static class BSParam
             0.0f ),
         new ParameterDefn<float>("VehicleRestitution", "Bouncyness factor for vehicles (0.0 - 1.0)",
             0.0f ),
+        // Turn off fudge with DensityScaleFactor = 0.0001.  Value used to be 0.2f;
         new ParameterDefn<float>("VehicleGroundGravityFudge", "Factor to multiply gravity if a ground vehicle is probably on the ground (0.0 - 1.0)",
-            0.2f ),
+            1.0f ),
         new ParameterDefn<float>("VehicleAngularBankingTimescaleFudge", "Factor to multiple angular banking timescale. Tune to increase realism.",
             60.0f ),
         new ParameterDefn<bool>("VehicleEnableLinearDeflection", "Turn on/off vehicle linear deflection effect",
@@ -701,7 +703,7 @@ public static class BSParam
 	    new ParameterDefn<float>("LinksetImplementation", "Type of linkset implementation (0=Constraint, 1=Compound, 2=Manual)",
             (float)BSLinkset.LinksetImplementation.Compound ),
 	    new ParameterDefn<bool>("LinksetOffsetCenterOfMass", "If 'true', compute linkset center-of-mass and offset linkset position to account for same",
-            false ),
+            true ),
 	    new ParameterDefn<bool>("LinkConstraintUseFrameOffset", "For linksets built with constraints, enable frame offsetFor linksets built with constraints, enable frame offset.",
             false ),
 	    new ParameterDefn<bool>("LinkConstraintEnableTransMotor", "Whether to enable translational motor on linkset constraints",
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index fdb2925..e92a1d2 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -440,8 +440,8 @@ public class BSPrim : BSPhysObject
                 Gravity = ComputeGravity(Buoyancy);
                 PhysScene.PE.SetGravity(PhysBody, Gravity);
 
-                OMV.Vector3 currentScale = PhysScene.PE.GetLocalScaling(PhysShape.physShapeInfo);   // DEBUG DEBUG
-                DetailLog("{0},BSPrim.UpdateMassProperties,currentScale{1},shape={2}", LocalID, currentScale, PhysShape.physShapeInfo);   // DEBUG DEBUG
+                // 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);
-- 
cgit v1.1


From 76e46d0158461a29e6ef358ba8cb7b7323cc0c05 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 23 Jul 2013 17:23:16 +0100
Subject: Improve spacing between data and units on console stats display

---
 OpenSim/Framework/Monitoring/Stats/Stat.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index cc2c947..f2329ce 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -225,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);
 
@@ -281,8 +287,11 @@ namespace OpenSim.Framework.Monitoring
                 double averageChangeOverTime = totalChange / divisor / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);
 
                 sb.AppendFormat(
-                    ", {0:0.##} {1}/s, {2:0.##} {3}/s", 
-                    lastChangeOverTime, UnitName, averageChangeOverTime, UnitName);
+                    ", {0:0.##}{1}/s, {2:0.##}{3}/s", 
+                    lastChangeOverTime, 
+                    UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName), 
+                    averageChangeOverTime,
+                    UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName));
             }
         }
     }
-- 
cgit v1.1


From 7c1eb86c7df2e9c9ccfcf4fe6811af29adbef931 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 21 Jul 2013 15:46:00 -0700
Subject: Don't post Link asset types back to the home grid

---
 .../Framework/InventoryAccess/HGInventoryAccessModule.cs         | 9 ++++++---
 OpenSim/Region/Framework/Scenes/EventManager.cs                  | 6 +++---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs               | 4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index e0c8ea6..460d147 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -185,8 +185,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 +224,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 +235,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");
         }
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 61b0ebd..39d7512 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -742,7 +742,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;
 
@@ -2146,7 +2146,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)
@@ -2155,7 +2155,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     try
                     {
-                        d(agentID, AssetID, AssetName, userlevel);
+                        d(agentID, type, AssetID, AssetName, userlevel);
                     }
                     catch (Exception e)
                     {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 1e4d558..58fa18c 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)
                 {
-- 
cgit v1.1


From 42e52f544df5210b41b96176c364d1f1d2d96b00 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 23 Jul 2013 11:29:53 -0700
Subject: Improvement of fetching name in groups

---
 OpenSim/Addons/Groups/GroupsModule.cs | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index 82e2d6f..69d03a9 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -1402,19 +1402,18 @@ namespace OpenSim.Groups
             if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
             // TODO: All the client update functions need to be reexamined because most do too much and send too much stuff
-            UserAccount account = m_sceneList[0].UserAccountService.GetUserAccount(remoteClient.Scene.RegionInfo.ScopeID, dataForAgentID);
-            string firstname, lastname;
-            if (account != null)
-            {
-                firstname = account.FirstName;
-                lastname = account.LastName;
-            }
-            else
+            string firstname = "Unknown", lastname = "Unknown";
+            string name = m_UserManagement.GetUserName(dataForAgentID);
+            if (!string.IsNullOrEmpty(name))
             {
-                firstname = "Unknown";
-                lastname = "Unknown";
+                string[] parts = name.Split(new char[] { ' ' });
+                if (parts.Length >= 2)
+                {
+                    firstname = parts[0];
+                    lastname = parts[1];
+                }
             }
-
+            
             remoteClient.SendAgentDataUpdate(dataForAgentID, activeGroupID, firstname,
                     lastname, activeGroupPowers, activeGroupName,
                     activeGroupTitle);
-- 
cgit v1.1


From 744276dd50daaaba5b4c54ab37f5a034bd48ca3a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 23 Jul 2013 14:17:32 -0700
Subject: In renaming the folders for hypergriding, don't rename the Current
 Outfit folder. The viewer doesn't like that.

---
 .../CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 460d147..94ea077 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -384,7 +384,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);
-- 
cgit v1.1


From 901bdfed4093c4d87c59abfbd576e71b2374b7c3 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 23 Jul 2013 14:23:22 -0700
Subject: Restoring landing on prims, which had been affected by the edit beams
 commit.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 33db88b..6433878 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1125,6 +1125,25 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void StopFlying()
         {
+            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);
         }
 
-- 
cgit v1.1


From 516062ae1fb7417bbd1e206cb412da41094addfb Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 23 Jul 2013 15:04:24 -0700
Subject: Don't touch the Current Outfit folder also on coming back home

---
 .../Framework/InventoryAccess/HGInventoryAccessModule.cs       | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 94ea077..8f9800f 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -351,7 +351,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());
                 }
             }
         }
-- 
cgit v1.1


From 9a4a513b5e4e2496b32113dcffbeeae776eabb89 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 23 Jul 2013 23:31:35 +0100
Subject: Correct issue where the last instance of a sampled stat was shown 3x
 larger than it should have been (though internal use was correct)

---
 OpenSim/Framework/Monitoring/Stats/Stat.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index f2329ce..ffd5132 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -280,7 +280,8 @@ namespace OpenSim.Framework.Monitoring
                 }
 
                 if (lastSample != null && penultimateSample != null)
-                    lastChangeOverTime = (double)lastSample - (double)penultimateSample;
+                    lastChangeOverTime 
+                        = ((double)lastSample - (double)penultimateSample) / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);
 
                 int divisor = m_samples.Count <= 1 ? 1 : m_samples.Count - 1;
 
-- 
cgit v1.1


From feef9d64a478695aa9721423c818e57bf4e0dff6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 23 Jul 2013 23:42:34 +0100
Subject: For unknown user issue, bump GUN7 to GUN8 and UMMAU3 to UMMAU4 to
 assess what looks like a very significant reducing in GUN occurrances

---
 .../CoreModules/Framework/UserManagement/UserManagementModule.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index a91adfa..53bd2e2 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -389,7 +389,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 }
 
                 names[0] = "Unknown";
-                names[1] = "UserUMMTGUN7";
+                names[1] = "UserUMMTGUN8";
 
                 return false;
             }
@@ -601,7 +601,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     // TODO: Can be removed when GUN* unknown users have definitely dropped significantly or
                     // disappeared.
                     user.FirstName = "Unknown";
-                    user.LastName = "UserUMMAU3";
+                    user.LastName = "UserUMMAU4";
                 }
 
                 AddUserInternal(user);
-- 
cgit v1.1


From d8a6eb5641f3b16811695ff34d925ae27de8fa38 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 24 Jul 2013 11:13:31 -0700
Subject: Decreased the time of group cache to 1 min, because it was getting on
 my nerves that it takes so long to let go of old info.

---
 OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs b/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs
index 79d6fc5..3ac74fc 100644
--- a/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs
+++ b/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Groups
         private ForeignImporter m_ForeignImporter;
 
         private Dictionary<string, bool> m_ActiveRequests = new Dictionary<string, bool>();
-        private const int GROUPS_CACHE_TIMEOUT = 5 * 60; // 5 minutes
+        private const int GROUPS_CACHE_TIMEOUT = 1 * 60; // 1 minutes
 
         // This all important cache cahces objects of different types:
         // group-<GroupID> or group-<Name>          => ExtendedGroupRecord
-- 
cgit v1.1


From e103e34f1d17d218c55ebb1ff19450c018cf73b2 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 24 Jul 2013 11:23:19 -0700
Subject: Added config var that we all thought was already there:
 see_into_region. (Note: different from the defunct see_into_neighboring_sim,
 which used to control the process from the other end). This enables child
 agents in neighbors for which the root agent doesn't have permission to be
 in.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 79 ++++++++++++++++++--------------
 bin/OpenSimDefaults.ini                  |  3 ++
 2 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9cfe869..e443c1d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -230,6 +230,8 @@ namespace OpenSim.Region.Framework.Scenes
 
         public int MaxUndoCount { get; set; }
 
+        public bool SeeIntoRegion { get; set; }
+
         // Using this for RegionReady module to prevent LoginsDisabled from changing under our feet;
         public bool LoginLock = false;
 
@@ -839,6 +841,8 @@ namespace OpenSim.Region.Framework.Scenes
                 //Animation states
                 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
 
+                SeeIntoRegion = startupConfig.GetBoolean("see_into_region", true);
+
                 MaxUndoCount = startupConfig.GetInt("MaxPrimUndos", 20);
 
                 PhysicalPrims = startupConfig.GetBoolean("physical_prim", PhysicalPrims);
@@ -4010,51 +4014,58 @@ namespace OpenSim.Region.Framework.Scenes
                 m_log.ErrorFormat("[CONNECTION BEGIN]: Estate Settings is null!");
             }
 
-            List<UUID> agentGroups = new List<UUID>();
-
-            if (m_groupsModule != 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 (!SeeIntoRegion)
             {
-                GroupMembershipData[] GroupMembership = m_groupsModule.GetMembershipData(agent.AgentID);
+                List<UUID> agentGroups = new List<UUID>();
 
-                if (GroupMembership != null)
-                {
-                    for (int i = 0; i < GroupMembership.Length; i++)
-                        agentGroups.Add(GroupMembership[i].GroupID);
-                }
-                else
+                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
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 8079632..6aa534a 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -86,6 +86,9 @@
     ;; 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
-- 
cgit v1.1


From 00d4a26eefafbe078af78458c9ca58931e29ecb9 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 24 Jul 2013 11:42:35 -0700
Subject: Amend previous commit.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index e443c1d..f766140 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3739,7 +3739,7 @@ namespace OpenSim.Region.Framework.Scenes
     
                     try
                     {
-                        if (!AuthorizeUser(agent, out reason))
+                        if (!AuthorizeUser(agent, SeeIntoRegion, out reason))
                         {
                             m_authenticateHandler.RemoveCircuit(agent.circuitcode);
                             return false;
@@ -3979,7 +3979,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;
 
@@ -4018,7 +4018,7 @@ namespace OpenSim.Region.Framework.Scenes
             // 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 (!SeeIntoRegion)
+            if (!bypassAccessControl)
             {
                 List<UUID> agentGroups = new List<UUID>();
 
@@ -5588,7 +5588,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             try
             {
-                if (!AuthorizeUser(aCircuit, out reason))
+                if (!AuthorizeUser(aCircuit, false, out reason))
                 {
                     // m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID);
                     return false;
-- 
cgit v1.1


From 9ab78d412cdb61b3d5c4727002c3a8eb7f6abb7f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 21 Jul 2013 17:38:01 -0700
Subject: EXPERIMENTAL: yet another variation of ES/EAC/TPFinish

---
 .../EntityTransfer/EntityTransferModule.cs         | 78 +++++++++++-----------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 344c8d7..3e7575b 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -744,30 +744,30 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 #endregion
                 capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
 
-                if (m_eqModule != null)
-                {
-                    // The EnableSimulator message makes the client establish a connection with the destination
-                    // simulator by sending the initial UseCircuitCode UDP packet to the destination containing the
-                    // correct circuit code.
-                    m_eqModule.EnableSimulator(destinationHandle, endPoint, sp.UUID);
-
-                    // XXX: Is this wait necessary?  We will always end up waiting on UpdateAgent for the destination
-                    // simulator to confirm that it has established communication with the viewer.
-                    Thread.Sleep(200);
-
-                    // At least on LL 3.3.4 for teleports between different regions on the same simulator this appears
-                    // unnecessary - teleport will succeed and SEED caps will be requested without it (though possibly
-                    // only on TeleportFinish).  This is untested for region teleport between different simulators
-                    // though this probably also works.
-                    m_eqModule.EstablishAgentCommunication(sp.UUID, endPoint, capsPath);
-                }
-                else
-                {
-                    // XXX: This is a little misleading since we're information the client of its avatar destination,
-                    // which may or may not be a neighbour region of the source region.  This path is probably little
-                    // used anyway (with EQ being the one used).  But it is currently being used for test code.
-                    sp.ControllingClient.InformClientOfNeighbour(destinationHandle, endPoint);
-                }
+                //if (m_eqModule != null)
+                //{
+                //    // The EnableSimulator message makes the client establish a connection with the destination
+                //    // simulator by sending the initial UseCircuitCode UDP packet to the destination containing the
+                //    // correct circuit code.
+                //    m_eqModule.EnableSimulator(destinationHandle, endPoint, sp.UUID);
+
+                //    // XXX: Is this wait necessary?  We will always end up waiting on UpdateAgent for the destination
+                //    // simulator to confirm that it has established communication with the viewer.
+                //    Thread.Sleep(200);
+
+                //    // At least on LL 3.3.4 for teleports between different regions on the same simulator this appears
+                //    // unnecessary - teleport will succeed and SEED caps will be requested without it (though possibly
+                //    // only on TeleportFinish).  This is untested for region teleport between different simulators
+                //    // though this probably also works.
+                //    m_eqModule.EstablishAgentCommunication(sp.UUID, endPoint, capsPath);
+                //}
+                //else
+                //{
+                //    // XXX: This is a little misleading since we're information the client of its avatar destination,
+                //    // which may or may not be a neighbour region of the source region.  This path is probably little
+                //    // used anyway (with EQ being the one used).  But it is currently being used for test code.
+                //    sp.ControllingClient.InformClientOfNeighbour(destinationHandle, endPoint);
+                //}
             }
             else
             {
@@ -796,6 +796,21 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 return;
             }
 
+            // 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;
+
+            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);
+            }
+
             // A common teleport failure occurs when we can send CreateAgent to the 
             // destination region but the viewer cannot establish the connection (e.g. due to network issues between
             // the viewer and the destination).  In this case, UpdateAgent timesout after 10 seconds, although then
@@ -838,21 +853,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} from {1} to {2}",
                 capsPath, sp.Scene.RegionInfo.RegionName, sp.Name);
 
-            // 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;
-
-            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);
-            }
-
             // TeleportFinish makes the client send CompleteMovementIntoRegion (at the destination), which
             // trigers a whole shebang of things there, including MakeRoot. So let's wait for confirmation
             // that the client contacted the destination before we close things here.
-- 
cgit v1.1


From aae29c0ee2467a7978df53dba6f8461d1f566c59 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 21 Jul 2013 20:22:13 -0700
Subject: Further tweaks on TPs: not sending the callback URL and instead
 waiting 15sec before closing the agent. This seems to be working fairly well.
 The viewer seems to have an 8 sec delay between UseCircuitCode and
 CompleteMovement. Also added back the position on UpdateAgent, because it's
 needed for TPing between neighboring regions.

---
 .../EntityTransfer/EntityTransferModule.cs         | 59 ++++++++++++----------
 .../Presence/PresenceDetector.cs                   |  2 +-
 OpenSim/Region/Framework/Scenes/Scene.cs           |  2 +-
 3 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 3e7575b..5124aed 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -684,6 +684,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath();
             }
 
+            //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Contacting destination...");
+
             // 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;
@@ -724,8 +726,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // Past this point we have to attempt clean up if the teleport fails, so update transfer state.
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.Transferring);
 
-            // OK, it got this agent. Let's close some child agents
-            sp.CloseChildAgents(newRegionX, newRegionY);
+            #region old protocol
 
             IClientIPEndpoint ipepClient;  
             if (NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY))
@@ -775,11 +776,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
             }
 
+            #endregion old protocol
+
             // Let's send a full update of the agent. This is a synchronous call.
             AgentData agent = new AgentData();
             sp.CopyTo(agent);
             agent.Position = position;
-            SetCallbackURL(agent, sp.Scene.RegionInfo);
+            //SetCallbackURL(agent, sp.Scene.RegionInfo);
 
             //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Updating agent...");
 
@@ -801,6 +804,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // 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);
@@ -853,30 +857,30 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} from {1} to {2}",
                 capsPath, sp.Scene.RegionInfo.RegionName, sp.Name);
 
-            // TeleportFinish makes the client send CompleteMovementIntoRegion (at the destination), which
-            // trigers a whole shebang of things there, including MakeRoot. So let's wait for confirmation
-            // that the client contacted the destination before we close things here.
-            if (!m_entityTransferStateMachine.WaitForAgentArrivedAtDestination(sp.UUID))
-            {
-                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 WaitForAgentArrivedAtDestination due to previous client close.",
-                        sp.Name, finalDestination.RegionName, sp.Scene.Name);
-
-                    return;
-                }
-
-                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);
+            //// TeleportFinish makes the client send CompleteMovementIntoRegion (at the destination), which
+            //// trigers a whole shebang of things there, including MakeRoot. So let's wait for confirmation
+            //// that the client contacted the destination before we close things here.
+            //if (!m_entityTransferStateMachine.WaitForAgentArrivedAtDestination(sp.UUID))
+            //{
+            //    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 WaitForAgentArrivedAtDestination due to previous client close.",
+            //            sp.Name, finalDestination.RegionName, sp.Scene.Name);
+
+            //        return;
+            //    }
+
+            //    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, currentAgentCircuit.SessionID.ToString(), "Destination region did not signal teleport completion.");
+            //    Fail(sp, finalDestination, logout, currentAgentCircuit.SessionID.ToString(), "Destination region did not signal teleport completion.");
 
-                return;
-            }
+            //    return;
+            //}
 
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp);
 
@@ -897,6 +901,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // Now let's make it officially a child agent
             sp.MakeChildAgent();
 
+            // OK, it got this agent. Let's close some child agents
+            sp.CloseChildAgents(newRegionX, newRegionY);
+
             // 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))
@@ -907,7 +914,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 //
                 // This sleep can be increased if necessary.  However, whilst it's active,
                 // an agent cannot teleport back to this region if it has teleported away.
-                Thread.Sleep(2000);
+                Thread.Sleep(15000);
 
                 sp.Scene.IncomingCloseAgent(sp.UUID, false);
             }
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/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f766140..d4ef3d9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4269,7 +4269,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name='agentID'></param>
         protected virtual ScenePresence WaitGetScenePresence(UUID agentID)
         {
-            int ntimes = 10;
+            int ntimes = 20;
             ScenePresence sp = null;
             while ((sp = GetScenePresence(agentID)) == null && (ntimes-- > 0))
                 Thread.Sleep(1000);
-- 
cgit v1.1


From 3891a8946bb72c9256d8de4185bf4a72c90be859 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 22 Jul 2013 11:54:35 -0700
Subject: New Teleport protocol (V2), still compatible with V1 and older.
 (version of the destination is being checked) In this new protocol, and as
 committed before, the viewer is not sent
 EnableSimulator/EstablishChildCommunication for the destination. Instead, it
 is sent TeleportFinish directly. TeleportFinish, in turn, makes the viewer
 send a UserCircuitCode packet followed by CompleteMovementIntoRegion packet.
 These 2 packets tend to occur one after the other almost immediately to the
 point that when CMIR arrives the client is not even connected yet and that
 packet is ignored (there might have been some race conditions here before);
 then the viewer sends CMIR again within 5-8 secs. But the delay between them
 may be higher in busier regions, which may lead to race conditions. This
 commit improves the process so there are are no race conditions at the
 destination. CompleteMovement (triggered by the viewer) waits until Update
 has been sent from the origin. Update, in turn, waits until there is a *root*
 scene presence -- so making sure CompleteMovement has run MakeRoot. In other
 words, there are two threadlets at the destination, one from the viewer and
 one from the origin region, waiting for each other to do the right thing.
 That makes it safe to close the agent at the origin upon return of the Update
 call without having to wait for callback, because we are absolutely sure that
 the viewer knows it is in th new region. Note also that in the V1 protocol,
 the destination was getting UseCircuitCode from the viewer twice -- once on
 EstablishAgentCommunication and then again on TeleportFinish. The second UCC
 was being ignored, but it shows how we were not following the expected
 steps...

---
 OpenSim/Framework/ChildAgentDataUpdate.cs          |  11 +-
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs   |  68 ++++++
 .../EntityTransfer/EntityTransferModule.cs         | 263 +++++++++++++++------
 .../Simulation/LocalSimulationConnector.cs         |   2 +-
 OpenSim/Region/Framework/Scenes/Scene.cs           |  18 +-
 OpenSim/Region/Framework/Scenes/ScenePresence.cs   |  33 ++-
 6 files changed, 316 insertions(+), 79 deletions(-)

diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 9fc048b..1c5f558 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -287,7 +287,7 @@ namespace OpenSim.Framework
         public Vector3 AtAxis;
         public Vector3 LeftAxis;
         public Vector3 UpAxis;
-        public bool ChangedGrid;
+        public bool SenderWantsToWaitForRoot;
 
         public float Far;
         public float Aspect;
@@ -356,8 +356,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);
 
@@ -526,8 +527,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/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 37fd252..1b72b26 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1257,6 +1257,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // UseCircuitCode handling
             if (packet.Type == PacketType.UseCircuitCode)
             {
+                m_log.DebugFormat("[ZZZ]: In the dungeon: UseCircuitCode");
                 // 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 };
@@ -1265,6 +1266,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 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);
+
+                m_log.DebugFormat("[ZZZ]: In the dungeon: CompleteAgentMovement");
+                // 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
             IClientAPI client;
@@ -1604,6 +1619,56 @@ 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 = 10;
+                while (!m_scene.TryGetClient(endPoint, out client) && count-- > 0)
+                {
+                    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>
@@ -1999,6 +2064,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             Packet packet = incomingPacket.Packet;
             LLClientView client = incomingPacket.Client;
 
+            if (packet is CompleteAgentMovementPacket)
+                m_log.DebugFormat("[ZZZ]: Received CompleteAgentMovementPacket");
+
             if (client.IsActive)
             {
                 m_currentIncomingClient = client;
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 5124aed..b0c0b1d 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -684,7 +684,18 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath();
             }
 
-            //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Contacting destination...");
+            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);
 
             // Let's create an agent there if one doesn't exist yet. 
             // NOTE: logout will always be false for a non-HG teleport.
@@ -707,7 +718,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;
@@ -725,14 +736,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             // Past this point we have to attempt clean up if the teleport fails, so update transfer state.
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.Transferring);
-
-            #region old protocol
-
-            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...");
@@ -745,30 +755,30 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 #endregion
                 capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
 
-                //if (m_eqModule != null)
-                //{
-                //    // The EnableSimulator message makes the client establish a connection with the destination
-                //    // simulator by sending the initial UseCircuitCode UDP packet to the destination containing the
-                //    // correct circuit code.
-                //    m_eqModule.EnableSimulator(destinationHandle, endPoint, sp.UUID);
-
-                //    // XXX: Is this wait necessary?  We will always end up waiting on UpdateAgent for the destination
-                //    // simulator to confirm that it has established communication with the viewer.
-                //    Thread.Sleep(200);
-
-                //    // At least on LL 3.3.4 for teleports between different regions on the same simulator this appears
-                //    // unnecessary - teleport will succeed and SEED caps will be requested without it (though possibly
-                //    // only on TeleportFinish).  This is untested for region teleport between different simulators
-                //    // though this probably also works.
-                //    m_eqModule.EstablishAgentCommunication(sp.UUID, endPoint, capsPath);
-                //}
-                //else
-                //{
-                //    // XXX: This is a little misleading since we're information the client of its avatar destination,
-                //    // which may or may not be a neighbour region of the source region.  This path is probably little
-                //    // used anyway (with EQ being the one used).  But it is currently being used for test code.
-                //    sp.ControllingClient.InformClientOfNeighbour(destinationHandle, endPoint);
-                //}
+                if (m_eqModule != null)
+                {
+                    // The EnableSimulator message makes the client establish a connection with the destination
+                    // simulator by sending the initial UseCircuitCode UDP packet to the destination containing the
+                    // correct circuit code.
+                    m_eqModule.EnableSimulator(destinationHandle, endPoint, sp.UUID);
+
+                    // XXX: Is this wait necessary?  We will always end up waiting on UpdateAgent for the destination
+                    // simulator to confirm that it has established communication with the viewer.
+                    Thread.Sleep(200);
+
+                    // At least on LL 3.3.4 for teleports between different regions on the same simulator this appears
+                    // unnecessary - teleport will succeed and SEED caps will be requested without it (though possibly
+                    // only on TeleportFinish).  This is untested for region teleport between different simulators
+                    // though this probably also works.
+                    m_eqModule.EstablishAgentCommunication(sp.UUID, endPoint, capsPath);
+                }
+                else
+                {
+                    // XXX: This is a little misleading since we're information the client of its avatar destination,
+                    // which may or may not be a neighbour region of the source region.  This path is probably little
+                    // used anyway (with EQ being the one used).  But it is currently being used for test code.
+                    sp.ControllingClient.InformClientOfNeighbour(destinationHandle, endPoint);
+                }
             }
             else
             {
@@ -776,15 +786,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
             }
 
-            #endregion old protocol
-
             // Let's send a full update of the agent. This is a synchronous call.
             AgentData agent = new AgentData();
             sp.CopyTo(agent);
-            agent.Position = position;
-            //SetCallbackURL(agent, sp.Scene.RegionInfo);
+            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.
@@ -814,7 +821,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 sp.ControllingClient.SendRegionTeleport(destinationHandle, 13, endPoint, 4,
                                                             teleportFlags, capsPath);
             }
-
+        
             // A common teleport failure occurs when we can send CreateAgent to the 
             // destination region but the viewer cannot establish the connection (e.g. due to network issues between
             // the viewer and the destination).  In this case, UpdateAgent timesout after 10 seconds, although then
@@ -835,7 +842,7 @@ 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, currentAgentCircuit.SessionID.ToString(), "Connection between viewer and destination region could not be established.");
                 return;
             }
@@ -845,7 +852,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 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, currentAgentCircuit.SessionID.ToString(), finalDestination);
@@ -857,30 +864,30 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} from {1} to {2}",
                 capsPath, sp.Scene.RegionInfo.RegionName, sp.Name);
 
-            //// TeleportFinish makes the client send CompleteMovementIntoRegion (at the destination), which
-            //// trigers a whole shebang of things there, including MakeRoot. So let's wait for confirmation
-            //// that the client contacted the destination before we close things here.
-            //if (!m_entityTransferStateMachine.WaitForAgentArrivedAtDestination(sp.UUID))
-            //{
-            //    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 WaitForAgentArrivedAtDestination due to previous client close.",
-            //            sp.Name, finalDestination.RegionName, sp.Scene.Name);
-
-            //        return;
-            //    }
-
-            //    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, currentAgentCircuit.SessionID.ToString(), "Destination region did not signal teleport completion.");
+            // TeleportFinish makes the client send CompleteMovementIntoRegion (at the destination), which
+            // trigers a whole shebang of things there, including MakeRoot. So let's wait for confirmation
+            // that the client contacted the destination before we close things here.
+            if (!m_entityTransferStateMachine.WaitForAgentArrivedAtDestination(sp.UUID))
+            {
+                if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Aborting)
+                {
+                    m_interRegionTeleportAborts.Value++;
 
-            //    return;
-            //}
+                    m_log.DebugFormat(
+                        "[ENTITY TRANSFER MODULE]: Aborted teleport of {0} to {1} from {2} after WaitForAgentArrivedAtDestination due to previous client close.",
+                        sp.Name, finalDestination.RegionName, sp.Scene.Name);
+
+                    return;
+                }
+
+                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, currentAgentCircuit.SessionID.ToString(), "Destination region did not signal teleport completion.");
+
+                return;
+            }
 
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp);
 
@@ -914,7 +921,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 //
                 // This sleep can be increased if necessary.  However, whilst it's active,
                 // an agent cannot teleport back to this region if it has teleported away.
-                Thread.Sleep(15000);
+                Thread.Sleep(2000);
 
                 sp.Scene.IncomingCloseAgent(sp.UUID, false);
             }
@@ -925,6 +932,126 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
         }
 
+        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;
+            }
+
+            // 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);
+
+            // 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.
+            m_log.DebugFormat("[ZZZ]: Sending Update");
+            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} from {2}.  Keeping avatar in source region.",
+                    sp.Name, finalDestination.RegionName, sp.Scene.RegionInfo.RegionName);
+
+                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);
+
+            // 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();
+
+            // OK, it got this agent. Let's close some child agents
+            sp.CloseChildAgents(newRegionX, newRegionY);
+
+            // 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))
+                sp.Scene.IncomingCloseAgent(sp.UUID, false);
+            else
+                // now we have a child agent in this region. 
+                sp.Reset();
+        }
+
         /// <summary>
         /// Clean up an inter-region teleport that did not complete, either because of simulator failure or cancellation.
         /// </summary>
@@ -938,11 +1065,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         {
             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.
             // XXX: Possibly this should be done asynchronously.
             Scene.SimulationService.CloseAgent(finalDestination, sp.UUID, auth_token);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 6d5039b..7dd10f7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         /// <summary>
         /// Version of this service
         /// </summary>
-        private const string m_Version = "SIMULATION/0.1";
+        private const string m_Version = "SIMULATION/0.2";
 
         /// <summary>
         /// Map region ID to scene.
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d4ef3d9..da8a1b8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4221,6 +4221,20 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 childAgentUpdate.ChildAgentDataUpdate(cAgentData);
+
+                int ntimes = 20;
+                if (cAgentData.SenderWantsToWaitForRoot)
+                {
+                    while (childAgentUpdate.IsChildAgent && ntimes-- > 0)
+                        Thread.Sleep(500);
+
+                    m_log.DebugFormat(
+                        "[SCENE PRESENCE]: Found presence {0} {1} {2} in {3} after {4} waits",
+                        childAgentUpdate.Name, childAgentUpdate.UUID, childAgentUpdate.IsChildAgent ? "child" : "root", RegionInfo.RegionName, 20 - ntimes);
+
+                    if (childAgentUpdate.IsChildAgent)
+                        return false;
+                }
                 return true;
             }
             return false;
@@ -4278,10 +4292,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;
         }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6433878..891e04e 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;
@@ -1311,6 +1313,26 @@ namespace OpenSim.Region.Framework.Scenes
                 PhysicsActor.Size = new Vector3(0.45f, 0.6f, height);
         }
 
+        private bool WaitForUpdateAgent(IClientAPI client)
+        {
+            // Before UpdateAgent, m_originRegionID is UUID.Zero; after, it's non-Zero
+            int count = 20;
+            while (m_originRegionID.Equals(UUID.Zero) && count-- > 0)
+            {
+                m_log.DebugFormat("[SCENE PRESENCE]: Agent {0} waiting for update in {1}", client.Name, Scene.RegionInfo.RegionName);
+                Thread.Sleep(200);
+            }
+
+            if (m_originRegionID.Equals(UUID.Zero))
+            {
+                // Movement into region will fail
+                m_log.WarnFormat("[SCENE PRESENCE]: Update agent {0} never arrived", client.Name);
+                return false;
+            }
+
+            return true;
+        }
+
         /// <summary>
         /// Complete Avatar's movement into the region.
         /// </summary>
@@ -1328,6 +1350,12 @@ namespace OpenSim.Region.Framework.Scenes
                 "[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}",
                 client.Name, Scene.RegionInfo.RegionName, AbsolutePosition);
 
+            if (m_teleportFlags != TeleportFlags.ViaLogin)
+                // 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))
@@ -1348,10 +1376,11 @@ 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
-            // This will also send the initial data to clients when TP to a neighboring region. 
-            // Not ideal, but until we know we're TP-ing from a neighboring region, there's not much we can do
             if (m_teleportFlags > 0)
                 SendInitialDataToMe();
 
-- 
cgit v1.1


From aaee63af8241f23c94bc97435a3b1d17425df890 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 22 Jul 2013 13:16:13 -0700
Subject: Minor improvements on TP V1 trying to make it exactly as it was
 before.

---
 .../EntityTransfer/EntityTransferModule.cs         | 32 ++++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index b0c0b1d..4f11326 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -697,6 +697,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             ulong destinationHandle = finalDestination.RegionHandle;
             AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
 
+            m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Using TP V1");
             // 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;
@@ -736,7 +737,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             // Past this point we have to attempt clean up if the teleport fails, so update transfer state.
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.Transferring);
-        
+
+            // OK, it got this agent. Let's close some child agents
+            sp.CloseChildAgents(newRegionX, newRegionY);
+
             IClientIPEndpoint ipepClient;
             string capsPath = String.Empty;
             if (NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY))
@@ -811,17 +815,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // 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);
-            }
-        
             // A common teleport failure occurs when we can send CreateAgent to the 
             // destination region but the viewer cannot establish the connection (e.g. due to network issues between
             // the viewer and the destination).  In this case, UpdateAgent timesout after 10 seconds, although then
@@ -847,6 +840,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 return;
             }
 
+            // 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);
+            }
+            else
+            {
+                sp.ControllingClient.SendRegionTeleport(destinationHandle, 13, endPoint, 4,
+                                                            teleportFlags, capsPath);
+            }
+
             if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Cancelling)
             {
                 m_interRegionTeleportCancels.Value++;
@@ -908,9 +912,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // Now let's make it officially a child agent
             sp.MakeChildAgent();
 
-            // OK, it got this agent. Let's close some child agents
-            sp.CloseChildAgents(newRegionX, newRegionY);
-
             // 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))
@@ -1063,6 +1064,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// <param name='finalDestination'></param>
         protected virtual void CleanupFailedInterRegionTeleport(ScenePresence sp, string auth_token, GridRegion finalDestination)
         {
+            m_log.DebugFormat("[ZZZ]: FAIL!");
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp);
 
             if (sp.IsChildAgent) // We had set it to child before attempted TP (V1)
-- 
cgit v1.1


From d7984ef775d0854606dadd71eac77d5f487ab8df Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 22 Jul 2013 13:29:58 -0700
Subject: More on putting TP V1 as it was

---
 .../EntityTransfer/EntityTransferModule.cs         | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 4f11326..22b577b 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -810,11 +810,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 return;
             }
 
-            // 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;
-
             // A common teleport failure occurs when we can send CreateAgent to the 
             // destination region but the viewer cannot establish the connection (e.g. due to network issues between
             // the viewer and the destination).  In this case, UpdateAgent timesout after 10 seconds, although then
@@ -840,17 +835,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 return;
             }
 
-            // 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);
-            }
-            else
-            {
-                sp.ControllingClient.SendRegionTeleport(destinationHandle, 13, endPoint, 4,
-                                                            teleportFlags, capsPath);
-            }
-
             if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Cancelling)
             {
                 m_interRegionTeleportCancels.Value++;
@@ -868,6 +852,22 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} from {1} to {2}",
                 capsPath, sp.Scene.RegionInfo.RegionName, sp.Name);
 
+            // 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;
+
+            // 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);
+            }
+            else
+            {
+                sp.ControllingClient.SendRegionTeleport(destinationHandle, 13, endPoint, 4,
+                                                            teleportFlags, capsPath);
+            }
+
             // TeleportFinish makes the client send CompleteMovementIntoRegion (at the destination), which
             // trigers a whole shebang of things there, including MakeRoot. So let's wait for confirmation
             // that the client contacted the destination before we close things here.
-- 
cgit v1.1


From 261512606d77747701934e80e150bd55454571f2 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 22 Jul 2013 14:23:50 -0700
Subject: Improve the opening test in CompleteMovement, to account for multiple
 flags besides ViaLogin.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 891e04e..edd49eb 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1350,7 +1350,7 @@ namespace OpenSim.Region.Framework.Scenes
                 "[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}",
                 client.Name, Scene.RegionInfo.RegionName, AbsolutePosition);
 
-            if (m_teleportFlags != TeleportFlags.ViaLogin)
+            if ((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
-- 
cgit v1.1


From 879cbb45753bf3f3144512748acd8faf120fc626 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 22 Jul 2013 14:35:14 -0700
Subject: This commit message intentionally left blank (last commit was
 idiotic)

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index edd49eb..7f24174 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1350,7 +1350,8 @@ namespace OpenSim.Region.Framework.Scenes
                 "[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}",
                 client.Name, Scene.RegionInfo.RegionName, AbsolutePosition);
 
-            if ((m_teleportFlags & TeleportFlags.ViaLogin) != 0)
+            // Make sure it's not a login agent. We don't want to wait for updates during login
+            if ((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
-- 
cgit v1.1


From c0433d5e4c8170de10e16dd09d85bf620a1530ae Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 22 Jul 2013 18:46:51 -0700
Subject: Changed the RegionHandshake packet to the Unknown queue, so that it
 is sent with high priority and hopefully gets to the client before
 AgentMovementComplete

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 32549c8..8b2440a 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -811,7 +811,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             handshake.RegionInfo4[0].RegionFlagsExtended = args.regionFlags;
             handshake.RegionInfo4[0].RegionProtocols = 0; // 1 here would indicate that SSB is supported
 
-            OutPacket(handshake, ThrottleOutPacketType.Task);
+            OutPacket(handshake, ThrottleOutPacketType.Unknown);
         }
 
 
-- 
cgit v1.1


From 14530b260764372df3627206c531b96b9d817dbe Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 22 Jul 2013 20:20:48 -0700
Subject: Minor adjustment on timings of waits.

---
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs   | 23 ++++++++++++++++++----
 OpenSim/Region/Framework/Scenes/Scene.cs           |  4 ++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 1b72b26..43167ee 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1631,11 +1631,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 CompleteAgentMovementPacket packet = (CompleteAgentMovementPacket)array[1];
 
                 // Determine which agent this packet came from
-                int count = 10;
-                while (!m_scene.TryGetClient(endPoint, out client) && count-- > 0)
+                int count = 20;
+                bool ready = false;
+                while (!ready && count-- > 0)
                 {
-                    m_log.Debug("[LLUDPSERVER]: Received a CompleteMovementIntoRegion in " + m_scene.RegionInfo.RegionName + " (not ready yet)");
-                    Thread.Sleep(200);
+                    if (m_scene.TryGetClient(endPoint, out client) && client.IsActive)
+                    {
+                        LLUDPClient udpClient = ((LLClientView)client).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)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index da8a1b8..84fdef0 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4226,10 +4226,10 @@ namespace OpenSim.Region.Framework.Scenes
                 if (cAgentData.SenderWantsToWaitForRoot)
                 {
                     while (childAgentUpdate.IsChildAgent && ntimes-- > 0)
-                        Thread.Sleep(500);
+                        Thread.Sleep(1000);
 
                     m_log.DebugFormat(
-                        "[SCENE PRESENCE]: Found presence {0} {1} {2} in {3} after {4} waits",
+                        "[SCENE]: Found presence {0} {1} {2} in {3} after {4} waits",
                         childAgentUpdate.Name, childAgentUpdate.UUID, childAgentUpdate.IsChildAgent ? "child" : "root", RegionInfo.RegionName, 20 - ntimes);
 
                     if (childAgentUpdate.IsChildAgent)
-- 
cgit v1.1


From e6a0f6e428e32356eba14729766aac28cec9989f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 22 Jul 2013 20:49:40 -0700
Subject: One more thing to test in order to let CompleteMovement go up the
 stack.

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 43167ee..f40948f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1635,9 +1635,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 bool ready = false;
                 while (!ready && count-- > 0)
                 {
-                    if (m_scene.TryGetClient(endPoint, out client) && client.IsActive)
+                    if (m_scene.TryGetClient(endPoint, out client) && client.IsActive && client.SceneAgent != null)
                     {
-                        LLUDPClient udpClient = ((LLClientView)client).UDPClient;
+                        LLClientView llClientView = (LLClientView)client;
+                        LLUDPClient udpClient = llClientView.UDPClient;
                         if (udpClient != null && udpClient.IsConnected)
                             ready = true;
                         else
-- 
cgit v1.1


From 4e5c7bdeb3222edeff8fbf8c01ce0b5916473e46 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 22 Jul 2013 22:00:20 -0700
Subject: Moved TriggerOnMakeRootAgent back to the end of MakeRootAgent, to see
 if that eliminates the temporary placement at infinity upon TPs

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 7f24174..f9190d9 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1013,9 +1013,8 @@ namespace OpenSim.Region.Framework.Scenes
             // recorded, which stops the input from being processed.
             MovementFlag = 0;
 
-            // DIVA NOTE: I moved TriggerOnMakeRootAgent out of here and into the end of
-            // CompleteMovement. We don't want modules doing heavy computation before CompleteMovement
-            // is over.
+            m_scene.EventManager.TriggerOnMakeRootAgent(this);
+
         }
 
         public int GetStateSource()
@@ -1437,10 +1436,6 @@ namespace OpenSim.Region.Framework.Scenes
 //                "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 
 //                client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
 
-            // DIVA NOTE: moved this here from MakeRoot. We don't want modules making heavy
-            // computations before CompleteMovement is over
-            m_scene.EventManager.TriggerOnMakeRootAgent(this);
-
         }
 
         /// <summary>
-- 
cgit v1.1


From 46d017b19745ccdd5948865de53375a814bf2659 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 24 Jul 2013 12:54:13 -0700
Subject: Today's wild shot at the infinity problem. Wait on the child agent
 left behind.

---
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 22b577b..29ba5f8 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1047,7 +1047,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // 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))
+            {
+                Thread.Sleep(5000);
                 sp.Scene.IncomingCloseAgent(sp.UUID, false);
+            }
             else
                 // now we have a child agent in this region. 
                 sp.Reset();
@@ -1064,7 +1067,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// <param name='finalDestination'></param>
         protected virtual void CleanupFailedInterRegionTeleport(ScenePresence sp, string auth_token, GridRegion finalDestination)
         {
-            m_log.DebugFormat("[ZZZ]: FAIL!");
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp);
 
             if (sp.IsChildAgent) // We had set it to child before attempted TP (V1)
-- 
cgit v1.1


From f0320f56520318d20e8aa250c441b72aa1f0019c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 24 Jul 2013 14:22:59 -0700
Subject: The previous commit did fix the infinity problem! I'm putting the
 same time on TP_V1 and adding a big red warning on top of those lines.

---
 .../Framework/EntityTransfer/EntityTransferModule.cs | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 29ba5f8..1ea0fd7 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -916,13 +916,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
             {
-                // 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(2000);
+                // 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(5000);
 
                 sp.Scene.IncomingCloseAgent(sp.UUID, false);
             }
@@ -1048,6 +1048,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
             {
+                // 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(5000);
                 sp.Scene.IncomingCloseAgent(sp.UUID, false);
             }
-- 
cgit v1.1


From cac37e298c267e4fa9c8d4306df85d74bff81fbe Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 24 Jul 2013 14:24:17 -0700
Subject: Deleted all [ZZZ] debug messages.

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs                 | 5 -----
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs     | 1 -
 2 files changed, 6 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index f40948f..25e10be 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1257,7 +1257,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // UseCircuitCode handling
             if (packet.Type == PacketType.UseCircuitCode)
             {
-                m_log.DebugFormat("[ZZZ]: In the dungeon: UseCircuitCode");
                 // 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 };
@@ -1271,7 +1270,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // Send ack straight away to let the viewer know that we got it.
                 SendAckImmediate(endPoint, packet.Header.Sequence);
 
-                m_log.DebugFormat("[ZZZ]: In the dungeon: CompleteAgentMovement");
                 // 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 };
@@ -2080,9 +2078,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             Packet packet = incomingPacket.Packet;
             LLClientView client = incomingPacket.Client;
 
-            if (packet is CompleteAgentMovementPacket)
-                m_log.DebugFormat("[ZZZ]: Received CompleteAgentMovementPacket");
-
             if (client.IsActive)
             {
                 m_currentIncomingClient = client;
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 1ea0fd7..70fbfc3 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1008,7 +1008,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // 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.
-            m_log.DebugFormat("[ZZZ]: Sending Update");
             if (!UpdateAgent(reg, finalDestination, agent, sp))
             {
                 if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Aborting)
-- 
cgit v1.1


From 20b989e048fff3215b90af6a34954b7ceb5e9868 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 24 Jul 2013 17:10:26 -0700
Subject: Increased the wait time to 15 secs. In a 0.7.5 standalone where the
 effect was always present, this seems to have fixed it.

---
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 70fbfc3..ea2d9b5 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -922,7 +922,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 // 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(5000);
+                Thread.Sleep(15000);
 
                 sp.Scene.IncomingCloseAgent(sp.UUID, false);
             }
@@ -1053,7 +1053,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 // 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(5000);
+                Thread.Sleep(15000);
                 sp.Scene.IncomingCloseAgent(sp.UUID, false);
             }
             else
-- 
cgit v1.1


From 1fabdcc43cc2d62ff03888166582b25884056e94 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 26 Jul 2013 01:04:16 +0100
Subject: If a returning teleport starts to reuse a downgraded child connection
 that was a previous root agent, do not close that child agent at the end of
 the 15 sec teleport timer.

This prevents an issue if the user teleports back to the neighbour simulator of a source before 15 seconds have elapsed.
This more closely emulates observed linden behaviour, though the timeout there is 50 secs and applies to all the pre-teleport agents.
Currently sticks a DoNotClose flag on ScenePresence though this may be temporary as possibly it could be incorporated into the ETM state machine
---
 .../EntityTransfer/EntityTransferModule.cs         | 10 +++++++-
 OpenSim/Region/Framework/Scenes/Scene.cs           | 29 ++++++++++++++--------
 OpenSim/Region/Framework/Scenes/ScenePresence.cs   |  7 ++++++
 3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index ea2d9b5..31db778 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1054,7 +1054,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 // 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);
-                sp.Scene.IncomingCloseAgent(sp.UUID, false);
+            
+                if (!sp.DoNotClose)
+                {
+                    sp.Scene.IncomingCloseAgent(sp.UUID, false);
+                }
+                else
+                {
+                    sp.DoNotClose = false;
+                }
             }
             else
                 // now we have a child agent in this region. 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 84fdef0..f4622b6 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3682,19 +3682,26 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 ScenePresence sp = GetScenePresence(agent.AgentID);
     
-                if (sp != null && !sp.IsChildAgent)
+                if (sp != null)
                 {
-                    // 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)
-                        sp.ControllingClient.Close(true);
+                    if (!sp.IsChildAgent)
+                    {
+                        // We have a zombie from a crashed session. 
+                        // Or the same user is trying to be root twice here, won't work.
+                        // Kill it.
+                        m_log.WarnFormat(
+                            "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting.  Removing existing presence.",
+                            sp.Name, sp.UUID, RegionInfo.RegionName);
+        
+                        if (sp.ControllingClient != null)
+                            sp.ControllingClient.Close(true);
 
-                    sp = null;
+                        sp = null;
+                    }
+                    else
+                    {
+                        sp.DoNotClose = true;
+                    }
                 }
 
                 // Optimistic: add or update the circuit data with the new agent circuit data and teleport flags.
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index f9190d9..d3e1946 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -717,6 +717,13 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        /// <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 DoNotClose { get; set; }
+
         private float m_speedModifier = 1.0f;
 
         public float SpeedModifier
-- 
cgit v1.1


From 72ed49af5f864e50fa4453849a94dd9d46533cba Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 26 Jul 2013 01:38:04 +0100
Subject: Reset DoNotClose scene presence teleport flag before pausing.  Rename
 DoNotClose to DoNotCloseAfterTeleport

---
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs    | 6 ++++--
 OpenSim/Region/Framework/Scenes/Scene.cs                            | 2 +-
 OpenSim/Region/Framework/Scenes/ScenePresence.cs                    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 31db778..8ce6bb4 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1047,6 +1047,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
             {
+                sp.DoNotCloseAfterTeleport = false;
+
                 // RED ALERT!!!!
                 // PLEASE DO NOT DECREASE THIS WAIT TIME UNDER ANY CIRCUMSTANCES.
                 // THE VIEWERS SEEM TO NEED SOME TIME AFTER RECEIVING MoveAgentIntoRegion
@@ -1055,13 +1057,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 // IN THE AVIE BEING PLACED IN INFINITY FOR A COUPLE OF SECONDS.
                 Thread.Sleep(15000);
             
-                if (!sp.DoNotClose)
+                if (!sp.DoNotCloseAfterTeleport)
                 {
                     sp.Scene.IncomingCloseAgent(sp.UUID, false);
                 }
                 else
                 {
-                    sp.DoNotClose = false;
+                    sp.DoNotCloseAfterTeleport = false;
                 }
             }
             else
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f4622b6..705660d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3700,7 +3700,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                     else
                     {
-                        sp.DoNotClose = true;
+                        sp.DoNotCloseAfterTeleport = true;
                     }
                 }
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d3e1946..4044f0c 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -722,7 +722,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// teleport is reusing the connection.
         /// </summary>
         /// <remarks>May be refactored or move somewhere else soon.</remarks>
-        public bool DoNotClose { get; set; }
+        public bool DoNotCloseAfterTeleport { get; set; }
 
         private float m_speedModifier = 1.0f;
 
-- 
cgit v1.1


From 4cd03d8c314864eeeb9f11b34fc7e687ac96b858 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 26 Jul 2013 01:40:56 +0100
Subject: Return Simulator/0.1 (V1) entity transfer behaviour to waiting only 2
 seconds before closing root agent after 15.

This is because a returning viewer by teleport before 15 seconds are up will be disrupted by the close.
The 2 second delay is within the scope where a normal viewer would not allow a teleport back anyway.
Simulator/0.2 (V2) protocol will continue with the longer delay since this is actually the behaviour viewers get from the ll grid
and an early close causes other issues (avatar being sent to infinite locations temporarily, etc.)
---
 .../Framework/EntityTransfer/EntityTransferModule.cs       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 8ce6bb4..3f1686c 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -916,13 +916,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
             {
-                // 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);
+                // 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(2000);
 
                 sp.Scene.IncomingCloseAgent(sp.UUID, false);
             }
-- 
cgit v1.1


From 878ce1e6b2b96043052015732286141f5b71310b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 25 Jul 2013 23:44:58 -0700
Subject: This should fix all issues with teleports. One should be able to TP
 as fast as needed. (Although sometimes Justin's state machine kicks in and
 doesn't let you) The EventQueues are a hairy mess, and it's very easy to mess
 things up. But it looks like this commit makes them work right. Here's what's
 going on: - Child and root agents are only closed after 15 sec, maybe - If
 the user comes back, they aren't closed, and everything is reused - On the
 receiving side, clients and scene presences are reused if they already exist
 - Caps are always recreated (this is where I spent most of my time!). It
 turns out that, because the agents carry the seeds around, the seed gets the
 same URL, except for the root agent coming back to a far away region, which
 gets a new seed (because we don't know what was its seed in the departing
 region, and we can't send it back to the client when the agent returns
 there).

---
 .../Linden/Caps/EventQueue/EventQueueGetModule.cs  | 58 +++++---------------
 .../Framework/Caps/CapabilitiesModule.cs           | 11 ++--
 .../EntityTransfer/EntityTransferModule.cs         | 11 ++--
 OpenSim/Region/Framework/Scenes/Scene.cs           | 61 ++++++++++------------
 4 files changed, 54 insertions(+), 87 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index c5e28ad..d02496f 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -91,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(
@@ -120,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);
@@ -189,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];
             }
         }
@@ -228,8 +224,12 @@ namespace OpenSim.Region.ClientStack.Linden
             {
                 Queue<OSD> queue = GetQueue(avatarID);
                 if (queue != null)
+                {
                     lock (queue)
                         queue.Enqueue(ev);
+                }
+                else
+                    m_log.WarnFormat("[EVENTQUEUE]: (Enqueue) No queue found for agent {0} in region {1}", avatarID, m_scene.RegionInfo.RegionName);
             } 
             catch (NullReferenceException e)
             {
@@ -244,7 +244,7 @@ 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);
+            //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)
@@ -261,31 +261,6 @@ namespace OpenSim.Region.ClientStack.Linden
             lock (m_AvatarQueueUUIDMapping)
                 m_AvatarQueueUUIDMapping.Remove(agentID);
 
-//            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);
-//                }
-//            }
-
             UUID searchval = UUID.Zero;
 
             removeitems.Clear();
@@ -305,19 +280,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>
@@ -417,7 +382,12 @@ namespace OpenSim.Region.ClientStack.Linden
             if (DebugLevel >= 2)
                 m_log.WarnFormat("POLLED FOR EQ MESSAGES BY {0} in {1}", pAgentId, m_scene.RegionInfo.RegionName);
 
-            Queue<OSD> queue = TryGetQueue(pAgentId);
+            Queue<OSD> queue = GetQueue(pAgentId);
+            if (queue == null)
+            {
+                return NoEvents(requestID, pAgentId);
+            }
+
             OSD element;
             lock (queue)
             {
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index ad1c4ce..6545a99 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -132,13 +132,9 @@ namespace OpenSim.Region.CoreModules.Framework
                 {
                     Caps oldCaps = m_capsObjects[agentId];
                     
-                    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;
+                    //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);
                 }
 
                 caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName,
@@ -153,6 +149,7 @@ namespace OpenSim.Region.CoreModules.Framework
 
         public void RemoveCaps(UUID agentId)
         {
+            m_log.DebugFormat("[CAPS]: Remove caps for agent {0} in region {1}", agentId, m_scene.RegionInfo.RegionName);
             lock (m_childrenSeeds)
             {
                 if (m_childrenSeeds.ContainsKey(agentId))
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 3f1686c..96cd6b9 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -316,7 +316,8 @@ 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("Slow down!");
                 return;
             }
 
@@ -1040,9 +1041,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // Now let's make it officially a child agent
             sp.MakeChildAgent();
 
-            // OK, it got this agent. Let's close some child agents
-            sp.CloseChildAgents(newRegionX, newRegionY);
-
             // 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))
@@ -1059,10 +1057,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             
                 if (!sp.DoNotCloseAfterTeleport)
                 {
+                    // OK, it got this agent. Let's close everything
+                    m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Closing in agent {0} in region {1}", sp.Name, Scene.RegionInfo.RegionName);
+                    sp.CloseChildAgents(newRegionX, newRegionY);
                     sp.Scene.IncomingCloseAgent(sp.UUID, false);
+
                 }
                 else
                 {
+                    m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Not closing agent {0}, user is back in {0}", sp.Name, Scene.RegionInfo.RegionName);
                     sp.DoNotCloseAfterTeleport = false;
                 }
             }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 705660d..6d0b13f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2805,6 +2805,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             ScenePresence sp;
             bool vialogin;
+            bool reallyNew = true;
 
             // Validation occurs in LLUDPServer
             //
@@ -2856,6 +2857,7 @@ 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
@@ -2867,7 +2869,9 @@ namespace OpenSim.Region.Framework.Scenes
                 // 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);
             }
@@ -3426,15 +3430,8 @@ namespace OpenSim.Region.Framework.Scenes
                     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.
@@ -3686,21 +3683,29 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     if (!sp.IsChildAgent)
                     {
-                        // We have a zombie from a crashed session. 
-                        // Or the same user is trying to be root twice here, won't work.
-                        // Kill it.
-                        m_log.WarnFormat(
-                            "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting.  Removing existing presence.",
-                            sp.Name, sp.UUID, RegionInfo.RegionName);
-        
-                        if (sp.ControllingClient != null)
-                            sp.ControllingClient.Close(true);
+                        // 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)
+                                sp.ControllingClient.Close(true);
 
-                        sp = null;
+                            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);
                     }
                     else
                     {
+                        // We have a child agent here
                         sp.DoNotCloseAfterTeleport = true;
+                        //m_log.WarnFormat("[SCENE]: Existing child scene presence for {0} {1} in {2}", sp.Name, sp.UUID, RegionInfo.RegionName);
                     }
                 }
 
@@ -3785,9 +3790,12 @@ namespace OpenSim.Region.Framework.Scenes
                             agent.AgentID, RegionInfo.RegionName);
     
                         sp.AdjustKnownSeeds();
-                        
+
                         if (CapsModule != null)
+                        {
                             CapsModule.SetAgentCapsSeeds(agent);
+                            CapsModule.CreateCaps(agent.AgentID);
+                        }
                     }
                 }
 
@@ -5545,17 +5553,6 @@ namespace OpenSim.Region.Framework.Scenes
         {
             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;
-- 
cgit v1.1


From d5367a219daa0b946b3394e342734945d5ef7f1b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 26 Jul 2013 07:39:57 -0700
Subject: Slight improvement: no need to delay the removal of the queues in EQ,
 because DisableSimulator is now being sent via UDP

---
 .../ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs     | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index d02496f..c69f758 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -246,16 +246,8 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             //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);
-            }
-
             lock (queues)
-            {
                 queues.Remove(agentID);
-            }
 
             List<UUID> removeitems = new List<UUID>();
             lock (m_AvatarQueueUUIDMapping)
-- 
cgit v1.1


From dd2c211e62b25f19386c1f4b5bc7ace40efa429a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 26 Jul 2013 07:40:55 -0700
Subject: Comment debug message

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 6d0b13f..dec493b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3698,8 +3698,8 @@ namespace OpenSim.Region.Framework.Scenes
 
                             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);
+                        //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);
                     }
                     else
                     {
-- 
cgit v1.1


From a08f01fa8323e18a63e920158c7f51ae78ac0e93 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 26 Jul 2013 18:43:15 +0100
Subject: Fix NPC regression test failures.

These were genuine failures caused by ScenePresence.CompleteMovement() waiting for an UpdateAgent from NPC introduction that would never come.
Instead, we do not wait if the agent is an NPC.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs                 | 4 +++-
 OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | 2 +-
 OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs     | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4044f0c..17da0d9 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1357,11 +1357,13 @@ namespace OpenSim.Region.Framework.Scenes
                 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 ((m_teleportFlags & TeleportFlags.ViaLogin) == 0)
+            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;
 
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index bf23040..f841d5c 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/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);
-- 
cgit v1.1


From ad2ebd2f3dc70d708aa00a5fef59aeb3a3e16a44 Mon Sep 17 00:00:00 2001
From: nebadon
Date: Fri, 26 Jul 2013 14:11:42 -0400
Subject: Force map tiler to save Water.jpg as an actual jpeg format it seems
 even though we specified jpg extention it was actually a png and thus
 confusing the viewer silently.

---
 OpenSim/Services/MapImageService/MapImageService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
                     }
                 }
             }
-- 
cgit v1.1


From 9038a503eb91625a2e8a2070007f8d7765ecf86c Mon Sep 17 00:00:00 2001
From: nebadon
Date: Fri, 26 Jul 2013 14:17:36 -0400
Subject: Add Aleric to Contributors list, thanks Aleric!!

---
 CONTRIBUTORS.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index f621cd3..8181483 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -65,6 +65,7 @@ what it is today.
 * A_Biondi
 * alex_carnell
 * Alan Webb (IBM)
+* Aleric
 * Allen Kerensky
 * BigFootAg
 * BlueWall Slade
-- 
cgit v1.1


From 056a6ee7653b17d8c1d92519f34f029bcd602143 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 26 Jul 2013 19:22:30 +0100
Subject: Fix regression tests relating to agent transfer by making simulator
 use last week's SIMULATOR/0.1 protocol for now.

---
 OpenSim/Framework/Servers/MainServer.cs                     |  5 +++++
 .../Avatar/Attachments/Tests/AttachmentsModuleTests.cs      |  9 +++++++++
 .../Simulation/LocalSimulationConnector.cs                  | 13 +++++++++----
 .../Framework/Scenes/Tests/ScenePresenceTeleportTests.cs    |  6 ++++++
 OpenSim/Tests/Common/OpenSimTestCase.cs                     | 12 ++++++++++--
 5 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index d189580..57931d4 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -285,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/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index 508743c..4ecae73 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;
@@ -802,6 +804,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             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,6 +836,9 @@ 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);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 7dd10f7..bee602e 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.2";
+        /// <remarks>
+        /// Currently valid versions are "SIMULATION/0.1" and "SIMULATION/0.2"
+        /// </remarks>
+        public string ServiceVersion { get; set; }
 
         /// <summary>
         /// Map region ID to scene.
@@ -64,6 +67,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 
         public void Initialise(IConfigSource config)
         {
+            ServiceVersion = "SIMULATION/0.2";
+
             IConfig moduleConfig = config.Configs["Modules"];
             if (moduleConfig != null)
             {
@@ -253,7 +258,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         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;
 
@@ -359,4 +364,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
index 297c66b..afd2779 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
@@ -136,6 +136,9 @@ 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);
 
@@ -454,6 +457,9 @@ 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);
 
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
-- 
cgit v1.1


From 840be97e40179c17d57e1943555643b57f47ae5a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 26 Jul 2013 20:52:30 +0100
Subject: Fix failure in TestCreateDuplicateRootScenePresence().

This is a test setup failure since code paths when adding a duplicate root scene presence now require the EntityTransferModule to be present.
Test fixed by adding this module to test setup
---
 .../Framework/Scenes/Tests/ScenePresenceAgentTests.cs       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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);
 
-- 
cgit v1.1


From ba9daf849e7c8db48e7c03e7cdedb77776b2052f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 26 Jul 2013 22:52:08 +0100
Subject: Fix regression from 056a6ee7 because the RemoteSimulationConnector
 uses a copy of the LocalSimulationConnector but never initializes it (hence
 ServiceVersion was never set)

---
 .../ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index bee602e..697ce68 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -63,12 +63,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         /// </summary>
         private bool m_ModuleEnabled = false;
 
+        public LocalSimulationConnectorModule()
+        {
+            ServiceVersion = "SIMULATION/0.2";
+        }
+
         #region Region Module interface
 
         public void Initialise(IConfigSource config)
         {
-            ServiceVersion = "SIMULATION/0.2";
-
             IConfig moduleConfig = config.Configs["Modules"];
             if (moduleConfig != null)
             {
-- 
cgit v1.1


From 428916a64d27e5f00e74d34fd4b0453f32c3d2de Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 26 Jul 2013 21:14:21 -0700
Subject: Commented out ChatSessionRequest capability in Vivox and Freeswitch.
 We aren't processing it in any meaningful way, and it seems to get invoked
 everytime someone types a message in group chat.

---
 .../Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs     | 18 +++++++++---------
 .../Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs        | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index ef1b92e..5a5a70c 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 2d65530..cdab116 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -433,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>
-- 
cgit v1.1


From 85428c49bb99484e15dd948ec48a285291e5a74c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 26 Jul 2013 21:27:00 -0700
Subject: Trying to decrease the lag on group chat. (Groups V2 only)

---
 OpenSim/Addons/Groups/GroupsMessagingModule.cs | 40 +++++++++++++++-----------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
index d172d48..31e9175 100644
--- a/OpenSim/Addons/Groups/GroupsMessagingModule.cs
+++ b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
@@ -264,8 +264,32 @@ namespace OpenSim.Groups
 
             int requestStartTick = Environment.TickCount;
 
+            // Copy Message
+            GridInstantMessage msg = new GridInstantMessage();
+            msg.imSessionID = groupID.Guid;
+            msg.fromAgentName = im.fromAgentName;
+            msg.message = im.message;
+            msg.dialog = im.dialog;
+            msg.offline = im.offline;
+            msg.ParentEstateID = im.ParentEstateID;
+            msg.Position = im.Position;
+            msg.RegionID = im.RegionID;
+            msg.binaryBucket = im.binaryBucket;
+            msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
+
+            msg.fromAgentID = im.fromAgentID;
+            msg.fromGroup = true;
+
+            // Send to self first of all
+            msg.toAgentID = msg.fromAgentID; 
+            ProcessMessageFromGroupSession(msg);
+
+            // Then send to everybody else
             foreach (GroupMembersData member in groupMembers)
             {
+                if (member.AgentID.Guid == im.fromAgentID)
+                    continue;
+
                 if (m_groupData.hasAgentDroppedGroupChatSession(member.AgentID.ToString(), groupID))
                 {
                     // Don't deliver messages to people who have dropped this session
@@ -273,22 +297,6 @@ namespace OpenSim.Groups
                     continue;
                 }
 
-                // Copy Message
-                GridInstantMessage msg = new GridInstantMessage();
-                msg.imSessionID = groupID.Guid;
-                msg.fromAgentName = im.fromAgentName;
-                msg.message = im.message;
-                msg.dialog = im.dialog;
-                msg.offline = im.offline;
-                msg.ParentEstateID = im.ParentEstateID;
-                msg.Position = im.Position;
-                msg.RegionID = im.RegionID;
-                msg.binaryBucket = im.binaryBucket;
-                msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
-
-                msg.fromAgentID = im.fromAgentID;
-                msg.fromGroup = true;
-
                 msg.toAgentID = member.AgentID.Guid;
 
                 IClientAPI client = GetActiveClient(member.AgentID);
-- 
cgit v1.1


From 3dac92f345cf69244cbbd10e65d5a8c04da710f5 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 26 Jul 2013 21:40:04 -0700
Subject: Increased the rate of the PollServiceRequestManager to 0.5 secs (it
 was 1sec). Group chat is going over the EQ... Hopefully this won't increase
 CPU when there's nothing going on, but we need to watch for that.

---
 OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index d83daab..6ab05d0 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             // directly back in the "ready-to-serve" queue by the worker thread.
             while (m_running)
             {
-                Thread.Sleep(1000); 
+                Thread.Sleep(500); 
                 Watchdog.UpdateThread();
 
                 List<PollServiceHttpRequest> not_ready = new List<PollServiceHttpRequest>();
-- 
cgit v1.1


From 1572e91b5f74c991230e15b7ca120e83a6ed3eb4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 27 Jul 2013 08:04:48 -0700
Subject: Clarifications on documentation of Group configs

---
 bin/OpenSim.ini.example | 12 +++++++++---
 bin/OpenSimDefaults.ini |  1 -
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 4ddefba..c30c73d 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -579,9 +579,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
 
 
@@ -957,7 +957,7 @@
 
     ;# {LevelGroupCreate} {Enabled:true} {User level for creating groups} {} 0
     ;; Minimum user level required to create groups
-    ;LevelGroupCreate = 0
+    ; 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
@@ -1010,6 +1010,12 @@
     ;; Enable Group Notices
     ; NoticesEnabled = true
 
+    ;# {MessageOnlineUsersOnly} {Module:GroupsModule Module:Groups Module V2} {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 to both Group modules in core
+    ; MessageOnlineUsersOnly = false
+
     ;; This makes the Groups modules very chatty on the console.
     ; DebugEnabled = false
 
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6aa534a..e70b9b3 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1612,7 +1612,6 @@
 
     ; 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
     MessageOnlineUsersOnly = false
 
     ; Service connectors to the Groups Service.  Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
-- 
cgit v1.1


From 69975763d2a735eb2696d2e27e5796a472a208ea Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 27 Jul 2013 15:38:56 -0700
Subject: Several major improvements to group (V2) chat. Specifically: handle
 join/drop appropriately, invitechatboxes. The major departure from flotsam is
 to send only one message per destination region, as opposed to one message
 per group member. This reduces messaging considerably in large groups that
 have clusters of members in certain regions.

---
 OpenSim/Addons/Groups/GroupsMessagingModule.cs     | 385 +++++++++++++++------
 OpenSim/Addons/Groups/GroupsModule.cs              |  26 +-
 .../Hypergrid/GroupsServiceHGConnectorModule.cs    |  22 --
 OpenSim/Addons/Groups/IGroupsServicesConnector.cs  |   6 -
 .../Local/GroupsServiceLocalConnectorModule.cs     |  22 --
 .../Remote/GroupsServiceRemoteConnectorModule.cs   |  22 --
 OpenSim/Framework/GridInstantMessage.cs            |  18 +
 .../Linden/Caps/EventQueue/EventQueueGetModule.cs  |   4 +-
 .../Avatar/InstantMessage/MessageTransferModule.cs |   4 +-
 OpenSim/Region/Framework/Interfaces/IEventQueue.cs |   2 +-
 .../InstantMessageServiceConnector.cs              |   1 +
 11 files changed, 316 insertions(+), 196 deletions(-)

diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
index 31e9175..be76ef1 100644
--- a/OpenSim/Addons/Groups/GroupsMessagingModule.cs
+++ b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
@@ -39,6 +39,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Groups
 {
@@ -79,6 +80,10 @@ namespace OpenSim.Groups
 
         private int m_usersOnlineCacheExpirySeconds = 20;
 
+        private Dictionary<UUID, List<string>> m_groupsAgentsDroppedFromChatSession = new Dictionary<UUID, List<string>>();
+        private Dictionary<UUID, List<string>> m_groupsAgentsInvitedToChatSession = new Dictionary<UUID, List<string>>();
+
+
         #region Region Module interfaceBase Members
 
         public void Initialise(IConfigSource config)
@@ -227,62 +232,50 @@ namespace OpenSim.Groups
         
         public void SendMessageToGroup(GridInstantMessage im, UUID groupID)
         {
-            List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(new UUID(im.fromAgentID).ToString(), groupID);
+            UUID fromAgentID = new UUID(im.fromAgentID);
+            List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(fromAgentID.ToString(), groupID);
             int groupMembersCount = groupMembers.Count;
+            PresenceInfo[] onlineAgents = null;
 
-            if (m_messageOnlineAgentsOnly)
-            {
-                string[] t1 = groupMembers.ConvertAll<string>(gmd => gmd.AgentID.ToString()).ToArray();
+            // In V2 we always only send to online members.
+            // Sending to offline members is not an option.
+            string[] t1 = groupMembers.ConvertAll<string>(gmd => gmd.AgentID.ToString()).ToArray();
 
-                // We cache in order not to overwhlem the presence service on large grids with many groups.  This does
-                // mean that members coming online will not see all group members until after m_usersOnlineCacheExpirySeconds has elapsed.
-                // (assuming this is the same across all grid simulators).
-                PresenceInfo[] onlineAgents;
-                if (!m_usersOnlineCache.TryGetValue(groupID, out onlineAgents))
-                {
-                    onlineAgents = m_presenceService.GetAgents(t1);
-                    m_usersOnlineCache.Add(groupID, onlineAgents, m_usersOnlineCacheExpirySeconds);
-                }
+            // We cache in order not to overwhlem the presence service on large grids with many groups.  This does
+            // mean that members coming online will not see all group members until after m_usersOnlineCacheExpirySeconds has elapsed.
+            // (assuming this is the same across all grid simulators).
+            if (!m_usersOnlineCache.TryGetValue(groupID, out onlineAgents))
+            {
+                onlineAgents = m_presenceService.GetAgents(t1);
+                m_usersOnlineCache.Add(groupID, onlineAgents, m_usersOnlineCacheExpirySeconds);
+            }
 
-                HashSet<string> onlineAgentsUuidSet = new HashSet<string>();
-                Array.ForEach<PresenceInfo>(onlineAgents, pi => onlineAgentsUuidSet.Add(pi.UserID));
+            HashSet<string> onlineAgentsUuidSet = new HashSet<string>();
+            Array.ForEach<PresenceInfo>(onlineAgents, pi => onlineAgentsUuidSet.Add(pi.UserID));
 
-                groupMembers = groupMembers.Where(gmd => onlineAgentsUuidSet.Contains(gmd.AgentID.ToString())).ToList();
+            groupMembers = groupMembers.Where(gmd => onlineAgentsUuidSet.Contains(gmd.AgentID.ToString())).ToList();
 
-    //            if (m_debugEnabled)
+//            if (m_debugEnabled)
 //                    m_log.DebugFormat(
 //                        "[Groups.Messaging]: SendMessageToGroup called for group {0} with {1} visible members, {2} online",
 //                        groupID, groupMembersCount, groupMembers.Count());
-            }
-            else
-            {
-                if (m_debugEnabled)
-                    m_log.DebugFormat(
-                        "[Groups.Messaging]: SendMessageToGroup called for group {0} with {1} visible members",
-                        groupID, groupMembers.Count);
-            }
 
             int requestStartTick = Environment.TickCount;
 
-            // Copy Message
-            GridInstantMessage msg = new GridInstantMessage();
-            msg.imSessionID = groupID.Guid;
-            msg.fromAgentName = im.fromAgentName;
-            msg.message = im.message;
-            msg.dialog = im.dialog;
-            msg.offline = im.offline;
-            msg.ParentEstateID = im.ParentEstateID;
-            msg.Position = im.Position;
-            msg.RegionID = im.RegionID;
-            msg.binaryBucket = im.binaryBucket;
-            msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
-
-            msg.fromAgentID = im.fromAgentID;
-            msg.fromGroup = true;
+            im.imSessionID = groupID.Guid;
+            im.fromGroup = true;
+            IClientAPI thisClient = GetActiveClient(fromAgentID);
+            if (thisClient != null)
+            {
+                im.RegionID = thisClient.Scene.RegionInfo.RegionID.Guid;
+            }
 
             // Send to self first of all
-            msg.toAgentID = msg.fromAgentID; 
-            ProcessMessageFromGroupSession(msg);
+            im.toAgentID = im.fromAgentID; 
+            ProcessMessageFromGroupSession(im);
+
+            List<UUID> regions = new List<UUID>();
+            List<UUID> clientsAlreadySent = new List<UUID>();
 
             // Then send to everybody else
             foreach (GroupMembersData member in groupMembers)
@@ -290,27 +283,50 @@ namespace OpenSim.Groups
                 if (member.AgentID.Guid == im.fromAgentID)
                     continue;
 
-                if (m_groupData.hasAgentDroppedGroupChatSession(member.AgentID.ToString(), groupID))
+                if (hasAgentDroppedGroupChatSession(member.AgentID.ToString(), groupID))
                 {
                     // Don't deliver messages to people who have dropped this session
                     if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: {0} has dropped session, not delivering to them", member.AgentID);
                     continue;
                 }
 
-                msg.toAgentID = member.AgentID.Guid;
+                im.toAgentID = member.AgentID.Guid;
 
                 IClientAPI client = GetActiveClient(member.AgentID);
                 if (client == null)
                 {
                     // If they're not local, forward across the grid
+                    // BUT do it only once per region, please! Sim would be even better!
                     if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: Delivering to {0} via Grid", member.AgentID);
-                    m_msgTransferModule.SendInstantMessage(msg, delegate(bool success) { });
+
+                    bool reallySend = true;
+                    if (onlineAgents != null)
+                    {
+                        PresenceInfo presence = onlineAgents.First(p => p.UserID == member.AgentID.ToString());
+                        if (regions.Contains(presence.RegionID))
+                            reallySend = false;
+                        else
+                            regions.Add(presence.RegionID);
+                    }
+
+                    if (reallySend)
+                    {
+                        // We have to create a new IM structure because the transfer module
+                        // uses async send
+                        GridInstantMessage msg = new GridInstantMessage(im, true);
+                        m_msgTransferModule.SendInstantMessage(msg, delegate(bool success) { });
+                    }
                 }
                 else
                 {
                     // Deliver locally, directly
                     if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: Passing to ProcessMessageFromGroupSession to deliver to {0} locally", client.Name);
-                    ProcessMessageFromGroupSession(msg);
+
+                    if (clientsAlreadySent.Contains(member.AgentID))
+                        continue;
+                    clientsAlreadySent.Add(member.AgentID);
+
+                    ProcessMessageFromGroupSession(im);
                 }
             }
 
@@ -343,21 +359,90 @@ namespace OpenSim.Groups
             // Any other message type will not be delivered to a client by the 
             // Instant Message Module
 
-
+            UUID regionID = new UUID(msg.RegionID);
             if (m_debugEnabled)
             {
-                m_log.DebugFormat("[Groups.Messaging]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
+                m_log.DebugFormat("[Groups.Messaging]: {0} called, IM from region {1}", 
+                    System.Reflection.MethodBase.GetCurrentMethod().Name, regionID);
 
                 DebugGridInstantMessage(msg);
             }
 
             // Incoming message from a group
-            if ((msg.fromGroup == true) && 
-                ((msg.dialog == (byte)InstantMessageDialog.SessionSend)
-                 || (msg.dialog == (byte)InstantMessageDialog.SessionAdd)
-                 || (msg.dialog == (byte)InstantMessageDialog.SessionDrop)))
+            if ((msg.fromGroup == true) && (msg.dialog == (byte)InstantMessageDialog.SessionSend))
             {
-                ProcessMessageFromGroupSession(msg);
+                // We have to redistribute the message across all members of the group who are here
+                // on this sim
+
+                UUID GroupID = new UUID(msg.imSessionID);
+
+                Scene aScene = m_sceneList[0];
+                GridRegion regionOfOrigin = aScene.GridService.GetRegionByUUID(aScene.RegionInfo.ScopeID, regionID);
+
+                List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(new UUID(msg.fromAgentID).ToString(), GroupID);
+                List<UUID> alreadySeen = new List<UUID>();
+
+                foreach (Scene s in m_sceneList)
+                {
+                    s.ForEachScenePresence(sp =>
+                        {
+                            // We need this, because we are searching through all
+                            // SPs, both root and children
+                            if (alreadySeen.Contains(sp.UUID))
+                            {
+                                if (m_debugEnabled)
+                                    m_log.DebugFormat("[Groups.Messaging]: skipping agent {0} because we've already seen it", sp.UUID);
+                                return;
+                            }
+                            alreadySeen.Add(sp.UUID);
+
+                            GroupMembersData m = groupMembers.Find(gmd =>
+                                {
+                                    return gmd.AgentID == sp.UUID;
+                                });
+                            if (m.AgentID == UUID.Zero)
+                            {
+                                if (m_debugEnabled)
+                                    m_log.DebugFormat("[Groups.Messaging]: skipping agent {0} because he is not a member of the group", sp.UUID);
+                                return;
+                            }
+
+                            // Check if the user has an agent in the region where
+                            // the IM came from, and if so, skip it, because the IM
+                            // was already sent via that agent
+                            if (regionOfOrigin != null)
+                            {
+                                AgentCircuitData aCircuit = s.AuthenticateHandler.GetAgentCircuitData(sp.UUID);
+                                if (aCircuit != null)
+                                {
+                                    if (aCircuit.ChildrenCapSeeds.Keys.Contains(regionOfOrigin.RegionHandle))
+                                    {
+                                        if (m_debugEnabled)
+                                            m_log.DebugFormat("[Groups.Messaging]: skipping agent {0} because he has an agent in region of origin", sp.UUID);
+                                        return;
+                                    }
+                                    else                                
+                                    {
+                                        if (m_debugEnabled)
+                                            m_log.DebugFormat("[Groups.Messaging]: not skipping agent {0}", sp.UUID);
+                                    }
+                                }
+                            }
+
+                            UUID AgentID = sp.UUID;
+                            msg.toAgentID = AgentID.Guid;
+
+                            if (!hasAgentDroppedGroupChatSession(AgentID.ToString(), GroupID)
+                                && !hasAgentBeenInvitedToGroupChatSession(AgentID.ToString(), GroupID))
+                            {
+                                AddAgentToSession(AgentID, GroupID, msg);
+                            }
+
+                            if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: Passing to ProcessMessageFromGroupSession to deliver to {0} locally", sp.Name);
+
+                            ProcessMessageFromGroupSession(msg);
+                        });
+                }
             }
         }
 
@@ -367,82 +452,40 @@ namespace OpenSim.Groups
 
             UUID AgentID = new UUID(msg.fromAgentID);
             UUID GroupID = new UUID(msg.imSessionID);
+            UUID toAgentID = new UUID(msg.toAgentID);
 
             switch (msg.dialog)
             {
                 case (byte)InstantMessageDialog.SessionAdd:
-                    m_groupData.AgentInvitedToGroupChatSession(AgentID.ToString(), GroupID);
+                    AgentInvitedToGroupChatSession(AgentID.ToString(), GroupID);
                     break;
 
                 case (byte)InstantMessageDialog.SessionDrop:
-                    m_groupData.AgentDroppedFromGroupChatSession(AgentID.ToString(), GroupID);
+                    AgentDroppedFromGroupChatSession(AgentID.ToString(), GroupID);
                     break;
 
                 case (byte)InstantMessageDialog.SessionSend:
-                    if (!m_groupData.hasAgentDroppedGroupChatSession(AgentID.ToString(), GroupID)
-                        && !m_groupData.hasAgentBeenInvitedToGroupChatSession(AgentID.ToString(), GroupID)
-                        )
+                    // User hasn't dropped, so they're in the session, 
+                    // maybe we should deliver it.
+                    IClientAPI client = GetActiveClient(new UUID(msg.toAgentID));
+                    if (client != null)
                     {
-                        // Agent not in session and hasn't dropped from session
-                        // Add them to the session for now, and Invite them
-                        m_groupData.AgentInvitedToGroupChatSession(AgentID.ToString(), GroupID);
+                        // Deliver locally, directly
+                        if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: Delivering to {0} locally", client.Name);
 
-                        UUID toAgentID = new UUID(msg.toAgentID);
-                        IClientAPI activeClient = GetActiveClient(toAgentID);
-                        if (activeClient != null)
+                        if (!hasAgentDroppedGroupChatSession(toAgentID.ToString(), GroupID))
                         {
-                            GroupRecord groupInfo = m_groupData.GetGroupRecord(UUID.Zero.ToString(), GroupID, null);
-                            if (groupInfo != null)
-                            {
-                                if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: Sending chatterbox invite instant message");
-
-                                // Force? open the group session dialog???
-                                // and simultanously deliver the message, so we don't need to do a seperate client.SendInstantMessage(msg);
-                                IEventQueue eq = activeClient.Scene.RequestModuleInterface<IEventQueue>();
-                                eq.ChatterboxInvitation(
-                                    GroupID
-                                    , groupInfo.GroupName
-                                    , new UUID(msg.fromAgentID)
-                                    , msg.message
-                                    , new UUID(msg.toAgentID)
-                                    , msg.fromAgentName
-                                    , msg.dialog
-                                    , msg.timestamp
-                                    , msg.offline == 1
-                                    , (int)msg.ParentEstateID
-                                    , msg.Position
-                                    , 1
-                                    , new UUID(msg.imSessionID)
-                                    , msg.fromGroup
-                                    , OpenMetaverse.Utils.StringToBytes(groupInfo.GroupName)
-                                    );
-
-                                eq.ChatterBoxSessionAgentListUpdates(
-                                    new UUID(GroupID)
-                                    , new UUID(msg.fromAgentID)
-                                    , new UUID(msg.toAgentID)
-                                    , false //canVoiceChat
-                                    , false //isModerator
-                                    , false //text mute
-                                    );
-                            }
+                            if (!hasAgentBeenInvitedToGroupChatSession(toAgentID.ToString(), GroupID))
+                                // This actually sends the message too, so no need to resend it
+                                // with client.SendInstantMessage
+                                AddAgentToSession(toAgentID, GroupID, msg);
+                            else
+                                client.SendInstantMessage(msg);
                         }
                     }
-                    else if (!m_groupData.hasAgentDroppedGroupChatSession(AgentID.ToString(), GroupID))
+                    else
                     {
-                        // User hasn't dropped, so they're in the session, 
-                        // maybe we should deliver it.
-                        IClientAPI client = GetActiveClient(new UUID(msg.toAgentID));
-                        if (client != null)
-                        {
-                            // Deliver locally, directly
-                            if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: Delivering to {0} locally", client.Name);
-                            client.SendInstantMessage(msg);
-                        }
-                        else
-                        {
-                            m_log.WarnFormat("[Groups.Messaging]: Received a message over the grid for a client that isn't here: {0}", msg.toAgentID);
-                        }
+                        m_log.WarnFormat("[Groups.Messaging]: Received a message over the grid for a client that isn't here: {0}", msg.toAgentID);
                     }
                     break;
 
@@ -452,6 +495,53 @@ namespace OpenSim.Groups
             }
         }
 
+        private void AddAgentToSession(UUID AgentID, UUID GroupID, GridInstantMessage msg)
+        {
+            // Agent not in session and hasn't dropped from session
+            // Add them to the session for now, and Invite them
+            AgentInvitedToGroupChatSession(AgentID.ToString(), GroupID);
+
+            IClientAPI activeClient = GetActiveClient(AgentID);
+            if (activeClient != null)
+            {
+                GroupRecord groupInfo = m_groupData.GetGroupRecord(UUID.Zero.ToString(), GroupID, null);
+                if (groupInfo != null)
+                {
+                    if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: Sending chatterbox invite instant message");
+
+                    // Force? open the group session dialog???
+                    // and simultanously deliver the message, so we don't need to do a seperate client.SendInstantMessage(msg);
+                    IEventQueue eq = activeClient.Scene.RequestModuleInterface<IEventQueue>();
+                    eq.ChatterboxInvitation(
+                        GroupID
+                        , groupInfo.GroupName
+                        , new UUID(msg.fromAgentID)
+                        , msg.message
+                        , AgentID
+                        , msg.fromAgentName
+                        , msg.dialog
+                        , msg.timestamp
+                        , msg.offline == 1
+                        , (int)msg.ParentEstateID
+                        , msg.Position
+                        , 1
+                        , new UUID(msg.imSessionID)
+                        , msg.fromGroup
+                        , OpenMetaverse.Utils.StringToBytes(groupInfo.GroupName)
+                        );
+
+                    eq.ChatterBoxSessionAgentListUpdates(
+                        new UUID(GroupID)
+                        , AgentID
+                        , new UUID(msg.toAgentID)
+                        , false //canVoiceChat
+                        , false //isModerator
+                        , false //text mute
+                        );
+                }
+            }
+        }
+
         #endregion
 
 
@@ -477,7 +567,7 @@ namespace OpenSim.Groups
     
                 if (groupInfo != null)
                 {
-                    m_groupData.AgentInvitedToGroupChatSession(AgentID.ToString(), GroupID);
+                    AgentInvitedToGroupChatSession(AgentID.ToString(), GroupID);
 
                     ChatterBoxSessionStartReplyViaCaps(remoteClient, groupInfo.GroupName, GroupID);
 
@@ -503,7 +593,7 @@ namespace OpenSim.Groups
                     m_log.DebugFormat("[Groups.Messaging]: Send message to session for group {0} with session ID {1}", GroupID, im.imSessionID.ToString());
 
                 //If this agent is sending a message, then they want to be in the session
-                m_groupData.AgentInvitedToGroupChatSession(AgentID.ToString(), GroupID);
+                AgentInvitedToGroupChatSession(AgentID.ToString(), GroupID);
 
                 SendMessageToGroup(im, GroupID);
             }
@@ -598,5 +688,70 @@ namespace OpenSim.Groups
         }
 
         #endregion
+
+        #region GroupSessionTracking
+
+        public void ResetAgentGroupChatSessions(string agentID)
+        {
+            foreach (List<string> agentList in m_groupsAgentsDroppedFromChatSession.Values)
+            {
+                agentList.Remove(agentID);
+            }
+        }
+
+        public bool hasAgentBeenInvitedToGroupChatSession(string agentID, UUID groupID)
+        {
+            // If we're  tracking this group, and we can find them in the tracking, then they've been invited
+            return m_groupsAgentsInvitedToChatSession.ContainsKey(groupID)
+                && m_groupsAgentsInvitedToChatSession[groupID].Contains(agentID);
+        }
+
+        public bool hasAgentDroppedGroupChatSession(string agentID, UUID groupID)
+        {
+            // If we're tracking drops for this group,
+            // and we find them, well... then they've dropped
+            return m_groupsAgentsDroppedFromChatSession.ContainsKey(groupID)
+                && m_groupsAgentsDroppedFromChatSession[groupID].Contains(agentID);
+        }
+
+        public void AgentDroppedFromGroupChatSession(string agentID, UUID groupID)
+        {
+            if (m_groupsAgentsDroppedFromChatSession.ContainsKey(groupID))
+            {
+                // If not in dropped list, add
+                if (!m_groupsAgentsDroppedFromChatSession[groupID].Contains(agentID))
+                {
+                    m_groupsAgentsDroppedFromChatSession[groupID].Add(agentID);
+                }
+            }
+        }
+
+        public void AgentInvitedToGroupChatSession(string agentID, UUID groupID)
+        {
+            // Add Session Status if it doesn't exist for this session
+            CreateGroupChatSessionTracking(groupID);
+
+            // If nessesary, remove from dropped list
+            if (m_groupsAgentsDroppedFromChatSession[groupID].Contains(agentID))
+            {
+                m_groupsAgentsDroppedFromChatSession[groupID].Remove(agentID);
+            }
+
+            // Add to invited
+            if (!m_groupsAgentsInvitedToChatSession[groupID].Contains(agentID))
+                m_groupsAgentsInvitedToChatSession[groupID].Add(agentID);
+        }
+
+        private void CreateGroupChatSessionTracking(UUID groupID)
+        {
+            if (!m_groupsAgentsDroppedFromChatSession.ContainsKey(groupID))
+            {
+                m_groupsAgentsDroppedFromChatSession.Add(groupID, new List<string>());
+                m_groupsAgentsInvitedToChatSession.Add(groupID, new List<string>());
+            }
+
+        }
+        #endregion
+
     }
 }
diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index 69d03a9..a14dc6a 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -141,6 +141,8 @@ namespace OpenSim.Groups
             if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
             scene.EventManager.OnNewClient += OnNewClient;
+            scene.EventManager.OnMakeRootAgent += OnMakeRoot;
+            scene.EventManager.OnMakeChildAgent += OnMakeChild;
             scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
             // The InstantMessageModule itself doesn't do this, 
             // so lets see if things explode if we don't do it
@@ -194,6 +196,7 @@ namespace OpenSim.Groups
             if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
             scene.EventManager.OnNewClient -= OnNewClient;
+            scene.EventManager.OnMakeRootAgent -= OnMakeRoot;
             scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
 
             lock (m_sceneList)
@@ -232,16 +235,31 @@ namespace OpenSim.Groups
         {
             if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            client.OnUUIDGroupNameRequest += HandleUUIDGroupNameRequest;
             client.OnAgentDataUpdateRequest += OnAgentDataUpdateRequest;
-            client.OnDirFindQuery += OnDirFindQuery;
             client.OnRequestAvatarProperties += OnRequestAvatarProperties;
+        }
 
+        private void OnMakeRoot(ScenePresence sp)
+        {
+            if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
+
+            sp.ControllingClient.OnUUIDGroupNameRequest += HandleUUIDGroupNameRequest;
+            sp.ControllingClient.OnDirFindQuery += OnDirFindQuery;
             // Used for Notices and Group Invites/Accept/Reject
-            client.OnInstantMessage += OnInstantMessage;
+            sp.ControllingClient.OnInstantMessage += OnInstantMessage;
 
             // Send client their groups information.
-            SendAgentGroupDataUpdate(client, client.AgentId);
+            SendAgentGroupDataUpdate(sp.ControllingClient, sp.UUID);
+        }
+
+        private void OnMakeChild(ScenePresence sp)
+        {
+            if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
+
+            sp.ControllingClient.OnUUIDGroupNameRequest -= HandleUUIDGroupNameRequest;
+            sp.ControllingClient.OnDirFindQuery -= OnDirFindQuery;
+            // Used for Notices and Group Invites/Accept/Reject
+            sp.ControllingClient.OnInstantMessage -= OnInstantMessage;
         }
 
         private void OnRequestAvatarProperties(IClientAPI remoteClient, UUID avatarID)
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
index c3c759e..daa0728 100644
--- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
@@ -590,28 +590,6 @@ namespace OpenSim.Groups
             return m_LocalGroupsConnector.GetGroupNotices(AgentUUI(RequestingAgentID), GroupID);
         }
 
-        public void ResetAgentGroupChatSessions(string agentID)
-        {
-        }
-
-        public bool hasAgentBeenInvitedToGroupChatSession(string agentID, UUID groupID)
-        {
-            return false;
-        }
-
-        public bool hasAgentDroppedGroupChatSession(string agentID, UUID groupID)
-        {
-            return false;
-        }
-
-        public void AgentDroppedFromGroupChatSession(string agentID, UUID groupID)
-        {
-        }
-
-        public void AgentInvitedToGroupChatSession(string agentID, UUID groupID)
-        {
-        }
-
         #endregion
 
         #region hypergrid groups
diff --git a/OpenSim/Addons/Groups/IGroupsServicesConnector.cs b/OpenSim/Addons/Groups/IGroupsServicesConnector.cs
index 73deb7a..a09b59e 100644
--- a/OpenSim/Addons/Groups/IGroupsServicesConnector.cs
+++ b/OpenSim/Addons/Groups/IGroupsServicesConnector.cs
@@ -92,12 +92,6 @@ namespace OpenSim.Groups
         GroupNoticeInfo GetGroupNotice(string RequestingAgentID, UUID noticeID);
         List<ExtendedGroupNoticeData> GetGroupNotices(string RequestingAgentID, UUID GroupID);
 
-        void ResetAgentGroupChatSessions(string agentID);
-        bool hasAgentBeenInvitedToGroupChatSession(string agentID, UUID groupID);
-        bool hasAgentDroppedGroupChatSession(string agentID, UUID groupID);
-        void AgentDroppedFromGroupChatSession(string agentID, UUID groupID);
-        void AgentInvitedToGroupChatSession(string agentID, UUID groupID);
-
     }
 
     public class GroupInviteInfo
diff --git a/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs b/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs
index 905bc91..564dec4 100644
--- a/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs
@@ -320,28 +320,6 @@ namespace OpenSim.Groups
             return m_GroupsService.GetGroupNotices(RequestingAgentID, GroupID);
         }
 
-        public void ResetAgentGroupChatSessions(string agentID)
-        {
-        }
-
-        public bool hasAgentBeenInvitedToGroupChatSession(string agentID, UUID groupID)
-        {
-            return false;
-        }
-
-        public bool hasAgentDroppedGroupChatSession(string agentID, UUID groupID)
-        {
-            return false;
-        }
-
-        public void AgentDroppedFromGroupChatSession(string agentID, UUID groupID)
-        {
-        }
-
-        public void AgentInvitedToGroupChatSession(string agentID, UUID groupID)
-        {
-        }
-
         #endregion
     }
 }
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs
index f1cf66c..9b6bfbd 100644
--- a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs
@@ -406,28 +406,6 @@ namespace OpenSim.Groups
             });
         }
 
-        public void ResetAgentGroupChatSessions(string agentID)
-        {
-        }
-
-        public bool hasAgentBeenInvitedToGroupChatSession(string agentID, UUID groupID)
-        {
-            return false;
-        }
-
-        public bool hasAgentDroppedGroupChatSession(string agentID, UUID groupID)
-        {
-            return false;
-        }
-
-        public void AgentDroppedFromGroupChatSession(string agentID, UUID groupID)
-        {
-        }
-
-        public void AgentInvitedToGroupChatSession(string agentID, UUID groupID)
-        {
-        }
-
         #endregion
     }
 
diff --git a/OpenSim/Framework/GridInstantMessage.cs b/OpenSim/Framework/GridInstantMessage.cs
index 6ae0488..da3690c 100644
--- a/OpenSim/Framework/GridInstantMessage.cs
+++ b/OpenSim/Framework/GridInstantMessage.cs
@@ -53,6 +53,24 @@ namespace OpenSim.Framework
             binaryBucket = new byte[0];
         }
 
+        public GridInstantMessage(GridInstantMessage im, bool addTimestamp)
+        {
+            fromAgentID = im.fromAgentID;
+            fromAgentName = im.fromAgentName;
+            toAgentID = im.toAgentID;
+            dialog = im.dialog;
+            fromGroup = im.fromGroup;
+            message = im.message;
+            imSessionID = im.imSessionID;
+            offline = im.offline;
+            Position = im.Position;
+            binaryBucket = im.binaryBucket;
+            RegionID = im.RegionID;
+
+            if (addTimestamp)
+                timestamp = (uint)Util.UnixTimeSinceEpoch();
+        }
+
         public GridInstantMessage(IScene scene, UUID _fromAgentID,
                 string _fromAgentName, UUID _toAgentID,
                 byte _dialog, bool _fromGroup, string _message,
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index c69f758..d7afe1a 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -750,12 +750,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/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index fa935cd..40a400f 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -372,7 +372,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;
@@ -672,7 +672,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);
             return gim;
         }
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/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;
         }
-- 
cgit v1.1


From 18eca40af3592d9743cf50267a460968e601859c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 27 Jul 2013 19:12:47 -0700
Subject: More bug fixes on group chat

---
 OpenSim/Addons/Groups/GroupsMessagingModule.cs | 34 ++++++++++++++------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
index be76ef1..04e2b80 100644
--- a/OpenSim/Addons/Groups/GroupsMessagingModule.cs
+++ b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
@@ -132,7 +132,6 @@ namespace OpenSim.Groups
             scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
             scene.EventManager.OnClientLogin += OnClientLogin;
         }
-        
         public void RegionLoaded(Scene scene)
         {
             if (!m_groupMessagingEnabled)
@@ -271,7 +270,8 @@ namespace OpenSim.Groups
             }
 
             // Send to self first of all
-            im.toAgentID = im.fromAgentID; 
+            im.toAgentID = im.fromAgentID;
+            im.fromGroup = true;
             ProcessMessageFromGroupSession(im);
 
             List<UUID> regions = new List<UUID>();
@@ -330,8 +330,7 @@ namespace OpenSim.Groups
                 }
             }
 
-            // Temporary for assessing how long it still takes to send messages to large online groups.
-            if (m_messageOnlineAgentsOnly)
+            if (m_debugEnabled)
                 m_log.DebugFormat(
                     "[Groups.Messaging]: SendMessageToGroup for group {0} with {1} visible members, {2} online took {3}ms",
                     groupID, groupMembersCount, groupMembers.Count(), Environment.TickCount - requestStartTick);
@@ -349,6 +348,7 @@ namespace OpenSim.Groups
             if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: OnInstantMessage registered for {0}", client.Name);
 
             client.OnInstantMessage += OnInstantMessage;
+            ResetAgentGroupChatSessions(client.AgentId.ToString());
         }
 
         private void OnGridInstantMessage(GridInstantMessage msg)
@@ -432,16 +432,19 @@ namespace OpenSim.Groups
                             UUID AgentID = sp.UUID;
                             msg.toAgentID = AgentID.Guid;
 
-                            if (!hasAgentDroppedGroupChatSession(AgentID.ToString(), GroupID)
-                                && !hasAgentBeenInvitedToGroupChatSession(AgentID.ToString(), GroupID))
+                            if (!hasAgentDroppedGroupChatSession(AgentID.ToString(), GroupID))
                             {
-                                AddAgentToSession(AgentID, GroupID, msg);
-                            }
-
-                            if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: Passing to ProcessMessageFromGroupSession to deliver to {0} locally", sp.Name);
+                                if (!hasAgentBeenInvitedToGroupChatSession(AgentID.ToString(), GroupID))
+                                    AddAgentToSession(AgentID, GroupID, msg);
+                                else
+                                {
+                                    if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: Passing to ProcessMessageFromGroupSession to deliver to {0} locally", sp.Name);
 
-                            ProcessMessageFromGroupSession(msg);
+                                    ProcessMessageFromGroupSession(msg);
+                                }
+                            }
                         });
+                        
                 }
             }
         }
@@ -664,12 +667,12 @@ namespace OpenSim.Groups
                 {
                     if (!sp.IsChildAgent)
                     {
-                        if (m_debugEnabled) m_log.WarnFormat("[Groups.Messaging]: Found root agent for client : {0}", sp.ControllingClient.Name);
+                        if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: Found root agent for client : {0}", sp.ControllingClient.Name);
                         return sp.ControllingClient;
                     }
                     else
                     {
-                        if (m_debugEnabled) m_log.WarnFormat("[Groups.Messaging]: Found child agent for client : {0}", sp.ControllingClient.Name);
+                        if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: Found child agent for client : {0}", sp.ControllingClient.Name);
                         child = sp.ControllingClient;
                     }
                 }
@@ -694,9 +697,10 @@ namespace OpenSim.Groups
         public void ResetAgentGroupChatSessions(string agentID)
         {
             foreach (List<string> agentList in m_groupsAgentsDroppedFromChatSession.Values)
-            {
                 agentList.Remove(agentID);
-            }
+
+            foreach (List<string> agentList in m_groupsAgentsInvitedToChatSession.Values)
+                agentList.Remove(agentID);
         }
 
         public bool hasAgentBeenInvitedToGroupChatSession(string agentID, UUID groupID)
-- 
cgit v1.1


From 9cbbb7eddfb3316a2db5bfaa0e81a39850e7163d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 27 Jul 2013 19:16:48 -0700
Subject: Clarification on docs of .ini.examples for Groups (again)

---
 bin/OpenSim.ini.example | 4 ++--
 bin/OpenSimDefaults.ini | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index c30c73d..33f3263 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1010,10 +1010,10 @@
     ;; Enable Group Notices
     ; NoticesEnabled = true
 
-    ;# {MessageOnlineUsersOnly} {Module:GroupsModule Module:Groups Module V2} {Message online users only?} {true false} false
+    ;# {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 to both Group modules in core
+    ; Applies Flotsam Group only. V2 has this always on, no other option
     ; MessageOnlineUsersOnly = false
 
     ;; This makes the Groups modules very chatty on the console.
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index e70b9b3..dbafd5c 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1612,6 +1612,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
+	; (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
-- 
cgit v1.1


From 8dff05a89798543994cb6e5ac5e5f715daf5898b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 27 Jul 2013 20:30:00 -0700
Subject: More on group chat: only root agents should subscribe to
 OnInstantMessage, or else they'll see an echo of their own messages after
 teleporting.

---
 OpenSim/Addons/Groups/GroupsMessagingModule.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
index 04e2b80..ce4f597 100644
--- a/OpenSim/Addons/Groups/GroupsMessagingModule.cs
+++ b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
@@ -129,9 +129,12 @@ namespace OpenSim.Groups
             m_sceneList.Add(scene);
 
             scene.EventManager.OnNewClient += OnNewClient;
+            scene.EventManager.OnMakeRootAgent += OnMakeRootAgent;
+            scene.EventManager.OnMakeChildAgent += OnMakeChildAgent;
             scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
             scene.EventManager.OnClientLogin += OnClientLogin;
         }
+
         public void RegionLoaded(Scene scene)
         {
             if (!m_groupMessagingEnabled)
@@ -347,10 +350,20 @@ namespace OpenSim.Groups
         {
             if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: OnInstantMessage registered for {0}", client.Name);
 
-            client.OnInstantMessage += OnInstantMessage;
             ResetAgentGroupChatSessions(client.AgentId.ToString());
         }
 
+        void OnMakeRootAgent(ScenePresence sp)
+        {
+            sp.ControllingClient.OnInstantMessage += OnInstantMessage;
+        }
+
+        void OnMakeChildAgent(ScenePresence sp)
+        {
+            sp.ControllingClient.OnInstantMessage -= OnInstantMessage;
+        }
+
+
         private void OnGridInstantMessage(GridInstantMessage msg)
         {
             // The instant message module will only deliver messages of dialog types:
-- 
cgit v1.1


From 170a6f0563c9b9e228dad0b1db5654f2114a05f4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 28 Jul 2013 09:00:28 -0700
Subject: This makes group search work (Groups V2).

---
 OpenSim/Addons/Groups/GroupsExtendedData.cs        | 24 +++++++++++++++++
 OpenSim/Addons/Groups/GroupsModule.cs              |  4 +++
 .../Groups/Remote/GroupsServiceRemoteConnector.cs  | 30 ++++++++++++++++++++++
 .../Remote/GroupsServiceRemoteConnectorModule.cs   |  2 +-
 .../Groups/Remote/GroupsServiceRobustConnector.cs  | 28 ++++++++++++++++++++
 OpenSim/Data/MySQL/MySQLGroupsData.cs              |  2 +-
 6 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Addons/Groups/GroupsExtendedData.cs b/OpenSim/Addons/Groups/GroupsExtendedData.cs
index 6f4db28..1632aee 100644
--- a/OpenSim/Addons/Groups/GroupsExtendedData.cs
+++ b/OpenSim/Addons/Groups/GroupsExtendedData.cs
@@ -504,6 +504,30 @@ namespace OpenSim.Groups
 
             return notice;
         }
+
+        public static Dictionary<string, object> DirGroupsReplyData(DirGroupsReplyData g)
+        {
+            Dictionary<string, object> dict = new Dictionary<string, object>();
+
+            dict["GroupID"] = g.groupID;
+            dict["Name"] = g.groupName;
+            dict["NMembers"] = g.members;
+            dict["SearchOrder"] = g.searchOrder;
+
+            return dict;
+        }
+
+        public static DirGroupsReplyData DirGroupsReplyData(Dictionary<string, object> dict)
+        {
+            DirGroupsReplyData g;
+
+            g.groupID = new UUID(dict["GroupID"].ToString());
+            g.groupName = dict["Name"].ToString();
+            Int32.TryParse(dict["NMembers"].ToString(), out g.members);
+            float.TryParse(dict["SearchOrder"].ToString(), out g.searchOrder);
+
+            return g;
+        }
     }
 
 }
diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index a14dc6a..7d3c064 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -313,6 +313,10 @@ namespace OpenSim.Groups
                     m_log.DebugFormat(
                         "[Groups]: {0} called with queryText({1}) queryFlags({2}) queryStart({3})", 
                         System.Reflection.MethodBase.GetCurrentMethod().Name, queryText, (DirFindFlags)queryFlags, queryStart);
+                
+                
+                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_groupData.FindGroups(GetRequestingAgentIDStr(remoteClient), queryText).ToArray());
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs
index 04328c9..9a3e125 100644
--- a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs
+++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs
@@ -133,6 +133,36 @@ namespace OpenSim.Groups
             return GroupsDataUtils.GroupRecord((Dictionary<string, object>)ret["RESULT"]);
         }
 
+        public List<DirGroupsReplyData> FindGroups(string RequestingAgentID, string query)
+        {
+            List<DirGroupsReplyData> hits = new List<DirGroupsReplyData>();
+            if (string.IsNullOrEmpty(query))
+                return hits;
+
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            sendData["Query"] = query;
+            sendData["RequestingAgentID"] = RequestingAgentID;
+
+            Dictionary<string, object> ret = MakeRequest("FINDGROUPS", sendData);
+
+            if (ret == null)
+                return hits;
+
+            if (!ret.ContainsKey("RESULT"))
+                return hits;
+
+            if (ret["RESULT"].ToString() == "NULL")
+                return hits;
+
+            foreach (object v in ((Dictionary<string, object>)ret["RESULT"]).Values)
+            {
+                DirGroupsReplyData m = GroupsDataUtils.DirGroupsReplyData((Dictionary<string, object>)v);
+                hits.Add(m);
+            }
+
+            return hits;
+        }
+
         public GroupMembershipData AddAgentToGroup(string RequestingAgentID, string AgentID, UUID GroupID, UUID RoleID, string token, out string reason)
         {
             reason = string.Empty;
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs
index 9b6bfbd..d3de0e8 100644
--- a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs
@@ -199,7 +199,7 @@ namespace OpenSim.Groups
         public List<DirGroupsReplyData> FindGroups(string RequestingAgentID, string search)
         {
             // TODO!
-            return new List<DirGroupsReplyData>();
+            return m_GroupsService.FindGroups(RequestingAgentID, search);
         }
 
         public bool AddAgentToGroup(string RequestingAgentID, string AgentID, UUID GroupID, UUID RoleID, string token, out string reason)
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
index 106c6c4..249d974 100644
--- a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
+++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
@@ -133,6 +133,8 @@ namespace OpenSim.Groups
                         return HandleAddNotice(request);
                     case "GETNOTICES":
                         return HandleGetNotices(request);
+                    case "FINDGROUPS":
+                        return HandleFindGroups(request);
                 }
                 m_log.DebugFormat("[GROUPS HANDLER]: unknown method request: {0}", method);
             }
@@ -740,6 +742,32 @@ namespace OpenSim.Groups
             return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
+        byte[] HandleFindGroups(Dictionary<string, object> request)
+        {
+            Dictionary<string, object> result = new Dictionary<string, object>();
+
+            if (!request.ContainsKey("RequestingAgentID") || !request.ContainsKey("Query"))
+                NullResult(result, "Bad network data");
+
+            List<DirGroupsReplyData> hits = m_GroupsService.FindGroups(request["RequestingAgentID"].ToString(), request["Query"].ToString());
+
+            if (hits == null || (hits != null && hits.Count == 0))
+                NullResult(result, "No hits");
+            else
+            {
+                Dictionary<string, object> dict = new Dictionary<string, object>();
+                int i = 0;
+                foreach (DirGroupsReplyData n in hits)
+                    dict["n-" + i++] = GroupsDataUtils.DirGroupsReplyData(n);
+
+                result["RESULT"] = dict;
+            }
+
+
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
+        }
+
 
         #region Helpers
 
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);
         }
-- 
cgit v1.1


From 6be614ba844ee988859fe7f63db76ef13b9f4962 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 28 Jul 2013 09:54:34 -0700
Subject: This makes people search work.

---
 .../UserManagement/UserManagementModule.cs         | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 53bd2e2..295ad64 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -46,6 +46,8 @@ using log4net;
 using Nini.Config;
 using Mono.Addins;
 
+using DirFindFlags = OpenMetaverse.DirectoryManager.DirFindFlags;
+
 namespace OpenSim.Region.CoreModules.Framework.UserManagement
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UserManagementModule")]
@@ -98,6 +100,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 scene.RegisterModuleInterface<IPeople>(this);
                 scene.EventManager.OnNewClient += new EventManager.OnNewClientDelegate(EventManager_OnNewClient);
                 scene.EventManager.OnPrimsLoaded += new EventManager.PrimsLoaded(EventManager_OnPrimsLoaded);
+                scene.EventManager.OnMakeRootAgent += new Action<ScenePresence>(EventManager_OnMakeRootAgent);
+                scene.EventManager.OnMakeChildAgent += new EventManager.OnMakeChildAgentDelegate(EventManager_OnMakeChildAgent);
             }
         }
 
@@ -153,6 +157,43 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             client.OnAvatarPickerRequest -= new AvatarPickerRequest(HandleAvatarPickerRequest);
         }
 
+        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);
+            }
+
+        }
+
         void HandleUUIDNameRequest(UUID uuid, IClientAPI client)
         {
 //            m_log.DebugFormat(
-- 
cgit v1.1


From 7b0b5c9d97dea840e1ede6e2318b3c049c804983 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 28 Jul 2013 13:49:58 -0700
Subject: Added BasicSearchModule.cs which handles OnDirFindQuery events.
 Removed that handler from both Groups modules in core, and replaced them with
 an operation on IGroupsModule.

---
 OpenSim/Addons/Groups/GroupsModule.cs              |  27 +--
 .../Framework/Search/BasicSearchModule.cs          | 198 +++++++++++++++++++++
 .../UserManagement/UserManagementModule.cs         |  39 ----
 .../Region/Framework/Interfaces/IGroupsModule.cs   |   2 +
 .../Avatar/XmlRpcGroups/GroupsModule.cs            |  22 +--
 bin/config-include/Grid.ini                        |   1 +
 bin/config-include/GridHypergrid.ini               |   1 +
 bin/config-include/Standalone.ini                  |   1 +
 bin/config-include/StandaloneHypergrid.ini         |   1 +
 9 files changed, 216 insertions(+), 76 deletions(-)
 create mode 100644 OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs

diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index 7d3c064..214a131 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -197,6 +197,7 @@ namespace OpenSim.Groups
 
             scene.EventManager.OnNewClient -= OnNewClient;
             scene.EventManager.OnMakeRootAgent -= OnMakeRoot;
+            scene.EventManager.OnMakeChildAgent -= OnMakeChild;
             scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
 
             lock (m_sceneList)
@@ -244,7 +245,6 @@ namespace OpenSim.Groups
             if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
             sp.ControllingClient.OnUUIDGroupNameRequest += HandleUUIDGroupNameRequest;
-            sp.ControllingClient.OnDirFindQuery += OnDirFindQuery;
             // Used for Notices and Group Invites/Accept/Reject
             sp.ControllingClient.OnInstantMessage += OnInstantMessage;
 
@@ -257,7 +257,6 @@ namespace OpenSim.Groups
             if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
             sp.ControllingClient.OnUUIDGroupNameRequest -= HandleUUIDGroupNameRequest;
-            sp.ControllingClient.OnDirFindQuery -= OnDirFindQuery;
             // Used for Notices and Group Invites/Accept/Reject
             sp.ControllingClient.OnInstantMessage -= OnInstantMessage;
         }
@@ -305,25 +304,6 @@ namespace OpenSim.Groups
         }
         */
 
-        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);
-                
-                
-                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_groupData.FindGroups(GetRequestingAgentIDStr(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);
@@ -1211,6 +1191,11 @@ namespace OpenSim.Groups
             }
         }
 
+        public List<DirGroupsReplyData> FindGroups(IClientAPI remoteClient, string query)
+        {
+            return m_groupData.FindGroups(GetRequestingAgentIDStr(remoteClient), query);
+        }
+
         #endregion
 
         #region Client/Update Tools
diff --git a/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs b/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs
new file mode 100644
index 0000000..a089447
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.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.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)
+        {
+            m_log.Debug("[ZZZ]: Got here");
+            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/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 295ad64..7adb203 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -100,8 +100,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 scene.RegisterModuleInterface<IPeople>(this);
                 scene.EventManager.OnNewClient += new EventManager.OnNewClientDelegate(EventManager_OnNewClient);
                 scene.EventManager.OnPrimsLoaded += new EventManager.PrimsLoaded(EventManager_OnPrimsLoaded);
-                scene.EventManager.OnMakeRootAgent += new Action<ScenePresence>(EventManager_OnMakeRootAgent);
-                scene.EventManager.OnMakeChildAgent += new EventManager.OnMakeChildAgentDelegate(EventManager_OnMakeChildAgent);
             }
         }
 
@@ -157,43 +155,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             client.OnAvatarPickerRequest -= new AvatarPickerRequest(HandleAvatarPickerRequest);
         }
 
-        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);
-            }
-
-        }
-
         void HandleUUIDNameRequest(UUID uuid, IClientAPI client)
         {
 //            m_log.DebugFormat(
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/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 32fb54b..f4734b7 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
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index cb3a5c8..15ba55a 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -23,6 +23,7 @@
     InventoryAccessModule	= "BasicInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
 	MapImageService			= "MapImageServiceModule"
+	SearchModule			= "BasicSearchModule"
     
     LandServiceInConnector			= true
     NeighbourServiceInConnector		= true
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..d3b9cb4 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -19,6 +19,7 @@
     EntityTransferModule    = "BasicEntityTransferModule"
     InventoryAccessModule   = "BasicInventoryAccessModule"
     MapImageService			= "MapImageServiceModule"
+	SearchModule			= "BasicSearchModule"
 
     LibraryModule              = true
     LLLoginServiceInConnector  = true
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 39c33e8..3abf49b 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -25,6 +25,7 @@
     InventoryAccessModule	= "HGInventoryAccessModule"
     FriendsModule			= "HGFriendsModule"
 	UserManagementModule	= "HGUserManagementModule"
+	SearchModule			= "BasicSearchModule"
     
     InventoryServiceInConnector			= true
     AssetServiceInConnector				= true
-- 
cgit v1.1


From 63f6c8f27ca280a7d362af08ba1716d5f28e3137 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 28 Jul 2013 13:53:47 -0700
Subject: Removed commented lines and useless debug message

---
 OpenSim/Addons/Groups/GroupsModule.cs                    | 16 ----------------
 .../CoreModules/Framework/Search/BasicSearchModule.cs    |  1 -
 2 files changed, 17 deletions(-)

diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index 214a131..826fcbf 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -909,23 +909,7 @@ namespace OpenSim.Groups
         {
             if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called for notice {1}", System.Reflection.MethodBase.GetCurrentMethod().Name, groupNoticeID);
 
-            //GroupRecord groupInfo = m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), data.GroupID, null);
-
             GridInstantMessage msg = CreateGroupNoticeIM(remoteClient.AgentId, groupNoticeID, (byte)InstantMessageDialog.GroupNoticeRequested);
-            //GridInstantMessage msg = new GridInstantMessage();
-            //msg.imSessionID = UUID.Zero.Guid;
-            //msg.fromAgentID = data.GroupID.Guid;
-            //msg.toAgentID = GetRequestingAgentID(remoteClient).Guid;
-            //msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
-            //msg.fromAgentName = "Group Notice : " + groupInfo == null ? "Unknown" : groupInfo.GroupName;
-            //msg.message = data.noticeData.Subject + "|" + data.Message;
-            //msg.dialog = (byte)OpenMetaverse.InstantMessageDialog.GroupNoticeRequested;
-            //msg.fromGroup = true;
-            //msg.offline = (byte)0;
-            //msg.ParentEstateID = 0;
-            //msg.Position = Vector3.Zero;
-            //msg.RegionID = UUID.Zero.Guid;
-            //msg.binaryBucket = data.BinaryBucket;
 
             OutgoingInstantMessage(msg, GetRequestingAgentID(remoteClient));
         }
diff --git a/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs b/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs
index a089447..8838612 100644
--- a/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs
@@ -150,7 +150,6 @@ namespace OpenSim.Region.CoreModules.Framework.Search
 
         void OnDirFindQuery(IClientAPI remoteClient, UUID queryID, string queryText, uint queryFlags, int queryStart)
         {
-            m_log.Debug("[ZZZ]: Got here");
             if (((DirFindFlags)queryFlags & DirFindFlags.People) == DirFindFlags.People)
             {
                 if (string.IsNullOrEmpty(queryText))
-- 
cgit v1.1


From 698b2135eed747c24e3325cc7e5a7bae513a2c25 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 28 Jul 2013 15:59:24 -0700
Subject: Fix an issue where HG members of groups weren't seeing the entire
 membership for group chat.

---
 OpenSim/Addons/Groups/GroupsMessagingModule.cs | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
index ce4f597..3cece77 100644
--- a/OpenSim/Addons/Groups/GroupsMessagingModule.cs
+++ b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Groups
         private IPresenceService m_presenceService;
 
         private IMessageTransferModule m_msgTransferModule = null;
-
+        private IUserManagement m_UserManagement = null;
         private IGroupsServicesConnector m_groupData = null;
 
         // Config Options
@@ -162,6 +162,17 @@ namespace OpenSim.Groups
                 return;
             }
 
+            m_UserManagement = scene.RequestModuleInterface<IUserManagement>();
+
+            // No groups module, no groups messaging
+            if (m_UserManagement == null)
+            {
+                m_log.Error("[Groups.Messaging]: Could not get IUserManagement, GroupsMessagingModule is now disabled.");
+                RemoveRegion(scene);
+                return;
+            }
+
+
             if (m_presenceService == null)
                 m_presenceService = scene.PresenceService;
 
@@ -392,9 +403,16 @@ namespace OpenSim.Groups
                 Scene aScene = m_sceneList[0];
                 GridRegion regionOfOrigin = aScene.GridService.GetRegionByUUID(aScene.RegionInfo.ScopeID, regionID);
 
-                List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(new UUID(msg.fromAgentID).ToString(), GroupID);
+                // Let's find out who sent it
+                string requestingAgent = m_UserManagement.GetUserUUI(new UUID(msg.fromAgentID));
+
+                List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(requestingAgent, GroupID);
                 List<UUID> alreadySeen = new List<UUID>();
 
+                if (m_debugEnabled)
+                    foreach (GroupMembersData m in groupMembers)
+                        m_log.DebugFormat("[Groups.Messaging]: member {0}", m.AgentID);
+
                 foreach (Scene s in m_sceneList)
                 {
                     s.ForEachScenePresence(sp =>
-- 
cgit v1.1


From c442ef346eee83320d92ebc829cf3dec7bd2ed98 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 28 Jul 2013 16:44:31 -0700
Subject: Same issue as previous commit.

---
 OpenSim/Addons/Groups/GroupsMessagingModule.cs | 13 +++++--------
 OpenSim/Addons/Groups/Service/GroupsService.cs | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
index 3cece77..5de1fb4 100644
--- a/OpenSim/Addons/Groups/GroupsMessagingModule.cs
+++ b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
@@ -246,7 +246,7 @@ namespace OpenSim.Groups
         public void SendMessageToGroup(GridInstantMessage im, UUID groupID)
         {
             UUID fromAgentID = new UUID(im.fromAgentID);
-            List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(fromAgentID.ToString(), groupID);
+            List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers("all", groupID);
             int groupMembersCount = groupMembers.Count;
             PresenceInfo[] onlineAgents = null;
 
@@ -403,15 +403,12 @@ namespace OpenSim.Groups
                 Scene aScene = m_sceneList[0];
                 GridRegion regionOfOrigin = aScene.GridService.GetRegionByUUID(aScene.RegionInfo.ScopeID, regionID);
 
-                // Let's find out who sent it
-                string requestingAgent = m_UserManagement.GetUserUUI(new UUID(msg.fromAgentID));
-
-                List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(requestingAgent, GroupID);
+                List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers("all", GroupID);
                 List<UUID> alreadySeen = new List<UUID>();
 
-                if (m_debugEnabled)
-                    foreach (GroupMembersData m in groupMembers)
-                        m_log.DebugFormat("[Groups.Messaging]: member {0}", m.AgentID);
+                //if (m_debugEnabled)
+                //    foreach (GroupMembersData m in groupMembers)
+                //        m_log.DebugFormat("[Groups.Messaging]: member {0}", m.AgentID);
 
                 foreach (Scene s in m_sceneList)
                 {
diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs
index a2ef13a..24eb7f3 100644
--- a/OpenSim/Addons/Groups/Service/GroupsService.cs
+++ b/OpenSim/Addons/Groups/Service/GroupsService.cs
@@ -255,13 +255,19 @@ namespace OpenSim.Groups
                 return members;
             List<RoleData> rolesList = new List<RoleData>(roles);
 
-            // Is the requester a member of the group?
-            bool isInGroup = false;
-            if (m_Database.RetrieveMember(GroupID, RequestingAgentID) != null)
-                isInGroup = true;
+            // Check visibility? 
+            // When we don't want to check visibility, we pass it "all" as the requestingAgentID
+            bool checkVisibility = !RequestingAgentID.Equals("all");
+            if (checkVisibility)
+            {
+                // Is the requester a member of the group?
+                bool isInGroup = false;
+                if (m_Database.RetrieveMember(GroupID, RequestingAgentID) != null)
+                    isInGroup = true;
 
-            if (!isInGroup) // reduce the roles to the visible ones
-                rolesList = rolesList.FindAll(r => (UInt64.Parse(r.Data["Powers"]) & (ulong)GroupPowers.MemberVisible) != 0);
+                if (!isInGroup) // reduce the roles to the visible ones
+                    rolesList = rolesList.FindAll(r => (UInt64.Parse(r.Data["Powers"]) & (ulong)GroupPowers.MemberVisible) != 0);
+            }
 
             MembershipData[] datas = m_Database.RetrieveMembers(GroupID);
             if (datas == null || (datas != null && datas.Length == 0))
-- 
cgit v1.1


From 468ddd23736ce47e1cb881308785414ced504cee Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 28 Jul 2013 17:12:14 -0700
Subject: Same issue.

---
 OpenSim/Addons/Groups/Service/GroupsService.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs
index 24eb7f3..294b89a 100644
--- a/OpenSim/Addons/Groups/Service/GroupsService.cs
+++ b/OpenSim/Addons/Groups/Service/GroupsService.cs
@@ -258,6 +258,7 @@ namespace OpenSim.Groups
             // Check visibility? 
             // When we don't want to check visibility, we pass it "all" as the requestingAgentID
             bool checkVisibility = !RequestingAgentID.Equals("all");
+            m_log.DebugFormat("[ZZZ]: AgentID is {0}. checkVisibility is {1}", RequestingAgentID, checkVisibility);
             if (checkVisibility)
             {
                 // Is the requester a member of the group?
-- 
cgit v1.1


From 33b54807a1646a9457a7a718f767ccec1c0cb39f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 28 Jul 2013 18:08:50 -0700
Subject: Changing the visibility test in groups service to be
 UUID.Zero.ToString() instead of "all" because some paths in the code assume
 there's a UUI in the RequestingAgent string.

---
 OpenSim/Addons/Groups/GroupsMessagingModule.cs                    | 4 ++--
 OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | 5 ++++-
 OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs      | 1 +
 OpenSim/Addons/Groups/Service/GroupsService.cs                    | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
index 5de1fb4..cd45432 100644
--- a/OpenSim/Addons/Groups/GroupsMessagingModule.cs
+++ b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
@@ -246,7 +246,7 @@ namespace OpenSim.Groups
         public void SendMessageToGroup(GridInstantMessage im, UUID groupID)
         {
             UUID fromAgentID = new UUID(im.fromAgentID);
-            List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers("all", groupID);
+            List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(UUID.Zero.ToString(), groupID);
             int groupMembersCount = groupMembers.Count;
             PresenceInfo[] onlineAgents = null;
 
@@ -403,7 +403,7 @@ namespace OpenSim.Groups
                 Scene aScene = m_sceneList[0];
                 GridRegion regionOfOrigin = aScene.GridService.GetRegionByUUID(aScene.RegionInfo.ScopeID, regionID);
 
-                List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers("all", GroupID);
+                List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(UUID.Zero.ToString(), GroupID);
                 List<UUID> alreadySeen = new List<UUID>();
 
                 //if (m_debugEnabled)
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
index daa0728..5e53981 100644
--- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
@@ -254,7 +254,10 @@ namespace OpenSim.Groups
         {
             string url = string.Empty, gname = string.Empty;
             if (IsLocal(GroupID, out url, out gname))
-                return m_LocalGroupsConnector.GetGroupMembers(AgentUUI(RequestingAgentID), GroupID);
+            {
+                string agentID = AgentUUI(RequestingAgentID);
+                return m_LocalGroupsConnector.GetGroupMembers(agentID, GroupID);
+            }
             else if (!string.IsNullOrEmpty(url))
             {
                 ExtendedGroupMembershipData membership = m_LocalGroupsConnector.GetAgentGroupMembership(RequestingAgentID, RequestingAgentID, GroupID);
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs
index 9a3e125..161ca0c 100644
--- a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs
+++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs
@@ -256,6 +256,7 @@ namespace OpenSim.Groups
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             sendData["GroupID"] = GroupID.ToString();
             sendData["RequestingAgentID"] = RequestingAgentID;
+
             Dictionary<string, object> ret = MakeRequest("GETGROUPMEMBERS", sendData);
 
             if (ret == null)
diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs
index 294b89a..037ef59 100644
--- a/OpenSim/Addons/Groups/Service/GroupsService.cs
+++ b/OpenSim/Addons/Groups/Service/GroupsService.cs
@@ -257,8 +257,8 @@ namespace OpenSim.Groups
 
             // Check visibility? 
             // When we don't want to check visibility, we pass it "all" as the requestingAgentID
-            bool checkVisibility = !RequestingAgentID.Equals("all");
-            m_log.DebugFormat("[ZZZ]: AgentID is {0}. checkVisibility is {1}", RequestingAgentID, checkVisibility);
+            bool checkVisibility = !RequestingAgentID.Equals(UUID.Zero.ToString());
+
             if (checkVisibility)
             {
                 // Is the requester a member of the group?
-- 
cgit v1.1


From 1d4bf06fe7731f4ca3d8f27a38d64f67d222c6af Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 28 Jul 2013 18:49:10 -0700
Subject: Group chat: guard against duplicate sends

---
 OpenSim/Addons/Groups/GroupsMessagingModule.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
index cd45432..83d296e 100644
--- a/OpenSim/Addons/Groups/GroupsMessagingModule.cs
+++ b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
@@ -297,6 +297,10 @@ namespace OpenSim.Groups
                 if (member.AgentID.Guid == im.fromAgentID)
                     continue;
 
+                if (clientsAlreadySent.Contains(member.AgentID))
+                    continue;
+                clientsAlreadySent.Add(member.AgentID);
+
                 if (hasAgentDroppedGroupChatSession(member.AgentID.ToString(), groupID))
                 {
                     // Don't deliver messages to people who have dropped this session
@@ -336,12 +340,9 @@ namespace OpenSim.Groups
                     // Deliver locally, directly
                     if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: Passing to ProcessMessageFromGroupSession to deliver to {0} locally", client.Name);
 
-                    if (clientsAlreadySent.Contains(member.AgentID))
-                        continue;
-                    clientsAlreadySent.Add(member.AgentID);
-
                     ProcessMessageFromGroupSession(im);
                 }
+
             }
 
             if (m_debugEnabled)
-- 
cgit v1.1


From 1b94de8e58434cc882e1dde83919ecd3f1425e3f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 28 Jul 2013 19:31:17 -0700
Subject: Group chat: prevent a situation where dupe IMs could occur.

---
 OpenSim/Addons/Groups/GroupsMessagingModule.cs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
index 83d296e..be59c62 100644
--- a/OpenSim/Addons/Groups/GroupsMessagingModule.cs
+++ b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
@@ -405,7 +405,6 @@ namespace OpenSim.Groups
                 GridRegion regionOfOrigin = aScene.GridService.GetRegionByUUID(aScene.RegionInfo.ScopeID, regionID);
 
                 List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(UUID.Zero.ToString(), GroupID);
-                List<UUID> alreadySeen = new List<UUID>();
 
                 //if (m_debugEnabled)
                 //    foreach (GroupMembersData m in groupMembers)
@@ -415,15 +414,10 @@ namespace OpenSim.Groups
                 {
                     s.ForEachScenePresence(sp =>
                         {
-                            // We need this, because we are searching through all
-                            // SPs, both root and children
-                            if (alreadySeen.Contains(sp.UUID))
-                            {
-                                if (m_debugEnabled)
-                                    m_log.DebugFormat("[Groups.Messaging]: skipping agent {0} because we've already seen it", sp.UUID);
+                            // If we got this via grid messaging, it's because the caller thinks
+                            // that the root agent is here. We should only send the IM to root agents.
+                            if (sp.IsChildAgent)
                                 return;
-                            }
-                            alreadySeen.Add(sp.UUID);
 
                             GroupMembersData m = groupMembers.Find(gmd =>
                                 {
-- 
cgit v1.1


From 7eee9eb312e9f947d201e0ef3e2f34bceec4568d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 28 Jul 2013 20:47:15 -0700
Subject: Groups: Better warning messages to the user.

---
 OpenSim/Addons/Groups/GroupsModule.cs                          |  4 ++++
 .../Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs  | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index 826fcbf..da8030c 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -991,6 +991,10 @@ namespace OpenSim.Groups
 
                 // Should this send updates to everyone in the group?
                 SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient));
+
+                if (reason != string.Empty)
+                    // A warning
+                    remoteClient.SendAlertMessage("Warning: " + reason);
             }
             else
                 remoteClient.SendJoinGroupReply(groupID, false);
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
index 5e53981..c33168c 100644
--- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
@@ -399,17 +399,21 @@ namespace OpenSim.Groups
 
                     if (success)
                     {
+                        // Here we always return true. The user has been added to the local group,
+                        // independent of whether the remote operation succeeds or not
                         url = m_UserManagement.GetUserServerURL(uid, "GroupsServerURI");
                         if (url == string.Empty)
                         {
-                            reason = "User doesn't have a groups server";
-                            return false;
+                            reason = "You don't have have an accessible groups server in your home world. You membership to this group in only within this grid.";
+                            return true;
                         }
 
                         GroupsServiceHGConnector c = GetConnector(url);
                         if (c != null)
-                            return c.CreateProxy(AgentUUI(RequestingAgentID), AgentID, token, GroupID, m_LocalGroupsServiceLocation, name, out reason);
+                            c.CreateProxy(AgentUUI(RequestingAgentID), AgentID, token, GroupID, m_LocalGroupsServiceLocation, name, out reason);
+                        return true;
                     }
+                    return false;
                 }
             }
             else if (m_UserManagement.IsLocalGridUser(uid)) // local user
-- 
cgit v1.1


From 8efe4bfc2ed7086e9fdf4812297e6525f955f6ac Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 29 Jul 2013 23:18:29 +0100
Subject: Make "abnormal thread terminations" into
 "ClientLogoutsDueToNoReceives" and add this to the StatsManager

This reflects the actual use of this stat - it hasn't recorded general exceptions for some time.
Make the sim extra stats collector draw the data from the stats manager rather than maintaing this data itself.
---
 .../Framework/Monitoring/SimExtraStatsCollector.cs | 25 +++------
 OpenSim/Framework/Monitoring/StatsManager.cs       | 65 ++++++++++++++++++++--
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs   | 26 +++++++--
 3 files changed, 89 insertions(+), 27 deletions(-)

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/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index a5b54c9..e6a2304 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -271,7 +271,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.
@@ -307,7 +307,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);
@@ -323,12 +323,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/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 25e10be..9e6a401 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -69,9 +69,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             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",
-                    "Number of UDP receives performed",
+                    "",
                     "",
                     "clientstack",
                     scene.Name,
@@ -84,7 +97,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 new Stat(
                     "IncomingPacketsProcessedCount",
                     "Number of inbound LL protocol packets processed",
-                    "Number of inbound LL protocol packets processed",
+                    "",
                     "",
                     "clientstack",
                     scene.Name,
@@ -97,7 +110,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 new Stat(
                     "OutgoingUDPSendsCount",
                     "Number of UDP sends performed",
-                    "Number of UDP sends performed",
+                    "",
                     "",
                     "clientstack",
                     scene.Name,
@@ -149,6 +162,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>Maximum transmission unit, or UDP packet size, for the LLUDP protocol</summary>
         public const int MTU = 1400;
 
+        /// <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>
@@ -1037,7 +1053,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 timeoutTicks = m_pausedAckTimeout;
 
             if (client.IsActive &&
-                (Environment.TickCount & Int32.MaxValue) - udpClient.TickLastPacketReceived > timeoutTicks)
+                (Environment.TickCount & Int32.MaxValue) - udpClient.TickLastPacketReceived > -1)
             {
                 // We must set IsActive synchronously so that we can stop the packet loop reinvoking this method, even
                 // though it's set later on by LLClientView.Close()
@@ -1778,7 +1794,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     "[LLUDPSERVER]: Ack timeout, disconnecting {0} agent for {1} in {2}",
                     client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, m_scene.RegionInfo.RegionName);
     
-                StatsManager.SimExtraStats.AddAbnormalClientThreadTermination();
+                ClientLogoutsDueToNoReceives++;
     
                 if (!client.SceneAgent.IsChildAgent)
                      client.Kick("Simulator logged you out due to connection timeout");
-- 
cgit v1.1


From 8004e6f31cb03abc9b6170622099879ccaf5570b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 29 Jul 2013 23:38:54 +0100
Subject: Fix issue just introduced in 8efe4bfc2ed7086e9fdf4812297e6525f955f6ac
 where I accidentally left in a test line to force very quick client unack

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 9e6a401..bf50868 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1053,7 +1053,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 timeoutTicks = m_pausedAckTimeout;
 
             if (client.IsActive &&
-                (Environment.TickCount & Int32.MaxValue) - udpClient.TickLastPacketReceived > -1)
+                (Environment.TickCount & Int32.MaxValue) - udpClient.TickLastPacketReceived > timeoutTicks)
             {
                 // We must set IsActive synchronously so that we can stop the packet loop reinvoking this method, even
                 // though it's set later on by LLClientView.Close()
-- 
cgit v1.1


From 1416c909326d89566cbe785b6dacac228e31a5a0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 29 Jul 2013 23:53:59 +0100
Subject: minor: Add timeout secs to connection timeout message.  Change
 message to reflect it is a timeout due to no data received rather than an ack
 issue.

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index bf50868..85fe1a4 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1062,7 +1062,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;
             }
@@ -1786,18 +1786,19 @@ 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)
-            {
-                m_log.WarnFormat(
-                    "[LLUDPSERVER]: Ack timeout, disconnecting {0} agent for {1} in {2}",
-                    client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, m_scene.RegionInfo.RegionName);
-    
+            {    
                 ClientLogoutsDueToNoReceives++;
+
+                m_log.WarnFormat(
+                    "[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.Kick("Simulator logged you out due to connection timeout.");
     
                 client.CloseWithoutChecks();
             }
-- 
cgit v1.1


From 5a7784a0e6c3f549d0e7b59380ad05729cb93a4f Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 24 Jul 2013 10:52:54 -0700
Subject: BulletSim: make density display and return value consistant with how
 the simulator expects it (scaled to 100kg/m^3).

---
 OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs  |  2 +-
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs      | 13 +++++++------
 OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 15 ++++++++++++++-
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 59e7f5f..58a417e 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -75,7 +75,7 @@ public sealed class BSCharacter : BSPhysObject
         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.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 0bdb5f1..4520171 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -463,7 +463,7 @@ public static class BSParam
         // 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.0001f ),
+            0.01f ),
 
         new ParameterDefn<float>("PID_D", "Derivitive factor for motion smoothing",
             2200f ),
@@ -474,8 +474,9 @@ public static class BSParam
             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" ,
@@ -555,8 +556,9 @@ public static class BSParam
             0.95f ),
         new ParameterDefn<float>("AvatarAlwaysRunFactor", "Speed multiplier if avatar is set to always run",
             1.3f ),
-        new ParameterDefn<float>("AvatarDensity", "Density of an avatar. Changed on avatar recreation.",
-            3.5f) ,
+            // 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 ),
         new ParameterDefn<float>("AvatarCapsuleWidth", "The distance between the sides of the avatar capsule",
@@ -608,9 +610,8 @@ public static class BSParam
             0.0f ),
         new ParameterDefn<float>("VehicleRestitution", "Bouncyness factor for vehicles (0.0 - 1.0)",
             0.0f ),
-        // Turn off fudge with DensityScaleFactor = 0.0001.  Value used to be 0.2f;
         new ParameterDefn<float>("VehicleGroundGravityFudge", "Factor to multiply gravity if a ground vehicle is probably on the ground (0.0 - 1.0)",
-            1.0f ),
+            0.2f ),
         new ParameterDefn<float>("VehicleAngularBankingTimescaleFudge", "Factor to multiple angular banking timescale. Tune to increase realism.",
             60.0f ),
         new ParameterDefn<bool>("VehicleEnableLinearDeflection", "Turn on/off vehicle linear deflection effect",
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index d34b797..0704591 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -187,10 +187,23 @@ public abstract class BSPhysObject : PhysicsActor
         MaterialAttributes matAttrib = BSMaterials.GetAttributes(Material, false);
         Friction = matAttrib.friction;
         Restitution = matAttrib.restitution;
-        Density = matAttrib.density / BSParam.DensityScaleFactor;
+        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.
     public abstract void ZeroMotion(bool inTaintTime);
     public abstract void ZeroAngularMotion(bool inTaintTime);
-- 
cgit v1.1


From 6ad577d32bcb7520a33e4c0c7510d81a7cad674c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 30 Jul 2013 15:22:32 -0700
Subject: BulletSim: test method for debugging of extended physics script
 operations.

---
 .../Scripting/ExtendedPhysics/ExtendedPhysics.cs   | 54 ++++++++++++++++++----
 1 file changed, 46 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
index 6009dc5..0cbc5f9 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,10 @@ 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 coorespond to an identical table in BSScene.
+    public const string PhysFunctSetLinksetType = "BulletSim.SetLinksetType";
+
     private IConfig Configuration { get; set; }
     private bool Enabled { get; set; }
     private Scene BaseScene { get; set; }
@@ -143,13 +147,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 +160,50 @@ 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)
     {
+        if (!Enabled) return;
+
+        // 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)
+                {
+                    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);
+        }
     }
 }
 }
-- 
cgit v1.1


From 0d189165a83bb97f243a1f29cfa6896936ca6db0 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 30 Jul 2013 15:23:33 -0700
Subject: BulletSim: distribute vehicle physical settings to all members of a
 linkset. Enables constraint based linksets. Rename some internal variables to
 clarify whether values world or vehicle relative.

---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 75 +++++++++++-----------
 OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs  | 18 +++++-
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     | 11 +++-
 3 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 82d7c44..f0d17d3 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -589,10 +589,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 m_vehicleMass = ControllingPrim.TotalMass;
 
                 // Friction affects are handled by this vehicle code
-                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);
+                // 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.
@@ -602,21 +602,21 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 m_physicsScene.PE.SetAngularFactorV(ControllingPrim.PhysBody, BSParam.VehicleAngularFactor);
 
                 // Vehicles report collision events so we know when it's on the ground
-                m_physicsScene.PE.AddToCollisionFlags(ControllingPrim.PhysBody, CollisionFlags.BS_VEHICLE_COLLISIONS);
-                // ControllingPrim.Linkset.SetPhysicalCollisionFlags(CollisionFlags.BS_VEHICLE_COLLISIONS);
+                // m_physicsScene.PE.AddToCollisionFlags(ControllingPrim.PhysBody, CollisionFlags.BS_VEHICLE_COLLISIONS);
+                ControllingPrim.Linkset.AddToPhysicalCollisionFlags(CollisionFlags.BS_VEHICLE_COLLISIONS);
 
-                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.ComputeLocalInertia(BSParam.VehicleInertiaFactor);
+                // 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 = ControllingPrim.ComputeGravity(m_VehicleBuoyancy);
                 // The actual vehicle gravity is set to zero in Bullet so we can do all the application of same.
-                m_physicsScene.PE.SetGravity(ControllingPrim.PhysBody, Vector3.Zero);
-                // ControllingPrim.Linkset.SetPhysicalGravity(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}",
                         ControllingPrim.LocalID, m_vehicleMass, ControllingPrim.Inertia, m_VehicleGravity,
@@ -1121,7 +1121,6 @@ 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
@@ -1170,7 +1169,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                                     m_VhoverTimescale, m_VhoverHeight, m_VhoverTargetHeight,
                                     verticalError, verticalCorrection);
                 }
-
             }
         }
 
@@ -1357,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);
 
@@ -1369,20 +1368,20 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             // 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;
-          //  }
+            //  }
 
             // Reduce any velocity by friction.
             Vector3 frictionFactorW = ComputeFrictionFactor(m_angularFrictionTimescale, pTimestep);
             angularMotorContributionV -= (currentAngularV * frictionFactorW);
 
-            VehicleRotationalVelocity += angularMotorContributionV * VehicleOrientation;
-
-
+            Vector3 angularMotorContributionW = angularMotorContributionV * VehicleOrientation;
+            VehicleRotationalVelocity += angularMotorContributionW;
 
-            VDetailLog("{0},  MoveAngular,angularTurning,angContribV={1}", ControllingPrim.LocalID, angularMotorContributionV);
+            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:
@@ -1409,7 +1408,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
                             // 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;
+                            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.
@@ -1419,12 +1418,13 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                             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;
+                            Vector3 vertContributionV = torqueVector * verticalAttractionSpeed * verticalAttractionSpeed;
 
                             VehicleRotationalVelocity += vertContributionV;
 
-                            VDetailLog("{0},  MoveAngular,verticalAttraction,upAxis={1},PredictedUp={2},torqueVector={3},contrib={4}",
+                            VDetailLog("{0},  MoveAngular,verticalAttraction,vertAttrSpeed={1},upAxis={2},PredictedUp={3},torqueVector={4},contrib={5}",
                                             ControllingPrim.LocalID,
+                                            verticalAttractionSpeed,
                                             vehicleUpAxis,
                                             predictedUp,
                                             torqueVector,
@@ -1437,37 +1437,38 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                             // 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);
+                            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 differenceAxis = Vector3.Cross(Vector3.UnitZ * justZOrientation, Vector3.UnitZ * VehicleOrientation);
+                            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;
+                            // differenceAngle /= m_verticalAttractionTimescale;
 
                             // Create the quaterian representing the correction angle
-                            Quaternion correctionRotation = Quaternion.CreateFromAxisAngle(differenceAxis, (float)differenceAngle);
+                            Quaternion correctionRotationW = Quaternion.CreateFromAxisAngle(differenceAxisW, (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;
+                            Vector3 vertContributionW = Vector3.Zero;
+                            correctionRotationW.GetEulerAngles(out vertContributionW.X, out vertContributionW.Y, out vertContributionW.Z);
+                            vertContributionW *= -1f;
+                            vertContributionW /= m_verticalAttractionTimescale;
 
-                            VehicleRotationalVelocity += vertContributionV;
+                            VehicleRotationalVelocity += vertContributionW;
 
                             VDetailLog("{0},  MoveAngular,verticalAttraction,upAxis={1},diffAxis={2},diffAng={3},corrRot={4},contrib={5}",
                                             ControllingPrim.LocalID,
                                             vehicleUpAxis,
-                                            differenceAxis,
+                                            differenceAxisW,
                                             differenceAngle,
-                                            correctionRotation,
-                                            vertContributionV);
+                                            correctionRotationW,
+                                            vertContributionW);
                             break;
                         }
                     case 2:
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 960c0b4..7f94666 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -309,16 +309,18 @@ public abstract class BSLinkset
             }
         );
     }
-    public virtual void ComputeLocalInertia(OMV.Vector3 inertiaFactor)
+    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, member.Mass);
+                    OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(member.PhysShape.physShapeInfo, linksetMass);
                     member.Inertia = inertia * inertiaFactor;
-                    m_physicsScene.PE.SetMassProps(member.PhysBody, member.Mass, member.Inertia);
+                    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
             }
@@ -334,6 +336,16 @@ public abstract class BSLinkset
             }
         );
     }
+    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) =>
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 33ae5a5..6359046 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -61,11 +61,11 @@ public sealed class BSLinksetCompound : BSLinkset
         if (LinksetRoot.PhysBody.HasPhysicalBody)
             m_physicsScene.PE.SetGravity(LinksetRoot.PhysBody, gravity);
     }
-    public override void ComputeLocalInertia(OMV.Vector3 inertiaFactor)
+    public override void ComputeAndSetLocalInertia(OMV.Vector3 inertiaFactor, float linksetMass)
     {
-        OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(LinksetRoot.PhysShape.physShapeInfo, LinksetRoot.Mass);
+        OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(LinksetRoot.PhysShape.physShapeInfo, linksetMass);
         LinksetRoot.Inertia = inertia * inertiaFactor;
-        m_physicsScene.PE.SetMassProps(LinksetRoot.PhysBody, LinksetRoot.Mass, LinksetRoot.Inertia);
+        m_physicsScene.PE.SetMassProps(LinksetRoot.PhysBody, linksetMass, LinksetRoot.Inertia);
         m_physicsScene.PE.UpdateInertiaTensor(LinksetRoot.PhysBody);
     }
     public override void SetPhysicalCollisionFlags(CollisionFlags collFlags)
@@ -73,6 +73,11 @@ public sealed class BSLinksetCompound : BSLinkset
         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)
-- 
cgit v1.1


From 2b5419927143667048bddf0a501e42c093a71147 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 30 Jul 2013 17:26:56 -0700
Subject: After talking to lkalif on the IRC: SimulatorFeatures response:
 renamed the OSDMap GridServices to OpenSimExtras, normalized the url keys
 under it, and moved ExportEnabled to under it too. Melanie: change your
 viewer code accordingly. Documentation at
 http://opensimulator.org/wiki/SimulatorFeatures_Extras

---
 .../ClientStack/Linden/Caps/SimulatorFeaturesModule.cs      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index 7d9f935..4bd17b1 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -149,15 +149,16 @@ namespace OpenSim.Region.ClientStack.Linden
                 m_features["PhysicsShapeTypes"] = typesMap;
     
                 // Extra information for viewers that want to use it
-                OSDMap gridServicesMap = new OSDMap();
+                OSDMap extrasMap = new OSDMap();
                 if (m_MapImageServerURL != string.Empty)
-                    gridServicesMap["map-server-url"] = m_MapImageServerURL;
+                    extrasMap["map-server-url"] = m_MapImageServerURL;
                 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;
+
             }
         }
 
-- 
cgit v1.1


From fd050fca7caef83d72d00241d0c0db5c1ec5d1ff Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 30 Jul 2013 21:10:00 -0700
Subject: Doing the HG Map / SimulatorFeatures "the right way": moved it to
 HGMapModule, hooking on to SimulatorFeatures.OnSimulatorFeaturesRequest event
 (similar to what the DynamicMenuModule does). Only HG Visitors get this var,
 to avoid spamming local users. The config var  is now called MapTileURL, to
 be consistent with the login one, and its being picked up from either
 [LoginService], [HGWorldMap] or [SimulatorFeatures], just because I have a
 bad memory.

---
 .../Linden/Caps/SimulatorFeaturesModule.cs         | 15 ++-----
 .../CoreModules/Hypergrid/HGWorldMapModule.cs      | 47 +++++++++++++++++++++-
 2 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index 4bd17b1..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,13 +140,13 @@ namespace OpenSim.Region.ClientStack.Linden
                 m_features["PhysicsShapeTypes"] = typesMap;
     
                 // Extra information for viewers that want to use it
+                // TODO: Take these out of here into their respective modules, like map-server-url
                 OSDMap extrasMap = new OSDMap();
-                if (m_MapImageServerURL != string.Empty)
-                    extrasMap["map-server-url"] = m_MapImageServerURL;
                 if (m_SearchURL != string.Empty)
                     extrasMap["search-server-url"] = m_SearchURL;
                 if (m_ExportSupported)
                     extrasMap["ExportSupported"] = true;
+
                 if (extrasMap.Count > 0)
                     m_features["OpenSimExtras"] = extrasMap;
 
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index c4255b9..4a5a352 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,13 +49,30 @@ 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 (m_MapImageServerURL != string.Empty)
+                {
+                    m_MapImageServerURL = m_MapImageServerURL.Trim();
+                    if (!m_MapImageServerURL.EndsWith("/"))
+                        m_MapImageServerURL = m_MapImageServerURL + "/";
+                }
+
+
+            }
         }
 
         public override void AddRegion(Scene scene)
@@ -64,6 +82,17 @@ namespace OpenSim.Region.CoreModules.Hypergrid
             scene.EventManager.OnClientClosed += new EventManager.ClientClosed(EventManager_OnClientClosed);
         }
 
+        public override void RegionLoaded(Scene scene)
+        {
+            base.RegionLoaded(scene);
+            ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface<ISimulatorFeaturesModule>();
+
+            if (featuresModule != null)
+                featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest;
+
+            m_UserManagement = m_scene.RequestModuleInterface<IUserManagement>();
+
+        }
         public override string Name
         {
             get { return "HGWorldMap"; }
@@ -115,6 +144,20 @@ namespace OpenSim.Region.CoreModules.Hypergrid
             return mapBlocks;
         }
 
+        private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
+        {
+            if (m_UserManagement != null && !m_UserManagement.IsLocalGridUser(agentID) && m_MapImageServerURL != string.Empty)
+            {
+                OSD extras = new OSDMap();
+                if (features.ContainsKey("OpenSimExtras"))
+                    extras = features["OpenSimExtras"];
+                else
+                    features["OpenSimExtras"] = extras;
+
+                ((OSDMap)extras)["map-server-url"] = m_MapImageServerURL;
+
+            }
+        }
     }
 
     class MapArea
-- 
cgit v1.1


From e4ecbc2b104959eced649e1620108afca22346dc Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 30 Jul 2013 21:38:41 -0700
Subject: Fix null ref.

---
 OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index 4a5a352..a7dd44e 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
 
                 m_MapImageServerURL = Util.GetConfigVarFromSections<string>(source, "MapTileURL", new string[] {"LoginService", "HGWorldMap", "SimulatorFeatures"});
 
-                if (m_MapImageServerURL != string.Empty)
+                if (!string.IsNullOrEmpty(m_MapImageServerURL))
                 {
                     m_MapImageServerURL = m_MapImageServerURL.Trim();
                     if (!m_MapImageServerURL.EndsWith("/"))
-- 
cgit v1.1


From 3c540f0d33894060d53616aa0aa67bc9d8ab82ec Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 30 Jul 2013 22:07:33 -0700
Subject: Avoid another null ref opportunity.

---
 OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index a7dd44e..a2aee08 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
 
         private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
         {
-            if (m_UserManagement != null && !m_UserManagement.IsLocalGridUser(agentID) && m_MapImageServerURL != string.Empty)
+            if (m_UserManagement != null && !string.IsNullOrEmpty(m_MapImageServerURL) && !m_UserManagement.IsLocalGridUser(agentID))
             {
                 OSD extras = new OSDMap();
                 if (features.ContainsKey("OpenSimExtras"))
-- 
cgit v1.1


From 87fcff9fc39f180ceb7d5511ca8bc23965fab17f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 31 Jul 2013 11:13:55 -0700
Subject: HGWorldMapModule: check whether it's enabled or not.

---
 OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index a2aee08..cb22f0b 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -77,6 +77,9 @@ namespace OpenSim.Region.CoreModules.Hypergrid
 
         public override void AddRegion(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
             base.AddRegion(scene);
 
             scene.EventManager.OnClientClosed += new EventManager.ClientClosed(EventManager_OnClientClosed);
@@ -84,6 +87,9 @@ namespace OpenSim.Region.CoreModules.Hypergrid
 
         public override void RegionLoaded(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
             base.RegionLoaded(scene);
             ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface<ISimulatorFeaturesModule>();
 
-- 
cgit v1.1


From ac2ad9690d9e8b8988dc68cf4e2933c7b18a71bc Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 31 Jul 2013 11:20:27 -0700
Subject: HGWorldMapModule: unregister event on RemoveRegion

---
 OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index cb22f0b..97227b3 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
 
             base.AddRegion(scene);
 
-            scene.EventManager.OnClientClosed += new EventManager.ClientClosed(EventManager_OnClientClosed);
+            scene.EventManager.OnClientClosed += EventManager_OnClientClosed;
         }
 
         public override void RegionLoaded(Scene scene)
@@ -99,6 +99,15 @@ namespace OpenSim.Region.CoreModules.Hypergrid
             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
         {
             get { return "HGWorldMap"; }
-- 
cgit v1.1


From 64f2dc778ad7a080ba89a1077da538c011c7c934 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Wed, 31 Jul 2013 11:27:35 -0700
Subject: A pretty major restructuring of the simian method invocations in
 order to service access capabilities. In conjunction with the corresponding
 Simian updates, this enables explicit per-simulator capability-based access
 to grid services. That enables grid owners to add or revoke access to the
 grid on a simulator by simulator basis.

---
 .../SimianGrid/SimianAssetServiceConnector.cs      | 507 ++++++++++++++-------
 .../SimianAuthenticationServiceConnector.cs        |  12 +-
 .../SimianGrid/SimianAvatarServiceConnector.cs     |   8 +-
 .../SimianGrid/SimianFriendsServiceConnector.cs    |   8 +-
 .../Services/Connectors/SimianGrid/SimianGrid.cs   | 114 +++++
 .../SimianGrid/SimianGridMaptileModule.cs          | 131 +++---
 .../SimianGrid/SimianGridServiceConnector.cs       |  18 +-
 .../SimianGrid/SimianInventoryServiceConnector.cs  |  30 +-
 .../SimianGrid/SimianPresenceServiceConnector.cs   |  18 +-
 .../Connectors/SimianGrid/SimianProfiles.cs        |   6 +-
 .../SimianUserAccountServiceConnector.cs           |   8 +-
 11 files changed, 578 insertions(+), 282 deletions(-)

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 6603f6e..3bd11d9 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
@@ -110,7 +110,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;
@@ -153,7 +153,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;
@@ -175,7 +175,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;
@@ -198,7 +198,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"];
@@ -218,7 +218,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)
@@ -297,7 +297,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/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..a4dd36c 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 bool m_enabled = true;
+
+        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.ErrorFormat("[SimianGrid] service URL is not defined");
+                    
+                    InitialiseSimCap();
+                    SimulatorCapability = SimulatorCapability.Trim();
+                    m_log.WarnFormat("[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);
+        }
+    }
+}
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 038a4bf..bcc1e4a 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -129,7 +129,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
@@ -145,7 +145,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)
@@ -192,7 +192,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());
@@ -220,7 +220,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());
@@ -261,7 +261,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);
@@ -299,7 +299,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;
@@ -350,7 +350,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);
@@ -380,7 +380,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;
@@ -410,7 +410,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 01163aa..211b775 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -149,7 +149,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 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)
@@ -168,7 +168,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                         { "SessionID", sessionID.ToString() }
                 };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             bool success = response["Success"].AsBoolean();
 
             if (!success)
@@ -187,7 +187,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                         { "SceneID", regionID.ToString() }
                 };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             bool success = response["Success"].AsBoolean();
 
             if (!success)
@@ -232,7 +232,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "UserIDList", String.Join(",",userIDs) }
             };
 
-            OSDMap sessionListResponse = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap sessionListResponse = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (! sessionListResponse["Success"].AsBoolean())
             {
                 m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve sessions: {0}",sessionListResponse["Message"].AsString());
@@ -275,7 +275,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                         { "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)
@@ -295,7 +295,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                         { "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)
@@ -340,7 +340,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 response;
 
@@ -356,7 +356,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                         { "SessionID", sessionID.ToString() }
                 };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean())
                 return response;
 
@@ -376,7 +376,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                         { "SceneLookAt", lastLookAt.ToString() }
                 };
 
-            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/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 6e32b3a..7e36c69 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;
@@ -204,7 +204,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())
             {
@@ -219,7 +219,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)
@@ -252,7 +252,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;
-- 
cgit v1.1


From d82126b651d07893c701c8477630aabf022b30d0 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Wed, 31 Jul 2013 11:42:22 -0700
Subject: Add the Simian service config to the GridCommon example

---
 bin/config-include/GridCommon.ini.example | 9 +++++++++
 1 file changed, 9 insertions(+)

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
-- 
cgit v1.1


From 12995924052a1804f01dceb80803447fccc1d9fe Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Wed, 31 Jul 2013 15:37:15 -0700
Subject: Experimental comment to eneralize the handling of Linden caps when
 the cap is something other than "localhost". A new interface for handling
 external caps is supported with an example implemented for Simian. The only
 linden cap supporting this interface right now is the GetTexture cap.

---
 .../ClientStack/Linden/Caps/GetTextureModule.cs    |   6 +-
 .../Framework/Interfaces/IExternalCapsModule.cs    |  48 ++++++
 .../SimianGrid/SimianExternalCapsModule.cs         | 179 +++++++++++++++++++++
 prebuild.xml                                       |   1 +
 4 files changed, 233 insertions(+), 1 deletion(-)
 create mode 100644 OpenSim/Region/Framework/Interfaces/IExternalCapsModule.cs
 create mode 100644 OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 13415f8..54cf285 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -137,7 +137,11 @@ namespace OpenSim.Region.ClientStack.Linden
             else
             {
 //                m_log.DebugFormat("[GETTEXTURE]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName);
-                caps.RegisterHandler("GetTexture", m_URL);
+                IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>();
+                if (handler != null)
+                    handler.RegisterExternalUserCapsHandler(agentID,caps,"GetTexture",m_URL);
+                else
+                    caps.RegisterHandler("GetTexture", m_URL);
             }
         }
 
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/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
new file mode 100644
index 0000000..8226705
--- /dev/null
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
@@ -0,0 +1,179 @@
+/*
+ * 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;
+        
+        private IGridUserService m_GridUserService;
+        
+#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.ErrorFormat("[SimianGrid] service URL is not defined");
+                    }
+                }
+                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/prebuild.xml b/prebuild.xml
index 91c326c..b376e86 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -869,6 +869,7 @@
       <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.Region.Framework"/>
-- 
cgit v1.1


From 9f05a7ac7bfba66989b053af06dca051a522a9b1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 1 Aug 2013 00:25:59 +0100
Subject: Include missing reference that probably stops windows build from
 commit 12995924052a1804f01dceb80803447fccc1d9fe

---
 prebuild.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/prebuild.xml b/prebuild.xml
index b376e86..af8f686 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -872,6 +872,7 @@
       <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"/>
-- 
cgit v1.1


From 59b461ac0eaae1cc34bb82431106fdf0476037f3 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 1 Aug 2013 09:27:44 -0700
Subject: Issue: painfully slow terrain loading. The cause is commit
 d9d995914c5fba00d4ccaf66b899384c8ea3d5eb (r/23185) -- the WaitOne on the
 UDPServer. Putting it back to how it was done solves the issue. But this may
 impact CPU usage, so I'm pushing it to test if it does.

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 85fe1a4..942c044 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -246,7 +246,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// 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 AutoResetEvent m_dataPresentEvent = new AutoResetEvent(false);
 
         private Pool<IncomingPacket> m_incomingPacketPool;
 
@@ -907,7 +907,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             PacketPool.Instance.ReturnPacket(packet);
 
-            m_dataPresentEvent.Set();
+            //m_dataPresentEvent.Set();
         }
 
         /// <summary>
@@ -1919,12 +1919,12 @@ 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);
+                    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.
-                    m_dataPresentEvent.WaitOne(100);
+                    //m_dataPresentEvent.WaitOne(100);
 
                     Watchdog.UpdateThread();
                 }
-- 
cgit v1.1


From 932c382737d155176bd7e0dcfaf9395d997a88fb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 1 Aug 2013 18:11:50 +0100
Subject: Revert "Issue: painfully slow terrain loading. The cause is commit
 d9d995914c5fba00d4ccaf66b899384c8ea3d5eb (r/23185) -- the WaitOne on the
 UDPServer. Putting it back to how it was done solves the issue. But this may
 impact CPU usage, so I'm pushing it to test if it does."

This reverts commit 59b461ac0eaae1cc34bb82431106fdf0476037f3.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 942c044..85fe1a4 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -246,7 +246,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// 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 AutoResetEvent m_dataPresentEvent = new AutoResetEvent(false);
 
         private Pool<IncomingPacket> m_incomingPacketPool;
 
@@ -907,7 +907,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             PacketPool.Instance.ReturnPacket(packet);
 
-            //m_dataPresentEvent.Set();
+            m_dataPresentEvent.Set();
         }
 
         /// <summary>
@@ -1919,12 +1919,12 @@ 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);
+                    //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.
-                    //m_dataPresentEvent.WaitOne(100);
+                    m_dataPresentEvent.WaitOne(100);
 
                     Watchdog.UpdateThread();
                 }
-- 
cgit v1.1


From 0c4c084bed5175d8a5b25b8f915363f3b15b6e3a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 1 Aug 2013 18:12:28 +0100
Subject: Try a different approach to slow terrain update by always cycling the
 loop immediately if any data was sent, rather than waiting.

What I believe is happening is that on initial terrain send, this is done one packet at a time.
With WaitOne, the outbound loop has enough time to loop and wait again after the first packet before the second, leading to a slower send.
This approach instead does not wait if a packet was just sent but instead loops again, which appears to lead to a quicker send without losing the cpu benefit of not continually looping when there is no outbound data.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 85fe1a4..558fcb7 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1924,7 +1924,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     //
                     // 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.
-                    m_dataPresentEvent.WaitOne(100);
+                    if (!m_packetSent)
+                        m_dataPresentEvent.WaitOne(100);
 
                     Watchdog.UpdateThread();
                 }
-- 
cgit v1.1


From 216e785ca9ca7dee51c32e69952a79b6e87733d1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 1 Aug 2013 21:16:53 +0100
Subject: Add experimental "debug attachments throttle <ms>" setting (command
 line) and ThrottlePer100PrimsRezzed in [Attachments] in config

This is an experimental setting to control cpu spikes when an attachment heavy avatar logs in or avatars with medium attachments lgoin simultaneously.
It inserts a ms sleep specified in terms of attachments prims after each rez when an avatar logs in.
Default is 0 (no throttling).
"debug attachments <level>" changes to "debug attachments log <level>" which controls logging.  A logging level of 1 will show the throttling performed if applicable.
Also adds "debug attachments status" command to show current throttle and debug logging levels.
---
 .../Avatar/Attachments/AttachmentsModule.cs        | 102 ++++++++++++++++++---
 bin/OpenSimDefaults.ini                            |   7 ++
 2 files changed, 94 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 2f5a76f..97477d4 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;
@@ -50,6 +51,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
+        /// or many avatars with a medium levels of attachments login 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;
@@ -66,9 +76,15 @@ 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)
@@ -87,24 +103,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
             {
@@ -114,6 +149,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>
@@ -240,7 +298,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}",
@@ -258,14 +316,28 @@ 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);
+                    SceneObjectGroup objatt 
+                        = RezSingleAttachmentFromInventoryInternal(
+                        sp, sp.PresenceType == PresenceType.Npc ? UUID.Zero : attach.ItemID, attach.AssetID, attachmentPt, 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);
+                    }
                 }
                 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);
                 }
             }
         }
@@ -919,8 +991,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;
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index dbafd5c..2488bf1 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -703,11 +703,18 @@
     ; 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
+    ; or when multiple avatars with medium level attachments login simultaneously.
+    ; If 0 then no throttling is performed.
+    ThrottlePer100PrimsRezzed = 0;
+
 
 [Mesh]
     ; enable / disable Collada mesh support
-- 
cgit v1.1


From 7b9a50721da3ac51ee3aa60ea946278d38a18426 Mon Sep 17 00:00:00 2001
From: teravus
Date: Thu, 1 Aug 2013 16:30:29 -0500
Subject: *  Thanks Plugh for pointing out that the constructor that takes a
 ulong regionhandle and saves it to to X,Y vars in the
 OpenSim.Framework.Location object was inverting the X and Y resulting in X
 and Y confusion.    The test also used 256x256 in the uint,uint constructor
 so it was unable to determine if the X and Y components swapped.   I don't
 expect much upheaval from this commit, not a lot of features were using the
 ulong Location object constructor.   The database never stores the ulong
 regionhandle...    the prims are loaded by region Guid.   LLUDPServer used it
 to determine regions that it handled in a service definition where there was
 simply a X == X test which has the same logical result un-switched as it did
 switched.   Again, thanks LibOMV for the regionhandle code.

---
 OpenSim/Framework/Location.cs           | 16 ++++++++--------
 OpenSim/Framework/Tests/LocationTest.cs | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

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/Tests/LocationTest.cs b/OpenSim/Framework/Tests/LocationTest.cs
index a56ecb4..af5f164 100644
--- a/OpenSim/Framework/Tests/LocationTest.cs
+++ b/OpenSim/Framework/Tests/LocationTest.cs
@@ -51,21 +51,21 @@ 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(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");
 
 
-            TestLocation1 = new Location(256001, 256001);
-            TestLocation2 = new Location(1099511628032000);
+            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");
 
-- 
cgit v1.1


From 68b98a8003e0ea7ed082b105ae82a644fb706796 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 1 Aug 2013 23:16:41 +0100
Subject: minor: Add name to debug lludp packet level feedback on console

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 558fcb7..5c38399 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -694,7 +694,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     {
                         DefaultClientPacketDebugLevel = newDebug;
                         MainConsole.Instance.OutputFormat(
-                            "Debug packet debug for new clients set to {0}", DefaultClientPacketDebugLevel);
+                            "Debug packet debug for new clients set to {0} in {1}", DefaultClientPacketDebugLevel, m_scene.Name);
                     }
                     else
                     {
-- 
cgit v1.1


From c9695a0a59cba91a184683efaa7802338d68e4bd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 2 Aug 2013 00:00:00 +0100
Subject: Move experimental attachments throttling further down the chain so
 that multiple attachments changes (e.g. change outfit) are also throttled

---
 .../Avatar/Attachments/AttachmentsModule.cs        | 31 +++++++++++-----------
 bin/OpenSimDefaults.ini                            |  4 +--
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 97477d4..675fccc 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -53,8 +53,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         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
-        /// or many avatars with a medium levels of attachments login simultaneously.
+        /// 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.
@@ -319,19 +319,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     SceneObjectGroup objatt 
                         = RezSingleAttachmentFromInventoryInternal(
                         sp, sp.PresenceType == PresenceType.Npc ? UUID.Zero : attach.ItemID, attach.AssetID, attachmentPt, 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);
-                    }
                 }
                 catch (Exception e)
                 {
@@ -1023,7 +1010,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/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 2488bf1..d5d29ec 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -710,8 +710,8 @@
     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
-    ; or when multiple avatars with medium level attachments login simultaneously.
+    ; 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;
 
-- 
cgit v1.1


From 598f63e984222a89ded65465674868df452cbeed Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 2 Aug 2013 00:06:39 +0100
Subject: Make atachment state load work again

---
 OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 7b12c81..e1ca6cd 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -363,7 +363,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     // inventory right now.
                     SceneObjectGroup objatt 
                         = RezSingleAttachmentFromInventoryInternal(
-                        sp, sp.PresenceType == PresenceType.Npc ? UUID.Zero : attach.ItemID, attach.AssetID, attachmentPt, true, null);
+                        sp, sp.PresenceType == PresenceType.Npc ? UUID.Zero : attach.ItemID, attach.AssetID, attachmentPt, true, d);
 
 
                     if (ThrottlePer100PrimsRezzed > 0)
-- 
cgit v1.1


From d4c506e453b1115142eac237d3a1c4f65fa36e26 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 2 Aug 2013 00:08:14 +0100
Subject: minor: replace veclist.Add(new Vector3(0,0,0)) with Vector3.Zero in
 InventoryAccessModules.RezObject() - structs are passed by value

---
 .../CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 1203192..68e4e26 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -771,7 +771,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
 
                 objlist.Add(g);
-                veclist.Add(new Vector3(0, 0, 0));
+                veclist.Add(Vector3.Zero);
 
                 float offsetHeight = 0;
                 pos = m_Scene.GetNewRezLocation(
-- 
cgit v1.1


From 07e4958b19b0b9dc9e1955b79e735230ccc6ea6f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 1 Aug 2013 20:40:13 -0700
Subject: Turn off edit beams when object is derezed while being edited.
 (mantis #6722)

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 17da0d9..456c8cc 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1568,8 +1568,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)
             {
-- 
cgit v1.1


From 87ee0c395ed82f27c2a52b5023d8036eb7e355c9 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 2 Aug 2013 09:44:01 -0700
Subject: Fix problem with modInvoke defined integer constants being build into
 scripts as boxed integers rather than proper reference to a new LSLInteger.
 This fixes an exception when using a registered integer constant in a script.

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs | 4 ++--
 OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
index 21bae27..92dd813 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
@@ -444,7 +444,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/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)
-- 
cgit v1.1


From 5bcccfc305ae4f5a74b9b816781a2a643daa23b3 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 1 Aug 2013 12:35:22 -0700
Subject: BulletSim: add BSLinkInfo structure to remember link specific
 information for each link in a linkset. Extend BSLinksetConstraint to create
 and use BSLinkInfo with the default static constraint.

---
 OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs  |  51 +++--
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     |   4 +-
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  | 205 ++++++++++++++-------
 3 files changed, 174 insertions(+), 86 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 7f94666..9613fe0 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -70,6 +70,15 @@ public abstract class BSLinkset
         return ret;
     }
 
+    public class BSLinkInfo
+    {
+        public BSPrimLinkable member;
+        public BSLinkInfo(BSPrimLinkable pMember)
+        {
+            member = pMember;
+        }
+    }
+
     public BSPrimLinkable LinksetRoot { get; protected set; }
 
     protected BSScene m_physicsScene { get; private set; }
@@ -78,7 +87,8 @@ public abstract class BSLinkset
     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
@@ -109,7 +119,7 @@ public abstract class BSLinkset
             m_nextLinksetID = 1;
         m_physicsScene = scene;
         LinksetRoot = parent;
-        m_children = new HashSet<BSPrimLinkable>();
+        m_children = new Dictionary<BSPrimLinkable, BSLinkInfo>();
         LinksetMass = parent.RawMass;
         Rebuilding = false;
 
@@ -170,17 +180,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;
     }
@@ -194,7 +194,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;
@@ -364,7 +381,7 @@ public abstract class BSLinkset
         {
             lock (m_linksetActivityLock)
             {
-                foreach (BSPrimLinkable bp in m_children)
+                foreach (BSPrimLinkable bp in m_children.Keys)
                 {
                     mass += bp.RawMass;
                 }
@@ -382,7 +399,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;
@@ -401,7 +418,7 @@ public abstract class BSLinkset
         {
             com = LinksetRoot.Position;
 
-            foreach (BSPrimLinkable bp in m_children)
+            foreach (BSPrimLinkable bp in m_children.Keys)
             {
                 com += bp.Position;
             }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 6359046..53c3584 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -257,7 +257,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);
 
@@ -353,7 +353,7 @@ public sealed class BSLinksetCompound : BSLinkset
 
             // Add the shapes of all the components of the linkset
             int memberIndex = 1;
-            ForEachMember(delegate(BSPrimLinkable cPrim)
+            ForEachMember((cPrim) =>
             {
                 if (IsRoot(cPrim))
                 {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index f17d698..d98bf77 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -36,6 +36,75 @@ 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)
     {
     }
@@ -142,7 +211,7 @@ 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);
 
@@ -190,73 +259,74 @@ public sealed class BSLinksetConstraints : BSLinkset
     }
 
     // Create a static constraint between the two passed objects
-    private BSConstraint BuildConstraint(BSPrimLinkable rootPrim, BSPrimLinkable childPrim)
+    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(
-                            m_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
-                        );
-        // ==================================================================================
-        */
+        li.member.ZeroMotion(true);
 
-        m_physicsScene.Constraints.AddConstraint(constrain);
+        BSConstraint constrain = null;
 
-        // 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)
+        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;
     }
 
@@ -317,23 +387,24 @@ public sealed class BSLinksetConstraints : BSLinkset
                 return; // Note the 'finally' clause at the botton which will get executed.
             }
 
-            foreach (BSPrimLinkable child in m_children)
+            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.)
-                child.UpdatePhysicalMassProperties(linksetMass, true);
+                li.member.UpdatePhysicalMassProperties(linksetMass, true);
 
                 BSConstraint constrain;
-                if (!m_physicsScene.Constraints.TryGetConstraint(LinksetRoot.PhysBody, child.PhysBody, out constrain))
+                if (!m_physicsScene.Constraints.TryGetConstraint(LinksetRoot.PhysBody, li.member.PhysBody, out constrain))
                 {
                     // If constraint doesn't exist yet, create it.
-                    constrain = BuildConstraint(LinksetRoot, child);
+                    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
         {
-- 
cgit v1.1


From 24df15dab7befd50f7a45eb54f001e6e481f0ec4 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 1 Aug 2013 17:43:06 -0700
Subject: BulletSim: add implementation of 'physSetLinksetType' and
 'physGetLinksetType' and processing routines in BulletSim. Add linkset
 rebuild/conversion routine in BSLinkset.

---
 .../Scripting/ExtendedPhysics/ExtendedPhysics.cs   | 65 ++++++++++++++++++++--
 OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs  |  2 +
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     |  1 +
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  |  1 +
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     | 44 +++++++++++++++
 .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 30 ++++++++++
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs    | 17 ++++++
 OpenSim/Region/Physics/Manager/PhysicsActor.cs     |  3 +-
 OpenSim/Region/Physics/Manager/PhysicsScene.cs     |  3 +-
 9 files changed, 159 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
index 0cbc5f9..d1d318c 100755
--- a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
@@ -49,10 +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 coorespond to an identical table in BSScene.
+    // 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; }
@@ -123,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;
@@ -136,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.
@@ -168,9 +178,11 @@ public class ExtendedPhysics : INonSharedRegionModule
     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)
     {
-        if (!Enabled) return;
+        int ret = -1;
+
+        if (!Enabled) return ret;
 
         // The part that is requesting the change.
         SceneObjectPart requestingPart = BaseScene.GetSceneObjectPart(hostID);
@@ -186,7 +198,7 @@ public class ExtendedPhysics : INonSharedRegionModule
                 Physics.Manager.PhysicsActor rootPhysActor = rootPart.PhysActor;
                 if (rootPhysActor != null)
                 {
-                    rootPhysActor.Extension(PhysFunctSetLinksetType, linksetType);
+                    ret = (int)rootPhysActor.Extension(PhysFunctSetLinksetType, linksetType);
                 }
                 else
                 {
@@ -204,6 +216,49 @@ public class ExtendedPhysics : INonSharedRegionModule
         {
             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/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 9613fe0..3afd52e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -79,6 +79,8 @@ public abstract class BSLinkset
         }
     }
 
+    public LinksetImplementation LinksetImpl { get; protected set; }
+
     public BSPrimLinkable LinksetRoot { get; protected set; }
 
     protected BSScene m_physicsScene { get; private set; }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 53c3584..085d195 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -42,6 +42,7 @@ public sealed class BSLinksetCompound : BSLinkset
     public BSLinksetCompound(BSScene scene, BSPrimLinkable parent)
         : base(scene, parent)
     {
+        LinksetImpl = LinksetImplementation.Compound;
     }
 
     // ================================================================
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index d98bf77..4bac222 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -107,6 +107,7 @@ public sealed class BSLinksetConstraints : BSLinkset
 
     public BSLinksetConstraints(BSScene scene, BSPrimLinkable parent) : base(scene, parent)
     {
+        LinksetImpl = LinksetImplementation.Constraint;
     }
 
     // When physical properties are changed the linkset needs to recalculate
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index e92a1d2..a0b6abc 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -1541,6 +1541,50 @@ public class BSPrim : BSPhysObject
         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.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 2f392da..c565998 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -233,5 +233,35 @@ public class BSPrimLinkable : BSPrimDisplaced
             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)
+        {
+            BSLinkset oldLinkset = Linkset;
+            BSLinkset newLinkset = BSLinkset.Factory(PhysScene, this);
+
+            // Pick up any physical dependencies this linkset might have in the physics engine.
+            oldLinkset.RemoveDependencies(this);
+
+            // Copy the linkset children from the old linkset to the new (will be a new instance from the factory)
+            oldLinkset.ForEachLinkInfo((li) =>
+            {
+                oldLinkset.RemoveMeFromLinkset(li.member);
+                newLinkset.AddMeToLinkset(li.member);
+                li.member.Linkset = newLinkset;
+                return false;
+            });
+
+            this.Linkset = newLinkset;
+
+            // Force the shape and linkset to get reconstructed
+            newLinkset.Refresh(this);
+            this.ForceBodyShapeRebuild(true);
+        }
+        return ret;
+    }
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 41aca3b..79ac5a5 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -862,6 +862,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()
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 2500f27..1750853 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -317,7 +317,8 @@ namespace OpenSim.Region.Physics.Manager
         // Extendable interface for new, physics engine specific operations
         public virtual object Extension(string pFunct, params object[] pParams)
         {
-            throw new NotImplementedException();
+            // A NOP of the physics engine does not implement this feature
+            return null;
         }
     }
 
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 07a1d36..c93206d 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -338,7 +338,8 @@ namespace OpenSim.Region.Physics.Manager
         // Extendable interface for new, physics engine specific operations
         public virtual object Extension(string pFunct, params object[] pParams)
         {
-            throw new NotImplementedException();
+            // A NOP if the extension thing is not implemented by the physics engine
+            return null;
         }
     }
 }
-- 
cgit v1.1


From 5bdfd55ace4b673d8aaa3f25fd4bb675b1b28263 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 2 Aug 2013 10:32:43 -0700
Subject: BulletSim: When converting linkset types, don't try to change the
 list of linkset children while iterating through the list.

---
 .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 29 +++++++++++++++-------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index c565998..7179a6d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -240,26 +240,37 @@ public class BSPrimLinkable : BSPrimDisplaced
         bool ret = false;
         if (LinksetType != newType)
         {
-            BSLinkset oldLinkset = Linkset;
+            // 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);
 
-            // Copy the linkset children from the old linkset to the new (will be a new instance from the factory)
-            oldLinkset.ForEachLinkInfo((li) =>
+            // 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) =>
             {
-                oldLinkset.RemoveMeFromLinkset(li.member);
-                newLinkset.AddMeToLinkset(li.member);
-                li.member.Linkset = newLinkset;
-                return false;
+                if (!oldLinkset.IsRoot(child))
+                    children.Add(child);
+                return false;   // 'false' says to continue to next member
             });
 
-            this.Linkset = newLinkset;
+            // 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);
+            this.ForceBodyShapeRebuild(true /* inTaintTime */);
         }
         return ret;
     }
-- 
cgit v1.1


From 54b1071556edf264835f990bb3595064d2b2e2f0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 2 Aug 2013 23:12:54 +0100
Subject: Allow older teleport ConnectorProtocolVersion of "SIMULATION/0.1" to
 be manually forced in a new [SimulationService] config setting.

This is for testing and debugging purposes to help determine whether a particular issue may be teleport related or not
"SIMULATION/0.2" (the newer teleport protocol) remains the default.  If the source simulator only implements "SIMULATION/0.1" this will correctly allow fallback to the older protocol.
Specifying "SIMULATION/0.1" will force the older, less efficient protocol to always be used.
---
 .../Simulation/LocalSimulationConnector.cs         | 33 +++++++++++++---------
 .../Simulation/RemoteSimulationConnector.cs        | 21 ++++++--------
 bin/config-include/Grid.ini                        | 11 ++++++++
 bin/config-include/Standalone.ini                  | 11 ++++++++
 4 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 697ce68..7aadb87 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -63,35 +63,40 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         /// </summary>
         private bool m_ModuleEnabled = false;
 
-        public LocalSimulationConnectorModule()
-        {
-            ServiceVersion = "SIMULATION/0.2";
-        }
-
         #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)
+        {
+            IConfig config = configSource.Configs["SimulationService"];
+            if (config != null)
+            {
+                ServiceVersion = config.GetString("ConnectorProtocolVersion", "SIMULATION/0.2");
+
+                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()
         {
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index 8722b80..f45f560 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);
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 15ba55a..1837bdd 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -30,6 +30,17 @@
     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/Standalone.ini b/bin/config-include/Standalone.ini
index d3b9cb4..7b7beb2 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -26,6 +26,17 @@
     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"
 
-- 
cgit v1.1


From 5198df3aa03eb47bc26b3c86924687612c015dce Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 2 Aug 2013 17:00:18 -0700
Subject: Issue: 10 simultaneous TPs, many not making it. Now bypassing the
 per-url lock -- we should be "ok" (or, more "ok") now that we have increased
 the connection limit on the http library. But this is a sensitive part of the
 code, so it may need reverting.

---
 OpenSim/Framework/WebUtil.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 6fb1e0c..0e9de59 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -145,10 +145,10 @@ namespace OpenSim.Framework
         
         public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout, bool compressed)
         {
-            lock (EndPointLock(url))
-            {
+            //lock (EndPointLock(url))
+            //{
                 return ServiceOSDRequestWorker(url,data,method,timeout,compressed);
-            }
+            //}
         }
 
         public static void LogOutgoingDetail(Stream outputStream)
-- 
cgit v1.1


From 847c01f406359289097a6ad8d681002a4beff086 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 2 Aug 2013 17:38:08 -0700
Subject: Amend Justin's last commit regarding the new config var
 ServiceVersion. The section may not exist at all.

---
 .../ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 7aadb87..e86d186 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -84,10 +84,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 
         public void InitialiseService(IConfigSource configSource)
         {
+            ServiceVersion = "SIMULATION/0.2";
             IConfig config = configSource.Configs["SimulationService"];
             if (config != null)
             {
-                ServiceVersion = config.GetString("ConnectorProtocolVersion", "SIMULATION/0.2");
+                ServiceVersion = config.GetString("ConnectorProtocolVersion", ServiceVersion);
 
                 if (ServiceVersion != "SIMULATION/0.1" && ServiceVersion != "SIMULATION/0.2")
                     throw new Exception(string.Format("Invalid ConnectorProtocolVersion {0}", ServiceVersion));
-- 
cgit v1.1


From b857353fc932bdf775abce2a3d34140cafe916ce Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 3 Aug 2013 15:42:25 -0700
Subject: Making the J2KDecoderModule decoder function async. Could this be the
 cause of sim freeze? -- HandleRequestImage in LLClientView is now sync, which
 means that it cannot take too long to complete. However, its execution path
 may end up in J2KDecoderModule.Decode, which is heavy and could stop the
 packet processing thread while it's at it.

---
 OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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); });
             }
         }
 
-- 
cgit v1.1


From dcfeb95e98ca7b002170a5916f556f54f300678c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 3 Aug 2013 20:13:44 -0700
Subject: HG: If OutboundPermission is set to false, let's enforce stricter
 permissions by not allowing objects to be taken to inventory.

---
 .../InventoryAccess/HGInventoryAccessModule.cs     | 31 ++++++++++++++++++++++
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs |  3 +++
 2 files changed, 34 insertions(+)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 8f9800f..978c288 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;
+
         }
 
         #endregion
@@ -417,5 +428,25 @@ 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;
+        }
+
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 58fa18c..2d1a3ef 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2068,7 +2068,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
-- 
cgit v1.1


From 09cb2a37dd73296290c306f38412c1743b9eb820 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 3 Aug 2013 20:36:30 -0700
Subject: More on HG inventory and OutboundPermission: disallowing giving
 inventory to foreigners if OutboundPermission is false

---
 .../Framework/InventoryAccess/HGInventoryAccessModule.cs    | 13 ++++++++++++-
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs          |  3 +++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 978c288..ce7ed26 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             // 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
@@ -447,6 +447,17 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             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/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 2d1a3ef..8e4e307 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -556,6 +556,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);
 
-- 
cgit v1.1


From 5b4b349776613d9054e85727f8f6a1f079a5225a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 3 Aug 2013 21:27:32 -0700
Subject: Fix the failing TestSendImage. J2K decoding is async.

---
 .../Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
index 83144e3..6aa8bcc 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;
@@ -105,7 +106,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             args.requestSequence = 1;
 
             llim.EnqueueReq(args);
-            llim.ProcessImageQueue(20);
+
+            // We now have to wait and hit the processing wheel, because the decoding is async
+            int i = 10;
+            while (i-- > 0)
+            {
+                llim.ProcessImageQueue(20);
+                Thread.Sleep(100);
+            }
 
             Assert.That(tc.SentImageDataPackets.Count, Is.EqualTo(1));
         }
-- 
cgit v1.1


From 05012bb0df9b109f792b83e82779d3f69fb37ecb Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 5 Aug 2013 08:09:30 -0700
Subject: Group notices bug fix: use a new IM for each member of the group,
 otherwise the fields get messed up because the transfer is async

---
 OpenSim/Addons/Groups/GroupsModule.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index da8030c..830c671 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -467,12 +467,12 @@ namespace OpenSim.Groups
                         }
 
                         // Send notice out to everyone that wants notices
-                        // Build notice IIM
-                        GridInstantMessage msg = CreateGroupNoticeIM(UUID.Zero, NoticeID, (byte)OpenMetaverse.InstantMessageDialog.GroupNotice);
                         foreach (GroupMembersData member in m_groupData.GetGroupMembers(GetRequestingAgentIDStr(remoteClient), GroupID))
                         {
                             if (member.AcceptNotices)
                             {
+                                // Build notice IIM, one of reach, because the sending may be async
+                                GridInstantMessage msg = CreateGroupNoticeIM(UUID.Zero, NoticeID, (byte)OpenMetaverse.InstantMessageDialog.GroupNotice);
                                 msg.toAgentID = member.AgentID.Guid;
                                 OutgoingInstantMessage(msg, member.AgentID);
                             }
-- 
cgit v1.1


From 76bd3de2fd243d0c910404af8a9998de746b04c4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 5 Aug 2013 19:22:47 +0100
Subject: Add checks monitoring framework to provide alerts if certain
 conditions do not hold.

Not yet in use.
---
 OpenSim/Framework/Monitoring/Checks/Check.cs  | 118 ++++++++++++
 OpenSim/Framework/Monitoring/ChecksManager.cs | 262 ++++++++++++++++++++++++++
 OpenSim/Framework/Monitoring/StatsManager.cs  |   6 +-
 OpenSim/Framework/Monitoring/Watchdog.cs      |   1 +
 OpenSim/Framework/Servers/ServerBase.cs       |   1 +
 5 files changed, 385 insertions(+), 3 deletions(-)
 create mode 100644 OpenSim/Framework/Monitoring/Checks/Check.cs
 create mode 100644 OpenSim/Framework/Monitoring/ChecksManager.cs

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/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index e6a2304..87197f4 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -35,9 +35,9 @@ 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";
@@ -257,7 +257,7 @@ namespace OpenSim.Framework.Monitoring
 //        }
 
         /// <summary>
-        /// Registers a statistic.
+        /// Register a statistic.
         /// </summary>
         /// <param name='stat'></param>
         /// <returns></returns>
diff --git a/OpenSim/Framework/Monitoring/Watchdog.cs b/OpenSim/Framework/Monitoring/Watchdog.cs
index 3f992b1..45762a6 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/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 029b848..a8e0f81 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -272,6 +272,7 @@ namespace OpenSim.Framework.Servers
                 "shutdown",
                 "Quit the application", (mod, args) => Shutdown());
 
+            ChecksManager.RegisterConsoleCommands(m_console);
             StatsManager.RegisterConsoleCommands(m_console);
         }
 
-- 
cgit v1.1


From 03698121ed1e605a126f9bba37088f145a0ef2fb Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Mon, 5 Aug 2013 12:34:53 -0700
Subject: Remove some debugging from simian connectors.

---
 .../Services/Connectors/SimianGrid/SimianExternalCapsModule.cs    | 6 +++++-
 OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs              | 8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
index 8226705..e85b0b7 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
@@ -79,7 +79,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     {
                         m_simianURL = m_config.GetString("SimianServiceURL");
                         if (String.IsNullOrEmpty(m_simianURL))
-                            m_log.ErrorFormat("[SimianGrid] service URL is not defined");
+                        {
+                            //m_log.DebugFormat("[SimianGrid] service URL is not defined");
+                            m_enabled = false;
+                            return;
+                        }
                     }
                 }
                 else
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
index a4dd36c..e7d2f86 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
@@ -74,11 +74,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 {
                     m_simianURL = m_config.GetString("SimianServiceURL");
                     if (String.IsNullOrEmpty(m_simianURL))
-                        m_log.ErrorFormat("[SimianGrid] service URL is not defined");
+                    {
+                        // m_log.DebugFormat("[SimianGrid] service URL is not defined");
+                        m_enabled = false;
+                        return;
+                    }
                     
                     InitialiseSimCap();
                     SimulatorCapability = SimulatorCapability.Trim();
-                    m_log.WarnFormat("[SimianExternalCaps] using {0} as simulator capability",SimulatorCapability);
+                    m_log.InfoFormat("[SimianExternalCaps] using {0} as simulator capability",SimulatorCapability);
                 }
             }
             catch (Exception e)
-- 
cgit v1.1


From 7f0d9ad64473ad0defb8d534a8ddadc6d471e4a5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 5 Aug 2013 20:36:46 +0100
Subject: Make test AssetsClient print out more information about any failure
 to set thread numbers and immediate post config thread numbers

---
 OpenSim/Tests/Clients/Assets/AssetsClient.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Tests/Clients/Assets/AssetsClient.cs b/OpenSim/Tests/Clients/Assets/AssetsClient.cs
index 26d740b..e988d0e 100644
--- a/OpenSim/Tests/Clients/Assets/AssetsClient.cs
+++ b/OpenSim/Tests/Clients/Assets/AssetsClient.cs
@@ -68,8 +68,18 @@ namespace OpenSim.Tests.Clients.AssetsClient
             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);
-            ThreadPool.SetMinThreads(1, 1);
-            ThreadPool.SetMaxThreads(10, 3);
+
+            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);
-- 
cgit v1.1


From b8612e005a2f85da2bde2d555f910934cccb218a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 5 Aug 2013 20:47:47 +0100
Subject: At OpenSimulator startup, print out default min built-in threadpool
 threads as well as max.

Make it clear that we only try to adjust max, and log at warn level if this fails.
Other minor logging cleanup.
---
 OpenSim/Region/Application/Application.cs | 41 ++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index e451aa8..2e155ec 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -103,26 +103,38 @@ 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.
@@ -130,22 +142,24 @@ namespace OpenSim
 			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 IO completion 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 IO 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 IO completion 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.
@@ -153,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.
-- 
cgit v1.1


From 24dcf3cf6a95596ce0ac188a63bb5c2c4c47dcee Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 5 Aug 2013 20:51:40 +0100
Subject: Comment out debug log lines about script modules comms for now.

If this is an issue, could change log4net config instead to allow re-enablement
---
 .../Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
index 6bf50d2..a515346 100644
--- a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
@@ -163,7 +163,7 @@ 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;
             List<Type> typeArgs = mi.GetParameters()
@@ -323,7 +323,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);
-- 
cgit v1.1


From 946b37096698c818104405cb511579e810a62973 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 5 Aug 2013 14:21:17 -0700
Subject: Child agent updates: remove the dependency on the root agent's camera
 position. That was a complete overkill that is unnecessary at this point.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 456c8cc..0ba2dab 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2989,8 +2989,7 @@ 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;
-- 
cgit v1.1


From 160659f68382187d7e949ca11c2942907671fe86 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 5 Aug 2013 23:04:36 +0100
Subject: Make it possible to set worker/iocp min/max threadpool limits on the
 fly with the console command "debug threadpool set"

---
 OpenSim/Framework/Servers/ServerBase.cs | 78 +++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index a8e0f81..55b6c58 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -256,6 +256,12 @@ namespace OpenSim.Framework.Servers
                 "Show thread status.  Synonym for \"show threads\"",
                 (string module, string[] args) => Notice(GetThreadsReport()));
 
+            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(
                 "General", false, "force gc",
                 "force gc",
@@ -283,6 +289,78 @@ namespace OpenSim.Framework.Servers
             m_serverStatsCollector.Start();
         }
 
+        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)
         {
             Notice("Manually invoking runtime garbage collection");
-- 
cgit v1.1


From 139dcf1246b933f76bf72d2306f3f70d2ca61479 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 5 Aug 2013 23:06:17 +0100
Subject: minor: move "threads abort" and "force gc" console commands into
 debug category - these are not things one needs to do in normal operation

---
 OpenSim/Framework/Servers/ServerBase.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 55b6c58..0545bea 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -246,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);
 
@@ -263,7 +263,7 @@ namespace OpenSim.Framework.Servers
                 HandleDebugThreadpoolSet);
 
             m_console.Commands.AddCommand(
-                "General", false, "force gc",
+                "Debug", false, "force gc",
                 "force gc",
                 "Manually invoke runtime garbage collection.  For debugging purposes",
                 HandleForceGc);
-- 
cgit v1.1


From f9dc5815c4788aefed7eab01fa79709d3921e22a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 5 Aug 2013 23:15:30 +0100
Subject: For LLImageManagerTests, make tests execute under synchronous fire
 and forget conditions.

I generally prefer this approach for regression tests because of the complexity of accounting for different threading conditions.
---
 .../Linden/UDP/Tests/LLImageManagerTests.cs          | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
index 6aa8bcc..575e54c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
@@ -54,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(
@@ -73,6 +76,14 @@ 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 override void SetUp()
         {
@@ -106,14 +117,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             args.requestSequence = 1;
 
             llim.EnqueueReq(args);
-
-            // We now have to wait and hit the processing wheel, because the decoding is async
-            int i = 10;
-            while (i-- > 0)
-            {
-                llim.ProcessImageQueue(20);
-                Thread.Sleep(100);
-            }
+            llim.ProcessImageQueue(20);
 
             Assert.That(tc.SentImageDataPackets.Count, Is.EqualTo(1));
         }
-- 
cgit v1.1


From 9bcf07279513294d58c3076e7d8a6eb5ee64c759 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 5 Aug 2013 23:44:48 +0100
Subject: Make it possible to switch whether we serialize osd requests per
 endpoint or not, either via config (SerializeOSDRequests in [Network]) or via
 the "debug comms set" console command.

For debug purposes to assess what impact this has on network response in a heavy test environment.
---
 OpenSim/Framework/Console/ConsoleUtil.cs | 22 ++++++++++++++++++-
 OpenSim/Framework/Servers/ServerBase.cs  | 37 ++++++++++++++++++++++++++++++++
 OpenSim/Framework/WebUtil.cs             | 20 +++++++++++++----
 3 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Framework/Console/ConsoleUtil.cs b/OpenSim/Framework/Console/ConsoleUtil.cs
index 97a86a8..c0ff454 100644
--- a/OpenSim/Framework/Console/ConsoleUtil.cs
+++ b/OpenSim/Framework/Console/ConsoleUtil.cs
@@ -156,7 +156,27 @@ 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='rawConsoleVector'>/param>
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 0545bea..824c7e2 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -257,6 +257,12 @@ namespace OpenSim.Framework.Servers
                 (string module, string[] args) => Notice(GetThreadsReport()));
 
             m_console.Commands.AddCommand (
+                "Debug", false, "debug comms set",
+                "debug comms set serialosdreq true|false",
+                "Set comms parameters.  For debug purposes.",
+                HandleDebugCommsSet);
+
+            m_console.Commands.AddCommand (
                 "Debug", false, "debug threadpool set",
                 "debug threadpool set worker|iocp min|max <n>",
                 "Set threadpool parameters.  For debug purposes.",
@@ -284,11 +290,42 @@ namespace OpenSim.Framework.Servers
 
         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 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 HandleDebugThreadpoolSet(string module, string[] args)
         {
             if (args.Length != 6)
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 0e9de59..706b33f 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,17 @@ namespace OpenSim.Framework
         
         public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout, bool compressed)
         {
-            //lock (EndPointLock(url))
-            //{
-                return ServiceOSDRequestWorker(url,data,method,timeout,compressed);
-            //}
+            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)
-- 
cgit v1.1


From 4581bdd929d84abe2dbdc46c819d015e391a5b6d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 5 Aug 2013 23:49:33 +0100
Subject: Add "debug comms status" command to show current debug comms settings

---
 OpenSim/Framework/Servers/ServerBase.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 824c7e2..1bee6a3 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -263,6 +263,12 @@ namespace OpenSim.Framework.Servers
                 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.",
@@ -302,6 +308,11 @@ namespace OpenSim.Framework.Servers
             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)
-- 
cgit v1.1


From ac198068ab7bb3895d95c6d1902b2c6af575a32a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 6 Aug 2013 00:00:12 +0100
Subject: Add "debug threadpool status" console command to show min/max/current
 worker/iocp threadpool numbers

---
 OpenSim/Framework/Servers/ServerBase.cs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 1bee6a3..c258ff6 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -274,6 +274,12 @@ namespace OpenSim.Framework.Servers
                 "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(
                 "Debug", false, "force gc",
                 "force gc",
@@ -337,6 +343,23 @@ namespace OpenSim.Framework.Servers
             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)
-- 
cgit v1.1


From 4c2f6de8e4957df3c7186437089ba0925edb1a08 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 6 Aug 2013 18:29:33 +0100
Subject: Add the experimental ability to dump stats (result of command "show
 stats all") to file OpenSimStats.log every 5 seconds.

This can currently only be activated with the console command "debug stats record start".
Off by default.
Records to file OpenSimStats.log for simulator and RobustStats.log for ROBUST
---
 OpenSim/Framework/Monitoring/StatsManager.cs | 52 +++++++++++++++++++++-------
 bin/OpenSim.32BitLaunch.exe.config           | 36 ++++++++++++++++++-
 bin/OpenSim.exe.config                       | 21 +++++++++++
 bin/Robust.32BitLaunch.exe.config            | 22 ++++++++++++
 bin/Robust.exe.config                        | 21 +++++++++++
 5 files changed, 139 insertions(+), 13 deletions(-)

diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index 87197f4..c8e838c 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -81,6 +81,8 @@ namespace OpenSim.Framework.Monitoring
                     + "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)
@@ -145,29 +147,55 @@ namespace OpenSim.Framework.Monitoring
             }
         }
 
-        private static void OutputAllStatsToConsole(ICommandConsole con)
+        public static List<string> GetAllStatsReports()
         {
+            List<string> reports = new List<string>();
+
             foreach (var category in RegisteredStats.Values)
-            {
-                OutputCategoryStatsToConsole(con, category);
-            }
+                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;
+        }
+
+        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:
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/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.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>
-- 
cgit v1.1


From d6d5d4ebd033d47886c6e31ae87c0be527f5545e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 6 Aug 2013 18:32:16 +0100
Subject: Add file missing from last commit 4c2f6de

---
 OpenSim/Framework/Monitoring/StatsLogger.cs | 108 ++++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 OpenSim/Framework/Monitoring/StatsLogger.cs

diff --git a/OpenSim/Framework/Monitoring/StatsLogger.cs b/OpenSim/Framework/Monitoring/StatsLogger.cs
new file mode 100644
index 0000000..fa2e1b6
--- /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 very {0}ms to file", 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
-- 
cgit v1.1


From 3194ffdab8d54723ad1546846c1d45472d6a8464 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 7 Aug 2013 08:01:59 -0700
Subject: Fixed incomplete commit r/23317 -- see_into_region. Put the guard
 around estate bans also, and delete the obsolete config var.

---
 OpenSim/Region/Application/ConfigurationLoader.cs |  1 -
 OpenSim/Region/Framework/Scenes/Scene.cs          | 32 +++++++++++------------
 OpenSim/Tools/Configger/ConfigurationLoader.cs    |  1 -
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index fc3999f..3e93638 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -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/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index dec493b..503b81a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4013,28 +4013,28 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
-            if (RegionInfo.EstateSettings != null)
-            {
-                if (RegionInfo.EstateSettings.IsBanned(agent.AgentID))
-                {
-                    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!");
-            }
-
             // 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 != null)
+                {
+                    if (RegionInfo.EstateSettings.IsBanned(agent.AgentID))
+                    {
+                        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)
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");
-- 
cgit v1.1


From dbd773e89e1956144d0358033e560fbd36c89ecd Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 7 Aug 2013 10:04:53 -0700
Subject: Amend to last commit -- remove the obsolete var from
 OpenSim.ini.example

---
 bin/OpenSim.ini.example | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 33f3263..d6de777 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -184,10 +184,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.
-- 
cgit v1.1


From a33a1ac958b3158c9ce009e5d2915c165fb11c23 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 7 Aug 2013 18:52:30 +0100
Subject: Add post-CreateAgent teleport cancellation/abortion functionality
 from v1 transfer protocol into v2.

This stops OpenSimulator still trying to teleport the user if they hit cancel on the teleport screen or closed the viewer whilst the protocol was trying to create an agent on the remote region.
Ideally, the code may also attempt to tell the destination simulator that the agent should be removed (accounting for issues where the destination was not responding in the first place, etc.)
---
 .../EntityTransfer/EntityTransferModule.cs          | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 96cd6b9..80c125a 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -956,6 +956,27 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 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);
 
-- 
cgit v1.1


From b10710d4a5f7fb33ee9b90aefac16ac3d4647db6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 7 Aug 2013 23:17:31 +0100
Subject: minor: add some method doc to ScenePresence fields used for entity
 transfer, add minor details to some log messages, rename a misleading local
 variable name.

No functional changes.
---
 OpenSim/Framework/ChildAgentDataUpdate.cs          |  6 +++++
 .../EntityTransfer/EntityTransferModule.cs         | 14 +++++++----
 OpenSim/Region/Framework/Scenes/Scene.cs           | 26 +++++++++++++--------
 OpenSim/Region/Framework/Scenes/ScenePresence.cs   | 27 ++++++++++++++--------
 4 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 1c5f558..18d008c 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -287,6 +287,12 @@ namespace OpenSim.Framework
         public Vector3 AtAxis;
         public Vector3 LeftAxis;
         public Vector3 UpAxis;
+
+        /// <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;
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 80c125a..01ef710 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -688,8 +688,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             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);
-
+                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,
@@ -698,7 +697,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             ulong destinationHandle = finalDestination.RegionHandle;
             AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
 
-            m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Using TP V1");
+            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;
@@ -1079,20 +1081,22 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 if (!sp.DoNotCloseAfterTeleport)
                 {
                     // OK, it got this agent. Let's close everything
-                    m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Closing in agent {0} in region {1}", sp.Name, Scene.RegionInfo.RegionName);
+                    m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Closing in agent {0} in region {1}", sp.Name, Scene.Name);
                     sp.CloseChildAgents(newRegionX, newRegionY);
                     sp.Scene.IncomingCloseAgent(sp.UUID, false);
 
                 }
                 else
                 {
-                    m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Not closing agent {0}, user is back in {0}", sp.Name, Scene.RegionInfo.RegionName);
+                    m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Not closing agent {0}, user is back in {0}", sp.Name, Scene.Name);
                     sp.DoNotCloseAfterTeleport = false;
                 }
             }
             else
+            {
                 // now we have a child agent in this region. 
                 sp.Reset();
+            }
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 503b81a..56cd57e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4222,36 +4222,42 @@ 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)
             {
-                if (cAgentData.SessionID != childAgentUpdate.ControllingClient.SessionId)
+                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).", childAgentUpdate.UUID, cAgentData.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}", 
-                        childAgentUpdate.UUID, childAgentUpdate.ControllingClient.SessionId, cAgentData.SessionID));
+                        sp.UUID, sp.ControllingClient.SessionId, cAgentData.SessionID));
                 }
 
-                childAgentUpdate.ChildAgentDataUpdate(cAgentData);
+                sp.ChildAgentDataUpdate(cAgentData);
 
                 int ntimes = 20;
                 if (cAgentData.SenderWantsToWaitForRoot)
                 {
-                    while (childAgentUpdate.IsChildAgent && ntimes-- > 0)
+                    while (sp.IsChildAgent && ntimes-- > 0)
                         Thread.Sleep(1000);
 
                     m_log.DebugFormat(
                         "[SCENE]: Found presence {0} {1} {2} in {3} after {4} waits",
-                        childAgentUpdate.Name, childAgentUpdate.UUID, childAgentUpdate.IsChildAgent ? "child" : "root", RegionInfo.RegionName, 20 - ntimes);
+                        sp.Name, sp.UUID, sp.IsChildAgent ? "child" : "root", Name, 20 - ntimes);
 
-                    if (childAgentUpdate.IsChildAgent)
+                    if (sp.IsChildAgent)
                         return false;
                 }
+
                 return true;
             }
+
             return false;
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 0ba2dab..7fd1302 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -285,10 +285,24 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         private Vector3 posLastSignificantMove;
 
-        // For teleports and crossings callbacks
+        #region For teleports and crossings callbacks
+
+        /// <summary>
+        /// In the V1 teleport protocol, the destination simulator sends ReleaseAgent to this address.
+        /// </summary>
         string m_callbackURI;
+
         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
         /// </value>
@@ -717,13 +731,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        /// <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; }
-
         private float m_speedModifier = 1.0f;
 
         public float SpeedModifier
@@ -1325,14 +1332,14 @@ namespace OpenSim.Region.Framework.Scenes
             int count = 20;
             while (m_originRegionID.Equals(UUID.Zero) && count-- > 0)
             {
-                m_log.DebugFormat("[SCENE PRESENCE]: Agent {0} waiting for update in {1}", client.Name, Scene.RegionInfo.RegionName);
+                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", client.Name);
+                m_log.WarnFormat("[SCENE PRESENCE]: Update agent {0} never arrived in {1}", client.Name, Scene.Name);
                 return false;
             }
 
-- 
cgit v1.1


From 638c3d25b0787c2fbdabbe80519389ad8ddb944d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 8 Aug 2013 00:48:22 +0100
Subject: Remove never implemented stub modules commands (list, load, unload)
 from back in 2009.

"show modules" is the functional console command that will show currently loaded modules.
Addresses http://opensimulator.org/mantis/view.php?id=6730
---
 OpenSim/Region/Application/OpenSim.cs | 40 -----------------------------------
 1 file changed, 40 deletions(-)

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 9dcc8da..58f9368 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -348,18 +348,6 @@ 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);
         }
 
         protected override void ShutdownSpecific()
@@ -557,34 +545,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>
-- 
cgit v1.1


From e4da8d74d8b0e04a5439638c8868367d4b20050f Mon Sep 17 00:00:00 2001
From: Kevin Cozens
Date: Mon, 5 Aug 2013 19:28:11 -0400
Subject: Additional regression tests for the location routines in Location.cs

---
 OpenSim/Framework/Tests/LocationTest.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/OpenSim/Framework/Tests/LocationTest.cs b/OpenSim/Framework/Tests/LocationTest.cs
index af5f164..3d5d1d2 100644
--- a/OpenSim/Framework/Tests/LocationTest.cs
+++ b/OpenSim/Framework/Tests/LocationTest.cs
@@ -55,11 +55,18 @@ namespace OpenSim.Framework.Tests
             Location TestLocation2 = new Location(1095216660736000);
             Assert.That(TestLocation1 == TestLocation2);
 
+            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 == 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");
+
+            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);
-- 
cgit v1.1


From 43da879ea2123707190875fe2615e01be19ecced Mon Sep 17 00:00:00 2001
From: Kevin Cozens
Date: Mon, 5 Aug 2013 19:29:38 -0400
Subject: Added regression tests for the routines related to fake parcel IDs.

---
 OpenSim/Framework/Tests/UtilTest.cs | 84 +++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs
index 11ca068..c83651c 100644
--- a/OpenSim/Framework/Tests/UtilTest.cs
+++ b/OpenSim/Framework/Tests/UtilTest.cs
@@ -282,5 +282,89 @@ 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);
+System.Console.WriteLine("uuid: " + uuid);
+System.Console.WriteLine("x2/y2: " + x2 + "," + y2);
+        }
     }
 }
-- 
cgit v1.1


From 64216b34a49377f6999f6d2cf624d3c537d3f9d5 Mon Sep 17 00:00:00 2001
From: Kevin Cozens
Date: Mon, 5 Aug 2013 19:30:46 -0400
Subject: Fixed error in BuildFakeParcelID() which was detected by regression
 tests.

---
 OpenSim/Framework/Util.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 6a15734..f0e5bc1 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1247,7 +1247,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);
@@ -1258,7 +1258,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);
-- 
cgit v1.1


From ce1361f2fea9c650cc774941b5cd95b14b8f01f5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 8 Aug 2013 01:07:30 +0100
Subject: minor: Remove console lines at bottom of FakeParcelIDTests()
 regression test that were accidentally left in

---
 OpenSim/Framework/Tests/UtilTest.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs
index c83651c..3b7f252 100644
--- a/OpenSim/Framework/Tests/UtilTest.cs
+++ b/OpenSim/Framework/Tests/UtilTest.cs
@@ -363,8 +363,6 @@ namespace OpenSim.Framework.Tests
 
             uuid = new UUID("00dd0700-00d1-0700-3800-000032000000");
             Util.FakeParcelIDToGlobalPosition(uuid, out x2, out y2);
-System.Console.WriteLine("uuid: " + uuid);
-System.Console.WriteLine("x2/y2: " + x2 + "," + y2);
         }
     }
 }
-- 
cgit v1.1


From 99a4a914887c16483074b0145b9b6da765ac024a Mon Sep 17 00:00:00 2001
From: teravus
Date: Wed, 7 Aug 2013 21:22:04 -0500
Subject: * This makes in-world terrain editing smoother, even in MegaRegions. 
   This change only affects the editing user's experience.  Non-editing users
 will see nothing different from the current 'slow' result.    See comments
 for the thought process and how the issues surrounding terrain editing,
 cache, bandwidth, threading, terrain patch reliability and throttling were
 balanced.

---
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  | 33 ++++++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 8b2440a..0dbce2f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -327,7 +327,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private PriorityQueue m_entityProps;
         private Prioritizer m_prioritizer;
         private bool m_disableFacelights = false;
-
+        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
         /// continually recreate it.
@@ -1239,9 +1239,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.Land);
+                // 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.Land);
+                }
             }
             catch (Exception e)
             {
@@ -6263,6 +6286,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++)
@@ -6278,6 +6304,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         }
                     }
                 }
+                m_justEditedTerrain = false; // Queue terrain packet (Land layer) if necessary, make it reliable again
             }
 
             return true;
-- 
cgit v1.1


From 4e86674a3a671561c3a9c85925308f2004fcc922 Mon Sep 17 00:00:00 2001
From: teravus
Date: Wed, 7 Aug 2013 23:33:23 -0500
Subject: * Added set water height <height> [<x>] [<y>] console command
 following the set terrain heights console command as an example.

---
 .../World/Estate/EstateManagementCommands.cs       | 31 +++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

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];
-- 
cgit v1.1


From 50c163ae6ca734610694f4edcc109ff0bdc65ba1 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 6 Aug 2013 08:21:16 -0700
Subject: Add a JSON web fetch of the statististics managed by StatsManager.
 Disabled by default. Enable by setting
 [Startup]ManagedStatsRemoteFetchURI="Something" and thereafter
 "http://ServerHTTPPort/Something/" will return all the managed stats
 (equivilent to "show stats all" console command). Accepts queries "cat=",
 "cont=" and "stat=" to specify statistic category, container and statistic
 names. The special name "all" is the default and returns all values in that
 group.

---
 OpenSim/Framework/Monitoring/StatsManager.cs | 31 ++++++++++++++++++++++++++++
 OpenSim/Region/Application/OpenSim.cs        |  7 +++++++
 OpenSim/Region/Application/OpenSimBase.cs    |  2 ++
 3 files changed, 40 insertions(+)

diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index c8e838c..23c6f18 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -26,10 +26,12 @@
  */
 
 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
@@ -262,6 +264,35 @@ namespace OpenSim.Framework.Monitoring
             return map;
         }
 
+        public static Hashtable HandleStatsRequest(Hashtable request)
+        {
+            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();
+
+            // 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.
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 58f9368..13fdb3b 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -172,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.WarnFormat("[OPENSIM] Enabling remote managed stats fetch. URL = {0}", urlBase);
+            }
+
             if (m_console is RemoteConsole)
             {
                 if (m_consolePort == 0)
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index f0c088a..b032e7f 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;
 
@@ -188,6 +189,7 @@ namespace OpenSim
                     CreatePIDFile(pidFile);
                 
                 userStatsURI = startupConfig.GetString("Stats_URI", String.Empty);
+                managedStatsURI = startupConfig.GetString("ManagedStatsRemoteFetchURI", String.Empty);
             }
 
             // Load the simulation data service
-- 
cgit v1.1


From c67c55e0fcd93e5b68e61e5f1bc4341af48568d3 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 8 Aug 2013 08:56:22 -0700
Subject: Better error reporting when registering LSL function extensions
 (comms module). For unknown reasons, a dynamic function signature cannot have
 more than 5 parameters. Error message now tells you this fact so you can
 curse MS and then go change your function definitions.

---
 .../ScriptModuleComms/ScriptModuleCommsModule.cs        | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
index a515346..6da2222 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;
             }
 
@@ -165,7 +166,7 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
         {
 //            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;
-- 
cgit v1.1


From d9bd6e6b5be3100141a3b1202f859c65a302d4ee Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 8 Aug 2013 09:41:11 -0700
Subject: Add parameter and explanation of ManagedStats return to
 OpenSimDefaults.ini. Add 'callback' query parameter to managed stats return
 to return function form of JSON data.

---
 OpenSim/Framework/Monitoring/StatsManager.cs | 6 ++++++
 OpenSim/Region/Application/OpenSim.cs        | 4 ++--
 bin/OpenSimDefaults.ini                      | 7 +++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index 23c6f18..7cf1fa7 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -281,6 +281,12 @@ namespace OpenSim.Framework.Monitoring
 
             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 + ");";
+            }
+
             // m_log.DebugFormat("{0} StatFetch: uri={1}, cat={2}, cont={3}, stat={4}, resp={5}",
             //                         LogHeader, regpath, pCategoryName, pContainerName, pStatName, strOut);
 
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 13fdb3b..1cdd868 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -175,8 +175,8 @@ namespace OpenSim
             if (managedStatsURI != String.Empty)
             {
                 string urlBase = String.Format("/{0}/", managedStatsURI);
-                MainServer.Instance.AddHTTPHandler(urlBase, StatsManager.HandleStatsRequest);
-                m_log.WarnFormat("[OPENSIM] Enabling remote managed stats fetch. URL = {0}", urlBase);
+                MainServer.Instance.AddHTTPHandler(urlBase, StatsManager.HandleStatsRequest);
+                m_log.InfoFormat("[OPENSIM] Enabling remote managed stats fetch. URL = {0}", urlBase);
             }
 
             if (m_console is RemoteConsole)
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index d5d29ec..0a85085 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -264,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
-- 
cgit v1.1


From 9fc97cbbf77f269d69aaa6234dd6e12ebf3b9563 Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Thu, 8 Aug 2013 12:44:03 -0700
Subject: Make m_originRegionID in ScenePresence public to allow DSG module to
 work for now. Once the code churn on teleport ends, I can find a better
 solution

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 7fd1302..1b8c276 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -290,9 +290,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// In the V1 teleport protocol, the destination simulator sends ReleaseAgent to this address.
         /// </summary>
-        string m_callbackURI;
+        private string m_callbackURI;
 
-        UUID m_originRegionID;
+        public UUID m_originRegionID;
 
         /// <summary>
         /// Used by the entity transfer module to signal when the presence should not be closed because a subsequent
-- 
cgit v1.1


From 6410a25cefcb1e7f87b76f273f8c6569fbe17670 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 8 Aug 2013 13:53:12 -0700
Subject: BulletSim: adjust avatar position when the avatar's size is changed.
 This fixes the problem of avatars bouncing when logged in. Added a little
 height to the avatar height fudges to eliminate a problem of feet being in
 the ground a bit.

---
 OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 12 ++++++++++--
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs     |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 58a417e..9af3dce 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -96,8 +96,8 @@ public sealed class BSCharacter : BSPhysObject
         m_moveActor = new BSActorAvatarMove(PhysScene, this, AvatarMoveActorName);
         PhysicalActors.Add(AvatarMoveActorName, m_moveActor);
 
-        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
         PhysScene.TaintedObject("BSCharacter.create", delegate()
@@ -190,6 +190,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.
@@ -207,6 +211,10 @@ public sealed class BSCharacter : BSPhysObject
                 {
                     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
                     PhysScene.PE.PushUpdate(PhysBody);
                 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 4520171..fcb892a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -570,9 +570,9 @@ public static class BSParam
         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.1f ),
+            0.2f ),
         new ParameterDefn<float>("AvatarHeightHighFudge", "A fudge factor to make tall avatars stand on the ground",
-            0.1f ),
+            0.2f ),
 	    new ParameterDefn<float>("AvatarContactProcessingThreshold", "Distance from capsule to check for collisions",
             0.1f ),
 	    new ParameterDefn<float>("AvatarBelowGroundUpCorrectionMeters", "Meters to move avatar up if it seems to be below ground",
-- 
cgit v1.1


From b1c26a56b3d615f3709363e3a2f91b5423f5891f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 8 Aug 2013 23:29:30 +0100
Subject: Fix an issue where under teleport v2 protocol, teleporting from
 regions in an line from A->B->C would not close region A when reaching C

The root cause was that v2 was only closing neighbour agents if the root connection also needed a close.
However, fixing this requires the neighbour regions also detect when they should not close due to re-teleports re-establishing the child connection.
This involves restructuring the code to introduce a scene presence state machine that can serialize the different add and remove client calls that are now possible with the late close of the
This commit appears to fix these issues and improve teleport, but still has holes on at least quick reteleporting (and possibly occasionally on ordinary teleports).
Also, has not been completely tested yet in scenarios where regions are running on different simulators
---
 .../Caps/EventQueue/Tests/EventQueueTests.cs       |   2 +-
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  |   6 +
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs   |   6 +-
 .../Linden/UDP/Tests/BasicCircuitTests.cs          |   2 +-
 .../EntityTransfer/EntityTransferModule.cs         |  48 ++--
 .../World/Estate/EstateManagementModule.cs         |   6 +-
 OpenSim/Region/Framework/Scenes/Scene.cs           | 308 +++++++++++++--------
 OpenSim/Region/Framework/Scenes/ScenePresence.cs   |  36 ++-
 8 files changed, 267 insertions(+), 147 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
index 141af8a..626932f 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
         public void RemoveForClient()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
+//            TestHelpers.EnableLogging();
 
             UUID spId = TestHelpers.ParseTail(0x1);
 
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 8b2440a..e775a81 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -512,7 +512,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();
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 5c38399..de2f9d4 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1799,9 +1799,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
     
                 if (!client.SceneAgent.IsChildAgent)
                      client.Kick("Simulator logged you out due to connection timeout.");
-    
-                client.CloseWithoutChecks();
             }
+
+            m_scene.IncomingCloseAgent(client.AgentId, true);
         }
 
         private void IncomingPacketHandler()
@@ -2142,7 +2142,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (!client.IsLoggingOut)
             {
                 client.IsLoggingOut = true;
-                client.Close();
+                m_scene.IncomingCloseAgent(client.AgentId, false);
             }
         }
     }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
index b47ff54..9700224 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
@@ -200,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");
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 01ef710..2f74253 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1064,8 +1064,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // 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
+            // May still need to signal neighbours whether child agents may need closing irrespective of whether this
+            // one needed closing.  Neighbour regions also contain logic to prevent a close if a subsequent move or
+            // teleport re-established the child connection.
+            sp.CloseChildAgents(newRegionX, newRegionY);
 
+            // 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))
             {
                 sp.DoNotCloseAfterTeleport = false;
@@ -1081,14 +1085,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 if (!sp.DoNotCloseAfterTeleport)
                 {
                     // OK, it got this agent. Let's close everything
-                    m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Closing in agent {0} in region {1}", sp.Name, Scene.Name);
-                    sp.CloseChildAgents(newRegionX, newRegionY);
+                    m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Closing agent {0} in {1}", sp.Name, Scene.Name);
                     sp.Scene.IncomingCloseAgent(sp.UUID, false);
-
                 }
                 else
                 {
-                    m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Not closing agent {0}, user is back in {0}", sp.Name, Scene.Name);
+                    m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Not closing agent {0}, user is back in {1}", sp.Name, Scene.Name);
                     sp.DoNotCloseAfterTeleport = false;
                 }
             }
@@ -1863,10 +1865,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);
@@ -1874,8 +1876,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>();
 
@@ -1945,6 +1946,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     newAgent = true;
                 else
                     newAgent = false;
+//                    continue;
 
                 if (neighbour.RegionHandle != sp.Scene.RegionInfo.RegionHandle)
                 {
@@ -2178,18 +2180,18 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             return handles;
         }
 
-//        private void Dump(string msg, List<ulong> handles)
-//        {
-//            m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg);
-//            foreach (ulong handle in handles)
-//            {
-//                uint x, y;
-//                Utils.LongToUInts(handle, out x, out y);
-//                x = x / Constants.RegionSize;
-//                y = y / Constants.RegionSize;
-//                m_log.InfoFormat("({0}, {1})", x, y);
-//            }
-//        }
+        private void Dump(string msg, List<ulong> handles)
+        {
+            m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg);
+            foreach (ulong handle in handles)
+            {
+                uint x, y;
+                Utils.LongToUInts(handle, out x, out y);
+                x = x / Constants.RegionSize;
+                y = y / Constants.RegionSize;
+                m_log.InfoFormat("({0}, {1})", x, y);
+            }
+        }
 
         #endregion
 
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 121b2aa..31547a6 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -562,7 +562,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);
                                 }
                             }
                         }
@@ -797,7 +797,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);
                     }
                 }
             }
@@ -820,7 +820,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/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 56cd57e..5f10869 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();
 
@@ -1312,7 +1312,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]: Persisting changed objects");
             EventManager.TriggerSceneShuttingDown(this);
@@ -2972,7 +2972,7 @@ namespace OpenSim.Region.Framework.Scenes
                         {
                             PresenceService.LogoutAgent(sp.ControllingClient.SessionId);
 
-                            sp.ControllingClient.Close();
+                            IncomingCloseAgent(sp.UUID, false);
                         }
                         else
                         {
@@ -3384,47 +3384,48 @@ namespace OpenSim.Region.Framework.Scenes
 
         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)
@@ -3587,13 +3588,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);
@@ -3613,15 +3614,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)
@@ -3639,7 +3640,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;
@@ -3656,7 +3657,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;
@@ -3668,61 +3669,104 @@ 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;
             }
 
             ILandObject land;
+            ScenePresence sp;
 
-            lock (agent)
+            lock (m_removeClientLock)
             {
-                ScenePresence sp = GetScenePresence(agent.AgentID);
-    
-                if (sp != 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)
                 {
-                    if (!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);
+                    m_log.DebugFormat(
+                        "[SCENE]: Reusing existing child scene presence for {0} in {1}", sp.Name, Name);
 
-                            if (sp.ControllingClient != null)
-                                sp.ControllingClient.Close(true);
+                    // 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.
+                    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 = 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);
+                        sp.DoNotCloseAfterTeleport = true;
                     }
-                    else
+                }
+            }
+
+            // 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)
+            {
+                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)
+                {
+                    m_log.WarnFormat(
+                        "[SCENE]: Agent {0} in {1} was still being removed after {2}s.  Aborting NewUserConnection.", 
+                        sp.Name, Name, polls * pollInterval / 1000);
+
+                    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);
+                }
+            }
+
+            // TODO: can we remove this lock?
+            lock (acd)
+            {
+                if (sp != null && !sp.IsChildAgent)
+                {
+                    // We have a root agent. Is it in transit?
+                    if (!EntityTransferModule.IsInTransit(sp.UUID))
                     {
-                        // We have a child agent here
-                        sp.DoNotCloseAfterTeleport = true;
-                        //m_log.WarnFormat("[SCENE]: Existing child scene presence for {0} {1} in {2}", sp.Name, sp.UUID, RegionInfo.RegionName);
+                        // 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.
-                agent.teleportFlags = teleportFlags;
-                m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
+                acd.teleportFlags = teleportFlags;
+                m_authenticateHandler.AddNewCircuit(acd.circuitcode, acd);
 
-                land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
+                land = LandChannel.GetLandObject(acd.startpos.X, acd.startpos.Y);
     
                 // On login test land permisions
                 if (vialogin)
                 {
-                    if (land != null && !TestLandRestrictions(agent.AgentID, out reason, ref agent.startpos.X, ref agent.startpos.Y))
+                    if (land != null && !TestLandRestrictions(acd.AgentID, out reason, ref acd.startpos.X, ref acd.startpos.Y))
                     {
-                        m_authenticateHandler.RemoveCircuit(agent.circuitcode);
+                        m_authenticateHandler.RemoveCircuit(acd.circuitcode);
                         return false;
                     }
                 }
@@ -3733,9 +3777,9 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         try
                         {
-                            if (!VerifyUserPresence(agent, out reason))
+                            if (!VerifyUserPresence(acd, out reason))
                             {
-                                m_authenticateHandler.RemoveCircuit(agent.circuitcode);
+                                m_authenticateHandler.RemoveCircuit(acd.circuitcode);
                                 return false;
                             }
                         }
@@ -3744,16 +3788,16 @@ namespace OpenSim.Region.Framework.Scenes
                             m_log.ErrorFormat(
                                 "[SCENE]: Exception verifying presence {0}{1}", e.Message, e.StackTrace);
 
-                            m_authenticateHandler.RemoveCircuit(agent.circuitcode);
+                            m_authenticateHandler.RemoveCircuit(acd.circuitcode);
                             return false;
                         }
                     }
     
                     try
                     {
-                        if (!AuthorizeUser(agent, SeeIntoRegion, out reason))
+                        if (!AuthorizeUser(acd, SeeIntoRegion, out reason))
                         {
-                            m_authenticateHandler.RemoveCircuit(agent.circuitcode);
+                            m_authenticateHandler.RemoveCircuit(acd.circuitcode);
                             return false;
                         }
                     }
@@ -3762,19 +3806,19 @@ namespace OpenSim.Region.Framework.Scenes
                         m_log.ErrorFormat(
                             "[SCENE]: Exception authorizing user {0}{1}", e.Message, e.StackTrace);
 
-                        m_authenticateHandler.RemoveCircuit(agent.circuitcode);
+                        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(agent);
-                        CapsModule.CreateCaps(agent.AgentID);
+                        CapsModule.SetAgentCapsSeeds(acd);
+                        CapsModule.CreateCaps(acd.AgentID);
                     }
                 }
                 else
@@ -3787,14 +3831,14 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         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.CreateCaps(agent.AgentID);
+                            CapsModule.SetAgentCapsSeeds(acd);
+                            CapsModule.CreateCaps(acd.AgentID);
                         }
                     }
                 }
@@ -3802,23 +3846,23 @@ namespace OpenSim.Region.Framework.Scenes
                 // 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, agent);
+                CacheUserName(null, acd);
             }
 
             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
@@ -3828,39 +3872,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;
                     }
                 }
 
@@ -3876,12 +3920,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
                             );
@@ -3889,7 +3933,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;
@@ -3900,7 +3944,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;
                     }
                 }
             }
@@ -4359,11 +4403,51 @@ 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 presence = m_sceneGraph.GetScenePresence(agentID);
-            if (presence != null)
+            ScenePresence sp;
+
+            lock (m_removeClientLock)
+            {
+                sp = GetScenePresence(agentID);
+    
+                if (sp == null)
+                {
+                    m_log.DebugFormat(
+                        "[SCENE]: Called RemoveClient() with agent ID {0} but no such presence is in {1}", 
+                        agentID, Name);
+    
+                    return false;
+                }
+
+                if (sp.LifecycleState != ScenePresenceState.Running)
+                {
+                    m_log.DebugFormat(
+                        "[SCENE]: Called RemoveClient() 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);
+                sp.ControllingClient.Close(force);
                 return true;
             }
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 7fd1302..bdcdf03 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -74,6 +74,8 @@ 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);
@@ -85,10 +87,27 @@ namespace OpenSim.Region.Framework.Scenes
                 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);
@@ -766,7 +785,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public ScenePresence(
             IClientAPI client, Scene world, AvatarAppearance appearance, PresenceType type)
-        {
+        {            
             AttachmentsSyncLock = new Object();
             AllowMovement = true;
             IsChildAgent = true;
@@ -811,6 +830,8 @@ namespace OpenSim.Region.Framework.Scenes
             SetDirectionVectors();
 
             Appearance = appearance;
+
+            m_stateMachine = new ScenePresenceStateMachine(this);
         }
 
         public void RegisterToEvents()
@@ -879,7 +900,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);
 
@@ -887,6 +908,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);
@@ -3738,6 +3764,8 @@ namespace OpenSim.Region.Framework.Scenes
             // m_reprioritizationTimer.Dispose(); 
 
             RemoveFromPhysicalScene();
+
+            LifecycleState = ScenePresenceState.Removed;
         }
 
         public void AddAttachment(SceneObjectGroup gobj)
-- 
cgit v1.1


From 99bce9d87723af1958a76cf8ac5e765ca804549d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 9 Aug 2013 00:24:22 +0100
Subject: Fix an issue with an A->C->B->A teleport where these regions are in a
 row (A,B,C) where the A root agent is still closed, terminating the
 connection.

This was occuring because teleport to B did not set DoNotCloseAfterTeleport on A as it was a neighbour (where it isn't set to avoid the issue where the source region doesn't send Close() to regions that are still neighbours (hence not resetting DoNotCloseAfterTeleport).
Fix here is to still set DoNotCloseAfterTeleport if scene presence is still registered as in transit from A
---
 OpenSim/Region/Framework/Scenes/Scene.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 5f10869..a3ea7d9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3699,6 +3699,14 @@ namespace OpenSim.Region.Framework.Scenes
 
                         sp.DoNotCloseAfterTeleport = true;
                     }
+                    else if (EntityTransferModule.IsInTransit(sp.UUID))
+                    {
+                        m_log.DebugFormat(
+                            "[SCENE]: Setting DoNotCloseAfterTeleport for child scene presence {0} in {1} because this region will attempt previous end-of-teleport close.", 
+                            sp.Name, Name);
+
+                        sp.DoNotCloseAfterTeleport = true;
+                    }
                 }
             }
 
-- 
cgit v1.1


From 7e01213bf2dba1f771cc49b3d27ad97e93c35961 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 9 Aug 2013 08:31:15 -0700
Subject: Go easy on enforcing session ids in position updates

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 33 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 503b81a..1633e07 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4267,24 +4267,25 @@ namespace OpenSim.Region.Framework.Scenes
             ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID);
             if (childAgentUpdate != null)
             {
-                if (childAgentUpdate.ControllingClient.SessionId == cAgentData.SessionID)
+                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)
                 {
-                    // 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)
-                    {
-                        uint rRegionX = (uint)(cAgentData.RegionHandle >> 40);
-                        uint rRegionY = (((uint)(cAgentData.RegionHandle)) >> 8);
-                        uint tRegionX = RegionInfo.RegionLocX;
-                        uint tRegionY = RegionInfo.RegionLocY;
-                        //Send Data to ScenePresence
-                        childAgentUpdate.ChildAgentDataUpdate(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY);
-                        // Not Implemented:
-                        //TODO: Do we need to pass the message on to one of our neighbors?
-                    }
+                    uint rRegionX = (uint)(cAgentData.RegionHandle >> 40);
+                    uint rRegionY = (((uint)(cAgentData.RegionHandle)) >> 8);
+                    uint tRegionX = RegionInfo.RegionLocX;
+                    uint tRegionY = RegionInfo.RegionLocY;
+                    //Send Data to ScenePresence
+                    childAgentUpdate.ChildAgentDataUpdate(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY);
+                    // Not Implemented:
+                    //TODO: Do we need to pass the message on to one of our neighbors?
                 }
-                else
-                    m_log.WarnFormat("[SCENE]: Attempt at updating position of agent {0} with invalid session id {1}", childAgentUpdate.UUID, cAgentData.SessionID);
+
                 return true;
             }
 
-- 
cgit v1.1


From 6fcbf219da1d5095d6f37e8e44031db9ef108c39 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 9 Aug 2013 17:48:35 +0100
Subject: Comment back out seed dump code enabled in b1c26a56.  Also adds a few
 teleport comments.

---
 .../EntityTransfer/EntityTransferModule.cs         | 38 +++++++++++++---------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 2f74253..87f0264 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1067,6 +1067,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // May still need to signal neighbours whether child agents may need closing irrespective of whether this
             // one needed closing.  Neighbour regions also contain logic to prevent a close if a subsequent move or
             // teleport re-established the child connection.
+            // 
+            // It may be possible to also close child agents after a pause but one needs to be very careful about
+            // race conditions between different regions on rapid teleporting (e.g. from A1 to a non-neighbour B, back
+            // to a neighbour A2 then off to a non-neighbour C.  Also, closing child agents early may be more compatible
+            // with complicated scenarios where there a mixture of V1 and V2 teleports, though this is conjecture.  It's
+            // easier to close immediately and greatly reduce the scope of race conditions if possible.
             sp.CloseChildAgents(newRegionX, newRegionY);
 
             // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone
@@ -1865,10 +1871,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);
@@ -2180,18 +2186,18 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             return handles;
         }
 
-        private void Dump(string msg, List<ulong> handles)
-        {
-            m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg);
-            foreach (ulong handle in handles)
-            {
-                uint x, y;
-                Utils.LongToUInts(handle, out x, out y);
-                x = x / Constants.RegionSize;
-                y = y / Constants.RegionSize;
-                m_log.InfoFormat("({0}, {1})", x, y);
-            }
-        }
+//        private void Dump(string msg, List<ulong> handles)
+//        {
+//            m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg);
+//            foreach (ulong handle in handles)
+//            {
+//                uint x, y;
+//                Utils.LongToUInts(handle, out x, out y);
+//                x = x / Constants.RegionSize;
+//                y = y / Constants.RegionSize;
+//                m_log.InfoFormat("({0}, {1})", x, y);
+//            }
+//        }
 
         #endregion
 
-- 
cgit v1.1


From aec701972844d4e006bb5d50e7983b818fb39249 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 9 Aug 2013 17:57:24 +0100
Subject: Add missing file from b1c26a56

---
 .../Framework/Scenes/ScenePresenceStateMachine.cs  | 102 +++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 OpenSim/Region/Framework/Scenes/ScenePresenceStateMachine.cs

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresenceStateMachine.cs b/OpenSim/Region/Framework/Scenes/ScenePresenceStateMachine.cs
new file mode 100644
index 0000000..dc3a212
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/ScenePresenceStateMachine.cs
@@ -0,0 +1,102 @@
+/*
+ * 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               => 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.
+        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 == ScenePresenceState.Removing && m_state == ScenePresenceState.Running)
+                    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
-- 
cgit v1.1


From bfdcdbb2f3f568c3ef829f30b8326dbc8a835f03 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 9 Aug 2013 17:59:58 +0100
Subject: Increase wait for source region to sent UpdateAgent to 10 seconds
 instead of 4.

This is giving much better results on teleports between simulators over my lan where for some reason there is a pause before the receiving simulator processes UpdateAgent()
At this point, v2 teleports between neighbour and non-neighbour regions on a single simulator and between v2 simulators and between a v1 and v2 simulator
are working okay for me in different scenarios (e.g. simple teleport, teleport back to original quickly and re-teleport, teleport back to neighbour and re-teleport. etc.)
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index aac80f7..69339b7 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1355,7 +1355,7 @@ namespace OpenSim.Region.Framework.Scenes
         private bool WaitForUpdateAgent(IClientAPI client)
         {
             // Before UpdateAgent, m_originRegionID is UUID.Zero; after, it's non-Zero
-            int count = 20;
+            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);
-- 
cgit v1.1


From 23ca1f859e20e537572cb774943784d50d3cacb8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 9 Aug 2013 18:27:26 +0100
Subject: minor: Consistently log IOCP for IO completion thread startup log
 information instead of mixing this with "IO Completion Threads"

---
 OpenSim/Region/Application/Application.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 2e155ec..3a4e5df 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -142,19 +142,19 @@ namespace OpenSim
 			if (iocpThreads < iocpThreadsMin)
             {
                 iocpThreads = iocpThreadsMin;
-                m_log.InfoFormat("[OPENSIM MAIN]: Bumping up max 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 max 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} max worker threads and {1} max IO completion threads",
+                    "[OPENSIM MAIN]: Threadpool set to {0} max worker threads and {1} max IOCP threads",
                     workerThreads, iocpThreads);
 			}
 			else
-- 
cgit v1.1


From 216f5afe54576c4852974b8479ac95654dc9e08e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 10 Aug 2013 09:09:52 -0700
Subject: Stats treaking. Update ToOSDMap for Stat and PercentageStat to return
 all the various numbers that have been added to the console output. Break out
 EventHistogram from CounterStat.

---
 OpenSim/Framework/Monitoring/Stats/CounterStat.cs  | 150 ++----------------
 .../Framework/Monitoring/Stats/EventHistogram.cs   | 173 +++++++++++++++++++++
 .../Framework/Monitoring/Stats/PercentageStat.cs   |  16 ++
 OpenSim/Framework/Monitoring/Stats/Stat.cs         |  46 ++++--
 4 files changed, 235 insertions(+), 150 deletions(-)
 create mode 100755 OpenSim/Framework/Monitoring/Stats/EventHistogram.cs

diff --git a/OpenSim/Framework/Monitoring/Stats/CounterStat.cs b/OpenSim/Framework/Monitoring/Stats/CounterStat.cs
index 04442c3..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
@@ -236,12 +100,18 @@ public class CounterStat : Stat
         // If there are any histograms, add a new field that is an array of histograms as OSDMaps
         if (m_histograms.Count > 0)
         {
-            OSDArray histos = new OSDArray();
-            foreach (EventHistogram histo in m_histograms.Values)
+            lock (counterLock)
             {
-                histos.Add(histo.GetHistogramAsOSDMap());
+                if (m_histograms.Count > 0)
+                {
+                    OSDArray histos = new OSDArray();
+                    foreach (EventHistogram histo in m_histograms.Values)
+                    {
+                        histos.Add(histo.GetHistogramAsOSDMap());
+                    }
+                    map.Add("Histograms", histos);
+                }
             }
-            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 ffd5132..2b34493 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -241,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));
@@ -248,26 +250,36 @@ namespace OpenSim.Framework.Monitoring
             ret.Add("Description", OSD.FromString(Description));
             ret.Add("UnitName", OSD.FromString(UnitName));
             ret.Add("Value", OSD.FromReal(Value));
-            ret.Add("StatType", "Stat");    // used by overloading classes to denote type of stat
+
+            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 lastChangeOverTime = 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()));
+                    //                    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)
                     {
@@ -280,13 +292,27 @@ namespace OpenSim.Framework.Monitoring
                 }
 
                 if (lastSample != null && penultimateSample != null)
-                    lastChangeOverTime 
+                {
+                    lastChangeOverTime
                         = ((double)lastSample - (double)penultimateSample) / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);
+                }
 
                 int divisor = m_samples.Count <= 1 ? 1 : m_samples.Count - 1;
 
-                double averageChangeOverTime = totalChange / divisor / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);
+                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, 
-- 
cgit v1.1


From b64d3ecaed2c4cc0ffab2e44d02745de4e8f5717 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 12 Aug 2013 18:15:12 +0100
Subject: Create TestSameSimulatorNeighbouringRegionsTeleportV2() regression
 test for V2 transfer protocol.

---
 .../Attachments/Tests/AttachmentsModuleTests.cs    | 113 ++++++++++++++++++++-
 OpenSim/Tests/Common/Mock/TestClient.cs            |  26 +++--
 2 files changed, 130 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index 4ecae73..f4bf6b3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -799,7 +799,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
         }
 
         [Test]
-        public void TestSameSimulatorNeighbouringRegionsTeleport()
+        public void TestSameSimulatorNeighbouringRegionsTeleportV1()
         {
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
@@ -904,5 +904,116 @@ 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);
+            IConfig entityTransferConfig = config.AddConfig("EntityTransfer");
+
+            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.SetUpInformClientOfNeighbour(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.
+            ((TestClient)beforeTeleportSp.ControllingClient).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/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index f7220d7..9370102 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -61,8 +61,13 @@ 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
 
@@ -472,7 +477,8 @@ namespace OpenSim.Tests.Common.Mock
 
         public void CompleteMovement()
         {
-            OnCompleteMovementToRegion(this, true);
+            if (OnCompleteMovementToRegion != null)
+                OnCompleteMovementToRegion(this, true);
         }
 
         /// <summary>
@@ -608,21 +614,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,
-- 
cgit v1.1


From e5b1688913d0fb9e72f67d0b476778a733ddb4b5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 12 Aug 2013 18:48:18 +0100
Subject: Add none behaviour to pCampbot when one wants bots to just stand
 around

---
 OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs | 43 ++++++++++++++++++++++
 OpenSim/Tools/pCampBot/BotManager.cs               | 17 +++++----
 OpenSim/Tools/pCampBot/pCampBot.cs                 |  7 ++--
 3 files changed, 57 insertions(+), 10 deletions(-)
 create mode 100644 OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs

diff --git a/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs
new file mode 100644
index 0000000..9cf8a54
--- /dev/null
+++ b/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using 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() { Name = "None"; }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index d615b3f..1a46380 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -177,18 +177,21 @@ namespace pCampBot
                 // 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());
-    
+                // Hard-coded for now        
+                if (behaviourSwitches.Contains("c"))
+                    behaviours.Add(new CrossBehaviour());
+
                 if (behaviourSwitches.Contains("g"))
                     behaviours.Add(new GrabbingBehaviour());
+
+                if (behaviourSwitches.Contains("n"))
+                    behaviours.Add(new NoneBehaviour());
+
+                if (behaviourSwitches.Contains("p"))
+                    behaviours.Add(new PhysicsBehaviour());
     
                 if (behaviourSwitches.Contains("t"))
                     behaviours.Add(new TeleportBehaviour());
-    
-                if (behaviourSwitches.Contains("c"))
-                    behaviours.Add(new CrossBehaviour());
 
                 StartBot(this, behaviours, firstName, lastName, password, loginUri);
             }
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index 9e82577..2707a49 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -123,9 +123,10 @@ namespace pCampBot
                 "  -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" +
+                "       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)" +
                 "  -wear              set appearance folder to load from (default: no)\n" +
                 "  -h, -help          show this message");
-- 
cgit v1.1


From de6ad380f659edbc102e9bde01033acd19034c2d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 12 Aug 2013 19:31:45 +0100
Subject: Get rid of issue where removing NPCs would through an exception by
 routing close through Scene.IncomingCloseAgent() and NPCAvatar.Close() rather
 than directly to Scene.RemoveClient().

This exception was actually harmless since it occurred at the very last stage of the remove client process.
---
 OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 69189b3..c26fdfc 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -385,7 +385,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}",
-- 
cgit v1.1


From f3edc0d8b795f665dcf2ea2feb2b7886c8a451e1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 12 Aug 2013 19:38:23 +0100
Subject: minor: Extend warning message when adding trying to add an event for
 a client without a queue to include the event message name.

---
 .../ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index d7afe1a..c28ba94 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -229,7 +229,12 @@ namespace OpenSim.Region.ClientStack.Linden
                         queue.Enqueue(ev);
                 }
                 else
-                    m_log.WarnFormat("[EVENTQUEUE]: (Enqueue) No queue found for agent {0} in region {1}", avatarID, m_scene.RegionInfo.RegionName);
+                {
+                    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)
             {
@@ -365,14 +370,14 @@ 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.WarnFormat("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)
-- 
cgit v1.1


From 377fe63c60b6632777da5f0a8a0c4c2d32a1f4ac Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 12 Aug 2013 21:02:50 +0100
Subject: Don't try and send group updates to NPCs via event queue, since NPCs
 have no event queue.

I think there is an argument for sending this information to NPCs anyway since in some cases it appears a lot easier to write server-side bots by hooking into such internal events.
However, would need to stop event messages building up on NPC queues if they are never retrieved.
---
 OpenSim/Addons/Groups/GroupsModule.cs                          | 10 +++++++---
 .../Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs |  1 -
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index 830c671..b0493fa 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -1223,12 +1223,16 @@ namespace OpenSim.Groups
         {
             if (m_debugEnabled) m_log.InfoFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
+            // NPCs currently don't have a CAPs structure or event queues.  There is a strong argument for conveying this information
+            // to them anyway since it makes writing server-side bots a lot easier, but for now we don't do anything.
+            if (remoteClient.SceneAgent.PresenceType == PresenceType.Npc)
+                return;
+
             OSDArray AgentData = new OSDArray(1);
             OSDMap AgentDataMap = new OSDMap(1);
             AgentDataMap.Add("AgentID", OSD.FromUUID(dataForAgentID));
             AgentData.Add(AgentDataMap);
 
-
             OSDArray GroupData = new OSDArray(data.Length);
             OSDArray NewGroupData = new OSDArray(data.Length);
 
@@ -1274,8 +1278,7 @@ namespace OpenSim.Groups
             if (queue != null)
             {
                 queue.Enqueue(queue.BuildEvent("AgentGroupDataUpdate", llDataStruct), GetRequestingAgentID(remoteClient));
-            }
-            
+            }            
         }
 
         private void SendScenePresenceUpdate(UUID AgentID, string Title)
@@ -1337,6 +1340,7 @@ namespace OpenSim.Groups
 
             GroupMembershipData[] membershipArray = GetProfileListedGroupMemberships(remoteClient, dataForAgentID);
             SendGroupMembershipInfoViaCaps(remoteClient, dataForAgentID, membershipArray);
+
             //remoteClient.SendAvatarGroupsReply(dataForAgentID, membershipArray);
             if (remoteClient.AgentId == dataForAgentID)
                 remoteClient.RefreshGroupMembership();
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index f4734b7..d744a14 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -1212,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);
 
-- 
cgit v1.1


From 2c31fe4614fc193f2600b36eac892ceee86f61e0 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 12 Aug 2013 13:44:53 -0700
Subject: BulletSim: add check in avatar stair step code to verify the
 collision is not with a volume detect object.

This fixes a problem of avatars trying to step over a volume detect object
that they collide with. This appeared as the avatar popping up as it started
to step up but then continuing on since the object wasn't physically interacting.
---
 .../Physics/BulletSPlugin/BSActorAvatarMove.cs     | 33 +++++++++++++---------
 .../Region/Physics/BulletSPlugin/BSCharacter.cs    |  1 +
 .../Region/Physics/BulletSPlugin/BSPhysObject.cs   |  1 +
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     |  4 +++
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
index 0f11c4a..5f232a4 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -311,21 +311,28 @@ public class BSActorAvatarMove : BSActor
                 // Don't care about collisions with the terrain
                 if (kvp.Key > m_physicsScene.TerrainManager.HighestTerrainID)
                 {
-                    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)
+                    BSPhysObject collisionObject;
+                    if (m_physicsScene.PhysObjects.TryGetValue(kvp.Key, out collisionObject))
                     {
-                        // 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 (!collisionObject.IsVolumeDetect)
                         {
-                            if (highestTouchPosition.Z < touchPosition.Z)
-                                highestTouchPosition = touchPosition;
+                            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;
+                                }
+                            }
                         }
                     }
                 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 9af3dce..d584782 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -404,6 +404,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; } }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 0704591..27caf62 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -175,6 +175,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; }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index a0b6abc..6b5dea3 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -617,6 +617,10 @@ public class BSPrim : BSPhysObject
         }
         return;
     }
+    public override bool IsVolumeDetect
+    {
+        get { return _isVolumeDetect; }
+    }
     public override void SetMaterial(int material)
     {
         base.SetMaterial(material);
-- 
cgit v1.1


From c49ea491a3d081ff788cc33ca29030690db3a939 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 12 Aug 2013 22:49:17 +0100
Subject: Make show bots pCampbot console command print connected, connecting,
 etc. bot totals at end.

---
 OpenSim/Tools/pCampBot/BotManager.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 1a46380..74bd36a 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -330,17 +330,30 @@ namespace pCampBot
             string outputFormat = "{0,-30}  {1, -30}  {2,-14}";
             MainConsole.Instance.OutputFormat(outputFormat, "Name", "Region", "Status");
 
+            Dictionary<ConnectionState, int> totals = new Dictionary<ConnectionState, int>();
+            foreach (object o in Enum.GetValues(typeof(ConnectionState)))
+                totals[(ConnectionState)o] = 0;
+
             lock (m_lBot)
             {
                 foreach (Bot pb in m_lBot)
                 {
                     Simulator currentSim = pb.Client.Network.CurrentSim;
+                    totals[pb.ConnectionState]++;
 
                     MainConsole.Instance.OutputFormat(
                         outputFormat,
                         pb.Name, currentSim != null ? currentSim.Name : "(none)", pb.ConnectionState);
                 }
             }
+
+            ConsoleDisplayList cdl = new ConsoleDisplayList();
+
+            foreach (KeyValuePair<ConnectionState, int> kvp in totals)
+                cdl.AddRow(kvp.Key, kvp.Value);
+
+
+            MainConsole.Instance.OutputFormat("\n{0}", cdl.ToString());
         }
 
         /*
-- 
cgit v1.1


From a90351cd2ce2f1a3245244d46db7d98102729a58 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 13 Aug 2013 11:49:09 -0700
Subject: Remove exception when printing error for failure removing script
 state.

---
 OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 229180f..6264f5d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -525,7 +525,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 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  ", 
-                        ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name), 
+                        savedState, ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name), 
                     e);
             }
         }
-- 
cgit v1.1


From e311f902ffeb0c1f36d6d4288e65d965d13a9fbe Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 13 Aug 2013 20:13:12 +0100
Subject: minor: Eliminate one of the duplicate 'have's in the HG message
 telling the user if no GroupsServerURI has been given in user data by the
 home grid

---
 OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
index c33168c..4642b2a 100644
--- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
@@ -404,7 +404,7 @@ namespace OpenSim.Groups
                         url = m_UserManagement.GetUserServerURL(uid, "GroupsServerURI");
                         if (url == string.Empty)
                         {
-                            reason = "You don't have have an accessible groups server in your home world. You membership to this group in only within this grid.";
+                            reason = "You don't have an accessible groups server in your home world. You membership to this group in only within this grid.";
                             return true;
                         }
 
-- 
cgit v1.1


From 5933f9448d839b9f6db391dedc493bb5cc951d66 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 13 Aug 2013 23:54:50 +0100
Subject: Add a SendAgentUpdates setting to a new pCampbot.ini.example file
 which can control whether bots send agent updates

pCampbot.ini.example is used by copying to pCampbot.ini, like other ini files
---
 OpenSim/Tools/pCampBot/Bot.cs        | 20 +-------------------
 OpenSim/Tools/pCampBot/BotManager.cs | 35 ++++++++++++++++++++---------------
 OpenSim/Tools/pCampBot/pCampBot.cs   | 35 +++++++++++++++++++++++++++++------
 bin/pCampbot.ini.example             |  9 +++++++++
 4 files changed, 59 insertions(+), 40 deletions(-)
 create mode 100644 bin/pCampbot.ini.example

diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index 9821180..c56d29b 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -64,11 +64,6 @@ namespace pCampBot
         public BotManager Manager { get; private set; }
 
         /// <summary>
-        /// Bot config, passed from BotManager.
-        /// </summary>
-        private IConfig startupConfig;
-
-        /// <summary>
         /// Behaviours implemented by this bot.
         /// </summary>
         /// <remarks>
@@ -153,9 +148,6 @@ namespace pCampBot
             LoginUri = loginUri;
 
             Manager = bm;
-            startupConfig = bm.Config;
-            readconfig();
-
             Behaviours = behaviours;
         }
 
@@ -177,14 +169,6 @@ namespace pCampBot
         }
 
         /// <summary>
-        /// Read the Nini config and initialize
-        /// </summary>
-        public void readconfig()
-        {
-            wear = startupConfig.GetString("wear", "no");
-        }
-
-        /// <summary>
         /// Tells LibSecondLife to logout and disconnect.  Raises the disconnect events once it finishes.
         /// </summary>
         public void shutdown()
@@ -207,6 +191,7 @@ namespace pCampBot
             Client.Settings.AVATAR_TRACKING = false;
             Client.Settings.OBJECT_TRACKING = false;
             Client.Settings.SEND_AGENT_THROTTLE = true;
+            Client.Settings.SEND_AGENT_UPDATES = false;
             Client.Settings.SEND_PINGS = true;
             Client.Settings.STORE_LAND_PATCHES = false;
             Client.Settings.USE_ASSET_CACHE = false;
@@ -481,9 +466,6 @@ namespace pCampBot
 
         public void Objects_NewPrim(object sender, PrimEventArgs args)
         {
-//            if (Name.EndsWith("4"))
-//                throw new Exception("Aaargh");
-
             Primitive prim = args.Prim;
 
             if (prim != null)
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 74bd36a..16b02b9 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -63,6 +63,11 @@ namespace pCampBot
         protected CommandConsole m_console;
 
         /// <summary>
+        /// Controls whether bots start out sending agent updates on connection.
+        /// </summary>
+        public bool BotsInitSendAgentUpdates { get; set; }
+
+        /// <summary>
         /// Created bots, whether active or inactive.
         /// </summary>
         protected List<Bot> m_lBot;
@@ -73,11 +78,6 @@ namespace pCampBot
         public Random Rng { get; private set; }
 
         /// <summary>
-        /// Overall configuration.
-        /// </summary>
-        public IConfig Config { get; private set; }
-
-        /// <summary>
         /// Track the assets we have and have not received so we don't endlessly repeat requests.
         /// </summary>
         public Dictionary<UUID, bool> AssetsReceived { get; private set; }
@@ -92,6 +92,8 @@ namespace pCampBot
         /// </summary>
         public BotManager()
         {
+            BotsInitSendAgentUpdates = true;
+
             LoginDelay = DefaultLoginDelay;
 
             Rng = new Random(Environment.TickCount);
@@ -148,18 +150,17 @@ 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 dobotStartup(int botcount, IConfig startupConfig)
         {
-            Config = cs;
-
-            string firstName = cs.GetString("firstname");
-            string lastNameStem = cs.GetString("lastname");
-            string password = cs.GetString("password");
-            string loginUri = cs.GetString("loginuri");
+            string firstName = startupConfig.GetString("firstname");
+            string lastNameStem = startupConfig.GetString("lastname");
+            string password = startupConfig.GetString("password");
+            string loginUri = startupConfig.GetString("loginuri");
+            string wearSetting = startupConfig.GetString("wear", "no");
 
             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 => behaviourSwitches.Add(b));
 
             MainConsole.Instance.OutputFormat(
                 "[BOT MANAGER]: Starting {0} bots connecting to {1}, named {2} {3}_<n>",
@@ -169,6 +170,7 @@ namespace pCampBot
                 lastNameStem);
 
             MainConsole.Instance.OutputFormat("[BOT MANAGER]: Delay between logins is {0}ms", LoginDelay);
+            MainConsole.Instance.OutputFormat("[BOT MANAGER]: BotsSendAgentUpdates is {0}", BotsInitSendAgentUpdates);
 
             for (int i = 0; i < botcount; i++)
             {
@@ -193,7 +195,7 @@ namespace pCampBot
                 if (behaviourSwitches.Contains("t"))
                     behaviours.Add(new TeleportBehaviour());
 
-                StartBot(this, behaviours, firstName, lastName, password, loginUri);
+                StartBot(this, behaviours, firstName, lastName, password, loginUri, wearSetting);
             }
         }
 
@@ -226,15 +228,18 @@ namespace pCampBot
         /// <param name="lastName">Last name</param>
         /// <param name="password">Password</param>
         /// <param name="loginUri">Login URI</param>
+        /// <param name="wearSetting"></param>
         public void StartBot(
              BotManager bm, List<IBehaviour> behaviours,
-             string firstName, string lastName, string password, string loginUri)
+             string firstName, string lastName, string password, string loginUri, string wearSetting)
         {
             MainConsole.Instance.OutputFormat(
                 "[BOT MANAGER]: Starting 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);
+            pb.wear = wearSetting;
+            pb.Client.Settings.SEND_AGENT_UPDATES = BotsInitSendAgentUpdates;
 
             pb.OnConnected += handlebotEvent;
             pb.OnDisconnected += handlebotEvent;
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index 2707a49..e43037d 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,28 +51,50 @@ 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();
 
+                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 botConfig = configSource.Configs["Bot"];
+
+                    if (botConfig != null)
+                    {
+                        bm.BotsInitSendAgentUpdates 
+                            = botConfig.GetBoolean("SendAgentUpdates", bm.BotsInitSendAgentUpdates);
+                    }
+                }
+
+                int botcount = commandLineConfig.GetInt("botcount", 1);
+
                 //startup specified number of bots.  1 is the default
-                Thread startBotThread = new Thread(o => bm.dobotStartup(botcount, config));
+                Thread startBotThread = new Thread(o => bm.dobotStartup(botcount, commandLineConfig));
                 startBotThread.Name = "Initial start bots thread";
                 startBotThread.Start();
 
diff --git a/bin/pCampbot.ini.example b/bin/pCampbot.ini.example
new file mode 100644
index 0000000..81cdcf4
--- /dev/null
+++ b/bin/pCampbot.ini.example
@@ -0,0 +1,9 @@
+; This is the example config file for pCampbot
+; To use it, copy this file to pCampbot.ini and change settings if required
+
+[Bot]
+  ; Control whether bots should regularly send agent updates
+  ; Not sending agent updates 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
-- 
cgit v1.1


From 0feb5da31e0986d46ea06ffb9804cf30f700e119 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 13 Aug 2013 21:06:24 -0700
Subject: BulletSim: move the creation of the avatar movement actor creating to
 taint time. Attempt to fix a problem of teleporting within the same region
 where the remove and addition of the physical avatar occasionally ends up
 with a non-moving avatar.

---
 OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index d584782..502f85f 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -89,13 +89,6 @@ public sealed class BSCharacter : BSPhysObject
         // set _avatarVolume and _mass based on capsule size, _density and Scale
         ComputeAvatarVolumeAndMass();
 
-        // 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);
-
         DetailLog("{0},BSCharacter.create,call,size={1},scale={2},density={3},volume={4},mass={5},pos={6}",
                             LocalID, _size, Scale, Density, _avatarVolume, RawMass, pos);
 
@@ -106,6 +99,13 @@ public sealed class BSCharacter : BSPhysObject
             // New body and shape into PhysBody and PhysShape
             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();
         });
         return;
-- 
cgit v1.1


From 2146b201694a128764e66680d151b68d83610880 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 14 Aug 2013 16:51:51 +0100
Subject: Add the ability to explicitly specify a login start location to
 pCampbot via the -start parameter

---
 OpenSim/Tools/pCampBot/Bot.cs        |  7 +++--
 OpenSim/Tools/pCampBot/BotManager.cs | 60 +++++++++++++++++++++++++++++++-----
 OpenSim/Tools/pCampBot/pCampBot.cs   | 36 ++++++++++++----------
 3 files changed, 76 insertions(+), 27 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index c56d29b..79344e8 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -97,6 +97,8 @@ namespace pCampBot
         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;
 
@@ -132,7 +134,7 @@ 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;
 
@@ -146,6 +148,7 @@ namespace pCampBot
             Name = string.Format("{0} {1}", FirstName, LastName);
             Password = password;
             LoginUri = loginUri;
+            StartLocation = startLocation;
 
             Manager = bm;
             Behaviours = behaviours;
@@ -209,7 +212,7 @@ namespace pCampBot
 
             ConnectionState = ConnectionState.Connecting;
 
-            if (Client.Network.Login(FirstName, LastName, Password, "pCampBot", "Your name"))
+            if (Client.Network.Login(FirstName, LastName, Password, "pCampBot", StartLocation, "Your name"))
             {
                 ConnectionState = ConnectionState.Connected;
 
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 16b02b9..57bd737 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -65,7 +65,7 @@ namespace pCampBot
         /// <summary>
         /// Controls whether bots start out sending agent updates on connection.
         /// </summary>
-        public bool BotsInitSendAgentUpdates { get; set; }
+        public bool InitBotSendAgentUpdates { get; set; }
 
         /// <summary>
         /// Created bots, whether active or inactive.
@@ -92,7 +92,7 @@ namespace pCampBot
         /// </summary>
         public BotManager()
         {
-            BotsInitSendAgentUpdates = true;
+            InitBotSendAgentUpdates = true;
 
             LoginDelay = DefaultLoginDelay;
 
@@ -156,21 +156,25 @@ namespace pCampBot
             string lastNameStem = startupConfig.GetString("lastname");
             string password = startupConfig.GetString("password");
             string loginUri = startupConfig.GetString("loginuri");
+            string startLocation = startupConfig.GetString("start", "last");
             string wearSetting = startupConfig.GetString("wear", "no");
 
+            string startUri = ParseInputStartLocationToUri(startLocation);
+
             HashSet<string> behaviourSwitches = new HashSet<string>();
             Array.ForEach<string>(
                 startupConfig.GetString("behaviours", "p").Split(new char[] { ',' }), b => behaviourSwitches.Add(b));
 
             MainConsole.Instance.OutputFormat(
-                "[BOT MANAGER]: Starting {0} bots connecting to {1}, named {2} {3}_<n>",
+                "[BOT MANAGER]: Starting {0} bots connecting to {1}, location {2}, named {3} {4}_<n>",
                 botcount,
                 loginUri,
+                startUri,
                 firstName,
                 lastNameStem);
 
             MainConsole.Instance.OutputFormat("[BOT MANAGER]: Delay between logins is {0}ms", LoginDelay);
-            MainConsole.Instance.OutputFormat("[BOT MANAGER]: BotsSendAgentUpdates is {0}", BotsInitSendAgentUpdates);
+            MainConsole.Instance.OutputFormat("[BOT MANAGER]: BotsSendAgentUpdates is {0}", InitBotSendAgentUpdates);
 
             for (int i = 0; i < botcount; i++)
             {
@@ -195,8 +199,47 @@ namespace pCampBot
                 if (behaviourSwitches.Contains("t"))
                     behaviours.Add(new TeleportBehaviour());
 
-                StartBot(this, behaviours, firstName, lastName, password, loginUri, wearSetting);
+                StartBot(this, behaviours, firstName, lastName, password, loginUri, startUri, wearSetting);
+            }
+        }
+
+        /// <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>
@@ -228,18 +271,19 @@ namespace pCampBot
         /// <param name="lastName">Last name</param>
         /// <param name="password">Password</param>
         /// <param name="loginUri">Login URI</param>
+        /// <param name="startLocation">Location to start the bot.  Can be "last", "home" or a specific sim name.</param>
         /// <param name="wearSetting"></param>
         public void StartBot(
              BotManager bm, List<IBehaviour> behaviours,
-             string firstName, string lastName, string password, string loginUri, string wearSetting)
+             string firstName, string lastName, string password, string loginUri, string startLocation, string wearSetting)
         {
             MainConsole.Instance.OutputFormat(
                 "[BOT MANAGER]: Starting 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 = BotsInitSendAgentUpdates;
+            pb.Client.Settings.SEND_AGENT_UPDATES = InitBotSendAgentUpdates;
 
             pb.OnConnected += handlebotEvent;
             pb.OnDisconnected += handlebotEvent;
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index e43037d..9c9ed3b 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -86,8 +86,8 @@ namespace pCampBot
 
                     if (botConfig != null)
                     {
-                        bm.BotsInitSendAgentUpdates 
-                            = botConfig.GetBoolean("SendAgentUpdates", bm.BotsInitSendAgentUpdates);
+                        bm.InitBotSendAgentUpdates 
+                            = botConfig.GetBoolean("SendAgentUpdates", bm.InitBotSendAgentUpdates);
                     }
                 }
 
@@ -119,6 +119,7 @@ namespace pCampBot
 
             cs.AddSwitch("Startup", "botcount", "n");
             cs.AddSwitch("Startup", "loginuri", "l");
+            cs.AddSwitch("Startup", "start", "s");
             cs.AddSwitch("Startup", "firstname");
             cs.AddSwitch("Startup", "lastname");
             cs.AddSwitch("Startup", "password");
@@ -137,22 +138,23 @@ namespace pCampBot
             // 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  - 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" +
+                "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.  Can be \"last\", \"home\" or a specific location with or without co-ords (e.g. \"region1\" or \"region2/50/30/90\"\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  - 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)" +
-                "  -wear              set appearance folder to load from (default: no)\n" +
-                "  -h, -help          show this message");
+                    + "  -wear              set appearance folder to load from (default: no)\n"
+                    + "  -h, -help          show this message.\n");
         }
     }
 }
-- 
cgit v1.1


From 3a62f39044403e7bf453c7b5b1fe825a48e908f3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 14 Aug 2013 18:26:11 +0100
Subject: Add a -form switch to pCampbot to allow one to login a sequence of
 bots starting from numbers other than 0

---
 OpenSim/Tools/pCampBot/BotManager.cs | 3 ++-
 OpenSim/Tools/pCampBot/pCampBot.cs   | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 57bd737..0fdfa0e 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -157,6 +157,7 @@ namespace pCampBot
             string password = startupConfig.GetString("password");
             string loginUri = startupConfig.GetString("loginuri");
             string startLocation = startupConfig.GetString("start", "last");
+            int fromBotNumber = startupConfig.GetInt("from", 0);
             string wearSetting = startupConfig.GetString("wear", "no");
 
             string startUri = ParseInputStartLocationToUri(startLocation);
@@ -178,7 +179,7 @@ namespace pCampBot
 
             for (int i = 0; i < botcount; i++)
             {
-                string lastName = string.Format("{0}_{1}", lastNameStem, i);
+                string lastName = string.Format("{0}_{1}", lastNameStem, i + fromBotNumber);
 
                 // We must give each bot its own list of instantiated behaviours since they store state.
                 List<IBehaviour> behaviours = new List<IBehaviour>();
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index 9c9ed3b..c8b6304 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -118,6 +118,7 @@ namespace pCampBot
             ArgvConfigSource cs = new ArgvConfigSource(args);
 
             cs.AddSwitch("Startup", "botcount", "n");
+            cs.AddSwitch("Startup", "from", "f");
             cs.AddSwitch("Startup", "loginuri", "l");
             cs.AddSwitch("Startup", "start", "s");
             cs.AddSwitch("Startup", "firstname");
@@ -137,15 +138,17 @@ 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 grid/standalone (required)\n"
-                    + "  -s, -start         start location for bots.  Can be \"last\", \"home\" or a specific location with or without co-ords (e.g. \"region1\" or \"region2/50/30/90\"\n"
-                    + "  -n, -botcount      number of bots to start (default: 1)\n"
+                    + "  -s, -start         optional start location for bots.  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\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"
+                    + "  -n, -botcount      optional number of bots to start (default: 1)\n"
+                    + "  -f, -from          optional starting number for login bot names, e.g. 25 will login Ima Bot_25, Ima Bot_26, etc.  (default: 0)"
                     + "  -b, behaviours     behaviours for bots.  Comma separated, e.g. p,g.  Default is p\n"
                     + "    current options are:\n"
                     + "       p (physics  - bots constantly move and jump around)\n"
@@ -153,7 +156,7 @@ namespace pCampBot
                     + "       n (none     - bots do nothing)\n"
                     + "       t (teleport - bots regularly teleport between regions on the grid)\n"
 //                "       c (cross)" +
-                    + "  -wear              set appearance folder to load from (default: no)\n"
+                    + "  -wear              optional folder from which to load appearance data, \"no\" if there is no such folder (default: no)\n"
                     + "  -h, -help          show this message.\n");
         }
     }
-- 
cgit v1.1


From 97c514daa5a3b4e4137bf01b7bee3fffc13a75d7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 14 Aug 2013 19:21:07 +0100
Subject: Shutdown a bot's actions by making it check for disconnecting state
 rather than aborting the thread.

Aborting the thread appears to be causing shutdown issues.
---
 OpenSim/Tools/pCampBot/Bot.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index 79344e8..dac8ccb 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -158,7 +158,7 @@ namespace pCampBot
         //add additional steps and/or things the bot should do
         private void Action()
         {
-            while (true)
+            while (ConnectionState != ConnectionState.Disconnecting)
                 lock (Behaviours)
                     Behaviours.ForEach(
                         b =>
@@ -178,8 +178,8 @@ namespace pCampBot
         {
             ConnectionState = ConnectionState.Disconnecting;
 
-            if (m_actionThread != null)
-                m_actionThread.Abort();
+//            if (m_actionThread != null)
+//                m_actionThread.Abort();
 
             Client.Network.Logout();
         }
-- 
cgit v1.1


From fd519748e9c828e03468dc61b331115f07b3fadd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 14 Aug 2013 19:35:02 +0100
Subject: Add method doc to Scene.RemoveClient() to ask any callers to use
 Scene.IncomingCloseAgent() instead.

IncomingCloseAgent() now sets the scene presence state machine properly, which is necessary to avoid races between multiple sources of close.
Hence, it's also necessary for everyone to consistently call IncomingCloseAgent()
Calling RemoveClient() directly is currently generating an attention-grabbing exception though this right now this is harmless.
---
 OpenSim/Region/Framework/Scenes/Scene.cs     | 12 ++++++++++++
 OpenSim/Region/Framework/Scenes/SceneBase.cs | 13 +++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a3bd388..d187377 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3382,6 +3382,18 @@ 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)
         {
             AgentCircuitData acd = m_authenticateHandler.GetAgentCircuitData(agentID);
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index d2097ea..5252b96 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -217,6 +217,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)
-- 
cgit v1.1


From 225cf0d0102d05721bd01120928b9d1d85c811a7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 14 Aug 2013 19:53:10 +0100
Subject: Add pCampbot RequestObjectTextures ini setting to control whether
 textures are requested for received objects.

---
 OpenSim/Tools/pCampBot/BotManager.cs |  7 +++++++
 OpenSim/Tools/pCampBot/pCampBot.cs   |  2 ++
 bin/pCampbot.ini.example             | 10 ++++++++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 0fdfa0e..5988584 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -68,6 +68,11 @@ namespace pCampBot
         public bool InitBotSendAgentUpdates { get; set; }
 
         /// <summary>
+        /// Controls whether bots request textures for the object information they receive
+        /// </summary>
+        public bool InitBotRequestObjectTextures { get; set; }
+
+        /// <summary>
         /// Created bots, whether active or inactive.
         /// </summary>
         protected List<Bot> m_lBot;
@@ -93,6 +98,7 @@ namespace pCampBot
         public BotManager()
         {
             InitBotSendAgentUpdates = true;
+            InitBotRequestObjectTextures = true;
 
             LoginDelay = DefaultLoginDelay;
 
@@ -176,6 +182,7 @@ namespace pCampBot
 
             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++)
             {
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index c8b6304..b02f917 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -88,6 +88,8 @@ namespace pCampBot
                     {
                         bm.InitBotSendAgentUpdates 
                             = botConfig.GetBoolean("SendAgentUpdates", bm.InitBotSendAgentUpdates);
+                        bm.InitBotRequestObjectTextures
+                            = botConfig.GetBoolean("RequestObjectTextures", bm.InitBotRequestObjectTextures);
                     }
                 }
 
diff --git a/bin/pCampbot.ini.example b/bin/pCampbot.ini.example
index 81cdcf4..f44feae 100644
--- a/bin/pCampbot.ini.example
+++ b/bin/pCampbot.ini.example
@@ -3,7 +3,13 @@
 
 [Bot]
   ; Control whether bots should regularly send agent updates
-  ; Not sending agent updates will reduce CPU requirements for pCampbot but greatly 
-  ; reduce the realism compared to viewers which are constantly sending AgentUpdates UDP packets
+  ; 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
-- 
cgit v1.1


From 2c67aa0f41193bf2271b75f060093f44819cdeae Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 14 Aug 2013 21:07:29 +0100
Subject: If pCampbot has been asked to shutdown, don't carry on logging in
 queued bots

---
 OpenSim/Tools/pCampBot/BotManager.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 5988584..397a98e 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -52,6 +52,11 @@ namespace pCampBot
         public const int DefaultLoginDelay = 5000;
 
         /// <summary>
+        /// True if pCampbot is in the process of shutting down.
+        /// </summary>
+        public bool ShuttingDown { 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>
@@ -186,6 +191,9 @@ namespace pCampBot
 
             for (int i = 0; i < botcount; i++)
             {
+                if (ShuttingDown)
+                    break;
+
                 string lastName = string.Format("{0}_{1}", lastNameStem, i + fromBotNumber);
 
                 // We must give each bot its own list of instantiated behaviours since they store state.
@@ -363,7 +371,9 @@ namespace pCampBot
 
         private void HandleShutdown(string module, string[] cmd)
         {
-            m_log.Info("[BOTMANAGER]: Shutting down bots");
+            MainConsole.Instance.Output("Shutting down");
+
+            ShuttingDown = true;
             doBotShutdown();
         }
 
-- 
cgit v1.1


From 0d5680e9712a5362c23b0ef6e479654d67e99b8b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 14 Aug 2013 22:07:22 +0100
Subject: Count any incoming packet that could not be recognized as an LLUDP
 packet as a malformed packet.  Record this as stat
 clientstack.<scene>.IncomingPacketsMalformedCount

Used to detect if a simulator is receiving significant junk UDP
Decimates the number of packets between which a warning is logged and prints the IP source of the last malformed packet when logging
---
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs   | 65 +++++++++++++++-------
 1 file changed, 44 insertions(+), 21 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index de2f9d4..553250c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -108,6 +108,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             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(
                     "OutgoingUDPSendsCount",
                     "Number of UDP sends performed",
                     "",
@@ -268,7 +281,10 @@ 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 current outgoing client for monitoring purposes.
@@ -1181,6 +1197,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 malformed was from {1}", 
+                    IncomingMalformedPacketCount, endPoint);
+        }
+
         public override void PacketReceived(UDPPacketBuffer buffer)
         {
             // Debugging/Profiling
@@ -1202,6 +1231,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
             }
 
@@ -1220,6 +1251,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
             }
 
@@ -1235,34 +1268,24 @@ 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.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));
+                }
+
+                RecordMalformedInboundPacket(endPoint);
+
                 return;
             }
 
-- 
cgit v1.1


From 93dffe17773ee5af552ac64a7902f66d8acac1b3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 14 Aug 2013 22:33:12 +0100
Subject: Add stat clientstack.<scene>.IncomingPacketsOrphanedCount to record
 well-formed packets that were not initial connection packets and could not be
 associated with a connected viewer.

---
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs   | 33 +++++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 553250c..102e581 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -121,6 +121,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             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",
                     "",
@@ -287,6 +300,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         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.
         /// </summary>
         private IClientAPI m_currentOutgoingClient;
@@ -1206,7 +1224,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             if ((IncomingMalformedPacketCount % 10000) == 0)
                 m_log.WarnFormat(
-                    "[LLUDPSERVER]: Received {0} malformed packets so far, probable network attack.  Last malformed was from {1}", 
+                    "[LLUDPSERVER]: Received {0} malformed packets so far, probable network attack.  Last was from {1}", 
                     IncomingMalformedPacketCount, endPoint);
         }
 
@@ -1279,9 +1297,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 if (IncomingMalformedPacketCount < 100)
                 {
-                    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));
+                    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);
@@ -1323,6 +1340,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (!m_scene.TryGetClient(endPoint, out client) || !(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;
             }
 
-- 
cgit v1.1


From 7c3b71d294987943058c8b3bcb18a424ca70dea5 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 14 Aug 2013 14:13:08 -0700
Subject: BulletSim: add physical object initialized flag so updates and
 collisions don't happen until the object is completely initialized.

This fixes the problem of doing a teleport while the simulator is running.
The destruction of the physical object while the engine is running means
that the physics parameter update would overwrite the new position of the
newly created avatar.
---
 OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs |  4 +++-
 OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs       |  4 ++++
 OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs      |  4 ++++
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs            |  4 ++++
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs           | 12 ++++++++----
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
index 5f232a4..c0589cd 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -69,7 +69,9 @@ public class BSActorAvatarMove : BSActor
     // BSActor.Dispose()
     public override void Dispose()
     {
-        Enabled = false;
+        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.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 502f85f..291dfcd 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -107,6 +107,8 @@ public sealed class BSCharacter : BSPhysObject
             PhysicalActors.Add(AvatarMoveActorName, m_moveActor);
 
             SetPhysicalProperties();
+
+            IsInitialized = true;
         });
         return;
     }
@@ -114,6 +116,8 @@ 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);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 27caf62..b26fef0 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -72,6 +72,8 @@ public abstract class BSPhysObject : PhysicsActor
     }
     protected BSPhysObject(BSScene parentScene, uint localID, string name, string typeName)
     {
+        IsInitialized = false;
+
         PhysScene = parentScene;
         LocalID = localID;
         PhysObjectName = name;
@@ -130,6 +132,8 @@ public abstract class BSPhysObject : PhysicsActor
     public string PhysObjectName { get; protected set; }
     public string TypeName { get; protected set; }
 
+    // Set to 'true' when the object is completely initialized
+    public bool IsInitialized { get; protected set; }
 
     // Return the object mass without calculating it or having side effects
     public abstract float RawMass { get; }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 6b5dea3..d5b999d 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -110,6 +110,8 @@ public class BSPrim : BSPhysObject
             CreateGeomAndObject(true);
 
             CurrentCollisionFlags = PhysScene.PE.GetCollisionFlags(PhysBody);
+
+            IsInitialized = true;
         });
     }
 
@@ -117,6 +119,8 @@ 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
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 79ac5a5..88d50b4 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -639,7 +639,8 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
                     BSPhysObject pobj;
                     if (PhysObjects.TryGetValue(entprop.ID, out pobj))
                     {
-                        pobj.UpdateProperties(entprop);
+                        if (pobj.IsInitialized)
+                            pobj.UpdateProperties(entprop);
                     }
                 }
             }
@@ -766,10 +767,13 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
 
         // 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 'good', 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;
-- 
cgit v1.1


From e8b1e91a1d4bb3ca65886c367c654a82033f4e03 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 14 Aug 2013 14:36:13 -0700
Subject: BulletSim: include check for volume detect in check for zeroing
 avatar motion.

Normally, avatar motion is zeroed if colliding with a stationary object so
they don't slide down hills and such. Without volume detect check this also
allowed avatars to stand on volume detect objects and to have some jiggling
when they were in the volume detect object. This commit fixes both.
---
 OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs | 2 +-
 OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs      | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
index c0589cd..68bc1b9 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -183,7 +183,7 @@ public class BSActorAvatarMove : BSActor
             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)
+                if (!m_controllingPrim.ColliderIsMoving && !m_controllingPrim.ColliderIsVolumeDetect)
                 {
                     m_physicsScene.DetailLog("{0},BSCharacter.MoveMotor,collidingWithStationary,zeroingMotion", m_controllingPrim.LocalID);
                     m_controllingPrim.IsStationary = true;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index b26fef0..9dc52d5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -132,7 +132,8 @@ public abstract class BSPhysObject : PhysicsActor
     public string PhysObjectName { get; protected set; }
     public string TypeName { get; protected set; }
 
-    // Set to 'true' when the object is completely initialized
+    // 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
@@ -356,6 +357,8 @@ public abstract class BSPhysObject : PhysicsActor
     // 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)
     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;
 
@@ -435,6 +438,7 @@ public abstract class BSPhysObject : PhysicsActor
 
         // 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.
-- 
cgit v1.1


From 60cc9e9a3c87a424fb213597092aa4aad53a6ba5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 14 Aug 2013 23:21:18 +0100
Subject: minor: remove unused entity transfer config in teleport v2
 attachments test

---
 .../CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index f4bf6b3..1fcef20 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -925,7 +925,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             IConfig modulesConfig = config.AddConfig("Modules");
             modulesConfig.Set("EntityTransferModule", etmA.Name);
             modulesConfig.Set("SimulationServices", lscm.Name);
-            IConfig entityTransferConfig = config.AddConfig("EntityTransfer");
 
             modulesConfig.Set("InventoryAccessModule", "BasicInventoryAccessModule");
 
-- 
cgit v1.1


From 104626d732614a2e0b1988961e61f63447017013 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 14 Aug 2013 23:22:20 +0100
Subject: minor: Comment out AvatarPicketSearch caps log message for now, which
 is occuring on every login and entity transfer

---
 OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
index 9f2aed0..10a4753 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
@@ -123,7 +123,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
             if (m_URL == "localhost")
             {
-                m_log.DebugFormat("[AVATAR PICKER SEARCH]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
+//                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"));
-- 
cgit v1.1


From 5011c657b5b8127927c75c4e1db496c15a394b3a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 14 Aug 2013 23:37:07 +0100
Subject: Actually implement the bot request object textures switch started in
 225cf0d.

Forgot to propogate it down to bot level.
---
 OpenSim/Tools/pCampBot/Bot.cs        | 8 ++++++++
 OpenSim/Tools/pCampBot/BotManager.cs | 1 +
 2 files changed, 9 insertions(+)

diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index dac8ccb..32bf32b 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -59,6 +59,11 @@ namespace pCampBot
         public delegate void AnEvent(Bot callbot, EventType someevent); // event delegate for bot events
 
         /// <summary>
+        /// Controls whether bots request textures for the object information they receive
+        /// </summary>
+        public bool RequestObjectTextures { get; set; }
+
+        /// <summary>
         /// Bot manager.
         /// </summary>
         public BotManager Manager { get; private set; }
@@ -469,6 +474,9 @@ namespace pCampBot
 
         public void Objects_NewPrim(object sender, PrimEventArgs args)
         {
+            if (!RequestObjectTextures)
+                return;
+
             Primitive prim = args.Prim;
 
             if (prim != null)
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 397a98e..dee02c3 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -300,6 +300,7 @@ namespace pCampBot
             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;
-- 
cgit v1.1


From 2231fcf5b45be9a2f5b6e1a2665ff7223e275b33 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 15 Aug 2013 13:46:46 +0100
Subject: Do not use the SP.DoNotCloseAfterTeleport flag for child agent
 connections.

This approach has problems if a client quits without sending a proper logout but then reconnects before the connection is closed due to inactivity.
In this case, the DoNotCloseAfterTeleport was wrongly set.
The simplest approach is to close child agents on teleport as quickly as possible so that races are very unlikely to occur
Hence, this code now closes child agents as the first action after a sucessful teleport.
---
 .../EntityTransfer/EntityTransferModule.cs         | 24 ++++++++---------
 OpenSim/Region/Framework/Scenes/Scene.cs           | 31 ++++++++++++++--------
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 87f0264..93a089d 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1055,6 +1055,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             
             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);
 
@@ -1064,17 +1072,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // Now let's make it officially a child agent
             sp.MakeChildAgent();
 
-            // May still need to signal neighbours whether child agents may need closing irrespective of whether this
-            // one needed closing.  Neighbour regions also contain logic to prevent a close if a subsequent move or
-            // teleport re-established the child connection.
-            // 
-            // It may be possible to also close child agents after a pause but one needs to be very careful about
-            // race conditions between different regions on rapid teleporting (e.g. from A1 to a non-neighbour B, back
-            // to a neighbour A2 then off to a non-neighbour C.  Also, closing child agents early may be more compatible
-            // with complicated scenarios where there a mixture of V1 and V2 teleports, though this is conjecture.  It's
-            // easier to close immediately and greatly reduce the scope of race conditions if possible.
-            sp.CloseChildAgents(newRegionX, newRegionY);
-
             // 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))
             {
@@ -1096,7 +1093,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 }
                 else
                 {
-                    m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Not closing agent {0}, user is back in {1}", sp.Name, Scene.Name);
+                    m_log.DebugFormat(
+                        "[ENTITY TRANSFER MODULE]: Connection for {0} in {1} has been re-established after teleport.  Not closing.", 
+                        sp.Name, Scene.Name);
+
                     sp.DoNotCloseAfterTeleport = false;
                 }
             }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d187377..3e5ef10 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3703,21 +3703,30 @@ namespace OpenSim.Region.Framework.Scenes
                     // 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.
-                    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);
+                    //
+                    // 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.DoNotCloseAfterTeleport = true;
-                    }
-                    else if (EntityTransferModule.IsInTransit(sp.UUID))
+                    if (EntityTransferModule.IsInTransit(sp.UUID))
                     {
+                        sp.DoNotCloseAfterTeleport = true;
+
                         m_log.DebugFormat(
-                            "[SCENE]: Setting DoNotCloseAfterTeleport for child scene presence {0} in {1} because this region will attempt previous end-of-teleport close.", 
+                            "[SCENE]: Set DoNotCloseAfterTeleport for child scene presence {0} in {1} because this region will attempt previous end-of-teleport close.", 
                             sp.Name, Name);
-
-                        sp.DoNotCloseAfterTeleport = true;
                     }
                 }
             }
-- 
cgit v1.1


From 3f8d79024bc760e4f0c5cbca2126ab725c847078 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 15 Aug 2013 14:07:57 +0100
Subject: Rely on the Scene.IncomingCloseAgent() check as to whether the
 connection should be kept open after teleport-end rather than doing this in
 the ET Module

This is safer since the close check in IncomingCloseAgent() is done under lock conditions, which prevents a race between ETM and Scene.AddClient()
---
 .../Framework/EntityTransfer/EntityTransferModule.cs | 20 ++++++--------------
 OpenSim/Region/Framework/Scenes/Scene.cs             |  2 +-
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 93a089d..5f85eb0 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1085,20 +1085,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 // IN THE AVIE BEING PLACED IN INFINITY FOR A COUPLE OF SECONDS.
                 Thread.Sleep(15000);
             
-                if (!sp.DoNotCloseAfterTeleport)
-                {
-                    // OK, it got this agent. Let's close everything
-                    m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Closing agent {0} in {1}", sp.Name, Scene.Name);
-                    sp.Scene.IncomingCloseAgent(sp.UUID, false);
-                }
-                else
-                {
-                    m_log.DebugFormat(
-                        "[ENTITY TRANSFER MODULE]: Connection for {0} in {1} has been re-established after teleport.  Not closing.", 
-                        sp.Name, Scene.Name);
-
-                    sp.DoNotCloseAfterTeleport = false;
-                }
+                // 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);
             }
             else
             {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 3e5ef10..b58e7c4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3725,7 +3725,7 @@ namespace OpenSim.Region.Framework.Scenes
                         sp.DoNotCloseAfterTeleport = true;
 
                         m_log.DebugFormat(
-                            "[SCENE]: Set DoNotCloseAfterTeleport for child scene presence {0} in {1} because this region will attempt previous end-of-teleport close.", 
+                            "[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);
                     }
                 }
-- 
cgit v1.1


From 3ddb7438d746b3efbe0cbedcb4ba2e18a0db51e2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 15 Aug 2013 14:41:00 +0100
Subject: Move DoNotCloseAfterTeleport flag reset before UpdateAgent in V2 to
 avoid a low probability where the destination re-establishing the child
 connection before the flag was reset

---
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 5f85eb0..4011422 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1029,6 +1029,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             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.
@@ -1075,8 +1081,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // 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))
             {
-                sp.DoNotCloseAfterTeleport = false;
-
                 // RED ALERT!!!!
                 // PLEASE DO NOT DECREASE THIS WAIT TIME UNDER ANY CIRCUMSTANCES.
                 // THE VIEWERS SEEM TO NEED SOME TIME AFTER RECEIVING MoveAgentIntoRegion
-- 
cgit v1.1


From 7c916ab91ccadb8cb9a84508f29fa64f7e2e9e1e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 15 Aug 2013 14:50:20 +0100
Subject: Try to make "slow down" message that one could receive on rapid
 teleporting more informative to the user.

This message is seen on V2 if one attempts to quickly re-teleport from a source region where one had previously teleported to a non-neighbour and back within 15 secs.
The solution here is for the user to wait a short while.
This message can also be seen on any teleport protocol if one recieves multiple teleport attempts simultaneously.  Probably still useful here to help identify misbehaving scripts.
---
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 4011422..17ebc83 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -317,7 +317,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     "[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("Slow down!");
+                sp.ControllingClient.SendTeleportFailed("Previous teleport process incomplete.  Please retry shortly.");
+
                 return;
             }
 
-- 
cgit v1.1


From 7d268912f1ee09b4e146208a4dd84dbf81ba335d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 16 Aug 2013 00:58:25 +0100
Subject: Packet headers are not zero-encoded so don't try to zero-decode these
 in PacketPool.GetType()

Instead adjusts code with that from Packet.BuildHeader(byte[], ref int, ref int):Header in libomv
This stops packet decoding failures with agent UUIDs that contain 00 in their earlier parts (e.g. b0b0b0b0-0000-0000-0000-000000000211)
Thanks to lkalif for pointing this out.
---
 .../Region/ClientStack/Linden/UDP/PacketPool.cs    | 25 ++++++++--------------
 1 file changed, 9 insertions(+), 16 deletions(-)

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);
-- 
cgit v1.1


From 1624522761b0634cea1089dd02cc9af7d30c356c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 16 Aug 2013 23:45:04 +0100
Subject: refactor: Make
 AttachmentModulesTests.TestSameSimulatorNeighbouringRegionsTeleportV2 use
 already available TestClient handle rather than retrieving it via the
 ScenePresence

---
 .../CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index 1fcef20..bdfef32 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -965,7 +965,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             // 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.
-            ((TestClient)beforeTeleportSp.ControllingClient).OnTestClientSendRegionTeleport 
+            tc.OnTestClientSendRegionTeleport 
                 += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL) 
                     => ThreadPool.UnsafeQueueUserWorkItem(o => destinationTestClients[0].CompleteMovement(), null);
 
-- 
cgit v1.1


From fbab898f74186b38cf2dad9aa42f7f9b17a34fe9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 16 Aug 2013 23:52:55 +0100
Subject: Add TestSameSimulatorNeighbouringRegionsV2() regression test for v2
 entity transfer protocl

---
 .../Scenes/Tests/ScenePresenceTeleportTests.cs     | 89 +++++++++++++++++++++-
 1 file changed, 87 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
index afd2779..936c2c0 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();
@@ -428,7 +429,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         }
 
         [Test]
-        public void TestSameSimulatorNeighbouringRegions()
+        public void TestSameSimulatorNeighbouringRegionsV1()
         {
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
@@ -512,5 +513,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.SetUpInformClientOfNeighbour(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();
+        }
     }
 }
\ No newline at end of file
-- 
cgit v1.1


From f5d3145bea75fe2c84f49685031443c6826ffae7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Aug 2013 00:24:56 +0100
Subject: Add ScenePresenceTeleportTests.TestSameSimulatorIsolatedRegionsV2()
 regression test for v2 transfers.

Also adjusts names of teleport setup helpers in EntityTransferHelpers
---
 .../Attachments/Tests/AttachmentsModuleTests.cs    |  4 +-
 .../Scenes/Tests/SceneObjectDeRezTests.cs          |  2 +-
 .../Scenes/Tests/ScenePresenceCrossingTests.cs     |  2 +-
 .../Scenes/Tests/ScenePresenceTeleportTests.cs     | 68 +++++++++++++++++++++-
 .../Tests/Common/Helpers/EntityTransferHelpers.cs  | 43 +++++++++++++-
 5 files changed, 109 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index bdfef32..fd493fc 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -844,7 +844,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             AgentCircuitData acd = SceneHelpers.GenerateAgentData(ua1.PrincipalID);
             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);
             beforeTeleportSp.AbsolutePosition = new Vector3(30, 31, 32);
@@ -943,7 +943,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             AgentCircuitData acd = SceneHelpers.GenerateAgentData(ua1.PrincipalID);
             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);
             beforeTeleportSp.AbsolutePosition = new Vector3(30, 31, 32);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index d670dad..5b5fb92 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -147,7 +147,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             AgentCircuitData acd = SceneHelpers.GenerateAgentData(uaB);
             TestClient clientB = new TestClient(acd, sceneB);
             List<TestClient> childClientsB = new List<TestClient>();
-            EntityTransferHelpers.SetUpInformClientOfNeighbour(clientB, childClientsB);
+            EntityTransferHelpers.SetupInformClientOfNeighbourTriggersNeighbourClientCreate(clientB, childClientsB);
 
             SceneHelpers.AddScenePresence(sceneB, clientB, acd);
 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
index 5df9aba..12a778b 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
@@ -97,7 +97,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId);
             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);
             originalSp.AbsolutePosition = new Vector3(128, 32, 10);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
index 936c2c0..8c25dbc 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
@@ -147,7 +147,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             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,
@@ -180,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>
@@ -467,7 +529,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId);
             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);
             beforeSceneASp.AbsolutePosition = new Vector3(30, 31, 32);
@@ -545,7 +607,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId);
             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);
             beforeSceneASp.AbsolutePosition = new Vector3(30, 31, 32);
diff --git a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
index 1b960b1..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,8 +77,6 @@ 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;
@@ -87,5 +87,42 @@ namespace OpenSim.Tests.Common
                 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
-- 
cgit v1.1


From 14ae89dbe7e06d838fc1bc01cf377d8f0d3eb035 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Aug 2013 00:39:41 +0100
Subject: Fix issues with RemoteAdmin admin_save_heightmap and
 admin_load_heightmap not working.

This is because they were wrongly looking for both regionid and region_id parameters in the same request.
Now only region_id is required (and recognized), regionid having been already deprecated for some time.
This is essentially Michelle Argus' patch from http://opensimulator.org/mantis/view.php?id=6737 but with tabs replaced with spaces.
Thanks!
---
 .../RemoteController/RemoteAdminPlugin.cs          | 45 ++++++++++++++--------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 3abf40b..c78cf3b 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -327,18 +327,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");
         }
@@ -352,23 +360,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");
         }
-- 
cgit v1.1


From 1f1736a79f925c3e19dee634f8cf74fd0f446073 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Aug 2013 00:46:18 +0100
Subject: minor: Make log messages consistent in NeighbourServicesConnector

---
 .../Connectors/Neighbour/NeighbourServicesConnector.cs       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
index 5948380..774fe2a 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;
@@ -154,7 +154,7 @@ namespace OpenSim.Services.Connectors
             catch (Exception e)
             {
                 m_log.WarnFormat(
-                    "[NEIGHBOUR SERVICE CONNCTOR]: Unable to send HelloNeighbour from {0} to {1}.  Exception {2}{3}",
+                    "[NEIGHBOUR SERVICES CONNECTOR]: Unable to send 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;
-- 
cgit v1.1


From 217c8deae5fab5aa025932b027dfc4a4b629cc58 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Aug 2013 00:51:21 +0100
Subject: minor: remove mono compiler warning in StatsManager

---
 OpenSim/Framework/Monitoring/StatsManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index 7cf1fa7..05ee4c5 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -267,7 +267,7 @@ namespace OpenSim.Framework.Monitoring
         public static Hashtable HandleStatsRequest(Hashtable request)
         {
             Hashtable responsedata = new Hashtable();
-            string regpath = request["uri"].ToString();
+//            string regpath = request["uri"].ToString();
             int response_code = 200;
             string contenttype = "text/json";
 
-- 
cgit v1.1


From 77d418a36d532e9aaf756858ff97c15edf04759a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Aug 2013 00:56:19 +0100
Subject: remove mono compiler warnings from PollServiceRequestManager

---
 OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 6ab05d0..6aa5907 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -51,10 +51,8 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         private uint m_WorkerThreadCount = 0;
         private Thread[] m_workerThreads;
-        private Thread m_longPollThread;
 
         private bool m_running = true;
-        private int slowCount = 0;
 
         private SmartThreadPool m_threadPool = new SmartThreadPool(20000, 12, 2);
 
@@ -83,7 +81,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                         int.MaxValue);
             }
 
-            m_longPollThread = Watchdog.StartThread(
+            Watchdog.StartThread(
                 this.CheckLongPollThreads,
                 string.Format("LongPollServiceWatcherThread:{0}", m_server.Port),
                 ThreadPriority.Normal,
@@ -136,7 +134,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 Thread.Sleep(500); 
                 Watchdog.UpdateThread();
 
-                List<PollServiceHttpRequest> not_ready = new List<PollServiceHttpRequest>();
+//                List<PollServiceHttpRequest> not_ready = new List<PollServiceHttpRequest>();
                 lock (m_longPollRequests)
                 {
                     if (m_longPollRequests.Count > 0 && m_running)
-- 
cgit v1.1


From d38d5ecbac5777c2bea1f9858410d7d2ff13935b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Aug 2013 01:00:20 +0100
Subject: minor: remove mono compiler warnings from ScenePresence

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 69339b7..37e5286 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -219,7 +219,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;
 
@@ -1847,8 +1847,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (m_movementUpdateCount < 1)
                 m_movementUpdateCount = 1;
 
-
-            AgentManager.ControlFlags flags = (AgentManager.ControlFlags)agentData.ControlFlags;
+//            AgentManager.ControlFlags flags = (AgentManager.ControlFlags)agentData.ControlFlags;
 
             // Camera location in world.  We'll need to raytrace
             // from this location from time to time.
@@ -3025,7 +3024,7 @@ namespace OpenSim.Region.Framework.Scenes
             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;
-- 
cgit v1.1


From f5dbfe99b10085a6d954105ce473daeb9235686c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Aug 2013 01:06:48 +0100
Subject: minor: remove mono compiler warnings from
 OpenSim/Services/Connectors/SimianGrid

---
 .../Services/Connectors/SimianGrid/SimianExternalCapsModule.cs    | 3 ---
 OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs              | 8 ++------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
index e85b0b7..764e71f 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
@@ -56,11 +56,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
         private Scene m_scene;
         private String m_simianURL;
         
-        private IGridUserService m_GridUserService;
-        
 #region IRegionModule Members
 
-
         public string Name
         {
             get { return this.GetType().Name; }
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
index e7d2f86..9898da9 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
@@ -29,11 +29,9 @@ 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;
@@ -52,7 +50,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private IConfig m_config = null;
-        private bool m_enabled = true;
 
         private String m_simianURL;
         
@@ -62,7 +59,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
         {
             get { return this.GetType().Name; }
         }
-
            
         public void Initialise(IConfigSource config)
         {
@@ -76,7 +72,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     if (String.IsNullOrEmpty(m_simianURL))
                     {
                         // m_log.DebugFormat("[SimianGrid] service URL is not defined");
-                        m_enabled = false;
                         return;
                     }
                     
@@ -141,6 +136,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         }
         
 #endregion
+
         public static String SimulatorCapability = UUID.Zero.ToString();
         public static OSDMap PostToService(string url, NameValueCollection data)
         {
@@ -148,4 +144,4 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return WebUtil.PostToService(url, data);
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1


From b3052c425effe7eed6f4a8ab8e25fd4de907bc86 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Aug 2013 01:08:19 +0100
Subject: Remove some mono compiler warnings from OpenSim/Server/Handlers

---
 OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs        | 2 +-
 OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs | 6 +-----
 OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs     | 6 ++----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
index f37f2f1..04bb9e8 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
                     data.destinationServerURI = args["destination_serveruri"];
 
             }
-            catch (InvalidCastException e)
+            catch (InvalidCastException)
             {
                 m_log.ErrorFormat("[HOME AGENT HANDLER]: Bad cast in UnpackData");
             }
diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
index d9c1bd3..7137836 100644
--- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
@@ -453,7 +453,6 @@ namespace OpenSim.Server.Handlers.Hypergrid
             XmlRpcResponse response = new XmlRpcResponse();
             response.Value = hash;
             return response;
-
         }
 
         /// <summary>
@@ -471,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();
@@ -482,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/Profiles/UserProfilesConnector.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
index f9a520a..28dbbc2 100644
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
@@ -39,8 +39,7 @@ namespace OpenSim.Server.Handlers.Profiles
 {
     public class UserProfilesConnector: ServiceConnector
     {
-        static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+//        static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);        
         
         // Our Local Module
         public IUserProfilesService ServiceModule
@@ -110,5 +109,4 @@ namespace OpenSim.Server.Handlers.Profiles
             Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData);
         }
     }
-}
-
+}
\ No newline at end of file
-- 
cgit v1.1


From d75f00cc2d0d601c6b9b4f2ea7a983c2ea85c62d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Aug 2013 01:09:31 +0100
Subject: minor: remove mono compiler warning from AttachmentsModule

---
 OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 675fccc..2818712 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -316,8 +316,7 @@ 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.
-                    SceneObjectGroup objatt 
-                        = RezSingleAttachmentFromInventoryInternal(
+                    RezSingleAttachmentFromInventoryInternal(
                         sp, sp.PresenceType == PresenceType.Npc ? UUID.Zero : attach.ItemID, attach.AssetID, attachmentPt, true);
                 }
                 catch (Exception e)
-- 
cgit v1.1


From 85a9cb260a5f06df495e29dd8a3ae590970efe57 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Aug 2013 01:10:58 +0100
Subject: Remove mono compiler warnings from UserProfilesModule

---
 .../Avatar/UserProfiles/UserProfileModule.cs       | 35 ++++++++++------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index c04098c..966a05c 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -307,7 +307,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             }
 
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(targetID, out serverURI);
+            GetUserProfileServerURI(targetID, out serverURI);
             UUID creatorId = UUID.Zero;
 
             OSDMap parameters= new OSDMap();
@@ -372,7 +372,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             }
             
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(target, out serverURI);
+            GetUserProfileServerURI(target, out serverURI);
 
             object Ad = (object)ad;
             if(!JsonRpcRequest(ref Ad, "classifieds_info_query", serverURI, UUID.Random().ToString()))
@@ -441,10 +441,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             Vector3 pos = remoteClient.SceneAgent.AbsolutePosition;
             ILandObject land = s.LandChannel.GetLandObject(pos.X, pos.Y);
             ScenePresence p = FindPresence(remoteClient.AgentId);
-            Vector3 avaPos = p.AbsolutePosition;
+//            Vector3 avaPos = p.AbsolutePosition;
             
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+            GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
             if (land == null)
             {
@@ -470,7 +470,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
             object Ad = ad;
 
-            OSD X = OSD.SerializeMembers(Ad);
+            OSD.SerializeMembers(Ad);
 
             if(!JsonRpcRequest(ref Ad, "classified_update", serverURI, UUID.Random().ToString()))
             {
@@ -491,7 +491,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         public void ClassifiedDelete(UUID queryClassifiedID, IClientAPI remoteClient)
         {
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+            GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
             UUID classifiedId;
             OSDMap parameters= new OSDMap();
@@ -541,7 +541,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             }
 
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(targetId, out serverURI);
+            GetUserProfileServerURI(targetId, out serverURI);
 
             OSDMap parameters= new OSDMap();
             parameters.Add("creatorId", OSD.FromUUID(targetId));
@@ -592,7 +592,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             UUID targetID;
             UUID.TryParse(args[0], out targetID);
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(targetID, out serverURI);
+            GetUserProfileServerURI(targetID, out serverURI);
             IClientAPI remoteClient = (IClientAPI)sender;
 
             UserProfilePick pick = new UserProfilePick();
@@ -660,7 +660,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             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;
-            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+            GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
             ScenePresence p = FindPresence(remoteClient.AgentId);
 
             Vector3 avaPos = p.AbsolutePosition;
@@ -720,7 +720,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         public void PickDelete(IClientAPI remoteClient, UUID queryPickID)
         {
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+            GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
             OSDMap parameters= new OSDMap();
             parameters.Add("pickId", OSD.FromUUID(queryPickID));
@@ -755,7 +755,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
             IClientAPI remoteClient = (IClientAPI)sender;
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+            GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
             note.TargetId = remoteClient.AgentId;
             UUID.TryParse(args[0], out note.UserId);
 
@@ -791,7 +791,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             note.Notes = queryNotes;
 
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+            GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
             object Note = note;
             if(!JsonRpcRequest(ref Note, "avatar_notes_update", serverURI, UUID.Random().ToString()))
@@ -836,7 +836,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             prop.Language = languages;
 
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+            GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
             object Param = prop;
             if(!JsonRpcRequest(ref Param, "avatar_interests_update", serverURI, UUID.Random().ToString()))
@@ -958,7 +958,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
                 prop.FirstLifeText = newProfile.FirstLifeAboutText;
 
                 string serverURI = string.Empty;
-                bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+                GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
 
                 object Prop = prop;
 
@@ -972,7 +972,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             }
         }
 
-
         /// <summary>
         /// Gets the profile data.
         /// </summary>
@@ -997,7 +996,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             }
 
             string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(properties.UserId, out serverURI);
+            GetUserProfileServerURI(properties.UserId, out serverURI);
 
             // This is checking a friend on the home grid
             // Not HG friend
@@ -1245,11 +1244,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
                 return false;
             }
 
-            byte[] buf = new byte[8192];
             Stream rstream = webResponse.GetResponseStream();
             OSDMap mret = (OSDMap)OSDParser.DeserializeJson(rstream);
 
-            if(mret.ContainsKey("error"))
+            if (mret.ContainsKey("error"))
                 return false;
             
             // get params...
@@ -1311,7 +1309,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
                 return false;
             }
 
-            byte[] buf = new byte[8192];
             Stream rstream = webResponse.GetResponseStream();
 
             OSDMap response = new OSDMap();
-- 
cgit v1.1


From 3585b0a1392b7f9e93c4156d1d9fad224b4f187a Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 18 Aug 2013 02:59:10 +0100
Subject: Allow updating the wearable type of wearables that have a type of 0.
 This will allow viewers to fix broken wearables as they detect them.

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 8e4e307..c4b07a5 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -416,6 +416,8 @@ 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
@@ -489,11 +491,13 @@ namespace OpenSim.Region.Framework.Scenes
                     item.SalePrice = itemUpd.SalePrice;
                     item.SaleType = itemUpd.SaleType;
 
-                    InventoryService.UpdateItem(item);
+                    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;
+                    }
 
-                    // We cannot send out a bulk update here, since this will cause editing of clothing to start 
-                    // failing frequently.  Possibly this is a race with a separate transaction that uploads the asset.
-//                    remoteClient.SendBulkUpdateInventory(item);
+                    InventoryService.UpdateItem(item);
                 }
 
                 if (UUID.Zero != transactionID)
@@ -503,6 +507,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
             {
-- 
cgit v1.1


From a90a5f52dd5f053a83a09fdd70ca08148ef641ce Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 19 Aug 2013 19:38:20 +0100
Subject: Show number of connections each bot has established in "show bots"
 command.

---
 OpenSim/Tools/pCampBot/Bot.cs        | 15 ++++++++++++++-
 OpenSim/Tools/pCampBot/BotManager.cs | 17 ++++++++++-------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index 32bf32b..be7a5a1 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -97,6 +97,19 @@ namespace pCampBot
         /// </summary>
         public ConnectionState ConnectionState { get; private set; }
 
+        /// <summary>
+        /// The number of connections that this bot has to different simulators.
+        /// </summary>
+        /// <value>Includes both root and child connections.</value>
+        public int ConnectionsCount
+        {
+            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; }
@@ -144,7 +157,7 @@ namespace pCampBot
             ConnectionState = ConnectionState.Disconnected;
 
             behaviours.ForEach(b => b.Initialize(this));
-            
+
             Client = new GridClient();
 
             Random = new Random(Environment.TickCount);// We do stuff randomly here
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index dee02c3..8f31bdf 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -395,8 +395,11 @@ namespace pCampBot
 
         private void HandleShowStatus(string module, string[] cmd)
         {
-            string outputFormat = "{0,-30}  {1, -30}  {2,-14}";
-            MainConsole.Instance.OutputFormat(outputFormat, "Name", "Region", "Status");
+            ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+            cdt.AddColumn("Name", 30);
+            cdt.AddColumn("Region", 30);
+            cdt.AddColumn("Status", 14);
+            cdt.AddColumn("Connections", 11);
 
             Dictionary<ConnectionState, int> totals = new Dictionary<ConnectionState, int>();
             foreach (object o in Enum.GetValues(typeof(ConnectionState)))
@@ -409,19 +412,19 @@ namespace pCampBot
                     Simulator currentSim = pb.Client.Network.CurrentSim;
                     totals[pb.ConnectionState]++;
 
-                    MainConsole.Instance.OutputFormat(
-                        outputFormat,
-                        pb.Name, currentSim != null ? currentSim.Name : "(none)", pb.ConnectionState);
+                    cdt.AddRow(
+                        pb.Name, currentSim != null ? currentSim.Name : "(none)", pb.ConnectionState, pb.ConnectionsCount);
                 }
             }
 
+            MainConsole.Instance.Output(cdt.ToString());
+
             ConsoleDisplayList cdl = new ConsoleDisplayList();
 
             foreach (KeyValuePair<ConnectionState, int> kvp in totals)
                 cdl.AddRow(kvp.Key, kvp.Value);
 
-
-            MainConsole.Instance.OutputFormat("\n{0}", cdl.ToString());
+            MainConsole.Instance.Output(cdl.ToString());
         }
 
         /*
-- 
cgit v1.1


From 49b7cbda72cdaae8b5a7a89c94915851997b0b13 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 19 Aug 2013 20:29:17 +0100
Subject: Create a separate pCampbot "disconnect" console command which
 disconnects connected bots.

"quit" console command now requires bots to be separate disconnected first before quitting.
This is to prepare the way for disconnecting/reconnecting different numbers of bots in a pCampbot session.
And hopefully resolves bug where console appears not to be reset if Environment.Exit(0) is called on a different thread
---
 OpenSim/Tools/pCampBot/BotManager.cs | 110 +++++++++++++++++++++--------------
 1 file changed, 67 insertions(+), 43 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 8f31bdf..5c0dc81 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -52,9 +52,9 @@ namespace pCampBot
         public const int DefaultLoginDelay = 5000;
 
         /// <summary>
-        /// True if pCampbot is in the process of shutting down.
+        /// Is pCampbot in the process of disconnecting bots?
         /// </summary>
-        public bool ShuttingDown { get; private set; }
+        public bool DisconnectingBots { get; private set; }
 
         /// <summary>
         /// Delay between logins of multiple bots.
@@ -139,6 +139,11 @@ namespace pCampBot
                     "Shutdown bots and exit",
                     HandleShutdown);
 
+            m_console.Commands.AddCommand("bot", false, "disconnect",
+                    "disconnect",
+                    "Disconnect all bots",
+                    HandleDisconnect);
+
             m_console.Commands.AddCommand("bot", false, "show regions",
                     "show regions",
                     "Show regions known to bots",
@@ -191,31 +196,37 @@ namespace pCampBot
 
             for (int i = 0; i < botcount; i++)
             {
-                if (ShuttingDown)
-                    break;
+                lock (m_lBot)
+                {
+                    if (DisconnectingBots)
+                        break;
+
+                    string lastName = string.Format("{0}_{1}", lastNameStem, i + fromBotNumber);
 
-                string lastName = string.Format("{0}_{1}", lastNameStem, i + fromBotNumber);
+                    // 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("c"))
+                        behaviours.Add(new CrossBehaviour());
 
-                // 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("c"))
-                    behaviours.Add(new CrossBehaviour());
+                    if (behaviourSwitches.Contains("g"))
+                        behaviours.Add(new GrabbingBehaviour());
 
-                if (behaviourSwitches.Contains("g"))
-                    behaviours.Add(new GrabbingBehaviour());
+                    if (behaviourSwitches.Contains("n"))
+                        behaviours.Add(new NoneBehaviour());
 
-                if (behaviourSwitches.Contains("n"))
-                    behaviours.Add(new NoneBehaviour());
+                    if (behaviourSwitches.Contains("p"))
+                        behaviours.Add(new PhysicsBehaviour());
+        
+                    if (behaviourSwitches.Contains("t"))
+                        behaviours.Add(new TeleportBehaviour());
 
-                if (behaviourSwitches.Contains("p"))
-                    behaviours.Add(new PhysicsBehaviour());
-    
-                if (behaviourSwitches.Contains("t"))
-                    behaviours.Add(new TeleportBehaviour());
+                    StartBot(this, behaviours, firstName, lastName, password, loginUri, startUri, wearSetting);
+                }
 
-                StartBot(this, behaviours, firstName, lastName, password, loginUri, startUri, wearSetting);
+                // Stagger logins
+                Thread.Sleep(LoginDelay);
             }
         }
 
@@ -305,17 +316,13 @@ namespace pCampBot
             pb.OnConnected += handlebotEvent;
             pb.OnDisconnected += handlebotEvent;
 
-            lock (m_lBot)
-                m_lBot.Add(pb);
+            m_lBot.Add(pb);
 
             Thread pbThread = new Thread(pb.startup);
             pbThread.Name = pb.Name;
             pbThread.IsBackground = true;
 
             pbThread.Start();
-
-            // Stagger logins
-            Thread.Sleep(LoginDelay);
         }
 
         /// <summary>
@@ -328,18 +335,16 @@ 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");
-
-                    lock (m_lBot)
-                    {
-                        if (m_lBot.TrueForAll(b => b.ConnectionState == ConnectionState.Disconnected))
-                            Environment.Exit(0);
-
-                        break;
-                    }
+                    break;
+                }
             }
         }
 
@@ -349,15 +354,12 @@ namespace pCampBot
         /// <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 ShutdownBots()
         {
-            lock (m_lBot)
+            foreach (Bot bot in m_lBot)
             {
-                foreach (Bot bot in m_lBot)
-                {
-                    Bot thisBot = bot;
-                    Util.FireAndForget(o => thisBot.shutdown());
-                }
+                Bot thisBot = bot;
+                Util.FireAndForget(o => thisBot.shutdown());
             }
         }
 
@@ -370,12 +372,34 @@ namespace pCampBot
             return new LocalConsole("pCampbot");
         }
 
+        private void HandleDisconnect(string module, string[] cmd)
+        {
+            MainConsole.Instance.Output("Disconnecting bots");
+
+            lock (m_lBot)
+            {
+                DisconnectingBots = true;
+
+                ShutdownBots();
+            }
+        }
+
         private void HandleShutdown(string module, string[] cmd)
         {
+            lock (m_lBot)
+            {
+                int connectedBots = m_lBot.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");
 
-            ShuttingDown = true;
-            doBotShutdown();
+            Environment.Exit(0);
         }
 
         private void HandleShowRegions(string module, string[] cmd)
-- 
cgit v1.1


From 2fa42f24fd0e80adc16320a404e3e85ca6d1baa1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 19 Aug 2013 21:00:31 +0100
Subject: Make it possible to disconnected a specified number of bots via the
 pCampbot console command "disconnect [<n>]"

Bots disconnected are ascending from last in numeric order.
Temporarily no way to reconnect bots.
---
 OpenSim/Framework/Console/ConsoleUtil.cs |  29 ++++++++-
 OpenSim/Tools/pCampBot/BotManager.cs     | 101 +++++++++++++++++--------------
 2 files changed, 82 insertions(+), 48 deletions(-)

diff --git a/OpenSim/Framework/Console/ConsoleUtil.cs b/OpenSim/Framework/Console/ConsoleUtil.cs
index c0ff454..794bfaf 100644
--- a/OpenSim/Framework/Console/ConsoleUtil.cs
+++ b/OpenSim/Framework/Console/ConsoleUtil.cs
@@ -179,8 +179,8 @@ namespace OpenSim.Framework.Console
         /// 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>
+        /// <param name='rawConsoleInt'>/param>
+        /// <param name='i'></param>
         /// <returns></returns>
         public static bool TryParseConsoleInt(ICommandConsole console, string rawConsoleInt, out int i)
         {
@@ -194,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/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 5c0dc81..157c69c 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -80,7 +80,7 @@ namespace pCampBot
         /// <summary>
         /// Created bots, whether active or inactive.
         /// </summary>
-        protected List<Bot> m_lBot;
+        protected List<Bot> m_bots;
 
         /// <summary>
         /// Random number generator.
@@ -130,35 +130,30 @@ namespace pCampBot
                 }
             }
 
-            m_console.Commands.AddCommand("bot", false, "shutdown",
-                    "shutdown",
-                    "Shutdown bots and exit", HandleShutdown);
+            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, "quit", "quit", "Shutdown bots and exit", HandleShutdown);
 
-            m_console.Commands.AddCommand("bot", false, "disconnect",
-                    "disconnect",
-                    "Disconnect all bots",
-                    HandleDisconnect);
+            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, "show regions",
-                    "show regions",
-                    "Show regions known to bots",
-                    HandleShowRegions);
+            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, "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_bots = new List<Bot>();
         }
 
         /// <summary>
@@ -196,7 +191,7 @@ namespace pCampBot
 
             for (int i = 0; i < botcount; i++)
             {
-                lock (m_lBot)
+                lock (m_bots)
                 {
                     if (DisconnectingBots)
                         break;
@@ -316,7 +311,7 @@ namespace pCampBot
             pb.OnConnected += handlebotEvent;
             pb.OnDisconnected += handlebotEvent;
 
-            m_lBot.Add(pb);
+            m_bots.Add(pb);
 
             Thread pbThread = new Thread(pb.startup);
             pbThread.Name = pb.Name;
@@ -349,21 +344,6 @@ namespace pCampBot
         }
 
         /// <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>
-        private void ShutdownBots()
-        {
-            foreach (Bot bot in m_lBot)
-            {
-                Bot thisBot = bot;
-                Util.FireAndForget(o => thisBot.shutdown());
-            }
-        }
-
-        /// <summary>
         /// Standard CreateConsole routine
         /// </summary>
         /// <returns></returns>
@@ -374,21 +354,50 @@ namespace pCampBot
 
         private void HandleDisconnect(string module, string[] cmd)
         {
-            MainConsole.Instance.Output("Disconnecting bots");
-
-            lock (m_lBot)
+            lock (m_bots)
             {
+                int botsToDisconnect;
+                int connectedBots = m_bots.Count(b => b.ConnectionState == ConnectionState.Connected);
+
+                if (cmd.Length == 1)
+                {
+                    botsToDisconnect = connectedBots;
+                }
+                else
+                {
+                    if (!ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, cmd[1], out botsToDisconnect))
+                        return;
+
+                    botsToDisconnect = Math.Min(botsToDisconnect, connectedBots);
+                }
+
                 DisconnectingBots = true;
 
-                ShutdownBots();
+                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.shutdown());
+                        disconnectedBots++;
+                    }
+                }
             }
         }
 
         private void HandleShutdown(string module, string[] cmd)
         {
-            lock (m_lBot)
+            lock (m_bots)
             {
-                int connectedBots = m_lBot.Count(b => b.ConnectionState == ConnectionState.Connected);
+                int connectedBots = m_bots.Count(b => b.ConnectionState == ConnectionState.Connected);
 
                 if (connectedBots > 0)
                 {
@@ -429,9 +438,9 @@ namespace pCampBot
             foreach (object o in Enum.GetValues(typeof(ConnectionState)))
                 totals[(ConnectionState)o] = 0;
 
-            lock (m_lBot)
+            lock (m_bots)
             {
-                foreach (Bot pb in m_lBot)
+                foreach (Bot pb in m_bots)
                 {
                     Simulator currentSim = pb.Client.Network.CurrentSim;
                     totals[pb.ConnectionState]++;
-- 
cgit v1.1


From 079cd4e94f820bad83fcbf8373ef268ecb82d9a6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 19 Aug 2013 21:17:59 +0100
Subject: refactor: restructure pCampbot multi-bot connection code.

---
 OpenSim/Tools/pCampBot/BotManager.cs | 70 ++++++++++++++++++++++++++++++------
 1 file changed, 60 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 157c69c..2cbadef 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -98,6 +98,46 @@ 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_behaviourSwitches = new HashSet<string>();
+
+        /// <summary>
         /// Constructor Creates MainConsole.Instance to take commands and provide the place to write data
         /// </summary>
         public BotManager()
@@ -163,20 +203,26 @@ namespace pCampBot
         /// <param name="cs">The configuration for the bots to use</param>
         public void dobotStartup(int botcount, IConfig startupConfig)
         {
-            string firstName = startupConfig.GetString("firstname");
-            string lastNameStem = startupConfig.GetString("lastname");
-            string password = startupConfig.GetString("password");
-            string loginUri = startupConfig.GetString("loginuri");
-            string startLocation = startupConfig.GetString("start", "last");
-            int fromBotNumber = startupConfig.GetInt("from", 0);
-            string wearSetting = startupConfig.GetString("wear", "no");
+            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 startUri = ParseInputStartLocationToUri(startLocation);
+            m_startUri = ParseInputStartLocationToUri(startupConfig.GetString("start", "last"));
 
-            HashSet<string> behaviourSwitches = new HashSet<string>();
             Array.ForEach<string>(
-                startupConfig.GetString("behaviours", "p").Split(new char[] { ',' }), b => behaviourSwitches.Add(b));
+                startupConfig.GetString("behaviours", "p").Split(new char[] { ',' }), b => m_behaviourSwitches.Add(b));
+
+            ConnectBots(
+                botcount, m_firstName, m_lastNameStem, m_password, m_loginUri, m_startUri, m_fromBotNumber, m_wearSetting, m_behaviourSwitches);
+        }
 
+        private void ConnectBots(
+            int botcount, string firstName, string lastNameStem, string password, string loginUri, string startUri, int fromBotNumber, string wearSetting,
+            HashSet<string> behaviourSwitches)
+        {
             MainConsole.Instance.OutputFormat(
                 "[BOT MANAGER]: Starting {0} bots connecting to {1}, location {2}, named {3} {4}_<n>",
                 botcount,
@@ -194,7 +240,11 @@ namespace pCampBot
                 lock (m_bots)
                 {
                     if (DisconnectingBots)
+                    {
+                        MainConsole.Instance.Output(
+                            "[BOT MANAGER]: Aborting bot connection due to user-initiated disconnection");
                         break;
+                    }
 
                     string lastName = string.Format("{0}_{1}", lastNameStem, i + fromBotNumber);
 
-- 
cgit v1.1


From ea3f024b8a546608fce825d4aa9f165eaecfeed5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 19 Aug 2013 21:25:17 +0100
Subject: refactor: start bot connection thread within BotManager rather than
 externally

---
 OpenSim/Tools/pCampBot/BotManager.cs | 27 ++++++++++++++++++++++++++-
 OpenSim/Tools/pCampBot/pCampBot.cs   |  5 +----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 2cbadef..fe6048a 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -52,6 +52,11 @@ 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; }
@@ -219,7 +224,25 @@ namespace pCampBot
                 botcount, m_firstName, m_lastNameStem, m_password, m_loginUri, m_startUri, m_fromBotNumber, m_wearSetting, m_behaviourSwitches);
         }
 
-        private void ConnectBots(
+        private bool ConnectBots(
+            int botcount, string firstName, string lastNameStem, string password, string loginUri, string startUri, int fromBotNumber, string wearSetting,
+            HashSet<string> behaviourSwitches)
+        {
+            ConnectingBots = true;
+
+            Thread startBotThread 
+                = new Thread(
+                    o => ConnectBotsInternal(
+                        botcount, firstName, lastNameStem, password, loginUri, startUri, fromBotNumber, wearSetting,
+                        behaviourSwitches));
+
+            startBotThread.Name = "Bots connection thread";
+            startBotThread.Start();
+
+            return true;
+        }
+
+        private void ConnectBotsInternal(
             int botcount, string firstName, string lastNameStem, string password, string loginUri, string startUri, int fromBotNumber, string wearSetting,
             HashSet<string> behaviourSwitches)
         {
@@ -273,6 +296,8 @@ namespace pCampBot
                 // Stagger logins
                 Thread.Sleep(LoginDelay);
             }
+
+            ConnectingBots = false;
         }
 
         /// <summary>
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index b02f917..e58b130 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -95,10 +95,7 @@ namespace pCampBot
 
                 int botcount = commandLineConfig.GetInt("botcount", 1);
 
-                //startup specified number of bots.  1 is the default
-                Thread startBotThread = new Thread(o => bm.dobotStartup(botcount, commandLineConfig));
-                startBotThread.Name = "Initial start bots thread";
-                startBotThread.Start();
+                bm.dobotStartup(botcount, commandLineConfig);
 
                 while (true)
                 {
-- 
cgit v1.1


From 589b1a2eaf9058c3577b17ae76580a79ba855978 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 19 Aug 2013 23:50:18 +0100
Subject: Make it possible to reconnect pCampbots with the console command
 "connect [<n>]".

If no n is given then all available bots are connected
---
 OpenSim/Tools/pCampBot/Bot.cs        |  96 ++++++++++++++++++-------
 OpenSim/Tools/pCampBot/BotManager.cs | 136 +++++++++++++++++++++--------------
 OpenSim/Tools/pCampBot/pCampBot.cs   |   3 +-
 3 files changed, 155 insertions(+), 80 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index be7a5a1..f7af26e 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -158,8 +158,6 @@ namespace pCampBot
 
             behaviours.ForEach(b => b.Initialize(this));
 
-            Client = new GridClient();
-
             Random = new Random(Environment.TickCount);// We do stuff randomly here
             FirstName = firstName;
             LastName = lastName;
@@ -170,6 +168,59 @@ namespace pCampBot
 
             Manager = bm;
             Behaviours = behaviours;
+
+            // Only calling for use as a template.
+            CreateLibOmvClient();
+        }
+
+        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
@@ -192,7 +243,7 @@ namespace pCampBot
         /// <summary>
         /// Tells LibSecondLife to logout and disconnect.  Raises the disconnect events once it finishes.
         /// </summary>
-        public void shutdown()
+        public void Disconnect()
         {
             ConnectionState = ConnectionState.Disconnecting;
 
@@ -202,34 +253,27 @@ namespace pCampBot
             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_AGENT_UPDATES = false;
-            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;
 
+            // 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;
@@ -474,6 +518,8 @@ namespace pCampBot
 //                    || args.Reason == NetworkManager.DisconnectType.NetworkTimeout)
 //               && OnDisconnected != null)
 
+
+
            if (
                (args.Reason == NetworkManager.DisconnectType.ClientInitiated
                     || args.Reason == NetworkManager.DisconnectType.ServerInitiated
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index fe6048a..f40a84d 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -182,6 +182,12 @@ namespace pCampBot
                 "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"
@@ -206,7 +212,7 @@ 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 startupConfig)
+        public void CreateBots(int botcount, IConfig startupConfig)
         {
             m_firstName = startupConfig.GetString("firstname");
             m_lastNameStem = startupConfig.GetString("lastname");
@@ -220,39 +226,55 @@ namespace pCampBot
             Array.ForEach<string>(
                 startupConfig.GetString("behaviours", "p").Split(new char[] { ',' }), b => m_behaviourSwitches.Add(b));
 
-            ConnectBots(
-                botcount, m_firstName, m_lastNameStem, m_password, m_loginUri, m_startUri, m_fromBotNumber, m_wearSetting, m_behaviourSwitches);
+            for (int i = 0; i < botcount; i++)
+            {
+                lock (m_bots)
+                {
+                    string lastName = string.Format("{0}_{1}", m_lastNameStem, i + m_fromBotNumber);
+
+                    // 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 (m_behaviourSwitches.Contains("c"))
+                        behaviours.Add(new CrossBehaviour());
+
+                    if (m_behaviourSwitches.Contains("g"))
+                        behaviours.Add(new GrabbingBehaviour());
+
+                    if (m_behaviourSwitches.Contains("n"))
+                        behaviours.Add(new NoneBehaviour());
+
+                    if (m_behaviourSwitches.Contains("p"))
+                        behaviours.Add(new PhysicsBehaviour());
+        
+                    if (m_behaviourSwitches.Contains("t"))
+                        behaviours.Add(new TeleportBehaviour());
+
+                    CreateBot(this, behaviours, m_firstName, lastName, m_password, m_loginUri, m_startUri, m_wearSetting);
+                }
+            }
         }
 
-        private bool ConnectBots(
-            int botcount, string firstName, string lastNameStem, string password, string loginUri, string startUri, int fromBotNumber, string wearSetting,
-            HashSet<string> behaviourSwitches)
+        public void ConnectBots(int botcount)
         {
             ConnectingBots = true;
 
-            Thread startBotThread 
-                = new Thread(
-                    o => ConnectBotsInternal(
-                        botcount, firstName, lastNameStem, password, loginUri, startUri, fromBotNumber, wearSetting,
-                        behaviourSwitches));
-
-            startBotThread.Name = "Bots connection thread";
-            startBotThread.Start();
+            Thread connectBotThread = new Thread(o => ConnectBotsInternal(botcount));
 
-            return true;
+            connectBotThread.Name = "Bots connection thread";
+            connectBotThread.Start();
         }
 
-        private void ConnectBotsInternal(
-            int botcount, string firstName, string lastNameStem, string password, string loginUri, string startUri, int fromBotNumber, string wearSetting,
-            HashSet<string> behaviourSwitches)
+        private void ConnectBotsInternal(int botcount)
         {
             MainConsole.Instance.OutputFormat(
                 "[BOT MANAGER]: Starting {0} bots connecting to {1}, location {2}, named {3} {4}_<n>",
                 botcount,
-                loginUri,
-                startUri,
-                firstName,
-                lastNameStem);
+                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);
@@ -269,28 +291,7 @@ namespace pCampBot
                         break;
                     }
 
-                    string lastName = string.Format("{0}_{1}", lastNameStem, i + fromBotNumber);
-
-                    // 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("c"))
-                        behaviours.Add(new CrossBehaviour());
-
-                    if (behaviourSwitches.Contains("g"))
-                        behaviours.Add(new GrabbingBehaviour());
-
-                    if (behaviourSwitches.Contains("n"))
-                        behaviours.Add(new NoneBehaviour());
-
-                    if (behaviourSwitches.Contains("p"))
-                        behaviours.Add(new PhysicsBehaviour());
-        
-                    if (behaviourSwitches.Contains("t"))
-                        behaviours.Add(new TeleportBehaviour());
-
-                    StartBot(this, behaviours, firstName, lastName, password, loginUri, startUri, wearSetting);
+                    m_bots[i].Connect();
                 }
 
                 // Stagger logins
@@ -360,7 +361,7 @@ namespace pCampBot
 //        }
 
         /// <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>
@@ -370,12 +371,12 @@ namespace pCampBot
         /// <param name="loginUri">Login URI</param>
         /// <param name="startLocation">Location to start the bot.  Can be "last", "home" or a specific sim name.</param>
         /// <param name="wearSetting"></param>
-        public void StartBot(
+        public void CreateBot(
              BotManager bm, List<IBehaviour> behaviours,
              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, startLocation, loginUri);
@@ -387,12 +388,6 @@ namespace pCampBot
             pb.OnDisconnected += handlebotEvent;
 
             m_bots.Add(pb);
-
-            Thread pbThread = new Thread(pb.startup);
-            pbThread.Name = pb.Name;
-            pbThread.IsBackground = true;
-
-            pbThread.Start();
         }
 
         /// <summary>
@@ -427,6 +422,37 @@ namespace pCampBot
             return new LocalConsole("pCampbot");
         }
 
+        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 HandleDisconnect(string module, string[] cmd)
         {
             lock (m_bots)
@@ -461,10 +487,12 @@ namespace pCampBot
 
                     if (thisBot.ConnectionState == ConnectionState.Connected)
                     {
-                        Util.FireAndForget(o => thisBot.shutdown());
+                        Util.FireAndForget(o => thisBot.Disconnect());
                         disconnectedBots++;
                     }
                 }
+
+                DisconnectingBots = false;
             }
         }
 
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index e58b130..ada39ee 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -95,7 +95,8 @@ namespace pCampBot
 
                 int botcount = commandLineConfig.GetInt("botcount", 1);
 
-                bm.dobotStartup(botcount, commandLineConfig);
+                bm.CreateBots(botcount, commandLineConfig);
+                bm.ConnectBots(botcount);
 
                 while (true)
                 {
-- 
cgit v1.1


From a3dd7db4a341f34e0df5b7fa4bddda4049e50acd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 20 Aug 2013 00:08:47 +0100
Subject: Add -connect (-c) switch to pCampbot command line options.

Now, bots will only connect at startup if this switch is specified.
If it is not specified, then a separate "connect" command is required on the pCampbot command line
---
 OpenSim/Tools/pCampBot/pCampBot.cs | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index ada39ee..fc67398 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -94,9 +94,12 @@ namespace pCampBot
                 }
 
                 int botcount = commandLineConfig.GetInt("botcount", 1);
+                bool startConnected = commandLineConfig.Get("connect") != null;
 
                 bm.CreateBots(botcount, commandLineConfig);
-                bm.ConnectBots(botcount);
+
+                if (startConnected)
+                    bm.ConnectBots(botcount);
 
                 while (true)
                 {
@@ -117,6 +120,7 @@ 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");
@@ -143,20 +147,21 @@ namespace pCampBot
                 "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         optional start location for bots.  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\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"
-                    + "  -n, -botcount      optional number of bots to start (default: 1)\n"
-                    + "  -f, -from          optional starting number for login bot names, e.g. 25 will login Ima Bot_25, Ima Bot_26, etc.  (default: 0)"
-                    + "  -b, behaviours     behaviours for bots.  Comma separated, e.g. p,g.  Default is p\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)" +
-                    + "  -wear              optional folder from which to load appearance data, \"no\" if there is no such folder (default: no)\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");
         }
     }
-- 
cgit v1.1


From 56d1d67a34bbd3e597168ab9bfa43be6a34e580a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 20 Aug 2013 17:01:12 +0100
Subject: Add pCampbot console commands to sit all bots on ground and stand all
 bots

---
 OpenSim/Tools/pCampBot/Bot.cs        | 24 ++++++++++++
 OpenSim/Tools/pCampBot/BotManager.cs | 74 +++++++++++++-----------------------
 2 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index f7af26e..27c086e 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -318,6 +318,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;
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index f40a84d..f5b5256 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -195,14 +195,18 @@ namespace pCampBot
                 HandleDisconnect);
 
             m_console.Commands.AddCommand(
-                "bot", false, "show regions", "show regions", "Show regions known to bots", HandleShowRegions);
+                "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, "show bots", "show bots", "Shows the status of all bots", HandleShowStatus);
+                "bot", false, "show regions", "show regions", "Show regions known to bots", HandleShowRegions);
 
-//            m_console.Commands.AddCommand("bot", false, "add bots",
-//                    "add bots <number>",
-//                    "Add more bots", HandleAddBots);
+            m_console.Commands.AddCommand(
+                "bot", false, "show bots", "show bots", "Shows the status of all bots", HandleShowBotsStatus);
 
             m_bots = new List<Bot>();
         }
@@ -340,26 +344,6 @@ namespace pCampBot
             return string.Format("uri:{0}&{1}&{2}&{3}", regionName, startPos.X, startPos.Y, startPos.Z);
         }
 
-//        /// <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>
         /// This creates a bot but does not start it.
         /// </summary>
@@ -496,6 +480,22 @@ namespace pCampBot
             }
         }
 
+        private void HandleSit(string module, string[] cmd)
+        {
+            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)
         {
             lock (m_bots)
@@ -529,7 +529,7 @@ namespace pCampBot
             }
         }
 
-        private void HandleShowStatus(string module, string[] cmd)
+        private void HandleShowBotsStatus(string module, string[] cmd)
         {
             ConsoleDisplayTable cdt = new ConsoleDisplayTable();
             cdt.AddColumn("Name", 30);
@@ -563,26 +563,6 @@ namespace pCampBot
             MainConsole.Instance.Output(cdl.ToString());
         }
 
-        /*
-        private void HandleQuit(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);
-        }
-        */
-//
-//        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)
         {
             lock (RegionsKnown)
@@ -602,4 +582,4 @@ namespace pCampBot
             }
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1


From e384ff604e081970ae9351431115a87e82345b18 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 20 Aug 2013 17:43:02 +0100
Subject: Add experimental "sit user name" and "stand user name" console
 commands in SitStandCommandsModule.

"sit user name" will currently only sit the given avatar on prims which have a sit target set and are not already sat upon.
Chiefly for debug purposes.
---
 .../Avatar/SitStand/SitStandCommandsModule.cs      | 180 +++++++++++++++++++++
 1 file changed, 180 insertions(+)
 create mode 100644 OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs

diff --git a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
new file mode 100644
index 0000000..874723c
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.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.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Monitoring;
+using OpenSim.Region.ClientStack.LindenUDP;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes.Animation;
+using OpenSim.Services.Interfaces;
+
+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 <first-name> <last-name>",
+                "Sit the named user on an unoccupied object with a sit target.\n"
+                    + "If there are no such objects then nothing happens",
+                HandleSitUserNameCommand);
+
+            scene.AddCommand(
+                "Users", this, "stand user name",
+                "stand user name <first-name> <last-name>",
+                "Stand the named user.",
+                HandleStandUserNameCommand);
+        }
+
+        protected 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 <first-name> <last-name>");
+                return;
+            }
+
+            string firstName = cmd[3];
+            string lastName = cmd[4];
+
+            ScenePresence sp = m_scene.GetScenePresence(firstName, lastName);
+    
+            if (sp == null || sp.IsChildAgent)
+                return;
+
+            SceneObjectPart sitPart = null;
+            List<SceneObjectGroup> sceneObjects = m_scene.GetSceneObjectGroups();
+
+            foreach (SceneObjectGroup sceneObject in sceneObjects)
+            {
+                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}",
+                    sp.Name, m_scene.Name);
+            }
+        }
+
+        protected 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 <first-name> <last-name>");
+                return;
+            }
+
+            string firstName = cmd[3];
+            string lastName = cmd[4];
+
+            ScenePresence sp = m_scene.GetScenePresence(firstName, lastName);
+    
+            if (sp == null || sp.IsChildAgent)
+                return;
+
+            sp.StandUp();
+        }
+    }
+}
\ No newline at end of file
-- 
cgit v1.1


From 43940f656210d5e572ef05bd223b3959513ee687 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 20 Aug 2013 18:13:40 +0100
Subject: Add --regex options to "sit user name" and "stand user name" console
 commands to sit/stand many avatars at once.

Currently, first name and last name are input separate but are concatenated with a space in the middle to form a regex.
So to sit all bots with the first name "ima", for instance, the command is "sit user name --regex ima .*"
---
 .../Avatar/SitStand/SitStandCommandsModule.cs      | 131 +++++++++++++--------
 1 file changed, 81 insertions(+), 50 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
index 874723c..e9cb213 100644
--- a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
@@ -30,18 +30,16 @@ 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.Framework.Monitoring;
-using OpenSim.Region.ClientStack.LindenUDP;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes.Animation;
-using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.OptionalModules.Avatar.SitStand
 {
@@ -92,89 +90,122 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
 
             scene.AddCommand(
                 "Users", this, "sit user name",
-                "sit user name <first-name> <last-name>",
-                "Sit the named user on an unoccupied object with a sit target.\n"
-                    + "If there are no such objects then nothing happens",
+                "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 <first-name> <last-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);
         }
 
-        protected void HandleSitUserNameCommand(string module, string[] cmd)
+        private void HandleSitUserNameCommand(string module, string[] cmd)
         {
             if (MainConsole.Instance.ConsoleScene != m_scene && MainConsole.Instance.ConsoleScene != null)
                 return;
 
-            if (cmd.Length != 5)
+            if (cmd.Length < 5)
             {
-                MainConsole.Instance.Output("Usage: sit user name <first-name> <last-name>");
+                MainConsole.Instance.Output("Usage: sit user name [--regex] <first-name> <last-name>");
                 return;
             }
 
-            string firstName = cmd[3];
-            string lastName = cmd[4];
+            List<ScenePresence> scenePresences = GetScenePresences(cmd);
 
-            ScenePresence sp = m_scene.GetScenePresence(firstName, lastName);
-    
-            if (sp == null || sp.IsChildAgent)
-                return;
-
-            SceneObjectPart sitPart = null;
-            List<SceneObjectGroup> sceneObjects = m_scene.GetSceneObjectGroups();
-
-            foreach (SceneObjectGroup sceneObject in sceneObjects)
+            foreach (ScenePresence sp in scenePresences)
             {
-                foreach (SceneObjectPart part in sceneObject.Parts)
+                SceneObjectPart sitPart = null;
+                List<SceneObjectGroup> sceneObjects = m_scene.GetSceneObjectGroups();
+
+                foreach (SceneObjectGroup sceneObject in sceneObjects)
                 {
-                    if (part.IsSitTargetSet && part.SitTargetAvatar == UUID.Zero)
+                    foreach (SceneObjectPart part in sceneObject.Parts)
                     {
-                        sitPart = part;
-                        break;
+                        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);
+                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}",
-                    sp.Name, 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;
+                }
             }
         }
 
-        protected void HandleStandUserNameCommand(string module, string[] cmd)
+        private void HandleStandUserNameCommand(string module, string[] cmd)
         {
             if (MainConsole.Instance.ConsoleScene != m_scene && MainConsole.Instance.ConsoleScene != null)
                 return;
 
-            if (cmd.Length != 5)
+            if (cmd.Length < 5)
             {
-                MainConsole.Instance.Output("Usage: stand user name <first-name> <last-name>");
+                MainConsole.Instance.Output("Usage: stand user name [--regex] <first-name> <last-name>");
                 return;
             }
 
-            string firstName = cmd[3];
-            string lastName = cmd[4];
+            List<ScenePresence> scenePresences = GetScenePresences(cmd);
 
-            ScenePresence sp = m_scene.GetScenePresence(firstName, lastName);
-    
-            if (sp == null || sp.IsChildAgent)
-                return;
+            foreach (ScenePresence sp in scenePresences)
+            {
+                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);
+            }
 
-            sp.StandUp();
+            return scenePresencesMatched;
         }
     }
 }
\ No newline at end of file
-- 
cgit v1.1


From a3e1b278a1d82e231f85bf0bf181ed79bbdaa7f2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 20 Aug 2013 18:41:09 +0100
Subject: Add pCampbot "show bot" console command to show more detailed
 information on a particular bot (e.g. what sims they are connected to)

---
 OpenSim/Tools/pCampBot/Bot.cs        | 11 +++++++-
 OpenSim/Tools/pCampBot/BotManager.cs | 49 +++++++++++++++++++++++++++++++++++-
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index 27c086e..d418288 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -97,11 +97,20 @@ 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 ConnectionsCount
+        public int SimulatorsCount
         {
             get
             {
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index f5b5256..303c8dd 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -208,6 +208,10 @@ namespace pCampBot
             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 <first-name> <last-name>", 
+                "Shows the detailed status and settings of a particular bot.", HandleShowBotStatus);
+
             m_bots = new List<Bot>();
         }
 
@@ -549,7 +553,7 @@ namespace pCampBot
                     totals[pb.ConnectionState]++;
 
                     cdt.AddRow(
-                        pb.Name, currentSim != null ? currentSim.Name : "(none)", pb.ConnectionState, pb.ConnectionsCount);
+                        pb.Name, currentSim != null ? currentSim.Name : "(none)", pb.ConnectionState, pb.SimulatorsCount);
                 }
             }
 
@@ -563,6 +567,49 @@ namespace pCampBot
             MainConsole.Instance.Output(cdl.ToString());
         }
 
+        private void HandleShowBotStatus(string module, string[] cmd)
+        {
+            if (cmd.Length != 4)
+            {
+                MainConsole.Instance.Output("Usage: show bot <first-name> <last-name>");
+                return;
+            }
+
+            string name = string.Format("{0} {1}", cmd[2], cmd[3]);
+
+            Bot bot;
+
+            lock (m_bots)
+                bot = m_bots.Find(b => b.Name == name);
+
+            if (bot == null)
+            {
+                MainConsole.Instance.Output("No bot found with name {0}", name);
+                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));
+
+            MainConsole.Instance.Output(cdl.ToString());
+
+            MainConsole.Instance.Output("Settings");
+
+            ConsoleDisplayList statusCdl = new ConsoleDisplayList();
+            GridClient botClient = bot.Client;
+            statusCdl.AddRow("SEND_AGENT_UPDATES", botClient.Settings.SEND_AGENT_UPDATES);
+
+            MainConsole.Instance.Output(statusCdl.ToString());
+        }
+
         internal void Grid_GridRegion(object o, GridRegionEventArgs args)
         {
             lock (RegionsKnown)
-- 
cgit v1.1


From 4a81465b91b6506200157f8679ae9192cd43b45f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 20 Aug 2013 18:47:52 +0100
Subject: Fix build break from last commit a3e1b27 on mono 2.4.3

Looks like this level of mono doesn't have a string.Join() which will take a list rather than an array (or some implicit conversion isn't happening)
---
 OpenSim/Tools/pCampBot/BotManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 303c8dd..13912ae 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -597,7 +597,7 @@ namespace pCampBot
 
             List<Simulator> connectedSimulators = bot.Simulators;
             List<string> simulatorNames = connectedSimulators.ConvertAll<string>(cs => cs.Name);
-            cdl.AddRow("Connections", string.Join(", ", simulatorNames));
+            cdl.AddRow("Connections", string.Join(", ", simulatorNames.ToArray()));
 
             MainConsole.Instance.Output(cdl.ToString());
 
-- 
cgit v1.1


From a6af561660759ef7625d88213b7d43b76e687280 Mon Sep 17 00:00:00 2001
From: teravus
Date: Tue, 20 Aug 2013 21:09:17 -0500
Subject: * Fix some threading issues in BulletXNA (the managed bullet
 library), this should better allow you to run it in multiple region scenarios
 (but why would you really want to do that?)  Source in OpenSimLibs. * Fixed a
 null ref during shutdown.

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs |   5 ++-
 OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs   |  46 ++++++++++++++++++++-
 bin/BulletXNA.dll                                  | Bin 610304 -> 618496 bytes
 bin/BulletXNA.pdb                                  | Bin 1963520 -> 1889792 bytes
 4 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index eb3af42..c9ff4f3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4089,7 +4089,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();
             }
@@ -4413,7 +4413,8 @@ namespace OpenSim.Region.Framework.Scenes
         public void RemoveFromPhysics()
         {
             ParentGroup.Scene.EventManager.TriggerObjectRemovedFromPhysicalScene(this);
-            ParentGroup.Scene.PhysicsScene.RemovePrim(PhysActor);
+            if (ParentGroup.Scene.PhysicsScene != null)
+                ParentGroup.Scene.PhysicsScene.RemovePrim(PhysActor);
             PhysActor = null;
         }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
index 6db5f5e..2a820be 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
@@ -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
@@ -1914,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);
diff --git a/bin/BulletXNA.dll b/bin/BulletXNA.dll
index bfaac4f..b3ddc32 100644
Binary files a/bin/BulletXNA.dll and b/bin/BulletXNA.dll differ
diff --git a/bin/BulletXNA.pdb b/bin/BulletXNA.pdb
index ecab22f..ed3baad 100644
Binary files a/bin/BulletXNA.pdb and b/bin/BulletXNA.pdb differ
-- 
cgit v1.1


From 1f39a763a5186c7c51e10b5b055394672cc6c54e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 21 Aug 2013 21:35:03 +0100
Subject: Don't allow users to attempt to sit on objects in a child region
 without going to that region first.

If this is attempted, they get a "Try moving closer.  Can't sit on object because it is not in the same region as you." message instead, which is the same as current ll grid.
Sitting on ground is okay, since viewer navigates avatar to required region first before sitting.
---
 .../Region/ClientStack/Linden/UDP/LLClientView.cs    | 20 ++++++++++++++++++++
 OpenSim/Region/Framework/Scenes/ScenePresence.cs     |  9 +++++++++
 2 files changed, 29 insertions(+)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index f0d8181..8c51077 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -6651,6 +6651,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 }
                 #endregion
 
+                if (SceneAgent.IsChildAgent)
+                {
+                    SendCantSitBecauseChildAgentResponse();
+                    return true;
+                }
+
                 AgentRequestSit handlerAgentRequestSit = OnAgentRequestSit;
 
                 if (handlerAgentRequestSit != null)
@@ -6675,6 +6681,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 }
                 #endregion
 
+                if (SceneAgent.IsChildAgent)
+                {
+                    SendCantSitBecauseChildAgentResponse();
+                    return true;
+                }
+
                 AgentSit handlerAgentSit = OnAgentSit;
                 if (handlerAgentSit != null)
                 {
@@ -6684,6 +6696,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;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 37e5286..4fc207a 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2297,6 +2297,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void HandleAgentRequestSit(IClientAPI remoteClient, UUID agentID, UUID targetID, Vector3 offset)
         {
+            if (IsChildAgent)
+                return;
+
             if (ParentID != 0)
             {
                 if (ParentPart.UUID == targetID)
@@ -2523,6 +2526,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)
@@ -2583,6 +2589,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         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");
-- 
cgit v1.1


From 3d9b73c47a15cf00150ac80570fea88de8cecbdf Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 21 Aug 2013 23:19:31 +0100
Subject: Implement ability for hg logins to try fallback regions just like
 local logins.

These would be specified in the [GridService] section of Robust.HG.ini, which already lists these in the example text.
Untested patch so that Neb can easily pull in for testing, though shouldn't disrupt existing hg logins since fallback processing is a bit of code stuck on the end of the login sequence.
---
 .../Services/HypergridService/GatekeeperService.cs | 44 +++++++++++++++++++---
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 0a3e70b..cbe1af0 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -326,7 +326,7 @@ namespace OpenSim.Services.HypergridService
                 return false;
             }
 
-            m_log.DebugFormat("[GATEKEEPER SERVICE]: User is OK");
+            m_log.DebugFormat("[GATEKEEPER SERVICE]: User {0} is ok", aCircuit.Name);
 
             bool isFirstLogin = false;
             //
@@ -345,7 +345,7 @@ 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)
@@ -376,7 +376,8 @@ 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
@@ -410,8 +411,41 @@ 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);
-            return m_SimulationService.CreateAgent(destination, aCircuit, (uint)loginFlag, out reason);
+            m_log.DebugFormat("[GATEKEEPER SERVICE]: Launching {0} {1}", aCircuit.Name, loginFlag);
+
+            bool success = m_SimulationService.CreateAgent(destination, aCircuit, (uint)loginFlag, out reason);
+
+            if (!success)
+            {
+                List<GridRegion> fallbackRegions = m_GridService.GetFallbackRegions(account.ScopeID, destination.RegionLocX, destination.RegionLocY);
+                if (fallbackRegions != null)
+                {
+                    // Try the fallback regions
+                    m_log.DebugFormat(
+                        "[GATEKEEPER SERVICE]: Could not successfully log agent {0} into {1}.  Trying fallback regions.", 
+                        aCircuit.Name, destination.RegionName);
+
+                    foreach (GridRegion fallbackRegion in fallbackRegions)
+                    {
+                        m_log.DebugFormat(
+                            "[GATEKEEPER SERVICE]: Trying fallback region {0} for {1}", 
+                            fallbackRegion.RegionName, aCircuit.Name);
+
+                        success = m_SimulationService.CreateAgent(fallbackRegion, aCircuit, (uint)loginFlag, out reason);
+
+                        if (success)
+                            break;
+                    }
+                }
+                else
+                {
+                    m_log.DebugFormat(
+                        "[GATEKEEPER SERVICE]: Could not successfully log agent {0} into {1} and no fallback regions to try.", 
+                        aCircuit.Name, destination.RegionName);
+                }
+            }
+
+            return success;
         }
 
         protected bool Authenticate(AgentCircuitData aCircuit)
-- 
cgit v1.1


From bcb8605f8428a9009a2badf9c9eed06d9f59962c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 22 Aug 2013 01:20:01 +0100
Subject: Revert "Implement ability for hg logins to try fallback regions just
 like local logins."

This approach does not work - it is taking place too far down the login process where really the region checking
could only be done when the hg map tiles are linked on the main map (messy and probably impossible) or possibly
when the final destination is fetched at the very first stage of teleport (which couldn't be done without a protocol
change to pass the agentID as well as the requested regionID)

This reverts commit 3d9b73c47a15cf00150ac80570fea88de8cecbdf.
---
 .../Services/HypergridService/GatekeeperService.cs | 44 +++-------------------
 1 file changed, 5 insertions(+), 39 deletions(-)

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index cbe1af0..0a3e70b 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -326,7 +326,7 @@ namespace OpenSim.Services.HypergridService
                 return false;
             }
 
-            m_log.DebugFormat("[GATEKEEPER SERVICE]: User {0} is ok", aCircuit.Name);
+            m_log.DebugFormat("[GATEKEEPER SERVICE]: User is OK");
 
             bool isFirstLogin = false;
             //
@@ -345,7 +345,7 @@ namespace OpenSim.Services.HypergridService
                         aCircuit.firstname, aCircuit.lastname);
                     return false;
                 }
-                m_log.DebugFormat("[GATEKEEPER SERVICE]: Login presence {0} is ok", aCircuit.Name);
+                m_log.DebugFormat("[GATEKEEPER SERVICE]: Login presence ok");
 
                 // Also login foreigners with GridUser service
                 if (m_GridUserService != null && account == null)
@@ -376,8 +376,7 @@ namespace OpenSim.Services.HypergridService
                 reason = "Destination region not found";
                 return false;
             }
-            m_log.DebugFormat(
-                "[GATEKEEPER SERVICE]: Destination {0} is ok for {1}", destination.RegionName, aCircuit.Name);
+            m_log.DebugFormat("[GATEKEEPER SERVICE]: destination ok: {0}", destination.RegionName);
 
             //
             // Adjust the visible name
@@ -411,41 +410,8 @@ namespace OpenSim.Services.HypergridService
             // Preserve our TeleportFlags we have gathered so-far
             loginFlag |= (Constants.TeleportFlags) aCircuit.teleportFlags;
 
-            m_log.DebugFormat("[GATEKEEPER SERVICE]: Launching {0} {1}", aCircuit.Name, loginFlag);
-
-            bool success = m_SimulationService.CreateAgent(destination, aCircuit, (uint)loginFlag, out reason);
-
-            if (!success)
-            {
-                List<GridRegion> fallbackRegions = m_GridService.GetFallbackRegions(account.ScopeID, destination.RegionLocX, destination.RegionLocY);
-                if (fallbackRegions != null)
-                {
-                    // Try the fallback regions
-                    m_log.DebugFormat(
-                        "[GATEKEEPER SERVICE]: Could not successfully log agent {0} into {1}.  Trying fallback regions.", 
-                        aCircuit.Name, destination.RegionName);
-
-                    foreach (GridRegion fallbackRegion in fallbackRegions)
-                    {
-                        m_log.DebugFormat(
-                            "[GATEKEEPER SERVICE]: Trying fallback region {0} for {1}", 
-                            fallbackRegion.RegionName, aCircuit.Name);
-
-                        success = m_SimulationService.CreateAgent(fallbackRegion, aCircuit, (uint)loginFlag, out reason);
-
-                        if (success)
-                            break;
-                    }
-                }
-                else
-                {
-                    m_log.DebugFormat(
-                        "[GATEKEEPER SERVICE]: Could not successfully log agent {0} into {1} and no fallback regions to try.", 
-                        aCircuit.Name, destination.RegionName);
-                }
-            }
-
-            return success;
+            m_log.DebugFormat("[GATEKEEPER SERVICE]: launching agent {0}", loginFlag);
+            return m_SimulationService.CreateAgent(destination, aCircuit, (uint)loginFlag, out reason);
         }
 
         protected bool Authenticate(AgentCircuitData aCircuit)
-- 
cgit v1.1


From 689cf2d3670ab4f9493acd5ef5adec4f446a4a47 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 22 Aug 2013 01:24:55 +0100
Subject: minor: Make logging in GatekeeperService.LoginAgent() a bit more
 detailed so that we can distinguish between simultaneous logins

---
 OpenSim/Services/HypergridService/GatekeeperService.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 0a3e70b..e10c4cb 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -326,7 +326,7 @@ namespace OpenSim.Services.HypergridService
                 return false;
             }
 
-            m_log.DebugFormat("[GATEKEEPER SERVICE]: User is OK");
+            m_log.DebugFormat("[GATEKEEPER SERVICE]: User {0} is ok", aCircuit.Name);
 
             bool isFirstLogin = false;
             //
@@ -345,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)
@@ -376,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
@@ -410,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);
         }
 
-- 
cgit v1.1


From 832c35d4d5288de0f976e40ede1c8f2ad7df4bcf Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 22 Aug 2013 20:05:57 +0100
Subject: Stop "sit user name" and "stand user name" console commands from
 trying to sit/stand avatars already sitting/standing

---
 .../OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
index e9cb213..4a591cf 100644
--- a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
@@ -119,6 +119,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
 
             foreach (ScenePresence sp in scenePresences)
             {
+                if (sp.SitGround || sp.IsSatOnObject)
+                    continue;
+
                 SceneObjectPart sitPart = null;
                 List<SceneObjectGroup> sceneObjects = m_scene.GetSceneObjectGroups();
 
@@ -169,8 +172,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
 
             foreach (ScenePresence sp in scenePresences)
             {
-                MainConsole.Instance.OutputFormat("Standing {0} in {1}", sp.Name, m_scene.Name);
-                sp.StandUp();
+                if (sp.SitGround || sp.IsSatOnObject)
+                {
+                    MainConsole.Instance.OutputFormat("Standing {0} in {1}", sp.Name, m_scene.Name);
+                    sp.StandUp();
+                }
             }
         }
 
-- 
cgit v1.1


From 66a7dc3a0de599068ea257cc2cefbbe4b95599c7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 22 Aug 2013 20:12:14 +0100
Subject: In pCampbot, don't try and reconnect bots that are already connected
 on console "connect" command

---
 OpenSim/Tools/pCampBot/BotManager.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 13912ae..245c460 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -299,7 +299,8 @@ namespace pCampBot
                         break;
                     }
 
-                    m_bots[i].Connect();
+                    if (m_bots[i].ConnectionState == ConnectionState.Disconnected)
+                        m_bots[i].Connect();
                 }
 
                 // Stagger logins
-- 
cgit v1.1


From 416bbe9583c77e2b1087b375d29ce1ace9c4b050 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 22 Aug 2013 22:44:43 +0100
Subject: Stop error messages being misleadingly generated when on client
 connection activity timeout, a root connection triggers a CloseAgent to a
 neighbour region which has already closed the agent due to inactivity.

Also separates out log messages to distinguish between close not finding an agent and wrong auth token, and downgrades former to debug and latter to warn
---
 OpenSim/Region/Framework/Scenes/Scene.cs | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b58e7c4..cb12d65 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4416,10 +4416,27 @@ namespace OpenSim.Region.Framework.Scenes
 
             // Check that the auth_token is valid
             AgentCircuitData acd = AuthenticateHandler.GetAgentCircuitData(agentID);
-            if (acd != null && acd.SessionID.ToString() == auth_token)
+
+            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.ErrorFormat("[SCENE]: Request to close agent {0} with invalid authorization token {1}", agentID, auth_token);
+            {
+                m_log.WarnFormat(
+                    "[SCENE]: Request to close agent {0} with invalid authorization token {1} in {2}", 
+                    agentID, auth_token, Name);
+            }
+
             return false;
         }
 
-- 
cgit v1.1


From beb9d966f9efb571b3d6635ba2500b6b0e685fc0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 22 Aug 2013 22:49:23 +0100
Subject: Stop "handle sit user name" command from trying to sit avatars on
 objects which have sit positions but are attachments

---
 .../Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
index 4a591cf..5a6b284 100644
--- a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
@@ -127,6 +127,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
 
                 foreach (SceneObjectGroup sceneObject in sceneObjects)
                 {
+                    if (sceneObject.IsAttachment)
+                        continue;
+
                     foreach (SceneObjectPart part in sceneObject.Parts)
                     {
                         if (part.IsSitTargetSet && part.SitTargetAvatar == UUID.Zero)
-- 
cgit v1.1


From 51c7fb1969f4850750de4b37827e5e2e9d85f3e0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 22 Aug 2013 23:11:05 +0100
Subject: Add "set bots" command to make it possible to set SEND_AGENT_UPDATES
 on all bots whilst pCampbot is running

---
 OpenSim/Tools/pCampBot/BotManager.cs | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 245c460..c335a6e 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -203,6 +203,9 @@ namespace pCampBot
                 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(
@@ -519,6 +522,30 @@ namespace pCampBot
             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)
         {
             string outputFormat = "{0,-30}  {1, -20}  {2, -5}  {3, -5}";
-- 
cgit v1.1


From 70f89ae65b09e9c2f0dc63cb416fea4cceb7dd13 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 22 Aug 2013 23:43:33 +0100
Subject: Make it possible to adjust the pCampbot login delay via the
 [BotManager] LoginDelay parameter of pCampbot.ini

---
 OpenSim/Tools/pCampBot/pCampBot.cs | 7 +++++++
 bin/pCampbot.ini.example           | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index fc67398..aee5864 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -82,6 +82,13 @@ namespace pCampBot
 
                     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)
diff --git a/bin/pCampbot.ini.example b/bin/pCampbot.ini.example
index f44feae..2952bb0 100644
--- a/bin/pCampbot.ini.example
+++ b/bin/pCampbot.ini.example
@@ -1,6 +1,10 @@
 ; 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 
-- 
cgit v1.1


From 13556cf1296d3c928d6eb286a6a1c9058c9ab5e7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 22 Aug 2013 23:49:19 +0100
Subject: Fix a further bug in pCampbot connect where ignoring already
 connected bots was wrongly counted as a connect

Also, only sleep when we actually perform a connection
---
 OpenSim/Tools/pCampBot/BotManager.cs | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index c335a6e..50a77ed 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -277,11 +277,11 @@ namespace pCampBot
             connectBotThread.Start();
         }
 
-        private void ConnectBotsInternal(int botcount)
+        private void ConnectBotsInternal(int botCount)
         {
             MainConsole.Instance.OutputFormat(
                 "[BOT MANAGER]: Starting {0} bots connecting to {1}, location {2}, named {3} {4}_<n>",
-                botcount,
+                botCount,
                 m_loginUri,
                 m_startUri,
                 m_firstName,
@@ -291,7 +291,9 @@ namespace pCampBot
             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++)
             {
                 lock (m_bots)
                 {
@@ -303,11 +305,17 @@ namespace pCampBot
                     }
 
                     if (m_bots[i].ConnectionState == ConnectionState.Disconnected)
+                    {
                         m_bots[i].Connect();
-                }
+                        connectedBots++;
 
-                // Stagger logins
-                Thread.Sleep(LoginDelay);
+                        if (connectedBots >= botCount)
+                            break;
+
+                        // Stagger logins
+                        Thread.Sleep(LoginDelay);
+                    }
+                }
             }
 
             ConnectingBots = false;
-- 
cgit v1.1


From a0c99a7dccbc625fc2c721da480521019260fc7b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Aug 2013 00:03:47 +0100
Subject: minor: remove mono compiler warning from LLClientView

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 8c51077..1b091bf 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -12602,7 +12602,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             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
@@ -12610,15 +12609,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;
-
                 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);
-- 
cgit v1.1


From a9f9b0da9d6c42aaa0c28c78c27f078f1a80c874 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Aug 2013 00:13:31 +0100
Subject: minor: Correct typo on "debug stats record start" message

---
 OpenSim/Framework/Monitoring/StatsLogger.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Monitoring/StatsLogger.cs b/OpenSim/Framework/Monitoring/StatsLogger.cs
index fa2e1b6..1e4fa11 100644
--- a/OpenSim/Framework/Monitoring/StatsLogger.cs
+++ b/OpenSim/Framework/Monitoring/StatsLogger.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Framework.Monitoring
             if (cmd[3] == "start")
             {
                 Start();
-                con.OutputFormat("Now recording all stats very {0}ms to file", m_statsLogIntervalMs);
+                con.OutputFormat("Now recording all stats to file every {0}ms", m_statsLogIntervalMs);
             }
             else if (cmd[3] == "stop")
             {
-- 
cgit v1.1


From 065c5839b5fb8ddf8a839026934b93cea8aba068 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Aug 2013 00:49:13 +0100
Subject: Refactor: merge SceneGraph.AddScenePresence() into
 CreateAndAddChildScenePresence() since the former was only ever called from
 the latter

This allows us to remove dead code relating to adding root agents directly to the scenegraph, which never happens.
---
 OpenSim/Region/Framework/Scenes/SceneGraph.cs | 34 +++++----------------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index bb7ae7f..0a5bfd2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -561,39 +561,15 @@ 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;
 
             lock (m_presenceLock)
             {
+                m_numChildAgents++;
+
                 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap);
                 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray);
 
@@ -604,7 +580,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;
@@ -616,6 +592,8 @@ namespace OpenSim.Region.Framework.Scenes
                 m_scenePresenceMap = newmap;
                 m_scenePresenceArray = newlist;
             }
+
+            return presence;
         }
 
         /// <summary>
-- 
cgit v1.1


From 61c20bd06a37bc4a8a264cdd66afc13ea3a43b79 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Aug 2013 00:53:42 +0100
Subject: Remove old and unused ScenePresence.RestoreInCurrentScene()

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4fc207a..b4e8f09 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3243,11 +3243,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);
-- 
cgit v1.1


From 2be786709badc9913f348932e75d3481d445caf8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Aug 2013 01:03:27 +0100
Subject: Make it possible for the "deregister region id" command to accept
 more than one id

---
 OpenSim/Services/GridService/GridService.cs | 51 +++++++++++++++--------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index daebf8b..59b150b 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);
@@ -526,37 +526,40 @@ 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;
+                }
+
+                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);
+                }
             }
 
             return;
-- 
cgit v1.1


From 04f4dd3dc7da5657ce3f792ef6d5f9191a7281f7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Aug 2013 01:04:03 +0100
Subject: remove redundant return at end of HandleDeregisterRegion()

---
 OpenSim/Services/GridService/GridService.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 59b150b..a1485c8 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -561,8 +561,6 @@ namespace OpenSim.Services.GridService
                     MainConsole.Instance.OutputFormat("Error deregistering {0} {1}", region.RegionName, regionUuid);
                 }
             }
-
-            return;
         }
 
         private void HandleShowRegions(string module, string[] cmd)
-- 
cgit v1.1


From 050617ae0ec13075db36449e8e5a4616c8bcd96e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Aug 2013 01:13:19 +0100
Subject: Make pCampbot "show bot" command take the bot number instead of the
 full bot name

Shorter and can do this because bot names are uniform
---
 OpenSim/Tools/pCampBot/BotManager.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 50a77ed..5c3835b 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -212,7 +212,7 @@ namespace pCampBot
                 "bot", false, "show bots", "show bots", "Shows the status of all bots", HandleShowBotsStatus);
 
             m_console.Commands.AddCommand(
-                "bot", false, "show bot", "show bot <first-name> <last-name>", 
+                "bot", false, "show bot", "show bot <n>", 
                 "Shows the detailed status and settings of a particular bot.", HandleShowBotStatus);
 
             m_bots = new List<Bot>();
@@ -605,13 +605,18 @@ namespace pCampBot
 
         private void HandleShowBotStatus(string module, string[] cmd)
         {
-            if (cmd.Length != 4)
+            if (cmd.Length != 3)
             {
-                MainConsole.Instance.Output("Usage: show bot <first-name> <last-name>");
+                MainConsole.Instance.Output("Usage: show bot <n>");
                 return;
             }
 
-            string name = string.Format("{0} {1}", cmd[2], cmd[3]);
+            int botNumber;
+
+            if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, cmd[2], out botNumber))
+                return;
+
+            string name = string.Format("{0} {1}_{2}", m_firstName, m_lastNameStem, botNumber);
 
             Bot bot;
 
-- 
cgit v1.1


From 0fbfef964928300df3cf4144d39dff2490b6a4e4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Aug 2013 01:21:03 +0100
Subject: minor: shortern warning messages in EntityTransferModule when
 UpdateAgent() fails

---
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 17ebc83..8950516 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -832,8 +832,8 @@ 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);
+                    "[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;
@@ -1053,8 +1053,8 @@ 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);
+                    "[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;
-- 
cgit v1.1


From 1a623bb266e78c9dc2648038de7b67d81b5a417e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Aug 2013 20:58:22 +0100
Subject: Rename pCampbot.ini -> pCampBot.ini (and example file) to be
 consistent with other capitalizations of pCampBot

---
 OpenSim/Tools/pCampBot/pCampBot.cs |  2 +-
 bin/pCampBot.ini.example           | 19 +++++++++++++++++++
 bin/pCampbot.ini.example           | 19 -------------------
 3 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 bin/pCampBot.ini.example
 delete mode 100644 bin/pCampbot.ini.example

diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index aee5864..781bb00 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -51,7 +51,7 @@ namespace pCampBot
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public const string ConfigFileName = "pCampbot.ini";
+        public const string ConfigFileName = "pCampBot.ini";
 
         [STAThread]
         public static void Main(string[] args)
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/bin/pCampbot.ini.example b/bin/pCampbot.ini.example
deleted file mode 100644
index 2952bb0..0000000
--- a/bin/pCampbot.ini.example
+++ /dev/null
@@ -1,19 +0,0 @@
-; 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
-- 
cgit v1.1


From c34e6f25b1c8df14d62c102283efbf8ea263805c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 23 Aug 2013 13:53:47 -0700
Subject: Fix a printing of exception error in InventoryArchiveModule that only
 printed the error message and not the call stack.

---
 .../CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 797097f..5854428 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -536,7 +536,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;
             }
         }
-- 
cgit v1.1


From 6a24515269bf4f478c78e2b93f1c09aa5b598775 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 24 Aug 2013 03:40:44 -0700
Subject: Whitespace fubar.

---
 bin/data/LICENSE-README-IMPORTANT.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
-- 
cgit v1.1


From c7a8afbb8da40e09252d58d95c89b8a99a684157 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 24 Aug 2013 03:41:56 -0700
Subject: Make HG logins fall back to fallback regions if the desired region
 fails.

---
 .../Services/HypergridService/GatekeeperService.cs | 27 +++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index e10c4cb..4a6b079 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -72,11 +72,14 @@ namespace OpenSim.Services.HypergridService
         private static Uri m_Uri;
         private static GridRegion m_DefaultGatewayRegion;
 
+        private static Random m_Random;
+
         public GatekeeperService(IConfigSource config, ISimulationService simService)
         {
             if (!m_Initialized)
             {
                 m_Initialized = true;
+                m_Random = new Random();
 
                 IConfig serverConfig = config.Configs["GatekeeperService"];
                 if (serverConfig == null)
@@ -220,6 +223,8 @@ namespace OpenSim.Services.HypergridService
         public bool LoginAgent(AgentCircuitData aCircuit, GridRegion destination, out string reason)
         {
             reason = string.Empty;
+            List<GridRegion> defaultRegions;
+            List<GridRegion> fallbackRegions;
 
             string authURL = string.Empty;
             if (aCircuit.ServiceURLs.ContainsKey("HomeURI"))
@@ -374,8 +379,14 @@ namespace OpenSim.Services.HypergridService
             destination = m_GridService.GetRegionByUUID(m_ScopeID, destination.RegionID);
             if (destination == null)
             {
-                reason = "Destination region not found";
-                return false;
+                defaultRegions = m_GridService.GetDefaultRegions(UUID.Zero);
+                if (defaultRegions == null || (defaultRegions != null && defaultRegions.Count == 0))
+                {
+                    reason = "Destination region not found";
+                    return false;
+                }
+                int index = m_Random.Next(0, defaultRegions.Count - 1);
+                destination = defaultRegions[index];
             }
 
             m_log.DebugFormat(
@@ -415,7 +426,17 @@ namespace OpenSim.Services.HypergridService
 
             m_log.DebugFormat("[GATEKEEPER SERVICE]: Launching {0} {1}", aCircuit.Name, loginFlag);
 
-            return m_SimulationService.CreateAgent(destination, aCircuit, (uint)loginFlag, out reason);
+            // try login to the desired region
+            if (m_SimulationService.CreateAgent(destination, aCircuit, (uint)loginFlag, out reason))
+                return true;
+
+            // if that failed, try the fallbacks
+            fallbackRegions = m_GridService.GetFallbackRegions(UUID.Zero, destination.RegionLocX, destination.RegionLocY);
+            foreach (GridRegion r in fallbackRegions)
+                if (m_SimulationService.CreateAgent(r, aCircuit, (uint)loginFlag, out reason))
+                    return true;
+
+            return false;
         }
 
         protected bool Authenticate(AgentCircuitData aCircuit)
-- 
cgit v1.1


From f0c0376660d767f232a1370f02e70d81728c9326 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 24 Aug 2013 08:42:41 -0700
Subject: Potential fix for access control bug on login introduced with
 SeeIntoRegion commit.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index cb12d65..d547323 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3824,7 +3824,7 @@ namespace OpenSim.Region.Framework.Scenes
     
                     try
                     {
-                        if (!AuthorizeUser(acd, SeeIntoRegion, out reason))
+                        if (!AuthorizeUser(acd, (vialogin ? false : SeeIntoRegion), out reason))
                         {
                             m_authenticateHandler.RemoveCircuit(acd.circuitcode);
                             return false;
-- 
cgit v1.1


From ec32c1d4b69e4219fe44a38bcbc411e7996641f1 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 24 Aug 2013 09:59:05 -0700
Subject: Added some more debug messages.

---
 OpenSim/Services/HypergridService/GatekeeperService.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 4a6b079..00502b1 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -431,11 +431,14 @@ namespace OpenSim.Services.HypergridService
                 return true;
 
             // if that failed, try the fallbacks
+            m_log.DebugFormat("[GATEKEEPER SERVICE]: Region {0} did not accept agent {1}", destination.RegionName, aCircuit.Name);
             fallbackRegions = m_GridService.GetFallbackRegions(UUID.Zero, destination.RegionLocX, destination.RegionLocY);
             foreach (GridRegion r in fallbackRegions)
+            {
+                m_log.DebugFormat("[GATEKEEPER SERVICE]: Trying region {0}...", r.RegionName);
                 if (m_SimulationService.CreateAgent(r, aCircuit, (uint)loginFlag, out reason))
                     return true;
-
+            }
             return false;
         }
 
-- 
cgit v1.1


From 60e4ce20b86e0594f4ed457b6a7329560dbaa121 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sun, 25 Aug 2013 20:17:04 +0100
Subject: Fix exception thrown after a region has been restarted through
 scheduling.

This exception was very likely harmless since it occurred after the restart had taken place, but still misleading.
Thanks to SCGreyWolf for the code change suggestion in http://opensimulator.org/mantis/view.php?id=6747, though I did this in a slightly different way.
---
 .../CoreModules/World/Region/RestartModule.cs      | 32 +++++++++++++++-------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
index 249a40d..75a8295 100644
--- a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
@@ -46,8 +46,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;
@@ -203,18 +203,30 @@ 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)
         {
-            int nextInterval = DoOneNotice();
-
-            SetTimer(nextInterval);
+            SetTimer(DoOneNotice());
         }
 
         public void AbortRestart(string message)
-- 
cgit v1.1


From 1b2830b929640544b6b19ee56b436a5a54d8d0d5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 26 Aug 2013 21:05:55 +0100
Subject: Revert "Added some more debug messages."

Fallback doesn't work at this level as the change of destination isn't communicated to the source region/viewer
Reverting because this introduces a bug when access does fail.
More detail in revert of main commit.

This reverts commit ec32c1d4b69e4219fe44a38bcbc411e7996641f1.
---
 OpenSim/Services/HypergridService/GatekeeperService.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 00502b1..4a6b079 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -431,14 +431,11 @@ namespace OpenSim.Services.HypergridService
                 return true;
 
             // if that failed, try the fallbacks
-            m_log.DebugFormat("[GATEKEEPER SERVICE]: Region {0} did not accept agent {1}", destination.RegionName, aCircuit.Name);
             fallbackRegions = m_GridService.GetFallbackRegions(UUID.Zero, destination.RegionLocX, destination.RegionLocY);
             foreach (GridRegion r in fallbackRegions)
-            {
-                m_log.DebugFormat("[GATEKEEPER SERVICE]: Trying region {0}...", r.RegionName);
                 if (m_SimulationService.CreateAgent(r, aCircuit, (uint)loginFlag, out reason))
                     return true;
-            }
+
             return false;
         }
 
-- 
cgit v1.1


From 0dd9a68eb74a7374f72cbed14c6e0eacdb642b60 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 26 Aug 2013 21:07:49 +0100
Subject: Revert "Make HG logins fall back to fallback regions if the desired
 region fails."

This is very similar to my earlier revert in bcb8605f8428a9009a2badf9c9eed06d9f59962c and fails for the same reasons.
Reverting this change because it causes a problem if access is denied to the user.
This reverts commit c7a8afbb8da40e09252d58d95c89b8a99a684157.
---
 .../Services/HypergridService/GatekeeperService.cs | 27 +++-------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 4a6b079..e10c4cb 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -72,14 +72,11 @@ namespace OpenSim.Services.HypergridService
         private static Uri m_Uri;
         private static GridRegion m_DefaultGatewayRegion;
 
-        private static Random m_Random;
-
         public GatekeeperService(IConfigSource config, ISimulationService simService)
         {
             if (!m_Initialized)
             {
                 m_Initialized = true;
-                m_Random = new Random();
 
                 IConfig serverConfig = config.Configs["GatekeeperService"];
                 if (serverConfig == null)
@@ -223,8 +220,6 @@ namespace OpenSim.Services.HypergridService
         public bool LoginAgent(AgentCircuitData aCircuit, GridRegion destination, out string reason)
         {
             reason = string.Empty;
-            List<GridRegion> defaultRegions;
-            List<GridRegion> fallbackRegions;
 
             string authURL = string.Empty;
             if (aCircuit.ServiceURLs.ContainsKey("HomeURI"))
@@ -379,14 +374,8 @@ namespace OpenSim.Services.HypergridService
             destination = m_GridService.GetRegionByUUID(m_ScopeID, destination.RegionID);
             if (destination == null)
             {
-                defaultRegions = m_GridService.GetDefaultRegions(UUID.Zero);
-                if (defaultRegions == null || (defaultRegions != null && defaultRegions.Count == 0))
-                {
-                    reason = "Destination region not found";
-                    return false;
-                }
-                int index = m_Random.Next(0, defaultRegions.Count - 1);
-                destination = defaultRegions[index];
+                reason = "Destination region not found";
+                return false;
             }
 
             m_log.DebugFormat(
@@ -426,17 +415,7 @@ namespace OpenSim.Services.HypergridService
 
             m_log.DebugFormat("[GATEKEEPER SERVICE]: Launching {0} {1}", aCircuit.Name, loginFlag);
 
-            // try login to the desired region
-            if (m_SimulationService.CreateAgent(destination, aCircuit, (uint)loginFlag, out reason))
-                return true;
-
-            // if that failed, try the fallbacks
-            fallbackRegions = m_GridService.GetFallbackRegions(UUID.Zero, destination.RegionLocX, destination.RegionLocY);
-            foreach (GridRegion r in fallbackRegions)
-                if (m_SimulationService.CreateAgent(r, aCircuit, (uint)loginFlag, out reason))
-                    return true;
-
-            return false;
+            return m_SimulationService.CreateAgent(destination, aCircuit, (uint)loginFlag, out reason);
         }
 
         protected bool Authenticate(AgentCircuitData aCircuit)
-- 
cgit v1.1


From 0882cf0fc32dac05d0e762abf68d6956305543bc Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 27 Aug 2013 09:55:50 -0700
Subject: BulletSim: add some protections for processing when shutting down.
 Attempt to fix Mantis 6740
 (http://opensimulator.org/mantis/view.php?id=6740).

---
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 88d50b4..c92c9b9 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -946,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;
@@ -989,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)
-- 
cgit v1.1


From aa521fb385c055980c8af1ddf44d839c643fd22e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 28 Aug 2013 16:33:01 -0700
Subject: Do not add a port zero to end of the hypergrid gateway host name. If
 the port is specified it is added but a ":0" is not added if the port is
 zero. This enables the hypergrid address short form
 "hypergridGateway:regionName" which is handled by the parser but failed
 because of this zero port addition.

---
 OpenSim/Services/Interfaces/IGridService.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index d7da056..6ed681f 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -137,7 +137,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 { 
-- 
cgit v1.1


From a8c0e16e474e5857ca83791d6bd1a484e2cfc9c9 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 29 Aug 2013 14:35:56 -0400
Subject: Initialization: move key expansion out to operate on all sources and
 not just environment variables

---
 OpenSim/Region/Application/ConfigurationLoader.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 3e93638..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;
         }
-- 
cgit v1.1


From 56f565b601c527a1b6fd345813972ee32e2e103d Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 29 Aug 2013 16:54:13 -0400
Subject: Profiles: Clean up some log entries caused when visiting HG avatar is
 using legacy profiles

---
 .../Avatar/UserProfiles/UserProfileModule.cs       | 42 +++++++++++++---------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 966a05c..bf1cffb 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -309,6 +309,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             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);
@@ -316,15 +317,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             OSD Params = (OSD)parameters;
             if(!JsonRpcRequest(ref Params, "avatarclassifiedsrequest", serverURI, UUID.Random().ToString()))
             {
-                // Error Handling here!
-                // if(parameters.ContainsKey("message")
+                remoteClient.SendAvatarClassifiedReply(new UUID(args[0]), classifieds);
+                return;
             }
 
             parameters = (OSDMap)Params;
 
             OSDArray list = (OSDArray)parameters["result"];
 
-            Dictionary<UUID, string> classifieds = new Dictionary<UUID, string>();
 
             foreach(OSD map in list)
             {
@@ -441,7 +441,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             Vector3 pos = remoteClient.SceneAgent.AbsolutePosition;
             ILandObject land = s.LandChannel.GetLandObject(pos.X, pos.Y);
             ScenePresence p = FindPresence(remoteClient.AgentId);
-//            Vector3 avaPos = p.AbsolutePosition;
             
             string serverURI = string.Empty;
             GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
@@ -542,14 +541,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
             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.SendAgentAlertMessage(
-                        "Error requesting picks", false);
+                remoteClient.SendAvatarPicksReply(new UUID(args[0]), picks);
                 return;
             }
 
@@ -557,8 +557,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
             OSDArray list = (OSDArray)parameters["result"];
 
-            Dictionary<UUID, string> picks = new Dictionary<UUID, string>();
-
             foreach(OSD map in list)
             {
                 OSDMap m = (OSDMap)map;
@@ -762,8 +760,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             object Note = (object)note;
             if(!JsonRpcRequest(ref Note, "avatarnotesrequest", serverURI, UUID.Random().ToString()))
             {
-                remoteClient.SendAgentAlertMessage(
-                        "Error requesting note", false);
+                remoteClient.SendAvatarNotesReply(note.TargetId, note.Notes);
+                return;
             }
             note = (UserProfileNotes) Note;
                 
@@ -796,8 +794,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             object Note = note;
             if(!JsonRpcRequest(ref Note, "avatar_notes_update", serverURI, UUID.Random().ToString()))
             {
-                remoteClient.SendAgentAlertMessage(
-                        "Error updating note", false);
+                return;
             }
         }
         #endregion Notes
@@ -1033,8 +1030,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             OSD Params = (OSD)parameters;
             if(!JsonRpcRequest(ref Params, "image_assets_request", profileServerURI, UUID.Random().ToString()))
             {
-                // Error Handling here!
-                // if(parameters.ContainsKey("message")
                 return false;
             }
             
@@ -1224,7 +1219,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             byte[] content = Encoding.UTF8.GetBytes(jsonRequestData);
 
             HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(uri);
-            // webRequest.Credentials = new NetworkCredential(rpcUser, rpcPass);
+
             webRequest.ContentType = "application/json-rpc";
             webRequest.Method = "POST";
 
@@ -1245,7 +1240,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             }
 
             Stream rstream = webResponse.GetResponseStream();
-            OSDMap mret = (OSDMap)OSDParser.DeserializeJson(rstream);
+            if (rstream.Length < 1)
+                return false;
+              
+            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;
@@ -1310,6 +1318,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             }
 
             Stream rstream = webResponse.GetResponseStream();
+            if (rstream.Length < 1)
+                return false;
 
             OSDMap response = new OSDMap();
             try
-- 
cgit v1.1


From 4cbadc3c4984b8bebc7098a720846309f645ad7b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 2 Sep 2013 17:27:45 +0100
Subject: Allow one to specify a DefaultHGRegion flag in [GridService] in order
 to allow different default regions for HG and direct grid logins.

This requires a new GridService.GetDefaultHypergridRegions() so ROBUST services require updating but not simulators.
This method still returns regions flagged with just DefaultRegion after any DefaultHGRegions, so if no DefaultHGRegions are specified
then existing configured defaults will still work.
Immediate use is for conference where we need to be able to specify different defaults
However, this is also generally useful to send experienced HG users to one default location and local users whose specified region fails (e.g. no "home" or "last") to another.
---
 OpenSim/Data/IRegionData.cs                        |  1 +
 OpenSim/Data/MSSQL/MSSQLRegionData.cs              |  5 +++
 OpenSim/Data/MySQL/MySQLRegionData.cs              |  5 +++
 OpenSim/Data/Null/NullRegionData.cs                |  5 +++
 OpenSim/Framework/RegionFlags.cs                   |  3 +-
 .../Grid/LocalGridServiceConnector.cs              |  5 +++
 .../Grid/RemoteGridServiceConnector.cs             | 20 +++++++++
 .../Server/Handlers/Grid/GridServerPostHandler.cs  | 33 ++++++++++++++
 .../Connectors/Grid/GridServicesConnector.cs       | 51 ++++++++++++++++++++++
 .../SimianGrid/SimianGridServiceConnector.cs       |  6 +++
 OpenSim/Services/GridService/GridService.cs        | 32 +++++++++++++-
 OpenSim/Services/GridService/HypergridLinker.cs    |  2 +-
 .../Services/HypergridService/GatekeeperService.cs |  2 +-
 OpenSim/Services/Interfaces/IGridService.cs        |  1 +
 bin/Robust.HG.ini.example                          | 11 ++---
 15 files changed, 172 insertions(+), 10 deletions(-)

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/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/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/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/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/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 3849a3f..31ef79b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -235,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);
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/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
index 89cba8a..c63b409 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -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/Services/Connectors/Grid/GridServicesConnector.cs b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
index 34ed0d7..0f5a613 100644
--- a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
@@ -515,6 +515,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/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index bcc1e4a..816591b 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -330,6 +330,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);
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index a1485c8..e72b7f9 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -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>();
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 e10c4cb..f6136b5 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -171,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];
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 6ed681f..88ac5b3 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);
 
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 466aed2..0fbdf4e 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -151,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"
@@ -168,16 +169,16 @@ 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
+    ;; where <flags> can be DefaultRegion, DefaultHGRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut, Reservation, NoMove, Authenticate
     ;; For example: 
     ; 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
-- 
cgit v1.1


From 5ce5ce6edb2217639cdcc375bf375452b81bb868 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 2 Sep 2013 17:45:38 +0100
Subject: Comment out warning about agent updating without valid session ID for
 now.

This causes extreme console spam if a simulator running latest master and one running 0.7.5 have adjacent regions occupied by avatars.
---
 OpenSim/Region/Framework/Scenes/Scene.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d547323..005c9b9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4346,10 +4346,10 @@ 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);
+//                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..
-- 
cgit v1.1


From 857f24a5e2b59072ad4d987d5e64318f5249c7e7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 2 Sep 2013 19:15:10 +0100
Subject: Fix bug where users teleporting to non-neighbour regions could
 continue to hear chat from their source region for some time after teleport
 completion.

This occurs on v2 teleport since the source region now waits 15 secs before closing the old child agent, which could still receive chat.
This commit introduces a ScenePresenceState.PreClose which is set before the wait, so that ChatModule can check for ScenePresenceState.Running.
This was theoretically also an issue on v1 teleport but since the pause before close was only 2 secs there, it was not noticed.
---
 .../Caps/EventQueue/Tests/EventQueueTests.cs       |  4 +-
 .../Region/CoreModules/Avatar/Chat/ChatModule.cs   | 15 +++---
 .../EntityTransfer/EntityTransferModule.cs         |  7 +++
 OpenSim/Region/Framework/Scenes/Scene.cs           | 59 ++++++++++++++++++++--
 .../Framework/Scenes/ScenePresenceStateMachine.cs  | 15 +++++-
 5 files changed, 85 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
index 626932f..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,7 +88,7 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
         }
 
         [Test]
-        public void RemoveForClient()
+        public void TestRemoveForClient()
         {
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 58f747b..5229c08 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -326,15 +326,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             UUID fromAgentID, UUID ownerID, string fromName, ChatTypeEnum type,
             string message, ChatSourceType src, bool ignoreDistance)
         {
-            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 (presence.LifecycleState != ScenePresenceState.Running)
+                return false;
 
             if (!ignoreDistance)
             {
+                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)
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 8950516..4219254 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -920,6 +920,9 @@ 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.
@@ -1082,6 +1085,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // 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
@@ -1095,6 +1101,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 // 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);
             }
             else
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 005c9b9..2a21a4c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3695,10 +3695,13 @@ namespace OpenSim.Region.Framework.Scenes
 
                 // 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)
+                if (sp != null && sp.IsChildAgent 
+                    && (sp.LifecycleState == ScenePresenceState.Running 
+                        || sp.LifecycleState == ScenePresenceState.PreRemove))
                 {
                     m_log.DebugFormat(
-                        "[SCENE]: Reusing existing child scene presence for {0} in {1}", sp.Name, Name);
+                        "[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
@@ -3720,6 +3723,8 @@ namespace OpenSim.Region.Framework.Scenes
 //                    }
 //                    else if (EntityTransferModule.IsInTransit(sp.UUID))
 
+                    sp.LifecycleState = ScenePresenceState.Running;
+
                     if (EntityTransferModule.IsInTransit(sp.UUID))
                     {
                         sp.DoNotCloseAfterTeleport = true;
@@ -4441,6 +4446,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>
@@ -4459,16 +4508,16 @@ namespace OpenSim.Region.Framework.Scenes
                 if (sp == null)
                 {
                     m_log.DebugFormat(
-                        "[SCENE]: Called RemoveClient() with agent ID {0} but no such presence is in {1}", 
+                        "[SCENE]: Called IncomingCloseAgent() with agent ID {0} but no such presence is in {1}", 
                         agentID, Name);
     
                     return false;
                 }
 
-                if (sp.LifecycleState != ScenePresenceState.Running)
+                if (sp.LifecycleState != ScenePresenceState.Running && sp.LifecycleState != ScenePresenceState.PreRemove)
                 {
                     m_log.DebugFormat(
-                        "[SCENE]: Called RemoveClient() for {0} in {1} but presence is already in state {2}",
+                        "[SCENE]: Called IncomingCloseAgent() for {0} in {1} but presence is already in state {2}",
                         sp.Name, Name, sp.LifecycleState);
 
                     return false;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresenceStateMachine.cs b/OpenSim/Region/Framework/Scenes/ScenePresenceStateMachine.cs
index dc3a212..cae7fe5 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresenceStateMachine.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresenceStateMachine.cs
@@ -37,7 +37,8 @@ namespace OpenSim.Region.Framework.Scenes
     /// This is a state machine.
     ///
     /// [Entry]               => Running
-    /// Running               => Removing
+    /// 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
@@ -46,6 +47,7 @@ namespace OpenSim.Region.Framework.Scenes
     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.
@@ -80,8 +82,17 @@ namespace OpenSim.Region.Framework.Scenes
 
             lock (this)
             {
-                if (newState == ScenePresenceState.Removing && m_state == ScenePresenceState.Running)
+                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;
             }           
-- 
cgit v1.1


From 9643915093aad385163551655676adc943855330 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Mon, 2 Sep 2013 16:28:40 -0400
Subject: Remove test that gives issue on Windows, just let the try/catch do
 the work.

---
 OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index bf1cffb..56ff2bd 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -1212,7 +1212,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             json.Add("jsonrpc", OSD.FromString("2.0"));
             json.Add("id", OSD.FromString(jsonId));
             json.Add("method", OSD.FromString(method));
-            // Experiment
+
             json.Add("params", OSD.SerializeMembers(parameters));
 
             string jsonRequestData = OSDParser.SerializeJsonString(json);
@@ -1240,8 +1240,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             }
 
             Stream rstream = webResponse.GetResponseStream();
-            if (rstream.Length < 1)
-                return false;
               
             OSDMap mret = new OSDMap();
             try
@@ -1318,8 +1316,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             }
 
             Stream rstream = webResponse.GetResponseStream();
-            if (rstream.Length < 1)
-                return false;
 
             OSDMap response = new OSDMap();
             try
-- 
cgit v1.1


From 4035badd20c00c766a1262afd7fa730ea6c53e98 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 00:04:12 +0100
Subject: Add experimental "show grid users online" console command to show
 grid users online from a standalone/robust instance.

This is not guaranteed to be accurate since users may be left "online" in certain situations.
For example, if a simulator crashes and they never login/logout again.
To counter this somewhat, only users continuously online for less than 5 days are shown.
---
 OpenSim/Framework/Util.cs                          |  8 ++---
 .../Services/UserAccountService/GridUserService.cs | 39 ++++++++++++++++++++++
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index f0e5bc1..52f5432 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -130,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
@@ -521,19 +521,19 @@ namespace OpenSim.Framework
 
         public static int ToUnixTime(DateTime stamp)
         {
-            TimeSpan t = stamp.ToUniversalTime() - unixEpoch;
+            TimeSpan t = stamp.ToUniversalTime() - UnixEpoch;
             return (int) t.TotalSeconds;
         }
 
         public static DateTime ToDateTime(ulong seconds)
         {
-            DateTime epoch = unixEpoch;
+            DateTime epoch = UnixEpoch;
             return epoch.AddSeconds(seconds);
         }
 
         public static DateTime ToDateTime(int seconds)
         {
-            DateTime epoch = unixEpoch;
+            DateTime epoch = UnixEpoch;
             return epoch.AddSeconds(seconds);
         }
 
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index b1cdd45..f9cfa12 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -47,6 +47,45 @@ namespace OpenSim.Services.UserAccountService
         public GridUserService(IConfigSource config) : base(config) 
         {
             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"]);
+                    DateTime loginDateTime = Util.UnixEpoch.AddSeconds(unixLoginTime);
+
+                    if ((loginDateTime - now).Days < 5)
+                        onlineRecentlyCount++;
+                }
+            }
+
+            MainConsole.Instance.OutputFormat("Users online within last 5 days: {0}", onlineRecentlyCount);
         }
 
         public virtual GridUserInfo GetGridUserInfo(string userID)
-- 
cgit v1.1


From 5f15ee95dc140ba775c4db801a72f6623e408b0f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 00:16:43 +0100
Subject: Fix logic errors in "show grid users online" console command which
 didn't actually filter out users shown continuously online for more than 5
 days

Remove confusion in command output.
---
 OpenSim/Services/UserAccountService/GridUserService.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index f9cfa12..944411f 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -78,14 +78,13 @@ namespace OpenSim.Services.UserAccountService
 //                    onlineCount++;
 
                     int unixLoginTime = int.Parse(gu.Data["Login"]);
-                    DateTime loginDateTime = Util.UnixEpoch.AddSeconds(unixLoginTime);
 
-                    if ((loginDateTime - now).Days < 5)
+                    if ((now - Util.ToDateTime(unixLoginTime)).Days < 5)
                         onlineRecentlyCount++;
                 }
             }
 
-            MainConsole.Instance.OutputFormat("Users online within last 5 days: {0}", onlineRecentlyCount);
+            MainConsole.Instance.OutputFormat("Users online: {0}", onlineRecentlyCount);
         }
 
         public virtual GridUserInfo GetGridUserInfo(string userID)
-- 
cgit v1.1


From 431156f6c48944c79e3f56c54d64e7f3bc748f7b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 00:17:50 +0100
Subject: minor simplification of some unix date functions in Util.  No
 functional change.

---
 OpenSim/Framework/Util.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 52f5432..e8dfec1 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -522,19 +522,17 @@ namespace OpenSim.Framework
         public static int ToUnixTime(DateTime stamp)
         {
             TimeSpan t = stamp.ToUniversalTime() - UnixEpoch;
-            return (int) t.TotalSeconds;
+            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>
-- 
cgit v1.1


From 9c652079361f496c46640ed67e964ee6164ce06e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 17:07:57 +0100
Subject: Show behaviours of pCampbot bots in "show bots" and "show bot"
 console commands

---
 .../Tools/pCampBot/Behaviours/AbstractBehaviour.cs |  5 +++++
 .../Tools/pCampBot/Behaviours/CrossBehaviour.cs    |  6 +++++-
 .../Tools/pCampBot/Behaviours/GrabbingBehaviour.cs |  6 +++++-
 OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs |  6 +++++-
 .../Tools/pCampBot/Behaviours/PhysicsBehaviour.cs  |  1 +
 .../Tools/pCampBot/Behaviours/TeleportBehaviour.cs |  6 +++++-
 OpenSim/Tools/pCampBot/BotManager.cs               | 22 ++++++++++++++--------
 OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs    |  5 +++++
 8 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
index 9a9371d..66d5542 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; }
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..6acc27d 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
@@ -41,7 +41,11 @@ namespace pCampBot
     /// </remarks>
     public class GrabbingBehaviour : AbstractBehaviour
     {
-        public GrabbingBehaviour() { Name = "Grabbing"; }
+        public GrabbingBehaviour() 
+        { 
+            AbbreviatedName = "g";
+            Name = "Grabbing"; 
+        }
 
         public override void Action()
         {
diff --git a/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs
index 9cf8a54..9a3075c 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs
@@ -38,6 +38,10 @@ namespace pCampBot
     /// </summary>
     public class NoneBehaviour : AbstractBehaviour
     {
-        public NoneBehaviour() { Name = "None"; }
+        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..47b4d46 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();
         }
diff --git a/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
index fbb4e96..5f7edda 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
@@ -42,7 +42,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()
         {
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 5c3835b..35a24d1 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -572,10 +572,11 @@ namespace pCampBot
         private void HandleShowBotsStatus(string module, string[] cmd)
         {
             ConsoleDisplayTable cdt = new ConsoleDisplayTable();
-            cdt.AddColumn("Name", 30);
-            cdt.AddColumn("Region", 30);
-            cdt.AddColumn("Status", 14);
-            cdt.AddColumn("Connections", 11);
+            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)))
@@ -583,13 +584,17 @@ namespace pCampBot
 
             lock (m_bots)
             {
-                foreach (Bot pb in m_bots)
+                foreach (Bot bot in m_bots)
                 {
-                    Simulator currentSim = pb.Client.Network.CurrentSim;
-                    totals[pb.ConnectionState]++;
+                    Simulator currentSim = bot.Client.Network.CurrentSim;
+                    totals[bot.ConnectionState]++;
 
                     cdt.AddRow(
-                        pb.Name, currentSim != null ? currentSim.Name : "(none)", pb.ConnectionState, pb.SimulatorsCount);
+                        bot.Name, 
+                        currentSim != null ? currentSim.Name : "(none)", 
+                        bot.ConnectionState, 
+                        bot.SimulatorsCount, 
+                        string.Join(",", bot.Behaviours.ConvertAll<string>(behaviour => behaviour.AbbreviatedName)));
                 }
             }
 
@@ -645,6 +650,7 @@ namespace pCampBot
             MainConsole.Instance.Output("Settings");
 
             ConsoleDisplayList statusCdl = new ConsoleDisplayList();
+            statusCdl.AddRow("Behaviours", string.Join(", ", bot.Behaviours.ConvertAll<string>(b => b.Name)));
             GridClient botClient = bot.Client;
             statusCdl.AddRow("SEND_AGENT_UPDATES", botClient.Settings.SEND_AGENT_UPDATES);
 
diff --git a/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs b/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
index 9c984be..f8a661b 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; }
-- 
cgit v1.1


From a89c56dcf1e2645554f8b81b6f1e517b829cc3a4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 17:53:29 +0100
Subject: Fix build break from last commit 9c65207.  Mono 2.4 lacks
 string.join(string, List<string>), or some auto casting is missing

---
 OpenSim/Tools/pCampBot/BotManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 35a24d1..7d4af13 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -594,7 +594,7 @@ namespace pCampBot
                         currentSim != null ? currentSim.Name : "(none)", 
                         bot.ConnectionState, 
                         bot.SimulatorsCount, 
-                        string.Join(",", bot.Behaviours.ConvertAll<string>(behaviour => behaviour.AbbreviatedName)));
+                        string.Join(",", bot.Behaviours.ConvertAll<string>(behaviour => behaviour.AbbreviatedName).ToArray()));
                 }
             }
 
-- 
cgit v1.1


From 01cb8033a42514728835a18a38f2a18349e83638 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 17:55:20 +0100
Subject: And fix break in "show bot" from commit 9c65207

---
 OpenSim/Tools/pCampBot/BotManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 7d4af13..3e446af 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -650,7 +650,7 @@ namespace pCampBot
             MainConsole.Instance.Output("Settings");
 
             ConsoleDisplayList statusCdl = new ConsoleDisplayList();
-            statusCdl.AddRow("Behaviours", string.Join(", ", bot.Behaviours.ConvertAll<string>(b => b.Name)));
+            statusCdl.AddRow("Behaviours", string.Join(", ", bot.Behaviours.ConvertAll<string>(b => b.Name).ToArray()));
             GridClient botClient = bot.Client;
             statusCdl.AddRow("SEND_AGENT_UPDATES", botClient.Settings.SEND_AGENT_UPDATES);
 
-- 
cgit v1.1


From 9bd62715704685738c55c6de8127b16cc6695bdb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 18:51:55 +0100
Subject: Add ability to adjust pCampbot bot behaviours whilst running with
 "add behaviour <behaviour-name> <bot-number>" console commad

---
 OpenSim/Tools/pCampBot/Bot.cs        |  51 ++++++++----
 OpenSim/Tools/pCampBot/BotManager.cs | 147 ++++++++++++++++++++++++++++-------
 2 files changed, 157 insertions(+), 41 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index d418288..6037516 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -72,9 +72,10 @@ namespace pCampBot
         /// 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.
@@ -165,8 +166,6 @@ namespace pCampBot
         {
             ConnectionState = ConnectionState.Disconnected;
 
-            behaviours.ForEach(b => b.Initialize(this));
-
             Random = new Random(Environment.TickCount);// We do stuff randomly here
             FirstName = firstName;
             LastName = lastName;
@@ -176,12 +175,31 @@ namespace pCampBot
             StartLocation = startLocation;
 
             Manager = bm;
-            Behaviours = behaviours;
+
+            Behaviours = new Dictionary<string, IBehaviour>();
+            foreach (IBehaviour behaviour in behaviours)
+                AddBehaviour(behaviour);
 
             // Only calling for use as a template.
             CreateLibOmvClient();
         }
 
+        public bool AddBehaviour(IBehaviour behaviour)
+        {
+            lock (Behaviours)
+            {
+                if (!Behaviours.ContainsKey(behaviour.AbbreviatedName))
+                {                    
+                    behaviour.Initialize(this);
+                    Behaviours.Add(behaviour.AbbreviatedName, behaviour);
+
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         private void CreateLibOmvClient()
         {
             GridClient newClient = new GridClient();
@@ -237,16 +255,21 @@ namespace pCampBot
         private void Action()
         {
             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();
+                    }
+                }
+
+                // XXX: This is a really shitty way of yielding so that behaviours can be added/removed
+                Thread.Sleep(100);
+            }
         }
 
         /// <summary>
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 3e446af..51c5ff4 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -140,7 +140,7 @@ namespace pCampBot
         /// <summary>
         /// Behaviour switches for bots.
         /// </summary>
-        private HashSet<string> m_behaviourSwitches = new HashSet<string>();
+        private HashSet<string> m_defaultBehaviourSwitches = new HashSet<string>();
 
         /// <summary>
         /// Constructor Creates MainConsole.Instance to take commands and provide the place to write data
@@ -195,6 +195,18 @@ namespace pCampBot
                 HandleDisconnect);
 
             m_console.Commands.AddCommand(
+                "bot", false, "add behaviour", "add behaviour <abbreviated-name> <bot-number>", 
+                "Add a behaviour to a bot",
+                "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",
+//                "Can be performed on connected or disconnected bots.",
+//                HandleRemoveBehaviour);
+
+            m_console.Commands.AddCommand(
                 "bot", false, "sit", "sit", "Sit all bots on the ground.",
                 HandleSit);
 
@@ -235,7 +247,7 @@ namespace pCampBot
             m_startUri = ParseInputStartLocationToUri(startupConfig.GetString("start", "last"));
 
             Array.ForEach<string>(
-                startupConfig.GetString("behaviours", "p").Split(new char[] { ',' }), b => m_behaviourSwitches.Add(b));
+                startupConfig.GetString("behaviours", "p").Split(new char[] { ',' }), b => m_defaultBehaviourSwitches.Add(b));
 
             for (int i = 0; i < botcount; i++)
             {
@@ -243,28 +255,50 @@ namespace pCampBot
                 {
                     string lastName = string.Format("{0}_{1}", m_lastNameStem, i + m_fromBotNumber);
 
-                    // 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 (m_behaviourSwitches.Contains("c"))
-                        behaviours.Add(new CrossBehaviour());
+                    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 (m_behaviourSwitches.Contains("g"))
-                        behaviours.Add(new GrabbingBehaviour());
+                if (abName == "n")
+                    newBehaviour = new NoneBehaviour();
 
-                    if (m_behaviourSwitches.Contains("n"))
-                        behaviours.Add(new NoneBehaviour());
+                if (abName == "p")
+                    newBehaviour = new PhysicsBehaviour();
 
-                    if (m_behaviourSwitches.Contains("p"))
-                        behaviours.Add(new PhysicsBehaviour());
-        
-                    if (m_behaviourSwitches.Contains("t"))
-                        behaviours.Add(new TeleportBehaviour());
+                if (abName == "t")
+                    newBehaviour = new TeleportBehaviour();
 
-                    CreateBot(this, behaviours, m_firstName, lastName, m_password, m_loginUri, m_startUri, m_wearSetting);
+                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)
@@ -453,6 +487,44 @@ namespace pCampBot
             }
         }
 
+        private void HandleAddBehaviour(string module, string[] cmd)
+        {
+            if (cmd.Length != 4)
+            {
+                MainConsole.Instance.OutputFormat("Usage: add behaviour <abbreviated-behaviour> <bot-number>");
+                return;
+            }
+
+            string rawBehaviours = cmd[2];
+            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;
+            }
+
+            HashSet<string> rawAbbreviatedSwitchesToAdd = new HashSet<string>();
+            Array.ForEach<string>(rawBehaviours.Split(new char[] { ',' }), b => rawAbbreviatedSwitchesToAdd.Add(b));
+
+            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 HandleDisconnect(string module, string[] cmd)
         {
             lock (m_bots)
@@ -594,7 +666,7 @@ namespace pCampBot
                         currentSim != null ? currentSim.Name : "(none)", 
                         bot.ConnectionState, 
                         bot.SimulatorsCount, 
-                        string.Join(",", bot.Behaviours.ConvertAll<string>(behaviour => behaviour.AbbreviatedName).ToArray()));
+                        string.Join(",", bot.Behaviours.Keys.ToArray()));
                 }
             }
 
@@ -621,16 +693,11 @@ namespace pCampBot
             if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, cmd[2], out botNumber))
                 return;
 
-            string name = string.Format("{0} {1}_{2}", m_firstName, m_lastNameStem, botNumber);
-
-            Bot bot;
-
-            lock (m_bots)
-                bot = m_bots.Find(b => b.Name == name);
+            Bot bot = GetBotFromNumber(botNumber);
 
             if (bot == null)
             {
-                MainConsole.Instance.Output("No bot found with name {0}", name);
+                MainConsole.Instance.OutputFormat("Error: No bot found with number {0}", botNumber);
                 return;
             }
 
@@ -650,13 +717,39 @@ namespace pCampBot
             MainConsole.Instance.Output("Settings");
 
             ConsoleDisplayList statusCdl = new ConsoleDisplayList();
-            statusCdl.AddRow("Behaviours", string.Join(", ", bot.Behaviours.ConvertAll<string>(b => b.Name).ToArray()));
+
+            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);
+        }
+
         internal void Grid_GridRegion(object o, GridRegionEventArgs args)
         {
             lock (RegionsKnown)
-- 
cgit v1.1


From 1a2627031d8a80b1d5e21fd2d13e4dc2b123c0b4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 19:05:54 +0100
Subject: Add pCampbot "remove behaviour" console command for removing bot
 behaviours during operation.

Doesn't currently work very well as stopping physics, for instance, can leave bot travelling in old direction
---
 OpenSim/Tools/pCampBot/Bot.cs        | 12 ++++++++
 OpenSim/Tools/pCampBot/BotManager.cs | 53 ++++++++++++++++++++++++++++++++----
 2 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index 6037516..0bd8151 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -184,6 +184,12 @@ namespace pCampBot
             CreateLibOmvClient();
         }
 
+        public bool TryGetBehaviour(string abbreviatedName, out IBehaviour behaviour)
+        {
+            lock (Behaviours)
+                return Behaviours.TryGetValue(abbreviatedName, out behaviour);
+        }
+
         public bool AddBehaviour(IBehaviour behaviour)
         {
             lock (Behaviours)
@@ -200,6 +206,12 @@ namespace pCampBot
             return false;
         }
 
+        public bool RemoveBehaviour(string abbreviatedName)
+        {
+            lock (Behaviours)
+                return Behaviours.Remove(abbreviatedName);
+        }
+
         private void CreateLibOmvClient()
         {
             GridClient newClient = new GridClient();
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 51c5ff4..6433c2e 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -200,11 +200,11 @@ namespace pCampBot
                 "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",
-//                "Can be performed on connected or disconnected bots.",
-//                HandleRemoveBehaviour);
+            m_console.Commands.AddCommand(
+                "bot", false, "remove behaviour", "remove behaviour <abbreviated-name> <bot-number>", 
+                "Remove a behaviour from a bot",
+                "Can be performed on connected or disconnected bots.",
+                HandleRemoveBehaviour);
 
             m_console.Commands.AddCommand(
                 "bot", false, "sit", "sit", "Sit all bots on the ground.",
@@ -525,6 +525,49 @@ namespace pCampBot
                 string.Join(", ", behavioursAdded.ConvertAll<string>(b => b.Name).ToArray()), bot.Name);
         }
 
+        private void HandleRemoveBehaviour(string module, string[] cmd)
+        {
+            if (cmd.Length != 4)
+            {
+                MainConsole.Instance.OutputFormat("Usage: remove behaviour <abbreviated-behaviour> <bot-number>");
+                return;
+            }
+
+            string rawBehaviours = cmd[2];
+            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;
+            }
+
+            HashSet<string> abbreviatedBehavioursToRemove = new HashSet<string>();
+            List<IBehaviour> behavioursRemoved = new List<IBehaviour>();
+
+            Array.ForEach<string>(rawBehaviours.Split(new char[] { ',' }), b => abbreviatedBehavioursToRemove.Add(b));
+
+            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);
+        }
+
         private void HandleDisconnect(string module, string[] cmd)
         {
             lock (m_bots)
-- 
cgit v1.1


From 3dbe7313d1c3fc28f0642531fbb6e238a98ac821 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 19:33:17 +0100
Subject: Add Close() method to IBehaviour to allow behaviours to cleanup when
 removed or bot it disconnected.

In this case, it is used to turn off jump when physics testing behaviour is removed.
---
 OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs |  2 ++
 OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs  |  5 +++++
 OpenSim/Tools/pCampBot/Bot.cs                          | 16 +++++++++++++++-
 OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs        |  8 ++++++++
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
index 66d5542..9bc8512 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
@@ -50,5 +50,7 @@ namespace pCampBot
         {
             Bot = bot;
         }
+
+        public virtual void Close() {}
     }
 }
diff --git a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
index 47b4d46..65a7c90 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
@@ -78,6 +78,11 @@ namespace pCampBot
                 Bot.Client.Self.Chat(randomf, 0, ChatType.Normal);
         }
 
+        public override void Close()
+        {
+            Bot.Client.Self.Jump(false);
+        }
+
         private string[] readexcuses()
         {
             string allexcuses = "";
diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index 0bd8151..f871b77 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -209,7 +209,17 @@ namespace pCampBot
         public bool RemoveBehaviour(string abbreviatedName)
         {
             lock (Behaviours)
-                return Behaviours.Remove(abbreviatedName);
+            {
+                IBehaviour behaviour;
+
+                if (!Behaviours.TryGetValue(abbreviatedName, out behaviour))
+                    return false;
+
+                behaviour.Close();
+                Behaviours.Remove(abbreviatedName);
+
+                return true;
+            }
         }
 
         private void CreateLibOmvClient()
@@ -282,6 +292,10 @@ namespace pCampBot
                 // 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>
diff --git a/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs b/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
index f8a661b..0ed4825 100644
--- a/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
@@ -51,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>
-- 
cgit v1.1


From 76bd2e2d727a15e5d3bc9045bdef6faaeca4a08f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 19:41:12 +0100
Subject: Consistently give responsibility for thread sleeping to behaviours
 rather than controlling from the main action loop

This is to avoid excessive and inconsistent delays between behaviours that currently need to embed sleeps in other actions (e.g. physics) and other behaviours.
Might need a more sophisticated approach in the long term.
---
 OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs | 3 +++
 OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs | 3 +++
 OpenSim/Tools/pCampBot/Bot.cs                          | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
index 6acc27d..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
@@ -60,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/TeleportBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
index 5f7edda..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;
@@ -74,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 f871b77..d0a4ef3 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -282,7 +282,7 @@ namespace pCampBot
                 {
                     foreach (IBehaviour behaviour in Behaviours.Values)
                     {
-                        Thread.Sleep(Random.Next(3000, 10000));
+//                        Thread.Sleep(Random.Next(3000, 10000));
                     
                         // m_log.DebugFormat("[pCAMPBOT]: For {0} performing action {1}", Name, b.GetType());
                         behaviour.Action();
-- 
cgit v1.1


From 9c3c9b7f5f62a7ed892f691180b765a9190cbbcc Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 19:57:34 +0100
Subject: Make pCampbot "add behaviour" and "remove behaviour" console commands
 work for all bots if no bot number is given

---
 OpenSim/Tools/pCampBot/BotManager.cs | 123 ++++++++++++++++++++++-------------
 1 file changed, 78 insertions(+), 45 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 6433c2e..3c1b11e 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -195,15 +195,17 @@ namespace pCampBot
                 HandleDisconnect);
 
             m_console.Commands.AddCommand(
-                "bot", false, "add behaviour", "add behaviour <abbreviated-name> <bot-number>", 
+                "bot", false, "add behaviour", "add behaviour <abbreviated-name> [<bot-number>]", 
                 "Add a behaviour to a bot",
-                "Can be performed on connected or disconnected bots.",
+                "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>", 
+                "bot", false, "remove behaviour", "remove behaviour <abbreviated-name> [<bot-number>]", 
                 "Remove a behaviour from a bot",
-                "Can be performed on connected or disconnected bots.",
+                "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(
@@ -224,7 +226,7 @@ namespace pCampBot
                 "bot", false, "show bots", "show bots", "Shows the status of all bots", HandleShowBotsStatus);
 
             m_console.Commands.AddCommand(
-                "bot", false, "show bot", "show bot <n>", 
+                "bot", false, "show bot", "show bot <bot-number>", 
                 "Shows the detailed status and settings of a particular bot.", HandleShowBotStatus);
 
             m_bots = new List<Bot>();
@@ -489,83 +491,114 @@ namespace pCampBot
 
         private void HandleAddBehaviour(string module, string[] cmd)
         {
-            if (cmd.Length != 4)
+            if (cmd.Length < 3 || cmd.Length > 4)
             {
-                MainConsole.Instance.OutputFormat("Usage: add behaviour <abbreviated-behaviour> <bot-number>");
+                MainConsole.Instance.OutputFormat("Usage: add behaviour <abbreviated-behaviour> [<bot-number>]");
                 return;
             }
 
             string rawBehaviours = cmd[2];
-            int botNumber;
-
-            if (!ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, cmd[3], out botNumber))
-                return;
 
-            Bot bot = GetBotFromNumber(botNumber);
+            List<Bot> botsToEffect = new List<Bot>();
 
-            if (bot == null)
+            if (cmd.Length == 3)
             {
-                MainConsole.Instance.OutputFormat("Error: No bot found with number {0}", botNumber);
-                return;
+                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));
 
-            List<IBehaviour> behavioursAdded = new List<IBehaviour>();
-
-            foreach (IBehaviour behaviour in CreateBehavioursFromAbbreviatedNames(rawAbbreviatedSwitchesToAdd))
+            foreach (Bot bot in botsToEffect)
             {
-                if (bot.AddBehaviour(behaviour))
-                    behavioursAdded.Add(behaviour);
-            }
+                List<IBehaviour> behavioursAdded = new List<IBehaviour>();
 
-            MainConsole.Instance.OutputFormat(
-                "Added behaviours {0} to bot {1}", 
-                string.Join(", ", behavioursAdded.ConvertAll<string>(b => b.Name).ToArray()), bot.Name);
+                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 != 4)
+            if (cmd.Length < 3 || cmd.Length > 4)
             {
-                MainConsole.Instance.OutputFormat("Usage: remove behaviour <abbreviated-behaviour> <bot-number>");
+                MainConsole.Instance.OutputFormat("Usage: remove behaviour <abbreviated-behaviour> [<bot-number>]");
                 return;
             }
 
             string rawBehaviours = cmd[2];
-            int botNumber;
-
-            if (!ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, cmd[3], out botNumber))
-                return;
 
-            Bot bot = GetBotFromNumber(botNumber);
+            List<Bot> botsToEffect = new List<Bot>();
 
-            if (bot == null)
+            if (cmd.Length == 3)
             {
-                MainConsole.Instance.OutputFormat("Error: No bot found with number {0}", botNumber);
-                return;
+                lock (m_bots)
+                    botsToEffect.AddRange(m_bots);
             }
+            else
+            {
+                int botNumber;
+                if (!ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, cmd[3], out botNumber))
+                    return;
 
-            HashSet<string> abbreviatedBehavioursToRemove = new HashSet<string>();
-            List<IBehaviour> behavioursRemoved = new List<IBehaviour>();
+                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 (string b in abbreviatedBehavioursToRemove)
+            foreach (Bot bot in botsToEffect)
             {
-                IBehaviour behaviour;
+                List<IBehaviour> behavioursRemoved = new List<IBehaviour>();
 
-                if (bot.TryGetBehaviour(b, out behaviour))
+                foreach (string b in abbreviatedBehavioursToRemove)
                 {
-                    bot.RemoveBehaviour(b);
-                    behavioursRemoved.Add(behaviour);
+                    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);
+                MainConsole.Instance.OutputFormat(
+                    "Removed behaviours {0} to bot {1}", 
+                    string.Join(", ", behavioursRemoved.ConvertAll<string>(b => b.Name).ToArray()), bot.Name);
+            }
         }
 
         private void HandleDisconnect(string module, string[] cmd)
-- 
cgit v1.1


From b781a23c445bea0fd199eb756ebf6143959256a6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 19:58:27 +0100
Subject: In pCampbot PhysicsBehaviour.Close(), only cancel jumping if bot is
 connected

---
 OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
index 65a7c90..6fd2b7c 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
@@ -80,7 +80,8 @@ namespace pCampBot
 
         public override void Close()
         {
-            Bot.Client.Self.Jump(false);
+            if (Bot.ConnectionState == ConnectionState.Connected)
+                Bot.Client.Self.Jump(false);
         }
 
         private string[] readexcuses()
-- 
cgit v1.1


From 5f0d54c209249e0640bc27b3d74a92e7c9d82428 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 26 Aug 2013 20:04:07 +0100
Subject: For a Hypergrid user, delay estate access checks until
 NewUserConnection() so that they work.

This is necessary because the hypergrid groups checks (as referenced by estates) require an agent circuit to be present to construct the hypergrid ID.
However, this is not around until Scene.NewUserConnection(), as called by CreateAgent() in EntityTransferModule.
Therefore, if we're dealing with a hypergrid user, delay the check until NewUserConnection()/CreateAgent()
The entity transfer impact should be minimal since CreateAgent() is the next significant call after NewUserConnection()
However, to preserve the accuracy of query access we will only relax the check for HG users.
---
 OpenSim/Region/Framework/Scenes/Scene.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2a21a4c..8754024 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5788,9 +5788,13 @@ namespace OpenSim.Region.Framework.Scenes
 
             try
             {
-                if (!AuthorizeUser(aCircuit, false, out reason))
+                // If this is a hypergrid user, then we can't perform a successful groups access check here since this
+                // currently relies on a circuit being present in the AuthenticateHandler to construct a Hypergrid ID.
+                // This is only present in NewUserConnection() which entity transfer calls very soon after QueryAccess().
+                // Therefore, we'll defer to the check in NewUserConnection() instead.
+                if (!AuthorizeUser(aCircuit, !UserManagementModule.IsLocalGridUser(agentID), out reason))
                 {
-                    // m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID);
+                    //m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID);
                     return false;
                 }
             }
-- 
cgit v1.1


From c7ded0618c303f8c24a91c83c2129292beebe466 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 27 Aug 2013 00:35:33 +0100
Subject: Also check user authorization if looking to upgrade from a child to a
 root agent.

Relevant if a child agent has been allowed into the region which should not be upgraded to a root agent.
---
 OpenSim/Region/Framework/Scenes/Scene.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 8754024..3eaa8fd 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3860,6 +3860,19 @@ namespace OpenSim.Region.Framework.Scenes
                     // Let the SP know how we got here. This has a lot of interesting
                     // uses down the line.
                     sp.TeleportFlags = (TPFlags)teleportFlags;
+
+                    // 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)
                     {
-- 
cgit v1.1


From dc74a50225a901e969ea83008555170f5742ca7a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 4 Sep 2013 23:48:24 +0100
Subject: Stop "show client stats" from throwing an exception if somehow
 Scene.m_clientManager still retains a reference to a dead client.

Instead, "show client stats" now prints "Off!" so that exception is not thrown and we know which entries in ClientManager are in this state.
There's a race condition which could trigger this, but the window is extremely short and exceptions would not be thrown consistently (which is the behaviour observed).
It should otherwise be impossible for this condition to occur, so there may be a weakness in client manager IClientAPI removal.
---
 .../OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index 15dea17..1eb0a6b 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -624,9 +624,16 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                                 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,
-                                         llClient.SceneAgent.IsChildAgent ? "N" : "Y", 
+                                         childAgentStatus, 
                                          (DateTime.Now - cinfo.StartedTime).Minutes,
                                          avg_reqs, 
                                          string.Format(
-- 
cgit v1.1


From b858be345a03448cf653efc725ec1fd4a57775f2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 5 Sep 2013 00:41:03 +0100
Subject: minor: add doc about DefaultHGRegion and some of the other
 GridService region settings (though not all as of yet)

---
 bin/Robust.HG.ini.example                       | 17 ++++++++++++++++-
 bin/Robust.ini.example                          | 20 ++++++++++++++++++--
 bin/config-include/StandaloneCommon.ini.example | 20 ++++++++++++++++++--
 3 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 0fbdf4e..8fe6d0c 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -170,7 +170,22 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     ;; The syntax is: Region_<RegionName> = "<flags>"
     ;; or:            Region_<RegionID> = "<flags>"
     ;; where <flags> can be DefaultRegion, DefaultHGRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut, Reservation, NoMove, Authenticate
-    ;; For example: 
+    ;;  
+    ;; 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)
 
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index da1b43a..de6fc28 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -132,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)
 
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 6b991a8..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 [Hypergrid], 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 [Hypergrid], 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"    
-- 
cgit v1.1


From 04619a9b139ac67c92b5b8be9607544be2621d7e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 5 Sep 2013 07:44:27 -0700
Subject: Restore group membership check for HG users in QueryAccess.

---
 .../Groups/Hypergrid/GroupsServiceHGConnectorModule.cs     |  9 ++++++---
 .../Framework/UserManagement/UserManagementModule.cs       | 14 ++++++++++----
 OpenSim/Region/Framework/Scenes/Scene.cs                   |  6 +-----
 3 files changed, 17 insertions(+), 12 deletions(-)

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/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 7adb203..8c983e6 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -481,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;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 3eaa8fd..e00206f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5801,11 +5801,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             try
             {
-                // If this is a hypergrid user, then we can't perform a successful groups access check here since this
-                // currently relies on a circuit being present in the AuthenticateHandler to construct a Hypergrid ID.
-                // This is only present in NewUserConnection() which entity transfer calls very soon after QueryAccess().
-                // Therefore, we'll defer to the check in NewUserConnection() instead.
-                if (!AuthorizeUser(aCircuit, !UserManagementModule.IsLocalGridUser(agentID), out reason))
+                if (!AuthorizeUser(aCircuit, false, out reason))
                 {
                     //m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID);
                     return false;
-- 
cgit v1.1


From a97f6f86680026de6350f301d52307c187726875 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sat, 7 Sep 2013 13:11:31 -0400
Subject: Fix configuration/ini expansion issue. Thanks to smxy for testing.

---
 OpenSim/Region/Application/ConfigurationLoader.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index bc7ecb7..010ae5a 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -203,10 +203,10 @@ namespace OpenSim
                 m_config.Source.Merge(envConfigSource);
             }
 
-            ReadConfigSettings();
-            
             m_config.Source.ExpandKeyValues();
 
+            ReadConfigSettings();
+
             return m_config;
         }
 
-- 
cgit v1.1


From b05cb3b2bfd6f3912fb33a790b7c2d1ed898d539 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 9 Sep 2013 14:47:49 -0700
Subject: Change collision logic in SceneObjectPart so land_collision will
 happen.

The previous logic would generate land_collision_start and land_collision_end
but would not generate the land_collision itself.
---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index c9ff4f3..2e11162 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2464,12 +2464,9 @@ namespace OpenSim.Region.Framework.Scenes
             SendCollisionEvent(scriptEvents.collision_end  , endedColliders  , ParentGroup.Scene.EventManager.TriggerScriptCollidingEnd);
 
             if (startedColliders.Contains(0))
-            {
-                if (m_lastColliders.Contains(0))
-                    SendLandCollisionEvent(scriptEvents.land_collision, ParentGroup.Scene.EventManager.TriggerScriptLandColliding);
-                else
-                    SendLandCollisionEvent(scriptEvents.land_collision_start, ParentGroup.Scene.EventManager.TriggerScriptLandCollidingStart);
-            }
+                SendLandCollisionEvent(scriptEvents.land_collision_start, ParentGroup.Scene.EventManager.TriggerScriptLandCollidingStart);
+            if (m_lastColliders.Contains(0))
+                SendLandCollisionEvent(scriptEvents.land_collision, ParentGroup.Scene.EventManager.TriggerScriptLandColliding);
             if (endedColliders.Contains(0))
                 SendLandCollisionEvent(scriptEvents.land_collision_end, ParentGroup.Scene.EventManager.TriggerScriptLandCollidingEnd);
         }
-- 
cgit v1.1


From ec5f17b2cecc38a21ae3b1276b3a391f7c004c5d Mon Sep 17 00:00:00 2001
From: Michael Cerquoni
Date: Tue, 10 Sep 2013 18:35:02 -0400
Subject: This extends the default max_distance for teleports to 16384, a big
 thank you to all of the viewer devs who made this possibe!

---
 bin/OpenSimDefaults.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 0a85085..28f0f4b 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -653,8 +653,8 @@
 
 [EntityTransfer]
     ; The maximum distance in regions that an agent is allowed to teleport along the x or y axis
-    ; This is set to 4095 because current viewers can't handle teleports that are greater than this distance
-    max_distance = 4095
+    ; This is set to 16384 because current viewers can't handle teleports that are greater than this distance
+    max_distance = 16384
 
     ; Minimum user level required for HyperGrid teleports
     LevelHGTeleport = 0
-- 
cgit v1.1


From 663059ac5c65f5fcf9e4313a2c2edfb5b5df0829 Mon Sep 17 00:00:00 2001
From: Michael Cerquoni
Date: Tue, 10 Sep 2013 19:56:39 -0400
Subject: chaning the default max_distance to 16383 as we actually start
 counting at zero, thank you dahlia for pointing this out.

---
 bin/OpenSimDefaults.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 28f0f4b..e168566 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -653,8 +653,8 @@
 
 [EntityTransfer]
     ; The maximum distance in regions that an agent is allowed to teleport along the x or y axis
-    ; This is set to 16384 because current viewers can't handle teleports that are greater than this distance
-    max_distance = 16384
+    ; This is set to 16383 because current viewers can't handle teleports that are greater than this distance
+    max_distance = 16383
 
     ; Minimum user level required for HyperGrid teleports
     LevelHGTeleport = 0
-- 
cgit v1.1


From 725751fd6c0101b8610e84716d28b6af91e20b61 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 6 Aug 2013 10:32:56 -0700
Subject: BulletSim: fixes for change linkset implementation of physical
 linksets.

---
 .../Scripting/ExtendedPhysics/ExtendedPhysics.cs   | 29 +++++++++++++++++++++-
 OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs  |  6 ++---
 .../Physics/BulletSPlugin/BSLinksetCompound.cs     | 14 +++++------
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  |  8 +++---
 .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 11 +++++---
 5 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
index d1d318c..4455df4 100755
--- a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
@@ -29,6 +29,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using System.Threading;
 
 using OpenSim.Framework;
 using OpenSim.Region.CoreModules;
@@ -198,7 +199,33 @@ public class ExtendedPhysics : INonSharedRegionModule
                 Physics.Manager.PhysicsActor rootPhysActor = rootPart.PhysActor;
                 if (rootPhysActor != null)
                 {
-                    ret = (int)rootPhysActor.Extension(PhysFunctSetLinksetType, linksetType);
+                    if (rootPhysActor.IsPhysical)
+                    {
+                        // Change a physical linkset by making non-physical, waiting for one heartbeat so all
+                        //    the prim and linkset state is updated, changing the type and making the
+                        //    linkset physical again.
+                        containingGroup.ScriptSetPhysicsStatus(false);
+                        Thread.Sleep(150);  // longer than one heartbeat tick
+
+                        // A kludge for the moment.
+                        // Since compound linksets move the children but don't generate position updates to the
+                        //     simulator, it is possible for compound linkset children to have out-of-sync simulator
+                        //     and physical positions. The following causes the simulator to push the real child positions
+                        //     down into the physics engine to get everything synced.
+                        containingGroup.UpdateGroupPosition(containingGroup.AbsolutePosition);
+                        containingGroup.UpdateGroupRotationR(containingGroup.GroupRotation);
+
+                        ret = (int)rootPhysActor.Extension(PhysFunctSetLinksetType, linksetType);
+                        Thread.Sleep(150);  // longer than one heartbeat tick
+
+                        containingGroup.ScriptSetPhysicsStatus(true);
+                    }
+                    else
+                    {
+                        // Non-physical linksets don't have a physical instantiation so there is no state to
+                        //    worry about being updated.
+                        ret = (int)rootPhysActor.Extension(PhysFunctSetLinksetType, linksetType);
+                    }
                 }
                 else
                 {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 3afd52e..a051002 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -148,7 +148,7 @@ public abstract class BSLinkset
     // Returns a new linkset for the child which is a linkset of one (just the
     //    orphened child).
     // Called at runtime.
-    public BSLinkset RemoveMeFromLinkset(BSPrimLinkable child)
+    public BSLinkset RemoveMeFromLinkset(BSPrimLinkable child, bool inTaintTime)
     {
         lock (m_linksetActivityLock)
         {
@@ -157,7 +157,7 @@ public abstract class BSLinkset
                 // Cannot remove the root from a linkset.
                 return this;
             }
-            RemoveChildFromLinkset(child);
+            RemoveChildFromLinkset(child, inTaintTime);
             LinksetMass = ComputeLinksetMass();
         }
 
@@ -255,7 +255,7 @@ public abstract class BSLinkset
 
     // 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);
+    protected abstract void RemoveChildFromLinkset(BSPrimLinkable child, bool inTaintTime);
 
     // When physical properties are changed the linkset needs to recalculate
     //   its internal properties.
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 085d195..47ab842 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -242,7 +242,7 @@ public sealed class BSLinksetCompound : BSLinkset
     {
         bool ret = false;
 
-        DetailLog("{0},BSLinksetCompound.RemoveBodyDependencies,refreshIfChild,rID={1},rBody={2},isRoot={3}",
+        DetailLog("{0},BSLinksetCompound.RemoveDependencies,refreshIfChild,rID={1},rBody={2},isRoot={3}",
                         child.LocalID, LinksetRoot.LocalID, LinksetRoot.PhysBody, IsRoot(child));
 
         ScheduleRebuild(child);
@@ -270,7 +270,7 @@ public sealed class BSLinksetCompound : BSLinkset
 
     // Remove the specified child from the linkset.
     // Safe to call even if the child is not really in the linkset.
-    protected override void RemoveChildFromLinkset(BSPrimLinkable child)
+    protected override void RemoveChildFromLinkset(BSPrimLinkable child, bool inTaintTime)
     {
         child.ClearDisplacement();
 
@@ -282,12 +282,12 @@ public sealed class BSLinksetCompound : BSLinkset
                             child.LocalID, child.PhysBody.AddrString);
 
             // Cause the child's body to be rebuilt and thus restored to normal operation
-            child.ForceBodyShapeRebuild(false);
+            child.ForceBodyShapeRebuild(inTaintTime);
 
             if (!HasAnyChildren)
             {
                 // The linkset is now empty. The root needs rebuilding.
-                LinksetRoot.ForceBodyShapeRebuild(false);
+                LinksetRoot.ForceBodyShapeRebuild(inTaintTime);
             }
             else
             {
@@ -318,10 +318,10 @@ public sealed class BSLinksetCompound : BSLinkset
             //     being destructed and going non-physical.
             LinksetRoot.ForceBodyShapeRebuild(true);
 
-            // There is no reason to build all this physical stuff for a non-physical linkset.
-            if (!LinksetRoot.IsPhysicallyActive)
+            // There is no reason to build all this physical stuff for a non-physical or empty linkset.
+            if (!LinksetRoot.IsPhysicallyActive || !HasAnyChildren)
             {
-                DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,notPhysical", LinksetRoot.LocalID);
+                DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,notPhysicalOrNoChildren", LinksetRoot.LocalID);
                 return; // Note the 'finally' clause at the botton which will get executed.
             }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index 4bac222..d4ee27d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -224,7 +224,7 @@ public sealed class BSLinksetConstraints : BSLinkset
 
     // Remove the specified child from the linkset.
     // Safe to call even if the child is not really in my linkset.
-    protected override void RemoveChildFromLinkset(BSPrimLinkable child)
+    protected override void RemoveChildFromLinkset(BSPrimLinkable child, bool inTaintTime)
     {
         if (m_children.Remove(child))
         {
@@ -236,7 +236,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                             rootx.LocalID, rootx.PhysBody.AddrString,
                             childx.LocalID, childx.PhysBody.AddrString);
 
-            m_physicsScene.TaintedObject("BSLinksetConstraints.RemoveChildFromLinkset", delegate()
+            m_physicsScene.TaintedObject(inTaintTime, "BSLinksetConstraints.RemoveChildFromLinkset", delegate()
             {
                 PhysicallyUnlinkAChildFromRoot(rootx, childx);
             });
@@ -382,9 +382,9 @@ public sealed class BSLinksetConstraints : BSLinkset
             Rebuilding = true;
 
             // There is no reason to build all this physical stuff for a non-physical linkset.
-            if (!LinksetRoot.IsPhysicallyActive)
+            if (!LinksetRoot.IsPhysicallyActive || !HasAnyChildren)
             {
-                DetailLog("{0},BSLinksetConstraint.RecomputeLinksetCompound,notPhysical", LinksetRoot.LocalID);
+                DetailLog("{0},BSLinksetConstraint.RecomputeLinksetCompound,notPhysicalOrNoChildren", LinksetRoot.LocalID);
                 return; // Note the 'finally' clause at the botton which will get executed.
             }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 7179a6d..38d1f88 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -66,7 +66,7 @@ public class BSPrimLinkable : BSPrimDisplaced
 
     public override void Destroy()
     {
-        Linkset = Linkset.RemoveMeFromLinkset(this);
+        Linkset = Linkset.RemoveMeFromLinkset(this, false /* inTaintTime */);
         base.Destroy();
     }
 
@@ -94,7 +94,7 @@ public class BSPrimLinkable : BSPrimDisplaced
         BSPhysObject parentBefore = Linkset.LinksetRoot;        // DEBUG
         int childrenBefore = Linkset.NumberOfChildren;          // DEBUG
 
-        Linkset = Linkset.RemoveMeFromLinkset(this);
+        Linkset = Linkset.RemoveMeFromLinkset(this, false /* inTaintTime*/);
 
         DetailLog("{0},BSPrimLinkset.delink,parentBefore={1},childrenBefore={2},parentAfter={3},childrenAfter={4}, ",
             LocalID, parentBefore.LocalID, childrenBefore, Linkset.LinksetRoot.LocalID, Linkset.NumberOfChildren);
@@ -240,6 +240,8 @@ public class BSPrimLinkable : BSPrimDisplaced
         bool ret = false;
         if (LinksetType != newType)
         {
+            DetailLog("{0},BSPrimLinkset.ConvertLinkset,oldT={1},newT={2}", LocalID, LinksetType, newType);
+
             // Set the implementation type first so the call to BSLinkset.Factory gets the new type.
             this.LinksetType = newType;
 
@@ -263,7 +265,10 @@ public class BSPrimLinkable : BSPrimDisplaced
             // 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);
+                oldLinkset.RemoveMeFromLinkset(child, true /*inTaintTime*/);
+            }
+            foreach (BSPrimLinkable child in children)
+            {
                 newLinkset.AddMeToLinkset(child);
                 child.Linkset = newLinkset;
             }
-- 
cgit v1.1


From 48ee73bfa771de64685a694417b34188f0a3350e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 7 Aug 2013 07:54:47 -0700
Subject: BulletSim: add API and calls for spring constraint parameters.

---
 OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs | 36 ++++++++++++++++++++
 OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs   | 38 ++++++++++++++++++++++
 .../Region/Physics/BulletSPlugin/BSApiTemplate.cs  |  8 +++++
 3 files changed, 82 insertions(+)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
index 12a0c17..6c36485 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
@@ -596,6 +596,30 @@ public override bool SetBreakingImpulseThreshold(BulletConstraint constrain, flo
     return BSAPICPP.SetBreakingImpulseThreshold2(constrainu.ptr, threshold);
 }
 
+public override bool SpringEnable(BulletConstraint constrain, int index, float numericTrueFalse)
+{
+    BulletConstraintUnman constrainu = constrain as BulletConstraintUnman;
+    return BSAPICPP.ConstraintSpringEnable2(constrainu.ptr, index, numericTrueFalse);
+}
+
+public override bool SpringSetEquilibriumPoint(BulletConstraint constrain, int index, float equilibriumPoint)
+{
+    BulletConstraintUnman constrainu = constrain as BulletConstraintUnman;
+    return BSAPICPP.ConstraintSpringSetEquilibriumPoint2(constrainu.ptr, index, equilibriumPoint);
+}
+
+public override bool SpringSetStiffness(BulletConstraint constrain, int index, float stiffnesss)
+{
+    BulletConstraintUnman constrainu = constrain as BulletConstraintUnman;
+    return BSAPICPP.ConstraintSpringSetStiffness2(constrainu.ptr, index, stiffnesss);
+}
+
+public override bool SpringSetDamping(BulletConstraint constrain, int index, float damping)
+{
+    BulletConstraintUnman constrainu = constrain as BulletConstraintUnman;
+    return BSAPICPP.ConstraintSpringSetDamping2(constrainu.ptr, index, damping);
+}
+
 public override bool CalculateTransforms(BulletConstraint constrain)
 {
     BulletConstraintUnman constrainu = constrain as BulletConstraintUnman;
@@ -1601,6 +1625,18 @@ public static extern bool TranslationalLimitMotor2(IntPtr constrain, float enabl
 public static extern bool SetBreakingImpulseThreshold2(IntPtr constrain, float threshold);
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
+public static extern bool ConstraintSpringEnable2(IntPtr constrain, int index, float numericTrueFalse);
+
+[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
+public static extern bool ConstraintSpringSetEquilibriumPoint2(IntPtr constrain, int index, float equilibriumPoint);
+
+[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
+public static extern bool ConstraintSpringSetStiffness2(IntPtr constrain, int index, float stiffness);
+
+[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
+public static extern bool ConstraintSpringSetDamping2(IntPtr constrain, int index, float damping);
+
+[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
 public static extern bool CalculateTransforms2(IntPtr constrain);
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
index 2a820be..9ad12a9 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
@@ -752,6 +752,44 @@ private sealed class BulletConstraintXNA : BulletConstraint
         constraint.SetBreakingImpulseThreshold(threshold);
         return true;
     }
+    public override bool SpringEnable(BulletConstraint pConstraint, int index, float numericTrueFalse)
+    {
+        Generic6DofSpringConstraint constraint = (pConstraint as BulletConstraintXNA).constrain as Generic6DofSpringConstraint;
+        constraint.EnableSpring(index, (numericTrueFalse == 0f ? false : true));
+        return true;
+    }
+
+    public override bool SpringSetEquilibriumPoint(BulletConstraint pConstraint, int index, float equilibriumPoint)
+    {
+        Generic6DofSpringConstraint constraint = (pConstraint as BulletConstraintXNA).constrain as Generic6DofSpringConstraint;
+        if (index == -1)
+        {
+            constraint.SetEquilibriumPoint();
+        }
+        else
+        {
+            if (equilibriumPoint == -1)
+                constraint.SetEquilibriumPoint(index);
+            else
+                constraint.SetEquilibriumPoint(index, equilibriumPoint);
+        }
+        return true;
+    }
+
+    public override bool SpringSetStiffness(BulletConstraint pConstraint, int index, float stiffness)
+    {
+        Generic6DofSpringConstraint constraint = (pConstraint as BulletConstraintXNA).constrain as Generic6DofSpringConstraint;
+        constraint.SetStiffness(index, stiffness);
+        return true;
+    }
+
+    public override bool SpringSetDamping(BulletConstraint pConstraint, int index, float damping)
+    {
+        Generic6DofSpringConstraint constraint = (pConstraint as BulletConstraintXNA).constrain as Generic6DofSpringConstraint;
+        constraint.SetDamping(index, damping);
+        return true;
+    }
+
     //BulletSimAPI.SetAngularDamping(Prim.PhysBody.ptr, angularDamping);
     public override void SetAngularDamping(BulletBody pBody, float angularDamping)
     {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index 6cdc112..8cca29f 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -441,6 +441,14 @@ public abstract bool TranslationalLimitMotor(BulletConstraint constrain, float e
 
 public abstract bool SetBreakingImpulseThreshold(BulletConstraint constrain, float threshold);
 
+public abstract bool SpringEnable(BulletConstraint constrain, int index, float numericTrueFalse);
+
+public abstract bool SpringSetEquilibriumPoint(BulletConstraint constrain, int index, float equilibriumPoint);
+
+public abstract bool SpringSetStiffness(BulletConstraint constrain, int index, float stiffnesss);
+
+public abstract bool SpringSetDamping(BulletConstraint constrain, int index, float damping);
+
 public abstract bool CalculateTransforms(BulletConstraint constrain);
 
 public abstract bool SetConstraintParam(BulletConstraint constrain, ConstraintParams paramIndex, float value, ConstraintParamAxis axis);
-- 
cgit v1.1


From 9a7d0e489cf726f00379917cd507839d5fe56725 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 7 Aug 2013 07:55:46 -0700
Subject: BulletSim: add spring constraint to linkset constraint types.

---
 .../Physics/BulletSPlugin/BSConstraintSpring.cs    | 85 ++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100755 OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs
new file mode 100755
index 0000000..01d67d4
--- /dev/null
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs
@@ -0,0 +1,85 @@
+/*
+ * 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;
+using OpenMetaverse;
+
+namespace OpenSim.Region.Physics.BulletSPlugin
+{
+
+public sealed class BSConstraintSpring : BSConstraint6Dof
+{
+    public override ConstraintType Type { get { return ConstraintType.D6_SPRING_CONSTRAINT_TYPE; } }
+
+    public BSConstraintSpring(BulletWorld world, BulletBody obj1, BulletBody obj2,
+                    Vector3 frame1Loc, Quaternion frame1Rot,
+                    Vector3 frame2Loc, Quaternion frame2Rot,
+                    bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies)
+        :base(world, obj1, obj2)
+    {
+        m_constraint = PhysicsScene.PE.Create6DofSpringConstraint(world, obj1, obj2,
+                                frame1Loc, frame1Rot, frame2Loc, frame2Rot,
+                                useLinearReferenceFrameA, disableCollisionsBetweenLinkedBodies);
+        m_enabled = true;
+
+        world.physicsScene.DetailLog("{0},BSConstraintSpring,createFrame,wID={1}, rID={2}, rBody={3}, cID={4}, cBody={5}",
+                            BSScene.DetailLogZero, world.worldID,
+                            obj1.ID, obj1.AddrString, obj2.ID, obj2.AddrString);
+    }
+
+    public bool SetEnable(int index, bool axisEnable)
+    {
+        bool ret = false;
+
+        return ret;
+    }
+
+    public bool SetStiffness(int index, float stiffness)
+    {
+        bool ret = false;
+
+        return ret;
+    }
+
+    public bool SetDamping(int index, float damping)
+    {
+        bool ret = false;
+
+        return ret;
+    }
+
+    public bool SetEquilibriumPoint(int index, float eqPoint)
+    {
+        bool ret = false;
+
+        return ret;
+    }
+
+}
+
+}
\ No newline at end of file
-- 
cgit v1.1


From 0971c7ae77cae3d238be31f46994b4692af949e3 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 7 Aug 2013 07:56:37 -0700
Subject: BulletSim: complete linkage of spring constraint into linkset
 constraint.

---
 .../Physics/BulletSPlugin/BSConstraint6Dof.cs      |  9 ++-
 OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs  |  2 +
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  | 81 ++++++++++++++++++----
 3 files changed, 77 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs
index d0949f5..5008ff7 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs
@@ -32,12 +32,19 @@ using OpenMetaverse;
 namespace OpenSim.Region.Physics.BulletSPlugin
 {
 
-public sealed class BSConstraint6Dof : BSConstraint
+public class BSConstraint6Dof : BSConstraint
 {
     private static string LogHeader = "[BULLETSIM 6DOF CONSTRAINT]";
 
     public override ConstraintType Type { get { return ConstraintType.D6_CONSTRAINT_TYPE; } }
 
+    public BSConstraint6Dof(BulletWorld world, BulletBody obj1, BulletBody obj2) :base(world)
+    {
+        m_body1 = obj1;
+        m_body2 = obj2;
+        m_enabled = false;
+    }
+
     // Create a btGeneric6DofConstraint
     public BSConstraint6Dof(BulletWorld world, BulletBody obj1, BulletBody obj2,
                     Vector3 frame1, Quaternion frame1rot,
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index a051002..d4b1c1e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -77,6 +77,8 @@ public abstract class BSLinkset
         {
             member = pMember;
         }
+        public virtual void ResetLink() { }
+        public virtual void SetLinkParameters(BSConstraint constrain) { }
     }
 
     public LinksetImplementation LinksetImpl { get; protected set; }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index d4ee27d..f3b70c3 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -51,16 +51,26 @@ public sealed class BSLinksetConstraints : BSLinkset
         public float cfm;
         public float erp;
         public float solverIterations;
+        //
+        public OMV.Vector3 frameInAloc;
+        public OMV.Quaternion frameInArot;
+        public OMV.Vector3 frameInBloc;
+        public OMV.Quaternion frameInBrot;
+        // Spring
+        public float springDamping;
+        public float springStiffness;
+
+
 
         public BSLinkInfoConstraint(BSPrimLinkable pMember)
             : base(pMember)
         {
             constraint = null;
-            ResetToFixedConstraint();
+            ResetLink();
         }
 
         // Set all the parameters for this constraint to a fixed, non-movable constraint.
-        public void ResetToFixedConstraint()
+        public override void ResetLink()
         {
             constraintType = ConstraintType.D6_CONSTRAINT_TYPE;
             linearLimitLow = OMV.Vector3.Zero;
@@ -74,10 +84,16 @@ public sealed class BSLinksetConstraints : BSLinkset
             cfm = BSParam.LinkConstraintCFM;
             erp = BSParam.LinkConstraintERP;
             solverIterations = BSParam.LinkConstraintSolverIterations;
+            frameInAloc = OMV.Vector3.Zero;
+            frameInArot = OMV.Quaternion.Identity;
+            frameInBloc = OMV.Vector3.Zero;
+            frameInBrot = OMV.Quaternion.Identity;
+            springDamping = -1f;
+            springStiffness = -1f;
         }
 
         // Given a constraint, apply the current constraint parameters to same.
-        public void SetConstraintParameters(BSConstraint constrain)
+        public override void SetLinkParameters(BSConstraint constrain)
         {
             switch (constraintType)
             {
@@ -85,6 +101,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                     BSConstraint6Dof constrain6dof = constrain as BSConstraint6Dof;
                     if (constrain6dof != null)
                     {
+                        // NOTE: D6_SPRING_CONSTRAINT_TYPE should be updated if you change any of this code.
                         // zero linear and angular limits makes the objects unable to move in relation to each other
                         constrain6dof.SetLinearLimits(linearLimitLow, linearLimitHigh);
                         constrain6dof.SetAngularLimits(angularLimitLow, angularLimitHigh);
@@ -99,6 +116,31 @@ public sealed class BSLinksetConstraints : BSLinkset
                         }
                     }
                     break;
+                case ConstraintType.D6_SPRING_CONSTRAINT_TYPE:
+                    BSConstraintSpring constrainSpring = constrain as BSConstraintSpring;
+                    if (constrainSpring != null)
+                    {
+                        // zero linear and angular limits makes the objects unable to move in relation to each other
+                        constrainSpring.SetLinearLimits(linearLimitLow, linearLimitHigh);
+                        constrainSpring.SetAngularLimits(angularLimitLow, angularLimitHigh);
+
+                        // tweek the constraint to increase stability
+                        constrainSpring.UseFrameOffset(useFrameOffset);
+                        constrainSpring.TranslationalLimitMotor(enableTransMotor, transMotorMaxVel, transMotorMaxForce);
+                        constrainSpring.SetCFMAndERP(cfm, erp);
+                        if (solverIterations != 0f)
+                        {
+                            constrainSpring.SetSolverIterations(solverIterations);
+                        }
+                        for (int ii = 0; ii < 6; ii++)
+                        {
+                            if (springDamping != -1)
+                                constrainSpring.SetDamping(ii, springDamping);
+                            if (springStiffness != -1)
+                            constrainSpring.SetStiffness(ii, springStiffness);
+                        }
+                    }
+                    break;
                 default:
                     break;
             }
@@ -262,8 +304,8 @@ public sealed class BSLinksetConstraints : BSLinkset
     // Create a static constraint between the two passed objects
     private BSConstraint BuildConstraint(BSPrimLinkable rootPrim, BSLinkInfo li)
     {
-        BSLinkInfoConstraint liConstraint = li as BSLinkInfoConstraint;
-        if (liConstraint == null)
+        BSLinkInfoConstraint linkInfo = li as BSLinkInfoConstraint;
+        if (linkInfo == null)
             return null;
 
         // Zero motion for children so they don't interpolate
@@ -271,27 +313,25 @@ public sealed class BSLinksetConstraints : BSLinkset
 
         BSConstraint constrain = null;
 
-        switch (liConstraint.constraintType)
+        switch (linkInfo.constraintType)
         {
             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;
+                OMV.Vector3 childRelativePosition = linkInfo.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);
+                DetailLog("{0},BSLinksetConstraint.BuildConstraint,6Dof,rBody={1},cBody={2},rLoc={3},cLoc={4},midLoc={7}",
+                                                rootPrim.LocalID, rootPrim.PhysBody, linkInfo.member.PhysBody,
+                                                rootPrim.Position, linkInfo.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 );
+                                    m_physicsScene.World, rootPrim.PhysBody, linkInfo.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
@@ -320,11 +360,23 @@ public sealed class BSLinksetConstraints : BSLinkset
                 */
 
                 break;
+            case ConstraintType.D6_SPRING_CONSTRAINT_TYPE:
+                constrain = new BSConstraintSpring(m_physicsScene.World, rootPrim.PhysBody, linkInfo.member.PhysBody,
+                                linkInfo.frameInAloc, linkInfo.frameInArot, linkInfo.frameInBloc, linkInfo.frameInBrot,
+                                true /*useLinearReferenceFrameA*/,
+                                true /*disableCollisionsBetweenLinkedBodies*/);
+                DetailLog("{0},BSLinksetConstraint.BuildConstraint,spring,root={1},rBody={2},child={3},cBody={4},rLoc={5},cLoc={6},midLoc={7}",
+                                                rootPrim.LocalID,
+                                                rootPrim.LocalID, rootPrim.PhysBody.AddrString,
+                                                linkInfo.member.LocalID, linkInfo.member.PhysBody.AddrString,
+                                                rootPrim.Position, linkInfo.member.Position);
+
+                break;
             default:
                 break;
         }
 
-        liConstraint.SetConstraintParameters(constrain);
+        linkInfo.SetLinkParameters(constrain);
 
         m_physicsScene.Constraints.AddConstraint(constrain);
 
@@ -401,6 +453,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                     // If constraint doesn't exist yet, create it.
                     constrain = BuildConstraint(LinksetRoot, li);
                 }
+                li.SetLinkParameters(constrain);
                 constrain.RecomputeConstraintVariables(linksetMass);
 
                 // PhysicsScene.PE.DumpConstraint(PhysicsScene.World, constrain.Constraint);    // DEBUG DEBUG
-- 
cgit v1.1


From 993bcec088ce5c3ec2f76f61842f19cbdcc89384 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 7 Aug 2013 10:15:28 -0700
Subject: BulletSim: add unmanaged and XNA functions for hinge, slider and
 spring constraints.

---
 OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs |  45 ++++++
 OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs   | 174 ++++++++++++++++++++-
 .../Region/Physics/BulletSPlugin/BSApiTemplate.cs  |  24 +++
 3 files changed, 241 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
index 6c36485..8dfb01c 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
@@ -596,6 +596,12 @@ public override bool SetBreakingImpulseThreshold(BulletConstraint constrain, flo
     return BSAPICPP.SetBreakingImpulseThreshold2(constrainu.ptr, threshold);
 }
 
+public override bool HingeSetLimits(BulletConstraint constrain, float low, float high, float softness, float bias, float relaxation)
+{
+    BulletConstraintUnman constrainu = constrain as BulletConstraintUnman;
+    return BSAPICPP.HingeSetLimits2(constrainu.ptr, low, high, softness, bias, relaxation);
+}
+
 public override bool SpringEnable(BulletConstraint constrain, int index, float numericTrueFalse)
 {
     BulletConstraintUnman constrainu = constrain as BulletConstraintUnman;
@@ -620,6 +626,30 @@ public override bool SpringSetDamping(BulletConstraint constrain, int index, flo
     return BSAPICPP.ConstraintSpringSetDamping2(constrainu.ptr, index, damping);
 }
 
+public override bool SliderSetLimits(BulletConstraint constrain, int lowerUpper, int linAng, float val)
+{
+    BulletConstraintUnman constrainu = constrain as BulletConstraintUnman;
+    return BSAPICPP.SliderSetLimits2(constrainu.ptr, lowerUpper, linAng, val);
+}
+
+public override bool SliderSet(BulletConstraint constrain, int softRestDamp, int dirLimOrtho, int linAng, float val)
+{
+    BulletConstraintUnman constrainu = constrain as BulletConstraintUnman;
+    return BSAPICPP.SliderSet2(constrainu.ptr, softRestDamp, dirLimOrtho, linAng, val);
+}
+
+public override bool SliderMotorEnable(BulletConstraint constrain, int linAng, float numericTrueFalse)
+{
+    BulletConstraintUnman constrainu = constrain as BulletConstraintUnman;
+    return BSAPICPP.SliderMotorEnable2(constrainu.ptr, linAng, numericTrueFalse);
+}
+
+public override bool SliderMotor(BulletConstraint constrain, int forceVel, int linAng, float val)
+{
+    BulletConstraintUnman constrainu = constrain as BulletConstraintUnman;
+    return BSAPICPP.SliderMotor2(constrainu.ptr, forceVel, linAng, val);
+}
+
 public override bool CalculateTransforms(BulletConstraint constrain)
 {
     BulletConstraintUnman constrainu = constrain as BulletConstraintUnman;
@@ -1625,6 +1655,9 @@ public static extern bool TranslationalLimitMotor2(IntPtr constrain, float enabl
 public static extern bool SetBreakingImpulseThreshold2(IntPtr constrain, float threshold);
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
+public static extern bool HingeSetLimits2(IntPtr constrain, float low, float high, float softness, float bias, float relaxation);
+
+[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
 public static extern bool ConstraintSpringEnable2(IntPtr constrain, int index, float numericTrueFalse);
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
@@ -1637,6 +1670,18 @@ public static extern bool ConstraintSpringSetStiffness2(IntPtr constrain, int in
 public static extern bool ConstraintSpringSetDamping2(IntPtr constrain, int index, float damping);
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
+public static extern bool SliderSetLimits2(IntPtr constrain, int lowerUpper, int linAng, float val);
+
+[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
+public static extern bool SliderSet2(IntPtr constrain, int softRestDamp, int dirLimOrtho, int linAng, float val);
+
+[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
+public static extern bool SliderMotorEnable2(IntPtr constrain, int linAng, float numericTrueFalse);
+
+[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
+public static extern bool SliderMotor2(IntPtr constrain, int forceVel, int linAng, float val);
+
+[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
 public static extern bool CalculateTransforms2(IntPtr constrain);
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
index 9ad12a9..ff2b497 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
@@ -752,6 +752,15 @@ private sealed class BulletConstraintXNA : BulletConstraint
         constraint.SetBreakingImpulseThreshold(threshold);
         return true;
     }
+    public override bool HingeSetLimits(BulletConstraint pConstraint, float low, float high, float softness, float bias, float relaxation)
+    {
+        HingeConstraint constraint = (pConstraint as BulletConstraintXNA).constrain as HingeConstraint;
+        if (softness == HINGE_NOT_SPECIFIED)
+            constraint.SetLimit(low, high);
+        else
+            constraint.SetLimit(low, high, softness, bias, relaxation);
+        return true;
+    }
     public override bool SpringEnable(BulletConstraint pConstraint, int index, float numericTrueFalse)
     {
         Generic6DofSpringConstraint constraint = (pConstraint as BulletConstraintXNA).constrain as Generic6DofSpringConstraint;
@@ -762,13 +771,13 @@ private sealed class BulletConstraintXNA : BulletConstraint
     public override bool SpringSetEquilibriumPoint(BulletConstraint pConstraint, int index, float equilibriumPoint)
     {
         Generic6DofSpringConstraint constraint = (pConstraint as BulletConstraintXNA).constrain as Generic6DofSpringConstraint;
-        if (index == -1)
+        if (index == SPRING_NOT_SPECIFIED)
         {
             constraint.SetEquilibriumPoint();
         }
         else
         {
-            if (equilibriumPoint == -1)
+            if (equilibriumPoint == SPRING_NOT_SPECIFIED)
                 constraint.SetEquilibriumPoint(index);
             else
                 constraint.SetEquilibriumPoint(index, equilibriumPoint);
@@ -790,6 +799,167 @@ private sealed class BulletConstraintXNA : BulletConstraint
         return true;
     }
 
+    public override bool SliderSetLimits(BulletConstraint pConstraint, int lowerUpper, int linAng, float val)
+    {
+        SliderConstraint constraint = (pConstraint as BulletConstraintXNA).constrain as SliderConstraint;
+		switch (lowerUpper)
+		{
+			case SLIDER_LOWER_LIMIT:
+				switch (linAng)
+				{
+					case SLIDER_LINEAR:
+						constraint.SetLowerLinLimit(val);
+						break;
+					case SLIDER_ANGULAR:
+						constraint.SetLowerAngLimit(val);
+						break;
+				}
+				break;
+			case SLIDER_UPPER_LIMIT:
+				switch (linAng)
+				{
+					case SLIDER_LINEAR:
+						constraint.SetUpperLinLimit(val);
+						break;
+					case SLIDER_ANGULAR:
+						constraint.SetUpperAngLimit(val);
+						break;
+				}
+				break;
+		}
+        return true;
+    }
+    public override bool SliderSet(BulletConstraint pConstraint, int softRestDamp, int dirLimOrtho, int linAng, float val)
+    {
+        SliderConstraint constraint = (pConstraint as BulletConstraintXNA).constrain as SliderConstraint;
+		switch (softRestDamp)
+		{
+			case SLIDER_SET_SOFTNESS:
+				switch (dirLimOrtho)
+				{
+					case SLIDER_SET_DIRECTION:
+						switch (linAng)
+						{
+							case SLIDER_LINEAR: constraint.SetSoftnessDirLin(val); break;
+							case SLIDER_ANGULAR: constraint.SetSoftnessDirAng(val); break;
+						}
+						break;
+					case SLIDER_SET_LIMIT:
+						switch (linAng)
+						{
+							case SLIDER_LINEAR: constraint.SetSoftnessLimLin(val); break;
+							case SLIDER_ANGULAR: constraint.SetSoftnessLimAng(val); break;
+						}
+						break;
+					case SLIDER_SET_ORTHO:
+						switch (linAng)
+						{
+							case SLIDER_LINEAR: constraint.SetSoftnessOrthoLin(val); break;
+							case SLIDER_ANGULAR: constraint.SetSoftnessOrthoAng(val); break;
+						}
+						break;
+				}
+				break;
+			case SLIDER_SET_RESTITUTION:
+				switch (dirLimOrtho)
+				{
+					case SLIDER_SET_DIRECTION:
+						switch (linAng)
+						{
+							case SLIDER_LINEAR: constraint.SetRestitutionDirLin(val); break;
+							case SLIDER_ANGULAR: constraint.SetRestitutionDirAng(val); break;
+						}
+						break;
+					case SLIDER_SET_LIMIT:
+						switch (linAng)
+						{
+							case SLIDER_LINEAR: constraint.SetRestitutionLimLin(val); break;
+							case SLIDER_ANGULAR: constraint.SetRestitutionLimAng(val); break;
+						}
+						break;
+					case SLIDER_SET_ORTHO:
+						switch (linAng)
+						{
+							case SLIDER_LINEAR: constraint.SetRestitutionOrthoLin(val); break;
+							case SLIDER_ANGULAR: constraint.SetRestitutionOrthoAng(val); break;
+						}
+						break;
+				}
+				break;
+			case SLIDER_SET_DAMPING:
+				switch (dirLimOrtho)
+				{
+					case SLIDER_SET_DIRECTION:
+						switch (linAng)
+						{
+							case SLIDER_LINEAR: constraint.SetDampingDirLin(val); break;
+							case SLIDER_ANGULAR: constraint.SetDampingDirAng(val); break;
+						}
+						break;
+					case SLIDER_SET_LIMIT:
+						switch (linAng)
+						{
+							case SLIDER_LINEAR: constraint.SetDampingLimLin(val); break;
+							case SLIDER_ANGULAR: constraint.SetDampingLimAng(val); break;
+						}
+						break;
+					case SLIDER_SET_ORTHO:
+						switch (linAng)
+						{
+							case SLIDER_LINEAR: constraint.SetDampingOrthoLin(val); break;
+							case SLIDER_ANGULAR: constraint.SetDampingOrthoAng(val); break;
+						}
+						break;
+				}
+				break;
+		}
+        return true;
+    }
+    public override bool SliderMotorEnable(BulletConstraint pConstraint, int linAng, float numericTrueFalse)
+    {
+        SliderConstraint constraint = (pConstraint as BulletConstraintXNA).constrain as SliderConstraint;
+		switch (linAng)
+		{
+			case SLIDER_LINEAR:
+				constraint.SetPoweredLinMotor(numericTrueFalse == 0.0 ? false : true);
+				break;
+			case SLIDER_ANGULAR:
+				constraint.SetPoweredAngMotor(numericTrueFalse == 0.0 ? false : true);
+				break;
+		}
+        return true;
+    }
+    public override bool SliderMotor(BulletConstraint pConstraint, int forceVel, int linAng, float val)
+    {
+        SliderConstraint constraint = (pConstraint as BulletConstraintXNA).constrain as SliderConstraint;
+		switch (forceVel)
+		{
+			case SLIDER_MOTOR_VELOCITY:
+				switch (linAng)
+				{
+					case SLIDER_LINEAR:
+						constraint.SetTargetLinMotorVelocity(val);
+						break;
+					case SLIDER_ANGULAR:
+						constraint.SetTargetAngMotorVelocity(val);
+						break;
+				}
+				break;
+			case SLIDER_MAX_MOTOR_FORCE:
+				switch (linAng)
+				{
+					case SLIDER_LINEAR:
+						constraint.SetMaxLinMotorForce(val);
+						break;
+					case SLIDER_ANGULAR:
+						constraint.SetMaxAngMotorForce(val);
+						break;
+				}
+				break;
+		}
+        return true;
+    }
+
     //BulletSimAPI.SetAngularDamping(Prim.PhysBody.ptr, angularDamping);
     public override void SetAngularDamping(BulletBody pBody, float angularDamping)
     {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index 8cca29f..b241059 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -441,14 +441,38 @@ public abstract bool TranslationalLimitMotor(BulletConstraint constrain, float e
 
 public abstract bool SetBreakingImpulseThreshold(BulletConstraint constrain, float threshold);
 
+public const int HINGE_NOT_SPECIFIED = -1;
+public abstract bool HingeSetLimits(BulletConstraint constrain, float low, float high, float softness, float bias, float relaxation);
+
 public abstract bool SpringEnable(BulletConstraint constrain, int index, float numericTrueFalse);
 
+public const int SPRING_NOT_SPECIFIED = -1;
 public abstract bool SpringSetEquilibriumPoint(BulletConstraint constrain, int index, float equilibriumPoint);
 
 public abstract bool SpringSetStiffness(BulletConstraint constrain, int index, float stiffnesss);
 
 public abstract bool SpringSetDamping(BulletConstraint constrain, int index, float damping);
 
+public const int SLIDER_LOWER_LIMIT = 0;
+public const int SLIDER_UPPER_LIMIT = 1;
+public const int SLIDER_LINEAR = 2;
+public const int SLIDER_ANGULAR = 3;
+public abstract bool SliderSetLimits(BulletConstraint constrain, int lowerUpper, int linAng, float val);
+
+public const int SLIDER_SET_SOFTNESS = 4;
+public const int SLIDER_SET_RESTITUTION = 5;
+public const int SLIDER_SET_DAMPING = 6;
+public const int SLIDER_SET_DIRECTION = 7;
+public const int SLIDER_SET_LIMIT = 8;
+public const int SLIDER_SET_ORTHO = 9;
+public abstract bool SliderSet(BulletConstraint constrain, int softRestDamp, int dirLimOrtho, int linAng, float val);
+
+public abstract bool SliderMotorEnable(BulletConstraint constrain, int linAng, float numericTrueFalse);
+
+public const int SLIDER_MOTOR_VELOCITY = 10;
+public const int SLIDER_MAX_MOTOR_FORCE = 11;
+public abstract bool SliderMotor(BulletConstraint constrain, int forceVel, int linAng, float val);
+
 public abstract bool CalculateTransforms(BulletConstraint constrain);
 
 public abstract bool SetConstraintParam(BulletConstraint constrain, ConstraintParams paramIndex, float value, ConstraintParamAxis axis);
-- 
cgit v1.1


From c6a6631efc74ac8c139e0ae8cad683496fdd0050 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 7 Aug 2013 10:24:37 -0700
Subject: BulletSim: move linkset extension operations into BSPrimLinkable
 where they should be.

---
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     | 32 +----------------
 .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 41 ++++++++++++++++++++++
 2 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index d5b999d..4685b48 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
     [Serializable]
 public class BSPrim : BSPhysObject
 {
-    private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+    protected static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
     private static readonly string LogHeader = "[BULLETS PRIM]";
 
     // _size is what the user passed. Scale is what we pass to the physics engine with the mesh.
@@ -1555,36 +1555,6 @@ public class BSPrim : BSPhysObject
         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;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 38d1f88..fc639ad 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -41,6 +41,8 @@ public class BSPrimLinkable : BSPrimDisplaced
     //    operations necessary for keeping the linkset created and, additionally, this
     //    calls the linkset implementation for its creation and management.
 
+    private static readonly string LogHeader = "[BULLETS PRIMLINKABLE]";
+
     // This adds the overrides for link() and delink() so the prim is linkable.
 
     public BSLinkset Linkset { get; set; }
@@ -279,5 +281,44 @@ public class BSPrimLinkable : BSPrimDisplaced
         }
         return ret;
     }
+
+    #region Extension
+    public override object Extension(string pFunct, params object[] pParams)
+    {
+        object ret = null;
+        switch (pFunct)
+        {
+            case BSScene.PhysFunctGetLinksetType:
+            {
+                ret = (object)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];
+                    if (Linkset.IsRoot(this))
+                    {
+                        PhysScene.TaintedObject("BSPrim.PhysFunctSetLinksetType", delegate()
+                        {
+                            // Cause the linkset type to change
+                            m_log.DebugFormat("{0} Extension.physSetLinksetType, oldType={1}, newType={2}",
+                                                LogHeader, Linkset.LinksetImpl, linksetType);
+                            ConvertLinkset(linksetType);
+                        });
+                    }
+                    ret = (object)(int)linksetType;
+                }
+                break;
+            }
+            default:
+                ret = base.Extension(pFunct, pParams);
+                break;
+        }
+        return ret;
+    }
+    #endregion  // Extension
 }
 }
-- 
cgit v1.1


From f3cc20050e8e4ce047509589f828ccafbc59e3a9 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 7 Aug 2013 11:13:53 -0700
Subject: BulletSim: initial implementation of physChangeLinkFixed that resets
 a linkset's link back to a fixed, non-moving connection.

---
 .../Scripting/ExtendedPhysics/ExtendedPhysics.cs   | 82 +++++++++++++++++++++-
 .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 29 +++++---
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs    |  4 ++
 3 files changed, 105 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
index 4455df4..decb61a 100755
--- a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
@@ -61,6 +61,10 @@ public class ExtendedPhysics : INonSharedRegionModule
     // Per prim functions. See BSPrim.
     public const string PhysFunctGetLinksetType = "BulletSim.GetLinksetType";
     public const string PhysFunctSetLinksetType = "BulletSim.SetLinksetType";
+    public const string PhysFunctChangeLinkFixed = "BulletSim.ChangeLinkFixed";
+    public const string PhysFunctChangeLinkHinge = "BulletSim.ChangeLinkHinge";
+    public const string PhysFunctChangeLinkSpring = "BulletSim.ChangeLinkSpring";
+    public const string PhysFunctChangeLinkSlider = "BulletSim.ChangeLinkSlider";
 
     // =============================================================
 
@@ -250,7 +254,6 @@ public class ExtendedPhysics : INonSharedRegionModule
     public int physGetLinksetType(UUID hostID, UUID scriptID)
     {
         int ret = -1;
-
         if (!Enabled) return ret;
 
         // The part that is requesting the change.
@@ -287,5 +290,82 @@ public class ExtendedPhysics : INonSharedRegionModule
         }
         return ret;
     }
+
+    [ScriptInvocation]
+    public int physChangeLinkFixed(UUID hostID, UUID scriptID, int linkNum)
+    {
+        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)
+                {
+                    SceneObjectPart linkPart = containingGroup.GetLinkNumPart(linkNum);
+                    if (linkPart != null)
+                    {
+                        Physics.Manager.PhysicsActor linkPhysActor = linkPart.PhysActor;
+                        if (linkPhysActor != null)
+                        {
+                            ret = (int)rootPhysActor.Extension(PhysFunctChangeLinkFixed, linkNum, linkPhysActor);
+                        }
+                        else
+                        {
+                            m_log.WarnFormat("{0} physChangeLinkFixed: Link part has no physical actor. rootName={1}, hostID={2}, linknum={3}",
+                                                LogHeader, rootPart.Name, hostID, linkNum);
+                        }
+                    }
+                    else
+                    {
+                        m_log.WarnFormat("{0} physChangeLinkFixed: Could not find linknum part. rootName={1}, hostID={2}, linknum={3}",
+                                            LogHeader, rootPart.Name, hostID, linkNum);
+                    }
+                }
+                else
+                {
+                    m_log.WarnFormat("{0} physChangeLinkFixed: Root part does not have a physics actor. rootName={1}, hostID={2}",
+                                        LogHeader, rootPart.Name, hostID);
+                }
+            }
+            else
+            {
+                m_log.WarnFormat("{0} physChangeLinkFixed: 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;
+    }
+
+    [ScriptInvocation]
+    public int physChangeLinkHinge(UUID hostID, UUID scriptID, int linkNum)
+    {
+        return 0;
+    }
+
+    [ScriptInvocation]
+    public int physChangeLinkSpring(UUID hostID, UUID scriptID, int linkNum)
+    {
+        return 0;
+    }
+
+    [ScriptInvocation]
+    public int physChangeLinkSlider(UUID hostID, UUID scriptID, int linkNum)
+    {
+        return 0;
+    }
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index fc639ad..77d8246 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -60,10 +60,7 @@ public class BSPrimLinkable : BSPrimDisplaced
 
         Linkset = BSLinkset.Factory(PhysScene, this);
 
-        PhysScene.TaintedObject("BSPrimLinksetCompound.Refresh", delegate()
-        {
-            Linkset.Refresh(this);
-        });
+        Linkset.Refresh(this);
     }
 
     public override void Destroy()
@@ -82,7 +79,7 @@ public class BSPrimLinkable : BSPrimDisplaced
 
             Linkset = parent.Linkset.AddMeToLinkset(this);
 
-            DetailLog("{0},BSPrimLinkset.link,call,parentBefore={1}, childrenBefore=={2}, parentAfter={3}, childrenAfter={4}",
+            DetailLog("{0},BSPrimLinkable.link,call,parentBefore={1}, childrenBefore=={2}, parentAfter={3}, childrenAfter={4}",
                 LocalID, parentBefore.LocalID, childrenBefore, Linkset.LinksetRoot.LocalID, Linkset.NumberOfChildren);
         }
         return;
@@ -98,7 +95,7 @@ public class BSPrimLinkable : BSPrimDisplaced
 
         Linkset = Linkset.RemoveMeFromLinkset(this, false /* inTaintTime*/);
 
-        DetailLog("{0},BSPrimLinkset.delink,parentBefore={1},childrenBefore={2},parentAfter={3},childrenAfter={4}, ",
+        DetailLog("{0},BSPrimLinkable.delink,parentBefore={1},childrenBefore={2},parentAfter={3},childrenAfter={4}, ",
             LocalID, parentBefore.LocalID, childrenBefore, Linkset.LinksetRoot.LocalID, Linkset.NumberOfChildren);
         return;
     }
@@ -110,7 +107,7 @@ public class BSPrimLinkable : BSPrimDisplaced
         set
         {
             base.Position = value;
-            PhysScene.TaintedObject("BSPrimLinkset.setPosition", delegate()
+            PhysScene.TaintedObject("BSPrimLinkable.setPosition", delegate()
             {
                 Linkset.UpdateProperties(UpdatedProperties.Position, this);
             });
@@ -124,7 +121,7 @@ public class BSPrimLinkable : BSPrimDisplaced
         set
         {
             base.Orientation = value;
-            PhysScene.TaintedObject("BSPrimLinkset.setOrientation", delegate()
+            PhysScene.TaintedObject("BSPrimLinkable.setOrientation", delegate()
             {
                 Linkset.UpdateProperties(UpdatedProperties.Orientation, this);
             });
@@ -242,7 +239,7 @@ public class BSPrimLinkable : BSPrimDisplaced
         bool ret = false;
         if (LinksetType != newType)
         {
-            DetailLog("{0},BSPrimLinkset.ConvertLinkset,oldT={1},newT={2}", LocalID, LinksetType, newType);
+            DetailLog("{0},BSPrimLinkable.ConvertLinkset,oldT={1},newT={2}", LocalID, LinksetType, newType);
 
             // Set the implementation type first so the call to BSLinkset.Factory gets the new type.
             this.LinksetType = newType;
@@ -288,12 +285,14 @@ public class BSPrimLinkable : BSPrimDisplaced
         object ret = null;
         switch (pFunct)
         {
+            // physGetLinksetType();
             case BSScene.PhysFunctGetLinksetType:
             {
                 ret = (object)LinksetType;
                 m_log.DebugFormat("{0} Extension.physGetLinksetType, type={1}", LogHeader, ret);
                 break;
             }
+            // physSetLinksetType(type);
             case BSScene.PhysFunctSetLinksetType:
             {
                 if (pParams.Length > 0)
@@ -313,6 +312,18 @@ public class BSPrimLinkable : BSPrimDisplaced
                 }
                 break;
             }
+            // physChangeLinkFixed(linknum);
+            // Params: int linkNum, PhysActor linkedPrim
+            case BSScene.PhysFunctChangeLinkFixed:
+            {
+                if (pParams.Length > 1)
+                {
+                    int linkNum = (int)pParams[0];
+                    Manager.PhysicsActor linkActor = (Manager.PhysicsActor)pParams[1];
+                    Linkset.Refresh(this);
+                }
+                break;
+            }
             default:
                 ret = base.Extension(pFunct, pParams);
                 break;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index c92c9b9..571db86 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -875,6 +875,10 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
     // Per prim functions. See BSPrim.
     public const string PhysFunctGetLinksetType = "BulletSim.GetLinksetType";
     public const string PhysFunctSetLinksetType = "BulletSim.SetLinksetType";
+    public const string PhysFunctChangeLinkFixed = "BulletSim.ChangeLinkFixed";
+    public const string PhysFunctChangeLinkHinge = "BulletSim.ChangeLinkHinge";
+    public const string PhysFunctChangeLinkSpring = "BulletSim.ChangeLinkSpring";
+    public const string PhysFunctChangeLinkSlider = "BulletSim.ChangeLinkSlider";
     // =============================================================
 
     public override object Extension(string pFunct, params object[] pParams)
-- 
cgit v1.1


From dff0fb56902f62b070ec6fd05769babfad32ed2e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 7 Aug 2013 11:18:23 -0700
Subject: BulletSim: Linkset.Refresh() calls internal ScheduleRebuild() to
 recreate the linkset physics at next PostTaint time. Replace the existing
 calls to ScheduleRebuild to be calls to Refresh(). This allows external
 routines to make changes to parameters and then cause the linkset to rebuild.

---
 .../Region/Physics/BulletSPlugin/BSLinksetCompound.cs   | 17 ++++++++---------
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs       | 11 ++++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 47ab842..8f12189 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -90,10 +90,9 @@ public sealed class BSLinksetCompound : BSLinkset
     //   its internal properties.
     public override void Refresh(BSPrimLinkable requestor)
     {
-        base.Refresh(requestor);
-
         // Something changed so do the rebuilding thing
-        // ScheduleRebuild();
+        ScheduleRebuild(requestor);
+        base.Refresh(requestor);
     }
 
     // Schedule a refresh to happen after all the other taint processing.
@@ -127,7 +126,7 @@ public sealed class BSLinksetCompound : BSLinkset
         if (IsRoot(child))
         {
             // The root is going dynamic. Rebuild the linkset so parts and mass get computed properly.
-            ScheduleRebuild(LinksetRoot);
+            Refresh(LinksetRoot);
         }
         return ret;
     }
@@ -144,7 +143,7 @@ public sealed class BSLinksetCompound : BSLinkset
         if (IsRoot(child))
         {
             // Schedule a rebuild to verify that the root shape is set to the real shape.
-            ScheduleRebuild(LinksetRoot);
+            Refresh(LinksetRoot);
         }
         return ret;
     }
@@ -227,7 +226,7 @@ public sealed class BSLinksetCompound : BSLinkset
                     //    there will already be a rebuild scheduled.
                     DetailLog("{0},BSLinksetCompound.UpdateProperties,couldNotUpdateChild.schedulingRebuild,whichUpdated={1}",
                                                                     updated.LocalID, whichUpdated);
-                    ScheduleRebuild(updated);
+                    Refresh(updated);
                 }
             }
         }
@@ -245,7 +244,7 @@ public sealed class BSLinksetCompound : BSLinkset
         DetailLog("{0},BSLinksetCompound.RemoveDependencies,refreshIfChild,rID={1},rBody={2},isRoot={3}",
                         child.LocalID, LinksetRoot.LocalID, LinksetRoot.PhysBody, IsRoot(child));
 
-        ScheduleRebuild(child);
+        Refresh(child);
 
         return ret;
     }
@@ -263,7 +262,7 @@ public sealed class BSLinksetCompound : BSLinkset
             DetailLog("{0},BSLinksetCompound.AddChildToLinkset,call,child={1}", LinksetRoot.LocalID, child.LocalID);
 
             // Rebuild the compound shape with the new child shape included
-            ScheduleRebuild(child);
+            Refresh(child);
         }
         return;
     }
@@ -292,7 +291,7 @@ public sealed class BSLinksetCompound : BSLinkset
             else
             {
                 // Rebuild the compound shape with the child removed
-                ScheduleRebuild(LinksetRoot);
+                Refresh(LinksetRoot);
             }
         }
         return;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index f3b70c3..db323c2 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -158,6 +158,7 @@ public sealed class BSLinksetConstraints : BSLinkset
     //   refresh will happen once after all the other taints are applied.
     public override void Refresh(BSPrimLinkable requestor)
     {
+        ScheduleRebuild(requestor);
         base.Refresh(requestor);
 
     }
@@ -194,7 +195,7 @@ public sealed class BSLinksetConstraints : BSLinkset
         if (IsRoot(child))
         {
             // The root is going dynamic. Rebuild the linkset so parts and mass get computed properly.
-            ScheduleRebuild(LinksetRoot);
+            Refresh(LinksetRoot);
         }
         return ret;
     }
@@ -213,7 +214,7 @@ public sealed class BSLinksetConstraints : BSLinkset
         if (IsRoot(child))
         {
             // Schedule a rebuild to verify that the root shape is set to the real shape.
-            ScheduleRebuild(LinksetRoot);
+            Refresh(LinksetRoot);
         }
         return ret;
     }
@@ -241,7 +242,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.
-            ScheduleRebuild(LinksetRoot);
+            Refresh(LinksetRoot);
         }
         return ret;
     }
@@ -259,7 +260,7 @@ public sealed class BSLinksetConstraints : BSLinkset
             DetailLog("{0},BSLinksetConstraints.AddChildToLinkset,call,child={1}", LinksetRoot.LocalID, child.LocalID);
 
             // Cause constraints and assorted properties to be recomputed before the next simulation step.
-            ScheduleRebuild(LinksetRoot);
+            Refresh(LinksetRoot);
         }
         return;
     }
@@ -283,7 +284,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                 PhysicallyUnlinkAChildFromRoot(rootx, childx);
             });
             // See that the linkset parameters are recomputed at the end of the taint time.
-            ScheduleRebuild(LinksetRoot);
+            Refresh(LinksetRoot);
         }
         else
         {
-- 
cgit v1.1


From 6aee08ac3c48b55ebd8e945c8b11f17dc1ab3151 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 8 Aug 2013 08:36:36 -0700
Subject: BulletSim: add physChangeLinkSpring to change linkset link to be a
 spring constraint. Add implementation to create spring constraint. Send up
 property updates for linkset children at the end of flexible linkset links.
 The simulator probably doesn't do the right thing yet.

---
 .../Scripting/ExtendedPhysics/ExtendedPhysics.cs   |  73 ++++++++++++++-
 .../Region/Physics/BulletSPlugin/BSApiTemplate.cs  |   4 +-
 OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs  |  24 +++++
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  | 102 ++++++++++++++++++++-
 .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs |   9 +-
 5 files changed, 198 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
index decb61a..278e9e7 100755
--- a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
@@ -291,6 +291,10 @@ public class ExtendedPhysics : INonSharedRegionModule
         return ret;
     }
 
+    // physChangeLinkFixed(integer linkNum)
+    // Change the link between the root and the linkNum into a fixed, static physical connection.
+    // This needs to change 'linkNum' into the physical object because lower level code has
+    //     no access to the link numbers.
     [ScriptInvocation]
     public int physChangeLinkFixed(UUID hostID, UUID scriptID, int linkNum)
     {
@@ -353,13 +357,76 @@ public class ExtendedPhysics : INonSharedRegionModule
     [ScriptInvocation]
     public int physChangeLinkHinge(UUID hostID, UUID scriptID, int linkNum)
     {
-        return 0;
+        return -1;
     }
 
     [ScriptInvocation]
-    public int physChangeLinkSpring(UUID hostID, UUID scriptID, int linkNum)
+    public int physChangeLinkSpring(UUID hostID, UUID scriptID, int linkNum,
+                        Vector3 frameInAloc, Quaternion frameInArot,
+                        Vector3 frameInBloc, Quaternion frameInBrot,
+                        Vector3 linearLimitLow, Vector3 linearLimitHigh,
+                        Vector3 angularLimitLow, Vector3 angularLimitHigh
+        )
     {
-        return 0;
+        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)
+                {
+                    SceneObjectPart linkPart = containingGroup.GetLinkNumPart(linkNum);
+                    if (linkPart != null)
+                    {
+                        Physics.Manager.PhysicsActor linkPhysActor = linkPart.PhysActor;
+                        if (linkPhysActor != null)
+                        {
+                            ret = (int)rootPhysActor.Extension(PhysFunctChangeLinkSpring, linkNum, linkPhysActor,
+                                                                    frameInAloc, frameInArot,
+                                                                    frameInBloc, frameInBrot,
+                                                                    linearLimitLow, linearLimitHigh,
+                                                                    angularLimitLow, angularLimitHigh
+                                                                        );
+                        }
+                        else
+                        {
+                            m_log.WarnFormat("{0} physChangeLinkFixed: Link part has no physical actor. rootName={1}, hostID={2}, linknum={3}",
+                                                LogHeader, rootPart.Name, hostID, linkNum);
+                        }
+                    }
+                    else
+                    {
+                        m_log.WarnFormat("{0} physChangeLinkFixed: Could not find linknum part. rootName={1}, hostID={2}, linknum={3}",
+                                            LogHeader, rootPart.Name, hostID, linkNum);
+                    }
+                }
+                else
+                {
+                    m_log.WarnFormat("{0} physChangeLinkFixed: Root part does not have a physics actor. rootName={1}, hostID={2}",
+                                        LogHeader, rootPart.Name, hostID);
+                }
+            }
+            else
+            {
+                m_log.WarnFormat("{0} physChangeLinkFixed: 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;
     }
 
     [ScriptInvocation]
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index b241059..9d8838b 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -43,7 +43,9 @@ public enum ConstraintType : int
 	SLIDER_CONSTRAINT_TYPE,
 	CONTACT_CONSTRAINT_TYPE,
 	D6_SPRING_CONSTRAINT_TYPE,
-	MAX_CONSTRAINT_TYPE
+	MAX_CONSTRAINT_TYPE,            // last type defined by Bullet
+    //
+    FIXED_CONSTRAINT_TYPE = 1234    // BulletSim constraint that is fixed and unmoving
 }
 
 // ===============================================================================
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index d4b1c1e..2058e3a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -79,6 +79,8 @@ public abstract class BSLinkset
         }
         public virtual void ResetLink() { }
         public virtual void SetLinkParameters(BSConstraint constrain) { }
+        // Returns 'true' if physical property updates from the child should be reported to the simulator
+        public virtual bool ShouldUpdateChildProperties() { return false; }
     }
 
     public LinksetImplementation LinksetImpl { get; protected set; }
@@ -224,6 +226,21 @@ public abstract class BSLinkset
         return ret;
     }
 
+    // Check the type of the link and return 'true' if the link is flexible and the
+    //    updates from the child should be sent to the simulator so things change.
+    public virtual bool ShouldReportPropertyUpdates(BSPrimLinkable child)
+    {
+        bool ret = false;
+
+        BSLinkInfo linkInfo;
+        if (m_children.TryGetValue(child, out linkInfo))
+        {
+            ret = linkInfo.ShouldUpdateChildProperties();
+        }
+
+        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.
@@ -432,6 +449,13 @@ public abstract class BSLinkset
         return com;
     }
 
+    #region Extension
+    public virtual object Extension(string pFunct, params object[] pParams)
+    {
+        return null;
+    }
+    #endregion // Extension
+
     // Invoke the detailed logger and output something if it's enabled.
     protected void DetailLog(string msg, params Object[] args)
     {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index db323c2..17fec9d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -60,8 +60,6 @@ public sealed class BSLinksetConstraints : BSLinkset
         public float springDamping;
         public float springStiffness;
 
-
-
         public BSLinkInfoConstraint(BSPrimLinkable pMember)
             : base(pMember)
         {
@@ -72,7 +70,8 @@ public sealed class BSLinksetConstraints : BSLinkset
         // Set all the parameters for this constraint to a fixed, non-movable constraint.
         public override void ResetLink()
         {
-            constraintType = ConstraintType.D6_CONSTRAINT_TYPE;
+            // constraintType = ConstraintType.D6_CONSTRAINT_TYPE;
+            constraintType = ConstraintType.FIXED_CONSTRAINT_TYPE;
             linearLimitLow = OMV.Vector3.Zero;
             linearLimitHigh = OMV.Vector3.Zero;
             angularLimitLow = OMV.Vector3.Zero;
@@ -97,6 +96,7 @@ public sealed class BSLinksetConstraints : BSLinkset
         {
             switch (constraintType)
             {
+                case ConstraintType.FIXED_CONSTRAINT_TYPE:
                 case ConstraintType.D6_CONSTRAINT_TYPE:
                     BSConstraint6Dof constrain6dof = constrain as BSConstraint6Dof;
                     if (constrain6dof != null)
@@ -145,6 +145,20 @@ public sealed class BSLinksetConstraints : BSLinkset
                     break;
             }
         }
+
+        // Return 'true' if the property updates from the physics engine should be reported
+        //    to the simulator.
+        // If the constraint is fixed, we don't need to report as the simulator and viewer will
+        //    report the right things.
+        public override bool ShouldUpdateChildProperties()
+        {
+            bool ret = true;
+
+            if (constraintType == ConstraintType.FIXED_CONSTRAINT_TYPE)
+                ret = false;
+
+            return ret;
+        }
     }
 
     public BSLinksetConstraints(BSScene scene, BSPrimLinkable parent) : base(scene, parent)
@@ -316,6 +330,7 @@ public sealed class BSLinksetConstraints : BSLinkset
 
         switch (linkInfo.constraintType)
         {
+            case ConstraintType.FIXED_CONSTRAINT_TYPE:
             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
@@ -466,5 +481,86 @@ public sealed class BSLinksetConstraints : BSLinkset
             Rebuilding = false;
         }
     }
+
+    #region Extension
+    public override object Extension(string pFunct, params object[] pParams)
+    {
+        object ret = null;
+        switch (pFunct)
+        {
+            // pParams = (int linkNUm, PhysActor linkChild)
+            case BSScene.PhysFunctChangeLinkFixed:
+                if (pParams.Length > 1)
+                {
+                    BSPrimLinkable child = pParams[1] as BSPrimLinkable;
+                    if (child != null)
+                    {
+                        m_physicsScene.TaintedObject("BSLinksetConstraint.PhysFunctChangeLinkFixed", delegate()
+                        {
+                            // Pick up all the constraints currently created.
+                            RemoveDependencies(child);
+
+                            BSLinkInfo linkInfo = null;
+                            if (m_children.TryGetValue(child, out linkInfo))
+                            {
+                                BSLinkInfoConstraint linkInfoC = linkInfo as BSLinkInfoConstraint;
+                                if (linkInfoC != null)
+                                {
+                                    // Setting to fixed is easy. The reset state is the fixed link configuration.
+                                    linkInfoC.ResetLink();
+                                    ret = (object)true;
+                                }
+                            }
+                            // Cause the whole linkset to be rebuilt in post-taint time.
+                            Refresh(child);
+                        });
+                    }
+                }
+                break;
+            case BSScene.PhysFunctChangeLinkSpring:
+                if (pParams.Length > 11)
+                {
+                    BSPrimLinkable child = pParams[1] as BSPrimLinkable;
+                    if (child != null)
+                    {
+                        m_physicsScene.TaintedObject("BSLinksetConstraint.PhysFunctChangeLinkFixed", delegate()
+                        {
+                            // Pick up all the constraints currently created.
+                            RemoveDependencies(child);
+
+                            BSLinkInfo linkInfo = null;
+                            if (m_children.TryGetValue(child, out linkInfo))
+                            {
+                                BSLinkInfoConstraint linkInfoC = linkInfo as BSLinkInfoConstraint;
+                                if (linkInfoC != null)
+                                {
+                                    // Start with a reset link definition
+                                    linkInfoC.ResetLink();
+                                    linkInfoC.constraintType = ConstraintType.D6_SPRING_CONSTRAINT_TYPE;
+                                    linkInfoC.frameInAloc = (OMV.Vector3)pParams[2];
+                                    linkInfoC.frameInArot = (OMV.Quaternion)pParams[3];
+                                    linkInfoC.frameInBloc = (OMV.Vector3)pParams[4];
+                                    linkInfoC.frameInBrot = (OMV.Quaternion)pParams[5];
+                                    linkInfoC.linearLimitLow = (OMV.Vector3)pParams[6];
+                                    linkInfoC.linearLimitHigh = (OMV.Vector3)pParams[7];
+                                    linkInfoC.angularLimitLow = (OMV.Vector3)pParams[8];
+                                    linkInfoC.angularLimitHigh = (OMV.Vector3)pParams[9];
+                                    ret = (object)true;
+                                }
+                            }
+                            // Cause the whole linkset to be rebuilt in post-taint time.
+                            Refresh(child);
+                        });
+                    }
+                }
+                break;
+            default:
+                ret = base.Extension(pFunct, pParams);
+                break;
+        }
+        return ret;
+    }
+    #endregion // Extension
+
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 77d8246..4c384a6 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -179,7 +179,7 @@ public class BSPrimLinkable : BSPrimDisplaced
     // Do any filtering/modification needed for linksets.
     public override void UpdateProperties(EntityProperties entprop)
     {
-        if (Linkset.IsRoot(this))
+        if (Linkset.IsRoot(this) || Linkset.ShouldReportPropertyUpdates(this))
         {
             // Properties are only updated for the roots of a linkset.
             // TODO: this will have to change when linksets are articulated.
@@ -316,12 +316,7 @@ public class BSPrimLinkable : BSPrimDisplaced
             // Params: int linkNum, PhysActor linkedPrim
             case BSScene.PhysFunctChangeLinkFixed:
             {
-                if (pParams.Length > 1)
-                {
-                    int linkNum = (int)pParams[0];
-                    Manager.PhysicsActor linkActor = (Manager.PhysicsActor)pParams[1];
-                    Linkset.Refresh(this);
-                }
+                Linkset.Extension(pFunct, pParams);
                 break;
             }
             default:
-- 
cgit v1.1


From b2a1348adc2bd27d3266a7d7c7594a2aa8272100 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 8 Aug 2013 16:37:37 -0700
Subject: BulletSim: update C++ HACD parameters to values that handle enclosed
 hollow spaces better. This shouldn't affect many since this HACD routine is
 off by default.

---
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index fcb892a..737dda1 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -683,21 +683,21 @@ public static class BSParam
             0f ),
 
 	    new ParameterDefn<float>("BHullMaxVerticesPerHull", "Bullet impl: max number of vertices per created hull",
-            100f ),
+            200f ),
 	    new ParameterDefn<float>("BHullMinClusters", "Bullet impl: minimum number of hulls to create per mesh",
-            2f ),
+            10f ),
 	    new ParameterDefn<float>("BHullCompacityWeight", "Bullet impl: weight factor for how compact to make hulls",
-            0.1f ),
+            20f ),
 	    new ParameterDefn<float>("BHullVolumeWeight", "Bullet impl: weight factor for volume in created hull",
-            0f ),
+            0.1f ),
 	    new ParameterDefn<float>("BHullConcavity", "Bullet impl: weight factor for how convex a created hull can be",
-            100f ),
+            10f ),
 	    new ParameterDefn<bool>("BHullAddExtraDistPoints", "Bullet impl: whether to add extra vertices for long distance vectors",
-            false ),
+            true ),
 	    new ParameterDefn<bool>("BHullAddNeighboursDistPoints", "Bullet impl: whether to add extra vertices between neighbor hulls",
-            false ),
+            true ),
 	    new ParameterDefn<bool>("BHullAddFacesPoints", "Bullet impl: whether to add extra vertices to break up hull faces",
-            false ),
+            true ),
 	    new ParameterDefn<bool>("BHullShouldAdjustCollisionMargin", "Bullet impl: whether to shrink resulting hulls to account for collision margin",
             false ),
 
-- 
cgit v1.1


From 455d36c4c70a55c5d48dc1410b8729929fafedf6 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 9 Aug 2013 10:59:10 -0700
Subject: BulletSim: add physChangeLinkParams to set individual parameters on
 link constraints. Not fully functional. Remove double definition of
 ExtendedPhysics parameters by having BulletSim reference the optional module
 (addition to prebuild.xml and usings).

---
 .../Scripting/ExtendedPhysics/ExtendedPhysics.cs   | 265 +++++++++++++--------
 .../Physics/BulletSPlugin/BSConstraintConeTwist.cs |  54 +++++
 .../Physics/BulletSPlugin/BSConstraintSlider.cs    |  55 +++++
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  |  85 +++----
 .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs |  18 +-
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs    |  14 --
 prebuild.xml                                       |   1 +
 7 files changed, 325 insertions(+), 167 deletions(-)
 create mode 100755 OpenSim/Region/Physics/BulletSPlugin/BSConstraintConeTwist.cs
 create mode 100755 OpenSim/Region/Physics/BulletSPlugin/BSConstraintSlider.cs

diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
index 278e9e7..baf5a5b 100755
--- a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
@@ -36,6 +36,7 @@ using OpenSim.Region.CoreModules;
 using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Physics.Manager;
 
 using Mono.Addins;
 using Nini.Config;
@@ -62,9 +63,8 @@ public class ExtendedPhysics : INonSharedRegionModule
     public const string PhysFunctGetLinksetType = "BulletSim.GetLinksetType";
     public const string PhysFunctSetLinksetType = "BulletSim.SetLinksetType";
     public const string PhysFunctChangeLinkFixed = "BulletSim.ChangeLinkFixed";
-    public const string PhysFunctChangeLinkHinge = "BulletSim.ChangeLinkHinge";
-    public const string PhysFunctChangeLinkSpring = "BulletSim.ChangeLinkSpring";
-    public const string PhysFunctChangeLinkSlider = "BulletSim.ChangeLinkSlider";
+    public const string PhysFunctChangeLinkType = "BulletSim.ChangeLinkType";
+    public const string PhysFunctChangeLinkParams = "BulletSim.ChangeLinkParams";
 
     // =============================================================
 
@@ -200,7 +200,7 @@ public class ExtendedPhysics : INonSharedRegionModule
 
             if (rootPart != null)
             {
-                Physics.Manager.PhysicsActor rootPhysActor = rootPart.PhysActor;
+                PhysicsActor rootPhysActor = rootPart.PhysActor;
                 if (rootPhysActor != null)
                 {
                     if (rootPhysActor.IsPhysical)
@@ -219,7 +219,7 @@ public class ExtendedPhysics : INonSharedRegionModule
                         containingGroup.UpdateGroupPosition(containingGroup.AbsolutePosition);
                         containingGroup.UpdateGroupRotationR(containingGroup.GroupRotation);
 
-                        ret = (int)rootPhysActor.Extension(PhysFunctSetLinksetType, linksetType);
+                        ret = MakeIntError(rootPhysActor.Extension(PhysFunctSetLinksetType, linksetType));
                         Thread.Sleep(150);  // longer than one heartbeat tick
 
                         containingGroup.ScriptSetPhysicsStatus(true);
@@ -228,7 +228,7 @@ public class ExtendedPhysics : INonSharedRegionModule
                     {
                         // Non-physical linksets don't have a physical instantiation so there is no state to
                         //    worry about being updated.
-                        ret = (int)rootPhysActor.Extension(PhysFunctSetLinksetType, linksetType);
+                        ret = MakeIntError(rootPhysActor.Extension(PhysFunctSetLinksetType, linksetType));
                     }
                 }
                 else
@@ -267,10 +267,10 @@ public class ExtendedPhysics : INonSharedRegionModule
 
             if (rootPart != null)
             {
-                Physics.Manager.PhysicsActor rootPhysActor = rootPart.PhysActor;
+                PhysicsActor rootPhysActor = rootPart.PhysActor;
                 if (rootPhysActor != null)
                 {
-                    ret = (int)rootPhysActor.Extension(PhysFunctGetLinksetType);
+                    ret = MakeIntError(rootPhysActor.Extension(PhysFunctGetLinksetType));
                 }
                 else
                 {
@@ -291,148 +291,225 @@ public class ExtendedPhysics : INonSharedRegionModule
         return ret;
     }
 
+    [ScriptConstant]
+    public static int PHYS_LINK_TYPE_FIXED  = 1234;
+    [ScriptConstant]
+    public static int PHYS_LINK_TYPE_HINGE  = 4;
+    [ScriptConstant]
+    public static int PHYS_LINK_TYPE_SPRING = 9;
+    [ScriptConstant]
+    public static int PHYS_LINK_TYPE_6DOF   = 6;
+    [ScriptConstant]
+    public static int PHYS_LINK_TYPE_SLIDER = 7;
+
+    // physChangeLinkType(integer linkNum, integer typeCode)
+    [ScriptInvocation]
+    public int physChangeLinkType(UUID hostID, UUID scriptID, int linkNum, int typeCode)
+    {
+        int ret = -1;
+        if (!Enabled) return ret;
+
+        PhysicsActor rootPhysActor;
+        PhysicsActor childPhysActor;
+
+        if (GetRootAndChildPhysActors(hostID, linkNum, out rootPhysActor, out childPhysActor))
+        {
+            ret = MakeIntError(rootPhysActor.Extension(PhysFunctChangeLinkType, childPhysActor, typeCode));
+        }
+
+        return ret;
+    }
+
     // physChangeLinkFixed(integer linkNum)
     // Change the link between the root and the linkNum into a fixed, static physical connection.
-    // This needs to change 'linkNum' into the physical object because lower level code has
-    //     no access to the link numbers.
     [ScriptInvocation]
     public int physChangeLinkFixed(UUID hostID, UUID scriptID, int linkNum)
     {
         int ret = -1;
         if (!Enabled) return ret;
 
-        // The part that is requesting the change.
-        SceneObjectPart requestingPart = BaseScene.GetSceneObjectPart(hostID);
+        PhysicsActor rootPhysActor;
+        PhysicsActor childPhysActor;
+
+        if (GetRootAndChildPhysActors(hostID, linkNum, out rootPhysActor, out childPhysActor))
+        {
+            ret = MakeIntError(rootPhysActor.Extension(PhysFunctChangeLinkType, childPhysActor, PHYS_LINK_TYPE_FIXED));
+        }
+
+        return ret;
+    }
+
+    // Code for specifying params.
+    // The choice if 14400 is arbitrary and only serves to catch parameter code misuse.
+    public static int PHYS_PARAM_MIN                    = 14401;
+    [ScriptConstant]
+    public static int PHYS_PARAM_FRAMEINA_LOC           = 14401;
+    [ScriptConstant]
+    public static int PHYS_PARAM_FRAMEINA_ROT           = 14402;
+    [ScriptConstant]
+    public static int PHYS_PARAM_FRAMEINB_LOC           = 14403;
+    [ScriptConstant]
+    public static int PHYS_PARAM_FRAMEINB_ROT           = 14404;
+    [ScriptConstant]
+    public static int PHYS_PARAM_LINEAR_LIMIT_LOW       = 14405;
+    [ScriptConstant]
+    public static int PHYS_PARAM_LINEAR_LIMIT_HIGH      = 14406;
+    [ScriptConstant]
+    public static int PHYS_PARAM_ANGULAR_LIMIT_LOW      = 14407;
+    [ScriptConstant]
+    public static int PHYS_PARAM_ANGULAR_LIMIT_HIGH     = 14408;
+    [ScriptConstant]
+    public static int PHYS_PARAM_USE_FRAME_OFFSET       = 14409;
+    [ScriptConstant]
+    public static int PHYS_PARAM_ENABLE_TRANSMOTOR      = 14410;
+    [ScriptConstant]
+    public static int PHYS_PARAM_TRANSMOTOR_MAXVEL      = 14411;
+    [ScriptConstant]
+    public static int PHYS_PARAM_TRANSMOTOR_MAXFORCE    = 14412;
+    [ScriptConstant]
+    public static int PHYS_PARAM_CFM                    = 14413;
+    [ScriptConstant]
+    public static int PHYS_PARAM_ERP                    = 14414;
+    [ScriptConstant]
+    public static int PHYS_PARAM_SOLVER_ITERATIONS      = 14415;
+    [ScriptConstant]
+    public static int PHYS_PARAM_SPRING_DAMPING         = 14416;
+    [ScriptConstant]
+    public static int PHYS_PARAM_SPRING_STIFFNESS       = 14417;
+    public static int PHYS_PARAM_MAX                    = 14417;
 
+    // physChangeLinkParams(integer linkNum, [ PHYS_PARAM_*, value, PHYS_PARAM_*, value, ...])
+    [ScriptInvocation]
+    public int physChangeLinkParams(UUID hostID, UUID scriptID, int linkNum, object[] parms)
+    {
+        int ret = -1;
+        if (!Enabled) return ret;
+
+        PhysicsActor rootPhysActor;
+        PhysicsActor childPhysActor;
+
+        if (GetRootAndChildPhysActors(hostID, linkNum, out rootPhysActor, out childPhysActor))
+        {
+            ret = MakeIntError(rootPhysActor.Extension(PhysFunctChangeLinkParams, childPhysActor, parms));
+        }
+
+        return ret;
+    }
+
+    private bool GetRootPhysActor(UUID hostID, out PhysicsActor rootPhysActor)
+    {
+        SceneObjectGroup containingGroup;
+        SceneObjectPart rootPart;
+        return GetRootPhysActor(hostID, out containingGroup, out rootPart, out rootPhysActor);
+    }
+
+    private bool GetRootPhysActor(UUID hostID, out SceneObjectGroup containingGroup, out SceneObjectPart rootPart, out PhysicsActor rootPhysActor)
+    {
+        bool ret = false;
+        rootPhysActor = null;
+        containingGroup = null;
+        rootPart = null;
+
+        SceneObjectPart requestingPart;
+
+        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)
+            containingGroup = requestingPart.ParentGroup;
+            if (containingGroup != null && !containingGroup.IsDeleted)
             {
-                Physics.Manager.PhysicsActor rootPhysActor = rootPart.PhysActor;
-                if (rootPhysActor != null)
+                rootPart = containingGroup.RootPart;
+                if (rootPart != null)
                 {
-                    SceneObjectPart linkPart = containingGroup.GetLinkNumPart(linkNum);
-                    if (linkPart != null)
+                    rootPhysActor = rootPart.PhysActor;
+                    if (rootPhysActor != null)
                     {
-                        Physics.Manager.PhysicsActor linkPhysActor = linkPart.PhysActor;
-                        if (linkPhysActor != null)
-                        {
-                            ret = (int)rootPhysActor.Extension(PhysFunctChangeLinkFixed, linkNum, linkPhysActor);
-                        }
-                        else
-                        {
-                            m_log.WarnFormat("{0} physChangeLinkFixed: Link part has no physical actor. rootName={1}, hostID={2}, linknum={3}",
-                                                LogHeader, rootPart.Name, hostID, linkNum);
-                        }
+                        ret = true;
                     }
                     else
                     {
-                        m_log.WarnFormat("{0} physChangeLinkFixed: Could not find linknum part. rootName={1}, hostID={2}, linknum={3}",
-                                            LogHeader, rootPart.Name, hostID, linkNum);
+                        m_log.WarnFormat("{0} GetRootAndChildPhysActors: Root part does not have a physics actor. rootName={1}, hostID={2}",
+                                        LogHeader, rootPart.Name, hostID);
                     }
                 }
                 else
                 {
-                    m_log.WarnFormat("{0} physChangeLinkFixed: Root part does not have a physics actor. rootName={1}, hostID={2}",
-                                        LogHeader, rootPart.Name, hostID);
+                    m_log.WarnFormat("{0} GetRootAndChildPhysActors: Root part does not exist. RequestingPartName={1}, hostID={2}",
+                                    LogHeader, requestingPart.Name, hostID);
                 }
             }
             else
             {
-                m_log.WarnFormat("{0} physChangeLinkFixed: Root part does not exist. RequestingPartName={1}, hostID={2}",
-                                    LogHeader, requestingPart.Name, hostID);
+                m_log.WarnFormat("{0} GetRootAndChildPhysActors: Containing group missing or deleted. hostID={1}", LogHeader, hostID);
             }
         }
         else
         {
-            m_log.WarnFormat("{0} physGetLinsetType: cannot find script object in scene. hostID={1}", LogHeader, hostID);
+            m_log.WarnFormat("{0} GetRootAndChildPhysActors: cannot find script object in scene. hostID={1}", LogHeader, hostID);
         }
+
         return ret;
     }
 
-    [ScriptInvocation]
-    public int physChangeLinkHinge(UUID hostID, UUID scriptID, int linkNum)
+    // Find the root and child PhysActors based on the linkNum.
+    // Return 'true' if both are found and returned.
+    private bool GetRootAndChildPhysActors(UUID hostID, int linkNum, out PhysicsActor rootPhysActor, out PhysicsActor childPhysActor)
     {
-        return -1;
-    }
+        bool ret = false;
+        rootPhysActor = null;
+        childPhysActor = null;
 
-    [ScriptInvocation]
-    public int physChangeLinkSpring(UUID hostID, UUID scriptID, int linkNum,
-                        Vector3 frameInAloc, Quaternion frameInArot,
-                        Vector3 frameInBloc, Quaternion frameInBrot,
-                        Vector3 linearLimitLow, Vector3 linearLimitHigh,
-                        Vector3 angularLimitLow, Vector3 angularLimitHigh
-        )
-    {
-        int ret = -1;
-        if (!Enabled) return ret;
+        SceneObjectGroup containingGroup;
+        SceneObjectPart rootPart;
 
-        // The part that is requesting the change.
-        SceneObjectPart requestingPart = BaseScene.GetSceneObjectPart(hostID);
-
-        if (requestingPart != null)
+        if (GetRootPhysActor(hostID, out containingGroup, out rootPart, out rootPhysActor))
         {
-            // The type is is always on the root of a linkset.
-            SceneObjectGroup containingGroup = requestingPart.ParentGroup;
-            SceneObjectPart rootPart = containingGroup.RootPart;
-
-            if (rootPart != null)
+            SceneObjectPart linkPart = containingGroup.GetLinkNumPart(linkNum);
+            if (linkPart != null)
             {
-                Physics.Manager.PhysicsActor rootPhysActor = rootPart.PhysActor;
-                if (rootPhysActor != null)
+                childPhysActor = linkPart.PhysActor;
+                if (childPhysActor != null)
                 {
-                    SceneObjectPart linkPart = containingGroup.GetLinkNumPart(linkNum);
-                    if (linkPart != null)
-                    {
-                        Physics.Manager.PhysicsActor linkPhysActor = linkPart.PhysActor;
-                        if (linkPhysActor != null)
-                        {
-                            ret = (int)rootPhysActor.Extension(PhysFunctChangeLinkSpring, linkNum, linkPhysActor,
-                                                                    frameInAloc, frameInArot,
-                                                                    frameInBloc, frameInBrot,
-                                                                    linearLimitLow, linearLimitHigh,
-                                                                    angularLimitLow, angularLimitHigh
-                                                                        );
-                        }
-                        else
-                        {
-                            m_log.WarnFormat("{0} physChangeLinkFixed: Link part has no physical actor. rootName={1}, hostID={2}, linknum={3}",
-                                                LogHeader, rootPart.Name, hostID, linkNum);
-                        }
-                    }
-                    else
-                    {
-                        m_log.WarnFormat("{0} physChangeLinkFixed: Could not find linknum part. rootName={1}, hostID={2}, linknum={3}",
-                                            LogHeader, rootPart.Name, hostID, linkNum);
-                    }
+                    ret = true;
                 }
                 else
                 {
-                    m_log.WarnFormat("{0} physChangeLinkFixed: Root part does not have a physics actor. rootName={1}, hostID={2}",
-                                        LogHeader, rootPart.Name, hostID);
+                    m_log.WarnFormat("{0} GetRootAndChildPhysActors: Link part has no physical actor. rootName={1}, hostID={2}, linknum={3}",
+                                        LogHeader, rootPart.Name, hostID, linkNum);
                 }
             }
             else
             {
-                m_log.WarnFormat("{0} physChangeLinkFixed: Root part does not exist. RequestingPartName={1}, hostID={2}",
-                                    LogHeader, requestingPart.Name, hostID);
+                m_log.WarnFormat("{0} GetRootAndChildPhysActors: Could not find linknum part. rootName={1}, hostID={2}, linknum={3}",
+                                    LogHeader, rootPart.Name, hostID, linkNum);
             }
         }
         else
         {
-            m_log.WarnFormat("{0} physGetLinsetType: cannot find script object in scene. hostID={1}", LogHeader, hostID);
+            m_log.WarnFormat("{0} GetRootAndChildPhysActors: Root part does not have a physics actor. rootName={1}, hostID={2}",
+                            LogHeader, rootPart.Name, hostID);
         }
+
         return ret;
     }
 
-    [ScriptInvocation]
-    public int physChangeLinkSlider(UUID hostID, UUID scriptID, int linkNum)
+    // Extension() returns an object. Convert that object into the integer error we expect to return.
+    private int MakeIntError(object extensionRet)
     {
-        return 0;
+        int ret = -1;
+        if (extensionRet != null)
+        {
+            try
+            {
+                ret = (int)extensionRet;
+            }
+            catch
+            {
+                ret = -1;
+            }
+        }
+        return ret;
     }
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintConeTwist.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintConeTwist.cs
new file mode 100755
index 0000000..7a76a9a
--- /dev/null
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintConeTwist.cs
@@ -0,0 +1,54 @@
+/*
+ * 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;
+using OpenMetaverse;
+
+namespace OpenSim.Region.Physics.BulletSPlugin
+{
+
+public sealed class BSConstraintConeTwist : BSConstraint
+{
+    public override ConstraintType Type { get { return ConstraintType.CONETWIST_CONSTRAINT_TYPE; } }
+
+    public BSConstraintConeTwist(BulletWorld world, BulletBody obj1, BulletBody obj2,
+                    Vector3 frameInAloc, Quaternion frameInArot,
+                    Vector3 frameInBloc, Quaternion frameInBrot,
+                    bool disableCollisionsBetweenLinkedBodies)
+        : base(world)
+    {
+        m_body1 = obj1;
+        m_body2 = obj2;
+        m_constraint = PhysicsScene.PE.CreateConeTwistConstraint(world, obj1, obj2,
+                                frameInAloc, frameInArot, frameInBloc, frameInBrot,
+                                disableCollisionsBetweenLinkedBodies);
+        m_enabled = true;
+    }
+}
+
+}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSlider.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSlider.cs
new file mode 100755
index 0000000..37cfa07
--- /dev/null
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSlider.cs
@@ -0,0 +1,55 @@
+/*
+ * 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;
+using OpenMetaverse;
+
+namespace OpenSim.Region.Physics.BulletSPlugin
+{
+
+public sealed class BSConstraintSlider : BSConstraint
+{
+    public override ConstraintType Type { get { return ConstraintType.SLIDER_CONSTRAINT_TYPE; } }
+
+    public BSConstraintSlider(BulletWorld world, BulletBody obj1, BulletBody obj2,
+                    Vector3 frameInAloc, Quaternion frameInArot,
+                    Vector3 frameInBloc, Quaternion frameInBrot,
+                    bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies)
+        : base(world)
+    {
+        m_body1 = obj1;
+        m_body2 = obj2;
+        m_constraint = PhysicsScene.PE.CreateSliderConstraint(world, obj1, obj2,
+                                frameInAloc, frameInArot, frameInBloc, frameInBrot,
+                                useLinearReferenceFrameA, disableCollisionsBetweenLinkedBodies);
+        m_enabled = true;
+    }
+
+}
+
+}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index 17fec9d..c09dd42 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -28,6 +28,8 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
+using OpenSim.Region.OptionalModules.Scripting;
+
 using OMV = OpenMetaverse;
 
 namespace OpenSim.Region.Physics.BulletSPlugin
@@ -489,71 +491,46 @@ public sealed class BSLinksetConstraints : BSLinkset
         switch (pFunct)
         {
             // pParams = (int linkNUm, PhysActor linkChild)
-            case BSScene.PhysFunctChangeLinkFixed:
+            case ExtendedPhysics.PhysFunctChangeLinkType:
                 if (pParams.Length > 1)
                 {
-                    BSPrimLinkable child = pParams[1] as BSPrimLinkable;
-                    if (child != null)
+                    int requestedType = (int)pParams[1];
+                    if (requestedType == (int)ConstraintType.FIXED_CONSTRAINT_TYPE
+                        || requestedType == (int)ConstraintType.D6_CONSTRAINT_TYPE
+                        || requestedType == (int)ConstraintType.D6_SPRING_CONSTRAINT_TYPE
+                        || requestedType == (int)ConstraintType.HINGE_CONSTRAINT_TYPE
+                        || requestedType == (int)ConstraintType.CONETWIST_CONSTRAINT_TYPE
+                        || requestedType == (int)ConstraintType.SLIDER_CONSTRAINT_TYPE)
                     {
-                        m_physicsScene.TaintedObject("BSLinksetConstraint.PhysFunctChangeLinkFixed", delegate()
+                        BSPrimLinkable child = pParams[0] as BSPrimLinkable;
+                        if (child != null)
                         {
-                            // Pick up all the constraints currently created.
-                            RemoveDependencies(child);
-
-                            BSLinkInfo linkInfo = null;
-                            if (m_children.TryGetValue(child, out linkInfo))
+                            m_physicsScene.TaintedObject("BSLinksetConstraint.PhysFunctChangeLinkFixed", delegate()
                             {
-                                BSLinkInfoConstraint linkInfoC = linkInfo as BSLinkInfoConstraint;
-                                if (linkInfoC != null)
-                                {
-                                    // Setting to fixed is easy. The reset state is the fixed link configuration.
-                                    linkInfoC.ResetLink();
-                                    ret = (object)true;
-                                }
-                            }
-                            // Cause the whole linkset to be rebuilt in post-taint time.
-                            Refresh(child);
-                        });
-                    }
-                }
-                break;
-            case BSScene.PhysFunctChangeLinkSpring:
-                if (pParams.Length > 11)
-                {
-                    BSPrimLinkable child = pParams[1] as BSPrimLinkable;
-                    if (child != null)
-                    {
-                        m_physicsScene.TaintedObject("BSLinksetConstraint.PhysFunctChangeLinkFixed", delegate()
-                        {
-                            // Pick up all the constraints currently created.
-                            RemoveDependencies(child);
+                                // Pick up all the constraints currently created.
+                                RemoveDependencies(child);
 
-                            BSLinkInfo linkInfo = null;
-                            if (m_children.TryGetValue(child, out linkInfo))
-                            {
-                                BSLinkInfoConstraint linkInfoC = linkInfo as BSLinkInfoConstraint;
-                                if (linkInfoC != null)
+                                BSLinkInfo linkInfo = null;
+                                if (m_children.TryGetValue(child, out linkInfo))
                                 {
-                                    // Start with a reset link definition
-                                    linkInfoC.ResetLink();
-                                    linkInfoC.constraintType = ConstraintType.D6_SPRING_CONSTRAINT_TYPE;
-                                    linkInfoC.frameInAloc = (OMV.Vector3)pParams[2];
-                                    linkInfoC.frameInArot = (OMV.Quaternion)pParams[3];
-                                    linkInfoC.frameInBloc = (OMV.Vector3)pParams[4];
-                                    linkInfoC.frameInBrot = (OMV.Quaternion)pParams[5];
-                                    linkInfoC.linearLimitLow = (OMV.Vector3)pParams[6];
-                                    linkInfoC.linearLimitHigh = (OMV.Vector3)pParams[7];
-                                    linkInfoC.angularLimitLow = (OMV.Vector3)pParams[8];
-                                    linkInfoC.angularLimitHigh = (OMV.Vector3)pParams[9];
-                                    ret = (object)true;
+                                    BSLinkInfoConstraint linkInfoC = linkInfo as BSLinkInfoConstraint;
+                                    if (linkInfoC != null)
+                                    {
+                                        // Setting to fixed is easy. The reset state is the fixed link configuration.
+                                        linkInfoC.ResetLink();
+                                        linkInfoC.constraintType = (ConstraintType)requestedType;
+                                        ret = (object)true;
+                                    }
                                 }
-                            }
-                            // Cause the whole linkset to be rebuilt in post-taint time.
-                            Refresh(child);
-                        });
+                                // Cause the whole linkset to be rebuilt in post-taint time.
+                                Refresh(child);
+                            });
+                        }
                     }
                 }
                 break;
+            case ExtendedPhysics.PhysFunctChangeLinkParams:
+                break;
             default:
                 ret = base.Extension(pFunct, pParams);
                 break;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 4c384a6..6136257 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -30,6 +30,7 @@ using System.Linq;
 using System.Text;
 
 using OpenSim.Framework;
+using OpenSim.Region.OptionalModules.Scripting;
 
 using OMV = OpenMetaverse;
 
@@ -286,14 +287,14 @@ public class BSPrimLinkable : BSPrimDisplaced
         switch (pFunct)
         {
             // physGetLinksetType();
-            case BSScene.PhysFunctGetLinksetType:
+            case ExtendedPhysics.PhysFunctGetLinksetType:
             {
                 ret = (object)LinksetType;
                 m_log.DebugFormat("{0} Extension.physGetLinksetType, type={1}", LogHeader, ret);
                 break;
             }
             // physSetLinksetType(type);
-            case BSScene.PhysFunctSetLinksetType:
+            case ExtendedPhysics.PhysFunctSetLinksetType:
             {
                 if (pParams.Length > 0)
                 {
@@ -312,9 +313,16 @@ public class BSPrimLinkable : BSPrimDisplaced
                 }
                 break;
             }
-            // physChangeLinkFixed(linknum);
-            // Params: int linkNum, PhysActor linkedPrim
-            case BSScene.PhysFunctChangeLinkFixed:
+            // physChangeLinkType(linknum, typeCode);
+            // Params: PhysActor linkedPrim, int typeCode
+            case ExtendedPhysics.PhysFunctChangeLinkType:
+            {
+                Linkset.Extension(pFunct, pParams);
+                break;
+            }
+            // physChangeLinkParams(linknum, [code, value, code, value, ...]);
+            // Params: PhysActor linkedPrim, object[] params
+            case ExtendedPhysics.PhysFunctChangeLinkParams:
             {
                 Linkset.Extension(pFunct, pParams);
                 break;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 571db86..7440468 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -867,20 +867,6 @@ 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 const string PhysFunctChangeLinkFixed = "BulletSim.ChangeLinkFixed";
-    public const string PhysFunctChangeLinkHinge = "BulletSim.ChangeLinkHinge";
-    public const string PhysFunctChangeLinkSpring = "BulletSim.ChangeLinkSpring";
-    public const string PhysFunctChangeLinkSlider = "BulletSim.ChangeLinkSlider";
-    // =============================================================
-
     public override object Extension(string pFunct, params object[] pParams)
     {
         return base.Extension(pFunct, pParams);
diff --git a/prebuild.xml b/prebuild.xml
index af8f686..585f96d 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1795,6 +1795,7 @@
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Region.Framework"/>
       <Reference name="OpenSim.Region.CoreModules"/>
+      <Reference name="OpenSim.Region.OptionalModules"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
       <Reference name="OpenSim.Region.Physics.Meshing" path="../../../../bin/Physics/"/>
-- 
cgit v1.1


From f6fdfd16f55c3e1bd55775f1f21e0ac9e44ff2ee Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 9 Aug 2013 17:01:35 -0700
Subject: BulletSim: change ExtendedPhysics constants to 'const' so they can be
 used as case variables in switch statements.

---
 .../Scripting/ExtendedPhysics/ExtendedPhysics.cs   | 56 +++++++++++-----------
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  | 22 +++++++++
 2 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
index baf5a5b..e0f16d6 100755
--- a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
@@ -160,7 +160,7 @@ public class ExtendedPhysics : INonSharedRegionModule
     }
 
     [ScriptConstant]
-    public static int PHYS_CENTER_OF_MASS =     1 << 0;
+    public const int PHYS_CENTER_OF_MASS =     1 << 0;
 
     [ScriptInvocation]
     public string physGetEngineType(UUID hostID, UUID scriptID)
@@ -176,11 +176,11 @@ public class ExtendedPhysics : INonSharedRegionModule
     }
 
     [ScriptConstant]
-    public static int PHYS_LINKSET_TYPE_CONSTRAINT  = 0;
+    public const int PHYS_LINKSET_TYPE_CONSTRAINT  = 0;
     [ScriptConstant]
-    public static int PHYS_LINKSET_TYPE_COMPOUND    = 1;
+    public const int PHYS_LINKSET_TYPE_COMPOUND    = 1;
     [ScriptConstant]
-    public static int PHYS_LINKSET_TYPE_MANUAL      = 2;
+    public const int PHYS_LINKSET_TYPE_MANUAL      = 2;
 
     [ScriptInvocation]
     public int physSetLinksetType(UUID hostID, UUID scriptID, int linksetType)
@@ -292,15 +292,15 @@ public class ExtendedPhysics : INonSharedRegionModule
     }
 
     [ScriptConstant]
-    public static int PHYS_LINK_TYPE_FIXED  = 1234;
+    public const int PHYS_LINK_TYPE_FIXED  = 1234;
     [ScriptConstant]
-    public static int PHYS_LINK_TYPE_HINGE  = 4;
+    public const int PHYS_LINK_TYPE_HINGE  = 4;
     [ScriptConstant]
-    public static int PHYS_LINK_TYPE_SPRING = 9;
+    public const int PHYS_LINK_TYPE_SPRING = 9;
     [ScriptConstant]
-    public static int PHYS_LINK_TYPE_6DOF   = 6;
+    public const int PHYS_LINK_TYPE_6DOF   = 6;
     [ScriptConstant]
-    public static int PHYS_LINK_TYPE_SLIDER = 7;
+    public const int PHYS_LINK_TYPE_SLIDER = 7;
 
     // physChangeLinkType(integer linkNum, integer typeCode)
     [ScriptInvocation]
@@ -341,42 +341,42 @@ public class ExtendedPhysics : INonSharedRegionModule
 
     // Code for specifying params.
     // The choice if 14400 is arbitrary and only serves to catch parameter code misuse.
-    public static int PHYS_PARAM_MIN                    = 14401;
+    public const int PHYS_PARAM_MIN                    = 14401;
     [ScriptConstant]
-    public static int PHYS_PARAM_FRAMEINA_LOC           = 14401;
+    public const int PHYS_PARAM_FRAMEINA_LOC           = 14401;
     [ScriptConstant]
-    public static int PHYS_PARAM_FRAMEINA_ROT           = 14402;
+    public const int PHYS_PARAM_FRAMEINA_ROT           = 14402;
     [ScriptConstant]
-    public static int PHYS_PARAM_FRAMEINB_LOC           = 14403;
+    public const int PHYS_PARAM_FRAMEINB_LOC           = 14403;
     [ScriptConstant]
-    public static int PHYS_PARAM_FRAMEINB_ROT           = 14404;
+    public const int PHYS_PARAM_FRAMEINB_ROT           = 14404;
     [ScriptConstant]
-    public static int PHYS_PARAM_LINEAR_LIMIT_LOW       = 14405;
+    public const int PHYS_PARAM_LINEAR_LIMIT_LOW       = 14405;
     [ScriptConstant]
-    public static int PHYS_PARAM_LINEAR_LIMIT_HIGH      = 14406;
+    public const int PHYS_PARAM_LINEAR_LIMIT_HIGH      = 14406;
     [ScriptConstant]
-    public static int PHYS_PARAM_ANGULAR_LIMIT_LOW      = 14407;
+    public const int PHYS_PARAM_ANGULAR_LIMIT_LOW      = 14407;
     [ScriptConstant]
-    public static int PHYS_PARAM_ANGULAR_LIMIT_HIGH     = 14408;
+    public const int PHYS_PARAM_ANGULAR_LIMIT_HIGH     = 14408;
     [ScriptConstant]
-    public static int PHYS_PARAM_USE_FRAME_OFFSET       = 14409;
+    public const int PHYS_PARAM_USE_FRAME_OFFSET       = 14409;
     [ScriptConstant]
-    public static int PHYS_PARAM_ENABLE_TRANSMOTOR      = 14410;
+    public const int PHYS_PARAM_ENABLE_TRANSMOTOR      = 14410;
     [ScriptConstant]
-    public static int PHYS_PARAM_TRANSMOTOR_MAXVEL      = 14411;
+    public const int PHYS_PARAM_TRANSMOTOR_MAXVEL      = 14411;
     [ScriptConstant]
-    public static int PHYS_PARAM_TRANSMOTOR_MAXFORCE    = 14412;
+    public const int PHYS_PARAM_TRANSMOTOR_MAXFORCE    = 14412;
     [ScriptConstant]
-    public static int PHYS_PARAM_CFM                    = 14413;
+    public const int PHYS_PARAM_CFM                    = 14413;
     [ScriptConstant]
-    public static int PHYS_PARAM_ERP                    = 14414;
+    public const int PHYS_PARAM_ERP                    = 14414;
     [ScriptConstant]
-    public static int PHYS_PARAM_SOLVER_ITERATIONS      = 14415;
+    public const int PHYS_PARAM_SOLVER_ITERATIONS      = 14415;
     [ScriptConstant]
-    public static int PHYS_PARAM_SPRING_DAMPING         = 14416;
+    public const int PHYS_PARAM_SPRING_DAMPING         = 14416;
     [ScriptConstant]
-    public static int PHYS_PARAM_SPRING_STIFFNESS       = 14417;
-    public static int PHYS_PARAM_MAX                    = 14417;
+    public const int PHYS_PARAM_SPRING_STIFFNESS       = 14417;
+    public const int PHYS_PARAM_MAX                    = 14417;
 
     // physChangeLinkParams(integer linkNum, [ PHYS_PARAM_*, value, PHYS_PARAM_*, value, ...])
     [ScriptInvocation]
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index c09dd42..b72afc0 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -530,6 +530,28 @@ public sealed class BSLinksetConstraints : BSLinkset
                 }
                 break;
             case ExtendedPhysics.PhysFunctChangeLinkParams:
+                int setParam = 2;
+                switch (setParam)
+                {
+                    case ExtendedPhysics.PHYS_PARAM_FRAMEINA_LOC:
+                    case ExtendedPhysics.PHYS_PARAM_FRAMEINA_ROT:
+                    case ExtendedPhysics.PHYS_PARAM_FRAMEINB_LOC:
+                    case ExtendedPhysics.PHYS_PARAM_FRAMEINB_ROT:
+                    case ExtendedPhysics.PHYS_PARAM_LINEAR_LIMIT_LOW:
+                    case ExtendedPhysics.PHYS_PARAM_LINEAR_LIMIT_HIGH:
+                    case ExtendedPhysics.PHYS_PARAM_ANGULAR_LIMIT_LOW:
+                    case ExtendedPhysics.PHYS_PARAM_ANGULAR_LIMIT_HIGH:
+                    case ExtendedPhysics.PHYS_PARAM_USE_FRAME_OFFSET:
+                    case ExtendedPhysics.PHYS_PARAM_ENABLE_TRANSMOTOR:
+                    case ExtendedPhysics.PHYS_PARAM_TRANSMOTOR_MAXVEL:
+                    case ExtendedPhysics.PHYS_PARAM_TRANSMOTOR_MAXFORCE:
+                    case ExtendedPhysics.PHYS_PARAM_CFM:
+                    case ExtendedPhysics.PHYS_PARAM_ERP:
+                    case ExtendedPhysics.PHYS_PARAM_SOLVER_ITERATIONS:
+                    case ExtendedPhysics.PHYS_PARAM_SPRING_DAMPING:
+                    case ExtendedPhysics.PHYS_PARAM_SPRING_STIFFNESS:
+                        break;
+                }
                 break;
             default:
                 ret = base.Extension(pFunct, pParams);
-- 
cgit v1.1


From 8755aeb348ed96ef78986e044ec83e7836a6c65a Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 16 Aug 2013 13:42:31 -0700
Subject: BulletSim: update DLLs and SOs with Bullet svn version 2644 (no major
 fixes) and with BulletSim implementing more of the constraint types and
 parameter settings.

---
 bin/lib32/BulletSim.dll   | Bin 982528 -> 1086976 bytes
 bin/lib32/libBulletSim.so | Bin 2271724 -> 2317618 bytes
 bin/lib64/BulletSim.dll   | Bin 1222656 -> 1229824 bytes
 bin/lib64/libBulletSim.so | Bin 2454796 -> 2491923 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index bc0e222..7987434 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index e09dd27..114a597 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 5fc09f6..b69fcf3 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 925269d..e4d2581 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1


From e1120cb74db9092cc0f9a7fc245d2f2ed6160b7a Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 16 Aug 2013 13:44:31 -0700
Subject: BulletSim: add extended physics function physGetLinkType(linkNum).
 Add implementation of physChangeLinkParams() in BSLinksetConstraint.

---
 .../Scripting/ExtendedPhysics/ExtendedPhysics.cs   |  19 +++
 OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs  |  11 ++
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  | 145 ++++++++++++++++++---
 .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs |  11 +-
 4 files changed, 163 insertions(+), 23 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
index e0f16d6..d035f7b 100755
--- a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
@@ -64,6 +64,7 @@ public class ExtendedPhysics : INonSharedRegionModule
     public const string PhysFunctSetLinksetType = "BulletSim.SetLinksetType";
     public const string PhysFunctChangeLinkFixed = "BulletSim.ChangeLinkFixed";
     public const string PhysFunctChangeLinkType = "BulletSim.ChangeLinkType";
+    public const string PhysFunctGetLinkType = "BulletSim.GetLinkType";
     public const string PhysFunctChangeLinkParams = "BulletSim.ChangeLinkParams";
 
     // =============================================================
@@ -320,6 +321,24 @@ public class ExtendedPhysics : INonSharedRegionModule
         return ret;
     }
 
+    // physGetLinkType(integer linkNum)
+    [ScriptInvocation]
+    public int physGetLinkType(UUID hostID, UUID scriptID, int linkNum, int typeCode)
+    {
+        int ret = -1;
+        if (!Enabled) return ret;
+
+        PhysicsActor rootPhysActor;
+        PhysicsActor childPhysActor;
+
+        if (GetRootAndChildPhysActors(hostID, linkNum, out rootPhysActor, out childPhysActor))
+        {
+            ret = MakeIntError(rootPhysActor.Extension(PhysFunctGetLinkType, childPhysActor));
+        }
+
+        return ret;
+    }
+
     // physChangeLinkFixed(integer linkNum)
     // Change the link between the root and the linkNum into a fixed, static physical connection.
     [ScriptInvocation]
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 2058e3a..77f69a5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -209,6 +209,17 @@ public abstract class BSLinkset
         return ret;
     }
 
+    public bool TryGetLinkInfo(BSPrimLinkable child, out BSLinkInfo foundInfo)
+    {
+        bool ret = false;
+        BSLinkInfo found = null;
+        lock (m_linksetActivityLock)
+        {
+            ret = m_children.TryGetValue(child, out found);
+        }
+        foundInfo = found;
+        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);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index b72afc0..92df84e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -168,6 +168,8 @@ public sealed class BSLinksetConstraints : BSLinkset
         LinksetImpl = LinksetImplementation.Constraint;
     }
 
+    private static string LogHeader = "[BULLETSIM LINKSET CONSTRAINT]";
+
     // When physical properties are changed the linkset needs to recalculate
     //   its internal properties.
     // This is queued in the 'post taint' queue so the
@@ -511,7 +513,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                                 RemoveDependencies(child);
 
                                 BSLinkInfo linkInfo = null;
-                                if (m_children.TryGetValue(child, out linkInfo))
+                                if (TryGetLinkInfo(child, out linkInfo))
                                 {
                                     BSLinkInfoConstraint linkInfoC = linkInfo as BSLinkInfoConstraint;
                                     if (linkInfoC != null)
@@ -529,28 +531,129 @@ public sealed class BSLinksetConstraints : BSLinkset
                     }
                 }
                 break;
+            case ExtendedPhysics.PhysFunctGetLinkType:
+                if (pParams.Length > 0)
+                {
+                    BSPrimLinkable child = pParams[0] as BSPrimLinkable;
+                    if (child != null)
+                    {
+                        BSLinkInfo linkInfo = null;
+                        if (TryGetLinkInfo(child, out linkInfo))
+                        {
+                            BSLinkInfoConstraint linkInfoC = linkInfo as BSLinkInfoConstraint;
+                            if (linkInfoC != null)
+                            {
+                                ret = (object)(int)linkInfoC.constraintType;
+                            }
+                        }
+                    }
+                }
+                break;
             case ExtendedPhysics.PhysFunctChangeLinkParams:
-                int setParam = 2;
-                switch (setParam)
+                // There should be two parameters: the childActor and a list of parameters to set
+                try
+                {
+                    if (pParams.Length > 1)
+                    {
+                        BSPrimLinkable child = pParams[0] as BSPrimLinkable;
+                        object[] setOps = (object[])pParams[1];
+                        BSLinkInfo baseLinkInfo = null;
+                        if (TryGetLinkInfo(child, out baseLinkInfo))
+                        {
+                            BSLinkInfoConstraint linkInfo = baseLinkInfo as BSLinkInfoConstraint;
+                            if (linkInfo != null)
+                            {
+                                float valueFloat;
+                                bool valueBool;
+                                OMV.Vector3 valueVector;
+                                OMV.Quaternion valueQuaternion;
+
+                                int opIndex = 0;
+                                while (opIndex < setOps.Length)
+                                {
+                                    int thisOp = (int)setOps[opIndex];
+                                    switch (thisOp)
+                                    {
+                                        case ExtendedPhysics.PHYS_PARAM_FRAMEINA_LOC:
+                                            valueVector = (OMV.Vector3)setOps[opIndex + 1];
+                                            linkInfo.frameInAloc = valueVector;
+                                            break;
+                                        case ExtendedPhysics.PHYS_PARAM_FRAMEINA_ROT:
+                                            valueQuaternion = (OMV.Quaternion)setOps[opIndex + 1];
+                                            linkInfo.frameInArot = valueQuaternion;
+                                            break;
+                                        case ExtendedPhysics.PHYS_PARAM_FRAMEINB_LOC:
+                                            valueVector = (OMV.Vector3)setOps[opIndex + 1];
+                                            linkInfo.frameInBloc = valueVector;
+                                            break;
+                                        case ExtendedPhysics.PHYS_PARAM_FRAMEINB_ROT:
+                                            valueQuaternion = (OMV.Quaternion)setOps[opIndex + 1];
+                                            linkInfo.frameInBrot = valueQuaternion;
+                                            break;
+                                        case ExtendedPhysics.PHYS_PARAM_LINEAR_LIMIT_LOW:
+                                            valueVector = (OMV.Vector3)setOps[opIndex + 1];
+                                            linkInfo.linearLimitLow = valueVector;
+                                            break;
+                                        case ExtendedPhysics.PHYS_PARAM_LINEAR_LIMIT_HIGH:
+                                            valueVector = (OMV.Vector3)setOps[opIndex + 1];
+                                            linkInfo.linearLimitHigh = valueVector;
+                                            break;
+                                        case ExtendedPhysics.PHYS_PARAM_ANGULAR_LIMIT_LOW:
+                                            valueVector = (OMV.Vector3)setOps[opIndex + 1];
+                                            linkInfo.angularLimitLow = valueVector;
+                                            break;
+                                        case ExtendedPhysics.PHYS_PARAM_ANGULAR_LIMIT_HIGH:
+                                            valueVector = (OMV.Vector3)setOps[opIndex + 1];
+                                            linkInfo.angularLimitHigh = valueVector;
+                                            break;
+                                        case ExtendedPhysics.PHYS_PARAM_USE_FRAME_OFFSET:
+                                            valueBool = (bool)setOps[opIndex + 1];
+                                            linkInfo.useFrameOffset = valueBool;
+                                            break;
+                                        case ExtendedPhysics.PHYS_PARAM_ENABLE_TRANSMOTOR:
+                                            valueBool = (bool)setOps[opIndex + 1];
+                                            linkInfo.enableTransMotor = valueBool;
+                                            break;
+                                        case ExtendedPhysics.PHYS_PARAM_TRANSMOTOR_MAXVEL:
+                                            valueFloat = (float)setOps[opIndex + 1];
+                                            linkInfo.transMotorMaxVel = valueFloat;
+                                            break;
+                                        case ExtendedPhysics.PHYS_PARAM_TRANSMOTOR_MAXFORCE:
+                                            valueFloat = (float)setOps[opIndex + 1];
+                                            linkInfo.transMotorMaxForce = valueFloat;
+                                            break;
+                                        case ExtendedPhysics.PHYS_PARAM_CFM:
+                                            valueFloat = (float)setOps[opIndex + 1];
+                                            linkInfo.cfm = valueFloat;
+                                            break;
+                                        case ExtendedPhysics.PHYS_PARAM_ERP:
+                                            valueFloat = (float)setOps[opIndex + 1];
+                                            linkInfo.erp = valueFloat;
+                                            break;
+                                        case ExtendedPhysics.PHYS_PARAM_SOLVER_ITERATIONS:
+                                            valueFloat = (float)setOps[opIndex + 1];
+                                            linkInfo.solverIterations = valueFloat;
+                                            break;
+                                        case ExtendedPhysics.PHYS_PARAM_SPRING_DAMPING:
+                                            valueFloat = (float)setOps[opIndex + 1];
+                                            linkInfo.springDamping = valueFloat;
+                                            break;
+                                        case ExtendedPhysics.PHYS_PARAM_SPRING_STIFFNESS:
+                                            valueFloat = (float)setOps[opIndex + 1];
+                                            linkInfo.springStiffness = valueFloat;
+                                            break;
+                                        default:
+                                            break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                catch (Exception e)
                 {
-                    case ExtendedPhysics.PHYS_PARAM_FRAMEINA_LOC:
-                    case ExtendedPhysics.PHYS_PARAM_FRAMEINA_ROT:
-                    case ExtendedPhysics.PHYS_PARAM_FRAMEINB_LOC:
-                    case ExtendedPhysics.PHYS_PARAM_FRAMEINB_ROT:
-                    case ExtendedPhysics.PHYS_PARAM_LINEAR_LIMIT_LOW:
-                    case ExtendedPhysics.PHYS_PARAM_LINEAR_LIMIT_HIGH:
-                    case ExtendedPhysics.PHYS_PARAM_ANGULAR_LIMIT_LOW:
-                    case ExtendedPhysics.PHYS_PARAM_ANGULAR_LIMIT_HIGH:
-                    case ExtendedPhysics.PHYS_PARAM_USE_FRAME_OFFSET:
-                    case ExtendedPhysics.PHYS_PARAM_ENABLE_TRANSMOTOR:
-                    case ExtendedPhysics.PHYS_PARAM_TRANSMOTOR_MAXVEL:
-                    case ExtendedPhysics.PHYS_PARAM_TRANSMOTOR_MAXFORCE:
-                    case ExtendedPhysics.PHYS_PARAM_CFM:
-                    case ExtendedPhysics.PHYS_PARAM_ERP:
-                    case ExtendedPhysics.PHYS_PARAM_SOLVER_ITERATIONS:
-                    case ExtendedPhysics.PHYS_PARAM_SPRING_DAMPING:
-                    case ExtendedPhysics.PHYS_PARAM_SPRING_STIFFNESS:
-                        break;
+                    // There are many ways to mess up the parameters. If not just right don't fail without some error.
+                    m_physicsScene.Logger.WarnFormat("{0} bad parameters in physSetLinksetParams: {1}", LogHeader, e);
                 }
                 break;
             default:
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 6136257..28ea8c0 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -317,14 +317,21 @@ public class BSPrimLinkable : BSPrimDisplaced
             // Params: PhysActor linkedPrim, int typeCode
             case ExtendedPhysics.PhysFunctChangeLinkType:
             {
-                Linkset.Extension(pFunct, pParams);
+                ret = Linkset.Extension(pFunct, pParams);
+                break;
+            }
+            // physGetLinkType(linknum);
+            // Params: PhysActor linkedPrim
+            case ExtendedPhysics.PhysFunctGetLinkType:
+            {
+                ret = Linkset.Extension(pFunct, pParams);
                 break;
             }
             // physChangeLinkParams(linknum, [code, value, code, value, ...]);
             // Params: PhysActor linkedPrim, object[] params
             case ExtendedPhysics.PhysFunctChangeLinkParams:
             {
-                Linkset.Extension(pFunct, pParams);
+                ret = Linkset.Extension(pFunct, pParams);
                 break;
             }
             default:
-- 
cgit v1.1


From 6d83f3f02190509119f65da92def19d08ef825f9 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 19 Aug 2013 11:08:22 -0700
Subject: BulletSim: adjust avatar capsule height calculation to be closer to
 defined SL heights. Correct BSParam avatar height defaults to be what's in
 OpenSimDefaults.ini.

---
 OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 15 ++++++++++-----
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs     |  4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 291dfcd..28b2a7e 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -676,18 +676,20 @@ public sealed class BSCharacter : BSPhysObject
         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;
+            const float AVATAR_LOW = 1.1f;
+            const float AVATAR_MID = 1.775f; // 1.87f
+            const float AVATAR_HI = 2.45f;
+            // An avatar is between 1.1 and 2.45 meters. Midpoint is 1.775m.
+            float midHeightOffset = size.Z - AVATAR_MID;
             if (midHeightOffset < 0f)
             {
                 // Small avatar. Add the adjustment based on the distance from midheight
-                heightAdjust += -1f * midHeightOffset * 4f * BSParam.AvatarHeightLowFudge;
+                heightAdjust += ((-1f * midHeightOffset) / (AVATAR_MID - AVATAR_LOW)) * BSParam.AvatarHeightLowFudge;
             }
             else
             {
                 // Large avatar. Add the adjustment based on the distance from midheight
-                heightAdjust += midHeightOffset * 4f * BSParam.AvatarHeightHighFudge;
+                heightAdjust += ((midHeightOffset) / (AVATAR_HI - AVATAR_MID)) * BSParam.AvatarHeightHighFudge;
             }
         }
         // The total scale height is the central cylindar plus the caps on the two ends.
@@ -698,6 +700,9 @@ public sealed class BSCharacter : BSPhysObject
         if (newScale.Z < 0)
             newScale.Z = 0.1f;
 
+        DetailLog("{0},BSCharacter.ComputerAvatarScale,size={1},lowF={2},midF={3},hiF={4},adj={5},newScale={6}",
+            LocalID, size, BSParam.AvatarHeightLowFudge, BSParam.AvatarHeightMidFudge, BSParam.AvatarHeightHighFudge, heightAdjust, newScale);
+
         return newScale;
     }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 737dda1..4e92e6d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -570,9 +570,9 @@ public static class BSParam
         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 ),
+            0.1f ),
         new ParameterDefn<float>("AvatarHeightHighFudge", "A fudge factor to make tall avatars stand on the ground",
-            0.2f ),
+            0.1f ),
 	    new ParameterDefn<float>("AvatarContactProcessingThreshold", "Distance from capsule to check for collisions",
             0.1f ),
 	    new ParameterDefn<float>("AvatarBelowGroundUpCorrectionMeters", "Meters to move avatar up if it seems to be below ground",
-- 
cgit v1.1


From 4781297b4ee5908b76039ce3b38291eb2e89e157 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 20 Aug 2013 08:14:08 -0700
Subject: BulletSim: Extension parameters passed through the classes made to
 pass just and array of objects rather than a mixture of parameters and array.
 Makes understanding and parsing what is being passed much easier.

---
 .../Scripting/ExtendedPhysics/ExtendedPhysics.cs   | 23 ++++--
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  | 93 ++++++++++++++++------
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     |  1 +
 .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 15 ++--
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs    |  1 +
 5 files changed, 98 insertions(+), 35 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
index d035f7b..90cf15a 100755
--- a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
@@ -315,7 +315,8 @@ public class ExtendedPhysics : INonSharedRegionModule
 
         if (GetRootAndChildPhysActors(hostID, linkNum, out rootPhysActor, out childPhysActor))
         {
-            ret = MakeIntError(rootPhysActor.Extension(PhysFunctChangeLinkType, childPhysActor, typeCode));
+            object[] parms = { childPhysActor, typeCode };
+            ret = MakeIntError(rootPhysActor.Extension(PhysFunctChangeLinkType, parms));
         }
 
         return ret;
@@ -323,7 +324,7 @@ public class ExtendedPhysics : INonSharedRegionModule
 
     // physGetLinkType(integer linkNum)
     [ScriptInvocation]
-    public int physGetLinkType(UUID hostID, UUID scriptID, int linkNum, int typeCode)
+    public int physGetLinkType(UUID hostID, UUID scriptID, int linkNum)
     {
         int ret = -1;
         if (!Enabled) return ret;
@@ -333,7 +334,8 @@ public class ExtendedPhysics : INonSharedRegionModule
 
         if (GetRootAndChildPhysActors(hostID, linkNum, out rootPhysActor, out childPhysActor))
         {
-            ret = MakeIntError(rootPhysActor.Extension(PhysFunctGetLinkType, childPhysActor));
+            object[] parms = { childPhysActor };
+            ret = MakeIntError(rootPhysActor.Extension(PhysFunctGetLinkType, parms));
         }
 
         return ret;
@@ -352,7 +354,8 @@ public class ExtendedPhysics : INonSharedRegionModule
 
         if (GetRootAndChildPhysActors(hostID, linkNum, out rootPhysActor, out childPhysActor))
         {
-            ret = MakeIntError(rootPhysActor.Extension(PhysFunctChangeLinkType, childPhysActor, PHYS_LINK_TYPE_FIXED));
+            object[] parms = { childPhysActor , PHYS_LINK_TYPE_FIXED };
+            ret = MakeIntError(rootPhysActor.Extension(PhysFunctChangeLinkType, parms));
         }
 
         return ret;
@@ -409,7 +412,8 @@ public class ExtendedPhysics : INonSharedRegionModule
 
         if (GetRootAndChildPhysActors(hostID, linkNum, out rootPhysActor, out childPhysActor))
         {
-            ret = MakeIntError(rootPhysActor.Extension(PhysFunctChangeLinkParams, childPhysActor, parms));
+            object[] parms2 = AddToBeginningOfArray(childPhysActor, parms);
+            ret = MakeIntError(rootPhysActor.Extension(PhysFunctChangeLinkParams, parms2));
         }
 
         return ret;
@@ -513,6 +517,15 @@ public class ExtendedPhysics : INonSharedRegionModule
         return ret;
     }
 
+    // Return an array of objects with the passed object as the first object of a new array
+    private object[] AddToBeginningOfArray(object firstOne, object[] prevArray)
+    {
+        object[] newArray = new object[1 + prevArray.Length];
+        newArray[0] = firstOne;
+        prevArray.CopyTo(newArray, 1);
+        return newArray;
+    }
+
     // Extension() returns an object. Convert that object into the integer error we expect to return.
     private int MakeIntError(object extensionRet)
     {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index 92df84e..87716b4 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -343,7 +343,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                 // real world coordinate of midpoint between the two objects
                 OMV.Vector3 midPoint = rootPrim.Position + (childRelativePosition / 2);
 
-                DetailLog("{0},BSLinksetConstraint.BuildConstraint,6Dof,rBody={1},cBody={2},rLoc={3},cLoc={4},midLoc={7}",
+                DetailLog("{0},BSLinksetConstraint.BuildConstraint,6Dof,rBody={1},cBody={2},rLoc={3},cLoc={4},midLoc={5}",
                                                 rootPrim.LocalID, rootPrim.PhysBody, linkInfo.member.PhysBody,
                                                 rootPrim.Position, linkInfo.member.Position, midPoint);
 
@@ -492,11 +492,12 @@ public sealed class BSLinksetConstraints : BSLinkset
         object ret = null;
         switch (pFunct)
         {
-            // pParams = (int linkNUm, PhysActor linkChild)
+            // pParams = [ BSPhysObject child, integer linkType ]
             case ExtendedPhysics.PhysFunctChangeLinkType:
                 if (pParams.Length > 1)
                 {
                     int requestedType = (int)pParams[1];
+                    DetailLog("{0},BSLinksetConstraint.SetLinkType,requestedType={1}", LinksetRoot.LocalID, requestedType);
                     if (requestedType == (int)ConstraintType.FIXED_CONSTRAINT_TYPE
                         || requestedType == (int)ConstraintType.D6_CONSTRAINT_TYPE
                         || requestedType == (int)ConstraintType.D6_SPRING_CONSTRAINT_TYPE
@@ -507,7 +508,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                         BSPrimLinkable child = pParams[0] as BSPrimLinkable;
                         if (child != null)
                         {
-                            m_physicsScene.TaintedObject("BSLinksetConstraint.PhysFunctChangeLinkFixed", delegate()
+                            m_physicsScene.TaintedObject("BSLinksetConstraint.PhysFunctChangeLinkType", delegate()
                             {
                                 // Pick up all the constraints currently created.
                                 RemoveDependencies(child);
@@ -522,15 +523,35 @@ public sealed class BSLinksetConstraints : BSLinkset
                                         linkInfoC.ResetLink();
                                         linkInfoC.constraintType = (ConstraintType)requestedType;
                                         ret = (object)true;
+                                        DetailLog("{0},BSLinksetConstraint.SetLinkType,link={1},type={2}",
+                                                    linkInfo.member.LocalID, linkInfo.member.LocalID, linkInfoC.constraintType);
+                                    }
+                                    else
+                                    {
+                                        DetailLog("{0},BSLinksetConstraint.SetLinkType,linkInfoNotConstraint,childID={1}", LinksetRoot.LocalID, child.LocalID);
                                     }
                                 }
+                                else
+                                {
+                                    DetailLog("{0},BSLinksetConstraint.SetLinkType,noLinkInfoForChild,childID={1}", LinksetRoot.LocalID, child.LocalID);
+                                }
                                 // Cause the whole linkset to be rebuilt in post-taint time.
                                 Refresh(child);
                             });
                         }
+                        else
+                        {
+                            DetailLog("{0},BSLinksetConstraint.SetLinkType,childNotBSPrimLinkable", LinksetRoot.LocalID);
+                        }
+                    }
+                    else
+                    {
+                        DetailLog("{0},BSLinksetConstraint.SetLinkType,illegalRequestedType,reqested={1},spring={2}",
+                                        LinksetRoot.LocalID, requestedType, ((int)ConstraintType.D6_SPRING_CONSTRAINT_TYPE));
                     }
                 }
                 break;
+            // pParams = []
             case ExtendedPhysics.PhysFunctGetLinkType:
                 if (pParams.Length > 0)
                 {
@@ -544,11 +565,15 @@ public sealed class BSLinksetConstraints : BSLinkset
                             if (linkInfoC != null)
                             {
                                 ret = (object)(int)linkInfoC.constraintType;
+                                DetailLog("{0},BSLinksetConstraint.GetLinkType,link={1},type={2}",
+                                            linkInfo.member.LocalID, linkInfo.member.LocalID, linkInfoC.constraintType);
+
                             }
                         }
                     }
                 }
                 break;
+            // pParams = [ BSPhysObject child, int op, object opParams, int op, object opParams, ... ]
             case ExtendedPhysics.PhysFunctChangeLinkParams:
                 // There should be two parameters: the childActor and a list of parameters to set
                 try
@@ -556,7 +581,6 @@ public sealed class BSLinksetConstraints : BSLinkset
                     if (pParams.Length > 1)
                     {
                         BSPrimLinkable child = pParams[0] as BSPrimLinkable;
-                        object[] setOps = (object[])pParams[1];
                         BSLinkInfo baseLinkInfo = null;
                         if (TryGetLinkInfo(child, out baseLinkInfo))
                         {
@@ -568,85 +592,106 @@ public sealed class BSLinksetConstraints : BSLinkset
                                 OMV.Vector3 valueVector;
                                 OMV.Quaternion valueQuaternion;
 
-                                int opIndex = 0;
-                                while (opIndex < setOps.Length)
+                                int opIndex = 1;
+                                while (opIndex < pParams.Length)
                                 {
-                                    int thisOp = (int)setOps[opIndex];
+                                    int thisOp = (int)pParams[opIndex];
+                                    DetailLog("{0},BSLinksetConstraint.ChangeLinkParams2,op={1},val={2}",
+                                                        linkInfo.member.LocalID, thisOp, pParams[opIndex+1]);
                                     switch (thisOp)
                                     {
                                         case ExtendedPhysics.PHYS_PARAM_FRAMEINA_LOC:
-                                            valueVector = (OMV.Vector3)setOps[opIndex + 1];
+                                            valueVector = (OMV.Vector3)pParams[opIndex + 1];
                                             linkInfo.frameInAloc = valueVector;
+                                            opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_FRAMEINA_ROT:
-                                            valueQuaternion = (OMV.Quaternion)setOps[opIndex + 1];
+                                            valueQuaternion = (OMV.Quaternion)pParams[opIndex + 1];
                                             linkInfo.frameInArot = valueQuaternion;
+                                            opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_FRAMEINB_LOC:
-                                            valueVector = (OMV.Vector3)setOps[opIndex + 1];
+                                            valueVector = (OMV.Vector3)pParams[opIndex + 1];
                                             linkInfo.frameInBloc = valueVector;
+                                            opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_FRAMEINB_ROT:
-                                            valueQuaternion = (OMV.Quaternion)setOps[opIndex + 1];
+                                            valueQuaternion = (OMV.Quaternion)pParams[opIndex + 1];
                                             linkInfo.frameInBrot = valueQuaternion;
+                                            opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_LINEAR_LIMIT_LOW:
-                                            valueVector = (OMV.Vector3)setOps[opIndex + 1];
+                                            valueVector = (OMV.Vector3)pParams[opIndex + 1];
                                             linkInfo.linearLimitLow = valueVector;
+                                            opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_LINEAR_LIMIT_HIGH:
-                                            valueVector = (OMV.Vector3)setOps[opIndex + 1];
+                                            valueVector = (OMV.Vector3)pParams[opIndex + 1];
                                             linkInfo.linearLimitHigh = valueVector;
+                                            opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_ANGULAR_LIMIT_LOW:
-                                            valueVector = (OMV.Vector3)setOps[opIndex + 1];
+                                            valueVector = (OMV.Vector3)pParams[opIndex + 1];
                                             linkInfo.angularLimitLow = valueVector;
+                                            opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_ANGULAR_LIMIT_HIGH:
-                                            valueVector = (OMV.Vector3)setOps[opIndex + 1];
+                                            valueVector = (OMV.Vector3)pParams[opIndex + 1];
                                             linkInfo.angularLimitHigh = valueVector;
+                                            opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_USE_FRAME_OFFSET:
-                                            valueBool = (bool)setOps[opIndex + 1];
+                                            valueBool = (bool)pParams[opIndex + 1];
                                             linkInfo.useFrameOffset = valueBool;
+                                            opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_ENABLE_TRANSMOTOR:
-                                            valueBool = (bool)setOps[opIndex + 1];
+                                            valueBool = (bool)pParams[opIndex + 1];
                                             linkInfo.enableTransMotor = valueBool;
+                                            opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_TRANSMOTOR_MAXVEL:
-                                            valueFloat = (float)setOps[opIndex + 1];
+                                            valueFloat = (float)pParams[opIndex + 1];
                                             linkInfo.transMotorMaxVel = valueFloat;
+                                            opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_TRANSMOTOR_MAXFORCE:
-                                            valueFloat = (float)setOps[opIndex + 1];
+                                            valueFloat = (float)pParams[opIndex + 1];
                                             linkInfo.transMotorMaxForce = valueFloat;
+                                            opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_CFM:
-                                            valueFloat = (float)setOps[opIndex + 1];
+                                            valueFloat = (float)pParams[opIndex + 1];
                                             linkInfo.cfm = valueFloat;
+                                            opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_ERP:
-                                            valueFloat = (float)setOps[opIndex + 1];
+                                            valueFloat = (float)pParams[opIndex + 1];
                                             linkInfo.erp = valueFloat;
+                                            opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_SOLVER_ITERATIONS:
-                                            valueFloat = (float)setOps[opIndex + 1];
+                                            valueFloat = (float)pParams[opIndex + 1];
                                             linkInfo.solverIterations = valueFloat;
+                                            opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_SPRING_DAMPING:
-                                            valueFloat = (float)setOps[opIndex + 1];
+                                            valueFloat = (float)pParams[opIndex + 1];
                                             linkInfo.springDamping = valueFloat;
+                                            opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_SPRING_STIFFNESS:
-                                            valueFloat = (float)setOps[opIndex + 1];
+                                            valueFloat = (float)pParams[opIndex + 1];
                                             linkInfo.springStiffness = valueFloat;
+                                            opIndex += 2;
                                             break;
                                         default:
                                             break;
                                     }
                                 }
                             }
+                            // Something changed so a rebuild is in order
+                            Refresh(child);
                         }
                     }
                 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 4685b48..45056bc 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -1552,6 +1552,7 @@ public class BSPrim : BSPhysObject
     #region Extension
     public override object Extension(string pFunct, params object[] pParams)
     {
+        DetailLog("{0} BSPrim.Extension,op={1}", LocalID, pFunct);
         object ret = null;
         switch (pFunct)
         {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 28ea8c0..531f8fb 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -283,17 +283,20 @@ public class BSPrimLinkable : BSPrimDisplaced
     #region Extension
     public override object Extension(string pFunct, params object[] pParams)
     {
+        DetailLog("{0} BSPrimLinkable.Extension,op={1},nParam={2}", LocalID, pFunct, pParams.Length);
         object ret = null;
         switch (pFunct)
         {
             // physGetLinksetType();
+            // pParams = []
             case ExtendedPhysics.PhysFunctGetLinksetType:
             {
                 ret = (object)LinksetType;
-                m_log.DebugFormat("{0} Extension.physGetLinksetType, type={1}", LogHeader, ret);
+                DetailLog("{0},BSPrimLinkable.Extension.physGetLinksetType,type={1}", LocalID, ret);
                 break;
             }
             // physSetLinksetType(type);
+            // pParams = [ BSPhysObject child, integer type ]
             case ExtendedPhysics.PhysFunctSetLinksetType:
             {
                 if (pParams.Length > 0)
@@ -304,8 +307,8 @@ public class BSPrimLinkable : BSPrimDisplaced
                         PhysScene.TaintedObject("BSPrim.PhysFunctSetLinksetType", delegate()
                         {
                             // Cause the linkset type to change
-                            m_log.DebugFormat("{0} Extension.physSetLinksetType, oldType={1}, newType={2}",
-                                                LogHeader, Linkset.LinksetImpl, linksetType);
+                            DetailLog("{0},BSPrimLinkable.Extension.physSetLinksetType, oldType={1},newType={2}",
+                                                LocalID, Linkset.LinksetImpl, linksetType);
                             ConvertLinkset(linksetType);
                         });
                     }
@@ -314,21 +317,21 @@ public class BSPrimLinkable : BSPrimDisplaced
                 break;
             }
             // physChangeLinkType(linknum, typeCode);
-            // Params: PhysActor linkedPrim, int typeCode
+            // pParams = [ BSPhysObject child, integer linkType ]
             case ExtendedPhysics.PhysFunctChangeLinkType:
             {
                 ret = Linkset.Extension(pFunct, pParams);
                 break;
             }
             // physGetLinkType(linknum);
-            // Params: PhysActor linkedPrim
+            // pParams = [ BSPhysObject child ]
             case ExtendedPhysics.PhysFunctGetLinkType:
             {
                 ret = Linkset.Extension(pFunct, pParams);
                 break;
             }
             // physChangeLinkParams(linknum, [code, value, code, value, ...]);
-            // Params: PhysActor linkedPrim, object[] params
+            // pParams = [ BSPhysObject child, object[] [ string op, object opParam, string op, object opParam, ... ] ]
             case ExtendedPhysics.PhysFunctChangeLinkParams:
             {
                 ret = Linkset.Extension(pFunct, pParams);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 7440468..b2ec0e5 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -869,6 +869,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
     #region Extensions
     public override object Extension(string pFunct, params object[] pParams)
     {
+        DetailLog("{0} BSScene.Extension,op={1}", DetailLogZero, pFunct);
         return base.Extension(pFunct, pParams);
     }
     #endregion // Extensions
-- 
cgit v1.1


From 995314f91f72eef0048a58f30e8dd8051f6bf14e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 20 Aug 2013 09:20:48 -0700
Subject: BulletSim: add ID parameter to TaintedObject calls so logging will
 include LocalID of object which created the taint.

---
 .../Physics/BulletSPlugin/BSActorAvatarMove.cs     |  2 +-
 .../Region/Physics/BulletSPlugin/BSCharacter.cs    | 26 +++++-----
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  |  4 +-
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs    |  2 +-
 .../Region/Physics/BulletSPlugin/BSPhysObject.cs   |  6 +--
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs     | 58 +++++++++++-----------
 .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs |  6 +--
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs    | 55 +++++++++++++-------
 8 files changed, 89 insertions(+), 70 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
index 68bc1b9..04a4a32 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -105,7 +105,7 @@ public class BSActorAvatarMove : BSActor
     //     into the movement motor.
     public void SetVelocityAndTarget(OMV.Vector3 vel, OMV.Vector3 targ, bool inTaintTime)
     {
-        m_physicsScene.TaintedObject(inTaintTime, "BSActorAvatarMove.setVelocityAndTarget", delegate()
+        m_physicsScene.TaintedObject(inTaintTime, m_controllingPrim.LocalID, "BSActorAvatarMove.setVelocityAndTarget", delegate()
         {
             if (m_velocityMotor != null)
             {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 28b2a7e..fc18960 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -93,7 +93,7 @@ public sealed class BSCharacter : BSPhysObject
                             LocalID, _size, Scale, Density, _avatarVolume, RawMass, pos);
 
         // do actual creation in taint time
-        PhysScene.TaintedObject("BSCharacter.create", delegate()
+        PhysScene.TaintedObject(LocalID, "BSCharacter.create", delegate()
         {
             DetailLog("{0},BSCharacter.create,taint", LocalID);
             // New body and shape into PhysBody and PhysShape
@@ -121,7 +121,7 @@ public sealed class BSCharacter : BSPhysObject
         base.Destroy();
 
         DetailLog("{0},BSCharacter.Destroy", LocalID);
-        PhysScene.TaintedObject("BSCharacter.destroy", delegate()
+        PhysScene.TaintedObject(LocalID, "BSCharacter.destroy", delegate()
         {
             PhysScene.Shapes.DereferenceBody(PhysBody, null /* bodyCallback */);
             PhysBody.Clear();
@@ -209,7 +209,7 @@ 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);
 
-            PhysScene.TaintedObject("BSCharacter.setSize", delegate()
+            PhysScene.TaintedObject(LocalID, "BSCharacter.setSize", delegate()
             {
                 if (PhysBody.HasPhysicalBody && PhysShape.physShapeInfo.HasPhysicalShape)
                 {
@@ -257,7 +257,7 @@ public sealed class BSCharacter : BSPhysObject
         _rotationalVelocity = OMV.Vector3.Zero;
 
         // Zero some other properties directly into the physics engine
-        PhysScene.TaintedObject(inTaintTime, "BSCharacter.ZeroMotion", delegate()
+        PhysScene.TaintedObject(inTaintTime, LocalID, "BSCharacter.ZeroMotion", delegate()
         {
             if (PhysBody.HasPhysicalBody)
                 PhysScene.PE.ClearAllForces(PhysBody);
@@ -267,7 +267,7 @@ public sealed class BSCharacter : BSPhysObject
     {
         _rotationalVelocity = OMV.Vector3.Zero;
 
-        PhysScene.TaintedObject(inTaintTime, "BSCharacter.ZeroMotion", delegate()
+        PhysScene.TaintedObject(inTaintTime, LocalID, "BSCharacter.ZeroMotion", delegate()
         {
             if (PhysBody.HasPhysicalBody)
             {
@@ -291,7 +291,7 @@ public sealed class BSCharacter : BSPhysObject
         set {
             RawPosition = value;
 
-            PhysScene.TaintedObject("BSCharacter.setPosition", delegate()
+            PhysScene.TaintedObject(LocalID, "BSCharacter.setPosition", delegate()
             {
                 DetailLog("{0},BSCharacter.SetPosition,taint,pos={1},orient={2}", LocalID, RawPosition, RawOrientation);
                 PositionSanityCheck();
@@ -363,7 +363,7 @@ 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.
-            PhysScene.TaintedObject(inTaintTime, "BSCharacter.PositionSanityCheck", delegate()
+            PhysScene.TaintedObject(inTaintTime, LocalID, "BSCharacter.PositionSanityCheck", delegate()
             {
                 DetailLog("{0},BSCharacter.PositionSanityCheck,taint,pos={1},orient={2}", LocalID, RawPosition, RawOrientation);
                 ForcePosition = RawPosition;
@@ -390,7 +390,7 @@ public sealed class BSCharacter : BSPhysObject
         set {
             RawForce = value;
             // m_log.DebugFormat("{0}: Force = {1}", LogHeader, _force);
-            PhysScene.TaintedObject("BSCharacter.SetForce", delegate()
+            PhysScene.TaintedObject(LocalID, "BSCharacter.SetForce", delegate()
             {
                 DetailLog("{0},BSCharacter.setForce,taint,force={1}", LocalID, RawForce);
                 if (PhysBody.HasPhysicalBody)
@@ -438,7 +438,7 @@ public sealed class BSCharacter : BSPhysObject
         set {
             RawVelocity = value;
             // m_log.DebugFormat("{0}: set velocity = {1}", LogHeader, RawVelocity);
-            PhysScene.TaintedObject("BSCharacter.setVelocity", delegate()
+            PhysScene.TaintedObject(LocalID, "BSCharacter.setVelocity", delegate()
             {
                 if (m_moveActor != null)
                     m_moveActor.SetVelocityAndTarget(RawVelocity, RawVelocity, true /* inTaintTime */);
@@ -480,7 +480,7 @@ public sealed class BSCharacter : BSPhysObject
             if (RawOrientation != value)
             {
                 RawOrientation = value;
-                PhysScene.TaintedObject("BSCharacter.setOrientation", delegate()
+                PhysScene.TaintedObject(LocalID, "BSCharacter.setOrientation", delegate()
                 {
                     // 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.
@@ -560,7 +560,7 @@ public sealed class BSCharacter : BSPhysObject
     public override bool FloatOnWater {
         set {
             _floatOnWater = value;
-            PhysScene.TaintedObject("BSCharacter.setFloatOnWater", delegate()
+            PhysScene.TaintedObject(LocalID, "BSCharacter.setFloatOnWater", delegate()
             {
                 if (PhysBody.HasPhysicalBody)
                 {
@@ -588,7 +588,7 @@ public sealed class BSCharacter : BSPhysObject
     public override float Buoyancy {
         get { return _buoyancy; }
         set { _buoyancy = value;
-            PhysScene.TaintedObject("BSCharacter.setBuoyancy", delegate()
+            PhysScene.TaintedObject(LocalID, "BSCharacter.setBuoyancy", delegate()
             {
                 DetailLog("{0},BSCharacter.setBuoyancy,taint,buoy={1}", LocalID, _buoyancy);
                 ForceBuoyancy = _buoyancy;
@@ -633,7 +633,7 @@ public sealed class BSCharacter : BSPhysObject
             OMV.Vector3 addForce = Util.ClampV(force, BSParam.MaxAddForceMagnitude);
             // DetailLog("{0},BSCharacter.addForce,call,force={1}", LocalID, addForce);
 
-            PhysScene.TaintedObject(inTaintTime, "BSCharacter.AddForce", delegate()
+            PhysScene.TaintedObject(inTaintTime, LocalID, "BSCharacter.AddForce", delegate()
             {
                 // Bullet adds this central force to the total force for this tick
                 // DetailLog("{0},BSCharacter.addForce,taint,force={1}", LocalID, addForce);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index 87716b4..b2a9501 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -297,7 +297,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                             rootx.LocalID, rootx.PhysBody.AddrString,
                             childx.LocalID, childx.PhysBody.AddrString);
 
-            m_physicsScene.TaintedObject(inTaintTime, "BSLinksetConstraints.RemoveChildFromLinkset", delegate()
+            m_physicsScene.TaintedObject(inTaintTime, childx.LocalID, "BSLinksetConstraints.RemoveChildFromLinkset", delegate()
             {
                 PhysicallyUnlinkAChildFromRoot(rootx, childx);
             });
@@ -508,7 +508,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                         BSPrimLinkable child = pParams[0] as BSPrimLinkable;
                         if (child != null)
                         {
-                            m_physicsScene.TaintedObject("BSLinksetConstraint.PhysFunctChangeLinkType", delegate()
+                            m_physicsScene.TaintedObject(child.LocalID, "BSLinksetConstraint.PhysFunctChangeLinkType", delegate()
                             {
                                 // Pick up all the constraints currently created.
                                 RemoveDependencies(child);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 4e92e6d..2f1799b 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -826,7 +826,7 @@ public static class BSParam
     private static void ResetConstraintSolverTainted(BSScene pPhysScene, float v)
     {
         BSScene physScene = pPhysScene;
-        physScene.TaintedObject("BSParam.ResetConstraintSolver", delegate()
+        physScene.TaintedObject(BSScene.DetailLogZero, "BSParam.ResetConstraintSolver", delegate()
         {
             physScene.PE.ResetConstraintSolver(physScene.World);
         });
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 9dc52d5..2efb1a5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -121,7 +121,7 @@ public abstract class BSPhysObject : PhysicsActor
     public virtual void Destroy()
     {
         PhysicalActors.Enable(false);
-        PhysScene.TaintedObject("BSPhysObject.Destroy", delegate()
+        PhysScene.TaintedObject(LocalID, "BSPhysObject.Destroy", delegate()
         {
             PhysicalActors.Dispose();
         });
@@ -509,7 +509,7 @@ public abstract class BSPhysObject : PhysicsActor
             // make sure first collision happens
             NextCollisionOkTime = Util.EnvironmentTickCountSubtract(SubscribedEventsMs);
 
-            PhysScene.TaintedObject(TypeName+".SubscribeEvents", delegate()
+            PhysScene.TaintedObject(LocalID, TypeName+".SubscribeEvents", delegate()
             {
                 if (PhysBody.HasPhysicalBody)
                     CurrentCollisionFlags = PhysScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
@@ -524,7 +524,7 @@ public abstract class BSPhysObject : PhysicsActor
     public override void UnSubscribeEvents() {
         // DetailLog("{0},{1}.UnSubscribeEvents,unsubscribing", LocalID, TypeName);
         SubscribedEventsMs = 0;
-        PhysScene.TaintedObject(TypeName+".UnSubscribeEvents", delegate()
+        PhysScene.TaintedObject(LocalID, TypeName+".UnSubscribeEvents", delegate()
         {
             // Make sure there is a body there because sometimes destruction happens in an un-ideal order.
             if (PhysBody.HasPhysicalBody)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 45056bc..15b7090 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -102,7 +102,7 @@ public class BSPrim : BSPhysObject
 
         // DetailLog("{0},BSPrim.constructor,call", LocalID);
         // do the actual object creation at taint time
-        PhysScene.TaintedObject("BSPrim.create", delegate()
+        PhysScene.TaintedObject(LocalID, "BSPrim.create", delegate()
         {
             // Make sure the object is being created with some sanity.
             ExtremeSanityCheck(true /* inTaintTime */);
@@ -126,7 +126,7 @@ public class BSPrim : BSPhysObject
         // Undo any vehicle properties
         this.VehicleType = (int)Vehicle.TYPE_NONE;
 
-        PhysScene.TaintedObject("BSPrim.Destroy", delegate()
+        PhysScene.TaintedObject(LocalID, "BSPrim.Destroy", delegate()
         {
             DetailLog("{0},BSPrim.Destroy,taint,", LocalID);
             // If there are physical body and shape, release my use of same.
@@ -161,7 +161,7 @@ public class BSPrim : BSPhysObject
     }
     public override bool ForceBodyShapeRebuild(bool inTaintTime)
     {
-        PhysScene.TaintedObject(inTaintTime, "BSPrim.ForceBodyShapeRebuild", delegate()
+        PhysScene.TaintedObject(inTaintTime, LocalID, "BSPrim.ForceBodyShapeRebuild", delegate()
         {
             _mass = CalculateMass();   // changing the shape changes the mass
             CreateGeomAndObject(true);
@@ -178,7 +178,7 @@ public class BSPrim : BSPhysObject
             if (value != _isSelected)
             {
                 _isSelected = value;
-                PhysScene.TaintedObject("BSPrim.setSelected", delegate()
+                PhysScene.TaintedObject(LocalID, "BSPrim.setSelected", delegate()
                 {
                     DetailLog("{0},BSPrim.selected,taint,selected={1}", LocalID, _isSelected);
                     SetObjectDynamic(false);
@@ -224,7 +224,7 @@ public class BSPrim : BSPhysObject
         _rotationalVelocity = OMV.Vector3.Zero;
 
         // Zero some other properties in the physics engine
-        PhysScene.TaintedObject(inTaintTime, "BSPrim.ZeroMotion", delegate()
+        PhysScene.TaintedObject(inTaintTime, LocalID, "BSPrim.ZeroMotion", delegate()
         {
             if (PhysBody.HasPhysicalBody)
                 PhysScene.PE.ClearAllForces(PhysBody);
@@ -234,7 +234,7 @@ public class BSPrim : BSPhysObject
     {
         _rotationalVelocity = OMV.Vector3.Zero;
         // Zero some other properties in the physics engine
-        PhysScene.TaintedObject(inTaintTime, "BSPrim.ZeroMotion", delegate()
+        PhysScene.TaintedObject(inTaintTime, LocalID, "BSPrim.ZeroMotion", delegate()
         {
             // DetailLog("{0},BSPrim.ZeroAngularMotion,call,rotVel={1}", LocalID, _rotationalVelocity);
             if (PhysBody.HasPhysicalBody)
@@ -262,7 +262,7 @@ public class BSPrim : BSPhysObject
         });
 
         // Update parameters so the new actor's Refresh() action is called at the right time.
-        PhysScene.TaintedObject("BSPrim.LockAngularMotion", delegate()
+        PhysScene.TaintedObject(LocalID, "BSPrim.LockAngularMotion", delegate()
         {
             UpdatePhysicalParameters();
         });
@@ -287,7 +287,7 @@ public class BSPrim : BSPhysObject
             RawPosition = value;
             PositionSanityCheck(false);
 
-            PhysScene.TaintedObject("BSPrim.setPosition", delegate()
+            PhysScene.TaintedObject(LocalID, "BSPrim.setPosition", delegate()
             {
                 DetailLog("{0},BSPrim.SetPosition,taint,pos={1},orient={2}", LocalID, RawPosition, RawOrientation);
                 ForcePosition = RawPosition;
@@ -531,7 +531,7 @@ public class BSPrim : BSPhysObject
         set {
             Vehicle type = (Vehicle)value;
 
-            PhysScene.TaintedObject("setVehicleType", delegate()
+            PhysScene.TaintedObject(LocalID, "setVehicleType", delegate()
             {
                 // 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
@@ -561,7 +561,7 @@ public class BSPrim : BSPhysObject
     }
     public override void VehicleFloatParam(int param, float value)
     {
-        PhysScene.TaintedObject("BSPrim.VehicleFloatParam", delegate()
+        PhysScene.TaintedObject(LocalID, "BSPrim.VehicleFloatParam", delegate()
         {
             BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
             if (vehicleActor != null)
@@ -573,7 +573,7 @@ public class BSPrim : BSPhysObject
     }
     public override void VehicleVectorParam(int param, OMV.Vector3 value)
     {
-        PhysScene.TaintedObject("BSPrim.VehicleVectorParam", delegate()
+        PhysScene.TaintedObject(LocalID, "BSPrim.VehicleVectorParam", delegate()
         {
             BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
             if (vehicleActor != null)
@@ -585,7 +585,7 @@ public class BSPrim : BSPhysObject
     }
     public override void VehicleRotationParam(int param, OMV.Quaternion rotation)
     {
-        PhysScene.TaintedObject("BSPrim.VehicleRotationParam", delegate()
+        PhysScene.TaintedObject(LocalID, "BSPrim.VehicleRotationParam", delegate()
         {
             BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
             if (vehicleActor != null)
@@ -597,7 +597,7 @@ public class BSPrim : BSPhysObject
     }
     public override void VehicleFlags(int param, bool remove)
     {
-        PhysScene.TaintedObject("BSPrim.VehicleFlags", delegate()
+        PhysScene.TaintedObject(LocalID, "BSPrim.VehicleFlags", delegate()
         {
             BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
             if (vehicleActor != null)
@@ -613,7 +613,7 @@ public class BSPrim : BSPhysObject
         if (_isVolumeDetect != newValue)
         {
             _isVolumeDetect = newValue;
-            PhysScene.TaintedObject("BSPrim.SetVolumeDetect", delegate()
+            PhysScene.TaintedObject(LocalID, "BSPrim.SetVolumeDetect", delegate()
             {
                 // DetailLog("{0},setVolumeDetect,taint,volDetect={1}", LocalID, _isVolumeDetect);
                 SetObjectDynamic(true);
@@ -628,7 +628,7 @@ public class BSPrim : BSPhysObject
     public override void SetMaterial(int material)
     {
         base.SetMaterial(material);
-        PhysScene.TaintedObject("BSPrim.SetMaterial", delegate()
+        PhysScene.TaintedObject(LocalID, "BSPrim.SetMaterial", delegate()
         {
             UpdatePhysicalParameters();
         });
@@ -641,7 +641,7 @@ public class BSPrim : BSPhysObject
             if (base.Friction != value)
             {
                 base.Friction = value;
-                PhysScene.TaintedObject("BSPrim.setFriction", delegate()
+                PhysScene.TaintedObject(LocalID, "BSPrim.setFriction", delegate()
                 {
                     UpdatePhysicalParameters();
                 });
@@ -656,7 +656,7 @@ public class BSPrim : BSPhysObject
             if (base.Restitution != value)
             {
                 base.Restitution = value;
-                PhysScene.TaintedObject("BSPrim.setRestitution", delegate()
+                PhysScene.TaintedObject(LocalID, "BSPrim.setRestitution", delegate()
                 {
                     UpdatePhysicalParameters();
                 });
@@ -673,7 +673,7 @@ public class BSPrim : BSPhysObject
             if (base.Density != value)
             {
                 base.Density = value;
-                PhysScene.TaintedObject("BSPrim.setDensity", delegate()
+                PhysScene.TaintedObject(LocalID, "BSPrim.setDensity", delegate()
                 {
                     UpdatePhysicalParameters();
                 });
@@ -688,7 +688,7 @@ public class BSPrim : BSPhysObject
             if (base.GravModifier != value)
             {
                 base.GravModifier = value;
-                PhysScene.TaintedObject("BSPrim.setGravityModifier", delegate()
+                PhysScene.TaintedObject(LocalID, "BSPrim.setGravityModifier", delegate()
                 {
                     UpdatePhysicalParameters();
                 });
@@ -699,7 +699,7 @@ public class BSPrim : BSPhysObject
         get { return RawVelocity; }
         set {
             RawVelocity = value;
-            PhysScene.TaintedObject("BSPrim.setVelocity", delegate()
+            PhysScene.TaintedObject(LocalID, "BSPrim.setVelocity", delegate()
             {
                 // DetailLog("{0},BSPrim.SetVelocity,taint,vel={1}", LocalID, RawVelocity);
                 ForceVelocity = RawVelocity;
@@ -745,7 +745,7 @@ public class BSPrim : BSPhysObject
                 return;
             RawOrientation = value;
 
-            PhysScene.TaintedObject("BSPrim.setOrientation", delegate()
+            PhysScene.TaintedObject(LocalID, "BSPrim.setOrientation", delegate()
             {
                 ForceOrientation = RawOrientation;
             });
@@ -776,7 +776,7 @@ public class BSPrim : BSPhysObject
             if (_isPhysical != value)
             {
                 _isPhysical = value;
-                PhysScene.TaintedObject("BSPrim.setIsPhysical", delegate()
+                PhysScene.TaintedObject(LocalID, "BSPrim.setIsPhysical", delegate()
                 {
                     DetailLog("{0},setIsPhysical,taint,isPhys={1}", LocalID, _isPhysical);
                     SetObjectDynamic(true);
@@ -1020,7 +1020,7 @@ public class BSPrim : BSPhysObject
     public override bool FloatOnWater {
         set {
             _floatOnWater = value;
-            PhysScene.TaintedObject("BSPrim.setFloatOnWater", delegate()
+            PhysScene.TaintedObject(LocalID, "BSPrim.setFloatOnWater", delegate()
             {
                 if (_floatOnWater)
                     CurrentCollisionFlags = PhysScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_FLOATS_ON_WATER);
@@ -1037,7 +1037,7 @@ public class BSPrim : BSPhysObject
             _rotationalVelocity = value;
             Util.ClampV(_rotationalVelocity, BSParam.MaxAngularVelocity);
             // m_log.DebugFormat("{0}: RotationalVelocity={1}", LogHeader, _rotationalVelocity);
-            PhysScene.TaintedObject("BSPrim.setRotationalVelocity", delegate()
+            PhysScene.TaintedObject(LocalID, "BSPrim.setRotationalVelocity", delegate()
             {
                 ForceRotationalVelocity = _rotationalVelocity;
             });
@@ -1068,7 +1068,7 @@ public class BSPrim : BSPhysObject
         get { return _buoyancy; }
         set {
             _buoyancy = value;
-            PhysScene.TaintedObject("BSPrim.setBuoyancy", delegate()
+            PhysScene.TaintedObject(LocalID, "BSPrim.setBuoyancy", delegate()
             {
                 ForceBuoyancy = _buoyancy;
             });
@@ -1142,7 +1142,7 @@ public class BSPrim : BSPhysObject
                 // DetailLog("{0},BSPrim.addForce,call,force={1}", LocalID, addForce);
 
                 OMV.Vector3 addForce = force;
-                PhysScene.TaintedObject(inTaintTime, "BSPrim.AddForce", delegate()
+                PhysScene.TaintedObject(inTaintTime, LocalID, "BSPrim.AddForce", delegate()
                 {
                     // Bullet adds this central force to the total force for this tick.
                     // Deep down in Bullet:
@@ -1172,7 +1172,7 @@ public class BSPrim : BSPhysObject
                 OMV.Vector3 addImpulse = Util.ClampV(impulse, BSParam.MaxAddForceMagnitude);
                 // DetailLog("{0},BSPrim.addForceImpulse,call,impulse={1}", LocalID, impulse);
 
-                PhysScene.TaintedObject(inTaintTime, "BSPrim.AddImpulse", delegate()
+                PhysScene.TaintedObject(inTaintTime, LocalID, "BSPrim.AddImpulse", delegate()
                 {
                     // Bullet adds this impulse immediately to the velocity
                     DetailLog("{0},BSPrim.addForceImpulse,taint,impulseforce={1}", LocalID, addImpulse);
@@ -1197,7 +1197,7 @@ public class BSPrim : BSPhysObject
         if (force.IsFinite())
         {
             OMV.Vector3 angForce = force;
-            PhysScene.TaintedObject(inTaintTime, "BSPrim.AddAngularForce", delegate()
+            PhysScene.TaintedObject(inTaintTime, LocalID, "BSPrim.AddAngularForce", delegate()
             {
                 if (PhysBody.HasPhysicalBody)
                 {
@@ -1221,7 +1221,7 @@ public class BSPrim : BSPhysObject
     public void ApplyTorqueImpulse(OMV.Vector3 impulse, bool inTaintTime)
     {
         OMV.Vector3 applyImpulse = impulse;
-        PhysScene.TaintedObject(inTaintTime, "BSPrim.ApplyTorqueImpulse", delegate()
+        PhysScene.TaintedObject(inTaintTime, LocalID, "BSPrim.ApplyTorqueImpulse", delegate()
         {
             if (PhysBody.HasPhysicalBody)
             {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 531f8fb..840265b 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -108,7 +108,7 @@ public class BSPrimLinkable : BSPrimDisplaced
         set
         {
             base.Position = value;
-            PhysScene.TaintedObject("BSPrimLinkable.setPosition", delegate()
+            PhysScene.TaintedObject(LocalID, "BSPrimLinkable.setPosition", delegate()
             {
                 Linkset.UpdateProperties(UpdatedProperties.Position, this);
             });
@@ -122,7 +122,7 @@ public class BSPrimLinkable : BSPrimDisplaced
         set
         {
             base.Orientation = value;
-            PhysScene.TaintedObject("BSPrimLinkable.setOrientation", delegate()
+            PhysScene.TaintedObject(LocalID, "BSPrimLinkable.setOrientation", delegate()
             {
                 Linkset.UpdateProperties(UpdatedProperties.Orientation, this);
             });
@@ -304,7 +304,7 @@ public class BSPrimLinkable : BSPrimDisplaced
                     BSLinkset.LinksetImplementation linksetType = (BSLinkset.LinksetImplementation)pParams[0];
                     if (Linkset.IsRoot(this))
                     {
-                        PhysScene.TaintedObject("BSPrim.PhysFunctSetLinksetType", delegate()
+                        PhysScene.TaintedObject(LocalID, "BSPrim.PhysFunctSetLinksetType", delegate()
                         {
                             // Cause the linkset type to change
                             DetailLog("{0},BSPrimLinkable.Extension.physSetLinksetType, oldType={1},newType={2}",
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index b2ec0e5..24233cc 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -157,12 +157,20 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
     public delegate void TaintCallback();
     private struct TaintCallbackEntry
     {
+        public String originator;
         public String ident;
         public TaintCallback callback;
-        public TaintCallbackEntry(string i, TaintCallback c)
+        public TaintCallbackEntry(string pIdent, TaintCallback pCallBack)
         {
-            ident = i;
-            callback = c;
+            originator = BSScene.DetailLogZero;
+            ident = pIdent;
+            callback = pCallBack;
+        }
+        public TaintCallbackEntry(string pOrigin, string pIdent, TaintCallback pCallBack)
+        {
+            originator = pOrigin;
+            ident = pIdent;
+            callback = pCallBack;
         }
     }
     private Object _taintLock = new Object();   // lock for using the next object
@@ -888,26 +896,37 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
     // Calls to the PhysicsActors can't directly call into the physics engine
     //       because it might be busy. We delay changes to a known time.
     // We rely on C#'s closure to save and restore the context for the delegate.
-    public void TaintedObject(String ident, TaintCallback callback)
+    public void TaintedObject(string pOriginator, string pIdent, TaintCallback pCallback)
     {
-        if (!m_initialized) return;
-
-        lock (_taintLock)
-        {
-            _taintOperations.Add(new TaintCallbackEntry(ident, callback));
-        }
-
-        return;
+        TaintedObject(false /*inTaintTime*/, pOriginator, pIdent, pCallback);
+    }
+    public void TaintedObject(uint pOriginator, String pIdent, TaintCallback pCallback)
+    {
+        TaintedObject(false /*inTaintTime*/, m_physicsLoggingEnabled ? pOriginator.ToString() : BSScene.DetailLogZero, pIdent, pCallback);
+    }
+    public void TaintedObject(bool inTaintTime, String pIdent, TaintCallback pCallback)
+    {
+        TaintedObject(inTaintTime, BSScene.DetailLogZero, pIdent, pCallback);
+    }
+    public void TaintedObject(bool inTaintTime, uint pOriginator, String pIdent, TaintCallback pCallback)
+    {
+        TaintedObject(inTaintTime, m_physicsLoggingEnabled ? pOriginator.ToString() : BSScene.DetailLogZero, pIdent, pCallback);
     }
-
     // Sometimes a potentially tainted operation can be used in and out of taint time.
     // This routine executes the command immediately if in taint-time otherwise it is queued.
-    public void TaintedObject(bool inTaintTime, string ident, TaintCallback callback)
+    public void TaintedObject(bool inTaintTime, string pOriginator, string pIdent, TaintCallback pCallback)
     {
+        if (!m_initialized) return;
+
         if (inTaintTime)
-            callback();
+            pCallback();
         else
-            TaintedObject(ident, callback);
+        {
+            lock (_taintLock)
+            {
+                _taintOperations.Add(new TaintCallbackEntry(pOriginator, pIdent, pCallback));
+            }
+        }
     }
 
     private void TriggerPreStepEvent(float timeStep)
@@ -951,7 +970,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
             {
                 try
                 {
-                    DetailLog("{0},BSScene.ProcessTaints,doTaint,id={1}", DetailLogZero, tcbe.ident); // DEBUG DEBUG DEBUG
+                    DetailLog("{0},BSScene.ProcessTaints,doTaint,id={1}", tcbe.originator, tcbe.ident); // DEBUG DEBUG DEBUG
                     tcbe.callback();
                 }
                 catch (Exception e)
@@ -1081,7 +1100,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         string xval = val;
         List<uint> xlIDs = lIDs;
         string xparm = parm;
-        TaintedObject("BSScene.UpdateParameterSet", delegate() {
+        TaintedObject(DetailLogZero, "BSScene.UpdateParameterSet", delegate() {
             BSParam.ParameterDefnBase thisParam;
             if (BSParam.TryGetParameter(xparm, out thisParam))
             {
-- 
cgit v1.1


From d09c35f5063114880aecb94a938bfc49f5af5f7d Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 20 Aug 2013 13:09:40 -0700
Subject: BulletSim: pass both root and child BSPhysObjects to Extension
 function. Update routines to use the new parameters list from above change.

---
 .../Scripting/ExtendedPhysics/ExtendedPhysics.cs   | 30 +++++++++++---------
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  | 32 ++++++++++++----------
 .../Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 14 +++++-----
 3 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
index 90cf15a..10e13b9 100755
--- a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
@@ -220,7 +220,8 @@ public class ExtendedPhysics : INonSharedRegionModule
                         containingGroup.UpdateGroupPosition(containingGroup.AbsolutePosition);
                         containingGroup.UpdateGroupRotationR(containingGroup.GroupRotation);
 
-                        ret = MakeIntError(rootPhysActor.Extension(PhysFunctSetLinksetType, linksetType));
+                        object[] parms2 = { rootPhysActor, null, linksetType };
+                        ret = MakeIntError(rootPhysActor.Extension(PhysFunctSetLinksetType, parms2));
                         Thread.Sleep(150);  // longer than one heartbeat tick
 
                         containingGroup.ScriptSetPhysicsStatus(true);
@@ -229,7 +230,8 @@ public class ExtendedPhysics : INonSharedRegionModule
                     {
                         // Non-physical linksets don't have a physical instantiation so there is no state to
                         //    worry about being updated.
-                        ret = MakeIntError(rootPhysActor.Extension(PhysFunctSetLinksetType, linksetType));
+                        object[] parms2 = { rootPhysActor, null, linksetType };
+                        ret = MakeIntError(rootPhysActor.Extension(PhysFunctSetLinksetType, parms2));
                     }
                 }
                 else
@@ -271,7 +273,8 @@ public class ExtendedPhysics : INonSharedRegionModule
                 PhysicsActor rootPhysActor = rootPart.PhysActor;
                 if (rootPhysActor != null)
                 {
-                    ret = MakeIntError(rootPhysActor.Extension(PhysFunctGetLinksetType));
+                    object[] parms2 = { rootPhysActor, null };
+                    ret = MakeIntError(rootPhysActor.Extension(PhysFunctGetLinksetType, parms2));
                 }
                 else
                 {
@@ -315,8 +318,8 @@ public class ExtendedPhysics : INonSharedRegionModule
 
         if (GetRootAndChildPhysActors(hostID, linkNum, out rootPhysActor, out childPhysActor))
         {
-            object[] parms = { childPhysActor, typeCode };
-            ret = MakeIntError(rootPhysActor.Extension(PhysFunctChangeLinkType, parms));
+            object[] parms2 = { rootPhysActor, childPhysActor, typeCode };
+            ret = MakeIntError(rootPhysActor.Extension(PhysFunctChangeLinkType, parms2));
         }
 
         return ret;
@@ -334,8 +337,8 @@ public class ExtendedPhysics : INonSharedRegionModule
 
         if (GetRootAndChildPhysActors(hostID, linkNum, out rootPhysActor, out childPhysActor))
         {
-            object[] parms = { childPhysActor };
-            ret = MakeIntError(rootPhysActor.Extension(PhysFunctGetLinkType, parms));
+            object[] parms2 = { rootPhysActor, childPhysActor };
+            ret = MakeIntError(rootPhysActor.Extension(PhysFunctGetLinkType, parms2));
         }
 
         return ret;
@@ -354,8 +357,8 @@ public class ExtendedPhysics : INonSharedRegionModule
 
         if (GetRootAndChildPhysActors(hostID, linkNum, out rootPhysActor, out childPhysActor))
         {
-            object[] parms = { childPhysActor , PHYS_LINK_TYPE_FIXED };
-            ret = MakeIntError(rootPhysActor.Extension(PhysFunctChangeLinkType, parms));
+            object[] parms2 = { rootPhysActor, childPhysActor , PHYS_LINK_TYPE_FIXED };
+            ret = MakeIntError(rootPhysActor.Extension(PhysFunctChangeLinkType, parms2));
         }
 
         return ret;
@@ -412,7 +415,7 @@ public class ExtendedPhysics : INonSharedRegionModule
 
         if (GetRootAndChildPhysActors(hostID, linkNum, out rootPhysActor, out childPhysActor))
         {
-            object[] parms2 = AddToBeginningOfArray(childPhysActor, parms);
+            object[] parms2 = AddToBeginningOfArray(rootPhysActor, childPhysActor, parms);
             ret = MakeIntError(rootPhysActor.Extension(PhysFunctChangeLinkParams, parms2));
         }
 
@@ -518,11 +521,12 @@ public class ExtendedPhysics : INonSharedRegionModule
     }
 
     // Return an array of objects with the passed object as the first object of a new array
-    private object[] AddToBeginningOfArray(object firstOne, object[] prevArray)
+    private object[] AddToBeginningOfArray(object firstOne, object secondOne, object[] prevArray)
     {
-        object[] newArray = new object[1 + prevArray.Length];
+        object[] newArray = new object[2 + prevArray.Length];
         newArray[0] = firstOne;
-        prevArray.CopyTo(newArray, 1);
+        newArray[1] = secondOne;
+        prevArray.CopyTo(newArray, 2);
         return newArray;
     }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index b2a9501..a9ae89d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -385,7 +385,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                                 linkInfo.frameInAloc, linkInfo.frameInArot, linkInfo.frameInBloc, linkInfo.frameInBrot,
                                 true /*useLinearReferenceFrameA*/,
                                 true /*disableCollisionsBetweenLinkedBodies*/);
-                DetailLog("{0},BSLinksetConstraint.BuildConstraint,spring,root={1},rBody={2},child={3},cBody={4},rLoc={5},cLoc={6},midLoc={7}",
+                DetailLog("{0},BSLinksetConstraint.BuildConstraint,spring,root={1},rBody={2},child={3},cBody={4},rLoc={5},cLoc={6}",
                                                 rootPrim.LocalID,
                                                 rootPrim.LocalID, rootPrim.PhysBody.AddrString,
                                                 linkInfo.member.LocalID, linkInfo.member.PhysBody.AddrString,
@@ -492,12 +492,12 @@ public sealed class BSLinksetConstraints : BSLinkset
         object ret = null;
         switch (pFunct)
         {
-            // pParams = [ BSPhysObject child, integer linkType ]
+            // pParams = [ BSPhysObject root, BSPhysObject child, integer linkType ]
             case ExtendedPhysics.PhysFunctChangeLinkType:
-                if (pParams.Length > 1)
+                if (pParams.Length > 2)
                 {
-                    int requestedType = (int)pParams[1];
-                    DetailLog("{0},BSLinksetConstraint.SetLinkType,requestedType={1}", LinksetRoot.LocalID, requestedType);
+                    int requestedType = (int)pParams[2];
+                    DetailLog("{0},BSLinksetConstraint.ChangeLinkType,requestedType={1}", LinksetRoot.LocalID, requestedType);
                     if (requestedType == (int)ConstraintType.FIXED_CONSTRAINT_TYPE
                         || requestedType == (int)ConstraintType.D6_CONSTRAINT_TYPE
                         || requestedType == (int)ConstraintType.D6_SPRING_CONSTRAINT_TYPE
@@ -505,9 +505,11 @@ public sealed class BSLinksetConstraints : BSLinkset
                         || requestedType == (int)ConstraintType.CONETWIST_CONSTRAINT_TYPE
                         || requestedType == (int)ConstraintType.SLIDER_CONSTRAINT_TYPE)
                     {
-                        BSPrimLinkable child = pParams[0] as BSPrimLinkable;
+                        BSPrimLinkable child = pParams[1] as BSPrimLinkable;
                         if (child != null)
                         {
+                            DetailLog("{0},BSLinksetConstraint.ChangeLinkType,rootID={1},childID={2},type={3}",
+                                                    LinksetRoot.LocalID, LinksetRoot.LocalID, child.LocalID, requestedType);
                             m_physicsScene.TaintedObject(child.LocalID, "BSLinksetConstraint.PhysFunctChangeLinkType", delegate()
                             {
                                 // Pick up all the constraints currently created.
@@ -523,17 +525,17 @@ public sealed class BSLinksetConstraints : BSLinkset
                                         linkInfoC.ResetLink();
                                         linkInfoC.constraintType = (ConstraintType)requestedType;
                                         ret = (object)true;
-                                        DetailLog("{0},BSLinksetConstraint.SetLinkType,link={1},type={2}",
+                                        DetailLog("{0},BSLinksetConstraint.ChangeLinkType,link={1},type={2}",
                                                     linkInfo.member.LocalID, linkInfo.member.LocalID, linkInfoC.constraintType);
                                     }
                                     else
                                     {
-                                        DetailLog("{0},BSLinksetConstraint.SetLinkType,linkInfoNotConstraint,childID={1}", LinksetRoot.LocalID, child.LocalID);
+                                        DetailLog("{0},BSLinksetConstraint.ChangeLinkType,linkInfoNotConstraint,childID={1}", LinksetRoot.LocalID, child.LocalID);
                                     }
                                 }
                                 else
                                 {
-                                    DetailLog("{0},BSLinksetConstraint.SetLinkType,noLinkInfoForChild,childID={1}", LinksetRoot.LocalID, child.LocalID);
+                                    DetailLog("{0},BSLinksetConstraint.ChangeLinkType,noLinkInfoForChild,childID={1}", LinksetRoot.LocalID, child.LocalID);
                                 }
                                 // Cause the whole linkset to be rebuilt in post-taint time.
                                 Refresh(child);
@@ -551,11 +553,11 @@ public sealed class BSLinksetConstraints : BSLinkset
                     }
                 }
                 break;
-            // pParams = []
+            // pParams = [ BSPhysObject root, BSPhysObject child ]
             case ExtendedPhysics.PhysFunctGetLinkType:
                 if (pParams.Length > 0)
                 {
-                    BSPrimLinkable child = pParams[0] as BSPrimLinkable;
+                    BSPrimLinkable child = pParams[1] as BSPrimLinkable;
                     if (child != null)
                     {
                         BSLinkInfo linkInfo = null;
@@ -573,14 +575,14 @@ public sealed class BSLinksetConstraints : BSLinkset
                     }
                 }
                 break;
-            // pParams = [ BSPhysObject child, int op, object opParams, int op, object opParams, ... ]
+            // pParams = [ BSPhysObject root, BSPhysObject child, int op, object opParams, int op, object opParams, ... ]
             case ExtendedPhysics.PhysFunctChangeLinkParams:
                 // There should be two parameters: the childActor and a list of parameters to set
                 try
                 {
-                    if (pParams.Length > 1)
+                    if (pParams.Length > 2)
                     {
-                        BSPrimLinkable child = pParams[0] as BSPrimLinkable;
+                        BSPrimLinkable child = pParams[1] as BSPrimLinkable;
                         BSLinkInfo baseLinkInfo = null;
                         if (TryGetLinkInfo(child, out baseLinkInfo))
                         {
@@ -592,7 +594,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                                 OMV.Vector3 valueVector;
                                 OMV.Quaternion valueQuaternion;
 
-                                int opIndex = 1;
+                                int opIndex = 2;
                                 while (opIndex < pParams.Length)
                                 {
                                     int thisOp = (int)pParams[opIndex];
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 840265b..126b146 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -288,7 +288,7 @@ public class BSPrimLinkable : BSPrimDisplaced
         switch (pFunct)
         {
             // physGetLinksetType();
-            // pParams = []
+            // pParams = [ BSPhysObject root, null ]
             case ExtendedPhysics.PhysFunctGetLinksetType:
             {
                 ret = (object)LinksetType;
@@ -296,12 +296,12 @@ public class BSPrimLinkable : BSPrimDisplaced
                 break;
             }
             // physSetLinksetType(type);
-            // pParams = [ BSPhysObject child, integer type ]
+            // pParams = [ BSPhysObject root, null, integer type ]
             case ExtendedPhysics.PhysFunctSetLinksetType:
             {
-                if (pParams.Length > 0)
+                if (pParams.Length > 2)
                 {
-                    BSLinkset.LinksetImplementation linksetType = (BSLinkset.LinksetImplementation)pParams[0];
+                    BSLinkset.LinksetImplementation linksetType = (BSLinkset.LinksetImplementation)pParams[2];
                     if (Linkset.IsRoot(this))
                     {
                         PhysScene.TaintedObject(LocalID, "BSPrim.PhysFunctSetLinksetType", delegate()
@@ -317,21 +317,21 @@ public class BSPrimLinkable : BSPrimDisplaced
                 break;
             }
             // physChangeLinkType(linknum, typeCode);
-            // pParams = [ BSPhysObject child, integer linkType ]
+            // pParams = [ BSPhysObject root, BSPhysObject child, integer linkType ]
             case ExtendedPhysics.PhysFunctChangeLinkType:
             {
                 ret = Linkset.Extension(pFunct, pParams);
                 break;
             }
             // physGetLinkType(linknum);
-            // pParams = [ BSPhysObject child ]
+            // pParams = [ BSPhysObject root, BSPhysObject child ]
             case ExtendedPhysics.PhysFunctGetLinkType:
             {
                 ret = Linkset.Extension(pFunct, pParams);
                 break;
             }
             // physChangeLinkParams(linknum, [code, value, code, value, ...]);
-            // pParams = [ BSPhysObject child, object[] [ string op, object opParam, string op, object opParam, ... ] ]
+            // pParams = [ BSPhysObject root, BSPhysObject child, object[] [ string op, object opParam, string op, object opParam, ... ] ]
             case ExtendedPhysics.PhysFunctChangeLinkParams:
             {
                 ret = Linkset.Extension(pFunct, pParams);
-- 
cgit v1.1


From e0b457d3c3daabc065aa66376bc17472d4b43e8f Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 21 Aug 2013 16:02:42 -0700
Subject: BulletSim: add position and rotation update for child prim physics
 update events. Normally, physics engines do not return updates for child
 prims so, under normal operation, this code should never execute. Will only
 be used when using flexible linkset linkages.

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 2e11162..b30c024 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2502,6 +2502,26 @@ namespace OpenSim.Region.Framework.Scenes
                 //ParentGroup.RootPart.m_groupPosition = newpos;
             }
 
+            if (pa != null && ParentID != 0 && ParentGroup != null)
+            {
+                // RA: Special case where a child object is requesting property updates.
+                // This happens when linksets are modified to use flexible links rather than
+                //    the default links.
+                // The simulator code presumes that child parts are only modified by scripts
+                //    so the logic for changing position/rotation/etc does not take into
+                //    account the physical object actually moving.
+                // This code updates the offset position and rotation of the child and then
+                //    lets the update code push the update to the viewer.
+                // Since physics engines do not normally generate this event for linkset children,
+                //    this code will not be active unless you have a specially configured
+                //    physics engine.
+                Quaternion invRootRotation = Quaternion.Normalize(Quaternion.Inverse(ParentGroup.RootPart.RotationOffset));
+                m_offsetPosition = pa.Position - m_groupPosition;
+                RotationOffset = pa.Orientation * invRootRotation;
+                m_log.DebugFormat("{0} PhysicsRequestingTerseUpdate child: pos={1}, rot={2}, offPos={3}, offRot={4}",
+                                    "[SCENE OBJECT PART]", pa.Position, pa.Orientation, m_offsetPosition, RotationOffset);
+            }
+
             ScheduleTerseUpdate();
         }
 
-- 
cgit v1.1


From 3dbf4a1002216e2d14c20353a5993ea63413d03d Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 22 Aug 2013 09:05:26 -0700
Subject: BulletSim: remove chatty debug message from previous commit.

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index b30c024..b3e6b67 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2504,7 +2504,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (pa != null && ParentID != 0 && ParentGroup != null)
             {
-                // RA: Special case where a child object is requesting property updates.
+                // Special case where a child object is requesting property updates.
                 // This happens when linksets are modified to use flexible links rather than
                 //    the default links.
                 // The simulator code presumes that child parts are only modified by scripts
@@ -2518,8 +2518,8 @@ namespace OpenSim.Region.Framework.Scenes
                 Quaternion invRootRotation = Quaternion.Normalize(Quaternion.Inverse(ParentGroup.RootPart.RotationOffset));
                 m_offsetPosition = pa.Position - m_groupPosition;
                 RotationOffset = pa.Orientation * invRootRotation;
-                m_log.DebugFormat("{0} PhysicsRequestingTerseUpdate child: pos={1}, rot={2}, offPos={3}, offRot={4}",
-                                    "[SCENE OBJECT PART]", pa.Position, pa.Orientation, m_offsetPosition, RotationOffset);
+                // m_log.DebugFormat("{0} PhysicsRequestingTerseUpdate child: pos={1}, rot={2}, offPos={3}, offRot={4}",
+                //                     "[SCENE OBJECT PART]", pa.Position, pa.Orientation, m_offsetPosition, RotationOffset);
             }
 
             ScheduleTerseUpdate();
-- 
cgit v1.1


From 67195618d580eb6cd848cf1e6462572ad2b2b118 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 22 Aug 2013 09:07:58 -0700
Subject: BulletSim: add requestor's ID to post taint detail log message.

---
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 24233cc..b3dfa41 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -987,10 +987,11 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
     //     will replace any previous operation by the same object.
     public void PostTaintObject(String ident, uint ID, TaintCallback callback)
     {
-        string uniqueIdent = ident + "-" + ID.ToString();
+        string IDAsString = ID.ToString();
+        string uniqueIdent = ident + "-" + IDAsString;
         lock (_taintLock)
         {
-            _postTaintOperations[uniqueIdent] = new TaintCallbackEntry(uniqueIdent, callback);
+            _postTaintOperations[uniqueIdent] = new TaintCallbackEntry(IDAsString, uniqueIdent, callback);
         }
 
         return;
-- 
cgit v1.1


From 30b3657a66e5a4012b96baae2c0424ec13409f83 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 22 Aug 2013 09:08:58 -0700
Subject: BulletSim: implementation of setting spring specific physical
 parameters. Add setting of linkset type to physChangeLinkParams. Lots of
 detail logging for setting of linkset constraint parameters.

---
 .../Scripting/ExtendedPhysics/ExtendedPhysics.cs   |  6 ++-
 .../Physics/BulletSPlugin/BSConstraint6Dof.cs      | 16 ++++---
 .../Physics/BulletSPlugin/BSConstraintSpring.cs    | 43 ++++++++++--------
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  | 52 +++++++++++++++++-----
 4 files changed, 81 insertions(+), 36 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
index 10e13b9..2f88e2b 100755
--- a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
@@ -367,6 +367,7 @@ public class ExtendedPhysics : INonSharedRegionModule
     // Code for specifying params.
     // The choice if 14400 is arbitrary and only serves to catch parameter code misuse.
     public const int PHYS_PARAM_MIN                    = 14401;
+
     [ScriptConstant]
     public const int PHYS_PARAM_FRAMEINA_LOC           = 14401;
     [ScriptConstant]
@@ -401,7 +402,10 @@ public class ExtendedPhysics : INonSharedRegionModule
     public const int PHYS_PARAM_SPRING_DAMPING         = 14416;
     [ScriptConstant]
     public const int PHYS_PARAM_SPRING_STIFFNESS       = 14417;
-    public const int PHYS_PARAM_MAX                    = 14417;
+    [ScriptConstant]
+    public const int PHYS_PARAM_LINK_TYPE              = 14418;
+
+    public const int PHYS_PARAM_MAX                    = 14418;
 
     // physChangeLinkParams(integer linkNum, [ PHYS_PARAM_*, value, PHYS_PARAM_*, value, ...])
     [ScriptInvocation]
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs
index 5008ff7..7fcb75c 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs
@@ -59,9 +59,11 @@ public class BSConstraint6Dof : BSConstraint
                                 frame2, frame2rot,
                                 useLinearReferenceFrameA, disableCollisionsBetweenLinkedBodies);
         m_enabled = true;
-        world.physicsScene.DetailLog("{0},BS6DofConstraint,createFrame,wID={1}, rID={2}, rBody={3}, cID={4}, cBody={5}",
-                            BSScene.DetailLogZero, world.worldID,
+        PhysicsScene.DetailLog("{0},BS6DofConstraint,create,wID={1}, rID={2}, rBody={3}, cID={4}, cBody={5}",
+                            m_body1.ID, world.worldID,
                             obj1.ID, obj1.AddrString, obj2.ID, obj2.AddrString);
+        PhysicsScene.DetailLog("{0},BS6DofConstraint,create,  f1Loc={1},f1Rot={2},f2Loc={3},f2Rot={4},usefA={5},disCol={6}",
+                            m_body1.ID, frame1, frame1rot, frame2, frame2rot, useLinearReferenceFrameA, disableCollisionsBetweenLinkedBodies);
     }
 
     // 6 Dof constraint based on a midpoint between the two constrained bodies
@@ -86,9 +88,11 @@ public class BSConstraint6Dof : BSConstraint
             m_constraint = PhysicsScene.PE.Create6DofConstraintToPoint(m_world, m_body1, m_body2,
                                     joinPoint,
                                     useLinearReferenceFrameA, disableCollisionsBetweenLinkedBodies);
+
             PhysicsScene.DetailLog("{0},BS6DofConstraint,createMidPoint,wID={1}, csrt={2}, rID={3}, rBody={4}, cID={5}, cBody={6}",
-                                BSScene.DetailLogZero, world.worldID, m_constraint.AddrString,
+                                m_body1.ID, world.worldID, m_constraint.AddrString,
                                 obj1.ID, obj1.AddrString, obj2.ID, obj2.AddrString);
+
             if (!m_constraint.HasPhysicalConstraint)
             {
                 world.physicsScene.Logger.ErrorFormat("{0} Failed creation of 6Dof constraint. rootID={1}, childID={2}",
@@ -113,8 +117,10 @@ public class BSConstraint6Dof : BSConstraint
                                 frameInBloc, frameInBrot,
                                 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);
+        PhysicsScene.DetailLog("{0},BS6DofConstraint,createFixed,wID={1},rID={2},rBody={3}",
+                                    m_body1.ID, world.worldID, obj1.ID, obj1.AddrString);
+        PhysicsScene.DetailLog("{0},BS6DofConstraint,createFixed,  fBLoc={1},fBRot={2},usefA={3},disCol={4}",
+                            m_body1.ID, frameInBloc, frameInBrot, useLinearReferenceFrameB, disableCollisionsBetweenLinkedBodies);
     }
 
     public bool SetFrames(Vector3 frameA, Quaternion frameArot, Vector3 frameB, Quaternion frameBrot)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs
index 01d67d4..410584d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs
@@ -47,37 +47,42 @@ public sealed class BSConstraintSpring : BSConstraint6Dof
                                 useLinearReferenceFrameA, disableCollisionsBetweenLinkedBodies);
         m_enabled = true;
 
-        world.physicsScene.DetailLog("{0},BSConstraintSpring,createFrame,wID={1}, rID={2}, rBody={3}, cID={4}, cBody={5}",
-                            BSScene.DetailLogZero, world.worldID,
-                            obj1.ID, obj1.AddrString, obj2.ID, obj2.AddrString);
+        PhysicsScene.DetailLog("{0},BSConstraintSpring,create,wID={1}, rID={2}, rBody={3}, cID={4}, cBody={5}",
+                            obj1.ID, world.worldID, obj1.ID, obj1.AddrString, obj2.ID, obj2.AddrString);
+        PhysicsScene.DetailLog("{0},BSConstraintSpring,create,  f1Loc={1},f1Rot={2},f2Loc={3},f2Rot={4},usefA={5},disCol={6}",
+                    m_body1.ID, frame1Loc, frame1Rot, frame2Loc, frame2Rot, useLinearReferenceFrameA, disableCollisionsBetweenLinkedBodies);
     }
 
-    public bool SetEnable(int index, bool axisEnable)
+    public bool SetEnable(int pIndex, bool pAxisEnable)
     {
-        bool ret = false;
-
-        return ret;
+        PhysicsScene.DetailLog("{0},BSConstraintSpring.SetEnable,obj1ID={1},obj2ID={2},indx={3},enable={4}",
+                                        m_body1.ID, m_body1.ID, m_body2.ID, pIndex, pAxisEnable);
+        PhysicsScene.PE.SpringEnable(m_constraint, pIndex, BSParam.NumericBool(pAxisEnable));
+        return true;
     }
 
-    public bool SetStiffness(int index, float stiffness)
+    public bool SetStiffness(int pIndex, float pStiffness)
     {
-        bool ret = false;
-
-        return ret;
+        PhysicsScene.DetailLog("{0},BSConstraintSpring.SetStiffness,obj1ID={1},obj2ID={2},indx={3},enable={4}",
+                                        m_body1.ID, m_body1.ID, m_body2.ID, pIndex, pStiffness);
+        PhysicsScene.PE.SpringSetStiffness(m_constraint, pIndex, pStiffness);
+        return true;
     }
 
-    public bool SetDamping(int index, float damping)
+    public bool SetDamping(int pIndex, float pDamping)
     {
-        bool ret = false;
-
-        return ret;
+        PhysicsScene.DetailLog("{0},BSConstraintSpring.SetDamping,obj1ID={1},obj2ID={2},indx={3},enable={4}",
+                                        m_body1.ID, m_body1.ID, m_body2.ID, pIndex, pDamping);
+        PhysicsScene.PE.SpringSetDamping(m_constraint, pIndex, pDamping);
+        return true;
     }
 
-    public bool SetEquilibriumPoint(int index, float eqPoint)
+    public bool SetEquilibriumPoint(int pIndex, float pEqPoint)
     {
-        bool ret = false;
-
-        return ret;
+        PhysicsScene.DetailLog("{0},BSConstraintSpring.SetEquilibriumPoint,obj1ID={1},obj2ID={2},indx={3},enable={4}",
+                                        m_body1.ID, m_body1.ID, m_body2.ID, pIndex, pEqPoint);
+        PhysicsScene.PE.SpringSetEquilibriumPoint(m_constraint, pIndex, pEqPoint);
+        return true;
     }
 
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index a9ae89d..be97c29 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -67,6 +67,7 @@ public sealed class BSLinksetConstraints : BSLinkset
         {
             constraint = null;
             ResetLink();
+            member.PhysScene.DetailLog("{0},BSLinkInfoConstraint.creation", member.LocalID);
         }
 
         // Set all the parameters for this constraint to a fixed, non-movable constraint.
@@ -91,11 +92,13 @@ public sealed class BSLinksetConstraints : BSLinkset
             frameInBrot = OMV.Quaternion.Identity;
             springDamping = -1f;
             springStiffness = -1f;
+            member.PhysScene.DetailLog("{0},BSLinkInfoConstraint.ResetLink", member.LocalID);
         }
 
         // Given a constraint, apply the current constraint parameters to same.
         public override void SetLinkParameters(BSConstraint constrain)
         {
+            member.PhysScene.DetailLog("{0},BSLinkInfoConstraint.SetLinkParameters,type={1}", member.LocalID, constraintType);
             switch (constraintType)
             {
                 case ConstraintType.FIXED_CONSTRAINT_TYPE:
@@ -139,7 +142,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                             if (springDamping != -1)
                                 constrainSpring.SetDamping(ii, springDamping);
                             if (springStiffness != -1)
-                            constrainSpring.SetStiffness(ii, springStiffness);
+                                constrainSpring.SetStiffness(ii, springStiffness);
                         }
                     }
                     break;
@@ -155,7 +158,6 @@ public sealed class BSLinksetConstraints : BSLinkset
         public override bool ShouldUpdateChildProperties()
         {
             bool ret = true;
-
             if (constraintType == ConstraintType.FIXED_CONSTRAINT_TYPE)
                 ret = false;
 
@@ -193,10 +195,16 @@ public sealed class BSLinksetConstraints : BSLinkset
         {
             // Queue to happen after all the other taint processing
             m_physicsScene.PostTaintObject("BSLinksetContraints.Refresh", requestor.LocalID, delegate()
+            {
+                if (HasAnyChildren)
                 {
-                    if (HasAnyChildren)
-                        RecomputeLinksetConstraints();
-                });
+                    // Constraints that have not been changed are not rebuild but make sure
+                    //     the constraint of the requestor is rebuilt.
+                    PhysicallyUnlinkAChildFromRoot(LinksetRoot, requestor);
+                    // Rebuild the linkset and all its constraints.
+                    RecomputeLinksetConstraints();
+                }
+            });
         }
     }
 
@@ -415,13 +423,22 @@ public sealed class BSLinksetConstraints : BSLinkset
                             rootPrim.LocalID, rootPrim.PhysBody.AddrString,
                             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 (m_physicsScene.Constraints.RemoveAndDestroyConstraint(rootPrim.PhysBody, childPrim.PhysBody))
+        // If asked to unlink root from root, just remove all the constraints
+        if (rootPrim == childPrim || childPrim == LinksetRoot)
         {
-            // Make the child refresh its location
-            m_physicsScene.PE.PushUpdate(childPrim.PhysBody);
+            PhysicallyUnlinkAllChildrenFromRoot(LinksetRoot);
             ret = true;
         }
+        else
+        {
+            // Find the constraint for this link and get rid of it from the overall collection and from my list
+            if (m_physicsScene.Constraints.RemoveAndDestroyConstraint(rootPrim.PhysBody, childPrim.PhysBody))
+            {
+                // Make the child refresh its location
+                m_physicsScene.PE.PushUpdate(childPrim.PhysBody);
+                ret = true;
+            }
+        }
 
         return ret;
     }
@@ -521,8 +538,6 @@ public sealed class BSLinksetConstraints : BSLinkset
                                     BSLinkInfoConstraint linkInfoC = linkInfo as BSLinkInfoConstraint;
                                     if (linkInfoC != null)
                                     {
-                                        // Setting to fixed is easy. The reset state is the fixed link configuration.
-                                        linkInfoC.ResetLink();
                                         linkInfoC.constraintType = (ConstraintType)requestedType;
                                         ret = (object)true;
                                         DetailLog("{0},BSLinksetConstraint.ChangeLinkType,link={1},type={2}",
@@ -589,6 +604,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                             BSLinkInfoConstraint linkInfo = baseLinkInfo as BSLinkInfoConstraint;
                             if (linkInfo != null)
                             {
+                                int valueInt;
                                 float valueFloat;
                                 bool valueBool;
                                 OMV.Vector3 valueVector;
@@ -602,6 +618,20 @@ public sealed class BSLinksetConstraints : BSLinkset
                                                         linkInfo.member.LocalID, thisOp, pParams[opIndex+1]);
                                     switch (thisOp)
                                     {
+                                        case ExtendedPhysics.PHYS_PARAM_LINK_TYPE:
+                                            valueInt = (int)pParams[opIndex + 1];
+                                            ConstraintType valueType = (ConstraintType)valueInt;
+                                            if (valueType == ConstraintType.FIXED_CONSTRAINT_TYPE
+                                                || valueType == ConstraintType.D6_CONSTRAINT_TYPE
+                                                || valueType == ConstraintType.D6_SPRING_CONSTRAINT_TYPE
+                                                || valueType == ConstraintType.HINGE_CONSTRAINT_TYPE
+                                                || valueType == ConstraintType.CONETWIST_CONSTRAINT_TYPE
+                                                || valueType == ConstraintType.SLIDER_CONSTRAINT_TYPE)
+                                            {
+                                                linkInfo.constraintType = valueType;
+                                            }
+                                            opIndex += 2;
+                                            break;
                                         case ExtendedPhysics.PHYS_PARAM_FRAMEINA_LOC:
                                             valueVector = (OMV.Vector3)pParams[opIndex + 1];
                                             linkInfo.frameInAloc = valueVector;
-- 
cgit v1.1


From 7c54630a2dde768e92b3034d76314cb1e061c348 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 22 Aug 2013 16:31:17 -0700
Subject: BulletSim: add axis parameter for specifying enable, damping, and
 stiffness for spring constraints. Renumber parameter ops since I can as no
 one is using them yet.

---
 .../Scripting/ExtendedPhysics/ExtendedPhysics.cs   | 10 +++--
 .../Region/Physics/BulletSPlugin/BSApiTemplate.cs  |  2 +-
 .../Physics/BulletSPlugin/BSConstraintSpring.cs    |  2 +-
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  | 51 +++++++++++++++-------
 4 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
index 2f88e2b..ef106bd 100755
--- a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
@@ -399,13 +399,15 @@ public class ExtendedPhysics : INonSharedRegionModule
     [ScriptConstant]
     public const int PHYS_PARAM_SOLVER_ITERATIONS      = 14415;
     [ScriptConstant]
-    public const int PHYS_PARAM_SPRING_DAMPING         = 14416;
+    public const int PHYS_PARAM_SPRING_AXIS_ENABLE     = 14416;
     [ScriptConstant]
-    public const int PHYS_PARAM_SPRING_STIFFNESS       = 14417;
+    public const int PHYS_PARAM_SPRING_DAMPING         = 14417;
     [ScriptConstant]
-    public const int PHYS_PARAM_LINK_TYPE              = 14418;
+    public const int PHYS_PARAM_SPRING_STIFFNESS       = 14418;
+    [ScriptConstant]
+    public const int PHYS_PARAM_LINK_TYPE              = 14419;
 
-    public const int PHYS_PARAM_MAX                    = 14418;
+    public const int PHYS_PARAM_MAX                    = 14419;
 
     // physChangeLinkParams(integer linkNum, [ PHYS_PARAM_*, value, PHYS_PARAM_*, value, ...])
     [ScriptInvocation]
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index 9d8838b..0b3f467 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -292,7 +292,7 @@ public enum ConstraintParamAxis : int
     AXIS_ANGULAR_X,
     AXIS_ANGULAR_Y,
     AXIS_ANGULAR_Z,
-    AXIS_LINEAR_ALL = 20,    // these last three added by BulletSim so we don't have to do zillions of calls
+    AXIS_LINEAR_ALL = 20,    // added by BulletSim so we don't have to do zillions of calls
     AXIS_ANGULAR_ALL,
     AXIS_ALL
 };
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs
index 410584d..432e5b2 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs
@@ -53,7 +53,7 @@ public sealed class BSConstraintSpring : BSConstraint6Dof
                     m_body1.ID, frame1Loc, frame1Rot, frame2Loc, frame2Rot, useLinearReferenceFrameA, disableCollisionsBetweenLinkedBodies);
     }
 
-    public bool SetEnable(int pIndex, bool pAxisEnable)
+    public bool SetAxisEnable(int pIndex, bool pAxisEnable)
     {
         PhysicsScene.DetailLog("{0},BSConstraintSpring.SetEnable,obj1ID={1},obj2ID={2},indx={3},enable={4}",
                                         m_body1.ID, m_body1.ID, m_body2.ID, pIndex, pAxisEnable);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index be97c29..f623231 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -59,8 +59,9 @@ public sealed class BSLinksetConstraints : BSLinkset
         public OMV.Vector3 frameInBloc;
         public OMV.Quaternion frameInBrot;
         // Spring
-        public float springDamping;
-        public float springStiffness;
+        public bool[] springAxisEnable;
+        public float[] springDamping;
+        public float[] springStiffness;
 
         public BSLinkInfoConstraint(BSPrimLinkable pMember)
             : base(pMember)
@@ -90,8 +91,15 @@ public sealed class BSLinksetConstraints : BSLinkset
             frameInArot = OMV.Quaternion.Identity;
             frameInBloc = OMV.Vector3.Zero;
             frameInBrot = OMV.Quaternion.Identity;
-            springDamping = -1f;
-            springStiffness = -1f;
+            springAxisEnable = new bool[6];
+            springDamping = new float[6];
+            springStiffness = new float[6];
+            for (int ii = 0; ii < springAxisEnable.Length; ii++)
+            {
+                springAxisEnable[ii] = false;
+                springDamping[ii] = BSAPITemplate.SPRING_NOT_SPECIFIED;
+                springStiffness[ii] = BSAPITemplate.SPRING_NOT_SPECIFIED;
+            }
             member.PhysScene.DetailLog("{0},BSLinkInfoConstraint.ResetLink", member.LocalID);
         }
 
@@ -139,11 +147,13 @@ public sealed class BSLinksetConstraints : BSLinkset
                         }
                         for (int ii = 0; ii < 6; ii++)
                         {
-                            if (springDamping != -1)
-                                constrainSpring.SetDamping(ii, springDamping);
-                            if (springStiffness != -1)
-                                constrainSpring.SetStiffness(ii, springStiffness);
+                            constrainSpring.SetAxisEnable(ii, springAxisEnable[ii]);
+                            if (springDamping[ii] != BSAPITemplate.SPRING_NOT_SPECIFIED)
+                                constrainSpring.SetDamping(ii, springDamping[ii]);
+                            if (springStiffness[ii] != BSAPITemplate.SPRING_NOT_SPECIFIED)
+                                constrainSpring.SetStiffness(ii, springStiffness[ii]);
                         }
+                        constrainSpring.SetEquilibriumPoint(BSAPITemplate.SPRING_NOT_SPECIFIED, BSAPITemplate.SPRING_NOT_SPECIFIED);
                     }
                     break;
                 default:
@@ -707,15 +717,26 @@ public sealed class BSLinksetConstraints : BSLinkset
                                             linkInfo.solverIterations = valueFloat;
                                             opIndex += 2;
                                             break;
+                                        case ExtendedPhysics.PHYS_PARAM_SPRING_AXIS_ENABLE:
+                                            valueInt = (int)pParams[opIndex + 1];
+                                            valueBool = ((int)pParams[opIndex + 2] != 0);
+                                            if (valueInt >=0 && valueInt < linkInfo.springAxisEnable.Length)
+                                                linkInfo.springAxisEnable[valueInt] = valueBool;
+                                            opIndex += 3;
+                                            break;
                                         case ExtendedPhysics.PHYS_PARAM_SPRING_DAMPING:
-                                            valueFloat = (float)pParams[opIndex + 1];
-                                            linkInfo.springDamping = valueFloat;
-                                            opIndex += 2;
+                                            valueInt = (int)pParams[opIndex + 1];
+                                            valueFloat = (float)pParams[opIndex + 2];
+                                            if (valueInt >=0 && valueInt < linkInfo.springDamping.Length)
+                                                linkInfo.springDamping[valueInt] = valueFloat;
+                                            opIndex += 3;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_SPRING_STIFFNESS:
-                                            valueFloat = (float)pParams[opIndex + 1];
-                                            linkInfo.springStiffness = valueFloat;
-                                            opIndex += 2;
+                                            valueInt = (int)pParams[opIndex + 1];
+                                            valueFloat = (float)pParams[opIndex + 2];
+                                            if (valueInt >=0 && valueInt < linkInfo.springStiffness.Length)
+                                                linkInfo.springStiffness[valueInt] = valueFloat;
+                                            opIndex += 3;
                                             break;
                                         default:
                                             break;
-- 
cgit v1.1


From cf2cdc191d0a93860da1ff4c42d34138e8f369fb Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 24 Aug 2013 08:33:28 -0700
Subject: BulletSim: ability to specify groups of axis to modify in constraint
 parameters that control multiple axis. Add useLinearReferenceFrameA
 constraint parameter.

---
 .../Scripting/ExtendedPhysics/ExtendedPhysics.cs   | 12 ++++-
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  | 53 ++++++++++++++++++----
 2 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
index ef106bd..94367f5 100755
--- a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
@@ -406,8 +406,18 @@ public class ExtendedPhysics : INonSharedRegionModule
     public const int PHYS_PARAM_SPRING_STIFFNESS       = 14418;
     [ScriptConstant]
     public const int PHYS_PARAM_LINK_TYPE              = 14419;
+    [ScriptConstant]
+    public const int PHYS_PARAM_USE_LINEAR_FRAMEA      = 14420;
+
+    public const int PHYS_PARAM_MAX                    = 14420;
 
-    public const int PHYS_PARAM_MAX                    = 14419;
+    // Used when specifying a parameter that has settings for the three linear and three angular axis
+    [ScriptConstant]
+    public const int PHYS_AXIS_ALL = -1;
+    [ScriptConstant]
+    public const int PHYS_AXIS_ALL_LINEAR = -2;
+    [ScriptConstant]
+    public const int PHYS_AXIS_ALL_ANGULAR = -3;
 
     // physChangeLinkParams(integer linkNum, [ PHYS_PARAM_*, value, PHYS_PARAM_*, value, ...])
     [ScriptInvocation]
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index f623231..ff5ac0e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -58,6 +58,7 @@ public sealed class BSLinksetConstraints : BSLinkset
         public OMV.Quaternion frameInArot;
         public OMV.Vector3 frameInBloc;
         public OMV.Quaternion frameInBrot;
+        public bool useLinearReferenceFrameA;
         // Spring
         public bool[] springAxisEnable;
         public float[] springDamping;
@@ -91,6 +92,7 @@ public sealed class BSLinksetConstraints : BSLinkset
             frameInArot = OMV.Quaternion.Identity;
             frameInBloc = OMV.Vector3.Zero;
             frameInBrot = OMV.Quaternion.Identity;
+            useLinearReferenceFrameA = true;
             springAxisEnable = new bool[6];
             springDamping = new float[6];
             springStiffness = new float[6];
@@ -145,7 +147,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                         {
                             constrainSpring.SetSolverIterations(solverIterations);
                         }
-                        for (int ii = 0; ii < 6; ii++)
+                        for (int ii = 0; ii < springAxisEnable.Length; ii++)
                         {
                             constrainSpring.SetAxisEnable(ii, springAxisEnable[ii]);
                             if (springDamping[ii] != BSAPITemplate.SPRING_NOT_SPECIFIED)
@@ -401,7 +403,7 @@ public sealed class BSLinksetConstraints : BSLinkset
             case ConstraintType.D6_SPRING_CONSTRAINT_TYPE:
                 constrain = new BSConstraintSpring(m_physicsScene.World, rootPrim.PhysBody, linkInfo.member.PhysBody,
                                 linkInfo.frameInAloc, linkInfo.frameInArot, linkInfo.frameInBloc, linkInfo.frameInBrot,
-                                true /*useLinearReferenceFrameA*/,
+                                linkInfo.useLinearReferenceFrameA,
                                 true /*disableCollisionsBetweenLinkedBodies*/);
                 DetailLog("{0},BSLinksetConstraint.BuildConstraint,spring,root={1},rBody={2},child={3},cBody={4},rLoc={5},cLoc={6}",
                                                 rootPrim.LocalID,
@@ -619,6 +621,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                                 bool valueBool;
                                 OMV.Vector3 valueVector;
                                 OMV.Quaternion valueQuaternion;
+                                int axisLow, axisHigh;
 
                                 int opIndex = 2;
                                 while (opIndex < pParams.Length)
@@ -720,24 +723,32 @@ public sealed class BSLinksetConstraints : BSLinkset
                                         case ExtendedPhysics.PHYS_PARAM_SPRING_AXIS_ENABLE:
                                             valueInt = (int)pParams[opIndex + 1];
                                             valueBool = ((int)pParams[opIndex + 2] != 0);
-                                            if (valueInt >=0 && valueInt < linkInfo.springAxisEnable.Length)
-                                                linkInfo.springAxisEnable[valueInt] = valueBool;
+                                            GetAxisRange(valueInt, out axisLow, out axisHigh);
+                                            for (int ii = axisLow; ii <= axisHigh; ii++)
+                                                linkInfo.springAxisEnable[ii] = valueBool;
                                             opIndex += 3;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_SPRING_DAMPING:
                                             valueInt = (int)pParams[opIndex + 1];
                                             valueFloat = (float)pParams[opIndex + 2];
-                                            if (valueInt >=0 && valueInt < linkInfo.springDamping.Length)
-                                                linkInfo.springDamping[valueInt] = valueFloat;
+                                            GetAxisRange(valueInt, out axisLow, out axisHigh);
+                                            for (int ii = axisLow; ii <= axisHigh; ii++)
+                                                linkInfo.springDamping[ii] = valueFloat;
                                             opIndex += 3;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_SPRING_STIFFNESS:
                                             valueInt = (int)pParams[opIndex + 1];
                                             valueFloat = (float)pParams[opIndex + 2];
-                                            if (valueInt >=0 && valueInt < linkInfo.springStiffness.Length)
-                                                linkInfo.springStiffness[valueInt] = valueFloat;
+                                            GetAxisRange(valueInt, out axisLow, out axisHigh);
+                                            for (int ii = axisLow; ii <= axisHigh; ii++)
+                                                linkInfo.springStiffness[ii] = valueFloat;
                                             opIndex += 3;
                                             break;
+                                        case ExtendedPhysics.PHYS_PARAM_USE_LINEAR_FRAMEA:
+                                            valueBool = (bool)pParams[opIndex + 1];
+                                            linkInfo.useLinearReferenceFrameA = valueBool;
+                                            opIndex += 2;
+                                            break;
                                         default:
                                             break;
                                     }
@@ -760,6 +771,32 @@ public sealed class BSLinksetConstraints : BSLinkset
         }
         return ret;
     }
+
+    // Bullet constraints keep some limit parameters for each linear and angular axis.
+    // Setting same is easier if there is an easy way to see all or types.
+    // This routine returns the array limits for the set of axis.
+    private void GetAxisRange(int rangeSpec, out int low, out int high)
+    {
+        switch (rangeSpec)
+        {
+            case ExtendedPhysics.PHYS_AXIS_ALL_LINEAR:
+                low = 0;
+                high = 2;
+                break;
+            case ExtendedPhysics.PHYS_AXIS_ALL_ANGULAR:
+                low = 3;
+                high = 5;
+                break;
+            case ExtendedPhysics.PHYS_AXIS_ALL:
+                low = 0;
+                high = 5;
+                break;
+            default:
+                low = high = rangeSpec;
+                break;
+        }
+        return;
+    }
     #endregion // Extension
 
 }
-- 
cgit v1.1


From 5827b6e1aabf2e19624faf0141b9611917fb84c5 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 4 Sep 2013 07:56:59 -0700
Subject: BulletSim: add extended physics LSL constants for axis specification.
 Add specific error warnings for mis-matched parameter types in extended   
 physics functions.

---
 .../Scripting/ExtendedPhysics/ExtendedPhysics.cs   | 16 +++-
 .../Physics/BulletSPlugin/BSConstraintSpring.cs    |  6 +-
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs  | 89 ++++++++++++++--------
 3 files changed, 74 insertions(+), 37 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
index 94367f5..b0b0bc6 100755
--- a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
@@ -415,9 +415,21 @@ public class ExtendedPhysics : INonSharedRegionModule
     [ScriptConstant]
     public const int PHYS_AXIS_ALL = -1;
     [ScriptConstant]
-    public const int PHYS_AXIS_ALL_LINEAR = -2;
+    public const int PHYS_AXIS_LINEAR_ALL = -2;
     [ScriptConstant]
-    public const int PHYS_AXIS_ALL_ANGULAR = -3;
+    public const int PHYS_AXIS_ANGULAR_ALL = -3;
+    [ScriptConstant]
+    public const int PHYS_AXIS_LINEAR_X  = 0;
+    [ScriptConstant]
+    public const int PHYS_AXIS_LINEAR_Y  = 1;
+    [ScriptConstant]
+    public const int PHYS_AXIS_LINEAR_Z  = 2;
+    [ScriptConstant]
+    public const int PHYS_AXIS_ANGULAR_X = 3;
+    [ScriptConstant]
+    public const int PHYS_AXIS_ANGULAR_Y = 4;
+    [ScriptConstant]
+    public const int PHYS_AXIS_ANGULAR_Z = 5;
 
     // physChangeLinkParams(integer linkNum, [ PHYS_PARAM_*, value, PHYS_PARAM_*, value, ...])
     [ScriptInvocation]
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs
index 432e5b2..652c94a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs
@@ -63,7 +63,7 @@ public sealed class BSConstraintSpring : BSConstraint6Dof
 
     public bool SetStiffness(int pIndex, float pStiffness)
     {
-        PhysicsScene.DetailLog("{0},BSConstraintSpring.SetStiffness,obj1ID={1},obj2ID={2},indx={3},enable={4}",
+        PhysicsScene.DetailLog("{0},BSConstraintSpring.SetStiffness,obj1ID={1},obj2ID={2},indx={3},stiff={4}",
                                         m_body1.ID, m_body1.ID, m_body2.ID, pIndex, pStiffness);
         PhysicsScene.PE.SpringSetStiffness(m_constraint, pIndex, pStiffness);
         return true;
@@ -71,7 +71,7 @@ public sealed class BSConstraintSpring : BSConstraint6Dof
 
     public bool SetDamping(int pIndex, float pDamping)
     {
-        PhysicsScene.DetailLog("{0},BSConstraintSpring.SetDamping,obj1ID={1},obj2ID={2},indx={3},enable={4}",
+        PhysicsScene.DetailLog("{0},BSConstraintSpring.SetDamping,obj1ID={1},obj2ID={2},indx={3},damp={4}",
                                         m_body1.ID, m_body1.ID, m_body2.ID, pIndex, pDamping);
         PhysicsScene.PE.SpringSetDamping(m_constraint, pIndex, pDamping);
         return true;
@@ -79,7 +79,7 @@ public sealed class BSConstraintSpring : BSConstraint6Dof
 
     public bool SetEquilibriumPoint(int pIndex, float pEqPoint)
     {
-        PhysicsScene.DetailLog("{0},BSConstraintSpring.SetEquilibriumPoint,obj1ID={1},obj2ID={2},indx={3},enable={4}",
+        PhysicsScene.DetailLog("{0},BSConstraintSpring.SetEquilibriumPoint,obj1ID={1},obj2ID={2},indx={3},eqPoint={4}",
                                         m_body1.ID, m_body1.ID, m_body2.ID, pIndex, pEqPoint);
         PhysicsScene.PE.SpringSetEquilibriumPoint(m_constraint, pIndex, pEqPoint);
         return true;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index ff5ac0e..b3347bf 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -605,30 +605,32 @@ public sealed class BSLinksetConstraints : BSLinkset
             // pParams = [ BSPhysObject root, BSPhysObject child, int op, object opParams, int op, object opParams, ... ]
             case ExtendedPhysics.PhysFunctChangeLinkParams:
                 // There should be two parameters: the childActor and a list of parameters to set
-                try
+                if (pParams.Length > 2)
                 {
-                    if (pParams.Length > 2)
+                    BSPrimLinkable child = pParams[1] as BSPrimLinkable;
+                    BSLinkInfo baseLinkInfo = null;
+                    if (TryGetLinkInfo(child, out baseLinkInfo))
                     {
-                        BSPrimLinkable child = pParams[1] as BSPrimLinkable;
-                        BSLinkInfo baseLinkInfo = null;
-                        if (TryGetLinkInfo(child, out baseLinkInfo))
+                        BSLinkInfoConstraint linkInfo = baseLinkInfo as BSLinkInfoConstraint;
+                        if (linkInfo != null)
                         {
-                            BSLinkInfoConstraint linkInfo = baseLinkInfo as BSLinkInfoConstraint;
-                            if (linkInfo != null)
+                            int valueInt;
+                            float valueFloat;
+                            bool valueBool;
+                            OMV.Vector3 valueVector;
+                            OMV.Quaternion valueQuaternion;
+                            int axisLow, axisHigh;
+
+                            int opIndex = 2;
+                            while (opIndex < pParams.Length)
                             {
-                                int valueInt;
-                                float valueFloat;
-                                bool valueBool;
-                                OMV.Vector3 valueVector;
-                                OMV.Quaternion valueQuaternion;
-                                int axisLow, axisHigh;
-
-                                int opIndex = 2;
-                                while (opIndex < pParams.Length)
+                                int thisOp = 0;
+                                string errMsg = "";
+                                try
                                 {
-                                    int thisOp = (int)pParams[opIndex];
+                                    thisOp = (int)pParams[opIndex];
                                     DetailLog("{0},BSLinksetConstraint.ChangeLinkParams2,op={1},val={2}",
-                                                        linkInfo.member.LocalID, thisOp, pParams[opIndex+1]);
+                                                        linkInfo.member.LocalID, thisOp, pParams[opIndex + 1]);
                                     switch (thisOp)
                                     {
                                         case ExtendedPhysics.PHYS_PARAM_LINK_TYPE:
@@ -646,89 +648,106 @@ public sealed class BSLinksetConstraints : BSLinkset
                                             opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_FRAMEINA_LOC:
+                                            errMsg = "PHYS_PARAM_FRAMEINA_LOC takes one parameter of type vector";
                                             valueVector = (OMV.Vector3)pParams[opIndex + 1];
                                             linkInfo.frameInAloc = valueVector;
                                             opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_FRAMEINA_ROT:
+                                            errMsg = "PHYS_PARAM_FRAMEINA_ROT takes one parameter of type rotation";
                                             valueQuaternion = (OMV.Quaternion)pParams[opIndex + 1];
                                             linkInfo.frameInArot = valueQuaternion;
                                             opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_FRAMEINB_LOC:
+                                            errMsg = "PHYS_PARAM_FRAMEINB_LOC takes one parameter of type vector";
                                             valueVector = (OMV.Vector3)pParams[opIndex + 1];
                                             linkInfo.frameInBloc = valueVector;
                                             opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_FRAMEINB_ROT:
+                                            errMsg = "PHYS_PARAM_FRAMEINB_ROT takes one parameter of type rotation";
                                             valueQuaternion = (OMV.Quaternion)pParams[opIndex + 1];
                                             linkInfo.frameInBrot = valueQuaternion;
                                             opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_LINEAR_LIMIT_LOW:
+                                            errMsg = "PHYS_PARAM_LINEAR_LIMIT_LOW takes one parameter of type vector";
                                             valueVector = (OMV.Vector3)pParams[opIndex + 1];
                                             linkInfo.linearLimitLow = valueVector;
                                             opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_LINEAR_LIMIT_HIGH:
+                                            errMsg = "PHYS_PARAM_LINEAR_LIMIT_HIGH takes one parameter of type vector";
                                             valueVector = (OMV.Vector3)pParams[opIndex + 1];
                                             linkInfo.linearLimitHigh = valueVector;
                                             opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_ANGULAR_LIMIT_LOW:
+                                            errMsg = "PHYS_PARAM_ANGULAR_LIMIT_LOW takes one parameter of type vector";
                                             valueVector = (OMV.Vector3)pParams[opIndex + 1];
                                             linkInfo.angularLimitLow = valueVector;
                                             opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_ANGULAR_LIMIT_HIGH:
+                                            errMsg = "PHYS_PARAM_ANGULAR_LIMIT_HIGH takes one parameter of type vector";
                                             valueVector = (OMV.Vector3)pParams[opIndex + 1];
                                             linkInfo.angularLimitHigh = valueVector;
                                             opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_USE_FRAME_OFFSET:
-                                            valueBool = (bool)pParams[opIndex + 1];
+                                            errMsg = "PHYS_PARAM_USE_FRAME_OFFSET takes one parameter of type integer (bool)";
+                                            valueBool = ((int)pParams[opIndex + 1]) != 0;
                                             linkInfo.useFrameOffset = valueBool;
                                             opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_ENABLE_TRANSMOTOR:
-                                            valueBool = (bool)pParams[opIndex + 1];
+                                            errMsg = "PHYS_PARAM_ENABLE_TRANSMOTOR takes one parameter of type integer (bool)";
+                                            valueBool = ((int)pParams[opIndex + 1]) != 0;
                                             linkInfo.enableTransMotor = valueBool;
                                             opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_TRANSMOTOR_MAXVEL:
+                                            errMsg = "PHYS_PARAM_TRANSMOTOR_MAXVEL takes one parameter of type float";
                                             valueFloat = (float)pParams[opIndex + 1];
                                             linkInfo.transMotorMaxVel = valueFloat;
                                             opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_TRANSMOTOR_MAXFORCE:
+                                            errMsg = "PHYS_PARAM_TRANSMOTOR_MAXFORCE takes one parameter of type float";
                                             valueFloat = (float)pParams[opIndex + 1];
                                             linkInfo.transMotorMaxForce = valueFloat;
                                             opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_CFM:
+                                            errMsg = "PHYS_PARAM_CFM takes one parameter of type float";
                                             valueFloat = (float)pParams[opIndex + 1];
                                             linkInfo.cfm = valueFloat;
                                             opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_ERP:
+                                            errMsg = "PHYS_PARAM_ERP takes one parameter of type float";
                                             valueFloat = (float)pParams[opIndex + 1];
                                             linkInfo.erp = valueFloat;
                                             opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_SOLVER_ITERATIONS:
+                                            errMsg = "PHYS_PARAM_SOLVER_ITERATIONS takes one parameter of type float";
                                             valueFloat = (float)pParams[opIndex + 1];
                                             linkInfo.solverIterations = valueFloat;
                                             opIndex += 2;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_SPRING_AXIS_ENABLE:
+                                            errMsg = "PHYS_PARAM_SPRING_AXIS_ENABLE takes two parameters of types integer and integer (bool)";
                                             valueInt = (int)pParams[opIndex + 1];
-                                            valueBool = ((int)pParams[opIndex + 2] != 0);
+                                            valueBool = ((int)pParams[opIndex + 2]) != 0;
                                             GetAxisRange(valueInt, out axisLow, out axisHigh);
                                             for (int ii = axisLow; ii <= axisHigh; ii++)
                                                 linkInfo.springAxisEnable[ii] = valueBool;
                                             opIndex += 3;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_SPRING_DAMPING:
+                                            errMsg = "PHYS_PARAM_SPRING_DAMPING takes two parameters of types integer and float";
                                             valueInt = (int)pParams[opIndex + 1];
                                             valueFloat = (float)pParams[opIndex + 2];
                                             GetAxisRange(valueInt, out axisLow, out axisHigh);
@@ -737,6 +756,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                                             opIndex += 3;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_SPRING_STIFFNESS:
+                                            errMsg = "PHYS_PARAM_SPRING_STIFFNESS takes two parameters of types integer and float";
                                             valueInt = (int)pParams[opIndex + 1];
                                             valueFloat = (float)pParams[opIndex + 2];
                                             GetAxisRange(valueInt, out axisLow, out axisHigh);
@@ -745,7 +765,8 @@ public sealed class BSLinksetConstraints : BSLinkset
                                             opIndex += 3;
                                             break;
                                         case ExtendedPhysics.PHYS_PARAM_USE_LINEAR_FRAMEA:
-                                            valueBool = (bool)pParams[opIndex + 1];
+                                            errMsg = "PHYS_PARAM_USE_LINEAR_FRAMEA takes one parameter of type integer (bool)";
+                                            valueBool = ((int)pParams[opIndex + 1]) != 0;
                                             linkInfo.useLinearReferenceFrameA = valueBool;
                                             opIndex += 2;
                                             break;
@@ -753,18 +774,22 @@ public sealed class BSLinksetConstraints : BSLinkset
                                             break;
                                     }
                                 }
+                                catch (InvalidCastException e)
+                                {
+                                    m_physicsScene.Logger.WarnFormat("{0} value of wrong type in physSetLinksetParams: {1}, err={2}",
+                                                        LogHeader, errMsg, e);
+                                }
+                                catch (Exception e)
+                                {
+                                    m_physicsScene.Logger.WarnFormat("{0} bad parameters in physSetLinksetParams: {1}", LogHeader, e);
+                                }
                             }
-                            // Something changed so a rebuild is in order
-                            Refresh(child);
                         }
+                        // Something changed so a rebuild is in order
+                        Refresh(child);
                     }
                 }
-                catch (Exception e)
-                {
-                    // There are many ways to mess up the parameters. If not just right don't fail without some error.
-                    m_physicsScene.Logger.WarnFormat("{0} bad parameters in physSetLinksetParams: {1}", LogHeader, e);
-                }
-                break;
+            break;
             default:
                 ret = base.Extension(pFunct, pParams);
                 break;
@@ -779,11 +804,11 @@ public sealed class BSLinksetConstraints : BSLinkset
     {
         switch (rangeSpec)
         {
-            case ExtendedPhysics.PHYS_AXIS_ALL_LINEAR:
+            case ExtendedPhysics.PHYS_AXIS_LINEAR_ALL:
                 low = 0;
                 high = 2;
                 break;
-            case ExtendedPhysics.PHYS_AXIS_ALL_ANGULAR:
+            case ExtendedPhysics.PHYS_AXIS_ANGULAR_ALL:
                 low = 3;
                 high = 5;
                 break;
-- 
cgit v1.1


From c5eabb28b4c933cfacefa85381e290372fbc094e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 9 Sep 2013 14:53:16 -0700
Subject: BulletSim: add LSL function and plumbing for setting a spring
 equilibrium point in the physics engine constraint.

---
 .../Scripting/ExtendedPhysics/ExtendedPhysics.cs     |  4 +++-
 OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs |  6 +++++-
 .../Physics/BulletSPlugin/BSConstraintSpring.cs      | 13 +++++++++++++
 .../Physics/BulletSPlugin/BSLinksetConstraints.cs    | 20 +++++++++++++++++++-
 4 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
index b0b0bc6..9daf9d7 100755
--- a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
@@ -408,8 +408,10 @@ public class ExtendedPhysics : INonSharedRegionModule
     public const int PHYS_PARAM_LINK_TYPE              = 14419;
     [ScriptConstant]
     public const int PHYS_PARAM_USE_LINEAR_FRAMEA      = 14420;
+    [ScriptConstant]
+    public const int PHYS_PARAM_SPRING_EQUILIBRIUM_POINT = 14421;
 
-    public const int PHYS_PARAM_MAX                    = 14420;
+    public const int PHYS_PARAM_MAX                    = 14421;
 
     // Used when specifying a parameter that has settings for the three linear and three angular axis
     [ScriptConstant]
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
index 42b5c49..b47e9a8 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
@@ -64,7 +64,7 @@ public abstract class BSConstraint : IDisposable
             {
                 bool success = PhysicsScene.PE.DestroyConstraint(m_world, m_constraint);
                 m_world.physicsScene.DetailLog("{0},BSConstraint.Dispose,taint,id1={1},body1={2},id2={3},body2={4},success={5}",
-                                    BSScene.DetailLogZero,
+                                    m_body1.ID,
                                     m_body1.ID, m_body1.AddrString,
                                     m_body2.ID, m_body2.AddrString,
                                     success);
@@ -77,7 +77,10 @@ public abstract class BSConstraint : IDisposable
     {
         bool ret = false;
         if (m_enabled)
+        {
+            m_world.physicsScene.DetailLog("{0},BSConstraint.SetLinearLimits,taint,low={1},high={2}", m_body1.ID, low, high);
             ret = PhysicsScene.PE.SetLinearLimits(m_constraint, low, high);
+        }
         return ret;
     }
 
@@ -86,6 +89,7 @@ public abstract class BSConstraint : IDisposable
         bool ret = false;
         if (m_enabled)
         {
+            m_world.physicsScene.DetailLog("{0},BSConstraint.SetAngularLimits,taint,low={1},high={2}", m_body1.ID, low, high);
             ret = PhysicsScene.PE.SetAngularLimits(m_constraint, low, high);
         }
         return ret;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs
index 652c94a..8e7ddff 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintSpring.cs
@@ -85,6 +85,19 @@ public sealed class BSConstraintSpring : BSConstraint6Dof
         return true;
     }
 
+    public bool SetEquilibriumPoint(Vector3 linearEq, Vector3 angularEq)
+    {
+        PhysicsScene.DetailLog("{0},BSConstraintSpring.SetEquilibriumPoint,obj1ID={1},obj2ID={2},linearEq={3},angularEq={4}",
+                                        m_body1.ID, m_body1.ID, m_body2.ID, linearEq, angularEq);
+        PhysicsScene.PE.SpringSetEquilibriumPoint(m_constraint, 0, linearEq.X);
+        PhysicsScene.PE.SpringSetEquilibriumPoint(m_constraint, 1, linearEq.Y);
+        PhysicsScene.PE.SpringSetEquilibriumPoint(m_constraint, 2, linearEq.Z);
+        PhysicsScene.PE.SpringSetEquilibriumPoint(m_constraint, 3, angularEq.X);
+        PhysicsScene.PE.SpringSetEquilibriumPoint(m_constraint, 4, angularEq.Y);
+        PhysicsScene.PE.SpringSetEquilibriumPoint(m_constraint, 5, angularEq.Z);
+        return true;
+    }
+
 }
 
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index b3347bf..aaf92c8 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -63,6 +63,8 @@ public sealed class BSLinksetConstraints : BSLinkset
         public bool[] springAxisEnable;
         public float[] springDamping;
         public float[] springStiffness;
+        public OMV.Vector3 springLinearEquilibriumPoint;
+        public OMV.Vector3 springAngularEquilibriumPoint;
 
         public BSLinkInfoConstraint(BSPrimLinkable pMember)
             : base(pMember)
@@ -102,6 +104,8 @@ public sealed class BSLinksetConstraints : BSLinkset
                 springDamping[ii] = BSAPITemplate.SPRING_NOT_SPECIFIED;
                 springStiffness[ii] = BSAPITemplate.SPRING_NOT_SPECIFIED;
             }
+            springLinearEquilibriumPoint = OMV.Vector3.Zero;
+            springAngularEquilibriumPoint = OMV.Vector3.Zero;
             member.PhysScene.DetailLog("{0},BSLinkInfoConstraint.ResetLink", member.LocalID);
         }
 
@@ -155,7 +159,12 @@ public sealed class BSLinksetConstraints : BSLinkset
                             if (springStiffness[ii] != BSAPITemplate.SPRING_NOT_SPECIFIED)
                                 constrainSpring.SetStiffness(ii, springStiffness[ii]);
                         }
-                        constrainSpring.SetEquilibriumPoint(BSAPITemplate.SPRING_NOT_SPECIFIED, BSAPITemplate.SPRING_NOT_SPECIFIED);
+                        constrainSpring.CalculateTransforms();
+
+                        if (springLinearEquilibriumPoint != OMV.Vector3.Zero)
+                            constrainSpring.SetEquilibriumPoint(springLinearEquilibriumPoint, springAngularEquilibriumPoint);
+                        else
+                            constrainSpring.SetEquilibriumPoint(BSAPITemplate.SPRING_NOT_SPECIFIED, BSAPITemplate.SPRING_NOT_SPECIFIED);
                     }
                     break;
                 default:
@@ -618,6 +627,7 @@ public sealed class BSLinksetConstraints : BSLinkset
                             float valueFloat;
                             bool valueBool;
                             OMV.Vector3 valueVector;
+                            OMV.Vector3 valueVector2;
                             OMV.Quaternion valueQuaternion;
                             int axisLow, axisHigh;
 
@@ -764,6 +774,14 @@ public sealed class BSLinksetConstraints : BSLinkset
                                                 linkInfo.springStiffness[ii] = valueFloat;
                                             opIndex += 3;
                                             break;
+                                        case ExtendedPhysics.PHYS_PARAM_SPRING_EQUILIBRIUM_POINT:
+                                            errMsg = "PHYS_PARAM_SPRING_EQUILIBRIUM_POINT takes two parameters of type vector";
+                                            valueVector = (OMV.Vector3)pParams[opIndex + 1];
+                                            valueVector2 = (OMV.Vector3)pParams[opIndex + 2];
+                                            linkInfo.springLinearEquilibriumPoint = valueVector;
+                                            linkInfo.springAngularEquilibriumPoint = valueVector2;
+                                            opIndex += 3;
+                                            break;
                                         case ExtendedPhysics.PHYS_PARAM_USE_LINEAR_FRAMEA:
                                             errMsg = "PHYS_PARAM_USE_LINEAR_FRAMEA takes one parameter of type integer (bool)";
                                             valueBool = ((int)pParams[opIndex + 1]) != 0;
-- 
cgit v1.1


From e34385634b56769516c4e0284860f48a5ce371c4 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 9 Sep 2013 15:42:57 -0700
Subject: BulletSim: update DLLs and SOs for spring parameters and constraint
 debugging dump code.

---
 bin/lib32/BulletSim.dll   | Bin 1086976 -> 1095680 bytes
 bin/lib32/libBulletSim.so | Bin 2317618 -> 2342728 bytes
 bin/lib64/BulletSim.dll   | Bin 1229824 -> 1233920 bytes
 bin/lib64/libBulletSim.so | Bin 2491923 -> 2520385 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 7987434..9bb7bcd 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 114a597..a4e0f4a 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index b69fcf3..8c96eb7 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index e4d2581..1f76a40 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1


From 6e39cc316f502855a89c51775e7394b73135ab86 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 10 Sep 2013 17:32:01 -0700
Subject: BulletSim: add ClearCollisionProxyCache function to API. Add proxy
 cache clearing when some properties are changed. This fixes a problem where
 objects would stop colliding of they were moved with setPosition mulitple
 times.

---
 OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs    | 10 ++++++++++
 OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs      | 13 +++++++++++++
 OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs |  2 ++
 OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs  | 12 ++++++++++--
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
index 8dfb01c..3bd81d4 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
@@ -725,6 +725,13 @@ public override bool RemoveObjectFromWorld(BulletWorld world, BulletBody obj)
     return BSAPICPP.RemoveObjectFromWorld2(worldu.ptr, bodyu.ptr);
 }
 
+public override bool ClearCollisionProxyCache(BulletWorld world, BulletBody obj)
+{
+    BulletWorldUnman worldu = world as BulletWorldUnman;
+    BulletBodyUnman bodyu = obj as BulletBodyUnman;
+    return BSAPICPP.ClearCollisionProxyCache2(worldu.ptr, bodyu.ptr);
+}
+
 public override bool AddConstraintToWorld(BulletWorld world, BulletConstraint constrain, bool disableCollisionsBetweenLinkedObjects)
 {
     BulletWorldUnman worldu = world as BulletWorldUnman;
@@ -1713,6 +1720,9 @@ public static extern bool AddObjectToWorld2(IntPtr world, IntPtr obj);
 public static extern bool RemoveObjectFromWorld2(IntPtr world, IntPtr obj);
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
+public static extern bool ClearCollisionProxyCache2(IntPtr world, IntPtr obj);
+
+[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
 public static extern bool AddConstraintToWorld2(IntPtr world, IntPtr constrain, bool disableCollisionsBetweenLinkedObjects);
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
index ff2b497..17ebed2 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
@@ -169,6 +169,19 @@ private sealed class BulletConstraintXNA : BulletConstraint
         return true;
     }
 
+    public override bool ClearCollisionProxyCache(BulletWorld pWorld, BulletBody pBody)
+    {
+        DiscreteDynamicsWorld world = (pWorld as BulletWorldXNA).world;
+        RigidBody body = ((BulletBodyXNA)pBody).rigidBody;
+        CollisionObject collisionObject = ((BulletBodyXNA)pBody).body;
+        if (body != null && collisionObject != null && collisionObject.GetBroadphaseHandle() != null)
+        {
+            world.RemoveCollisionObject(collisionObject);
+            world.AddCollisionObject(collisionObject);
+        }
+        return true;
+    }
+
     public override bool AddConstraintToWorld(BulletWorld pWorld, BulletConstraint pConstraint, bool pDisableCollisionsBetweenLinkedObjects)
     {
         DiscreteDynamicsWorld world = (pWorld as BulletWorldXNA).world;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index 0b3f467..f7dd158 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -498,6 +498,8 @@ public abstract bool AddObjectToWorld(BulletWorld world, BulletBody obj);
 
 public abstract bool RemoveObjectFromWorld(BulletWorld world, BulletBody obj);
 
+public abstract bool ClearCollisionProxyCache(BulletWorld world, BulletBody obj);
+
 public abstract bool AddConstraintToWorld(BulletWorld world, BulletConstraint constrain, bool disableCollisionsBetweenLinkedObjects);
 
 public abstract bool RemoveConstraintFromWorld(BulletWorld world, BulletConstraint constrain);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 2efb1a5..47df611 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -300,8 +300,16 @@ public abstract class BSPhysObject : PhysicsActor
     // Called in taint-time!!
     public void ActivateIfPhysical(bool forceIt)
     {
-        if (IsPhysical && PhysBody.HasPhysicalBody)
-            PhysScene.PE.Activate(PhysBody, forceIt);
+        if (PhysBody.HasPhysicalBody)
+        {
+            // Clear the collision cache since we've changed some properties.
+            PhysScene.PE.ClearCollisionProxyCache(PhysScene.World, PhysBody);
+            if (IsPhysical)
+            {
+                // Physical objects might need activating
+                PhysScene.PE.Activate(PhysBody, forceIt);
+            }
+        }
     }
 
     // 'actors' act on the physical object to change or constrain its motion. These can range from
-- 
cgit v1.1


From 8bcf75312739ae382175e21df0ad977ec493ddda Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 10 Sep 2013 17:42:22 -0700
Subject: BulletSim: update DLLs and SOs with ClearCollisionCache inteface
 calls and constraint debugging messages.

---
 bin/lib32/BulletSim.dll   | Bin 1095680 -> 1096192 bytes
 bin/lib32/libBulletSim.so | Bin 2342728 -> 2342970 bytes
 bin/lib64/BulletSim.dll   | Bin 1233920 -> 1233920 bytes
 bin/lib64/libBulletSim.so | Bin 2520385 -> 2520691 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 9bb7bcd..e344f84 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index a4e0f4a..94e1682 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 8c96eb7..31949c8 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 1f76a40..399f4f8 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1


From b29e9d37e7705e461f71a3a599d95ad79b57e18a Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Wed, 11 Sep 2013 12:15:16 -0700
Subject: Change handling of the FetchInventoryDescendents2 capability
 configuration to allow for external handlers.

---
 .../Linden/Caps/WebFetchInvDescModule.cs           | 59 +++++++++++++---------
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 164adeb..340d2e7 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.ClientStack.Linden
             public List<UUID> folders;
         }
 
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private Scene m_scene;
 
@@ -115,7 +115,7 @@ namespace OpenSim.Region.ClientStack.Linden
             m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
 
             foreach (Thread t in m_workerThreads)
-                Watchdog.AbortThread(t.ManagedThreadId); 
+                Watchdog.AbortThread(t.ManagedThreadId);
 
             m_scene = null;
         }
@@ -296,36 +296,49 @@ namespace OpenSim.Region.ClientStack.Linden
                         requestinfo.request["body"].ToString(), String.Empty, String.Empty, null, null);
 
                 lock (responses)
-                    responses[requestID] = response; 
+                    responses[requestID] = response;
             }
         }
 
         private void RegisterCaps(UUID agentID, Caps caps)
         {
-            if (m_fetchInventoryDescendents2Url == "")
+            RegisterFetchDescendentsCap(agentID, caps, "FetchInventoryDescendents2", m_fetchInventoryDescendents2Url);
+        }
+
+        private void RegisterFetchDescendentsCap(UUID agentID, Caps caps, string capName, string url)
+        {
+            string capUrl;
+
+            // disable the cap clause
+            if (url == "")
+            {
                 return;
+            }
+            // handled by the simulator
+            else if (url == "localhost")
+            {
+                capUrl = "/CAPS/" + UUID.Random() + "/";
 
-            // Register this as a poll service          
-            PollServiceInventoryEventArgs args 
-                = new PollServiceInventoryEventArgs(m_scene, "/CAPS/" + UUID.Random() + "/", agentID);            
-            args.Type = PollServiceEventArgs.EventType.Inventory;
+                // Register this as a poll service
+                PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(m_scene, capUrl, agentID);
+                args.Type = PollServiceEventArgs.EventType.Inventory;
 
-            caps.RegisterPollHandler("FetchInventoryDescendents2", args);
+                caps.RegisterPollHandler(capName, args);
+            }
+            // external handler
+            else
+            {
+                capUrl = url;
+                IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>();
+                if (handler != null)
+                    handler.RegisterExternalUserCapsHandler(agentID,caps,capName,capUrl);
+                else
+                    caps.RegisterHandler(capName, capUrl);
+            }
 
-//            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_log.DebugFormat(
+            //     "[FETCH INVENTORY DESCENDENTS2 MODULE]: Registered capability {0} at {1} in region {2} for {3}",
+            //     capName, capUrl, m_scene.RegionInfo.RegionName, agentID);
         }
 
 //        private void DeregisterCaps(UUID agentID, Caps caps)
-- 
cgit v1.1


From dacc20ee48883efe3702c284edff5ee3fa0e96b0 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 11 Sep 2013 16:48:15 -0700
Subject: BulletSim: remove collision cache clearing logic for physical
 objects. This fixes constraints from getting messed up when properties
 change.

---
 OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 47df611..f89b376 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -302,13 +302,16 @@ public abstract class BSPhysObject : PhysicsActor
     {
         if (PhysBody.HasPhysicalBody)
         {
-            // Clear the collision cache since we've changed some properties.
-            PhysScene.PE.ClearCollisionProxyCache(PhysScene.World, PhysBody);
             if (IsPhysical)
             {
                 // Physical objects might need activating
                 PhysScene.PE.Activate(PhysBody, forceIt);
             }
+            else
+            {
+                // Clear the collision cache since we've changed some properties.
+                PhysScene.PE.ClearCollisionProxyCache(PhysScene.World, PhysBody);
+            }
         }
     }
 
-- 
cgit v1.1


From 3c85afbb431d14a676c00d20bfeeb5e2d13e8eaf Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 12 Sep 2013 11:46:12 -0400
Subject: Allow setting the EntityTransfer-max_distance to 0 to override
 distance checks. This is to facilitate current viewer work fixing the
 distance limitations for teleporting.

---
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs   | 3 +++
 bin/OpenSimDefaults.ini                                            | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 4219254..9302784 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -518,6 +518,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// </returns>
         private bool IsWithinMaxTeleportDistance(RegionInfo sourceRegion, GridRegion destRegion)
         {
+            if(MaxTransferDistance == 0)
+                return true;
+
 //                        m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Source co-ords are x={0} y={1}", curRegionX, curRegionY);
 //
 //                        m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final dest is x={0} y={1} {2}@{3}",
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index e168566..c16dee2 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -652,8 +652,11 @@
 
 
 [EntityTransfer]
-    ; The maximum distance in regions that an agent is allowed to teleport along the x or y axis
-    ; This is set to 16383 because current viewers can't handle teleports that are greater than this distance
+    ; The maximum distance in regions that an agent is allowed to teleport 
+    ; along the x or y axis. This is set to 16383 because current viewers 
+    ; can't handle teleports that are greater than this distance
+    ; Setting to 0 will allow teleports of any distance
+    ;
     max_distance = 16383
 
     ; Minimum user level required for HyperGrid teleports
-- 
cgit v1.1


From 2d7adcb22fdd349b819ac4ffc85029a7664406cc Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 12 Sep 2013 13:07:18 -0700
Subject: BulletSim: update DLLs and SOs to disable Bullet's internal
 profiling.

This was accidentily left on. This version should make performance better
and fix the memory leak.
---
 bin/lib32/BulletSim.dll   | Bin 1096192 -> 1093632 bytes
 bin/lib32/libBulletSim.so | Bin 2342970 -> 2332216 bytes
 bin/lib64/BulletSim.dll   | Bin 1233920 -> 1230848 bytes
 bin/lib64/libBulletSim.so | Bin 2520691 -> 2522559 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index e344f84..7c16cb5 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 94e1682..3d2737b 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 31949c8..3afdf63 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 399f4f8..6a17848 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1


From 07d6a0385fdbb0559a878f0884505459e08e7867 Mon Sep 17 00:00:00 2001
From: Talun
Date: Tue, 10 Sep 2013 10:56:34 +0100
Subject: 6762: llList2Key fails to convert a string in a list to a key

llGetPrimitiveParams changed to return the sculpty key as an LSL_String so
that type checking in llList2Key will work
---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 34e2b4d..924f4d9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8483,7 +8483,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 break;
 
                             case ScriptBaseClass.PRIM_TYPE_SCULPT:
-                                res.Add(Shape.SculptTexture.ToString());
+                                res.Add(new LSL_String(Shape.SculptTexture.ToString()));
                                 res.Add(new LSL_Integer(Shape.SculptType));
                                 break;
 
-- 
cgit v1.1


From 53de6d94ea5e80b873864be32f1781bc2f7017c9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 12 Sep 2013 23:38:50 +0100
Subject: minor: replace spaces with tabs for see_into_region setting

---
 bin/OpenSimDefaults.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index c16dee2..7954a14 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -86,8 +86,8 @@
     ;; 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
+    ;; 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.
-- 
cgit v1.1


From 1c7accf9500250abad243eaeb6f6baadf7644e78 Mon Sep 17 00:00:00 2001
From: teravus
Date: Sat, 24 Aug 2013 05:55:53 -0500
Subject: * Fix a null ref that causes a stack unwind when crossing borders. 
 Less stack unwinding..   the faster it goes. * Tweak XEngine so that it's
 partially functional again.    It's still not great, but basic things work.
 (cherry picked from commit 01c3be27460fd3f28efd17b8d6606b883350f653)

---
 .../CoreModules/Avatar/Combat/CombatModule.cs      |  2 +
 .../ScriptEngine/Shared/Instance/ScriptInstance.cs |  3 +-
 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs     | 56 +++++++++++++++++-----
 3 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index 343cdb5..c52d586 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -182,6 +182,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
             try
             {
                 ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+                if (obj == null)
+                    return;
                 if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0
                     || avatar.Scene.RegionInfo.RegionSettings.AllowDamage)
                 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 2fb073d..275b608 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -231,6 +231,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 ItemID = ScriptTask.ItemID;
                 AssetID = ScriptTask.AssetID;
             }
+            LocalID = part.LocalId;
 
             PrimName = part.ParentGroup.Name;
             StartParam = startParam;
@@ -1240,4 +1241,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 9d1e143..27d7674 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1316,13 +1316,21 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
             ScriptInstance instance = null;
             // Create the object record
+            UUID appDomain = assetID;
+           
+
+          
             lockScriptsForRead(true);
             if ((!m_Scripts.ContainsKey(itemID)) ||
                 (m_Scripts[itemID].AssetID != assetID))
             {
                 lockScriptsForRead(false);
-
-                UUID appDomain = assetID;
+  instance = new ScriptInstance(this, part,
+                                          item,
+                                          startParam, postOnRez,
+                                          m_MaxScriptQueue);
+                
+                
 
                 if (part.ParentGroup.IsAttachment)
                     appDomain = part.ParentGroup.RootPart.UUID;
@@ -1345,9 +1353,39 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                             sandbox = AppDomain.CreateDomain(
                                             m_Scene.RegionInfo.RegionID.ToString(),
                                             evidence, appSetup);
-                            m_AppDomains[appDomain].AssemblyResolve +=
-                                new ResolveEventHandler(
-                                    AssemblyResolver.OnAssemblyResolve);
+                            if (m_AppDomains.ContainsKey(appDomain))
+                            {
+                                m_AppDomains[appDomain].AssemblyResolve +=
+                                    new ResolveEventHandler(
+                                        AssemblyResolver.OnAssemblyResolve);
+                                if (m_DomainScripts.ContainsKey(appDomain))
+                                {
+                                    m_DomainScripts[appDomain].Add(itemID);
+                                }
+                                else
+                                {
+                                    m_DomainScripts.Add(appDomain, new List<UUID>());
+                                    m_DomainScripts[appDomain].Add(itemID);
+                                }
+                            }
+                            else
+                            {
+                                m_AppDomains.Add(appDomain, sandbox);
+                                m_AppDomains[appDomain].AssemblyResolve +=
+                                    new ResolveEventHandler(
+                                        AssemblyResolver.OnAssemblyResolve);
+                                if (m_DomainScripts.ContainsKey(appDomain))
+                                {
+                                    m_DomainScripts[appDomain].Add(itemID);
+                                }
+                                else
+                                {
+                                    m_DomainScripts.Add(appDomain, new List<UUID>());
+                                    m_DomainScripts[appDomain].Add(itemID);
+                                }
+
+                            }
+
                         }
                         else
                         {
@@ -1373,12 +1411,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                         return false;
                     }
                 }
-                m_DomainScripts[appDomain].Add(itemID);
-
-                instance = new ScriptInstance(this, part,
-                                              item,
-                                              startParam, postOnRez,
-                                              m_MaxScriptQueue);
+                
 
                 instance.Load(m_AppDomains[appDomain], assembly, stateSource);
 //                m_log.DebugFormat(
@@ -1502,6 +1535,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             if (handlerObjectRemoved != null)
             {
                 SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);                    
+                if (part != null)
                 handlerObjectRemoved(part.UUID);
             }
 
-- 
cgit v1.1


From 120b6948ed873a3af7713b411b956b8cb4c7f516 Mon Sep 17 00:00:00 2001
From: teravus
Date: Sat, 24 Aug 2013 18:55:21 -0500
Subject: * This fixes the border crossing offsets by storing the final
 keyframe location in the hijacked variable KeyFrame.AngularVelocity.  When
 steps in OnTimer <= 0.0, normalize the final position by Constants.RegionSize
 and move the object there.    The hack here is KeyFrame.AngularVelocity
 probably isn't the right name for this variable because it's the un-mucked
 with keyframe position.    When you determine the feasibility of changing the
 name without affecting the serialization of existing objects in world...  
 It's simply a name change to KeyFrame.FinalPosition or something proper.
 (cherry picked from commit e0399ccaec68889c12e4679b4d62142b49b379df)

---
 OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 24 +++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index 29652aa..4d153da 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -498,6 +498,7 @@ namespace OpenSim.Region.Framework.Scenes
                         k.Position = pos;
 //                        k.Velocity = Vector3.Zero;
                     }
+                    k.AngularVelocity = (Vector3)k.Position;
 
                     k.StartRotation = rot;
                     if (k.Rotation.HasValue)
@@ -632,13 +633,13 @@ namespace OpenSim.Region.Framework.Scenes
 
             // Do the frame processing
             double steps = (double)m_currentFrame.TimeMS / tickDuration;
-
+            
             if (steps <= 0.0)
             {
                 m_group.RootPart.Velocity = Vector3.Zero;
                 m_group.RootPart.AngularVelocity = Vector3.Zero;
 
-                m_nextPosition = (Vector3)m_currentFrame.Position;
+                m_nextPosition = NormalizeVector(m_currentFrame.AngularVelocity);
                 m_group.AbsolutePosition = m_nextPosition;
 
                 // we are sending imediate updates, no doing force a extra terseUpdate
@@ -726,7 +727,26 @@ namespace OpenSim.Region.Framework.Scenes
                 m_group.SendGroupRootTerseUpdate();
             }
         }
+        private Vector3 NormalizeVector(Vector3? pPosition)
+        {
+            if (pPosition == null)
+                return Vector3.Zero;
+
+            Vector3 tmp = (Vector3) pPosition;
 
+            while (tmp.X > Constants.RegionSize)
+                tmp.X -= Constants.RegionSize;
+            while (tmp.X < 0)
+                tmp.X += Constants.RegionSize;
+            while (tmp.Y > Constants.RegionSize)
+                tmp.Y -= Constants.RegionSize;
+            while (tmp.Y < 0)
+                tmp.Y += Constants.RegionSize;
+
+            return tmp;
+
+            
+        }
         public Byte[] Serialize()
         {
             StopTimer();
-- 
cgit v1.1


From 3f0fa9f707e7e09f6dd9ad0becad18d5ffa4cb7b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 16 Sep 2013 19:45:42 +0100
Subject: To avoid viewers (particularly on the Hypergrid) from permanently
 caching a UUID -> "Unknown User" binding, drop the binding request rather
 than replying with "Unknown User"

By not binding UUID -> "Unknown User", we leave open the possibility that the binding may be correctly resolved at a later time, which can still happen in some Hypergrid situations.
Observed behaviour of LL viewer 3.3.4 is that a dropped bind request is not retried until the next session.
---
 .../UserManagement/UserManagementModule.cs         | 77 ++++++++++++----------
 1 file changed, 42 insertions(+), 35 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 8c983e6..25e8d69 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -178,17 +178,20 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 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);
 
+                    // As least upto September 2013, clients permanently cache UUID -> Name bindings.  Some clients
+                    // appear to clear this when the user asks it to clear the cache, but others may not.
+                    //
+                    // So to avoid clients
+                    // (particularly Hypergrid clients) permanently binding "Unknown User" to a given UUID, we will 
+                    // instead drop the request entirely.
+                    if (TryGetUserNames(uuid, names))
                         client.SendNameReply(uuid, names[0], names[1]);
-                    }
+//                    else
+//                        m_log.DebugFormat(
+//                            "[USER MANAGEMENT MODULE]: No bound name for {0} found, ignoring request from {1}", 
+//                            uuid, client.Name);
                 });
-
             }
         }
 
@@ -391,7 +394,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 }
 
                 names[0] = "Unknown";
-                names[1] = "UserUMMTGUN8";
+                names[1] = "UserUMMTGUN9";
 
                 return false;
             }
@@ -539,7 +542,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             AddUser(uuid, homeURL + ";" + first + " " + last);
         }
 
-        public void AddUser (UUID id, string creatorData)
+        public void AddUser(UUID id, string creatorData)
         {
             //m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, creatorData {1}", id, creatorData);
 
@@ -549,24 +552,24 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
             if (oldUser != null)
             {
-                if (creatorData == null || creatorData == String.Empty)
-                {
-                    //ignore updates without creator data
-                    return;
-                }
-
-                //try update unknown users, but don't update anyone else
-                if (oldUser.FirstName == "Unknown" && !creatorData.Contains("Unknown")) 
-                {
-                    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
-                {
+//                if (creatorData == null || creatorData == String.Empty)
+//                {
+//                    //ignore updates without creator data
+//                    return;
+//                }
+//
+//                //try update unknown users, but don't update anyone else
+//                if (oldUser.FirstName == "Unknown" && !creatorData.Contains("Unknown")) 
+//                {
+//                    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
+//                {
                     //we have already a valid user within the cache
                     return;
-                }
+//                }
             }
 
             UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, id);
@@ -602,15 +605,19 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     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";
-                }
+
+                // To avoid issues with clients, particularly Hypergrid ones, permanently caching
+                // UUID -> "Unknown User" name bindings, elsewhere we will drop such requests rather than replying.
+                // This also means that we cannot add an unknown user binding to the cache here.
+//                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);
             }
-- 
cgit v1.1


From 60cf42cb8dda3931c87267c989eb7bb9abe5da2f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 16 Sep 2013 22:56:08 +0100
Subject: Make llGetLinkPrimitiveParams() abort and return existing list of
 params when it encounters an invalid link number, rather than throwing an
 exception

Addresses http://opensimulator.org/mantis/view.php?id=6768
Thanks to talun for the patch on that commit - in the end I took a different approach that also deals with invalid PRIM_LINK_TARGET
However, not yet generating the same warning on invalid PRIM_LINK_TARGET as seen on LL grid
This commit also adds regression tests for some cases of llGetLinkPrimitiveParams()
---
 .../Shared/Api/Implementation/LSL_Api.cs           |  13 +-
 .../Shared/Tests/LSL_ApiObjectTests.cs             | 385 +++++++++++++++++++++
 .../ScriptEngine/Shared/Tests/LSL_ApiTest.cs       | 238 +------------
 3 files changed, 397 insertions(+), 239 deletions(-)
 create mode 100644 OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 924f4d9..bd451a5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8190,6 +8190,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             while (true)
             {
+//                m_log.DebugFormat(
+//                    "[LSL API]: GetEntityParams has {0} rules with scene entity named {1}", 
+//                    rules.Length, entity != null ? entity.Name : "NULL");
+
+                if (entity == null)
+                    return result;
+
                 if (entity is SceneObjectPart)
                     remaining = GetPrimParams((SceneObjectPart)entity, rules, ref result);
                 else
@@ -8400,7 +8407,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             while (idx < rules.Length)
             {
                 int code = (int)rules.GetLSLIntegerItem(idx++);
-                int remain = rules.Length-idx;
+                int remain = rules.Length - idx;
 
                 switch (code)
                 {
@@ -8777,7 +8784,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         ));
                         break;
                     case (int)ScriptBaseClass.PRIM_LINK_TARGET:
-                        if(remain < 3)
+
+                        // TODO: Should be issuing a runtime script warning in this case.
+                        if (remain < 3)
                             return null;
 
                         return rules.GetSublist(idx, -1);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
new file mode 100644
index 0000000..ff87cc1
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
@@ -0,0 +1,385 @@
+/*
+ * 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 log4net;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenMetaverse.Assets;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Region.CoreModules.Avatar.AvatarFactory;
+using OpenSim.Region.OptionalModules.World.NPC;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.ScriptEngine.Shared;
+using OpenSim.Region.ScriptEngine.Shared.Api;
+using OpenSim.Region.ScriptEngine.Shared.Instance;
+using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
+using OpenSim.Services.Interfaces;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
+using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
+
+namespace OpenSim.Region.ScriptEngine.Shared.Tests
+{
+    [TestFixture]
+    public class LSL_ApiObjectTests : OpenSimTestCase
+    {
+        private const double VECTOR_COMPONENT_ACCURACY = 0.0000005d;
+        private const float FLOAT_ACCURACY = 0.00005f;
+
+        protected Scene m_scene;
+        protected XEngine.XEngine m_engine;
+
+        [SetUp]
+        public override void SetUp()
+        {
+            base.SetUp();
+
+            IConfigSource initConfigSource = new IniConfigSource();
+            IConfig config = initConfigSource.AddConfig("XEngine");
+            config.Set("Enabled", "true");
+
+            m_scene = new SceneHelpers().SetupScene();
+            SceneHelpers.SetupSceneModules(m_scene, initConfigSource);
+
+            m_engine = new XEngine.XEngine();
+            m_engine.Initialise(initConfigSource);
+            m_engine.AddRegion(m_scene);
+        }
+
+        [Test]
+        public void TestllGetLinkPrimitiveParams()
+        {
+            TestHelpers.InMethod();
+            TestHelpers.EnableLogging();
+
+            UUID ownerId = TestHelpers.ParseTail(0x1);
+
+            SceneObjectGroup grp1 = SceneHelpers.CreateSceneObject(2, ownerId, "grp1-", 0x10);
+            grp1.AbsolutePosition = new Vector3(10, 11, 12);
+            m_scene.AddSceneObject(grp1);
+
+            LSL_Api apiGrp1 = new LSL_Api();
+            apiGrp1.Initialize(m_engine, grp1.RootPart, null, null);
+
+            // Check simple 1 prim case
+            {
+                LSL_List resList 
+                    = apiGrp1.llGetLinkPrimitiveParams(1, new LSL_List(new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
+
+                Assert.That(resList.Length, Is.EqualTo(1));
+            }
+
+            // Check invalid parameters are ignored
+            {
+                LSL_List resList 
+                    = apiGrp1.llGetLinkPrimitiveParams(3, new LSL_List(new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
+
+                Assert.That(resList.Length, Is.EqualTo(0));
+            }
+
+            // Check all parameters are ignored if an initial bad link is given
+            {
+                LSL_List resList 
+                    = apiGrp1.llGetLinkPrimitiveParams(
+                        3, 
+                        new LSL_List(
+                            new LSL_Integer(ScriptBaseClass.PRIM_ROTATION), 
+                            new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET),
+                            new LSL_Integer(1),
+                            new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
+
+                Assert.That(resList.Length, Is.EqualTo(0));
+            }
+
+            // Check only subsequent parameters are ignored when we hit the first bad link number
+            {
+                LSL_List resList 
+                    = apiGrp1.llGetLinkPrimitiveParams(
+                        1, 
+                        new LSL_List(
+                            new LSL_Integer(ScriptBaseClass.PRIM_ROTATION), 
+                            new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET),
+                            new LSL_Integer(3),
+                            new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
+
+                Assert.That(resList.Length, Is.EqualTo(1));
+            }
+        }
+
+        [Test]
+        // llSetPrimitiveParams and llGetPrimitiveParams test.
+        public void TestllSetPrimitiveParams()
+        {
+            TestHelpers.InMethod();
+
+            // Create Prim1.
+            Scene scene = new SceneHelpers().SetupScene();
+            string obj1Name = "Prim1";
+            UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001");
+            SceneObjectPart part1 =
+                new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default,
+                Vector3.Zero, Quaternion.Identity,
+                Vector3.Zero) { Name = obj1Name, UUID = objUuid };
+            Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part1), false), Is.True);
+
+            LSL_Api apiGrp1 = new LSL_Api();
+            apiGrp1.Initialize(m_engine, part1, null, null);
+
+            // Note that prim hollow check is passed with the other prim params in order to allow the
+            // specification of a different check value from the prim param. A cylinder, prism, sphere,
+            // torus or ring, with a hole shape of square, is limited to a hollow of 70%. Test 5 below
+            // specifies a value of 95% and checks to see if 70% was properly returned.
+
+            // Test a sphere.
+            CheckllSetPrimitiveParams(
+                apiGrp1,
+                "test 1",                                   // Prim test identification string
+                new LSL_Types.Vector3(6.0d, 9.9d, 9.9d),    // Prim size
+                ScriptBaseClass.PRIM_TYPE_SPHERE,           // Prim type
+                ScriptBaseClass.PRIM_HOLE_DEFAULT,          // Prim hole type
+                new LSL_Types.Vector3(0.0d, 0.075d, 0.0d),  // Prim cut
+                0.80f,                                      // Prim hollow
+                new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim twist
+                new LSL_Types.Vector3(0.32d, 0.76d, 0.0d),  // Prim dimple
+                0.80f);                                     // Prim hollow check
+
+            // Test a prism.
+            CheckllSetPrimitiveParams(
+                apiGrp1,
+                "test 2",                                   // Prim test identification string
+                new LSL_Types.Vector3(3.5d, 3.5d, 3.5d),    // Prim size
+                ScriptBaseClass.PRIM_TYPE_PRISM,            // Prim type
+                ScriptBaseClass.PRIM_HOLE_CIRCLE,           // Prim hole type
+                new LSL_Types.Vector3(0.0d, 1.0d, 0.0d),    // Prim cut
+                0.90f,                                      // Prim hollow
+                new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim twist
+                new LSL_Types.Vector3(2.0d, 1.0d, 0.0d),    // Prim taper 
+                new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim shear
+                0.90f);                                     // Prim hollow check
+
+            // Test a box.
+            CheckllSetPrimitiveParams(
+                apiGrp1,
+                "test 3",                                   // Prim test identification string
+                new LSL_Types.Vector3(3.5d, 3.5d, 3.5d),    // Prim size
+                ScriptBaseClass.PRIM_TYPE_BOX,              // Prim type
+                ScriptBaseClass.PRIM_HOLE_TRIANGLE,         // Prim hole type
+                new LSL_Types.Vector3(0.0d, 1.0d, 0.0d),    // Prim cut
+                0.95f,                                      // Prim hollow
+                new LSL_Types.Vector3(1.0d, 0.0d, 0.0d),    // Prim twist
+                new LSL_Types.Vector3(1.0d, 1.0d, 0.0d),    // Prim taper 
+                new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim shear
+                0.95f);                                     // Prim hollow check
+
+            // Test a tube.
+            CheckllSetPrimitiveParams(
+                apiGrp1,
+                "test 4",                                   // Prim test identification string
+                new LSL_Types.Vector3(4.2d, 4.2d, 4.2d),    // Prim size
+                ScriptBaseClass.PRIM_TYPE_TUBE,             // Prim type
+                ScriptBaseClass.PRIM_HOLE_SQUARE,           // Prim hole type
+                new LSL_Types.Vector3(0.0d, 1.0d, 0.0d),    // Prim cut
+                0.00f,                                      // Prim hollow
+                new LSL_Types.Vector3(1.0d, -1.0d, 0.0d),   // Prim twist
+                new LSL_Types.Vector3(1.0d, 0.05d, 0.0d),   // Prim hole size
+                // Expression for y selected to test precision problems during byte
+                // cast in SetPrimitiveShapeParams.
+                new LSL_Types.Vector3(0.0d, 0.35d + 0.1d, 0.0d),    // Prim shear
+                new LSL_Types.Vector3(0.0d, 1.0d, 0.0d),    // Prim profile cut
+                // Expression for y selected to test precision problems during sbyte
+                // cast in SetPrimitiveShapeParams.
+                new LSL_Types.Vector3(-1.0d, 0.70d + 0.1d + 0.1d, 0.0d),    // Prim taper
+                1.11f,                                      // Prim revolutions
+                0.88f,                                      // Prim radius
+                0.95f,                                      // Prim skew
+                0.00f);                                     // Prim hollow check
+
+            // Test a prism.
+            CheckllSetPrimitiveParams(
+                apiGrp1,
+                "test 5",                                   // Prim test identification string
+                new LSL_Types.Vector3(3.5d, 3.5d, 3.5d),    // Prim size
+                ScriptBaseClass.PRIM_TYPE_PRISM,            // Prim type
+                ScriptBaseClass.PRIM_HOLE_SQUARE,           // Prim hole type
+                new LSL_Types.Vector3(0.0d, 1.0d, 0.0d),    // Prim cut
+                0.95f,                                      // Prim hollow
+                // Expression for x selected to test precision problems during sbyte
+                // cast in SetPrimitiveShapeBlockParams.
+                new LSL_Types.Vector3(0.7d + 0.2d, 0.0d, 0.0d),     // Prim twist
+                // Expression for y selected to test precision problems during sbyte
+                // cast in SetPrimitiveShapeParams.
+                new LSL_Types.Vector3(2.0d, (1.3d + 0.1d), 0.0d),   // Prim taper 
+                new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim shear
+                0.70f);                                     // Prim hollow check
+
+            // Test a sculpted prim.
+            CheckllSetPrimitiveParams(
+                apiGrp1,
+                "test 6",                                   // Prim test identification string
+                new LSL_Types.Vector3(2.0d, 2.0d, 2.0d),    // Prim size
+                ScriptBaseClass.PRIM_TYPE_SCULPT,           // Prim type
+                "be293869-d0d9-0a69-5989-ad27f1946fd4",     // Prim map
+                ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE);   // Prim sculpt type
+        }
+
+        // Set prim params for a box, cylinder or prism and check results.
+        public void CheckllSetPrimitiveParams(LSL_Api api, string primTest,
+            LSL_Types.Vector3 primSize, int primType, int primHoleType, LSL_Types.Vector3 primCut,
+            float primHollow, LSL_Types.Vector3 primTwist, LSL_Types.Vector3 primTaper, LSL_Types.Vector3 primShear,
+            float primHollowCheck)
+        {
+            // Set the prim params.
+            api.llSetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, primSize,
+                ScriptBaseClass.PRIM_TYPE, primType, primHoleType,
+                primCut, primHollow, primTwist, primTaper, primShear));
+
+            // Get params for prim to validate settings.
+            LSL_Types.list primParams =
+                api.llGetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, ScriptBaseClass.PRIM_TYPE));
+
+            // Validate settings.
+            CheckllSetPrimitiveParamsVector(primSize, api.llList2Vector(primParams, 0), primTest + " prim size");
+            Assert.AreEqual(primType, api.llList2Integer(primParams, 1),
+                "TestllSetPrimitiveParams " + primTest + " prim type check fail");
+            Assert.AreEqual(primHoleType, api.llList2Integer(primParams, 2),
+                "TestllSetPrimitiveParams " + primTest + " prim hole default check fail");
+            CheckllSetPrimitiveParamsVector(primCut, api.llList2Vector(primParams, 3), primTest + " prim cut");
+            Assert.AreEqual(primHollowCheck, api.llList2Float(primParams, 4), FLOAT_ACCURACY,
+                "TestllSetPrimitiveParams " + primTest + " prim hollow check fail");
+            CheckllSetPrimitiveParamsVector(primTwist, api.llList2Vector(primParams, 5), primTest + " prim twist");
+            CheckllSetPrimitiveParamsVector(primTaper, api.llList2Vector(primParams, 6), primTest + " prim taper");
+            CheckllSetPrimitiveParamsVector(primShear, api.llList2Vector(primParams, 7), primTest + " prim shear");
+        }
+
+        // Set prim params for a sphere and check results.
+        public void CheckllSetPrimitiveParams(LSL_Api api, string primTest,
+            LSL_Types.Vector3 primSize, int primType, int primHoleType, LSL_Types.Vector3 primCut,
+            float primHollow, LSL_Types.Vector3 primTwist, LSL_Types.Vector3 primDimple, float primHollowCheck)
+        {
+            // Set the prim params.
+            api.llSetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, primSize,
+                ScriptBaseClass.PRIM_TYPE, primType, primHoleType,
+                primCut, primHollow, primTwist, primDimple));
+
+            // Get params for prim to validate settings.
+            LSL_Types.list primParams =
+                api.llGetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, ScriptBaseClass.PRIM_TYPE));
+
+            // Validate settings.
+            CheckllSetPrimitiveParamsVector(primSize, api.llList2Vector(primParams, 0), primTest + " prim size");
+            Assert.AreEqual(primType, api.llList2Integer(primParams, 1),
+                "TestllSetPrimitiveParams " + primTest + " prim type check fail");
+            Assert.AreEqual(primHoleType, api.llList2Integer(primParams, 2),
+                "TestllSetPrimitiveParams " + primTest + " prim hole default check fail");
+            CheckllSetPrimitiveParamsVector(primCut, api.llList2Vector(primParams, 3), primTest + " prim cut");
+            Assert.AreEqual(primHollowCheck, api.llList2Float(primParams, 4), FLOAT_ACCURACY,
+                "TestllSetPrimitiveParams " + primTest + " prim hollow check fail");
+            CheckllSetPrimitiveParamsVector(primTwist, api.llList2Vector(primParams, 5), primTest + " prim twist");
+            CheckllSetPrimitiveParamsVector(primDimple, api.llList2Vector(primParams, 6), primTest + " prim dimple");
+        }
+
+        // Set prim params for a torus, tube or ring and check results.
+        public void CheckllSetPrimitiveParams(LSL_Api api, string primTest,
+            LSL_Types.Vector3 primSize, int primType, int primHoleType, LSL_Types.Vector3 primCut,
+            float primHollow, LSL_Types.Vector3 primTwist, LSL_Types.Vector3 primHoleSize,
+            LSL_Types.Vector3 primShear, LSL_Types.Vector3 primProfCut, LSL_Types.Vector3 primTaper,
+            float primRev, float primRadius, float primSkew, float primHollowCheck)
+        {
+            // Set the prim params.
+            api.llSetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, primSize,
+                ScriptBaseClass.PRIM_TYPE, primType, primHoleType,
+                primCut, primHollow, primTwist, primHoleSize, primShear, primProfCut,
+                primTaper, primRev, primRadius, primSkew));
+
+            // Get params for prim to validate settings.
+            LSL_Types.list primParams =
+                api.llGetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, ScriptBaseClass.PRIM_TYPE));
+
+            // Valdate settings.
+            CheckllSetPrimitiveParamsVector(primSize, api.llList2Vector(primParams, 0), primTest + " prim size");
+            Assert.AreEqual(primType, api.llList2Integer(primParams, 1),
+                "TestllSetPrimitiveParams " + primTest + " prim type check fail");
+            Assert.AreEqual(primHoleType, api.llList2Integer(primParams, 2),
+                "TestllSetPrimitiveParams " + primTest + " prim hole default check fail");
+            CheckllSetPrimitiveParamsVector(primCut, api.llList2Vector(primParams, 3), primTest + " prim cut");
+            Assert.AreEqual(primHollowCheck, api.llList2Float(primParams, 4), FLOAT_ACCURACY,
+                "TestllSetPrimitiveParams " + primTest + " prim hollow check fail");
+            CheckllSetPrimitiveParamsVector(primTwist, api.llList2Vector(primParams, 5), primTest + " prim twist");
+            CheckllSetPrimitiveParamsVector(primHoleSize, api.llList2Vector(primParams, 6), primTest + " prim hole size");
+            CheckllSetPrimitiveParamsVector(primShear, api.llList2Vector(primParams, 7), primTest + " prim shear");
+            CheckllSetPrimitiveParamsVector(primProfCut, api.llList2Vector(primParams, 8), primTest + " prim profile cut");
+            CheckllSetPrimitiveParamsVector(primTaper, api.llList2Vector(primParams, 9), primTest + " prim taper");
+            Assert.AreEqual(primRev, api.llList2Float(primParams, 10), FLOAT_ACCURACY,
+                "TestllSetPrimitiveParams " + primTest + " prim revolutions fail");
+            Assert.AreEqual(primRadius, api.llList2Float(primParams, 11), FLOAT_ACCURACY,
+                "TestllSetPrimitiveParams " + primTest + " prim radius fail");
+            Assert.AreEqual(primSkew, api.llList2Float(primParams, 12), FLOAT_ACCURACY,
+                "TestllSetPrimitiveParams " + primTest + " prim skew fail");
+        }
+
+        // Set prim params for a sculpted prim and check results.
+        public void CheckllSetPrimitiveParams(LSL_Api api, string primTest,
+            LSL_Types.Vector3 primSize, int primType, string primMap, int primSculptType)
+        {
+            // Set the prim params.
+            api.llSetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, primSize,
+                ScriptBaseClass.PRIM_TYPE, primType, primMap, primSculptType));
+
+            // Get params for prim to validate settings.
+            LSL_Types.list primParams =
+                api.llGetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, ScriptBaseClass.PRIM_TYPE));
+
+            // Validate settings.
+            CheckllSetPrimitiveParamsVector(primSize, api.llList2Vector(primParams, 0), primTest + " prim size");
+            Assert.AreEqual(primType, api.llList2Integer(primParams, 1),
+                "TestllSetPrimitiveParams " + primTest + " prim type check fail");
+            Assert.AreEqual(primMap, (string)api.llList2String(primParams, 2),
+                "TestllSetPrimitiveParams " + primTest + " prim map check fail");
+            Assert.AreEqual(primSculptType, api.llList2Integer(primParams, 3),
+                "TestllSetPrimitiveParams " + primTest + " prim type scuplt check fail");
+        }
+
+        public void CheckllSetPrimitiveParamsVector(LSL_Types.Vector3 vecCheck, LSL_Types.Vector3 vecReturned, string msg)
+        {
+            // Check each vector component against expected result.
+            Assert.AreEqual(vecCheck.x, vecReturned.x, VECTOR_COMPONENT_ACCURACY,
+                "TestllSetPrimitiveParams " + msg + " vector check fail on x component");
+            Assert.AreEqual(vecCheck.y, vecReturned.y, VECTOR_COMPONENT_ACCURACY,
+                "TestllSetPrimitiveParams " + msg + " vector check fail on y component");
+            Assert.AreEqual(vecCheck.z, vecReturned.z, VECTOR_COMPONENT_ACCURACY,
+                "TestllSetPrimitiveParams " + msg + " vector check fail on z component");
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
index e97ae06..7e3726a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -47,9 +47,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
     [TestFixture, LongRunning]
     public class LSL_ApiTest
     {
-        private const double ANGLE_ACCURACY_IN_RADIANS = 1E-6;
         private const double VECTOR_COMPONENT_ACCURACY = 0.0000005d;
-        private const float FLOAT_ACCURACY = 0.00005f;
+        private const double ANGLE_ACCURACY_IN_RADIANS = 1E-6;
         private LSL_Api m_lslApi;
 
         [SetUp]
@@ -255,241 +254,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         }
 
         [Test]
-        // llSetPrimitiveParams and llGetPrimitiveParams test.
-        public void TestllSetPrimitiveParams()
-        {
-            TestHelpers.InMethod();
-
-            // Create Prim1.
-            Scene scene = new SceneHelpers().SetupScene();
-            string obj1Name = "Prim1";
-            UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001");
-            SceneObjectPart part1 =
-                new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default,
-                Vector3.Zero, Quaternion.Identity,
-                Vector3.Zero) { Name = obj1Name, UUID = objUuid };
-            Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part1), false), Is.True);
-
-            // Note that prim hollow check is passed with the other prim params in order to allow the
-            // specification of a different check value from the prim param. A cylinder, prism, sphere,
-            // torus or ring, with a hole shape of square, is limited to a hollow of 70%. Test 5 below
-            // specifies a value of 95% and checks to see if 70% was properly returned.
-
-            // Test a sphere.
-            CheckllSetPrimitiveParams(
-                "test 1",                                   // Prim test identification string
-                new LSL_Types.Vector3(6.0d, 9.9d, 9.9d),    // Prim size
-                ScriptBaseClass.PRIM_TYPE_SPHERE,           // Prim type
-                ScriptBaseClass.PRIM_HOLE_DEFAULT,          // Prim hole type
-                new LSL_Types.Vector3(0.0d, 0.075d, 0.0d),  // Prim cut
-                0.80f,                                      // Prim hollow
-                new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim twist
-                new LSL_Types.Vector3(0.32d, 0.76d, 0.0d),  // Prim dimple
-                0.80f);                                     // Prim hollow check
-
-            // Test a prism.
-            CheckllSetPrimitiveParams(
-                "test 2",                                   // Prim test identification string
-                new LSL_Types.Vector3(3.5d, 3.5d, 3.5d),    // Prim size
-                ScriptBaseClass.PRIM_TYPE_PRISM,            // Prim type
-                ScriptBaseClass.PRIM_HOLE_CIRCLE,           // Prim hole type
-                new LSL_Types.Vector3(0.0d, 1.0d, 0.0d),    // Prim cut
-                0.90f,                                      // Prim hollow
-                new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim twist
-                new LSL_Types.Vector3(2.0d, 1.0d, 0.0d),    // Prim taper 
-                new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim shear
-                0.90f);                                     // Prim hollow check
-
-            // Test a box.
-            CheckllSetPrimitiveParams(
-                "test 3",                                   // Prim test identification string
-                new LSL_Types.Vector3(3.5d, 3.5d, 3.5d),    // Prim size
-                ScriptBaseClass.PRIM_TYPE_BOX,              // Prim type
-                ScriptBaseClass.PRIM_HOLE_TRIANGLE,         // Prim hole type
-                new LSL_Types.Vector3(0.0d, 1.0d, 0.0d),    // Prim cut
-                0.95f,                                      // Prim hollow
-                new LSL_Types.Vector3(1.0d, 0.0d, 0.0d),    // Prim twist
-                new LSL_Types.Vector3(1.0d, 1.0d, 0.0d),    // Prim taper 
-                new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim shear
-                0.95f);                                     // Prim hollow check
-
-            // Test a tube.
-            CheckllSetPrimitiveParams(
-                "test 4",                                   // Prim test identification string
-                new LSL_Types.Vector3(4.2d, 4.2d, 4.2d),    // Prim size
-                ScriptBaseClass.PRIM_TYPE_TUBE,             // Prim type
-                ScriptBaseClass.PRIM_HOLE_SQUARE,           // Prim hole type
-                new LSL_Types.Vector3(0.0d, 1.0d, 0.0d),    // Prim cut
-                0.00f,                                      // Prim hollow
-                new LSL_Types.Vector3(1.0d, -1.0d, 0.0d),   // Prim twist
-                new LSL_Types.Vector3(1.0d, 0.05d, 0.0d),   // Prim hole size
-                // Expression for y selected to test precision problems during byte
-                // cast in SetPrimitiveShapeParams.
-                new LSL_Types.Vector3(0.0d, 0.35d + 0.1d, 0.0d),    // Prim shear
-                new LSL_Types.Vector3(0.0d, 1.0d, 0.0d),    // Prim profile cut
-                // Expression for y selected to test precision problems during sbyte
-                // cast in SetPrimitiveShapeParams.
-                new LSL_Types.Vector3(-1.0d, 0.70d + 0.1d + 0.1d, 0.0d),    // Prim taper
-                1.11f,                                      // Prim revolutions
-                0.88f,                                      // Prim radius
-                0.95f,                                      // Prim skew
-                0.00f);                                     // Prim hollow check
-
-            // Test a prism.
-            CheckllSetPrimitiveParams(
-                "test 5",                                   // Prim test identification string
-                new LSL_Types.Vector3(3.5d, 3.5d, 3.5d),    // Prim size
-                ScriptBaseClass.PRIM_TYPE_PRISM,            // Prim type
-                ScriptBaseClass.PRIM_HOLE_SQUARE,           // Prim hole type
-                new LSL_Types.Vector3(0.0d, 1.0d, 0.0d),    // Prim cut
-                0.95f,                                      // Prim hollow
-                // Expression for x selected to test precision problems during sbyte
-                // cast in SetPrimitiveShapeBlockParams.
-                new LSL_Types.Vector3(0.7d + 0.2d, 0.0d, 0.0d),     // Prim twist
-                // Expression for y selected to test precision problems during sbyte
-                // cast in SetPrimitiveShapeParams.
-                new LSL_Types.Vector3(2.0d, (1.3d + 0.1d), 0.0d),   // Prim taper 
-                new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim shear
-                0.70f);                                     // Prim hollow check
-
-            // Test a sculpted prim.
-            CheckllSetPrimitiveParams(
-                "test 6",                                   // Prim test identification string
-                new LSL_Types.Vector3(2.0d, 2.0d, 2.0d),    // Prim size
-                ScriptBaseClass.PRIM_TYPE_SCULPT,           // Prim type
-                "be293869-d0d9-0a69-5989-ad27f1946fd4",     // Prim map
-                ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE);   // Prim sculpt type
-        }
-
-        // Set prim params for a box, cylinder or prism and check results.
-        public void CheckllSetPrimitiveParams(string primTest,
-            LSL_Types.Vector3 primSize, int primType, int primHoleType, LSL_Types.Vector3 primCut,
-            float primHollow, LSL_Types.Vector3 primTwist, LSL_Types.Vector3 primTaper, LSL_Types.Vector3 primShear,
-            float primHollowCheck)
-        {
-            // Set the prim params.
-            m_lslApi.llSetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, primSize,
-                ScriptBaseClass.PRIM_TYPE, primType, primHoleType,
-                primCut, primHollow, primTwist, primTaper, primShear));
-
-            // Get params for prim to validate settings.
-            LSL_Types.list primParams =
-                m_lslApi.llGetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, ScriptBaseClass.PRIM_TYPE));
-
-            // Validate settings.
-            CheckllSetPrimitiveParamsVector(primSize, m_lslApi.llList2Vector(primParams, 0), primTest + " prim size");
-            Assert.AreEqual(primType, m_lslApi.llList2Integer(primParams, 1),
-                "TestllSetPrimitiveParams " + primTest + " prim type check fail");
-            Assert.AreEqual(primHoleType, m_lslApi.llList2Integer(primParams, 2),
-                "TestllSetPrimitiveParams " + primTest + " prim hole default check fail");
-            CheckllSetPrimitiveParamsVector(primCut, m_lslApi.llList2Vector(primParams, 3), primTest + " prim cut");
-            Assert.AreEqual(primHollowCheck, m_lslApi.llList2Float(primParams, 4), FLOAT_ACCURACY,
-                "TestllSetPrimitiveParams " + primTest + " prim hollow check fail");
-            CheckllSetPrimitiveParamsVector(primTwist, m_lslApi.llList2Vector(primParams, 5), primTest + " prim twist");
-            CheckllSetPrimitiveParamsVector(primTaper, m_lslApi.llList2Vector(primParams, 6), primTest + " prim taper");
-            CheckllSetPrimitiveParamsVector(primShear, m_lslApi.llList2Vector(primParams, 7), primTest + " prim shear");
-        }
-
-        // Set prim params for a sphere and check results.
-        public void CheckllSetPrimitiveParams(string primTest,
-            LSL_Types.Vector3 primSize, int primType, int primHoleType, LSL_Types.Vector3 primCut,
-            float primHollow, LSL_Types.Vector3 primTwist, LSL_Types.Vector3 primDimple, float primHollowCheck)
-        {
-            // Set the prim params.
-            m_lslApi.llSetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, primSize,
-                ScriptBaseClass.PRIM_TYPE, primType, primHoleType,
-                primCut, primHollow, primTwist, primDimple));
-
-            // Get params for prim to validate settings.
-            LSL_Types.list primParams =
-                m_lslApi.llGetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, ScriptBaseClass.PRIM_TYPE));
-
-            // Validate settings.
-            CheckllSetPrimitiveParamsVector(primSize, m_lslApi.llList2Vector(primParams, 0), primTest + " prim size");
-            Assert.AreEqual(primType, m_lslApi.llList2Integer(primParams, 1),
-                "TestllSetPrimitiveParams " + primTest + " prim type check fail");
-            Assert.AreEqual(primHoleType, m_lslApi.llList2Integer(primParams, 2),
-                "TestllSetPrimitiveParams " + primTest + " prim hole default check fail");
-            CheckllSetPrimitiveParamsVector(primCut, m_lslApi.llList2Vector(primParams, 3), primTest + " prim cut");
-            Assert.AreEqual(primHollowCheck, m_lslApi.llList2Float(primParams, 4), FLOAT_ACCURACY,
-                "TestllSetPrimitiveParams " + primTest + " prim hollow check fail");
-            CheckllSetPrimitiveParamsVector(primTwist, m_lslApi.llList2Vector(primParams, 5), primTest + " prim twist");
-            CheckllSetPrimitiveParamsVector(primDimple, m_lslApi.llList2Vector(primParams, 6), primTest + " prim dimple");
-        }
-
-        // Set prim params for a torus, tube or ring and check results.
-        public void CheckllSetPrimitiveParams(string primTest,
-            LSL_Types.Vector3 primSize, int primType, int primHoleType, LSL_Types.Vector3 primCut,
-            float primHollow, LSL_Types.Vector3 primTwist, LSL_Types.Vector3 primHoleSize,
-            LSL_Types.Vector3 primShear, LSL_Types.Vector3 primProfCut, LSL_Types.Vector3 primTaper,
-            float primRev, float primRadius, float primSkew, float primHollowCheck)
-        {
-            // Set the prim params.
-            m_lslApi.llSetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, primSize,
-                ScriptBaseClass.PRIM_TYPE, primType, primHoleType,
-                primCut, primHollow, primTwist, primHoleSize, primShear, primProfCut,
-                primTaper, primRev, primRadius, primSkew));
-
-            // Get params for prim to validate settings.
-            LSL_Types.list primParams =
-                m_lslApi.llGetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, ScriptBaseClass.PRIM_TYPE));
-
-            // Valdate settings.
-            CheckllSetPrimitiveParamsVector(primSize, m_lslApi.llList2Vector(primParams, 0), primTest + " prim size");
-            Assert.AreEqual(primType, m_lslApi.llList2Integer(primParams, 1),
-                "TestllSetPrimitiveParams " + primTest + " prim type check fail");
-            Assert.AreEqual(primHoleType, m_lslApi.llList2Integer(primParams, 2),
-                "TestllSetPrimitiveParams " + primTest + " prim hole default check fail");
-            CheckllSetPrimitiveParamsVector(primCut, m_lslApi.llList2Vector(primParams, 3), primTest + " prim cut");
-            Assert.AreEqual(primHollowCheck, m_lslApi.llList2Float(primParams, 4), FLOAT_ACCURACY,
-                "TestllSetPrimitiveParams " + primTest + " prim hollow check fail");
-            CheckllSetPrimitiveParamsVector(primTwist, m_lslApi.llList2Vector(primParams, 5), primTest + " prim twist");
-            CheckllSetPrimitiveParamsVector(primHoleSize, m_lslApi.llList2Vector(primParams, 6), primTest + " prim hole size");
-            CheckllSetPrimitiveParamsVector(primShear, m_lslApi.llList2Vector(primParams, 7), primTest + " prim shear");
-            CheckllSetPrimitiveParamsVector(primProfCut, m_lslApi.llList2Vector(primParams, 8), primTest + " prim profile cut");
-            CheckllSetPrimitiveParamsVector(primTaper, m_lslApi.llList2Vector(primParams, 9), primTest + " prim taper");
-            Assert.AreEqual(primRev, m_lslApi.llList2Float(primParams, 10), FLOAT_ACCURACY,
-                "TestllSetPrimitiveParams " + primTest + " prim revolutions fail");
-            Assert.AreEqual(primRadius, m_lslApi.llList2Float(primParams, 11), FLOAT_ACCURACY,
-                "TestllSetPrimitiveParams " + primTest + " prim radius fail");
-            Assert.AreEqual(primSkew, m_lslApi.llList2Float(primParams, 12), FLOAT_ACCURACY,
-                "TestllSetPrimitiveParams " + primTest + " prim skew fail");
-        }
-
-        // Set prim params for a sculpted prim and check results.
-        public void CheckllSetPrimitiveParams(string primTest,
-            LSL_Types.Vector3 primSize, int primType, string primMap, int primSculptType)
-        {
-            // Set the prim params.
-            m_lslApi.llSetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, primSize,
-                ScriptBaseClass.PRIM_TYPE, primType, primMap, primSculptType));
-
-            // Get params for prim to validate settings.
-            LSL_Types.list primParams =
-                m_lslApi.llGetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, ScriptBaseClass.PRIM_TYPE));
-
-            // Validate settings.
-            CheckllSetPrimitiveParamsVector(primSize, m_lslApi.llList2Vector(primParams, 0), primTest + " prim size");
-            Assert.AreEqual(primType, m_lslApi.llList2Integer(primParams, 1),
-                "TestllSetPrimitiveParams " + primTest + " prim type check fail");
-            Assert.AreEqual(primMap, (string)m_lslApi.llList2String(primParams, 2),
-                "TestllSetPrimitiveParams " + primTest + " prim map check fail");
-            Assert.AreEqual(primSculptType, m_lslApi.llList2Integer(primParams, 3),
-                "TestllSetPrimitiveParams " + primTest + " prim type scuplt check fail");
-        }
-
-        public void CheckllSetPrimitiveParamsVector(LSL_Types.Vector3 vecCheck, LSL_Types.Vector3 vecReturned, string msg)
-        {
-            // Check each vector component against expected result.
-            Assert.AreEqual(vecCheck.x, vecReturned.x, VECTOR_COMPONENT_ACCURACY,
-                "TestllSetPrimitiveParams " + msg + " vector check fail on x component");
-            Assert.AreEqual(vecCheck.y, vecReturned.y, VECTOR_COMPONENT_ACCURACY,
-                "TestllSetPrimitiveParams " + msg + " vector check fail on y component");
-            Assert.AreEqual(vecCheck.z, vecReturned.z, VECTOR_COMPONENT_ACCURACY,
-                "TestllSetPrimitiveParams " + msg + " vector check fail on z component");
-        }
-
-        [Test]
         public void TestllVecNorm()
         {
             TestHelpers.InMethod();
-- 
cgit v1.1


From f99dae03cb1f5ab7215de1f7741befc3f0856840 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 16 Sep 2013 23:00:40 +0100
Subject: Fix bug where using PRIM_LINK_TARGET with only two remaining list
 items (e.g. link number then PRIM_ROTATION) would not return the parameter

Extended regression test for this case
---
 .../ScriptEngine/Shared/Api/Implementation/LSL_Api.cs      |  4 ++--
 .../Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index bd451a5..975bf2d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8202,7 +8202,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 else
                     remaining = GetAgentParams((ScenePresence)entity, rules, ref result);
 
-                if (remaining == null || remaining.Length <= 2)
+                if (remaining == null || remaining.Length < 2)
                     return result;
 
                 int linknumber = remaining.GetLSLIntegerItem(0);
@@ -8786,7 +8786,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     case (int)ScriptBaseClass.PRIM_LINK_TARGET:
 
                         // TODO: Should be issuing a runtime script warning in this case.
-                        if (remain < 3)
+                        if (remain < 2)
                             return null;
 
                         return rules.GetSublist(idx, -1);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
index ff87cc1..ed61dc0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
@@ -100,6 +100,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
                 Assert.That(resList.Length, Is.EqualTo(1));
             }
 
+            // Check 2 prim case
+            {
+                LSL_List resList 
+                    = apiGrp1.llGetLinkPrimitiveParams(
+                        1, 
+                        new LSL_List(
+                            new LSL_Integer(ScriptBaseClass.PRIM_ROTATION), 
+                            new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET),
+                            new LSL_Integer(2),
+                            new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
+
+                Assert.That(resList.Length, Is.EqualTo(2));
+            }
+
             // Check invalid parameters are ignored
             {
                 LSL_List resList 
-- 
cgit v1.1


From 2603a2891bd6e4e20d9169c4a74eaabf9b44fba0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 16 Sep 2013 23:26:13 +0100
Subject: Reinsert comments about possible race conditions when sending bulk
 inventory updates on non-flag clothing editing

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index c4b07a5..69b5f43 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -512,6 +512,9 @@ namespace OpenSim.Region.Framework.Scenes
                     // 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.
+                    //
+                    // In other situations we cannot send out a bulk update here, since this will cause editing of clothing to start 
+                    // failing frequently.  Possibly this is a race with a separate transaction that uploads the asset.
                     if (sendUpdate)
                         remoteClient.SendBulkUpdateInventory(item);
                 }
-- 
cgit v1.1


From 69ec85f4911de3218e0efb910fdbb1725e81e4ae Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 17 Sep 2013 00:02:36 +0100
Subject: Fix issue in recent 3f0fa9f7 where the code start adding unknown user
 cache entries with no name

---
 .../CoreModules/Framework/UserManagement/UserManagementModule.cs     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 25e8d69..63f78ac 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -602,8 +602,11 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                             user.LastName = "@unknown";
                         }
                     }
+
                     if (parts.Length >= 2)
                         user.FirstName = parts[1].Replace(' ', '.');
+
+                    AddUserInternal(user);
                 }
 
                 // To avoid issues with clients, particularly Hypergrid ones, permanently caching
@@ -618,8 +621,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 //                    user.FirstName = "Unknown";
 //                    user.LastName = "UserUMMAU4";
 //                }
-
-                AddUserInternal(user);
             }
         }
 
-- 
cgit v1.1


From 845d2b193a2e2058cfe89e06e0589f38c8103eb3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 17 Sep 2013 00:54:53 +0100
Subject: Comment out warning about no grid user found in
 UMM.TryGetUserNamesFromServices() for now

---
 .../CoreModules/Framework/UserManagement/UserManagementModule.cs  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 63f78ac..80b6ac1 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -388,10 +388,10 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     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);
-                }
+//                else
+//                {
+//                    m_log.DebugFormat("[USER MANAGEMENT MODULE]: No grid user found for {0}", uuid);
+//                }
 
                 names[0] = "Unknown";
                 names[1] = "UserUMMTGUN9";
-- 
cgit v1.1


From 1d2466889a3f184ff86d0d607ab3d2d10b1b4e16 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 17 Sep 2013 01:20:55 +0100
Subject: Reinstate insertion of "Unknown UserUMMAU4" now, as naive removing
 may be generating too many repeating user requests from other sources.

Leaves in the dropping of the client GUN8 (now 9) uuid binding message, since this was the much more common case from the viewer-side and this can only affect viewers.
---
 .../UserManagement/UserManagementModule.cs         | 66 ++++++++++------------
 1 file changed, 31 insertions(+), 35 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 80b6ac1..bb2bbe3 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -388,10 +388,10 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     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);
-//                }
+                else
+                {
+                    m_log.DebugFormat("[USER MANAGEMENT MODULE]: No grid user found for {0}", uuid);
+                }
 
                 names[0] = "Unknown";
                 names[1] = "UserUMMTGUN9";
@@ -552,24 +552,24 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
             if (oldUser != null)
             {
-//                if (creatorData == null || creatorData == String.Empty)
-//                {
-//                    //ignore updates without creator data
-//                    return;
-//                }
-//
-//                //try update unknown users, but don't update anyone else
-//                if (oldUser.FirstName == "Unknown" && !creatorData.Contains("Unknown")) 
-//                {
-//                    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
-//                {
+                if (creatorData == null || creatorData == String.Empty)
+                {
+                    //ignore updates without creator data
+                    return;
+                }
+
+                //try update unknown users, but don't update anyone else
+                if (oldUser.FirstName == "Unknown" && !creatorData.Contains("Unknown")) 
+                {
+                    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
+                {
                     //we have already a valid user within the cache
                     return;
-//                }
+                }
             }
 
             UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, id);
@@ -605,22 +605,18 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
                     if (parts.Length >= 2)
                         user.FirstName = parts[1].Replace(' ', '.');
-
-                    AddUserInternal(user);
                 }
-
-                // To avoid issues with clients, particularly Hypergrid ones, permanently caching
-                // UUID -> "Unknown User" name bindings, elsewhere we will drop such requests rather than replying.
-                // This also means that we cannot add an unknown user binding to the cache here.
-//                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";
-//                }
+                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);
             }
         }
 
-- 
cgit v1.1


From 7dbc93c62a6803fbe201e933b8bc1374b48869ad Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 18 Sep 2013 21:41:51 +0100
Subject: Change logging to provide more information on
 LLUDPServer.HandleCompleteMovementIntoRegion()

Add more information on which endpoint sent the packet when we have to wait and if we end up dropping the packet
Only check if the client is active - other checks are redundant since they can only failed if IsActve = false
---
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs   | 49 +++++++++++++++++-----
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 102e581..cdc1668 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1693,31 +1693,60 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 CompleteAgentMovementPacket packet = (CompleteAgentMovementPacket)array[1];
 
                 // Determine which agent this packet came from
+                // We need to wait here because in when using the OpenSimulator V2 teleport protocol to travel to a destination
+                // simulator with no existing child presence, the viewer (at least LL 3.3.4) will send UseCircuitCode 
+                // and then CompleteAgentMovement immediately without waiting for an ack.  As we are now handling these
+                // packets asynchronously, we need to account for this thread proceeding more quickly than the 
+                // UseCircuitCode thread.
                 int count = 20;
-                bool ready = false;
-                while (!ready && count-- > 0)
+                while (count-- > 0)
                 {
-                    if (m_scene.TryGetClient(endPoint, out client) && client.IsActive && client.SceneAgent != null)
+                    if (m_scene.TryGetClient(endPoint, out client))
                     {
-                        LLClientView llClientView = (LLClientView)client;
-                        LLUDPClient udpClient = llClientView.UDPClient;
-                        if (udpClient != null && udpClient.IsConnected)
-                            ready = true;
+                        if (client.IsActive)
+                        {
+                            break;
+                        }
                         else
                         {
-                            m_log.Debug("[LLUDPSERVER]: Received a CompleteMovementIntoRegion in " + m_scene.RegionInfo.RegionName + " (not ready yet)");
-                            Thread.Sleep(200);
+                            // This check exists to catch a condition where the client has been closed by another thread
+                            // but has not yet been removed from the client manager (and possibly a new connection has
+                            // not yet been established).
+                            m_log.DebugFormat(
+                                "[LLUDPSERVER]: Received a CompleteMovementIntoRegion from {0} for {1} in {2} but client is not active.  Waiting.",
+                                endPoint, client.Name, m_scene.Name);
                         }
                     }
                     else
                     {
-                        m_log.Debug("[LLUDPSERVER]: Received a CompleteMovementIntoRegion in " + m_scene.RegionInfo.RegionName + " (not ready yet)");
+                        m_log.DebugFormat(
+                            "[LLUDPSERVER]: Received a CompleteMovementIntoRegion from {0} in {1} but no client exists.  Waiting.", 
+                            endPoint, m_scene.Name);
+
                         Thread.Sleep(200);
                     }
                 }
 
                 if (client == null)
+                {
+                    m_log.DebugFormat(
+                        "[LLUDPSERVER]: No client found for CompleteMovementIntoRegion from {0} in {1} after wait.  Dropping.",
+                        endPoint, m_scene.Name);
+
                     return;
+                }
+                else if (!client.IsActive)
+                {
+                    // This check exists to catch a condition where the client has been closed by another thread
+                    // but has not yet been removed from the client manager.
+                    // The packet could be simply ignored but it is useful to know if this condition occurred for other debugging
+                    // purposes.
+                    m_log.DebugFormat(
+                        "[LLUDPSERVER]: Received a CompleteMovementIntoRegion from {0} for {1} in {2} but client is not active after wait.  Dropping.",
+                        endPoint, client.Name, m_scene.Name);
+
+                    return;
+                }
 
                 IncomingPacket incomingPacket1;
 
-- 
cgit v1.1


From f4d82a56f4c13bd24305e008418819edcfdc549d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 18 Sep 2013 22:09:46 +0100
Subject: Double the time spent waiting for a UseCircuitCode packet in
 LLUDPServer.HandleCompleteMovementIntoRegion()

This is to deal with one aspect of http://opensimulator.org/mantis/view.php?id=6755
With the V2 teleport arrangements, viewers appear to send the single UseCircuitCode and CompleteAgentMovement packets immediately after each other
Possibly, on occasion a poor network might drop the initial UseCircuitCode packet and by the time it retries, the CompleteAgementMovement has timed out and the teleport fails.
There's no apparant harm in doubling the wait time (most times only one wait will be performed) so trying this.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index cdc1668..b1752c1 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1698,7 +1698,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // and then CompleteAgentMovement immediately without waiting for an ack.  As we are now handling these
                 // packets asynchronously, we need to account for this thread proceeding more quickly than the 
                 // UseCircuitCode thread.
-                int count = 20;
+                int count = 40;
                 while (count-- > 0)
                 {
                     if (m_scene.TryGetClient(endPoint, out client))
-- 
cgit v1.1


From 3ce46adb2a614dda85b8207bb327dae6024824d8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 18 Sep 2013 22:56:00 +0100
Subject: minor: Make log message when Scene.IncomingChildAgentDateUpdate()
 more explicit that there is a problem if it still finds the agent to be a
 child if the sender wanted to wait till it became root

Add some comments about the mssage sequence, though much more data is at
http://opensimulator.org/wiki/Teleports
---
 OpenSim/Region/Framework/Scenes/Scene.cs         | 11 ++++++++---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs |  5 ++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index e00206f..6c9a8df 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4338,9 +4338,14 @@ namespace OpenSim.Region.Framework.Scenes
                     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)
+                        m_log.DebugFormat(
+                            "[SCENE]: Found presence {0} {1} unexpectedly still child in {2}",
+                            sp.Name, sp.UUID, Name);
+                    else
+                        m_log.DebugFormat(
+                            "[SCENE]: Found presence {0} {1} as root in {2} after {3} waits",
+                                sp.Name, sp.UUID, Name, 20 - ntimes);
 
                     if (sp.IsChildAgent)
                         return false;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b4e8f09..d542e47 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1354,7 +1354,10 @@ namespace OpenSim.Region.Framework.Scenes
 
         private bool WaitForUpdateAgent(IClientAPI client)
         {
-            // Before UpdateAgent, m_originRegionID is UUID.Zero; after, it's non-Zero
+            // Before the source region executes UpdateAgent
+            // (which triggers Scene.IncomingChildAgentDataUpdate(AgentData cAgentData) here in the destination, 
+            // m_originRegionID is UUID.Zero; after, it's non-Zero.  The CompleteMovement sequence initiated from the
+            // viewer (in turn triggered by the source region sending it a TeleportFinish event) waits until it's non-zero
             int count = 50;
             while (m_originRegionID.Equals(UUID.Zero) && count-- > 0)
             {
-- 
cgit v1.1


From ddcbd4bb7d1518d0607d43e9d687faee186e9409 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 18 Sep 2013 23:09:38 +0100
Subject: refactor: rename *ChildAgentDataUpdate() methods to
 *UpdateChildAgent()

verb-noun is consistent with other similar methods
---
 .../ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs   | 6 +++---
 OpenSim/Region/Framework/Scenes/Scene.cs                          | 8 ++++----
 OpenSim/Region/Framework/Scenes/ScenePresence.cs                  | 5 +++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index e86d186..8ec943d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -235,7 +235,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 //                        "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate",
 //                        destination.RegionName, destination.RegionID);
 
-                return m_scenes[destination.RegionID].IncomingChildAgentDataUpdate(cAgentData);
+                return m_scenes[destination.RegionID].IncomingUpdateChildAgent(cAgentData);
             }
 
 //            m_log.DebugFormat(
@@ -245,7 +245,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return false;
         }
 
-        public bool UpdateAgent(GridRegion destination, AgentPosition cAgentData)
+        public bool UpdateAgent(GridRegion destination, AgentPosition agentPosition)
         {
             if (destination == null)
                 return false;
@@ -257,7 +257,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             foreach (Scene s in m_scenes.Values)
             {
 //                m_log.Debug("[LOCAL COMMS]: Found region to send ChildAgentUpdate");
-                s.IncomingChildAgentDataUpdate(cAgentData);
+                s.IncomingUpdateChildAgent(agentPosition);
             }
 
             //m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate");
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 6c9a8df..758a012 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4296,7 +4296,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="cAgentData">Agent that contains all of the relevant things about an agent.
         /// Appearance, animations, position, etc.</param>
         /// <returns>true if we handled it.</returns>
-        public virtual bool IncomingChildAgentDataUpdate(AgentData cAgentData)
+        public virtual bool IncomingUpdateChildAgent(AgentData cAgentData)
         {
             m_log.DebugFormat(
                 "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName);
@@ -4330,7 +4330,7 @@ namespace OpenSim.Region.Framework.Scenes
                         sp.UUID, sp.ControllingClient.SessionId, cAgentData.SessionID));
                 }
 
-                sp.ChildAgentDataUpdate(cAgentData);
+                sp.UpdateChildAgent(cAgentData);
 
                 int ntimes = 20;
                 if (cAgentData.SenderWantsToWaitForRoot)
@@ -4363,7 +4363,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="cAgentData">AgentPosition that contains agent positional data so we can know what to send</param>
         /// <returns>true if we handled it.</returns>
-        public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData)
+        public virtual bool IncomingUpdateChildAgent(AgentPosition cAgentData)
         {
             //m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName);
             ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID);
@@ -4383,7 +4383,7 @@ namespace OpenSim.Region.Framework.Scenes
                     uint tRegionX = RegionInfo.RegionLocX;
                     uint tRegionY = RegionInfo.RegionLocY;
                     //Send Data to ScenePresence
-                    childAgentUpdate.ChildAgentDataUpdate(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY);
+                    childAgentUpdate.UpdateChildAgent(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY);
                     // Not Implemented:
                     //TODO: Do we need to pass the message on to one of our neighbors?
                 }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d542e47..3e61713 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3341,7 +3341,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         #region Child Agent Updates
 
-        public void ChildAgentDataUpdate(AgentData cAgentData)
+        public void UpdateChildAgent(AgentData cAgentData)
         {
 //            m_log.Debug("   >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName);
             if (!IsChildAgent)
@@ -3351,11 +3351,12 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         private static Vector3 marker = new Vector3(-1f, -1f, -1f);
+
         /// <summary>
         /// This updates important decision making data about a child agent
         /// The main purpose is to figure out what objects to send to a child agent that's in a neighboring region
         /// </summary>
-        public void ChildAgentDataUpdate(AgentPosition cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY)
+        public void UpdateChildAgent(AgentPosition cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY)
         {
             if (!IsChildAgent)
                 return;
-- 
cgit v1.1


From 8999f0602535ee7066caee5774a6dae72a12a45b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 18 Sep 2013 23:13:31 +0100
Subject: minor: correct method name in comment

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 3e61713..52ea8fe 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1355,7 +1355,7 @@ namespace OpenSim.Region.Framework.Scenes
         private bool WaitForUpdateAgent(IClientAPI client)
         {
             // Before the source region executes UpdateAgent
-            // (which triggers Scene.IncomingChildAgentDataUpdate(AgentData cAgentData) here in the destination, 
+            // (which triggers Scene.IncomingUpdateChildAgent(AgentData cAgentData) here in the destination, 
             // m_originRegionID is UUID.Zero; after, it's non-Zero.  The CompleteMovement sequence initiated from the
             // viewer (in turn triggered by the source region sending it a TeleportFinish event) waits until it's non-zero
             int count = 50;
-- 
cgit v1.1


From ac0a527976cda9d138d1b8967e81be4767e9f332 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 18 Sep 2013 23:27:37 +0100
Subject: Add [SimulationService] section to GridHypergrid.ini and
 StandaloneHypergrid.ini

This was already in Grid.ini and Standalone.ini
Default settings are same as previously, just introduce a debug ConnectorProtocolVersion parameter
---
 bin/config-include/GridHypergrid.ini       | 11 +++++++++++
 bin/config-include/StandaloneHypergrid.ini | 10 ++++++++++
 2 files changed, 21 insertions(+)

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 7edcafb..d416ee9 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -35,6 +35,17 @@
     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"
+
 [Profile]
     Module = "BasicProfileModule"
 
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 3abf49b..4dd35c0 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -38,6 +38,16 @@
     SimulationServiceInConnector		= 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"
 
 [Messaging]
     MessageTransferModule = HGMessageTransferModule
-- 
cgit v1.1


From 997700c4aae2c0498e86c955cd158e89ae2d2489 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 18 Sep 2013 23:49:27 +0100
Subject: minor: Make config-include .ini files more consistent

Chiefly tabs to spaces.
No actual setting changes
---
 bin/config-include/Grid.ini                     |   7 +-
 bin/config-include/GridCommon.ini.example       |  83 +++++++++---------
 bin/config-include/GridHypergrid.ini            |  25 +++---
 bin/config-include/HyperSimianGrid.ini          |   7 +-
 bin/config-include/Standalone.ini               |   9 +-
 bin/config-include/StandaloneCommon.ini.example | 109 ++++++++++++------------
 bin/config-include/StandaloneHypergrid.ini      |  58 ++++++-------
 7 files changed, 149 insertions(+), 149 deletions(-)

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 1837bdd..69a209a 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -22,8 +22,8 @@
     EntityTransferModule	= "BasicEntityTransferModule"
     InventoryAccessModule	= "BasicInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
-	MapImageService			= "MapImageServiceModule"
-	SearchModule			= "BasicSearchModule"
+    MapImageService			= "MapImageServiceModule"
+    SearchModule			= "BasicSearchModule"
     
     LandServiceInConnector			= true
     NeighbourServiceInConnector		= true
@@ -52,7 +52,7 @@
     ; for the LocalGridServicesConnector which is used by the Remote one
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
 
-	NetworkConnector = "OpenSim.Services.Connectors.dll:GridServicesConnector"
+    NetworkConnector = "OpenSim.Services.Connectors.dll:GridServicesConnector"
     
 [LibraryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -64,5 +64,6 @@
 
 [MapImageService]
 	LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
+
 	; in minutes
 	RefreshTime = 60
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 920a691..0a69dbf 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -27,24 +27,24 @@
     ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
 
 [Hypergrid]
-	; Uncomment the variables in this section only if you are in
-	; Hypergrid configuration. Otherwise, ignore.
+    ; Uncomment the variables in this section only if you are in
+    ; Hypergrid configuration. Otherwise, ignore.
 
     ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
-	;; If this is a standalone world, this is the address of this instance.
-	;; If this is a grided simulator, this is the address of the external robust server that
-	;; runs the UserAgentsService.
-	;; For example http://myworld.com:9000 or http://myworld.com:8002
-	;; This is a default that can be overwritten in some sections.
-	; HomeURI = "http://127.0.0.1:9000"
+    ;; If this is a standalone world, this is the address of this instance.
+    ;; If this is a grided simulator, this is the address of the external robust server that
+    ;; runs the UserAgentsService.
+    ;; For example http://myworld.com:9000 or http://myworld.com:8002
+    ;; This is a default that can be overwritten in some sections.
+    ; HomeURI = "http://127.0.0.1:9000"
 
     ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
-	;; If this is a standalone world, this is the address of this instance.
-	;; If this is a grided simulator, this is the address of the external robust server
-	;; that runs the Gatekeeper service.
-	;; For example http://myworld.com:9000 or http://myworld.com:8002
-	;; This is a default that can be overwritten in some sections.
-	; GatekeeperURI = "http://127.0.0.1:9000"
+    ;; If this is a standalone world, this is the address of this instance.
+    ;; If this is a grided simulator, this is the address of the external robust server
+    ;; that runs the Gatekeeper service.
+    ;; For example http://myworld.com:9000 or http://myworld.com:8002
+    ;; This is a default that can be overwritten in some sections.
+    ; GatekeeperURI = "http://127.0.0.1:9000"
 
 [Modules]
     ;; Choose one cache module and the corresponding config file, if it exists.
@@ -81,10 +81,10 @@
     InventoryServerURI = "http://mygridserver.com:8003"
 
 [GridInfo]
-   ;
-   ; Change this to your grid info service
-   ;
-   GridInfoURI = "http://mygridserver.com:8002"
+    ;
+    ; Change this to your grid info service
+    ;
+    GridInfoURI = "http://mygridserver.com:8002"
 
 [GridService]
     ;
@@ -157,9 +157,9 @@
     ;; uncomment the next line. You may want to do this on sims that have licensed content.
     ; OutboundPermission = False
 
-	;; Send visual reminder to local users that their inventories are unavailable while they are traveling
-	;; and available when they return. True by default.
-	;RestrictInventoryAccessAbroad = True
+    ;; Send visual reminder to local users that their inventories are unavailable while they are traveling
+    ;; and available when they return. True by default.
+    ;RestrictInventoryAccessAbroad = True
 
 
 [HGAssetService]
@@ -171,14 +171,14 @@
     HomeURI = "http://mygridserver.com:8002"
 
     ;; The asset types that this grid can export to / import from other grids.
-	;; Comma separated.
-	;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
-	;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
-	;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
-	;;
-	;; Leave blank or commented if you don't want to apply any restrictions.
-	;; A more strict, but still reasonable, policy may be to disallow the exchange 
-	;; of scripts, like so:
+    ;; Comma separated.
+    ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
+    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
+    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
+    ;;
+    ;; Leave blank or commented if you don't want to apply any restrictions.
+    ;; A more strict, but still reasonable, policy may be to disallow the exchange 
+    ;; of scripts, like so:
     ; DisallowExport ="LSLText"
     ; DisallowImport ="LSLBytecode"
 
@@ -197,20 +197,19 @@
    	MapImageServerURI = "http://mygridserver.com:8003"
 
 [AuthorizationService]
-	; If you have regions with access restrictions
-	; specify them here using the convention
-	; Region_<Region_Name> = <flags>
-	; Valid flags are:
-	; DisallowForeigners -- HG visitors not allowed
-	; DisallowResidents -- only Admins and Managers allowed
-	; Example:
-	; Region_Test_1 = "DisallowForeigners"
-
+  ; If you have regions with access restrictions
+    ; specify them here using the convention
+    ; Region_<Region_Name> = <flags>
+    ; Valid flags are:
+    ; DisallowForeigners -- HG visitors not allowed
+    ; 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/"
+    ;; 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
+    ;; Capability assigned by the grid administrator for the simulator
+    ;; SimulatorCapability = "00000000-0000-0000-0000-000000000000"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index d416ee9..2a66b4c 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -25,10 +25,10 @@
     EntityTransferModule	= "HGEntityTransferModule"
     InventoryAccessModule	= "HGInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
-	FriendsModule			= "HGFriendsModule"
-	MapImageService			= "MapImageServiceModule"
-	UserManagementModule	= "HGUserManagementModule"
-	SearchModule			= "BasicSearchModule"
+    FriendsModule			= "HGFriendsModule"
+    MapImageService			= "MapImageServiceModule"
+    UserManagementModule	= "HGUserManagementModule"
+    SearchModule			= "BasicSearchModule"
     
     LandServiceInConnector			= true
     NeighbourServiceInConnector		= true
@@ -73,7 +73,7 @@
     ; Needed to display non-default map tile images for linked regions
     AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
 
-	HypergridLinker = true
+    HypergridLinker = true
     AllowHypergridMapSearch = true
 
 [LibraryService]
@@ -89,12 +89,13 @@
     LureModule = HGLureModule
 
 [HGInstantMessageService]
-	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
-	GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector"
-	PresenceService	= "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
-	UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector"
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
+    GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector"
+    PresenceService	= "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
+    UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector"
 
 [MapImageService]
-	LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
-	; in minutes
-	RefreshTime = 60
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
+
+    ; in minutes
+    RefreshTime = 60
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index 99a589c..f561dd5 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -91,6 +91,7 @@
     ; accessible from other grids
     ;
     ProfileServerURI = "http://mygridserver.com:8002/user"
-	;; If you want to protect your assets from being copied by foreign visitors
-	;; uncomment the next line. You may want to do this on sims that have licensed content.
-	; OutboundPermission = False
+
+    ;; If you want to protect your assets from being copied by foreign visitors
+    ;; uncomment the next line. You may want to do this on sims that have licensed content.
+    ; OutboundPermission = False
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 7b7beb2..424d8c8 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -19,7 +19,7 @@
     EntityTransferModule    = "BasicEntityTransferModule"
     InventoryAccessModule   = "BasicInventoryAccessModule"
     MapImageService			= "MapImageServiceModule"
-	SearchModule			= "BasicSearchModule"
+    SearchModule			= "BasicSearchModule"
 
     LibraryModule              = true
     LLLoginServiceInConnector  = true
@@ -117,9 +117,10 @@
     DSTZone = "America/Los_Angeles;Pacific Standard Time"
 
 [MapImageService]
-	LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
-	; in minutes
-	RefreshTime = 60
+    LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
+
+    ; in minutes
+    RefreshTime = 60
 
 ;; This should always be the very last thing on this file
 [Includes]
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index f7545d4..12c5b95 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -28,25 +28,24 @@
     ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
 
 [Hypergrid]
-	; Uncomment the variables in this section only if you are in
-	; Hypergrid configuration. Otherwise, ignore.
+    ; Uncomment the variables in this section only if you are in
+    ; Hypergrid configuration. Otherwise, ignore.
 
     ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
-	;; If this is a standalone world, this is the address of this instance.
-	;; If this is a grided simulator, this is the address of the external robust server that
-	;; runs the UserAgentsService.
-	;; For example http://myworld.com:9000 or http://myworld.com:8002
-	;; This is a default that can be overwritten in some sections.
-	; HomeURI = "http://127.0.0.1:9000"
+    ;; If this is a standalone world, this is the address of this instance.
+    ;; If this is a grided simulator, this is the address of the external robust server that
+    ;; runs the UserAgentsService.
+    ;; For example http://myworld.com:9000 or http://myworld.com:8002
+    ;; This is a default that can be overwritten in some sections.
+    ; HomeURI = "http://127.0.0.1:9000"
 
     ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
-	;; If this is a standalone world, this is the address of this instance.
-	;; If this is a grided simulator, this is the address of the external robust server
-	;; that runs the Gatekeeper service.
-	;; For example http://myworld.com:9000 or http://myworld.com:8002
-	;; This is a default that can be overwritten in some sections.
-	; GatekeeperURI = "http://127.0.0.1:9000"
-
+    ;; If this is a standalone world, this is the address of this instance.
+    ;; If this is a grided simulator, this is the address of the external robust server
+    ;; that runs the Gatekeeper service.
+    ;; For example http://myworld.com:9000 or http://myworld.com:8002
+    ;; This is a default that can be overwritten in some sections.
+    ; GatekeeperURI = "http://127.0.0.1:9000"
 
 [Modules]
     ;; Choose one cache module and the corresponding config file, if it exists.
@@ -266,20 +265,20 @@
     ; If false, HG TPs happen only to the  Default regions specified in [GridService] section
     AllowTeleportsToAnyRegion = true
 
-	;; Regular expressions for controlling which client versions are accepted/denied.
-	;; An empty string means nothing is checked.
-	;;
-	;; Example 1: allow only these 3 types of clients (any version of them)
-	;; AllowedClients = "Imprudence|Hippo|Second Life"
-	;;
-	;; Example 2: allow all clients except these
-	;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
-	;;
-	;; Note that these are regular expressions, so every character counts.
-	;; Also note that this is very weak security and should not be trusted as a reliable means
-	;; for keeping bad clients out; modified clients can fake their identifiers.
-	;;
-	;;
+    ;; Regular expressions for controlling which client versions are accepted/denied.
+    ;; An empty string means nothing is checked.
+    ;;
+    ;; Example 1: allow only these 3 types of clients (any version of them)
+    ;; AllowedClients = "Imprudence|Hippo|Second Life"
+    ;;
+    ;; Example 2: allow all clients except these
+    ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
+    ;;
+    ;; Note that these are regular expressions, so every character counts.
+    ;; Also note that this is very weak security and should not be trusted as a reliable means
+    ;; for keeping bad clients out; modified clients can fake their identifiers.
+    ;;
+    ;;
     ;AllowedClients = ""
     ;DeniedClients = ""
 
@@ -302,7 +301,7 @@
     ;; Are local users allowed to visit other grids?
     ;; What user level? Use variables of this forrm:
     ;; ForeignTripsAllowed_Level_<UserLevel> = true | false
-	;; (the default is true)
+    ;; (the default is true)
     ;; For example:
     ; ForeignTripsAllowed_Level_0 = false
     ; ForeignTripsAllowed_Level_200 = true ; true is default, no need to say it
@@ -310,45 +309,45 @@
     ;; If ForeignTripsAllowed is false, make exceptions using DisallowExcept
     ;; Leave blank or commented for no exceptions.
     ; DisallowExcept_Level_0 = "http://myothergrid.com:8002, http://boss.com:8002"
-	;;
+    ;;
     ;; If ForeignTripsAllowed is true, make exceptions using AllowExcept.
     ;; Leave blank or commented for no exceptions.
     ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
 
 [HGInventoryService]
-	;; If you have this set under [Hypergrid], 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 [Hypergrid], 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.
-	;; Comma separated.
-	;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
-	;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
-	;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
-	;;
-	;; Leave blank or commented if you don't want to apply any restrictions.
-	;; A more strict, but still reasonable, policy may be to disallow the exchange 
-	;; of scripts, like so:
+    ;; Comma separated.
+    ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
+    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
+    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
+    ;;
+    ;; Leave blank or commented if you don't want to apply any restrictions.
+    ;; A more strict, but still reasonable, policy may be to disallow the exchange 
+    ;; of scripts, like so:
     ; DisallowExport ="LSLText"
     ; DisallowImport ="LSLBytecode"
 
 
 [HGInventoryAccessModule]
-	;; If you have these set under [Hypergrid], 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"
+    ; GatekeeperURI = "http://127.0.0.1:9000"
 
     ;; If you want to protect your assets from being copied by foreign visitors
     ;; uncomment the next line. You may want to do this on sims that have licensed content.
-	;; true = allow exports, false = disallow exports. True by default.
+    ;; true = allow exports, false = disallow exports. True by default.
     ; OutboundPermission = True
 
-	;; Send visual reminder to local users that their inventories are unavailable while they are traveling
-	;; and available when they return. True by default.
-	;RestrictInventoryAccessAbroad = True
+    ;; Send visual reminder to local users that their inventories are unavailable while they are traveling
+    ;; and available when they return. True by default.
+    ;RestrictInventoryAccessAbroad = True
 
 [HGFriendsModule]
     ; User level required to be able to send friendship invitations to foreign users
@@ -356,20 +355,20 @@
 
 [Messaging]
     ; === HG ONLY ===
-	;; If you have this set under [Hypergrid], 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"
 
 
 [EntityTransfer]
-	;; User level from which local users are allowed to HG teleport. Default 0 (all users)
-	;LevelHGTeleport = 0
+    ;; User level from which local users are allowed to HG teleport. Default 0 (all users)
+    ;LevelHGTeleport = 0
 
-	;; Are local users restricted from taking their appearance abroad?
-	;; Default is no restrictions
+    ;; Are local users restricted from taking their appearance abroad?
+    ;; Default is no restrictions
     ;RestrictAppearanceAbroad = false
 
-	;; If appearance is restricted, which accounts' appearances are allowed to be exported?
-	;; Comma-separated list of account names
+    ;; 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
@@ -385,5 +384,3 @@
 
     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 4dd35c0..370ab90 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -5,7 +5,7 @@
 ;;
 
 [Startup]
-	WorldMapModule = "HGWorldMap"
+    WorldMapModule = "HGWorldMap"
 
 [Modules]
     AssetServices			= "HGAssetBroker"
@@ -20,12 +20,12 @@
     SimulationServices		= "RemoteSimulationConnectorModule"
     AvatarServices			= "LocalAvatarServicesConnector"
     UserProfilesServices    = "LocalUserProfilesServicesConnector"
-	MapImageService			= "MapImageServiceModule"
+    MapImageService			= "MapImageServiceModule"
     EntityTransferModule	= "HGEntityTransferModule"
     InventoryAccessModule	= "HGInventoryAccessModule"
     FriendsModule			= "HGFriendsModule"
-	UserManagementModule	= "HGUserManagementModule"
-	SearchModule			= "BasicSearchModule"
+    UserManagementModule	= "HGUserManagementModule"
+    SearchModule			= "BasicSearchModule"
     
     InventoryServiceInConnector			= true
     AssetServiceInConnector				= true
@@ -33,10 +33,10 @@
     NeighbourServiceInConnector			= true
     LibraryModule						= true
     LLLoginServiceInConnector			= true
-	GridInfoServiceInConnector			= true
+    GridInfoServiceInConnector			= true
     AuthenticationServiceInConnector	= true
     SimulationServiceInConnector		= true
-	MapImageServiceInConnector			= 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
@@ -74,9 +74,9 @@
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
 
 [LibraryService]
-	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
-	LibraryName = "OpenSim Library"
-	DefaultLibrary = "./inventory/Libraries.xml"
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
 
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
@@ -123,7 +123,7 @@
     LocalServiceModule		= "OpenSim.Services.LLLoginService.dll:LLLoginService"
     UserAccountService		= "OpenSim.Services.UserAccountService.dll:UserAccountService"
     GridUserService			= "OpenSim.Services.UserAccountService.dll:GridUserService"
-	UserAgentService		= "OpenSim.Services.HypergridService.dll:UserAgentService"
+    UserAgentService		= "OpenSim.Services.HypergridService.dll:UserAgentService"
     AuthenticationService	= "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     InventoryService		= "OpenSim.Services.InventoryService.dll:XInventoryService"
     PresenceService			= "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -132,9 +132,9 @@
     FriendsService			= "OpenSim.Services.FriendsService.dll:FriendsService"
    
 [MapImageService]
-	LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
-	; in minutes
-	RefreshTime = 60
+    LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
+    ; in minutes
+    RefreshTime = 60
 
 [GatekeeperService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
@@ -148,8 +148,8 @@
     SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
 
 [UserAgentService]
-	LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
-	;; for the service
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    ;; for the service
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
@@ -166,10 +166,10 @@
 [HGInventoryService]
     ; For the InventoryServiceInConnector
     LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
-	;; alternatives:
-	;;  HG1.5, more permissive, not recommended, but still supported
+    ;; alternatives:
+    ;;  HG1.5, more permissive, not recommended, but still supported
     ;LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGInventoryService"
-	;;  HG1.0, totally permissive, not recommended, but OK for grids with 100% trust
+    ;;  HG1.0, totally permissive, not recommended, but OK for grids with 100% trust
     ;LocalServiceModule    = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
@@ -182,19 +182,19 @@
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
 [HGFriendsService]
-	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService"
-	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
-	FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
-	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-	GridService = "OpenSim.Services.GridService.dll:GridService"
-	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService"
+    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
 
 [HGInstantMessageService]
-	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
-	GridService = "OpenSim.Services.GridService.dll:GridService"
-	PresenceService	= "OpenSim.Services.PresenceService.dll:PresenceService"
-	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
-	InGatekeeper = True
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    PresenceService	= "OpenSim.Services.PresenceService.dll:PresenceService"
+    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    InGatekeeper = True
 
 ;; This should always be the very last thing on this file
 [Includes]
-- 
cgit v1.1


From 83c113896ec518cef98880195f81bc6fe2d6a63f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 19 Sep 2013 20:24:08 +0100
Subject: Create regression TestCrossOnSameSimulatorNoRootDestPerm() to check
 that avatars are not allowed to cross into a neighbour where they are not
 authorized, even if a child agent was allowed.

---
 OpenSim/Region/Framework/Scenes/Scene.cs           |  3 +-
 .../Scenes/Tests/ScenePresenceCrossingTests.cs     | 86 ++++++++++++++++++++++
 2 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 758a012..4357b91 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -731,6 +731,7 @@ namespace OpenSim.Region.Framework.Scenes
             m_config = config;
             MinFrameTime = 0.089f;
             MinMaintenanceTime = 1;
+            SeeIntoRegion = true;
 
             Random random = new Random();
 
@@ -841,7 +842,7 @@ namespace OpenSim.Region.Framework.Scenes
                 //Animation states
                 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
 
-                SeeIntoRegion = startupConfig.GetBoolean("see_into_region", true);
+                SeeIntoRegion = startupConfig.GetBoolean("see_into_region", SeeIntoRegion);
 
                 MaxUndoCount = startupConfig.GetInt("MaxPrimUndos", 20);
 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
index 12a778b..cf211a1 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
@@ -38,6 +38,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.CoreModules.Framework;
 using OpenSim.Region.CoreModules.Framework.EntityTransfer;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
+using OpenSim.Region.CoreModules.World.Permissions;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
 
@@ -159,5 +160,90 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Assert.That(agentMovementCompleteReceived, Is.EqualTo(1));
             Assert.That(spAfterCrossSceneB.IsChildAgent, Is.False);
         }
+
+        /// <summary>
+        /// Test a cross attempt where the user can see into the neighbour but does not have permission to become
+        /// root there.
+        /// </summary>
+        [Test]
+        public void TestCrossOnSameSimulatorNoRootDestPerm()
+        {
+            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), 1000, 999);
+
+            SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm);
+            SceneHelpers.SetupSceneModules(sceneA, config, new CapabilitiesModule(), etmA);
+
+            // We need to set up the permisions module on scene B so that our later use of agent limit to deny
+            // QueryAccess won't succeed anyway because administrators are always allowed in and the default
+            // IsAdministrator if no permissions module is present is true.
+            SceneHelpers.SetupSceneModules(sceneB, config, new CapabilitiesModule(), new PermissionsModule(), etmB);
+
+            AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId);
+            TestClient tc = new TestClient(acd, sceneA);
+            List<TestClient> destinationTestClients = new List<TestClient>();
+            EntityTransferHelpers.SetupInformClientOfNeighbourTriggersNeighbourClientCreate(tc, destinationTestClients);
+
+            // Make sure sceneB will not accept this avatar.
+            sceneB.RegionInfo.EstateSettings.PublicAccess = false;
+
+            ScenePresence originalSp = SceneHelpers.AddScenePresence(sceneA, tc, acd);
+            originalSp.AbsolutePosition = new Vector3(128, 32, 10);
+
+            AgentUpdateArgs moveArgs = new AgentUpdateArgs();
+            //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);
+
+            sceneA.Update(1);
+
+//            Console.WriteLine("Second pos {0}", originalSp.AbsolutePosition);
+
+            // FIXME: This is a sufficient number of updates to for the presence to reach the northern border.
+            // But really we want to do this in a more robust way.
+            for (int i = 0; i < 100; i++)
+            {
+                sceneA.Update(1);
+//                Console.WriteLine("Pos {0}", originalSp.AbsolutePosition);
+            }
+
+            // sceneA agent should still be root
+            ScenePresence spAfterCrossSceneA = sceneA.GetScenePresence(originalSp.UUID);
+            Assert.That(spAfterCrossSceneA.IsChildAgent, Is.False);
+
+            ScenePresence spAfterCrossSceneB = sceneB.GetScenePresence(originalSp.UUID);
+
+            // sceneB agent should also still be root
+            Assert.That(spAfterCrossSceneB.IsChildAgent, Is.True);
+
+            // sceneB should ignore unauthorized attempt to upgrade agent to root
+            TestClient sceneBTc = ((TestClient)spAfterCrossSceneB.ControllingClient);
+
+            int agentMovementCompleteReceived = 0;
+            sceneBTc.OnReceivedMoveAgentIntoRegion += (ri, pos, look) => agentMovementCompleteReceived++;
+
+            sceneBTc.CompleteMovement();
+
+            Assert.That(agentMovementCompleteReceived, Is.EqualTo(0));
+            Assert.That(spAfterCrossSceneB.IsChildAgent, Is.True);
+        }
     }
 }
\ No newline at end of file
-- 
cgit v1.1


From 3a9a8d2113cc6cc333edf7e813f881111f301378 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 19 Sep 2013 20:26:26 +0100
Subject: Revert "Also check user authorization if looking to upgrade from a
 child to a root agent."

This reverts commit c7ded0618c303f8c24a91c83c2129292beebe466.
This proves not to be necessary - the necessary checks are already being done via QueryAccess() before cross or teleport
---
 OpenSim/Region/Framework/Scenes/Scene.cs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4357b91..495491c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3861,19 +3861,6 @@ namespace OpenSim.Region.Framework.Scenes
                     // Let the SP know how we got here. This has a lot of interesting
                     // uses down the line.
                     sp.TeleportFlags = (TPFlags)teleportFlags;
-
-                    // 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)
                     {
-- 
cgit v1.1


From 6bdef1f70b782b69090e5846f9463942857d97cd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 19 Sep 2013 20:49:55 +0100
Subject: minor: Stop debug logging whenever an npc is moved, other npc log
 related formatting cleanups

---
 .../Region/OptionalModules/World/NPC/NPCModule.cs  | 31 +++++++++++-----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index c26fdfc..b863370 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -146,9 +146,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     int.MaxValue);
 
             m_log.DebugFormat(
-                    "[NPC MODULE]: Creating NPC {0} {1} {2}, owner={3}, senseAsAgent={4} at {5} in {6}",
-                    firstname, lastname, npcAvatar.AgentId, owner,
-                    senseAsAgent, position, scene.RegionInfo.RegionName);
+                "[NPC MODULE]: Creating NPC {0} {1} {2}, owner={3}, senseAsAgent={4} at {5} in {6}",
+                firstname, lastname, npcAvatar.AgentId, owner,
+                senseAsAgent, position, scene.RegionInfo.RegionName);
 
             AgentCircuitData acd = new AgentCircuitData();
             acd.AgentID = npcAvatar.AgentId;
@@ -188,16 +188,16 @@ namespace OpenSim.Region.OptionalModules.World.NPC
 
                     sp.CompleteMovement(npcAvatar, false);
                     m_avatars.Add(npcAvatar.AgentId, npcAvatar);
-                    m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}",
-                            npcAvatar.AgentId, sp.Name);
+                    m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}", npcAvatar.AgentId, sp.Name);
 
                     return npcAvatar.AgentId;
                 }
                 else
                 {
                     m_log.WarnFormat(
-                            "[NPC MODULE]: Could not find scene presence for NPC {0} {1}",
-                            sp.Name, sp.UUID);
+                        "[NPC MODULE]: Could not find scene presence for NPC {0} {1}",
+                        sp.Name, sp.UUID);
+
                     return UUID.Zero;
                 }
             }
@@ -213,10 +213,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     ScenePresence sp;
                     if (scene.TryGetScenePresence(agentID, out sp))
                     {
-                        m_log.DebugFormat(
-                                "[NPC MODULE]: Moving {0} to {1} in {2}, noFly {3}, landAtTarget {4}",
-                                sp.Name, pos, scene.RegionInfo.RegionName,
-                                noFly, landAtTarget);
+//                        m_log.DebugFormat(
+//                                "[NPC MODULE]: Moving {0} to {1} in {2}, noFly {3}, landAtTarget {4}",
+//                                sp.Name, pos, scene.RegionInfo.RegionName,
+//                                noFly, landAtTarget);
 
                         sp.MoveToTarget(pos, noFly, landAtTarget);
                         sp.SetAlwaysRun = running;
@@ -293,9 +293,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     ScenePresence sp;
                     if (scene.TryGetScenePresence(agentID, out sp))
                     {
-                        sp.HandleAgentRequestSit(m_avatars[agentID], agentID,
-                                partID, Vector3.Zero);
-                        //sp.HandleAgentSit(m_avatars[agentID], agentID);
+                        sp.HandleAgentRequestSit(m_avatars[agentID], agentID, partID, Vector3.Zero);
 
                         return true;
                     }
@@ -387,8 +385,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     */
 
                     scene.IncomingCloseAgent(agentID, false);
-//                    scene.RemoveClient(agentID, false);
+
                     m_avatars.Remove(agentID);
+
                     /*
                     m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}",
                             agentID, av.Name);
@@ -427,4 +426,4 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     av.OwnerID == callerID;
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1


From 03b2b5b77bef684536143ed509df444b859c26c0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 19 Sep 2013 20:59:27 +0100
Subject: minor: Make log message at top of ScenePresence.CompleteMovement info
 level and comment out later log message in ScenePresence.MakeRootAgent()

Need an info message since this is currently important in detecting teleport issue when not at debug log level.
CompleteMovement message occurs before MakeRootAgent() one did
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 52ea8fe..e247875 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -900,9 +900,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void MakeRootAgent(Vector3 pos, bool isFlying)
         {
-            m_log.InfoFormat(
-                "[SCENE]: Upgrading child to root agent for {0} in {1}",
-                Name, m_scene.RegionInfo.RegionName);
+//            m_log.InfoFormat(
+//                "[SCENE]: Upgrading child to root agent for {0} in {1}",
+//                Name, m_scene.RegionInfo.RegionName);
 
             //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count);
 
@@ -1388,9 +1388,9 @@ namespace OpenSim.Region.Framework.Scenes
         {
 //            DateTime startTime = DateTime.Now;
 
-            m_log.DebugFormat(
+            m_log.InfoFormat(
                 "[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}",
-                client.Name, Scene.RegionInfo.RegionName, AbsolutePosition);
+                client.Name, Scene.Name, 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)
-- 
cgit v1.1


From b6f10780c25007032835c4247fbd51d695d348df Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 19 Sep 2013 21:44:30 +0100
Subject: minor: Make SP.MakeRootAgent() private - no external code has any
 business calling this method

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index e247875..f12d629 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -898,7 +898,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// This method is on the critical path for transferring an avatar from one region to another.  Delay here
         /// delays that crossing.
         /// </summary>
-        public void MakeRootAgent(Vector3 pos, bool isFlying)
+        private void MakeRootAgent(Vector3 pos, bool isFlying)
         {
 //            m_log.InfoFormat(
 //                "[SCENE]: Upgrading child to root agent for {0} in {1}",
-- 
cgit v1.1


From 979b17165b7e504385187ab082ef0a8cd50605bd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 19 Sep 2013 22:45:50 +0100
Subject: For debug purposes, allow simulators to force use of earlier
 SIMULATION/0.1 teleport protocol even if SIMULATION/0.2 is available.

This is specified in the MaxOutgoingTransferVersion attribute of [EntityTransfer] in OpenSim.ini, see OpenSimDefaults.ini for more details.
Default remains "SIMULATION/0.2"
Primarily for http://opensimulator.org/mantis/view.php?id=6755
---
 .../EntityTransfer/EntityTransferModule.cs         | 53 ++++++++++++++++++++--
 .../Scenes/Tests/ScenePresenceTeleportTests.cs     |  2 +-
 bin/OpenSimDefaults.ini                            | 10 +++-
 3 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 9302784..c1c8672 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -56,6 +56,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         public const int DefaultMaxTransferDistance = 4095;
         public const bool WaitForAgentArrivedAtDestinationDefault = true;
 
+        public string OutgoingTransferVersionName { get; set; }
+
+        /// <summary>
+        /// Determine the maximum entity transfer version we will use for teleports.
+        /// </summary>
+        public float MaxOutgoingTransferVersion { get; set; }
+
         /// <summary>
         /// The maximum distance, in standard region units (256m) that an agent is allowed to transfer.
         /// </summary>
@@ -151,9 +158,35 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// <param name="source"></param>
         protected virtual void InitialiseCommon(IConfigSource source)
         {
+            string transferVersionName = "SIMULATION";
+            float maxTransferVersion = 0.2f;
+
             IConfig transferConfig = source.Configs["EntityTransfer"];
             if (transferConfig != null)
             {
+                string rawVersion 
+                    = transferConfig.GetString(
+                        "MaxOutgoingTransferVersion", 
+                        string.Format("{0}/{1}", transferVersionName, maxTransferVersion));
+
+                string[] rawVersionComponents = rawVersion.Split(new char[] { '/' });
+
+                bool versionValid = false;
+
+                if (rawVersionComponents.Length >= 2)
+                    versionValid = float.TryParse(rawVersionComponents[1], out maxTransferVersion);
+
+                if (!versionValid)
+                {
+                    m_log.ErrorFormat(
+                        "[ENTITY TRANSFER MODULE]: MaxOutgoingTransferVersion {0} is invalid, using {1}", 
+                        rawVersion, string.Format("{0}/{1}", transferVersionName, maxTransferVersion));
+                }
+                else
+                {
+                    transferVersionName = rawVersionComponents[0];
+                }
+
                 DisableInterRegionTeleportCancellation 
                     = transferConfig.GetBoolean("DisableInterRegionTeleportCancellation", false);
 
@@ -167,6 +200,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 MaxTransferDistance = DefaultMaxTransferDistance;
             }
 
+            OutgoingTransferVersionName = transferVersionName;
+            MaxOutgoingTransferVersion = maxTransferVersion;
+
             m_entityTransferStateMachine = new EntityTransferStateMachine(this);
 
             m_Enabled = true;
@@ -623,7 +659,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (!sp.ValidateAttachments())
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: Failed validation of all attachments for teleport of {0} from {1} to {2}.  Continuing.",
-                    sp.Name, sp.Scene.RegionInfo.RegionName, finalDestination.RegionName);
+                    sp.Name, sp.Scene.Name, finalDestination.RegionName);
 
             string reason;
             string version;
@@ -634,7 +670,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: {0} was stopped from teleporting from {1} to {2} because {3}",
-                    sp.Name, sp.Scene.RegionInfo.RegionName, finalDestination.RegionName, reason);
+                    sp.Name, sp.Scene.Name, finalDestination.RegionName, reason);
 
                 return;
             }
@@ -644,7 +680,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // as server attempts.
             m_interRegionTeleportAttempts.Value++;
 
-            m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Destination is running version {0}", version);
+            m_log.DebugFormat(
+                "[ENTITY TRANSFER MODULE]: {0} max transfer version is {1}/{2}, {3} max version is {4}", 
+                sp.Scene.Name, OutgoingTransferVersionName, MaxOutgoingTransferVersion, finalDestination.RegionName, version);
 
             // Fixing a bug where teleporting while sitting results in the avatar ending up removed from
             // both regions
@@ -689,7 +727,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath();
             }
 
-            if (version.Equals("SIMULATION/0.2"))
+            // We're going to fallback to V1 if the destination gives us anything smaller than 0.2 or we're forcing
+            // use of the earlier protocol
+            float versionNumber = 0.1f;
+            string[] versionComponents = version.Split(new char[] { '/' });
+            if (versionComponents.Length >= 2)
+                float.TryParse(versionComponents[1], out versionNumber);
+
+            if (versionNumber == 0.2f && MaxOutgoingTransferVersion >= versionNumber)
                 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);           
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
index 8c25dbc..3ba34dd 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
@@ -185,7 +185,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestSameSimulatorIsolatedRegionsV2()
         {
             TestHelpers.InMethod();
-//            TestHelpers.EnableLogging();
+            TestHelpers.EnableLogging();
 
             UUID userId = TestHelpers.ParseTail(0x1);
 
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 7954a14..8da4daf 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -636,7 +636,6 @@
 	Cap_AvatarPickerSearch = "localhost"
 
     
-
 [Chat]
     ; Controls whether the chat module is enabled.  Default is true.
     enabled = true;
@@ -652,6 +651,15 @@
 
 
 [EntityTransfer]
+    ; The maximum protocol version that we will use for outgoing transfers
+    ; 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.
+    MaxOutgoingTransferVersion = "SIMULATION/0.2"
+
     ; The maximum distance in regions that an agent is allowed to teleport 
     ; along the x or y axis. This is set to 16383 because current viewers 
     ; can't handle teleports that are greater than this distance
-- 
cgit v1.1


From f1267730ef7c4c91e189ad98eeda1bfa80aa106c Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Wed, 24 Apr 2013 11:42:27 +0300
Subject: UUID Gatherer: find assets used in Light Projection, Particle
 Systems, and Collision Sounds.

---
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 8f69ce3..502c748 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -172,7 +172,20 @@ namespace OpenSim.Region.Framework.Scenes
                     // If the prim is a sculpt then preserve this information too
                     if (part.Shape.SculptTexture != UUID.Zero)
                         assetUuids[part.Shape.SculptTexture] = AssetType.Texture;
-                    
+
+                    if (part.Shape.ProjectionTextureUUID != UUID.Zero)
+                        assetUuids[part.Shape.ProjectionTextureUUID] = AssetType.Texture;
+
+                    if (part.CollisionSound != UUID.Zero)
+                        assetUuids[part.CollisionSound] = AssetType.Sound;
+
+                    if (part.ParticleSystem.Length > 0)
+                    {
+                        Primitive.ParticleSystem ps = new Primitive.ParticleSystem(part.ParticleSystem, 0);
+                        if (ps.Texture != UUID.Zero)
+                            assetUuids[ps.Texture] = AssetType.Texture;
+                    }
+
                     TaskInventoryDictionary taskDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();
                     
                     // Now analyze this prim's inventory items to preserve all the uuids that they reference
-- 
cgit v1.1


From c06a9ffe5c639ae50bdb129882b5689443cce654 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 20 Sep 2013 00:04:33 +0100
Subject: Make new regions PG by default instead of Mature.

This makes scripted object sounds and a few other things play by default instead of having to switch the viewer to adult
This reduces the support burden
---
 OpenSim/Framework/RegionSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 47dbcec..db8c53e 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -200,7 +200,7 @@ namespace OpenSim.Framework
             set { m_ObjectBonus = value; }
         }
 
-        private int m_Maturity = 1;
+        private int m_Maturity = 0;
 
         public int Maturity
         {
-- 
cgit v1.1


From 07d7a5fd76460a16b97d285a1b2c4a101e5543b6 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 20 Sep 2013 09:36:19 -0700
Subject: BulletSim: zero velocity when avatar not moving.

This fixes a movement jitter that happens when an avatar is standing on a
tilted surface.
---
 OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
index 04a4a32..8ca55e5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -278,6 +278,7 @@ public class BSActorAvatarMove : BSActor
         if (m_controllingPrim.IsStationary)
         {
             entprop.Position = m_controllingPrim.RawPosition;
+            entprop.Velocity = OMV.Vector3.Zero;
             m_physicsScene.PE.SetTranslation(m_controllingPrim.PhysBody, entprop.Position, entprop.Rotation);
         }
 
-- 
cgit v1.1


From 35a6361b2431abf9d49b4413c5b9eaac51934134 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 20 Sep 2013 09:23:12 -0700
Subject: BulletSim: reduce avatar walking stopped threshold. Add parameter for
 setting the walking stopped threshold.

This fixes the slight jump when an avatar stops walking.
---
 OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs | 1 +
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs           | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
index 8ca55e5..1bcf879 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -128,6 +128,7 @@ public class BSActorAvatarMove : BSActor
                                                 BSMotor.Infinite,           // decay time scale
                                                 1f                          // efficiency
             );
+            m_velocityMotor.ErrorZeroThreshold = BSParam.AvatarStopZeroThreshold;
             // _velocityMotor.PhysicsScene = PhysicsScene; // DEBUG DEBUG so motor will output detail log messages.
             SetVelocityAndTarget(m_controllingPrim.RawVelocity, m_controllingPrim.TargetVelocity, true /* inTaintTime */);
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 2f1799b..43aa63e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -134,6 +134,7 @@ public static class BSParam
     public static float AvatarHeightMidFudge { get; private set; }
     public static float AvatarHeightHighFudge { get; private set; }
 	public static float AvatarContactProcessingThreshold { get; private set; }
+    public static float AvatarStopZeroThreshold { get; private set; }
 	public static int AvatarJumpFrames { get; private set; }
 	public static float AvatarBelowGroundUpCorrectionMeters { get; private set; }
 	public static float AvatarStepHeight { get; private set; }
@@ -575,6 +576,8 @@ public static class BSParam
             0.1f ),
 	    new ParameterDefn<float>("AvatarContactProcessingThreshold", "Distance from capsule to check for collisions",
             0.1f ),
+	    new ParameterDefn<float>("AvatarStopZeroThreshold", "Movement velocity below which avatar is assumed to be stopped",
+            0.1f ),
 	    new ParameterDefn<float>("AvatarBelowGroundUpCorrectionMeters", "Meters to move avatar up if it seems to be below ground",
             1.0f ),
 	    new ParameterDefn<int>("AvatarJumpFrames", "Number of frames to allow jump forces. Changes jump height.",
-- 
cgit v1.1


From c6dea6ee783b0d2f300ef34fb432fb7197a5dabb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 20 Sep 2013 20:19:44 +0100
Subject: Change some message log levels in Scene.IncomingUpdateChildAgent()
 for debugging purposes

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 495491c..bc5a67f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4293,7 +4293,7 @@ namespace OpenSim.Region.Framework.Scenes
             ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2);
             if (nearestParcel == null)
             {
-                m_log.DebugFormat(
+                m_log.InfoFormat(
                     "[SCENE]: Denying root agent entry to {0} in {1}: no allowed parcel",
                     cAgentData.AgentID, RegionInfo.RegionName);
 
@@ -4327,11 +4327,11 @@ namespace OpenSim.Region.Framework.Scenes
                         Thread.Sleep(1000);
 
                     if (sp.IsChildAgent)
-                        m_log.DebugFormat(
+                        m_log.WarnFormat(
                             "[SCENE]: Found presence {0} {1} unexpectedly still child in {2}",
                             sp.Name, sp.UUID, Name);
                     else
-                        m_log.DebugFormat(
+                        m_log.InfoFormat(
                             "[SCENE]: Found presence {0} {1} as root in {2} after {3} waits",
                                 sp.Name, sp.UUID, Name, 20 - ntimes);
 
-- 
cgit v1.1


From c01db5fbdd982a9613d1d64e2ac54f1b5c73b63c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 20 Sep 2013 22:41:53 +0100
Subject: Lock around read/write of ScenePresence.m_originRegionID to make sure
 that all threads are seeing the latest value and not a cached one.

There is a possibilty that some V2 teleport failures are due to the viewer triggered CompleteMovement thread not seeing the change of m_originRegionID by the UpdateAgent thread.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 38 ++++++++++++++++++++----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index f12d629..8d72e18 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -311,7 +311,21 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         private string m_callbackURI;
 
-        public UUID m_originRegionID;
+        /// <summary>
+        /// Records the region from which this presence originated, if not from login.
+        /// </summary>
+        /// <remarks>
+        /// Also acts as a signal in the teleport V2 process to release UpdateAgent after a viewer has triggered
+        /// CompleteMovement and made the previous child agent a root agent.
+        /// </remarks>
+        private UUID m_originRegionID;
+
+        /// <summary>
+        /// This object is used as a lock before accessing m_originRegionID to make sure that every thread is seeing
+        /// the very latest value and not using some cached version.  Cannot make m_originRegionID itself volatite as
+        /// it is a value type.
+        /// </summary>
+        private object m_originRegionIDAccessLock = new object();
 
         /// <summary>
         /// Used by the entity transfer module to signal when the presence should not be closed because a subsequent
@@ -1359,13 +1373,21 @@ namespace OpenSim.Region.Framework.Scenes
             // m_originRegionID is UUID.Zero; after, it's non-Zero.  The CompleteMovement sequence initiated from the
             // viewer (in turn triggered by the source region sending it a TeleportFinish event) waits until it's non-zero
             int count = 50;
-            while (m_originRegionID.Equals(UUID.Zero) && count-- > 0)
+            UUID originID;
+
+            lock (m_originRegionIDAccessLock)
+                originID = m_originRegionID;
+
+            while (originID.Equals(UUID.Zero) && count-- > 0)
             {
+                lock (m_originRegionIDAccessLock)
+                    originID = m_originRegionID;
+
                 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))
+            if (originID.Equals(UUID.Zero))
             {
                 // Movement into region will fail
                 m_log.WarnFormat("[SCENE PRESENCE]: Update agent {0} never arrived in {1}", client.Name, Scene.Name);
@@ -1444,7 +1466,12 @@ namespace OpenSim.Region.Framework.Scenes
                     "[SCENE PRESENCE]: Releasing {0} {1} with callback to {2}",
                     client.Name, client.AgentId, m_callbackURI);
 
-                Scene.SimulationService.ReleaseAgent(m_originRegionID, UUID, m_callbackURI);
+                UUID originID;
+
+                lock (m_originRegionIDAccessLock)
+                    originID = m_originRegionID;
+
+                Scene.SimulationService.ReleaseAgent(originID, UUID, m_callbackURI);
                 m_callbackURI = null;
             }
 //            else
@@ -3461,7 +3488,8 @@ namespace OpenSim.Region.Framework.Scenes
 
         private void CopyFrom(AgentData cAgent)
         {
-            m_originRegionID = cAgent.RegionID;
+            lock (m_originRegionIDAccessLock)
+                m_originRegionID = cAgent.RegionID;
 
             m_callbackURI = cAgent.CallbackURI;
 //            m_log.DebugFormat(
-- 
cgit v1.1


From 8502517d8081366dfc63756ae07cfe64a27a1eb0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 20 Sep 2013 23:07:24 +0100
Subject: Make UUID.Zero resolve to "Unknown User" in user cache.

This is to avoid massive numbers of 'no user found' logs when user IDs are missing for some reason.
UUID.Zero should not be used for any user ID.
---
 .../Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index bb2bbe3..96eb63f 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -73,6 +73,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 Init();
                 m_log.DebugFormat("[USER MANAGEMENT MODULE]: {0} is enabled", Name);
             }
+
+            AddUser(UUID.Zero, "Unknown", "User");
         }
 
         public bool IsSharedModule
-- 
cgit v1.1


From e2b3b7a2ae01a82e7ca1ed7efd6237a5bf1c9811 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 20 Sep 2013 23:42:55 +0100
Subject: minor: Correct minor spelling mistake Reseting -> Resetting in HG Map
 module log message

---
 OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index 97227b3..79a409d 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -129,7 +129,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
                         b.Access = 254; // means 'simulator is offline'. We need this because the viewer ignores 255's
                     }
 
-                    m_log.DebugFormat("[HG MAP]: Reseting {0} blocks", mapBlocks.Count);
+                    m_log.DebugFormat("[HG MAP]: Resetting {0} blocks", mapBlocks.Count);
                     sp.ControllingClient.SendMapBlock(mapBlocks, 0);
                     m_SeenMapBlocks.Remove(clientID);
                 }
-- 
cgit v1.1


From 4c0ec861769497b64b5ad71f712fb792564ebe4a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 21 Sep 2013 00:14:57 +0100
Subject: minor: Add prefix to log message in LureModule

---
 OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
index 7f4606b..465ffbc 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
@@ -165,7 +165,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
                     (uint)presence.AbsolutePosition.Y,
                     (uint)Math.Ceiling(presence.AbsolutePosition.Z));
 
-            m_log.DebugFormat("TP invite with message {0}, type {1}", message, lureType);
+            m_log.DebugFormat("[LURE MODULE]: TP invite with message {0}, type {1}", message, lureType);
 
             GridInstantMessage m = new GridInstantMessage(scene, client.AgentId,
                     client.FirstName+" "+client.LastName, targetid,
-- 
cgit v1.1


From cbdfe96905da9d1386b572f89e8372bbdb3345e6 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Mon, 15 Jul 2013 15:26:18 +0300
Subject: When giving items between avatars in different simulators, only add
 the item to the receiving avatar's inventory once.

When a user gives an item, the user's client sends an InventoryOffered IM message to its simulator. This adds the item to the receiver's inventory. If the receiver isn't in the same simulator then XMLRPC is used to forward the IM to the correct simulator. The bug was that the receiving simulator handled the message by calling OnInstantMessage() again, which added a second copy of the item to the inventory. Instead, the receiving simulator should only notify the avatar that the item was offered.
---
 .../Inventory/Transfer/InventoryTransferModule.cs  | 53 ++++++++++++++++++----
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 1417a19..f52654f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -148,9 +148,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 
         private void OnInstantMessage(IClientAPI client, GridInstantMessage im)
         {
-//            m_log.DebugFormat(
-//                "[INVENTORY TRANSFER]: {0} IM type received from {1}", 
-//                (InstantMessageDialog)im.dialog, client.Name);
+            m_log.DebugFormat(
+                "[INVENTORY TRANSFER]: {0} IM type received from client {1}. From={2} ({3}), To={4}", 
+                (InstantMessageDialog)im.dialog, client.Name,
+                im.fromAgentID, im.fromAgentName, im.toAgentID);
           
             Scene scene = FindClientScene(client.AgentId);
 
@@ -450,23 +451,57 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
         /// <summary>
         ///
         /// </summary>
-        /// <param name="msg"></param>
-        private void OnGridInstantMessage(GridInstantMessage msg)
+        /// <param name="im"></param>
+        private void OnGridInstantMessage(GridInstantMessage im)
         {
+            // Check if it's a type of message that we should handle
+            if (!((im.dialog == (byte) InstantMessageDialog.InventoryOffered)
+                || (im.dialog == (byte) InstantMessageDialog.InventoryAccepted)
+                || (im.dialog == (byte) InstantMessageDialog.InventoryDeclined)
+                || (im.dialog == (byte) InstantMessageDialog.TaskInventoryDeclined)))
+                return;
+
+            m_log.DebugFormat(
+                "[INVENTORY TRANSFER]: {0} IM type received from grid. From={1} ({2}), To={3}",
+                (InstantMessageDialog)im.dialog, im.fromAgentID, im.fromAgentName, im.toAgentID);
+
             // Check if this is ours to handle
             //
-            Scene scene = FindClientScene(new UUID(msg.toAgentID));
+            Scene scene = FindClientScene(new UUID(im.toAgentID));
 
             if (scene == null)
                 return;
 
             // Find agent to deliver to
             //
-            ScenePresence user = scene.GetScenePresence(new UUID(msg.toAgentID));
+            ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID));
 
-            // Just forward to local handling
-            OnInstantMessage(user.ControllingClient, msg);
+            if (user != null)
+            {
+                user.ControllingClient.SendInstantMessage(im);
 
+                if (im.dialog == (byte)InstantMessageDialog.InventoryOffered)
+                {
+                    AssetType assetType = (AssetType)im.binaryBucket[0];
+                    UUID inventoryID = new UUID(im.binaryBucket, 1);
+                
+                    IInventoryService invService = scene.InventoryService;
+                    InventoryNodeBase node = null;
+                    if (AssetType.Folder == assetType)
+                    {
+                        InventoryFolderBase folder = new InventoryFolderBase(inventoryID, new UUID(im.toAgentID));
+                        node = invService.GetFolder(folder);
+                    }
+                    else
+                    {
+                        InventoryItemBase item = new InventoryItemBase(inventoryID, new UUID(im.toAgentID));
+                        node = invService.GetItem(item);
+                    }
+
+                    if (node != null)
+                        user.ControllingClient.SendBulkUpdateInventory(node);
+                }
+            }
         }
     }
 }
-- 
cgit v1.1


From a37c59b43e34e1b3f279f7684a42a2c4a25f18c7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 21 Sep 2013 00:40:23 +0100
Subject: minor: Recomment out log message uncommented in previous cbdfe969

---
 .../Avatar/Inventory/Transfer/InventoryTransferModule.cs          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index f52654f..0b10dd8 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -148,10 +148,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 
         private void OnInstantMessage(IClientAPI client, GridInstantMessage im)
         {
-            m_log.DebugFormat(
-                "[INVENTORY TRANSFER]: {0} IM type received from client {1}. From={2} ({3}), To={4}", 
-                (InstantMessageDialog)im.dialog, client.Name,
-                im.fromAgentID, im.fromAgentName, im.toAgentID);
+//            m_log.DebugFormat(
+//                "[INVENTORY TRANSFER]: {0} IM type received from client {1}. From={2} ({3}), To={4}", 
+//                (InstantMessageDialog)im.dialog, client.Name,
+//                im.fromAgentID, im.fromAgentName, im.toAgentID);
           
             Scene scene = FindClientScene(client.AgentId);
 
-- 
cgit v1.1


From 2dc92e7de11086c7649d3ee0f8adc974efce6805 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Sun, 4 Aug 2013 19:19:11 +0200
Subject: Preserve attachment point & position when attachment is rezzed in
 world

Patch taken from
http://opensimulator.org/mantis/view.php?id=4905
originally by Greg C.

Fixed to apply to r/23314 commit
ba9daf849e7c8db48e7c03e7cdedb77776b2052f
(cherry picked from commit 4ff9fbca441110cc2b93edc7286e0e9339e61cbe)
---
 OpenSim/Data/MSSQL/MSSQLSimulationData.cs          | 17 ++++++++++---
 .../Data/MSSQL/Resources/RegionStore.migrations    | 12 +++++++++
 OpenSim/Data/MySQL/MySQLSimulationData.cs          | 29 ++++++++++++++++++----
 .../Data/MySQL/Resources/RegionStore.migrations    | 10 ++++++++
 .../Data/SQLite/Resources/RegionStore.migrations   | 12 +++++++++
 OpenSim/Data/SQLite/SQLiteSimulationData.cs        | 16 ++++++++++++
 OpenSim/Framework/PrimitiveBaseShape.cs            | 11 ++++++++
 .../Linden/Caps/ObjectCaps/ObjectAdd.cs            |  4 +++
 .../Caps/ObjectCaps/UploadObjectAssetModule.cs     |  1 +
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  |  1 +
 .../Avatar/Attachments/AttachmentsModule.cs        | 18 +++++++++++++-
 .../InventoryAccess/InventoryAccessModule.cs       |  8 ++++++
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs |  7 ++++++
 .../Scenes/Serialization/SceneObjectSerializer.cs  | 14 +++++++++++
 14 files changed, 150 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
index 5135050..f41f60c 100644
--- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
@@ -351,7 +351,7 @@ IF EXISTS (SELECT UUID FROM prims WHERE UUID = @UUID)
             ScriptAccessPin = @ScriptAccessPin, AllowedDrop = @AllowedDrop, DieAtEdge = @DieAtEdge, SalePrice = @SalePrice, 
             SaleType = @SaleType, ColorR = @ColorR, ColorG = @ColorG, ColorB = @ColorB, ColorA = @ColorA, ParticleSystem = @ParticleSystem, 
             ClickAction = @ClickAction, Material = @Material, CollisionSound = @CollisionSound, CollisionSoundVolume = @CollisionSoundVolume, PassTouches = @PassTouches,
-            LinkNumber = @LinkNumber, MediaURL = @MediaURL, DynAttrs = @DynAttrs,
+            LinkNumber = @LinkNumber, MediaURL = @MediaURL, AttachedPosX = @AttachedPosX, AttachedPosY = @AttachedPosY, AttachedPosZ = @AttachedPosZ, DynAttrs = @DynAttrs,
             PhysicsShapeType = @PhysicsShapeType, Density = @Density, GravityModifier = @GravityModifier, Friction = @Friction, Restitution = @Restitution
         WHERE UUID = @UUID
     END
@@ -367,7 +367,7 @@ ELSE
             PayPrice, PayButton1, PayButton2, PayButton3, PayButton4, LoopedSound, LoopedSoundGain, TextureAnimation, OmegaX, 
             OmegaY, OmegaZ, CameraEyeOffsetX, CameraEyeOffsetY, CameraEyeOffsetZ, CameraAtOffsetX, CameraAtOffsetY, CameraAtOffsetZ, 
             ForceMouselook, ScriptAccessPin, AllowedDrop, DieAtEdge, SalePrice, SaleType, ColorR, ColorG, ColorB, ColorA, 
-            ParticleSystem, ClickAction, Material, CollisionSound, CollisionSoundVolume, PassTouches, LinkNumber, MediaURL, DynAttrs,
+            ParticleSystem, ClickAction, Material, CollisionSound, CollisionSoundVolume, PassTouches, LinkNumber, MediaURL, AttachedPosX, AttachedPosY, AttachedPosZ, DynAttrs,
             PhysicsShapeType, Density, GravityModifier, Friction, Restitution
             ) VALUES (
             @UUID, @CreationDate, @Name, @Text, @Description, @SitName, @TouchName, @ObjectFlags, @OwnerMask, @NextOwnerMask, @GroupMask, 
@@ -378,7 +378,7 @@ ELSE
             @PayPrice, @PayButton1, @PayButton2, @PayButton3, @PayButton4, @LoopedSound, @LoopedSoundGain, @TextureAnimation, @OmegaX, 
             @OmegaY, @OmegaZ, @CameraEyeOffsetX, @CameraEyeOffsetY, @CameraEyeOffsetZ, @CameraAtOffsetX, @CameraAtOffsetY, @CameraAtOffsetZ, 
             @ForceMouselook, @ScriptAccessPin, @AllowedDrop, @DieAtEdge, @SalePrice, @SaleType, @ColorR, @ColorG, @ColorB, @ColorA, 
-            @ParticleSystem, @ClickAction, @Material, @CollisionSound, @CollisionSoundVolume, @PassTouches, @LinkNumber, @MediaURL, @DynAttrs,
+            @ParticleSystem, @ClickAction, @Material, @CollisionSound, @CollisionSoundVolume, @PassTouches, @LinkNumber, @MediaURL, @AttachedPosX, @AttachedPosY, @AttachedPosZ, @DynAttrs,
             @PhysicsShapeType, @Density, @GravityModifier, @Friction, @Restitution
             )
     END";
@@ -1695,6 +1695,12 @@ VALUES
             if (!(primRow["MediaURL"] is System.DBNull))
                 prim.MediaUrl = (string)primRow["MediaURL"];
             
+            if (!(primRow["AttachedPosX"] is System.DBNull))
+                prim.AttachedPos = new Vector3(
+                                        Convert.ToSingle(primRow["AttachedPosX"]),
+                                        Convert.ToSingle(primRow["AttachedPosY"]),
+                                        Convert.ToSingle(primRow["AttachedPosZ"]));
+
             if (!(primRow["DynAttrs"] is System.DBNull))
                 prim.DynAttrs = DAMap.FromXml((string)primRow["DynAttrs"]);
             else
@@ -2099,7 +2105,10 @@ VALUES
                 parameters.Add(_Database.CreateParameter("PassTouches", 0));
             parameters.Add(_Database.CreateParameter("LinkNumber", prim.LinkNum));
             parameters.Add(_Database.CreateParameter("MediaURL", prim.MediaUrl));
-            
+            parameters.Add(_Database.CreateParameter("AttachedPosX", prim.AttachedPos.X));
+            parameters.Add(_Database.CreateParameter("AttachedPosY", prim.AttachedPos.Y));
+            parameters.Add(_Database.CreateParameter("AttachedPosZ", prim.AttachedPos.Z));
+
             if (prim.DynAttrs.CountNamespaces > 0)
                 parameters.Add(_Database.CreateParameter("DynAttrs", prim.DynAttrs.ToXml()));
             else
diff --git a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
index 4549801..bb89884 100644
--- a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
@@ -1168,3 +1168,15 @@ ALTER TABLE prims ADD `Friction` double NOT NULL default '0.6';
 ALTER TABLE prims ADD `Restitution` double NOT NULL default '0.5';
 
 COMMIT
+
+:VERSION 40       #---------------- Save Attachment info
+
+BEGIN TRANSACTION
+
+ALTER TABLE prims ADD AttachedPosX float(53) default 0.0;
+ALTER TABLE prims ADD AttachedPosY float(53) default 0.0;
+ALTER TABLE prims ADD AttachedPosZ float(53) default 0.0;
+ALTER TABLE primshapes ADD LastAttachPoint int not null default 0;
+
+COMMIT
+
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index cf367ef..b03a904 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -173,7 +173,8 @@ namespace OpenSim.Data.MySQL
                                     "ParticleSystem, ClickAction, Material, " +
                                     "CollisionSound, CollisionSoundVolume, " +
                                     "PassTouches, " +
-                                    "LinkNumber, MediaURL, KeyframeMotion, " +
+                                    "LinkNumber, MediaURL, AttachedPosX, " +
+				    "AttachedPosY, AttachedPosZ, KeyframeMotion, " +
                                     "PhysicsShapeType, Density, GravityModifier, " +
                                     "Friction, Restitution, DynAttrs " +
                                     ") values (" + "?UUID, " +
@@ -208,7 +209,8 @@ namespace OpenSim.Data.MySQL
                                     "?ColorB, ?ColorA, ?ParticleSystem, " +
                                     "?ClickAction, ?Material, ?CollisionSound, " +
                                     "?CollisionSoundVolume, ?PassTouches, " +
-                                    "?LinkNumber, ?MediaURL, ?KeyframeMotion, " +
+                                    "?LinkNumber, ?MediaURL, ?AttachedPosX, " +
+				    "?AttachedPosY, ?AttachedPosZ, ?KeyframeMotion, " +
                                     "?PhysicsShapeType, ?Density, ?GravityModifier, " +
                                     "?Friction, ?Restitution, ?DynAttrs)";
 
@@ -227,7 +229,7 @@ namespace OpenSim.Data.MySQL
                                     "PathTaperX, PathTaperY, PathTwist, " +
                                     "PathTwistBegin, ProfileBegin, ProfileEnd, " +
                                     "ProfileCurve, ProfileHollow, Texture, " +
-                                    "ExtraParams, State, Media) " +
+                                    "ExtraParams, State, LastAttachPoint, Media) " +
                                     "values (?UUID, " +
                                     "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " +
                                     "?PCode, ?PathBegin, ?PathEnd, " +
@@ -239,7 +241,7 @@ namespace OpenSim.Data.MySQL
                                     "?PathTwistBegin, ?ProfileBegin, " +
                                     "?ProfileEnd, ?ProfileCurve, " +
                                     "?ProfileHollow, ?Texture, ?ExtraParams, " +
-                                    "?State, ?Media)";
+                                    "?State, ?LastAttachPoint, ?Media)";
 
                             FillShapeCommand(cmd, prim);
 
@@ -1303,7 +1305,16 @@ namespace OpenSim.Data.MySQL
             
             if (!(row["MediaURL"] is System.DBNull))
                 prim.MediaUrl = (string)row["MediaURL"];
-            
+
+            if (!(row["AttachedPosX"] is System.DBNull))
+            {
+                prim.AttachedPos = new Vector3(
+                    (float)(double)row["AttachedPosX"],
+                    (float)(double)row["AttachedPosY"],
+                    (float)(double)row["AttachedPosZ"]
+                    );
+            }
+
             if (!(row["DynAttrs"] is System.DBNull))
                 prim.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]);
             else
@@ -1673,6 +1684,12 @@ namespace OpenSim.Data.MySQL
 
             cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum);
             cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl);
+            if (prim.AttachedPos != null)
+            {
+                cmd.Parameters.AddWithValue("AttachedPosX", (double)prim.AttachedPos.X);
+                cmd.Parameters.AddWithValue("AttachedPosY", (double)prim.AttachedPos.Y);
+                cmd.Parameters.AddWithValue("AttachedPosZ", (double)prim.AttachedPos.Z);
+            }
 
             if (prim.KeyframeMotion != null)
                 cmd.Parameters.AddWithValue("KeyframeMotion", prim.KeyframeMotion.Serialize());
@@ -1879,6 +1896,7 @@ namespace OpenSim.Data.MySQL
             s.ExtraParams = (byte[])row["ExtraParams"];
 
             s.State = (byte)(int)row["State"];
+            s.LastAttachPoint = (byte)(int)row["LastAttachPoint"];
             
             if (!(row["Media"] is System.DBNull))
                 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
@@ -1925,6 +1943,7 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("Texture", s.TextureEntry);
             cmd.Parameters.AddWithValue("ExtraParams", s.ExtraParams);
             cmd.Parameters.AddWithValue("State", s.State);
+            cmd.Parameters.AddWithValue("LastAttachPoint", s.LastAttachPoint);
             cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml());
         }
 
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index 70b9558..a77e44d 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -930,3 +930,13 @@ BEGIN;
 ALTER TABLE prims ADD COLUMN `KeyframeMotion` blob;
 
 COMMIT;
+
+:VERSION 49         #--------------------- Save attachment info
+
+BEGIN;
+ALTER TABLE prims ADD COLUMN AttachedPosX double default 0;
+ALTER TABLE prims ADD COLUMN AttachedPosY double default 0;
+ALTER TABLE prims ADD COLUMN AttachedPosZ double default 0;
+ALTER TABLE primshapes ADD COLUMN LastAttachPoint int(4) not null default '0';
+COMMIT;
+
diff --git a/OpenSim/Data/SQLite/Resources/RegionStore.migrations b/OpenSim/Data/SQLite/Resources/RegionStore.migrations
index bff039d..901068f 100644
--- a/OpenSim/Data/SQLite/Resources/RegionStore.migrations
+++ b/OpenSim/Data/SQLite/Resources/RegionStore.migrations
@@ -600,3 +600,15 @@ BEGIN;
 ALTER TABLE prims ADD COLUMN `KeyframeMotion` blob;
 
 COMMIT;
+
+:VERSION 30       #---------------- Save Attachment info
+
+BEGIN;
+
+ALTER TABLE prims ADD COLUMN AttachedPosX double default '0';
+ALTER TABLE prims ADD COLUMN AttachedPosY double default '0';
+ALTER TABLE prims ADD COLUMN AttachedPosZ double default '0';
+ALTER TABLE primshapes ADD COLUMN LastAttachPoint int not null default '0';
+
+COMMIT;
+
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index eba6612..d938b6b 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -1236,6 +1236,10 @@ namespace OpenSim.Data.SQLite
 
             createCol(prims, "MediaURL", typeof(String));
             
+            createCol(prims, "AttachedPosX", typeof(Double));
+            createCol(prims, "AttachedPosY", typeof(Double));
+            createCol(prims, "AttachedPosZ", typeof(Double));
+
             createCol(prims, "DynAttrs", typeof(String));
 
             createCol(prims, "PhysicsShapeType", typeof(Byte));
@@ -1724,6 +1728,12 @@ namespace OpenSim.Data.SQLite
                 prim.MediaUrl = (string)row["MediaURL"];
             }
             
+            prim.AttachedPos = new Vector3(
+                Convert.ToSingle(row["AttachedPosX"]),
+                Convert.ToSingle(row["AttachedPosY"]),
+                Convert.ToSingle(row["AttachedPosZ"])
+                );
+
             if (!(row["DynAttrs"] is System.DBNull))
             {
                 //m_log.DebugFormat("[SQLITE]: DynAttrs type [{0}]", row["DynAttrs"].GetType());
@@ -2176,6 +2186,10 @@ namespace OpenSim.Data.SQLite
 
             row["MediaURL"] = prim.MediaUrl;
 
+            row["AttachedPosX"] = prim.AttachedPos.X;
+            row["AttachedPosY"] = prim.AttachedPos.Y;
+            row["AttachedPosZ"] = prim.AttachedPos.Z;
+
             if (prim.DynAttrs.CountNamespaces > 0)
                 row["DynAttrs"] = prim.DynAttrs.ToXml();
             else
@@ -2444,6 +2458,7 @@ namespace OpenSim.Data.SQLite
             s.ProfileCurve = Convert.ToByte(row["ProfileCurve"]);
             s.ProfileHollow = Convert.ToUInt16(row["ProfileHollow"]);
             s.State = Convert.ToByte(row["State"]);
+            s.LastAttachPoint = Convert.ToByte(row["LastAttachPoint"]);
 
             byte[] textureEntry = (byte[])row["Texture"];
             s.TextureEntry = textureEntry;
@@ -2493,6 +2508,7 @@ namespace OpenSim.Data.SQLite
             row["ProfileCurve"] = s.ProfileCurve;
             row["ProfileHollow"] = s.ProfileHollow;
             row["State"] = s.State;
+            row["LastAttachPoint"] = s.LastAttachPoint;
 
             row["Texture"] = s.TextureEntry;
             row["ExtraParams"] = s.ExtraParams;
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index c1e1a4f..c8a5376 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -105,6 +105,7 @@ namespace OpenSim.Framework
         private ushort _profileHollow;
         private Vector3 _scale;
         private byte _state;
+        private byte _lastattach;
         private ProfileShape _profileShape;
         private HollowShape _hollowShape;
 
@@ -207,6 +208,7 @@ namespace OpenSim.Framework
             PCode = (byte)prim.PrimData.PCode;
 
             State = prim.PrimData.State;
+            LastAttachPoint = prim.PrimData.State;
             PathBegin = Primitive.PackBeginCut(prim.PrimData.PathBegin);
             PathEnd = Primitive.PackEndCut(prim.PrimData.PathEnd);
             PathScaleX = Primitive.PackPathScale(prim.PrimData.PathScaleX);
@@ -583,6 +585,15 @@ namespace OpenSim.Framework
             }
         }
 
+        public byte LastAttachPoint {
+            get {
+                return _lastattach;
+            }
+            set {
+                _lastattach = value;
+            }
+        }
+
         public ProfileShape ProfileShape {
             get {
                 return _profileShape;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs
index 92805e2..94f8bc1 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs
@@ -155,6 +155,7 @@ namespace OpenSim.Region.ClientStack.Linden
             Quaternion rotation = Quaternion.Identity;
             Vector3 scale = Vector3.Zero;
             int state = 0;
+            int lastattach = 0;
 
             if (r.Type != OSDType.Map) // not a proper req
                 return responsedata;
@@ -224,6 +225,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
                 ray_target_id = ObjMap["RayTargetId"].AsUUID();
                 state = ObjMap["State"].AsInteger();
+                lastattach = ObjMap["LastAttachPoint"].AsInteger();
                 try
                 {
                     ray_end = ((OSDArray)ObjMap["RayEnd"]).AsVector3();
@@ -290,6 +292,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
                 //session_id = rm["session_id"].AsUUID();
                 state = rm["state"].AsInteger();
+                lastattach = rm["last_attach_point"].AsInteger();
                 try
                 {
                     ray_end = ((OSDArray)rm["ray_end"]).AsVector3();
@@ -331,6 +334,7 @@ namespace OpenSim.Region.ClientStack.Linden
             pbs.ProfileEnd = (ushort)profile_end;
             pbs.Scale = scale;
             pbs.State = (byte)state;
+            pbs.LastAttachPoint = (byte)lastattach;
 
             SceneObjectGroup obj = null; ;
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
index 55a503e..769fe28 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
@@ -277,6 +277,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 pbs.ProfileEnd = (ushort) obj.ProfileEnd;
                 pbs.Scale = obj.Scale;
                 pbs.State = (byte) 0;
+                pbs.LastAttachPoint = (byte) 0;
                 SceneObjectPart prim = new SceneObjectPart();
                 prim.UUID = UUID.Random();
                 prim.CreatorID = AgentId;
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 1b091bf..3609ec1 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -12188,6 +12188,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             shape.PCode = addPacket.ObjectData.PCode;
             shape.State = addPacket.ObjectData.State;
+            shape.LastAttachPoint = addPacket.ObjectData.State;
             shape.PathBegin = addPacket.ObjectData.PathBegin;
             shape.PathEnd = addPacket.ObjectData.PathEnd;
             shape.PathScaleX = addPacket.ObjectData.PathScaleX;
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 2818712..d0e0b35 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -422,6 +422,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 attachPos = Vector3.Zero;
             }
 
+            // if the attachment point is the same as previous, make sure we get the saved
+            // position info.
+            if (attachmentPt != 0 && attachmentPt == group.RootPart.Shape.LastAttachPoint)
+            {
+                attachPos = group.RootPart.AttachedPos;
+            }
+
             // AttachmentPt 0 means the client chose to 'wear' the attachment.
             if (attachmentPt == (uint)AttachmentPoint.Default)
             {
@@ -429,6 +436,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 attachmentPt = group.AttachmentPoint;
             }
 
+            // if we didn't find an attach point, look for where it was last attached
+            if (attachmentPt == 0)
+            {
+                attachmentPt = (uint)group.RootPart.Shape.LastAttachPoint;
+                attachPos = group.RootPart.AttachedPos;
+                group.HasGroupChanged = true;
+            }
+
             // if we still didn't find a suitable attachment point.......
             if (attachmentPt == 0)
             {
@@ -619,6 +634,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 so.ClearPartAttachmentData();
                 rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive);
                 so.HasGroupChanged = true;
+                so.RootPart.Shape.LastAttachPoint = (byte)so.AttachmentPoint;
                 rootPart.Rezzed = DateTime.Now;
                 rootPart.RemFlag(PrimFlags.TemporaryOnRez);
                 so.AttachToBackup();
@@ -1210,4 +1226,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
         #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 68e4e26..0ec9575 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -836,6 +836,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     m_log.Debug("[INVENTORY ACCESS MODULE]: Object has UUID.Zero! Position 3");
                 }
 
+                // if this was previously an attachment and is now being rezzed,
+                // save the old attachment info.
+                if (group.IsAttachment == false && group.RootPart.Shape.State != 0)
+                {
+                    group.RootPart.AttachedPos = group.AbsolutePosition;
+                    group.RootPart.Shape.LastAttachPoint = (byte)group.AttachmentPoint;
+                }
+
                 foreach (SceneObjectPart part in group.Parts)
                 {
                     // Make the rezzer the owner, as this is not necessarily set correctly in the serialized asset.
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 69b5f43..4bebbe8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2230,6 +2230,13 @@ namespace OpenSim.Region.Framework.Scenes
                     sourcePart.Inventory.RemoveInventoryItem(item.ItemID);
             }
 
+
+            if (group.IsAttachment == false && group.RootPart.Shape.State != 0)
+            {
+                group.RootPart.AttachedPos = group.AbsolutePosition;
+                group.RootPart.Shape.LastAttachPoint = (byte)group.AttachmentPoint;
+            }
+                                    
             group.FromPartID = sourcePart.UUID;
             AddNewSceneObject(group, true, pos, rot, vel);
             
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 945745e..3ea936c 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -365,6 +365,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             m_SOPXmlProcessors.Add("CollisionSound", ProcessCollisionSound);
             m_SOPXmlProcessors.Add("CollisionSoundVolume", ProcessCollisionSoundVolume);
             m_SOPXmlProcessors.Add("MediaUrl", ProcessMediaUrl);
+            m_SOPXmlProcessors.Add("AttachedPos", ProcessAttachedPos);
             m_SOPXmlProcessors.Add("DynAttrs", ProcessDynAttrs);
             m_SOPXmlProcessors.Add("TextureAnimation", ProcessTextureAnimation);
             m_SOPXmlProcessors.Add("ParticleSystem", ProcessParticleSystem);
@@ -433,6 +434,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             m_ShapeXmlProcessors.Add("ProfileEnd", ProcessShpProfileEnd);
             m_ShapeXmlProcessors.Add("ProfileHollow", ProcessShpProfileHollow);
             m_ShapeXmlProcessors.Add("Scale", ProcessShpScale);
+            m_ShapeXmlProcessors.Add("LastAttachPoint", ProcessShpLastAttach);
             m_ShapeXmlProcessors.Add("State", ProcessShpState);
             m_ShapeXmlProcessors.Add("ProfileShape", ProcessShpProfileShape);
             m_ShapeXmlProcessors.Add("HollowShape", ProcessShpHollowShape);
@@ -761,6 +763,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             obj.MediaUrl = reader.ReadElementContentAsString("MediaUrl", String.Empty);
         }
 
+        private static void ProcessAttachedPos(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.AttachedPos = Util.ReadVector(reader, "AttachedPos");
+        }
+
         private static void ProcessDynAttrs(SceneObjectPart obj, XmlTextReader reader)
         {
             obj.DynAttrs.ReadXml(reader);
@@ -1043,6 +1050,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             shp.State = (byte)reader.ReadElementContentAsInt("State", String.Empty);
         }
 
+        private static void ProcessShpLastAttach(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.LastAttachPoint = (byte)reader.ReadElementContentAsInt("LastAttachPoint", String.Empty);
+        }
+
         private static void ProcessShpProfileShape(PrimitiveBaseShape shp, XmlTextReader reader)
         {
             shp.ProfileShape = Util.ReadEnum<ProfileShape>(reader, "ProfileShape");
@@ -1289,6 +1301,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             writer.WriteElementString("CollisionSoundVolume", sop.CollisionSoundVolume.ToString());
             if (sop.MediaUrl != null)
                 writer.WriteElementString("MediaUrl", sop.MediaUrl.ToString());
+            WriteVector(writer, "AttachedPos", sop.AttachedPos);
             
             if (sop.DynAttrs.CountNamespaces > 0)
             {
@@ -1471,6 +1484,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 writer.WriteElementString("ProfileEnd", shp.ProfileEnd.ToString());
                 writer.WriteElementString("ProfileHollow", shp.ProfileHollow.ToString());
                 writer.WriteElementString("State", shp.State.ToString());
+                writer.WriteElementString("LastAttachPoint", shp.LastAttachPoint.ToString());
 
                 WriteFlags(writer, "ProfileShape", shp.ProfileShape.ToString(), options);
                 WriteFlags(writer, "HollowShape", shp.HollowShape.ToString(), options);
-- 
cgit v1.1


From 7889e7757a7a3266c70bf0763f92c53b33d86b60 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Sun, 4 Aug 2013 19:20:10 +0200
Subject: Don't use 'Indented' formatting for RpcXml responses. (cherry picked
 from commit 93abcde69043b175071e0bb752538d9730433f1d)

---
 OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index c4e569d..76b4257 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1056,7 +1056,21 @@ namespace OpenSim.Framework.Servers.HttpServer
                     }
 
                     response.ContentType = "text/xml";
-                    responseString = XmlRpcResponseSerializer.Singleton.Serialize(xmlRpcResponse);
+                    using (MemoryStream outs = new MemoryStream())
+                    {
+                        using (XmlTextWriter writer = new XmlTextWriter(outs, Encoding.UTF8))
+                        {
+                            writer.Formatting = Formatting.None;
+                            XmlRpcResponseSerializer.Singleton.Serialize(writer, xmlRpcResponse);
+                            writer.Flush();
+                            outs.Flush();
+                            outs.Position = 0;
+                            using (StreamReader sr = new StreamReader(outs))
+                            {
+                                responseString = sr.ReadToEnd();
+                            }
+                        }
+                    }
                 }
                 else
                 {
-- 
cgit v1.1


From 8de5c29e2cc75598f5a00e1a557bd925129e506e Mon Sep 17 00:00:00 2001
From: teravus
Date: Sun, 22 Sep 2013 21:34:55 -0500
Subject: * The last two are the the patch that Aleric wanted pulled from his
 repo. * Added GregC to CONTRIBUTORS.txt, Aleric was already in there. *
 There's some controversy, Some people have suggested that this could be
 stored in dynamic attributes instead of the database..    Melanie was wanting
 to pull from the avination repo but was asked to wait on committing anything
 new until the release.    The cherry-pick doesn't answer those questions.

---
 CONTRIBUTORS.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 8181483..a4bcb91 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -87,6 +87,7 @@ what it is today.
 * Garmin Kawaguichi
 * Gerhard
 * Godfrey
+* Greg C.
 * Grumly57
 * GuduleLapointe
 * Ewe Loon
-- 
cgit v1.1


From f384a6291e6b03b451dd3e3fec7667bc8f53c296 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 25 Sep 2013 00:02:17 +0100
Subject: Instead of swallowing any socket begin/end receive exceptions, log
 them for debugging purposes.

This may reveal why on some teleports with current code, the UseCircuitCode message gets through but CompleteMovement disappears into the ether.
---
 .../ClientStack/Linden/UDP/OpenSimUDPBase.cs       | 39 ++++++++++++++++++----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
index d0ed7e8..88494be 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
@@ -295,7 +295,16 @@ namespace OpenMetaverse
                         m_log.Warn("[UDPBASE]: Salvaged the UDP listener on port " + m_udpPort);
                     }
                 }
-                catch (ObjectDisposedException) { }
+                catch (ObjectDisposedException e) 
+                { 
+                    m_log.Error(
+                        string.Format("[UDPBASE]: Error processing UDP begin receive {0}.  Exception  ", UdpReceives), e);
+                }
+                catch (Exception e)
+                {
+                    m_log.Error(
+                        string.Format("[UDPBASE]: Error processing UDP begin receive {0}.  Exception  ", UdpReceives), e);
+                }
             }
         }
 
@@ -312,12 +321,12 @@ namespace OpenMetaverse
                 if (m_asyncPacketHandling)
                     AsyncBeginReceive();
 
-                // get the buffer that was created in AsyncBeginReceive
-                // this is the received data
-                UDPPacketBuffer buffer = (UDPPacketBuffer)iar.AsyncState;
-
                 try
                 {
+                    // get the buffer that was created in AsyncBeginReceive
+                    // this is the received data
+                    UDPPacketBuffer buffer = (UDPPacketBuffer)iar.AsyncState;
+
                     int startTick = Util.EnvironmentTickCount();
 
                     // get the length of data actually read from the socket, store it with the
@@ -345,8 +354,24 @@ namespace OpenMetaverse
                         m_currentReceiveTimeSamples++;
                     }
                 }
-                catch (SocketException) { }
-                catch (ObjectDisposedException) { }
+                catch (SocketException se) 
+                { 
+                    m_log.Error(
+                        string.Format(
+                            "[UDPBASE]: Error processing UDP end receive {0}, socket error code {1}.  Exception  ", 
+                            UdpReceives, se.ErrorCode), 
+                        se);
+                }
+                catch (ObjectDisposedException e) 
+                { 
+                    m_log.Error(
+                        string.Format("[UDPBASE]: Error processing UDP end receive {0}.  Exception  ", UdpReceives), e);
+                }
+                catch (Exception e)
+                {
+                    m_log.Error(
+                        string.Format("[UDPBASE]: Error processing UDP end receive {0}.  Exception  ", UdpReceives), e);
+                }
                 finally
                 {
 //                    if (UsePools)
-- 
cgit v1.1


From 732554be0451b9e7fa5f96ffb8f9f347b964dd88 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 25 Sep 2013 18:29:14 +0100
Subject: Reinsert 200ms sleep accidentally removed in commit 7dbc93c (Wed Sep
 18 21:41:51 2013 +0100)

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index b1752c1..a130ffe 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1722,9 +1722,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         m_log.DebugFormat(
                             "[LLUDPSERVER]: Received a CompleteMovementIntoRegion from {0} in {1} but no client exists.  Waiting.", 
                             endPoint, m_scene.Name);
-
-                        Thread.Sleep(200);
                     }
+
+                    Thread.Sleep(200);
                 }
 
                 if (client == null)
-- 
cgit v1.1


From 32ddfc274056e68bfd9e7e6d3e7921c8062a59d1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 25 Sep 2013 18:45:56 +0100
Subject: Reinsert client.SceneAgent checks into
 LLUDPServer.HandleCompleteMovementIntoRegion() to fix race condition
 regression in commit 7dbc93c (Wed Sep 18 21:41:51 2013 +0100)

This check is necessary to close a race condition where the CompleteAgentMovement processing could proceed when the UseCircuitCode thread had added the client to the client manager but before the ScenePresence had registered to process the CompleteAgentMovement message.
This is most probably why the message appeared to get lost on a proportion of entity transfers.
A better long term solution may be to set the IClientAPI.SceneAgent property before the client is added to the manager.
---
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs   | 37 +++++++++++++++-------
 OpenSim/Region/Framework/Scenes/Scene.cs           |  3 ++
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index a130ffe..9504f15 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1692,6 +1692,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 endPoint = (IPEndPoint)array[0];
                 CompleteAgentMovementPacket packet = (CompleteAgentMovementPacket)array[1];
 
+                m_log.DebugFormat(
+                    "[LLUDPSERVER]: Handling CompleteAgentMovement request from {0} in {1}", endPoint, m_scene.Name);
+
                 // Determine which agent this packet came from
                 // We need to wait here because in when using the OpenSimulator V2 teleport protocol to travel to a destination
                 // simulator with no existing child presence, the viewer (at least LL 3.3.4) will send UseCircuitCode 
@@ -1703,24 +1706,36 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 {
                     if (m_scene.TryGetClient(endPoint, out client))
                     {
-                        if (client.IsActive)
-                        {
-                            break;
-                        }
-                        else
+                        if (!client.IsActive)
                         {
                             // This check exists to catch a condition where the client has been closed by another thread
                             // but has not yet been removed from the client manager (and possibly a new connection has
                             // not yet been established).
                             m_log.DebugFormat(
-                                "[LLUDPSERVER]: Received a CompleteMovementIntoRegion from {0} for {1} in {2} but client is not active.  Waiting.",
+                                "[LLUDPSERVER]: Received a CompleteAgentMovement from {0} for {1} in {2} but client is not active yet.  Waiting.",
+                                endPoint, client.Name, m_scene.Name);
+                        }
+                        else if (client.SceneAgent == null)
+                        {
+                            // This check exists to catch a condition where the new client has been added to the client
+                            // manager but the SceneAgent has not yet been set in Scene.AddNewClient().  If we are too
+                            // eager, then the new ScenePresence may not have registered a listener for this messsage
+                            // before we try to process it.
+                            // XXX: A better long term fix may be to add the SceneAgent before the client is added to 
+                            // the client manager
+                            m_log.DebugFormat(
+                                "[LLUDPSERVER]: Received a CompleteAgentMovement from {0} for {1} in {2} but client SceneAgent not set yet.  Waiting.",
                                 endPoint, client.Name, m_scene.Name);
                         }
+                        else
+                        {
+                            break;
+                        }
                     }
                     else
                     {
                         m_log.DebugFormat(
-                            "[LLUDPSERVER]: Received a CompleteMovementIntoRegion from {0} in {1} but no client exists.  Waiting.", 
+                            "[LLUDPSERVER]: Received a CompleteAgentMovement from {0} in {1} but no client exists yet.  Waiting.", 
                             endPoint, m_scene.Name);
                     }
 
@@ -1730,19 +1745,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (client == null)
                 {
                     m_log.DebugFormat(
-                        "[LLUDPSERVER]: No client found for CompleteMovementIntoRegion from {0} in {1} after wait.  Dropping.",
+                        "[LLUDPSERVER]: No client found for CompleteAgentMovement from {0} in {1} after wait.  Dropping.",
                         endPoint, m_scene.Name);
 
                     return;
                 }
-                else if (!client.IsActive)
+                else if (!client.IsActive || client.SceneAgent == null)
                 {
                     // This check exists to catch a condition where the client has been closed by another thread
                     // but has not yet been removed from the client manager.
                     // The packet could be simply ignored but it is useful to know if this condition occurred for other debugging
                     // purposes.
                     m_log.DebugFormat(
-                        "[LLUDPSERVER]: Received a CompleteMovementIntoRegion from {0} for {1} in {2} but client is not active after wait.  Dropping.",
+                        "[LLUDPSERVER]: Received a CompleteAgentMovement from {0} for {1} in {2} but client is not active after wait.  Dropping.",
                         endPoint, client.Name, m_scene.Name);
 
                     return;
@@ -1767,7 +1782,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             catch (Exception e)
             {
                 m_log.ErrorFormat(
-                    "[LLUDPSERVER]: CompleteMovementIntoRegion handling from endpoint {0}, client {1} {2} failed.  Exception {3}{4}",
+                    "[LLUDPSERVER]: CompleteAgentMovement 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",
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index bc5a67f..3dc509b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2863,6 +2863,9 @@ namespace OpenSim.Region.Framework.Scenes
     
                 // We must set this here so that TriggerOnNewClient and TriggerOnClientLogin can determine whether the
                 // client is for a root or child agent.
+                // XXX: This may be better set for a new client before that client is added to the client manager.
+                // But need to know what happens in the case where a ScenePresence is already present (and if this 
+                // actually occurs).
                 client.SceneAgent = sp;
 
                 // This is currently also being done earlier in NewUserConnection for real users to see if this 
-- 
cgit v1.1


From b22c92368f8991c174897306334c523bac8a4099 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 25 Sep 2013 21:53:38 +0100
Subject: Move adding UUID.Zero -> Unknown User binding to UMM.Init() so that
 it's also called by HGUserManagementModule

---
 .../CoreModules/Framework/UserManagement/UserManagementModule.cs       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 96eb63f..d3926cc 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -73,8 +73,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 Init();
                 m_log.DebugFormat("[USER MANAGEMENT MODULE]: {0} is enabled", Name);
             }
-
-            AddUser(UUID.Zero, "Unknown", "User");
         }
 
         public bool IsSharedModule
@@ -645,6 +643,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         protected void Init()
         {
+            AddUser(UUID.Zero, "Unknown", "User");
             RegisterConsoleCmds();
         }
 
-- 
cgit v1.1


From 4664090b34dfa2e944204fb7b616a19fcb3eeddf Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 25 Sep 2013 22:59:57 +0100
Subject: minor: correct spelling of Initialized in LSC connector version
 message

---
 .../ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 8ec943d..5c098a8 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                     throw new Exception(string.Format("Invalid ConnectorProtocolVersion {0}", ServiceVersion));
 
                 m_log.InfoFormat(
-                    "[LOCAL SIMULATION CONNECTOR]: Initialzied with connector protocol version {0}", ServiceVersion);
+                    "[LOCAL SIMULATION CONNECTOR]: Initialized with connector protocol version {0}", ServiceVersion);
             }
         }
 
-- 
cgit v1.1


From babfbe8d6d29380e42242008b6a743bc895ddb96 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 26 Sep 2013 00:31:33 +0100
Subject: minor: log MaxOutgoingTransferVersion at EntityTransferModule startup

---
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index c1c8672..8ae81ac 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -185,6 +185,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 else
                 {
                     transferVersionName = rawVersionComponents[0];
+
+                    m_log.InfoFormat(
+                        "[ENTITY TRANSFER MODULE]: MaxOutgoingTransferVersion set to {0}", 
+                        string.Format("{0}/{1}", transferVersionName, maxTransferVersion));
                 }
 
                 DisableInterRegionTeleportCancellation 
-- 
cgit v1.1


From 253f8de8cddfc195c2e54ef328ac0c4cb371d199 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 26 Sep 2013 00:33:50 +0100
Subject: minor: Add scene name to baked textures in cache log message

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 8d72e18..7243db1 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2909,7 +2909,7 @@ namespace OpenSim.Region.Framework.Scenes
             // If we are using the the cached appearance then send it out to everyone
             if (cachedappearance)
             {
-                m_log.DebugFormat("[SCENE PRESENCE]: baked textures are in the cache for {0}", Name);
+                m_log.DebugFormat("[SCENE PRESENCE]: Baked textures are in the cache for {0} in {1}", Name, m_scene.Name);
 
                 // If the avatars baked textures are all in the cache, then we have a 
                 // complete appearance... send it out, if not, then we'll send it when
-- 
cgit v1.1


From e24edada2435f942575a5a7acb4568fe6c0e4e30 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 26 Sep 2013 00:39:32 +0100
Subject: minor: Comment out windlight log message about sending scene data for
 now.

---
 OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
index 89f3280..0a4e83e 100644
--- a/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
+++ b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
@@ -207,7 +207,8 @@ namespace OpenSim.Region.CoreModules.World.LightShare
 
         private void EventManager_OnMakeRootAgent(ScenePresence presence)
         {
-            m_log.Debug("[WINDLIGHT]: Sending windlight scene to new client");
+//            m_log.Debug("[WINDLIGHT]: Sending windlight scene to new client {0}", presence.Name);
+
             SendProfileToClient(presence.ControllingClient);
         }
 
-- 
cgit v1.1


From d6d82dbd3c9d081209914351ff3cc18c349e362b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 26 Sep 2013 20:13:29 +0100
Subject: minor: correct attachment spelling mistake in log message in
 HGEntityTransferModule.OnIncomingSceneObject()

---
 .../CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 76dbc72..04a0db6 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 if (aCircuit.ServiceURLs != null && aCircuit.ServiceURLs.ContainsKey("AssetServerURI"))
                 {
                     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);
+                    m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Incoming attachment {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(Scene.AssetService, url);
                     uuidGatherer.GatherAssetUuids(so, ids);
-- 
cgit v1.1


From 70b51f12cd0b4f2c11cefa4a2c47b91fe2fde53e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 27 Sep 2013 00:01:18 +0100
Subject: minor: Clean up tabbing and spacing issues in OpenSim.ini.example

---
 bin/OpenSim.ini.example | 51 +++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index d6de777..b78e3b7 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -418,8 +418,8 @@
     ;# {SMTP_SERVER_PASSWORD} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server password} {}
     ; SMTP_SERVER_PASSWORD = ""
 
-[Network]
 
+[Network]
     ;# {ConsoleUser} {} {User name for console account} {}
     ;; Configure the remote console user here. This will not actually be used
     ;; unless you use -console=rest at startup.
@@ -456,6 +456,7 @@
     ;; web server
     ; user_agent = "OpenSim LSL (Mozilla Compatible)"
 
+
 [XMLRPC]
     ;# {XmlRpcRouterModule} {} {Module used to route incoming llRemoteData calls} {XmlRpcRouterModule XmlRpcGridRouterModule} XmlRpcRouterModule
     ;; If enabled and set to XmlRpcRouterModule, this will post an event, 
@@ -470,9 +471,6 @@
     ;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800
     ;XmlRpcPort = 20800
 
-
-;;    {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
@@ -508,7 +506,7 @@
     ; These are enabled by default to localhost. Change if you see fit.
     Cap_GetTexture = "localhost"
     Cap_GetMesh = "localhost"
-	Cap_AvatarPickerSearch = "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.
@@ -516,7 +514,6 @@
 
 
 [SimulatorFeatures]
-
     ;# {MapImageServerURI} {} {URL for the map server} {}
     ; Experimental new information sent in SimulatorFeatures cap for Kokua
     ; viewers 
@@ -554,7 +551,7 @@
     ;; Module to handle offline messaging. The core module requires an external
     ;; web service to do this. See OpenSim wiki.
     ; OfflineMessageModule = OfflineMessageModule
-	;; Or, alternatively, use this one, which works for both standalones and grids
+    ;; Or, alternatively, use this one, which works for both standalones and grids
     ; OfflineMessageModule = "Offline Message Module V2"
 
     ;# {OfflineMessageURL} {OfflineMessageModule:OfflineMessageModule Offline Message Module V2:Offline Message Module V2} {URL of offline messaging service} {}
@@ -562,8 +559,8 @@
     ; OfflineMessageURL = http://yourserver/Offline.php or http://yourrobustserver:8003
 
     ;# {StorageProvider} {Offline Message Module V2:Offline Message Module V2} {DLL that provides the storage interface} {OpenSim.Data.MySQL.dll}
-	;; For standalones, this is the storage dll.
-	; StorageProvider = OpenSim.Data.MySQL.dll
+    ;; For standalones, this is the storage dll.
+    ; StorageProvider = OpenSim.Data.MySQL.dll
 
     ;# {MuteListModule} {OfflineMessageModule:OfflineMessageModule} {} {} MuteListModule
     ;; Mute list handler (not yet implemented). MUST BE SET to allow offline
@@ -960,38 +957,38 @@
     ;; http://code.google.com/p/flotsam/
     ;; or from the SimianGrid project at http://code.google.com/p/openmetaverse
     ; Module = Default
-	;; or... use Groups Module V2, which works for standalones and robust grids
-	; Module = "Groups Module V2"
+    ;; or... use Groups Module V2, which works for standalones and robust grids
+    ; Module = "Groups Module V2"
 
     ;# {StorageProvider} {Module:Groups Module V2} {The DLL that provides the storage for V2} {OpenSim.Data.MySQL.dll} 
     ; StorageProvider = OpenSim.Data.MySQL.dll
 
     ;# {ServicesConnectorModule} {Module:GroupsModule Module:Groups Module V2} {Service connector to use for groups} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector "Groups Local Service Connector" "Groups Remote Service Connector" "Groups HG Service Connector"} XmlRpcGroupsServicesConnector
     ;; Service connectors to the Groups Service as used in the GroupsModule.  Select one as follows:
-	;; -- for Flotsam Groups use XmlRpcGroupsServicesConnector
-	;; -- for Simian Groups use SimianGroupsServicesConnector
-	;; -- for V2 Groups, standalone, non-HG use "Groups Local Service Connector"
-	;; -- for V2 Groups, grided sim, non-HG use "Groups Remote Service Connector"
-	;; -- for V2 Groups, HG, both standalone and grided sim, use "Groups HG Service Connector"
-	;; Note that the quotes "" around the words are important!
+    ;; -- for Flotsam Groups use XmlRpcGroupsServicesConnector
+    ;; -- for Simian Groups use SimianGroupsServicesConnector
+    ;; -- for V2 Groups, standalone, non-HG use "Groups Local Service Connector"
+    ;; -- for V2 Groups, grided sim, non-HG use "Groups Remote Service Connector"
+    ;; -- for V2 Groups, HG, both standalone and grided sim, use "Groups HG Service Connector"
+    ;; Note that the quotes "" around the words are important!
     ; ServicesConnectorModule = XmlRpcGroupsServicesConnector
 
     ;# {LocalService} {ServicesConnectorModule:Groups HG Service Connector} {Is the group service in this process or elsewhere?} {local remote} local
-	;; Used for V2 in HG only. If standalone, set this to local; if grided sim, set this to remote
+    ;; Used for V2 in HG only. If standalone, set this to local; if grided sim, set this to remote
     ; LocalService = local
 
     ;# {GroupsServerURI} {Module:GroupsModule (ServicesConnectorModule:Groups Remote Service Connector or (ServicesConnectorModule:Groups HG Service Connector and LocalService:remote))} {Groups Server URI} {}
     ;; URI for the groups services of this grid
     ;; e.g. http://yourxmlrpcserver.com/xmlrpc.php for Flotsam XmlRpc
     ;; or http://mygridserver.com:82/Grid/ for SimianGrid
-	;; or http:://mygridserver.com:8003 for robust, V2
-	;; Leave it commented for standalones, V2
+    ;; or http:://mygridserver.com:8003 for robust, V2
+    ;; Leave it commented for standalones, V2
     ; GroupsServerURI = ""
 
     ;# {HomeURI} {ServicesConnectorModule:Groups HG Service Connector} {What's the home address of this world?} {} 
-	;; Used for V2 in HG only. For example
-	;; http://mygridserver.com:9000 or http://mygridserver.com:8002
-	;; If you have this set under [Startup], no need to set it here, leave it commented
+    ;; Used for V2 in HG only. For example
+    ;; http://mygridserver.com:9000 or http://mygridserver.com:8002
+    ;; If you have this set under [Startup], no need to set it here, leave it commented
     ; HomeURI = "" 
 
     ;# {MessagingEnabled} {Module:GroupsModule Module:Groups Module V2} {Is groups messaging enabled?} {true false} true
@@ -999,8 +996,8 @@
 
     ;# {MessagingModule} {MessagingEnabled:true} {Module to use for groups messaging} {GroupsMessagingModule "Groups Messaging Module V2"} GroupsMessagingModule
     ; MessagingModule = GroupsMessagingModule
-	;; or use V2 for Groups V2
-	; MessagingModule = "Groups Messaging Module V2"
+    ;; or use V2 for Groups V2
+    ; MessagingModule = "Groups Messaging Module V2"
 
     ;# {NoticesEnabled} {Module:GroupsModule Module:Groups Module V2} {Enable group notices?} {true false} true
     ;; Enable Group Notices
@@ -1020,6 +1017,7 @@
     ; XmlRpcServiceReadKey    = 1234
     ; XmlRpcServiceWriteKey   = 1234
 
+
 [InterestManagement]
      ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness
      ;; This section controls how state updates are prioritized for each client
@@ -1038,16 +1036,19 @@
     ;# {Enabled} {} {Enable Non Player Character (NPC) facilities} {true false} false
     ; Enabled = false
 
+
 [Terrain]
     ;# {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,
-- 
cgit v1.1


From 585d0800dd61798ec2640e3f42f7d41fb9fa5b33 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 27 Sep 2013 00:14:40 +0100
Subject: minor: Make OpenSimDefaults.ini consistent (spacing and tabs to
 spaces)

---
 bin/OpenSimDefaults.ini | 51 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 8da4daf..c090306 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -399,7 +399,6 @@
   ; ProfileURL = http://127.0.0.1:9000
 
 
-
 [SMTP]
     enabled = false
 
@@ -461,6 +460,7 @@
     ; many simultaneous requests, default is 30 and is currently applied only to assets
     ;MaxRequestConcurrency = 30
 
+
 [ClientStack.LindenUDP]
     ; Set this to true to process incoming packets asynchronously. Networking is
     ; already separated from packet handling with a queue, so this will only
@@ -560,6 +560,7 @@
     ;
     ;PausedAckTimeout = 300
 
+
 [ClientStack.LindenCaps]
     ;; Long list of capabilities taken from 
     ;; http://wiki.secondlife.com/wiki/Current_Sim_Capabilities
@@ -632,8 +633,8 @@
     Cap_FetchInventoryDescendents2 = "localhost"
     Cap_FetchInventory2 = "localhost"
 
-	; Capability for searching for people
-	Cap_AvatarPickerSearch = "localhost"
+    ; Capability for searching for people
+    Cap_AvatarPickerSearch = "localhost"
 
     
 [Chat]
@@ -964,6 +965,7 @@
     ; Default is false.
     ;force_simple_prim_meshing = true
 
+
 [BulletSim]
     ; All the BulletSim parameters can be displayed with the console command
     ;   "physics get all" and all are defined in the source file
@@ -1279,6 +1281,7 @@
     ; Maximum number of external urls that scripts can set up in this simulator (e.g. via llRequestURL())
     max_external_urls_per_simulator = 100
 
+
 [DataSnapshot]
     ; The following set of configs pertains to search.
     ; Set index_sims to true to enable search engines to index your searchable data
@@ -1683,31 +1686,36 @@
      RootReprioritizationDistance = 10.0
      ChildReprioritizationDistance = 20.0
 
+
 [Monitoring]
     ; Enable region monitoring
     ; If true, this will print out an error if more than a minute has passed since the last simulator frame
     ; Also is another source of region statistics provided via the regionstats URL
     Enabled = true
 
-; View region statistics via a web page
-; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page
-; Use a web browser and type in the "Login URI" + "/SStats/"
-; For example- http://127.0.0.1:9000/SStats/
+
 [WebStats]
-; enabled=false
+    ; View region statistics via a web page
+    ; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page
+    ; Use a web browser and type in the "Login URI" + "/SStats/"
+    ; For example- http://127.0.0.1:9000/SStats/
+    ; enabled=false
 
 
 [MediaOnAPrim]
     ; Enable media on a prim facilities
     Enabled = true;
 
+
 [NPC]
     ;; Enable Non Player Character (NPC) facilities
     Enabled = false
 
+
 [Terrain]
     InitialTerrain = "pinhead-island"
 
+
 ;; 
 ;; If you are using a simian grid frontend you can enable
 ;; this module to upload tile images for the mapping fn
@@ -1717,15 +1725,17 @@
     MaptileURL = "http://www.mygrid.com/Grid/"
     RefreshTime = 3600
 
+
 ;;
 ;; JsonStore module provides structured store for scripts 
 ;; 
 [JsonStore]
-Enabled = False
+    Enabled = False
+
+    ;; Enable direct access to the SOP dynamic attributes
+    EnableObjectStore = False
+    MaxStringSpace = 0
 
-;; Enable direct access to the SOP dynamic attributes
-EnableObjectStore = False
-MaxStringSpace = 0
 
 ;;
 ;; These are defaults that are overwritten below in [Architecture].
@@ -1740,24 +1750,29 @@ MaxStringSpace = 0
     ; asset store each time the region starts
     AssetLoaderEnabled = true
 
+
 [GridService]
     ;; default standalone, overridable in StandaloneCommon.ini
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
 	
+
 [AutoBackupModule]
-	;; default is module is disabled at the top level
-	AutoBackupModuleEnabled = false
+    ;; default is module is disabled at the top level
+    AutoBackupModuleEnabled = false
+
 
 [Sounds]
-	;; {Module} {} {Implementation of ISoundModule to use.} {OpenSim.Region.CoreModules.dll:SoundModule}
-	Module = OpenSim.Region.CoreModules.dll:SoundModule
+    ;; {Module} {} {Implementation of ISoundModule to use.} {OpenSim.Region.CoreModules.dll:SoundModule}
+    Module = OpenSim.Region.CoreModules.dll:SoundModule
+
+    ;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0}
+    MaxDistance = 100.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"
-- 
cgit v1.1


From b704de9bf82782c3e8e5ebbdf88d8dfcb26c1750 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Thu, 26 Sep 2013 16:27:11 -0700
Subject: minor code formatting for the sake of consistency and readability

---
 OpenSim/Region/Application/OpenSim.cs | 54 +++++++++++++++++++++++------------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 1cdd868..a7fe226 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -237,27 +237,33 @@ namespace OpenSim
 
             m_console.Commands.AddCommand("General", false, "change region",
                                           "change region <region name>",
-                                          "Change current console region", ChangeSelectedRegion);
+                                          "Change current console region", 
+                                          ChangeSelectedRegion);
 
             m_console.Commands.AddCommand("Archiving", false, "save xml",
                                           "save xml",
-                                          "Save a region's data in XML format", SaveXml);
+                                          "Save a region's data in XML format", 
+                                          SaveXml);
 
             m_console.Commands.AddCommand("Archiving", false, "save xml2",
                                           "save xml2",
-                                          "Save a region's data in XML2 format", SaveXml2);
+                                          "Save a region's data in XML2 format", 
+                                          SaveXml2);
 
             m_console.Commands.AddCommand("Archiving", false, "load xml",
                                           "load xml [-newIDs [<x> <y> <z>]]",
-                                          "Load a region's data from XML format", LoadXml);
+                                          "Load a region's data from XML format",
+                                          LoadXml);
 
             m_console.Commands.AddCommand("Archiving", false, "load xml2",
                                           "load xml2",
-                                          "Load a region's data from XML2 format", LoadXml2);
+                                          "Load a region's data from XML2 format", 
+                                          LoadXml2);
 
             m_console.Commands.AddCommand("Archiving", false, "save prims xml2",
                                           "save prims xml2 [<prim name> <file name>]",
-                                          "Save named prim to XML2", SavePrimsXml2);
+                                          "Save named prim to XML2", 
+                                          SavePrimsXml2);
 
             m_console.Commands.AddCommand("Archiving", false, "load oar",
                                           "load oar [--merge] [--skip-assets] [<OAR path>]",
@@ -287,7 +293,8 @@ namespace OpenSim
 
             m_console.Commands.AddCommand("Objects", false, "edit scale",
                                           "edit scale <name> <x> <y> <z>",
-                                          "Change the scale of a named prim", HandleEditScale);
+                                          "Change the scale of a named prim", 
+                                          HandleEditScale);
 
             m_console.Commands.AddCommand("Users", false, "kick user",
                                           "kick user <first> <last> [--force] [message]",
@@ -305,31 +312,38 @@ namespace OpenSim
 
             m_console.Commands.AddCommand("Comms", false, "show connections",
                                           "show connections",
-                                          "Show connection data", HandleShow);
+                                          "Show connection data", 
+                                          HandleShow);
 
             m_console.Commands.AddCommand("Comms", false, "show circuits",
                                           "show circuits",
-                                          "Show agent circuit data", HandleShow);
+                                          "Show agent circuit data", 
+                                          HandleShow);
 
             m_console.Commands.AddCommand("Comms", false, "show pending-objects",
                                           "show pending-objects",
-                                          "Show # of objects on the pending queues of all scene viewers", HandleShow);
+                                          "Show # of objects on the pending queues of all scene viewers", 
+                                          HandleShow);
 
             m_console.Commands.AddCommand("General", false, "show modules",
                                           "show modules",
-                                          "Show module data", HandleShow);
+                                          "Show module data", 
+                                          HandleShow);
 
             m_console.Commands.AddCommand("Regions", false, "show regions",
                                           "show regions",
-                                          "Show region data", HandleShow);
+                                          "Show region data", 
+                                          HandleShow);
             
             m_console.Commands.AddCommand("Regions", false, "show ratings",
                                           "show ratings",
-                                          "Show rating data", HandleShow);
+                                          "Show rating data", 
+                                          HandleShow);
 
             m_console.Commands.AddCommand("Objects", false, "backup",
                                           "backup",
-                                          "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.", RunCommand);
+                                          "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.", 
+                                          RunCommand);
 
             m_console.Commands.AddCommand("Regions", false, "create region",
                                           "create region [\"region name\"] <region_file.ini>",
@@ -342,19 +356,23 @@ namespace OpenSim
 
             m_console.Commands.AddCommand("Regions", false, "restart",
                                           "restart",
-                                          "Restart all sims in this instance", RunCommand);
+                                          "Restart all sims in this instance", 
+                                          RunCommand);
 
             m_console.Commands.AddCommand("General", false, "command-script",
                                           "command-script <script>",
-                                          "Run a command script from file", RunCommand);
+                                          "Run a command script from file", 
+                                          RunCommand);
 
             m_console.Commands.AddCommand("Regions", false, "remove-region",
                                           "remove-region <name>",
-                                          "Remove a region from this simulator", RunCommand);
+                                          "Remove a region from this simulator", 
+                                          RunCommand);
 
             m_console.Commands.AddCommand("Regions", false, "delete-region",
                                           "delete-region <name>",
-                                          "Delete a region from disk", RunCommand);
+                                          "Delete a region from disk", 
+                                          RunCommand);
         }
 
         protected override void ShutdownSpecific()
-- 
cgit v1.1


From b16bc7b01ca0691758e66f85238d657f02271082 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 27 Sep 2013 19:14:21 +0100
Subject: refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order
 to make it clear that all non-clientstack callers should be using this rather
 than RemoveClient() in order to step through the ScenePresence state machine
 properly.

Adds IScene.CloseAgent() to replace RemoveClient()
---
 OpenSim/Framework/IScene.cs                        | 12 +++++-----
 OpenSim/Region/Application/OpenSim.cs              |  2 +-
 .../Caps/EventQueue/Tests/EventQueueTests.cs       |  2 +-
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs   |  4 ++--
 .../ClientStack/Linden/UDP/Tests/MockScene.cs      |  6 ++---
 .../Attachments/Tests/AttachmentsModuleTests.cs    |  2 +-
 .../Region/CoreModules/Avatar/Gods/GodsModule.cs   |  2 +-
 .../EntityTransfer/EntityTransferModule.cs         |  8 +++----
 .../Simulation/LocalSimulationConnector.cs         |  2 +-
 .../World/Estate/EstateManagementModule.cs         |  6 ++---
 OpenSim/Region/Framework/Scenes/Scene.cs           | 26 +++++++++++-----------
 OpenSim/Region/Framework/Scenes/SceneBase.cs       | 14 +-----------
 .../Scenes/Tests/ScenePresenceAgentTests.cs        |  4 ++--
 .../Scenes/Tests/ScenePresenceCapabilityTests.cs   |  2 +-
 .../Region/OptionalModules/World/NPC/NPCModule.cs  |  2 +-
 .../Shared/Api/Implementation/OSSL_Api.cs          |  2 +-
 16 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 8164f41..c3df37b 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Framework
         event restart OnRestart;
 
         /// <summary>
-        /// Add a new client and create a presence for it.  All clients except initial login clients will starts off as a child agent
+        /// Add a new agent.  All agents except initial login clients will starts off as a child agent
         /// - the later agent crossing will promote it to a root agent.
         /// </summary>
         /// <param name="client"></param>
@@ -96,14 +96,16 @@ namespace OpenSim.Framework
         ISceneAgent AddNewClient(IClientAPI client, PresenceType type);
 
         /// <summary>
-        /// Remove the given client from the scene.
+        /// Tell a single agent to disconnect from the region.
         /// </summary>
         /// <param name="agentID"></param>
-        /// <param name="closeChildAgents">Close the neighbour child agents associated with this client.</param>
-        void RemoveClient(UUID agentID, bool closeChildAgents);
+        /// <param name="force">
+        /// Force the agent to close even if it might be in the middle of some other operation.  You do not want to
+        /// force unless you are absolutely sure that the agent is dead and a normal close is not working.
+        /// </param>
+        bool CloseAgent(UUID agentID, bool force);
 
         void Restart();
-        //RegionInfo OtherRegionUp(RegionInfo thisRegion);
 
         string GetSimulatorVersion();
 
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index a7fe226..12250df 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -452,7 +452,7 @@ namespace OpenSim
                     else
                         presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n");
 
-                    presence.Scene.IncomingCloseAgent(presence.UUID, force);
+                    presence.Scene.CloseAgent(presence.UUID, force);
                     break;
                 }
             }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
index b3b0b8a..9e24bce 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
             UUID spId = TestHelpers.ParseTail(0x1);
 
             SceneHelpers.AddScenePresence(m_scene, spId);
-            m_scene.IncomingCloseAgent(spId, false);
+            m_scene.CloseAgent(spId, false);
 
             // TODO: Add more assertions for the other aspects of event queues
             Assert.That(MainServer.Instance.GetPollServiceHandlerKeys().Count, Is.EqualTo(0));
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 9504f15..5296a6d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1893,7 +1893,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                      client.Kick("Simulator logged you out due to connection timeout.");
             }
 
-            m_scene.IncomingCloseAgent(client.AgentId, true);
+            m_scene.CloseAgent(client.AgentId, true);
         }
 
         private void IncomingPacketHandler()
@@ -2234,7 +2234,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (!client.IsLoggingOut)
             {
                 client.IsLoggingOut = true;
-                m_scene.IncomingCloseAgent(client.AgentId, false);
+                m_scene.CloseAgent(client.AgentId, false);
             }
         }
     }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs
index 119a677..28b5eb7 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs
@@ -59,10 +59,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             // FIXME
             return null;
         }
-        
-        public override void RemoveClient(UUID agentID, bool someReason) {}
-//        public override void CloseAllAgents(uint circuitcode) {}
+
+        public override bool CloseAgent(UUID agentID, bool force) { return true; }
         public override bool CheckClient(UUID clientId, IPEndPoint endPoint) { return true; }
+
         public override void OtherRegionUp(GridRegion otherRegion) {  }
 
         public override bool TryGetScenePresence(UUID uuid, out ScenePresence sp) { sp = null; return false; }
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index fd493fc..4e58045 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -719,7 +719,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             SceneObjectGroup rezzedAtt = presence.GetAttachments()[0];
 
             m_numberOfAttachEventsFired = 0;
-            scene.IncomingCloseAgent(presence.UUID, false);
+            scene.CloseAgent(presence.UUID, false);
 
             // Check that we can't retrieve this attachment from the scene.
             Assert.That(scene.GetSceneObjectGroup(rezzedAtt.UUID), Is.Null);
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index 0cd495c..3b6d970 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -272,7 +272,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             if (sp.IsChildAgent)
                 return;
             sp.ControllingClient.Kick(reason);
-            sp.Scene.IncomingCloseAgent(sp.UUID, true); 
+            sp.Scene.CloseAgent(sp.UUID, true); 
         }
 
         private void OnIncomingInstantMessage(GridInstantMessage msg)
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 8ae81ac..aa8a4db 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -972,7 +972,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
             {
-                if (!sp.Scene.IncomingPreCloseAgent(sp))
+                if (!sp.Scene.IncomingPreCloseClient(sp))
                     return;
 
                 // We need to delay here because Imprudence viewers, unlike v1 or v3, have a short (<200ms, <500ms) delay before
@@ -983,7 +983,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 // an agent cannot teleport back to this region if it has teleported away.
                 Thread.Sleep(2000);
 
-                sp.Scene.IncomingCloseAgent(sp.UUID, false);
+                sp.Scene.CloseAgent(sp.UUID, false);
             }
             else
             {
@@ -1137,7 +1137,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // 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))
+                if (!sp.Scene.IncomingPreCloseClient(sp))
                     return;
 
                 // RED ALERT!!!!
@@ -1154,7 +1154,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: Closing agent {0} in {1} after teleport", sp.Name, Scene.Name);
 
-                sp.Scene.IncomingCloseAgent(sp.UUID, false);
+                sp.Scene.CloseAgent(sp.UUID, false);
             }
             else
             {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 5c098a8..678f3dc 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -311,7 +311,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 //                        "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate",
 //                        s.RegionInfo.RegionName, destination.RegionHandle);
 
-                m_scenes[destination.RegionID].IncomingCloseAgent(id, false, auth_token);
+                m_scenes[destination.RegionID].CloseAgent(id, false, auth_token);
                 return true;
             }
 
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 31547a6..42db1cf 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -562,7 +562,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.");
-                                    Scene.IncomingCloseAgent(s.UUID, false);
+                                    Scene.CloseAgent(s.UUID, false);
                                 }
                             }
                         }
@@ -797,7 +797,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.");
-                        Scene.IncomingCloseAgent(s.UUID, false);
+                        Scene.CloseAgent(s.UUID, false);
                     }
                 }
             }
@@ -820,7 +820,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.");
-                            Scene.IncomingCloseAgent(p.UUID, false);
+                            Scene.CloseAgent(p.UUID, false);
                         }
                     }
                 }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 3dc509b..82abfe9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1313,7 +1313,7 @@ namespace OpenSim.Region.Framework.Scenes
             Thread.Sleep(500);
 
             // Stop all client threads.
-            ForEachScenePresence(delegate(ScenePresence avatar) { IncomingCloseAgent(avatar.UUID, false); });
+            ForEachScenePresence(delegate(ScenePresence avatar) { CloseAgent(avatar.UUID, false); });
 
             m_log.Debug("[SCENE]: Persisting changed objects");
             EventManager.TriggerSceneShuttingDown(this);
@@ -2976,7 +2976,7 @@ namespace OpenSim.Region.Framework.Scenes
                         {
                             PresenceService.LogoutAgent(sp.ControllingClient.SessionId);
 
-                            IncomingCloseAgent(sp.UUID, false);
+                            CloseAgent(sp.UUID, false);
                         }
                         else
                         {
@@ -3398,7 +3398,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name='closeChildAgents'>
         /// Close the neighbour child agents associated with this client.
         /// </param>
-        public override void RemoveClient(UUID agentID, bool closeChildAgents)
+        public void RemoveClient(UUID agentID, bool closeChildAgents)
         {
             AgentCircuitData acd = m_authenticateHandler.GetAgentCircuitData(agentID);
 
@@ -3783,7 +3783,7 @@ namespace OpenSim.Region.Framework.Scenes
                             sp.Name, sp.UUID, RegionInfo.RegionName);
 
                         if (sp.ControllingClient != null)
-                            IncomingCloseAgent(sp.UUID, true);
+                            CloseAgent(sp.UUID, true);
 
                         sp = null;
                     }
@@ -4424,7 +4424,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="force"></param>
         /// <param name="auth_token"></param>
         /// <returns></returns>
-        public bool IncomingCloseAgent(UUID agentID, bool force, string auth_token)
+        public bool CloseAgent(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);
 
@@ -4442,7 +4442,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (acd.SessionID.ToString() == auth_token)
             {
-                return IncomingCloseAgent(agentID, force);
+                return CloseAgent(agentID, force);
             }
             else
             {
@@ -4455,16 +4455,16 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Tell a single agent to prepare to close.
+        /// Tell a single client 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().
+        /// This should only be called if we may close the client but there will be some delay in so doing.  Meant for
+        /// internal use - other callers should almost certainly called CloseClient().
         /// </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)
+        public bool IncomingPreCloseClient(ScenePresence sp)
         {
             lock (m_removeClientLock)
             {
@@ -4506,7 +4506,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Force the agent to close even if it might be in the middle of some other operation.  You do not want to
         /// force unless you are absolutely sure that the agent is dead and a normal close is not working.
         /// </param>
-        public bool IncomingCloseAgent(UUID agentID, bool force)
+        public override bool CloseAgent(UUID agentID, bool force)
         {
             ScenePresence sp;
 
@@ -4517,7 +4517,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if (sp == null)
                 {
                     m_log.DebugFormat(
-                        "[SCENE]: Called IncomingCloseAgent() with agent ID {0} but no such presence is in {1}", 
+                        "[SCENE]: Called CloseClient() with agent ID {0} but no such presence is in {1}", 
                         agentID, Name);
     
                     return false;
@@ -4526,7 +4526,7 @@ namespace OpenSim.Region.Framework.Scenes
                 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}",
+                        "[SCENE]: Called CloseClient() for {0} in {1} but presence is already in state {2}",
                         sp.Name, Name, sp.LifecycleState);
 
                     return false;
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 5252b96..4b37983 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -218,19 +218,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         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 abstract bool CloseAgent(UUID agentID, bool force);
 
         public bool TryGetScenePresence(UUID agentID, out object scenePresence)
         {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
index bbe34d2..e25bcb7 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         }
 
         [Test]
-        public void TestCloseAgent()
+        public void TestCloseClient()
         {
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
@@ -154,7 +154,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             TestScene scene = new SceneHelpers().SetupScene();
             ScenePresence sp = SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1));
 
-            scene.IncomingCloseAgent(sp.UUID, false);
+            scene.CloseAgent(sp.UUID, false);
 
             Assert.That(scene.GetScenePresence(sp.UUID), Is.Null);
             Assert.That(scene.AuthenticateHandler.GetAgentCircuitData(sp.UUID), Is.Null);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
index b6fb730..4fdfc74 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // TODO: Need to add tests for other ICapabiltiesModule methods.
 
-            scene.IncomingCloseAgent(sp.UUID, false);
+            scene.CloseAgent(sp.UUID, false);
             Assert.That(capsMod.GetCapsForUser(spUuid), Is.Null);
 
             // TODO: Need to add tests for other ICapabiltiesModule methods.
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index b863370..740f75a 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -384,7 +384,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                             agentID, av.Name);
                     */
 
-                    scene.IncomingCloseAgent(agentID, false);
+                    scene.CloseAgent(agentID, false);
 
                     m_avatars.Remove(agentID);
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 415166a..f4d5562 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2964,7 +2964,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         sp.ControllingClient.Kick(alert);
 
                     // ...and close on our side
-                    sp.Scene.IncomingCloseAgent(sp.UUID, false);
+                    sp.Scene.CloseAgent(sp.UUID, false);
                 }
             });
         }
-- 
cgit v1.1


From 2cd95fac736cc99b1a2ad661e4a03810225ffaca Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 27 Sep 2013 22:27:39 +0100
Subject: refactor: Rename Scene.AddNewClient() to AddNewAgent() to make it
 obvious in the code that this is symmetric with CloseAgent()

---
 OpenSim/Framework/IScene.cs                                  |  4 ++--
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs        |  2 +-
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs         |  2 +-
 OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs     |  3 ++-
 OpenSim/Region/Framework/Scenes/EventManager.cs              |  6 +++---
 OpenSim/Region/Framework/Scenes/Scene.cs                     | 12 ++++++------
 OpenSim/Region/Framework/Scenes/SceneBase.cs                 |  2 +-
 .../Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs |  4 ++--
 .../Agent/InternetRelayClientView/Server/IRCClientView.cs    |  2 +-
 OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs        |  2 +-
 OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs        |  4 ++--
 OpenSim/Tests/Common/Helpers/SceneHelpers.cs                 |  2 +-
 12 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index c3df37b..e1b6d1e 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -86,14 +86,14 @@ namespace OpenSim.Framework
         event restart OnRestart;
 
         /// <summary>
-        /// Add a new agent.  All agents except initial login clients will starts off as a child agent
+        /// Add a new agent with an attached client.  All agents except initial login clients will starts off as a child agent
         /// - the later agent crossing will promote it to a root agent.
         /// </summary>
         /// <param name="client"></param>
         /// <param name="type">The type of agent to add.</param>
         /// <returns>
         /// The scene agent if the new client was added or if an agent that already existed.</returns>
-        ISceneAgent AddNewClient(IClientAPI client, PresenceType type);
+        ISceneAgent AddNewAgent(IClientAPI client, PresenceType type);
 
         /// <summary>
         /// Tell a single agent to disconnect from the region.
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 3609ec1..6b58fb7 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -750,7 +750,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public virtual void Start()
         {
-            m_scene.AddNewClient(this, PresenceType.User);
+            m_scene.AddNewAgent(this, PresenceType.User);
 
             RefreshGroupMembership();
         }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 5296a6d..8d957dc 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1718,7 +1718,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         else if (client.SceneAgent == null)
                         {
                             // This check exists to catch a condition where the new client has been added to the client
-                            // manager but the SceneAgent has not yet been set in Scene.AddNewClient().  If we are too
+                            // manager but the SceneAgent has not yet been set in Scene.AddNewAgent().  If we are too
                             // eager, then the new ScenePresence may not have registered a listener for this messsage
                             // before we try to process it.
                             // XXX: A better long term fix may be to add the SceneAgent before the client is added to 
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs
index 28b5eb7..e2178e5 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         public override void Update(int frames) {}
         public override void LoadWorldMap() {}
         
-        public override ISceneAgent AddNewClient(IClientAPI client, PresenceType type)
+        public override ISceneAgent AddNewAgent(IClientAPI client, PresenceType type)
         {
             client.OnObjectName += RecordObjectNameCall;
 
@@ -61,6 +61,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         }
 
         public override bool CloseAgent(UUID agentID, bool force) { return true; }
+
         public override bool CheckClient(UUID clientId, IPEndPoint endPoint) { return true; }
 
         public override void OtherRegionUp(GridRegion otherRegion) {  }
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 39d7512..37b5776 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Triggered when a new presence is added to the scene
         /// </summary>
         /// <remarks>
-        /// Triggered in <see cref="OpenSim.Region.Framework.Scenes.Scene.AddNewClient"/> which is used by both
+        /// Triggered in <see cref="OpenSim.Region.Framework.Scenes.Scene.AddNewAgent"/> which is used by both
         /// <see cref="OpenSim.Framework.PresenceType.User">users</see> and <see cref="OpenSim.Framework.PresenceType.Npc">NPCs</see>
         /// </remarks>
         public event OnNewPresenceDelegate OnNewPresence;
@@ -155,7 +155,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Triggered when a presence is removed from the scene
         /// </summary>
         /// <remarks>
-        /// Triggered in <see cref="OpenSim.Region.Framework.Scenes.Scene.AddNewClient"/> which is used by both
+        /// Triggered in <see cref="OpenSim.Region.Framework.Scenes.Scene.AddNewAgent"/> which is used by both
         /// <see cref="OpenSim.Framework.PresenceType.User">users</see> and <see cref="OpenSim.Framework.PresenceType.Npc">NPCs</see>
         /// 
         /// Triggered under per-agent lock.  So if you want to perform any long-running operations, please
@@ -1102,7 +1102,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Triggered in <see cref="OpenSim.Region.Framework.Scenes.Scene.ProcessMoneyTransferRequest"/>
         /// via <see cref="OpenSim.Region.Framework.Scenes.Scene.SubscribeToClientGridEvents"/>
         /// via <see cref="OpenSim.Region.Framework.Scenes.Scene.SubscribeToClientEvents"/>
-        /// via <see cref="OpenSim.Region.Framework.Scenes.Scene.AddNewClient"/>
+        /// via <see cref="OpenSim.Region.Framework.Scenes.Scene.AddNewAgent"/>
         /// </remarks>
         public event MoneyTransferEvent OnMoneyTransfer;
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 82abfe9..7772f94 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2802,7 +2802,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         #region Add/Remove Avatar Methods
 
-        public override ISceneAgent AddNewClient(IClientAPI client, PresenceType type)
+        public override ISceneAgent AddNewAgent(IClientAPI client, PresenceType type)
         {
             ScenePresence sp;
             bool vialogin;
@@ -2810,7 +2810,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             // Validation occurs in LLUDPServer
             //
-            // XXX: A race condition exists here where two simultaneous calls to AddNewClient can interfere with
+            // XXX: A race condition exists here where two simultaneous calls to AddNewAgent can interfere with
             // each other.  In practice, this does not currently occur in the code.
             AgentCircuitData aCircuit = m_authenticateHandler.GetAgentCircuitData(client.CircuitCode);
 
@@ -2818,9 +2818,9 @@ namespace OpenSim.Region.Framework.Scenes
             // and a simultaneous one that removes it (as can happen if the client is closed at a particular point
             // whilst connecting).
             //
-            // It would be easier to lock across all NewUserConnection(), AddNewClient() and
+            // It would be easier to lock across all NewUserConnection(), AddNewAgent() and
             // RemoveClient() calls for all agents, but this would allow a slow call (e.g. because of slow service
-            // response in some module listening to AddNewClient()) from holding up unrelated agent calls.
+            // response in some module listening to AddNewAgent()) from holding up unrelated agent calls.
             //
             // In practice, the lock (this) in LLUDPServer.AddNewClient() currently lock across all
             // AddNewClient() operations (though not other ops).
@@ -2837,7 +2837,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 // XXX: Not sure how good it is to add a new client if a scene presence already exists.  Possibly this
                 // could occur if a viewer crashes and relogs before the old client is kicked out.  But this could cause
-                // other problems, and possible the code calling AddNewClient() should ensure that no client is already
+                // other problems, and possibly the code calling AddNewAgent() should ensure that no client is already
                 // connected.
                 if (sp == null)
                 {
@@ -4306,7 +4306,7 @@ namespace OpenSim.Region.Framework.Scenes
             // We have to wait until the viewer contacts this region
             // 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.
+            // a UseCircuitCode packet which in turn calls AddNewAgent which finally creates the ScenePresence.
             ScenePresence sp = WaitGetScenePresence(cAgentData.AgentID);
 
             if (sp != null)
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 4b37983..4f04706 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -216,7 +216,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         #region Add/Remove Agent/Avatar
 
-        public abstract ISceneAgent AddNewClient(IClientAPI client, PresenceType type);
+        public abstract ISceneAgent AddNewAgent(IClientAPI client, PresenceType type);
 
         public abstract bool CloseAgent(UUID agentID, bool force);
 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
index e25bcb7..d1aeaee 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
@@ -200,7 +200,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // *** This is the second stage, where the client established a child agent/scene presence using the
             // circuit code given to the scene in stage 1 ***
             TestClient client = new TestClient(acd, scene);
-            scene.AddNewClient(client, PresenceType.User);
+            scene.AddNewAgent(client, PresenceType.User);
 
             Assert.That(scene.AuthenticateHandler.GetAgentCircuitData(agentId), Is.Not.Null);
             Assert.That(scene.AuthenticateHandler.GetAgentCircuits().Count, Is.EqualTo(1));
@@ -279,7 +279,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 //            string reason;
 //            scene.NewUserConnection(agent, (uint)TeleportFlags.ViaLogin, out reason);
 //            testclient = new TestClient(agent, scene);
-//            scene.AddNewClient(testclient);
+//            scene.AddNewAgent(testclient);
 //
 //            ScenePresence presence = scene.GetScenePresence(agent1);
 //
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 23a435d..a4fc4ae 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -903,7 +903,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void Start()
         {
-            m_scene.AddNewClient(this, PresenceType.User);
+            m_scene.AddNewAgent(this, PresenceType.User);
 
             // Mimicking LLClientView which gets always set appearance from client.
             AvatarAppearance appearance;
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 740f75a..fffe1ab 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -175,7 +175,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
             {
                 scene.AuthenticateHandler.AddNewCircuit(npcAvatar.CircuitCode,
                         acd);
-                scene.AddNewClient(npcAvatar, PresenceType.Npc);
+                scene.AddNewAgent(npcAvatar, PresenceType.Npc);
 
                 ScenePresence sp;
                 if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp))
diff --git a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
index ff6608d..52a17e7 100644
--- a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Tests.Common
 
                 TestClient neighbourTc = new TestClient(newAgent, neighbourScene);
                 neighbourTcs.Add(neighbourTc);
-                neighbourScene.AddNewClient(neighbourTc, PresenceType.User);
+                neighbourScene.AddNewAgent(neighbourTc, PresenceType.User);
             };
         }
 
@@ -119,7 +119,7 @@ namespace OpenSim.Tests.Common
 
                 TestClient destinationClient = new TestClient(newAgent, destinationScene);
                 destinationClients.Add(destinationClient);
-                destinationScene.AddNewClient(destinationClient, PresenceType.User);
+                destinationScene.AddNewAgent(destinationClient, PresenceType.User);
 
                 ThreadPool.UnsafeQueueUserWorkItem(o => destinationClient.CompleteMovement(), null);
             };
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index d9bb85e..4cdfe98 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -548,7 +548,7 @@ namespace OpenSim.Tests.Common
                 Console.WriteLine("NewUserConnection failed: " + reason);
 
             // Stage 2: add the new client as a child agent to the scene
-            scene.AddNewClient(client, PresenceType.User);
+            scene.AddNewAgent(client, PresenceType.User);
 
             return scene.GetScenePresence(client.AgentId);
         }
-- 
cgit v1.1


From 8996ac1a9cde74cc17676411b0f1c58bcc63d179 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 27 Sep 2013 22:33:42 +0100
Subject: minor: Disable logging left active on regression test
 TestSameSimulatorIsolatedRegionsV2()

---
 OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
index 3ba34dd..8c25dbc 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
@@ -185,7 +185,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestSameSimulatorIsolatedRegionsV2()
         {
             TestHelpers.InMethod();
-            TestHelpers.EnableLogging();
+//            TestHelpers.EnableLogging();
 
             UUID userId = TestHelpers.ParseTail(0x1);
 
-- 
cgit v1.1


From 970249a3c7b1d9cffe88eb8d7075cce6fa8ca3d9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 4 Oct 2013 19:40:43 +0100
Subject: Add OnChatToNPC and OnInstantMessageToNPC messages to NPCAvatar to
 allow region modules to directly subscribe to chat and messages received by
 NPCs

Currently still requires INPC from NPCModule.GetNPC() to be cast to an NPCAvatar.
---
 .../Region/OptionalModules/World/NPC/NPCAvatar.cs  | 27 +++++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 9a61702..a895ee1 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -44,6 +44,20 @@ namespace OpenSim.Region.OptionalModules.World.NPC
     {
         public bool SenseAsAgent { get; set; }
 
+        public delegate void ChatToNPC(
+            string message, byte type, Vector3 fromPos, string fromName, 
+            UUID fromAgentID, UUID ownerID, byte source, byte audible);
+
+        /// <summary>
+        /// Fired when the NPC receives a chat message.
+        /// </summary>
+        public event ChatToNPC OnChatToNPC;
+
+        /// <summary>
+        /// Fired when the NPC receives an instant message.
+        /// </summary>
+        public event Action<GridInstantMessage> OnInstantMessageToNPC;
+
         private readonly string m_firstname;
         private readonly string m_lastname;
         private readonly Vector3 m_startPos;
@@ -614,17 +628,18 @@ namespace OpenSim.Region.OptionalModules.World.NPC
             string message, byte type, Vector3 fromPos, string fromName,
             UUID fromAgentID, UUID ownerID, byte source, byte audible)
         {
-        }
+            ChatToNPC ctn = OnChatToNPC;
 
-        public virtual void SendChatMessage(
-            byte[] message, byte type, Vector3 fromPos, string fromName,
-            UUID fromAgentID, UUID ownerID, byte source, byte audible)
-        {
+            if (ctn != null)
+                ctn(message, type, fromPos, fromName, fromAgentID, ownerID, source, audible);
         }
 
         public void SendInstantMessage(GridInstantMessage im)
         {
-            
+            Action<GridInstantMessage> oimtn = OnInstantMessageToNPC;
+
+            if (oimtn != null)
+                oimtn(im);
         }
 
         public void SendGenericMessage(string method, UUID invoice, List<string> message)
-- 
cgit v1.1


From 42bdf446585007029faf4cd21abd289487f0f797 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 4 Oct 2013 23:33:47 +0100
Subject: Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

---
 OpenSim/Addons/Groups/Properties/AssemblyInfo.cs                        | 2 +-
 OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs                     | 2 +-
 .../RegionModulesController/Properties/AssemblyInfo.cs                  | 2 +-
 OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs  | 2 +-
 OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs                | 2 +-
 OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs                           | 2 +-
 OpenSim/Data/MySQL/Properties/AssemblyInfo.cs                           | 2 +-
 OpenSim/Data/Null/Properties/AssemblyInfo.cs                            | 2 +-
 OpenSim/Data/Properties/AssemblyInfo.cs                                 | 2 +-
 OpenSim/Data/SQLite/Properties/AssemblyInfo.cs                          | 2 +-
 OpenSim/Framework/AssemblyInfo.cs                                       | 2 +-
 OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs     | 2 +-
 OpenSim/Framework/Communications/Properties/AssemblyInfo.cs             | 2 +-
 OpenSim/Framework/Configuration/HTTP/Properties/AssemblyInfo.cs         | 2 +-
 OpenSim/Framework/Configuration/XML/Properties/AssemblyInfo.cs          | 2 +-
 OpenSim/Framework/Console/AssemblyInfo.cs                               | 2 +-
 OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs                 | 2 +-
 OpenSim/Framework/RegionLoader/Filesystem/Properties/AssemblyInfo.cs    | 2 +-
 OpenSim/Framework/RegionLoader/Web/Properties/AssemblyInfo.cs           | 2 +-
 OpenSim/Framework/Serialization/Properties/AssemblyInfo.cs              | 2 +-
 OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs         | 2 +-
 OpenSim/Framework/Servers/VersionInfo.cs                                | 2 +-
 OpenSim/Region/ClientStack/Linden/Caps/Properties/AssemblyInfo.cs       | 2 +-
 OpenSim/Region/ClientStack/Linden/UDP/Properties/AssemblyInfo.cs        | 2 +-
 OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs                   | 2 +-
 OpenSim/Region/DataSnapshot/Properties/AssemblyInfo.cs                  | 2 +-
 OpenSim/Region/Framework/Properties/AssemblyInfo.cs                     | 2 +-
 OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs               | 2 +-
 OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs               | 2 +-
 OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs         | 2 +-
 .../Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs | 2 +-
 OpenSim/Region/Physics/Manager/AssemblyInfo.cs                          | 2 +-
 OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs               | 2 +-
 OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs                        | 2 +-
 OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs                        | 2 +-
 OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs          | 2 +-
 .../ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs   | 2 +-
 OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs | 2 +-
 OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs  | 2 +-
 OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs          | 2 +-
 OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs                | 2 +-
 OpenSim/Server/Base/Properties/AssemblyInfo.cs                          | 2 +-
 OpenSim/Server/Handlers/Properties/AssemblyInfo.cs                      | 2 +-
 OpenSim/Services/AssetService/Properties/AssemblyInfo.cs                | 2 +-
 OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs       | 2 +-
 OpenSim/Services/AuthorizationService/Properties/AssemblyInfo.cs        | 2 +-
 OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs               | 2 +-
 OpenSim/Services/Base/Properties/AssemblyInfo.cs                        | 2 +-
 OpenSim/Services/Connectors/Properties/AssemblyInfo.cs                  | 2 +-
 OpenSim/Services/FreeswitchService/Properties/AssemblyInfo.cs           | 2 +-
 OpenSim/Services/Friends/Properties/AssemblyInfo.cs                     | 2 +-
 OpenSim/Services/GridService/Properties/AssemblyInfo.cs                 | 2 +-
 OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs            | 2 +-
 OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs                  | 2 +-
 OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs            | 2 +-
 OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs              | 2 +-
 OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs             | 2 +-
 OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs             | 2 +-
 OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs          | 2 +-
 OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs                       | 2 +-
 OpenSim/Tools/Configger/Properties/AssemblyInfo.cs                      | 2 +-
 OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs                       | 2 +-
 62 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs b/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs
index 5ccd7fe..16fe03b 100644
--- a/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs
+++ b/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@ using Mono.Addins;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
 [assembly: Addin("OpenSim.Groups", "0.1")]
 [assembly: AddinDependency("OpenSim", "0.5")]
diff --git a/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs b/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs
index ffe8a3e..5d71edc 100644
--- a/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs
+++ b/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@ using Mono.Addins;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
 [assembly: Addin("OpenSim.OfflineIM", "0.1")]
 [assembly: AddinDependency("OpenSim", "0.5")]
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs
index 5683a72..ddef158 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs
index a9d3f74..dd34cc8 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs b/OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs
index f8f63f4..0cf8bf4 100644
--- a/OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs
+++ b/OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs b/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs
index 9bc580e..38bb868 100644
--- a/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs
@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // 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.*")]
+[assembly : AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs b/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs
index 1146d92..f562300 100644
--- a/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs
@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // 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.*")]
+[assembly : AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Data/Null/Properties/AssemblyInfo.cs b/OpenSim/Data/Null/Properties/AssemblyInfo.cs
index 1e02c31..28ef51a 100644
--- a/OpenSim/Data/Null/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/Null/Properties/AssemblyInfo.cs
@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // 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.*")]
+[assembly : AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Data/Properties/AssemblyInfo.cs b/OpenSim/Data/Properties/AssemblyInfo.cs
index a85f473..9258e55 100644
--- a/OpenSim/Data/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/Properties/AssemblyInfo.cs
@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // 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.*")]
+[assembly : AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs b/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs
index 992982c..3873eaf 100644
--- a/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs
@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // 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.*")]
+[assembly : AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Framework/AssemblyInfo.cs b/OpenSim/Framework/AssemblyInfo.cs
index d6b4e6a..287b988 100644
--- a/OpenSim/Framework/AssemblyInfo.cs
+++ b/OpenSim/Framework/AssemblyInfo.cs
@@ -59,4 +59,4 @@ using System.Runtime.InteropServices;
 //      Revision
 //
 
-[assembly : AssemblyVersion("0.7.6.*")]
+[assembly : AssemblyVersion("0.8.0.*")]
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs b/OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs
index feffa26..11fece3 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
index df8eb52..09611fa 100644
--- a/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // 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.*")]
+[assembly : AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Framework/Configuration/HTTP/Properties/AssemblyInfo.cs b/OpenSim/Framework/Configuration/HTTP/Properties/AssemblyInfo.cs
index 3ef9682..05a2e0e 100644
--- a/OpenSim/Framework/Configuration/HTTP/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Configuration/HTTP/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Framework/Configuration/XML/Properties/AssemblyInfo.cs b/OpenSim/Framework/Configuration/XML/Properties/AssemblyInfo.cs
index cbdffeb..d928a94 100644
--- a/OpenSim/Framework/Configuration/XML/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Configuration/XML/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Framework/Console/AssemblyInfo.cs b/OpenSim/Framework/Console/AssemblyInfo.cs
index c618454..ba59025 100644
--- a/OpenSim/Framework/Console/AssemblyInfo.cs
+++ b/OpenSim/Framework/Console/AssemblyInfo.cs
@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly : AssemblyVersion("0.7.6.*")]
+[assembly : AssemblyVersion("0.8.0.*")]
diff --git a/OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs b/OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs
index 36678bb..07971bf 100644
--- a/OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Framework/RegionLoader/Filesystem/Properties/AssemblyInfo.cs b/OpenSim/Framework/RegionLoader/Filesystem/Properties/AssemblyInfo.cs
index d4806f1..563bcb9 100644
--- a/OpenSim/Framework/RegionLoader/Filesystem/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/RegionLoader/Filesystem/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Framework/RegionLoader/Web/Properties/AssemblyInfo.cs b/OpenSim/Framework/RegionLoader/Web/Properties/AssemblyInfo.cs
index 1541a5b..ab36f10 100644
--- a/OpenSim/Framework/RegionLoader/Web/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/RegionLoader/Web/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Framework/Serialization/Properties/AssemblyInfo.cs b/OpenSim/Framework/Serialization/Properties/AssemblyInfo.cs
index a8dff93..3f04148 100644
--- a/OpenSim/Framework/Serialization/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Serialization/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs b/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs
index 8e592c1..f409667 100644
--- a/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index 80568e0..98c19b9 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -29,7 +29,7 @@ namespace OpenSim
 {
     public class VersionInfo
     {
-        private const string VERSION_NUMBER = "0.7.6";
+        private const string VERSION_NUMBER = "0.8.0";
         private const Flavour VERSION_FLAVOUR = Flavour.Dev;
 
         public enum Flavour
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/Properties/AssemblyInfo.cs b/OpenSim/Region/ClientStack/Linden/Caps/Properties/AssemblyInfo.cs
index 595d01a..112608b 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Properties/AssemblyInfo.cs b/OpenSim/Region/ClientStack/Linden/UDP/Properties/AssemblyInfo.cs
index 98ef72f..f8d0c02 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
index bfe0383..9809c86 100644
--- a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@ using Mono.Addins;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
 
 [assembly: Addin("OpenSim.Region.CoreModules", "0.1")]
diff --git a/OpenSim/Region/DataSnapshot/Properties/AssemblyInfo.cs b/OpenSim/Region/DataSnapshot/Properties/AssemblyInfo.cs
index 0e7df07..3d74597 100644
--- a/OpenSim/Region/DataSnapshot/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/DataSnapshot/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Region/Framework/Properties/AssemblyInfo.cs b/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
index 167c248..a2a99d4 100644
--- a/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs b/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
index 70bda72..ba0b578 100644
--- a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@ using Mono.Addins;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
 
 [assembly: Addin("OpenSim.Region.OptionalModules", "0.1")]
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
index 6fd6f7e..ffcb01e 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly : AssemblyVersion("0.7.6.*")]
+[assembly : AssemblyVersion("0.8.0.*")]
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs b/OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs
index 02b03a8..d069178 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs b/OpenSim/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
index f611b9a..b8cf624 100644
--- a/OpenSim/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
index 5da3956..10e850e 100644
--- a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly : AssemblyVersion("0.7.6.*")]
+[assembly : AssemblyVersion("0.8.0.*")]
diff --git a/OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs b/OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs
index 3de061a..8542753 100644
--- a/OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
index f477ed1..288cab5 100644
--- a/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly : AssemblyVersion("0.7.6.*")]
+[assembly : AssemblyVersion("0.8.0.*")]
diff --git a/OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs
index 4289863..83be103 100644
--- a/OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs
@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly : AssemblyVersion("0.7.6.*")]
+[assembly : AssemblyVersion("0.8.0.*")]
diff --git a/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs b/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
index 86a3101..c341dfd 100644
--- a/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs
index 6d218a6..9137c69 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs
index 5b5c4fd..d163438 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs
index 48964b6..815d11b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs
index f0640da..87ea9c4 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs b/OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs
index 1fff12a..f2d3255 100644
--- a/OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Server/Base/Properties/AssemblyInfo.cs b/OpenSim/Server/Base/Properties/AssemblyInfo.cs
index b4732b8..67340c7 100644
--- a/OpenSim/Server/Base/Properties/AssemblyInfo.cs
+++ b/OpenSim/Server/Base/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Server/Handlers/Properties/AssemblyInfo.cs b/OpenSim/Server/Handlers/Properties/AssemblyInfo.cs
index 3295ffd..04cd798 100644
--- a/OpenSim/Server/Handlers/Properties/AssemblyInfo.cs
+++ b/OpenSim/Server/Handlers/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Services/AssetService/Properties/AssemblyInfo.cs b/OpenSim/Services/AssetService/Properties/AssemblyInfo.cs
index 50ee033..72c2ac4 100644
--- a/OpenSim/Services/AssetService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/AssetService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs b/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs
index 435852da..8ffeeca 100644
--- a/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Services/AuthorizationService/Properties/AssemblyInfo.cs b/OpenSim/Services/AuthorizationService/Properties/AssemblyInfo.cs
index 8db1671..e51d2ca 100644
--- a/OpenSim/Services/AuthorizationService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/AuthorizationService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs b/OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs
index 138d4cd..3800e62 100644
--- a/OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Services/Base/Properties/AssemblyInfo.cs b/OpenSim/Services/Base/Properties/AssemblyInfo.cs
index 84a40f0..959670c 100644
--- a/OpenSim/Services/Base/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/Base/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs b/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs
index 8b18afb..bc89f5d 100644
--- a/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Services/FreeswitchService/Properties/AssemblyInfo.cs b/OpenSim/Services/FreeswitchService/Properties/AssemblyInfo.cs
index b488b36..6bc543a 100644
--- a/OpenSim/Services/FreeswitchService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/FreeswitchService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Services/Friends/Properties/AssemblyInfo.cs b/OpenSim/Services/Friends/Properties/AssemblyInfo.cs
index b11d07d..f9473e2 100644
--- a/OpenSim/Services/Friends/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/Friends/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Services/GridService/Properties/AssemblyInfo.cs b/OpenSim/Services/GridService/Properties/AssemblyInfo.cs
index b1e5e12..bd84123 100644
--- a/OpenSim/Services/GridService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/GridService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs b/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs
index 8d66f1b..0fb60f6 100644
--- a/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs b/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs
index 47ece75..f7c8cc1 100644
--- a/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs b/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs
index bfae81f..fd8707b 100644
--- a/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs b/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs
index 0a6daee..c373351 100644
--- a/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs b/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs
index 19936e5..edadb26 100644
--- a/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs b/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs
index 5d433df..3bfd1fc 100644
--- a/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs b/OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs
index e7d2d6f..16ae6bd 100644
--- a/OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs b/OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs
index 088be45..7006211 100644
--- a/OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs
+++ b/OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs b/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs
index 0348628..bfcd4fb 100644
--- a/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs
+++ b/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
diff --git a/OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs b/OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs
index 78f3603..731e2c3 100644
--- a/OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs
+++ b/OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
 
-- 
cgit v1.1


From 44580e2233eb0e4df40036679c7bf273d8593834 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 4 Oct 2013 23:36:28 +0100
Subject: Update an AssmblyVersion property that I missed to 0.8.0

---
 OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs
index 1b6a3e1..4968e7b 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs
@@ -62,4 +62,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("0.7.6.*")]
 
-[assembly : AssemblyVersion("0.7.6.*")]
+[assembly : AssemblyVersion("0.8.0.*")]
-- 
cgit v1.1


From 083eb7679b8565757e025d8fe090e9d147fe132d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 4 Oct 2013 17:32:17 -0700
Subject: Added SimulatorFeatures/OpenSimExtras: say-range, whisper-range,
 shout-range, at the request of Singularity dev Liru-Dargon

---
 .../Region/CoreModules/Avatar/Chat/ChatModule.cs   | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 5229c08..27ace68 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -32,6 +32,7 @@ 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;
@@ -94,6 +95,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
 
         public virtual void RegionLoaded(Scene scene)
         {
+            if (!m_enabled)
+                return;
+
+            ISimulatorFeaturesModule featuresModule = scene.RequestModuleInterface<ISimulatorFeaturesModule>();
+
+            if (featuresModule != null)
+                featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest;
+
         }
 
         public virtual void RemoveRegion(Scene scene)
@@ -353,5 +362,33 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             
             return true;
         }
+
+        #region SimulatorFeaturesRequest
+
+        static OSDInteger m_SayRange, m_WhisperRange, m_ShoutRange;
+
+        private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
+        {
+            OSD extras = new OSDMap();
+            if (features.ContainsKey("OpenSimExtras"))
+                extras = features["OpenSimExtras"];
+            else
+                features["OpenSimExtras"] = extras;
+
+            if (m_SayRange == null)
+            {
+                // Do this only once
+                m_SayRange = new OSDInteger(m_saydistance);
+                m_WhisperRange = new OSDInteger(m_whisperdistance);
+                m_ShoutRange = new OSDInteger(m_shoutdistance);
+            }
+
+            ((OSDMap)extras)["say-range"] = m_SayRange;
+            ((OSDMap)extras)["whisper-range"] = m_WhisperRange;
+            ((OSDMap)extras)["shout-range"] = m_ShoutRange;
+
+        }
+
+        #endregion
     }
 }
\ No newline at end of file
-- 
cgit v1.1


From 85593d8d25205344d512cbc976aa890a51f5f974 Mon Sep 17 00:00:00 2001
From: teravus
Date: Fri, 4 Oct 2013 20:37:59 -0500
Subject: * Add an initial complete frame timeout to the WebSocket processor to
 make it easier to write WebSocket service code that is resistant to Denial of
 Service attacks.

---
 .../Servers/HttpServer/WebsocketServerHandler.cs   | 67 +++++++++++++++++++++-
 1 file changed, 65 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
index de89e2e..c2925e3 100644
--- a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
@@ -28,8 +28,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net;
 using System.Security.Cryptography;
 using System.Text;
+using System.Threading;
 using HttpServer;
 
 namespace OpenSim.Framework.Servers.HttpServer
@@ -98,6 +100,8 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// </summary>
         public ValidateHandshake HandshakeValidateMethodOverride = null;
 
+        private ManualResetEvent _receiveDone = new ManualResetEvent(false);
+
         private OSHttpRequest _request;
         private HTTPNetworkContext _networkContext;
         private IHttpClientContext _clientContext;
@@ -109,6 +113,8 @@ namespace OpenSim.Framework.Servers.HttpServer
         private bool _closing;
         private bool _upgraded;
         private int _maxPayloadBytes = 41943040;
+        private int _initialMsgTimeout = 0;
+        private int _defaultReadTimeout = 10000;
 
         private const string HandshakeAcceptText =
             "HTTP/1.1 101 Switching Protocols\r\n" +
@@ -131,6 +137,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             _request = preq;
             _networkContext = pContext.GiveMeTheNetworkStreamIKnowWhatImDoing();
+            _networkContext.Stream.ReadTimeout = _defaultReadTimeout;
             _clientContext = pContext;
             _bufferLength = bufferlen;
             _buffer = new byte[_bufferLength];
@@ -206,6 +213,16 @@ namespace OpenSim.Framework.Servers.HttpServer
         }
 
         /// <summary>
+        /// Set this to the maximum amount of milliseconds to wait for the first complete message to be sent or received on the websocket after upgrading
+        /// Default, it waits forever.  Use this when your Websocket consuming code opens a connection and waits for a message from the other side to avoid a Denial of Service vector.
+        /// </summary>
+        public int InitialMsgTimeout
+        {
+            get { return _initialMsgTimeout; }
+            set { _initialMsgTimeout = value; }
+        }
+
+        /// <summary>
         /// This triggers the websocket start the upgrade process
         /// </summary>
         public void HandshakeAndUpgrade()
@@ -245,6 +262,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                     string rawaccept = string.Format(HandshakeAcceptText, acceptKey);
                     SendUpgradeSuccess(rawaccept);
                     
+
                 }
                 else
                 {
@@ -258,6 +276,10 @@ namespace OpenSim.Framework.Servers.HttpServer
                 SendUpgradeSuccess(rawaccept);
             }
         }
+        public IPEndPoint GetRemoteIPEndpoint()
+        {
+            return _request.RemoteIPEndPoint;
+        }
 
         /// <summary>
         /// Generates a handshake response key string based on the client's 
@@ -290,9 +312,16 @@ namespace OpenSim.Framework.Servers.HttpServer
             WebSocketState socketState = new WebSocketState() { ReceivedBytes = new List<byte>(), Header = WebsocketFrameHeader.HeaderDefault(), FrameComplete = true};
             
             byte[] bhandshakeResponse = Encoding.UTF8.GetBytes(pHandshakeResponse);
+
+            
+           
+
             try
             {
-                
+                if (_initialMsgTimeout > 0)
+                {
+                    _receiveDone.Reset();
+                }
                 // Begin reading the TCP stream before writing the Upgrade success message to the other side of the stream.
                 _networkContext.Stream.BeginRead(_buffer, 0, _bufferLength, OnReceive, socketState);
                 
@@ -303,6 +332,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                 UpgradeCompletedDelegate d = OnUpgradeCompleted;
                 if (d != null)
                     d(this, new UpgradeCompletedEventArgs());
+                if (_initialMsgTimeout > 0)
+                {
+                    if (!_receiveDone.WaitOne(TimeSpan.FromMilliseconds(_initialMsgTimeout)))
+                        Close(string.Empty);
+                }
             }
             catch (IOException)
             {
@@ -489,6 +523,11 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// <param name="message">the string message that is to be sent</param>
         public void SendMessage(string message)
         {
+            if (_initialMsgTimeout > 0)
+            {
+                _receiveDone.Set();
+                _initialMsgTimeout = 0;
+            }
             byte[] messagedata = Encoding.UTF8.GetBytes(message);
             WebSocketFrame textMessageFrame = new WebSocketFrame() { Header = WebsocketFrameHeader.HeaderDefault(), WebSocketPayload = messagedata };
             textMessageFrame.Header.Opcode = WebSocketReader.OpCode.Text;
@@ -499,6 +538,11 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public void SendData(byte[] data)
         {
+            if (_initialMsgTimeout > 0)
+            {
+                _receiveDone.Set();
+                _initialMsgTimeout = 0;
+            }
             WebSocketFrame dataMessageFrame = new WebSocketFrame() { Header = WebsocketFrameHeader.HeaderDefault(), WebSocketPayload = data};
             dataMessageFrame.Header.IsEnd = true;
             dataMessageFrame.Header.Opcode = WebSocketReader.OpCode.Binary;
@@ -531,6 +575,11 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// </summary>
         public void SendPingCheck()
         {
+            if (_initialMsgTimeout > 0)
+            {
+                _receiveDone.Set();
+                _initialMsgTimeout = 0;
+            }
             WebSocketFrame pingFrame = new WebSocketFrame() { Header = WebsocketFrameHeader.HeaderDefault(), WebSocketPayload = new byte[0] };
             pingFrame.Header.Opcode = WebSocketReader.OpCode.Ping;
             pingFrame.Header.IsEnd = true;
@@ -544,6 +593,11 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// <param name="message"></param>
         public void Close(string message)
         {
+            if (_initialMsgTimeout > 0)
+            {
+                _receiveDone.Set();
+                _initialMsgTimeout = 0;
+            }
             if (_networkContext == null)
                 return;
             if (_networkContext.Stream != null)
@@ -583,7 +637,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                 WebSocketReader.Mask(psocketState.Header.Mask, unmask);
                 psocketState.ReceivedBytes = new List<byte>(unmask);
             }
-            
+            if (psocketState.Header.Opcode != WebSocketReader.OpCode.Continue  && _initialMsgTimeout > 0)
+            {
+                _receiveDone.Set();
+                _initialMsgTimeout = 0;
+            }
             switch (psocketState.Header.Opcode)
             {
                 case WebSocketReader.OpCode.Ping:
@@ -696,6 +754,11 @@ namespace OpenSim.Framework.Servers.HttpServer
         }
         public void Dispose()
         {
+            if (_initialMsgTimeout > 0)
+            {
+                _receiveDone.Set();
+                _initialMsgTimeout = 0;
+            }
             if (_networkContext != null && _networkContext.Stream != null)
             {
                 if (_networkContext.Stream.CanWrite)
-- 
cgit v1.1


From 31246ecd04c0f57631587e25ae0245d086098ddc Mon Sep 17 00:00:00 2001
From: teravus
Date: Fri, 4 Oct 2013 20:53:01 -0500
Subject: * Added a unique and interesting WebSocket grid login processor by
 hijacking the LLSD login code.    This sends the data through the normal
 login channels and spits out a JSON object back that mimics the login
 response.    Feel free to comment on the best way to set this up as a config
 option.

---
 OpenSim/Server/Handlers/Login/LLLoginHandlers.cs   | 56 ++++++++++++++++++++++
 .../Handlers/Login/LLLoginServiceInConnector.cs    |  1 +
 2 files changed, 57 insertions(+)

diff --git a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
index f83a239..e4a0ffa 100644
--- a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
+++ b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
@@ -53,6 +53,7 @@ namespace OpenSim.Server.Handlers.Login
 
         private ILoginService m_LocalService;
         private bool m_Proxy;
+        
 
         public LLLoginHandlers(ILoginService service, bool hasProxy)
         {
@@ -213,6 +214,61 @@ namespace OpenSim.Server.Handlers.Login
             return FailedOSDResponse();
         }
 
+        public void HandleWebSocketLoginEvents(string path, WebSocketHttpServerHandler sock)
+        {
+            sock.MaxPayloadSize = 16384; //16 kb payload
+            sock.InitialMsgTimeout = 5000; //5 second first message to trigger at least one of these events
+            sock.NoDelay_TCP_Nagle = true;
+            sock.OnData += delegate(object sender, WebsocketDataEventArgs data) { sock.Close("fail"); };
+            sock.OnPing += delegate(object sender, PingEventArgs pingdata) { sock.Close("fail"); };
+            sock.OnPong += delegate(object sender, PongEventArgs pongdata) { sock.Close("fail"); };
+            sock.OnText += delegate(object sender, WebsocketTextEventArgs text)
+                               {
+                                   OSD request = null;
+                                   try
+                                   {
+                                       request = OSDParser.DeserializeJson(text.Data);
+                                       if (!(request is OSDMap))
+                                       {
+                                           sock.SendMessage(OSDParser.SerializeJsonString(FailedOSDResponse()));
+                                       }
+                                       else
+                                       {
+                                           OSDMap req = request as OSDMap;
+                                           string first = req["firstname"].AsString();
+                                           string last = req["lastname"].AsString();
+                                           string passwd = req["passwd"].AsString();
+                                           string start = req["startlocation"].AsString();
+                                           string version = req["version"].AsString();
+                                           string channel = req["channel"].AsString();
+                                           string mac = req["mac"].AsString();
+                                           string id0 = req["id0"].AsString();
+                                           UUID scope = UUID.Zero;
+                                           IPEndPoint endPoint =
+                                               (sender as WebSocketHttpServerHandler).GetRemoteIPEndpoint();
+                                           LoginResponse reply = null;
+                                           reply = m_LocalService.Login(first, last, passwd, start, scope, version,
+                                                                        channel, mac, id0, endPoint);
+                                           sock.SendMessage(OSDParser.SerializeJsonString(reply.ToOSDMap()));
+
+                                       }
+
+                                   }
+                                   catch (Exception)
+                                   {
+                                       sock.SendMessage(OSDParser.SerializeJsonString(FailedOSDResponse()));
+                                   }
+                                   finally
+                                   {
+                                       sock.Close("success");
+                                   }
+                               };
+            
+            sock.HandshakeAndUpgrade();
+
+        }
+        
+
         private XmlRpcResponse FailedXMLRPCResponse()
         {
             Hashtable hash = new Hashtable();
diff --git a/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs
index 1fb0dbc..97e8295 100644
--- a/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs
+++ b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs
@@ -98,6 +98,7 @@ namespace OpenSim.Server.Handlers.Login
             server.AddXmlRPCHandler("login_to_simulator", loginHandlers.HandleXMLRPCLogin, false);
             server.AddXmlRPCHandler("set_login_level", loginHandlers.HandleXMLRPCSetLoginLevel, false);
             server.SetDefaultLLSDHandler(loginHandlers.HandleLLSDLogin);
+            server.AddWebSocketHandler("/WebSocket/GridLogin", loginHandlers.HandleWebSocketLoginEvents);
         }
     }
 }
-- 
cgit v1.1


From ece2d24077cacba677de5cebdd3a9da463306ecd Mon Sep 17 00:00:00 2001
From: teravus
Date: Sat, 5 Oct 2013 17:36:58 -0500
Subject: * Fixes cases where Last Attachment Point gets overwritten with 0
 when it shouldn't * Fixes cases where Last Attachment Point doesn't get
 written when it should. * Fixes Null Reference in BaseHttpServer when
 shutting down, null path provided. * Drop then Wear retains Last Attachment
 Point

---
 OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs            | 1 +
 .../Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs    | 3 ++-
 .../Framework/InventoryAccess/InventoryAccessModule.cs            | 8 ++++++--
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs               | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index ed733cf..5681ece 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1967,6 +1967,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public void RemoveHTTPHandler(string httpMethod, string path)
         {
+            if (path == null) return; // Caps module isn't loaded, tries to remove handler where path = null
             lock (m_HTTPHandlers)
             {
                 if (httpMethod != null && httpMethod.Length == 0)
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 81a7278..051e959 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -685,6 +685,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 if (changed && m_scene.AvatarFactory != null)
                     m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID);
 
+                so.RootPart.Shape.LastAttachPoint = (byte)so.AttachmentPoint;
+                
                 sp.RemoveAttachment(so);
                 so.FromItemID = UUID.Zero;
 
@@ -699,7 +701,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 so.ClearPartAttachmentData();
                 rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive,false);
                 so.HasGroupChanged = true;
-                so.RootPart.Shape.LastAttachPoint = (byte)so.AttachmentPoint;
                 rootPart.Rezzed = DateTime.Now;
                 rootPart.RemFlag(PrimFlags.TemporaryOnRez);
                 so.AttachToBackup();
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 3feeb13..ac4203f 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -390,9 +390,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                 // Trees could be attached and it's been done, but it makes
                 // no sense. State must be preserved because it's the tree type
-                if (objectGroup.RootPart.Shape.PCode != (byte)PCode.Tree &&
-                    objectGroup.RootPart.Shape.PCode != (byte)PCode.NewTree)
+                if (objectGroup.RootPart.Shape.PCode != (byte) PCode.Tree &&
+                    objectGroup.RootPart.Shape.PCode != (byte) PCode.NewTree)
+                {
                     objectGroup.RootPart.Shape.State = objectGroup.RootPart.AttachPoint;
+                    if (objectGroup.RootPart.AttachPoint > 0)
+                        objectGroup.RootPart.Shape.LastAttachPoint = objectGroup.RootPart.AttachPoint;
+                }
 
                 objectGroup.AbsolutePosition = inventoryStoredPosition;
                 objectGroup.RootPart.RotationOffset = inventoryStoredRotation;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6deb870..997a1be 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1667,7 +1667,8 @@ namespace OpenSim.Region.Framework.Scenes
             ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
             if (avatar == null)
                 return;
-
+            m_rootPart.Shape.LastAttachPoint = m_rootPart.Shape.State;
+            m_rootPart.AttachedPos = m_rootPart.OffsetPosition;
             avatar.RemoveAttachment(this);
 
             Vector3 detachedpos = new Vector3(127f,127f,127f);
@@ -2107,6 +2108,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                         if (RootPart.Shape.PCode == 9 && RootPart.Shape.State != 0)
                         {
+                            RootPart.Shape.LastAttachPoint = RootPart.Shape.State;
                             RootPart.Shape.State = 0;
                             ScheduleGroupForFullUpdate();
                         }
-- 
cgit v1.1


From f76cc6036ebf446553ee5201321879538dafe3b2 Mon Sep 17 00:00:00 2001
From: teravus
Date: Mon, 7 Oct 2013 21:35:55 -0500
Subject: * Added a Basic DOS protection container/base object for the most
 common HTTP Server handlers. XMLRPC Handler, GenericHttpHandler and
 <Various>StreamHandler * Applied the XmlRpcBasicDOSProtector.cs to the login
 service as both an example, and good practice. * Applied the
 BaseStreamHandlerBasicDOSProtector.cs to the friends service as an example of
 the DOS Protector on StreamHandlers * Added CircularBuffer, used for CPU and
 Memory friendly rate monitoring. * DosProtector has 2 states, 1. Just Check
 for blocked users and check general velocity, 2. Track velocity per user,    
 It only jumps to 2 if it's getting a lot of requests, and state 1 is about as
 resource friendly as if it wasn't even there.

---
 OpenSim/Framework/CircularBuffer.cs                | 312 +++++++++++++++++++++
 .../BaseStreamHandlerBasicDOSProtector.cs          | 233 +++++++++++++++
 .../HttpServer/GenericHTTPBasicDOSProtector.cs     | 238 ++++++++++++++++
 .../Servers/HttpServer/XmlRpcBasicDOSProtector.cs  | 211 ++++++++++++++
 .../Avatar/Friends/FriendsRequestHandler.cs        |  12 +-
 .../CoreModules/World/WorldMap/WorldMapModule.cs   |  21 +-
 .../Server/Handlers/Asset/AssetServerGetHandler.cs |  12 +-
 OpenSim/Server/Handlers/Login/LLLoginHandlers.cs   |  11 +
 .../Handlers/Login/LLLoginServiceInConnector.cs    |  15 +-
 ThirdPartyLicenses/CircularBuffer.txt              |  16 ++
 bin/Robust.ini.example                             |  19 ++
 bin/config-include/StandaloneCommon.ini.example    |  19 +-
 12 files changed, 1112 insertions(+), 7 deletions(-)
 create mode 100644 OpenSim/Framework/CircularBuffer.cs
 create mode 100644 OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
 create mode 100644 OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
 create mode 100644 OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
 create mode 100644 ThirdPartyLicenses/CircularBuffer.txt

diff --git a/OpenSim/Framework/CircularBuffer.cs b/OpenSim/Framework/CircularBuffer.cs
new file mode 100644
index 0000000..e919337
--- /dev/null
+++ b/OpenSim/Framework/CircularBuffer.cs
@@ -0,0 +1,312 @@
+/*
+Copyright (c) 2012, Alex Regueiro 
+All rights reserved.
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the 
+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.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
+OR 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.Threading;
+
+namespace OpenSim.Framework
+{
+    public class CircularBuffer<T> : ICollection<T>, IEnumerable<T>, ICollection, IEnumerable
+    {
+        private int capacity;
+        private int size;
+        private int head;
+        private int tail;
+        private T[] buffer;
+
+        [NonSerialized()]
+        private object syncRoot;
+
+        public CircularBuffer(int capacity)
+            : this(capacity, false)
+        {
+        }
+
+        public CircularBuffer(int capacity, bool allowOverflow)
+        {
+            if (capacity < 0)
+                throw new ArgumentException("Needs to have at least 1","capacity");
+
+            this.capacity = capacity;
+            size = 0;
+            head = 0;
+            tail = 0;
+            buffer = new T[capacity];
+            AllowOverflow = allowOverflow;
+        }
+
+        public bool AllowOverflow
+        {
+            get;
+            set;
+        }
+
+        public int Capacity
+        {
+            get { return capacity; }
+            set
+            {
+                if (value == capacity)
+                    return;
+
+                if (value < size)
+                    throw new ArgumentOutOfRangeException("value","Capacity is too small.");
+
+                var dst = new T[value];
+                if (size > 0)
+                    CopyTo(dst);
+                buffer = dst;
+
+                capacity = value;
+            }
+        }
+
+        public int Size
+        {
+            get { return size; }
+        }
+
+        public bool Contains(T item)
+        {
+            int bufferIndex = head;
+            var comparer = EqualityComparer<T>.Default;
+            for (int i = 0; i < size; i++, bufferIndex++)
+            {
+                if (bufferIndex == capacity)
+                    bufferIndex = 0;
+
+                if (item == null && buffer[bufferIndex] == null)
+                    return true;
+                else if ((buffer[bufferIndex] != null) &&
+                    comparer.Equals(buffer[bufferIndex], item))
+                    return true;
+            }
+
+            return false;
+        }
+
+        public void Clear()
+        {
+            size = 0;
+            head = 0;
+            tail = 0;
+        }
+
+        public int Put(T[] src)
+        {
+            return Put(src, 0, src.Length);
+        }
+
+        public int Put(T[] src, int offset, int count)
+        {
+            if (!AllowOverflow && count > capacity - size)
+                throw new InvalidOperationException("Buffer Overflow");
+
+            int srcIndex = offset;
+            for (int i = 0; i < count; i++, tail++, srcIndex++)
+            {
+                if (tail == capacity)
+                    tail = 0;
+                buffer[tail] = src[srcIndex];
+            }
+            size = Math.Min(size + count, capacity);
+            return count;
+        }
+
+        public void Put(T item)
+        {
+            if (!AllowOverflow && size == capacity)
+                throw new InvalidOperationException("Buffer Overflow");
+
+            buffer[tail] = item;
+            if (++tail == capacity)
+                tail = 0;
+            size++;
+        }
+
+        public void Skip(int count)
+        {
+            head += count;
+            if (head >= capacity)
+                head -= capacity;
+        }
+
+        public T[] Get(int count)
+        {
+            var dst = new T[count];
+            Get(dst);
+            return dst;
+        }
+
+        public int Get(T[] dst)
+        {
+            return Get(dst, 0, dst.Length);
+        }
+
+        public int Get(T[] dst, int offset, int count)
+        {
+            int realCount = Math.Min(count, size);
+            int dstIndex = offset;
+            for (int i = 0; i < realCount; i++, head++, dstIndex++)
+            {
+                if (head == capacity)
+                    head = 0;
+                dst[dstIndex] = buffer[head];
+            }
+            size -= realCount;
+            return realCount;
+        }
+
+        public T Get()
+        {
+            if (size == 0)
+                throw new InvalidOperationException("Buffer Empty");
+
+            var item = buffer[head];
+            if (++head == capacity)
+                head = 0;
+            size--;
+            return item;
+        }
+
+        public void CopyTo(T[] array)
+        {
+            CopyTo(array, 0);
+        }
+
+        public void CopyTo(T[] array, int arrayIndex)
+        {
+            CopyTo(0, array, arrayIndex, size);
+        }
+
+        public void CopyTo(int index, T[] array, int arrayIndex, int count)
+        {
+            if (count > size)
+                throw new ArgumentOutOfRangeException("count", "Count Too Large");
+
+            int bufferIndex = head;
+            for (int i = 0; i < count; i++, bufferIndex++, arrayIndex++)
+            {
+                if (bufferIndex == capacity)
+                    bufferIndex = 0;
+                array[arrayIndex] = buffer[bufferIndex];
+            }
+        }
+
+        public IEnumerator<T> GetEnumerator()
+        {
+            int bufferIndex = head;
+            for (int i = 0; i < size; i++, bufferIndex++)
+            {
+                if (bufferIndex == capacity)
+                    bufferIndex = 0;
+
+                yield return buffer[bufferIndex];
+            }
+        }
+
+        public T[] GetBuffer()
+        {
+            return buffer;
+        }
+
+        public T[] ToArray()
+        {
+            var dst = new T[size];
+            CopyTo(dst);
+            return dst;
+        }
+
+        #region ICollection<T> Members
+
+        int ICollection<T>.Count
+        {
+            get { return Size; }
+        }
+
+        bool ICollection<T>.IsReadOnly
+        {
+            get { return false; }
+        }
+
+        void ICollection<T>.Add(T item)
+        {
+            Put(item);
+        }
+
+        bool ICollection<T>.Remove(T item)
+        {
+            if (size == 0)
+                return false;
+
+            Get();
+            return true;
+        }
+
+        #endregion
+
+        #region IEnumerable<T> Members
+
+        IEnumerator<T> IEnumerable<T>.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        #endregion
+
+        #region ICollection Members
+
+        int ICollection.Count
+        {
+            get { return Size; }
+        }
+
+        bool ICollection.IsSynchronized
+        {
+            get { return false; }
+        }
+
+        object ICollection.SyncRoot
+        {
+            get
+            {
+                if (syncRoot == null)
+                    Interlocked.CompareExchange(ref syncRoot, new object(), null);
+                return syncRoot;
+            }
+        }
+
+        void ICollection.CopyTo(Array array, int arrayIndex)
+        {
+            CopyTo((T[])array, arrayIndex);
+        }
+
+        #endregion
+
+        #region IEnumerable Members
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return (IEnumerator)GetEnumerator();
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
new file mode 100644
index 0000000..8fc9a8a
--- /dev/null
+++ b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
@@ -0,0 +1,233 @@
+/*
+ * 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 OpenSim.Framework;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using log4net;
+
+namespace OpenSim.Framework.Servers.HttpServer
+{
+    /// <summary>
+    /// BaseStreamHandlerBasicDOSProtector Base streamed request handler.
+    /// </summary>
+    /// <remarks>
+    /// Inheriting classes should override ProcessRequest() rather than Handle()
+    /// </remarks>
+    public abstract class BaseStreamHandlerBasicDOSProtector : BaseRequestHandler, IStreamedRequestHandler
+    {
+        private readonly CircularBuffer<int> _generalRequestTimes;
+        private readonly BasicDosProtectorOptions _options;
+        private readonly Dictionary<string, CircularBuffer<int>> _deeperInspection;
+        private readonly Dictionary<string, int> _tempBlocked;
+        private readonly System.Timers.Timer _forgetTimer;
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private readonly System.Threading.ReaderWriterLockSlim _lockSlim = new System.Threading.ReaderWriterLockSlim();
+
+        protected BaseStreamHandlerBasicDOSProtector(string httpMethod, string path, BasicDosProtectorOptions options) : this(httpMethod, path, null, null, options) {}
+
+        protected BaseStreamHandlerBasicDOSProtector(string httpMethod, string path, string name, string description, BasicDosProtectorOptions options)
+            : base(httpMethod, path, name, description)
+        {
+            _generalRequestTimes = new CircularBuffer<int>(options.MaxRequestsInTimeframe + 1, true);
+            _generalRequestTimes.Put(0);
+            _options = options;
+            _deeperInspection = new Dictionary<string, CircularBuffer<int>>();
+            _tempBlocked = new Dictionary<string, int>();
+            _forgetTimer = new System.Timers.Timer();
+            _forgetTimer.Elapsed += delegate
+            {
+                _forgetTimer.Enabled = false;
+
+                List<string> removes = new List<string>();
+                _lockSlim.EnterReadLock();
+                foreach (string str in _tempBlocked.Keys)
+                {
+                    if (
+                        Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(),
+                                                          _tempBlocked[str]) > 0)
+                        removes.Add(str);
+                }
+                _lockSlim.ExitReadLock();
+                lock (_deeperInspection)
+                {
+                    _lockSlim.EnterWriteLock();
+                    for (int i = 0; i < removes.Count; i++)
+                    {
+                        _tempBlocked.Remove(removes[i]);
+                        _deeperInspection.Remove(removes[i]);
+                    }
+                    _lockSlim.ExitWriteLock();
+                }
+                foreach (string str in removes)
+                {
+                    m_log.InfoFormat("[{0}] client: {1} is no longer blocked.",
+                                     _options.ReportingName, str);
+                }
+                _lockSlim.EnterReadLock();
+                if (_tempBlocked.Count > 0)
+                    _forgetTimer.Enabled = true;
+                _lockSlim.ExitReadLock();
+            };
+
+            _forgetTimer.Interval = _options.ForgetTimeSpan.TotalMilliseconds;
+        }
+
+        public virtual byte[] Handle(
+            string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            byte[] result;
+            RequestsReceived++;
+            //httpRequest.Headers
+
+            if (_options.MaxRequestsInTimeframe < 1 || _options.RequestTimeSpan.TotalMilliseconds < 1)
+            {
+                result = ProcessRequest(path, request, httpRequest, httpResponse);
+                RequestsHandled++;
+                return result;
+                
+            }
+
+            string clientstring = GetClientString(httpRequest);
+
+            _lockSlim.EnterReadLock();
+            if (_tempBlocked.ContainsKey(clientstring))
+            {
+                _lockSlim.ExitReadLock();
+
+                if (_options.ThrottledAction == ThrottleAction.DoThrottledMethod)
+                {
+                    result = ThrottledRequest(path, request, httpRequest, httpResponse);
+                    RequestsHandled++;
+                    return result;
+                }
+                else
+                    throw new System.Security.SecurityException("Throttled");
+            }
+            _lockSlim.ExitReadLock();
+
+            _generalRequestTimes.Put(Util.EnvironmentTickCount());
+
+            if (_generalRequestTimes.Size == _generalRequestTimes.Capacity &&
+                (Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(), _generalRequestTimes.Get()) <
+                 _options.RequestTimeSpan.TotalMilliseconds))
+            {
+                //Trigger deeper inspection
+                if (DeeperInspection(httpRequest))
+                {
+                    result = ProcessRequest(path, request, httpRequest, httpResponse);
+                    RequestsHandled++;
+                    return result;
+                }
+                if (_options.ThrottledAction == ThrottleAction.DoThrottledMethod)
+                {
+                    result = ThrottledRequest(path, request, httpRequest, httpResponse);
+                    RequestsHandled++;
+                    return result;
+                }
+                else
+                    throw new System.Security.SecurityException("Throttled");
+            }
+           
+            result =ProcessRequest(path, request, httpRequest, httpResponse);
+            RequestsHandled++;
+
+            return result;
+        }
+
+        protected virtual byte[] ProcessRequest(
+            string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            return null;
+        }
+
+        protected virtual byte[] ThrottledRequest(
+            string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            return new byte[0];
+        }
+
+        private bool DeeperInspection(IOSHttpRequest httpRequest)
+        {
+            lock (_deeperInspection)
+            {
+                string clientstring = GetClientString(httpRequest);
+
+
+                if (_deeperInspection.ContainsKey(clientstring))
+                {
+                    _deeperInspection[clientstring].Put(Util.EnvironmentTickCount());
+                    if (_deeperInspection[clientstring].Size == _deeperInspection[clientstring].Capacity &&
+                        (Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(), _deeperInspection[clientstring].Get()) <
+                         _options.RequestTimeSpan.TotalMilliseconds))
+                    {
+                        _lockSlim.EnterWriteLock();
+                        if (!_tempBlocked.ContainsKey(clientstring))
+                            _tempBlocked.Add(clientstring, Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds);
+                        else
+                            _tempBlocked[clientstring] = Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds;
+                        _lockSlim.ExitWriteLock();
+
+                        m_log.WarnFormat("[{0}]: client: {1} is blocked for {2} milliseconds, X-ForwardedForAllowed status is {3}, endpoint:{4}", _options.ReportingName, clientstring, _options.ForgetTimeSpan.TotalMilliseconds, _options.AllowXForwardedFor, GetRemoteAddr(httpRequest));
+                        return false;
+                    }
+                    //else
+                    //   return true;
+                }
+                else
+                {
+                    _deeperInspection.Add(clientstring, new CircularBuffer<int>(_options.MaxRequestsInTimeframe + 1, true));
+                    _deeperInspection[clientstring].Put(Util.EnvironmentTickCount());
+                    _forgetTimer.Enabled = true;
+                }
+
+            }
+            return true;
+        }
+        private string GetRemoteAddr(IOSHttpRequest httpRequest)
+        {
+            string remoteaddr = string.Empty;
+            if (httpRequest.Headers["remote_addr"] != null)
+                remoteaddr = httpRequest.Headers["remote_addr"];
+
+            return remoteaddr;
+        }
+
+        private string GetClientString(IOSHttpRequest httpRequest)
+        {
+            string clientstring = string.Empty;
+
+            if (_options.AllowXForwardedFor && httpRequest.Headers["x-forwarded-for"] != null)
+                clientstring = httpRequest.Headers["x-forwarded-for"];
+            else
+                clientstring = GetRemoteAddr(httpRequest);
+
+            return clientstring;
+           
+        }
+    }
+}
diff --git a/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
new file mode 100644
index 0000000..5fc999a
--- /dev/null
+++ b/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
@@ -0,0 +1,238 @@
+/*
+ * 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.Net;
+using OpenSim.Framework;
+using log4net;
+
+namespace OpenSim.Framework.Servers.HttpServer
+{
+    public class GenericHTTPDOSProtector
+    {
+        private readonly GenericHTTPMethod _normalMethod;
+        private readonly GenericHTTPMethod _throttledMethod;
+        private readonly CircularBuffer<int> _generalRequestTimes;
+        private readonly BasicDosProtectorOptions _options;
+        private readonly Dictionary<string, CircularBuffer<int>> _deeperInspection;
+        private readonly Dictionary<string, int> _tempBlocked;
+        private readonly System.Timers.Timer _forgetTimer;
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private readonly System.Threading.ReaderWriterLockSlim _lockSlim = new System.Threading.ReaderWriterLockSlim();
+
+        public GenericHTTPDOSProtector(GenericHTTPMethod normalMethod, GenericHTTPMethod throttledMethod, BasicDosProtectorOptions options)
+        {
+            _normalMethod = normalMethod;
+            _throttledMethod = throttledMethod;
+            _generalRequestTimes = new CircularBuffer<int>(options.MaxRequestsInTimeframe + 1, true);
+            _generalRequestTimes.Put(0);
+            _options = options;
+            _deeperInspection = new Dictionary<string, CircularBuffer<int>>();
+            _tempBlocked = new Dictionary<string, int>();
+            _forgetTimer = new System.Timers.Timer();
+            _forgetTimer.Elapsed += delegate
+            {
+                _forgetTimer.Enabled = false;
+
+                List<string> removes = new List<string>();
+                _lockSlim.EnterReadLock();
+                foreach (string str in _tempBlocked.Keys)
+                {
+                    if (
+                        Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(),
+                                                          _tempBlocked[str]) > 0)
+                        removes.Add(str);
+                }
+                _lockSlim.ExitReadLock();
+                lock (_deeperInspection)
+                {
+                    _lockSlim.EnterWriteLock();
+                    for (int i = 0; i < removes.Count; i++)
+                    {
+                        _tempBlocked.Remove(removes[i]);
+                        _deeperInspection.Remove(removes[i]);
+                    }
+                    _lockSlim.ExitWriteLock();
+                }
+                foreach (string str in removes)
+                {
+                    m_log.InfoFormat("[{0}] client: {1} is no longer blocked.",
+                                     _options.ReportingName, str);
+                }
+                _lockSlim.EnterReadLock();
+                if (_tempBlocked.Count > 0)
+                    _forgetTimer.Enabled = true;
+                _lockSlim.ExitReadLock();
+            };
+
+            _forgetTimer.Interval = _options.ForgetTimeSpan.TotalMilliseconds;
+        }
+        public Hashtable Process(Hashtable request)
+        {
+            if (_options.MaxRequestsInTimeframe < 1)
+                return _normalMethod(request);
+            if (_options.RequestTimeSpan.TotalMilliseconds < 1)
+                return _normalMethod(request);
+
+            string clientstring = GetClientString(request);
+
+            _lockSlim.EnterReadLock();
+            if (_tempBlocked.ContainsKey(clientstring))
+            {
+                _lockSlim.ExitReadLock();
+
+                if (_options.ThrottledAction == ThrottleAction.DoThrottledMethod)
+                    return _throttledMethod(request);
+                else
+                    throw new System.Security.SecurityException("Throttled");
+            }
+            _lockSlim.ExitReadLock();
+
+            _generalRequestTimes.Put(Util.EnvironmentTickCount());
+
+            if (_generalRequestTimes.Size == _generalRequestTimes.Capacity &&
+                (Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(), _generalRequestTimes.Get()) <
+                 _options.RequestTimeSpan.TotalMilliseconds))
+            {
+                //Trigger deeper inspection
+                if (DeeperInspection(request))
+                    return _normalMethod(request);
+                if (_options.ThrottledAction == ThrottleAction.DoThrottledMethod)
+                    return _throttledMethod(request);
+                else
+                    throw new System.Security.SecurityException("Throttled");
+            }
+            Hashtable resp = null;
+            try
+            {
+                resp = _normalMethod(request);
+            }
+            catch (Exception)
+            {
+
+                throw;
+            }
+
+            return resp;
+        }
+        private bool DeeperInspection(Hashtable request)
+        {
+            lock (_deeperInspection)
+            {
+                string clientstring = GetClientString(request);
+
+
+                if (_deeperInspection.ContainsKey(clientstring))
+                {
+                    _deeperInspection[clientstring].Put(Util.EnvironmentTickCount());
+                    if (_deeperInspection[clientstring].Size == _deeperInspection[clientstring].Capacity &&
+                        (Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(), _deeperInspection[clientstring].Get()) <
+                         _options.RequestTimeSpan.TotalMilliseconds))
+                    {
+                        _lockSlim.EnterWriteLock();
+                        if (!_tempBlocked.ContainsKey(clientstring))
+                            _tempBlocked.Add(clientstring, Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds);
+                        else
+                            _tempBlocked[clientstring] = Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds;
+                        _lockSlim.ExitWriteLock();
+                        
+                         m_log.WarnFormat("[{0}]: client: {1} is blocked for {2} milliseconds, X-ForwardedForAllowed status is {3}, endpoint:{4}", _options.ReportingName, clientstring, _options.ForgetTimeSpan.TotalMilliseconds, _options.AllowXForwardedFor, GetRemoteAddr(request));
+                        return false;
+                    }
+                    //else
+                    //   return true;
+                }
+                else
+                {
+                    _deeperInspection.Add(clientstring, new CircularBuffer<int>(_options.MaxRequestsInTimeframe + 1, true));
+                    _deeperInspection[clientstring].Put(Util.EnvironmentTickCount());
+                    _forgetTimer.Enabled = true;
+                }
+
+            }
+            return true;
+        }
+
+        private string GetRemoteAddr(Hashtable request)
+        {
+            string remoteaddr = "";
+            if (!request.ContainsKey("headers"))
+                return remoteaddr;
+            Hashtable requestinfo = (Hashtable)request["headers"];
+            if (!requestinfo.ContainsKey("remote_addr"))
+                return remoteaddr;
+            object remote_addrobj = requestinfo["remote_addr"];
+            if (remote_addrobj != null)
+            {
+                if (!string.IsNullOrEmpty(remote_addrobj.ToString()))
+                {
+                    remoteaddr = remote_addrobj.ToString();
+                }
+
+            }
+            return remoteaddr;
+        }
+
+        private string GetClientString(Hashtable request)
+        {
+            string clientstring = "";
+            if (!request.ContainsKey("headers"))
+                return clientstring;
+
+            Hashtable requestinfo = (Hashtable)request["headers"];
+            if (_options.AllowXForwardedFor && requestinfo.ContainsKey("x-forwarded-for"))
+            {
+                object str = requestinfo["x-forwarded-for"];
+                if (str != null)
+                {
+                    if (!string.IsNullOrEmpty(str.ToString()))
+                    {
+                        return str.ToString();
+                    }
+                }
+            }
+            if (!requestinfo.ContainsKey("remote_addr"))
+                return clientstring;
+
+            object remote_addrobj = requestinfo["remote_addr"];
+            if (remote_addrobj != null)
+            {
+                if (!string.IsNullOrEmpty(remote_addrobj.ToString()))
+                {
+                    clientstring = remote_addrobj.ToString();
+                }
+            }
+
+            return clientstring;
+
+        }
+
+    }
+}
diff --git a/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
new file mode 100644
index 0000000..ae59c95
--- /dev/null
+++ b/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
@@ -0,0 +1,211 @@
+/*
+ * 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.Net;
+using Nwc.XmlRpc;
+using OpenSim.Framework;
+using log4net;
+
+namespace OpenSim.Framework.Servers.HttpServer
+{
+    public enum ThrottleAction
+    {
+        DoThrottledMethod,
+        DoThrow
+    }
+
+    public class XmlRpcBasicDOSProtector
+    {
+        private readonly XmlRpcMethod _normalMethod;
+        private readonly XmlRpcMethod _throttledMethod;
+        private readonly CircularBuffer<int> _generalRequestTimes; // General request checker
+        private readonly BasicDosProtectorOptions _options;
+        private readonly Dictionary<string, CircularBuffer<int>> _deeperInspection;   // per client request checker
+        private readonly Dictionary<string, int> _tempBlocked;  // blocked list
+        private readonly System.Timers.Timer _forgetTimer;  // Cleanup timer
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private readonly System.Threading.ReaderWriterLockSlim _lockSlim = new System.Threading.ReaderWriterLockSlim();
+
+        public XmlRpcBasicDOSProtector(XmlRpcMethod normalMethod, XmlRpcMethod throttledMethod,BasicDosProtectorOptions options)
+        {
+            _normalMethod = normalMethod;
+            _throttledMethod = throttledMethod;
+            _generalRequestTimes = new CircularBuffer<int>(options.MaxRequestsInTimeframe + 1,true);
+            _generalRequestTimes.Put(0);
+            _options = options;
+            _deeperInspection = new Dictionary<string, CircularBuffer<int>>();
+            _tempBlocked = new Dictionary<string, int>();
+            _forgetTimer = new System.Timers.Timer();
+            _forgetTimer.Elapsed += delegate
+                                        {
+                                            _forgetTimer.Enabled = false;
+
+                                            List<string> removes = new List<string>();
+                                            _lockSlim.EnterReadLock();
+                                            foreach (string str in _tempBlocked.Keys)
+                                            {
+                                                if (
+                                                    Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(),
+                                                                                      _tempBlocked[str]) > 0)
+                                                    removes.Add(str);
+                                            }
+                                            _lockSlim.ExitReadLock();
+                                            lock (_deeperInspection)
+                                            {
+                                                _lockSlim.EnterWriteLock();
+                                                for (int i = 0; i < removes.Count; i++)
+                                                {
+                                                    _tempBlocked.Remove(removes[i]);
+                                                    _deeperInspection.Remove(removes[i]);
+                                                }
+                                                _lockSlim.ExitWriteLock();
+                                            }
+                                            foreach (string str in removes)
+                                            {
+                                                m_log.InfoFormat("[{0}] client: {1} is no longer blocked.",
+                                                                 _options.ReportingName, str);
+                                            }
+                                            _lockSlim.EnterReadLock();
+                                            if (_tempBlocked.Count > 0)
+                                                _forgetTimer.Enabled = true;
+                                            _lockSlim.ExitReadLock();
+                                        };
+                                        
+            _forgetTimer.Interval = _options.ForgetTimeSpan.TotalMilliseconds;
+        }
+        public XmlRpcResponse Process(XmlRpcRequest request, IPEndPoint client)
+        {
+            // If these are set like this, this is disabled
+            if (_options.MaxRequestsInTimeframe < 1 || _options.RequestTimeSpan.TotalMilliseconds < 1)
+                return _normalMethod(request, client);
+           
+            string clientstring = GetClientString(request, client);
+
+            _lockSlim.EnterReadLock();
+            if (_tempBlocked.ContainsKey(clientstring))
+            {
+                _lockSlim.ExitReadLock();
+
+                if (_options.ThrottledAction == ThrottleAction.DoThrottledMethod)
+                    return _throttledMethod(request, client);
+                else
+                    throw new System.Security.SecurityException("Throttled");
+            }
+            _lockSlim.ExitReadLock();
+
+            _generalRequestTimes.Put(Util.EnvironmentTickCount());
+            
+            if (_generalRequestTimes.Size == _generalRequestTimes.Capacity &&
+                (Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(), _generalRequestTimes.Get()) <
+                 _options.RequestTimeSpan.TotalMilliseconds))
+            {
+                //Trigger deeper inspection
+                if (DeeperInspection(request, client))
+                    return _normalMethod(request, client);
+                if (_options.ThrottledAction == ThrottleAction.DoThrottledMethod)
+                    return _throttledMethod(request, client);
+                else
+                    throw new System.Security.SecurityException("Throttled");
+            }
+            XmlRpcResponse resp = null;
+           
+            resp = _normalMethod(request, client);
+           
+            return resp;
+        }
+
+        // If the service is getting more hits per expected timeframe then it starts to separate them out by client
+        private bool DeeperInspection(XmlRpcRequest request, IPEndPoint client)
+        {
+            lock (_deeperInspection)
+            {
+                string clientstring = GetClientString(request, client);
+                
+
+                if (_deeperInspection.ContainsKey(clientstring))
+                {
+                    _deeperInspection[clientstring].Put(Util.EnvironmentTickCount());
+                    if (_deeperInspection[clientstring].Size == _deeperInspection[clientstring].Capacity &&
+                        (Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(), _deeperInspection[clientstring].Get()) <
+                         _options.RequestTimeSpan.TotalMilliseconds))
+                    {
+                        //Looks like we're over the limit
+                        _lockSlim.EnterWriteLock();
+                        if (!_tempBlocked.ContainsKey(clientstring))
+                            _tempBlocked.Add(clientstring, Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds);
+                        else
+                            _tempBlocked[clientstring] = Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds;
+                        _lockSlim.ExitWriteLock();
+
+                        m_log.WarnFormat("[{0}]: client: {1} is blocked for {2} milliseconds, X-ForwardedForAllowed status is {3}, endpoint:{4}",_options.ReportingName,clientstring,_options.ForgetTimeSpan.TotalMilliseconds, _options.AllowXForwardedFor, client.Address);
+                        
+                        return false;
+                    }
+                    //else
+                     //   return true;
+                }
+                else
+                {
+                    _deeperInspection.Add(clientstring, new CircularBuffer<int>(_options.MaxRequestsInTimeframe + 1, true));
+                    _deeperInspection[clientstring].Put(Util.EnvironmentTickCount());
+                    _forgetTimer.Enabled = true;
+                }
+
+            }
+            return true;
+        }
+        private string GetClientString(XmlRpcRequest request, IPEndPoint client)
+        {
+            string clientstring;
+            if (_options.AllowXForwardedFor && request.Params.Count > 3)
+            {
+                object headerstr = request.Params[3];
+                if (headerstr != null && !string.IsNullOrEmpty(headerstr.ToString()))
+                    clientstring = request.Params[3].ToString();
+                else
+                    clientstring = client.Address.ToString();
+            }
+            else
+                clientstring = client.Address.ToString();
+            return clientstring;
+        }
+
+    }
+
+    public class BasicDosProtectorOptions
+    {
+        public int MaxRequestsInTimeframe;
+        public TimeSpan RequestTimeSpan;
+        public TimeSpan ForgetTimeSpan;
+        public bool AllowXForwardedFor;
+        public string ReportingName = "BASICDOSPROTECTOR";
+        public ThrottleAction ThrottledAction = ThrottleAction.DoThrottledMethod;
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
index 2116605..ed4b205 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
@@ -42,14 +42,22 @@ using log4net;
 
 namespace OpenSim.Region.CoreModules.Avatar.Friends
 {
-    public class FriendsRequestHandler : BaseStreamHandler
+    public class FriendsRequestHandler : BaseStreamHandlerBasicDOSProtector
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private FriendsModule m_FriendsModule;
 
         public FriendsRequestHandler(FriendsModule fmodule)
-                : base("POST", "/friends")
+                : base("POST", "/friends", new BasicDosProtectorOptions()
+                                          {
+                                              AllowXForwardedFor = true,
+                                              ForgetTimeSpan = TimeSpan.FromMinutes(2),
+                                              MaxRequestsInTimeframe = 5,
+                                              ReportingName = "FRIENDSDOSPROTECTOR",
+                                              RequestTimeSpan = TimeSpan.FromSeconds(5),
+                                              ThrottledAction = ThrottleAction.DoThrottledMethod
+                                          })
         {
             m_FriendsModule = fmodule;
         }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index a26a5f0..0f05e07 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -165,7 +165,16 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             regionimage = regionimage.Replace("-", "");
             m_log.Info("[WORLD MAP]: JPEG Map location: " + m_scene.RegionInfo.ServerURI + "index.php?method=" + regionimage);
 
-            MainServer.Instance.AddHTTPHandler(regionimage, OnHTTPGetMapImage);
+            MainServer.Instance.AddHTTPHandler(regionimage,
+                new GenericHTTPDOSProtector(OnHTTPGetMapImage, OnHTTPThrottled, new BasicDosProtectorOptions()
+                    {
+                        AllowXForwardedFor = false,
+                        ForgetTimeSpan = TimeSpan.FromMinutes(2),
+                        MaxRequestsInTimeframe = 4,
+                        ReportingName = "MAPDOSPROTECTOR",
+                        RequestTimeSpan = TimeSpan.FromSeconds(10),
+                        ThrottledAction = ThrottleAction.DoThrottledMethod
+                    }).Process);
             MainServer.Instance.AddLLSDHandler(
                 "/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest);
 
@@ -1081,6 +1090,16 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             block.Y = (ushort)(r.RegionLocY / Constants.RegionSize);
         }
 
+        public Hashtable OnHTTPThrottled(Hashtable keysvals)
+        {
+            Hashtable reply = new Hashtable();
+            int statuscode = 500;
+            reply["str_response_string"] = "I blocked you! HAHAHAHAHAHAHHAHAH";
+            reply["int_response_code"] = statuscode;
+            reply["content_type"] = "text/plain";
+            return reply;
+        }
+
         public Hashtable OnHTTPGetMapImage(Hashtable keysvals)
         {
             m_log.Debug("[WORLD MAP]: Sending map image jpeg");
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
index 8b23a83..0bd0235 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
@@ -42,14 +42,22 @@ using OpenSim.Framework.Servers.HttpServer;
 
 namespace OpenSim.Server.Handlers.Asset
 {
-    public class AssetServerGetHandler : BaseStreamHandler
+    public class AssetServerGetHandler : BaseStreamHandlerBasicDOSProtector
     {
         // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private IAssetService m_AssetService;
 
         public AssetServerGetHandler(IAssetService service) :
-                base("GET", "/assets")
+                base("GET", "/assets",new BasicDosProtectorOptions()
+                                          {
+                                              AllowXForwardedFor = true,
+                                              ForgetTimeSpan = TimeSpan.FromSeconds(2),
+                                              MaxRequestsInTimeframe = 5,
+                                              ReportingName = "ASSETGETDOSPROTECTOR",
+                                              RequestTimeSpan = TimeSpan.FromSeconds(5),
+                                              ThrottledAction = ThrottleAction.DoThrottledMethod
+                                          })
         {
             m_AssetService = service;
         }
diff --git a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
index e4a0ffa..f2a5678 100644
--- a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
+++ b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
@@ -145,6 +145,17 @@ namespace OpenSim.Server.Handlers.Login
             return FailedXMLRPCResponse();
 
         }
+        public XmlRpcResponse HandleXMLRPCLoginBlocked(XmlRpcRequest request, IPEndPoint client)
+        {
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable resp = new Hashtable();
+
+            resp["reason"] = "presence";
+            resp["message"] = "Logins are currently restricted. Please try again later.";
+            resp["login"] = "false";
+            response.Value = resp;
+            return response;
+        }
 
         public XmlRpcResponse HandleXMLRPCSetLoginLevel(XmlRpcRequest request, IPEndPoint remoteClient)
         {
diff --git a/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs
index 97e8295..f60e892 100644
--- a/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs
+++ b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs
@@ -44,6 +44,7 @@ namespace OpenSim.Server.Handlers.Login
 
         private ILoginService m_LoginService;
         private bool m_Proxy;
+        private BasicDosProtectorOptions m_DosProtectionOptions;
 
         public LLLoginServiceInConnector(IConfigSource config, IHttpServer server, IScene scene) :
                 base(config, server, String.Empty)
@@ -88,6 +89,16 @@ namespace OpenSim.Server.Handlers.Login
                 throw new Exception(String.Format("No LocalServiceModule for LoginService in config file"));
 
             m_Proxy = serverConfig.GetBoolean("HasProxy", false);
+            m_DosProtectionOptions = new BasicDosProtectorOptions();
+            // Dos Protection Options
+            m_DosProtectionOptions.AllowXForwardedFor = serverConfig.GetBoolean("DOSAllowXForwardedForHeader", false);
+            m_DosProtectionOptions.RequestTimeSpan =
+                TimeSpan.FromMilliseconds(serverConfig.GetInt("DOSRequestTimeFrameMS", 10000));
+            m_DosProtectionOptions.MaxRequestsInTimeframe = serverConfig.GetInt("DOSMaxRequestsInTimeFrame", 5);
+            m_DosProtectionOptions.ForgetTimeSpan =
+                TimeSpan.FromMilliseconds(serverConfig.GetInt("DOSForgiveClientAfterMS", 120000));
+            m_DosProtectionOptions.ReportingName = "LOGINDOSPROTECTION";
+            
 
             return loginService;
         }
@@ -95,7 +106,9 @@ namespace OpenSim.Server.Handlers.Login
         private void InitializeHandlers(IHttpServer server)
         {
             LLLoginHandlers loginHandlers = new LLLoginHandlers(m_LoginService, m_Proxy);
-            server.AddXmlRPCHandler("login_to_simulator", loginHandlers.HandleXMLRPCLogin, false);
+            server.AddXmlRPCHandler("login_to_simulator", 
+                new XmlRpcBasicDOSProtector(loginHandlers.HandleXMLRPCLogin,loginHandlers.HandleXMLRPCLoginBlocked,
+                    m_DosProtectionOptions).Process, false);
             server.AddXmlRPCHandler("set_login_level", loginHandlers.HandleXMLRPCSetLoginLevel, false);
             server.SetDefaultLLSDHandler(loginHandlers.HandleLLSDLogin);
             server.AddWebSocketHandler("/WebSocket/GridLogin", loginHandlers.HandleWebSocketLoginEvents);
diff --git a/ThirdPartyLicenses/CircularBuffer.txt b/ThirdPartyLicenses/CircularBuffer.txt
new file mode 100644
index 0000000..09c37d9
--- /dev/null
+++ b/ThirdPartyLicenses/CircularBuffer.txt
@@ -0,0 +1,16 @@
+Copyright (c) 2012, Alex Regueiro 
+All rights reserved.
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the 
+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.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index de6fc28..74c208d 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -356,6 +356,25 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
     ;;      'America/Los_Angeles' is used on Linux/Mac systems whilst 'Pacific Standard Time' is used on Windows
     DSTZone = "America/Los_Angeles;Pacific Standard Time"
 
+    ;Basic Login Service Dos Protection Tweaks
+    ;;
+    ;; Some Grids/Users use a transparent proxy that makes use of the X-Forwarded-For HTTP Header, If you do, set this to true
+    ;; If you set this to true and you don't have a transparent proxy, it may allow attackers to put random things in the X-Forwarded-For header to
+    ;;     get around this basic DOS protection.
+    ;DOSAllowXForwardedForHeader = false
+    ;;
+    ;; The protector adds up requests during this rolling period of time, default 10 seconds
+    ;DOSRequestTimeFrameMS = 10000
+    ;;
+    ;; The amount of requests in the above timeframe from the same endpoint that triggers protection
+    ;DOSMaxRequestsInTimeFrame = 5
+    ;;
+    ;; The amount of time that a specific endpoint is blocked.    Default 2 minutes.
+    ;DOSForgiveClientAfterMS = 120000
+    ;; 
+    ;; To turn off basic dos protection, set the DOSMaxRequestsInTimeFrame to 0.
+
+
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
 	; Set this if you want to change the default
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 12c5b95..75fd956 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -117,7 +117,7 @@
     SRV_AssetServerURI = "http://127.0.0.1:9000"
     SRV_ProfileServerURI = "http://127.0.0.1:9000"
     SRV_FriendsServerURI = "http://127.0.0.1:9000"
-    SRV_IMServerURI = "http://127.0.0.1:9000"
+    SRV_IMServerURI = "http://127.0.0.1:9000
 
     ;; For Viewer 2
     MapTileURL = "http://127.0.0.1:9000/"
@@ -150,6 +150,23 @@
     ;AllowedClients = ""
     ;DeniedClients = ""
 
+    ; Basic Login Service Dos Protection Tweaks
+    ; ;
+    ; ; Some Grids/Users use a transparent proxy that makes use of the X-Forwarded-For HTTP Header, If you do, set this to true
+    ; ; If you set this to true and you don't have a transparent proxy, it may allow attackers to put random things in the X-Forwarded-For header to
+    ; ;     get around this basic DOS protection.
+    ; DOSAllowXForwardedForHeader = false
+    ; ;
+    ; ; The protector adds up requests during this rolling period of time, default 10 seconds
+    ; DOSRequestTimeFrameMS = 10000
+    ; ;
+    ; ; The amount of requests in the above timeframe from the same endpoint that triggers protection
+    ; DOSMaxRequestsInTimeFrame = 5
+    ; ;
+    ; ; The amount of time that a specific endpoint is blocked.    Default 2 minutes.
+    ; DOSForgiveClientAfterMS = 120000
+    ; ; 
+    ; ; To turn off basic dos protection, set the DOSMaxRequestsInTimeFrame to 0.
 
 [FreeswitchService]
     ;; If FreeSWITCH is not being used then you don't need to set any of these parameters
-- 
cgit v1.1


From 75fdd6054d6605877acb511b1bd794de963a15f3 Mon Sep 17 00:00:00 2001
From: teravus
Date: Mon, 7 Oct 2013 23:19:50 -0500
Subject: * Refactor * Break out common BasicDOSProtector code into separate
 class.

---
 .../BaseStreamHandlerBasicDOSProtector.cs          | 144 +---------------
 .../Servers/HttpServer/BasicDOSProtector.cs        | 181 +++++++++++++++++++++
 .../HttpServer/GenericHTTPBasicDOSProtector.cs     | 143 +---------------
 .../Servers/HttpServer/XmlRpcBasicDOSProtector.cs  | 155 ++----------------
 .../Avatar/Friends/FriendsRequestHandler.cs        |   4 +-
 .../CoreModules/World/WorldMap/WorldMapModule.cs   |   4 +-
 .../Server/Handlers/Asset/AssetServerGetHandler.cs |   2 +-
 7 files changed, 218 insertions(+), 415 deletions(-)
 create mode 100644 OpenSim/Framework/Servers/HttpServer/BasicDOSProtector.cs

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
index 8fc9a8a..9b8b8c2 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
@@ -25,10 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 using OpenSim.Framework;
-using System.Collections.Generic;
 using System.IO;
-using System.Reflection;
-using log4net;
 
 namespace OpenSim.Framework.Servers.HttpServer
 {
@@ -40,61 +37,17 @@ namespace OpenSim.Framework.Servers.HttpServer
     /// </remarks>
     public abstract class BaseStreamHandlerBasicDOSProtector : BaseRequestHandler, IStreamedRequestHandler
     {
-        private readonly CircularBuffer<int> _generalRequestTimes;
+       
         private readonly BasicDosProtectorOptions _options;
-        private readonly Dictionary<string, CircularBuffer<int>> _deeperInspection;
-        private readonly Dictionary<string, int> _tempBlocked;
-        private readonly System.Timers.Timer _forgetTimer;
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private readonly System.Threading.ReaderWriterLockSlim _lockSlim = new System.Threading.ReaderWriterLockSlim();
+        private readonly BasicDOSProtector _dosProtector;
 
         protected BaseStreamHandlerBasicDOSProtector(string httpMethod, string path, BasicDosProtectorOptions options) : this(httpMethod, path, null, null, options) {}
 
         protected BaseStreamHandlerBasicDOSProtector(string httpMethod, string path, string name, string description, BasicDosProtectorOptions options)
             : base(httpMethod, path, name, description)
         {
-            _generalRequestTimes = new CircularBuffer<int>(options.MaxRequestsInTimeframe + 1, true);
-            _generalRequestTimes.Put(0);
             _options = options;
-            _deeperInspection = new Dictionary<string, CircularBuffer<int>>();
-            _tempBlocked = new Dictionary<string, int>();
-            _forgetTimer = new System.Timers.Timer();
-            _forgetTimer.Elapsed += delegate
-            {
-                _forgetTimer.Enabled = false;
-
-                List<string> removes = new List<string>();
-                _lockSlim.EnterReadLock();
-                foreach (string str in _tempBlocked.Keys)
-                {
-                    if (
-                        Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(),
-                                                          _tempBlocked[str]) > 0)
-                        removes.Add(str);
-                }
-                _lockSlim.ExitReadLock();
-                lock (_deeperInspection)
-                {
-                    _lockSlim.EnterWriteLock();
-                    for (int i = 0; i < removes.Count; i++)
-                    {
-                        _tempBlocked.Remove(removes[i]);
-                        _deeperInspection.Remove(removes[i]);
-                    }
-                    _lockSlim.ExitWriteLock();
-                }
-                foreach (string str in removes)
-                {
-                    m_log.InfoFormat("[{0}] client: {1} is no longer blocked.",
-                                     _options.ReportingName, str);
-                }
-                _lockSlim.EnterReadLock();
-                if (_tempBlocked.Count > 0)
-                    _forgetTimer.Enabled = true;
-                _lockSlim.ExitReadLock();
-            };
-
-            _forgetTimer.Interval = _options.ForgetTimeSpan.TotalMilliseconds;
+            _dosProtector = new BasicDOSProtector(_options);
         }
 
         public virtual byte[] Handle(
@@ -102,58 +55,13 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             byte[] result;
             RequestsReceived++;
-            //httpRequest.Headers
 
-            if (_options.MaxRequestsInTimeframe < 1 || _options.RequestTimeSpan.TotalMilliseconds < 1)
-            {
+            if (_dosProtector.Process(GetClientString(httpRequest), GetRemoteAddr(httpRequest)))
                 result = ProcessRequest(path, request, httpRequest, httpResponse);
-                RequestsHandled++;
-                return result;
-                
-            }
-
-            string clientstring = GetClientString(httpRequest);
-
-            _lockSlim.EnterReadLock();
-            if (_tempBlocked.ContainsKey(clientstring))
-            {
-                _lockSlim.ExitReadLock();
-
-                if (_options.ThrottledAction == ThrottleAction.DoThrottledMethod)
-                {
-                    result = ThrottledRequest(path, request, httpRequest, httpResponse);
-                    RequestsHandled++;
-                    return result;
-                }
-                else
-                    throw new System.Security.SecurityException("Throttled");
-            }
-            _lockSlim.ExitReadLock();
-
-            _generalRequestTimes.Put(Util.EnvironmentTickCount());
+            else
+                result = ThrottledRequest(path, request, httpRequest, httpResponse);
 
-            if (_generalRequestTimes.Size == _generalRequestTimes.Capacity &&
-                (Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(), _generalRequestTimes.Get()) <
-                 _options.RequestTimeSpan.TotalMilliseconds))
-            {
-                //Trigger deeper inspection
-                if (DeeperInspection(httpRequest))
-                {
-                    result = ProcessRequest(path, request, httpRequest, httpResponse);
-                    RequestsHandled++;
-                    return result;
-                }
-                if (_options.ThrottledAction == ThrottleAction.DoThrottledMethod)
-                {
-                    result = ThrottledRequest(path, request, httpRequest, httpResponse);
-                    RequestsHandled++;
-                    return result;
-                }
-                else
-                    throw new System.Security.SecurityException("Throttled");
-            }
-           
-            result =ProcessRequest(path, request, httpRequest, httpResponse);
+            
             RequestsHandled++;
 
             return result;
@@ -171,43 +79,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             return new byte[0];
         }
 
-        private bool DeeperInspection(IOSHttpRequest httpRequest)
-        {
-            lock (_deeperInspection)
-            {
-                string clientstring = GetClientString(httpRequest);
-
-
-                if (_deeperInspection.ContainsKey(clientstring))
-                {
-                    _deeperInspection[clientstring].Put(Util.EnvironmentTickCount());
-                    if (_deeperInspection[clientstring].Size == _deeperInspection[clientstring].Capacity &&
-                        (Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(), _deeperInspection[clientstring].Get()) <
-                         _options.RequestTimeSpan.TotalMilliseconds))
-                    {
-                        _lockSlim.EnterWriteLock();
-                        if (!_tempBlocked.ContainsKey(clientstring))
-                            _tempBlocked.Add(clientstring, Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds);
-                        else
-                            _tempBlocked[clientstring] = Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds;
-                        _lockSlim.ExitWriteLock();
-
-                        m_log.WarnFormat("[{0}]: client: {1} is blocked for {2} milliseconds, X-ForwardedForAllowed status is {3}, endpoint:{4}", _options.ReportingName, clientstring, _options.ForgetTimeSpan.TotalMilliseconds, _options.AllowXForwardedFor, GetRemoteAddr(httpRequest));
-                        return false;
-                    }
-                    //else
-                    //   return true;
-                }
-                else
-                {
-                    _deeperInspection.Add(clientstring, new CircularBuffer<int>(_options.MaxRequestsInTimeframe + 1, true));
-                    _deeperInspection[clientstring].Put(Util.EnvironmentTickCount());
-                    _forgetTimer.Enabled = true;
-                }
-
-            }
-            return true;
-        }
+        
         private string GetRemoteAddr(IOSHttpRequest httpRequest)
         {
             string remoteaddr = string.Empty;
diff --git a/OpenSim/Framework/Servers/HttpServer/BasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/BasicDOSProtector.cs
new file mode 100644
index 0000000..50a4ea2
--- /dev/null
+++ b/OpenSim/Framework/Servers/HttpServer/BasicDOSProtector.cs
@@ -0,0 +1,181 @@
+/*
+ * 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;
+
+namespace OpenSim.Framework.Servers.HttpServer
+{
+   
+    public class BasicDOSProtector
+    {
+        public enum ThrottleAction
+        {
+            DoThrottledMethod,
+            DoThrow
+        }
+        private readonly CircularBuffer<int> _generalRequestTimes; // General request checker
+        private readonly BasicDosProtectorOptions _options;
+        private readonly Dictionary<string, CircularBuffer<int>> _deeperInspection;   // per client request checker
+        private readonly Dictionary<string, int> _tempBlocked;  // blocked list
+        private readonly System.Timers.Timer _forgetTimer;  // Cleanup timer
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private readonly System.Threading.ReaderWriterLockSlim _lockSlim = new System.Threading.ReaderWriterLockSlim();
+        public BasicDOSProtector(BasicDosProtectorOptions options)
+        {
+            _generalRequestTimes = new CircularBuffer<int>(options.MaxRequestsInTimeframe + 1, true);
+            _generalRequestTimes.Put(0);
+            _options = options;
+            _deeperInspection = new Dictionary<string, CircularBuffer<int>>();
+            _tempBlocked = new Dictionary<string, int>();
+            _forgetTimer = new System.Timers.Timer();
+            _forgetTimer.Elapsed += delegate
+            {
+                _forgetTimer.Enabled = false;
+
+                List<string> removes = new List<string>();
+                _lockSlim.EnterReadLock();
+                foreach (string str in _tempBlocked.Keys)
+                {
+                    if (
+                        Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(),
+                                                          _tempBlocked[str]) > 0)
+                        removes.Add(str);
+                }
+                _lockSlim.ExitReadLock();
+                lock (_deeperInspection)
+                {
+                    _lockSlim.EnterWriteLock();
+                    for (int i = 0; i < removes.Count; i++)
+                    {
+                        _tempBlocked.Remove(removes[i]);
+                        _deeperInspection.Remove(removes[i]);
+                    }
+                    _lockSlim.ExitWriteLock();
+                }
+                foreach (string str in removes)
+                {
+                    m_log.InfoFormat("[{0}] client: {1} is no longer blocked.",
+                                     _options.ReportingName, str);
+                }
+                _lockSlim.EnterReadLock();
+                if (_tempBlocked.Count > 0)
+                    _forgetTimer.Enabled = true;
+                _lockSlim.ExitReadLock();
+            };
+
+            _forgetTimer.Interval = _options.ForgetTimeSpan.TotalMilliseconds;
+        }
+        public bool Process(string key, string endpoint)
+        {
+            if (_options.MaxRequestsInTimeframe < 1 || _options.RequestTimeSpan.TotalMilliseconds < 1)
+                return true;
+
+            string clientstring = key;
+
+            _lockSlim.EnterReadLock();
+            if (_tempBlocked.ContainsKey(clientstring))
+            {
+                _lockSlim.ExitReadLock();
+
+                if (_options.ThrottledAction == ThrottleAction.DoThrottledMethod)
+                    return false;
+                else
+                    throw new System.Security.SecurityException("Throttled");
+            }
+            _lockSlim.ExitReadLock();
+
+            _generalRequestTimes.Put(Util.EnvironmentTickCount());
+
+            if (_generalRequestTimes.Size == _generalRequestTimes.Capacity &&
+                (Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(), _generalRequestTimes.Get()) <
+                 _options.RequestTimeSpan.TotalMilliseconds))
+            {
+                //Trigger deeper inspection
+                if (DeeperInspection(key, endpoint))
+                    return true;
+                if (_options.ThrottledAction == ThrottleAction.DoThrottledMethod)
+                    return false;
+                else
+                    throw new System.Security.SecurityException("Throttled");
+            }
+            return true;
+        }
+        private bool DeeperInspection(string key, string endpoint)
+        {
+            lock (_deeperInspection)
+            {
+                string clientstring = key;
+
+
+                if (_deeperInspection.ContainsKey(clientstring))
+                {
+                    _deeperInspection[clientstring].Put(Util.EnvironmentTickCount());
+                    if (_deeperInspection[clientstring].Size == _deeperInspection[clientstring].Capacity &&
+                        (Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(), _deeperInspection[clientstring].Get()) <
+                         _options.RequestTimeSpan.TotalMilliseconds))
+                    {
+                        //Looks like we're over the limit
+                        _lockSlim.EnterWriteLock();
+                        if (!_tempBlocked.ContainsKey(clientstring))
+                            _tempBlocked.Add(clientstring, Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds);
+                        else
+                            _tempBlocked[clientstring] = Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds;
+                        _lockSlim.ExitWriteLock();
+
+                        m_log.WarnFormat("[{0}]: client: {1} is blocked for {2} milliseconds, X-ForwardedForAllowed status is {3}, endpoint:{4}", _options.ReportingName, clientstring, _options.ForgetTimeSpan.TotalMilliseconds, _options.AllowXForwardedFor, endpoint);
+
+                        return false;
+                    }
+                    //else
+                    //   return true;
+                }
+                else
+                {
+                    _deeperInspection.Add(clientstring, new CircularBuffer<int>(_options.MaxRequestsInTimeframe + 1, true));
+                    _deeperInspection[clientstring].Put(Util.EnvironmentTickCount());
+                    _forgetTimer.Enabled = true;
+                }
+
+            }
+            return true;
+        }
+
+    }
+
+
+    public class BasicDosProtectorOptions
+    {
+        public int MaxRequestsInTimeframe;
+        public TimeSpan RequestTimeSpan;
+        public TimeSpan ForgetTimeSpan;
+        public bool AllowXForwardedFor;
+        public string ReportingName = "BASICDOSPROTECTOR";
+        public BasicDOSProtector.ThrottleAction ThrottledAction = BasicDOSProtector.ThrottleAction.DoThrottledMethod;
+    }
+}
diff --git a/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
index 5fc999a..39c98b4 100644
--- a/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
+++ b/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
@@ -25,13 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Net;
-using OpenSim.Framework;
-using log4net;
 
 namespace OpenSim.Framework.Servers.HttpServer
 {
@@ -39,147 +33,26 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         private readonly GenericHTTPMethod _normalMethod;
         private readonly GenericHTTPMethod _throttledMethod;
-        private readonly CircularBuffer<int> _generalRequestTimes;
+      
         private readonly BasicDosProtectorOptions _options;
-        private readonly Dictionary<string, CircularBuffer<int>> _deeperInspection;
-        private readonly Dictionary<string, int> _tempBlocked;
-        private readonly System.Timers.Timer _forgetTimer;
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private readonly System.Threading.ReaderWriterLockSlim _lockSlim = new System.Threading.ReaderWriterLockSlim();
+        private readonly BasicDOSProtector _dosProtector;
 
         public GenericHTTPDOSProtector(GenericHTTPMethod normalMethod, GenericHTTPMethod throttledMethod, BasicDosProtectorOptions options)
         {
             _normalMethod = normalMethod;
             _throttledMethod = throttledMethod;
-            _generalRequestTimes = new CircularBuffer<int>(options.MaxRequestsInTimeframe + 1, true);
-            _generalRequestTimes.Put(0);
+            
             _options = options;
-            _deeperInspection = new Dictionary<string, CircularBuffer<int>>();
-            _tempBlocked = new Dictionary<string, int>();
-            _forgetTimer = new System.Timers.Timer();
-            _forgetTimer.Elapsed += delegate
-            {
-                _forgetTimer.Enabled = false;
-
-                List<string> removes = new List<string>();
-                _lockSlim.EnterReadLock();
-                foreach (string str in _tempBlocked.Keys)
-                {
-                    if (
-                        Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(),
-                                                          _tempBlocked[str]) > 0)
-                        removes.Add(str);
-                }
-                _lockSlim.ExitReadLock();
-                lock (_deeperInspection)
-                {
-                    _lockSlim.EnterWriteLock();
-                    for (int i = 0; i < removes.Count; i++)
-                    {
-                        _tempBlocked.Remove(removes[i]);
-                        _deeperInspection.Remove(removes[i]);
-                    }
-                    _lockSlim.ExitWriteLock();
-                }
-                foreach (string str in removes)
-                {
-                    m_log.InfoFormat("[{0}] client: {1} is no longer blocked.",
-                                     _options.ReportingName, str);
-                }
-                _lockSlim.EnterReadLock();
-                if (_tempBlocked.Count > 0)
-                    _forgetTimer.Enabled = true;
-                _lockSlim.ExitReadLock();
-            };
-
-            _forgetTimer.Interval = _options.ForgetTimeSpan.TotalMilliseconds;
+            _dosProtector = new BasicDOSProtector(_options);
         }
         public Hashtable Process(Hashtable request)
         {
-            if (_options.MaxRequestsInTimeframe < 1)
+            if (_dosProtector.Process(GetClientString(request), GetRemoteAddr(request)))
                 return _normalMethod(request);
-            if (_options.RequestTimeSpan.TotalMilliseconds < 1)
-                return _normalMethod(request);
-
-            string clientstring = GetClientString(request);
-
-            _lockSlim.EnterReadLock();
-            if (_tempBlocked.ContainsKey(clientstring))
-            {
-                _lockSlim.ExitReadLock();
-
-                if (_options.ThrottledAction == ThrottleAction.DoThrottledMethod)
-                    return _throttledMethod(request);
-                else
-                    throw new System.Security.SecurityException("Throttled");
-            }
-            _lockSlim.ExitReadLock();
-
-            _generalRequestTimes.Put(Util.EnvironmentTickCount());
-
-            if (_generalRequestTimes.Size == _generalRequestTimes.Capacity &&
-                (Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(), _generalRequestTimes.Get()) <
-                 _options.RequestTimeSpan.TotalMilliseconds))
-            {
-                //Trigger deeper inspection
-                if (DeeperInspection(request))
-                    return _normalMethod(request);
-                if (_options.ThrottledAction == ThrottleAction.DoThrottledMethod)
-                    return _throttledMethod(request);
-                else
-                    throw new System.Security.SecurityException("Throttled");
-            }
-            Hashtable resp = null;
-            try
-            {
-                resp = _normalMethod(request);
-            }
-            catch (Exception)
-            {
-
-                throw;
-            }
-
-            return resp;
-        }
-        private bool DeeperInspection(Hashtable request)
-        {
-            lock (_deeperInspection)
-            {
-                string clientstring = GetClientString(request);
-
-
-                if (_deeperInspection.ContainsKey(clientstring))
-                {
-                    _deeperInspection[clientstring].Put(Util.EnvironmentTickCount());
-                    if (_deeperInspection[clientstring].Size == _deeperInspection[clientstring].Capacity &&
-                        (Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(), _deeperInspection[clientstring].Get()) <
-                         _options.RequestTimeSpan.TotalMilliseconds))
-                    {
-                        _lockSlim.EnterWriteLock();
-                        if (!_tempBlocked.ContainsKey(clientstring))
-                            _tempBlocked.Add(clientstring, Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds);
-                        else
-                            _tempBlocked[clientstring] = Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds;
-                        _lockSlim.ExitWriteLock();
-                        
-                         m_log.WarnFormat("[{0}]: client: {1} is blocked for {2} milliseconds, X-ForwardedForAllowed status is {3}, endpoint:{4}", _options.ReportingName, clientstring, _options.ForgetTimeSpan.TotalMilliseconds, _options.AllowXForwardedFor, GetRemoteAddr(request));
-                        return false;
-                    }
-                    //else
-                    //   return true;
-                }
-                else
-                {
-                    _deeperInspection.Add(clientstring, new CircularBuffer<int>(_options.MaxRequestsInTimeframe + 1, true));
-                    _deeperInspection[clientstring].Put(Util.EnvironmentTickCount());
-                    _forgetTimer.Enabled = true;
-                }
-
-            }
-            return true;
+            else
+                return _throttledMethod(request);
         }
-
+        
         private string GetRemoteAddr(Hashtable request)
         {
             string remoteaddr = "";
diff --git a/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
index ae59c95..bc7efb6 100644
--- a/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
+++ b/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
@@ -25,162 +25,42 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Reflection;
 using System.Net;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
-using log4net;
+
 
 namespace OpenSim.Framework.Servers.HttpServer
 {
-    public enum ThrottleAction
-    {
-        DoThrottledMethod,
-        DoThrow
-    }
-
     public class XmlRpcBasicDOSProtector
     {
         private readonly XmlRpcMethod _normalMethod;
         private readonly XmlRpcMethod _throttledMethod;
-        private readonly CircularBuffer<int> _generalRequestTimes; // General request checker
+       
         private readonly BasicDosProtectorOptions _options;
-        private readonly Dictionary<string, CircularBuffer<int>> _deeperInspection;   // per client request checker
-        private readonly Dictionary<string, int> _tempBlocked;  // blocked list
-        private readonly System.Timers.Timer _forgetTimer;  // Cleanup timer
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private readonly System.Threading.ReaderWriterLockSlim _lockSlim = new System.Threading.ReaderWriterLockSlim();
+        private readonly BasicDOSProtector _dosProtector;
 
         public XmlRpcBasicDOSProtector(XmlRpcMethod normalMethod, XmlRpcMethod throttledMethod,BasicDosProtectorOptions options)
         {
             _normalMethod = normalMethod;
             _throttledMethod = throttledMethod;
-            _generalRequestTimes = new CircularBuffer<int>(options.MaxRequestsInTimeframe + 1,true);
-            _generalRequestTimes.Put(0);
+           
             _options = options;
-            _deeperInspection = new Dictionary<string, CircularBuffer<int>>();
-            _tempBlocked = new Dictionary<string, int>();
-            _forgetTimer = new System.Timers.Timer();
-            _forgetTimer.Elapsed += delegate
-                                        {
-                                            _forgetTimer.Enabled = false;
+            _dosProtector = new BasicDOSProtector(_options);
 
-                                            List<string> removes = new List<string>();
-                                            _lockSlim.EnterReadLock();
-                                            foreach (string str in _tempBlocked.Keys)
-                                            {
-                                                if (
-                                                    Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(),
-                                                                                      _tempBlocked[str]) > 0)
-                                                    removes.Add(str);
-                                            }
-                                            _lockSlim.ExitReadLock();
-                                            lock (_deeperInspection)
-                                            {
-                                                _lockSlim.EnterWriteLock();
-                                                for (int i = 0; i < removes.Count; i++)
-                                                {
-                                                    _tempBlocked.Remove(removes[i]);
-                                                    _deeperInspection.Remove(removes[i]);
-                                                }
-                                                _lockSlim.ExitWriteLock();
-                                            }
-                                            foreach (string str in removes)
-                                            {
-                                                m_log.InfoFormat("[{0}] client: {1} is no longer blocked.",
-                                                                 _options.ReportingName, str);
-                                            }
-                                            _lockSlim.EnterReadLock();
-                                            if (_tempBlocked.Count > 0)
-                                                _forgetTimer.Enabled = true;
-                                            _lockSlim.ExitReadLock();
-                                        };
-                                        
-            _forgetTimer.Interval = _options.ForgetTimeSpan.TotalMilliseconds;
         }
         public XmlRpcResponse Process(XmlRpcRequest request, IPEndPoint client)
         {
-            // If these are set like this, this is disabled
-            if (_options.MaxRequestsInTimeframe < 1 || _options.RequestTimeSpan.TotalMilliseconds < 1)
-                return _normalMethod(request, client);
-           
-            string clientstring = GetClientString(request, client);
-
-            _lockSlim.EnterReadLock();
-            if (_tempBlocked.ContainsKey(clientstring))
-            {
-                _lockSlim.ExitReadLock();
 
-                if (_options.ThrottledAction == ThrottleAction.DoThrottledMethod)
-                    return _throttledMethod(request, client);
-                else
-                    throw new System.Security.SecurityException("Throttled");
-            }
-            _lockSlim.ExitReadLock();
-
-            _generalRequestTimes.Put(Util.EnvironmentTickCount());
-            
-            if (_generalRequestTimes.Size == _generalRequestTimes.Capacity &&
-                (Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(), _generalRequestTimes.Get()) <
-                 _options.RequestTimeSpan.TotalMilliseconds))
-            {
-                //Trigger deeper inspection
-                if (DeeperInspection(request, client))
-                    return _normalMethod(request, client);
-                if (_options.ThrottledAction == ThrottleAction.DoThrottledMethod)
-                    return _throttledMethod(request, client);
-                else
-                    throw new System.Security.SecurityException("Throttled");
-            }
             XmlRpcResponse resp = null;
-           
-            resp = _normalMethod(request, client);
-           
+            if (_dosProtector.Process(GetClientString(request, client), GetEndPoint(request, client)))
+                resp = _normalMethod(request, client);
+            else
+                resp = _throttledMethod(request, client);
+            
             return resp;
         }
 
-        // If the service is getting more hits per expected timeframe then it starts to separate them out by client
-        private bool DeeperInspection(XmlRpcRequest request, IPEndPoint client)
-        {
-            lock (_deeperInspection)
-            {
-                string clientstring = GetClientString(request, client);
-                
-
-                if (_deeperInspection.ContainsKey(clientstring))
-                {
-                    _deeperInspection[clientstring].Put(Util.EnvironmentTickCount());
-                    if (_deeperInspection[clientstring].Size == _deeperInspection[clientstring].Capacity &&
-                        (Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(), _deeperInspection[clientstring].Get()) <
-                         _options.RequestTimeSpan.TotalMilliseconds))
-                    {
-                        //Looks like we're over the limit
-                        _lockSlim.EnterWriteLock();
-                        if (!_tempBlocked.ContainsKey(clientstring))
-                            _tempBlocked.Add(clientstring, Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds);
-                        else
-                            _tempBlocked[clientstring] = Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds;
-                        _lockSlim.ExitWriteLock();
-
-                        m_log.WarnFormat("[{0}]: client: {1} is blocked for {2} milliseconds, X-ForwardedForAllowed status is {3}, endpoint:{4}",_options.ReportingName,clientstring,_options.ForgetTimeSpan.TotalMilliseconds, _options.AllowXForwardedFor, client.Address);
-                        
-                        return false;
-                    }
-                    //else
-                     //   return true;
-                }
-                else
-                {
-                    _deeperInspection.Add(clientstring, new CircularBuffer<int>(_options.MaxRequestsInTimeframe + 1, true));
-                    _deeperInspection[clientstring].Put(Util.EnvironmentTickCount());
-                    _forgetTimer.Enabled = true;
-                }
-
-            }
-            return true;
-        }
         private string GetClientString(XmlRpcRequest request, IPEndPoint client)
         {
             string clientstring;
@@ -197,15 +77,12 @@ namespace OpenSim.Framework.Servers.HttpServer
             return clientstring;
         }
 
-    }
+        private string GetEndPoint(XmlRpcRequest request, IPEndPoint client)
+        {
+             return client.Address.ToString();
+        }
 
-    public class BasicDosProtectorOptions
-    {
-        public int MaxRequestsInTimeframe;
-        public TimeSpan RequestTimeSpan;
-        public TimeSpan ForgetTimeSpan;
-        public bool AllowXForwardedFor;
-        public string ReportingName = "BASICDOSPROTECTOR";
-        public ThrottleAction ThrottledAction = ThrottleAction.DoThrottledMethod;
     }
+
+    
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
index ed4b205..ff87ece 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
@@ -53,10 +53,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                                           {
                                               AllowXForwardedFor = true,
                                               ForgetTimeSpan = TimeSpan.FromMinutes(2),
-                                              MaxRequestsInTimeframe = 5,
+                                              MaxRequestsInTimeframe = 20,
                                               ReportingName = "FRIENDSDOSPROTECTOR",
                                               RequestTimeSpan = TimeSpan.FromSeconds(5),
-                                              ThrottledAction = ThrottleAction.DoThrottledMethod
+                                              ThrottledAction = BasicDOSProtector.ThrottleAction.DoThrottledMethod
                                           })
         {
             m_FriendsModule = fmodule;
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 0f05e07..cdf1467 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         MaxRequestsInTimeframe = 4,
                         ReportingName = "MAPDOSPROTECTOR",
                         RequestTimeSpan = TimeSpan.FromSeconds(10),
-                        ThrottledAction = ThrottleAction.DoThrottledMethod
+                        ThrottledAction = BasicDOSProtector.ThrottleAction.DoThrottledMethod
                     }).Process);
             MainServer.Instance.AddLLSDHandler(
                 "/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest);
@@ -1094,7 +1094,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         {
             Hashtable reply = new Hashtable();
             int statuscode = 500;
-            reply["str_response_string"] = "I blocked you! HAHAHAHAHAHAHHAHAH";
+            reply["str_response_string"] = "";
             reply["int_response_code"] = statuscode;
             reply["content_type"] = "text/plain";
             return reply;
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
index 0bd0235..cd42e70 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Server.Handlers.Asset
                                               MaxRequestsInTimeframe = 5,
                                               ReportingName = "ASSETGETDOSPROTECTOR",
                                               RequestTimeSpan = TimeSpan.FromSeconds(5),
-                                              ThrottledAction = ThrottleAction.DoThrottledMethod
+                                              ThrottledAction = BasicDOSProtector.ThrottleAction.DoThrottledMethod
                                           })
         {
             m_AssetService = service;
-- 
cgit v1.1


From 1df58d04b16601fb3afa408ef48e59aa68dc335b Mon Sep 17 00:00:00 2001
From: teravus
Date: Mon, 7 Oct 2013 23:48:24 -0500
Subject: * Move the BasicDOSProtector.cs to OpenSim.Framework (all useful
 classes belong there.....) * Add an IsBlocked(string Key) method so it can be
 used more generically.   (think..   if we want to rate limit login failures,
 we could have a call in the Login Service to IsBlocked(uuid.ToString()) and
 ignore the connection if it returns true, if IsBlocked returns false, we
 could run the login information and if the login fails we could run the
 Process method to count the login failures.

---
 OpenSim/Framework/BasicDOSProtector.cs             | 209 +++++++++++++++++++++
 .../Servers/HttpServer/BasicDOSProtector.cs        | 181 ------------------
 2 files changed, 209 insertions(+), 181 deletions(-)
 create mode 100644 OpenSim/Framework/BasicDOSProtector.cs
 delete mode 100644 OpenSim/Framework/Servers/HttpServer/BasicDOSProtector.cs

diff --git a/OpenSim/Framework/BasicDOSProtector.cs b/OpenSim/Framework/BasicDOSProtector.cs
new file mode 100644
index 0000000..b470161
--- /dev/null
+++ b/OpenSim/Framework/BasicDOSProtector.cs
@@ -0,0 +1,209 @@
+/*
+ * 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;
+
+namespace OpenSim.Framework
+{
+   
+    public class BasicDOSProtector
+    {
+        public enum ThrottleAction
+        {
+            DoThrottledMethod,
+            DoThrow
+        }
+        private readonly CircularBuffer<int> _generalRequestTimes; // General request checker
+        private readonly BasicDosProtectorOptions _options;
+        private readonly Dictionary<string, CircularBuffer<int>> _deeperInspection;   // per client request checker
+        private readonly Dictionary<string, int> _tempBlocked;  // blocked list
+        private readonly System.Timers.Timer _forgetTimer;  // Cleanup timer
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private readonly System.Threading.ReaderWriterLockSlim _lockSlim = new System.Threading.ReaderWriterLockSlim();
+        public BasicDOSProtector(BasicDosProtectorOptions options)
+        {
+            _generalRequestTimes = new CircularBuffer<int>(options.MaxRequestsInTimeframe + 1, true);
+            _generalRequestTimes.Put(0);
+            _options = options;
+            _deeperInspection = new Dictionary<string, CircularBuffer<int>>();
+            _tempBlocked = new Dictionary<string, int>();
+            _forgetTimer = new System.Timers.Timer();
+            _forgetTimer.Elapsed += delegate
+            {
+                _forgetTimer.Enabled = false;
+
+                List<string> removes = new List<string>();
+                _lockSlim.EnterReadLock();
+                foreach (string str in _tempBlocked.Keys)
+                {
+                    if (
+                        Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(),
+                                                          _tempBlocked[str]) > 0)
+                        removes.Add(str);
+                }
+                _lockSlim.ExitReadLock();
+                lock (_deeperInspection)
+                {
+                    _lockSlim.EnterWriteLock();
+                    for (int i = 0; i < removes.Count; i++)
+                    {
+                        _tempBlocked.Remove(removes[i]);
+                        _deeperInspection.Remove(removes[i]);
+                    }
+                    _lockSlim.ExitWriteLock();
+                }
+                foreach (string str in removes)
+                {
+                    m_log.InfoFormat("[{0}] client: {1} is no longer blocked.",
+                                     _options.ReportingName, str);
+                }
+                _lockSlim.EnterReadLock();
+                if (_tempBlocked.Count > 0)
+                    _forgetTimer.Enabled = true;
+                _lockSlim.ExitReadLock();
+            };
+
+            _forgetTimer.Interval = _options.ForgetTimeSpan.TotalMilliseconds;
+        }
+
+        /// <summary>
+        /// Given a string Key, Returns if that context is blocked
+        /// </summary>
+        /// <param name="key">A Key identifying the context</param>
+        /// <returns>bool Yes or No, True or False for blocked</returns>
+        public bool IsBlocked(string key)
+        {
+            bool ret = false;
+             _lockSlim.EnterReadLock();
+            ret = _tempBlocked.ContainsKey(key);
+            _lockSlim.ExitReadLock();
+            return ret;
+        }
+
+        /// <summary>
+        /// Process the velocity of this context
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="endpoint"></param>
+        /// <returns></returns>
+        public bool Process(string key, string endpoint)
+        {
+            if (_options.MaxRequestsInTimeframe < 1 || _options.RequestTimeSpan.TotalMilliseconds < 1)
+                return true;
+
+            string clientstring = key;
+
+            _lockSlim.EnterReadLock();
+            if (_tempBlocked.ContainsKey(clientstring))
+            {
+                _lockSlim.ExitReadLock();
+
+                if (_options.ThrottledAction == ThrottleAction.DoThrottledMethod)
+                    return false;
+                else
+                    throw new System.Security.SecurityException("Throttled");
+            }
+            _lockSlim.ExitReadLock();
+
+            _generalRequestTimes.Put(Util.EnvironmentTickCount());
+
+            if (_generalRequestTimes.Size == _generalRequestTimes.Capacity &&
+                (Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(), _generalRequestTimes.Get()) <
+                 _options.RequestTimeSpan.TotalMilliseconds))
+            {
+                //Trigger deeper inspection
+                if (DeeperInspection(key, endpoint))
+                    return true;
+                if (_options.ThrottledAction == ThrottleAction.DoThrottledMethod)
+                    return false;
+                else
+                    throw new System.Security.SecurityException("Throttled");
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// At this point, the rate limiting code needs to track 'per user' velocity.
+        /// </summary>
+        /// <param name="key">Context Key, string representing a rate limiting context</param>
+        /// <param name="endpoint"></param>
+        /// <returns></returns>
+        private bool DeeperInspection(string key, string endpoint)
+        {
+            lock (_deeperInspection)
+            {
+                string clientstring = key;
+
+
+                if (_deeperInspection.ContainsKey(clientstring))
+                {
+                    _deeperInspection[clientstring].Put(Util.EnvironmentTickCount());
+                    if (_deeperInspection[clientstring].Size == _deeperInspection[clientstring].Capacity &&
+                        (Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(), _deeperInspection[clientstring].Get()) <
+                         _options.RequestTimeSpan.TotalMilliseconds))
+                    {
+                        //Looks like we're over the limit
+                        _lockSlim.EnterWriteLock();
+                        if (!_tempBlocked.ContainsKey(clientstring))
+                            _tempBlocked.Add(clientstring, Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds);
+                        else
+                            _tempBlocked[clientstring] = Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds;
+                        _lockSlim.ExitWriteLock();
+
+                        m_log.WarnFormat("[{0}]: client: {1} is blocked for {2} milliseconds, X-ForwardedForAllowed status is {3}, endpoint:{4}", _options.ReportingName, clientstring, _options.ForgetTimeSpan.TotalMilliseconds, _options.AllowXForwardedFor, endpoint);
+
+                        return false;
+                    }
+                    //else
+                    //   return true;
+                }
+                else
+                {
+                    _deeperInspection.Add(clientstring, new CircularBuffer<int>(_options.MaxRequestsInTimeframe + 1, true));
+                    _deeperInspection[clientstring].Put(Util.EnvironmentTickCount());
+                    _forgetTimer.Enabled = true;
+                }
+
+            }
+            return true;
+        }
+
+    }
+
+
+    public class BasicDosProtectorOptions
+    {
+        public int MaxRequestsInTimeframe;
+        public TimeSpan RequestTimeSpan;
+        public TimeSpan ForgetTimeSpan;
+        public bool AllowXForwardedFor;
+        public string ReportingName = "BASICDOSPROTECTOR";
+        public BasicDOSProtector.ThrottleAction ThrottledAction = BasicDOSProtector.ThrottleAction.DoThrottledMethod;
+    }
+}
diff --git a/OpenSim/Framework/Servers/HttpServer/BasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/BasicDOSProtector.cs
deleted file mode 100644
index 50a4ea2..0000000
--- a/OpenSim/Framework/Servers/HttpServer/BasicDOSProtector.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using log4net;
-
-namespace OpenSim.Framework.Servers.HttpServer
-{
-   
-    public class BasicDOSProtector
-    {
-        public enum ThrottleAction
-        {
-            DoThrottledMethod,
-            DoThrow
-        }
-        private readonly CircularBuffer<int> _generalRequestTimes; // General request checker
-        private readonly BasicDosProtectorOptions _options;
-        private readonly Dictionary<string, CircularBuffer<int>> _deeperInspection;   // per client request checker
-        private readonly Dictionary<string, int> _tempBlocked;  // blocked list
-        private readonly System.Timers.Timer _forgetTimer;  // Cleanup timer
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private readonly System.Threading.ReaderWriterLockSlim _lockSlim = new System.Threading.ReaderWriterLockSlim();
-        public BasicDOSProtector(BasicDosProtectorOptions options)
-        {
-            _generalRequestTimes = new CircularBuffer<int>(options.MaxRequestsInTimeframe + 1, true);
-            _generalRequestTimes.Put(0);
-            _options = options;
-            _deeperInspection = new Dictionary<string, CircularBuffer<int>>();
-            _tempBlocked = new Dictionary<string, int>();
-            _forgetTimer = new System.Timers.Timer();
-            _forgetTimer.Elapsed += delegate
-            {
-                _forgetTimer.Enabled = false;
-
-                List<string> removes = new List<string>();
-                _lockSlim.EnterReadLock();
-                foreach (string str in _tempBlocked.Keys)
-                {
-                    if (
-                        Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(),
-                                                          _tempBlocked[str]) > 0)
-                        removes.Add(str);
-                }
-                _lockSlim.ExitReadLock();
-                lock (_deeperInspection)
-                {
-                    _lockSlim.EnterWriteLock();
-                    for (int i = 0; i < removes.Count; i++)
-                    {
-                        _tempBlocked.Remove(removes[i]);
-                        _deeperInspection.Remove(removes[i]);
-                    }
-                    _lockSlim.ExitWriteLock();
-                }
-                foreach (string str in removes)
-                {
-                    m_log.InfoFormat("[{0}] client: {1} is no longer blocked.",
-                                     _options.ReportingName, str);
-                }
-                _lockSlim.EnterReadLock();
-                if (_tempBlocked.Count > 0)
-                    _forgetTimer.Enabled = true;
-                _lockSlim.ExitReadLock();
-            };
-
-            _forgetTimer.Interval = _options.ForgetTimeSpan.TotalMilliseconds;
-        }
-        public bool Process(string key, string endpoint)
-        {
-            if (_options.MaxRequestsInTimeframe < 1 || _options.RequestTimeSpan.TotalMilliseconds < 1)
-                return true;
-
-            string clientstring = key;
-
-            _lockSlim.EnterReadLock();
-            if (_tempBlocked.ContainsKey(clientstring))
-            {
-                _lockSlim.ExitReadLock();
-
-                if (_options.ThrottledAction == ThrottleAction.DoThrottledMethod)
-                    return false;
-                else
-                    throw new System.Security.SecurityException("Throttled");
-            }
-            _lockSlim.ExitReadLock();
-
-            _generalRequestTimes.Put(Util.EnvironmentTickCount());
-
-            if (_generalRequestTimes.Size == _generalRequestTimes.Capacity &&
-                (Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(), _generalRequestTimes.Get()) <
-                 _options.RequestTimeSpan.TotalMilliseconds))
-            {
-                //Trigger deeper inspection
-                if (DeeperInspection(key, endpoint))
-                    return true;
-                if (_options.ThrottledAction == ThrottleAction.DoThrottledMethod)
-                    return false;
-                else
-                    throw new System.Security.SecurityException("Throttled");
-            }
-            return true;
-        }
-        private bool DeeperInspection(string key, string endpoint)
-        {
-            lock (_deeperInspection)
-            {
-                string clientstring = key;
-
-
-                if (_deeperInspection.ContainsKey(clientstring))
-                {
-                    _deeperInspection[clientstring].Put(Util.EnvironmentTickCount());
-                    if (_deeperInspection[clientstring].Size == _deeperInspection[clientstring].Capacity &&
-                        (Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(), _deeperInspection[clientstring].Get()) <
-                         _options.RequestTimeSpan.TotalMilliseconds))
-                    {
-                        //Looks like we're over the limit
-                        _lockSlim.EnterWriteLock();
-                        if (!_tempBlocked.ContainsKey(clientstring))
-                            _tempBlocked.Add(clientstring, Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds);
-                        else
-                            _tempBlocked[clientstring] = Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds;
-                        _lockSlim.ExitWriteLock();
-
-                        m_log.WarnFormat("[{0}]: client: {1} is blocked for {2} milliseconds, X-ForwardedForAllowed status is {3}, endpoint:{4}", _options.ReportingName, clientstring, _options.ForgetTimeSpan.TotalMilliseconds, _options.AllowXForwardedFor, endpoint);
-
-                        return false;
-                    }
-                    //else
-                    //   return true;
-                }
-                else
-                {
-                    _deeperInspection.Add(clientstring, new CircularBuffer<int>(_options.MaxRequestsInTimeframe + 1, true));
-                    _deeperInspection[clientstring].Put(Util.EnvironmentTickCount());
-                    _forgetTimer.Enabled = true;
-                }
-
-            }
-            return true;
-        }
-
-    }
-
-
-    public class BasicDosProtectorOptions
-    {
-        public int MaxRequestsInTimeframe;
-        public TimeSpan RequestTimeSpan;
-        public TimeSpan ForgetTimeSpan;
-        public bool AllowXForwardedFor;
-        public string ReportingName = "BASICDOSPROTECTOR";
-        public BasicDOSProtector.ThrottleAction ThrottledAction = BasicDOSProtector.ThrottleAction.DoThrottledMethod;
-    }
-}
-- 
cgit v1.1


From e7ea053c4a4945160980f5e6763ecc4dc8af2609 Mon Sep 17 00:00:00 2001
From: teravus
Date: Mon, 7 Oct 2013 23:52:44 -0500
Subject: * Remove a test *cleanup*

---
 OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
index cd42e70..8b23a83 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
@@ -42,22 +42,14 @@ using OpenSim.Framework.Servers.HttpServer;
 
 namespace OpenSim.Server.Handlers.Asset
 {
-    public class AssetServerGetHandler : BaseStreamHandlerBasicDOSProtector
+    public class AssetServerGetHandler : BaseStreamHandler
     {
         // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private IAssetService m_AssetService;
 
         public AssetServerGetHandler(IAssetService service) :
-                base("GET", "/assets",new BasicDosProtectorOptions()
-                                          {
-                                              AllowXForwardedFor = true,
-                                              ForgetTimeSpan = TimeSpan.FromSeconds(2),
-                                              MaxRequestsInTimeframe = 5,
-                                              ReportingName = "ASSETGETDOSPROTECTOR",
-                                              RequestTimeSpan = TimeSpan.FromSeconds(5),
-                                              ThrottledAction = BasicDOSProtector.ThrottleAction.DoThrottledMethod
-                                          })
+                base("GET", "/assets")
         {
             m_AssetService = service;
         }
-- 
cgit v1.1


From 75f63ecfcd885ae71bca130ee0db1ecc997b86cd Mon Sep 17 00:00:00 2001
From: teravus
Date: Wed, 9 Oct 2013 22:21:25 -0500
Subject: * Add a session concurrency option per key.  Allows developer/config
 to specify number of concurrent requests on a service.

---
 OpenSim/Framework/BasicDOSProtector.cs             | 96 ++++++++++++++++++----
 .../BaseStreamHandlerBasicDOSProtector.cs          |  8 +-
 .../HttpServer/GenericHTTPBasicDOSProtector.cs     | 14 +++-
 .../Servers/HttpServer/XmlRpcBasicDOSProtector.cs  |  7 +-
 4 files changed, 102 insertions(+), 23 deletions(-)

diff --git a/OpenSim/Framework/BasicDOSProtector.cs b/OpenSim/Framework/BasicDOSProtector.cs
index b470161..89bfa94 100644
--- a/OpenSim/Framework/BasicDOSProtector.cs
+++ b/OpenSim/Framework/BasicDOSProtector.cs
@@ -43,9 +43,11 @@ namespace OpenSim.Framework
         private readonly BasicDosProtectorOptions _options;
         private readonly Dictionary<string, CircularBuffer<int>> _deeperInspection;   // per client request checker
         private readonly Dictionary<string, int> _tempBlocked;  // blocked list
+        private readonly Dictionary<string, int> _sessions; 
         private readonly System.Timers.Timer _forgetTimer;  // Cleanup timer
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private readonly System.Threading.ReaderWriterLockSlim _lockSlim = new System.Threading.ReaderWriterLockSlim();
+        private readonly System.Threading.ReaderWriterLockSlim _blockLockSlim = new System.Threading.ReaderWriterLockSlim();
+        private readonly System.Threading.ReaderWriterLockSlim _sessionLockSlim = new System.Threading.ReaderWriterLockSlim();
         public BasicDOSProtector(BasicDosProtectorOptions options)
         {
             _generalRequestTimes = new CircularBuffer<int>(options.MaxRequestsInTimeframe + 1, true);
@@ -53,13 +55,14 @@ namespace OpenSim.Framework
             _options = options;
             _deeperInspection = new Dictionary<string, CircularBuffer<int>>();
             _tempBlocked = new Dictionary<string, int>();
+            _sessions = new Dictionary<string, int>();
             _forgetTimer = new System.Timers.Timer();
             _forgetTimer.Elapsed += delegate
             {
                 _forgetTimer.Enabled = false;
 
                 List<string> removes = new List<string>();
-                _lockSlim.EnterReadLock();
+                _blockLockSlim.EnterReadLock();
                 foreach (string str in _tempBlocked.Keys)
                 {
                     if (
@@ -67,26 +70,27 @@ namespace OpenSim.Framework
                                                           _tempBlocked[str]) > 0)
                         removes.Add(str);
                 }
-                _lockSlim.ExitReadLock();
+                _blockLockSlim.ExitReadLock();
                 lock (_deeperInspection)
                 {
-                    _lockSlim.EnterWriteLock();
+                    _blockLockSlim.EnterWriteLock();
                     for (int i = 0; i < removes.Count; i++)
                     {
                         _tempBlocked.Remove(removes[i]);
                         _deeperInspection.Remove(removes[i]);
+                        _sessions.Remove(removes[i]);
                     }
-                    _lockSlim.ExitWriteLock();
+                    _blockLockSlim.ExitWriteLock();
                 }
                 foreach (string str in removes)
                 {
                     m_log.InfoFormat("[{0}] client: {1} is no longer blocked.",
                                      _options.ReportingName, str);
                 }
-                _lockSlim.EnterReadLock();
+                _blockLockSlim.EnterReadLock();
                 if (_tempBlocked.Count > 0)
                     _forgetTimer.Enabled = true;
-                _lockSlim.ExitReadLock();
+                _blockLockSlim.ExitReadLock();
             };
 
             _forgetTimer.Interval = _options.ForgetTimeSpan.TotalMilliseconds;
@@ -100,9 +104,9 @@ namespace OpenSim.Framework
         public bool IsBlocked(string key)
         {
             bool ret = false;
-             _lockSlim.EnterReadLock();
+             _blockLockSlim.EnterReadLock();
             ret = _tempBlocked.ContainsKey(key);
-            _lockSlim.ExitReadLock();
+            _blockLockSlim.ExitReadLock();
             return ret;
         }
 
@@ -119,20 +123,58 @@ namespace OpenSim.Framework
 
             string clientstring = key;
 
-            _lockSlim.EnterReadLock();
+            _blockLockSlim.EnterReadLock();
             if (_tempBlocked.ContainsKey(clientstring))
             {
-                _lockSlim.ExitReadLock();
+                _blockLockSlim.ExitReadLock();
 
                 if (_options.ThrottledAction == ThrottleAction.DoThrottledMethod)
                     return false;
                 else
                     throw new System.Security.SecurityException("Throttled");
             }
-            _lockSlim.ExitReadLock();
+           
+            _blockLockSlim.ExitReadLock();
 
-            _generalRequestTimes.Put(Util.EnvironmentTickCount());
+            lock (_generalRequestTimes)
+                _generalRequestTimes.Put(Util.EnvironmentTickCount());
 
+            if (_options.MaxConcurrentSessions > 0)
+            {
+                int sessionscount = 0;
+
+                _sessionLockSlim.EnterReadLock();
+                if (_sessions.ContainsKey(key))
+                    sessionscount = _sessions[key];
+                _sessionLockSlim.ExitReadLock();
+
+                if (sessionscount > _options.MaxConcurrentSessions)
+                {
+                    // Add to blocking and cleanup methods
+                    lock (_deeperInspection)
+                    {
+                        _blockLockSlim.EnterWriteLock();
+                        if (!_tempBlocked.ContainsKey(clientstring))
+                        {
+                            _tempBlocked.Add(clientstring,
+                                             Util.EnvironmentTickCount() +
+                                             (int) _options.ForgetTimeSpan.TotalMilliseconds);
+                            _forgetTimer.Enabled = true;
+                            m_log.WarnFormat("[{0}]: client: {1} is blocked for {2} milliseconds based on concurrency, X-ForwardedForAllowed status is {3}, endpoint:{4}", _options.ReportingName, clientstring, _options.ForgetTimeSpan.TotalMilliseconds, _options.AllowXForwardedFor, endpoint);
+
+                        }
+                        else
+                            _tempBlocked[clientstring] = Util.EnvironmentTickCount() +
+                                                         (int) _options.ForgetTimeSpan.TotalMilliseconds;
+                        _blockLockSlim.ExitWriteLock();
+
+                    }
+                    
+
+                }
+                else 
+                    ProcessConcurrency(key, endpoint);
+            }
             if (_generalRequestTimes.Size == _generalRequestTimes.Capacity &&
                 (Util.EnvironmentTickCountSubtract(Util.EnvironmentTickCount(), _generalRequestTimes.Get()) <
                  _options.RequestTimeSpan.TotalMilliseconds))
@@ -147,6 +189,29 @@ namespace OpenSim.Framework
             }
             return true;
         }
+        private void ProcessConcurrency(string key, string endpoint)
+        {
+            _sessionLockSlim.EnterWriteLock();
+            if (_sessions.ContainsKey(key))
+                _sessions[key] = _sessions[key] + 1;
+            else 
+                _sessions.Add(key,1);
+            _sessionLockSlim.ExitWriteLock();
+        }
+        public void ProcessEnd(string key, string endpoint)
+        {
+            _sessionLockSlim.EnterWriteLock();
+            if (_sessions.ContainsKey(key))
+            {
+                _sessions[key]--;
+                if (_sessions[key] <= 0)
+                    _sessions.Remove(key);
+            }
+            else
+                _sessions.Add(key, 1);
+           
+            _sessionLockSlim.ExitWriteLock();
+        }
 
         /// <summary>
         /// At this point, the rate limiting code needs to track 'per user' velocity.
@@ -169,12 +234,12 @@ namespace OpenSim.Framework
                          _options.RequestTimeSpan.TotalMilliseconds))
                     {
                         //Looks like we're over the limit
-                        _lockSlim.EnterWriteLock();
+                        _blockLockSlim.EnterWriteLock();
                         if (!_tempBlocked.ContainsKey(clientstring))
                             _tempBlocked.Add(clientstring, Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds);
                         else
                             _tempBlocked[clientstring] = Util.EnvironmentTickCount() + (int)_options.ForgetTimeSpan.TotalMilliseconds;
-                        _lockSlim.ExitWriteLock();
+                        _blockLockSlim.ExitWriteLock();
 
                         m_log.WarnFormat("[{0}]: client: {1} is blocked for {2} milliseconds, X-ForwardedForAllowed status is {3}, endpoint:{4}", _options.ReportingName, clientstring, _options.ForgetTimeSpan.TotalMilliseconds, _options.AllowXForwardedFor, endpoint);
 
@@ -205,5 +270,6 @@ namespace OpenSim.Framework
         public bool AllowXForwardedFor;
         public string ReportingName = "BASICDOSPROTECTOR";
         public BasicDOSProtector.ThrottleAction ThrottledAction = BasicDOSProtector.ThrottleAction.DoThrottledMethod;
+        public int MaxConcurrentSessions;
     }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
index 9b8b8c2..1b88545 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
@@ -55,12 +55,14 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             byte[] result;
             RequestsReceived++;
-
-            if (_dosProtector.Process(GetClientString(httpRequest), GetRemoteAddr(httpRequest)))
+            string clientstring = GetClientString(httpRequest);
+            string endpoint = GetRemoteAddr(httpRequest);
+            if (_dosProtector.Process(clientstring, endpoint))
                 result = ProcessRequest(path, request, httpRequest, httpResponse);
             else
                 result = ThrottledRequest(path, request, httpRequest, httpResponse);
-
+            if (_options.MaxConcurrentSessions > 0)
+                _dosProtector.ProcessEnd(clientstring, endpoint);
             
             RequestsHandled++;
 
diff --git a/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
index 39c98b4..cd4b8ff 100644
--- a/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
+++ b/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
@@ -47,10 +47,18 @@ namespace OpenSim.Framework.Servers.HttpServer
         }
         public Hashtable Process(Hashtable request)
         {
-            if (_dosProtector.Process(GetClientString(request), GetRemoteAddr(request)))
-                return _normalMethod(request);
+            Hashtable process = null;
+            string clientstring= GetClientString(request);
+            string endpoint = GetRemoteAddr(request);
+            if (_dosProtector.Process(clientstring, endpoint))
+                process =  _normalMethod(request);
             else
-                return _throttledMethod(request);
+                process = _throttledMethod(request);
+
+            if (_options.MaxConcurrentSessions>0)
+                _dosProtector.ProcessEnd(clientstring, endpoint);
+
+            return process;
         }
         
         private string GetRemoteAddr(Hashtable request)
diff --git a/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
index bc7efb6..f212208 100644
--- a/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
+++ b/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
@@ -53,11 +53,14 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
 
             XmlRpcResponse resp = null;
-            if (_dosProtector.Process(GetClientString(request, client), GetEndPoint(request, client)))
+            string clientstring = GetClientString(request, client);
+            string endpoint = GetEndPoint(request, client);
+            if (_dosProtector.Process(clientstring, endpoint))
                 resp = _normalMethod(request, client);
             else
                 resp = _throttledMethod(request, client);
-            
+            if (_options.MaxConcurrentSessions > 0)
+                _dosProtector.ProcessEnd(clientstring, endpoint);
             return resp;
         }
 
-- 
cgit v1.1


From 8b5e2f2cd28510fc249bade0ca0d71e02b6b5f34 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 11 Oct 2013 13:29:43 -0700
Subject: BulletSim: Fix snap back from edge of region problem. Mantis 6794.

---
 OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
index c4807c4..c016eed 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
@@ -354,6 +354,8 @@ public sealed class BSTerrainManager : IDisposable
     // Return a new position that is over known terrain if the position is outside our terrain.
     public Vector3 ClampPositionIntoKnownTerrain(Vector3 pPos)
     {
+        float edgeEpsilon = 0.1f;
+
         Vector3 ret = pPos;
 
         // First, base addresses are never negative so correct for that possible problem.
@@ -378,10 +380,19 @@ public sealed class BSTerrainManager : IDisposable
             // NOTE that GetTerrainPhysicalAtXYZ will set 'terrainBaseXYZ' to the base of the unfound region.
 
             // Must be off the top of a region. Find an adjacent region to move into.
+            //     The returned terrain is always 'lower'. That is, closer to <0,0>.
             Vector3 adjacentTerrainBase = FindAdjacentTerrainBase(terrainBaseXYZ);
 
-            ret.X = Math.Min(ret.X, adjacentTerrainBase.X + (ret.X % DefaultRegionSize.X));
-            ret.Y = Math.Min(ret.Y, adjacentTerrainBase.Y + (ret.X % DefaultRegionSize.Y));
+            if (adjacentTerrainBase.X < terrainBaseXYZ.X)
+            {
+                // moving down into a new region in the X dimension. New position will be the max in the new base.
+                ret.X = adjacentTerrainBase.X + DefaultRegionSize.X - edgeEpsilon;
+            }
+            if (adjacentTerrainBase.Y < terrainBaseXYZ.Y)
+            {
+                // moving down into a new region in the X dimension. New position will be the max in the new base.
+                ret.Y = adjacentTerrainBase.Y + DefaultRegionSize.Y - edgeEpsilon;
+            }
             DetailLog("{0},BSTerrainManager.ClampPositionToKnownTerrain,findingAdjacentRegion,adjacentRegBase={1},oldPos={2},newPos={3}",
                                         BSScene.DetailLogZero, adjacentTerrainBase, pPos, ret);
 
-- 
cgit v1.1


From 2eade554716ddcdab590d4bc5d9ad18079c12bdb Mon Sep 17 00:00:00 2001
From: teravus
Date: Sat, 12 Oct 2013 15:06:05 -0500
Subject: * pushing test

---
 TESTING.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TESTING.txt b/TESTING.txt
index e7ab088..da9dd60 100644
--- a/TESTING.txt
+++ b/TESTING.txt
@@ -1,4 +1,4 @@
-= The Quick Guide to OpenSim Unit Testing =
+= The Quick Guide to OpenSim Unit Testing = 
 
 == Running Tests ==
 
-- 
cgit v1.1


From ff8a76825841533bdc5d534b6f58b2ab964ea6c6 Mon Sep 17 00:00:00 2001
From: Fernando Oliveira
Date: Sat, 12 Oct 2013 16:33:45 -0500
Subject: Fernando Oliveira's Postgress SQL Server Data Connector as a single
 commit. * Added PostGreSQL support * Added MySQL/MySQLXGroupData.cs *
 PostgreSQL data access implementation * PostgreSQL dll binarie and
 RegionStore.migrations * Migrations Scripts from MSSQL to POSTGRES * Postgres
 SQL Type fixes * Postgres SQL Connection string * Data type issues * more
 fixes * tests and +tests * UUID x string - FIGHT! * Fixed PG types to
 internal csharp types * More data type fix (PostgreSQL fields are case
 sensitive) :( * more field case sensitive fixes * changed the migration files
 to be case sensitive for fields. * fixed fields case * finished converting,
 now search for hidden bugs. * some more fixes * bool type fixed * more case
 fixes; * creatorID case fixed * case fields fixed * fixed default now() for
 TMStamp fields with don't allow nulls. * fix case sensitve for Region name
 and Estate name * fixed case for names for search * fix class name Error *
 Bug fixed on select and migrations * Un-Reverting my change due to Postgres
 issue with the ILIKE function * Fixed some issued for Diva Distro * Fixes for
 integration with Diva Distro * Added System.Core to prebuild.xml for PG
 project * Configured to make DIff for Push to OpenSim Project * Diffs only to
 PostgreSQL mods.

---
 OpenSim/Data/PGSQL/PGSQLAssetData.cs               |  295 ++
 OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs      |  254 ++
 OpenSim/Data/PGSQL/PGSQLAvatarData.cs              |   72 +
 OpenSim/Data/PGSQL/PGSQLEstateData.cs              |  598 +++
 OpenSim/Data/PGSQL/PGSQLFramework.cs               |   82 +
 OpenSim/Data/PGSQL/PGSQLFriendsData.cs             |  116 +
 OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs     |  519 +++
 OpenSim/Data/PGSQL/PGSQLGridUserData.cs            |   68 +
 OpenSim/Data/PGSQL/PGSQLGroupsData.cs              |  481 +++
 OpenSim/Data/PGSQL/PGSQLHGTravelData.cs            |   80 +
 OpenSim/Data/PGSQL/PGSQLInventoryData.cs           |  831 ++++
 OpenSim/Data/PGSQL/PGSQLManager.cs                 |  321 ++
 OpenSim/Data/PGSQL/PGSQLMigration.cs               |  102 +
 OpenSim/Data/PGSQL/PGSQLOfflineIMData.cs           |   56 +
 OpenSim/Data/PGSQL/PGSQLPresenceData.cs            |  115 +
 OpenSim/Data/PGSQL/PGSQLRegionData.cs              |  392 ++
 OpenSim/Data/PGSQL/PGSQLSimulationData.cs          | 2247 +++++++++++
 OpenSim/Data/PGSQL/PGSQLUserAccountData.cs         |  325 ++
 OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs        | 1075 +++++
 OpenSim/Data/PGSQL/PGSQLXAssetData.cs              |  535 +++
 OpenSim/Data/PGSQL/PGSQLXInventoryData.cs          |  330 ++
 OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs      |   65 +
 OpenSim/Data/PGSQL/Resources/AssetStore.migrations |   94 +
 OpenSim/Data/PGSQL/Resources/AuthStore.migrations  |   32 +
 OpenSim/Data/PGSQL/Resources/Avatar.migrations     |   59 +
 .../Data/PGSQL/Resources/EstateStore.migrations    |  307 ++
 .../Data/PGSQL/Resources/FriendsStore.migrations   |   44 +
 OpenSim/Data/PGSQL/Resources/GridStore.migrations  |  242 ++
 .../Data/PGSQL/Resources/GridUserStore.migrations  |   60 +
 .../Data/PGSQL/Resources/HGTravelStore.migrations  |   17 +
 OpenSim/Data/PGSQL/Resources/IM_Store.migrations   |   26 +
 .../Data/PGSQL/Resources/InventoryStore.migrations |  211 +
 OpenSim/Data/PGSQL/Resources/LogStore.migrations   |   16 +
 OpenSim/Data/PGSQL/Resources/Presence.migrations   |   30 +
 .../Data/PGSQL/Resources/RegionStore.migrations    | 1136 ++++++
 .../Data/PGSQL/Resources/UserAccount.migrations    |   51 +
 .../Data/PGSQL/Resources/UserProfiles.migrations   |   83 +
 OpenSim/Data/PGSQL/Resources/UserStore.migrations  |  404 ++
 .../Data/PGSQL/Resources/XAssetStore.migrations    |   27 +
 .../PGSQL/Resources/os_groups_Store.migrations     |   94 +
 bin/Npgsql.dll                                     |  Bin 0 -> 413184 bytes
 bin/Npgsql.xml                                     | 4120 ++++++++++++++++++++
 bin/Robust.HG.ini.example                          |    9 +
 bin/Robust.ini.example                             |    9 +
 bin/config-include/GridCommon.ini.example          |    6 +
 bin/config-include/StandaloneCommon.ini.example    |    6 +
 prebuild.xml                                       |   36 +
 47 files changed, 16078 insertions(+)
 create mode 100644 OpenSim/Data/PGSQL/PGSQLAssetData.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLAvatarData.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLEstateData.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLFramework.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLFriendsData.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLGridUserData.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLGroupsData.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLHGTravelData.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLInventoryData.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLManager.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLMigration.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLOfflineIMData.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLPresenceData.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLRegionData.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLSimulationData.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLUserAccountData.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLXAssetData.cs
 create mode 100644 OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
 create mode 100644 OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Data/PGSQL/Resources/AssetStore.migrations
 create mode 100644 OpenSim/Data/PGSQL/Resources/AuthStore.migrations
 create mode 100644 OpenSim/Data/PGSQL/Resources/Avatar.migrations
 create mode 100644 OpenSim/Data/PGSQL/Resources/EstateStore.migrations
 create mode 100644 OpenSim/Data/PGSQL/Resources/FriendsStore.migrations
 create mode 100644 OpenSim/Data/PGSQL/Resources/GridStore.migrations
 create mode 100644 OpenSim/Data/PGSQL/Resources/GridUserStore.migrations
 create mode 100644 OpenSim/Data/PGSQL/Resources/HGTravelStore.migrations
 create mode 100644 OpenSim/Data/PGSQL/Resources/IM_Store.migrations
 create mode 100644 OpenSim/Data/PGSQL/Resources/InventoryStore.migrations
 create mode 100644 OpenSim/Data/PGSQL/Resources/LogStore.migrations
 create mode 100644 OpenSim/Data/PGSQL/Resources/Presence.migrations
 create mode 100644 OpenSim/Data/PGSQL/Resources/RegionStore.migrations
 create mode 100644 OpenSim/Data/PGSQL/Resources/UserAccount.migrations
 create mode 100644 OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
 create mode 100644 OpenSim/Data/PGSQL/Resources/UserStore.migrations
 create mode 100644 OpenSim/Data/PGSQL/Resources/XAssetStore.migrations
 create mode 100644 OpenSim/Data/PGSQL/Resources/os_groups_Store.migrations
 create mode 100644 bin/Npgsql.dll
 create mode 100644 bin/Npgsql.xml

diff --git a/OpenSim/Data/PGSQL/PGSQLAssetData.cs b/OpenSim/Data/PGSQL/PGSQLAssetData.cs
new file mode 100644
index 0000000..ab74856
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLAssetData.cs
@@ -0,0 +1,295 @@
+/*
+ * 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 System.Collections.Generic;
+using OpenMetaverse;
+using log4net;
+using OpenSim.Framework;
+using Npgsql;
+using NpgsqlTypes;
+
+namespace OpenSim.Data.PGSQL
+{
+    /// <summary>
+    /// A PGSQL Interface for the Asset server
+    /// </summary>
+    public class PGSQLAssetData : AssetDataBase
+    {
+        private const string _migrationStore = "AssetStore";
+
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private long m_ticksToEpoch;
+        /// <summary>
+        /// Database manager
+        /// </summary>
+        private PGSQLManager m_database;
+        private string m_connectionString;
+
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+
+        #region IPlugin Members
+
+        override public void Dispose() { }
+
+        /// <summary>
+        /// <para>Initialises asset interface</para>
+        /// </summary>
+        // [Obsolete("Cannot be default-initialized!")]
+        override public void Initialise()
+        {
+            m_log.Info("[PGSQLAssetData]: " + Name + " cannot be default-initialized!");
+            throw new PluginNotInitialisedException(Name);
+        }
+
+        /// <summary>
+        /// Initialises asset interface
+        /// </summary>
+        /// <para>
+        /// a string instead of file, if someone writes the support
+        /// </para>
+        /// <param name="connectionString">connect string</param>
+        override public void Initialise(string connectionString)
+        {
+            m_ticksToEpoch = new System.DateTime(1970, 1, 1).Ticks;
+
+            m_database = new PGSQLManager(connectionString);
+            m_connectionString = connectionString;
+
+            //New migration to check for DB changes
+            m_database.CheckMigration(_migrationStore);
+        }
+
+        /// <summary>
+        /// Database provider version.
+        /// </summary>
+        override public string Version
+        {
+            get { return m_database.getVersion(); }
+        }
+
+        /// <summary>
+        /// The name of this DB provider.
+        /// </summary>
+        override public string Name
+        {
+            get { return "PGSQL Asset storage engine"; }
+        }
+
+        #endregion
+
+        #region IAssetDataPlugin Members
+
+        /// <summary>
+        /// Fetch Asset from m_database
+        /// </summary>
+        /// <param name="assetID">the asset UUID</param>
+        /// <returns></returns>
+        override public AssetBase GetAsset(UUID assetID)
+        {
+            string sql = "SELECT * FROM assets WHERE id = :id";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("id", assetID));
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    if (reader.Read())
+                    {
+                        AssetBase asset = new AssetBase(
+                            DBGuid.FromDB(reader["id"]),
+                            (string)reader["name"],
+                            Convert.ToSByte(reader["assetType"]),
+                            reader["creatorid"].ToString()
+                        );
+                        // Region Main
+                        asset.Description = (string)reader["description"];
+                        asset.Local = Convert.ToBoolean(reader["local"]);
+                        asset.Temporary = Convert.ToBoolean(reader["temporary"]);
+                        asset.Flags = (AssetFlags)(Convert.ToInt32(reader["asset_flags"]));
+                        asset.Data = (byte[])reader["data"];
+                        return asset;
+                    }
+                    return null; // throw new Exception("No rows to return");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Create asset in m_database
+        /// </summary>
+        /// <param name="asset">the asset</param>
+        override public void StoreAsset(AssetBase asset)
+        {
+           
+            string sql =
+                @"UPDATE assets set name = :name, description = :description, " + "\"assetType\" " + @" = :assetType,
+                         local = :local, temporary = :temporary, creatorid = :creatorid, data = :data
+                    WHERE id=:id;
+
+                  INSERT INTO assets
+                    (id, name, description, " + "\"assetType\" " + @", local, 
+                     temporary, create_time, access_time, creatorid, asset_flags, data)
+                  Select :id, :name, :description, :assetType, :local, 
+                         :temporary, :create_time, :access_time, :creatorid, :asset_flags, :data
+                   Where not EXISTS(SELECT * FROM assets WHERE id=:id) 
+                ";
+            
+            string assetName = asset.Name;
+            if (asset.Name.Length > 64)
+            {
+                assetName = asset.Name.Substring(0, 64);
+                m_log.WarnFormat(
+                    "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                    asset.Name, asset.ID, asset.Name.Length, assetName.Length);
+            }
+            
+            string assetDescription = asset.Description;
+            if (asset.Description.Length > 64)
+            {
+                assetDescription = asset.Description.Substring(0, 64);
+                m_log.WarnFormat(
+                    "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                    asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
+            }
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
+            {
+                int now = (int)((System.DateTime.Now.Ticks - m_ticksToEpoch) / 10000000);
+                command.Parameters.Add(m_database.CreateParameter("id", asset.FullID));
+                command.Parameters.Add(m_database.CreateParameter("name", assetName));
+                command.Parameters.Add(m_database.CreateParameter("description", assetDescription));
+                command.Parameters.Add(m_database.CreateParameter("assetType", asset.Type));
+                command.Parameters.Add(m_database.CreateParameter("local", asset.Local));
+                command.Parameters.Add(m_database.CreateParameter("temporary", asset.Temporary));
+                command.Parameters.Add(m_database.CreateParameter("access_time", now));
+                command.Parameters.Add(m_database.CreateParameter("create_time", now));
+                command.Parameters.Add(m_database.CreateParameter("asset_flags", (int)asset.Flags));
+                command.Parameters.Add(m_database.CreateParameter("creatorid", asset.Metadata.CreatorID));
+                command.Parameters.Add(m_database.CreateParameter("data", asset.Data));
+                conn.Open();
+                try
+                {
+                    command.ExecuteNonQuery();
+                }
+                catch(Exception e)
+                {
+                    m_log.Error("[ASSET DB]: Error storing item :" + e.Message + " sql "+sql);
+                }
+            }
+        }
+
+
+// Commented out since currently unused - this probably should be called in GetAsset()
+//        private void UpdateAccessTime(AssetBase asset)
+//        {
+//            using (AutoClosingSqlCommand cmd = m_database.Query("UPDATE assets SET access_time = :access_time WHERE id=:id"))
+//            {
+//                int now = (int)((System.DateTime.Now.Ticks - m_ticksToEpoch) / 10000000);
+//                cmd.Parameters.AddWithValue(":id", asset.FullID.ToString());
+//                cmd.Parameters.AddWithValue(":access_time", now);
+//                try
+//                {
+//                    cmd.ExecuteNonQuery();
+//                }
+//                catch (Exception e)
+//                {
+//                    m_log.Error(e.ToString());
+//                }
+//            }
+//        }
+
+        /// <summary>
+        /// Check if asset exist in m_database
+        /// </summary>
+        /// <param name="uuid"></param>
+        /// <returns>true if exist.</returns>
+        override public bool ExistsAsset(UUID uuid)
+        {
+            if (GetAsset(uuid) != null)
+            {
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Returns a list of AssetMetadata objects. The list is a subset of
+        /// the entire data set offset by <paramref name="start" /> containing
+        /// <paramref name="count" /> elements.
+        /// </summary>
+        /// <param name="start">The number of results to discard from the total data set.</param>
+        /// <param name="count">The number of rows the returned list should contain.</param>
+        /// <returns>A list of AssetMetadata objects.</returns>
+        public override List<AssetMetadata> FetchAssetMetadataSet(int start, int count)
+        {
+            List<AssetMetadata> retList = new List<AssetMetadata>(count);
+            string sql = @" SELECT id, name, description, " + "\"assetType\"" + @", temporary, creatorid
+                              FROM assets 
+                             order by id
+                             limit :stop
+                            offset :start;";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("start", start));
+                cmd.Parameters.Add(m_database.CreateParameter("stop", start + count - 1));
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    while (reader.Read())
+                    {
+                        AssetMetadata metadata = new AssetMetadata();
+                        metadata.FullID = DBGuid.FromDB(reader["id"]);
+                        metadata.Name = (string)reader["name"];
+                        metadata.Description = (string)reader["description"];
+                        metadata.Type = Convert.ToSByte(reader["assetType"]);
+                        metadata.Temporary = Convert.ToBoolean(reader["temporary"]);
+                        metadata.CreatorID = (string)reader["creatorid"];
+                        retList.Add(metadata);
+                    }
+                }
+            }
+
+            return retList;
+        }
+
+        public override bool Delete(string id)
+        {
+            return false;
+        }
+        #endregion
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs b/OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs
new file mode 100644
index 0000000..d174112
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs
@@ -0,0 +1,254 @@
+/*
+ * 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 OpenMetaverse;
+using OpenSim.Framework;
+using System.Reflection;
+using System.Text;
+using System.Data;
+using Npgsql;
+using NpgsqlTypes;
+
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLAuthenticationData : IAuthenticationData
+    {
+        private string m_Realm;
+        private List<string> m_ColumnNames = null;
+        private int m_LastExpire = 0;
+        private string m_ConnectionString;
+        private PGSQLManager m_database;
+
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+
+        public PGSQLAuthenticationData(string connectionString, string realm)
+        {
+            m_Realm = realm;
+            m_ConnectionString = connectionString;
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            {
+                conn.Open();
+                Migration m = new Migration(conn, GetType().Assembly, "AuthStore");
+                m_database = new PGSQLManager(m_ConnectionString);
+                m.Update();
+            }
+        }
+
+        public AuthenticationData Get(UUID principalID)
+        {
+            AuthenticationData ret = new AuthenticationData();
+            ret.Data = new Dictionary<string, object>();
+
+            string sql = string.Format("select * from {0} where uuid = :principalID", m_Realm);
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("principalID", principalID));
+                conn.Open();
+                using (NpgsqlDataReader result = cmd.ExecuteReader())
+                {
+                    if (result.Read())
+                    {
+                        ret.PrincipalID = principalID;
+
+                        if (m_ColumnNames == null)
+                        {
+                            m_ColumnNames = new List<string>();
+
+                            DataTable schemaTable = result.GetSchemaTable();
+                            foreach (DataRow row in schemaTable.Rows)
+                                m_ColumnNames.Add(row["ColumnName"].ToString());
+                        }
+
+                        foreach (string s in m_ColumnNames)
+                        {
+                            if (s == "UUID"||s == "uuid")
+                                continue;
+
+                            ret.Data[s] = result[s].ToString();
+                        }
+                        return ret;
+                    }
+                }
+            }
+            return null;
+        }
+
+        public bool Store(AuthenticationData data)
+        {
+            if (data.Data.ContainsKey("UUID"))
+                data.Data.Remove("UUID");
+            if (data.Data.ContainsKey("uuid"))
+                data.Data.Remove("uuid");
+
+            /*
+            Dictionary<string, object> oAuth = new Dictionary<string, object>();
+
+            foreach (KeyValuePair<string, object> oDado in data.Data)
+            {
+                if (oDado.Key != oDado.Key.ToLower())
+                {
+                    oAuth.Add(oDado.Key.ToLower(), oDado.Value);
+                }
+            }
+            foreach (KeyValuePair<string, object> oDado in data.Data)
+            {
+                if (!oAuth.ContainsKey(oDado.Key.ToLower())) {
+                    oAuth.Add(oDado.Key.ToLower(), oDado.Value);
+                }
+            }
+            */
+            string[] fields = new List<string>(data.Data.Keys).ToArray();
+            StringBuilder updateBuilder = new StringBuilder();
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                updateBuilder.AppendFormat("update {0} set ", m_Realm);
+
+                bool first = true;
+                foreach (string field in fields)
+                {
+                    if (!first)
+                        updateBuilder.Append(", ");
+                    updateBuilder.AppendFormat("\"{0}\" = :{0}",field);
+
+                    first = false;
+                    
+                    cmd.Parameters.Add(m_database.CreateParameter("" + field, data.Data[field]));
+                }
+
+                updateBuilder.Append(" where uuid = :principalID");
+
+                cmd.CommandText = updateBuilder.ToString();
+                cmd.Connection = conn;
+                cmd.Parameters.Add(m_database.CreateParameter("principalID", data.PrincipalID));
+                
+                conn.Open();
+                if (cmd.ExecuteNonQuery() < 1)
+                {
+                    StringBuilder insertBuilder = new StringBuilder();
+
+                    insertBuilder.AppendFormat("insert into {0} (uuid, \"", m_Realm);
+                    insertBuilder.Append(String.Join("\", \"", fields));
+                    insertBuilder.Append("\") values (:principalID, :");
+                    insertBuilder.Append(String.Join(", :", fields));
+                    insertBuilder.Append(")");
+
+                    cmd.CommandText = insertBuilder.ToString();
+
+                    if (cmd.ExecuteNonQuery() < 1)
+                    {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
+        public bool SetDataItem(UUID principalID, string item, string value)
+        {
+            string sql = string.Format("update {0} set {1} = :{1} where uuid = :UUID", m_Realm, item);
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("" + item, value));
+                conn.Open();
+                if (cmd.ExecuteNonQuery() > 0)
+                    return true;
+            }
+            return false;
+        }
+
+        public bool SetToken(UUID principalID, string token, int lifetime)
+        {
+            if (System.Environment.TickCount - m_LastExpire > 30000)
+                DoExpire();
+            
+            string sql = "insert into tokens (uuid, token, validity) values (:principalID, :token, :lifetime)";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("principalID", principalID));
+                cmd.Parameters.Add(m_database.CreateParameter("token", token));
+                cmd.Parameters.Add(m_database.CreateParameter("lifetime", DateTime.Now.AddMinutes(lifetime)));
+                conn.Open();
+
+                if (cmd.ExecuteNonQuery() > 0)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public bool CheckToken(UUID principalID, string token, int lifetime)
+        {
+            if (System.Environment.TickCount - m_LastExpire > 30000)
+                DoExpire();
+
+            DateTime validDate = DateTime.Now.AddMinutes(lifetime);
+            string sql = "update tokens set validity = :validDate where uuid = :principalID and token = :token and validity > (CURRENT_DATE + CURRENT_TIME)";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("principalID", principalID));
+                cmd.Parameters.Add(m_database.CreateParameter("token", token));
+                cmd.Parameters.Add(m_database.CreateParameter("validDate", validDate));
+                conn.Open();
+
+                if (cmd.ExecuteNonQuery() > 0)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        private void DoExpire()
+        {
+            DateTime currentDateTime = DateTime.Now;
+            string sql = "delete from tokens where validity < :currentDateTime";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                conn.Open();
+                cmd.Parameters.Add(m_database.CreateParameter("currentDateTime", currentDateTime));
+                cmd.ExecuteNonQuery();
+            }
+            m_LastExpire = System.Environment.TickCount;
+        }
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLAvatarData.cs b/OpenSim/Data/PGSQL/PGSQLAvatarData.cs
new file mode 100644
index 0000000..d9c4905
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLAvatarData.cs
@@ -0,0 +1,72 @@
+/*
+ * 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 OpenMetaverse;
+using OpenSim.Framework;
+using Npgsql;
+using NpgsqlTypes;
+
+
+namespace OpenSim.Data.PGSQL
+{
+    /// <summary>
+    /// A PGSQL Interface for Avatar Storage
+    /// </summary>
+    public class PGSQLAvatarData : PGSQLGenericTableHandler<AvatarBaseData>,
+            IAvatarData
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
+        public PGSQLAvatarData(string connectionString, string realm) :
+                base(connectionString, realm, "Avatar")
+        {
+        }
+
+        public bool Delete(UUID principalID, string name)
+        {
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+
+                cmd.CommandText = String.Format("DELETE FROM {0} where \"PrincipalID\" = :PrincipalID and \"Name\" = :Name", m_Realm);
+                cmd.Parameters.Add(m_database.CreateParameter("PrincipalID", principalID));
+                cmd.Parameters.Add(m_database.CreateParameter("Name", name));
+                cmd.Connection = conn;
+                conn.Open();
+                if (cmd.ExecuteNonQuery() > 0)
+                    return true;
+
+                return false;
+            }
+        }
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLEstateData.cs b/OpenSim/Data/PGSQL/PGSQLEstateData.cs
new file mode 100644
index 0000000..347baf3
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLEstateData.cs
@@ -0,0 +1,598 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using System.Data;
+using Npgsql;
+using NpgsqlTypes;
+
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLEstateStore : IEstateDataStore
+    {
+        private const string _migrationStore = "EstateStore";
+
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private PGSQLManager _Database;
+        private string m_connectionString;
+        private FieldInfo[] _Fields;
+        private Dictionary<string, FieldInfo> _FieldMap = new Dictionary<string, FieldInfo>();
+
+        #region Public methods
+
+        public PGSQLEstateStore()
+        {
+        }
+
+        public PGSQLEstateStore(string connectionString)
+        {
+            Initialise(connectionString);
+        }
+
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+
+        /// <summary>
+        /// Initialises the estatedata class.
+        /// </summary>
+        /// <param name="connectionString">connectionString.</param>
+        public void Initialise(string connectionString)
+        {
+            if (!string.IsNullOrEmpty(connectionString))
+            {
+                m_connectionString = connectionString;
+                _Database = new PGSQLManager(connectionString);
+            }
+
+            //Migration settings
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                Migration m = new Migration(conn, GetType().Assembly, "EstateStore");
+                m.Update();
+            }
+
+            //Interesting way to get parameters! Maybe implement that also with other types
+            Type t = typeof(EstateSettings);
+            _Fields = t.GetFields(BindingFlags.NonPublic |
+                                  BindingFlags.Instance |
+                                  BindingFlags.DeclaredOnly);
+
+            foreach (FieldInfo f in _Fields)
+            {
+                if (f.Name.Substring(0, 2) == "m_")
+                    _FieldMap[f.Name.Substring(2)] = f;
+            }
+        }
+
+        /// <summary>
+        /// Loads the estate settings.
+        /// </summary>
+        /// <param name="regionID">region ID.</param>
+        /// <returns></returns>
+        public EstateSettings LoadEstateSettings(UUID regionID, bool create)
+        {
+            EstateSettings es = new EstateSettings();
+
+            string sql = "select estate_settings.\"" + String.Join("\",estate_settings.\"", FieldList) + 
+                         "\" from estate_map left join estate_settings on estate_map.\"EstateID\" = estate_settings.\"EstateID\" " + 
+                         " where estate_settings.\"EstateID\" is not null and \"RegionID\" = :RegionID";
+
+            bool insertEstate = false;
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("RegionID", regionID));
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    if (reader.Read())
+                    {
+                        foreach (string name in FieldList)
+                        {
+                            FieldInfo f = _FieldMap[name];
+                            object v = reader[name];
+                            if (f.FieldType == typeof(bool))
+                            {
+                                f.SetValue(es, v);
+                            }
+                            else if (f.FieldType == typeof(UUID))
+                            {
+                                UUID estUUID = UUID.Zero;
+
+                                UUID.TryParse(v.ToString(), out estUUID);
+
+                                f.SetValue(es, estUUID);
+                            }
+                            else if (f.FieldType == typeof(string))
+                            {
+                                f.SetValue(es, v.ToString());
+                            }
+                            else if (f.FieldType == typeof(UInt32))
+                            {
+                                f.SetValue(es, Convert.ToUInt32(v));
+                            }
+                            else if (f.FieldType == typeof(Single))
+                            {
+                                f.SetValue(es, Convert.ToSingle(v));
+                            }
+                            else
+                                f.SetValue(es, v);
+                        }
+                    }
+                    else
+                    {
+                        insertEstate = true;
+                    }
+                }
+            }
+
+            if (insertEstate && create)
+            {
+                DoCreate(es);
+                LinkRegion(regionID, (int)es.EstateID);
+            }
+
+            LoadBanList(es);
+
+            es.EstateManagers = LoadUUIDList(es.EstateID, "estate_managers");
+            es.EstateAccess = LoadUUIDList(es.EstateID, "estate_users");
+            es.EstateGroups = LoadUUIDList(es.EstateID, "estate_groups");
+
+            //Set event
+            es.OnSave += StoreEstateSettings;
+            return es;
+        }
+
+        public EstateSettings CreateNewEstate()
+        {
+            EstateSettings es = new EstateSettings();
+            es.OnSave += StoreEstateSettings;
+
+            DoCreate(es);
+
+            LoadBanList(es);
+
+            es.EstateManagers = LoadUUIDList(es.EstateID, "estate_managers");
+            es.EstateAccess = LoadUUIDList(es.EstateID, "estate_users");
+            es.EstateGroups = LoadUUIDList(es.EstateID, "estate_groups");
+
+            return es;
+        }
+
+        private void DoCreate(EstateSettings es)
+        {
+            List<string> names = new List<string>(FieldList);
+
+            names.Remove("EstateID");
+
+            string sql = string.Format("insert into estate_settings (\"{0}\") values ( :{1} )", String.Join("\",\"", names.ToArray()), String.Join(", :", names.ToArray()));
+
+            m_log.Debug("[DB ESTATE]: SQL: " + sql);
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand insertCommand = new NpgsqlCommand(sql, conn))
+            {
+                insertCommand.CommandText = sql + "; Select cast(lastval() as int) as ID ;";
+
+                foreach (string name in names)
+                {
+                    insertCommand.Parameters.Add(_Database.CreateParameter("" + name, _FieldMap[name].GetValue(es)));
+                }
+                //NpgsqlParameter idParameter = new NpgsqlParameter("ID", SqlDbType.Int);
+                //idParameter.Direction = ParameterDirection.Output;
+                //insertCommand.Parameters.Add(idParameter);
+                conn.Open();
+
+                es.EstateID = 100;
+
+                using (NpgsqlDataReader result = insertCommand.ExecuteReader())
+                {
+                    if (result.Read())
+                    {
+                        es.EstateID = (uint)result.GetInt32(0);
+                    }
+                }
+
+            }
+
+            //TODO check if this is needed??
+            es.Save();
+        }
+
+        /// <summary>
+        /// Stores the estate settings.
+        /// </summary>
+        /// <param name="es">estate settings</param>
+        public void StoreEstateSettings(EstateSettings es)
+        {
+            List<string> names = new List<string>(FieldList);
+
+            names.Remove("EstateID");
+
+            string sql = string.Format("UPDATE estate_settings SET ");
+            foreach (string name in names)
+            {
+                sql += "\"" + name + "\" = :" + name + ", ";
+            }
+            sql = sql.Remove(sql.LastIndexOf(","));
+            sql += " WHERE \"EstateID\" = :EstateID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                foreach (string name in names)
+                {
+                    cmd.Parameters.Add(_Database.CreateParameter("" + name, _FieldMap[name].GetValue(es)));
+                }
+
+                cmd.Parameters.Add(_Database.CreateParameter("EstateID", es.EstateID));
+                conn.Open();
+                cmd.ExecuteNonQuery();
+            }
+
+            SaveBanList(es);
+            SaveUUIDList(es.EstateID, "estate_managers", es.EstateManagers);
+            SaveUUIDList(es.EstateID, "estate_users", es.EstateAccess);
+            SaveUUIDList(es.EstateID, "estate_groups", es.EstateGroups);
+        }
+
+        #endregion
+
+        #region Private methods
+
+        private string[] FieldList
+        {
+            get { return new List<string>(_FieldMap.Keys).ToArray(); }
+        }
+
+        private void LoadBanList(EstateSettings es)
+        {
+            es.ClearBans();
+
+            string sql = "select \"bannedUUID\" from estateban where \"EstateID\" = :EstateID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                NpgsqlParameter idParameter = new NpgsqlParameter("EstateID", DbType.Int32);
+                idParameter.Value = es.EstateID;
+                cmd.Parameters.Add(idParameter);
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    while (reader.Read())
+                    {
+                        EstateBan eb = new EstateBan();
+
+                        eb.BannedUserID = new UUID((Guid)reader["bannedUUID"]); //uuid;
+                        eb.BannedHostAddress = "0.0.0.0";
+                        eb.BannedHostIPMask = "0.0.0.0";
+                        es.AddBan(eb);
+                    }
+                }
+            }
+        }
+
+        private UUID[] LoadUUIDList(uint estateID, string table)
+        {
+            List<UUID> uuids = new List<UUID>();
+
+            string sql = string.Format("select uuid from {0} where \"EstateID\" = :EstateID", table);
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("EstateID", estateID));
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    while (reader.Read())
+                    {
+                        uuids.Add(new UUID((Guid)reader["uuid"])); //uuid);
+                    }
+                }
+            }
+
+            return uuids.ToArray();
+        }
+
+        private void SaveBanList(EstateSettings es)
+        {
+            //Delete first
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (NpgsqlCommand cmd = conn.CreateCommand())
+                {
+                    cmd.CommandText = "delete from estateban where \"EstateID\" = :EstateID";
+                    cmd.Parameters.AddWithValue("EstateID", (int)es.EstateID);
+                    cmd.ExecuteNonQuery();
+
+                    //Insert after
+                    cmd.CommandText = "insert into estateban (\"EstateID\", \"bannedUUID\",\"bannedIp\", \"bannedIpHostMask\", \"bannedNameMask\") values ( :EstateID, :bannedUUID, '','','' )";
+                    cmd.Parameters.AddWithValue("bannedUUID", Guid.Empty);
+                    foreach (EstateBan b in es.EstateBans)
+                    {
+                        cmd.Parameters["bannedUUID"].Value = b.BannedUserID.Guid;
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+            }
+        }
+
+        private void SaveUUIDList(uint estateID, string table, UUID[] data)
+        {
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (NpgsqlCommand cmd = conn.CreateCommand())
+                {
+                    cmd.Parameters.AddWithValue("EstateID", (int)estateID);
+                    cmd.CommandText = string.Format("delete from {0} where \"EstateID\" = :EstateID", table);
+                    cmd.ExecuteNonQuery();
+
+                    cmd.CommandText = string.Format("insert into {0} (\"EstateID\", uuid) values ( :EstateID, :uuid )", table);
+                    cmd.Parameters.AddWithValue("uuid", Guid.Empty);
+                    foreach (UUID uuid in data)
+                    {
+                        cmd.Parameters["uuid"].Value = uuid.Guid; //.ToString(); //TODO check if this works
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+            }
+        }
+
+        public EstateSettings LoadEstateSettings(int estateID)
+        {
+            EstateSettings es = new EstateSettings();
+            string sql = "select estate_settings.\"" + String.Join("\",estate_settings.\"", FieldList) + "\" from estate_settings where \"EstateID\" = :EstateID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    cmd.Parameters.AddWithValue("EstateID", (int)estateID);
+                    using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                    {
+                        if (reader.Read())
+                        {
+                            foreach (string name in FieldList)
+                            {
+                                FieldInfo f = _FieldMap[name];
+                                object v = reader[name];
+                                if (f.FieldType == typeof(bool))
+                                {
+                                    f.SetValue(es, Convert.ToInt32(v) != 0);
+                                }
+                                else if (f.FieldType == typeof(UUID))
+                                {
+                                    f.SetValue(es, new UUID((Guid)v)); // uuid);
+                                }
+                                else if (f.FieldType == typeof(string))
+                                {
+                                    f.SetValue(es, v.ToString());
+                                }
+                                else if (f.FieldType == typeof(UInt32))
+                                {
+                                    f.SetValue(es, Convert.ToUInt32(v));
+                                }
+                                else if (f.FieldType == typeof(Single))
+                                {
+                                    f.SetValue(es, Convert.ToSingle(v));
+                                }
+                                else
+                                    f.SetValue(es, v);
+                            }
+                        }
+
+                    }
+                }
+            }
+            LoadBanList(es);
+
+            es.EstateManagers = LoadUUIDList(es.EstateID, "estate_managers");
+            es.EstateAccess = LoadUUIDList(es.EstateID, "estate_users");
+            es.EstateGroups = LoadUUIDList(es.EstateID, "estate_groups");
+
+            //Set event
+            es.OnSave += StoreEstateSettings;
+            return es;
+
+        }
+
+        public List<EstateSettings> LoadEstateSettingsAll()
+        {
+            List<EstateSettings> allEstateSettings = new List<EstateSettings>();
+
+            List<int> allEstateIds = GetEstatesAll();
+
+            foreach (int estateId in allEstateIds)
+                allEstateSettings.Add(LoadEstateSettings(estateId));
+
+            return allEstateSettings;
+        }
+
+        public List<int> GetEstates(string search)
+        {
+            List<int> result = new List<int>();
+            string sql = "select \"estateID\" from estate_settings where lower(\"EstateName\") = lower(:EstateName)";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    cmd.Parameters.AddWithValue("EstateName", search);
+
+                    using (IDataReader reader = cmd.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            result.Add(Convert.ToInt32(reader["EstateID"]));
+                        }
+                        reader.Close();
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        public List<int> GetEstatesAll()
+        {
+            List<int> result = new List<int>();
+            string sql = "select \"EstateID\" from estate_settings";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    using (IDataReader reader = cmd.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            result.Add(Convert.ToInt32(reader["EstateID"]));
+                        }
+                        reader.Close();
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        public List<int> GetEstatesByOwner(UUID ownerID)
+        {
+            List<int> result = new List<int>();
+            string sql = "select \"estateID\" from estate_settings where \"EstateOwner\" = :EstateOwner";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    cmd.Parameters.AddWithValue("EstateOwner", ownerID);
+
+                    using (IDataReader reader = cmd.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            result.Add(Convert.ToInt32(reader["EstateID"]));
+                        }
+                        reader.Close();
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        public bool LinkRegion(UUID regionID, int estateID)
+        {
+            string deleteSQL = "delete from estate_map where \"RegionID\" = :RegionID";
+            string insertSQL = "insert into estate_map values (:RegionID, :EstateID)";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+
+                NpgsqlTransaction transaction = conn.BeginTransaction();
+
+                try
+                {
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(deleteSQL, conn))
+                    {
+                        cmd.Transaction = transaction;
+                        cmd.Parameters.AddWithValue("RegionID", regionID.Guid);
+
+                        cmd.ExecuteNonQuery();
+                    }
+
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(insertSQL, conn))
+                    {
+                        cmd.Transaction = transaction;
+                        cmd.Parameters.AddWithValue("RegionID", regionID.Guid);
+                        cmd.Parameters.AddWithValue("EstateID", estateID);
+
+                        int ret = cmd.ExecuteNonQuery();
+
+                        if (ret != 0)
+                            transaction.Commit();
+                        else
+                            transaction.Rollback();
+
+                        return (ret != 0);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    m_log.Error("[REGION DB]: LinkRegion failed: " + ex.Message);
+                    transaction.Rollback();
+                }
+            }
+            return false;
+        }
+
+        public List<UUID> GetRegions(int estateID)
+        {
+            List<UUID> result = new List<UUID>();
+            string sql = "select \"RegionID\" from estate_map where \"EstateID\" = :EstateID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    cmd.Parameters.AddWithValue("EstateID", estateID);
+
+                    using (IDataReader reader = cmd.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            result.Add(DBGuid.FromDB(reader["RegionID"]));
+                        }
+                        reader.Close();
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        public bool DeleteEstate(int estateID)
+        {
+            // TODO: Implementation!            
+            return false;
+        }
+        #endregion
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLFramework.cs b/OpenSim/Data/PGSQL/PGSQLFramework.cs
new file mode 100644
index 0000000..494b0aa
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLFramework.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;
+using System.Collections.Generic;
+using System.Data;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    /// <summary>
+    /// A database interface class to a user profile storage system
+    /// </summary>
+    public class PGSqlFramework
+    {
+        private static readonly log4net.ILog m_log =
+                log4net.LogManager.GetLogger(
+                System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected string m_connectionString;
+        protected object m_dbLock = new object();
+
+        protected PGSqlFramework(string connectionString)
+        {
+            m_connectionString = connectionString;
+        }
+
+        //////////////////////////////////////////////////////////////
+        //
+        // All non queries are funneled through one connection
+        // to increase performance a little
+        //
+        protected int ExecuteNonQuery(NpgsqlCommand cmd)
+        {
+            lock (m_dbLock)
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+                    cmd.Connection = dbcon;
+
+                    try
+                    {
+                        return cmd.ExecuteNonQuery();
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error(e.Message, e);
+                        return 0;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLFriendsData.cs b/OpenSim/Data/PGSQL/PGSQLFriendsData.cs
new file mode 100644
index 0000000..4c1ee02
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLFriendsData.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;
+using System.Collections.Generic;
+using System.Data;
+using OpenMetaverse;
+using OpenSim.Framework;
+using System.Reflection;
+using System.Text;
+using Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLFriendsData : PGSQLGenericTableHandler<FriendsData>, IFriendsData
+    {
+        public PGSQLFriendsData(string connectionString, string realm)
+            : base(connectionString, realm, "FriendsStore")
+        {
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            {
+                conn.Open();
+                Migration m = new Migration(conn, GetType().Assembly, "FriendsStore");
+                m.Update();
+            }
+        }
+
+        
+        public bool Delete(string principalID, string friend)
+        {
+            UUID princUUID = UUID.Zero;
+
+            bool ret = UUID.TryParse(principalID, out princUUID);
+
+            if (ret)
+                return Delete(princUUID, friend);
+            else
+                return false;
+        }
+
+        public bool Delete(UUID principalID, string friend)
+        {
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                cmd.CommandText = String.Format("delete from {0} where \"PrincipalID\" = :PrincipalID and \"Friend\" = :Friend", m_Realm);
+                cmd.Parameters.Add(m_database.CreateParameter("PrincipalID", principalID.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("Friend", friend));
+                cmd.Connection = conn;
+                conn.Open();
+                cmd.ExecuteNonQuery();
+
+                return true;
+            }
+        }
+
+        public FriendsData[] GetFriends(string principalID)
+        {
+            UUID princUUID = UUID.Zero;
+
+            bool ret = UUID.TryParse(principalID, out princUUID);
+
+            if (ret)
+               return GetFriends(princUUID);
+            else
+                return new FriendsData[0];
+        }
+
+        public FriendsData[] GetFriends(UUID principalID)
+        {
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+
+                cmd.CommandText = String.Format("select a.*,case when b.\"Flags\" is null then '-1' else b.\"Flags\" end as \"TheirFlags\" from {0} as a " + 
+                                                " left join {0} as b on a.\"PrincipalID\" = b.\"Friend\" and a.\"Friend\" = b.\"PrincipalID\" " +
+                                                " where a.\"PrincipalID\" = :PrincipalID", m_Realm);
+                cmd.Parameters.Add(m_database.CreateParameter("PrincipalID", principalID.ToString()));
+                cmd.Connection = conn;
+                conn.Open();
+                return DoQuery(cmd);
+            }
+        }
+
+        public FriendsData[] GetFriends(Guid principalID)
+        {
+            return GetFriends(principalID);
+        }
+ 
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs b/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs
new file mode 100644
index 0000000..2151568
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs
@@ -0,0 +1,519 @@
+/*
+ * 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;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using System.Text;
+using Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLGenericTableHandler<T> : PGSqlFramework where T : class, new()
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected string m_ConnectionString;
+        protected PGSQLManager m_database; //used for parameter type translation
+        protected Dictionary<string, FieldInfo> m_Fields =
+                new Dictionary<string, FieldInfo>();
+
+        protected Dictionary<string, string> m_FieldTypes = new Dictionary<string, string>();
+
+        protected List<string> m_ColumnNames = null;
+        protected string m_Realm;
+        protected FieldInfo m_DataField = null;
+
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+
+        public PGSQLGenericTableHandler(string connectionString,
+                string realm, string storeName)
+            : base(connectionString)
+        {
+            m_Realm = realm;
+            
+            m_ConnectionString = connectionString;
+
+            if (storeName != String.Empty)
+            {
+                using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+                {
+                    conn.Open();
+                    Migration m = new Migration(conn, GetType().Assembly, storeName);
+                    m.Update();
+                }
+
+            }
+            m_database = new PGSQLManager(m_ConnectionString);
+
+            Type t = typeof(T);
+            FieldInfo[] fields = t.GetFields(BindingFlags.Public |
+                                             BindingFlags.Instance |
+                                             BindingFlags.DeclaredOnly);
+
+            LoadFieldTypes();
+
+            if (fields.Length == 0)
+                return;
+
+            foreach (FieldInfo f in fields)
+            {
+                if (f.Name != "Data")
+                    m_Fields[f.Name] = f;
+                else
+                    m_DataField = f;
+            }
+
+        }
+
+        private void LoadFieldTypes()
+        {
+            m_FieldTypes = new Dictionary<string, string>();
+
+            string query = string.Format(@"select column_name,data_type
+                        from INFORMATION_SCHEMA.COLUMNS 
+                       where table_name = lower('{0}');
+
+                ", m_Realm);
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(query, conn))
+            {
+                conn.Open();
+                using (NpgsqlDataReader rdr = cmd.ExecuteReader())
+                {
+                    while (rdr.Read())
+                    {
+                        // query produces 0 to many rows of single column, so always add the first item in each row
+                        m_FieldTypes.Add((string)rdr[0], (string)rdr[1]);
+                    }
+                }
+            }
+        }
+
+        private void CheckColumnNames(NpgsqlDataReader reader)
+        {
+            if (m_ColumnNames != null)
+                return;
+
+            m_ColumnNames = new List<string>();
+
+            DataTable schemaTable = reader.GetSchemaTable();
+
+            foreach (DataRow row in schemaTable.Rows)
+            {
+                if (row["ColumnName"] != null &&
+                        (!m_Fields.ContainsKey(row["ColumnName"].ToString())))
+                    m_ColumnNames.Add(row["ColumnName"].ToString());
+
+            }
+        }
+
+        // TODO GET CONSTRAINTS FROM POSTGRESQL
+        private List<string> GetConstraints()
+        {
+            List<string> constraints = new List<string>();
+            string query = string.Format(@"SELECT kcu.column_name
+                        FROM information_schema.table_constraints tc
+                        LEFT JOIN information_schema.key_column_usage kcu
+                        ON tc.constraint_catalog = kcu.constraint_catalog
+                        AND tc.constraint_schema = kcu.constraint_schema
+                        AND tc.constraint_name = kcu.constraint_name
+
+                        LEFT JOIN information_schema.referential_constraints rc
+                        ON tc.constraint_catalog = rc.constraint_catalog
+                        AND tc.constraint_schema = rc.constraint_schema
+                        AND tc.constraint_name = rc.constraint_name
+
+                        LEFT JOIN information_schema.constraint_column_usage ccu
+                        ON rc.unique_constraint_catalog = ccu.constraint_catalog
+                        AND rc.unique_constraint_schema = ccu.constraint_schema
+                        AND rc.unique_constraint_name = ccu.constraint_name
+
+                        where tc.table_name = lower('{0}') 
+                        and lower(tc.constraint_type) in ('primary key')
+                        and kcu.column_name is not null
+                        ;", m_Realm);
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(query, conn))
+            {
+                conn.Open();
+                using (NpgsqlDataReader rdr = cmd.ExecuteReader())
+                {
+                    while (rdr.Read())
+                    {
+                        // query produces 0 to many rows of single column, so always add the first item in each row
+                        constraints.Add((string)rdr[0]);
+                    }
+                }
+                return constraints;
+            }
+        }
+
+        public virtual T[] Get(string field, string key)
+        {
+            return Get(new string[] { field }, new string[] { key });
+        }
+
+        public virtual T[] Get(string[] fields, string[] keys)
+        {
+            if (fields.Length != keys.Length)
+                return new T[0];
+
+            List<string> terms = new List<string>();
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+
+                for (int i = 0; i < fields.Length; i++)
+                {
+                    if ( m_FieldTypes.ContainsKey(fields[i]) )
+                        cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i], m_FieldTypes[fields[i]]));
+                    else
+                        cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i]));
+
+                    terms.Add(" \"" + fields[i] + "\" = :" + fields[i]);
+                }
+
+                string where = String.Join(" AND ", terms.ToArray());
+
+                string query = String.Format("SELECT * FROM {0} WHERE {1}",
+                        m_Realm, where);
+
+                cmd.Connection = conn;
+                cmd.CommandText = query;
+                conn.Open();
+                return DoQuery(cmd);
+            }
+        }
+
+        protected T[] DoQuery(NpgsqlCommand cmd)
+        {
+            List<T> result = new List<T>();
+            if (cmd.Connection == null)
+            {
+                cmd.Connection = new NpgsqlConnection(m_connectionString);
+            }
+            if (cmd.Connection.State == ConnectionState.Closed)
+            {
+                cmd.Connection.Open();
+            }
+            using (NpgsqlDataReader reader = cmd.ExecuteReader())
+            {
+                if (reader == null)
+                    return new T[0];
+
+                CheckColumnNames(reader);                
+
+                while (reader.Read())
+                {
+                    T row = new T();
+
+                    foreach (string name in m_Fields.Keys)
+                    {
+                        if (m_Fields[name].GetValue(row) is bool)
+                        {
+                            int v = Convert.ToInt32(reader[name]);
+                            m_Fields[name].SetValue(row, v != 0 ? true : false);
+                        }
+                        else if (m_Fields[name].GetValue(row) is UUID)
+                        {
+                            UUID uuid = UUID.Zero;
+
+                            UUID.TryParse(reader[name].ToString(), out uuid);
+                            m_Fields[name].SetValue(row, uuid);
+                        }
+                        else if (m_Fields[name].GetValue(row) is int)
+                        {
+                            int v = Convert.ToInt32(reader[name]);
+                            m_Fields[name].SetValue(row, v);
+                        }
+                        else
+                        {
+                            m_Fields[name].SetValue(row, reader[name]);
+                        }
+                    }
+
+                    if (m_DataField != null)
+                    {
+                        Dictionary<string, string> data =
+                                new Dictionary<string, string>();
+
+                        foreach (string col in m_ColumnNames)
+                        {
+                            data[col] = reader[col].ToString();
+
+                            if (data[col] == null)
+                                data[col] = String.Empty;
+                        }
+
+                        m_DataField.SetValue(row, data);
+                    }
+
+                    result.Add(row);
+                }
+                return result.ToArray();
+            }
+        }
+
+        public virtual T[] Get(string where)
+        {
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+
+                string query = String.Format("SELECT * FROM {0} WHERE {1}",
+                        m_Realm, where);
+                cmd.Connection = conn;
+                cmd.CommandText = query;
+
+                //m_log.WarnFormat("[PGSQLGenericTable]: SELECT {0} WHERE {1}", m_Realm, where);
+
+                conn.Open();
+                return DoQuery(cmd);
+            }
+        }
+
+        public virtual bool Store(T row)
+        {
+            List<string> constraintFields = GetConstraints();
+            List<KeyValuePair<string, string>> constraints = new List<KeyValuePair<string, string>>();
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+
+                StringBuilder query = new StringBuilder();
+                List<String> names = new List<String>();
+                List<String> values = new List<String>();
+
+                foreach (FieldInfo fi in m_Fields.Values)
+                {
+                    names.Add(fi.Name);
+                    values.Add(":" + fi.Name);
+                    // Temporarily return more information about what field is unexpectedly null for
+                    // http://opensimulator.org/mantis/view.php?id=5403.  This might be due to a bug in the 
+                    // InventoryTransferModule or we may be required to substitute a DBNull here.
+                    if (fi.GetValue(row) == null)
+                        throw new NullReferenceException(
+                            string.Format(
+                                "[PGSQL GENERIC TABLE HANDLER]: Trying to store field {0} for {1} which is unexpectedly null",
+                                fi.Name, row));
+
+                    if (constraintFields.Count > 0 && constraintFields.Contains(fi.Name))
+                    {
+                        constraints.Add(new KeyValuePair<string, string>(fi.Name, fi.GetValue(row).ToString() ));
+                    }
+                    if (m_FieldTypes.ContainsKey(fi.Name))
+                        cmd.Parameters.Add(m_database.CreateParameter(fi.Name, fi.GetValue(row), m_FieldTypes[fi.Name]));
+                    else
+                        cmd.Parameters.Add(m_database.CreateParameter(fi.Name, fi.GetValue(row)));
+                }
+
+                if (m_DataField != null)
+                {
+                    Dictionary<string, string> data =
+                            (Dictionary<string, string>)m_DataField.GetValue(row);
+
+                    foreach (KeyValuePair<string, string> kvp in data)
+                    {
+                        if (constraintFields.Count > 0 && constraintFields.Contains(kvp.Key))
+                        {
+                            constraints.Add(new KeyValuePair<string, string>(kvp.Key, kvp.Key));
+                        }
+                        names.Add(kvp.Key);
+                        values.Add(":" + kvp.Key);
+
+                        if (m_FieldTypes.ContainsKey(kvp.Key))
+                            cmd.Parameters.Add(m_database.CreateParameter("" + kvp.Key, kvp.Value, m_FieldTypes[kvp.Key]));
+                        else
+                            cmd.Parameters.Add(m_database.CreateParameter("" + kvp.Key, kvp.Value));
+                    }
+
+                }
+
+                query.AppendFormat("UPDATE {0} SET ", m_Realm);
+                int i = 0;
+                for (i = 0; i < names.Count - 1; i++)
+                {
+                    query.AppendFormat("\"{0}\" = {1}, ", names[i], values[i]);
+                }
+                query.AppendFormat("\"{0}\" = {1} ", names[i], values[i]);
+                if (constraints.Count > 0)
+                {
+                    List<string> terms = new List<string>();
+                    for (int j = 0; j < constraints.Count; j++)
+                    {
+                        terms.Add(String.Format(" \"{0}\" = :{0}", constraints[j].Key));
+                    }
+                    string where = String.Join(" AND ", terms.ToArray());
+                    query.AppendFormat(" WHERE {0} ", where);
+                    
+                }
+                cmd.Connection = conn;
+                cmd.CommandText = query.ToString();
+                
+                conn.Open();
+                if (cmd.ExecuteNonQuery() > 0)
+                {
+                    //m_log.WarnFormat("[PGSQLGenericTable]: Updating {0}", m_Realm);
+                    return true;
+                }
+                else
+                {
+                    // assume record has not yet been inserted
+
+                    query = new StringBuilder();
+                    query.AppendFormat("INSERT INTO {0} (\"", m_Realm);
+                    query.Append(String.Join("\",\"", names.ToArray()));
+                    query.Append("\") values (" + String.Join(",", values.ToArray()) + ")");
+                    cmd.Connection = conn;
+                    cmd.CommandText = query.ToString();
+                    
+                    // m_log.WarnFormat("[PGSQLGenericTable]: Inserting into {0} sql {1}", m_Realm, cmd.CommandText);
+
+                    if (conn.State != ConnectionState.Open)
+                        conn.Open();
+                    if (cmd.ExecuteNonQuery() > 0)
+                        return true;
+                }
+
+                return false;
+            }
+        }
+
+        public virtual bool Delete(string field, string key)
+        {
+            return Delete(new string[] { field }, new string[] { key });
+        }
+
+        public virtual bool Delete(string[] fields, string[] keys)
+        {
+            if (fields.Length != keys.Length)
+                return false;
+
+            List<string> terms = new List<string>();
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                for (int i = 0; i < fields.Length; i++)
+                {
+                    if (m_FieldTypes.ContainsKey(fields[i]))
+                        cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i], m_FieldTypes[fields[i]]));
+                    else
+                        cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i]));
+
+                    terms.Add(" \"" + fields[i] + "\" = :" + fields[i]);
+                }
+
+                string where = String.Join(" AND ", terms.ToArray());
+
+                string query = String.Format("DELETE FROM {0} WHERE {1}", m_Realm, where);
+
+                cmd.Connection = conn;
+                cmd.CommandText = query;
+                conn.Open();
+
+                if (cmd.ExecuteNonQuery() > 0)
+                {
+                    //m_log.Warn("[PGSQLGenericTable]: " + deleteCommand);
+                    return true;
+                }
+                return false;
+            }
+        }
+        public long GetCount(string field, string key)
+        {
+            return GetCount(new string[] { field }, new string[] { key });
+        }
+
+        public long GetCount(string[] fields, string[] keys)
+        {
+            if (fields.Length != keys.Length)
+                return 0;
+
+            List<string> terms = new List<string>();
+
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                for (int i = 0; i < fields.Length; i++)
+                {
+                    cmd.Parameters.AddWithValue(fields[i], keys[i]);
+                    terms.Add("\"" + fields[i] + "\" = :" + fields[i]);
+                }
+
+                string where = String.Join(" and ", terms.ToArray());
+
+                string query = String.Format("select count(*) from {0} where {1}",
+                                             m_Realm, where);
+
+                cmd.CommandText = query;
+
+                Object result = DoQueryScalar(cmd);
+
+                return Convert.ToInt64(result);
+            }
+        }
+
+        public long GetCount(string where)
+        {
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                string query = String.Format("select count(*) from {0} where {1}",
+                                             m_Realm, where);
+
+                cmd.CommandText = query;
+
+                object result = DoQueryScalar(cmd);
+
+                return Convert.ToInt64(result);
+            }
+        }
+
+        public object DoQueryScalar(NpgsqlCommand cmd)
+        {
+            using (NpgsqlConnection dbcon = new NpgsqlConnection(m_ConnectionString))
+            {
+                dbcon.Open();
+                cmd.Connection = dbcon;
+
+                return cmd.ExecuteScalar();
+            }
+        }
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLGridUserData.cs b/OpenSim/Data/PGSQL/PGSQLGridUserData.cs
new file mode 100644
index 0000000..89319f3
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLGridUserData.cs
@@ -0,0 +1,68 @@
+/*
+ * 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;
+
+namespace OpenSim.Data.PGSQL
+{
+    /// <summary>
+    /// A PGSQL Interface for Avatar Storage
+    /// </summary>
+    public class PGSQLGridUserData : PGSQLGenericTableHandler<GridUserData>,
+            IGridUserData
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public PGSQLGridUserData(string connectionString, string realm) :
+            base(connectionString, realm, "GridUserStore")
+        {
+        }
+
+        public new GridUserData Get(string userID)
+        {
+            GridUserData[] ret = Get("UserID", userID);
+
+            if (ret.Length == 0)
+                return null;
+
+            return ret[0];
+        }
+
+        public GridUserData[] GetAll(string userID)
+        {
+            return base.Get(String.Format("\"UserID\" LIKE '{0}%'", userID));
+        }
+
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLGroupsData.cs b/OpenSim/Data/PGSQL/PGSQLGroupsData.cs
new file mode 100644
index 0000000..ed75b63
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLGroupsData.cs
@@ -0,0 +1,481 @@
+/*
+ * 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 OpenSim.Framework;
+using OpenMetaverse;
+using Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLGroupsData : IGroupsData
+    {
+        private PGSqlGroupsGroupsHandler m_Groups;
+        private PGSqlGroupsMembershipHandler m_Membership;
+        private PGSqlGroupsRolesHandler m_Roles;
+        private PGSqlGroupsRoleMembershipHandler m_RoleMembership;
+        private PGSqlGroupsInvitesHandler m_Invites;
+        private PGSqlGroupsNoticesHandler m_Notices;
+        private PGSqlGroupsPrincipalsHandler m_Principals;
+
+        public PGSQLGroupsData(string connectionString, string realm)
+        {
+            m_Groups = new PGSqlGroupsGroupsHandler(connectionString, realm + "_groups", realm + "_Store");
+            m_Membership = new PGSqlGroupsMembershipHandler(connectionString, realm + "_membership");
+            m_Roles = new PGSqlGroupsRolesHandler(connectionString, realm + "_roles");
+            m_RoleMembership = new PGSqlGroupsRoleMembershipHandler(connectionString, realm + "_rolemembership");
+            m_Invites = new PGSqlGroupsInvitesHandler(connectionString, realm + "_invites");
+            m_Notices = new PGSqlGroupsNoticesHandler(connectionString, realm + "_notices");
+            m_Principals = new PGSqlGroupsPrincipalsHandler(connectionString, realm + "_principals");
+        }
+
+        #region groups table
+        public bool StoreGroup(GroupData data)
+        {
+            return m_Groups.Store(data);
+        }
+
+        public GroupData RetrieveGroup(UUID groupID)
+        {
+            GroupData[] groups = m_Groups.Get("GroupID", groupID.ToString());
+            if (groups.Length > 0)
+                return groups[0];
+
+            return null;
+        }
+
+        public GroupData RetrieveGroup(string name)
+        {
+            GroupData[] groups = m_Groups.Get("Name", name);
+            if (groups.Length > 0)
+                return groups[0];
+
+            return null;
+        }
+
+        public GroupData[] RetrieveGroups(string pattern)
+        {
+            if (string.IsNullOrEmpty(pattern)) // True for where clause
+                pattern = " true ORDER BY lower(\"Name\") LIMIT 100";
+            else
+                pattern = string.Format(" lower(\"Name\") LIKE lower('%{0}%') ORDER BY lower(\"Name\") LIMIT 100", pattern);
+
+            return m_Groups.Get(pattern);
+        }
+
+        public bool DeleteGroup(UUID groupID)
+        {
+            return m_Groups.Delete("GroupID", groupID.ToString());
+        }
+
+        public int GroupsCount()
+        {
+            return (int)m_Groups.GetCount(" \"Location\" = \"\"");
+        }
+
+        #endregion
+
+        #region membership table
+        public MembershipData[] RetrieveMembers(UUID groupID)
+        {
+            return m_Membership.Get("GroupID", groupID.ToString());
+        }
+
+        public MembershipData RetrieveMember(UUID groupID, string pricipalID)
+        {
+            MembershipData[] m = m_Membership.Get(new string[] { "GroupID", "PrincipalID" },
+                                                  new string[] { groupID.ToString(), pricipalID });
+            if (m != null && m.Length > 0)
+                return m[0];
+
+            return null;
+        }
+
+        public MembershipData[] RetrieveMemberships(string pricipalID)
+        {
+            return m_Membership.Get("PrincipalID", pricipalID.ToString());
+        }
+
+        public bool StoreMember(MembershipData data)
+        {
+            return m_Membership.Store(data);
+        }
+
+        public bool DeleteMember(UUID groupID, string pricipalID)
+        {
+            return m_Membership.Delete(new string[] { "GroupID", "PrincipalID" }, 
+                                       new string[] { groupID.ToString(), pricipalID });
+        }
+        
+        public int MemberCount(UUID groupID)
+        {
+            return (int)m_Membership.GetCount("GroupID", groupID.ToString());
+        }
+        #endregion
+
+        #region roles table
+        public bool StoreRole(RoleData data)
+        {
+            return m_Roles.Store(data);
+        }
+
+        public RoleData RetrieveRole(UUID groupID, UUID roleID)
+        {
+            RoleData[] data = m_Roles.Get(new string[] { "GroupID", "RoleID" },
+                                          new string[] { groupID.ToString(), roleID.ToString() });
+
+            if (data != null && data.Length > 0)
+                return data[0];
+
+            return null;
+        }
+
+        public RoleData[] RetrieveRoles(UUID groupID)
+        {
+            //return m_Roles.RetrieveRoles(groupID);
+            return m_Roles.Get("GroupID", groupID.ToString());
+        }
+
+        public bool DeleteRole(UUID groupID, UUID roleID)
+        {
+            return m_Roles.Delete(new string[] { "GroupID", "RoleID" }, 
+                                  new string[] { groupID.ToString(), roleID.ToString() });
+        }
+
+        public int RoleCount(UUID groupID)
+        {
+            return (int)m_Roles.GetCount("GroupID", groupID.ToString());
+        }
+
+
+        #endregion
+
+        #region rolememberhip table
+        public RoleMembershipData[] RetrieveRolesMembers(UUID groupID)
+        {
+            RoleMembershipData[] data = m_RoleMembership.Get("GroupID", groupID.ToString());
+
+            return data;
+        }
+
+        public RoleMembershipData[] RetrieveRoleMembers(UUID groupID, UUID roleID)
+        {
+            RoleMembershipData[] data = m_RoleMembership.Get(new string[] { "GroupID", "RoleID" },
+                                                             new string[] { groupID.ToString(), roleID.ToString() });
+
+            return data;
+        }
+
+        public RoleMembershipData[] RetrieveMemberRoles(UUID groupID, string principalID)
+        {
+            RoleMembershipData[] data = m_RoleMembership.Get(new string[] { "GroupID", "PrincipalID" },
+                                                             new string[] { groupID.ToString(), principalID.ToString() });
+
+            return data;
+        }
+
+        public RoleMembershipData RetrieveRoleMember(UUID groupID, UUID roleID, string principalID)
+        {
+            RoleMembershipData[] data = m_RoleMembership.Get(new string[] { "GroupID", "RoleID", "PrincipalID" },
+                                                             new string[] { groupID.ToString(), roleID.ToString(), principalID.ToString() });
+
+            if (data != null && data.Length > 0)
+                return data[0];
+
+            return null;
+        }
+
+        public int RoleMemberCount(UUID groupID, UUID roleID)
+        {
+            return (int)m_RoleMembership.GetCount(new string[] { "GroupID", "RoleID" },
+                                                  new string[] { groupID.ToString(), roleID.ToString() });
+        }
+
+        public bool StoreRoleMember(RoleMembershipData data)
+        {
+            return m_RoleMembership.Store(data);
+        }
+
+        public bool DeleteRoleMember(RoleMembershipData data)
+        {
+            return m_RoleMembership.Delete(new string[] { "GroupID", "RoleID", "PrincipalID"},
+                                           new string[] { data.GroupID.ToString(), data.RoleID.ToString(), data.PrincipalID });
+        }
+
+        public bool DeleteMemberAllRoles(UUID groupID, string principalID)
+        {
+            return m_RoleMembership.Delete(new string[] { "GroupID", "PrincipalID" },
+                                           new string[] { groupID.ToString(), principalID });
+        }
+
+        #endregion
+
+        #region principals table
+        public bool StorePrincipal(PrincipalData data)
+        {
+            return m_Principals.Store(data);
+        }
+
+        public PrincipalData RetrievePrincipal(string principalID)
+        {
+            PrincipalData[] p = m_Principals.Get("PrincipalID", principalID);
+            if (p != null && p.Length > 0)
+                return p[0];
+
+            return null;
+        }
+
+        public bool DeletePrincipal(string principalID)
+        {
+            return m_Principals.Delete("PrincipalID", principalID);
+        }
+        #endregion
+
+        #region invites table
+
+        public bool StoreInvitation(InvitationData data)
+        {
+            return m_Invites.Store(data);
+        }
+
+        public InvitationData RetrieveInvitation(UUID inviteID)
+        {
+            InvitationData[] invites = m_Invites.Get("InviteID", inviteID.ToString());
+
+            if (invites != null && invites.Length > 0)
+                return invites[0];
+
+            return null;
+        }
+
+        public InvitationData RetrieveInvitation(UUID groupID, string principalID)
+        {
+            InvitationData[] invites = m_Invites.Get(new string[] { "GroupID", "PrincipalID" },
+                                                     new string[] { groupID.ToString(), principalID });
+
+            if (invites != null && invites.Length > 0)
+                return invites[0];
+
+            return null;
+        }
+
+        public bool DeleteInvite(UUID inviteID)
+        {
+            return m_Invites.Delete("InviteID", inviteID.ToString());
+        }
+
+        public void DeleteOldInvites()
+        {
+            m_Invites.DeleteOld();
+        }
+
+        #endregion
+
+        #region notices table
+
+        public bool StoreNotice(NoticeData data)
+        {
+            return m_Notices.Store(data);
+        }
+
+        public NoticeData RetrieveNotice(UUID noticeID)
+        {
+            NoticeData[] notices = m_Notices.Get("NoticeID", noticeID.ToString());
+
+            if (notices != null && notices.Length > 0)
+                return notices[0];
+
+            return null;
+        }
+
+        public NoticeData[] RetrieveNotices(UUID groupID)
+        {
+            NoticeData[] notices = m_Notices.Get("GroupID", groupID.ToString());
+
+            return notices;
+        }
+
+        public bool DeleteNotice(UUID noticeID)
+        {
+            return m_Notices.Delete("NoticeID", noticeID.ToString());
+        }
+
+        public void DeleteOldNotices()
+        {
+            m_Notices.DeleteOld();
+        }
+
+        #endregion
+
+        #region combinations
+        public MembershipData RetrievePrincipalGroupMembership(string principalID, UUID groupID)
+        {
+            // TODO
+            return null;
+        }
+        public MembershipData[] RetrievePrincipalGroupMemberships(string principalID)
+        {
+            // TODO
+            return null;
+        }
+
+        #endregion
+    }
+
+    public class PGSqlGroupsGroupsHandler : PGSQLGenericTableHandler<GroupData>
+    {
+        protected override Assembly Assembly
+        {
+            // WARNING! Moving migrations to this assembly!!!
+            get { return GetType().Assembly; }
+        }
+
+        public PGSqlGroupsGroupsHandler(string connectionString, string realm, string store) 
+            : base(connectionString, realm, store)
+        {
+        }
+
+    }
+
+    public class PGSqlGroupsMembershipHandler : PGSQLGenericTableHandler<MembershipData>
+    {
+        protected override Assembly Assembly
+        {
+            // WARNING! Moving migrations to this assembly!!!
+            get { return GetType().Assembly; }
+        }
+
+        public PGSqlGroupsMembershipHandler(string connectionString, string realm) 
+            : base(connectionString, realm, string.Empty)
+        {
+        }
+
+    }
+
+    public class PGSqlGroupsRolesHandler : PGSQLGenericTableHandler<RoleData>
+    {
+        protected override Assembly Assembly
+        {
+            // WARNING! Moving migrations to this assembly!!!
+            get { return GetType().Assembly; }
+        }
+
+        public PGSqlGroupsRolesHandler(string connectionString, string realm) 
+            : base(connectionString, realm, string.Empty)
+        {
+        }
+
+    }
+
+    public class PGSqlGroupsRoleMembershipHandler : PGSQLGenericTableHandler<RoleMembershipData>
+    {
+        protected override Assembly Assembly
+        {
+            // WARNING! Moving migrations to this assembly!!!
+            get { return GetType().Assembly; }
+        }
+
+        public PGSqlGroupsRoleMembershipHandler(string connectionString, string realm) 
+            : base(connectionString, realm, string.Empty)
+        {
+        }
+
+    }
+
+    public class PGSqlGroupsInvitesHandler : PGSQLGenericTableHandler<InvitationData>
+    {
+        protected override Assembly Assembly
+        {
+            // WARNING! Moving migrations to this assembly!!!
+            get { return GetType().Assembly; }
+        }
+
+        public PGSqlGroupsInvitesHandler(string connectionString, string realm) 
+            : base(connectionString, realm, string.Empty)
+        {
+        }
+
+        public void DeleteOld()
+        {
+            uint now = (uint)Util.UnixTimeSinceEpoch();
+
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                cmd.CommandText = String.Format("delete from {0} where \"TMStamp\" < :tstamp", m_Realm);
+                cmd.Parameters.AddWithValue("tstamp", now - 14 * 24 * 60 * 60); // > 2 weeks old
+
+                ExecuteNonQuery(cmd);
+            }
+
+        }
+    }
+
+    public class PGSqlGroupsNoticesHandler : PGSQLGenericTableHandler<NoticeData>
+    {
+        protected override Assembly Assembly
+        {
+            // WARNING! Moving migrations to this assembly!!!
+            get { return GetType().Assembly; }
+        }
+
+        public PGSqlGroupsNoticesHandler(string connectionString, string realm) 
+            : base(connectionString, realm, string.Empty)
+        {
+        }
+
+        public void DeleteOld()
+        {
+            uint now = (uint)Util.UnixTimeSinceEpoch();
+
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                cmd.CommandText = String.Format("delete from {0} where \"TMStamp\" < :tstamp", m_Realm);
+                cmd.Parameters.AddWithValue("tstamp", now - 14 * 24 * 60 * 60); // > 2 weeks old
+
+                ExecuteNonQuery(cmd);
+            }
+
+        }
+    }
+
+    public class PGSqlGroupsPrincipalsHandler : PGSQLGenericTableHandler<PrincipalData>
+    {
+        protected override Assembly Assembly
+        {
+            // WARNING! Moving migrations to this assembly!!!
+            get { return GetType().Assembly; }
+        }
+
+        public PGSqlGroupsPrincipalsHandler(string connectionString, string realm) 
+            : base(connectionString, realm, string.Empty)
+        {
+        }
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLHGTravelData.cs b/OpenSim/Data/PGSQL/PGSQLHGTravelData.cs
new file mode 100644
index 0000000..c71b15f
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLHGTravelData.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 Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    /// <summary>
+    /// A PGSQL Interface for user grid data
+    /// </summary>
+    public class PGSQLHGTravelData : PGSQLGenericTableHandler<HGTravelingData>, IHGTravelingData
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public PGSQLHGTravelData(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 (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                cmd.CommandText = String.Format(@"delete from {0} where ""TMStamp"" < CURRENT_DATE - INTERVAL '2 day'", m_Realm);
+
+                ExecuteNonQuery(cmd);
+            }
+
+        }
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLInventoryData.cs b/OpenSim/Data/PGSQL/PGSQLInventoryData.cs
new file mode 100644
index 0000000..c999433
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLInventoryData.cs
@@ -0,0 +1,831 @@
+/*
+ * 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;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    /// <summary>
+    /// A PGSQL interface for the inventory server
+    /// </summary>
+    public class PGSQLInventoryData : IInventoryDataPlugin
+    {
+        private const string _migrationStore = "InventoryStore";
+
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        /// <summary>
+        /// The database manager
+        /// </summary>
+        private PGSQLManager database;
+        private string m_connectionString;
+
+        #region IPlugin members
+
+        [Obsolete("Cannot be default-initialized!")]
+        public void Initialise()
+        {
+            m_log.Info("[PGSQLInventoryData]: " + Name + " cannot be default-initialized!");
+            throw new PluginNotInitialisedException(Name);
+        }
+
+        /// <summary>
+        /// Loads and initialises the PGSQL inventory storage interface
+        /// </summary>
+        /// <param name="connectionString">connect string</param>
+        /// <remarks>use PGSQL_connection.ini</remarks>
+        public void Initialise(string connectionString)
+        {
+            m_connectionString = connectionString;
+            database = new PGSQLManager(connectionString);
+          
+            //New migrations check of store
+            database.CheckMigration(_migrationStore);
+        }
+
+        /// <summary>
+        /// The name of this DB provider
+        /// </summary>
+        /// <returns>A string containing the name of the DB provider</returns>
+        public string Name
+        {
+            get { return "PGSQL Inventory Data Interface"; }
+        }
+
+        /// <summary>
+        /// Closes this DB provider
+        /// </summary>
+        public void Dispose()
+        {
+            database = null;
+        }
+
+        /// <summary>
+        /// Returns the version of this DB provider
+        /// </summary>
+        /// <returns>A string containing the DB provider</returns>
+        public string Version
+        {
+            get { return database.getVersion(); }
+        }
+
+        #endregion
+
+        #region Folder methods
+
+        /// <summary>
+        /// Returns a list of the root folders within a users inventory
+        /// </summary>
+        /// <param name="user">The user whos inventory is to be searched</param>
+        /// <returns>A list of folder objects</returns>
+        public List<InventoryFolderBase> getUserRootFolders(UUID user)
+        {
+            if (user == UUID.Zero)
+                return new List<InventoryFolderBase>();
+
+            return getInventoryFolders(UUID.Zero, user);
+        }
+
+        /// <summary>
+        /// see InventoryItemBase.getUserRootFolder
+        /// </summary>
+        /// <param name="user">the User UUID</param>
+        /// <returns></returns>
+        public InventoryFolderBase getUserRootFolder(UUID user)
+        {
+            List<InventoryFolderBase> items = getUserRootFolders(user);
+
+            InventoryFolderBase rootFolder = null;
+
+            // There should only ever be one root folder for a user.  However, if there's more
+            // than one we'll simply use the first one rather than failing.  It would be even
+            // nicer to print some message to this effect, but this feels like it's too low a
+            // to put such a message out, and it's too minor right now to spare the time to
+            // suitably refactor.
+            if (items.Count > 0)
+            {
+                rootFolder = items[0];
+            }
+
+            return rootFolder;
+        }
+
+        /// <summary>
+        /// Returns a list of folders in a users inventory contained within the specified folder
+        /// </summary>
+        /// <param name="parentID">The folder to search</param>
+        /// <returns>A list of inventory folders</returns>
+        public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
+        {
+            return getInventoryFolders(parentID, UUID.Zero);
+        }
+
+        /// <summary>
+        /// Returns a specified inventory folder
+        /// </summary>
+        /// <param name="folderID">The folder to return</param>
+        /// <returns>A folder class</returns>
+        public InventoryFolderBase getInventoryFolder(UUID folderID)
+        {
+            string sql = "SELECT * FROM inventoryfolders WHERE \"folderID\" = :folderID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("folderID", folderID));
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    if (reader.Read())
+                    {
+                        return readInventoryFolder(reader);
+                    }
+                }
+            }
+            m_log.InfoFormat("[INVENTORY DB] : Found no inventory folder with ID : {0}", folderID);
+            return null;
+        }
+
+        /// <summary>
+        /// Returns all child folders in the hierarchy from the parent folder and down.
+        /// Does not return the parent folder itself.
+        /// </summary>
+        /// <param name="parentID">The folder to get subfolders for</param>
+        /// <returns>A list of inventory folders</returns>
+        public List<InventoryFolderBase> getFolderHierarchy(UUID parentID)
+        {
+            //Note maybe change this to use a Dataset that loading in all folders of a user and then go throw it that way.
+            //Note this is changed so it opens only one connection to the database and not everytime it wants to get data.
+
+            /*  NOTE: the implementation below is very inefficient (makes a separate request to get subfolders for
+             * every found folder, recursively).  Inventory code for other DBs has been already rewritten to get ALL
+             * inventory for a specific user at once.
+             * 
+             * Meanwhile, one little thing is corrected:  getFolderHierarchy(UUID.Zero) doesn't make sense and should never 
+             * be used, so check for that and return an empty list.
+             */
+
+            List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
+
+            if (parentID == UUID.Zero)
+                return folders;
+
+            string sql = "SELECT * FROM inventoryfolders WHERE \"parentFolderID\" = :parentID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("parentID", parentID));
+                conn.Open();
+                folders.AddRange(getInventoryFolders(cmd));
+
+                List<InventoryFolderBase> tempFolders = new List<InventoryFolderBase>();
+
+                foreach (InventoryFolderBase folderBase in folders)
+                {
+                    tempFolders.AddRange(getFolderHierarchy(folderBase.ID, cmd));
+                }
+                if (tempFolders.Count > 0)
+                {
+                    folders.AddRange(tempFolders);
+                }
+            }
+            return folders;
+        }
+
+        /// <summary>
+        /// Creates a new inventory folder
+        /// </summary>
+        /// <param name="folder">Folder to create</param>
+        public void addInventoryFolder(InventoryFolderBase folder)
+        {
+            string sql = "INSERT INTO inventoryfolders (\"folderID\", \"agentID\", \"parentFolderID\", \"folderName\", type, version) " +
+                         "   VALUES (:folderID, :agentID, :parentFolderID, :folderName, :type, :version);";
+
+            string folderName = folder.Name;
+            if (folderName.Length > 64)
+            {
+                folderName = folderName.Substring(0, 64);
+                m_log.Warn("[INVENTORY DB]: Name field truncated from " + folder.Name.Length.ToString() + " to " + folderName.Length + " characters on add");
+            }
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID));
+                cmd.Parameters.Add(database.CreateParameter("agentID", folder.Owner));
+                cmd.Parameters.Add(database.CreateParameter("parentFolderID", folder.ParentID));
+                cmd.Parameters.Add(database.CreateParameter("folderName", folderName));
+                cmd.Parameters.Add(database.CreateParameter("type", folder.Type));
+                cmd.Parameters.Add(database.CreateParameter("version", folder.Version));
+                conn.Open();
+                try
+                {
+                    cmd.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat("[INVENTORY DB]: Error : {0}", e.Message);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates an inventory folder
+        /// </summary>
+        /// <param name="folder">Folder to update</param>
+        public void updateInventoryFolder(InventoryFolderBase folder)
+        {
+            string sql = @"UPDATE inventoryfolders SET ""agentID"" = :agentID, 
+                                                       ""parentFolderID"" = :parentFolderID,
+                                                       ""folderName"" = :folderName,
+                                                       type = :type,
+                                                       version = :version 
+                           WHERE folderID = :folderID";
+
+            string folderName = folder.Name;
+            if (folderName.Length > 64)
+            {
+                folderName = folderName.Substring(0, 64);
+                m_log.Warn("[INVENTORY DB]: Name field truncated from " + folder.Name.Length.ToString() + " to " + folderName.Length + " characters on update");
+            }
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID));
+                cmd.Parameters.Add(database.CreateParameter("agentID", folder.Owner));
+                cmd.Parameters.Add(database.CreateParameter("parentFolderID", folder.ParentID));
+                cmd.Parameters.Add(database.CreateParameter("folderName", folderName));
+                cmd.Parameters.Add(database.CreateParameter("type", folder.Type));
+                cmd.Parameters.Add(database.CreateParameter("version", folder.Version));
+                conn.Open();
+                try
+                {
+                    cmd.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat("[INVENTORY DB]: Error : {0}", e.Message);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates an inventory folder
+        /// </summary>
+        /// <param name="folder">Folder to update</param>
+        public void moveInventoryFolder(InventoryFolderBase folder)
+        {
+            string sql = @"UPDATE inventoryfolders SET ""parentFolderID"" = :parentFolderID WHERE ""folderID"" = :folderID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("parentFolderID", folder.ParentID));
+                cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID));
+                conn.Open();
+                try
+                {
+                    cmd.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat("[INVENTORY DB]: Error : {0}", e.Message);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Delete an inventory folder
+        /// </summary>
+        /// <param name="folderID">Id of folder to delete</param>
+        public void deleteInventoryFolder(UUID folderID)
+        {
+            string sql = @"SELECT * FROM inventoryfolders WHERE ""parentFolderID"" = :parentID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                List<InventoryFolderBase> subFolders;
+                cmd.Parameters.Add(database.CreateParameter("parentID", UUID.Zero));
+                conn.Open();
+                subFolders = getFolderHierarchy(folderID, cmd);
+                
+
+                //Delete all sub-folders
+                foreach (InventoryFolderBase f in subFolders)
+                {
+                    DeleteOneFolder(f.ID, conn);
+                    DeleteItemsInFolder(f.ID, conn);
+                }
+
+                //Delete the actual row
+                DeleteOneFolder(folderID, conn);
+                DeleteItemsInFolder(folderID, conn);
+            }
+        }
+
+        #endregion
+
+        #region Item Methods
+
+        /// <summary>
+        /// Returns a list of items in a specified folder
+        /// </summary>
+        /// <param name="folderID">The folder to search</param>
+        /// <returns>A list containing inventory items</returns>
+        public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
+        {
+            string sql = @"SELECT * FROM inventoryitems WHERE ""parentFolderID"" = :parentFolderID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("parentFolderID", folderID));
+                conn.Open();
+                List<InventoryItemBase> items = new List<InventoryItemBase>();
+
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    while (reader.Read())
+                    {
+                        items.Add(readInventoryItem(reader));
+                    }
+                }
+                return items;
+            }
+        }
+
+        /// <summary>
+        /// Returns a specified inventory item
+        /// </summary>
+        /// <param name="itemID">The item ID</param>
+        /// <returns>An inventory item</returns>
+        public InventoryItemBase getInventoryItem(UUID itemID)
+        {
+            string sql = @"SELECT * FROM inventoryitems WHERE ""inventoryID"" = :inventoryID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("inventoryID", itemID));
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    if (reader.Read())
+                    {
+                        return readInventoryItem(reader);
+                    }
+                }
+            }
+            
+            m_log.InfoFormat("[INVENTORY DB]: Found no inventory item with ID : {0}", itemID);
+            return null;
+        }
+
+        /// <summary>
+        /// Adds a specified item to the database
+        /// </summary>
+        /// <param name="item">The inventory item</param>
+        public void addInventoryItem(InventoryItemBase item)
+        {
+            if (getInventoryItem(item.ID) != null)
+            {
+                updateInventoryItem(item);
+                return;
+            }
+
+            string sql = @"INSERT INTO inventoryitems 
+                            (""inventoryID"", ""assetID"", ""assetType"", ""parentFolderID"", ""avatarID"", ""inventoryName"", 
+                             ""inventoryDescription"", ""inventoryNextPermissions"", ""inventoryCurrentPermissions"",
+                             ""invType"", ""creatorID"", ""inventoryBasePermissions"", ""inventoryEveryOnePermissions"", ""inventoryGroupPermissions"",
+                             ""salePrice"", ""SaleType"", ""creationDate"", ""groupID"", ""groupOwned"", flags) 
+                        VALUES
+                            (:inventoryID, :assetID, :assetType, :parentFolderID, :avatarID, :inventoryName, :inventoryDescription,
+                             :inventoryNextPermissions, :inventoryCurrentPermissions, :invType, :creatorID,
+                             :inventoryBasePermissions, :inventoryEveryOnePermissions, :inventoryGroupPermissions, :SalePrice, :SaleType,
+                             :creationDate, :groupID, :groupOwned, :flags)";
+            
+            string itemName = item.Name;
+            if (item.Name.Length > 64)
+            {
+                itemName = item.Name.Substring(0, 64);
+                m_log.Warn("[INVENTORY DB]: Name field truncated from " + item.Name.Length.ToString() + " to " + itemName.Length.ToString() + " characters");
+            }
+            
+            string itemDesc = item.Description;
+            if (item.Description.Length > 128)
+            {
+                itemDesc = item.Description.Substring(0, 128);
+                m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters");
+            }
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
+            {
+                command.Parameters.Add(database.CreateParameter("inventoryID", item.ID));
+                command.Parameters.Add(database.CreateParameter("assetID", item.AssetID));
+                command.Parameters.Add(database.CreateParameter("assetType", item.AssetType));
+                command.Parameters.Add(database.CreateParameter("parentFolderID", item.Folder));
+                command.Parameters.Add(database.CreateParameter("avatarID", item.Owner));
+                command.Parameters.Add(database.CreateParameter("inventoryName", itemName));
+                command.Parameters.Add(database.CreateParameter("inventoryDescription", itemDesc));
+                command.Parameters.Add(database.CreateParameter("inventoryNextPermissions", item.NextPermissions));
+                command.Parameters.Add(database.CreateParameter("inventoryCurrentPermissions", item.CurrentPermissions));
+                command.Parameters.Add(database.CreateParameter("invType", item.InvType));
+                command.Parameters.Add(database.CreateParameter("creatorID", item.CreatorId));
+                command.Parameters.Add(database.CreateParameter("inventoryBasePermissions", item.BasePermissions));
+                command.Parameters.Add(database.CreateParameter("inventoryEveryOnePermissions", item.EveryOnePermissions));
+                command.Parameters.Add(database.CreateParameter("inventoryGroupPermissions", item.GroupPermissions));
+                command.Parameters.Add(database.CreateParameter("SalePrice", item.SalePrice));
+                command.Parameters.Add(database.CreateParameter("SaleType", item.SaleType));
+                command.Parameters.Add(database.CreateParameter("creationDate", item.CreationDate));
+                command.Parameters.Add(database.CreateParameter("groupID", item.GroupID));
+                command.Parameters.Add(database.CreateParameter("groupOwned", item.GroupOwned));
+                command.Parameters.Add(database.CreateParameter("flags", item.Flags));
+                conn.Open();
+                try
+                {
+                    command.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[INVENTORY DB]: Error inserting item :" + e.Message);
+                }
+            }
+
+            sql = @"UPDATE inventoryfolders SET version = version + 1 WHERE ""folderID"" = @folderID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
+            {
+                command.Parameters.Add(database.CreateParameter("folderID", item.Folder.ToString()));
+                conn.Open();
+                try
+                {
+                    command.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[INVENTORY DB] Error updating inventory folder for new item :" + e.Message);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates the specified inventory item
+        /// </summary>
+        /// <param name="item">Inventory item to update</param>
+        public void updateInventoryItem(InventoryItemBase item)
+        {
+            string sql = @"UPDATE inventoryitems SET ""assetID"" = :assetID, 
+                                                ""assetType"" = :assetType,
+                                                ""parentFolderID"" = :parentFolderID,
+                                                ""avatarID"" = :avatarID,
+                                                ""inventoryName"" = :inventoryName, 
+                                                ""inventoryDescription"" = :inventoryDescription, 
+                                                ""inventoryNextPermissions"" = :inventoryNextPermissions, 
+                                                ""inventoryCurrentPermissions"" = :inventoryCurrentPermissions, 
+                                                ""invType"" = :invType, 
+                                                ""creatorID"" = :creatorID, 
+                                                ""inventoryBasePermissions"" = :inventoryBasePermissions, 
+                                                ""inventoryEveryOnePermissions"" = :inventoryEveryOnePermissions, 
+                                                ""inventoryGroupPermissions"" = :inventoryGroupPermissions, 
+                                                ""salePrice"" = :SalePrice, 
+                                                ""saleType"" = :SaleType, 
+                                                ""creationDate"" = :creationDate, 
+                                                ""groupID"" = :groupID, 
+                                                ""groupOwned"" = :groupOwned, 
+                                                flags = :flags 
+                                        WHERE ""inventoryID"" = :inventoryID";
+
+            string itemName = item.Name;
+            if (item.Name.Length > 64)
+            {
+                itemName = item.Name.Substring(0, 64);
+                m_log.Warn("[INVENTORY DB]: Name field truncated from " + item.Name.Length.ToString() + " to " + itemName.Length.ToString() + " characters on update");
+            }
+            
+            string itemDesc = item.Description;
+            if (item.Description.Length > 128)
+            {
+                itemDesc = item.Description.Substring(0, 128);
+                m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters on update");
+            }
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
+            {
+                command.Parameters.Add(database.CreateParameter("inventoryID", item.ID));
+                command.Parameters.Add(database.CreateParameter("assetID", item.AssetID));
+                command.Parameters.Add(database.CreateParameter("assetType", item.AssetType));
+                command.Parameters.Add(database.CreateParameter("parentFolderID", item.Folder));
+                command.Parameters.Add(database.CreateParameter("avatarID", item.Owner));
+                command.Parameters.Add(database.CreateParameter("inventoryName", itemName));
+                command.Parameters.Add(database.CreateParameter("inventoryDescription", itemDesc));
+                command.Parameters.Add(database.CreateParameter("inventoryNextPermissions", item.NextPermissions));
+                command.Parameters.Add(database.CreateParameter("inventoryCurrentPermissions", item.CurrentPermissions));
+                command.Parameters.Add(database.CreateParameter("invType", item.InvType));
+                command.Parameters.Add(database.CreateParameter("creatorID", item.CreatorId));
+                command.Parameters.Add(database.CreateParameter("inventoryBasePermissions", item.BasePermissions));
+                command.Parameters.Add(database.CreateParameter("inventoryEveryOnePermissions", item.EveryOnePermissions));
+                command.Parameters.Add(database.CreateParameter("inventoryGroupPermissions", item.GroupPermissions));
+                command.Parameters.Add(database.CreateParameter("SalePrice", item.SalePrice));
+                command.Parameters.Add(database.CreateParameter("SaleType", item.SaleType));
+                command.Parameters.Add(database.CreateParameter("creationDate", item.CreationDate));
+                command.Parameters.Add(database.CreateParameter("groupID", item.GroupID));
+                command.Parameters.Add(database.CreateParameter("groupOwned", item.GroupOwned));
+                command.Parameters.Add(database.CreateParameter("flags", item.Flags));
+                conn.Open();
+                try
+                {
+                    command.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[INVENTORY DB]: Error updating item :" + e.Message);
+                }
+            }
+        }
+
+        // See IInventoryDataPlugin
+
+        /// <summary>
+        /// Delete an item in inventory database
+        /// </summary>
+        /// <param name="itemID">the item UUID</param>
+        public void deleteInventoryItem(UUID itemID)
+        {
+            string sql = @"DELETE FROM inventoryitems WHERE ""inventoryID""=:inventoryID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("inventoryID", itemID));
+                try
+                {
+                    conn.Open();
+                    cmd.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[INVENTORY DB]: Error deleting item :" + e.Message);
+                }
+            }
+        }
+
+        public InventoryItemBase queryInventoryItem(UUID itemID)
+        {
+            return getInventoryItem(itemID);
+        }
+
+        public InventoryFolderBase queryInventoryFolder(UUID folderID)
+        {
+            return getInventoryFolder(folderID);
+        }
+
+        /// <summary>
+        /// Returns all activated gesture-items in the inventory of the specified avatar.
+        /// </summary>
+        /// <param name="avatarID">The <see cref="UUID"/> of the avatar</param>
+        /// <returns>
+        /// The list of gestures (<see cref="InventoryItemBase"/>s)
+        /// </returns>
+        public List<InventoryItemBase> fetchActiveGestures(UUID avatarID)
+        {
+            string sql = @"SELECT * FROM inventoryitems WHERE ""avatarID"" = :uuid AND ""assetType"" = :assetType and flags = 1";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("uuid", avatarID));
+                cmd.Parameters.Add(database.CreateParameter("assetType", (int)AssetType.Gesture));
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    List<InventoryItemBase> gestureList = new List<InventoryItemBase>();
+                    while (reader.Read())
+                    {
+                        gestureList.Add(readInventoryItem(reader));
+                    }
+                    return gestureList;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Private methods
+
+        /// <summary>
+        /// Delete an item in inventory database
+        /// </summary>
+        /// <param name="folderID">the item ID</param>
+        /// <param name="connection">connection to the database</param>
+        private void DeleteItemsInFolder(UUID folderID, NpgsqlConnection connection)
+        {
+            using (NpgsqlCommand command = new NpgsqlCommand(@"DELETE FROM inventoryitems WHERE ""folderID""=:folderID", connection))
+            {
+                command.Parameters.Add(database.CreateParameter("folderID", folderID));
+
+                try
+                {
+                    command.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[INVENTORY DB] Error deleting item :" + e.Message);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the folder hierarchy in a loop.
+        /// </summary>
+        /// <param name="parentID">parent ID.</param>
+        /// <param name="command">SQL command/connection to database</param>
+        /// <returns></returns>
+        private static List<InventoryFolderBase> getFolderHierarchy(UUID parentID, NpgsqlCommand command)
+        {
+            command.Parameters["parentID"].Value = parentID.Guid; //.ToString();
+
+            List<InventoryFolderBase> folders = getInventoryFolders(command);
+
+            if (folders.Count > 0)
+            {
+                List<InventoryFolderBase> tempFolders = new List<InventoryFolderBase>();
+
+                foreach (InventoryFolderBase folderBase in folders)
+                {
+                    tempFolders.AddRange(getFolderHierarchy(folderBase.ID, command));
+                }
+
+                if (tempFolders.Count > 0)
+                {
+                    folders.AddRange(tempFolders);
+                }
+            }
+            return folders;
+        }
+
+        /// <summary>
+        /// Gets the inventory folders.
+        /// </summary>
+        /// <param name="parentID">parentID, use UUID.Zero to get root</param>
+        /// <param name="user">user id, use UUID.Zero, if you want all folders from a parentID.</param>
+        /// <returns></returns>
+        private List<InventoryFolderBase> getInventoryFolders(UUID parentID, UUID user)
+        {
+            string sql = @"SELECT * FROM inventoryfolders WHERE ""parentFolderID"" = :parentID AND ""agentID"" = :uuid";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
+            {
+                if (user == UUID.Zero)
+                {
+                    command.Parameters.Add(database.CreateParameter("uuid", "%"));
+                }
+                else
+                {
+                    command.Parameters.Add(database.CreateParameter("uuid", user));
+                }
+                command.Parameters.Add(database.CreateParameter("parentID", parentID));
+                conn.Open();
+                return getInventoryFolders(command);
+            }
+        }
+
+        /// <summary>
+        /// Gets the inventory folders.
+        /// </summary>
+        /// <param name="command">SQLcommand.</param>
+        /// <returns></returns>
+        private static List<InventoryFolderBase> getInventoryFolders(NpgsqlCommand command)
+        {
+            using (NpgsqlDataReader reader = command.ExecuteReader())
+            {
+
+                List<InventoryFolderBase> items = new List<InventoryFolderBase>();
+                while (reader.Read())
+                {
+                    items.Add(readInventoryFolder(reader));
+                }
+                return items;
+            }
+        }
+
+        /// <summary>
+        /// Reads a list of inventory folders returned by a query.
+        /// </summary>
+        /// <param name="reader">A PGSQL Data Reader</param>
+        /// <returns>A List containing inventory folders</returns>
+        protected static InventoryFolderBase readInventoryFolder(NpgsqlDataReader reader)
+        {
+            try
+            {
+                InventoryFolderBase folder = new InventoryFolderBase();
+                folder.Owner = DBGuid.FromDB(reader["agentID"]);
+                folder.ParentID = DBGuid.FromDB(reader["parentFolderID"]);
+                folder.ID = DBGuid.FromDB(reader["folderID"]);
+                folder.Name = (string)reader["folderName"];
+                folder.Type = (short)reader["type"];
+                folder.Version = Convert.ToUInt16(reader["version"]);
+
+                return folder;
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[INVENTORY DB] Error reading inventory folder :" + e.Message);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Reads a one item from an SQL result
+        /// </summary>
+        /// <param name="reader">The SQL Result</param>
+        /// <returns>the item read</returns>
+        private static InventoryItemBase readInventoryItem(IDataRecord reader)
+        {
+            try
+            {
+                InventoryItemBase item = new InventoryItemBase();
+
+                item.ID = DBGuid.FromDB(reader["inventoryID"]);
+                item.AssetID = DBGuid.FromDB(reader["assetID"]);
+                item.AssetType = Convert.ToInt32(reader["assetType"].ToString());
+                item.Folder = DBGuid.FromDB(reader["parentFolderID"]);
+                item.Owner = DBGuid.FromDB(reader["avatarID"]);
+                item.Name = reader["inventoryName"].ToString();
+                item.Description = reader["inventoryDescription"].ToString();
+                item.NextPermissions = Convert.ToUInt32(reader["inventoryNextPermissions"]);
+                item.CurrentPermissions = Convert.ToUInt32(reader["inventoryCurrentPermissions"]);
+                item.InvType = Convert.ToInt32(reader["invType"].ToString());
+                item.CreatorId = reader["creatorID"].ToString();
+                item.BasePermissions = Convert.ToUInt32(reader["inventoryBasePermissions"]);
+                item.EveryOnePermissions = Convert.ToUInt32(reader["inventoryEveryOnePermissions"]);
+                item.GroupPermissions = Convert.ToUInt32(reader["inventoryGroupPermissions"]);
+                item.SalePrice = Convert.ToInt32(reader["salePrice"]);
+                item.SaleType = Convert.ToByte(reader["saleType"]);
+                item.CreationDate = Convert.ToInt32(reader["creationDate"]);
+                item.GroupID = DBGuid.FromDB(reader["groupID"]);
+                item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]);
+                item.Flags = Convert.ToUInt32(reader["flags"]);
+
+                return item;
+            }
+            catch (NpgsqlException e)
+            {
+                m_log.Error("[INVENTORY DB]: Error reading inventory item :" + e.Message);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Delete a folder in inventory databasae
+        /// </summary>
+        /// <param name="folderID">the folder UUID</param>
+        /// <param name="connection">connection to database</param>
+        private void DeleteOneFolder(UUID folderID, NpgsqlConnection connection)
+        {
+            try
+            {
+                using (NpgsqlCommand command = new NpgsqlCommand(@"DELETE FROM inventoryfolders WHERE ""folderID""=:folderID and type=-1", connection))
+                {
+                    command.Parameters.Add(database.CreateParameter("folderID", folderID));
+
+                    command.ExecuteNonQuery();
+                }
+            }
+            catch (NpgsqlException e)
+            {
+                m_log.Error("[INVENTORY DB]: Error deleting folder :" + e.Message);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLManager.cs b/OpenSim/Data/PGSQL/PGSQLManager.cs
new file mode 100644
index 0000000..3ddaf38
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLManager.cs
@@ -0,0 +1,321 @@
+/*
+ * 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.IO;
+using System.Reflection;
+using log4net;
+using OpenMetaverse;
+using Npgsql;
+using NpgsqlTypes;
+
+namespace OpenSim.Data.PGSQL
+{
+    /// <summary>
+    /// A management class for the MS SQL Storage Engine
+    /// </summary>
+    public class PGSQLManager
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        /// <summary>
+        /// Connection string for ADO.net
+        /// </summary>
+        private readonly string connectionString;
+
+        /// <summary>
+        /// Initialize the manager and set the connectionstring
+        /// </summary>
+        /// <param name="connection"></param>
+        public PGSQLManager(string connection)
+        {
+            connectionString = connection;
+        }
+
+        /// <summary>
+        /// Type conversion to a SQLDbType functions
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        internal NpgsqlDbType DbtypeFromType(Type type)
+        {
+            if (type == typeof(string))
+            {
+                return NpgsqlDbType.Varchar;
+            }
+            if (type == typeof(double))
+            {
+                return NpgsqlDbType.Double;
+            }
+            if (type == typeof(Single))
+            {
+                return NpgsqlDbType.Double;
+            }
+            if (type == typeof(int))
+            {
+                return NpgsqlDbType.Integer;
+            }
+            if (type == typeof(bool))
+            {
+                return NpgsqlDbType.Boolean;
+            }
+            if (type == typeof(UUID))
+            {
+                return NpgsqlDbType.Uuid;
+            }
+            if (type == typeof(byte))
+            {
+                return NpgsqlDbType.Smallint;
+            }
+            if (type == typeof(sbyte))
+            {
+                return NpgsqlDbType.Integer;
+            }
+            if (type == typeof(Byte[]))
+            {
+                return NpgsqlDbType.Bytea;
+            }
+            if (type == typeof(uint) || type == typeof(ushort))
+            {
+                return NpgsqlDbType.Integer;
+            }
+            if (type == typeof(ulong))
+            {
+                return NpgsqlDbType.Bigint;
+            }
+            if (type == typeof(DateTime))
+            {
+                return NpgsqlDbType.Timestamp;
+            }
+
+            return NpgsqlDbType.Varchar;
+        }
+
+        internal NpgsqlDbType DbtypeFromString(Type type, string PGFieldType)
+        {
+            if (PGFieldType == "")
+            {
+                return DbtypeFromType(type);
+            }
+
+            if (PGFieldType == "character varying")
+            {
+                return NpgsqlDbType.Varchar;
+            }
+            if (PGFieldType == "double precision")
+            {
+                return NpgsqlDbType.Double;
+            }
+            if (PGFieldType == "integer")
+            {
+                return NpgsqlDbType.Integer;
+            }
+            if (PGFieldType == "smallint")
+            {
+                return NpgsqlDbType.Smallint;
+            }
+            if (PGFieldType == "boolean")
+            {
+                return NpgsqlDbType.Boolean;
+            }
+            if (PGFieldType == "uuid")
+            {
+                return NpgsqlDbType.Uuid;
+            }
+            if (PGFieldType == "bytea")
+            {
+                return NpgsqlDbType.Bytea;
+            }
+
+            return DbtypeFromType(type);
+        }
+
+        /// <summary>
+        /// Creates value for parameter.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns></returns>
+        private static object CreateParameterValue(object value)
+        {
+            Type valueType = value.GetType();
+
+            if (valueType == typeof(UUID)) //TODO check if this works
+            {
+                return ((UUID) value).Guid;
+            }
+            if (valueType == typeof(UUID))
+            {
+                return ((UUID)value).Guid;
+            }
+            if (valueType == typeof(bool))
+            {
+                return (bool)value;
+            }
+            if (valueType == typeof(Byte[]))
+            {
+                return value;
+            }
+            if (valueType == typeof(int))
+            {
+                return value;
+            }
+            return value;
+        }
+
+        /// <summary>
+        ///  Create value for parameter based on PGSQL Schema
+        /// </summary>
+        /// <param name="value"></param>
+        /// <param name="PGFieldType"></param>
+        /// <returns></returns>
+        internal static object CreateParameterValue(object value, string PGFieldType)
+        {
+            if (PGFieldType == "uuid")
+            {
+                UUID uidout;
+                UUID.TryParse(value.ToString(), out uidout);
+                return uidout;
+            }
+            if (PGFieldType == "integer")
+            {
+                int intout;
+                int.TryParse(value.ToString(), out intout);
+                return intout;
+            }
+            if (PGFieldType == "boolean")
+            {
+                return (value.ToString() == "true");
+            }
+            if (PGFieldType == "timestamp with time zone")
+            {
+                return (DateTime)value;
+            }
+            if (PGFieldType == "timestamp without time zone")
+            {
+                return (DateTime)value;
+            }
+            return CreateParameterValue(value);
+        }
+
+        /// <summary>
+        /// Create a parameter for a command
+        /// </summary>
+        /// <param name="parameterName">Name of the parameter.</param>
+        /// <param name="parameterObject">parameter object.</param>
+        /// <returns></returns>
+        internal NpgsqlParameter CreateParameter(string parameterName, object parameterObject)
+        {
+            return CreateParameter(parameterName, parameterObject, false);
+        }
+
+        /// <summary>
+        /// Creates the parameter for a command.
+        /// </summary>
+        /// <param name="parameterName">Name of the parameter.</param>
+        /// <param name="parameterObject">parameter object.</param>
+        /// <param name="parameterOut">if set to <c>true</c> parameter is a output parameter</param>
+        /// <returns></returns>
+        internal NpgsqlParameter CreateParameter(string parameterName, object parameterObject, bool parameterOut)
+        {
+            //Tweak so we dont always have to add : sign
+            if (parameterName.StartsWith(":")) parameterName = parameterName.Replace(":","");
+
+            //HACK if object is null, it is turned into a string, there are no nullable type till now
+            if (parameterObject == null) parameterObject = "";
+
+            NpgsqlParameter parameter = new NpgsqlParameter(parameterName, DbtypeFromType(parameterObject.GetType()));
+
+            if (parameterOut)
+            {
+                parameter.Direction = ParameterDirection.Output;
+            }
+            else
+            {
+                parameter.Direction = ParameterDirection.Input;
+                parameter.Value = CreateParameterValue(parameterObject);
+            }
+
+            return parameter;
+        }
+
+        /// <summary>
+        /// Create a parameter with PGSQL schema type
+        /// </summary>
+        /// <param name="parameterName"></param>
+        /// <param name="parameterObject"></param>
+        /// <param name="PGFieldType"></param>
+        /// <returns></returns>
+        internal NpgsqlParameter CreateParameter(string parameterName, object parameterObject, string PGFieldType)
+        {
+            //Tweak so we dont always have to add : sign
+            if (parameterName.StartsWith(":")) parameterName = parameterName.Replace(":", "");
+
+            //HACK if object is null, it is turned into a string, there are no nullable type till now
+            if (parameterObject == null) parameterObject = "";
+
+            NpgsqlParameter parameter = new NpgsqlParameter(parameterName, DbtypeFromString(parameterObject.GetType(), PGFieldType));
+
+            parameter.Direction = ParameterDirection.Input;
+            parameter.Value = CreateParameterValue(parameterObject, PGFieldType);
+
+            return parameter;
+        }
+
+        /// <summary>
+        /// Checks if we need to do some migrations to the database
+        /// </summary>
+        /// <param name="migrationStore">migrationStore.</param>
+        public void CheckMigration(string migrationStore)
+        {
+            using (NpgsqlConnection connection = new NpgsqlConnection(connectionString)) 
+            {
+                connection.Open();
+                Assembly assem = GetType().Assembly;
+                PGSQLMigration migration = new PGSQLMigration(connection, assem, migrationStore);
+
+                migration.Update();
+            }
+        }
+
+        /// <summary>
+        /// Returns the version of this DB provider
+        /// </summary>
+        /// <returns>A string containing the DB provider</returns>
+        public string getVersion()
+        {
+            Module module = GetType().Module;
+            // string dllName = module.Assembly.ManifestModule.Name;
+            Version dllVersion = module.Assembly.GetName().Version;
+
+            return
+                string.Format("{0}.{1}.{2}.{3}", dllVersion.Major, dllVersion.Minor, dllVersion.Build,
+                              dllVersion.Revision);
+        }
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLMigration.cs b/OpenSim/Data/PGSQL/PGSQLMigration.cs
new file mode 100644
index 0000000..709fde0
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLMigration.cs
@@ -0,0 +1,102 @@
+/*
+ * 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 Npgsql;
+using System;
+using System.Data;
+using System.Data.Common;
+using System.Reflection;
+
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLMigration : Migration
+    {
+        public PGSQLMigration(NpgsqlConnection conn, Assembly assem, string type)
+            : base(conn, assem, type)
+        {
+        }
+
+        public PGSQLMigration(NpgsqlConnection conn, Assembly assem, string subtype, string type)
+            : base(conn, assem, subtype, type)
+        {
+        }
+
+        protected override int FindVersion(DbConnection conn, string type)
+        {
+            int version = 0;
+            NpgsqlConnection lcConn = (NpgsqlConnection)conn;
+
+            using (NpgsqlCommand cmd = lcConn.CreateCommand())
+            {
+                try
+                {
+                    cmd.CommandText = "select version from migrations where name = '" + type + "' " + 
+                                      " order by version desc limit 1"; //Must be 
+                    using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                    {
+                        if (reader.Read())
+                        {
+                            version = Convert.ToInt32(reader["version"]);
+                        }
+                        reader.Close();
+                    }
+                }
+                catch
+                {
+                    // Return -1 to indicate table does not exist
+                    return -1;
+                }
+            }
+            return version;
+        }
+
+        protected override void ExecuteScript(DbConnection conn, string[] script)
+        {
+            if (!(conn is NpgsqlConnection))
+            {
+                base.ExecuteScript(conn, script);
+                return;
+            }
+
+            foreach (string sql in script)
+            {
+                try
+                {
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(sql, (NpgsqlConnection)conn))
+                    {
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+                catch (Exception)
+                {
+                    throw new Exception(sql);
+
+                }
+            }
+        }
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLOfflineIMData.cs b/OpenSim/Data/PGSQL/PGSQLOfflineIMData.cs
new file mode 100644
index 0000000..82e5ed8
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLOfflineIMData.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 System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using OpenSim.Framework;
+using OpenMetaverse;
+using Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLOfflineIMData : PGSQLGenericTableHandler<OfflineIMData>, IOfflineIMData
+    {
+        public PGSQLOfflineIMData(string connectionString, string realm)
+            : base(connectionString, realm, "IM_Store")
+        {
+        }
+
+        public void DeleteOld()
+        {
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                cmd.CommandText = String.Format("delete from {0} where \"TMStamp\" < CURRENT_DATE - INTERVAL '2 week'", m_Realm);
+         
+                ExecuteNonQuery(cmd);
+            }
+
+        }
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLPresenceData.cs b/OpenSim/Data/PGSQL/PGSQLPresenceData.cs
new file mode 100644
index 0000000..666de07
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLPresenceData.cs
@@ -0,0 +1,115 @@
+/*
+ * 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 Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    /// <summary>
+    /// A PGSQL Interface for the Presence Server
+    /// </summary>
+    public class PGSQLPresenceData : PGSQLGenericTableHandler<PresenceData>,
+            IPresenceData
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public PGSQLPresenceData(string connectionString, string realm) :
+                base(connectionString, realm, "Presence")
+        {
+        }
+
+        public PresenceData Get(UUID sessionID)
+        {
+            PresenceData[] ret = Get("SessionID", sessionID.ToString());
+
+            if (ret.Length == 0)
+                return null;
+
+            return ret[0];
+        }
+
+        public void LogoutRegionAgents(UUID regionID)
+        {
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+
+                cmd.CommandText = String.Format(@"DELETE FROM {0} WHERE ""RegionID""=:RegionID", m_Realm);
+
+                cmd.Parameters.Add(m_database.CreateParameter("RegionID", regionID));
+                cmd.Connection = conn;
+                conn.Open();
+                cmd.ExecuteNonQuery();
+            }
+        }
+
+        public bool ReportAgent(UUID sessionID, UUID regionID)
+        {
+            PresenceData[] pd = Get("SessionID", sessionID.ToString());
+            if (pd.Length == 0)
+                return false;
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+
+                cmd.CommandText = String.Format(@"UPDATE {0} SET 
+                                                ""RegionID"" = :RegionID
+                                        WHERE ""SessionID"" = :SessionID", m_Realm);
+
+                cmd.Parameters.Add(m_database.CreateParameter("SessionID", sessionID));
+                cmd.Parameters.Add(m_database.CreateParameter("RegionID", regionID));
+                cmd.Connection = conn;
+                conn.Open();
+                if (cmd.ExecuteNonQuery() == 0)
+                    return false;
+            }
+            return true;
+        }
+
+        public bool VerifyAgent(UUID agentId, UUID secureSessionID)
+        {
+            PresenceData[] ret = Get("SecureSessionID", secureSessionID.ToString());
+            
+            if (ret.Length == 0)
+                return false;
+
+            if(ret[0].UserID != agentId.ToString())
+                return false;
+
+            return true;
+        }
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLRegionData.cs b/OpenSim/Data/PGSQL/PGSQLRegionData.cs
new file mode 100644
index 0000000..8a46559
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLRegionData.cs
@@ -0,0 +1,392 @@
+/*
+ * 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.Drawing;
+using System.IO;
+using System.Reflection;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using RegionFlags = OpenSim.Framework.RegionFlags;
+using Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    /// <summary>
+    /// A PGSQL Interface for the Region Server.
+    /// </summary>
+    public class PGSQLRegionData : IRegionData
+    {
+        private string m_Realm;
+        private List<string> m_ColumnNames = null;
+        private string m_ConnectionString;
+        private PGSQLManager m_database;
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected Dictionary<string, string> m_FieldTypes = new Dictionary<string, string>();
+
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+
+        public PGSQLRegionData(string connectionString, string realm) 
+        {
+            m_Realm = realm;
+            m_ConnectionString = connectionString;
+            m_database = new PGSQLManager(connectionString);
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            {
+                conn.Open();
+                Migration m = new Migration(conn, GetType().Assembly, "GridStore");
+                m.Update();
+            }
+            LoadFieldTypes();
+         }
+
+        private void LoadFieldTypes()
+        {
+            m_FieldTypes = new Dictionary<string, string>();
+
+            string query = string.Format(@"select column_name,data_type
+                        from INFORMATION_SCHEMA.COLUMNS 
+                       where table_name = lower('{0}');
+
+                ", m_Realm);
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(query, conn))
+            {
+                conn.Open();
+                using (NpgsqlDataReader rdr = cmd.ExecuteReader())
+                {
+                    while (rdr.Read())
+                    {
+                        // query produces 0 to many rows of single column, so always add the first item in each row
+                        m_FieldTypes.Add((string)rdr[0], (string)rdr[1]);
+                    }
+                }
+            }
+        }
+
+        public List<RegionData> Get(string regionName, UUID scopeID)
+        {
+            string sql = "select * from "+m_Realm+" where lower(\"regionName\") like lower(:regionName) ";
+            if (scopeID != UUID.Zero)
+                sql += " and \"ScopeID\" = :scopeID";
+            sql += " order by lower(\"regionName\")";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("regionName", regionName));
+                if (scopeID != UUID.Zero) 
+                    cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
+                conn.Open();
+                return RunCommand(cmd);
+            }
+        }
+
+        public RegionData Get(int posX, int posY, UUID scopeID)
+        {
+            string sql = "select * from "+m_Realm+" where \"locX\" = :posX and \"locY\" = :posY";
+            if (scopeID != UUID.Zero)
+                sql += " and \"ScopeID\" = :scopeID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("posX", posX));
+                cmd.Parameters.Add(m_database.CreateParameter("posY", posY));
+                if (scopeID != UUID.Zero) 
+                    cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
+                conn.Open();
+                List<RegionData> ret = RunCommand(cmd);
+                if (ret.Count == 0)
+                    return null;
+
+                return ret[0];
+            }
+        }
+
+        public RegionData Get(UUID regionID, UUID scopeID)
+        {
+            string sql = "select * from "+m_Realm+" where uuid = :regionID";
+            if (scopeID != UUID.Zero)
+                sql += " and \"ScopeID\" = :scopeID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("regionID", regionID));
+                if (scopeID != UUID.Zero) 
+                    cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
+                conn.Open();
+                List<RegionData> ret = RunCommand(cmd);
+                if (ret.Count == 0)
+                    return null;
+
+                return ret[0];
+            }
+        }
+
+        public List<RegionData> Get(int startX, int startY, int endX, int endY, UUID scopeID)
+        {
+            string sql = "select * from "+m_Realm+" where \"locX\" between :startX and :endX and \"locY\" between :startY and :endY";
+            if (scopeID != UUID.Zero)
+                sql += " and \"ScopeID\" = :scopeID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("startX", startX));
+                cmd.Parameters.Add(m_database.CreateParameter("startY", startY));
+                cmd.Parameters.Add(m_database.CreateParameter("endX", endX));
+                cmd.Parameters.Add(m_database.CreateParameter("endY", endY));
+                cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
+                conn.Open();
+                return RunCommand(cmd);
+            }
+        }
+
+        public List<RegionData> RunCommand(NpgsqlCommand cmd)
+        {
+            List<RegionData> retList = new List<RegionData>();
+
+            NpgsqlDataReader result = cmd.ExecuteReader();
+
+            while (result.Read())
+            {
+                RegionData ret = new RegionData();
+                ret.Data = new Dictionary<string, object>();
+
+                UUID regionID;
+                UUID.TryParse(result["uuid"].ToString(), out regionID);
+                ret.RegionID = regionID;
+                UUID scope;
+                UUID.TryParse(result["ScopeID"].ToString(), out scope);
+                ret.ScopeID = scope;
+                ret.RegionName = result["regionName"].ToString();
+                ret.posX = Convert.ToInt32(result["locX"]);
+                ret.posY = Convert.ToInt32(result["locY"]);
+                ret.sizeX = Convert.ToInt32(result["sizeX"]);
+                ret.sizeY = Convert.ToInt32(result["sizeY"]);
+
+                if (m_ColumnNames == null)
+                {
+                    m_ColumnNames = new List<string>();
+
+                    DataTable schemaTable = result.GetSchemaTable();
+                    foreach (DataRow row in schemaTable.Rows)
+                        m_ColumnNames.Add(row["ColumnName"].ToString());
+                }
+
+                foreach (string s in m_ColumnNames)
+                {
+                    if (s == "uuid")
+                        continue;
+                    if (s == "ScopeID")
+                        continue;
+                    if (s == "regionName")
+                        continue;
+                    if (s == "locX")
+                        continue;
+                    if (s == "locY")
+                        continue;
+
+                    ret.Data[s] = result[s].ToString();
+                }
+
+                retList.Add(ret);
+            }
+            return retList;
+        }
+
+        public bool Store(RegionData data)
+        {
+            if (data.Data.ContainsKey("uuid"))
+                data.Data.Remove("uuid");
+            if (data.Data.ContainsKey("ScopeID"))
+                data.Data.Remove("ScopeID");
+            if (data.Data.ContainsKey("regionName"))
+                data.Data.Remove("regionName");
+            if (data.Data.ContainsKey("posX"))
+                data.Data.Remove("posX");
+            if (data.Data.ContainsKey("posY"))
+                data.Data.Remove("posY");
+            if (data.Data.ContainsKey("sizeX"))
+                data.Data.Remove("sizeX");
+            if (data.Data.ContainsKey("sizeY"))
+                data.Data.Remove("sizeY");
+            if (data.Data.ContainsKey("locX"))
+                data.Data.Remove("locX");
+            if (data.Data.ContainsKey("locY"))
+                data.Data.Remove("locY");
+
+            string[] fields = new List<string>(data.Data.Keys).ToArray();
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+
+                string update = "update " + m_Realm + " set \"locX\"=:posX, \"locY\"=:posY, \"sizeX\"=:sizeX, \"sizeY\"=:sizeY ";
+                
+                foreach (string field in fields)
+                {
+
+                    update += ", ";
+                    update += " \"" + field + "\" = :" + field;
+
+                    if (m_FieldTypes.ContainsKey(field))
+                        cmd.Parameters.Add(m_database.CreateParameter(field, data.Data[field], m_FieldTypes[field]));
+                    else
+                        cmd.Parameters.Add(m_database.CreateParameter(field, data.Data[field]));
+                }
+
+                update += " where uuid = :regionID";
+
+                if (data.ScopeID != UUID.Zero)
+                    update += " and \"ScopeID\" = :scopeID";
+
+                cmd.CommandText = update;
+                cmd.Connection = conn;
+                cmd.Parameters.Add(m_database.CreateParameter("regionID", data.RegionID));
+                cmd.Parameters.Add(m_database.CreateParameter("regionName", data.RegionName));
+                cmd.Parameters.Add(m_database.CreateParameter("scopeID", data.ScopeID));
+                cmd.Parameters.Add(m_database.CreateParameter("posX", data.posX));
+                cmd.Parameters.Add(m_database.CreateParameter("posY", data.posY));
+                cmd.Parameters.Add(m_database.CreateParameter("sizeX", data.sizeX));
+                cmd.Parameters.Add(m_database.CreateParameter("sizeY", data.sizeY));
+                conn.Open();
+                try
+                {
+                    if (cmd.ExecuteNonQuery() < 1)
+                    {
+                        string insert = "insert into " + m_Realm + " (uuid, \"ScopeID\", \"locX\", \"locY\", \"sizeX\", \"sizeY\", \"regionName\", \"" +
+                                String.Join("\", \"", fields) +
+                                "\") values (:regionID, :scopeID, :posX, :posY, :sizeX, :sizeY, :regionName, :" + String.Join(", :", fields) + ")";
+
+                        cmd.CommandText = insert;
+
+                        try
+                        {
+                            if (cmd.ExecuteNonQuery() < 1)
+                            {
+                                return false;
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            m_log.Warn("[PGSQL Grid]: Error inserting into Regions table: " + ex.Message + ", INSERT sql: " + insert);
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    m_log.Warn("[PGSQL Grid]: Error updating Regions table: " + ex.Message + ", UPDATE sql: " + update);
+                }
+            }
+
+            return true;
+        }
+
+        public bool SetDataItem(UUID regionID, string item, string value)
+        {
+            string sql = "update " + m_Realm +
+                    " set \"" + item + "\" = :" + item + " where uuid = :UUID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("" + item, value));
+                cmd.Parameters.Add(m_database.CreateParameter("UUID", regionID));
+                conn.Open();
+                if (cmd.ExecuteNonQuery() > 0)
+                    return true;
+            }
+            return false;
+        }
+
+        public bool Delete(UUID regionID)
+        {
+            string sql = "delete from " + m_Realm +
+                    " where uuid = :UUID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("UUID", regionID));
+                conn.Open();
+                if (cmd.ExecuteNonQuery() > 0)
+                    return true;
+            }
+            return false;
+        }
+
+        public List<RegionData> GetDefaultRegions(UUID scopeID)
+        {
+            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);
+            RegionDataDistanceCompare distanceComparer = new RegionDataDistanceCompare(x, y);
+            regions.Sort(distanceComparer);
+
+            return regions;
+        }
+
+        public List<RegionData> GetHyperlinks(UUID scopeID)
+        {
+            return Get((int)RegionFlags.Hyperlink, scopeID);
+        }
+
+        private List<RegionData> Get(int regionFlags, UUID scopeID)
+        {
+            string sql = "SELECT * FROM " + m_Realm + " WHERE (flags & " + regionFlags.ToString() + ") <> 0";
+            if (scopeID != UUID.Zero)
+                sql += " AND \"ScopeID\" = :scopeID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
+                conn.Open();
+                return RunCommand(cmd);
+            }
+        }
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
new file mode 100644
index 0000000..5753ae3
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
@@ -0,0 +1,2247 @@
+/*
+ * 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.Drawing;
+using System.IO;
+using System.Reflection;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    /// <summary>
+    /// A PGSQL Interface for the Region Server.
+    /// </summary>
+    public class PGSQLSimulationData : ISimulationDataStore
+    {
+        private const string _migrationStore = "RegionStore";
+
+        // private static FileSystemDataStore Instance = new FileSystemDataStore();
+        private static readonly ILog _Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        /// <summary>
+        /// The database manager
+        /// </summary>
+        private PGSQLManager _Database;
+        private string m_connectionString;
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+
+        public PGSQLSimulationData()
+        {
+        }
+
+        public PGSQLSimulationData(string connectionString)
+        {
+            Initialise(connectionString);
+        }
+
+        /// <summary>
+        /// Initialises the region datastore
+        /// </summary>
+        /// <param name="connectionString">The connection string.</param>
+        public void Initialise(string connectionString)
+        {
+            m_connectionString = connectionString;
+            _Database = new PGSQLManager(connectionString);
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(connectionString))
+            {
+                conn.Open();
+                //New Migration settings
+                Migration m = new Migration(conn, Assembly, "RegionStore");
+                m.Update();
+            }
+        }
+
+        /// <summary>
+        /// Dispose the database
+        /// </summary>
+        public void Dispose() { }
+
+        #region SceneObjectGroup region for loading and Store of the scene.
+
+        /// <summary>
+        /// Loads the objects present in the region.
+        /// </summary>
+        /// <param name="regionUUID">The region UUID.</param>
+        /// <returns></returns>
+        public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
+        {
+            UUID lastGroupID = UUID.Zero;
+
+            Dictionary<UUID, SceneObjectPart> prims = new Dictionary<UUID, SceneObjectPart>();
+            Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>();
+            SceneObjectGroup grp = null;
+
+            string sql = @"SELECT *, 
+                           CASE WHEN prims.""UUID"" = prims.""SceneGroupID"" THEN 0 ELSE 1 END as sort 
+                            FROM prims 
+                            LEFT JOIN primshapes ON prims.""UUID"" = primshapes.""UUID"" 
+                            WHERE ""RegionUUID"" = :RegionUUID 
+                            ORDER BY ""SceneGroupID"" asc, sort asc, ""LinkNumber"" asc";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
+            {
+                command.Parameters.Add(_Database.CreateParameter("regionUUID", regionUUID));
+                conn.Open();
+                using (NpgsqlDataReader reader = command.ExecuteReader())
+                {
+                    while (reader.Read())
+                    {
+                        SceneObjectPart sceneObjectPart = BuildPrim(reader);
+                        if (reader["Shape"] is DBNull)
+                            sceneObjectPart.Shape = PrimitiveBaseShape.Default;
+                        else
+                            sceneObjectPart.Shape = BuildShape(reader);
+
+                        prims[sceneObjectPart.UUID] = sceneObjectPart;
+
+                        UUID groupID = new UUID((Guid)reader["SceneGroupID"]);
+
+                        if (groupID != lastGroupID) // New SOG
+                        {
+                            if (grp != null)
+                                objects[grp.UUID] = grp;
+
+                            lastGroupID = groupID;
+
+                            // There sometimes exist OpenSim bugs that 'orphan groups' so that none of the prims are
+                            // recorded as the root prim (for which the UUID must equal the persisted group UUID).  In
+                            // this case, force the UUID to be the same as the group UUID so that at least these can be
+                            // deleted (we need to change the UUID so that any other prims in the linkset can also be 
+                            // deleted).
+                            if (sceneObjectPart.UUID != groupID && groupID != UUID.Zero)
+                            {
+                                _Log.WarnFormat(
+                                    "[REGION DB]: Found root prim {0} {1} at {2} where group was actually {3}.  Forcing UUID to group UUID",
+                                    sceneObjectPart.Name, sceneObjectPart.UUID, sceneObjectPart.GroupPosition, groupID);
+
+                                sceneObjectPart.UUID = groupID;
+                            }
+
+                            grp = new SceneObjectGroup(sceneObjectPart);
+                        }
+                        else
+                        {
+                            // Black magic to preserve link numbers
+                            // Why is this needed, fix this in AddPart method.
+                            int link = sceneObjectPart.LinkNum;
+
+                            grp.AddPart(sceneObjectPart);
+
+                            if (link != 0)
+                                sceneObjectPart.LinkNum = link;
+                        }
+                    }
+                }
+            }
+
+            if (grp != null)
+                objects[grp.UUID] = grp;
+
+            // Instead of attempting to LoadItems on every prim,
+            // most of which probably have no items... get a 
+            // list from DB of all prims which have items and
+            // LoadItems only on those
+            List<SceneObjectPart> primsWithInventory = new List<SceneObjectPart>();
+            string qry = "select distinct \"primID\" from primitems";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand command = new NpgsqlCommand(qry, conn))
+            {
+                conn.Open();
+                using (NpgsqlDataReader itemReader = command.ExecuteReader())
+                {
+                    while (itemReader.Read())
+                    {
+                        if (!(itemReader["primID"] is DBNull))
+                        {
+                            UUID primID = new UUID(itemReader["primID"].ToString());
+                            if (prims.ContainsKey(primID))
+                            {
+                                primsWithInventory.Add(prims[primID]);
+                            }
+                        }
+                    }
+                }
+            }
+
+            LoadItems(primsWithInventory);
+
+            _Log.DebugFormat("[REGION DB]: Loaded {0} objects using {1} prims", objects.Count, prims.Count);
+
+            return new List<SceneObjectGroup>(objects.Values);
+        }
+
+        /// <summary>
+        /// Load in the prim's persisted inventory.
+        /// </summary>
+        /// <param name="allPrims">all prims with inventory on a region</param>
+        private void LoadItems(List<SceneObjectPart> allPrimsWithInventory)
+        {
+            string sql = @"SELECT * FROM primitems WHERE ""primID"" = :PrimID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
+            {
+                conn.Open();
+                foreach (SceneObjectPart objectPart in allPrimsWithInventory)
+                {
+                    command.Parameters.Clear();
+                    command.Parameters.Add(_Database.CreateParameter("PrimID", objectPart.UUID));
+
+                    List<TaskInventoryItem> inventory = new List<TaskInventoryItem>();
+
+                    using (NpgsqlDataReader reader = command.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            TaskInventoryItem item = BuildItem(reader);
+
+                            item.ParentID = objectPart.UUID; // Values in database are
+                            // often wrong
+                            inventory.Add(item);
+                        }
+                    }
+
+                    objectPart.Inventory.RestoreInventoryItems(inventory);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Stores all object's details apart from inventory
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <param name="regionUUID"></param>
+        public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
+        {
+            uint flags = obj.RootPart.GetEffectiveObjectFlags();
+            // Eligibility check
+            //
+            if ((flags & (uint)PrimFlags.Temporary) != 0)
+                return;
+            if ((flags & (uint)PrimFlags.TemporaryOnRez) != 0)
+                return;
+
+            //_Log.DebugFormat("[PGSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Parts.Length);
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                NpgsqlTransaction transaction = conn.BeginTransaction();
+
+                try
+                {
+                    foreach (SceneObjectPart sceneObjectPart in obj.Parts)
+                    {
+                        //Update prim
+                        using (NpgsqlCommand sqlCommand = conn.CreateCommand())
+                        {
+                            sqlCommand.Transaction = transaction;
+                            try
+                            {
+                                StoreSceneObjectPrim(sceneObjectPart, sqlCommand, obj.UUID, regionUUID);
+                            }
+                            catch (NpgsqlException sqlEx)
+                            {
+                                _Log.ErrorFormat("[REGION DB]: Store SceneObjectPrim SQL error: {0} at line {1}", sqlEx.Message, sqlEx.Line);
+                                throw;
+                            }
+                        }
+
+                        //Update primshapes
+                        using (NpgsqlCommand sqlCommand = conn.CreateCommand())
+                        {
+                            sqlCommand.Transaction = transaction;
+                            try
+                            {
+                                StoreSceneObjectPrimShapes(sceneObjectPart, sqlCommand, obj.UUID, regionUUID);
+                            }
+                            catch (NpgsqlException sqlEx)
+                            {
+                                _Log.ErrorFormat("[REGION DB]: Store SceneObjectPrimShapes SQL error: {0} at line {1}", sqlEx.Message, sqlEx.Line);
+                                throw;
+                            }
+                        }
+                    }
+
+                    transaction.Commit();
+                }
+                catch (Exception ex)
+                {
+                    _Log.ErrorFormat("[REGION DB]: Store SceneObjectGroup error: {0}, Rolling back...", ex.Message);
+                    try
+                    {
+                        transaction.Rollback();
+                    }
+                    catch (Exception ex2)
+                    {
+                        //Show error
+                        _Log.InfoFormat("[REGION DB]: Rollback of SceneObjectGroup store transaction failed with error: {0}", ex2.Message);
+
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Stores the prim of the sceneobjectpart.
+        /// </summary>
+        /// <param name="sceneObjectPart">The sceneobjectpart or prim.</param>
+        /// <param name="sqlCommand">The SQL command with the transaction.</param>
+        /// <param name="sceneGroupID">The scenegroup UUID.</param>
+        /// <param name="regionUUID">The region UUID.</param>
+        private void StoreSceneObjectPrim(SceneObjectPart sceneObjectPart, NpgsqlCommand sqlCommand, UUID sceneGroupID, UUID regionUUID)
+        {
+            //Big query to update or insert a new prim.
+            
+            string queryPrims = @"
+        UPDATE prims SET 
+            ""CreationDate"" = :CreationDate, ""Name"" = :Name, ""Text"" = :Text, ""Description"" = :Description, ""SitName"" = :SitName, 
+            ""TouchName"" = :TouchName, ""ObjectFlags"" = :ObjectFlags, ""OwnerMask"" = :OwnerMask, ""NextOwnerMask"" = :NextOwnerMask, ""GroupMask"" = :GroupMask, 
+            ""EveryoneMask"" = :EveryoneMask, ""BaseMask"" = :BaseMask, ""PositionX"" = :PositionX, ""PositionY"" = :PositionY, ""PositionZ"" = :PositionZ, 
+            ""GroupPositionX"" = :GroupPositionX, ""GroupPositionY"" = :GroupPositionY, ""GroupPositionZ"" = :GroupPositionZ, ""VelocityX"" = :VelocityX, 
+            ""VelocityY"" = :VelocityY, ""VelocityZ"" = :VelocityZ, ""AngularVelocityX"" = :AngularVelocityX, ""AngularVelocityY"" = :AngularVelocityY, 
+            ""AngularVelocityZ"" = :AngularVelocityZ, ""AccelerationX"" = :AccelerationX, ""AccelerationY"" = :AccelerationY, 
+            ""AccelerationZ"" = :AccelerationZ, ""RotationX"" = :RotationX, ""RotationY"" = :RotationY, ""RotationZ"" = :RotationZ, ""RotationW"" = :RotationW, 
+            ""SitTargetOffsetX"" = :SitTargetOffsetX, ""SitTargetOffsetY"" = :SitTargetOffsetY, ""SitTargetOffsetZ"" = :SitTargetOffsetZ, 
+            ""SitTargetOrientW"" = :SitTargetOrientW, ""SitTargetOrientX"" = :SitTargetOrientX, ""SitTargetOrientY"" = :SitTargetOrientY, 
+            ""SitTargetOrientZ"" = :SitTargetOrientZ, ""RegionUUID"" = :RegionUUID, ""CreatorID"" = :CreatorID, ""OwnerID"" = :OwnerID, ""GroupID"" = :GroupID, 
+            ""LastOwnerID"" = :LastOwnerID, ""SceneGroupID"" = :SceneGroupID, ""PayPrice"" = :PayPrice, ""PayButton1"" = :PayButton1, ""PayButton2"" = :PayButton2, 
+            ""PayButton3"" = :PayButton3, ""PayButton4"" = :PayButton4, ""LoopedSound"" = :LoopedSound, ""LoopedSoundGain"" = :LoopedSoundGain, 
+            ""TextureAnimation"" = :TextureAnimation, ""OmegaX"" = :OmegaX, ""OmegaY"" = :OmegaY, ""OmegaZ"" = :OmegaZ, ""CameraEyeOffsetX"" = :CameraEyeOffsetX, 
+            ""CameraEyeOffsetY"" = :CameraEyeOffsetY, ""CameraEyeOffsetZ"" = :CameraEyeOffsetZ, ""CameraAtOffsetX"" = :CameraAtOffsetX, 
+            ""CameraAtOffsetY"" = :CameraAtOffsetY, ""CameraAtOffsetZ"" = :CameraAtOffsetZ, ""ForceMouselook"" = :ForceMouselook, 
+            ""ScriptAccessPin"" = :ScriptAccessPin, ""AllowedDrop"" = :AllowedDrop, ""DieAtEdge"" = :DieAtEdge, ""SalePrice"" = :SalePrice, 
+            ""SaleType"" = :SaleType, ""ColorR"" = :ColorR, ""ColorG"" = :ColorG, ""ColorB"" = :ColorB, ""ColorA"" = :ColorA, ""ParticleSystem"" = :ParticleSystem, 
+            ""ClickAction"" = :ClickAction, ""Material"" = :Material, ""CollisionSound"" = :CollisionSound, ""CollisionSoundVolume"" = :CollisionSoundVolume, ""PassTouches"" = :PassTouches,
+            ""LinkNumber"" = :LinkNumber, ""MediaURL"" = :MediaURL, ""DynAttrs"" = :DynAttrs,
+            ""PhysicsShapeType"" = :PhysicsShapeType, ""Density"" = :Density, ""GravityModifier"" = :GravityModifier, ""Friction"" = :Friction, ""Restitution"" = :Restitution
+        WHERE ""UUID"" = :UUID ;
+
+        INSERT INTO 
+            prims (
+            ""UUID"", ""CreationDate"", ""Name"", ""Text"", ""Description"", ""SitName"", ""TouchName"", ""ObjectFlags"", ""OwnerMask"", ""NextOwnerMask"", ""GroupMask"",
+            ""EveryoneMask"", ""BaseMask"", ""PositionX"", ""PositionY"", ""PositionZ"", ""GroupPositionX"", ""GroupPositionY"", ""GroupPositionZ"", ""VelocityX"", 
+            ""VelocityY"", ""VelocityZ"", ""AngularVelocityX"", ""AngularVelocityY"", ""AngularVelocityZ"", ""AccelerationX"", ""AccelerationY"", ""AccelerationZ"", 
+            ""RotationX"", ""RotationY"", ""RotationZ"", ""RotationW"", ""SitTargetOffsetX"", ""SitTargetOffsetY"", ""SitTargetOffsetZ"", ""SitTargetOrientW"", 
+            ""SitTargetOrientX"", ""SitTargetOrientY"", ""SitTargetOrientZ"", ""RegionUUID"", ""CreatorID"", ""OwnerID"", ""GroupID"", ""LastOwnerID"", ""SceneGroupID"", 
+            ""PayPrice"", ""PayButton1"", ""PayButton2"", ""PayButton3"", ""PayButton4"", ""LoopedSound"", ""LoopedSoundGain"", ""TextureAnimation"", ""OmegaX"", 
+            ""OmegaY"", ""OmegaZ"", ""CameraEyeOffsetX"", ""CameraEyeOffsetY"", ""CameraEyeOffsetZ"", ""CameraAtOffsetX"", ""CameraAtOffsetY"", ""CameraAtOffsetZ"", 
+            ""ForceMouselook"", ""ScriptAccessPin"", ""AllowedDrop"", ""DieAtEdge"", ""SalePrice"", ""SaleType"", ""ColorR"", ""ColorG"", ""ColorB"", ""ColorA"", 
+            ""ParticleSystem"", ""ClickAction"", ""Material"", ""CollisionSound"", ""CollisionSoundVolume"", ""PassTouches"", ""LinkNumber"", ""MediaURL"", ""DynAttrs"",
+            ""PhysicsShapeType"", ""Density"", ""GravityModifier"", ""Friction"", ""Restitution""
+            ) Select 
+            :UUID, :CreationDate, :Name, :Text, :Description, :SitName, :TouchName, :ObjectFlags, :OwnerMask, :NextOwnerMask, :GroupMask, 
+            :EveryoneMask, :BaseMask, :PositionX, :PositionY, :PositionZ, :GroupPositionX, :GroupPositionY, :GroupPositionZ, :VelocityX, 
+            :VelocityY, :VelocityZ, :AngularVelocityX, :AngularVelocityY, :AngularVelocityZ, :AccelerationX, :AccelerationY, :AccelerationZ, 
+            :RotationX, :RotationY, :RotationZ, :RotationW, :SitTargetOffsetX, :SitTargetOffsetY, :SitTargetOffsetZ, :SitTargetOrientW, 
+            :SitTargetOrientX, :SitTargetOrientY, :SitTargetOrientZ, :RegionUUID, :CreatorID, :OwnerID, :GroupID, :LastOwnerID, :SceneGroupID, 
+            :PayPrice, :PayButton1, :PayButton2, :PayButton3, :PayButton4, :LoopedSound, :LoopedSoundGain, :TextureAnimation, :OmegaX, 
+            :OmegaY, :OmegaZ, :CameraEyeOffsetX, :CameraEyeOffsetY, :CameraEyeOffsetZ, :CameraAtOffsetX, :CameraAtOffsetY, :CameraAtOffsetZ, 
+            :ForceMouselook, :ScriptAccessPin, :AllowedDrop, :DieAtEdge, :SalePrice, :SaleType, :ColorR, :ColorG, :ColorB, :ColorA, 
+            :ParticleSystem, :ClickAction, :Material, :CollisionSound, :CollisionSoundVolume, :PassTouches, :LinkNumber, :MediaURL, :DynAttrs,
+            :PhysicsShapeType, :Density, :GravityModifier, :Friction, :Restitution
+            where not EXISTS (SELECT ""UUID"" FROM prims WHERE ""UUID"" = :UUID);
+        ";
+
+            //Set commandtext.
+            sqlCommand.CommandText = queryPrims;
+            //Add parameters
+            sqlCommand.Parameters.AddRange(CreatePrimParameters(sceneObjectPart, sceneGroupID, regionUUID));
+
+            //Execute the query. If it fails then error is trapped in calling function
+            sqlCommand.ExecuteNonQuery();
+        }
+
+        /// <summary>
+        /// Stores the scene object prim shapes.
+        /// </summary>
+        /// <param name="sceneObjectPart">The sceneobjectpart containing prim shape.</param>
+        /// <param name="sqlCommand">The SQL command with the transaction.</param>
+        /// <param name="sceneGroupID">The scenegroup UUID.</param>
+        /// <param name="regionUUID">The region UUID.</param>
+        private void StoreSceneObjectPrimShapes(SceneObjectPart sceneObjectPart, NpgsqlCommand sqlCommand, UUID sceneGroupID, UUID regionUUID)
+        {
+            //Big query to or insert or update primshapes
+            
+            string queryPrimShapes = @"
+        UPDATE primshapes SET 
+            ""Shape"" = :Shape, ""ScaleX"" = :ScaleX, ""ScaleY"" = :ScaleY, ""ScaleZ"" = :ScaleZ, ""PCode"" = :PCode, ""PathBegin"" = :PathBegin, 
+            ""PathEnd"" = :PathEnd, ""PathScaleX"" = :PathScaleX, ""PathScaleY"" = :PathScaleY, ""PathShearX"" = :PathShearX, ""PathShearY"" = :PathShearY, 
+            ""PathSkew"" = :PathSkew, ""PathCurve"" = :PathCurve, ""PathRadiusOffset"" = :PathRadiusOffset, ""PathRevolutions"" = :PathRevolutions, 
+            ""PathTaperX"" = :PathTaperX, ""PathTaperY"" = :PathTaperY, ""PathTwist"" = :PathTwist, ""PathTwistBegin"" = :PathTwistBegin, 
+            ""ProfileBegin"" = :ProfileBegin, ""ProfileEnd"" = :ProfileEnd, ""ProfileCurve"" = :ProfileCurve, ""ProfileHollow"" = :ProfileHollow, 
+            ""Texture"" = :Texture, ""ExtraParams"" = :ExtraParams, ""State"" = :State, ""Media"" = :Media
+        WHERE ""UUID"" = :UUID ;
+
+        INSERT INTO 
+            primshapes (
+            ""UUID"", ""Shape"", ""ScaleX"", ""ScaleY"", ""ScaleZ"", ""PCode"", ""PathBegin"", ""PathEnd"", ""PathScaleX"", ""PathScaleY"", ""PathShearX"", ""PathShearY"", 
+            ""PathSkew"", ""PathCurve"", ""PathRadiusOffset"", ""PathRevolutions"", ""PathTaperX"", ""PathTaperY"", ""PathTwist"", ""PathTwistBegin"", ""ProfileBegin"", 
+            ""ProfileEnd"", ""ProfileCurve"", ""ProfileHollow"", ""Texture"", ""ExtraParams"", ""State"", ""Media""
+            ) 
+            Select
+            :UUID, :Shape, :ScaleX, :ScaleY, :ScaleZ, :PCode, :PathBegin, :PathEnd, :PathScaleX, :PathScaleY, :PathShearX, :PathShearY, 
+            :PathSkew, :PathCurve, :PathRadiusOffset, :PathRevolutions, :PathTaperX, :PathTaperY, :PathTwist, :PathTwistBegin, :ProfileBegin, 
+            :ProfileEnd, :ProfileCurve, :ProfileHollow, :Texture, :ExtraParams, :State, :Media
+        where not EXISTS (SELECT ""UUID"" FROM primshapes WHERE ""UUID"" = :UUID);
+        ";
+
+            //Set commandtext.
+            sqlCommand.CommandText = queryPrimShapes;
+
+            //Add parameters
+            sqlCommand.Parameters.AddRange(CreatePrimShapeParameters(sceneObjectPart, sceneGroupID, regionUUID));
+
+            //Execute the query. If it fails then error is trapped in calling function
+            sqlCommand.ExecuteNonQuery();
+
+        }
+
+        /// <summary>
+        /// Removes a object from the database.
+        /// Meaning removing it from tables Prims, PrimShapes and PrimItems
+        /// </summary>
+        /// <param name="objectID">id of scenegroup</param>
+        /// <param name="regionUUID">regionUUID (is this used anyway</param>
+        public void RemoveObject(UUID objectID, UUID regionUUID)
+        {
+            //_Log.InfoFormat("[PGSQL]: Removing obj: {0} from region: {1}", objectID, regionUUID);
+
+            //Remove from prims and primsitem table
+            string sqlPrims = @"DELETE FROM PRIMS WHERE ""SceneGroupID"" = :objectID";
+            string sqlPrimItems = @"DELETE FROM PRIMITEMS WHERE ""primID"" in (SELECT ""UUID"" FROM PRIMS WHERE ""SceneGroupID"" = :objectID)";
+            string sqlPrimShapes = @"DELETE FROM PRIMSHAPES WHERE ""UUID"" in (SELECT ""UUID"" FROM PRIMS WHERE ""SceneGroupID"" = :objectID)";
+
+            lock (_Database)
+            {
+                //Using the non transaction mode.
+                using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+                using (NpgsqlCommand cmd = new NpgsqlCommand())
+                {
+                    cmd.Connection = conn;
+                    cmd.CommandText = sqlPrimShapes;
+                    conn.Open();
+                    cmd.Parameters.Add(_Database.CreateParameter("objectID", objectID));
+                    cmd.ExecuteNonQuery();
+
+                    cmd.CommandText = sqlPrimItems;
+                    cmd.ExecuteNonQuery();
+
+                    cmd.CommandText = sqlPrims;
+                    cmd.ExecuteNonQuery();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Store the inventory of a prim. Warning deletes everything first and then adds all again.
+        /// </summary>
+        /// <param name="primID"></param>
+        /// <param name="items"></param>
+        public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
+        {
+            //_Log.InfoFormat("[REGION DB: Persisting Prim Inventory with prim ID {0}", primID);
+
+            //Statement from PGSQL section!
+            // For now, we're just going to crudely remove all the previous inventory items
+            // no matter whether they have changed or not, and replace them with the current set.
+
+            //Delete everything from PrimID
+            //TODO add index on PrimID in DB, if not already exist
+
+            string sql = @"delete from primitems where ""primID"" = :primID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("primID", primID));
+                conn.Open();
+                cmd.ExecuteNonQuery();
+            }
+
+            sql =
+                @"INSERT INTO primitems (
+            ""itemID"",""primID"",""assetID"",""parentFolderID"",""invType"",""assetType"",""name"",""description"",""creationDate"",""creatorID"",""ownerID"",""lastOwnerID"",""groupID"",
+            ""nextPermissions"",""currentPermissions"",""basePermissions"",""everyonePermissions"",""groupPermissions"",""flags"") 
+            VALUES (:itemID,:primID,:assetID,:parentFolderID,:invType,:assetType,:name,:description,:creationDate,:creatorID,:ownerID,
+            :lastOwnerID,:groupID,:nextPermissions,:currentPermissions,:basePermissions,:everyonePermissions,:groupPermissions,:flags)";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                conn.Open();
+                foreach (TaskInventoryItem taskItem in items)
+                {
+                    cmd.Parameters.AddRange(CreatePrimInventoryParameters(taskItem));
+                    cmd.ExecuteNonQuery();
+                    cmd.Parameters.Clear();
+                }
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Loads the terrain map.
+        /// </summary>
+        /// <param name="regionID">regionID.</param>
+        /// <returns></returns>
+        public double[,] LoadTerrain(UUID regionID)
+        {
+            double[,] terrain = new double[(int)Constants.RegionSize, (int)Constants.RegionSize];
+            terrain.Initialize();
+
+            string sql = @"select ""RegionUUID"", ""Revision"", ""Heightfield"" from terrain 
+                            where ""RegionUUID"" = :RegionUUID order by ""Revision"" desc limit 1; ";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                // PGSqlParameter param = new PGSqlParameter();
+                cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", regionID));
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    int rev;
+                    if (reader.Read())
+                    {
+                        MemoryStream str = new MemoryStream((byte[])reader["Heightfield"]);
+                        BinaryReader br = new BinaryReader(str);
+                        for (int x = 0; x < (int)Constants.RegionSize; x++)
+                        {
+                            for (int y = 0; y < (int)Constants.RegionSize; y++)
+                            {
+                                terrain[x, y] = br.ReadDouble();
+                            }
+                        }
+                        rev = (int)reader["Revision"];
+                    }
+                    else
+                    {
+                        _Log.Info("[REGION DB]: No terrain found for region");
+                        return null;
+                    }
+                    _Log.Info("[REGION DB]: Loaded terrain revision r" + rev);
+                }
+            }
+
+            return terrain;
+        }
+
+        /// <summary>
+        /// Stores the terrain map to DB.
+        /// </summary>
+        /// <param name="terrain">terrain map data.</param>
+        /// <param name="regionID">regionID.</param>
+        public void StoreTerrain(double[,] terrain, UUID regionID)
+        {
+            int revision = Util.UnixTimeSinceEpoch();
+
+            //Delete old terrain map
+            string sql = @"delete from terrain where ""RegionUUID""=:RegionUUID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", regionID));
+                conn.Open();
+                cmd.ExecuteNonQuery();
+            }
+
+            _Log.Info("[REGION DB]: Deleted terrain revision r " + revision);
+
+            sql = @"insert into terrain(""RegionUUID"", ""Revision"", ""Heightfield"") values(:RegionUUID, :Revision, :Heightfield)";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", regionID));
+                cmd.Parameters.Add(_Database.CreateParameter("Revision", revision));
+                cmd.Parameters.Add(_Database.CreateParameter("Heightfield", serializeTerrain(terrain)));
+                conn.Open();
+                cmd.ExecuteNonQuery();
+            }
+
+            _Log.Info("[REGION DB]: Stored terrain revision r " + revision);
+        }
+
+        /// <summary>
+        /// Loads all the land objects of a region.
+        /// </summary>
+        /// <param name="regionUUID">The region UUID.</param>
+        /// <returns></returns>
+        public List<LandData> LoadLandObjects(UUID regionUUID)
+        {
+            List<LandData> LandDataForRegion = new List<LandData>();
+
+            string sql = @"select * from land where ""RegionUUID"" = :RegionUUID";
+
+            //Retrieve all land data from region
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", regionUUID));
+                conn.Open();
+                using (NpgsqlDataReader readerLandData = cmd.ExecuteReader())
+                {
+                    while (readerLandData.Read())
+                    {
+                        LandDataForRegion.Add(BuildLandData(readerLandData));
+                    }
+                }
+            }
+
+            //Retrieve all accesslist data for all landdata
+            foreach (LandData LandData in LandDataForRegion)
+            {
+                sql = @"select * from landaccesslist where ""LandUUID"" = :LandUUID";
+                using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    cmd.Parameters.Add(_Database.CreateParameter("LandUUID", LandData.GlobalID));
+                    conn.Open();
+                    using (NpgsqlDataReader readerAccessList = cmd.ExecuteReader())
+                    {
+                        while (readerAccessList.Read())
+                        {
+                            LandData.ParcelAccessList.Add(BuildLandAccessData(readerAccessList));
+                        }
+                    }
+                }
+            }
+
+            //Return data
+            return LandDataForRegion;
+        }
+
+        /// <summary>
+        /// Stores land object with landaccess list.
+        /// </summary>
+        /// <param name="parcel">parcel data.</param>
+        public void StoreLandObject(ILandObject parcel)
+        {
+            //As this is only one record in land table I just delete all and then add a new record.
+            //As the delete landaccess is already in the pgsql code
+
+            //Delete old values
+            RemoveLandObject(parcel.LandData.GlobalID);
+
+            //Insert new values
+            string sql = @"INSERT INTO land
+                (""UUID"",""RegionUUID"",""LocalLandID"",""Bitmap"",""Name"",""Description"",""OwnerUUID"",""IsGroupOwned"",""Area"",""AuctionID"",""Category"",""ClaimDate"",""ClaimPrice"",
+                 ""GroupUUID"",""SalePrice"",""LandStatus"",""LandFlags"",""LandingType"",""MediaAutoScale"",""MediaTextureUUID"",""MediaURL"",""MusicURL"",""PassHours"",""PassPrice"",
+                 ""SnapshotUUID"",""UserLocationX"",""UserLocationY"",""UserLocationZ"",""UserLookAtX"",""UserLookAtY"",""UserLookAtZ"",""AuthbuyerID"",""OtherCleanTime"")
+                VALUES
+                (:UUID,:RegionUUID,:LocalLandID,:Bitmap,:Name,:Description,:OwnerUUID,:IsGroupOwned,:Area,:AuctionID,:Category,:ClaimDate,:ClaimPrice,
+                 :GroupUUID,:SalePrice,:LandStatus,:LandFlags,:LandingType,:MediaAutoScale,:MediaTextureUUID,:MediaURL,:MusicURL,:PassHours,:PassPrice,
+                 :SnapshotUUID,:UserLocationX,:UserLocationY,:UserLocationZ,:UserLookAtX,:UserLookAtY,:UserLookAtZ,:AuthbuyerID,:OtherCleanTime)";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.AddRange(CreateLandParameters(parcel.LandData, parcel.RegionUUID));
+                conn.Open();
+                cmd.ExecuteNonQuery();
+            }
+
+            sql = @"INSERT INTO landaccesslist (""LandUUID"",""AccessUUID"",""LandFlags"",""Expires"") VALUES (:LandUUID,:AccessUUID,:Flags,:Expires)";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                conn.Open();
+                foreach (LandAccessEntry parcelAccessEntry in parcel.LandData.ParcelAccessList)
+                {
+                    cmd.Parameters.AddRange(CreateLandAccessParameters(parcelAccessEntry, parcel.RegionUUID));
+
+                    cmd.ExecuteNonQuery();
+                    cmd.Parameters.Clear();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Removes a land object from DB.
+        /// </summary>
+        /// <param name="globalID">UUID of landobject</param>
+        public void RemoveLandObject(UUID globalID)
+        {
+            string sql = @"delete from land where ""UUID""=:UUID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("UUID", globalID));
+                conn.Open();
+                cmd.ExecuteNonQuery();
+            }
+            sql = @"delete from landaccesslist where ""LandUUID""=:UUID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("UUID", globalID));
+                conn.Open();
+                cmd.ExecuteNonQuery();
+            }
+        }
+        public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
+        {
+            RegionLightShareData nWP = new RegionLightShareData();
+            nWP.OnSave += StoreRegionWindlightSettings;
+
+            string sql = @"select * from regionwindlight where ""region_id"" = :regionID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("regionID", regionUUID));
+                conn.Open();
+                using (NpgsqlDataReader result = cmd.ExecuteReader())
+                {
+                    if (!result.Read())
+                    {
+                        //No result, so store our default windlight profile and return it
+                        nWP.regionID = regionUUID;
+                        StoreRegionWindlightSettings(nWP);
+                        return nWP;
+                    }
+                    else
+                    {
+                        nWP.regionID = DBGuid.FromDB(result["region_id"]);
+                        nWP.waterColor.X = Convert.ToSingle(result["water_color_r"]);
+                        nWP.waterColor.Y = Convert.ToSingle(result["water_color_g"]);
+                        nWP.waterColor.Z = Convert.ToSingle(result["water_color_b"]);
+                        nWP.waterFogDensityExponent = Convert.ToSingle(result["water_fog_density_exponent"]);
+                        nWP.underwaterFogModifier = Convert.ToSingle(result["underwater_fog_modifier"]);
+                        nWP.reflectionWaveletScale.X = Convert.ToSingle(result["reflection_wavelet_scale_1"]);
+                        nWP.reflectionWaveletScale.Y = Convert.ToSingle(result["reflection_wavelet_scale_2"]);
+                        nWP.reflectionWaveletScale.Z = Convert.ToSingle(result["reflection_wavelet_scale_3"]);
+                        nWP.fresnelScale = Convert.ToSingle(result["fresnel_scale"]);
+                        nWP.fresnelOffset = Convert.ToSingle(result["fresnel_offset"]);
+                        nWP.refractScaleAbove = Convert.ToSingle(result["refract_scale_above"]);
+                        nWP.refractScaleBelow = Convert.ToSingle(result["refract_scale_below"]);
+                        nWP.blurMultiplier = Convert.ToSingle(result["blur_multiplier"]);
+                        nWP.bigWaveDirection.X = Convert.ToSingle(result["big_wave_direction_x"]);
+                        nWP.bigWaveDirection.Y = Convert.ToSingle(result["big_wave_direction_y"]);
+                        nWP.littleWaveDirection.X = Convert.ToSingle(result["little_wave_direction_x"]);
+                        nWP.littleWaveDirection.Y = Convert.ToSingle(result["little_wave_direction_y"]);
+                        UUID.TryParse(result["normal_map_texture"].ToString(), out nWP.normalMapTexture);
+                        nWP.horizon.X = Convert.ToSingle(result["horizon_r"]);
+                        nWP.horizon.Y = Convert.ToSingle(result["horizon_g"]);
+                        nWP.horizon.Z = Convert.ToSingle(result["horizon_b"]);
+                        nWP.horizon.W = Convert.ToSingle(result["horizon_i"]);
+                        nWP.hazeHorizon = Convert.ToSingle(result["haze_horizon"]);
+                        nWP.blueDensity.X = Convert.ToSingle(result["blue_density_r"]);
+                        nWP.blueDensity.Y = Convert.ToSingle(result["blue_density_g"]);
+                        nWP.blueDensity.Z = Convert.ToSingle(result["blue_density_b"]);
+                        nWP.blueDensity.W = Convert.ToSingle(result["blue_density_i"]);
+                        nWP.hazeDensity = Convert.ToSingle(result["haze_density"]);
+                        nWP.densityMultiplier = Convert.ToSingle(result["density_multiplier"]);
+                        nWP.distanceMultiplier = Convert.ToSingle(result["distance_multiplier"]);
+                        nWP.maxAltitude = Convert.ToUInt16(result["max_altitude"]);
+                        nWP.sunMoonColor.X = Convert.ToSingle(result["sun_moon_color_r"]);
+                        nWP.sunMoonColor.Y = Convert.ToSingle(result["sun_moon_color_g"]);
+                        nWP.sunMoonColor.Z = Convert.ToSingle(result["sun_moon_color_b"]);
+                        nWP.sunMoonColor.W = Convert.ToSingle(result["sun_moon_color_i"]);
+                        nWP.sunMoonPosition = Convert.ToSingle(result["sun_moon_position"]);
+                        nWP.ambient.X = Convert.ToSingle(result["ambient_r"]);
+                        nWP.ambient.Y = Convert.ToSingle(result["ambient_g"]);
+                        nWP.ambient.Z = Convert.ToSingle(result["ambient_b"]);
+                        nWP.ambient.W = Convert.ToSingle(result["ambient_i"]);
+                        nWP.eastAngle = Convert.ToSingle(result["east_angle"]);
+                        nWP.sunGlowFocus = Convert.ToSingle(result["sun_glow_focus"]);
+                        nWP.sunGlowSize = Convert.ToSingle(result["sun_glow_size"]);
+                        nWP.sceneGamma = Convert.ToSingle(result["scene_gamma"]);
+                        nWP.starBrightness = Convert.ToSingle(result["star_brightness"]);
+                        nWP.cloudColor.X = Convert.ToSingle(result["cloud_color_r"]);
+                        nWP.cloudColor.Y = Convert.ToSingle(result["cloud_color_g"]);
+                        nWP.cloudColor.Z = Convert.ToSingle(result["cloud_color_b"]);
+                        nWP.cloudColor.W = Convert.ToSingle(result["cloud_color_i"]);
+                        nWP.cloudXYDensity.X = Convert.ToSingle(result["cloud_x"]);
+                        nWP.cloudXYDensity.Y = Convert.ToSingle(result["cloud_y"]);
+                        nWP.cloudXYDensity.Z = Convert.ToSingle(result["cloud_density"]);
+                        nWP.cloudCoverage = Convert.ToSingle(result["cloud_coverage"]);
+                        nWP.cloudScale = Convert.ToSingle(result["cloud_scale"]);
+                        nWP.cloudDetailXYDensity.X = Convert.ToSingle(result["cloud_detail_x"]);
+                        nWP.cloudDetailXYDensity.Y = Convert.ToSingle(result["cloud_detail_y"]);
+                        nWP.cloudDetailXYDensity.Z = Convert.ToSingle(result["cloud_detail_density"]);
+                        nWP.cloudScrollX = Convert.ToSingle(result["cloud_scroll_x"]);
+                        nWP.cloudScrollXLock = Convert.ToBoolean(result["cloud_scroll_x_lock"]);
+                        nWP.cloudScrollY = Convert.ToSingle(result["cloud_scroll_y"]);
+                        nWP.cloudScrollYLock = Convert.ToBoolean(result["cloud_scroll_y_lock"]);
+                        nWP.drawClassicClouds = Convert.ToBoolean(result["draw_classic_clouds"]);
+                        nWP.valid = true;
+                    }
+                }
+            }
+            return nWP;
+        }
+
+        public void RemoveRegionWindlightSettings(UUID regionID)
+        {
+            string sql = @"delete from regionwindlight where ""region_id"" = :region_id";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                conn.Open();
+                cmd.Parameters.Add(_Database.CreateParameter("region_id", regionID));
+                cmd.ExecuteNonQuery();
+            }
+        }
+
+        public void StoreRegionWindlightSettings(RegionLightShareData wl)
+        {
+            string sql = @"select count (region_id) from regionwindlight where ""region_id"" = :region_id ;";
+            bool exists = false;
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID));
+                    exists = (int)cmd.ExecuteScalar() > 0;
+                }
+            }
+            if (exists)
+            {
+                RemoveRegionWindlightSettings(wl.regionID);
+            }
+
+            // sql insert
+            sql = @"INSERT INTO regionwindlight
+                       (region_id
+                       ,water_color_r
+                       ,water_color_g
+                       ,water_color_b
+                       ,water_fog_density_exponent
+                       ,underwater_fog_modifier
+                       ,reflection_wavelet_scale_1
+                       ,reflection_wavelet_scale_2
+                       ,reflection_wavelet_scale_3
+                       ,fresnel_scale
+                       ,fresnel_offset
+                       ,refract_scale_above
+                       ,refract_scale_below
+                       ,blur_multiplier
+                       ,big_wave_direction_x
+                       ,big_wave_direction_y
+                       ,little_wave_direction_x
+                       ,little_wave_direction_y
+                       ,normal_map_texture
+                       ,horizon_r
+                       ,horizon_g
+                       ,horizon_b
+                       ,horizon_i
+                       ,haze_horizon
+                       ,blue_density_r
+                       ,blue_density_g
+                       ,blue_density_b
+                       ,blue_density_i
+                       ,haze_density
+                       ,density_multiplier
+                       ,distance_multiplier
+                       ,max_altitude
+                       ,sun_moon_color_r
+                       ,sun_moon_color_g
+                       ,sun_moon_color_b
+                       ,sun_moon_color_i
+                       ,sun_moon_position
+                       ,ambient_r
+                       ,ambient_g
+                       ,ambient_b
+                       ,ambient_i
+                       ,east_angle
+                       ,sun_glow_focus
+                       ,sun_glow_size
+                       ,scene_gamma
+                       ,star_brightness
+                       ,cloud_color_r
+                       ,cloud_color_g
+                       ,cloud_color_b
+                       ,cloud_color_i
+                       ,cloud_x
+                       ,cloud_y
+                       ,cloud_density
+                       ,cloud_coverage
+                       ,cloud_scale
+                       ,cloud_detail_x
+                       ,cloud_detail_y
+                       ,cloud_detail_density
+                       ,cloud_scroll_x
+                       ,cloud_scroll_x_lock
+                       ,cloud_scroll_y
+                       ,cloud_scroll_y_lock
+                       ,draw_classic_clouds)
+                 VALUES
+                       (:region_id
+                       ,:water_color_r
+                       ,:water_color_g
+                       ,:water_color_b
+                       ,:water_fog_density_exponent
+                       ,:underwater_fog_modifier
+                       ,:reflection_wavelet_scale_1
+                       ,:reflection_wavelet_scale_2
+                       ,:reflection_wavelet_scale_3
+                       ,:fresnel_scale
+                       ,:fresnel_offset
+                       ,:refract_scale_above
+                       ,:refract_scale_below
+                       ,:blur_multiplier
+                       ,:big_wave_direction_x
+                       ,:big_wave_direction_y
+                       ,:little_wave_direction_x
+                       ,:little_wave_direction_y
+                       ,:normal_map_texture
+                       ,:horizon_r
+                       ,:horizon_g
+                       ,:horizon_b
+                       ,:horizon_i
+                       ,:haze_horizon
+                       ,:blue_density_r
+                       ,:blue_density_g
+                       ,:blue_density_b
+                       ,:blue_density_i
+                       ,:haze_density
+                       ,:density_multiplier
+                       ,:distance_multiplier
+                       ,:max_altitude
+                       ,:sun_moon_color_r
+                       ,:sun_moon_color_g
+                       ,:sun_moon_color_b
+                       ,:sun_moon_color_i
+                       ,:sun_moon_position
+                       ,:ambient_r
+                       ,:ambient_g
+                       ,:ambient_b
+                       ,:ambient_i
+                       ,:east_angle
+                       ,:sun_glow_focus
+                       ,:sun_glow_size
+                       ,:scene_gamma
+                       ,:star_brightness
+                       ,:cloud_color_r
+                       ,:cloud_color_g
+                       ,:cloud_color_b
+                       ,:cloud_color_i
+                       ,:cloud_x
+                       ,:cloud_y
+                       ,:cloud_density
+                       ,:cloud_coverage
+                       ,:cloud_scale
+                       ,:cloud_detail_x
+                       ,:cloud_detail_y
+                       ,:cloud_detail_density
+                       ,:cloud_scroll_x
+                       ,:cloud_scroll_x_lock
+                       ,:cloud_scroll_y
+                       ,:cloud_scroll_y_lock
+                       ,:draw_classic_clouds);";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID));
+                    cmd.Parameters.Add(_Database.CreateParameter("water_color_r", wl.waterColor.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("water_color_g", wl.waterColor.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("water_color_b", wl.waterColor.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("water_fog_density_exponent", wl.waterFogDensityExponent));
+                    cmd.Parameters.Add(_Database.CreateParameter("underwater_fog_modifier", wl.underwaterFogModifier));
+                    cmd.Parameters.Add(_Database.CreateParameter("reflection_wavelet_scale_1", wl.reflectionWaveletScale.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("reflection_wavelet_scale_2", wl.reflectionWaveletScale.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("reflection_wavelet_scale_3", wl.reflectionWaveletScale.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("fresnel_scale", wl.fresnelScale));
+                    cmd.Parameters.Add(_Database.CreateParameter("fresnel_offset", wl.fresnelOffset));
+                    cmd.Parameters.Add(_Database.CreateParameter("refract_scale_above", wl.refractScaleAbove));
+                    cmd.Parameters.Add(_Database.CreateParameter("refract_scale_below", wl.refractScaleBelow));
+                    cmd.Parameters.Add(_Database.CreateParameter("blur_multiplier", wl.blurMultiplier));
+                    cmd.Parameters.Add(_Database.CreateParameter("big_wave_direction_x", wl.bigWaveDirection.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("big_wave_direction_y", wl.bigWaveDirection.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("little_wave_direction_x", wl.littleWaveDirection.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("little_wave_direction_y", wl.littleWaveDirection.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("normal_map_texture", wl.normalMapTexture));
+                    cmd.Parameters.Add(_Database.CreateParameter("horizon_r", wl.horizon.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("horizon_g", wl.horizon.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("horizon_b", wl.horizon.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("horizon_i", wl.horizon.W));
+                    cmd.Parameters.Add(_Database.CreateParameter("haze_horizon", wl.hazeHorizon));
+                    cmd.Parameters.Add(_Database.CreateParameter("blue_density_r", wl.blueDensity.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("blue_density_g", wl.blueDensity.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("blue_density_b", wl.blueDensity.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("blue_density_i", wl.blueDensity.W));
+                    cmd.Parameters.Add(_Database.CreateParameter("haze_density", wl.hazeDensity));
+                    cmd.Parameters.Add(_Database.CreateParameter("density_multiplier", wl.densityMultiplier));
+                    cmd.Parameters.Add(_Database.CreateParameter("distance_multiplier", wl.distanceMultiplier));
+                    cmd.Parameters.Add(_Database.CreateParameter("max_altitude", wl.maxAltitude));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_moon_color_r", wl.sunMoonColor.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_moon_color_g", wl.sunMoonColor.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_moon_color_b", wl.sunMoonColor.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_moon_color_i", wl.sunMoonColor.W));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_moon_position", wl.sunMoonPosition));
+                    cmd.Parameters.Add(_Database.CreateParameter("ambient_r", wl.ambient.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("ambient_g", wl.ambient.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("ambient_b", wl.ambient.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("ambient_i", wl.ambient.W));
+                    cmd.Parameters.Add(_Database.CreateParameter("east_angle", wl.eastAngle));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_glow_focus", wl.sunGlowFocus));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_glow_size", wl.sunGlowSize));
+                    cmd.Parameters.Add(_Database.CreateParameter("scene_gamma", wl.sceneGamma));
+                    cmd.Parameters.Add(_Database.CreateParameter("star_brightness", wl.starBrightness));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_color_r", wl.cloudColor.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_color_g", wl.cloudColor.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_color_b", wl.cloudColor.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_color_i", wl.cloudColor.W));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_x", wl.cloudXYDensity.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_y", wl.cloudXYDensity.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_density", wl.cloudXYDensity.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_coverage", wl.cloudCoverage));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_scale", wl.cloudScale));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_detail_x", wl.cloudDetailXYDensity.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_detail_y", wl.cloudDetailXYDensity.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_detail_density", wl.cloudDetailXYDensity.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_scroll_x", wl.cloudScrollX));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_scroll_x_lock", wl.cloudScrollXLock));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_scroll_y", wl.cloudScrollY));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_scroll_y_lock", wl.cloudScrollYLock));
+                    cmd.Parameters.Add(_Database.CreateParameter("draw_classic_clouds", wl.drawClassicClouds));
+
+                    cmd.ExecuteNonQuery();
+                }
+            }
+            #region update
+            //            }
+            //            else
+            //            {
+            //                // sql update
+            //                sql = @"UPDATE [OpenSim].[dbo].[regionwindlight]
+            //   SET [region_id] =                   @region_id
+            //      ,[water_color_r] =               @water_color_r
+            //      ,[water_color_g] =               @water_color_g
+            //      ,[water_color_b] =               @water_color_b
+            //      ,[water_fog_density_exponent] =  @water_fog_density_exponent
+            //      ,[underwater_fog_modifier] =     @underwater_fog_modifier
+            //      ,[reflection_wavelet_scale_1] =  @reflection_wavelet_scale_1
+            //      ,[reflection_wavelet_scale_2] =  @reflection_wavelet_scale_2
+            //      ,[reflection_wavelet_scale_3] =  @reflection_wavelet_scale_3
+            //      ,[fresnel_scale] =               @fresnel_scale
+            //      ,[fresnel_offset] =              @fresnel_offset
+            //      ,[refract_scale_above] =         @refract_scale_above
+            //      ,[refract_scale_below] =         @refract_scale_below
+            //      ,[blur_multiplier] =             @blur_multiplier
+            //      ,[big_wave_direction_x] =        @big_wave_direction_x
+            //      ,[big_wave_direction_y] =        @big_wave_direction_y
+            //      ,[little_wave_direction_x] =     @little_wave_direction_x
+            //      ,[little_wave_direction_y] =     @little_wave_direction_y
+            //      ,[normal_map_texture] =          @normal_map_texture
+            //      ,[horizon_r] =                   @horizon_r
+            //      ,[horizon_g] =                   @horizon_g
+            //      ,[horizon_b] =                   @horizon_b
+            //      ,[horizon_i] =                   @horizon_i
+            //      ,[haze_horizon] =                @haze_horizon
+            //      ,[blue_density_r] =              @blue_density_r
+            //      ,[blue_density_g] =              @blue_density_g
+            //      ,[blue_density_b] =              @blue_density_b
+            //      ,[blue_density_i] =              @blue_density_i
+            //      ,[haze_density] =                @haze_density
+            //      ,[density_multiplier] =          @density_multiplier
+            //      ,[distance_multiplier] =         @distance_multiplier
+            //      ,[max_altitude] =                @max_altitude
+            //      ,[sun_moon_color_r] =            @sun_moon_color_r
+            //      ,[sun_moon_color_g] =            @sun_moon_color_g
+            //      ,[sun_moon_color_b] =            @sun_moon_color_b
+            //      ,[sun_moon_color_i] =            @sun_moon_color_i
+            //      ,[sun_moon_position] =           @sun_moon_position
+            //      ,[ambient_r] =                   @ambient_r
+            //      ,[ambient_g] =                   @ambient_g
+            //      ,[ambient_b] =                   @ambient_b
+            //      ,[ambient_i] =                   @ambient_i
+            //      ,[east_angle] =                  @east_angle
+            //      ,[sun_glow_focus] =              @sun_glow_focus
+            //      ,[sun_glow_size] =               @sun_glow_size
+            //      ,[scene_gamma] =                 @scene_gamma
+            //      ,[star_brightness] =             @star_brightness
+            //      ,[cloud_color_r] =               @cloud_color_r
+            //      ,[cloud_color_g] =               @cloud_color_g
+            //      ,[cloud_color_b] =               @cloud_color_b
+            //      ,[cloud_color_i] =               @cloud_color_i
+            //      ,[cloud_x] =                     @cloud_x
+            //      ,[cloud_y] =                     @cloud_y
+            //      ,[cloud_density] =               @cloud_density
+            //      ,[cloud_coverage] =              @cloud_coverage
+            //      ,[cloud_scale] =                 @cloud_scale
+            //      ,[cloud_detail_x] =              @cloud_detail_x
+            //      ,[cloud_detail_y] =              @cloud_detail_y
+            //      ,[cloud_detail_density] =        @cloud_detail_density
+            //      ,[cloud_scroll_x] =              @cloud_scroll_x
+            //      ,[cloud_scroll_x_lock] =         @cloud_scroll_x_lock
+            //      ,[cloud_scroll_y] =              @cloud_scroll_y
+            //      ,[cloud_scroll_y_lock] =         @cloud_scroll_y_lock
+            //      ,[draw_classic_clouds] =         @draw_classic_clouds
+            // WHERE region_id = @region_id";
+            //                using (SqlConnection conn = new SqlConnection(m_connectionString))
+            //                {
+            //                    conn.Open();
+            //                    using (SqlCommand cmd = new SqlCommand(sql, conn))
+            //                    {
+            //                        cmd.Parameters.AddWithValue("region_id", wl.regionID);
+            //                        cmd.Parameters.AddWithValue("water_color_r", wl.waterColor.X);
+            //                        cmd.Parameters.AddWithValue("water_color_g", wl.waterColor.Y);
+            //                        cmd.Parameters.AddWithValue("water_color_b", wl.waterColor.Z);
+            //                        cmd.Parameters.AddWithValue("water_fog_density_exponent", wl.waterFogDensityExponent);
+            //                        cmd.Parameters.AddWithValue("underwater_fog_modifier", wl.underwaterFogModifier);
+            //                        cmd.Parameters.AddWithValue("reflection_wavelet_scale_1", wl.reflectionWaveletScale.X);
+            //                        cmd.Parameters.AddWithValue("reflection_wavelet_scale_2", wl.reflectionWaveletScale.Y);
+            //                        cmd.Parameters.AddWithValue("reflection_wavelet_scale_3", wl.reflectionWaveletScale.Z);
+            //                        cmd.Parameters.AddWithValue("fresnel_scale", wl.fresnelScale);
+            //                        cmd.Parameters.AddWithValue("fresnel_offset", wl.fresnelOffset);
+            //                        cmd.Parameters.AddWithValue("refract_scale_above", wl.refractScaleAbove);
+            //                        cmd.Parameters.AddWithValue("refract_scale_below", wl.refractScaleBelow);
+            //                        cmd.Parameters.AddWithValue("blur_multiplier", wl.blurMultiplier);
+            //                        cmd.Parameters.AddWithValue("big_wave_direction_x", wl.bigWaveDirection.X);
+            //                        cmd.Parameters.AddWithValue("big_wave_direction_y", wl.bigWaveDirection.Y);
+            //                        cmd.Parameters.AddWithValue("little_wave_direction_x", wl.littleWaveDirection.X);
+            //                        cmd.Parameters.AddWithValue("little_wave_direction_y", wl.littleWaveDirection.Y);
+            //                        cmd.Parameters.AddWithValue("normal_map_texture", wl.normalMapTexture);
+            //                        cmd.Parameters.AddWithValue("horizon_r", wl.horizon.X);
+            //                        cmd.Parameters.AddWithValue("horizon_g", wl.horizon.Y);
+            //                        cmd.Parameters.AddWithValue("horizon_b", wl.horizon.Z);
+            //                        cmd.Parameters.AddWithValue("horizon_i", wl.horizon.W);
+            //                        cmd.Parameters.AddWithValue("haze_horizon", wl.hazeHorizon);
+            //                        cmd.Parameters.AddWithValue("blue_density_r", wl.blueDensity.X);
+            //                        cmd.Parameters.AddWithValue("blue_density_g", wl.blueDensity.Y);
+            //                        cmd.Parameters.AddWithValue("blue_density_b", wl.blueDensity.Z);
+            //                        cmd.Parameters.AddWithValue("blue_density_i", wl.blueDensity.W);
+            //                        cmd.Parameters.AddWithValue("haze_density", wl.hazeDensity);
+            //                        cmd.Parameters.AddWithValue("density_multiplier", wl.densityMultiplier);
+            //                        cmd.Parameters.AddWithValue("distance_multiplier", wl.distanceMultiplier);
+            //                        cmd.Parameters.AddWithValue("max_altitude", wl.maxAltitude);
+            //                        cmd.Parameters.AddWithValue("sun_moon_color_r", wl.sunMoonColor.X);
+            //                        cmd.Parameters.AddWithValue("sun_moon_color_g", wl.sunMoonColor.Y);
+            //                        cmd.Parameters.AddWithValue("sun_moon_color_b", wl.sunMoonColor.Z);
+            //                        cmd.Parameters.AddWithValue("sun_moon_color_i", wl.sunMoonColor.W);
+            //                        cmd.Parameters.AddWithValue("sun_moon_position", wl.sunMoonPosition);
+            //                        cmd.Parameters.AddWithValue("ambient_r", wl.ambient.X);
+            //                        cmd.Parameters.AddWithValue("ambient_g", wl.ambient.Y);
+            //                        cmd.Parameters.AddWithValue("ambient_b", wl.ambient.Z);
+            //                        cmd.Parameters.AddWithValue("ambient_i", wl.ambient.W);
+            //                        cmd.Parameters.AddWithValue("east_angle", wl.eastAngle);
+            //                        cmd.Parameters.AddWithValue("sun_glow_focus", wl.sunGlowFocus);
+            //                        cmd.Parameters.AddWithValue("sun_glow_size", wl.sunGlowSize);
+            //                        cmd.Parameters.AddWithValue("scene_gamma", wl.sceneGamma);
+            //                        cmd.Parameters.AddWithValue("star_brightness", wl.starBrightness);
+            //                        cmd.Parameters.AddWithValue("cloud_color_r", wl.cloudColor.X);
+            //                        cmd.Parameters.AddWithValue("cloud_color_g", wl.cloudColor.Y);
+            //                        cmd.Parameters.AddWithValue("cloud_color_b", wl.cloudColor.Z);
+            //                        cmd.Parameters.AddWithValue("cloud_color_i", wl.cloudColor.W);
+            //                        cmd.Parameters.AddWithValue("cloud_x", wl.cloudXYDensity.X);
+            //                        cmd.Parameters.AddWithValue("cloud_y", wl.cloudXYDensity.Y);
+            //                        cmd.Parameters.AddWithValue("cloud_density", wl.cloudXYDensity.Z);
+            //                        cmd.Parameters.AddWithValue("cloud_coverage", wl.cloudCoverage);
+            //                        cmd.Parameters.AddWithValue("cloud_scale", wl.cloudScale);
+            //                        cmd.Parameters.AddWithValue("cloud_detail_x", wl.cloudDetailXYDensity.X);
+            //                        cmd.Parameters.AddWithValue("cloud_detail_y", wl.cloudDetailXYDensity.Y);
+            //                        cmd.Parameters.AddWithValue("cloud_detail_density", wl.cloudDetailXYDensity.Z);
+            //                        cmd.Parameters.AddWithValue("cloud_scroll_x", wl.cloudScrollX);
+            //                        cmd.Parameters.AddWithValue("cloud_scroll_x_lock", wl.cloudScrollXLock);
+            //                        cmd.Parameters.AddWithValue("cloud_scroll_y", wl.cloudScrollY);
+            //                        cmd.Parameters.AddWithValue("cloud_scroll_y_lock", wl.cloudScrollYLock);
+            //                        cmd.Parameters.AddWithValue("draw_classic_clouds", wl.drawClassicClouds);
+
+            //                        cmd.ExecuteNonQuery();
+            //                    }
+            //                }
+            //            }
+            #endregion
+        }
+
+        #region Environment Settings
+        public string LoadRegionEnvironmentSettings(UUID regionUUID)
+        {
+            string sql = "select * from regionenvironment where region_id = :region_id";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("region_id", regionUUID));
+                conn.Open();
+                using (NpgsqlDataReader result = cmd.ExecuteReader())
+                {
+                    if (!result.Read())
+                    {
+                        return String.Empty;
+                    }
+                    else
+                    {
+                        return Convert.ToString(result["llsd_settings"]);
+                    }
+                }
+            }
+        }
+
+        public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
+        {
+            {
+                string sql = "DELETE FROM regionenvironment WHERE region_id = :region_id ;";
+                
+                using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    cmd.Parameters.Add(_Database.CreateParameter("region_id", regionUUID));
+                    conn.Open();
+                    cmd.ExecuteNonQuery();
+                }
+
+                sql = "INSERT INTO regionenvironment (region_id, llsd_settings) VALUES (:region_id, :llsd_settings) ;";
+
+                using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    cmd.Parameters.Add(_Database.CreateParameter("region_id", regionUUID));
+                    cmd.Parameters.Add(_Database.CreateParameter("llsd_settings", settings));
+
+                    conn.Open();
+                    cmd.ExecuteNonQuery();
+                }
+            }
+        }
+
+        public void RemoveRegionEnvironmentSettings(UUID regionUUID)
+        {
+            string sql = "delete from regionenvironment where region_id = :region_id ;";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("region_id", regionUUID));
+
+                conn.Open();
+                cmd.ExecuteNonQuery();
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// Loads the settings of a region.
+        /// </summary>
+        /// <param name="regionUUID">The region UUID.</param>
+        /// <returns></returns>
+        public RegionSettings LoadRegionSettings(UUID regionUUID)
+        {
+            string sql = @"select * from regionsettings where ""regionUUID"" = :regionUUID";
+            RegionSettings regionSettings;
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("regionUUID", regionUUID));
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    if (reader.Read())
+                    {
+                        regionSettings = BuildRegionSettings(reader);
+                        regionSettings.OnSave += StoreRegionSettings;
+
+                        return regionSettings;
+                    }
+                }
+            }
+
+            //If we reach this point then there are new region settings for that region
+            regionSettings = new RegionSettings();
+            regionSettings.RegionUUID = regionUUID;
+            regionSettings.OnSave += StoreRegionSettings;
+
+            //Store new values
+            StoreNewRegionSettings(regionSettings);
+
+            LoadSpawnPoints(regionSettings);
+
+            return regionSettings;
+        }
+
+        /// <summary>
+        /// Store region settings, need to check if the check is really necesary. If we can make something for creating new region.
+        /// </summary>
+        /// <param name="regionSettings">region settings.</param>
+        public void StoreRegionSettings(RegionSettings regionSettings)
+        {
+            //Little check if regionUUID already exist in DB
+            string regionUUID;
+            string sql = @"SELECT ""regionUUID"" FROM regionsettings WHERE ""regionUUID"" = :regionUUID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("regionUUID", regionSettings.RegionUUID));
+                conn.Open();
+                regionUUID = cmd.ExecuteScalar().ToString();
+            }
+
+            if (string.IsNullOrEmpty(regionUUID))
+            {
+                StoreNewRegionSettings(regionSettings);
+            }
+            else
+            {
+                //This method only updates region settings!!! First call LoadRegionSettings to create new region settings in DB
+                sql =
+                   @"UPDATE regionsettings SET block_terraform = :block_terraform ,block_fly = :block_fly ,allow_damage = :allow_damage 
+,restrict_pushing = :restrict_pushing ,allow_land_resell = :allow_land_resell ,allow_land_join_divide = :allow_land_join_divide 
+,block_show_in_search = :block_show_in_search ,agent_limit = :agent_limit ,object_bonus = :object_bonus ,maturity = :maturity 
+,disable_scripts = :disable_scripts ,disable_collisions = :disable_collisions ,disable_physics = :disable_physics 
+,terrain_texture_1 = :terrain_texture_1 ,terrain_texture_2 = :terrain_texture_2 ,terrain_texture_3 = :terrain_texture_3 
+,terrain_texture_4 = :terrain_texture_4 ,elevation_1_nw = :elevation_1_nw ,elevation_2_nw = :elevation_2_nw 
+,elevation_1_ne = :elevation_1_ne ,elevation_2_ne = :elevation_2_ne ,elevation_1_se = :elevation_1_se ,elevation_2_se = :elevation_2_se 
+,elevation_1_sw = :elevation_1_sw ,elevation_2_sw = :elevation_2_sw ,water_height = :water_height ,terrain_raise_limit = :terrain_raise_limit 
+,terrain_lower_limit = :terrain_lower_limit ,use_estate_sun = :use_estate_sun ,fixed_sun = :fixed_sun ,sun_position = :sun_position 
+,covenant = :covenant ,covenant_datetime = :covenant_datetime, sunvectorx = :sunvectorx, sunvectory = :sunvectory, sunvectorz = :sunvectorz,  
+""Sandbox"" = :Sandbox, loaded_creation_datetime = :loaded_creation_datetime, loaded_creation_id = :loaded_creation_id, ""map_tile_ID"" = :TerrainImageID, 
+""TelehubObject"" = :telehubobject, ""parcel_tile_ID"" = :ParcelImageID
+ WHERE ""regionUUID"" = :regionUUID";
+
+                using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    cmd.Parameters.AddRange(CreateRegionSettingParameters(regionSettings));
+                    conn.Open();
+                    cmd.ExecuteNonQuery();
+                }
+            }
+            SaveSpawnPoints(regionSettings);
+        }
+
+        public void Shutdown()
+        {
+            //Not used??
+        }
+
+        #region Private Methods
+
+        /// <summary>
+        /// Serializes the terrain data for storage in DB.
+        /// </summary>
+        /// <param name="val">terrain data</param>
+        /// <returns></returns>
+        private static Array serializeTerrain(double[,] val)
+        {
+            MemoryStream str = new MemoryStream(((int)Constants.RegionSize * (int)Constants.RegionSize) * sizeof(double));
+            BinaryWriter bw = new BinaryWriter(str);
+
+            // TODO: COMPATIBILITY - Add byte-order conversions
+            for (int x = 0; x < (int)Constants.RegionSize; x++)
+                for (int y = 0; y < (int)Constants.RegionSize; y++)
+                {
+                    double height = val[x, y];
+                    if (height == 0.0)
+                        height = double.Epsilon;
+
+                    bw.Write(height);
+                }
+
+            return str.ToArray();
+        }
+
+        /// <summary>
+        /// Stores new regionsettings.
+        /// </summary>
+        /// <param name="regionSettings">The region settings.</param>
+        private void StoreNewRegionSettings(RegionSettings regionSettings)
+        {
+            string sql = @"INSERT INTO regionsettings
+                                (""regionUUID"",block_terraform,block_fly,allow_damage,restrict_pushing,allow_land_resell,allow_land_join_divide,
+                                block_show_in_search,agent_limit,object_bonus,maturity,disable_scripts,disable_collisions,disable_physics,
+                                terrain_texture_1,terrain_texture_2,terrain_texture_3,terrain_texture_4,elevation_1_nw,elevation_2_nw,elevation_1_ne,
+                                elevation_2_ne,elevation_1_se,elevation_2_se,elevation_1_sw,elevation_2_sw,water_height,terrain_raise_limit,
+                                terrain_lower_limit,use_estate_sun,fixed_sun,sun_position,covenant,covenant_datetime,sunvectorx, sunvectory, sunvectorz,
+                                ""Sandbox"", loaded_creation_datetime, loaded_creation_id
+                                ) 
+                            VALUES
+                                (:regionUUID,:block_terraform,:block_fly,:allow_damage,:restrict_pushing,:allow_land_resell,:allow_land_join_divide,
+                                :block_show_in_search,:agent_limit,:object_bonus,:maturity,:disable_scripts,:disable_collisions,:disable_physics,
+                                :terrain_texture_1,:terrain_texture_2,:terrain_texture_3,:terrain_texture_4,:elevation_1_nw,:elevation_2_nw,:elevation_1_ne,
+                                :elevation_2_ne,:elevation_1_se,:elevation_2_se,:elevation_1_sw,:elevation_2_sw,:water_height,:terrain_raise_limit,
+                                :terrain_lower_limit,:use_estate_sun,:fixed_sun,:sun_position,:covenant, :covenant_datetime, :sunvectorx,:sunvectory, 
+                                :sunvectorz, :Sandbox, :loaded_creation_datetime, :loaded_creation_id )";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.AddRange(CreateRegionSettingParameters(regionSettings));
+                conn.Open();
+                cmd.ExecuteNonQuery();
+            }
+        }
+
+        #region Private DataRecord conversion methods
+
+        /// <summary>
+        /// Builds the region settings from a datarecod.
+        /// </summary>
+        /// <param name="row">datarecord with regionsettings.</param>
+        /// <returns></returns>
+        private static RegionSettings BuildRegionSettings(IDataRecord row)
+        {
+            //TODO change this is some more generic code so we doesnt have to change it every time a new field is added?
+            RegionSettings newSettings = new RegionSettings();
+
+            newSettings.RegionUUID = new UUID((Guid)row["regionUUID"]);
+            newSettings.BlockTerraform = Convert.ToBoolean(row["block_terraform"]);
+            newSettings.AllowDamage = Convert.ToBoolean(row["allow_damage"]);
+            newSettings.BlockFly = Convert.ToBoolean(row["block_fly"]);
+            newSettings.RestrictPushing = Convert.ToBoolean(row["restrict_pushing"]);
+            newSettings.AllowLandResell = Convert.ToBoolean(row["allow_land_resell"]);
+            newSettings.AllowLandJoinDivide = Convert.ToBoolean(row["allow_land_join_divide"]);
+            newSettings.BlockShowInSearch = Convert.ToBoolean(row["block_show_in_search"]);
+            newSettings.AgentLimit = Convert.ToInt32(row["agent_limit"]);
+            newSettings.ObjectBonus = Convert.ToDouble(row["object_bonus"]);
+            newSettings.Maturity = Convert.ToInt32(row["maturity"]);
+            newSettings.DisableScripts = Convert.ToBoolean(row["disable_scripts"]);
+            newSettings.DisableCollisions = Convert.ToBoolean(row["disable_collisions"]);
+            newSettings.DisablePhysics = Convert.ToBoolean(row["disable_physics"]);
+            newSettings.TerrainTexture1 = new UUID((Guid)row["terrain_texture_1"]);
+            newSettings.TerrainTexture2 = new UUID((Guid)row["terrain_texture_2"]);
+            newSettings.TerrainTexture3 = new UUID((Guid)row["terrain_texture_3"]);
+            newSettings.TerrainTexture4 = new UUID((Guid)row["terrain_texture_4"]);
+            newSettings.Elevation1NW = Convert.ToDouble(row["elevation_1_nw"]);
+            newSettings.Elevation2NW = Convert.ToDouble(row["elevation_2_nw"]);
+            newSettings.Elevation1NE = Convert.ToDouble(row["elevation_1_ne"]);
+            newSettings.Elevation2NE = Convert.ToDouble(row["elevation_2_ne"]);
+            newSettings.Elevation1SE = Convert.ToDouble(row["elevation_1_se"]);
+            newSettings.Elevation2SE = Convert.ToDouble(row["elevation_2_se"]);
+            newSettings.Elevation1SW = Convert.ToDouble(row["elevation_1_sw"]);
+            newSettings.Elevation2SW = Convert.ToDouble(row["elevation_2_sw"]);
+            newSettings.WaterHeight = Convert.ToDouble(row["water_height"]);
+            newSettings.TerrainRaiseLimit = Convert.ToDouble(row["terrain_raise_limit"]);
+            newSettings.TerrainLowerLimit = Convert.ToDouble(row["terrain_lower_limit"]);
+            newSettings.UseEstateSun = Convert.ToBoolean(row["use_estate_sun"]);
+            newSettings.Sandbox = Convert.ToBoolean(row["Sandbox"]);
+            newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]);
+            newSettings.SunPosition = Convert.ToDouble(row["sun_position"]);
+            newSettings.SunVector = new Vector3(
+                                                 Convert.ToSingle(row["sunvectorx"]),
+                                                 Convert.ToSingle(row["sunvectory"]),
+                                                 Convert.ToSingle(row["sunvectorz"])
+                                                 );
+            newSettings.Covenant = new UUID((Guid)row["covenant"]);
+            newSettings.CovenantChangedDateTime = Convert.ToInt32(row["covenant_datetime"]);
+            newSettings.LoadedCreationDateTime = Convert.ToInt32(row["loaded_creation_datetime"]);
+
+            if (row["loaded_creation_id"] is DBNull)
+                newSettings.LoadedCreationID = "";
+            else
+                newSettings.LoadedCreationID = (String)row["loaded_creation_id"];
+
+            newSettings.TerrainImageID = new UUID((string)row["map_tile_ID"]);
+            newSettings.ParcelImageID = new UUID((Guid)row["parcel_tile_ID"]);
+            newSettings.TelehubObject = new UUID((Guid)row["TelehubObject"]);
+
+            return newSettings;
+        }
+
+        /// <summary>
+        /// Builds the land data from a datarecord.
+        /// </summary>
+        /// <param name="row">datarecord with land data</param>
+        /// <returns></returns>
+        private static LandData BuildLandData(IDataRecord row)
+        {
+            LandData newData = new LandData();
+
+            newData.GlobalID = new UUID((Guid)row["UUID"]);
+            newData.LocalID = Convert.ToInt32(row["LocalLandID"]);
+
+            // Bitmap is a byte[512]
+            newData.Bitmap = (Byte[])row["Bitmap"];
+
+            newData.Name = (string)row["Name"];
+            newData.Description = (string)row["Description"];
+            newData.OwnerID = new UUID((Guid)row["OwnerUUID"]);
+            newData.IsGroupOwned = Convert.ToBoolean(row["IsGroupOwned"]);
+            newData.Area = Convert.ToInt32(row["Area"]);
+            newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented
+            newData.Category = (ParcelCategory)Convert.ToInt32(row["Category"]);
+            //Enum libsecondlife.Parcel.ParcelCategory
+            newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]);
+            newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]);
+            newData.GroupID = new UUID((Guid)row["GroupUUID"]);
+            newData.SalePrice = Convert.ToInt32(row["SalePrice"]);
+            newData.Status = (ParcelStatus)Convert.ToInt32(row["LandStatus"]);
+            //Enum. libsecondlife.Parcel.ParcelStatus
+            newData.Flags = Convert.ToUInt32(row["LandFlags"]);
+            newData.LandingType = Convert.ToByte(row["LandingType"]);
+            newData.MediaAutoScale = Convert.ToByte(row["MediaAutoScale"]);
+            newData.MediaID = new UUID((Guid)row["MediaTextureUUID"]);
+            newData.MediaURL = (string)row["MediaURL"];
+            newData.MusicURL = (string)row["MusicURL"];
+            newData.PassHours = Convert.ToSingle(row["PassHours"]);
+            newData.PassPrice = Convert.ToInt32(row["PassPrice"]);
+
+            //            UUID authedbuyer;
+            //            UUID snapshotID;
+            //
+            //            if (UUID.TryParse((string)row["AuthBuyerID"], out authedbuyer))
+            //                newData.AuthBuyerID = authedbuyer;
+            //
+            //            if (UUID.TryParse((string)row["SnapshotUUID"], out snapshotID))
+            //                newData.SnapshotID = snapshotID;
+            newData.AuthBuyerID = new UUID((Guid)row["AuthBuyerID"]);
+            newData.SnapshotID = new UUID((Guid)row["SnapshotUUID"]);
+
+            newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]);
+
+            try
+            {
+                newData.UserLocation =
+                    new Vector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]),
+                                  Convert.ToSingle(row["UserLocationZ"]));
+                newData.UserLookAt =
+                    new Vector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]),
+                                  Convert.ToSingle(row["UserLookAtZ"]));
+            }
+            catch (InvalidCastException)
+            {
+                newData.UserLocation = Vector3.Zero;
+                newData.UserLookAt = Vector3.Zero;
+                _Log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name);
+            }
+
+            newData.ParcelAccessList = new List<LandAccessEntry>();
+            newData.MediaDescription = (string)row["MediaDescription"];
+            newData.MediaType = (string)row["MediaType"];
+            newData.MediaWidth = Convert.ToInt32((((string)row["MediaSize"]).Split(','))[0]);
+            newData.MediaHeight = Convert.ToInt32((((string)row["MediaSize"]).Split(','))[1]);
+            newData.MediaLoop = Convert.ToBoolean(row["MediaLoop"]);
+            newData.ObscureMusic = Convert.ToBoolean(row["ObscureMusic"]);
+            newData.ObscureMedia = Convert.ToBoolean(row["ObscureMedia"]);
+
+            return newData;
+        }
+
+        /// <summary>
+        /// Builds the landaccess data from a data record.
+        /// </summary>
+        /// <param name="row">datarecord with landaccess data</param>
+        /// <returns></returns>
+        private static LandAccessEntry BuildLandAccessData(IDataRecord row)
+        {
+            LandAccessEntry entry = new LandAccessEntry();
+            entry.AgentID = new UUID((Guid)row["AccessUUID"]);
+            entry.Flags = (AccessList)Convert.ToInt32(row["Flags"]);
+            entry.Expires = Convert.ToInt32(row["Expires"]);
+            return entry;
+        }
+
+        /// <summary>
+        /// Builds the prim from a datarecord.
+        /// </summary>
+        /// <param name="primRow">datarecord</param>
+        /// <returns></returns>
+        private static SceneObjectPart BuildPrim(IDataRecord primRow)
+        {
+            SceneObjectPart prim = new SceneObjectPart();
+
+            prim.UUID = new UUID((Guid)primRow["UUID"]);
+            // explicit conversion of integers is required, which sort
+            // of sucks.  No idea if there is a shortcut here or not.
+            prim.CreationDate = Convert.ToInt32(primRow["CreationDate"]);
+            prim.Name = (string)primRow["Name"];
+            // various text fields
+            prim.Text = (string)primRow["Text"];
+            prim.Color = Color.FromArgb(Convert.ToInt32(primRow["ColorA"]),
+                                        Convert.ToInt32(primRow["ColorR"]),
+                                        Convert.ToInt32(primRow["ColorG"]),
+                                        Convert.ToInt32(primRow["ColorB"]));
+            prim.Description = (string)primRow["Description"];
+            prim.SitName = (string)primRow["SitName"];
+            prim.TouchName = (string)primRow["TouchName"];
+            // permissions
+            prim.Flags = (PrimFlags)Convert.ToUInt32(primRow["ObjectFlags"]);
+            //prim.creatorID = new UUID((Guid)primRow["creatorID"]);
+            prim.CreatorIdentification = (string)primRow["CreatorID"].ToString();
+            prim.OwnerID = new UUID((Guid)primRow["OwnerID"]);
+            prim.GroupID = new UUID((Guid)primRow["GroupID"]);
+            prim.LastOwnerID = new UUID((Guid)primRow["LastOwnerID"]);
+            prim.OwnerMask = Convert.ToUInt32(primRow["OwnerMask"]);
+            prim.NextOwnerMask = Convert.ToUInt32(primRow["NextOwnerMask"]);
+            prim.GroupMask = Convert.ToUInt32(primRow["GroupMask"]);
+            prim.EveryoneMask = Convert.ToUInt32(primRow["EveryoneMask"]);
+            prim.BaseMask = Convert.ToUInt32(primRow["BaseMask"]);
+            // vectors
+            prim.OffsetPosition = new Vector3(
+                                    Convert.ToSingle(primRow["PositionX"]),
+                                    Convert.ToSingle(primRow["PositionY"]),
+                                    Convert.ToSingle(primRow["PositionZ"]));
+
+            prim.GroupPosition = new Vector3(
+                                    Convert.ToSingle(primRow["GroupPositionX"]),
+                                    Convert.ToSingle(primRow["GroupPositionY"]),
+                                    Convert.ToSingle(primRow["GroupPositionZ"]));
+
+            prim.Velocity = new Vector3(
+                                Convert.ToSingle(primRow["VelocityX"]),
+                                Convert.ToSingle(primRow["VelocityY"]),
+                                Convert.ToSingle(primRow["VelocityZ"]));
+
+            prim.AngularVelocity = new Vector3(
+                                    Convert.ToSingle(primRow["AngularVelocityX"]),
+                                    Convert.ToSingle(primRow["AngularVelocityY"]),
+                                    Convert.ToSingle(primRow["AngularVelocityZ"]));
+
+            prim.Acceleration = new Vector3(
+                                Convert.ToSingle(primRow["AccelerationX"]),
+                                Convert.ToSingle(primRow["AccelerationY"]),
+                                Convert.ToSingle(primRow["AccelerationZ"]));
+
+            // quaternions
+            prim.RotationOffset = new Quaternion(
+                                Convert.ToSingle(primRow["RotationX"]),
+                                Convert.ToSingle(primRow["RotationY"]),
+                                Convert.ToSingle(primRow["RotationZ"]),
+                                Convert.ToSingle(primRow["RotationW"]));
+
+            prim.SitTargetPositionLL = new Vector3(
+                                Convert.ToSingle(primRow["SitTargetOffsetX"]),
+                                Convert.ToSingle(primRow["SitTargetOffsetY"]),
+                                Convert.ToSingle(primRow["SitTargetOffsetZ"]));
+
+            prim.SitTargetOrientationLL = new Quaternion(
+                                Convert.ToSingle(primRow["SitTargetOrientX"]),
+                                Convert.ToSingle(primRow["SitTargetOrientY"]),
+                                Convert.ToSingle(primRow["SitTargetOrientZ"]),
+                                Convert.ToSingle(primRow["SitTargetOrientW"]));
+
+            prim.PayPrice[0] = Convert.ToInt32(primRow["PayPrice"]);
+            prim.PayPrice[1] = Convert.ToInt32(primRow["PayButton1"]);
+            prim.PayPrice[2] = Convert.ToInt32(primRow["PayButton2"]);
+            prim.PayPrice[3] = Convert.ToInt32(primRow["PayButton3"]);
+            prim.PayPrice[4] = Convert.ToInt32(primRow["PayButton4"]);
+
+            prim.Sound = new UUID((Guid)primRow["LoopedSound"]);
+            prim.SoundGain = Convert.ToSingle(primRow["LoopedSoundGain"]);
+            prim.SoundFlags = 1; // If it's persisted at all, it's looped
+
+            if (!(primRow["TextureAnimation"] is DBNull))
+                prim.TextureAnimation = (Byte[])primRow["TextureAnimation"];
+            if (!(primRow["ParticleSystem"] is DBNull))
+                prim.ParticleSystem = (Byte[])primRow["ParticleSystem"];
+
+            prim.AngularVelocity = new Vector3(
+                                        Convert.ToSingle(primRow["OmegaX"]),
+                                        Convert.ToSingle(primRow["OmegaY"]),
+                                        Convert.ToSingle(primRow["OmegaZ"]));
+
+            prim.SetCameraEyeOffset(new Vector3(
+                                        Convert.ToSingle(primRow["CameraEyeOffsetX"]),
+                                        Convert.ToSingle(primRow["CameraEyeOffsetY"]),
+                                        Convert.ToSingle(primRow["CameraEyeOffsetZ"])
+                                        ));
+
+            prim.SetCameraAtOffset(new Vector3(
+                                       Convert.ToSingle(primRow["CameraAtOffsetX"]),
+                                       Convert.ToSingle(primRow["CameraAtOffsetY"]),
+                                       Convert.ToSingle(primRow["CameraAtOffsetZ"])
+                                       ));
+
+            if (Convert.ToInt16(primRow["ForceMouselook"]) != 0)
+                prim.SetForceMouselook(true);
+
+            prim.ScriptAccessPin = Convert.ToInt32(primRow["ScriptAccessPin"]);
+
+            if (Convert.ToInt16(primRow["AllowedDrop"]) != 0)
+                prim.AllowedDrop = true;
+
+            if (Convert.ToInt16(primRow["DieAtEdge"]) != 0)
+                prim.DIE_AT_EDGE = true;
+
+            prim.SalePrice = Convert.ToInt32(primRow["SalePrice"]);
+            prim.ObjectSaleType = Convert.ToByte(primRow["SaleType"]);
+
+            prim.Material = Convert.ToByte(primRow["Material"]);
+
+            if (!(primRow["ClickAction"] is DBNull))
+                prim.ClickAction = Convert.ToByte(primRow["ClickAction"]);
+
+            prim.CollisionSound = new UUID((Guid)primRow["CollisionSound"]);
+            prim.CollisionSoundVolume = Convert.ToSingle(primRow["CollisionSoundVolume"]);
+
+            prim.PassTouches = (bool)primRow["PassTouches"];
+
+            if (!(primRow["MediaURL"] is System.DBNull))
+                prim.MediaUrl = (string)primRow["MediaURL"];
+
+            if (!(primRow["DynAttrs"] is System.DBNull) && (string)primRow["DynAttrs"] != "")
+                prim.DynAttrs = DAMap.FromXml((string)primRow["DynAttrs"]);
+            else
+                prim.DynAttrs = new DAMap();             
+
+            prim.PhysicsShapeType = Convert.ToByte(primRow["PhysicsShapeType"]);
+            prim.Density = Convert.ToSingle(primRow["Density"]);
+            prim.GravityModifier = Convert.ToSingle(primRow["GravityModifier"]);
+            prim.Friction = Convert.ToSingle(primRow["Friction"]);
+            prim.Restitution = Convert.ToSingle(primRow["Restitution"]);
+
+            return prim;
+        }
+
+        /// <summary>
+        /// Builds the prim shape from a datarecord.
+        /// </summary>
+        /// <param name="shapeRow">The row.</param>
+        /// <returns></returns>
+        private static PrimitiveBaseShape BuildShape(IDataRecord shapeRow)
+        {
+            PrimitiveBaseShape baseShape = new PrimitiveBaseShape();
+
+            baseShape.Scale = new Vector3(
+                        (float)Convert.ToDouble(shapeRow["ScaleX"]),
+                        (float)Convert.ToDouble(shapeRow["ScaleY"]),
+                        (float)Convert.ToDouble(shapeRow["ScaleZ"]));
+
+            // paths
+            baseShape.PCode = Convert.ToByte(shapeRow["PCode"]);
+            baseShape.PathBegin = Convert.ToUInt16(shapeRow["PathBegin"]);
+            baseShape.PathEnd = Convert.ToUInt16(shapeRow["PathEnd"]);
+            baseShape.PathScaleX = Convert.ToByte(shapeRow["PathScaleX"]);
+            baseShape.PathScaleY = Convert.ToByte(shapeRow["PathScaleY"]);
+            baseShape.PathShearX = Convert.ToByte(shapeRow["PathShearX"]);
+            baseShape.PathShearY = Convert.ToByte(shapeRow["PathShearY"]);
+            baseShape.PathSkew = Convert.ToSByte(shapeRow["PathSkew"]);
+            baseShape.PathCurve = Convert.ToByte(shapeRow["PathCurve"]);
+            baseShape.PathRadiusOffset = Convert.ToSByte(shapeRow["PathRadiusOffset"]);
+            baseShape.PathRevolutions = Convert.ToByte(shapeRow["PathRevolutions"]);
+            baseShape.PathTaperX = Convert.ToSByte(shapeRow["PathTaperX"]);
+            baseShape.PathTaperY = Convert.ToSByte(shapeRow["PathTaperY"]);
+            baseShape.PathTwist = Convert.ToSByte(shapeRow["PathTwist"]);
+            baseShape.PathTwistBegin = Convert.ToSByte(shapeRow["PathTwistBegin"]);
+            // profile
+            baseShape.ProfileBegin = Convert.ToUInt16(shapeRow["ProfileBegin"]);
+            baseShape.ProfileEnd = Convert.ToUInt16(shapeRow["ProfileEnd"]);
+            baseShape.ProfileCurve = Convert.ToByte(shapeRow["ProfileCurve"]);
+            baseShape.ProfileHollow = Convert.ToUInt16(shapeRow["ProfileHollow"]);
+
+            byte[] textureEntry = (byte[])shapeRow["Texture"];
+            baseShape.TextureEntry = textureEntry;
+
+            baseShape.ExtraParams = (byte[])shapeRow["ExtraParams"];
+
+            try
+            {
+                baseShape.State = Convert.ToByte(shapeRow["State"]);
+            }
+            catch (InvalidCastException)
+            {
+            }
+
+            if (!(shapeRow["Media"] is System.DBNull))
+            {
+                baseShape.Media = PrimitiveBaseShape.MediaList.FromXml((string)shapeRow["Media"]);
+            }
+
+            return baseShape;
+        }
+
+        /// <summary>
+        /// Build a prim inventory item from the persisted data.
+        /// </summary>
+        /// <param name="inventoryRow"></param>
+        /// <returns></returns>
+        private static TaskInventoryItem BuildItem(IDataRecord inventoryRow)
+        {
+            TaskInventoryItem taskItem = new TaskInventoryItem();
+
+            taskItem.ItemID = new UUID((Guid)inventoryRow["itemID"]);
+            taskItem.ParentPartID = new UUID((Guid)inventoryRow["primID"]);
+            taskItem.AssetID = new UUID((Guid)inventoryRow["assetID"]);
+            taskItem.ParentID = new UUID((Guid)inventoryRow["parentFolderID"]);
+
+            taskItem.InvType = Convert.ToInt32(inventoryRow["invType"]);
+            taskItem.Type = Convert.ToInt32(inventoryRow["assetType"]);
+
+            taskItem.Name = (string)inventoryRow["name"];
+            taskItem.Description = (string)inventoryRow["description"];
+            taskItem.CreationDate = Convert.ToUInt32(inventoryRow["creationDate"]);
+            //taskItem.creatorID = new UUID((Guid)inventoryRow["creatorID"]);
+            taskItem.CreatorIdentification = (string)inventoryRow["creatorID"].ToString();
+            taskItem.OwnerID = new UUID((Guid)inventoryRow["ownerID"]);
+            taskItem.LastOwnerID = new UUID((Guid)inventoryRow["lastOwnerID"]);
+            taskItem.GroupID = new UUID((Guid)inventoryRow["groupID"]);
+
+            taskItem.NextPermissions = Convert.ToUInt32(inventoryRow["nextPermissions"]);
+            taskItem.CurrentPermissions = Convert.ToUInt32(inventoryRow["currentPermissions"]);
+            taskItem.BasePermissions = Convert.ToUInt32(inventoryRow["basePermissions"]);
+            taskItem.EveryonePermissions = Convert.ToUInt32(inventoryRow["everyonePermissions"]);
+            taskItem.GroupPermissions = Convert.ToUInt32(inventoryRow["groupPermissions"]);
+            taskItem.Flags = Convert.ToUInt32(inventoryRow["flags"]);
+
+            return taskItem;
+        }
+
+        #endregion
+
+        #region Create parameters methods
+
+        /// <summary>
+        /// Creates the prim inventory parameters.
+        /// </summary>
+        /// <param name="taskItem">item in inventory.</param>
+        /// <returns></returns>
+        private NpgsqlParameter[] CreatePrimInventoryParameters(TaskInventoryItem taskItem)
+        {
+            List<NpgsqlParameter> parameters = new List<NpgsqlParameter>();
+
+            parameters.Add(_Database.CreateParameter("itemID", taskItem.ItemID));
+            parameters.Add(_Database.CreateParameter("primID", taskItem.ParentPartID));
+            parameters.Add(_Database.CreateParameter("assetID", taskItem.AssetID));
+            parameters.Add(_Database.CreateParameter("parentFolderID", taskItem.ParentID));
+            parameters.Add(_Database.CreateParameter("invType", taskItem.InvType));
+            parameters.Add(_Database.CreateParameter("assetType", taskItem.Type));
+
+            parameters.Add(_Database.CreateParameter("name", taskItem.Name));
+            parameters.Add(_Database.CreateParameter("description", taskItem.Description));
+            parameters.Add(_Database.CreateParameter("creationDate", taskItem.CreationDate));
+            parameters.Add(_Database.CreateParameter("creatorID", taskItem.CreatorID));
+            parameters.Add(_Database.CreateParameter("ownerID", taskItem.OwnerID));
+            parameters.Add(_Database.CreateParameter("lastOwnerID", taskItem.LastOwnerID));
+            parameters.Add(_Database.CreateParameter("groupID", taskItem.GroupID));
+            parameters.Add(_Database.CreateParameter("nextPermissions", taskItem.NextPermissions));
+            parameters.Add(_Database.CreateParameter("currentPermissions", taskItem.CurrentPermissions));
+            parameters.Add(_Database.CreateParameter("basePermissions", taskItem.BasePermissions));
+            parameters.Add(_Database.CreateParameter("everyonePermissions", taskItem.EveryonePermissions));
+            parameters.Add(_Database.CreateParameter("groupPermissions", taskItem.GroupPermissions));
+            parameters.Add(_Database.CreateParameter("flags", taskItem.Flags));
+
+            return parameters.ToArray();
+        }
+
+        /// <summary>
+        /// Creates the region setting parameters.
+        /// </summary>
+        /// <param name="settings">regionsettings.</param>
+        /// <returns></returns>
+        private NpgsqlParameter[] CreateRegionSettingParameters(RegionSettings settings)
+        {
+            List<NpgsqlParameter> parameters = new List<NpgsqlParameter>();
+
+            parameters.Add(_Database.CreateParameter("regionUUID", settings.RegionUUID));
+            parameters.Add(_Database.CreateParameter("block_terraform", settings.BlockTerraform));
+            parameters.Add(_Database.CreateParameter("block_fly", settings.BlockFly));
+            parameters.Add(_Database.CreateParameter("allow_damage", settings.AllowDamage));
+            parameters.Add(_Database.CreateParameter("restrict_pushing", settings.RestrictPushing));
+            parameters.Add(_Database.CreateParameter("allow_land_resell", settings.AllowLandResell));
+            parameters.Add(_Database.CreateParameter("allow_land_join_divide", settings.AllowLandJoinDivide));
+            parameters.Add(_Database.CreateParameter("block_show_in_search", settings.BlockShowInSearch));
+            parameters.Add(_Database.CreateParameter("agent_limit", settings.AgentLimit));
+            parameters.Add(_Database.CreateParameter("object_bonus", settings.ObjectBonus));
+            parameters.Add(_Database.CreateParameter("maturity", settings.Maturity));
+            parameters.Add(_Database.CreateParameter("disable_scripts", settings.DisableScripts));
+            parameters.Add(_Database.CreateParameter("disable_collisions", settings.DisableCollisions));
+            parameters.Add(_Database.CreateParameter("disable_physics", settings.DisablePhysics));
+            parameters.Add(_Database.CreateParameter("terrain_texture_1", settings.TerrainTexture1));
+            parameters.Add(_Database.CreateParameter("terrain_texture_2", settings.TerrainTexture2));
+            parameters.Add(_Database.CreateParameter("terrain_texture_3", settings.TerrainTexture3));
+            parameters.Add(_Database.CreateParameter("terrain_texture_4", settings.TerrainTexture4));
+            parameters.Add(_Database.CreateParameter("elevation_1_nw", settings.Elevation1NW));
+            parameters.Add(_Database.CreateParameter("elevation_2_nw", settings.Elevation2NW));
+            parameters.Add(_Database.CreateParameter("elevation_1_ne", settings.Elevation1NE));
+            parameters.Add(_Database.CreateParameter("elevation_2_ne", settings.Elevation2NE));
+            parameters.Add(_Database.CreateParameter("elevation_1_se", settings.Elevation1SE));
+            parameters.Add(_Database.CreateParameter("elevation_2_se", settings.Elevation2SE));
+            parameters.Add(_Database.CreateParameter("elevation_1_sw", settings.Elevation1SW));
+            parameters.Add(_Database.CreateParameter("elevation_2_sw", settings.Elevation2SW));
+            parameters.Add(_Database.CreateParameter("water_height", settings.WaterHeight));
+            parameters.Add(_Database.CreateParameter("terrain_raise_limit", settings.TerrainRaiseLimit));
+            parameters.Add(_Database.CreateParameter("terrain_lower_limit", settings.TerrainLowerLimit));
+            parameters.Add(_Database.CreateParameter("use_estate_sun", settings.UseEstateSun));
+            parameters.Add(_Database.CreateParameter("Sandbox", settings.Sandbox));
+            parameters.Add(_Database.CreateParameter("fixed_sun", settings.FixedSun));
+            parameters.Add(_Database.CreateParameter("sun_position", settings.SunPosition));
+            parameters.Add(_Database.CreateParameter("sunvectorx", settings.SunVector.X));
+            parameters.Add(_Database.CreateParameter("sunvectory", settings.SunVector.Y));
+            parameters.Add(_Database.CreateParameter("sunvectorz", settings.SunVector.Z));
+            parameters.Add(_Database.CreateParameter("covenant", settings.Covenant));
+            parameters.Add(_Database.CreateParameter("covenant_datetime", settings.CovenantChangedDateTime));
+            parameters.Add(_Database.CreateParameter("Loaded_Creation_DateTime", settings.LoadedCreationDateTime));
+            parameters.Add(_Database.CreateParameter("Loaded_Creation_ID", settings.LoadedCreationID));
+            parameters.Add(_Database.CreateParameter("TerrainImageID", settings.TerrainImageID));
+            parameters.Add(_Database.CreateParameter("ParcelImageID", settings.ParcelImageID));
+            parameters.Add(_Database.CreateParameter("TelehubObject", settings.TelehubObject));
+
+            return parameters.ToArray();
+        }
+
+        /// <summary>
+        /// Creates the land parameters.
+        /// </summary>
+        /// <param name="land">land parameters.</param>
+        /// <param name="regionUUID">region UUID.</param>
+        /// <returns></returns>
+        private NpgsqlParameter[] CreateLandParameters(LandData land, UUID regionUUID)
+        {
+            List<NpgsqlParameter> parameters = new List<NpgsqlParameter>();
+
+            parameters.Add(_Database.CreateParameter("UUID", land.GlobalID));
+            parameters.Add(_Database.CreateParameter("RegionUUID", regionUUID));
+            parameters.Add(_Database.CreateParameter("LocalLandID", land.LocalID));
+
+            // Bitmap is a byte[512]
+            parameters.Add(_Database.CreateParameter("Bitmap", land.Bitmap));
+
+            parameters.Add(_Database.CreateParameter("Name", land.Name));
+            parameters.Add(_Database.CreateParameter("Description", land.Description));
+            parameters.Add(_Database.CreateParameter("OwnerUUID", land.OwnerID));
+            parameters.Add(_Database.CreateParameter("IsGroupOwned", land.IsGroupOwned));
+            parameters.Add(_Database.CreateParameter("Area", land.Area));
+            parameters.Add(_Database.CreateParameter("AuctionID", land.AuctionID)); //Unemplemented
+            parameters.Add(_Database.CreateParameter("Category", (int)land.Category)); //Enum libsecondlife.Parcel.ParcelCategory
+            parameters.Add(_Database.CreateParameter("ClaimDate", land.ClaimDate));
+            parameters.Add(_Database.CreateParameter("ClaimPrice", land.ClaimPrice));
+            parameters.Add(_Database.CreateParameter("GroupUUID", land.GroupID));
+            parameters.Add(_Database.CreateParameter("SalePrice", land.SalePrice));
+            parameters.Add(_Database.CreateParameter("LandStatus", (int)land.Status)); //Enum. libsecondlife.Parcel.ParcelStatus
+            parameters.Add(_Database.CreateParameter("LandFlags", land.Flags));
+            parameters.Add(_Database.CreateParameter("LandingType", Convert.ToInt32( land.LandingType) ));
+            parameters.Add(_Database.CreateParameter("MediaAutoScale", Convert.ToInt32( land.MediaAutoScale )));
+            parameters.Add(_Database.CreateParameter("MediaTextureUUID", land.MediaID));
+            parameters.Add(_Database.CreateParameter("MediaURL", land.MediaURL));
+            parameters.Add(_Database.CreateParameter("MusicURL", land.MusicURL));
+            parameters.Add(_Database.CreateParameter("PassHours", land.PassHours));
+            parameters.Add(_Database.CreateParameter("PassPrice", land.PassPrice));
+            parameters.Add(_Database.CreateParameter("SnapshotUUID", land.SnapshotID));
+            parameters.Add(_Database.CreateParameter("UserLocationX", land.UserLocation.X));
+            parameters.Add(_Database.CreateParameter("UserLocationY", land.UserLocation.Y));
+            parameters.Add(_Database.CreateParameter("UserLocationZ", land.UserLocation.Z));
+            parameters.Add(_Database.CreateParameter("UserLookAtX", land.UserLookAt.X));
+            parameters.Add(_Database.CreateParameter("UserLookAtY", land.UserLookAt.Y));
+            parameters.Add(_Database.CreateParameter("UserLookAtZ", land.UserLookAt.Z));
+            parameters.Add(_Database.CreateParameter("AuthBuyerID", land.AuthBuyerID));
+            parameters.Add(_Database.CreateParameter("OtherCleanTime", land.OtherCleanTime));
+
+            return parameters.ToArray();
+        }
+
+        /// <summary>
+        /// Creates the land access parameters.
+        /// </summary>
+        /// <param name="parcelAccessEntry">parcel access entry.</param>
+        /// <param name="parcelID">parcel ID.</param>
+        /// <returns></returns>
+        private NpgsqlParameter[] CreateLandAccessParameters(LandAccessEntry parcelAccessEntry, UUID parcelID)
+        {
+            List<NpgsqlParameter> parameters = new List<NpgsqlParameter>();
+
+            parameters.Add(_Database.CreateParameter("LandUUID", parcelID));
+            parameters.Add(_Database.CreateParameter("AccessUUID", parcelAccessEntry.AgentID));
+            parameters.Add(_Database.CreateParameter("Flags", parcelAccessEntry.Flags));
+            parameters.Add(_Database.CreateParameter("Expires", parcelAccessEntry.Expires));
+
+            return parameters.ToArray();
+        }
+
+        /// <summary>
+        /// Creates the prim parameters for storing in DB.
+        /// </summary>
+        /// <param name="prim">Basic data of SceneObjectpart prim.</param>
+        /// <param name="sceneGroupID">The scenegroup ID.</param>
+        /// <param name="regionUUID">The region ID.</param>
+        /// <returns></returns>
+        private NpgsqlParameter[] CreatePrimParameters(SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
+        {
+            List<NpgsqlParameter> parameters = new List<NpgsqlParameter>();
+
+            parameters.Add(_Database.CreateParameter("UUID", prim.UUID));
+            parameters.Add(_Database.CreateParameter("RegionUUID", regionUUID));
+            parameters.Add(_Database.CreateParameter("CreationDate", prim.CreationDate));
+            parameters.Add(_Database.CreateParameter("Name", prim.Name));
+            parameters.Add(_Database.CreateParameter("SceneGroupID", sceneGroupID));
+            // the UUID of the root part for this SceneObjectGroup
+            // various text fields
+            parameters.Add(_Database.CreateParameter("Text", prim.Text));
+            parameters.Add(_Database.CreateParameter("ColorR", prim.Color.R));
+            parameters.Add(_Database.CreateParameter("ColorG", prim.Color.G));
+            parameters.Add(_Database.CreateParameter("ColorB", prim.Color.B));
+            parameters.Add(_Database.CreateParameter("ColorA", prim.Color.A));
+            parameters.Add(_Database.CreateParameter("Description", prim.Description));
+            parameters.Add(_Database.CreateParameter("SitName", prim.SitName));
+            parameters.Add(_Database.CreateParameter("TouchName", prim.TouchName));
+            // permissions
+            parameters.Add(_Database.CreateParameter("ObjectFlags", (uint)prim.Flags));
+            parameters.Add(_Database.CreateParameter("CreatorID", prim.CreatorID));
+            parameters.Add(_Database.CreateParameter("OwnerID", prim.OwnerID));
+            parameters.Add(_Database.CreateParameter("GroupID", prim.GroupID));
+            parameters.Add(_Database.CreateParameter("LastOwnerID", prim.LastOwnerID));
+            parameters.Add(_Database.CreateParameter("OwnerMask", prim.OwnerMask));
+            parameters.Add(_Database.CreateParameter("NextOwnerMask", prim.NextOwnerMask));
+            parameters.Add(_Database.CreateParameter("GroupMask", prim.GroupMask));
+            parameters.Add(_Database.CreateParameter("EveryoneMask", prim.EveryoneMask));
+            parameters.Add(_Database.CreateParameter("BaseMask", prim.BaseMask));
+            // vectors
+            parameters.Add(_Database.CreateParameter("PositionX", prim.OffsetPosition.X));
+            parameters.Add(_Database.CreateParameter("PositionY", prim.OffsetPosition.Y));
+            parameters.Add(_Database.CreateParameter("PositionZ", prim.OffsetPosition.Z));
+            parameters.Add(_Database.CreateParameter("GroupPositionX", prim.GroupPosition.X));
+            parameters.Add(_Database.CreateParameter("GroupPositionY", prim.GroupPosition.Y));
+            parameters.Add(_Database.CreateParameter("GroupPositionZ", prim.GroupPosition.Z));
+            parameters.Add(_Database.CreateParameter("VelocityX", prim.Velocity.X));
+            parameters.Add(_Database.CreateParameter("VelocityY", prim.Velocity.Y));
+            parameters.Add(_Database.CreateParameter("VelocityZ", prim.Velocity.Z));
+            parameters.Add(_Database.CreateParameter("AngularVelocityX", prim.AngularVelocity.X));
+            parameters.Add(_Database.CreateParameter("AngularVelocityY", prim.AngularVelocity.Y));
+            parameters.Add(_Database.CreateParameter("AngularVelocityZ", prim.AngularVelocity.Z));
+            parameters.Add(_Database.CreateParameter("AccelerationX", prim.Acceleration.X));
+            parameters.Add(_Database.CreateParameter("AccelerationY", prim.Acceleration.Y));
+            parameters.Add(_Database.CreateParameter("AccelerationZ", prim.Acceleration.Z));
+            // quaternions
+            parameters.Add(_Database.CreateParameter("RotationX", prim.RotationOffset.X));
+            parameters.Add(_Database.CreateParameter("RotationY", prim.RotationOffset.Y));
+            parameters.Add(_Database.CreateParameter("RotationZ", prim.RotationOffset.Z));
+            parameters.Add(_Database.CreateParameter("RotationW", prim.RotationOffset.W));
+
+            // Sit target
+            Vector3 sitTargetPos = prim.SitTargetPositionLL;
+            parameters.Add(_Database.CreateParameter("SitTargetOffsetX", sitTargetPos.X));
+            parameters.Add(_Database.CreateParameter("SitTargetOffsetY", sitTargetPos.Y));
+            parameters.Add(_Database.CreateParameter("SitTargetOffsetZ", sitTargetPos.Z));
+
+            Quaternion sitTargetOrient = prim.SitTargetOrientationLL;
+            parameters.Add(_Database.CreateParameter("SitTargetOrientW", sitTargetOrient.W));
+            parameters.Add(_Database.CreateParameter("SitTargetOrientX", sitTargetOrient.X));
+            parameters.Add(_Database.CreateParameter("SitTargetOrientY", sitTargetOrient.Y));
+            parameters.Add(_Database.CreateParameter("SitTargetOrientZ", sitTargetOrient.Z));
+
+            parameters.Add(_Database.CreateParameter("PayPrice", prim.PayPrice[0]));
+            parameters.Add(_Database.CreateParameter("PayButton1", prim.PayPrice[1]));
+            parameters.Add(_Database.CreateParameter("PayButton2", prim.PayPrice[2]));
+            parameters.Add(_Database.CreateParameter("PayButton3", prim.PayPrice[3]));
+            parameters.Add(_Database.CreateParameter("PayButton4", prim.PayPrice[4]));
+
+            if ((prim.SoundFlags & 1) != 0) // Looped
+            {
+                parameters.Add(_Database.CreateParameter("LoopedSound", prim.Sound));
+                parameters.Add(_Database.CreateParameter("LoopedSoundGain", prim.SoundGain));
+            }
+            else
+            {
+                parameters.Add(_Database.CreateParameter("LoopedSound", UUID.Zero));
+                parameters.Add(_Database.CreateParameter("LoopedSoundGain", 0.0f));
+            }
+
+            parameters.Add(_Database.CreateParameter("TextureAnimation", prim.TextureAnimation));
+            parameters.Add(_Database.CreateParameter("ParticleSystem", prim.ParticleSystem));
+
+            parameters.Add(_Database.CreateParameter("OmegaX", prim.AngularVelocity.X));
+            parameters.Add(_Database.CreateParameter("OmegaY", prim.AngularVelocity.Y));
+            parameters.Add(_Database.CreateParameter("OmegaZ", prim.AngularVelocity.Z));
+
+            parameters.Add(_Database.CreateParameter("CameraEyeOffsetX", prim.GetCameraEyeOffset().X));
+            parameters.Add(_Database.CreateParameter("CameraEyeOffsetY", prim.GetCameraEyeOffset().Y));
+            parameters.Add(_Database.CreateParameter("CameraEyeOffsetZ", prim.GetCameraEyeOffset().Z));
+
+            parameters.Add(_Database.CreateParameter("CameraAtOffsetX", prim.GetCameraAtOffset().X));
+            parameters.Add(_Database.CreateParameter("CameraAtOffsetY", prim.GetCameraAtOffset().Y));
+            parameters.Add(_Database.CreateParameter("CameraAtOffsetZ", prim.GetCameraAtOffset().Z));
+
+            if (prim.GetForceMouselook())
+                parameters.Add(_Database.CreateParameter("ForceMouselook", 1));
+            else
+                parameters.Add(_Database.CreateParameter("ForceMouselook", 0));
+
+            parameters.Add(_Database.CreateParameter("ScriptAccessPin", prim.ScriptAccessPin));
+
+            if (prim.AllowedDrop)
+                parameters.Add(_Database.CreateParameter("AllowedDrop", 1));
+            else
+                parameters.Add(_Database.CreateParameter("AllowedDrop", 0));
+
+            if (prim.DIE_AT_EDGE)
+                parameters.Add(_Database.CreateParameter("DieAtEdge", 1));
+            else
+                parameters.Add(_Database.CreateParameter("DieAtEdge", 0));
+
+            parameters.Add(_Database.CreateParameter("SalePrice", prim.SalePrice));
+            parameters.Add(_Database.CreateParameter("SaleType", prim.ObjectSaleType));
+
+            byte clickAction = prim.ClickAction;
+            parameters.Add(_Database.CreateParameter("ClickAction", clickAction));
+
+            parameters.Add(_Database.CreateParameter("Material", prim.Material));
+
+            parameters.Add(_Database.CreateParameter("CollisionSound", prim.CollisionSound));
+            parameters.Add(_Database.CreateParameter("CollisionSoundVolume", prim.CollisionSoundVolume));
+            
+            parameters.Add(_Database.CreateParameter("PassTouches", prim.PassTouches));
+
+            parameters.Add(_Database.CreateParameter("LinkNumber", prim.LinkNum));
+            parameters.Add(_Database.CreateParameter("MediaURL", prim.MediaUrl));
+            
+            if (prim.DynAttrs.CountNamespaces > 0)
+                parameters.Add(_Database.CreateParameter("DynAttrs", prim.DynAttrs.ToXml()));
+            else
+                parameters.Add(_Database.CreateParameter("DynAttrs", null));
+            
+            parameters.Add(_Database.CreateParameter("PhysicsShapeType", prim.PhysicsShapeType));
+            parameters.Add(_Database.CreateParameter("Density", (double)prim.Density));
+            parameters.Add(_Database.CreateParameter("GravityModifier", (double)prim.GravityModifier));
+            parameters.Add(_Database.CreateParameter("Friction", (double)prim.Friction));
+            parameters.Add(_Database.CreateParameter("Restitution", (double)prim.Restitution));
+
+            return parameters.ToArray();
+        }
+
+        /// <summary>
+        /// Creates the primshape parameters for stroing in DB.
+        /// </summary>
+        /// <param name="prim">Basic data of SceneObjectpart prim.</param>
+        /// <param name="sceneGroupID">The scene group ID.</param>
+        /// <param name="regionUUID">The region UUID.</param>
+        /// <returns></returns>
+        private NpgsqlParameter[] CreatePrimShapeParameters(SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
+        {
+            List<NpgsqlParameter> parameters = new List<NpgsqlParameter>();
+
+            PrimitiveBaseShape s = prim.Shape;
+            parameters.Add(_Database.CreateParameter("UUID", prim.UUID));
+            // shape is an enum
+            parameters.Add(_Database.CreateParameter("Shape", 0));
+            // vectors
+            parameters.Add(_Database.CreateParameter("ScaleX", s.Scale.X));
+            parameters.Add(_Database.CreateParameter("ScaleY", s.Scale.Y));
+            parameters.Add(_Database.CreateParameter("ScaleZ", s.Scale.Z));
+            // paths
+            parameters.Add(_Database.CreateParameter("PCode", s.PCode));
+            parameters.Add(_Database.CreateParameter("PathBegin", s.PathBegin));
+            parameters.Add(_Database.CreateParameter("PathEnd", s.PathEnd));
+            parameters.Add(_Database.CreateParameter("PathScaleX", s.PathScaleX));
+            parameters.Add(_Database.CreateParameter("PathScaleY", s.PathScaleY));
+            parameters.Add(_Database.CreateParameter("PathShearX", s.PathShearX));
+            parameters.Add(_Database.CreateParameter("PathShearY", s.PathShearY));
+            parameters.Add(_Database.CreateParameter("PathSkew", s.PathSkew));
+            parameters.Add(_Database.CreateParameter("PathCurve", s.PathCurve));
+            parameters.Add(_Database.CreateParameter("PathRadiusOffset", s.PathRadiusOffset));
+            parameters.Add(_Database.CreateParameter("PathRevolutions", s.PathRevolutions));
+            parameters.Add(_Database.CreateParameter("PathTaperX", s.PathTaperX));
+            parameters.Add(_Database.CreateParameter("PathTaperY", s.PathTaperY));
+            parameters.Add(_Database.CreateParameter("PathTwist", s.PathTwist));
+            parameters.Add(_Database.CreateParameter("PathTwistBegin", s.PathTwistBegin));
+            // profile
+            parameters.Add(_Database.CreateParameter("ProfileBegin", s.ProfileBegin));
+            parameters.Add(_Database.CreateParameter("ProfileEnd", s.ProfileEnd));
+            parameters.Add(_Database.CreateParameter("ProfileCurve", s.ProfileCurve));
+            parameters.Add(_Database.CreateParameter("ProfileHollow", s.ProfileHollow));
+            parameters.Add(_Database.CreateParameter("Texture", s.TextureEntry));
+            parameters.Add(_Database.CreateParameter("ExtraParams", s.ExtraParams));
+            parameters.Add(_Database.CreateParameter("State", s.State));
+
+            if (null == s.Media)
+            {
+                parameters.Add(_Database.CreateParameter("Media", DBNull.Value));
+            }
+            else
+            {
+                parameters.Add(_Database.CreateParameter("Media", s.Media.ToXml()));
+            }
+
+            return parameters.ToArray();
+        }
+
+        #endregion
+
+        #endregion
+
+        private void LoadSpawnPoints(RegionSettings rs)
+        {
+            rs.ClearSpawnPoints();
+
+            string sql = @"SELECT ""Yaw"", ""Pitch"", ""Distance"" FROM spawn_points WHERE ""RegionUUID"" = :RegionUUID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", rs.RegionUUID));
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    if (reader.Read())
+                    {
+                        SpawnPoint sp = new SpawnPoint();
+
+                        sp.Yaw = (float)reader["Yaw"];
+                        sp.Pitch = (float)reader["Pitch"];
+                        sp.Distance = (float)reader["Distance"];
+
+                        rs.AddSpawnPoint(sp);
+                    }
+                }
+            }
+        }
+
+        private void SaveSpawnPoints(RegionSettings rs)
+        {
+            string sql = @"DELETE FROM spawn_points WHERE ""RegionUUID"" = :RegionUUID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", rs.RegionUUID));
+                conn.Open();
+                cmd.ExecuteNonQuery();
+            }
+            foreach (SpawnPoint p in rs.SpawnPoints())
+            {
+                sql = @"INSERT INTO spawn_points (""RegionUUID"", ""Yaw"", ""Pitch"", ""Distance"") VALUES (:RegionUUID, :Yaw, :Pitch, :Distance)";
+                using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", rs.RegionUUID));
+                    cmd.Parameters.Add(_Database.CreateParameter("Yaw", p.Yaw));
+                    cmd.Parameters.Add(_Database.CreateParameter("Pitch", p.Pitch));
+                    cmd.Parameters.Add(_Database.CreateParameter("Distance", p.Distance));
+                    conn.Open();
+                    cmd.ExecuteNonQuery();
+                }
+            }
+        }
+
+        public void SaveExtra(UUID regionID, string name, string value)
+        {
+        }
+
+        public void RemoveExtra(UUID regionID, string name)
+        {
+        }
+
+        public Dictionary<string, string> GetExtra(UUID regionID)
+        {
+            return null;
+        }
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs b/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs
new file mode 100644
index 0000000..00f01cb
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs
@@ -0,0 +1,325 @@
+/*
+ * 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.Data;
+using OpenMetaverse;
+using OpenSim.Framework;
+using System.Text;
+using Npgsql;
+using log4net;
+using System.Reflection;
+
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLUserAccountData : PGSQLGenericTableHandler<UserAccountData>,IUserAccountData
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        
+        public PGSQLUserAccountData(string connectionString, string realm) :
+            base(connectionString, realm, "UserAccount")
+        {
+        }
+        
+        /* 
+        private string m_Realm;
+        private List<string> m_ColumnNames = null;
+        private PGSQLManager m_database;
+
+        public PGSQLUserAccountData(string connectionString, string realm) :
+            base(connectionString, realm, "UserAccount")
+        {
+            m_Realm = realm;
+            m_ConnectionString = connectionString;
+            m_database = new PGSQLManager(connectionString);
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            {
+                conn.Open();
+                Migration m = new Migration(conn, GetType().Assembly, "UserAccount");
+                m.Update();
+            }
+        }
+        */
+        /*
+        public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query)
+        {
+            return null;
+        }
+        */
+        /*
+        public override UserAccountData[] Get(string[] fields, string[] keys)
+        {
+            UserAccountData[] retUA = base.Get(fields,keys);
+
+            if (retUA.Length > 0)
+            {
+                Dictionary<string, string> data = retUA[0].Data;
+                Dictionary<string, string> data2 = new Dictionary<string, string>();
+
+                foreach (KeyValuePair<string,string> chave in data)
+                {
+                    string s2 = chave.Key;
+
+                    data2[s2] = chave.Value;
+
+                    if (!m_FieldTypes.ContainsKey(chave.Key))
+                    {
+                        string tipo = "";
+                        m_FieldTypes.TryGetValue(chave.Key, out tipo);
+                        m_FieldTypes.Add(s2, tipo);
+                    }
+                }
+                foreach (KeyValuePair<string, string> chave in data2)
+                {
+                    if (!retUA[0].Data.ContainsKey(chave.Key))
+                        retUA[0].Data.Add(chave.Key, chave.Value);
+                }
+            }
+
+            return retUA;
+        }
+        */
+        /*
+        public UserAccountData Get(UUID principalID, UUID scopeID)
+        {
+            UserAccountData ret = new UserAccountData();
+            ret.Data = new Dictionary<string, string>();
+
+            string sql = string.Format(@"select * from {0} where ""PrincipalID"" = :principalID", m_Realm);
+            if (scopeID != UUID.Zero)
+                sql += @" and ""ScopeID"" = :scopeID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("principalID", principalID));
+                cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
+                
+                conn.Open();
+                using (NpgsqlDataReader result = cmd.ExecuteReader())
+                {
+                    if (result.Read())
+                    {
+                        ret.PrincipalID = principalID;
+                        UUID scope;
+                        UUID.TryParse(result["scopeid"].ToString(), out scope);
+                        ret.ScopeID = scope;
+
+                        if (m_ColumnNames == null)
+                        {
+                            m_ColumnNames = new List<string>();
+
+                            DataTable schemaTable = result.GetSchemaTable();
+                            foreach (DataRow row in schemaTable.Rows)
+                                m_ColumnNames.Add(row["ColumnName"].ToString());
+                        }
+
+                        foreach (string s in m_ColumnNames)
+                        {
+                            string s2 = s;
+                            if (s2 == "uuid")
+                                continue;
+                            if (s2 == "scopeid")
+                                continue;
+
+                            ret.Data[s] = result[s].ToString();
+                        }
+                        return ret;
+                    }
+                }
+            }
+            return null;
+        }
+        
+        
+        public override bool Store(UserAccountData data)
+        {
+            if (data.Data.ContainsKey("PrincipalID"))
+                data.Data.Remove("PrincipalID");
+            if (data.Data.ContainsKey("ScopeID"))
+                data.Data.Remove("ScopeID");
+
+            string[] fields = new List<string>(data.Data.Keys).ToArray();
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                m_log.DebugFormat("[USER]: Try to update user {0} {1}", data.FirstName, data.LastName);
+
+                StringBuilder updateBuilder = new StringBuilder();
+                updateBuilder.AppendFormat("update {0} set ", m_Realm);
+                bool first = true;
+                foreach (string field in fields)
+                {
+                    if (!first)
+                        updateBuilder.Append(", ");
+                    updateBuilder.AppendFormat("\"{0}\" = :{0}", field);
+
+                    first = false;
+                    if (m_FieldTypes.ContainsKey(field))
+                        cmd.Parameters.Add(m_database.CreateParameter("" + field, data.Data[field], m_FieldTypes[field]));
+                    else
+                        cmd.Parameters.Add(m_database.CreateParameter("" + field, data.Data[field]));
+                }
+
+                updateBuilder.Append(" where \"PrincipalID\" = :principalID");
+
+                if (data.ScopeID != UUID.Zero)
+                    updateBuilder.Append(" and \"ScopeID\" = :scopeID");
+
+                cmd.CommandText = updateBuilder.ToString();
+                cmd.Connection = conn;
+                cmd.Parameters.Add(m_database.CreateParameter("principalID", data.PrincipalID));
+                cmd.Parameters.Add(m_database.CreateParameter("scopeID", data.ScopeID));
+
+                m_log.DebugFormat("[USER]: SQL update user {0} ", cmd.CommandText);
+
+                conn.Open();
+
+                m_log.DebugFormat("[USER]: CON opened update user {0} ", cmd.CommandText);
+
+                int conta = 0;
+                try
+                {
+                    conta = cmd.ExecuteNonQuery();
+                }
+                catch (Exception e){
+                    m_log.ErrorFormat("[USER]: ERROR opened update user {0} ", e.Message);
+                }
+                
+
+                if (conta < 1)
+                {
+                    m_log.DebugFormat("[USER]: Try to insert user {0} {1}", data.FirstName, data.LastName);
+
+                    StringBuilder insertBuilder = new StringBuilder();
+                    insertBuilder.AppendFormat(@"insert into {0} (""PrincipalID"", ""ScopeID"", ""FirstName"", ""LastName"", """, m_Realm);
+                    insertBuilder.Append(String.Join(@""", """, fields));
+                    insertBuilder.Append(@""") values (:principalID, :scopeID, :FirstName, :LastName, :");
+                    insertBuilder.Append(String.Join(", :", fields));
+                    insertBuilder.Append(");");
+
+                    cmd.Parameters.Add(m_database.CreateParameter("FirstName", data.FirstName));
+                    cmd.Parameters.Add(m_database.CreateParameter("LastName", data.LastName));
+
+                    cmd.CommandText = insertBuilder.ToString();
+
+                    if (cmd.ExecuteNonQuery() < 1)
+                    {
+                        return false;
+                    }
+                }
+                else
+                    m_log.DebugFormat("[USER]: User {0} {1} exists", data.FirstName, data.LastName);
+            }
+            return true;
+        }
+        
+
+        public bool Store(UserAccountData data, UUID principalID, string token)
+        {
+            return false;
+        }
+
+        
+        public bool SetDataItem(UUID principalID, string item, string value)
+        {
+            string sql = string.Format(@"update {0} set {1} = :{1} where ""UUID"" = :UUID", m_Realm, item);
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                if (m_FieldTypes.ContainsKey(item))
+                    cmd.Parameters.Add(m_database.CreateParameter("" + item, value, m_FieldTypes[item]));
+                else
+                    cmd.Parameters.Add(m_database.CreateParameter("" + item, value));
+
+                cmd.Parameters.Add(m_database.CreateParameter("UUID", principalID));
+                conn.Open();
+
+                if (cmd.ExecuteNonQuery() > 0)
+                    return true;
+            }
+            return false;
+        }
+        */
+        /*
+        public UserAccountData[] Get(string[] keys, string[] vals)
+        {
+            return null;
+        }
+        */
+
+        public UserAccountData[] GetUsers(UUID scopeID, string query)
+        {
+            string[] words = query.Split(new char[] { ' ' });
+
+            for (int i = 0; i < words.Length; i++)
+            {
+                if (words[i].Length < 3)
+                {
+                    if (i != words.Length - 1)
+                        Array.Copy(words, i + 1, words, i, words.Length - i - 1);
+                    Array.Resize(ref words, words.Length - 1);
+                }
+            }
+
+            if (words.Length == 0)
+                return new UserAccountData[0];
+
+            if (words.Length > 2)
+                return new UserAccountData[0];
+
+            string sql = "";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                if (words.Length == 1)
+                {
+                    sql = String.Format(@"select * from {0} where (""ScopeID""=:ScopeID or ""ScopeID""='00000000-0000-0000-0000-000000000000') and (""FirstName"" ilike :search or ""LastName"" ilike :search)", m_Realm);
+                    cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
+                    cmd.Parameters.Add(m_database.CreateParameter("search", "%" + words[0] + "%"));
+                }
+                else
+                {
+                    sql = String.Format(@"select * from {0} where (""ScopeID""=:ScopeID or ""ScopeID""='00000000-0000-0000-0000-000000000000') and (""FirstName"" ilike :searchFirst or ""LastName"" ilike :searchLast)", m_Realm);
+                    cmd.Parameters.Add(m_database.CreateParameter("searchFirst", "%" + words[0] + "%"));
+                    cmd.Parameters.Add(m_database.CreateParameter("searchLast", "%" + words[1] + "%"));
+                    cmd.Parameters.Add(m_database.CreateParameter("ScopeID", scopeID.ToString()));
+                }
+                cmd.Connection = conn;
+                cmd.CommandText = sql;
+                conn.Open();
+                return DoQuery(cmd);
+            }
+        }
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
new file mode 100644
index 0000000..e3cbf7f
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
@@ -0,0 +1,1075 @@
+/*
+ * 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 OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using log4net;
+using Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    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 (NpgsqlConnection dbcon = new NpgsqlConnection(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 (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+            {
+                string query = @"SELECT ""classifieduuid"", ""name"" FROM classifieds WHERE ""creatoruuid"" = :Id";
+                dbcon.Open();
+                using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                {
+                    cmd.Parameters.AddWithValue("Id", creatorId);
+                    using( NpgsqlDataReader 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 = @"INSERT INTO classifieds ( ""classifieduuid"",""creatoruuid"", ""creationdate"", ""expirationdate"", ""category"",
+                                    ""name"", ""description"", ""parceluuid"", ""parentestate"", ""snapshotuuid"", ""simname"",
+                                    ""posglobal"", ""parcelname"", ""classifiedflags"", ""priceforlisting"")
+                              Select :ClassifiedId, :CreatorId, :CreatedDate, :ExpirationDate, :Category,
+                                     :Name, :Description, :ParcelId, :ParentEstate, :SnapshotId, :SimName 
+                                     :GlobalPos, :ParcelName, :Flags, :ListingPrice 
+                                Where not exists( Select ""classifieduuid"" from classifieds where ""classifieduuid"" = :ClassifiedId );
+
+                           update classifieds
+                              set category =:Category, 
+                                  expirationdate = :ExpirationDate, 
+                                  name = :Name, 
+                                  description  = :Description, 
+                                  parentestate = :ParentEstate, 
+                                  posglobal       = :GlobalPos, 
+                                  parcelname      = :ParcelName,
+                                  classifiedflags = :Flags, 
+                                  priceforlisting = :ListingPrice, 
+                                  snapshotuuid    = :SnapshotId
+                            where classifieduuid = :ClassifiedId ;
+                                ";
+            
+            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 (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(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 classifieduuid = :ClasifiedId ;";
+            
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(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 (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("AdId", ad.ClassifiedId.ToString());
+                        
+                        using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                        {
+                            if(reader.Read ())
+                            {
+                                ad.CreatorId = GetUUID(reader["creatoruuid"]);
+                                ad.ParcelId = GetUUID(reader["parceluuid"]);
+                                ad.SnapshotId = GetUUID(reader["snapshotuuid"]);
+                                ad.CreationDate = Convert.ToInt32(reader["creationdate"]);
+                                ad.ExpirationDate = Convert.ToInt32(reader["expirationdate"]);
+                                ad.ParentEstate = Convert.ToInt32(reader["parentestate"]);
+                                ad.Flags = (byte)Convert.ToInt16(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();
+                                
+                            }
+                        }
+                    }
+                    dbcon.Close();
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                 ": GetPickInfo exception {0}", e.Message);
+            }
+            return true;
+        }
+
+        public static UUID GetUUID( object uuidValue ) {
+
+            UUID ret = UUID.Zero;
+
+            UUID.TryParse(uuidValue.ToString(), out ret);
+
+            return ret;
+        }
+
+
+        #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 (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("Id", avatarId.ToString());
+                        
+                        using (NpgsqlDataReader 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 (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("CreatorId", avatarId.ToString());
+                        cmd.Parameters.AddWithValue("PickId", pickId.ToString());
+                        
+                        using (NpgsqlDataReader 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 ( :PickId, :CreatorId, :TopPick, :ParcelId,:Name, :Desc, :SnapshotId,:User,
+                          :Original, :SimName, :GlobalPos, :SortOrder, :Enabled) 
+                      where not exists ( select pickid from userpicks where pickid = :pickid);
+
+                     Update userpicks
+                        set parceluuid = :ParcelId,
+                            name = :Name,
+                            description  = :Desc,
+                            snapshotuuid = :SnapshotId,
+                            pickuuid     = :PickId,
+                            posglobal    = :GlobalPos
+                       where pickid = :PickId;
+                    ";
+            
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(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 (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(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 (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("Id", notes.UserId.ToString());
+                        cmd.Parameters.AddWithValue("TargetId", notes.TargetId.ToString());
+                        
+                        using (NpgsqlDataReader 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 ( :UserId, :TargetId, :Notes )
+                            where not exists ( Select useruuid from usernotes where useruuid = :UserId and targetuuid = :TargetId );
+
+                           update usernotes
+                              set notes = :Notes
+                            where useruuid = :UserId 
+                              and targetuuid = :TargetId;
+                        ";
+            }
+            
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(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 (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("Id", props.UserId.ToString());
+                        
+                        using (NpgsqlDataReader 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 (NpgsqlCommand put = new NpgsqlCommand(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 (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(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 (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(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 (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query,"\"classifieds\""), dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("Id", avatarId.ToString());
+                        
+                        using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                        {
+                            if(reader.HasRows)
+                            {
+                                while (reader.Read())
+                                {
+                                    data.Add(new OSDString((string)reader["snapshotuuid"].ToString ()));
+                                }
+                            }
+                        }
+                    }
+
+                    dbcon.Close();
+                    dbcon.Open();
+
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query,"\"userpicks\""), dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("Id", avatarId.ToString());
+                        
+                        using (NpgsqlDataReader 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 (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query,"\"userpicks\""), dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("Id", avatarId.ToString());
+                        
+                        using (NpgsqlDataReader 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 (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("Id", avatarId.ToString());
+                        
+                        using (NpgsqlDataReader 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 (NpgsqlCommand put = new NpgsqlCommand(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 (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(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 (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("Id", props.UserId.ToString());
+                        cmd.Parameters.AddWithValue (":TagId", props.TagId.ToString());
+                        
+                        using (NpgsqlDataReader 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 (NpgsqlCommand put = new NpgsqlCommand(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 (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(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/PGSQL/PGSQLXAssetData.cs b/OpenSim/Data/PGSQL/PGSQLXAssetData.cs
new file mode 100644
index 0000000..e959619
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLXAssetData.cs
@@ -0,0 +1,535 @@
+/*
+ * 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.IO;
+using System.IO.Compression;
+using System.Reflection;
+using System.Security.Cryptography;
+using System.Text;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Data;
+using Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLXAssetData : IXAssetDataPlugin
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+
+        /// <summary>
+        /// Number of days that must pass before we update the access time on an asset when it has been fetched.
+        /// </summary>
+        private const int DaysBetweenAccessTimeUpdates = 30;
+
+        private bool m_enableCompression = false;
+        private string m_connectionString;
+        private object m_dbLock = new object();
+
+        /// <summary>
+        /// We can reuse this for all hashing since all methods are single-threaded through m_dbBLock
+        /// </summary>
+        private HashAlgorithm hasher = new SHA256CryptoServiceProvider();
+
+        #region IPlugin Members
+
+        public string Version { get { return "1.0.0.0"; } }
+
+        /// <summary>
+        /// <para>Initialises Asset interface</para>
+        /// <para>
+        /// <list type="bullet">
+        /// <item>Loads and initialises the PGSQL storage plugin.</item>
+        /// <item>Warns and uses the obsolete pgsql_connection.ini if connect string is empty.</item>
+        /// <item>Check for migration</item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        /// <param name="connect">connect string</param>
+        public void Initialise(string connect)
+        {
+            m_log.ErrorFormat("[PGSQL XASSETDATA]: ***********************************************************");
+            m_log.ErrorFormat("[PGSQL XASSETDATA]: ***********************************************************");
+            m_log.ErrorFormat("[PGSQL XASSETDATA]: ***********************************************************");
+            m_log.ErrorFormat("[PGSQL XASSETDATA]: THIS PLUGIN IS STRICTLY EXPERIMENTAL.");
+            m_log.ErrorFormat("[PGSQL XASSETDATA]: DO NOT USE FOR ANY DATA THAT YOU DO NOT MIND LOSING.");
+            m_log.ErrorFormat("[PGSQL XASSETDATA]: DATABASE TABLES CAN CHANGE AT ANY TIME, CAUSING EXISTING DATA TO BE LOST.");
+            m_log.ErrorFormat("[PGSQL XASSETDATA]: ***********************************************************");
+            m_log.ErrorFormat("[PGSQL XASSETDATA]: ***********************************************************");
+            m_log.ErrorFormat("[PGSQL XASSETDATA]: ***********************************************************");
+
+            m_connectionString = connect;
+
+            using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+            {
+                dbcon.Open();
+                Migration m = new Migration(dbcon, Assembly, "XAssetStore");
+                m.Update();
+            }
+        }
+
+        public void Initialise()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Dispose() { }
+
+        /// <summary>
+        /// The name of this DB provider
+        /// </summary>
+        public string Name
+        {
+            get { return "PGSQL XAsset storage engine"; }
+        }
+
+        #endregion
+
+        #region IAssetDataPlugin Members
+
+        /// <summary>
+        /// Fetch Asset <paramref name="assetID"/> from database
+        /// </summary>
+        /// <param name="assetID">Asset UUID to fetch</param>
+        /// <returns>Return the asset</returns>
+        /// <remarks>On failure : throw an exception and attempt to reconnect to database</remarks>
+        public AssetBase GetAsset(UUID assetID)
+        {
+//            m_log.DebugFormat("[PGSQL XASSET DATA]: Looking for asset {0}", assetID);
+
+            AssetBase asset = null;
+            lock (m_dbLock)
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(
+                        @"SELECT ""Name"", ""Description"", ""AccessTime"", ""AssetType"", ""Local"", ""Temporary"", ""AssetFlags"", ""CreatorID"", ""Data""
+                            FROM XAssetsMeta 
+                            JOIN XAssetsData ON XAssetsMeta.Hash = XAssetsData.Hash WHERE ""ID""=:ID",
+                        dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("ID", assetID.ToString());
+
+                        try
+                        {
+                            using (NpgsqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                            {
+                                if (dbReader.Read())
+                                {
+                                    asset = new AssetBase(assetID, (string)dbReader["Name"], (sbyte)dbReader["AssetType"], dbReader["CreatorID"].ToString());
+                                    asset.Data = (byte[])dbReader["Data"];
+                                    asset.Description = (string)dbReader["Description"];
+
+                                    string local = dbReader["Local"].ToString();
+                                    if (local.Equals("1") || local.Equals("true", StringComparison.InvariantCultureIgnoreCase))
+                                        asset.Local = true;
+                                    else
+                                        asset.Local = false;
+
+                                    asset.Temporary = Convert.ToBoolean(dbReader["Temporary"]);
+                                    asset.Flags = (AssetFlags)Convert.ToInt32(dbReader["AssetFlags"]);
+
+                                    if (m_enableCompression)
+                                    {
+                                        using (GZipStream decompressionStream = new GZipStream(new MemoryStream(asset.Data), CompressionMode.Decompress))
+                                        {
+                                            MemoryStream outputStream = new MemoryStream();
+                                            WebUtil.CopyStream(decompressionStream, outputStream, int.MaxValue);
+    //                                        int compressedLength = asset.Data.Length;
+                                            asset.Data = outputStream.ToArray();
+    
+    //                                        m_log.DebugFormat(
+    //                                            "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}",
+    //                                            asset.ID, asset.Name, asset.Data.Length, compressedLength);
+                                        }
+                                    }
+
+                                    UpdateAccessTime(asset.Metadata, (int)dbReader["AccessTime"]);
+                                }
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.Error(string.Format("[PGSQL XASSET DATA]: Failure fetching asset {0}", assetID), e);
+                        }
+                    }
+                }
+            }
+
+            return asset;
+        }
+
+        /// <summary>
+        /// Create an asset in database, or update it if existing.
+        /// </summary>
+        /// <param name="asset">Asset UUID to create</param>
+        /// <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 (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+
+                    using (NpgsqlTransaction transaction = dbcon.BeginTransaction())
+                    {
+                        string assetName = asset.Name;
+                        if (asset.Name.Length > 64)
+                        {
+                            assetName = asset.Name.Substring(0, 64);
+                            m_log.WarnFormat(
+                                "[XASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                                asset.Name, asset.ID, asset.Name.Length, assetName.Length);
+                        }
+    
+                        string assetDescription = asset.Description;
+                        if (asset.Description.Length > 64)
+                        {
+                            assetDescription = asset.Description.Substring(0, 64);
+                            m_log.WarnFormat(
+                                "[XASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                                asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
+                        }
+
+                        if (m_enableCompression)
+                        {
+                            MemoryStream outputStream = new MemoryStream();
+
+                            using (GZipStream compressionStream = new GZipStream(outputStream, CompressionMode.Compress, false))
+                            {
+    //                            Console.WriteLine(WebUtil.CopyTo(new MemoryStream(asset.Data), compressionStream, int.MaxValue));
+                                // We have to close the compression stream in order to make sure it writes everything out to the underlying memory output stream.
+                                compressionStream.Close();
+                                byte[] compressedData = outputStream.ToArray();
+                                asset.Data = compressedData;
+                            }
+                        }
+
+                        byte[] hash = hasher.ComputeHash(asset.Data);
+
+//                        m_log.DebugFormat(
+//                            "[XASSET DB]: Compressed data size for {0} {1}, hash {2} is {3}",
+//                            asset.ID, asset.Name, hash, compressedData.Length);
+
+                        try
+                        {
+                            using (NpgsqlCommand cmd =
+                                new NpgsqlCommand(
+                                    @"insert INTO XAssetsMeta(""ID"", ""Hash"", ""Name"", ""Description"", ""AssetType"", ""Local"", ""Temporary"", ""CreateTime"", ""AccessTime"", ""AssetFlags"", ""CreatorID"")
+                                       Select :ID, :Hash, :Name, :Description, :AssetType, :Local, :Temporary, :CreateTime, :AccessTime, :AssetFlags, :CreatorID
+                                        where not exists( Select ""ID"" from XAssetsMeta where ""ID"" = :ID ;
+
+                                      update XAssetsMeta
+                                          set ""ID"" = :ID, ""Hash"" = :Hash, ""Name"" = :Name, ""Description"" = :Description, 
+                                              ""AssetType"" = :AssetType, ""Local"" = :Local, ""Temporary"" = :Temporary, ""CreateTime"" = :CreateTime, 
+                                              ""AccessTime"" = :AccessTime, ""AssetFlags"" = :AssetFlags, ""CreatorID"" = :CreatorID
+                                        where ""ID"" = :ID;
+                                     ",
+                                    dbcon))
+                            {
+                                // create unix epoch time
+                                int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
+                                cmd.Parameters.AddWithValue("ID", asset.ID);
+                                cmd.Parameters.AddWithValue("Hash", hash);
+                                cmd.Parameters.AddWithValue("Name", assetName);
+                                cmd.Parameters.AddWithValue("Description", assetDescription);
+                                cmd.Parameters.AddWithValue("AssetType", asset.Type);
+                                cmd.Parameters.AddWithValue("Local", asset.Local);
+                                cmd.Parameters.AddWithValue("Temporary", asset.Temporary);
+                                cmd.Parameters.AddWithValue("CreateTime", now);
+                                cmd.Parameters.AddWithValue("AccessTime", now);
+                                cmd.Parameters.AddWithValue("CreatorID", asset.Metadata.CreatorID);
+                                cmd.Parameters.AddWithValue("AssetFlags", (int)asset.Flags);
+                                cmd.ExecuteNonQuery();
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.ErrorFormat("[ASSET DB]: PGSQL failure creating asset metadata {0} with name \"{1}\". Error: {2}",
+                                asset.FullID, asset.Name, e.Message);
+
+                            transaction.Rollback();
+
+                            return;
+                        }
+
+                        if (!ExistsData(dbcon, transaction, hash))
+                        {
+                            try
+                            {
+                                using (NpgsqlCommand cmd =
+                                    new NpgsqlCommand(
+                                        @"INSERT INTO XAssetsData(""Hash"", ""Data"") VALUES(:Hash, :Data)",
+                                        dbcon))
+                                {
+                                    cmd.Parameters.AddWithValue("Hash", hash);
+                                    cmd.Parameters.AddWithValue("Data", asset.Data);
+                                    cmd.ExecuteNonQuery();
+                                }
+                            }
+                            catch (Exception e)
+                            {
+                                m_log.ErrorFormat("[XASSET DB]: PGSQL failure creating asset data {0} with name \"{1}\". Error: {2}",
+                                    asset.FullID, asset.Name, e.Message);
+    
+                                transaction.Rollback();
+    
+                                return;
+                            }
+                        }
+    
+                        transaction.Commit();
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates the access time of the asset if it was accessed above a given threshhold amount of time.
+        /// </summary>
+        /// <remarks>
+        /// This gives us some insight into assets which haven't ben accessed for a long period.  This is only done
+        /// over the threshold time to avoid excessive database writes as assets are fetched.
+        /// </remarks>
+        /// <param name='asset'></param>
+        /// <param name='accessTime'></param>
+        private void UpdateAccessTime(AssetMetadata assetMetadata, int accessTime)
+        {
+            DateTime now = DateTime.UtcNow;
+
+            if ((now - Utils.UnixTimeToDateTime(accessTime)).TotalDays < DaysBetweenAccessTimeUpdates)
+                return;
+
+            lock (m_dbLock)
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+                    NpgsqlCommand cmd =
+                        new NpgsqlCommand(@"update XAssetsMeta set ""AccessTime""=:AccessTime where ID=:ID", dbcon);
+
+                    try
+                    {
+                        using (cmd)
+                        {
+                            // create unix epoch time
+                            cmd.Parameters.AddWithValue("ID", assetMetadata.ID);
+                            cmd.Parameters.AddWithValue("AccessTime", (int)Utils.DateTimeToUnixTime(now));
+                            cmd.ExecuteNonQuery();
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[XASSET PGSQL DB]: Failure updating access_time for asset {0} with name {1} : {2}", 
+                            assetMetadata.ID, assetMetadata.Name, e.Message);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// We assume we already have the m_dbLock.
+        /// </summary>
+        /// TODO: need to actually use the transaction.
+        /// <param name="dbcon"></param>
+        /// <param name="transaction"></param>
+        /// <param name="hash"></param>
+        /// <returns></returns>
+        private bool ExistsData(NpgsqlConnection dbcon, NpgsqlTransaction transaction, byte[] hash)
+        {
+//            m_log.DebugFormat("[ASSETS DB]: Checking for asset {0}", uuid);
+
+            bool exists = false;
+
+            using (NpgsqlCommand cmd = new NpgsqlCommand(@"SELECT ""Hash"" FROM XAssetsData WHERE ""Hash""=:Hash", dbcon))
+            {
+                cmd.Parameters.AddWithValue("Hash", hash);
+
+                try
+                {
+                    using (NpgsqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                    {
+                        if (dbReader.Read())
+                        {
+//                                    m_log.DebugFormat("[ASSETS DB]: Found asset {0}", uuid);
+                            exists = true;
+                        }
+                    }
+                }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat(
+                        "[XASSETS DB]: PGSql failure in ExistsData fetching hash {0}.  Exception {1}{2}",
+                        hash, e.Message, e.StackTrace);
+                }
+            }
+
+            return exists;
+        }
+
+        /// <summary>
+        /// Check if the asset exists in the database
+        /// </summary>
+        /// <param name="uuid">The asset UUID</param>
+        /// <returns>true if it exists, false otherwise.</returns>
+        public bool ExistsAsset(UUID uuid)
+        {
+//            m_log.DebugFormat("[ASSETS DB]: Checking for asset {0}", uuid);
+
+            bool assetExists = false;
+
+            lock (m_dbLock)
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(@"SELECT ""ID"" FROM XAssetsMeta WHERE ""ID""=:ID", dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("ID", uuid.ToString());
+
+                        try
+                        {
+                            using (NpgsqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                            {
+                                if (dbReader.Read())
+                                {
+//                                    m_log.DebugFormat("[ASSETS DB]: Found asset {0}", uuid);
+                                    assetExists = true;
+                                }
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.Error(string.Format("[XASSETS DB]: PGSql failure fetching asset {0}", uuid), e);
+                        }
+                    }
+                }
+            }
+
+            return assetExists;
+        }
+
+
+        /// <summary>
+        /// Returns a list of AssetMetadata objects. The list is a subset of
+        /// the entire data set offset by <paramref name="start" /> containing
+        /// <paramref name="count" /> elements.
+        /// </summary>
+        /// <param name="start">The number of results to discard from the total data set.</param>
+        /// <param name="count">The number of rows the returned list should contain.</param>
+        /// <returns>A list of AssetMetadata objects.</returns>
+        public List<AssetMetadata> FetchAssetMetadataSet(int start, int count)
+        {
+            List<AssetMetadata> retList = new List<AssetMetadata>(count);
+
+            lock (m_dbLock)
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+                    NpgsqlCommand cmd = new NpgsqlCommand( @"SELECT ""Name"", ""Description"", ""AccessTime"", ""AssetType"", ""Temporary"", ""ID"", ""AssetFlags"", ""CreatorID""
+                                            FROM XAssetsMeta 
+                                            LIMIT :start, :count", dbcon);
+                    cmd.Parameters.AddWithValue("start", start);
+                    cmd.Parameters.AddWithValue("count", count);
+
+                    try
+                    {
+                        using (NpgsqlDataReader dbReader = cmd.ExecuteReader())
+                        {
+                            while (dbReader.Read())
+                            {
+                                AssetMetadata metadata = new AssetMetadata();
+                                metadata.Name = (string)dbReader["Name"];
+                                metadata.Description = (string)dbReader["Description"];
+                                metadata.Type = (sbyte)dbReader["AssetType"];
+                                metadata.Temporary = Convert.ToBoolean(dbReader["Temporary"]); // Not sure if this is correct.
+                                metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["AssetFlags"]);
+                                metadata.FullID = DBGuid.FromDB(dbReader["ID"]);
+                                metadata.CreatorID = dbReader["CreatorID"].ToString();
+
+                                // We'll ignore this for now - it appears unused!
+//                                metadata.SHA1 = dbReader["hash"]);
+
+                                UpdateAccessTime(metadata, (int)dbReader["AccessTime"]);
+
+                                retList.Add(metadata);
+                            }
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error("[XASSETS DB]: PGSql failure fetching asset set" + Environment.NewLine + e.ToString());
+                    }
+                }
+            }
+
+            return retList;
+        }
+
+        public bool Delete(string id)
+        {
+//            m_log.DebugFormat("[XASSETS DB]: Deleting asset {0}", id);
+
+            lock (m_dbLock)
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(@"delete from XAssetsMeta where ""ID""=:ID", dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("ID", id);
+                        cmd.ExecuteNonQuery();
+                    }
+
+                    // TODO: How do we deal with data from deleted assets?  Probably not easily reapable unless we
+                    // keep a reference count (?)
+                }
+            }
+
+            return true;
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
new file mode 100644
index 0000000..a22b882
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
@@ -0,0 +1,330 @@
+/*
+ * 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.Data;
+using OpenMetaverse;
+using OpenSim.Framework;
+using System.Reflection;
+using System.Text;
+using log4net;
+using Npgsql;
+using NpgsqlTypes;
+
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLXInventoryData : IXInventoryData
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(
+//                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private PGSQLFolderHandler m_Folders;
+        private PGSQLItemHandler m_Items;
+
+        public PGSQLXInventoryData(string conn, string realm)
+        {
+            m_Folders = new PGSQLFolderHandler(
+                    conn, "inventoryfolders", "InventoryStore");
+            m_Items = new PGSQLItemHandler(
+                    conn, "inventoryitems", String.Empty);
+        }
+
+        public static UUID str2UUID(string strUUID)
+        {
+            UUID newUUID = UUID.Zero;
+
+            UUID.TryParse(strUUID, out newUUID);
+
+            return newUUID;
+        }
+
+        public XInventoryFolder[] GetFolders(string[] fields, string[] vals)
+        {
+            return m_Folders.Get(fields, vals);
+        }
+
+        public XInventoryItem[] GetItems(string[] fields, string[] vals)
+        {
+            return m_Items.Get(fields, vals);
+        }
+
+        public bool StoreFolder(XInventoryFolder folder)
+        {
+            if (folder.folderName.Length > 64)
+                folder.folderName = folder.folderName.Substring(0, 64);
+            return m_Folders.Store(folder);
+        }
+
+        public bool StoreItem(XInventoryItem item)
+        {
+            if (item.inventoryName.Length > 64)
+                item.inventoryName = item.inventoryName.Substring(0, 64);
+            if (item.inventoryDescription.Length > 128)
+                item.inventoryDescription = item.inventoryDescription.Substring(0, 128);
+
+            return m_Items.Store(item);
+        }
+
+        public bool DeleteFolders(string field, string val)
+        {
+            return m_Folders.Delete(field, val);
+        }
+
+        public bool DeleteFolders(string[] fields, string[] vals)
+        {
+            return m_Folders.Delete(fields, vals);
+        }
+
+        public bool DeleteItems(string field, string val)
+        {
+            return m_Items.Delete(field, val);
+        }
+
+        public bool DeleteItems(string[] fields, string[] vals)
+        {
+            return m_Items.Delete(fields, vals);
+        }
+
+        public bool MoveItem(string id, string newParent)
+        {
+            return m_Items.MoveItem(id, newParent);
+        }
+
+        public bool MoveFolder(string id, string newParent)
+        {
+            return m_Folders.MoveFolder(id, newParent);
+        }
+
+        public XInventoryItem[] GetActiveGestures(UUID principalID)
+        {
+            return m_Items.GetActiveGestures(principalID.ToString());
+        }
+
+        public int GetAssetPermissions(UUID principalID, UUID assetID)
+        {
+            return m_Items.GetAssetPermissions(principalID, assetID);
+        }
+    }
+
+    public class PGSQLItemHandler : PGSQLInventoryHandler<XInventoryItem>
+    {
+        public PGSQLItemHandler(string c, string t, string m) :
+            base(c, t, m)
+        {
+        }
+
+        public bool MoveItem(string id, string newParent)
+        {
+            XInventoryItem[] retrievedItems = Get(new string[] { "inventoryID" }, new string[] { id });
+            if (retrievedItems.Length == 0)
+                return false;
+
+            UUID oldParent = retrievedItems[0].parentFolderID;
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            {
+                using (NpgsqlCommand cmd = new NpgsqlCommand())
+                {
+                    cmd.CommandText = String.Format(@"update {0} set ""parentFolderID"" = :ParentFolderID where ""inventoryID"" = :InventoryID", m_Realm);
+                    cmd.Parameters.Add(m_database.CreateParameter("ParentFolderID", newParent));
+                    cmd.Parameters.Add(m_database.CreateParameter("InventoryID", id ));
+                    cmd.Connection = conn;
+                    conn.Open();
+
+                    if (cmd.ExecuteNonQuery() == 0)
+                        return false;
+                }
+            }
+
+            IncrementFolderVersion(oldParent);
+            IncrementFolderVersion(newParent);
+
+            return true;
+        }
+
+        public XInventoryItem[] GetActiveGestures(string principalID)
+        {
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            {
+                using (NpgsqlCommand cmd = new NpgsqlCommand())
+                {
+                    cmd.CommandText = String.Format(@"select * from inventoryitems where ""avatarID"" = :uuid and ""assetType"" = :type and ""flags"" = 1", m_Realm);
+
+                    UUID princID = UUID.Zero;
+                    UUID.TryParse(principalID, out princID);
+
+                    cmd.Parameters.Add(m_database.CreateParameter("uuid", principalID));
+                    cmd.Parameters.Add(m_database.CreateParameter("type", (int)AssetType.Gesture));
+                    cmd.Connection = conn;
+                    conn.Open();
+                    return DoQuery(cmd);
+                }
+            }
+        }
+
+        public int GetAssetPermissions(UUID principalID, UUID assetID)
+        {
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            {
+                using (NpgsqlCommand cmd = new NpgsqlCommand())
+                {
+                    cmd.CommandText = String.Format(@"select bit_or(""inventoryCurrentPermissions"") as ""inventoryCurrentPermissions"" 
+                                 from inventoryitems 
+                                 where ""avatarID"" = :PrincipalID 
+                                   and ""assetID"" = :AssetID 
+                                 group by ""assetID"" ", m_Realm);
+
+                    cmd.Parameters.Add(m_database.CreateParameter("PrincipalID", principalID));
+                    cmd.Parameters.Add(m_database.CreateParameter("AssetID", assetID));
+                    cmd.Connection = conn;
+                    conn.Open();
+                    using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                    {
+
+                        int perms = 0;
+
+                        if (reader.Read())
+                        {
+                            perms = Convert.ToInt32(reader["inventoryCurrentPermissions"]);
+                        }
+
+                        return perms;
+                    }
+
+                }
+            }
+        }
+
+        public override bool Store(XInventoryItem item)
+        {
+            if (!base.Store(item))
+                return false;
+
+            IncrementFolderVersion(item.parentFolderID);
+
+            return true;
+        }
+    }
+
+    public class PGSQLFolderHandler : PGSQLInventoryHandler<XInventoryFolder>
+    {
+        public PGSQLFolderHandler(string c, string t, string m) :
+            base(c, t, m)
+        {
+        }
+
+        public bool MoveFolder(string id, string newParentFolderID)
+        {
+            XInventoryFolder[] folders = Get(new string[] { "folderID" }, new string[] { id });
+
+            if (folders.Length == 0)
+                return false;
+
+            UUID oldParentFolderUUID = folders[0].parentFolderID;
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            {
+                using (NpgsqlCommand cmd = new NpgsqlCommand())
+                {
+                    UUID foldID = UUID.Zero;
+                    UUID.TryParse(id, out foldID);
+
+                    UUID newPar = UUID.Zero;
+                    UUID.TryParse(newParentFolderID, out newPar);
+
+                    cmd.CommandText = String.Format(@"update {0} set ""parentFolderID"" = :ParentFolderID where ""folderID"" = :folderID", m_Realm);
+                    cmd.Parameters.Add(m_database.CreateParameter("ParentFolderID", newPar));
+                    cmd.Parameters.Add(m_database.CreateParameter("folderID", foldID));
+                    cmd.Connection = conn;
+                    conn.Open();
+
+                    if (cmd.ExecuteNonQuery() == 0)
+                        return false;
+                }
+            }
+
+            IncrementFolderVersion(oldParentFolderUUID);
+            IncrementFolderVersion(newParentFolderID);
+
+            return true;
+        }
+
+        public override bool Store(XInventoryFolder folder)
+        {
+            if (!base.Store(folder))
+                return false;
+
+            IncrementFolderVersion(folder.parentFolderID);
+
+            return true;
+        }
+    }
+
+    public class PGSQLInventoryHandler<T> : PGSQLGenericTableHandler<T> where T: class, new()
+    {
+        public PGSQLInventoryHandler(string c, string t, string m) : base(c, t, m) {}
+
+        protected bool IncrementFolderVersion(UUID folderID)
+        {
+            return IncrementFolderVersion(folderID.ToString());
+        }
+
+        protected bool IncrementFolderVersion(string folderID)
+        {
+//            m_log.DebugFormat("[PGSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
+//            Util.PrintCallStack();
+
+            string sql = @"update inventoryfolders set version=version+1 where ""folderID"" = :folderID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            {
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    UUID foldID = UUID.Zero;
+                    UUID.TryParse(folderID, out foldID);
+
+                    conn.Open();
+
+                    cmd.Parameters.Add( m_database.CreateParameter("folderID", foldID) );
+
+                    try
+                    {
+                        cmd.ExecuteNonQuery();
+                    }
+                    catch (Exception)
+                    {
+                        return false;
+                    }
+                }
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs b/OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..27d0679
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+
+[assembly : AssemblyTitle("OpenSim.Data.PGSQL")]
+[assembly : AssemblyDescription("")]
+[assembly : AssemblyConfiguration("")]
+[assembly : AssemblyCompany("http://opensimulator.org")]
+[assembly : AssemblyProduct("OpenSim.Data.PGSQL")]
+[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")]
+[assembly : AssemblyTrademark("")]
+[assembly : AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+
+[assembly : ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+
+[assembly : Guid("0e1c1ca4-2cf2-4315-b0e7-432c02feea8a")]
+
+// 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.*")]
+
diff --git a/OpenSim/Data/PGSQL/Resources/AssetStore.migrations b/OpenSim/Data/PGSQL/Resources/AssetStore.migrations
new file mode 100644
index 0000000..b6db585
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/AssetStore.migrations
@@ -0,0 +1,94 @@
+:VERSION 1
+
+CREATE TABLE assets (
+  "id" varchar(36) NOT NULL PRIMARY KEY,
+  "name" varchar(64) NOT NULL,
+  "description" varchar(64) NOT NULL,
+  "assetType" smallint NOT NULL,
+  "local" smallint NOT NULL,
+  "temporary" smallint NOT NULL,
+  "data" bytea NOT NULL
+) ;
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_assets
+	(
+	"id" varchar(36) NOT NULL,
+	"name" varchar(64) NOT NULL,
+	"description" varchar(64) NOT NULL,
+	"assetType" smallint NOT NULL,
+	"local" boolean NOT NULL,
+	"temporary" boolean NOT NULL,
+	"data" bytea NOT NULL
+	) ; 
+
+INSERT INTO Tmp_assets ("id", "name", "description", "assetType", "local", "temporary", "data")
+ SELECT "id", "name", "description", "assetType", case when "local" = 1 then true else false end, case when "temporary" = 1 then true else false end, "data" 
+   FROM assets ;
+
+DROP TABLE assets;
+
+Alter table Tmp_assets
+  rename to assets;
+
+ALTER TABLE assets ADD PRIMARY KEY ("id");
+
+COMMIT;
+
+
+:VERSION 3
+
+BEGIN TRANSACTION;
+
+ALTER TABLE assets add "create_time" integer default 0;
+ALTER TABLE assets add "access_time" integer default 0;
+
+COMMIT;
+
+
+:VERSION 4
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_assets
+	(
+	"id" uuid NOT NULL,
+	"name" varchar(64) NOT NULL,
+	"description" varchar(64) NOT NULL,
+	"assetType" smallint NOT NULL,
+	"local" boolean NOT NULL,
+	"temporary" boolean NOT NULL,
+	"data" bytea NOT NULL,
+	"create_time" int NULL,
+	"access_time" int NULL
+	)  ;
+	 
+
+INSERT INTO Tmp_assets ("id", "name", "description", "assetType", "local", "temporary", "data", "create_time", "access_time")
+		SELECT cast("id" as uuid), "name", "description", "assetType", "local", "temporary", "data", "create_time", "access_time" 
+		FROM assets ;
+
+DROP TABLE assets;
+
+Alter table Tmp_assets
+  rename to assets;
+
+ ALTER TABLE assets ADD PRIMARY KEY ("id");
+
+COMMIT;
+
+
+:VERSION 5
+
+DELETE FROM assets WHERE "id" = 'dc4b9f0b-d008-45c6-96a4-01dd947ac621';
+
+:VERSION 6
+
+ALTER TABLE assets ADD "asset_flags" INTEGER NOT NULL DEFAULT 0;
+
+:VERSION 7
+
+alter table assets add "creatorid" varchar(36) not null default '';
diff --git a/OpenSim/Data/PGSQL/Resources/AuthStore.migrations b/OpenSim/Data/PGSQL/Resources/AuthStore.migrations
new file mode 100644
index 0000000..a1f5b61
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/AuthStore.migrations
@@ -0,0 +1,32 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE auth (
+  uuid uuid NOT NULL default '00000000-0000-0000-0000-000000000000',
+  "passwordHash" varchar(32) NOT NULL,
+  "passwordSalt" varchar(32) NOT NULL,
+  "webLoginKey" varchar(255) NOT NULL,
+  "accountType" VARCHAR(32) NOT NULL DEFAULT 'UserAccount'
+) ;
+
+CREATE TABLE tokens (
+  uuid uuid NOT NULL default '00000000-0000-0000-0000-000000000000',
+  token varchar(255) NOT NULL,
+  validity TIMESTAMP NOT NULL )
+  ;
+
+COMMIT;
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+   INSERT INTO auth (uuid, "passwordHash", "passwordSalt", "webLoginKey", "accountType") 
+	SELECT uuid AS UUID, passwordHash AS passwordHash, passwordSalt AS passwordSalt, webLoginKey AS webLoginKey, 'UserAccount' as accountType 
+	FROM users
+      where exists ( Select * from information_schema.tables where table_name = 'users' )
+	;
+
+COMMIT;
+
diff --git a/OpenSim/Data/PGSQL/Resources/Avatar.migrations b/OpenSim/Data/PGSQL/Resources/Avatar.migrations
new file mode 100644
index 0000000..160086d
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/Avatar.migrations
@@ -0,0 +1,59 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Avatars (
+"PrincipalID" uuid NOT NULL PRIMARY KEY, 
+"Name" varchar(32) NOT NULL, 
+"Value" varchar(255) NOT NULL DEFAULT ''
+);
+
+
+COMMIT;
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_Avatars
+	(
+	"PrincipalID" uuid NOT NULL,
+	"Name" varchar(32) NOT NULL, 
+	"Value" text NOT NULL DEFAULT ''
+	)  ;
+	
+ INSERT INTO Tmp_Avatars ("PrincipalID", "Name", "Value")
+	SELECT "PrincipalID", cast("Name" as text), "Value" 
+	FROM Avatars ;
+
+DROP TABLE Avatars;
+
+Alter table Tmp_Avatars
+  rename to Avatars;
+
+COMMIT;
+
+:VERSION 3
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_Avatars
+	(
+	"PrincipalID" uuid NOT NULL,
+	"Name" varchar(32) NOT NULL, 
+	"Value" text NOT NULL DEFAULT ''
+);
+
+ALTER TABLE Tmp_Avatars ADD PRIMARY KEY ("PrincipalID", "Name");
+
+
+INSERT INTO Tmp_Avatars ("PrincipalID", "Name", "Value")
+	SELECT "PrincipalID", "Name", cast("Value" as text) FROM Avatars ;
+
+DROP TABLE Avatars;
+
+Alter table Tmp_Avatars
+  rename to Avatars;
+
+COMMIT;
+
diff --git a/OpenSim/Data/PGSQL/Resources/EstateStore.migrations b/OpenSim/Data/PGSQL/Resources/EstateStore.migrations
new file mode 100644
index 0000000..59270f8
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/EstateStore.migrations
@@ -0,0 +1,307 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE estate_managers(
+	"EstateID" int NOT NULL Primary Key,
+	uuid varchar(36) NOT NULL
+ );
+ 
+CREATE TABLE estate_groups(
+	"EstateID" int NOT NULL,
+	uuid varchar(36) NOT NULL
+	);
+
+
+CREATE TABLE estate_users(
+	"EstateID" int NOT NULL,
+	uuid varchar(36) NOT NULL
+	);
+
+
+CREATE TABLE estateban(
+	"EstateID" int NOT NULL,
+	"bannedUUID" varchar(36) NOT NULL,
+	"bannedIp" varchar(16) NOT NULL,
+	"bannedIpHostMask" varchar(16) NOT NULL,
+	"bannedNameMask" varchar(64) NULL DEFAULT NULL
+	);
+
+Create Sequence estate_settings_id increment by 100 start with 100;
+
+CREATE TABLE estate_settings(
+	"EstateID" integer DEFAULT nextval('estate_settings_id') NOT NULL,
+	"EstateName" varchar(64) NULL DEFAULT (NULL),
+	"AbuseEmailToEstateOwner" boolean NOT NULL,
+	"DenyAnonymous" boolean NOT NULL,
+	"ResetHomeOnTeleport" boolean NOT NULL,
+	"FixedSun" boolean NOT NULL,
+	"DenyTransacted" boolean NOT NULL,
+	"BlockDwell" boolean NOT NULL,
+	"DenyIdentified" boolean NOT NULL,
+	"AllowVoice" boolean NOT NULL,
+	"UseGlobalTime" boolean NOT NULL,
+	"PricePerMeter" int NOT NULL,
+	"TaxFree" boolean NOT NULL,
+	"AllowDirectTeleport" boolean NOT NULL,
+	"RedirectGridX" int NOT NULL,
+	"RedirectGridY" int NOT NULL,
+	"ParentEstateID" int NOT NULL,
+	"SunPosition" double precision NOT NULL,
+	"EstateSkipScripts" boolean NOT NULL,
+	"BillableFactor" double precision NOT NULL,
+	"PublicAccess" boolean NOT NULL,
+	"AbuseEmail" varchar(255) NOT NULL,
+	"EstateOwner" varchar(36) NOT NULL,
+	"DenyMinors" boolean NOT NULL
+	);
+
+
+CREATE TABLE estate_map(
+	"RegionID" varchar(36) NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+	"EstateID" int NOT NULL
+ );
+ 
+COMMIT;
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+CREATE INDEX IX_estate_managers ON estate_managers
+	(
+	"EstateID"
+	);
+
+
+CREATE INDEX IX_estate_groups ON estate_groups
+	(
+	"EstateID"
+	);
+
+
+CREATE INDEX IX_estate_users ON estate_users
+	(
+	"EstateID"
+	);
+
+COMMIT;
+
+:VERSION 3
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_estateban
+	(
+	"EstateID" int NOT NULL,
+	"bannedUUID" varchar(36) NOT NULL,
+	"bannedIp" varchar(16) NULL,
+	"bannedIpHostMask" varchar(16) NULL,
+	"bannedNameMask" varchar(64) NULL
+	);
+
+ INSERT INTO Tmp_estateban ("EstateID", "bannedUUID", "bannedIp", "bannedIpHostMask", "bannedNameMask")
+   SELECT "EstateID", "bannedUUID", "bannedIp", "bannedIpHostMask", "bannedNameMask" FROM estateban;
+
+DROP TABLE estateban;
+
+Alter table Tmp_estateban
+  rename to estateban;
+
+CREATE INDEX IX_estateban ON estateban
+	(
+	"EstateID"
+	);
+
+COMMIT;
+
+
+:VERSION 4
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_estate_managers
+	(
+	"EstateID" int NOT NULL,
+	uuid uuid NOT NULL
+	);
+
+INSERT INTO Tmp_estate_managers ("EstateID", uuid)
+	SELECT "EstateID", cast(uuid as uuid) FROM estate_managers;
+
+DROP TABLE estate_managers;
+
+Alter table Tmp_estate_managers
+  rename to estate_managers;
+
+CREATE INDEX IX_estate_managers ON estate_managers
+	(
+	"EstateID"
+	);
+
+COMMIT;
+
+
+:VERSION 5
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_estate_groups
+	(
+	"EstateID" int NOT NULL,
+	uuid uuid NOT NULL
+	) ;
+
+ INSERT INTO Tmp_estate_groups ("EstateID", uuid)
+	SELECT "EstateID", cast(uuid as uuid) FROM estate_groups;
+
+DROP TABLE estate_groups;
+
+Alter table Tmp_estate_groups
+  rename to estate_groups;
+
+CREATE INDEX IX_estate_groups ON estate_groups
+	(
+	"EstateID"
+	);
+
+COMMIT;
+
+
+:VERSION 6
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_estate_users
+	(
+	"EstateID" int NOT NULL,
+	uuid uuid NOT NULL
+	);
+
+INSERT INTO Tmp_estate_users ("EstateID", uuid)
+	SELECT "EstateID", cast(uuid as uuid) FROM estate_users ;
+
+DROP TABLE estate_users;
+
+Alter table Tmp_estate_users
+  rename to estate_users;
+
+CREATE INDEX IX_estate_users ON estate_users
+	(
+	"EstateID"
+	);
+
+COMMIT;
+
+
+:VERSION 7
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_estateban
+	(
+	"EstateID" int NOT NULL,
+	"bannedUUID" uuid NOT NULL,
+	"bannedIp" varchar(16) NULL,
+	"bannedIpHostMask" varchar(16) NULL,
+	"bannedNameMask" varchar(64) NULL
+	);
+
+INSERT INTO Tmp_estateban ("EstateID", "bannedUUID", "bannedIp", "bannedIpHostMask", "bannedNameMask")
+	SELECT "EstateID", cast("bannedUUID" as uuid), "bannedIp", "bannedIpHostMask", "bannedNameMask" FROM estateban ;
+
+DROP TABLE estateban;
+
+Alter table Tmp_estateban
+  rename to estateban;
+
+CREATE INDEX IX_estateban ON estateban
+	(
+	"EstateID"
+	);
+
+COMMIT;
+
+
+:VERSION 8
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_estate_settings
+	(
+	"EstateID" integer default nextval('estate_settings_id') NOT NULL,
+	"EstateName" varchar(64) NULL DEFAULT (NULL),
+	"AbuseEmailToEstateOwner" boolean NOT NULL,
+	"DenyAnonymous" boolean NOT NULL,
+	"ResetHomeOnTeleport" boolean NOT NULL,
+	"FixedSun" boolean NOT NULL,
+	"DenyTransacted" boolean NOT NULL,
+	"BlockDwell" boolean NOT NULL,
+	"DenyIdentified" boolean NOT NULL,
+	"AllowVoice" boolean NOT NULL,
+	"UseGlobalTime" boolean NOT NULL,
+	"PricePerMeter" int NOT NULL,
+	"TaxFree" boolean NOT NULL,
+	"AllowDirectTeleport" boolean NOT NULL,
+	"RedirectGridX" int NOT NULL,
+	"RedirectGridY" int NOT NULL,
+	"ParentEstateID" int NOT NULL,
+	"SunPosition" double precision NOT NULL,
+	"EstateSkipScripts" boolean NOT NULL,
+	"BillableFactor" double precision NOT NULL,
+	"PublicAccess" boolean NOT NULL,
+	"AbuseEmail" varchar(255) NOT NULL,
+	"EstateOwner" uuid NOT NULL,
+	"DenyMinors" boolean NOT NULL
+	);
+
+INSERT INTO Tmp_estate_settings ("EstateID", "EstateName", "AbuseEmailToEstateOwner", "DenyAnonymous", "ResetHomeOnTeleport", "FixedSun", "DenyTransacted", "BlockDwell", "DenyIdentified", "AllowVoice", "UseGlobalTime", "PricePerMeter", "TaxFree", "AllowDirectTeleport", "RedirectGridX", "RedirectGridY", "ParentEstateID", "SunPosition", "EstateSkipScripts", "BillableFactor", "PublicAccess", "AbuseEmail", "EstateOwner", "DenyMinors")
+	SELECT "EstateID", "EstateName", "AbuseEmailToEstateOwner", "DenyAnonymous", "ResetHomeOnTeleport", "FixedSun", "DenyTransacted", "BlockDwell", "DenyIdentified", "AllowVoice", "UseGlobalTime", "PricePerMeter", "TaxFree", "AllowDirectTeleport", "RedirectGridX", "RedirectGridY", "ParentEstateID", "SunPosition", "EstateSkipScripts", "BillableFactor", "PublicAccess", "AbuseEmail", cast("EstateOwner" as uuid), "DenyMinors" FROM estate_settings ;
+
+DROP TABLE estate_settings;
+
+
+Alter table Tmp_estate_settings
+  rename to estate_settings;
+
+
+Create index on estate_settings (lower("EstateName"));
+
+COMMIT;
+
+
+:VERSION 9
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_estate_map
+	(
+	"RegionID" uuid NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+	"EstateID" int NOT NULL
+	);
+
+INSERT INTO Tmp_estate_map ("RegionID", "EstateID")
+	SELECT cast("RegionID" as uuid), "EstateID" FROM estate_map ;
+
+DROP TABLE estate_map;
+
+Alter table Tmp_estate_map
+  rename to estate_map;
+
+COMMIT;
+
+:VERSION 10
+
+BEGIN TRANSACTION;
+ALTER TABLE estate_settings ADD COLUMN "AllowLandmark" boolean NOT NULL default true;
+ALTER TABLE estate_settings ADD COLUMN "AllowParcelChanges" boolean NOT NULL default true;
+ALTER TABLE estate_settings ADD COLUMN "AllowSetHome" boolean NOT NULL default true;
+COMMIT;
+
+:VERSION 11
+
+Begin transaction;
+
+
+Commit;
+
diff --git a/OpenSim/Data/PGSQL/Resources/FriendsStore.migrations b/OpenSim/Data/PGSQL/Resources/FriendsStore.migrations
new file mode 100644
index 0000000..a87199b
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/FriendsStore.migrations
@@ -0,0 +1,44 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Friends (
+"PrincipalID" uuid NOT NULL, 
+"Friend" varchar(255) NOT NULL, 
+"Flags" char(16) NOT NULL DEFAULT '0',
+"Offered" varchar(32) NOT NULL DEFAULT 0);
+ 
+
+COMMIT;
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+INSERT INTO Friends ("PrincipalID", "Friend", "Flags", "Offered") 
+SELECT "ownerID", "friendID", "friendPerms", 0 FROM userfriends;
+
+COMMIT;
+
+:VERSION 3 
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_Friends
+	("PrincipalID" varchar(255) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', 
+	"Friend" varchar(255) NOT NULL, 
+	"Flags" char(16) NOT NULL DEFAULT '0',
+	"Offered" varchar(32) NOT NULL DEFAULT 0) ;
+
+INSERT INTO Tmp_Friends ("PrincipalID", "Friend", "Flags", "Offered")
+	SELECT cast("PrincipalID" as varchar(255)), "Friend", "Flags", "Offered" FROM Friends ;
+
+DROP TABLE Friends;
+
+Alter table Tmp_Friends
+  rename to Friends;
+
+ALTER TABLE Friends ADD PRIMARY KEY("PrincipalID", "Friend");
+
+
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/GridStore.migrations b/OpenSim/Data/PGSQL/Resources/GridStore.migrations
new file mode 100644
index 0000000..0ab8d2b
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/GridStore.migrations
@@ -0,0 +1,242 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE regions(
+ "regionHandle" varchar(255) NULL,
+ "regionName" varchar(255) NULL,
+ uuid varchar(255) NOT NULL PRIMARY KEY,
+ "regionRecvKey" varchar(255) NULL,
+ "regionSecret" varchar(255) NULL,
+ "regionSendKey" varchar(255) NULL,
+ "regionDataURI" varchar(255) NULL,
+ "serverIP" varchar(255) NULL,
+ "serverPort" varchar(255) NULL,
+ "serverURI" varchar(255) NULL,
+ "locX" varchar(255) NULL,
+ "locY" varchar(255) NULL,
+ "locZ" varchar(255) NULL,
+ "eastOverrideHandle" varchar(255) NULL,
+ "westOverrideHandle" varchar(255) NULL,
+ "southOverrideHandle" varchar(255) NULL,
+ "northOverrideHandle" varchar(255) NULL,
+ "regionAssetURI" varchar(255) NULL,
+ "regionAssetRecvKey" varchar(255) NULL,
+ "regionAssetSendKey" varchar(255) NULL,
+ "regionUserURI" varchar(255) NULL,
+ "regionUserRecvKey" varchar(255) NULL,
+ "regionUserSendKey" varchar(255) NULL,
+ "regionMapTexture" varchar(255) NULL,
+ "serverHttpPort" varchar(255) NULL,
+ "serverRemotingPort" varchar(255) NULL,
+ "owner_uuid" varchar(36) NULL
+);
+
+COMMIT;
+
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_regions
+	(
+	uuid varchar(36) NOT NULL,
+	"regionHandle" bigint NULL,
+	"regionName" varchar(20) NULL,
+	"regionRecvKey" varchar(128) NULL,
+	"regionSendKey" varchar(128) NULL,
+	"regionSecret" varchar(128) NULL,
+	"regionDataURI" varchar(128) NULL,
+	"serverIP" varchar(64) NULL,
+	"serverPort" int NULL,
+	"serverURI" varchar(255) NULL,
+	"locX" int NULL,
+	"locY" int NULL,
+	"locZ" int NULL,
+	"eastOverrideHandle" bigint NULL,
+	"westOverrideHandle" bigint NULL,
+	"southOverrideHandle" bigint NULL,
+	"northOverrideHandle" bigint NULL,
+	"regionAssetURI" varchar(255) NULL,
+	"regionAssetRecvKey" varchar(128) NULL,
+	"regionAssetSendKey" varchar(128) NULL,
+	"regionUserURI" varchar(255) NULL,
+	"regionUserRecvKey" varchar(128) NULL,
+	"regionUserSendKey" varchar(128) NULL,
+	"regionMapTexture" varchar(36) NULL,
+	"serverHttpPort" int NULL,
+	"serverRemotingPort" int NULL,
+	"owner_uuid" varchar(36) NULL,
+	"originUUID" varchar(36) NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000')
+	);
+
+INSERT INTO Tmp_regions (uuid, "regionHandle", "regionName", "regionRecvKey", "regionSendKey", "regionSecret", "regionDataURI", "serverIP", "serverPort", "serverURI", "locX", "locY", "locZ", "eastOverrideHandle", "westOverrideHandle", "southOverrideHandle", "northOverrideHandle", "regionAssetURI", "regionAssetRecvKey", "regionAssetSendKey", "regionUserURI", "regionUserRecvKey", "regionUserSendKey", "regionMapTexture", "serverHttpPort", "serverRemotingPort", "owner_uuid")
+	SELECT cast(uuid as varchar(36)), cast("regionHandle" as bigint), cast("regionName" as varchar(20)), cast("regionRecvKey" as varchar(128)), cast("regionSendKey" as varchar(128)), cast("regionSecret" as varchar(128)), cast("regionDataURI" as varchar(128)), cast("serverIP" as varchar(64)), cast("serverPort" as int), "serverURI", cast("locX" as int), cast("locY" as int), cast("locZ" as int), cast("eastOverrideHandle" as bigint), cast("westOverrideHandle" as bigint), 
+	      cast("southOverrideHandle" as bigint), cast("northOverrideHandle" as bigint), "regionAssetURI", cast("regionAssetRecvKey" as varchar(128)), cast("regionAssetSendKey" as varchar(128)), "regionUserURI", cast("regionUserRecvKey" as varchar(128)), cast("regionUserSendKey" as varchar(128)), cast("regionMapTexture" as varchar(36)), 
+	      cast("serverHttpPort" as int), cast("serverRemotingPort" as int), "owner_uuid" 
+	      FROM regions;
+
+DROP TABLE regions;
+
+alter table Tmp_regions
+  rename to regions;
+
+COMMIT;
+
+:VERSION 3
+
+BEGIN TRANSACTION;
+
+CREATE INDEX IX_regions_name ON regions
+	(
+	"regionName"
+	);
+
+CREATE INDEX IX_regions_handle ON regions
+	(
+	"regionHandle"
+	);
+
+
+CREATE INDEX IX_regions_override ON regions
+	(
+	"eastOverrideHandle",
+	"westOverrideHandle",
+	"southOverrideHandle",
+	"northOverrideHandle"
+	);
+
+COMMIT;
+
+
+:VERSION 4
+
+/* To prevent any potential data loss issues, you should review this script in detail before running it outside the cotext of the database designer.*/
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_regions
+	(
+	uuid uuid NOT NULL,
+	"regionHandle" bigint NULL,
+	"regionName" varchar(20) NULL,
+	"regionRecvKey" varchar(128) NULL,
+	"regionSendKey" varchar(128) NULL,
+	"regionSecret" varchar(128) NULL,
+	"regionDataURI" varchar(128) NULL,
+	"serverIP" varchar(64) NULL,
+	"serverPort" int NULL,
+	"serverURI" varchar(255) NULL,
+	"locX" int NULL,
+	"locY" int NULL,
+	"locZ" int NULL,
+	"eastOverrideHandle" bigint NULL,
+	"westOverrideHandle" bigint NULL,
+	"southOverrideHandle" bigint NULL,
+	"northOverrideHandle" bigint NULL,
+	"regionAssetURI" varchar(255) NULL,
+	"regionAssetRecvKey" varchar(128) NULL,
+	"regionAssetSendKey" varchar(128) NULL,
+	"regionUserURI" varchar(255) NULL,
+	"regionUserRecvKey" varchar(128) NULL,
+	"regionUserSendKey" varchar(128) NULL,
+	"regionMapTexture" uuid NULL,
+	"serverHttpPort" int NULL,
+	"serverRemotingPort" int NULL,
+	"owner_uuid" uuid NOT NULL,
+	"originUUID" uuid NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000')
+	);
+	
+
+INSERT INTO Tmp_regions (uuid, "regionHandle", "regionName", "regionRecvKey", "regionSendKey", "regionSecret", "regionDataURI", "serverIP", "serverPort", "serverURI", "locX", "locY", "locZ", "eastOverrideHandle", "westOverrideHandle", "southOverrideHandle", "northOverrideHandle", "regionAssetURI", "regionAssetRecvKey", "regionAssetSendKey", "regionUserURI", "regionUserRecvKey", "regionUserSendKey", "regionMapTexture", "serverHttpPort", "serverRemotingPort", "owner_uuid", "originUUID")
+  SELECT cast(uuid as uuid), "regionHandle", "regionName", "regionRecvKey", "regionSendKey", "regionSecret", "regionDataURI", "serverIP", "serverPort", "serverURI", "locX", "locY", "locZ", "eastOverrideHandle", "westOverrideHandle", "southOverrideHandle", "northOverrideHandle", "regionAssetURI", "regionAssetRecvKey", "regionAssetSendKey", "regionUserURI", "regionUserRecvKey", "regionUserSendKey", cast("regionMapTexture" as uuid), "serverHttpPort", "serverRemotingPort", cast( "owner_uuid" as uuid), cast("originUUID" as uuid) FROM regions ;
+  
+
+DROP TABLE regions;
+
+alter table Tmp_regions rename to regions;
+
+ALTER TABLE regions ADD CONSTRAINT
+	PK__regions__uuid PRIMARY KEY 
+	(
+	uuid
+	);
+
+CREATE INDEX IX_regions_name ON regions
+	(
+	"regionName"
+	);
+
+CREATE INDEX IX_regions_handle ON regions
+	(
+	"regionHandle"
+	);
+
+CREATE INDEX IX_regions_override ON regions
+	(
+	"eastOverrideHandle",
+	"westOverrideHandle",
+	"southOverrideHandle",
+	"northOverrideHandle"
+	);
+
+COMMIT;
+
+
+:VERSION 5
+
+BEGIN TRANSACTION;
+
+ALTER TABLE regions ADD access int default 0;
+
+COMMIT;
+
+
+:VERSION 6
+
+BEGIN TRANSACTION;
+
+ALTER TABLE regions ADD "ScopeID" uuid default '00000000-0000-0000-0000-000000000000';
+ALTER TABLE regions alter column "owner_uuid" set DEFAULT ('00000000-0000-0000-0000-000000000000');
+ALTER TABLE regions ADD "sizeX" integer not null default 0;
+ALTER TABLE regions ADD "sizeY" integer not null default 0;
+
+COMMIT;
+
+
+:VERSION 7
+
+BEGIN TRANSACTION;
+
+ALTER TABLE regions ADD "flags" integer NOT NULL DEFAULT 0;
+CREATE INDEX flags ON regions("flags");
+ALTER TABLE regions ADD "last_seen" integer NOT NULL DEFAULT 0;
+ALTER TABLE regions ADD "PrincipalID" uuid NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
+ALTER TABLE regions ADD "Token" varchar(255) NOT NULL DEFAULT 0;
+
+COMMIT;
+
+:VERSION 8
+
+BEGIN TRANSACTION;
+ALTER TABLE regions ALTER COLUMN "regionName" type VarChar(128) ;
+
+DROP INDEX IX_regions_name;
+ALTER TABLE regions ALTER COLUMN "regionName" type VarChar(128),
+  ALTER COLUMN "regionName" SET NOT NULL;
+
+CREATE INDEX IX_regions_name ON regions
+	(
+	"regionName"
+	);
+
+COMMIT;
+
+:VERSION 9
+
+BEGIN TRANSACTION;
+
+ALTER TABLE regions ADD "parcelMapTexture" uuid NULL;
+
+COMMIT;
+
diff --git a/OpenSim/Data/PGSQL/Resources/GridUserStore.migrations b/OpenSim/Data/PGSQL/Resources/GridUserStore.migrations
new file mode 100644
index 0000000..d37c4f6d
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/GridUserStore.migrations
@@ -0,0 +1,60 @@
+:VERSION 1         # -------------------------- 
+
+BEGIN TRANSACTION;
+
+CREATE TABLE GridUser (
+    "UserID" VARCHAR(255) NOT NULL Primary Key,
+    "HomeRegionID" CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    "HomePosition" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    "HomeLookAt" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    "LastRegionID" CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    "LastPosition" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    "LastLookAt" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    "Online" CHAR(5) NOT NULL DEFAULT 'false',
+    "Login" CHAR(16) NOT NULL DEFAULT '0',
+    "Logout" CHAR(16) NOT NULL DEFAULT '0'
+) ;
+
+COMMIT;
+
+:VERSION 2         # -------------------------- 
+
+BEGIN TRANSACTION;
+
+CREATE TABLE GridUser_tmp (
+    "UserID" VARCHAR(255) NOT NULL PRIMARY KEY,
+    "HomeRegionID" uuid NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    "HomePosition" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    "HomeLookAt" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    "LastRegionID" uuid NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    "LastPosition" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    "LastLookAt" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    "Online" CHAR(5) NOT NULL DEFAULT 'false',
+    "Login" CHAR(16) NOT NULL DEFAULT '0',
+    "Logout" CHAR(16) NOT NULL DEFAULT '0'
+    );
+
+COMMIT;
+
+
+INSERT INTO GridUser_tmp ("UserID"
+           ,"HomeRegionID"
+           ,"HomePosition"
+           ,"HomeLookAt"
+           ,"LastRegionID"
+           ,"LastPosition"
+           ,"LastLookAt"
+           ,"Online"
+           ,"Login"
+           ,"Logout")
+ SELECT "UserID", cast("HomeRegionID" as uuid), "HomePosition" ,"HomeLookAt" , cast("LastRegionID" as uuid),
+       "LastPosition"
+      ,"LastLookAt"
+      ,"Online"
+      ,"Login"
+      ,"Logout" FROM GridUser;
+
+DROP TABLE GridUser;
+
+alter table GridUser_tmp rename to GridUser;
+
diff --git a/OpenSim/Data/PGSQL/Resources/HGTravelStore.migrations b/OpenSim/Data/PGSQL/Resources/HGTravelStore.migrations
new file mode 100644
index 0000000..adf126d
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/HGTravelStore.migrations
@@ -0,0 +1,17 @@
+:VERSION 1         # -------------------------- 
+
+BEGIN;
+
+CREATE TABLE hg_traveling_data (
+    "SessionID" VARCHAR(36) NOT NULL Primary Key,
+    "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 default now()
+);
+
+
+COMMIT;
+
diff --git a/OpenSim/Data/PGSQL/Resources/IM_Store.migrations b/OpenSim/Data/PGSQL/Resources/IM_Store.migrations
new file mode 100644
index 0000000..70dc011
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/IM_Store.migrations
@@ -0,0 +1,26 @@
+:VERSION 1         # -------------------------- 
+
+BEGIN Transaction;
+
+Create Sequence im_offiline_id increment by 1 start with 1;
+
+CREATE TABLE im_offline (
+  "ID" integer PRIMARY KEY NOT NULL DEFAULT nextval('im_offiline_id') ,
+  "PrincipalID" char(36) NOT NULL default '',
+  "Message" text NOT NULL,
+  "TMStamp" timestamp NOT NULL default now()
+);
+
+COMMIT;
+
+:VERSION 2         # -------------------------- 
+
+BEGIN;
+
+/*
+INSERT INTO `im_offline` SELECT * from `diva_im_offline`;
+DROP TABLE `diva_im_offline`;
+DELETE FROM `migrations` WHERE name='diva_im_Store';
+*/
+
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations b/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations
new file mode 100644
index 0000000..b61e1f8
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations
@@ -0,0 +1,211 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE inventoryfolders (
+  "folderID" varchar(36) NOT NULL default '' PRIMARY KEY,
+  "agentID" varchar(36) default NULL,
+  "parentFolderID" varchar(36) default NULL,
+  "folderName" varchar(64) default NULL,
+  "type" smallint NOT NULL default 0,
+  "version" int NOT NULL default 0
+);
+
+
+CREATE INDEX owner ON inventoryfolders
+(
+	"agentID" ASC
+);
+
+CREATE INDEX parent ON inventoryfolders
+(
+	"parentFolderID" ASC
+);
+
+
+CREATE TABLE inventoryitems (
+  "inventoryID" varchar(36) NOT NULL default '' Primary Key,
+  "assetID" varchar(36) default NULL,
+  "assetType" int default NULL,
+  "parentFolderID" varchar(36) default NULL,
+  "avatarID" varchar(36) default NULL,
+  "inventoryName" varchar(64) default NULL,
+  "inventoryDescription" varchar(128) default NULL,
+  "inventoryNextPermissions" int default NULL,
+  "inventoryCurrentPermissions" int default NULL,
+  "invType" int default NULL,
+  "creatorID" varchar(36) default NULL,
+  "inventoryBasePermissions" int NOT NULL default 0,
+  "inventoryEveryOnePermissions" int NOT NULL default 0,
+  "salePrice" int default NULL,
+  "saleType" smallint default NULL,
+  "creationDate" int default NULL,
+  "groupID" varchar(36) default NULL,
+  "groupOwned" boolean default NULL,
+  "flags" int default NULL
+);
+
+
+CREATE INDEX ii_owner ON inventoryitems
+(
+	"avatarID" ASC
+);
+
+CREATE INDEX ii_folder ON inventoryitems
+(
+	"parentFolderID" ASC
+);
+
+COMMIT;
+
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+ALTER TABLE inventoryitems ADD "inventoryGroupPermissions" INTEGER NOT NULL default 0;
+
+COMMIT;
+
+:VERSION 3
+
+/* To prevent any potential data loss issues, you should review this script in detail before running it outside the cotext of the database designer.*/
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_inventoryfolders
+	(
+	"folderID" uuid NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+	"agentID" uuid NULL DEFAULT (NULL),
+	"parentFolderID" uuid NULL DEFAULT (NULL),
+	"folderName" varchar(64) NULL DEFAULT (NULL),
+	"type" smallint NOT NULL DEFAULT ((0)),
+	"version" int NOT NULL DEFAULT ((0))
+	);
+
+ INSERT INTO Tmp_inventoryfolders ("folderID", "agentID", "parentFolderID", "folderName", type, version)
+   SELECT cast("folderID" as uuid), cast("agentID" as uuid), cast("parentFolderID" as uuid), "folderName", "type", "version"
+   FROM inventoryfolders;
+
+DROP TABLE inventoryfolders;
+
+alter table Tmp_inventoryfolders rename to inventoryfolders;
+
+ALTER TABLE inventoryfolders ADD CONSTRAINT
+	PK__inventor__C2FABFB3173876EA PRIMARY KEY 
+	(
+	"folderID"
+	);
+
+CREATE INDEX owner ON inventoryfolders
+	(
+	"agentID"
+	);
+
+CREATE INDEX parent ON inventoryfolders
+	(
+	"parentFolderID"
+	);
+
+COMMIT;
+
+
+:VERSION 4
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_inventoryitems
+	(
+	"inventoryID" uuid NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+	"assetID" uuid NULL DEFAULT (NULL),
+	"assetType" int NULL DEFAULT (NULL),
+	"parentFolderID" uuid NULL DEFAULT (NULL),
+	"avatarID" uuid NULL DEFAULT (NULL),
+	"inventoryName" varchar(64) NULL DEFAULT (NULL),
+	"inventoryDescription" varchar(128) NULL DEFAULT (NULL),
+	"inventoryNextPermissions" int NULL DEFAULT (NULL),
+	"inventoryCurrentPermissions" int NULL DEFAULT (NULL),
+	"invType" int NULL DEFAULT (NULL),
+	"creatorID" uuid NULL DEFAULT (NULL),
+	"inventoryBasePermissions" int NOT NULL DEFAULT ((0)),
+	"inventoryEveryOnePermissions" int NOT NULL DEFAULT ((0)),
+	"salePrice" int NULL DEFAULT (NULL),
+	"SaleType" smallint NULL DEFAULT (NULL),
+	"creationDate" int NULL DEFAULT (NULL),
+	"groupID" uuid NULL DEFAULT (NULL),
+	"groupOwned" boolean NULL DEFAULT (NULL),
+	"flags" int NULL DEFAULT (NULL),
+	"inventoryGroupPermissions" int NOT NULL DEFAULT ((0))
+	);
+
+
+	 INSERT INTO Tmp_inventoryitems ("inventoryID", "assetID", "assetType", "parentFolderID", "avatarID", "inventoryName", "inventoryDescription", "inventoryNextPermissions", "inventoryCurrentPermissions", "invType", "creatorID", "inventoryBasePermissions", "inventoryEveryOnePermissions", "salePrice", "SaleType", "creationDate", "groupID", "groupOwned", "flags", "inventoryGroupPermissions")
+		SELECT cast("inventoryID" as uuid), cast("assetID" as uuid), "assetType", cast("parentFolderID" as uuid), cast("avatarID" as uuid), "inventoryName", "inventoryDescription", "inventoryNextPermissions", "inventoryCurrentPermissions", "invType", cast("creatorID" as uuid), "inventoryBasePermissions", "inventoryEveryOnePermissions", "salePrice", "SaleType", "creationDate", cast("groupID" as uuid), "groupOwned", "flags", "inventoryGroupPermissions" 
+		FROM inventoryitems ;
+
+DROP TABLE inventoryitems;
+
+alter table Tmp_inventoryitems rename to inventoryitems;
+
+ALTER TABLE inventoryitems ADD CONSTRAINT
+	PK__inventor__C4B7BC2220C1E124 PRIMARY KEY 
+	(
+	"inventoryID"
+	);
+
+
+CREATE INDEX ii2_owner ON inventoryitems
+	(
+	"avatarID"
+	);
+
+CREATE INDEX ii2_folder ON inventoryitems
+	(
+	"parentFolderID"
+	);
+
+COMMIT;
+
+:VERSION 5
+
+
+BEGIN TRANSACTION;
+
+-- # Restoring defaults:   
+-- # NOTE: "inventoryID" does NOT need one: it's NOT NULL PK and a unique Guid must be provided every time anyway!
+ 
+alter table inventoryitems
+   alter column "inventoryBasePermissions" set default 0;    
+alter table inventoryitems
+   alter column "inventoryEveryOnePermissions" set default 0;  
+alter table inventoryitems
+   alter column "inventoryGroupPermissions" set default 0 ;   
+   
+COMMIT     ;
+   
+:VERSION 7
+
+BEGIN TRANSACTION;
+
+-- # "creatorID" goes back to VARCHAR(36) (???)
+
+alter table inventoryitems
+  alter column "creatorID" type varchar(36);
+
+COMMIT	;
+   
+:VERSION 8
+
+ALTER TABLE inventoryitems
+ alter column "creatorID" set DEFAULT '00000000-0000-0000-0000-000000000000';
+   
+
+:VERSION 9
+
+BEGIN TRANSACTION;
+
+--# "creatorID" goes up to VARCHAR(255)
+
+alter table inventoryitems
+  alter column "creatorID" type varchar(255);
+  
+Commit;
diff --git a/OpenSim/Data/PGSQL/Resources/LogStore.migrations b/OpenSim/Data/PGSQL/Resources/LogStore.migrations
new file mode 100644
index 0000000..83727c6
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/LogStore.migrations
@@ -0,0 +1,16 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE logs (
+  "logID" int NOT NULL Primary Key,
+  "target" varchar(36) default NULL,
+  "server" varchar(64) default NULL,
+  "method" varchar(64) default NULL,
+  "arguments" varchar(255) default NULL,
+  "priority" int default NULL,
+  "message" text
+);
+
+COMMIT;
+
diff --git a/OpenSim/Data/PGSQL/Resources/Presence.migrations b/OpenSim/Data/PGSQL/Resources/Presence.migrations
new file mode 100644
index 0000000..684faa2
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/Presence.migrations
@@ -0,0 +1,30 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Presence (
+"UserID" varchar(255) NOT NULL, 
+"RegionID" uuid NOT NULL, 
+"SessionID" uuid NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+"SecureSessionID" uuid NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'
+);
+ 
+
+COMMIT;
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+CREATE UNIQUE INDEX SessionID ON Presence("SessionID");
+CREATE INDEX UserID ON Presence("UserID");
+
+COMMIT;
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+ALTER TABLE Presence ADD "LastSeen" Timestamp;
+
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/RegionStore.migrations b/OpenSim/Data/PGSQL/Resources/RegionStore.migrations
new file mode 100644
index 0000000..65eb011
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/RegionStore.migrations
@@ -0,0 +1,1136 @@
+begin transaction ;
+:VERSION 1
+
+CREATE TABLE prims(
+	"UUID" varchar(255) NOT NULL Primary key,
+	"RegionUUID" varchar(255) NULL,
+	"ParentID" int NULL,
+	"CreationDate" int NULL,
+	"Name" varchar(255) NULL,
+	"SceneGroupID" varchar(255) NULL,
+	"Text" varchar(255) NULL,
+	"Description" varchar(255) NULL,
+	"SitName" varchar(255) NULL,
+	"TouchName" varchar(255) NULL,
+	"ObjectFlags" int NULL,
+	"CreatorID" varchar(255) NULL,
+	"OwnerID" varchar(255) NULL,
+	"GroupID" varchar(255) NULL,
+	"LastOwnerID" varchar(255) NULL,
+	"OwnerMask" int NULL,
+	"NextOwnerMask" int NULL,
+	"GroupMask" int NULL,
+	"EveryoneMask" int NULL,
+	"BaseMask" int NULL,
+	"PositionX" double precision NULL,
+	"PositionY" double precision NULL,
+	"PositionZ" double precision NULL,
+	"GroupPositionX" double precision NULL,
+	"GroupPositionY" double precision NULL,
+	"GroupPositionZ" double precision NULL,
+	"VelocityX" double precision NULL,
+	"VelocityY" double precision NULL,
+	"VelocityZ" double precision NULL,
+	"AngularVelocityX" double precision NULL,
+	"AngularVelocityY" double precision NULL,
+	"AngularVelocityZ" double precision NULL,
+	"AccelerationX" double precision NULL,
+	"AccelerationY" double precision NULL,
+	"AccelerationZ" double precision NULL,
+	"RotationX" double precision NULL,
+	"RotationY" double precision NULL,
+	"RotationZ" double precision NULL,
+	"RotationW" double precision NULL,
+	"SitTargetOffsetX" double precision NULL,
+	"SitTargetOffsetY" double precision NULL,
+	"SitTargetOffsetZ" double precision NULL,
+	"SitTargetOrientW" double precision NULL,
+	"SitTargetOrientX" double precision NULL,
+	"SitTargetOrientY" double precision NULL,
+	"SitTargetOrientZ" double precision NULL
+	);
+
+CREATE TABLE primshapes(
+	"UUID" varchar(255) NOT NULL primary key,
+	"Shape" int NULL,
+	"ScaleX" double precision NULL,
+	"ScaleY" double precision NULL,
+	"ScaleZ" double precision NULL,
+	"PCode" int NULL,
+	"PathBegin" int NULL,
+	"PathEnd" int NULL,
+	"PathScaleX" int NULL,
+	"PathScaleY" int NULL,
+	"PathShearX" int NULL,
+	"PathShearY" int NULL,
+	"PathSkew" int NULL,
+	"PathCurve" int NULL,
+	"PathRadiusOffset" int NULL,
+	"PathRevolutions" int NULL,
+	"PathTaperX" int NULL,
+	"PathTaperY" int NULL,
+	"PathTwist" int NULL,
+	"PathTwistBegin" int NULL,
+	"ProfileBegin" int NULL,
+	"ProfileEnd" int NULL,
+	"ProfileCurve" int NULL,
+	"ProfileHollow" int NULL,
+	"State" int NULL,
+	"Texture" bytea NULL,
+	"ExtraParams" bytea NULL
+	);
+
+CREATE TABLE primitems(
+	"itemID" varchar(255)  NOT NULL primary key,
+	"primID" varchar(255)  NULL,
+	"assetID" varchar(255)  NULL,
+	"parentFolderID" varchar(255)  NULL,
+	"invType" int NULL,
+	"assetType" int NULL,
+	"name" varchar(255)  NULL,
+	"description" varchar(255)  NULL,
+	"creationDate" varchar(255)  NULL,
+	"creatorID" varchar(255)  NULL,
+	"ownerID" varchar(255)  NULL,
+	"lastOwnerID" varchar(255)  NULL,
+	"groupID" varchar(255)  NULL,
+	"nextPermissions" int NULL,
+	"currentPermissions" int NULL,
+	"basePermissions" int NULL,
+	"everyonePermissions" int NULL,
+	"groupPermissions" int NULL
+	);
+
+CREATE TABLE terrain(
+	"RegionUUID" varchar(255)  NULL,
+	"Revision" int NULL,
+	"Heightfield" bytea NULL
+);
+
+
+CREATE TABLE land(
+	"UUID" varchar(255)  NOT NULL primary key,
+	"RegionUUID" varchar(255)  NULL,
+	"LocalLandID" int NULL,
+	"Bitmap" bytea NULL,
+	"Name" varchar(255)  NULL,
+	"Description" varchar(255)  NULL,
+	"OwnerUUID" varchar(255)  NULL,
+	"IsGroupOwned" boolean NULL,
+	"Area" int NULL,
+	"AuctionID" int NULL,
+	"Category" int NULL,
+	"ClaimDate" int NULL,
+	"ClaimPrice" int NULL,
+	"GroupUUID" varchar(255)  NULL,
+	"SalePrice" int NULL,
+	"LandStatus" int NULL,
+	"LandFlags" int NULL,
+	"LandingType" int NULL,
+	"MediaAutoScale" int NULL,
+	"MediaTextureUUID" varchar(255)  NULL,
+	"MediaURL" varchar(255)  NULL,
+	"MusicURL" varchar(255)  NULL,
+	"PassHours" double precision NULL,
+	"PassPrice" int NULL,
+	"SnapshotUUID" varchar(255)  NULL,
+	"UserLocationX" double precision NULL,
+	"UserLocationY" double precision NULL,
+	"UserLocationZ" double precision NULL,
+	"UserLookAtX" double precision NULL,
+	"UserLookAtY" double precision NULL,
+	"UserLookAtZ" double precision NULL
+);
+
+Create index on land (lower("Name"));
+
+CREATE TABLE landaccesslist(
+	"LandUUID" varchar(255)  NULL,
+	"AccessUUID" varchar(255)  NULL,
+	"Flags" int NULL
+);
+
+COMMIT;
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+CREATE TABLE regionban (
+	"regionUUID" VARCHAR(36) NOT NULL, 
+	"bannedUUID" VARCHAR(36) NOT NULL, 
+	"bannedIp" VARCHAR(16) NOT NULL, 
+	"bannedIpHostMask" VARCHAR(16) NOT NULL
+	);
+
+create table regionsettings (
+	"regionUUID" varchar(36) not null primary key,
+	"block_terraform" boolean not null,
+	"block_fly" boolean not null,
+	"allow_damage" boolean not null,
+	"restrict_pushing" boolean not null,
+	"allow_land_resell" boolean not null,
+	"allow_land_join_divide" boolean not null,
+	"block_show_in_search" boolean not null,
+	"agent_limit" int not null,
+	"object_bonus" double precision not null,
+	"maturity" int not null,
+	"disable_scripts" boolean not null,
+	"disable_collisions" boolean not null,
+	"disable_physics" boolean not null,
+	"terrain_texture_1" varchar(36) not null,
+	"terrain_texture_2" varchar(36) not null,
+	"terrain_texture_3" varchar(36) not null,
+	"terrain_texture_4" varchar(36) not null,
+	"elevation_1_nw" double precision not null,
+	"elevation_2_nw" double precision not null,
+	"elevation_1_ne" double precision not null,
+	"elevation_2_ne" double precision not null,
+	"elevation_1_se" double precision not null,
+	"elevation_2_se" double precision not null,
+	"elevation_1_sw" double precision not null,
+	"elevation_2_sw" double precision not null,
+	"water_height" double precision not null,
+	"terrain_raise_limit" double precision not null,
+	"terrain_lower_limit" double precision not null,
+	"use_estate_sun" boolean not null,
+	"fixed_sun" boolean not null,
+	"sun_position" double precision not null,
+	"covenant" varchar(36) default NULL,
+	"Sandbox" boolean NOT NULL
+	);
+
+COMMIT;
+
+:VERSION 3
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_prims
+	(
+	"UUID" varchar(36) NOT NULL ,
+	"RegionUUID" varchar(36) NULL,
+	"ParentID" int NULL,
+	"CreationDate" int NULL,
+	"Name" varchar(255) NULL,
+	"SceneGroupID" varchar(36) NULL,
+	"Text" varchar(255) NULL,
+	"Description" varchar(255) NULL,
+	"SitName" varchar(255) NULL,
+	"TouchName" varchar(255) NULL,
+	"ObjectFlags" int NULL,
+	"CreatorID" varchar(36) NULL,
+	"OwnerID" varchar(36) NULL,
+	"GroupID" varchar(36) NULL,
+	"LastOwnerID" varchar(36) NULL,
+	"OwnerMask" int NULL,
+	"NextOwnerMask" int NULL,
+	"GroupMask" int NULL,
+	"EveryoneMask" int NULL,
+	"BaseMask" int NULL,
+	"PositionX" double precision NULL,
+	"PositionY" double precision NULL,
+	"PositionZ" double precision NULL,
+	"GroupPositionX" double precision NULL,
+	"GroupPositionY" double precision NULL,
+	"GroupPositionZ" double precision NULL,
+	"VelocityX" double precision NULL,
+	"VelocityY" double precision NULL,
+	"VelocityZ" double precision NULL,
+	"AngularVelocityX" double precision NULL,
+	"AngularVelocityY" double precision NULL,
+	"AngularVelocityZ" double precision NULL,
+	"AccelerationX" double precision NULL,
+	"AccelerationY" double precision NULL,
+	"AccelerationZ" double precision NULL,
+	"RotationX" double precision NULL,
+	"RotationY" double precision NULL,
+	"RotationZ" double precision NULL,
+	"RotationW" double precision NULL,
+	"SitTargetOffsetX" double precision NULL,
+	"SitTargetOffsetY" double precision NULL,
+	"SitTargetOffsetZ" double precision NULL,
+	"SitTargetOrientW" double precision NULL,
+	"SitTargetOrientX" double precision NULL,
+	"SitTargetOrientY" double precision NULL,
+	"SitTargetOrientZ" double precision NULL
+	);
+
+INSERT INTO Tmp_prims ("UUID", "RegionUUID", "ParentID", "CreationDate", "Name", "SceneGroupID", "Text", "Description", "SitName", "TouchName", "ObjectFlags", "CreatorID", "OwnerID", "GroupID", "LastOwnerID", "OwnerMask", "NextOwnerMask", "GroupMask", "EveryoneMask", "BaseMask", "PositionX", "PositionY", "PositionZ", "GroupPositionX", "GroupPositionY", "GroupPositionZ", "VelocityX", "VelocityY", "VelocityZ", "AngularVelocityX", "AngularVelocityY", "AngularVelocityZ", "AccelerationX", "AccelerationY", "AccelerationZ", "RotationX", "RotationY", "RotationZ", "RotationW", "SitTargetOffsetX", "SitTargetOffsetY", "SitTargetOffsetZ", "SitTargetOrientW", "SitTargetOrientX", "SitTargetOrientY", "SitTargetOrientZ")
+	SELECT cast("UUID" as varchar(36)), cast("RegionUUID" as varchar(36)), "ParentID", "CreationDate", "Name", cast("SceneGroupID" as varchar(36)), "Text", "Description", "SitName", "TouchName", "ObjectFlags", cast("CreatorID" as varchar(36)), cast("OwnerID" as varchar(36)), cast( "GroupID" as varchar(36)), cast("LastOwnerID" as varchar(36)), "OwnerMask", "NextOwnerMask", "GroupMask", "EveryoneMask", "BaseMask", "PositionX", "PositionY", "PositionZ", "GroupPositionX", "GroupPositionY", "GroupPositionZ", "VelocityX", "VelocityY", "VelocityZ", "AngularVelocityX", "AngularVelocityY", "AngularVelocityZ", "AccelerationX", "AccelerationY", "AccelerationZ", "RotationX", "RotationY", "RotationZ", "RotationW", "SitTargetOffsetX", "SitTargetOffsetY", "SitTargetOffsetZ", "SitTargetOrientW", "SitTargetOrientX", "SitTargetOrientY", "SitTargetOrientZ" 
+	FROM prims ;
+
+DROP TABLE prims;
+
+alter table Tmp_prims rename to prims;
+
+
+ALTER TABLE prims ADD CONSTRAINT
+	PK__prims__10566F31 PRIMARY KEY 
+	(
+	"UUID"
+	);
+
+COMMIT;
+
+:VERSION 4
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_primitems
+	(
+	"itemID" varchar(36) NOT NULL,
+	"primID" varchar(36) NULL,
+	"assetID" varchar(36) NULL,
+	"parentFolderID" varchar(36) NULL,
+	"invType" int NULL,
+	"assetType" int NULL,
+	"name" varchar(255) NULL,
+	"description" varchar(255) NULL,
+	"creationDate" varchar(255) NULL,
+	"creatorID" varchar(36) NULL,
+	"ownerID" varchar(36) NULL,
+	"lastOwnerID" varchar(36) NULL,
+	"groupID" varchar(36) NULL,
+	"nextPermissions" int NULL,
+	"currentPermissions" int NULL,
+	"basePermissions" int NULL,
+	"everyonePermissions" int NULL,
+	"groupPermissions" int NULL
+	);
+
+INSERT INTO Tmp_primitems ("itemID", "primID", "assetID", "parentFolderID", "invType", "assetType", "name", "description", "creationDate", "creatorID", "ownerID", "lastOwnerID", "groupID", "nextPermissions", "currentPermissions", "basePermissions", "everyonePermissions", "groupPermissions")
+	SELECT cast("itemID" as varchar(36)), cast("primID" as varchar(36)), cast("assetID" as varchar(36)), cast( "parentFolderID" as varchar(36)), "invType", "assetType", "name", "description", "creationDate", cast( "creatorID" as varchar(36)), cast("ownerID" as varchar(36)), cast("lastOwnerID" as varchar(36)), cast("groupID" as varchar(36)), "nextPermissions", "currentPermissions", "basePermissions", "everyonePermissions", "groupPermissions"
+	  from primitems;
+
+DROP TABLE primitems;
+
+alter table Tmp_primitems rename to primitems;
+
+ALTER TABLE primitems ADD CONSTRAINT
+	PK__primitems__0A688BB1 PRIMARY KEY 
+	(
+	"itemID"
+	);
+
+
+COMMIT;
+
+
+:VERSION 5
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_primshapes
+	(
+	"UUID" varchar(36) NOT NULL,
+	"Shape" int NULL,
+	"ScaleX" double precision NULL,
+	"ScaleY" double precision NULL,
+	"ScaleZ" double precision NULL,
+	"PCode" int NULL,
+	"PathBegin" int NULL,
+	"PathEnd" int NULL,
+	"PathScaleX" int NULL,
+	"PathScaleY" int NULL,
+	"PathShearX" int NULL,
+	"PathShearY" int NULL,
+	"PathSkew" int NULL,
+	"PathCurve" int NULL,
+	"PathRadiusOffset" int NULL,
+	"PathRevolutions" int NULL,
+	"PathTaperX" int NULL,
+	"PathTaperY" int NULL,
+	"PathTwist" int NULL,
+	"PathTwistBegin" int NULL,
+	"ProfileBegin" int NULL,
+	"ProfileEnd" int NULL,
+	"ProfileCurve" int NULL,
+	"ProfileHollow" int NULL,
+	"State" int NULL,
+	"Texture" bytea NULL,
+	"ExtraParams" bytea NULL
+	) ;
+
+INSERT INTO Tmp_primshapes ("UUID", "Shape", "ScaleX", "ScaleY", "ScaleZ", "PCode", "PathBegin", "PathEnd", "PathScaleX", "PathScaleY", "PathShearX", "PathShearY", "PathSkew", "PathCurve", "PathRadiusOffset", "PathRevolutions", "PathTaperX", "PathTaperY", "PathTwist", "PathTwistBegin", "ProfileBegin", "ProfileEnd", "ProfileCurve", "ProfileHollow", "State", "Texture", "ExtraParams")
+	SELECT cast("UUID" as varchar(36)), "Shape", "ScaleX", "ScaleY", "ScaleZ", "PCode", "PathBegin", "PathEnd", "PathScaleX", "PathScaleY", "PathShearX", "PathShearY", "PathSkew", "PathCurve", "PathRadiusOffset", "PathRevolutions", "PathTaperX", "PathTaperY", "PathTwist", "PathTwistBegin", "ProfileBegin", "ProfileEnd", "ProfileCurve", "ProfileHollow", "State", "Texture", "ExtraParams" 
+	FROM primshapes;
+
+DROP TABLE primshapes;
+
+alter table Tmp_primshapes rename to primshapes;
+
+ALTER TABLE primshapes ADD CONSTRAINT
+	PK__primshapes__0880433F PRIMARY KEY 
+	(
+	"UUID"
+	) ;
+
+COMMIT;
+
+
+:VERSION 6
+
+BEGIN TRANSACTION;
+
+ALTER TABLE prims ADD "PayPrice" int not null default 0;
+ALTER TABLE prims ADD "PayButton1" int not null default 0;
+ALTER TABLE prims ADD "PayButton2" int not null default 0;
+ALTER TABLE prims ADD "PayButton3" int not null default 0;
+ALTER TABLE prims ADD "PayButton4" int not null default 0;
+ALTER TABLE prims ADD "LoopedSound" varchar(36) not null default '00000000-0000-0000-0000-000000000000';
+ALTER TABLE prims ADD "LoopedSoundGain" double precision not null default 0.0;
+ALTER TABLE prims ADD "TextureAnimation" bytea;
+ALTER TABLE prims ADD "OmegaX" double precision not null default 0.0;
+ALTER TABLE prims ADD "OmegaY" double precision not null default 0.0;
+ALTER TABLE prims ADD "OmegaZ" double precision not null default 0.0;
+ALTER TABLE prims ADD "CameraEyeOffsetX" double precision not null default 0.0;
+ALTER TABLE prims ADD "CameraEyeOffsetY" double precision not null default 0.0;
+ALTER TABLE prims ADD "CameraEyeOffsetZ" double precision not null default 0.0;
+ALTER TABLE prims ADD "CameraAtOffsetX" double precision not null default 0.0;
+ALTER TABLE prims ADD "CameraAtOffsetY" double precision not null default 0.0;
+ALTER TABLE prims ADD "CameraAtOffsetZ" double precision not null default 0.0;
+ALTER TABLE prims ADD "ForceMouselook" smallint not null default 0;
+ALTER TABLE prims ADD "ScriptAccessPin" int not null default 0;
+ALTER TABLE prims ADD "AllowedDrop" smallint not null default 0;
+ALTER TABLE prims ADD "DieAtEdge" smallint not null default 0;
+ALTER TABLE prims ADD "SalePrice" int not null default 10;
+ALTER TABLE prims ADD "SaleType" smallint not null default 0;
+
+ALTER TABLE primitems add "flags" integer not null default 0;
+
+ALTER TABLE land ADD "AuthbuyerID" varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
+
+CREATE index prims_regionuuid on prims("RegionUUID");
+CREATE index prims_parentid on prims("ParentID");
+
+CREATE index primitems_primid on primitems("primID");
+
+COMMIT;
+
+
+:VERSION 7
+
+BEGIN TRANSACTION;
+
+ALTER TABLE prims ADD "ColorR" int not null default 0;
+ALTER TABLE prims ADD "ColorG" int not null default 0;
+ALTER TABLE prims ADD "ColorB" int not null default 0;
+ALTER TABLE prims ADD "ColorA" int not null default 0;
+ALTER TABLE prims ADD "ParticleSystem" bytea;
+ALTER TABLE prims ADD "ClickAction" smallint NOT NULL default 0;
+
+COMMIT;
+
+
+:VERSION 8
+
+BEGIN TRANSACTION;
+
+ALTER TABLE land ADD "OtherCleanTime" integer NOT NULL default 0;
+ALTER TABLE land ADD "Dwell" integer NOT NULL default 0;
+
+COMMIT;
+
+:VERSION 9
+
+BEGIN TRANSACTION;
+
+ALTER TABLE prims ADD "Material" smallint NOT NULL default 3;
+
+COMMIT;
+
+
+:VERSION 10
+
+BEGIN TRANSACTION;
+
+ALTER TABLE regionsettings ADD "sunvectorx" double precision NOT NULL default 0;
+ALTER TABLE regionsettings ADD "sunvectory" double precision NOT NULL default 0;
+ALTER TABLE regionsettings ADD "sunvectorz" double precision NOT NULL default 0;
+
+COMMIT;
+
+
+:VERSION 11
+
+BEGIN TRANSACTION;
+
+ALTER TABLE prims ADD "CollisionSound" char(36) not null default '00000000-0000-0000-0000-000000000000';
+ALTER TABLE prims ADD "CollisionSoundVolume" double precision not null default 0.0;
+
+COMMIT;
+
+
+:VERSION 12
+
+BEGIN TRANSACTION;
+
+ALTER TABLE prims ADD "LinkNumber" integer not null default 0;
+
+COMMIT;
+
+
+:VERSION 13
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_prims
+	(
+	"UUID" uuid NOT NULL,
+	"RegionUUID" uuid NULL,
+	"ParentID" int NULL,
+	"CreationDate" int NULL,
+	"Name" varchar(255) NULL,
+	"SceneGroupID" uuid NULL,
+	"Text" varchar(255) NULL,
+	"Description" varchar(255) NULL,
+	"SitName" varchar(255) NULL,
+	"TouchName" varchar(255) NULL,
+	"ObjectFlags" int NULL,
+	"CreatorID" uuid NULL,
+	"OwnerID" uuid NULL,
+	"GroupID" uuid NULL,
+	"LastOwnerID" uuid NULL,
+	"OwnerMask" int NULL,
+	"NextOwnerMask" int NULL,
+	"GroupMask" int NULL,
+	"EveryoneMask" int NULL,
+	"BaseMask" int NULL,
+	"PositionX" double precision NULL,
+	"PositionY" double precision NULL,
+	"PositionZ" double precision NULL,
+	"GroupPositionX" double precision NULL,
+	"GroupPositionY" double precision NULL,
+	"GroupPositionZ" double precision NULL,
+	"VelocityX" double precision NULL,
+	"VelocityY" double precision NULL,
+	"VelocityZ" double precision NULL,
+	"AngularVelocityX" double precision NULL,
+	"AngularVelocityY" double precision NULL,
+	"AngularVelocityZ" double precision NULL,
+	"AccelerationX" double precision NULL,
+	"AccelerationY" double precision NULL,
+	"AccelerationZ" double precision NULL,
+	"RotationX" double precision NULL,
+	"RotationY" double precision NULL,
+	"RotationZ" double precision NULL,
+	"RotationW" double precision NULL,
+	"SitTargetOffsetX" double precision NULL,
+	"SitTargetOffsetY" double precision NULL,
+	"SitTargetOffsetZ" double precision NULL,
+	"SitTargetOrientW" double precision NULL,
+	"SitTargetOrientX" double precision NULL,
+	"SitTargetOrientY" double precision NULL,
+	"SitTargetOrientZ" double precision NULL,
+	"PayPrice" int NOT NULL DEFAULT ((0)),
+	"PayButton1" int NOT NULL DEFAULT ((0)),
+	"PayButton2" int NOT NULL DEFAULT ((0)),
+	"PayButton3" int NOT NULL DEFAULT ((0)),
+	"PayButton4" int NOT NULL DEFAULT ((0)),
+	"LoopedSound" uuid NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+	"LoopedSoundGain" double precision NOT NULL DEFAULT ((0.0)),
+	"TextureAnimation" bytea NULL,
+	"OmegaX" double precision NOT NULL DEFAULT ((0.0)),
+	"OmegaY" double precision NOT NULL DEFAULT ((0.0)),
+	"OmegaZ" double precision NOT NULL DEFAULT ((0.0)),
+	"CameraEyeOffsetX" double precision NOT NULL DEFAULT ((0.0)),
+	"CameraEyeOffsetY" double precision NOT NULL DEFAULT ((0.0)),
+	"CameraEyeOffsetZ" double precision NOT NULL DEFAULT ((0.0)),
+	"CameraAtOffsetX" double precision NOT NULL DEFAULT ((0.0)),
+	"CameraAtOffsetY" double precision NOT NULL DEFAULT ((0.0)),
+	"CameraAtOffsetZ" double precision NOT NULL DEFAULT ((0.0)),
+	"ForceMouselook" smallint NOT NULL DEFAULT ((0)),
+	"ScriptAccessPin" int NOT NULL DEFAULT ((0)),
+	"AllowedDrop" smallint NOT NULL DEFAULT ((0)),
+	"DieAtEdge" smallint NOT NULL DEFAULT ((0)),
+	"SalePrice" int NOT NULL DEFAULT ((10)),
+	"SaleType" smallint NOT NULL DEFAULT ((0)),
+	"ColorR" int NOT NULL DEFAULT ((0)),
+	"ColorG" int NOT NULL DEFAULT ((0)),
+	"ColorB" int NOT NULL DEFAULT ((0)),
+	"ColorA" int NOT NULL DEFAULT ((0)),
+	"ParticleSystem" bytea NULL,
+	"ClickAction" smallint NOT NULL DEFAULT ((0)),
+	"Material" smallint NOT NULL DEFAULT ((3)),
+	"CollisionSound" uuid NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+	"CollisionSoundVolume" double precision NOT NULL DEFAULT ((0.0)),
+	"LinkNumber" int NOT NULL DEFAULT ((0))
+	);
+
+INSERT INTO Tmp_prims ("UUID", "RegionUUID", "ParentID", "CreationDate", "Name", "SceneGroupID", "Text", "Description", "SitName", "TouchName", "ObjectFlags", "CreatorID", "OwnerID", "GroupID", "LastOwnerID", "OwnerMask", "NextOwnerMask", "GroupMask", "EveryoneMask", "BaseMask", "PositionX", "PositionY", "PositionZ", "GroupPositionX", "GroupPositionY", "GroupPositionZ", "VelocityX", "VelocityY", "VelocityZ", "AngularVelocityX", "AngularVelocityY", "AngularVelocityZ", "AccelerationX", "AccelerationY", "AccelerationZ", "RotationX", "RotationY", "RotationZ", "RotationW", "SitTargetOffsetX", "SitTargetOffsetY", "SitTargetOffsetZ", "SitTargetOrientW", "SitTargetOrientX", "SitTargetOrientY", "SitTargetOrientZ", "PayPrice", "PayButton1", "PayButton2", "PayButton3", "PayButton4", "LoopedSound", "LoopedSoundGain", "TextureAnimation", "OmegaX", "OmegaY", "OmegaZ", "CameraEyeOffsetX", "CameraEyeOffsetY", "CameraEyeOffsetZ", "CameraAtOffsetX", "CameraAtOffsetY", "CameraAtOffsetZ", "ForceMouselook", "ScriptAccessPin", "AllowedDrop", "DieAtEdge", "SalePrice", "SaleType", "ColorR", "ColorG", "ColorB", "ColorA", "ParticleSystem", "ClickAction", "Material", "CollisionSound", "CollisionSoundVolume", "LinkNumber")
+	SELECT cast("UUID" as uuid), cast("RegionUUID" as uuid), "ParentID", "CreationDate", "Name", cast("SceneGroupID" as uuid), "Text", "Description", "SitName", "TouchName", "ObjectFlags", cast("CreatorID" as uuid), cast("OwnerID" as uuid), cast("GroupID" as uuid), cast("LastOwnerID" as uuid), "OwnerMask", "NextOwnerMask", "GroupMask", "EveryoneMask", "BaseMask", "PositionX", "PositionY", "PositionZ", "GroupPositionX", "GroupPositionY", "GroupPositionZ", "VelocityX", "VelocityY", "VelocityZ", "AngularVelocityX", "AngularVelocityY", "AngularVelocityZ", "AccelerationX", "AccelerationY", "AccelerationZ", "RotationX", "RotationY", "RotationZ", "RotationW", "SitTargetOffsetX", "SitTargetOffsetY", "SitTargetOffsetZ", "SitTargetOrientW", "SitTargetOrientX", "SitTargetOrientY", "SitTargetOrientZ", "PayPrice", "PayButton1", "PayButton2", "PayButton3", "PayButton4", cast("LoopedSound" as uuid), "LoopedSoundGain", "TextureAnimation", "OmegaX", "OmegaY", "OmegaZ", "CameraEyeOffsetX", "CameraEyeOffsetY", "CameraEyeOffsetZ", "CameraAtOffsetX", "CameraAtOffsetY", "CameraAtOffsetZ", "ForceMouselook", "ScriptAccessPin", "AllowedDrop", "DieAtEdge", "SalePrice", "SaleType", "ColorR", "ColorG", "ColorB", "ColorA", "ParticleSystem", "ClickAction", "Material", cast("CollisionSound" as uuid), "CollisionSoundVolume", "LinkNumber" 
+	 FROM prims ;
+
+DROP TABLE prims;
+
+alter table Tmp_prims rename to prims;
+
+ALTER TABLE prims ADD CONSTRAINT
+	PK__prims__10566F31 PRIMARY KEY 
+	(
+	"UUID"
+	);
+
+
+CREATE INDEX prims_regionuuid ON prims
+	(
+	"RegionUUID"
+	);
+
+CREATE INDEX prims_parentid ON prims
+	(
+	"ParentID"
+	);
+
+COMMIT;
+
+
+:VERSION 14
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_primshapes
+	(
+	"UUID" uuid NOT NULL,
+	"Shape" int NULL,
+	"ScaleX" double precision NULL,
+	"ScaleY" double precision NULL,
+	"ScaleZ" double precision NULL,
+	"PCode" int NULL,
+	"PathBegin" int NULL,
+	"PathEnd" int NULL,
+	"PathScaleX" int NULL,
+	"PathScaleY" int NULL,
+	"PathShearX" int NULL,
+	"PathShearY" int NULL,
+	"PathSkew" int NULL,
+	"PathCurve" int NULL,
+	"PathRadiusOffset" int NULL,
+	"PathRevolutions" int NULL,
+	"PathTaperX" int NULL,
+	"PathTaperY" int NULL,
+	"PathTwist" int NULL,
+	"PathTwistBegin" int NULL,
+	"ProfileBegin" int NULL,
+	"ProfileEnd" int NULL,
+	"ProfileCurve" int NULL,
+	"ProfileHollow" int NULL,
+	"State" int NULL,
+	"Texture" bytea NULL,
+	"ExtraParams" bytea NULL
+	);
+
+INSERT INTO Tmp_primshapes ("UUID", "Shape", "ScaleX", "ScaleY", "ScaleZ", "PCode", "PathBegin", "PathEnd", "PathScaleX", "PathScaleY", "PathShearX", "PathShearY", "PathSkew", "PathCurve", "PathRadiusOffset", "PathRevolutions", "PathTaperX", "PathTaperY", "PathTwist", "PathTwistBegin", "ProfileBegin", "ProfileEnd", "ProfileCurve", "ProfileHollow", "State", "Texture", "ExtraParams")
+	SELECT cast("UUID" as uuid), "Shape", "ScaleX", "ScaleY", "ScaleZ", "PCode", "PathBegin", "PathEnd", "PathScaleX", "PathScaleY", "PathShearX", "PathShearY", "PathSkew", "PathCurve", "PathRadiusOffset", "PathRevolutions", "PathTaperX", "PathTaperY", "PathTwist", "PathTwistBegin", "ProfileBegin", "ProfileEnd", "ProfileCurve", "ProfileHollow", "State", "Texture", "ExtraParams" 
+	FROM primshapes;
+
+DROP TABLE primshapes;
+
+alter table Tmp_primshapes rename to primshapes;
+
+ALTER TABLE primshapes ADD CONSTRAINT
+	PK__primshapes__0880433F PRIMARY KEY 
+	(
+	"UUID"
+	);
+
+COMMIT;
+
+
+:VERSION 15
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_primitems
+	(
+	"itemID" uuid NOT NULL,
+	"primID" uuid NULL,
+	"assetID" uuid NULL,
+	"parentFolderID" uuid NULL,
+	"invType" int NULL,
+	"assetType" int NULL,
+	"name" varchar(255) NULL,
+	"description" varchar(255) NULL,
+	"creationDate" varchar(255) NULL,
+	"creatorID" uuid NULL,
+	"ownerID" uuid NULL,
+	"lastOwnerID" uuid NULL,
+	"groupID" uuid NULL,
+	"nextPermissions" int NULL,
+	"currentPermissions" int NULL,
+	"basePermissions" int NULL,
+	"everyonePermissions" int NULL,
+	"groupPermissions" int NULL,
+	flags int NOT NULL DEFAULT ((0))
+	);
+
+INSERT INTO Tmp_primitems ("itemID", "primID", "assetID", "parentFolderID", "invType", "assetType", "name", "description", "creationDate", "creatorID", "ownerID", "lastOwnerID", "groupID", "nextPermissions", "currentPermissions", "basePermissions", "everyonePermissions", "groupPermissions", flags)
+	SELECT cast("itemID" as uuid), cast("primID" as uuid), cast("assetID" as uuid), cast("parentFolderID" as uuid), "invType", "assetType", "name", "description", "creationDate", cast("creatorID" as uuid), cast("ownerID" as uuid), cast("lastOwnerID" as uuid), cast("groupID" as uuid), "nextPermissions", "currentPermissions", "basePermissions", "everyonePermissions", "groupPermissions", flags 
+	FROM primitems ;
+
+DROP TABLE primitems;
+
+alter table Tmp_primitems rename to primitems;
+
+ALTER TABLE primitems ADD CONSTRAINT
+	PK__primitems__0A688BB1 PRIMARY KEY 
+	(
+	"itemID"
+	);
+
+CREATE INDEX primitems_primid ON primitems
+	(
+	"primID"
+	) ;
+
+COMMIT;
+
+
+:VERSION 16
+
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_terrain
+	(
+	"RegionUUID" uuid NULL,
+	"Revision" int NULL,
+	"Heightfield" bytea NULL
+	);
+
+INSERT INTO Tmp_terrain ("RegionUUID", "Revision", "Heightfield")
+	SELECT cast("RegionUUID" as uuid), "Revision", "Heightfield" 
+	FROM terrain ;
+
+DROP TABLE terrain;
+
+alter table Tmp_terrain rename to terrain;
+
+COMMIT;
+
+
+:VERSION 17
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_land
+	(
+	"UUID" uuid NOT NULL,
+	"RegionUUID" uuid NULL,
+	"LocalLandID" int NULL,
+	"Bitmap" bytea NULL,
+	"Name" varchar(255) NULL,
+	"Description" varchar(255) NULL,
+	"OwnerUUID" uuid NULL,
+	"IsGroupOwned" boolean NULL,
+	"Area" int NULL,
+	"AuctionID" int NULL,
+	"Category" int NULL,
+	"ClaimDate" int NULL,
+	"ClaimPrice" int NULL,
+	"GroupUUID" uuid NULL,
+	"SalePrice" int NULL,
+	"LandStatus" int NULL,
+	"LandFlags" int NULL,
+	"LandingType" int NULL,
+	"MediaAutoScale" int NULL,
+	"MediaTextureUUID" uuid NULL,
+	"MediaURL" varchar(255) NULL,
+	"MusicURL" varchar(255) NULL,
+	"PassHours" double precision NULL,
+	"PassPrice" int NULL,
+	"SnapshotUUID" uuid NULL,
+	"UserLocationX" double precision NULL,
+	"UserLocationY" double precision NULL,
+	"UserLocationZ" double precision NULL,
+	"UserLookAtX" double precision NULL,
+	"UserLookAtY" double precision NULL,
+	"UserLookAtZ" double precision NULL,
+	"AuthbuyerID" uuid NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+	"OtherCleanTime" int NOT NULL DEFAULT ((0)),
+	"Dwell" int NOT NULL DEFAULT ((0))
+	);
+	
+INSERT INTO Tmp_land ("UUID", "RegionUUID", "LocalLandID", "Bitmap", "Name", "Description", "OwnerUUID", "IsGroupOwned", "Area", "AuctionID", "Category", "ClaimDate", "ClaimPrice", "GroupUUID", "SalePrice", "LandStatus", "LandFlags", "LandingType", "MediaAutoScale", "MediaTextureUUID", "MediaURL", "MusicURL", "PassHours", "PassPrice", "SnapshotUUID", "UserLocationX", "UserLocationY", "UserLocationZ", "UserLookAtX", "UserLookAtY", "UserLookAtZ", "AuthbuyerID", "OtherCleanTime", "Dwell")
+	SELECT cast("UUID" as uuid), cast("RegionUUID" as uuid), "LocalLandID", "Bitmap", "Name", "Description", cast("OwnerUUID" as uuid), "IsGroupOwned", "Area", "AuctionID", "Category", "ClaimDate", "ClaimPrice", cast("GroupUUID" as uuid), "SalePrice", "LandStatus", "LandFlags", "LandingType", "MediaAutoScale", cast("MediaTextureUUID" as uuid), "MediaURL", "MusicURL", "PassHours", "PassPrice", cast("SnapshotUUID" as uuid), "UserLocationX", "UserLocationY", "UserLocationZ", "UserLookAtX", "UserLookAtY", "UserLookAtZ", cast("AuthbuyerID" as uuid), "OtherCleanTime", "Dwell" 
+	FROM land ;
+
+DROP TABLE land;
+
+alter table Tmp_land rename to land;
+
+ALTER TABLE land ADD CONSTRAINT
+	PK__land__65A475E71BFD2C07 PRIMARY KEY 
+	(
+	"UUID"
+	);
+
+Create index on land (lower("Name"));
+
+COMMIT;
+
+
+
+:VERSION 18
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_landaccesslist
+	(
+	"LandUUID" uuid NULL,
+	"AccessUUID" uuid NULL,
+	"Flags" int NULL
+	);
+
+INSERT INTO Tmp_landaccesslist ("LandUUID", "AccessUUID", "Flags")
+	SELECT cast("LandUUID" as uuid), cast("AccessUUID" as uuid), "Flags" 
+	FROM landaccesslist ;
+
+DROP TABLE landaccesslist;
+
+alter table Tmp_landaccesslist rename to landaccesslist;
+
+COMMIT;
+
+
+
+:VERSION 19
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_regionban
+	(
+	"regionUUID" uuid NOT NULL,
+	"bannedUUID" uuid NOT NULL,
+	"bannedIp" varchar(16) NOT NULL,
+	"bannedIpHostMask" varchar(16) NOT NULL
+	);
+
+INSERT INTO Tmp_regionban ("regionUUID", "bannedUUID", "bannedIp", "bannedIpHostMask")
+	SELECT cast("regionUUID" as uuid), cast("bannedUUID" as uuid), "bannedIp", "bannedIpHostMask" 
+	FROM regionban ;
+
+DROP TABLE regionban;
+
+alter table Tmp_regionban rename to regionban;
+
+COMMIT;
+
+
+:VERSION 20
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_regionsettings
+	(
+	"regionUUID" uuid NOT NULL,
+	"block_terraform" boolean NOT NULL,
+	"block_fly" boolean NOT NULL,
+	"allow_damage" boolean NOT NULL,
+	"restrict_pushing" boolean NOT NULL,
+	"allow_land_resell" boolean NOT NULL,
+	"allow_land_join_divide" boolean NOT NULL,
+	"block_show_in_search" boolean NOT NULL,
+	"agent_limit" int NOT NULL,
+	"object_bonus" double precision NOT NULL,
+	"maturity" int NOT NULL,
+	"disable_scripts" boolean NOT NULL,
+	"disable_collisions" boolean NOT NULL,
+	"disable_physics" boolean NOT NULL,
+	"terrain_texture_1" uuid NOT NULL,
+	"terrain_texture_2" uuid NOT NULL,
+	"terrain_texture_3" uuid NOT NULL,
+	"terrain_texture_4" uuid NOT NULL,
+	"elevation_1_nw" double precision NOT NULL,
+	"elevation_2_nw" double precision NOT NULL,
+	"elevation_1_ne" double precision NOT NULL,
+	"elevation_2_ne" double precision NOT NULL,
+	"elevation_1_se" double precision NOT NULL,
+	"elevation_2_se" double precision NOT NULL,
+	"elevation_1_sw" double precision NOT NULL,
+	"elevation_2_sw" double precision NOT NULL,
+	"water_height" double precision NOT NULL,
+	"terrain_raise_limit" double precision NOT NULL,
+	"terrain_lower_limit" double precision NOT NULL,
+	"use_estate_sun" boolean NOT NULL,
+	"fixed_sun" boolean NOT NULL,
+	"sun_position" double precision NOT NULL,
+	"covenant" uuid NULL DEFAULT (NULL),
+	"Sandbox" boolean NOT NULL,
+	"sunvectorx" double precision NOT NULL DEFAULT ((0)),
+	"sunvectory" double precision NOT NULL DEFAULT ((0)),
+	"sunvectorz" double precision NOT NULL DEFAULT ((0))
+	);
+
+INSERT INTO Tmp_regionsettings ("regionUUID", "block_terraform", "block_fly", "allow_damage", "restrict_pushing", "allow_land_resell", "allow_land_join_divide", "block_show_in_search", "agent_limit", "object_bonus", "maturity", "disable_scripts", "disable_collisions", "disable_physics", "terrain_texture_1", "terrain_texture_2", "terrain_texture_3", "terrain_texture_4", "elevation_1_nw", "elevation_2_nw", "elevation_1_ne", "elevation_2_ne", "elevation_1_se", "elevation_2_se", "elevation_1_sw", "elevation_2_sw", "water_height", "terrain_raise_limit", "terrain_lower_limit", "use_estate_sun", "fixed_sun", "sun_position", "covenant", "Sandbox", "sunvectorx", "sunvectory", "sunvectorz")
+	SELECT cast("regionUUID" as uuid), "block_terraform", "block_fly", "allow_damage", "restrict_pushing", "allow_land_resell", "allow_land_join_divide", "block_show_in_search", "agent_limit", "object_bonus", "maturity", "disable_scripts", "disable_collisions", "disable_physics", cast("terrain_texture_1" as uuid), cast("terrain_texture_2" as uuid), cast("terrain_texture_3" as uuid), cast("terrain_texture_4" as uuid), "elevation_1_nw", "elevation_2_nw", "elevation_1_ne", "elevation_2_ne", "elevation_1_se", "elevation_2_se", "elevation_1_sw", "elevation_2_sw", "water_height", "terrain_raise_limit", "terrain_lower_limit", "use_estate_sun", "fixed_sun", "sun_position", cast("covenant" as uuid), "Sandbox", "sunvectorx", "sunvectory", "sunvectorz" 
+	FROM regionsettings ;
+
+DROP TABLE regionsettings;
+
+alter table Tmp_regionsettings rename to regionsettings;
+
+ALTER TABLE regionsettings ADD CONSTRAINT
+	PK__regionse__5B35159D21B6055D PRIMARY KEY 
+	(
+	"regionUUID"
+	);
+
+COMMIT;
+
+
+:VERSION 21
+
+BEGIN TRANSACTION;
+
+ALTER TABLE prims ADD "PassTouches" boolean not null default false;
+
+COMMIT;
+
+
+:VERSION 22
+
+BEGIN TRANSACTION;
+
+ALTER TABLE regionsettings ADD "loaded_creation_date" varchar(20) ;
+ALTER TABLE regionsettings ADD "loaded_creation_time" varchar(20) ;
+ALTER TABLE regionsettings ADD "loaded_creation_id" varchar(64) ;
+
+COMMIT;
+
+:VERSION 23
+
+BEGIN TRANSACTION;
+
+ALTER TABLE regionsettings DROP COLUMN "loaded_creation_date";
+ALTER TABLE regionsettings DROP COLUMN "loaded_creation_time";
+ALTER TABLE regionsettings ADD "loaded_creation_datetime" int NOT NULL default 0;
+
+COMMIT;
+
+:VERSION 24
+
+BEGIN TRANSACTION;
+
+ALTER TABLE prims ADD  "MediaURL" varchar(255);
+ALTER TABLE primshapes ADD "Media" TEXT NULL;
+
+COMMIT;
+
+:VERSION 25
+
+BEGIN TRANSACTION;
+CREATE TABLE regionwindlight (
+  "region_id" varchar(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000' PRIMARY KEY,
+  "water_color_r" double precision NOT NULL DEFAULT '4.000000',
+  water_color_g double precision NOT NULL DEFAULT '38.000000',
+  water_color_b double precision NOT NULL DEFAULT '64.000000',
+  water_fog_density_exponent double precision NOT NULL DEFAULT '4.0',
+  underwater_fog_modifier double precision NOT NULL DEFAULT '0.25',
+  reflection_wavelet_scale_1 double precision NOT NULL DEFAULT '2.0',
+  reflection_wavelet_scale_2 double precision NOT NULL DEFAULT '2.0',
+  reflection_wavelet_scale_3 double precision NOT NULL DEFAULT '2.0',
+  fresnel_scale double precision NOT NULL DEFAULT '0.40',
+  fresnel_offset double precision NOT NULL DEFAULT '0.50',
+  refract_scale_above double precision NOT NULL DEFAULT '0.03',
+  refract_scale_below double precision NOT NULL DEFAULT '0.20',
+  blur_multiplier double precision NOT NULL DEFAULT '0.040',
+  big_wave_direction_x double precision NOT NULL DEFAULT '1.05',
+  big_wave_direction_y double precision NOT NULL DEFAULT '-0.42',
+  little_wave_direction_x double precision NOT NULL DEFAULT '1.11',
+  little_wave_direction_y double precision NOT NULL DEFAULT '-1.16',
+  normal_map_texture varchar(36) NOT NULL DEFAULT '822ded49-9a6c-f61c-cb89-6df54f42cdf4',
+  horizon_r double precision NOT NULL DEFAULT '0.25',
+  horizon_g double precision NOT NULL DEFAULT '0.25',
+  horizon_b double precision NOT NULL DEFAULT '0.32',
+  horizon_i double precision NOT NULL DEFAULT '0.32',
+  haze_horizon double precision NOT NULL DEFAULT '0.19',
+  blue_density_r double precision NOT NULL DEFAULT '0.12',
+  blue_density_g double precision NOT NULL DEFAULT '0.22',
+  blue_density_b double precision NOT NULL DEFAULT '0.38',
+  blue_density_i double precision NOT NULL DEFAULT '0.38',
+  haze_density double precision NOT NULL DEFAULT '0.70',
+  density_multiplier double precision NOT NULL DEFAULT '0.18',
+  distance_multiplier double precision NOT NULL DEFAULT '0.8',
+  max_altitude int NOT NULL DEFAULT '1605',
+  sun_moon_color_r double precision NOT NULL DEFAULT '0.24',
+  sun_moon_color_g double precision NOT NULL DEFAULT '0.26',
+  sun_moon_color_b double precision NOT NULL DEFAULT '0.30',
+  sun_moon_color_i double precision NOT NULL DEFAULT '0.30',
+  sun_moon_position double precision NOT NULL DEFAULT '0.317',
+  ambient_r double precision NOT NULL DEFAULT '0.35',
+  ambient_g double precision NOT NULL DEFAULT '0.35',
+  ambient_b double precision NOT NULL DEFAULT '0.35',
+  ambient_i double precision NOT NULL DEFAULT '0.35',
+  east_angle double precision NOT NULL DEFAULT '0.00',
+  sun_glow_focus double precision NOT NULL DEFAULT '0.10',
+  sun_glow_size double precision NOT NULL DEFAULT '1.75',
+  scene_gamma double precision NOT NULL DEFAULT '1.00',
+  star_brightness double precision NOT NULL DEFAULT '0.00',
+  cloud_color_r double precision NOT NULL DEFAULT '0.41',
+  cloud_color_g double precision NOT NULL DEFAULT '0.41',
+  cloud_color_b double precision NOT NULL DEFAULT '0.41',
+  cloud_color_i double precision NOT NULL DEFAULT '0.41',
+  cloud_x double precision NOT NULL DEFAULT '1.00',
+  cloud_y double precision NOT NULL DEFAULT '0.53',
+  cloud_density double precision NOT NULL DEFAULT '1.00',
+  cloud_coverage double precision NOT NULL DEFAULT '0.27',
+  cloud_scale double precision NOT NULL DEFAULT '0.42',
+  cloud_detail_x double precision NOT NULL DEFAULT '1.00',
+  cloud_detail_y double precision NOT NULL DEFAULT '0.53',
+  cloud_detail_density double precision NOT NULL DEFAULT '0.12',
+  cloud_scroll_x double precision NOT NULL DEFAULT '0.20',
+  cloud_scroll_x_lock smallint NOT NULL DEFAULT '0',
+  cloud_scroll_y double precision NOT NULL DEFAULT '0.01',
+  cloud_scroll_y_lock smallint NOT NULL DEFAULT '0',
+  draw_classic_clouds smallint NOT NULL DEFAULT '1'  
+);
+
+COMMIT;
+
+:VERSION 26
+
+BEGIN TRANSACTION;
+
+ALTER TABLE regionsettings ADD "map_tile_ID" CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
+
+COMMIT;
+
+:VERSION 27         #---------------------
+
+BEGIN TRANSACTION;
+ALTER TABLE land ADD "MediaType" VARCHAR(32) NOT NULL DEFAULT 'none/none' ;
+ALTER TABLE land ADD "MediaDescription" VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE land ADD "MediaSize" VARCHAR(16) NOT NULL DEFAULT '0,0';
+ALTER TABLE land ADD "MediaLoop" boolean NOT NULL DEFAULT false;
+ALTER TABLE land ADD "ObscureMusic" boolean NOT NULL DEFAULT false;
+ALTER TABLE land ADD "ObscureMedia" boolean NOT NULL DEFAULT false;
+COMMIT;
+
+:VERSION 28         #---------------------
+
+BEGIN TRANSACTION;
+
+ALTER TABLE prims 
+alter column "CreatorID" set DEFAULT '00000000-0000-0000-0000-000000000000' ;
+
+ALTER TABLE prims  ALTER COLUMN "CreatorID" set NOT NULL;
+
+ALTER TABLE primitems
+alter column "creatorID" set DEFAULT '00000000-0000-0000-0000-000000000000' ;
+
+ALTER TABLE primitems ALTER COLUMN "creatorID" set NOT NULL;
+
+COMMIT;
+
+:VERSION 29         #----------------- Region Covenant changed time
+
+BEGIN TRANSACTION;
+
+ALTER TABLE regionsettings ADD "covenant_datetime" int NOT NULL default 0;
+
+COMMIT;
+
+:VERSION 30         #------------------Migrate "creatorID" storage to varchars instead of UUIDs for HG support
+
+BEGIN TRANSACTION;
+
+alter table prims rename column "CreatorID" to "CreatorIDOld";
+alter table primitems rename column "creatorID" to "creatorIDOld";
+
+COMMIT;
+
+:VERSION 31        #---------------------
+
+BEGIN TRANSACTION;
+
+ALTER TABLE prims ADD "CreatorID" varchar(255);
+ALTER TABLE primitems ADD "creatorID" varchar(255);
+
+COMMIT;
+
+:VERSION 32        #---------------------
+
+BEGIN TRANSACTION;
+
+UPDATE prims SET "CreatorID" = cast("CreatorIDOld" as varchar(255));
+UPDATE primitems SET "creatorID" = cast("creatorIDOld" as varchar(255));
+
+COMMIT;
+
+:VERSION 33       #---------------------
+
+BEGIN TRANSACTION;
+
+ALTER TABLE prims alter column "CreatorID" set default '00000000-0000-0000-0000-000000000000' ;
+
+ALTER TABLE prims ALTER COLUMN "CreatorID" set NOT NULL;
+
+ALTER TABLE primitems alter column "creatorID" set DEFAULT '00000000-0000-0000-0000-000000000000' ;
+
+ALTER TABLE primitems ALTER COLUMN "creatorID" set NOT NULL;
+
+COMMIT;
+
+:VERSION 34		  #--------------- Telehub support
+
+BEGIN TRANSACTION;
+
+CREATE TABLE spawn_points(
+	"RegionUUID" uuid NOT NULL PRIMARY KEY,
+	"Yaw" double precision NOT NULL,
+	"Pitch" double precision NOT NULL,
+	"Distance" double precision NOT NULL
+);
+
+ALTER TABLE regionsettings ADD "TelehubObject" uuid NOT NULL  DEFAULT '00000000-0000-0000-0000-000000000000';
+
+COMMIT;
+
+:VERSION 35       #---------------- Parcels for sale
+
+BEGIN TRANSACTION;
+
+ALTER TABLE regionsettings ADD "parcel_tile_ID" uuid NOT NULL  DEFAULT '00000000-0000-0000-0000-000000000000';
+
+COMMIT;
+
+:VERSION 36       #---------------- Timed bans/access
+
+BEGIN TRANSACTION;
+
+ALTER TABLE landaccesslist ADD "Expires" integer NOT NULL  DEFAULT 0;
+
+COMMIT;
+
+:VERSION 37       #---------------- Environment Settings
+
+BEGIN TRANSACTION;
+
+CREATE TABLE regionenvironment(
+	"region_id" uuid NOT NULL primary key,
+	"llsd_settings" varchar  NOT NULL
+);
+
+COMMIT;
+
+:VERSION 38       #---------------- Dynamic attributes
+
+BEGIN TRANSACTION;
+
+ALTER TABLE prims ADD "DynAttrs" TEXT;
+
+COMMIT;
+
+:VERSION 39       #---------------- Extra physics params
+
+BEGIN TRANSACTION;
+
+ALTER TABLE prims ADD "PhysicsShapeType" smallint NOT NULL default '0';
+ALTER TABLE prims ADD "Density" double precision NOT NULL default '1000';
+ALTER TABLE prims ADD "GravityModifier" double precision NOT NULL default '1';
+ALTER TABLE prims ADD "Friction" double precision NOT NULL default '0.6';
+ALTER TABLE prims ADD "Restitution" double precision NOT NULL default '0.5';
+
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/UserAccount.migrations b/OpenSim/Data/PGSQL/Resources/UserAccount.migrations
new file mode 100644
index 0000000..c785463
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/UserAccount.migrations
@@ -0,0 +1,51 @@
+:VERSION 1
+
+CREATE TABLE UserAccounts (
+  "PrincipalID" uuid NOT NULL Primary key,
+  "ScopeID" uuid NOT NULL,
+  "FirstName" varchar(64) NOT NULL,
+  "LastName" varchar(64) NOT NULL,
+  "Email" varchar(64) NULL,
+  "ServiceURLs" text NULL,
+  "Created" int default NULL
+);
+
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+INSERT INTO UserAccounts ("PrincipalID", "ScopeID", "FirstName", "LastName", "Email", "ServiceURLs", "Created") 
+SELECT UUID AS "PrincipalID", '00000000-0000-0000-0000-000000000000' AS "ScopeID", 
+username AS "FirstName", 
+lastname AS "LastName", 
+email as "Email", (
+'AssetServerURI=' +  
+userAssetURI + ' InventoryServerURI='  + userInventoryURI + ' GatewayURI= HomeURI=') AS "ServiceURLs", 
+created as "Created" FROM users;
+
+COMMIT;
+
+:VERSION 3
+
+BEGIN TRANSACTION;
+
+CREATE UNIQUE INDEX "PrincipalID" ON UserAccounts("PrincipalID");
+CREATE INDEX "Email" ON UserAccounts("Email");
+CREATE INDEX "FirstName" ON UserAccounts("FirstName");
+CREATE INDEX "LastName" ON UserAccounts("LastName");
+CREATE INDEX Name ON UserAccounts("FirstName","LastName");
+
+COMMIT;
+
+:VERSION 4
+
+BEGIN TRANSACTION;
+
+ALTER TABLE UserAccounts ADD "UserLevel" integer NOT NULL DEFAULT 0;
+ALTER TABLE UserAccounts ADD "UserFlags" integer NOT NULL DEFAULT 0;
+ALTER TABLE UserAccounts ADD "UserTitle" varchar(64) NOT NULL DEFAULT '';
+
+COMMIT;
+
+
diff --git a/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
new file mode 100644
index 0000000..f23c870
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
@@ -0,0 +1,83 @@
+:VERSION 1         # -------------------------------
+
+begin;
+
+CREATE TABLE classifieds (
+  "classifieduuid" char(36) NOT NULL,
+  "creatoruuid" char(36) NOT NULL,
+  "creationdate" integer NOT NULL,
+  "expirationdate" integer NOT NULL,
+  "category" varchar(20) NOT NULL,
+  "name" varchar(255) NOT NULL,
+  "description" text NOT NULL,
+  "parceluuid" char(36) NOT NULL,
+  "parentestate" integer NOT NULL,
+  "snapshotuuid" char(36) NOT NULL,
+  "simname" varchar(255) NOT NULL,
+  "posglobal" varchar(255) NOT NULL,
+  "parcelname" varchar(255) NOT NULL,
+  "classifiedflags" integer NOT NULL,
+  "priceforlisting" integer NOT NULL,
+  constraint classifiedspk PRIMARY KEY ("classifieduuid")
+);
+
+
+CREATE TABLE usernotes (
+  "useruuid" varchar(36) NOT NULL,
+  "targetuuid" varchar(36) NOT NULL,
+  "notes" text NOT NULL,
+  constraint usernoteuk UNIQUE ("useruuid","targetuuid")
+);
+
+
+CREATE TABLE userpicks (
+  "pickuuid" varchar(36) NOT NULL,
+  "creatoruuid" varchar(36) NOT NULL,
+  "toppick" boolean 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" integer NOT NULL,
+  "enabled" boolean NOT NULL,
+  PRIMARY KEY ("pickuuid")
+);
+
+
+CREATE TABLE userprofile (
+  "useruuid" varchar(36) NOT NULL,
+  "profilePartner" varchar(36) NOT NULL,
+  "profileAllowPublish" bytea NOT NULL,
+  "profileMaturePublish" bytea NOT NULL,
+  "profileURL" varchar(255) NOT NULL,
+  "profileWantToMask" integer NOT NULL,
+  "profileWantToText" text NOT NULL,
+  "profileSkillsMask" integer 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")
+);
+
+commit;
+
+:VERSION 2         # -------------------------------
+ 
+begin;
+CREATE TABLE 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/PGSQL/Resources/UserStore.migrations b/OpenSim/Data/PGSQL/Resources/UserStore.migrations
new file mode 100644
index 0000000..974d489
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/UserStore.migrations
@@ -0,0 +1,404 @@
+:VERSION 1
+
+CREATE TABLE users (
+  "UUID" varchar(36) NOT NULL default '' Primary Key,
+  "username" varchar(32) NOT NULL,
+  "lastname" varchar(32) NOT NULL,
+  "passwordHash" varchar(32) NOT NULL,
+  "passwordSalt" varchar(32) NOT NULL,
+  "homeRegion" bigint default NULL,
+  "homeLocationX" double precision default NULL,
+  "homeLocationY" double precision default NULL,
+  "homeLocationZ" double precision default NULL,
+  "homeLookAtX" double precision default NULL,
+  "homeLookAtY" double precision default NULL,
+  "homeLookAtZ" double precision default NULL,
+  "created" int NOT NULL,
+  "lastLogin" int NOT NULL,
+  "userInventoryURI" varchar(255) default NULL,
+  "userAssetURI" varchar(255) default NULL,
+  "profileCanDoMask" int default NULL,
+  "profileWantDoMask" int default NULL,
+  "profileAboutText" text,
+  "profileFirstText" text,
+  "profileImage" varchar(36) default NULL,
+  "profileFirstImage" varchar(36) default NULL,
+  "webLoginKey" varchar(36) default NULL
+);
+
+CREATE INDEX "usernames" ON users
+(
+	"username" ASC,
+	"lastname" ASC
+);
+
+
+CREATE TABLE agents (
+  "UUID" varchar(36) NOT NULL Primary Key,
+  "sessionID" varchar(36) NOT NULL,
+  "secureSessionID" varchar(36) NOT NULL,
+  "agentIP" varchar(16) NOT NULL,
+  "agentPort" int NOT NULL,
+  "agentOnline" smallint NOT NULL,
+  "loginTime" int NOT NULL,
+  "logoutTime" int NOT NULL,
+  "currentRegion" varchar(36) NOT NULL,
+  "currentHandle" bigint NOT NULL,
+  "currentPos" varchar(64) NOT NULL
+);
+
+CREATE INDEX session ON agents
+(
+	"sessionID" ASC
+);
+
+CREATE INDEX ssession ON agents
+(
+	"secureSessionID" ASC
+);
+
+
+CREATE TABLE userfriends(
+	"ownerID" varchar(50) NOT NULL,
+	"friendID" varchar(50) NOT NULL,
+	"friendPerms" varchar(50)  NOT NULL,
+	"datetimestamp" varchar(50)  NOT NULL
+);
+
+CREATE TABLE avatarappearance  (
+  "Owner"  varchar(36) NOT NULL primary key,
+  "Serial"  int NOT NULL,
+  "Visual_Params" bytea NOT NULL,
+  "Texture" bytea NOT NULL,
+  "Avatar_Height" double precision NOT NULL,
+  "Body_Item" varchar(36) NOT NULL,
+  "Body_Asset" varchar(36) NOT NULL,
+  "Skin_Item" varchar(36) NOT NULL,
+  "Skin_Asset" varchar(36) NOT NULL,
+  "Hair_Item" varchar(36) NOT NULL,
+  "Hair_Asset" varchar(36) NOT NULL,
+  "Eyes_Item" varchar(36) NOT NULL,
+  "Eyes_Asset" varchar(36) NOT NULL,
+  "Shirt_Item" varchar(36) NOT NULL,
+  "Shirt_Asset" varchar(36) NOT NULL,
+  "Pants_Item" varchar(36) NOT NULL,
+  "Pants_Asset" varchar(36) NOT NULL,
+  "Shoes_Item" varchar(36) NOT NULL,
+  "Shoes_Asset" varchar(36) NOT NULL,
+  "Socks_Item" varchar(36) NOT NULL,
+  "Socks_Asset" varchar(36) NOT NULL,
+  "Jacket_Item" varchar(36) NOT NULL,
+  "Jacket_Asset" varchar(36) NOT NULL,
+  "Gloves_Item" varchar(36) NOT NULL,
+  "Gloves_Asset" varchar(36) NOT NULL,
+  "Undershirt_Item" varchar(36) NOT NULL,
+  "Undershirt_Asset" varchar(36) NOT NULL,
+  "Underpants_Item" varchar(36) NOT NULL,
+  "Underpants_Asset" varchar(36) NOT NULL,
+  "Skirt_Item" varchar(36) NOT NULL,
+  "Skirt_Asset" varchar(36) NOT NULL
+);
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+ALTER TABLE users ADD "homeRegionID" varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
+ALTER TABLE users ADD "userFlags" int NOT NULL default 0;
+ALTER TABLE users ADD "godLevel" int NOT NULL default 0;
+ALTER TABLE users ADD "customType" varchar(32) not null default '';
+ALTER TABLE users ADD "partner" varchar(36) not null default '00000000-0000-0000-0000-000000000000';
+
+COMMIT;
+
+
+:VERSION 3
+
+BEGIN TRANSACTION;
+
+CREATE TABLE avatarattachments (
+	"UUID" varchar(36) NOT NULL
+	, "attachpoint" int NOT NULL
+	, item varchar(36) NOT NULL
+	, asset varchar(36) NOT NULL);
+
+CREATE INDEX IX_avatarattachments ON avatarattachments
+	(
+	"UUID"
+	);
+
+COMMIT;
+
+
+:VERSION 4
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_userfriends
+	(
+	"ownerID" varchar(36) NOT NULL,
+	"friendID" varchar(36) NOT NULL,
+	"friendPerms" int NOT NULL,
+	"datetimestamp" int NOT NULL
+	);
+
+INSERT INTO Tmp_userfriends ("ownerID", "friendID", "friendPerms", "datetimestamp")
+ SELECT cast("ownerID" as varchar(36)), cast("friendID" as varchar(36)), cast("friendPerms" as int), cast("datetimestamp" as int) 
+ FROM userfriends;
+
+DROP TABLE userfriends;
+
+alter table Tmp_userfriends rename to userfriends;
+
+CREATE INDEX IX_userfriends_ownerID ON userfriends
+	(
+	"ownerID"
+	);
+
+CREATE INDEX IX_userfriends_friendID ON userfriends
+	(
+	"friendID"
+	);
+
+COMMIT;
+
+
+:VERSION 5
+
+BEGIN TRANSACTION;
+
+ ALTER TABLE users add "email" varchar(250);
+ 
+COMMIT;
+
+
+:VERSION 6
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_users
+	(
+	"UUID" uuid NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+	"username" varchar(32) NOT NULL,
+	"lastname" varchar(32) NOT NULL,
+	"passwordHash" varchar(32) NOT NULL,
+	"passwordSalt" varchar(32) NOT NULL,
+	"homeRegion" bigint NULL DEFAULT (NULL),
+	"homeLocationX" double precision NULL DEFAULT (NULL),
+	"homeLocationY" double precision NULL DEFAULT (NULL),
+	"homeLocationZ" double precision NULL DEFAULT (NULL),
+	"homeLookAtX" double precision NULL DEFAULT (NULL),
+	"homeLookAtY" double precision NULL DEFAULT (NULL),
+	"homeLookAtZ" double precision NULL DEFAULT (NULL),
+	"created" int NOT NULL,
+	"lastLogin" int NOT NULL,
+	"userInventoryURI" varchar(255) NULL DEFAULT (NULL),
+	"userAssetURI" varchar(255) NULL DEFAULT (NULL),
+	"profileCanDoMask" int NULL DEFAULT (NULL),
+	"profileWantDoMask" int NULL DEFAULT (NULL),
+	"profileAboutText" text NULL,
+	"profileFirstText" text NULL,
+	"profileImage" uuid NULL DEFAULT (NULL),
+	"profileFirstImage" uuid NULL DEFAULT (NULL),
+	"webLoginKey" uuid NULL DEFAULT (NULL),
+	"homeRegionID" uuid NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+	"userFlags" int NOT NULL DEFAULT ((0)),
+	"godLevel" int NOT NULL DEFAULT ((0)),
+	"customType" varchar(32) NOT NULL DEFAULT (''),
+	"partner" uuid NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+	email varchar(250) NULL
+	);
+
+INSERT INTO Tmp_users ("UUID", "username", "lastname", "passwordHash", "passwordSalt", "homeRegion", "homeLocationX", "homeLocationY", "homeLocationZ", "homeLookAtX", "homeLookAtY", "homeLookAtZ", "created", "lastLogin", "userInventoryURI", "userAssetURI", "profileCanDoMask", "profileWantDoMask", "profileAboutText", "profileFirstText", "profileImage", "profileFirstImage", "webLoginKey", "homeRegionID", "userFlags", "godLevel", "customType", "partner", email)
+	SELECT cast("UUID" as uuid), "username", "lastname", "passwordHash", "passwordSalt", "homeRegion", "homeLocationX", "homeLocationY", "homeLocationZ", "homeLookAtX", "homeLookAtY", "homeLookAtZ", "created", "lastLogin", "userInventoryURI", "userAssetURI", "profileCanDoMask", "profileWantDoMask", "profileAboutText", "profileFirstText", cast("profileImage" as uuid), cast("profileFirstImage" as uuid), cast("webLoginKey" as uuid), cast("homeRegionID" as uuid), "userFlags", "godLevel", "customType", cast("partner" as uuid), email 
+	FROM users ;
+
+DROP TABLE users;
+
+alter table Tmp_users rename to users;
+
+ALTER TABLE users ADD CONSTRAINT
+	PK__users__65A475E737A5467C PRIMARY KEY 
+	(
+	"UUID"
+	);
+
+CREATE INDEX "usernames" ON users
+	(
+	"username",
+	"lastname"
+	);
+
+COMMIT;
+
+
+:VERSION 7
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_agents
+	(
+	"UUID" uuid NOT NULL,
+	"sessionID" uuid NOT NULL,
+	"secureSessionID" uuid NOT NULL,
+	"agentIP" varchar(16) NOT NULL,
+	"agentPort" int NOT NULL,
+	"agentOnline" smallint NOT NULL,
+	"loginTime" int NOT NULL,
+	"logoutTime" int NOT NULL,
+	"currentRegion" uuid NOT NULL,
+	"currentHandle" bigint NOT NULL,
+	"currentPos" varchar(64) NOT NULL
+	);
+
+INSERT INTO Tmp_agents ("UUID", "sessionID", "secureSessionID", "agentIP", "agentPort", "agentOnline", "loginTime", "logoutTime", "currentRegion", "currentHandle", "currentPos")
+	SELECT cast("UUID" as uuid), cast("sessionID" as uuid), cast("secureSessionID" as uuid), "agentIP", "agentPort", "agentOnline", "loginTime", "logoutTime", cast("currentRegion" as uuid), "currentHandle", "currentPos" 
+	FROM agents ;
+
+DROP TABLE agents;
+
+alter table Tmp_agents rename to agents;
+
+ALTER TABLE agents ADD CONSTRAINT
+	PK__agents__65A475E749C3F6B7 PRIMARY KEY 
+	(
+	"UUID"
+	) ;
+
+CREATE INDEX session ON agents
+	(
+	"sessionID"
+	);
+
+CREATE INDEX ssession ON agents
+	(
+	"secureSessionID"
+	);
+
+COMMIT;
+
+
+:VERSION 8
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_userfriends
+	(
+	"ownerID" uuid NOT NULL,
+	"friendID" uuid NOT NULL,
+	"friendPerms" int NOT NULL,
+	"datetimestamp" int NOT NULL
+	);
+
+INSERT INTO Tmp_userfriends ("ownerID", "friendID", "friendPerms", "datetimestamp")
+		SELECT cast("ownerID" as uuid), cast( "friendID" as uuid), "friendPerms", "datetimestamp" 
+		FROM userfriends;
+
+DROP TABLE userfriends;
+
+alter table Tmp_userfriends rename to userfriends;
+
+CREATE INDEX IX_userfriends_ownerID ON userfriends
+	(
+	"ownerID"
+	);
+
+CREATE INDEX IX_userfriends_friendID ON userfriends
+	(
+	"friendID"
+	);
+
+COMMIT;
+
+
+:VERSION 9
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_avatarappearance
+	(
+	"Owner" uuid NOT NULL,
+	"Serial" int NOT NULL,
+	"Visual_Params" bytea NOT NULL,
+	"Texture" bytea NOT NULL,
+	"Avatar_Height" double precision NOT NULL,
+	"Body_Item" uuid NOT NULL,
+	"Body_Asset" uuid NOT NULL,
+	"Skin_Item" uuid NOT NULL,
+	"Skin_Asset" uuid NOT NULL,
+	"Hair_Item" uuid NOT NULL,
+	"Hair_Asset" uuid NOT NULL,
+	"Eyes_Item" uuid NOT NULL,
+	"Eyes_Asset" uuid NOT NULL,
+	"Shirt_Item" uuid NOT NULL,
+	"Shirt_Asset" uuid NOT NULL,
+	"Pants_Item" uuid NOT NULL,
+	"Pants_Asset" uuid NOT NULL,
+	"Shoes_Item" uuid NOT NULL,
+	"Shoes_Asset" uuid NOT NULL,
+	"Socks_Item" uuid NOT NULL,
+	"Socks_Asset" uuid NOT NULL,
+	"Jacket_Item" uuid NOT NULL,
+	"Jacket_Asset" uuid NOT NULL,
+	"Gloves_Item" uuid NOT NULL,
+	"Gloves_Asset" uuid NOT NULL,
+	"Undershirt_Item" uuid NOT NULL,
+	"Undershirt_Asset" uuid NOT NULL,
+	"Underpants_Item" uuid NOT NULL,
+	"Underpants_Asset" uuid NOT NULL,
+	"Skirt_Item" uuid NOT NULL,
+	"Skirt_Asset" uuid NOT NULL
+	);
+
+INSERT INTO Tmp_avatarappearance ("Owner", "Serial", "Visual_Params", "Texture", "Avatar_Height", "Body_Item", "Body_Asset", "Skin_Item", "Skin_Asset", "Hair_Item", "Hair_Asset", "Eyes_Item", "Eyes_Asset", "Shirt_Item", "Shirt_Asset", "Pants_Item", "Pants_Asset", "Shoes_Item", "Shoes_Asset", "Socks_Item", "Socks_Asset", "Jacket_Item", "Jacket_Asset", "Gloves_Item", "Gloves_Asset", "Undershirt_Item", "Undershirt_Asset", "Underpants_Item", "Underpants_Asset", "Skirt_Item", "Skirt_Asset")
+	SELECT cast("Owner" as uuid), "Serial", "Visual_Params", "Texture", "Avatar_Height", cast("Body_Item" as uuid), cast("Body_Asset" as uuid), cast("Skin_Item" as uuid), cast("Skin_Asset" as uuid), cast("Hair_Item" as uuid), cast("Hair_Asset" as uuid), cast("Eyes_Item" as uuid), cast("Eyes_Asset" as uuid), cast("Shirt_Item" as uuid), cast("Shirt_Asset" as uuid), cast("Pants_Item" as uuid), cast("Pants_Asset" as uuid), cast("Shoes_Item" as uuid), cast("Shoes_Asset" as uuid), cast("Socks_Item" as uuid), cast("Socks_Asset" as uuid), cast("Jacket_Item" as uuid), cast("Jacket_Asset" as uuid), cast("Gloves_Item" as uuid), cast("Gloves_Asset" as uuid), cast("Undershirt_Item" as uuid), cast("Undershirt_Asset" as uuid), cast("Underpants_Item" as uuid), cast("Underpants_Asset" as uuid), cast("Skirt_Item" as uuid), cast("Skirt_Asset" as uuid) 
+	FROM avatarappearance ;
+
+DROP TABLE avatarappearance;
+
+alter table Tmp_avatarappearance rename to avatarappearance;
+
+ALTER TABLE avatarappearance ADD CONSTRAINT
+	PK__avatarap__7DD115CC4E88ABD4 PRIMARY KEY 
+	(
+	"Owner"
+	);
+
+COMMIT;
+
+
+:VERSION 10
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_avatarattachments
+	(
+	"UUID" uuid NOT NULL,
+	"attachpoint" int NOT NULL,
+	item uuid NOT NULL,
+	asset uuid NOT NULL
+	);
+
+INSERT INTO Tmp_avatarattachments ("UUID", "attachpoint", item, asset)
+	SELECT cast("UUID" as uuid), "attachpoint", cast(item as uuid), cast(asset as uuid) 
+	FROM avatarattachments ;
+
+DROP TABLE avatarattachments;
+
+alter table Tmp_avatarattachments rename to avatarattachments;
+
+CREATE INDEX IX_avatarattachments ON avatarattachments
+	(
+	"UUID"
+	);
+
+COMMIT;
+
+
+:VERSION 11
+
+BEGIN TRANSACTION;
+
+ALTER TABLE users ADD "scopeID" uuid not null default '00000000-0000-0000-0000-000000000000';
+
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations b/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations
new file mode 100644
index 0000000..325ed0d
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations
@@ -0,0 +1,27 @@
+# -----------------
+:VERSION 1
+
+BEGIN;
+
+CREATE TABLE XAssetsMeta (
+  "ID" char(36) NOT NULL,
+  "Hash" char(32) NOT NULL,
+  "Name" varchar(64) NOT NULL,
+  "Description" varchar(64) NOT NULL,
+  "AssetType" smallint NOT NULL,
+  "Local" smallint NOT NULL,
+  "Temporary" smallint NOT NULL,
+  "CreateTime" integer NOT NULL,
+  "AccessTime" integer NOT NULL,
+  "AssetFlags" integer NOT NULL,
+  "CreatorID" varchar(128) NOT NULL,
+  PRIMARY KEY ("ID")
+);
+
+CREATE TABLE XAssetsData (
+  "Hash" char(32) NOT NULL,
+  "Data" bytea NOT NULL,
+  PRIMARY KEY ("Hash")
+);
+
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/os_groups_Store.migrations b/OpenSim/Data/PGSQL/Resources/os_groups_Store.migrations
new file mode 100644
index 0000000..4573f71
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/os_groups_Store.migrations
@@ -0,0 +1,94 @@
+:VERSION 1         # -------------------------- 
+
+BEGIN;
+
+CREATE TABLE os_groups_groups (
+  "GroupID" char(36) Primary Key NOT NULL default '',
+  "Location" varchar(255) NOT NULL default '',
+  "Name" varchar(255) NOT NULL default '',
+  "Charter" text NOT NULL,
+  "InsigniaID" char(36) NOT NULL default '',
+  "FounderID" char(36) NOT NULL default '',
+  "MembershipFee" integer NOT NULL default '0',
+  "OpenEnrollment" varchar(255) NOT NULL default '',
+  "ShowInList" integer NOT NULL default '0',
+  "AllowPublish" integer NOT NULL default '0',
+  "MaturePublish" integer NOT NULL default '0',
+  "OwnerRoleID" char(36) NOT NULL default ''
+);
+
+
+CREATE TABLE os_groups_membership (
+  "GroupID"char(36) NOT NULL default '',
+  "PrincipalID" VARCHAR(255) NOT NULL default '',
+  "SelectedRoleID" char(36) NOT NULL default '',
+  "Contribution" integer NOT NULL default '0',
+  "ListInProfile" integer NOT NULL default '1',
+  "AcceptNotices" integer NOT NULL default '1',
+  "AccessToken" char(36) NOT NULL default '',
+  constraint os_groupmemberpk primary key ("GroupID", "PrincipalID")
+);
+
+
+
+CREATE TABLE os_groups_roles (
+  "GroupID" char(36) NOT NULL default '',
+  "RoleID" char(36) NOT NULL default '',
+  "Name" varchar(255) NOT NULL default '',
+  "Description" varchar(255) NOT NULL default '',
+  "Title" varchar(255) NOT NULL default '',
+  "Powers" bigint NOT NULL default 0,
+  constraint os_grouprolepk PRIMARY KEY  ("GroupID","RoleID")
+);
+
+
+CREATE TABLE os_groups_rolemembership (
+  "GroupID" char(36) NOT NULL default '',
+  "RoleID" char(36) NOT NULL default '',
+  "PrincipalID" VARCHAR(255) NOT NULL default '',
+  constraint os_grouprolememberpk PRIMARY KEY  ("GroupID","RoleID","PrincipalID")
+);
+
+
+CREATE TABLE os_groups_invites (
+  "InviteID" char(36) NOT NULL default '',
+  "GroupID" char(36) NOT NULL default '',
+  "RoleID" char(36) NOT NULL default '',
+  "PrincipalID" VARCHAR(255) NOT NULL default '',
+  "TMStamp" timestamp NOT NULL default now(),
+  constraint os_groupinvitespk PRIMARY KEY  ("InviteID")
+);
+--  UNIQUE KEY "PrincipalGroup" ("GroupID","PrincipalID")
+
+
+CREATE TABLE os_groups_notices (
+  "GroupID" char(36) NOT NULL default '',
+  "NoticeID" char(36) NOT NULL default '',
+  "TMStamp" integer NOT NULL default '0',
+  "FromName" varchar(255) NOT NULL default '',
+  "Subject" varchar(255) NOT NULL default '',
+  "Message" text NOT NULL,
+  "HasAttachment" integer NOT NULL default '0',
+  "AttachmentType" integer NOT NULL default '0',
+  "AttachmentName" varchar(128) NOT NULL default '',
+  "AttachmentItemID" char(36) NOT NULL default '',
+  "AttachmentOwnerID" varchar(255) NOT NULL default '',
+  constraint os_groupsnoticespk PRIMARY KEY  ("NoticeID")
+);
+--  KEY  "GroupID" ("GroupID"),
+--  KEY "TMStamp" ("TMStamp")
+
+CREATE TABLE os_groups_principals (
+  "PrincipalID" VARCHAR(255) NOT NULL default '',
+  "ActiveGroupID" char(36) NOT NULL default '',
+  constraint os_groupprincpk PRIMARY KEY  ("PrincipalID")
+);
+
+COMMIT;
+
+:VERSION 2         # -------------------------- 
+
+BEGIN;
+
+
+COMMIT;
diff --git a/bin/Npgsql.dll b/bin/Npgsql.dll
new file mode 100644
index 0000000..24ca4bd
Binary files /dev/null and b/bin/Npgsql.dll differ
diff --git a/bin/Npgsql.xml b/bin/Npgsql.xml
new file mode 100644
index 0000000..a51252d
--- /dev/null
+++ b/bin/Npgsql.xml
@@ -0,0 +1,4120 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Npgsql</name>
+    </assembly>
+    <members>
+        <member name="T:Npgsql.NpgsqlParameter">
+            <summary>
+             This class represents a parameter to a command that will be sent to server
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameter.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> class.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameter.#ctor(System.String,System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see>
+            class with the parameter m_Name and a value of the new <b>NpgsqlParameter</b>.
+            </summary>
+            <param m_Name="parameterName">The m_Name of the parameter to map.</param>
+            <param m_Name="value">An <see cref="T:System.Object">Object</see> that is the value of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see>.</param>
+            <remarks>
+            <p>When you specify an <see cref="T:System.Object">Object</see>
+            in the value parameter, the <see cref="T:System.Data.DbType">DbType</see> is
+            inferred from the .NET Framework type of the <b>Object</b>.</p>
+            <p>When using this constructor, you must be aware of a possible misuse of the constructor which takes a DbType parameter.
+            This happens when calling this constructor passing an int 0 and the compiler thinks you are passing a value of DbType.
+            Use <code> Convert.ToInt32(value) </code> for example to have compiler calling the correct constructor.</p>
+            </remarks>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameter.#ctor(System.String,NpgsqlTypes.NpgsqlDbType)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see>
+            class with the parameter m_Name and the data type.
+            </summary>
+            <param m_Name="parameterName">The m_Name of the parameter to map.</param>
+            <param m_Name="parameterType">One of the <see cref="T:System.Data.DbType">DbType</see> values.</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameter.#ctor(System.String,NpgsqlTypes.NpgsqlDbType,System.Int32)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see>
+            class with the parameter m_Name, the <see cref="T:System.Data.DbType">DbType</see>, and the size.
+            </summary>
+            <param m_Name="parameterName">The m_Name of the parameter to map.</param>
+            <param m_Name="parameterType">One of the <see cref="T:System.Data.DbType">DbType</see> values.</param>
+            <param m_Name="size">The length of the parameter.</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameter.#ctor(System.String,NpgsqlTypes.NpgsqlDbType,System.Int32,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see>
+            class with the parameter m_Name, the <see cref="T:System.Data.DbType">DbType</see>, the size,
+            and the source column m_Name.
+            </summary>
+            <param m_Name="parameterName">The m_Name of the parameter to map.</param>
+            <param m_Name="parameterType">One of the <see cref="T:System.Data.DbType">DbType</see> values.</param>
+            <param m_Name="size">The length of the parameter.</param>
+            <param m_Name="sourceColumn">The m_Name of the source column.</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameter.#ctor(System.String,NpgsqlTypes.NpgsqlDbType,System.Int32,System.String,System.Data.ParameterDirection,System.Boolean,System.Byte,System.Byte,System.Data.DataRowVersion,System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see>
+            class with the parameter m_Name, the <see cref="T:System.Data.DbType">DbType</see>, the size,
+            the source column m_Name, a <see cref="T:System.Data.ParameterDirection">ParameterDirection</see>,
+            the precision of the parameter, the scale of the parameter, a
+            <see cref="T:System.Data.DataRowVersion">DataRowVersion</see> to use, and the
+            value of the parameter.
+            </summary>
+            <param m_Name="parameterName">The m_Name of the parameter to map.</param>
+            <param m_Name="parameterType">One of the <see cref="T:System.Data.DbType">DbType</see> values.</param>
+            <param m_Name="size">The length of the parameter.</param>
+            <param m_Name="sourceColumn">The m_Name of the source column.</param>
+            <param m_Name="direction">One of the <see cref="T:System.Data.ParameterDirection">ParameterDirection</see> values.</param>
+            <param m_Name="isNullable"><b>true</b> if the value of the field can be null, otherwise <b>false</b>.</param>
+            <param m_Name="precision">The total number of digits to the left and right of the decimal point to which
+            <see cref="P:Npgsql.NpgsqlParameter.Value">Value</see> is resolved.</param>
+            <param m_Name="scale">The total number of decimal places to which
+            <see cref="P:Npgsql.NpgsqlParameter.Value">Value</see> is resolved.</param>
+            <param m_Name="sourceVersion">One of the <see cref="T:System.Data.DataRowVersion">DataRowVersion</see> values.</param>
+            <param m_Name="value">An <see cref="T:System.Object">Object</see> that is the value
+            of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see>.</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameter.Clone">
+            <summary>
+            Creates a new <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> that
+            is a copy of the current instance.
+            </summary>
+            <returns>A new <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> that is a copy of this instance.</returns>
+        </member>
+        <member name="P:Npgsql.NpgsqlParameter.Precision">
+            <summary>
+            Gets or sets the maximum number of digits used to represent the
+            <see cref="P:Npgsql.NpgsqlParameter.Value">Value</see> property.
+            </summary>
+            <value>The maximum number of digits used to represent the
+            <see cref="P:Npgsql.NpgsqlParameter.Value">Value</see> property.
+            The default value is 0, which indicates that the data provider
+            sets the precision for <b>Value</b>.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlParameter.Scale">
+            <summary>
+            Gets or sets the number of decimal places to which
+            <see cref="P:Npgsql.NpgsqlParameter.Value">Value</see> is resolved.
+            </summary>
+            <value>The number of decimal places to which
+            <see cref="P:Npgsql.NpgsqlParameter.Value">Value</see> is resolved. The default is 0.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlParameter.Size">
+            <summary>
+            Gets or sets the maximum size, in bytes, of the data within the column.
+            </summary>
+            <value>The maximum size, in bytes, of the data within the column.
+            The default value is inferred from the parameter value.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlParameter.DbType">
+            <summary>
+            Gets or sets the <see cref="T:System.Data.DbType">DbType</see> of the parameter.
+            </summary>
+            <value>One of the <see cref="T:System.Data.DbType">DbType</see> values. The default is <b>String</b>.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlParameter.NpgsqlDbType">
+            <summary>
+            Gets or sets the <see cref="T:System.Data.DbType">DbType</see> of the parameter.
+            </summary>
+            <value>One of the <see cref="T:System.Data.DbType">DbType</see> values. The default is <b>String</b>.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlParameter.Direction">
+            <summary>
+            Gets or sets a value indicating whether the parameter is input-only,
+            output-only, bidirectional, or a stored procedure return value parameter.
+            </summary>
+            <value>One of the <see cref="T:System.Data.ParameterDirection">ParameterDirection</see>
+            values. The default is <b>Input</b>.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlParameter.IsNullable">
+            <summary>
+            Gets or sets a value indicating whether the parameter accepts null values.
+            </summary>
+            <value><b>true</b> if null values are accepted; otherwise, <b>false</b>. The default is <b>false</b>.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlParameter.ParameterName">
+            <summary>
+            Gets or sets the m_Name of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see>.
+            </summary>
+            <value>The m_Name of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see>.
+            The default is an empty string.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlParameter.CleanName">
+            <summary>
+            The m_Name scrubbed of any optional marker
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlParameter.SourceColumn">
+            <summary>
+            Gets or sets the m_Name of the source column that is mapped to the
+            <see cref="T:System.Data.DataSet">DataSet</see> and used for loading or
+            returning the <see cref="P:Npgsql.NpgsqlParameter.Value">Value</see>.
+            </summary>
+            <value>The m_Name of the source column that is mapped to the
+            <see cref="T:System.Data.DataSet">DataSet</see>. The default is an empty string.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlParameter.SourceVersion">
+            <summary>
+            Gets or sets the <see cref="T:System.Data.DataRowVersion">DataRowVersion</see>
+            to use when loading <see cref="P:Npgsql.NpgsqlParameter.Value">Value</see>.
+            </summary>
+            <value>One of the <see cref="T:System.Data.DataRowVersion">DataRowVersion</see> values.
+            The default is <b>Current</b>.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlParameter.Value">
+            <summary>
+            Gets or sets the value of the parameter.
+            </summary>
+            <value>An <see cref="T:System.Object">Object</see> that is the value of the parameter.
+            The default value is null.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlParameter.NpgsqlValue">
+            <summary>
+            Gets or sets the value of the parameter.
+            </summary>
+            <value>An <see cref="T:System.Object">Object</see> that is the value of the parameter.
+            The default value is null.</value>
+        </member>
+        <member name="T:Npgsql.NpgsqlFlush">
+             <summary>
+             This class represents the Parse message sent to PostgreSQL
+             server.
+             </summary>
+            
+        </member>
+        <member name="T:Npgsql.ClientMessage">
+            <summary>
+            For classes representing messages sent from the client to the server.
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlCopySerializer">
+            <summary>
+            Writes given objects into a stream for PostgreSQL COPY in default copy format (not CSV or BINARY).
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnectionStringBuilder.Clone">
+            <summary>
+            Return an exact copy of this NpgsqlConnectionString.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnectionStringBuilder.SetValue(System.String,System.Object)">
+            <summary>
+            This function will set value for known key, both private member and base[key].
+            </summary>
+            <param name="keyword"></param>
+            <param name="value"></param>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnectionStringBuilder.SetValue(Npgsql.Keywords,System.Object)">
+            <summary>
+            The function will modify private member only, not base[key].
+            </summary>
+            <param name="keyword"></param>
+            <param name="value"></param>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnectionStringBuilder.Clear">
+            <summary>
+            Clear the member and assign them to the default value.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnectionStringBuilder.Compatible">
+            <summary>
+            Compatibilty version. When possible, behaviour caused by breaking changes will be preserved
+            if this version is less than that where the breaking change was introduced.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnectionStringBuilder.Item(System.String)">
+            <summary>
+            Case insensative accessor for indivual connection string values.
+            </summary>
+        </member>
+        <member name="T:Npgsql.MD5">
+            <summary>
+            Common base class for all derived MD5 implementations.
+            </summary>
+        </member>
+        <member name="M:Npgsql.HashAlgorithm.#ctor">
+            <summary>
+            Called from constructor of derived class.
+            </summary>
+        </member>
+        <member name="M:Npgsql.HashAlgorithm.Finalize">
+            <summary>
+            Finalizer for HashAlgorithm
+            </summary>
+        </member>
+        <member name="M:Npgsql.HashAlgorithm.ComputeHash(System.Byte[])">
+            <summary>
+            Computes the entire hash of all the bytes in the byte array.
+            </summary>
+        </member>
+        <member name="M:Npgsql.HashAlgorithm.HashCore(System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            When overridden in a derived class, drives the hashing function.
+            </summary>
+            <param name="rgb"></param>
+            <param name="start"></param>
+            <param name="size"></param>
+        </member>
+        <member name="M:Npgsql.HashAlgorithm.HashFinal">
+            <summary>
+            When overridden in a derived class, this pads and hashes whatever data might be left in the buffers and then returns the hash created.
+            </summary>
+        </member>
+        <member name="M:Npgsql.HashAlgorithm.Initialize">
+            <summary>
+            When overridden in a derived class, initializes the object to prepare for hashing.
+            </summary>
+        </member>
+        <member name="M:Npgsql.HashAlgorithm.TransformBlock(System.Byte[],System.Int32,System.Int32,System.Byte[],System.Int32)">
+            <summary>
+            Used for stream chaining.  Computes hash as data passes through it.
+            </summary>
+            <param name="inputBuffer">The buffer from which to grab the data to be copied.</param>
+            <param name="inputOffset">The offset into the input buffer to start reading at.</param>
+            <param name="inputCount">The number of bytes to be copied.</param>
+            <param name="outputBuffer">The buffer to write the copied data to.</param>
+            <param name="outputOffset">At what point in the outputBuffer to write the data at.</param>
+        </member>
+        <member name="M:Npgsql.HashAlgorithm.TransformFinalBlock(System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            Used for stream chaining.  Computes hash as data passes through it.  Finishes off the hash.
+            </summary>
+            <param name="inputBuffer">The buffer from which to grab the data to be copied.</param>
+            <param name="inputOffset">The offset into the input buffer to start reading at.</param>
+            <param name="inputCount">The number of bytes to be copied.</param>
+        </member>
+        <member name="P:Npgsql.HashAlgorithm.CanTransformMultipleBlocks">
+            <summary>
+            Get whether or not the hash can transform multiple blocks at a time.
+            Note: MUST be overriden if descendant can transform multiple block
+            on a single call!
+            </summary>
+        </member>
+        <member name="P:Npgsql.HashAlgorithm.Hash">
+            <summary>
+            Gets the previously computed hash.
+            </summary>
+        </member>
+        <member name="P:Npgsql.HashAlgorithm.HashSize">
+            <summary>
+            Returns the size in bits of the hash.
+            </summary>
+        </member>
+        <member name="P:Npgsql.HashAlgorithm.InputBlockSize">
+            <summary>
+            Must be overriden if not 1
+            </summary>
+        </member>
+        <member name="P:Npgsql.HashAlgorithm.OutputBlockSize">
+            <summary>
+            Must be overriden if not 1
+            </summary>
+        </member>
+        <member name="M:Npgsql.MD5.#ctor">
+            <summary>
+            Called from constructor of derived class.
+            </summary>
+        </member>
+        <member name="M:Npgsql.MD5.Create">
+            <summary>
+            Creates the default derived class.
+            </summary>
+        </member>
+        <member name="M:Npgsql.SqlGenerators.SqlBaseGenerator.GetColumnsForJoin(Npgsql.SqlGenerators.JoinExpression,Npgsql.SqlGenerators.ProjectionExpression,Npgsql.SqlGenerators.VisitedExpression)">
+            <summary>
+            Given a join expression and a projection, fetch all columns in the projection
+            that reference columns in the join.
+            </summary>
+        </member>
+        <member name="M:Npgsql.SqlGenerators.SqlBaseGenerator.GetFromNames(Npgsql.SqlGenerators.InputExpression,System.Collections.Generic.List{System.String})">
+            <summary>
+            Given an InputExpression append all from names (including nested joins) to the list.
+            </summary>
+        </member>
+        <member name="M:Npgsql.SqlGenerators.SqlBaseGenerator.GetReplacementColumn(Npgsql.SqlGenerators.JoinExpression,Npgsql.SqlGenerators.ColumnExpression)">
+            <summary>
+            Get new ColumnExpression that will be used in projection that had it's existing columns moved.
+            These should be simple references to the inner column
+            </summary>
+        </member>
+        <member name="M:Npgsql.SqlGenerators.SqlBaseGenerator.AdjustPropertyAccess(Npgsql.SqlGenerators.ColumnExpression[],System.String)">
+            <summary>
+            Every property accessed in the list of columns must be adjusted for a new scope
+            </summary>
+        </member>
+        <member name="T:Npgsql.PGUtil">
+            <summary>
+             This class provides many util methods to handle
+             reading and writing of PostgreSQL protocol messages.
+             </summary>
+        </member>
+        <member name="M:Npgsql.PGUtil.ConvertProtocolVersion(Npgsql.ProtocolVersion)">
+            <summary>
+             This method takes a ProtocolVersion and returns an integer
+             version number that the Postgres backend will recognize in a
+             startup packet.
+             </summary>
+        </member>
+        <member name="M:Npgsql.PGUtil.ExtractServerVersion(System.String)">
+            <summary>
+            This method takes a version string as returned by SELECT VERSION() and returns
+            a valid version string ("7.2.2" for example).
+            This is only needed when running protocol version 2.
+            This does not do any validity checks.
+            </summary>
+        </member>
+        <member name="M:Npgsql.PGUtil.ReadString(System.IO.Stream)">
+            <summary>
+             This method gets a C NULL terminated string from the network stream.
+             It keeps reading a byte in each time until a NULL byte is returned.
+             It returns the resultant string of bytes read.
+             This string is sent from backend.
+             </summary>
+        </member>
+        <member name="M:Npgsql.PGUtil.ReadBytes(System.IO.Stream,System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            Reads requested number of bytes from stream with retries until Stream.Read returns 0 or count is reached.
+            </summary>
+            <param name="stream">Stream to read</param>
+            <param name="buffer">byte buffer to fill</param>
+            <param name="offset">starting position to fill the buffer</param>
+            <param name="count">number of bytes to read</param>
+            <returns>The number of bytes read.  May be less than count if no more bytes are available.</returns>
+        </member>
+        <member name="M:Npgsql.PGUtil.WriteString(System.String,System.IO.Stream)">
+            <summary>
+             This method writes a C NULL terminated string to the network stream.
+             It appends a NULL terminator to the end of the String.
+             </summary>
+            <summary>
+             This method writes a C NULL terminated string to the network stream.
+             It appends a NULL terminator to the end of the String.
+             </summary>
+        </member>
+        <member name="M:Npgsql.PGUtil.WriteBytes(System.Byte[],System.IO.Stream)">
+            <summary>
+            This method writes a set of bytes to the stream. It also enables logging of them.
+            </summary>
+        </member>
+        <member name="M:Npgsql.PGUtil.WriteLimString(System.String,System.Int32,System.IO.Stream)">
+            <summary>
+             This method writes a C NULL terminated string limited in length to the
+             backend server.
+             It pads the string with null bytes to the size specified.
+             </summary>
+        </member>
+        <member name="M:Npgsql.PGUtil.WriteInt32(System.IO.Stream,System.Int32)">
+            <summary>
+            Write a 32-bit integer to the given stream in the correct byte order.
+            </summary>
+        </member>
+        <member name="M:Npgsql.PGUtil.ReadInt32(System.IO.Stream)">
+            <summary>
+            Read a 32-bit integer from the given stream in the correct byte order.
+            </summary>
+        </member>
+        <member name="M:Npgsql.PGUtil.WriteInt16(System.IO.Stream,System.Int16)">
+            <summary>
+            Write a 16-bit integer to the given stream in the correct byte order.
+            </summary>
+        </member>
+        <member name="M:Npgsql.PGUtil.ReadInt16(System.IO.Stream)">
+            <summary>
+            Read a 16-bit integer from the given stream in the correct byte order.
+            </summary>
+        </member>
+        <member name="T:Npgsql.ProtocolVersion">
+            <summary>
+            Represent the frontend/backend protocol version.
+            </summary>
+        </member>
+        <member name="T:Npgsql.ServerVersion">
+            <summary>
+            Represent the backend server version.
+            As this class offers no functionality beyond that offered by <see cref="T:System.Version"/> it has been
+            deprecated in favour of that class.
+            </summary>
+            
+        </member>
+        <member name="M:Npgsql.ServerVersion.ToString">
+            <summary>
+            Returns the string representation of this version in three place dot notation (Major.Minor.Patch).
+            </summary>
+        </member>
+        <member name="P:Npgsql.ServerVersion.Major">
+            <summary>
+            Server version major number.
+            </summary>
+        </member>
+        <member name="P:Npgsql.ServerVersion.Minor">
+            <summary>
+            Server version minor number.
+            </summary>
+        </member>
+        <member name="P:Npgsql.ServerVersion.Patch">
+            <summary>
+            Server version patch level number.
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlCopyOut">
+            <summary>
+            Represents a PostgreSQL COPY TO STDOUT operation with a corresponding SQL statement
+            to execute against a PostgreSQL database
+            and an associated stream used to write results to (if provided by user)
+            or for reading the results (when generated by driver).
+            Eg. new NpgsqlCopyOut("COPY (SELECT * FROM mytable) TO STDOUT", connection, streamToWrite).Start();
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyOut.#ctor(System.String,Npgsql.NpgsqlConnection)">
+            <summary>
+            Creates NpgsqlCommand to run given query upon Start(), after which CopyStream provides data from database as requested in the query.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyOut.#ctor(Npgsql.NpgsqlCommand,Npgsql.NpgsqlConnection)">
+            <summary>
+            Given command is run upon Start(), after which CopyStream provides data from database as requested in the query.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyOut.#ctor(Npgsql.NpgsqlCommand,Npgsql.NpgsqlConnection,System.IO.Stream)">
+            <summary>
+            Given command is executed upon Start() and all requested copy data is written to toStream immediately.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyOut.FieldIsBinary(System.Int32)">
+            <summary>
+            Returns true if this operation is currently active and field at given location is in binary format.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyOut.Start">
+            <summary>
+            Command specified upon creation is executed as a non-query.
+            If CopyStream is set upon creation, all copy data from server will be written to it, and operation will be finished immediately.
+            Otherwise the CopyStream member can be used for reading copy data from server until no more data is available.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyOut.End">
+            <summary>
+            Flush generated CopyStream at once. Effectively reads and discard all the rest of copy data from server.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyOut.IsActive">
+            <summary>
+            Returns true if the connection is currently reserved for this operation.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyOut.CopyStream">
+            <summary>
+            The stream provided by user or generated upon Start()
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyOut.NpgsqlCommand">
+            <summary>
+            The Command used to execute this copy operation.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyOut.IsBinary">
+            <summary>
+            Returns true if this operation is currently active and in binary format.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyOut.FieldCount">
+            <summary>
+            Returns number of fields if this operation is currently active, otherwise -1
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyOut.Read">
+            <summary>
+            Faster alternative to using the generated CopyStream.
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlConnectorPool">
+            <summary>
+            This class manages all connector objects, pooled AND non-pooled.
+            </summary>
+        </member>
+        <member name="F:Npgsql.NpgsqlConnectorPool.ConnectorPoolMgr">
+            <value>Unique static instance of the connector pool
+            mamager.</value>
+        </member>
+        <member name="F:Npgsql.NpgsqlConnectorPool.PooledConnectors">
+            <value>Map of index to unused pooled connectors, avaliable to the
+            next RequestConnector() call.</value>
+            <remarks>This hashmap will be indexed by connection string.
+            This key will hold a list of queues of pooled connectors available to be used.</remarks>
+        </member>
+        <member name="F:Npgsql.NpgsqlConnectorPool.Timer">
+            <value>Timer for tracking unused connections in pools.</value>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnectorPool.RequestConnector(Npgsql.NpgsqlConnection)">
+            <summary>
+            Searches the shared and pooled connector lists for a
+            matching connector object or creates a new one.
+            </summary>
+            <param name="Connection">The NpgsqlConnection that is requesting
+            the connector. Its ConnectionString will be used to search the
+            pool for available connectors.</param>
+            <returns>A connector object.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnectorPool.RequestPooledConnector(Npgsql.NpgsqlConnection)">
+            <summary>
+            Find a pooled connector.  Handle locking and timeout here.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnectorPool.RequestPooledConnectorInternal(Npgsql.NpgsqlConnection)">
+            <summary>
+            Find a pooled connector.  Handle shared/non-shared here.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnectorPool.ReleaseConnector(Npgsql.NpgsqlConnection,Npgsql.NpgsqlConnector)">
+            <summary>
+            Releases a connector, possibly back to the pool for future use.
+            </summary>
+            <remarks>
+            Pooled connectors will be put back into the pool if there is room.
+            Shared connectors should just have their use count decremented
+            since they always stay in the shared pool.
+            </remarks>
+            <param name="Connector">The connector to release.</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnectorPool.ReleasePooledConnector(Npgsql.NpgsqlConnection,Npgsql.NpgsqlConnector)">
+            <summary>
+            Release a pooled connector.  Handle locking here.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnectorPool.ReleasePooledConnectorInternal(Npgsql.NpgsqlConnection,Npgsql.NpgsqlConnector)">
+            <summary>
+            Release a pooled connector.  Handle shared/non-shared here.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnectorPool.GetNonPooledConnector(Npgsql.NpgsqlConnection)">
+            <summary>
+            Create a connector without any pooling functionality.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnectorPool.GetPooledConnector(Npgsql.NpgsqlConnection)">
+            <summary>
+            Find an available pooled connector in the non-shared pool, or create
+            a new one if none found.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnectorPool.FixPoolCountBecauseOfConnectionDisposeFalse(Npgsql.NpgsqlConnection)">
+            <summary>
+            This method is only called when NpgsqlConnection.Dispose(false) is called which means a
+            finalization. This also means, an NpgsqlConnection was leak. We clear pool count so that
+            client doesn't end running out of connections from pool. When the connection is finalized, its underlying
+            socket is closed.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnectorPool.UngetNonPooledConnector(Npgsql.NpgsqlConnection,Npgsql.NpgsqlConnector)">
+            <summary>
+            Close the connector.
+            </summary>
+            <param name="Connection"></param>
+            <param name="Connector">Connector to release</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnectorPool.UngetPooledConnector(Npgsql.NpgsqlConnection,Npgsql.NpgsqlConnector)">
+            <summary>
+            Put a pooled connector into the pool queue.
+            </summary>
+            <param name="Connector">Connector to pool</param>
+        </member>
+        <member name="T:Npgsql.NpgsqlConnectorPool.ConnectorQueue">
+            <summary>
+            A queue with an extra Int32 for keeping track of busy connections.
+            </summary>
+        </member>
+        <member name="F:Npgsql.NpgsqlConnectorPool.ConnectorQueue.Available">
+            <summary>
+            Connections available to the end user
+            </summary>
+        </member>
+        <member name="F:Npgsql.NpgsqlConnectorPool.ConnectorQueue.Busy">
+            <summary>
+            Connections currently in use
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlBackEndKeyData">
+            <summary>
+            This class represents a BackEndKeyData message received
+            from PostgreSQL
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlPromotableSinglePhaseNotification.Prepare">
+            <summary>
+            Used when a connection is closed
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlQuery">
+            <summary>
+            Summary description for NpgsqlQuery
+            </summary>
+        </member>
+        <member name="T:Npgsql.NoticeEventHandler">
+            <summary>
+            Represents the method that handles the <see cref="E:Npgsql.NpgsqlConnection.Notification">Notice</see> events.
+            </summary>
+            <param name="e">A <see cref="T:Npgsql.NpgsqlNoticeEventArgs">NpgsqlNoticeEventArgs</see> that contains the event data.</param>
+        </member>
+        <member name="T:Npgsql.NotificationEventHandler">
+            <summary>
+            Represents the method that handles the <see cref="E:Npgsql.NpgsqlConnection.Notification">Notification</see> events.
+            </summary>
+            <param name="sender">The source of the event.</param>
+            <param name="e">A <see cref="T:Npgsql.NpgsqlNotificationEventArgs">NpgsqlNotificationEventArgs</see> that contains the event data.</param>
+        </member>
+        <member name="T:Npgsql.NpgsqlConnection">
+            <summary>
+            This class represents a connection to a
+            PostgreSQL server.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.#ctor">
+            <summary>
+            Initializes a new instance of the
+            <see cref="T:Npgsql.NpgsqlConnection">NpgsqlConnection</see> class.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the
+            <see cref="T:Npgsql.NpgsqlConnection">NpgsqlConnection</see> class
+            and sets the <see cref="P:Npgsql.NpgsqlConnection.ConnectionString">ConnectionString</see>.
+            </summary>
+            <param name="ConnectionString">The connection used to open the PostgreSQL database.</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.BeginDbTransaction(System.Data.IsolationLevel)">
+            <summary>
+            Begins a database transaction with the specified isolation level.
+            </summary>
+            <param name="isolationLevel">The <see cref="T:System.Data.IsolationLevel">isolation level</see> under which the transaction should run.</param>
+            <returns>An <see cref="T:System.Data.Common.DbTransaction">DbTransaction</see>
+            object representing the new transaction.</returns>
+            <remarks>
+            Currently the IsolationLevel ReadCommitted and Serializable are supported by the PostgreSQL backend.
+            There's no support for nested transactions.
+            </remarks>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.BeginTransaction">
+            <summary>
+            Begins a database transaction.
+            </summary>
+            <returns>A <see cref="T:Npgsql.NpgsqlTransaction">NpgsqlTransaction</see>
+            object representing the new transaction.</returns>
+            <remarks>
+            Currently there's no support for nested transactions.
+            </remarks>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.BeginTransaction(System.Data.IsolationLevel)">
+            <summary>
+            Begins a database transaction with the specified isolation level.
+            </summary>
+            <param name="level">The <see cref="T:System.Data.IsolationLevel">isolation level</see> under which the transaction should run.</param>
+            <returns>A <see cref="T:Npgsql.NpgsqlTransaction">NpgsqlTransaction</see>
+            object representing the new transaction.</returns>
+            <remarks>
+            Currently the IsolationLevel ReadCommitted and Serializable are supported by the PostgreSQL backend.
+            There's no support for nested transactions.
+            </remarks>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.Open">
+            <summary>
+            Opens a database connection with the property settings specified by the
+            <see cref="P:Npgsql.NpgsqlConnection.ConnectionString">ConnectionString</see>.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.ChangeDatabase(System.String)">
+            <summary>
+            This method changes the current database by disconnecting from the actual
+            database and connecting to the specified.
+            </summary>
+            <param name="dbName">The name of the database to use in place of the current database.</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.Close">
+            <summary>
+            Releases the connection to the database.  If the connection is pooled, it will be
+            made available for re-use.  If it is non-pooled, the actual connection will be shutdown.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.CreateDbCommand">
+            <summary>
+            Creates and returns a <see cref="T:System.Data.Common.DbCommand">DbCommand</see>
+            object associated with the <see cref="T:System.Data.Common.DbConnection">IDbConnection</see>.
+            </summary>
+            <returns>A <see cref="T:System.Data.Common.DbCommand">DbCommand</see> object.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.CreateCommand">
+            <summary>
+            Creates and returns a <see cref="T:Npgsql.NpgsqlCommand">NpgsqlCommand</see>
+            object associated with the <see cref="T:Npgsql.NpgsqlConnection">NpgsqlConnection</see>.
+            </summary>
+            <returns>A <see cref="T:Npgsql.NpgsqlCommand">NpgsqlCommand</see> object.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.Dispose(System.Boolean)">
+            <summary>
+            Releases all resources used by the
+            <see cref="T:Npgsql.NpgsqlConnection">NpgsqlConnection</see>.
+            </summary>
+            <param name="disposing"><b>true</b> when called from Dispose();
+            <b>false</b> when being called from the finalizer.</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.System#ICloneable#Clone">
+            <summary>
+            Create a new connection based on this one.
+            </summary>
+            <returns>A new NpgsqlConnection object.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.Clone">
+            <summary>
+            Create a new connection based on this one.
+            </summary>
+            <returns>A new NpgsqlConnection object.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.DefaultCertificateSelectionCallback(System.Security.Cryptography.X509Certificates.X509CertificateCollection,System.Security.Cryptography.X509Certificates.X509Certificate,System.String,System.Security.Cryptography.X509Certificates.X509CertificateCollection)">
+            <summary>
+            Default SSL CertificateSelectionCallback implementation.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.DefaultCertificateValidationCallback(System.Security.Cryptography.X509Certificates.X509Certificate,System.Int32[])">
+            <summary>
+            Default SSL CertificateValidationCallback implementation.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.DefaultPrivateKeySelectionCallback(System.Security.Cryptography.X509Certificates.X509Certificate,System.String)">
+            <summary>
+            Default SSL PrivateKeySelectionCallback implementation.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.DefaultProvideClientCertificatesCallback(System.Security.Cryptography.X509Certificates.X509CertificateCollection)">
+            <summary>
+            Default SSL ProvideClientCertificatesCallback implementation.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.LogConnectionString">
+            <summary>
+            Write each key/value pair in the connection string to the log.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.GetSchema">
+            <summary>
+            Returns the supported collections
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.GetSchema(System.String)">
+            <summary>
+            Returns the schema collection specified by the collection name.
+            </summary>
+            <param name="collectionName">The collection name.</param>
+            <returns>The collection specified.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnection.GetSchema(System.String,System.String[])">
+            <summary>
+            Returns the schema collection specified by the collection name filtered by the restrictions.
+            </summary>
+            <param name="collectionName">The collection name.</param>
+            <param name="restrictions">
+            The restriction values to filter the results.  A description of the restrictions is contained
+            in the Restrictions collection.
+            </param>
+            <returns>The collection specified.</returns>
+        </member>
+        <member name="E:Npgsql.NpgsqlConnection.Notice">
+            <summary>
+            Occurs on NoticeResponses from the PostgreSQL backend.
+            </summary>
+        </member>
+        <member name="E:Npgsql.NpgsqlConnection.Notification">
+            <summary>
+            Occurs on NotificationResponses from the PostgreSQL backend.
+            </summary>
+        </member>
+        <member name="E:Npgsql.NpgsqlConnection.ProvideClientCertificatesCallback">
+            <summary>
+            Called to provide client certificates for SSL handshake.
+            </summary>
+        </member>
+        <member name="E:Npgsql.NpgsqlConnection.CertificateSelectionCallback">
+            <summary>
+            Mono.Security.Protocol.Tls.CertificateSelectionCallback delegate.
+            </summary>
+        </member>
+        <member name="E:Npgsql.NpgsqlConnection.CertificateValidationCallback">
+            <summary>
+            Mono.Security.Protocol.Tls.CertificateValidationCallback delegate.
+            </summary>
+        </member>
+        <member name="E:Npgsql.NpgsqlConnection.PrivateKeySelectionCallback">
+            <summary>
+            Mono.Security.Protocol.Tls.PrivateKeySelectionCallback delegate.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.ConnectionString">
+            <summary>
+            Gets or sets the string used to connect to a PostgreSQL database.
+            Valid values are:
+            <ul>
+            <li>
+            Server:             Address/Name of Postgresql Server;
+            </li>
+            <li>
+            Port:               Port to connect to;
+            </li>
+            <li>
+            Protocol:           Protocol version to use, instead of automatic; Integer 2 or 3;
+            </li>
+            <li>
+            Database:           Database name. Defaults to user name if not specified;
+            </li>
+            <li>
+            User Id:            User name;
+            </li>
+            <li>
+            Password:           Password for clear text authentication;
+            </li>
+            <li>
+            SSL:                True or False. Controls whether to attempt a secure connection. Default = False;
+            </li>
+            <li>
+            Pooling:            True or False. Controls whether connection pooling is used. Default = True;
+            </li>
+            <li>
+            MinPoolSize:        Min size of connection pool;
+            </li>
+            <li>
+            MaxPoolSize:        Max size of connection pool;
+            </li>
+            <li>
+            Timeout:            Time to wait for connection open in seconds. Default is 15.
+            </li>
+            <li>
+            CommandTimeout:     Time to wait for command to finish execution before throw an exception. In seconds. Default is 20.
+            </li>
+            <li>
+            Sslmode:            Mode for ssl connection control. Can be Prefer, Require, Allow or Disable. Default is Disable. Check user manual for explanation of values.
+            </li>
+            <li>
+            ConnectionLifeTime: Time to wait before closing unused connections in the pool in seconds. Default is 15.
+            </li>
+            <li>
+            SyncNotification:   Specifies if Npgsql should use synchronous notifications.
+            </li>
+            <li>
+            SearchPath: Changes search path to specified and public schemas.
+            </li>
+            </ul>
+            </summary>
+            <value>The connection string that includes the server name,
+            the database name, and other parameters needed to establish
+            the initial connection. The default value is an empty string.
+            </value>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.Host">
+            <summary>
+            Backend server host name.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.Port">
+            <summary>
+            Backend server port.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.SSL">
+            <summary>
+            If true, the connection will attempt to use SSL.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.ConnectionTimeout">
+            <summary>
+            Gets the time to wait while trying to establish a connection
+            before terminating the attempt and generating an error.
+            </summary>
+            <value>The time (in seconds) to wait for a connection to open. The default value is 15 seconds.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.CommandTimeout">
+            <summary>
+            Gets the time to wait while trying to execute a command
+            before terminating the attempt and generating an error.
+            </summary>
+            <value>The time (in seconds) to wait for a command to complete. The default value is 20 seconds.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.ConnectionLifeTime">
+            <summary>
+            Gets the time to wait before closing unused connections in the pool if the count
+            of all connections exeeds MinPoolSize.
+            </summary>
+            <remarks>
+            If connection pool contains unused connections for ConnectionLifeTime seconds,
+            the half of them will be closed. If there will be unused connections in a second
+            later then again the half of them will be closed and so on.
+            This strategy provide smooth change of connection count in the pool.
+            </remarks>
+            <value>The time (in seconds) to wait. The default value is 15 seconds.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.Database">
+            <summary>
+             Gets the name of the current database or the database to be used after a connection is opened.
+             </summary>
+             <value>The name of the current database or the name of the database to be
+             used after a connection is opened. The default value is the empty string.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.PreloadReader">
+            <summary>
+            Whether datareaders are loaded in their entirety (for compatibility with earlier code).
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.DataSource">
+            <summary>
+            Gets the database server name.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.SyncNotification">
+            <summary>
+            Gets flag indicating if we are using Synchronous notification or not.
+            The default value is false.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.FullState">
+            <summary>
+            Gets the current state of the connection.
+            </summary>
+            <value>A bitwise combination of the <see cref="T:System.Data.ConnectionState">ConnectionState</see> values. The default is <b>Closed</b>.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.State">
+            <summary>
+            Gets whether the current state of the connection is Open or Closed
+            </summary>
+            <value>ConnectionState.Open or ConnectionState.Closed</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.PostgreSqlVersion">
+            <summary>
+            Version of the PostgreSQL backend.
+            This can only be called when there is an active connection.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.BackendProtocolVersion">
+            <summary>
+            Protocol version in use.
+            This can only be called when there is an active connection.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.ProcessID">
+            <summary>
+            Process id of backend server.
+            This can only be called when there is an active connection.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.Connector">
+            <summary>
+            The connector object connected to the backend.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.ConnectionStringValues">
+            <summary>
+            Gets the NpgsqlConnectionStringBuilder containing the parsed connection string values.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.UserName">
+            <summary>
+            User name.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.Password">
+            <summary>
+            Password.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnection.Pooling">
+            <summary>
+            Determine if connection pooling will be used for this connection.
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlCancelRequest">
+             <summary>
+             This class represents the CancelRequest message sent to PostgreSQL
+             server.
+             </summary>
+            
+        </member>
+        <!-- Badly formed XML comment ignored for member "T:NpgsqlTypes.NpgsqlInterval" -->
+        <!-- Badly formed XML comment ignored for member "F:NpgsqlTypes.NpgsqlInterval.TicksPerMicrosecond" -->
+        <!-- Badly formed XML comment ignored for member "F:NpgsqlTypes.NpgsqlInterval.TicksPerMillsecond" -->
+        <!-- Badly formed XML comment ignored for member "F:NpgsqlTypes.NpgsqlInterval.TicksPerSecond" -->
+        <!-- Badly formed XML comment ignored for member "F:NpgsqlTypes.NpgsqlInterval.TicksPerMinute" -->
+        <!-- Badly formed XML comment ignored for member "F:NpgsqlTypes.NpgsqlInterval.TicksPerHour" -->
+        <!-- Badly formed XML comment ignored for member "F:NpgsqlTypes.NpgsqlInterval.TicksPerDay" -->
+        <!-- Badly formed XML comment ignored for member "F:NpgsqlTypes.NpgsqlInterval.HoursPerDay" -->
+        <!-- Badly formed XML comment ignored for member "F:NpgsqlTypes.NpgsqlInterval.DaysPerMonth" -->
+        <!-- Badly formed XML comment ignored for member "F:NpgsqlTypes.NpgsqlInterval.TicksPerMonth" -->
+        <!-- Badly formed XML comment ignored for member "F:NpgsqlTypes.NpgsqlInterval.MonthsPerYear" -->
+        <!-- Badly formed XML comment ignored for member "F:NpgsqlTypes.NpgsqlInterval.MaxValue" -->
+        <!-- Badly formed XML comment ignored for member "F:NpgsqlTypes.NpgsqlInterval.MinValue" -->
+        <!-- Badly formed XML comment ignored for member "F:NpgsqlTypes.NpgsqlInterval.Zero" -->
+        <member name="M:NpgsqlTypes.NpgsqlInterval.#ctor(System.Int64)">
+            <param name="ticks">A time period expressed in 100ns units.</param>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.#ctor(System.TimeSpan)">
+            <param name="timespan">A time period expressed in a <see cref="T:System.TimeSpan"/></param>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.#ctor(System.Int32,System.Int32,System.Int64)">
+            <param name="ticks">Number of 100ns units.</param>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.#ctor(System.Int32,System.Int32,System.Int32,System.Int32)">
+            <param name="seconds">Number of seconds.</param>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.#ctor(System.Int32,System.Int32,System.Int32,System.Int32,System.Int32)">
+            <param name="milliseconds">Number of milliseconds.</param>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.#ctor(System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32)">
+            <param name="milliseconds">Number of milliseconds.</param>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.#ctor(System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32,System.Int32)">
+            <param name="milliseconds">Number of milliseconds.</param>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.FromTicks(System.Int64)">
+            <returns>A <see cref="M:NpgsqlTypes.NpgsqlInterval.Canonicalize"/>d <see cref="T:NpgsqlTypes.NpgsqlInterval"/> with the given number of ticks.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.FromMicroseconds(System.Double)">
+            <returns>A <see cref="M:NpgsqlTypes.NpgsqlInterval.Canonicalize"/>d <see cref="T:NpgsqlTypes.NpgsqlInterval"/> with the given number of microseconds.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.FromMilliseconds(System.Double)">
+            <returns>A <see cref="M:NpgsqlTypes.NpgsqlInterval.Canonicalize"/>d <see cref="T:NpgsqlTypes.NpgsqlInterval"/> with the given number of milliseconds.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.FromSeconds(System.Double)">
+            <returns>A <see cref="M:NpgsqlTypes.NpgsqlInterval.Canonicalize"/>d <see cref="T:NpgsqlTypes.NpgsqlInterval"/> with the given number of seconds.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.FromMinutes(System.Double)">
+            <returns>A <see cref="M:NpgsqlTypes.NpgsqlInterval.Canonicalize"/>d <see cref="T:NpgsqlTypes.NpgsqlInterval"/> with the given number of minutes.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.FromHours(System.Double)">
+            <returns>A <see cref="M:NpgsqlTypes.NpgsqlInterval.Canonicalize"/>d <see cref="T:NpgsqlTypes.NpgsqlInterval"/> with the given number of hours.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.FromDays(System.Double)">
+            <returns>A <see cref="M:NpgsqlTypes.NpgsqlInterval.Canonicalize"/>d <see cref="T:NpgsqlTypes.NpgsqlInterval"/> with the given number of days.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.FromMonths(System.Double)">
+            <returns>A <see cref="M:NpgsqlTypes.NpgsqlInterval.Canonicalize"/>d <see cref="T:NpgsqlTypes.NpgsqlInterval"/> with the given number of months.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.Add(NpgsqlTypes.NpgsqlInterval)">
+            <returns>An <see cref="T:NpgsqlTypes.NpgsqlInterval"></see> whose values are the sums of the two instances.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.Subtract(NpgsqlTypes.NpgsqlInterval)">
+            <returns>An <see cref="T:NpgsqlTypes.NpgsqlInterval"></see> whose values are the differences of the two instances.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.Negate">
+            <returns>An <see cref="T:NpgsqlTypes.NpgsqlInterval"/> whose value is the negated value of this instance.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.Duration">
+            <returns>An <see cref="T:NpgsqlTypes.NpgsqlInterval"/> whose value is the absolute value of this instance.</returns>
+        </member>
+        <!-- Badly formed XML comment ignored for member "M:NpgsqlTypes.NpgsqlInterval.JustifyDays" -->
+        <member name="M:NpgsqlTypes.NpgsqlInterval.UnjustifyDays">
+            <returns>An <see cref="T:NpgsqlTypes.NpgsqlInterval"/> based on this one, but with any days converted to multiples of ±24hours.</returns>
+        </member>
+        <!-- Badly formed XML comment ignored for member "M:NpgsqlTypes.NpgsqlInterval.JustifyMonths" -->
+        <member name="M:NpgsqlTypes.NpgsqlInterval.UnjustifyMonths">
+            <returns>An <see cref="T:NpgsqlTypes.NpgsqlInterval"/> based on this one, but with any months converted to multiples of ±30days.</returns>
+        </member>
+        <!-- Badly formed XML comment ignored for member "M:NpgsqlTypes.NpgsqlInterval.JustifyInterval" -->
+        <member name="M:NpgsqlTypes.NpgsqlInterval.UnjustifyInterval">
+            <returns>An <see cref="T:NpgsqlTypes.NpgsqlInterval"/> based on this one, but with any months converted to multiples of ±30days and then any days converted to multiples of ±24hours;</returns>
+        </member>
+        <!-- Badly formed XML comment ignored for member "M:NpgsqlTypes.NpgsqlInterval.Canonicalize" -->
+        <member name="M:NpgsqlTypes.NpgsqlInterval.op_Implicit(System.TimeSpan)~NpgsqlTypes.NpgsqlInterval">
+            <returns>An eqivalent, canonical, <see cref="T:NpgsqlTypes.NpgsqlInterval"/>.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.op_Explicit(NpgsqlTypes.NpgsqlInterval)~System.TimeSpan">
+            <returns>An equivalent <see cref="T:System.TimeSpan"/>.</returns>
+        </member>
+        <!-- Badly formed XML comment ignored for member "M:NpgsqlTypes.NpgsqlInterval.Equals(NpgsqlTypes.NpgsqlInterval)" -->
+        <!-- Badly formed XML comment ignored for member "M:NpgsqlTypes.NpgsqlInterval.Equals(System.Object)" -->
+        <!-- Badly formed XML comment ignored for member "M:NpgsqlTypes.NpgsqlInterval.Compare(NpgsqlTypes.NpgsqlInterval,NpgsqlTypes.NpgsqlInterval)" -->
+        <member name="M:NpgsqlTypes.NpgsqlInterval.GetHashCode">
+            <returns>An signed integer.</returns>
+        </member>
+        <!-- Badly formed XML comment ignored for member "M:NpgsqlTypes.NpgsqlInterval.CompareTo(NpgsqlTypes.NpgsqlInterval)" -->
+        <member name="M:NpgsqlTypes.NpgsqlInterval.CompareTo(System.Object)">
+            <exception cref="T:System.ArgumentException">The argument is not an <see cref="T:NpgsqlTypes.NpgsqlInterval"/>.</exception>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.Parse(System.String)">
+            <exception cref="T:System.FormatException">The string was not in a format that could be parsed to produce an <see cref="T:NpgsqlTypes.NpgsqlInterval"/>.</exception>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.TryParse(System.String,NpgsqlTypes.NpgsqlInterval@)">
+            <returns>true if the parsing succeeded, false otherwise.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.ToString">
+            <returns>The <see cref="T:System.String"/> representation.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.op_Addition(NpgsqlTypes.NpgsqlInterval,NpgsqlTypes.NpgsqlInterval)">
+            <returns>An <see cref="T:NpgsqlTypes.NpgsqlInterval"/> whose values are the sum of the arguments.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.op_Subtraction(NpgsqlTypes.NpgsqlInterval,NpgsqlTypes.NpgsqlInterval)">
+            <returns>An <see cref="T:NpgsqlTypes.NpgsqlInterval"/> whose values are the difference of the arguments</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.op_Equality(NpgsqlTypes.NpgsqlInterval,NpgsqlTypes.NpgsqlInterval)">
+            <returns>true if the two arguments are exactly the same, false otherwise.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.op_Inequality(NpgsqlTypes.NpgsqlInterval,NpgsqlTypes.NpgsqlInterval)">
+            <returns>false if the two arguments are exactly the same, true otherwise.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.op_LessThan(NpgsqlTypes.NpgsqlInterval,NpgsqlTypes.NpgsqlInterval)">
+            <returns>true if the first <see cref="T:NpgsqlTypes.NpgsqlInterval"/> is less than second, false otherwise.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.op_LessThanOrEqual(NpgsqlTypes.NpgsqlInterval,NpgsqlTypes.NpgsqlInterval)">
+            <returns>true if the first <see cref="T:NpgsqlTypes.NpgsqlInterval"/> is less than or equivalent to second, false otherwise.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.op_GreaterThan(NpgsqlTypes.NpgsqlInterval,NpgsqlTypes.NpgsqlInterval)">
+            <returns>true if the first <see cref="T:NpgsqlTypes.NpgsqlInterval"/> is greater than second, false otherwise.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.op_GreaterThanOrEqual(NpgsqlTypes.NpgsqlInterval,NpgsqlTypes.NpgsqlInterval)">
+            <returns>true if the first <see cref="T:NpgsqlTypes.NpgsqlInterval"/> is greater than or equivalent to the second, false otherwise.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.op_UnaryPlus(NpgsqlTypes.NpgsqlInterval)">
+            <returns>The argument.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlInterval.op_UnaryNegation(NpgsqlTypes.NpgsqlInterval)">
+            <returns>The negation of the argument.</returns>
+        </member>
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlInterval.Ticks" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlInterval.Microseconds" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlInterval.Milliseconds" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlInterval.Seconds" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlInterval.Minutes" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlInterval.Hours" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlInterval.Days" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlInterval.Months" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlInterval.Time" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlInterval.TotalTicks" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlInterval.TotalMicroseconds" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlInterval.TotalMilliseconds" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlInterval.TotalSeconds" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlInterval.TotalMinutes" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlInterval.TotalHours" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlInterval.TotalDays" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlInterval.TotalMonths" -->
+        <member name="M:NpgsqlTypes.NpgsqlTime.Normalize">
+            <returns>This time, normalised</returns>
+        </member>
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlTime.Ticks" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlTime.Microseconds" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlTime.Milliseconds" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlTime.Seconds" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlTime.Minutes" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlTime.Hours" -->
+        <member name="M:NpgsqlTypes.NpgsqlTimeTZ.Normalize">
+            <returns>This time, normalised</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlTimeTZ.CompareTo(NpgsqlTypes.NpgsqlTimeTZ)">
+            <returns>An integer which is 0 if they are equal, &lt; 0 if this is the smaller and &gt; 0 if this is the larger.</returns>
+        </member>
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlTimeTZ.Microseconds" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlTimeTZ.Milliseconds" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlTimeTZ.Seconds" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlTimeTZ.Minutes" -->
+        <!-- Badly formed XML comment ignored for member "P:NpgsqlTypes.NpgsqlTimeTZ.Hours" -->
+        <member name="T:Npgsql.SSPIHandler">
+            <summary>
+            A class to handle everything associated with SSPI authentication
+            </summary>
+        </member>
+        <member name="T:Npgsql.SSPIHandler.SecBufferDesc">
+            <summary>
+            Simplified SecBufferDesc struct with only one SecBuffer
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlSync">
+             <summary>
+             This class represents the Parse message sent to PostgreSQL
+             server.
+             </summary>
+            
+        </member>
+        <member name="T:Npgsql.NpgsqlNoticeEventArgs">
+            <summary>
+            EventArgs class to send Notice parameters, which are just NpgsqlError's in a lighter context.
+            </summary>
+        </member>
+        <member name="F:Npgsql.NpgsqlNoticeEventArgs.Notice">
+            <summary>
+            Notice information.
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlError">
+            <summary>
+            This class represents the ErrorResponse and NoticeResponse
+            message sent from PostgreSQL server.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlError.ToString">
+            <summary>
+            Return a string representation of this error object.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlError.Severity">
+            <summary>
+            Severity code.  All versions.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlError.Code">
+            <summary>
+            Error code.  PostgreSQL 7.4 and up.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlError.Message">
+            <summary>
+            Terse error message.  All versions.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlError.Detail">
+            <summary>
+            Detailed error message.  PostgreSQL 7.4 and up.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlError.Hint">
+            <summary>
+            Suggestion to help resolve the error.  PostgreSQL 7.4 and up.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlError.Position">
+            <summary>
+            Position (one based) within the query string where the error was encounterd.  PostgreSQL 7.4 and up.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlError.InternalPosition">
+            <summary>
+            Position (one based) within the query string where the error was encounterd.  This position refers to an internal command executed for example inside a PL/pgSQL function. PostgreSQL 7.4 and up.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlError.InternalQuery">
+            <summary>
+            Internal query string where the error was encounterd.  This position refers to an internal command executed for example inside a PL/pgSQL function. PostgreSQL 7.4 and up.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlError.Where">
+            <summary>
+            Trace back information.  PostgreSQL 7.4 and up.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlError.File">
+            <summary>
+            Source file (in backend) reporting the error.  PostgreSQL 7.4 and up.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlError.Line">
+            <summary>
+            Source file line number (in backend) reporting the error.  PostgreSQL 7.4 and up.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlError.Routine">
+            <summary>
+            Source routine (in backend) reporting the error.  PostgreSQL 7.4 and up.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlError.ErrorSql">
+            <summary>
+            String containing the sql sent which produced this error.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlError.BackendProtocolVersion">
+            <summary>
+            Backend protocol version in use.
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlCopyOutState">
+            <summary>
+            Represents an ongoing COPY TO STDOUT operation.
+            Provides methods to read data from server or end the operation.
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlState">
+            <summary> This class represents the base class for the state pattern design pattern
+             implementation.
+             </summary>
+            
+        </member>
+        <member name="M:Npgsql.NpgsqlState.ChangeState(Npgsql.NpgsqlConnector,Npgsql.NpgsqlState)">
+            <summary>
+            This method is used by the states to change the state of the context.
+             </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlState.ProcessBackendResponses(Npgsql.NpgsqlConnector)">
+            <summary>
+             This method is responsible to handle all protocol messages sent from the backend.
+             It holds all the logic to do it.
+             To exchange data, it uses a Mediator object from which it reads/writes information
+             to handle backend requests.
+             </summary>
+            
+        </member>
+        <member name="M:Npgsql.NpgsqlState.ProcessBackendResponsesEnum(Npgsql.NpgsqlConnector)">
+            <summary>
+             This method is responsible to handle all protocol messages sent from the backend.
+             It holds all the logic to do it.
+             To exchange data, it uses a Mediator object from which it reads/writes information
+             to handle backend requests.
+             </summary>
+            
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyOutState.StartCopy(Npgsql.NpgsqlConnector,Npgsql.NpgsqlCopyFormat)">
+            <summary>
+            Called from NpgsqlState.ProcessBackendResponses upon CopyOutResponse.
+            If CopyStream is already set, it is used to write data received from server, after which the copy ends.
+            Otherwise CopyStream is set to a readable NpgsqlCopyOutStream that receives data from server.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyOutState.GetCopyData(Npgsql.NpgsqlConnector)">
+            <summary>
+            Called from NpgsqlOutStream.Read to read copy data from server.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyOutState.CopyFormat">
+            <summary>
+            Copy format information returned from server.
+            </summary>
+        </member>
+        <member name="T:NpgsqlTypes.ArrayNativeToBackendTypeConverter">
+            <summary>
+            Handles serialisation of .NET array or IEnumeration to pg format.
+            Arrays of arrays, enumerations of enumerations, arrays of enumerations etc.
+            are treated as multi-dimensional arrays (in much the same manner as an array of arrays
+            is used to emulate multi-dimensional arrays in languages that lack native support for them).
+            If such an enumeration of enumerations is "jagged" (as opposed to rectangular, cuboid,
+            hypercuboid, hyperhypercuboid, etc) then this class will "correctly" serialise it, but pg
+            will raise an error as it doesn't allow jagged arrays.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ArrayNativeToBackendTypeConverter.#ctor(NpgsqlTypes.NpgsqlNativeTypeInfo)">
+            <summary>
+            Create an ArrayNativeToBackendTypeConverter with the element converter passed
+            </summary>
+            <param name="elementConverter">The <see cref="T:NpgsqlTypes.NpgsqlNativeTypeInfo"/> that would be used to serialise the element type.</param>
+        </member>
+        <member name="M:NpgsqlTypes.ArrayNativeToBackendTypeConverter.FromArray(NpgsqlTypes.NpgsqlNativeTypeInfo,System.Object,System.Boolean)">
+            <summary>
+            Serialise the enumeration or array.
+            </summary>
+        </member>
+        <member name="T:NpgsqlTypes.ArrayBackendToNativeTypeConverter">
+            <summary>
+            Handles parsing of pg arrays into .NET arrays.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ArrayBackendToNativeTypeConverter.TokenEnumeration(System.String)">
+            <summary>
+            Takes a string representation of a pg 1-dimensional array
+            (or a 1-dimensional row within an n-dimensional array)
+            and allows enumeration of the string represenations of each items.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ArrayBackendToNativeTypeConverter.ArrayChunkEnumeration(System.String)">
+            <summary>
+            Takes a string representation of a pg n-dimensional array
+            and allows enumeration of the string represenations of the next
+            lower level of rows (which in turn can be taken as (n-1)-dimensional arrays.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ArrayBackendToNativeTypeConverter.RecursiveArrayListEnumeration(System.Collections.ArrayList)">
+            <summary>
+            Takes an ArrayList which may be an ArrayList of ArrayLists, an ArrayList of ArrayLists of ArrayLists
+            and so on and enumerates the items that aren't ArrayLists (the leaf nodes if we think of the ArrayList
+            passed as a tree). Simply uses the ArrayLists' own IEnumerators to get that of the next,
+            pushing them onto a stack until we hit something that isn't an ArrayList.
+            <param name="list"><see cref="T:System.Collections.ArrayList">ArrayList</see> to enumerate</param>
+            <returns><see cref="T:System.Collections.IEnumerable">IEnumerable</see></returns>
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ArrayBackendToNativeTypeConverter.#ctor(NpgsqlTypes.NpgsqlBackendTypeInfo)">
+            <summary>
+            Create a new ArrayBackendToNativeTypeConverter
+            </summary>
+            <param name="elementConverter"><see cref="T:NpgsqlTypes.NpgsqlBackendTypeInfo"/> for the element type.</param>
+        </member>
+        <member name="M:NpgsqlTypes.ArrayBackendToNativeTypeConverter.ToArray(NpgsqlTypes.NpgsqlBackendTypeInfo,System.String,System.Int16,System.Int32)">
+            <summary>
+            Creates an array from pg representation.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ArrayBackendToNativeTypeConverter.ToArrayList(NpgsqlTypes.NpgsqlBackendTypeInfo,System.String,System.Int16,System.Int32)">
+            <summary>
+            Creates an array list from pg represenation of an array.
+            Multidimensional arrays are treated as ArrayLists of ArrayLists
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ArrayBackendToNativeTypeConverter.ToArray(System.Collections.ArrayList,System.Type)">
+            <summary>
+            Creates an n-dimensional array from an ArrayList of ArrayLists or
+            a 1-dimensional array from something else. 
+            </summary>
+            <param name="list"><see cref="T:System.Collections.ArrayList"/> to convert</param>
+            <returns><see cref="T:System.Array"/> produced.</returns>
+        </member>
+        <member name="T:NpgsqlTypes.ArrayBackendToNativeTypeConverter.IntSetIterator">
+            <summary>
+            Takes an array of ints and treats them like the limits of a set of counters.
+            Retains a matching set of ints that is set to all zeros on the first ++
+            On a ++ it increments the "right-most" int. If that int reaches it's 
+            limit it is set to zero and the one before it is incremented, and so on.
+            
+            Making this a more general purpose class is pretty straight-forward, but we'll just put what we need here.
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlParameterStatus">
+             <summary>
+             This class represents the ParameterStatus message sent from PostgreSQL
+             server.
+             </summary>
+            
+        </member>
+        <member name="T:Npgsql.NpgsqlMediator">
+            <summary>
+             This class is responsible for serving as bridge between the backend
+             protocol handling and the core classes. It is used as the mediator for
+             exchanging data generated/sent from/to backend.
+             </summary>
+            
+        </member>
+        <member name="T:Npgsql.NpgsqlCommandBuilder">
+            <summary>
+             This class is responsible to create database commands for automatic insert, update and delete operations.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommandBuilder.DeriveParameters(Npgsql.NpgsqlCommand)">
+            <summary>
+            
+             This method is reponsible to derive the command parameter list with values obtained from function definition.
+             It clears the Parameters collection of command. Also, if there is any parameter type which is not supported by Npgsql, an InvalidOperationException will be thrown.
+             Parameters name will be parameter1, parameter2, ...
+             For while, only parameter name and NpgsqlDbType are obtained.
+            </summary>
+             <param name="command">NpgsqlCommand whose function parameters will be obtained.</param>
+        </member>
+        <member name="T:Npgsql.CompletedResponse">
+            <summary>
+            Represents a completed response message.
+            </summary>
+        </member>
+        <!-- Badly formed XML comment ignored for member "T:Npgsql.IServerResponseObject" -->
+        <member name="T:Npgsql.IStreamOwner">
+            <summary>
+            Marker interface which identifies a class which may take possession of a stream for the duration of
+            it's lifetime (possibly temporarily giving that possession to another class for part of that time.
+            
+            It inherits from IDisposable, since any such class must make sure it leaves the stream in a valid state.
+            
+            The most important such class is that compiler-generated from ProcessBackendResponsesEnum. Of course
+            we can't make that inherit from this interface, alas.
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlException">
+            <summary>
+            The exception that is thrown when the PostgreSQL backend reports errors.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlException.#ctor(System.Collections.IList)">
+            <summary>
+            Construct a backend error exception based on a list of one or more
+            backend errors.  The basic Exception.Message will be built from the
+            first (usually the only) error in the list.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlException.ToString">
+            <summary>
+            Format a .NET style exception string.
+            Include all errors in the list, including any hints.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlException.AppendString(System.IO.StringWriter,System.String,System.String)">
+            <summary>
+            Append a line to the given Stream, first checking for zero-length.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlException.Item(System.Int32)">
+            <summary>
+            Provide access to the entire list of errors provided by the PostgreSQL backend.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlException.Severity">
+            <summary>
+            Severity code.  All versions.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlException.Code">
+            <summary>
+            Error code.  PostgreSQL 7.4 and up.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlException.BaseMessage">
+            <summary>
+            Basic error message.  All versions.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlException.Detail">
+            <summary>
+            Detailed error message.  PostgreSQL 7.4 and up.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlException.Hint">
+            <summary>
+            Suggestion to help resolve the error.  PostgreSQL 7.4 and up.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlException.Position">
+            <summary>
+            Position (one based) within the query string where the error was encounterd.  PostgreSQL 7.4 and up.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlException.Where">
+            <summary>
+            Trace back information.  PostgreSQL 7.4 and up.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlException.File">
+            <summary>
+            Source file (in backend) reporting the error.  PostgreSQL 7.4 and up.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlException.Line">
+            <summary>
+            Source file line number (in backend) reporting the error.  PostgreSQL 7.4 and up.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlException.Routine">
+            <summary>
+            Source routine (in backend) reporting the error.  PostgreSQL 7.4 and up.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlException.ErrorSql">
+            <summary>
+            String containing the sql sent which produced this error.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlException.Errors">
+            <summary>
+            Returns the entire list of errors provided by the PostgreSQL backend.
+            </summary>
+        </member>
+        <member name="T:Npgsql.LogLevel">
+            <summary>
+            The level of verbosity of the NpgsqlEventLog
+            </summary>
+        </member>
+        <member name="F:Npgsql.LogLevel.None">
+            <summary>
+            Don't log at all
+            </summary>
+        </member>
+        <member name="F:Npgsql.LogLevel.Normal">
+            <summary>
+            Only log the most common issues
+            </summary>
+        </member>
+        <member name="F:Npgsql.LogLevel.Debug">
+            <summary>
+            Log everything
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlEventLog">
+            <summary>
+            This class handles all the Npgsql event and debug logging
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlEventLog.LogMsg(System.String,Npgsql.LogLevel)">
+            <summary>
+            Writes a string to the Npgsql event log if msglevel is bigger then <see cref="P:Npgsql.NpgsqlEventLog.Level">NpgsqlEventLog.Level</see>
+            </summary>
+            <remarks>
+            This method is obsolete and should no longer be used.
+            It is likely to be removed in future versions of Npgsql
+            </remarks>
+            <param name="message">The message to write to the event log</param>
+            <param name="msglevel">The minimum <see cref="T:Npgsql.LogLevel">LogLevel</see> for which this message should be logged.</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlEventLog.LogMsg(System.Resources.ResourceManager,System.String,Npgsql.LogLevel,System.Object[])">
+            <summary>
+            Writes a string to the Npgsql event log if msglevel is bigger then <see cref="P:Npgsql.NpgsqlEventLog.Level">NpgsqlEventLog.Level</see>
+            </summary>
+            <param name="resman">The <see cref="T:System.Resources.ResourceManager">ResourceManager</see> to get the localized resources</param>
+            <param name="ResourceString">The name of the resource that should be fetched by the <see cref="T:System.Resources.ResourceManager">ResourceManager</see></param>
+            <param name="msglevel">The minimum <see cref="T:Npgsql.LogLevel">LogLevel</see> for which this message should be logged.</param>
+            <param name="Parameters">The additional parameters that shall be included into the log-message (must be compatible with the string in the resource):</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlEventLog.LogIndexerGet(Npgsql.LogLevel,System.String,System.Object)">
+            <summary>
+            Writes the default log-message for the action of calling the Get-part of an Indexer to the log file.
+            </summary>
+            <param name="msglevel">The minimum <see cref="T:Npgsql.LogLevel">LogLevel</see> for which this message should be logged.</param>
+            <param name="ClassName">The name of the class that contains the Indexer</param>
+            <param name="IndexerParam">The parameter given to the Indexer</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlEventLog.LogIndexerSet(Npgsql.LogLevel,System.String,System.Object,System.Object)">
+            <summary>
+            Writes the default log-message for the action of calling the Set-part of an Indexer to the logfile.
+            </summary>
+            <param name="msglevel">The minimum <see cref="T:Npgsql.LogLevel">LogLevel</see> for which this message should be logged.</param>
+            <param name="ClassName">The name of the class that contains the Indexer</param>
+            <param name="IndexerParam">The parameter given to the Indexer</param>
+            <param name="value">The value the Indexer is set to</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlEventLog.LogPropertyGet(Npgsql.LogLevel,System.String,System.String)">
+            <summary>
+            Writes the default log-message for the action of calling the Get-part of a Property to the logfile.
+            </summary>
+            <param name="msglevel">The minimum <see cref="T:Npgsql.LogLevel">LogLevel</see> for which this message should be logged.</param>
+            <param name="ClassName">The name of the class that contains the Property</param>
+            <param name="PropertyName">The name of the Property</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlEventLog.LogPropertySet(Npgsql.LogLevel,System.String,System.String,System.Object)">
+            <summary>
+            Writes the default log-message for the action of calling the Set-part of a Property to the logfile.
+            </summary>
+            <param name="msglevel">The minimum <see cref="T:Npgsql.LogLevel">LogLevel</see> for which this message should be logged.</param>
+            <param name="ClassName">The name of the class that contains the Property</param>
+            <param name="PropertyName">The name of the Property</param>
+            <param name="value">The value the Property is set to</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlEventLog.LogMethodEnter(Npgsql.LogLevel,System.String,System.String)">
+            <summary>
+            Writes the default log-message for the action of calling a Method without Arguments to the logfile.
+            </summary>
+            <param name="msglevel">The minimum <see cref="T:Npgsql.LogLevel">LogLevel</see> for which this message should be logged.</param>
+            <param name="ClassName">The name of the class that contains the Method</param>
+            <param name="MethodName">The name of the Method</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlEventLog.LogMethodEnter(Npgsql.LogLevel,System.String,System.String,System.Object)">
+            <summary>
+            Writes the default log-message for the action of calling a Method with one Argument to the logfile.
+            </summary>
+            <param name="msglevel">The minimum <see cref="T:Npgsql.LogLevel">LogLevel</see> for which this message should be logged.</param>
+            <param name="ClassName">The name of the class that contains the Method</param>
+            <param name="MethodName">The name of the Method</param>
+            <param name="MethodParameter">The value of the Argument of the Method</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlEventLog.LogMethodEnter(Npgsql.LogLevel,System.String,System.String,System.Object,System.Object)">
+            <summary>
+            Writes the default log-message for the action of calling a Method with two Arguments to the logfile.
+            </summary>
+            <param name="msglevel">The minimum <see cref="T:Npgsql.LogLevel">LogLevel</see> for which this message should be logged.</param>
+            <param name="ClassName">The name of the class that contains the Method</param>
+            <param name="MethodName">The name of the Method</param>
+            <param name="MethodParameter1">The value of the first Argument of the Method</param>
+            <param name="MethodParameter2">The value of the second Argument of the Method</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlEventLog.LogMethodEnter(Npgsql.LogLevel,System.String,System.String,System.Object,System.Object,System.Object)">
+            <summary>
+            Writes the default log-message for the action of calling a Method with three Arguments to the logfile.
+            </summary>
+            <param name="msglevel">The minimum <see cref="T:Npgsql.LogLevel">LogLevel</see> for which this message should be logged.</param>
+            <param name="ClassName">The name of the class that contains the Method</param>
+            <param name="MethodName">The name of the Method</param>
+            <param name="MethodParameter1">The value of the first Argument of the Method</param>
+            <param name="MethodParameter2">The value of the second Argument of the Method</param>
+            <param name="MethodParameter3">The value of the third Argument of the Method</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlEventLog.LogMethodEnter(Npgsql.LogLevel,System.String,System.String,System.Object[])">
+            <summary>
+            Writes the default log-message for the action of calling a Method with more than three Arguments to the logfile.
+            </summary>
+            <param name="msglevel">The minimum <see cref="T:Npgsql.LogLevel">LogLevel</see> for which this message should be logged.</param>
+            <param name="ClassName">The name of the class that contains the Method</param>
+            <param name="MethodName">The name of the Method</param>
+            <param name="MethodParameters">A <see cref="T:System.Object">Object</see>-Array with zero or more Ojects that are Arguments of the Method.</param>
+        </member>
+        <member name="P:Npgsql.NpgsqlEventLog.Level">
+            <summary>
+             Sets/Returns the level of information to log to the logfile.
+             </summary>
+             <value>The current <see cref="T:Npgsql.LogLevel">LogLevel</see></value>
+        </member>
+        <member name="P:Npgsql.NpgsqlEventLog.LogName">
+            <summary>
+             Sets/Returns the filename to use for logging.
+             </summary>
+             <value>The filename of the current Log file.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlEventLog.EchoMessages">
+            <summary>
+             Sets/Returns whether Log messages should be echoed to the console
+             </summary>
+             <value><b>true</b> if Log messages are echoed to the console, otherwise <b>false</b></value>
+        </member>
+        <member name="T:Npgsql.NpgsqlDescribe">
+             <summary>
+             This class represents the Parse message sent to PostgreSQL
+             server.
+             </summary>
+            
+        </member>
+        <member name="T:Npgsql.NpgsqlCopyIn">
+            <summary>
+            Represents a PostgreSQL COPY FROM STDIN operation with a corresponding SQL statement
+            to execute against a PostgreSQL database
+            and an associated stream used to read data from (if provided by user)
+            or for writing it (when generated by driver).
+            Eg. new NpgsqlCopyIn("COPY mytable FROM STDIN", connection, streamToRead).Start();
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyIn.#ctor(System.String,Npgsql.NpgsqlConnection)">
+            <summary>
+            Creates NpgsqlCommand to run given query upon Start(). Data for the requested COPY IN operation can then be written to CopyData stream followed by a call to End() or Cancel().
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyIn.#ctor(Npgsql.NpgsqlCommand,Npgsql.NpgsqlConnection)">
+            <summary>
+            Given command is run upon Start(). Data for the requested COPY IN operation can then be written to CopyData stream followed by a call to End() or Cancel().
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyIn.#ctor(Npgsql.NpgsqlCommand,Npgsql.NpgsqlConnection,System.IO.Stream)">
+            <summary>
+            Given command is executed upon Start() and all data from fromStream is passed to it as copy data.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyIn.FieldIsBinary(System.Int32)">
+            <summary>
+            Returns true if this operation is currently active and field at given location is in binary format.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyIn.Start">
+            <summary>
+            Command specified upon creation is executed as a non-query.
+            If CopyStream is set upon creation, it will be flushed to server as copy data, and operation will be finished immediately.
+            Otherwise the CopyStream member can be used for writing copy data to server and operation finished with a call to End() or Cancel().
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyIn.End">
+            <summary>
+            Called after writing all data to CopyStream to successfully complete this copy operation.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyIn.Cancel(System.String)">
+            <summary>
+            Withdraws an already started copy operation. The operation will fail with given error message.
+            Will do nothing if current operation is not active.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyIn.IsActive">
+            <summary>
+            Returns true if the connection is currently reserved for this operation.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyIn.CopyStream">
+            <summary>
+            The stream provided by user or generated upon Start().
+            User may provide a stream to constructor; it is used to pass to server all data read from it.
+            Otherwise, call to Start() sets this to a writable NpgsqlCopyInStream that passes all data written to it to server.
+            In latter case this is only available while the copy operation is active and null otherwise.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyIn.IsBinary">
+            <summary>
+            Returns true if this operation is currently active and in binary format.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyIn.FieldCount">
+            <summary>
+            Returns number of fields expected on each input row if this operation is currently active, otherwise -1
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyIn.NpgsqlCommand">
+            <summary>
+            The Command used to execute this copy operation.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyIn.CopyBufferSize">
+            <summary>
+            Set before a COPY IN query to define size of internal buffer for reading from given CopyStream.
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlCopyFormat">
+            <summary>
+            Represents information about COPY operation data transfer format as returned by server.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyFormat.#ctor(System.Byte,System.Int16[])">
+            <summary>
+            Only created when a CopyInResponse or CopyOutResponse is received by NpgsqlState.ProcessBackendResponses()
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyFormat.FieldIsBinary(System.Int32)">
+            <summary>
+            Returns true if this operation is currently active and field at given location is in binary format.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyFormat.IsBinary">
+            <summary>
+            Returns true if this operation is currently active and in binary format.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyFormat.FieldCount">
+            <summary>
+            Returns number of fields if this operation is currently active, otherwise -1
+            </summary>
+        </member>
+        <!-- Badly formed XML comment ignored for member "P:Npgsql.Cache`1.CacheSize" -->
+        <member name="P:Npgsql.Cache`1.Item(System.String)">
+            <returns></returns>
+        </member>
+        <member name="T:NpgsqlTypes.BasicBackendToNativeTypeConverter">
+            <summary>
+            Provide event handlers to convert all native supported basic data types from their backend
+            text representation to a .NET object.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BasicBackendToNativeTypeConverter.ToBinary(NpgsqlTypes.NpgsqlBackendTypeInfo,System.String,System.Int16,System.Int32)">
+            <summary>
+            Binary data.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BasicBackendToNativeTypeConverter.ToBoolean(NpgsqlTypes.NpgsqlBackendTypeInfo,System.String,System.Int16,System.Int32)">
+            <summary>
+            Convert a postgresql boolean to a System.Boolean.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BasicBackendToNativeTypeConverter.ToBit(NpgsqlTypes.NpgsqlBackendTypeInfo,System.String,System.Int16,System.Int32)">
+            <summary>
+            Convert a postgresql bit to a System.Boolean.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BasicBackendToNativeTypeConverter.ToDateTime(NpgsqlTypes.NpgsqlBackendTypeInfo,System.String,System.Int16,System.Int32)">
+            <summary>
+            Convert a postgresql datetime to a System.DateTime.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BasicBackendToNativeTypeConverter.ToDate(NpgsqlTypes.NpgsqlBackendTypeInfo,System.String,System.Int16,System.Int32)">
+            <summary>
+            Convert a postgresql date to a System.DateTime.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BasicBackendToNativeTypeConverter.ToTime(NpgsqlTypes.NpgsqlBackendTypeInfo,System.String,System.Int16,System.Int32)">
+            <summary>
+            Convert a postgresql time to a System.DateTime.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BasicBackendToNativeTypeConverter.ToMoney(NpgsqlTypes.NpgsqlBackendTypeInfo,System.String,System.Int16,System.Int32)">
+            <summary>
+            Convert a postgresql money to a System.Decimal.
+            </summary>
+        </member>
+        <member name="T:NpgsqlTypes.BasicNativeToBackendTypeConverter">
+            <summary>
+            Provide event handlers to convert the basic native supported data types from
+            native form to backend representation.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BasicNativeToBackendTypeConverter.ToBinary(NpgsqlTypes.NpgsqlNativeTypeInfo,System.Object,System.Boolean)">
+            <summary>
+            Binary data.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BasicNativeToBackendTypeConverter.ToBoolean(NpgsqlTypes.NpgsqlNativeTypeInfo,System.Object,System.Boolean)">
+            <summary>
+            Convert to a postgresql boolean.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BasicNativeToBackendTypeConverter.ToBit(NpgsqlTypes.NpgsqlNativeTypeInfo,System.Object,System.Boolean)">
+            <summary>
+            Convert to a postgresql bit.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BasicNativeToBackendTypeConverter.ToDateTime(NpgsqlTypes.NpgsqlNativeTypeInfo,System.Object,System.Boolean)">
+            <summary>
+            Convert to a postgresql timestamp.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BasicNativeToBackendTypeConverter.ToDate(NpgsqlTypes.NpgsqlNativeTypeInfo,System.Object,System.Boolean)">
+            <summary>
+            Convert to a postgresql date.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BasicNativeToBackendTypeConverter.ToTime(NpgsqlTypes.NpgsqlNativeTypeInfo,System.Object,System.Boolean)">
+            <summary>
+            Convert to a postgresql time.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BasicNativeToBackendTypeConverter.ToMoney(NpgsqlTypes.NpgsqlNativeTypeInfo,System.Object,System.Boolean)">
+            <summary>
+            Convert to a postgres money.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BasicNativeToBackendTypeConverter.ToSingleDouble(NpgsqlTypes.NpgsqlNativeTypeInfo,System.Object,System.Boolean)">
+            <summary>
+            Convert to a postgres double with maximum precision.
+            </summary>
+        </member>
+        <member name="T:NpgsqlTypes.ExtendedBackendToNativeTypeConverter">
+            <summary>
+            Provide event handlers to convert extended native supported data types from their backend
+            text representation to a .NET object.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ExtendedBackendToNativeTypeConverter.ToPoint(NpgsqlTypes.NpgsqlBackendTypeInfo,System.String,System.Int16,System.Int32)">
+            <summary>
+            Convert a postgresql point to a System.NpgsqlPoint.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ExtendedBackendToNativeTypeConverter.ToBox(NpgsqlTypes.NpgsqlBackendTypeInfo,System.String,System.Int16,System.Int32)">
+            <summary>
+            Convert a postgresql point to a System.RectangleF.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ExtendedBackendToNativeTypeConverter.ToLSeg(NpgsqlTypes.NpgsqlBackendTypeInfo,System.String,System.Int16,System.Int32)">
+            <summary>
+            LDeg.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ExtendedBackendToNativeTypeConverter.ToPath(NpgsqlTypes.NpgsqlBackendTypeInfo,System.String,System.Int16,System.Int32)">
+            <summary>
+            Path.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ExtendedBackendToNativeTypeConverter.ToPolygon(NpgsqlTypes.NpgsqlBackendTypeInfo,System.String,System.Int16,System.Int32)">
+            <summary>
+            Polygon.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ExtendedBackendToNativeTypeConverter.ToCircle(NpgsqlTypes.NpgsqlBackendTypeInfo,System.String,System.Int16,System.Int32)">
+            <summary>
+            Circle.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ExtendedBackendToNativeTypeConverter.ToInet(NpgsqlTypes.NpgsqlBackendTypeInfo,System.String,System.Int16,System.Int32)">
+            <summary>
+            Inet.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ExtendedBackendToNativeTypeConverter.ToMacAddress(NpgsqlTypes.NpgsqlBackendTypeInfo,System.String,System.Int16,System.Int32)">
+            <summary>
+            MAC Address.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ExtendedBackendToNativeTypeConverter.ToInterval(NpgsqlTypes.NpgsqlBackendTypeInfo,System.String,System.Int16,System.Int32)">
+            <summary>
+            interval
+            </summary>
+        </member>
+        <member name="T:NpgsqlTypes.ExtendedNativeToBackendTypeConverter">
+            <summary>
+            Provide event handlers to convert extended native supported data types from
+            native form to backend representation.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ExtendedNativeToBackendTypeConverter.ToPoint(NpgsqlTypes.NpgsqlNativeTypeInfo,System.Object,System.Boolean)">
+            <summary>
+            Point.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ExtendedNativeToBackendTypeConverter.ToBox(NpgsqlTypes.NpgsqlNativeTypeInfo,System.Object,System.Boolean)">
+            <summary>
+            Box.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ExtendedNativeToBackendTypeConverter.ToLSeg(NpgsqlTypes.NpgsqlNativeTypeInfo,System.Object,System.Boolean)">
+            <summary>
+            LSeg.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ExtendedNativeToBackendTypeConverter.ToPath(NpgsqlTypes.NpgsqlNativeTypeInfo,System.Object,System.Boolean)">
+            <summary>
+            Open path.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ExtendedNativeToBackendTypeConverter.ToPolygon(NpgsqlTypes.NpgsqlNativeTypeInfo,System.Object,System.Boolean)">
+            <summary>
+            Polygon.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ExtendedNativeToBackendTypeConverter.ToMacAddress(NpgsqlTypes.NpgsqlNativeTypeInfo,System.Object,System.Boolean)">
+            <summary>
+            Convert to a postgres MAC Address.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ExtendedNativeToBackendTypeConverter.ToCircle(NpgsqlTypes.NpgsqlNativeTypeInfo,System.Object,System.Boolean)">
+            <summary>
+            Circle.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ExtendedNativeToBackendTypeConverter.ToIPAddress(NpgsqlTypes.NpgsqlNativeTypeInfo,System.Object,System.Boolean)">
+            <summary>
+            Convert to a postgres inet.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.ExtendedNativeToBackendTypeConverter.ToInterval(NpgsqlTypes.NpgsqlNativeTypeInfo,System.Object,System.Boolean)">
+            <summary>
+            Convert to a postgres interval
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlNotificationEventArgs">
+            <summary>
+            EventArgs class to send Notification parameters.
+            </summary>
+        </member>
+        <member name="F:Npgsql.NpgsqlNotificationEventArgs.PID">
+            <summary>
+            Process ID of the PostgreSQL backend that sent this notification.
+            </summary>
+        </member>
+        <member name="F:Npgsql.NpgsqlNotificationEventArgs.Condition">
+            <summary>
+            Condition that triggered that notification.
+            </summary>
+        </member>
+        <member name="F:Npgsql.NpgsqlNotificationEventArgs.AdditionalInformation">
+            <summary>
+            Additional Information From Notifiying Process (for future use, currently postgres always sets this to an empty string)
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlClosedState.ResolveIPHost(System.String)">
+            <summary>
+            Resolve a host name or IP address.
+            This is needed because if you call Dns.Resolve() with an IP address, it will attempt
+            to resolve it as a host name, when it should just convert it to an IP address.
+            </summary>
+            <param name="HostName"></param>
+        </member>
+        <member name="T:Npgsql.NpgsqlRowDescription">
+             <summary>
+             This class represents a RowDescription message sent from
+             the PostgreSQL.
+             </summary>
+            
+        </member>
+        <member name="T:Npgsql.NpgsqlRowDescription.FieldData">
+            <summary>
+            This struct represents the internal data of the RowDescription message.
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlParse">
+             <summary>
+             This class represents the Parse message sent to PostgreSQL
+             server.
+             </summary>
+            
+        </member>
+        <member name="T:Npgsql.NpgsqlFactory">
+            <summary>
+            A factory to create instances of various Npgsql objects.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlFactory.CreateCommand">
+            <summary>
+            Creates an NpgsqlCommand object.
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlExecute">
+             <summary>
+             This class represents the Parse message sent to PostgreSQL
+             server.
+             </summary>
+            
+        </member>
+        <member name="T:Npgsql.NpgsqlRowUpdatedEventHandler">
+            <summary>
+            Represents the method that handles the <see cref="E:Npgsql.NpgsqlDataAdapter.RowUpdated">RowUpdated</see> events.
+            </summary>
+            <param name="sender">The source of the event.</param>
+            <param name="e">A <see cref="T:NpgsqlRowUpdatedEventArgs">NpgsqlRowUpdatedEventArgs</see> that contains the event data.</param>
+        </member>
+        <member name="T:Npgsql.NpgsqlRowUpdatingEventHandler">
+            <summary>
+            Represents the method that handles the <see cref="E:Npgsql.NpgsqlDataAdapter.RowUpdating">RowUpdating</see> events.
+            </summary>
+            <param name="sender">The source of the event.</param>
+            <param name="e">A <see cref="T:NpgsqlRowUpdatingEventArgs">NpgsqlRowUpdatingEventArgs</see> that contains the event data.</param>
+        </member>
+        <member name="T:Npgsql.NpgsqlDataAdapter">
+            <summary>
+            This class represents an adapter from many commands: select, update, insert and delete to fill <see cref="T:System.Data.DataSet">Datasets.</see>
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlCopyOutStream">
+            <summary>
+            Stream for reading data from a table or select on a PostgreSQL version 7.4 or newer database during an active COPY TO STDOUT operation.
+            <b>Passes data exactly as provided by the server.</b>
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyOutStream.#ctor(Npgsql.NpgsqlConnector)">
+            <summary>
+            Created only by NpgsqlCopyOutState.StartCopy()
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyOutStream.Close">
+            <summary>
+            Discards copy data as long as server pushes it. Returns after operation is finished.
+            Does nothing if this stream is not the active copy operation reader.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyOutStream.Write(System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            Not writable.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyOutStream.Flush">
+            <summary>
+            Not flushable.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyOutStream.Read(System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            Copies data read from server to given byte buffer.
+            Since server returns data row by row, length will differ each time, but it is only zero once the operation ends.
+            Can be mixed with calls to the more efficient NpgsqlCopyOutStream.Read() : byte[] though that would not make much sense.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyOutStream.Seek(System.Int64,System.IO.SeekOrigin)">
+            <summary>
+            Not seekable
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyOutStream.SetLength(System.Int64)">
+            <summary>
+            Not supported
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyOutStream.Read">
+            <summary>
+            Returns a whole row of data from server without extra work.
+            If standard Stream.Read(...) has been called before, it's internal buffers remains are returned.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyOutStream.IsActive">
+            <summary>
+            True while this stream can be used to read copy data from server
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyOutStream.CanRead">
+            <summary>
+            True
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyOutStream.CanWrite">
+            <summary>
+            False
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyOutStream.CanSeek">
+            <summary>
+            False
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyOutStream.Length">
+            <summary>
+            Number of bytes read so far
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyOutStream.Position">
+            <summary>
+            Number of bytes read so far; can not be set.
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlBind">
+             <summary>
+             This class represents the Bind message sent to PostgreSQL
+             server.
+             </summary>
+            
+        </member>
+        <member name="T:NpgsqlTypes.LargeObjectManager">
+            <summary>
+            Summary description for LargeObjectManager.
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlTransaction">
+            <summary>
+            Represents a transaction to be made in a PostgreSQL database. This class cannot be inherited.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlTransaction.Commit">
+            <summary>
+            Commits the database transaction.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlTransaction.Rollback">
+            <summary>
+            Rolls back a transaction from a pending state.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlTransaction.Rollback(System.String)">
+            <summary>
+            Rolls back a transaction from a pending savepoint state.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlTransaction.Save(System.String)">
+            <summary>
+            Creates a transaction save point.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlTransaction.Cancel">
+            <summary>
+            Cancel the transaction without telling the backend about it.  This is
+            used to make the transaction go away when closing a connection.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlTransaction.Connection">
+            <summary>
+            Gets the <see cref="T:Npgsql.NpgsqlConnection">NpgsqlConnection</see>
+            object associated with the transaction, or a null reference if the
+            transaction is no longer valid.
+            </summary>
+            <value>The <see cref="T:Npgsql.NpgsqlConnection">NpgsqlConnection</see>
+            object associated with the transaction.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlTransaction.IsolationLevel">
+            <summary>
+            Specifies the <see cref="T:System.Data.IsolationLevel">IsolationLevel</see> for this transaction.
+            </summary>
+            <value>The <see cref="T:System.Data.IsolationLevel">IsolationLevel</see> for this transaction.
+            The default is <b>ReadCommitted</b>.</value>
+        </member>
+        <member name="T:Npgsql.NpgsqlStartupPacket">
+             <summary>
+             This class represents a StartupPacket message of PostgreSQL
+             protocol.
+             </summary>
+            
+        </member>
+        <member name="T:Npgsql.NpgsqlDataReader">
+            <summary>
+            Provides a means of reading a forward-only stream of rows from a PostgreSQL backend.  This class cannot be inherited.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetDataTypeName(System.Int32)">
+            <summary>
+            Return the data type name of the column at index <param name="Index"></param>.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetFieldType(System.Int32)">
+            <summary>
+            Return the data type of the column at index <param name="Index"></param>.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetProviderSpecificFieldType(System.Int32)">
+            <summary>
+            Return the Npgsql specific data type of the column at requested ordinal.
+            </summary>
+            <param name="ordinal">column position</param>
+            <returns>Appropriate Npgsql type for column.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetName(System.Int32)">
+            <summary>
+            Return the column name of the column at index <param name="Index"></param>.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetDataTypeOID(System.Int32)">
+            <summary>
+            Return the data type OID of the column at index <param name="Index"></param>.
+            </summary>
+            FIXME: Why this method returns String?
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetOrdinal(System.String)">
+            <summary>
+            Return the column name of the column named <param name="Name"></param>.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetFieldDbType(System.Int32)">
+            <summary>
+            Return the data DbType of the column at index <param name="Index"></param>.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetFieldNpgsqlDbType(System.Int32)">
+            <summary>
+            Return the data NpgsqlDbType of the column at index <param name="Index"></param>.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetInterval(System.Int32)">
+            <summary>
+            Get the value of a column as a <see cref="T:NpgsqlTypes.NpgsqlInterval"/>.
+            <remarks>If the differences between <see cref="T:NpgsqlTypes.NpgsqlInterval"/> and <see cref="!:System.Timespan"/>
+            in handling of days and months is not important to your application, use <see cref="!:GetTimeSpan()"/>
+            instead.</remarks>
+            </summary>
+            <param name="i">Index of the field to find.</param>
+            <returns><see cref="T:NpgsqlTypes.NpgsqlInterval"/> value of the field.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetGuid(System.Int32)">
+            <summary>
+            Gets the value of a column converted to a Guid.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetInt16(System.Int32)">
+            <summary>
+            Gets the value of a column as Int16.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetInt32(System.Int32)">
+            <summary>
+            Gets the value of a column as Int32.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetInt64(System.Int32)">
+            <summary>
+            Gets the value of a column as Int64.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetFloat(System.Int32)">
+            <summary>
+            Gets the value of a column as Single.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetDouble(System.Int32)">
+            <summary>
+            Gets the value of a column as Double.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetString(System.Int32)">
+            <summary>
+            Gets the value of a column as String.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetDecimal(System.Int32)">
+            <summary>
+            Gets the value of a column as Decimal.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetTimeSpan(System.Int32)">
+            <summary>
+            Gets the value of a column as TimeSpan.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetValues(System.Object[])">
+            <summary>
+            Copy values from each column in the current row into <param name="Values"></param>.
+            </summary>
+            <returns>The number of column values copied.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetProviderSpecificValues(System.Object[])">
+            <summary>
+            Copy values from each column in the current row into <param name="Values"></param>.
+            </summary>
+            <param name="values">An array appropriately sized to store values from all columns.</param>
+            <returns>The number of column values copied.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetBoolean(System.Int32)">
+            <summary>
+            Gets the value of a column as Boolean.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetByte(System.Int32)">
+            <summary>
+            Gets the value of a column as Byte.  Not implemented.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetChar(System.Int32)">
+            <summary>
+            Gets the value of a column as Char.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetDateTime(System.Int32)">
+            <summary>
+            Gets the value of a column as DateTime.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetSchemaTable">
+            <summary>
+            Returns a System.Data.DataTable that describes the column metadata of the DataReader.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlDataReader.GetTableNameFromQuery">
+            <summary>
+             This methods parses the command text and tries to get the tablename
+             from it.
+            </summary>
+        </member>
+        <member name="E:Npgsql.NpgsqlDataReader.ReaderClosed">
+            <summary>
+            Is raised whenever Close() is called.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlDataReader.FieldCount">
+            <summary>
+            Gets the number of columns in the current row.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlDataReader.Item(System.Int32)">
+            <summary>
+            Gets the value of a column in its native format.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlDataReader.Item(System.String)">
+            <summary>
+            Gets the value of a column in its native format.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlDataReader.Depth">
+            <summary>
+            Gets a value indicating the depth of nesting for the current row.  Always returns zero.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlDataReader.IsClosed">
+            <summary>
+            Gets a value indicating whether the data reader is closed.
+            </summary>
+        </member>
+        <member name="F:Npgsql.NpgsqlDataReader.KeyLookup.primaryKey">
+            <summary>
+            Contains the column names as the keys
+            </summary>
+        </member>
+        <member name="F:Npgsql.NpgsqlDataReader.KeyLookup.uniqueColumns">
+            <summary>
+            Contains all unique columns
+            </summary>
+        </member>
+        <member name="T:Npgsql.ForwardsOnlyDataReader">
+            <summary>
+            This is the primary implementation of NpgsqlDataReader. It is the one used in normal cases (where the 
+            preload-reader option is not set in the connection string to resolve some potential backwards-compatibility
+            issues), the only implementation used internally, and in cases where CachingDataReader is used, it is still
+            used to do the actual "leg-work" of turning a response stream from the server into a datareader-style
+            object - with CachingDataReader then filling it's cache from here.
+            </summary>
+        </member>
+        <member name="M:Npgsql.ForwardsOnlyDataReader.GetNextResponseObject">
+            <summary>
+            Iterate through the objects returned through from the server.
+            If it's a CompletedResponse the rowsaffected count is updated appropriately,
+            and we iterate again, otherwise we return it (perhaps updating our cache of pending
+            rows if appropriate).
+            </summary>
+            <returns>The next <see cref="T:Npgsql.IServerResponseObject"/> we will deal with.</returns>
+        </member>
+        <member name="M:Npgsql.ForwardsOnlyDataReader.GetNextRowDescription">
+            <summary>
+            Advances the data reader to the next result, when multiple result sets were returned by the PostgreSQL backend.
+            </summary>
+            <returns>True if the reader was advanced, otherwise false.</returns>
+        </member>
+        <member name="M:Npgsql.ForwardsOnlyDataReader.Dispose(System.Boolean)">
+            <summary>
+            Releases the resources used by the <see cref="T:Npgsql.NpgsqlCommand">NpgsqlCommand</see>.
+            </summary>
+        </member>
+        <member name="M:Npgsql.ForwardsOnlyDataReader.Close">
+            <summary>
+            Closes the data reader object.
+            </summary>
+        </member>
+        <member name="M:Npgsql.ForwardsOnlyDataReader.NextResult">
+            <summary>
+            Advances the data reader to the next result, when multiple result sets were returned by the PostgreSQL backend.
+            </summary>
+            <returns>True if the reader was advanced, otherwise false.</returns>
+        </member>
+        <member name="M:Npgsql.ForwardsOnlyDataReader.Read">
+            <summary>
+            Advances the data reader to the next row.
+            </summary>
+            <returns>True if the reader was advanced, otherwise false.</returns>
+        </member>
+        <member name="M:Npgsql.ForwardsOnlyDataReader.GetValue(System.Int32)">
+            <summary>
+            Return the value of the column at index <param name="Index"></param>.
+            </summary>
+        </member>
+        <member name="M:Npgsql.ForwardsOnlyDataReader.GetBytes(System.Int32,System.Int64,System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            Gets raw data from a column.
+            </summary>
+        </member>
+        <member name="M:Npgsql.ForwardsOnlyDataReader.GetChars(System.Int32,System.Int64,System.Char[],System.Int32,System.Int32)">
+            <summary>
+            Gets raw data from a column.
+            </summary>
+        </member>
+        <member name="M:Npgsql.ForwardsOnlyDataReader.IsDBNull(System.Int32)">
+            <summary>
+            Report whether the value in a column is DBNull.
+            </summary>
+        </member>
+        <member name="P:Npgsql.ForwardsOnlyDataReader.RecordsAffected">
+            <summary>
+            Gets the number of rows changed, inserted, or deleted by execution of the SQL statement.
+            </summary>
+        </member>
+        <member name="P:Npgsql.ForwardsOnlyDataReader.HasRows">
+            <summary>
+            Indicates if NpgsqlDatareader has rows to be read.
+            </summary>
+        </member>
+        <member name="T:Npgsql.CachingDataReader">
+            <summary>
+            <para>Provides an implementation of NpgsqlDataReader in which all data is pre-loaded into memory.
+            This operates by first creating a ForwardsOnlyDataReader as usual, and then loading all of it's
+            Rows into memory. There is a general principle that when there is a trade-off between a class design that
+            is more efficient and/or scalable on the one hand and one that is less efficient but has more functionality
+            (in this case the internal-only functionality of caching results) that one can build the less efficent class
+            from the most efficient without significant extra loss in efficiency, but not the other way around. The relationship
+            between ForwardsOnlyDataReader and CachingDataReader is an example of this).</para>
+            <para>Since the interface presented to the user is still forwards-only, queues are used to
+            store this information, so that dequeueing as we go we give the garbage collector the best opportunity
+            possible to reclaim any memory that is no longer in use.</para>
+            <para>ForwardsOnlyDataReader being used to actually
+            obtain the information from the server means that the "leg-work" is still only done (and need only be
+            maintained) in one place.</para>
+            <para>This class exists to allow for certain potential backwards-compatibility issues to be resolved
+            with little effort on the part of affected users. It is considerably less efficient than ForwardsOnlyDataReader
+            and hence never used internally.</para>
+            </summary>
+        </member>
+        <member name="T:Npgsql.ProvideClientCertificatesCallback">
+            <summary>
+            Represents the method that allows the application to provide a certificate collection to be used for SSL clien authentication
+            </summary>
+            <param name="certificates">A <see cref="T:System.Security.Cryptography.X509Certificates.X509CertificateCollection">X509CertificateCollection</see> to be filled with one or more client certificates.</param>
+        </member>
+        <member name="T:Npgsql.NpgsqlConnector">
+            <summary>
+            !!! Helper class, for compilation only.
+            Connector implements the logic for the Connection Objects to
+            access the physical connection to the database, and isolate
+            the application developer from connection pooling internals.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnector.#ctor(Npgsql.NpgsqlConnectionStringBuilder,System.Boolean,System.Boolean)">
+            <summary>
+            Constructor.
+            </summary>
+            <param name="Shared">Controls whether the connector can be shared.</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnector.IsValid">
+            <summary>
+            This method checks if the connector is still ok.
+            We try to send a simple query text, select 1 as ConnectionTest;
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnector.ReleaseResources">
+            <summary>
+            This method is responsible for releasing all resources associated with this Connector.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnector.ReleasePlansPortals">
+            <summary>
+            This method is responsible to release all portals used by this Connector.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnector.DefaultCertificateSelectionCallback(System.Security.Cryptography.X509Certificates.X509CertificateCollection,System.Security.Cryptography.X509Certificates.X509Certificate,System.String,System.Security.Cryptography.X509Certificates.X509CertificateCollection)">
+            <summary>
+            Default SSL CertificateSelectionCallback implementation.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnector.DefaultCertificateValidationCallback(System.Security.Cryptography.X509Certificates.X509Certificate,System.Int32[])">
+            <summary>
+            Default SSL CertificateValidationCallback implementation.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnector.DefaultPrivateKeySelectionCallback(System.Security.Cryptography.X509Certificates.X509Certificate,System.String)">
+            <summary>
+            Default SSL PrivateKeySelectionCallback implementation.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnector.DefaultProvideClientCertificatesCallback(System.Security.Cryptography.X509Certificates.X509CertificateCollection)">
+            <summary>
+            Default SSL ProvideClientCertificatesCallback implementation.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnector.ProcessServerVersion">
+            <summary>
+            This method is required to set all the version dependent features flags.
+            SupportsPrepare means the server can use prepared query plans (7.3+)
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnector.Open">
+            <summary>
+            Opens the physical connection to the server.
+            </summary>
+            <remarks>Usually called by the RequestConnector
+            Method of the connection pool manager.</remarks>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnector.Close">
+            <summary>
+            Closes the physical connection to the server.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnector.NextPortalName">
+            <summary>
+             Returns next portal index.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlConnector.NextPlanName">
+            <summary>
+             Returns next plan index.
+            </summary>
+        </member>
+        <member name="E:Npgsql.NpgsqlConnector.Notice">
+            <summary>
+            Occurs on NoticeResponses from the PostgreSQL backend.
+            </summary>
+        </member>
+        <member name="E:Npgsql.NpgsqlConnector.Notification">
+            <summary>
+            Occurs on NotificationResponses from the PostgreSQL backend.
+            </summary>
+        </member>
+        <member name="E:Npgsql.NpgsqlConnector.ProvideClientCertificatesCallback">
+            <summary>
+            Called to provide client certificates for SSL handshake.
+            </summary>
+        </member>
+        <member name="E:Npgsql.NpgsqlConnector.CertificateSelectionCallback">
+            <summary>
+            Mono.Security.Protocol.Tls.CertificateSelectionCallback delegate.
+            </summary>
+        </member>
+        <member name="E:Npgsql.NpgsqlConnector.CertificateValidationCallback">
+            <summary>
+            Mono.Security.Protocol.Tls.CertificateValidationCallback delegate.
+            </summary>
+        </member>
+        <member name="E:Npgsql.NpgsqlConnector.PrivateKeySelectionCallback">
+            <summary>
+            Mono.Security.Protocol.Tls.PrivateKeySelectionCallback delegate.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnector.State">
+            <summary>
+            Gets the current state of the connection.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnector.ConnectionString">
+            <summary>
+            Return Connection String.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnector.ServerVersion">
+            <summary>
+            Version of backend server this connector is connected to.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnector.BackendProtocolVersion">
+            <summary>
+            Backend protocol version in use by this connector.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnector.Stream">
+            <summary>
+            The physical connection stream to the backend.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnector.Socket">
+            <summary>
+            The physical connection socket to the backend.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnector.IsInitialized">
+            <summary>
+            Reports if this connector is fully connected.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnector.Mediator">
+            <summary>
+            The connection mediator.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnector.Transaction">
+            <summary>
+            Report if the connection is in a transaction.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlConnector.SupportsPrepare">
+            <summary>
+            Report whether the current connection can support prepare functionality.
+            </summary>
+        </member>
+        <member name="T:NpgsqlTypes.NpgsqlTypesHelper">
+            <summary>
+            This class contains helper methods for type conversion between
+            the .Net type system and postgresql.
+            </summary>
+        </member>
+        <member name="F:NpgsqlTypes.NpgsqlTypesHelper.BackendTypeMappingCache">
+            <summary>
+            A cache of basic datatype mappings keyed by server version.  This way we don't
+            have to load the basic type mappings for every connection.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlTypesHelper.TryGetBackendTypeInfo(System.String,NpgsqlTypes.NpgsqlBackendTypeInfo@)">
+            <summary>
+            Find a NpgsqlNativeTypeInfo in the default types map that can handle objects
+            of the given NpgsqlDbType.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlTypesHelper.TryGetNativeTypeInfo(NpgsqlTypes.NpgsqlDbType,NpgsqlTypes.NpgsqlNativeTypeInfo@)">
+            <summary>
+            Find a NpgsqlNativeTypeInfo in the default types map that can handle objects
+            of the given NpgsqlDbType.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlTypesHelper.TryGetNativeTypeInfo(System.Data.DbType,NpgsqlTypes.NpgsqlNativeTypeInfo@)">
+            <summary>
+            Find a NpgsqlNativeTypeInfo in the default types map that can handle objects
+            of the given DbType.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlTypesHelper.TryGetNativeTypeInfo(System.Type,NpgsqlTypes.NpgsqlNativeTypeInfo@)">
+            <summary>
+            Find a NpgsqlNativeTypeInfo in the default types map that can handle objects
+            of the given System.Type.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlTypesHelper.ConvertBackendStringToSystemType(NpgsqlTypes.NpgsqlBackendTypeInfo,System.String,System.Int16,System.Int32)">
+            <summary>
+             This method is responsible to convert the string received from the backend
+             to the corresponding NpgsqlType.
+             The given TypeInfo is called upon to do the conversion.
+             If no TypeInfo object is provided, no conversion is performed.
+             </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlTypesHelper.PrepareDefaultTypesMap">
+            <summary>
+            Create the one and only native to backend type map.
+            This map is used when formatting native data
+            types to backend representations.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlTypesHelper.CreateAndLoadInitialTypesMapping(Npgsql.NpgsqlConnector)">
+            <summary>
+             This method creates (or retrieves from cache) a mapping between type and OID 
+             of all natively supported postgresql data types.
+             This is needed as from one version to another, this mapping can be changed and
+             so we avoid hardcoding them.
+             </summary>
+             <returns>NpgsqlTypeMapping containing all known data types.  The mapping must be
+             cloned before it is modified because it is cached; changes made by one connection may
+             effect another connection.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlTypesHelper.LoadTypesMappings(Npgsql.NpgsqlConnector,NpgsqlTypes.NpgsqlBackendTypeMapping,System.Collections.Generic.IEnumerable{NpgsqlTypes.NpgsqlBackendTypeInfo})">
+            <summary>
+            Attempt to map types by issuing a query against pg_type.
+            This function takes a list of NpgsqlTypeInfo and attempts to resolve the OID field
+            of each by querying pg_type.  If the mapping is found, the type info object is
+            updated (OID) and added to the provided NpgsqlTypeMapping object.
+            </summary>
+            <param name="conn">NpgsqlConnector to send query through.</param>
+            <param name="TypeMappings">Mapping object to add types too.</param>
+            <param name="TypeInfoList">List of types that need to have OID's mapped.</param>
+        </member>
+        <member name="T:NpgsqlTypes.ConvertBackendToNativeHandler">
+            <summary>
+            Delegate called to convert the given backend data to its native representation.
+            </summary>
+        </member>
+        <member name="T:NpgsqlTypes.ConvertNativeToBackendHandler">
+            <summary>
+            Delegate called to convert the given native data to its backand representation.
+            </summary>
+        </member>
+        <member name="T:NpgsqlTypes.NpgsqlBackendTypeInfo">
+            <summary>
+            Represents a backend data type.
+            This class can be called upon to convert a backend field representation to a native object.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlBackendTypeInfo.#ctor(System.Int32,System.String,NpgsqlTypes.NpgsqlDbType,System.Data.DbType,System.Type,NpgsqlTypes.ConvertBackendToNativeHandler)">
+            <summary>
+            Construct a new NpgsqlTypeInfo with the given attributes and conversion handlers.
+            </summary>
+            <param name="OID">Type OID provided by the backend server.</param>
+            <param name="Name">Type name provided by the backend server.</param>
+            <param name="NpgsqlDbType">NpgsqlDbType</param>
+            <param name="Type">System type to convert fields of this type to.</param>
+            <param name="ConvertBackendToNative">Data conversion handler.</param>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlBackendTypeInfo.ConvertToNative(System.String,System.Int16,System.Int32)">
+            <summary>
+            Perform a data conversion from a backend representation to 
+            a native object.
+            </summary>
+            <param name="BackendData">Data sent from the backend.</param>
+            <param name="TypeModifier">Type modifier field sent from the backend.</param>
+        </member>
+        <member name="P:NpgsqlTypes.NpgsqlBackendTypeInfo.OID">
+            <summary>
+            Type OID provided by the backend server.
+            </summary>
+        </member>
+        <member name="P:NpgsqlTypes.NpgsqlBackendTypeInfo.Name">
+            <summary>
+            Type name provided by the backend server.
+            </summary>
+        </member>
+        <member name="P:NpgsqlTypes.NpgsqlBackendTypeInfo.NpgsqlDbType">
+            <summary>
+            NpgsqlDbType.
+            </summary>
+        </member>
+        <member name="P:NpgsqlTypes.NpgsqlBackendTypeInfo.DbType">
+            <summary>
+            NpgsqlDbType.
+            </summary>
+        </member>
+        <member name="P:NpgsqlTypes.NpgsqlBackendTypeInfo.Type">
+            <summary>
+            Provider type to convert fields of this type to.
+            </summary>
+        </member>
+        <member name="P:NpgsqlTypes.NpgsqlBackendTypeInfo.FrameworkType">
+            <summary>
+            System type to convert fields of this type to.
+            </summary>
+        </member>
+        <member name="T:NpgsqlTypes.NpgsqlNativeTypeInfo">
+            <summary>
+            Represents a backend data type.
+            This class can be called upon to convert a native object to its backend field representation,
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlNativeTypeInfo.ArrayOf(NpgsqlTypes.NpgsqlNativeTypeInfo)">
+            <summary>
+            Returns an NpgsqlNativeTypeInfo for an array where the elements are of the type
+            described by the NpgsqlNativeTypeInfo supplied.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlNativeTypeInfo.#ctor(System.String,NpgsqlTypes.NpgsqlDbType,System.Data.DbType,System.Boolean,NpgsqlTypes.ConvertNativeToBackendHandler)">
+            <summary>
+            Construct a new NpgsqlTypeInfo with the given attributes and conversion handlers.
+            </summary>
+            <param name="Name">Type name provided by the backend server.</param>
+            <param name="NpgsqlDbType">NpgsqlDbType</param>
+            <param name="ConvertNativeToBackend">Data conversion handler.</param>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlNativeTypeInfo.ConvertToBackend(System.Object,System.Boolean)">
+            <summary>
+            Perform a data conversion from a native object to
+            a backend representation.
+            DBNull and null values are handled differently depending if a plain query is used
+            When 
+            </summary>
+            <param name="NativeData">Native .NET object to be converted.</param>
+            <param name="ForExtendedQuery">Flag indicating if the conversion has to be done for 
+            plain queries or extended queries</param>
+        </member>
+        <member name="P:NpgsqlTypes.NpgsqlNativeTypeInfo.Name">
+            <summary>
+            Type name provided by the backend server.
+            </summary>
+        </member>
+        <member name="P:NpgsqlTypes.NpgsqlNativeTypeInfo.NpgsqlDbType">
+            <summary>
+            NpgsqlDbType.
+            </summary>
+        </member>
+        <member name="P:NpgsqlTypes.NpgsqlNativeTypeInfo.DbType">
+            <summary>
+            DbType.
+            </summary>
+        </member>
+        <member name="P:NpgsqlTypes.NpgsqlNativeTypeInfo.Quote">
+            <summary>
+            Apply quoting.
+            </summary>
+        </member>
+        <member name="P:NpgsqlTypes.NpgsqlNativeTypeInfo.UseSize">
+            <summary>
+            Use parameter size information.
+            </summary>
+        </member>
+        <member name="T:NpgsqlTypes.NpgsqlBackendTypeMapping">
+            <summary>
+            Provide mapping between type OID, type name, and a NpgsqlBackendTypeInfo object that represents it.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlBackendTypeMapping.#ctor">
+            <summary>
+            Construct an empty mapping.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlBackendTypeMapping.#ctor(NpgsqlTypes.NpgsqlBackendTypeMapping)">
+            <summary>
+            Copy constuctor.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlBackendTypeMapping.AddType(NpgsqlTypes.NpgsqlBackendTypeInfo)">
+            <summary>
+            Add the given NpgsqlBackendTypeInfo to this mapping.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlBackendTypeMapping.AddType(System.Int32,System.String,NpgsqlTypes.NpgsqlDbType,System.Data.DbType,System.Type,NpgsqlTypes.ConvertBackendToNativeHandler)">
+            <summary>
+            Add a new NpgsqlBackendTypeInfo with the given attributes and conversion handlers to this mapping.
+            </summary>
+            <param name="OID">Type OID provided by the backend server.</param>
+            <param name="Name">Type name provided by the backend server.</param>
+            <param name="NpgsqlDbType">NpgsqlDbType</param>
+            <param name="Type">System type to convert fields of this type to.</param>
+            <param name="BackendConvert">Data conversion handler.</param>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlBackendTypeMapping.Clone">
+            <summary>
+            Make a shallow copy of this type mapping.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlBackendTypeMapping.ContainsOID(System.Int32)">
+            <summary>
+            Determine if a NpgsqlBackendTypeInfo with the given backend type OID exists in this mapping.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlBackendTypeMapping.ContainsName(System.String)">
+            <summary>
+            Determine if a NpgsqlBackendTypeInfo with the given backend type name exists in this mapping.
+            </summary>
+        </member>
+        <member name="P:NpgsqlTypes.NpgsqlBackendTypeMapping.Count">
+            <summary>
+            Get the number of type infos held.
+            </summary>
+        </member>
+        <member name="P:NpgsqlTypes.NpgsqlBackendTypeMapping.Item(System.Int32)">
+            <summary>
+            Retrieve the NpgsqlBackendTypeInfo with the given backend type OID, or null if none found.
+            </summary>
+        </member>
+        <member name="P:NpgsqlTypes.NpgsqlBackendTypeMapping.Item(System.String)">
+            <summary>
+            Retrieve the NpgsqlBackendTypeInfo with the given backend type name, or null if none found.
+            </summary>
+        </member>
+        <member name="T:NpgsqlTypes.NpgsqlNativeTypeMapping">
+            <summary>
+            Provide mapping between type Type, NpgsqlDbType and a NpgsqlNativeTypeInfo object that represents it.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlNativeTypeMapping.AddType(NpgsqlTypes.NpgsqlNativeTypeInfo)">
+            <summary>
+            Add the given NpgsqlNativeTypeInfo to this mapping.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlNativeTypeMapping.AddType(System.String,NpgsqlTypes.NpgsqlDbType,System.Data.DbType,System.Boolean,NpgsqlTypes.ConvertNativeToBackendHandler)">
+            <summary>
+            Add a new NpgsqlNativeTypeInfo with the given attributes and conversion handlers to this mapping.
+            </summary>
+            <param name="Name">Type name provided by the backend server.</param>
+            <param name="NpgsqlDbType">NpgsqlDbType</param>
+            <param name="NativeConvert">Data conversion handler.</param>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlNativeTypeMapping.TryGetValue(NpgsqlTypes.NpgsqlDbType,NpgsqlTypes.NpgsqlNativeTypeInfo@)">
+            <summary>
+            Retrieve the NpgsqlNativeTypeInfo with the given NpgsqlDbType.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlNativeTypeMapping.TryGetValue(System.Data.DbType,NpgsqlTypes.NpgsqlNativeTypeInfo@)">
+            <summary>
+            Retrieve the NpgsqlNativeTypeInfo with the given DbType.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlNativeTypeMapping.TryGetValue(System.Type,NpgsqlTypes.NpgsqlNativeTypeInfo@)">
+            <summary>
+            Retrieve the NpgsqlNativeTypeInfo with the given Type.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlNativeTypeMapping.ContainsName(System.String)">
+            <summary>
+            Determine if a NpgsqlNativeTypeInfo with the given backend type name exists in this mapping.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlNativeTypeMapping.ContainsNpgsqlDbType(NpgsqlTypes.NpgsqlDbType)">
+            <summary>
+            Determine if a NpgsqlNativeTypeInfo with the given NpgsqlDbType exists in this mapping.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlNativeTypeMapping.ContainsType(System.Type)">
+            <summary>
+            Determine if a NpgsqlNativeTypeInfo with the given Type name exists in this mapping.
+            </summary>
+        </member>
+        <member name="P:NpgsqlTypes.NpgsqlNativeTypeMapping.Count">
+            <summary>
+            Get the number of type infos held.
+            </summary>
+        </member>
+        <member name="T:Npgsql.StringRowReaderV3">
+            <summary>
+            Implements <see cref="T:Npgsql.RowReader"/> for version 3 of the protocol.
+            </summary>
+        </member>
+        <member name="T:Npgsql.RowReader">
+            <summary>
+            Reads a row, field by field, allowing a DataRow to be built appropriately.
+            </summary>
+        </member>
+        <member name="T:Npgsql.RowReader.Streamer">
+            <summary>
+            Reads part of a field, as needed (for <see cref="!:System.Data.IDataRecord.GetChars()"/>
+            and <see cref="!:System.Data.IDataRecord.GetBytes()"/>
+            </summary>
+        </member>
+        <member name="T:Npgsql.RowReader.Streamer`1">
+            <summary>
+            Adds further functionality to stream that is dependant upon the type of data read.
+            </summary>
+        </member>
+        <member name="T:Npgsql.RowReader.CharStreamer">
+            <summary>
+            Completes the implementation of Streamer for char data.
+            </summary>
+        </member>
+        <member name="T:Npgsql.RowReader.ByteStreamer">
+            <summary>
+            Completes the implementation of Streamer for byte data.
+            </summary>
+        </member>
+        <member name="T:Npgsql.StringRowReaderV2">
+            <summary>
+            Implements <see cref="T:Npgsql.RowReader"/> for version 2 of the protocol.
+            </summary>
+        </member>
+        <member name="T:Npgsql.StringRowReaderV2.NullMap">
+            <summary>
+            Encapsulates the null mapping bytes sent at the start of a version 2
+            datarow message, and the process of identifying the nullity of the data
+            at a particular index
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlSchema">
+            <summary>
+            Provides the underlying mechanism for reading schema information.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlSchema.#ctor(Npgsql.NpgsqlConnection)">
+            <summary>
+            Creates an NpgsqlSchema that can read schema information from the database.
+            </summary>
+            <param name="connection">An open database connection for reading metadata.</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlSchema.GetMetaDataCollections">
+            <summary>
+            Returns the MetaDataCollections that lists all possible collections.
+            </summary>
+            <returns>The MetaDataCollections</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlSchema.GetRestrictions">
+            <summary>
+            Returns the Restrictions that contains the meaning and position of the values in the restrictions array.
+            </summary>
+            <returns>The Restrictions</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlSchema.GetDatabases(System.String[])">
+            <summary>
+            Returns the Databases that contains a list of all accessable databases.
+            </summary>
+            <param name="restrictions">The restrictions to filter the collection.</param>
+            <returns>The Databases</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlSchema.GetTables(System.String[])">
+            <summary>
+            Returns the Tables that contains table and view names and the database and schema they come from.
+            </summary>
+            <param name="restrictions">The restrictions to filter the collection.</param>
+            <returns>The Tables</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlSchema.GetColumns(System.String[])">
+            <summary>
+            Returns the Columns that contains information about columns in tables. 
+            </summary>
+            <param name="restrictions">The restrictions to filter the collection.</param>
+            <returns>The Columns.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlSchema.GetViews(System.String[])">
+            <summary>
+            Returns the Views that contains view names and the database and schema they come from.
+            </summary>
+            <param name="restrictions">The restrictions to filter the collection.</param>
+            <returns>The Views</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlSchema.GetUsers(System.String[])">
+            <summary>
+            Returns the Users containing user names and the sysid of those users.
+            </summary>
+            <param name="restrictions">The restrictions to filter the collection.</param>
+            <returns>The Users.</returns>
+        </member>
+        <member name="T:Npgsql.NpgsqlRow">
+            <summary>
+            This is the abstract base class for NpgsqlAsciiRow and NpgsqlBinaryRow.
+            </summary>
+        </member>
+        <member name="T:NpgsqlTypes.BitString">
+            <summary>
+            <para>Implements a bit string; a collection of zero or more bits which can each be 1 or 0.</para>
+            <para>BitString's behave as a list of bools, though like most strings and unlike most collections the position
+            tends to be of as much significance as the value.</para>
+            <para>BitStrings are often used as masks, and are commonly cast to and from other values.</para>
+            </summary>
+        </member>
+        <member name="F:NpgsqlTypes.BitString.Empty">
+            <summary>
+            Represents the empty string.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.#ctor(System.Collections.Generic.IEnumerable{System.Boolean})">
+            <summary>
+            Create a BitString from an enumeration of boolean values. The BitString will contain
+            those booleans in the order they came in.
+            </summary>
+            <param name="bits">The boolean values.</param>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.#ctor(System.Boolean,System.Int32)">
+            <summary>
+            Creates a BitString filled with a given number of true or false values.
+            </summary>
+            <param name="value">The value to fill the string with.</param>
+            <param name="count">The number of bits to fill.</param>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.#ctor(System.String)">
+            <summary>
+            Creats a bitstring from a <see cref="T:System.String">string</see>.
+            <param name="str">The <see cref="T:System.String">string to copy from</see>.</param>
+            <seealso cref="!:Npgsql.BitString.Parse(System.String)"/>
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.#ctor(System.Boolean)">
+            <summary>
+            Creates a single-bit element from a boolean value.
+            </summary>
+            <param name="boolean">The <see cref="T:System.Boolean">bool</see> value which determines whether
+            the bit is 1 or 0.</param>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.#ctor(System.UInt32)">
+            <summary>
+            Creates a bitstring from an unsigned integer value. The string will be the shortest required to
+            contain the integer (e.g. 1 bit for 0 or 1, 2 for 2 or 3, 3 for 4-7, and so on).
+            </summary>
+            <param name="integer">The <see cref="T:System.UInt32">integer</see>.</param>
+            <remarks>This method is not CLS Compliant, and may not be available to some languages.</remarks>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.#ctor(System.Int32)">
+            <summary>
+            Creates a bitstring from an integer value. The string will be the shortest required to
+            contain the integer (e.g. 1 bit for 0 or 1, 2 for 2 or 3, 3 for 4-7, and so on).
+            </summary>
+            <param name="integer">The <see cref="T:System.Int32">integer</see>.</param>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.IndexOf(System.Boolean)">
+            <summary>
+            Finds the first instance of a given value
+            </summary>
+            <param name="item">The value - whether true or false - to search for.</param>
+            <returns>The index of the value found, or -1 if none are present.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.Contains(System.Boolean)">
+            <summary>
+            True if there is at least one bit with the value looked for.
+            </summary>
+            <param name="item">The value - true or false - to detect.</param>
+            <returns>True if at least one bit was the same as item, false otherwise.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.CopyTo(System.Boolean[],System.Int32)">
+            <summary>
+            Copies the bitstring to an array of bools.
+            </summary>
+            <param name="array">The <see cref="T:System.Boolean">boolean</see> array to copy to.</param>
+            <param name="arrayIndex">The index in the array to start copying from.</param>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.GetEnumerator">
+            <summary>
+            Returns an enumerator that enumerates through the string.
+            </summary>
+            <returns>The enumerator.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.Concat(NpgsqlTypes.BitString)">
+            <summary>
+            Creats a bitstring by concatenating another onto this one.
+            </summary>
+            <param name="append">The string to append to this one.</param>
+            <returns>The combined strings.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.Substring(System.Int32,System.Int32)">
+            <summary>
+            Returns a substring of this string.
+            </summary>
+            <param name="start">The position to start from, must be between 0 and the length of the string.</param>
+            <param name="length">The length of the string to return, must be greater than zero, and may not be
+            so large that the start + length exceeds the bounds of this instance.</param>
+            <returns>The Bitstring identified</returns>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.Substring(System.Int32)">
+            <summary>
+            Returns a substring of this string.
+            </summary>
+            <param name="start">The position to start from, must be between 0 and the length of the string,
+            the rest of the string is returned.</param>
+            <returns>The Bitstring identified</returns>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.And(NpgsqlTypes.BitString)">
+            <summary>
+            A logical and between this string and another. The two strings must be the same length.
+            </summary>
+            <param name="operand">Another BitString to AND with this one.</param>
+            <returns>A bitstring with 1 where both BitStrings had 1 and 0 otherwise.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.Or(NpgsqlTypes.BitString)">
+            <summary>
+            A logical or between this string and another. The two strings must be the same length.
+            </summary>
+            <param name="operand">Another BitString to OR with this one.</param>
+            <returns>A bitstring with 1 where either BitString had 1 and 0 otherwise.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.Xor(NpgsqlTypes.BitString)">
+            <summary>
+            A logical xor between this string and another. The two strings must be the same length.
+            </summary>
+            <param name="operand">Another BitString to XOR with this one.</param>
+            <returns>A bitstring with 1 where one BitStrings and the other had 0,
+            and 0 where they both had 1 or both had 0.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.Not">
+            <summary>
+            A bitstring that is the logical inverse of this one.
+            </summary>
+            <returns>A bitstring of the same length as this with 1 where this has 0 and vice-versa.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.LShift(System.Int32)">
+            <summary>
+            Shifts the string operand bits to the left, filling with zeros to produce a
+            string of the same length.
+            </summary>
+            <param name="operand">The number of bits to shift to the left.</param>
+            <returns>A left-shifted bitstring.</returns>
+            <remarks><para>The behaviour of LShift is closer to what one would expect from dealing
+            with PostgreSQL bit-strings than in using the same operations on integers in .NET</para>
+            <para>In particular, negative operands result in a right-shift, and operands greater than
+            the length of the string will shift it entirely, resulting in a zero-filled string.</para>
+            </remarks>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.RShift(System.Int32)">
+            <summary>
+            Shifts the string operand bits to the right, filling with zeros to produce a
+            string of the same length.
+            </summary>
+            <param name="operand">The number of bits to shift to the right.</param>
+            <returns>A right-shifted bitstring.</returns>
+            <remarks><para>The behaviour of RShift is closer to what one would expect from dealing
+            with PostgreSQL bit-strings than in using the same operations on integers in .NET</para>
+            <para>In particular, negative operands result in a left-shift, and operands greater than
+            the length of the string will shift it entirely, resulting in a zero-filled string. It also performs
+            a logical shift, rather than an arithmetic shift, so it always sets the vacated bit positions to zero
+            (like PostgreSQL and like .NET for unsigned integers but not for signed integers).</para>
+            </remarks>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.Equals(NpgsqlTypes.BitString)">
+            <summary>
+            Returns true if the this string is identical to the argument passed.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.CompareTo(NpgsqlTypes.BitString)">
+            <summary>
+            Compares two strings. Strings are compared as strings, so while 0 being less than 1 will
+            mean a comparison between two strings of the same size is the same as treating them as numbers,
+            in the case of two strings of differing lengths the comparison starts at the right-most (most significant)
+            bit, and if all bits of the shorter string are exhausted without finding a comparison, then the larger
+            string is deemed to be greater than the shorter (0010 is greater than 0001 but less than 00100).
+            </summary>
+            <param name="other">Another string to compare with this one.</param>
+            <returns>A value if the two strings are identical, an integer less
+            than zero if this is less than the argument, and an integer greater
+            than zero otherwise.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.CompareTo(System.Object)">
+            <summary>
+            Compares the string with another object.
+            </summary>
+            <param name="obj">The object to compare with.</param>
+            <returns>If the object is null then this string is considered greater. If the object is another BitString
+            then they are compared as in <see cref="!:CompareTo(Npgsql.BitString)">the explicit comparison for BitStrings</see>
+            in any other case a <see cref="T:System.ArgumentException"/> is thrown.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.Equals(System.Object)">
+            <summary>
+            Compares this BitString with an object for equality.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.GetHashCode">
+            <summary>
+            Returns a code for use in hashing operations.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.ToString(System.String)">
+            <summary>
+            Returns a string representation of the BitString.
+            </summary>
+            <param name="format">
+            A string which can contain a letter and optionally a number which sets a minimum size for the string
+            returned. In each case using the lower-case form of the letter will result in a lower-case string
+            being returned.
+            <list type="table">
+            <item>
+            <term>B</term>
+            <description>A string of 1s and 0s.</description>
+            </item>
+            <item>
+            <term>X</term>
+            <description>An hexadecimal string (will result in an error unless the string's length is divisible by 4).</description>
+            </item>
+            <item>
+            <term>G</term>
+            <description>A string of 1s and 0s in single-quotes preceded by 'B' (Postgres bit string literal syntax).</description>
+            </item>
+            <term>Y</term>
+            <description>An hexadecimal string in single-quotes preceded by 'X' (Postgres bit literal syntax, will result in an error unless the string's length is divisible by 4.</description>
+            </list>
+            <term>C</term>
+            <description>The format produced by format-string "Y" if legal, otherwise that produced by format-string "G".</description>
+            <term>E</term>
+            <description>The most compact safe representation for Postgres. If single bit will be either a 0 or a 1. Otherwise if it
+            can be that produce by format string "Y" it will, otherwise if there are less than 9bits in length it will be that
+            produced by format-string "G". For longer strings that cannot be represented in hexadecimal it will be a string
+            representing the first part of the string in format "Y" followed by the PostgreSQL concatenation operator, followed
+            by the final bits in the format "G". E.g. "X'13DCE'||B'110'"</description>
+            If format is empty or null, it is treated as if "B" had been passed (the default repreesentation, and that
+            generally used by PostgreSQL for display).
+            </param>
+            <returns>The formatted string.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.ToString">
+            <summary>
+            Returns a string representation for the Bitstring
+            </summary>
+            <returns>A string containing '0' and '1' characters.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.ToString(System.String,System.IFormatProvider)">
+            <summary>
+            Returns the same string as <see cref="M:NpgsqlTypes.BitString.ToString(System.String)"/>. formatProvider is ignored.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.Parse(System.String)">
+            <summary>
+            Parses a string to produce a BitString. Most formats that can be produced by
+            <see cref="M:NpgsqlTypes.BitString.ToString(System.String)"/> can be accepted, but hexadecimal
+            can be interpreted with the preceding X' to mark the following characters as
+            being hexadecimal rather than binary.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.op_BitwiseAnd(NpgsqlTypes.BitString,NpgsqlTypes.BitString)">
+            <summary>
+            Performs a logical AND on the two operands.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.op_BitwiseOr(NpgsqlTypes.BitString,NpgsqlTypes.BitString)">
+            <summary>
+            Performs a logcial OR on the two operands.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.op_ExclusiveOr(NpgsqlTypes.BitString,NpgsqlTypes.BitString)">
+            <summary>
+            Perofrms a logical EXCLUSIVE-OR on the two operands
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.op_OnesComplement(NpgsqlTypes.BitString)">
+            <summary>
+            Performs a logical NOT on the operand.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.op_Addition(NpgsqlTypes.BitString,NpgsqlTypes.BitString)">
+            <summary>
+            Concatenates the operands.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.op_LeftShift(NpgsqlTypes.BitString,System.Int32)">
+            <summary>
+            Left-shifts the string BitString.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.op_RightShift(NpgsqlTypes.BitString,System.Int32)">
+            <summary>
+            Right-shifts the string BitString.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.op_Equality(NpgsqlTypes.BitString,NpgsqlTypes.BitString)">
+            <summary>
+            Compares the two operands.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.op_Inequality(NpgsqlTypes.BitString,NpgsqlTypes.BitString)">
+            <summary>
+            Compares the two operands.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.op_LessThan(NpgsqlTypes.BitString,NpgsqlTypes.BitString)">
+            <summary>
+            Compares the two operands.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.op_GreaterThan(NpgsqlTypes.BitString,NpgsqlTypes.BitString)">
+            <summary>
+            Compares the two operands.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.op_LessThanOrEqual(NpgsqlTypes.BitString,NpgsqlTypes.BitString)">
+            <summary>
+            Compares the two operands.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.op_GreaterThanOrEqual(NpgsqlTypes.BitString,NpgsqlTypes.BitString)">
+            <summary>
+            Compares the two operands.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.ToString(System.Text.Encoding)">
+            <summary>
+            Interprets the bitstring as a series of bits in an encoded character string,
+            encoded according to the Encoding passed, and returns that string.
+            The bitstring must contain a whole number of octets(bytes) and also be
+            valid according to the Encoding passed.
+            </summary>
+            <param name="encoding">The <see cref="T:System.Text.Encoding"/> to use in producing the string.</param>
+            <returns>The string that was encoded in the BitString.</returns>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.ToByteEnumerable">
+            <summary>
+            Interprets the bitstring as a series of octets (bytes) and returns those octets. Fails
+            if the Bitstring does not contain a whole number of octets (its length is not evenly
+            divisible by 8).
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.ToSByteEnumerable">
+            <summary>
+            Interprets the bitstring as a series of signed octets (bytes) and returns those octets. Fails
+            if the Bitstring does not contain a whole number of octets (its length is not evenly
+            divisible by 8).
+            <remarks>This method is not CLS-Compliant and may not be available to languages that cannot
+            handle signed bytes.</remarks>
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.ToUInt16Enumerable">
+            <summary>
+            Interprets the bitstring as a series of unsigned 16-bit integers and returns those integers.
+            Fails if the Bitstring's length is not evenly divisible by 16.
+            <remarks>This method is not CLS-Compliant and may not be available to languages that cannot
+            handle unsigned integers.</remarks>
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.ToInt16Enumerable">
+            <summary>
+            Interprets the bitstring as a series of 16-bit integers and returns those integers.
+            Fails if the Bitstring's length is not evenly divisible by 16.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.ToUInt32Enumerable">
+            <summary>
+            Interprets the bitstring as a series of unsigned 32-bit integers and returns those integers.
+            Fails if the Bitstring's length is not evenly divisible by 32.
+            <remarks>This method is not CLS-Compliant and may not be available to languages that cannot
+            handle unsigned integers.</remarks>
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.ToInt32Enumerable">
+            <summary>
+            Interprets the bitstring as a series of signed 32-bit integers and returns those integers.
+            Fails if the Bitstring's length is not evenly divisible by 32.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.ToUInt64Enumerable">
+            <summary>
+            Interprets the bitstring as a series of unsigned 64-bit integers and returns those integers.
+            Fails if the Bitstring's length is not evenly divisible by 64.
+            <remarks>This method is not CLS-Compliant and may not be available to languages that cannot
+            handle unsigned integers.</remarks>
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.BitString.ToInt64Enumerable">
+            <summary>
+            Interprets the bitstring as a series of signed 64-bit integers and returns those integers.
+            Fails if the Bitstring's length is not evenly divisible by 64.
+            </summary>
+        </member>
+        <member name="P:NpgsqlTypes.BitString.Length">
+            <summary>
+            The length of the string.
+            </summary>
+        </member>
+        <member name="P:NpgsqlTypes.BitString.Item(System.Int32)">
+            <summary>
+            Retrieves the value of the bit at the given index.
+            </summary>
+        </member>
+        <member name="T:Npgsql.MD5CryptoServiceProvider">
+            <summary>
+            C# implementation of the MD5 cryptographic hash function.
+            </summary>
+        </member>
+        <member name="M:Npgsql.MD5CryptoServiceProvider.#ctor">
+            <summary>
+            Creates a new MD5CryptoServiceProvider.
+            </summary>
+        </member>
+        <member name="M:Npgsql.MD5CryptoServiceProvider.HashCore(System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            Drives the hashing function.
+            </summary>
+            <param name="rgb">Byte array containing the data to hash.</param>
+            <param name="start">Where in the input buffer to start.</param>
+            <param name="size">Size in bytes of the data in the buffer to hash.</param>
+        </member>
+        <member name="M:Npgsql.MD5CryptoServiceProvider.HashFinal">
+            <summary>
+            This finalizes the hash.  Takes the data from the chaining variables and returns it.
+            </summary>
+        </member>
+        <member name="M:Npgsql.MD5CryptoServiceProvider.Initialize">
+            <summary>
+            Resets the class after use.  Called automatically after hashing is done.
+            </summary>
+        </member>
+        <member name="M:Npgsql.MD5CryptoServiceProvider.ProcessBlock(System.Byte[],System.Int32)">
+            <summary>
+            This is the meat of the hash function.  It is what processes each block one at a time.
+            </summary>
+            <param name="inputBuffer">Byte array to process data from.</param>
+            <param name="inputOffset">Where in the byte array to start processing.</param>
+        </member>
+        <member name="M:Npgsql.MD5CryptoServiceProvider.ProcessFinalBlock(System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            Pads and then processes the final block.
+            </summary>
+            <param name="inputBuffer">Buffer to grab data from.</param>
+            <param name="inputOffset">Position in buffer in bytes to get data from.</param>
+            <param name="inputCount">How much data in bytes in the buffer to use.</param>
+        </member>
+        <member name="T:Npgsql.NpgsqlCopyInStream">
+            <summary>
+            Stream for writing data to a table on a PostgreSQL version 7.4 or newer database during an active COPY FROM STDIN operation.
+            <b>Passes data exactly as is and when given</b>, so see to it that you use server encoding, correct format and reasonably sized writes!
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyInStream.#ctor(Npgsql.NpgsqlConnector)">
+            <summary>
+            Created only by NpgsqlCopyInState.StartCopy()
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyInStream.Close">
+            <summary>
+            Successfully completes copying data to server. Returns after operation is finished.
+            Does nothing if this stream is not the active copy operation writer.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyInStream.Cancel(System.String)">
+            <summary>
+            Withdraws an already started copy operation. The operation will fail with given error message.
+            Does nothing if this stream is not the active copy operation writer.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyInStream.Write(System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            Writes given bytes to server.
+            Fails if this stream is not the active copy operation writer.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyInStream.Flush">
+            <summary>
+            Flushes stream contents to server.
+            Fails if this stream is not the active copy operation writer.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyInStream.Read(System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            Not readable
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyInStream.Seek(System.Int64,System.IO.SeekOrigin)">
+            <summary>
+            Not seekable
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyInStream.SetLength(System.Int64)">
+            <summary>
+            Not supported
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyInStream.IsActive">
+            <summary>
+            True while this stream can be used to write copy data to server
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyInStream.CanRead">
+            <summary>
+            False
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyInStream.CanWrite">
+            <summary>
+            True
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyInStream.CanSeek">
+            <summary>
+            False
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyInStream.Length">
+            <summary>
+            Number of bytes written so far
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyInStream.Position">
+            <summary>
+            Number of bytes written so far; not settable
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlCommand">
+            <summary>
+            Represents a SQL statement or function (stored procedure) to execute
+            against a PostgreSQL database. This class cannot be inherited.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Npgsql.NpgsqlCommand">NpgsqlCommand</see> class.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Npgsql.NpgsqlCommand">NpgsqlCommand</see> class with the text of the query.
+            </summary>
+            <param name="cmdText">The text of the query.</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.#ctor(System.String,Npgsql.NpgsqlConnection)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Npgsql.NpgsqlCommand">NpgsqlCommand</see> class with the text of the query and a <see cref="T:Npgsql.NpgsqlConnection">NpgsqlConnection</see>.
+            </summary>
+            <param name="cmdText">The text of the query.</param>
+            <param name="connection">A <see cref="T:Npgsql.NpgsqlConnection">NpgsqlConnection</see> that represents the connection to a PostgreSQL server.</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.#ctor(System.String,Npgsql.NpgsqlConnection,Npgsql.NpgsqlTransaction)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Npgsql.NpgsqlCommand">NpgsqlCommand</see> class with the text of the query, a <see cref="T:Npgsql.NpgsqlConnection">NpgsqlConnection</see>, and the <see cref="T:Npgsql.NpgsqlTransaction">NpgsqlTransaction</see>.
+            </summary>
+            <param name="cmdText">The text of the query.</param>
+            <param name="connection">A <see cref="T:Npgsql.NpgsqlConnection">NpgsqlConnection</see> that represents the connection to a PostgreSQL server.</param>
+            <param name="transaction">The <see cref="T:Npgsql.NpgsqlTransaction">NpgsqlTransaction</see> in which the <see cref="T:Npgsql.NpgsqlCommand">NpgsqlCommand</see> executes.</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.#ctor(System.String,Npgsql.NpgsqlConnector)">
+            <summary>
+            Used to execute internal commands.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.Cancel">
+            <summary>
+            Attempts to cancel the execution of a <see cref="T:Npgsql.NpgsqlCommand">NpgsqlCommand</see>.
+            </summary>
+            <remarks>This Method isn't implemented yet.</remarks>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.System#ICloneable#Clone">
+            <summary>
+            Create a new command based on this one.
+            </summary>
+            <returns>A new NpgsqlCommand object.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.Clone">
+            <summary>
+            Create a new command based on this one.
+            </summary>
+            <returns>A new NpgsqlCommand object.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.CreateDbParameter">
+            <summary>
+            Creates a new instance of an <see cref="T:System.Data.Common.DbParameter">DbParameter</see> object.
+            </summary>
+            <returns>An <see cref="T:System.Data.Common.DbParameter">DbParameter</see> object.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.CreateParameter">
+            <summary>
+            Creates a new instance of a <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> object.
+            </summary>
+            <returns>A <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> object.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.ExecuteBlind">
+            <summary>
+            Slightly optimised version of ExecuteNonQuery() for internal ues in cases where the number
+            of affected rows is of no interest.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.ExecuteNonQuery">
+            <summary>
+            Executes a SQL statement against the connection and returns the number of rows affected.
+            </summary>
+            <returns>The number of rows affected if known; -1 otherwise.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.ExecuteDbDataReader(System.Data.CommandBehavior)">
+            <summary>
+            Sends the <see cref="P:Npgsql.NpgsqlCommand.CommandText">CommandText</see> to
+            the <see cref="T:Npgsql.NpgsqlConnection">Connection</see> and builds a
+            <see cref="T:Npgsql.NpgsqlDataReader">NpgsqlDataReader</see>
+            using one of the <see cref="T:System.Data.CommandBehavior">CommandBehavior</see> values.
+            </summary>
+            <param name="behavior">One of the <see cref="T:System.Data.CommandBehavior">CommandBehavior</see> values.</param>
+            <returns>A <see cref="T:Npgsql.NpgsqlDataReader">NpgsqlDataReader</see> object.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.ExecuteReader">
+            <summary>
+            Sends the <see cref="P:Npgsql.NpgsqlCommand.CommandText">CommandText</see> to
+            the <see cref="T:Npgsql.NpgsqlConnection">Connection</see> and builds a
+            <see cref="T:Npgsql.NpgsqlDataReader">NpgsqlDataReader</see>.
+            </summary>
+            <returns>A <see cref="T:Npgsql.NpgsqlDataReader">NpgsqlDataReader</see> object.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.ExecuteReader(System.Data.CommandBehavior)">
+            <summary>
+            Sends the <see cref="P:Npgsql.NpgsqlCommand.CommandText">CommandText</see> to
+            the <see cref="T:Npgsql.NpgsqlConnection">Connection</see> and builds a
+            <see cref="T:Npgsql.NpgsqlDataReader">NpgsqlDataReader</see>
+            using one of the <see cref="T:System.Data.CommandBehavior">CommandBehavior</see> values.
+            </summary>
+            <param name="cb">One of the <see cref="T:System.Data.CommandBehavior">CommandBehavior</see> values.</param>
+            <returns>A <see cref="T:Npgsql.NpgsqlDataReader">NpgsqlDataReader</see> object.</returns>
+            <remarks>Currently the CommandBehavior parameter is ignored.</remarks>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.BindParameters">
+            <summary>
+             This method binds the parameters from parameters collection to the bind
+             message.
+             </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.ExecuteScalar">
+            <summary>
+            Executes the query, and returns the first column of the first row
+            in the result set returned by the query. Extra columns or rows are ignored.
+            </summary>
+            <returns>The first column of the first row in the result set,
+            or a null reference if the result set is empty.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.Prepare">
+            <summary>
+            Creates a prepared version of the command on a PostgreSQL server.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.CheckConnectionState">
+            <summary>
+             This method checks the connection state to see if the connection
+             is set or it is open. If one of this conditions is not met, throws
+             an InvalidOperationException
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCommand.GetCommandText">
+            <summary>
+            This method substitutes the <see cref="P:Npgsql.NpgsqlCommand.Parameters">Parameters</see>, if exist, in the command
+            to their actual values.
+            The parameter name format is <b>:ParameterName</b>.
+            </summary>
+            <returns>A version of <see cref="P:Npgsql.NpgsqlCommand.CommandText">CommandText</see> with the <see cref="P:Npgsql.NpgsqlCommand.Parameters">Parameters</see> inserted.</returns>
+        </member>
+        <member name="P:Npgsql.NpgsqlCommand.CommandText">
+            <summary>
+            Gets or sets the SQL statement or function (stored procedure) to execute at the data source.
+            </summary>
+            <value>The Transact-SQL statement or stored procedure to execute. The default is an empty string.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlCommand.CommandTimeout">
+            <summary>
+            Gets or sets the wait time before terminating the attempt
+            to execute a command and generating an error.
+            </summary>
+            <value>The time (in seconds) to wait for the command to execute.
+            The default is 20 seconds.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlCommand.CommandType">
+            <summary>
+            Gets or sets a value indicating how the
+            <see cref="P:Npgsql.NpgsqlCommand.CommandText">CommandText</see> property is to be interpreted.
+            </summary>
+            <value>One of the <see cref="T:System.Data.CommandType">CommandType</see> values. The default is <see cref="T:System.Data.CommandType">CommandType.Text</see>.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlCommand.Connection">
+            <summary>
+            Gets or sets the <see cref="T:Npgsql.NpgsqlConnection">NpgsqlConnection</see>
+            used by this instance of the <see cref="T:Npgsql.NpgsqlCommand">NpgsqlCommand</see>.
+            </summary>
+            <value>The connection to a data source. The default value is a null reference.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlCommand.Parameters">
+            <summary>
+            Gets the <see cref="T:Npgsql.NpgsqlParameterCollection">NpgsqlParameterCollection</see>.
+            </summary>
+            <value>The parameters of the SQL statement or function (stored procedure). The default is an empty collection.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlCommand.Transaction">
+            <summary>
+            Gets or sets the <see cref="T:Npgsql.NpgsqlTransaction">NpgsqlTransaction</see>
+            within which the <see cref="T:Npgsql.NpgsqlCommand">NpgsqlCommand</see> executes.
+            </summary>
+            <value>The <see cref="T:Npgsql.NpgsqlTransaction">NpgsqlTransaction</see>.
+            The default value is a null reference.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlCommand.UpdatedRowSource">
+            <summary>
+            Gets or sets how command results are applied to the <see cref="T:System.Data.DataRow">DataRow</see>
+            when used by the <see cref="M:System.Data.Common.DbDataAdapter.Update(System.Data.DataSet)">Update</see>
+            method of the <see cref="T:System.Data.Common.DbDataAdapter">DbDataAdapter</see>.
+            </summary>
+            <value>One of the <see cref="T:System.Data.UpdateRowSource">UpdateRowSource</see> values.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlCommand.LastInsertedOID">
+            <summary>
+            Returns oid of inserted row. This is only updated when using executenonQuery and when command inserts just a single row. If table is created without oids, this will always be 0.
+            </summary>
+        </member>
+        <member name="T:Npgsql.NpgsqlParameterCollection">
+            <summary>
+            Represents a collection of parameters relevant to a <see cref="T:Npgsql.NpgsqlCommand">NpgsqlCommand</see>
+            as well as their respective mappings to columns in a <see cref="T:System.Data.DataSet">DataSet</see>.
+            This class cannot be inherited.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.#ctor">
+            <summary>
+            Initializes a new instance of the NpgsqlParameterCollection class.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.Add(Npgsql.NpgsqlParameter)">
+            <summary>
+            Adds the specified <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> object to the <see cref="T:Npgsql.NpgsqlParameterCollection">NpgsqlParameterCollection</see>.
+            </summary>
+            <param name="value">The <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> to add to the collection.</param>
+            <returns>The index of the new <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> object.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.Add(System.String,System.Object)">
+            <summary>
+            Adds a <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> to the <see cref="T:Npgsql.NpgsqlParameterCollection">NpgsqlParameterCollection</see> given the specified parameter name and value.
+            </summary>
+            <param name="parameterName">The name of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see>.</param>
+            <param name="value">The Value of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> to add to the collection.</param>
+            <returns>The index of the new <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> object.</returns>
+            <remarks>
+            Use caution when using this overload of the
+            <b>Add</b> method to specify integer parameter values.
+            Because this overload takes a <i>value</i> of type Object,
+            you must convert the integral value to an <b>Object</b>
+            type when the value is zero, as the following C# example demonstrates.
+            <code>parameters.Add(":pname", Convert.ToInt32(0));</code>
+            If you do not perform this conversion, the compiler will assume you
+            are attempting to call the NpgsqlParameterCollection.Add(string, DbType) overload.
+            </remarks>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.Add(System.String,NpgsqlTypes.NpgsqlDbType)">
+            <summary>
+            Adds a <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> to the <see cref="T:Npgsql.NpgsqlParameterCollection">NpgsqlParameterCollection</see> given the parameter name and the data type.
+            </summary>
+            <param name="parameterName">The name of the parameter.</param>
+            <param name="parameterType">One of the DbType values.</param>
+            <returns>The index of the new <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> object.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.Add(System.String,NpgsqlTypes.NpgsqlDbType,System.Int32)">
+            <summary>
+            Adds a <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> to the <see cref="T:Npgsql.NpgsqlParameterCollection">NpgsqlParameterCollection</see> with the parameter name, the data type, and the column length.
+            </summary>
+            <param name="parameterName">The name of the parameter.</param>
+            <param name="parameterType">One of the DbType values.</param>
+            <param name="size">The length of the column.</param>
+            <returns>The index of the new <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> object.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.Add(System.String,NpgsqlTypes.NpgsqlDbType,System.Int32,System.String)">
+            <summary>
+            Adds a <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> to the <see cref="T:Npgsql.NpgsqlParameterCollection">NpgsqlParameterCollection</see> with the parameter name, the data type, the column length, and the source column name.
+            </summary>
+            <param name="parameterName">The name of the parameter.</param>
+            <param name="parameterType">One of the DbType values.</param>
+            <param name="size">The length of the column.</param>
+            <param name="sourceColumn">The name of the source column.</param>
+            <returns>The index of the new <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> object.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.RemoveAt(System.String)">
+            <summary>
+            Removes the specified <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> from the collection using the parameter name.
+            </summary>
+            <param name="parameterName">The name of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> object to retrieve.</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.Contains(System.String)">
+            <summary>
+            Gets a value indicating whether a <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> with the specified parameter name exists in the collection.
+            </summary>
+            <param name="parameterName">The name of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> object to find.</param>
+            <returns><b>true</b> if the collection contains the parameter; otherwise, <b>false</b>.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.IndexOf(System.String)">
+            <summary>
+            Gets the location of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> in the collection with a specific parameter name.
+            </summary>
+            <param name="parameterName">The name of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> object to find.</param>
+            <returns>The zero-based location of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> in the collection.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.RemoveAt(System.Int32)">
+            <summary>
+            Removes the specified <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> from the collection using a specific index.
+            </summary>
+            <param name="index">The zero-based index of the parameter.</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.Insert(System.Int32,System.Object)">
+            <summary>
+            Inserts a <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> into the collection at the specified index.
+            </summary>
+            <param name="index">The zero-based index where the parameter is to be inserted within the collection.</param>
+            <param name="value">The <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> to add to the collection.</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.Remove(System.Object)">
+            <summary>
+            Removes the specified <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> from the collection.
+            </summary>
+            <param name="value">The <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> to remove from the collection.</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.Contains(System.Object)">
+            <summary>
+            Gets a value indicating whether a <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> exists in the collection.
+            </summary>
+            <param name="value">The value of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> object to find.</param>
+            <returns>true if the collection contains the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> object; otherwise, false.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.TryGetValue(System.String,Npgsql.NpgsqlParameter@)">
+            <summary>
+            Gets a value indicating whether a <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> with the specified parameter name exists in the collection.
+            </summary>
+            <param name="parameterName">The name of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> object to find.</param>
+            <param name="parameter">A reference to the requested parameter is returned in this out param if it is found in the list.  This value is null if the parameter is not found.</param>
+            <returns><b>true</b> if the collection contains the parameter and param will contain the parameter; otherwise, <b>false</b>.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.Clear">
+            <summary>
+            Removes all items from the collection.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.IndexOf(System.Object)">
+            <summary>
+            Gets the location of a <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> in the collection.
+            </summary>
+            <param name="value">The value of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> object to find.</param>
+            <returns>The zero-based index of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> object in the collection.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.Add(System.Object)">
+            <summary>
+            Adds the specified <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> object to the <see cref="T:Npgsql.NpgsqlParameterCollection">NpgsqlParameterCollection</see>.
+            </summary>
+            <param name="value">The <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> to add to the collection.</param>
+            <returns>The zero-based index of the new <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> object.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.CopyTo(System.Array,System.Int32)">
+            <summary>
+            Copies <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> objects from the <see cref="T:Npgsql.NpgsqlParameterCollection">NpgsqlParameterCollection</see> to the specified array.
+            </summary>
+            <param name="array">An <see cref="T:System.Array">Array</see> to which to copy the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> objects in the collection.</param>
+            <param name="index">The starting index of the array.</param>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.GetEnumerator">
+            <summary>
+            Returns an enumerator that can iterate through the collection.
+            </summary>
+            <returns>An <see cref="T:System.Collections.IEnumerator">IEnumerator</see> that can be used to iterate through the collection.</returns>
+        </member>
+        <member name="M:Npgsql.NpgsqlParameterCollection.CheckType(System.Object)">
+            <summary>
+            In methods taking an object as argument this method is used to verify
+            that the argument has the type <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see>
+            </summary>
+            <param name="Object">The object to verify</param>
+        </member>
+        <member name="P:Npgsql.NpgsqlParameterCollection.Item(System.String)">
+            <summary>
+            Gets the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> with the specified name.
+            </summary>
+            <param name="parameterName">The name of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> to retrieve.</param>
+            <value>The <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> with the specified name, or a null reference if the parameter is not found.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlParameterCollection.Item(System.Int32)">
+            <summary>
+            Gets the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> at the specified index.
+            </summary>
+            <param name="index">The zero-based index of the <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> to retrieve.</param>
+            <value>The <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> at the specified index.</value>
+        </member>
+        <member name="P:Npgsql.NpgsqlParameterCollection.Count">
+            <summary>
+            Gets the number of <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> objects in the collection.
+            </summary>
+            <value>The number of <see cref="T:Npgsql.NpgsqlParameter">NpgsqlParameter</see> objects in the collection.</value>
+        </member>
+        <member name="T:Npgsql.NpgsqlCopyInState">
+            <summary>
+            Represents an ongoing COPY FROM STDIN operation.
+            Provides methods to push data to server and end or cancel the operation.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyInState.StartCopy(Npgsql.NpgsqlConnector,Npgsql.NpgsqlCopyFormat)">
+            <summary>
+            Called from NpgsqlState.ProcessBackendResponses upon CopyInResponse.
+            If CopyStream is already set, it is used to read data to push to server, after which the copy is completed.
+            Otherwise CopyStream is set to a writable NpgsqlCopyInStream that calls SendCopyData each time it is written to.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyInState.SendCopyData(Npgsql.NpgsqlConnector,System.Byte[],System.Int32,System.Int32)">
+            <summary>
+            Sends given packet to server as a CopyData message.
+            Does not check for notifications! Use another thread for that.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyInState.SendCopyDone(Npgsql.NpgsqlConnector)">
+            <summary>
+            Sends CopyDone message to server. Handles responses, ie. may throw an exception.
+            </summary>
+        </member>
+        <member name="M:Npgsql.NpgsqlCopyInState.SendCopyFail(Npgsql.NpgsqlConnector,System.String)">
+            <summary>
+            Sends CopyFail message to server. Handles responses, ie. should always throw an exception:
+            in CopyIn state the server responds to CopyFail with an error response;
+            outside of a CopyIn state the server responds to CopyFail with an error response;
+            without network connection or whatever, there's going to eventually be a failure, timeout or user intervention.
+            </summary>
+        </member>
+        <member name="P:Npgsql.NpgsqlCopyInState.CopyFormat">
+            <summary>
+            Copy format information returned from server.
+            </summary>
+        </member>
+        <member name="T:NpgsqlTypes.NpgsqlPoint">
+            <summary>
+            Represents a PostgreSQL Point type
+            </summary>
+        </member>
+        <member name="T:NpgsqlTypes.NpgsqlLSeg">
+            <summary>
+            Represents a PostgreSQL Line Segment type.
+            </summary>
+        </member>
+        <member name="T:NpgsqlTypes.NpgsqlPath">
+            <summary>
+            Represents a PostgreSQL Path type.
+            </summary>
+        </member>
+        <member name="T:NpgsqlTypes.NpgsqlPolygon">
+            <summary>
+            Represents a PostgreSQL Polygon type.
+            </summary>
+        </member>
+        <member name="T:NpgsqlTypes.NpgsqlCircle">
+            <summary>
+            Represents a PostgreSQL Circle type.
+            </summary>
+        </member>
+        <member name="T:NpgsqlTypes.NpgsqlInet">
+            <summary>
+            Represents a PostgreSQL inet type.
+            </summary>
+        </member>
+        <member name="T:NpgsqlTypes.NpgsqlMacAddress">
+            <summary>
+            Represents a PostgreSQL MacAddress type.
+            </summary>
+        </member>
+        <member name="M:NpgsqlTypes.NpgsqlMacAddress.#ctor(System.String)">
+            <summary>
+            
+            </summary>
+            <param name="macAddr">The macAddr parameter must contain a string that can only consist of numbers
+            and upper-case letters as hexadecimal digits. (See PhysicalAddress.Parse method on MSDN)</param>
+        </member>
+        <member name="T:Npgsql.NpgsqlPasswordPacket">
+            <summary>
+            This class represents a PasswordPacket message sent to backend
+            PostgreSQL.
+            </summary>
+        </member>
+    </members>
+</doc>
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 8fe6d0c..2ad262a 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -126,6 +126,15 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
 	; GatekeeperURI = "http://127.0.0.1:8002"
 
 [DatabaseService]
+    ; PGSQL
+    ; Uncomment these lines if you want to use PGSQL storage
+    ; Change the connection string to your db details
+    ;StorageProvider = "OpenSim.Data.PGSQL.dll"
+    ;ConnectionString = "Server=localhost;Database=opensim;User Id=opensim; password=***;"
+
+    ; MySQL
+    ; Uncomment these lines if you want to use MySQL storage
+    ; Change the connection string to your db details
     StorageProvider = "OpenSim.Data.MySQL.dll"
     ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;"
 
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 74c208d..6a84574 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -88,6 +88,15 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
 ;ConsolePort = 0
 
 [DatabaseService]
+    ; PGSQL
+    ; Uncomment these lines if you want to use PGSQL storage
+    ; Change the connection string to your db details
+    ;StorageProvider = "OpenSim.Data.PGSQL.dll"
+    ;ConnectionString = "Server=localhost;Database=opensim;User Id=opensim; password=***;"
+
+    ; MySQL
+    ; Uncomment these lines if you want to use MySQL storage
+    ; Change the connection string to your db details
     StorageProvider = "OpenSim.Data.MySQL.dll"
     ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;"
 
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 0a69dbf..5460c0a 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -26,6 +26,12 @@
     ;StorageProvider = "OpenSim.Data.MSSQL.dll"
     ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
 
+    ; PGSQL
+    ; Uncomment these lines if you want to use PGSQL storage
+    ; Change the connection string to your db details
+    ;StorageProvider = "OpenSim.Data.PGSQL.dll"
+    ;ConnectionString = "Server=localhost;Database=opensim;User Id=opensim; password=***;"
+
 [Hypergrid]
     ; Uncomment the variables in this section only if you are in
     ; Hypergrid configuration. Otherwise, ignore.
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 75fd956..ef4fb3c 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -27,6 +27,12 @@
     ;StorageProvider = "OpenSim.Data.MSSQL.dll"
     ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
 
+    ; PGSQL
+    ; Uncomment these lines if you want to use PGSQL storage
+    ; Change the connection string to your db details
+    ;StorageProvider = "OpenSim.Data.PGSQL.dll"
+    ;ConnectionString = "Server=localhost;Database=opensim;User Id=opensim; password=***;"
+
 [Hypergrid]
     ; Uncomment the variables in this section only if you are in
     ; Hypergrid configuration. Otherwise, ignore.
diff --git a/prebuild.xml b/prebuild.xml
index 585f96d..a5357da 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2073,6 +2073,42 @@
       </Files>
     </Project>
 
+    <Project frameworkVersion="v3_5" name="OpenSim.Data.PGSQL" path="OpenSim/Data/PGSQL" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Core"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Data"/>
+      <Reference name="System.Drawing"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Data"/>
+      <Reference name="OpenSim.Region.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
+      <Reference name="OpenMetaverse" path="../../../bin/"/>
+	  <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
+      <Reference name="log4net" path="../../../bin/"/>
+      <Reference name="Mono.Addins" path="../../../bin/"/>
+      <Reference name="Npgsql" path="../../../bin/"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+        <Match buildAction="EmbeddedResource" path="Resources" pattern="*.migrations"/>
+        <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
+      </Files>
+    </Project>
+	
     <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library">
       <Configuration name="Debug">
         <Options>
-- 
cgit v1.1


From daf44cc65ed8e2a0158d42011ec8cbeef105d580 Mon Sep 17 00:00:00 2001
From: Michael Cerquoni
Date: Sat, 12 Oct 2013 20:47:10 -0400
Subject: fix missing " for variable SRV_IMServerURI in example file

---
 bin/config-include/StandaloneCommon.ini.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index ef4fb3c..a368bb8 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -123,7 +123,7 @@
     SRV_AssetServerURI = "http://127.0.0.1:9000"
     SRV_ProfileServerURI = "http://127.0.0.1:9000"
     SRV_FriendsServerURI = "http://127.0.0.1:9000"
-    SRV_IMServerURI = "http://127.0.0.1:9000
+    SRV_IMServerURI = "http://127.0.0.1:9000"
 
     ;; For Viewer 2
     MapTileURL = "http://127.0.0.1:9000/"
-- 
cgit v1.1


From dbdcf2d995012f17c7948e0ac78bee5fcbbaa300 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 14 Oct 2013 23:58:12 +0100
Subject: Remove to re-add with version information for future reference

---
 bin/Npgsql.dll | Bin 413184 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 bin/Npgsql.dll

diff --git a/bin/Npgsql.dll b/bin/Npgsql.dll
deleted file mode 100644
index 24ca4bd..0000000
Binary files a/bin/Npgsql.dll and /dev/null differ
-- 
cgit v1.1


From a27c2432bb7d41d919a96bd44f42fb3154da6d64 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 14 Oct 2013 23:59:49 +0100
Subject: This is Npgsql2.0.12.0-bin-ms-net3.5sp1

From http://pgfoundry.org/frs/download.php/3354/Npgsql2.0.12.0-bin-ms.net3.5sp1.zip
This is identical to the version added in ff8a7682, removed and readded to check and record version
---
 bin/Npgsql.dll | Bin 0 -> 413184 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 bin/Npgsql.dll

diff --git a/bin/Npgsql.dll b/bin/Npgsql.dll
new file mode 100644
index 0000000..24ca4bd
Binary files /dev/null and b/bin/Npgsql.dll differ
-- 
cgit v1.1


From f106ba87ca92b477b32a84aa246e4b4481b0980b Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Wed, 18 Sep 2013 15:55:42 +0300
Subject: Made terrain uploads thread-safe

---
 .../AssetTransaction/AgentAssetsTransactions.cs    |  9 +++++
 .../World/Estate/EstateManagementModule.cs         | 47 +++++++++++++---------
 .../World/Estate/EstateTerrainXferHandler.cs       |  6 ++-
 .../Region/Framework/Interfaces/IEstateModule.cs   |  5 +++
 4 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index 0271738..f56d17d 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -33,6 +33,7 @@ using OpenSim.Framework;
 
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 {
@@ -119,6 +120,14 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             }
             else
             {
+                // Check if the xfer is a terrain xfer
+                IEstateModule estateModule = m_Scene.RequestModuleInterface<IEstateModule>();
+                if (estateModule != null)
+                {
+                    if (estateModule.IsTerrainXfer(xferID))
+                        return;
+                }
+                
                 m_log.ErrorFormat(
                     "[AGENT ASSET TRANSACTIONS]: Could not find uploader for xfer id {0}, packet id {1}, data length {2}",
                     xferID, packetID, data.Length);
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 42db1cf..17387da 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -829,26 +829,23 @@ namespace OpenSim.Region.CoreModules.World.Estate
         
         private void AbortTerrainXferHandler(IClientAPI remoteClient, ulong XferID)
         {
-            if (TerrainUploader != null)
+            lock (this)
             {
-                lock (TerrainUploader)
+                if ((TerrainUploader != null) && (XferID == TerrainUploader.XferID))
                 {
-                    if (XferID == TerrainUploader.XferID)
-                    {
-                        remoteClient.OnXferReceive -= TerrainUploader.XferReceive;
-                        remoteClient.OnAbortXfer -= AbortTerrainXferHandler;
-                        TerrainUploader.TerrainUploadDone -= HandleTerrainApplication;
+                    remoteClient.OnXferReceive -= TerrainUploader.XferReceive;
+                    remoteClient.OnAbortXfer -= AbortTerrainXferHandler;
+                    TerrainUploader.TerrainUploadDone -= HandleTerrainApplication;
 
-                        TerrainUploader = null;
-                        remoteClient.SendAlertMessage("Terrain Upload aborted by the client");
-                    }
+                    TerrainUploader = null;
+                    remoteClient.SendAlertMessage("Terrain Upload aborted by the client");
                 }
             }
-
         }
+
         private void HandleTerrainApplication(string filename, byte[] terrainData, IClientAPI remoteClient)
         {
-            lock (TerrainUploader)
+            lock (this)
             {
                 remoteClient.OnXferReceive -= TerrainUploader.XferReceive;
                 remoteClient.OnAbortXfer -= AbortTerrainXferHandler;
@@ -907,22 +904,32 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         private void handleUploadTerrain(IClientAPI remote_client, string clientFileName)
         {
-            if (TerrainUploader == null)
+            lock (this)
             {
-
-                TerrainUploader = new EstateTerrainXferHandler(remote_client, clientFileName);
-                lock (TerrainUploader)
+                if (TerrainUploader == null)
                 {
+                    m_log.DebugFormat("Starting to receive uploaded terrain");
+                    TerrainUploader = new EstateTerrainXferHandler(remote_client, clientFileName);
                     remote_client.OnXferReceive += TerrainUploader.XferReceive;
                     remote_client.OnAbortXfer += AbortTerrainXferHandler;
                     TerrainUploader.TerrainUploadDone += HandleTerrainApplication;
+                    TerrainUploader.RequestStartXfer(remote_client);
+                }
+                else
+                {
+                    remote_client.SendAlertMessage("Another Terrain Upload is in progress.  Please wait your turn!");
                 }
-                TerrainUploader.RequestStartXfer(remote_client);
-
             }
-            else
+        }
+
+        public bool IsTerrainXfer(ulong xferID)
+        {
+            lock (this)
             {
-                remote_client.SendAlertMessage("Another Terrain Upload is in progress.  Please wait your turn!");
+                if (TerrainUploader == null)
+                    return false;
+                else
+                    return TerrainUploader.XferID == xferID;
             }
         }
         
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
index b8d8b10..2d74eaf 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
@@ -78,7 +78,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
         /// <param name="data"></param>
         public void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data)
         {
-            if (mXferID == xferID)
+            if (mXferID != xferID)
+                return;
+
+            lock (this)
             {
                 if (m_asset.Data.Length > 1)
                 {
@@ -99,7 +102,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 if ((packetID & 0x80000000) != 0)
                 {
                     SendCompleteMessage(remoteClient);
-
                 }
             }
         }
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index d49b24e..944c66b 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -54,5 +54,10 @@ namespace OpenSim.Region.Framework.Interfaces
 
         void setEstateTerrainBaseTexture(int level, UUID texture);
         void setEstateTerrainTextureHeights(int corner, float lowValue, float highValue);
+
+        /// <summary>
+        /// Returns whether the transfer ID is being used for a terrain transfer.
+        /// </summary>
+        bool IsTerrainXfer(ulong xferID);
     }
 }
-- 
cgit v1.1


From 3e1ca2bd2136a51f23dff0d31f4725b4e05c3f7c Mon Sep 17 00:00:00 2001
From: fernando
Date: Tue, 15 Oct 2013 11:55:08 -0500
Subject: * Fixes mantis #6802   Simulator crashes whist loading (lighshare
 enabled) * Please test

---
 OpenSim/Data/PGSQL/PGSQLEstateData.cs                  | 14 +++++++++-----
 OpenSim/Data/PGSQL/PGSQLSimulationData.cs              |  8 ++++----
 OpenSim/Data/PGSQL/Resources/InventoryStore.migrations |  9 +++++++++
 OpenSim/Data/PGSQL/Resources/RegionStore.migrations    | 18 ++++++++++++++++++
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Data/PGSQL/PGSQLEstateData.cs b/OpenSim/Data/PGSQL/PGSQLEstateData.cs
index 347baf3..141b8ed 100644
--- a/OpenSim/Data/PGSQL/PGSQLEstateData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLEstateData.cs
@@ -201,11 +201,10 @@ namespace OpenSim.Data.PGSQL
 
             string sql = string.Format("insert into estate_settings (\"{0}\") values ( :{1} )", String.Join("\",\"", names.ToArray()), String.Join(", :", names.ToArray()));
 
-            m_log.Debug("[DB ESTATE]: SQL: " + sql);
             using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             using (NpgsqlCommand insertCommand = new NpgsqlCommand(sql, conn))
             {
-                insertCommand.CommandText = sql + "; Select cast(lastval() as int) as ID ;";
+                insertCommand.CommandText = sql;
 
                 foreach (string name in names)
                 {
@@ -218,11 +217,16 @@ namespace OpenSim.Data.PGSQL
 
                 es.EstateID = 100;
 
-                using (NpgsqlDataReader result = insertCommand.ExecuteReader())
+                if (insertCommand.ExecuteNonQuery() > 0)
                 {
-                    if (result.Read())
+                    insertCommand.CommandText = "Select cast(lastval() as int) as ID ;";
+
+                    using (NpgsqlDataReader result = insertCommand.ExecuteReader())
                     {
-                        es.EstateID = (uint)result.GetInt32(0);
+                        if (result.Read())
+                        {
+                            es.EstateID = (uint)result.GetInt32(0);
+                        }
                     }
                 }
 
diff --git a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
index 5753ae3..69b0beb 100644
--- a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
@@ -727,7 +727,7 @@ namespace OpenSim.Data.PGSQL
             using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
-                cmd.Parameters.Add(_Database.CreateParameter("regionID", regionUUID));
+                cmd.Parameters.Add(_Database.CreateParameter("regionID", regionUUID.ToString() ));
                 conn.Open();
                 using (NpgsqlDataReader result = cmd.ExecuteReader())
                 {
@@ -817,7 +817,7 @@ namespace OpenSim.Data.PGSQL
             using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
                 conn.Open();
-                cmd.Parameters.Add(_Database.CreateParameter("region_id", regionID));
+                cmd.Parameters.Add(_Database.CreateParameter("region_id", regionID.ToString()));
                 cmd.ExecuteNonQuery();
             }
         }
@@ -831,8 +831,8 @@ namespace OpenSim.Data.PGSQL
                 conn.Open();
                 using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                 {
-                    cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID));
-                    exists = (int)cmd.ExecuteScalar() > 0;
+                    cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID.ToString() ));
+                    exists = cmd.ExecuteNonQuery() > 0;
                 }
             }
             if (exists)
diff --git a/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations b/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations
index b61e1f8..8f7982a 100644
--- a/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations
@@ -209,3 +209,12 @@ alter table inventoryitems
   alter column "creatorID" type varchar(255);
   
 Commit;
+
+:VERSION 10
+
+BEGIN TRANSACTION;
+
+Alter table inventoryitems Rename Column "SaleType" to "saleType";
+
+Commit;
+
diff --git a/OpenSim/Data/PGSQL/Resources/RegionStore.migrations b/OpenSim/Data/PGSQL/Resources/RegionStore.migrations
index 65eb011..1e33027 100644
--- a/OpenSim/Data/PGSQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/RegionStore.migrations
@@ -1134,3 +1134,21 @@ ALTER TABLE prims ADD "Friction" double precision NOT NULL default '0.6';
 ALTER TABLE prims ADD "Restitution" double precision NOT NULL default '0.5';
 
 COMMIT;
+
+:VERSION 40      #-- regionwindlight changed type from smallint to bool
+
+BEGIN TRANSACTION;
+
+ALTER TABLE regionwindlight ALTER COLUMN cloud_scroll_x_lock DROP DEFAULT;
+ALTER TABLE regionwindlight ALTER cloud_scroll_x_lock TYPE bool USING CASE WHEN cloud_scroll_x_lock=0 THEN FALSE ELSE TRUE END;
+ALTER TABLE regionwindlight ALTER COLUMN cloud_scroll_x_lock SET DEFAULT FALSE;
+
+ALTER TABLE regionwindlight ALTER COLUMN cloud_scroll_y_lock DROP DEFAULT;
+ALTER TABLE regionwindlight ALTER cloud_scroll_y_lock TYPE bool USING CASE WHEN cloud_scroll_y_lock=0 THEN FALSE ELSE TRUE END;
+ALTER TABLE regionwindlight ALTER COLUMN cloud_scroll_y_lock SET DEFAULT FALSE;
+
+ALTER TABLE regionwindlight ALTER COLUMN draw_classic_clouds DROP DEFAULT;
+ALTER TABLE regionwindlight ALTER draw_classic_clouds TYPE bool USING CASE WHEN draw_classic_clouds=0 THEN FALSE ELSE TRUE END;
+ALTER TABLE regionwindlight ALTER COLUMN draw_classic_clouds SET DEFAULT FALSE;
+
+COMMIT;
-- 
cgit v1.1


From 5ca7395e175b476fd20fcf97383c8eb09b64ae3a Mon Sep 17 00:00:00 2001
From: Kevin Cozens
Date: Fri, 2 Aug 2013 15:26:28 -0400
Subject: Added support for attachments to group notices when using Flotsam
 groups.

---
 .../Avatar/XmlRpcGroups/GroupsModule.cs            | 172 +++++++++++++++------
 1 file changed, 122 insertions(+), 50 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index d744a14..d09d3ad 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -39,6 +39,7 @@ using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
+using System.Text;
 using DirFindFlags = OpenMetaverse.DirectoryManager.DirFindFlags;
 
 namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
@@ -421,44 +422,75 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     string Subject = im.message.Substring(0, im.message.IndexOf('|'));
                     string Message = im.message.Substring(Subject.Length + 1);
 
+                    InventoryItemBase item = null;
+                    bool hasAttachment = false;
+                    UUID itemID = UUID.Zero;    //Assignment to quiet compiler
+                    UUID ownerID = UUID.Zero;   //Assignment to quiet compiler
                     byte[] bucket;
 
-                    if ((im.binaryBucket.Length == 1) && (im.binaryBucket[0] == 0))
-                    {
-                        bucket = new byte[19];
-                        bucket[0] = 0; //dunno
-                        bucket[1] = 0; //dunno
-                        GroupID.ToBytes(bucket, 2);
-                        bucket[18] = 0; //dunno
-                    }
-                    else
+                    if (im.binaryBucket.Length >= 1 && im.binaryBucket[0] > 0)
                     {
                         string binBucket = OpenMetaverse.Utils.BytesToString(im.binaryBucket);
                         binBucket = binBucket.Remove(0, 14).Trim();
-                        if (m_debugEnabled)
+
+                        OSDMap binBucketOSD = (OSDMap)OSDParser.DeserializeLLSDXml(binBucket);
+                        if (binBucketOSD is OSD)
                         {
-                            m_log.WarnFormat("I don't understand a group notice binary bucket of: {0}", binBucket);
+                            OSDMap binBucketMap = (OSDMap)binBucketOSD;
+
+                            itemID = binBucketMap["item_id"].AsUUID();
+                            ownerID = binBucketMap["owner_id"].AsUUID();
 
-                            OSDMap binBucketOSD = (OSDMap)OSDParser.DeserializeLLSDXml(binBucket);
-                            
-                            foreach (string key in binBucketOSD.Keys)
+                            //Attempt to get the details of the attached item.
+                            //If sender doesn't own the attachment, the item
+                            //variable will be set to null and attachment will
+                            //not be included with the group notice.
+                            Scene scene = (Scene)remoteClient.Scene;
+                            item = new InventoryItemBase(itemID, ownerID);
+                            item = scene.InventoryService.GetItem(item);
+
+                            if (item != null)
                             {
-                                if (binBucketOSD.ContainsKey(key))
-                                {
-                                    m_log.WarnFormat("{0}: {1}", key, binBucketOSD[key].ToString());
-                                }
+                                //Got item details so include the attachment.
+                                hasAttachment = true;
                             }
                         }
-   
-                        // treat as if no attachment
+                        else
+                        {
+                            m_log.DebugFormat("[Groups]: Received OSD with unexpected type: {0}", binBucketOSD.GetType());
+                        }
+                    }
+
+                    if (hasAttachment)
+                    {
+                        //Bucket contains information about attachment.
+                        //
+                        //Byte offset and description of bucket data:
+                        //0:  1 byte indicating if attachment is present
+                        //1:  1 byte indicating the type of attachment
+                        //2:  16 bytes - Group UUID
+                        //18: 16 bytes - UUID of the attachment owner
+                        //34: 16 bytes - UUID of the attachment
+                        //50: variable - Name of the attachment
+                        //??: NUL byte to terminate the attachment name
+                        byte[] name = Encoding.UTF8.GetBytes(item.Name);
+                        bucket = new byte[51 + name.Length];//3 bytes, 3 UUIDs, and name
+                        bucket[0] = 1;                      //Has attachment flag
+                        bucket[1] = (byte)item.InvType;     //Type of Attachment
+                        GroupID.ToBytes(bucket, 2);
+                        ownerID.ToBytes(bucket, 18);
+                        itemID.ToBytes(bucket, 34);
+                        name.CopyTo(bucket, 50);
+                    }
+                    else
+                    {
                         bucket = new byte[19];
-                        bucket[0] = 0; //dunno
-                        bucket[1] = 0; //dunno
+                        bucket[0] = 0;  //Has attachment flag
+                        bucket[1] = 0;  //Type of attachment
                         GroupID.ToBytes(bucket, 2);
-                        bucket[18] = 0; //dunno
+                        bucket[18] = 0; //NUL terminate name of attachment
                     }
 
-                    
                     m_groupData.AddGroupNotice(GetRequestingAgentID(remoteClient), GroupID, NoticeID, im.fromAgentName, Subject, Message, bucket);
                     if (OnNewGroupNotice != null)
                     {
@@ -483,7 +515,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
                        if (member.AcceptNotices)
                         {
-                            // Build notice IIM
+                            // Build notice IM
                             GridInstantMessage msg = CreateGroupNoticeIM(UUID.Zero, NoticeID, (byte)OpenMetaverse.InstantMessageDialog.GroupNotice);
 
                             msg.toAgentID = member.AgentID.Guid;
@@ -492,10 +524,40 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     }
                 }
             }
-            
+
+            if (im.dialog == (byte)InstantMessageDialog.GroupNoticeInventoryAccepted)
+            {
+                //Is bucket large enough to hold UUID of the attachment?
+                if (im.binaryBucket.Length < 16)
+                    return;
+
+                UUID noticeID = new UUID(im.imSessionID);
+
+                GroupNoticeInfo notice = m_groupData.GetGroupNotice(GetRequestingAgentID(remoteClient), noticeID);
+                if (notice != null)
+                {
+                    UUID giver = new UUID(notice.BinaryBucket, 18);
+                    UUID attachmentUUID = new UUID(notice.BinaryBucket, 34);
+
+                    if (m_debugEnabled)
+                        m_log.DebugFormat("[Groups]: Giving inventory from {0} to {1}", giver, remoteClient.AgentId);
+
+                    InventoryItemBase itemCopy = ((Scene)(remoteClient.Scene)).GiveInventoryItem(remoteClient.AgentId,
+                        giver, attachmentUUID);
+
+                    if (itemCopy == null)
+                    {
+                        remoteClient.SendAgentAlertMessage("Can't find item to give. Nothing given.", false);
+                        return;
+                    }
+
+                    remoteClient.SendInventoryItemCreateUpdate(itemCopy, 0);
+                }
+            }
+
             // Interop, received special 210 code for ejecting a group member
             // this only works within the comms servers domain, and won't work hypergrid
-            // TODO:FIXME: Use a presense server of some kind to find out where the 
+            // TODO:FIXME: Use a presence server of some kind to find out where the
             // client actually is, and try contacting that region directly to notify them,
             // or provide the notification via xmlrpc update queue
             if ((im.dialog == 210))
@@ -873,26 +935,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             if (data != null)
             {
-                GroupRecord groupInfo = m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), data.GroupID, null);
-
-                GridInstantMessage msg = new GridInstantMessage();
-                msg.imSessionID = UUID.Zero.Guid;
-                msg.fromAgentID = data.GroupID.Guid;
-                msg.toAgentID = GetRequestingAgentID(remoteClient).Guid;
-                msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
-                msg.fromAgentName = "Group Notice : " + groupInfo == null ? "Unknown" : groupInfo.GroupName;
-                msg.message = data.noticeData.Subject + "|" + data.Message;
-                msg.dialog = (byte)OpenMetaverse.InstantMessageDialog.GroupNoticeRequested;
-                msg.fromGroup = true;
-                msg.offline = (byte)0;
-                msg.ParentEstateID = 0;
-                msg.Position = Vector3.Zero;
-                msg.RegionID = UUID.Zero.Guid;
-                msg.binaryBucket = data.BinaryBucket;
+                GridInstantMessage msg = CreateGroupNoticeIM(remoteClient.AgentId, groupNoticeID, (byte)InstantMessageDialog.GroupNoticeRequested);
 
                 OutgoingInstantMessage(msg, GetRequestingAgentID(remoteClient));
             }
-
         }
 
         public GridInstantMessage CreateGroupNoticeIM(UUID agentID, UUID groupNoticeID, byte dialog)
@@ -900,10 +946,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
             GridInstantMessage msg = new GridInstantMessage();
-            msg.imSessionID = UUID.Zero.Guid;
+            byte[] bucket;
+
+            msg.imSessionID = groupNoticeID.Guid;
             msg.toAgentID = agentID.Guid;
             msg.dialog = dialog;
-            // msg.dialog = (byte)OpenMetaverse.InstantMessageDialog.GroupNotice;
             msg.fromGroup = true;
             msg.offline = (byte)0;
             msg.ParentEstateID = 0;
@@ -917,13 +964,38 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 msg.timestamp = info.noticeData.Timestamp;
                 msg.fromAgentName = info.noticeData.FromName;
                 msg.message = info.noticeData.Subject + "|" + info.Message;
-                msg.binaryBucket = info.BinaryBucket;
+
+                if (info.BinaryBucket[0] > 0)
+                {
+                    //32 is due to not needing space for two of the UUIDs.
+                    //(Don't need UUID of attachment or its owner in IM)
+                    //50 offset gets us to start of attachment name.
+                    //We are skipping the attachment flag, type, and
+                    //the three UUID fields at the start of the bucket.
+                    bucket = new byte[info.BinaryBucket.Length-32];
+                    bucket[0] = 1;      //Has attachment
+                    bucket[1] = info.BinaryBucket[1];
+                    Array.Copy(info.BinaryBucket, 50,
+                               bucket, 18, info.BinaryBucket.Length-50);
+                }
+                else
+                {
+                    bucket = new byte[19];
+                    bucket[0] = 0;      //No attachment
+                    bucket[1] = 0;      //Attachment type
+                    bucket[18] = 0;     //NUL terminate name
+                }
+
+                info.GroupID.ToBytes(bucket, 2);
+                msg.binaryBucket = bucket;
             }
             else
             {
-                if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: Group Notice {0} not found, composing empty message.", groupNoticeID);
+                if (m_debugEnabled)
+                    m_log.DebugFormat("[GROUPS]: Group Notice {0} not found, composing empty message.", groupNoticeID);
+
                 msg.fromAgentID = UUID.Zero.Guid;
-                msg.timestamp = (uint)Util.UnixTimeSinceEpoch(); ;
+                msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
                 msg.fromAgentName = string.Empty;
                 msg.message = string.Empty;
                 msg.binaryBucket = new byte[0];
@@ -1047,7 +1119,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             // Message to ejector
             // Interop, received special 210 code for ejecting a group member
             // this only works within the comms servers domain, and won't work hypergrid
-            // TODO:FIXME: Use a presense server of some kind to find out where the 
+            // TODO:FIXME: Use a presence server of some kind to find out where the
             // client actually is, and try contacting that region directly to notify them,
             // or provide the notification via xmlrpc update queue
 
-- 
cgit v1.1


From acfe603a5fb2db84534f97e5f7cee3e49178279b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 15 Oct 2013 23:24:49 +0100
Subject: As discussed on many previous occasions, switch the default physics
 engine in OpenSimulator from OpenDynamicsEngine to BulletSim.

The BulletSim plugin is higher performance and has a better implementation of vehicles amongst other things.
Many thanks to Robert Adams for making this possible with the enormous amount of work that he has done on this plugin.
If you want to continue using ODE, set physics = OpenDynamicsEngine in the [Startup] section of OpenSim.ini
---
 bin/OpenSimDefaults.ini | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index c090306..b56d5d1 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -229,14 +229,13 @@
     ;CacheSculptMaps = true
     
     ; Choose one of the physics engines below.
-    ; OpenDynamicsEngine is by some distance the most developed physics engine.
-    ; BulletSim is a high performance, up-and-coming physics engine.
-    ; basicphysics effectively does not model physics at all, making all objects phantom.
-    physics = OpenDynamicsEngine
+    ; BulletSim is a high performance physics engine.  It is the default OpenSimulator physics engine
+    ; OpenDynamicsEngine is another developed physics engine that was the previous default in OpenSimulator 0.7.6 and before
+    physics = BulletSim
+    ;physics = modified_BulletX
+    ;physics = OpenDynamicsEngine
     ;physics = basicphysics
     ;physics = POS
-    ;physics = modified_BulletX
-    ;physics = BulletSim
 
     ; ##
     ; ## SCRIPT ENGINE
-- 
cgit v1.1


From d0c17808391e93964dcaf0ffcf06899c5669f4ff Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Wed, 25 Sep 2013 10:56:05 +0300
Subject: Fixed rezzing coalesced objects from a prim's inventory

Previously only the first object in the Coalesced Object was rezzed. Now all the objects are rezzed.
---
 .../InventoryAccess/InventoryAccessModule.cs       |  51 ++-------
 .../Framework/Interfaces/IEntityInventory.cs       |  10 +-
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 119 +++++++++++++++++----
 .../Framework/Scenes/SceneObjectPartInventory.cs   | 101 +++++++++--------
 .../Shared/Api/Implementation/LSL_Api.cs           |  41 +++----
 5 files changed, 188 insertions(+), 134 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 0ec9575..831922e 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -757,64 +757,29 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
             SceneObjectGroup group = null;
 
-            string xmlData = Utils.BytesToString(rezAsset.Data);
-            List<SceneObjectGroup> objlist = new List<SceneObjectGroup>();
-            List<Vector3> veclist = new List<Vector3>();
+            List<SceneObjectGroup> objlist;
+            List<Vector3> veclist;
+            Vector3 bbox;
+            float offsetHeight;
             byte bRayEndIsIntersection = (byte)(RayEndIsIntersection ? 1 : 0);
             Vector3 pos;
 
-            XmlDocument doc = new XmlDocument();
-            doc.LoadXml(xmlData);
-            XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
-            if (e == null || attachment) // Single
-            {
-                SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
-
-                objlist.Add(g);
-                veclist.Add(Vector3.Zero);
+            bool single = m_Scene.GetObjectsToRez(rezAsset.Data, attachment, out objlist, out veclist, out bbox, out offsetHeight);
 
-                float offsetHeight = 0;
+            if (single)
+            {
                 pos = m_Scene.GetNewRezLocation(
                     RayStart, RayEnd, RayTargetID, Quaternion.Identity,
-                    BypassRayCast, bRayEndIsIntersection, true, g.GetAxisAlignedBoundingBox(out offsetHeight), false);
+                    BypassRayCast, bRayEndIsIntersection, true, bbox, false);
                 pos.Z += offsetHeight;
             }
             else
             {
-                XmlElement coll = (XmlElement)e;
-                float bx = Convert.ToSingle(coll.GetAttribute("x"));
-                float by = Convert.ToSingle(coll.GetAttribute("y"));
-                float bz = Convert.ToSingle(coll.GetAttribute("z"));
-                Vector3 bbox = new Vector3(bx, by, bz);
-
                 pos = m_Scene.GetNewRezLocation(RayStart, RayEnd,
                         RayTargetID, Quaternion.Identity,
                         BypassRayCast, bRayEndIsIntersection, true,
                         bbox, false);
-
                 pos -= bbox / 2;
-
-                XmlNodeList groups = e.SelectNodes("SceneObjectGroup");
-                foreach (XmlNode n in groups)
-                {
-                    SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml);
-
-                    objlist.Add(g);
-                    XmlElement el = (XmlElement)n;
-
-                    string rawX = el.GetAttribute("offsetx");
-                    string rawY = el.GetAttribute("offsety");
-                    string rawZ = el.GetAttribute("offsetz");
-//                        
-//                            m_log.DebugFormat(
-//                                "[INVENTORY ACCESS MODULE]: Converting coalesced object {0} offset <{1}, {2}, {3}>", 
-//                                g.Name, rawX, rawY, rawZ);
-
-                    float x = Convert.ToSingle(rawX);
-                    float y = Convert.ToSingle(rawY);
-                    float z = Convert.ToSingle(rawZ);
-                    veclist.Add(new Vector3(x, y, z));
-                }
             }
 
             if (item != null && !DoPreRezWhenFromItem(remoteClient, item, objlist, pos, veclist, attachment))
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 150193d..9ffda51 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -234,15 +234,17 @@ namespace OpenSim.Region.Framework.Interfaces
         List<TaskInventoryItem> GetInventoryItems(InventoryType type);
 
         /// <summary>
-        /// Get the scene object referenced by an inventory item.
+        /// Get the scene object(s) referenced by an inventory item.
         /// </summary>
         /// 
         /// This is returned in a 'rez ready' state.  That is, name, description, permissions and other details have
         /// been adjusted to reflect the part and item from which it originates.
         /// 
-        /// <param name="item"></param>
-        /// <returns>The scene object.  Null if the scene object asset couldn't be found</returns>
-        SceneObjectGroup GetRezReadySceneObject(TaskInventoryItem item);
+        /// <param name="item">Inventory item</param>
+        /// <param name="objlist">The scene objects</param>
+        /// <param name="veclist">Relative offsets for each object</param>
+        /// <returns>true = success, false = the scene object asset couldn't be found</returns>
+        bool GetRezReadySceneObjects(TaskInventoryItem item, out List<SceneObjectGroup> objlist, out List<Vector3> veclist);
 
         /// <summary>
         /// Update an existing inventory item.
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 4bebbe8..65536db 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -31,6 +31,7 @@ using System.Collections;
 using System.Reflection;
 using System.Text;
 using System.Timers;
+using System.Xml;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using log4net;
@@ -2135,6 +2136,69 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
+        /// Returns the list of Scene Objects in an asset.
+        /// </summary>
+        /// <remarks>
+        /// Returns one object if the asset is a regular object, and multiple objects for a coalesced object.
+        /// </remarks>
+        /// <param name="assetData">Asset data</param>
+        /// <param name="attachment">Whether the item is an attachment</param>
+        /// <param name="objlist">The objects included in the asset</param>
+        /// <param name="veclist">Relative positions of the objects</param>
+        /// <param name="bbox">Bounding box of all the objects</param>
+        /// <param name="offsetHeight">Offset in the Z axis from the centre of the bounding box
+        /// to the centre of the root prim (relevant only when returning a single object)</param>
+        /// <returns>true = returning a single object; false = multiple objects</returns>
+        public bool GetObjectsToRez(byte[] assetData, bool attachment, out List<SceneObjectGroup> objlist, out List<Vector3> veclist,
+            out Vector3 bbox, out float offsetHeight)
+        {
+            objlist = new List<SceneObjectGroup>();
+            veclist = new List<Vector3>();
+
+            XmlDocument doc = new XmlDocument();
+            string xmlData = Utils.BytesToString(assetData);
+            doc.LoadXml(xmlData);
+            XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
+
+            if (e == null || attachment) // Single
+            {
+                SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
+                objlist.Add(g);
+                veclist.Add(new Vector3(0, 0, 0));
+                bbox = g.GetAxisAlignedBoundingBox(out offsetHeight);
+                return true;
+            }
+            else
+            {
+                XmlElement coll = (XmlElement)e;
+                float bx = Convert.ToSingle(coll.GetAttribute("x"));
+                float by = Convert.ToSingle(coll.GetAttribute("y"));
+                float bz = Convert.ToSingle(coll.GetAttribute("z"));
+                bbox = new Vector3(bx, by, bz);
+                offsetHeight = 0;
+
+                XmlNodeList groups = e.SelectNodes("SceneObjectGroup");
+                foreach (XmlNode n in groups)
+                {
+                    SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml);
+                    objlist.Add(g);
+
+                    XmlElement el = (XmlElement)n;
+                    string rawX = el.GetAttribute("offsetx");
+                    string rawY = el.GetAttribute("offsety");
+                    string rawZ = el.GetAttribute("offsetz");
+
+                    float x = Convert.ToSingle(rawX);
+                    float y = Convert.ToSingle(rawY);
+                    float z = Convert.ToSingle(rawZ);
+                    veclist.Add(new Vector3(x, y, z));
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
         /// Event Handler Rez an object into a scene
         /// Calls the non-void event handler
         /// </summary>
@@ -2209,19 +2273,25 @@ namespace OpenSim.Region.Framework.Scenes
         /// will be used if it exists.</param>
         /// <param name="vel">The velocity of the rezzed object.</param>
         /// <param name="param"></param>
-        /// <returns>The SceneObjectGroup rezzed or null if rez was unsuccessful</returns>
-        public virtual SceneObjectGroup RezObject(
+        /// <returns>The SceneObjectGroup(s) rezzed, or null if rez was unsuccessful</returns>
+        public virtual List<SceneObjectGroup> RezObject(
             SceneObjectPart sourcePart, TaskInventoryItem item, Vector3 pos, Quaternion? rot, Vector3 vel, int param)
         {
             if (null == item)
                 return null;
+
+            List<SceneObjectGroup> objlist;
+            List<Vector3> veclist;
             
-            SceneObjectGroup group = sourcePart.Inventory.GetRezReadySceneObject(item);
-            
-            if (null == group)
+            bool success = sourcePart.Inventory.GetRezReadySceneObjects(item, out objlist, out veclist);
+            if (!success)
                 return null;
-            
-            if (!Permissions.CanRezObject(group.PrimCount, item.OwnerID, pos))
+
+            int totalPrims = 0;
+            foreach (SceneObjectGroup group in objlist)
+                totalPrims += group.PrimCount;
+
+            if (!Permissions.CanRezObject(totalPrims, item.OwnerID, pos))
                 return null;
 
             if (!Permissions.BypassPermissions())
@@ -2230,23 +2300,28 @@ namespace OpenSim.Region.Framework.Scenes
                     sourcePart.Inventory.RemoveInventoryItem(item.ItemID);
             }
 
-
-            if (group.IsAttachment == false && group.RootPart.Shape.State != 0)
+            for (int i = 0; i < objlist.Count; i++)
             {
-                group.RootPart.AttachedPos = group.AbsolutePosition;
-                group.RootPart.Shape.LastAttachPoint = (byte)group.AttachmentPoint;
+                SceneObjectGroup group = objlist[i];
+                Vector3 curpos = pos + veclist[i];
+
+                if (group.IsAttachment == false && group.RootPart.Shape.State != 0)
+                {
+                    group.RootPart.AttachedPos = group.AbsolutePosition;
+                    group.RootPart.Shape.LastAttachPoint = (byte)group.AttachmentPoint;
+                }
+
+                group.FromPartID = sourcePart.UUID;
+                AddNewSceneObject(group, true, curpos, rot, vel);
+
+                // We can only call this after adding the scene object, since the scene object references the scene
+                // to find out if scripts should be activated at all.
+                group.CreateScriptInstances(param, true, DefaultScriptEngine, 3);
+
+                group.ScheduleGroupForFullUpdate();
             }
-                                    
-            group.FromPartID = sourcePart.UUID;
-            AddNewSceneObject(group, true, pos, rot, vel);
-            
-            // We can only call this after adding the scene object, since the scene object references the scene
-            // to find out if scripts should be activated at all.
-            group.CreateScriptInstances(param, true, DefaultScriptEngine, 3);
-            
-            group.ScheduleGroupForFullUpdate();
-        
-            return group;
+
+            return objlist;
         }
 
         public virtual bool returnObjects(SceneObjectGroup[] returnobjects,
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 3f223a3..380e402 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -733,8 +733,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             return items;
         }
-        
-        public SceneObjectGroup GetRezReadySceneObject(TaskInventoryItem item)
+
+        public bool GetRezReadySceneObjects(TaskInventoryItem item, out List<SceneObjectGroup> objlist, out List<Vector3> veclist)
         {
             AssetBase rezAsset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString());
 
@@ -743,66 +743,75 @@ namespace OpenSim.Region.Framework.Scenes
                 m_log.WarnFormat(
                     "[PRIM INVENTORY]: Could not find asset {0} for inventory item {1} in {2}", 
                     item.AssetID, item.Name, m_part.Name);
-                return null;
+                objlist = null;
+                veclist = null;
+                return false;
             }
 
-            string xmlData = Utils.BytesToString(rezAsset.Data);
-            SceneObjectGroup group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
+            Vector3 bbox;
+            float offsetHeight;
 
-            group.ResetIDs();
+            bool single = m_part.ParentGroup.Scene.GetObjectsToRez(rezAsset.Data, false, out objlist, out veclist, out bbox, out offsetHeight);
 
-            SceneObjectPart rootPart = group.GetPart(group.UUID);
+            for (int i = 0; i < objlist.Count; i++)
+            {
+                SceneObjectGroup group = objlist[i];
 
-            // Since renaming the item in the inventory does not affect the name stored
-            // in the serialization, transfer the correct name from the inventory to the
-            // object itself before we rez.
-            rootPart.Name = item.Name;
-            rootPart.Description = item.Description;
+                group.ResetIDs();
 
-            SceneObjectPart[] partList = group.Parts;
+                SceneObjectPart rootPart = group.GetPart(group.UUID);
 
-            group.SetGroup(m_part.GroupID, null);
+                // Since renaming the item in the inventory does not affect the name stored
+                // in the serialization, transfer the correct name from the inventory to the
+                // object itself before we rez.
+                rootPart.Name = item.Name;
+                rootPart.Description = item.Description;
 
-            // TODO: Remove magic number badness
-            if ((rootPart.OwnerID != item.OwnerID) || (item.CurrentPermissions & 16) != 0 || (item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0) // Magic number
-            {
-                if (m_part.ParentGroup.Scene.Permissions.PropagatePermissions())
+                SceneObjectPart[] partList = group.Parts;
+
+                group.SetGroup(m_part.GroupID, null);
+
+                // TODO: Remove magic number badness
+                if ((rootPart.OwnerID != item.OwnerID) || (item.CurrentPermissions & 16) != 0 || (item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0) // Magic number
                 {
-                    foreach (SceneObjectPart part in partList)
+                    if (m_part.ParentGroup.Scene.Permissions.PropagatePermissions())
                     {
-                        if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
-                            part.EveryoneMask = item.EveryonePermissions;
-                        if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
-                            part.NextOwnerMask = item.NextPermissions;
-                        if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteGroup) != 0)
-                            part.GroupMask = item.GroupPermissions;
+                        foreach (SceneObjectPart part in partList)
+                        {
+                            if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
+                                part.EveryoneMask = item.EveryonePermissions;
+                            if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
+                                part.NextOwnerMask = item.NextPermissions;
+                            if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteGroup) != 0)
+                                part.GroupMask = item.GroupPermissions;
+                        }
+
+                        group.ApplyNextOwnerPermissions();
                     }
-                    
-                    group.ApplyNextOwnerPermissions();
                 }
-            }
 
-            foreach (SceneObjectPart part in partList)
-            {
-                // TODO: Remove magic number badness
-                if ((part.OwnerID != item.OwnerID) || (item.CurrentPermissions & 16) != 0 || (item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0) // Magic number
+                foreach (SceneObjectPart part in partList)
                 {
-                    part.LastOwnerID = part.OwnerID;
-                    part.OwnerID = item.OwnerID;
-                    part.Inventory.ChangeInventoryOwner(item.OwnerID);
+                    // TODO: Remove magic number badness
+                    if ((part.OwnerID != item.OwnerID) || (item.CurrentPermissions & 16) != 0 || (item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0) // Magic number
+                    {
+                        part.LastOwnerID = part.OwnerID;
+                        part.OwnerID = item.OwnerID;
+                        part.Inventory.ChangeInventoryOwner(item.OwnerID);
+                    }
+
+                    if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
+                        part.EveryoneMask = item.EveryonePermissions;
+                    if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
+                        part.NextOwnerMask = item.NextPermissions;
+                    if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteGroup) != 0)
+                        part.GroupMask = item.GroupPermissions;
                 }
-                
-                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
-                    part.EveryoneMask = item.EveryonePermissions;
-                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
-                    part.NextOwnerMask = item.NextPermissions;
-                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteGroup) != 0)
-                    part.GroupMask = item.GroupPermissions;
+
+                rootPart.TrimPermissions();
             }
-            
-            rootPart.TrimPermissions(); 
-            
-            return group;
+
+            return true;
         }
         
         /// <summary>
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 975bf2d..b19ed0a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2970,37 +2970,40 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 // need the magnitude later
                 // float velmag = (float)Util.GetMagnitude(llvel);
 
-                SceneObjectGroup new_group = World.RezObject(m_host, item, pos, rot, vel, param);
+                List<SceneObjectGroup> new_groups = World.RezObject(m_host, item, pos, rot, vel, param);
 
                 // If either of these are null, then there was an unknown error.
-                if (new_group == null)
+                if (new_groups == null)
                     return;
 
-                // objects rezzed with this method are die_at_edge by default.
-                new_group.RootPart.SetDieAtEdge(true);
+                foreach (SceneObjectGroup group in new_groups)
+                {
+                    // objects rezzed with this method are die_at_edge by default.
+                    group.RootPart.SetDieAtEdge(true);
 
-                new_group.ResumeScripts();
+                    group.ResumeScripts();
 
-                m_ScriptEngine.PostObjectEvent(m_host.LocalId, new EventParams(
-                        "object_rez", new Object[] {
-                        new LSL_String(
-                        new_group.RootPart.UUID.ToString()) },
-                        new DetectParams[0]));
+                    m_ScriptEngine.PostObjectEvent(m_host.LocalId, new EventParams(
+                            "object_rez", new Object[] {
+                            new LSL_String(
+                            group.RootPart.UUID.ToString()) },
+                            new DetectParams[0]));
 
-                float groupmass = new_group.GetMass();
+                    float groupmass = group.GetMass();
 
-                PhysicsActor pa = new_group.RootPart.PhysActor;
+                    PhysicsActor pa = group.RootPart.PhysActor;
 
-                //Recoil.
-                if (pa != null && pa.IsPhysical && (Vector3)vel != Vector3.Zero)
-                {
-                    Vector3 recoil = -vel * groupmass * m_recoilScaleFactor;
-                    if (recoil != Vector3.Zero)
+                    //Recoil.
+                    if (pa != null && pa.IsPhysical && (Vector3)vel != Vector3.Zero)
                     {
-                        llApplyImpulse(recoil, 0);
+                        Vector3 recoil = -vel * groupmass * m_recoilScaleFactor;
+                        if (recoil != Vector3.Zero)
+                        {
+                            llApplyImpulse(recoil, 0);
+                        }
                     }
+                    // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay)
                 }
-                // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay)
             });
 
             //ScriptSleep((int)((groupmass * velmag) / 10));
-- 
cgit v1.1


From 766a31431e41033b9cddf5759e9b6e1b4c77682a Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 15 Oct 2013 17:02:22 -0700
Subject: BulletSim: implement the SL bug where VEHICLE_HOVER_UP_ONLY disables
 the vehicle buoyancy if the vehicle is above its hover height.

This is a known misfeature of this vehicle flag which has been accepted
since it would break too many implementations. The problem is noticed
when creating a jetski-like vehicle that jumps over sand bars. A boat
normally is configured with neutral buoyancy and hovering at water
height. When it jumps the sandbar, it needs to have gravity applied
to get back to water level.
---
 OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index f0d17d3..7b98f9d 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -1125,7 +1125,19 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 {
                     // If body is already heigher, use its height as target height
                     if (VehiclePosition.Z > m_VhoverTargetHeight)
+                    {
                         m_VhoverTargetHeight = VehiclePosition.Z;
+
+                        // A 'misfeature' of this flag is that if the vehicle is above it's hover height,
+                        //     the vehicle's buoyancy goes away. This is an SL bug that got used by so many
+                        //    scripts that it could not be changed.
+                        // So, if above the height, reapply gravity if buoyancy had it turned off.
+                        if (m_VehicleBuoyancy != 0)
+                        {
+                            Vector3 appliedGravity = ControllingPrim.ComputeGravity(ControllingPrim.Buoyancy) * m_vehicleMass;
+                            VehicleAddForce(appliedGravity);
+                        }
+                    }
                 }
 
                 if ((m_flags & VehicleFlag.LOCK_HOVER_HEIGHT) != 0)
-- 
cgit v1.1


From 8fdf70b87e51bdd2035f5ab54a335fbb50d79e80 Mon Sep 17 00:00:00 2001
From: Fernando Oliveira
Date: Wed, 16 Oct 2013 20:15:04 -0500
Subject: * Fixes mantis mantis 0006803 [PGSQL] - Simulator crashes -
 Mono.Security.dll missing.    The root of the issue is that the Postgres
 driver relies on Mono.Security.dll from the mono project.   Unfortunately,
 when using Mono, including the dll in the distribution causes conflicts. 
 This solution puts Mono.Security.dll in bin/lib/NET/  and, if windows .NET is
 the runtime, informs the assembly loader to load
 bin/lib/NET/Mono.Security.dll when .NET is scanning for the Mono.Security
 namespace.   On Mono, the included Mono.Security assembly is ignored.

---
 OpenSim/Data/PGSQL/PGSQLFramework.cs |  23 +++++++++++++++++++++++
 OpenSim/Data/PGSQL/PGSQLManager.cs   |  24 ++++++++++++++++++++++++
 bin/lib/NET/Mono.Security.dll        | Bin 0 -> 282624 bytes
 3 files changed, 47 insertions(+)
 create mode 100644 bin/lib/NET/Mono.Security.dll

diff --git a/OpenSim/Data/PGSQL/PGSQLFramework.cs b/OpenSim/Data/PGSQL/PGSQLFramework.cs
index 494b0aa..48f8dd3 100644
--- a/OpenSim/Data/PGSQL/PGSQLFramework.cs
+++ b/OpenSim/Data/PGSQL/PGSQLFramework.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Data;
+using System.Reflection;
 using OpenMetaverse;
 using OpenSim.Framework;
 using Npgsql;
@@ -50,8 +51,30 @@ namespace OpenSim.Data.PGSQL
         protected PGSqlFramework(string connectionString)
         {
             m_connectionString = connectionString;
+            InitializeMonoSecurity();
         }
 
+        public void InitializeMonoSecurity()
+        {
+            if (!Util.IsPlatformMono)
+            {
+                AppDomain currentDomain = AppDomain.CurrentDomain;
+                currentDomain.AssemblyResolve += new ResolveEventHandler(ResolveEventHandlerMonoSec);
+            }
+        }
+
+        private System.Reflection.Assembly ResolveEventHandlerMonoSec(object sender, ResolveEventArgs args)
+        {
+            Assembly MyAssembly = null;
+
+            if (args.Name.Substring(0, args.Name.IndexOf(",")) == "Mono.Security")
+            {
+                MyAssembly = Assembly.LoadFrom("lib/NET/Mono.Security.dll");
+            }
+
+            //Return the loaded assembly.
+            return MyAssembly;
+        }
         //////////////////////////////////////////////////////////////
         //
         // All non queries are funneled through one connection
diff --git a/OpenSim/Data/PGSQL/PGSQLManager.cs b/OpenSim/Data/PGSQL/PGSQLManager.cs
index 3ddaf38..2084fe9 100644
--- a/OpenSim/Data/PGSQL/PGSQLManager.cs
+++ b/OpenSim/Data/PGSQL/PGSQLManager.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.IO;
 using System.Reflection;
+using OpenSim.Framework;
 using log4net;
 using OpenMetaverse;
 using Npgsql;
@@ -56,6 +57,29 @@ namespace OpenSim.Data.PGSQL
         public PGSQLManager(string connection)
         {
             connectionString = connection;
+            InitializeMonoSecurity();
+        }
+
+        public void InitializeMonoSecurity()
+        {
+            if (!Util.IsPlatformMono)
+            {
+                AppDomain currentDomain = AppDomain.CurrentDomain;
+                currentDomain.AssemblyResolve += new ResolveEventHandler(ResolveEventHandlerMonoSec);
+            }
+        }
+
+        private System.Reflection.Assembly ResolveEventHandlerMonoSec(object sender, ResolveEventArgs args)
+        {
+            Assembly MyAssembly = null;
+
+            if (args.Name.Substring(0, args.Name.IndexOf(",")) == "Mono.Security")
+            {
+                MyAssembly = Assembly.LoadFrom("lib/NET/Mono.Security.dll");
+            }
+
+            //Return the loaded assembly.
+            return MyAssembly;
         }
 
         /// <summary>
diff --git a/bin/lib/NET/Mono.Security.dll b/bin/lib/NET/Mono.Security.dll
new file mode 100644
index 0000000..6accde7
Binary files /dev/null and b/bin/lib/NET/Mono.Security.dll differ
-- 
cgit v1.1


From f83343d3022d568f4fdbbfa79fee867ba4d2e9ec Mon Sep 17 00:00:00 2001
From: Fernando Oliveira
Date: Wed, 16 Oct 2013 21:20:11 -0500
Subject: * One More thing, add an appdomain data element to ensure that we
 don't duplicate the assembly resolving.

---
 OpenSim/Data/PGSQL/PGSQLFramework.cs | 10 ++++++++--
 OpenSim/Data/PGSQL/PGSQLManager.cs   |  9 +++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Data/PGSQL/PGSQLFramework.cs b/OpenSim/Data/PGSQL/PGSQLFramework.cs
index 48f8dd3..1028e4e 100644
--- a/OpenSim/Data/PGSQL/PGSQLFramework.cs
+++ b/OpenSim/Data/PGSQL/PGSQLFramework.cs
@@ -58,8 +58,14 @@ namespace OpenSim.Data.PGSQL
         {
             if (!Util.IsPlatformMono)
             {
-                AppDomain currentDomain = AppDomain.CurrentDomain;
-                currentDomain.AssemblyResolve += new ResolveEventHandler(ResolveEventHandlerMonoSec);
+
+                if (AppDomain.CurrentDomain.GetData("MonoSecurityPostgresAdded") == null)
+                {
+                    AppDomain.CurrentDomain.SetData("MonoSecurityPostgresAdded", "true");
+
+                    AppDomain currentDomain = AppDomain.CurrentDomain;
+                    currentDomain.AssemblyResolve += new ResolveEventHandler(ResolveEventHandlerMonoSec);
+                }
             }
         }
 
diff --git a/OpenSim/Data/PGSQL/PGSQLManager.cs b/OpenSim/Data/PGSQL/PGSQLManager.cs
index 2084fe9..97f40b2 100644
--- a/OpenSim/Data/PGSQL/PGSQLManager.cs
+++ b/OpenSim/Data/PGSQL/PGSQLManager.cs
@@ -64,8 +64,13 @@ namespace OpenSim.Data.PGSQL
         {
             if (!Util.IsPlatformMono)
             {
-                AppDomain currentDomain = AppDomain.CurrentDomain;
-                currentDomain.AssemblyResolve += new ResolveEventHandler(ResolveEventHandlerMonoSec);
+                if (AppDomain.CurrentDomain.GetData("MonoSecurityPostgresAdded") == null)
+                {
+                    AppDomain.CurrentDomain.SetData("MonoSecurityPostgresAdded", "true");
+
+                    AppDomain currentDomain = AppDomain.CurrentDomain;
+                    currentDomain.AssemblyResolve += new ResolveEventHandler(ResolveEventHandlerMonoSec);
+                }
             }
         }
 
-- 
cgit v1.1


From 67ffb64764aa109eee479444318b095730644c6d Mon Sep 17 00:00:00 2001
From: Fernando Oliveira
Date: Wed, 16 Oct 2013 23:38:13 -0300
Subject: Corrected estateID to EstateID on getEstates function at
 PGSQLEstateData.cs

---
 OpenSim/Data/PGSQL/PGSQLEstateData.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Data/PGSQL/PGSQLEstateData.cs b/OpenSim/Data/PGSQL/PGSQLEstateData.cs
index 141b8ed..5ad0eaa 100644
--- a/OpenSim/Data/PGSQL/PGSQLEstateData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLEstateData.cs
@@ -452,7 +452,7 @@ namespace OpenSim.Data.PGSQL
         public List<int> GetEstates(string search)
         {
             List<int> result = new List<int>();
-            string sql = "select \"estateID\" from estate_settings where lower(\"EstateName\") = lower(:EstateName)";
+            string sql = "select \"EstateID\" from estate_settings where lower(\"EstateName\") = lower(:EstateName)";
             using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             {
                 conn.Open();
-- 
cgit v1.1


From 622135671282f9fc9ba64cf81960301d7d4ccbeb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 17 Oct 2013 22:28:58 +0100
Subject: Removing Mono.Security.dll temporarily so that it can be re-added
 with origin information

---
 bin/lib/NET/Mono.Security.dll | Bin 282624 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 bin/lib/NET/Mono.Security.dll

diff --git a/bin/lib/NET/Mono.Security.dll b/bin/lib/NET/Mono.Security.dll
deleted file mode 100644
index 6accde7..0000000
Binary files a/bin/lib/NET/Mono.Security.dll and /dev/null differ
-- 
cgit v1.1


From 1bd89ac2877683a9dfa3693f7407028744c81e4c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 17 Oct 2013 22:31:15 +0100
Subject: Readding Mono.Security.dll.  This comes from
 http://pgfoundry.org/frs/download.php/3354/Npgsql2.0.12.0-bin-ms.net3.5sp1.zip

This is identical to what was previously there but need to record origin information
---
 bin/lib/NET/Mono.Security.dll | Bin 0 -> 282624 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 bin/lib/NET/Mono.Security.dll

diff --git a/bin/lib/NET/Mono.Security.dll b/bin/lib/NET/Mono.Security.dll
new file mode 100644
index 0000000..6accde7
Binary files /dev/null and b/bin/lib/NET/Mono.Security.dll differ
-- 
cgit v1.1


From 0094971186b7ba96df454acdf221f702bc214be5 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Mon, 16 Sep 2013 13:31:48 +0300
Subject: After finishing to edit an attachment, let other avatars see the
 changes. (The changes weren't visible before because updates to attachments
 aren't sent while the attachment is selected.)

---
 OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 9 ++-------
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs      | 3 ++-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 998c19e..cddf818 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -244,25 +244,20 @@ namespace OpenSim.Region.Framework.Scenes
             if (part.ParentGroup.RootPart.LocalId != part.LocalId)
                 return;
 
-            bool isAttachment = false;
-            
             // This is wrong, wrong, wrong. Selection should not be
             // handled by group, but by prim. Legacy cruft.
             // TODO: Make selection flagging per prim!
             //
             part.ParentGroup.IsSelected = false;
             
-            if (part.ParentGroup.IsAttachment)
-                isAttachment = true;
-            else
-                part.ParentGroup.ScheduleGroupForFullUpdate();
+            part.ParentGroup.ScheduleGroupForFullUpdate();
 
             // If it's not an attachment, and we are allowed to move it,
             // then we might have done so. If we moved across a parcel
             // boundary, we will need to recount prims on the parcels.
             // For attachments, that makes no sense.
             //
-            if (!isAttachment)
+            if (!part.ParentGroup.IsAttachment)
             {
                 if (Permissions.CanEditObject(
                         part.UUID, remoteClient.AgentId) 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index b3e6b67..9e6c25d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2700,7 +2700,8 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
 
             // This was pulled from SceneViewer. Attachments always receive full updates.
-            // I could not verify if this is a requirement but this maintains existing behavior
+            // This is needed because otherwise if only the root prim changes position, then
+            // it looks as if the entire object has moved (including the other prims).
             if (ParentGroup.IsAttachment)
             {
                 ScheduleFullUpdate();
-- 
cgit v1.1


From 571a75f93468fb0ee9f6fd29401ba578f25b47e3 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 18 Oct 2013 09:15:08 -0700
Subject: BulletSim: update lib32/libBulletSim.dylib to current BulletSim C++
 API.

---
 bin/lib32/libBulletSim.dylib | Bin 1181656 -> 1510988 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/lib32/libBulletSim.dylib b/bin/lib32/libBulletSim.dylib
index 02f8a7f..6efec3a 100755
Binary files a/bin/lib32/libBulletSim.dylib and b/bin/lib32/libBulletSim.dylib differ
-- 
cgit v1.1


From 84a149ecbff485400a4d1032677c8f15946ccb29 Mon Sep 17 00:00:00 2001
From: Kevin Cozens
Date: Tue, 15 Oct 2013 21:15:48 -0400
Subject: Call ScriptSleep() instead of llSleep() in routine for llEmail.

Signed-off-by: teravus <teravus@gmail.com>
---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index b19ed0a..8650b91 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3325,7 +3325,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
 
             emailModule.SendEmail(m_host.UUID, address, subject, message);
-            llSleep(EMAIL_PAUSE_TIME);
+            ScriptSleep(EMAIL_PAUSE_TIME * 1000);
         }
 
         public void llGetNextEmail(string address, string subject)
-- 
cgit v1.1


From a7e7bed66096a6ccd2bea8fd46ec2732e7420fd0 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 19 Oct 2013 11:44:27 -0700
Subject: BulletSim: update SOs and DLLs with version that enables compressed
 AABB maps for Bvh meshes. This greatly reduces the memory usage for large
 meshes and for mesh terrain in particular.

---
 bin/lib32/BulletSim.dll   | Bin 1093632 -> 992768 bytes
 bin/lib32/libBulletSim.so | Bin 2332216 -> 2332216 bytes
 bin/lib64/BulletSim.dll   | Bin 1230848 -> 1231872 bytes
 bin/lib64/libBulletSim.so | Bin 2522559 -> 2522559 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 7c16cb5..187d150 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 3d2737b..e60bdd3 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 3afdf63..e8738e1 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 6a17848..ef3eb3a 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1


From 4830431eb0a73f28b7e5eaa76cf6054230327b1d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 22 Oct 2013 01:02:40 +0100
Subject: Add current .NET windows framework requirement to README.

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 118fe71..6309385 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,8 @@ need to build OpenSim before running it.
 
 # Running OpenSim on Windows
 
+You will need .NET Framework 3.5 installed to run OpenSimulator.
+
 We recommend that you run OpenSim from a command prompt on Windows in order
 to capture any errors.
 
-- 
cgit v1.1


From 511122834b5cd95839029d28365e479dc25eae9d Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 23 Oct 2013 16:07:03 -0700
Subject: BulletSim: change collision flags for groundplane to not interact
 with static objects. Reorder collision flag setting code for terrain to fit
 pattern used elsewhere.

---
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs            | 5 +++++
 OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | 5 ++---
 OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs   | 7 ++++---
 OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs      | 3 ++-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 43aa63e..834228e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -120,6 +120,7 @@ public static class BSParam
 	public static float NumberOfSolverIterations { get; private set; }
     public static bool UseSingleSidedMeshes { get; private set; }
     public static float GlobalContactBreakingThreshold { get; private set; }
+    public static float PhysicsUnmanLoggingFrames { get; private set; }
 
     // Avatar parameters
     public static float AvatarFriction { get; private set; }
@@ -671,6 +672,10 @@ public static class BSParam
             0f,
             (s) => { return GlobalContactBreakingThreshold; },
             (s,v) => { GlobalContactBreakingThreshold = v; s.UnmanagedParams[0].globalContactBreakingThreshold = v; } ),
+	    new ParameterDefn<float>("PhysicsUnmanLoggingFrames", "If non-zero, frames between output of detailed unmanaged physics statistics",
+            0f,
+            (s) => { return PhysicsUnmanLoggingFrames; },
+            (s,v) => { PhysicsUnmanLoggingFrames = v; s.UnmanagedParams[0].physicsLoggingFrames = v; } ),
 
 	    new ParameterDefn<int>("CSHullMaxDepthSplit", "CS impl: max depth to split for hull. 1-10 but > 7 is iffy",
             7 ),
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
index c7deb4e..8888d6d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
@@ -112,15 +112,14 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys
         m_physicsScene.PE.SetRestitution(m_mapInfo.terrainBody, BSParam.TerrainRestitution);
         m_physicsScene.PE.SetCollisionFlags(m_mapInfo.terrainBody, CollisionFlags.CF_STATIC_OBJECT);
 
+        m_mapInfo.terrainBody.collisionType = CollisionType.Terrain;
+
         // Return the new terrain to the world of physical objects
         m_physicsScene.PE.AddObjectToWorld(m_physicsScene.World, m_mapInfo.terrainBody);
 
         // redo its bounding box now that it is in the world
         m_physicsScene.PE.UpdateSingleAabb(m_physicsScene.World, m_mapInfo.terrainBody);
 
-        m_mapInfo.terrainBody.collisionType = CollisionType.Terrain;
-        m_mapInfo.terrainBody.ApplyCollisionMask(m_physicsScene);
-
         // Make it so the terrain will not move or be considered for movement.
         m_physicsScene.PE.ForceActivationState(m_mapInfo.terrainBody, ActivationState.DISABLE_SIMULATION);
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
index c016eed..441d2d3 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
@@ -138,13 +138,14 @@ public sealed class BSTerrainManager : IDisposable
         m_groundPlane = m_physicsScene.PE.CreateBodyWithDefaultMotionState(groundPlaneShape,
                                         BSScene.GROUNDPLANE_ID, Vector3.Zero, Quaternion.Identity);
 
+        // Everything collides with the ground plane.
+        m_groundPlane.collisionType = CollisionType.Groundplane;
+
         m_physicsScene.PE.AddObjectToWorld(m_physicsScene.World, m_groundPlane);
         m_physicsScene.PE.UpdateSingleAabb(m_physicsScene.World, m_groundPlane);
+
         // Ground plane does not move
         m_physicsScene.PE.ForceActivationState(m_groundPlane, ActivationState.DISABLE_SIMULATION);
-        // Everything collides with the ground plane.
-        m_groundPlane.collisionType = CollisionType.Groundplane;
-        m_groundPlane.ApplyCollisionMask(m_physicsScene);
 
         BSTerrainPhys initialTerrain = new BSTerrainHeightmap(m_physicsScene, Vector3.Zero, BSScene.TERRAIN_ID, DefaultRegionSize);
         lock (m_terrains)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
index d5060e3..971ff9f 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
@@ -235,7 +235,8 @@ public static Dictionary<CollisionType, CollisionTypeFilterGroup> CollisionTypeM
     { CollisionType.Groundplane,
                 new CollisionTypeFilterGroup(CollisionType.Groundplane,
                                 (uint)CollisionFilterGroups.BGroundPlaneGroup,
-                                (uint)CollisionFilterGroups.BAllGroup)
+                                // (uint)CollisionFilterGroups.BAllGroup)
+                                (uint)(CollisionFilterGroups.BCharacterGroup | CollisionFilterGroups.BSolidGroup))
     },
     { CollisionType.Terrain,
                 new CollisionTypeFilterGroup(CollisionType.Terrain,
-- 
cgit v1.1


From 5d61c4039dd4f22b20875a0a9dee72179642da9c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 24 Oct 2013 00:33:14 +0100
Subject: Only set the data present event if we actually queued an outoing
 packet (not if we sent immediately)

---
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs    | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 8d957dc..981f7ef 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -919,6 +919,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (packet.Type == PacketType.CoarseLocationUpdate && allowSplitting)
                 allowSplitting = false;
 
+            bool packetQueued = false;
+
             if (allowSplitting && packet.HasVariableBlocks)
             {
                 byte[][] datas = packet.ToBytesMultiple();
@@ -930,18 +932,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 for (int i = 0; i < packetCount; i++)
                 {
                     byte[] data = datas[i];
-                    SendPacketData(udpClient, data, packet.Type, category, method);
+
+                    if (!SendPacketData(udpClient, data, packet.Type, category, method))
+                        packetQueued = true;
                 }
             }
             else
             {
                 byte[] data = packet.ToBytes();
-                SendPacketData(udpClient, data, packet.Type, category, method);
+                packetQueued = SendPacketData(udpClient, data, packet.Type, category, method);
             }
 
             PacketPool.Instance.ReturnPacket(packet);
 
-            m_dataPresentEvent.Set();
+            if (packetQueued)
+                m_dataPresentEvent.Set();
         }
 
         /// <summary>
@@ -955,7 +960,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// The method to call if the packet is not acked by the client.  If null, then a standard
         /// resend of the packet is done.
         /// </param>
-        public void SendPacketData(
+        /// <returns>true if the data was sent immediately, false if it was queued for sending</returns>
+        public bool SendPacketData(
             LLUDPClient udpClient, byte[] data, PacketType type, ThrottleOutPacketType category, UnackedPacketMethod method)
         {
             int dataLength = data.Length;
@@ -1020,7 +1026,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // packet so that it isn't sent before a queued update packet.
             bool requestQueue = type == PacketType.KillObject;
             if (!outgoingPacket.Client.EnqueueOutgoing(outgoingPacket, requestQueue))
+            {
                 SendPacketFinal(outgoingPacket);
+                return true;
+            }
+            else
+            {
+                return false;
+            }
 
             #endregion Queue or Send
         }
-- 
cgit v1.1


From cccdfcb59eea7f8a43fe34ca55ff89b3317904f2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 24 Oct 2013 00:37:49 +0100
Subject: Comment out LLUDPServer.BroadcastPacket() to reduce code complexity. 
 Appears to be a never used method.

---
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs   | 76 +++++++++++-----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 981f7ef..218c2b2 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -862,44 +862,44 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return x == m_location;
         }
 
-        public void BroadcastPacket(Packet packet, ThrottleOutPacketType category, bool sendToPausedAgents, bool allowSplitting)
-        {
-            // CoarseLocationUpdate and AvatarGroupsReply packets cannot be split in an automated way
-            if ((packet.Type == PacketType.CoarseLocationUpdate || packet.Type == PacketType.AvatarGroupsReply) && allowSplitting)
-                allowSplitting = false;
-
-            if (allowSplitting && packet.HasVariableBlocks)
-            {
-                byte[][] datas = packet.ToBytesMultiple();
-                int packetCount = datas.Length;
-
-                if (packetCount < 1)
-                    m_log.Error("[LLUDPSERVER]: Failed to split " + packet.Type + " with estimated length " + packet.Length);
-
-                for (int i = 0; i < packetCount; i++)
-                {
-                    byte[] data = datas[i];
-                    m_scene.ForEachClient(
-                        delegate(IClientAPI client)
-                        {
-                            if (client is LLClientView)
-                                SendPacketData(((LLClientView)client).UDPClient, data, packet.Type, category, null);
-                        }
-                    );
-                }
-            }
-            else
-            {
-                byte[] data = packet.ToBytes();
-                m_scene.ForEachClient(
-                    delegate(IClientAPI client)
-                    {
-                        if (client is LLClientView)
-                            SendPacketData(((LLClientView)client).UDPClient, data, packet.Type, category, null);
-                    }
-                );
-            }
-        }
+//        public void BroadcastPacket(Packet packet, ThrottleOutPacketType category, bool sendToPausedAgents, bool allowSplitting)
+//        {
+//            // CoarseLocationUpdate and AvatarGroupsReply packets cannot be split in an automated way
+//            if ((packet.Type == PacketType.CoarseLocationUpdate || packet.Type == PacketType.AvatarGroupsReply) && allowSplitting)
+//                allowSplitting = false;
+//
+//            if (allowSplitting && packet.HasVariableBlocks)
+//            {
+//                byte[][] datas = packet.ToBytesMultiple();
+//                int packetCount = datas.Length;
+//
+//                if (packetCount < 1)
+//                    m_log.Error("[LLUDPSERVER]: Failed to split " + packet.Type + " with estimated length " + packet.Length);
+//
+//                for (int i = 0; i < packetCount; i++)
+//                {
+//                    byte[] data = datas[i];
+//                    m_scene.ForEachClient(
+//                        delegate(IClientAPI client)
+//                        {
+//                            if (client is LLClientView)
+//                                SendPacketData(((LLClientView)client).UDPClient, data, packet.Type, category, null);
+//                        }
+//                    );
+//                }
+//            }
+//            else
+//            {
+//                byte[] data = packet.ToBytes();
+//                m_scene.ForEachClient(
+//                    delegate(IClientAPI client)
+//                    {
+//                        if (client is LLClientView)
+//                            SendPacketData(((LLClientView)client).UDPClient, data, packet.Type, category, null);
+//                    }
+//                );
+//            }
+//        }
 
         /// <summary>
         /// Start the process of sending a packet to the client.
-- 
cgit v1.1


From 31989bd51e5bdabbfab874ed79531df5ca172ec1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 24 Oct 2013 21:29:57 +0100
Subject: Show texture ids for full object/part info console commmds

---
 .../World/Objects/Commands/ObjectCommandsModule.cs      | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index 0e79733..e77f0aa 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -631,7 +631,22 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 cdl.AddRow("SculptType", s.SculptType);
                 cdl.AddRow("State", s.State);
 
-                // TODO, unpack and display texture entries
+                // TODO, need to display more information about textures but in a compact format
+                // to stop output becoming huge.
+                for (int i = 0; i < sop.GetNumberOfSides(); i++)               
+                {
+                    Primitive.TextureEntryFace teFace = s.Textures.FaceTextures[i];
+
+                    UUID textureID;
+
+                    if (teFace != null)
+                        textureID = teFace.TextureID;
+                    else
+                        textureID = s.Textures.DefaultTexture.TextureID;
+
+                    cdl.AddRow(string.Format("Face {0} texture ID", i), textureID);
+                }
+
                 //cdl.AddRow("Textures", string.Format("{0} entries", s.Textures.
             }
 
-- 
cgit v1.1


From df76e5231035c8d45b4e8a28c1f21a18b4974b67 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 24 Oct 2013 23:00:02 +0100
Subject: minor: Add commented out code for apparent passing of texture IDs in
 ObjectProperties UDP replies to viewer

Not yet shown that this is used or resolves a bug where not all textures appear on objects with an "XML with textures" upload from singularity 1.8.3
Proper texture entries are actually present and appear properly on relog, but not on select from viewer until at least one face texture is changed.
---
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 6b58fb7..03cd2b4 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4546,6 +4546,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             SceneObjectPart root = sop.ParentGroup.RootPart;
 
             block.TouchName = Util.StringToBytes256(root.TouchName);
+
+            // SL 3.3.4, at least, appears to read this information as a concatenated byte[] stream of UUIDs but
+            // it's not yet clear whether this is actually used.  If this is done in the future then a pre-cached
+            // copy is really needed since it's less efficient to be constantly recreating this byte array.
+//            using (MemoryStream memStream = new MemoryStream())
+//            {
+//                using (BinaryWriter binWriter = new BinaryWriter(memStream))
+//                {
+//                    for (int i = 0; i < sop.GetNumberOfSides(); i++)               
+//                    {
+//                        Primitive.TextureEntryFace teFace = sop.Shape.Textures.FaceTextures[i];
+//
+//                        UUID textureID;
+//
+//                        if (teFace != null)
+//                            textureID = teFace.TextureID;
+//                        else
+//                            textureID = sop.Shape.Textures.DefaultTexture.TextureID;
+//
+//                        binWriter.Write(textureID.GetBytes());
+//                    }
+//
+//                    block.TextureID = memStream.ToArray();
+//                }
+//            }
+           
             block.TextureID = new byte[0]; // TextureID ???
             block.SitName = Util.StringToBytes256(root.SitName);
             block.OwnerMask = root.OwnerMask;
-- 
cgit v1.1


From 5be8f6632be186ae09b395d0f87089df3503d2bb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 25 Oct 2013 00:54:33 +0100
Subject: minor: Fix commented out GridInfo service URL to be 8002 in
 Robust.ini.example rather than 9000 (already done in Robust.HG.ini.example)

---
 bin/Robust.ini.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 6a84574..0660de4 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -425,7 +425,7 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
 
     ; helper uri: optional: if it exists if will be used to tell the client to use
     ;                       this for all economy related things
-    ;economy = http://127.0.0.1:9000/
+    ;economy = http://127.0.0.1:8002/
 
     ; web page of grid: optional: page providing further information about your grid
     ;about = http://127.0.0.1/about/
-- 
cgit v1.1


From 93d5d66fbd44733186439971d819f9409dac4bdd Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 26 Oct 2013 21:20:19 -0700
Subject: BulletSim: update collision flags to make sure they fit in the shorts
 provided.

---
 OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index f7dd158..be6f152 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -249,7 +249,7 @@ public enum CollisionFlags : uint
     BS_VEHICLE_COLLISIONS            = 1 << 12, // return collisions for vehicle ground checking
     BS_RETURN_ROOT_COMPOUND_SHAPE    = 1 << 13, // return the pos/rot of the root shape in a compound shape
     BS_NONE                          = 0,
-    BS_ALL                           = 0xFFFFFFFF
+    BS_ALL                           = 0x7FFF   // collision flags are a signed short
 };
 
 // Values f collisions groups and masks
@@ -265,14 +265,14 @@ public enum CollisionFilterGroups : uint
     BDebrisGroup            = 1 << 3,   // 0008
     BSensorTrigger          = 1 << 4,   // 0010
     BCharacterGroup         = 1 << 5,   // 0020
-    BAllGroup               = 0x000FFFFF,
+    BAllGroup               = 0x0007FFF,        // collision flags are a signed short
     // Filter groups defined by BulletSim
-    BGroundPlaneGroup       = 1 << 10,  // 0400
-    BTerrainGroup           = 1 << 11,  // 0800
-    BRaycastGroup           = 1 << 12,  // 1000
-    BSolidGroup             = 1 << 13,  // 2000
+    BGroundPlaneGroup       = 1 << 8,  // 0400
+    BTerrainGroup           = 1 << 9,  // 0800
+    BRaycastGroup           = 1 << 10,  // 1000
+    BSolidGroup             = 1 << 11,  // 2000
     // BLinksetGroup        = xx  // a linkset proper is either static or dynamic
-    BLinksetChildGroup      = 1 << 14,  // 4000
+    BLinksetChildGroup      = 1 << 12,  // 4000
 };
 
 // CFM controls the 'hardness' of the constraint. 0=fixed, 0..1=violatable. Default=0
-- 
cgit v1.1


From d23ef79f98d03dd8964e56a412f1417893cff7ec Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 26 Oct 2013 21:30:51 -0700
Subject: BulletSim: restore collision flags when clear collision cache. THis
 fixes the extranious addition of objects to the collision cache which created
 extra CPU overhead.

---
 bin/lib32/BulletSim.dll   | Bin 992768 -> 1094144 bytes
 bin/lib32/libBulletSim.so | Bin 2332216 -> 2337209 bytes
 bin/lib64/BulletSim.dll   | Bin 1231872 -> 1231360 bytes
 bin/lib64/libBulletSim.so | Bin 2522559 -> 2523676 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 187d150..ee7cce7 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index e60bdd3..ee2bd80 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index e8738e1..b4c4bec 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index ef3eb3a..9c4033b 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1


From 39de7614ec14babe092a2dd47072fd4a5015fdbb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 28 Oct 2013 18:03:34 +0000
Subject: Remove legacy sqlite lines added internally by OpenSimulator to the
 [Startup] section.

These are long unused but confusingly will be seen in the [Startup] section on a "config save".
---
 OpenSim/Framework/ConfigSettings.cs               | 1 -
 OpenSim/Region/Application/ConfigurationLoader.cs | 3 ---
 OpenSim/Tools/Configger/ConfigurationLoader.cs    | 5 +----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs
index 002a371..108a3e4 100644
--- a/OpenSim/Framework/ConfigSettings.cs
+++ b/OpenSim/Framework/ConfigSettings.cs
@@ -31,7 +31,6 @@ namespace OpenSim.Framework
     {
         public string PhysicsEngine                 { get; set; }
         public string MeshEngineName                { get; set; }
-        public string StorageDll                    { get; set; }
         public string ClientstackDll                { get; set; }
         public string LibrariesXMLFile              { get; set; }
 
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 010ae5a..e3e0c01 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -338,8 +338,6 @@ namespace OpenSim
                 config.Set("meshing", "Meshmerizer");
                 config.Set("physical_prim", 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");
                 config.Set("storage_prim_inventories", true);
                 config.Set("startup_console_commands_file", String.Empty);
                 config.Set("shutdown_console_commands_file", String.Empty);
@@ -371,7 +369,6 @@ namespace OpenSim
             {
                 m_configSettings.PhysicsEngine = startupConfig.GetString("physics");
                 m_configSettings.MeshEngineName = startupConfig.GetString("meshing");
-                m_configSettings.StorageDll = startupConfig.GetString("storage_plugin");
 
                 m_configSettings.ClientstackDll 
                     = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs
index 72ba185..0b6ee9c 100644
--- a/OpenSim/Tools/Configger/ConfigurationLoader.cs
+++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs
@@ -240,8 +240,6 @@ namespace OpenSim.Tools.Configger
                 config.Set("meshing", "Meshmerizer");
                 config.Set("physical_prim", 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");
                 config.Set("storage_prim_inventories", true);
                 config.Set("startup_console_commands_file", String.Empty);
                 config.Set("shutdown_console_commands_file", String.Empty);
@@ -253,6 +251,5 @@ namespace OpenSim.Tools.Configger
 
             return defaultConfig;
         }
-
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1


From edaf0a98d6e23932139920fe1999f94e9601483e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 29 Oct 2013 23:37:22 +0000
Subject: Give the caller AddMapTile a valid reason response if this failed due
 to blank response from server or connection failure.

Raise log lines which indicate problems to warning from debug
---
 .../Connectors/MapImage/MapImageServicesConnector.cs  | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
index 30bfb70..cc485f7 100644
--- a/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
+++ b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
@@ -114,29 +114,32 @@ namespace OpenSim.Services.Connectors
                     }
                     else if (replyData.ContainsKey("Result") && (replyData["Result"].ToString().ToLower() == "failure"))
                     {
-                        m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Registration failed: {0}", replyData["Message"].ToString());
-                        reason = replyData["Message"].ToString();
+                        reason = string.Format("Map post to {0} failed: {1}", uri, replyData["Message"].ToString());
+                        m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason);
+
                         return false;
                     }
                     else if (!replyData.ContainsKey("Result"))
                     {
-                        m_log.DebugFormat("[MAP IMAGE CONNECTOR]: reply data does not contain result field");
+                        reason = string.Format("Reply data from {0} does not contain result field", uri);
+                        m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason);
                     }
                     else
                     {
-                        m_log.DebugFormat("[MAP IMAGE CONNECTOR]: unexpected result {0}", replyData["Result"].ToString());
-                        reason = "Unexpected result " + replyData["Result"].ToString();
+                        reason = string.Format("Unexpected result {0} from {1}" + replyData["Result"].ToString(), uri);
+                        m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason);
                     }
-
                 }
                 else
                 {
-                    m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Map post received null reply");
+                    reason = string.Format("Map post received null reply from {0}", uri);
+                    m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason);
                 }
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Exception when contacting map server at {0}: {1}", uri, e.Message);
+                reason = string.Format("Exception when posting to map server at {0}: {1}", uri, e.Message);
+                m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason);
             }
             finally
             {
-- 
cgit v1.1


From 28f36d8db5b60c2053813416b867ef0d9501995f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 30 Oct 2013 18:32:53 +0000
Subject: Put fcache commands output to console, not log

---
 .../Region/CoreModules/Asset/FlotsamAssetCache.cs  | 53 ++++++++++------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 2afe065..103228f 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -36,12 +36,10 @@ using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Threading;
 using System.Timers;
-
 using log4net;
 using Nini.Config;
 using Mono.Addins;
 using OpenMetaverse;
-
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Region.Framework.Interfaces;
@@ -810,34 +808,36 @@ namespace OpenSim.Region.CoreModules.Asset
         #region Console Commands
         private void HandleConsoleCommand(string module, string[] cmdparams)
         {
+            ICommandConsole con = MainConsole.Instance;
+
             if (cmdparams.Length >= 2)
             {
                 string cmd = cmdparams[1];
+
                 switch (cmd)
                 {
                     case "status":
                         if (m_MemoryCacheEnabled)
-                            m_log.InfoFormat("[FLOTSAM ASSET CACHE]: Memory Cache : {0} assets", m_MemoryCache.Count);
+                            con.OutputFormat("Memory Cache : {0} assets", m_MemoryCache.Count);
                         else
-                            m_log.InfoFormat("[FLOTSAM ASSET CACHE]: Memory cache disabled");
+                            con.OutputFormat("Memory cache disabled");
 
                         if (m_FileCacheEnabled)
                         {
                             int fileCount = GetFileCacheCount(m_CacheDirectory);
-                            m_log.InfoFormat("[FLOTSAM ASSET CACHE]: File Cache : {0} assets", fileCount);
+                            con.OutputFormat("File Cache : {0} assets", fileCount);
+                            con.Output("Deep scans have previously been performed on the following regions:");
     
                             foreach (string s in Directory.GetFiles(m_CacheDirectory, "*.fac"))
-                            {
-                                m_log.Info("[FLOTSAM ASSET CACHE]: Deep scans have previously been performed on the following regions:");
-    
+                            {                                    
                                 string RegionID = s.Remove(0,s.IndexOf("_")).Replace(".fac","");
                                 DateTime RegionDeepScanTMStamp = File.GetLastWriteTime(s);
-                                m_log.InfoFormat("[FLOTSAM ASSET CACHE]: Region: {0}, {1}", RegionID, RegionDeepScanTMStamp.ToString("MM/dd/yyyy hh:mm:ss"));
+                                con.OutputFormat("Region: {0}, {1}", RegionID, RegionDeepScanTMStamp.ToString("MM/dd/yyyy hh:mm:ss"));
                             }
                         }
                         else
                         {
-                            m_log.InfoFormat("[FLOTSAM ASSET CACHE]: File cache disabled");
+                            con.Output("File cache disabled");
                         }
 
                         break;
@@ -845,7 +845,7 @@ namespace OpenSim.Region.CoreModules.Asset
                     case "clear":
                         if (cmdparams.Length < 2)
                         {
-                            m_log.Warn("[FLOTSAM ASSET CACHE]: Usage is fcache clear [file] [memory]");
+                            con.Output("Usage is fcache clear [file] [memory]");
                             break;
                         }
 
@@ -869,11 +869,11 @@ namespace OpenSim.Region.CoreModules.Asset
                             if (m_MemoryCacheEnabled)
                             {
                                 m_MemoryCache.Clear();
-                                m_log.Info("[FLOTSAM ASSET CACHE]: Memory cache cleared.");
+                                con.Output("Memory cache cleared.");
                             }
                             else
                             {
-                                m_log.Info("[FLOTSAM ASSET CACHE]: Memory cache not enabled.");
+                                con.Output("Memory cache not enabled.");
                             }
                         }
     
@@ -882,24 +882,22 @@ namespace OpenSim.Region.CoreModules.Asset
                             if (m_FileCacheEnabled)
                             {
                                 ClearFileCache();
-                                m_log.Info("[FLOTSAM ASSET CACHE]: File cache cleared.");
+                                con.Output("File cache cleared.");
                             }
                             else
                             {
-                                m_log.Info("[FLOTSAM ASSET CACHE]: File cache not enabled.");
+                                con.Output("File cache not enabled.");
                             }
                         }
 
                         break;
 
                     case "assets":
-                        m_log.Info("[FLOTSAM ASSET CACHE]: Ensuring assets are cached for all scenes.");
+                        con.Output("Ensuring assets are cached for all scenes.");
 
                         Util.FireAndForget(delegate {
                             int assetReferenceTotal = TouchAllSceneAssets(true);
-                            m_log.InfoFormat(
-                                "[FLOTSAM ASSET CACHE]: Completed check with {0} assets.",
-                                assetReferenceTotal);
+                            con.OutputFormat("Completed check with {0} assets.", assetReferenceTotal);
                         });
 
                         break;
@@ -907,7 +905,7 @@ namespace OpenSim.Region.CoreModules.Asset
                     case "expire":
                         if (cmdparams.Length < 3)
                         {
-                            m_log.InfoFormat("[FLOTSAM ASSET CACHE]: Invalid parameters for Expire, please specify a valid date & time", cmd);
+                            con.OutputFormat("Invalid parameters for Expire, please specify a valid date & time", cmd);
                             break;
                         }
 
@@ -925,28 +923,27 @@ namespace OpenSim.Region.CoreModules.Asset
 
                         if (!DateTime.TryParse(s_expirationDate, out expirationDate))
                         {
-                            m_log.InfoFormat("[FLOTSAM ASSET CACHE]: {0} is not a valid date & time", cmd);
+                            con.OutputFormat("{0} is not a valid date & time", cmd);
                             break;
                         }
 
                         if (m_FileCacheEnabled)
                             CleanExpiredFiles(m_CacheDirectory, expirationDate);
                         else
-                            m_log.InfoFormat("[FLOTSAM ASSET CACHE]: File cache not active, not clearing.");
+                            con.OutputFormat("File cache not active, not clearing.");
 
                         break;
                     default:
-                        m_log.InfoFormat("[FLOTSAM ASSET CACHE]: Unknown command {0}", cmd);
+                        con.OutputFormat("Unknown command {0}", cmd);
                         break;
                 }
             }
             else if (cmdparams.Length == 1)
             {
-                m_log.InfoFormat("[FLOTSAM ASSET CACHE]: fcache status - Display cache status");
-                m_log.InfoFormat("[FLOTSAM ASSET CACHE]: fcache clearmem - Remove all assets cached in memory");
-                m_log.InfoFormat("[FLOTSAM ASSET CACHE]: fcache clearfile - Remove all assets cached on disk");
-                m_log.InfoFormat("[FLOTSAM ASSET CACHE]: fcache cachescenes - Attempt a deep cache of all assets in all scenes");
-                m_log.InfoFormat("[FLOTSAM ASSET CACHE]: fcache <datetime> - Purge assets older then the specified date & time");
+                con.Output("fcache assets - Attempt a deep cache of all assets in all scenes");
+                con.Output("fcache expire <datetime> - Purge assets older then the specified date & time");
+                con.Output("fcache clear [file] [memory] - Remove cached assets");
+                con.Output("fcache status - Display cache status");
             }
         }
 
-- 
cgit v1.1


From fdd1c63c3c1333c8ec833a669de76e07d2ff0159 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 30 Oct 2013 18:57:51 +0000
Subject: Make "fcache status" command also display information on disk/mem
 cache hit rate that is currently only displayed if LogLevel >=1 in
 [AssetCache] config

---
 .../Region/CoreModules/Asset/FlotsamAssetCache.cs  | 56 +++++++++++++++-------
 1 file changed, 38 insertions(+), 18 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 103228f..08d4fc0 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -31,6 +31,7 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
@@ -74,8 +75,6 @@ namespace OpenSim.Region.CoreModules.Asset
         private static ulong m_RequestsForInprogress;
         private static ulong m_DiskHits;
         private static ulong m_MemoryHits;
-        private static double m_HitRateMemory;
-        private static double m_HitRateFile;
 
 #if WAIT_ON_INPROGRESS_REQUESTS
         private Dictionary<string, ManualResetEvent> m_CurrentlyWriting = new Dictionary<string, ManualResetEvent>();
@@ -427,18 +426,9 @@ namespace OpenSim.Region.CoreModules.Asset
 
             if (((m_LogLevel >= 1)) && (m_HitRateDisplay != 0) && (m_Requests % m_HitRateDisplay == 0))
             {
-                m_HitRateFile = (double)m_DiskHits / m_Requests * 100.0;
-
                 m_log.InfoFormat("[FLOTSAM ASSET CACHE]: Cache Get :: {0} :: {1}", id, asset == null ? "Miss" : "Hit");
-                m_log.InfoFormat("[FLOTSAM ASSET CACHE]: File Hit Rate {0}% for {1} requests", m_HitRateFile.ToString("0.00"), m_Requests);
-
-                if (m_MemoryCacheEnabled)
-                {
-                    m_HitRateMemory = (double)m_MemoryHits / m_Requests * 100.0;
-                    m_log.InfoFormat("[FLOTSAM ASSET CACHE]: Memory Hit Rate {0}% for {1} requests", m_HitRateMemory.ToString("0.00"), m_Requests);
-                }
 
-                m_log.InfoFormat("[FLOTSAM ASSET CACHE]: {0} unnessesary requests due to requests for assets that are currently downloading.", m_RequestsForInprogress);
+                GenerateCacheHitReport().ForEach(l => m_log.InfoFormat("[FLOTSAM ASSET CACHE]: {0}", l));
             }
 
             return asset;
@@ -805,6 +795,30 @@ namespace OpenSim.Region.CoreModules.Asset
             }
         }
 
+        private List<string> GenerateCacheHitReport()
+        {
+            List<string> outputLines = new List<string>();
+
+            double fileHitRate = (double)m_DiskHits / m_Requests * 100.0;
+            outputLines.Add(
+                string.Format("File Hit Rate: {0}% for {1} requests", fileHitRate.ToString("0.00"), m_Requests));
+
+            if (m_MemoryCacheEnabled)
+            {
+                double memHitRate = (double)m_MemoryHits / m_Requests * 100.0;
+
+                outputLines.Add(
+                    string.Format("Memory Hit Rate: {0}% for {1} requests", memHitRate.ToString("0.00"), m_Requests));
+            }
+
+            outputLines.Add(
+                string.Format(
+                    "Unnecessary requests due to requests for assets that are currently downloading: {0}", 
+                    m_RequestsForInprogress));
+
+            return outputLines;
+        }
+
         #region Console Commands
         private void HandleConsoleCommand(string module, string[] cmdparams)
         {
@@ -818,14 +832,24 @@ namespace OpenSim.Region.CoreModules.Asset
                 {
                     case "status":
                         if (m_MemoryCacheEnabled)
-                            con.OutputFormat("Memory Cache : {0} assets", m_MemoryCache.Count);
+                            con.OutputFormat("Memory Cache: {0} assets", m_MemoryCache.Count);
                         else
                             con.OutputFormat("Memory cache disabled");
 
                         if (m_FileCacheEnabled)
                         {
                             int fileCount = GetFileCacheCount(m_CacheDirectory);
-                            con.OutputFormat("File Cache : {0} assets", fileCount);
+                            con.OutputFormat("File Cache: {0} assets", fileCount);
+                        }
+                        else
+                        {
+                            con.Output("File cache disabled");
+                        }
+
+                        GenerateCacheHitReport().ForEach(l => con.Output(l));
+
+                        if (m_FileCacheEnabled)
+                        {
                             con.Output("Deep scans have previously been performed on the following regions:");
     
                             foreach (string s in Directory.GetFiles(m_CacheDirectory, "*.fac"))
@@ -835,10 +859,6 @@ namespace OpenSim.Region.CoreModules.Asset
                                 con.OutputFormat("Region: {0}, {1}", RegionID, RegionDeepScanTMStamp.ToString("MM/dd/yyyy hh:mm:ss"));
                             }
                         }
-                        else
-                        {
-                            con.Output("File cache disabled");
-                        }
 
                         break;
 
-- 
cgit v1.1


From 46a4c32e27e17aa083fe0008b45838f30b36540e Mon Sep 17 00:00:00 2001
From: dahlia
Date: Wed, 30 Oct 2013 22:01:34 -0700
Subject: update libomv to 5b4c1e8694479629f7cacd72dd6bc39a6b327f9c (git master
 as of time of this commit)

---
 bin/OpenMetaverse.Rendering.Meshmerizer.dll | Bin 24576 -> 20480 bytes
 bin/OpenMetaverse.StructuredData.dll        | Bin 102400 -> 102400 bytes
 bin/OpenMetaverse.dll                       | Bin 1785856 -> 1794048 bytes
 bin/OpenMetaverseTypes.dll                  | Bin 114688 -> 110592 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index 100916c..e63593e 100755
Binary files a/bin/OpenMetaverse.Rendering.Meshmerizer.dll and b/bin/OpenMetaverse.Rendering.Meshmerizer.dll differ
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index bb16ed0..d6a3247 100755
Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 59e8083..3d89548 100755
Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index 7ee907b..213555c 100755
Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ
-- 
cgit v1.1


From 0e07fad2e16ef135c71440ae3c6c909c4eee4a86 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 31 Oct 2013 20:19:57 +0000
Subject: minor: update pCampbot usage/help statement

---
 OpenSim/Tools/pCampBot/pCampBot.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index 781bb00..1fb0e03 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -151,17 +151,17 @@ namespace pCampBot
             // worn to the folder MyAppearance/FirstName_LastName, and the load it.
 
             Console.WriteLine(
-                "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n"
+                "Usage: pCampBot -loginuri <loginuri> -firstname <first-name> -lastname <last-name> -password <password> [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"
+                    + "  -s, -start         start location for bots (default: last) (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"
+                    + "  -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"
+                    + "  -b, behaviours     behaviours for bots.  Comma separated, e.g. p,g (default: p) (optional)\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"
-- 
cgit v1.1


From eb52d346c0d4362f426e42854b3f7fb46d4fea97 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Thu, 31 Oct 2013 16:13:03 -0700
Subject: add new LSL constants associated with new "ribbon", "glow", and
 "blend" particle system functionality. Note that this does *not* complete
 required server side changes for implementing the new particle system

---
 .../Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 1137ad8..a073862 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -106,6 +106,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int PSYS_PART_TARGET_POS_MASK = 64;
         public const int PSYS_PART_TARGET_LINEAR_MASK = 128;
         public const int PSYS_PART_EMISSIVE_MASK = 256;
+        public const int PSYS_PART_RIBBON_MASK = 1024;
         public const int PSYS_PART_FLAGS = 0;
         public const int PSYS_PART_START_COLOR = 1;
         public const int PSYS_PART_START_ALPHA = 2;
@@ -129,6 +130,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int PSYS_SRC_OMEGA = 21;
         public const int PSYS_SRC_ANGLE_BEGIN = 22;
         public const int PSYS_SRC_ANGLE_END = 23;
+        public const int PSYS_PART_BLEND_FUNC_SOURCE = 24;
+        public const int PSYS_PART_BLEND_FUNC_DEST = 25;
+        public const int PSYS_PART_START_GLOW = 26;
+        public const int PSYS_PART_END_GLOW = 27;
+        public const int PSYS_PART_BF_ONE = 0;
+        public const int PSYS_PART_BF_ZERO = 1;
+        public const int PSYS_PART_BF_DEST_COLOR = 2;
+        public const int PSYS_PART_BF_SOURCE_COLOR = 3;
+        public const int PSYS_PART_BF_ONE_MINUS_DEST_COLOR = 4;
+        public const int PSYS_PART_BF_ONE_MINUS_SOURCE_COLOR = 5;
+        public const int PSYS_PART_BF_SOURCE_ALPHA = 7;
+        public const int PSYS_PART_BF_ONE_MINUS_SOURCE_ALPHA = 9;
         public const int PSYS_SRC_PATTERN_DROP = 1;
         public const int PSYS_SRC_PATTERN_EXPLODE = 2;
         public const int PSYS_SRC_PATTERN_ANGLE = 4;
-- 
cgit v1.1


From 3d5a7e9b194d9d6a73091935e316b56d5302dcbb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 31 Oct 2013 23:45:52 +0000
Subject: Add OutgoingPacketsResentCount clientstack stat.

This allows one to monitor the total number of messages resent to clients over time.
A constantly increasing stat may indicate a general server network or overloading issue if a fairly high proportion of packets sent
A smaller constantly increasing stat may indicate a problem with a particular client-server connection, would need to check "show queues" in this case.
---
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  |  6 ++++-
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs   | 27 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 03cd2b4..5d3b5b5 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -3801,7 +3801,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_udpClient.NeedAcks.Remove(oPacket.SequenceNumber);
 
             // Count this as a resent packet since we are going to requeue all of the updates contained in it
-            Interlocked.Increment(ref m_udpClient.PacketsResent);
+            Interlocked.Increment(ref m_udpClient.PacketsResent);           
+
+            // We're not going to worry about interlock yet since its not currently critical that this total count
+            // is 100% correct
+            m_udpServer.PacketsResentCount++;
 
             foreach (EntityUpdate update in updates)
                 ResendPrimUpdate(update);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 218c2b2..ca17771 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -147,6 +147,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             StatsManager.RegisterStat(
                 new Stat(
+                    "OutgoingPacketsResentCount",
+                    "Number of packets resent because a client did not acknowledge receipt",
+                    "",
+                    "",
+                    "clientstack",
+                    scene.Name,
+                    StatType.Pull,
+                    MeasuresOfInterest.AverageChangeOverTime,
+                    stat => stat.Value = m_udpServer.PacketsResentCount,
+                    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.",
@@ -295,6 +308,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public Socket Server { get { return null; } }
 
         /// <summary>
+        /// Record how many packets have been resent
+        /// </summary>
+        internal int PacketsResentCount { get; set; }
+
+        /// <summary>
+        /// Record how many packets have been sent
+        /// </summary>
+        internal int PacketsSentCount { get; set; }
+
+        /// <summary>
         /// Record how many inbound packets could not be recognized as LLUDP packets.
         /// </summary>
         public int IncomingMalformedPacketCount { get; private set; }
@@ -1221,6 +1244,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // Stats tracking
             Interlocked.Increment(ref udpClient.PacketsSent);
 
+            // We're not going to worry about interlock yet since its not currently critical that this total count
+            // is 100% correct
+            PacketsSentCount++;
+
             // Put the UDP payload on the wire
             AsyncBeginSend(buffer);
 
-- 
cgit v1.1


From 50794c90085438091b02123cd15aad77f90a2637 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 31 Oct 2013 23:51:01 +0000
Subject: minor: remove mono compiler warnings in AvatarPickerSearchModule and
 UploadBakedTextureModule

---
 OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs | 7 ++-----
 OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs | 3 +--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
index 10a4753..bbadc55 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
@@ -49,12 +49,10 @@ 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 static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         private Scene m_scene;
         private IPeople m_People;
@@ -134,6 +132,5 @@ namespace OpenSim.Region.ClientStack.Linden
                 caps.RegisterHandler("AvatarPickerSearch", m_URL);
             }
         }
-
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index 79a935d..4501dd9 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public void RegisterCaps(UUID agentID, Caps caps)
         {
-            UUID capID = UUID.Random();
+//            UUID capID = UUID.Random();
 
             //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture));
             if (m_URL == "localhost")
@@ -127,7 +127,6 @@ namespace OpenSim.Region.ClientStack.Linden
             {
                 caps.RegisterHandler("UploadBakedTexture", m_URL);
             }
-
         }
     }
 }
\ No newline at end of file
-- 
cgit v1.1


From 4c4a1cf71526aa39346f2a8af124a5bcb51e735d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 31 Oct 2013 23:59:22 +0000
Subject: Start counting resent packets in the places that I missed when the
 stat was first added a few commits ago

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 4 ++++
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 5d3b5b5..1a2d4de 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4367,6 +4367,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // Count this as a resent packet since we are going to requeue all of the updates contained in it
             Interlocked.Increment(ref m_udpClient.PacketsResent);
 
+            // We're not going to worry about interlock yet since its not currently critical that this total count
+            // is 100% correct
+            m_udpServer.PacketsResentCount++;
+
             foreach (ObjectPropertyUpdate update in updates)
                 ResendPropertyUpdate(update);
         }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index ca17771..3bd1ef1 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1237,6 +1237,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             else
             {
                 Interlocked.Increment(ref udpClient.PacketsResent);
+
+                // We're not going to worry about interlock yet since its not currently critical that this total count
+                // is 100% correct
+                PacketsResentCount++;
             }
 
             #endregion Sequence Number Assignment
-- 
cgit v1.1


From cc7065f9ee0598640ac24e2672f8a0ba8744fd40 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 1 Nov 2013 00:04:18 +0000
Subject: minor: change "bot" pCampBot help cateogry to "Bots"

---
 OpenSim/Tools/pCampBot/BotManager.cs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 3c1b11e..abc71cb 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -176,57 +176,57 @@ namespace pCampBot
             }
 
             m_console.Commands.AddCommand(
-                "bot", false, "shutdown", "shutdown", "Shutdown bots and exit", HandleShutdown);
+                "Bots", false, "shutdown", "shutdown", "Shutdown bots and exit", HandleShutdown);
 
             m_console.Commands.AddCommand(
-                "bot", false, "quit", "quit", "Shutdown bots and exit", HandleShutdown);
+                "Bots", false, "quit", "quit", "Shutdown bots and exit", HandleShutdown);
 
             m_console.Commands.AddCommand(
-                "bot", false, "connect", "connect [<n>]", "Connect bots",
+                "Bots", 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",
+                "Bots", 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>]", 
+                "Bots", 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>]", 
+                "Bots", 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.",
+                "Bots", false, "sit", "sit", "Sit all bots on the ground.",
                 HandleSit);
 
             m_console.Commands.AddCommand(
-                "bot", false, "stand", "stand", "Stand all bots.",
+                "Bots", 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);
+                "Bots", 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);
+                "Bots", 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);
+                "Bots", false, "show bots", "show bots", "Shows the status of all bots", HandleShowBotsStatus);
 
             m_console.Commands.AddCommand(
-                "bot", false, "show bot", "show bot <bot-number>", 
+                "Bots", false, "show bot", "show bot <bot-number>", 
                 "Shows the detailed status and settings of a particular bot.", HandleShowBotStatus);
 
             m_bots = new List<Bot>();
-- 
cgit v1.1


From cc73ef4eb9a51badeffa3c45de6431bd1ca30c2d Mon Sep 17 00:00:00 2001
From: dahlia
Date: Thu, 31 Oct 2013 17:49:01 -0700
Subject: add new particle system blending rule enumerations

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 8650b91..e6ff75f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6240,7 +6240,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             PSYS_SRC_TARGET_KEY = 20,
             PSYS_SRC_OMEGA = 21,
             PSYS_SRC_ANGLE_BEGIN = 22,
-            PSYS_SRC_ANGLE_END = 23
+            PSYS_SRC_ANGLE_END = 23,
+            PSYS_PART_BLEND_FUNC_SOURCE = 24,
+            PSYS_PART_BLEND_FUNC_DEST = 25,
+            PSYS_PART_START_GLOW = 26,
+            PSYS_PART_END_GLOW = 27
         }
 
         internal Primitive.ParticleSystem.ParticleDataFlags ConvertUINTtoFlags(uint flags)
-- 
cgit v1.1


From c6395240f0dd7767cb9f14f2ad8b6cccadf1351a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 1 Nov 2013 02:04:04 +0000
Subject: For individual bots, seed random number generator with a random
 number from BotManager rather than Environment.Tickcount

Otherwise, since bots are now created all at once, a bunch will get exactly the same tickcount and hence number sequences
---
 OpenSim/Tools/pCampBot/Bot.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index d0a4ef3..ccc24fa 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -166,7 +166,7 @@ namespace pCampBot
         {
             ConnectionState = ConnectionState.Disconnected;
 
-            Random = new Random(Environment.TickCount);// We do stuff randomly here
+            Random = new Random(bm.Rng.Next());
             FirstName = firstName;
             LastName = lastName;
             Name = string.Format("{0} {1}", FirstName, LastName);
-- 
cgit v1.1


From f4ded3af63e4a71ffd8ee7f1a422ec600f59b845 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Fri, 1 Nov 2013 01:40:56 -0700
Subject: discard alpha in 4-plane sculpt textures before generating physics
 proxy mesh

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index fc679e7..4ad0cb1 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -629,21 +629,16 @@ namespace OpenSim.Region.Physics.Meshing
 
                 try
                 {
-                    OpenMetaverse.Imaging.ManagedImage unusedData;
-                    OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(primShape.SculptData, out unusedData, out idata);
+                    OpenMetaverse.Imaging.ManagedImage managedImage;
 
-                    if (idata == null)
-                    {
-                        // In some cases it seems that the decode can return a null bitmap without throwing
-                        // an exception
-                        m_log.WarnFormat("[PHYSICS]: OpenJPEG decoded sculpt data for {0} to a null bitmap.  Ignoring.", primName);
-
-                        return false;
-                    }
+                    OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(primShape.SculptData, out managedImage);
 
-                    unusedData = null;
+                    if ((managedImage.Channels & OpenMetaverse.Imaging.ManagedImage.ImageChannels.Alpha) != 0)
+                        managedImage.ConvertChannels(managedImage.Channels & ~OpenMetaverse.Imaging.ManagedImage.ImageChannels.Alpha);
 
-                    //idata = CSJ2K.J2kImage.FromBytes(primShape.SculptData);
+                    Bitmap imgData = OpenMetaverse.Imaging.LoadTGAClass.LoadTGA(new MemoryStream(managedImage.ExportTGA()));
+                    idata = (Image)imgData;
+                    managedImage = null;
 
                     if (cacheSculptMaps)
                     {
-- 
cgit v1.1


From 7faf286d0025da04497e2b593f629c6582607c78 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Fri, 1 Nov 2013 13:45:09 -0700
Subject: add null check for jpeg2000 sculpt image decode failure. Note: the
 j2kDecodeCache folder should be cleared after updating to this revision so
 that sculpts containing alpha can be re-decoded and successfully meshed.

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 4ad0cb1..1f08b03 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -633,6 +633,15 @@ namespace OpenSim.Region.Physics.Meshing
 
                     OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(primShape.SculptData, out managedImage);
 
+                    if (managedImage == null)
+                    {
+                        // In some cases it seems that the decode can return a null bitmap without throwing
+                        // an exception
+                        m_log.WarnFormat("[PHYSICS]: OpenJPEG decoded sculpt data for {0} to a null bitmap.  Ignoring.", primName);
+
+                        return false;
+                    }
+
                     if ((managedImage.Channels & OpenMetaverse.Imaging.ManagedImage.ImageChannels.Alpha) != 0)
                         managedImage.ConvertChannels(managedImage.Channels & ~OpenMetaverse.Imaging.ManagedImage.ImageChannels.Alpha);
 
-- 
cgit v1.1


From 2b069a3b1ea6750d35e318989c8b982e82adba43 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 2 Nov 2013 00:39:12 +0000
Subject: If the LSL state_entry() event definition contains any parameters,
 then generate syntax error as seen on the LL grid

This is done through the parser and so generates the same syntax error message if any parameters are wrongly specified for this event.
We were already enforcing event names in the parser.
This is only for state_entry so far as an initial test of the approach - appears to work correctly.
---
 .../ScriptEngine/Shared/CodeTools/Compiler.cs      |    11 +-
 .../Shared/CodeTools/LSL2CSCodeTransformer.cs      |    10 +
 .../Shared/CodeTools/Tests/CSCodeGeneratorTest.cs  |     1 +
 .../ScriptEngine/Shared/CodeTools/lsl.parser.cs    | 15143 ++++++++++---------
 4 files changed, 7693 insertions(+), 7472 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index b71afe3..87f7189 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -610,6 +610,7 @@ namespace SecondLife
                             results = CScodeProvider.CompileAssemblyFromSource(
                                 parameters, Script);
                         }
+
                         // Deal with an occasional segv in the compiler.
                         // Rarely, if ever, occurs twice in succession.
                         // Line # == 0 and no file name are indications that
@@ -647,15 +648,19 @@ namespace SecondLife
                                         "language type \"" + lang.ToString() + "\"");
             }
 
-            // Check result
-            // Go through errors
+//            foreach (Type type in results.CompiledAssembly.GetTypes())
+//            {
+//                foreach (MethodInfo method in type.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static))
+//                {
+//                    m_log.DebugFormat("[COMPILER]: {0}.{1}", type.FullName, method.Name);
+//                }
+//            }
 
             //
             // WARNINGS AND ERRORS
             //
             bool hadErrors = false;
             string errtext = String.Empty;
-
             if (results.Errors.Count > 0)
             {
                 foreach (CompilerError CompErr in results.Errors)
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs
index e77b3d2..0fb3574 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs
@@ -27,12 +27,16 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
+using log4net;
 using Tools;
 
 namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 {
     public class LSL2CSCodeTransformer
     {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private SYMBOL m_astRoot = null;
         private static Dictionary<string, string> m_datatypeLSL2OpenSim = null;
 
@@ -78,6 +82,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
         /// <param name="s">The current node to transform.</param>
         private void TransformNode(SYMBOL s)
         {
+//            m_log.DebugFormat("[LSL2CSCODETRANSFORMER]: Tranforming node {0}", s);
+
             // make sure to put type lower in the inheritance hierarchy first
             // ie: since IdentConstant and StringConstant inherit from Constant,
             // put IdentConstant and StringConstant before Constant
@@ -103,10 +109,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                 // We need to check for that here.
                 if (null != s.kids[i])
                 {
+//                    m_log.Debug("[LSL2CSCODETRANSFORMER]: Moving down level");
+
                     if (!(s is Assignment || s is ArgumentDeclarationList) && s.kids[i] is Declaration)
                         AddImplicitInitialization(s, i);
 
                     TransformNode((SYMBOL) s.kids[i]);
+
+//                    m_log.Debug("[LSL2CSCODETRANSFORMER]: Moving up level");
                 }
             }
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
index 77e087c..b92f3a3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
@@ -762,6 +762,7 @@ default
         public void TestIfStatement()
         {
             TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
 
             string input = @"// let's test if statements
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
index ca56cd6..1e3c6f6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
@@ -130,7 +130,15 @@ public class StateEvent : SYMBOL{
 public override string yyname { get { return "StateEvent"; }}
 public override int yynum { get { return 103; }}
 public StateEvent(Parser yyp):base(yyp){}}
-//%+ArgumentDeclarationList+104
+//%+StateEntryStateEvent+104
+public class StateEntryStateEvent : StateEvent{
+ public  StateEntryStateEvent (Parser yyp, string  name , CompoundStatement  cs ):base(((LSLSyntax
+)yyp), name , cs ){}
+
+public override string yyname { get { return "StateEntryStateEvent"; }}
+public override int yynum { get { return 104; }}
+public StateEntryStateEvent(Parser yyp):base(yyp){}}
+//%+ArgumentDeclarationList+105
 public class ArgumentDeclarationList : SYMBOL{
  public  ArgumentDeclarationList (Parser yyp, Declaration  d ):base(((LSLSyntax
 )yyp)){ kids . Add ( d );
@@ -141,9 +149,9 @@ public class ArgumentDeclarationList : SYMBOL{
 }
 
 public override string yyname { get { return "ArgumentDeclarationList"; }}
-public override int yynum { get { return 104; }}
+public override int yynum { get { return 105; }}
 public ArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+Declaration+105
+//%+Declaration+106
 public class Declaration : SYMBOL{
  private  string  m_datatype ;
  private  string  m_id ;
@@ -163,9 +171,9 @@ public class Declaration : SYMBOL{
 }
 
 public override string yyname { get { return "Declaration"; }}
-public override int yynum { get { return 105; }}
+public override int yynum { get { return 106; }}
 public Declaration(Parser yyp):base(yyp){}}
-//%+Typename+106
+//%+Typename+107
 public class Typename : SYMBOL{
  public  string  yytext ;
  public  Typename (Parser yyp, string  text ):base(((LSLSyntax
@@ -173,9 +181,9 @@ public class Typename : SYMBOL{
 }
 
 public override string yyname { get { return "Typename"; }}
-public override int yynum { get { return 106; }}
+public override int yynum { get { return 107; }}
 public Typename(Parser yyp):base(yyp){}}
-//%+Event+107
+//%+Event+108
 public class Event : SYMBOL{
  public  string  yytext ;
  public  Event (Parser yyp, string  text ):base(((LSLSyntax
@@ -183,9 +191,17 @@ public class Event : SYMBOL{
 }
 
 public override string yyname { get { return "Event"; }}
-public override int yynum { get { return 107; }}
+public override int yynum { get { return 108; }}
 public Event(Parser yyp):base(yyp){}}
-//%+CompoundStatement+108
+//%+EntryEvent+109
+public class EntryEvent : Event{
+ public  EntryEvent (Parser yyp, string  text ):base(((LSLSyntax
+)yyp), text ){}
+
+public override string yyname { get { return "EntryEvent"; }}
+public override int yynum { get { return 109; }}
+public EntryEvent(Parser yyp):base(yyp){}}
+//%+CompoundStatement+110
 public class CompoundStatement : SYMBOL{
  public  CompoundStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -194,9 +210,9 @@ public class CompoundStatement : SYMBOL{
 }
 
 public override string yyname { get { return "CompoundStatement"; }}
-public override int yynum { get { return 108; }}
+public override int yynum { get { return 110; }}
 }
-//%+StatementList+109
+//%+StatementList+111
 public class StatementList : SYMBOL{
  private  void  AddStatement ( Statement  s ){ if ( s . kids . Top  is  IfStatement || s . kids . Top  is  WhileStatement || s . kids . Top  is  DoWhileStatement || s . kids . Top  is  ForLoop ) kids . Add ( s . kids . Pop ());
  else  kids . Add ( s );
@@ -210,9 +226,9 @@ public class StatementList : SYMBOL{
 }
 
 public override string yyname { get { return "StatementList"; }}
-public override int yynum { get { return 109; }}
+public override int yynum { get { return 111; }}
 public StatementList(Parser yyp):base(yyp){}}
-//%+Statement+110
+//%+Statement+112
 public class Statement : SYMBOL{
  public  Statement (Parser yyp, Declaration  d ):base(((LSLSyntax
 )yyp)){ kids . Add ( d );
@@ -258,9 +274,9 @@ public class Statement : SYMBOL{
 }
 
 public override string yyname { get { return "Statement"; }}
-public override int yynum { get { return 110; }}
+public override int yynum { get { return 112; }}
 public Statement(Parser yyp):base(yyp){}}
-//%+EmptyStatement+111
+//%+EmptyStatement+113
 public class EmptyStatement : SYMBOL{
  public  EmptyStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -268,9 +284,9 @@ public class EmptyStatement : SYMBOL{
 }
 
 public override string yyname { get { return "EmptyStatement"; }}
-public override int yynum { get { return 111; }}
+public override int yynum { get { return 113; }}
 }
-//%+Assignment+112
+//%+Assignment+114
 public class Assignment : SYMBOL{
  protected  string  m_assignmentType ;
  public  Assignment (Parser yyp, SYMBOL  lhs , SYMBOL  rhs , string  assignmentType ):base(((LSLSyntax
@@ -290,9 +306,9 @@ public class Assignment : SYMBOL{
 }
 
 public override string yyname { get { return "Assignment"; }}
-public override int yynum { get { return 112; }}
+public override int yynum { get { return 114; }}
 public Assignment(Parser yyp):base(yyp){}}
-//%+SimpleAssignment+113
+//%+SimpleAssignment+115
 public class SimpleAssignment : Assignment{
  public  SimpleAssignment (Parser yyp, SYMBOL  lhs , SYMBOL  rhs , string  assignmentType ):base(((LSLSyntax
 )yyp)){ m_assignmentType = assignmentType ;
@@ -302,9 +318,9 @@ public class SimpleAssignment : Assignment{
 }
 
 public override string yyname { get { return "SimpleAssignment"; }}
-public override int yynum { get { return 113; }}
+public override int yynum { get { return 115; }}
 public SimpleAssignment(Parser yyp):base(yyp){}}
-//%+ReturnStatement+114
+//%+ReturnStatement+116
 public class ReturnStatement : SYMBOL{
  public  ReturnStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -314,9 +330,9 @@ public class ReturnStatement : SYMBOL{
 }
 
 public override string yyname { get { return "ReturnStatement"; }}
-public override int yynum { get { return 114; }}
+public override int yynum { get { return 116; }}
 }
-//%+JumpLabel+115
+//%+JumpLabel+117
 public class JumpLabel : SYMBOL{
  private  string  m_labelName ;
  public  JumpLabel (Parser yyp, string  labelName ):base(((LSLSyntax
@@ -329,9 +345,9 @@ public class JumpLabel : SYMBOL{
 }
 
 public override string yyname { get { return "JumpLabel"; }}
-public override int yynum { get { return 115; }}
+public override int yynum { get { return 117; }}
 public JumpLabel(Parser yyp):base(yyp){}}
-//%+JumpStatement+116
+//%+JumpStatement+118
 public class JumpStatement : SYMBOL{
  private  string  m_targetName ;
  public  JumpStatement (Parser yyp, string  targetName ):base(((LSLSyntax
@@ -344,9 +360,9 @@ public class JumpStatement : SYMBOL{
 }
 
 public override string yyname { get { return "JumpStatement"; }}
-public override int yynum { get { return 116; }}
+public override int yynum { get { return 118; }}
 public JumpStatement(Parser yyp):base(yyp){}}
-//%+StateChange+117
+//%+StateChange+119
 public class StateChange : SYMBOL{
  private  string  m_newState ;
  public  StateChange (Parser yyp, string  newState ):base(((LSLSyntax
@@ -357,9 +373,9 @@ public class StateChange : SYMBOL{
 }
 
 public override string yyname { get { return "StateChange"; }}
-public override int yynum { get { return 117; }}
+public override int yynum { get { return 119; }}
 public StateChange(Parser yyp):base(yyp){}}
-//%+IfStatement+118
+//%+IfStatement+120
 public class IfStatement : SYMBOL{
  private  void  AddStatement ( Statement  s ){ if (0< s . kids . Count && s . kids . Top  is  CompoundStatement ) kids . Add ( s . kids . Pop ());
  else  kids . Add ( s );
@@ -376,9 +392,9 @@ public class IfStatement : SYMBOL{
 }
 
 public override string yyname { get { return "IfStatement"; }}
-public override int yynum { get { return 118; }}
+public override int yynum { get { return 120; }}
 public IfStatement(Parser yyp):base(yyp){}}
-//%+WhileStatement+119
+//%+WhileStatement+121
 public class WhileStatement : SYMBOL{
  public  WhileStatement (Parser yyp, SYMBOL  s , Statement  st ):base(((LSLSyntax
 )yyp)){ kids . Add ( s );
@@ -387,9 +403,9 @@ public class WhileStatement : SYMBOL{
 }
 
 public override string yyname { get { return "WhileStatement"; }}
-public override int yynum { get { return 119; }}
+public override int yynum { get { return 121; }}
 public WhileStatement(Parser yyp):base(yyp){}}
-//%+DoWhileStatement+120
+//%+DoWhileStatement+122
 public class DoWhileStatement : SYMBOL{
  public  DoWhileStatement (Parser yyp, SYMBOL  s , Statement  st ):base(((LSLSyntax
 )yyp)){ if (0< st . kids . Count && st . kids . Top  is  CompoundStatement ) kids . Add ( st . kids . Pop ());
@@ -398,9 +414,9 @@ public class DoWhileStatement : SYMBOL{
 }
 
 public override string yyname { get { return "DoWhileStatement"; }}
-public override int yynum { get { return 120; }}
+public override int yynum { get { return 122; }}
 public DoWhileStatement(Parser yyp):base(yyp){}}
-//%+ForLoop+121
+//%+ForLoop+123
 public class ForLoop : SYMBOL{
  public  ForLoop (Parser yyp, ForLoopStatement  flsa , Expression  e , ForLoopStatement  flsb , Statement  s ):base(((LSLSyntax
 )yyp)){ kids . Add ( flsa );
@@ -411,9 +427,9 @@ public class ForLoop : SYMBOL{
 }
 
 public override string yyname { get { return "ForLoop"; }}
-public override int yynum { get { return 121; }}
+public override int yynum { get { return 123; }}
 public ForLoop(Parser yyp):base(yyp){}}
-//%+ForLoopStatement+122
+//%+ForLoopStatement+124
 public class ForLoopStatement : SYMBOL{
  public  ForLoopStatement (Parser yyp, Expression  e ):base(((LSLSyntax
 )yyp)){ kids . Add ( e );
@@ -431,9 +447,9 @@ public class ForLoopStatement : SYMBOL{
 }
 
 public override string yyname { get { return "ForLoopStatement"; }}
-public override int yynum { get { return 122; }}
+public override int yynum { get { return 124; }}
 public ForLoopStatement(Parser yyp):base(yyp){}}
-//%+FunctionCall+123
+//%+FunctionCall+125
 public class FunctionCall : SYMBOL{
  private  string  m_id ;
  public  FunctionCall (Parser yyp, string  id , ArgumentList  al ):base(((LSLSyntax
@@ -447,9 +463,9 @@ public class FunctionCall : SYMBOL{
 }
 
 public override string yyname { get { return "FunctionCall"; }}
-public override int yynum { get { return 123; }}
+public override int yynum { get { return 125; }}
 public FunctionCall(Parser yyp):base(yyp){}}
-//%+ArgumentList+124
+//%+ArgumentList+126
 public class ArgumentList : SYMBOL{
  public  ArgumentList (Parser yyp, Argument  a ):base(((LSLSyntax
 )yyp)){ AddArgument ( a );
@@ -463,14 +479,14 @@ public class ArgumentList : SYMBOL{
 }
 
 public override string yyname { get { return "ArgumentList"; }}
-public override int yynum { get { return 124; }}
+public override int yynum { get { return 126; }}
 public ArgumentList(Parser yyp):base(yyp){}}
-//%+Argument+125
+//%+Argument+127
 public class Argument : SYMBOL{
 public override string yyname { get { return "Argument"; }}
-public override int yynum { get { return 125; }}
+public override int yynum { get { return 127; }}
 public Argument(Parser yyp):base(yyp){}}
-//%+ExpressionArgument+126
+//%+ExpressionArgument+128
 public class ExpressionArgument : Argument{
  public  ExpressionArgument (Parser yyp, Expression  e ):base(((LSLSyntax
 )yyp)){ if ( e  is  ConstantExpression ) while (0< e . kids . Count ) kids . Add ( e . kids . Pop ());
@@ -478,9 +494,9 @@ public class ExpressionArgument : Argument{
 }
 
 public override string yyname { get { return "ExpressionArgument"; }}
-public override int yynum { get { return 126; }}
+public override int yynum { get { return 128; }}
 public ExpressionArgument(Parser yyp):base(yyp){}}
-//%+Constant+127
+//%+Constant+129
 public class Constant : SYMBOL{
  private  string  m_type ;
  private  string  m_val ;
@@ -502,9 +518,9 @@ public class Constant : SYMBOL{
 }
 
 public override string yyname { get { return "Constant"; }}
-public override int yynum { get { return 127; }}
+public override int yynum { get { return 129; }}
 public Constant(Parser yyp):base(yyp){}}
-//%+VectorConstant+128
+//%+VectorConstant+130
 public class VectorConstant : Constant{
  public  VectorConstant (Parser yyp, Expression  valX , Expression  valY , Expression  valZ ):base(((LSLSyntax
 )yyp),"vector", null ){ kids . Add ( valX );
@@ -513,9 +529,9 @@ public class VectorConstant : Constant{
 }
 
 public override string yyname { get { return "VectorConstant"; }}
-public override int yynum { get { return 128; }}
+public override int yynum { get { return 130; }}
 public VectorConstant(Parser yyp):base(yyp){}}
-//%+RotationConstant+129
+//%+RotationConstant+131
 public class RotationConstant : Constant{
  public  RotationConstant (Parser yyp, Expression  valX , Expression  valY , Expression  valZ , Expression  valS ):base(((LSLSyntax
 )yyp),"rotation", null ){ kids . Add ( valX );
@@ -525,36 +541,36 @@ public class RotationConstant : Constant{
 }
 
 public override string yyname { get { return "RotationConstant"; }}
-public override int yynum { get { return 129; }}
+public override int yynum { get { return 131; }}
 public RotationConstant(Parser yyp):base(yyp){}}
-//%+ListConstant+130
+//%+ListConstant+132
 public class ListConstant : Constant{
  public  ListConstant (Parser yyp, ArgumentList  al ):base(((LSLSyntax
 )yyp),"list", null ){ kids . Add ( al );
 }
 
 public override string yyname { get { return "ListConstant"; }}
-public override int yynum { get { return 130; }}
+public override int yynum { get { return 132; }}
 public ListConstant(Parser yyp):base(yyp){}}
-//%+Expression+131
+//%+Expression+133
 public class Expression : SYMBOL{
  protected  void  AddExpression ( Expression  e ){ if ( e  is  ConstantExpression ) while (0< e . kids . Count ) kids . Add ( e . kids . Pop ());
  else  kids . Add ( e );
 }
 
 public override string yyname { get { return "Expression"; }}
-public override int yynum { get { return 131; }}
+public override int yynum { get { return 133; }}
 public Expression(Parser yyp):base(yyp){}}
-//%+ConstantExpression+132
+//%+ConstantExpression+134
 public class ConstantExpression : Expression{
  public  ConstantExpression (Parser yyp, Constant  c ):base(((LSLSyntax
 )yyp)){ kids . Add ( c );
 }
 
 public override string yyname { get { return "ConstantExpression"; }}
-public override int yynum { get { return 132; }}
+public override int yynum { get { return 134; }}
 public ConstantExpression(Parser yyp):base(yyp){}}
-//%+IdentExpression+133
+//%+IdentExpression+135
 public class IdentExpression : Expression{
  protected  string  m_name ;
  public  IdentExpression (Parser yyp, string  name ):base(((LSLSyntax
@@ -567,9 +583,9 @@ public class IdentExpression : Expression{
 }
 
 public override string yyname { get { return "IdentExpression"; }}
-public override int yynum { get { return 133; }}
+public override int yynum { get { return 135; }}
 public IdentExpression(Parser yyp):base(yyp){}}
-//%+IdentDotExpression+134
+//%+IdentDotExpression+136
 public class IdentDotExpression : IdentExpression{
  private  string  m_member ;
  public  IdentDotExpression (Parser yyp, string  name , string  member ):base(((LSLSyntax
@@ -583,18 +599,18 @@ public class IdentDotExpression : IdentExpression{
 }
 
 public override string yyname { get { return "IdentDotExpression"; }}
-public override int yynum { get { return 134; }}
+public override int yynum { get { return 136; }}
 public IdentDotExpression(Parser yyp):base(yyp){}}
-//%+FunctionCallExpression+135
+//%+FunctionCallExpression+137
 public class FunctionCallExpression : Expression{
  public  FunctionCallExpression (Parser yyp, FunctionCall  fc ):base(((LSLSyntax
 )yyp)){ kids . Add ( fc );
 }
 
 public override string yyname { get { return "FunctionCallExpression"; }}
-public override int yynum { get { return 135; }}
+public override int yynum { get { return 137; }}
 public FunctionCallExpression(Parser yyp):base(yyp){}}
-//%+BinaryExpression+136
+//%+BinaryExpression+138
 public class BinaryExpression : Expression{
  private  string  m_expressionSymbol ;
  public  BinaryExpression (Parser yyp, Expression  lhs , Expression  rhs , string  expressionSymbol ):base(((LSLSyntax
@@ -609,9 +625,9 @@ public class BinaryExpression : Expression{
 }
 
 public override string yyname { get { return "BinaryExpression"; }}
-public override int yynum { get { return 136; }}
+public override int yynum { get { return 138; }}
 public BinaryExpression(Parser yyp):base(yyp){}}
-//%+UnaryExpression+137
+//%+UnaryExpression+139
 public class UnaryExpression : Expression{
  private  string  m_unarySymbol ;
  public  UnaryExpression (Parser yyp, string  unarySymbol , Expression  e ):base(((LSLSyntax
@@ -625,9 +641,9 @@ public class UnaryExpression : Expression{
 }
 
 public override string yyname { get { return "UnaryExpression"; }}
-public override int yynum { get { return 137; }}
+public override int yynum { get { return 139; }}
 public UnaryExpression(Parser yyp):base(yyp){}}
-//%+TypecastExpression+138
+//%+TypecastExpression+140
 public class TypecastExpression : Expression{
  private  string  m_typecastType ;
  public  TypecastExpression (Parser yyp, string  typecastType , SYMBOL  rhs ):base(((LSLSyntax
@@ -641,18 +657,18 @@ public class TypecastExpression : Expression{
 }
 
 public override string yyname { get { return "TypecastExpression"; }}
-public override int yynum { get { return 138; }}
+public override int yynum { get { return 140; }}
 public TypecastExpression(Parser yyp):base(yyp){}}
-//%+ParenthesisExpression+139
+//%+ParenthesisExpression+141
 public class ParenthesisExpression : Expression{
  public  ParenthesisExpression (Parser yyp, SYMBOL  s ):base(((LSLSyntax
 )yyp)){ kids . Add ( s );
 }
 
 public override string yyname { get { return "ParenthesisExpression"; }}
-public override int yynum { get { return 139; }}
+public override int yynum { get { return 141; }}
 public ParenthesisExpression(Parser yyp):base(yyp){}}
-//%+IncrementDecrementExpression+140
+//%+IncrementDecrementExpression+142
 public class IncrementDecrementExpression : Expression{
  private  string  m_name ;
  private  string  m_operation ;
@@ -680,7 +696,7 @@ public class IncrementDecrementExpression : Expression{
 }
 
 public override string yyname { get { return "IncrementDecrementExpression"; }}
-public override int yynum { get { return 140; }}
+public override int yynum { get { return 142; }}
 public IncrementDecrementExpression(Parser yyp):base(yyp){}}
 
 public class LSLProgramRoot_1 : LSLProgramRoot {
@@ -792,6 +808,18 @@ public class StateBody_2 : StateBody {
 	((StateEvent)(yyq.StackAt(0).m_value))
 	){}}
 
+public class StateBody_3 : StateBody {
+  public StateBody_3(Parser yyq):base(yyq,
+	((StateEntryStateEvent)(yyq.StackAt(0).m_value))
+	){}}
+
+public class StateBody_4 : StateBody {
+  public StateBody_4(Parser yyq):base(yyq,
+	((StateBody)(yyq.StackAt(1).m_value))
+	, 
+	((StateEntryStateEvent)(yyq.StackAt(0).m_value))
+	){}}
+
 public class StateEvent_1 : StateEvent {
   public StateEvent_1(Parser yyq):base(yyq,
 	((Event)(yyq.StackAt(4).m_value))
@@ -801,6 +829,13 @@ public class StateEvent_1 : StateEvent {
 	((CompoundStatement)(yyq.StackAt(0).m_value))
 	){}}
 
+public class StateEntryStateEvent_1 : StateEntryStateEvent {
+  public StateEntryStateEvent_1(Parser yyq):base(yyq,
+	((EntryEvent)(yyq.StackAt(3).m_value))
+	.yytext, 
+	((CompoundStatement)(yyq.StackAt(0).m_value))
+	  ){}}
+
 public class ArgumentDeclarationList_1 : ArgumentDeclarationList {
   public ArgumentDeclarationList_1(Parser yyq):base(yyq,
 	((Declaration)(yyq.StackAt(0).m_value))
@@ -1915,37 +1950,37 @@ public class Event_27 : Event {
 
 public class Event_28 : Event {
   public Event_28(Parser yyq):base(yyq,
-	((STATE_ENTRY_EVENT)(yyq.StackAt(0).m_value))
+	((STATE_EXIT_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_29 : Event {
   public Event_29(Parser yyq):base(yyq,
-	((STATE_EXIT_EVENT)(yyq.StackAt(0).m_value))
+	((TIMER_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_30 : Event {
   public Event_30(Parser yyq):base(yyq,
-	((TIMER_EVENT)(yyq.StackAt(0).m_value))
+	((TOUCH_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_31 : Event {
   public Event_31(Parser yyq):base(yyq,
-	((TOUCH_EVENT)(yyq.StackAt(0).m_value))
+	((TOUCH_END_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_32 : Event {
   public Event_32(Parser yyq):base(yyq,
-	((TOUCH_END_EVENT)(yyq.StackAt(0).m_value))
+	((TOUCH_START_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_33 : Event {
   public Event_33(Parser yyq):base(yyq,
-	((TOUCH_START_EVENT)(yyq.StackAt(0).m_value))
+	((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_34 : Event {
-  public Event_34(Parser yyq):base(yyq,
-	((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value))
+public class EntryEvent_1 : EntryEvent {
+  public EntryEvent_1(Parser yyq):base(yyq,
+	((STATE_ENTRY_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 public class yyLSLSyntax
 : YyParser {
@@ -1963,11 +1998,11 @@ public class ArgumentList_3 : ArgumentList {
 public class ArgumentDeclarationList_4 : ArgumentDeclarationList {
   public ArgumentDeclarationList_4(Parser yyq):base(yyq){}}
 
-public class ArgumentList_4 : ArgumentList {
-  public ArgumentList_4(Parser yyq):base(yyq){}}
-
 public class ArgumentDeclarationList_5 : ArgumentDeclarationList {
   public ArgumentDeclarationList_5(Parser yyq):base(yyq){}}
+
+public class ArgumentList_4 : ArgumentList {
+  public ArgumentList_4(Parser yyq):base(yyq){}}
 public yyLSLSyntax
 ():base() { arr = new int[] { 
 101,4,6,52,0,
@@ -1979,9 +2014,9 @@ public yyLSLSyntax
 97,0,109,0,82,
 0,111,0,111,0,
 116,0,1,96,1,
-2,104,18,1,2717,
+2,104,18,1,2729,
 102,2,0,105,5,
-320,1,0,106,18,
+326,1,0,106,18,
 1,0,0,2,0,
 1,1,107,18,1,
 1,108,20,109,4,
@@ -2042,7 +2077,7 @@ public yyLSLSyntax
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,1,
-106,1,2,2,0,
+107,1,2,2,0,
 1,9,131,18,1,
 9,132,20,133,4,
 10,73,0,68,0,
@@ -2071,7 +2106,7 @@ public yyLSLSyntax
 105,0,111,0,110,
 0,76,0,105,0,
 115,0,116,0,1,
-104,1,2,2,0,
+105,1,2,2,0,
 1,21,142,18,1,
 21,143,20,144,4,
 10,67,0,79,0,
@@ -2086,429 +2121,468 @@ public yyLSLSyntax
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,122,1,2,2,
+1,124,1,2,2,
 0,1,1695,148,18,
 1,1695,143,2,0,
-1,30,149,18,1,
-30,150,20,151,4,
-22,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
+1,2645,149,18,1,
+2645,150,20,151,4,
+22,82,0,73,0,
+71,0,72,0,84,
+0,95,0,66,0,
+82,0,65,0,67,
+0,69,0,1,13,
+1,1,2,0,1,
+2727,152,18,1,2727,
+153,20,154,4,48,
+71,0,108,0,111,
+0,98,0,97,0,
+108,0,70,0,117,
+0,110,0,99,0,
+116,0,105,0,111,
+0,110,0,68,0,
+101,0,102,0,105,
+0,110,0,105,0,
 116,0,105,0,111,
-0,110,0,1,105,
+0,110,0,1,99,
 1,2,2,0,1,
-31,152,18,1,31,
-153,20,154,4,22,
-82,0,73,0,71,
-0,72,0,84,0,
-95,0,80,0,65,
-0,82,0,69,0,
-78,0,1,17,1,
-1,2,0,1,32,
-155,18,1,32,156,
-20,157,4,20,76,
-0,69,0,70,0,
-84,0,95,0,66,
-0,82,0,65,0,
-67,0,69,0,1,
-12,1,1,2,0,
-1,1114,158,18,1,
-1114,132,2,0,1,
-1152,159,18,1,1152,
-160,20,161,4,32,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,1,113,1,
-2,2,0,1,1117,
-162,18,1,1117,163,
-20,164,4,28,80,
-0,69,0,82,0,
-67,0,69,0,78,
-0,84,0,95,0,
-69,0,81,0,85,
-0,65,0,76,0,
-83,0,1,10,1,
-1,2,0,1,40,
-165,18,1,40,132,
-2,0,1,41,166,
-18,1,41,135,2,
-0,1,42,167,18,
-1,42,168,20,169,
-4,20,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
+30,155,18,1,30,
+156,20,157,4,22,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
 0,105,0,111,0,
-110,0,1,131,1,
-2,2,0,1,43,
-170,18,1,43,171,
-20,172,4,22,82,
+110,0,1,106,1,
+2,2,0,1,31,
+158,18,1,31,159,
+20,160,4,22,82,
 0,73,0,71,0,
 72,0,84,0,95,
-0,83,0,72,0,
-73,0,70,0,84,
-0,1,41,1,1,
-2,0,1,44,173,
-18,1,44,132,2,
-0,1,1159,174,18,
-1,1159,168,2,0,
-1,46,175,18,1,
-46,176,20,177,4,
-12,80,0,69,0,
-82,0,73,0,79,
-0,68,0,1,24,
+0,80,0,65,0,
+82,0,69,0,78,
+0,1,17,1,1,
+2,0,1,32,161,
+18,1,32,162,20,
+163,4,20,76,0,
+69,0,70,0,84,
+0,95,0,66,0,
+82,0,65,0,67,
+0,69,0,1,12,
 1,1,2,0,1,
-47,178,18,1,47,
-132,2,0,1,48,
-179,18,1,48,180,
-20,181,4,18,68,
-0,69,0,67,0,
-82,0,69,0,77,
-0,69,0,78,0,
-84,0,1,5,1,
-1,2,0,1,49,
-182,18,1,49,183,
-20,184,4,18,73,
-0,78,0,67,0,
-82,0,69,0,77,
-0,69,0,78,0,
-84,0,1,4,1,
-1,2,0,1,50,
-185,18,1,50,180,
-2,0,1,51,186,
-18,1,51,183,2,
-0,1,52,187,18,
-1,52,135,2,0,
-1,2281,188,18,1,
-2281,160,2,0,1,
-1730,189,18,1,1730,
-160,2,0,1,1731,
-190,18,1,1731,191,
-20,192,4,18,83,
+2651,164,18,1,2651,
+165,20,166,4,10,
+83,0,116,0,97,
+0,116,0,101,0,
+1,101,1,2,2,
+0,1,1114,167,18,
+1,1114,132,2,0,
+1,1152,168,18,1,
+1152,169,20,170,4,
+32,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,1,115,
+1,2,2,0,1,
+1117,171,18,1,1117,
+172,20,173,4,28,
+80,0,69,0,82,
+0,67,0,69,0,
+78,0,84,0,95,
+0,69,0,81,0,
+85,0,65,0,76,
+0,83,0,1,10,
+1,1,2,0,1,
+40,174,18,1,40,
+132,2,0,1,41,
+175,18,1,41,135,
+2,0,1,42,176,
+18,1,42,177,20,
+178,4,20,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,133,
+1,2,2,0,1,
+43,179,18,1,43,
+180,20,181,4,22,
+82,0,73,0,71,
+0,72,0,84,0,
+95,0,83,0,72,
+0,73,0,70,0,
+84,0,1,41,1,
+1,2,0,1,44,
+182,18,1,44,132,
+2,0,1,1159,183,
+18,1,1159,177,2,
+0,1,46,184,18,
+1,46,185,20,186,
+4,12,80,0,69,
+0,82,0,73,0,
+79,0,68,0,1,
+24,1,1,2,0,
+1,47,187,18,1,
+47,132,2,0,1,
+48,188,18,1,48,
+189,20,190,4,18,
+68,0,69,0,67,
+0,82,0,69,0,
+77,0,69,0,78,
+0,84,0,1,5,
+1,1,2,0,1,
+49,191,18,1,49,
+192,20,193,4,18,
+73,0,78,0,67,
+0,82,0,69,0,
+77,0,69,0,78,
+0,84,0,1,4,
+1,1,2,0,1,
+50,194,18,1,50,
+189,2,0,1,51,
+195,18,1,51,192,
+2,0,1,52,196,
+18,1,52,135,2,
+0,1,2281,197,18,
+1,2281,169,2,0,
+1,2669,198,18,1,
+2669,156,2,0,1,
+1730,199,18,1,1730,
+169,2,0,1,1731,
+200,18,1,1731,201,
+20,202,4,18,83,
 0,69,0,77,0,
 73,0,67,0,79,
 0,76,0,79,0,
 78,0,1,11,1,
 1,2,0,1,61,
-193,18,1,61,129,
-2,0,1,62,194,
-18,1,62,153,2,
-0,1,63,195,18,
+203,18,1,61,129,
+2,0,1,62,204,
+18,1,62,159,2,
+0,1,63,205,18,
 1,63,132,2,0,
-1,65,196,18,1,
-65,176,2,0,1,
-66,197,18,1,66,
+1,65,206,18,1,
+65,185,2,0,1,
+66,207,18,1,66,
 132,2,0,1,67,
-198,18,1,67,180,
-2,0,1,68,199,
-18,1,68,183,2,
-0,1,69,200,18,
-1,69,180,2,0,
-1,70,201,18,1,
-70,183,2,0,1,
-71,202,18,1,71,
+208,18,1,67,189,
+2,0,1,68,209,
+18,1,68,192,2,
+0,1,69,210,18,
+1,69,189,2,0,
+1,70,211,18,1,
+70,192,2,0,1,
+71,212,18,1,71,
 135,2,0,1,73,
-203,18,1,73,168,
-2,0,1,74,204,
-18,1,74,153,2,
-0,1,1189,205,18,
-1,1189,206,20,207,
+213,18,1,73,177,
+2,0,1,74,214,
+18,1,74,159,2,
+0,1,1189,215,18,
+1,1189,216,20,217,
 4,22,83,0,84,
 0,65,0,82,0,
 95,0,69,0,81,
 0,85,0,65,0,
 76,0,83,0,1,
 8,1,1,2,0,
-1,76,208,18,1,
-76,209,20,210,4,
+1,76,218,18,1,
+76,219,20,220,4,
 20,76,0,69,0,
 70,0,84,0,95,
 0,83,0,72,0,
 73,0,70,0,84,
 0,1,40,1,1,
-2,0,1,1153,211,
-18,1,1153,212,20,
-213,4,24,83,0,
+2,0,1,1153,221,
+18,1,1153,222,20,
+223,4,24,83,0,
 76,0,65,0,83,
 0,72,0,95,0,
 69,0,81,0,85,
 0,65,0,76,0,
 83,0,1,9,1,
 1,2,0,1,79,
-214,18,1,79,215,
-20,216,4,10,84,
+224,18,1,79,225,
+20,226,4,10,84,
 0,73,0,76,0,
 68,0,69,0,1,
 36,1,1,2,0,
-1,1195,217,18,1,
-1195,168,2,0,1,
-82,218,18,1,82,
-168,2,0,1,1123,
-219,18,1,1123,168,
-2,0,1,85,220,
-18,1,85,221,20,
-222,4,26,83,0,
+1,1195,227,18,1,
+1195,177,2,0,1,
+82,228,18,1,82,
+177,2,0,1,1123,
+229,18,1,1123,177,
+2,0,1,85,230,
+18,1,85,231,20,
+232,4,26,83,0,
 84,0,82,0,79,
 0,75,0,69,0,
 95,0,83,0,84,
 0,82,0,79,0,
 75,0,69,0,1,
 39,1,1,2,0,
-1,89,223,18,1,
-89,224,20,225,4,
+1,89,233,18,1,
+89,234,20,235,4,
 10,77,0,73,0,
 78,0,85,0,83,
 0,1,19,1,1,
-2,0,1,2318,226,
-18,1,2318,191,2,
-0,1,93,227,18,
-1,93,168,2,0,
-1,97,228,18,1,
-97,229,20,230,4,
-14,65,0,77,0,
-80,0,95,0,65,
-0,77,0,80,0,
-1,38,1,1,2,
-0,1,102,231,18,
-1,102,232,20,233,
-4,22,69,0,88,
-0,67,0,76,0,
-65,0,77,0,65,
-0,84,0,73,0,
-79,0,78,0,1,
-37,1,1,2,0,
-1,1775,234,18,1,
-1775,153,2,0,1,
-2718,235,18,1,2718,
-236,23,237,4,6,
-69,0,79,0,70,
-0,1,2,1,6,
-2,0,1,107,238,
-18,1,107,168,2,
-0,1,2337,239,18,
-1,2337,153,2,0,
-1,1224,240,18,1,
-1224,160,2,0,1,
-1225,241,18,1,1225,
-242,20,243,4,24,
-77,0,73,0,78,
-0,85,0,83,0,
-95,0,69,0,81,
-0,85,0,65,0,
-76,0,83,0,1,
-7,1,1,2,0,
-1,112,244,18,1,
-112,245,20,246,4,
-28,71,0,82,0,
-69,0,65,0,84,
-0,69,0,82,0,
-95,0,69,0,81,
-0,85,0,65,0,
-76,0,83,0,1,
-32,1,1,2,0,
-1,1188,247,18,1,
-1188,160,2,0,1,
-1231,248,18,1,1231,
-168,2,0,1,118,
-249,18,1,118,168,
-2,0,1,1737,250,
-18,1,1737,168,2,
-0,1,124,251,18,
-1,124,252,20,253,
-4,22,76,0,69,
-0,83,0,83,0,
-95,0,69,0,81,
-0,85,0,65,0,
-76,0,83,0,1,
-31,1,1,2,0,
-1,2657,254,18,1,
-2657,150,2,0,1,
-2658,255,18,1,2658,
-256,20,257,4,12,
-69,0,81,0,85,
-0,65,0,76,0,
-83,0,1,15,1,
-1,2,0,1,130,
-258,18,1,130,168,
-2,0,1,1803,259,
-18,1,1803,260,20,
-261,4,18,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,1,110,1,2,
-2,0,1,1804,262,
-18,1,1804,263,20,
-264,4,4,68,0,
-79,0,1,44,1,
-1,2,0,1,2364,
-265,18,1,2364,260,
-2,0,1,137,266,
-18,1,137,267,20,
-268,4,36,69,0,
+2,0,1,2318,236,
+18,1,2318,201,2,
+0,1,93,237,18,
+1,93,177,2,0,
+1,2707,238,18,1,
+2707,239,20,240,4,
+34,71,0,108,0,
+111,0,98,0,97,
+0,108,0,68,0,
+101,0,102,0,105,
+0,110,0,105,0,
+116,0,105,0,111,
+0,110,0,115,0,
+1,97,1,2,2,
+0,1,97,241,18,
+1,97,242,20,243,
+4,14,65,0,77,
+0,80,0,95,0,
+65,0,77,0,80,
+0,1,38,1,1,
+2,0,1,102,244,
+18,1,102,245,20,
+246,4,22,69,0,
 88,0,67,0,76,
 0,65,0,77,0,
 65,0,84,0,73,
 0,79,0,78,0,
-95,0,69,0,81,
-0,85,0,65,0,
-76,0,83,0,1,
-30,1,1,2,0,
-1,2293,269,18,1,
-2293,191,2,0,1,
-1701,270,18,1,1701,
-168,2,0,1,1756,
-271,18,1,1756,191,
-2,0,1,143,272,
-18,1,143,168,2,
-0,1,2299,273,18,
-1,2299,168,2,0,
-1,1260,274,18,1,
-1260,160,2,0,1,
-1261,275,18,1,1261,
-276,20,277,4,22,
-80,0,76,0,85,
+1,37,1,1,2,
+0,1,1775,247,18,
+1,1775,159,2,0,
+1,107,248,18,1,
+107,177,2,0,1,
+2337,249,18,1,2337,
+159,2,0,1,1224,
+250,18,1,1224,169,
+2,0,1,1225,251,
+18,1,1225,252,20,
+253,4,24,77,0,
+73,0,78,0,85,
 0,83,0,95,0,
 69,0,81,0,85,
 0,65,0,76,0,
-83,0,1,6,1,
-1,2,0,1,151,
-278,18,1,151,279,
-20,280,4,26,69,
-0,81,0,85,0,
-65,0,76,0,83,
+83,0,1,7,1,
+1,2,0,1,112,
+254,18,1,112,255,
+20,256,4,28,71,
+0,82,0,69,0,
+65,0,84,0,69,
+0,82,0,95,0,
+69,0,81,0,85,
+0,65,0,76,0,
+83,0,1,32,1,
+1,2,0,1,1188,
+257,18,1,1188,169,
+2,0,1,1231,258,
+18,1,1231,177,2,
+0,1,118,259,18,
+1,118,177,2,0,
+1,2730,260,18,1,
+2730,261,23,262,4,
+6,69,0,79,0,
+70,0,1,2,1,
+6,2,0,1,1737,
+263,18,1,1737,177,
+2,0,1,124,264,
+18,1,124,265,20,
+266,4,22,76,0,
+69,0,83,0,83,
+0,95,0,69,0,
+81,0,85,0,65,
+0,76,0,83,0,
+1,31,1,1,2,
+0,1,130,267,18,
+1,130,177,2,0,
+1,1803,268,18,1,
+1803,269,20,270,4,
+18,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,1,
+112,1,2,2,0,
+1,1804,271,18,1,
+1804,272,20,273,4,
+4,68,0,79,0,
+1,44,1,1,2,
+0,1,2364,274,18,
+1,2364,269,2,0,
+1,137,275,18,1,
+137,276,20,277,4,
+36,69,0,88,0,
+67,0,76,0,65,
+0,77,0,65,0,
+84,0,73,0,79,
+0,78,0,95,0,
+69,0,81,0,85,
+0,65,0,76,0,
+83,0,1,30,1,
+1,2,0,1,2293,
+278,18,1,2293,201,
+2,0,1,1701,279,
+18,1,1701,177,2,
+0,1,1756,280,18,
+1,1756,201,2,0,
+1,143,281,18,1,
+143,177,2,0,1,
+2299,282,18,1,2299,
+177,2,0,1,1260,
+283,18,1,1260,169,
+2,0,1,1261,284,
+18,1,1261,285,20,
+286,4,22,80,0,
+76,0,85,0,83,
 0,95,0,69,0,
 81,0,85,0,65,
 0,76,0,83,0,
-1,29,1,1,2,
-0,1,1267,281,18,
-1,1267,168,2,0,
-1,157,282,18,1,
-157,168,2,0,1,
-1773,283,18,1,1773,
-146,2,0,1,1832,
-284,18,1,1832,260,
-2,0,1,1833,285,
-18,1,1833,286,20,
-287,4,10,87,0,
-72,0,73,0,76,
-0,69,0,1,45,
+1,6,1,1,2,
+0,1,151,287,18,
+1,151,288,20,289,
+4,26,69,0,81,
+0,85,0,65,0,
+76,0,83,0,95,
+0,69,0,81,0,
+85,0,65,0,76,
+0,83,0,1,29,
 1,1,2,0,1,
-1834,288,18,1,1834,
-135,2,0,1,166,
-289,18,1,166,290,
-20,291,4,20,76,
-0,69,0,70,0,
-84,0,95,0,65,
-0,78,0,71,0,
-76,0,69,0,1,
-25,1,1,2,0,
-1,1840,292,18,1,
-1840,168,2,0,1,
-172,293,18,1,172,
-168,2,0,1,2706,
-294,18,1,2706,295,
-20,296,4,12,83,
-0,116,0,97,0,
-116,0,101,0,115,
-0,1,100,1,2,
-2,0,1,2335,297,
-18,1,2335,146,2,
-0,1,1296,298,18,
-1,1296,160,2,0,
-1,1297,299,18,1,
-1297,256,2,0,1,
-2413,300,18,1,2413,
-301,20,302,4,26,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,76,0,
-105,0,115,0,116,
-0,1,109,1,2,
-2,0,1,1859,303,
-18,1,1859,153,2,
-0,1,1860,304,18,
-1,1860,191,2,0,
-1,188,305,18,1,
-188,168,2,0,1,
-182,306,18,1,182,
-307,20,308,4,22,
-82,0,73,0,71,
-0,72,0,84,0,
+1267,290,18,1,1267,
+177,2,0,1,157,
+291,18,1,157,177,
+2,0,1,1773,292,
+18,1,1773,146,2,
+0,1,1832,293,18,
+1,1832,269,2,0,
+1,1833,294,18,1,
+1833,295,20,296,4,
+10,87,0,72,0,
+73,0,76,0,69,
+0,1,45,1,1,
+2,0,1,1834,297,
+18,1,1834,135,2,
+0,1,166,298,18,
+1,166,299,20,300,
+4,20,76,0,69,
+0,70,0,84,0,
 95,0,65,0,78,
 0,71,0,76,0,
-69,0,1,26,1,
-1,2,0,1,199,
-309,18,1,199,310,
-20,311,4,10,67,
-0,65,0,82,0,
-69,0,84,0,1,
-35,1,1,2,0,
-1,1871,312,18,1,
-1871,160,2,0,1,
-1872,313,18,1,1872,
-153,2,0,1,1873,
-314,18,1,1873,191,
-2,0,1,1875,315,
-18,1,1875,286,2,
-0,1,205,316,18,
-1,205,168,2,0,
-1,2515,317,18,1,
-2515,140,2,0,1,
-1882,318,18,1,1882,
-168,2,0,1,2227,
-319,18,1,2227,260,
-2,0,1,217,320,
-18,1,217,321,20,
-322,4,12,83,0,
-84,0,82,0,79,
-0,75,0,69,0,
-1,34,1,1,2,
-0,1,1332,323,18,
-1,1332,160,2,0,
-1,1335,324,18,1,
-1335,163,2,0,1,
-223,325,18,1,223,
-168,2,0,1,1341,
-326,18,1,1341,168,
-2,0,1,1901,327,
-18,1,1901,153,2,
-0,1,1303,328,18,
-1,1303,168,2,0,
-1,2462,329,18,1,
-2462,260,2,0,1,
-236,330,18,1,236,
-331,20,332,4,6,
-65,0,77,0,80,
-0,1,33,1,1,
-2,0,1,2466,333,
-18,1,2466,334,20,
-335,4,34,67,0,
-111,0,109,0,112,
-0,111,0,117,0,
-110,0,100,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,108,1,
-2,2,0,1,2467,
-336,18,1,2467,150,
-2,0,1,2468,337,
-18,1,2468,338,20,
-339,4,10,83,0,
-84,0,65,0,84,
-0,69,0,1,48,
-1,1,2,0,1,
-2469,340,18,1,2469,
-132,2,0,1,242,
-341,18,1,242,168,
-2,0,1,2471,342,
-18,1,2471,343,20,
-344,4,36,72,0,
+69,0,1,25,1,
+1,2,0,1,1840,
+301,18,1,1840,177,
+2,0,1,172,302,
+18,1,172,177,2,
+0,1,2706,303,18,
+1,2706,201,2,0,
+1,2335,304,18,1,
+2335,146,2,0,1,
+1296,305,18,1,1296,
+169,2,0,1,1297,
+306,18,1,1297,307,
+20,308,4,12,69,
+0,81,0,85,0,
+65,0,76,0,83,
+0,1,15,1,1,
+2,0,1,2413,309,
+18,1,2413,310,20,
+311,4,26,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,76,0,105,0,
+115,0,116,0,1,
+111,1,2,2,0,
+1,1859,312,18,1,
+1859,159,2,0,1,
+1860,313,18,1,1860,
+201,2,0,1,188,
+314,18,1,188,177,
+2,0,1,182,315,
+18,1,182,316,20,
+317,4,22,82,0,
+73,0,71,0,72,
+0,84,0,95,0,
+65,0,78,0,71,
+0,76,0,69,0,
+1,26,1,1,2,
+0,1,199,318,18,
+1,199,319,20,320,
+4,10,67,0,65,
+0,82,0,69,0,
+84,0,1,35,1,
+1,2,0,1,1871,
+321,18,1,1871,169,
+2,0,1,1872,322,
+18,1,1872,159,2,
+0,1,1873,323,18,
+1,1873,201,2,0,
+1,1875,324,18,1,
+1875,295,2,0,1,
+205,325,18,1,205,
+177,2,0,1,1882,
+326,18,1,1882,177,
+2,0,1,2227,327,
+18,1,2227,269,2,
+0,1,217,328,18,
+1,217,329,20,330,
+4,12,83,0,84,
+0,82,0,79,0,
+75,0,69,0,1,
+34,1,1,2,0,
+1,1332,331,18,1,
+1332,169,2,0,1,
+1335,332,18,1,1335,
+172,2,0,1,223,
+333,18,1,223,177,
+2,0,1,1341,334,
+18,1,1341,177,2,
+0,1,1901,335,18,
+1,1901,159,2,0,
+1,1303,336,18,1,
+1303,177,2,0,1,
+2462,337,18,1,2462,
+269,2,0,1,236,
+338,18,1,236,339,
+20,340,4,6,65,
+0,77,0,80,0,
+1,33,1,1,2,
+0,1,2466,341,18,
+1,2466,342,20,343,
+4,34,67,0,111,
+0,109,0,112,0,
+111,0,117,0,110,
+0,100,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,1,110,1,2,
+2,0,1,2467,344,
+18,1,2467,156,2,
+0,1,2468,345,18,
+1,2468,346,20,347,
+4,10,83,0,84,
+0,65,0,84,0,
+69,0,1,48,1,
+1,2,0,1,2469,
+348,18,1,2469,132,
+2,0,1,242,349,
+18,1,242,177,2,
+0,1,2471,350,18,
+1,2471,351,20,352,
+4,34,83,0,84,
+0,65,0,84,0,
+69,0,95,0,69,
+0,78,0,84,0,
+82,0,89,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,85,1,1,
+2,0,1,2472,353,
+18,1,2472,354,20,
+355,4,36,72,0,
 84,0,84,0,80,
 0,95,0,82,0,
 69,0,81,0,85,
@@ -2517,8 +2591,8 @@ public yyLSLSyntax
 0,86,0,69,0,
 78,0,84,0,1,
 91,1,1,2,0,
-1,2472,345,18,1,
-2472,346,20,347,4,
+1,2473,356,18,1,
+2473,357,20,358,4,
 34,84,0,79,0,
 85,0,67,0,72,
 0,95,0,83,0,
@@ -2527,8 +2601,8 @@ public yyLSLSyntax
 69,0,86,0,69,
 0,78,0,84,0,
 1,89,1,1,2,
-0,1,2473,348,18,
-1,2473,349,20,350,
+0,1,2474,359,18,
+1,2474,360,20,361,
 4,30,84,0,79,
 0,85,0,67,0,
 72,0,95,0,69,
@@ -2536,24 +2610,24 @@ public yyLSLSyntax
 95,0,69,0,86,
 0,69,0,78,0,
 84,0,1,90,1,
-1,2,0,1,2474,
-351,18,1,2474,352,
-20,353,4,22,84,
+1,2,0,1,2475,
+362,18,1,2475,363,
+20,364,4,22,84,
 0,79,0,85,0,
 67,0,72,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
 0,1,88,1,1,
-2,0,1,2475,354,
-18,1,2475,355,20,
-356,4,22,84,0,
+2,0,1,2476,365,
+18,1,2476,366,20,
+367,4,22,84,0,
 73,0,77,0,69,
 0,82,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
 1,87,1,1,2,
-0,1,2476,357,18,
-1,2476,358,20,359,
+0,1,2477,368,18,
+1,2477,369,20,370,
 4,32,83,0,84,
 0,65,0,84,0,
 69,0,95,0,69,
@@ -2562,706 +2636,697 @@ public yyLSLSyntax
 0,86,0,69,0,
 78,0,84,0,1,
 86,1,1,2,0,
-1,2477,360,18,1,
-2477,361,20,362,4,
-34,83,0,84,0,
-65,0,84,0,69,
-0,95,0,69,0,
-78,0,84,0,82,
-0,89,0,95,0,
+1,2478,371,18,1,
+2478,372,20,373,4,
+24,83,0,69,0,
+78,0,83,0,79,
+0,82,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,85,1,1,2,
-0,1,2478,363,18,
-1,2478,364,20,365,
-4,24,83,0,69,
-0,78,0,83,0,
-79,0,82,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,84,1,1,
-2,0,1,2479,366,
-18,1,2479,367,20,
-368,4,52,82,0,
-85,0,78,0,95,
-0,84,0,73,0,
-77,0,69,0,95,
-0,80,0,69,0,
-82,0,77,0,73,
-0,83,0,83,0,
-73,0,79,0,78,
-0,83,0,95,0,
+1,84,1,1,2,
+0,1,2479,374,18,
+1,2479,375,20,376,
+4,52,82,0,85,
+0,78,0,95,0,
+84,0,73,0,77,
+0,69,0,95,0,
+80,0,69,0,82,
+0,77,0,73,0,
+83,0,83,0,73,
+0,79,0,78,0,
+83,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+83,1,1,2,0,
+1,2480,377,18,1,
+2480,378,20,379,4,
+34,82,0,69,0,
+77,0,79,0,84,
+0,69,0,95,0,
+68,0,65,0,84,
+0,65,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,83,1,1,2,
-0,1,2480,369,18,
-1,2480,370,20,371,
-4,34,82,0,69,
-0,77,0,79,0,
-84,0,69,0,95,
-0,68,0,65,0,
-84,0,65,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,82,1,1,
-2,0,1,2481,372,
-18,1,2481,373,20,
-374,4,24,79,0,
-78,0,95,0,82,
-0,69,0,90,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,81,1,
-1,2,0,1,2482,
-375,18,1,2482,376,
-20,377,4,32,79,
-0,66,0,74,0,
-69,0,67,0,84,
+1,82,1,1,2,
+0,1,2481,380,18,
+1,2481,381,20,382,
+4,24,79,0,78,
 0,95,0,82,0,
 69,0,90,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,80,1,1,
-2,0,1,2483,378,
-18,1,2483,379,20,
-380,4,38,78,0,
-79,0,84,0,95,
-0,65,0,84,0,
-95,0,84,0,65,
-0,82,0,71,0,
-69,0,84,0,95,
-0,69,0,86,0,
+0,1,81,1,1,
+2,0,1,2482,383,
+18,1,2482,384,20,
+385,4,32,79,0,
+66,0,74,0,69,
+0,67,0,84,0,
+95,0,82,0,69,
+0,90,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,80,1,1,2,
+0,1,2483,386,18,
+1,2483,387,20,388,
+4,38,78,0,79,
+0,84,0,95,0,
+65,0,84,0,95,
+0,84,0,65,0,
+82,0,71,0,69,
+0,84,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,79,1,1,2,
+0,1,256,389,18,
+1,256,390,20,391,
+4,14,80,0,69,
+0,82,0,67,0,
 69,0,78,0,84,
-0,1,79,1,1,
-2,0,1,256,381,
-18,1,256,382,20,
-383,4,14,80,0,
-69,0,82,0,67,
+0,1,22,1,1,
+2,0,1,1371,392,
+18,1,1371,222,2,
+0,1,2486,393,18,
+1,2486,394,20,395,
+4,36,77,0,79,
+0,86,0,73,0,
+78,0,71,0,95,
+0,83,0,84,0,
+65,0,82,0,84,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,76,
+1,1,2,0,1,
+2487,396,18,1,2487,
+397,20,398,4,32,
+77,0,79,0,86,
+0,73,0,78,0,
+71,0,95,0,69,
+0,78,0,68,0,
+95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,22,1,
-1,2,0,1,1371,
-384,18,1,1371,212,
-2,0,1,2486,385,
-18,1,2486,386,20,
-387,4,36,77,0,
-79,0,86,0,73,
-0,78,0,71,0,
-95,0,83,0,84,
-0,65,0,82,0,
-84,0,95,0,69,
+84,0,1,75,1,
+1,2,0,1,1931,
+399,18,1,1931,269,
+2,0,1,1932,400,
+18,1,1932,401,20,
+402,4,4,73,0,
+70,0,1,42,1,
+1,2,0,1,262,
+403,18,1,262,177,
+2,0,1,1377,404,
+18,1,1377,177,2,
+0,1,2492,405,18,
+1,2492,406,20,407,
+4,48,76,0,65,
+0,78,0,68,0,
+95,0,67,0,79,
+0,76,0,76,0,
+73,0,83,0,73,
+0,79,0,78,0,
+95,0,69,0,78,
+0,68,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,70,1,1,2,
+0,1,1876,408,18,
+1,1876,135,2,0,
+1,2494,409,18,1,
+2494,410,20,411,4,
+38,72,0,84,0,
+84,0,80,0,95,
+0,82,0,69,0,
+83,0,80,0,79,
+0,78,0,83,0,
+69,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
-76,1,1,2,0,
-1,2487,388,18,1,
-2487,389,20,390,4,
-32,77,0,79,0,
-86,0,73,0,78,
-0,71,0,95,0,
-69,0,78,0,68,
+68,1,1,2,0,
+1,2495,412,18,1,
+2495,413,20,414,4,
+22,69,0,77,0,
+65,0,73,0,76,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,75,
-1,1,2,0,1,
-1931,391,18,1,1931,
-260,2,0,1,1932,
-392,18,1,1932,393,
-20,394,4,4,73,
-0,70,0,1,42,
+0,84,0,1,67,
 1,1,2,0,1,
-262,395,18,1,262,
-168,2,0,1,1377,
-396,18,1,1377,168,
-2,0,1,2492,397,
-18,1,2492,398,20,
-399,4,48,76,0,
-65,0,78,0,68,
-0,95,0,67,0,
-79,0,76,0,76,
-0,73,0,83,0,
-73,0,79,0,78,
-0,95,0,69,0,
-78,0,68,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,70,1,1,
-2,0,1,1876,400,
-18,1,1876,135,2,
-0,1,2494,401,18,
-1,2494,402,20,403,
-4,38,72,0,84,
-0,84,0,80,0,
-95,0,82,0,69,
-0,83,0,80,0,
-79,0,78,0,83,
-0,69,0,95,0,
+1939,415,18,1,1939,
+177,2,0,1,2497,
+416,18,1,2497,417,
+20,418,4,26,67,
+0,79,0,78,0,
+84,0,82,0,79,
+0,76,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,68,1,1,2,
-0,1,2495,404,18,
-1,2495,405,20,406,
-4,22,69,0,77,
-0,65,0,73,0,
-76,0,95,0,69,
+1,65,1,1,2,
+0,1,827,419,18,
+1,827,177,2,0,
+1,2499,420,18,1,
+2499,421,20,422,4,
+38,67,0,79,0,
+76,0,76,0,73,
+0,83,0,73,0,
+79,0,78,0,95,
+0,69,0,78,0,
+68,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
-67,1,1,2,0,
-1,1939,407,18,1,
-1939,168,2,0,1,
-2497,408,18,1,2497,
-409,20,410,4,26,
-67,0,79,0,78,
-0,84,0,82,0,
-79,0,76,0,95,
+63,1,1,2,0,
+1,2500,423,18,1,
+2500,424,20,425,4,
+30,67,0,79,0,
+76,0,76,0,73,
+0,83,0,73,0,
+79,0,78,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,65,1,1,
-2,0,1,827,411,
-18,1,827,168,2,
-0,1,2499,412,18,
-1,2499,413,20,414,
-4,38,67,0,79,
-0,76,0,76,0,
-73,0,83,0,73,
-0,79,0,78,0,
-95,0,69,0,78,
-0,68,0,95,0,
+0,1,62,1,1,
+2,0,1,2501,426,
+18,1,2501,427,20,
+428,4,26,67,0,
+72,0,65,0,78,
+0,71,0,69,0,
+68,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+61,1,1,2,0,
+1,2502,429,18,1,
+2502,430,20,431,4,
+24,65,0,84,0,
+84,0,65,0,67,
+0,72,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,63,1,1,2,
-0,1,2500,415,18,
-1,2500,416,20,417,
-4,30,67,0,79,
-0,76,0,76,0,
-73,0,83,0,73,
-0,79,0,78,0,
+1,60,1,1,2,
+0,1,2503,432,18,
+1,2503,433,20,434,
+4,30,65,0,84,
+0,95,0,84,0,
+65,0,82,0,71,
+0,69,0,84,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,62,1,
-1,2,0,1,2501,
-418,18,1,2501,419,
-20,420,4,26,67,
-0,72,0,65,0,
-78,0,71,0,69,
-0,68,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,61,1,1,2,
-0,1,2502,421,18,
-1,2502,422,20,423,
-4,24,65,0,84,
+84,0,1,59,1,
+1,2,0,1,2504,
+435,18,1,2504,436,
+20,437,4,38,65,
+0,84,0,95,0,
+82,0,79,0,84,
+0,95,0,84,0,
+65,0,82,0,71,
+0,69,0,84,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,58,1,
+1,2,0,1,277,
+438,18,1,277,439,
+20,440,4,10,83,
+0,76,0,65,0,
+83,0,72,0,1,
+21,1,1,2,0,
+1,2506,441,18,1,
+2506,135,2,0,1,
+2507,442,18,1,2507,
+159,2,0,1,2509,
+443,18,1,2509,342,
+2,0,1,2510,444,
+18,1,2510,445,20,
+446,4,10,69,0,
+118,0,101,0,110,
+0,116,0,1,108,
+1,2,2,0,1,
+283,447,18,1,283,
+177,2,0,1,1958,
+448,18,1,1958,159,
+2,0,1,1406,449,
+18,1,1406,169,2,
+0,1,1407,450,18,
+1,1407,216,2,0,
+1,2522,451,18,1,
+2522,159,2,0,1,
+2524,452,18,1,2524,
+342,2,0,1,2526,
+453,18,1,2526,454,
+20,455,4,18,83,
+0,116,0,97,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,1,102,1,
+2,2,0,1,299,
+456,18,1,299,457,
+20,458,4,8,83,
 0,84,0,65,0,
-67,0,72,0,95,
+82,0,1,20,1,
+1,2,0,1,1370,
+459,18,1,1370,169,
+2,0,1,305,460,
+18,1,305,177,2,
+0,1,2458,461,18,
+1,2458,269,2,0,
+1,2459,462,18,1,
+2459,150,2,0,1,
+2464,463,18,1,2464,
+150,2,0,1,1989,
+464,18,1,1989,269,
+2,0,1,1990,465,
+18,1,1990,466,20,
+467,4,8,69,0,
+76,0,83,0,69,
+0,1,43,1,1,
+2,0,1,2470,468,
+18,1,2470,162,2,
+0,1,322,469,18,
+1,322,234,2,0,
+1,1933,470,18,1,
+1933,135,2,0,1,
+883,471,18,1,883,
+177,2,0,1,328,
+472,18,1,328,177,
+2,0,1,1443,473,
+18,1,1443,252,2,
+0,1,1449,474,18,
+1,1449,177,2,0,
+1,2485,475,18,1,
+2485,476,20,477,4,
+30,78,0,79,0,
+95,0,83,0,69,
+0,78,0,83,0,
+79,0,82,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,60,1,1,
-2,0,1,2503,424,
-18,1,2503,425,20,
-426,4,30,65,0,
-84,0,95,0,84,
-0,65,0,82,0,
-71,0,69,0,84,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,59,
-1,1,2,0,1,
-2504,427,18,1,2504,
-428,20,429,4,38,
-65,0,84,0,95,
-0,82,0,79,0,
-84,0,95,0,84,
-0,65,0,82,0,
-71,0,69,0,84,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,58,
-1,1,2,0,1,
-277,430,18,1,277,
-431,20,432,4,10,
-83,0,76,0,65,
-0,83,0,72,0,
-1,21,1,1,2,
-0,1,2506,433,18,
-1,2506,135,2,0,
-1,283,434,18,1,
-283,168,2,0,1,
-1958,435,18,1,1958,
-153,2,0,1,2517,
-436,18,1,2517,153,
-2,0,1,2519,437,
-18,1,2519,334,2,
-0,1,1406,438,18,
-1,1406,160,2,0,
-1,1407,439,18,1,
-1407,206,2,0,1,
-299,440,18,1,299,
-441,20,442,4,8,
-83,0,84,0,65,
-0,82,0,1,20,
-1,1,2,0,1,
-1370,443,18,1,1370,
-160,2,0,1,305,
-444,18,1,305,168,
-2,0,1,2458,445,
-18,1,2458,260,2,
-0,1,2459,446,18,
-1,2459,447,20,448,
-4,22,82,0,73,
-0,71,0,72,0,
-84,0,95,0,66,
-0,82,0,65,0,
-67,0,69,0,1,
-13,1,1,2,0,
-1,2464,449,18,1,
-2464,447,2,0,1,
-1989,450,18,1,1989,
-260,2,0,1,1990,
-451,18,1,1990,452,
-20,453,4,8,69,
-0,76,0,83,0,
-69,0,1,43,1,
-1,2,0,1,2470,
-454,18,1,2470,156,
-2,0,1,322,455,
-18,1,322,224,2,
-0,1,1933,456,18,
-1,1933,135,2,0,
-1,883,457,18,1,
-883,168,2,0,1,
-328,458,18,1,328,
-168,2,0,1,1443,
-459,18,1,1443,242,
-2,0,1,2558,460,
-18,1,2558,447,2,
-0,1,2559,461,18,
-1,2559,462,20,463,
-4,20,83,0,116,
+0,1,77,1,1,
+2,0,1,2565,478,
+18,1,2565,150,2,
+0,1,2566,479,18,
+1,2566,480,20,481,
+4,40,83,0,116,
+0,97,0,116,0,
+101,0,69,0,110,
+0,116,0,114,0,
+121,0,83,0,116,
 0,97,0,116,0,
 101,0,69,0,118,
 0,101,0,110,0,
-116,0,1,103,1,
-2,2,0,1,2560,
-464,18,1,2560,465,
-20,466,4,26,68,
-0,69,0,70,0,
-65,0,85,0,76,
-0,84,0,95,0,
-83,0,84,0,65,
-0,84,0,69,0,
-1,47,1,1,2,
-0,1,2561,467,18,
-1,2561,156,2,0,
-1,1449,468,18,1,
-1449,168,2,0,1,
-2485,469,18,1,2485,
-470,20,471,4,30,
-78,0,79,0,95,
-0,83,0,69,0,
-78,0,83,0,79,
-0,82,0,95,0,
+116,0,1,104,1,
+2,2,0,1,2488,
+482,18,1,2488,483,
+20,484,4,22,77,
+0,79,0,78,0,
+69,0,89,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,74,1,1,
+2,0,1,2489,485,
+18,1,2489,486,20,
+487,4,24,76,0,
+73,0,83,0,84,
+0,69,0,78,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,73,1,
+1,2,0,1,2490,
+488,18,1,2490,489,
+20,490,4,36,76,
+0,73,0,78,0,
+75,0,95,0,77,
+0,69,0,83,0,
+83,0,65,0,71,
+0,69,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,77,1,1,2,
-0,1,2488,472,18,
-1,2488,473,20,474,
-4,22,77,0,79,
-0,78,0,69,0,
-89,0,95,0,69,
+1,72,1,1,2,
+0,1,2491,491,18,
+1,2491,492,20,493,
+4,52,76,0,65,
+0,78,0,68,0,
+95,0,67,0,79,
+0,76,0,76,0,
+73,0,83,0,73,
+0,79,0,78,0,
+95,0,83,0,84,
+0,65,0,82,0,
+84,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
-74,1,1,2,0,
-1,2489,475,18,1,
-2489,476,20,477,4,
-24,76,0,73,0,
-83,0,84,0,69,
-0,78,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,73,1,1,2,
-0,1,2490,478,18,
-1,2490,479,20,480,
-4,36,76,0,73,
-0,78,0,75,0,
-95,0,77,0,69,
-0,83,0,83,0,
-65,0,71,0,69,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,72,
-1,1,2,0,1,
-2491,481,18,1,2491,
-482,20,483,4,52,
-76,0,65,0,78,
-0,68,0,95,0,
-67,0,79,0,76,
-0,76,0,73,0,
-83,0,73,0,79,
-0,78,0,95,0,
-83,0,84,0,65,
-0,82,0,84,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,71,1,
-1,2,0,1,2493,
-484,18,1,2493,485,
-20,486,4,40,76,
-0,65,0,78,0,
-68,0,95,0,67,
-0,79,0,76,0,
-76,0,73,0,83,
-0,73,0,79,0,
-78,0,95,0,69,
+71,1,1,2,0,
+1,2493,494,18,1,
+2493,495,20,496,4,
+40,76,0,65,0,
+78,0,68,0,95,
+0,67,0,79,0,
+76,0,76,0,73,
+0,83,0,73,0,
+79,0,78,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,69,1,1,
+2,0,1,1413,497,
+18,1,1413,177,2,
+0,1,346,498,18,
+1,346,499,20,500,
+4,8,80,0,76,
+0,85,0,83,0,
+1,18,1,1,2,
+0,1,2496,501,18,
+1,2496,502,20,503,
+4,32,68,0,65,
+0,84,0,65,0,
+83,0,69,0,82,
+0,86,0,69,0,
+82,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
-69,1,1,2,0,
-1,1413,487,18,1,
-1413,168,2,0,1,
-346,488,18,1,346,
-489,20,490,4,8,
-80,0,76,0,85,
-0,83,0,1,18,
-1,1,2,0,1,
-2496,491,18,1,2496,
-492,20,493,4,32,
-68,0,65,0,84,
-0,65,0,83,0,
-69,0,82,0,86,
-0,69,0,82,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,66,1,
-1,2,0,1,2021,
-494,18,1,2021,260,
-2,0,1,2022,495,
-18,1,2022,338,2,
-0,1,352,496,18,
-1,352,168,2,0,
-1,2024,497,18,1,
-2024,132,2,0,1,
-2025,498,18,1,2025,
-499,20,500,4,8,
-74,0,85,0,77,
-0,80,0,1,49,
-1,1,2,0,1,
-2026,501,18,1,2026,
-132,2,0,1,2027,
-502,18,1,2027,503,
-20,504,4,4,65,
-0,84,0,1,23,
-1,1,2,0,1,
-2028,505,18,1,2028,
-132,2,0,1,2029,
-506,18,1,2029,334,
-2,0,1,2030,507,
-18,1,2030,508,20,
-509,4,14,70,0,
-111,0,114,0,76,
-0,111,0,111,0,
-112,0,1,121,1,
-2,2,0,1,2031,
-510,18,1,2031,511,
-20,512,4,32,68,
-0,111,0,87,0,
-104,0,105,0,108,
-0,101,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,1,120,1,2,
-2,0,1,2032,513,
-18,1,2032,514,20,
-515,4,28,87,0,
-104,0,105,0,108,
-0,101,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,1,119,1,2,
-2,0,1,2033,516,
-18,1,2033,517,20,
-518,4,22,73,0,
-102,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-1,118,1,2,2,
-0,1,2034,519,18,
-1,2034,520,20,521,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,67,0,104,
-0,97,0,110,0,
-103,0,101,0,1,
-117,1,2,2,0,
-1,1478,522,18,1,
-1478,160,2,0,1,
-1479,523,18,1,1479,
-276,2,0,1,2037,
-524,18,1,2037,191,
-2,0,1,2038,525,
-18,1,2038,526,20,
-527,4,18,74,0,
-117,0,109,0,112,
-0,76,0,97,0,
-98,0,101,0,108,
-0,1,115,1,2,
-2,0,1,2039,528,
-18,1,2039,191,2,
-0,1,2040,529,18,
-1,2040,530,20,531,
-4,30,82,0,101,
-0,116,0,117,0,
-114,0,110,0,83,
+66,1,1,2,0,
+1,2021,504,18,1,
+2021,269,2,0,1,
+2022,505,18,1,2022,
+346,2,0,1,352,
+506,18,1,352,177,
+2,0,1,2024,507,
+18,1,2024,132,2,
+0,1,2025,508,18,
+1,2025,509,20,510,
+4,8,74,0,85,
+0,77,0,80,0,
+1,49,1,1,2,
+0,1,2026,511,18,
+1,2026,132,2,0,
+1,2027,512,18,1,
+2027,513,20,514,4,
+4,65,0,84,0,
+1,23,1,1,2,
+0,1,2028,515,18,
+1,2028,132,2,0,
+1,2029,516,18,1,
+2029,342,2,0,1,
+2030,517,18,1,2030,
+518,20,519,4,14,
+70,0,111,0,114,
+0,76,0,111,0,
+111,0,112,0,1,
+123,1,2,2,0,
+1,2031,520,18,1,
+2031,521,20,522,4,
+32,68,0,111,0,
+87,0,104,0,105,
+0,108,0,101,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,122,
+1,2,2,0,1,
+2032,523,18,1,2032,
+524,20,525,4,28,
+87,0,104,0,105,
+0,108,0,101,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,121,
+1,2,2,0,1,
+2033,526,18,1,2033,
+527,20,528,4,22,
+73,0,102,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,1,114,1,
-2,2,0,1,2041,
-532,18,1,2041,191,
-2,0,1,1485,533,
-18,1,1485,168,2,
-0,1,372,534,18,
-1,372,180,2,0,
-1,373,535,18,1,
-373,132,2,0,1,
-374,536,18,1,374,
-176,2,0,1,375,
-537,18,1,375,132,
-2,0,1,376,538,
-18,1,376,183,2,
-0,1,377,539,18,
-1,377,132,2,0,
-1,378,540,18,1,
-378,176,2,0,1,
-379,541,18,1,379,
-132,2,0,1,380,
-542,18,1,380,543,
-20,544,4,16,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-1,127,1,2,2,
-0,1,381,545,18,
-1,381,290,2,0,
-1,371,546,18,1,
-371,547,20,548,4,
-24,70,0,117,0,
-110,0,99,0,116,
-0,105,0,111,0,
-110,0,67,0,97,
-0,108,0,108,0,
-1,123,1,2,2,
-0,1,942,549,18,
-1,942,168,2,0,
-1,387,550,18,1,
-387,168,2,0,1,
-1514,551,18,1,1514,
-160,2,0,1,1515,
-552,18,1,1515,256,
-2,0,1,2074,553,
-18,1,2074,160,2,
-0,1,2075,554,18,
-1,2075,153,2,0,
-1,406,555,18,1,
-406,143,2,0,1,
-1521,556,18,1,1521,
-168,2,0,1,2636,
-557,18,1,2636,295,
-2,0,1,2557,558,
-18,1,2557,462,2,
-0,1,2639,559,18,
-1,2639,560,20,561,
-4,10,83,0,116,
-0,97,0,116,0,
-101,0,1,101,1,
-2,2,0,1,412,
-562,18,1,412,168,
-2,0,1,2641,563,
-18,1,2641,132,2,
-0,1,2484,564,18,
-1,2484,565,20,566,
-4,46,78,0,79,
+116,0,1,120,1,
+2,2,0,1,2034,
+529,18,1,2034,530,
+20,531,4,22,83,
+0,116,0,97,0,
+116,0,101,0,67,
+0,104,0,97,0,
+110,0,103,0,101,
+0,1,119,1,2,
+2,0,1,1478,532,
+18,1,1478,169,2,
+0,1,1479,533,18,
+1,1479,285,2,0,
+1,2037,534,18,1,
+2037,201,2,0,1,
+2038,535,18,1,2038,
+536,20,537,4,18,
+74,0,117,0,109,
+0,112,0,76,0,
+97,0,98,0,101,
+0,108,0,1,117,
+1,2,2,0,1,
+2039,538,18,1,2039,
+201,2,0,1,2040,
+539,18,1,2040,540,
+20,541,4,30,82,
+0,101,0,116,0,
+117,0,114,0,110,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,1,
+116,1,2,2,0,
+1,2041,542,18,1,
+2041,201,2,0,1,
+1485,543,18,1,1485,
+177,2,0,1,372,
+544,18,1,372,189,
+2,0,1,373,545,
+18,1,373,132,2,
+0,1,374,546,18,
+1,374,185,2,0,
+1,375,547,18,1,
+375,132,2,0,1,
+376,548,18,1,376,
+192,2,0,1,377,
+549,18,1,377,132,
+2,0,1,378,550,
+18,1,378,185,2,
+0,1,379,551,18,
+1,379,132,2,0,
+1,380,552,18,1,
+380,553,20,554,4,
+16,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,1,129,1,
+2,2,0,1,381,
+555,18,1,381,299,
+2,0,1,371,556,
+18,1,371,557,20,
+558,4,24,70,0,
+117,0,110,0,99,
+0,116,0,105,0,
+111,0,110,0,67,
+0,97,0,108,0,
+108,0,1,125,1,
+2,2,0,1,942,
+559,18,1,942,177,
+2,0,1,387,560,
+18,1,387,177,2,
+0,1,1514,561,18,
+1,1514,169,2,0,
+1,1515,562,18,1,
+1515,307,2,0,1,
+2606,563,18,1,2606,
+454,2,0,1,2074,
+564,18,1,2074,169,
+2,0,1,2075,565,
+18,1,2075,159,2,
+0,1,406,566,18,
+1,406,143,2,0,
+1,1521,567,18,1,
+1521,177,2,0,1,
+412,568,18,1,412,
+177,2,0,1,2484,
+569,18,1,2484,570,
+20,571,4,46,78,
+0,79,0,84,0,
+95,0,65,0,84,
+0,95,0,82,0,
+79,0,84,0,95,
+0,84,0,65,0,
+82,0,71,0,69,
 0,84,0,95,0,
-65,0,84,0,95,
-0,82,0,79,0,
-84,0,95,0,84,
-0,65,0,82,0,
-71,0,69,0,84,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,78,
+69,0,86,0,69,
+0,78,0,84,0,
+1,78,1,1,2,
+0,1,2023,572,18,
+1,2023,573,20,574,
+4,26,68,0,69,
+0,70,0,65,0,
+85,0,76,0,84,
+0,95,0,83,0,
+84,0,65,0,84,
+0,69,0,1,47,
 1,1,2,0,1,
-2023,567,18,1,2023,
-465,2,0,1,1442,
-568,18,1,1442,160,
-2,0,1,2651,569,
-18,1,2651,140,2,
-0,1,2653,570,18,
-1,2653,153,2,0,
-1,2655,571,18,1,
-2655,334,2,0,1,
-2035,572,18,1,2035,
-191,2,0,1,2036,
-573,18,1,2036,574,
-20,575,4,26,74,
+2564,575,18,1,2564,
+576,20,577,4,20,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,103,1,2,2,
+0,1,2648,578,18,
+1,2648,579,20,580,
+4,12,83,0,116,
+0,97,0,116,0,
+101,0,115,0,1,
+100,1,2,2,0,
+1,2567,581,18,1,
+2567,576,2,0,1,
+1442,582,18,1,1442,
+169,2,0,1,2569,
+583,18,1,2569,162,
+2,0,1,2652,584,
+18,1,2652,165,2,
+0,1,2653,585,18,
+1,2653,132,2,0,
+1,2654,586,18,1,
+2654,135,2,0,1,
+2035,587,18,1,2035,
+201,2,0,1,2036,
+588,18,1,2036,589,
+20,590,4,26,74,
 0,117,0,109,0,
 112,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,116,1,2,2,
-0,1,431,576,18,
+1,118,1,2,2,
+0,1,431,591,18,
 1,431,143,2,0,
-1,2105,577,18,1,
-2105,260,2,0,1,
-2106,578,18,1,2106,
-452,2,0,1,1550,
-579,18,1,1550,160,
-2,0,1,437,580,
-18,1,437,168,2,
-0,1,2044,581,18,
-1,2044,582,20,583,
+1,2105,592,18,1,
+2105,269,2,0,1,
+2106,593,18,1,2106,
+466,2,0,1,1550,
+594,18,1,1550,169,
+2,0,1,437,595,
+18,1,437,177,2,
+0,1,2044,596,18,
+1,2044,597,20,598,
 4,28,69,0,109,
 0,112,0,116,0,
 121,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,111,1,2,2,
-0,1,2045,584,18,
-1,2045,191,2,0,
-1,1555,585,18,1,
-1555,168,2,0,1,
-1001,586,18,1,1001,
-547,2,0,1,1002,
-587,18,1,1002,543,
-2,0,1,447,588,
-18,1,447,307,2,
-0,1,2597,589,18,
-1,2597,590,20,591,
-4,18,83,0,116,
-0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-1,102,1,2,2,
-0,1,1010,592,18,
-1,1010,160,2,0,
-1,1011,593,18,1,
-1011,153,2,0,1,
-1012,594,18,1,1012,
-168,2,0,1,1013,
-595,18,1,1013,153,
-2,0,1,459,596,
-18,1,459,597,20,
-598,4,24,76,0,
-69,0,70,0,84,
-0,95,0,66,0,
-82,0,65,0,67,
-0,75,0,69,0,
-84,0,1,27,1,
-1,2,0,1,1574,
-599,18,1,1574,191,
-2,0,1,461,600,
-18,1,461,601,20,
-602,4,24,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,76,
-0,105,0,115,0,
-116,0,1,124,1,
-2,2,0,1,462,
-603,18,1,462,143,
-2,0,1,464,604,
-18,1,464,605,20,
-606,4,16,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,1,
-125,1,2,2,0,
-1,2136,607,18,1,
-2136,260,2,0,1,
-2694,608,18,1,2694,
-191,2,0,1,2695,
-609,18,1,2695,610,
-20,611,4,34,71,
-0,108,0,111,0,
-98,0,97,0,108,
-0,68,0,101,0,
-102,0,105,0,110,
-0,105,0,116,0,
-105,0,111,0,110,
-0,115,0,1,97,
+1,113,1,2,2,
+0,1,2045,599,18,
+1,2045,201,2,0,
+1,1555,600,18,1,
+1555,177,2,0,1,
+2670,601,18,1,2670,
+307,2,0,1,2511,
+602,18,1,2511,135,
+2,0,1,1001,603,
+18,1,1001,557,2,
+0,1,1002,604,18,
+1,1002,553,2,0,
+1,447,605,18,1,
+447,316,2,0,1,
+2676,606,18,1,2676,
+177,2,0,1,2520,
+607,18,1,2520,140,
+2,0,1,1010,608,
+18,1,1010,169,2,
+0,1,1011,609,18,
+1,1011,159,2,0,
+1,1012,610,18,1,
+1012,177,2,0,1,
+1013,611,18,1,1013,
+159,2,0,1,459,
+612,18,1,459,613,
+20,614,4,24,76,
+0,69,0,70,0,
+84,0,95,0,66,
+0,82,0,65,0,
+67,0,75,0,69,
+0,84,0,1,27,
+1,1,2,0,1,
+1574,615,18,1,1574,
+201,2,0,1,461,
+616,18,1,461,617,
+20,618,4,24,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+76,0,105,0,115,
+0,116,0,1,126,
 1,2,2,0,1,
-1585,612,18,1,1585,
-613,20,614,4,12,
-82,0,69,0,84,
-0,85,0,82,0,
-78,0,1,50,1,
-1,2,0,1,476,
-615,18,1,476,616,
-20,617,4,30,83,
-0,84,0,82,0,
-73,0,78,0,71,
-0,95,0,67,0,
-79,0,78,0,83,
-0,84,0,65,0,
-78,0,84,0,1,
-3,1,1,2,0,
-1,477,618,18,1,
-477,619,20,620,4,
-28,70,0,76,0,
-79,0,65,0,84,
+462,619,18,1,462,
+143,2,0,1,464,
+620,18,1,464,621,
+20,622,4,16,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+1,127,1,2,2,
+0,1,2136,623,18,
+1,2136,269,2,0,
+1,2729,104,1,2695,
+624,18,1,2695,201,
+2,0,1,1585,625,
+18,1,1585,626,20,
+627,4,12,82,0,
+69,0,84,0,85,
+0,82,0,78,0,
+1,50,1,1,2,
+0,1,476,628,18,
+1,476,629,20,630,
+4,30,83,0,84,
+0,82,0,73,0,
+78,0,71,0,95,
+0,67,0,79,0,
+78,0,83,0,84,
+0,65,0,78,0,
+84,0,1,3,1,
+1,2,0,1,477,
+631,18,1,477,632,
+20,633,4,28,70,
+0,76,0,79,0,
+65,0,84,0,95,
+0,67,0,79,0,
+78,0,83,0,84,
+0,65,0,78,0,
+84,0,1,95,1,
+1,2,0,1,478,
+634,18,1,478,635,
+20,636,4,40,72,
+0,69,0,88,0,
+95,0,73,0,78,
+0,84,0,69,0,
+71,0,69,0,82,
 0,95,0,67,0,
 79,0,78,0,83,
 0,84,0,65,0,
 78,0,84,0,1,
-95,1,1,2,0,
-1,478,621,18,1,
-478,622,20,623,4,
-40,72,0,69,0,
-88,0,95,0,73,
-0,78,0,84,0,
-69,0,71,0,69,
-0,82,0,95,0,
-67,0,79,0,78,
-0,83,0,84,0,
-65,0,78,0,84,
-0,1,94,1,1,
-2,0,1,479,624,
-18,1,479,625,20,
-626,4,32,73,0,
-78,0,84,0,69,
-0,71,0,69,0,
-82,0,95,0,67,
-0,79,0,78,0,
-83,0,84,0,65,
-0,78,0,84,0,
-1,93,1,1,2,
-0,1,480,627,18,
-1,480,628,20,629,
-4,26,82,0,73,
-0,71,0,72,0,
-84,0,95,0,66,
-0,82,0,65,0,
-67,0,75,0,69,
-0,84,0,1,28,
+94,1,1,2,0,
+1,479,637,18,1,
+479,638,20,639,4,
+32,73,0,78,0,
+84,0,69,0,71,
+0,69,0,82,0,
+95,0,67,0,79,
+0,78,0,83,0,
+84,0,65,0,78,
+0,84,0,1,93,
 1,1,2,0,1,
-481,630,18,1,481,
-605,2,0,1,2713,
-631,18,1,2713,632,
-20,633,4,48,71,
-0,108,0,111,0,
-98,0,97,0,108,
-0,70,0,117,0,
-110,0,99,0,116,
-0,105,0,111,0,
-110,0,68,0,101,
-0,102,0,105,0,
-110,0,105,0,116,
-0,105,0,111,0,
-110,0,1,99,1,
-2,2,0,1,2714,
-634,18,1,2714,635,
-20,636,4,50,71,
+480,640,18,1,480,
+641,20,642,4,26,
+82,0,73,0,71,
+0,72,0,84,0,
+95,0,66,0,82,
+0,65,0,67,0,
+75,0,69,0,84,
+0,1,28,1,1,
+2,0,1,481,643,
+18,1,481,621,2,
+0,1,2718,644,18,
+1,2718,579,2,0,
+1,1048,645,18,1,
+1048,177,2,0,1,
+2725,646,18,1,2725,
+153,2,0,1,2726,
+647,18,1,2726,648,
+20,649,4,50,71,
 0,108,0,111,0,
 98,0,97,0,108,
 0,86,0,97,0,
@@ -3273,36 +3338,30 @@ public yyLSLSyntax
 0,116,0,105,0,
 111,0,110,0,1,
 98,1,2,2,0,
-1,2715,637,18,1,
-2715,632,2,0,1,
-2716,638,18,1,2716,
-635,2,0,1,2717,
-104,1,2634,639,18,
-1,2634,447,2,0,
-1,1048,640,18,1,
-1048,168,2,0,1,
-2640,641,18,1,2640,
-560,2,0,1,2642,
-642,18,1,2642,135,
-2,0,1,2042,643,
-18,1,2042,644,20,
-645,4,20,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,1,112,
-1,2,2,0,1,
-2043,646,18,1,2043,
-191,2,0,1,1620,
-647,18,1,1620,160,
-2,0,1,1621,648,
-18,1,1621,150,2,
-0,1,1622,649,18,
-1,1622,256,2,0,
-1,509,650,18,1,
+1,2563,650,18,1,
+2563,480,2,0,1,
+2728,651,18,1,2728,
+648,2,0,1,2042,
+652,18,1,2042,653,
+20,654,4,20,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,1,
+114,1,2,2,0,
+1,2043,655,18,1,
+2043,201,2,0,1,
+2568,656,18,1,2568,
+573,2,0,1,1620,
+657,18,1,1620,169,
+2,0,1,1621,658,
+18,1,1621,156,2,
+0,1,1622,659,18,
+1,1622,307,2,0,
+1,509,660,18,1,
 509,143,2,0,1,
-2498,651,18,1,2498,
-652,20,653,4,42,
+2498,661,18,1,2498,
+662,20,663,4,42,
 67,0,79,0,76,
 0,76,0,73,0,
 83,0,73,0,79,
@@ -3313,321 +3372,323 @@ public yyLSLSyntax
 0,69,0,78,0,
 84,0,1,64,1,
 1,2,0,1,1628,
-654,18,1,1628,168,
-2,0,1,515,655,
-18,1,515,168,2,
-0,1,2505,656,18,
-1,2505,657,20,658,
-4,10,69,0,118,
+664,18,1,1628,177,
+2,0,1,515,665,
+18,1,515,177,2,
+0,1,2505,666,18,
+1,2505,667,20,668,
+4,20,69,0,110,
+0,116,0,114,0,
+121,0,69,0,118,
 0,101,0,110,0,
-116,0,1,107,1,
-2,2,0,1,2664,
-659,18,1,2664,168,
-2,0,1,525,660,
-18,1,525,307,2,
-0,1,2197,661,18,
-1,2197,160,2,0,
-1,2198,662,18,1,
-2198,153,2,0,1,
-1591,663,18,1,1591,
-168,2,0,1,2521,
-664,18,1,2521,590,
-2,0,1,1094,665,
-18,1,1094,601,2,
-0,1,1096,666,18,
-1,1096,153,2,0,
-1,2683,667,18,1,
-2683,191,2,0,1,
-1657,668,18,1,1657,
-191,2,0,1,1658,
-669,18,1,1658,670,
-20,671,4,6,70,
+116,0,1,109,1,
+2,2,0,1,2663,
+669,18,1,2663,140,
+2,0,1,2665,670,
+18,1,2665,159,2,
+0,1,2667,671,18,
+1,2667,342,2,0,
+1,525,672,18,1,
+525,316,2,0,1,
+2197,673,18,1,2197,
+169,2,0,1,2198,
+674,18,1,2198,159,
+2,0,1,1591,675,
+18,1,1591,177,2,
+0,1,1094,676,18,
+1,1094,617,2,0,
+1,1096,677,18,1,
+1096,159,2,0,1,
+1657,678,18,1,1657,
+201,2,0,1,1658,
+679,18,1,1658,680,
+20,681,4,6,70,
 0,79,0,82,0,
 1,46,1,1,2,
-0,1,1659,672,18,
+0,1,1659,682,18,
 1,1659,135,2,0,
-1,1665,673,18,1,
-1665,168,2,0,1,
-1113,674,18,1,1113,
-176,2,0,675,5,
-0,676,5,324,1,
-2,677,19,237,1,
-2,678,5,6,1,
-2706,679,17,680,15,
-681,4,30,37,0,
-76,0,83,0,76,
-0,80,0,114,0,
-111,0,103,0,114,
-0,97,0,109,0,
-82,0,111,0,111,
-0,116,0,1,-1,
-1,5,682,20,683,
-4,32,76,0,83,
-0,76,0,80,0,
-114,0,111,0,103,
-0,114,0,97,0,
-109,0,82,0,111,
-0,111,0,116,0,
-95,0,49,0,1,
-142,1,3,1,3,
-1,2,684,22,1,
-1,1,2640,685,17,
-686,15,687,4,14,
-37,0,83,0,116,
-0,97,0,116,0,
-101,0,115,0,1,
--1,1,5,688,20,
-689,4,16,83,0,
-116,0,97,0,116,
-0,101,0,115,0,
-95,0,49,0,1,
-152,1,3,1,2,
-1,1,690,22,1,
-11,1,2634,691,17,
-692,15,693,4,12,
-37,0,83,0,116,
-0,97,0,116,0,
-101,0,1,-1,1,
-5,694,20,695,4,
-14,83,0,116,0,
+1,1665,683,18,1,
+1665,177,2,0,1,
+1113,684,18,1,1113,
+185,2,0,685,5,
+0,686,5,329,1,
+2,687,19,262,1,
+2,688,5,6,1,
+2651,689,17,690,15,
+691,4,14,37,0,
+83,0,116,0,97,
+0,116,0,101,0,
+115,0,1,-1,1,
+5,692,20,693,4,
+16,83,0,116,0,
 97,0,116,0,101,
-0,95,0,49,0,
-1,154,1,3,1,
-5,1,4,696,22,
-1,13,1,2558,697,
-17,698,15,693,1,
--1,1,5,699,20,
-700,4,14,83,0,
+0,115,0,95,0,
+50,0,1,155,1,
+3,1,3,1,2,
+694,22,1,12,1,
+2652,695,17,696,15,
+691,1,-1,1,5,
+697,20,698,4,16,
+83,0,116,0,97,
+0,116,0,101,0,
+115,0,95,0,49,
+0,1,154,1,3,
+1,2,1,1,699,
+22,1,11,1,2565,
+700,17,701,15,702,
+4,12,37,0,83,
+0,116,0,97,0,
+116,0,101,0,1,
+-1,1,5,703,20,
+704,4,14,83,0,
 116,0,97,0,116,
 0,101,0,95,0,
-50,0,1,155,1,
+50,0,1,157,1,
 3,1,6,1,5,
-701,22,1,14,1,
-2636,702,17,703,15,
-681,1,-1,1,5,
-704,20,705,4,32,
-76,0,83,0,76,
-0,80,0,114,0,
-111,0,103,0,114,
-0,97,0,109,0,
-82,0,111,0,111,
-0,116,0,95,0,
-50,0,1,143,1,
-3,1,2,1,1,
-706,22,1,2,1,
-2639,707,17,708,15,
-687,1,-1,1,5,
-709,20,710,4,16,
+705,22,1,14,1,
+2645,706,17,707,15,
+702,1,-1,1,5,
+708,20,709,4,14,
 83,0,116,0,97,
 0,116,0,101,0,
-115,0,95,0,50,
-0,1,153,1,3,
-1,3,1,2,711,
-22,1,12,1,3,
-712,19,617,1,3,
-713,5,95,1,256,
-714,16,0,615,1,
-1261,715,16,0,615,
-1,509,716,16,0,
-615,1,1515,717,16,
-0,615,1,2021,718,
-17,719,15,720,4,
+95,0,49,0,1,
+156,1,3,1,5,
+1,4,710,22,1,
+13,1,2718,711,17,
+712,15,713,4,30,
+37,0,76,0,83,
+0,76,0,80,0,
+114,0,111,0,103,
+0,114,0,97,0,
+109,0,82,0,111,
+0,111,0,116,0,
+1,-1,1,5,714,
+20,715,4,32,76,
+0,83,0,76,0,
+80,0,114,0,111,
+0,103,0,114,0,
+97,0,109,0,82,
+0,111,0,111,0,
+116,0,95,0,49,
+0,1,144,1,3,
+1,3,1,2,716,
+22,1,1,1,2648,
+717,17,718,15,713,
+1,-1,1,5,719,
+20,720,4,32,76,
+0,83,0,76,0,
+80,0,114,0,111,
+0,103,0,114,0,
+97,0,109,0,82,
+0,111,0,111,0,
+116,0,95,0,50,
+0,1,145,1,3,
+1,2,1,1,721,
+22,1,2,1,3,
+722,19,630,1,3,
+723,5,95,1,256,
+724,16,0,628,1,
+1261,725,16,0,628,
+1,509,726,16,0,
+628,1,1515,727,16,
+0,628,1,2021,728,
+17,729,15,730,4,
 24,37,0,73,0,
 102,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,-1,1,5,721,
-20,722,4,26,73,
+1,-1,1,5,731,
+20,732,4,26,73,
 0,102,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,50,0,
-1,185,1,3,1,
-8,1,7,723,22,
-1,45,1,1775,724,
-16,0,615,1,2029,
-725,17,726,15,727,
+1,190,1,3,1,
+8,1,7,733,22,
+1,48,1,1775,734,
+16,0,628,1,2029,
+735,17,736,15,737,
 4,20,37,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,1,-1,1,
-5,728,20,729,4,
+5,738,20,739,4,
 24,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
 0,49,0,51,0,
-1,179,1,3,1,
-2,1,1,730,22,
-1,39,1,2030,731,
-17,732,15,727,1,
--1,1,5,733,20,
-734,4,24,83,0,
+1,184,1,3,1,
+2,1,1,740,22,
+1,42,1,2030,741,
+17,742,15,737,1,
+-1,1,5,743,20,
+744,4,24,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-50,0,1,178,1,
+50,0,1,183,1,
 3,1,2,1,1,
-735,22,1,38,1,
-2031,736,17,737,15,
-727,1,-1,1,5,
-738,20,739,4,24,
+745,22,1,41,1,
+2031,746,17,747,15,
+737,1,-1,1,5,
+748,20,749,4,24,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
 49,0,49,0,1,
-177,1,3,1,2,
-1,1,740,22,1,
-37,1,2032,741,17,
-742,15,727,1,-1,
-1,5,743,20,744,
+182,1,3,1,2,
+1,1,750,22,1,
+40,1,2032,751,17,
+752,15,737,1,-1,
+1,5,753,20,754,
 4,24,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
 95,0,49,0,48,
-0,1,176,1,3,
-1,2,1,1,745,
-22,1,36,1,2033,
-746,17,747,15,727,
-1,-1,1,5,748,
-20,749,4,22,83,
+0,1,181,1,3,
+1,2,1,1,755,
+22,1,39,1,2033,
+756,17,757,15,737,
+1,-1,1,5,758,
+20,759,4,22,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,95,0,57,
-0,1,175,1,3,
-1,2,1,1,750,
-22,1,35,1,277,
-751,16,0,615,1,
-2035,752,17,753,15,
-727,1,-1,1,5,
-754,20,755,4,22,
+0,1,180,1,3,
+1,2,1,1,760,
+22,1,38,1,277,
+761,16,0,628,1,
+2035,762,17,763,15,
+737,1,-1,1,5,
+764,20,765,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-56,0,1,174,1,
+56,0,1,179,1,
 3,1,3,1,2,
-756,22,1,34,1,
-2037,757,17,758,15,
-727,1,-1,1,5,
-759,20,760,4,22,
+766,22,1,37,1,
+2037,767,17,768,15,
+737,1,-1,1,5,
+769,20,770,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-55,0,1,173,1,
+55,0,1,178,1,
 3,1,3,1,2,
-761,22,1,33,1,
-2039,762,17,763,15,
-727,1,-1,1,5,
-764,20,765,4,22,
+771,22,1,36,1,
+2039,772,17,773,15,
+737,1,-1,1,5,
+774,20,775,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-54,0,1,172,1,
+54,0,1,177,1,
 3,1,3,1,2,
-766,22,1,32,1,
-32,767,16,0,615,
-1,2041,768,17,769,
-15,727,1,-1,1,
-5,770,20,771,4,
+776,22,1,35,1,
+32,777,16,0,628,
+1,2041,778,17,779,
+15,737,1,-1,1,
+5,780,20,781,4,
 22,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,53,0,1,171,
+0,53,0,1,176,
 1,3,1,3,1,
-2,772,22,1,31,
-1,2293,773,16,0,
-615,1,2043,774,17,
-775,15,727,1,-1,
-1,5,776,20,777,
+2,782,22,1,34,
+1,2293,783,16,0,
+628,1,2043,784,17,
+785,15,737,1,-1,
+1,5,786,20,787,
 4,22,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
 95,0,51,0,1,
-169,1,3,1,3,
-1,2,778,22,1,
-29,1,2045,779,17,
-780,15,727,1,-1,
-1,5,781,20,782,
+174,1,3,1,3,
+1,2,788,22,1,
+32,1,2045,789,17,
+790,15,737,1,-1,
+1,5,791,20,792,
 4,22,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
 95,0,49,0,1,
-167,1,3,1,3,
-1,2,783,22,1,
-27,1,41,784,16,
-0,615,1,1297,785,
-16,0,615,1,43,
-786,16,0,615,1,
-1803,787,17,788,15,
-789,4,16,37,0,
+172,1,3,1,3,
+1,2,793,22,1,
+30,1,41,794,16,
+0,628,1,1297,795,
+16,0,628,1,43,
+796,16,0,628,1,
+1803,797,17,798,15,
+799,4,16,37,0,
 70,0,111,0,114,
 0,76,0,111,0,
 111,0,112,0,1,
--1,1,5,790,20,
-791,4,18,70,0,
+-1,1,5,800,20,
+801,4,18,70,0,
 111,0,114,0,76,
 0,111,0,111,0,
 112,0,95,0,49,
-0,1,192,1,3,
-1,10,1,9,792,
-22,1,52,1,1804,
-793,16,0,615,1,
-299,794,16,0,615,
-1,52,795,16,0,
-615,1,2318,796,16,
-0,615,1,62,797,
-16,0,615,1,2075,
-798,16,0,615,1,
-1574,799,17,800,15,
-727,1,-1,1,5,
-801,20,802,4,22,
+0,1,197,1,3,
+1,10,1,9,802,
+22,1,55,1,1804,
+803,16,0,628,1,
+299,804,16,0,628,
+1,52,805,16,0,
+628,1,2318,806,16,
+0,628,1,62,807,
+16,0,628,1,2075,
+808,16,0,628,1,
+1574,809,17,810,15,
+737,1,-1,1,5,
+811,20,812,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-52,0,1,170,1,
+52,0,1,175,1,
 3,1,3,1,2,
-803,22,1,30,1,
-71,804,16,0,615,
-1,76,805,16,0,
-615,1,1834,806,16,
-0,615,1,2337,807,
-16,0,615,1,79,
-808,16,0,615,1,
-1335,809,16,0,615,
-1,322,810,16,0,
-615,1,85,811,16,
-0,615,1,89,812,
-16,0,615,1,346,
-813,16,0,615,1,
-2105,814,17,815,15,
-720,1,-1,1,5,
-816,20,817,4,26,
+813,22,1,33,1,
+71,814,16,0,628,
+1,76,815,16,0,
+628,1,1834,816,16,
+0,628,1,2337,817,
+16,0,628,1,79,
+818,16,0,628,1,
+1335,819,16,0,628,
+1,322,820,16,0,
+628,1,85,821,16,
+0,628,1,89,822,
+16,0,628,1,346,
+823,16,0,628,1,
+2105,824,17,825,15,
+730,1,-1,1,5,
+826,20,827,4,26,
 73,0,102,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,95,0,51,
-0,1,186,1,3,
-1,6,1,5,818,
-22,1,46,1,2106,
-819,16,0,615,1,
-97,820,16,0,615,
-1,1860,821,17,822,
-15,823,4,34,37,
+0,1,191,1,3,
+1,6,1,5,828,
+22,1,49,1,2106,
+829,16,0,628,1,
+97,830,16,0,628,
+1,1860,831,17,832,
+15,833,4,34,37,
 0,68,0,111,0,
 87,0,104,0,105,
 0,108,0,101,0,
@@ -3635,7 +3696,7 @@ public yyLSLSyntax
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,1,-1,
-1,5,824,20,825,
+1,5,834,20,835,
 4,36,68,0,111,
 0,87,0,104,0,
 105,0,108,0,101,
@@ -3643,25 +3704,25 @@ public yyLSLSyntax
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,1,190,
+0,49,0,1,195,
 1,3,1,8,1,
-7,826,22,1,50,
-1,2364,827,17,828,
-15,789,1,-1,1,
-5,829,20,830,4,
+7,836,22,1,53,
+1,2364,837,17,838,
+15,799,1,-1,1,
+5,839,20,840,4,
 18,70,0,111,0,
 114,0,76,0,111,
 0,111,0,112,0,
 95,0,50,0,1,
-193,1,3,1,9,
-1,8,831,22,1,
-53,1,102,832,16,
-0,615,1,112,833,
-16,0,615,1,1117,
-834,16,0,615,1,
-1873,835,17,836,15,
-823,1,-1,1,5,
-837,20,838,4,36,
+198,1,3,1,9,
+1,8,841,22,1,
+56,1,102,842,16,
+0,628,1,112,843,
+16,0,628,1,1117,
+844,16,0,628,1,
+1873,845,17,846,15,
+833,1,-1,1,5,
+847,20,848,4,36,
 68,0,111,0,87,
 0,104,0,105,0,
 108,0,101,0,83,
@@ -3669,414 +3730,414 @@ public yyLSLSyntax
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,95,0,50,
-0,1,191,1,3,
-1,8,1,7,839,
-22,1,51,1,1876,
-840,16,0,615,1,
-124,841,16,0,615,
-1,2136,842,17,843,
-15,720,1,-1,1,
-5,844,20,845,4,
+0,1,196,1,3,
+1,8,1,7,849,
+22,1,54,1,1876,
+850,16,0,628,1,
+124,851,16,0,628,
+1,2136,852,17,853,
+15,730,1,-1,1,
+5,854,20,855,4,
 26,73,0,102,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-52,0,1,187,1,
+52,0,1,192,1,
 3,1,8,1,7,
-846,22,1,47,1,
-381,847,16,0,615,
-1,525,848,16,0,
-615,1,137,849,16,
-0,615,1,1901,850,
-16,0,615,1,2658,
-851,16,0,615,1,
-1153,852,16,0,615,
-1,151,853,16,0,
-615,1,1407,854,16,
-0,615,1,1659,855,
-16,0,615,1,2413,
-856,16,0,615,1,
-406,857,16,0,615,
-1,1371,858,16,0,
-615,1,166,859,16,
-0,615,1,1622,860,
-16,0,615,1,1931,
-861,17,862,15,863,
-4,30,37,0,87,
-0,104,0,105,0,
-108,0,101,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,864,20,865,4,
-32,87,0,104,0,
-105,0,108,0,101,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,1,188,
-1,3,1,6,1,
-5,866,22,1,48,
-1,1933,867,16,0,
-615,1,431,868,16,
-0,615,1,1585,869,
-16,0,615,1,182,
-870,16,0,615,1,
-1189,871,16,0,615,
-1,1443,872,16,0,
-615,1,1695,873,16,
-0,615,1,2198,874,
-16,0,615,1,447,
-875,16,0,615,1,
-2458,876,17,877,15,
-878,4,28,37,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,76,0,
-105,0,115,0,116,
+856,22,1,50,1,
+381,857,16,0,628,
+1,525,858,16,0,
+628,1,137,859,16,
+0,628,1,1901,860,
+16,0,628,1,1153,
+861,16,0,628,1,
+151,862,16,0,628,
+1,1407,863,16,0,
+628,1,1659,864,16,
+0,628,1,2413,865,
+16,0,628,1,406,
+866,16,0,628,1,
+1371,867,16,0,628,
+1,166,868,16,0,
+628,1,1622,869,16,
+0,628,1,1931,870,
+17,871,15,872,4,
+30,37,0,87,0,
+104,0,105,0,108,
+0,101,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
 0,1,-1,1,5,
-879,20,880,4,30,
+873,20,874,4,32,
+87,0,104,0,105,
+0,108,0,101,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
-0,116,0,76,0,
-105,0,115,0,116,
-0,95,0,50,0,
-1,165,1,3,1,
-3,1,2,881,22,
-1,25,1,2459,882,
-17,883,15,884,4,
-36,37,0,67,0,
-111,0,109,0,112,
-0,111,0,117,0,
-110,0,100,0,83,
+0,116,0,95,0,
+49,0,1,193,1,
+3,1,6,1,5,
+875,22,1,51,1,
+1933,876,16,0,628,
+1,431,877,16,0,
+628,1,1585,878,16,
+0,628,1,182,879,
+16,0,628,1,1189,
+880,16,0,628,1,
+1443,881,16,0,628,
+1,1695,882,16,0,
+628,1,2198,883,16,
+0,628,1,447,884,
+16,0,628,1,2458,
+885,17,886,15,887,
+4,28,37,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,1,-1,1,
-5,885,20,886,4,
-38,67,0,111,0,
-109,0,112,0,111,
-0,117,0,110,0,
-100,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
+116,0,76,0,105,
+0,115,0,116,0,
+1,-1,1,5,888,
+20,889,4,30,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,76,0,105,
+0,115,0,116,0,
 95,0,50,0,1,
-163,1,3,1,4,
-1,3,887,22,1,
-23,1,1958,888,16,
-0,615,1,2462,889,
-17,890,15,878,1,
--1,1,5,891,20,
-892,4,30,83,0,
+170,1,3,1,3,
+1,2,890,22,1,
+28,1,2459,891,17,
+892,15,893,4,36,
+37,0,67,0,111,
+0,109,0,112,0,
+111,0,117,0,110,
+0,100,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
-0,76,0,105,0,
-115,0,116,0,95,
-0,49,0,1,164,
-1,3,1,2,1,
-1,893,22,1,24,
-1,1657,894,17,895,
-15,727,1,-1,1,
-5,896,20,897,4,
-22,83,0,116,0,
+0,1,-1,1,5,
+894,20,895,4,38,
+67,0,111,0,109,
+0,112,0,111,0,
+117,0,110,0,100,
+0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
 0,50,0,1,168,
-1,3,1,3,1,
-2,898,22,1,28,
-1,2464,899,17,900,
-15,884,1,-1,1,
-5,901,20,902,4,
-38,67,0,111,0,
-109,0,112,0,111,
-0,117,0,110,0,
-100,0,83,0,116,
+1,3,1,4,1,
+3,896,22,1,26,
+1,1958,897,16,0,
+628,1,2462,898,17,
+899,15,887,1,-1,
+1,5,900,20,901,
+4,30,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-95,0,49,0,1,
-162,1,3,1,3,
-1,2,903,22,1,
-22,1,199,904,16,
-0,615,1,459,905,
-16,0,615,1,462,
-906,16,0,615,1,
-217,907,16,0,615,
-1,2227,908,17,909,
-15,863,1,-1,1,
-5,910,20,911,4,
-32,87,0,104,0,
-105,0,108,0,101,
+76,0,105,0,115,
+0,116,0,95,0,
+49,0,1,169,1,
+3,1,2,1,1,
+902,22,1,27,1,
+1657,903,17,904,15,
+737,1,-1,1,5,
+905,20,906,4,22,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+50,0,1,173,1,
+3,1,3,1,2,
+907,22,1,31,1,
+2464,908,17,909,15,
+893,1,-1,1,5,
+910,20,911,4,38,
+67,0,111,0,109,
+0,112,0,111,0,
+117,0,110,0,100,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,50,0,1,189,
-1,3,1,6,1,
-5,912,22,1,49,
-1,1225,913,16,0,
-615,1,1479,914,16,
-0,615,1,1731,915,
-16,0,615,1,1989,
-916,17,917,15,720,
-1,-1,1,5,918,
-20,919,4,26,73,
-0,102,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,49,0,
-1,184,1,3,1,
-6,1,5,920,22,
-1,44,1,1990,921,
-16,0,615,1,236,
-922,16,0,615,1,
-1756,923,16,0,615,
-1,4,924,19,184,
-1,4,925,5,100,
-1,256,926,16,0,
-538,1,1261,927,16,
-0,538,1,509,928,
-16,0,538,1,1515,
-929,16,0,538,1,
-2021,718,1,1775,930,
-16,0,538,1,2029,
-725,1,2030,731,1,
-2031,736,1,2032,741,
-1,2033,746,1,277,
-931,16,0,538,1,
-2035,752,1,2037,757,
-1,2039,762,1,32,
-932,16,0,538,1,
-2041,768,1,2293,933,
-16,0,538,1,2043,
-774,1,2045,779,1,
-40,934,16,0,186,
-1,41,935,16,0,
-538,1,1297,936,16,
-0,538,1,43,937,
-16,0,538,1,44,
-938,16,0,186,1,
-1803,787,1,1804,939,
-16,0,538,1,299,
-940,16,0,538,1,
-47,941,16,0,182,
-1,52,942,16,0,
-538,1,2318,943,16,
-0,538,1,63,944,
-16,0,201,1,66,
-945,16,0,199,1,
-2075,946,16,0,538,
-1,1574,799,1,71,
-947,16,0,538,1,
-76,948,16,0,538,
-1,1834,949,16,0,
-538,1,2337,950,16,
-0,538,1,79,951,
-16,0,538,1,1335,
-952,16,0,538,1,
-322,953,16,0,538,
-1,85,954,16,0,
-538,1,89,955,16,
-0,538,1,346,956,
-16,0,538,1,97,
-957,16,0,538,1,
-2106,958,16,0,538,
-1,102,959,16,0,
-538,1,1860,821,1,
-2364,827,1,1114,960,
-16,0,182,1,112,
-961,16,0,538,1,
-1117,962,16,0,538,
-1,1873,835,1,1876,
-963,16,0,538,1,
-124,964,16,0,538,
-1,2136,842,1,381,
-965,16,0,538,1,
-525,966,16,0,538,
-1,137,967,16,0,
-538,1,1901,968,16,
-0,538,1,2658,969,
-16,0,538,1,1153,
-970,16,0,538,1,
-151,971,16,0,538,
-1,1407,972,16,0,
-538,1,1659,973,16,
-0,538,1,2413,974,
-16,0,538,1,406,
-975,16,0,538,1,
-1371,976,16,0,538,
-1,2105,814,1,166,
-977,16,0,538,1,
-1622,978,16,0,538,
-1,1931,861,1,1933,
-979,16,0,538,1,
-431,980,16,0,538,
-1,1585,981,16,0,
-538,1,182,982,16,
-0,538,1,1189,983,
-16,0,538,1,1443,
-984,16,0,538,1,
-1695,985,16,0,538,
-1,2198,986,16,0,
-538,1,447,987,16,
-0,538,1,2458,876,
-1,2459,882,1,1958,
-988,16,0,538,1,
-2462,889,1,1657,894,
-1,2464,899,1,199,
-989,16,0,538,1,
-459,990,16,0,538,
-1,462,991,16,0,
-538,1,217,992,16,
-0,538,1,2227,908,
-1,1225,993,16,0,
-538,1,1479,994,16,
-0,538,1,1731,995,
-16,0,538,1,1989,
-916,1,1990,996,16,
-0,538,1,236,997,
-16,0,538,1,1756,
-998,16,0,538,1,
-5,999,19,181,1,
-5,1000,5,100,1,
-256,1001,16,0,534,
-1,1261,1002,16,0,
-534,1,509,1003,16,
-0,534,1,1515,1004,
-16,0,534,1,2021,
-718,1,1775,1005,16,
-0,534,1,2029,725,
-1,2030,731,1,2031,
-736,1,2032,741,1,
-2033,746,1,277,1006,
-16,0,534,1,2035,
-752,1,2037,757,1,
-2039,762,1,32,1007,
-16,0,534,1,2041,
-768,1,2293,1008,16,
-0,534,1,2043,774,
-1,2045,779,1,40,
-1009,16,0,185,1,
-41,1010,16,0,534,
-1,1297,1011,16,0,
-534,1,43,1012,16,
-0,534,1,44,1013,
-16,0,185,1,1803,
-787,1,1804,1014,16,
-0,534,1,299,1015,
-16,0,534,1,47,
-1016,16,0,179,1,
-52,1017,16,0,534,
-1,2318,1018,16,0,
-534,1,63,1019,16,
-0,200,1,66,1020,
-16,0,198,1,2075,
-1021,16,0,534,1,
-1574,799,1,71,1022,
-16,0,534,1,76,
-1023,16,0,534,1,
-1834,1024,16,0,534,
-1,2337,1025,16,0,
-534,1,79,1026,16,
-0,534,1,1335,1027,
-16,0,534,1,322,
-1028,16,0,534,1,
-85,1029,16,0,534,
-1,89,1030,16,0,
-534,1,346,1031,16,
-0,534,1,97,1032,
-16,0,534,1,2106,
-1033,16,0,534,1,
-102,1034,16,0,534,
-1,1860,821,1,2364,
-827,1,1114,1035,16,
-0,179,1,112,1036,
-16,0,534,1,1117,
-1037,16,0,534,1,
-1873,835,1,1876,1038,
-16,0,534,1,124,
-1039,16,0,534,1,
-2136,842,1,381,1040,
-16,0,534,1,525,
-1041,16,0,534,1,
-137,1042,16,0,534,
-1,1901,1043,16,0,
-534,1,2658,1044,16,
-0,534,1,1153,1045,
-16,0,534,1,151,
-1046,16,0,534,1,
-1407,1047,16,0,534,
-1,1659,1048,16,0,
-534,1,2413,1049,16,
-0,534,1,406,1050,
-16,0,534,1,1371,
-1051,16,0,534,1,
-2105,814,1,166,1052,
-16,0,534,1,1622,
-1053,16,0,534,1,
-1931,861,1,1933,1054,
-16,0,534,1,431,
-1055,16,0,534,1,
-1585,1056,16,0,534,
-1,182,1057,16,0,
-534,1,1189,1058,16,
-0,534,1,1443,1059,
-16,0,534,1,1695,
-1060,16,0,534,1,
-2198,1061,16,0,534,
-1,447,1062,16,0,
-534,1,2458,876,1,
-2459,882,1,1958,1063,
-16,0,534,1,2462,
-889,1,1657,894,1,
-2464,899,1,199,1064,
-16,0,534,1,459,
-1065,16,0,534,1,
-462,1066,16,0,534,
-1,217,1067,16,0,
-534,1,2227,908,1,
-1225,1068,16,0,534,
-1,1479,1069,16,0,
-534,1,1731,1070,16,
-0,534,1,1989,916,
-1,1990,1071,16,0,
-534,1,236,1072,16,
-0,534,1,1756,1073,
-16,0,534,1,6,
-1074,19,277,1,6,
-1075,5,2,1,1114,
-1076,16,0,275,1,
-40,1077,16,0,523,
-1,7,1078,19,243,
-1,7,1079,5,2,
-1,1114,1080,16,0,
-241,1,40,1081,16,
-0,459,1,8,1082,
-19,207,1,8,1083,
-5,2,1,1114,1084,
-16,0,205,1,40,
-1085,16,0,439,1,
-9,1086,19,213,1,
-9,1087,5,2,1,
-1114,1088,16,0,211,
-1,40,1089,16,0,
-384,1,10,1090,19,
-164,1,10,1091,5,
-2,1,1114,1092,16,
-0,162,1,40,1093,
-16,0,324,1,11,
-1094,19,192,1,11,
-1095,5,146,1,1260,
-1096,17,1097,15,1098,
+0,49,0,1,167,
+1,3,1,3,1,
+2,912,22,1,25,
+1,199,913,16,0,
+628,1,459,914,16,
+0,628,1,462,915,
+16,0,628,1,217,
+916,16,0,628,1,
+2227,917,17,918,15,
+872,1,-1,1,5,
+919,20,920,4,32,
+87,0,104,0,105,
+0,108,0,101,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+50,0,1,194,1,
+3,1,6,1,5,
+921,22,1,52,1,
+1225,922,16,0,628,
+1,1479,923,16,0,
+628,1,1731,924,16,
+0,628,1,1989,925,
+17,926,15,730,1,
+-1,1,5,927,20,
+928,4,26,73,0,
+102,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+189,1,3,1,6,
+1,5,929,22,1,
+47,1,1990,930,16,
+0,628,1,236,931,
+16,0,628,1,2670,
+932,16,0,628,1,
+1756,933,16,0,628,
+1,4,934,19,193,
+1,4,935,5,100,
+1,256,936,16,0,
+548,1,1261,937,16,
+0,548,1,509,938,
+16,0,548,1,1515,
+939,16,0,548,1,
+2021,728,1,1775,940,
+16,0,548,1,2029,
+735,1,2030,741,1,
+2031,746,1,2032,751,
+1,2033,756,1,277,
+941,16,0,548,1,
+2035,762,1,2037,767,
+1,2039,772,1,32,
+942,16,0,548,1,
+2041,778,1,2293,943,
+16,0,548,1,2043,
+784,1,2045,789,1,
+40,944,16,0,195,
+1,41,945,16,0,
+548,1,1297,946,16,
+0,548,1,43,947,
+16,0,548,1,44,
+948,16,0,195,1,
+1803,797,1,1804,949,
+16,0,548,1,299,
+950,16,0,548,1,
+47,951,16,0,191,
+1,52,952,16,0,
+548,1,2318,953,16,
+0,548,1,63,954,
+16,0,211,1,66,
+955,16,0,209,1,
+2075,956,16,0,548,
+1,1574,809,1,71,
+957,16,0,548,1,
+76,958,16,0,548,
+1,1834,959,16,0,
+548,1,2337,960,16,
+0,548,1,79,961,
+16,0,548,1,1335,
+962,16,0,548,1,
+322,963,16,0,548,
+1,85,964,16,0,
+548,1,89,965,16,
+0,548,1,346,966,
+16,0,548,1,97,
+967,16,0,548,1,
+2106,968,16,0,548,
+1,102,969,16,0,
+548,1,1860,831,1,
+2364,837,1,1114,970,
+16,0,191,1,112,
+971,16,0,548,1,
+1117,972,16,0,548,
+1,1873,845,1,1876,
+973,16,0,548,1,
+124,974,16,0,548,
+1,2136,852,1,381,
+975,16,0,548,1,
+525,976,16,0,548,
+1,137,977,16,0,
+548,1,1901,978,16,
+0,548,1,1153,979,
+16,0,548,1,151,
+980,16,0,548,1,
+1407,981,16,0,548,
+1,1659,982,16,0,
+548,1,2413,983,16,
+0,548,1,406,984,
+16,0,548,1,1371,
+985,16,0,548,1,
+2105,824,1,166,986,
+16,0,548,1,1622,
+987,16,0,548,1,
+1931,870,1,1933,988,
+16,0,548,1,431,
+989,16,0,548,1,
+1585,990,16,0,548,
+1,182,991,16,0,
+548,1,1189,992,16,
+0,548,1,1443,993,
+16,0,548,1,1695,
+994,16,0,548,1,
+2198,995,16,0,548,
+1,447,996,16,0,
+548,1,2458,885,1,
+2459,891,1,1958,997,
+16,0,548,1,2462,
+898,1,1657,903,1,
+2464,908,1,199,998,
+16,0,548,1,459,
+999,16,0,548,1,
+462,1000,16,0,548,
+1,217,1001,16,0,
+548,1,2227,917,1,
+1225,1002,16,0,548,
+1,1479,1003,16,0,
+548,1,1731,1004,16,
+0,548,1,1989,925,
+1,1990,1005,16,0,
+548,1,236,1006,16,
+0,548,1,2670,1007,
+16,0,548,1,1756,
+1008,16,0,548,1,
+5,1009,19,190,1,
+5,1010,5,100,1,
+256,1011,16,0,544,
+1,1261,1012,16,0,
+544,1,509,1013,16,
+0,544,1,1515,1014,
+16,0,544,1,2021,
+728,1,1775,1015,16,
+0,544,1,2029,735,
+1,2030,741,1,2031,
+746,1,2032,751,1,
+2033,756,1,277,1016,
+16,0,544,1,2035,
+762,1,2037,767,1,
+2039,772,1,32,1017,
+16,0,544,1,2041,
+778,1,2293,1018,16,
+0,544,1,2043,784,
+1,2045,789,1,40,
+1019,16,0,194,1,
+41,1020,16,0,544,
+1,1297,1021,16,0,
+544,1,43,1022,16,
+0,544,1,44,1023,
+16,0,194,1,1803,
+797,1,1804,1024,16,
+0,544,1,299,1025,
+16,0,544,1,47,
+1026,16,0,188,1,
+52,1027,16,0,544,
+1,2318,1028,16,0,
+544,1,63,1029,16,
+0,210,1,66,1030,
+16,0,208,1,2075,
+1031,16,0,544,1,
+1574,809,1,71,1032,
+16,0,544,1,76,
+1033,16,0,544,1,
+1834,1034,16,0,544,
+1,2337,1035,16,0,
+544,1,79,1036,16,
+0,544,1,1335,1037,
+16,0,544,1,322,
+1038,16,0,544,1,
+85,1039,16,0,544,
+1,89,1040,16,0,
+544,1,346,1041,16,
+0,544,1,97,1042,
+16,0,544,1,2106,
+1043,16,0,544,1,
+102,1044,16,0,544,
+1,1860,831,1,2364,
+837,1,1114,1045,16,
+0,188,1,112,1046,
+16,0,544,1,1117,
+1047,16,0,544,1,
+1873,845,1,1876,1048,
+16,0,544,1,124,
+1049,16,0,544,1,
+2136,852,1,381,1050,
+16,0,544,1,525,
+1051,16,0,544,1,
+137,1052,16,0,544,
+1,1901,1053,16,0,
+544,1,1153,1054,16,
+0,544,1,151,1055,
+16,0,544,1,1407,
+1056,16,0,544,1,
+1659,1057,16,0,544,
+1,2413,1058,16,0,
+544,1,406,1059,16,
+0,544,1,1371,1060,
+16,0,544,1,2105,
+824,1,166,1061,16,
+0,544,1,1622,1062,
+16,0,544,1,1931,
+870,1,1933,1063,16,
+0,544,1,431,1064,
+16,0,544,1,1585,
+1065,16,0,544,1,
+182,1066,16,0,544,
+1,1189,1067,16,0,
+544,1,1443,1068,16,
+0,544,1,1695,1069,
+16,0,544,1,2198,
+1070,16,0,544,1,
+447,1071,16,0,544,
+1,2458,885,1,2459,
+891,1,1958,1072,16,
+0,544,1,2462,898,
+1,1657,903,1,2464,
+908,1,199,1073,16,
+0,544,1,459,1074,
+16,0,544,1,462,
+1075,16,0,544,1,
+217,1076,16,0,544,
+1,2227,917,1,1225,
+1077,16,0,544,1,
+1479,1078,16,0,544,
+1,1731,1079,16,0,
+544,1,1989,925,1,
+1990,1080,16,0,544,
+1,236,1081,16,0,
+544,1,2670,1082,16,
+0,544,1,1756,1083,
+16,0,544,1,6,
+1084,19,286,1,6,
+1085,5,2,1,1114,
+1086,16,0,284,1,
+40,1087,16,0,533,
+1,7,1088,19,253,
+1,7,1089,5,2,
+1,1114,1090,16,0,
+251,1,40,1091,16,
+0,473,1,8,1092,
+19,217,1,8,1093,
+5,2,1,1114,1094,
+16,0,215,1,40,
+1095,16,0,450,1,
+9,1096,19,223,1,
+9,1097,5,2,1,
+1114,1098,16,0,221,
+1,40,1099,16,0,
+392,1,10,1100,19,
+173,1,10,1101,5,
+2,1,1114,1102,16,
+0,171,1,40,1103,
+16,0,332,1,11,
+1104,19,202,1,11,
+1105,5,146,1,1260,
+1106,17,1107,15,1108,
 4,34,37,0,83,
 0,105,0,109,0,
 112,0,108,0,101,
@@ -4085,7 +4146,7 @@ public yyLSLSyntax
 0,110,0,109,0,
 101,0,110,0,116,
 0,1,-1,1,5,
-1099,20,1100,4,38,
+1109,20,1110,4,38,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
@@ -4093,11 +4154,11 @@ public yyLSLSyntax
 103,0,110,0,109,
 0,101,0,110,0,
 116,0,95,0,50,
-0,49,0,1,220,
+0,49,0,1,225,
 1,3,1,6,1,
-5,1101,22,1,80,
-1,1011,1102,17,1103,
-15,1104,4,44,37,
+5,1111,22,1,83,
+1,1011,1112,17,1113,
+15,1114,4,44,37,
 0,80,0,97,0,
 114,0,101,0,110,
 0,116,0,104,0,
@@ -4107,7 +4168,7 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,1,-1,
-1,5,1105,20,1106,
+1,5,1115,20,1116,
 4,46,80,0,97,
 0,114,0,101,0,
 110,0,116,0,104,
@@ -4117,12 +4178,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,50,0,1,267,
+0,50,0,1,272,
 1,3,1,4,1,
-3,1107,22,1,127,
-1,1514,1108,17,1109,
-15,1098,1,-1,1,
-5,1110,20,1111,4,
+3,1117,22,1,130,
+1,1514,1118,17,1119,
+15,1108,1,-1,1,
+5,1120,20,1121,4,
 38,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
@@ -4131,26 +4192,26 @@ public yyLSLSyntax
 109,0,101,0,110,
 0,116,0,95,0,
 49,0,52,0,1,
-213,1,3,1,4,
-1,3,1112,22,1,
-73,1,9,1113,17,
-1114,15,1115,4,24,
+218,1,3,1,4,
+1,3,1122,22,1,
+76,1,9,1123,17,
+1124,15,1125,4,24,
 37,0,68,0,101,
 0,99,0,108,0,
 97,0,114,0,97,
 0,116,0,105,0,
 111,0,110,0,1,
--1,1,5,1116,20,
-1117,4,26,68,0,
+-1,1,5,1126,20,
+1127,4,26,68,0,
 101,0,99,0,108,
 0,97,0,114,0,
 97,0,116,0,105,
 0,111,0,110,0,
 95,0,49,0,1,
-161,1,3,1,3,
-1,2,1118,22,1,
-21,1,262,1119,17,
-1120,15,1121,4,34,
+166,1,3,1,3,
+1,2,1128,22,1,
+24,1,262,1129,17,
+1130,15,1131,4,34,
 37,0,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
@@ -4158,8 +4219,8 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,1,
--1,1,5,1122,20,
-1123,4,36,66,0,
+-1,1,5,1132,20,
+1133,4,36,66,0,
 105,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
@@ -4167,11 +4228,11 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,53,0,1,
-249,1,3,1,4,
-1,3,1124,22,1,
-109,1,1267,1125,17,
-1126,15,1098,1,-1,
-1,5,1127,20,1128,
+254,1,3,1,4,
+1,3,1134,22,1,
+112,1,1267,1135,17,
+1136,15,1108,1,-1,
+1,5,1137,20,1138,
 4,36,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -4179,13 +4240,13 @@ public yyLSLSyntax
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,56,0,1,207,
+0,56,0,1,212,
 1,3,1,6,1,
-5,1129,22,1,67,
-1,2021,718,1,1521,
-1130,17,1131,15,1098,
-1,-1,1,5,1132,
-20,1133,4,36,83,
+5,1139,22,1,70,
+1,2021,728,1,1521,
+1140,17,1141,15,1108,
+1,-1,1,5,1142,
+20,1143,4,36,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
@@ -4193,26 +4254,26 @@ public yyLSLSyntax
 0,110,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-1,200,1,3,1,
-4,1,3,1134,22,
-1,60,1,2024,1135,
-17,1136,15,1137,4,
+1,205,1,3,1,
+4,1,3,1144,22,
+1,63,1,2024,1145,
+17,1146,15,1147,4,
 24,37,0,83,0,
 116,0,97,0,116,
 0,101,0,67,0,
 104,0,97,0,110,
 0,103,0,101,0,
-1,-1,1,5,1138,
-20,1139,4,26,83,
+1,-1,1,5,1148,
+20,1149,4,26,83,
 0,116,0,97,0,
 116,0,101,0,67,
 0,104,0,97,0,
 110,0,103,0,101,
 0,95,0,49,0,
-1,182,1,3,1,
-3,1,2,1140,22,
-1,42,1,1775,1141,
-17,1142,15,1143,4,
+1,187,1,3,1,
+3,1,2,1150,22,
+1,45,1,1775,1151,
+17,1152,15,1153,4,
 30,37,0,69,0,
 109,0,112,0,116,
 0,121,0,83,0,
@@ -4220,34 +4281,34 @@ public yyLSLSyntax
 0,101,0,109,0,
 101,0,110,0,116,
 0,1,-1,1,5,
-1144,20,1145,4,32,
+1154,20,1155,4,32,
 69,0,109,0,112,
 0,116,0,121,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,1,166,1,
+49,0,1,171,1,
 3,1,1,1,0,
-1146,22,1,26,1,
-19,1147,17,1114,1,
-2,1118,1,2028,1148,
-17,1149,15,1150,4,
+1156,22,1,29,1,
+19,1157,17,1124,1,
+2,1128,1,2028,1158,
+17,1159,15,1160,4,
 20,37,0,74,0,
 117,0,109,0,112,
 0,76,0,97,0,
 98,0,101,0,108,
 0,1,-1,1,5,
-1151,20,1152,4,22,
+1161,20,1162,4,22,
 74,0,117,0,109,
 0,112,0,76,0,
 97,0,98,0,101,
 0,108,0,95,0,
-49,0,1,180,1,
+49,0,1,185,1,
 3,1,3,1,2,
-1153,22,1,40,1,
-2029,725,1,2281,1154,
-17,1155,15,1156,4,
+1163,22,1,43,1,
+2029,735,1,2281,1164,
+17,1165,15,1166,4,
 34,37,0,70,0,
 111,0,114,0,76,
 0,111,0,111,0,
@@ -4255,8 +4316,8 @@ public yyLSLSyntax
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,-1,1,5,1157,
-20,1158,4,36,70,
+1,-1,1,5,1167,
+20,1168,4,36,70,
 0,111,0,114,0,
 76,0,111,0,111,
 0,112,0,83,0,
@@ -4264,26 +4325,26 @@ public yyLSLSyntax
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,50,0,
-1,195,1,3,1,
-2,1,1,1159,22,
-1,55,1,2031,736,
-1,2032,741,1,2033,
-746,1,2034,1160,16,
-0,572,1,2035,752,
-1,2036,1161,16,0,
-524,1,2037,757,1,
-2038,1162,16,0,528,
-1,2039,762,1,32,
-1163,17,1142,1,0,
-1146,1,2041,768,1,
-2042,1164,16,0,646,
-1,2043,774,1,2044,
-1165,16,0,584,1,
-2045,779,1,2299,1166,
-16,0,226,1,1296,
-1167,17,1168,15,1098,
-1,-1,1,5,1169,
-20,1170,4,38,83,
+1,200,1,3,1,
+2,1,1,1169,22,
+1,58,1,2031,746,
+1,2032,751,1,2033,
+756,1,2034,1170,16,
+0,587,1,2035,762,
+1,2036,1171,16,0,
+534,1,2037,767,1,
+2038,1172,16,0,538,
+1,2039,772,1,32,
+1173,17,1152,1,0,
+1156,1,2041,778,1,
+2042,1174,16,0,655,
+1,2043,784,1,2044,
+1175,16,0,599,1,
+2045,789,1,2299,1176,
+16,0,236,1,1296,
+1177,17,1178,15,1108,
+1,-1,1,5,1179,
+20,1180,4,38,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
@@ -4291,12 +4352,12 @@ public yyLSLSyntax
 0,110,0,109,0,
 101,0,110,0,116,
 0,95,0,50,0,
-48,0,1,219,1,
+48,0,1,224,1,
 3,1,6,1,5,
-1171,22,1,79,1,
-283,1172,17,1173,15,
-1121,1,-1,1,5,
-1174,20,1175,4,36,
+1181,22,1,82,1,
+283,1182,17,1183,15,
+1131,1,-1,1,5,
+1184,20,1185,4,36,
 66,0,105,0,110,
 0,97,0,114,0,
 121,0,69,0,120,
@@ -4304,10 +4365,10 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,52,
-0,1,248,1,3,
-1,4,1,3,1176,
-22,1,108,1,40,
-1177,17,1178,15,1179,
+0,1,253,1,3,
+1,4,1,3,1186,
+22,1,111,1,40,
+1187,17,1188,15,1189,
 4,32,37,0,73,
 0,100,0,101,0,
 110,0,116,0,69,
@@ -4315,21 +4376,21 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,1,
--1,1,5,1180,20,
-1181,4,34,73,0,
+-1,1,5,1190,20,
+1191,4,34,73,0,
 100,0,101,0,110,
 0,116,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,1,234,1,
+49,0,1,239,1,
 3,1,2,1,1,
-1182,22,1,94,1,
-44,1183,17,1178,1,
-1,1182,1,1803,787,
-1,47,1184,17,1185,
-15,1186,4,38,37,
+1192,22,1,97,1,
+44,1193,17,1188,1,
+1,1192,1,1803,797,
+1,47,1194,17,1195,
+15,1196,4,38,37,
 0,73,0,100,0,
 101,0,110,0,116,
 0,68,0,111,0,
@@ -4338,7 +4399,7 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,1,-1,1,
-5,1187,20,1188,4,
+5,1197,20,1198,4,
 40,73,0,100,0,
 101,0,110,0,116,
 0,68,0,111,0,
@@ -4347,10 +4408,10 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,49,
-0,1,235,1,3,
-1,4,1,3,1189,
-22,1,95,1,48,
-1190,17,1191,15,1192,
+0,1,240,1,3,
+1,4,1,3,1199,
+22,1,98,1,48,
+1200,17,1201,15,1202,
 4,58,37,0,73,
 0,110,0,99,0,
 114,0,101,0,109,
@@ -4363,8 +4424,8 @@ public yyLSLSyntax
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-1,-1,1,5,1193,
-20,1194,4,60,73,
+1,-1,1,5,1203,
+20,1204,4,60,73,
 0,110,0,99,0,
 114,0,101,0,109,
 0,101,0,110,0,
@@ -4377,11 +4438,11 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,52,0,1,
-239,1,3,1,5,
-1,4,1195,22,1,
-99,1,49,1196,17,
-1197,15,1192,1,-1,
-1,5,1198,20,1199,
+244,1,3,1,5,
+1,4,1205,22,1,
+102,1,49,1206,17,
+1207,15,1202,1,-1,
+1,5,1208,20,1209,
 4,60,73,0,110,
 0,99,0,114,0,
 101,0,109,0,101,
@@ -4394,12 +4455,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-51,0,1,238,1,
+51,0,1,243,1,
 3,1,5,1,4,
-1200,22,1,98,1,
-50,1201,17,1202,15,
-1192,1,-1,1,5,
-1203,20,1204,4,60,
+1210,22,1,101,1,
+50,1211,17,1212,15,
+1202,1,-1,1,5,
+1213,20,1214,4,60,
 73,0,110,0,99,
 0,114,0,101,0,
 109,0,101,0,110,
@@ -4412,12 +4473,12 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,50,0,
-1,237,1,3,1,
-3,1,2,1205,22,
-1,97,1,51,1206,
-17,1207,15,1192,1,
--1,1,5,1208,20,
-1209,4,60,73,0,
+1,242,1,3,1,
+3,1,2,1215,22,
+1,100,1,51,1216,
+17,1217,15,1202,1,
+-1,1,5,1218,20,
+1219,4,60,73,0,
 110,0,99,0,114,
 0,101,0,109,0,
 101,0,110,0,116,
@@ -4429,12 +4490,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,49,0,1,236,
+0,49,0,1,241,
 1,3,1,3,1,
-2,1210,22,1,96,
-1,305,1211,17,1212,
-15,1121,1,-1,1,
-5,1213,20,1214,4,
+2,1220,22,1,99,
+1,305,1221,17,1222,
+15,1131,1,-1,1,
+5,1223,20,1224,4,
 36,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
@@ -4442,11 +4503,11 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-51,0,1,247,1,
+51,0,1,252,1,
 3,1,4,1,3,
-1215,22,1,107,1,
-525,1216,17,1217,15,
-1218,4,34,37,0,
+1225,22,1,110,1,
+525,1226,17,1227,15,
+1228,4,34,37,0,
 82,0,111,0,116,
 0,97,0,116,0,
 105,0,111,0,110,
@@ -4454,7 +4515,7 @@ public yyLSLSyntax
 110,0,115,0,116,
 0,97,0,110,0,
 116,0,1,-1,1,
-5,1219,20,1220,4,
+5,1229,20,1230,4,
 36,82,0,111,0,
 116,0,97,0,116,
 0,105,0,111,0,
@@ -4462,11 +4523,11 @@ public yyLSLSyntax
 0,110,0,115,0,
 116,0,97,0,110,
 0,116,0,95,0,
-49,0,1,232,1,
+49,0,1,237,1,
 3,1,10,1,9,
-1221,22,1,92,1,
-63,1222,17,1223,15,
-1224,4,38,37,0,
+1231,22,1,95,1,
+63,1232,17,1233,15,
+1234,4,38,37,0,
 84,0,121,0,112,
 0,101,0,99,0,
 97,0,115,0,116,
@@ -4475,7 +4536,7 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,1,-1,1,5,
-1225,20,1226,4,40,
+1235,20,1236,4,40,
 84,0,121,0,112,
 0,101,0,99,0,
 97,0,115,0,116,
@@ -4484,12 +4545,12 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,50,0,
-1,269,1,3,1,
-5,1,4,1227,22,
-1,129,1,66,1228,
-17,1229,15,1224,1,
--1,1,5,1230,20,
-1231,4,40,84,0,
+1,274,1,3,1,
+5,1,4,1237,22,
+1,132,1,66,1238,
+17,1239,15,1234,1,
+-1,1,5,1240,20,
+1241,4,40,84,0,
 121,0,112,0,101,
 0,99,0,97,0,
 115,0,116,0,69,
@@ -4497,12 +4558,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,51,0,1,270,
+0,51,0,1,275,
 1,3,1,7,1,
-6,1232,22,1,130,
-1,67,1233,17,1234,
-15,1224,1,-1,1,
-5,1235,20,1236,4,
+6,1242,22,1,133,
+1,67,1243,17,1244,
+15,1234,1,-1,1,
+5,1245,20,1246,4,
 40,84,0,121,0,
 112,0,101,0,99,
 0,97,0,115,0,
@@ -4511,12 +4572,12 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,55,
-0,1,274,1,3,
-1,8,1,7,1237,
-22,1,134,1,68,
-1238,17,1239,15,1224,
-1,-1,1,5,1240,
-20,1241,4,40,84,
+0,1,279,1,3,
+1,8,1,7,1247,
+22,1,137,1,68,
+1248,17,1249,15,1234,
+1,-1,1,5,1250,
+20,1251,4,40,84,
 0,121,0,112,0,
 101,0,99,0,97,
 0,115,0,116,0,
@@ -4525,11 +4586,11 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,53,0,1,
-272,1,3,1,8,
-1,7,1242,22,1,
-132,1,69,1243,17,
-1244,15,1224,1,-1,
-1,5,1245,20,1246,
+277,1,3,1,8,
+1,7,1252,22,1,
+135,1,69,1253,17,
+1254,15,1234,1,-1,
+1,5,1255,20,1256,
 4,40,84,0,121,
 0,112,0,101,0,
 99,0,97,0,115,
@@ -4538,12 +4599,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-54,0,1,273,1,
+54,0,1,278,1,
 3,1,6,1,5,
-1247,22,1,133,1,
-70,1248,17,1249,15,
-1224,1,-1,1,5,
-1250,20,1251,4,40,
+1257,22,1,136,1,
+70,1258,17,1259,15,
+1234,1,-1,1,5,
+1260,20,1261,4,40,
 84,0,121,0,112,
 0,101,0,99,0,
 97,0,115,0,116,
@@ -4552,12 +4613,12 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,52,0,
-1,271,1,3,1,
-6,1,5,1252,22,
-1,131,1,74,1253,
-17,1254,15,1224,1,
--1,1,5,1255,20,
-1256,4,40,84,0,
+1,276,1,3,1,
+6,1,5,1262,22,
+1,134,1,74,1263,
+17,1264,15,1234,1,
+-1,1,5,1265,20,
+1266,4,40,84,0,
 121,0,112,0,101,
 0,99,0,97,0,
 115,0,116,0,69,
@@ -4565,12 +4626,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,57,0,1,276,
+0,57,0,1,281,
 1,3,1,7,1,
-6,1257,22,1,136,
-1,1013,1258,17,1259,
-15,1104,1,-1,1,
-5,1260,20,1261,4,
+6,1267,22,1,139,
+1,1013,1268,17,1269,
+15,1114,1,-1,1,
+5,1270,20,1271,4,
 46,80,0,97,0,
 114,0,101,0,110,
 0,116,0,104,0,
@@ -4580,12 +4641,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,1,266,1,
+49,0,1,271,1,
 3,1,4,1,3,
-1262,22,1,126,1,
-1332,1263,17,1264,15,
-1098,1,-1,1,5,
-1265,20,1266,4,38,
+1272,22,1,129,1,
+1332,1273,17,1274,15,
+1108,1,-1,1,5,
+1275,20,1276,4,38,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
@@ -4593,12 +4654,12 @@ public yyLSLSyntax
 103,0,110,0,109,
 0,101,0,110,0,
 116,0,95,0,49,
-0,57,0,1,218,
+0,57,0,1,223,
 1,3,1,6,1,
-5,1267,22,1,78,
-1,2337,1268,17,1142,
-1,0,1146,1,1585,
-1269,17,1270,15,1271,
+5,1277,22,1,81,
+1,2337,1278,17,1152,
+1,0,1156,1,1585,
+1279,17,1280,15,1281,
 4,32,37,0,82,
 0,101,0,116,0,
 117,0,114,0,110,
@@ -4606,30 +4667,30 @@ public yyLSLSyntax
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,1,
--1,1,5,1272,20,
-1273,4,34,82,0,
+-1,1,5,1282,20,
+1283,4,34,82,0,
 101,0,116,0,117,
 0,114,0,110,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-50,0,1,225,1,
+50,0,1,230,1,
 3,1,2,1,1,
-1274,22,1,85,1,
-2023,1275,17,1276,15,
-1137,1,-1,1,5,
-1277,20,1278,4,26,
+1284,22,1,88,1,
+2023,1285,17,1286,15,
+1147,1,-1,1,5,
+1287,20,1288,4,26,
 83,0,116,0,97,
 0,116,0,101,0,
 67,0,104,0,97,
 0,110,0,103,0,
 101,0,95,0,50,
-0,1,183,1,3,
-1,3,1,2,1279,
-22,1,43,1,2136,
-842,1,82,1280,17,
-1281,15,1282,4,32,
+0,1,188,1,3,
+1,3,1,2,1289,
+22,1,46,1,2136,
+852,1,82,1290,17,
+1291,15,1292,4,32,
 37,0,85,0,110,
 0,97,0,114,0,
 121,0,69,0,120,
@@ -4637,7 +4698,7 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,1,-1,1,
-5,1283,20,1284,4,
+5,1293,20,1294,4,
 34,85,0,110,0,
 97,0,114,0,121,
 0,69,0,120,0,
@@ -4645,29 +4706,29 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,51,0,
-1,265,1,3,1,
-3,1,2,1285,22,
-1,125,1,2026,1286,
-17,1287,15,1288,4,
+1,270,1,3,1,
+3,1,2,1295,22,
+1,128,1,2026,1296,
+17,1297,15,1298,4,
 28,37,0,74,0,
 117,0,109,0,112,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,1,
--1,1,5,1289,20,
-1290,4,30,74,0,
+-1,1,5,1299,20,
+1300,4,30,74,0,
 117,0,109,0,112,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,1,181,
+0,49,0,1,186,
 1,3,1,3,1,
-2,1291,22,1,41,
-1,1591,1292,17,1293,
-15,1271,1,-1,1,
-5,1294,20,1295,4,
+2,1301,22,1,44,
+1,1591,1302,17,1303,
+15,1281,1,-1,1,
+5,1304,20,1305,4,
 34,82,0,101,0,
 116,0,117,0,114,
 0,110,0,83,0,
@@ -4675,12 +4736,12 @@ public yyLSLSyntax
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-1,224,1,3,1,
-3,1,2,1296,22,
-1,84,1,1341,1297,
-17,1298,15,1098,1,
--1,1,5,1299,20,
-1300,4,36,83,0,
+1,229,1,3,1,
+3,1,2,1306,22,
+1,87,1,1341,1307,
+17,1308,15,1108,1,
+-1,1,5,1309,20,
+1310,4,36,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
@@ -4688,12 +4749,12 @@ public yyLSLSyntax
 110,0,109,0,101,
 0,110,0,116,0,
 95,0,54,0,1,
-205,1,3,1,4,
-1,3,1301,22,1,
-65,1,2030,731,1,
-328,1302,17,1303,15,
-1121,1,-1,1,5,
-1304,20,1305,4,36,
+210,1,3,1,4,
+1,3,1311,22,1,
+68,1,2030,741,1,
+328,1312,17,1313,15,
+1131,1,-1,1,5,
+1314,20,1315,4,36,
 66,0,105,0,110,
 0,97,0,114,0,
 121,0,69,0,120,
@@ -4701,12 +4762,12 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,50,
-0,1,246,1,3,
-1,4,1,3,1306,
-22,1,106,1,1303,
-1307,17,1308,15,1098,
-1,-1,1,5,1309,
-20,1310,4,36,83,
+0,1,251,1,3,
+1,4,1,3,1316,
+22,1,109,1,1303,
+1317,17,1318,15,1108,
+1,-1,1,5,1319,
+20,1320,4,36,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
@@ -4714,28 +4775,28 @@ public yyLSLSyntax
 0,110,0,109,0,
 101,0,110,0,116,
 0,95,0,55,0,
-1,206,1,3,1,
-6,1,5,1311,22,
-1,66,1,1096,1312,
-17,1313,15,1314,4,
+1,211,1,3,1,
+6,1,5,1321,22,
+1,69,1,1096,1322,
+17,1323,15,1324,4,
 26,37,0,70,0,
 117,0,110,0,99,
 0,116,0,105,0,
 111,0,110,0,67,
 0,97,0,108,0,
 108,0,1,-1,1,
-5,1315,20,1316,4,
+5,1325,20,1326,4,
 28,70,0,117,0,
 110,0,99,0,116,
 0,105,0,111,0,
 110,0,67,0,97,
 0,108,0,108,0,
 95,0,49,0,1,
-277,1,3,1,5,
-1,4,1317,22,1,
-137,1,93,1318,17,
-1319,15,1282,1,-1,
-1,5,1320,20,1321,
+282,1,3,1,5,
+1,4,1327,22,1,
+140,1,93,1328,17,
+1329,15,1292,1,-1,
+1,5,1330,20,1331,
 4,34,85,0,110,
 0,97,0,114,0,
 121,0,69,0,120,
@@ -4743,12 +4804,12 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,50,
-0,1,264,1,3,
-1,3,1,2,1322,
-22,1,124,1,1550,
-1323,17,1324,15,1098,
-1,-1,1,5,1325,
-20,1326,4,38,83,
+0,1,269,1,3,
+1,3,1,2,1332,
+22,1,127,1,1550,
+1333,17,1334,15,1108,
+1,-1,1,5,1335,
+20,1336,4,38,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
@@ -4756,16 +4817,16 @@ public yyLSLSyntax
 0,110,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-51,0,1,212,1,
+51,0,1,217,1,
 3,1,4,1,3,
-1327,22,1,72,1,
-2040,1328,16,0,532,
-1,2106,1329,17,1142,
-1,0,1146,1,1555,
-1330,16,0,599,1,
-827,1331,17,1332,15,
-1121,1,-1,1,5,
-1333,20,1334,4,38,
+1337,22,1,75,1,
+2040,1338,16,0,542,
+1,2106,1339,17,1152,
+1,0,1156,1,1555,
+1340,16,0,615,1,
+827,1341,17,1342,15,
+1131,1,-1,1,5,
+1343,20,1344,4,38,
 66,0,105,0,110,
 0,97,0,114,0,
 121,0,69,0,120,
@@ -4773,30 +4834,30 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,49,
-0,53,0,1,259,
+0,53,0,1,264,
 1,3,1,4,1,
-3,1335,22,1,119,
-1,1859,1336,16,0,
-304,1,1860,821,1,
-1804,1337,17,1142,1,
-0,1146,1,107,1338,
-17,1339,15,1282,1,
--1,1,5,1340,20,
-1341,4,34,85,0,
+3,1345,22,1,122,
+1,1859,1346,16,0,
+313,1,1860,831,1,
+1804,1347,17,1152,1,
+0,1156,1,107,1348,
+17,1349,15,1292,1,
+-1,1,5,1350,20,
+1351,4,34,85,0,
 110,0,97,0,114,
 0,121,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,1,263,1,
+49,0,1,268,1,
 3,1,3,1,2,
-1342,22,1,123,1,
-1114,1343,17,1185,1,
-3,1189,1,1048,1344,
-17,1345,15,1121,1,
--1,1,5,1346,20,
-1347,4,38,66,0,
+1352,22,1,126,1,
+1114,1353,17,1195,1,
+3,1199,1,1048,1354,
+17,1355,15,1131,1,
+-1,1,5,1356,20,
+1357,4,38,66,0,
 105,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
@@ -4804,12 +4865,12 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,49,0,56,
-0,1,262,1,3,
-1,4,1,3,1348,
-22,1,122,1,352,
-1349,17,1350,15,1121,
-1,-1,1,5,1351,
-20,1352,4,36,66,
+0,1,267,1,3,
+1,4,1,3,1358,
+22,1,125,1,352,
+1359,17,1360,15,1131,
+1,-1,1,5,1361,
+20,1362,4,36,66,
 0,105,0,110,0,
 97,0,114,0,121,
 0,69,0,120,0,
@@ -4817,13 +4878,13 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,49,0,
-1,245,1,3,1,
-4,1,3,1353,22,
-1,105,1,1872,1354,
-16,0,314,1,1873,
-835,1,118,1355,17,
-1356,15,1121,1,-1,
-1,5,1357,20,1358,
+1,250,1,3,1,
+4,1,3,1363,22,
+1,108,1,1872,1364,
+16,0,323,1,1873,
+845,1,118,1365,17,
+1366,15,1131,1,-1,
+1,5,1367,20,1368,
 4,38,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
@@ -4832,12 +4893,12 @@ public yyLSLSyntax
 0,115,0,105,0,
 111,0,110,0,95,
 0,49,0,52,0,
-1,258,1,3,1,
-4,1,3,1359,22,
-1,118,1,1123,1360,
-17,1361,15,1098,1,
--1,1,5,1362,20,
-1363,4,38,83,0,
+1,263,1,3,1,
+4,1,3,1369,22,
+1,121,1,1123,1370,
+17,1371,15,1108,1,
+-1,1,5,1372,20,
+1373,4,38,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
@@ -4845,10 +4906,10 @@ public yyLSLSyntax
 110,0,109,0,101,
 0,110,0,116,0,
 95,0,49,0,50,
-0,1,211,1,3,
-1,6,1,5,1364,
-22,1,71,1,371,
-1365,17,1366,15,1367,
+0,1,216,1,3,
+1,6,1,5,1374,
+22,1,74,1,371,
+1375,17,1376,15,1377,
 4,46,37,0,70,
 0,117,0,110,0,
 99,0,116,0,105,
@@ -4859,7 +4920,7 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,1,-1,
-1,5,1368,20,1369,
+1,5,1378,20,1379,
 4,48,70,0,117,
 0,110,0,99,0,
 116,0,105,0,111,
@@ -4870,12 +4931,12 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,49,0,
-1,244,1,3,1,
-2,1,1,1370,22,
-1,104,1,1377,1371,
-17,1372,15,1098,1,
--1,1,5,1373,20,
-1374,4,36,83,0,
+1,249,1,3,1,
+2,1,1,1380,22,
+1,107,1,1377,1381,
+17,1382,15,1108,1,
+-1,1,5,1383,20,
+1384,4,36,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
@@ -4883,11 +4944,11 @@ public yyLSLSyntax
 110,0,109,0,101,
 0,110,0,116,0,
 95,0,53,0,1,
-204,1,3,1,4,
-1,3,1375,22,1,
-64,1,375,1376,17,
-1377,15,1192,1,-1,
-1,5,1378,20,1379,
+209,1,3,1,4,
+1,3,1385,22,1,
+67,1,375,1386,17,
+1387,15,1202,1,-1,
+1,5,1388,20,1389,
 4,60,73,0,110,
 0,99,0,114,0,
 101,0,109,0,101,
@@ -4900,12 +4961,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-56,0,1,243,1,
+56,0,1,248,1,
 3,1,5,1,4,
-1380,22,1,103,1,
-377,1381,17,1382,15,
-1192,1,-1,1,5,
-1383,20,1384,4,60,
+1390,22,1,106,1,
+377,1391,17,1392,15,
+1202,1,-1,1,5,
+1393,20,1394,4,60,
 73,0,110,0,99,
 0,114,0,101,0,
 109,0,101,0,110,
@@ -4918,12 +4979,12 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,53,0,
-1,240,1,3,1,
-3,1,2,1385,22,
-1,100,1,379,1386,
-17,1387,15,1192,1,
--1,1,5,1388,20,
-1389,4,60,73,0,
+1,245,1,3,1,
+3,1,2,1395,22,
+1,103,1,379,1396,
+17,1397,15,1202,1,
+-1,1,5,1398,20,
+1399,4,60,73,0,
 110,0,99,0,114,
 0,101,0,109,0,
 101,0,110,0,116,
@@ -4935,11 +4996,11 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,55,0,1,242,
+0,55,0,1,247,
 1,3,1,5,1,
-4,1390,22,1,102,
-1,380,1391,17,1392,
-15,1393,4,38,37,
+4,1400,22,1,105,
+1,380,1401,17,1402,
+15,1403,4,38,37,
 0,67,0,111,0,
 110,0,115,0,116,
 0,97,0,110,0,
@@ -4948,7 +5009,7 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,1,-1,1,
-5,1394,20,1395,4,
+5,1404,20,1405,4,
 40,67,0,111,0,
 110,0,115,0,116,
 0,97,0,110,0,
@@ -4957,12 +5018,12 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,49,
-0,1,233,1,3,
-1,2,1,1,1396,
-22,1,93,1,883,
-1397,17,1398,15,1121,
-1,-1,1,5,1399,
-20,1400,4,38,66,
+0,1,238,1,3,
+1,2,1,1,1406,
+22,1,96,1,883,
+1407,17,1408,15,1131,
+1,-1,1,5,1409,
+20,1410,4,38,66,
 0,105,0,110,0,
 97,0,114,0,121,
 0,69,0,120,0,
@@ -4970,29 +5031,29 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,49,0,
-54,0,1,260,1,
+54,0,1,265,1,
 3,1,4,1,3,
-1401,22,1,120,1,
-1628,1402,17,1403,15,
-1404,4,22,37,0,
+1411,22,1,123,1,
+1628,1412,17,1413,15,
+1414,4,22,37,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-1,-1,1,5,1405,
-20,1406,4,24,65,
+1,-1,1,5,1415,
+20,1416,4,24,65,
 0,115,0,115,0,
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,1,198,
+0,49,0,1,203,
 1,3,1,4,1,
-3,1407,22,1,58,
-1,2075,1408,17,1142,
-1,0,1146,1,373,
-1409,17,1410,15,1192,
-1,-1,1,5,1411,
-20,1412,4,60,73,
+3,1417,22,1,61,
+1,2075,1418,17,1152,
+1,0,1156,1,373,
+1419,17,1420,15,1202,
+1,-1,1,5,1421,
+20,1422,4,60,73,
 0,110,0,99,0,
 114,0,101,0,109,
 0,101,0,110,0,
@@ -5005,11 +5066,11 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,54,0,1,
-241,1,3,1,3,
-1,2,1413,22,1,
-101,1,130,1414,17,
-1415,15,1121,1,-1,
-1,5,1416,20,1417,
+246,1,3,1,3,
+1,2,1423,22,1,
+104,1,130,1424,17,
+1425,15,1131,1,-1,
+1,5,1426,20,1427,
 4,38,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
@@ -5018,12 +5079,12 @@ public yyLSLSyntax
 0,115,0,105,0,
 111,0,110,0,95,
 0,49,0,51,0,
-1,257,1,3,1,
-4,1,3,1418,22,
-1,117,1,143,1419,
-17,1420,15,1121,1,
--1,1,5,1421,20,
-1422,4,38,66,0,
+1,262,1,3,1,
+4,1,3,1428,22,
+1,120,1,143,1429,
+17,1430,15,1131,1,
+-1,1,5,1431,20,
+1432,4,38,66,0,
 105,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
@@ -5031,83 +5092,83 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,49,0,50,
-0,1,256,1,3,
-1,4,1,3,1423,
-22,1,116,1,1901,
-1424,17,1142,1,0,
-1146,1,2657,1425,16,
-0,608,1,1152,1426,
-17,1427,15,1098,1,
--1,1,5,1428,20,
-1429,4,38,83,0,
+0,1,261,1,3,
+1,4,1,3,1433,
+22,1,119,1,1901,
+1434,17,1152,1,0,
+1156,1,1152,1435,17,
+1436,15,1108,1,-1,
+1,5,1437,20,1438,
+4,38,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,50,0,52,0,
+1,228,1,3,1,
+6,1,5,1439,22,
+1,86,1,1406,1440,
+17,1441,15,1108,1,
+-1,1,5,1442,20,
+1443,4,38,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,50,0,52,
-0,1,223,1,3,
-1,6,1,5,1430,
-22,1,83,1,1406,
-1431,17,1432,15,1098,
-1,-1,1,5,1433,
-20,1434,4,38,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,49,0,
-55,0,1,216,1,
-3,1,4,1,3,
-1435,22,1,76,1,
-1659,1436,16,0,269,
-1,2413,1437,17,1142,
-1,0,1146,1,1159,
-1438,17,1439,15,1098,
-1,-1,1,5,1440,
-20,1441,4,38,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
+95,0,49,0,55,
+0,1,221,1,3,
+1,4,1,3,1444,
+22,1,79,1,1659,
+1445,16,0,278,1,
+2413,1446,17,1152,1,
+0,1156,1,1159,1447,
+17,1448,15,1108,1,
+-1,1,5,1449,20,
+1450,4,38,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,49,
+0,1,215,1,3,
+1,6,1,5,1451,
+22,1,73,1,157,
+1452,17,1453,15,1131,
+1,-1,1,5,1454,
+20,1455,4,38,66,
+0,105,0,110,0,
+97,0,114,0,121,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
 0,95,0,49,0,
-49,0,1,210,1,
-3,1,6,1,5,
-1442,22,1,70,1,
-157,1443,17,1444,15,
-1121,1,-1,1,5,
-1445,20,1446,4,38,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,49,0,1,255,
-1,3,1,4,1,
-3,1447,22,1,115,
-1,1413,1448,17,1449,
-15,1098,1,-1,1,
-5,1450,20,1451,4,
-36,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-52,0,1,203,1,
+49,0,1,260,1,
 3,1,4,1,3,
-1452,22,1,63,1,
-1370,1453,17,1454,15,
-1098,1,-1,1,5,
-1455,20,1456,4,38,
+1456,22,1,118,1,
+1413,1457,17,1458,15,
+1108,1,-1,1,5,
+1459,20,1460,4,36,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,52,
+0,1,208,1,3,
+1,4,1,3,1461,
+22,1,66,1,2669,
+1462,16,0,303,1,
+1478,1463,17,1464,15,
+1108,1,-1,1,5,
+1465,20,1466,4,38,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
@@ -5115,12 +5176,56 @@ public yyLSLSyntax
 103,0,110,0,109,
 0,101,0,110,0,
 116,0,95,0,49,
-0,56,0,1,217,
+0,53,0,1,219,
 1,3,1,4,1,
-3,1457,22,1,77,
-1,1478,1458,17,1459,
-15,1098,1,-1,1,
-5,1460,20,1461,4,
+3,1467,22,1,77,
+1,2676,1468,16,0,
+624,1,1621,1469,16,
+0,678,1,1574,809,
+1,172,1470,17,1471,
+15,1131,1,-1,1,
+5,1472,20,1473,4,
+38,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+49,0,48,0,1,
+259,1,3,1,4,
+1,3,1474,22,1,
+117,1,1931,870,1,
+1665,1475,17,1476,15,
+1166,1,-1,1,5,
+1477,20,1478,4,36,
+70,0,111,0,114,
+0,76,0,111,0,
+111,0,112,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,49,
+0,1,199,1,3,
+1,2,1,1,1479,
+22,1,57,1,2364,
+837,1,2105,824,1,
+1188,1480,17,1481,15,
+1108,1,-1,1,5,
+1482,20,1483,4,38,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,50,
+0,51,0,1,227,
+1,3,1,6,1,
+5,1484,22,1,85,
+1,1442,1485,17,1486,
+15,1108,1,-1,1,
+5,1487,20,1488,4,
 38,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
@@ -5128,52 +5233,28 @@ public yyLSLSyntax
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,53,0,1,
-214,1,3,1,4,
-1,3,1462,22,1,
-74,1,1620,1463,17,
-1464,15,1404,1,-1,
-1,5,1465,20,1466,
-4,24,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,50,
-0,1,199,1,3,
-1,2,1,1,1467,
-22,1,59,1,1621,
-1468,16,0,668,1,
-1574,799,1,172,1469,
-17,1470,15,1121,1,
--1,1,5,1471,20,
-1472,4,38,66,0,
+49,0,54,0,1,
+220,1,3,1,4,
+1,3,1489,22,1,
+78,1,1694,1490,16,
+0,200,1,942,1491,
+17,1492,15,1131,1,
+-1,1,5,1493,20,
+1494,4,38,66,0,
 105,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,49,0,48,
-0,1,254,1,3,
-1,4,1,3,1473,
-22,1,114,1,1931,
-861,1,1665,1474,17,
-1475,15,1156,1,-1,
-1,5,1476,20,1477,
-4,36,70,0,111,
-0,114,0,76,0,
-111,0,111,0,112,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,1,194,
-1,3,1,2,1,
-1,1478,22,1,54,
-1,2364,827,1,2105,
-814,1,1188,1479,17,
-1480,15,1098,1,-1,
-1,5,1481,20,1482,
+95,0,49,0,55,
+0,1,266,1,3,
+1,4,1,3,1495,
+22,1,124,1,2198,
+1496,17,1152,1,0,
+1156,1,1195,1497,17,
+1498,15,1108,1,-1,
+1,5,1499,20,1500,
 4,38,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -5181,116 +5262,59 @@ public yyLSLSyntax
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,50,0,51,0,
-1,222,1,3,1,
-6,1,5,1483,22,
-1,82,1,1442,1484,
-17,1485,15,1098,1,
--1,1,5,1486,20,
-1487,4,38,83,0,
+0,49,0,48,0,
+1,214,1,3,1,
+6,1,5,1501,22,
+1,72,1,1449,1502,
+17,1503,15,1108,1,
+-1,1,5,1504,20,
+1505,4,36,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,49,0,54,
-0,1,215,1,3,
-1,4,1,3,1488,
-22,1,75,1,1694,
-1489,16,0,190,1,
-942,1490,17,1491,15,
-1121,1,-1,1,5,
-1492,20,1493,4,38,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,55,0,1,261,
-1,3,1,4,1,
-3,1494,22,1,121,
-1,2198,1495,17,1142,
-1,0,1146,1,1195,
-1496,17,1497,15,1098,
-1,-1,1,5,1498,
-20,1499,4,38,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,49,0,
-48,0,1,209,1,
-3,1,6,1,5,
-1500,22,1,69,1,
-1449,1501,17,1502,15,
-1098,1,-1,1,5,
-1503,20,1504,4,36,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,51,
-0,1,202,1,3,
-1,4,1,3,1505,
-22,1,62,1,1701,
-1506,17,1507,15,1156,
-1,-1,1,5,1508,
-20,1509,4,36,70,
-0,111,0,114,0,
-76,0,111,0,111,
-0,112,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,51,0,
-1,196,1,3,1,
-4,1,3,1510,22,
-1,56,1,447,1511,
-17,1512,15,1513,4,
-30,37,0,86,0,
+95,0,51,0,1,
+207,1,3,1,4,
+1,3,1506,22,1,
+65,1,1701,1507,17,
+1508,15,1166,1,-1,
+1,5,1509,20,1510,
+4,36,70,0,111,
+0,114,0,76,0,
+111,0,111,0,112,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,95,
+0,51,0,1,201,
+1,3,1,4,1,
+3,1511,22,1,59,
+1,447,1512,17,1513,
+15,1514,4,30,37,
+0,86,0,101,0,
+99,0,116,0,111,
+0,114,0,67,0,
+111,0,110,0,115,
+0,116,0,97,0,
+110,0,116,0,1,
+-1,1,5,1515,20,
+1516,4,32,86,0,
 101,0,99,0,116,
 0,111,0,114,0,
 67,0,111,0,110,
 0,115,0,116,0,
 97,0,110,0,116,
-0,1,-1,1,5,
-1514,20,1515,4,32,
-86,0,101,0,99,
-0,116,0,111,0,
-114,0,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,95,0,
-49,0,1,231,1,
-3,1,8,1,7,
-1516,22,1,91,1,
-2458,876,1,2459,882,
-1,1958,1517,17,1142,
-1,0,1146,1,188,
-1518,17,1519,15,1121,
-1,-1,1,5,1520,
-20,1521,4,36,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,57,0,
-1,253,1,3,1,
-4,1,3,1522,22,
-1,113,1,2462,889,
-1,1657,894,1,2464,
-899,1,205,1523,17,
-1524,15,1121,1,-1,
-1,5,1525,20,1526,
+0,95,0,49,0,
+1,236,1,3,1,
+8,1,7,1517,22,
+1,94,1,2458,885,
+1,2459,891,1,1958,
+1518,17,1152,1,0,
+1156,1,188,1519,17,
+1520,15,1131,1,-1,
+1,5,1521,20,1522,
 4,36,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
@@ -5298,13 +5322,38 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,56,0,1,252,
+0,57,0,1,258,
 1,3,1,4,1,
-3,1527,22,1,112,
-1,2227,908,1,1224,
-1528,17,1529,15,1098,
-1,-1,1,5,1530,
-20,1531,4,38,83,
+3,1523,22,1,116,
+1,2462,898,1,1657,
+903,1,2464,908,1,
+205,1524,17,1525,15,
+1131,1,-1,1,5,
+1526,20,1527,4,36,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,56,
+0,1,257,1,3,
+1,4,1,3,1528,
+22,1,115,1,1620,
+1529,17,1530,15,1414,
+1,-1,1,5,1531,
+20,1532,4,24,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,50,0,1,204,
+1,3,1,2,1,
+1,1533,22,1,62,
+1,2227,917,1,1224,
+1534,17,1535,15,1108,
+1,-1,1,5,1536,
+20,1537,4,38,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
@@ -5312,12 +5361,12 @@ public yyLSLSyntax
 0,110,0,109,0,
 101,0,110,0,116,
 0,95,0,50,0,
-50,0,1,221,1,
+50,0,1,226,1,
 3,1,6,1,5,
-1532,22,1,81,1,
-223,1533,17,1534,15,
-1121,1,-1,1,5,
-1535,20,1536,4,36,
+1538,22,1,84,1,
+223,1539,17,1540,15,
+1131,1,-1,1,5,
+1541,20,1542,4,36,
 66,0,105,0,110,
 0,97,0,114,0,
 121,0,69,0,120,
@@ -5325,12 +5374,12 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,55,
-0,1,251,1,3,
-1,4,1,3,1537,
-22,1,111,1,1730,
-1538,17,1539,15,1156,
-1,-1,1,5,1540,
-20,1541,4,36,70,
+0,1,256,1,3,
+1,4,1,3,1543,
+22,1,114,1,1730,
+1544,17,1545,15,1166,
+1,-1,1,5,1546,
+20,1547,4,36,70,
 0,111,0,114,0,
 76,0,111,0,111,
 0,112,0,83,0,
@@ -5338,35 +5387,35 @@ public yyLSLSyntax
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,52,0,
-1,197,1,3,1,
-4,1,3,1542,22,
-1,57,1,476,1543,
-17,1544,15,1545,4,
+1,202,1,3,1,
+4,1,3,1548,22,
+1,60,1,476,1549,
+17,1550,15,1551,4,
 18,37,0,67,0,
 111,0,110,0,115,
 0,116,0,97,0,
 110,0,116,0,1,
--1,1,5,1546,20,
-1547,4,20,67,0,
+-1,1,5,1552,20,
+1553,4,20,67,0,
 111,0,110,0,115,
 0,116,0,97,0,
 110,0,116,0,95,
-0,52,0,1,229,
+0,52,0,1,234,
 1,3,1,2,1,
-1,1548,22,1,89,
-1,477,1549,17,1550,
-15,1545,1,-1,1,
-5,1551,20,1552,4,
+1,1554,22,1,92,
+1,477,1555,17,1556,
+15,1551,1,-1,1,
+5,1557,20,1558,4,
 20,67,0,111,0,
 110,0,115,0,116,
 0,97,0,110,0,
 116,0,95,0,51,
-0,1,228,1,3,
-1,2,1,1,1553,
-22,1,88,1,1231,
-1554,17,1555,15,1098,
-1,-1,1,5,1556,
-20,1557,4,36,83,
+0,1,233,1,3,
+1,2,1,1,1559,
+22,1,91,1,1231,
+1560,17,1561,15,1108,
+1,-1,1,5,1562,
+20,1563,4,36,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
@@ -5374,38 +5423,38 @@ public yyLSLSyntax
 0,110,0,109,0,
 101,0,110,0,116,
 0,95,0,57,0,
-1,208,1,3,1,
-6,1,5,1558,22,
-1,68,1,479,1559,
-17,1560,15,1545,1,
--1,1,5,1561,20,
-1562,4,20,67,0,
+1,213,1,3,1,
+6,1,5,1564,22,
+1,71,1,479,1565,
+17,1566,15,1551,1,
+-1,1,5,1567,20,
+1568,4,20,67,0,
 111,0,110,0,115,
 0,116,0,97,0,
 110,0,116,0,95,
-0,49,0,1,226,
+0,49,0,1,231,
 1,3,1,2,1,
-1,1563,22,1,86,
-1,480,1564,17,1565,
-15,1566,4,26,37,
+1,1569,22,1,89,
+1,480,1570,17,1571,
+15,1572,4,26,37,
 0,76,0,105,0,
 115,0,116,0,67,
 0,111,0,110,0,
 115,0,116,0,97,
 0,110,0,116,0,
-1,-1,1,5,1567,
-20,1568,4,28,76,
+1,-1,1,5,1573,
+20,1574,4,28,76,
 0,105,0,115,0,
 116,0,67,0,111,
 0,110,0,115,0,
 116,0,97,0,110,
 0,116,0,95,0,
-49,0,1,230,1,
+49,0,1,235,1,
 3,1,4,1,3,
-1569,22,1,90,1,
-1485,1570,17,1571,15,
-1098,1,-1,1,5,
-1572,20,1573,4,36,
+1575,22,1,93,1,
+1485,1576,17,1577,15,
+1108,1,-1,1,5,
+1578,20,1579,4,36,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
@@ -5413,39 +5462,51 @@ public yyLSLSyntax
 103,0,110,0,109,
 0,101,0,110,0,
 116,0,95,0,50,
-0,1,201,1,3,
-1,4,1,3,1574,
-22,1,61,1,1737,
-1575,16,0,271,1,
-1989,916,1,1990,1576,
-17,1142,1,0,1146,
-1,2664,1577,16,0,
-667,1,242,1578,17,
-1579,15,1121,1,-1,
-1,5,1580,20,1581,
-4,36,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,54,0,1,250,
-1,3,1,4,1,
-3,1582,22,1,110,
-1,478,1583,17,1584,
-15,1545,1,-1,1,
+0,1,206,1,3,
+1,4,1,3,1580,
+22,1,64,1,1737,
+1581,16,0,280,1,
+1989,925,1,1990,1582,
+17,1152,1,0,1156,
+1,242,1583,17,1584,
+15,1131,1,-1,1,
 5,1585,20,1586,4,
-20,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,95,0,50,
-0,1,227,1,3,
-1,2,1,1,1587,
-22,1,87,1,1001,
-1588,17,1589,15,1224,
-1,-1,1,5,1590,
-20,1591,4,40,84,
+36,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+54,0,1,255,1,
+3,1,4,1,3,
+1587,22,1,113,1,
+478,1588,17,1589,15,
+1551,1,-1,1,5,
+1590,20,1591,4,20,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,95,0,50,0,
+1,232,1,3,1,
+2,1,1,1592,22,
+1,90,1,1370,1593,
+17,1594,15,1108,1,
+-1,1,5,1595,20,
+1596,4,38,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,56,
+0,1,222,1,3,
+1,4,1,3,1597,
+22,1,80,1,1001,
+1598,17,1599,15,1234,
+1,-1,1,5,1600,
+20,1601,4,40,84,
 0,121,0,112,0,
 101,0,99,0,97,
 0,115,0,116,0,
@@ -5454,11 +5515,11 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,56,0,1,
-275,1,3,1,5,
-1,4,1592,22,1,
-135,1,1002,1593,17,
-1594,15,1224,1,-1,
-1,5,1595,20,1596,
+280,1,3,1,5,
+1,4,1602,22,1,
+138,1,1002,1603,17,
+1604,15,1234,1,-1,
+1,5,1605,20,1606,
 4,40,84,0,121,
 0,112,0,101,0,
 99,0,97,0,115,
@@ -5467,173 +5528,209 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,1,268,1,
+49,0,1,273,1,
 3,1,5,1,4,
-1597,22,1,128,1,
-12,1598,19,157,1,
-12,1599,5,43,1,
-1901,1600,16,0,155,
-1,2075,1601,16,0,
-155,1,1860,821,1,
-1803,787,1,1804,1602,
-16,0,155,1,2517,
-1603,16,0,155,1,
-2413,1604,16,0,155,
-1,2198,1605,16,0,
-155,1,1873,835,1,
-1657,894,1,1989,916,
-1,1990,1606,16,0,
-155,1,31,1607,16,
-0,155,1,32,1608,
-16,0,155,1,2105,
-814,1,2106,1609,16,
-0,155,1,2653,1610,
-16,0,155,1,2227,
-908,1,2337,1611,16,
-0,155,1,2560,1612,
-16,0,467,1,2021,
-718,1,2458,876,1,
-2459,882,1,2462,889,
-1,2136,842,1,2464,
-899,1,2029,725,1,
-2030,731,1,2031,736,
-1,2032,741,1,2469,
-1613,16,0,454,1,
-2035,752,1,2364,827,
-1,2039,762,1,1931,
-861,1,2041,768,1,
-2043,774,1,2045,779,
-1,1775,1614,16,0,
-155,1,2033,746,1,
-2037,757,1,1574,799,
-1,1958,1615,16,0,
-155,1,13,1616,19,
-448,1,13,1617,5,
-34,1,1860,821,1,
-1803,787,1,2519,1618,
-17,1619,15,1620,4,
-22,37,0,83,0,
+1607,22,1,131,1,
+12,1608,19,163,1,
+12,1609,5,44,1,
+1901,1610,16,0,161,
+1,2075,1611,16,0,
+161,1,1860,831,1,
+1803,797,1,1804,1612,
+16,0,161,1,2413,
+1613,16,0,161,1,
+2198,1614,16,0,161,
+1,1873,845,1,1657,
+903,1,1989,925,1,
+1990,1615,16,0,161,
+1,31,1616,16,0,
+161,1,32,1617,16,
+0,161,1,2105,824,
+1,2106,1618,16,0,
+161,1,2227,917,1,
+2337,1619,16,0,161,
+1,2665,1620,16,0,
+161,1,2021,728,1,
+2458,885,1,2459,891,
+1,2462,898,1,2136,
+852,1,2464,908,1,
+2029,735,1,2030,741,
+1,2031,746,1,2032,
+751,1,2469,1621,16,
+0,468,1,2035,762,
+1,2364,837,1,2039,
+772,1,1931,870,1,
+2041,778,1,2507,1622,
+16,0,161,1,2043,
+784,1,2045,789,1,
+1775,1623,16,0,161,
+1,2568,1624,16,0,
+583,1,2033,756,1,
+2522,1625,16,0,161,
+1,2037,767,1,1574,
+809,1,1958,1626,16,
+0,161,1,13,1627,
+19,151,1,13,1628,
+5,37,1,2509,1629,
+17,1630,15,1631,4,
+42,37,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+110,0,116,0,114,
+0,121,0,83,0,
 116,0,97,0,116,
 0,101,0,69,0,
 118,0,101,0,110,
 0,116,0,1,-1,
-1,5,1621,20,1622,
-4,24,83,0,116,
+1,5,1632,20,1633,
+4,44,83,0,116,
+0,97,0,116,0,
+101,0,69,0,110,
+0,116,0,114,0,
+121,0,83,0,116,
 0,97,0,116,0,
 101,0,69,0,118,
 0,101,0,110,0,
 116,0,95,0,49,
-0,1,158,1,3,
-1,6,1,5,1623,
-22,1,17,1,2521,
-1624,16,0,460,1,
-2413,1625,16,0,446,
-1,1873,835,1,1657,
-894,1,1989,916,1,
-32,1626,16,0,449,
-1,2105,814,1,2364,
-827,1,2227,908,1,
-1574,799,1,2557,1627,
-17,1628,15,1629,4,
+0,1,163,1,3,
+1,5,1,4,1634,
+22,1,20,1,1860,
+831,1,1803,797,1,
+2413,1635,16,0,462,
+1,2524,1636,17,1637,
+15,1638,4,22,37,
+0,83,0,116,0,
+97,0,116,0,101,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,-1,1,5,
+1639,20,1640,4,24,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+162,1,3,1,6,
+1,5,1641,22,1,
+19,1,2526,1642,16,
+0,478,1,1873,845,
+1,1657,903,1,1989,
+925,1,32,1643,16,
+0,463,1,2567,1644,
+17,1645,15,1646,4,
 20,37,0,83,0,
 116,0,97,0,116,
 0,101,0,66,0,
 111,0,100,0,121,
 0,1,-1,1,5,
-1630,20,1631,4,22,
-83,0,116,0,97,
-0,116,0,101,0,
-66,0,111,0,100,
-0,121,0,95,0,
-50,0,1,157,1,
-3,1,3,1,2,
-1632,22,1,16,1,
-2559,1633,17,1634,15,
-1629,1,-1,1,5,
-1635,20,1636,4,22,
+1647,20,1648,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 66,0,111,0,100,
 0,121,0,95,0,
-49,0,1,156,1,
+49,0,1,158,1,
 3,1,2,1,1,
-1637,22,1,15,1,
-2021,718,1,2458,876,
-1,2459,882,1,2462,
-889,1,2136,842,1,
-2464,899,1,2029,725,
-1,2030,731,1,2031,
-736,1,2032,741,1,
-2033,746,1,2035,752,
-1,2037,757,1,2039,
-762,1,1931,861,1,
-2041,768,1,2043,774,
-1,2045,779,1,2597,
-1638,16,0,639,1,
-14,1639,19,144,1,
-14,1640,5,105,1,
-2515,1641,16,0,142,
-1,1011,1102,1,1514,
-1108,1,9,1113,1,
-10,1642,17,1643,15,
-1644,4,48,37,0,
+1649,22,1,15,1,
+2105,824,1,2364,837,
+1,2227,917,1,1574,
+809,1,2563,1650,17,
+1651,15,1646,1,-1,
+1,5,1652,20,1653,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,52,0,1,
+161,1,3,1,3,
+1,2,1654,22,1,
+18,1,2564,1655,17,
+1656,15,1646,1,-1,
+1,5,1657,20,1658,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,50,0,1,
+159,1,3,1,3,
+1,2,1659,22,1,
+16,1,2566,1660,17,
+1661,15,1646,1,-1,
+1,5,1662,20,1663,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,51,0,1,
+160,1,3,1,2,
+1,1,1664,22,1,
+17,1,2458,885,1,
+2459,891,1,2462,898,
+1,2136,852,1,2464,
+908,1,2029,735,1,
+2030,741,1,2031,746,
+1,2032,751,1,2033,
+756,1,2035,762,1,
+2037,767,1,2039,772,
+1,1931,870,1,2041,
+778,1,2021,728,1,
+2043,784,1,2045,789,
+1,2606,1665,16,0,
+149,1,14,1666,19,
+144,1,14,1667,5,
+105,1,2511,1668,17,
+1669,15,1670,4,48,
+37,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+76,0,105,0,115,
+0,116,0,1,-1,
+1,5,140,1,0,
+1,0,1671,22,1,
+21,1,1260,1106,1,
+1011,1112,1,1514,1118,
+1,9,1123,1,10,
+1672,17,1673,15,1670,
+1,-1,1,5,140,
+1,0,1,0,1671,
+1,262,1129,1,1267,
+1135,1,1521,1140,1,
+1773,1674,16,0,148,
+1,19,1157,1,20,
+1675,16,0,142,1,
+2281,1164,1,525,1226,
+1,30,1676,17,1677,
+15,1670,1,-1,1,
+5,1678,20,1679,4,
+50,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,76,
+0,105,0,115,0,
+116,0,95,0,50,
+0,1,165,1,3,
+1,4,1,3,1680,
+22,1,23,1,283,
+1182,1,40,1187,1,
+41,1681,17,1682,15,
+1683,4,26,37,0,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,76,0,
-105,0,115,0,116,
-0,1,-1,1,5,
-140,1,0,1,0,
-1645,22,1,18,1,
-262,1119,1,1267,1125,
-1,481,1646,17,1647,
-15,1648,4,26,37,
-0,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,76,0,105,
-0,115,0,116,0,
-1,-1,1,5,1649,
-20,1650,4,28,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-76,0,105,0,115,
-0,116,0,95,0,
-49,0,1,278,1,
-3,1,2,1,1,
-1651,22,1,139,1,
-1521,1130,1,1773,1652,
-16,0,148,1,19,
-1147,1,20,1653,16,
-0,142,1,2281,1154,
-1,525,1216,1,30,
-1654,17,1655,15,1644,
-1,-1,1,5,1656,
-20,1657,4,50,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
-95,0,50,0,1,
-160,1,3,1,4,
-1,3,1658,22,1,
-20,1,283,1172,1,
-40,1177,1,41,1659,
-17,1660,15,1648,1,
--1,1,5,601,1,
-0,1,0,1661,22,
-1,138,1,42,1662,
-17,1663,15,1664,4,
+0,76,0,105,0,
+115,0,116,0,1,
+-1,1,5,617,1,
+0,1,0,1684,22,
+1,141,1,42,1685,
+17,1686,15,1687,4,
 38,37,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
@@ -5642,8 +5739,8 @@ public yyLSLSyntax
 114,0,103,0,117,
 0,109,0,101,0,
 110,0,116,0,1,
--1,1,5,1665,20,
-1666,4,40,69,0,
+-1,1,5,1688,20,
+1689,4,40,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
@@ -5651,2838 +5748,2883 @@ public yyLSLSyntax
 114,0,103,0,117,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,1,280,
+0,49,0,1,285,
 1,3,1,2,1,
-1,1667,22,1,141,
-1,44,1183,1,1260,
-1096,1,47,1184,1,
-48,1190,1,49,1196,
-1,50,1201,1,51,
-1206,1,305,1211,1,
-63,1222,1,66,1228,
-1,67,1233,1,1478,
-1458,1,69,1243,1,
-70,1248,1,68,1238,
-1,74,1253,1,1013,
-1258,1,2335,1668,16,
-0,148,1,1332,1263,
-1,1048,1344,1,82,
-1280,1,1296,1167,1,
-1341,1297,1,328,1302,
-1,1303,1307,1,1096,
-1312,1,93,1318,1,
-1550,1323,1,352,1349,
-1,107,1338,1,1114,
-1343,1,1370,1453,1,
-118,1355,1,1123,1360,
-1,371,1365,1,1377,
-1371,1,375,1376,1,
-377,1381,1,379,1386,
-1,380,1391,1,883,
-1397,1,2642,1669,17,
-1670,15,1644,1,-1,
-1,5,140,1,0,
-1,0,1645,1,373,
-1409,1,130,1414,1,
-2651,1671,16,0,142,
-1,143,1419,1,1152,
-1426,1,387,1672,16,
-0,555,1,1406,1431,
-1,1159,1438,1,157,
-1443,1,1413,1448,1,
-1665,1474,1,412,1673,
-16,0,576,1,1094,
-1674,16,0,603,1,
-172,1469,1,827,1331,
-1,1188,1479,1,437,
-1675,16,0,650,1,
-1442,1484,1,1694,1676,
-16,0,148,1,942,
-1490,1,1195,1496,1,
-1449,1501,1,1701,1506,
-1,447,1511,1,188,
-1518,1,205,1523,1,
-2467,1677,17,1678,15,
-1644,1,-1,1,5,
-1679,20,1680,4,50,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,76,0,
+1,1690,22,1,144,
+1,44,1193,1,47,
+1194,1,48,1200,1,
+49,1206,1,50,1211,
+1,51,1216,1,305,
+1221,1,63,1232,1,
+66,1238,1,67,1243,
+1,1478,1463,1,69,
+1253,1,70,1258,1,
+68,1248,1,74,1263,
+1,1013,1268,1,2335,
+1691,16,0,148,1,
+1332,1273,1,1048,1354,
+1,82,1290,1,1296,
+1177,1,1341,1307,1,
+328,1312,1,1303,1317,
+1,1096,1322,1,93,
+1328,1,1550,1333,1,
+352,1359,1,107,1348,
+1,1114,1353,1,1370,
+1593,1,118,1365,1,
+1123,1370,1,371,1375,
+1,1377,1381,1,375,
+1386,1,377,1391,1,
+379,1396,1,380,1401,
+1,883,1407,1,373,
+1419,1,130,1424,1,
+143,1429,1,2654,1692,
+17,1693,15,1670,1,
+-1,1,5,140,1,
+0,1,0,1671,1,
+1152,1435,1,387,1694,
+16,0,566,1,1406,
+1440,1,2663,1695,16,
+0,142,1,1159,1447,
+1,157,1452,1,1413,
+1457,1,1665,1475,1,
+412,1696,16,0,591,
+1,1094,1697,16,0,
+619,1,2520,1698,16,
+0,142,1,172,1470,
+1,827,1341,1,1188,
+1480,1,437,1699,16,
+0,660,1,1442,1485,
+1,1694,1700,16,0,
+148,1,942,1491,1,
+1195,1497,1,1449,1502,
+1,1701,1507,1,447,
+1512,1,188,1519,1,
+205,1524,1,2467,1701,
+17,1702,15,1670,1,
+-1,1,5,1703,20,
+1704,4,50,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,76,0,105,0,
+115,0,116,0,95,
+0,49,0,1,164,
+1,3,1,2,1,
+1,1705,22,1,22,
+1,461,1706,16,0,
+619,1,464,1707,17,
+1708,15,1683,1,-1,
+1,5,1709,20,1710,
+4,28,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,76,0,
 105,0,115,0,116,
-0,95,0,49,0,
-1,159,1,3,1,
-2,1,1,1681,22,
-1,19,1,461,1682,
-16,0,603,1,464,
-1683,17,1684,15,1648,
-1,-1,1,5,1685,
-20,1686,4,28,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-76,0,105,0,115,
-0,116,0,95,0,
-50,0,1,279,1,
-3,1,4,1,3,
-1687,22,1,140,1,
-1224,1528,1,223,1533,
-1,1730,1538,1,476,
-1543,1,477,1549,1,
-1231,1554,1,479,1559,
-1,480,1564,1,1485,
-1570,1,459,1688,17,
-1689,15,1648,1,-1,
-1,5,601,1,0,
-1,0,1661,1,242,
-1578,1,478,1583,1,
-2506,1690,17,1691,15,
-1644,1,-1,1,5,
-140,1,0,1,0,
-1645,1,1001,1588,1,
-1002,1593,1,15,1692,
-19,257,1,15,1693,
-5,6,1,1114,1694,
-16,0,299,1,1621,
-1695,16,0,649,1,
-2657,1696,16,0,255,
-1,40,1697,16,0,
-552,1,19,1147,1,
-9,1113,1,16,1698,
-19,136,1,16,1699,
-5,139,1,256,1700,
-16,0,187,1,1261,
-1701,16,0,187,1,
-509,1702,16,0,187,
-1,9,1703,16,0,
-134,1,2021,718,1,
-1775,1704,16,0,187,
-1,2029,725,1,2030,
-731,1,2031,736,1,
-2032,741,1,2033,746,
-1,277,1705,16,0,
-187,1,2035,752,1,
-2037,757,1,2039,762,
-1,32,1706,16,0,
-187,1,2041,768,1,
-2293,1707,16,0,187,
-1,2043,774,1,2045,
-779,1,40,1708,16,
-0,166,1,41,1709,
-16,0,187,1,1297,
-1710,16,0,187,1,
-43,1711,16,0,187,
-1,44,1712,16,0,
-166,1,1803,787,1,
-1804,1713,16,0,187,
-1,299,1714,16,0,
-187,1,2480,1715,17,
-1716,15,1717,4,12,
-37,0,69,0,118,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,1718,20,1719,4,
-16,69,0,118,0,
-101,0,110,0,116,
-0,95,0,50,0,
-53,0,1,312,1,
-3,1,2,1,1,
-1720,22,1,173,1,
-52,1721,16,0,187,
-1,2484,1722,17,1723,
-15,1717,1,-1,1,
-5,1724,20,1725,4,
-16,69,0,118,0,
-101,0,110,0,116,
 0,95,0,50,0,
-49,0,1,308,1,
-3,1,2,1,1,
-1726,22,1,169,1,
-1515,1727,16,0,187,
-1,2318,1728,16,0,
-187,1,2491,1729,17,
-1730,15,1717,1,-1,
-1,5,1731,20,1732,
-4,16,69,0,118,
-0,101,0,110,0,
+1,284,1,3,1,
+4,1,3,1711,22,
+1,143,1,1224,1534,
+1,223,1539,1,1730,
+1544,1,476,1549,1,
+477,1555,1,1231,1560,
+1,479,1565,1,480,
+1570,1,1485,1576,1,
+459,1712,17,1713,15,
+1683,1,-1,1,5,
+617,1,0,1,0,
+1684,1,242,1583,1,
+478,1588,1,481,1714,
+17,1715,15,1683,1,
+-1,1,5,1716,20,
+1717,4,28,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,76,
+0,105,0,115,0,
 116,0,95,0,49,
-0,52,0,1,301,
-1,3,1,2,1,
-1,1733,22,1,162,
-1,62,1734,16,0,
-202,1,63,1735,16,
-0,166,1,2495,1736,
-17,1737,15,1717,1,
--1,1,5,1738,20,
-1739,4,16,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-49,0,48,0,1,
-297,1,3,1,2,
-1,1,1740,22,1,
-158,1,2075,1741,16,
-0,187,1,1574,799,
-1,1479,1742,16,0,
-187,1,71,1743,16,
-0,187,1,1658,1744,
-16,0,672,1,1833,
-1745,16,0,288,1,
-1834,1746,16,0,187,
-1,2337,1747,16,0,
-187,1,79,1748,16,
-0,187,1,1335,1749,
-16,0,187,1,322,
-1750,16,0,187,1,
-76,1751,16,0,187,
-1,85,1752,16,0,
-187,1,89,1753,16,
-0,187,1,346,1754,
-16,0,187,1,97,
-1755,16,0,187,1,
-2106,1756,16,0,187,
-1,102,1757,16,0,
-187,1,1860,821,1,
-2458,876,1,2364,827,
-1,1990,1758,16,0,
-187,1,112,1759,16,
-0,187,1,1117,1760,
-16,0,187,1,1873,
-835,1,1875,1761,16,
-0,400,1,1876,1762,
-16,0,187,1,124,
-1763,16,0,187,1,
-2478,1764,17,1765,15,
-1717,1,-1,1,5,
-1766,20,1767,4,16,
+0,1,283,1,3,
+1,2,1,1,1718,
+22,1,142,1,1001,
+1598,1,1002,1603,1,
+15,1719,19,308,1,
+15,1720,5,6,1,
+2669,1721,16,0,601,
+1,1114,1722,16,0,
+306,1,1621,1723,16,
+0,659,1,40,1724,
+16,0,562,1,19,
+1157,1,9,1123,1,
+16,1725,19,136,1,
+16,1726,5,140,1,
+2510,1727,16,0,602,
+1,256,1728,16,0,
+196,1,1261,1729,16,
+0,196,1,509,1730,
+16,0,196,1,9,
+1731,16,0,134,1,
+2021,728,1,1775,1732,
+16,0,196,1,2029,
+735,1,2030,741,1,
+2031,746,1,2032,751,
+1,2033,756,1,277,
+1733,16,0,196,1,
+2035,762,1,2037,767,
+1,2039,772,1,32,
+1734,16,0,196,1,
+2041,778,1,2293,1735,
+16,0,196,1,2043,
+784,1,2045,789,1,
+40,1736,16,0,175,
+1,41,1737,16,0,
+196,1,1297,1738,16,
+0,196,1,43,1739,
+16,0,196,1,44,
+1740,16,0,175,1,
+1803,797,1,1804,1741,
+16,0,196,1,299,
+1742,16,0,196,1,
+2480,1743,17,1744,15,
+1745,4,12,37,0,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,50,0,55,
-0,1,314,1,3,
-1,2,1,1,1768,
-22,1,175,1,2136,
-842,1,381,1769,16,
-0,187,1,2641,1770,
-16,0,642,1,137,
-1771,16,0,187,1,
-1901,1772,16,0,187,
-1,2658,1773,16,0,
-187,1,1153,1774,16,
-0,187,1,151,1775,
-16,0,187,1,1407,
-1776,16,0,187,1,
-1659,1777,16,0,187,
-1,2413,1778,16,0,
-187,1,406,1779,16,
-0,187,1,1371,1780,
-16,0,187,1,2105,
-814,1,166,1781,16,
-0,187,1,525,1782,
-16,0,187,1,1622,
-1783,16,0,187,1,
-1931,861,1,1932,1784,
-16,0,456,1,1933,
-1785,16,0,187,1,
-431,1786,16,0,187,
-1,1585,1787,16,0,
-187,1,182,1788,16,
-0,187,1,1189,1789,
-16,0,187,1,1443,
-1790,16,0,187,1,
-1695,1791,16,0,187,
-1,2198,1792,16,0,
-187,1,447,1793,16,
-0,187,1,199,1794,
-16,0,187,1,2459,
-882,1,1958,1795,16,
-0,187,1,2462,889,
-1,1657,894,1,2464,
-899,1,459,1796,16,
-0,187,1,462,1797,
-16,0,187,1,2471,
-1798,17,1799,15,1717,
-1,-1,1,5,1800,
-20,1801,4,16,69,
+1,-1,1,5,1746,
+20,1747,4,16,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,51,0,52,0,
-1,321,1,3,1,
-2,1,1,1802,22,
-1,182,1,2472,1803,
-17,1804,15,1717,1,
--1,1,5,1805,20,
-1806,4,16,69,0,
+0,50,0,53,0,
+1,317,1,3,1,
+2,1,1,1748,22,
+1,176,1,52,1749,
+16,0,196,1,2484,
+1750,17,1751,15,1745,
+1,-1,1,5,1752,
+20,1753,4,16,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,50,0,49,0,
+1,313,1,3,1,
+2,1,1,1754,22,
+1,172,1,1515,1755,
+16,0,196,1,2318,
+1756,16,0,196,1,
+2491,1757,17,1758,15,
+1745,1,-1,1,5,
+1759,20,1760,4,16,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,49,0,52,
+0,1,306,1,3,
+1,2,1,1,1761,
+22,1,165,1,62,
+1762,16,0,212,1,
+63,1763,16,0,175,
+1,2495,1764,17,1765,
+15,1745,1,-1,1,
+5,1766,20,1767,4,
+16,69,0,118,0,
+101,0,110,0,116,
+0,95,0,49,0,
+48,0,1,302,1,
+3,1,2,1,1,
+1768,22,1,161,1,
+2075,1769,16,0,196,
+1,1574,809,1,1479,
+1770,16,0,196,1,
+71,1771,16,0,196,
+1,1622,1772,16,0,
+196,1,1658,1773,16,
+0,682,1,1833,1774,
+16,0,297,1,1834,
+1775,16,0,196,1,
+2337,1776,16,0,196,
+1,79,1777,16,0,
+196,1,1335,1778,16,
+0,196,1,322,1779,
+16,0,196,1,76,
+1780,16,0,196,1,
+85,1781,16,0,196,
+1,89,1782,16,0,
+196,1,346,1783,16,
+0,196,1,97,1784,
+16,0,196,1,2106,
+1785,16,0,196,1,
+102,1786,16,0,196,
+1,1860,831,1,2458,
+885,1,2364,837,1,
+1990,1787,16,0,196,
+1,112,1788,16,0,
+196,1,1117,1789,16,
+0,196,1,1873,845,
+1,1875,1790,16,0,
+408,1,1876,1791,16,
+0,196,1,124,1792,
+16,0,196,1,2478,
+1793,17,1794,15,1745,
+1,-1,1,5,1795,
+20,1796,4,16,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,50,0,55,0,
+1,319,1,3,1,
+2,1,1,1797,22,
+1,178,1,2136,852,
+1,381,1798,16,0,
+196,1,525,1799,16,
+0,196,1,137,1800,
+16,0,196,1,2653,
+1801,16,0,586,1,
+1901,1802,16,0,196,
+1,1153,1803,16,0,
+196,1,151,1804,16,
+0,196,1,1407,1805,
+16,0,196,1,1659,
+1806,16,0,196,1,
+2413,1807,16,0,196,
+1,406,1808,16,0,
+196,1,1371,1809,16,
+0,196,1,2105,824,
+1,166,1810,16,0,
+196,1,2670,1811,16,
+0,196,1,1931,870,
+1,1932,1812,16,0,
+470,1,1933,1813,16,
+0,196,1,431,1814,
+16,0,196,1,1585,
+1815,16,0,196,1,
+182,1816,16,0,196,
+1,1189,1817,16,0,
+196,1,1443,1818,16,
+0,196,1,1695,1819,
+16,0,196,1,2198,
+1820,16,0,196,1,
+447,1821,16,0,196,
+1,199,1822,16,0,
+196,1,2459,891,1,
+1958,1823,16,0,196,
+1,2462,898,1,1657,
+903,1,2464,908,1,
+459,1824,16,0,196,
+1,462,1825,16,0,
+196,1,2471,1826,17,
+1827,15,1828,4,22,
+37,0,69,0,110,
+0,116,0,114,0,
+121,0,69,0,118,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,1829,20,1830,4,
+24,69,0,110,0,
+116,0,114,0,121,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,49,0,
+1,326,1,3,1,
+2,1,1,1831,22,
+1,185,1,2472,1832,
+17,1833,15,1745,1,
+-1,1,5,1834,20,
+1835,4,16,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
 51,0,51,0,1,
-320,1,3,1,2,
-1,1,1807,22,1,
-181,1,2473,1808,17,
-1809,15,1717,1,-1,
-1,5,1810,20,1811,
+325,1,3,1,2,
+1,1,1836,22,1,
+184,1,2473,1837,17,
+1838,15,1745,1,-1,
+1,5,1839,20,1840,
 4,16,69,0,118,
 0,101,0,110,0,
 116,0,95,0,51,
-0,50,0,1,319,
+0,50,0,1,324,
 1,3,1,2,1,
-1,1812,22,1,180,
-1,2474,1813,17,1814,
-15,1717,1,-1,1,
-5,1815,20,1816,4,
+1,1841,22,1,183,
+1,2474,1842,17,1843,
+15,1745,1,-1,1,
+5,1844,20,1845,4,
 16,69,0,118,0,
 101,0,110,0,116,
 0,95,0,51,0,
-49,0,1,318,1,
+49,0,1,323,1,
 3,1,2,1,1,
-1817,22,1,179,1,
-2475,1818,17,1819,15,
-1717,1,-1,1,5,
-1820,20,1821,4,16,
+1846,22,1,182,1,
+2475,1847,17,1848,15,
+1745,1,-1,1,5,
+1849,20,1850,4,16,
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,51,0,48,
-0,1,317,1,3,
-1,2,1,1,1822,
-22,1,178,1,2476,
-1823,17,1824,15,1717,
-1,-1,1,5,1825,
-20,1826,4,16,69,
+0,1,322,1,3,
+1,2,1,1,1851,
+22,1,181,1,2476,
+1852,17,1853,15,1745,
+1,-1,1,5,1854,
+20,1855,4,16,69,
 0,118,0,101,0,
 110,0,116,0,95,
 0,50,0,57,0,
-1,316,1,3,1,
-2,1,1,1827,22,
-1,177,1,2477,1828,
-17,1829,15,1717,1,
--1,1,5,1830,20,
-1831,4,16,69,0,
+1,321,1,3,1,
+2,1,1,1856,22,
+1,180,1,2477,1857,
+17,1858,15,1745,1,
+-1,1,5,1859,20,
+1860,4,16,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
 50,0,56,0,1,
-315,1,3,1,2,
-1,1,1832,22,1,
-176,1,2227,908,1,
-2479,1833,17,1834,15,
-1717,1,-1,1,5,
-1835,20,1836,4,16,
+320,1,3,1,2,
+1,1,1861,22,1,
+179,1,2227,917,1,
+2479,1862,17,1863,15,
+1745,1,-1,1,5,
+1864,20,1865,4,16,
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,50,0,54,
-0,1,313,1,3,
-1,2,1,1,1837,
-22,1,174,1,1225,
-1838,16,0,187,1,
-2481,1839,17,1840,15,
-1717,1,-1,1,5,
-1841,20,1842,4,16,
+0,1,318,1,3,
+1,2,1,1,1866,
+22,1,177,1,1225,
+1867,16,0,196,1,
+2481,1868,17,1869,15,
+1745,1,-1,1,5,
+1870,20,1871,4,16,
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,50,0,52,
-0,1,311,1,3,
-1,2,1,1,1843,
-22,1,172,1,2482,
-1844,17,1845,15,1717,
-1,-1,1,5,1846,
-20,1847,4,16,69,
+0,1,316,1,3,
+1,2,1,1,1872,
+22,1,175,1,2482,
+1873,17,1874,15,1745,
+1,-1,1,5,1875,
+20,1876,4,16,69,
 0,118,0,101,0,
 110,0,116,0,95,
 0,50,0,51,0,
-1,310,1,3,1,
-2,1,1,1848,22,
-1,171,1,2483,1849,
-17,1850,15,1717,1,
--1,1,5,1851,20,
-1852,4,16,69,0,
+1,315,1,3,1,
+2,1,1,1877,22,
+1,174,1,2483,1878,
+17,1879,15,1745,1,
+-1,1,5,1880,20,
+1881,4,16,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
 50,0,50,0,1,
-309,1,3,1,2,
-1,1,1853,22,1,
-170,1,1731,1854,16,
-0,187,1,2485,1855,
-17,1856,15,1717,1,
--1,1,5,1857,20,
-1858,4,16,69,0,
+314,1,3,1,2,
+1,1,1882,22,1,
+173,1,1731,1883,16,
+0,196,1,2485,1884,
+17,1885,15,1745,1,
+-1,1,5,1886,20,
+1887,4,16,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
 50,0,48,0,1,
-307,1,3,1,2,
-1,1,1859,22,1,
-168,1,2486,1860,17,
-1861,15,1717,1,-1,
-1,5,1862,20,1863,
+312,1,3,1,2,
+1,1,1888,22,1,
+171,1,2486,1889,17,
+1890,15,1745,1,-1,
+1,5,1891,20,1892,
 4,16,69,0,118,
 0,101,0,110,0,
 116,0,95,0,49,
-0,57,0,1,306,
+0,57,0,1,311,
 1,3,1,2,1,
-1,1864,22,1,167,
-1,2487,1865,17,1866,
-15,1717,1,-1,1,
-5,1867,20,1868,4,
+1,1893,22,1,170,
+1,2487,1894,17,1895,
+15,1745,1,-1,1,
+5,1896,20,1897,4,
 16,69,0,118,0,
 101,0,110,0,116,
 0,95,0,49,0,
-56,0,1,305,1,
+56,0,1,310,1,
 3,1,2,1,1,
-1869,22,1,166,1,
-2488,1870,17,1871,15,
-1717,1,-1,1,5,
-1872,20,1873,4,16,
+1898,22,1,169,1,
+2488,1899,17,1900,15,
+1745,1,-1,1,5,
+1901,20,1902,4,16,
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,49,0,55,
-0,1,304,1,3,
-1,2,1,1,1874,
-22,1,165,1,2489,
-1875,17,1876,15,1717,
-1,-1,1,5,1877,
-20,1878,4,16,69,
+0,1,309,1,3,
+1,2,1,1,1903,
+22,1,168,1,2489,
+1904,17,1905,15,1745,
+1,-1,1,5,1906,
+20,1907,4,16,69,
 0,118,0,101,0,
 110,0,116,0,95,
 0,49,0,54,0,
-1,303,1,3,1,
-2,1,1,1879,22,
-1,164,1,2490,1880,
-17,1881,15,1717,1,
--1,1,5,1882,20,
-1883,4,16,69,0,
+1,308,1,3,1,
+2,1,1,1908,22,
+1,167,1,2490,1909,
+17,1910,15,1745,1,
+-1,1,5,1911,20,
+1912,4,16,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
 49,0,53,0,1,
-302,1,3,1,2,
-1,1,1884,22,1,
-163,1,1989,916,1,
-2492,1885,17,1886,15,
-1717,1,-1,1,5,
-1887,20,1888,4,16,
+307,1,3,1,2,
+1,1,1913,22,1,
+166,1,1989,925,1,
+2492,1914,17,1915,15,
+1745,1,-1,1,5,
+1916,20,1917,4,16,
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,49,0,51,
-0,1,300,1,3,
-1,2,1,1,1889,
-22,1,161,1,2493,
-1890,17,1891,15,1717,
-1,-1,1,5,1892,
-20,1893,4,16,69,
+0,1,305,1,3,
+1,2,1,1,1918,
+22,1,164,1,2493,
+1919,17,1920,15,1745,
+1,-1,1,5,1921,
+20,1922,4,16,69,
 0,118,0,101,0,
 110,0,116,0,95,
 0,49,0,50,0,
-1,299,1,3,1,
-2,1,1,1894,22,
-1,160,1,2494,1895,
-17,1896,15,1717,1,
--1,1,5,1897,20,
-1898,4,16,69,0,
+1,304,1,3,1,
+2,1,1,1923,22,
+1,163,1,2494,1924,
+17,1925,15,1745,1,
+-1,1,5,1926,20,
+1927,4,16,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
 49,0,49,0,1,
-298,1,3,1,2,
-1,1,1899,22,1,
-159,1,236,1900,16,
-0,187,1,2496,1901,
-17,1902,15,1717,1,
--1,1,5,1903,20,
-1904,4,14,69,0,
+303,1,3,1,2,
+1,1,1928,22,1,
+162,1,236,1929,16,
+0,196,1,2496,1930,
+17,1931,15,1745,1,
+-1,1,5,1932,20,
+1933,4,14,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-57,0,1,296,1,
+57,0,1,301,1,
 3,1,2,1,1,
-1905,22,1,157,1,
-2497,1906,17,1907,15,
-1717,1,-1,1,5,
-1908,20,1909,4,14,
+1934,22,1,160,1,
+2497,1935,17,1936,15,
+1745,1,-1,1,5,
+1937,20,1938,4,14,
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,56,0,1,
-295,1,3,1,2,
-1,1,1910,22,1,
-156,1,2498,1911,17,
-1912,15,1717,1,-1,
-1,5,1913,20,1914,
+300,1,3,1,2,
+1,1,1939,22,1,
+159,1,2498,1940,17,
+1941,15,1745,1,-1,
+1,5,1942,20,1943,
 4,14,69,0,118,
 0,101,0,110,0,
 116,0,95,0,55,
-0,1,294,1,3,
-1,2,1,1,1915,
-22,1,155,1,2499,
-1916,17,1917,15,1717,
-1,-1,1,5,1918,
-20,1919,4,14,69,
+0,1,299,1,3,
+1,2,1,1,1944,
+22,1,158,1,2499,
+1945,17,1946,15,1745,
+1,-1,1,5,1947,
+20,1948,4,14,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,54,0,1,293,
+0,54,0,1,298,
 1,3,1,2,1,
-1,1920,22,1,154,
-1,2500,1921,17,1922,
-15,1717,1,-1,1,
-5,1923,20,1924,4,
+1,1949,22,1,157,
+1,2500,1950,17,1951,
+15,1745,1,-1,1,
+5,1952,20,1953,4,
 14,69,0,118,0,
 101,0,110,0,116,
 0,95,0,53,0,
-1,292,1,3,1,
-2,1,1,1925,22,
-1,153,1,2501,1926,
-17,1927,15,1717,1,
--1,1,5,1928,20,
-1929,4,14,69,0,
+1,297,1,3,1,
+2,1,1,1954,22,
+1,156,1,2501,1955,
+17,1956,15,1745,1,
+-1,1,5,1957,20,
+1958,4,14,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-52,0,1,291,1,
+52,0,1,296,1,
 3,1,2,1,1,
-1930,22,1,152,1,
-2502,1931,17,1932,15,
-1717,1,-1,1,5,
-1933,20,1934,4,14,
+1959,22,1,155,1,
+2502,1960,17,1961,15,
+1745,1,-1,1,5,
+1962,20,1963,4,14,
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,51,0,1,
-290,1,3,1,2,
-1,1,1935,22,1,
-151,1,2503,1936,17,
-1937,15,1717,1,-1,
-1,5,1938,20,1939,
+295,1,3,1,2,
+1,1,1964,22,1,
+154,1,2503,1965,17,
+1966,15,1745,1,-1,
+1,5,1967,20,1968,
 4,14,69,0,118,
 0,101,0,110,0,
 116,0,95,0,50,
-0,1,289,1,3,
-1,2,1,1,1940,
-22,1,150,1,2504,
-1941,17,1942,15,1717,
-1,-1,1,5,1943,
-20,1944,4,14,69,
+0,1,294,1,3,
+1,2,1,1,1969,
+22,1,153,1,2504,
+1970,17,1971,15,1745,
+1,-1,1,5,1972,
+20,1973,4,14,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,49,0,1,288,
+0,49,0,1,293,
 1,3,1,2,1,
-1,1945,22,1,149,
-1,2505,1946,16,0,
-433,1,217,1947,16,
-0,187,1,1756,1948,
-16,0,187,1,17,
-1949,19,154,1,17,
-1950,5,117,1,1,
-1951,17,1952,15,1953,
+1,1974,22,1,152,
+1,2505,1975,16,0,
+441,1,217,1976,16,
+0,196,1,1756,1977,
+16,0,196,1,17,
+1978,19,160,1,17,
+1979,5,118,1,1,
+1980,17,1981,15,1982,
 4,18,37,0,84,
 0,121,0,112,0,
 101,0,110,0,97,
 0,109,0,101,0,
-1,-1,1,5,1954,
-20,1955,4,20,84,
+1,-1,1,5,1983,
+20,1984,4,20,84,
 0,121,0,112,0,
 101,0,110,0,97,
 0,109,0,101,0,
 95,0,55,0,1,
-287,1,3,1,2,
-1,1,1956,22,1,
-148,1,2,1957,17,
-1958,15,1953,1,-1,
-1,5,1959,20,1960,
+292,1,3,1,2,
+1,1,1985,22,1,
+151,1,2,1986,17,
+1987,15,1982,1,-1,
+1,5,1988,20,1989,
 4,20,84,0,121,
 0,112,0,101,0,
 110,0,97,0,109,
 0,101,0,95,0,
-54,0,1,286,1,
+54,0,1,291,1,
 3,1,2,1,1,
-1961,22,1,147,1,
-3,1962,17,1963,15,
-1953,1,-1,1,5,
-1964,20,1965,4,20,
+1990,22,1,150,1,
+3,1991,17,1992,15,
+1982,1,-1,1,5,
+1993,20,1994,4,20,
 84,0,121,0,112,
 0,101,0,110,0,
 97,0,109,0,101,
 0,95,0,53,0,
-1,285,1,3,1,
-2,1,1,1966,22,
-1,146,1,4,1967,
-17,1968,15,1953,1,
--1,1,5,1969,20,
-1970,4,20,84,0,
+1,290,1,3,1,
+2,1,1,1995,22,
+1,149,1,4,1996,
+17,1997,15,1982,1,
+-1,1,5,1998,20,
+1999,4,20,84,0,
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,95,
-0,52,0,1,284,
+0,52,0,1,289,
 1,3,1,2,1,
-1,1971,22,1,145,
-1,5,1972,17,1973,
-15,1953,1,-1,1,
-5,1974,20,1975,4,
+1,2000,22,1,148,
+1,5,2001,17,2002,
+15,1982,1,-1,1,
+5,2003,20,2004,4,
 20,84,0,121,0,
 112,0,101,0,110,
 0,97,0,109,0,
 101,0,95,0,51,
-0,1,283,1,3,
-1,2,1,1,1976,
-22,1,144,1,6,
-1977,17,1978,15,1953,
-1,-1,1,5,1979,
-20,1980,4,20,84,
+0,1,288,1,3,
+1,2,1,1,2005,
+22,1,147,1,6,
+2006,17,2007,15,1982,
+1,-1,1,5,2008,
+20,2009,4,20,84,
 0,121,0,112,0,
 101,0,110,0,97,
 0,109,0,101,0,
 95,0,50,0,1,
-282,1,3,1,2,
-1,1,1981,22,1,
-143,1,7,1982,17,
-1983,15,1953,1,-1,
-1,5,1984,20,1985,
+287,1,3,1,2,
+1,1,2010,22,1,
+146,1,7,2011,17,
+2012,15,1982,1,-1,
+1,5,2013,20,2014,
 4,20,84,0,121,
 0,112,0,101,0,
 110,0,97,0,109,
 0,101,0,95,0,
-49,0,1,281,1,
+49,0,1,286,1,
 3,1,2,1,1,
-1986,22,1,142,1,
-1514,1108,1,9,1113,
-1,10,1642,1,262,
-1119,1,1267,1125,1,
-481,1646,1,1521,1130,
-1,1773,1987,16,0,
-234,1,19,1147,1,
-20,1988,16,0,152,
-1,2281,1154,1,525,
-1216,1,30,1654,1,
-283,1172,1,1010,1989,
-16,0,593,1,40,
-1177,1,41,1659,1,
-42,1662,1,44,1183,
-1,1260,1096,1,47,
-1184,1,1303,1307,1,
-49,1196,1,50,1201,
-1,48,1190,1,305,
-1211,1,51,1206,1,
-61,1990,16,0,194,
-1,63,1222,1,66,
-1228,1,67,1233,1,
-1478,1458,1,69,1243,
-1,70,1248,1,68,
-1238,1,73,1991,16,
-0,204,1,74,1253,
-1,1013,1258,1,2335,
-1992,16,0,239,1,
-328,1302,1,1048,1344,
-1,82,1280,1,1840,
-1993,16,0,303,1,
-2515,1994,16,0,436,
-1,1341,1297,1,1094,
-1995,16,0,666,1,
-1096,1312,1,93,1318,
-1,1550,1323,1,352,
-1349,1,1011,1102,1,
-107,1338,1,1114,1343,
-1,1871,1996,16,0,
-313,1,1370,1453,1,
-118,1355,1,1123,1360,
-1,1332,1263,1,1377,
-1371,1,375,1376,1,
-1882,1997,16,0,327,
-1,377,1381,1,827,
-1331,1,380,1391,1,
-130,1414,1,2074,1998,
-16,0,554,1,371,
-1365,1,373,1409,1,
-1012,1999,16,0,595,
-1,379,1386,1,143,
-1419,1,1152,1426,1,
-1406,1431,1,1159,1438,
-1,157,1443,1,1413,
-1448,1,883,1397,1,
-1296,1167,1,172,1469,
-1,1665,1474,1,1939,
-2000,16,0,435,1,
-1188,1479,1,1442,1484,
-1,188,1518,1,942,
-1490,1,1195,1496,1,
-1449,1501,1,1701,1506,
-1,447,1511,1,205,
-1523,1,2467,1677,1,
-464,1683,1,2642,1669,
-1,2197,2001,16,0,
-662,1,1224,1528,1,
-223,1533,1,1730,1538,
-1,2651,2002,16,0,
-570,1,477,1549,1,
-1231,1554,1,479,1559,
-1,480,1564,1,1485,
-1570,1,459,1688,1,
-476,1543,1,242,1578,
-1,478,1583,1,2506,
-1690,1,1001,1588,1,
-1002,1593,1,18,2003,
-19,490,1,18,2004,
-5,84,1,1011,1102,
-1,1012,2005,16,0,
-488,1,1013,1258,1,
-262,1119,1,1267,2006,
-16,0,488,1,515,
-2007,16,0,488,1,
-1521,2008,16,0,488,
-1,525,1216,1,283,
-1172,1,2299,2009,16,
-0,488,1,42,2010,
-16,0,488,1,40,
-1177,1,44,1183,1,
-47,1184,1,1303,2011,
-16,0,488,1,1555,
-2012,16,0,488,1,
-50,1201,1,48,1190,
-1,49,1196,1,51,
-1206,1,63,1222,1,
-305,1211,1,66,1228,
-1,67,1233,1,68,
-1238,1,69,1243,1,
-70,1248,1,73,2013,
-16,0,488,1,74,
-1253,1,328,1302,1,
-1048,2014,16,0,488,
-1,82,2015,16,0,
-488,1,1840,2016,16,
-0,488,1,1591,2017,
-16,0,488,1,1341,
-2018,16,0,488,1,
-1096,1312,1,93,1318,
-1,352,1349,1,107,
-2019,16,0,488,1,
-1114,1343,1,118,2020,
-16,0,488,1,1123,
-2021,16,0,488,1,
-371,1365,1,1628,2022,
-16,0,488,1,375,
-1376,1,1882,2023,16,
-0,488,1,377,1381,
-1,379,1386,1,380,
-1391,1,883,2024,16,
-0,488,1,373,1409,
-1,130,2025,16,0,
-488,1,143,2026,16,
-0,488,1,387,2027,
-16,0,488,1,2664,
-2028,16,0,488,1,
-1159,2029,16,0,488,
-1,157,2030,16,0,
-488,1,1413,2031,16,
-0,488,1,1665,2032,
-16,0,488,1,412,
-2033,16,0,488,1,
-1377,2034,16,0,488,
-1,172,2035,16,0,
-488,1,1939,2036,16,
-0,488,1,437,2037,
-16,0,488,1,188,
-2038,16,0,488,1,
-942,2039,16,0,488,
-1,1195,2040,16,0,
-488,1,1449,2041,16,
-0,488,1,1701,2042,
-16,0,488,1,447,
-1511,1,205,2043,16,
-0,488,1,827,2044,
-16,0,488,1,223,
-2045,16,0,488,1,
-476,1543,1,477,1549,
-1,1231,2046,16,0,
-488,1,479,1559,1,
-480,1564,1,1485,2047,
-16,0,488,1,1737,
-2048,16,0,488,1,
-242,2049,16,0,488,
-1,478,1583,1,1001,
-1588,1,1002,1593,1,
-19,2050,19,225,1,
-19,2051,5,176,1,
-256,2052,16,0,223,
-1,1261,2053,16,0,
-223,1,1011,1102,1,
-1012,2054,16,0,455,
-1,2458,876,1,262,
-1119,1,1267,2055,16,
-0,455,1,2021,718,
-1,1521,2056,16,0,
-455,1,1775,2057,16,
-0,223,1,2029,725,
-1,2030,731,1,2031,
-736,1,2032,741,1,
-2033,746,1,277,2058,
-16,0,223,1,2035,
-752,1,2037,757,1,
-2039,762,1,32,2059,
-16,0,223,1,2464,
-899,1,2293,2060,16,
-0,223,1,2043,774,
-1,2045,779,1,2299,
-2061,16,0,455,1,
-41,2062,16,0,223,
-1,42,2063,16,0,
-455,1,40,1177,1,
-44,1183,1,43,2064,
-16,0,223,1,1804,
-2065,16,0,223,1,
-48,1190,1,49,1196,
-1,47,1184,1,51,
-1206,1,52,2066,16,
-0,223,1,50,1201,
-1,305,1211,1,1096,
-1312,1,1515,2067,16,
-0,223,1,2318,2068,
-16,0,223,1,283,
-1172,1,63,1222,1,
-66,1228,1,67,1233,
-1,68,1238,1,69,
-1243,1,70,1248,1,
-71,2069,16,0,223,
-1,73,2070,16,0,
-455,1,74,1253,1,
-1013,1258,1,76,2071,
-16,0,223,1,1834,
-2072,16,0,223,1,
-2337,2073,16,0,223,
-1,79,2074,16,0,
-223,1,1335,2075,16,
-0,223,1,299,2076,
-16,0,223,1,82,
-2077,16,0,455,1,
-1840,2078,16,0,455,
-1,1297,2079,16,0,
-223,1,85,2080,16,
-0,223,1,1341,2081,
-16,0,455,1,89,
-2082,16,0,223,1,
-1303,2083,16,0,455,
-1,509,2084,16,0,
-223,1,93,1318,1,
-322,2085,16,0,223,
-1,97,2086,16,0,
-223,1,2041,768,1,
-1555,2087,16,0,455,
-1,827,2088,16,0,
-455,1,102,2089,16,
-0,223,1,1860,821,
-1,1803,787,1,2364,
-827,1,107,2090,16,
-0,455,1,1114,1343,
-1,112,2091,16,0,
-223,1,1117,2092,16,
-0,223,1,352,1349,
-1,1873,835,1,118,
-2093,16,0,455,1,
-1123,2094,16,0,455,
-1,371,1365,1,515,
-2095,16,0,455,1,
-1377,2096,16,0,455,
-1,124,2097,16,0,
-223,1,1882,2098,16,
-0,455,1,377,1381,
-1,379,1386,1,380,
-1391,1,130,2099,16,
-0,455,1,346,2100,
-16,0,223,1,2075,
-2101,16,0,223,1,
-373,1409,1,387,2102,
-16,0,455,1,137,
-2103,16,0,223,1,
-143,2104,16,0,455,
-1,1901,2105,16,0,
-223,1,1048,2106,16,
-0,455,1,2658,2107,
-16,0,223,1,1153,
-2108,16,0,223,1,
-375,1376,1,151,2109,
-16,0,223,1,1407,
-2110,16,0,223,1,
-1659,2111,16,0,223,
-1,2413,2112,16,0,
-223,1,1159,2113,16,
-0,455,1,381,2114,
-16,0,223,1,157,
-2115,16,0,455,1,
-1413,2116,16,0,455,
-1,883,2117,16,0,
-455,1,1371,2118,16,
-0,223,1,328,1302,
-1,2105,814,1,2106,
-2119,16,0,223,1,
-166,2120,16,0,223,
-1,525,2121,16,0,
-223,1,1622,2122,16,
-0,223,1,406,2123,
-16,0,223,1,1574,
-799,1,172,2124,16,
-0,455,1,1931,861,
-1,412,2125,16,0,
-455,1,1933,2126,16,
-0,223,1,1876,2127,
-16,0,223,1,431,
-2128,16,0,223,1,
-1585,2129,16,0,223,
-1,182,2130,16,0,
-223,1,1628,2131,16,
-0,455,1,1189,2132,
-16,0,223,1,437,
-2133,16,0,455,1,
-1591,2134,16,0,455,
-1,188,2135,16,0,
-455,1,1695,2136,16,
-0,223,1,2198,2137,
-16,0,223,1,1195,
-2138,16,0,455,1,
-1449,2139,16,0,455,
-1,1701,2140,16,0,
-455,1,447,2141,16,
-0,223,1,199,2142,
-16,0,223,1,2459,
-882,1,1958,2143,16,
-0,223,1,2462,889,
-1,1657,894,1,205,
-2144,16,0,455,1,
-459,2145,16,0,223,
-1,462,2146,16,0,
-223,1,1665,2147,16,
-0,455,1,217,2148,
-16,0,223,1,2227,
-908,1,942,2149,16,
-0,455,1,1225,2150,
-16,0,223,1,223,
-2151,16,0,455,1,
-1479,2152,16,0,223,
-1,1731,2153,16,0,
-223,1,477,1549,1,
-1231,2154,16,0,455,
-1,479,1559,1,480,
-1564,1,1485,2155,16,
-0,455,1,1737,2156,
-16,0,455,1,1989,
-916,1,1990,2157,16,
-0,223,1,1443,2158,
-16,0,223,1,236,
-2159,16,0,223,1,
-2136,842,1,2664,2160,
-16,0,455,1,476,
-1543,1,242,2161,16,
-0,455,1,478,1583,
-1,1939,2162,16,0,
-455,1,1001,1588,1,
-1002,1593,1,1756,2163,
-16,0,223,1,20,
-2164,19,442,1,20,
-2165,5,84,1,1011,
-1102,1,1012,2166,16,
-0,440,1,1013,1258,
-1,262,1119,1,1267,
-2167,16,0,440,1,
-515,2168,16,0,440,
-1,1521,2169,16,0,
-440,1,525,1216,1,
-283,1172,1,2299,2170,
-16,0,440,1,42,
-2171,16,0,440,1,
-40,1177,1,44,1183,
-1,47,1184,1,1303,
-2172,16,0,440,1,
-1555,2173,16,0,440,
-1,50,1201,1,48,
-1190,1,49,1196,1,
-51,1206,1,63,1222,
-1,305,1211,1,66,
-1228,1,67,1233,1,
-68,1238,1,69,1243,
-1,70,1248,1,73,
-2174,16,0,440,1,
-74,1253,1,328,2175,
-16,0,440,1,1048,
-2176,16,0,440,1,
-82,2177,16,0,440,
-1,1840,2178,16,0,
-440,1,1591,2179,16,
-0,440,1,1341,2180,
-16,0,440,1,1096,
-1312,1,93,1318,1,
-352,2181,16,0,440,
-1,107,2182,16,0,
-440,1,1114,1343,1,
-118,2183,16,0,440,
-1,1123,2184,16,0,
-440,1,371,1365,1,
-1628,2185,16,0,440,
-1,375,1376,1,1882,
-2186,16,0,440,1,
-377,1381,1,379,1386,
-1,380,1391,1,883,
-2187,16,0,440,1,
-373,1409,1,130,2188,
-16,0,440,1,143,
-2189,16,0,440,1,
-387,2190,16,0,440,
-1,2664,2191,16,0,
-440,1,1159,2192,16,
-0,440,1,157,2193,
-16,0,440,1,1413,
-2194,16,0,440,1,
-1665,2195,16,0,440,
-1,412,2196,16,0,
-440,1,1377,2197,16,
-0,440,1,172,2198,
-16,0,440,1,1939,
-2199,16,0,440,1,
-437,2200,16,0,440,
-1,188,2201,16,0,
-440,1,942,2202,16,
-0,440,1,1195,2203,
-16,0,440,1,1449,
-2204,16,0,440,1,
-1701,2205,16,0,440,
-1,447,1511,1,205,
-2206,16,0,440,1,
-827,2207,16,0,440,
-1,223,2208,16,0,
-440,1,476,1543,1,
-477,1549,1,1231,2209,
-16,0,440,1,479,
-1559,1,480,1564,1,
-1485,2210,16,0,440,
-1,1737,2211,16,0,
-440,1,242,2212,16,
-0,440,1,478,1583,
-1,1001,1588,1,1002,
-1593,1,21,2213,19,
-432,1,21,2214,5,
-84,1,1011,1102,1,
-1012,2215,16,0,430,
-1,1013,1258,1,262,
-1119,1,1267,2216,16,
-0,430,1,515,2217,
-16,0,430,1,1521,
-2218,16,0,430,1,
-525,1216,1,283,1172,
-1,2299,2219,16,0,
-430,1,42,2220,16,
-0,430,1,40,1177,
-1,44,1183,1,47,
-1184,1,1303,2221,16,
-0,430,1,1555,2222,
-16,0,430,1,50,
-1201,1,48,1190,1,
-49,1196,1,51,1206,
-1,63,1222,1,305,
-1211,1,66,1228,1,
-67,1233,1,68,1238,
-1,69,1243,1,70,
-1248,1,73,2223,16,
-0,430,1,74,1253,
-1,328,2224,16,0,
-430,1,1048,2225,16,
-0,430,1,82,2226,
-16,0,430,1,1840,
-2227,16,0,430,1,
-1591,2228,16,0,430,
-1,1341,2229,16,0,
-430,1,1096,1312,1,
-93,1318,1,352,2230,
-16,0,430,1,107,
-2231,16,0,430,1,
-1114,1343,1,118,2232,
-16,0,430,1,1123,
-2233,16,0,430,1,
-371,1365,1,1628,2234,
-16,0,430,1,375,
-1376,1,1882,2235,16,
-0,430,1,377,1381,
-1,379,1386,1,380,
-1391,1,883,2236,16,
-0,430,1,373,1409,
-1,130,2237,16,0,
-430,1,143,2238,16,
-0,430,1,387,2239,
-16,0,430,1,2664,
-2240,16,0,430,1,
-1159,2241,16,0,430,
-1,157,2242,16,0,
-430,1,1413,2243,16,
-0,430,1,1665,2244,
-16,0,430,1,412,
-2245,16,0,430,1,
-1377,2246,16,0,430,
-1,172,2247,16,0,
-430,1,1939,2248,16,
-0,430,1,437,2249,
-16,0,430,1,188,
-2250,16,0,430,1,
-942,2251,16,0,430,
-1,1195,2252,16,0,
-430,1,1449,2253,16,
-0,430,1,1701,2254,
-16,0,430,1,447,
-1511,1,205,2255,16,
-0,430,1,827,2256,
-16,0,430,1,223,
-2257,16,0,430,1,
-476,1543,1,477,1549,
-1,1231,2258,16,0,
-430,1,479,1559,1,
-480,1564,1,1485,2259,
-16,0,430,1,1737,
-2260,16,0,430,1,
-242,2261,16,0,430,
-1,478,1583,1,1001,
-1588,1,1002,1593,1,
-22,2262,19,383,1,
-22,2263,5,84,1,
-1011,1102,1,1012,2264,
-16,0,381,1,1013,
-1258,1,262,1119,1,
-1267,2265,16,0,381,
-1,515,2266,16,0,
-381,1,1521,2267,16,
-0,381,1,525,1216,
-1,283,1172,1,2299,
-2268,16,0,381,1,
-42,2269,16,0,381,
-1,40,1177,1,44,
-1183,1,47,1184,1,
-1303,2270,16,0,381,
-1,1555,2271,16,0,
-381,1,50,1201,1,
-48,1190,1,49,1196,
-1,51,1206,1,63,
-1222,1,305,1211,1,
-66,1228,1,67,1233,
-1,68,1238,1,69,
-1243,1,70,1248,1,
-73,2272,16,0,381,
-1,74,1253,1,328,
-2273,16,0,381,1,
-1048,2274,16,0,381,
-1,82,2275,16,0,
-381,1,1840,2276,16,
-0,381,1,1591,2277,
-16,0,381,1,1341,
-2278,16,0,381,1,
-1096,1312,1,93,1318,
-1,352,2279,16,0,
-381,1,107,2280,16,
-0,381,1,1114,1343,
-1,118,2281,16,0,
-381,1,1123,2282,16,
-0,381,1,371,1365,
-1,1628,2283,16,0,
-381,1,375,1376,1,
-1882,2284,16,0,381,
-1,377,1381,1,379,
-1386,1,380,1391,1,
-883,2285,16,0,381,
-1,373,1409,1,130,
-2286,16,0,381,1,
-143,2287,16,0,381,
-1,387,2288,16,0,
-381,1,2664,2289,16,
-0,381,1,1159,2290,
-16,0,381,1,157,
-2291,16,0,381,1,
-1413,2292,16,0,381,
-1,1665,2293,16,0,
-381,1,412,2294,16,
-0,381,1,1377,2295,
-16,0,381,1,172,
-2296,16,0,381,1,
-1939,2297,16,0,381,
-1,437,2298,16,0,
-381,1,188,2299,16,
-0,381,1,942,2300,
-16,0,381,1,1195,
-2301,16,0,381,1,
-1449,2302,16,0,381,
-1,1701,2303,16,0,
-381,1,447,1511,1,
-205,2304,16,0,381,
-1,827,2305,16,0,
-381,1,223,2306,16,
-0,381,1,476,1543,
-1,477,1549,1,1231,
-2307,16,0,381,1,
-479,1559,1,480,1564,
-1,1485,2308,16,0,
-381,1,1737,2309,16,
-0,381,1,242,2310,
-16,0,381,1,478,
-1583,1,1001,1588,1,
-1002,1593,1,23,2311,
-19,504,1,23,2312,
-5,38,1,1901,2313,
-16,0,502,1,2075,
-2314,16,0,502,1,
-1860,821,1,1803,787,
-1,1804,2315,16,0,
-502,1,2413,2316,16,
-0,502,1,2198,2317,
-16,0,502,1,1873,
-835,1,1657,894,1,
-1989,916,1,1990,2318,
-16,0,502,1,1775,
-2319,16,0,502,1,
-32,2320,16,0,502,
-1,2105,814,1,2106,
-2321,16,0,502,1,
-2364,827,1,2227,908,
-1,2337,2322,16,0,
-502,1,2021,718,1,
-2458,876,1,2459,882,
-1,2462,889,1,2136,
-842,1,2464,899,1,
-2029,725,1,2030,731,
-1,2031,736,1,2032,
-741,1,2033,746,1,
-2035,752,1,2037,757,
-1,2039,762,1,1931,
-861,1,2041,768,1,
-2043,774,1,2045,779,
-1,1574,799,1,1958,
-2323,16,0,502,1,
-24,2324,19,177,1,
-24,2325,5,5,1,
-44,2326,16,0,175,
-1,377,2327,16,0,
-540,1,40,2328,16,
-0,674,1,63,2329,
-16,0,196,1,373,
-2330,16,0,536,1,
-25,2331,19,291,1,
-25,2332,5,177,1,
-256,2333,16,0,545,
-1,1261,2334,16,0,
-545,1,1011,1102,1,
-1012,2335,16,0,289,
-1,2458,876,1,262,
-1119,1,1267,2336,16,
-0,289,1,2021,718,
-1,1521,2337,16,0,
-289,1,1775,2338,16,
-0,545,1,2029,725,
-1,2030,731,1,2031,
-736,1,2032,741,1,
-2033,746,1,277,2339,
-16,0,545,1,2035,
-752,1,2037,757,1,
-2039,762,1,32,2340,
-16,0,545,1,2464,
-899,1,2293,2341,16,
-0,545,1,2043,774,
-1,2045,779,1,2299,
-2342,16,0,289,1,
-41,2343,16,0,545,
-1,42,2344,16,0,
-289,1,40,1177,1,
-44,1183,1,43,2345,
-16,0,545,1,1804,
-2346,16,0,545,1,
-48,1190,1,49,1196,
-1,47,1184,1,51,
-1206,1,52,2347,16,
-0,545,1,50,1201,
-1,305,1211,1,1096,
-1312,1,1515,2348,16,
-0,545,1,2318,2349,
-16,0,545,1,62,
-2350,16,0,545,1,
-63,1222,1,66,1228,
-1,67,1233,1,68,
-1238,1,69,1243,1,
-70,1248,1,71,2351,
-16,0,545,1,283,
-1172,1,73,2352,16,
-0,289,1,74,1253,
-1,1013,1258,1,76,
-2353,16,0,545,1,
-1834,2354,16,0,545,
-1,2337,2355,16,0,
-545,1,79,2356,16,
-0,545,1,1335,2357,
-16,0,545,1,299,
-2358,16,0,545,1,
-82,2359,16,0,289,
-1,1840,2360,16,0,
-289,1,1297,2361,16,
-0,545,1,85,2362,
-16,0,545,1,1341,
-2363,16,0,289,1,
-89,2364,16,0,545,
-1,1303,2365,16,0,
-289,1,509,2366,16,
-0,545,1,93,1318,
-1,322,2367,16,0,
-545,1,97,2368,16,
-0,545,1,2041,768,
-1,1555,2369,16,0,
-289,1,827,2370,16,
-0,289,1,102,2371,
-16,0,545,1,1860,
-821,1,1803,787,1,
-2364,827,1,107,2372,
-16,0,289,1,1114,
-1343,1,112,2373,16,
-0,545,1,1117,2374,
-16,0,545,1,352,
-1349,1,1873,835,1,
-118,1355,1,1123,2375,
-16,0,289,1,371,
-1365,1,515,2376,16,
-0,289,1,1377,2377,
-16,0,289,1,124,
-2378,16,0,545,1,
-1882,2379,16,0,289,
-1,377,1381,1,379,
-1386,1,380,1391,1,
-130,1414,1,346,2380,
-16,0,545,1,2075,
-2381,16,0,545,1,
-373,1409,1,387,2382,
-16,0,289,1,137,
-2383,16,0,545,1,
-143,2384,16,0,289,
-1,1901,2385,16,0,
-545,1,1048,1344,1,
-2658,2386,16,0,545,
-1,1153,2387,16,0,
-545,1,375,1376,1,
-151,2388,16,0,545,
-1,1407,2389,16,0,
-545,1,1659,2390,16,
-0,545,1,2413,2391,
-16,0,545,1,1159,
-2392,16,0,289,1,
-381,2393,16,0,545,
-1,157,2394,16,0,
-289,1,1413,2395,16,
-0,289,1,883,2396,
-16,0,289,1,1371,
-2397,16,0,545,1,
-328,1302,1,2105,814,
-1,2106,2398,16,0,
-545,1,166,2399,16,
-0,545,1,525,2400,
-16,0,545,1,1622,
-2401,16,0,545,1,
-406,2402,16,0,545,
-1,1574,799,1,172,
-1469,1,1931,861,1,
-412,2403,16,0,289,
-1,1933,2404,16,0,
-545,1,1876,2405,16,
-0,545,1,431,2406,
-16,0,545,1,1585,
-2407,16,0,545,1,
-182,2408,16,0,545,
-1,1628,2409,16,0,
-289,1,1189,2410,16,
-0,545,1,437,2411,
-16,0,289,1,1591,
-2412,16,0,289,1,
-188,1518,1,1695,2413,
-16,0,545,1,2198,
-2414,16,0,545,1,
-1195,2415,16,0,289,
-1,1449,2416,16,0,
-289,1,1701,2417,16,
-0,289,1,447,2418,
-16,0,545,1,199,
-2419,16,0,545,1,
-2459,882,1,1958,2420,
-16,0,545,1,2462,
-889,1,1657,894,1,
-205,2421,16,0,289,
-1,459,2422,16,0,
-545,1,462,2423,16,
-0,545,1,1665,2424,
-16,0,289,1,217,
-2425,16,0,545,1,
-2227,908,1,942,1490,
-1,1225,2426,16,0,
-545,1,223,2427,16,
-0,289,1,1479,2428,
-16,0,545,1,1731,
-2429,16,0,545,1,
-477,1549,1,1231,2430,
-16,0,289,1,479,
-1559,1,480,1564,1,
-1485,2431,16,0,289,
-1,1737,2432,16,0,
-289,1,1989,916,1,
-1990,2433,16,0,545,
-1,1443,2434,16,0,
-545,1,236,2435,16,
-0,545,1,2136,842,
-1,2664,2436,16,0,
-289,1,476,1543,1,
-242,2437,16,0,289,
-1,478,1583,1,1939,
-2438,16,0,289,1,
-1001,1588,1,1002,1593,
-1,1756,2439,16,0,
-545,1,26,2440,19,
-308,1,26,2441,5,
-84,1,1011,1102,1,
-1012,2442,16,0,306,
-1,1013,1258,1,262,
-1119,1,1267,2443,16,
-0,306,1,515,2444,
-16,0,660,1,1521,
-2445,16,0,306,1,
-525,1216,1,283,1172,
-1,2299,2446,16,0,
-306,1,42,2447,16,
-0,306,1,40,1177,
-1,44,1183,1,47,
-1184,1,1303,2448,16,
-0,306,1,1555,2449,
-16,0,306,1,50,
-1201,1,48,1190,1,
-49,1196,1,51,1206,
-1,63,1222,1,305,
-1211,1,66,1228,1,
-67,1233,1,68,1238,
-1,69,1243,1,70,
-1248,1,73,2450,16,
-0,306,1,74,1253,
-1,328,1302,1,1048,
-1344,1,82,2451,16,
-0,306,1,1840,2452,
-16,0,306,1,1591,
-2453,16,0,306,1,
-1341,2454,16,0,306,
-1,1096,1312,1,93,
-1318,1,352,1349,1,
-107,2455,16,0,306,
-1,1114,1343,1,118,
-1355,1,1123,2456,16,
-0,306,1,371,1365,
-1,1628,2457,16,0,
-306,1,375,1376,1,
-1882,2458,16,0,306,
-1,377,1381,1,379,
-1386,1,380,1391,1,
-883,2459,16,0,306,
-1,373,1409,1,130,
-1414,1,143,2460,16,
-0,306,1,387,2461,
-16,0,306,1,2664,
-2462,16,0,306,1,
-1159,2463,16,0,306,
-1,157,2464,16,0,
-306,1,1413,2465,16,
-0,306,1,1665,2466,
-16,0,306,1,412,
-2467,16,0,306,1,
-1377,2468,16,0,306,
-1,172,1469,1,1939,
-2469,16,0,306,1,
-437,2470,16,0,588,
-1,188,1518,1,942,
-1490,1,1195,2471,16,
-0,306,1,1449,2472,
-16,0,306,1,1701,
-2473,16,0,306,1,
-447,1511,1,205,2474,
-16,0,306,1,827,
-2475,16,0,306,1,
-223,2476,16,0,306,
-1,476,1543,1,477,
-1549,1,1231,2477,16,
-0,306,1,479,1559,
-1,480,1564,1,1485,
-2478,16,0,306,1,
-1737,2479,16,0,306,
-1,242,2480,16,0,
-306,1,478,1583,1,
-1001,1588,1,1002,1593,
-1,27,2481,19,598,
-1,27,2482,5,95,
-1,256,2483,16,0,
-596,1,1261,2484,16,
-0,596,1,509,2485,
-16,0,596,1,1515,
-2486,16,0,596,1,
-2021,718,1,1775,2487,
-16,0,596,1,2029,
-725,1,2030,731,1,
-2031,736,1,2032,741,
-1,2033,746,1,277,
-2488,16,0,596,1,
-2035,752,1,2037,757,
-1,2039,762,1,32,
-2489,16,0,596,1,
-2041,768,1,2293,2490,
-16,0,596,1,2043,
-774,1,2045,779,1,
-41,2491,16,0,596,
-1,1297,2492,16,0,
-596,1,43,2493,16,
-0,596,1,1803,787,
-1,1804,2494,16,0,
-596,1,299,2495,16,
-0,596,1,52,2496,
-16,0,596,1,2318,
-2497,16,0,596,1,
-62,2498,16,0,596,
-1,2075,2499,16,0,
-596,1,1574,799,1,
-71,2500,16,0,596,
-1,76,2501,16,0,
-596,1,1834,2502,16,
-0,596,1,2337,2503,
-16,0,596,1,79,
-2504,16,0,596,1,
-1335,2505,16,0,596,
-1,322,2506,16,0,
-596,1,85,2507,16,
-0,596,1,89,2508,
-16,0,596,1,346,
-2509,16,0,596,1,
-2105,814,1,2106,2510,
-16,0,596,1,97,
-2511,16,0,596,1,
-1860,821,1,2364,827,
-1,102,2512,16,0,
-596,1,112,2513,16,
-0,596,1,1117,2514,
-16,0,596,1,1873,
-835,1,1876,2515,16,
-0,596,1,124,2516,
-16,0,596,1,2136,
-842,1,381,2517,16,
-0,596,1,525,2518,
-16,0,596,1,137,
-2519,16,0,596,1,
-1901,2520,16,0,596,
-1,2658,2521,16,0,
-596,1,1153,2522,16,
-0,596,1,151,2523,
-16,0,596,1,1407,
-2524,16,0,596,1,
-1659,2525,16,0,596,
-1,2413,2526,16,0,
-596,1,406,2527,16,
-0,596,1,1371,2528,
-16,0,596,1,166,
-2529,16,0,596,1,
-1622,2530,16,0,596,
-1,1931,861,1,1933,
-2531,16,0,596,1,
-431,2532,16,0,596,
-1,1585,2533,16,0,
-596,1,182,2534,16,
-0,596,1,1189,2535,
-16,0,596,1,1443,
-2536,16,0,596,1,
-1695,2537,16,0,596,
-1,2198,2538,16,0,
-596,1,447,2539,16,
-0,596,1,2458,876,
-1,2459,882,1,1958,
-2540,16,0,596,1,
-2462,889,1,1657,894,
-1,2464,899,1,199,
-2541,16,0,596,1,
-459,2542,16,0,596,
-1,462,2543,16,0,
-596,1,217,2544,16,
-0,596,1,2227,908,
-1,1225,2545,16,0,
-596,1,1479,2546,16,
-0,596,1,1731,2547,
-16,0,596,1,1989,
-916,1,1990,2548,16,
-0,596,1,236,2549,
-16,0,596,1,1756,
-2550,16,0,596,1,
-28,2551,19,629,1,
-28,2552,5,60,1,
-328,1302,1,223,1533,
-1,1096,1312,1,118,
-1355,1,883,1397,1,
-525,1216,1,1001,1588,
-1,130,1414,1,459,
-1688,1,1114,1343,1,
-352,1349,1,447,1511,
-1,464,1683,1,1011,
-1102,1,1013,1258,1,
-242,1578,1,143,1419,
-1,40,1177,1,41,
-1659,1,42,1662,1,
-479,1559,1,44,1183,
-1,481,1646,1,373,
-1409,1,47,1184,1,
-157,1443,1,49,1196,
-1,50,1201,1,48,
-1190,1,379,1386,1,
-380,1391,1,51,1206,
-1,476,1543,1,371,
-1365,1,478,1583,1,
-1048,1344,1,375,1376,
-1,172,1469,1,262,
-1119,1,283,1172,1,
-63,1222,1,67,1233,
-1,68,1238,1,69,
-1243,1,66,1228,1,
-461,2553,16,0,627,
-1,74,1253,1,377,
-1381,1,1002,1593,1,
-70,1248,1,188,1518,
-1,82,1280,1,305,
-1211,1,477,1549,1,
-827,1331,1,93,1318,
-1,480,1564,1,205,
-1523,1,942,1490,1,
-107,1338,1,29,2554,
-19,280,1,29,2555,
-5,84,1,1011,1102,
-1,1012,2556,16,0,
-278,1,1013,1258,1,
-262,1119,1,1267,2557,
-16,0,278,1,515,
-2558,16,0,278,1,
-1521,2559,16,0,278,
-1,525,1216,1,283,
-1172,1,2299,2560,16,
-0,278,1,42,2561,
-16,0,278,1,40,
-1177,1,44,1183,1,
-47,1184,1,1303,2562,
-16,0,278,1,1555,
-2563,16,0,278,1,
-50,1201,1,48,1190,
-1,49,1196,1,51,
-1206,1,63,1222,1,
-305,1211,1,66,1228,
-1,67,1233,1,68,
-1238,1,69,1243,1,
-70,1248,1,73,2564,
-16,0,278,1,74,
-1253,1,328,1302,1,
-1048,1344,1,82,2565,
-16,0,278,1,1840,
-2566,16,0,278,1,
-1591,2567,16,0,278,
-1,1341,2568,16,0,
-278,1,1096,1312,1,
-93,1318,1,352,1349,
-1,107,2569,16,0,
-278,1,1114,1343,1,
-118,1355,1,1123,2570,
-16,0,278,1,371,
-1365,1,1628,2571,16,
-0,278,1,375,1376,
-1,1882,2572,16,0,
-278,1,377,1381,1,
-379,1386,1,380,1391,
-1,883,2573,16,0,
-278,1,373,1409,1,
-130,1414,1,143,1419,
-1,387,2574,16,0,
-278,1,2664,2575,16,
-0,278,1,1159,2576,
-16,0,278,1,157,
-1443,1,1413,2577,16,
-0,278,1,1665,2578,
-16,0,278,1,412,
-2579,16,0,278,1,
-1377,2580,16,0,278,
-1,172,1469,1,1939,
-2581,16,0,278,1,
-437,2582,16,0,278,
-1,188,1518,1,942,
-1490,1,1195,2583,16,
-0,278,1,1449,2584,
-16,0,278,1,1701,
-2585,16,0,278,1,
-447,1511,1,205,2586,
-16,0,278,1,827,
-2587,16,0,278,1,
-223,2588,16,0,278,
-1,476,1543,1,477,
-1549,1,1231,2589,16,
-0,278,1,479,1559,
-1,480,1564,1,1485,
-2590,16,0,278,1,
-1737,2591,16,0,278,
-1,242,2592,16,0,
-278,1,478,1583,1,
-1001,1588,1,1002,1593,
-1,30,2593,19,268,
-1,30,2594,5,84,
-1,1011,1102,1,1012,
-2595,16,0,266,1,
-1013,1258,1,262,1119,
-1,1267,2596,16,0,
-266,1,515,2597,16,
-0,266,1,1521,2598,
-16,0,266,1,525,
-1216,1,283,1172,1,
-2299,2599,16,0,266,
-1,42,2600,16,0,
-266,1,40,1177,1,
-44,1183,1,47,1184,
-1,1303,2601,16,0,
-266,1,1555,2602,16,
-0,266,1,50,1201,
-1,48,1190,1,49,
-1196,1,51,1206,1,
-63,1222,1,305,1211,
-1,66,1228,1,67,
-1233,1,68,1238,1,
-69,1243,1,70,1248,
-1,73,2603,16,0,
-266,1,74,1253,1,
-328,1302,1,1048,1344,
-1,82,2604,16,0,
-266,1,1840,2605,16,
-0,266,1,1591,2606,
-16,0,266,1,1341,
-2607,16,0,266,1,
-1096,1312,1,93,1318,
-1,352,1349,1,107,
-2608,16,0,266,1,
-1114,1343,1,118,1355,
-1,1123,2609,16,0,
-266,1,371,1365,1,
-1628,2610,16,0,266,
-1,375,1376,1,1882,
-2611,16,0,266,1,
-377,1381,1,379,1386,
-1,380,1391,1,883,
-2612,16,0,266,1,
-373,1409,1,130,1414,
-1,143,1419,1,387,
-2613,16,0,266,1,
-2664,2614,16,0,266,
-1,1159,2615,16,0,
-266,1,157,1443,1,
-1413,2616,16,0,266,
-1,1665,2617,16,0,
-266,1,412,2618,16,
-0,266,1,1377,2619,
-16,0,266,1,172,
-1469,1,1939,2620,16,
-0,266,1,437,2621,
-16,0,266,1,188,
-1518,1,942,1490,1,
-1195,2622,16,0,266,
-1,1449,2623,16,0,
-266,1,1701,2624,16,
-0,266,1,447,1511,
-1,205,2625,16,0,
-266,1,827,2626,16,
-0,266,1,223,2627,
-16,0,266,1,476,
-1543,1,477,1549,1,
-1231,2628,16,0,266,
-1,479,1559,1,480,
-1564,1,1485,2629,16,
-0,266,1,1737,2630,
-16,0,266,1,242,
-2631,16,0,266,1,
-478,1583,1,1001,1588,
-1,1002,1593,1,31,
-2632,19,253,1,31,
-2633,5,84,1,1011,
-1102,1,1012,2634,16,
-0,251,1,1013,1258,
-1,262,1119,1,1267,
-2635,16,0,251,1,
-515,2636,16,0,251,
-1,1521,2637,16,0,
-251,1,525,1216,1,
-283,1172,1,2299,2638,
-16,0,251,1,42,
-2639,16,0,251,1,
-40,1177,1,44,1183,
-1,47,1184,1,1303,
-2640,16,0,251,1,
-1555,2641,16,0,251,
-1,50,1201,1,48,
-1190,1,49,1196,1,
-51,1206,1,63,1222,
-1,305,1211,1,66,
-1228,1,67,1233,1,
-68,1238,1,69,1243,
-1,70,1248,1,73,
-2642,16,0,251,1,
-74,1253,1,328,1302,
-1,1048,1344,1,82,
-2643,16,0,251,1,
-1840,2644,16,0,251,
-1,1591,2645,16,0,
-251,1,1341,2646,16,
-0,251,1,1096,1312,
-1,93,1318,1,352,
-1349,1,107,2647,16,
-0,251,1,1114,1343,
-1,118,1355,1,1123,
-2648,16,0,251,1,
-371,1365,1,1628,2649,
-16,0,251,1,375,
-1376,1,1882,2650,16,
-0,251,1,377,1381,
-1,379,1386,1,380,
-1391,1,883,2651,16,
-0,251,1,373,1409,
-1,130,1414,1,143,
-2652,16,0,251,1,
-387,2653,16,0,251,
-1,2664,2654,16,0,
-251,1,1159,2655,16,
-0,251,1,157,2656,
-16,0,251,1,1413,
-2657,16,0,251,1,
-1665,2658,16,0,251,
-1,412,2659,16,0,
-251,1,1377,2660,16,
-0,251,1,172,1469,
-1,1939,2661,16,0,
-251,1,437,2662,16,
-0,251,1,188,1518,
-1,942,1490,1,1195,
-2663,16,0,251,1,
-1449,2664,16,0,251,
-1,1701,2665,16,0,
-251,1,447,1511,1,
-205,2666,16,0,251,
-1,827,2667,16,0,
-251,1,223,2668,16,
-0,251,1,476,1543,
-1,477,1549,1,1231,
-2669,16,0,251,1,
-479,1559,1,480,1564,
-1,1485,2670,16,0,
-251,1,1737,2671,16,
-0,251,1,242,2672,
-16,0,251,1,478,
-1583,1,1001,1588,1,
-1002,1593,1,32,2673,
-19,246,1,32,2674,
-5,84,1,1011,1102,
-1,1012,2675,16,0,
-244,1,1013,1258,1,
-262,1119,1,1267,2676,
-16,0,244,1,515,
-2677,16,0,244,1,
-1521,2678,16,0,244,
-1,525,1216,1,283,
-1172,1,2299,2679,16,
-0,244,1,42,2680,
-16,0,244,1,40,
-1177,1,44,1183,1,
-47,1184,1,1303,2681,
-16,0,244,1,1555,
-2682,16,0,244,1,
-50,1201,1,48,1190,
-1,49,1196,1,51,
-1206,1,63,1222,1,
-305,1211,1,66,1228,
-1,67,1233,1,68,
-1238,1,69,1243,1,
-70,1248,1,73,2683,
-16,0,244,1,74,
-1253,1,328,1302,1,
-1048,1344,1,82,2684,
-16,0,244,1,1840,
-2685,16,0,244,1,
-1591,2686,16,0,244,
-1,1341,2687,16,0,
-244,1,1096,1312,1,
-93,1318,1,352,1349,
-1,107,2688,16,0,
-244,1,1114,1343,1,
-118,1355,1,1123,2689,
-16,0,244,1,371,
-1365,1,1628,2690,16,
-0,244,1,375,1376,
-1,1882,2691,16,0,
-244,1,377,1381,1,
-379,1386,1,380,1391,
-1,883,2692,16,0,
-244,1,373,1409,1,
-130,1414,1,143,2693,
-16,0,244,1,387,
-2694,16,0,244,1,
-2664,2695,16,0,244,
-1,1159,2696,16,0,
-244,1,157,2697,16,
-0,244,1,1413,2698,
-16,0,244,1,1665,
-2699,16,0,244,1,
-412,2700,16,0,244,
-1,1377,2701,16,0,
-244,1,172,1469,1,
-1939,2702,16,0,244,
-1,437,2703,16,0,
-244,1,188,1518,1,
-942,1490,1,1195,2704,
-16,0,244,1,1449,
-2705,16,0,244,1,
-1701,2706,16,0,244,
-1,447,1511,1,205,
-2707,16,0,244,1,
-827,2708,16,0,244,
-1,223,2709,16,0,
-244,1,476,1543,1,
-477,1549,1,1231,2710,
-16,0,244,1,479,
-1559,1,480,1564,1,
-1485,2711,16,0,244,
-1,1737,2712,16,0,
-244,1,242,2713,16,
-0,244,1,478,1583,
-1,1001,1588,1,1002,
-1593,1,33,2714,19,
-332,1,33,2715,5,
-84,1,1011,1102,1,
-1012,2716,16,0,330,
-1,1013,1258,1,262,
-1119,1,1267,2717,16,
-0,330,1,515,2718,
-16,0,330,1,1521,
-2719,16,0,330,1,
-525,1216,1,283,1172,
-1,2299,2720,16,0,
-330,1,42,2721,16,
-0,330,1,40,1177,
-1,44,1183,1,47,
-1184,1,1303,2722,16,
-0,330,1,1555,2723,
-16,0,330,1,50,
-1201,1,48,1190,1,
-49,1196,1,51,1206,
-1,63,1222,1,305,
-1211,1,66,1228,1,
-67,1233,1,68,1238,
-1,69,1243,1,70,
-1248,1,73,2724,16,
-0,330,1,74,1253,
-1,328,1302,1,1048,
-1344,1,82,2725,16,
-0,330,1,1840,2726,
-16,0,330,1,1591,
-2727,16,0,330,1,
-1341,2728,16,0,330,
-1,1096,1312,1,93,
-1318,1,352,1349,1,
-107,2729,16,0,330,
-1,1114,1343,1,118,
-1355,1,1123,2730,16,
-0,330,1,371,1365,
-1,1628,2731,16,0,
-330,1,375,1376,1,
-1882,2732,16,0,330,
-1,377,1381,1,379,
-1386,1,380,1391,1,
-883,2733,16,0,330,
-1,373,1409,1,130,
-1414,1,143,1419,1,
-387,2734,16,0,330,
-1,2664,2735,16,0,
-330,1,1159,2736,16,
-0,330,1,157,1443,
-1,1413,2737,16,0,
-330,1,1665,2738,16,
-0,330,1,412,2739,
-16,0,330,1,1377,
-2740,16,0,330,1,
-172,1469,1,1939,2741,
-16,0,330,1,437,
-2742,16,0,330,1,
-188,1518,1,942,1490,
-1,1195,2743,16,0,
-330,1,1449,2744,16,
-0,330,1,1701,2745,
-16,0,330,1,447,
-1511,1,205,2746,16,
-0,330,1,827,2747,
-16,0,330,1,223,
-2748,16,0,330,1,
-476,1543,1,477,1549,
-1,1231,2749,16,0,
-330,1,479,1559,1,
-480,1564,1,1485,2750,
-16,0,330,1,1737,
-2751,16,0,330,1,
-242,1578,1,478,1583,
-1,1001,1588,1,1002,
-1593,1,34,2752,19,
-322,1,34,2753,5,
-84,1,1011,1102,1,
-1012,2754,16,0,320,
-1,1013,1258,1,262,
-1119,1,1267,2755,16,
-0,320,1,515,2756,
-16,0,320,1,1521,
-2757,16,0,320,1,
-525,1216,1,283,1172,
-1,2299,2758,16,0,
-320,1,42,2759,16,
-0,320,1,40,1177,
-1,44,1183,1,47,
-1184,1,1303,2760,16,
-0,320,1,1555,2761,
-16,0,320,1,50,
-1201,1,48,1190,1,
-49,1196,1,51,1206,
-1,63,1222,1,305,
-1211,1,66,1228,1,
-67,1233,1,68,1238,
-1,69,1243,1,70,
-1248,1,73,2762,16,
-0,320,1,74,1253,
-1,328,1302,1,1048,
-1344,1,82,2763,16,
-0,320,1,1840,2764,
-16,0,320,1,1591,
-2765,16,0,320,1,
-1341,2766,16,0,320,
-1,1096,1312,1,93,
-1318,1,352,1349,1,
-107,2767,16,0,320,
-1,1114,1343,1,118,
-1355,1,1123,2768,16,
-0,320,1,371,1365,
-1,1628,2769,16,0,
-320,1,375,1376,1,
-1882,2770,16,0,320,
-1,377,1381,1,379,
-1386,1,380,1391,1,
-883,2771,16,0,320,
-1,373,1409,1,130,
-1414,1,143,1419,1,
-387,2772,16,0,320,
-1,2664,2773,16,0,
-320,1,1159,2774,16,
-0,320,1,157,1443,
-1,1413,2775,16,0,
-320,1,1665,2776,16,
-0,320,1,412,2777,
-16,0,320,1,1377,
-2778,16,0,320,1,
-172,1469,1,1939,2779,
-16,0,320,1,437,
-2780,16,0,320,1,
-188,1518,1,942,1490,
-1,1195,2781,16,0,
-320,1,1449,2782,16,
-0,320,1,1701,2783,
-16,0,320,1,447,
-1511,1,205,1523,1,
-827,2784,16,0,320,
-1,223,1533,1,476,
-1543,1,477,1549,1,
-1231,2785,16,0,320,
-1,479,1559,1,480,
-1564,1,1485,2786,16,
-0,320,1,1737,2787,
-16,0,320,1,242,
-1578,1,478,1583,1,
-1001,1588,1,1002,1593,
-1,35,2788,19,311,
-1,35,2789,5,84,
-1,1011,1102,1,1012,
-2790,16,0,309,1,
-1013,1258,1,262,1119,
-1,1267,2791,16,0,
-309,1,515,2792,16,
-0,309,1,1521,2793,
-16,0,309,1,525,
-1216,1,283,1172,1,
-2299,2794,16,0,309,
-1,42,2795,16,0,
-309,1,40,1177,1,
-44,1183,1,47,1184,
-1,1303,2796,16,0,
-309,1,1555,2797,16,
-0,309,1,50,1201,
-1,48,1190,1,49,
-1196,1,51,1206,1,
-63,1222,1,305,1211,
-1,66,1228,1,67,
-1233,1,68,1238,1,
-69,1243,1,70,1248,
-1,73,2798,16,0,
-309,1,74,1253,1,
-328,1302,1,1048,1344,
-1,82,2799,16,0,
-309,1,1840,2800,16,
-0,309,1,1591,2801,
-16,0,309,1,1341,
-2802,16,0,309,1,
-1096,1312,1,93,1318,
-1,352,1349,1,107,
-2803,16,0,309,1,
-1114,1343,1,118,1355,
-1,1123,2804,16,0,
-309,1,371,1365,1,
-1628,2805,16,0,309,
-1,375,1376,1,1882,
-2806,16,0,309,1,
-377,1381,1,379,1386,
-1,380,1391,1,883,
-2807,16,0,309,1,
-373,1409,1,130,1414,
-1,143,1419,1,387,
-2808,16,0,309,1,
-2664,2809,16,0,309,
-1,1159,2810,16,0,
-309,1,157,1443,1,
-1413,2811,16,0,309,
-1,1665,2812,16,0,
-309,1,412,2813,16,
-0,309,1,1377,2814,
-16,0,309,1,172,
-1469,1,1939,2815,16,
-0,309,1,437,2816,
-16,0,309,1,188,
-1518,1,942,1490,1,
-1195,2817,16,0,309,
-1,1449,2818,16,0,
-309,1,1701,2819,16,
-0,309,1,447,1511,
-1,205,1523,1,827,
-2820,16,0,309,1,
-223,2821,16,0,309,
-1,476,1543,1,477,
-1549,1,1231,2822,16,
-0,309,1,479,1559,
-1,480,1564,1,1485,
-2823,16,0,309,1,
-1737,2824,16,0,309,
-1,242,1578,1,478,
-1583,1,1001,1588,1,
-1002,1593,1,36,2825,
-19,216,1,36,2826,
-5,94,1,256,2827,
-16,0,214,1,1261,
-2828,16,0,214,1,
-509,2829,16,0,214,
-1,1515,2830,16,0,
-214,1,2021,718,1,
-1775,2831,16,0,214,
-1,2029,725,1,2030,
-731,1,2031,736,1,
-2032,741,1,2033,746,
-1,277,2832,16,0,
-214,1,2035,752,1,
-2037,757,1,2039,762,
-1,32,2833,16,0,
-214,1,2041,768,1,
-2293,2834,16,0,214,
-1,2043,774,1,2045,
-779,1,41,2835,16,
-0,214,1,1297,2836,
-16,0,214,1,43,
-2837,16,0,214,1,
-1803,787,1,1804,2838,
-16,0,214,1,299,
-2839,16,0,214,1,
-52,2840,16,0,214,
-1,2318,2841,16,0,
-214,1,2075,2842,16,
-0,214,1,1574,799,
-1,71,2843,16,0,
-214,1,76,2844,16,
-0,214,1,1834,2845,
-16,0,214,1,2337,
-2846,16,0,214,1,
-79,2847,16,0,214,
-1,1335,2848,16,0,
-214,1,322,2849,16,
-0,214,1,85,2850,
-16,0,214,1,89,
-2851,16,0,214,1,
-346,2852,16,0,214,
-1,2105,814,1,2106,
-2853,16,0,214,1,
-97,2854,16,0,214,
-1,1860,821,1,2364,
-827,1,102,2855,16,
-0,214,1,112,2856,
-16,0,214,1,1117,
-2857,16,0,214,1,
-1873,835,1,1876,2858,
-16,0,214,1,124,
-2859,16,0,214,1,
-2136,842,1,381,2860,
-16,0,214,1,525,
-2861,16,0,214,1,
-137,2862,16,0,214,
-1,1901,2863,16,0,
-214,1,2658,2864,16,
-0,214,1,1153,2865,
-16,0,214,1,151,
-2866,16,0,214,1,
-1407,2867,16,0,214,
-1,1659,2868,16,0,
-214,1,2413,2869,16,
-0,214,1,406,2870,
-16,0,214,1,1371,
-2871,16,0,214,1,
-166,2872,16,0,214,
-1,1622,2873,16,0,
-214,1,1931,861,1,
-1933,2874,16,0,214,
-1,431,2875,16,0,
-214,1,1585,2876,16,
-0,214,1,182,2877,
-16,0,214,1,1189,
-2878,16,0,214,1,
-1443,2879,16,0,214,
-1,1695,2880,16,0,
-214,1,2198,2881,16,
-0,214,1,447,2882,
-16,0,214,1,2458,
-876,1,2459,882,1,
-1958,2883,16,0,214,
-1,2462,889,1,1657,
-894,1,2464,899,1,
-199,2884,16,0,214,
-1,459,2885,16,0,
-214,1,462,2886,16,
-0,214,1,217,2887,
-16,0,214,1,2227,
-908,1,1225,2888,16,
-0,214,1,1479,2889,
-16,0,214,1,1731,
-2890,16,0,214,1,
-1989,916,1,1990,2891,
-16,0,214,1,236,
-2892,16,0,214,1,
-1756,2893,16,0,214,
-1,37,2894,19,233,
-1,37,2895,5,94,
-1,256,2896,16,0,
-231,1,1261,2897,16,
-0,231,1,509,2898,
-16,0,231,1,1515,
-2899,16,0,231,1,
-2021,718,1,1775,2900,
-16,0,231,1,2029,
-725,1,2030,731,1,
-2031,736,1,2032,741,
-1,2033,746,1,277,
-2901,16,0,231,1,
-2035,752,1,2037,757,
-1,2039,762,1,32,
-2902,16,0,231,1,
-2041,768,1,2293,2903,
-16,0,231,1,2043,
-774,1,2045,779,1,
-41,2904,16,0,231,
-1,1297,2905,16,0,
-231,1,43,2906,16,
-0,231,1,1803,787,
-1,1804,2907,16,0,
-231,1,299,2908,16,
-0,231,1,52,2909,
-16,0,231,1,2318,
-2910,16,0,231,1,
-2075,2911,16,0,231,
-1,1574,799,1,71,
-2912,16,0,231,1,
-76,2913,16,0,231,
-1,1834,2914,16,0,
-231,1,2337,2915,16,
-0,231,1,79,2916,
-16,0,231,1,1335,
-2917,16,0,231,1,
-322,2918,16,0,231,
-1,85,2919,16,0,
-231,1,89,2920,16,
-0,231,1,346,2921,
-16,0,231,1,2105,
-814,1,2106,2922,16,
-0,231,1,97,2923,
-16,0,231,1,1860,
-821,1,2364,827,1,
-102,2924,16,0,231,
-1,112,2925,16,0,
-231,1,1117,2926,16,
-0,231,1,1873,835,
-1,1876,2927,16,0,
-231,1,124,2928,16,
-0,231,1,2136,842,
-1,381,2929,16,0,
-231,1,525,2930,16,
-0,231,1,137,2931,
-16,0,231,1,1901,
-2932,16,0,231,1,
-2658,2933,16,0,231,
-1,1153,2934,16,0,
-231,1,151,2935,16,
-0,231,1,1407,2936,
-16,0,231,1,1659,
-2937,16,0,231,1,
-2413,2938,16,0,231,
-1,406,2939,16,0,
-231,1,1371,2940,16,
-0,231,1,166,2941,
-16,0,231,1,1622,
-2942,16,0,231,1,
-1931,861,1,1933,2943,
-16,0,231,1,431,
-2944,16,0,231,1,
-1585,2945,16,0,231,
-1,182,2946,16,0,
-231,1,1189,2947,16,
-0,231,1,1443,2948,
-16,0,231,1,1695,
-2949,16,0,231,1,
-2198,2950,16,0,231,
-1,447,2951,16,0,
-231,1,2458,876,1,
-2459,882,1,1958,2952,
-16,0,231,1,2462,
-889,1,1657,894,1,
-2464,899,1,199,2953,
-16,0,231,1,459,
-2954,16,0,231,1,
-462,2955,16,0,231,
-1,217,2956,16,0,
-231,1,2227,908,1,
-1225,2957,16,0,231,
-1,1479,2958,16,0,
-231,1,1731,2959,16,
-0,231,1,1989,916,
-1,1990,2960,16,0,
-231,1,236,2961,16,
-0,231,1,1756,2962,
-16,0,231,1,38,
-2963,19,230,1,38,
-2964,5,84,1,1011,
-1102,1,1012,2965,16,
-0,228,1,1013,1258,
-1,262,1119,1,1267,
-2966,16,0,228,1,
-515,2967,16,0,228,
-1,1521,2968,16,0,
-228,1,525,1216,1,
-283,1172,1,2299,2969,
-16,0,228,1,42,
-2970,16,0,228,1,
-40,1177,1,44,1183,
-1,47,1184,1,1303,
-2971,16,0,228,1,
-1555,2972,16,0,228,
-1,50,1201,1,48,
-1190,1,49,1196,1,
-51,1206,1,63,1222,
-1,305,1211,1,66,
-1228,1,67,1233,1,
-68,1238,1,69,1243,
-1,70,1248,1,73,
-2973,16,0,228,1,
-74,1253,1,328,1302,
-1,1048,1344,1,82,
-2974,16,0,228,1,
-1840,2975,16,0,228,
-1,1591,2976,16,0,
-228,1,1341,2977,16,
-0,228,1,1096,1312,
-1,93,1318,1,352,
-1349,1,107,2978,16,
-0,228,1,1114,1343,
-1,118,1355,1,1123,
-2979,16,0,228,1,
-371,1365,1,1628,2980,
-16,0,228,1,375,
-1376,1,1882,2981,16,
-0,228,1,377,1381,
-1,379,1386,1,380,
-1391,1,883,1397,1,
-373,1409,1,130,1414,
-1,143,1419,1,387,
-2982,16,0,228,1,
-2664,2983,16,0,228,
-1,1159,2984,16,0,
-228,1,157,1443,1,
-1413,2985,16,0,228,
-1,1665,2986,16,0,
-228,1,412,2987,16,
-0,228,1,1377,2988,
-16,0,228,1,172,
-1469,1,1939,2989,16,
-0,228,1,437,2990,
-16,0,228,1,188,
-1518,1,942,1490,1,
-1195,2991,16,0,228,
-1,1449,2992,16,0,
-228,1,1701,2993,16,
-0,228,1,447,1511,
-1,205,1523,1,827,
-1331,1,223,1533,1,
-476,1543,1,477,1549,
-1,1231,2994,16,0,
-228,1,479,1559,1,
-480,1564,1,1485,2995,
-16,0,228,1,1737,
-2996,16,0,228,1,
-242,1578,1,478,1583,
-1,1001,1588,1,1002,
-1593,1,39,2997,19,
-222,1,39,2998,5,
-84,1,1011,1102,1,
-1012,2999,16,0,220,
-1,1013,1258,1,262,
-1119,1,1267,3000,16,
-0,220,1,515,3001,
-16,0,220,1,1521,
-3002,16,0,220,1,
-525,1216,1,283,1172,
-1,2299,3003,16,0,
-220,1,42,3004,16,
-0,220,1,40,1177,
-1,44,1183,1,47,
-1184,1,1303,3005,16,
-0,220,1,1555,3006,
-16,0,220,1,50,
-1201,1,48,1190,1,
-49,1196,1,51,1206,
-1,63,1222,1,305,
-1211,1,66,1228,1,
-67,1233,1,68,1238,
-1,69,1243,1,70,
-1248,1,73,3007,16,
-0,220,1,74,1253,
-1,328,1302,1,1048,
-1344,1,82,3008,16,
-0,220,1,1840,3009,
-16,0,220,1,1591,
-3010,16,0,220,1,
-1341,3011,16,0,220,
-1,1096,1312,1,93,
-1318,1,352,1349,1,
-107,3012,16,0,220,
-1,1114,1343,1,118,
-1355,1,1123,3013,16,
-0,220,1,371,1365,
-1,1628,3014,16,0,
-220,1,375,1376,1,
-1882,3015,16,0,220,
-1,377,1381,1,379,
-1386,1,380,1391,1,
-883,1397,1,373,1409,
-1,130,1414,1,143,
-1419,1,387,3016,16,
-0,220,1,2664,3017,
-16,0,220,1,1159,
-3018,16,0,220,1,
-157,1443,1,1413,3019,
-16,0,220,1,1665,
-3020,16,0,220,1,
-412,3021,16,0,220,
-1,1377,3022,16,0,
-220,1,172,1469,1,
-1939,3023,16,0,220,
-1,437,3024,16,0,
-220,1,188,1518,1,
-942,1490,1,1195,3025,
-16,0,220,1,1449,
-3026,16,0,220,1,
-1701,3027,16,0,220,
-1,447,1511,1,205,
-1523,1,827,1331,1,
-223,1533,1,476,1543,
-1,477,1549,1,1231,
-3028,16,0,220,1,
-479,1559,1,480,1564,
-1,1485,3029,16,0,
-220,1,1737,3030,16,
-0,220,1,242,1578,
-1,478,1583,1,1001,
-1588,1,1002,1593,1,
-40,3031,19,210,1,
-40,3032,5,84,1,
-1011,1102,1,1012,3033,
-16,0,208,1,1013,
-1258,1,262,1119,1,
-1267,3034,16,0,208,
-1,515,3035,16,0,
-208,1,1521,3036,16,
-0,208,1,525,1216,
-1,283,1172,1,2299,
-3037,16,0,208,1,
-42,3038,16,0,208,
-1,40,1177,1,44,
-1183,1,47,1184,1,
-1303,3039,16,0,208,
-1,1555,3040,16,0,
-208,1,50,1201,1,
-48,1190,1,49,1196,
-1,51,1206,1,63,
-1222,1,305,1211,1,
-66,1228,1,67,1233,
-1,68,1238,1,69,
-1243,1,70,1248,1,
-73,3041,16,0,208,
-1,74,1253,1,328,
-1302,1,1048,1344,1,
-82,3042,16,0,208,
-1,1840,3043,16,0,
-208,1,1591,3044,16,
-0,208,1,1341,3045,
-16,0,208,1,1096,
-1312,1,93,1318,1,
-352,1349,1,107,3046,
-16,0,208,1,1114,
-1343,1,118,3047,16,
-0,208,1,1123,3048,
-16,0,208,1,371,
-1365,1,1628,3049,16,
-0,208,1,375,1376,
-1,1882,3050,16,0,
-208,1,377,1381,1,
-379,1386,1,380,1391,
-1,883,3051,16,0,
-208,1,373,1409,1,
-130,3052,16,0,208,
-1,143,3053,16,0,
-208,1,387,3054,16,
-0,208,1,2664,3055,
-16,0,208,1,1159,
-3056,16,0,208,1,
-157,3057,16,0,208,
-1,1413,3058,16,0,
-208,1,1665,3059,16,
-0,208,1,412,3060,
-16,0,208,1,1377,
-3061,16,0,208,1,
-172,3062,16,0,208,
-1,1939,3063,16,0,
-208,1,437,3064,16,
-0,208,1,188,3065,
-16,0,208,1,942,
-1490,1,1195,3066,16,
-0,208,1,1449,3067,
-16,0,208,1,1701,
-3068,16,0,208,1,
-447,1511,1,205,3069,
-16,0,208,1,827,
-3070,16,0,208,1,
-223,3071,16,0,208,
-1,476,1543,1,477,
-1549,1,1231,3072,16,
-0,208,1,479,1559,
-1,480,1564,1,1485,
-3073,16,0,208,1,
-1737,3074,16,0,208,
-1,242,3075,16,0,
-208,1,478,1583,1,
-1001,1588,1,1002,1593,
-1,41,3076,19,172,
-1,41,3077,5,84,
-1,1011,1102,1,1012,
-3078,16,0,170,1,
-1013,1258,1,262,1119,
-1,1267,3079,16,0,
-170,1,515,3080,16,
-0,170,1,1521,3081,
-16,0,170,1,525,
-1216,1,283,1172,1,
-2299,3082,16,0,170,
-1,42,3083,16,0,
-170,1,40,1177,1,
-44,1183,1,47,1184,
-1,1303,3084,16,0,
-170,1,1555,3085,16,
-0,170,1,50,1201,
-1,48,1190,1,49,
-1196,1,51,1206,1,
-63,1222,1,305,1211,
-1,66,1228,1,67,
-1233,1,68,1238,1,
-69,1243,1,70,1248,
-1,73,3086,16,0,
-170,1,74,1253,1,
-328,1302,1,1048,1344,
-1,82,3087,16,0,
-170,1,1840,3088,16,
-0,170,1,1591,3089,
-16,0,170,1,1341,
-3090,16,0,170,1,
-1096,1312,1,93,1318,
-1,352,1349,1,107,
-3091,16,0,170,1,
-1114,1343,1,118,3092,
-16,0,170,1,1123,
-3093,16,0,170,1,
-371,1365,1,1628,3094,
-16,0,170,1,375,
-1376,1,1882,3095,16,
-0,170,1,377,1381,
-1,379,1386,1,380,
-1391,1,883,3096,16,
-0,170,1,373,1409,
-1,130,3097,16,0,
-170,1,143,3098,16,
-0,170,1,387,3099,
-16,0,170,1,2664,
-3100,16,0,170,1,
-1159,3101,16,0,170,
-1,157,3102,16,0,
-170,1,1413,3103,16,
-0,170,1,1665,3104,
-16,0,170,1,412,
-3105,16,0,170,1,
-1377,3106,16,0,170,
-1,172,3107,16,0,
-170,1,1939,3108,16,
-0,170,1,437,3109,
-16,0,170,1,188,
-3110,16,0,170,1,
-942,1490,1,1195,3111,
-16,0,170,1,1449,
-3112,16,0,170,1,
-1701,3113,16,0,170,
-1,447,1511,1,205,
-3114,16,0,170,1,
-827,3115,16,0,170,
-1,223,3116,16,0,
-170,1,476,1543,1,
-477,1549,1,1231,3117,
-16,0,170,1,479,
-1559,1,480,1564,1,
-1485,3118,16,0,170,
-1,1737,3119,16,0,
-170,1,242,3120,16,
-0,170,1,478,1583,
-1,1001,1588,1,1002,
-1593,1,42,3121,19,
-394,1,42,3122,5,
-38,1,1901,3123,16,
-0,392,1,2075,3124,
-16,0,392,1,1860,
-821,1,1803,787,1,
-1804,3125,16,0,392,
-1,2413,3126,16,0,
-392,1,2198,3127,16,
-0,392,1,1873,835,
-1,1657,894,1,1989,
-916,1,1990,3128,16,
-0,392,1,1775,3129,
-16,0,392,1,32,
-3130,16,0,392,1,
-2105,814,1,2106,3131,
-16,0,392,1,2364,
-827,1,2227,908,1,
-2337,3132,16,0,392,
-1,2021,718,1,2458,
-876,1,2459,882,1,
-2462,889,1,2136,842,
-1,2464,899,1,2029,
-725,1,2030,731,1,
-2031,736,1,2032,741,
-1,2033,746,1,2035,
-752,1,2037,757,1,
-2039,762,1,1931,861,
-1,2041,768,1,2043,
-774,1,2045,779,1,
-1574,799,1,1958,3133,
-16,0,392,1,43,
-3134,19,453,1,43,
-3135,5,25,1,2035,
-752,1,2037,757,1,
-2039,762,1,2041,768,
-1,2227,908,1,2043,
-774,1,1657,894,1,
-1860,821,1,2136,842,
-1,2021,718,1,2459,
-882,1,1574,799,1,
-2105,3136,16,0,578,
-1,1931,861,1,1873,
-835,1,2031,736,1,
-1803,787,1,1989,3137,
-16,0,451,1,2464,
-899,1,2029,725,1,
-2030,731,1,2364,827,
-1,2032,741,1,2033,
-746,1,2045,779,1,
-44,3138,19,264,1,
-44,3139,5,38,1,
-1901,3140,16,0,262,
-1,2075,3141,16,0,
-262,1,1860,821,1,
-1803,787,1,1804,3142,
-16,0,262,1,2413,
-3143,16,0,262,1,
-2198,3144,16,0,262,
-1,1873,835,1,1657,
-894,1,1989,916,1,
-1990,3145,16,0,262,
-1,1775,3146,16,0,
-262,1,32,3147,16,
-0,262,1,2105,814,
-1,2106,3148,16,0,
-262,1,2364,827,1,
-2227,908,1,2337,3149,
-16,0,262,1,2021,
-718,1,2458,876,1,
-2459,882,1,2462,889,
-1,2136,842,1,2464,
-899,1,2029,725,1,
-2030,731,1,2031,736,
-1,2032,741,1,2033,
-746,1,2035,752,1,
-2037,757,1,2039,762,
-1,1931,861,1,2041,
-768,1,2043,774,1,
-2045,779,1,1574,799,
-1,1958,3150,16,0,
-262,1,45,3151,19,
-287,1,45,3152,5,
-39,1,1901,3153,16,
-0,315,1,2075,3154,
-16,0,315,1,1860,
-821,1,1803,787,1,
-1804,3155,16,0,315,
-1,2413,3156,16,0,
-315,1,2198,3157,16,
-0,315,1,1873,835,
-1,1657,894,1,1989,
-916,1,1990,3158,16,
-0,315,1,1775,3159,
-16,0,315,1,32,
-3160,16,0,315,1,
-2105,814,1,2106,3161,
-16,0,315,1,2364,
-827,1,2227,908,1,
-2337,3162,16,0,315,
-1,2021,718,1,2458,
-876,1,2459,882,1,
-2462,889,1,2136,842,
-1,2464,899,1,2029,
-725,1,2030,731,1,
-2031,736,1,2032,741,
-1,2033,746,1,2035,
-752,1,2037,757,1,
-2039,762,1,1931,861,
-1,2041,768,1,2043,
-774,1,2045,779,1,
-1832,3163,16,0,285,
-1,1574,799,1,1958,
-3164,16,0,315,1,
-46,3165,19,671,1,
-46,3166,5,38,1,
-1901,3167,16,0,669,
-1,2075,3168,16,0,
-669,1,1860,821,1,
-1803,787,1,1804,3169,
-16,0,669,1,2413,
-3170,16,0,669,1,
-2198,3171,16,0,669,
-1,1873,835,1,1657,
-894,1,1989,916,1,
-1990,3172,16,0,669,
-1,1775,3173,16,0,
-669,1,32,3174,16,
-0,669,1,2105,814,
-1,2106,3175,16,0,
-669,1,2364,827,1,
-2227,908,1,2337,3176,
-16,0,669,1,2021,
-718,1,2458,876,1,
-2459,882,1,2462,889,
-1,2136,842,1,2464,
-899,1,2029,725,1,
-2030,731,1,2031,736,
-1,2032,741,1,2033,
-746,1,2035,752,1,
-2037,757,1,2039,762,
-1,1931,861,1,2041,
-768,1,2043,774,1,
-2045,779,1,1574,799,
-1,1958,3177,16,0,
-669,1,47,3178,19,
-466,1,47,3179,5,
-19,1,0,3180,16,
-0,464,1,2706,3181,
-16,0,464,1,2634,
-691,1,2636,3182,16,
-0,464,1,2639,707,
-1,2714,3183,17,3184,
-15,3185,4,36,37,
-0,71,0,108,0,
-111,0,98,0,97,
-0,108,0,68,0,
-101,0,102,0,105,
-0,110,0,105,0,
-116,0,105,0,111,
-0,110,0,115,0,
-1,-1,1,5,3186,
-20,3187,4,38,71,
+2015,22,1,145,1,
+1514,1118,1,9,1123,
+1,10,1672,1,262,
+1129,1,1267,1135,1,
+481,1714,1,1521,1140,
+1,1773,2016,16,0,
+247,1,19,1157,1,
+20,2017,16,0,158,
+1,2281,1164,1,525,
+1226,1,30,1676,1,
+283,1182,1,1010,2018,
+16,0,609,1,40,
+1187,1,41,1681,1,
+42,1685,1,44,1193,
+1,1260,1106,1,47,
+1194,1,1303,1317,1,
+49,1206,1,50,1211,
+1,48,1200,1,305,
+1221,1,51,1216,1,
+61,2019,16,0,204,
+1,63,1232,1,66,
+1238,1,67,1243,1,
+1478,1463,1,69,1253,
+1,70,1258,1,68,
+1248,1,73,2020,16,
+0,214,1,74,1263,
+1,1013,1268,1,2335,
+2021,16,0,249,1,
+328,1312,1,1048,1354,
+1,2511,1668,1,82,
+1290,1,1840,2022,16,
+0,312,1,1341,1307,
+1,2520,2023,16,0,
+451,1,1096,1322,1,
+93,1328,1,1550,1333,
+1,352,1359,1,1011,
+1112,1,107,1348,1,
+1114,1353,1,1871,2024,
+16,0,322,1,1370,
+1593,1,118,1365,1,
+1123,1370,1,1332,1273,
+1,1377,1381,1,375,
+1386,1,1882,2025,16,
+0,335,1,377,1391,
+1,827,1341,1,380,
+1401,1,130,1424,1,
+2074,2026,16,0,565,
+1,371,1375,1,373,
+1419,1,1012,2027,16,
+0,611,1,379,1396,
+1,143,1429,1,2654,
+1692,1,1152,1435,1,
+1406,1440,1,2663,2028,
+16,0,670,1,1159,
+1447,1,157,1452,1,
+1413,1457,1,883,1407,
+1,1094,2029,16,0,
+677,1,1296,1177,1,
+172,1470,1,1665,1475,
+1,1939,2030,16,0,
+448,1,1188,1480,1,
+1442,1485,1,188,1519,
+1,942,1491,1,1195,
+1497,1,1449,1502,1,
+1701,1507,1,447,1512,
+1,205,1524,1,2467,
+1701,1,464,1707,1,
+2197,2031,16,0,674,
+1,1224,1534,1,223,
+1539,1,1730,1544,1,
+476,1549,1,477,1555,
+1,1231,1560,1,479,
+1565,1,480,1570,1,
+1485,1576,1,459,1712,
+1,242,1583,1,478,
+1588,1,2506,2032,16,
+0,442,1,1001,1598,
+1,1002,1603,1,18,
+2033,19,500,1,18,
+2034,5,84,1,1011,
+1112,1,1012,2035,16,
+0,498,1,1013,1268,
+1,262,1129,1,1267,
+2036,16,0,498,1,
+515,2037,16,0,498,
+1,1521,2038,16,0,
+498,1,525,1226,1,
+283,1182,1,2299,2039,
+16,0,498,1,42,
+2040,16,0,498,1,
+40,1187,1,44,1193,
+1,47,1194,1,1303,
+2041,16,0,498,1,
+1555,2042,16,0,498,
+1,50,1211,1,48,
+1200,1,49,1206,1,
+51,1216,1,63,1232,
+1,305,1221,1,66,
+1238,1,67,1243,1,
+68,1248,1,69,1253,
+1,70,1258,1,73,
+2043,16,0,498,1,
+74,1263,1,328,1312,
+1,1048,2044,16,0,
+498,1,82,2045,16,
+0,498,1,1840,2046,
+16,0,498,1,1591,
+2047,16,0,498,1,
+1341,2048,16,0,498,
+1,1096,1322,1,93,
+1328,1,352,1359,1,
+107,2049,16,0,498,
+1,1114,1353,1,118,
+2050,16,0,498,1,
+1123,2051,16,0,498,
+1,371,1375,1,1628,
+2052,16,0,498,1,
+375,1386,1,1882,2053,
+16,0,498,1,377,
+1391,1,379,1396,1,
+380,1401,1,883,2054,
+16,0,498,1,373,
+1419,1,130,2055,16,
+0,498,1,143,2056,
+16,0,498,1,387,
+2057,16,0,498,1,
+1159,2058,16,0,498,
+1,157,2059,16,0,
+498,1,1413,2060,16,
+0,498,1,1665,2061,
+16,0,498,1,412,
+2062,16,0,498,1,
+2676,2063,16,0,498,
+1,1377,2064,16,0,
+498,1,172,2065,16,
+0,498,1,1939,2066,
+16,0,498,1,437,
+2067,16,0,498,1,
+188,2068,16,0,498,
+1,942,2069,16,0,
+498,1,1195,2070,16,
+0,498,1,1449,2071,
+16,0,498,1,1701,
+2072,16,0,498,1,
+447,1512,1,205,2073,
+16,0,498,1,827,
+2074,16,0,498,1,
+223,2075,16,0,498,
+1,476,1549,1,477,
+1555,1,1231,2076,16,
+0,498,1,479,1565,
+1,480,1570,1,1485,
+2077,16,0,498,1,
+1737,2078,16,0,498,
+1,242,2079,16,0,
+498,1,478,1588,1,
+1001,1598,1,1002,1603,
+1,19,2080,19,235,
+1,19,2081,5,176,
+1,2676,2082,16,0,
+469,1,256,2083,16,
+0,233,1,1261,2084,
+16,0,233,1,1011,
+1112,1,1012,2085,16,
+0,469,1,2458,885,
+1,262,1129,1,1267,
+2086,16,0,469,1,
+2021,728,1,1521,2087,
+16,0,469,1,1775,
+2088,16,0,233,1,
+2029,735,1,2030,741,
+1,2031,746,1,2032,
+751,1,2033,756,1,
+277,2089,16,0,233,
+1,2035,762,1,2037,
+767,1,2039,772,1,
+32,2090,16,0,233,
+1,2464,908,1,2293,
+2091,16,0,233,1,
+2043,784,1,2045,789,
+1,2299,2092,16,0,
+469,1,41,2093,16,
+0,233,1,42,2094,
+16,0,469,1,40,
+1187,1,44,1193,1,
+43,2095,16,0,233,
+1,1804,2096,16,0,
+233,1,48,1200,1,
+49,1206,1,47,1194,
+1,51,1216,1,52,
+2097,16,0,233,1,
+50,1211,1,305,1221,
+1,1096,1322,1,1515,
+2098,16,0,233,1,
+2318,2099,16,0,233,
+1,283,1182,1,63,
+1232,1,66,1238,1,
+67,1243,1,68,1248,
+1,69,1253,1,70,
+1258,1,71,2100,16,
+0,233,1,73,2101,
+16,0,469,1,74,
+1263,1,1013,1268,1,
+76,2102,16,0,233,
+1,1834,2103,16,0,
+233,1,2337,2104,16,
+0,233,1,79,2105,
+16,0,233,1,1335,
+2106,16,0,233,1,
+299,2107,16,0,233,
+1,82,2108,16,0,
+469,1,1840,2109,16,
+0,469,1,1297,2110,
+16,0,233,1,85,
+2111,16,0,233,1,
+1341,2112,16,0,469,
+1,89,2113,16,0,
+233,1,1303,2114,16,
+0,469,1,509,2115,
+16,0,233,1,93,
+1328,1,322,2116,16,
+0,233,1,97,2117,
+16,0,233,1,2041,
+778,1,1555,2118,16,
+0,469,1,827,2119,
+16,0,469,1,102,
+2120,16,0,233,1,
+1860,831,1,1803,797,
+1,2364,837,1,107,
+2121,16,0,469,1,
+1114,1353,1,112,2122,
+16,0,233,1,1117,
+2123,16,0,233,1,
+352,1359,1,1873,845,
+1,118,2124,16,0,
+469,1,1123,2125,16,
+0,469,1,371,1375,
+1,515,2126,16,0,
+469,1,1377,2127,16,
+0,469,1,124,2128,
+16,0,233,1,1882,
+2129,16,0,469,1,
+377,1391,1,379,1396,
+1,380,1401,1,130,
+2130,16,0,469,1,
+346,2131,16,0,233,
+1,2075,2132,16,0,
+233,1,373,1419,1,
+387,2133,16,0,469,
+1,137,2134,16,0,
+233,1,143,2135,16,
+0,469,1,1901,2136,
+16,0,233,1,1048,
+2137,16,0,469,1,
+1153,2138,16,0,233,
+1,375,1386,1,151,
+2139,16,0,233,1,
+1407,2140,16,0,233,
+1,1659,2141,16,0,
+233,1,2413,2142,16,
+0,233,1,1159,2143,
+16,0,469,1,381,
+2144,16,0,233,1,
+157,2145,16,0,469,
+1,1413,2146,16,0,
+469,1,883,2147,16,
+0,469,1,1371,2148,
+16,0,233,1,328,
+1312,1,2105,824,1,
+2106,2149,16,0,233,
+1,166,2150,16,0,
+233,1,525,2151,16,
+0,233,1,1622,2152,
+16,0,233,1,406,
+2153,16,0,233,1,
+1574,809,1,172,2154,
+16,0,469,1,1931,
+870,1,412,2155,16,
+0,469,1,1933,2156,
+16,0,233,1,1876,
+2157,16,0,233,1,
+431,2158,16,0,233,
+1,1585,2159,16,0,
+233,1,182,2160,16,
+0,233,1,1628,2161,
+16,0,469,1,1189,
+2162,16,0,233,1,
+437,2163,16,0,469,
+1,1591,2164,16,0,
+469,1,188,2165,16,
+0,469,1,1695,2166,
+16,0,233,1,2198,
+2167,16,0,233,1,
+1195,2168,16,0,469,
+1,1449,2169,16,0,
+469,1,1701,2170,16,
+0,469,1,447,2171,
+16,0,233,1,199,
+2172,16,0,233,1,
+2459,891,1,1958,2173,
+16,0,233,1,2462,
+898,1,1657,903,1,
+205,2174,16,0,469,
+1,459,2175,16,0,
+233,1,462,2176,16,
+0,233,1,1665,2177,
+16,0,469,1,217,
+2178,16,0,233,1,
+2227,917,1,942,2179,
+16,0,469,1,1225,
+2180,16,0,233,1,
+223,2181,16,0,469,
+1,1479,2182,16,0,
+233,1,1731,2183,16,
+0,233,1,477,1555,
+1,1231,2184,16,0,
+469,1,479,1565,1,
+480,1570,1,1485,2185,
+16,0,469,1,1737,
+2186,16,0,469,1,
+1989,925,1,1990,2187,
+16,0,233,1,1443,
+2188,16,0,233,1,
+236,2189,16,0,233,
+1,2136,852,1,476,
+1549,1,242,2190,16,
+0,469,1,478,1588,
+1,1939,2191,16,0,
+469,1,2670,2192,16,
+0,233,1,1001,1598,
+1,1002,1603,1,1756,
+2193,16,0,233,1,
+20,2194,19,458,1,
+20,2195,5,84,1,
+1011,1112,1,1012,2196,
+16,0,456,1,1013,
+1268,1,262,1129,1,
+1267,2197,16,0,456,
+1,515,2198,16,0,
+456,1,1521,2199,16,
+0,456,1,525,1226,
+1,283,1182,1,2299,
+2200,16,0,456,1,
+42,2201,16,0,456,
+1,40,1187,1,44,
+1193,1,47,1194,1,
+1303,2202,16,0,456,
+1,1555,2203,16,0,
+456,1,50,1211,1,
+48,1200,1,49,1206,
+1,51,1216,1,63,
+1232,1,305,1221,1,
+66,1238,1,67,1243,
+1,68,1248,1,69,
+1253,1,70,1258,1,
+73,2204,16,0,456,
+1,74,1263,1,328,
+2205,16,0,456,1,
+1048,2206,16,0,456,
+1,82,2207,16,0,
+456,1,1840,2208,16,
+0,456,1,1591,2209,
+16,0,456,1,1341,
+2210,16,0,456,1,
+1096,1322,1,93,1328,
+1,352,2211,16,0,
+456,1,107,2212,16,
+0,456,1,1114,1353,
+1,118,2213,16,0,
+456,1,1123,2214,16,
+0,456,1,371,1375,
+1,1628,2215,16,0,
+456,1,375,1386,1,
+1882,2216,16,0,456,
+1,377,1391,1,379,
+1396,1,380,1401,1,
+883,2217,16,0,456,
+1,373,1419,1,130,
+2218,16,0,456,1,
+143,2219,16,0,456,
+1,387,2220,16,0,
+456,1,1159,2221,16,
+0,456,1,157,2222,
+16,0,456,1,1413,
+2223,16,0,456,1,
+1665,2224,16,0,456,
+1,412,2225,16,0,
+456,1,2676,2226,16,
+0,456,1,1377,2227,
+16,0,456,1,172,
+2228,16,0,456,1,
+1939,2229,16,0,456,
+1,437,2230,16,0,
+456,1,188,2231,16,
+0,456,1,942,2232,
+16,0,456,1,1195,
+2233,16,0,456,1,
+1449,2234,16,0,456,
+1,1701,2235,16,0,
+456,1,447,1512,1,
+205,2236,16,0,456,
+1,827,2237,16,0,
+456,1,223,2238,16,
+0,456,1,476,1549,
+1,477,1555,1,1231,
+2239,16,0,456,1,
+479,1565,1,480,1570,
+1,1485,2240,16,0,
+456,1,1737,2241,16,
+0,456,1,242,2242,
+16,0,456,1,478,
+1588,1,1001,1598,1,
+1002,1603,1,21,2243,
+19,440,1,21,2244,
+5,84,1,1011,1112,
+1,1012,2245,16,0,
+438,1,1013,1268,1,
+262,1129,1,1267,2246,
+16,0,438,1,515,
+2247,16,0,438,1,
+1521,2248,16,0,438,
+1,525,1226,1,283,
+1182,1,2299,2249,16,
+0,438,1,42,2250,
+16,0,438,1,40,
+1187,1,44,1193,1,
+47,1194,1,1303,2251,
+16,0,438,1,1555,
+2252,16,0,438,1,
+50,1211,1,48,1200,
+1,49,1206,1,51,
+1216,1,63,1232,1,
+305,1221,1,66,1238,
+1,67,1243,1,68,
+1248,1,69,1253,1,
+70,1258,1,73,2253,
+16,0,438,1,74,
+1263,1,328,2254,16,
+0,438,1,1048,2255,
+16,0,438,1,82,
+2256,16,0,438,1,
+1840,2257,16,0,438,
+1,1591,2258,16,0,
+438,1,1341,2259,16,
+0,438,1,1096,1322,
+1,93,1328,1,352,
+2260,16,0,438,1,
+107,2261,16,0,438,
+1,1114,1353,1,118,
+2262,16,0,438,1,
+1123,2263,16,0,438,
+1,371,1375,1,1628,
+2264,16,0,438,1,
+375,1386,1,1882,2265,
+16,0,438,1,377,
+1391,1,379,1396,1,
+380,1401,1,883,2266,
+16,0,438,1,373,
+1419,1,130,2267,16,
+0,438,1,143,2268,
+16,0,438,1,387,
+2269,16,0,438,1,
+1159,2270,16,0,438,
+1,157,2271,16,0,
+438,1,1413,2272,16,
+0,438,1,1665,2273,
+16,0,438,1,412,
+2274,16,0,438,1,
+2676,2275,16,0,438,
+1,1377,2276,16,0,
+438,1,172,2277,16,
+0,438,1,1939,2278,
+16,0,438,1,437,
+2279,16,0,438,1,
+188,2280,16,0,438,
+1,942,2281,16,0,
+438,1,1195,2282,16,
+0,438,1,1449,2283,
+16,0,438,1,1701,
+2284,16,0,438,1,
+447,1512,1,205,2285,
+16,0,438,1,827,
+2286,16,0,438,1,
+223,2287,16,0,438,
+1,476,1549,1,477,
+1555,1,1231,2288,16,
+0,438,1,479,1565,
+1,480,1570,1,1485,
+2289,16,0,438,1,
+1737,2290,16,0,438,
+1,242,2291,16,0,
+438,1,478,1588,1,
+1001,1598,1,1002,1603,
+1,22,2292,19,391,
+1,22,2293,5,84,
+1,1011,1112,1,1012,
+2294,16,0,389,1,
+1013,1268,1,262,1129,
+1,1267,2295,16,0,
+389,1,515,2296,16,
+0,389,1,1521,2297,
+16,0,389,1,525,
+1226,1,283,1182,1,
+2299,2298,16,0,389,
+1,42,2299,16,0,
+389,1,40,1187,1,
+44,1193,1,47,1194,
+1,1303,2300,16,0,
+389,1,1555,2301,16,
+0,389,1,50,1211,
+1,48,1200,1,49,
+1206,1,51,1216,1,
+63,1232,1,305,1221,
+1,66,1238,1,67,
+1243,1,68,1248,1,
+69,1253,1,70,1258,
+1,73,2302,16,0,
+389,1,74,1263,1,
+328,2303,16,0,389,
+1,1048,2304,16,0,
+389,1,82,2305,16,
+0,389,1,1840,2306,
+16,0,389,1,1591,
+2307,16,0,389,1,
+1341,2308,16,0,389,
+1,1096,1322,1,93,
+1328,1,352,2309,16,
+0,389,1,107,2310,
+16,0,389,1,1114,
+1353,1,118,2311,16,
+0,389,1,1123,2312,
+16,0,389,1,371,
+1375,1,1628,2313,16,
+0,389,1,375,1386,
+1,1882,2314,16,0,
+389,1,377,1391,1,
+379,1396,1,380,1401,
+1,883,2315,16,0,
+389,1,373,1419,1,
+130,2316,16,0,389,
+1,143,2317,16,0,
+389,1,387,2318,16,
+0,389,1,1159,2319,
+16,0,389,1,157,
+2320,16,0,389,1,
+1413,2321,16,0,389,
+1,1665,2322,16,0,
+389,1,412,2323,16,
+0,389,1,2676,2324,
+16,0,389,1,1377,
+2325,16,0,389,1,
+172,2326,16,0,389,
+1,1939,2327,16,0,
+389,1,437,2328,16,
+0,389,1,188,2329,
+16,0,389,1,942,
+2330,16,0,389,1,
+1195,2331,16,0,389,
+1,1449,2332,16,0,
+389,1,1701,2333,16,
+0,389,1,447,1512,
+1,205,2334,16,0,
+389,1,827,2335,16,
+0,389,1,223,2336,
+16,0,389,1,476,
+1549,1,477,1555,1,
+1231,2337,16,0,389,
+1,479,1565,1,480,
+1570,1,1485,2338,16,
+0,389,1,1737,2339,
+16,0,389,1,242,
+2340,16,0,389,1,
+478,1588,1,1001,1598,
+1,1002,1603,1,23,
+2341,19,514,1,23,
+2342,5,38,1,1901,
+2343,16,0,512,1,
+2075,2344,16,0,512,
+1,1860,831,1,1803,
+797,1,1804,2345,16,
+0,512,1,2413,2346,
+16,0,512,1,2198,
+2347,16,0,512,1,
+1873,845,1,1657,903,
+1,1989,925,1,1990,
+2348,16,0,512,1,
+1775,2349,16,0,512,
+1,32,2350,16,0,
+512,1,2105,824,1,
+2106,2351,16,0,512,
+1,2364,837,1,2227,
+917,1,2337,2352,16,
+0,512,1,2021,728,
+1,2458,885,1,2459,
+891,1,2462,898,1,
+2136,852,1,2464,908,
+1,2029,735,1,2030,
+741,1,2031,746,1,
+2032,751,1,2033,756,
+1,2035,762,1,2037,
+767,1,2039,772,1,
+1931,870,1,2041,778,
+1,2043,784,1,2045,
+789,1,1574,809,1,
+1958,2353,16,0,512,
+1,24,2354,19,186,
+1,24,2355,5,5,
+1,44,2356,16,0,
+184,1,377,2357,16,
+0,550,1,40,2358,
+16,0,684,1,63,
+2359,16,0,206,1,
+373,2360,16,0,546,
+1,25,2361,19,300,
+1,25,2362,5,177,
+1,2676,2363,16,0,
+298,1,256,2364,16,
+0,555,1,1261,2365,
+16,0,555,1,1011,
+1112,1,1012,2366,16,
+0,298,1,2458,885,
+1,262,1129,1,1267,
+2367,16,0,298,1,
+2021,728,1,1521,2368,
+16,0,298,1,1775,
+2369,16,0,555,1,
+2029,735,1,2030,741,
+1,2031,746,1,2032,
+751,1,2033,756,1,
+277,2370,16,0,555,
+1,2035,762,1,2037,
+767,1,2039,772,1,
+32,2371,16,0,555,
+1,2464,908,1,2293,
+2372,16,0,555,1,
+2043,784,1,2045,789,
+1,2299,2373,16,0,
+298,1,41,2374,16,
+0,555,1,42,2375,
+16,0,298,1,40,
+1187,1,44,1193,1,
+43,2376,16,0,555,
+1,1804,2377,16,0,
+555,1,48,1200,1,
+49,1206,1,47,1194,
+1,51,1216,1,52,
+2378,16,0,555,1,
+50,1211,1,305,1221,
+1,1096,1322,1,1515,
+2379,16,0,555,1,
+2318,2380,16,0,555,
+1,62,2381,16,0,
+555,1,63,1232,1,
+66,1238,1,67,1243,
+1,68,1248,1,69,
+1253,1,70,1258,1,
+71,2382,16,0,555,
+1,283,1182,1,73,
+2383,16,0,298,1,
+74,1263,1,1013,1268,
+1,76,2384,16,0,
+555,1,1834,2385,16,
+0,555,1,2337,2386,
+16,0,555,1,79,
+2387,16,0,555,1,
+1335,2388,16,0,555,
+1,299,2389,16,0,
+555,1,82,2390,16,
+0,298,1,1840,2391,
+16,0,298,1,1297,
+2392,16,0,555,1,
+85,2393,16,0,555,
+1,1341,2394,16,0,
+298,1,89,2395,16,
+0,555,1,1303,2396,
+16,0,298,1,509,
+2397,16,0,555,1,
+93,1328,1,322,2398,
+16,0,555,1,97,
+2399,16,0,555,1,
+2041,778,1,1555,2400,
+16,0,298,1,827,
+2401,16,0,298,1,
+102,2402,16,0,555,
+1,1860,831,1,1803,
+797,1,2364,837,1,
+107,2403,16,0,298,
+1,1114,1353,1,112,
+2404,16,0,555,1,
+1117,2405,16,0,555,
+1,352,1359,1,1873,
+845,1,118,1365,1,
+1123,2406,16,0,298,
+1,371,1375,1,515,
+2407,16,0,298,1,
+1377,2408,16,0,298,
+1,124,2409,16,0,
+555,1,1882,2410,16,
+0,298,1,377,1391,
+1,379,1396,1,380,
+1401,1,130,1424,1,
+346,2411,16,0,555,
+1,2075,2412,16,0,
+555,1,373,1419,1,
+387,2413,16,0,298,
+1,137,2414,16,0,
+555,1,143,2415,16,
+0,298,1,1901,2416,
+16,0,555,1,1048,
+1354,1,1153,2417,16,
+0,555,1,375,1386,
+1,151,2418,16,0,
+555,1,1407,2419,16,
+0,555,1,1659,2420,
+16,0,555,1,2413,
+2421,16,0,555,1,
+1159,2422,16,0,298,
+1,381,2423,16,0,
+555,1,157,2424,16,
+0,298,1,1413,2425,
+16,0,298,1,883,
+2426,16,0,298,1,
+1371,2427,16,0,555,
+1,328,1312,1,2105,
+824,1,2106,2428,16,
+0,555,1,166,2429,
+16,0,555,1,525,
+2430,16,0,555,1,
+1622,2431,16,0,555,
+1,406,2432,16,0,
+555,1,1574,809,1,
+172,1470,1,1931,870,
+1,412,2433,16,0,
+298,1,1933,2434,16,
+0,555,1,1876,2435,
+16,0,555,1,431,
+2436,16,0,555,1,
+1585,2437,16,0,555,
+1,182,2438,16,0,
+555,1,1628,2439,16,
+0,298,1,1189,2440,
+16,0,555,1,437,
+2441,16,0,298,1,
+1591,2442,16,0,298,
+1,188,1519,1,1695,
+2443,16,0,555,1,
+2198,2444,16,0,555,
+1,1195,2445,16,0,
+298,1,1449,2446,16,
+0,298,1,1701,2447,
+16,0,298,1,447,
+2448,16,0,555,1,
+199,2449,16,0,555,
+1,2459,891,1,1958,
+2450,16,0,555,1,
+2462,898,1,1657,903,
+1,205,2451,16,0,
+298,1,459,2452,16,
+0,555,1,462,2453,
+16,0,555,1,1665,
+2454,16,0,298,1,
+217,2455,16,0,555,
+1,2227,917,1,942,
+1491,1,1225,2456,16,
+0,555,1,223,2457,
+16,0,298,1,1479,
+2458,16,0,555,1,
+1731,2459,16,0,555,
+1,477,1555,1,1231,
+2460,16,0,298,1,
+479,1565,1,480,1570,
+1,1485,2461,16,0,
+298,1,1737,2462,16,
+0,298,1,1989,925,
+1,1990,2463,16,0,
+555,1,1443,2464,16,
+0,555,1,236,2465,
+16,0,555,1,2136,
+852,1,476,1549,1,
+242,2466,16,0,298,
+1,478,1588,1,1939,
+2467,16,0,298,1,
+2670,2468,16,0,555,
+1,1001,1598,1,1002,
+1603,1,1756,2469,16,
+0,555,1,26,2470,
+19,317,1,26,2471,
+5,84,1,1011,1112,
+1,1012,2472,16,0,
+315,1,1013,1268,1,
+262,1129,1,1267,2473,
+16,0,315,1,515,
+2474,16,0,672,1,
+1521,2475,16,0,315,
+1,525,1226,1,283,
+1182,1,2299,2476,16,
+0,315,1,42,2477,
+16,0,315,1,40,
+1187,1,44,1193,1,
+47,1194,1,1303,2478,
+16,0,315,1,1555,
+2479,16,0,315,1,
+50,1211,1,48,1200,
+1,49,1206,1,51,
+1216,1,63,1232,1,
+305,1221,1,66,1238,
+1,67,1243,1,68,
+1248,1,69,1253,1,
+70,1258,1,73,2480,
+16,0,315,1,74,
+1263,1,328,1312,1,
+1048,1354,1,82,2481,
+16,0,315,1,1840,
+2482,16,0,315,1,
+1591,2483,16,0,315,
+1,1341,2484,16,0,
+315,1,1096,1322,1,
+93,1328,1,352,1359,
+1,107,2485,16,0,
+315,1,1114,1353,1,
+118,1365,1,1123,2486,
+16,0,315,1,371,
+1375,1,1628,2487,16,
+0,315,1,375,1386,
+1,1882,2488,16,0,
+315,1,377,1391,1,
+379,1396,1,380,1401,
+1,883,2489,16,0,
+315,1,373,1419,1,
+130,1424,1,143,2490,
+16,0,315,1,387,
+2491,16,0,315,1,
+1159,2492,16,0,315,
+1,157,2493,16,0,
+315,1,1413,2494,16,
+0,315,1,1665,2495,
+16,0,315,1,412,
+2496,16,0,315,1,
+2676,2497,16,0,315,
+1,1377,2498,16,0,
+315,1,172,1470,1,
+1939,2499,16,0,315,
+1,437,2500,16,0,
+605,1,188,1519,1,
+942,1491,1,1195,2501,
+16,0,315,1,1449,
+2502,16,0,315,1,
+1701,2503,16,0,315,
+1,447,1512,1,205,
+2504,16,0,315,1,
+827,2505,16,0,315,
+1,223,2506,16,0,
+315,1,476,1549,1,
+477,1555,1,1231,2507,
+16,0,315,1,479,
+1565,1,480,1570,1,
+1485,2508,16,0,315,
+1,1737,2509,16,0,
+315,1,242,2510,16,
+0,315,1,478,1588,
+1,1001,1598,1,1002,
+1603,1,27,2511,19,
+614,1,27,2512,5,
+95,1,256,2513,16,
+0,612,1,1261,2514,
+16,0,612,1,509,
+2515,16,0,612,1,
+1515,2516,16,0,612,
+1,2021,728,1,1775,
+2517,16,0,612,1,
+2029,735,1,2030,741,
+1,2031,746,1,2032,
+751,1,2033,756,1,
+277,2518,16,0,612,
+1,2035,762,1,2037,
+767,1,2039,772,1,
+32,2519,16,0,612,
+1,2041,778,1,2293,
+2520,16,0,612,1,
+2043,784,1,2045,789,
+1,41,2521,16,0,
+612,1,1297,2522,16,
+0,612,1,43,2523,
+16,0,612,1,1803,
+797,1,1804,2524,16,
+0,612,1,299,2525,
+16,0,612,1,52,
+2526,16,0,612,1,
+2318,2527,16,0,612,
+1,62,2528,16,0,
+612,1,2075,2529,16,
+0,612,1,1574,809,
+1,71,2530,16,0,
+612,1,76,2531,16,
+0,612,1,1834,2532,
+16,0,612,1,2337,
+2533,16,0,612,1,
+79,2534,16,0,612,
+1,1335,2535,16,0,
+612,1,322,2536,16,
+0,612,1,85,2537,
+16,0,612,1,89,
+2538,16,0,612,1,
+346,2539,16,0,612,
+1,2105,824,1,2106,
+2540,16,0,612,1,
+97,2541,16,0,612,
+1,1860,831,1,2364,
+837,1,102,2542,16,
+0,612,1,112,2543,
+16,0,612,1,1117,
+2544,16,0,612,1,
+1873,845,1,1876,2545,
+16,0,612,1,124,
+2546,16,0,612,1,
+2136,852,1,381,2547,
+16,0,612,1,525,
+2548,16,0,612,1,
+137,2549,16,0,612,
+1,1901,2550,16,0,
+612,1,1153,2551,16,
+0,612,1,151,2552,
+16,0,612,1,1407,
+2553,16,0,612,1,
+1659,2554,16,0,612,
+1,2413,2555,16,0,
+612,1,406,2556,16,
+0,612,1,1371,2557,
+16,0,612,1,166,
+2558,16,0,612,1,
+1622,2559,16,0,612,
+1,1931,870,1,1933,
+2560,16,0,612,1,
+431,2561,16,0,612,
+1,1585,2562,16,0,
+612,1,182,2563,16,
+0,612,1,1189,2564,
+16,0,612,1,1443,
+2565,16,0,612,1,
+1695,2566,16,0,612,
+1,2198,2567,16,0,
+612,1,447,2568,16,
+0,612,1,2458,885,
+1,2459,891,1,1958,
+2569,16,0,612,1,
+2462,898,1,1657,903,
+1,2464,908,1,199,
+2570,16,0,612,1,
+459,2571,16,0,612,
+1,462,2572,16,0,
+612,1,217,2573,16,
+0,612,1,2227,917,
+1,1225,2574,16,0,
+612,1,1479,2575,16,
+0,612,1,1731,2576,
+16,0,612,1,1989,
+925,1,1990,2577,16,
+0,612,1,236,2578,
+16,0,612,1,2670,
+2579,16,0,612,1,
+1756,2580,16,0,612,
+1,28,2581,19,642,
+1,28,2582,5,60,
+1,328,1312,1,223,
+1539,1,1096,1322,1,
+118,1365,1,883,1407,
+1,525,1226,1,1001,
+1598,1,130,1424,1,
+459,1712,1,1114,1353,
+1,352,1359,1,447,
+1512,1,464,1707,1,
+1011,1112,1,1013,1268,
+1,242,1583,1,143,
+1429,1,40,1187,1,
+41,1681,1,42,1685,
+1,479,1565,1,44,
+1193,1,481,1714,1,
+373,1419,1,47,1194,
+1,157,1452,1,49,
+1206,1,50,1211,1,
+48,1200,1,379,1396,
+1,380,1401,1,51,
+1216,1,476,1549,1,
+371,1375,1,478,1588,
+1,1048,1354,1,375,
+1386,1,172,1470,1,
+262,1129,1,283,1182,
+1,63,1232,1,67,
+1243,1,68,1248,1,
+69,1253,1,66,1238,
+1,461,2583,16,0,
+640,1,74,1263,1,
+377,1391,1,1002,1603,
+1,70,1258,1,188,
+1519,1,82,1290,1,
+305,1221,1,477,1555,
+1,827,1341,1,93,
+1328,1,480,1570,1,
+205,1524,1,942,1491,
+1,107,1348,1,29,
+2584,19,289,1,29,
+2585,5,84,1,1011,
+1112,1,1012,2586,16,
+0,287,1,1013,1268,
+1,262,1129,1,1267,
+2587,16,0,287,1,
+515,2588,16,0,287,
+1,1521,2589,16,0,
+287,1,525,1226,1,
+283,1182,1,2299,2590,
+16,0,287,1,42,
+2591,16,0,287,1,
+40,1187,1,44,1193,
+1,47,1194,1,1303,
+2592,16,0,287,1,
+1555,2593,16,0,287,
+1,50,1211,1,48,
+1200,1,49,1206,1,
+51,1216,1,63,1232,
+1,305,1221,1,66,
+1238,1,67,1243,1,
+68,1248,1,69,1253,
+1,70,1258,1,73,
+2594,16,0,287,1,
+74,1263,1,328,1312,
+1,1048,1354,1,82,
+2595,16,0,287,1,
+1840,2596,16,0,287,
+1,1591,2597,16,0,
+287,1,1341,2598,16,
+0,287,1,1096,1322,
+1,93,1328,1,352,
+1359,1,107,2599,16,
+0,287,1,1114,1353,
+1,118,1365,1,1123,
+2600,16,0,287,1,
+371,1375,1,1628,2601,
+16,0,287,1,375,
+1386,1,1882,2602,16,
+0,287,1,377,1391,
+1,379,1396,1,380,
+1401,1,883,2603,16,
+0,287,1,373,1419,
+1,130,1424,1,143,
+1429,1,387,2604,16,
+0,287,1,1159,2605,
+16,0,287,1,157,
+1452,1,1413,2606,16,
+0,287,1,1665,2607,
+16,0,287,1,412,
+2608,16,0,287,1,
+2676,2609,16,0,287,
+1,1377,2610,16,0,
+287,1,172,1470,1,
+1939,2611,16,0,287,
+1,437,2612,16,0,
+287,1,188,1519,1,
+942,1491,1,1195,2613,
+16,0,287,1,1449,
+2614,16,0,287,1,
+1701,2615,16,0,287,
+1,447,1512,1,205,
+2616,16,0,287,1,
+827,2617,16,0,287,
+1,223,2618,16,0,
+287,1,476,1549,1,
+477,1555,1,1231,2619,
+16,0,287,1,479,
+1565,1,480,1570,1,
+1485,2620,16,0,287,
+1,1737,2621,16,0,
+287,1,242,2622,16,
+0,287,1,478,1588,
+1,1001,1598,1,1002,
+1603,1,30,2623,19,
+277,1,30,2624,5,
+84,1,1011,1112,1,
+1012,2625,16,0,275,
+1,1013,1268,1,262,
+1129,1,1267,2626,16,
+0,275,1,515,2627,
+16,0,275,1,1521,
+2628,16,0,275,1,
+525,1226,1,283,1182,
+1,2299,2629,16,0,
+275,1,42,2630,16,
+0,275,1,40,1187,
+1,44,1193,1,47,
+1194,1,1303,2631,16,
+0,275,1,1555,2632,
+16,0,275,1,50,
+1211,1,48,1200,1,
+49,1206,1,51,1216,
+1,63,1232,1,305,
+1221,1,66,1238,1,
+67,1243,1,68,1248,
+1,69,1253,1,70,
+1258,1,73,2633,16,
+0,275,1,74,1263,
+1,328,1312,1,1048,
+1354,1,82,2634,16,
+0,275,1,1840,2635,
+16,0,275,1,1591,
+2636,16,0,275,1,
+1341,2637,16,0,275,
+1,1096,1322,1,93,
+1328,1,352,1359,1,
+107,2638,16,0,275,
+1,1114,1353,1,118,
+1365,1,1123,2639,16,
+0,275,1,371,1375,
+1,1628,2640,16,0,
+275,1,375,1386,1,
+1882,2641,16,0,275,
+1,377,1391,1,379,
+1396,1,380,1401,1,
+883,2642,16,0,275,
+1,373,1419,1,130,
+1424,1,143,1429,1,
+387,2643,16,0,275,
+1,1159,2644,16,0,
+275,1,157,1452,1,
+1413,2645,16,0,275,
+1,1665,2646,16,0,
+275,1,412,2647,16,
+0,275,1,2676,2648,
+16,0,275,1,1377,
+2649,16,0,275,1,
+172,1470,1,1939,2650,
+16,0,275,1,437,
+2651,16,0,275,1,
+188,1519,1,942,1491,
+1,1195,2652,16,0,
+275,1,1449,2653,16,
+0,275,1,1701,2654,
+16,0,275,1,447,
+1512,1,205,2655,16,
+0,275,1,827,2656,
+16,0,275,1,223,
+2657,16,0,275,1,
+476,1549,1,477,1555,
+1,1231,2658,16,0,
+275,1,479,1565,1,
+480,1570,1,1485,2659,
+16,0,275,1,1737,
+2660,16,0,275,1,
+242,2661,16,0,275,
+1,478,1588,1,1001,
+1598,1,1002,1603,1,
+31,2662,19,266,1,
+31,2663,5,84,1,
+1011,1112,1,1012,2664,
+16,0,264,1,1013,
+1268,1,262,1129,1,
+1267,2665,16,0,264,
+1,515,2666,16,0,
+264,1,1521,2667,16,
+0,264,1,525,1226,
+1,283,1182,1,2299,
+2668,16,0,264,1,
+42,2669,16,0,264,
+1,40,1187,1,44,
+1193,1,47,1194,1,
+1303,2670,16,0,264,
+1,1555,2671,16,0,
+264,1,50,1211,1,
+48,1200,1,49,1206,
+1,51,1216,1,63,
+1232,1,305,1221,1,
+66,1238,1,67,1243,
+1,68,1248,1,69,
+1253,1,70,1258,1,
+73,2672,16,0,264,
+1,74,1263,1,328,
+1312,1,1048,1354,1,
+82,2673,16,0,264,
+1,1840,2674,16,0,
+264,1,1591,2675,16,
+0,264,1,1341,2676,
+16,0,264,1,1096,
+1322,1,93,1328,1,
+352,1359,1,107,2677,
+16,0,264,1,1114,
+1353,1,118,1365,1,
+1123,2678,16,0,264,
+1,371,1375,1,1628,
+2679,16,0,264,1,
+375,1386,1,1882,2680,
+16,0,264,1,377,
+1391,1,379,1396,1,
+380,1401,1,883,2681,
+16,0,264,1,373,
+1419,1,130,1424,1,
+143,2682,16,0,264,
+1,387,2683,16,0,
+264,1,1159,2684,16,
+0,264,1,157,2685,
+16,0,264,1,1413,
+2686,16,0,264,1,
+1665,2687,16,0,264,
+1,412,2688,16,0,
+264,1,2676,2689,16,
+0,264,1,1377,2690,
+16,0,264,1,172,
+1470,1,1939,2691,16,
+0,264,1,437,2692,
+16,0,264,1,188,
+1519,1,942,1491,1,
+1195,2693,16,0,264,
+1,1449,2694,16,0,
+264,1,1701,2695,16,
+0,264,1,447,1512,
+1,205,2696,16,0,
+264,1,827,2697,16,
+0,264,1,223,2698,
+16,0,264,1,476,
+1549,1,477,1555,1,
+1231,2699,16,0,264,
+1,479,1565,1,480,
+1570,1,1485,2700,16,
+0,264,1,1737,2701,
+16,0,264,1,242,
+2702,16,0,264,1,
+478,1588,1,1001,1598,
+1,1002,1603,1,32,
+2703,19,256,1,32,
+2704,5,84,1,1011,
+1112,1,1012,2705,16,
+0,254,1,1013,1268,
+1,262,1129,1,1267,
+2706,16,0,254,1,
+515,2707,16,0,254,
+1,1521,2708,16,0,
+254,1,525,1226,1,
+283,1182,1,2299,2709,
+16,0,254,1,42,
+2710,16,0,254,1,
+40,1187,1,44,1193,
+1,47,1194,1,1303,
+2711,16,0,254,1,
+1555,2712,16,0,254,
+1,50,1211,1,48,
+1200,1,49,1206,1,
+51,1216,1,63,1232,
+1,305,1221,1,66,
+1238,1,67,1243,1,
+68,1248,1,69,1253,
+1,70,1258,1,73,
+2713,16,0,254,1,
+74,1263,1,328,1312,
+1,1048,1354,1,82,
+2714,16,0,254,1,
+1840,2715,16,0,254,
+1,1591,2716,16,0,
+254,1,1341,2717,16,
+0,254,1,1096,1322,
+1,93,1328,1,352,
+1359,1,107,2718,16,
+0,254,1,1114,1353,
+1,118,1365,1,1123,
+2719,16,0,254,1,
+371,1375,1,1628,2720,
+16,0,254,1,375,
+1386,1,1882,2721,16,
+0,254,1,377,1391,
+1,379,1396,1,380,
+1401,1,883,2722,16,
+0,254,1,373,1419,
+1,130,1424,1,143,
+2723,16,0,254,1,
+387,2724,16,0,254,
+1,1159,2725,16,0,
+254,1,157,2726,16,
+0,254,1,1413,2727,
+16,0,254,1,1665,
+2728,16,0,254,1,
+412,2729,16,0,254,
+1,2676,2730,16,0,
+254,1,1377,2731,16,
+0,254,1,172,1470,
+1,1939,2732,16,0,
+254,1,437,2733,16,
+0,254,1,188,1519,
+1,942,1491,1,1195,
+2734,16,0,254,1,
+1449,2735,16,0,254,
+1,1701,2736,16,0,
+254,1,447,1512,1,
+205,2737,16,0,254,
+1,827,2738,16,0,
+254,1,223,2739,16,
+0,254,1,476,1549,
+1,477,1555,1,1231,
+2740,16,0,254,1,
+479,1565,1,480,1570,
+1,1485,2741,16,0,
+254,1,1737,2742,16,
+0,254,1,242,2743,
+16,0,254,1,478,
+1588,1,1001,1598,1,
+1002,1603,1,33,2744,
+19,340,1,33,2745,
+5,84,1,1011,1112,
+1,1012,2746,16,0,
+338,1,1013,1268,1,
+262,1129,1,1267,2747,
+16,0,338,1,515,
+2748,16,0,338,1,
+1521,2749,16,0,338,
+1,525,1226,1,283,
+1182,1,2299,2750,16,
+0,338,1,42,2751,
+16,0,338,1,40,
+1187,1,44,1193,1,
+47,1194,1,1303,2752,
+16,0,338,1,1555,
+2753,16,0,338,1,
+50,1211,1,48,1200,
+1,49,1206,1,51,
+1216,1,63,1232,1,
+305,1221,1,66,1238,
+1,67,1243,1,68,
+1248,1,69,1253,1,
+70,1258,1,73,2754,
+16,0,338,1,74,
+1263,1,328,1312,1,
+1048,1354,1,82,2755,
+16,0,338,1,1840,
+2756,16,0,338,1,
+1591,2757,16,0,338,
+1,1341,2758,16,0,
+338,1,1096,1322,1,
+93,1328,1,352,1359,
+1,107,2759,16,0,
+338,1,1114,1353,1,
+118,1365,1,1123,2760,
+16,0,338,1,371,
+1375,1,1628,2761,16,
+0,338,1,375,1386,
+1,1882,2762,16,0,
+338,1,377,1391,1,
+379,1396,1,380,1401,
+1,883,2763,16,0,
+338,1,373,1419,1,
+130,1424,1,143,1429,
+1,387,2764,16,0,
+338,1,1159,2765,16,
+0,338,1,157,1452,
+1,1413,2766,16,0,
+338,1,1665,2767,16,
+0,338,1,412,2768,
+16,0,338,1,2676,
+2769,16,0,338,1,
+1377,2770,16,0,338,
+1,172,1470,1,1939,
+2771,16,0,338,1,
+437,2772,16,0,338,
+1,188,1519,1,942,
+1491,1,1195,2773,16,
+0,338,1,1449,2774,
+16,0,338,1,1701,
+2775,16,0,338,1,
+447,1512,1,205,2776,
+16,0,338,1,827,
+2777,16,0,338,1,
+223,2778,16,0,338,
+1,476,1549,1,477,
+1555,1,1231,2779,16,
+0,338,1,479,1565,
+1,480,1570,1,1485,
+2780,16,0,338,1,
+1737,2781,16,0,338,
+1,242,1583,1,478,
+1588,1,1001,1598,1,
+1002,1603,1,34,2782,
+19,330,1,34,2783,
+5,84,1,1011,1112,
+1,1012,2784,16,0,
+328,1,1013,1268,1,
+262,1129,1,1267,2785,
+16,0,328,1,515,
+2786,16,0,328,1,
+1521,2787,16,0,328,
+1,525,1226,1,283,
+1182,1,2299,2788,16,
+0,328,1,42,2789,
+16,0,328,1,40,
+1187,1,44,1193,1,
+47,1194,1,1303,2790,
+16,0,328,1,1555,
+2791,16,0,328,1,
+50,1211,1,48,1200,
+1,49,1206,1,51,
+1216,1,63,1232,1,
+305,1221,1,66,1238,
+1,67,1243,1,68,
+1248,1,69,1253,1,
+70,1258,1,73,2792,
+16,0,328,1,74,
+1263,1,328,1312,1,
+1048,1354,1,82,2793,
+16,0,328,1,1840,
+2794,16,0,328,1,
+1591,2795,16,0,328,
+1,1341,2796,16,0,
+328,1,1096,1322,1,
+93,1328,1,352,1359,
+1,107,2797,16,0,
+328,1,1114,1353,1,
+118,1365,1,1123,2798,
+16,0,328,1,371,
+1375,1,1628,2799,16,
+0,328,1,375,1386,
+1,1882,2800,16,0,
+328,1,377,1391,1,
+379,1396,1,380,1401,
+1,883,2801,16,0,
+328,1,373,1419,1,
+130,1424,1,143,1429,
+1,387,2802,16,0,
+328,1,1159,2803,16,
+0,328,1,157,1452,
+1,1413,2804,16,0,
+328,1,1665,2805,16,
+0,328,1,412,2806,
+16,0,328,1,2676,
+2807,16,0,328,1,
+1377,2808,16,0,328,
+1,172,1470,1,1939,
+2809,16,0,328,1,
+437,2810,16,0,328,
+1,188,1519,1,942,
+1491,1,1195,2811,16,
+0,328,1,1449,2812,
+16,0,328,1,1701,
+2813,16,0,328,1,
+447,1512,1,205,1524,
+1,827,2814,16,0,
+328,1,223,1539,1,
+476,1549,1,477,1555,
+1,1231,2815,16,0,
+328,1,479,1565,1,
+480,1570,1,1485,2816,
+16,0,328,1,1737,
+2817,16,0,328,1,
+242,1583,1,478,1588,
+1,1001,1598,1,1002,
+1603,1,35,2818,19,
+320,1,35,2819,5,
+84,1,1011,1112,1,
+1012,2820,16,0,318,
+1,1013,1268,1,262,
+1129,1,1267,2821,16,
+0,318,1,515,2822,
+16,0,318,1,1521,
+2823,16,0,318,1,
+525,1226,1,283,1182,
+1,2299,2824,16,0,
+318,1,42,2825,16,
+0,318,1,40,1187,
+1,44,1193,1,47,
+1194,1,1303,2826,16,
+0,318,1,1555,2827,
+16,0,318,1,50,
+1211,1,48,1200,1,
+49,1206,1,51,1216,
+1,63,1232,1,305,
+1221,1,66,1238,1,
+67,1243,1,68,1248,
+1,69,1253,1,70,
+1258,1,73,2828,16,
+0,318,1,74,1263,
+1,328,1312,1,1048,
+1354,1,82,2829,16,
+0,318,1,1840,2830,
+16,0,318,1,1591,
+2831,16,0,318,1,
+1341,2832,16,0,318,
+1,1096,1322,1,93,
+1328,1,352,1359,1,
+107,2833,16,0,318,
+1,1114,1353,1,118,
+1365,1,1123,2834,16,
+0,318,1,371,1375,
+1,1628,2835,16,0,
+318,1,375,1386,1,
+1882,2836,16,0,318,
+1,377,1391,1,379,
+1396,1,380,1401,1,
+883,2837,16,0,318,
+1,373,1419,1,130,
+1424,1,143,1429,1,
+387,2838,16,0,318,
+1,1159,2839,16,0,
+318,1,157,1452,1,
+1413,2840,16,0,318,
+1,1665,2841,16,0,
+318,1,412,2842,16,
+0,318,1,2676,2843,
+16,0,318,1,1377,
+2844,16,0,318,1,
+172,1470,1,1939,2845,
+16,0,318,1,437,
+2846,16,0,318,1,
+188,1519,1,942,1491,
+1,1195,2847,16,0,
+318,1,1449,2848,16,
+0,318,1,1701,2849,
+16,0,318,1,447,
+1512,1,205,1524,1,
+827,2850,16,0,318,
+1,223,2851,16,0,
+318,1,476,1549,1,
+477,1555,1,1231,2852,
+16,0,318,1,479,
+1565,1,480,1570,1,
+1485,2853,16,0,318,
+1,1737,2854,16,0,
+318,1,242,1583,1,
+478,1588,1,1001,1598,
+1,1002,1603,1,36,
+2855,19,226,1,36,
+2856,5,94,1,256,
+2857,16,0,224,1,
+1261,2858,16,0,224,
+1,509,2859,16,0,
+224,1,1515,2860,16,
+0,224,1,2021,728,
+1,1775,2861,16,0,
+224,1,2029,735,1,
+2030,741,1,2031,746,
+1,2032,751,1,2033,
+756,1,277,2862,16,
+0,224,1,2035,762,
+1,2037,767,1,2039,
+772,1,32,2863,16,
+0,224,1,2041,778,
+1,2293,2864,16,0,
+224,1,2043,784,1,
+2045,789,1,41,2865,
+16,0,224,1,1297,
+2866,16,0,224,1,
+43,2867,16,0,224,
+1,1803,797,1,1804,
+2868,16,0,224,1,
+299,2869,16,0,224,
+1,52,2870,16,0,
+224,1,2318,2871,16,
+0,224,1,2075,2872,
+16,0,224,1,1574,
+809,1,71,2873,16,
+0,224,1,76,2874,
+16,0,224,1,1834,
+2875,16,0,224,1,
+2337,2876,16,0,224,
+1,79,2877,16,0,
+224,1,1335,2878,16,
+0,224,1,322,2879,
+16,0,224,1,85,
+2880,16,0,224,1,
+89,2881,16,0,224,
+1,346,2882,16,0,
+224,1,2105,824,1,
+2106,2883,16,0,224,
+1,97,2884,16,0,
+224,1,1860,831,1,
+2364,837,1,102,2885,
+16,0,224,1,112,
+2886,16,0,224,1,
+1117,2887,16,0,224,
+1,1873,845,1,1876,
+2888,16,0,224,1,
+124,2889,16,0,224,
+1,2136,852,1,381,
+2890,16,0,224,1,
+525,2891,16,0,224,
+1,137,2892,16,0,
+224,1,1901,2893,16,
+0,224,1,1153,2894,
+16,0,224,1,151,
+2895,16,0,224,1,
+1407,2896,16,0,224,
+1,1659,2897,16,0,
+224,1,2413,2898,16,
+0,224,1,406,2899,
+16,0,224,1,2670,
+2900,16,0,224,1,
+1657,903,1,166,2901,
+16,0,224,1,1622,
+2902,16,0,224,1,
+1931,870,1,1933,2903,
+16,0,224,1,431,
+2904,16,0,224,1,
+1585,2905,16,0,224,
+1,182,2906,16,0,
+224,1,1189,2907,16,
+0,224,1,1443,2908,
+16,0,224,1,1695,
+2909,16,0,224,1,
+2198,2910,16,0,224,
+1,447,2911,16,0,
+224,1,2458,885,1,
+2459,891,1,1958,2912,
+16,0,224,1,2462,
+898,1,1371,2913,16,
+0,224,1,2464,908,
+1,199,2914,16,0,
+224,1,459,2915,16,
+0,224,1,462,2916,
+16,0,224,1,217,
+2917,16,0,224,1,
+2227,917,1,1225,2918,
+16,0,224,1,1479,
+2919,16,0,224,1,
+1731,2920,16,0,224,
+1,1989,925,1,1990,
+2921,16,0,224,1,
+236,2922,16,0,224,
+1,1756,2923,16,0,
+224,1,37,2924,19,
+246,1,37,2925,5,
+94,1,256,2926,16,
+0,244,1,1261,2927,
+16,0,244,1,509,
+2928,16,0,244,1,
+1515,2929,16,0,244,
+1,2021,728,1,1775,
+2930,16,0,244,1,
+2029,735,1,2030,741,
+1,2031,746,1,2032,
+751,1,2033,756,1,
+277,2931,16,0,244,
+1,2035,762,1,2037,
+767,1,2039,772,1,
+32,2932,16,0,244,
+1,2041,778,1,2293,
+2933,16,0,244,1,
+2043,784,1,2045,789,
+1,41,2934,16,0,
+244,1,1297,2935,16,
+0,244,1,43,2936,
+16,0,244,1,1803,
+797,1,1804,2937,16,
+0,244,1,299,2938,
+16,0,244,1,52,
+2939,16,0,244,1,
+2318,2940,16,0,244,
+1,2075,2941,16,0,
+244,1,1574,809,1,
+71,2942,16,0,244,
+1,76,2943,16,0,
+244,1,1834,2944,16,
+0,244,1,2337,2945,
+16,0,244,1,79,
+2946,16,0,244,1,
+1335,2947,16,0,244,
+1,322,2948,16,0,
+244,1,85,2949,16,
+0,244,1,89,2950,
+16,0,244,1,346,
+2951,16,0,244,1,
+2105,824,1,2106,2952,
+16,0,244,1,97,
+2953,16,0,244,1,
+1860,831,1,2364,837,
+1,102,2954,16,0,
+244,1,112,2955,16,
+0,244,1,1117,2956,
+16,0,244,1,1873,
+845,1,1876,2957,16,
+0,244,1,124,2958,
+16,0,244,1,2136,
+852,1,381,2959,16,
+0,244,1,525,2960,
+16,0,244,1,137,
+2961,16,0,244,1,
+1901,2962,16,0,244,
+1,1153,2963,16,0,
+244,1,151,2964,16,
+0,244,1,1407,2965,
+16,0,244,1,1659,
+2966,16,0,244,1,
+2413,2967,16,0,244,
+1,406,2968,16,0,
+244,1,2670,2969,16,
+0,244,1,1657,903,
+1,166,2970,16,0,
+244,1,1622,2971,16,
+0,244,1,1931,870,
+1,1933,2972,16,0,
+244,1,431,2973,16,
+0,244,1,1585,2974,
+16,0,244,1,182,
+2975,16,0,244,1,
+1189,2976,16,0,244,
+1,1443,2977,16,0,
+244,1,1695,2978,16,
+0,244,1,2198,2979,
+16,0,244,1,447,
+2980,16,0,244,1,
+2458,885,1,2459,891,
+1,1958,2981,16,0,
+244,1,2462,898,1,
+1371,2982,16,0,244,
+1,2464,908,1,199,
+2983,16,0,244,1,
+459,2984,16,0,244,
+1,462,2985,16,0,
+244,1,217,2986,16,
+0,244,1,2227,917,
+1,1225,2987,16,0,
+244,1,1479,2988,16,
+0,244,1,1731,2989,
+16,0,244,1,1989,
+925,1,1990,2990,16,
+0,244,1,236,2991,
+16,0,244,1,1756,
+2992,16,0,244,1,
+38,2993,19,243,1,
+38,2994,5,84,1,
+1011,1112,1,1012,2995,
+16,0,241,1,1013,
+1268,1,262,1129,1,
+1267,2996,16,0,241,
+1,515,2997,16,0,
+241,1,1521,2998,16,
+0,241,1,525,1226,
+1,283,1182,1,2299,
+2999,16,0,241,1,
+42,3000,16,0,241,
+1,40,1187,1,44,
+1193,1,47,1194,1,
+1303,3001,16,0,241,
+1,1555,3002,16,0,
+241,1,50,1211,1,
+48,1200,1,49,1206,
+1,51,1216,1,63,
+1232,1,305,1221,1,
+66,1238,1,67,1243,
+1,68,1248,1,69,
+1253,1,70,1258,1,
+73,3003,16,0,241,
+1,74,1263,1,328,
+1312,1,1048,1354,1,
+82,3004,16,0,241,
+1,1840,3005,16,0,
+241,1,1591,3006,16,
+0,241,1,1341,3007,
+16,0,241,1,1096,
+1322,1,93,1328,1,
+352,1359,1,107,3008,
+16,0,241,1,1114,
+1353,1,118,1365,1,
+1123,3009,16,0,241,
+1,371,1375,1,1628,
+3010,16,0,241,1,
+375,1386,1,1882,3011,
+16,0,241,1,377,
+1391,1,379,1396,1,
+380,1401,1,883,1407,
+1,373,1419,1,130,
+1424,1,143,1429,1,
+387,3012,16,0,241,
+1,1159,3013,16,0,
+241,1,157,1452,1,
+1413,3014,16,0,241,
+1,1665,3015,16,0,
+241,1,412,3016,16,
+0,241,1,2676,3017,
+16,0,241,1,1377,
+3018,16,0,241,1,
+172,1470,1,1939,3019,
+16,0,241,1,437,
+3020,16,0,241,1,
+188,1519,1,942,1491,
+1,1195,3021,16,0,
+241,1,1449,3022,16,
+0,241,1,1701,3023,
+16,0,241,1,447,
+1512,1,205,1524,1,
+827,1341,1,223,1539,
+1,476,1549,1,477,
+1555,1,1231,3024,16,
+0,241,1,479,1565,
+1,480,1570,1,1485,
+3025,16,0,241,1,
+1737,3026,16,0,241,
+1,242,1583,1,478,
+1588,1,1001,1598,1,
+1002,1603,1,39,3027,
+19,232,1,39,3028,
+5,84,1,1011,1112,
+1,1012,3029,16,0,
+230,1,1013,1268,1,
+262,1129,1,1267,3030,
+16,0,230,1,515,
+3031,16,0,230,1,
+1521,3032,16,0,230,
+1,525,1226,1,283,
+1182,1,2299,3033,16,
+0,230,1,42,3034,
+16,0,230,1,40,
+1187,1,44,1193,1,
+47,1194,1,1303,3035,
+16,0,230,1,1555,
+3036,16,0,230,1,
+50,1211,1,48,1200,
+1,49,1206,1,51,
+1216,1,63,1232,1,
+305,1221,1,66,1238,
+1,67,1243,1,68,
+1248,1,69,1253,1,
+70,1258,1,73,3037,
+16,0,230,1,74,
+1263,1,328,1312,1,
+1048,1354,1,82,3038,
+16,0,230,1,1840,
+3039,16,0,230,1,
+1591,3040,16,0,230,
+1,1341,3041,16,0,
+230,1,1096,1322,1,
+93,1328,1,352,1359,
+1,107,3042,16,0,
+230,1,1114,1353,1,
+118,1365,1,1123,3043,
+16,0,230,1,371,
+1375,1,1628,3044,16,
+0,230,1,375,1386,
+1,1882,3045,16,0,
+230,1,377,1391,1,
+379,1396,1,380,1401,
+1,883,1407,1,373,
+1419,1,130,1424,1,
+143,1429,1,387,3046,
+16,0,230,1,1159,
+3047,16,0,230,1,
+157,1452,1,1413,3048,
+16,0,230,1,1665,
+3049,16,0,230,1,
+412,3050,16,0,230,
+1,2676,3051,16,0,
+230,1,1377,3052,16,
+0,230,1,172,1470,
+1,1939,3053,16,0,
+230,1,437,3054,16,
+0,230,1,188,1519,
+1,942,1491,1,1195,
+3055,16,0,230,1,
+1449,3056,16,0,230,
+1,1701,3057,16,0,
+230,1,447,1512,1,
+205,1524,1,827,1341,
+1,223,1539,1,476,
+1549,1,477,1555,1,
+1231,3058,16,0,230,
+1,479,1565,1,480,
+1570,1,1485,3059,16,
+0,230,1,1737,3060,
+16,0,230,1,242,
+1583,1,478,1588,1,
+1001,1598,1,1002,1603,
+1,40,3061,19,220,
+1,40,3062,5,84,
+1,1011,1112,1,1012,
+3063,16,0,218,1,
+1013,1268,1,262,1129,
+1,1267,3064,16,0,
+218,1,515,3065,16,
+0,218,1,1521,3066,
+16,0,218,1,525,
+1226,1,283,1182,1,
+2299,3067,16,0,218,
+1,42,3068,16,0,
+218,1,40,1187,1,
+44,1193,1,47,1194,
+1,1303,3069,16,0,
+218,1,1555,3070,16,
+0,218,1,50,1211,
+1,48,1200,1,49,
+1206,1,51,1216,1,
+63,1232,1,305,1221,
+1,66,1238,1,67,
+1243,1,68,1248,1,
+69,1253,1,70,1258,
+1,73,3071,16,0,
+218,1,74,1263,1,
+328,1312,1,1048,1354,
+1,82,3072,16,0,
+218,1,1840,3073,16,
+0,218,1,1591,3074,
+16,0,218,1,1341,
+3075,16,0,218,1,
+1096,1322,1,93,1328,
+1,352,1359,1,107,
+3076,16,0,218,1,
+1114,1353,1,118,3077,
+16,0,218,1,1123,
+3078,16,0,218,1,
+371,1375,1,1628,3079,
+16,0,218,1,375,
+1386,1,1882,3080,16,
+0,218,1,377,1391,
+1,379,1396,1,380,
+1401,1,883,3081,16,
+0,218,1,373,1419,
+1,130,3082,16,0,
+218,1,143,3083,16,
+0,218,1,387,3084,
+16,0,218,1,1159,
+3085,16,0,218,1,
+157,3086,16,0,218,
+1,1413,3087,16,0,
+218,1,1665,3088,16,
+0,218,1,412,3089,
+16,0,218,1,2676,
+3090,16,0,218,1,
+1377,3091,16,0,218,
+1,172,3092,16,0,
+218,1,1939,3093,16,
+0,218,1,437,3094,
+16,0,218,1,188,
+3095,16,0,218,1,
+942,1491,1,1195,3096,
+16,0,218,1,1449,
+3097,16,0,218,1,
+1701,3098,16,0,218,
+1,447,1512,1,205,
+3099,16,0,218,1,
+827,3100,16,0,218,
+1,223,3101,16,0,
+218,1,476,1549,1,
+477,1555,1,1231,3102,
+16,0,218,1,479,
+1565,1,480,1570,1,
+1485,3103,16,0,218,
+1,1737,3104,16,0,
+218,1,242,3105,16,
+0,218,1,478,1588,
+1,1001,1598,1,1002,
+1603,1,41,3106,19,
+181,1,41,3107,5,
+84,1,1011,1112,1,
+1012,3108,16,0,179,
+1,1013,1268,1,262,
+1129,1,1267,3109,16,
+0,179,1,515,3110,
+16,0,179,1,1521,
+3111,16,0,179,1,
+525,1226,1,283,1182,
+1,2299,3112,16,0,
+179,1,42,3113,16,
+0,179,1,40,1187,
+1,44,1193,1,47,
+1194,1,1303,3114,16,
+0,179,1,1555,3115,
+16,0,179,1,50,
+1211,1,48,1200,1,
+49,1206,1,51,1216,
+1,63,1232,1,305,
+1221,1,66,1238,1,
+67,1243,1,68,1248,
+1,69,1253,1,70,
+1258,1,73,3116,16,
+0,179,1,74,1263,
+1,328,1312,1,1048,
+1354,1,82,3117,16,
+0,179,1,1840,3118,
+16,0,179,1,1591,
+3119,16,0,179,1,
+1341,3120,16,0,179,
+1,1096,1322,1,93,
+1328,1,352,1359,1,
+107,3121,16,0,179,
+1,1114,1353,1,118,
+3122,16,0,179,1,
+1123,3123,16,0,179,
+1,371,1375,1,1628,
+3124,16,0,179,1,
+375,1386,1,1882,3125,
+16,0,179,1,377,
+1391,1,379,1396,1,
+380,1401,1,883,3126,
+16,0,179,1,373,
+1419,1,130,3127,16,
+0,179,1,143,3128,
+16,0,179,1,387,
+3129,16,0,179,1,
+1159,3130,16,0,179,
+1,157,3131,16,0,
+179,1,1413,3132,16,
+0,179,1,1665,3133,
+16,0,179,1,412,
+3134,16,0,179,1,
+2676,3135,16,0,179,
+1,1377,3136,16,0,
+179,1,172,3137,16,
+0,179,1,1939,3138,
+16,0,179,1,437,
+3139,16,0,179,1,
+188,3140,16,0,179,
+1,942,1491,1,1195,
+3141,16,0,179,1,
+1449,3142,16,0,179,
+1,1701,3143,16,0,
+179,1,447,1512,1,
+205,3144,16,0,179,
+1,827,3145,16,0,
+179,1,223,3146,16,
+0,179,1,476,1549,
+1,477,1555,1,1231,
+3147,16,0,179,1,
+479,1565,1,480,1570,
+1,1485,3148,16,0,
+179,1,1737,3149,16,
+0,179,1,242,3150,
+16,0,179,1,478,
+1588,1,1001,1598,1,
+1002,1603,1,42,3151,
+19,402,1,42,3152,
+5,38,1,1901,3153,
+16,0,400,1,2075,
+3154,16,0,400,1,
+1860,831,1,1803,797,
+1,1804,3155,16,0,
+400,1,2413,3156,16,
+0,400,1,2198,3157,
+16,0,400,1,1873,
+845,1,1657,903,1,
+1989,925,1,1990,3158,
+16,0,400,1,1775,
+3159,16,0,400,1,
+32,3160,16,0,400,
+1,2105,824,1,2106,
+3161,16,0,400,1,
+2364,837,1,2227,917,
+1,2337,3162,16,0,
+400,1,2021,728,1,
+2458,885,1,2459,891,
+1,2462,898,1,2136,
+852,1,2464,908,1,
+2029,735,1,2030,741,
+1,2031,746,1,2032,
+751,1,2033,756,1,
+2035,762,1,2037,767,
+1,2039,772,1,1931,
+870,1,2041,778,1,
+2043,784,1,2045,789,
+1,1574,809,1,1958,
+3163,16,0,400,1,
+43,3164,19,467,1,
+43,3165,5,25,1,
+2035,762,1,2037,767,
+1,2039,772,1,2041,
+778,1,2227,917,1,
+2043,784,1,1657,903,
+1,1860,831,1,2136,
+852,1,2021,728,1,
+2459,891,1,1574,809,
+1,2105,3166,16,0,
+593,1,1931,870,1,
+1873,845,1,2031,746,
+1,1803,797,1,1989,
+3167,16,0,465,1,
+2464,908,1,2029,735,
+1,2030,741,1,2364,
+837,1,2032,751,1,
+2033,756,1,2045,789,
+1,44,3168,19,273,
+1,44,3169,5,38,
+1,1901,3170,16,0,
+271,1,2075,3171,16,
+0,271,1,1860,831,
+1,1803,797,1,1804,
+3172,16,0,271,1,
+2413,3173,16,0,271,
+1,2198,3174,16,0,
+271,1,1873,845,1,
+1657,903,1,1989,925,
+1,1990,3175,16,0,
+271,1,1775,3176,16,
+0,271,1,32,3177,
+16,0,271,1,2105,
+824,1,2106,3178,16,
+0,271,1,2364,837,
+1,2227,917,1,2337,
+3179,16,0,271,1,
+2021,728,1,2458,885,
+1,2459,891,1,2462,
+898,1,2136,852,1,
+2464,908,1,2029,735,
+1,2030,741,1,2031,
+746,1,2032,751,1,
+2033,756,1,2035,762,
+1,2037,767,1,2039,
+772,1,1931,870,1,
+2041,778,1,2043,784,
+1,2045,789,1,1574,
+809,1,1958,3180,16,
+0,271,1,45,3181,
+19,296,1,45,3182,
+5,39,1,1901,3183,
+16,0,324,1,2075,
+3184,16,0,324,1,
+1860,831,1,1803,797,
+1,1804,3185,16,0,
+324,1,2413,3186,16,
+0,324,1,2198,3187,
+16,0,324,1,1873,
+845,1,1657,903,1,
+1989,925,1,1990,3188,
+16,0,324,1,1775,
+3189,16,0,324,1,
+32,3190,16,0,324,
+1,2105,824,1,2106,
+3191,16,0,324,1,
+2364,837,1,2227,917,
+1,2337,3192,16,0,
+324,1,2021,728,1,
+2458,885,1,2459,891,
+1,2462,898,1,2136,
+852,1,2464,908,1,
+2029,735,1,2030,741,
+1,2031,746,1,2032,
+751,1,2033,756,1,
+2035,762,1,2037,767,
+1,2039,772,1,1931,
+870,1,2041,778,1,
+2043,784,1,2045,789,
+1,1832,3193,16,0,
+294,1,1574,809,1,
+1958,3194,16,0,324,
+1,46,3195,19,681,
+1,46,3196,5,38,
+1,1901,3197,16,0,
+679,1,2075,3198,16,
+0,679,1,1860,831,
+1,1803,797,1,1804,
+3199,16,0,679,1,
+2413,3200,16,0,679,
+1,2198,3201,16,0,
+679,1,1873,845,1,
+1657,903,1,1989,925,
+1,1990,3202,16,0,
+679,1,1775,3203,16,
+0,679,1,32,3204,
+16,0,679,1,2105,
+824,1,2106,3205,16,
+0,679,1,2364,837,
+1,2227,917,1,2337,
+3206,16,0,679,1,
+2021,728,1,2458,885,
+1,2459,891,1,2462,
+898,1,2136,852,1,
+2464,908,1,2029,735,
+1,2030,741,1,2031,
+746,1,2032,751,1,
+2033,756,1,2035,762,
+1,2037,767,1,2039,
+772,1,1931,870,1,
+2041,778,1,2043,784,
+1,2045,789,1,1574,
+809,1,1958,3207,16,
+0,679,1,47,3208,
+19,574,1,47,3209,
+5,19,1,0,3210,
+16,0,656,1,2725,
+3211,17,3212,15,3213,
+4,36,37,0,71,
 0,108,0,111,0,
 98,0,97,0,108,
 0,68,0,101,0,
 102,0,105,0,110,
 0,105,0,116,0,
 105,0,111,0,110,
-0,115,0,95,0,
-50,0,1,145,1,
-3,1,3,1,2,
-3188,22,1,4,1,
-2558,697,1,2716,3189,
-17,3190,15,3185,1,
--1,1,5,3191,20,
-3192,4,38,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
-68,0,101,0,102,
-0,105,0,110,0,
-105,0,116,0,105,
-0,111,0,110,0,
-115,0,95,0,49,
-0,1,144,1,3,
-1,2,1,1,3193,
-22,1,3,1,2022,
-3194,16,0,567,1,
-2459,882,1,2715,3195,
-17,3196,15,3185,1,
--1,1,5,3197,20,
-3198,4,38,71,0,
+0,115,0,1,-1,
+1,5,3214,20,3215,
+4,38,71,0,108,
+0,111,0,98,0,
+97,0,108,0,68,
+0,101,0,102,0,
+105,0,110,0,105,
+0,116,0,105,0,
+111,0,110,0,115,
+0,95,0,52,0,
+1,149,1,3,1,
+3,1,2,3216,22,
+1,6,1,2726,3217,
+17,3218,15,3213,1,
+-1,1,5,3219,20,
+3220,4,38,71,0,
 108,0,111,0,98,
 0,97,0,108,0,
 68,0,101,0,102,
 0,105,0,110,0,
 105,0,116,0,105,
 0,111,0,110,0,
-115,0,95,0,51,
-0,1,146,1,3,
-1,2,1,1,3199,
-22,1,5,1,2464,
-899,1,2466,3200,17,
-3201,15,3202,4,50,
-37,0,71,0,108,
-0,111,0,98,0,
-97,0,108,0,70,
-0,117,0,110,0,
-99,0,116,0,105,
-0,111,0,110,0,
-68,0,101,0,102,
-0,105,0,110,0,
-105,0,116,0,105,
-0,111,0,110,0,
-1,-1,1,5,3203,
-20,3204,4,52,71,
+115,0,95,0,50,
+0,1,147,1,3,
+1,3,1,2,3221,
+22,1,4,1,2706,
+3222,17,3223,15,3224,
+4,52,37,0,71,
 0,108,0,111,0,
 98,0,97,0,108,
-0,70,0,117,0,
-110,0,99,0,116,
-0,105,0,111,0,
-110,0,68,0,101,
-0,102,0,105,0,
-110,0,105,0,116,
-0,105,0,111,0,
-110,0,95,0,50,
-0,1,151,1,3,
-1,7,1,6,3205,
-22,1,10,1,2640,
-685,1,2713,3206,17,
-3207,15,3185,1,-1,
-1,5,3208,20,3209,
+0,86,0,97,0,
+114,0,105,0,97,
+0,98,0,108,0,
+101,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,1,
+-1,1,5,3225,20,
+3226,4,54,71,0,
+108,0,111,0,98,
+0,97,0,108,0,
+86,0,97,0,114,
+0,105,0,97,0,
+98,0,108,0,101,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,95,0,
+49,0,1,150,1,
+3,1,3,1,2,
+3227,22,1,7,1,
+2707,3228,16,0,656,
+1,2718,3229,16,0,
+656,1,2565,700,1,
+2022,3230,16,0,572,
+1,2459,891,1,2645,
+706,1,2648,3231,16,
+0,656,1,2464,908,
+1,2466,3232,17,3233,
+15,3234,4,50,37,
+0,71,0,108,0,
+111,0,98,0,97,
+0,108,0,70,0,
+117,0,110,0,99,
+0,116,0,105,0,
+111,0,110,0,68,
+0,101,0,102,0,
+105,0,110,0,105,
+0,116,0,105,0,
+111,0,110,0,1,
+-1,1,5,3235,20,
+3236,4,52,71,0,
+108,0,111,0,98,
+0,97,0,108,0,
+70,0,117,0,110,
+0,99,0,116,0,
+105,0,111,0,110,
+0,68,0,101,0,
+102,0,105,0,110,
+0,105,0,116,0,
+105,0,111,0,110,
+0,95,0,50,0,
+1,153,1,3,1,
+7,1,6,3237,22,
+1,10,1,2652,695,
+1,2727,3238,17,3239,
+15,3213,1,-1,1,
+5,3240,20,3241,4,
+38,71,0,108,0,
+111,0,98,0,97,
+0,108,0,68,0,
+101,0,102,0,105,
+0,110,0,105,0,
+116,0,105,0,111,
+0,110,0,115,0,
+95,0,51,0,1,
+148,1,3,1,2,
+1,1,3242,22,1,
+5,1,2728,3243,17,
+3244,15,3213,1,-1,
+1,5,3245,20,3246,
 4,38,71,0,108,
 0,111,0,98,0,
 97,0,108,0,68,
@@ -8490,13 +8632,13 @@ public yyLSLSyntax
 105,0,110,0,105,
 0,116,0,105,0,
 111,0,110,0,115,
-0,95,0,52,0,
-1,147,1,3,1,
-3,1,2,3210,22,
-1,6,1,2655,3211,
-17,3212,15,3202,1,
--1,1,5,3213,20,
-3214,4,52,71,0,
+0,95,0,49,0,
+1,146,1,3,1,
+2,1,1,3247,22,
+1,3,1,2667,3248,
+17,3249,15,3234,1,
+-1,1,5,3250,20,
+3251,4,52,71,0,
 108,0,111,0,98,
 0,97,0,108,0,
 70,0,117,0,110,
@@ -8507,11 +8649,12 @@ public yyLSLSyntax
 0,105,0,116,0,
 105,0,111,0,110,
 0,95,0,49,0,
-1,150,1,3,1,
-6,1,5,3215,22,
-1,9,1,2694,3216,
-17,3217,15,3218,4,
-52,37,0,71,0,
+1,152,1,3,1,
+6,1,5,3252,22,
+1,9,1,2695,3253,
+17,3254,15,3224,1,
+-1,1,5,3255,20,
+3256,4,54,71,0,
 108,0,111,0,98,
 0,97,0,108,0,
 86,0,97,0,114,
@@ -8521,2214 +8664,2266 @@ public yyLSLSyntax
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
-0,110,0,1,-1,
-1,5,3219,20,3220,
-4,54,71,0,108,
-0,111,0,98,0,
-97,0,108,0,86,
-0,97,0,114,0,
-105,0,97,0,98,
-0,108,0,101,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,95,0,49,
-0,1,148,1,3,
-1,3,1,2,3221,
-22,1,7,1,2695,
-3222,16,0,464,1,
-2683,3223,17,3224,15,
-3218,1,-1,1,5,
-3225,20,3226,4,54,
-71,0,108,0,111,
-0,98,0,97,0,
-108,0,86,0,97,
-0,114,0,105,0,
-97,0,98,0,108,
-0,101,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-95,0,50,0,1,
-149,1,3,1,5,
-1,4,3227,22,1,
-8,1,48,3228,19,
-339,1,48,3229,5,
-54,1,0,3230,16,
-0,337,1,2075,3231,
-16,0,495,1,1860,
-821,1,1803,787,1,
-1804,3232,16,0,495,
-1,2413,3233,16,0,
-495,1,2634,691,1,
-1873,835,1,1657,894,
-1,2639,707,1,2640,
-685,1,1989,916,1,
-1990,3234,16,0,495,
-1,2459,882,1,1775,
-3235,16,0,495,1,
-32,3236,16,0,495,
-1,2105,814,1,2106,
-3237,16,0,495,1,
-2466,3200,1,2655,3211,
-1,2683,3223,1,2227,
-908,1,2337,3238,16,
-0,495,1,2558,697,
-1,2694,3216,1,2695,
-3239,16,0,337,1,
-2021,718,1,2458,876,
-1,1901,3240,16,0,
-495,1,2462,889,1,
-2136,842,1,2464,899,
-1,2029,725,1,2030,
-731,1,2031,736,1,
-2032,741,1,2033,746,
-1,2035,752,1,2364,
-827,1,2715,3195,1,
-2039,762,1,1931,861,
-1,2041,768,1,2043,
-774,1,2045,779,1,
-2198,3241,16,0,495,
-1,2706,3242,16,0,
-337,1,2037,757,1,
-2713,3206,1,2714,3183,
-1,1574,799,1,2716,
-3189,1,2636,3243,16,
-0,337,1,1958,3244,
-16,0,495,1,49,
-3245,19,500,1,49,
-3246,5,38,1,1901,
-3247,16,0,498,1,
-2075,3248,16,0,498,
-1,1860,821,1,1803,
-787,1,1804,3249,16,
-0,498,1,2413,3250,
-16,0,498,1,2198,
-3251,16,0,498,1,
-1873,835,1,1657,894,
-1,1989,916,1,1990,
-3252,16,0,498,1,
-1775,3253,16,0,498,
-1,32,3254,16,0,
-498,1,2105,814,1,
-2106,3255,16,0,498,
-1,2364,827,1,2227,
-908,1,2337,3256,16,
-0,498,1,2021,718,
-1,2458,876,1,2459,
-882,1,2462,889,1,
-2136,842,1,2464,899,
-1,2029,725,1,2030,
-731,1,2031,736,1,
-2032,741,1,2033,746,
-1,2035,752,1,2037,
-757,1,2039,762,1,
-1931,861,1,2041,768,
-1,2043,774,1,2045,
-779,1,1574,799,1,
-1958,3257,16,0,498,
-1,50,3258,19,614,
-1,50,3259,5,38,
-1,1901,3260,16,0,
-612,1,2075,3261,16,
-0,612,1,1860,821,
-1,1803,787,1,1804,
-3262,16,0,612,1,
-2413,3263,16,0,612,
-1,2198,3264,16,0,
-612,1,1873,835,1,
-1657,894,1,1989,916,
-1,1990,3265,16,0,
-612,1,1775,3266,16,
-0,612,1,32,3267,
-16,0,612,1,2105,
-814,1,2106,3268,16,
-0,612,1,2364,827,
-1,2227,908,1,2337,
-3269,16,0,612,1,
-2021,718,1,2458,876,
-1,2459,882,1,2462,
-889,1,2136,842,1,
-2464,899,1,2029,725,
-1,2030,731,1,2031,
-736,1,2032,741,1,
-2033,746,1,2035,752,
-1,2037,757,1,2039,
-762,1,1931,861,1,
-2041,768,1,2043,774,
-1,2045,779,1,1574,
-799,1,1958,3270,16,
-0,612,1,51,3271,
-19,127,1,51,3272,
-5,53,1,0,3273,
-16,0,125,1,2075,
-3274,16,0,125,1,
-1860,821,1,1803,787,
-1,1804,3275,16,0,
-125,1,10,3276,16,
-0,125,1,2413,3277,
-16,0,125,1,2198,
-3278,16,0,125,1,
-1873,835,1,21,3279,
-16,0,125,1,1657,
-894,1,2030,731,1,
-2642,3280,16,0,125,
-1,1989,916,1,1990,
-3281,16,0,125,1,
-2459,882,1,1775,3282,
-16,0,125,1,32,
-3283,16,0,125,1,
-2105,814,1,2106,3284,
-16,0,125,1,2655,
-3211,1,2683,3223,1,
-2227,908,1,2337,3285,
-16,0,125,1,52,
-3286,16,0,125,1,
-2694,3216,1,2695,3287,
-16,0,125,1,2021,
-718,1,2458,876,1,
-1901,3288,16,0,125,
-1,2462,889,1,2136,
-842,1,2464,899,1,
-2029,725,1,2466,3200,
-1,2031,736,1,2032,
-741,1,2033,746,1,
-2035,752,1,2364,827,
-1,2715,3195,1,2039,
-762,1,1931,861,1,
-2041,768,1,2043,774,
-1,2045,779,1,2037,
-757,1,2713,3206,1,
-2714,3183,1,1574,799,
-1,2716,3189,1,1958,
-3289,16,0,125,1,
-2506,3290,16,0,125,
-1,52,3291,19,124,
-1,52,3292,5,53,
-1,0,3293,16,0,
-122,1,2075,3294,16,
-0,122,1,1860,821,
-1,1803,787,1,1804,
-3295,16,0,122,1,
-10,3296,16,0,122,
-1,2413,3297,16,0,
-122,1,2198,3298,16,
-0,122,1,1873,835,
-1,21,3299,16,0,
-122,1,1657,894,1,
-2030,731,1,2642,3300,
-16,0,122,1,1989,
-916,1,1990,3301,16,
-0,122,1,2459,882,
-1,1775,3302,16,0,
-122,1,32,3303,16,
-0,122,1,2105,814,
-1,2106,3304,16,0,
-122,1,2655,3211,1,
-2683,3223,1,2227,908,
-1,2337,3305,16,0,
-122,1,52,3306,16,
-0,122,1,2694,3216,
-1,2695,3307,16,0,
-122,1,2021,718,1,
-2458,876,1,1901,3308,
-16,0,122,1,2462,
-889,1,2136,842,1,
-2464,899,1,2029,725,
-1,2466,3200,1,2031,
-736,1,2032,741,1,
-2033,746,1,2035,752,
-1,2364,827,1,2715,
-3195,1,2039,762,1,
-1931,861,1,2041,768,
-1,2043,774,1,2045,
-779,1,2037,757,1,
-2713,3206,1,2714,3183,
-1,1574,799,1,2716,
-3189,1,1958,3309,16,
-0,122,1,2506,3310,
-16,0,122,1,53,
-3311,19,121,1,53,
-3312,5,53,1,0,
-3313,16,0,119,1,
-2075,3314,16,0,119,
-1,1860,821,1,1803,
-787,1,1804,3315,16,
-0,119,1,10,3316,
-16,0,119,1,2413,
-3317,16,0,119,1,
-2198,3318,16,0,119,
-1,1873,835,1,21,
-3319,16,0,119,1,
-1657,894,1,2030,731,
-1,2642,3320,16,0,
-119,1,1989,916,1,
-1990,3321,16,0,119,
-1,2459,882,1,1775,
-3322,16,0,119,1,
-32,3323,16,0,119,
-1,2105,814,1,2106,
-3324,16,0,119,1,
-2655,3211,1,2683,3223,
-1,2227,908,1,2337,
-3325,16,0,119,1,
-52,3326,16,0,119,
-1,2694,3216,1,2695,
-3327,16,0,119,1,
-2021,718,1,2458,876,
-1,1901,3328,16,0,
-119,1,2462,889,1,
-2136,842,1,2464,899,
-1,2029,725,1,2466,
-3200,1,2031,736,1,
-2032,741,1,2033,746,
-1,2035,752,1,2364,
-827,1,2715,3195,1,
-2039,762,1,1931,861,
-1,2041,768,1,2043,
-774,1,2045,779,1,
-2037,757,1,2713,3206,
-1,2714,3183,1,1574,
-799,1,2716,3189,1,
-1958,3329,16,0,119,
-1,2506,3330,16,0,
-119,1,54,3331,19,
-118,1,54,3332,5,
-53,1,0,3333,16,
-0,116,1,2075,3334,
+0,110,0,95,0,
+50,0,1,151,1,
+3,1,5,1,4,
+3257,22,1,8,1,
+2651,689,1,48,3258,
+19,347,1,48,3259,
+5,54,1,0,3260,
+16,0,345,1,2726,
+3217,1,2727,3238,1,
+2728,3243,1,2075,3261,
+16,0,505,1,1860,
+831,1,1804,3262,16,
+0,505,1,2413,3263,
+16,0,505,1,2198,
+3264,16,0,505,1,
+1873,845,1,1657,903,
+1,2030,741,1,1989,
+925,1,1990,3265,16,
+0,505,1,2645,706,
+1,2459,891,1,1775,
+3266,16,0,505,1,
+32,3267,16,0,505,
+1,2718,3268,16,0,
+345,1,2105,824,1,
+2651,689,1,2652,695,
+1,2648,3269,16,0,
+345,1,2227,917,1,
+2337,3270,16,0,505,
+1,2667,3248,1,2695,
+3253,1,2565,700,1,
+1803,797,1,2458,885,
+1,1901,3271,16,0,
+505,1,2462,898,1,
+2136,852,1,2464,908,
+1,2029,735,1,2466,
+3232,1,2031,746,1,
+2032,751,1,2033,756,
+1,2035,762,1,2364,
+837,1,2039,772,1,
+1931,870,1,2041,778,
+1,2021,728,1,2043,
+784,1,2045,789,1,
+2725,3211,1,2706,3222,
+1,2707,3272,16,0,
+345,1,2037,767,1,
+1574,809,1,2106,3273,
+16,0,505,1,1958,
+3274,16,0,505,1,
+49,3275,19,510,1,
+49,3276,5,38,1,
+1901,3277,16,0,508,
+1,2075,3278,16,0,
+508,1,1860,831,1,
+1803,797,1,1804,3279,
+16,0,508,1,2413,
+3280,16,0,508,1,
+2198,3281,16,0,508,
+1,1873,845,1,1657,
+903,1,1989,925,1,
+1990,3282,16,0,508,
+1,1775,3283,16,0,
+508,1,32,3284,16,
+0,508,1,2105,824,
+1,2106,3285,16,0,
+508,1,2364,837,1,
+2227,917,1,2337,3286,
+16,0,508,1,2021,
+728,1,2458,885,1,
+2459,891,1,2462,898,
+1,2136,852,1,2464,
+908,1,2029,735,1,
+2030,741,1,2031,746,
+1,2032,751,1,2033,
+756,1,2035,762,1,
+2037,767,1,2039,772,
+1,1931,870,1,2041,
+778,1,2043,784,1,
+2045,789,1,1574,809,
+1,1958,3287,16,0,
+508,1,50,3288,19,
+627,1,50,3289,5,
+38,1,1901,3290,16,
+0,625,1,2075,3291,
+16,0,625,1,1860,
+831,1,1803,797,1,
+1804,3292,16,0,625,
+1,2413,3293,16,0,
+625,1,2198,3294,16,
+0,625,1,1873,845,
+1,1657,903,1,1989,
+925,1,1990,3295,16,
+0,625,1,1775,3296,
+16,0,625,1,32,
+3297,16,0,625,1,
+2105,824,1,2106,3298,
+16,0,625,1,2364,
+837,1,2227,917,1,
+2337,3299,16,0,625,
+1,2021,728,1,2458,
+885,1,2459,891,1,
+2462,898,1,2136,852,
+1,2464,908,1,2029,
+735,1,2030,741,1,
+2031,746,1,2032,751,
+1,2033,756,1,2035,
+762,1,2037,767,1,
+2039,772,1,1931,870,
+1,2041,778,1,2043,
+784,1,2045,789,1,
+1574,809,1,1958,3300,
+16,0,625,1,51,
+3301,19,127,1,51,
+3302,5,53,1,0,
+3303,16,0,125,1,
+2726,3217,1,2727,3238,
+1,2728,3243,1,2075,
+3304,16,0,125,1,
+1860,831,1,1804,3305,
+16,0,125,1,10,
+3306,16,0,125,1,
+2413,3307,16,0,125,
+1,2198,3308,16,0,
+125,1,1873,845,1,
+21,3309,16,0,125,
+1,1657,903,1,2030,
+741,1,1989,925,1,
+1990,3310,16,0,125,
+1,2459,891,1,1775,
+3311,16,0,125,1,
+32,3312,16,0,125,
+1,2105,824,1,2106,
+3313,16,0,125,1,
+2654,3314,16,0,125,
+1,2227,917,1,2337,
+3315,16,0,125,1,
+2667,3248,1,52,3316,
+16,0,125,1,2695,
+3253,1,1803,797,1,
+2458,885,1,1901,3317,
+16,0,125,1,2462,
+898,1,2136,852,1,
+2464,908,1,2029,735,
+1,2466,3232,1,2031,
+746,1,2032,751,1,
+2033,756,1,2035,762,
+1,2364,837,1,2039,
+772,1,1931,870,1,
+2041,778,1,2021,728,
+1,2043,784,1,2045,
+789,1,2511,3318,16,
+0,125,1,2725,3211,
+1,2706,3222,1,2707,
+3319,16,0,125,1,
+2037,767,1,1574,809,
+1,1958,3320,16,0,
+125,1,52,3321,19,
+124,1,52,3322,5,
+53,1,0,3323,16,
+0,122,1,2726,3217,
+1,2727,3238,1,2728,
+3243,1,2075,3324,16,
+0,122,1,1860,831,
+1,1804,3325,16,0,
+122,1,10,3326,16,
+0,122,1,2413,3327,
+16,0,122,1,2198,
+3328,16,0,122,1,
+1873,845,1,21,3329,
+16,0,122,1,1657,
+903,1,2030,741,1,
+1989,925,1,1990,3330,
+16,0,122,1,2459,
+891,1,1775,3331,16,
+0,122,1,32,3332,
+16,0,122,1,2105,
+824,1,2106,3333,16,
+0,122,1,2654,3334,
+16,0,122,1,2227,
+917,1,2337,3335,16,
+0,122,1,2667,3248,
+1,52,3336,16,0,
+122,1,2695,3253,1,
+1803,797,1,2458,885,
+1,1901,3337,16,0,
+122,1,2462,898,1,
+2136,852,1,2464,908,
+1,2029,735,1,2466,
+3232,1,2031,746,1,
+2032,751,1,2033,756,
+1,2035,762,1,2364,
+837,1,2039,772,1,
+1931,870,1,2041,778,
+1,2021,728,1,2043,
+784,1,2045,789,1,
+2511,3338,16,0,122,
+1,2725,3211,1,2706,
+3222,1,2707,3339,16,
+0,122,1,2037,767,
+1,1574,809,1,1958,
+3340,16,0,122,1,
+53,3341,19,121,1,
+53,3342,5,53,1,
+0,3343,16,0,119,
+1,2726,3217,1,2727,
+3238,1,2728,3243,1,
+2075,3344,16,0,119,
+1,1860,831,1,1804,
+3345,16,0,119,1,
+10,3346,16,0,119,
+1,2413,3347,16,0,
+119,1,2198,3348,16,
+0,119,1,1873,845,
+1,21,3349,16,0,
+119,1,1657,903,1,
+2030,741,1,1989,925,
+1,1990,3350,16,0,
+119,1,2459,891,1,
+1775,3351,16,0,119,
+1,32,3352,16,0,
+119,1,2105,824,1,
+2106,3353,16,0,119,
+1,2654,3354,16,0,
+119,1,2227,917,1,
+2337,3355,16,0,119,
+1,2667,3248,1,52,
+3356,16,0,119,1,
+2695,3253,1,1803,797,
+1,2458,885,1,1901,
+3357,16,0,119,1,
+2462,898,1,2136,852,
+1,2464,908,1,2029,
+735,1,2466,3232,1,
+2031,746,1,2032,751,
+1,2033,756,1,2035,
+762,1,2364,837,1,
+2039,772,1,1931,870,
+1,2041,778,1,2021,
+728,1,2043,784,1,
+2045,789,1,2511,3358,
+16,0,119,1,2725,
+3211,1,2706,3222,1,
+2707,3359,16,0,119,
+1,2037,767,1,1574,
+809,1,1958,3360,16,
+0,119,1,54,3361,
+19,118,1,54,3362,
+5,53,1,0,3363,
+16,0,116,1,2726,
+3217,1,2727,3238,1,
+2728,3243,1,2075,3364,
 16,0,116,1,1860,
-821,1,1803,787,1,
-1804,3335,16,0,116,
-1,10,3336,16,0,
-116,1,2413,3337,16,
-0,116,1,2198,3338,
-16,0,116,1,1873,
-835,1,21,3339,16,
-0,116,1,1657,894,
-1,2030,731,1,2642,
-3340,16,0,116,1,
-1989,916,1,1990,3341,
-16,0,116,1,2459,
-882,1,1775,3342,16,
-0,116,1,32,3343,
-16,0,116,1,2105,
-814,1,2106,3344,16,
-0,116,1,2655,3211,
-1,2683,3223,1,2227,
-908,1,2337,3345,16,
-0,116,1,52,3346,
-16,0,116,1,2694,
-3216,1,2695,3347,16,
-0,116,1,2021,718,
-1,2458,876,1,1901,
-3348,16,0,116,1,
-2462,889,1,2136,842,
-1,2464,899,1,2029,
-725,1,2466,3200,1,
-2031,736,1,2032,741,
-1,2033,746,1,2035,
-752,1,2364,827,1,
-2715,3195,1,2039,762,
-1,1931,861,1,2041,
-768,1,2043,774,1,
-2045,779,1,2037,757,
-1,2713,3206,1,2714,
-3183,1,1574,799,1,
-2716,3189,1,1958,3349,
-16,0,116,1,2506,
-3350,16,0,116,1,
-55,3351,19,115,1,
-55,3352,5,53,1,
-0,3353,16,0,113,
-1,2075,3354,16,0,
-113,1,1860,821,1,
-1803,787,1,1804,3355,
-16,0,113,1,10,
-3356,16,0,113,1,
-2413,3357,16,0,113,
-1,2198,3358,16,0,
-113,1,1873,835,1,
-21,3359,16,0,113,
-1,1657,894,1,2030,
-731,1,2642,3360,16,
-0,113,1,1989,916,
-1,1990,3361,16,0,
-113,1,2459,882,1,
-1775,3362,16,0,113,
-1,32,3363,16,0,
-113,1,2105,814,1,
-2106,3364,16,0,113,
-1,2655,3211,1,2683,
-3223,1,2227,908,1,
-2337,3365,16,0,113,
-1,52,3366,16,0,
-113,1,2694,3216,1,
-2695,3367,16,0,113,
-1,2021,718,1,2458,
-876,1,1901,3368,16,
-0,113,1,2462,889,
-1,2136,842,1,2464,
-899,1,2029,725,1,
-2466,3200,1,2031,736,
-1,2032,741,1,2033,
-746,1,2035,752,1,
-2364,827,1,2715,3195,
-1,2039,762,1,1931,
-861,1,2041,768,1,
-2043,774,1,2045,779,
-1,2037,757,1,2713,
-3206,1,2714,3183,1,
-1574,799,1,2716,3189,
-1,1958,3369,16,0,
-113,1,2506,3370,16,
-0,113,1,56,3371,
-19,112,1,56,3372,
-5,53,1,0,3373,
-16,0,110,1,2075,
-3374,16,0,110,1,
-1860,821,1,1803,787,
-1,1804,3375,16,0,
-110,1,10,3376,16,
-0,110,1,2413,3377,
-16,0,110,1,2198,
-3378,16,0,110,1,
-1873,835,1,21,3379,
-16,0,110,1,1657,
-894,1,2030,731,1,
-2642,3380,16,0,110,
-1,1989,916,1,1990,
-3381,16,0,110,1,
-2459,882,1,1775,3382,
-16,0,110,1,32,
-3383,16,0,110,1,
-2105,814,1,2106,3384,
-16,0,110,1,2655,
-3211,1,2683,3223,1,
-2227,908,1,2337,3385,
-16,0,110,1,52,
-3386,16,0,110,1,
-2694,3216,1,2695,3387,
-16,0,110,1,2021,
-718,1,2458,876,1,
-1901,3388,16,0,110,
-1,2462,889,1,2136,
-842,1,2464,899,1,
-2029,725,1,2466,3200,
-1,2031,736,1,2032,
-741,1,2033,746,1,
-2035,752,1,2364,827,
-1,2715,3195,1,2039,
-762,1,1931,861,1,
-2041,768,1,2043,774,
-1,2045,779,1,2037,
-757,1,2713,3206,1,
-2714,3183,1,1574,799,
-1,2716,3189,1,1958,
-3389,16,0,110,1,
-2506,3390,16,0,110,
-1,57,3391,19,109,
-1,57,3392,5,53,
-1,0,3393,16,0,
-107,1,2075,3394,16,
-0,107,1,1860,821,
-1,1803,787,1,1804,
-3395,16,0,107,1,
-10,3396,16,0,107,
-1,2413,3397,16,0,
-107,1,2198,3398,16,
-0,107,1,1873,835,
-1,21,3399,16,0,
-107,1,1657,894,1,
-2030,731,1,2642,3400,
-16,0,107,1,1989,
-916,1,1990,3401,16,
-0,107,1,2459,882,
-1,1775,3402,16,0,
-107,1,32,3403,16,
-0,107,1,2105,814,
-1,2106,3404,16,0,
-107,1,2655,3211,1,
-2683,3223,1,2227,908,
-1,2337,3405,16,0,
-107,1,52,3406,16,
-0,107,1,2694,3216,
-1,2695,3407,16,0,
-107,1,2021,718,1,
-2458,876,1,1901,3408,
-16,0,107,1,2462,
-889,1,2136,842,1,
-2464,899,1,2029,725,
-1,2466,3200,1,2031,
-736,1,2032,741,1,
-2033,746,1,2035,752,
-1,2364,827,1,2715,
-3195,1,2039,762,1,
-1931,861,1,2041,768,
-1,2043,774,1,2045,
-779,1,2037,757,1,
-2713,3206,1,2714,3183,
-1,1574,799,1,2716,
-3189,1,1958,3409,16,
-0,107,1,2506,3410,
-16,0,107,1,58,
-3411,19,429,1,58,
-3412,5,9,1,2519,
-1618,1,2557,1627,1,
-2521,3413,16,0,427,
-1,2559,1633,1,2597,
-3414,16,0,427,1,
-2561,3415,16,0,427,
-1,2459,882,1,2464,
-899,1,2470,3416,16,
-0,427,1,59,3417,
-19,426,1,59,3418,
-5,9,1,2519,1618,
-1,2557,1627,1,2521,
-3419,16,0,424,1,
-2559,1633,1,2597,3420,
-16,0,424,1,2561,
-3421,16,0,424,1,
-2459,882,1,2464,899,
-1,2470,3422,16,0,
-424,1,60,3423,19,
-423,1,60,3424,5,
-9,1,2519,1618,1,
-2557,1627,1,2521,3425,
-16,0,421,1,2559,
-1633,1,2597,3426,16,
-0,421,1,2561,3427,
-16,0,421,1,2459,
-882,1,2464,899,1,
-2470,3428,16,0,421,
-1,61,3429,19,420,
-1,61,3430,5,9,
-1,2519,1618,1,2557,
-1627,1,2521,3431,16,
-0,418,1,2559,1633,
-1,2597,3432,16,0,
-418,1,2561,3433,16,
-0,418,1,2459,882,
-1,2464,899,1,2470,
-3434,16,0,418,1,
-62,3435,19,417,1,
-62,3436,5,9,1,
-2519,1618,1,2557,1627,
-1,2521,3437,16,0,
-415,1,2559,1633,1,
-2597,3438,16,0,415,
-1,2561,3439,16,0,
-415,1,2459,882,1,
-2464,899,1,2470,3440,
-16,0,415,1,63,
-3441,19,414,1,63,
-3442,5,9,1,2519,
-1618,1,2557,1627,1,
-2521,3443,16,0,412,
-1,2559,1633,1,2597,
-3444,16,0,412,1,
-2561,3445,16,0,412,
-1,2459,882,1,2464,
-899,1,2470,3446,16,
-0,412,1,64,3447,
-19,653,1,64,3448,
-5,9,1,2519,1618,
-1,2557,1627,1,2521,
-3449,16,0,651,1,
-2559,1633,1,2597,3450,
-16,0,651,1,2561,
-3451,16,0,651,1,
-2459,882,1,2464,899,
-1,2470,3452,16,0,
-651,1,65,3453,19,
-410,1,65,3454,5,
-9,1,2519,1618,1,
-2557,1627,1,2521,3455,
-16,0,408,1,2559,
-1633,1,2597,3456,16,
-0,408,1,2561,3457,
-16,0,408,1,2459,
-882,1,2464,899,1,
-2470,3458,16,0,408,
-1,66,3459,19,493,
-1,66,3460,5,9,
-1,2519,1618,1,2557,
-1627,1,2521,3461,16,
-0,491,1,2559,1633,
-1,2597,3462,16,0,
-491,1,2561,3463,16,
-0,491,1,2459,882,
-1,2464,899,1,2470,
-3464,16,0,491,1,
-67,3465,19,406,1,
-67,3466,5,9,1,
-2519,1618,1,2557,1627,
-1,2521,3467,16,0,
-404,1,2559,1633,1,
-2597,3468,16,0,404,
-1,2561,3469,16,0,
-404,1,2459,882,1,
-2464,899,1,2470,3470,
-16,0,404,1,68,
-3471,19,403,1,68,
-3472,5,9,1,2519,
-1618,1,2557,1627,1,
-2521,3473,16,0,401,
-1,2559,1633,1,2597,
-3474,16,0,401,1,
-2561,3475,16,0,401,
-1,2459,882,1,2464,
-899,1,2470,3476,16,
-0,401,1,69,3477,
-19,486,1,69,3478,
-5,9,1,2519,1618,
-1,2557,1627,1,2521,
-3479,16,0,484,1,
-2559,1633,1,2597,3480,
-16,0,484,1,2561,
-3481,16,0,484,1,
-2459,882,1,2464,899,
-1,2470,3482,16,0,
-484,1,70,3483,19,
-399,1,70,3484,5,
-9,1,2519,1618,1,
-2557,1627,1,2521,3485,
-16,0,397,1,2559,
-1633,1,2597,3486,16,
-0,397,1,2561,3487,
-16,0,397,1,2459,
-882,1,2464,899,1,
-2470,3488,16,0,397,
-1,71,3489,19,483,
-1,71,3490,5,9,
-1,2519,1618,1,2557,
-1627,1,2521,3491,16,
-0,481,1,2559,1633,
-1,2597,3492,16,0,
-481,1,2561,3493,16,
-0,481,1,2459,882,
-1,2464,899,1,2470,
-3494,16,0,481,1,
-72,3495,19,480,1,
-72,3496,5,9,1,
-2519,1618,1,2557,1627,
-1,2521,3497,16,0,
-478,1,2559,1633,1,
-2597,3498,16,0,478,
-1,2561,3499,16,0,
-478,1,2459,882,1,
-2464,899,1,2470,3500,
-16,0,478,1,73,
-3501,19,477,1,73,
-3502,5,9,1,2519,
-1618,1,2557,1627,1,
-2521,3503,16,0,475,
-1,2559,1633,1,2597,
-3504,16,0,475,1,
-2561,3505,16,0,475,
-1,2459,882,1,2464,
-899,1,2470,3506,16,
-0,475,1,74,3507,
-19,474,1,74,3508,
-5,9,1,2519,1618,
-1,2557,1627,1,2521,
-3509,16,0,472,1,
-2559,1633,1,2597,3510,
-16,0,472,1,2561,
-3511,16,0,472,1,
-2459,882,1,2464,899,
-1,2470,3512,16,0,
-472,1,75,3513,19,
-390,1,75,3514,5,
-9,1,2519,1618,1,
-2557,1627,1,2521,3515,
-16,0,388,1,2559,
-1633,1,2597,3516,16,
-0,388,1,2561,3517,
-16,0,388,1,2459,
-882,1,2464,899,1,
-2470,3518,16,0,388,
-1,76,3519,19,387,
-1,76,3520,5,9,
-1,2519,1618,1,2557,
-1627,1,2521,3521,16,
-0,385,1,2559,1633,
-1,2597,3522,16,0,
-385,1,2561,3523,16,
-0,385,1,2459,882,
-1,2464,899,1,2470,
-3524,16,0,385,1,
-77,3525,19,471,1,
-77,3526,5,9,1,
-2519,1618,1,2557,1627,
-1,2521,3527,16,0,
-469,1,2559,1633,1,
-2597,3528,16,0,469,
-1,2561,3529,16,0,
-469,1,2459,882,1,
-2464,899,1,2470,3530,
-16,0,469,1,78,
-3531,19,566,1,78,
-3532,5,9,1,2519,
-1618,1,2557,1627,1,
-2521,3533,16,0,564,
-1,2559,1633,1,2597,
-3534,16,0,564,1,
-2561,3535,16,0,564,
-1,2459,882,1,2464,
-899,1,2470,3536,16,
-0,564,1,79,3537,
-19,380,1,79,3538,
-5,9,1,2519,1618,
-1,2557,1627,1,2521,
-3539,16,0,378,1,
-2559,1633,1,2597,3540,
-16,0,378,1,2561,
-3541,16,0,378,1,
-2459,882,1,2464,899,
-1,2470,3542,16,0,
-378,1,80,3543,19,
-377,1,80,3544,5,
-9,1,2519,1618,1,
-2557,1627,1,2521,3545,
-16,0,375,1,2559,
-1633,1,2597,3546,16,
-0,375,1,2561,3547,
-16,0,375,1,2459,
-882,1,2464,899,1,
-2470,3548,16,0,375,
-1,81,3549,19,374,
-1,81,3550,5,9,
-1,2519,1618,1,2557,
-1627,1,2521,3551,16,
-0,372,1,2559,1633,
-1,2597,3552,16,0,
-372,1,2561,3553,16,
-0,372,1,2459,882,
-1,2464,899,1,2470,
-3554,16,0,372,1,
-82,3555,19,371,1,
-82,3556,5,9,1,
-2519,1618,1,2557,1627,
-1,2521,3557,16,0,
-369,1,2559,1633,1,
-2597,3558,16,0,369,
-1,2561,3559,16,0,
-369,1,2459,882,1,
-2464,899,1,2470,3560,
-16,0,369,1,83,
-3561,19,368,1,83,
-3562,5,9,1,2519,
-1618,1,2557,1627,1,
-2521,3563,16,0,366,
-1,2559,1633,1,2597,
-3564,16,0,366,1,
-2561,3565,16,0,366,
-1,2459,882,1,2464,
-899,1,2470,3566,16,
-0,366,1,84,3567,
-19,365,1,84,3568,
-5,9,1,2519,1618,
-1,2557,1627,1,2521,
-3569,16,0,363,1,
-2559,1633,1,2597,3570,
-16,0,363,1,2561,
-3571,16,0,363,1,
-2459,882,1,2464,899,
-1,2470,3572,16,0,
-363,1,85,3573,19,
-362,1,85,3574,5,
-9,1,2519,1618,1,
-2557,1627,1,2521,3575,
-16,0,360,1,2559,
-1633,1,2597,3576,16,
-0,360,1,2561,3577,
-16,0,360,1,2459,
-882,1,2464,899,1,
-2470,3578,16,0,360,
-1,86,3579,19,359,
-1,86,3580,5,9,
-1,2519,1618,1,2557,
-1627,1,2521,3581,16,
-0,357,1,2559,1633,
-1,2597,3582,16,0,
-357,1,2561,3583,16,
-0,357,1,2459,882,
-1,2464,899,1,2470,
-3584,16,0,357,1,
-87,3585,19,356,1,
-87,3586,5,9,1,
-2519,1618,1,2557,1627,
-1,2521,3587,16,0,
-354,1,2559,1633,1,
-2597,3588,16,0,354,
-1,2561,3589,16,0,
-354,1,2459,882,1,
-2464,899,1,2470,3590,
-16,0,354,1,88,
-3591,19,353,1,88,
-3592,5,9,1,2519,
-1618,1,2557,1627,1,
-2521,3593,16,0,351,
-1,2559,1633,1,2597,
-3594,16,0,351,1,
-2561,3595,16,0,351,
-1,2459,882,1,2464,
-899,1,2470,3596,16,
-0,351,1,89,3597,
-19,347,1,89,3598,
-5,9,1,2519,1618,
-1,2557,1627,1,2521,
-3599,16,0,345,1,
-2559,1633,1,2597,3600,
-16,0,345,1,2561,
-3601,16,0,345,1,
-2459,882,1,2464,899,
-1,2470,3602,16,0,
-345,1,90,3603,19,
-350,1,90,3604,5,
-9,1,2519,1618,1,
-2557,1627,1,2521,3605,
-16,0,348,1,2559,
-1633,1,2597,3606,16,
-0,348,1,2561,3607,
-16,0,348,1,2459,
-882,1,2464,899,1,
-2470,3608,16,0,348,
-1,91,3609,19,344,
-1,91,3610,5,9,
-1,2519,1618,1,2557,
-1627,1,2521,3611,16,
-0,342,1,2559,1633,
-1,2597,3612,16,0,
-342,1,2561,3613,16,
-0,342,1,2459,882,
-1,2464,899,1,2470,
-3614,16,0,342,1,
-92,3615,19,133,1,
-92,3616,5,125,1,
-0,3617,16,0,563,
-1,1,1951,1,2,
-1957,1,3,1962,1,
-4,1967,1,5,1972,
-1,6,1977,1,7,
-1982,1,8,3618,16,
-0,131,1,1515,3619,
-16,0,165,1,2021,
-718,1,2022,3620,16,
-0,497,1,256,3621,
-16,0,173,1,2025,
-3622,16,0,501,1,
-18,3623,16,0,138,
-1,2027,3624,16,0,
-505,1,2695,3625,16,
-0,563,1,2029,725,
-1,2030,731,1,2031,
-736,1,2032,741,1,
-2033,746,1,277,3626,
-16,0,173,1,2035,
-752,1,2037,757,1,
-2039,762,1,32,3627,
-16,0,165,1,2041,
-768,1,2293,3628,16,
-0,173,1,2043,774,
-1,2045,779,1,2713,
-3206,1,2715,3195,1,
-41,3629,16,0,173,
-1,1297,3630,16,0,
-165,1,43,3631,16,
-0,173,1,46,3632,
-16,0,178,1,1804,
-3633,16,0,165,1,
-299,3634,16,0,173,
-1,52,3635,16,0,
-165,1,509,3636,16,
-0,173,1,2318,3637,
-16,0,165,1,62,
-3638,16,0,195,1,
-65,3639,16,0,197,
-1,2075,3640,16,0,
-165,1,1574,799,1,
-71,3641,16,0,173,
-1,1775,3642,16,0,
-165,1,76,3643,16,
-0,173,1,1834,3644,
-16,0,165,1,2337,
-3645,16,0,165,1,
-79,3646,16,0,173,
-1,1335,3647,16,0,
-165,1,322,3648,16,
-0,173,1,85,3649,
-16,0,173,1,1261,
-3650,16,0,165,1,
-89,3651,16,0,173,
-1,346,3652,16,0,
-173,1,97,3653,16,
-0,173,1,2106,3654,
-16,0,165,1,102,
-3655,16,0,173,1,
-1860,821,1,1803,787,
-1,2364,827,1,1113,
-3656,16,0,158,1,
-112,3657,16,0,173,
-1,1117,3658,16,0,
-165,1,1873,835,1,
-1876,3659,16,0,165,
-1,372,3660,16,0,
-535,1,374,3661,16,
-0,537,1,124,3662,
-16,0,173,1,376,
-3663,16,0,539,1,
-378,3664,16,0,541,
-1,2136,842,1,381,
-3665,16,0,173,1,
-525,3666,16,0,173,
-1,137,3667,16,0,
-173,1,1901,3668,16,
-0,165,1,2655,3211,
-1,2658,3669,16,0,
-173,1,1153,3670,16,
-0,165,1,151,3671,
-16,0,173,1,1407,
-3672,16,0,165,1,
-1659,3673,16,0,165,
-1,2413,3674,16,0,
-165,1,406,3675,16,
-0,173,1,1371,3676,
-16,0,165,1,2105,
-814,1,1657,894,1,
-166,3677,16,0,173,
-1,1622,3678,16,0,
-173,1,2683,3223,1,
-1931,861,1,1933,3679,
-16,0,165,1,431,
-3680,16,0,173,1,
-1585,3681,16,0,173,
-1,182,3682,16,0,
-173,1,2694,3216,1,
-1189,3683,16,0,165,
-1,1443,3684,16,0,
-165,1,1695,3685,16,
-0,165,1,2198,3686,
-16,0,165,1,447,
-3687,16,0,173,1,
-2458,876,1,2459,882,
-1,1958,3688,16,0,
-165,1,2462,889,1,
-2714,3183,1,2464,899,
-1,2716,3189,1,2466,
-3200,1,459,3689,16,
-0,173,1,2468,3690,
-16,0,340,1,462,
-3691,16,0,173,1,
-199,3692,16,0,173,
-1,217,3693,16,0,
-173,1,2227,908,1,
-1225,3694,16,0,165,
-1,1479,3695,16,0,
-165,1,1731,3696,16,
-0,173,1,1989,916,
-1,1990,3697,16,0,
-165,1,236,3698,16,
-0,173,1,1756,3699,
-16,0,165,1,93,
-3700,19,626,1,93,
-3701,5,95,1,256,
-3702,16,0,624,1,
-1261,3703,16,0,624,
-1,509,3704,16,0,
-624,1,1515,3705,16,
-0,624,1,2021,718,
-1,1775,3706,16,0,
-624,1,2029,725,1,
-2030,731,1,2031,736,
-1,2032,741,1,2033,
-746,1,277,3707,16,
-0,624,1,2035,752,
-1,2037,757,1,2039,
-762,1,32,3708,16,
-0,624,1,2041,768,
-1,2293,3709,16,0,
-624,1,2043,774,1,
-2045,779,1,41,3710,
-16,0,624,1,1297,
-3711,16,0,624,1,
-43,3712,16,0,624,
-1,1803,787,1,1804,
-3713,16,0,624,1,
-299,3714,16,0,624,
-1,52,3715,16,0,
-624,1,2318,3716,16,
-0,624,1,62,3717,
-16,0,624,1,2075,
-3718,16,0,624,1,
-1574,799,1,71,3719,
-16,0,624,1,76,
-3720,16,0,624,1,
-1834,3721,16,0,624,
-1,2337,3722,16,0,
-624,1,79,3723,16,
-0,624,1,1335,3724,
-16,0,624,1,322,
-3725,16,0,624,1,
-85,3726,16,0,624,
-1,89,3727,16,0,
-624,1,346,3728,16,
-0,624,1,2105,814,
-1,2106,3729,16,0,
-624,1,97,3730,16,
-0,624,1,1860,821,
-1,2364,827,1,102,
-3731,16,0,624,1,
-112,3732,16,0,624,
-1,1117,3733,16,0,
-624,1,1873,835,1,
-1876,3734,16,0,624,
-1,124,3735,16,0,
-624,1,2136,842,1,
-381,3736,16,0,624,
-1,525,3737,16,0,
-624,1,137,3738,16,
-0,624,1,1901,3739,
-16,0,624,1,2658,
-3740,16,0,624,1,
-1153,3741,16,0,624,
-1,151,3742,16,0,
-624,1,1407,3743,16,
-0,624,1,1659,3744,
-16,0,624,1,2413,
-3745,16,0,624,1,
-406,3746,16,0,624,
-1,1371,3747,16,0,
-624,1,166,3748,16,
-0,624,1,1622,3749,
-16,0,624,1,1931,
-861,1,1933,3750,16,
-0,624,1,431,3751,
-16,0,624,1,1585,
-3752,16,0,624,1,
-182,3753,16,0,624,
-1,1189,3754,16,0,
-624,1,1443,3755,16,
-0,624,1,1695,3756,
-16,0,624,1,2198,
-3757,16,0,624,1,
-447,3758,16,0,624,
-1,2458,876,1,2459,
-882,1,1958,3759,16,
-0,624,1,2462,889,
-1,1657,894,1,2464,
-899,1,199,3760,16,
-0,624,1,459,3761,
-16,0,624,1,462,
-3762,16,0,624,1,
-217,3763,16,0,624,
-1,2227,908,1,1225,
-3764,16,0,624,1,
-1479,3765,16,0,624,
-1,1731,3766,16,0,
-624,1,1989,916,1,
-1990,3767,16,0,624,
-1,236,3768,16,0,
-624,1,1756,3769,16,
-0,624,1,94,3770,
-19,623,1,94,3771,
-5,95,1,256,3772,
-16,0,621,1,1261,
-3773,16,0,621,1,
-509,3774,16,0,621,
-1,1515,3775,16,0,
-621,1,2021,718,1,
-1775,3776,16,0,621,
-1,2029,725,1,2030,
-731,1,2031,736,1,
-2032,741,1,2033,746,
-1,277,3777,16,0,
-621,1,2035,752,1,
-2037,757,1,2039,762,
-1,32,3778,16,0,
-621,1,2041,768,1,
-2293,3779,16,0,621,
-1,2043,774,1,2045,
-779,1,41,3780,16,
-0,621,1,1297,3781,
-16,0,621,1,43,
-3782,16,0,621,1,
-1803,787,1,1804,3783,
-16,0,621,1,299,
-3784,16,0,621,1,
-52,3785,16,0,621,
-1,2318,3786,16,0,
-621,1,62,3787,16,
-0,621,1,2075,3788,
-16,0,621,1,1574,
-799,1,71,3789,16,
-0,621,1,76,3790,
-16,0,621,1,1834,
-3791,16,0,621,1,
-2337,3792,16,0,621,
-1,79,3793,16,0,
-621,1,1335,3794,16,
-0,621,1,322,3795,
-16,0,621,1,85,
-3796,16,0,621,1,
-89,3797,16,0,621,
-1,346,3798,16,0,
-621,1,2105,814,1,
-2106,3799,16,0,621,
-1,97,3800,16,0,
-621,1,1860,821,1,
-2364,827,1,102,3801,
-16,0,621,1,112,
-3802,16,0,621,1,
-1117,3803,16,0,621,
-1,1873,835,1,1876,
-3804,16,0,621,1,
-124,3805,16,0,621,
-1,2136,842,1,381,
-3806,16,0,621,1,
-525,3807,16,0,621,
-1,137,3808,16,0,
-621,1,1901,3809,16,
-0,621,1,2658,3810,
-16,0,621,1,1153,
-3811,16,0,621,1,
-151,3812,16,0,621,
-1,1407,3813,16,0,
-621,1,1659,3814,16,
-0,621,1,2413,3815,
-16,0,621,1,406,
-3816,16,0,621,1,
-1371,3817,16,0,621,
-1,166,3818,16,0,
-621,1,1622,3819,16,
-0,621,1,1931,861,
-1,1933,3820,16,0,
-621,1,431,3821,16,
-0,621,1,1585,3822,
-16,0,621,1,182,
-3823,16,0,621,1,
-1189,3824,16,0,621,
-1,1443,3825,16,0,
-621,1,1695,3826,16,
-0,621,1,2198,3827,
-16,0,621,1,447,
-3828,16,0,621,1,
-2458,876,1,2459,882,
-1,1958,3829,16,0,
-621,1,2462,889,1,
-1657,894,1,2464,899,
-1,199,3830,16,0,
-621,1,459,3831,16,
-0,621,1,462,3832,
-16,0,621,1,217,
-3833,16,0,621,1,
-2227,908,1,1225,3834,
-16,0,621,1,1479,
-3835,16,0,621,1,
-1731,3836,16,0,621,
-1,1989,916,1,1990,
-3837,16,0,621,1,
-236,3838,16,0,621,
-1,1756,3839,16,0,
-621,1,95,3840,19,
-620,1,95,3841,5,
-95,1,256,3842,16,
-0,618,1,1261,3843,
-16,0,618,1,509,
-3844,16,0,618,1,
-1515,3845,16,0,618,
-1,2021,718,1,1775,
-3846,16,0,618,1,
-2029,725,1,2030,731,
-1,2031,736,1,2032,
-741,1,2033,746,1,
-277,3847,16,0,618,
-1,2035,752,1,2037,
-757,1,2039,762,1,
-32,3848,16,0,618,
-1,2041,768,1,2293,
-3849,16,0,618,1,
-2043,774,1,2045,779,
-1,41,3850,16,0,
-618,1,1297,3851,16,
-0,618,1,43,3852,
-16,0,618,1,1803,
-787,1,1804,3853,16,
-0,618,1,299,3854,
-16,0,618,1,52,
-3855,16,0,618,1,
-2318,3856,16,0,618,
-1,62,3857,16,0,
-618,1,2075,3858,16,
-0,618,1,1574,799,
-1,71,3859,16,0,
-618,1,76,3860,16,
-0,618,1,1834,3861,
-16,0,618,1,2337,
-3862,16,0,618,1,
-79,3863,16,0,618,
-1,1335,3864,16,0,
-618,1,322,3865,16,
-0,618,1,85,3866,
-16,0,618,1,89,
-3867,16,0,618,1,
-346,3868,16,0,618,
-1,2105,814,1,2106,
-3869,16,0,618,1,
-97,3870,16,0,618,
-1,1860,821,1,2364,
-827,1,102,3871,16,
-0,618,1,112,3872,
-16,0,618,1,1117,
-3873,16,0,618,1,
-1873,835,1,1876,3874,
-16,0,618,1,124,
-3875,16,0,618,1,
-2136,842,1,381,3876,
-16,0,618,1,525,
-3877,16,0,618,1,
-137,3878,16,0,618,
-1,1901,3879,16,0,
-618,1,2658,3880,16,
-0,618,1,1153,3881,
-16,0,618,1,151,
-3882,16,0,618,1,
-1407,3883,16,0,618,
-1,1659,3884,16,0,
-618,1,2413,3885,16,
-0,618,1,406,3886,
-16,0,618,1,1371,
-3887,16,0,618,1,
-166,3888,16,0,618,
-1,1622,3889,16,0,
-618,1,1931,861,1,
-1933,3890,16,0,618,
-1,431,3891,16,0,
-618,1,1585,3892,16,
-0,618,1,182,3893,
-16,0,618,1,1189,
-3894,16,0,618,1,
-1443,3895,16,0,618,
-1,1695,3896,16,0,
-618,1,2198,3897,16,
-0,618,1,447,3898,
-16,0,618,1,2458,
-876,1,2459,882,1,
-1958,3899,16,0,618,
-1,2462,889,1,1657,
-894,1,2464,899,1,
-199,3900,16,0,618,
-1,459,3901,16,0,
-618,1,462,3902,16,
-0,618,1,217,3903,
-16,0,618,1,2227,
-908,1,1225,3904,16,
-0,618,1,1479,3905,
-16,0,618,1,1731,
-3906,16,0,618,1,
-1989,916,1,1990,3907,
-16,0,618,1,236,
-3908,16,0,618,1,
-1756,3909,16,0,618,
-1,96,3910,19,103,
-1,96,3911,5,1,
-1,0,3912,16,0,
-104,1,97,3913,19,
-611,1,97,3914,5,
-1,1,0,3915,16,
-0,609,1,98,3916,
-19,636,1,98,3917,
-5,2,1,0,3918,
-16,0,638,1,2695,
-3919,16,0,634,1,
-99,3920,19,633,1,
-99,3921,5,2,1,
-0,3922,16,0,637,
-1,2695,3923,16,0,
-631,1,100,3924,19,
-296,1,100,3925,5,
-2,1,0,3926,16,
-0,557,1,2695,3927,
-16,0,294,1,101,
-3928,19,561,1,101,
-3929,5,4,1,0,
-3930,16,0,641,1,
-2695,3931,16,0,641,
-1,2706,3932,16,0,
-559,1,2636,3933,16,
-0,559,1,102,3934,
-19,591,1,102,3935,
-5,2,1,2470,3936,
-16,0,664,1,2561,
-3937,16,0,589,1,
-103,3938,19,463,1,
-103,3939,5,4,1,
-2597,3940,16,0,558,
-1,2521,3941,16,0,
-558,1,2470,3942,16,
-0,461,1,2561,3943,
-16,0,461,1,104,
-3944,19,141,1,104,
-3945,5,3,1,2642,
-3946,16,0,569,1,
-2506,3947,16,0,317,
-1,10,3948,16,0,
-139,1,105,3949,19,
-151,1,105,3950,5,
-17,1,0,3951,16,
-0,254,1,2075,3952,
-16,0,648,1,2337,
-3953,16,0,648,1,
-2413,3954,16,0,648,
-1,10,3955,16,0,
-336,1,2198,3956,16,
-0,648,1,1901,3957,
-16,0,648,1,2642,
-3958,16,0,336,1,
-21,3959,16,0,149,
-1,2106,3960,16,0,
-648,1,2506,3961,16,
-0,336,1,1804,3962,
-16,0,648,1,1990,
-3963,16,0,648,1,
-2695,3964,16,0,254,
-1,32,3965,16,0,
-648,1,1958,3966,16,
-0,648,1,1775,3967,
-16,0,648,1,106,
-3968,19,130,1,106,
-3969,5,18,1,0,
-3970,16,0,128,1,
-2642,3971,16,0,137,
-1,2075,3972,16,0,
-137,1,2337,3973,16,
-0,137,1,2413,3974,
+831,1,1804,3365,16,
+0,116,1,10,3366,
+16,0,116,1,2413,
+3367,16,0,116,1,
+2198,3368,16,0,116,
+1,1873,845,1,21,
+3369,16,0,116,1,
+1657,903,1,2030,741,
+1,1989,925,1,1990,
+3370,16,0,116,1,
+2459,891,1,1775,3371,
+16,0,116,1,32,
+3372,16,0,116,1,
+2105,824,1,2106,3373,
+16,0,116,1,2654,
+3374,16,0,116,1,
+2227,917,1,2337,3375,
+16,0,116,1,2667,
+3248,1,52,3376,16,
+0,116,1,2695,3253,
+1,1803,797,1,2458,
+885,1,1901,3377,16,
+0,116,1,2462,898,
+1,2136,852,1,2464,
+908,1,2029,735,1,
+2466,3232,1,2031,746,
+1,2032,751,1,2033,
+756,1,2035,762,1,
+2364,837,1,2039,772,
+1,1931,870,1,2041,
+778,1,2021,728,1,
+2043,784,1,2045,789,
+1,2511,3378,16,0,
+116,1,2725,3211,1,
+2706,3222,1,2707,3379,
+16,0,116,1,2037,
+767,1,1574,809,1,
+1958,3380,16,0,116,
+1,55,3381,19,115,
+1,55,3382,5,53,
+1,0,3383,16,0,
+113,1,2726,3217,1,
+2727,3238,1,2728,3243,
+1,2075,3384,16,0,
+113,1,1860,831,1,
+1804,3385,16,0,113,
+1,10,3386,16,0,
+113,1,2413,3387,16,
+0,113,1,2198,3388,
+16,0,113,1,1873,
+845,1,21,3389,16,
+0,113,1,1657,903,
+1,2030,741,1,1989,
+925,1,1990,3390,16,
+0,113,1,2459,891,
+1,1775,3391,16,0,
+113,1,32,3392,16,
+0,113,1,2105,824,
+1,2106,3393,16,0,
+113,1,2654,3394,16,
+0,113,1,2227,917,
+1,2337,3395,16,0,
+113,1,2667,3248,1,
+52,3396,16,0,113,
+1,2695,3253,1,1803,
+797,1,2458,885,1,
+1901,3397,16,0,113,
+1,2462,898,1,2136,
+852,1,2464,908,1,
+2029,735,1,2466,3232,
+1,2031,746,1,2032,
+751,1,2033,756,1,
+2035,762,1,2364,837,
+1,2039,772,1,1931,
+870,1,2041,778,1,
+2021,728,1,2043,784,
+1,2045,789,1,2511,
+3398,16,0,113,1,
+2725,3211,1,2706,3222,
+1,2707,3399,16,0,
+113,1,2037,767,1,
+1574,809,1,1958,3400,
+16,0,113,1,56,
+3401,19,112,1,56,
+3402,5,53,1,0,
+3403,16,0,110,1,
+2726,3217,1,2727,3238,
+1,2728,3243,1,2075,
+3404,16,0,110,1,
+1860,831,1,1804,3405,
+16,0,110,1,10,
+3406,16,0,110,1,
+2413,3407,16,0,110,
+1,2198,3408,16,0,
+110,1,1873,845,1,
+21,3409,16,0,110,
+1,1657,903,1,2030,
+741,1,1989,925,1,
+1990,3410,16,0,110,
+1,2459,891,1,1775,
+3411,16,0,110,1,
+32,3412,16,0,110,
+1,2105,824,1,2106,
+3413,16,0,110,1,
+2654,3414,16,0,110,
+1,2227,917,1,2337,
+3415,16,0,110,1,
+2667,3248,1,52,3416,
+16,0,110,1,2695,
+3253,1,1803,797,1,
+2458,885,1,1901,3417,
+16,0,110,1,2462,
+898,1,2136,852,1,
+2464,908,1,2029,735,
+1,2466,3232,1,2031,
+746,1,2032,751,1,
+2033,756,1,2035,762,
+1,2364,837,1,2039,
+772,1,1931,870,1,
+2041,778,1,2021,728,
+1,2043,784,1,2045,
+789,1,2511,3418,16,
+0,110,1,2725,3211,
+1,2706,3222,1,2707,
+3419,16,0,110,1,
+2037,767,1,1574,809,
+1,1958,3420,16,0,
+110,1,57,3421,19,
+109,1,57,3422,5,
+53,1,0,3423,16,
+0,107,1,2726,3217,
+1,2727,3238,1,2728,
+3243,1,2075,3424,16,
+0,107,1,1860,831,
+1,1804,3425,16,0,
+107,1,10,3426,16,
+0,107,1,2413,3427,
+16,0,107,1,2198,
+3428,16,0,107,1,
+1873,845,1,21,3429,
+16,0,107,1,1657,
+903,1,2030,741,1,
+1989,925,1,1990,3430,
+16,0,107,1,2459,
+891,1,1775,3431,16,
+0,107,1,32,3432,
+16,0,107,1,2105,
+824,1,2106,3433,16,
+0,107,1,2654,3434,
+16,0,107,1,2227,
+917,1,2337,3435,16,
+0,107,1,2667,3248,
+1,52,3436,16,0,
+107,1,2695,3253,1,
+1803,797,1,2458,885,
+1,1901,3437,16,0,
+107,1,2462,898,1,
+2136,852,1,2464,908,
+1,2029,735,1,2466,
+3232,1,2031,746,1,
+2032,751,1,2033,756,
+1,2035,762,1,2364,
+837,1,2039,772,1,
+1931,870,1,2041,778,
+1,2021,728,1,2043,
+784,1,2045,789,1,
+2511,3438,16,0,107,
+1,2725,3211,1,2706,
+3222,1,2707,3439,16,
+0,107,1,2037,767,
+1,1574,809,1,1958,
+3440,16,0,107,1,
+58,3441,19,437,1,
+58,3442,5,12,1,
+2524,1636,1,2526,3443,
+16,0,435,1,2564,
+1655,1,2566,1660,1,
+2567,1644,1,2606,3444,
+16,0,435,1,2459,
+891,1,2563,1650,1,
+2464,908,1,2569,3445,
+16,0,435,1,2470,
+3446,16,0,435,1,
+2509,1629,1,59,3447,
+19,434,1,59,3448,
+5,12,1,2524,1636,
+1,2526,3449,16,0,
+432,1,2564,1655,1,
+2566,1660,1,2567,1644,
+1,2606,3450,16,0,
+432,1,2459,891,1,
+2563,1650,1,2464,908,
+1,2569,3451,16,0,
+432,1,2470,3452,16,
+0,432,1,2509,1629,
+1,60,3453,19,431,
+1,60,3454,5,12,
+1,2524,1636,1,2526,
+3455,16,0,429,1,
+2564,1655,1,2566,1660,
+1,2567,1644,1,2606,
+3456,16,0,429,1,
+2459,891,1,2563,1650,
+1,2464,908,1,2569,
+3457,16,0,429,1,
+2470,3458,16,0,429,
+1,2509,1629,1,61,
+3459,19,428,1,61,
+3460,5,12,1,2524,
+1636,1,2526,3461,16,
+0,426,1,2564,1655,
+1,2566,1660,1,2567,
+1644,1,2606,3462,16,
+0,426,1,2459,891,
+1,2563,1650,1,2464,
+908,1,2569,3463,16,
+0,426,1,2470,3464,
+16,0,426,1,2509,
+1629,1,62,3465,19,
+425,1,62,3466,5,
+12,1,2524,1636,1,
+2526,3467,16,0,423,
+1,2564,1655,1,2566,
+1660,1,2567,1644,1,
+2606,3468,16,0,423,
+1,2459,891,1,2563,
+1650,1,2464,908,1,
+2569,3469,16,0,423,
+1,2470,3470,16,0,
+423,1,2509,1629,1,
+63,3471,19,422,1,
+63,3472,5,12,1,
+2524,1636,1,2526,3473,
+16,0,420,1,2564,
+1655,1,2566,1660,1,
+2567,1644,1,2606,3474,
+16,0,420,1,2459,
+891,1,2563,1650,1,
+2464,908,1,2569,3475,
+16,0,420,1,2470,
+3476,16,0,420,1,
+2509,1629,1,64,3477,
+19,663,1,64,3478,
+5,12,1,2524,1636,
+1,2526,3479,16,0,
+661,1,2564,1655,1,
+2566,1660,1,2567,1644,
+1,2606,3480,16,0,
+661,1,2459,891,1,
+2563,1650,1,2464,908,
+1,2569,3481,16,0,
+661,1,2470,3482,16,
+0,661,1,2509,1629,
+1,65,3483,19,418,
+1,65,3484,5,12,
+1,2524,1636,1,2526,
+3485,16,0,416,1,
+2564,1655,1,2566,1660,
+1,2567,1644,1,2606,
+3486,16,0,416,1,
+2459,891,1,2563,1650,
+1,2464,908,1,2569,
+3487,16,0,416,1,
+2470,3488,16,0,416,
+1,2509,1629,1,66,
+3489,19,503,1,66,
+3490,5,12,1,2524,
+1636,1,2526,3491,16,
+0,501,1,2564,1655,
+1,2566,1660,1,2567,
+1644,1,2606,3492,16,
+0,501,1,2459,891,
+1,2563,1650,1,2464,
+908,1,2569,3493,16,
+0,501,1,2470,3494,
+16,0,501,1,2509,
+1629,1,67,3495,19,
+414,1,67,3496,5,
+12,1,2524,1636,1,
+2526,3497,16,0,412,
+1,2564,1655,1,2566,
+1660,1,2567,1644,1,
+2606,3498,16,0,412,
+1,2459,891,1,2563,
+1650,1,2464,908,1,
+2569,3499,16,0,412,
+1,2470,3500,16,0,
+412,1,2509,1629,1,
+68,3501,19,411,1,
+68,3502,5,12,1,
+2524,1636,1,2526,3503,
+16,0,409,1,2564,
+1655,1,2566,1660,1,
+2567,1644,1,2606,3504,
+16,0,409,1,2459,
+891,1,2563,1650,1,
+2464,908,1,2569,3505,
+16,0,409,1,2470,
+3506,16,0,409,1,
+2509,1629,1,69,3507,
+19,496,1,69,3508,
+5,12,1,2524,1636,
+1,2526,3509,16,0,
+494,1,2564,1655,1,
+2566,1660,1,2567,1644,
+1,2606,3510,16,0,
+494,1,2459,891,1,
+2563,1650,1,2464,908,
+1,2569,3511,16,0,
+494,1,2470,3512,16,
+0,494,1,2509,1629,
+1,70,3513,19,407,
+1,70,3514,5,12,
+1,2524,1636,1,2526,
+3515,16,0,405,1,
+2564,1655,1,2566,1660,
+1,2567,1644,1,2606,
+3516,16,0,405,1,
+2459,891,1,2563,1650,
+1,2464,908,1,2569,
+3517,16,0,405,1,
+2470,3518,16,0,405,
+1,2509,1629,1,71,
+3519,19,493,1,71,
+3520,5,12,1,2524,
+1636,1,2526,3521,16,
+0,491,1,2564,1655,
+1,2566,1660,1,2567,
+1644,1,2606,3522,16,
+0,491,1,2459,891,
+1,2563,1650,1,2464,
+908,1,2569,3523,16,
+0,491,1,2470,3524,
+16,0,491,1,2509,
+1629,1,72,3525,19,
+490,1,72,3526,5,
+12,1,2524,1636,1,
+2526,3527,16,0,488,
+1,2564,1655,1,2566,
+1660,1,2567,1644,1,
+2606,3528,16,0,488,
+1,2459,891,1,2563,
+1650,1,2464,908,1,
+2569,3529,16,0,488,
+1,2470,3530,16,0,
+488,1,2509,1629,1,
+73,3531,19,487,1,
+73,3532,5,12,1,
+2524,1636,1,2526,3533,
+16,0,485,1,2564,
+1655,1,2566,1660,1,
+2567,1644,1,2606,3534,
+16,0,485,1,2459,
+891,1,2563,1650,1,
+2464,908,1,2569,3535,
+16,0,485,1,2470,
+3536,16,0,485,1,
+2509,1629,1,74,3537,
+19,484,1,74,3538,
+5,12,1,2524,1636,
+1,2526,3539,16,0,
+482,1,2564,1655,1,
+2566,1660,1,2567,1644,
+1,2606,3540,16,0,
+482,1,2459,891,1,
+2563,1650,1,2464,908,
+1,2569,3541,16,0,
+482,1,2470,3542,16,
+0,482,1,2509,1629,
+1,75,3543,19,398,
+1,75,3544,5,12,
+1,2524,1636,1,2526,
+3545,16,0,396,1,
+2564,1655,1,2566,1660,
+1,2567,1644,1,2606,
+3546,16,0,396,1,
+2459,891,1,2563,1650,
+1,2464,908,1,2569,
+3547,16,0,396,1,
+2470,3548,16,0,396,
+1,2509,1629,1,76,
+3549,19,395,1,76,
+3550,5,12,1,2524,
+1636,1,2526,3551,16,
+0,393,1,2564,1655,
+1,2566,1660,1,2567,
+1644,1,2606,3552,16,
+0,393,1,2459,891,
+1,2563,1650,1,2464,
+908,1,2569,3553,16,
+0,393,1,2470,3554,
+16,0,393,1,2509,
+1629,1,77,3555,19,
+477,1,77,3556,5,
+12,1,2524,1636,1,
+2526,3557,16,0,475,
+1,2564,1655,1,2566,
+1660,1,2567,1644,1,
+2606,3558,16,0,475,
+1,2459,891,1,2563,
+1650,1,2464,908,1,
+2569,3559,16,0,475,
+1,2470,3560,16,0,
+475,1,2509,1629,1,
+78,3561,19,571,1,
+78,3562,5,12,1,
+2524,1636,1,2526,3563,
+16,0,569,1,2564,
+1655,1,2566,1660,1,
+2567,1644,1,2606,3564,
+16,0,569,1,2459,
+891,1,2563,1650,1,
+2464,908,1,2569,3565,
+16,0,569,1,2470,
+3566,16,0,569,1,
+2509,1629,1,79,3567,
+19,388,1,79,3568,
+5,12,1,2524,1636,
+1,2526,3569,16,0,
+386,1,2564,1655,1,
+2566,1660,1,2567,1644,
+1,2606,3570,16,0,
+386,1,2459,891,1,
+2563,1650,1,2464,908,
+1,2569,3571,16,0,
+386,1,2470,3572,16,
+0,386,1,2509,1629,
+1,80,3573,19,385,
+1,80,3574,5,12,
+1,2524,1636,1,2526,
+3575,16,0,383,1,
+2564,1655,1,2566,1660,
+1,2567,1644,1,2606,
+3576,16,0,383,1,
+2459,891,1,2563,1650,
+1,2464,908,1,2569,
+3577,16,0,383,1,
+2470,3578,16,0,383,
+1,2509,1629,1,81,
+3579,19,382,1,81,
+3580,5,12,1,2524,
+1636,1,2526,3581,16,
+0,380,1,2564,1655,
+1,2566,1660,1,2567,
+1644,1,2606,3582,16,
+0,380,1,2459,891,
+1,2563,1650,1,2464,
+908,1,2569,3583,16,
+0,380,1,2470,3584,
+16,0,380,1,2509,
+1629,1,82,3585,19,
+379,1,82,3586,5,
+12,1,2524,1636,1,
+2526,3587,16,0,377,
+1,2564,1655,1,2566,
+1660,1,2567,1644,1,
+2606,3588,16,0,377,
+1,2459,891,1,2563,
+1650,1,2464,908,1,
+2569,3589,16,0,377,
+1,2470,3590,16,0,
+377,1,2509,1629,1,
+83,3591,19,376,1,
+83,3592,5,12,1,
+2524,1636,1,2526,3593,
+16,0,374,1,2564,
+1655,1,2566,1660,1,
+2567,1644,1,2606,3594,
+16,0,374,1,2459,
+891,1,2563,1650,1,
+2464,908,1,2569,3595,
+16,0,374,1,2470,
+3596,16,0,374,1,
+2509,1629,1,84,3597,
+19,373,1,84,3598,
+5,12,1,2524,1636,
+1,2526,3599,16,0,
+371,1,2564,1655,1,
+2566,1660,1,2567,1644,
+1,2606,3600,16,0,
+371,1,2459,891,1,
+2563,1650,1,2464,908,
+1,2569,3601,16,0,
+371,1,2470,3602,16,
+0,371,1,2509,1629,
+1,85,3603,19,352,
+1,85,3604,5,12,
+1,2524,1636,1,2526,
+3605,16,0,350,1,
+2564,1655,1,2566,1660,
+1,2567,1644,1,2606,
+3606,16,0,350,1,
+2459,891,1,2563,1650,
+1,2464,908,1,2569,
+3607,16,0,350,1,
+2470,3608,16,0,350,
+1,2509,1629,1,86,
+3609,19,370,1,86,
+3610,5,12,1,2524,
+1636,1,2526,3611,16,
+0,368,1,2564,1655,
+1,2566,1660,1,2567,
+1644,1,2606,3612,16,
+0,368,1,2459,891,
+1,2563,1650,1,2464,
+908,1,2569,3613,16,
+0,368,1,2470,3614,
+16,0,368,1,2509,
+1629,1,87,3615,19,
+367,1,87,3616,5,
+12,1,2524,1636,1,
+2526,3617,16,0,365,
+1,2564,1655,1,2566,
+1660,1,2567,1644,1,
+2606,3618,16,0,365,
+1,2459,891,1,2563,
+1650,1,2464,908,1,
+2569,3619,16,0,365,
+1,2470,3620,16,0,
+365,1,2509,1629,1,
+88,3621,19,364,1,
+88,3622,5,12,1,
+2524,1636,1,2526,3623,
+16,0,362,1,2564,
+1655,1,2566,1660,1,
+2567,1644,1,2606,3624,
+16,0,362,1,2459,
+891,1,2563,1650,1,
+2464,908,1,2569,3625,
+16,0,362,1,2470,
+3626,16,0,362,1,
+2509,1629,1,89,3627,
+19,358,1,89,3628,
+5,12,1,2524,1636,
+1,2526,3629,16,0,
+356,1,2564,1655,1,
+2566,1660,1,2567,1644,
+1,2606,3630,16,0,
+356,1,2459,891,1,
+2563,1650,1,2464,908,
+1,2569,3631,16,0,
+356,1,2470,3632,16,
+0,356,1,2509,1629,
+1,90,3633,19,361,
+1,90,3634,5,12,
+1,2524,1636,1,2526,
+3635,16,0,359,1,
+2564,1655,1,2566,1660,
+1,2567,1644,1,2606,
+3636,16,0,359,1,
+2459,891,1,2563,1650,
+1,2464,908,1,2569,
+3637,16,0,359,1,
+2470,3638,16,0,359,
+1,2509,1629,1,91,
+3639,19,355,1,91,
+3640,5,12,1,2524,
+1636,1,2526,3641,16,
+0,353,1,2564,1655,
+1,2566,1660,1,2567,
+1644,1,2606,3642,16,
+0,353,1,2459,891,
+1,2563,1650,1,2464,
+908,1,2569,3643,16,
+0,353,1,2470,3644,
+16,0,353,1,2509,
+1629,1,92,3645,19,
+133,1,92,3646,5,
+125,1,0,3647,16,
+0,585,1,1,1980,
+1,2,1986,1,3,
+1991,1,4,1996,1,
+5,2001,1,6,2006,
+1,7,2011,1,8,
+3648,16,0,131,1,
+1515,3649,16,0,174,
+1,2021,728,1,2022,
+3650,16,0,507,1,
+256,3651,16,0,182,
+1,2025,3652,16,0,
+511,1,18,3653,16,
+0,138,1,2027,3654,
+16,0,515,1,2695,
+3253,1,2029,735,1,
+2030,741,1,2031,746,
+1,2032,751,1,2033,
+756,1,277,3655,16,
+0,182,1,2035,762,
+1,2037,767,1,2039,
+772,1,32,3656,16,
+0,174,1,2041,778,
+1,2293,3657,16,0,
+182,1,2043,784,1,
+2045,789,1,41,3658,
+16,0,182,1,1297,
+3659,16,0,174,1,
+43,3660,16,0,182,
+1,46,3661,16,0,
+187,1,1804,3662,16,
+0,174,1,299,3663,
+16,0,182,1,2725,
+3211,1,52,3664,16,
+0,174,1,509,3665,
+16,0,182,1,2318,
+3666,16,0,174,1,
+62,3667,16,0,205,
+1,65,3668,16,0,
+207,1,2075,3669,16,
+0,174,1,1574,809,
+1,71,3670,16,0,
+182,1,1775,3671,16,
+0,174,1,76,3672,
+16,0,182,1,1834,
+3673,16,0,174,1,
+2337,3674,16,0,174,
+1,79,3675,16,0,
+182,1,1335,3676,16,
+0,174,1,322,3677,
+16,0,182,1,85,
+3678,16,0,182,1,
+1261,3679,16,0,174,
+1,89,3680,16,0,
+182,1,346,3681,16,
+0,182,1,97,3682,
+16,0,182,1,2106,
+3683,16,0,174,1,
+102,3684,16,0,182,
+1,1860,831,1,1803,
+797,1,2364,837,1,
+1113,3685,16,0,167,
+1,112,3686,16,0,
+182,1,1117,3687,16,
+0,174,1,1873,845,
+1,1876,3688,16,0,
+174,1,372,3689,16,
+0,545,1,374,3690,
+16,0,547,1,124,
+3691,16,0,182,1,
+376,3692,16,0,549,
+1,378,3693,16,0,
+551,1,2136,852,1,
+381,3694,16,0,182,
+1,525,3695,16,0,
+182,1,137,3696,16,
+0,182,1,1901,3697,
+16,0,174,1,1153,
+3698,16,0,174,1,
+151,3699,16,0,182,
+1,1407,3700,16,0,
+174,1,1659,3701,16,
+0,174,1,2413,3702,
+16,0,174,1,406,
+3703,16,0,182,1,
+2667,3248,1,1371,3704,
+16,0,174,1,2105,
+824,1,166,3705,16,
+0,182,1,1622,3706,
+16,0,182,1,1931,
+870,1,1933,3707,16,
+0,174,1,431,3708,
+16,0,182,1,1585,
+3709,16,0,182,1,
+182,3710,16,0,182,
+1,1189,3711,16,0,
+174,1,1443,3712,16,
+0,174,1,1695,3713,
+16,0,174,1,2198,
+3714,16,0,174,1,
+2706,3222,1,2707,3715,
+16,0,585,1,2458,
+885,1,2459,891,1,
+1958,3716,16,0,174,
+1,2462,898,1,1657,
+903,1,2464,908,1,
+2466,3232,1,459,3717,
+16,0,182,1,2468,
+3718,16,0,348,1,
+447,3719,16,0,182,
+1,199,3720,16,0,
+182,1,2726,3217,1,
+2727,3238,1,2728,3243,
+1,2227,917,1,1225,
+3721,16,0,174,1,
+1479,3722,16,0,174,
+1,1731,3723,16,0,
+182,1,462,3724,16,
+0,182,1,1989,925,
+1,1990,3725,16,0,
+174,1,236,3726,16,
+0,182,1,217,3727,
+16,0,182,1,2670,
+3728,16,0,182,1,
+1756,3729,16,0,174,
+1,93,3730,19,639,
+1,93,3731,5,95,
+1,256,3732,16,0,
+637,1,1261,3733,16,
+0,637,1,509,3734,
+16,0,637,1,1515,
+3735,16,0,637,1,
+2021,728,1,1775,3736,
+16,0,637,1,2029,
+735,1,2030,741,1,
+2031,746,1,2032,751,
+1,2033,756,1,277,
+3737,16,0,637,1,
+2035,762,1,2037,767,
+1,2039,772,1,32,
+3738,16,0,637,1,
+2041,778,1,2293,3739,
+16,0,637,1,2043,
+784,1,2045,789,1,
+41,3740,16,0,637,
+1,1297,3741,16,0,
+637,1,43,3742,16,
+0,637,1,1803,797,
+1,1804,3743,16,0,
+637,1,299,3744,16,
+0,637,1,52,3745,
+16,0,637,1,2318,
+3746,16,0,637,1,
+62,3747,16,0,637,
+1,2075,3748,16,0,
+637,1,1574,809,1,
+71,3749,16,0,637,
+1,76,3750,16,0,
+637,1,1834,3751,16,
+0,637,1,2337,3752,
+16,0,637,1,79,
+3753,16,0,637,1,
+1335,3754,16,0,637,
+1,322,3755,16,0,
+637,1,85,3756,16,
+0,637,1,89,3757,
+16,0,637,1,346,
+3758,16,0,637,1,
+2105,824,1,2106,3759,
+16,0,637,1,97,
+3760,16,0,637,1,
+1860,831,1,2364,837,
+1,102,3761,16,0,
+637,1,112,3762,16,
+0,637,1,1117,3763,
+16,0,637,1,1873,
+845,1,1876,3764,16,
+0,637,1,124,3765,
+16,0,637,1,2136,
+852,1,381,3766,16,
+0,637,1,525,3767,
+16,0,637,1,137,
+3768,16,0,637,1,
+1901,3769,16,0,637,
+1,1153,3770,16,0,
+637,1,151,3771,16,
+0,637,1,1407,3772,
+16,0,637,1,1659,
+3773,16,0,637,1,
+2413,3774,16,0,637,
+1,406,3775,16,0,
+637,1,1371,3776,16,
+0,637,1,166,3777,
+16,0,637,1,1622,
+3778,16,0,637,1,
+1931,870,1,1933,3779,
+16,0,637,1,431,
+3780,16,0,637,1,
+1585,3781,16,0,637,
+1,182,3782,16,0,
+637,1,1189,3783,16,
+0,637,1,1443,3784,
+16,0,637,1,1695,
+3785,16,0,637,1,
+2198,3786,16,0,637,
+1,447,3787,16,0,
+637,1,2458,885,1,
+2459,891,1,1958,3788,
+16,0,637,1,2462,
+898,1,1657,903,1,
+2464,908,1,199,3789,
+16,0,637,1,459,
+3790,16,0,637,1,
+462,3791,16,0,637,
+1,217,3792,16,0,
+637,1,2227,917,1,
+1225,3793,16,0,637,
+1,1479,3794,16,0,
+637,1,1731,3795,16,
+0,637,1,1989,925,
+1,1990,3796,16,0,
+637,1,236,3797,16,
+0,637,1,2670,3798,
+16,0,637,1,1756,
+3799,16,0,637,1,
+94,3800,19,636,1,
+94,3801,5,95,1,
+256,3802,16,0,634,
+1,1261,3803,16,0,
+634,1,509,3804,16,
+0,634,1,1515,3805,
+16,0,634,1,2021,
+728,1,1775,3806,16,
+0,634,1,2029,735,
+1,2030,741,1,2031,
+746,1,2032,751,1,
+2033,756,1,277,3807,
+16,0,634,1,2035,
+762,1,2037,767,1,
+2039,772,1,32,3808,
+16,0,634,1,2041,
+778,1,2293,3809,16,
+0,634,1,2043,784,
+1,2045,789,1,41,
+3810,16,0,634,1,
+1297,3811,16,0,634,
+1,43,3812,16,0,
+634,1,1803,797,1,
+1804,3813,16,0,634,
+1,299,3814,16,0,
+634,1,52,3815,16,
+0,634,1,2318,3816,
+16,0,634,1,62,
+3817,16,0,634,1,
+2075,3818,16,0,634,
+1,1574,809,1,71,
+3819,16,0,634,1,
+76,3820,16,0,634,
+1,1834,3821,16,0,
+634,1,2337,3822,16,
+0,634,1,79,3823,
+16,0,634,1,1335,
+3824,16,0,634,1,
+322,3825,16,0,634,
+1,85,3826,16,0,
+634,1,89,3827,16,
+0,634,1,346,3828,
+16,0,634,1,2105,
+824,1,2106,3829,16,
+0,634,1,97,3830,
+16,0,634,1,1860,
+831,1,2364,837,1,
+102,3831,16,0,634,
+1,112,3832,16,0,
+634,1,1117,3833,16,
+0,634,1,1873,845,
+1,1876,3834,16,0,
+634,1,124,3835,16,
+0,634,1,2136,852,
+1,381,3836,16,0,
+634,1,525,3837,16,
+0,634,1,137,3838,
+16,0,634,1,1901,
+3839,16,0,634,1,
+1153,3840,16,0,634,
+1,151,3841,16,0,
+634,1,1407,3842,16,
+0,634,1,1659,3843,
+16,0,634,1,2413,
+3844,16,0,634,1,
+406,3845,16,0,634,
+1,1371,3846,16,0,
+634,1,166,3847,16,
+0,634,1,1622,3848,
+16,0,634,1,1931,
+870,1,1933,3849,16,
+0,634,1,431,3850,
+16,0,634,1,1585,
+3851,16,0,634,1,
+182,3852,16,0,634,
+1,1189,3853,16,0,
+634,1,1443,3854,16,
+0,634,1,1695,3855,
+16,0,634,1,2198,
+3856,16,0,634,1,
+447,3857,16,0,634,
+1,2458,885,1,2459,
+891,1,1958,3858,16,
+0,634,1,2462,898,
+1,1657,903,1,2464,
+908,1,199,3859,16,
+0,634,1,459,3860,
+16,0,634,1,462,
+3861,16,0,634,1,
+217,3862,16,0,634,
+1,2227,917,1,1225,
+3863,16,0,634,1,
+1479,3864,16,0,634,
+1,1731,3865,16,0,
+634,1,1989,925,1,
+1990,3866,16,0,634,
+1,236,3867,16,0,
+634,1,2670,3868,16,
+0,634,1,1756,3869,
+16,0,634,1,95,
+3870,19,633,1,95,
+3871,5,95,1,256,
+3872,16,0,631,1,
+1261,3873,16,0,631,
+1,509,3874,16,0,
+631,1,1515,3875,16,
+0,631,1,2021,728,
+1,1775,3876,16,0,
+631,1,2029,735,1,
+2030,741,1,2031,746,
+1,2032,751,1,2033,
+756,1,277,3877,16,
+0,631,1,2035,762,
+1,2037,767,1,2039,
+772,1,32,3878,16,
+0,631,1,2041,778,
+1,2293,3879,16,0,
+631,1,2043,784,1,
+2045,789,1,41,3880,
+16,0,631,1,1297,
+3881,16,0,631,1,
+43,3882,16,0,631,
+1,1803,797,1,1804,
+3883,16,0,631,1,
+299,3884,16,0,631,
+1,52,3885,16,0,
+631,1,2318,3886,16,
+0,631,1,62,3887,
+16,0,631,1,2075,
+3888,16,0,631,1,
+1574,809,1,71,3889,
+16,0,631,1,76,
+3890,16,0,631,1,
+1834,3891,16,0,631,
+1,2337,3892,16,0,
+631,1,79,3893,16,
+0,631,1,1335,3894,
+16,0,631,1,322,
+3895,16,0,631,1,
+85,3896,16,0,631,
+1,89,3897,16,0,
+631,1,346,3898,16,
+0,631,1,2105,824,
+1,2106,3899,16,0,
+631,1,97,3900,16,
+0,631,1,1860,831,
+1,2364,837,1,102,
+3901,16,0,631,1,
+112,3902,16,0,631,
+1,1117,3903,16,0,
+631,1,1873,845,1,
+1876,3904,16,0,631,
+1,124,3905,16,0,
+631,1,2136,852,1,
+381,3906,16,0,631,
+1,525,3907,16,0,
+631,1,137,3908,16,
+0,631,1,1901,3909,
+16,0,631,1,1153,
+3910,16,0,631,1,
+151,3911,16,0,631,
+1,1407,3912,16,0,
+631,1,1659,3913,16,
+0,631,1,2413,3914,
+16,0,631,1,406,
+3915,16,0,631,1,
+1371,3916,16,0,631,
+1,166,3917,16,0,
+631,1,1622,3918,16,
+0,631,1,1931,870,
+1,1933,3919,16,0,
+631,1,431,3920,16,
+0,631,1,1585,3921,
+16,0,631,1,182,
+3922,16,0,631,1,
+1189,3923,16,0,631,
+1,1443,3924,16,0,
+631,1,1695,3925,16,
+0,631,1,2198,3926,
+16,0,631,1,447,
+3927,16,0,631,1,
+2458,885,1,2459,891,
+1,1958,3928,16,0,
+631,1,2462,898,1,
+1657,903,1,2464,908,
+1,199,3929,16,0,
+631,1,459,3930,16,
+0,631,1,462,3931,
+16,0,631,1,217,
+3932,16,0,631,1,
+2227,917,1,1225,3933,
+16,0,631,1,1479,
+3934,16,0,631,1,
+1731,3935,16,0,631,
+1,1989,925,1,1990,
+3936,16,0,631,1,
+236,3937,16,0,631,
+1,2670,3938,16,0,
+631,1,1756,3939,16,
+0,631,1,96,3940,
+19,103,1,96,3941,
+5,1,1,0,3942,
+16,0,104,1,97,
+3943,19,240,1,97,
+3944,5,1,1,0,
+3945,16,0,238,1,
+98,3946,19,649,1,
+98,3947,5,2,1,
+0,3948,16,0,651,
+1,2707,3949,16,0,
+647,1,99,3950,19,
+154,1,99,3951,5,
+2,1,0,3952,16,
+0,152,1,2707,3953,
+16,0,646,1,100,
+3954,19,580,1,100,
+3955,5,2,1,0,
+3956,16,0,578,1,
+2707,3957,16,0,644,
+1,101,3958,19,166,
+1,101,3959,5,4,
+1,0,3960,16,0,
+584,1,2707,3961,16,
+0,584,1,2718,3962,
+16,0,164,1,2648,
+3963,16,0,164,1,
+102,3964,19,455,1,
+102,3965,5,2,1,
+2470,3966,16,0,453,
+1,2569,3967,16,0,
+563,1,103,3968,19,
+577,1,103,3969,5,
+4,1,2470,3970,16,
+0,581,1,2526,3971,
+16,0,575,1,2569,
+3972,16,0,581,1,
+2606,3973,16,0,575,
+1,104,3974,19,481,
+1,104,3975,5,4,
+1,2470,3976,16,0,
+479,1,2526,3977,16,
+0,650,1,2569,3978,
+16,0,479,1,2606,
+3979,16,0,650,1,
+105,3980,19,141,1,
+105,3981,5,3,1,
+2511,3982,16,0,607,
+1,2654,3983,16,0,
+669,1,10,3984,16,
+0,139,1,106,3985,
+19,157,1,106,3986,
+5,17,1,0,3987,
+16,0,198,1,2075,
+3988,16,0,658,1,
+2337,3989,16,0,658,
+1,2413,3990,16,0,
+658,1,10,3991,16,
+0,344,1,2511,3992,
+16,0,344,1,1901,
+3993,16,0,658,1,
+2198,3994,16,0,658,
+1,2707,3995,16,0,
+198,1,21,3996,16,
+0,155,1,2106,3997,
+16,0,658,1,2654,
+3998,16,0,344,1,
+1804,3999,16,0,658,
+1,1990,4000,16,0,
+658,1,32,4001,16,
+0,658,1,1958,4002,
+16,0,658,1,1775,
+4003,16,0,658,1,
+107,4004,19,130,1,
+107,4005,5,18,1,
+0,4006,16,0,128,
+1,2075,4007,16,0,
+137,1,2337,4008,16,
+0,137,1,2413,4009,
 16,0,137,1,10,
-3975,16,0,137,1,
-2198,3976,16,0,137,
-1,1901,3977,16,0,
-137,1,52,3978,16,
-0,193,1,21,3979,
-16,0,137,1,2106,
-3980,16,0,137,1,
-2506,3981,16,0,137,
-1,1804,3982,16,0,
-137,1,1990,3983,16,
-0,137,1,2695,3984,
-16,0,128,1,32,
-3985,16,0,137,1,
-1958,3986,16,0,137,
-1,1775,3987,16,0,
-137,1,107,3988,19,
-658,1,107,3989,5,
-4,1,2597,3990,16,
-0,656,1,2521,3991,
-16,0,656,1,2470,
-3992,16,0,656,1,
-2561,3993,16,0,656,
-1,108,3994,19,335,
-1,108,3995,5,14,
-1,2517,3996,16,0,
-437,1,2075,3997,16,
-0,506,1,2337,3998,
-16,0,506,1,2413,
-3999,16,0,506,1,
-1901,4000,16,0,506,
-1,2198,4001,16,0,
-506,1,2106,4002,16,
-0,506,1,2653,4003,
-16,0,571,1,1804,
-4004,16,0,506,1,
-1990,4005,16,0,506,
-1,31,4006,16,0,
-333,1,32,4007,16,
-0,506,1,1958,4008,
-16,0,506,1,1775,
-4009,16,0,506,1,
-109,4010,19,302,1,
-109,4011,5,1,1,
-32,4012,16,0,300,
-1,110,4013,19,261,
-1,110,4014,5,11,
-1,2075,4015,16,0,
-577,1,2337,4016,16,
-0,265,1,2413,4017,
-16,0,445,1,1901,
-4018,16,0,391,1,
-2198,4019,16,0,319,
-1,2106,4020,16,0,
-607,1,1804,4021,16,
-0,284,1,1990,4022,
-16,0,494,1,32,
-4023,16,0,329,1,
-1958,4024,16,0,450,
-1,1775,4025,16,0,
-259,1,111,4026,19,
-583,1,111,4027,5,
-11,1,2075,4028,16,
-0,581,1,2337,4029,
-16,0,581,1,2413,
-4030,16,0,581,1,
-1901,4031,16,0,581,
-1,2198,4032,16,0,
-581,1,2106,4033,16,
-0,581,1,1804,4034,
-16,0,581,1,1990,
-4035,16,0,581,1,
-32,4036,16,0,581,
-1,1958,4037,16,0,
-581,1,1775,4038,16,
-0,581,1,112,4039,
-19,645,1,112,4040,
-5,11,1,2075,4041,
-16,0,643,1,2337,
-4042,16,0,643,1,
-2413,4043,16,0,643,
-1,1901,4044,16,0,
-643,1,2198,4045,16,
-0,643,1,2106,4046,
-16,0,643,1,1804,
-4047,16,0,643,1,
-1990,4048,16,0,643,
-1,32,4049,16,0,
-643,1,1958,4050,16,
-0,643,1,1775,4051,
-16,0,643,1,113,
-4052,19,161,1,113,
-4053,5,31,1,1901,
-4054,16,0,647,1,
-1479,4055,16,0,551,
-1,2075,4056,16,0,
-647,1,1695,4057,16,
-0,189,1,1756,4058,
-16,0,188,1,2413,
-4059,16,0,647,1,
-2198,4060,16,0,647,
-1,1876,4061,16,0,
-661,1,1659,4062,16,
-0,188,1,1443,4063,
-16,0,522,1,1117,
-4064,16,0,159,1,
-1990,4065,16,0,647,
-1,1189,4066,16,0,
-240,1,1775,4067,16,
-0,647,1,32,4068,
-16,0,647,1,2106,
-4069,16,0,647,1,
-1515,4070,16,0,579,
-1,2337,4071,16,0,
-647,1,52,4072,16,
-0,592,1,1804,4073,
-16,0,647,1,1261,
-4074,16,0,298,1,
-1153,4075,16,0,247,
-1,1225,4076,16,0,
-274,1,1335,4077,16,
-0,443,1,1933,4078,
-16,0,553,1,1834,
-4079,16,0,312,1,
-1297,4080,16,0,323,
-1,1407,4081,16,0,
-568,1,2318,4082,16,
-0,188,1,1958,4083,
-16,0,647,1,1371,
-4084,16,0,438,1,
-114,4085,19,531,1,
-114,4086,5,11,1,
-2075,4087,16,0,529,
-1,2337,4088,16,0,
-529,1,2413,4089,16,
-0,529,1,1901,4090,
-16,0,529,1,2198,
-4091,16,0,529,1,
-2106,4092,16,0,529,
-1,1804,4093,16,0,
-529,1,1990,4094,16,
-0,529,1,32,4095,
-16,0,529,1,1958,
-4096,16,0,529,1,
-1775,4097,16,0,529,
-1,115,4098,19,527,
-1,115,4099,5,11,
-1,2075,4100,16,0,
-525,1,2337,4101,16,
-0,525,1,2413,4102,
-16,0,525,1,1901,
-4103,16,0,525,1,
-2198,4104,16,0,525,
-1,2106,4105,16,0,
-525,1,1804,4106,16,
-0,525,1,1990,4107,
-16,0,525,1,32,
-4108,16,0,525,1,
-1958,4109,16,0,525,
-1,1775,4110,16,0,
-525,1,116,4111,19,
-575,1,116,4112,5,
-11,1,2075,4113,16,
-0,573,1,2337,4114,
-16,0,573,1,2413,
-4115,16,0,573,1,
-1901,4116,16,0,573,
-1,2198,4117,16,0,
-573,1,2106,4118,16,
-0,573,1,1804,4119,
-16,0,573,1,1990,
-4120,16,0,573,1,
-32,4121,16,0,573,
-1,1958,4122,16,0,
-573,1,1775,4123,16,
-0,573,1,117,4124,
-19,521,1,117,4125,
-5,11,1,2075,4126,
-16,0,519,1,2337,
-4127,16,0,519,1,
-2413,4128,16,0,519,
-1,1901,4129,16,0,
-519,1,2198,4130,16,
-0,519,1,2106,4131,
-16,0,519,1,1804,
-4132,16,0,519,1,
-1990,4133,16,0,519,
-1,32,4134,16,0,
-519,1,1958,4135,16,
-0,519,1,1775,4136,
-16,0,519,1,118,
-4137,19,518,1,118,
-4138,5,11,1,2075,
-4139,16,0,516,1,
-2337,4140,16,0,516,
-1,2413,4141,16,0,
-516,1,1901,4142,16,
-0,516,1,2198,4143,
-16,0,516,1,2106,
-4144,16,0,516,1,
-1804,4145,16,0,516,
-1,1990,4146,16,0,
-516,1,32,4147,16,
-0,516,1,1958,4148,
-16,0,516,1,1775,
-4149,16,0,516,1,
-119,4150,19,515,1,
-119,4151,5,11,1,
-2075,4152,16,0,513,
-1,2337,4153,16,0,
-513,1,2413,4154,16,
-0,513,1,1901,4155,
-16,0,513,1,2198,
-4156,16,0,513,1,
-2106,4157,16,0,513,
-1,1804,4158,16,0,
-513,1,1990,4159,16,
-0,513,1,32,4160,
-16,0,513,1,1958,
-4161,16,0,513,1,
-1775,4162,16,0,513,
-1,120,4163,19,512,
-1,120,4164,5,11,
-1,2075,4165,16,0,
-510,1,2337,4166,16,
-0,510,1,2413,4167,
-16,0,510,1,1901,
-4168,16,0,510,1,
-2198,4169,16,0,510,
-1,2106,4170,16,0,
-510,1,1804,4171,16,
-0,510,1,1990,4172,
-16,0,510,1,32,
-4173,16,0,510,1,
-1958,4174,16,0,510,
-1,1775,4175,16,0,
-510,1,121,4176,19,
-509,1,121,4177,5,
-11,1,2075,4178,16,
-0,507,1,2337,4179,
-16,0,507,1,2413,
-4180,16,0,507,1,
-1901,4181,16,0,507,
-1,2198,4182,16,0,
-507,1,2106,4183,16,
-0,507,1,1804,4184,
-16,0,507,1,1990,
-4185,16,0,507,1,
-32,4186,16,0,507,
-1,1958,4187,16,0,
-507,1,1775,4188,16,
-0,507,1,122,4189,
-19,147,1,122,4190,
-5,3,1,1756,4191,
-16,0,283,1,2318,
-4192,16,0,297,1,
-1659,4193,16,0,145,
-1,123,4194,19,548,
-1,123,4195,5,68,
-1,1901,4196,16,0,
-546,1,1479,4197,16,
-0,546,1,112,4198,
-16,0,546,1,2293,
-4199,16,0,546,1,
-1804,4200,16,0,546,
-1,431,4201,16,0,
-546,1,1443,4202,16,
-0,546,1,1756,4203,
-16,0,546,1,124,
-4204,16,0,546,1,
-525,4205,16,0,546,
-1,236,4206,16,0,
-546,1,346,4207,16,
-0,546,1,1876,4208,
-16,0,546,1,1659,
-4209,16,0,546,1,
-1225,4210,16,0,546,
-1,1117,4211,16,0,
-546,1,137,4212,16,
-0,546,1,2318,4213,
-16,0,546,1,1775,
-4214,16,0,546,1,
-32,4215,16,0,546,
-1,1407,4216,16,0,
-546,1,256,4217,16,
-0,546,1,459,4218,
-16,0,546,1,406,
-4219,16,0,546,1,
-41,4220,16,0,546,
-1,2658,4221,16,0,
-546,1,43,4222,16,
-0,546,1,1585,4223,
-16,0,546,1,1990,
-4224,16,0,546,1,
-2337,4225,16,0,546,
-1,509,4226,16,0,
-546,1,52,4227,16,
-0,546,1,151,4228,
-16,0,546,1,447,
-4229,16,0,546,1,
-166,4230,16,0,546,
-1,462,4231,16,0,
-546,1,277,4232,16,
-0,546,1,1695,4233,
-16,0,546,1,62,
-4234,16,0,586,1,
-1153,4235,16,0,546,
-1,381,4236,16,0,
-546,1,2106,4237,16,
-0,546,1,1335,4238,
-16,0,546,1,71,
-4239,16,0,546,1,
-182,4240,16,0,546,
-1,76,4241,16,0,
-546,1,79,4242,16,
-0,546,1,1933,4243,
-16,0,546,1,299,
-4244,16,0,546,1,
-85,4245,16,0,546,
-1,1515,4246,16,0,
-546,1,2198,4247,16,
-0,546,1,89,4248,
-16,0,546,1,1834,
-4249,16,0,546,1,
-1622,4250,16,0,546,
-1,2413,4251,16,0,
-546,1,2075,4252,16,
-0,546,1,1731,4253,
-16,0,546,1,97,
-4254,16,0,546,1,
-1297,4255,16,0,546,
-1,1189,4256,16,0,
-546,1,102,4257,16,
-0,546,1,1261,4258,
-16,0,546,1,322,
-4259,16,0,546,1,
-1958,4260,16,0,546,
-1,199,4261,16,0,
-546,1,1371,4262,16,
-0,546,1,217,4263,
-16,0,546,1,124,
-4264,19,602,1,124,
-4265,5,2,1,459,
-4266,16,0,600,1,
-41,4267,16,0,665,
-1,125,4268,19,606,
-1,125,4269,5,3,
-1,462,4270,16,0,
-604,1,459,4271,16,
-0,630,1,41,4272,
-16,0,630,1,126,
-4273,19,4274,4,36,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
+4010,16,0,137,1,
+2511,4011,16,0,137,
+1,2198,4012,16,0,
+137,1,1901,4013,16,
+0,137,1,52,4014,
+16,0,203,1,2707,
+4015,16,0,128,1,
+21,4016,16,0,137,
+1,2106,4017,16,0,
+137,1,2654,4018,16,
+0,137,1,1804,4019,
+16,0,137,1,1990,
+4020,16,0,137,1,
+32,4021,16,0,137,
+1,1958,4022,16,0,
+137,1,1775,4023,16,
+0,137,1,108,4024,
+19,446,1,108,4025,
+5,4,1,2470,4026,
+16,0,444,1,2526,
+4027,16,0,444,1,
+2569,4028,16,0,444,
+1,2606,4029,16,0,
+444,1,109,4030,19,
+668,1,109,4031,5,
+4,1,2470,4032,16,
+0,666,1,2526,4033,
+16,0,666,1,2569,
+4034,16,0,666,1,
+2606,4035,16,0,666,
+1,110,4036,19,343,
+1,110,4037,5,15,
+1,2665,4038,16,0,
+671,1,2075,4039,16,
+0,516,1,2337,4040,
+16,0,516,1,2507,
+4041,16,0,443,1,
+2413,4042,16,0,516,
+1,1901,4043,16,0,
+516,1,2198,4044,16,
+0,516,1,2106,4045,
+16,0,516,1,2522,
+4046,16,0,452,1,
+1804,4047,16,0,516,
+1,1990,4048,16,0,
+516,1,31,4049,16,
+0,341,1,32,4050,
+16,0,516,1,1958,
+4051,16,0,516,1,
+1775,4052,16,0,516,
+1,111,4053,19,311,
+1,111,4054,5,1,
+1,32,4055,16,0,
+309,1,112,4056,19,
+270,1,112,4057,5,
+11,1,2075,4058,16,
+0,592,1,2337,4059,
+16,0,274,1,2413,
+4060,16,0,461,1,
+1901,4061,16,0,399,
+1,2198,4062,16,0,
+327,1,2106,4063,16,
+0,623,1,1804,4064,
+16,0,293,1,1990,
+4065,16,0,504,1,
+32,4066,16,0,337,
+1,1958,4067,16,0,
+464,1,1775,4068,16,
+0,268,1,113,4069,
+19,598,1,113,4070,
+5,11,1,2075,4071,
+16,0,596,1,2337,
+4072,16,0,596,1,
+2413,4073,16,0,596,
+1,1901,4074,16,0,
+596,1,2198,4075,16,
+0,596,1,2106,4076,
+16,0,596,1,1804,
+4077,16,0,596,1,
+1990,4078,16,0,596,
+1,32,4079,16,0,
+596,1,1958,4080,16,
+0,596,1,1775,4081,
+16,0,596,1,114,
+4082,19,654,1,114,
+4083,5,11,1,2075,
+4084,16,0,652,1,
+2337,4085,16,0,652,
+1,2413,4086,16,0,
+652,1,1901,4087,16,
+0,652,1,2198,4088,
+16,0,652,1,2106,
+4089,16,0,652,1,
+1804,4090,16,0,652,
+1,1990,4091,16,0,
+652,1,32,4092,16,
+0,652,1,1958,4093,
+16,0,652,1,1775,
+4094,16,0,652,1,
+115,4095,19,170,1,
+115,4096,5,31,1,
+1901,4097,16,0,657,
+1,1479,4098,16,0,
+561,1,2075,4099,16,
+0,657,1,1695,4100,
+16,0,199,1,1756,
+4101,16,0,197,1,
+2413,4102,16,0,657,
+1,2198,4103,16,0,
+657,1,1876,4104,16,
+0,673,1,1659,4105,
+16,0,197,1,1443,
+4106,16,0,532,1,
+1117,4107,16,0,168,
+1,1990,4108,16,0,
+657,1,1189,4109,16,
+0,250,1,1775,4110,
+16,0,657,1,32,
+4111,16,0,657,1,
+2106,4112,16,0,657,
+1,1515,4113,16,0,
+594,1,2337,4114,16,
+0,657,1,52,4115,
+16,0,608,1,1804,
+4116,16,0,657,1,
+1261,4117,16,0,305,
+1,1153,4118,16,0,
+257,1,1225,4119,16,
+0,283,1,1335,4120,
+16,0,459,1,1933,
+4121,16,0,564,1,
+1834,4122,16,0,321,
+1,1297,4123,16,0,
+331,1,1407,4124,16,
+0,582,1,2318,4125,
+16,0,197,1,1958,
+4126,16,0,657,1,
+1371,4127,16,0,449,
+1,116,4128,19,541,
+1,116,4129,5,11,
+1,2075,4130,16,0,
+539,1,2337,4131,16,
+0,539,1,2413,4132,
+16,0,539,1,1901,
+4133,16,0,539,1,
+2198,4134,16,0,539,
+1,2106,4135,16,0,
+539,1,1804,4136,16,
+0,539,1,1990,4137,
+16,0,539,1,32,
+4138,16,0,539,1,
+1958,4139,16,0,539,
+1,1775,4140,16,0,
+539,1,117,4141,19,
+537,1,117,4142,5,
+11,1,2075,4143,16,
+0,535,1,2337,4144,
+16,0,535,1,2413,
+4145,16,0,535,1,
+1901,4146,16,0,535,
+1,2198,4147,16,0,
+535,1,2106,4148,16,
+0,535,1,1804,4149,
+16,0,535,1,1990,
+4150,16,0,535,1,
+32,4151,16,0,535,
+1,1958,4152,16,0,
+535,1,1775,4153,16,
+0,535,1,118,4154,
+19,590,1,118,4155,
+5,11,1,2075,4156,
+16,0,588,1,2337,
+4157,16,0,588,1,
+2413,4158,16,0,588,
+1,1901,4159,16,0,
+588,1,2198,4160,16,
+0,588,1,2106,4161,
+16,0,588,1,1804,
+4162,16,0,588,1,
+1990,4163,16,0,588,
+1,32,4164,16,0,
+588,1,1958,4165,16,
+0,588,1,1775,4166,
+16,0,588,1,119,
+4167,19,531,1,119,
+4168,5,11,1,2075,
+4169,16,0,529,1,
+2337,4170,16,0,529,
+1,2413,4171,16,0,
+529,1,1901,4172,16,
+0,529,1,2198,4173,
+16,0,529,1,2106,
+4174,16,0,529,1,
+1804,4175,16,0,529,
+1,1990,4176,16,0,
+529,1,32,4177,16,
+0,529,1,1958,4178,
+16,0,529,1,1775,
+4179,16,0,529,1,
+120,4180,19,528,1,
+120,4181,5,11,1,
+2075,4182,16,0,526,
+1,2337,4183,16,0,
+526,1,2413,4184,16,
+0,526,1,1901,4185,
+16,0,526,1,2198,
+4186,16,0,526,1,
+2106,4187,16,0,526,
+1,1804,4188,16,0,
+526,1,1990,4189,16,
+0,526,1,32,4190,
+16,0,526,1,1958,
+4191,16,0,526,1,
+1775,4192,16,0,526,
+1,121,4193,19,525,
+1,121,4194,5,11,
+1,2075,4195,16,0,
+523,1,2337,4196,16,
+0,523,1,2413,4197,
+16,0,523,1,1901,
+4198,16,0,523,1,
+2198,4199,16,0,523,
+1,2106,4200,16,0,
+523,1,1804,4201,16,
+0,523,1,1990,4202,
+16,0,523,1,32,
+4203,16,0,523,1,
+1958,4204,16,0,523,
+1,1775,4205,16,0,
+523,1,122,4206,19,
+522,1,122,4207,5,
+11,1,2075,4208,16,
+0,520,1,2337,4209,
+16,0,520,1,2413,
+4210,16,0,520,1,
+1901,4211,16,0,520,
+1,2198,4212,16,0,
+520,1,2106,4213,16,
+0,520,1,1804,4214,
+16,0,520,1,1990,
+4215,16,0,520,1,
+32,4216,16,0,520,
+1,1958,4217,16,0,
+520,1,1775,4218,16,
+0,520,1,123,4219,
+19,519,1,123,4220,
+5,11,1,2075,4221,
+16,0,517,1,2337,
+4222,16,0,517,1,
+2413,4223,16,0,517,
+1,1901,4224,16,0,
+517,1,2198,4225,16,
+0,517,1,2106,4226,
+16,0,517,1,1804,
+4227,16,0,517,1,
+1990,4228,16,0,517,
+1,32,4229,16,0,
+517,1,1958,4230,16,
+0,517,1,1775,4231,
+16,0,517,1,124,
+4232,19,147,1,124,
+4233,5,3,1,1756,
+4234,16,0,292,1,
+2318,4235,16,0,304,
+1,1659,4236,16,0,
+145,1,125,4237,19,
+558,1,125,4238,5,
+68,1,1901,4239,16,
+0,556,1,1479,4240,
+16,0,556,1,112,
+4241,16,0,556,1,
+2293,4242,16,0,556,
+1,1804,4243,16,0,
+556,1,431,4244,16,
+0,556,1,1443,4245,
+16,0,556,1,1756,
+4246,16,0,556,1,
+124,4247,16,0,556,
+1,525,4248,16,0,
+556,1,236,4249,16,
+0,556,1,346,4250,
+16,0,556,1,1876,
+4251,16,0,556,1,
+1659,4252,16,0,556,
+1,1225,4253,16,0,
+556,1,1117,4254,16,
+0,556,1,137,4255,
+16,0,556,1,2318,
+4256,16,0,556,1,
+2670,4257,16,0,556,
+1,1775,4258,16,0,
+556,1,32,4259,16,
+0,556,1,1407,4260,
+16,0,556,1,256,
+4261,16,0,556,1,
+459,4262,16,0,556,
+1,406,4263,16,0,
+556,1,41,4264,16,
+0,556,1,151,4265,
+16,0,556,1,43,
+4266,16,0,556,1,
+1585,4267,16,0,556,
+1,1990,4268,16,0,
+556,1,2337,4269,16,
+0,556,1,509,4270,
+16,0,556,1,52,
+4271,16,0,556,1,
+381,4272,16,0,556,
+1,447,4273,16,0,
+556,1,166,4274,16,
+0,556,1,462,4275,
+16,0,556,1,277,
+4276,16,0,556,1,
+1695,4277,16,0,556,
+1,62,4278,16,0,
+603,1,1153,4279,16,
+0,556,1,2106,4280,
+16,0,556,1,1335,
+4281,16,0,556,1,
+71,4282,16,0,556,
+1,182,4283,16,0,
+556,1,76,4284,16,
+0,556,1,79,4285,
+16,0,556,1,1933,
+4286,16,0,556,1,
+299,4287,16,0,556,
+1,85,4288,16,0,
+556,1,1515,4289,16,
+0,556,1,2198,4290,
+16,0,556,1,89,
+4291,16,0,556,1,
+1834,4292,16,0,556,
+1,1622,4293,16,0,
+556,1,2413,4294,16,
+0,556,1,2075,4295,
+16,0,556,1,1731,
+4296,16,0,556,1,
+97,4297,16,0,556,
+1,1297,4298,16,0,
+556,1,1189,4299,16,
+0,556,1,102,4300,
+16,0,556,1,1261,
+4301,16,0,556,1,
+322,4302,16,0,556,
+1,1958,4303,16,0,
+556,1,199,4304,16,
+0,556,1,1371,4305,
+16,0,556,1,217,
+4306,16,0,556,1,
+126,4307,19,618,1,
+126,4308,5,2,1,
+459,4309,16,0,616,
+1,41,4310,16,0,
+676,1,127,4311,19,
+622,1,127,4312,5,
+3,1,462,4313,16,
+0,620,1,459,4314,
+16,0,643,1,41,
+4315,16,0,643,1,
+128,4316,19,4317,4,
+36,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,1,128,4312,
+1,129,4318,19,554,
+1,129,4319,5,68,
+1,1901,4320,16,0,
+552,1,1479,4321,16,
+0,552,1,112,4322,
+16,0,552,1,2293,
+4323,16,0,552,1,
+1804,4324,16,0,552,
+1,431,4325,16,0,
+552,1,1443,4326,16,
+0,552,1,1756,4327,
+16,0,552,1,124,
+4328,16,0,552,1,
+525,4329,16,0,552,
+1,236,4330,16,0,
+552,1,346,4331,16,
+0,552,1,1876,4332,
+16,0,552,1,1659,
+4333,16,0,552,1,
+1225,4334,16,0,552,
+1,1117,4335,16,0,
+552,1,137,4336,16,
+0,552,1,2318,4337,
+16,0,552,1,2670,
+4338,16,0,552,1,
+1775,4339,16,0,552,
+1,32,4340,16,0,
+552,1,1407,4341,16,
+0,552,1,256,4342,
+16,0,552,1,459,
+4343,16,0,552,1,
+406,4344,16,0,552,
+1,41,4345,16,0,
+552,1,151,4346,16,
+0,552,1,43,4347,
+16,0,552,1,1585,
+4348,16,0,552,1,
+1990,4349,16,0,552,
+1,2337,4350,16,0,
+552,1,509,4351,16,
+0,552,1,52,4352,
+16,0,552,1,381,
+4353,16,0,552,1,
+447,4354,16,0,552,
+1,166,4355,16,0,
+552,1,462,4356,16,
+0,552,1,277,4357,
+16,0,552,1,1695,
+4358,16,0,552,1,
+62,4359,16,0,604,
+1,1153,4360,16,0,
+552,1,2106,4361,16,
+0,552,1,1335,4362,
+16,0,552,1,71,
+4363,16,0,552,1,
+182,4364,16,0,552,
+1,76,4365,16,0,
+552,1,79,4366,16,
+0,552,1,1933,4367,
+16,0,552,1,299,
+4368,16,0,552,1,
+85,4369,16,0,552,
+1,1515,4370,16,0,
+552,1,2198,4371,16,
+0,552,1,89,4372,
+16,0,552,1,1834,
+4373,16,0,552,1,
+1622,4374,16,0,552,
+1,2413,4375,16,0,
+552,1,2075,4376,16,
+0,552,1,1731,4377,
+16,0,552,1,97,
+4378,16,0,552,1,
+1297,4379,16,0,552,
+1,1189,4380,16,0,
+552,1,102,4381,16,
+0,552,1,1261,4382,
+16,0,552,1,322,
+4383,16,0,552,1,
+1958,4384,16,0,552,
+1,199,4385,16,0,
+552,1,1371,4386,16,
+0,552,1,217,4387,
+16,0,552,1,130,
+4388,19,4389,4,28,
+86,0,101,0,99,
+0,116,0,111,0,
+114,0,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
+0,116,0,1,130,
+4319,1,131,4390,19,
+4391,4,32,82,0,
+111,0,116,0,97,
+0,116,0,105,0,
+111,0,110,0,67,
 0,111,0,110,0,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,1,126,4269,1,
-127,4275,19,544,1,
-127,4276,5,68,1,
-1901,4277,16,0,542,
-1,1479,4278,16,0,
-542,1,112,4279,16,
-0,542,1,2293,4280,
-16,0,542,1,1804,
-4281,16,0,542,1,
-431,4282,16,0,542,
-1,1443,4283,16,0,
-542,1,1756,4284,16,
-0,542,1,124,4285,
-16,0,542,1,525,
-4286,16,0,542,1,
-236,4287,16,0,542,
-1,346,4288,16,0,
-542,1,1876,4289,16,
-0,542,1,1659,4290,
-16,0,542,1,1225,
-4291,16,0,542,1,
-1117,4292,16,0,542,
-1,137,4293,16,0,
-542,1,2318,4294,16,
-0,542,1,1775,4295,
-16,0,542,1,32,
-4296,16,0,542,1,
-1407,4297,16,0,542,
-1,256,4298,16,0,
-542,1,459,4299,16,
-0,542,1,406,4300,
-16,0,542,1,41,
-4301,16,0,542,1,
-2658,4302,16,0,542,
-1,43,4303,16,0,
-542,1,1585,4304,16,
-0,542,1,1990,4305,
-16,0,542,1,2337,
-4306,16,0,542,1,
-509,4307,16,0,542,
-1,52,4308,16,0,
-542,1,151,4309,16,
-0,542,1,447,4310,
-16,0,542,1,166,
-4311,16,0,542,1,
-462,4312,16,0,542,
-1,277,4313,16,0,
-542,1,1695,4314,16,
-0,542,1,62,4315,
-16,0,587,1,1153,
-4316,16,0,542,1,
-381,4317,16,0,542,
-1,2106,4318,16,0,
-542,1,1335,4319,16,
-0,542,1,71,4320,
-16,0,542,1,182,
-4321,16,0,542,1,
-76,4322,16,0,542,
-1,79,4323,16,0,
-542,1,1933,4324,16,
-0,542,1,299,4325,
-16,0,542,1,85,
-4326,16,0,542,1,
-1515,4327,16,0,542,
-1,2198,4328,16,0,
-542,1,89,4329,16,
-0,542,1,1834,4330,
-16,0,542,1,1622,
-4331,16,0,542,1,
-2413,4332,16,0,542,
-1,2075,4333,16,0,
-542,1,1731,4334,16,
-0,542,1,97,4335,
-16,0,542,1,1297,
-4336,16,0,542,1,
-1189,4337,16,0,542,
-1,102,4338,16,0,
-542,1,1261,4339,16,
-0,542,1,322,4340,
-16,0,542,1,1958,
-4341,16,0,542,1,
-199,4342,16,0,542,
-1,1371,4343,16,0,
-542,1,217,4344,16,
-0,542,1,128,4345,
-19,4346,4,28,86,
-0,101,0,99,0,
-116,0,111,0,114,
-0,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,1,128,4276,
-1,129,4347,19,4348,
-4,32,82,0,111,
-0,116,0,97,0,
-116,0,105,0,111,
-0,110,0,67,0,
+115,0,116,0,97,
+0,110,0,116,0,
+1,131,4319,1,132,
+4392,19,4393,4,24,
+76,0,105,0,115,
+0,116,0,67,0,
 111,0,110,0,115,
 0,116,0,97,0,
 110,0,116,0,1,
-129,4276,1,130,4349,
-19,4350,4,24,76,
-0,105,0,115,0,
-116,0,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,1,130,
-4276,1,131,4351,19,
-169,1,131,4352,5,
-67,1,1901,4353,16,
-0,585,1,1479,4354,
-16,0,533,1,112,
-4355,16,0,249,1,
-2293,4356,16,0,273,
-1,1804,4357,16,0,
-585,1,431,4358,16,
-0,580,1,1443,4359,
-16,0,468,1,1756,
-4360,16,0,673,1,
-124,4361,16,0,258,
-1,525,4362,16,0,
-305,1,236,4363,16,
-0,341,1,346,4364,
-16,0,496,1,1876,
-4365,16,0,318,1,
-1659,4366,16,0,673,
-1,1225,4367,16,0,
-248,1,1117,4368,16,
-0,219,1,137,4369,
-16,0,272,1,2318,
-4370,16,0,673,1,
-1775,4371,16,0,585,
-1,32,4372,16,0,
-585,1,1407,4373,16,
-0,487,1,256,4374,
-16,0,395,1,459,
-4375,16,0,167,1,
-406,4376,16,0,562,
-1,41,4377,16,0,
-167,1,2658,4378,16,
-0,659,1,43,4379,
-16,0,640,1,1990,
-4380,16,0,585,1,
-2337,4381,16,0,585,
-1,509,4382,16,0,
-655,1,52,4383,16,
-0,594,1,151,4384,
-16,0,282,1,447,
-4385,16,0,305,1,
-166,4386,16,0,293,
-1,462,4387,16,0,
-167,1,277,4388,16,
-0,434,1,1695,4389,
-16,0,270,1,1261,
-4390,16,0,281,1,
-1153,4391,16,0,174,
-1,381,4392,16,0,
-550,1,2106,4393,16,
-0,585,1,1335,4394,
-16,0,326,1,71,
-4395,16,0,203,1,
-182,4396,16,0,305,
-1,76,4397,16,0,
-549,1,79,4398,16,
-0,218,1,1933,4399,
-16,0,407,1,299,
-4400,16,0,444,1,
-85,4401,16,0,457,
-1,1515,4402,16,0,
-556,1,2198,4403,16,
-0,585,1,89,4404,
-16,0,227,1,1834,
-4405,16,0,292,1,
-1622,4406,16,0,654,
-1,2413,4407,16,0,
-585,1,2075,4408,16,
-0,585,1,1731,4409,
-16,0,250,1,97,
-4410,16,0,411,1,
-1297,4411,16,0,328,
-1,1189,4412,16,0,
-217,1,102,4413,16,
-0,238,1,1585,4414,
-16,0,663,1,322,
-4415,16,0,458,1,
-1958,4416,16,0,585,
-1,199,4417,16,0,
-316,1,1371,4418,16,
-0,396,1,217,4419,
-16,0,325,1,132,
-4420,19,4421,4,36,
-67,0,111,0,110,
-0,115,0,116,0,
-97,0,110,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,132,4352,1,
-133,4422,19,4423,4,
-30,73,0,100,0,
-101,0,110,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,133,4352,1,
-134,4424,19,4425,4,
-36,73,0,100,0,
-101,0,110,0,116,
-0,68,0,111,0,
+132,4319,1,133,4394,
+19,178,1,133,4395,
+5,67,1,1901,4396,
+16,0,600,1,1479,
+4397,16,0,543,1,
+112,4398,16,0,259,
+1,2293,4399,16,0,
+282,1,1804,4400,16,
+0,600,1,431,4401,
+16,0,595,1,1443,
+4402,16,0,474,1,
+1756,4403,16,0,683,
+1,124,4404,16,0,
+267,1,525,4405,16,
+0,314,1,236,4406,
+16,0,349,1,346,
+4407,16,0,506,1,
+1876,4408,16,0,326,
+1,1659,4409,16,0,
+683,1,1225,4410,16,
+0,258,1,1117,4411,
+16,0,229,1,137,
+4412,16,0,281,1,
+2318,4413,16,0,683,
+1,2670,4414,16,0,
+606,1,1775,4415,16,
+0,600,1,32,4416,
+16,0,600,1,1407,
+4417,16,0,497,1,
+256,4418,16,0,403,
+1,459,4419,16,0,
+176,1,406,4420,16,
+0,568,1,41,4421,
+16,0,176,1,151,
+4422,16,0,291,1,
+43,4423,16,0,645,
+1,1990,4424,16,0,
+600,1,2337,4425,16,
+0,600,1,509,4426,
+16,0,665,1,52,
+4427,16,0,610,1,
+381,4428,16,0,560,
+1,447,4429,16,0,
+314,1,166,4430,16,
+0,302,1,462,4431,
+16,0,176,1,277,
+4432,16,0,447,1,
+1695,4433,16,0,279,
+1,1261,4434,16,0,
+290,1,1153,4435,16,
+0,183,1,2106,4436,
+16,0,600,1,1335,
+4437,16,0,334,1,
+71,4438,16,0,213,
+1,182,4439,16,0,
+314,1,76,4440,16,
+0,559,1,79,4441,
+16,0,228,1,1933,
+4442,16,0,415,1,
+299,4443,16,0,460,
+1,85,4444,16,0,
+471,1,1515,4445,16,
+0,567,1,2198,4446,
+16,0,600,1,89,
+4447,16,0,237,1,
+1834,4448,16,0,301,
+1,1622,4449,16,0,
+664,1,2413,4450,16,
+0,600,1,2075,4451,
+16,0,600,1,1731,
+4452,16,0,263,1,
+97,4453,16,0,419,
+1,1297,4454,16,0,
+336,1,1189,4455,16,
+0,227,1,102,4456,
+16,0,248,1,1585,
+4457,16,0,675,1,
+322,4458,16,0,472,
+1,1958,4459,16,0,
+600,1,199,4460,16,
+0,325,1,1371,4461,
+16,0,404,1,217,
+4462,16,0,333,1,
+134,4463,19,4464,4,
+36,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
 116,0,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,1,134,4352,
-1,135,4426,19,4427,
-4,44,70,0,117,
-0,110,0,99,0,
-116,0,105,0,111,
-0,110,0,67,0,
-97,0,108,0,108,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,135,4352,1,
-136,4428,19,4429,4,
-32,66,0,105,0,
-110,0,97,0,114,
-0,121,0,69,0,
+110,0,1,134,4395,
+1,135,4465,19,4466,
+4,30,73,0,100,
+0,101,0,110,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,135,4395,
+1,136,4467,19,4468,
+4,36,73,0,100,
+0,101,0,110,0,
+116,0,68,0,111,
+0,116,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,1,136,
-4352,1,137,4430,19,
-4431,4,30,85,0,
-110,0,97,0,114,
-0,121,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,137,
-4352,1,138,4432,19,
-4433,4,36,84,0,
-121,0,112,0,101,
-0,99,0,97,0,
-115,0,116,0,69,
+4395,1,137,4469,19,
+4470,4,44,70,0,
+117,0,110,0,99,
+0,116,0,105,0,
+111,0,110,0,67,
+0,97,0,108,0,
+108,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,137,4395,
+1,138,4471,19,4472,
+4,32,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,1,
-138,4352,1,139,4434,
-19,4435,4,42,80,
-0,97,0,114,0,
-101,0,110,0,116,
-0,104,0,101,0,
-115,0,105,0,115,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,139,4352,1,
-140,4436,19,4437,4,
-56,73,0,110,0,
-99,0,114,0,101,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-114,0,101,0,109,
+138,4395,1,139,4473,
+19,4474,4,30,85,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,1,
+139,4395,1,140,4475,
+19,4476,4,36,84,
+0,121,0,112,0,
+101,0,99,0,97,
+0,115,0,116,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+1,140,4395,1,141,
+4477,19,4478,4,42,
+80,0,97,0,114,
 0,101,0,110,0,
-116,0,69,0,120,
+116,0,104,0,101,
+0,115,0,105,0,
+115,0,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,1,140,4352,
-1,142,4438,19,683,
-1,142,3911,1,143,
-4439,19,705,1,143,
-3911,1,144,4440,19,
-3192,1,144,3914,1,
-145,4441,19,3187,1,
-145,3914,1,146,4442,
-19,3198,1,146,3914,
-1,147,4443,19,3209,
-1,147,3914,1,148,
-4444,19,3220,1,148,
-3917,1,149,4445,19,
-3226,1,149,3917,1,
-150,4446,19,3214,1,
-150,3921,1,151,4447,
-19,3204,1,151,3921,
-1,152,4448,19,689,
-1,152,3925,1,153,
-4449,19,710,1,153,
-3925,1,154,4450,19,
-695,1,154,3929,1,
-155,4451,19,700,1,
-155,3929,1,156,4452,
-19,1636,1,156,3935,
-1,157,4453,19,1631,
-1,157,3935,1,158,
-4454,19,1622,1,158,
-3939,1,159,4455,19,
-1680,1,159,3945,1,
-160,4456,19,1657,1,
-160,3945,1,161,4457,
-19,1117,1,161,3950,
-1,162,4458,19,902,
-1,162,3995,1,163,
-4459,19,886,1,163,
-3995,1,164,4460,19,
-892,1,164,4011,1,
-165,4461,19,880,1,
-165,4011,1,166,4462,
-19,1145,1,166,4027,
-1,167,4463,19,782,
-1,167,4014,1,168,
-4464,19,897,1,168,
-4014,1,169,4465,19,
-777,1,169,4014,1,
-170,4466,19,802,1,
-170,4014,1,171,4467,
-19,771,1,171,4014,
-1,172,4468,19,765,
-1,172,4014,1,173,
-4469,19,760,1,173,
-4014,1,174,4470,19,
-755,1,174,4014,1,
-175,4471,19,749,1,
-175,4014,1,176,4472,
-19,744,1,176,4014,
-1,177,4473,19,739,
-1,177,4014,1,178,
-4474,19,734,1,178,
-4014,1,179,4475,19,
-729,1,179,4014,1,
-180,4476,19,1152,1,
-180,4099,1,181,4477,
-19,1290,1,181,4112,
-1,182,4478,19,1139,
-1,182,4125,1,183,
-4479,19,1278,1,183,
-4125,1,184,4480,19,
-919,1,184,4138,1,
-185,4481,19,722,1,
-185,4138,1,186,4482,
-19,817,1,186,4138,
-1,187,4483,19,845,
-1,187,4138,1,188,
-4484,19,865,1,188,
-4151,1,189,4485,19,
-911,1,189,4151,1,
-190,4486,19,825,1,
-190,4164,1,191,4487,
-19,838,1,191,4164,
-1,192,4488,19,791,
-1,192,4177,1,193,
-4489,19,830,1,193,
-4177,1,194,4490,19,
-1477,1,194,4190,1,
-195,4491,19,1158,1,
-195,4190,1,196,4492,
-19,1509,1,196,4190,
-1,197,4493,19,1541,
-1,197,4190,1,198,
-4494,19,1406,1,198,
-4040,1,199,4495,19,
-1466,1,199,4040,1,
-200,4496,19,1133,1,
-200,4053,1,201,4497,
-19,1573,1,201,4053,
-1,202,4498,19,1504,
-1,202,4053,1,203,
-4499,19,1451,1,203,
-4053,1,204,4500,19,
-1374,1,204,4053,1,
-205,4501,19,1300,1,
-205,4053,1,206,4502,
-19,1310,1,206,4053,
-1,207,4503,19,1128,
-1,207,4053,1,208,
-4504,19,1557,1,208,
-4053,1,209,4505,19,
-1499,1,209,4053,1,
-210,4506,19,1441,1,
-210,4053,1,211,4507,
-19,1363,1,211,4053,
-1,212,4508,19,1326,
-1,212,4053,1,213,
-4509,19,1111,1,213,
-4053,1,214,4510,19,
-1461,1,214,4053,1,
-215,4511,19,1487,1,
-215,4053,1,216,4512,
-19,1434,1,216,4053,
-1,217,4513,19,1456,
-1,217,4053,1,218,
-4514,19,1266,1,218,
-4053,1,219,4515,19,
-1170,1,219,4053,1,
-220,4516,19,1100,1,
-220,4053,1,221,4517,
-19,1531,1,221,4053,
-1,222,4518,19,1482,
-1,222,4053,1,223,
-4519,19,1429,1,223,
-4053,1,224,4520,19,
-1295,1,224,4086,1,
-225,4521,19,1273,1,
-225,4086,1,226,4522,
-19,1562,1,226,4276,
-1,227,4523,19,1586,
-1,227,4276,1,228,
-4524,19,1552,1,228,
-4276,1,229,4525,19,
-1547,1,229,4276,1,
-230,4526,19,1568,1,
-230,4276,1,231,4527,
-19,1515,1,231,4276,
-1,232,4528,19,1220,
-1,232,4276,1,233,
-4529,19,1395,1,233,
-4352,1,234,4530,19,
-1181,1,234,4352,1,
-235,4531,19,1188,1,
-235,4352,1,236,4532,
-19,1209,1,236,4352,
-1,237,4533,19,1204,
-1,237,4352,1,238,
-4534,19,1199,1,238,
-4352,1,239,4535,19,
-1194,1,239,4352,1,
-240,4536,19,1384,1,
-240,4352,1,241,4537,
-19,1412,1,241,4352,
-1,242,4538,19,1389,
-1,242,4352,1,243,
-4539,19,1379,1,243,
-4352,1,244,4540,19,
-1369,1,244,4352,1,
-245,4541,19,1352,1,
-245,4352,1,246,4542,
-19,1305,1,246,4352,
-1,247,4543,19,1214,
-1,247,4352,1,248,
-4544,19,1175,1,248,
-4352,1,249,4545,19,
-1123,1,249,4352,1,
-250,4546,19,1581,1,
-250,4352,1,251,4547,
-19,1536,1,251,4352,
-1,252,4548,19,1526,
-1,252,4352,1,253,
-4549,19,1521,1,253,
-4352,1,254,4550,19,
-1472,1,254,4352,1,
-255,4551,19,1446,1,
-255,4352,1,256,4552,
-19,1422,1,256,4352,
-1,257,4553,19,1417,
-1,257,4352,1,258,
-4554,19,1358,1,258,
-4352,1,259,4555,19,
-1334,1,259,4352,1,
-260,4556,19,1400,1,
-260,4352,1,261,4557,
-19,1493,1,261,4352,
-1,262,4558,19,1347,
-1,262,4352,1,263,
-4559,19,1341,1,263,
-4352,1,264,4560,19,
-1321,1,264,4352,1,
-265,4561,19,1284,1,
-265,4352,1,266,4562,
-19,1261,1,266,4352,
-1,267,4563,19,1106,
-1,267,4352,1,268,
-4564,19,1596,1,268,
-4352,1,269,4565,19,
-1226,1,269,4352,1,
-270,4566,19,1231,1,
-270,4352,1,271,4567,
-19,1251,1,271,4352,
-1,272,4568,19,1241,
-1,272,4352,1,273,
-4569,19,1246,1,273,
-4352,1,274,4570,19,
-1236,1,274,4352,1,
-275,4571,19,1591,1,
-275,4352,1,276,4572,
-19,1256,1,276,4352,
-1,277,4573,19,1316,
-1,277,4195,1,278,
-4574,19,1650,1,278,
-4265,1,279,4575,19,
-1686,1,279,4265,1,
-280,4576,19,1666,1,
-280,4269,1,281,4577,
-19,1985,1,281,3969,
-1,282,4578,19,1980,
-1,282,3969,1,283,
-4579,19,1975,1,283,
-3969,1,284,4580,19,
-1970,1,284,3969,1,
-285,4581,19,1965,1,
-285,3969,1,286,4582,
-19,1960,1,286,3969,
-1,287,4583,19,1955,
-1,287,3969,1,288,
-4584,19,1944,1,288,
-3989,1,289,4585,19,
-1939,1,289,3989,1,
-290,4586,19,1934,1,
-290,3989,1,291,4587,
-19,1929,1,291,3989,
-1,292,4588,19,1924,
-1,292,3989,1,293,
-4589,19,1919,1,293,
-3989,1,294,4590,19,
-1914,1,294,3989,1,
-295,4591,19,1909,1,
-295,3989,1,296,4592,
-19,1904,1,296,3989,
-1,297,4593,19,1739,
-1,297,3989,1,298,
-4594,19,1898,1,298,
-3989,1,299,4595,19,
-1893,1,299,3989,1,
-300,4596,19,1888,1,
-300,3989,1,301,4597,
-19,1732,1,301,3989,
-1,302,4598,19,1883,
-1,302,3989,1,303,
-4599,19,1878,1,303,
-3989,1,304,4600,19,
-1873,1,304,3989,1,
-305,4601,19,1868,1,
-305,3989,1,306,4602,
-19,1863,1,306,3989,
-1,307,4603,19,1858,
-1,307,3989,1,308,
-4604,19,1725,1,308,
-3989,1,309,4605,19,
-1852,1,309,3989,1,
-310,4606,19,1847,1,
-310,3989,1,311,4607,
-19,1842,1,311,3989,
-1,312,4608,19,1719,
-1,312,3989,1,313,
-4609,19,1836,1,313,
-3989,1,314,4610,19,
-1767,1,314,3989,1,
-315,4611,19,1831,1,
-315,3989,1,316,4612,
-19,1826,1,316,3989,
-1,317,4613,19,1821,
-1,317,3989,1,318,
-4614,19,1816,1,318,
-3989,1,319,4615,19,
-1811,1,319,3989,1,
-320,4616,19,1806,1,
-320,3989,1,321,4617,
-19,1801,1,321,3989,
-1,322,4618,19,4619,
+110,0,1,141,4395,
+1,142,4479,19,4480,
+4,56,73,0,110,
+0,99,0,114,0,
+101,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,114,0,101,0,
+109,0,101,0,110,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,142,
+4395,1,144,4481,19,
+715,1,144,3941,1,
+145,4482,19,720,1,
+145,3941,1,146,4483,
+19,3246,1,146,3944,
+1,147,4484,19,3220,
+1,147,3944,1,148,
+4485,19,3241,1,148,
+3944,1,149,4486,19,
+3215,1,149,3944,1,
+150,4487,19,3226,1,
+150,3947,1,151,4488,
+19,3256,1,151,3947,
+1,152,4489,19,3251,
+1,152,3951,1,153,
+4490,19,3236,1,153,
+3951,1,154,4491,19,
+698,1,154,3955,1,
+155,4492,19,693,1,
+155,3955,1,156,4493,
+19,709,1,156,3959,
+1,157,4494,19,704,
+1,157,3959,1,158,
+4495,19,1648,1,158,
+3965,1,159,4496,19,
+1658,1,159,3965,1,
+160,4497,19,1663,1,
+160,3965,1,161,4498,
+19,1653,1,161,3965,
+1,162,4499,19,1640,
+1,162,3969,1,163,
+4500,19,1633,1,163,
+3975,1,164,4501,19,
+1704,1,164,3981,1,
+165,4502,19,1679,1,
+165,3981,1,166,4503,
+19,1127,1,166,3986,
+1,167,4504,19,911,
+1,167,4037,1,168,
+4505,19,895,1,168,
+4037,1,169,4506,19,
+901,1,169,4054,1,
+170,4507,19,889,1,
+170,4054,1,171,4508,
+19,1155,1,171,4070,
+1,172,4509,19,792,
+1,172,4057,1,173,
+4510,19,906,1,173,
+4057,1,174,4511,19,
+787,1,174,4057,1,
+175,4512,19,812,1,
+175,4057,1,176,4513,
+19,781,1,176,4057,
+1,177,4514,19,775,
+1,177,4057,1,178,
+4515,19,770,1,178,
+4057,1,179,4516,19,
+765,1,179,4057,1,
+180,4517,19,759,1,
+180,4057,1,181,4518,
+19,754,1,181,4057,
+1,182,4519,19,749,
+1,182,4057,1,183,
+4520,19,744,1,183,
+4057,1,184,4521,19,
+739,1,184,4057,1,
+185,4522,19,1162,1,
+185,4142,1,186,4523,
+19,1300,1,186,4155,
+1,187,4524,19,1149,
+1,187,4168,1,188,
+4525,19,1288,1,188,
+4168,1,189,4526,19,
+928,1,189,4181,1,
+190,4527,19,732,1,
+190,4181,1,191,4528,
+19,827,1,191,4181,
+1,192,4529,19,855,
+1,192,4181,1,193,
+4530,19,874,1,193,
+4194,1,194,4531,19,
+920,1,194,4194,1,
+195,4532,19,835,1,
+195,4207,1,196,4533,
+19,848,1,196,4207,
+1,197,4534,19,801,
+1,197,4220,1,198,
+4535,19,840,1,198,
+4220,1,199,4536,19,
+1478,1,199,4233,1,
+200,4537,19,1168,1,
+200,4233,1,201,4538,
+19,1510,1,201,4233,
+1,202,4539,19,1547,
+1,202,4233,1,203,
+4540,19,1416,1,203,
+4083,1,204,4541,19,
+1532,1,204,4083,1,
+205,4542,19,1143,1,
+205,4096,1,206,4543,
+19,1579,1,206,4096,
+1,207,4544,19,1505,
+1,207,4096,1,208,
+4545,19,1460,1,208,
+4096,1,209,4546,19,
+1384,1,209,4096,1,
+210,4547,19,1310,1,
+210,4096,1,211,4548,
+19,1320,1,211,4096,
+1,212,4549,19,1138,
+1,212,4096,1,213,
+4550,19,1563,1,213,
+4096,1,214,4551,19,
+1500,1,214,4096,1,
+215,4552,19,1450,1,
+215,4096,1,216,4553,
+19,1373,1,216,4096,
+1,217,4554,19,1336,
+1,217,4096,1,218,
+4555,19,1121,1,218,
+4096,1,219,4556,19,
+1466,1,219,4096,1,
+220,4557,19,1488,1,
+220,4096,1,221,4558,
+19,1443,1,221,4096,
+1,222,4559,19,1596,
+1,222,4096,1,223,
+4560,19,1276,1,223,
+4096,1,224,4561,19,
+1180,1,224,4096,1,
+225,4562,19,1110,1,
+225,4096,1,226,4563,
+19,1537,1,226,4096,
+1,227,4564,19,1483,
+1,227,4096,1,228,
+4565,19,1438,1,228,
+4096,1,229,4566,19,
+1305,1,229,4129,1,
+230,4567,19,1283,1,
+230,4129,1,231,4568,
+19,1568,1,231,4319,
+1,232,4569,19,1591,
+1,232,4319,1,233,
+4570,19,1558,1,233,
+4319,1,234,4571,19,
+1553,1,234,4319,1,
+235,4572,19,1574,1,
+235,4319,1,236,4573,
+19,1516,1,236,4319,
+1,237,4574,19,1230,
+1,237,4319,1,238,
+4575,19,1405,1,238,
+4395,1,239,4576,19,
+1191,1,239,4395,1,
+240,4577,19,1198,1,
+240,4395,1,241,4578,
+19,1219,1,241,4395,
+1,242,4579,19,1214,
+1,242,4395,1,243,
+4580,19,1209,1,243,
+4395,1,244,4581,19,
+1204,1,244,4395,1,
+245,4582,19,1394,1,
+245,4395,1,246,4583,
+19,1422,1,246,4395,
+1,247,4584,19,1399,
+1,247,4395,1,248,
+4585,19,1389,1,248,
+4395,1,249,4586,19,
+1379,1,249,4395,1,
+250,4587,19,1362,1,
+250,4395,1,251,4588,
+19,1315,1,251,4395,
+1,252,4589,19,1224,
+1,252,4395,1,253,
+4590,19,1185,1,253,
+4395,1,254,4591,19,
+1133,1,254,4395,1,
+255,4592,19,1586,1,
+255,4395,1,256,4593,
+19,1542,1,256,4395,
+1,257,4594,19,1527,
+1,257,4395,1,258,
+4595,19,1522,1,258,
+4395,1,259,4596,19,
+1473,1,259,4395,1,
+260,4597,19,1455,1,
+260,4395,1,261,4598,
+19,1432,1,261,4395,
+1,262,4599,19,1427,
+1,262,4395,1,263,
+4600,19,1368,1,263,
+4395,1,264,4601,19,
+1344,1,264,4395,1,
+265,4602,19,1410,1,
+265,4395,1,266,4603,
+19,1494,1,266,4395,
+1,267,4604,19,1357,
+1,267,4395,1,268,
+4605,19,1351,1,268,
+4395,1,269,4606,19,
+1331,1,269,4395,1,
+270,4607,19,1294,1,
+270,4395,1,271,4608,
+19,1271,1,271,4395,
+1,272,4609,19,1116,
+1,272,4395,1,273,
+4610,19,1606,1,273,
+4395,1,274,4611,19,
+1236,1,274,4395,1,
+275,4612,19,1241,1,
+275,4395,1,276,4613,
+19,1261,1,276,4395,
+1,277,4614,19,1251,
+1,277,4395,1,278,
+4615,19,1256,1,278,
+4395,1,279,4616,19,
+1246,1,279,4395,1,
+280,4617,19,1601,1,
+280,4395,1,281,4618,
+19,1266,1,281,4395,
+1,282,4619,19,1326,
+1,282,4238,1,283,
+4620,19,1717,1,283,
+4308,1,284,4621,19,
+1710,1,284,4308,1,
+285,4622,19,1689,1,
+285,4312,1,286,4623,
+19,2014,1,286,4005,
+1,287,4624,19,2009,
+1,287,4005,1,288,
+4625,19,2004,1,288,
+4005,1,289,4626,19,
+1999,1,289,4005,1,
+290,4627,19,1994,1,
+290,4005,1,291,4628,
+19,1989,1,291,4005,
+1,292,4629,19,1984,
+1,292,4005,1,293,
+4630,19,1973,1,293,
+4025,1,294,4631,19,
+1968,1,294,4025,1,
+295,4632,19,1963,1,
+295,4025,1,296,4633,
+19,1958,1,296,4025,
+1,297,4634,19,1953,
+1,297,4025,1,298,
+4635,19,1948,1,298,
+4025,1,299,4636,19,
+1943,1,299,4025,1,
+300,4637,19,1938,1,
+300,4025,1,301,4638,
+19,1933,1,301,4025,
+1,302,4639,19,1767,
+1,302,4025,1,303,
+4640,19,1927,1,303,
+4025,1,304,4641,19,
+1922,1,304,4025,1,
+305,4642,19,1917,1,
+305,4025,1,306,4643,
+19,1760,1,306,4025,
+1,307,4644,19,1912,
+1,307,4025,1,308,
+4645,19,1907,1,308,
+4025,1,309,4646,19,
+1902,1,309,4025,1,
+310,4647,19,1897,1,
+310,4025,1,311,4648,
+19,1892,1,311,4025,
+1,312,4649,19,1887,
+1,312,4025,1,313,
+4650,19,1753,1,313,
+4025,1,314,4651,19,
+1881,1,314,4025,1,
+315,4652,19,1876,1,
+315,4025,1,316,4653,
+19,1871,1,316,4025,
+1,317,4654,19,1747,
+1,317,4025,1,318,
+4655,19,1865,1,318,
+4025,1,319,4656,19,
+1796,1,319,4025,1,
+320,4657,19,1860,1,
+320,4025,1,321,4658,
+19,1855,1,321,4025,
+1,322,4659,19,1850,
+1,322,4025,1,323,
+4660,19,1845,1,323,
+4025,1,324,4661,19,
+1840,1,324,4025,1,
+325,4662,19,1835,1,
+325,4025,1,326,4663,
+19,1830,1,326,4031,
+1,327,4664,19,4665,
 4,50,65,0,114,
 0,103,0,117,0,
 109,0,101,0,110,
@@ -10739,16 +10934,16 @@ public yyLSLSyntax
 0,111,0,110,0,
 76,0,105,0,115,
 0,116,0,95,0,
-51,0,1,322,3945,
-1,323,4620,19,4621,
+51,0,1,327,3981,
+1,328,4666,19,4667,
 4,28,65,0,114,
 0,103,0,117,0,
 109,0,101,0,110,
 0,116,0,76,0,
 105,0,115,0,116,
 0,95,0,51,0,
-1,323,4265,1,324,
-4622,19,4623,4,50,
+1,328,4308,1,329,
+4668,19,4669,4,50,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
@@ -10759,32 +10954,33 @@ public yyLSLSyntax
 0,110,0,76,0,
 105,0,115,0,116,
 0,95,0,52,0,
-1,324,3945,1,325,
-4624,19,4625,4,28,
+1,329,3981,1,330,
+4670,19,4671,4,50,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,76,0,
+105,0,115,0,116,
+0,95,0,53,0,
+1,330,3981,1,331,
+4672,19,4673,4,28,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
 0,76,0,105,0,
 115,0,116,0,95,
-0,52,0,1,325,
-4265,1,326,4626,19,
-4627,4,50,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,95,
-0,53,0,1,326,
-3945,2,0,0};
+0,52,0,1,331,
+4308,2,0,0};
 new Sfactory(this,"ExpressionArgument_1",new SCreator(ExpressionArgument_1_factory));
 new Sfactory(this,"SimpleAssignment_8",new SCreator(SimpleAssignment_8_factory));
+new Sfactory(this,"SimpleAssignment_9",new SCreator(SimpleAssignment_9_factory));
 new Sfactory(this,"StatementList_1",new SCreator(StatementList_1_factory));
 new Sfactory(this,"StateChange_1",new SCreator(StateChange_1_factory));
-new Sfactory(this,"StateChange_2",new SCreator(StateChange_2_factory));
+new Sfactory(this,"EmptyStatement",new SCreator(EmptyStatement_factory));
 new Sfactory(this,"Declaration",new SCreator(Declaration_factory));
 new Sfactory(this,"IdentExpression",new SCreator(IdentExpression_factory));
 new Sfactory(this,"error",new SCreator(error_factory));
@@ -10833,6 +11029,7 @@ new Sfactory(this,"LSLProgramRoot_2",new SCreator(LSLProgramRoot_2_factory));
 new Sfactory(this,"States_1",new SCreator(States_1_factory));
 new Sfactory(this,"States_2",new SCreator(States_2_factory));
 new Sfactory(this,"FunctionCallExpression_1",new SCreator(FunctionCallExpression_1_factory));
+new Sfactory(this,"Event_24",new SCreator(Event_24_factory));
 new Sfactory(this,"ForLoopStatement",new SCreator(ForLoopStatement_factory));
 new Sfactory(this,"DoWhileStatement_1",new SCreator(DoWhileStatement_1_factory));
 new Sfactory(this,"DoWhileStatement_2",new SCreator(DoWhileStatement_2_factory));
@@ -10885,7 +11082,9 @@ new Sfactory(this,"ArgumentList_1",new SCreator(ArgumentList_1_factory));
 new Sfactory(this,"ArgumentList_2",new SCreator(ArgumentList_2_factory));
 new Sfactory(this,"Constant",new SCreator(Constant_factory));
 new Sfactory(this,"State",new SCreator(State_factory));
+new Sfactory(this,"Event_12",new SCreator(Event_12_factory));
 new Sfactory(this,"Event_13",new SCreator(Event_13_factory));
+new Sfactory(this,"Event_14",new SCreator(Event_14_factory));
 new Sfactory(this,"LSLProgramRoot",new SCreator(LSLProgramRoot_factory));
 new Sfactory(this,"StateChange",new SCreator(StateChange_factory));
 new Sfactory(this,"IncrementDecrementExpression_2",new SCreator(IncrementDecrementExpression_2_factory));
@@ -10900,10 +11099,11 @@ new Sfactory(this,"Event_21",new SCreator(Event_21_factory));
 new Sfactory(this,"Event_22",new SCreator(Event_22_factory));
 new Sfactory(this,"CompoundStatement",new SCreator(CompoundStatement_factory));
 new Sfactory(this,"RotationConstant_1",new SCreator(RotationConstant_1_factory));
+new Sfactory(this,"ArgumentDeclarationList_4",new SCreator(ArgumentDeclarationList_4_factory));
 new Sfactory(this,"TypecastExpression",new SCreator(TypecastExpression_factory));
 new Sfactory(this,"SimpleAssignment_3",new SCreator(SimpleAssignment_3_factory));
 new Sfactory(this,"SimpleAssignment_4",new SCreator(SimpleAssignment_4_factory));
-new Sfactory(this,"Statement_1",new SCreator(Statement_1_factory));
+new Sfactory(this,"StateEntryStateEvent_1",new SCreator(StateEntryStateEvent_1_factory));
 new Sfactory(this,"Statement_2",new SCreator(Statement_2_factory));
 new Sfactory(this,"Statement_3",new SCreator(Statement_3_factory));
 new Sfactory(this,"Statement_4",new SCreator(Statement_4_factory));
@@ -10928,7 +11128,7 @@ new Sfactory(this,"IncrementDecrementExpression_6",new SCreator(IncrementDecreme
 new Sfactory(this,"StateEvent",new SCreator(StateEvent_factory));
 new Sfactory(this,"Event_20",new SCreator(Event_20_factory));
 new Sfactory(this,"Event_23",new SCreator(Event_23_factory));
-new Sfactory(this,"Event_24",new SCreator(Event_24_factory));
+new Sfactory(this,"Statement_1",new SCreator(Statement_1_factory));
 new Sfactory(this,"Event_26",new SCreator(Event_26_factory));
 new Sfactory(this,"SimpleAssignment_10",new SCreator(SimpleAssignment_10_factory));
 new Sfactory(this,"Event",new SCreator(Event_factory));
@@ -10941,7 +11141,6 @@ new Sfactory(this,"Statement_13",new SCreator(Statement_13_factory));
 new Sfactory(this,"Event_15",new SCreator(Event_15_factory));
 new Sfactory(this,"Event_16",new SCreator(Event_16_factory));
 new Sfactory(this,"Event_32",new SCreator(Event_32_factory));
-new Sfactory(this,"Event_34",new SCreator(Event_34_factory));
 new Sfactory(this,"SimpleAssignment_20",new SCreator(SimpleAssignment_20_factory));
 new Sfactory(this,"SimpleAssignment_24",new SCreator(SimpleAssignment_24_factory));
 new Sfactory(this,"SimpleAssignment_1",new SCreator(SimpleAssignment_1_factory));
@@ -10951,8 +11150,8 @@ new Sfactory(this,"FunctionCallExpression",new SCreator(FunctionCallExpression_f
 new Sfactory(this,"SimpleAssignment_6",new SCreator(SimpleAssignment_6_factory));
 new Sfactory(this,"StateBody_1",new SCreator(StateBody_1_factory));
 new Sfactory(this,"StatementList_2",new SCreator(StatementList_2_factory));
-new Sfactory(this,"SimpleAssignment_9",new SCreator(SimpleAssignment_9_factory));
-new Sfactory(this,"BinaryExpression_15",new SCreator(BinaryExpression_15_factory));
+new Sfactory(this,"StateBody_3",new SCreator(StateBody_3_factory));
+new Sfactory(this,"StateBody_4",new SCreator(StateBody_4_factory));
 new Sfactory(this,"BinaryExpression_16",new SCreator(BinaryExpression_16_factory));
 new Sfactory(this,"BinaryExpression_17",new SCreator(BinaryExpression_17_factory));
 new Sfactory(this,"BinaryExpression_18",new SCreator(BinaryExpression_18_factory));
@@ -10964,13 +11163,14 @@ new Sfactory(this,"BinaryExpression_11",new SCreator(BinaryExpression_11_factory
 new Sfactory(this,"BinaryExpression_12",new SCreator(BinaryExpression_12_factory));
 new Sfactory(this,"BinaryExpression_13",new SCreator(BinaryExpression_13_factory));
 new Sfactory(this,"BinaryExpression_14",new SCreator(BinaryExpression_14_factory));
+new Sfactory(this,"BinaryExpression_15",new SCreator(BinaryExpression_15_factory));
 new Sfactory(this,"BinaryExpression_6",new SCreator(BinaryExpression_6_factory));
 new Sfactory(this,"BinaryExpression_7",new SCreator(BinaryExpression_7_factory));
 new Sfactory(this,"ArgumentList",new SCreator(ArgumentList_factory));
 new Sfactory(this,"Event_10",new SCreator(Event_10_factory));
 new Sfactory(this,"ConstantExpression_1",new SCreator(ConstantExpression_1_factory));
-new Sfactory(this,"Event_12",new SCreator(Event_12_factory));
-new Sfactory(this,"Event_14",new SCreator(Event_14_factory));
+new Sfactory(this,"StateEntryStateEvent",new SCreator(StateEntryStateEvent_factory));
+new Sfactory(this,"StateChange_2",new SCreator(StateChange_2_factory));
 new Sfactory(this,"Event_17",new SCreator(Event_17_factory));
 new Sfactory(this,"Event_18",new SCreator(Event_18_factory));
 new Sfactory(this,"Event_19",new SCreator(Event_19_factory));
@@ -10991,6 +11191,7 @@ new Sfactory(this,"Declaration_1",new SCreator(Declaration_1_factory));
 new Sfactory(this,"SimpleAssignment_7",new SCreator(SimpleAssignment_7_factory));
 new Sfactory(this,"ForLoop",new SCreator(ForLoop_factory));
 new Sfactory(this,"ForLoop_2",new SCreator(ForLoop_2_factory));
+new Sfactory(this,"EntryEvent_1",new SCreator(EntryEvent_1_factory));
 new Sfactory(this,"Event_30",new SCreator(Event_30_factory));
 new Sfactory(this,"Event_31",new SCreator(Event_31_factory));
 new Sfactory(this,"Event_33",new SCreator(Event_33_factory));
@@ -11000,9 +11201,8 @@ new Sfactory(this,"IfStatement",new SCreator(IfStatement_factory));
 new Sfactory(this,"ForLoopStatement_1",new SCreator(ForLoopStatement_1_factory));
 new Sfactory(this,"ForLoopStatement_2",new SCreator(ForLoopStatement_2_factory));
 new Sfactory(this,"ForLoopStatement_3",new SCreator(ForLoopStatement_3_factory));
-new Sfactory(this,"ArgumentDeclarationList_4",new SCreator(ArgumentDeclarationList_4_factory));
+new Sfactory(this,"EntryEvent",new SCreator(EntryEvent_factory));
 new Sfactory(this,"ArgumentDeclarationList_5",new SCreator(ArgumentDeclarationList_5_factory));
-new Sfactory(this,"EmptyStatement",new SCreator(EmptyStatement_factory));
 new Sfactory(this,"WhileStatement",new SCreator(WhileStatement_factory));
 new Sfactory(this,"ForLoop_1",new SCreator(ForLoop_1_factory));
 new Sfactory(this,"Constant_2",new SCreator(Constant_2_factory));
@@ -11014,9 +11214,10 @@ new Sfactory(this,"States",new SCreator(States_factory));
 }
 public static object ExpressionArgument_1_factory(Parser yyp) { return new ExpressionArgument_1(yyp); }
 public static object SimpleAssignment_8_factory(Parser yyp) { return new SimpleAssignment_8(yyp); }
+public static object SimpleAssignment_9_factory(Parser yyp) { return new SimpleAssignment_9(yyp); }
 public static object StatementList_1_factory(Parser yyp) { return new StatementList_1(yyp); }
 public static object StateChange_1_factory(Parser yyp) { return new StateChange_1(yyp); }
-public static object StateChange_2_factory(Parser yyp) { return new StateChange_2(yyp); }
+public static object EmptyStatement_factory(Parser yyp) { return new EmptyStatement(yyp); }
 public static object Declaration_factory(Parser yyp) { return new Declaration(yyp); }
 public static object IdentExpression_factory(Parser yyp) { return new IdentExpression(yyp); }
 public static object error_factory(Parser yyp) { return new error(yyp); }
@@ -11065,6 +11266,7 @@ public static object LSLProgramRoot_2_factory(Parser yyp) { return new LSLProgra
 public static object States_1_factory(Parser yyp) { return new States_1(yyp); }
 public static object States_2_factory(Parser yyp) { return new States_2(yyp); }
 public static object FunctionCallExpression_1_factory(Parser yyp) { return new FunctionCallExpression_1(yyp); }
+public static object Event_24_factory(Parser yyp) { return new Event_24(yyp); }
 public static object ForLoopStatement_factory(Parser yyp) { return new ForLoopStatement(yyp); }
 public static object DoWhileStatement_1_factory(Parser yyp) { return new DoWhileStatement_1(yyp); }
 public static object DoWhileStatement_2_factory(Parser yyp) { return new DoWhileStatement_2(yyp); }
@@ -11117,7 +11319,9 @@ public static object ArgumentList_1_factory(Parser yyp) { return new ArgumentLis
 public static object ArgumentList_2_factory(Parser yyp) { return new ArgumentList_2(yyp); }
 public static object Constant_factory(Parser yyp) { return new Constant(yyp); }
 public static object State_factory(Parser yyp) { return new State(yyp); }
+public static object Event_12_factory(Parser yyp) { return new Event_12(yyp); }
 public static object Event_13_factory(Parser yyp) { return new Event_13(yyp); }
+public static object Event_14_factory(Parser yyp) { return new Event_14(yyp); }
 public static object LSLProgramRoot_factory(Parser yyp) { return new LSLProgramRoot(yyp); }
 public static object StateChange_factory(Parser yyp) { return new StateChange(yyp); }
 public static object IncrementDecrementExpression_2_factory(Parser yyp) { return new IncrementDecrementExpression_2(yyp); }
@@ -11132,10 +11336,11 @@ public static object Event_21_factory(Parser yyp) { return new Event_21(yyp); }
 public static object Event_22_factory(Parser yyp) { return new Event_22(yyp); }
 public static object CompoundStatement_factory(Parser yyp) { return new CompoundStatement(yyp); }
 public static object RotationConstant_1_factory(Parser yyp) { return new RotationConstant_1(yyp); }
+public static object ArgumentDeclarationList_4_factory(Parser yyp) { return new ArgumentDeclarationList_4(yyp); }
 public static object TypecastExpression_factory(Parser yyp) { return new TypecastExpression(yyp); }
 public static object SimpleAssignment_3_factory(Parser yyp) { return new SimpleAssignment_3(yyp); }
 public static object SimpleAssignment_4_factory(Parser yyp) { return new SimpleAssignment_4(yyp); }
-public static object Statement_1_factory(Parser yyp) { return new Statement_1(yyp); }
+public static object StateEntryStateEvent_1_factory(Parser yyp) { return new StateEntryStateEvent_1(yyp); }
 public static object Statement_2_factory(Parser yyp) { return new Statement_2(yyp); }
 public static object Statement_3_factory(Parser yyp) { return new Statement_3(yyp); }
 public static object Statement_4_factory(Parser yyp) { return new Statement_4(yyp); }
@@ -11160,7 +11365,7 @@ public static object IncrementDecrementExpression_6_factory(Parser yyp) { return
 public static object StateEvent_factory(Parser yyp) { return new StateEvent(yyp); }
 public static object Event_20_factory(Parser yyp) { return new Event_20(yyp); }
 public static object Event_23_factory(Parser yyp) { return new Event_23(yyp); }
-public static object Event_24_factory(Parser yyp) { return new Event_24(yyp); }
+public static object Statement_1_factory(Parser yyp) { return new Statement_1(yyp); }
 public static object Event_26_factory(Parser yyp) { return new Event_26(yyp); }
 public static object SimpleAssignment_10_factory(Parser yyp) { return new SimpleAssignment_10(yyp); }
 public static object Event_factory(Parser yyp) { return new Event(yyp); }
@@ -11173,7 +11378,6 @@ public static object Statement_13_factory(Parser yyp) { return new Statement_13(
 public static object Event_15_factory(Parser yyp) { return new Event_15(yyp); }
 public static object Event_16_factory(Parser yyp) { return new Event_16(yyp); }
 public static object Event_32_factory(Parser yyp) { return new Event_32(yyp); }
-public static object Event_34_factory(Parser yyp) { return new Event_34(yyp); }
 public static object SimpleAssignment_20_factory(Parser yyp) { return new SimpleAssignment_20(yyp); }
 public static object SimpleAssignment_24_factory(Parser yyp) { return new SimpleAssignment_24(yyp); }
 public static object SimpleAssignment_1_factory(Parser yyp) { return new SimpleAssignment_1(yyp); }
@@ -11183,8 +11387,8 @@ public static object FunctionCallExpression_factory(Parser yyp) { return new Fun
 public static object SimpleAssignment_6_factory(Parser yyp) { return new SimpleAssignment_6(yyp); }
 public static object StateBody_1_factory(Parser yyp) { return new StateBody_1(yyp); }
 public static object StatementList_2_factory(Parser yyp) { return new StatementList_2(yyp); }
-public static object SimpleAssignment_9_factory(Parser yyp) { return new SimpleAssignment_9(yyp); }
-public static object BinaryExpression_15_factory(Parser yyp) { return new BinaryExpression_15(yyp); }
+public static object StateBody_3_factory(Parser yyp) { return new StateBody_3(yyp); }
+public static object StateBody_4_factory(Parser yyp) { return new StateBody_4(yyp); }
 public static object BinaryExpression_16_factory(Parser yyp) { return new BinaryExpression_16(yyp); }
 public static object BinaryExpression_17_factory(Parser yyp) { return new BinaryExpression_17(yyp); }
 public static object BinaryExpression_18_factory(Parser yyp) { return new BinaryExpression_18(yyp); }
@@ -11196,13 +11400,14 @@ public static object BinaryExpression_11_factory(Parser yyp) { return new Binary
 public static object BinaryExpression_12_factory(Parser yyp) { return new BinaryExpression_12(yyp); }
 public static object BinaryExpression_13_factory(Parser yyp) { return new BinaryExpression_13(yyp); }
 public static object BinaryExpression_14_factory(Parser yyp) { return new BinaryExpression_14(yyp); }
+public static object BinaryExpression_15_factory(Parser yyp) { return new BinaryExpression_15(yyp); }
 public static object BinaryExpression_6_factory(Parser yyp) { return new BinaryExpression_6(yyp); }
 public static object BinaryExpression_7_factory(Parser yyp) { return new BinaryExpression_7(yyp); }
 public static object ArgumentList_factory(Parser yyp) { return new ArgumentList(yyp); }
 public static object Event_10_factory(Parser yyp) { return new Event_10(yyp); }
 public static object ConstantExpression_1_factory(Parser yyp) { return new ConstantExpression_1(yyp); }
-public static object Event_12_factory(Parser yyp) { return new Event_12(yyp); }
-public static object Event_14_factory(Parser yyp) { return new Event_14(yyp); }
+public static object StateEntryStateEvent_factory(Parser yyp) { return new StateEntryStateEvent(yyp); }
+public static object StateChange_2_factory(Parser yyp) { return new StateChange_2(yyp); }
 public static object Event_17_factory(Parser yyp) { return new Event_17(yyp); }
 public static object Event_18_factory(Parser yyp) { return new Event_18(yyp); }
 public static object Event_19_factory(Parser yyp) { return new Event_19(yyp); }
@@ -11223,6 +11428,7 @@ public static object Declaration_1_factory(Parser yyp) { return new Declaration_
 public static object SimpleAssignment_7_factory(Parser yyp) { return new SimpleAssignment_7(yyp); }
 public static object ForLoop_factory(Parser yyp) { return new ForLoop(yyp); }
 public static object ForLoop_2_factory(Parser yyp) { return new ForLoop_2(yyp); }
+public static object EntryEvent_1_factory(Parser yyp) { return new EntryEvent_1(yyp); }
 public static object Event_30_factory(Parser yyp) { return new Event_30(yyp); }
 public static object Event_31_factory(Parser yyp) { return new Event_31(yyp); }
 public static object Event_33_factory(Parser yyp) { return new Event_33(yyp); }
@@ -11232,9 +11438,8 @@ public static object IfStatement_factory(Parser yyp) { return new IfStatement(yy
 public static object ForLoopStatement_1_factory(Parser yyp) { return new ForLoopStatement_1(yyp); }
 public static object ForLoopStatement_2_factory(Parser yyp) { return new ForLoopStatement_2(yyp); }
 public static object ForLoopStatement_3_factory(Parser yyp) { return new ForLoopStatement_3(yyp); }
-public static object ArgumentDeclarationList_4_factory(Parser yyp) { return new ArgumentDeclarationList_4(yyp); }
+public static object EntryEvent_factory(Parser yyp) { return new EntryEvent(yyp); }
 public static object ArgumentDeclarationList_5_factory(Parser yyp) { return new ArgumentDeclarationList_5(yyp); }
-public static object EmptyStatement_factory(Parser yyp) { return new EmptyStatement(yyp); }
 public static object WhileStatement_factory(Parser yyp) { return new WhileStatement(yyp); }
 public static object ForLoop_1_factory(Parser yyp) { return new ForLoop_1(yyp); }
 public static object Constant_2_factory(Parser yyp) { return new Constant_2(yyp); }
-- 
cgit v1.1


From 2d315ec207292ef05bab5e4f662599e755d7acbf Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 5 Nov 2013 20:58:52 +0000
Subject: Fix a race condition where pCampbot actions could continue even if a
 bot had disconnected.

---
 OpenSim/Tools/pCampBot/Bot.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index ccc24fa..70aa2cb 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -276,7 +276,7 @@ namespace pCampBot
         //add additional steps and/or things the bot should do
         private void Action()
         {
-            while (ConnectionState != ConnectionState.Disconnecting)
+            while (ConnectionState == ConnectionState.Connected)
             {
                 lock (Behaviours)
                 {
-- 
cgit v1.1


From fb23f78928c72cdaab1e33270f4c732690e10714 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 5 Nov 2013 23:18:09 +0000
Subject: minor: comment out "SetLastPosition" GridUserService debug message
 for now.

---
 OpenSim/Services/UserAccountService/GridUserService.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index 944411f..bef1691 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -194,7 +194,8 @@ 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)
             {
-- 
cgit v1.1


From caf2abe311a9f7a703ba7444601c34d96053edcf Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 5 Nov 2013 23:32:26 +0000
Subject: Record individual region bot disconnects in pCampbot log

---
 OpenSim/Tools/pCampBot/Bot.cs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index 70aa2cb..de464ab 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -264,9 +264,10 @@ namespace pCampBot
                 newClient.Throttle.Total = 400000;
             }
 
-            newClient.Network.LoginProgress += this.Network_LoginProgress;
-            newClient.Network.SimConnected += this.Network_SimConnected;
-            newClient.Network.Disconnected += this.Network_OnDisconnected;
+            newClient.Network.LoginProgress += Network_LoginProgress;
+            newClient.Network.SimConnected += Network_SimConnected;
+            newClient.Network.SimDisconnected += Network_SimDisconnected;
+            newClient.Network.Disconnected += Network_OnDisconnected;
             newClient.Objects.ObjectUpdate += Objects_NewPrim;
 
             Client = newClient;
@@ -583,7 +584,13 @@ namespace pCampBot
         public void Network_SimConnected(object sender, SimConnectedEventArgs args)
         {
             m_log.DebugFormat(
-                "[BOT]: Bot {0} connected to {1} at {2}", Name, args.Simulator.Name, args.Simulator.IPEndPoint);
+                "[BOT]: Bot {0} connected to region {1} at {2}", Name, args.Simulator.Name, args.Simulator.IPEndPoint);
+        }
+
+        public void Network_SimDisconnected(object sender, SimDisconnectedEventArgs args)
+        {
+            m_log.DebugFormat(
+                "[BOT]: Bot {0} disconnected from region {1} at {2}", Name, args.Simulator.Name, args.Simulator.IPEndPoint);
         }
 
         public void Network_OnDisconnected(object sender, DisconnectedEventArgs args)
@@ -591,7 +598,7 @@ namespace pCampBot
             ConnectionState = ConnectionState.Disconnected;
 
             m_log.DebugFormat(
-                "[BOT]: Bot {0} disconnected reason {1}, message {2}", Name, args.Reason, args.Message);
+                "[BOT]: Bot {0} disconnected from grid, reason {1}, message {2}", Name, args.Reason, args.Message);
 
 //            m_log.ErrorFormat("Fired Network_OnDisconnected");
 
-- 
cgit v1.1


From 8e1bf55e7b85f8c92237ef2208a4a2c31ba6153c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 6 Nov 2013 01:02:20 +0000
Subject: Add IncomingPacketsResentCount clientstack statistics

This records how many packets were indicated to be resends by clients
Not 100% reliable since clients can lie about resends, but usually would indicate if clients are not receiving UDP acks at all or in a manner they consider timely.
---
 .../Region/ClientStack/Linden/UDP/LLUDPServer.cs   | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 3bd1ef1..c0a4e56 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -134,6 +134,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             StatsManager.RegisterStat(
                 new Stat(
+                    "IncomingPacketsResentCount",
+                    "Number of inbound packets that clients indicate are resends.",
+                    "",
+                    "",
+                    "clientstack",
+                    scene.Name,
+                    StatType.Pull,
+                    MeasuresOfInterest.AverageChangeOverTime,
+                    stat => stat.Value = m_udpServer.IncomingPacketsResentCount,
+                    StatVerbosity.Debug));
+
+            StatsManager.RegisterStat(
+                new Stat(
                     "OutgoingUDPSendsCount",
                     "Number of UDP sends performed",
                     "",
@@ -318,6 +331,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         internal int PacketsSentCount { get; set; }
 
         /// <summary>
+        /// Record how many incoming packets are indicated as resends by clients.
+        /// </summary>
+        internal int IncomingPacketsResentCount { get; set; }
+
+        /// <summary>
         /// Record how many inbound packets could not be recognized as LLUDP packets.
         /// </summary>
         public int IncomingMalformedPacketCount { get; private set; }
@@ -1467,6 +1485,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             #region Incoming Packet Accounting
 
+            // We're not going to worry about interlock yet since its not currently critical that this total count
+            // is 100% correct
+            if (packet.Header.Resent)
+                IncomingPacketsResentCount++;
+
             // Check the archive of received reliable packet IDs to see whether we already received this packet
             if (packet.Header.Reliable && !udpClient.PacketArchive.TryEnqueue(packet.Header.Sequence))
             {
-- 
cgit v1.1


From 417836ac5e3beb840ad68909e6f618ee3177b282 Mon Sep 17 00:00:00 2001
From: Latif Khalifa
Date: Wed, 6 Nov 2013 02:43:44 +0100
Subject: Updated libomv to 25ee208a 2013-11-05

---
 bin/OpenMetaverse.Rendering.Meshmerizer.dll | Bin 20480 -> 20480 bytes
 bin/OpenMetaverse.StructuredData.dll        | Bin 102400 -> 106496 bytes
 bin/OpenMetaverse.XML                       | 125 +++++++++++++++++++++++++++-
 bin/OpenMetaverse.dll                       | Bin 1794048 -> 1806336 bytes
 bin/OpenMetaverseTypes.XML                  |  52 ------------
 bin/OpenMetaverseTypes.dll                  | Bin 110592 -> 110592 bytes
 6 files changed, 124 insertions(+), 53 deletions(-)

diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index e63593e..052490d 100755
Binary files a/bin/OpenMetaverse.Rendering.Meshmerizer.dll and b/bin/OpenMetaverse.Rendering.Meshmerizer.dll differ
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index d6a3247..8b920bd 100755
Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ
diff --git a/bin/OpenMetaverse.XML b/bin/OpenMetaverse.XML
index 457cbe1..6e35a04 100644
--- a/bin/OpenMetaverse.XML
+++ b/bin/OpenMetaverse.XML
@@ -7557,6 +7557,9 @@
         <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket.DataBlock">
             <exclude/>
         </member>
+        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket.SizeBlock">
+            <exclude/>
+        </member>
         <member name="T:OpenMetaverse.Packets.MapItemRequestPacket">
             <exclude/>
         </member>
@@ -9160,6 +9163,13 @@
             </summary>
             <returns>A byte array containing raw texture data</returns>
         </member>
+        <member name="M:OpenMetaverse.Imaging.ManagedImage.ExportBitmap">
+            <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="T:OpenMetaverse.Assets.AssetMutable">
             <summary>
             Represents an Animation
@@ -11537,6 +11547,26 @@
             <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="F:OpenMetaverse.Primitive.ParticleSystem.PartStartGlow">
+            <summary>A <see langword="float"/> that represents the start glow value</summary>
+            <remarks>Minimum value is 0, maximum value is 1</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartEndGlow">
+            <summary>A <see langword="float"/> that represents the end glow value</summary>
+            <remarks>Minimum value is 0, maximum value is 1</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BlendFuncSource">
+            <summary>OpenGL blend function to use at particle source</summary>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BlendFuncDest">
+            <summary>OpenGL blend function to use at particle destination</summary>
+        </member>
+        <member name="M:OpenMetaverse.Primitive.ParticleSystem.IsLegacyCompatible">
+            <summary>
+            Can this particle system be packed in a legacy compatible way
+            </summary>
+            <returns>True if the particle system doesn't use new particle system features</returns>
+        </member>
         <member name="M:OpenMetaverse.Primitive.ParticleSystem.#ctor(System.Byte[],System.Int32)">
             <summary>
             Decodes a byte[] array into a ParticleSystem Object
@@ -11611,6 +11641,15 @@
         <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Beam">
             <summary>used for point/grab/touch</summary>
         </member>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Ribbon">
+            <summary>continuous ribbon particle</summary>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.DataGlow">
+            <summary>particle data contains glow</summary>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.DataBlend">
+            <summary>particle data contains blend functions</summary>
+        </member>
         <member name="T:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags">
             <summary>
             Particle Flags Enum
@@ -12044,6 +12083,17 @@
             <param name="transactionID">UUID of the transaction</param>
             <param name="callback">The callback to fire when the simulator responds with the asset data</param>
         </member>
+        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.UUID,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>
         <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
@@ -18501,7 +18551,11 @@
             </summary>
             <returns>True on success, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.DecodeWearableParams(OpenMetaverse.AppearanceManager.WearableData)">
+        <member name="M:OpenMetaverse.AppearanceManager.DecodeWearableParams(OpenMetaverse.AppearanceManager.WearableData,OpenMetaverse.AppearanceManager.TextureData[]@)">
+            <summary>
+            Populates textures and visual params from a decoded asset
+            </summary>
+            <param name="wearable">Wearable to decode</param>
             <summary>
             Populates textures and visual params from a decoded asset
             </summary>
@@ -18984,6 +19038,9 @@
         <member name="P:OpenMetaverse.InventoryNode.Data">
             <summary></summary>
         </member>
+        <member name="P:OpenMetaverse.InventoryNode.Tag">
+            <summary>User data</summary>
+        </member>
         <member name="P:OpenMetaverse.InventoryNode.Parent">
             <summary></summary>
         </member>
@@ -19146,6 +19203,15 @@
             Region protocol flags
             </summary>
         </member>
+        <member name="F:OpenMetaverse.RegionProtocols.None">
+            <summary>Nothing special</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionProtocols.AgentAppearanceService">
+            <summary>Region supports Server side Appearance</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionProtocols.SelfAppearanceSupport">
+            <summary>Viewer supports Server side Appearance</summary>
+        </member>
         <member name="T:OpenMetaverse.SimAccess">
             <summary>
             Access level for a simulator
@@ -21475,6 +21541,11 @@
             Constants for the archiving module
             </summary>
         </member>
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.LANDDATA_PATH">
+            <value>
+              Path for region settings.
+            </value>
+        </member>
         <member name="F:OpenMetaverse.Assets.ArchiveConstants.CONTROL_FILE_PATH">
             <summary>
             The location of the archive control file
@@ -23668,6 +23739,58 @@
             </summary>
             <returns>OSD containting the messaage</returns>
         </member>
+        <member name="T:OpenMetaverse.Parallel">
+            <summary>
+            Provides helper methods for parallelizing loops
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Parallel.For(System.Int32,System.Int32,System.Action{System.Int32})">
+            <summary>
+            Executes a for loop in which iterations may run in parallel
+            </summary>
+            <param name="fromInclusive">The loop will be started at this index</param>
+            <param name="toExclusive">The loop will be terminated before this index is reached</param>
+            <param name="body">Method body to run for each iteration of the loop</param>
+        </member>
+        <member name="M:OpenMetaverse.Parallel.For(System.Int32,System.Int32,System.Int32,System.Action{System.Int32})">
+            <summary>
+            Executes a for loop in which iterations may run in parallel
+            </summary>
+            <param name="threadCount">The number of concurrent execution threads to run</param>
+            <param name="fromInclusive">The loop will be started at this index</param>
+            <param name="toExclusive">The loop will be terminated before this index is reached</param>
+            <param name="body">Method body to run for each iteration of the loop</param>
+        </member>
+        <member name="M:OpenMetaverse.Parallel.ForEach``1(System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
+            <summary>
+            Executes a foreach loop in which iterations may run in parallel
+            </summary>
+            <typeparam name="T">Object type that the collection wraps</typeparam>
+            <param name="enumerable">An enumerable collection to iterate over</param>
+            <param name="body">Method body to run for each object in the collection</param>
+        </member>
+        <member name="M:OpenMetaverse.Parallel.ForEach``1(System.Int32,System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
+            <summary>
+            Executes a foreach loop in which iterations may run in parallel
+            </summary>
+            <typeparam name="T">Object type that the collection wraps</typeparam>
+            <param name="threadCount">The number of concurrent execution threads to run</param>
+            <param name="enumerable">An enumerable collection to iterate over</param>
+            <param name="body">Method body to run for each object in the collection</param>
+        </member>
+        <member name="M:OpenMetaverse.Parallel.Invoke(System.Action[])">
+            <summary>
+            Executes a series of tasks in parallel
+            </summary>
+            <param name="actions">A series of method bodies to execute</param>
+        </member>
+        <member name="M:OpenMetaverse.Parallel.Invoke(System.Int32,System.Action[])">
+            <summary>
+            Executes a series of tasks in parallel
+            </summary>
+            <param name="threadCount">The number of concurrent execution threads to run</param>
+            <param name="actions">A series of method bodies to execute</param>
+        </member>
         <member name="F:OpenMetaverse.InventorySortOrder.ByName">
             <summary>Sort by name</summary>
         </member>
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 3d89548..a91670d 100755
Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ
diff --git a/bin/OpenMetaverseTypes.XML b/bin/OpenMetaverseTypes.XML
index 56e3ac7..4f5b6b4 100644
--- a/bin/OpenMetaverseTypes.XML
+++ b/bin/OpenMetaverseTypes.XML
@@ -2573,58 +2573,6 @@
         <member name="F:OpenMetaverse.UUID.ZeroString">
             <summary>A cache of UUID.Zero as a string to optimize a common path</summary>
         </member>
-        <member name="T:OpenMetaverse.Parallel">
-            <summary>
-            Provides helper methods for parallelizing loops
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Parallel.For(System.Int32,System.Int32,System.Action{System.Int32})">
-            <summary>
-            Executes a for loop in which iterations may run in parallel
-            </summary>
-            <param name="fromInclusive">The loop will be started at this index</param>
-            <param name="toExclusive">The loop will be terminated before this index is reached</param>
-            <param name="body">Method body to run for each iteration of the loop</param>
-        </member>
-        <member name="M:OpenMetaverse.Parallel.For(System.Int32,System.Int32,System.Int32,System.Action{System.Int32})">
-            <summary>
-            Executes a for loop in which iterations may run in parallel
-            </summary>
-            <param name="threadCount">The number of concurrent execution threads to run</param>
-            <param name="fromInclusive">The loop will be started at this index</param>
-            <param name="toExclusive">The loop will be terminated before this index is reached</param>
-            <param name="body">Method body to run for each iteration of the loop</param>
-        </member>
-        <member name="M:OpenMetaverse.Parallel.ForEach``1(System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
-            <summary>
-            Executes a foreach loop in which iterations may run in parallel
-            </summary>
-            <typeparam name="T">Object type that the collection wraps</typeparam>
-            <param name="enumerable">An enumerable collection to iterate over</param>
-            <param name="body">Method body to run for each object in the collection</param>
-        </member>
-        <member name="M:OpenMetaverse.Parallel.ForEach``1(System.Int32,System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
-            <summary>
-            Executes a foreach loop in which iterations may run in parallel
-            </summary>
-            <typeparam name="T">Object type that the collection wraps</typeparam>
-            <param name="threadCount">The number of concurrent execution threads to run</param>
-            <param name="enumerable">An enumerable collection to iterate over</param>
-            <param name="body">Method body to run for each object in the collection</param>
-        </member>
-        <member name="M:OpenMetaverse.Parallel.Invoke(System.Action[])">
-            <summary>
-            Executes a series of tasks in parallel
-            </summary>
-            <param name="actions">A series of method bodies to execute</param>
-        </member>
-        <member name="M:OpenMetaverse.Parallel.Invoke(System.Int32,System.Action[])">
-            <summary>
-            Executes a series of tasks in parallel
-            </summary>
-            <param name="threadCount">The number of concurrent execution threads to run</param>
-            <param name="actions">A series of method bodies to execute</param>
-        </member>
         <member name="M:OpenMetaverse.CircularQueue`1.#ctor(OpenMetaverse.CircularQueue{`0})">
             <summary>
             Copy constructor
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index 213555c..4d00d5e 100755
Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ
-- 
cgit v1.1


From 26fd29622d602cbd63743f4f2fa0b681b00826ed Mon Sep 17 00:00:00 2001
From: Latif Khalifa
Date: Wed, 6 Nov 2013 03:48:48 +0100
Subject: Added sending (for now hard-coded) sim isze in SendMapBlockSplit()

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 1a2d4de..20bc59c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1463,6 +1463,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             mapReply.AgentData.AgentID = AgentId;
             mapReply.Data = new MapBlockReplyPacket.DataBlock[mapBlocks2.Length];
+            mapReply.Size = new MapBlockReplyPacket.SizeBlock[mapBlocks2.Length];
             mapReply.AgentData.Flags = flag;
 
             for (int i = 0; i < mapBlocks2.Length; i++)
@@ -1477,6 +1478,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 mapReply.Data[i].RegionFlags = mapBlocks2[i].RegionFlags;
                 mapReply.Data[i].Access = mapBlocks2[i].Access;
                 mapReply.Data[i].Agents = mapBlocks2[i].Agents;
+
+                // TODO: hookup varregion sim size here
+                mapReply.Size[i] = new MapBlockReplyPacket.SizeBlock();
+                mapReply.Size[i].SizeX = 256;
+                mapReply.Size[i].SizeY = 256;
             }
             OutPacket(mapReply, ThrottleOutPacketType.Land);
         }
-- 
cgit v1.1


From cd33972ed12b7e5cb3771591259d218f51160774 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Tue, 5 Nov 2013 22:04:39 -0800
Subject: trigger a build to see if tests will work

---
 CONTRIBUTORS.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index a4bcb91..9ae7a31 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -7,7 +7,7 @@ people that make the day to day of OpenSim happen.
 
 * justincc (OSVW Consulting, justincc.org)
 * chi11ken (Genkii)
-* dahlia
+* dahlia 
 * Melanie Thielker
 * Diva (Crista Lopes, University of California, Irvine)
 * Dan Lake (Intel)
-- 
cgit v1.1


From e1ce3907f2edfd10b9322db4b429922897ed9905 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Tue, 5 Nov 2013 23:01:14 -0800
Subject: Update libomv to 7e260ad419ebb1c24a5f1b123e11dd930e05f414. Thanks
 lkalif :)

---
 bin/OpenMetaverseTypes.XML | 2220 ++++++++++++++++++++++----------------------
 bin/OpenMetaverseTypes.dll |  Bin 110592 -> 110592 bytes
 2 files changed, 1110 insertions(+), 1110 deletions(-)

diff --git a/bin/OpenMetaverseTypes.XML b/bin/OpenMetaverseTypes.XML
index 4f5b6b4..5280485 100644
--- a/bin/OpenMetaverseTypes.XML
+++ b/bin/OpenMetaverseTypes.XML
@@ -4,1048 +4,988 @@
         <name>OpenMetaverseTypes</name>
     </assembly>
     <members>
-        <member name="F:OpenMetaverse.Utils.DEG_TO_RAD">
-            <summary>Used for converting degrees to radians</summary>
+        <member name="F:OpenMetaverse.ExpiringCache`2.syncRoot">
+            <summary>For thread safety</summary>
         </member>
-        <member name="F:OpenMetaverse.Utils.RAD_TO_DEG">
-            <summary>Used for converting radians to degrees</summary>
+        <member name="F:OpenMetaverse.ExpiringCache`2.isPurging">
+            <summary>For thread safety</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToInt16(System.Byte[])">
+        <member name="M:OpenMetaverse.ExpiringCache`2.PurgeCache(System.Object,System.Timers.ElapsedEventArgs)">
             <summary>
-            Convert the first two bytes starting in the byte array in
-            little endian ordering to a signed short integer
+            Purges expired objects from the cache. Called automatically by the purge timer.
             </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.Utils.BytesToInt16(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.ReaderWriterLockSlim.ExitAndWakeUpAppropriateWaiters">
             <summary>
-            Convert the first two bytes starting at the given position in
-            little endian ordering to a signed short integer
+            Determines the appropriate events to set, leaves the locks, and sets the events. 
             </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>
-        <member name="M:OpenMetaverse.Utils.BytesToInt(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.ReaderWriterLockSlim.LazyCreateEvent(System.Threading.EventWaitHandle@,System.Boolean)">
             <summary>
-            Convert the first four bytes starting at the given position in
-            little endian ordering to a signed integer
+            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="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.Utils.BytesToInt(System.Byte[])">
+        <member name="M:OpenMetaverse.ReaderWriterLockSlim.WaitOnEvent(System.Threading.EventWaitHandle,System.UInt32@,System.Int32)">
             <summary>
-            Convert the first four bytes of the given array in little endian
-            ordering to a signed integer
+            Waits on 'waitEvent' with a timeout of 'millisceondsTimeout.  
+            Before the wait 'numWaiters' is incremented and is restored before leaving this routine.
             </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="M:OpenMetaverse.Utils.BytesToInt64(System.Byte[])">
+        <member name="F:OpenMetaverse.Quaternion.X">
+            <summary>X value</summary>
+        </member>
+        <member name="F:OpenMetaverse.Quaternion.Y">
+            <summary>Y value</summary>
+        </member>
+        <member name="F:OpenMetaverse.Quaternion.Z">
+            <summary>Z value</summary>
+        </member>
+        <member name="F:OpenMetaverse.Quaternion.W">
+            <summary>W value</summary>
+        </member>
+        <member name="M:OpenMetaverse.Quaternion.#ctor(System.Single,System.Single,System.Single)">
             <summary>
-            Convert the first eight bytes of the given array in little endian
-            ordering to a signed long integer
+            Build a quaternion from normalized float values
             </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>
+            <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.Utils.BytesToInt64(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Quaternion.#ctor(System.Byte[],System.Int32,System.Boolean)">
             <summary>
-            Convert the first eight bytes starting at the given position in
-            little endian ordering to a signed long integer
+            Constructor, builds a quaternion object from a byte array
             </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>
+            <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.Utils.BytesToUInt16(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Quaternion.Normalize">
             <summary>
-            Convert the first two bytes starting at the given position in
-            little endian ordering to an unsigned short
+            Normalizes the quaternion
             </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.Utils.BytesToUInt16(System.Byte[])">
+        <member name="M:OpenMetaverse.Quaternion.FromBytes(System.Byte[],System.Int32,System.Boolean)">
             <summary>
-            Convert two bytes in little endian ordering to an unsigned short
+            Builds a quaternion object from a byte array
             </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>
+            <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.Utils.BytesToUInt(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Quaternion.GetBytes">
             <summary>
-            Convert the first four bytes starting at the given position in
-            little endian ordering to an unsigned integer
+            Normalize this quaternion and serialize it to a byte array
             </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>
+            <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.Utils.BytesToUInt(System.Byte[])">
+        <member name="M:OpenMetaverse.Quaternion.ToBytes(System.Byte[],System.Int32)">
             <summary>
-            Convert the first four bytes of the given array in little endian
-            ordering to an unsigned integer
+            Writes the raw bytes for this quaternion to a byte array
             </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>
+            <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.Utils.BytesToUInt64(System.Byte[])">
+        <member name="M:OpenMetaverse.Quaternion.GetEulerAngles(System.Single@,System.Single@,System.Single@)">
             <summary>
-            Convert the first eight bytes of the given array in little endian
-            ordering to an unsigned 64-bit integer
+            Convert this quaternion to euler angles
             </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>
+            <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.Utils.BytesToFloat(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Quaternion.GetAxisAngle(OpenMetaverse.Vector3@,System.Single@)">
             <summary>
-            Convert four bytes in little endian ordering to a floating point
-            value
+            Convert this quaternion to an angle around an axis
             </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>
+            <param name="axis">Unit vector describing the axis</param>
+            <param name="angle">Angle around the axis, in radians</param>
         </member>
-        <member name="M:OpenMetaverse.Utils.IntToBytes(System.Int32)">
+        <member name="M:OpenMetaverse.Quaternion.Conjugate(OpenMetaverse.Quaternion)">
             <summary>
-            Convert an integer to a byte array in little endian format
+            Returns the conjugate (spatial inverse) of a quaternion
             </summary>
-            <param name="value">The integer to convert</param>
-            <returns>A four byte little endian array</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.IntToBytesBig(System.Int32)">
+        <member name="M:OpenMetaverse.Quaternion.CreateFromAxisAngle(System.Single,System.Single,System.Single,System.Single)">
             <summary>
-            Convert an integer to a byte array in big endian format
+            Build a quaternion from an axis and an angle of rotation around
+            that axis
             </summary>
-            <param name="value">The integer to convert</param>
-            <returns>A four byte big endian array</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.Int64ToBytes(System.Int64)">
+        <member name="M:OpenMetaverse.Quaternion.CreateFromAxisAngle(OpenMetaverse.Vector3,System.Single)">
             <summary>
-            Convert a 64-bit integer to a byte array in little endian format
+            Build a quaternion from an axis and an angle of rotation around
+            that axis
             </summary>
-            <param name="value">The value to convert</param>
-            <returns>An 8 byte little endian array</returns>
+            <param name="axis">Axis of rotation</param>
+            <param name="angle">Angle of rotation</param>
         </member>
-        <member name="M:OpenMetaverse.Utils.UInt64ToBytes(System.UInt64)">
+        <member name="M:OpenMetaverse.Quaternion.CreateFromEulers(OpenMetaverse.Vector3)">
             <summary>
-            Convert a 64-bit unsigned integer to a byte array in little endian
-            format
+            Creates a quaternion from a vector containing roll, pitch, and yaw
+            in radians
             </summary>
-            <param name="value">The value to convert</param>
-            <returns>An 8 byte little endian array</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.Utils.FloatToBytes(System.Single)">
+        <member name="M:OpenMetaverse.Quaternion.CreateFromEulers(System.Single,System.Single,System.Single)">
             <summary>
-            Convert a floating point value to four bytes in little endian
-            ordering
+            Creates a quaternion from roll, pitch, and yaw euler angles in
+            radians
             </summary>
-            <param name="value">A floating point value</param>
-            <returns>A four byte array containing the value in little endian
-            ordering</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.Utils.UIntToHexString(System.UInt32)">
+        <member name="M:OpenMetaverse.Quaternion.Inverse(OpenMetaverse.Quaternion)">
             <summary>
-            Converts an unsigned integer to a hexadecimal string
+            Conjugates and renormalizes a vector
             </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>
-        <member name="M:OpenMetaverse.Utils.BytesToString(System.Byte[])">
+        <member name="M:OpenMetaverse.Quaternion.Slerp(OpenMetaverse.Quaternion,OpenMetaverse.Quaternion,System.Single)">
             <summary>
-            Convert a variable length UTF8 byte array to a string
+            Spherical linear interpolation between two quaternions
             </summary>
-            <param name="bytes">The UTF8 encoded byte array to convert</param>
-            <returns>The decoded string</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToHexString(System.Byte[],System.String)">
+        <member name="M:OpenMetaverse.Quaternion.ToRawString">
             <summary>
-            Converts a byte array to a string containing hexadecimal characters
+            Get a string representation of the quaternion elements with up to three
+            decimal digits and separated by spaces only
             </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>
+            <returns>Raw string representation of the quaternion</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToHexString(System.Byte[],System.Int32,System.String)">
+        <member name="F:OpenMetaverse.Quaternion.Identity">
+            <summary>A quaternion with a value of 0,0,0,1</summary>
+        </member>
+        <member name="T:OpenMetaverse.Vector3d">
             <summary>
-            Converts a byte array to a string containing hexadecimal characters
+            A three-dimensional vector with doubleing-point values
             </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="M:OpenMetaverse.Utils.StringToBytes(System.String)">
+        <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>
-            Convert a string to a UTF8 encoded byte array
+            Constructor, builds a vector from a byte array
             </summary>
-            <param name="str">The string to convert</param>
-            <returns>A null-terminated UTF8 byte array</returns>
+            <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.Utils.HexStringToBytes(System.String,System.Boolean)">
+        <member name="M:OpenMetaverse.Vector3d.ApproxEquals(OpenMetaverse.Vector3d,System.Double)">
             <summary>
-            Converts a string containing hexadecimal characters to a byte array
+            Test if this vector is equal to another vector, within a given
+            tolerance range
             </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>
+            <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.Utils.IsHexDigit(System.Char)">
+        <member name="M:OpenMetaverse.Vector3d.CompareTo(OpenMetaverse.Vector3d)">
             <summary>
-            Returns true is c is a hexadecimal digit (A-F, a-f, 0-9)
+            IComparable.CompareTo implementation
             </summary>
-            <param name="c">Character to test</param>
-            <returns>true if hex digit, false if not</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.HexToByte(System.String)">
+        <member name="M:OpenMetaverse.Vector3d.IsFinite">
             <summary>
-            Converts 1 or 2 character string into equivalant byte value
+            Test if this vector is composed of all finite numbers
             </summary>
-            <param name="hex">1 or 2 character string</param>
-            <returns>byte</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.FloatToByte(System.Single,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.Vector3d.FromBytes(System.Byte[],System.Int32)">
             <summary>
-            Convert a float value to a byte given a minimum and maximum range
+            Builds a vector from a byte array
             </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>
+            <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.Utils.ByteToFloat(System.Byte[],System.Int32,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.Vector3d.GetBytes">
             <summary>
-            Convert a byte to a float value given a minimum and maximum range
+            Returns the raw bytes for this vector
             </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>
+            <returns>A 24 byte array containing X, Y, and Z</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.ByteToFloat(System.Byte,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.Vector3d.ToBytes(System.Byte[],System.Int32)">
             <summary>
-            Convert a byte to a float value given a minimum and maximum range
+            Writes the raw bytes for this vector to a byte array
             </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>
+            <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.Utils.TryParseSingle(System.String,System.Single@)">
+        <member name="M:OpenMetaverse.Vector3d.Parse(System.String)">
             <summary>
-            Attempts to parse a floating point value from a string, using an
-            EN-US number format
+            Parse a vector from a string
             </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>
+            <param name="val">A string representation of a 3D vector, enclosed 
+            in arrow brackets and separated by commas</param>
         </member>
-        <member name="M:OpenMetaverse.Utils.TryParseDouble(System.String,System.Double@)">
+        <member name="M:OpenMetaverse.Vector3d.SmoothStep(OpenMetaverse.Vector3d,OpenMetaverse.Vector3d,System.Double)">
             <summary>
-            Attempts to parse a floating point value from a string, using an
-            EN-US number format
+            Interpolates between two vectors using a cubic equation
             </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.TryParseHex(System.String,System.UInt32@)">
+        <member name="M:OpenMetaverse.Vector3d.ToString">
             <summary>
-            Tries to parse an unsigned 32-bit integer from a hexadecimal string
+            Get a formatted string representation of the vector
             </summary>
-            <param name="s">String to parse</param>
-            <param name="result">Resulting integer</param>
-            <returns>True if the parse was successful, otherwise false</returns>
+            <returns>A string representation of the vector</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.EnumToText(System.Enum)">
+        <member name="M:OpenMetaverse.Vector3d.ToRawString">
             <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
+            Get a string representation of the vector elements with up to three
+            decimal digits and separated by spaces only
             </summary>
-            <param name="value">Enum value</param>
-            <returns>Text representation of the enum</returns>
+            <returns>Raw string representation of the vector</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.AssetTypeToString(OpenMetaverse.AssetType)">
+        <member name="M:OpenMetaverse.Vector3d.op_Modulus(OpenMetaverse.Vector3d,OpenMetaverse.Vector3d)">
             <summary>
-            Takes an AssetType and returns the string representation
+            Cross product between two vectors
             </summary>
-            <param name="type">The source <seealso cref="T:OpenMetaverse.AssetType"/></param>
-            <returns>The string version of the AssetType</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.StringToAssetType(System.String)">
+        <member name="M:OpenMetaverse.Vector3d.op_Implicit(OpenMetaverse.Vector3)~OpenMetaverse.Vector3d">
             <summary>
-            Translate a string name of an AssetType into the proper Type
+            Implicit casting for Vector3 > Vector3d
             </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>
+            <param name="value"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.InventoryTypeToString(OpenMetaverse.InventoryType)">
+        <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.LocklessQueue`1">
             <summary>
-            Convert an InventoryType to a string
+            A thread-safe lockless queue that supports multiple readers and 
+            multiple writers
             </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.Utils.StringToInventoryType(System.String)">
+        <member name="F:OpenMetaverse.LocklessQueue`1.head">
+            <summary>Queue head</summary>
+        </member>
+        <member name="F:OpenMetaverse.LocklessQueue`1.tail">
+            <summary>Queue tail</summary>
+        </member>
+        <member name="F:OpenMetaverse.LocklessQueue`1.count">
+            <summary>Queue item count</summary>
+        </member>
+        <member name="M:OpenMetaverse.LocklessQueue`1.#ctor">
             <summary>
-            Convert a string into a valid InventoryType
+            Constructor
             </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="M:OpenMetaverse.Utils.SaleTypeToString(OpenMetaverse.SaleType)">
+        <member name="M:OpenMetaverse.LocklessQueue`1.Enqueue(`0)">
             <summary>
-            Convert a SaleType to a string
+            Enqueue an item
             </summary>
-            <param name="type">The <seealso cref="T:SaleType"/> to convert</param>
-            <returns>A string representation of the source</returns>
+            <param name="item">Item to enqeue</param>
         </member>
-        <member name="M:OpenMetaverse.Utils.StringToSaleType(System.String)">
+        <member name="M:OpenMetaverse.LocklessQueue`1.TryDequeue(`0@)">
             <summary>
-            Convert a string into a valid SaleType
+            Try to dequeue an item
             </summary>
-            <param name="value">A string representation of the SaleType to convert</param>
-            <returns>A SaleType object which matched the type</returns>
+            <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.Utils.StringToAttachmentPoint(System.String)">
+        <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="T:OpenMetaverse.LocklessQueue`1.SingleLinkNode">
             <summary>
-            Converts a string used in LLSD to AttachmentPoint type
+            Provides a node container for data in a singly linked list
             </summary>
-            <param name="value">String representation of AttachmentPoint to convert</param>
-            <returns>AttachmentPoint enum</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.CopyBytes(System.Byte[])">
+        <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="M:OpenMetaverse.LocklessQueue`1.SingleLinkNode.#ctor">
             <summary>
-            Copy a byte array
+            Constructor
             </summary>
-            <param name="bytes">Byte array to copy</param>
-            <returns>A copy of the given byte array</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.UIntsToLong(System.UInt32,System.UInt32)">
+        <member name="M:OpenMetaverse.LocklessQueue`1.SingleLinkNode.#ctor(`0)">
             <summary>
-            Packs to 32-bit unsigned integers in to a 64-bit unsigned integer
+            Constructor
             </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="M:OpenMetaverse.Utils.LongToUInts(System.UInt64,System.UInt32@,System.UInt32@)">
+        <member name="M:OpenMetaverse.Matrix4.GetEulerAngles(System.Single@,System.Single@,System.Single@)">
             <summary>
-            Unpacks two 32-bit unsigned integers from a 64-bit unsigned integer
+            Convert this matrix to euler rotations
             </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>
+            <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.Utils.IPToUInt(System.Net.IPAddress)">
+        <member name="M:OpenMetaverse.Matrix4.GetQuaternion">
             <summary>
-            Convert an IP address object to an unsigned 32-bit integer
+            Convert this matrix to a quaternion rotation
             </summary>
-            <param name="address">IP address to convert</param>
-            <returns>32-bit unsigned integer holding the IP address bits</returns>
+            <returns>A quaternion representation of this rotation matrix</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.GetUnixTime">
+        <member name="M:OpenMetaverse.Matrix4.CreateFromEulers(System.Single,System.Single,System.Single)">
             <summary>
-            Gets a unix timestamp for the current time
+            Construct a matrix from euler rotation values in radians
             </summary>
-            <returns>An unsigned integer representing a unix timestamp for now</returns>
+            <param name="roll">X euler angle in radians</param>
+            <param name="pitch">Y euler angle in radians</param>
+            <param name="yaw">Z euler angle in radians</param>
         </member>
-        <member name="M:OpenMetaverse.Utils.UnixTimeToDateTime(System.UInt32)">
+        <member name="M:OpenMetaverse.Matrix4.ToString">
             <summary>
-            Convert a UNIX timestamp to a native DateTime object
+            Get a formatted string representation of the vector
             </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>
+            <returns>A string representation of the vector</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.UnixTimeToDateTime(System.Int32)">
+        <member name="F:OpenMetaverse.Matrix4.Zero">
+            <summary>A 4x4 matrix containing all zeroes</summary>
+        </member>
+        <member name="F:OpenMetaverse.Matrix4.Identity">
+            <summary>A 4x4 identity matrix</summary>
+        </member>
+        <member name="F:OpenMetaverse.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>
-            Convert a UNIX timestamp to a native DateTime object
+            Convert the first two bytes starting in the byte array in
+            little endian ordering to a signed short integer
             </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>
+            <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.Utils.DateTimeToUnixTime(System.DateTime)">
+        <member name="M:OpenMetaverse.Utils.BytesToInt16(System.Byte[],System.Int32)">
             <summary>
-            Convert a native DateTime object to a UNIX timestamp
+            Convert the first two bytes starting at the given position in
+            little endian ordering to a signed short integer
             </summary>
-            <param name="time">A DateTime object you want to convert to a 
-            timestamp</param>
-            <returns>An unsigned integer representing a UNIX timestamp</returns>
+            <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.Utils.Swap``1(``0@,``0@)">
+        <member name="M:OpenMetaverse.Utils.BytesToInt(System.Byte[],System.Int32)">
             <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>
+            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>
-        <member name="M:OpenMetaverse.Utils.EnumTryParse``1(System.String,``0@)">
+        <member name="M:OpenMetaverse.Utils.BytesToInt(System.Byte[])">
             <summary>
-            Try to parse an enumeration value from a string
+            Convert the first four bytes of the given array in little endian
+            ordering to a signed integer
             </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>
+            <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="M:OpenMetaverse.Utils.SwapWords(System.Byte)">
+        <member name="M:OpenMetaverse.Utils.BytesToInt64(System.Byte[])">
             <summary>
-            Swaps the high and low words in a byte. Converts aaaabbbb to bbbbaaaa
+            Convert the first eight bytes of the given array in little endian
+            ordering to a signed long integer
             </summary>
-            <param name="value">Byte to swap the words in</param>
-            <returns>Byte value with the words swapped</returns>
+            <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.Utils.HostnameToIPv4(System.String)">
+        <member name="M:OpenMetaverse.Utils.BytesToInt64(System.Byte[],System.Int32)">
             <summary>
-            Attempts to convert a string representation of a hostname or IP
-            address to a <seealso cref="T:System.Net.IPAddress"/>
+            Convert the first eight bytes starting at the given position in
+            little endian ordering to a signed long integer
             </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.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.Utils.Epoch">
-            <summary>UNIX epoch in DateTime format</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>
-        <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.Utils.RNG">
-            <summary>Provide a single instance of a random number generator
-            to avoid making duplicate copies and handle thread safety</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.Utils.Clamp(System.Single,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.Utils.BytesToUInt16(System.Byte[],System.Int32)">
             <summary>
-            Clamp a given value between a range
+            Convert the first two bytes starting at the given position in
+            little endian ordering to an unsigned short
             </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>
+            <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.Utils.Clamp(System.Double,System.Double,System.Double)">
+        <member name="M:OpenMetaverse.Utils.BytesToUInt16(System.Byte[])">
             <summary>
-            Clamp a given value between a range
+            Convert two bytes in little endian ordering to an unsigned short
             </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>
+            <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.Utils.Clamp(System.Int32,System.Int32,System.Int32)">
+        <member name="M:OpenMetaverse.Utils.BytesToUInt(System.Byte[],System.Int32)">
             <summary>
-            Clamp a given value between a range
+            Convert the first four bytes starting at the given position in
+            little endian ordering to an unsigned integer
             </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>
+            <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.Utils.Round(System.Single)">
+        <member name="M:OpenMetaverse.Utils.BytesToUInt(System.Byte[])">
             <summary>
-            Round a floating-point value to the nearest integer
+            Convert the first four bytes of the given array in little endian
+            ordering to an unsigned integer
             </summary>
-            <param name="val">Floating point number to round</param>
-            <returns>Integer</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.Utils.IsFinite(System.Single)">
+        <member name="M:OpenMetaverse.Utils.BytesToUInt64(System.Byte[])">
             <summary>
-            Test if a single precision float is a finite number
+            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>
-        <member name="M:OpenMetaverse.Utils.IsFinite(System.Double)">
+        <member name="M:OpenMetaverse.Utils.BytesToFloat(System.Byte[],System.Int32)">
             <summary>
-            Test if a double precision float is a finite number
+            Convert four bytes in little endian ordering to a floating point
+            value
             </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.Distance(System.Single,System.Single)">
+        <member name="M:OpenMetaverse.Utils.IntToBytes(System.Int32)">
             <summary>
-            Get the distance between two floating-point values
+            Convert an integer to a byte array in little endian format
             </summary>
-            <param name="value1">First value</param>
-            <param name="value2">Second value</param>
-            <returns>The distance between the two values</returns>
+            <param name="value">The integer to convert</param>
+            <returns>A four byte little endian array</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.MD5(System.Byte[])">
+        <member name="M:OpenMetaverse.Utils.IntToBytesBig(System.Int32)">
             <summary>
-            Compute the MD5 hash for a byte array
+            Convert an integer to a byte array in big endian format
             </summary>
-            <param name="data">Byte array to compute the hash for</param>
-            <returns>MD5 hash of the input data</returns>
+            <param name="value">The integer to convert</param>
+            <returns>A four byte big endian array</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.SHA1(System.Byte[])">
+        <member name="M:OpenMetaverse.Utils.Int64ToBytes(System.Int64)">
             <summary>
-            Compute the SHA1 hash for a byte array
+            Convert a 64-bit integer to a byte array in little endian format
             </summary>
-            <param name="data">Byte array to compute the hash for</param>
-            <returns>SHA1 hash of the input data</returns>
+            <param name="value">The value to convert</param>
+            <returns>An 8 byte little endian array</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.SHA1String(System.String)">
+        <member name="M:OpenMetaverse.Utils.UInt64ToBytes(System.UInt64)">
             <summary>
-            Calculate the SHA1 hash of a given string
+            Convert a 64-bit unsigned integer to a byte array in little endian
+            format
             </summary>
-            <param name="value">The string to hash</param>
-            <returns>The SHA1 hash as a string</returns>
+            <param name="value">The value to convert</param>
+            <returns>An 8 byte little endian array</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.SHA256(System.Byte[])">
+        <member name="M:OpenMetaverse.Utils.FloatToBytes(System.Single)">
             <summary>
-            Compute the SHA256 hash for a byte array
+            Convert a floating point value to four bytes in little endian
+            ordering
             </summary>
-            <param name="data">Byte array to compute the hash for</param>
-            <returns>SHA256 hash of the input data</returns>
+            <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.Utils.SHA256String(System.String)">
+        <member name="M:OpenMetaverse.Utils.UIntToHexString(System.UInt32)">
             <summary>
-            Calculate the SHA256 hash of a given string
+            Converts an unsigned integer to a hexadecimal string
             </summary>
-            <param name="value">The string to hash</param>
-            <returns>The SHA256 hash as a string</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.Utils.MD5(System.String)">
+        <member name="M:OpenMetaverse.Utils.BytesToString(System.Byte[])">
             <summary>
-            Calculate the MD5 hash of a given string
+            Convert a variable length UTF8 byte array to a string
             </summary>
-            <param name="password">The password to hash</param>
-            <returns>An MD5 hash in string format, with $1$ prepended</returns>
+            <param name="bytes">The UTF8 encoded byte array to convert</param>
+            <returns>The decoded string</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.MD5String(System.String)">
+        <member name="M:OpenMetaverse.Utils.BytesToHexString(System.Byte[],System.String)">
             <summary>
-            Calculate the MD5 hash of a given string
+            Converts a byte array to a string containing hexadecimal characters
             </summary>
-            <param name="value">The string to hash</param>
-            <returns>The MD5 hash as a string</returns>
+            <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="M:OpenMetaverse.Utils.RandomDouble">
+        <member name="M:OpenMetaverse.Utils.BytesToHexString(System.Byte[],System.Int32,System.String)">
             <summary>
-            Generate a random double precision floating point value
+            Converts a byte array to a string containing hexadecimal characters
             </summary>
-            <returns>Random value of type double</returns>
+            <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="M:OpenMetaverse.Utils.GetRunningPlatform">
+        <member name="M:OpenMetaverse.Utils.StringToBytes(System.String)">
             <summary>
-            Get the current running platform
+            Convert a string to a UTF8 encoded byte array
             </summary>
-            <returns>Enumeration of the current platform we are running on</returns>
+            <param name="str">The string to convert</param>
+            <returns>A null-terminated UTF8 byte array</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.GetRunningRuntime">
+        <member name="M:OpenMetaverse.Utils.HexStringToBytes(System.String,System.Boolean)">
             <summary>
-            Get the current running runtime
+            Converts a string containing hexadecimal characters to a byte array
             </summary>
-            <returns>Enumeration of the current runtime we are running on</returns>
+            <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="T:OpenMetaverse.Utils.Platform">
+        <member name="M:OpenMetaverse.Utils.IsHexDigit(System.Char)">
             <summary>
-            Operating system
+            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.Utils.Platform.Unknown">
-            <summary>Unknown</summary>
-        </member>
-        <member name="F:OpenMetaverse.Utils.Platform.Windows">
-            <summary>Microsoft Windows</summary>
-        </member>
-        <member name="F:OpenMetaverse.Utils.Platform.WindowsCE">
-            <summary>Microsoft Windows CE</summary>
-        </member>
-        <member name="F:OpenMetaverse.Utils.Platform.Linux">
-            <summary>Linux</summary>
-        </member>
-        <member name="F:OpenMetaverse.Utils.Platform.OSX">
-            <summary>Apple OSX</summary>
-        </member>
-        <member name="T:OpenMetaverse.Utils.Runtime">
+        <member name="M:OpenMetaverse.Utils.HexToByte(System.String)">
             <summary>
-            Runtime platform
+            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="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@)">
+        <member name="M:OpenMetaverse.Utils.FloatToByte(System.Single,System.Single,System.Single)">
             <summary>
-            Convert this matrix to euler rotations
+            Convert a float value to a byte given a minimum and maximum 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="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.Matrix4.GetQuaternion">
+        <member name="M:OpenMetaverse.Utils.ByteToFloat(System.Byte[],System.Int32,System.Single,System.Single)">
             <summary>
-            Convert this matrix to a quaternion rotation
+            Convert a byte to a float value given a minimum and maximum range
             </summary>
-            <returns>A quaternion representation of this rotation matrix</returns>
+            <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.Matrix4.CreateFromEulers(System.Single,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.Utils.ByteToFloat(System.Byte,System.Single,System.Single)">
             <summary>
-            Construct a matrix from euler rotation values in radians
+            Convert a byte to a float value given a minimum and maximum range
             </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>
+            <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.Matrix4.ToString">
+        <member name="M:OpenMetaverse.Utils.TryParseSingle(System.String,System.Single@)">
             <summary>
-            Get a formatted string representation of the vector
+            Attempts to parse a floating point value from a string, using an
+            EN-US number format
             </summary>
-            <returns>A string representation of the vector</returns>
-        </member>
-        <member name="F:OpenMetaverse.Matrix4.Zero">
-            <summary>A 4x4 matrix containing all zeroes</summary>
-        </member>
-        <member name="F:OpenMetaverse.Matrix4.Identity">
-            <summary>A 4x4 identity matrix</summary>
+            <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="T:OpenMetaverse.BlockingQueue`1">
+        <member name="M:OpenMetaverse.Utils.TryParseDouble(System.String,System.Double@)">
             <summary>
-            Same as Queue except Dequeue function blocks until there is an object to return.
-            Note: This class does not need to be synchronized
+            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>
-        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor(System.Collections.Generic.IEnumerable{`0})">
+        <member name="M:OpenMetaverse.Utils.TryParseHex(System.String,System.UInt32@)">
             <summary>
-            Create new BlockingQueue.
+            Tries to parse an unsigned 32-bit integer from a hexadecimal string
             </summary>
-            <param name="col">The System.Collections.ICollection to copy elements from</param>
+            <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.BlockingQueue`1.#ctor(System.Int32)">
+        <member name="M:OpenMetaverse.Utils.EnumToText(System.Enum)">
             <summary>
-            Create new BlockingQueue.
+            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="capacity">The initial number of elements that the queue can contain</param>
+            <param name="value">Enum value</param>
+            <returns>Text representation of the enum</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor">
+        <member name="M:OpenMetaverse.Utils.AssetTypeToString(OpenMetaverse.AssetType)">
             <summary>
-            Create new BlockingQueue.
+            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>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Finalize">
+        <member name="M:OpenMetaverse.Utils.StringToAssetType(System.String)">
             <summary>
-            BlockingQueue Destructor (Close queue, resume any waiting thread).
+            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.BlockingQueue`1.Clear">
+        <member name="M:OpenMetaverse.Utils.InventoryTypeToString(OpenMetaverse.InventoryType)">
             <summary>
-            Remove all objects from the Queue.
+            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.BlockingQueue`1.Close">
+        <member name="M:OpenMetaverse.Utils.StringToInventoryType(System.String)">
             <summary>
-            Remove all objects from the Queue, resume all dequeue threads.
+            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="M:OpenMetaverse.BlockingQueue`1.Dequeue">
+        <member name="M:OpenMetaverse.Utils.SaleTypeToString(OpenMetaverse.SaleType)">
             <summary>
-            Removes and returns the object at the beginning of the Queue.
+            Convert a SaleType to a string
             </summary>
-            <returns>Object in queue.</returns>
+            <param name="type">The <seealso cref="T:SaleType"/> to convert</param>
+            <returns>A string representation of the source</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue(System.TimeSpan)">
+        <member name="M:OpenMetaverse.Utils.StringToSaleType(System.String)">
             <summary>
-            Removes and returns the object at the beginning of the Queue.
+            Convert a string into a valid SaleType
             </summary>
-            <param name="timeout">time to wait before returning</param>
-            <returns>Object in queue.</returns>
+            <param name="value">A string representation of the SaleType to convert</param>
+            <returns>A SaleType object which matched the type</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue(System.Int32)">
+        <member name="M:OpenMetaverse.Utils.StringToAttachmentPoint(System.String)">
             <summary>
-            Removes and returns the object at the beginning of the Queue.
+            Converts a string used in LLSD to AttachmentPoint type
             </summary>
-            <param name="timeout">time to wait before returning (in milliseconds)</param>
-            <returns>Object in queue.</returns>
+            <param name="value">String representation of AttachmentPoint to convert</param>
+            <returns>AttachmentPoint enum</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Enqueue(`0)">
+        <member name="M:OpenMetaverse.Utils.CopyBytes(System.Byte[])">
             <summary>
-            Adds an object to the end of the Queue
+            Copy a byte array
             </summary>
-            <param name="obj">Object to put in queue</param>
+            <param name="bytes">Byte array to copy</param>
+            <returns>A copy of the given byte array</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Open">
+        <member name="M:OpenMetaverse.Utils.UIntsToLong(System.UInt32,System.UInt32)">
             <summary>
-            Open Queue.
+            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="P:OpenMetaverse.BlockingQueue`1.Closed">
+        <member name="M:OpenMetaverse.Utils.LongToUInts(System.UInt64,System.UInt32@,System.UInt32@)">
             <summary>
-            Gets flag indicating if queue has been closed.
+            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.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="M:OpenMetaverse.Vector4.#ctor(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Utils.IPToUInt(System.Net.IPAddress)">
             <summary>
-            Constructor, builds a vector from a byte array
+            Convert an IP address object to an unsigned 32-bit integer
             </summary>
-            <param name="byteArray">Byte array containing four four-byte floats</param>
-            <param name="pos">Beginning position in the byte array</param>
+            <param name="address">IP address to convert</param>
+            <returns>32-bit unsigned integer holding the IP address bits</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector4.ApproxEquals(OpenMetaverse.Vector4,System.Single)">
+        <member name="M:OpenMetaverse.Utils.GetUnixTime">
             <summary>
-            Test if this vector is equal to another vector, within a given
-            tolerance range
+            Gets a unix timestamp for the current time
             </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>
+            <returns>An unsigned integer representing a unix timestamp for now</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector4.CompareTo(OpenMetaverse.Vector4)">
+        <member name="M:OpenMetaverse.Utils.UnixTimeToDateTime(System.UInt32)">
             <summary>
-            IComparable.CompareTo implementation
+            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="M:OpenMetaverse.Vector4.IsFinite">
+        <member name="M:OpenMetaverse.Utils.UnixTimeToDateTime(System.Int32)">
             <summary>
-            Test if this vector is composed of all finite numbers
+            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="M:OpenMetaverse.Vector4.FromBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Utils.DateTimeToUnixTime(System.DateTime)">
             <summary>
-            Builds a vector from a byte array
+            Convert a native DateTime object to a UNIX timestamp
             </summary>
-            <param name="byteArray">Byte array containing a 16 byte vector</param>
-            <param name="pos">Beginning position in the byte array</param>
+            <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="M:OpenMetaverse.Vector4.GetBytes">
+        <member name="M:OpenMetaverse.Utils.Swap``1(``0@,``0@)">
             <summary>
-            Returns the raw bytes for this vector
+            Swap two values
             </summary>
-            <returns>A 16 byte array containing X, Y, Z, and W</returns>
+            <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="M:OpenMetaverse.Vector4.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Utils.EnumTryParse``1(System.String,``0@)">
             <summary>
-            Writes the raw bytes for this vector to a byte array
+            Try to parse an enumeration value from a string
             </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>
+            <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="M:OpenMetaverse.Vector4.ToRawString">
+        <member name="M:OpenMetaverse.Utils.SwapWords(System.Byte)">
             <summary>
-            Get a string representation of the vector elements with up to three
-            decimal digits and separated by spaces only
+            Swaps the high and low words in a byte. Converts aaaabbbb to bbbbaaaa
             </summary>
-            <returns>Raw string representation of the vector</returns>
+            <param name="value">Byte to swap the words in</param>
+            <returns>Byte value with the words swapped</returns>
         </member>
-        <member name="F:OpenMetaverse.Vector4.Zero">
-            <summary>A vector with a value of 0,0,0,0</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.Vector4.One">
-            <summary>A vector with a value of 1,1,1,1</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.Vector4.UnitX">
-            <summary>A vector with a value of 1,0,0,0</summary>
+        <member name="F:OpenMetaverse.Utils.Epoch">
+            <summary>UNIX epoch in DateTime format</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector4.UnitY">
-            <summary>A vector with a value of 0,1,0,0</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.Vector4.UnitZ">
-            <summary>A vector with a value of 0,0,1,0</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.Vector4.UnitW">
-            <summary>A vector with a value of 0,0,0,1</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="T:OpenMetaverse.Vector3d">
+        <member name="M:OpenMetaverse.Utils.Clamp(System.Single,System.Single,System.Single)">
             <summary>
-            A three-dimensional vector with doubleing-point values
+            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.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)">
+        <member name="M:OpenMetaverse.Utils.Clamp(System.Double,System.Double,System.Double)">
             <summary>
-            Constructor, builds a vector from a byte array
+            Clamp a given value between a range
             </summary>
-            <param name="byteArray">Byte array containing three eight-byte doubles</param>
-            <param name="pos">Beginning position in the byte array</param>
+            <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="M:OpenMetaverse.Vector3d.ApproxEquals(OpenMetaverse.Vector3d,System.Double)">
+        <member name="M:OpenMetaverse.Utils.Clamp(System.Int32,System.Int32,System.Int32)">
             <summary>
-            Test if this vector is equal to another vector, within a given
-            tolerance range
+            Clamp a given value between a 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>
+            <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="M:OpenMetaverse.Vector3d.CompareTo(OpenMetaverse.Vector3d)">
+        <member name="M:OpenMetaverse.Utils.Round(System.Single)">
             <summary>
-            IComparable.CompareTo implementation
+            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="M:OpenMetaverse.Vector3d.IsFinite">
+        <member name="M:OpenMetaverse.Utils.IsFinite(System.Single)">
             <summary>
-            Test if this vector is composed of all finite numbers
+            Test if a single precision float is a finite number
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.FromBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Utils.IsFinite(System.Double)">
             <summary>
-            Builds a vector from a byte array
+            Test if a double precision float is a finite number
             </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">
+        <member name="M:OpenMetaverse.Utils.Distance(System.Single,System.Single)">
             <summary>
-            Returns the raw bytes for this vector
+            Get the distance between two floating-point values
             </summary>
-            <returns>A 24 byte array containing X, Y, and Z</returns>
+            <param name="value1">First value</param>
+            <param name="value2">Second value</param>
+            <returns>The distance between the two values</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Utils.MD5(System.Byte[])">
             <summary>
-            Writes the raw bytes for this vector to a byte array
+            Compute the MD5 hash for 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>
+            <param name="data">Byte array to compute the hash for</param>
+            <returns>MD5 hash of the input data</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.Parse(System.String)">
+        <member name="M:OpenMetaverse.Utils.SHA1(System.Byte[])">
             <summary>
-            Parse a vector from a string
+            Compute the SHA1 hash for a byte array
             </summary>
-            <param name="val">A string representation of a 3D vector, enclosed 
-            in arrow brackets and separated by commas</param>
+            <param name="data">Byte array to compute the hash for</param>
+            <returns>SHA1 hash of the input data</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.SmoothStep(OpenMetaverse.Vector3d,OpenMetaverse.Vector3d,System.Double)">
+        <member name="M:OpenMetaverse.Utils.SHA1String(System.String)">
             <summary>
-            Interpolates between two vectors using a cubic equation
+            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="M:OpenMetaverse.Vector3d.ToString">
+        <member name="M:OpenMetaverse.Utils.SHA256(System.Byte[])">
             <summary>
-            Get a formatted string representation of the vector
+            Compute the SHA256 hash for a byte array
             </summary>
-            <returns>A string representation of the vector</returns>
+            <param name="data">Byte array to compute the hash for</param>
+            <returns>SHA256 hash of the input data</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.ToRawString">
+        <member name="M:OpenMetaverse.Utils.SHA256String(System.String)">
             <summary>
-            Get a string representation of the vector elements with up to three
-            decimal digits and separated by spaces only
+            Calculate the SHA256 hash of a given string
             </summary>
-            <returns>Raw string representation of the vector</returns>
+            <param name="value">The string to hash</param>
+            <returns>The SHA256 hash as a string</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.op_Modulus(OpenMetaverse.Vector3d,OpenMetaverse.Vector3d)">
+        <member name="M:OpenMetaverse.Utils.MD5(System.String)">
             <summary>
-            Cross product between two vectors
+            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="M:OpenMetaverse.Vector3d.op_Implicit(OpenMetaverse.Vector3)~OpenMetaverse.Vector3d">
+        <member name="M:OpenMetaverse.Utils.MD5String(System.String)">
             <summary>
-            Implicit casting for Vector3 > Vector3d
+            Calculate the MD5 hash of a given string
             </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>
+            <param name="value">The string to hash</param>
+            <returns>The MD5 hash as a string</returns>
         </member>
-        <member name="T:OpenMetaverse.Vector3">
+        <member name="M:OpenMetaverse.Utils.RandomDouble">
             <summary>
-            A three-dimensional vector with floating-point values
+            Generate a random double precision floating point value
             </summary>
+            <returns>Random value of type double</returns>
         </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)">
+        <member name="M:OpenMetaverse.Utils.GetRunningPlatform">
             <summary>
-            Constructor, builds a vector from a byte array
+            Get the current running platform
             </summary>
-            <param name="byteArray">Byte array containing three four-byte floats</param>
-            <param name="pos">Beginning position in the byte array</param>
+            <returns>Enumeration of the current platform we are running on</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3.ApproxEquals(OpenMetaverse.Vector3,System.Single)">
+        <member name="M:OpenMetaverse.Utils.GetRunningRuntime">
             <summary>
-            Test if this vector is equal to another vector, within a given
-            tolerance range
+            Get the current running runtime
             </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>
+            <returns>Enumeration of the current runtime we are running on</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3.CompareTo(OpenMetaverse.Vector3)">
+        <member name="T:OpenMetaverse.Utils.Platform">
             <summary>
-            IComparable.CompareTo implementation
+            Operating system
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3.IsFinite">
-            <summary>
-            Test if this vector is composed of all finite numbers
-            </summary>
+        <member name="F:OpenMetaverse.Utils.Platform.Unknown">
+            <summary>Unknown</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 name="F:OpenMetaverse.Utils.Platform.Windows">
+            <summary>Microsoft Windows</summary>
         </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 name="F:OpenMetaverse.Utils.Platform.WindowsCE">
+            <summary>Microsoft Windows CE</summary>
         </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 name="F:OpenMetaverse.Utils.Platform.Linux">
+            <summary>Linux</summary>
         </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 name="F:OpenMetaverse.Utils.Platform.OSX">
+            <summary>Apple OSX</summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3.RotationBetween(OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
+        <member name="T:OpenMetaverse.Utils.Runtime">
             <summary>
-            Calculate the rotation between two vectors
+            Runtime platform
             </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 name="F:OpenMetaverse.Utils.Runtime.Windows">
+            <summary>.NET runtime</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 name="F:OpenMetaverse.Utils.Runtime.Mono">
+            <summary>Mono runtime: http://www.mono-project.com/</summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3.ToRawString">
+        <member name="T:OpenMetaverse.PCode">
             <summary>
-            Get a string representation of the vector elements with up to three
-            decimal digits and separated by spaces only
+            Identifier code for primitive types
             </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 name="F:OpenMetaverse.PCode.None">
+            <summary>None</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>
-            Identifier code for primitive types
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.PCode.None">
-            <summary>None</summary>
-        </member>
-        <member name="F:OpenMetaverse.PCode.Prim">
-            <summary>A Primitive</summary>
+        <member name="F:OpenMetaverse.PCode.Prim">
+            <summary>A Primitive</summary>
         </member>
         <member name="F:OpenMetaverse.PCode.Avatar">
             <summary>A Avatar</summary>
@@ -1615,6 +1555,92 @@
         <member name="F:OpenMetaverse.PhysicsShapeType.ConvexHull">
             <summary>Use convex hull represantion of this prim</summary>
         </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="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="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="M:OpenMetaverse.Vector4.CompareTo(OpenMetaverse.Vector4)">
+            <summary>
+            IComparable.CompareTo implementation
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Vector4.IsFinite">
+            <summary>
+            Test if this vector is composed of all finite numbers
+            </summary>
+        </member>
+        <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="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="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="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.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>
+        </member>
         <member name="T:OpenMetaverse.Color4">
             <summary>
             An 8-bit color structure including an alpha channel
@@ -1748,18 +1774,34 @@
         <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="T:OpenMetaverse.Vector2">
+        <member name="M:OpenMetaverse.CircularQueue`1.#ctor(OpenMetaverse.CircularQueue{`0})">
             <summary>
-            A two-dimensional vector with floating-point values
+            Copy constructor
             </summary>
+            <param name="queue">Circular queue to copy</param>
         </member>
-        <member name="F:OpenMetaverse.Vector2.X">
+        <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.Vector2.Y">
+        <member name="F:OpenMetaverse.Vector3.Y">
             <summary>Y value</summary>
         </member>
-        <member name="M:OpenMetaverse.Vector2.ApproxEquals(OpenMetaverse.Vector2,System.Single)">
+        <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
@@ -1770,337 +1812,487 @@
             <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.Vector3.CompareTo(OpenMetaverse.Vector3)">
             <summary>
-            Test if this vector is composed of all finite numbers
+            IComparable.CompareTo implementation
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector2.CompareTo(OpenMetaverse.Vector2)">
+        <member name="M:OpenMetaverse.Vector3.IsFinite">
             <summary>
-            IComparable.CompareTo implementation
+            Test if this vector is composed of all finite numbers
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector2.FromBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Vector3.FromBytes(System.Byte[],System.Int32)">
             <summary>
             Builds a vector from a byte array
             </summary>
-            <param name="byteArray">Byte array containing two four-byte floats</param>
+            <param name="byteArray">Byte array containing a 12 byte vector</param>
             <param name="pos">Beginning position in the byte array</param>
         </member>
-        <member name="M:OpenMetaverse.Vector2.GetBytes">
+        <member name="M:OpenMetaverse.Vector3.GetBytes">
             <summary>
             Returns the raw bytes for this vector
             </summary>
-            <returns>An eight-byte array containing X and Y</returns>
+            <returns>A 12 byte array containing X, Y, and Z</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector2.ToBytes(System.Byte[],System.Int32)">
+        <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 8 bytes before the end of the array</param>
+            writing. Must be at least 12 bytes before the end of the array</param>
         </member>
-        <member name="M:OpenMetaverse.Vector2.Parse(System.String)">
+        <member name="M:OpenMetaverse.Vector3.Parse(System.String)">
             <summary>
             Parse a vector from a string
             </summary>
-            <param name="val">A string representation of a 2D vector, enclosed 
+            <param name="val">A string representation of a 3D vector, enclosed 
             in arrow brackets and separated by commas</param>
         </member>
-        <member name="M:OpenMetaverse.Vector2.SmoothStep(OpenMetaverse.Vector2,OpenMetaverse.Vector2,System.Single)">
+        <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.Vector2.ToString">
+        <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.Vector2.ToRawString">
+        <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="F:OpenMetaverse.Vector2.Zero">
-            <summary>A vector with a value of 0,0</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector2.One">
-            <summary>A vector with a value of 1,1</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector2.UnitX">
-            <summary>A vector with a value of 1,0</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector2.UnitY">
-            <summary>A vector with a value of 0,1</summary>
+        <member name="M:OpenMetaverse.Vector3.op_Modulus(OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
+            <summary>
+            Cross product between two vectors
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.TokenBucket">
+        <member name="M:OpenMetaverse.Vector3.op_Explicit(OpenMetaverse.Vector3d)~OpenMetaverse.Vector3">
             <summary>
-            A hierarchical token bucket for bandwidth throttling. See
-            http://en.wikipedia.org/wiki/Token_bucket for more information
+            Explicit casting for Vector3d > Vector3
             </summary>
+            <param name="value"></param>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.TokenBucket.parent">
-            <summary>Parent bucket to this bucket, or null if this is a root
-            bucket</summary>
+        <member name="F:OpenMetaverse.Vector3.Zero">
+            <summary>A vector with a value of 0,0,0</summary>
         </member>
-        <member name="F:OpenMetaverse.TokenBucket.maxBurst">
-            <summary>Size of the bucket in bytes. If zero, the bucket has 
-            infinite capacity</summary>
+        <member name="F:OpenMetaverse.Vector3.One">
+            <summary>A vector with a value of 1,1,1</summary>
         </member>
-        <member name="F:OpenMetaverse.TokenBucket.tokensPerMS">
-            <summary>Rate that the bucket fills, in bytes per millisecond. If
-            zero, the bucket always remains full</summary>
+        <member name="F:OpenMetaverse.Vector3.UnitX">
+            <summary>A unit vector facing forward (X axis), value 1,0,0</summary>
         </member>
-        <member name="F:OpenMetaverse.TokenBucket.content">
-            <summary>Number of tokens currently in the bucket</summary>
+        <member name="F:OpenMetaverse.Vector3.UnitY">
+            <summary>A unit vector facing left (Y axis), value 0,1,0</summary>
         </member>
-        <member name="F:OpenMetaverse.TokenBucket.lastDrip">
-            <summary>Time of the last drip, in system ticks</summary>
+        <member name="F:OpenMetaverse.Vector3.UnitZ">
+            <summary>A unit vector facing up (Z axis), value 0,0,1</summary>
         </member>
-        <member name="M:OpenMetaverse.TokenBucket.#ctor(OpenMetaverse.TokenBucket,System.Int32,System.Int32)">
+        <member name="T:OpenMetaverse.UUID">
             <summary>
-            Default constructor
+            A 128-bit Universally Unique Identifier, used throughout the Second
+            Life networking protocol
             </summary>
-            <param name="parent">Parent bucket if this is a child bucket, or
-            null if this is a root bucket</param>
-            <param name="maxBurst">Maximum size of the bucket in bytes, or
-            zero if this bucket has no maximum capacity</param>
-            <param name="dripRate">Rate that the bucket fills, in bytes per
-            second. If zero, the bucket always remains full</param>
         </member>
-        <member name="M:OpenMetaverse.TokenBucket.RemoveTokens(System.Int32)">
+        <member name="F:OpenMetaverse.UUID.Guid">
+            <summary>The System.Guid object this struct wraps around</summary>
+        </member>
+        <member name="M:OpenMetaverse.UUID.#ctor(System.String)">
             <summary>
-            Remove a given number of tokens from the bucket
+            Constructor that takes a string UUID representation
             </summary>
-            <param name="amount">Number of tokens to remove from the bucket</param>
-            <returns>True if the requested number of tokens were removed from
-            the bucket, otherwise false</returns>
+            <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.TokenBucket.RemoveTokens(System.Int32,System.Boolean@)">
+        <member name="M:OpenMetaverse.UUID.#ctor(System.Guid)">
             <summary>
-            Remove a given number of tokens from the bucket
+            Constructor that takes a System.Guid object
             </summary>
-            <param name="amount">Number of tokens to remove from the bucket</param>
-            <param name="dripSucceeded">True if tokens were added to the bucket
-            during this call, otherwise false</param>
-            <returns>True if the requested number of tokens were removed from
-            the bucket, otherwise false</returns>
+            <param name="val">A Guid object that contains the unique identifier
+            to be represented by this UUID</param>
         </member>
-        <member name="M:OpenMetaverse.TokenBucket.Drip">
+        <member name="M:OpenMetaverse.UUID.#ctor(System.Byte[],System.Int32)">
             <summary>
-            Add tokens to the bucket over time. The number of tokens added each
-            call depends on the length of time that has passed since the last 
-            call to Drip
+            Constructor that takes a byte array containing a UUID
             </summary>
-            <returns>True if tokens were added to the bucket, otherwise false</returns>
+            <param name="source">Byte array containing a 16 byte UUID</param>
+            <param name="pos">Beginning offset in the array</param>
         </member>
-        <member name="P:OpenMetaverse.TokenBucket.Parent">
+        <member name="M:OpenMetaverse.UUID.#ctor(System.UInt64)">
             <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
+            Constructor that takes an unsigned 64-bit unsigned integer to 
+            convert to a UUID
             </summary>
+            <param name="val">64-bit unsigned integer to convert to a UUID</param>
         </member>
-        <member name="P:OpenMetaverse.TokenBucket.MaxBurst">
+        <member name="M:OpenMetaverse.UUID.#ctor(OpenMetaverse.UUID)">
             <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
+            Copy constructor
             </summary>
+            <param name="val">UUID to copy</param>
         </member>
-        <member name="P:OpenMetaverse.TokenBucket.DripRate">
+        <member name="M:OpenMetaverse.UUID.CompareTo(OpenMetaverse.UUID)">
             <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
+            IComparable.CompareTo implementation
             </summary>
-            <remarks>Tokens are added to the bucket any time 
-            <seealso cref="M:OpenMetaverse.TokenBucket.RemoveTokens(System.Int32)"/> is called, at the granularity of
-            the system tick interval (typically around 15-22ms)</remarks>
         </member>
-        <member name="P:OpenMetaverse.TokenBucket.Content">
+        <member name="M:OpenMetaverse.UUID.FromBytes(System.Byte[],System.Int32)">
             <summary>
-            The number of bytes that can be sent at this moment. This is the
-            current number of tokens in the bucket
-            <remarks>If this bucket has a parent bucket that does not have
-            enough tokens for a request, <seealso cref="M:OpenMetaverse.TokenBucket.RemoveTokens(System.Int32)"/> will 
-            return false regardless of the content of this bucket</remarks>
+            Assigns this UUID from 16 bytes out of 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>
         </member>
-        <member name="F:OpenMetaverse.Quaternion.X">
-            <summary>X value</summary>
-        </member>
-        <member name="F:OpenMetaverse.Quaternion.Y">
-            <summary>Y value</summary>
-        </member>
-        <member name="F:OpenMetaverse.Quaternion.Z">
-            <summary>Z value</summary>
-        </member>
-        <member name="F:OpenMetaverse.Quaternion.W">
-            <summary>W value</summary>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.#ctor(System.Single,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.UUID.GetBytes">
             <summary>
-            Build a quaternion from normalized float values
+            Returns a copy of the raw bytes for this UUID
             </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>
+            <returns>A 16 byte array containing this UUID</returns>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.#ctor(System.Byte[],System.Int32,System.Boolean)">
+        <member name="M:OpenMetaverse.UUID.ToBytes(System.Byte[],System.Int32)">
             <summary>
-            Constructor, builds a quaternion object from a byte array
+            Writes the raw bytes for this UUID to a byte array
             </summary>
-            <param name="byteArray">Byte array containing four four-byte floats</param>
-            <param name="pos">Offset in the byte array to start reading at</param>
-            <param name="normalized">Whether the source data is normalized or
-            not. If this is true 12 bytes will be read, otherwise 16 bytes will
-            be read.</param>
+            <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.Quaternion.Normalize">
+        <member name="M:OpenMetaverse.UUID.CRC">
             <summary>
-            Normalizes the quaternion
+            Calculate an LLCRC (cyclic redundancy check) for this UUID
             </summary>
+            <returns>The CRC checksum for this UUID</returns>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.FromBytes(System.Byte[],System.Int32,System.Boolean)">
+        <member name="M:OpenMetaverse.UUID.GetULong">
             <summary>
-            Builds a quaternion object from a byte array
+            Create a 64-bit integer representation from the second half of this UUID
             </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>
+            <returns>An integer created from the last eight bytes of this UUID</returns>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.GetBytes">
+        <member name="M:OpenMetaverse.UUID.Parse(System.String)">
             <summary>
-            Normalize this quaternion and serialize it to a byte array
+            Generate a UUID from a string
             </summary>
-            <returns>A 12 byte array containing normalized X, Y, and Z floating
-            point values in order using little endian byte ordering</returns>
+            <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.Quaternion.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.UUID.TryParse(System.String,OpenMetaverse.UUID@)">
             <summary>
-            Writes the raw bytes for this quaternion to a byte array
+            Generate a UUID from a string
             </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>
+            <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.Quaternion.GetEulerAngles(System.Single@,System.Single@,System.Single@)">
+        <member name="M:OpenMetaverse.UUID.Combine(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Convert this quaternion to euler angles
+            Combine two UUIDs together by taking the MD5 hash of a byte array
+            containing both UUIDs
             </summary>
-            <param name="roll">X euler angle</param>
-            <param name="pitch">Y euler angle</param>
-            <param name="yaw">Z euler angle</param>
+            <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.Quaternion.GetAxisAngle(OpenMetaverse.Vector3@,System.Single@)">
+        <member name="M:OpenMetaverse.UUID.Random">
             <summary>
-            Convert this quaternion to an angle around an axis
+            
             </summary>
-            <param name="axis">Unit vector describing the axis</param>
-            <param name="angle">Angle around the axis, in radians</param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.Conjugate(OpenMetaverse.Quaternion)">
+        <member name="M:OpenMetaverse.UUID.GetHashCode">
             <summary>
-            Returns the conjugate (spatial inverse) of a quaternion
+            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.Quaternion.CreateFromAxisAngle(System.Single,System.Single,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.UUID.Equals(System.Object)">
             <summary>
-            Build a quaternion from an axis and an angle of rotation around
-            that axis
+            Comparison function
             </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.Quaternion.CreateFromAxisAngle(OpenMetaverse.Vector3,System.Single)">
+        <member name="M:OpenMetaverse.UUID.Equals(OpenMetaverse.UUID)">
             <summary>
-            Build a quaternion from an axis and an angle of rotation around
-            that axis
+            Comparison function
             </summary>
-            <param name="axis">Axis of rotation</param>
-            <param name="angle">Angle of rotation</param>
+            <param name="uuid">UUID to compare to</param>
+            <returns>True if the UUIDs are equal, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.CreateFromEulers(OpenMetaverse.Vector3)">
+        <member name="M:OpenMetaverse.UUID.ToString">
             <summary>
-            Creates a quaternion from a vector containing roll, pitch, and yaw
-            in radians
+            Get a hyphenated string representation of this UUID
             </summary>
-            <param name="eulers">Vector representation of the euler angles in
-            radians</param>
-            <returns>Quaternion representation of the euler angles</returns>
+            <returns>A string representation of this UUID, lowercase and 
+            with hyphens</returns>
+            <example>11f8aa9c-b071-4242-836b-13b7abe0d489</example>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.CreateFromEulers(System.Single,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.UUID.op_Equality(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Creates a quaternion from roll, pitch, and yaw euler angles in
-            radians
+            Equals operator
             </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="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.Quaternion.Inverse(OpenMetaverse.Quaternion)">
+        <member name="M:OpenMetaverse.UUID.op_Inequality(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Conjugates and renormalizes a vector
+            Not 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 not equal, otherwise true</returns>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.Slerp(OpenMetaverse.Quaternion,OpenMetaverse.Quaternion,System.Single)">
+        <member name="M:OpenMetaverse.UUID.op_ExclusiveOr(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Spherical linear interpolation between two quaternions
+            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>
-        <member name="M:OpenMetaverse.Quaternion.ToRawString">
+        <member name="M:OpenMetaverse.UUID.op_Explicit(System.String)~OpenMetaverse.UUID">
             <summary>
-            Get a string representation of the quaternion elements with up to three
-            decimal digits and separated by spaces only
+            String typecasting operator
             </summary>
-            <returns>Raw string representation of the quaternion</returns>
-        </member>
-        <member name="F:OpenMetaverse.Quaternion.Identity">
-            <summary>A quaternion with a value of 0,0,0,1</summary>
+            <param name="val">A UUID in string form. Case insensitive, 
+            hyphenated or non-hyphenated</param>
+            <returns>A UUID built from the string representation</returns>
         </member>
-        <member name="F:OpenMetaverse.ExpiringCache`2.syncRoot">
-            <summary>For thread safety</summary>
+        <member name="F:OpenMetaverse.UUID.Zero">
+            <summary>An UUID with a value of all zeroes</summary>
         </member>
-        <member name="F:OpenMetaverse.ExpiringCache`2.isPurging">
-            <summary>For thread safety</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.ExpiringCache`2.PurgeCache(System.Object,System.Timers.ElapsedEventArgs)">
+        <member name="T:OpenMetaverse.TokenBucket">
             <summary>
-            Purges expired objects from the cache. Called automatically by the purge timer.
+            A hierarchical token bucket for bandwidth throttling. See
+            http://en.wikipedia.org/wiki/Token_bucket for more information
             </summary>
         </member>
-        <member name="T:OpenMetaverse.EnumInfoAttribute">
-            <summary>
-            Attribute class that allows extra attributes to be attached to ENUMs
-            </summary>
+        <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.EnumInfoAttribute.Text">
-            <summary>Text used when presenting ENUM to user</summary>
+        <member name="F:OpenMetaverse.TokenBucket.maxBurst">
+            <summary>Size of the bucket in bytes. If zero, the bucket has 
+            infinite capacity</summary>
         </member>
-        <member name="M:OpenMetaverse.EnumInfoAttribute.#ctor">
-            <summary>Default initializer</summary>
+        <member name="F:OpenMetaverse.TokenBucket.tokensPerMS">
+            <summary>Rate that the bucket fills, in bytes per millisecond. If
+            zero, the bucket always remains full</summary>
         </member>
-        <member name="M:OpenMetaverse.EnumInfoAttribute.#ctor(System.String)">
-            <summary>Text used when presenting ENUM to user</summary>
+        <member name="F:OpenMetaverse.TokenBucket.content">
+            <summary>Number of tokens currently in the bucket</summary>
         </member>
-        <member name="T:OpenMetaverse.AssetType">
+        <member name="F:OpenMetaverse.TokenBucket.lastDrip">
+            <summary>Time of the last drip, in system ticks</summary>
+        </member>
+        <member name="M:OpenMetaverse.TokenBucket.#ctor(OpenMetaverse.TokenBucket,System.Int32,System.Int32)">
             <summary>
-            The different types of grid assets
+            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.AssetType.Unknown">
-            <summary>Unknown asset type</summary>
-        </member>
-        <member name="F:OpenMetaverse.AssetType.Texture">
-            <summary>Texture asset, stores in JPEG2000 J2C stream format</summary>
+        <member name="M:OpenMetaverse.TokenBucket.RemoveTokens(System.Int32)">
+            <summary>
+            Remove a given number of tokens from the bucket
+            </summary>
+            <param name="amount">Number of tokens to remove from the bucket</param>
+            <returns>True if the requested number of tokens were removed from
+            the bucket, otherwise false</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.Sound">
-            <summary>Sound asset</summary>
+        <member name="M:OpenMetaverse.TokenBucket.RemoveTokens(System.Int32,System.Boolean@)">
+            <summary>
+            Remove a given number of tokens from the bucket
+            </summary>
+            <param name="amount">Number of tokens to remove from the bucket</param>
+            <param name="dripSucceeded">True if tokens were added to the bucket
+            during this call, otherwise false</param>
+            <returns>True if the requested number of tokens were removed from
+            the bucket, otherwise false</returns>
+        </member>
+        <member name="M:OpenMetaverse.TokenBucket.Drip">
+            <summary>
+            Add tokens to the bucket over time. The number of tokens added each
+            call depends on the length of time that has passed since the last 
+            call to Drip
+            </summary>
+            <returns>True if tokens were added to the bucket, otherwise false</returns>
+        </member>
+        <member name="P:OpenMetaverse.TokenBucket.Parent">
+            <summary>
+            The parent bucket of this bucket, or null if this bucket has no
+            parent. The parent bucket will limit the aggregate bandwidth of all
+            of its children buckets
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.TokenBucket.MaxBurst">
+            <summary>
+            Maximum burst rate in bytes per second. This is the maximum number
+            of tokens that can accumulate in the bucket at any one time
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.TokenBucket.DripRate">
+            <summary>
+            The speed limit of this bucket in bytes per second. This is the
+            number of tokens that are added to the bucket per second
+            </summary>
+            <remarks>Tokens are added to the bucket any time 
+            <seealso cref="M:OpenMetaverse.TokenBucket.RemoveTokens(System.Int32)"/> 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)"/> will 
+            return false regardless of the content of this bucket</remarks>
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.Vector2">
+            <summary>
+            A two-dimensional vector with floating-point values
+            </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="M:OpenMetaverse.Vector2.ApproxEquals(OpenMetaverse.Vector2,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.Vector2.IsFinite">
+            <summary>
+            Test if this vector is composed of all finite numbers
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Vector2.CompareTo(OpenMetaverse.Vector2)">
+            <summary>
+            IComparable.CompareTo implementation
+            </summary>
+        </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>
+        <member name="M:OpenMetaverse.Vector2.GetBytes">
+            <summary>
+            Returns the raw bytes for this vector
+            </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>
+        <member name="M:OpenMetaverse.Vector2.Parse(System.String)">
+            <summary>
+            Parse a vector from a string
+            </summary>
+            <param name="val">A string representation of a 2D vector, enclosed 
+            in arrow brackets and separated by commas</param>
+        </member>
+        <member name="M:OpenMetaverse.Vector2.SmoothStep(OpenMetaverse.Vector2,OpenMetaverse.Vector2,System.Single)">
+            <summary>
+            Interpolates between two vectors using a cubic equation
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Vector2.ToString">
+            <summary>
+            Get a formatted string representation of the vector
+            </summary>
+            <returns>A string representation of the vector</returns>
+        </member>
+        <member name="M:OpenMetaverse.Vector2.ToRawString">
+            <summary>
+            Get a string representation of the vector elements with up to three
+            decimal digits and separated by spaces only
+            </summary>
+            <returns>Raw string representation of the vector</returns>
+        </member>
+        <member name="F:OpenMetaverse.Vector2.Zero">
+            <summary>A vector with a value of 0,0</summary>
+        </member>
+        <member name="F:OpenMetaverse.Vector2.One">
+            <summary>A vector with a value of 1,1</summary>
+        </member>
+        <member name="F:OpenMetaverse.Vector2.UnitX">
+            <summary>A vector with a value of 1,0</summary>
+        </member>
+        <member name="F:OpenMetaverse.Vector2.UnitY">
+            <summary>A vector with a value of 0,1</summary>
+        </member>
+        <member name="T:OpenMetaverse.EnumInfoAttribute">
+            <summary>
+            Attribute class that allows extra attributes to be attached to ENUMs
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.EnumInfoAttribute.Text">
+            <summary>Text used when presenting ENUM to user</summary>
+        </member>
+        <member name="M:OpenMetaverse.EnumInfoAttribute.#ctor">
+            <summary>Default initializer</summary>
+        </member>
+        <member name="M:OpenMetaverse.EnumInfoAttribute.#ctor(System.String)">
+            <summary>Text used when presenting ENUM to user</summary>
+        </member>
+        <member name="T:OpenMetaverse.AssetType">
+            <summary>
+            The different types of grid assets
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.AssetType.Unknown">
+            <summary>Unknown asset type</summary>
+        </member>
+        <member name="F:OpenMetaverse.AssetType.Texture">
+            <summary>Texture asset, stores in JPEG2000 J2C stream format</summary>
+        </member>
+        <member name="F:OpenMetaverse.AssetType.Sound">
+            <summary>Sound asset</summary>
         </member>
         <member name="F:OpenMetaverse.AssetType.CallingCard">
             <summary>Calling card for another avatar</summary>
@@ -2332,270 +2524,78 @@
         <member name="F:OpenMetaverse.WearableType.Invalid">
             <summary>Invalid wearable asset</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="F:OpenMetaverse.LocklessQueue`1.head">
-            <summary>Queue head</summary>
-        </member>
-        <member name="F:OpenMetaverse.LocklessQueue`1.tail">
-            <summary>Queue tail</summary>
-        </member>
-        <member name="F:OpenMetaverse.LocklessQueue`1.count">
-            <summary>Queue item count</summary>
-        </member>
-        <member name="M:OpenMetaverse.LocklessQueue`1.#ctor">
-            <summary>
-            Constructor
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.LocklessQueue`1.Enqueue(`0)">
-            <summary>
-            Enqueue an item
-            </summary>
-            <param name="item">Item to enqeue</param>
-        </member>
-        <member name="M:OpenMetaverse.LocklessQueue`1.TryDequeue(`0@)">
-            <summary>
-            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="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="T:OpenMetaverse.LocklessQueue`1.SingleLinkNode">
-            <summary>
-            Provides a node container for data in a singly linked list
-            </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="M:OpenMetaverse.LocklessQueue`1.SingleLinkNode.#ctor">
-            <summary>
-            Constructor
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.LocklessQueue`1.SingleLinkNode.#ctor(`0)">
-            <summary>
-            Constructor
-            </summary>
-        </member>
-        <member name="T:OpenMetaverse.UUID">
-            <summary>
-            A 128-bit Universally Unique Identifier, used throughout the Second
-            Life networking protocol
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.UUID.Guid">
-            <summary>The System.Guid object this struct wraps around</summary>
-        </member>
-        <member name="M:OpenMetaverse.UUID.#ctor(System.String)">
-            <summary>
-            Constructor that takes a string UUID representation
-            </summary>
-            <param name="val">A string representation of a UUID, case 
-            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)">
-            <summary>
-            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.UUID.#ctor(System.Byte[],System.Int32)">
-            <summary>
-            Constructor that takes a byte array containing a UUID
-            </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.UUID.#ctor(System.UInt64)">
-            <summary>
-            Constructor that takes an unsigned 64-bit unsigned integer to 
-            convert to a UUID
-            </summary>
-            <param name="val">64-bit unsigned integer to convert to a UUID</param>
-        </member>
-        <member name="M:OpenMetaverse.UUID.#ctor(OpenMetaverse.UUID)">
-            <summary>
-            Copy constructor
-            </summary>
-            <param name="val">UUID to copy</param>
-        </member>
-        <member name="M:OpenMetaverse.UUID.CompareTo(OpenMetaverse.UUID)">
-            <summary>
-            IComparable.CompareTo implementation
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.UUID.FromBytes(System.Byte[],System.Int32)">
-            <summary>
-            Assigns this UUID from 16 bytes out of 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>
-        </member>
-        <member name="M:OpenMetaverse.UUID.GetBytes">
-            <summary>
-            Returns a copy of the raw bytes for this UUID
-            </summary>
-            <returns>A 16 byte array containing this UUID</returns>
-        </member>
-        <member name="M:OpenMetaverse.UUID.ToBytes(System.Byte[],System.Int32)">
-            <summary>
-            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 16 bytes before the end of the array</param>
-        </member>
-        <member name="M:OpenMetaverse.UUID.CRC">
-            <summary>
-            Calculate an LLCRC (cyclic redundancy check) for this UUID
-            </summary>
-            <returns>The CRC checksum for this UUID</returns>
-        </member>
-        <member name="M:OpenMetaverse.UUID.GetULong">
-            <summary>
-            Create a 64-bit integer representation from the second half of this UUID
-            </summary>
-            <returns>An integer created from the last eight bytes of this UUID</returns>
-        </member>
-        <member name="M:OpenMetaverse.UUID.Parse(System.String)">
-            <summary>
-            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.UUID.TryParse(System.String,OpenMetaverse.UUID@)">
-            <summary>
-            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>
-            <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.UUID.Combine(OpenMetaverse.UUID,OpenMetaverse.UUID)">
-            <summary>
-            Combine two UUIDs together by taking the MD5 hash of a byte array
-            containing both UUIDs
-            </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="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>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.UUID.GetHashCode">
+        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor(System.Collections.Generic.IEnumerable{`0})">
             <summary>
-            Return a hash code for this UUID, used by .NET for hash tables
+            Create new BlockingQueue.
             </summary>
-            <returns>An integer composed of all the UUID bytes XORed together</returns>
+            <param name="col">The System.Collections.ICollection to copy elements from</param>
         </member>
-        <member name="M:OpenMetaverse.UUID.Equals(System.Object)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor(System.Int32)">
             <summary>
-            Comparison function
+            Create new BlockingQueue.
             </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="capacity">The initial number of elements that the queue can contain</param>
         </member>
-        <member name="M:OpenMetaverse.UUID.Equals(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor">
             <summary>
-            Comparison function
+            Create new BlockingQueue.
             </summary>
-            <param name="uuid">UUID to compare to</param>
-            <returns>True if the UUIDs are equal, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.UUID.ToString">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Finalize">
             <summary>
-            Get a hyphenated string representation of this UUID
+            BlockingQueue Destructor (Close queue, resume any waiting thread).
             </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.BlockingQueue`1.Clear">
             <summary>
-            Equals operator
+            Remove all objects from the Queue.
             </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.BlockingQueue`1.Close">
             <summary>
-            Not equals operator
+            Remove all objects from the Queue, resume all dequeue threads.
             </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>
         </member>
-        <member name="M:OpenMetaverse.UUID.op_ExclusiveOr(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue">
             <summary>
-            XOR operator
+            Removes and returns the object at the beginning of the Queue.
             </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>
+            <returns>Object in queue.</returns>
         </member>
-        <member name="M:OpenMetaverse.UUID.op_Explicit(System.String)~OpenMetaverse.UUID">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue(System.TimeSpan)">
             <summary>
-            String typecasting operator
+            Removes and returns the object at the beginning of the Queue.
             </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="F:OpenMetaverse.UUID.Zero">
-            <summary>An UUID with a value of all zeroes</summary>
-        </member>
-        <member name="F:OpenMetaverse.UUID.ZeroString">
-            <summary>A cache of UUID.Zero as a string to optimize a common path</summary>
+            <param name="timeout">time to wait before returning</param>
+            <returns>Object in queue.</returns>
         </member>
-        <member name="M:OpenMetaverse.CircularQueue`1.#ctor(OpenMetaverse.CircularQueue{`0})">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue(System.Int32)">
             <summary>
-            Copy constructor
+            Removes and returns the object at the beginning of the Queue.
             </summary>
-            <param name="queue">Circular queue to copy</param>
+            <param name="timeout">time to wait before returning (in milliseconds)</param>
+            <returns>Object in queue.</returns>
         </member>
-        <member name="M:OpenMetaverse.ReaderWriterLockSlim.ExitAndWakeUpAppropriateWaiters">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Enqueue(`0)">
             <summary>
-            Determines the appropriate events to set, leaves the locks, and sets the events. 
+            Adds an object to the end of the Queue
             </summary>
+            <param name="obj">Object to put in queue</param>
         </member>
-        <member name="M:OpenMetaverse.ReaderWriterLockSlim.LazyCreateEvent(System.Threading.EventWaitHandle@,System.Boolean)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Open">
             <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' 
+            Open Queue.
             </summary>
         </member>
-        <member name="M:OpenMetaverse.ReaderWriterLockSlim.WaitOnEvent(System.Threading.EventWaitHandle,System.UInt32@,System.Int32)">
+        <member name="P:OpenMetaverse.BlockingQueue`1.Closed">
             <summary>
-            Waits on 'waitEvent' with a timeout of 'millisceondsTimeout.  
-            Before the wait 'numWaiters' is incremented and is restored before leaving this routine.
+            Gets flag indicating if queue has been closed.
             </summary>
         </member>
     </members>
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index 4d00d5e..49a0f3b 100755
Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ
-- 
cgit v1.1


From 709814c19438e279d58a9689b0b3a6f2b1989e34 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Tue, 5 Nov 2013 23:38:43 -0800
Subject: add support for particle blending LSL functions

---
 .../ScriptEngine/Shared/Api/Implementation/LSL_Api.cs    | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index e6ff75f..86e8200 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6270,6 +6270,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             ps.BurstRate = 0.1f;
             ps.PartMaxAge = 10.0f;
             ps.BurstPartCount = 1;
+            ps.BlendFuncSource = ScriptBaseClass.PSYS_PART_BF_SOURCE_ALPHA;
+            ps.BlendFuncDest = ScriptBaseClass.PSYS_PART_BF_ONE_MINUS_SOURCE_ALPHA;
+
             return ps;
         }
 
@@ -6304,6 +6307,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 LSL_Vector tempv = new LSL_Vector();
 
                 float tempf = 0;
+                int tmpi = 0;
 
                 for (int i = 0; i < rules.Length; i += 2)
                 {
@@ -6362,7 +6366,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             break;
 
                         case (int)ScriptBaseClass.PSYS_SRC_PATTERN:
-                            int tmpi = (int)rules.GetLSLIntegerItem(i + 1);
+                            tmpi = (int)rules.GetLSLIntegerItem(i + 1);
                             prules.Pattern = (Primitive.ParticleSystem.SourcePattern)tmpi;
                             break;
 
@@ -6382,6 +6386,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             prules.PartFlags &= 0xFFFFFFFD; // Make sure new angle format is off.
                             break;
 
+                        case (int)ScriptBaseClass.PSYS_PART_BLEND_FUNC_SOURCE:
+                            tmpi = (int)rules.GetLSLIntegerItem(i + 1);
+                            prules.BlendFuncSource = (byte)tmpi;
+                            break;
+
+                        case (int)ScriptBaseClass.PSYS_PART_BLEND_FUNC_DEST:
+                            tmpi = (int)rules.GetLSLIntegerItem(i + 1);
+                            prules.BlendFuncDest = (byte)tmpi;
+                            break;
+
                         case (int)ScriptBaseClass.PSYS_SRC_TEXTURE:
                             prules.Texture = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, rules.GetLSLStringItem(i + 1));
                             break;
-- 
cgit v1.1


From 0b4577d5b0b68e009d498c9ed27cd6cca9b7200f Mon Sep 17 00:00:00 2001
From: dahlia
Date: Tue, 5 Nov 2013 23:48:44 -0800
Subject: add support for particle glow LSL functions

---
 .../Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 86e8200..5663048 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6272,6 +6272,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             ps.BurstPartCount = 1;
             ps.BlendFuncSource = ScriptBaseClass.PSYS_PART_BF_SOURCE_ALPHA;
             ps.BlendFuncDest = ScriptBaseClass.PSYS_PART_BF_ONE_MINUS_SOURCE_ALPHA;
+            ps.PartStartGlow = 0.0f;
+            ps.PartEndGlow = 0.0f;
 
             return ps;
         }
@@ -6396,6 +6398,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             prules.BlendFuncDest = (byte)tmpi;
                             break;
 
+                        case (int)ScriptBaseClass.PSYS_PART_START_GLOW:
+                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            prules.PartStartGlow = (float)tempf;
+                            break;
+
+                        case (int)ScriptBaseClass.PSYS_PART_END_GLOW:
+                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            prules.PartEndGlow = (float)tempf;
+                            break;
+
                         case (int)ScriptBaseClass.PSYS_SRC_TEXTURE:
                             prules.Texture = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, rules.GetLSLStringItem(i + 1));
                             break;
-- 
cgit v1.1


From 52ff860f30a16f57408d372cda9280cf71a95e3d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 6 Nov 2013 23:27:19 +0000
Subject: minor: Make PID file examples in OpenSim and Robust config somewhat
 more meaningful than just /tmp/my.pid

---
 bin/OpenSim.ini.example | 2 +-
 bin/OpenSimDefaults.ini | 2 +-
 bin/Robust.ini.example  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index b78e3b7..d3f9156 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -69,7 +69,7 @@
 
     ;# {PIDFile} {} {Path to PID file?} {}
     ;; Place to create a PID file
-    ; PIDFile = "/tmp/my.pid"
+    ; PIDFile = "/tmp/OpenSim.exe.pid"
 
     ;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem
     ;; Determine where OpenSimulator looks for the files which tell it
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index b56d5d1..ae7b794 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -21,7 +21,7 @@
     crash_dir = "crashes"
 
     ; Place to create a PID file
-    ; PIDFile = "/tmp/my.pid"
+    ; PIDFile = "/tmp/OpenSim.exe.pid"
 
     ; Console commands run at startup
     startup_console_commands_file = "startup_commands.txt"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 0660de4..f79059b 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -15,7 +15,7 @@
 [Startup]
   ; Place to create a PID file
   ; If no path if specified then a PID file is not created.
-  ; PIDFile = "/tmp/my.pid"
+  ; PIDFile = "/tmp/Robust.exe.pid"
 
   ; Plugin Registry Location
   ; Set path to directory for plugin registry. Information
-- 
cgit v1.1


From 3b2721c95726a6968a23b6d27d83769f03b987b0 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Wed, 6 Nov 2013 19:13:41 -0800
Subject: update OpenMetaverse.dll to 7ae74674a09877119cbb4c80cbffea474e20da29 
 - addresses particle flags issue

---
 bin/OpenMetaverse.dll | Bin 1806336 -> 1806336 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index a91670d..30ad7e5 100755
Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ
-- 
cgit v1.1


From 5cef8bf64ec3725788ca0ceb70395f8389e52e7c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 8 Nov 2013 00:31:26 +0000
Subject: Make admin_save_oar request submit a request ID and log this for
 tracking.

Previous behaviour of always logging 'name' is unhelpful since this actually an error message parameter which is only filled out if an error has occurred
---
 .../RemoteController/RemoteAdminPlugin.cs              | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index c78cf3b..8b66ee1 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1408,7 +1408,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         /// </remarks>
         private void XmlRpcSaveOARMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
         {
-            m_log.Info("[RADMIN]: Received Save OAR Administrator Request");
+            m_log.Info("[RADMIN]: Received Save OAR Request");
 
             Hashtable responseData = (Hashtable)response.Value;
             Hashtable requestData = (Hashtable)request.Params[0];
@@ -1454,8 +1454,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                 if (archiver != null)
                 {
+                    Guid requestId = Guid.NewGuid();
                     scene.EventManager.OnOarFileSaved += RemoteAdminOarSaveCompleted;
-                    archiver.ArchiveRegion(filename, options);
+
+                    m_log.InfoFormat(
+                        "[RADMIN]: Submitting save OAR request for {0} to file {1}, request ID {2}", 
+                        scene.Name, filename, requestId);
+
+                    archiver.ArchiveRegion(filename, requestId, options);
 
                     lock (m_saveOarLock)
                         Monitor.Wait(m_saveOarLock,5000);
@@ -1476,12 +1482,16 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 throw e;
             }
 
-            m_log.Info("[RADMIN]: Save OAR Administrator Request complete");
+            m_log.Info("[RADMIN]: Save OAR Request complete");
         }
 
         private void RemoteAdminOarSaveCompleted(Guid uuid, string name)
         {
-            m_log.DebugFormat("[RADMIN]: File processing complete for {0}", name);
+            if (name != "")
+                m_log.ErrorFormat("[RADMIN]: Saving of OAR file with request ID {0} failed with message {1}", uuid, name);
+            else
+                m_log.DebugFormat("[RADMIN]: Saved OAR file for request {0}", uuid);
+
             lock (m_saveOarLock)
                 Monitor.Pulse(m_saveOarLock);
         }
-- 
cgit v1.1


From 626a050159e0eb3d3d12fee482f2c9280b1b2b4e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 8 Nov 2013 00:34:35 +0000
Subject: minor: Make PID file example in Robust.HG.ini more meaningful as is
 now the case in OpenSim and vanilla ROBUST config files

---
 bin/Robust.HG.ini.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 2ad262a..965e241 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -23,7 +23,7 @@
 [Startup]
   ; Place to create a PID file
   ; If no path if specified then a PID file is not created.
-  ; PIDFile = "/tmp/my.pid"
+  ; PIDFile = "/tmp/Robust.exe.pid"
 
   ; Plugin Registry Location
   ; Set path to directory for plugin registry. Information
-- 
cgit v1.1


From ea9e96dd50d22e5e1003b675c4148d59df7ec989 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 8 Nov 2013 21:13:05 +0000
Subject: Update OpenSimulator to use .NET 4.0

This allows region modules to register script functions that have more than a couple of arguments.
It also allows OpenSimulator code to use the feature and syntax additions that came with .NET 4.0
Windows users will need to install Microsoft .NET 4 framework if they have not done so already.
Windows C# Express 2010 also becomes the minimum IDE for build, so runprebuild.bat now generates a 2010 solution and runprebuild2010.bat goes away
Official minimum mono version becomes 2.10.8.1.  OpenSimulator will probably work with 2.8 later but this is not guaranteed.
---
 README.md           |   4 +-
 prebuild.xml        | 200 ++++++++++++++++++++++++++--------------------------
 runprebuild.bat     |  24 ++++++-
 runprebuild2010.bat |   2 -
 4 files changed, 125 insertions(+), 105 deletions(-)
 delete mode 100755 runprebuild2010.bat

diff --git a/README.md b/README.md
index 6309385..fb1e921 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,8 @@ need to build OpenSim before running it.
 
 You will need .NET Framework 3.5 installed to run OpenSimulator.
 
+You will need .NET 4.0 installed to run OpenSimulator.
+
 We recommend that you run OpenSim from a command prompt on Windows in order
 to capture any errors.
 
@@ -31,7 +33,7 @@ Now see the "Configuring OpenSim" section
 
 # Running OpenSim on Linux
 
-You will need Mono >= 2.4.3 to run OpenSim.  On some Linux distributions you
+You will need Mono >= 2.10.8.1 to run OpenSimulator.  On some Linux distributions you
 may need to install additional packages.  See http://opensimulator.org/wiki/Dependencies
 for more information.
 
diff --git a/prebuild.xml b/prebuild.xml
index a5357da..de3b89b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -34,7 +34,7 @@
 
     <!-- Core OpenSim Projects -->
 <!--
-        <Project frameworkVersion="v3_5" name="OpenSim.Model" path="OpenSim/Model" type="Library">
+        <Project frameworkVersion="v4_0" name="OpenSim.Model" path="OpenSim/Model" type="Library">
           <Configuration name="Debug">
             <Options>
               <OutputPath>../../../bin/</OutputPath>
@@ -55,7 +55,7 @@
         </Project>
 -->
 
-    <Project frameworkVersion="v3_5" name="SmartThreadPool" path="ThirdParty/SmartThreadPool" type="Library">
+    <Project frameworkVersion="v4_0" name="SmartThreadPool" path="ThirdParty/SmartThreadPool" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>
@@ -77,7 +77,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework" path="OpenSim/Framework" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework" path="OpenSim/Framework" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>
@@ -113,7 +113,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.Interfaces" path="OpenSim/Services/Interfaces" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.Interfaces" path="OpenSim/Services/Interfaces" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -141,7 +141,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -168,7 +168,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -209,7 +209,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Console" path="OpenSim/Framework/Console" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Console" path="OpenSim/Framework/Console" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -236,7 +236,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Serialization" path="OpenSim/Framework/Serialization" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Serialization" path="OpenSim/Framework/Serialization" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -265,7 +265,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Data" path="OpenSim/Data" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Data" path="OpenSim/Data" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>
@@ -295,7 +295,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Configuration.XML" path="OpenSim/Framework/Configuration/XML" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Configuration.XML" path="OpenSim/Framework/Configuration/XML" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -320,7 +320,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Configuration.HTTP" path="OpenSim/Framework/Configuration/HTTP" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Configuration.HTTP" path="OpenSim/Framework/Configuration/HTTP" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -347,7 +347,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.AssetLoader.Filesystem" path="OpenSim/Framework/AssetLoader/Filesystem" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.AssetLoader.Filesystem" path="OpenSim/Framework/AssetLoader/Filesystem" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -372,7 +372,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.RegionLoader.Web" path="OpenSim/Framework/RegionLoader/Web" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.RegionLoader.Web" path="OpenSim/Framework/RegionLoader/Web" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -398,7 +398,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.RegionLoader.Filesystem" path="OpenSim/Framework/RegionLoader/Filesystem" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.RegionLoader.Filesystem" path="OpenSim/Framework/RegionLoader/Filesystem" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -424,7 +424,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers" path="OpenSim/Framework/Servers" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Servers" path="OpenSim/Framework/Servers" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -457,7 +457,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.Manager" path="OpenSim/Region/Physics/Manager" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.Manager" path="OpenSim/Region/Physics/Manager" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -485,7 +485,7 @@
     </Project>
 
     <!-- Physics Plug-ins -->
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BasicPhysicsPlugin" path="OpenSim/Region/Physics/BasicPhysicsPlugin" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.BasicPhysicsPlugin" path="OpenSim/Region/Physics/BasicPhysicsPlugin" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/Physics/</OutputPath>
@@ -508,7 +508,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.POSPlugin" path="OpenSim/Region/Physics/POSPlugin" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.POSPlugin" path="OpenSim/Region/Physics/POSPlugin" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/Physics/</OutputPath>
@@ -531,7 +531,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.OdePlugin" path="OpenSim/Region/Physics/OdePlugin" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.OdePlugin" path="OpenSim/Region/Physics/OdePlugin" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/Physics/</OutputPath>
@@ -561,7 +561,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.Meshing" path="OpenSim/Region/Physics/Meshing" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.Meshing" path="OpenSim/Region/Physics/Meshing" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/Physics/</OutputPath>
@@ -592,7 +592,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Capabilities" path="OpenSim/Capabilities" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Capabilities" path="OpenSim/Capabilities" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>
@@ -627,7 +627,7 @@
     </Project>
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -668,7 +668,7 @@
     </Project>
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Framework" path="OpenSim/Region/Framework" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Framework" path="OpenSim/Region/Framework" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -721,7 +721,7 @@
     <!-- OGS projects -->
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Server.Base" path="OpenSim/Server/Base" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Server.Base" path="OpenSim/Server/Base" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -756,7 +756,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.Base" path="OpenSim/Services/Base" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.Base" path="OpenSim/Services/Base" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -783,7 +783,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.UserAccountService" path="OpenSim/Services/UserAccountService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.UserAccountService" path="OpenSim/Services/UserAccountService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -814,7 +814,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.FriendsService" path="OpenSim/Services/Friends" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.FriendsService" path="OpenSim/Services/Friends" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -845,7 +845,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.Connectors" path="OpenSim/Services/Connectors" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.Connectors" path="OpenSim/Services/Connectors" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -886,7 +886,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.AssetService" path="OpenSim/Services/AssetService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.AssetService" path="OpenSim/Services/AssetService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -918,7 +918,7 @@
       </Files>
     </Project>
     
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.AuthorizationService" path="OpenSim/Services/AuthorizationService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.AuthorizationService" path="OpenSim/Services/AuthorizationService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -949,7 +949,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.FreeswitchService" path="OpenSim/Services/FreeswitchService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.FreeswitchService" path="OpenSim/Services/FreeswitchService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -981,7 +981,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.AuthenticationService" path="OpenSim/Services/AuthenticationService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.AuthenticationService" path="OpenSim/Services/AuthenticationService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1013,7 +1013,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.GridService" path="OpenSim/Services/GridService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.GridService" path="OpenSim/Services/GridService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1047,7 +1047,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.PresenceService" path="OpenSim/Services/PresenceService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.PresenceService" path="OpenSim/Services/PresenceService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1078,7 +1078,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.AvatarService" path="OpenSim/Services/AvatarService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.AvatarService" path="OpenSim/Services/AvatarService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1109,7 +1109,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.InventoryService" path="OpenSim/Services/InventoryService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.InventoryService" path="OpenSim/Services/InventoryService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1144,7 +1144,7 @@
     </Project>
     
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.LLLoginService" path="OpenSim/Services/LLLoginService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.LLLoginService" path="OpenSim/Services/LLLoginService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1177,7 +1177,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.HypergridService" path="OpenSim/Services/HypergridService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.HypergridService" path="OpenSim/Services/HypergridService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1215,7 +1215,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.MapImageService" path="OpenSim/Services/MapImageService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.MapImageService" path="OpenSim/Services/MapImageService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1245,7 +1245,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.UserProfilesService" path="OpenSim/Services/UserProfilesService" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.UserProfilesService" path="OpenSim/Services/UserProfilesService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1281,7 +1281,7 @@
     </Project>
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1321,7 +1321,7 @@
     </Project>
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Capabilities.Handlers" path="OpenSim/Capabilities/Handlers" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Capabilities.Handlers" path="OpenSim/Capabilities/Handlers" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1362,7 +1362,7 @@
     </Project>
 
 
-    <Project frameworkVersion="v3_5" name="Robust" path="OpenSim/Server" type="Exe">
+    <Project frameworkVersion="v4_0" name="Robust" path="OpenSim/Server" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>
@@ -1398,7 +1398,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.ConsoleClient" path="OpenSim/ConsoleClient" type="Exe">
+    <Project frameworkVersion="v4_0" name="OpenSim.ConsoleClient" path="OpenSim/ConsoleClient" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>
@@ -1431,7 +1431,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1466,7 +1466,7 @@
     </Project>
 
     <!-- ClientStack Plugins -->
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenUDP" path="OpenSim/Region/ClientStack/Linden/UDP" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ClientStack.LindenUDP" path="OpenSim/Region/ClientStack/Linden/UDP" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../bin/</OutputPath>
@@ -1512,7 +1512,7 @@
 
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenCaps" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ClientStack.LindenCaps" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../bin/</OutputPath>
@@ -1556,7 +1556,7 @@
     </Project>
 
     
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1623,7 +1623,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1661,7 +1661,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1719,7 +1719,7 @@
     </Project>
 
     <!-- Datastore Plugins -->
-    <Project frameworkVersion="v3_5" name="OpenSim.Data.Null" path="OpenSim/Data/Null" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Data.Null" path="OpenSim/Data/Null" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1747,7 +1747,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -1772,7 +1772,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletSPlugin" path="OpenSim/Region/Physics/BulletSPlugin" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.BulletSPlugin" path="OpenSim/Region/Physics/BulletSPlugin" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/Physics/</OutputPath>
@@ -1811,7 +1811,7 @@
     </Project>
 
     <!-- OpenSim app -->
-    <Project frameworkVersion="v3_5" name="OpenSim" path="OpenSim/Region/Application" type="Exe">
+    <Project frameworkVersion="v4_0" name="OpenSim" path="OpenSim/Region/Application" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1856,7 +1856,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.ApplicationPlugins.LoadRegions" path="OpenSim/ApplicationPlugins/LoadRegions" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.ApplicationPlugins.LoadRegions" path="OpenSim/ApplicationPlugins/LoadRegions" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1891,7 +1891,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.ApplicationPlugins.RegionModulesController" path="OpenSim/ApplicationPlugins/RegionModulesController" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.ApplicationPlugins.RegionModulesController" path="OpenSim/ApplicationPlugins/RegionModulesController" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1921,7 +1921,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.ApplicationPlugins.RemoteController" path="OpenSim/ApplicationPlugins/RemoteController" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.ApplicationPlugins.RemoteController" path="OpenSim/ApplicationPlugins/RemoteController" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1963,7 +1963,7 @@
 
     <!-- Scene Server API Example Apps -->
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.DataSnapshot" path="OpenSim/Region/DataSnapshot" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.DataSnapshot" path="OpenSim/Region/DataSnapshot" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2000,7 +2000,7 @@
     </Project>
 
     <!-- Data Base Modules -->
-    <Project frameworkVersion="v3_5" name="OpenSim.Data.MySQL" path="OpenSim/Data/MySQL" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Data.MySQL" path="OpenSim/Data/MySQL" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2039,7 +2039,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Data.MSSQL" path="OpenSim/Data/MSSQL" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Data.MSSQL" path="OpenSim/Data/MSSQL" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2073,7 +2073,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Data.PGSQL" path="OpenSim/Data/PGSQL" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Data.PGSQL" path="OpenSim/Data/PGSQL" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2109,7 +2109,7 @@
       </Files>
     </Project>
 	
-    <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2151,7 +2151,7 @@
     </Project>
 
     
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared" path="OpenSim/Region/ScriptEngine/Shared" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Shared" path="OpenSim/Region/ScriptEngine/Shared" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -2188,7 +2188,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime" path="OpenSim/Region/ScriptEngine/Shared/Api/Runtime" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime" path="OpenSim/Region/ScriptEngine/Shared/Api/Runtime" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../../bin/</OutputPath>
@@ -2221,7 +2221,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared.YieldProlog" path="OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Shared.YieldProlog" path="OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../../../bin/</OutputPath>
@@ -2253,7 +2253,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared.Api" path="OpenSim/Region/ScriptEngine/Shared/Api/Implementation" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Shared.Api" path="OpenSim/Region/ScriptEngine/Shared/Api/Implementation" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../../bin/</OutputPath>
@@ -2293,7 +2293,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared.CodeTools" path="OpenSim/Region/ScriptEngine/Shared/CodeTools" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Shared.CodeTools" path="OpenSim/Region/ScriptEngine/Shared/CodeTools" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../bin/</OutputPath>
@@ -2324,7 +2324,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared.Instance" path="OpenSim/Region/ScriptEngine/Shared/Instance" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Shared.Instance" path="OpenSim/Region/ScriptEngine/Shared/Instance" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../bin/</OutputPath>
@@ -2364,7 +2364,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.XEngine.Api.Runtime" path="OpenSim/Region/ScriptEngine/XEngine/Api/Runtime" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.XEngine.Api.Runtime" path="OpenSim/Region/ScriptEngine/XEngine/Api/Runtime" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../../bin/</OutputPath>
@@ -2398,7 +2398,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.XEngine" path="OpenSim/Region/ScriptEngine/XEngine" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.XEngine" path="OpenSim/Region/ScriptEngine/XEngine" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -2443,7 +2443,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2494,7 +2494,7 @@
     
     <!-- Addons -->
     
-    <Project frameworkVersion="v3_5" name="OpenSim.Addons.OfflineIM" path="OpenSim/Addons/OfflineIM" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Addons.OfflineIM" path="OpenSim/Addons/OfflineIM" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2541,7 +2541,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Addons.Groups" path="OpenSim/Addons/Groups" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Addons.Groups" path="OpenSim/Addons/Groups" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2592,7 +2592,7 @@
 
     <!-- Tools -->
 
-    <Project frameworkVersion="v3_5" name="pCampBot" path="OpenSim/Tools/pCampBot" type="Exe">
+    <Project frameworkVersion="v4_0" name="pCampBot" path="OpenSim/Tools/pCampBot" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2619,7 +2619,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Tools.lslc" path="OpenSim/Tools/Compiler" type="Exe">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tools.lslc" path="OpenSim/Tools/Compiler" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2646,7 +2646,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Tools.Configger" path="OpenSim/Tools/Configger" type="Exe">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tools.Configger" path="OpenSim/Tools/Configger" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2670,7 +2670,7 @@
     </Project>
 
     <!-- Test Clients -->
-    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.AssetClient" path="OpenSim/Tests/Clients/Assets" type="Exe">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tests.Clients.AssetClient" path="OpenSim/Tests/Clients/Assets" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -2697,7 +2697,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.GridClient" path="OpenSim/Tests/Clients/Grid" type="Exe">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tests.Clients.GridClient" path="OpenSim/Tests/Clients/Grid" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -2724,7 +2724,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.PresenceClient" path="OpenSim/Tests/Clients/Presence" type="Exe">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tests.Clients.PresenceClient" path="OpenSim/Tests/Clients/Presence" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -2751,7 +2751,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.UserAccountClient" path="OpenSim/Tests/Clients/UserAccounts" type="Exe">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tests.Clients.UserAccountClient" path="OpenSim/Tests/Clients/UserAccounts" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -2778,7 +2778,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.InstantantMessage" path="OpenSim/Tests/Clients/InstantMessage" type="Exe">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tests.Clients.InstantantMessage" path="OpenSim/Tests/Clients/InstantMessage" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -2806,7 +2806,7 @@
     </Project>
 
     <!-- Test assemblies -->
-    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2853,7 +2853,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Tests" path="OpenSim/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tests" path="OpenSim/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>
@@ -2876,7 +2876,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.InventoryService.Tests" path="OpenSim/Services/InventoryService/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Services.InventoryService.Tests" path="OpenSim/Services/InventoryService/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -2919,7 +2919,7 @@
     </Project>
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Capabilities.Handlers.Tests" path="OpenSim/Capabilities/Handlers" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Capabilities.Handlers.Tests" path="OpenSim/Capabilities/Handlers" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -2969,7 +2969,7 @@
     </Project>
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Data.Tests" path="OpenSim/Data/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Data.Tests" path="OpenSim/Data/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -3011,7 +3011,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Tests" path="OpenSim/Framework/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Tests" path="OpenSim/Framework/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -3042,7 +3042,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Serialization.Tests" path="OpenSim/Framework/Serialization/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Serialization.Tests" path="OpenSim/Framework/Serialization/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -3073,7 +3073,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers.Tests" path="OpenSim/Framework/Servers/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Servers.Tests" path="OpenSim/Framework/Servers/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>
@@ -3103,7 +3103,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules.Tests" path="OpenSim/Region/CoreModules" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.CoreModules.Tests" path="OpenSim/Region/CoreModules" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -3182,7 +3182,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules.Tests" path="OpenSim/Region/OptionalModules" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.OptionalModules.Tests" path="OpenSim/Region/OptionalModules" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -3243,7 +3243,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Framework.Tests" path="OpenSim/Region/Framework" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Framework.Tests" path="OpenSim/Region/Framework" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -3303,7 +3303,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenCaps.Tests" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ClientStack.LindenCaps.Tests" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../bin/</OutputPath>
@@ -3340,7 +3340,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenUDP.Tests" path="OpenSim/Region/ClientStack/Linden/UDP/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ClientStack.LindenUDP.Tests" path="OpenSim/Region/ClientStack/Linden/UDP/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../../bin/</OutputPath>
@@ -3376,7 +3376,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Tests" path="OpenSim/Region/ScriptEngine" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Tests" path="OpenSim/Region/ScriptEngine" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -3435,7 +3435,7 @@
            TODO: this is kind of lame, we basically build a duplicate
            assembly but with tests added in, just because we can't resolve cross-bin-dir-refs.
       -->
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.OdePlugin.Tests" path="OpenSim/Region/Physics/OdePlugin/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.OdePlugin.Tests" path="OpenSim/Region/Physics/OdePlugin/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../bin/</OutputPath>
@@ -3466,7 +3466,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletSPlugin.Tests" path="OpenSim/Region/Physics/BulletSPlugin/Tests" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.BulletSPlugin.Tests" path="OpenSim/Region/Physics/BulletSPlugin/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../bin/</OutputPath>
@@ -3500,7 +3500,7 @@
     </Project>
 
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers.Tests" path="OpenSim/Server/Handlers" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Server.Handlers.Tests" path="OpenSim/Server/Handlers" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -3546,7 +3546,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Stress" path="OpenSim/Tests/Stress" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tests.Stress" path="OpenSim/Tests/Stress" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -3587,7 +3587,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Performance" path="OpenSim/Tests/Performance" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Tests.Performance" path="OpenSim/Tests/Performance" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
diff --git a/runprebuild.bat b/runprebuild.bat
index 8927e9a..0fd7bbf 100755
--- a/runprebuild.bat
+++ b/runprebuild.bat
@@ -1,4 +1,24 @@
+@echo OFF
+
 bin\Prebuild.exe /target nant
-bin\Prebuild.exe /target vs2008
-echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild opensim.sln > compile.bat
+bin\Prebuild.exe /target vs2010
+
+setlocal ENABLEEXTENSIONS
+set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0"
+set VALUE_NAME=MSBuildToolsPath
+
+FOR /F "usebackq skip=4 tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
+    set ValueName=%%A
+    set ValueType=%%B
+    set ValueValue=%%C
+)
+
+if defined ValueName (
+    @echo Value Name = %ValueName%
+    @echo Value Type = %ValueType%
+    @echo Value Value = %ValueValue%
+) else (
+    @echo %KEY_NAME%\%VALUE_NAME% not found.
+)
 
+@echo %ValueValue%\msbuild opensim.sln > compile.bat
diff --git a/runprebuild2010.bat b/runprebuild2010.bat
deleted file mode 100755
index 8c832b3..0000000
--- a/runprebuild2010.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-bin\Prebuild.exe /target vs2010
-echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild OpenSim.sln > compile.bat
-- 
cgit v1.1


From 9a9abd37ebff245ef67aea2ff0affbf0c4eef62e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 8 Nov 2013 23:16:09 +0000
Subject: minor: remove the bit left in the readme which said .net 3.5
 framework was required

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index fb1e921..2aea328 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,6 @@ need to build OpenSim before running it.
 
 # Running OpenSim on Windows
 
-You will need .NET Framework 3.5 installed to run OpenSimulator.
-
 You will need .NET 4.0 installed to run OpenSimulator.
 
 We recommend that you run OpenSim from a command prompt on Windows in order
-- 
cgit v1.1


From fd24147afa9c7c6e40f50ad0038e7eb1432d1b82 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 9 Nov 2013 00:36:05 +0000
Subject: Add initial test for checking that specifying a parameter in LSL
 state_entry() generates a syntax error.

Same for other events to follow at a later date.
---
 .../Shared/CodeTools/Tests/LSL_EventTests.cs       | 64 ++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
new file mode 100644
index 0000000..2a1c19c
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
@@ -0,0 +1,64 @@
+/*
+ * 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.Text.RegularExpressions;
+using NUnit.Framework;
+using OpenSim.Region.ScriptEngine.Shared.CodeTools;
+using OpenSim.Tests.Common;
+
+namespace OpenSim.Region.ScriptEngine.Shared.Tests
+{
+    public class LSL_EventTests : OpenSimTestCase
+    {
+        [Test]
+        public void TestStateEntryEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            CSCodeGenerator cg = new CSCodeGenerator();
+            cg.Convert("default { state_entry() {} }");
+
+            {
+                bool gotException = false;
+
+                try
+                {
+                    cg.Convert("default { state_entry(integer n) {} }");
+                }
+                catch (Exception )
+                {
+                    gotException = true;
+                }
+
+                Assert.That(gotException, Is.True);
+            }
+        }
+    }
+}
\ No newline at end of file
-- 
cgit v1.1


From 0f16612400ed959146362810fb21d32656c9b844 Mon Sep 17 00:00:00 2001
From: justincc
Date: Wed, 13 Nov 2013 00:00:55 +0000
Subject: Fix runprebuild.bat on Windows 7 systems and later

MS changed Windows 7 "reg query" command to spit out fewer lines in its preamble
Annoyingly there is no option to print raw values and not this preamble.
So now using the Windows find command.
But this has the side effect of stopping this working with Cygwin as it uses its own GNU find command.
Might fix in the future but not simple since Windows find itself is in different locations
---
 runprebuild.bat | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/runprebuild.bat b/runprebuild.bat
index 0fd7bbf..5f75982 100755
--- a/runprebuild.bat
+++ b/runprebuild.bat
@@ -7,18 +7,24 @@ setlocal ENABLEEXTENSIONS
 set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0"
 set VALUE_NAME=MSBuildToolsPath
 
-FOR /F "usebackq skip=4 tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
+rem We have to use find here as req query spits out 4 lines before Windows 7
+rem But 2 lines after Windows 7.  Unfortunately, this screws up cygwin
+rem as it uses its own find command.  This could be fixed but it could be
+rem complex to find the location of find on all windows systems
+FOR /F "usebackq tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul ^| FIND "%VALUE_NAME%"`) DO (
     set ValueName=%%A
     set ValueType=%%B
     set ValueValue=%%C
 )
 
 if defined ValueName (
+    @echo Found msbuild path registry entry
     @echo Value Name = %ValueName%
     @echo Value Type = %ValueType%
     @echo Value Value = %ValueValue%
+    @echo Creating compile.bat
+    @echo %ValueValue%\msbuild opensim.sln > compile.bat
 ) else (
     @echo %KEY_NAME%\%VALUE_NAME% not found.
+    @echo Not creating compile.bat
 )
-
-@echo %ValueValue%\msbuild opensim.sln > compile.bat
-- 
cgit v1.1


From 4563e7e04ae1497178c62b0229aa538bcf6b772d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 13 Nov 2013 00:25:41 +0000
Subject: Get runprebuild.sh to generate a vs2010 for xbuild to work with .NET
 4 rather than vs2008

At least since 2009, Monodevelop has been able to load vs2010 files as well
---
 runprebuild.sh | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/runprebuild.sh b/runprebuild.sh
index d276edb..8c18db6 100755
--- a/runprebuild.sh
+++ b/runprebuild.sh
@@ -22,21 +22,11 @@ case "$1" in
   
   ;;
 
-
-  'vs2008')
-
-    mono bin/Prebuild.exe /target vs2008
-
-  ;;
-
-
   *)
 
     mono bin/Prebuild.exe /target nant
-    mono bin/Prebuild.exe /target vs2008
+    mono bin/Prebuild.exe /target vs2010
 
   ;;
 
-
 esac
-
-- 
cgit v1.1


From 869a23e2234ce9b565249c5850324ca2de2f06ba Mon Sep 17 00:00:00 2001
From: justincc
Date: Wed, 13 Nov 2013 01:07:14 +0000
Subject: Update OpenSim.32BitLaunch.exe and Robust.32BitLaunch.exe to .NET 4
 versions.

Also fixes some issues in associated solution files
---
 .../OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj | 141 +++++++++++++-------
 .../Robust.32BitLaunch/Robust.32BitLaunch.csproj   | 147 +++++++++++++--------
 .../Robust.32BitLaunch/Robust.32BitLaunch.sln      |  40 +++---
 bin/OpenSim.32BitLaunch.exe                        | Bin 5632 -> 5632 bytes
 bin/Robust.32BitLaunch.exe                         | Bin 5632 -> 5632 bytes
 5 files changed, 202 insertions(+), 126 deletions(-)
 mode change 100644 => 100755 bin/Robust.32BitLaunch.exe

diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj b/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
index d829e69..4625c33 100644
--- a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
+++ b/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
@@ -1,58 +1,97 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenSim._32BitLaunch</RootNamespace>
-    <AssemblyName>OpenSim.32BitLaunch</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Region\Application\OpenSim.csproj">
-      <Project>{438A9556-0000-0000-0000-000000000000}</Project>
-      <Name>OpenSim</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>OpenSim._32BitLaunch</RootNamespace>
+    <AssemblyName>OpenSim.32BitLaunch</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" />
+    <Reference Include="OpenSim, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <ExecutableExtension>.exe</ExecutableExtension>
+      <HintPath>..\..\..\bin\OpenSim.exe</HintPath>
+    </Reference>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>
\ No newline at end of file
diff --git a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj
index 481b3f8..9618c08 100644
--- a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj
+++ b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj
@@ -1,62 +1,99 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Robust._32BitLaunch</RootNamespace>
-    <AssemblyName>Robust.32BitLaunch</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\bin\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="Robust, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\bin\Robust.exe</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Robust._32BitLaunch</RootNamespace>
+    <AssemblyName>Robust.32BitLaunch</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\bin\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Robust, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\bin\Robust.exe</HintPath>
+    </Reference>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>
\ No newline at end of file
diff --git a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln
index c7c97b1..a48a2d3 100644
--- a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln
+++ b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln
@@ -1,20 +1,20 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C# Express 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.32BitLaunch", "Robust.32BitLaunch.csproj", "{595D67F3-B413-4A43-8568-5B5930E3B31D}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C# Express 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.32BitLaunch", "Robust.32BitLaunch.csproj", "{595D67F3-B413-4A43-8568-5B5930E3B31D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/bin/OpenSim.32BitLaunch.exe b/bin/OpenSim.32BitLaunch.exe
index cc73c8b..62c14af 100755
Binary files a/bin/OpenSim.32BitLaunch.exe and b/bin/OpenSim.32BitLaunch.exe differ
diff --git a/bin/Robust.32BitLaunch.exe b/bin/Robust.32BitLaunch.exe
old mode 100644
new mode 100755
index 4d2698b..affedb4
Binary files a/bin/Robust.32BitLaunch.exe and b/bin/Robust.32BitLaunch.exe differ
-- 
cgit v1.1


From 7da10850b063d4b31ad48cf3448b9a76bc5bd835 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 13 Nov 2013 23:25:54 +0000
Subject: Fix bug where removing a physical linkset would only decrement the
 Active Objects statistic by 1 instead of by the number of prims removed.

Unlike LL, OpenSimulator currently uses this stat to record the number of prims in the physics simulation, even when they are at rest.
Added regression test for this case.
---
 OpenSim/Region/Framework/Scenes/SceneGraph.cs      |  4 +-
 .../Framework/Scenes/Tests/SceneStatisticsTests.cs | 71 ++++++++++++++++++++++
 2 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 0a5bfd2..1aecce5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -519,12 +519,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         protected internal void AddPhysicalPrim(int number)
         {
-            m_physicalPrim++;
+            m_physicalPrim += number;
         }
 
         protected internal void RemovePhysicalPrim(int number)
         {
-            m_physicalPrim--;
+            m_physicalPrim -= number;
         }
 
         protected internal void AddToScriptLPS(int number)
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs
new file mode 100644
index 0000000..1667002
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Region.Framework.Scenes.Tests
+{
+    [TestFixture]
+    public class SceneStatisticsTests : OpenSimTestCase
+    {
+        private TestScene m_scene;
+
+        [SetUp]
+        public void Init()
+        {
+            m_scene = new SceneHelpers().SetupScene();
+        }
+
+        [Test]
+        public void TestAddRemovePhysicalLinkset()
+        {
+            Assert.That(m_scene.SceneGraph.GetActiveObjectsCount(), Is.EqualTo(0));
+
+            UUID ownerId = TestHelpers.ParseTail(0x1);
+            SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(3, ownerId, "so1", 0x10);
+            so1.ScriptSetPhysicsStatus(true);
+            m_scene.AddSceneObject(so1);
+
+            Assert.That(m_scene.SceneGraph.GetTotalObjectsCount(), Is.EqualTo(3));
+            Assert.That(m_scene.SceneGraph.GetActiveObjectsCount(), Is.EqualTo(3));
+
+            m_scene.DeleteSceneObject(so1, false);
+
+            Assert.That(m_scene.SceneGraph.GetTotalObjectsCount(), Is.EqualTo(0));
+            Assert.That(m_scene.SceneGraph.GetActiveObjectsCount(), Is.EqualTo(0));
+        }
+    }
+}
\ No newline at end of file
-- 
cgit v1.1


From b4932bda2aa5ad371174a544f90fc7a3d012e64a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 15 Nov 2013 00:16:33 +0000
Subject: If a local land ID is given to the "land show" command, then output
 to console the full details of that parcel.

Using "land show" without a land ID still outputs a summary of parcels in the region
---
 .../CoreModules/World/Land/LandManagementModule.cs | 180 ++++++++++++++-------
 1 file changed, 126 insertions(+), 54 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 1789d6d..73c4d6c 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -42,7 +42,6 @@ using OpenSim.Framework.Capabilities;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
@@ -70,7 +69,6 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         private LandChannel landChannel;
         private Scene m_scene;
-        protected Commander m_commander = new Commander("land");
         
         protected IUserManagement m_userManager;
         protected IPrimCountModule m_primCountModule;
@@ -140,14 +138,13 @@ namespace OpenSim.Region.CoreModules.World.Land
             m_scene.EventManager.OnIncomingLandDataFromStorage += EventManagerOnIncomingLandDataFromStorage;
             m_scene.EventManager.OnSetAllowForcefulBan += EventManagerOnSetAllowedForcefulBan;            
             m_scene.EventManager.OnRegisterCaps += EventManagerOnRegisterCaps;
-            m_scene.EventManager.OnPluginConsole += EventManagerOnPluginConsole;
 
             lock (m_scene)
             {
                 m_scene.LandChannel = (ILandChannel)landChannel;
             }
             
-            InstallInterfaces();
+            RegisterCommands();
         }
 
         public void RegionLoaded(Scene scene)
@@ -159,10 +156,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void RemoveRegion(Scene scene)
         {            
-            // TODO: Also release other event manager listeners here
-            
-            m_scene.EventManager.OnPluginConsole -= EventManagerOnPluginConsole;
-            m_scene.UnregisterModuleCommander(m_commander.Name);            
+            // TODO: Release event manager listeners here      
         }
 
 //        private bool OnVerifyUserConnection(ScenePresence scenePresence, out string reason)
@@ -170,30 +164,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 //            ILandObject nearestParcel = m_scene.GetNearestAllowedParcel(scenePresence.UUID, scenePresence.AbsolutePosition.X, scenePresence.AbsolutePosition.Y);
 //            reason = "You are not allowed to enter this sim.";
 //            return nearestParcel != null;
-//        }
-        
-        /// <summary>
-        /// Processes commandline input. Do not call directly.
-        /// </summary>
-        /// <param name="args">Commandline arguments</param>
-        protected void EventManagerOnPluginConsole(string[] args)
-        {
-            if (args[0] == "land")
-            {
-                if (args.Length == 1)
-                {
-                    m_commander.ProcessConsoleCommand("help", new string[0]);
-                    return;
-                }
-
-                string[] tmpArgs = new string[args.Length - 2];
-                int i;
-                for (i = 2; i < args.Length; i++)
-                    tmpArgs[i - 2] = args[i];
-
-                m_commander.ProcessConsoleCommand(args[1], tmpArgs);
-            }
-        }        
+//        }     
 
         void EventManagerOnNewClient(IClientAPI client)
         {
@@ -1872,44 +1843,84 @@ namespace OpenSim.Region.CoreModules.World.Land
                 m_Dialog.SendAlertToUser(remoteClient, "You are not allowed to set your home location in this parcel.");
         }
 
-
-        protected void InstallInterfaces()
+        protected void RegisterCommands()
         {
-            Command clearCommand
-                = new Command("clear", CommandIntentions.COMMAND_HAZARDOUS, ClearCommand, "Clears all the parcels from the region.");
-            Command showCommand 
-                = new Command("show", CommandIntentions.COMMAND_STATISTICAL, ShowParcelsCommand, "Shows all parcels on the region.");
+            ICommands commands = MainConsole.Instance.Commands;
 
-            m_commander.RegisterCommand("clear", clearCommand);
-            m_commander.RegisterCommand("show", showCommand);
+            commands.AddCommand(
+                "Land", false, "land clear",
+                "land clear",
+                "Clear all the parcels from the region.",
+                "Command will ask for confirmation before proceeding.",
+                HandleClearCommand);
 
-            // Add this to our scene so scripts can call these functions
-            m_scene.RegisterModuleCommander(m_commander);
+            commands.AddCommand(
+                "Land", false, "land show",
+                "land show [<local-land-id>]",
+                "Show information about the parcels on the region.",
+                "If no local land ID is given, then summary information about all the parcels is shown.\n"
+                    + "If a local land ID is given then full information about that parcel is shown.",
+                HandleShowCommand);
         }    
         
-        protected void ClearCommand(Object[] args)
+        protected void HandleClearCommand(string module, string[] args)
         {
+            if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_scene))
+                return;
+
             string response = MainConsole.Instance.CmdPrompt(
                 string.Format(
-                    "Are you sure that you want to clear all land parcels from {0} (y or n)", 
-                    m_scene.RegionInfo.RegionName), 
+                    "Are you sure that you want to clear all land parcels from {0} (y or n)", m_scene.Name), 
                 "n");
             
             if (response.ToLower() == "y")
             {
                 Clear(true);
-                MainConsole.Instance.OutputFormat("Cleared all parcels from {0}", m_scene.RegionInfo.RegionName);
+                MainConsole.Instance.OutputFormat("Cleared all parcels from {0}", m_scene.Name);
             }
             else
             {
-                MainConsole.Instance.OutputFormat("Aborting clear of all parcels from {0}", m_scene.RegionInfo.RegionName);
+                MainConsole.Instance.OutputFormat("Aborting clear of all parcels from {0}", m_scene.Name);
             }
         }        
         
-        protected void ShowParcelsCommand(Object[] args)
+        protected void HandleShowCommand(string module, string[] args)
         {
-            StringBuilder report = new StringBuilder();  
-            
+            if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_scene))
+                return;
+
+            StringBuilder report = new StringBuilder(); 
+
+            if (args.Length <= 2)
+            {
+                AppendParcelsSummaryReport(report);
+            }
+            else
+            {
+                int landLocalId;
+
+                if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, args[2], out landLocalId))
+                    return;
+
+                ILandObject lo;
+
+                lock (m_landList)
+                { 
+                    if (!m_landList.TryGetValue(landLocalId, out lo))
+                    {
+                        MainConsole.Instance.OutputFormat("No parcel found with local ID {0}", landLocalId);
+                        return;
+                    }
+                }
+
+                AppendParcelReport(report, lo);
+            }
+
+            MainConsole.Instance.Output(report.ToString());
+        }
+
+        private void AppendParcelsSummaryReport(StringBuilder report)
+        {           
             report.AppendFormat("Land information for {0}\n", m_scene.RegionInfo.RegionName);            
             report.AppendFormat(
                 "{0,-20} {1,-10} {2,-9} {3,-18} {4,-18} {5,-20}\n",
@@ -1931,8 +1942,69 @@ namespace OpenSim.Region.CoreModules.World.Land
                         ld.Name, ld.LocalID, ld.Area, lo.StartPoint, lo.EndPoint, m_userManager.GetUserName(ld.OwnerID));
                 }
             }
-            
-            MainConsole.Instance.Output(report.ToString());
-        }         
+        } 
+
+        private void AppendParcelReport(StringBuilder report, ILandObject lo)
+        {
+            LandData ld = lo.LandData;
+
+            ConsoleDisplayList cdl = new ConsoleDisplayList();
+            cdl.AddRow("Parcel name", ld.Name);
+            cdl.AddRow("Local ID", ld.LocalID);
+            cdl.AddRow("Description", ld.Description);
+            cdl.AddRow("Snapshot ID", ld.SnapshotID);
+            cdl.AddRow("Area", ld.Area);
+            cdl.AddRow("Starts", lo.StartPoint);
+            cdl.AddRow("Ends", lo.EndPoint);
+            cdl.AddRow("AABB Min", ld.AABBMin);
+            cdl.AddRow("AABB Max", ld.AABBMax);
+
+            cdl.AddRow("Owner", m_userManager.GetUserName(ld.OwnerID));
+            cdl.AddRow("Is group owned?", ld.IsGroupOwned);
+            cdl.AddRow("GroupID", ld.GroupID);
+
+            cdl.AddRow("Status", ld.Status);
+            cdl.AddRow("Flags", (ParcelFlags)ld.Flags);           
+
+            cdl.AddRow("Landing Type", (LandingType)ld.LandingType);
+            cdl.AddRow("User Location", ld.UserLocation);
+            cdl.AddRow("User look at", ld.UserLookAt);
+
+            cdl.AddRow("Other clean time", ld.OtherCleanTime);
+
+            cdl.AddRow("Max Prims", lo.GetParcelMaxPrimCount());
+            IPrimCounts pc = lo.PrimCounts;
+            cdl.AddRow("Owner Prims", pc.Owner);
+            cdl.AddRow("Group Prims", pc.Group);
+            cdl.AddRow("Other Prims", pc.Others);
+            cdl.AddRow("Selected Prims", pc.Selected);
+            cdl.AddRow("Total Prims", pc.Total);
+
+            cdl.AddRow("Music URL", ld.MusicURL);
+            cdl.AddRow("Obscure Music", ld.ObscureMusic);
+
+            cdl.AddRow("Media ID", ld.MediaID);
+            cdl.AddRow("Media Autoscale", Convert.ToBoolean(ld.MediaAutoScale));
+            cdl.AddRow("Media URL", ld.MediaURL);
+            cdl.AddRow("Media Type", ld.MediaType);
+            cdl.AddRow("Media Description", ld.MediaDescription);
+            cdl.AddRow("Media Width", ld.MediaWidth);
+            cdl.AddRow("Media Height", ld.MediaHeight);
+            cdl.AddRow("Media Loop", ld.MediaLoop);
+            cdl.AddRow("Obscure Media", ld.ObscureMedia);
+
+            cdl.AddRow("Parcel Category", ld.Category);
+
+            cdl.AddRow("Claim Date", ld.ClaimDate);
+            cdl.AddRow("Claim Price", ld.ClaimPrice);
+            cdl.AddRow("Pass Hours", ld.PassHours);
+            cdl.AddRow("Pass Price", ld.PassPrice);
+
+            cdl.AddRow("Auction ID", ld.AuctionID);
+            cdl.AddRow("Authorized Buyer ID", ld.AuthBuyerID);
+            cdl.AddRow("Sale Price", ld.SalePrice);
+
+            cdl.AddToStringBuilder(report);
+        }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1


From 7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 15 Nov 2013 21:45:08 +0000
Subject: refactor: replace verbose checks with String.IsNullOrEmpty where
 applicable.

Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
---
 CONTRIBUTORS.txt                                                  | 1 +
 OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs       | 4 ++--
 OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs      | 2 +-
 OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs     | 2 +-
 OpenSim/Framework/Configuration/XML/XmlConfiguration.cs           | 2 +-
 OpenSim/Framework/InventoryItemBase.cs                            | 2 +-
 OpenSim/Framework/Monitoring/Stats/Stat.cs                        | 6 +++---
 .../Serialization/External/UserInventoryItemSerializer.cs         | 2 +-
 OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs            | 2 +-
 OpenSim/Framework/TaskInventoryItem.cs                            | 2 +-
 OpenSim/Framework/WebUtil.cs                                      | 2 +-
 OpenSim/Region/Application/OpenSimBase.cs                         | 2 +-
 .../Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs      | 4 ++--
 .../Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs | 2 +-
 .../CoreModules/Framework/UserManagement/UserManagementModule.cs  | 4 ++--
 .../CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs      | 6 +++---
 .../CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs      | 4 ++--
 OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs       | 2 +-
 .../ServiceConnectorsOut/Inventory/HGInventoryBroker.cs           | 2 +-
 OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs   | 4 ++--
 OpenSim/Region/DataSnapshot/DataSnapshotManager.cs                | 2 +-
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs                | 2 +-
 .../Framework/Scenes/Serialization/SceneObjectSerializer.cs       | 4 ++--
 OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs        | 2 +-
 .../OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs   | 8 ++++----
 .../Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs    | 5 ++---
 .../Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs    | 5 ++---
 .../Shared/Api/Implementation/Plugins/SensorRepeat.cs             | 4 ++--
 OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs          | 2 +-
 OpenSim/Services/HypergridService/HGInventoryService.cs           | 2 +-
 30 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 9ae7a31..ef84315 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -109,6 +109,7 @@ what it is today.
 * Kayne
 * Kevin Cozens
 * kinoc (Daxtron Labs)
+* Kira
 * Kitto Flora
 * KittyLiu
 * Kurt Taylor (IBM)
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs
index 59fec6f..653dbac 100644
--- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnector.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Groups
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             if (GroupID != UUID.Zero)
                 sendData["GroupID"] = GroupID.ToString();
-            if (GroupName != null && GroupName != string.Empty)
+            if (!string.IsNullOrEmpty(GroupName))
                 sendData["Name"] = GroupsDataUtils.Sanitize(GroupName);
 
             sendData["RequestingAgentID"] = RequestingAgentID;
@@ -275,7 +275,7 @@ namespace OpenSim.Groups
 
             //m_log.DebugFormat("[XXX]: reply was {0}", reply);
 
-            if (reply == string.Empty || reply == null)
+            if (string.IsNullOrEmpty(reply))
                 return null;
 
             Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs
index 161ca0c..ed41978 100644
--- a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs
+++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs
@@ -120,7 +120,7 @@ namespace OpenSim.Groups
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             if (GroupID != UUID.Zero)
                 sendData["GroupID"] = GroupID.ToString();
-            if (GroupName != null && GroupName != string.Empty)
+            if (!string.IsNullOrEmpty(GroupName))
                 sendData["Name"] = GroupsDataUtils.Sanitize(GroupName);
 
             sendData["RequestingAgentID"] = RequestingAgentID;
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
index 789bf2b..7b3124a 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Capabilities.Handlers
 //                m_log.DebugFormat("[GETTEXTURE]: Received request for texture id {0}", textureID);
                 
                 string[] formats;
-                if (format != null && format != string.Empty)
+                if (!string.IsNullOrEmpty(format))
                 {
                     formats = new string[1] { format.ToLower() };
                 }
diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
index 43162fc..3152a7d 100644
--- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
+++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Framework.Configuration.XML
 
         public void Commit()
         {
-            if (fileName == null || fileName == String.Empty)
+            if (string.IsNullOrEmpty(fileName))
                 return;
 
             if (!Directory.Exists(Util.configDir()))
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 3d45e76..558dfd0 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Framework
         {
             get
             {
-                if (m_creatorData != null && m_creatorData != string.Empty)
+                if (!string.IsNullOrEmpty(m_creatorData))
                     return m_creatorId + ';' + m_creatorData;
                 else
                     return m_creatorId;
diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index 2b34493..e095801 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -231,7 +231,7 @@ namespace OpenSim.Framework.Monitoring
                 Container, 
                 ShortName, 
                 Value, 
-                UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName));
+                string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName));
 
             AppendMeasuresOfInterest(sb);
 
@@ -316,9 +316,9 @@ namespace OpenSim.Framework.Monitoring
                 sb.AppendFormat(
                     ", {0:0.##}{1}/s, {2:0.##}{3}/s", 
                     lastChangeOverTime, 
-                    UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName), 
+                    string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName), 
                     averageChangeOverTime,
-                    UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName));
+                    string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName));
             }
         }
     }
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
index 88f9581..f2a6b8b 100644
--- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
@@ -277,7 +277,7 @@ namespace OpenSim.Framework.Serialization.External
             writer.WriteStartElement("GroupOwned");
             writer.WriteString(inventoryItem.GroupOwned.ToString());
             writer.WriteEndElement();
-            if (options.ContainsKey("creators") && inventoryItem.CreatorData != null && inventoryItem.CreatorData != string.Empty)
+            if (options.ContainsKey("creators") && !string.IsNullOrEmpty(inventoryItem.CreatorData))
                 writer.WriteElementString("CreatorData", inventoryItem.CreatorData);
             else if (options.ContainsKey("home"))
             {
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 76b4257..e1ae74e 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -785,7 +785,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 "[BASE HTTP SERVER]: HTTP IN {0} :{1} {2} content type handler {3} {4} from {5}",
                 RequestNumber,
                 Port,
-                (request.ContentType == null || request.ContentType == "") ? "not set" : request.ContentType,
+                string.IsNullOrEmpty(request.ContentType) ? "not set" : request.ContentType,
                 request.HttpMethod,
                 request.Url.PathAndQuery,
                 request.RemoteIPEndPoint);
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index a06f8e7..307cb75 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Framework
         {
             get
             {
-                if (_creatorData != null && _creatorData != string.Empty)
+                if (!string.IsNullOrEmpty(_creatorData))
                     return _creatorID.ToString() + ';' + _creatorData;
                 else
                     return _creatorID.ToString();
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 706b33f..bcf6af8 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -720,7 +720,7 @@ namespace OpenSim.Framework
         /// <returns></returns>
         public static string[] GetPreferredImageTypes(string accept)
         {
-            if (accept == null || accept == string.Empty)
+            if (string.IsNullOrEmpty(accept))
                 return new string[0];
 
             string[] types = accept.Split(new char[] { ',' });
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index b032e7f..308638c 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -908,7 +908,7 @@ namespace OpenSim
             regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, true);
 
             string newName;
-            if (estateName != null && estateName != "")
+            if (!string.IsNullOrEmpty(estateName))
                 newName = estateName;
             else
                 newName = MainConsole.Instance.CmdPrompt("New estate name", regInfo.EstateSettings.EstateName);
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 31c42d8..f7057fe 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -421,7 +421,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 item.CreatorId = ospResolvedId.ToString();
                 item.CreatorData = string.Empty;
             }
-            else if (item.CreatorData == null || item.CreatorData == String.Empty)
+            else if (string.IsNullOrEmpty(item.CreatorData))
             {
                 item.CreatorId = m_userInfo.PrincipalID.ToString();
 //                item.CreatorIdAsUuid = new UUID(item.CreatorId);
@@ -522,7 +522,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         
                         foreach (SceneObjectGroup sog in sceneObjects)
                             foreach (SceneObjectPart sop in sog.Parts)
-                                if (sop.CreatorData == null || sop.CreatorData == "")
+                                if (string.IsNullOrEmpty(sop.CreatorData))
                                     sop.CreatorID = m_creatorIdForAssetId[assetId];
 
                         if (coa != null)
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
index 144895c..b7a4d1a 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
@@ -174,7 +174,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
         private void AdjustIdentifiers(AssetMetadata meta)
         {
-            if (meta.CreatorID != null && meta.CreatorID != string.Empty)
+            if (!string.IsNullOrEmpty(meta.CreatorID))
             {
                 UUID uuid = UUID.Zero;
                 UUID.TryParse(meta.CreatorID, out uuid);
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index d3926cc..3fb5195 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -466,7 +466,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     return userdata.ServerURLs[serverType].ToString();
                 }
 
-                if (userdata.HomeURL != null && userdata.HomeURL != string.Empty)
+                if (!string.IsNullOrEmpty(userdata.HomeURL))
                 {
                     //m_log.DebugFormat(
                     //    "[USER MANAGEMENT MODULE]: Did not find url type {0} so requesting urls from '{1}' for {2}",
@@ -552,7 +552,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
             if (oldUser != null)
             {
-                if (creatorData == null || creatorData == String.Empty)
+                if (string.IsNullOrEmpty(creatorData))
                 {
                     //ignore updates without creator data
                     return;
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 1a62405..c3a8afd 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -460,9 +460,9 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                         Request.Headers.Add(HttpCustomHeaders[i],
                                             HttpCustomHeaders[i+1]);
                 }
-                if (proxyurl != null && proxyurl.Length > 0)
+                if (!string.IsNullOrEmpty(proxyurl))
                 {
-                    if (proxyexcepts != null && proxyexcepts.Length > 0)
+                    if (!string.IsNullOrEmpty(proxyexcepts))
                     {
                         string[] elist = proxyexcepts.Split(';');
                         Request.Proxy = new WebProxy(proxyurl, true, elist);
@@ -483,7 +483,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                 }
 
                 // Encode outbound data
-                if (OutboundBody != null && OutboundBody.Length > 0)
+                if (!string.IsNullOrEmpty(OutboundBody))
                 {
                     byte[] data = Util.UTF8.GetBytes(OutboundBody);
 
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index 65737fa..baf9f2f 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -161,9 +161,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
         {
             WebRequest request = HttpWebRequest.Create(url);
             
-            if (m_proxyurl != null && m_proxyurl.Length > 0) 
+            if (!string.IsNullOrEmpty(m_proxyurl)) 
             {
-                if (m_proxyexcepts != null && m_proxyexcepts.Length > 0) 
+                if (!string.IsNullOrEmpty(m_proxyexcepts)) 
                 {
                     string[] elist = m_proxyexcepts.Split(';');
                     request.Proxy = new WebProxy(m_proxyurl, true, elist);
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index cbffca7..c6e05b1 100644
--- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -677,7 +677,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
             // if not, use as method name
             UUID parseUID;
             string mName = "llRemoteData";
-            if ((Channel != null) && (Channel != ""))
+            if (!string.IsNullOrEmpty(Channel))
                 if (!UUID.TryParse(Channel, out parseUID))
                     mName = Channel;
                 else
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index 58576d1..77a3c82 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -259,7 +259,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                 if (sp == null)
                 {
                     inventoryURL = UserManagementModule.GetUserServerURL(userID, "InventoryServerURI");
-                    if (inventoryURL != null && inventoryURL != string.Empty)
+                    if (!string.IsNullOrEmpty(inventoryURL))
                     {
                         inventoryURL = inventoryURL.Trim(new char[] { '/' });
                         m_InventoryURLs.Add(userID, inventoryURL);
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 32d245f..d451b9e 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -464,7 +464,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 // or creator data is present.  Otherwise, use the estate owner instead.
                 foreach (SceneObjectPart part in sceneObject.Parts)
                 {
-                    if (part.CreatorData == null || part.CreatorData == string.Empty)
+                    if (string.IsNullOrEmpty(part.CreatorData))
                     {
                         if (!ResolveUserUuid(scene, part.CreatorID))
                             part.CreatorID = scene.RegionInfo.EstateSettings.EstateOwner;
@@ -498,7 +498,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                                 kvp.Value.OwnerID = scene.RegionInfo.EstateSettings.EstateOwner;
                             }
 
-                            if (kvp.Value.CreatorData == null || kvp.Value.CreatorData == string.Empty)
+                            if (string.IsNullOrEmpty(kvp.Value.CreatorData))
                             {
                                 if (!ResolveUserUuid(scene, kvp.Value.CreatorID))
                                     kvp.Value.CreatorID = scene.RegionInfo.EstateSettings.EstateOwner;
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index dd48dd5..0c0a7aa 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -307,7 +307,7 @@ namespace OpenSim.Region.DataSnapshot
             XmlNode regiondata = requestedSnap.CreateNode(XmlNodeType.Element, "regiondata", "");
             try
             {
-                if (regionName == null || regionName == "")
+                if (string.IsNullOrEmpty(regionName))
                 {
                     XmlNode timerblock = requestedSnap.CreateNode(XmlNodeType.Element, "expire", "");
                     timerblock.InnerText = m_period.ToString();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 9e6c25d..dcbb509 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -473,7 +473,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             get
             {
-                if (CreatorData != null && CreatorData != string.Empty)
+                if (!string.IsNullOrEmpty(CreatorData))
                     return CreatorID.ToString() + ';' + CreatorData;
                 else
                     return CreatorID.ToString();
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 3ea936c..f07dee9 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1223,7 +1223,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
             WriteUUID(writer, "CreatorID", sop.CreatorID, options);
 
-            if (sop.CreatorData != null && sop.CreatorData != string.Empty)
+            if (!string.IsNullOrEmpty(sop.CreatorData))
                 writer.WriteElementString("CreatorData", sop.CreatorData);
             else if (options.ContainsKey("home"))
             {
@@ -1396,7 +1396,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
                     WriteUUID(writer, "CreatorID", item.CreatorID, options);
 
-                    if (item.CreatorData != null && item.CreatorData != string.Empty)
+                    if (!string.IsNullOrEmpty(item.CreatorData))
                         writer.WriteElementString("CreatorData", item.CreatorData);
                     else if (options.ContainsKey("home"))
                     {
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
index 5a37fad..b5d9fda 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
@@ -461,7 +461,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
 
             string result = instr;
 
-            if (result == null || result.Length == 0)
+            if (string.IsNullOrEmpty(result))
                 return result;
 
             // Repeatedly scan the string until all possible
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index cdab116..b4fae9d 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -822,11 +822,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
         {
             string requrl = String.Format(m_vivoxChannelPath, m_vivoxServer, "create", channelId, m_authToken);
 
-            if (parent != null && parent != String.Empty)
+            if (!string.IsNullOrEmpty(parent))
             {
                 requrl = String.Format("{0}&chan_parent={1}", requrl, parent);
             }
-            if (description != null && description != String.Empty)
+            if (!string.IsNullOrEmpty(description))
             {
                 requrl = String.Format("{0}&chan_desc={1}", requrl, description);
             }
@@ -862,7 +862,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             //     requrl = String.Format("{0}&chan_parent={1}", requrl, parent);
             // }
 
-            if (description != null && description != String.Empty)
+            if (!string.IsNullOrEmpty(description))
             {
                 requrl = String.Format("{0}&chan_desc={1}", requrl, description);
             }
@@ -1047,7 +1047,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
         private XmlElement VivoxDeleteChannel(string parent, string channelid)
         {
             string requrl = String.Format(m_vivoxChannelDel, m_vivoxServer, "delete", channelid, m_authToken);
-            if (parent != null && parent != String.Empty)
+            if (!string.IsNullOrEmpty(parent))
             {
                 requrl = String.Format("{0}&chan_parent={1}", requrl, parent);
             }
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
index 7bae8f7..8095b28 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
@@ -212,8 +212,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]: Initializing {0}", this.Name);
 
                 m_groupsServerURI = groupsConfig.GetString("GroupsServerURI", string.Empty);
-                if ((m_groupsServerURI == null) ||
-                    (m_groupsServerURI == string.Empty))
+                if (string.IsNullOrEmpty(m_groupsServerURI))
                 {
                     m_log.ErrorFormat("Please specify a valid Simian Server for GroupsServerURI in OpenSim.ini, [Groups]");
                     m_connectorEnabled = false;
@@ -438,7 +437,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     return null;
                 }
             } 
-            else if ((groupName != null) && (groupName != string.Empty))
+            else if (!string.IsNullOrEmpty(groupName))
             {
                 if (!SimianGetFirstGenericEntry("Group", groupName, out groupID, out GroupInfoMap))
                 {
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index 71b24ac..e28d0c2 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -168,8 +168,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 m_log.DebugFormat("[XMLRPC-GROUPS-CONNECTOR]: Initializing {0}", this.Name);
 
                 m_groupsServerURI = groupsConfig.GetString("GroupsServerURI", string.Empty);
-                if ((m_groupsServerURI == null) ||
-                    (m_groupsServerURI == string.Empty))
+                if (string.IsNullOrEmpty(m_groupsServerURI))
                 {
                     m_log.ErrorFormat("Please specify a valid URL for GroupsServerURI in OpenSim.ini, [Groups]");
                     m_connectorEnabled = false;
@@ -354,7 +353,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             {
                 param["GroupID"] = GroupID.ToString();
             }
-            if ((GroupName != null) && (GroupName != string.Empty))
+            if (!string.IsNullOrEmpty(GroupName))
             {
                 param["Name"] = GroupName.ToString();
             }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 6e74227..64dc2e2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -367,7 +367,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
             Vector3 ZeroVector = new Vector3(0, 0, 0);
 
-            bool nameSearch = (ts.name != null && ts.name != "");
+            bool nameSearch = !string.IsNullOrEmpty(ts.name);
 
             foreach (EntityBase ent in Entities)
             {
@@ -605,7 +605,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                     return sensedEntities;
                 senseEntity(sp);
             }
-            else if (ts.name != null && ts.name != "")
+            else if (!string.IsNullOrEmpty(ts.name))
             {
                 ScenePresence sp;
                 // Try lookup by name will return if/when found
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 87f7189..a1b8d85 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -618,7 +618,7 @@ namespace SecondLife
                         // error log.
                         if (results.Errors.Count > 0)
                         {
-                            if (!retried && (results.Errors[0].FileName == null || results.Errors[0].FileName == String.Empty) &&
+                            if (!retried && string.IsNullOrEmpty(results.Errors[0].FileName) &&
                                 results.Errors[0].Line == 0)
                             {
                                 // System.Console.WriteLine("retrying failed compilation");
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs
index 326e68d..3233caf 100644
--- a/OpenSim/Services/HypergridService/HGInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGInventoryService.cs
@@ -298,7 +298,7 @@ namespace OpenSim.Services.HypergridService
                 UserAccount user = m_Cache.GetUser(it.CreatorId);
 
                 // Adjust the creator data
-                if (user != null && it != null && (it.CreatorData == null || it.CreatorData == string.Empty))
+                if (user != null && it != null && string.IsNullOrEmpty(it.CreatorData))
                     it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName;
             }
             return it;
-- 
cgit v1.1


From f63fd81a686ed1ef33d524e28d511ad991b8dbad Mon Sep 17 00:00:00 2001
From: dahlia
Date: Fri, 15 Nov 2013 14:40:38 -0800
Subject: update libomv to 1538d3088e79ff0a9abea6905b487755b6890a85 in hope
 that it fixes some bulletsim issues on linux

---
 bin/OpenMetaverse.StructuredData.dll | Bin 106496 -> 106496 bytes
 bin/OpenMetaverse.dll                | Bin 1806336 -> 1806336 bytes
 bin/OpenMetaverseTypes.dll           | Bin 110592 -> 110592 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index 8b920bd..d980531 100755
Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 30ad7e5..4b558e7 100755
Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index 49a0f3b..5add2f1 100755
Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ
-- 
cgit v1.1


From 346644016c529db6ed63aa866c7cf91cec1b635f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 15 Nov 2013 23:10:59 +0000
Subject: If HGSuitcaseInventoryService.GetRootFolder() fails to create a
 suitcase folder when required, then don't try to store the null and perform
 other operations on it.

Patch from http://opensimulator.org/mantis/view.php?id=6844
Thanks Kira.
---
 .../HypergridService/HGSuitcaseInventoryService.cs    | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index 0601ece..835cde3 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -213,16 +213,23 @@ namespace OpenSim.Services.HypergridService
                 // In the DB we tag it as type 100, but we use -1 (Unknown) outside
                 suitcase = CreateFolder(principalID, root.folderID, 100, "My Suitcase");
                 if (suitcase == null)
+                {
                     m_log.ErrorFormat("[HG SUITCASE INVENTORY SERVICE]: Unable to create suitcase folder");
-                m_Database.StoreFolder(suitcase);
+                }
+                else
+                {
+                    m_Database.StoreFolder(suitcase);
 
-                // Create System folders
-                CreateSystemFolders(principalID, suitcase.folderID);
-            }
+                    // Create System folders
+                    CreateSystemFolders(principalID, suitcase.folderID);
 
-            SetAsNormalFolder(suitcase);
+                    SetAsNormalFolder(suitcase);
 
-            return ConvertToOpenSim(suitcase);
+                    return ConvertToOpenSim(suitcase);
+                }
+            }
+
+            return null;
         }
 
         protected void CreateSystemFolders(UUID principalID, UUID rootID)
-- 
cgit v1.1


From ecfb78dd167c9c2c4509ca4bcf74d0c801641f39 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 15 Nov 2013 23:16:12 +0000
Subject: minor: Use default(UUID) in rez attachment failure error logging
 rather than (UUID)null

Patch from http://opensimulator.org/mantis/view.php?id=6843
Thanks Kira.
---
 OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index d0e0b35..1ca142e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -321,7 +321,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 }
                 catch (Exception e)
                 {
-                    UUID agentId = (sp.ControllingClient == null) ? (UUID)null : sp.ControllingClient.AgentId;
+                    UUID agentId = (sp.ControllingClient == null) ? default(UUID) : 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, attachmentPt, agentId, e.Message, e.StackTrace);
                 }
-- 
cgit v1.1


From 92fbe675b58bf03ecd14b9244e044d9df9bb016b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 16 Nov 2013 00:05:49 +0000
Subject: minor: Add OpenSim.v11.suo to .gitignore file.

This is generated if a vs2010 OpenSim.sln is loaded into vs2012
As per http://opensimulator.org/mantis/view.php?id=6839
---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index f0a5487..fce3a05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,6 +66,10 @@ Examples/*.dll
 OpenSim.build
 OpenSim.sln
 OpenSim.suo
+
+# This is generated if a vs2010 OpenSim.sln is loaded into vs2012
+OpenSim.v11.suo
+
 OpenSim.userprefs
 Prebuild/Prebuild.build
 Prebuild/Prebuild.sln
-- 
cgit v1.1


From b58a4741051cd4745049d06455925c7e1c9f2142 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 16 Nov 2013 00:21:12 +0000
Subject: Ignore *.suo and *.user as these are user specific preference files
 from Visual Studio

http://stackoverflow.com/questions/72298/should-i-add-the-visual-studio-suo-and-user-files-to-source-control
---
 .gitignore | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index fce3a05..aa3e024 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,12 @@
 *.pidb
 *.dll.build
 *.dll
+
+# Ignore .user and .suo files as these are user preference specific
+# http://stackoverflow.com/questions/72298/should-i-add-the-visual-studio-suo-and-user-files-to-source-control
+*.suo
+*.user
+
 *.VisualState.xml
 */*/obj
 */*/*/obj
@@ -65,11 +71,6 @@ bin/crashes/
 Examples/*.dll
 OpenSim.build
 OpenSim.sln
-OpenSim.suo
-
-# This is generated if a vs2010 OpenSim.sln is loaded into vs2012
-OpenSim.v11.suo
-
 OpenSim.userprefs
 Prebuild/Prebuild.build
 Prebuild/Prebuild.sln
-- 
cgit v1.1


From d728c1beb27dfd3a31f9ad084d1c4094b27b65f9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 16 Nov 2013 01:25:25 +0000
Subject: refactor LSL_EventTests.TestStateEntryEvent into single method to
 test compile

---
 .../Shared/CodeTools/Tests/LSL_EventTests.cs       | 31 ++++++++++++----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
index 2a1c19c..a297309 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
@@ -36,29 +36,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 {
     public class LSL_EventTests : OpenSimTestCase
     {
+        CSCodeGenerator m_cg = new CSCodeGenerator();
+
         [Test]
         public void TestStateEntryEvent()
         {
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            CSCodeGenerator cg = new CSCodeGenerator();
-            cg.Convert("default { state_entry() {} }");
-
-            {
-                bool gotException = false;
+            TestCompile("default { state_entry() {} }", false);
+            TestCompile("default { state_entry(integer n) {} }", true);
+        }
 
-                try
-                {
-                    cg.Convert("default { state_entry(integer n) {} }");
-                }
-                catch (Exception )
-                {
-                    gotException = true;
-                }
+        private void TestCompile(string script, bool expectException)
+        {
+            bool gotException = false;
 
-                Assert.That(gotException, Is.True);
+            try
+            {
+                m_cg.Convert(script);
+            }
+            catch (Exception)
+            {
+                gotException = true;
             }
+
+            Assert.That(gotException, Is.EqualTo(expectException));
         }
     }
 }
\ No newline at end of file
-- 
cgit v1.1


From 62006baaef46cc11816a90471454f256e3c8dd82 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 16 Nov 2013 01:30:23 +0000
Subject: Make state_exit, moving_end, moving_start, not_at_rot_target,
 not_at_target and timer LSL events generate a syntax error if inappropriately
 given arguments.

This matches behaviour seen on the LL grid and a previous change for state_entry.
These are all the events which should take no arguments
---
 .../Shared/CodeTools/Tests/LSL_EventTests.cs       |    60 +
 .../ScriptEngine/Shared/CodeTools/lsl.parser.cs    | 14945 ++++++++++---------
 2 files changed, 7539 insertions(+), 7466 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
index a297309..6c51060 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
@@ -39,6 +39,46 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         CSCodeGenerator m_cg = new CSCodeGenerator();
 
         [Test]
+        public void TestMovingEndEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestCompile("default { moving_end() {} }", false);
+            TestCompile("default { moving_end(integer n) {} }", true);
+        }
+
+        [Test]
+        public void TestMovingStartEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestCompile("default { moving_start() {} }", false);
+            TestCompile("default { moving_start(integer n) {} }", true);
+        }
+
+        [Test]
+        public void TestNotAtRotTargetEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestCompile("default { not_at_rot_target() {} }", false);
+            TestCompile("default { not_at_rot_target(integer n) {} }", true);
+        }
+
+        [Test]
+        public void TestNotAtTargetEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestCompile("default { not_at_target() {} }", false);
+            TestCompile("default { not_at_target(integer n) {} }", true);
+        }
+
+        [Test]
         public void TestStateEntryEvent()
         {
             TestHelpers.InMethod();
@@ -48,6 +88,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TestCompile("default { state_entry(integer n) {} }", true);
         }
 
+        [Test]
+        public void TestStateExitEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestCompile("default { state_exit() {} }", false);
+            TestCompile("default { state_exit(integer n) {} }", true);
+        }
+
+        [Test]
+        public void TestTimerEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestCompile("default { timer() {} }", false);
+            TestCompile("default { timer(integer n) {} }", true);
+        }
+
         private void TestCompile(string script, bool expectException)
         {
             bool gotException = false;
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
index 1e3c6f6..96dcea9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
@@ -130,14 +130,14 @@ public class StateEvent : SYMBOL{
 public override string yyname { get { return "StateEvent"; }}
 public override int yynum { get { return 103; }}
 public StateEvent(Parser yyp):base(yyp){}}
-//%+StateEntryStateEvent+104
-public class StateEntryStateEvent : StateEvent{
- public  StateEntryStateEvent (Parser yyp, string  name , CompoundStatement  cs ):base(((LSLSyntax
+//%+VoidArgStateEvent+104
+public class VoidArgStateEvent : StateEvent{
+ public  VoidArgStateEvent (Parser yyp, string  name , CompoundStatement  cs ):base(((LSLSyntax
 )yyp), name , cs ){}
 
-public override string yyname { get { return "StateEntryStateEvent"; }}
+public override string yyname { get { return "VoidArgStateEvent"; }}
 public override int yynum { get { return 104; }}
-public StateEntryStateEvent(Parser yyp):base(yyp){}}
+public VoidArgStateEvent(Parser yyp):base(yyp){}}
 //%+ArgumentDeclarationList+105
 public class ArgumentDeclarationList : SYMBOL{
  public  ArgumentDeclarationList (Parser yyp, Declaration  d ):base(((LSLSyntax
@@ -193,14 +193,14 @@ public class Event : SYMBOL{
 public override string yyname { get { return "Event"; }}
 public override int yynum { get { return 108; }}
 public Event(Parser yyp):base(yyp){}}
-//%+EntryEvent+109
-public class EntryEvent : Event{
- public  EntryEvent (Parser yyp, string  text ):base(((LSLSyntax
+//%+VoidArgEvent+109
+public class VoidArgEvent : Event{
+ public  VoidArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
-public override string yyname { get { return "EntryEvent"; }}
+public override string yyname { get { return "VoidArgEvent"; }}
 public override int yynum { get { return 109; }}
-public EntryEvent(Parser yyp):base(yyp){}}
+public VoidArgEvent(Parser yyp):base(yyp){}}
 //%+CompoundStatement+110
 public class CompoundStatement : SYMBOL{
  public  CompoundStatement (Parser yyp):base(((LSLSyntax
@@ -810,14 +810,14 @@ public class StateBody_2 : StateBody {
 
 public class StateBody_3 : StateBody {
   public StateBody_3(Parser yyq):base(yyq,
-	((StateEntryStateEvent)(yyq.StackAt(0).m_value))
+	((VoidArgStateEvent)(yyq.StackAt(0).m_value))
 	){}}
 
 public class StateBody_4 : StateBody {
   public StateBody_4(Parser yyq):base(yyq,
 	((StateBody)(yyq.StackAt(1).m_value))
 	, 
-	((StateEntryStateEvent)(yyq.StackAt(0).m_value))
+	((VoidArgStateEvent)(yyq.StackAt(0).m_value))
 	){}}
 
 public class StateEvent_1 : StateEvent {
@@ -829,12 +829,12 @@ public class StateEvent_1 : StateEvent {
 	((CompoundStatement)(yyq.StackAt(0).m_value))
 	){}}
 
-public class StateEntryStateEvent_1 : StateEntryStateEvent {
-  public StateEntryStateEvent_1(Parser yyq):base(yyq,
-	((EntryEvent)(yyq.StackAt(3).m_value))
+public class VoidArgStateEvent_1 : VoidArgStateEvent {
+  public VoidArgStateEvent_1(Parser yyq):base(yyq,
+	((VoidArgEvent)(yyq.StackAt(3).m_value))
 	.yytext, 
 	((CompoundStatement)(yyq.StackAt(0).m_value))
-	  ){}}
+	){}}
 
 public class ArgumentDeclarationList_1 : ArgumentDeclarationList {
   public ArgumentDeclarationList_1(Parser yyq):base(yyq,
@@ -1900,87 +1900,87 @@ public class Event_17 : Event {
 
 public class Event_18 : Event {
   public Event_18(Parser yyq):base(yyq,
-	((MOVING_END_EVENT)(yyq.StackAt(0).m_value))
+	((NO_SENSOR_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_19 : Event {
   public Event_19(Parser yyq):base(yyq,
-	((MOVING_START_EVENT)(yyq.StackAt(0).m_value))
+	((OBJECT_REZ_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_20 : Event {
   public Event_20(Parser yyq):base(yyq,
-	((NO_SENSOR_EVENT)(yyq.StackAt(0).m_value))
+	((ON_REZ_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_21 : Event {
   public Event_21(Parser yyq):base(yyq,
-	((NOT_AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value))
+	((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_22 : Event {
   public Event_22(Parser yyq):base(yyq,
-	((NOT_AT_TARGET_EVENT)(yyq.StackAt(0).m_value))
+	((RUN_TIME_PERMISSIONS_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_23 : Event {
   public Event_23(Parser yyq):base(yyq,
-	((OBJECT_REZ_EVENT)(yyq.StackAt(0).m_value))
+	((SENSOR_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_24 : Event {
   public Event_24(Parser yyq):base(yyq,
-	((ON_REZ_EVENT)(yyq.StackAt(0).m_value))
+	((TOUCH_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_25 : Event {
   public Event_25(Parser yyq):base(yyq,
-	((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value))
+	((TOUCH_END_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_26 : Event {
   public Event_26(Parser yyq):base(yyq,
-	((RUN_TIME_PERMISSIONS_EVENT)(yyq.StackAt(0).m_value))
+	((TOUCH_START_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_27 : Event {
   public Event_27(Parser yyq):base(yyq,
-	((SENSOR_EVENT)(yyq.StackAt(0).m_value))
+	((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_28 : Event {
-  public Event_28(Parser yyq):base(yyq,
-	((STATE_EXIT_EVENT)(yyq.StackAt(0).m_value))
+public class VoidArgEvent_1 : VoidArgEvent {
+  public VoidArgEvent_1(Parser yyq):base(yyq,
+	((STATE_ENTRY_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_29 : Event {
-  public Event_29(Parser yyq):base(yyq,
-	((TIMER_EVENT)(yyq.StackAt(0).m_value))
+public class VoidArgEvent_2 : VoidArgEvent {
+  public VoidArgEvent_2(Parser yyq):base(yyq,
+	((STATE_EXIT_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_30 : Event {
-  public Event_30(Parser yyq):base(yyq,
-	((TOUCH_EVENT)(yyq.StackAt(0).m_value))
+public class VoidArgEvent_3 : VoidArgEvent {
+  public VoidArgEvent_3(Parser yyq):base(yyq,
+	((MOVING_END_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_31 : Event {
-  public Event_31(Parser yyq):base(yyq,
-	((TOUCH_END_EVENT)(yyq.StackAt(0).m_value))
+public class VoidArgEvent_4 : VoidArgEvent {
+  public VoidArgEvent_4(Parser yyq):base(yyq,
+	((MOVING_START_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_32 : Event {
-  public Event_32(Parser yyq):base(yyq,
-	((TOUCH_START_EVENT)(yyq.StackAt(0).m_value))
+public class VoidArgEvent_5 : VoidArgEvent {
+  public VoidArgEvent_5(Parser yyq):base(yyq,
+	((NOT_AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_33 : Event {
-  public Event_33(Parser yyq):base(yyq,
-	((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value))
+public class VoidArgEvent_6 : VoidArgEvent {
+  public VoidArgEvent_6(Parser yyq):base(yyq,
+	((NOT_AT_TARGET_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class EntryEvent_1 : EntryEvent {
-  public EntryEvent_1(Parser yyq):base(yyq,
-	((STATE_ENTRY_EVENT)(yyq.StackAt(0).m_value))
+public class VoidArgEvent_7 : VoidArgEvent {
+  public VoidArgEvent_7(Parser yyq):base(yyq,
+	((TIMER_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 public class yyLSLSyntax
 : YyParser {
@@ -2572,80 +2572,124 @@ public yyLSLSyntax
 18,1,242,177,2,
 0,1,2471,350,18,
 1,2471,351,20,352,
-4,34,83,0,84,
-0,65,0,84,0,
-69,0,95,0,69,
-0,78,0,84,0,
-82,0,89,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,85,1,1,
-2,0,1,2472,353,
-18,1,2472,354,20,
-355,4,36,72,0,
-84,0,84,0,80,
-0,95,0,82,0,
-69,0,81,0,85,
-0,69,0,83,0,
+4,22,84,0,73,
+0,77,0,69,0,
+82,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+87,1,1,2,0,
+1,2472,353,18,1,
+2472,354,20,355,4,
+38,78,0,79,0,
+84,0,95,0,65,
+0,84,0,95,0,
+84,0,65,0,82,
+0,71,0,69,0,
 84,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
-91,1,1,2,0,
+79,1,1,2,0,
 1,2473,356,18,1,
 2473,357,20,358,4,
-34,84,0,79,0,
-85,0,67,0,72,
+46,78,0,79,0,
+84,0,95,0,65,
+0,84,0,95,0,
+82,0,79,0,84,
+0,95,0,84,0,
+65,0,82,0,71,
+0,69,0,84,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,78,1,
+1,2,0,1,2474,
+359,18,1,2474,360,
+20,361,4,36,77,
+0,79,0,86,0,
+73,0,78,0,71,
 0,95,0,83,0,
 84,0,65,0,82,
 0,84,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,89,1,1,2,
-0,1,2474,359,18,
-1,2474,360,20,361,
-4,30,84,0,79,
-0,85,0,67,0,
-72,0,95,0,69,
-0,78,0,68,0,
+1,76,1,1,2,
+0,1,2475,362,18,
+1,2475,363,20,364,
+4,32,77,0,79,
+0,86,0,73,0,
+78,0,71,0,95,
+0,69,0,78,0,
+68,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+75,1,1,2,0,
+1,2476,365,18,1,
+2476,366,20,367,4,
+32,83,0,84,0,
+65,0,84,0,69,
+0,95,0,69,0,
+88,0,73,0,84,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,86,
+1,1,2,0,1,
+2477,368,18,1,2477,
+369,20,370,4,34,
+83,0,84,0,65,
+0,84,0,69,0,
+95,0,69,0,78,
+0,84,0,82,0,
+89,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+85,1,1,2,0,
+1,2478,371,18,1,
+2478,372,20,373,4,
+36,72,0,84,0,
+84,0,80,0,95,
+0,82,0,69,0,
+81,0,85,0,69,
+0,83,0,84,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,90,1,
-1,2,0,1,2475,
-362,18,1,2475,363,
-20,364,4,22,84,
+84,0,1,91,1,
+1,2,0,1,2479,
+374,18,1,2479,375,
+20,376,4,34,84,
 0,79,0,85,0,
 67,0,72,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,88,1,1,
-2,0,1,2476,365,
-18,1,2476,366,20,
-367,4,22,84,0,
-73,0,77,0,69,
-0,82,0,95,0,
+0,83,0,84,0,
+65,0,82,0,84,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,89,
+1,1,2,0,1,
+2480,377,18,1,2480,
+378,20,379,4,30,
+84,0,79,0,85,
+0,67,0,72,0,
+95,0,69,0,78,
+0,68,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,87,1,1,2,
-0,1,2477,368,18,
-1,2477,369,20,370,
-4,32,83,0,84,
-0,65,0,84,0,
-69,0,95,0,69,
-0,88,0,73,0,
-84,0,95,0,69,
+1,90,1,1,2,
+0,1,2481,380,18,
+1,2481,381,20,382,
+4,22,84,0,79,
+0,85,0,67,0,
+72,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
-86,1,1,2,0,
-1,2478,371,18,1,
-2478,372,20,373,4,
+88,1,1,2,0,
+1,2482,383,18,1,
+2482,384,20,385,4,
 24,83,0,69,0,
 78,0,83,0,79,
 0,82,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
 1,84,1,1,2,
-0,1,2479,374,18,
-1,2479,375,20,376,
+0,1,2483,386,18,
+1,2483,387,20,388,
 4,52,82,0,85,
 0,78,0,95,0,
 84,0,73,0,77,
@@ -2658,1581 +2702,1550 @@ public yyLSLSyntax
 0,86,0,69,0,
 78,0,84,0,1,
 83,1,1,2,0,
-1,2480,377,18,1,
-2480,378,20,379,4,
-34,82,0,69,0,
-77,0,79,0,84,
-0,69,0,95,0,
-68,0,65,0,84,
-0,65,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,82,1,1,2,
-0,1,2481,380,18,
-1,2481,381,20,382,
-4,24,79,0,78,
-0,95,0,82,0,
-69,0,90,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,81,1,1,
-2,0,1,2482,383,
-18,1,2482,384,20,
-385,4,32,79,0,
-66,0,74,0,69,
-0,67,0,84,0,
-95,0,82,0,69,
-0,90,0,95,0,
-69,0,86,0,69,
+1,256,389,18,1,
+256,390,20,391,4,
+14,80,0,69,0,
+82,0,67,0,69,
 0,78,0,84,0,
-1,80,1,1,2,
-0,1,2483,386,18,
-1,2483,387,20,388,
-4,38,78,0,79,
-0,84,0,95,0,
-65,0,84,0,95,
-0,84,0,65,0,
-82,0,71,0,69,
+1,22,1,1,2,
+0,1,1371,392,18,
+1,1371,222,2,0,
+1,2486,393,18,1,
+2486,394,20,395,4,
+32,79,0,66,0,
+74,0,69,0,67,
 0,84,0,95,0,
+82,0,69,0,90,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,80,
+1,1,2,0,1,
+2487,396,18,1,2487,
+397,20,398,4,30,
+78,0,79,0,95,
+0,83,0,69,0,
+78,0,83,0,79,
+0,82,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,79,1,1,2,
-0,1,256,389,18,
-1,256,390,20,391,
-4,14,80,0,69,
-0,82,0,67,0,
+1,77,1,1,2,
+0,1,1931,399,18,
+1,1931,269,2,0,
+1,1932,400,18,1,
+1932,401,20,402,4,
+4,73,0,70,0,
+1,42,1,1,2,
+0,1,262,403,18,
+1,262,177,2,0,
+1,1377,404,18,1,
+1377,177,2,0,1,
+2492,405,18,1,2492,
+406,20,407,4,48,
+76,0,65,0,78,
+0,68,0,95,0,
+67,0,79,0,76,
+0,76,0,73,0,
+83,0,73,0,79,
+0,78,0,95,0,
+69,0,78,0,68,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,70,
+1,1,2,0,1,
+1876,408,18,1,1876,
+135,2,0,1,2494,
+409,18,1,2494,410,
+20,411,4,38,72,
+0,84,0,84,0,
+80,0,95,0,82,
+0,69,0,83,0,
+80,0,79,0,78,
+0,83,0,69,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,68,1,
+1,2,0,1,2495,
+412,18,1,2495,413,
+20,414,4,22,69,
+0,77,0,65,0,
+73,0,76,0,95,
+0,69,0,86,0,
 69,0,78,0,84,
-0,1,22,1,1,
-2,0,1,1371,392,
-18,1,1371,222,2,
-0,1,2486,393,18,
-1,2486,394,20,395,
-4,36,77,0,79,
-0,86,0,73,0,
-78,0,71,0,95,
-0,83,0,84,0,
-65,0,82,0,84,
+0,1,67,1,1,
+2,0,1,1939,415,
+18,1,1939,177,2,
+0,1,2497,416,18,
+1,2497,417,20,418,
+4,26,67,0,79,
+0,78,0,84,0,
+82,0,79,0,76,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,76,
+0,84,0,1,65,
 1,1,2,0,1,
-2487,396,18,1,2487,
-397,20,398,4,32,
-77,0,79,0,86,
-0,73,0,78,0,
-71,0,95,0,69,
+827,419,18,1,827,
+177,2,0,1,2499,
+420,18,1,2499,421,
+20,422,4,38,67,
+0,79,0,76,0,
+76,0,73,0,83,
+0,73,0,79,0,
+78,0,95,0,69,
 0,78,0,68,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,75,1,
-1,2,0,1,1931,
-399,18,1,1931,269,
-2,0,1,1932,400,
-18,1,1932,401,20,
-402,4,4,73,0,
-70,0,1,42,1,
-1,2,0,1,262,
-403,18,1,262,177,
-2,0,1,1377,404,
-18,1,1377,177,2,
-0,1,2492,405,18,
-1,2492,406,20,407,
-4,48,76,0,65,
-0,78,0,68,0,
-95,0,67,0,79,
-0,76,0,76,0,
-73,0,83,0,73,
-0,79,0,78,0,
-95,0,69,0,78,
-0,68,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,70,1,1,2,
-0,1,1876,408,18,
-1,1876,135,2,0,
-1,2494,409,18,1,
-2494,410,20,411,4,
-38,72,0,84,0,
-84,0,80,0,95,
-0,82,0,69,0,
-83,0,80,0,79,
-0,78,0,83,0,
-69,0,95,0,69,
+84,0,1,63,1,
+1,2,0,1,2500,
+423,18,1,2500,424,
+20,425,4,30,67,
+0,79,0,76,0,
+76,0,73,0,83,
+0,73,0,79,0,
+78,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
-68,1,1,2,0,
-1,2495,412,18,1,
-2495,413,20,414,4,
-22,69,0,77,0,
-65,0,73,0,76,
+62,1,1,2,0,
+1,2501,426,18,1,
+2501,427,20,428,4,
+26,67,0,72,0,
+65,0,78,0,71,
+0,69,0,68,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,61,1,
+1,2,0,1,2502,
+429,18,1,2502,430,
+20,431,4,24,65,
+0,84,0,84,0,
+65,0,67,0,72,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,67,
+0,84,0,1,60,
 1,1,2,0,1,
-1939,415,18,1,1939,
-177,2,0,1,2497,
-416,18,1,2497,417,
-20,418,4,26,67,
-0,79,0,78,0,
-84,0,82,0,79,
-0,76,0,95,0,
+2503,432,18,1,2503,
+433,20,434,4,30,
+65,0,84,0,95,
+0,84,0,65,0,
+82,0,71,0,69,
+0,84,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,65,1,1,2,
-0,1,827,419,18,
-1,827,177,2,0,
-1,2499,420,18,1,
-2499,421,20,422,4,
-38,67,0,79,0,
-76,0,76,0,73,
-0,83,0,73,0,
-79,0,78,0,95,
-0,69,0,78,0,
-68,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-63,1,1,2,0,
-1,2500,423,18,1,
-2500,424,20,425,4,
-30,67,0,79,0,
-76,0,76,0,73,
-0,83,0,73,0,
-79,0,78,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,62,1,1,
-2,0,1,2501,426,
-18,1,2501,427,20,
-428,4,26,67,0,
-72,0,65,0,78,
-0,71,0,69,0,
-68,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-61,1,1,2,0,
-1,2502,429,18,1,
-2502,430,20,431,4,
-24,65,0,84,0,
-84,0,65,0,67,
-0,72,0,95,0,
+1,59,1,1,2,
+0,1,2504,435,18,
+1,2504,436,20,437,
+4,38,65,0,84,
+0,95,0,82,0,
+79,0,84,0,95,
+0,84,0,65,0,
+82,0,71,0,69,
+0,84,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,60,1,1,2,
-0,1,2503,432,18,
-1,2503,433,20,434,
-4,30,65,0,84,
-0,95,0,84,0,
-65,0,82,0,71,
-0,69,0,84,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,59,1,
-1,2,0,1,2504,
-435,18,1,2504,436,
-20,437,4,38,65,
-0,84,0,95,0,
-82,0,79,0,84,
-0,95,0,84,0,
-65,0,82,0,71,
-0,69,0,84,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,58,1,
-1,2,0,1,277,
-438,18,1,277,439,
-20,440,4,10,83,
-0,76,0,65,0,
-83,0,72,0,1,
-21,1,1,2,0,
-1,2506,441,18,1,
-2506,135,2,0,1,
-2507,442,18,1,2507,
-159,2,0,1,2509,
-443,18,1,2509,342,
-2,0,1,2510,444,
-18,1,2510,445,20,
-446,4,10,69,0,
+1,58,1,1,2,
+0,1,277,438,18,
+1,277,439,20,440,
+4,10,83,0,76,
+0,65,0,83,0,
+72,0,1,21,1,
+1,2,0,1,2506,
+441,18,1,2506,135,
+2,0,1,2507,442,
+18,1,2507,159,2,
+0,1,2509,443,18,
+1,2509,342,2,0,
+1,2510,444,18,1,
+2510,445,20,446,4,
+10,69,0,118,0,
+101,0,110,0,116,
+0,1,108,1,2,
+2,0,1,283,447,
+18,1,283,177,2,
+0,1,1958,448,18,
+1,1958,159,2,0,
+1,1406,449,18,1,
+1406,169,2,0,1,
+1407,450,18,1,1407,
+216,2,0,1,2522,
+451,18,1,2522,159,
+2,0,1,2524,452,
+18,1,2524,342,2,
+0,1,2526,453,18,
+1,2526,454,20,455,
+4,18,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+1,102,1,2,2,
+0,1,299,456,18,
+1,299,457,20,458,
+4,8,83,0,84,
+0,65,0,82,0,
+1,20,1,1,2,
+0,1,1370,459,18,
+1,1370,169,2,0,
+1,305,460,18,1,
+305,177,2,0,1,
+2458,461,18,1,2458,
+269,2,0,1,2459,
+462,18,1,2459,150,
+2,0,1,2464,463,
+18,1,2464,150,2,
+0,1,1989,464,18,
+1,1989,269,2,0,
+1,1990,465,18,1,
+1990,466,20,467,4,
+8,69,0,76,0,
+83,0,69,0,1,
+43,1,1,2,0,
+1,2470,468,18,1,
+2470,162,2,0,1,
+322,469,18,1,322,
+234,2,0,1,1933,
+470,18,1,1933,135,
+2,0,1,883,471,
+18,1,883,177,2,
+0,1,328,472,18,
+1,328,177,2,0,
+1,1443,473,18,1,
+1443,252,2,0,1,
+1449,474,18,1,1449,
+177,2,0,1,2485,
+475,18,1,2485,476,
+20,477,4,24,79,
+0,78,0,95,0,
+82,0,69,0,90,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,81,
+1,1,2,0,1,
+2565,478,18,1,2565,
+150,2,0,1,2566,
+479,18,1,2566,480,
+20,481,4,34,86,
+0,111,0,105,0,
+100,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
 118,0,101,0,110,
-0,116,0,1,108,
+0,116,0,1,104,
 1,2,2,0,1,
-283,447,18,1,283,
-177,2,0,1,1958,
-448,18,1,1958,159,
-2,0,1,1406,449,
-18,1,1406,169,2,
-0,1,1407,450,18,
-1,1407,216,2,0,
-1,2522,451,18,1,
-2522,159,2,0,1,
-2524,452,18,1,2524,
-342,2,0,1,2526,
-453,18,1,2526,454,
-20,455,4,18,83,
-0,116,0,97,0,
-116,0,101,0,66,
-0,111,0,100,0,
-121,0,1,102,1,
-2,2,0,1,299,
-456,18,1,299,457,
-20,458,4,8,83,
-0,84,0,65,0,
-82,0,1,20,1,
-1,2,0,1,1370,
-459,18,1,1370,169,
-2,0,1,305,460,
-18,1,305,177,2,
-0,1,2458,461,18,
-1,2458,269,2,0,
-1,2459,462,18,1,
-2459,150,2,0,1,
-2464,463,18,1,2464,
-150,2,0,1,1989,
-464,18,1,1989,269,
-2,0,1,1990,465,
-18,1,1990,466,20,
-467,4,8,69,0,
-76,0,83,0,69,
-0,1,43,1,1,
-2,0,1,2470,468,
-18,1,2470,162,2,
-0,1,322,469,18,
-1,322,234,2,0,
-1,1933,470,18,1,
-1933,135,2,0,1,
-883,471,18,1,883,
-177,2,0,1,328,
-472,18,1,328,177,
-2,0,1,1443,473,
-18,1,1443,252,2,
-0,1,1449,474,18,
-1,1449,177,2,0,
-1,2485,475,18,1,
-2485,476,20,477,4,
-30,78,0,79,0,
-95,0,83,0,69,
-0,78,0,83,0,
-79,0,82,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,77,1,1,
-2,0,1,2565,478,
-18,1,2565,150,2,
-0,1,2566,479,18,
-1,2566,480,20,481,
-4,40,83,0,116,
-0,97,0,116,0,
-101,0,69,0,110,
-0,116,0,114,0,
-121,0,83,0,116,
-0,97,0,116,0,
-101,0,69,0,118,
-0,101,0,110,0,
-116,0,1,104,1,
-2,2,0,1,2488,
-482,18,1,2488,483,
-20,484,4,22,77,
-0,79,0,78,0,
-69,0,89,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,74,1,1,
-2,0,1,2489,485,
-18,1,2489,486,20,
-487,4,24,76,0,
-73,0,83,0,84,
-0,69,0,78,0,
+2488,482,18,1,2488,
+483,20,484,4,22,
+77,0,79,0,78,
+0,69,0,89,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,73,1,
-1,2,0,1,2490,
-488,18,1,2490,489,
-20,490,4,36,76,
-0,73,0,78,0,
-75,0,95,0,77,
-0,69,0,83,0,
-83,0,65,0,71,
-0,69,0,95,0,
+84,0,1,74,1,
+1,2,0,1,2489,
+485,18,1,2489,486,
+20,487,4,24,76,
+0,73,0,83,0,
+84,0,69,0,78,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,73,
+1,1,2,0,1,
+2490,488,18,1,2490,
+489,20,490,4,36,
+76,0,73,0,78,
+0,75,0,95,0,
+77,0,69,0,83,
+0,83,0,65,0,
+71,0,69,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,72,1,1,
+2,0,1,2491,491,
+18,1,2491,492,20,
+493,4,52,76,0,
+65,0,78,0,68,
+0,95,0,67,0,
+79,0,76,0,76,
+0,73,0,83,0,
+73,0,79,0,78,
+0,95,0,83,0,
+84,0,65,0,82,
+0,84,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,72,1,1,2,
-0,1,2491,491,18,
-1,2491,492,20,493,
-4,52,76,0,65,
+1,71,1,1,2,
+0,1,2493,494,18,
+1,2493,495,20,496,
+4,40,76,0,65,
 0,78,0,68,0,
 95,0,67,0,79,
 0,76,0,76,0,
 73,0,83,0,73,
 0,79,0,78,0,
-95,0,83,0,84,
-0,65,0,82,0,
-84,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-71,1,1,2,0,
-1,2493,494,18,1,
-2493,495,20,496,4,
-40,76,0,65,0,
-78,0,68,0,95,
-0,67,0,79,0,
-76,0,76,0,73,
-0,83,0,73,0,
-79,0,78,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,69,1,1,
-2,0,1,1413,497,
-18,1,1413,177,2,
-0,1,346,498,18,
-1,346,499,20,500,
-4,8,80,0,76,
-0,85,0,83,0,
-1,18,1,1,2,
-0,1,2496,501,18,
-1,2496,502,20,503,
-4,32,68,0,65,
-0,84,0,65,0,
-83,0,69,0,82,
-0,86,0,69,0,
-82,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-66,1,1,2,0,
-1,2021,504,18,1,
-2021,269,2,0,1,
-2022,505,18,1,2022,
-346,2,0,1,352,
-506,18,1,352,177,
-2,0,1,2024,507,
-18,1,2024,132,2,
-0,1,2025,508,18,
-1,2025,509,20,510,
-4,8,74,0,85,
-0,77,0,80,0,
-1,49,1,1,2,
-0,1,2026,511,18,
-1,2026,132,2,0,
-1,2027,512,18,1,
-2027,513,20,514,4,
-4,65,0,84,0,
-1,23,1,1,2,
-0,1,2028,515,18,
-1,2028,132,2,0,
-1,2029,516,18,1,
-2029,342,2,0,1,
-2030,517,18,1,2030,
-518,20,519,4,14,
-70,0,111,0,114,
-0,76,0,111,0,
-111,0,112,0,1,
-123,1,2,2,0,
-1,2031,520,18,1,
-2031,521,20,522,4,
-32,68,0,111,0,
-87,0,104,0,105,
-0,108,0,101,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,1,122,
-1,2,2,0,1,
-2032,523,18,1,2032,
-524,20,525,4,28,
-87,0,104,0,105,
-0,108,0,101,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,1,121,
-1,2,2,0,1,
-2033,526,18,1,2033,
-527,20,528,4,22,
-73,0,102,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,120,1,
-2,2,0,1,2034,
-529,18,1,2034,530,
-20,531,4,22,83,
-0,116,0,97,0,
-116,0,101,0,67,
-0,104,0,97,0,
-110,0,103,0,101,
-0,1,119,1,2,
-2,0,1,1478,532,
-18,1,1478,169,2,
-0,1,1479,533,18,
-1,1479,285,2,0,
-1,2037,534,18,1,
-2037,201,2,0,1,
-2038,535,18,1,2038,
-536,20,537,4,18,
-74,0,117,0,109,
-0,112,0,76,0,
-97,0,98,0,101,
-0,108,0,1,117,
-1,2,2,0,1,
-2039,538,18,1,2039,
-201,2,0,1,2040,
-539,18,1,2040,540,
-20,541,4,30,82,
-0,101,0,116,0,
-117,0,114,0,110,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,69,1,
+1,2,0,1,1413,
+497,18,1,1413,177,
+2,0,1,346,498,
+18,1,346,499,20,
+500,4,8,80,0,
+76,0,85,0,83,
+0,1,18,1,1,
+2,0,1,2496,501,
+18,1,2496,502,20,
+503,4,32,68,0,
+65,0,84,0,65,
+0,83,0,69,0,
+82,0,86,0,69,
+0,82,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,66,1,1,2,
+0,1,2021,504,18,
+1,2021,269,2,0,
+1,2022,505,18,1,
+2022,346,2,0,1,
+352,506,18,1,352,
+177,2,0,1,2024,
+507,18,1,2024,132,
+2,0,1,2025,508,
+18,1,2025,509,20,
+510,4,8,74,0,
+85,0,77,0,80,
+0,1,49,1,1,
+2,0,1,2026,511,
+18,1,2026,132,2,
+0,1,2027,512,18,
+1,2027,513,20,514,
+4,4,65,0,84,
+0,1,23,1,1,
+2,0,1,2028,515,
+18,1,2028,132,2,
+0,1,2029,516,18,
+1,2029,342,2,0,
+1,2030,517,18,1,
+2030,518,20,519,4,
+14,70,0,111,0,
+114,0,76,0,111,
+0,111,0,112,0,
+1,123,1,2,2,
+0,1,2031,520,18,
+1,2031,521,20,522,
+4,32,68,0,111,
+0,87,0,104,0,
+105,0,108,0,101,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,1,
-116,1,2,2,0,
-1,2041,542,18,1,
-2041,201,2,0,1,
-1485,543,18,1,1485,
-177,2,0,1,372,
-544,18,1,372,189,
-2,0,1,373,545,
-18,1,373,132,2,
-0,1,374,546,18,
-1,374,185,2,0,
-1,375,547,18,1,
-375,132,2,0,1,
-376,548,18,1,376,
-192,2,0,1,377,
-549,18,1,377,132,
-2,0,1,378,550,
-18,1,378,185,2,
-0,1,379,551,18,
-1,379,132,2,0,
-1,380,552,18,1,
-380,553,20,554,4,
-16,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,1,129,1,
-2,2,0,1,381,
-555,18,1,381,299,
-2,0,1,371,556,
-18,1,371,557,20,
-558,4,24,70,0,
-117,0,110,0,99,
-0,116,0,105,0,
-111,0,110,0,67,
-0,97,0,108,0,
-108,0,1,125,1,
-2,2,0,1,942,
-559,18,1,942,177,
-2,0,1,387,560,
-18,1,387,177,2,
-0,1,1514,561,18,
-1,1514,169,2,0,
-1,1515,562,18,1,
-1515,307,2,0,1,
-2606,563,18,1,2606,
-454,2,0,1,2074,
-564,18,1,2074,169,
-2,0,1,2075,565,
-18,1,2075,159,2,
-0,1,406,566,18,
-1,406,143,2,0,
-1,1521,567,18,1,
-1521,177,2,0,1,
-412,568,18,1,412,
-177,2,0,1,2484,
-569,18,1,2484,570,
-20,571,4,46,78,
-0,79,0,84,0,
-95,0,65,0,84,
-0,95,0,82,0,
-79,0,84,0,95,
-0,84,0,65,0,
-82,0,71,0,69,
-0,84,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,78,1,1,2,
-0,1,2023,572,18,
-1,2023,573,20,574,
-4,26,68,0,69,
-0,70,0,65,0,
-85,0,76,0,84,
-0,95,0,83,0,
-84,0,65,0,84,
-0,69,0,1,47,
-1,1,2,0,1,
-2564,575,18,1,2564,
-576,20,577,4,20,
+122,1,2,2,0,
+1,2032,523,18,1,
+2032,524,20,525,4,
+28,87,0,104,0,
+105,0,108,0,101,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,1,
+121,1,2,2,0,
+1,2033,526,18,1,
+2033,527,20,528,4,
+22,73,0,102,0,
 83,0,116,0,97,
 0,116,0,101,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,103,1,2,2,
-0,1,2648,578,18,
-1,2648,579,20,580,
-4,12,83,0,116,
-0,97,0,116,0,
-101,0,115,0,1,
-100,1,2,2,0,
-1,2567,581,18,1,
-2567,576,2,0,1,
-1442,582,18,1,1442,
-169,2,0,1,2569,
-583,18,1,2569,162,
-2,0,1,2652,584,
-18,1,2652,165,2,
-0,1,2653,585,18,
-1,2653,132,2,0,
-1,2654,586,18,1,
-2654,135,2,0,1,
-2035,587,18,1,2035,
-201,2,0,1,2036,
-588,18,1,2036,589,
-20,590,4,26,74,
-0,117,0,109,0,
-112,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-1,118,1,2,2,
-0,1,431,591,18,
-1,431,143,2,0,
-1,2105,592,18,1,
-2105,269,2,0,1,
-2106,593,18,1,2106,
-466,2,0,1,1550,
-594,18,1,1550,169,
-2,0,1,437,595,
-18,1,437,177,2,
-0,1,2044,596,18,
-1,2044,597,20,598,
-4,28,69,0,109,
-0,112,0,116,0,
-121,0,83,0,116,
+109,0,101,0,110,
+0,116,0,1,120,
+1,2,2,0,1,
+2034,529,18,1,2034,
+530,20,531,4,22,
+83,0,116,0,97,
+0,116,0,101,0,
+67,0,104,0,97,
+0,110,0,103,0,
+101,0,1,119,1,
+2,2,0,1,1478,
+532,18,1,1478,169,
+2,0,1,1479,533,
+18,1,1479,285,2,
+0,1,2037,534,18,
+1,2037,201,2,0,
+1,2038,535,18,1,
+2038,536,20,537,4,
+18,74,0,117,0,
+109,0,112,0,76,
+0,97,0,98,0,
+101,0,108,0,1,
+117,1,2,2,0,
+1,2039,538,18,1,
+2039,201,2,0,1,
+2040,539,18,1,2040,
+540,20,541,4,30,
+82,0,101,0,116,
+0,117,0,114,0,
+110,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,113,1,2,2,
-0,1,2045,599,18,
-1,2045,201,2,0,
-1,1555,600,18,1,
-1555,177,2,0,1,
-2670,601,18,1,2670,
-307,2,0,1,2511,
-602,18,1,2511,135,
-2,0,1,1001,603,
-18,1,1001,557,2,
-0,1,1002,604,18,
-1,1002,553,2,0,
-1,447,605,18,1,
-447,316,2,0,1,
-2676,606,18,1,2676,
-177,2,0,1,2520,
-607,18,1,2520,140,
-2,0,1,1010,608,
-18,1,1010,169,2,
-0,1,1011,609,18,
-1,1011,159,2,0,
-1,1012,610,18,1,
-1012,177,2,0,1,
-1013,611,18,1,1013,
-159,2,0,1,459,
-612,18,1,459,613,
-20,614,4,24,76,
-0,69,0,70,0,
-84,0,95,0,66,
-0,82,0,65,0,
-67,0,75,0,69,
-0,84,0,1,27,
-1,1,2,0,1,
-1574,615,18,1,1574,
-201,2,0,1,461,
-616,18,1,461,617,
-20,618,4,24,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-76,0,105,0,115,
-0,116,0,1,126,
+1,116,1,2,2,
+0,1,2041,542,18,
+1,2041,201,2,0,
+1,1485,543,18,1,
+1485,177,2,0,1,
+372,544,18,1,372,
+189,2,0,1,373,
+545,18,1,373,132,
+2,0,1,374,546,
+18,1,374,185,2,
+0,1,375,547,18,
+1,375,132,2,0,
+1,376,548,18,1,
+376,192,2,0,1,
+377,549,18,1,377,
+132,2,0,1,378,
+550,18,1,378,185,
+2,0,1,379,551,
+18,1,379,132,2,
+0,1,380,552,18,
+1,380,553,20,554,
+4,16,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
+0,116,0,1,129,
 1,2,2,0,1,
-462,619,18,1,462,
-143,2,0,1,464,
-620,18,1,464,621,
-20,622,4,16,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-1,127,1,2,2,
-0,1,2136,623,18,
-1,2136,269,2,0,
-1,2729,104,1,2695,
-624,18,1,2695,201,
-2,0,1,1585,625,
-18,1,1585,626,20,
-627,4,12,82,0,
-69,0,84,0,85,
-0,82,0,78,0,
-1,50,1,1,2,
-0,1,476,628,18,
-1,476,629,20,630,
-4,30,83,0,84,
-0,82,0,73,0,
-78,0,71,0,95,
-0,67,0,79,0,
-78,0,83,0,84,
-0,65,0,78,0,
-84,0,1,3,1,
-1,2,0,1,477,
-631,18,1,477,632,
-20,633,4,28,70,
-0,76,0,79,0,
-65,0,84,0,95,
-0,67,0,79,0,
-78,0,83,0,84,
-0,65,0,78,0,
-84,0,1,95,1,
-1,2,0,1,478,
-634,18,1,478,635,
-20,636,4,40,72,
-0,69,0,88,0,
-95,0,73,0,78,
-0,84,0,69,0,
-71,0,69,0,82,
-0,95,0,67,0,
-79,0,78,0,83,
-0,84,0,65,0,
+381,555,18,1,381,
+299,2,0,1,371,
+556,18,1,371,557,
+20,558,4,24,70,
+0,117,0,110,0,
+99,0,116,0,105,
+0,111,0,110,0,
+67,0,97,0,108,
+0,108,0,1,125,
+1,2,2,0,1,
+942,559,18,1,942,
+177,2,0,1,387,
+560,18,1,387,177,
+2,0,1,1514,561,
+18,1,1514,169,2,
+0,1,1515,562,18,
+1,1515,307,2,0,
+1,2606,563,18,1,
+2606,454,2,0,1,
+2074,564,18,1,2074,
+169,2,0,1,2075,
+565,18,1,2075,159,
+2,0,1,406,566,
+18,1,406,143,2,
+0,1,1521,567,18,
+1,1521,177,2,0,
+1,412,568,18,1,
+412,177,2,0,1,
+2484,569,18,1,2484,
+570,20,571,4,34,
+82,0,69,0,77,
+0,79,0,84,0,
+69,0,95,0,68,
+0,65,0,84,0,
+65,0,95,0,69,
+0,86,0,69,0,
 78,0,84,0,1,
-94,1,1,2,0,
-1,479,637,18,1,
-479,638,20,639,4,
-32,73,0,78,0,
+82,1,1,2,0,
+1,2023,572,18,1,
+2023,573,20,574,4,
+26,68,0,69,0,
+70,0,65,0,85,
+0,76,0,84,0,
+95,0,83,0,84,
+0,65,0,84,0,
+69,0,1,47,1,
+1,2,0,1,2564,
+575,18,1,2564,576,
+20,577,4,20,83,
+0,116,0,97,0,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+103,1,2,2,0,
+1,2648,578,18,1,
+2648,579,20,580,4,
+12,83,0,116,0,
+97,0,116,0,101,
+0,115,0,1,100,
+1,2,2,0,1,
+2567,581,18,1,2567,
+576,2,0,1,1442,
+582,18,1,1442,169,
+2,0,1,2569,583,
+18,1,2569,162,2,
+0,1,2652,584,18,
+1,2652,165,2,0,
+1,2653,585,18,1,
+2653,132,2,0,1,
+2654,586,18,1,2654,
+135,2,0,1,2035,
+587,18,1,2035,201,
+2,0,1,2036,588,
+18,1,2036,589,20,
+590,4,26,74,0,
+117,0,109,0,112,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,1,
+118,1,2,2,0,
+1,431,591,18,1,
+431,143,2,0,1,
+2105,592,18,1,2105,
+269,2,0,1,2106,
+593,18,1,2106,466,
+2,0,1,1550,594,
+18,1,1550,169,2,
+0,1,437,595,18,
+1,437,177,2,0,
+1,2044,596,18,1,
+2044,597,20,598,4,
+28,69,0,109,0,
+112,0,116,0,121,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,1,
+113,1,2,2,0,
+1,2045,599,18,1,
+2045,201,2,0,1,
+1555,600,18,1,1555,
+177,2,0,1,2670,
+601,18,1,2670,307,
+2,0,1,2511,602,
+18,1,2511,135,2,
+0,1,1001,603,18,
+1,1001,557,2,0,
+1,1002,604,18,1,
+1002,553,2,0,1,
+447,605,18,1,447,
+316,2,0,1,2676,
+606,18,1,2676,177,
+2,0,1,2520,607,
+18,1,2520,140,2,
+0,1,1010,608,18,
+1,1010,169,2,0,
+1,1011,609,18,1,
+1011,159,2,0,1,
+1012,610,18,1,1012,
+177,2,0,1,1013,
+611,18,1,1013,159,
+2,0,1,459,612,
+18,1,459,613,20,
+614,4,24,76,0,
+69,0,70,0,84,
+0,95,0,66,0,
+82,0,65,0,67,
+0,75,0,69,0,
+84,0,1,27,1,
+1,2,0,1,1574,
+615,18,1,1574,201,
+2,0,1,461,616,
+18,1,461,617,20,
+618,4,24,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,76,
+0,105,0,115,0,
+116,0,1,126,1,
+2,2,0,1,462,
+619,18,1,462,143,
+2,0,1,464,620,
+18,1,464,621,20,
+622,4,16,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,1,
+127,1,2,2,0,
+1,2136,623,18,1,
+2136,269,2,0,1,
+2729,104,1,2695,624,
+18,1,2695,201,2,
+0,1,1585,625,18,
+1,1585,626,20,627,
+4,12,82,0,69,
+0,84,0,85,0,
+82,0,78,0,1,
+50,1,1,2,0,
+1,476,628,18,1,
+476,629,20,630,4,
+30,83,0,84,0,
+82,0,73,0,78,
+0,71,0,95,0,
+67,0,79,0,78,
+0,83,0,84,0,
+65,0,78,0,84,
+0,1,3,1,1,
+2,0,1,477,631,
+18,1,477,632,20,
+633,4,28,70,0,
+76,0,79,0,65,
+0,84,0,95,0,
+67,0,79,0,78,
+0,83,0,84,0,
+65,0,78,0,84,
+0,1,95,1,1,
+2,0,1,478,634,
+18,1,478,635,20,
+636,4,40,72,0,
+69,0,88,0,95,
+0,73,0,78,0,
 84,0,69,0,71,
 0,69,0,82,0,
 95,0,67,0,79,
 0,78,0,83,0,
 84,0,65,0,78,
-0,84,0,1,93,
+0,84,0,1,94,
 1,1,2,0,1,
-480,640,18,1,480,
-641,20,642,4,26,
-82,0,73,0,71,
-0,72,0,84,0,
-95,0,66,0,82,
-0,65,0,67,0,
-75,0,69,0,84,
-0,1,28,1,1,
-2,0,1,481,643,
-18,1,481,621,2,
-0,1,2718,644,18,
-1,2718,579,2,0,
-1,1048,645,18,1,
-1048,177,2,0,1,
-2725,646,18,1,2725,
-153,2,0,1,2726,
-647,18,1,2726,648,
-20,649,4,50,71,
-0,108,0,111,0,
-98,0,97,0,108,
-0,86,0,97,0,
-114,0,105,0,97,
-0,98,0,108,0,
-101,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,1,
-98,1,2,2,0,
-1,2563,650,18,1,
-2563,480,2,0,1,
-2728,651,18,1,2728,
-648,2,0,1,2042,
-652,18,1,2042,653,
-20,654,4,20,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,1,
-114,1,2,2,0,
-1,2043,655,18,1,
-2043,201,2,0,1,
-2568,656,18,1,2568,
-573,2,0,1,1620,
-657,18,1,1620,169,
-2,0,1,1621,658,
-18,1,1621,156,2,
-0,1,1622,659,18,
-1,1622,307,2,0,
-1,509,660,18,1,
-509,143,2,0,1,
-2498,661,18,1,2498,
-662,20,663,4,42,
-67,0,79,0,76,
-0,76,0,73,0,
-83,0,73,0,79,
-0,78,0,95,0,
-83,0,84,0,65,
-0,82,0,84,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,64,1,
-1,2,0,1,1628,
-664,18,1,1628,177,
-2,0,1,515,665,
-18,1,515,177,2,
-0,1,2505,666,18,
-1,2505,667,20,668,
-4,20,69,0,110,
-0,116,0,114,0,
-121,0,69,0,118,
-0,101,0,110,0,
-116,0,1,109,1,
-2,2,0,1,2663,
-669,18,1,2663,140,
-2,0,1,2665,670,
-18,1,2665,159,2,
-0,1,2667,671,18,
-1,2667,342,2,0,
-1,525,672,18,1,
-525,316,2,0,1,
-2197,673,18,1,2197,
-169,2,0,1,2198,
-674,18,1,2198,159,
-2,0,1,1591,675,
-18,1,1591,177,2,
-0,1,1094,676,18,
-1,1094,617,2,0,
-1,1096,677,18,1,
-1096,159,2,0,1,
-1657,678,18,1,1657,
-201,2,0,1,1658,
-679,18,1,1658,680,
-20,681,4,6,70,
-0,79,0,82,0,
-1,46,1,1,2,
-0,1,1659,682,18,
-1,1659,135,2,0,
-1,1665,683,18,1,
-1665,177,2,0,1,
-1113,684,18,1,1113,
-185,2,0,685,5,
-0,686,5,329,1,
-2,687,19,262,1,
-2,688,5,6,1,
-2651,689,17,690,15,
-691,4,14,37,0,
-83,0,116,0,97,
-0,116,0,101,0,
-115,0,1,-1,1,
-5,692,20,693,4,
-16,83,0,116,0,
-97,0,116,0,101,
-0,115,0,95,0,
-50,0,1,155,1,
-3,1,3,1,2,
-694,22,1,12,1,
-2652,695,17,696,15,
-691,1,-1,1,5,
-697,20,698,4,16,
-83,0,116,0,97,
-0,116,0,101,0,
-115,0,95,0,49,
-0,1,154,1,3,
-1,2,1,1,699,
-22,1,11,1,2565,
-700,17,701,15,702,
-4,12,37,0,83,
+479,637,18,1,479,
+638,20,639,4,32,
+73,0,78,0,84,
+0,69,0,71,0,
+69,0,82,0,95,
+0,67,0,79,0,
+78,0,83,0,84,
+0,65,0,78,0,
+84,0,1,93,1,
+1,2,0,1,480,
+640,18,1,480,641,
+20,642,4,26,82,
+0,73,0,71,0,
+72,0,84,0,95,
+0,66,0,82,0,
+65,0,67,0,75,
+0,69,0,84,0,
+1,28,1,1,2,
+0,1,481,643,18,
+1,481,621,2,0,
+1,2718,644,18,1,
+2718,579,2,0,1,
+1048,645,18,1,1048,
+177,2,0,1,2725,
+646,18,1,2725,153,
+2,0,1,2726,647,
+18,1,2726,648,20,
+649,4,50,71,0,
+108,0,111,0,98,
+0,97,0,108,0,
+86,0,97,0,114,
+0,105,0,97,0,
+98,0,108,0,101,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,1,98,
+1,2,2,0,1,
+2563,650,18,1,2563,
+480,2,0,1,2728,
+651,18,1,2728,648,
+2,0,1,2042,652,
+18,1,2042,653,20,
+654,4,20,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,1,114,
+1,2,2,0,1,
+2043,655,18,1,2043,
+201,2,0,1,2568,
+656,18,1,2568,573,
+2,0,1,1620,657,
+18,1,1620,169,2,
+0,1,1621,658,18,
+1,1621,156,2,0,
+1,1622,659,18,1,
+1622,307,2,0,1,
+509,660,18,1,509,
+143,2,0,1,2498,
+661,18,1,2498,662,
+20,663,4,42,67,
+0,79,0,76,0,
+76,0,73,0,83,
+0,73,0,79,0,
+78,0,95,0,83,
+0,84,0,65,0,
+82,0,84,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,64,1,1,
+2,0,1,1628,664,
+18,1,1628,177,2,
+0,1,515,665,18,
+1,515,177,2,0,
+1,2505,666,18,1,
+2505,667,20,668,4,
+24,86,0,111,0,
+105,0,100,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,109,1,2,2,
+0,1,2663,669,18,
+1,2663,140,2,0,
+1,2665,670,18,1,
+2665,159,2,0,1,
+2667,671,18,1,2667,
+342,2,0,1,525,
+672,18,1,525,316,
+2,0,1,2197,673,
+18,1,2197,169,2,
+0,1,2198,674,18,
+1,2198,159,2,0,
+1,1591,675,18,1,
+1591,177,2,0,1,
+1094,676,18,1,1094,
+617,2,0,1,1096,
+677,18,1,1096,159,
+2,0,1,1657,678,
+18,1,1657,201,2,
+0,1,1658,679,18,
+1,1658,680,20,681,
+4,6,70,0,79,
+0,82,0,1,46,
+1,1,2,0,1,
+1659,682,18,1,1659,
+135,2,0,1,1665,
+683,18,1,1665,177,
+2,0,1,1113,684,
+18,1,1113,185,2,
+0,685,5,0,686,
+5,329,1,2,687,
+19,262,1,2,688,
+5,6,1,2651,689,
+17,690,15,691,4,
+14,37,0,83,0,
+116,0,97,0,116,
+0,101,0,115,0,
+1,-1,1,5,692,
+20,693,4,16,83,
 0,116,0,97,0,
-116,0,101,0,1,
--1,1,5,703,20,
-704,4,14,83,0,
+116,0,101,0,115,
+0,95,0,50,0,
+1,155,1,3,1,
+3,1,2,694,22,
+1,12,1,2652,695,
+17,696,15,691,1,
+-1,1,5,697,20,
+698,4,16,83,0,
+116,0,97,0,116,
+0,101,0,115,0,
+95,0,49,0,1,
+154,1,3,1,2,
+1,1,699,22,1,
+11,1,2565,700,17,
+701,15,702,4,12,
+37,0,83,0,116,
+0,97,0,116,0,
+101,0,1,-1,1,
+5,703,20,704,4,
+14,83,0,116,0,
+97,0,116,0,101,
+0,95,0,50,0,
+1,157,1,3,1,
+6,1,5,705,22,
+1,14,1,2645,706,
+17,707,15,702,1,
+-1,1,5,708,20,
+709,4,14,83,0,
 116,0,97,0,116,
 0,101,0,95,0,
-50,0,1,157,1,
-3,1,6,1,5,
-705,22,1,14,1,
-2645,706,17,707,15,
-702,1,-1,1,5,
-708,20,709,4,14,
-83,0,116,0,97,
-0,116,0,101,0,
+49,0,1,156,1,
+3,1,5,1,4,
+710,22,1,13,1,
+2718,711,17,712,15,
+713,4,30,37,0,
+76,0,83,0,76,
+0,80,0,114,0,
+111,0,103,0,114,
+0,97,0,109,0,
+82,0,111,0,111,
+0,116,0,1,-1,
+1,5,714,20,715,
+4,32,76,0,83,
+0,76,0,80,0,
+114,0,111,0,103,
+0,114,0,97,0,
+109,0,82,0,111,
+0,111,0,116,0,
 95,0,49,0,1,
-156,1,3,1,5,
-1,4,710,22,1,
-13,1,2718,711,17,
-712,15,713,4,30,
-37,0,76,0,83,
+144,1,3,1,3,
+1,2,716,22,1,
+1,1,2648,717,17,
+718,15,713,1,-1,
+1,5,719,20,720,
+4,32,76,0,83,
 0,76,0,80,0,
 114,0,111,0,103,
 0,114,0,97,0,
 109,0,82,0,111,
 0,111,0,116,0,
-1,-1,1,5,714,
-20,715,4,32,76,
-0,83,0,76,0,
-80,0,114,0,111,
-0,103,0,114,0,
-97,0,109,0,82,
-0,111,0,111,0,
-116,0,95,0,49,
-0,1,144,1,3,
-1,3,1,2,716,
-22,1,1,1,2648,
-717,17,718,15,713,
-1,-1,1,5,719,
-20,720,4,32,76,
-0,83,0,76,0,
-80,0,114,0,111,
-0,103,0,114,0,
-97,0,109,0,82,
-0,111,0,111,0,
-116,0,95,0,50,
-0,1,145,1,3,
-1,2,1,1,721,
-22,1,2,1,3,
-722,19,630,1,3,
-723,5,95,1,256,
-724,16,0,628,1,
-1261,725,16,0,628,
-1,509,726,16,0,
-628,1,1515,727,16,
-0,628,1,2021,728,
-17,729,15,730,4,
-24,37,0,73,0,
-102,0,83,0,116,
+95,0,50,0,1,
+145,1,3,1,2,
+1,1,721,22,1,
+2,1,3,722,19,
+630,1,3,723,5,
+95,1,256,724,16,
+0,628,1,1261,725,
+16,0,628,1,509,
+726,16,0,628,1,
+1515,727,16,0,628,
+1,2021,728,17,729,
+15,730,4,24,37,
+0,73,0,102,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,-1,
+1,5,731,20,732,
+4,26,73,0,102,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,95,
+0,50,0,1,190,
+1,3,1,8,1,
+7,733,22,1,48,
+1,1775,734,16,0,
+628,1,2029,735,17,
+736,15,737,4,20,
+37,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,-1,1,5,731,
-20,732,4,26,73,
-0,102,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,50,0,
-1,190,1,3,1,
-8,1,7,733,22,
-1,48,1,1775,734,
-16,0,628,1,2029,
-735,17,736,15,737,
-4,20,37,0,83,
+1,-1,1,5,738,
+20,739,4,24,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,1,-1,1,
-5,738,20,739,4,
+116,0,95,0,49,
+0,51,0,1,184,
+1,3,1,2,1,
+1,740,22,1,42,
+1,2030,741,17,742,
+15,737,1,-1,1,
+5,743,20,744,4,
 24,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,51,0,
-1,184,1,3,1,
-2,1,1,740,22,
-1,42,1,2030,741,
-17,742,15,737,1,
--1,1,5,743,20,
-744,4,24,83,0,
+0,49,0,50,0,
+1,183,1,3,1,
+2,1,1,745,22,
+1,41,1,2031,746,
+17,747,15,737,1,
+-1,1,5,748,20,
+749,4,24,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-50,0,1,183,1,
+49,0,1,182,1,
 3,1,2,1,1,
-745,22,1,41,1,
-2031,746,17,747,15,
+750,22,1,40,1,
+2032,751,17,752,15,
 737,1,-1,1,5,
-748,20,749,4,24,
+753,20,754,4,24,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,49,0,1,
-182,1,3,1,2,
-1,1,750,22,1,
-40,1,2032,751,17,
-752,15,737,1,-1,
-1,5,753,20,754,
-4,24,83,0,116,
+49,0,48,0,1,
+181,1,3,1,2,
+1,1,755,22,1,
+39,1,2033,756,17,
+757,15,737,1,-1,
+1,5,758,20,759,
+4,22,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-95,0,49,0,48,
-0,1,181,1,3,
-1,2,1,1,755,
-22,1,39,1,2033,
-756,17,757,15,737,
-1,-1,1,5,758,
-20,759,4,22,83,
+95,0,57,0,1,
+180,1,3,1,2,
+1,1,760,22,1,
+38,1,277,761,16,
+0,628,1,2035,762,
+17,763,15,737,1,
+-1,1,5,764,20,
+765,4,22,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,56,0,
+1,179,1,3,1,
+3,1,2,766,22,
+1,37,1,2037,767,
+17,768,15,737,1,
+-1,1,5,769,20,
+770,4,22,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,55,0,
+1,178,1,3,1,
+3,1,2,771,22,
+1,36,1,2039,772,
+17,773,15,737,1,
+-1,1,5,774,20,
+775,4,22,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,54,0,
+1,177,1,3,1,
+3,1,2,776,22,
+1,35,1,32,777,
+16,0,628,1,2041,
+778,17,779,15,737,
+1,-1,1,5,780,
+20,781,4,22,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,95,0,57,
-0,1,180,1,3,
-1,2,1,1,760,
-22,1,38,1,277,
-761,16,0,628,1,
-2035,762,17,763,15,
-737,1,-1,1,5,
-764,20,765,4,22,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-56,0,1,179,1,
-3,1,3,1,2,
-766,22,1,37,1,
-2037,767,17,768,15,
+116,0,95,0,53,
+0,1,176,1,3,
+1,3,1,2,782,
+22,1,34,1,2293,
+783,16,0,628,1,
+2043,784,17,785,15,
 737,1,-1,1,5,
-769,20,770,4,22,
+786,20,787,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-55,0,1,178,1,
+51,0,1,174,1,
 3,1,3,1,2,
-771,22,1,36,1,
-2039,772,17,773,15,
+788,22,1,32,1,
+2045,789,17,790,15,
 737,1,-1,1,5,
-774,20,775,4,22,
+791,20,792,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-54,0,1,177,1,
+49,0,1,172,1,
 3,1,3,1,2,
-776,22,1,35,1,
-32,777,16,0,628,
-1,2041,778,17,779,
-15,737,1,-1,1,
-5,780,20,781,4,
-22,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,53,0,1,176,
-1,3,1,3,1,
-2,782,22,1,34,
-1,2293,783,16,0,
-628,1,2043,784,17,
-785,15,737,1,-1,
-1,5,786,20,787,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-95,0,51,0,1,
-174,1,3,1,3,
-1,2,788,22,1,
-32,1,2045,789,17,
-790,15,737,1,-1,
-1,5,791,20,792,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,1,
-172,1,3,1,3,
-1,2,793,22,1,
-30,1,41,794,16,
-0,628,1,1297,795,
-16,0,628,1,43,
-796,16,0,628,1,
-1803,797,17,798,15,
-799,4,16,37,0,
-70,0,111,0,114,
-0,76,0,111,0,
-111,0,112,0,1,
--1,1,5,800,20,
-801,4,18,70,0,
+793,22,1,30,1,
+41,794,16,0,628,
+1,1297,795,16,0,
+628,1,43,796,16,
+0,628,1,1803,797,
+17,798,15,799,4,
+16,37,0,70,0,
 111,0,114,0,76,
 0,111,0,111,0,
-112,0,95,0,49,
-0,1,197,1,3,
-1,10,1,9,802,
-22,1,55,1,1804,
-803,16,0,628,1,
-299,804,16,0,628,
-1,52,805,16,0,
-628,1,2318,806,16,
-0,628,1,62,807,
-16,0,628,1,2075,
-808,16,0,628,1,
-1574,809,17,810,15,
-737,1,-1,1,5,
-811,20,812,4,22,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-52,0,1,175,1,
-3,1,3,1,2,
-813,22,1,33,1,
-71,814,16,0,628,
-1,76,815,16,0,
-628,1,1834,816,16,
-0,628,1,2337,817,
-16,0,628,1,79,
-818,16,0,628,1,
-1335,819,16,0,628,
-1,322,820,16,0,
-628,1,85,821,16,
-0,628,1,89,822,
-16,0,628,1,346,
-823,16,0,628,1,
-2105,824,17,825,15,
-730,1,-1,1,5,
-826,20,827,4,26,
-73,0,102,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,51,
-0,1,191,1,3,
-1,6,1,5,828,
-22,1,49,1,2106,
-829,16,0,628,1,
-97,830,16,0,628,
-1,1860,831,17,832,
-15,833,4,34,37,
-0,68,0,111,0,
-87,0,104,0,105,
-0,108,0,101,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,1,-1,
-1,5,834,20,835,
-4,36,68,0,111,
-0,87,0,104,0,
-105,0,108,0,101,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,1,195,
-1,3,1,8,1,
-7,836,22,1,53,
-1,2364,837,17,838,
-15,799,1,-1,1,
-5,839,20,840,4,
+112,0,1,-1,1,
+5,800,20,801,4,
 18,70,0,111,0,
 114,0,76,0,111,
 0,111,0,112,0,
-95,0,50,0,1,
-198,1,3,1,9,
-1,8,841,22,1,
-56,1,102,842,16,
-0,628,1,112,843,
-16,0,628,1,1117,
-844,16,0,628,1,
-1873,845,17,846,15,
-833,1,-1,1,5,
-847,20,848,4,36,
-68,0,111,0,87,
-0,104,0,105,0,
-108,0,101,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,50,
-0,1,196,1,3,
-1,8,1,7,849,
-22,1,54,1,1876,
-850,16,0,628,1,
-124,851,16,0,628,
-1,2136,852,17,853,
-15,730,1,-1,1,
-5,854,20,855,4,
-26,73,0,102,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-52,0,1,192,1,
-3,1,8,1,7,
-856,22,1,50,1,
-381,857,16,0,628,
-1,525,858,16,0,
-628,1,137,859,16,
-0,628,1,1901,860,
-16,0,628,1,1153,
-861,16,0,628,1,
-151,862,16,0,628,
-1,1407,863,16,0,
-628,1,1659,864,16,
-0,628,1,2413,865,
-16,0,628,1,406,
-866,16,0,628,1,
-1371,867,16,0,628,
-1,166,868,16,0,
-628,1,1622,869,16,
-0,628,1,1931,870,
-17,871,15,872,4,
-30,37,0,87,0,
+95,0,49,0,1,
+197,1,3,1,10,
+1,9,802,22,1,
+55,1,1804,803,16,
+0,628,1,299,804,
+16,0,628,1,52,
+805,16,0,628,1,
+2318,806,16,0,628,
+1,62,807,16,0,
+628,1,2075,808,16,
+0,628,1,1574,809,
+17,810,15,737,1,
+-1,1,5,811,20,
+812,4,22,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,52,0,
+1,175,1,3,1,
+3,1,2,813,22,
+1,33,1,71,814,
+16,0,628,1,76,
+815,16,0,628,1,
+1834,816,16,0,628,
+1,2337,817,16,0,
+628,1,79,818,16,
+0,628,1,1335,819,
+16,0,628,1,322,
+820,16,0,628,1,
+85,821,16,0,628,
+1,89,822,16,0,
+628,1,346,823,16,
+0,628,1,2105,824,
+17,825,15,730,1,
+-1,1,5,826,20,
+827,4,26,73,0,
+102,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,51,0,1,
+191,1,3,1,6,
+1,5,828,22,1,
+49,1,2106,829,16,
+0,628,1,97,830,
+16,0,628,1,1860,
+831,17,832,15,833,
+4,34,37,0,68,
+0,111,0,87,0,
 104,0,105,0,108,
 0,101,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,1,-1,1,5,
-873,20,874,4,32,
-87,0,104,0,105,
-0,108,0,101,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,1,193,1,
-3,1,6,1,5,
-875,22,1,51,1,
-1933,876,16,0,628,
-1,431,877,16,0,
-628,1,1585,878,16,
-0,628,1,182,879,
-16,0,628,1,1189,
-880,16,0,628,1,
-1443,881,16,0,628,
-1,1695,882,16,0,
-628,1,2198,883,16,
-0,628,1,447,884,
-16,0,628,1,2458,
-885,17,886,15,887,
-4,28,37,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,76,0,105,
-0,115,0,116,0,
-1,-1,1,5,888,
-20,889,4,30,83,
+834,20,835,4,36,
+68,0,111,0,87,
+0,104,0,105,0,
+108,0,101,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,76,0,105,
-0,115,0,116,0,
+116,0,95,0,49,
+0,1,195,1,3,
+1,8,1,7,836,
+22,1,53,1,2364,
+837,17,838,15,799,
+1,-1,1,5,839,
+20,840,4,18,70,
+0,111,0,114,0,
+76,0,111,0,111,
+0,112,0,95,0,
+50,0,1,198,1,
+3,1,9,1,8,
+841,22,1,56,1,
+102,842,16,0,628,
+1,112,843,16,0,
+628,1,1117,844,16,
+0,628,1,1873,845,
+17,846,15,833,1,
+-1,1,5,847,20,
+848,4,36,68,0,
+111,0,87,0,104,
+0,105,0,108,0,
+101,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
 95,0,50,0,1,
-170,1,3,1,3,
-1,2,890,22,1,
-28,1,2459,891,17,
-892,15,893,4,36,
-37,0,67,0,111,
-0,109,0,112,0,
-111,0,117,0,110,
-0,100,0,83,0,
+196,1,3,1,8,
+1,7,849,22,1,
+54,1,1876,850,16,
+0,628,1,124,851,
+16,0,628,1,2136,
+852,17,853,15,730,
+1,-1,1,5,854,
+20,855,4,26,73,
+0,102,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
-0,1,-1,1,5,
-894,20,895,4,38,
-67,0,111,0,109,
-0,112,0,111,0,
-117,0,110,0,100,
+0,95,0,52,0,
+1,192,1,3,1,
+8,1,7,856,22,
+1,50,1,381,857,
+16,0,628,1,525,
+858,16,0,628,1,
+137,859,16,0,628,
+1,1901,860,16,0,
+628,1,1153,861,16,
+0,628,1,151,862,
+16,0,628,1,1407,
+863,16,0,628,1,
+1659,864,16,0,628,
+1,2413,865,16,0,
+628,1,406,866,16,
+0,628,1,1371,867,
+16,0,628,1,166,
+868,16,0,628,1,
+1622,869,16,0,628,
+1,1931,870,17,871,
+15,872,4,30,37,
+0,87,0,104,0,
+105,0,108,0,101,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
-110,0,116,0,95,
-0,50,0,1,168,
-1,3,1,4,1,
-3,896,22,1,26,
-1,1958,897,16,0,
-628,1,2462,898,17,
-899,15,887,1,-1,
-1,5,900,20,901,
+110,0,116,0,1,
+-1,1,5,873,20,
+874,4,32,87,0,
+104,0,105,0,108,
+0,101,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,49,0,
+1,193,1,3,1,
+6,1,5,875,22,
+1,51,1,1933,876,
+16,0,628,1,431,
+877,16,0,628,1,
+1585,878,16,0,628,
+1,182,879,16,0,
+628,1,1189,880,16,
+0,628,1,1443,881,
+16,0,628,1,1695,
+882,16,0,628,1,
+2198,883,16,0,628,
+1,447,884,16,0,
+628,1,2458,885,17,
+886,15,887,4,28,
+37,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+76,0,105,0,115,
+0,116,0,1,-1,
+1,5,888,20,889,
 4,30,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
 76,0,105,0,115,
 0,116,0,95,0,
-49,0,1,169,1,
-3,1,2,1,1,
-902,22,1,27,1,
-1657,903,17,904,15,
-737,1,-1,1,5,
-905,20,906,4,22,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-50,0,1,173,1,
+50,0,1,170,1,
 3,1,3,1,2,
-907,22,1,31,1,
-2464,908,17,909,15,
-893,1,-1,1,5,
-910,20,911,4,38,
+890,22,1,28,1,
+2459,891,17,892,15,
+893,4,36,37,0,
 67,0,111,0,109,
 0,112,0,111,0,
 117,0,110,0,100,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,1,167,
-1,3,1,3,1,
-2,912,22,1,25,
-1,199,913,16,0,
-628,1,459,914,16,
-0,628,1,462,915,
-16,0,628,1,217,
-916,16,0,628,1,
-2227,917,17,918,15,
-872,1,-1,1,5,
-919,20,920,4,32,
-87,0,104,0,105,
-0,108,0,101,0,
+110,0,116,0,1,
+-1,1,5,894,20,
+895,4,38,67,0,
+111,0,109,0,112,
+0,111,0,117,0,
+110,0,100,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,50,
+0,1,168,1,3,
+1,4,1,3,896,
+22,1,26,1,1958,
+897,16,0,628,1,
+2462,898,17,899,15,
+887,1,-1,1,5,
+900,20,901,4,30,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,76,0,
+105,0,115,0,116,
+0,95,0,49,0,
+1,169,1,3,1,
+2,1,1,902,22,
+1,27,1,1657,903,
+17,904,15,737,1,
+-1,1,5,905,20,
+906,4,22,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,50,0,
+1,173,1,3,1,
+3,1,2,907,22,
+1,31,1,2464,908,
+17,909,15,893,1,
+-1,1,5,910,20,
+911,4,38,67,0,
+111,0,109,0,112,
+0,111,0,117,0,
+110,0,100,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,49,
+0,1,167,1,3,
+1,3,1,2,912,
+22,1,25,1,199,
+913,16,0,628,1,
+459,914,16,0,628,
+1,462,915,16,0,
+628,1,217,916,16,
+0,628,1,2227,917,
+17,918,15,872,1,
+-1,1,5,919,20,
+920,4,32,87,0,
+104,0,105,0,108,
+0,101,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,50,0,
+1,194,1,3,1,
+6,1,5,921,22,
+1,52,1,1225,922,
+16,0,628,1,1479,
+923,16,0,628,1,
+1731,924,16,0,628,
+1,1989,925,17,926,
+15,730,1,-1,1,
+5,927,20,928,4,
+26,73,0,102,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-50,0,1,194,1,
+49,0,1,189,1,
 3,1,6,1,5,
-921,22,1,52,1,
-1225,922,16,0,628,
-1,1479,923,16,0,
-628,1,1731,924,16,
-0,628,1,1989,925,
-17,926,15,730,1,
--1,1,5,927,20,
-928,4,26,73,0,
-102,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
+929,22,1,47,1,
+1990,930,16,0,628,
+1,236,931,16,0,
+628,1,2670,932,16,
+0,628,1,1756,933,
+16,0,628,1,4,
+934,19,193,1,4,
+935,5,100,1,256,
+936,16,0,548,1,
+1261,937,16,0,548,
+1,509,938,16,0,
+548,1,1515,939,16,
+0,548,1,2021,728,
+1,1775,940,16,0,
+548,1,2029,735,1,
+2030,741,1,2031,746,
+1,2032,751,1,2033,
+756,1,277,941,16,
+0,548,1,2035,762,
+1,2037,767,1,2039,
+772,1,32,942,16,
+0,548,1,2041,778,
+1,2293,943,16,0,
+548,1,2043,784,1,
+2045,789,1,40,944,
+16,0,195,1,41,
+945,16,0,548,1,
+1297,946,16,0,548,
+1,43,947,16,0,
+548,1,44,948,16,
+0,195,1,1803,797,
+1,1804,949,16,0,
+548,1,299,950,16,
+0,548,1,47,951,
+16,0,191,1,52,
+952,16,0,548,1,
+2318,953,16,0,548,
+1,63,954,16,0,
+211,1,66,955,16,
+0,209,1,2075,956,
+16,0,548,1,1574,
+809,1,71,957,16,
+0,548,1,76,958,
+16,0,548,1,1834,
+959,16,0,548,1,
+2337,960,16,0,548,
+1,79,961,16,0,
+548,1,1335,962,16,
+0,548,1,322,963,
+16,0,548,1,85,
+964,16,0,548,1,
+89,965,16,0,548,
+1,346,966,16,0,
+548,1,97,967,16,
+0,548,1,2106,968,
+16,0,548,1,102,
+969,16,0,548,1,
+1860,831,1,2364,837,
+1,1114,970,16,0,
+191,1,112,971,16,
+0,548,1,1117,972,
+16,0,548,1,1873,
+845,1,1876,973,16,
+0,548,1,124,974,
+16,0,548,1,2136,
+852,1,381,975,16,
+0,548,1,525,976,
+16,0,548,1,137,
+977,16,0,548,1,
+1901,978,16,0,548,
+1,1153,979,16,0,
+548,1,151,980,16,
+0,548,1,1407,981,
+16,0,548,1,1659,
+982,16,0,548,1,
+2413,983,16,0,548,
+1,406,984,16,0,
+548,1,1371,985,16,
+0,548,1,2105,824,
+1,166,986,16,0,
+548,1,1622,987,16,
+0,548,1,1931,870,
+1,1933,988,16,0,
+548,1,431,989,16,
+0,548,1,1585,990,
+16,0,548,1,182,
+991,16,0,548,1,
+1189,992,16,0,548,
+1,1443,993,16,0,
+548,1,1695,994,16,
+0,548,1,2198,995,
+16,0,548,1,447,
+996,16,0,548,1,
+2458,885,1,2459,891,
+1,1958,997,16,0,
+548,1,2462,898,1,
+1657,903,1,2464,908,
+1,199,998,16,0,
+548,1,459,999,16,
+0,548,1,462,1000,
+16,0,548,1,217,
+1001,16,0,548,1,
+2227,917,1,1225,1002,
+16,0,548,1,1479,
+1003,16,0,548,1,
+1731,1004,16,0,548,
+1,1989,925,1,1990,
+1005,16,0,548,1,
+236,1006,16,0,548,
+1,2670,1007,16,0,
+548,1,1756,1008,16,
+0,548,1,5,1009,
+19,190,1,5,1010,
+5,100,1,256,1011,
+16,0,544,1,1261,
+1012,16,0,544,1,
+509,1013,16,0,544,
+1,1515,1014,16,0,
+544,1,2021,728,1,
+1775,1015,16,0,544,
+1,2029,735,1,2030,
+741,1,2031,746,1,
+2032,751,1,2033,756,
+1,277,1016,16,0,
+544,1,2035,762,1,
+2037,767,1,2039,772,
+1,32,1017,16,0,
+544,1,2041,778,1,
+2293,1018,16,0,544,
+1,2043,784,1,2045,
+789,1,40,1019,16,
+0,194,1,41,1020,
+16,0,544,1,1297,
+1021,16,0,544,1,
+43,1022,16,0,544,
+1,44,1023,16,0,
+194,1,1803,797,1,
+1804,1024,16,0,544,
+1,299,1025,16,0,
+544,1,47,1026,16,
+0,188,1,52,1027,
+16,0,544,1,2318,
+1028,16,0,544,1,
+63,1029,16,0,210,
+1,66,1030,16,0,
+208,1,2075,1031,16,
+0,544,1,1574,809,
+1,71,1032,16,0,
+544,1,76,1033,16,
+0,544,1,1834,1034,
+16,0,544,1,2337,
+1035,16,0,544,1,
+79,1036,16,0,544,
+1,1335,1037,16,0,
+544,1,322,1038,16,
+0,544,1,85,1039,
+16,0,544,1,89,
+1040,16,0,544,1,
+346,1041,16,0,544,
+1,97,1042,16,0,
+544,1,2106,1043,16,
+0,544,1,102,1044,
+16,0,544,1,1860,
+831,1,2364,837,1,
+1114,1045,16,0,188,
+1,112,1046,16,0,
+544,1,1117,1047,16,
+0,544,1,1873,845,
+1,1876,1048,16,0,
+544,1,124,1049,16,
+0,544,1,2136,852,
+1,381,1050,16,0,
+544,1,525,1051,16,
+0,544,1,137,1052,
+16,0,544,1,1901,
+1053,16,0,544,1,
+1153,1054,16,0,544,
+1,151,1055,16,0,
+544,1,1407,1056,16,
+0,544,1,1659,1057,
+16,0,544,1,2413,
+1058,16,0,544,1,
+406,1059,16,0,544,
+1,1371,1060,16,0,
+544,1,2105,824,1,
+166,1061,16,0,544,
+1,1622,1062,16,0,
+544,1,1931,870,1,
+1933,1063,16,0,544,
+1,431,1064,16,0,
+544,1,1585,1065,16,
+0,544,1,182,1066,
+16,0,544,1,1189,
+1067,16,0,544,1,
+1443,1068,16,0,544,
+1,1695,1069,16,0,
+544,1,2198,1070,16,
+0,544,1,447,1071,
+16,0,544,1,2458,
+885,1,2459,891,1,
+1958,1072,16,0,544,
+1,2462,898,1,1657,
+903,1,2464,908,1,
+199,1073,16,0,544,
+1,459,1074,16,0,
+544,1,462,1075,16,
+0,544,1,217,1076,
+16,0,544,1,2227,
+917,1,1225,1077,16,
+0,544,1,1479,1078,
+16,0,544,1,1731,
+1079,16,0,544,1,
+1989,925,1,1990,1080,
+16,0,544,1,236,
+1081,16,0,544,1,
+2670,1082,16,0,544,
+1,1756,1083,16,0,
+544,1,6,1084,19,
+286,1,6,1085,5,
+2,1,1114,1086,16,
+0,284,1,40,1087,
+16,0,533,1,7,
+1088,19,253,1,7,
+1089,5,2,1,1114,
+1090,16,0,251,1,
+40,1091,16,0,473,
+1,8,1092,19,217,
+1,8,1093,5,2,
+1,1114,1094,16,0,
+215,1,40,1095,16,
+0,450,1,9,1096,
+19,223,1,9,1097,
+5,2,1,1114,1098,
+16,0,221,1,40,
+1099,16,0,392,1,
+10,1100,19,173,1,
+10,1101,5,2,1,
+1114,1102,16,0,171,
+1,40,1103,16,0,
+332,1,11,1104,19,
+202,1,11,1105,5,
+146,1,1260,1106,17,
+1107,15,1108,4,34,
+37,0,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,1,
+-1,1,5,1109,20,
+1110,4,38,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
 0,110,0,116,0,
-95,0,49,0,1,
-189,1,3,1,6,
-1,5,929,22,1,
-47,1,1990,930,16,
-0,628,1,236,931,
-16,0,628,1,2670,
-932,16,0,628,1,
-1756,933,16,0,628,
-1,4,934,19,193,
-1,4,935,5,100,
-1,256,936,16,0,
-548,1,1261,937,16,
-0,548,1,509,938,
-16,0,548,1,1515,
-939,16,0,548,1,
-2021,728,1,1775,940,
-16,0,548,1,2029,
-735,1,2030,741,1,
-2031,746,1,2032,751,
-1,2033,756,1,277,
-941,16,0,548,1,
-2035,762,1,2037,767,
-1,2039,772,1,32,
-942,16,0,548,1,
-2041,778,1,2293,943,
-16,0,548,1,2043,
-784,1,2045,789,1,
-40,944,16,0,195,
-1,41,945,16,0,
-548,1,1297,946,16,
-0,548,1,43,947,
-16,0,548,1,44,
-948,16,0,195,1,
-1803,797,1,1804,949,
-16,0,548,1,299,
-950,16,0,548,1,
-47,951,16,0,191,
-1,52,952,16,0,
-548,1,2318,953,16,
-0,548,1,63,954,
-16,0,211,1,66,
-955,16,0,209,1,
-2075,956,16,0,548,
-1,1574,809,1,71,
-957,16,0,548,1,
-76,958,16,0,548,
-1,1834,959,16,0,
-548,1,2337,960,16,
-0,548,1,79,961,
-16,0,548,1,1335,
-962,16,0,548,1,
-322,963,16,0,548,
-1,85,964,16,0,
-548,1,89,965,16,
-0,548,1,346,966,
-16,0,548,1,97,
-967,16,0,548,1,
-2106,968,16,0,548,
-1,102,969,16,0,
-548,1,1860,831,1,
-2364,837,1,1114,970,
-16,0,191,1,112,
-971,16,0,548,1,
-1117,972,16,0,548,
-1,1873,845,1,1876,
-973,16,0,548,1,
-124,974,16,0,548,
-1,2136,852,1,381,
-975,16,0,548,1,
-525,976,16,0,548,
-1,137,977,16,0,
-548,1,1901,978,16,
-0,548,1,1153,979,
-16,0,548,1,151,
-980,16,0,548,1,
-1407,981,16,0,548,
-1,1659,982,16,0,
-548,1,2413,983,16,
-0,548,1,406,984,
-16,0,548,1,1371,
-985,16,0,548,1,
-2105,824,1,166,986,
-16,0,548,1,1622,
-987,16,0,548,1,
-1931,870,1,1933,988,
-16,0,548,1,431,
-989,16,0,548,1,
-1585,990,16,0,548,
-1,182,991,16,0,
-548,1,1189,992,16,
-0,548,1,1443,993,
-16,0,548,1,1695,
-994,16,0,548,1,
-2198,995,16,0,548,
-1,447,996,16,0,
-548,1,2458,885,1,
-2459,891,1,1958,997,
-16,0,548,1,2462,
-898,1,1657,903,1,
-2464,908,1,199,998,
-16,0,548,1,459,
-999,16,0,548,1,
-462,1000,16,0,548,
-1,217,1001,16,0,
-548,1,2227,917,1,
-1225,1002,16,0,548,
-1,1479,1003,16,0,
-548,1,1731,1004,16,
-0,548,1,1989,925,
-1,1990,1005,16,0,
-548,1,236,1006,16,
-0,548,1,2670,1007,
-16,0,548,1,1756,
-1008,16,0,548,1,
-5,1009,19,190,1,
-5,1010,5,100,1,
-256,1011,16,0,544,
-1,1261,1012,16,0,
-544,1,509,1013,16,
-0,544,1,1515,1014,
-16,0,544,1,2021,
-728,1,1775,1015,16,
-0,544,1,2029,735,
-1,2030,741,1,2031,
-746,1,2032,751,1,
-2033,756,1,277,1016,
-16,0,544,1,2035,
-762,1,2037,767,1,
-2039,772,1,32,1017,
-16,0,544,1,2041,
-778,1,2293,1018,16,
-0,544,1,2043,784,
-1,2045,789,1,40,
-1019,16,0,194,1,
-41,1020,16,0,544,
-1,1297,1021,16,0,
-544,1,43,1022,16,
-0,544,1,44,1023,
-16,0,194,1,1803,
-797,1,1804,1024,16,
-0,544,1,299,1025,
-16,0,544,1,47,
-1026,16,0,188,1,
-52,1027,16,0,544,
-1,2318,1028,16,0,
-544,1,63,1029,16,
-0,210,1,66,1030,
-16,0,208,1,2075,
-1031,16,0,544,1,
-1574,809,1,71,1032,
-16,0,544,1,76,
-1033,16,0,544,1,
-1834,1034,16,0,544,
-1,2337,1035,16,0,
-544,1,79,1036,16,
-0,544,1,1335,1037,
-16,0,544,1,322,
-1038,16,0,544,1,
-85,1039,16,0,544,
-1,89,1040,16,0,
-544,1,346,1041,16,
-0,544,1,97,1042,
-16,0,544,1,2106,
-1043,16,0,544,1,
-102,1044,16,0,544,
-1,1860,831,1,2364,
-837,1,1114,1045,16,
-0,188,1,112,1046,
-16,0,544,1,1117,
-1047,16,0,544,1,
-1873,845,1,1876,1048,
-16,0,544,1,124,
-1049,16,0,544,1,
-2136,852,1,381,1050,
-16,0,544,1,525,
-1051,16,0,544,1,
-137,1052,16,0,544,
-1,1901,1053,16,0,
-544,1,1153,1054,16,
-0,544,1,151,1055,
-16,0,544,1,1407,
-1056,16,0,544,1,
-1659,1057,16,0,544,
-1,2413,1058,16,0,
-544,1,406,1059,16,
-0,544,1,1371,1060,
-16,0,544,1,2105,
-824,1,166,1061,16,
-0,544,1,1622,1062,
-16,0,544,1,1931,
-870,1,1933,1063,16,
-0,544,1,431,1064,
-16,0,544,1,1585,
-1065,16,0,544,1,
-182,1066,16,0,544,
-1,1189,1067,16,0,
-544,1,1443,1068,16,
-0,544,1,1695,1069,
-16,0,544,1,2198,
-1070,16,0,544,1,
-447,1071,16,0,544,
-1,2458,885,1,2459,
-891,1,1958,1072,16,
-0,544,1,2462,898,
-1,1657,903,1,2464,
-908,1,199,1073,16,
-0,544,1,459,1074,
-16,0,544,1,462,
-1075,16,0,544,1,
-217,1076,16,0,544,
-1,2227,917,1,1225,
-1077,16,0,544,1,
-1479,1078,16,0,544,
-1,1731,1079,16,0,
-544,1,1989,925,1,
-1990,1080,16,0,544,
-1,236,1081,16,0,
-544,1,2670,1082,16,
-0,544,1,1756,1083,
-16,0,544,1,6,
-1084,19,286,1,6,
-1085,5,2,1,1114,
-1086,16,0,284,1,
-40,1087,16,0,533,
-1,7,1088,19,253,
-1,7,1089,5,2,
-1,1114,1090,16,0,
-251,1,40,1091,16,
-0,473,1,8,1092,
-19,217,1,8,1093,
-5,2,1,1114,1094,
-16,0,215,1,40,
-1095,16,0,450,1,
-9,1096,19,223,1,
-9,1097,5,2,1,
-1114,1098,16,0,221,
-1,40,1099,16,0,
-392,1,10,1100,19,
-173,1,10,1101,5,
-2,1,1114,1102,16,
-0,171,1,40,1103,
-16,0,332,1,11,
-1104,19,202,1,11,
-1105,5,146,1,1260,
-1106,17,1107,15,1108,
-4,34,37,0,83,
+95,0,50,0,49,
+0,1,225,1,3,
+1,6,1,5,1111,
+22,1,83,1,1011,
+1112,17,1113,15,1114,
+4,44,37,0,80,
+0,97,0,114,0,
+101,0,110,0,116,
+0,104,0,101,0,
+115,0,105,0,115,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,1,-1,1,5,
+1115,20,1116,4,46,
+80,0,97,0,114,
+0,101,0,110,0,
+116,0,104,0,101,
+0,115,0,105,0,
+115,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,50,
+0,1,272,1,3,
+1,4,1,3,1117,
+22,1,130,1,1514,
+1118,17,1119,15,1108,
+1,-1,1,5,1120,
+20,1121,4,38,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
 115,0,105,0,103,
 0,110,0,109,0,
 101,0,110,0,116,
-0,1,-1,1,5,
-1109,20,1110,4,38,
+0,95,0,49,0,
+52,0,1,218,1,
+3,1,4,1,3,
+1122,22,1,76,1,
+9,1123,17,1124,15,
+1125,4,24,37,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,1,-1,1,
+5,1126,20,1127,4,
+26,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,95,0,
+49,0,1,166,1,
+3,1,3,1,2,
+1128,22,1,24,1,
+262,1129,17,1130,15,
+1131,4,34,37,0,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,-1,1,
+5,1132,20,1133,4,
+36,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+53,0,1,254,1,
+3,1,4,1,3,
+1134,22,1,112,1,
+1267,1135,17,1136,15,
+1108,1,-1,1,5,
+1137,20,1138,4,36,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
 0,115,0,105,0,
 103,0,110,0,109,
 0,101,0,110,0,
-116,0,95,0,50,
-0,49,0,1,225,
-1,3,1,6,1,
-5,1111,22,1,83,
-1,1011,1112,17,1113,
-15,1114,4,44,37,
-0,80,0,97,0,
-114,0,101,0,110,
-0,116,0,104,0,
-101,0,115,0,105,
-0,115,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,-1,
-1,5,1115,20,1116,
-4,46,80,0,97,
-0,114,0,101,0,
-110,0,116,0,104,
-0,101,0,115,0,
-105,0,115,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,50,0,1,272,
-1,3,1,4,1,
-3,1117,22,1,130,
-1,1514,1118,17,1119,
-15,1108,1,-1,1,
-5,1120,20,1121,4,
-38,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,52,0,1,
-218,1,3,1,4,
-1,3,1122,22,1,
-76,1,9,1123,17,
-1124,15,1125,4,24,
-37,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,1,
--1,1,5,1126,20,
-1127,4,26,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-95,0,49,0,1,
-166,1,3,1,3,
-1,2,1128,22,1,
-24,1,262,1129,17,
-1130,15,1131,4,34,
-37,0,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,1,
--1,1,5,1132,20,
-1133,4,36,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,53,0,1,
-254,1,3,1,4,
-1,3,1134,22,1,
-112,1,1267,1135,17,
-1136,15,1108,1,-1,
-1,5,1137,20,1138,
+116,0,95,0,56,
+0,1,212,1,3,
+1,6,1,5,1139,
+22,1,70,1,2021,
+728,1,1521,1140,17,
+1141,15,1108,1,-1,
+1,5,1142,20,1143,
 4,36,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -4240,209 +4253,178 @@ public yyLSLSyntax
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,56,0,1,212,
-1,3,1,6,1,
-5,1139,22,1,70,
-1,2021,728,1,1521,
-1140,17,1141,15,1108,
-1,-1,1,5,1142,
-20,1143,4,36,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,49,0,
-1,205,1,3,1,
-4,1,3,1144,22,
-1,63,1,2024,1145,
-17,1146,15,1147,4,
-24,37,0,83,0,
-116,0,97,0,116,
-0,101,0,67,0,
-104,0,97,0,110,
-0,103,0,101,0,
-1,-1,1,5,1148,
-20,1149,4,26,83,
-0,116,0,97,0,
-116,0,101,0,67,
-0,104,0,97,0,
-110,0,103,0,101,
-0,95,0,49,0,
-1,187,1,3,1,
-3,1,2,1150,22,
-1,45,1,1775,1151,
-17,1152,15,1153,4,
-30,37,0,69,0,
+0,49,0,1,205,
+1,3,1,4,1,
+3,1144,22,1,63,
+1,2024,1145,17,1146,
+15,1147,4,24,37,
+0,83,0,116,0,
+97,0,116,0,101,
+0,67,0,104,0,
+97,0,110,0,103,
+0,101,0,1,-1,
+1,5,1148,20,1149,
+4,26,83,0,116,
+0,97,0,116,0,
+101,0,67,0,104,
+0,97,0,110,0,
+103,0,101,0,95,
+0,49,0,1,187,
+1,3,1,3,1,
+2,1150,22,1,45,
+1,1775,1151,17,1152,
+15,1153,4,30,37,
+0,69,0,109,0,
+112,0,116,0,121,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,1,
+-1,1,5,1154,20,
+1155,4,32,69,0,
 109,0,112,0,116,
 0,121,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
-0,1,-1,1,5,
-1154,20,1155,4,32,
-69,0,109,0,112,
-0,116,0,121,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,1,171,1,
-3,1,1,1,0,
-1156,22,1,29,1,
-19,1157,17,1124,1,
-2,1128,1,2028,1158,
-17,1159,15,1160,4,
-20,37,0,74,0,
+0,95,0,49,0,
+1,171,1,3,1,
+1,1,0,1156,22,
+1,29,1,19,1157,
+17,1124,1,2,1128,
+1,2028,1158,17,1159,
+15,1160,4,20,37,
+0,74,0,117,0,
+109,0,112,0,76,
+0,97,0,98,0,
+101,0,108,0,1,
+-1,1,5,1161,20,
+1162,4,22,74,0,
 117,0,109,0,112,
 0,76,0,97,0,
 98,0,101,0,108,
-0,1,-1,1,5,
-1161,20,1162,4,22,
-74,0,117,0,109,
-0,112,0,76,0,
-97,0,98,0,101,
-0,108,0,95,0,
-49,0,1,185,1,
-3,1,3,1,2,
-1163,22,1,43,1,
-2029,735,1,2281,1164,
-17,1165,15,1166,4,
-34,37,0,70,0,
-111,0,114,0,76,
-0,111,0,111,0,
-112,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-1,-1,1,5,1167,
-20,1168,4,36,70,
-0,111,0,114,0,
-76,0,111,0,111,
-0,112,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,50,0,
-1,200,1,3,1,
-2,1,1,1169,22,
-1,58,1,2031,746,
-1,2032,751,1,2033,
-756,1,2034,1170,16,
-0,587,1,2035,762,
-1,2036,1171,16,0,
-534,1,2037,767,1,
-2038,1172,16,0,538,
-1,2039,772,1,32,
-1173,17,1152,1,0,
-1156,1,2041,778,1,
-2042,1174,16,0,655,
-1,2043,784,1,2044,
-1175,16,0,599,1,
-2045,789,1,2299,1176,
-16,0,236,1,1296,
-1177,17,1178,15,1108,
-1,-1,1,5,1179,
-20,1180,4,38,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,50,0,
-48,0,1,224,1,
-3,1,6,1,5,
-1181,22,1,82,1,
-283,1182,17,1183,15,
-1131,1,-1,1,5,
-1184,20,1185,4,36,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,52,
-0,1,253,1,3,
-1,4,1,3,1186,
-22,1,111,1,40,
-1187,17,1188,15,1189,
-4,32,37,0,73,
-0,100,0,101,0,
-110,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,1,
--1,1,5,1190,20,
-1191,4,34,73,0,
-100,0,101,0,110,
-0,116,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-49,0,1,239,1,
-3,1,2,1,1,
-1192,22,1,97,1,
-44,1193,17,1188,1,
-1,1192,1,1803,797,
-1,47,1194,17,1195,
-15,1196,4,38,37,
-0,73,0,100,0,
-101,0,110,0,116,
-0,68,0,111,0,
+0,95,0,49,0,
+1,185,1,3,1,
+3,1,2,1163,22,
+1,43,1,2029,735,
+1,2281,1164,17,1165,
+15,1166,4,34,37,
+0,70,0,111,0,
+114,0,76,0,111,
+0,111,0,112,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,-1,
+1,5,1167,20,1168,
+4,36,70,0,111,
+0,114,0,76,0,
+111,0,111,0,112,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,95,
+0,50,0,1,200,
+1,3,1,2,1,
+1,1169,22,1,58,
+1,2031,746,1,2032,
+751,1,2033,756,1,
+2034,1170,16,0,587,
+1,2035,762,1,2036,
+1171,16,0,534,1,
+2037,767,1,2038,1172,
+16,0,538,1,2039,
+772,1,32,1173,17,
+1152,1,0,1156,1,
+2041,778,1,2042,1174,
+16,0,655,1,2043,
+784,1,2044,1175,16,
+0,599,1,2045,789,
+1,2299,1176,16,0,
+236,1,1296,1177,17,
+1178,15,1108,1,-1,
+1,5,1179,20,1180,
+4,38,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,50,0,48,0,
+1,224,1,3,1,
+6,1,5,1181,22,
+1,82,1,283,1182,
+17,1183,15,1131,1,
+-1,1,5,1184,20,
+1185,4,36,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,52,0,1,
+253,1,3,1,4,
+1,3,1186,22,1,
+111,1,40,1187,17,
+1188,15,1189,4,32,
+37,0,73,0,100,
+0,101,0,110,0,
 116,0,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,1,-1,1,
-5,1197,20,1198,4,
-40,73,0,100,0,
+5,1190,20,1191,4,
+34,73,0,100,0,
 101,0,110,0,116,
-0,68,0,111,0,
-116,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,1,240,1,3,
-1,4,1,3,1199,
-22,1,98,1,48,
-1200,17,1201,15,1202,
-4,58,37,0,73,
-0,110,0,99,0,
-114,0,101,0,109,
-0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,114,0,
-101,0,109,0,101,
-0,110,0,116,0,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,49,0,
+1,239,1,3,1,
+2,1,1,1192,22,
+1,97,1,44,1193,
+17,1188,1,1,1192,
+1,1803,797,1,47,
+1194,17,1195,15,1196,
+4,38,37,0,73,
+0,100,0,101,0,
+110,0,116,0,68,
+0,111,0,116,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-1,-1,1,5,1203,
-20,1204,4,60,73,
-0,110,0,99,0,
-114,0,101,0,109,
-0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,114,0,
-101,0,109,0,101,
-0,110,0,116,0,
+1,-1,1,5,1197,
+20,1198,4,40,73,
+0,100,0,101,0,
+110,0,116,0,68,
+0,111,0,116,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,52,0,1,
-244,1,3,1,5,
-1,4,1205,22,1,
-102,1,49,1206,17,
-1207,15,1202,1,-1,
-1,5,1208,20,1209,
+95,0,49,0,1,
+240,1,3,1,4,
+1,3,1199,22,1,
+98,1,48,1200,17,
+1201,15,1202,4,58,
+37,0,73,0,110,
+0,99,0,114,0,
+101,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,114,0,101,0,
+109,0,101,0,110,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,-1,
+1,5,1203,20,1204,
 4,60,73,0,110,
 0,99,0,114,0,
 101,0,109,0,101,
@@ -4455,12 +4437,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-51,0,1,243,1,
+52,0,1,244,1,
 3,1,5,1,4,
-1210,22,1,101,1,
-50,1211,17,1212,15,
+1205,22,1,102,1,
+49,1206,17,1207,15,
 1202,1,-1,1,5,
-1213,20,1214,4,60,
+1208,20,1209,4,60,
 73,0,110,0,99,
 0,114,0,101,0,
 109,0,101,0,110,
@@ -4472,13 +4454,13 @@ public yyLSLSyntax
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,50,0,
-1,242,1,3,1,
-3,1,2,1215,22,
-1,100,1,51,1216,
-17,1217,15,1202,1,
--1,1,5,1218,20,
-1219,4,60,73,0,
+0,95,0,51,0,
+1,243,1,3,1,
+5,1,4,1210,22,
+1,101,1,50,1211,
+17,1212,15,1202,1,
+-1,1,5,1213,20,
+1214,4,60,73,0,
 110,0,99,0,114,
 0,101,0,109,0,
 101,0,110,0,116,
@@ -4490,67 +4472,71 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,49,0,1,241,
+0,50,0,1,242,
 1,3,1,3,1,
-2,1220,22,1,99,
-1,305,1221,17,1222,
-15,1131,1,-1,1,
-5,1223,20,1224,4,
-36,66,0,105,0,
-110,0,97,0,114,
-0,121,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-51,0,1,252,1,
-3,1,4,1,3,
-1225,22,1,110,1,
-525,1226,17,1227,15,
-1228,4,34,37,0,
-82,0,111,0,116,
-0,97,0,116,0,
-105,0,111,0,110,
-0,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,1,-1,1,
-5,1229,20,1230,4,
-36,82,0,111,0,
-116,0,97,0,116,
-0,105,0,111,0,
-110,0,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,95,0,
-49,0,1,237,1,
-3,1,10,1,9,
-1231,22,1,95,1,
-63,1232,17,1233,15,
-1234,4,38,37,0,
-84,0,121,0,112,
-0,101,0,99,0,
-97,0,115,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,-1,1,5,
-1235,20,1236,4,40,
-84,0,121,0,112,
+2,1215,22,1,100,
+1,51,1216,17,1217,
+15,1202,1,-1,1,
+5,1218,20,1219,4,
+60,73,0,110,0,
+99,0,114,0,101,
+0,109,0,101,0,
+110,0,116,0,68,
 0,101,0,99,0,
-97,0,115,0,116,
+114,0,101,0,109,
+0,101,0,110,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,49,
+0,1,241,1,3,
+1,3,1,2,1220,
+22,1,99,1,305,
+1221,17,1222,15,1131,
+1,-1,1,5,1223,
+20,1224,4,36,66,
+0,105,0,110,0,
+97,0,114,0,121,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,50,0,
-1,274,1,3,1,
-5,1,4,1237,22,
-1,132,1,66,1238,
-17,1239,15,1234,1,
--1,1,5,1240,20,
-1241,4,40,84,0,
+0,95,0,51,0,
+1,252,1,3,1,
+4,1,3,1225,22,
+1,110,1,525,1226,
+17,1227,15,1228,4,
+34,37,0,82,0,
+111,0,116,0,97,
+0,116,0,105,0,
+111,0,110,0,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+1,-1,1,5,1229,
+20,1230,4,36,82,
+0,111,0,116,0,
+97,0,116,0,105,
+0,111,0,110,0,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,95,0,49,0,
+1,237,1,3,1,
+10,1,9,1231,22,
+1,95,1,63,1232,
+17,1233,15,1234,4,
+38,37,0,84,0,
+121,0,112,0,101,
+0,99,0,97,0,
+115,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,1,
+-1,1,5,1235,20,
+1236,4,40,84,0,
 121,0,112,0,101,
 0,99,0,97,0,
 115,0,116,0,69,
@@ -4558,12 +4544,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,51,0,1,275,
-1,3,1,7,1,
-6,1242,22,1,133,
-1,67,1243,17,1244,
+0,50,0,1,274,
+1,3,1,5,1,
+4,1237,22,1,132,
+1,66,1238,17,1239,
 15,1234,1,-1,1,
-5,1245,20,1246,4,
+5,1240,20,1241,4,
 40,84,0,121,0,
 112,0,101,0,99,
 0,97,0,115,0,
@@ -4571,13 +4557,13 @@ public yyLSLSyntax
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,95,0,55,
-0,1,279,1,3,
-1,8,1,7,1247,
-22,1,137,1,68,
-1248,17,1249,15,1234,
-1,-1,1,5,1250,
-20,1251,4,40,84,
+110,0,95,0,51,
+0,1,275,1,3,
+1,7,1,6,1242,
+22,1,133,1,67,
+1243,17,1244,15,1234,
+1,-1,1,5,1245,
+20,1246,4,40,84,
 0,121,0,112,0,
 101,0,99,0,97,
 0,115,0,116,0,
@@ -4585,12 +4571,12 @@ public yyLSLSyntax
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,53,0,1,
-277,1,3,1,8,
-1,7,1252,22,1,
-135,1,69,1253,17,
-1254,15,1234,1,-1,
-1,5,1255,20,1256,
+95,0,55,0,1,
+279,1,3,1,8,
+1,7,1247,22,1,
+137,1,68,1248,17,
+1249,15,1234,1,-1,
+1,5,1250,20,1251,
 4,40,84,0,121,
 0,112,0,101,0,
 99,0,97,0,115,
@@ -4599,12 +4585,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-54,0,1,278,1,
-3,1,6,1,5,
-1257,22,1,136,1,
-70,1258,17,1259,15,
+53,0,1,277,1,
+3,1,8,1,7,
+1252,22,1,135,1,
+69,1253,17,1254,15,
 1234,1,-1,1,5,
-1260,20,1261,4,40,
+1255,20,1256,4,40,
 84,0,121,0,112,
 0,101,0,99,0,
 97,0,115,0,116,
@@ -4612,13 +4598,13 @@ public yyLSLSyntax
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,52,0,
-1,276,1,3,1,
-6,1,5,1262,22,
-1,134,1,74,1263,
-17,1264,15,1234,1,
--1,1,5,1265,20,
-1266,4,40,84,0,
+0,95,0,54,0,
+1,278,1,3,1,
+6,1,5,1257,22,
+1,136,1,70,1258,
+17,1259,15,1234,1,
+-1,1,5,1260,20,
+1261,4,40,84,0,
 121,0,112,0,101,
 0,99,0,97,0,
 115,0,116,0,69,
@@ -4626,302 +4612,305 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,57,0,1,281,
-1,3,1,7,1,
-6,1267,22,1,139,
-1,1013,1268,17,1269,
-15,1114,1,-1,1,
-5,1270,20,1271,4,
-46,80,0,97,0,
-114,0,101,0,110,
-0,116,0,104,0,
-101,0,115,0,105,
-0,115,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-49,0,1,271,1,
-3,1,4,1,3,
-1272,22,1,129,1,
-1332,1273,17,1274,15,
-1108,1,-1,1,5,
-1275,20,1276,4,38,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,57,0,1,223,
+0,52,0,1,276,
 1,3,1,6,1,
-5,1277,22,1,81,
-1,2337,1278,17,1152,
-1,0,1156,1,1585,
-1279,17,1280,15,1281,
-4,32,37,0,82,
-0,101,0,116,0,
-117,0,114,0,110,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,1,
--1,1,5,1282,20,
-1283,4,34,82,0,
-101,0,116,0,117,
-0,114,0,110,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-50,0,1,230,1,
-3,1,2,1,1,
-1284,22,1,88,1,
-2023,1285,17,1286,15,
-1147,1,-1,1,5,
-1287,20,1288,4,26,
-83,0,116,0,97,
-0,116,0,101,0,
-67,0,104,0,97,
-0,110,0,103,0,
-101,0,95,0,50,
-0,1,188,1,3,
-1,3,1,2,1289,
-22,1,46,1,2136,
-852,1,82,1290,17,
-1291,15,1292,4,32,
-37,0,85,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
+5,1262,22,1,134,
+1,74,1263,17,1264,
+15,1234,1,-1,1,
+5,1265,20,1266,4,
+40,84,0,121,0,
+112,0,101,0,99,
+0,97,0,115,0,
+116,0,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,1,-1,1,
-5,1293,20,1294,4,
-34,85,0,110,0,
-97,0,114,0,121,
+110,0,95,0,57,
+0,1,281,1,3,
+1,7,1,6,1267,
+22,1,139,1,1013,
+1268,17,1269,15,1114,
+1,-1,1,5,1270,
+20,1271,4,46,80,
+0,97,0,114,0,
+101,0,110,0,116,
+0,104,0,101,0,
+115,0,105,0,115,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,51,0,
-1,270,1,3,1,
-3,1,2,1295,22,
-1,128,1,2026,1296,
-17,1297,15,1298,4,
-28,37,0,74,0,
-117,0,109,0,112,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,1,
--1,1,5,1299,20,
-1300,4,30,74,0,
-117,0,109,0,112,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,1,186,
-1,3,1,3,1,
-2,1301,22,1,44,
-1,1591,1302,17,1303,
-15,1281,1,-1,1,
-5,1304,20,1305,4,
-34,82,0,101,0,
-116,0,117,0,114,
-0,110,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
 0,95,0,49,0,
-1,229,1,3,1,
-3,1,2,1306,22,
-1,87,1,1341,1307,
-17,1308,15,1108,1,
--1,1,5,1309,20,
-1310,4,36,83,0,
+1,271,1,3,1,
+4,1,3,1272,22,
+1,129,1,1332,1273,
+17,1274,15,1108,1,
+-1,1,5,1275,20,
+1276,4,38,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,54,0,1,
-210,1,3,1,4,
-1,3,1311,22,1,
-68,1,2030,741,1,
-328,1312,17,1313,15,
-1131,1,-1,1,5,
-1314,20,1315,4,36,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,50,
-0,1,251,1,3,
-1,4,1,3,1316,
-22,1,109,1,1303,
-1317,17,1318,15,1108,
-1,-1,1,5,1319,
-20,1320,4,36,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
+95,0,49,0,57,
+0,1,223,1,3,
+1,6,1,5,1277,
+22,1,81,1,2337,
+1278,17,1152,1,0,
+1156,1,1585,1279,17,
+1280,15,1281,4,32,
+37,0,82,0,101,
+0,116,0,117,0,
+114,0,110,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,1282,20,1283,4,
+34,82,0,101,0,
+116,0,117,0,114,
+0,110,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
 101,0,110,0,116,
-0,95,0,55,0,
-1,211,1,3,1,
-6,1,5,1321,22,
-1,69,1,1096,1322,
-17,1323,15,1324,4,
-26,37,0,70,0,
-117,0,110,0,99,
-0,116,0,105,0,
-111,0,110,0,67,
-0,97,0,108,0,
-108,0,1,-1,1,
-5,1325,20,1326,4,
-28,70,0,117,0,
+0,95,0,50,0,
+1,230,1,3,1,
+2,1,1,1284,22,
+1,88,1,2023,1285,
+17,1286,15,1147,1,
+-1,1,5,1287,20,
+1288,4,26,83,0,
+116,0,97,0,116,
+0,101,0,67,0,
+104,0,97,0,110,
+0,103,0,101,0,
+95,0,50,0,1,
+188,1,3,1,3,
+1,2,1289,22,1,
+46,1,2136,852,1,
+82,1290,17,1291,15,
+1292,4,32,37,0,
+85,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+1,-1,1,5,1293,
+20,1294,4,34,85,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,51,0,1,270,
+1,3,1,3,1,
+2,1295,22,1,128,
+1,2026,1296,17,1297,
+15,1298,4,28,37,
+0,74,0,117,0,
+109,0,112,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,1299,20,1300,4,
+30,74,0,117,0,
+109,0,112,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,49,
+0,1,186,1,3,
+1,3,1,2,1301,
+22,1,44,1,1591,
+1302,17,1303,15,1281,
+1,-1,1,5,1304,
+20,1305,4,34,82,
+0,101,0,116,0,
+117,0,114,0,110,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,95,
+0,49,0,1,229,
+1,3,1,3,1,
+2,1306,22,1,87,
+1,1341,1307,17,1308,
+15,1108,1,-1,1,
+5,1309,20,1310,4,
+36,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+54,0,1,210,1,
+3,1,4,1,3,
+1311,22,1,68,1,
+2030,741,1,328,1312,
+17,1313,15,1131,1,
+-1,1,5,1314,20,
+1315,4,36,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,50,0,1,
+251,1,3,1,4,
+1,3,1316,22,1,
+109,1,1303,1317,17,
+1318,15,1108,1,-1,
+1,5,1319,20,1320,
+4,36,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,55,0,1,211,
+1,3,1,6,1,
+5,1321,22,1,69,
+1,1096,1322,17,1323,
+15,1324,4,26,37,
+0,70,0,117,0,
 110,0,99,0,116,
 0,105,0,111,0,
 110,0,67,0,97,
 0,108,0,108,0,
-95,0,49,0,1,
-282,1,3,1,5,
-1,4,1327,22,1,
-140,1,93,1328,17,
-1329,15,1292,1,-1,
-1,5,1330,20,1331,
-4,34,85,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,50,
-0,1,269,1,3,
-1,3,1,2,1332,
-22,1,127,1,1550,
-1333,17,1334,15,1108,
-1,-1,1,5,1335,
-20,1336,4,38,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,49,0,
-51,0,1,217,1,
-3,1,4,1,3,
-1337,22,1,75,1,
-2040,1338,16,0,542,
-1,2106,1339,17,1152,
-1,0,1156,1,1555,
-1340,16,0,615,1,
-827,1341,17,1342,15,
-1131,1,-1,1,5,
-1343,20,1344,4,38,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,53,0,1,264,
-1,3,1,4,1,
-3,1345,22,1,122,
-1,1859,1346,16,0,
-313,1,1860,831,1,
-1804,1347,17,1152,1,
-0,1156,1,107,1348,
-17,1349,15,1292,1,
--1,1,5,1350,20,
-1351,4,34,85,0,
-110,0,97,0,114,
-0,121,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-49,0,1,268,1,
-3,1,3,1,2,
-1352,22,1,126,1,
-1114,1353,17,1195,1,
-3,1199,1,1048,1354,
-17,1355,15,1131,1,
--1,1,5,1356,20,
-1357,4,38,66,0,
+1,-1,1,5,1325,
+20,1326,4,28,70,
+0,117,0,110,0,
+99,0,116,0,105,
+0,111,0,110,0,
+67,0,97,0,108,
+0,108,0,95,0,
+49,0,1,282,1,
+3,1,5,1,4,
+1327,22,1,140,1,
+93,1328,17,1329,15,
+1292,1,-1,1,5,
+1330,20,1331,4,34,
+85,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,50,0,1,
+269,1,3,1,3,
+1,2,1332,22,1,
+127,1,1550,1333,17,
+1334,15,1108,1,-1,
+1,5,1335,20,1336,
+4,38,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,49,0,51,0,
+1,217,1,3,1,
+4,1,3,1337,22,
+1,75,1,2040,1338,
+16,0,542,1,2106,
+1339,17,1152,1,0,
+1156,1,1555,1340,16,
+0,615,1,827,1341,
+17,1342,15,1131,1,
+-1,1,5,1343,20,
+1344,4,38,66,0,
 105,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,49,0,56,
-0,1,267,1,3,
-1,4,1,3,1358,
-22,1,125,1,352,
-1359,17,1360,15,1131,
-1,-1,1,5,1361,
-20,1362,4,36,66,
-0,105,0,110,0,
+95,0,49,0,53,
+0,1,264,1,3,
+1,4,1,3,1345,
+22,1,122,1,1859,
+1346,16,0,313,1,
+1860,831,1,1804,1347,
+17,1152,1,0,1156,
+1,107,1348,17,1349,
+15,1292,1,-1,1,
+5,1350,20,1351,4,
+34,85,0,110,0,
 97,0,114,0,121,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,49,0,
-1,250,1,3,1,
-4,1,3,1363,22,
-1,108,1,1872,1364,
-16,0,323,1,1873,
-845,1,118,1365,17,
-1366,15,1131,1,-1,
-1,5,1367,20,1368,
-4,38,66,0,105,
+1,268,1,3,1,
+3,1,2,1352,22,
+1,126,1,1114,1353,
+17,1195,1,3,1199,
+1,1048,1354,17,1355,
+15,1131,1,-1,1,
+5,1356,20,1357,4,
+38,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+49,0,56,0,1,
+267,1,3,1,4,
+1,3,1358,22,1,
+125,1,352,1359,17,
+1360,15,1131,1,-1,
+1,5,1361,20,1362,
+4,36,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,49,0,52,0,
-1,263,1,3,1,
-4,1,3,1369,22,
-1,121,1,1123,1370,
-17,1371,15,1108,1,
--1,1,5,1372,20,
-1373,4,38,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,50,
-0,1,216,1,3,
-1,6,1,5,1374,
-22,1,74,1,371,
-1375,17,1376,15,1377,
-4,46,37,0,70,
-0,117,0,110,0,
-99,0,116,0,105,
-0,111,0,110,0,
-67,0,97,0,108,
-0,108,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,-1,
-1,5,1378,20,1379,
-4,48,70,0,117,
+0,49,0,1,250,
+1,3,1,4,1,
+3,1363,22,1,108,
+1,1872,1364,16,0,
+323,1,1873,845,1,
+118,1365,17,1366,15,
+1131,1,-1,1,5,
+1367,20,1368,4,38,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,49,
+0,52,0,1,263,
+1,3,1,4,1,
+3,1369,22,1,121,
+1,1123,1370,17,1371,
+15,1108,1,-1,1,
+5,1372,20,1373,4,
+38,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,50,0,1,
+216,1,3,1,6,
+1,5,1374,22,1,
+74,1,371,1375,17,
+1376,15,1377,4,46,
+37,0,70,0,117,
 0,110,0,99,0,
 116,0,105,0,111,
 0,110,0,67,0,
@@ -4930,43 +4919,36 @@ public yyLSLSyntax
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,49,0,
-1,249,1,3,1,
-2,1,1,1380,22,
-1,107,1,1377,1381,
-17,1382,15,1108,1,
--1,1,5,1383,20,
-1384,4,36,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,53,0,1,
-209,1,3,1,4,
-1,3,1385,22,1,
-67,1,375,1386,17,
-1387,15,1202,1,-1,
-1,5,1388,20,1389,
-4,60,73,0,110,
-0,99,0,114,0,
-101,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,114,0,101,0,
+0,1,-1,1,5,
+1378,20,1379,4,48,
+70,0,117,0,110,
+0,99,0,116,0,
+105,0,111,0,110,
+0,67,0,97,0,
+108,0,108,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,49,0,1,249,
+1,3,1,2,1,
+1,1380,22,1,107,
+1,1377,1381,17,1382,
+15,1108,1,-1,1,
+5,1383,20,1384,4,
+36,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
 109,0,101,0,110,
-0,116,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-56,0,1,248,1,
-3,1,5,1,4,
-1390,22,1,106,1,
-377,1391,17,1392,15,
+0,116,0,95,0,
+53,0,1,209,1,
+3,1,4,1,3,
+1385,22,1,67,1,
+375,1386,17,1387,15,
 1202,1,-1,1,5,
-1393,20,1394,4,60,
+1388,20,1389,4,60,
 73,0,110,0,99,
 0,114,0,101,0,
 109,0,101,0,110,
@@ -4978,13 +4960,13 @@ public yyLSLSyntax
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,53,0,
-1,245,1,3,1,
-3,1,2,1395,22,
-1,103,1,379,1396,
-17,1397,15,1202,1,
--1,1,5,1398,20,
-1399,4,60,73,0,
+0,95,0,56,0,
+1,248,1,3,1,
+5,1,4,1390,22,
+1,106,1,377,1391,
+17,1392,15,1202,1,
+-1,1,5,1393,20,
+1394,4,60,73,0,
 110,0,99,0,114,
 0,101,0,109,0,
 101,0,110,0,116,
@@ -4996,81 +4978,169 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,55,0,1,247,
-1,3,1,5,1,
-4,1400,22,1,105,
-1,380,1401,17,1402,
-15,1403,4,38,37,
-0,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,1,-1,1,
-5,1404,20,1405,4,
-40,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
+0,53,0,1,245,
+1,3,1,3,1,
+2,1395,22,1,103,
+1,379,1396,17,1397,
+15,1202,1,-1,1,
+5,1398,20,1399,4,
+60,73,0,110,0,
+99,0,114,0,101,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+114,0,101,0,109,
+0,101,0,110,0,
 116,0,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,95,0,49,
-0,1,238,1,3,
-1,2,1,1,1406,
-22,1,96,1,883,
-1407,17,1408,15,1131,
-1,-1,1,5,1409,
-20,1410,4,38,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,49,0,
-54,0,1,265,1,
-3,1,4,1,3,
-1411,22,1,123,1,
-1628,1412,17,1413,15,
-1414,4,22,37,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
+110,0,95,0,55,
+0,1,247,1,3,
+1,5,1,4,1400,
+22,1,105,1,380,
+1401,17,1402,15,1403,
+4,38,37,0,67,
+0,111,0,110,0,
+115,0,116,0,97,
 0,110,0,116,0,
-1,-1,1,5,1415,
-20,1416,4,24,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,1,203,
-1,3,1,4,1,
-3,1417,22,1,61,
-1,2075,1418,17,1152,
-1,0,1156,1,373,
-1419,17,1420,15,1202,
-1,-1,1,5,1421,
-20,1422,4,60,73,
-0,110,0,99,0,
-114,0,101,0,109,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+1,-1,1,5,1404,
+20,1405,4,40,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,49,0,1,
+238,1,3,1,2,
+1,1,1406,22,1,
+96,1,883,1407,17,
+1408,15,1131,1,-1,
+1,5,1409,20,1410,
+4,38,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,49,0,54,0,
+1,265,1,3,1,
+4,1,3,1411,22,
+1,123,1,1628,1412,
+17,1413,15,1414,4,
+22,37,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,1,-1,
+1,5,1415,20,1416,
+4,24,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
 0,101,0,110,0,
-116,0,68,0,101,
+116,0,95,0,49,
+0,1,203,1,3,
+1,4,1,3,1417,
+22,1,61,1,2075,
+1418,17,1152,1,0,
+1156,1,373,1419,17,
+1420,15,1202,1,-1,
+1,5,1421,20,1422,
+4,60,73,0,110,
 0,99,0,114,0,
 101,0,109,0,101,
 0,110,0,116,0,
-69,0,120,0,112,
+68,0,101,0,99,
 0,114,0,101,0,
+109,0,101,0,110,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+54,0,1,246,1,
+3,1,3,1,2,
+1423,22,1,104,1,
+130,1424,17,1425,15,
+1131,1,-1,1,5,
+1426,20,1427,4,38,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,49,
+0,51,0,1,262,
+1,3,1,4,1,
+3,1428,22,1,120,
+1,143,1429,17,1430,
+15,1131,1,-1,1,
+5,1431,20,1432,4,
+38,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+49,0,50,0,1,
+261,1,3,1,4,
+1,3,1433,22,1,
+119,1,1901,1434,17,
+1152,1,0,1156,1,
+1152,1435,17,1436,15,
+1108,1,-1,1,5,
+1437,20,1438,4,38,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,50,
+0,52,0,1,228,
+1,3,1,6,1,
+5,1439,22,1,86,
+1,1406,1440,17,1441,
+15,1108,1,-1,1,
+5,1442,20,1443,4,
+38,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
 115,0,115,0,105,
-0,111,0,110,0,
-95,0,54,0,1,
-246,1,3,1,3,
-1,2,1423,22,1,
-104,1,130,1424,17,
-1425,15,1131,1,-1,
-1,5,1426,20,1427,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,55,0,1,
+221,1,3,1,4,
+1,3,1444,22,1,
+79,1,1659,1445,16,
+0,278,1,2413,1446,
+17,1152,1,0,1156,
+1,1159,1447,17,1448,
+15,1108,1,-1,1,
+5,1449,20,1450,4,
+38,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,49,0,1,
+215,1,3,1,6,
+1,5,1451,22,1,
+73,1,157,1452,17,
+1453,15,1131,1,-1,
+1,5,1454,20,1455,
 4,38,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
@@ -5078,70 +5148,43 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,49,0,51,0,
-1,262,1,3,1,
-4,1,3,1428,22,
-1,120,1,143,1429,
-17,1430,15,1131,1,
--1,1,5,1431,20,
-1432,4,38,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,49,0,50,
-0,1,261,1,3,
-1,4,1,3,1433,
-22,1,119,1,1901,
-1434,17,1152,1,0,
-1156,1,1152,1435,17,
-1436,15,1108,1,-1,
-1,5,1437,20,1438,
-4,38,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,50,0,52,0,
-1,228,1,3,1,
-6,1,5,1439,22,
-1,86,1,1406,1440,
-17,1441,15,1108,1,
--1,1,5,1442,20,
-1443,4,38,83,0,
+0,49,0,49,0,
+1,260,1,3,1,
+4,1,3,1456,22,
+1,118,1,1413,1457,
+17,1458,15,1108,1,
+-1,1,5,1459,20,
+1460,4,36,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,49,0,55,
-0,1,221,1,3,
-1,4,1,3,1444,
-22,1,79,1,1659,
-1445,16,0,278,1,
-2413,1446,17,1152,1,
-0,1156,1,1159,1447,
-17,1448,15,1108,1,
--1,1,5,1449,20,
-1450,4,38,83,0,
+95,0,52,0,1,
+208,1,3,1,4,
+1,3,1461,22,1,
+66,1,2669,1462,16,
+0,303,1,1478,1463,
+17,1464,15,1108,1,
+-1,1,5,1465,20,
+1466,4,38,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,49,0,49,
-0,1,215,1,3,
-1,6,1,5,1451,
-22,1,73,1,157,
-1452,17,1453,15,1131,
-1,-1,1,5,1454,
-20,1455,4,38,66,
+95,0,49,0,53,
+0,1,219,1,3,
+1,4,1,3,1467,
+22,1,77,1,2676,
+1468,16,0,624,1,
+1621,1469,16,0,678,
+1,1574,809,1,172,
+1470,17,1471,15,1131,
+1,-1,1,5,1472,
+20,1473,4,38,66,
 0,105,0,110,0,
 97,0,114,0,121,
 0,69,0,120,0,
@@ -5149,42 +5192,54 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,49,0,
-49,0,1,260,1,
+48,0,1,259,1,
 3,1,4,1,3,
-1456,22,1,118,1,
-1413,1457,17,1458,15,
-1108,1,-1,1,5,
-1459,20,1460,4,36,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,52,
-0,1,208,1,3,
-1,4,1,3,1461,
-22,1,66,1,2669,
-1462,16,0,303,1,
-1478,1463,17,1464,15,
-1108,1,-1,1,5,
-1465,20,1466,4,38,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,53,0,1,219,
-1,3,1,4,1,
-3,1467,22,1,77,
-1,2676,1468,16,0,
-624,1,1621,1469,16,
-0,678,1,1574,809,
-1,172,1470,17,1471,
+1474,22,1,117,1,
+1931,870,1,1665,1475,
+17,1476,15,1166,1,
+-1,1,5,1477,20,
+1478,4,36,70,0,
+111,0,114,0,76,
+0,111,0,111,0,
+112,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+199,1,3,1,2,
+1,1,1479,22,1,
+57,1,2364,837,1,
+2105,824,1,1188,1480,
+17,1481,15,1108,1,
+-1,1,5,1482,20,
+1483,4,38,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+95,0,50,0,51,
+0,1,227,1,3,
+1,6,1,5,1484,
+22,1,85,1,1442,
+1485,17,1486,15,1108,
+1,-1,1,5,1487,
+20,1488,4,38,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
+101,0,110,0,116,
+0,95,0,49,0,
+54,0,1,220,1,
+3,1,4,1,3,
+1489,22,1,78,1,
+1694,1490,16,0,200,
+1,942,1491,17,1492,
 15,1131,1,-1,1,
-5,1472,20,1473,4,
+5,1493,20,1494,4,
 38,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
@@ -5192,69 +5247,112 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,48,0,1,
-259,1,3,1,4,
-1,3,1474,22,1,
-117,1,1931,870,1,
-1665,1475,17,1476,15,
-1166,1,-1,1,5,
-1477,20,1478,4,36,
-70,0,111,0,114,
-0,76,0,111,0,
-111,0,112,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,1,199,1,3,
-1,2,1,1,1479,
-22,1,57,1,2364,
-837,1,2105,824,1,
-1188,1480,17,1481,15,
+49,0,55,0,1,
+266,1,3,1,4,
+1,3,1495,22,1,
+124,1,2198,1496,17,
+1152,1,0,1156,1,
+1195,1497,17,1498,15,
 1108,1,-1,1,5,
-1482,20,1483,4,38,
+1499,20,1500,4,38,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
 0,115,0,105,0,
 103,0,110,0,109,
 0,101,0,110,0,
-116,0,95,0,50,
-0,51,0,1,227,
+116,0,95,0,49,
+0,48,0,1,214,
 1,3,1,6,1,
-5,1484,22,1,85,
-1,1442,1485,17,1486,
+5,1501,22,1,72,
+1,1449,1502,17,1503,
 15,1108,1,-1,1,
-5,1487,20,1488,4,
-38,83,0,105,0,
+5,1504,20,1505,4,
+36,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
 115,0,115,0,105,
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,54,0,1,
-220,1,3,1,4,
-1,3,1489,22,1,
-78,1,1694,1490,16,
-0,200,1,942,1491,
-17,1492,15,1131,1,
--1,1,5,1493,20,
-1494,4,38,66,0,
+51,0,1,207,1,
+3,1,4,1,3,
+1506,22,1,65,1,
+1701,1507,17,1508,15,
+1166,1,-1,1,5,
+1509,20,1510,4,36,
+70,0,111,0,114,
+0,76,0,111,0,
+111,0,112,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,51,
+0,1,201,1,3,
+1,4,1,3,1511,
+22,1,59,1,447,
+1512,17,1513,15,1514,
+4,30,37,0,86,
+0,101,0,99,0,
+116,0,111,0,114,
+0,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,1,-1,1,
+5,1515,20,1516,4,
+32,86,0,101,0,
+99,0,116,0,111,
+0,114,0,67,0,
+111,0,110,0,115,
+0,116,0,97,0,
+110,0,116,0,95,
+0,49,0,1,236,
+1,3,1,8,1,
+7,1517,22,1,94,
+1,2458,885,1,2459,
+891,1,1958,1518,17,
+1152,1,0,1156,1,
+188,1519,17,1520,15,
+1131,1,-1,1,5,
+1521,20,1522,4,36,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,57,
+0,1,258,1,3,
+1,4,1,3,1523,
+22,1,116,1,2462,
+898,1,1657,903,1,
+2464,908,1,205,1524,
+17,1525,15,1131,1,
+-1,1,5,1526,20,
+1527,4,36,66,0,
 105,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,49,0,55,
-0,1,266,1,3,
-1,4,1,3,1495,
-22,1,124,1,2198,
-1496,17,1152,1,0,
-1156,1,1195,1497,17,
-1498,15,1108,1,-1,
-1,5,1499,20,1500,
+95,0,56,0,1,
+257,1,3,1,4,
+1,3,1528,22,1,
+115,1,1620,1529,17,
+1530,15,1414,1,-1,
+1,5,1531,20,1532,
+4,24,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,50,
+0,1,204,1,3,
+1,2,1,1,1533,
+22,1,62,1,2227,
+917,1,1224,1534,17,
+1535,15,1108,1,-1,
+1,5,1536,20,1537,
 4,38,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -5262,25 +5360,25 @@ public yyLSLSyntax
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,48,0,
-1,214,1,3,1,
-6,1,5,1501,22,
-1,72,1,1449,1502,
-17,1503,15,1108,1,
--1,1,5,1504,20,
-1505,4,36,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,51,0,1,
-207,1,3,1,4,
-1,3,1506,22,1,
-65,1,1701,1507,17,
-1508,15,1166,1,-1,
-1,5,1509,20,1510,
+0,50,0,50,0,
+1,226,1,3,1,
+6,1,5,1538,22,
+1,84,1,223,1539,
+17,1540,15,1131,1,
+-1,1,5,1541,20,
+1542,4,36,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,55,0,1,
+256,1,3,1,4,
+1,3,1543,22,1,
+114,1,1730,1544,17,
+1545,15,1166,1,-1,
+1,5,1546,20,1547,
 4,36,70,0,111,
 0,114,0,76,0,
 111,0,111,0,112,
@@ -5288,238 +5386,126 @@ public yyLSLSyntax
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,51,0,1,201,
-1,3,1,4,1,
-3,1511,22,1,59,
-1,447,1512,17,1513,
-15,1514,4,30,37,
-0,86,0,101,0,
-99,0,116,0,111,
-0,114,0,67,0,
-111,0,110,0,115,
-0,116,0,97,0,
-110,0,116,0,1,
--1,1,5,1515,20,
-1516,4,32,86,0,
-101,0,99,0,116,
-0,111,0,114,0,
-67,0,111,0,110,
-0,115,0,116,0,
-97,0,110,0,116,
-0,95,0,49,0,
-1,236,1,3,1,
-8,1,7,1517,22,
-1,94,1,2458,885,
-1,2459,891,1,1958,
-1518,17,1152,1,0,
-1156,1,188,1519,17,
-1520,15,1131,1,-1,
-1,5,1521,20,1522,
-4,36,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,57,0,1,258,
+0,52,0,1,202,
 1,3,1,4,1,
-3,1523,22,1,116,
-1,2462,898,1,1657,
-903,1,2464,908,1,
-205,1524,17,1525,15,
-1131,1,-1,1,5,
-1526,20,1527,4,36,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,56,
-0,1,257,1,3,
-1,4,1,3,1528,
-22,1,115,1,1620,
-1529,17,1530,15,1414,
-1,-1,1,5,1531,
-20,1532,4,24,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,50,0,1,204,
-1,3,1,2,1,
-1,1533,22,1,62,
-1,2227,917,1,1224,
-1534,17,1535,15,1108,
-1,-1,1,5,1536,
-20,1537,4,38,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,50,0,
-50,0,1,226,1,
-3,1,6,1,5,
-1538,22,1,84,1,
-223,1539,17,1540,15,
-1131,1,-1,1,5,
-1541,20,1542,4,36,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,55,
-0,1,256,1,3,
-1,4,1,3,1543,
-22,1,114,1,1730,
-1544,17,1545,15,1166,
-1,-1,1,5,1546,
-20,1547,4,36,70,
-0,111,0,114,0,
-76,0,111,0,111,
-0,112,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,52,0,
-1,202,1,3,1,
-4,1,3,1548,22,
-1,60,1,476,1549,
-17,1550,15,1551,4,
-18,37,0,67,0,
-111,0,110,0,115,
-0,116,0,97,0,
-110,0,116,0,1,
--1,1,5,1552,20,
-1553,4,20,67,0,
-111,0,110,0,115,
-0,116,0,97,0,
-110,0,116,0,95,
-0,52,0,1,234,
-1,3,1,2,1,
-1,1554,22,1,92,
-1,477,1555,17,1556,
-15,1551,1,-1,1,
-5,1557,20,1558,4,
+3,1548,22,1,60,
+1,476,1549,17,1550,
+15,1551,4,18,37,
+0,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,1,-1,1,
+5,1552,20,1553,4,
 20,67,0,111,0,
 110,0,115,0,116,
 0,97,0,110,0,
-116,0,95,0,51,
-0,1,233,1,3,
-1,2,1,1,1559,
-22,1,91,1,1231,
-1560,17,1561,15,1108,
-1,-1,1,5,1562,
-20,1563,4,36,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,57,0,
-1,213,1,3,1,
-6,1,5,1564,22,
-1,71,1,479,1565,
-17,1566,15,1551,1,
--1,1,5,1567,20,
-1568,4,20,67,0,
-111,0,110,0,115,
-0,116,0,97,0,
-110,0,116,0,95,
-0,49,0,1,231,
-1,3,1,2,1,
-1,1569,22,1,89,
-1,480,1570,17,1571,
-15,1572,4,26,37,
-0,76,0,105,0,
-115,0,116,0,67,
+116,0,95,0,52,
+0,1,234,1,3,
+1,2,1,1,1554,
+22,1,92,1,477,
+1555,17,1556,15,1551,
+1,-1,1,5,1557,
+20,1558,4,20,67,
 0,111,0,110,0,
 115,0,116,0,97,
 0,110,0,116,0,
-1,-1,1,5,1573,
-20,1574,4,28,76,
+95,0,51,0,1,
+233,1,3,1,2,
+1,1,1559,22,1,
+91,1,1231,1560,17,
+1561,15,1108,1,-1,
+1,5,1562,20,1563,
+4,36,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,57,0,1,213,
+1,3,1,6,1,
+5,1564,22,1,71,
+1,479,1565,17,1566,
+15,1551,1,-1,1,
+5,1567,20,1568,4,
+20,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,95,0,49,
+0,1,231,1,3,
+1,2,1,1,1569,
+22,1,89,1,480,
+1570,17,1571,15,1572,
+4,26,37,0,76,
 0,105,0,115,0,
 116,0,67,0,111,
 0,110,0,115,0,
 116,0,97,0,110,
-0,116,0,95,0,
-49,0,1,235,1,
-3,1,4,1,3,
-1575,22,1,93,1,
-1485,1576,17,1577,15,
-1108,1,-1,1,5,
-1578,20,1579,4,36,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,50,
-0,1,206,1,3,
-1,4,1,3,1580,
-22,1,64,1,1737,
-1581,16,0,280,1,
-1989,925,1,1990,1582,
-17,1152,1,0,1156,
-1,242,1583,17,1584,
-15,1131,1,-1,1,
-5,1585,20,1586,4,
-36,66,0,105,0,
-110,0,97,0,114,
-0,121,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-54,0,1,255,1,
-3,1,4,1,3,
-1587,22,1,113,1,
-478,1588,17,1589,15,
-1551,1,-1,1,5,
-1590,20,1591,4,20,
+0,116,0,1,-1,
+1,5,1573,20,1574,
+4,28,76,0,105,
+0,115,0,116,0,
 67,0,111,0,110,
 0,115,0,116,0,
 97,0,110,0,116,
-0,95,0,50,0,
-1,232,1,3,1,
-2,1,1,1592,22,
-1,90,1,1370,1593,
-17,1594,15,1108,1,
--1,1,5,1595,20,
-1596,4,38,83,0,
+0,95,0,49,0,
+1,235,1,3,1,
+4,1,3,1575,22,
+1,93,1,1485,1576,
+17,1577,15,1108,1,
+-1,1,5,1578,20,
+1579,4,36,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,49,0,56,
-0,1,222,1,3,
-1,4,1,3,1597,
-22,1,80,1,1001,
-1598,17,1599,15,1234,
-1,-1,1,5,1600,
-20,1601,4,40,84,
-0,121,0,112,0,
-101,0,99,0,97,
-0,115,0,116,0,
-69,0,120,0,112,
-0,114,0,101,0,
+95,0,50,0,1,
+206,1,3,1,4,
+1,3,1580,22,1,
+64,1,1737,1581,16,
+0,280,1,1989,925,
+1,1990,1582,17,1152,
+1,0,1156,1,242,
+1583,17,1584,15,1131,
+1,-1,1,5,1585,
+20,1586,4,36,66,
+0,105,0,110,0,
+97,0,114,0,121,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,54,0,
+1,255,1,3,1,
+4,1,3,1587,22,
+1,113,1,478,1588,
+17,1589,15,1551,1,
+-1,1,5,1590,20,
+1591,4,20,67,0,
+111,0,110,0,115,
+0,116,0,97,0,
+110,0,116,0,95,
+0,50,0,1,232,
+1,3,1,2,1,
+1,1592,22,1,90,
+1,1370,1593,17,1594,
+15,1108,1,-1,1,
+5,1595,20,1596,4,
+38,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
 115,0,115,0,105,
-0,111,0,110,0,
-95,0,56,0,1,
-280,1,3,1,5,
-1,4,1602,22,1,
-138,1,1002,1603,17,
-1604,15,1234,1,-1,
-1,5,1605,20,1606,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,56,0,1,
+222,1,3,1,4,
+1,3,1597,22,1,
+80,1,1001,1598,17,
+1599,15,1234,1,-1,
+1,5,1600,20,1601,
 4,40,84,0,121,
 0,112,0,101,0,
 99,0,97,0,115,
@@ -5528,158 +5514,196 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,1,273,1,
+56,0,1,280,1,
 3,1,5,1,4,
-1607,22,1,131,1,
-12,1608,19,163,1,
-12,1609,5,44,1,
-1901,1610,16,0,161,
-1,2075,1611,16,0,
-161,1,1860,831,1,
-1803,797,1,1804,1612,
-16,0,161,1,2413,
-1613,16,0,161,1,
-2198,1614,16,0,161,
-1,1873,845,1,1657,
-903,1,1989,925,1,
-1990,1615,16,0,161,
-1,31,1616,16,0,
-161,1,32,1617,16,
-0,161,1,2105,824,
-1,2106,1618,16,0,
-161,1,2227,917,1,
-2337,1619,16,0,161,
-1,2665,1620,16,0,
-161,1,2021,728,1,
-2458,885,1,2459,891,
-1,2462,898,1,2136,
-852,1,2464,908,1,
-2029,735,1,2030,741,
-1,2031,746,1,2032,
-751,1,2469,1621,16,
-0,468,1,2035,762,
-1,2364,837,1,2039,
-772,1,1931,870,1,
-2041,778,1,2507,1622,
-16,0,161,1,2043,
-784,1,2045,789,1,
-1775,1623,16,0,161,
-1,2568,1624,16,0,
-583,1,2033,756,1,
-2522,1625,16,0,161,
-1,2037,767,1,1574,
-809,1,1958,1626,16,
-0,161,1,13,1627,
-19,151,1,13,1628,
-5,37,1,2509,1629,
-17,1630,15,1631,4,
-42,37,0,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
-110,0,116,0,114,
-0,121,0,83,0,
+1602,22,1,138,1,
+1002,1603,17,1604,15,
+1234,1,-1,1,5,
+1605,20,1606,4,40,
+84,0,121,0,112,
+0,101,0,99,0,
+97,0,115,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,49,0,
+1,273,1,3,1,
+5,1,4,1607,22,
+1,131,1,12,1608,
+19,163,1,12,1609,
+5,44,1,1901,1610,
+16,0,161,1,2075,
+1611,16,0,161,1,
+1860,831,1,1803,797,
+1,1804,1612,16,0,
+161,1,2413,1613,16,
+0,161,1,2198,1614,
+16,0,161,1,1873,
+845,1,1657,903,1,
+1989,925,1,1990,1615,
+16,0,161,1,31,
+1616,16,0,161,1,
+32,1617,16,0,161,
+1,2105,824,1,2106,
+1618,16,0,161,1,
+2227,917,1,2337,1619,
+16,0,161,1,2665,
+1620,16,0,161,1,
+2021,728,1,2458,885,
+1,2459,891,1,2462,
+898,1,2136,852,1,
+2464,908,1,2029,735,
+1,2030,741,1,2031,
+746,1,2032,751,1,
+2469,1621,16,0,468,
+1,2035,762,1,2364,
+837,1,2039,772,1,
+1931,870,1,2041,778,
+1,2507,1622,16,0,
+161,1,2043,784,1,
+2045,789,1,1775,1623,
+16,0,161,1,2568,
+1624,16,0,583,1,
+2033,756,1,2522,1625,
+16,0,161,1,2037,
+767,1,1574,809,1,
+1958,1626,16,0,161,
+1,13,1627,19,151,
+1,13,1628,5,37,
+1,2509,1629,17,1630,
+15,1631,4,36,37,
+0,86,0,111,0,
+105,0,100,0,65,
+0,114,0,103,0,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,-1,1,5,1632,
+20,1633,4,38,86,
+0,111,0,105,0,
+100,0,65,0,114,
+0,103,0,83,0,
 116,0,97,0,116,
 0,101,0,69,0,
 118,0,101,0,110,
-0,116,0,1,-1,
-1,5,1632,20,1633,
-4,44,83,0,116,
-0,97,0,116,0,
-101,0,69,0,110,
-0,116,0,114,0,
-121,0,83,0,116,
+0,116,0,95,0,
+49,0,1,163,1,
+3,1,5,1,4,
+1634,22,1,20,1,
+1860,831,1,1803,797,
+1,2413,1635,16,0,
+462,1,2524,1636,17,
+1637,15,1638,4,22,
+37,0,83,0,116,
 0,97,0,116,0,
 101,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,49,
-0,1,163,1,3,
-1,5,1,4,1634,
-22,1,20,1,1860,
-831,1,1803,797,1,
-2413,1635,16,0,462,
-1,2524,1636,17,1637,
-15,1638,4,22,37,
-0,83,0,116,0,
+116,0,1,-1,1,
+5,1639,20,1640,4,
+24,83,0,116,0,
 97,0,116,0,101,
 0,69,0,118,0,
 101,0,110,0,116,
-0,1,-1,1,5,
-1639,20,1640,4,24,
-83,0,116,0,97,
-0,116,0,101,0,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,49,0,1,
-162,1,3,1,6,
-1,5,1641,22,1,
-19,1,2526,1642,16,
-0,478,1,1873,845,
-1,1657,903,1,1989,
-925,1,32,1643,16,
-0,463,1,2567,1644,
-17,1645,15,1646,4,
-20,37,0,83,0,
+0,95,0,49,0,
+1,162,1,3,1,
+6,1,5,1641,22,
+1,19,1,2526,1642,
+16,0,478,1,1873,
+845,1,1657,903,1,
+1989,925,1,32,1643,
+16,0,463,1,2567,
+1644,17,1645,15,1646,
+4,20,37,0,83,
+0,116,0,97,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,1,-1,1,
+5,1647,20,1648,4,
+22,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,95,
+0,49,0,1,158,
+1,3,1,2,1,
+1,1649,22,1,15,
+1,2105,824,1,2364,
+837,1,2227,917,1,
+1574,809,1,2563,1650,
+17,1651,15,1646,1,
+-1,1,5,1652,20,
+1653,4,22,83,0,
 116,0,97,0,116,
 0,101,0,66,0,
 111,0,100,0,121,
-0,1,-1,1,5,
-1647,20,1648,4,22,
-83,0,116,0,97,
-0,116,0,101,0,
-66,0,111,0,100,
-0,121,0,95,0,
-49,0,1,158,1,
-3,1,2,1,1,
-1649,22,1,15,1,
-2105,824,1,2364,837,
-1,2227,917,1,1574,
-809,1,2563,1650,17,
-1651,15,1646,1,-1,
-1,5,1652,20,1653,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-95,0,52,0,1,
-161,1,3,1,3,
-1,2,1654,22,1,
-18,1,2564,1655,17,
-1656,15,1646,1,-1,
-1,5,1657,20,1658,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-95,0,50,0,1,
-159,1,3,1,3,
-1,2,1659,22,1,
-16,1,2566,1660,17,
-1661,15,1646,1,-1,
-1,5,1662,20,1663,
-4,22,83,0,116,
+0,95,0,52,0,
+1,161,1,3,1,
+3,1,2,1654,22,
+1,18,1,2564,1655,
+17,1656,15,1646,1,
+-1,1,5,1657,20,
+1658,4,22,83,0,
+116,0,97,0,116,
+0,101,0,66,0,
+111,0,100,0,121,
+0,95,0,50,0,
+1,159,1,3,1,
+3,1,2,1659,22,
+1,16,1,2566,1660,
+17,1661,15,1646,1,
+-1,1,5,1662,20,
+1663,4,22,83,0,
+116,0,97,0,116,
+0,101,0,66,0,
+111,0,100,0,121,
+0,95,0,51,0,
+1,160,1,3,1,
+2,1,1,1664,22,
+1,17,1,2458,885,
+1,2459,891,1,2462,
+898,1,2136,852,1,
+2464,908,1,2029,735,
+1,2030,741,1,2031,
+746,1,2032,751,1,
+2033,756,1,2035,762,
+1,2037,767,1,2039,
+772,1,1931,870,1,
+2041,778,1,2021,728,
+1,2043,784,1,2045,
+789,1,2606,1665,16,
+0,149,1,14,1666,
+19,144,1,14,1667,
+5,105,1,2511,1668,
+17,1669,15,1670,4,
+48,37,0,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
 0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-95,0,51,0,1,
-160,1,3,1,2,
-1,1,1664,22,1,
-17,1,2458,885,1,
-2459,891,1,2462,898,
-1,2136,852,1,2464,
-908,1,2029,735,1,
-2030,741,1,2031,746,
-1,2032,751,1,2033,
-756,1,2035,762,1,
-2037,767,1,2039,772,
-1,1931,870,1,2041,
-778,1,2021,728,1,
-2043,784,1,2045,789,
-1,2606,1665,16,0,
-149,1,14,1666,19,
-144,1,14,1667,5,
-105,1,2511,1668,17,
-1669,15,1670,4,48,
-37,0,65,0,114,
+105,0,111,0,110,
+0,76,0,105,0,
+115,0,116,0,1,
+-1,1,5,140,1,
+0,1,0,1671,22,
+1,21,1,1260,1106,
+1,1011,1112,1,1514,
+1118,1,9,1123,1,
+10,1672,17,1673,15,
+1670,1,-1,1,5,
+140,1,0,1,0,
+1671,1,262,1129,1,
+1267,1135,1,1521,1140,
+1,1773,1674,16,0,
+148,1,19,1157,1,
+20,1675,16,0,142,
+1,2281,1164,1,525,
+1226,1,30,1676,17,
+1677,15,1670,1,-1,
+1,5,1678,20,1679,
+4,50,65,0,114,
 0,103,0,117,0,
 109,0,101,0,110,
 0,116,0,68,0,
@@ -5688,1682 +5712,1084 @@ public yyLSLSyntax
 97,0,116,0,105,
 0,111,0,110,0,
 76,0,105,0,115,
-0,116,0,1,-1,
-1,5,140,1,0,
-1,0,1671,22,1,
-21,1,1260,1106,1,
-1011,1112,1,1514,1118,
-1,9,1123,1,10,
-1672,17,1673,15,1670,
-1,-1,1,5,140,
-1,0,1,0,1671,
-1,262,1129,1,1267,
-1135,1,1521,1140,1,
-1773,1674,16,0,148,
-1,19,1157,1,20,
-1675,16,0,142,1,
-2281,1164,1,525,1226,
-1,30,1676,17,1677,
-15,1670,1,-1,1,
-5,1678,20,1679,4,
-50,65,0,114,0,
+0,116,0,95,0,
+50,0,1,165,1,
+3,1,4,1,3,
+1680,22,1,23,1,
+283,1182,1,40,1187,
+1,41,1681,17,1682,
+15,1683,4,26,37,
+0,65,0,114,0,
 103,0,117,0,109,
 0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,76,
-0,105,0,115,0,
-116,0,95,0,50,
-0,1,165,1,3,
-1,4,1,3,1680,
-22,1,23,1,283,
-1182,1,40,1187,1,
-41,1681,17,1682,15,
-1683,4,26,37,0,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,76,0,105,0,
-115,0,116,0,1,
--1,1,5,617,1,
-0,1,0,1684,22,
-1,141,1,42,1685,
-17,1686,15,1687,4,
-38,37,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,1,
--1,1,5,1688,20,
-1689,4,40,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,1,285,
-1,3,1,2,1,
-1,1690,22,1,144,
-1,44,1193,1,47,
-1194,1,48,1200,1,
-49,1206,1,50,1211,
-1,51,1216,1,305,
-1221,1,63,1232,1,
-66,1238,1,67,1243,
-1,1478,1463,1,69,
-1253,1,70,1258,1,
-68,1248,1,74,1263,
-1,1013,1268,1,2335,
-1691,16,0,148,1,
-1332,1273,1,1048,1354,
-1,82,1290,1,1296,
-1177,1,1341,1307,1,
-328,1312,1,1303,1317,
-1,1096,1322,1,93,
-1328,1,1550,1333,1,
-352,1359,1,107,1348,
-1,1114,1353,1,1370,
-1593,1,118,1365,1,
-1123,1370,1,371,1375,
-1,1377,1381,1,375,
-1386,1,377,1391,1,
-379,1396,1,380,1401,
-1,883,1407,1,373,
-1419,1,130,1424,1,
-143,1429,1,2654,1692,
-17,1693,15,1670,1,
--1,1,5,140,1,
-0,1,0,1671,1,
-1152,1435,1,387,1694,
-16,0,566,1,1406,
-1440,1,2663,1695,16,
-0,142,1,1159,1447,
-1,157,1452,1,1413,
-1457,1,1665,1475,1,
-412,1696,16,0,591,
-1,1094,1697,16,0,
-619,1,2520,1698,16,
-0,142,1,172,1470,
-1,827,1341,1,1188,
-1480,1,437,1699,16,
-0,660,1,1442,1485,
-1,1694,1700,16,0,
-148,1,942,1491,1,
-1195,1497,1,1449,1502,
-1,1701,1507,1,447,
-1512,1,188,1519,1,
-205,1524,1,2467,1701,
-17,1702,15,1670,1,
--1,1,5,1703,20,
-1704,4,50,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,95,
-0,49,0,1,164,
-1,3,1,2,1,
-1,1705,22,1,22,
-1,461,1706,16,0,
-619,1,464,1707,17,
-1708,15,1683,1,-1,
-1,5,1709,20,1710,
-4,28,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,76,0,
-105,0,115,0,116,
-0,95,0,50,0,
-1,284,1,3,1,
-4,1,3,1711,22,
-1,143,1,1224,1534,
-1,223,1539,1,1730,
-1544,1,476,1549,1,
-477,1555,1,1231,1560,
-1,479,1565,1,480,
-1570,1,1485,1576,1,
-459,1712,17,1713,15,
-1683,1,-1,1,5,
-617,1,0,1,0,
-1684,1,242,1583,1,
-478,1588,1,481,1714,
-17,1715,15,1683,1,
--1,1,5,1716,20,
-1717,4,28,65,0,
+116,0,76,0,105,
+0,115,0,116,0,
+1,-1,1,5,617,
+1,0,1,0,1684,
+22,1,141,1,42,
+1685,17,1686,15,1687,
+4,38,37,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+1,-1,1,5,1688,
+20,1689,4,40,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+285,1,3,1,2,
+1,1,1690,22,1,
+144,1,44,1193,1,
+47,1194,1,48,1200,
+1,49,1206,1,50,
+1211,1,51,1216,1,
+305,1221,1,63,1232,
+1,66,1238,1,67,
+1243,1,1478,1463,1,
+69,1253,1,70,1258,
+1,68,1248,1,74,
+1263,1,1013,1268,1,
+2335,1691,16,0,148,
+1,1332,1273,1,1048,
+1354,1,82,1290,1,
+1296,1177,1,1341,1307,
+1,328,1312,1,1303,
+1317,1,1096,1322,1,
+93,1328,1,1550,1333,
+1,352,1359,1,107,
+1348,1,1114,1353,1,
+1370,1593,1,118,1365,
+1,1123,1370,1,371,
+1375,1,1377,1381,1,
+375,1386,1,377,1391,
+1,379,1396,1,380,
+1401,1,883,1407,1,
+373,1419,1,130,1424,
+1,143,1429,1,2654,
+1692,17,1693,15,1670,
+1,-1,1,5,140,
+1,0,1,0,1671,
+1,1152,1435,1,387,
+1694,16,0,566,1,
+1406,1440,1,2663,1695,
+16,0,142,1,1159,
+1447,1,157,1452,1,
+1413,1457,1,1665,1475,
+1,412,1696,16,0,
+591,1,1094,1697,16,
+0,619,1,2520,1698,
+16,0,142,1,172,
+1470,1,827,1341,1,
+1188,1480,1,437,1699,
+16,0,660,1,1442,
+1485,1,1694,1700,16,
+0,148,1,942,1491,
+1,1195,1497,1,1449,
+1502,1,1701,1507,1,
+447,1512,1,188,1519,
+1,205,1524,1,2467,
+1701,17,1702,15,1670,
+1,-1,1,5,1703,
+20,1704,4,50,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
+95,0,49,0,1,
+164,1,3,1,2,
+1,1,1705,22,1,
+22,1,461,1706,16,
+0,619,1,464,1707,
+17,1708,15,1683,1,
+-1,1,5,1709,20,
+1710,4,28,65,0,
 114,0,103,0,117,
 0,109,0,101,0,
 110,0,116,0,76,
 0,105,0,115,0,
-116,0,95,0,49,
-0,1,283,1,3,
-1,2,1,1,1718,
-22,1,142,1,1001,
-1598,1,1002,1603,1,
-15,1719,19,308,1,
-15,1720,5,6,1,
-2669,1721,16,0,601,
-1,1114,1722,16,0,
-306,1,1621,1723,16,
-0,659,1,40,1724,
-16,0,562,1,19,
-1157,1,9,1123,1,
-16,1725,19,136,1,
-16,1726,5,140,1,
-2510,1727,16,0,602,
-1,256,1728,16,0,
-196,1,1261,1729,16,
-0,196,1,509,1730,
-16,0,196,1,9,
-1731,16,0,134,1,
-2021,728,1,1775,1732,
-16,0,196,1,2029,
-735,1,2030,741,1,
-2031,746,1,2032,751,
-1,2033,756,1,277,
-1733,16,0,196,1,
-2035,762,1,2037,767,
-1,2039,772,1,32,
-1734,16,0,196,1,
-2041,778,1,2293,1735,
-16,0,196,1,2043,
-784,1,2045,789,1,
-40,1736,16,0,175,
-1,41,1737,16,0,
-196,1,1297,1738,16,
-0,196,1,43,1739,
-16,0,196,1,44,
-1740,16,0,175,1,
-1803,797,1,1804,1741,
-16,0,196,1,299,
-1742,16,0,196,1,
-2480,1743,17,1744,15,
-1745,4,12,37,0,
+116,0,95,0,50,
+0,1,284,1,3,
+1,4,1,3,1711,
+22,1,143,1,1224,
+1534,1,223,1539,1,
+1730,1544,1,476,1549,
+1,477,1555,1,1231,
+1560,1,479,1565,1,
+480,1570,1,1485,1576,
+1,459,1712,17,1713,
+15,1683,1,-1,1,
+5,617,1,0,1,
+0,1684,1,242,1583,
+1,478,1588,1,481,
+1714,17,1715,15,1683,
+1,-1,1,5,1716,
+20,1717,4,28,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+76,0,105,0,115,
+0,116,0,95,0,
+49,0,1,283,1,
+3,1,2,1,1,
+1718,22,1,142,1,
+1001,1598,1,1002,1603,
+1,15,1719,19,308,
+1,15,1720,5,6,
+1,2669,1721,16,0,
+601,1,1114,1722,16,
+0,306,1,1621,1723,
+16,0,659,1,40,
+1724,16,0,562,1,
+19,1157,1,9,1123,
+1,16,1725,19,136,
+1,16,1726,5,140,
+1,2510,1727,16,0,
+602,1,256,1728,16,
+0,196,1,1261,1729,
+16,0,196,1,509,
+1730,16,0,196,1,
+9,1731,16,0,134,
+1,2021,728,1,1775,
+1732,16,0,196,1,
+2029,735,1,2030,741,
+1,2031,746,1,2032,
+751,1,2033,756,1,
+277,1733,16,0,196,
+1,2035,762,1,2037,
+767,1,2039,772,1,
+32,1734,16,0,196,
+1,2041,778,1,2293,
+1735,16,0,196,1,
+2043,784,1,2045,789,
+1,40,1736,16,0,
+175,1,41,1737,16,
+0,196,1,1297,1738,
+16,0,196,1,43,
+1739,16,0,196,1,
+44,1740,16,0,175,
+1,1803,797,1,1804,
+1741,16,0,196,1,
+299,1742,16,0,196,
+1,2480,1743,17,1744,
+15,1745,4,12,37,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,-1,1,5,
+1746,20,1747,4,16,
 69,0,118,0,101,
 0,110,0,116,0,
-1,-1,1,5,1746,
-20,1747,4,16,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,50,0,53,0,
-1,317,1,3,1,
-2,1,1,1748,22,
-1,176,1,52,1749,
-16,0,196,1,2484,
-1750,17,1751,15,1745,
-1,-1,1,5,1752,
-20,1753,4,16,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,50,0,49,0,
-1,313,1,3,1,
-2,1,1,1754,22,
-1,172,1,1515,1755,
-16,0,196,1,2318,
-1756,16,0,196,1,
-2491,1757,17,1758,15,
+95,0,50,0,53,
+0,1,317,1,3,
+1,2,1,1,1748,
+22,1,176,1,52,
+1749,16,0,196,1,
+2484,1750,17,1751,15,
 1745,1,-1,1,5,
-1759,20,1760,4,16,
+1752,20,1753,4,16,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,49,0,52,
-0,1,306,1,3,
-1,2,1,1,1761,
-22,1,165,1,62,
-1762,16,0,212,1,
-63,1763,16,0,175,
-1,2495,1764,17,1765,
+95,0,50,0,49,
+0,1,313,1,3,
+1,2,1,1,1754,
+22,1,172,1,1515,
+1755,16,0,196,1,
+2318,1756,16,0,196,
+1,2491,1757,17,1758,
 15,1745,1,-1,1,
-5,1766,20,1767,4,
+5,1759,20,1760,4,
 16,69,0,118,0,
 101,0,110,0,116,
 0,95,0,49,0,
-48,0,1,302,1,
+52,0,1,306,1,
 3,1,2,1,1,
-1768,22,1,161,1,
-2075,1769,16,0,196,
-1,1574,809,1,1479,
-1770,16,0,196,1,
-71,1771,16,0,196,
-1,1622,1772,16,0,
-196,1,1658,1773,16,
-0,682,1,1833,1774,
-16,0,297,1,1834,
-1775,16,0,196,1,
-2337,1776,16,0,196,
-1,79,1777,16,0,
-196,1,1335,1778,16,
-0,196,1,322,1779,
-16,0,196,1,76,
-1780,16,0,196,1,
-85,1781,16,0,196,
-1,89,1782,16,0,
-196,1,346,1783,16,
-0,196,1,97,1784,
-16,0,196,1,2106,
-1785,16,0,196,1,
-102,1786,16,0,196,
-1,1860,831,1,2458,
-885,1,2364,837,1,
-1990,1787,16,0,196,
-1,112,1788,16,0,
-196,1,1117,1789,16,
-0,196,1,1873,845,
-1,1875,1790,16,0,
-408,1,1876,1791,16,
-0,196,1,124,1792,
-16,0,196,1,2478,
-1793,17,1794,15,1745,
-1,-1,1,5,1795,
-20,1796,4,16,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,50,0,55,0,
-1,319,1,3,1,
-2,1,1,1797,22,
-1,178,1,2136,852,
-1,381,1798,16,0,
-196,1,525,1799,16,
-0,196,1,137,1800,
-16,0,196,1,2653,
-1801,16,0,586,1,
-1901,1802,16,0,196,
-1,1153,1803,16,0,
-196,1,151,1804,16,
-0,196,1,1407,1805,
-16,0,196,1,1659,
-1806,16,0,196,1,
-2413,1807,16,0,196,
-1,406,1808,16,0,
-196,1,1371,1809,16,
-0,196,1,2105,824,
-1,166,1810,16,0,
-196,1,2670,1811,16,
-0,196,1,1931,870,
-1,1932,1812,16,0,
-470,1,1933,1813,16,
-0,196,1,431,1814,
-16,0,196,1,1585,
-1815,16,0,196,1,
-182,1816,16,0,196,
-1,1189,1817,16,0,
-196,1,1443,1818,16,
-0,196,1,1695,1819,
-16,0,196,1,2198,
-1820,16,0,196,1,
-447,1821,16,0,196,
-1,199,1822,16,0,
-196,1,2459,891,1,
-1958,1823,16,0,196,
-1,2462,898,1,1657,
-903,1,2464,908,1,
-459,1824,16,0,196,
-1,462,1825,16,0,
-196,1,2471,1826,17,
-1827,15,1828,4,22,
-37,0,69,0,110,
-0,116,0,114,0,
-121,0,69,0,118,
+1761,22,1,165,1,
+62,1762,16,0,212,
+1,63,1763,16,0,
+175,1,2495,1764,17,
+1765,15,1745,1,-1,
+1,5,1766,20,1767,
+4,16,69,0,118,
+0,101,0,110,0,
+116,0,95,0,49,
+0,48,0,1,302,
+1,3,1,2,1,
+1,1768,22,1,161,
+1,2075,1769,16,0,
+196,1,1574,809,1,
+1479,1770,16,0,196,
+1,71,1771,16,0,
+196,1,1622,1772,16,
+0,196,1,1658,1773,
+16,0,682,1,1833,
+1774,16,0,297,1,
+1834,1775,16,0,196,
+1,2337,1776,16,0,
+196,1,79,1777,16,
+0,196,1,1335,1778,
+16,0,196,1,322,
+1779,16,0,196,1,
+76,1780,16,0,196,
+1,85,1781,16,0,
+196,1,89,1782,16,
+0,196,1,346,1783,
+16,0,196,1,97,
+1784,16,0,196,1,
+2106,1785,16,0,196,
+1,102,1786,16,0,
+196,1,1860,831,1,
+2458,885,1,2364,837,
+1,1990,1787,16,0,
+196,1,112,1788,16,
+0,196,1,1117,1789,
+16,0,196,1,1873,
+845,1,1875,1790,16,
+0,408,1,1876,1791,
+16,0,196,1,124,
+1792,16,0,196,1,
+2478,1793,17,1794,15,
+1745,1,-1,1,5,
+1795,20,1796,4,16,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,50,0,55,
+0,1,319,1,3,
+1,2,1,1,1797,
+22,1,178,1,2136,
+852,1,381,1798,16,
+0,196,1,525,1799,
+16,0,196,1,137,
+1800,16,0,196,1,
+2653,1801,16,0,586,
+1,1901,1802,16,0,
+196,1,1153,1803,16,
+0,196,1,151,1804,
+16,0,196,1,1407,
+1805,16,0,196,1,
+1659,1806,16,0,196,
+1,2413,1807,16,0,
+196,1,406,1808,16,
+0,196,1,1371,1809,
+16,0,196,1,2105,
+824,1,166,1810,16,
+0,196,1,2670,1811,
+16,0,196,1,1931,
+870,1,1932,1812,16,
+0,470,1,1933,1813,
+16,0,196,1,431,
+1814,16,0,196,1,
+1585,1815,16,0,196,
+1,182,1816,16,0,
+196,1,1189,1817,16,
+0,196,1,1443,1818,
+16,0,196,1,1695,
+1819,16,0,196,1,
+2198,1820,16,0,196,
+1,447,1821,16,0,
+196,1,199,1822,16,
+0,196,1,2459,891,
+1,1958,1823,16,0,
+196,1,2462,898,1,
+1657,903,1,2464,908,
+1,459,1824,16,0,
+196,1,462,1825,16,
+0,196,1,2471,1826,
+17,1827,15,1828,4,
+26,37,0,86,0,
+111,0,105,0,100,
+0,65,0,114,0,
+103,0,69,0,118,
 0,101,0,110,0,
 116,0,1,-1,1,
 5,1829,20,1830,4,
-24,69,0,110,0,
-116,0,114,0,121,
+28,86,0,111,0,
+105,0,100,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,55,0,1,
+326,1,3,1,2,
+1,1,1831,22,1,
+185,1,2472,1832,17,
+1833,15,1828,1,-1,
+1,5,1834,20,1835,
+4,28,86,0,111,
+0,105,0,100,0,
+65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,49,0,
-1,326,1,3,1,
-2,1,1,1831,22,
-1,185,1,2472,1832,
-17,1833,15,1745,1,
--1,1,5,1834,20,
-1835,4,16,69,0,
+0,95,0,54,0,
+1,325,1,3,1,
+2,1,1,1836,22,
+1,184,1,2473,1837,
+17,1838,15,1828,1,
+-1,1,5,1839,20,
+1840,4,28,86,0,
+111,0,105,0,100,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,53,
+0,1,324,1,3,
+1,2,1,1,1841,
+22,1,183,1,2474,
+1842,17,1843,15,1828,
+1,-1,1,5,1844,
+20,1845,4,28,86,
+0,111,0,105,0,
+100,0,65,0,114,
+0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-51,0,51,0,1,
-325,1,3,1,2,
-1,1,1836,22,1,
-184,1,2473,1837,17,
-1838,15,1745,1,-1,
-1,5,1839,20,1840,
-4,16,69,0,118,
-0,101,0,110,0,
-116,0,95,0,51,
-0,50,0,1,324,
-1,3,1,2,1,
-1,1841,22,1,183,
-1,2474,1842,17,1843,
-15,1745,1,-1,1,
-5,1844,20,1845,4,
-16,69,0,118,0,
-101,0,110,0,116,
-0,95,0,51,0,
-49,0,1,323,1,
+52,0,1,323,1,
 3,1,2,1,1,
 1846,22,1,182,1,
 2475,1847,17,1848,15,
-1745,1,-1,1,5,
-1849,20,1850,4,16,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,51,0,48,
-0,1,322,1,3,
-1,2,1,1,1851,
-22,1,181,1,2476,
-1852,17,1853,15,1745,
-1,-1,1,5,1854,
-20,1855,4,16,69,
+1828,1,-1,1,5,
+1849,20,1850,4,28,
+86,0,111,0,105,
+0,100,0,65,0,
+114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,50,0,57,0,
-1,321,1,3,1,
-2,1,1,1856,22,
-1,180,1,2477,1857,
-17,1858,15,1745,1,
--1,1,5,1859,20,
-1860,4,16,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-50,0,56,0,1,
-320,1,3,1,2,
-1,1,1861,22,1,
-179,1,2227,917,1,
-2479,1862,17,1863,15,
-1745,1,-1,1,5,
-1864,20,1865,4,16,
+0,51,0,1,322,
+1,3,1,2,1,
+1,1851,22,1,181,
+1,2476,1852,17,1853,
+15,1828,1,-1,1,
+5,1854,20,1855,4,
+28,86,0,111,0,
+105,0,100,0,65,
+0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,50,0,54,
-0,1,318,1,3,
-1,2,1,1,1866,
-22,1,177,1,1225,
-1867,16,0,196,1,
-2481,1868,17,1869,15,
+95,0,50,0,1,
+321,1,3,1,2,
+1,1,1856,22,1,
+180,1,2477,1857,17,
+1858,15,1828,1,-1,
+1,5,1859,20,1860,
+4,28,86,0,111,
+0,105,0,100,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,49,0,
+1,320,1,3,1,
+2,1,1,1861,22,
+1,179,1,2227,917,
+1,2479,1862,17,1863,
+15,1745,1,-1,1,
+5,1864,20,1865,4,
+16,69,0,118,0,
+101,0,110,0,116,
+0,95,0,50,0,
+54,0,1,318,1,
+3,1,2,1,1,
+1866,22,1,177,1,
+1225,1867,16,0,196,
+1,2481,1868,17,1869,
+15,1745,1,-1,1,
+5,1870,20,1871,4,
+16,69,0,118,0,
+101,0,110,0,116,
+0,95,0,50,0,
+52,0,1,316,1,
+3,1,2,1,1,
+1872,22,1,175,1,
+2482,1873,17,1874,15,
 1745,1,-1,1,5,
-1870,20,1871,4,16,
+1875,20,1876,4,16,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,50,0,52,
-0,1,316,1,3,
-1,2,1,1,1872,
-22,1,175,1,2482,
-1873,17,1874,15,1745,
-1,-1,1,5,1875,
-20,1876,4,16,69,
+95,0,50,0,51,
+0,1,315,1,3,
+1,2,1,1,1877,
+22,1,174,1,2483,
+1878,17,1879,15,1745,
+1,-1,1,5,1880,
+20,1881,4,16,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,50,0,51,0,
-1,315,1,3,1,
-2,1,1,1877,22,
-1,174,1,2483,1878,
-17,1879,15,1745,1,
--1,1,5,1880,20,
-1881,4,16,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-50,0,50,0,1,
-314,1,3,1,2,
-1,1,1882,22,1,
-173,1,1731,1883,16,
-0,196,1,2485,1884,
-17,1885,15,1745,1,
--1,1,5,1886,20,
-1887,4,16,69,0,
+0,50,0,50,0,
+1,314,1,3,1,
+2,1,1,1882,22,
+1,173,1,1731,1883,
+16,0,196,1,2485,
+1884,17,1885,15,1745,
+1,-1,1,5,1886,
+20,1887,4,16,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,50,0,48,0,
+1,312,1,3,1,
+2,1,1,1888,22,
+1,171,1,2486,1889,
+17,1890,15,1745,1,
+-1,1,5,1891,20,
+1892,4,16,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-50,0,48,0,1,
-312,1,3,1,2,
-1,1,1888,22,1,
-171,1,2486,1889,17,
-1890,15,1745,1,-1,
-1,5,1891,20,1892,
+49,0,57,0,1,
+311,1,3,1,2,
+1,1,1893,22,1,
+170,1,2487,1894,17,
+1895,15,1745,1,-1,
+1,5,1896,20,1897,
 4,16,69,0,118,
 0,101,0,110,0,
 116,0,95,0,49,
-0,57,0,1,311,
+0,56,0,1,310,
 1,3,1,2,1,
-1,1893,22,1,170,
-1,2487,1894,17,1895,
+1,1898,22,1,169,
+1,2488,1899,17,1900,
 15,1745,1,-1,1,
-5,1896,20,1897,4,
+5,1901,20,1902,4,
 16,69,0,118,0,
 101,0,110,0,116,
 0,95,0,49,0,
-56,0,1,310,1,
+55,0,1,309,1,
 3,1,2,1,1,
-1898,22,1,169,1,
-2488,1899,17,1900,15,
+1903,22,1,168,1,
+2489,1904,17,1905,15,
 1745,1,-1,1,5,
-1901,20,1902,4,16,
+1906,20,1907,4,16,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,49,0,55,
-0,1,309,1,3,
-1,2,1,1,1903,
-22,1,168,1,2489,
-1904,17,1905,15,1745,
-1,-1,1,5,1906,
-20,1907,4,16,69,
+95,0,49,0,54,
+0,1,308,1,3,
+1,2,1,1,1908,
+22,1,167,1,2490,
+1909,17,1910,15,1745,
+1,-1,1,5,1911,
+20,1912,4,16,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,49,0,54,0,
-1,308,1,3,1,
-2,1,1,1908,22,
-1,167,1,2490,1909,
-17,1910,15,1745,1,
--1,1,5,1911,20,
-1912,4,16,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-49,0,53,0,1,
-307,1,3,1,2,
-1,1,1913,22,1,
-166,1,1989,925,1,
-2492,1914,17,1915,15,
+0,49,0,53,0,
+1,307,1,3,1,
+2,1,1,1913,22,
+1,166,1,1989,925,
+1,2492,1914,17,1915,
+15,1745,1,-1,1,
+5,1916,20,1917,4,
+16,69,0,118,0,
+101,0,110,0,116,
+0,95,0,49,0,
+51,0,1,305,1,
+3,1,2,1,1,
+1918,22,1,164,1,
+2493,1919,17,1920,15,
 1745,1,-1,1,5,
-1916,20,1917,4,16,
+1921,20,1922,4,16,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,49,0,51,
-0,1,305,1,3,
-1,2,1,1,1918,
-22,1,164,1,2493,
-1919,17,1920,15,1745,
-1,-1,1,5,1921,
-20,1922,4,16,69,
+95,0,49,0,50,
+0,1,304,1,3,
+1,2,1,1,1923,
+22,1,163,1,2494,
+1924,17,1925,15,1745,
+1,-1,1,5,1926,
+20,1927,4,16,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,49,0,50,0,
-1,304,1,3,1,
-2,1,1,1923,22,
-1,163,1,2494,1924,
-17,1925,15,1745,1,
--1,1,5,1926,20,
-1927,4,16,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-49,0,49,0,1,
-303,1,3,1,2,
-1,1,1928,22,1,
-162,1,236,1929,16,
-0,196,1,2496,1930,
-17,1931,15,1745,1,
--1,1,5,1932,20,
-1933,4,14,69,0,
+0,49,0,49,0,
+1,303,1,3,1,
+2,1,1,1928,22,
+1,162,1,236,1929,
+16,0,196,1,2496,
+1930,17,1931,15,1745,
+1,-1,1,5,1932,
+20,1933,4,14,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,57,0,1,301,
+1,3,1,2,1,
+1,1934,22,1,160,
+1,2497,1935,17,1936,
+15,1745,1,-1,1,
+5,1937,20,1938,4,
+14,69,0,118,0,
+101,0,110,0,116,
+0,95,0,56,0,
+1,300,1,3,1,
+2,1,1,1939,22,
+1,159,1,2498,1940,
+17,1941,15,1745,1,
+-1,1,5,1942,20,
+1943,4,14,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-57,0,1,301,1,
+55,0,1,299,1,
 3,1,2,1,1,
-1934,22,1,160,1,
-2497,1935,17,1936,15,
+1944,22,1,158,1,
+2499,1945,17,1946,15,
 1745,1,-1,1,5,
-1937,20,1938,4,14,
+1947,20,1948,4,14,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,56,0,1,
-300,1,3,1,2,
-1,1,1939,22,1,
-159,1,2498,1940,17,
-1941,15,1745,1,-1,
-1,5,1942,20,1943,
+95,0,54,0,1,
+298,1,3,1,2,
+1,1,1949,22,1,
+157,1,2500,1950,17,
+1951,15,1745,1,-1,
+1,5,1952,20,1953,
 4,14,69,0,118,
 0,101,0,110,0,
-116,0,95,0,55,
-0,1,299,1,3,
-1,2,1,1,1944,
-22,1,158,1,2499,
-1945,17,1946,15,1745,
-1,-1,1,5,1947,
-20,1948,4,14,69,
+116,0,95,0,53,
+0,1,297,1,3,
+1,2,1,1,1954,
+22,1,156,1,2501,
+1955,17,1956,15,1745,
+1,-1,1,5,1957,
+20,1958,4,14,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,54,0,1,298,
+0,52,0,1,296,
 1,3,1,2,1,
-1,1949,22,1,157,
-1,2500,1950,17,1951,
+1,1959,22,1,155,
+1,2502,1960,17,1961,
 15,1745,1,-1,1,
-5,1952,20,1953,4,
+5,1962,20,1963,4,
 14,69,0,118,0,
 101,0,110,0,116,
-0,95,0,53,0,
-1,297,1,3,1,
-2,1,1,1954,22,
-1,156,1,2501,1955,
-17,1956,15,1745,1,
--1,1,5,1957,20,
-1958,4,14,69,0,
+0,95,0,51,0,
+1,295,1,3,1,
+2,1,1,1964,22,
+1,154,1,2503,1965,
+17,1966,15,1745,1,
+-1,1,5,1967,20,
+1968,4,14,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-52,0,1,296,1,
+50,0,1,294,1,
 3,1,2,1,1,
-1959,22,1,155,1,
-2502,1960,17,1961,15,
+1969,22,1,153,1,
+2504,1970,17,1971,15,
 1745,1,-1,1,5,
-1962,20,1963,4,14,
+1972,20,1973,4,14,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,51,0,1,
-295,1,3,1,2,
-1,1,1964,22,1,
-154,1,2503,1965,17,
-1966,15,1745,1,-1,
-1,5,1967,20,1968,
-4,14,69,0,118,
+95,0,49,0,1,
+293,1,3,1,2,
+1,1,1974,22,1,
+152,1,2505,1975,16,
+0,441,1,217,1976,
+16,0,196,1,1756,
+1977,16,0,196,1,
+17,1978,19,160,1,
+17,1979,5,118,1,
+1,1980,17,1981,15,
+1982,4,18,37,0,
+84,0,121,0,112,
 0,101,0,110,0,
-116,0,95,0,50,
-0,1,294,1,3,
-1,2,1,1,1969,
-22,1,153,1,2504,
-1970,17,1971,15,1745,
-1,-1,1,5,1972,
-20,1973,4,14,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,49,0,1,293,
-1,3,1,2,1,
-1,1974,22,1,152,
-1,2505,1975,16,0,
-441,1,217,1976,16,
-0,196,1,1756,1977,
-16,0,196,1,17,
-1978,19,160,1,17,
-1979,5,118,1,1,
-1980,17,1981,15,1982,
-4,18,37,0,84,
-0,121,0,112,0,
-101,0,110,0,97,
-0,109,0,101,0,
-1,-1,1,5,1983,
-20,1984,4,20,84,
-0,121,0,112,0,
-101,0,110,0,97,
-0,109,0,101,0,
-95,0,55,0,1,
-292,1,3,1,2,
-1,1,1985,22,1,
-151,1,2,1986,17,
-1987,15,1982,1,-1,
-1,5,1988,20,1989,
-4,20,84,0,121,
-0,112,0,101,0,
-110,0,97,0,109,
-0,101,0,95,0,
-54,0,1,291,1,
-3,1,2,1,1,
-1990,22,1,150,1,
-3,1991,17,1992,15,
-1982,1,-1,1,5,
-1993,20,1994,4,20,
+97,0,109,0,101,
+0,1,-1,1,5,
+1983,20,1984,4,20,
 84,0,121,0,112,
 0,101,0,110,0,
 97,0,109,0,101,
-0,95,0,53,0,
-1,290,1,3,1,
-2,1,1,1995,22,
-1,149,1,4,1996,
-17,1997,15,1982,1,
--1,1,5,1998,20,
-1999,4,20,84,0,
+0,95,0,55,0,
+1,292,1,3,1,
+2,1,1,1985,22,
+1,151,1,2,1986,
+17,1987,15,1982,1,
+-1,1,5,1988,20,
+1989,4,20,84,0,
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,95,
-0,52,0,1,289,
+0,54,0,1,291,
 1,3,1,2,1,
-1,2000,22,1,148,
-1,5,2001,17,2002,
+1,1990,22,1,150,
+1,3,1991,17,1992,
 15,1982,1,-1,1,
-5,2003,20,2004,4,
+5,1993,20,1994,4,
 20,84,0,121,0,
 112,0,101,0,110,
 0,97,0,109,0,
-101,0,95,0,51,
-0,1,288,1,3,
-1,2,1,1,2005,
-22,1,147,1,6,
-2006,17,2007,15,1982,
-1,-1,1,5,2008,
-20,2009,4,20,84,
+101,0,95,0,53,
+0,1,290,1,3,
+1,2,1,1,1995,
+22,1,149,1,4,
+1996,17,1997,15,1982,
+1,-1,1,5,1998,
+20,1999,4,20,84,
 0,121,0,112,0,
 101,0,110,0,97,
 0,109,0,101,0,
-95,0,50,0,1,
-287,1,3,1,2,
-1,1,2010,22,1,
-146,1,7,2011,17,
-2012,15,1982,1,-1,
-1,5,2013,20,2014,
+95,0,52,0,1,
+289,1,3,1,2,
+1,1,2000,22,1,
+148,1,5,2001,17,
+2002,15,1982,1,-1,
+1,5,2003,20,2004,
 4,20,84,0,121,
 0,112,0,101,0,
 110,0,97,0,109,
 0,101,0,95,0,
-49,0,1,286,1,
+51,0,1,288,1,
 3,1,2,1,1,
-2015,22,1,145,1,
-1514,1118,1,9,1123,
-1,10,1672,1,262,
-1129,1,1267,1135,1,
-481,1714,1,1521,1140,
-1,1773,2016,16,0,
-247,1,19,1157,1,
-20,2017,16,0,158,
-1,2281,1164,1,525,
-1226,1,30,1676,1,
-283,1182,1,1010,2018,
-16,0,609,1,40,
-1187,1,41,1681,1,
-42,1685,1,44,1193,
-1,1260,1106,1,47,
-1194,1,1303,1317,1,
-49,1206,1,50,1211,
-1,48,1200,1,305,
-1221,1,51,1216,1,
-61,2019,16,0,204,
-1,63,1232,1,66,
-1238,1,67,1243,1,
-1478,1463,1,69,1253,
-1,70,1258,1,68,
-1248,1,73,2020,16,
-0,214,1,74,1263,
-1,1013,1268,1,2335,
-2021,16,0,249,1,
-328,1312,1,1048,1354,
-1,2511,1668,1,82,
-1290,1,1840,2022,16,
-0,312,1,1341,1307,
-1,2520,2023,16,0,
-451,1,1096,1322,1,
-93,1328,1,1550,1333,
-1,352,1359,1,1011,
-1112,1,107,1348,1,
-1114,1353,1,1871,2024,
-16,0,322,1,1370,
-1593,1,118,1365,1,
-1123,1370,1,1332,1273,
-1,1377,1381,1,375,
-1386,1,1882,2025,16,
-0,335,1,377,1391,
-1,827,1341,1,380,
-1401,1,130,1424,1,
-2074,2026,16,0,565,
-1,371,1375,1,373,
-1419,1,1012,2027,16,
-0,611,1,379,1396,
-1,143,1429,1,2654,
-1692,1,1152,1435,1,
-1406,1440,1,2663,2028,
-16,0,670,1,1159,
-1447,1,157,1452,1,
-1413,1457,1,883,1407,
-1,1094,2029,16,0,
-677,1,1296,1177,1,
-172,1470,1,1665,1475,
-1,1939,2030,16,0,
-448,1,1188,1480,1,
-1442,1485,1,188,1519,
-1,942,1491,1,1195,
-1497,1,1449,1502,1,
-1701,1507,1,447,1512,
-1,205,1524,1,2467,
-1701,1,464,1707,1,
-2197,2031,16,0,674,
-1,1224,1534,1,223,
-1539,1,1730,1544,1,
-476,1549,1,477,1555,
-1,1231,1560,1,479,
-1565,1,480,1570,1,
-1485,1576,1,459,1712,
-1,242,1583,1,478,
-1588,1,2506,2032,16,
-0,442,1,1001,1598,
-1,1002,1603,1,18,
-2033,19,500,1,18,
-2034,5,84,1,1011,
-1112,1,1012,2035,16,
-0,498,1,1013,1268,
-1,262,1129,1,1267,
-2036,16,0,498,1,
-515,2037,16,0,498,
-1,1521,2038,16,0,
-498,1,525,1226,1,
-283,1182,1,2299,2039,
-16,0,498,1,42,
-2040,16,0,498,1,
-40,1187,1,44,1193,
-1,47,1194,1,1303,
-2041,16,0,498,1,
-1555,2042,16,0,498,
-1,50,1211,1,48,
-1200,1,49,1206,1,
-51,1216,1,63,1232,
-1,305,1221,1,66,
-1238,1,67,1243,1,
-68,1248,1,69,1253,
-1,70,1258,1,73,
-2043,16,0,498,1,
-74,1263,1,328,1312,
-1,1048,2044,16,0,
-498,1,82,2045,16,
-0,498,1,1840,2046,
-16,0,498,1,1591,
-2047,16,0,498,1,
-1341,2048,16,0,498,
-1,1096,1322,1,93,
-1328,1,352,1359,1,
-107,2049,16,0,498,
-1,1114,1353,1,118,
-2050,16,0,498,1,
-1123,2051,16,0,498,
-1,371,1375,1,1628,
-2052,16,0,498,1,
-375,1386,1,1882,2053,
-16,0,498,1,377,
-1391,1,379,1396,1,
-380,1401,1,883,2054,
-16,0,498,1,373,
-1419,1,130,2055,16,
-0,498,1,143,2056,
-16,0,498,1,387,
-2057,16,0,498,1,
-1159,2058,16,0,498,
-1,157,2059,16,0,
-498,1,1413,2060,16,
-0,498,1,1665,2061,
-16,0,498,1,412,
-2062,16,0,498,1,
-2676,2063,16,0,498,
-1,1377,2064,16,0,
-498,1,172,2065,16,
-0,498,1,1939,2066,
-16,0,498,1,437,
-2067,16,0,498,1,
-188,2068,16,0,498,
-1,942,2069,16,0,
-498,1,1195,2070,16,
-0,498,1,1449,2071,
-16,0,498,1,1701,
-2072,16,0,498,1,
-447,1512,1,205,2073,
-16,0,498,1,827,
-2074,16,0,498,1,
-223,2075,16,0,498,
-1,476,1549,1,477,
-1555,1,1231,2076,16,
-0,498,1,479,1565,
-1,480,1570,1,1485,
-2077,16,0,498,1,
-1737,2078,16,0,498,
-1,242,2079,16,0,
-498,1,478,1588,1,
-1001,1598,1,1002,1603,
-1,19,2080,19,235,
-1,19,2081,5,176,
-1,2676,2082,16,0,
-469,1,256,2083,16,
-0,233,1,1261,2084,
-16,0,233,1,1011,
-1112,1,1012,2085,16,
-0,469,1,2458,885,
-1,262,1129,1,1267,
-2086,16,0,469,1,
-2021,728,1,1521,2087,
-16,0,469,1,1775,
-2088,16,0,233,1,
-2029,735,1,2030,741,
-1,2031,746,1,2032,
-751,1,2033,756,1,
-277,2089,16,0,233,
-1,2035,762,1,2037,
-767,1,2039,772,1,
-32,2090,16,0,233,
-1,2464,908,1,2293,
-2091,16,0,233,1,
-2043,784,1,2045,789,
-1,2299,2092,16,0,
-469,1,41,2093,16,
-0,233,1,42,2094,
-16,0,469,1,40,
-1187,1,44,1193,1,
-43,2095,16,0,233,
-1,1804,2096,16,0,
-233,1,48,1200,1,
-49,1206,1,47,1194,
-1,51,1216,1,52,
-2097,16,0,233,1,
-50,1211,1,305,1221,
-1,1096,1322,1,1515,
-2098,16,0,233,1,
-2318,2099,16,0,233,
-1,283,1182,1,63,
-1232,1,66,1238,1,
-67,1243,1,68,1248,
-1,69,1253,1,70,
-1258,1,71,2100,16,
-0,233,1,73,2101,
-16,0,469,1,74,
+2005,22,1,147,1,
+6,2006,17,2007,15,
+1982,1,-1,1,5,
+2008,20,2009,4,20,
+84,0,121,0,112,
+0,101,0,110,0,
+97,0,109,0,101,
+0,95,0,50,0,
+1,287,1,3,1,
+2,1,1,2010,22,
+1,146,1,7,2011,
+17,2012,15,1982,1,
+-1,1,5,2013,20,
+2014,4,20,84,0,
+121,0,112,0,101,
+0,110,0,97,0,
+109,0,101,0,95,
+0,49,0,1,286,
+1,3,1,2,1,
+1,2015,22,1,145,
+1,1514,1118,1,9,
+1123,1,10,1672,1,
+262,1129,1,1267,1135,
+1,481,1714,1,1521,
+1140,1,1773,2016,16,
+0,247,1,19,1157,
+1,20,2017,16,0,
+158,1,2281,1164,1,
+525,1226,1,30,1676,
+1,283,1182,1,1010,
+2018,16,0,609,1,
+40,1187,1,41,1681,
+1,42,1685,1,44,
+1193,1,1260,1106,1,
+47,1194,1,1303,1317,
+1,49,1206,1,50,
+1211,1,48,1200,1,
+305,1221,1,51,1216,
+1,61,2019,16,0,
+204,1,63,1232,1,
+66,1238,1,67,1243,
+1,1478,1463,1,69,
+1253,1,70,1258,1,
+68,1248,1,73,2020,
+16,0,214,1,74,
 1263,1,1013,1268,1,
-76,2102,16,0,233,
-1,1834,2103,16,0,
-233,1,2337,2104,16,
-0,233,1,79,2105,
-16,0,233,1,1335,
-2106,16,0,233,1,
-299,2107,16,0,233,
-1,82,2108,16,0,
-469,1,1840,2109,16,
-0,469,1,1297,2110,
-16,0,233,1,85,
-2111,16,0,233,1,
-1341,2112,16,0,469,
-1,89,2113,16,0,
-233,1,1303,2114,16,
-0,469,1,509,2115,
-16,0,233,1,93,
-1328,1,322,2116,16,
-0,233,1,97,2117,
-16,0,233,1,2041,
-778,1,1555,2118,16,
-0,469,1,827,2119,
-16,0,469,1,102,
-2120,16,0,233,1,
-1860,831,1,1803,797,
-1,2364,837,1,107,
-2121,16,0,469,1,
-1114,1353,1,112,2122,
-16,0,233,1,1117,
-2123,16,0,233,1,
-352,1359,1,1873,845,
-1,118,2124,16,0,
-469,1,1123,2125,16,
-0,469,1,371,1375,
-1,515,2126,16,0,
-469,1,1377,2127,16,
-0,469,1,124,2128,
-16,0,233,1,1882,
-2129,16,0,469,1,
-377,1391,1,379,1396,
-1,380,1401,1,130,
-2130,16,0,469,1,
-346,2131,16,0,233,
-1,2075,2132,16,0,
-233,1,373,1419,1,
-387,2133,16,0,469,
-1,137,2134,16,0,
-233,1,143,2135,16,
-0,469,1,1901,2136,
-16,0,233,1,1048,
-2137,16,0,469,1,
-1153,2138,16,0,233,
-1,375,1386,1,151,
-2139,16,0,233,1,
-1407,2140,16,0,233,
-1,1659,2141,16,0,
-233,1,2413,2142,16,
-0,233,1,1159,2143,
-16,0,469,1,381,
-2144,16,0,233,1,
-157,2145,16,0,469,
-1,1413,2146,16,0,
-469,1,883,2147,16,
-0,469,1,1371,2148,
-16,0,233,1,328,
-1312,1,2105,824,1,
-2106,2149,16,0,233,
-1,166,2150,16,0,
-233,1,525,2151,16,
-0,233,1,1622,2152,
-16,0,233,1,406,
-2153,16,0,233,1,
-1574,809,1,172,2154,
-16,0,469,1,1931,
-870,1,412,2155,16,
-0,469,1,1933,2156,
-16,0,233,1,1876,
-2157,16,0,233,1,
-431,2158,16,0,233,
-1,1585,2159,16,0,
-233,1,182,2160,16,
-0,233,1,1628,2161,
-16,0,469,1,1189,
-2162,16,0,233,1,
-437,2163,16,0,469,
-1,1591,2164,16,0,
-469,1,188,2165,16,
-0,469,1,1695,2166,
-16,0,233,1,2198,
-2167,16,0,233,1,
-1195,2168,16,0,469,
-1,1449,2169,16,0,
-469,1,1701,2170,16,
-0,469,1,447,2171,
-16,0,233,1,199,
-2172,16,0,233,1,
-2459,891,1,1958,2173,
-16,0,233,1,2462,
-898,1,1657,903,1,
-205,2174,16,0,469,
-1,459,2175,16,0,
-233,1,462,2176,16,
-0,233,1,1665,2177,
-16,0,469,1,217,
-2178,16,0,233,1,
-2227,917,1,942,2179,
-16,0,469,1,1225,
-2180,16,0,233,1,
-223,2181,16,0,469,
-1,1479,2182,16,0,
-233,1,1731,2183,16,
-0,233,1,477,1555,
-1,1231,2184,16,0,
-469,1,479,1565,1,
-480,1570,1,1485,2185,
-16,0,469,1,1737,
-2186,16,0,469,1,
-1989,925,1,1990,2187,
-16,0,233,1,1443,
-2188,16,0,233,1,
-236,2189,16,0,233,
-1,2136,852,1,476,
-1549,1,242,2190,16,
-0,469,1,478,1588,
-1,1939,2191,16,0,
-469,1,2670,2192,16,
-0,233,1,1001,1598,
-1,1002,1603,1,1756,
-2193,16,0,233,1,
-20,2194,19,458,1,
-20,2195,5,84,1,
-1011,1112,1,1012,2196,
-16,0,456,1,1013,
+2335,2021,16,0,249,
+1,328,1312,1,1048,
+1354,1,2511,1668,1,
+82,1290,1,1840,2022,
+16,0,312,1,1341,
+1307,1,2520,2023,16,
+0,451,1,1096,1322,
+1,93,1328,1,1550,
+1333,1,352,1359,1,
+1011,1112,1,107,1348,
+1,1114,1353,1,1871,
+2024,16,0,322,1,
+1370,1593,1,118,1365,
+1,1123,1370,1,1332,
+1273,1,1377,1381,1,
+375,1386,1,1882,2025,
+16,0,335,1,377,
+1391,1,827,1341,1,
+380,1401,1,130,1424,
+1,2074,2026,16,0,
+565,1,371,1375,1,
+373,1419,1,1012,2027,
+16,0,611,1,379,
+1396,1,143,1429,1,
+2654,1692,1,1152,1435,
+1,1406,1440,1,2663,
+2028,16,0,670,1,
+1159,1447,1,157,1452,
+1,1413,1457,1,883,
+1407,1,1094,2029,16,
+0,677,1,1296,1177,
+1,172,1470,1,1665,
+1475,1,1939,2030,16,
+0,448,1,1188,1480,
+1,1442,1485,1,188,
+1519,1,942,1491,1,
+1195,1497,1,1449,1502,
+1,1701,1507,1,447,
+1512,1,205,1524,1,
+2467,1701,1,464,1707,
+1,2197,2031,16,0,
+674,1,1224,1534,1,
+223,1539,1,1730,1544,
+1,476,1549,1,477,
+1555,1,1231,1560,1,
+479,1565,1,480,1570,
+1,1485,1576,1,459,
+1712,1,242,1583,1,
+478,1588,1,2506,2032,
+16,0,442,1,1001,
+1598,1,1002,1603,1,
+18,2033,19,500,1,
+18,2034,5,84,1,
+1011,1112,1,1012,2035,
+16,0,498,1,1013,
 1268,1,262,1129,1,
-1267,2197,16,0,456,
-1,515,2198,16,0,
-456,1,1521,2199,16,
-0,456,1,525,1226,
+1267,2036,16,0,498,
+1,515,2037,16,0,
+498,1,1521,2038,16,
+0,498,1,525,1226,
 1,283,1182,1,2299,
-2200,16,0,456,1,
-42,2201,16,0,456,
+2039,16,0,498,1,
+42,2040,16,0,498,
 1,40,1187,1,44,
 1193,1,47,1194,1,
-1303,2202,16,0,456,
-1,1555,2203,16,0,
-456,1,50,1211,1,
+1303,2041,16,0,498,
+1,1555,2042,16,0,
+498,1,50,1211,1,
 48,1200,1,49,1206,
 1,51,1216,1,63,
 1232,1,305,1221,1,
 66,1238,1,67,1243,
 1,68,1248,1,69,
 1253,1,70,1258,1,
-73,2204,16,0,456,
+73,2043,16,0,498,
 1,74,1263,1,328,
-2205,16,0,456,1,
-1048,2206,16,0,456,
-1,82,2207,16,0,
-456,1,1840,2208,16,
-0,456,1,1591,2209,
-16,0,456,1,1341,
-2210,16,0,456,1,
-1096,1322,1,93,1328,
-1,352,2211,16,0,
-456,1,107,2212,16,
-0,456,1,1114,1353,
-1,118,2213,16,0,
-456,1,1123,2214,16,
-0,456,1,371,1375,
-1,1628,2215,16,0,
-456,1,375,1386,1,
-1882,2216,16,0,456,
-1,377,1391,1,379,
-1396,1,380,1401,1,
-883,2217,16,0,456,
-1,373,1419,1,130,
-2218,16,0,456,1,
-143,2219,16,0,456,
-1,387,2220,16,0,
-456,1,1159,2221,16,
-0,456,1,157,2222,
-16,0,456,1,1413,
-2223,16,0,456,1,
-1665,2224,16,0,456,
-1,412,2225,16,0,
-456,1,2676,2226,16,
-0,456,1,1377,2227,
-16,0,456,1,172,
-2228,16,0,456,1,
-1939,2229,16,0,456,
-1,437,2230,16,0,
-456,1,188,2231,16,
-0,456,1,942,2232,
-16,0,456,1,1195,
-2233,16,0,456,1,
-1449,2234,16,0,456,
-1,1701,2235,16,0,
-456,1,447,1512,1,
-205,2236,16,0,456,
-1,827,2237,16,0,
-456,1,223,2238,16,
-0,456,1,476,1549,
-1,477,1555,1,1231,
-2239,16,0,456,1,
-479,1565,1,480,1570,
-1,1485,2240,16,0,
-456,1,1737,2241,16,
-0,456,1,242,2242,
-16,0,456,1,478,
-1588,1,1001,1598,1,
-1002,1603,1,21,2243,
-19,440,1,21,2244,
-5,84,1,1011,1112,
-1,1012,2245,16,0,
-438,1,1013,1268,1,
-262,1129,1,1267,2246,
-16,0,438,1,515,
-2247,16,0,438,1,
-1521,2248,16,0,438,
-1,525,1226,1,283,
-1182,1,2299,2249,16,
-0,438,1,42,2250,
-16,0,438,1,40,
-1187,1,44,1193,1,
-47,1194,1,1303,2251,
-16,0,438,1,1555,
-2252,16,0,438,1,
-50,1211,1,48,1200,
-1,49,1206,1,51,
-1216,1,63,1232,1,
-305,1221,1,66,1238,
-1,67,1243,1,68,
-1248,1,69,1253,1,
-70,1258,1,73,2253,
-16,0,438,1,74,
-1263,1,328,2254,16,
-0,438,1,1048,2255,
-16,0,438,1,82,
-2256,16,0,438,1,
-1840,2257,16,0,438,
-1,1591,2258,16,0,
-438,1,1341,2259,16,
-0,438,1,1096,1322,
-1,93,1328,1,352,
-2260,16,0,438,1,
-107,2261,16,0,438,
-1,1114,1353,1,118,
-2262,16,0,438,1,
-1123,2263,16,0,438,
-1,371,1375,1,1628,
-2264,16,0,438,1,
-375,1386,1,1882,2265,
-16,0,438,1,377,
-1391,1,379,1396,1,
-380,1401,1,883,2266,
-16,0,438,1,373,
-1419,1,130,2267,16,
-0,438,1,143,2268,
-16,0,438,1,387,
-2269,16,0,438,1,
-1159,2270,16,0,438,
-1,157,2271,16,0,
-438,1,1413,2272,16,
-0,438,1,1665,2273,
-16,0,438,1,412,
-2274,16,0,438,1,
-2676,2275,16,0,438,
-1,1377,2276,16,0,
-438,1,172,2277,16,
-0,438,1,1939,2278,
-16,0,438,1,437,
-2279,16,0,438,1,
-188,2280,16,0,438,
-1,942,2281,16,0,
-438,1,1195,2282,16,
-0,438,1,1449,2283,
-16,0,438,1,1701,
-2284,16,0,438,1,
-447,1512,1,205,2285,
-16,0,438,1,827,
-2286,16,0,438,1,
-223,2287,16,0,438,
-1,476,1549,1,477,
-1555,1,1231,2288,16,
-0,438,1,479,1565,
+1312,1,1048,2044,16,
+0,498,1,82,2045,
+16,0,498,1,1840,
+2046,16,0,498,1,
+1591,2047,16,0,498,
+1,1341,2048,16,0,
+498,1,1096,1322,1,
+93,1328,1,352,1359,
+1,107,2049,16,0,
+498,1,1114,1353,1,
+118,2050,16,0,498,
+1,1123,2051,16,0,
+498,1,371,1375,1,
+1628,2052,16,0,498,
+1,375,1386,1,1882,
+2053,16,0,498,1,
+377,1391,1,379,1396,
+1,380,1401,1,883,
+2054,16,0,498,1,
+373,1419,1,130,2055,
+16,0,498,1,143,
+2056,16,0,498,1,
+387,2057,16,0,498,
+1,1159,2058,16,0,
+498,1,157,2059,16,
+0,498,1,1413,2060,
+16,0,498,1,1665,
+2061,16,0,498,1,
+412,2062,16,0,498,
+1,2676,2063,16,0,
+498,1,1377,2064,16,
+0,498,1,172,2065,
+16,0,498,1,1939,
+2066,16,0,498,1,
+437,2067,16,0,498,
+1,188,2068,16,0,
+498,1,942,2069,16,
+0,498,1,1195,2070,
+16,0,498,1,1449,
+2071,16,0,498,1,
+1701,2072,16,0,498,
+1,447,1512,1,205,
+2073,16,0,498,1,
+827,2074,16,0,498,
+1,223,2075,16,0,
+498,1,476,1549,1,
+477,1555,1,1231,2076,
+16,0,498,1,479,
+1565,1,480,1570,1,
+1485,2077,16,0,498,
+1,1737,2078,16,0,
+498,1,242,2079,16,
+0,498,1,478,1588,
+1,1001,1598,1,1002,
+1603,1,19,2080,19,
+235,1,19,2081,5,
+176,1,2676,2082,16,
+0,469,1,256,2083,
+16,0,233,1,1261,
+2084,16,0,233,1,
+1011,1112,1,1012,2085,
+16,0,469,1,2458,
+885,1,262,1129,1,
+1267,2086,16,0,469,
+1,2021,728,1,1521,
+2087,16,0,469,1,
+1775,2088,16,0,233,
+1,2029,735,1,2030,
+741,1,2031,746,1,
+2032,751,1,2033,756,
+1,277,2089,16,0,
+233,1,2035,762,1,
+2037,767,1,2039,772,
+1,32,2090,16,0,
+233,1,2464,908,1,
+2293,2091,16,0,233,
+1,2043,784,1,2045,
+789,1,2299,2092,16,
+0,469,1,41,2093,
+16,0,233,1,42,
+2094,16,0,469,1,
+40,1187,1,44,1193,
+1,43,2095,16,0,
+233,1,1804,2096,16,
+0,233,1,48,1200,
+1,49,1206,1,47,
+1194,1,51,1216,1,
+52,2097,16,0,233,
+1,50,1211,1,305,
+1221,1,1096,1322,1,
+1515,2098,16,0,233,
+1,2318,2099,16,0,
+233,1,283,1182,1,
+63,1232,1,66,1238,
+1,67,1243,1,68,
+1248,1,69,1253,1,
+70,1258,1,71,2100,
+16,0,233,1,73,
+2101,16,0,469,1,
+74,1263,1,1013,1268,
+1,76,2102,16,0,
+233,1,1834,2103,16,
+0,233,1,2337,2104,
+16,0,233,1,79,
+2105,16,0,233,1,
+1335,2106,16,0,233,
+1,299,2107,16,0,
+233,1,82,2108,16,
+0,469,1,1840,2109,
+16,0,469,1,1297,
+2110,16,0,233,1,
+85,2111,16,0,233,
+1,1341,2112,16,0,
+469,1,89,2113,16,
+0,233,1,1303,2114,
+16,0,469,1,509,
+2115,16,0,233,1,
+93,1328,1,322,2116,
+16,0,233,1,97,
+2117,16,0,233,1,
+2041,778,1,1555,2118,
+16,0,469,1,827,
+2119,16,0,469,1,
+102,2120,16,0,233,
+1,1860,831,1,1803,
+797,1,2364,837,1,
+107,2121,16,0,469,
+1,1114,1353,1,112,
+2122,16,0,233,1,
+1117,2123,16,0,233,
+1,352,1359,1,1873,
+845,1,118,2124,16,
+0,469,1,1123,2125,
+16,0,469,1,371,
+1375,1,515,2126,16,
+0,469,1,1377,2127,
+16,0,469,1,124,
+2128,16,0,233,1,
+1882,2129,16,0,469,
+1,377,1391,1,379,
+1396,1,380,1401,1,
+130,2130,16,0,469,
+1,346,2131,16,0,
+233,1,2075,2132,16,
+0,233,1,373,1419,
+1,387,2133,16,0,
+469,1,137,2134,16,
+0,233,1,143,2135,
+16,0,469,1,1901,
+2136,16,0,233,1,
+1048,2137,16,0,469,
+1,1153,2138,16,0,
+233,1,375,1386,1,
+151,2139,16,0,233,
+1,1407,2140,16,0,
+233,1,1659,2141,16,
+0,233,1,2413,2142,
+16,0,233,1,1159,
+2143,16,0,469,1,
+381,2144,16,0,233,
+1,157,2145,16,0,
+469,1,1413,2146,16,
+0,469,1,883,2147,
+16,0,469,1,1371,
+2148,16,0,233,1,
+328,1312,1,2105,824,
+1,2106,2149,16,0,
+233,1,166,2150,16,
+0,233,1,525,2151,
+16,0,233,1,1622,
+2152,16,0,233,1,
+406,2153,16,0,233,
+1,1574,809,1,172,
+2154,16,0,469,1,
+1931,870,1,412,2155,
+16,0,469,1,1933,
+2156,16,0,233,1,
+1876,2157,16,0,233,
+1,431,2158,16,0,
+233,1,1585,2159,16,
+0,233,1,182,2160,
+16,0,233,1,1628,
+2161,16,0,469,1,
+1189,2162,16,0,233,
+1,437,2163,16,0,
+469,1,1591,2164,16,
+0,469,1,188,2165,
+16,0,469,1,1695,
+2166,16,0,233,1,
+2198,2167,16,0,233,
+1,1195,2168,16,0,
+469,1,1449,2169,16,
+0,469,1,1701,2170,
+16,0,469,1,447,
+2171,16,0,233,1,
+199,2172,16,0,233,
+1,2459,891,1,1958,
+2173,16,0,233,1,
+2462,898,1,1657,903,
+1,205,2174,16,0,
+469,1,459,2175,16,
+0,233,1,462,2176,
+16,0,233,1,1665,
+2177,16,0,469,1,
+217,2178,16,0,233,
+1,2227,917,1,942,
+2179,16,0,469,1,
+1225,2180,16,0,233,
+1,223,2181,16,0,
+469,1,1479,2182,16,
+0,233,1,1731,2183,
+16,0,233,1,477,
+1555,1,1231,2184,16,
+0,469,1,479,1565,
 1,480,1570,1,1485,
-2289,16,0,438,1,
-1737,2290,16,0,438,
-1,242,2291,16,0,
-438,1,478,1588,1,
-1001,1598,1,1002,1603,
-1,22,2292,19,391,
-1,22,2293,5,84,
+2185,16,0,469,1,
+1737,2186,16,0,469,
+1,1989,925,1,1990,
+2187,16,0,233,1,
+1443,2188,16,0,233,
+1,236,2189,16,0,
+233,1,2136,852,1,
+476,1549,1,242,2190,
+16,0,469,1,478,
+1588,1,1939,2191,16,
+0,469,1,2670,2192,
+16,0,233,1,1001,
+1598,1,1002,1603,1,
+1756,2193,16,0,233,
+1,20,2194,19,458,
+1,20,2195,5,84,
 1,1011,1112,1,1012,
-2294,16,0,389,1,
+2196,16,0,456,1,
 1013,1268,1,262,1129,
-1,1267,2295,16,0,
-389,1,515,2296,16,
-0,389,1,1521,2297,
-16,0,389,1,525,
+1,1267,2197,16,0,
+456,1,515,2198,16,
+0,456,1,1521,2199,
+16,0,456,1,525,
 1226,1,283,1182,1,
-2299,2298,16,0,389,
-1,42,2299,16,0,
-389,1,40,1187,1,
+2299,2200,16,0,456,
+1,42,2201,16,0,
+456,1,40,1187,1,
 44,1193,1,47,1194,
-1,1303,2300,16,0,
-389,1,1555,2301,16,
-0,389,1,50,1211,
+1,1303,2202,16,0,
+456,1,1555,2203,16,
+0,456,1,50,1211,
 1,48,1200,1,49,
 1206,1,51,1216,1,
 63,1232,1,305,1221,
 1,66,1238,1,67,
 1243,1,68,1248,1,
 69,1253,1,70,1258,
-1,73,2302,16,0,
-389,1,74,1263,1,
-328,2303,16,0,389,
-1,1048,2304,16,0,
-389,1,82,2305,16,
-0,389,1,1840,2306,
-16,0,389,1,1591,
-2307,16,0,389,1,
-1341,2308,16,0,389,
+1,73,2204,16,0,
+456,1,74,1263,1,
+328,2205,16,0,456,
+1,1048,2206,16,0,
+456,1,82,2207,16,
+0,456,1,1840,2208,
+16,0,456,1,1591,
+2209,16,0,456,1,
+1341,2210,16,0,456,
 1,1096,1322,1,93,
-1328,1,352,2309,16,
-0,389,1,107,2310,
-16,0,389,1,1114,
-1353,1,118,2311,16,
-0,389,1,1123,2312,
-16,0,389,1,371,
-1375,1,1628,2313,16,
-0,389,1,375,1386,
-1,1882,2314,16,0,
-389,1,377,1391,1,
+1328,1,352,2211,16,
+0,456,1,107,2212,
+16,0,456,1,1114,
+1353,1,118,2213,16,
+0,456,1,1123,2214,
+16,0,456,1,371,
+1375,1,1628,2215,16,
+0,456,1,375,1386,
+1,1882,2216,16,0,
+456,1,377,1391,1,
 379,1396,1,380,1401,
-1,883,2315,16,0,
-389,1,373,1419,1,
-130,2316,16,0,389,
-1,143,2317,16,0,
-389,1,387,2318,16,
-0,389,1,1159,2319,
-16,0,389,1,157,
-2320,16,0,389,1,
-1413,2321,16,0,389,
-1,1665,2322,16,0,
-389,1,412,2323,16,
-0,389,1,2676,2324,
-16,0,389,1,1377,
-2325,16,0,389,1,
-172,2326,16,0,389,
-1,1939,2327,16,0,
-389,1,437,2328,16,
-0,389,1,188,2329,
-16,0,389,1,942,
-2330,16,0,389,1,
-1195,2331,16,0,389,
-1,1449,2332,16,0,
-389,1,1701,2333,16,
-0,389,1,447,1512,
-1,205,2334,16,0,
-389,1,827,2335,16,
-0,389,1,223,2336,
-16,0,389,1,476,
+1,883,2217,16,0,
+456,1,373,1419,1,
+130,2218,16,0,456,
+1,143,2219,16,0,
+456,1,387,2220,16,
+0,456,1,1159,2221,
+16,0,456,1,157,
+2222,16,0,456,1,
+1413,2223,16,0,456,
+1,1665,2224,16,0,
+456,1,412,2225,16,
+0,456,1,2676,2226,
+16,0,456,1,1377,
+2227,16,0,456,1,
+172,2228,16,0,456,
+1,1939,2229,16,0,
+456,1,437,2230,16,
+0,456,1,188,2231,
+16,0,456,1,942,
+2232,16,0,456,1,
+1195,2233,16,0,456,
+1,1449,2234,16,0,
+456,1,1701,2235,16,
+0,456,1,447,1512,
+1,205,2236,16,0,
+456,1,827,2237,16,
+0,456,1,223,2238,
+16,0,456,1,476,
 1549,1,477,1555,1,
-1231,2337,16,0,389,
+1231,2239,16,0,456,
 1,479,1565,1,480,
-1570,1,1485,2338,16,
-0,389,1,1737,2339,
-16,0,389,1,242,
-2340,16,0,389,1,
+1570,1,1485,2240,16,
+0,456,1,1737,2241,
+16,0,456,1,242,
+2242,16,0,456,1,
 478,1588,1,1001,1598,
-1,1002,1603,1,23,
-2341,19,514,1,23,
-2342,5,38,1,1901,
-2343,16,0,512,1,
-2075,2344,16,0,512,
-1,1860,831,1,1803,
-797,1,1804,2345,16,
-0,512,1,2413,2346,
-16,0,512,1,2198,
-2347,16,0,512,1,
-1873,845,1,1657,903,
-1,1989,925,1,1990,
-2348,16,0,512,1,
-1775,2349,16,0,512,
-1,32,2350,16,0,
-512,1,2105,824,1,
-2106,2351,16,0,512,
-1,2364,837,1,2227,
-917,1,2337,2352,16,
-0,512,1,2021,728,
-1,2458,885,1,2459,
-891,1,2462,898,1,
-2136,852,1,2464,908,
-1,2029,735,1,2030,
-741,1,2031,746,1,
-2032,751,1,2033,756,
-1,2035,762,1,2037,
-767,1,2039,772,1,
-1931,870,1,2041,778,
-1,2043,784,1,2045,
-789,1,1574,809,1,
-1958,2353,16,0,512,
-1,24,2354,19,186,
-1,24,2355,5,5,
-1,44,2356,16,0,
-184,1,377,2357,16,
-0,550,1,40,2358,
-16,0,684,1,63,
-2359,16,0,206,1,
-373,2360,16,0,546,
-1,25,2361,19,300,
-1,25,2362,5,177,
-1,2676,2363,16,0,
-298,1,256,2364,16,
-0,555,1,1261,2365,
-16,0,555,1,1011,
-1112,1,1012,2366,16,
-0,298,1,2458,885,
-1,262,1129,1,1267,
-2367,16,0,298,1,
-2021,728,1,1521,2368,
-16,0,298,1,1775,
-2369,16,0,555,1,
-2029,735,1,2030,741,
-1,2031,746,1,2032,
-751,1,2033,756,1,
-277,2370,16,0,555,
-1,2035,762,1,2037,
-767,1,2039,772,1,
-32,2371,16,0,555,
-1,2464,908,1,2293,
-2372,16,0,555,1,
-2043,784,1,2045,789,
-1,2299,2373,16,0,
-298,1,41,2374,16,
-0,555,1,42,2375,
-16,0,298,1,40,
-1187,1,44,1193,1,
-43,2376,16,0,555,
-1,1804,2377,16,0,
-555,1,48,1200,1,
-49,1206,1,47,1194,
-1,51,1216,1,52,
-2378,16,0,555,1,
-50,1211,1,305,1221,
-1,1096,1322,1,1515,
-2379,16,0,555,1,
-2318,2380,16,0,555,
-1,62,2381,16,0,
-555,1,63,1232,1,
-66,1238,1,67,1243,
-1,68,1248,1,69,
-1253,1,70,1258,1,
-71,2382,16,0,555,
-1,283,1182,1,73,
-2383,16,0,298,1,
-74,1263,1,1013,1268,
-1,76,2384,16,0,
-555,1,1834,2385,16,
-0,555,1,2337,2386,
-16,0,555,1,79,
-2387,16,0,555,1,
-1335,2388,16,0,555,
-1,299,2389,16,0,
-555,1,82,2390,16,
-0,298,1,1840,2391,
-16,0,298,1,1297,
-2392,16,0,555,1,
-85,2393,16,0,555,
-1,1341,2394,16,0,
-298,1,89,2395,16,
-0,555,1,1303,2396,
-16,0,298,1,509,
-2397,16,0,555,1,
-93,1328,1,322,2398,
-16,0,555,1,97,
-2399,16,0,555,1,
-2041,778,1,1555,2400,
-16,0,298,1,827,
-2401,16,0,298,1,
-102,2402,16,0,555,
-1,1860,831,1,1803,
-797,1,2364,837,1,
-107,2403,16,0,298,
-1,1114,1353,1,112,
-2404,16,0,555,1,
-1117,2405,16,0,555,
-1,352,1359,1,1873,
-845,1,118,1365,1,
-1123,2406,16,0,298,
-1,371,1375,1,515,
-2407,16,0,298,1,
-1377,2408,16,0,298,
-1,124,2409,16,0,
-555,1,1882,2410,16,
-0,298,1,377,1391,
-1,379,1396,1,380,
-1401,1,130,1424,1,
-346,2411,16,0,555,
-1,2075,2412,16,0,
-555,1,373,1419,1,
-387,2413,16,0,298,
-1,137,2414,16,0,
-555,1,143,2415,16,
-0,298,1,1901,2416,
-16,0,555,1,1048,
-1354,1,1153,2417,16,
-0,555,1,375,1386,
-1,151,2418,16,0,
-555,1,1407,2419,16,
-0,555,1,1659,2420,
-16,0,555,1,2413,
-2421,16,0,555,1,
-1159,2422,16,0,298,
-1,381,2423,16,0,
-555,1,157,2424,16,
-0,298,1,1413,2425,
-16,0,298,1,883,
-2426,16,0,298,1,
-1371,2427,16,0,555,
-1,328,1312,1,2105,
-824,1,2106,2428,16,
-0,555,1,166,2429,
-16,0,555,1,525,
-2430,16,0,555,1,
-1622,2431,16,0,555,
-1,406,2432,16,0,
-555,1,1574,809,1,
-172,1470,1,1931,870,
-1,412,2433,16,0,
-298,1,1933,2434,16,
-0,555,1,1876,2435,
-16,0,555,1,431,
-2436,16,0,555,1,
-1585,2437,16,0,555,
-1,182,2438,16,0,
-555,1,1628,2439,16,
-0,298,1,1189,2440,
-16,0,555,1,437,
-2441,16,0,298,1,
-1591,2442,16,0,298,
-1,188,1519,1,1695,
-2443,16,0,555,1,
-2198,2444,16,0,555,
-1,1195,2445,16,0,
-298,1,1449,2446,16,
-0,298,1,1701,2447,
-16,0,298,1,447,
-2448,16,0,555,1,
-199,2449,16,0,555,
-1,2459,891,1,1958,
-2450,16,0,555,1,
-2462,898,1,1657,903,
-1,205,2451,16,0,
-298,1,459,2452,16,
-0,555,1,462,2453,
-16,0,555,1,1665,
-2454,16,0,298,1,
-217,2455,16,0,555,
-1,2227,917,1,942,
-1491,1,1225,2456,16,
-0,555,1,223,2457,
-16,0,298,1,1479,
-2458,16,0,555,1,
-1731,2459,16,0,555,
-1,477,1555,1,1231,
-2460,16,0,298,1,
-479,1565,1,480,1570,
-1,1485,2461,16,0,
-298,1,1737,2462,16,
-0,298,1,1989,925,
-1,1990,2463,16,0,
-555,1,1443,2464,16,
-0,555,1,236,2465,
-16,0,555,1,2136,
-852,1,476,1549,1,
-242,2466,16,0,298,
-1,478,1588,1,1939,
-2467,16,0,298,1,
-2670,2468,16,0,555,
-1,1001,1598,1,1002,
-1603,1,1756,2469,16,
-0,555,1,26,2470,
-19,317,1,26,2471,
-5,84,1,1011,1112,
-1,1012,2472,16,0,
-315,1,1013,1268,1,
-262,1129,1,1267,2473,
-16,0,315,1,515,
-2474,16,0,672,1,
-1521,2475,16,0,315,
-1,525,1226,1,283,
-1182,1,2299,2476,16,
-0,315,1,42,2477,
-16,0,315,1,40,
-1187,1,44,1193,1,
-47,1194,1,1303,2478,
-16,0,315,1,1555,
-2479,16,0,315,1,
-50,1211,1,48,1200,
-1,49,1206,1,51,
-1216,1,63,1232,1,
-305,1221,1,66,1238,
-1,67,1243,1,68,
-1248,1,69,1253,1,
-70,1258,1,73,2480,
-16,0,315,1,74,
-1263,1,328,1312,1,
-1048,1354,1,82,2481,
-16,0,315,1,1840,
-2482,16,0,315,1,
-1591,2483,16,0,315,
-1,1341,2484,16,0,
-315,1,1096,1322,1,
-93,1328,1,352,1359,
-1,107,2485,16,0,
-315,1,1114,1353,1,
-118,1365,1,1123,2486,
-16,0,315,1,371,
-1375,1,1628,2487,16,
-0,315,1,375,1386,
-1,1882,2488,16,0,
-315,1,377,1391,1,
-379,1396,1,380,1401,
-1,883,2489,16,0,
-315,1,373,1419,1,
-130,1424,1,143,2490,
-16,0,315,1,387,
-2491,16,0,315,1,
-1159,2492,16,0,315,
-1,157,2493,16,0,
-315,1,1413,2494,16,
-0,315,1,1665,2495,
-16,0,315,1,412,
-2496,16,0,315,1,
-2676,2497,16,0,315,
-1,1377,2498,16,0,
-315,1,172,1470,1,
-1939,2499,16,0,315,
-1,437,2500,16,0,
-605,1,188,1519,1,
-942,1491,1,1195,2501,
-16,0,315,1,1449,
-2502,16,0,315,1,
-1701,2503,16,0,315,
-1,447,1512,1,205,
-2504,16,0,315,1,
-827,2505,16,0,315,
-1,223,2506,16,0,
-315,1,476,1549,1,
-477,1555,1,1231,2507,
-16,0,315,1,479,
-1565,1,480,1570,1,
-1485,2508,16,0,315,
-1,1737,2509,16,0,
-315,1,242,2510,16,
-0,315,1,478,1588,
-1,1001,1598,1,1002,
-1603,1,27,2511,19,
-614,1,27,2512,5,
-95,1,256,2513,16,
-0,612,1,1261,2514,
-16,0,612,1,509,
-2515,16,0,612,1,
-1515,2516,16,0,612,
-1,2021,728,1,1775,
-2517,16,0,612,1,
-2029,735,1,2030,741,
-1,2031,746,1,2032,
-751,1,2033,756,1,
-277,2518,16,0,612,
-1,2035,762,1,2037,
-767,1,2039,772,1,
-32,2519,16,0,612,
-1,2041,778,1,2293,
-2520,16,0,612,1,
-2043,784,1,2045,789,
-1,41,2521,16,0,
-612,1,1297,2522,16,
-0,612,1,43,2523,
-16,0,612,1,1803,
-797,1,1804,2524,16,
-0,612,1,299,2525,
-16,0,612,1,52,
-2526,16,0,612,1,
-2318,2527,16,0,612,
-1,62,2528,16,0,
-612,1,2075,2529,16,
-0,612,1,1574,809,
-1,71,2530,16,0,
-612,1,76,2531,16,
-0,612,1,1834,2532,
-16,0,612,1,2337,
-2533,16,0,612,1,
-79,2534,16,0,612,
-1,1335,2535,16,0,
-612,1,322,2536,16,
-0,612,1,85,2537,
-16,0,612,1,89,
-2538,16,0,612,1,
-346,2539,16,0,612,
-1,2105,824,1,2106,
-2540,16,0,612,1,
-97,2541,16,0,612,
-1,1860,831,1,2364,
-837,1,102,2542,16,
-0,612,1,112,2543,
-16,0,612,1,1117,
-2544,16,0,612,1,
-1873,845,1,1876,2545,
-16,0,612,1,124,
-2546,16,0,612,1,
-2136,852,1,381,2547,
-16,0,612,1,525,
-2548,16,0,612,1,
-137,2549,16,0,612,
-1,1901,2550,16,0,
-612,1,1153,2551,16,
-0,612,1,151,2552,
-16,0,612,1,1407,
-2553,16,0,612,1,
-1659,2554,16,0,612,
-1,2413,2555,16,0,
-612,1,406,2556,16,
-0,612,1,1371,2557,
-16,0,612,1,166,
-2558,16,0,612,1,
-1622,2559,16,0,612,
-1,1931,870,1,1933,
-2560,16,0,612,1,
-431,2561,16,0,612,
-1,1585,2562,16,0,
-612,1,182,2563,16,
-0,612,1,1189,2564,
-16,0,612,1,1443,
-2565,16,0,612,1,
-1695,2566,16,0,612,
-1,2198,2567,16,0,
-612,1,447,2568,16,
-0,612,1,2458,885,
-1,2459,891,1,1958,
-2569,16,0,612,1,
-2462,898,1,1657,903,
-1,2464,908,1,199,
-2570,16,0,612,1,
-459,2571,16,0,612,
-1,462,2572,16,0,
-612,1,217,2573,16,
-0,612,1,2227,917,
-1,1225,2574,16,0,
-612,1,1479,2575,16,
-0,612,1,1731,2576,
-16,0,612,1,1989,
-925,1,1990,2577,16,
-0,612,1,236,2578,
-16,0,612,1,2670,
-2579,16,0,612,1,
-1756,2580,16,0,612,
-1,28,2581,19,642,
-1,28,2582,5,60,
-1,328,1312,1,223,
-1539,1,1096,1322,1,
-118,1365,1,883,1407,
-1,525,1226,1,1001,
-1598,1,130,1424,1,
-459,1712,1,1114,1353,
-1,352,1359,1,447,
-1512,1,464,1707,1,
-1011,1112,1,1013,1268,
-1,242,1583,1,143,
-1429,1,40,1187,1,
-41,1681,1,42,1685,
-1,479,1565,1,44,
-1193,1,481,1714,1,
-373,1419,1,47,1194,
-1,157,1452,1,49,
-1206,1,50,1211,1,
-48,1200,1,379,1396,
-1,380,1401,1,51,
-1216,1,476,1549,1,
-371,1375,1,478,1588,
-1,1048,1354,1,375,
-1386,1,172,1470,1,
-262,1129,1,283,1182,
-1,63,1232,1,67,
-1243,1,68,1248,1,
-69,1253,1,66,1238,
-1,461,2583,16,0,
-640,1,74,1263,1,
-377,1391,1,1002,1603,
-1,70,1258,1,188,
-1519,1,82,1290,1,
-305,1221,1,477,1555,
-1,827,1341,1,93,
-1328,1,480,1570,1,
-205,1524,1,942,1491,
-1,107,1348,1,29,
-2584,19,289,1,29,
-2585,5,84,1,1011,
-1112,1,1012,2586,16,
-0,287,1,1013,1268,
+1,1002,1603,1,21,
+2243,19,440,1,21,
+2244,5,84,1,1011,
+1112,1,1012,2245,16,
+0,438,1,1013,1268,
 1,262,1129,1,1267,
-2587,16,0,287,1,
-515,2588,16,0,287,
-1,1521,2589,16,0,
-287,1,525,1226,1,
-283,1182,1,2299,2590,
-16,0,287,1,42,
-2591,16,0,287,1,
+2246,16,0,438,1,
+515,2247,16,0,438,
+1,1521,2248,16,0,
+438,1,525,1226,1,
+283,1182,1,2299,2249,
+16,0,438,1,42,
+2250,16,0,438,1,
 40,1187,1,44,1193,
 1,47,1194,1,1303,
-2592,16,0,287,1,
-1555,2593,16,0,287,
+2251,16,0,438,1,
+1555,2252,16,0,438,
 1,50,1211,1,48,
 1200,1,49,1206,1,
 51,1216,1,63,1232,
@@ -7371,224 +6797,372 @@ public yyLSLSyntax
 1238,1,67,1243,1,
 68,1248,1,69,1253,
 1,70,1258,1,73,
-2594,16,0,287,1,
-74,1263,1,328,1312,
-1,1048,1354,1,82,
-2595,16,0,287,1,
-1840,2596,16,0,287,
-1,1591,2597,16,0,
-287,1,1341,2598,16,
-0,287,1,1096,1322,
-1,93,1328,1,352,
-1359,1,107,2599,16,
-0,287,1,1114,1353,
-1,118,1365,1,1123,
-2600,16,0,287,1,
-371,1375,1,1628,2601,
-16,0,287,1,375,
-1386,1,1882,2602,16,
-0,287,1,377,1391,
-1,379,1396,1,380,
-1401,1,883,2603,16,
-0,287,1,373,1419,
-1,130,1424,1,143,
-1429,1,387,2604,16,
-0,287,1,1159,2605,
-16,0,287,1,157,
-1452,1,1413,2606,16,
-0,287,1,1665,2607,
-16,0,287,1,412,
-2608,16,0,287,1,
-2676,2609,16,0,287,
-1,1377,2610,16,0,
-287,1,172,1470,1,
-1939,2611,16,0,287,
-1,437,2612,16,0,
-287,1,188,1519,1,
-942,1491,1,1195,2613,
-16,0,287,1,1449,
-2614,16,0,287,1,
-1701,2615,16,0,287,
+2253,16,0,438,1,
+74,1263,1,328,2254,
+16,0,438,1,1048,
+2255,16,0,438,1,
+82,2256,16,0,438,
+1,1840,2257,16,0,
+438,1,1591,2258,16,
+0,438,1,1341,2259,
+16,0,438,1,1096,
+1322,1,93,1328,1,
+352,2260,16,0,438,
+1,107,2261,16,0,
+438,1,1114,1353,1,
+118,2262,16,0,438,
+1,1123,2263,16,0,
+438,1,371,1375,1,
+1628,2264,16,0,438,
+1,375,1386,1,1882,
+2265,16,0,438,1,
+377,1391,1,379,1396,
+1,380,1401,1,883,
+2266,16,0,438,1,
+373,1419,1,130,2267,
+16,0,438,1,143,
+2268,16,0,438,1,
+387,2269,16,0,438,
+1,1159,2270,16,0,
+438,1,157,2271,16,
+0,438,1,1413,2272,
+16,0,438,1,1665,
+2273,16,0,438,1,
+412,2274,16,0,438,
+1,2676,2275,16,0,
+438,1,1377,2276,16,
+0,438,1,172,2277,
+16,0,438,1,1939,
+2278,16,0,438,1,
+437,2279,16,0,438,
+1,188,2280,16,0,
+438,1,942,2281,16,
+0,438,1,1195,2282,
+16,0,438,1,1449,
+2283,16,0,438,1,
+1701,2284,16,0,438,
 1,447,1512,1,205,
-2616,16,0,287,1,
-827,2617,16,0,287,
-1,223,2618,16,0,
-287,1,476,1549,1,
-477,1555,1,1231,2619,
-16,0,287,1,479,
+2285,16,0,438,1,
+827,2286,16,0,438,
+1,223,2287,16,0,
+438,1,476,1549,1,
+477,1555,1,1231,2288,
+16,0,438,1,479,
 1565,1,480,1570,1,
-1485,2620,16,0,287,
-1,1737,2621,16,0,
-287,1,242,2622,16,
-0,287,1,478,1588,
+1485,2289,16,0,438,
+1,1737,2290,16,0,
+438,1,242,2291,16,
+0,438,1,478,1588,
 1,1001,1598,1,1002,
-1603,1,30,2623,19,
-277,1,30,2624,5,
+1603,1,22,2292,19,
+391,1,22,2293,5,
 84,1,1011,1112,1,
-1012,2625,16,0,275,
+1012,2294,16,0,389,
 1,1013,1268,1,262,
-1129,1,1267,2626,16,
-0,275,1,515,2627,
-16,0,275,1,1521,
-2628,16,0,275,1,
+1129,1,1267,2295,16,
+0,389,1,515,2296,
+16,0,389,1,1521,
+2297,16,0,389,1,
 525,1226,1,283,1182,
-1,2299,2629,16,0,
-275,1,42,2630,16,
-0,275,1,40,1187,
+1,2299,2298,16,0,
+389,1,42,2299,16,
+0,389,1,40,1187,
 1,44,1193,1,47,
-1194,1,1303,2631,16,
-0,275,1,1555,2632,
-16,0,275,1,50,
+1194,1,1303,2300,16,
+0,389,1,1555,2301,
+16,0,389,1,50,
 1211,1,48,1200,1,
 49,1206,1,51,1216,
 1,63,1232,1,305,
 1221,1,66,1238,1,
 67,1243,1,68,1248,
 1,69,1253,1,70,
-1258,1,73,2633,16,
-0,275,1,74,1263,
-1,328,1312,1,1048,
-1354,1,82,2634,16,
-0,275,1,1840,2635,
-16,0,275,1,1591,
-2636,16,0,275,1,
-1341,2637,16,0,275,
-1,1096,1322,1,93,
-1328,1,352,1359,1,
-107,2638,16,0,275,
-1,1114,1353,1,118,
-1365,1,1123,2639,16,
-0,275,1,371,1375,
-1,1628,2640,16,0,
-275,1,375,1386,1,
-1882,2641,16,0,275,
-1,377,1391,1,379,
-1396,1,380,1401,1,
-883,2642,16,0,275,
-1,373,1419,1,130,
-1424,1,143,1429,1,
-387,2643,16,0,275,
-1,1159,2644,16,0,
-275,1,157,1452,1,
-1413,2645,16,0,275,
-1,1665,2646,16,0,
-275,1,412,2647,16,
-0,275,1,2676,2648,
-16,0,275,1,1377,
-2649,16,0,275,1,
-172,1470,1,1939,2650,
-16,0,275,1,437,
-2651,16,0,275,1,
-188,1519,1,942,1491,
-1,1195,2652,16,0,
-275,1,1449,2653,16,
-0,275,1,1701,2654,
-16,0,275,1,447,
-1512,1,205,2655,16,
-0,275,1,827,2656,
-16,0,275,1,223,
-2657,16,0,275,1,
+1258,1,73,2302,16,
+0,389,1,74,1263,
+1,328,2303,16,0,
+389,1,1048,2304,16,
+0,389,1,82,2305,
+16,0,389,1,1840,
+2306,16,0,389,1,
+1591,2307,16,0,389,
+1,1341,2308,16,0,
+389,1,1096,1322,1,
+93,1328,1,352,2309,
+16,0,389,1,107,
+2310,16,0,389,1,
+1114,1353,1,118,2311,
+16,0,389,1,1123,
+2312,16,0,389,1,
+371,1375,1,1628,2313,
+16,0,389,1,375,
+1386,1,1882,2314,16,
+0,389,1,377,1391,
+1,379,1396,1,380,
+1401,1,883,2315,16,
+0,389,1,373,1419,
+1,130,2316,16,0,
+389,1,143,2317,16,
+0,389,1,387,2318,
+16,0,389,1,1159,
+2319,16,0,389,1,
+157,2320,16,0,389,
+1,1413,2321,16,0,
+389,1,1665,2322,16,
+0,389,1,412,2323,
+16,0,389,1,2676,
+2324,16,0,389,1,
+1377,2325,16,0,389,
+1,172,2326,16,0,
+389,1,1939,2327,16,
+0,389,1,437,2328,
+16,0,389,1,188,
+2329,16,0,389,1,
+942,2330,16,0,389,
+1,1195,2331,16,0,
+389,1,1449,2332,16,
+0,389,1,1701,2333,
+16,0,389,1,447,
+1512,1,205,2334,16,
+0,389,1,827,2335,
+16,0,389,1,223,
+2336,16,0,389,1,
 476,1549,1,477,1555,
-1,1231,2658,16,0,
-275,1,479,1565,1,
-480,1570,1,1485,2659,
-16,0,275,1,1737,
-2660,16,0,275,1,
-242,2661,16,0,275,
+1,1231,2337,16,0,
+389,1,479,1565,1,
+480,1570,1,1485,2338,
+16,0,389,1,1737,
+2339,16,0,389,1,
+242,2340,16,0,389,
 1,478,1588,1,1001,
 1598,1,1002,1603,1,
-31,2662,19,266,1,
-31,2663,5,84,1,
-1011,1112,1,1012,2664,
-16,0,264,1,1013,
-1268,1,262,1129,1,
-1267,2665,16,0,264,
-1,515,2666,16,0,
-264,1,1521,2667,16,
-0,264,1,525,1226,
-1,283,1182,1,2299,
-2668,16,0,264,1,
-42,2669,16,0,264,
-1,40,1187,1,44,
-1193,1,47,1194,1,
-1303,2670,16,0,264,
-1,1555,2671,16,0,
-264,1,50,1211,1,
-48,1200,1,49,1206,
-1,51,1216,1,63,
-1232,1,305,1221,1,
-66,1238,1,67,1243,
-1,68,1248,1,69,
-1253,1,70,1258,1,
-73,2672,16,0,264,
-1,74,1263,1,328,
-1312,1,1048,1354,1,
-82,2673,16,0,264,
-1,1840,2674,16,0,
-264,1,1591,2675,16,
-0,264,1,1341,2676,
-16,0,264,1,1096,
-1322,1,93,1328,1,
-352,1359,1,107,2677,
-16,0,264,1,1114,
-1353,1,118,1365,1,
-1123,2678,16,0,264,
-1,371,1375,1,1628,
-2679,16,0,264,1,
-375,1386,1,1882,2680,
-16,0,264,1,377,
+23,2341,19,514,1,
+23,2342,5,38,1,
+1901,2343,16,0,512,
+1,2075,2344,16,0,
+512,1,1860,831,1,
+1803,797,1,1804,2345,
+16,0,512,1,2413,
+2346,16,0,512,1,
+2198,2347,16,0,512,
+1,1873,845,1,1657,
+903,1,1989,925,1,
+1990,2348,16,0,512,
+1,1775,2349,16,0,
+512,1,32,2350,16,
+0,512,1,2105,824,
+1,2106,2351,16,0,
+512,1,2364,837,1,
+2227,917,1,2337,2352,
+16,0,512,1,2021,
+728,1,2458,885,1,
+2459,891,1,2462,898,
+1,2136,852,1,2464,
+908,1,2029,735,1,
+2030,741,1,2031,746,
+1,2032,751,1,2033,
+756,1,2035,762,1,
+2037,767,1,2039,772,
+1,1931,870,1,2041,
+778,1,2043,784,1,
+2045,789,1,1574,809,
+1,1958,2353,16,0,
+512,1,24,2354,19,
+186,1,24,2355,5,
+5,1,44,2356,16,
+0,184,1,377,2357,
+16,0,550,1,40,
+2358,16,0,684,1,
+63,2359,16,0,206,
+1,373,2360,16,0,
+546,1,25,2361,19,
+300,1,25,2362,5,
+177,1,2676,2363,16,
+0,298,1,256,2364,
+16,0,555,1,1261,
+2365,16,0,555,1,
+1011,1112,1,1012,2366,
+16,0,298,1,2458,
+885,1,262,1129,1,
+1267,2367,16,0,298,
+1,2021,728,1,1521,
+2368,16,0,298,1,
+1775,2369,16,0,555,
+1,2029,735,1,2030,
+741,1,2031,746,1,
+2032,751,1,2033,756,
+1,277,2370,16,0,
+555,1,2035,762,1,
+2037,767,1,2039,772,
+1,32,2371,16,0,
+555,1,2464,908,1,
+2293,2372,16,0,555,
+1,2043,784,1,2045,
+789,1,2299,2373,16,
+0,298,1,41,2374,
+16,0,555,1,42,
+2375,16,0,298,1,
+40,1187,1,44,1193,
+1,43,2376,16,0,
+555,1,1804,2377,16,
+0,555,1,48,1200,
+1,49,1206,1,47,
+1194,1,51,1216,1,
+52,2378,16,0,555,
+1,50,1211,1,305,
+1221,1,1096,1322,1,
+1515,2379,16,0,555,
+1,2318,2380,16,0,
+555,1,62,2381,16,
+0,555,1,63,1232,
+1,66,1238,1,67,
+1243,1,68,1248,1,
+69,1253,1,70,1258,
+1,71,2382,16,0,
+555,1,283,1182,1,
+73,2383,16,0,298,
+1,74,1263,1,1013,
+1268,1,76,2384,16,
+0,555,1,1834,2385,
+16,0,555,1,2337,
+2386,16,0,555,1,
+79,2387,16,0,555,
+1,1335,2388,16,0,
+555,1,299,2389,16,
+0,555,1,82,2390,
+16,0,298,1,1840,
+2391,16,0,298,1,
+1297,2392,16,0,555,
+1,85,2393,16,0,
+555,1,1341,2394,16,
+0,298,1,89,2395,
+16,0,555,1,1303,
+2396,16,0,298,1,
+509,2397,16,0,555,
+1,93,1328,1,322,
+2398,16,0,555,1,
+97,2399,16,0,555,
+1,2041,778,1,1555,
+2400,16,0,298,1,
+827,2401,16,0,298,
+1,102,2402,16,0,
+555,1,1860,831,1,
+1803,797,1,2364,837,
+1,107,2403,16,0,
+298,1,1114,1353,1,
+112,2404,16,0,555,
+1,1117,2405,16,0,
+555,1,352,1359,1,
+1873,845,1,118,1365,
+1,1123,2406,16,0,
+298,1,371,1375,1,
+515,2407,16,0,298,
+1,1377,2408,16,0,
+298,1,124,2409,16,
+0,555,1,1882,2410,
+16,0,298,1,377,
 1391,1,379,1396,1,
-380,1401,1,883,2681,
-16,0,264,1,373,
-1419,1,130,1424,1,
-143,2682,16,0,264,
-1,387,2683,16,0,
-264,1,1159,2684,16,
-0,264,1,157,2685,
-16,0,264,1,1413,
-2686,16,0,264,1,
-1665,2687,16,0,264,
-1,412,2688,16,0,
-264,1,2676,2689,16,
-0,264,1,1377,2690,
-16,0,264,1,172,
-1470,1,1939,2691,16,
-0,264,1,437,2692,
-16,0,264,1,188,
-1519,1,942,1491,1,
-1195,2693,16,0,264,
-1,1449,2694,16,0,
-264,1,1701,2695,16,
-0,264,1,447,1512,
-1,205,2696,16,0,
-264,1,827,2697,16,
-0,264,1,223,2698,
-16,0,264,1,476,
-1549,1,477,1555,1,
-1231,2699,16,0,264,
+380,1401,1,130,1424,
+1,346,2411,16,0,
+555,1,2075,2412,16,
+0,555,1,373,1419,
+1,387,2413,16,0,
+298,1,137,2414,16,
+0,555,1,143,2415,
+16,0,298,1,1901,
+2416,16,0,555,1,
+1048,1354,1,1153,2417,
+16,0,555,1,375,
+1386,1,151,2418,16,
+0,555,1,1407,2419,
+16,0,555,1,1659,
+2420,16,0,555,1,
+2413,2421,16,0,555,
+1,1159,2422,16,0,
+298,1,381,2423,16,
+0,555,1,157,2424,
+16,0,298,1,1413,
+2425,16,0,298,1,
+883,2426,16,0,298,
+1,1371,2427,16,0,
+555,1,328,1312,1,
+2105,824,1,2106,2428,
+16,0,555,1,166,
+2429,16,0,555,1,
+525,2430,16,0,555,
+1,1622,2431,16,0,
+555,1,406,2432,16,
+0,555,1,1574,809,
+1,172,1470,1,1931,
+870,1,412,2433,16,
+0,298,1,1933,2434,
+16,0,555,1,1876,
+2435,16,0,555,1,
+431,2436,16,0,555,
+1,1585,2437,16,0,
+555,1,182,2438,16,
+0,555,1,1628,2439,
+16,0,298,1,1189,
+2440,16,0,555,1,
+437,2441,16,0,298,
+1,1591,2442,16,0,
+298,1,188,1519,1,
+1695,2443,16,0,555,
+1,2198,2444,16,0,
+555,1,1195,2445,16,
+0,298,1,1449,2446,
+16,0,298,1,1701,
+2447,16,0,298,1,
+447,2448,16,0,555,
+1,199,2449,16,0,
+555,1,2459,891,1,
+1958,2450,16,0,555,
+1,2462,898,1,1657,
+903,1,205,2451,16,
+0,298,1,459,2452,
+16,0,555,1,462,
+2453,16,0,555,1,
+1665,2454,16,0,298,
+1,217,2455,16,0,
+555,1,2227,917,1,
+942,1491,1,1225,2456,
+16,0,555,1,223,
+2457,16,0,298,1,
+1479,2458,16,0,555,
+1,1731,2459,16,0,
+555,1,477,1555,1,
+1231,2460,16,0,298,
 1,479,1565,1,480,
-1570,1,1485,2700,16,
-0,264,1,1737,2701,
-16,0,264,1,242,
-2702,16,0,264,1,
-478,1588,1,1001,1598,
-1,1002,1603,1,32,
-2703,19,256,1,32,
-2704,5,84,1,1011,
-1112,1,1012,2705,16,
-0,254,1,1013,1268,
+1570,1,1485,2461,16,
+0,298,1,1737,2462,
+16,0,298,1,1989,
+925,1,1990,2463,16,
+0,555,1,1443,2464,
+16,0,555,1,236,
+2465,16,0,555,1,
+2136,852,1,476,1549,
+1,242,2466,16,0,
+298,1,478,1588,1,
+1939,2467,16,0,298,
+1,2670,2468,16,0,
+555,1,1001,1598,1,
+1002,1603,1,1756,2469,
+16,0,555,1,26,
+2470,19,317,1,26,
+2471,5,84,1,1011,
+1112,1,1012,2472,16,
+0,315,1,1013,1268,
 1,262,1129,1,1267,
-2706,16,0,254,1,
-515,2707,16,0,254,
-1,1521,2708,16,0,
-254,1,525,1226,1,
-283,1182,1,2299,2709,
-16,0,254,1,42,
-2710,16,0,254,1,
+2473,16,0,315,1,
+515,2474,16,0,672,
+1,1521,2475,16,0,
+315,1,525,1226,1,
+283,1182,1,2299,2476,
+16,0,315,1,42,
+2477,16,0,315,1,
 40,1187,1,44,1193,
 1,47,1194,1,1303,
-2711,16,0,254,1,
-1555,2712,16,0,254,
+2478,16,0,315,1,
+1555,2479,16,0,315,
 1,50,1211,1,48,
 1200,1,49,1206,1,
 51,1216,1,63,1232,
@@ -7596,934 +7170,1461 @@ public yyLSLSyntax
 1238,1,67,1243,1,
 68,1248,1,69,1253,
 1,70,1258,1,73,
-2713,16,0,254,1,
+2480,16,0,315,1,
 74,1263,1,328,1312,
 1,1048,1354,1,82,
-2714,16,0,254,1,
-1840,2715,16,0,254,
-1,1591,2716,16,0,
-254,1,1341,2717,16,
-0,254,1,1096,1322,
+2481,16,0,315,1,
+1840,2482,16,0,315,
+1,1591,2483,16,0,
+315,1,1341,2484,16,
+0,315,1,1096,1322,
 1,93,1328,1,352,
-1359,1,107,2718,16,
-0,254,1,1114,1353,
+1359,1,107,2485,16,
+0,315,1,1114,1353,
 1,118,1365,1,1123,
-2719,16,0,254,1,
-371,1375,1,1628,2720,
-16,0,254,1,375,
-1386,1,1882,2721,16,
-0,254,1,377,1391,
+2486,16,0,315,1,
+371,1375,1,1628,2487,
+16,0,315,1,375,
+1386,1,1882,2488,16,
+0,315,1,377,1391,
 1,379,1396,1,380,
-1401,1,883,2722,16,
-0,254,1,373,1419,
+1401,1,883,2489,16,
+0,315,1,373,1419,
 1,130,1424,1,143,
-2723,16,0,254,1,
-387,2724,16,0,254,
-1,1159,2725,16,0,
-254,1,157,2726,16,
-0,254,1,1413,2727,
-16,0,254,1,1665,
-2728,16,0,254,1,
-412,2729,16,0,254,
-1,2676,2730,16,0,
-254,1,1377,2731,16,
-0,254,1,172,1470,
-1,1939,2732,16,0,
-254,1,437,2733,16,
-0,254,1,188,1519,
+2490,16,0,315,1,
+387,2491,16,0,315,
+1,1159,2492,16,0,
+315,1,157,2493,16,
+0,315,1,1413,2494,
+16,0,315,1,1665,
+2495,16,0,315,1,
+412,2496,16,0,315,
+1,2676,2497,16,0,
+315,1,1377,2498,16,
+0,315,1,172,1470,
+1,1939,2499,16,0,
+315,1,437,2500,16,
+0,605,1,188,1519,
+1,942,1491,1,1195,
+2501,16,0,315,1,
+1449,2502,16,0,315,
+1,1701,2503,16,0,
+315,1,447,1512,1,
+205,2504,16,0,315,
+1,827,2505,16,0,
+315,1,223,2506,16,
+0,315,1,476,1549,
+1,477,1555,1,1231,
+2507,16,0,315,1,
+479,1565,1,480,1570,
+1,1485,2508,16,0,
+315,1,1737,2509,16,
+0,315,1,242,2510,
+16,0,315,1,478,
+1588,1,1001,1598,1,
+1002,1603,1,27,2511,
+19,614,1,27,2512,
+5,95,1,256,2513,
+16,0,612,1,1261,
+2514,16,0,612,1,
+509,2515,16,0,612,
+1,1515,2516,16,0,
+612,1,2021,728,1,
+1775,2517,16,0,612,
+1,2029,735,1,2030,
+741,1,2031,746,1,
+2032,751,1,2033,756,
+1,277,2518,16,0,
+612,1,2035,762,1,
+2037,767,1,2039,772,
+1,32,2519,16,0,
+612,1,2041,778,1,
+2293,2520,16,0,612,
+1,2043,784,1,2045,
+789,1,41,2521,16,
+0,612,1,1297,2522,
+16,0,612,1,43,
+2523,16,0,612,1,
+1803,797,1,1804,2524,
+16,0,612,1,299,
+2525,16,0,612,1,
+52,2526,16,0,612,
+1,2318,2527,16,0,
+612,1,62,2528,16,
+0,612,1,2075,2529,
+16,0,612,1,1574,
+809,1,71,2530,16,
+0,612,1,76,2531,
+16,0,612,1,1834,
+2532,16,0,612,1,
+2337,2533,16,0,612,
+1,79,2534,16,0,
+612,1,1335,2535,16,
+0,612,1,322,2536,
+16,0,612,1,85,
+2537,16,0,612,1,
+89,2538,16,0,612,
+1,346,2539,16,0,
+612,1,2105,824,1,
+2106,2540,16,0,612,
+1,97,2541,16,0,
+612,1,1860,831,1,
+2364,837,1,102,2542,
+16,0,612,1,112,
+2543,16,0,612,1,
+1117,2544,16,0,612,
+1,1873,845,1,1876,
+2545,16,0,612,1,
+124,2546,16,0,612,
+1,2136,852,1,381,
+2547,16,0,612,1,
+525,2548,16,0,612,
+1,137,2549,16,0,
+612,1,1901,2550,16,
+0,612,1,1153,2551,
+16,0,612,1,151,
+2552,16,0,612,1,
+1407,2553,16,0,612,
+1,1659,2554,16,0,
+612,1,2413,2555,16,
+0,612,1,406,2556,
+16,0,612,1,1371,
+2557,16,0,612,1,
+166,2558,16,0,612,
+1,1622,2559,16,0,
+612,1,1931,870,1,
+1933,2560,16,0,612,
+1,431,2561,16,0,
+612,1,1585,2562,16,
+0,612,1,182,2563,
+16,0,612,1,1189,
+2564,16,0,612,1,
+1443,2565,16,0,612,
+1,1695,2566,16,0,
+612,1,2198,2567,16,
+0,612,1,447,2568,
+16,0,612,1,2458,
+885,1,2459,891,1,
+1958,2569,16,0,612,
+1,2462,898,1,1657,
+903,1,2464,908,1,
+199,2570,16,0,612,
+1,459,2571,16,0,
+612,1,462,2572,16,
+0,612,1,217,2573,
+16,0,612,1,2227,
+917,1,1225,2574,16,
+0,612,1,1479,2575,
+16,0,612,1,1731,
+2576,16,0,612,1,
+1989,925,1,1990,2577,
+16,0,612,1,236,
+2578,16,0,612,1,
+2670,2579,16,0,612,
+1,1756,2580,16,0,
+612,1,28,2581,19,
+642,1,28,2582,5,
+60,1,328,1312,1,
+223,1539,1,1096,1322,
+1,118,1365,1,883,
+1407,1,525,1226,1,
+1001,1598,1,130,1424,
+1,459,1712,1,1114,
+1353,1,352,1359,1,
+447,1512,1,464,1707,
+1,1011,1112,1,1013,
+1268,1,242,1583,1,
+143,1429,1,40,1187,
+1,41,1681,1,42,
+1685,1,479,1565,1,
+44,1193,1,481,1714,
+1,373,1419,1,47,
+1194,1,157,1452,1,
+49,1206,1,50,1211,
+1,48,1200,1,379,
+1396,1,380,1401,1,
+51,1216,1,476,1549,
+1,371,1375,1,478,
+1588,1,1048,1354,1,
+375,1386,1,172,1470,
+1,262,1129,1,283,
+1182,1,63,1232,1,
+67,1243,1,68,1248,
+1,69,1253,1,66,
+1238,1,461,2583,16,
+0,640,1,74,1263,
+1,377,1391,1,1002,
+1603,1,70,1258,1,
+188,1519,1,82,1290,
+1,305,1221,1,477,
+1555,1,827,1341,1,
+93,1328,1,480,1570,
+1,205,1524,1,942,
+1491,1,107,1348,1,
+29,2584,19,289,1,
+29,2585,5,84,1,
+1011,1112,1,1012,2586,
+16,0,287,1,1013,
+1268,1,262,1129,1,
+1267,2587,16,0,287,
+1,515,2588,16,0,
+287,1,1521,2589,16,
+0,287,1,525,1226,
+1,283,1182,1,2299,
+2590,16,0,287,1,
+42,2591,16,0,287,
+1,40,1187,1,44,
+1193,1,47,1194,1,
+1303,2592,16,0,287,
+1,1555,2593,16,0,
+287,1,50,1211,1,
+48,1200,1,49,1206,
+1,51,1216,1,63,
+1232,1,305,1221,1,
+66,1238,1,67,1243,
+1,68,1248,1,69,
+1253,1,70,1258,1,
+73,2594,16,0,287,
+1,74,1263,1,328,
+1312,1,1048,1354,1,
+82,2595,16,0,287,
+1,1840,2596,16,0,
+287,1,1591,2597,16,
+0,287,1,1341,2598,
+16,0,287,1,1096,
+1322,1,93,1328,1,
+352,1359,1,107,2599,
+16,0,287,1,1114,
+1353,1,118,1365,1,
+1123,2600,16,0,287,
+1,371,1375,1,1628,
+2601,16,0,287,1,
+375,1386,1,1882,2602,
+16,0,287,1,377,
+1391,1,379,1396,1,
+380,1401,1,883,2603,
+16,0,287,1,373,
+1419,1,130,1424,1,
+143,1429,1,387,2604,
+16,0,287,1,1159,
+2605,16,0,287,1,
+157,1452,1,1413,2606,
+16,0,287,1,1665,
+2607,16,0,287,1,
+412,2608,16,0,287,
+1,2676,2609,16,0,
+287,1,1377,2610,16,
+0,287,1,172,1470,
+1,1939,2611,16,0,
+287,1,437,2612,16,
+0,287,1,188,1519,
 1,942,1491,1,1195,
-2734,16,0,254,1,
-1449,2735,16,0,254,
-1,1701,2736,16,0,
-254,1,447,1512,1,
-205,2737,16,0,254,
-1,827,2738,16,0,
-254,1,223,2739,16,
-0,254,1,476,1549,
+2613,16,0,287,1,
+1449,2614,16,0,287,
+1,1701,2615,16,0,
+287,1,447,1512,1,
+205,2616,16,0,287,
+1,827,2617,16,0,
+287,1,223,2618,16,
+0,287,1,476,1549,
 1,477,1555,1,1231,
-2740,16,0,254,1,
+2619,16,0,287,1,
 479,1565,1,480,1570,
-1,1485,2741,16,0,
-254,1,1737,2742,16,
-0,254,1,242,2743,
-16,0,254,1,478,
+1,1485,2620,16,0,
+287,1,1737,2621,16,
+0,287,1,242,2622,
+16,0,287,1,478,
 1588,1,1001,1598,1,
-1002,1603,1,33,2744,
-19,340,1,33,2745,
+1002,1603,1,30,2623,
+19,277,1,30,2624,
 5,84,1,1011,1112,
-1,1012,2746,16,0,
-338,1,1013,1268,1,
-262,1129,1,1267,2747,
-16,0,338,1,515,
-2748,16,0,338,1,
-1521,2749,16,0,338,
+1,1012,2625,16,0,
+275,1,1013,1268,1,
+262,1129,1,1267,2626,
+16,0,275,1,515,
+2627,16,0,275,1,
+1521,2628,16,0,275,
 1,525,1226,1,283,
-1182,1,2299,2750,16,
-0,338,1,42,2751,
-16,0,338,1,40,
+1182,1,2299,2629,16,
+0,275,1,42,2630,
+16,0,275,1,40,
 1187,1,44,1193,1,
-47,1194,1,1303,2752,
-16,0,338,1,1555,
-2753,16,0,338,1,
+47,1194,1,1303,2631,
+16,0,275,1,1555,
+2632,16,0,275,1,
 50,1211,1,48,1200,
 1,49,1206,1,51,
 1216,1,63,1232,1,
 305,1221,1,66,1238,
 1,67,1243,1,68,
 1248,1,69,1253,1,
-70,1258,1,73,2754,
-16,0,338,1,74,
+70,1258,1,73,2633,
+16,0,275,1,74,
 1263,1,328,1312,1,
-1048,1354,1,82,2755,
-16,0,338,1,1840,
-2756,16,0,338,1,
-1591,2757,16,0,338,
-1,1341,2758,16,0,
-338,1,1096,1322,1,
+1048,1354,1,82,2634,
+16,0,275,1,1840,
+2635,16,0,275,1,
+1591,2636,16,0,275,
+1,1341,2637,16,0,
+275,1,1096,1322,1,
 93,1328,1,352,1359,
-1,107,2759,16,0,
-338,1,1114,1353,1,
-118,1365,1,1123,2760,
-16,0,338,1,371,
-1375,1,1628,2761,16,
-0,338,1,375,1386,
-1,1882,2762,16,0,
-338,1,377,1391,1,
+1,107,2638,16,0,
+275,1,1114,1353,1,
+118,1365,1,1123,2639,
+16,0,275,1,371,
+1375,1,1628,2640,16,
+0,275,1,375,1386,
+1,1882,2641,16,0,
+275,1,377,1391,1,
 379,1396,1,380,1401,
-1,883,2763,16,0,
-338,1,373,1419,1,
+1,883,2642,16,0,
+275,1,373,1419,1,
 130,1424,1,143,1429,
-1,387,2764,16,0,
-338,1,1159,2765,16,
-0,338,1,157,1452,
-1,1413,2766,16,0,
-338,1,1665,2767,16,
-0,338,1,412,2768,
-16,0,338,1,2676,
-2769,16,0,338,1,
-1377,2770,16,0,338,
+1,387,2643,16,0,
+275,1,1159,2644,16,
+0,275,1,157,1452,
+1,1413,2645,16,0,
+275,1,1665,2646,16,
+0,275,1,412,2647,
+16,0,275,1,2676,
+2648,16,0,275,1,
+1377,2649,16,0,275,
 1,172,1470,1,1939,
-2771,16,0,338,1,
-437,2772,16,0,338,
+2650,16,0,275,1,
+437,2651,16,0,275,
 1,188,1519,1,942,
-1491,1,1195,2773,16,
-0,338,1,1449,2774,
-16,0,338,1,1701,
-2775,16,0,338,1,
-447,1512,1,205,2776,
-16,0,338,1,827,
-2777,16,0,338,1,
-223,2778,16,0,338,
+1491,1,1195,2652,16,
+0,275,1,1449,2653,
+16,0,275,1,1701,
+2654,16,0,275,1,
+447,1512,1,205,2655,
+16,0,275,1,827,
+2656,16,0,275,1,
+223,2657,16,0,275,
 1,476,1549,1,477,
-1555,1,1231,2779,16,
-0,338,1,479,1565,
+1555,1,1231,2658,16,
+0,275,1,479,1565,
 1,480,1570,1,1485,
-2780,16,0,338,1,
-1737,2781,16,0,338,
-1,242,1583,1,478,
-1588,1,1001,1598,1,
-1002,1603,1,34,2782,
-19,330,1,34,2783,
-5,84,1,1011,1112,
-1,1012,2784,16,0,
-328,1,1013,1268,1,
-262,1129,1,1267,2785,
-16,0,328,1,515,
-2786,16,0,328,1,
-1521,2787,16,0,328,
-1,525,1226,1,283,
-1182,1,2299,2788,16,
-0,328,1,42,2789,
-16,0,328,1,40,
-1187,1,44,1193,1,
-47,1194,1,1303,2790,
-16,0,328,1,1555,
-2791,16,0,328,1,
-50,1211,1,48,1200,
-1,49,1206,1,51,
-1216,1,63,1232,1,
-305,1221,1,66,1238,
-1,67,1243,1,68,
-1248,1,69,1253,1,
-70,1258,1,73,2792,
-16,0,328,1,74,
-1263,1,328,1312,1,
-1048,1354,1,82,2793,
-16,0,328,1,1840,
-2794,16,0,328,1,
-1591,2795,16,0,328,
-1,1341,2796,16,0,
-328,1,1096,1322,1,
-93,1328,1,352,1359,
-1,107,2797,16,0,
-328,1,1114,1353,1,
-118,1365,1,1123,2798,
-16,0,328,1,371,
-1375,1,1628,2799,16,
-0,328,1,375,1386,
-1,1882,2800,16,0,
-328,1,377,1391,1,
-379,1396,1,380,1401,
-1,883,2801,16,0,
-328,1,373,1419,1,
-130,1424,1,143,1429,
-1,387,2802,16,0,
-328,1,1159,2803,16,
-0,328,1,157,1452,
-1,1413,2804,16,0,
-328,1,1665,2805,16,
-0,328,1,412,2806,
-16,0,328,1,2676,
-2807,16,0,328,1,
-1377,2808,16,0,328,
-1,172,1470,1,1939,
-2809,16,0,328,1,
-437,2810,16,0,328,
-1,188,1519,1,942,
-1491,1,1195,2811,16,
-0,328,1,1449,2812,
-16,0,328,1,1701,
-2813,16,0,328,1,
-447,1512,1,205,1524,
-1,827,2814,16,0,
-328,1,223,1539,1,
-476,1549,1,477,1555,
-1,1231,2815,16,0,
-328,1,479,1565,1,
-480,1570,1,1485,2816,
-16,0,328,1,1737,
-2817,16,0,328,1,
-242,1583,1,478,1588,
-1,1001,1598,1,1002,
-1603,1,35,2818,19,
-320,1,35,2819,5,
-84,1,1011,1112,1,
-1012,2820,16,0,318,
-1,1013,1268,1,262,
-1129,1,1267,2821,16,
-0,318,1,515,2822,
-16,0,318,1,1521,
-2823,16,0,318,1,
-525,1226,1,283,1182,
-1,2299,2824,16,0,
-318,1,42,2825,16,
-0,318,1,40,1187,
-1,44,1193,1,47,
-1194,1,1303,2826,16,
-0,318,1,1555,2827,
-16,0,318,1,50,
-1211,1,48,1200,1,
-49,1206,1,51,1216,
-1,63,1232,1,305,
-1221,1,66,1238,1,
-67,1243,1,68,1248,
-1,69,1253,1,70,
-1258,1,73,2828,16,
-0,318,1,74,1263,
-1,328,1312,1,1048,
-1354,1,82,2829,16,
-0,318,1,1840,2830,
-16,0,318,1,1591,
-2831,16,0,318,1,
-1341,2832,16,0,318,
-1,1096,1322,1,93,
-1328,1,352,1359,1,
-107,2833,16,0,318,
-1,1114,1353,1,118,
-1365,1,1123,2834,16,
-0,318,1,371,1375,
-1,1628,2835,16,0,
-318,1,375,1386,1,
-1882,2836,16,0,318,
-1,377,1391,1,379,
-1396,1,380,1401,1,
-883,2837,16,0,318,
-1,373,1419,1,130,
-1424,1,143,1429,1,
-387,2838,16,0,318,
-1,1159,2839,16,0,
-318,1,157,1452,1,
-1413,2840,16,0,318,
-1,1665,2841,16,0,
-318,1,412,2842,16,
-0,318,1,2676,2843,
-16,0,318,1,1377,
-2844,16,0,318,1,
-172,1470,1,1939,2845,
-16,0,318,1,437,
-2846,16,0,318,1,
+2659,16,0,275,1,
+1737,2660,16,0,275,
+1,242,2661,16,0,
+275,1,478,1588,1,
+1001,1598,1,1002,1603,
+1,31,2662,19,266,
+1,31,2663,5,84,
+1,1011,1112,1,1012,
+2664,16,0,264,1,
+1013,1268,1,262,1129,
+1,1267,2665,16,0,
+264,1,515,2666,16,
+0,264,1,1521,2667,
+16,0,264,1,525,
+1226,1,283,1182,1,
+2299,2668,16,0,264,
+1,42,2669,16,0,
+264,1,40,1187,1,
+44,1193,1,47,1194,
+1,1303,2670,16,0,
+264,1,1555,2671,16,
+0,264,1,50,1211,
+1,48,1200,1,49,
+1206,1,51,1216,1,
+63,1232,1,305,1221,
+1,66,1238,1,67,
+1243,1,68,1248,1,
+69,1253,1,70,1258,
+1,73,2672,16,0,
+264,1,74,1263,1,
+328,1312,1,1048,1354,
+1,82,2673,16,0,
+264,1,1840,2674,16,
+0,264,1,1591,2675,
+16,0,264,1,1341,
+2676,16,0,264,1,
+1096,1322,1,93,1328,
+1,352,1359,1,107,
+2677,16,0,264,1,
+1114,1353,1,118,1365,
+1,1123,2678,16,0,
+264,1,371,1375,1,
+1628,2679,16,0,264,
+1,375,1386,1,1882,
+2680,16,0,264,1,
+377,1391,1,379,1396,
+1,380,1401,1,883,
+2681,16,0,264,1,
+373,1419,1,130,1424,
+1,143,2682,16,0,
+264,1,387,2683,16,
+0,264,1,1159,2684,
+16,0,264,1,157,
+2685,16,0,264,1,
+1413,2686,16,0,264,
+1,1665,2687,16,0,
+264,1,412,2688,16,
+0,264,1,2676,2689,
+16,0,264,1,1377,
+2690,16,0,264,1,
+172,1470,1,1939,2691,
+16,0,264,1,437,
+2692,16,0,264,1,
 188,1519,1,942,1491,
-1,1195,2847,16,0,
-318,1,1449,2848,16,
-0,318,1,1701,2849,
-16,0,318,1,447,
-1512,1,205,1524,1,
-827,2850,16,0,318,
-1,223,2851,16,0,
-318,1,476,1549,1,
-477,1555,1,1231,2852,
-16,0,318,1,479,
-1565,1,480,1570,1,
-1485,2853,16,0,318,
-1,1737,2854,16,0,
-318,1,242,1583,1,
-478,1588,1,1001,1598,
-1,1002,1603,1,36,
-2855,19,226,1,36,
-2856,5,94,1,256,
-2857,16,0,224,1,
-1261,2858,16,0,224,
-1,509,2859,16,0,
-224,1,1515,2860,16,
-0,224,1,2021,728,
-1,1775,2861,16,0,
-224,1,2029,735,1,
-2030,741,1,2031,746,
-1,2032,751,1,2033,
-756,1,277,2862,16,
-0,224,1,2035,762,
-1,2037,767,1,2039,
-772,1,32,2863,16,
-0,224,1,2041,778,
-1,2293,2864,16,0,
-224,1,2043,784,1,
-2045,789,1,41,2865,
-16,0,224,1,1297,
-2866,16,0,224,1,
-43,2867,16,0,224,
-1,1803,797,1,1804,
-2868,16,0,224,1,
-299,2869,16,0,224,
-1,52,2870,16,0,
-224,1,2318,2871,16,
-0,224,1,2075,2872,
-16,0,224,1,1574,
-809,1,71,2873,16,
-0,224,1,76,2874,
-16,0,224,1,1834,
-2875,16,0,224,1,
-2337,2876,16,0,224,
-1,79,2877,16,0,
-224,1,1335,2878,16,
-0,224,1,322,2879,
-16,0,224,1,85,
-2880,16,0,224,1,
-89,2881,16,0,224,
-1,346,2882,16,0,
-224,1,2105,824,1,
-2106,2883,16,0,224,
-1,97,2884,16,0,
-224,1,1860,831,1,
-2364,837,1,102,2885,
-16,0,224,1,112,
-2886,16,0,224,1,
-1117,2887,16,0,224,
-1,1873,845,1,1876,
-2888,16,0,224,1,
-124,2889,16,0,224,
-1,2136,852,1,381,
-2890,16,0,224,1,
-525,2891,16,0,224,
-1,137,2892,16,0,
-224,1,1901,2893,16,
-0,224,1,1153,2894,
-16,0,224,1,151,
-2895,16,0,224,1,
-1407,2896,16,0,224,
-1,1659,2897,16,0,
-224,1,2413,2898,16,
-0,224,1,406,2899,
-16,0,224,1,2670,
-2900,16,0,224,1,
-1657,903,1,166,2901,
-16,0,224,1,1622,
-2902,16,0,224,1,
-1931,870,1,1933,2903,
-16,0,224,1,431,
-2904,16,0,224,1,
-1585,2905,16,0,224,
-1,182,2906,16,0,
-224,1,1189,2907,16,
-0,224,1,1443,2908,
-16,0,224,1,1695,
-2909,16,0,224,1,
-2198,2910,16,0,224,
-1,447,2911,16,0,
-224,1,2458,885,1,
-2459,891,1,1958,2912,
-16,0,224,1,2462,
-898,1,1371,2913,16,
-0,224,1,2464,908,
-1,199,2914,16,0,
-224,1,459,2915,16,
-0,224,1,462,2916,
-16,0,224,1,217,
-2917,16,0,224,1,
-2227,917,1,1225,2918,
-16,0,224,1,1479,
-2919,16,0,224,1,
-1731,2920,16,0,224,
-1,1989,925,1,1990,
-2921,16,0,224,1,
-236,2922,16,0,224,
-1,1756,2923,16,0,
-224,1,37,2924,19,
-246,1,37,2925,5,
-94,1,256,2926,16,
-0,244,1,1261,2927,
-16,0,244,1,509,
-2928,16,0,244,1,
-1515,2929,16,0,244,
-1,2021,728,1,1775,
-2930,16,0,244,1,
-2029,735,1,2030,741,
-1,2031,746,1,2032,
-751,1,2033,756,1,
-277,2931,16,0,244,
-1,2035,762,1,2037,
-767,1,2039,772,1,
-32,2932,16,0,244,
-1,2041,778,1,2293,
-2933,16,0,244,1,
-2043,784,1,2045,789,
-1,41,2934,16,0,
-244,1,1297,2935,16,
-0,244,1,43,2936,
-16,0,244,1,1803,
-797,1,1804,2937,16,
-0,244,1,299,2938,
-16,0,244,1,52,
-2939,16,0,244,1,
-2318,2940,16,0,244,
-1,2075,2941,16,0,
-244,1,1574,809,1,
-71,2942,16,0,244,
-1,76,2943,16,0,
-244,1,1834,2944,16,
-0,244,1,2337,2945,
-16,0,244,1,79,
-2946,16,0,244,1,
-1335,2947,16,0,244,
-1,322,2948,16,0,
-244,1,85,2949,16,
-0,244,1,89,2950,
-16,0,244,1,346,
-2951,16,0,244,1,
-2105,824,1,2106,2952,
-16,0,244,1,97,
-2953,16,0,244,1,
-1860,831,1,2364,837,
-1,102,2954,16,0,
-244,1,112,2955,16,
-0,244,1,1117,2956,
-16,0,244,1,1873,
-845,1,1876,2957,16,
-0,244,1,124,2958,
-16,0,244,1,2136,
-852,1,381,2959,16,
-0,244,1,525,2960,
-16,0,244,1,137,
-2961,16,0,244,1,
-1901,2962,16,0,244,
-1,1153,2963,16,0,
-244,1,151,2964,16,
-0,244,1,1407,2965,
-16,0,244,1,1659,
-2966,16,0,244,1,
-2413,2967,16,0,244,
-1,406,2968,16,0,
-244,1,2670,2969,16,
-0,244,1,1657,903,
-1,166,2970,16,0,
-244,1,1622,2971,16,
-0,244,1,1931,870,
-1,1933,2972,16,0,
-244,1,431,2973,16,
-0,244,1,1585,2974,
-16,0,244,1,182,
-2975,16,0,244,1,
-1189,2976,16,0,244,
-1,1443,2977,16,0,
-244,1,1695,2978,16,
-0,244,1,2198,2979,
-16,0,244,1,447,
-2980,16,0,244,1,
-2458,885,1,2459,891,
-1,1958,2981,16,0,
-244,1,2462,898,1,
-1371,2982,16,0,244,
-1,2464,908,1,199,
-2983,16,0,244,1,
-459,2984,16,0,244,
-1,462,2985,16,0,
-244,1,217,2986,16,
-0,244,1,2227,917,
-1,1225,2987,16,0,
-244,1,1479,2988,16,
-0,244,1,1731,2989,
-16,0,244,1,1989,
-925,1,1990,2990,16,
-0,244,1,236,2991,
-16,0,244,1,1756,
-2992,16,0,244,1,
-38,2993,19,243,1,
-38,2994,5,84,1,
-1011,1112,1,1012,2995,
-16,0,241,1,1013,
+1,1195,2693,16,0,
+264,1,1449,2694,16,
+0,264,1,1701,2695,
+16,0,264,1,447,
+1512,1,205,2696,16,
+0,264,1,827,2697,
+16,0,264,1,223,
+2698,16,0,264,1,
+476,1549,1,477,1555,
+1,1231,2699,16,0,
+264,1,479,1565,1,
+480,1570,1,1485,2700,
+16,0,264,1,1737,
+2701,16,0,264,1,
+242,2702,16,0,264,
+1,478,1588,1,1001,
+1598,1,1002,1603,1,
+32,2703,19,256,1,
+32,2704,5,84,1,
+1011,1112,1,1012,2705,
+16,0,254,1,1013,
 1268,1,262,1129,1,
-1267,2996,16,0,241,
-1,515,2997,16,0,
-241,1,1521,2998,16,
-0,241,1,525,1226,
+1267,2706,16,0,254,
+1,515,2707,16,0,
+254,1,1521,2708,16,
+0,254,1,525,1226,
 1,283,1182,1,2299,
-2999,16,0,241,1,
-42,3000,16,0,241,
+2709,16,0,254,1,
+42,2710,16,0,254,
 1,40,1187,1,44,
 1193,1,47,1194,1,
-1303,3001,16,0,241,
-1,1555,3002,16,0,
-241,1,50,1211,1,
+1303,2711,16,0,254,
+1,1555,2712,16,0,
+254,1,50,1211,1,
 48,1200,1,49,1206,
 1,51,1216,1,63,
 1232,1,305,1221,1,
 66,1238,1,67,1243,
 1,68,1248,1,69,
 1253,1,70,1258,1,
-73,3003,16,0,241,
+73,2713,16,0,254,
 1,74,1263,1,328,
 1312,1,1048,1354,1,
-82,3004,16,0,241,
-1,1840,3005,16,0,
-241,1,1591,3006,16,
-0,241,1,1341,3007,
-16,0,241,1,1096,
+82,2714,16,0,254,
+1,1840,2715,16,0,
+254,1,1591,2716,16,
+0,254,1,1341,2717,
+16,0,254,1,1096,
 1322,1,93,1328,1,
-352,1359,1,107,3008,
-16,0,241,1,1114,
+352,1359,1,107,2718,
+16,0,254,1,1114,
 1353,1,118,1365,1,
-1123,3009,16,0,241,
+1123,2719,16,0,254,
 1,371,1375,1,1628,
-3010,16,0,241,1,
-375,1386,1,1882,3011,
-16,0,241,1,377,
-1391,1,379,1396,1,
-380,1401,1,883,1407,
-1,373,1419,1,130,
-1424,1,143,1429,1,
-387,3012,16,0,241,
-1,1159,3013,16,0,
-241,1,157,1452,1,
-1413,3014,16,0,241,
-1,1665,3015,16,0,
-241,1,412,3016,16,
-0,241,1,2676,3017,
-16,0,241,1,1377,
-3018,16,0,241,1,
-172,1470,1,1939,3019,
-16,0,241,1,437,
-3020,16,0,241,1,
-188,1519,1,942,1491,
-1,1195,3021,16,0,
-241,1,1449,3022,16,
-0,241,1,1701,3023,
-16,0,241,1,447,
-1512,1,205,1524,1,
-827,1341,1,223,1539,
+2720,16,0,254,1,
+375,1386,1,1882,2721,
+16,0,254,1,377,
+1391,1,379,1396,1,
+380,1401,1,883,2722,
+16,0,254,1,373,
+1419,1,130,1424,1,
+143,2723,16,0,254,
+1,387,2724,16,0,
+254,1,1159,2725,16,
+0,254,1,157,2726,
+16,0,254,1,1413,
+2727,16,0,254,1,
+1665,2728,16,0,254,
+1,412,2729,16,0,
+254,1,2676,2730,16,
+0,254,1,1377,2731,
+16,0,254,1,172,
+1470,1,1939,2732,16,
+0,254,1,437,2733,
+16,0,254,1,188,
+1519,1,942,1491,1,
+1195,2734,16,0,254,
+1,1449,2735,16,0,
+254,1,1701,2736,16,
+0,254,1,447,1512,
+1,205,2737,16,0,
+254,1,827,2738,16,
+0,254,1,223,2739,
+16,0,254,1,476,
+1549,1,477,1555,1,
+1231,2740,16,0,254,
+1,479,1565,1,480,
+1570,1,1485,2741,16,
+0,254,1,1737,2742,
+16,0,254,1,242,
+2743,16,0,254,1,
+478,1588,1,1001,1598,
+1,1002,1603,1,33,
+2744,19,340,1,33,
+2745,5,84,1,1011,
+1112,1,1012,2746,16,
+0,338,1,1013,1268,
+1,262,1129,1,1267,
+2747,16,0,338,1,
+515,2748,16,0,338,
+1,1521,2749,16,0,
+338,1,525,1226,1,
+283,1182,1,2299,2750,
+16,0,338,1,42,
+2751,16,0,338,1,
+40,1187,1,44,1193,
+1,47,1194,1,1303,
+2752,16,0,338,1,
+1555,2753,16,0,338,
+1,50,1211,1,48,
+1200,1,49,1206,1,
+51,1216,1,63,1232,
+1,305,1221,1,66,
+1238,1,67,1243,1,
+68,1248,1,69,1253,
+1,70,1258,1,73,
+2754,16,0,338,1,
+74,1263,1,328,1312,
+1,1048,1354,1,82,
+2755,16,0,338,1,
+1840,2756,16,0,338,
+1,1591,2757,16,0,
+338,1,1341,2758,16,
+0,338,1,1096,1322,
+1,93,1328,1,352,
+1359,1,107,2759,16,
+0,338,1,1114,1353,
+1,118,1365,1,1123,
+2760,16,0,338,1,
+371,1375,1,1628,2761,
+16,0,338,1,375,
+1386,1,1882,2762,16,
+0,338,1,377,1391,
+1,379,1396,1,380,
+1401,1,883,2763,16,
+0,338,1,373,1419,
+1,130,1424,1,143,
+1429,1,387,2764,16,
+0,338,1,1159,2765,
+16,0,338,1,157,
+1452,1,1413,2766,16,
+0,338,1,1665,2767,
+16,0,338,1,412,
+2768,16,0,338,1,
+2676,2769,16,0,338,
+1,1377,2770,16,0,
+338,1,172,1470,1,
+1939,2771,16,0,338,
+1,437,2772,16,0,
+338,1,188,1519,1,
+942,1491,1,1195,2773,
+16,0,338,1,1449,
+2774,16,0,338,1,
+1701,2775,16,0,338,
+1,447,1512,1,205,
+2776,16,0,338,1,
+827,2777,16,0,338,
+1,223,2778,16,0,
+338,1,476,1549,1,
+477,1555,1,1231,2779,
+16,0,338,1,479,
+1565,1,480,1570,1,
+1485,2780,16,0,338,
+1,1737,2781,16,0,
+338,1,242,1583,1,
+478,1588,1,1001,1598,
+1,1002,1603,1,34,
+2782,19,330,1,34,
+2783,5,84,1,1011,
+1112,1,1012,2784,16,
+0,328,1,1013,1268,
+1,262,1129,1,1267,
+2785,16,0,328,1,
+515,2786,16,0,328,
+1,1521,2787,16,0,
+328,1,525,1226,1,
+283,1182,1,2299,2788,
+16,0,328,1,42,
+2789,16,0,328,1,
+40,1187,1,44,1193,
+1,47,1194,1,1303,
+2790,16,0,328,1,
+1555,2791,16,0,328,
+1,50,1211,1,48,
+1200,1,49,1206,1,
+51,1216,1,63,1232,
+1,305,1221,1,66,
+1238,1,67,1243,1,
+68,1248,1,69,1253,
+1,70,1258,1,73,
+2792,16,0,328,1,
+74,1263,1,328,1312,
+1,1048,1354,1,82,
+2793,16,0,328,1,
+1840,2794,16,0,328,
+1,1591,2795,16,0,
+328,1,1341,2796,16,
+0,328,1,1096,1322,
+1,93,1328,1,352,
+1359,1,107,2797,16,
+0,328,1,1114,1353,
+1,118,1365,1,1123,
+2798,16,0,328,1,
+371,1375,1,1628,2799,
+16,0,328,1,375,
+1386,1,1882,2800,16,
+0,328,1,377,1391,
+1,379,1396,1,380,
+1401,1,883,2801,16,
+0,328,1,373,1419,
+1,130,1424,1,143,
+1429,1,387,2802,16,
+0,328,1,1159,2803,
+16,0,328,1,157,
+1452,1,1413,2804,16,
+0,328,1,1665,2805,
+16,0,328,1,412,
+2806,16,0,328,1,
+2676,2807,16,0,328,
+1,1377,2808,16,0,
+328,1,172,1470,1,
+1939,2809,16,0,328,
+1,437,2810,16,0,
+328,1,188,1519,1,
+942,1491,1,1195,2811,
+16,0,328,1,1449,
+2812,16,0,328,1,
+1701,2813,16,0,328,
+1,447,1512,1,205,
+1524,1,827,2814,16,
+0,328,1,223,1539,
 1,476,1549,1,477,
-1555,1,1231,3024,16,
-0,241,1,479,1565,
+1555,1,1231,2815,16,
+0,328,1,479,1565,
 1,480,1570,1,1485,
-3025,16,0,241,1,
-1737,3026,16,0,241,
+2816,16,0,328,1,
+1737,2817,16,0,328,
 1,242,1583,1,478,
 1588,1,1001,1598,1,
-1002,1603,1,39,3027,
-19,232,1,39,3028,
+1002,1603,1,35,2818,
+19,320,1,35,2819,
 5,84,1,1011,1112,
-1,1012,3029,16,0,
-230,1,1013,1268,1,
-262,1129,1,1267,3030,
-16,0,230,1,515,
-3031,16,0,230,1,
-1521,3032,16,0,230,
+1,1012,2820,16,0,
+318,1,1013,1268,1,
+262,1129,1,1267,2821,
+16,0,318,1,515,
+2822,16,0,318,1,
+1521,2823,16,0,318,
 1,525,1226,1,283,
-1182,1,2299,3033,16,
-0,230,1,42,3034,
-16,0,230,1,40,
+1182,1,2299,2824,16,
+0,318,1,42,2825,
+16,0,318,1,40,
 1187,1,44,1193,1,
-47,1194,1,1303,3035,
-16,0,230,1,1555,
-3036,16,0,230,1,
+47,1194,1,1303,2826,
+16,0,318,1,1555,
+2827,16,0,318,1,
 50,1211,1,48,1200,
 1,49,1206,1,51,
 1216,1,63,1232,1,
 305,1221,1,66,1238,
 1,67,1243,1,68,
 1248,1,69,1253,1,
-70,1258,1,73,3037,
-16,0,230,1,74,
+70,1258,1,73,2828,
+16,0,318,1,74,
 1263,1,328,1312,1,
-1048,1354,1,82,3038,
-16,0,230,1,1840,
-3039,16,0,230,1,
-1591,3040,16,0,230,
-1,1341,3041,16,0,
-230,1,1096,1322,1,
+1048,1354,1,82,2829,
+16,0,318,1,1840,
+2830,16,0,318,1,
+1591,2831,16,0,318,
+1,1341,2832,16,0,
+318,1,1096,1322,1,
 93,1328,1,352,1359,
-1,107,3042,16,0,
-230,1,1114,1353,1,
-118,1365,1,1123,3043,
-16,0,230,1,371,
-1375,1,1628,3044,16,
-0,230,1,375,1386,
-1,1882,3045,16,0,
-230,1,377,1391,1,
+1,107,2833,16,0,
+318,1,1114,1353,1,
+118,1365,1,1123,2834,
+16,0,318,1,371,
+1375,1,1628,2835,16,
+0,318,1,375,1386,
+1,1882,2836,16,0,
+318,1,377,1391,1,
 379,1396,1,380,1401,
-1,883,1407,1,373,
-1419,1,130,1424,1,
-143,1429,1,387,3046,
-16,0,230,1,1159,
-3047,16,0,230,1,
-157,1452,1,1413,3048,
-16,0,230,1,1665,
-3049,16,0,230,1,
-412,3050,16,0,230,
-1,2676,3051,16,0,
-230,1,1377,3052,16,
-0,230,1,172,1470,
-1,1939,3053,16,0,
-230,1,437,3054,16,
-0,230,1,188,1519,
-1,942,1491,1,1195,
-3055,16,0,230,1,
-1449,3056,16,0,230,
-1,1701,3057,16,0,
-230,1,447,1512,1,
-205,1524,1,827,1341,
-1,223,1539,1,476,
-1549,1,477,1555,1,
-1231,3058,16,0,230,
-1,479,1565,1,480,
-1570,1,1485,3059,16,
-0,230,1,1737,3060,
-16,0,230,1,242,
-1583,1,478,1588,1,
-1001,1598,1,1002,1603,
-1,40,3061,19,220,
-1,40,3062,5,84,
+1,883,2837,16,0,
+318,1,373,1419,1,
+130,1424,1,143,1429,
+1,387,2838,16,0,
+318,1,1159,2839,16,
+0,318,1,157,1452,
+1,1413,2840,16,0,
+318,1,1665,2841,16,
+0,318,1,412,2842,
+16,0,318,1,2676,
+2843,16,0,318,1,
+1377,2844,16,0,318,
+1,172,1470,1,1939,
+2845,16,0,318,1,
+437,2846,16,0,318,
+1,188,1519,1,942,
+1491,1,1195,2847,16,
+0,318,1,1449,2848,
+16,0,318,1,1701,
+2849,16,0,318,1,
+447,1512,1,205,1524,
+1,827,2850,16,0,
+318,1,223,2851,16,
+0,318,1,476,1549,
+1,477,1555,1,1231,
+2852,16,0,318,1,
+479,1565,1,480,1570,
+1,1485,2853,16,0,
+318,1,1737,2854,16,
+0,318,1,242,1583,
+1,478,1588,1,1001,
+1598,1,1002,1603,1,
+36,2855,19,226,1,
+36,2856,5,94,1,
+256,2857,16,0,224,
+1,1261,2858,16,0,
+224,1,509,2859,16,
+0,224,1,1515,2860,
+16,0,224,1,2021,
+728,1,1775,2861,16,
+0,224,1,2029,735,
+1,2030,741,1,2031,
+746,1,2032,751,1,
+2033,756,1,277,2862,
+16,0,224,1,2035,
+762,1,2037,767,1,
+2039,772,1,32,2863,
+16,0,224,1,2041,
+778,1,2293,2864,16,
+0,224,1,2043,784,
+1,2045,789,1,41,
+2865,16,0,224,1,
+1297,2866,16,0,224,
+1,43,2867,16,0,
+224,1,1803,797,1,
+1804,2868,16,0,224,
+1,299,2869,16,0,
+224,1,52,2870,16,
+0,224,1,2318,2871,
+16,0,224,1,2075,
+2872,16,0,224,1,
+1574,809,1,71,2873,
+16,0,224,1,76,
+2874,16,0,224,1,
+1834,2875,16,0,224,
+1,2337,2876,16,0,
+224,1,79,2877,16,
+0,224,1,1335,2878,
+16,0,224,1,322,
+2879,16,0,224,1,
+85,2880,16,0,224,
+1,89,2881,16,0,
+224,1,346,2882,16,
+0,224,1,2105,824,
+1,2106,2883,16,0,
+224,1,97,2884,16,
+0,224,1,1860,831,
+1,2364,837,1,102,
+2885,16,0,224,1,
+112,2886,16,0,224,
+1,1117,2887,16,0,
+224,1,1873,845,1,
+1876,2888,16,0,224,
+1,124,2889,16,0,
+224,1,2136,852,1,
+381,2890,16,0,224,
+1,525,2891,16,0,
+224,1,137,2892,16,
+0,224,1,1901,2893,
+16,0,224,1,1153,
+2894,16,0,224,1,
+151,2895,16,0,224,
+1,1407,2896,16,0,
+224,1,1659,2897,16,
+0,224,1,2413,2898,
+16,0,224,1,406,
+2899,16,0,224,1,
+2670,2900,16,0,224,
+1,1657,903,1,166,
+2901,16,0,224,1,
+1622,2902,16,0,224,
+1,1931,870,1,1933,
+2903,16,0,224,1,
+431,2904,16,0,224,
+1,1585,2905,16,0,
+224,1,182,2906,16,
+0,224,1,1189,2907,
+16,0,224,1,1443,
+2908,16,0,224,1,
+1695,2909,16,0,224,
+1,2198,2910,16,0,
+224,1,447,2911,16,
+0,224,1,2458,885,
+1,2459,891,1,1958,
+2912,16,0,224,1,
+2462,898,1,1371,2913,
+16,0,224,1,2464,
+908,1,199,2914,16,
+0,224,1,459,2915,
+16,0,224,1,462,
+2916,16,0,224,1,
+217,2917,16,0,224,
+1,2227,917,1,1225,
+2918,16,0,224,1,
+1479,2919,16,0,224,
+1,1731,2920,16,0,
+224,1,1989,925,1,
+1990,2921,16,0,224,
+1,236,2922,16,0,
+224,1,1756,2923,16,
+0,224,1,37,2924,
+19,246,1,37,2925,
+5,94,1,256,2926,
+16,0,244,1,1261,
+2927,16,0,244,1,
+509,2928,16,0,244,
+1,1515,2929,16,0,
+244,1,2021,728,1,
+1775,2930,16,0,244,
+1,2029,735,1,2030,
+741,1,2031,746,1,
+2032,751,1,2033,756,
+1,277,2931,16,0,
+244,1,2035,762,1,
+2037,767,1,2039,772,
+1,32,2932,16,0,
+244,1,2041,778,1,
+2293,2933,16,0,244,
+1,2043,784,1,2045,
+789,1,41,2934,16,
+0,244,1,1297,2935,
+16,0,244,1,43,
+2936,16,0,244,1,
+1803,797,1,1804,2937,
+16,0,244,1,299,
+2938,16,0,244,1,
+52,2939,16,0,244,
+1,2318,2940,16,0,
+244,1,2075,2941,16,
+0,244,1,1574,809,
+1,71,2942,16,0,
+244,1,76,2943,16,
+0,244,1,1834,2944,
+16,0,244,1,2337,
+2945,16,0,244,1,
+79,2946,16,0,244,
+1,1335,2947,16,0,
+244,1,322,2948,16,
+0,244,1,85,2949,
+16,0,244,1,89,
+2950,16,0,244,1,
+346,2951,16,0,244,
+1,2105,824,1,2106,
+2952,16,0,244,1,
+97,2953,16,0,244,
+1,1860,831,1,2364,
+837,1,102,2954,16,
+0,244,1,112,2955,
+16,0,244,1,1117,
+2956,16,0,244,1,
+1873,845,1,1876,2957,
+16,0,244,1,124,
+2958,16,0,244,1,
+2136,852,1,381,2959,
+16,0,244,1,525,
+2960,16,0,244,1,
+137,2961,16,0,244,
+1,1901,2962,16,0,
+244,1,1153,2963,16,
+0,244,1,151,2964,
+16,0,244,1,1407,
+2965,16,0,244,1,
+1659,2966,16,0,244,
+1,2413,2967,16,0,
+244,1,406,2968,16,
+0,244,1,2670,2969,
+16,0,244,1,1657,
+903,1,166,2970,16,
+0,244,1,1622,2971,
+16,0,244,1,1931,
+870,1,1933,2972,16,
+0,244,1,431,2973,
+16,0,244,1,1585,
+2974,16,0,244,1,
+182,2975,16,0,244,
+1,1189,2976,16,0,
+244,1,1443,2977,16,
+0,244,1,1695,2978,
+16,0,244,1,2198,
+2979,16,0,244,1,
+447,2980,16,0,244,
+1,2458,885,1,2459,
+891,1,1958,2981,16,
+0,244,1,2462,898,
+1,1371,2982,16,0,
+244,1,2464,908,1,
+199,2983,16,0,244,
+1,459,2984,16,0,
+244,1,462,2985,16,
+0,244,1,217,2986,
+16,0,244,1,2227,
+917,1,1225,2987,16,
+0,244,1,1479,2988,
+16,0,244,1,1731,
+2989,16,0,244,1,
+1989,925,1,1990,2990,
+16,0,244,1,236,
+2991,16,0,244,1,
+1756,2992,16,0,244,
+1,38,2993,19,243,
+1,38,2994,5,84,
 1,1011,1112,1,1012,
-3063,16,0,218,1,
+2995,16,0,241,1,
 1013,1268,1,262,1129,
-1,1267,3064,16,0,
-218,1,515,3065,16,
-0,218,1,1521,3066,
-16,0,218,1,525,
+1,1267,2996,16,0,
+241,1,515,2997,16,
+0,241,1,1521,2998,
+16,0,241,1,525,
 1226,1,283,1182,1,
-2299,3067,16,0,218,
-1,42,3068,16,0,
-218,1,40,1187,1,
+2299,2999,16,0,241,
+1,42,3000,16,0,
+241,1,40,1187,1,
 44,1193,1,47,1194,
-1,1303,3069,16,0,
-218,1,1555,3070,16,
-0,218,1,50,1211,
+1,1303,3001,16,0,
+241,1,1555,3002,16,
+0,241,1,50,1211,
 1,48,1200,1,49,
 1206,1,51,1216,1,
 63,1232,1,305,1221,
 1,66,1238,1,67,
 1243,1,68,1248,1,
 69,1253,1,70,1258,
-1,73,3071,16,0,
-218,1,74,1263,1,
+1,73,3003,16,0,
+241,1,74,1263,1,
 328,1312,1,1048,1354,
-1,82,3072,16,0,
-218,1,1840,3073,16,
-0,218,1,1591,3074,
-16,0,218,1,1341,
-3075,16,0,218,1,
+1,82,3004,16,0,
+241,1,1840,3005,16,
+0,241,1,1591,3006,
+16,0,241,1,1341,
+3007,16,0,241,1,
 1096,1322,1,93,1328,
 1,352,1359,1,107,
-3076,16,0,218,1,
-1114,1353,1,118,3077,
-16,0,218,1,1123,
-3078,16,0,218,1,
-371,1375,1,1628,3079,
-16,0,218,1,375,
-1386,1,1882,3080,16,
-0,218,1,377,1391,
-1,379,1396,1,380,
-1401,1,883,3081,16,
-0,218,1,373,1419,
-1,130,3082,16,0,
-218,1,143,3083,16,
-0,218,1,387,3084,
-16,0,218,1,1159,
-3085,16,0,218,1,
-157,3086,16,0,218,
-1,1413,3087,16,0,
-218,1,1665,3088,16,
-0,218,1,412,3089,
-16,0,218,1,2676,
-3090,16,0,218,1,
-1377,3091,16,0,218,
-1,172,3092,16,0,
-218,1,1939,3093,16,
-0,218,1,437,3094,
-16,0,218,1,188,
-3095,16,0,218,1,
-942,1491,1,1195,3096,
-16,0,218,1,1449,
-3097,16,0,218,1,
-1701,3098,16,0,218,
-1,447,1512,1,205,
-3099,16,0,218,1,
-827,3100,16,0,218,
-1,223,3101,16,0,
-218,1,476,1549,1,
-477,1555,1,1231,3102,
-16,0,218,1,479,
+3008,16,0,241,1,
+1114,1353,1,118,1365,
+1,1123,3009,16,0,
+241,1,371,1375,1,
+1628,3010,16,0,241,
+1,375,1386,1,1882,
+3011,16,0,241,1,
+377,1391,1,379,1396,
+1,380,1401,1,883,
+1407,1,373,1419,1,
+130,1424,1,143,1429,
+1,387,3012,16,0,
+241,1,1159,3013,16,
+0,241,1,157,1452,
+1,1413,3014,16,0,
+241,1,1665,3015,16,
+0,241,1,412,3016,
+16,0,241,1,2676,
+3017,16,0,241,1,
+1377,3018,16,0,241,
+1,172,1470,1,1939,
+3019,16,0,241,1,
+437,3020,16,0,241,
+1,188,1519,1,942,
+1491,1,1195,3021,16,
+0,241,1,1449,3022,
+16,0,241,1,1701,
+3023,16,0,241,1,
+447,1512,1,205,1524,
+1,827,1341,1,223,
+1539,1,476,1549,1,
+477,1555,1,1231,3024,
+16,0,241,1,479,
 1565,1,480,1570,1,
-1485,3103,16,0,218,
-1,1737,3104,16,0,
-218,1,242,3105,16,
-0,218,1,478,1588,
+1485,3025,16,0,241,
+1,1737,3026,16,0,
+241,1,242,1583,1,
+478,1588,1,1001,1598,
+1,1002,1603,1,39,
+3027,19,232,1,39,
+3028,5,84,1,1011,
+1112,1,1012,3029,16,
+0,230,1,1013,1268,
+1,262,1129,1,1267,
+3030,16,0,230,1,
+515,3031,16,0,230,
+1,1521,3032,16,0,
+230,1,525,1226,1,
+283,1182,1,2299,3033,
+16,0,230,1,42,
+3034,16,0,230,1,
+40,1187,1,44,1193,
+1,47,1194,1,1303,
+3035,16,0,230,1,
+1555,3036,16,0,230,
+1,50,1211,1,48,
+1200,1,49,1206,1,
+51,1216,1,63,1232,
+1,305,1221,1,66,
+1238,1,67,1243,1,
+68,1248,1,69,1253,
+1,70,1258,1,73,
+3037,16,0,230,1,
+74,1263,1,328,1312,
+1,1048,1354,1,82,
+3038,16,0,230,1,
+1840,3039,16,0,230,
+1,1591,3040,16,0,
+230,1,1341,3041,16,
+0,230,1,1096,1322,
+1,93,1328,1,352,
+1359,1,107,3042,16,
+0,230,1,1114,1353,
+1,118,1365,1,1123,
+3043,16,0,230,1,
+371,1375,1,1628,3044,
+16,0,230,1,375,
+1386,1,1882,3045,16,
+0,230,1,377,1391,
+1,379,1396,1,380,
+1401,1,883,1407,1,
+373,1419,1,130,1424,
+1,143,1429,1,387,
+3046,16,0,230,1,
+1159,3047,16,0,230,
+1,157,1452,1,1413,
+3048,16,0,230,1,
+1665,3049,16,0,230,
+1,412,3050,16,0,
+230,1,2676,3051,16,
+0,230,1,1377,3052,
+16,0,230,1,172,
+1470,1,1939,3053,16,
+0,230,1,437,3054,
+16,0,230,1,188,
+1519,1,942,1491,1,
+1195,3055,16,0,230,
+1,1449,3056,16,0,
+230,1,1701,3057,16,
+0,230,1,447,1512,
+1,205,1524,1,827,
+1341,1,223,1539,1,
+476,1549,1,477,1555,
+1,1231,3058,16,0,
+230,1,479,1565,1,
+480,1570,1,1485,3059,
+16,0,230,1,1737,
+3060,16,0,230,1,
+242,1583,1,478,1588,
 1,1001,1598,1,1002,
-1603,1,41,3106,19,
-181,1,41,3107,5,
+1603,1,40,3061,19,
+220,1,40,3062,5,
 84,1,1011,1112,1,
-1012,3108,16,0,179,
+1012,3063,16,0,218,
 1,1013,1268,1,262,
-1129,1,1267,3109,16,
-0,179,1,515,3110,
-16,0,179,1,1521,
-3111,16,0,179,1,
+1129,1,1267,3064,16,
+0,218,1,515,3065,
+16,0,218,1,1521,
+3066,16,0,218,1,
 525,1226,1,283,1182,
-1,2299,3112,16,0,
-179,1,42,3113,16,
-0,179,1,40,1187,
+1,2299,3067,16,0,
+218,1,42,3068,16,
+0,218,1,40,1187,
 1,44,1193,1,47,
-1194,1,1303,3114,16,
-0,179,1,1555,3115,
-16,0,179,1,50,
+1194,1,1303,3069,16,
+0,218,1,1555,3070,
+16,0,218,1,50,
 1211,1,48,1200,1,
 49,1206,1,51,1216,
 1,63,1232,1,305,
 1221,1,66,1238,1,
 67,1243,1,68,1248,
 1,69,1253,1,70,
-1258,1,73,3116,16,
-0,179,1,74,1263,
+1258,1,73,3071,16,
+0,218,1,74,1263,
 1,328,1312,1,1048,
-1354,1,82,3117,16,
-0,179,1,1840,3118,
-16,0,179,1,1591,
-3119,16,0,179,1,
-1341,3120,16,0,179,
+1354,1,82,3072,16,
+0,218,1,1840,3073,
+16,0,218,1,1591,
+3074,16,0,218,1,
+1341,3075,16,0,218,
 1,1096,1322,1,93,
 1328,1,352,1359,1,
-107,3121,16,0,179,
+107,3076,16,0,218,
 1,1114,1353,1,118,
-3122,16,0,179,1,
-1123,3123,16,0,179,
+3077,16,0,218,1,
+1123,3078,16,0,218,
 1,371,1375,1,1628,
-3124,16,0,179,1,
-375,1386,1,1882,3125,
-16,0,179,1,377,
+3079,16,0,218,1,
+375,1386,1,1882,3080,
+16,0,218,1,377,
 1391,1,379,1396,1,
-380,1401,1,883,3126,
-16,0,179,1,373,
-1419,1,130,3127,16,
-0,179,1,143,3128,
-16,0,179,1,387,
-3129,16,0,179,1,
-1159,3130,16,0,179,
-1,157,3131,16,0,
-179,1,1413,3132,16,
-0,179,1,1665,3133,
-16,0,179,1,412,
-3134,16,0,179,1,
-2676,3135,16,0,179,
-1,1377,3136,16,0,
-179,1,172,3137,16,
-0,179,1,1939,3138,
-16,0,179,1,437,
-3139,16,0,179,1,
-188,3140,16,0,179,
+380,1401,1,883,3081,
+16,0,218,1,373,
+1419,1,130,3082,16,
+0,218,1,143,3083,
+16,0,218,1,387,
+3084,16,0,218,1,
+1159,3085,16,0,218,
+1,157,3086,16,0,
+218,1,1413,3087,16,
+0,218,1,1665,3088,
+16,0,218,1,412,
+3089,16,0,218,1,
+2676,3090,16,0,218,
+1,1377,3091,16,0,
+218,1,172,3092,16,
+0,218,1,1939,3093,
+16,0,218,1,437,
+3094,16,0,218,1,
+188,3095,16,0,218,
 1,942,1491,1,1195,
-3141,16,0,179,1,
-1449,3142,16,0,179,
-1,1701,3143,16,0,
-179,1,447,1512,1,
-205,3144,16,0,179,
-1,827,3145,16,0,
-179,1,223,3146,16,
-0,179,1,476,1549,
+3096,16,0,218,1,
+1449,3097,16,0,218,
+1,1701,3098,16,0,
+218,1,447,1512,1,
+205,3099,16,0,218,
+1,827,3100,16,0,
+218,1,223,3101,16,
+0,218,1,476,1549,
 1,477,1555,1,1231,
-3147,16,0,179,1,
+3102,16,0,218,1,
 479,1565,1,480,1570,
-1,1485,3148,16,0,
-179,1,1737,3149,16,
-0,179,1,242,3150,
-16,0,179,1,478,
+1,1485,3103,16,0,
+218,1,1737,3104,16,
+0,218,1,242,3105,
+16,0,218,1,478,
 1588,1,1001,1598,1,
-1002,1603,1,42,3151,
-19,402,1,42,3152,
-5,38,1,1901,3153,
-16,0,400,1,2075,
-3154,16,0,400,1,
-1860,831,1,1803,797,
-1,1804,3155,16,0,
-400,1,2413,3156,16,
-0,400,1,2198,3157,
-16,0,400,1,1873,
-845,1,1657,903,1,
-1989,925,1,1990,3158,
-16,0,400,1,1775,
-3159,16,0,400,1,
-32,3160,16,0,400,
-1,2105,824,1,2106,
-3161,16,0,400,1,
-2364,837,1,2227,917,
-1,2337,3162,16,0,
-400,1,2021,728,1,
-2458,885,1,2459,891,
-1,2462,898,1,2136,
-852,1,2464,908,1,
-2029,735,1,2030,741,
-1,2031,746,1,2032,
-751,1,2033,756,1,
-2035,762,1,2037,767,
-1,2039,772,1,1931,
-870,1,2041,778,1,
-2043,784,1,2045,789,
-1,1574,809,1,1958,
-3163,16,0,400,1,
-43,3164,19,467,1,
-43,3165,5,25,1,
-2035,762,1,2037,767,
-1,2039,772,1,2041,
-778,1,2227,917,1,
-2043,784,1,1657,903,
-1,1860,831,1,2136,
-852,1,2021,728,1,
-2459,891,1,1574,809,
-1,2105,3166,16,0,
-593,1,1931,870,1,
-1873,845,1,2031,746,
-1,1803,797,1,1989,
-3167,16,0,465,1,
-2464,908,1,2029,735,
-1,2030,741,1,2364,
-837,1,2032,751,1,
-2033,756,1,2045,789,
-1,44,3168,19,273,
-1,44,3169,5,38,
-1,1901,3170,16,0,
-271,1,2075,3171,16,
-0,271,1,1860,831,
-1,1803,797,1,1804,
-3172,16,0,271,1,
-2413,3173,16,0,271,
-1,2198,3174,16,0,
-271,1,1873,845,1,
-1657,903,1,1989,925,
-1,1990,3175,16,0,
-271,1,1775,3176,16,
-0,271,1,32,3177,
-16,0,271,1,2105,
-824,1,2106,3178,16,
-0,271,1,2364,837,
-1,2227,917,1,2337,
-3179,16,0,271,1,
-2021,728,1,2458,885,
-1,2459,891,1,2462,
-898,1,2136,852,1,
-2464,908,1,2029,735,
-1,2030,741,1,2031,
-746,1,2032,751,1,
-2033,756,1,2035,762,
-1,2037,767,1,2039,
-772,1,1931,870,1,
-2041,778,1,2043,784,
-1,2045,789,1,1574,
-809,1,1958,3180,16,
-0,271,1,45,3181,
-19,296,1,45,3182,
-5,39,1,1901,3183,
-16,0,324,1,2075,
-3184,16,0,324,1,
-1860,831,1,1803,797,
-1,1804,3185,16,0,
-324,1,2413,3186,16,
-0,324,1,2198,3187,
-16,0,324,1,1873,
-845,1,1657,903,1,
-1989,925,1,1990,3188,
-16,0,324,1,1775,
-3189,16,0,324,1,
-32,3190,16,0,324,
-1,2105,824,1,2106,
-3191,16,0,324,1,
-2364,837,1,2227,917,
-1,2337,3192,16,0,
-324,1,2021,728,1,
-2458,885,1,2459,891,
-1,2462,898,1,2136,
-852,1,2464,908,1,
-2029,735,1,2030,741,
-1,2031,746,1,2032,
-751,1,2033,756,1,
-2035,762,1,2037,767,
-1,2039,772,1,1931,
-870,1,2041,778,1,
-2043,784,1,2045,789,
-1,1832,3193,16,0,
-294,1,1574,809,1,
-1958,3194,16,0,324,
-1,46,3195,19,681,
-1,46,3196,5,38,
-1,1901,3197,16,0,
-679,1,2075,3198,16,
-0,679,1,1860,831,
-1,1803,797,1,1804,
-3199,16,0,679,1,
-2413,3200,16,0,679,
-1,2198,3201,16,0,
-679,1,1873,845,1,
-1657,903,1,1989,925,
-1,1990,3202,16,0,
-679,1,1775,3203,16,
-0,679,1,32,3204,
-16,0,679,1,2105,
-824,1,2106,3205,16,
-0,679,1,2364,837,
-1,2227,917,1,2337,
-3206,16,0,679,1,
-2021,728,1,2458,885,
-1,2459,891,1,2462,
-898,1,2136,852,1,
-2464,908,1,2029,735,
-1,2030,741,1,2031,
-746,1,2032,751,1,
-2033,756,1,2035,762,
-1,2037,767,1,2039,
-772,1,1931,870,1,
-2041,778,1,2043,784,
-1,2045,789,1,1574,
-809,1,1958,3207,16,
-0,679,1,47,3208,
-19,574,1,47,3209,
-5,19,1,0,3210,
-16,0,656,1,2725,
-3211,17,3212,15,3213,
-4,36,37,0,71,
+1002,1603,1,41,3106,
+19,181,1,41,3107,
+5,84,1,1011,1112,
+1,1012,3108,16,0,
+179,1,1013,1268,1,
+262,1129,1,1267,3109,
+16,0,179,1,515,
+3110,16,0,179,1,
+1521,3111,16,0,179,
+1,525,1226,1,283,
+1182,1,2299,3112,16,
+0,179,1,42,3113,
+16,0,179,1,40,
+1187,1,44,1193,1,
+47,1194,1,1303,3114,
+16,0,179,1,1555,
+3115,16,0,179,1,
+50,1211,1,48,1200,
+1,49,1206,1,51,
+1216,1,63,1232,1,
+305,1221,1,66,1238,
+1,67,1243,1,68,
+1248,1,69,1253,1,
+70,1258,1,73,3116,
+16,0,179,1,74,
+1263,1,328,1312,1,
+1048,1354,1,82,3117,
+16,0,179,1,1840,
+3118,16,0,179,1,
+1591,3119,16,0,179,
+1,1341,3120,16,0,
+179,1,1096,1322,1,
+93,1328,1,352,1359,
+1,107,3121,16,0,
+179,1,1114,1353,1,
+118,3122,16,0,179,
+1,1123,3123,16,0,
+179,1,371,1375,1,
+1628,3124,16,0,179,
+1,375,1386,1,1882,
+3125,16,0,179,1,
+377,1391,1,379,1396,
+1,380,1401,1,883,
+3126,16,0,179,1,
+373,1419,1,130,3127,
+16,0,179,1,143,
+3128,16,0,179,1,
+387,3129,16,0,179,
+1,1159,3130,16,0,
+179,1,157,3131,16,
+0,179,1,1413,3132,
+16,0,179,1,1665,
+3133,16,0,179,1,
+412,3134,16,0,179,
+1,2676,3135,16,0,
+179,1,1377,3136,16,
+0,179,1,172,3137,
+16,0,179,1,1939,
+3138,16,0,179,1,
+437,3139,16,0,179,
+1,188,3140,16,0,
+179,1,942,1491,1,
+1195,3141,16,0,179,
+1,1449,3142,16,0,
+179,1,1701,3143,16,
+0,179,1,447,1512,
+1,205,3144,16,0,
+179,1,827,3145,16,
+0,179,1,223,3146,
+16,0,179,1,476,
+1549,1,477,1555,1,
+1231,3147,16,0,179,
+1,479,1565,1,480,
+1570,1,1485,3148,16,
+0,179,1,1737,3149,
+16,0,179,1,242,
+3150,16,0,179,1,
+478,1588,1,1001,1598,
+1,1002,1603,1,42,
+3151,19,402,1,42,
+3152,5,38,1,1901,
+3153,16,0,400,1,
+2075,3154,16,0,400,
+1,1860,831,1,1803,
+797,1,1804,3155,16,
+0,400,1,2413,3156,
+16,0,400,1,2198,
+3157,16,0,400,1,
+1873,845,1,1657,903,
+1,1989,925,1,1990,
+3158,16,0,400,1,
+1775,3159,16,0,400,
+1,32,3160,16,0,
+400,1,2105,824,1,
+2106,3161,16,0,400,
+1,2364,837,1,2227,
+917,1,2337,3162,16,
+0,400,1,2021,728,
+1,2458,885,1,2459,
+891,1,2462,898,1,
+2136,852,1,2464,908,
+1,2029,735,1,2030,
+741,1,2031,746,1,
+2032,751,1,2033,756,
+1,2035,762,1,2037,
+767,1,2039,772,1,
+1931,870,1,2041,778,
+1,2043,784,1,2045,
+789,1,1574,809,1,
+1958,3163,16,0,400,
+1,43,3164,19,467,
+1,43,3165,5,25,
+1,2035,762,1,2037,
+767,1,2039,772,1,
+2041,778,1,2227,917,
+1,2043,784,1,1657,
+903,1,1860,831,1,
+2136,852,1,2021,728,
+1,2459,891,1,1574,
+809,1,2105,3166,16,
+0,593,1,1931,870,
+1,1873,845,1,2031,
+746,1,1803,797,1,
+1989,3167,16,0,465,
+1,2464,908,1,2029,
+735,1,2030,741,1,
+2364,837,1,2032,751,
+1,2033,756,1,2045,
+789,1,44,3168,19,
+273,1,44,3169,5,
+38,1,1901,3170,16,
+0,271,1,2075,3171,
+16,0,271,1,1860,
+831,1,1803,797,1,
+1804,3172,16,0,271,
+1,2413,3173,16,0,
+271,1,2198,3174,16,
+0,271,1,1873,845,
+1,1657,903,1,1989,
+925,1,1990,3175,16,
+0,271,1,1775,3176,
+16,0,271,1,32,
+3177,16,0,271,1,
+2105,824,1,2106,3178,
+16,0,271,1,2364,
+837,1,2227,917,1,
+2337,3179,16,0,271,
+1,2021,728,1,2458,
+885,1,2459,891,1,
+2462,898,1,2136,852,
+1,2464,908,1,2029,
+735,1,2030,741,1,
+2031,746,1,2032,751,
+1,2033,756,1,2035,
+762,1,2037,767,1,
+2039,772,1,1931,870,
+1,2041,778,1,2043,
+784,1,2045,789,1,
+1574,809,1,1958,3180,
+16,0,271,1,45,
+3181,19,296,1,45,
+3182,5,39,1,1901,
+3183,16,0,324,1,
+2075,3184,16,0,324,
+1,1860,831,1,1803,
+797,1,1804,3185,16,
+0,324,1,2413,3186,
+16,0,324,1,2198,
+3187,16,0,324,1,
+1873,845,1,1657,903,
+1,1989,925,1,1990,
+3188,16,0,324,1,
+1775,3189,16,0,324,
+1,32,3190,16,0,
+324,1,2105,824,1,
+2106,3191,16,0,324,
+1,2364,837,1,2227,
+917,1,2337,3192,16,
+0,324,1,2021,728,
+1,2458,885,1,2459,
+891,1,2462,898,1,
+2136,852,1,2464,908,
+1,2029,735,1,2030,
+741,1,2031,746,1,
+2032,751,1,2033,756,
+1,2035,762,1,2037,
+767,1,2039,772,1,
+1931,870,1,2041,778,
+1,2043,784,1,2045,
+789,1,1832,3193,16,
+0,294,1,1574,809,
+1,1958,3194,16,0,
+324,1,46,3195,19,
+681,1,46,3196,5,
+38,1,1901,3197,16,
+0,679,1,2075,3198,
+16,0,679,1,1860,
+831,1,1803,797,1,
+1804,3199,16,0,679,
+1,2413,3200,16,0,
+679,1,2198,3201,16,
+0,679,1,1873,845,
+1,1657,903,1,1989,
+925,1,1990,3202,16,
+0,679,1,1775,3203,
+16,0,679,1,32,
+3204,16,0,679,1,
+2105,824,1,2106,3205,
+16,0,679,1,2364,
+837,1,2227,917,1,
+2337,3206,16,0,679,
+1,2021,728,1,2458,
+885,1,2459,891,1,
+2462,898,1,2136,852,
+1,2464,908,1,2029,
+735,1,2030,741,1,
+2031,746,1,2032,751,
+1,2033,756,1,2035,
+762,1,2037,767,1,
+2039,772,1,1931,870,
+1,2041,778,1,2043,
+784,1,2045,789,1,
+1574,809,1,1958,3207,
+16,0,679,1,47,
+3208,19,574,1,47,
+3209,5,19,1,0,
+3210,16,0,656,1,
+2725,3211,17,3212,15,
+3213,4,36,37,0,
+71,0,108,0,111,
+0,98,0,97,0,
+108,0,68,0,101,
+0,102,0,105,0,
+110,0,105,0,116,
+0,105,0,111,0,
+110,0,115,0,1,
+-1,1,5,3214,20,
+3215,4,38,71,0,
+108,0,111,0,98,
+0,97,0,108,0,
+68,0,101,0,102,
+0,105,0,110,0,
+105,0,116,0,105,
+0,111,0,110,0,
+115,0,95,0,52,
+0,1,149,1,3,
+1,3,1,2,3216,
+22,1,6,1,2726,
+3217,17,3218,15,3213,
+1,-1,1,5,3219,
+20,3220,4,38,71,
+0,108,0,111,0,
+98,0,97,0,108,
+0,68,0,101,0,
+102,0,105,0,110,
+0,105,0,116,0,
+105,0,111,0,110,
+0,115,0,95,0,
+50,0,1,147,1,
+3,1,3,1,2,
+3221,22,1,4,1,
+2706,3222,17,3223,15,
+3224,4,52,37,0,
+71,0,108,0,111,
+0,98,0,97,0,
+108,0,86,0,97,
+0,114,0,105,0,
+97,0,98,0,108,
+0,101,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+1,-1,1,5,3225,
+20,3226,4,54,71,
 0,108,0,111,0,
 98,0,97,0,108,
-0,68,0,101,0,
-102,0,105,0,110,
-0,105,0,116,0,
-105,0,111,0,110,
-0,115,0,1,-1,
-1,5,3214,20,3215,
+0,86,0,97,0,
+114,0,105,0,97,
+0,98,0,108,0,
+101,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,95,
+0,49,0,1,150,
+1,3,1,3,1,
+2,3227,22,1,7,
+1,2707,3228,16,0,
+656,1,2718,3229,16,
+0,656,1,2565,700,
+1,2022,3230,16,0,
+572,1,2459,891,1,
+2645,706,1,2648,3231,
+16,0,656,1,2464,
+908,1,2466,3232,17,
+3233,15,3234,4,50,
+37,0,71,0,108,
+0,111,0,98,0,
+97,0,108,0,70,
+0,117,0,110,0,
+99,0,116,0,105,
+0,111,0,110,0,
+68,0,101,0,102,
+0,105,0,110,0,
+105,0,116,0,105,
+0,111,0,110,0,
+1,-1,1,5,3235,
+20,3236,4,52,71,
+0,108,0,111,0,
+98,0,97,0,108,
+0,70,0,117,0,
+110,0,99,0,116,
+0,105,0,111,0,
+110,0,68,0,101,
+0,102,0,105,0,
+110,0,105,0,116,
+0,105,0,111,0,
+110,0,95,0,50,
+0,1,153,1,3,
+1,7,1,6,3237,
+22,1,10,1,2652,
+695,1,2727,3238,17,
+3239,15,3213,1,-1,
+1,5,3240,20,3241,
 4,38,71,0,108,
 0,111,0,98,0,
 97,0,108,0,68,
@@ -8531,25 +8632,42 @@ public yyLSLSyntax
 105,0,110,0,105,
 0,116,0,105,0,
 111,0,110,0,115,
-0,95,0,52,0,
-1,149,1,3,1,
-3,1,2,3216,22,
-1,6,1,2726,3217,
-17,3218,15,3213,1,
--1,1,5,3219,20,
-3220,4,38,71,0,
+0,95,0,51,0,
+1,148,1,3,1,
+2,1,1,3242,22,
+1,5,1,2728,3243,
+17,3244,15,3213,1,
+-1,1,5,3245,20,
+3246,4,38,71,0,
 108,0,111,0,98,
 0,97,0,108,0,
 68,0,101,0,102,
 0,105,0,110,0,
 105,0,116,0,105,
 0,111,0,110,0,
-115,0,95,0,50,
-0,1,147,1,3,
-1,3,1,2,3221,
-22,1,4,1,2706,
-3222,17,3223,15,3224,
-4,52,37,0,71,
+115,0,95,0,49,
+0,1,146,1,3,
+1,2,1,1,3247,
+22,1,3,1,2667,
+3248,17,3249,15,3234,
+1,-1,1,5,3250,
+20,3251,4,52,71,
+0,108,0,111,0,
+98,0,97,0,108,
+0,70,0,117,0,
+110,0,99,0,116,
+0,105,0,111,0,
+110,0,68,0,101,
+0,102,0,105,0,
+110,0,105,0,116,
+0,105,0,111,0,
+110,0,95,0,49,
+0,1,152,1,3,
+1,6,1,5,3252,
+22,1,9,1,2695,
+3253,17,3254,15,3224,
+1,-1,1,5,3255,
+20,3256,4,54,71,
 0,108,0,111,0,
 98,0,97,0,108,
 0,86,0,97,0,
@@ -8559,340 +8677,146 @@ public yyLSLSyntax
 0,99,0,108,0,
 97,0,114,0,97,
 0,116,0,105,0,
-111,0,110,0,1,
--1,1,5,3225,20,
-3226,4,54,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
-86,0,97,0,114,
-0,105,0,97,0,
-98,0,108,0,101,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,95,0,
-49,0,1,150,1,
-3,1,3,1,2,
-3227,22,1,7,1,
-2707,3228,16,0,656,
-1,2718,3229,16,0,
-656,1,2565,700,1,
-2022,3230,16,0,572,
-1,2459,891,1,2645,
-706,1,2648,3231,16,
-0,656,1,2464,908,
-1,2466,3232,17,3233,
-15,3234,4,50,37,
-0,71,0,108,0,
-111,0,98,0,97,
-0,108,0,70,0,
-117,0,110,0,99,
-0,116,0,105,0,
-111,0,110,0,68,
-0,101,0,102,0,
-105,0,110,0,105,
-0,116,0,105,0,
-111,0,110,0,1,
--1,1,5,3235,20,
-3236,4,52,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
-70,0,117,0,110,
-0,99,0,116,0,
-105,0,111,0,110,
-0,68,0,101,0,
-102,0,105,0,110,
-0,105,0,116,0,
-105,0,111,0,110,
-0,95,0,50,0,
-1,153,1,3,1,
-7,1,6,3237,22,
-1,10,1,2652,695,
-1,2727,3238,17,3239,
-15,3213,1,-1,1,
-5,3240,20,3241,4,
-38,71,0,108,0,
-111,0,98,0,97,
-0,108,0,68,0,
-101,0,102,0,105,
-0,110,0,105,0,
-116,0,105,0,111,
-0,110,0,115,0,
-95,0,51,0,1,
-148,1,3,1,2,
-1,1,3242,22,1,
-5,1,2728,3243,17,
-3244,15,3213,1,-1,
-1,5,3245,20,3246,
-4,38,71,0,108,
-0,111,0,98,0,
-97,0,108,0,68,
-0,101,0,102,0,
-105,0,110,0,105,
-0,116,0,105,0,
-111,0,110,0,115,
-0,95,0,49,0,
-1,146,1,3,1,
-2,1,1,3247,22,
-1,3,1,2667,3248,
-17,3249,15,3234,1,
--1,1,5,3250,20,
-3251,4,52,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
-70,0,117,0,110,
-0,99,0,116,0,
-105,0,111,0,110,
-0,68,0,101,0,
-102,0,105,0,110,
-0,105,0,116,0,
-105,0,111,0,110,
-0,95,0,49,0,
-1,152,1,3,1,
-6,1,5,3252,22,
-1,9,1,2695,3253,
-17,3254,15,3224,1,
--1,1,5,3255,20,
-3256,4,54,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
-86,0,97,0,114,
-0,105,0,97,0,
-98,0,108,0,101,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,95,0,
-50,0,1,151,1,
-3,1,5,1,4,
-3257,22,1,8,1,
-2651,689,1,48,3258,
-19,347,1,48,3259,
-5,54,1,0,3260,
-16,0,345,1,2726,
-3217,1,2727,3238,1,
-2728,3243,1,2075,3261,
-16,0,505,1,1860,
-831,1,1804,3262,16,
-0,505,1,2413,3263,
-16,0,505,1,2198,
-3264,16,0,505,1,
-1873,845,1,1657,903,
-1,2030,741,1,1989,
-925,1,1990,3265,16,
-0,505,1,2645,706,
-1,2459,891,1,1775,
-3266,16,0,505,1,
-32,3267,16,0,505,
-1,2718,3268,16,0,
-345,1,2105,824,1,
-2651,689,1,2652,695,
-1,2648,3269,16,0,
-345,1,2227,917,1,
-2337,3270,16,0,505,
-1,2667,3248,1,2695,
-3253,1,2565,700,1,
-1803,797,1,2458,885,
-1,1901,3271,16,0,
-505,1,2462,898,1,
-2136,852,1,2464,908,
-1,2029,735,1,2466,
-3232,1,2031,746,1,
-2032,751,1,2033,756,
-1,2035,762,1,2364,
-837,1,2039,772,1,
-1931,870,1,2041,778,
-1,2021,728,1,2043,
-784,1,2045,789,1,
-2725,3211,1,2706,3222,
-1,2707,3272,16,0,
-345,1,2037,767,1,
-1574,809,1,2106,3273,
-16,0,505,1,1958,
-3274,16,0,505,1,
-49,3275,19,510,1,
-49,3276,5,38,1,
-1901,3277,16,0,508,
-1,2075,3278,16,0,
-508,1,1860,831,1,
-1803,797,1,1804,3279,
-16,0,508,1,2413,
-3280,16,0,508,1,
-2198,3281,16,0,508,
+111,0,110,0,95,
+0,50,0,1,151,
+1,3,1,5,1,
+4,3257,22,1,8,
+1,2651,689,1,48,
+3258,19,347,1,48,
+3259,5,54,1,0,
+3260,16,0,345,1,
+2726,3217,1,2727,3238,
+1,2728,3243,1,2075,
+3261,16,0,505,1,
+1860,831,1,1804,3262,
+16,0,505,1,2413,
+3263,16,0,505,1,
+2198,3264,16,0,505,
 1,1873,845,1,1657,
-903,1,1989,925,1,
-1990,3282,16,0,508,
-1,1775,3283,16,0,
-508,1,32,3284,16,
-0,508,1,2105,824,
-1,2106,3285,16,0,
-508,1,2364,837,1,
-2227,917,1,2337,3286,
-16,0,508,1,2021,
-728,1,2458,885,1,
-2459,891,1,2462,898,
+903,1,2030,741,1,
+1989,925,1,1990,3265,
+16,0,505,1,2645,
+706,1,2459,891,1,
+1775,3266,16,0,505,
+1,32,3267,16,0,
+505,1,2718,3268,16,
+0,345,1,2105,824,
+1,2651,689,1,2652,
+695,1,2648,3269,16,
+0,345,1,2227,917,
+1,2337,3270,16,0,
+505,1,2667,3248,1,
+2695,3253,1,2565,700,
+1,1803,797,1,2458,
+885,1,1901,3271,16,
+0,505,1,2462,898,
 1,2136,852,1,2464,
 908,1,2029,735,1,
-2030,741,1,2031,746,
+2466,3232,1,2031,746,
 1,2032,751,1,2033,
 756,1,2035,762,1,
-2037,767,1,2039,772,
+2364,837,1,2039,772,
 1,1931,870,1,2041,
-778,1,2043,784,1,
-2045,789,1,1574,809,
-1,1958,3287,16,0,
-508,1,50,3288,19,
-627,1,50,3289,5,
-38,1,1901,3290,16,
-0,625,1,2075,3291,
-16,0,625,1,1860,
-831,1,1803,797,1,
-1804,3292,16,0,625,
-1,2413,3293,16,0,
-625,1,2198,3294,16,
-0,625,1,1873,845,
-1,1657,903,1,1989,
-925,1,1990,3295,16,
-0,625,1,1775,3296,
-16,0,625,1,32,
-3297,16,0,625,1,
-2105,824,1,2106,3298,
-16,0,625,1,2364,
-837,1,2227,917,1,
-2337,3299,16,0,625,
-1,2021,728,1,2458,
-885,1,2459,891,1,
-2462,898,1,2136,852,
-1,2464,908,1,2029,
-735,1,2030,741,1,
-2031,746,1,2032,751,
-1,2033,756,1,2035,
-762,1,2037,767,1,
-2039,772,1,1931,870,
-1,2041,778,1,2043,
-784,1,2045,789,1,
-1574,809,1,1958,3300,
-16,0,625,1,51,
-3301,19,127,1,51,
-3302,5,53,1,0,
-3303,16,0,125,1,
-2726,3217,1,2727,3238,
-1,2728,3243,1,2075,
-3304,16,0,125,1,
-1860,831,1,1804,3305,
-16,0,125,1,10,
-3306,16,0,125,1,
-2413,3307,16,0,125,
-1,2198,3308,16,0,
-125,1,1873,845,1,
-21,3309,16,0,125,
-1,1657,903,1,2030,
-741,1,1989,925,1,
-1990,3310,16,0,125,
-1,2459,891,1,1775,
-3311,16,0,125,1,
-32,3312,16,0,125,
-1,2105,824,1,2106,
-3313,16,0,125,1,
-2654,3314,16,0,125,
+778,1,2021,728,1,
+2043,784,1,2045,789,
+1,2725,3211,1,2706,
+3222,1,2707,3272,16,
+0,345,1,2037,767,
+1,1574,809,1,2106,
+3273,16,0,505,1,
+1958,3274,16,0,505,
+1,49,3275,19,510,
+1,49,3276,5,38,
+1,1901,3277,16,0,
+508,1,2075,3278,16,
+0,508,1,1860,831,
+1,1803,797,1,1804,
+3279,16,0,508,1,
+2413,3280,16,0,508,
+1,2198,3281,16,0,
+508,1,1873,845,1,
+1657,903,1,1989,925,
+1,1990,3282,16,0,
+508,1,1775,3283,16,
+0,508,1,32,3284,
+16,0,508,1,2105,
+824,1,2106,3285,16,
+0,508,1,2364,837,
 1,2227,917,1,2337,
-3315,16,0,125,1,
-2667,3248,1,52,3316,
-16,0,125,1,2695,
-3253,1,1803,797,1,
-2458,885,1,1901,3317,
-16,0,125,1,2462,
+3286,16,0,508,1,
+2021,728,1,2458,885,
+1,2459,891,1,2462,
 898,1,2136,852,1,
 2464,908,1,2029,735,
-1,2466,3232,1,2031,
+1,2030,741,1,2031,
 746,1,2032,751,1,
 2033,756,1,2035,762,
-1,2364,837,1,2039,
+1,2037,767,1,2039,
 772,1,1931,870,1,
-2041,778,1,2021,728,
-1,2043,784,1,2045,
-789,1,2511,3318,16,
-0,125,1,2725,3211,
-1,2706,3222,1,2707,
-3319,16,0,125,1,
-2037,767,1,1574,809,
-1,1958,3320,16,0,
-125,1,52,3321,19,
-124,1,52,3322,5,
-53,1,0,3323,16,
-0,122,1,2726,3217,
-1,2727,3238,1,2728,
-3243,1,2075,3324,16,
-0,122,1,1860,831,
-1,1804,3325,16,0,
-122,1,10,3326,16,
-0,122,1,2413,3327,
-16,0,122,1,2198,
-3328,16,0,122,1,
-1873,845,1,21,3329,
-16,0,122,1,1657,
-903,1,2030,741,1,
-1989,925,1,1990,3330,
-16,0,122,1,2459,
-891,1,1775,3331,16,
-0,122,1,32,3332,
-16,0,122,1,2105,
-824,1,2106,3333,16,
-0,122,1,2654,3334,
-16,0,122,1,2227,
-917,1,2337,3335,16,
-0,122,1,2667,3248,
-1,52,3336,16,0,
-122,1,2695,3253,1,
-1803,797,1,2458,885,
-1,1901,3337,16,0,
-122,1,2462,898,1,
-2136,852,1,2464,908,
-1,2029,735,1,2466,
-3232,1,2031,746,1,
-2032,751,1,2033,756,
-1,2035,762,1,2364,
-837,1,2039,772,1,
-1931,870,1,2041,778,
-1,2021,728,1,2043,
-784,1,2045,789,1,
-2511,3338,16,0,122,
-1,2725,3211,1,2706,
-3222,1,2707,3339,16,
-0,122,1,2037,767,
+2041,778,1,2043,784,
+1,2045,789,1,1574,
+809,1,1958,3287,16,
+0,508,1,50,3288,
+19,627,1,50,3289,
+5,38,1,1901,3290,
+16,0,625,1,2075,
+3291,16,0,625,1,
+1860,831,1,1803,797,
+1,1804,3292,16,0,
+625,1,2413,3293,16,
+0,625,1,2198,3294,
+16,0,625,1,1873,
+845,1,1657,903,1,
+1989,925,1,1990,3295,
+16,0,625,1,1775,
+3296,16,0,625,1,
+32,3297,16,0,625,
+1,2105,824,1,2106,
+3298,16,0,625,1,
+2364,837,1,2227,917,
+1,2337,3299,16,0,
+625,1,2021,728,1,
+2458,885,1,2459,891,
+1,2462,898,1,2136,
+852,1,2464,908,1,
+2029,735,1,2030,741,
+1,2031,746,1,2032,
+751,1,2033,756,1,
+2035,762,1,2037,767,
+1,2039,772,1,1931,
+870,1,2041,778,1,
+2043,784,1,2045,789,
 1,1574,809,1,1958,
-3340,16,0,122,1,
-53,3341,19,121,1,
-53,3342,5,53,1,
-0,3343,16,0,119,
+3300,16,0,625,1,
+51,3301,19,127,1,
+51,3302,5,53,1,
+0,3303,16,0,125,
 1,2726,3217,1,2727,
 3238,1,2728,3243,1,
-2075,3344,16,0,119,
+2075,3304,16,0,125,
 1,1860,831,1,1804,
-3345,16,0,119,1,
-10,3346,16,0,119,
-1,2413,3347,16,0,
-119,1,2198,3348,16,
-0,119,1,1873,845,
-1,21,3349,16,0,
-119,1,1657,903,1,
+3305,16,0,125,1,
+10,3306,16,0,125,
+1,2413,3307,16,0,
+125,1,2198,3308,16,
+0,125,1,1873,845,
+1,21,3309,16,0,
+125,1,1657,903,1,
 2030,741,1,1989,925,
-1,1990,3350,16,0,
-119,1,2459,891,1,
-1775,3351,16,0,119,
-1,32,3352,16,0,
-119,1,2105,824,1,
-2106,3353,16,0,119,
-1,2654,3354,16,0,
-119,1,2227,917,1,
-2337,3355,16,0,119,
+1,1990,3310,16,0,
+125,1,2459,891,1,
+1775,3311,16,0,125,
+1,32,3312,16,0,
+125,1,2105,824,1,
+2106,3313,16,0,125,
+1,2654,3314,16,0,
+125,1,2227,917,1,
+2337,3315,16,0,125,
 1,2667,3248,1,52,
-3356,16,0,119,1,
+3316,16,0,125,1,
 2695,3253,1,1803,797,
 1,2458,885,1,1901,
-3357,16,0,119,1,
+3317,16,0,125,1,
 2462,898,1,2136,852,
 1,2464,908,1,2029,
 735,1,2466,3232,1,
@@ -8902,42 +8826,42 @@ public yyLSLSyntax
 2039,772,1,1931,870,
 1,2041,778,1,2021,
 728,1,2043,784,1,
-2045,789,1,2511,3358,
-16,0,119,1,2725,
+2045,789,1,2511,3318,
+16,0,125,1,2725,
 3211,1,2706,3222,1,
-2707,3359,16,0,119,
+2707,3319,16,0,125,
 1,2037,767,1,1574,
-809,1,1958,3360,16,
-0,119,1,54,3361,
-19,118,1,54,3362,
-5,53,1,0,3363,
-16,0,116,1,2726,
+809,1,1958,3320,16,
+0,125,1,52,3321,
+19,124,1,52,3322,
+5,53,1,0,3323,
+16,0,122,1,2726,
 3217,1,2727,3238,1,
-2728,3243,1,2075,3364,
-16,0,116,1,1860,
-831,1,1804,3365,16,
-0,116,1,10,3366,
-16,0,116,1,2413,
-3367,16,0,116,1,
-2198,3368,16,0,116,
+2728,3243,1,2075,3324,
+16,0,122,1,1860,
+831,1,1804,3325,16,
+0,122,1,10,3326,
+16,0,122,1,2413,
+3327,16,0,122,1,
+2198,3328,16,0,122,
 1,1873,845,1,21,
-3369,16,0,116,1,
+3329,16,0,122,1,
 1657,903,1,2030,741,
 1,1989,925,1,1990,
-3370,16,0,116,1,
-2459,891,1,1775,3371,
-16,0,116,1,32,
-3372,16,0,116,1,
-2105,824,1,2106,3373,
-16,0,116,1,2654,
-3374,16,0,116,1,
-2227,917,1,2337,3375,
-16,0,116,1,2667,
-3248,1,52,3376,16,
-0,116,1,2695,3253,
+3330,16,0,122,1,
+2459,891,1,1775,3331,
+16,0,122,1,32,
+3332,16,0,122,1,
+2105,824,1,2106,3333,
+16,0,122,1,2654,
+3334,16,0,122,1,
+2227,917,1,2337,3335,
+16,0,122,1,2667,
+3248,1,52,3336,16,
+0,122,1,2695,3253,
 1,1803,797,1,2458,
-885,1,1901,3377,16,
-0,116,1,2462,898,
+885,1,1901,3337,16,
+0,122,1,2462,898,
 1,2136,852,1,2464,
 908,1,2029,735,1,
 2466,3232,1,2031,746,
@@ -8947,41 +8871,41 @@ public yyLSLSyntax
 1,1931,870,1,2041,
 778,1,2021,728,1,
 2043,784,1,2045,789,
-1,2511,3378,16,0,
-116,1,2725,3211,1,
-2706,3222,1,2707,3379,
-16,0,116,1,2037,
+1,2511,3338,16,0,
+122,1,2725,3211,1,
+2706,3222,1,2707,3339,
+16,0,122,1,2037,
 767,1,1574,809,1,
-1958,3380,16,0,116,
-1,55,3381,19,115,
-1,55,3382,5,53,
-1,0,3383,16,0,
-113,1,2726,3217,1,
+1958,3340,16,0,122,
+1,53,3341,19,121,
+1,53,3342,5,53,
+1,0,3343,16,0,
+119,1,2726,3217,1,
 2727,3238,1,2728,3243,
-1,2075,3384,16,0,
-113,1,1860,831,1,
-1804,3385,16,0,113,
-1,10,3386,16,0,
-113,1,2413,3387,16,
-0,113,1,2198,3388,
-16,0,113,1,1873,
-845,1,21,3389,16,
-0,113,1,1657,903,
+1,2075,3344,16,0,
+119,1,1860,831,1,
+1804,3345,16,0,119,
+1,10,3346,16,0,
+119,1,2413,3347,16,
+0,119,1,2198,3348,
+16,0,119,1,1873,
+845,1,21,3349,16,
+0,119,1,1657,903,
 1,2030,741,1,1989,
-925,1,1990,3390,16,
-0,113,1,2459,891,
-1,1775,3391,16,0,
-113,1,32,3392,16,
-0,113,1,2105,824,
-1,2106,3393,16,0,
-113,1,2654,3394,16,
-0,113,1,2227,917,
-1,2337,3395,16,0,
-113,1,2667,3248,1,
-52,3396,16,0,113,
+925,1,1990,3350,16,
+0,119,1,2459,891,
+1,1775,3351,16,0,
+119,1,32,3352,16,
+0,119,1,2105,824,
+1,2106,3353,16,0,
+119,1,2654,3354,16,
+0,119,1,2227,917,
+1,2337,3355,16,0,
+119,1,2667,3248,1,
+52,3356,16,0,119,
 1,2695,3253,1,1803,
 797,1,2458,885,1,
-1901,3397,16,0,113,
+1901,3357,16,0,119,
 1,2462,898,1,2136,
 852,1,2464,908,1,
 2029,735,1,2466,3232,
@@ -8992,41 +8916,41 @@ public yyLSLSyntax
 870,1,2041,778,1,
 2021,728,1,2043,784,
 1,2045,789,1,2511,
-3398,16,0,113,1,
+3358,16,0,119,1,
 2725,3211,1,2706,3222,
-1,2707,3399,16,0,
-113,1,2037,767,1,
-1574,809,1,1958,3400,
-16,0,113,1,56,
-3401,19,112,1,56,
-3402,5,53,1,0,
-3403,16,0,110,1,
+1,2707,3359,16,0,
+119,1,2037,767,1,
+1574,809,1,1958,3360,
+16,0,119,1,54,
+3361,19,118,1,54,
+3362,5,53,1,0,
+3363,16,0,116,1,
 2726,3217,1,2727,3238,
 1,2728,3243,1,2075,
-3404,16,0,110,1,
-1860,831,1,1804,3405,
-16,0,110,1,10,
-3406,16,0,110,1,
-2413,3407,16,0,110,
-1,2198,3408,16,0,
-110,1,1873,845,1,
-21,3409,16,0,110,
+3364,16,0,116,1,
+1860,831,1,1804,3365,
+16,0,116,1,10,
+3366,16,0,116,1,
+2413,3367,16,0,116,
+1,2198,3368,16,0,
+116,1,1873,845,1,
+21,3369,16,0,116,
 1,1657,903,1,2030,
 741,1,1989,925,1,
-1990,3410,16,0,110,
+1990,3370,16,0,116,
 1,2459,891,1,1775,
-3411,16,0,110,1,
-32,3412,16,0,110,
+3371,16,0,116,1,
+32,3372,16,0,116,
 1,2105,824,1,2106,
-3413,16,0,110,1,
-2654,3414,16,0,110,
+3373,16,0,116,1,
+2654,3374,16,0,116,
 1,2227,917,1,2337,
-3415,16,0,110,1,
-2667,3248,1,52,3416,
-16,0,110,1,2695,
+3375,16,0,116,1,
+2667,3248,1,52,3376,
+16,0,116,1,2695,
 3253,1,1803,797,1,
-2458,885,1,1901,3417,
-16,0,110,1,2462,
+2458,885,1,1901,3377,
+16,0,116,1,2462,
 898,1,2136,852,1,
 2464,908,1,2029,735,
 1,2466,3232,1,2031,
@@ -9036,42 +8960,42 @@ public yyLSLSyntax
 772,1,1931,870,1,
 2041,778,1,2021,728,
 1,2043,784,1,2045,
-789,1,2511,3418,16,
-0,110,1,2725,3211,
+789,1,2511,3378,16,
+0,116,1,2725,3211,
 1,2706,3222,1,2707,
-3419,16,0,110,1,
+3379,16,0,116,1,
 2037,767,1,1574,809,
-1,1958,3420,16,0,
-110,1,57,3421,19,
-109,1,57,3422,5,
-53,1,0,3423,16,
-0,107,1,2726,3217,
+1,1958,3380,16,0,
+116,1,55,3381,19,
+115,1,55,3382,5,
+53,1,0,3383,16,
+0,113,1,2726,3217,
 1,2727,3238,1,2728,
-3243,1,2075,3424,16,
-0,107,1,1860,831,
-1,1804,3425,16,0,
-107,1,10,3426,16,
-0,107,1,2413,3427,
-16,0,107,1,2198,
-3428,16,0,107,1,
-1873,845,1,21,3429,
-16,0,107,1,1657,
+3243,1,2075,3384,16,
+0,113,1,1860,831,
+1,1804,3385,16,0,
+113,1,10,3386,16,
+0,113,1,2413,3387,
+16,0,113,1,2198,
+3388,16,0,113,1,
+1873,845,1,21,3389,
+16,0,113,1,1657,
 903,1,2030,741,1,
-1989,925,1,1990,3430,
-16,0,107,1,2459,
-891,1,1775,3431,16,
-0,107,1,32,3432,
-16,0,107,1,2105,
-824,1,2106,3433,16,
-0,107,1,2654,3434,
-16,0,107,1,2227,
-917,1,2337,3435,16,
-0,107,1,2667,3248,
-1,52,3436,16,0,
-107,1,2695,3253,1,
+1989,925,1,1990,3390,
+16,0,113,1,2459,
+891,1,1775,3391,16,
+0,113,1,32,3392,
+16,0,113,1,2105,
+824,1,2106,3393,16,
+0,113,1,2654,3394,
+16,0,113,1,2227,
+917,1,2337,3395,16,
+0,113,1,2667,3248,
+1,52,3396,16,0,
+113,1,2695,3253,1,
 1803,797,1,2458,885,
-1,1901,3437,16,0,
-107,1,2462,898,1,
+1,1901,3397,16,0,
+113,1,2462,898,1,
 2136,852,1,2464,908,
 1,2029,735,1,2466,
 3232,1,2031,746,1,
@@ -9081,1900 +9005,1989 @@ public yyLSLSyntax
 1931,870,1,2041,778,
 1,2021,728,1,2043,
 784,1,2045,789,1,
-2511,3438,16,0,107,
+2511,3398,16,0,113,
 1,2725,3211,1,2706,
-3222,1,2707,3439,16,
-0,107,1,2037,767,
+3222,1,2707,3399,16,
+0,113,1,2037,767,
 1,1574,809,1,1958,
-3440,16,0,107,1,
-58,3441,19,437,1,
-58,3442,5,12,1,
-2524,1636,1,2526,3443,
-16,0,435,1,2564,
-1655,1,2566,1660,1,
-2567,1644,1,2606,3444,
-16,0,435,1,2459,
-891,1,2563,1650,1,
-2464,908,1,2569,3445,
-16,0,435,1,2470,
-3446,16,0,435,1,
-2509,1629,1,59,3447,
-19,434,1,59,3448,
-5,12,1,2524,1636,
-1,2526,3449,16,0,
-432,1,2564,1655,1,
-2566,1660,1,2567,1644,
-1,2606,3450,16,0,
-432,1,2459,891,1,
-2563,1650,1,2464,908,
-1,2569,3451,16,0,
-432,1,2470,3452,16,
-0,432,1,2509,1629,
-1,60,3453,19,431,
-1,60,3454,5,12,
+3400,16,0,113,1,
+56,3401,19,112,1,
+56,3402,5,53,1,
+0,3403,16,0,110,
+1,2726,3217,1,2727,
+3238,1,2728,3243,1,
+2075,3404,16,0,110,
+1,1860,831,1,1804,
+3405,16,0,110,1,
+10,3406,16,0,110,
+1,2413,3407,16,0,
+110,1,2198,3408,16,
+0,110,1,1873,845,
+1,21,3409,16,0,
+110,1,1657,903,1,
+2030,741,1,1989,925,
+1,1990,3410,16,0,
+110,1,2459,891,1,
+1775,3411,16,0,110,
+1,32,3412,16,0,
+110,1,2105,824,1,
+2106,3413,16,0,110,
+1,2654,3414,16,0,
+110,1,2227,917,1,
+2337,3415,16,0,110,
+1,2667,3248,1,52,
+3416,16,0,110,1,
+2695,3253,1,1803,797,
+1,2458,885,1,1901,
+3417,16,0,110,1,
+2462,898,1,2136,852,
+1,2464,908,1,2029,
+735,1,2466,3232,1,
+2031,746,1,2032,751,
+1,2033,756,1,2035,
+762,1,2364,837,1,
+2039,772,1,1931,870,
+1,2041,778,1,2021,
+728,1,2043,784,1,
+2045,789,1,2511,3418,
+16,0,110,1,2725,
+3211,1,2706,3222,1,
+2707,3419,16,0,110,
+1,2037,767,1,1574,
+809,1,1958,3420,16,
+0,110,1,57,3421,
+19,109,1,57,3422,
+5,53,1,0,3423,
+16,0,107,1,2726,
+3217,1,2727,3238,1,
+2728,3243,1,2075,3424,
+16,0,107,1,1860,
+831,1,1804,3425,16,
+0,107,1,10,3426,
+16,0,107,1,2413,
+3427,16,0,107,1,
+2198,3428,16,0,107,
+1,1873,845,1,21,
+3429,16,0,107,1,
+1657,903,1,2030,741,
+1,1989,925,1,1990,
+3430,16,0,107,1,
+2459,891,1,1775,3431,
+16,0,107,1,32,
+3432,16,0,107,1,
+2105,824,1,2106,3433,
+16,0,107,1,2654,
+3434,16,0,107,1,
+2227,917,1,2337,3435,
+16,0,107,1,2667,
+3248,1,52,3436,16,
+0,107,1,2695,3253,
+1,1803,797,1,2458,
+885,1,1901,3437,16,
+0,107,1,2462,898,
+1,2136,852,1,2464,
+908,1,2029,735,1,
+2466,3232,1,2031,746,
+1,2032,751,1,2033,
+756,1,2035,762,1,
+2364,837,1,2039,772,
+1,1931,870,1,2041,
+778,1,2021,728,1,
+2043,784,1,2045,789,
+1,2511,3438,16,0,
+107,1,2725,3211,1,
+2706,3222,1,2707,3439,
+16,0,107,1,2037,
+767,1,1574,809,1,
+1958,3440,16,0,107,
+1,58,3441,19,437,
+1,58,3442,5,12,
 1,2524,1636,1,2526,
-3455,16,0,429,1,
+3443,16,0,435,1,
 2564,1655,1,2566,1660,
 1,2567,1644,1,2606,
-3456,16,0,429,1,
+3444,16,0,435,1,
 2459,891,1,2563,1650,
 1,2464,908,1,2569,
-3457,16,0,429,1,
-2470,3458,16,0,429,
-1,2509,1629,1,61,
-3459,19,428,1,61,
-3460,5,12,1,2524,
-1636,1,2526,3461,16,
-0,426,1,2564,1655,
+3445,16,0,435,1,
+2470,3446,16,0,435,
+1,2509,1629,1,59,
+3447,19,434,1,59,
+3448,5,12,1,2524,
+1636,1,2526,3449,16,
+0,432,1,2564,1655,
 1,2566,1660,1,2567,
-1644,1,2606,3462,16,
-0,426,1,2459,891,
+1644,1,2606,3450,16,
+0,432,1,2459,891,
 1,2563,1650,1,2464,
-908,1,2569,3463,16,
-0,426,1,2470,3464,
-16,0,426,1,2509,
-1629,1,62,3465,19,
-425,1,62,3466,5,
+908,1,2569,3451,16,
+0,432,1,2470,3452,
+16,0,432,1,2509,
+1629,1,60,3453,19,
+431,1,60,3454,5,
 12,1,2524,1636,1,
-2526,3467,16,0,423,
+2526,3455,16,0,429,
 1,2564,1655,1,2566,
 1660,1,2567,1644,1,
-2606,3468,16,0,423,
+2606,3456,16,0,429,
 1,2459,891,1,2563,
 1650,1,2464,908,1,
-2569,3469,16,0,423,
-1,2470,3470,16,0,
-423,1,2509,1629,1,
-63,3471,19,422,1,
-63,3472,5,12,1,
-2524,1636,1,2526,3473,
-16,0,420,1,2564,
+2569,3457,16,0,429,
+1,2470,3458,16,0,
+429,1,2509,1629,1,
+61,3459,19,428,1,
+61,3460,5,12,1,
+2524,1636,1,2526,3461,
+16,0,426,1,2564,
 1655,1,2566,1660,1,
-2567,1644,1,2606,3474,
-16,0,420,1,2459,
+2567,1644,1,2606,3462,
+16,0,426,1,2459,
 891,1,2563,1650,1,
-2464,908,1,2569,3475,
-16,0,420,1,2470,
-3476,16,0,420,1,
-2509,1629,1,64,3477,
-19,663,1,64,3478,
+2464,908,1,2569,3463,
+16,0,426,1,2470,
+3464,16,0,426,1,
+2509,1629,1,62,3465,
+19,425,1,62,3466,
 5,12,1,2524,1636,
-1,2526,3479,16,0,
-661,1,2564,1655,1,
+1,2526,3467,16,0,
+423,1,2564,1655,1,
 2566,1660,1,2567,1644,
-1,2606,3480,16,0,
-661,1,2459,891,1,
+1,2606,3468,16,0,
+423,1,2459,891,1,
 2563,1650,1,2464,908,
-1,2569,3481,16,0,
-661,1,2470,3482,16,
-0,661,1,2509,1629,
-1,65,3483,19,418,
-1,65,3484,5,12,
+1,2569,3469,16,0,
+423,1,2470,3470,16,
+0,423,1,2509,1629,
+1,63,3471,19,422,
+1,63,3472,5,12,
 1,2524,1636,1,2526,
-3485,16,0,416,1,
+3473,16,0,420,1,
 2564,1655,1,2566,1660,
 1,2567,1644,1,2606,
-3486,16,0,416,1,
+3474,16,0,420,1,
 2459,891,1,2563,1650,
 1,2464,908,1,2569,
-3487,16,0,416,1,
-2470,3488,16,0,416,
-1,2509,1629,1,66,
-3489,19,503,1,66,
-3490,5,12,1,2524,
-1636,1,2526,3491,16,
-0,501,1,2564,1655,
+3475,16,0,420,1,
+2470,3476,16,0,420,
+1,2509,1629,1,64,
+3477,19,663,1,64,
+3478,5,12,1,2524,
+1636,1,2526,3479,16,
+0,661,1,2564,1655,
 1,2566,1660,1,2567,
-1644,1,2606,3492,16,
-0,501,1,2459,891,
+1644,1,2606,3480,16,
+0,661,1,2459,891,
 1,2563,1650,1,2464,
-908,1,2569,3493,16,
-0,501,1,2470,3494,
-16,0,501,1,2509,
-1629,1,67,3495,19,
-414,1,67,3496,5,
+908,1,2569,3481,16,
+0,661,1,2470,3482,
+16,0,661,1,2509,
+1629,1,65,3483,19,
+418,1,65,3484,5,
 12,1,2524,1636,1,
-2526,3497,16,0,412,
+2526,3485,16,0,416,
 1,2564,1655,1,2566,
 1660,1,2567,1644,1,
-2606,3498,16,0,412,
+2606,3486,16,0,416,
 1,2459,891,1,2563,
 1650,1,2464,908,1,
-2569,3499,16,0,412,
-1,2470,3500,16,0,
-412,1,2509,1629,1,
-68,3501,19,411,1,
-68,3502,5,12,1,
-2524,1636,1,2526,3503,
-16,0,409,1,2564,
+2569,3487,16,0,416,
+1,2470,3488,16,0,
+416,1,2509,1629,1,
+66,3489,19,503,1,
+66,3490,5,12,1,
+2524,1636,1,2526,3491,
+16,0,501,1,2564,
 1655,1,2566,1660,1,
-2567,1644,1,2606,3504,
-16,0,409,1,2459,
+2567,1644,1,2606,3492,
+16,0,501,1,2459,
 891,1,2563,1650,1,
-2464,908,1,2569,3505,
-16,0,409,1,2470,
-3506,16,0,409,1,
-2509,1629,1,69,3507,
-19,496,1,69,3508,
+2464,908,1,2569,3493,
+16,0,501,1,2470,
+3494,16,0,501,1,
+2509,1629,1,67,3495,
+19,414,1,67,3496,
 5,12,1,2524,1636,
-1,2526,3509,16,0,
-494,1,2564,1655,1,
+1,2526,3497,16,0,
+412,1,2564,1655,1,
 2566,1660,1,2567,1644,
-1,2606,3510,16,0,
-494,1,2459,891,1,
+1,2606,3498,16,0,
+412,1,2459,891,1,
 2563,1650,1,2464,908,
-1,2569,3511,16,0,
-494,1,2470,3512,16,
-0,494,1,2509,1629,
-1,70,3513,19,407,
-1,70,3514,5,12,
+1,2569,3499,16,0,
+412,1,2470,3500,16,
+0,412,1,2509,1629,
+1,68,3501,19,411,
+1,68,3502,5,12,
 1,2524,1636,1,2526,
-3515,16,0,405,1,
+3503,16,0,409,1,
 2564,1655,1,2566,1660,
 1,2567,1644,1,2606,
-3516,16,0,405,1,
+3504,16,0,409,1,
 2459,891,1,2563,1650,
 1,2464,908,1,2569,
-3517,16,0,405,1,
-2470,3518,16,0,405,
-1,2509,1629,1,71,
-3519,19,493,1,71,
-3520,5,12,1,2524,
-1636,1,2526,3521,16,
-0,491,1,2564,1655,
+3505,16,0,409,1,
+2470,3506,16,0,409,
+1,2509,1629,1,69,
+3507,19,496,1,69,
+3508,5,12,1,2524,
+1636,1,2526,3509,16,
+0,494,1,2564,1655,
 1,2566,1660,1,2567,
-1644,1,2606,3522,16,
-0,491,1,2459,891,
+1644,1,2606,3510,16,
+0,494,1,2459,891,
 1,2563,1650,1,2464,
-908,1,2569,3523,16,
-0,491,1,2470,3524,
-16,0,491,1,2509,
-1629,1,72,3525,19,
-490,1,72,3526,5,
+908,1,2569,3511,16,
+0,494,1,2470,3512,
+16,0,494,1,2509,
+1629,1,70,3513,19,
+407,1,70,3514,5,
 12,1,2524,1636,1,
-2526,3527,16,0,488,
+2526,3515,16,0,405,
 1,2564,1655,1,2566,
 1660,1,2567,1644,1,
-2606,3528,16,0,488,
+2606,3516,16,0,405,
 1,2459,891,1,2563,
 1650,1,2464,908,1,
-2569,3529,16,0,488,
-1,2470,3530,16,0,
-488,1,2509,1629,1,
-73,3531,19,487,1,
-73,3532,5,12,1,
-2524,1636,1,2526,3533,
-16,0,485,1,2564,
+2569,3517,16,0,405,
+1,2470,3518,16,0,
+405,1,2509,1629,1,
+71,3519,19,493,1,
+71,3520,5,12,1,
+2524,1636,1,2526,3521,
+16,0,491,1,2564,
 1655,1,2566,1660,1,
-2567,1644,1,2606,3534,
-16,0,485,1,2459,
+2567,1644,1,2606,3522,
+16,0,491,1,2459,
 891,1,2563,1650,1,
-2464,908,1,2569,3535,
-16,0,485,1,2470,
-3536,16,0,485,1,
-2509,1629,1,74,3537,
-19,484,1,74,3538,
+2464,908,1,2569,3523,
+16,0,491,1,2470,
+3524,16,0,491,1,
+2509,1629,1,72,3525,
+19,490,1,72,3526,
 5,12,1,2524,1636,
-1,2526,3539,16,0,
-482,1,2564,1655,1,
+1,2526,3527,16,0,
+488,1,2564,1655,1,
 2566,1660,1,2567,1644,
-1,2606,3540,16,0,
-482,1,2459,891,1,
+1,2606,3528,16,0,
+488,1,2459,891,1,
 2563,1650,1,2464,908,
-1,2569,3541,16,0,
-482,1,2470,3542,16,
-0,482,1,2509,1629,
-1,75,3543,19,398,
-1,75,3544,5,12,
+1,2569,3529,16,0,
+488,1,2470,3530,16,
+0,488,1,2509,1629,
+1,73,3531,19,487,
+1,73,3532,5,12,
 1,2524,1636,1,2526,
-3545,16,0,396,1,
+3533,16,0,485,1,
 2564,1655,1,2566,1660,
 1,2567,1644,1,2606,
-3546,16,0,396,1,
+3534,16,0,485,1,
 2459,891,1,2563,1650,
 1,2464,908,1,2569,
-3547,16,0,396,1,
-2470,3548,16,0,396,
-1,2509,1629,1,76,
-3549,19,395,1,76,
-3550,5,12,1,2524,
-1636,1,2526,3551,16,
-0,393,1,2564,1655,
+3535,16,0,485,1,
+2470,3536,16,0,485,
+1,2509,1629,1,74,
+3537,19,484,1,74,
+3538,5,12,1,2524,
+1636,1,2526,3539,16,
+0,482,1,2564,1655,
 1,2566,1660,1,2567,
-1644,1,2606,3552,16,
-0,393,1,2459,891,
+1644,1,2606,3540,16,
+0,482,1,2459,891,
 1,2563,1650,1,2464,
-908,1,2569,3553,16,
-0,393,1,2470,3554,
-16,0,393,1,2509,
-1629,1,77,3555,19,
-477,1,77,3556,5,
+908,1,2569,3541,16,
+0,482,1,2470,3542,
+16,0,482,1,2509,
+1629,1,75,3543,19,
+364,1,75,3544,5,
 12,1,2524,1636,1,
-2526,3557,16,0,475,
+2526,3545,16,0,362,
 1,2564,1655,1,2566,
 1660,1,2567,1644,1,
-2606,3558,16,0,475,
+2606,3546,16,0,362,
 1,2459,891,1,2563,
 1650,1,2464,908,1,
-2569,3559,16,0,475,
-1,2470,3560,16,0,
-475,1,2509,1629,1,
-78,3561,19,571,1,
-78,3562,5,12,1,
-2524,1636,1,2526,3563,
-16,0,569,1,2564,
+2569,3547,16,0,362,
+1,2470,3548,16,0,
+362,1,2509,1629,1,
+76,3549,19,361,1,
+76,3550,5,12,1,
+2524,1636,1,2526,3551,
+16,0,359,1,2564,
 1655,1,2566,1660,1,
-2567,1644,1,2606,3564,
-16,0,569,1,2459,
+2567,1644,1,2606,3552,
+16,0,359,1,2459,
 891,1,2563,1650,1,
-2464,908,1,2569,3565,
-16,0,569,1,2470,
-3566,16,0,569,1,
-2509,1629,1,79,3567,
-19,388,1,79,3568,
+2464,908,1,2569,3553,
+16,0,359,1,2470,
+3554,16,0,359,1,
+2509,1629,1,77,3555,
+19,398,1,77,3556,
 5,12,1,2524,1636,
-1,2526,3569,16,0,
-386,1,2564,1655,1,
+1,2526,3557,16,0,
+396,1,2564,1655,1,
 2566,1660,1,2567,1644,
-1,2606,3570,16,0,
-386,1,2459,891,1,
+1,2606,3558,16,0,
+396,1,2459,891,1,
 2563,1650,1,2464,908,
-1,2569,3571,16,0,
-386,1,2470,3572,16,
-0,386,1,2509,1629,
-1,80,3573,19,385,
-1,80,3574,5,12,
+1,2569,3559,16,0,
+396,1,2470,3560,16,
+0,396,1,2509,1629,
+1,78,3561,19,358,
+1,78,3562,5,12,
 1,2524,1636,1,2526,
-3575,16,0,383,1,
+3563,16,0,356,1,
 2564,1655,1,2566,1660,
 1,2567,1644,1,2606,
-3576,16,0,383,1,
+3564,16,0,356,1,
 2459,891,1,2563,1650,
 1,2464,908,1,2569,
-3577,16,0,383,1,
-2470,3578,16,0,383,
-1,2509,1629,1,81,
-3579,19,382,1,81,
-3580,5,12,1,2524,
-1636,1,2526,3581,16,
-0,380,1,2564,1655,
+3565,16,0,356,1,
+2470,3566,16,0,356,
+1,2509,1629,1,79,
+3567,19,355,1,79,
+3568,5,12,1,2524,
+1636,1,2526,3569,16,
+0,353,1,2564,1655,
 1,2566,1660,1,2567,
-1644,1,2606,3582,16,
-0,380,1,2459,891,
+1644,1,2606,3570,16,
+0,353,1,2459,891,
 1,2563,1650,1,2464,
-908,1,2569,3583,16,
-0,380,1,2470,3584,
-16,0,380,1,2509,
-1629,1,82,3585,19,
-379,1,82,3586,5,
+908,1,2569,3571,16,
+0,353,1,2470,3572,
+16,0,353,1,2509,
+1629,1,80,3573,19,
+395,1,80,3574,5,
 12,1,2524,1636,1,
-2526,3587,16,0,377,
+2526,3575,16,0,393,
 1,2564,1655,1,2566,
 1660,1,2567,1644,1,
-2606,3588,16,0,377,
+2606,3576,16,0,393,
 1,2459,891,1,2563,
 1650,1,2464,908,1,
-2569,3589,16,0,377,
-1,2470,3590,16,0,
-377,1,2509,1629,1,
-83,3591,19,376,1,
-83,3592,5,12,1,
-2524,1636,1,2526,3593,
-16,0,374,1,2564,
+2569,3577,16,0,393,
+1,2470,3578,16,0,
+393,1,2509,1629,1,
+81,3579,19,477,1,
+81,3580,5,12,1,
+2524,1636,1,2526,3581,
+16,0,475,1,2564,
 1655,1,2566,1660,1,
-2567,1644,1,2606,3594,
-16,0,374,1,2459,
+2567,1644,1,2606,3582,
+16,0,475,1,2459,
 891,1,2563,1650,1,
-2464,908,1,2569,3595,
-16,0,374,1,2470,
-3596,16,0,374,1,
-2509,1629,1,84,3597,
-19,373,1,84,3598,
+2464,908,1,2569,3583,
+16,0,475,1,2470,
+3584,16,0,475,1,
+2509,1629,1,82,3585,
+19,571,1,82,3586,
 5,12,1,2524,1636,
-1,2526,3599,16,0,
-371,1,2564,1655,1,
+1,2526,3587,16,0,
+569,1,2564,1655,1,
 2566,1660,1,2567,1644,
-1,2606,3600,16,0,
-371,1,2459,891,1,
+1,2606,3588,16,0,
+569,1,2459,891,1,
 2563,1650,1,2464,908,
-1,2569,3601,16,0,
-371,1,2470,3602,16,
-0,371,1,2509,1629,
-1,85,3603,19,352,
-1,85,3604,5,12,
+1,2569,3589,16,0,
+569,1,2470,3590,16,
+0,569,1,2509,1629,
+1,83,3591,19,388,
+1,83,3592,5,12,
 1,2524,1636,1,2526,
-3605,16,0,350,1,
+3593,16,0,386,1,
 2564,1655,1,2566,1660,
 1,2567,1644,1,2606,
-3606,16,0,350,1,
+3594,16,0,386,1,
 2459,891,1,2563,1650,
 1,2464,908,1,2569,
-3607,16,0,350,1,
-2470,3608,16,0,350,
-1,2509,1629,1,86,
-3609,19,370,1,86,
-3610,5,12,1,2524,
-1636,1,2526,3611,16,
-0,368,1,2564,1655,
+3595,16,0,386,1,
+2470,3596,16,0,386,
+1,2509,1629,1,84,
+3597,19,385,1,84,
+3598,5,12,1,2524,
+1636,1,2526,3599,16,
+0,383,1,2564,1655,
 1,2566,1660,1,2567,
-1644,1,2606,3612,16,
-0,368,1,2459,891,
+1644,1,2606,3600,16,
+0,383,1,2459,891,
 1,2563,1650,1,2464,
-908,1,2569,3613,16,
-0,368,1,2470,3614,
-16,0,368,1,2509,
-1629,1,87,3615,19,
-367,1,87,3616,5,
+908,1,2569,3601,16,
+0,383,1,2470,3602,
+16,0,383,1,2509,
+1629,1,85,3603,19,
+370,1,85,3604,5,
 12,1,2524,1636,1,
-2526,3617,16,0,365,
+2526,3605,16,0,368,
 1,2564,1655,1,2566,
 1660,1,2567,1644,1,
-2606,3618,16,0,365,
+2606,3606,16,0,368,
 1,2459,891,1,2563,
 1650,1,2464,908,1,
-2569,3619,16,0,365,
-1,2470,3620,16,0,
-365,1,2509,1629,1,
-88,3621,19,364,1,
-88,3622,5,12,1,
-2524,1636,1,2526,3623,
-16,0,362,1,2564,
+2569,3607,16,0,368,
+1,2470,3608,16,0,
+368,1,2509,1629,1,
+86,3609,19,367,1,
+86,3610,5,12,1,
+2524,1636,1,2526,3611,
+16,0,365,1,2564,
 1655,1,2566,1660,1,
-2567,1644,1,2606,3624,
-16,0,362,1,2459,
+2567,1644,1,2606,3612,
+16,0,365,1,2459,
 891,1,2563,1650,1,
-2464,908,1,2569,3625,
-16,0,362,1,2470,
-3626,16,0,362,1,
-2509,1629,1,89,3627,
-19,358,1,89,3628,
+2464,908,1,2569,3613,
+16,0,365,1,2470,
+3614,16,0,365,1,
+2509,1629,1,87,3615,
+19,352,1,87,3616,
 5,12,1,2524,1636,
-1,2526,3629,16,0,
-356,1,2564,1655,1,
+1,2526,3617,16,0,
+350,1,2564,1655,1,
 2566,1660,1,2567,1644,
-1,2606,3630,16,0,
-356,1,2459,891,1,
+1,2606,3618,16,0,
+350,1,2459,891,1,
 2563,1650,1,2464,908,
-1,2569,3631,16,0,
-356,1,2470,3632,16,
-0,356,1,2509,1629,
-1,90,3633,19,361,
-1,90,3634,5,12,
+1,2569,3619,16,0,
+350,1,2470,3620,16,
+0,350,1,2509,1629,
+1,88,3621,19,382,
+1,88,3622,5,12,
 1,2524,1636,1,2526,
-3635,16,0,359,1,
-2564,1655,1,2566,1660,
-1,2567,1644,1,2606,
-3636,16,0,359,1,
-2459,891,1,2563,1650,
-1,2464,908,1,2569,
-3637,16,0,359,1,
-2470,3638,16,0,359,
-1,2509,1629,1,91,
-3639,19,355,1,91,
-3640,5,12,1,2524,
-1636,1,2526,3641,16,
-0,353,1,2564,1655,
-1,2566,1660,1,2567,
-1644,1,2606,3642,16,
-0,353,1,2459,891,
-1,2563,1650,1,2464,
-908,1,2569,3643,16,
-0,353,1,2470,3644,
-16,0,353,1,2509,
-1629,1,92,3645,19,
-133,1,92,3646,5,
-125,1,0,3647,16,
-0,585,1,1,1980,
-1,2,1986,1,3,
-1991,1,4,1996,1,
-5,2001,1,6,2006,
-1,7,2011,1,8,
-3648,16,0,131,1,
-1515,3649,16,0,174,
-1,2021,728,1,2022,
-3650,16,0,507,1,
-256,3651,16,0,182,
-1,2025,3652,16,0,
-511,1,18,3653,16,
-0,138,1,2027,3654,
-16,0,515,1,2695,
-3253,1,2029,735,1,
-2030,741,1,2031,746,
-1,2032,751,1,2033,
-756,1,277,3655,16,
-0,182,1,2035,762,
-1,2037,767,1,2039,
-772,1,32,3656,16,
-0,174,1,2041,778,
-1,2293,3657,16,0,
-182,1,2043,784,1,
-2045,789,1,41,3658,
-16,0,182,1,1297,
-3659,16,0,174,1,
-43,3660,16,0,182,
-1,46,3661,16,0,
-187,1,1804,3662,16,
-0,174,1,299,3663,
-16,0,182,1,2725,
-3211,1,52,3664,16,
-0,174,1,509,3665,
-16,0,182,1,2318,
-3666,16,0,174,1,
-62,3667,16,0,205,
-1,65,3668,16,0,
-207,1,2075,3669,16,
-0,174,1,1574,809,
-1,71,3670,16,0,
-182,1,1775,3671,16,
-0,174,1,76,3672,
-16,0,182,1,1834,
-3673,16,0,174,1,
-2337,3674,16,0,174,
-1,79,3675,16,0,
-182,1,1335,3676,16,
-0,174,1,322,3677,
-16,0,182,1,85,
-3678,16,0,182,1,
-1261,3679,16,0,174,
-1,89,3680,16,0,
-182,1,346,3681,16,
-0,182,1,97,3682,
-16,0,182,1,2106,
-3683,16,0,174,1,
-102,3684,16,0,182,
-1,1860,831,1,1803,
-797,1,2364,837,1,
-1113,3685,16,0,167,
-1,112,3686,16,0,
-182,1,1117,3687,16,
-0,174,1,1873,845,
-1,1876,3688,16,0,
-174,1,372,3689,16,
-0,545,1,374,3690,
-16,0,547,1,124,
-3691,16,0,182,1,
-376,3692,16,0,549,
-1,378,3693,16,0,
-551,1,2136,852,1,
-381,3694,16,0,182,
-1,525,3695,16,0,
-182,1,137,3696,16,
-0,182,1,1901,3697,
-16,0,174,1,1153,
-3698,16,0,174,1,
-151,3699,16,0,182,
-1,1407,3700,16,0,
-174,1,1659,3701,16,
-0,174,1,2413,3702,
-16,0,174,1,406,
-3703,16,0,182,1,
-2667,3248,1,1371,3704,
-16,0,174,1,2105,
-824,1,166,3705,16,
-0,182,1,1622,3706,
-16,0,182,1,1931,
-870,1,1933,3707,16,
-0,174,1,431,3708,
-16,0,182,1,1585,
-3709,16,0,182,1,
-182,3710,16,0,182,
-1,1189,3711,16,0,
-174,1,1443,3712,16,
-0,174,1,1695,3713,
-16,0,174,1,2198,
-3714,16,0,174,1,
-2706,3222,1,2707,3715,
-16,0,585,1,2458,
-885,1,2459,891,1,
-1958,3716,16,0,174,
-1,2462,898,1,1657,
-903,1,2464,908,1,
-2466,3232,1,459,3717,
-16,0,182,1,2468,
-3718,16,0,348,1,
-447,3719,16,0,182,
-1,199,3720,16,0,
-182,1,2726,3217,1,
-2727,3238,1,2728,3243,
-1,2227,917,1,1225,
-3721,16,0,174,1,
-1479,3722,16,0,174,
-1,1731,3723,16,0,
-182,1,462,3724,16,
-0,182,1,1989,925,
-1,1990,3725,16,0,
-174,1,236,3726,16,
-0,182,1,217,3727,
-16,0,182,1,2670,
-3728,16,0,182,1,
-1756,3729,16,0,174,
-1,93,3730,19,639,
-1,93,3731,5,95,
-1,256,3732,16,0,
-637,1,1261,3733,16,
-0,637,1,509,3734,
-16,0,637,1,1515,
-3735,16,0,637,1,
-2021,728,1,1775,3736,
-16,0,637,1,2029,
+3623,16,0,380,1,
+2564,1655,1,2566,1660,
+1,2567,1644,1,2606,
+3624,16,0,380,1,
+2459,891,1,2563,1650,
+1,2464,908,1,2569,
+3625,16,0,380,1,
+2470,3626,16,0,380,
+1,2509,1629,1,89,
+3627,19,376,1,89,
+3628,5,12,1,2524,
+1636,1,2526,3629,16,
+0,374,1,2564,1655,
+1,2566,1660,1,2567,
+1644,1,2606,3630,16,
+0,374,1,2459,891,
+1,2563,1650,1,2464,
+908,1,2569,3631,16,
+0,374,1,2470,3632,
+16,0,374,1,2509,
+1629,1,90,3633,19,
+379,1,90,3634,5,
+12,1,2524,1636,1,
+2526,3635,16,0,377,
+1,2564,1655,1,2566,
+1660,1,2567,1644,1,
+2606,3636,16,0,377,
+1,2459,891,1,2563,
+1650,1,2464,908,1,
+2569,3637,16,0,377,
+1,2470,3638,16,0,
+377,1,2509,1629,1,
+91,3639,19,373,1,
+91,3640,5,12,1,
+2524,1636,1,2526,3641,
+16,0,371,1,2564,
+1655,1,2566,1660,1,
+2567,1644,1,2606,3642,
+16,0,371,1,2459,
+891,1,2563,1650,1,
+2464,908,1,2569,3643,
+16,0,371,1,2470,
+3644,16,0,371,1,
+2509,1629,1,92,3645,
+19,133,1,92,3646,
+5,125,1,0,3647,
+16,0,585,1,1,
+1980,1,2,1986,1,
+3,1991,1,4,1996,
+1,5,2001,1,6,
+2006,1,7,2011,1,
+8,3648,16,0,131,
+1,1515,3649,16,0,
+174,1,2021,728,1,
+2022,3650,16,0,507,
+1,256,3651,16,0,
+182,1,2025,3652,16,
+0,511,1,18,3653,
+16,0,138,1,2027,
+3654,16,0,515,1,
+2695,3253,1,2029,735,
+1,2030,741,1,2031,
+746,1,2032,751,1,
+2033,756,1,277,3655,
+16,0,182,1,2035,
+762,1,2037,767,1,
+2039,772,1,32,3656,
+16,0,174,1,2041,
+778,1,2293,3657,16,
+0,182,1,2043,784,
+1,2045,789,1,41,
+3658,16,0,182,1,
+1297,3659,16,0,174,
+1,43,3660,16,0,
+182,1,46,3661,16,
+0,187,1,1804,3662,
+16,0,174,1,299,
+3663,16,0,182,1,
+2725,3211,1,52,3664,
+16,0,174,1,509,
+3665,16,0,182,1,
+2318,3666,16,0,174,
+1,62,3667,16,0,
+205,1,65,3668,16,
+0,207,1,2075,3669,
+16,0,174,1,1574,
+809,1,71,3670,16,
+0,182,1,1775,3671,
+16,0,174,1,76,
+3672,16,0,182,1,
+1834,3673,16,0,174,
+1,2337,3674,16,0,
+174,1,79,3675,16,
+0,182,1,1335,3676,
+16,0,174,1,322,
+3677,16,0,182,1,
+85,3678,16,0,182,
+1,1261,3679,16,0,
+174,1,89,3680,16,
+0,182,1,346,3681,
+16,0,182,1,97,
+3682,16,0,182,1,
+2106,3683,16,0,174,
+1,102,3684,16,0,
+182,1,1860,831,1,
+1803,797,1,2364,837,
+1,1113,3685,16,0,
+167,1,112,3686,16,
+0,182,1,1117,3687,
+16,0,174,1,1873,
+845,1,1876,3688,16,
+0,174,1,372,3689,
+16,0,545,1,374,
+3690,16,0,547,1,
+124,3691,16,0,182,
+1,376,3692,16,0,
+549,1,378,3693,16,
+0,551,1,2136,852,
+1,381,3694,16,0,
+182,1,525,3695,16,
+0,182,1,137,3696,
+16,0,182,1,1901,
+3697,16,0,174,1,
+1153,3698,16,0,174,
+1,151,3699,16,0,
+182,1,1407,3700,16,
+0,174,1,1659,3701,
+16,0,174,1,2413,
+3702,16,0,174,1,
+406,3703,16,0,182,
+1,2667,3248,1,1371,
+3704,16,0,174,1,
+2105,824,1,166,3705,
+16,0,182,1,1622,
+3706,16,0,182,1,
+1931,870,1,1933,3707,
+16,0,174,1,431,
+3708,16,0,182,1,
+1585,3709,16,0,182,
+1,182,3710,16,0,
+182,1,1189,3711,16,
+0,174,1,1443,3712,
+16,0,174,1,1695,
+3713,16,0,174,1,
+2198,3714,16,0,174,
+1,2706,3222,1,2707,
+3715,16,0,585,1,
+2458,885,1,2459,891,
+1,1958,3716,16,0,
+174,1,2462,898,1,
+1657,903,1,2464,908,
+1,2466,3232,1,459,
+3717,16,0,182,1,
+2468,3718,16,0,348,
+1,447,3719,16,0,
+182,1,199,3720,16,
+0,182,1,2726,3217,
+1,2727,3238,1,2728,
+3243,1,2227,917,1,
+1225,3721,16,0,174,
+1,1479,3722,16,0,
+174,1,1731,3723,16,
+0,182,1,462,3724,
+16,0,182,1,1989,
+925,1,1990,3725,16,
+0,174,1,236,3726,
+16,0,182,1,217,
+3727,16,0,182,1,
+2670,3728,16,0,182,
+1,1756,3729,16,0,
+174,1,93,3730,19,
+639,1,93,3731,5,
+95,1,256,3732,16,
+0,637,1,1261,3733,
+16,0,637,1,509,
+3734,16,0,637,1,
+1515,3735,16,0,637,
+1,2021,728,1,1775,
+3736,16,0,637,1,
+2029,735,1,2030,741,
+1,2031,746,1,2032,
+751,1,2033,756,1,
+277,3737,16,0,637,
+1,2035,762,1,2037,
+767,1,2039,772,1,
+32,3738,16,0,637,
+1,2041,778,1,2293,
+3739,16,0,637,1,
+2043,784,1,2045,789,
+1,41,3740,16,0,
+637,1,1297,3741,16,
+0,637,1,43,3742,
+16,0,637,1,1803,
+797,1,1804,3743,16,
+0,637,1,299,3744,
+16,0,637,1,52,
+3745,16,0,637,1,
+2318,3746,16,0,637,
+1,62,3747,16,0,
+637,1,2075,3748,16,
+0,637,1,1574,809,
+1,71,3749,16,0,
+637,1,76,3750,16,
+0,637,1,1834,3751,
+16,0,637,1,2337,
+3752,16,0,637,1,
+79,3753,16,0,637,
+1,1335,3754,16,0,
+637,1,322,3755,16,
+0,637,1,85,3756,
+16,0,637,1,89,
+3757,16,0,637,1,
+346,3758,16,0,637,
+1,2105,824,1,2106,
+3759,16,0,637,1,
+97,3760,16,0,637,
+1,1860,831,1,2364,
+837,1,102,3761,16,
+0,637,1,112,3762,
+16,0,637,1,1117,
+3763,16,0,637,1,
+1873,845,1,1876,3764,
+16,0,637,1,124,
+3765,16,0,637,1,
+2136,852,1,381,3766,
+16,0,637,1,525,
+3767,16,0,637,1,
+137,3768,16,0,637,
+1,1901,3769,16,0,
+637,1,1153,3770,16,
+0,637,1,151,3771,
+16,0,637,1,1407,
+3772,16,0,637,1,
+1659,3773,16,0,637,
+1,2413,3774,16,0,
+637,1,406,3775,16,
+0,637,1,1371,3776,
+16,0,637,1,166,
+3777,16,0,637,1,
+1622,3778,16,0,637,
+1,1931,870,1,1933,
+3779,16,0,637,1,
+431,3780,16,0,637,
+1,1585,3781,16,0,
+637,1,182,3782,16,
+0,637,1,1189,3783,
+16,0,637,1,1443,
+3784,16,0,637,1,
+1695,3785,16,0,637,
+1,2198,3786,16,0,
+637,1,447,3787,16,
+0,637,1,2458,885,
+1,2459,891,1,1958,
+3788,16,0,637,1,
+2462,898,1,1657,903,
+1,2464,908,1,199,
+3789,16,0,637,1,
+459,3790,16,0,637,
+1,462,3791,16,0,
+637,1,217,3792,16,
+0,637,1,2227,917,
+1,1225,3793,16,0,
+637,1,1479,3794,16,
+0,637,1,1731,3795,
+16,0,637,1,1989,
+925,1,1990,3796,16,
+0,637,1,236,3797,
+16,0,637,1,2670,
+3798,16,0,637,1,
+1756,3799,16,0,637,
+1,94,3800,19,636,
+1,94,3801,5,95,
+1,256,3802,16,0,
+634,1,1261,3803,16,
+0,634,1,509,3804,
+16,0,634,1,1515,
+3805,16,0,634,1,
+2021,728,1,1775,3806,
+16,0,634,1,2029,
 735,1,2030,741,1,
 2031,746,1,2032,751,
 1,2033,756,1,277,
-3737,16,0,637,1,
+3807,16,0,634,1,
 2035,762,1,2037,767,
 1,2039,772,1,32,
-3738,16,0,637,1,
-2041,778,1,2293,3739,
-16,0,637,1,2043,
+3808,16,0,634,1,
+2041,778,1,2293,3809,
+16,0,634,1,2043,
 784,1,2045,789,1,
-41,3740,16,0,637,
-1,1297,3741,16,0,
-637,1,43,3742,16,
-0,637,1,1803,797,
-1,1804,3743,16,0,
-637,1,299,3744,16,
-0,637,1,52,3745,
-16,0,637,1,2318,
-3746,16,0,637,1,
-62,3747,16,0,637,
-1,2075,3748,16,0,
-637,1,1574,809,1,
-71,3749,16,0,637,
-1,76,3750,16,0,
-637,1,1834,3751,16,
-0,637,1,2337,3752,
-16,0,637,1,79,
-3753,16,0,637,1,
-1335,3754,16,0,637,
-1,322,3755,16,0,
-637,1,85,3756,16,
-0,637,1,89,3757,
-16,0,637,1,346,
-3758,16,0,637,1,
-2105,824,1,2106,3759,
-16,0,637,1,97,
-3760,16,0,637,1,
+41,3810,16,0,634,
+1,1297,3811,16,0,
+634,1,43,3812,16,
+0,634,1,1803,797,
+1,1804,3813,16,0,
+634,1,299,3814,16,
+0,634,1,52,3815,
+16,0,634,1,2318,
+3816,16,0,634,1,
+62,3817,16,0,634,
+1,2075,3818,16,0,
+634,1,1574,809,1,
+71,3819,16,0,634,
+1,76,3820,16,0,
+634,1,1834,3821,16,
+0,634,1,2337,3822,
+16,0,634,1,79,
+3823,16,0,634,1,
+1335,3824,16,0,634,
+1,322,3825,16,0,
+634,1,85,3826,16,
+0,634,1,89,3827,
+16,0,634,1,346,
+3828,16,0,634,1,
+2105,824,1,2106,3829,
+16,0,634,1,97,
+3830,16,0,634,1,
 1860,831,1,2364,837,
-1,102,3761,16,0,
-637,1,112,3762,16,
-0,637,1,1117,3763,
-16,0,637,1,1873,
-845,1,1876,3764,16,
-0,637,1,124,3765,
-16,0,637,1,2136,
-852,1,381,3766,16,
-0,637,1,525,3767,
-16,0,637,1,137,
-3768,16,0,637,1,
-1901,3769,16,0,637,
-1,1153,3770,16,0,
-637,1,151,3771,16,
-0,637,1,1407,3772,
-16,0,637,1,1659,
-3773,16,0,637,1,
-2413,3774,16,0,637,
-1,406,3775,16,0,
-637,1,1371,3776,16,
-0,637,1,166,3777,
-16,0,637,1,1622,
-3778,16,0,637,1,
-1931,870,1,1933,3779,
-16,0,637,1,431,
-3780,16,0,637,1,
-1585,3781,16,0,637,
-1,182,3782,16,0,
-637,1,1189,3783,16,
-0,637,1,1443,3784,
-16,0,637,1,1695,
-3785,16,0,637,1,
-2198,3786,16,0,637,
-1,447,3787,16,0,
-637,1,2458,885,1,
-2459,891,1,1958,3788,
-16,0,637,1,2462,
+1,102,3831,16,0,
+634,1,112,3832,16,
+0,634,1,1117,3833,
+16,0,634,1,1873,
+845,1,1876,3834,16,
+0,634,1,124,3835,
+16,0,634,1,2136,
+852,1,381,3836,16,
+0,634,1,525,3837,
+16,0,634,1,137,
+3838,16,0,634,1,
+1901,3839,16,0,634,
+1,1153,3840,16,0,
+634,1,151,3841,16,
+0,634,1,1407,3842,
+16,0,634,1,1659,
+3843,16,0,634,1,
+2413,3844,16,0,634,
+1,406,3845,16,0,
+634,1,1371,3846,16,
+0,634,1,166,3847,
+16,0,634,1,1622,
+3848,16,0,634,1,
+1931,870,1,1933,3849,
+16,0,634,1,431,
+3850,16,0,634,1,
+1585,3851,16,0,634,
+1,182,3852,16,0,
+634,1,1189,3853,16,
+0,634,1,1443,3854,
+16,0,634,1,1695,
+3855,16,0,634,1,
+2198,3856,16,0,634,
+1,447,3857,16,0,
+634,1,2458,885,1,
+2459,891,1,1958,3858,
+16,0,634,1,2462,
 898,1,1657,903,1,
-2464,908,1,199,3789,
-16,0,637,1,459,
-3790,16,0,637,1,
-462,3791,16,0,637,
-1,217,3792,16,0,
-637,1,2227,917,1,
-1225,3793,16,0,637,
-1,1479,3794,16,0,
-637,1,1731,3795,16,
-0,637,1,1989,925,
-1,1990,3796,16,0,
-637,1,236,3797,16,
-0,637,1,2670,3798,
-16,0,637,1,1756,
-3799,16,0,637,1,
-94,3800,19,636,1,
-94,3801,5,95,1,
-256,3802,16,0,634,
-1,1261,3803,16,0,
-634,1,509,3804,16,
-0,634,1,1515,3805,
-16,0,634,1,2021,
-728,1,1775,3806,16,
-0,634,1,2029,735,
+2464,908,1,199,3859,
+16,0,634,1,459,
+3860,16,0,634,1,
+462,3861,16,0,634,
+1,217,3862,16,0,
+634,1,2227,917,1,
+1225,3863,16,0,634,
+1,1479,3864,16,0,
+634,1,1731,3865,16,
+0,634,1,1989,925,
+1,1990,3866,16,0,
+634,1,236,3867,16,
+0,634,1,2670,3868,
+16,0,634,1,1756,
+3869,16,0,634,1,
+95,3870,19,633,1,
+95,3871,5,95,1,
+256,3872,16,0,631,
+1,1261,3873,16,0,
+631,1,509,3874,16,
+0,631,1,1515,3875,
+16,0,631,1,2021,
+728,1,1775,3876,16,
+0,631,1,2029,735,
 1,2030,741,1,2031,
 746,1,2032,751,1,
-2033,756,1,277,3807,
-16,0,634,1,2035,
+2033,756,1,277,3877,
+16,0,631,1,2035,
 762,1,2037,767,1,
-2039,772,1,32,3808,
-16,0,634,1,2041,
-778,1,2293,3809,16,
-0,634,1,2043,784,
+2039,772,1,32,3878,
+16,0,631,1,2041,
+778,1,2293,3879,16,
+0,631,1,2043,784,
 1,2045,789,1,41,
-3810,16,0,634,1,
-1297,3811,16,0,634,
-1,43,3812,16,0,
-634,1,1803,797,1,
-1804,3813,16,0,634,
-1,299,3814,16,0,
-634,1,52,3815,16,
-0,634,1,2318,3816,
-16,0,634,1,62,
-3817,16,0,634,1,
-2075,3818,16,0,634,
+3880,16,0,631,1,
+1297,3881,16,0,631,
+1,43,3882,16,0,
+631,1,1803,797,1,
+1804,3883,16,0,631,
+1,299,3884,16,0,
+631,1,52,3885,16,
+0,631,1,2318,3886,
+16,0,631,1,62,
+3887,16,0,631,1,
+2075,3888,16,0,631,
 1,1574,809,1,71,
-3819,16,0,634,1,
-76,3820,16,0,634,
-1,1834,3821,16,0,
-634,1,2337,3822,16,
-0,634,1,79,3823,
-16,0,634,1,1335,
-3824,16,0,634,1,
-322,3825,16,0,634,
-1,85,3826,16,0,
-634,1,89,3827,16,
-0,634,1,346,3828,
-16,0,634,1,2105,
-824,1,2106,3829,16,
-0,634,1,97,3830,
-16,0,634,1,1860,
+3889,16,0,631,1,
+76,3890,16,0,631,
+1,1834,3891,16,0,
+631,1,2337,3892,16,
+0,631,1,79,3893,
+16,0,631,1,1335,
+3894,16,0,631,1,
+322,3895,16,0,631,
+1,85,3896,16,0,
+631,1,89,3897,16,
+0,631,1,346,3898,
+16,0,631,1,2105,
+824,1,2106,3899,16,
+0,631,1,97,3900,
+16,0,631,1,1860,
 831,1,2364,837,1,
-102,3831,16,0,634,
-1,112,3832,16,0,
-634,1,1117,3833,16,
-0,634,1,1873,845,
-1,1876,3834,16,0,
-634,1,124,3835,16,
-0,634,1,2136,852,
-1,381,3836,16,0,
-634,1,525,3837,16,
-0,634,1,137,3838,
-16,0,634,1,1901,
-3839,16,0,634,1,
-1153,3840,16,0,634,
-1,151,3841,16,0,
-634,1,1407,3842,16,
-0,634,1,1659,3843,
-16,0,634,1,2413,
-3844,16,0,634,1,
-406,3845,16,0,634,
-1,1371,3846,16,0,
-634,1,166,3847,16,
-0,634,1,1622,3848,
-16,0,634,1,1931,
-870,1,1933,3849,16,
-0,634,1,431,3850,
-16,0,634,1,1585,
-3851,16,0,634,1,
-182,3852,16,0,634,
-1,1189,3853,16,0,
-634,1,1443,3854,16,
-0,634,1,1695,3855,
-16,0,634,1,2198,
-3856,16,0,634,1,
-447,3857,16,0,634,
+102,3901,16,0,631,
+1,112,3902,16,0,
+631,1,1117,3903,16,
+0,631,1,1873,845,
+1,1876,3904,16,0,
+631,1,124,3905,16,
+0,631,1,2136,852,
+1,381,3906,16,0,
+631,1,525,3907,16,
+0,631,1,137,3908,
+16,0,631,1,1901,
+3909,16,0,631,1,
+1153,3910,16,0,631,
+1,151,3911,16,0,
+631,1,1407,3912,16,
+0,631,1,1659,3913,
+16,0,631,1,2413,
+3914,16,0,631,1,
+406,3915,16,0,631,
+1,1371,3916,16,0,
+631,1,166,3917,16,
+0,631,1,1622,3918,
+16,0,631,1,1931,
+870,1,1933,3919,16,
+0,631,1,431,3920,
+16,0,631,1,1585,
+3921,16,0,631,1,
+182,3922,16,0,631,
+1,1189,3923,16,0,
+631,1,1443,3924,16,
+0,631,1,1695,3925,
+16,0,631,1,2198,
+3926,16,0,631,1,
+447,3927,16,0,631,
 1,2458,885,1,2459,
-891,1,1958,3858,16,
-0,634,1,2462,898,
+891,1,1958,3928,16,
+0,631,1,2462,898,
 1,1657,903,1,2464,
-908,1,199,3859,16,
-0,634,1,459,3860,
-16,0,634,1,462,
-3861,16,0,634,1,
-217,3862,16,0,634,
+908,1,199,3929,16,
+0,631,1,459,3930,
+16,0,631,1,462,
+3931,16,0,631,1,
+217,3932,16,0,631,
 1,2227,917,1,1225,
-3863,16,0,634,1,
-1479,3864,16,0,634,
-1,1731,3865,16,0,
-634,1,1989,925,1,
-1990,3866,16,0,634,
-1,236,3867,16,0,
-634,1,2670,3868,16,
-0,634,1,1756,3869,
-16,0,634,1,95,
-3870,19,633,1,95,
-3871,5,95,1,256,
-3872,16,0,631,1,
-1261,3873,16,0,631,
-1,509,3874,16,0,
-631,1,1515,3875,16,
-0,631,1,2021,728,
-1,1775,3876,16,0,
-631,1,2029,735,1,
-2030,741,1,2031,746,
-1,2032,751,1,2033,
-756,1,277,3877,16,
-0,631,1,2035,762,
-1,2037,767,1,2039,
-772,1,32,3878,16,
-0,631,1,2041,778,
-1,2293,3879,16,0,
-631,1,2043,784,1,
-2045,789,1,41,3880,
-16,0,631,1,1297,
-3881,16,0,631,1,
-43,3882,16,0,631,
-1,1803,797,1,1804,
-3883,16,0,631,1,
-299,3884,16,0,631,
-1,52,3885,16,0,
-631,1,2318,3886,16,
-0,631,1,62,3887,
-16,0,631,1,2075,
-3888,16,0,631,1,
-1574,809,1,71,3889,
-16,0,631,1,76,
-3890,16,0,631,1,
-1834,3891,16,0,631,
-1,2337,3892,16,0,
-631,1,79,3893,16,
-0,631,1,1335,3894,
-16,0,631,1,322,
-3895,16,0,631,1,
-85,3896,16,0,631,
-1,89,3897,16,0,
-631,1,346,3898,16,
-0,631,1,2105,824,
-1,2106,3899,16,0,
-631,1,97,3900,16,
-0,631,1,1860,831,
-1,2364,837,1,102,
-3901,16,0,631,1,
-112,3902,16,0,631,
-1,1117,3903,16,0,
-631,1,1873,845,1,
-1876,3904,16,0,631,
-1,124,3905,16,0,
-631,1,2136,852,1,
-381,3906,16,0,631,
-1,525,3907,16,0,
-631,1,137,3908,16,
-0,631,1,1901,3909,
-16,0,631,1,1153,
-3910,16,0,631,1,
-151,3911,16,0,631,
-1,1407,3912,16,0,
-631,1,1659,3913,16,
-0,631,1,2413,3914,
-16,0,631,1,406,
-3915,16,0,631,1,
-1371,3916,16,0,631,
-1,166,3917,16,0,
-631,1,1622,3918,16,
-0,631,1,1931,870,
-1,1933,3919,16,0,
-631,1,431,3920,16,
-0,631,1,1585,3921,
-16,0,631,1,182,
-3922,16,0,631,1,
-1189,3923,16,0,631,
-1,1443,3924,16,0,
-631,1,1695,3925,16,
-0,631,1,2198,3926,
-16,0,631,1,447,
-3927,16,0,631,1,
-2458,885,1,2459,891,
-1,1958,3928,16,0,
-631,1,2462,898,1,
-1657,903,1,2464,908,
-1,199,3929,16,0,
-631,1,459,3930,16,
-0,631,1,462,3931,
-16,0,631,1,217,
-3932,16,0,631,1,
-2227,917,1,1225,3933,
-16,0,631,1,1479,
-3934,16,0,631,1,
-1731,3935,16,0,631,
-1,1989,925,1,1990,
-3936,16,0,631,1,
-236,3937,16,0,631,
-1,2670,3938,16,0,
-631,1,1756,3939,16,
-0,631,1,96,3940,
-19,103,1,96,3941,
-5,1,1,0,3942,
-16,0,104,1,97,
-3943,19,240,1,97,
-3944,5,1,1,0,
-3945,16,0,238,1,
-98,3946,19,649,1,
-98,3947,5,2,1,
-0,3948,16,0,651,
-1,2707,3949,16,0,
-647,1,99,3950,19,
-154,1,99,3951,5,
-2,1,0,3952,16,
-0,152,1,2707,3953,
-16,0,646,1,100,
-3954,19,580,1,100,
-3955,5,2,1,0,
-3956,16,0,578,1,
-2707,3957,16,0,644,
-1,101,3958,19,166,
-1,101,3959,5,4,
-1,0,3960,16,0,
-584,1,2707,3961,16,
-0,584,1,2718,3962,
-16,0,164,1,2648,
-3963,16,0,164,1,
-102,3964,19,455,1,
-102,3965,5,2,1,
-2470,3966,16,0,453,
-1,2569,3967,16,0,
-563,1,103,3968,19,
-577,1,103,3969,5,
-4,1,2470,3970,16,
-0,581,1,2526,3971,
-16,0,575,1,2569,
-3972,16,0,581,1,
-2606,3973,16,0,575,
-1,104,3974,19,481,
-1,104,3975,5,4,
-1,2470,3976,16,0,
-479,1,2526,3977,16,
-0,650,1,2569,3978,
-16,0,479,1,2606,
-3979,16,0,650,1,
-105,3980,19,141,1,
-105,3981,5,3,1,
-2511,3982,16,0,607,
-1,2654,3983,16,0,
-669,1,10,3984,16,
-0,139,1,106,3985,
-19,157,1,106,3986,
-5,17,1,0,3987,
-16,0,198,1,2075,
-3988,16,0,658,1,
-2337,3989,16,0,658,
-1,2413,3990,16,0,
-658,1,10,3991,16,
-0,344,1,2511,3992,
-16,0,344,1,1901,
-3993,16,0,658,1,
-2198,3994,16,0,658,
-1,2707,3995,16,0,
-198,1,21,3996,16,
-0,155,1,2106,3997,
-16,0,658,1,2654,
-3998,16,0,344,1,
-1804,3999,16,0,658,
-1,1990,4000,16,0,
-658,1,32,4001,16,
-0,658,1,1958,4002,
-16,0,658,1,1775,
-4003,16,0,658,1,
-107,4004,19,130,1,
-107,4005,5,18,1,
-0,4006,16,0,128,
-1,2075,4007,16,0,
-137,1,2337,4008,16,
-0,137,1,2413,4009,
-16,0,137,1,10,
-4010,16,0,137,1,
-2511,4011,16,0,137,
-1,2198,4012,16,0,
-137,1,1901,4013,16,
-0,137,1,52,4014,
-16,0,203,1,2707,
-4015,16,0,128,1,
-21,4016,16,0,137,
-1,2106,4017,16,0,
-137,1,2654,4018,16,
-0,137,1,1804,4019,
-16,0,137,1,1990,
-4020,16,0,137,1,
-32,4021,16,0,137,
-1,1958,4022,16,0,
-137,1,1775,4023,16,
-0,137,1,108,4024,
-19,446,1,108,4025,
-5,4,1,2470,4026,
-16,0,444,1,2526,
-4027,16,0,444,1,
-2569,4028,16,0,444,
-1,2606,4029,16,0,
-444,1,109,4030,19,
-668,1,109,4031,5,
-4,1,2470,4032,16,
-0,666,1,2526,4033,
-16,0,666,1,2569,
-4034,16,0,666,1,
-2606,4035,16,0,666,
-1,110,4036,19,343,
-1,110,4037,5,15,
-1,2665,4038,16,0,
-671,1,2075,4039,16,
-0,516,1,2337,4040,
-16,0,516,1,2507,
-4041,16,0,443,1,
-2413,4042,16,0,516,
-1,1901,4043,16,0,
-516,1,2198,4044,16,
-0,516,1,2106,4045,
-16,0,516,1,2522,
-4046,16,0,452,1,
-1804,4047,16,0,516,
-1,1990,4048,16,0,
-516,1,31,4049,16,
-0,341,1,32,4050,
-16,0,516,1,1958,
-4051,16,0,516,1,
-1775,4052,16,0,516,
-1,111,4053,19,311,
-1,111,4054,5,1,
-1,32,4055,16,0,
-309,1,112,4056,19,
-270,1,112,4057,5,
-11,1,2075,4058,16,
-0,592,1,2337,4059,
-16,0,274,1,2413,
-4060,16,0,461,1,
-1901,4061,16,0,399,
-1,2198,4062,16,0,
-327,1,2106,4063,16,
-0,623,1,1804,4064,
-16,0,293,1,1990,
-4065,16,0,504,1,
-32,4066,16,0,337,
-1,1958,4067,16,0,
-464,1,1775,4068,16,
-0,268,1,113,4069,
-19,598,1,113,4070,
-5,11,1,2075,4071,
-16,0,596,1,2337,
-4072,16,0,596,1,
-2413,4073,16,0,596,
-1,1901,4074,16,0,
-596,1,2198,4075,16,
-0,596,1,2106,4076,
-16,0,596,1,1804,
-4077,16,0,596,1,
-1990,4078,16,0,596,
-1,32,4079,16,0,
-596,1,1958,4080,16,
-0,596,1,1775,4081,
-16,0,596,1,114,
-4082,19,654,1,114,
-4083,5,11,1,2075,
-4084,16,0,652,1,
-2337,4085,16,0,652,
-1,2413,4086,16,0,
-652,1,1901,4087,16,
-0,652,1,2198,4088,
-16,0,652,1,2106,
-4089,16,0,652,1,
-1804,4090,16,0,652,
-1,1990,4091,16,0,
-652,1,32,4092,16,
-0,652,1,1958,4093,
-16,0,652,1,1775,
-4094,16,0,652,1,
-115,4095,19,170,1,
-115,4096,5,31,1,
-1901,4097,16,0,657,
-1,1479,4098,16,0,
-561,1,2075,4099,16,
-0,657,1,1695,4100,
-16,0,199,1,1756,
-4101,16,0,197,1,
-2413,4102,16,0,657,
-1,2198,4103,16,0,
-657,1,1876,4104,16,
-0,673,1,1659,4105,
-16,0,197,1,1443,
-4106,16,0,532,1,
-1117,4107,16,0,168,
-1,1990,4108,16,0,
-657,1,1189,4109,16,
-0,250,1,1775,4110,
-16,0,657,1,32,
-4111,16,0,657,1,
-2106,4112,16,0,657,
-1,1515,4113,16,0,
-594,1,2337,4114,16,
-0,657,1,52,4115,
-16,0,608,1,1804,
-4116,16,0,657,1,
-1261,4117,16,0,305,
-1,1153,4118,16,0,
-257,1,1225,4119,16,
-0,283,1,1335,4120,
-16,0,459,1,1933,
-4121,16,0,564,1,
-1834,4122,16,0,321,
-1,1297,4123,16,0,
-331,1,1407,4124,16,
-0,582,1,2318,4125,
-16,0,197,1,1958,
-4126,16,0,657,1,
-1371,4127,16,0,449,
-1,116,4128,19,541,
-1,116,4129,5,11,
-1,2075,4130,16,0,
-539,1,2337,4131,16,
-0,539,1,2413,4132,
-16,0,539,1,1901,
-4133,16,0,539,1,
-2198,4134,16,0,539,
-1,2106,4135,16,0,
-539,1,1804,4136,16,
-0,539,1,1990,4137,
-16,0,539,1,32,
-4138,16,0,539,1,
-1958,4139,16,0,539,
-1,1775,4140,16,0,
-539,1,117,4141,19,
-537,1,117,4142,5,
-11,1,2075,4143,16,
-0,535,1,2337,4144,
-16,0,535,1,2413,
-4145,16,0,535,1,
-1901,4146,16,0,535,
-1,2198,4147,16,0,
-535,1,2106,4148,16,
-0,535,1,1804,4149,
-16,0,535,1,1990,
-4150,16,0,535,1,
-32,4151,16,0,535,
-1,1958,4152,16,0,
-535,1,1775,4153,16,
-0,535,1,118,4154,
-19,590,1,118,4155,
-5,11,1,2075,4156,
-16,0,588,1,2337,
-4157,16,0,588,1,
-2413,4158,16,0,588,
-1,1901,4159,16,0,
-588,1,2198,4160,16,
-0,588,1,2106,4161,
-16,0,588,1,1804,
-4162,16,0,588,1,
-1990,4163,16,0,588,
-1,32,4164,16,0,
-588,1,1958,4165,16,
-0,588,1,1775,4166,
-16,0,588,1,119,
-4167,19,531,1,119,
-4168,5,11,1,2075,
-4169,16,0,529,1,
-2337,4170,16,0,529,
-1,2413,4171,16,0,
-529,1,1901,4172,16,
-0,529,1,2198,4173,
-16,0,529,1,2106,
-4174,16,0,529,1,
-1804,4175,16,0,529,
-1,1990,4176,16,0,
-529,1,32,4177,16,
-0,529,1,1958,4178,
-16,0,529,1,1775,
-4179,16,0,529,1,
-120,4180,19,528,1,
-120,4181,5,11,1,
-2075,4182,16,0,526,
-1,2337,4183,16,0,
-526,1,2413,4184,16,
-0,526,1,1901,4185,
-16,0,526,1,2198,
-4186,16,0,526,1,
-2106,4187,16,0,526,
-1,1804,4188,16,0,
-526,1,1990,4189,16,
-0,526,1,32,4190,
-16,0,526,1,1958,
-4191,16,0,526,1,
-1775,4192,16,0,526,
-1,121,4193,19,525,
-1,121,4194,5,11,
-1,2075,4195,16,0,
-523,1,2337,4196,16,
-0,523,1,2413,4197,
-16,0,523,1,1901,
-4198,16,0,523,1,
-2198,4199,16,0,523,
-1,2106,4200,16,0,
-523,1,1804,4201,16,
-0,523,1,1990,4202,
-16,0,523,1,32,
-4203,16,0,523,1,
-1958,4204,16,0,523,
-1,1775,4205,16,0,
-523,1,122,4206,19,
-522,1,122,4207,5,
-11,1,2075,4208,16,
-0,520,1,2337,4209,
-16,0,520,1,2413,
-4210,16,0,520,1,
-1901,4211,16,0,520,
-1,2198,4212,16,0,
-520,1,2106,4213,16,
-0,520,1,1804,4214,
-16,0,520,1,1990,
-4215,16,0,520,1,
-32,4216,16,0,520,
-1,1958,4217,16,0,
-520,1,1775,4218,16,
-0,520,1,123,4219,
-19,519,1,123,4220,
-5,11,1,2075,4221,
-16,0,517,1,2337,
-4222,16,0,517,1,
-2413,4223,16,0,517,
-1,1901,4224,16,0,
-517,1,2198,4225,16,
-0,517,1,2106,4226,
-16,0,517,1,1804,
-4227,16,0,517,1,
-1990,4228,16,0,517,
-1,32,4229,16,0,
-517,1,1958,4230,16,
-0,517,1,1775,4231,
-16,0,517,1,124,
-4232,19,147,1,124,
-4233,5,3,1,1756,
-4234,16,0,292,1,
-2318,4235,16,0,304,
-1,1659,4236,16,0,
-145,1,125,4237,19,
-558,1,125,4238,5,
-68,1,1901,4239,16,
-0,556,1,1479,4240,
-16,0,556,1,112,
-4241,16,0,556,1,
-2293,4242,16,0,556,
-1,1804,4243,16,0,
-556,1,431,4244,16,
-0,556,1,1443,4245,
-16,0,556,1,1756,
-4246,16,0,556,1,
-124,4247,16,0,556,
-1,525,4248,16,0,
-556,1,236,4249,16,
-0,556,1,346,4250,
-16,0,556,1,1876,
-4251,16,0,556,1,
-1659,4252,16,0,556,
-1,1225,4253,16,0,
-556,1,1117,4254,16,
-0,556,1,137,4255,
-16,0,556,1,2318,
-4256,16,0,556,1,
-2670,4257,16,0,556,
-1,1775,4258,16,0,
-556,1,32,4259,16,
-0,556,1,1407,4260,
-16,0,556,1,256,
-4261,16,0,556,1,
-459,4262,16,0,556,
-1,406,4263,16,0,
-556,1,41,4264,16,
-0,556,1,151,4265,
-16,0,556,1,43,
-4266,16,0,556,1,
-1585,4267,16,0,556,
-1,1990,4268,16,0,
-556,1,2337,4269,16,
-0,556,1,509,4270,
-16,0,556,1,52,
-4271,16,0,556,1,
-381,4272,16,0,556,
-1,447,4273,16,0,
-556,1,166,4274,16,
-0,556,1,462,4275,
-16,0,556,1,277,
-4276,16,0,556,1,
-1695,4277,16,0,556,
-1,62,4278,16,0,
-603,1,1153,4279,16,
-0,556,1,2106,4280,
-16,0,556,1,1335,
-4281,16,0,556,1,
-71,4282,16,0,556,
-1,182,4283,16,0,
-556,1,76,4284,16,
-0,556,1,79,4285,
-16,0,556,1,1933,
-4286,16,0,556,1,
-299,4287,16,0,556,
-1,85,4288,16,0,
-556,1,1515,4289,16,
-0,556,1,2198,4290,
-16,0,556,1,89,
-4291,16,0,556,1,
-1834,4292,16,0,556,
-1,1622,4293,16,0,
-556,1,2413,4294,16,
-0,556,1,2075,4295,
-16,0,556,1,1731,
-4296,16,0,556,1,
-97,4297,16,0,556,
-1,1297,4298,16,0,
-556,1,1189,4299,16,
-0,556,1,102,4300,
-16,0,556,1,1261,
-4301,16,0,556,1,
-322,4302,16,0,556,
-1,1958,4303,16,0,
-556,1,199,4304,16,
-0,556,1,1371,4305,
-16,0,556,1,217,
-4306,16,0,556,1,
-126,4307,19,618,1,
-126,4308,5,2,1,
-459,4309,16,0,616,
-1,41,4310,16,0,
-676,1,127,4311,19,
-622,1,127,4312,5,
-3,1,462,4313,16,
-0,620,1,459,4314,
-16,0,643,1,41,
-4315,16,0,643,1,
-128,4316,19,4317,4,
-36,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,1,128,4312,
-1,129,4318,19,554,
-1,129,4319,5,68,
-1,1901,4320,16,0,
-552,1,1479,4321,16,
-0,552,1,112,4322,
-16,0,552,1,2293,
-4323,16,0,552,1,
-1804,4324,16,0,552,
-1,431,4325,16,0,
-552,1,1443,4326,16,
-0,552,1,1756,4327,
-16,0,552,1,124,
-4328,16,0,552,1,
-525,4329,16,0,552,
-1,236,4330,16,0,
-552,1,346,4331,16,
-0,552,1,1876,4332,
-16,0,552,1,1659,
-4333,16,0,552,1,
-1225,4334,16,0,552,
-1,1117,4335,16,0,
-552,1,137,4336,16,
-0,552,1,2318,4337,
-16,0,552,1,2670,
-4338,16,0,552,1,
-1775,4339,16,0,552,
-1,32,4340,16,0,
-552,1,1407,4341,16,
-0,552,1,256,4342,
-16,0,552,1,459,
-4343,16,0,552,1,
-406,4344,16,0,552,
-1,41,4345,16,0,
-552,1,151,4346,16,
-0,552,1,43,4347,
-16,0,552,1,1585,
-4348,16,0,552,1,
-1990,4349,16,0,552,
-1,2337,4350,16,0,
-552,1,509,4351,16,
-0,552,1,52,4352,
-16,0,552,1,381,
-4353,16,0,552,1,
-447,4354,16,0,552,
-1,166,4355,16,0,
-552,1,462,4356,16,
-0,552,1,277,4357,
-16,0,552,1,1695,
-4358,16,0,552,1,
-62,4359,16,0,604,
-1,1153,4360,16,0,
-552,1,2106,4361,16,
-0,552,1,1335,4362,
-16,0,552,1,71,
-4363,16,0,552,1,
-182,4364,16,0,552,
-1,76,4365,16,0,
-552,1,79,4366,16,
-0,552,1,1933,4367,
-16,0,552,1,299,
-4368,16,0,552,1,
-85,4369,16,0,552,
-1,1515,4370,16,0,
-552,1,2198,4371,16,
-0,552,1,89,4372,
-16,0,552,1,1834,
-4373,16,0,552,1,
-1622,4374,16,0,552,
-1,2413,4375,16,0,
-552,1,2075,4376,16,
-0,552,1,1731,4377,
-16,0,552,1,97,
-4378,16,0,552,1,
-1297,4379,16,0,552,
-1,1189,4380,16,0,
-552,1,102,4381,16,
-0,552,1,1261,4382,
-16,0,552,1,322,
-4383,16,0,552,1,
-1958,4384,16,0,552,
-1,199,4385,16,0,
-552,1,1371,4386,16,
-0,552,1,217,4387,
-16,0,552,1,130,
-4388,19,4389,4,28,
-86,0,101,0,99,
-0,116,0,111,0,
-114,0,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,1,130,
-4319,1,131,4390,19,
-4391,4,32,82,0,
-111,0,116,0,97,
-0,116,0,105,0,
-111,0,110,0,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-1,131,4319,1,132,
-4392,19,4393,4,24,
-76,0,105,0,115,
-0,116,0,67,0,
-111,0,110,0,115,
-0,116,0,97,0,
-110,0,116,0,1,
-132,4319,1,133,4394,
-19,178,1,133,4395,
-5,67,1,1901,4396,
-16,0,600,1,1479,
-4397,16,0,543,1,
-112,4398,16,0,259,
-1,2293,4399,16,0,
-282,1,1804,4400,16,
-0,600,1,431,4401,
-16,0,595,1,1443,
-4402,16,0,474,1,
-1756,4403,16,0,683,
-1,124,4404,16,0,
-267,1,525,4405,16,
-0,314,1,236,4406,
-16,0,349,1,346,
-4407,16,0,506,1,
-1876,4408,16,0,326,
-1,1659,4409,16,0,
-683,1,1225,4410,16,
-0,258,1,1117,4411,
-16,0,229,1,137,
-4412,16,0,281,1,
-2318,4413,16,0,683,
-1,2670,4414,16,0,
-606,1,1775,4415,16,
-0,600,1,32,4416,
-16,0,600,1,1407,
-4417,16,0,497,1,
-256,4418,16,0,403,
-1,459,4419,16,0,
-176,1,406,4420,16,
-0,568,1,41,4421,
-16,0,176,1,151,
-4422,16,0,291,1,
-43,4423,16,0,645,
-1,1990,4424,16,0,
-600,1,2337,4425,16,
-0,600,1,509,4426,
-16,0,665,1,52,
-4427,16,0,610,1,
-381,4428,16,0,560,
-1,447,4429,16,0,
-314,1,166,4430,16,
-0,302,1,462,4431,
-16,0,176,1,277,
-4432,16,0,447,1,
-1695,4433,16,0,279,
-1,1261,4434,16,0,
-290,1,1153,4435,16,
-0,183,1,2106,4436,
-16,0,600,1,1335,
-4437,16,0,334,1,
-71,4438,16,0,213,
-1,182,4439,16,0,
-314,1,76,4440,16,
-0,559,1,79,4441,
-16,0,228,1,1933,
-4442,16,0,415,1,
-299,4443,16,0,460,
-1,85,4444,16,0,
-471,1,1515,4445,16,
-0,567,1,2198,4446,
-16,0,600,1,89,
-4447,16,0,237,1,
-1834,4448,16,0,301,
-1,1622,4449,16,0,
-664,1,2413,4450,16,
-0,600,1,2075,4451,
-16,0,600,1,1731,
-4452,16,0,263,1,
-97,4453,16,0,419,
-1,1297,4454,16,0,
-336,1,1189,4455,16,
-0,227,1,102,4456,
-16,0,248,1,1585,
-4457,16,0,675,1,
-322,4458,16,0,472,
-1,1958,4459,16,0,
-600,1,199,4460,16,
-0,325,1,1371,4461,
-16,0,404,1,217,
-4462,16,0,333,1,
-134,4463,19,4464,4,
-36,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,1,134,4395,
-1,135,4465,19,4466,
-4,30,73,0,100,
-0,101,0,110,0,
-116,0,69,0,120,
+3933,16,0,631,1,
+1479,3934,16,0,631,
+1,1731,3935,16,0,
+631,1,1989,925,1,
+1990,3936,16,0,631,
+1,236,3937,16,0,
+631,1,2670,3938,16,
+0,631,1,1756,3939,
+16,0,631,1,96,
+3940,19,103,1,96,
+3941,5,1,1,0,
+3942,16,0,104,1,
+97,3943,19,240,1,
+97,3944,5,1,1,
+0,3945,16,0,238,
+1,98,3946,19,649,
+1,98,3947,5,2,
+1,0,3948,16,0,
+651,1,2707,3949,16,
+0,647,1,99,3950,
+19,154,1,99,3951,
+5,2,1,0,3952,
+16,0,152,1,2707,
+3953,16,0,646,1,
+100,3954,19,580,1,
+100,3955,5,2,1,
+0,3956,16,0,578,
+1,2707,3957,16,0,
+644,1,101,3958,19,
+166,1,101,3959,5,
+4,1,0,3960,16,
+0,584,1,2707,3961,
+16,0,584,1,2718,
+3962,16,0,164,1,
+2648,3963,16,0,164,
+1,102,3964,19,455,
+1,102,3965,5,2,
+1,2470,3966,16,0,
+453,1,2569,3967,16,
+0,563,1,103,3968,
+19,577,1,103,3969,
+5,4,1,2470,3970,
+16,0,581,1,2526,
+3971,16,0,575,1,
+2569,3972,16,0,581,
+1,2606,3973,16,0,
+575,1,104,3974,19,
+481,1,104,3975,5,
+4,1,2470,3976,16,
+0,479,1,2526,3977,
+16,0,650,1,2569,
+3978,16,0,479,1,
+2606,3979,16,0,650,
+1,105,3980,19,141,
+1,105,3981,5,3,
+1,2511,3982,16,0,
+607,1,2654,3983,16,
+0,669,1,10,3984,
+16,0,139,1,106,
+3985,19,157,1,106,
+3986,5,17,1,0,
+3987,16,0,198,1,
+2075,3988,16,0,658,
+1,2337,3989,16,0,
+658,1,2413,3990,16,
+0,658,1,10,3991,
+16,0,344,1,2511,
+3992,16,0,344,1,
+1901,3993,16,0,658,
+1,2198,3994,16,0,
+658,1,2707,3995,16,
+0,198,1,21,3996,
+16,0,155,1,2106,
+3997,16,0,658,1,
+2654,3998,16,0,344,
+1,1804,3999,16,0,
+658,1,1990,4000,16,
+0,658,1,32,4001,
+16,0,658,1,1958,
+4002,16,0,658,1,
+1775,4003,16,0,658,
+1,107,4004,19,130,
+1,107,4005,5,18,
+1,0,4006,16,0,
+128,1,2075,4007,16,
+0,137,1,2337,4008,
+16,0,137,1,2413,
+4009,16,0,137,1,
+10,4010,16,0,137,
+1,2511,4011,16,0,
+137,1,2198,4012,16,
+0,137,1,1901,4013,
+16,0,137,1,52,
+4014,16,0,203,1,
+2707,4015,16,0,128,
+1,21,4016,16,0,
+137,1,2106,4017,16,
+0,137,1,2654,4018,
+16,0,137,1,1804,
+4019,16,0,137,1,
+1990,4020,16,0,137,
+1,32,4021,16,0,
+137,1,1958,4022,16,
+0,137,1,1775,4023,
+16,0,137,1,108,
+4024,19,446,1,108,
+4025,5,4,1,2470,
+4026,16,0,444,1,
+2526,4027,16,0,444,
+1,2569,4028,16,0,
+444,1,2606,4029,16,
+0,444,1,109,4030,
+19,668,1,109,4031,
+5,4,1,2470,4032,
+16,0,666,1,2526,
+4033,16,0,666,1,
+2569,4034,16,0,666,
+1,2606,4035,16,0,
+666,1,110,4036,19,
+343,1,110,4037,5,
+15,1,2665,4038,16,
+0,671,1,2075,4039,
+16,0,516,1,2337,
+4040,16,0,516,1,
+2507,4041,16,0,443,
+1,2413,4042,16,0,
+516,1,1901,4043,16,
+0,516,1,2198,4044,
+16,0,516,1,2106,
+4045,16,0,516,1,
+2522,4046,16,0,452,
+1,1804,4047,16,0,
+516,1,1990,4048,16,
+0,516,1,31,4049,
+16,0,341,1,32,
+4050,16,0,516,1,
+1958,4051,16,0,516,
+1,1775,4052,16,0,
+516,1,111,4053,19,
+311,1,111,4054,5,
+1,1,32,4055,16,
+0,309,1,112,4056,
+19,270,1,112,4057,
+5,11,1,2075,4058,
+16,0,592,1,2337,
+4059,16,0,274,1,
+2413,4060,16,0,461,
+1,1901,4061,16,0,
+399,1,2198,4062,16,
+0,327,1,2106,4063,
+16,0,623,1,1804,
+4064,16,0,293,1,
+1990,4065,16,0,504,
+1,32,4066,16,0,
+337,1,1958,4067,16,
+0,464,1,1775,4068,
+16,0,268,1,113,
+4069,19,598,1,113,
+4070,5,11,1,2075,
+4071,16,0,596,1,
+2337,4072,16,0,596,
+1,2413,4073,16,0,
+596,1,1901,4074,16,
+0,596,1,2198,4075,
+16,0,596,1,2106,
+4076,16,0,596,1,
+1804,4077,16,0,596,
+1,1990,4078,16,0,
+596,1,32,4079,16,
+0,596,1,1958,4080,
+16,0,596,1,1775,
+4081,16,0,596,1,
+114,4082,19,654,1,
+114,4083,5,11,1,
+2075,4084,16,0,652,
+1,2337,4085,16,0,
+652,1,2413,4086,16,
+0,652,1,1901,4087,
+16,0,652,1,2198,
+4088,16,0,652,1,
+2106,4089,16,0,652,
+1,1804,4090,16,0,
+652,1,1990,4091,16,
+0,652,1,32,4092,
+16,0,652,1,1958,
+4093,16,0,652,1,
+1775,4094,16,0,652,
+1,115,4095,19,170,
+1,115,4096,5,31,
+1,1901,4097,16,0,
+657,1,1479,4098,16,
+0,561,1,2075,4099,
+16,0,657,1,1695,
+4100,16,0,199,1,
+1756,4101,16,0,197,
+1,2413,4102,16,0,
+657,1,2198,4103,16,
+0,657,1,1876,4104,
+16,0,673,1,1659,
+4105,16,0,197,1,
+1443,4106,16,0,532,
+1,1117,4107,16,0,
+168,1,1990,4108,16,
+0,657,1,1189,4109,
+16,0,250,1,1775,
+4110,16,0,657,1,
+32,4111,16,0,657,
+1,2106,4112,16,0,
+657,1,1515,4113,16,
+0,594,1,2337,4114,
+16,0,657,1,52,
+4115,16,0,608,1,
+1804,4116,16,0,657,
+1,1261,4117,16,0,
+305,1,1153,4118,16,
+0,257,1,1225,4119,
+16,0,283,1,1335,
+4120,16,0,459,1,
+1933,4121,16,0,564,
+1,1834,4122,16,0,
+321,1,1297,4123,16,
+0,331,1,1407,4124,
+16,0,582,1,2318,
+4125,16,0,197,1,
+1958,4126,16,0,657,
+1,1371,4127,16,0,
+449,1,116,4128,19,
+541,1,116,4129,5,
+11,1,2075,4130,16,
+0,539,1,2337,4131,
+16,0,539,1,2413,
+4132,16,0,539,1,
+1901,4133,16,0,539,
+1,2198,4134,16,0,
+539,1,2106,4135,16,
+0,539,1,1804,4136,
+16,0,539,1,1990,
+4137,16,0,539,1,
+32,4138,16,0,539,
+1,1958,4139,16,0,
+539,1,1775,4140,16,
+0,539,1,117,4141,
+19,537,1,117,4142,
+5,11,1,2075,4143,
+16,0,535,1,2337,
+4144,16,0,535,1,
+2413,4145,16,0,535,
+1,1901,4146,16,0,
+535,1,2198,4147,16,
+0,535,1,2106,4148,
+16,0,535,1,1804,
+4149,16,0,535,1,
+1990,4150,16,0,535,
+1,32,4151,16,0,
+535,1,1958,4152,16,
+0,535,1,1775,4153,
+16,0,535,1,118,
+4154,19,590,1,118,
+4155,5,11,1,2075,
+4156,16,0,588,1,
+2337,4157,16,0,588,
+1,2413,4158,16,0,
+588,1,1901,4159,16,
+0,588,1,2198,4160,
+16,0,588,1,2106,
+4161,16,0,588,1,
+1804,4162,16,0,588,
+1,1990,4163,16,0,
+588,1,32,4164,16,
+0,588,1,1958,4165,
+16,0,588,1,1775,
+4166,16,0,588,1,
+119,4167,19,531,1,
+119,4168,5,11,1,
+2075,4169,16,0,529,
+1,2337,4170,16,0,
+529,1,2413,4171,16,
+0,529,1,1901,4172,
+16,0,529,1,2198,
+4173,16,0,529,1,
+2106,4174,16,0,529,
+1,1804,4175,16,0,
+529,1,1990,4176,16,
+0,529,1,32,4177,
+16,0,529,1,1958,
+4178,16,0,529,1,
+1775,4179,16,0,529,
+1,120,4180,19,528,
+1,120,4181,5,11,
+1,2075,4182,16,0,
+526,1,2337,4183,16,
+0,526,1,2413,4184,
+16,0,526,1,1901,
+4185,16,0,526,1,
+2198,4186,16,0,526,
+1,2106,4187,16,0,
+526,1,1804,4188,16,
+0,526,1,1990,4189,
+16,0,526,1,32,
+4190,16,0,526,1,
+1958,4191,16,0,526,
+1,1775,4192,16,0,
+526,1,121,4193,19,
+525,1,121,4194,5,
+11,1,2075,4195,16,
+0,523,1,2337,4196,
+16,0,523,1,2413,
+4197,16,0,523,1,
+1901,4198,16,0,523,
+1,2198,4199,16,0,
+523,1,2106,4200,16,
+0,523,1,1804,4201,
+16,0,523,1,1990,
+4202,16,0,523,1,
+32,4203,16,0,523,
+1,1958,4204,16,0,
+523,1,1775,4205,16,
+0,523,1,122,4206,
+19,522,1,122,4207,
+5,11,1,2075,4208,
+16,0,520,1,2337,
+4209,16,0,520,1,
+2413,4210,16,0,520,
+1,1901,4211,16,0,
+520,1,2198,4212,16,
+0,520,1,2106,4213,
+16,0,520,1,1804,
+4214,16,0,520,1,
+1990,4215,16,0,520,
+1,32,4216,16,0,
+520,1,1958,4217,16,
+0,520,1,1775,4218,
+16,0,520,1,123,
+4219,19,519,1,123,
+4220,5,11,1,2075,
+4221,16,0,517,1,
+2337,4222,16,0,517,
+1,2413,4223,16,0,
+517,1,1901,4224,16,
+0,517,1,2198,4225,
+16,0,517,1,2106,
+4226,16,0,517,1,
+1804,4227,16,0,517,
+1,1990,4228,16,0,
+517,1,32,4229,16,
+0,517,1,1958,4230,
+16,0,517,1,1775,
+4231,16,0,517,1,
+124,4232,19,147,1,
+124,4233,5,3,1,
+1756,4234,16,0,292,
+1,2318,4235,16,0,
+304,1,1659,4236,16,
+0,145,1,125,4237,
+19,558,1,125,4238,
+5,68,1,1901,4239,
+16,0,556,1,1479,
+4240,16,0,556,1,
+112,4241,16,0,556,
+1,2293,4242,16,0,
+556,1,1804,4243,16,
+0,556,1,431,4244,
+16,0,556,1,1443,
+4245,16,0,556,1,
+1756,4246,16,0,556,
+1,124,4247,16,0,
+556,1,525,4248,16,
+0,556,1,236,4249,
+16,0,556,1,346,
+4250,16,0,556,1,
+1876,4251,16,0,556,
+1,1659,4252,16,0,
+556,1,1225,4253,16,
+0,556,1,1117,4254,
+16,0,556,1,137,
+4255,16,0,556,1,
+2318,4256,16,0,556,
+1,2670,4257,16,0,
+556,1,1775,4258,16,
+0,556,1,32,4259,
+16,0,556,1,1407,
+4260,16,0,556,1,
+256,4261,16,0,556,
+1,459,4262,16,0,
+556,1,406,4263,16,
+0,556,1,41,4264,
+16,0,556,1,151,
+4265,16,0,556,1,
+43,4266,16,0,556,
+1,1585,4267,16,0,
+556,1,1990,4268,16,
+0,556,1,2337,4269,
+16,0,556,1,509,
+4270,16,0,556,1,
+52,4271,16,0,556,
+1,381,4272,16,0,
+556,1,447,4273,16,
+0,556,1,166,4274,
+16,0,556,1,462,
+4275,16,0,556,1,
+277,4276,16,0,556,
+1,1695,4277,16,0,
+556,1,62,4278,16,
+0,603,1,1153,4279,
+16,0,556,1,2106,
+4280,16,0,556,1,
+1335,4281,16,0,556,
+1,71,4282,16,0,
+556,1,182,4283,16,
+0,556,1,76,4284,
+16,0,556,1,79,
+4285,16,0,556,1,
+1933,4286,16,0,556,
+1,299,4287,16,0,
+556,1,85,4288,16,
+0,556,1,1515,4289,
+16,0,556,1,2198,
+4290,16,0,556,1,
+89,4291,16,0,556,
+1,1834,4292,16,0,
+556,1,1622,4293,16,
+0,556,1,2413,4294,
+16,0,556,1,2075,
+4295,16,0,556,1,
+1731,4296,16,0,556,
+1,97,4297,16,0,
+556,1,1297,4298,16,
+0,556,1,1189,4299,
+16,0,556,1,102,
+4300,16,0,556,1,
+1261,4301,16,0,556,
+1,322,4302,16,0,
+556,1,1958,4303,16,
+0,556,1,199,4304,
+16,0,556,1,1371,
+4305,16,0,556,1,
+217,4306,16,0,556,
+1,126,4307,19,618,
+1,126,4308,5,2,
+1,459,4309,16,0,
+616,1,41,4310,16,
+0,676,1,127,4311,
+19,622,1,127,4312,
+5,3,1,462,4313,
+16,0,620,1,459,
+4314,16,0,643,1,
+41,4315,16,0,643,
+1,128,4316,19,4317,
+4,36,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,1,135,4395,
-1,136,4467,19,4468,
-4,36,73,0,100,
-0,101,0,110,0,
-116,0,68,0,111,
+110,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,1,128,
+4312,1,129,4318,19,
+554,1,129,4319,5,
+68,1,1901,4320,16,
+0,552,1,1479,4321,
+16,0,552,1,112,
+4322,16,0,552,1,
+2293,4323,16,0,552,
+1,1804,4324,16,0,
+552,1,431,4325,16,
+0,552,1,1443,4326,
+16,0,552,1,1756,
+4327,16,0,552,1,
+124,4328,16,0,552,
+1,525,4329,16,0,
+552,1,236,4330,16,
+0,552,1,346,4331,
+16,0,552,1,1876,
+4332,16,0,552,1,
+1659,4333,16,0,552,
+1,1225,4334,16,0,
+552,1,1117,4335,16,
+0,552,1,137,4336,
+16,0,552,1,2318,
+4337,16,0,552,1,
+2670,4338,16,0,552,
+1,1775,4339,16,0,
+552,1,32,4340,16,
+0,552,1,1407,4341,
+16,0,552,1,256,
+4342,16,0,552,1,
+459,4343,16,0,552,
+1,406,4344,16,0,
+552,1,41,4345,16,
+0,552,1,151,4346,
+16,0,552,1,43,
+4347,16,0,552,1,
+1585,4348,16,0,552,
+1,1990,4349,16,0,
+552,1,2337,4350,16,
+0,552,1,509,4351,
+16,0,552,1,52,
+4352,16,0,552,1,
+381,4353,16,0,552,
+1,447,4354,16,0,
+552,1,166,4355,16,
+0,552,1,462,4356,
+16,0,552,1,277,
+4357,16,0,552,1,
+1695,4358,16,0,552,
+1,62,4359,16,0,
+604,1,1153,4360,16,
+0,552,1,2106,4361,
+16,0,552,1,1335,
+4362,16,0,552,1,
+71,4363,16,0,552,
+1,182,4364,16,0,
+552,1,76,4365,16,
+0,552,1,79,4366,
+16,0,552,1,1933,
+4367,16,0,552,1,
+299,4368,16,0,552,
+1,85,4369,16,0,
+552,1,1515,4370,16,
+0,552,1,2198,4371,
+16,0,552,1,89,
+4372,16,0,552,1,
+1834,4373,16,0,552,
+1,1622,4374,16,0,
+552,1,2413,4375,16,
+0,552,1,2075,4376,
+16,0,552,1,1731,
+4377,16,0,552,1,
+97,4378,16,0,552,
+1,1297,4379,16,0,
+552,1,1189,4380,16,
+0,552,1,102,4381,
+16,0,552,1,1261,
+4382,16,0,552,1,
+322,4383,16,0,552,
+1,1958,4384,16,0,
+552,1,199,4385,16,
+0,552,1,1371,4386,
+16,0,552,1,217,
+4387,16,0,552,1,
+130,4388,19,4389,4,
+28,86,0,101,0,
+99,0,116,0,111,
+0,114,0,67,0,
+111,0,110,0,115,
+0,116,0,97,0,
+110,0,116,0,1,
+130,4319,1,131,4390,
+19,4391,4,32,82,
+0,111,0,116,0,
+97,0,116,0,105,
+0,111,0,110,0,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,1,131,4319,1,
+132,4392,19,4393,4,
+24,76,0,105,0,
+115,0,116,0,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+1,132,4319,1,133,
+4394,19,178,1,133,
+4395,5,67,1,1901,
+4396,16,0,600,1,
+1479,4397,16,0,543,
+1,112,4398,16,0,
+259,1,2293,4399,16,
+0,282,1,1804,4400,
+16,0,600,1,431,
+4401,16,0,595,1,
+1443,4402,16,0,474,
+1,1756,4403,16,0,
+683,1,124,4404,16,
+0,267,1,525,4405,
+16,0,314,1,236,
+4406,16,0,349,1,
+346,4407,16,0,506,
+1,1876,4408,16,0,
+326,1,1659,4409,16,
+0,683,1,1225,4410,
+16,0,258,1,1117,
+4411,16,0,229,1,
+137,4412,16,0,281,
+1,2318,4413,16,0,
+683,1,2670,4414,16,
+0,606,1,1775,4415,
+16,0,600,1,32,
+4416,16,0,600,1,
+1407,4417,16,0,497,
+1,256,4418,16,0,
+403,1,459,4419,16,
+0,176,1,406,4420,
+16,0,568,1,41,
+4421,16,0,176,1,
+151,4422,16,0,291,
+1,43,4423,16,0,
+645,1,1990,4424,16,
+0,600,1,2337,4425,
+16,0,600,1,509,
+4426,16,0,665,1,
+52,4427,16,0,610,
+1,381,4428,16,0,
+560,1,447,4429,16,
+0,314,1,166,4430,
+16,0,302,1,462,
+4431,16,0,176,1,
+277,4432,16,0,447,
+1,1695,4433,16,0,
+279,1,1261,4434,16,
+0,290,1,1153,4435,
+16,0,183,1,2106,
+4436,16,0,600,1,
+1335,4437,16,0,334,
+1,71,4438,16,0,
+213,1,182,4439,16,
+0,314,1,76,4440,
+16,0,559,1,79,
+4441,16,0,228,1,
+1933,4442,16,0,415,
+1,299,4443,16,0,
+460,1,85,4444,16,
+0,471,1,1515,4445,
+16,0,567,1,2198,
+4446,16,0,600,1,
+89,4447,16,0,237,
+1,1834,4448,16,0,
+301,1,1622,4449,16,
+0,664,1,2413,4450,
+16,0,600,1,2075,
+4451,16,0,600,1,
+1731,4452,16,0,263,
+1,97,4453,16,0,
+419,1,1297,4454,16,
+0,336,1,1189,4455,
+16,0,227,1,102,
+4456,16,0,248,1,
+1585,4457,16,0,675,
+1,322,4458,16,0,
+472,1,1958,4459,16,
+0,600,1,199,4460,
+16,0,325,1,1371,
+4461,16,0,404,1,
+217,4462,16,0,333,
+1,134,4463,19,4464,
+4,36,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
 0,116,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
-0,110,0,1,136,
-4395,1,137,4469,19,
-4470,4,44,70,0,
-117,0,110,0,99,
-0,116,0,105,0,
-111,0,110,0,67,
-0,97,0,108,0,
-108,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,1,137,4395,
-1,138,4471,19,4472,
-4,32,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,1,
-138,4395,1,139,4473,
-19,4474,4,30,85,
-0,110,0,97,0,
-114,0,121,0,69,
+0,110,0,1,134,
+4395,1,135,4465,19,
+4466,4,30,73,0,
+100,0,101,0,110,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,135,
+4395,1,136,4467,19,
+4468,4,36,73,0,
+100,0,101,0,110,
+0,116,0,68,0,
+111,0,116,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,1,
-139,4395,1,140,4475,
-19,4476,4,36,84,
-0,121,0,112,0,
-101,0,99,0,97,
-0,115,0,116,0,
+136,4395,1,137,4469,
+19,4470,4,44,70,
+0,117,0,110,0,
+99,0,116,0,105,
+0,111,0,110,0,
+67,0,97,0,108,
+0,108,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,137,
+4395,1,138,4471,19,
+4472,4,32,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-1,140,4395,1,141,
-4477,19,4478,4,42,
-80,0,97,0,114,
-0,101,0,110,0,
-116,0,104,0,101,
-0,115,0,105,0,
-115,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,1,141,4395,
-1,142,4479,19,4480,
-4,56,73,0,110,
-0,99,0,114,0,
-101,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
+1,138,4395,1,139,
+4473,19,4474,4,30,
+85,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
 0,114,0,101,0,
-109,0,101,0,110,
-0,116,0,69,0,
+115,0,115,0,105,
+0,111,0,110,0,
+1,139,4395,1,140,
+4475,19,4476,4,36,
+84,0,121,0,112,
+0,101,0,99,0,
+97,0,115,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,1,140,4395,1,
+141,4477,19,4478,4,
+42,80,0,97,0,
+114,0,101,0,110,
+0,116,0,104,0,
+101,0,115,0,105,
+0,115,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
-0,110,0,1,142,
-4395,1,144,4481,19,
-715,1,144,3941,1,
-145,4482,19,720,1,
-145,3941,1,146,4483,
-19,3246,1,146,3944,
-1,147,4484,19,3220,
-1,147,3944,1,148,
-4485,19,3241,1,148,
-3944,1,149,4486,19,
-3215,1,149,3944,1,
-150,4487,19,3226,1,
-150,3947,1,151,4488,
-19,3256,1,151,3947,
-1,152,4489,19,3251,
-1,152,3951,1,153,
-4490,19,3236,1,153,
-3951,1,154,4491,19,
-698,1,154,3955,1,
-155,4492,19,693,1,
-155,3955,1,156,4493,
-19,709,1,156,3959,
-1,157,4494,19,704,
-1,157,3959,1,158,
-4495,19,1648,1,158,
-3965,1,159,4496,19,
-1658,1,159,3965,1,
-160,4497,19,1663,1,
-160,3965,1,161,4498,
-19,1653,1,161,3965,
-1,162,4499,19,1640,
-1,162,3969,1,163,
-4500,19,1633,1,163,
-3975,1,164,4501,19,
-1704,1,164,3981,1,
-165,4502,19,1679,1,
-165,3981,1,166,4503,
-19,1127,1,166,3986,
-1,167,4504,19,911,
-1,167,4037,1,168,
-4505,19,895,1,168,
-4037,1,169,4506,19,
-901,1,169,4054,1,
-170,4507,19,889,1,
-170,4054,1,171,4508,
-19,1155,1,171,4070,
-1,172,4509,19,792,
-1,172,4057,1,173,
-4510,19,906,1,173,
-4057,1,174,4511,19,
-787,1,174,4057,1,
-175,4512,19,812,1,
-175,4057,1,176,4513,
-19,781,1,176,4057,
-1,177,4514,19,775,
-1,177,4057,1,178,
-4515,19,770,1,178,
-4057,1,179,4516,19,
-765,1,179,4057,1,
-180,4517,19,759,1,
-180,4057,1,181,4518,
-19,754,1,181,4057,
-1,182,4519,19,749,
-1,182,4057,1,183,
-4520,19,744,1,183,
-4057,1,184,4521,19,
-739,1,184,4057,1,
-185,4522,19,1162,1,
-185,4142,1,186,4523,
-19,1300,1,186,4155,
-1,187,4524,19,1149,
-1,187,4168,1,188,
-4525,19,1288,1,188,
-4168,1,189,4526,19,
-928,1,189,4181,1,
-190,4527,19,732,1,
-190,4181,1,191,4528,
-19,827,1,191,4181,
-1,192,4529,19,855,
-1,192,4181,1,193,
-4530,19,874,1,193,
-4194,1,194,4531,19,
-920,1,194,4194,1,
-195,4532,19,835,1,
-195,4207,1,196,4533,
-19,848,1,196,4207,
-1,197,4534,19,801,
-1,197,4220,1,198,
-4535,19,840,1,198,
-4220,1,199,4536,19,
-1478,1,199,4233,1,
-200,4537,19,1168,1,
-200,4233,1,201,4538,
-19,1510,1,201,4233,
-1,202,4539,19,1547,
-1,202,4233,1,203,
-4540,19,1416,1,203,
-4083,1,204,4541,19,
-1532,1,204,4083,1,
-205,4542,19,1143,1,
-205,4096,1,206,4543,
-19,1579,1,206,4096,
-1,207,4544,19,1505,
-1,207,4096,1,208,
-4545,19,1460,1,208,
-4096,1,209,4546,19,
-1384,1,209,4096,1,
-210,4547,19,1310,1,
-210,4096,1,211,4548,
-19,1320,1,211,4096,
-1,212,4549,19,1138,
-1,212,4096,1,213,
-4550,19,1563,1,213,
-4096,1,214,4551,19,
-1500,1,214,4096,1,
-215,4552,19,1450,1,
-215,4096,1,216,4553,
-19,1373,1,216,4096,
-1,217,4554,19,1336,
-1,217,4096,1,218,
-4555,19,1121,1,218,
-4096,1,219,4556,19,
-1466,1,219,4096,1,
-220,4557,19,1488,1,
-220,4096,1,221,4558,
-19,1443,1,221,4096,
-1,222,4559,19,1596,
-1,222,4096,1,223,
-4560,19,1276,1,223,
-4096,1,224,4561,19,
-1180,1,224,4096,1,
-225,4562,19,1110,1,
-225,4096,1,226,4563,
-19,1537,1,226,4096,
-1,227,4564,19,1483,
-1,227,4096,1,228,
-4565,19,1438,1,228,
-4096,1,229,4566,19,
-1305,1,229,4129,1,
-230,4567,19,1283,1,
-230,4129,1,231,4568,
-19,1568,1,231,4319,
-1,232,4569,19,1591,
-1,232,4319,1,233,
-4570,19,1558,1,233,
-4319,1,234,4571,19,
-1553,1,234,4319,1,
-235,4572,19,1574,1,
-235,4319,1,236,4573,
-19,1516,1,236,4319,
-1,237,4574,19,1230,
-1,237,4319,1,238,
-4575,19,1405,1,238,
-4395,1,239,4576,19,
-1191,1,239,4395,1,
-240,4577,19,1198,1,
-240,4395,1,241,4578,
-19,1219,1,241,4395,
-1,242,4579,19,1214,
-1,242,4395,1,243,
-4580,19,1209,1,243,
-4395,1,244,4581,19,
-1204,1,244,4395,1,
-245,4582,19,1394,1,
-245,4395,1,246,4583,
-19,1422,1,246,4395,
-1,247,4584,19,1399,
-1,247,4395,1,248,
-4585,19,1389,1,248,
-4395,1,249,4586,19,
-1379,1,249,4395,1,
-250,4587,19,1362,1,
-250,4395,1,251,4588,
-19,1315,1,251,4395,
-1,252,4589,19,1224,
-1,252,4395,1,253,
-4590,19,1185,1,253,
-4395,1,254,4591,19,
-1133,1,254,4395,1,
-255,4592,19,1586,1,
-255,4395,1,256,4593,
-19,1542,1,256,4395,
-1,257,4594,19,1527,
-1,257,4395,1,258,
-4595,19,1522,1,258,
-4395,1,259,4596,19,
-1473,1,259,4395,1,
-260,4597,19,1455,1,
-260,4395,1,261,4598,
-19,1432,1,261,4395,
-1,262,4599,19,1427,
-1,262,4395,1,263,
-4600,19,1368,1,263,
-4395,1,264,4601,19,
-1344,1,264,4395,1,
-265,4602,19,1410,1,
-265,4395,1,266,4603,
-19,1494,1,266,4395,
-1,267,4604,19,1357,
-1,267,4395,1,268,
-4605,19,1351,1,268,
-4395,1,269,4606,19,
-1331,1,269,4395,1,
-270,4607,19,1294,1,
-270,4395,1,271,4608,
-19,1271,1,271,4395,
-1,272,4609,19,1116,
-1,272,4395,1,273,
-4610,19,1606,1,273,
-4395,1,274,4611,19,
-1236,1,274,4395,1,
-275,4612,19,1241,1,
-275,4395,1,276,4613,
-19,1261,1,276,4395,
-1,277,4614,19,1251,
-1,277,4395,1,278,
-4615,19,1256,1,278,
-4395,1,279,4616,19,
-1246,1,279,4395,1,
-280,4617,19,1601,1,
-280,4395,1,281,4618,
-19,1266,1,281,4395,
-1,282,4619,19,1326,
-1,282,4238,1,283,
-4620,19,1717,1,283,
-4308,1,284,4621,19,
-1710,1,284,4308,1,
-285,4622,19,1689,1,
-285,4312,1,286,4623,
-19,2014,1,286,4005,
-1,287,4624,19,2009,
-1,287,4005,1,288,
-4625,19,2004,1,288,
-4005,1,289,4626,19,
-1999,1,289,4005,1,
-290,4627,19,1994,1,
-290,4005,1,291,4628,
-19,1989,1,291,4005,
-1,292,4629,19,1984,
-1,292,4005,1,293,
-4630,19,1973,1,293,
-4025,1,294,4631,19,
-1968,1,294,4025,1,
-295,4632,19,1963,1,
-295,4025,1,296,4633,
-19,1958,1,296,4025,
-1,297,4634,19,1953,
-1,297,4025,1,298,
-4635,19,1948,1,298,
-4025,1,299,4636,19,
-1943,1,299,4025,1,
-300,4637,19,1938,1,
-300,4025,1,301,4638,
-19,1933,1,301,4025,
-1,302,4639,19,1767,
-1,302,4025,1,303,
-4640,19,1927,1,303,
-4025,1,304,4641,19,
-1922,1,304,4025,1,
-305,4642,19,1917,1,
-305,4025,1,306,4643,
-19,1760,1,306,4025,
-1,307,4644,19,1912,
-1,307,4025,1,308,
-4645,19,1907,1,308,
-4025,1,309,4646,19,
-1902,1,309,4025,1,
-310,4647,19,1897,1,
-310,4025,1,311,4648,
-19,1892,1,311,4025,
-1,312,4649,19,1887,
-1,312,4025,1,313,
-4650,19,1753,1,313,
-4025,1,314,4651,19,
-1881,1,314,4025,1,
-315,4652,19,1876,1,
-315,4025,1,316,4653,
-19,1871,1,316,4025,
-1,317,4654,19,1747,
-1,317,4025,1,318,
-4655,19,1865,1,318,
-4025,1,319,4656,19,
-1796,1,319,4025,1,
-320,4657,19,1860,1,
-320,4025,1,321,4658,
-19,1855,1,321,4025,
-1,322,4659,19,1850,
-1,322,4025,1,323,
-4660,19,1845,1,323,
-4025,1,324,4661,19,
-1840,1,324,4025,1,
-325,4662,19,1835,1,
-325,4025,1,326,4663,
-19,1830,1,326,4031,
-1,327,4664,19,4665,
-4,50,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-76,0,105,0,115,
-0,116,0,95,0,
-51,0,1,327,3981,
-1,328,4666,19,4667,
-4,28,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,76,0,
-105,0,115,0,116,
-0,95,0,51,0,
-1,328,4308,1,329,
-4668,19,4669,4,50,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,76,0,
-105,0,115,0,116,
-0,95,0,52,0,
-1,329,3981,1,330,
-4670,19,4671,4,50,
-65,0,114,0,103,
-0,117,0,109,0,
+0,110,0,1,141,
+4395,1,142,4479,19,
+4480,4,56,73,0,
+110,0,99,0,114,
+0,101,0,109,0,
 101,0,110,0,116,
 0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,76,0,
-105,0,115,0,116,
-0,95,0,53,0,
-1,330,3981,1,331,
-4672,19,4673,4,28,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
+99,0,114,0,101,
+0,109,0,101,0,
+110,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,1,
+142,4395,1,144,4481,
+19,715,1,144,3941,
+1,145,4482,19,720,
+1,145,3941,1,146,
+4483,19,3246,1,146,
+3944,1,147,4484,19,
+3220,1,147,3944,1,
+148,4485,19,3241,1,
+148,3944,1,149,4486,
+19,3215,1,149,3944,
+1,150,4487,19,3226,
+1,150,3947,1,151,
+4488,19,3256,1,151,
+3947,1,152,4489,19,
+3251,1,152,3951,1,
+153,4490,19,3236,1,
+153,3951,1,154,4491,
+19,698,1,154,3955,
+1,155,4492,19,693,
+1,155,3955,1,156,
+4493,19,709,1,156,
+3959,1,157,4494,19,
+704,1,157,3959,1,
+158,4495,19,1648,1,
+158,3965,1,159,4496,
+19,1658,1,159,3965,
+1,160,4497,19,1663,
+1,160,3965,1,161,
+4498,19,1653,1,161,
+3965,1,162,4499,19,
+1640,1,162,3969,1,
+163,4500,19,1633,1,
+163,3975,1,164,4501,
+19,1704,1,164,3981,
+1,165,4502,19,1679,
+1,165,3981,1,166,
+4503,19,1127,1,166,
+3986,1,167,4504,19,
+911,1,167,4037,1,
+168,4505,19,895,1,
+168,4037,1,169,4506,
+19,901,1,169,4054,
+1,170,4507,19,889,
+1,170,4054,1,171,
+4508,19,1155,1,171,
+4070,1,172,4509,19,
+792,1,172,4057,1,
+173,4510,19,906,1,
+173,4057,1,174,4511,
+19,787,1,174,4057,
+1,175,4512,19,812,
+1,175,4057,1,176,
+4513,19,781,1,176,
+4057,1,177,4514,19,
+775,1,177,4057,1,
+178,4515,19,770,1,
+178,4057,1,179,4516,
+19,765,1,179,4057,
+1,180,4517,19,759,
+1,180,4057,1,181,
+4518,19,754,1,181,
+4057,1,182,4519,19,
+749,1,182,4057,1,
+183,4520,19,744,1,
+183,4057,1,184,4521,
+19,739,1,184,4057,
+1,185,4522,19,1162,
+1,185,4142,1,186,
+4523,19,1300,1,186,
+4155,1,187,4524,19,
+1149,1,187,4168,1,
+188,4525,19,1288,1,
+188,4168,1,189,4526,
+19,928,1,189,4181,
+1,190,4527,19,732,
+1,190,4181,1,191,
+4528,19,827,1,191,
+4181,1,192,4529,19,
+855,1,192,4181,1,
+193,4530,19,874,1,
+193,4194,1,194,4531,
+19,920,1,194,4194,
+1,195,4532,19,835,
+1,195,4207,1,196,
+4533,19,848,1,196,
+4207,1,197,4534,19,
+801,1,197,4220,1,
+198,4535,19,840,1,
+198,4220,1,199,4536,
+19,1478,1,199,4233,
+1,200,4537,19,1168,
+1,200,4233,1,201,
+4538,19,1510,1,201,
+4233,1,202,4539,19,
+1547,1,202,4233,1,
+203,4540,19,1416,1,
+203,4083,1,204,4541,
+19,1532,1,204,4083,
+1,205,4542,19,1143,
+1,205,4096,1,206,
+4543,19,1579,1,206,
+4096,1,207,4544,19,
+1505,1,207,4096,1,
+208,4545,19,1460,1,
+208,4096,1,209,4546,
+19,1384,1,209,4096,
+1,210,4547,19,1310,
+1,210,4096,1,211,
+4548,19,1320,1,211,
+4096,1,212,4549,19,
+1138,1,212,4096,1,
+213,4550,19,1563,1,
+213,4096,1,214,4551,
+19,1500,1,214,4096,
+1,215,4552,19,1450,
+1,215,4096,1,216,
+4553,19,1373,1,216,
+4096,1,217,4554,19,
+1336,1,217,4096,1,
+218,4555,19,1121,1,
+218,4096,1,219,4556,
+19,1466,1,219,4096,
+1,220,4557,19,1488,
+1,220,4096,1,221,
+4558,19,1443,1,221,
+4096,1,222,4559,19,
+1596,1,222,4096,1,
+223,4560,19,1276,1,
+223,4096,1,224,4561,
+19,1180,1,224,4096,
+1,225,4562,19,1110,
+1,225,4096,1,226,
+4563,19,1537,1,226,
+4096,1,227,4564,19,
+1483,1,227,4096,1,
+228,4565,19,1438,1,
+228,4096,1,229,4566,
+19,1305,1,229,4129,
+1,230,4567,19,1283,
+1,230,4129,1,231,
+4568,19,1568,1,231,
+4319,1,232,4569,19,
+1591,1,232,4319,1,
+233,4570,19,1558,1,
+233,4319,1,234,4571,
+19,1553,1,234,4319,
+1,235,4572,19,1574,
+1,235,4319,1,236,
+4573,19,1516,1,236,
+4319,1,237,4574,19,
+1230,1,237,4319,1,
+238,4575,19,1405,1,
+238,4395,1,239,4576,
+19,1191,1,239,4395,
+1,240,4577,19,1198,
+1,240,4395,1,241,
+4578,19,1219,1,241,
+4395,1,242,4579,19,
+1214,1,242,4395,1,
+243,4580,19,1209,1,
+243,4395,1,244,4581,
+19,1204,1,244,4395,
+1,245,4582,19,1394,
+1,245,4395,1,246,
+4583,19,1422,1,246,
+4395,1,247,4584,19,
+1399,1,247,4395,1,
+248,4585,19,1389,1,
+248,4395,1,249,4586,
+19,1379,1,249,4395,
+1,250,4587,19,1362,
+1,250,4395,1,251,
+4588,19,1315,1,251,
+4395,1,252,4589,19,
+1224,1,252,4395,1,
+253,4590,19,1185,1,
+253,4395,1,254,4591,
+19,1133,1,254,4395,
+1,255,4592,19,1586,
+1,255,4395,1,256,
+4593,19,1542,1,256,
+4395,1,257,4594,19,
+1527,1,257,4395,1,
+258,4595,19,1522,1,
+258,4395,1,259,4596,
+19,1473,1,259,4395,
+1,260,4597,19,1455,
+1,260,4395,1,261,
+4598,19,1432,1,261,
+4395,1,262,4599,19,
+1427,1,262,4395,1,
+263,4600,19,1368,1,
+263,4395,1,264,4601,
+19,1344,1,264,4395,
+1,265,4602,19,1410,
+1,265,4395,1,266,
+4603,19,1494,1,266,
+4395,1,267,4604,19,
+1357,1,267,4395,1,
+268,4605,19,1351,1,
+268,4395,1,269,4606,
+19,1331,1,269,4395,
+1,270,4607,19,1294,
+1,270,4395,1,271,
+4608,19,1271,1,271,
+4395,1,272,4609,19,
+1116,1,272,4395,1,
+273,4610,19,1606,1,
+273,4395,1,274,4611,
+19,1236,1,274,4395,
+1,275,4612,19,1241,
+1,275,4395,1,276,
+4613,19,1261,1,276,
+4395,1,277,4614,19,
+1251,1,277,4395,1,
+278,4615,19,1256,1,
+278,4395,1,279,4616,
+19,1246,1,279,4395,
+1,280,4617,19,1601,
+1,280,4395,1,281,
+4618,19,1266,1,281,
+4395,1,282,4619,19,
+1326,1,282,4238,1,
+283,4620,19,1717,1,
+283,4308,1,284,4621,
+19,1710,1,284,4308,
+1,285,4622,19,1689,
+1,285,4312,1,286,
+4623,19,2014,1,286,
+4005,1,287,4624,19,
+2009,1,287,4005,1,
+288,4625,19,2004,1,
+288,4005,1,289,4626,
+19,1999,1,289,4005,
+1,290,4627,19,1994,
+1,290,4005,1,291,
+4628,19,1989,1,291,
+4005,1,292,4629,19,
+1984,1,292,4005,1,
+293,4630,19,1973,1,
+293,4025,1,294,4631,
+19,1968,1,294,4025,
+1,295,4632,19,1963,
+1,295,4025,1,296,
+4633,19,1958,1,296,
+4025,1,297,4634,19,
+1953,1,297,4025,1,
+298,4635,19,1948,1,
+298,4025,1,299,4636,
+19,1943,1,299,4025,
+1,300,4637,19,1938,
+1,300,4025,1,301,
+4638,19,1933,1,301,
+4025,1,302,4639,19,
+1767,1,302,4025,1,
+303,4640,19,1927,1,
+303,4025,1,304,4641,
+19,1922,1,304,4025,
+1,305,4642,19,1917,
+1,305,4025,1,306,
+4643,19,1760,1,306,
+4025,1,307,4644,19,
+1912,1,307,4025,1,
+308,4645,19,1907,1,
+308,4025,1,309,4646,
+19,1902,1,309,4025,
+1,310,4647,19,1897,
+1,310,4025,1,311,
+4648,19,1892,1,311,
+4025,1,312,4649,19,
+1887,1,312,4025,1,
+313,4650,19,1753,1,
+313,4025,1,314,4651,
+19,1881,1,314,4025,
+1,315,4652,19,1876,
+1,315,4025,1,316,
+4653,19,1871,1,316,
+4025,1,317,4654,19,
+1747,1,317,4025,1,
+318,4655,19,1865,1,
+318,4025,1,319,4656,
+19,1796,1,319,4025,
+1,320,4657,19,1860,
+1,320,4031,1,321,
+4658,19,1855,1,321,
+4031,1,322,4659,19,
+1850,1,322,4031,1,
+323,4660,19,1845,1,
+323,4031,1,324,4661,
+19,1840,1,324,4031,
+1,325,4662,19,1835,
+1,325,4031,1,326,
+4663,19,1830,1,326,
+4031,1,327,4664,19,
+4665,4,50,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
 0,76,0,105,0,
 115,0,116,0,95,
-0,52,0,1,331,
-4308,2,0,0};
+0,51,0,1,327,
+3981,1,328,4666,19,
+4667,4,28,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,76,
+0,105,0,115,0,
+116,0,95,0,51,
+0,1,328,4308,1,
+329,4668,19,4669,4,
+50,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,76,
+0,105,0,115,0,
+116,0,95,0,52,
+0,1,329,3981,1,
+330,4670,19,4671,4,
+50,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,76,
+0,105,0,115,0,
+116,0,95,0,53,
+0,1,330,3981,1,
+331,4672,19,4673,4,
+28,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,76,0,105,
+0,115,0,116,0,
+95,0,52,0,1,
+331,4308,2,0,0};
 new Sfactory(this,"ExpressionArgument_1",new SCreator(ExpressionArgument_1_factory));
 new Sfactory(this,"SimpleAssignment_8",new SCreator(SimpleAssignment_8_factory));
 new Sfactory(this,"SimpleAssignment_9",new SCreator(SimpleAssignment_9_factory));
@@ -10993,6 +11006,7 @@ new Sfactory(this,"SimpleAssignment_19",new SCreator(SimpleAssignment_19_factory
 new Sfactory(this,"BinaryExpression_9",new SCreator(BinaryExpression_9_factory));
 new Sfactory(this,"VectorConstant_1",new SCreator(VectorConstant_1_factory));
 new Sfactory(this,"ParenthesisExpression",new SCreator(ParenthesisExpression_factory));
+new Sfactory(this,"StatementList",new SCreator(StatementList_factory));
 new Sfactory(this,"UnaryExpression",new SCreator(UnaryExpression_factory));
 new Sfactory(this,"IdentDotExpression_1",new SCreator(IdentDotExpression_1_factory));
 new Sfactory(this,"ArgumentList_4",new SCreator(ArgumentList_4_factory));
@@ -11016,7 +11030,7 @@ new Sfactory(this,"Event_4",new SCreator(Event_4_factory));
 new Sfactory(this,"Event_5",new SCreator(Event_5_factory));
 new Sfactory(this,"SimpleAssignment_5",new SCreator(SimpleAssignment_5_factory));
 new Sfactory(this,"Typename_1",new SCreator(Typename_1_factory));
-new Sfactory(this,"Typename_2",new SCreator(Typename_2_factory));
+new Sfactory(this,"VoidArgStateEvent_1",new SCreator(VoidArgStateEvent_1_factory));
 new Sfactory(this,"Typename_3",new SCreator(Typename_3_factory));
 new Sfactory(this,"Typename_4",new SCreator(Typename_4_factory));
 new Sfactory(this,"Typename_5",new SCreator(Typename_5_factory));
@@ -11029,7 +11043,6 @@ new Sfactory(this,"LSLProgramRoot_2",new SCreator(LSLProgramRoot_2_factory));
 new Sfactory(this,"States_1",new SCreator(States_1_factory));
 new Sfactory(this,"States_2",new SCreator(States_2_factory));
 new Sfactory(this,"FunctionCallExpression_1",new SCreator(FunctionCallExpression_1_factory));
-new Sfactory(this,"Event_24",new SCreator(Event_24_factory));
 new Sfactory(this,"ForLoopStatement",new SCreator(ForLoopStatement_factory));
 new Sfactory(this,"DoWhileStatement_1",new SCreator(DoWhileStatement_1_factory));
 new Sfactory(this,"DoWhileStatement_2",new SCreator(DoWhileStatement_2_factory));
@@ -11043,21 +11056,26 @@ new Sfactory(this,"SimpleAssignment_17",new SCreator(SimpleAssignment_17_factory
 new Sfactory(this,"SimpleAssignment_18",new SCreator(SimpleAssignment_18_factory));
 new Sfactory(this,"JumpStatement_1",new SCreator(JumpStatement_1_factory));
 new Sfactory(this,"GlobalDefinitions",new SCreator(GlobalDefinitions_factory));
+new Sfactory(this,"VoidArgEvent_4",new SCreator(VoidArgEvent_4_factory));
 new Sfactory(this,"FunctionCall_1",new SCreator(FunctionCall_1_factory));
 new Sfactory(this,"ArgumentList_3",new SCreator(ArgumentList_3_factory));
 new Sfactory(this,"Assignment_2",new SCreator(Assignment_2_factory));
+new Sfactory(this,"VoidArgEvent_1",new SCreator(VoidArgEvent_1_factory));
 new Sfactory(this,"TypecastExpression_1",new SCreator(TypecastExpression_1_factory));
 new Sfactory(this,"SimpleAssignment_21",new SCreator(SimpleAssignment_21_factory));
 new Sfactory(this,"SimpleAssignment_22",new SCreator(SimpleAssignment_22_factory));
 new Sfactory(this,"SimpleAssignment_23",new SCreator(SimpleAssignment_23_factory));
 new Sfactory(this,"TypecastExpression_9",new SCreator(TypecastExpression_9_factory));
+new Sfactory(this,"VoidArgEvent_2",new SCreator(VoidArgEvent_2_factory));
+new Sfactory(this,"VoidArgEvent_3",new SCreator(VoidArgEvent_3_factory));
 new Sfactory(this,"ArgumentDeclarationList_1",new SCreator(ArgumentDeclarationList_1_factory));
 new Sfactory(this,"ArgumentDeclarationList_2",new SCreator(ArgumentDeclarationList_2_factory));
-new Sfactory(this,"ArgumentDeclarationList_3",new SCreator(ArgumentDeclarationList_3_factory));
+new Sfactory(this,"VoidArgEvent_6",new SCreator(VoidArgEvent_6_factory));
 new Sfactory(this,"GlobalDefinitions_1",new SCreator(GlobalDefinitions_1_factory));
 new Sfactory(this,"GlobalDefinitions_2",new SCreator(GlobalDefinitions_2_factory));
 new Sfactory(this,"IncrementDecrementExpression",new SCreator(IncrementDecrementExpression_factory));
 new Sfactory(this,"GlobalVariableDeclaration",new SCreator(GlobalVariableDeclaration_factory));
+new Sfactory(this,"ArgumentDeclarationList_3",new SCreator(ArgumentDeclarationList_3_factory));
 new Sfactory(this,"Event_11",new SCreator(Event_11_factory));
 new Sfactory(this,"TypecastExpression_2",new SCreator(TypecastExpression_2_factory));
 new Sfactory(this,"TypecastExpression_3",new SCreator(TypecastExpression_3_factory));
@@ -11082,7 +11100,6 @@ new Sfactory(this,"ArgumentList_1",new SCreator(ArgumentList_1_factory));
 new Sfactory(this,"ArgumentList_2",new SCreator(ArgumentList_2_factory));
 new Sfactory(this,"Constant",new SCreator(Constant_factory));
 new Sfactory(this,"State",new SCreator(State_factory));
-new Sfactory(this,"Event_12",new SCreator(Event_12_factory));
 new Sfactory(this,"Event_13",new SCreator(Event_13_factory));
 new Sfactory(this,"Event_14",new SCreator(Event_14_factory));
 new Sfactory(this,"LSLProgramRoot",new SCreator(LSLProgramRoot_factory));
@@ -11099,11 +11116,10 @@ new Sfactory(this,"Event_21",new SCreator(Event_21_factory));
 new Sfactory(this,"Event_22",new SCreator(Event_22_factory));
 new Sfactory(this,"CompoundStatement",new SCreator(CompoundStatement_factory));
 new Sfactory(this,"RotationConstant_1",new SCreator(RotationConstant_1_factory));
-new Sfactory(this,"ArgumentDeclarationList_4",new SCreator(ArgumentDeclarationList_4_factory));
 new Sfactory(this,"TypecastExpression",new SCreator(TypecastExpression_factory));
 new Sfactory(this,"SimpleAssignment_3",new SCreator(SimpleAssignment_3_factory));
 new Sfactory(this,"SimpleAssignment_4",new SCreator(SimpleAssignment_4_factory));
-new Sfactory(this,"StateEntryStateEvent_1",new SCreator(StateEntryStateEvent_1_factory));
+new Sfactory(this,"Statement_1",new SCreator(Statement_1_factory));
 new Sfactory(this,"Statement_2",new SCreator(Statement_2_factory));
 new Sfactory(this,"Statement_3",new SCreator(Statement_3_factory));
 new Sfactory(this,"Statement_4",new SCreator(Statement_4_factory));
@@ -11122,13 +11138,14 @@ new Sfactory(this,"StateBody",new SCreator(StateBody_factory));
 new Sfactory(this,"Event_7",new SCreator(Event_7_factory));
 new Sfactory(this,"Event_8",new SCreator(Event_8_factory));
 new Sfactory(this,"IncrementDecrementExpression_1",new SCreator(IncrementDecrementExpression_1_factory));
+new Sfactory(this,"Typename_2",new SCreator(Typename_2_factory));
 new Sfactory(this,"IncrementDecrementExpression_3",new SCreator(IncrementDecrementExpression_3_factory));
 new Sfactory(this,"IncrementDecrementExpression_4",new SCreator(IncrementDecrementExpression_4_factory));
 new Sfactory(this,"IncrementDecrementExpression_6",new SCreator(IncrementDecrementExpression_6_factory));
 new Sfactory(this,"StateEvent",new SCreator(StateEvent_factory));
 new Sfactory(this,"Event_20",new SCreator(Event_20_factory));
 new Sfactory(this,"Event_23",new SCreator(Event_23_factory));
-new Sfactory(this,"Statement_1",new SCreator(Statement_1_factory));
+new Sfactory(this,"Event_24",new SCreator(Event_24_factory));
 new Sfactory(this,"Event_26",new SCreator(Event_26_factory));
 new Sfactory(this,"SimpleAssignment_10",new SCreator(SimpleAssignment_10_factory));
 new Sfactory(this,"Event",new SCreator(Event_factory));
@@ -11140,7 +11157,6 @@ new Sfactory(this,"SimpleAssignment",new SCreator(SimpleAssignment_factory));
 new Sfactory(this,"Statement_13",new SCreator(Statement_13_factory));
 new Sfactory(this,"Event_15",new SCreator(Event_15_factory));
 new Sfactory(this,"Event_16",new SCreator(Event_16_factory));
-new Sfactory(this,"Event_32",new SCreator(Event_32_factory));
 new Sfactory(this,"SimpleAssignment_20",new SCreator(SimpleAssignment_20_factory));
 new Sfactory(this,"SimpleAssignment_24",new SCreator(SimpleAssignment_24_factory));
 new Sfactory(this,"SimpleAssignment_1",new SCreator(SimpleAssignment_1_factory));
@@ -11169,12 +11185,14 @@ new Sfactory(this,"BinaryExpression_7",new SCreator(BinaryExpression_7_factory))
 new Sfactory(this,"ArgumentList",new SCreator(ArgumentList_factory));
 new Sfactory(this,"Event_10",new SCreator(Event_10_factory));
 new Sfactory(this,"ConstantExpression_1",new SCreator(ConstantExpression_1_factory));
-new Sfactory(this,"StateEntryStateEvent",new SCreator(StateEntryStateEvent_factory));
+new Sfactory(this,"Event_12",new SCreator(Event_12_factory));
 new Sfactory(this,"StateChange_2",new SCreator(StateChange_2_factory));
 new Sfactory(this,"Event_17",new SCreator(Event_17_factory));
 new Sfactory(this,"Event_18",new SCreator(Event_18_factory));
 new Sfactory(this,"Event_19",new SCreator(Event_19_factory));
 new Sfactory(this,"BinaryExpression_10",new SCreator(BinaryExpression_10_factory));
+new Sfactory(this,"VoidArgEvent_5",new SCreator(VoidArgEvent_5_factory));
+new Sfactory(this,"VoidArgEvent_7",new SCreator(VoidArgEvent_7_factory));
 new Sfactory(this,"StateEvent_1",new SCreator(StateEvent_1_factory));
 new Sfactory(this,"VectorConstant",new SCreator(VectorConstant_factory));
 new Sfactory(this,"EmptyStatement_1",new SCreator(EmptyStatement_1_factory));
@@ -11183,34 +11201,29 @@ new Sfactory(this,"TypecastExpression_6",new SCreator(TypecastExpression_6_facto
 new Sfactory(this,"TypecastExpression_7",new SCreator(TypecastExpression_7_factory));
 new Sfactory(this,"FunctionCall",new SCreator(FunctionCall_factory));
 new Sfactory(this,"Event_27",new SCreator(Event_27_factory));
-new Sfactory(this,"Event_28",new SCreator(Event_28_factory));
-new Sfactory(this,"Event_29",new SCreator(Event_29_factory));
 new Sfactory(this,"ListConstant_1",new SCreator(ListConstant_1_factory));
 new Sfactory(this,"Event_6",new SCreator(Event_6_factory));
 new Sfactory(this,"Declaration_1",new SCreator(Declaration_1_factory));
 new Sfactory(this,"SimpleAssignment_7",new SCreator(SimpleAssignment_7_factory));
 new Sfactory(this,"ForLoop",new SCreator(ForLoop_factory));
 new Sfactory(this,"ForLoop_2",new SCreator(ForLoop_2_factory));
-new Sfactory(this,"EntryEvent_1",new SCreator(EntryEvent_1_factory));
-new Sfactory(this,"Event_30",new SCreator(Event_30_factory));
-new Sfactory(this,"Event_31",new SCreator(Event_31_factory));
-new Sfactory(this,"Event_33",new SCreator(Event_33_factory));
 new Sfactory(this,"GlobalFunctionDefinition_1",new SCreator(GlobalFunctionDefinition_1_factory));
 new Sfactory(this,"JumpLabel_1",new SCreator(JumpLabel_1_factory));
 new Sfactory(this,"IfStatement",new SCreator(IfStatement_factory));
 new Sfactory(this,"ForLoopStatement_1",new SCreator(ForLoopStatement_1_factory));
 new Sfactory(this,"ForLoopStatement_2",new SCreator(ForLoopStatement_2_factory));
 new Sfactory(this,"ForLoopStatement_3",new SCreator(ForLoopStatement_3_factory));
-new Sfactory(this,"EntryEvent",new SCreator(EntryEvent_factory));
+new Sfactory(this,"ArgumentDeclarationList_4",new SCreator(ArgumentDeclarationList_4_factory));
 new Sfactory(this,"ArgumentDeclarationList_5",new SCreator(ArgumentDeclarationList_5_factory));
 new Sfactory(this,"WhileStatement",new SCreator(WhileStatement_factory));
 new Sfactory(this,"ForLoop_1",new SCreator(ForLoop_1_factory));
 new Sfactory(this,"Constant_2",new SCreator(Constant_2_factory));
-new Sfactory(this,"StatementList",new SCreator(StatementList_factory));
+new Sfactory(this,"VoidArgEvent",new SCreator(VoidArgEvent_factory));
 new Sfactory(this,"StateBody_2",new SCreator(StateBody_2_factory));
 new Sfactory(this,"WhileStatement_2",new SCreator(WhileStatement_2_factory));
 new Sfactory(this,"IdentExpression_1",new SCreator(IdentExpression_1_factory));
 new Sfactory(this,"States",new SCreator(States_factory));
+new Sfactory(this,"VoidArgStateEvent",new SCreator(VoidArgStateEvent_factory));
 }
 public static object ExpressionArgument_1_factory(Parser yyp) { return new ExpressionArgument_1(yyp); }
 public static object SimpleAssignment_8_factory(Parser yyp) { return new SimpleAssignment_8(yyp); }
@@ -11230,6 +11243,7 @@ public static object SimpleAssignment_19_factory(Parser yyp) { return new Simple
 public static object BinaryExpression_9_factory(Parser yyp) { return new BinaryExpression_9(yyp); }
 public static object VectorConstant_1_factory(Parser yyp) { return new VectorConstant_1(yyp); }
 public static object ParenthesisExpression_factory(Parser yyp) { return new ParenthesisExpression(yyp); }
+public static object StatementList_factory(Parser yyp) { return new StatementList(yyp); }
 public static object UnaryExpression_factory(Parser yyp) { return new UnaryExpression(yyp); }
 public static object IdentDotExpression_1_factory(Parser yyp) { return new IdentDotExpression_1(yyp); }
 public static object ArgumentList_4_factory(Parser yyp) { return new ArgumentList_4(yyp); }
@@ -11253,7 +11267,7 @@ public static object Event_4_factory(Parser yyp) { return new Event_4(yyp); }
 public static object Event_5_factory(Parser yyp) { return new Event_5(yyp); }
 public static object SimpleAssignment_5_factory(Parser yyp) { return new SimpleAssignment_5(yyp); }
 public static object Typename_1_factory(Parser yyp) { return new Typename_1(yyp); }
-public static object Typename_2_factory(Parser yyp) { return new Typename_2(yyp); }
+public static object VoidArgStateEvent_1_factory(Parser yyp) { return new VoidArgStateEvent_1(yyp); }
 public static object Typename_3_factory(Parser yyp) { return new Typename_3(yyp); }
 public static object Typename_4_factory(Parser yyp) { return new Typename_4(yyp); }
 public static object Typename_5_factory(Parser yyp) { return new Typename_5(yyp); }
@@ -11266,7 +11280,6 @@ public static object LSLProgramRoot_2_factory(Parser yyp) { return new LSLProgra
 public static object States_1_factory(Parser yyp) { return new States_1(yyp); }
 public static object States_2_factory(Parser yyp) { return new States_2(yyp); }
 public static object FunctionCallExpression_1_factory(Parser yyp) { return new FunctionCallExpression_1(yyp); }
-public static object Event_24_factory(Parser yyp) { return new Event_24(yyp); }
 public static object ForLoopStatement_factory(Parser yyp) { return new ForLoopStatement(yyp); }
 public static object DoWhileStatement_1_factory(Parser yyp) { return new DoWhileStatement_1(yyp); }
 public static object DoWhileStatement_2_factory(Parser yyp) { return new DoWhileStatement_2(yyp); }
@@ -11280,21 +11293,26 @@ public static object SimpleAssignment_17_factory(Parser yyp) { return new Simple
 public static object SimpleAssignment_18_factory(Parser yyp) { return new SimpleAssignment_18(yyp); }
 public static object JumpStatement_1_factory(Parser yyp) { return new JumpStatement_1(yyp); }
 public static object GlobalDefinitions_factory(Parser yyp) { return new GlobalDefinitions(yyp); }
+public static object VoidArgEvent_4_factory(Parser yyp) { return new VoidArgEvent_4(yyp); }
 public static object FunctionCall_1_factory(Parser yyp) { return new FunctionCall_1(yyp); }
 public static object ArgumentList_3_factory(Parser yyp) { return new ArgumentList_3(yyp); }
 public static object Assignment_2_factory(Parser yyp) { return new Assignment_2(yyp); }
+public static object VoidArgEvent_1_factory(Parser yyp) { return new VoidArgEvent_1(yyp); }
 public static object TypecastExpression_1_factory(Parser yyp) { return new TypecastExpression_1(yyp); }
 public static object SimpleAssignment_21_factory(Parser yyp) { return new SimpleAssignment_21(yyp); }
 public static object SimpleAssignment_22_factory(Parser yyp) { return new SimpleAssignment_22(yyp); }
 public static object SimpleAssignment_23_factory(Parser yyp) { return new SimpleAssignment_23(yyp); }
 public static object TypecastExpression_9_factory(Parser yyp) { return new TypecastExpression_9(yyp); }
+public static object VoidArgEvent_2_factory(Parser yyp) { return new VoidArgEvent_2(yyp); }
+public static object VoidArgEvent_3_factory(Parser yyp) { return new VoidArgEvent_3(yyp); }
 public static object ArgumentDeclarationList_1_factory(Parser yyp) { return new ArgumentDeclarationList_1(yyp); }
 public static object ArgumentDeclarationList_2_factory(Parser yyp) { return new ArgumentDeclarationList_2(yyp); }
-public static object ArgumentDeclarationList_3_factory(Parser yyp) { return new ArgumentDeclarationList_3(yyp); }
+public static object VoidArgEvent_6_factory(Parser yyp) { return new VoidArgEvent_6(yyp); }
 public static object GlobalDefinitions_1_factory(Parser yyp) { return new GlobalDefinitions_1(yyp); }
 public static object GlobalDefinitions_2_factory(Parser yyp) { return new GlobalDefinitions_2(yyp); }
 public static object IncrementDecrementExpression_factory(Parser yyp) { return new IncrementDecrementExpression(yyp); }
 public static object GlobalVariableDeclaration_factory(Parser yyp) { return new GlobalVariableDeclaration(yyp); }
+public static object ArgumentDeclarationList_3_factory(Parser yyp) { return new ArgumentDeclarationList_3(yyp); }
 public static object Event_11_factory(Parser yyp) { return new Event_11(yyp); }
 public static object TypecastExpression_2_factory(Parser yyp) { return new TypecastExpression_2(yyp); }
 public static object TypecastExpression_3_factory(Parser yyp) { return new TypecastExpression_3(yyp); }
@@ -11319,7 +11337,6 @@ public static object ArgumentList_1_factory(Parser yyp) { return new ArgumentLis
 public static object ArgumentList_2_factory(Parser yyp) { return new ArgumentList_2(yyp); }
 public static object Constant_factory(Parser yyp) { return new Constant(yyp); }
 public static object State_factory(Parser yyp) { return new State(yyp); }
-public static object Event_12_factory(Parser yyp) { return new Event_12(yyp); }
 public static object Event_13_factory(Parser yyp) { return new Event_13(yyp); }
 public static object Event_14_factory(Parser yyp) { return new Event_14(yyp); }
 public static object LSLProgramRoot_factory(Parser yyp) { return new LSLProgramRoot(yyp); }
@@ -11336,11 +11353,10 @@ public static object Event_21_factory(Parser yyp) { return new Event_21(yyp); }
 public static object Event_22_factory(Parser yyp) { return new Event_22(yyp); }
 public static object CompoundStatement_factory(Parser yyp) { return new CompoundStatement(yyp); }
 public static object RotationConstant_1_factory(Parser yyp) { return new RotationConstant_1(yyp); }
-public static object ArgumentDeclarationList_4_factory(Parser yyp) { return new ArgumentDeclarationList_4(yyp); }
 public static object TypecastExpression_factory(Parser yyp) { return new TypecastExpression(yyp); }
 public static object SimpleAssignment_3_factory(Parser yyp) { return new SimpleAssignment_3(yyp); }
 public static object SimpleAssignment_4_factory(Parser yyp) { return new SimpleAssignment_4(yyp); }
-public static object StateEntryStateEvent_1_factory(Parser yyp) { return new StateEntryStateEvent_1(yyp); }
+public static object Statement_1_factory(Parser yyp) { return new Statement_1(yyp); }
 public static object Statement_2_factory(Parser yyp) { return new Statement_2(yyp); }
 public static object Statement_3_factory(Parser yyp) { return new Statement_3(yyp); }
 public static object Statement_4_factory(Parser yyp) { return new Statement_4(yyp); }
@@ -11359,13 +11375,14 @@ public static object StateBody_factory(Parser yyp) { return new StateBody(yyp);
 public static object Event_7_factory(Parser yyp) { return new Event_7(yyp); }
 public static object Event_8_factory(Parser yyp) { return new Event_8(yyp); }
 public static object IncrementDecrementExpression_1_factory(Parser yyp) { return new IncrementDecrementExpression_1(yyp); }
+public static object Typename_2_factory(Parser yyp) { return new Typename_2(yyp); }
 public static object IncrementDecrementExpression_3_factory(Parser yyp) { return new IncrementDecrementExpression_3(yyp); }
 public static object IncrementDecrementExpression_4_factory(Parser yyp) { return new IncrementDecrementExpression_4(yyp); }
 public static object IncrementDecrementExpression_6_factory(Parser yyp) { return new IncrementDecrementExpression_6(yyp); }
 public static object StateEvent_factory(Parser yyp) { return new StateEvent(yyp); }
 public static object Event_20_factory(Parser yyp) { return new Event_20(yyp); }
 public static object Event_23_factory(Parser yyp) { return new Event_23(yyp); }
-public static object Statement_1_factory(Parser yyp) { return new Statement_1(yyp); }
+public static object Event_24_factory(Parser yyp) { return new Event_24(yyp); }
 public static object Event_26_factory(Parser yyp) { return new Event_26(yyp); }
 public static object SimpleAssignment_10_factory(Parser yyp) { return new SimpleAssignment_10(yyp); }
 public static object Event_factory(Parser yyp) { return new Event(yyp); }
@@ -11377,7 +11394,6 @@ public static object SimpleAssignment_factory(Parser yyp) { return new SimpleAss
 public static object Statement_13_factory(Parser yyp) { return new Statement_13(yyp); }
 public static object Event_15_factory(Parser yyp) { return new Event_15(yyp); }
 public static object Event_16_factory(Parser yyp) { return new Event_16(yyp); }
-public static object Event_32_factory(Parser yyp) { return new Event_32(yyp); }
 public static object SimpleAssignment_20_factory(Parser yyp) { return new SimpleAssignment_20(yyp); }
 public static object SimpleAssignment_24_factory(Parser yyp) { return new SimpleAssignment_24(yyp); }
 public static object SimpleAssignment_1_factory(Parser yyp) { return new SimpleAssignment_1(yyp); }
@@ -11406,12 +11422,14 @@ public static object BinaryExpression_7_factory(Parser yyp) { return new BinaryE
 public static object ArgumentList_factory(Parser yyp) { return new ArgumentList(yyp); }
 public static object Event_10_factory(Parser yyp) { return new Event_10(yyp); }
 public static object ConstantExpression_1_factory(Parser yyp) { return new ConstantExpression_1(yyp); }
-public static object StateEntryStateEvent_factory(Parser yyp) { return new StateEntryStateEvent(yyp); }
+public static object Event_12_factory(Parser yyp) { return new Event_12(yyp); }
 public static object StateChange_2_factory(Parser yyp) { return new StateChange_2(yyp); }
 public static object Event_17_factory(Parser yyp) { return new Event_17(yyp); }
 public static object Event_18_factory(Parser yyp) { return new Event_18(yyp); }
 public static object Event_19_factory(Parser yyp) { return new Event_19(yyp); }
 public static object BinaryExpression_10_factory(Parser yyp) { return new BinaryExpression_10(yyp); }
+public static object VoidArgEvent_5_factory(Parser yyp) { return new VoidArgEvent_5(yyp); }
+public static object VoidArgEvent_7_factory(Parser yyp) { return new VoidArgEvent_7(yyp); }
 public static object StateEvent_1_factory(Parser yyp) { return new StateEvent_1(yyp); }
 public static object VectorConstant_factory(Parser yyp) { return new VectorConstant(yyp); }
 public static object EmptyStatement_1_factory(Parser yyp) { return new EmptyStatement_1(yyp); }
@@ -11420,34 +11438,29 @@ public static object TypecastExpression_6_factory(Parser yyp) { return new Typec
 public static object TypecastExpression_7_factory(Parser yyp) { return new TypecastExpression_7(yyp); }
 public static object FunctionCall_factory(Parser yyp) { return new FunctionCall(yyp); }
 public static object Event_27_factory(Parser yyp) { return new Event_27(yyp); }
-public static object Event_28_factory(Parser yyp) { return new Event_28(yyp); }
-public static object Event_29_factory(Parser yyp) { return new Event_29(yyp); }
 public static object ListConstant_1_factory(Parser yyp) { return new ListConstant_1(yyp); }
 public static object Event_6_factory(Parser yyp) { return new Event_6(yyp); }
 public static object Declaration_1_factory(Parser yyp) { return new Declaration_1(yyp); }
 public static object SimpleAssignment_7_factory(Parser yyp) { return new SimpleAssignment_7(yyp); }
 public static object ForLoop_factory(Parser yyp) { return new ForLoop(yyp); }
 public static object ForLoop_2_factory(Parser yyp) { return new ForLoop_2(yyp); }
-public static object EntryEvent_1_factory(Parser yyp) { return new EntryEvent_1(yyp); }
-public static object Event_30_factory(Parser yyp) { return new Event_30(yyp); }
-public static object Event_31_factory(Parser yyp) { return new Event_31(yyp); }
-public static object Event_33_factory(Parser yyp) { return new Event_33(yyp); }
 public static object GlobalFunctionDefinition_1_factory(Parser yyp) { return new GlobalFunctionDefinition_1(yyp); }
 public static object JumpLabel_1_factory(Parser yyp) { return new JumpLabel_1(yyp); }
 public static object IfStatement_factory(Parser yyp) { return new IfStatement(yyp); }
 public static object ForLoopStatement_1_factory(Parser yyp) { return new ForLoopStatement_1(yyp); }
 public static object ForLoopStatement_2_factory(Parser yyp) { return new ForLoopStatement_2(yyp); }
 public static object ForLoopStatement_3_factory(Parser yyp) { return new ForLoopStatement_3(yyp); }
-public static object EntryEvent_factory(Parser yyp) { return new EntryEvent(yyp); }
+public static object ArgumentDeclarationList_4_factory(Parser yyp) { return new ArgumentDeclarationList_4(yyp); }
 public static object ArgumentDeclarationList_5_factory(Parser yyp) { return new ArgumentDeclarationList_5(yyp); }
 public static object WhileStatement_factory(Parser yyp) { return new WhileStatement(yyp); }
 public static object ForLoop_1_factory(Parser yyp) { return new ForLoop_1(yyp); }
 public static object Constant_2_factory(Parser yyp) { return new Constant_2(yyp); }
-public static object StatementList_factory(Parser yyp) { return new StatementList(yyp); }
+public static object VoidArgEvent_factory(Parser yyp) { return new VoidArgEvent(yyp); }
 public static object StateBody_2_factory(Parser yyp) { return new StateBody_2(yyp); }
 public static object WhileStatement_2_factory(Parser yyp) { return new WhileStatement_2(yyp); }
 public static object IdentExpression_1_factory(Parser yyp) { return new IdentExpression_1(yyp); }
 public static object States_factory(Parser yyp) { return new States(yyp); }
+public static object VoidArgStateEvent_factory(Parser yyp) { return new VoidArgStateEvent(yyp); }
 }
 public class LSLSyntax
 : Parser {
-- 
cgit v1.1


From edd7e1946372bc57bb49d0b6b65c546795ea896a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 16 Nov 2013 02:50:14 +0000
Subject: If anything other than a single integer is specified for events that
 only take a single integer, generate a syntax error on LSL script compile
 rather than an exception later on.

This applies to events changed, collision, collision_start, collision_end, on_rez, run_time_permissions, sensor, touch, touch_start, touch_end
---
 .../Shared/CodeTools/Tests/LSL_EventTests.cs       |   107 +-
 .../ScriptEngine/Shared/CodeTools/lsl.parser.cs    | 16897 ++++++++++---------
 2 files changed, 8725 insertions(+), 8279 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
index 6c51060..42d2d7b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
@@ -108,20 +108,123 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TestCompile("default { timer(integer n) {} }", true);
         }
 
+        [Test]
+        public void TestChangedEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("changed");
+        }  
+
+        [Test]
+        public void TestCollisionEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("collision");
+        }  
+
+        [Test]
+        public void TestCollisionStartEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("collision_start");
+        }  
+
+        [Test]
+        public void TestCollisionEndEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("collision_end");
+        }  
+
+        [Test]
+        public void TestOnRezEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("on_rez");
+        }  
+
+        [Test]
+        public void TestRunTimePermissionsEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("run_time_permissions");
+        }  
+
+        [Test]
+        public void TestSensorEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("sensor");
+        }  
+
+        [Test]
+        public void TestTouchEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("touch");
+        }  
+
+        [Test]
+        public void TestTouchStartEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("touch_start");
+        }            
+
+        [Test]
+        public void TestTouchEndEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntArgEvent("touch_end");
+        }           
+
+        private void TestIntArgEvent(string eventName)
+        {
+            TestCompile("default { " + eventName + "(integer n) {} }", false);
+            TestCompile("default { " + eventName + "{{}} }", true);
+            TestCompile("default { " + eventName + "(string s) {{}} }", true);
+            TestCompile("default { " + eventName + "(integer n, integer o) {{}} }", true);
+        }
+
         private void TestCompile(string script, bool expectException)
         {
             bool gotException = false;
+            Exception ge = null;
 
             try
             {
                 m_cg.Convert(script);
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 gotException = true;
+                ge = e;
             }
 
-            Assert.That(gotException, Is.EqualTo(expectException));
+            Assert.That(
+                gotException, 
+                Is.EqualTo(expectException), 
+                "Failed on {0}, exception {1}", script, ge != null ? ge.ToString() : "n/a");
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
index 96dcea9..3b1567f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
@@ -116,9 +116,9 @@ public class StateEvent : SYMBOL{
 )yyp)){ m_name = name ;
  kids . Add ( cs );
 }
- public  StateEvent (Parser yyp, string  name , ArgumentDeclarationList  dal , CompoundStatement  cs ):base(((LSLSyntax
+ public  StateEvent (Parser yyp, string  name , ArgumentDeclarationList  adl , CompoundStatement  cs ):base(((LSLSyntax
 )yyp)){ m_name = name ;
- if (0< dal . kids . Count ) kids . Add ( dal );
+ if (0< adl . kids . Count ) kids . Add ( adl );
  kids . Add ( cs );
 }
  public  override  string  ToString (){ return "EVENT<"+ m_name +">";
@@ -130,15 +130,23 @@ public class StateEvent : SYMBOL{
 public override string yyname { get { return "StateEvent"; }}
 public override int yynum { get { return 103; }}
 public StateEvent(Parser yyp):base(yyp){}}
-//%+VoidArgStateEvent+104
+//%+IntArgStateEvent+104
+public class IntArgStateEvent : StateEvent{
+ public  IntArgStateEvent (Parser yyp, string  name , IntArgumentDeclarationList  iadl , CompoundStatement  cs ):base(((LSLSyntax
+)yyp), name , iadl , cs ){}
+
+public override string yyname { get { return "IntArgStateEvent"; }}
+public override int yynum { get { return 104; }}
+public IntArgStateEvent(Parser yyp):base(yyp){}}
+//%+VoidArgStateEvent+105
 public class VoidArgStateEvent : StateEvent{
  public  VoidArgStateEvent (Parser yyp, string  name , CompoundStatement  cs ):base(((LSLSyntax
 )yyp), name , cs ){}
 
 public override string yyname { get { return "VoidArgStateEvent"; }}
-public override int yynum { get { return 104; }}
+public override int yynum { get { return 105; }}
 public VoidArgStateEvent(Parser yyp):base(yyp){}}
-//%+ArgumentDeclarationList+105
+//%+ArgumentDeclarationList+106
 public class ArgumentDeclarationList : SYMBOL{
  public  ArgumentDeclarationList (Parser yyp, Declaration  d ):base(((LSLSyntax
 )yyp)){ kids . Add ( d );
@@ -149,9 +157,17 @@ public class ArgumentDeclarationList : SYMBOL{
 }
 
 public override string yyname { get { return "ArgumentDeclarationList"; }}
-public override int yynum { get { return 105; }}
+public override int yynum { get { return 106; }}
 public ArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+Declaration+106
+//%+IntArgumentDeclarationList+107
+public class IntArgumentDeclarationList : ArgumentDeclarationList{
+ public  IntArgumentDeclarationList (Parser yyp, IntDeclaration  d ):base(((LSLSyntax
+)yyp), d ){}
+
+public override string yyname { get { return "IntArgumentDeclarationList"; }}
+public override int yynum { get { return 107; }}
+public IntArgumentDeclarationList(Parser yyp):base(yyp){}}
+//%+Declaration+108
 public class Declaration : SYMBOL{
  private  string  m_datatype ;
  private  string  m_id ;
@@ -171,9 +187,17 @@ public class Declaration : SYMBOL{
 }
 
 public override string yyname { get { return "Declaration"; }}
-public override int yynum { get { return 106; }}
+public override int yynum { get { return 108; }}
 public Declaration(Parser yyp):base(yyp){}}
-//%+Typename+107
+//%+IntDeclaration+109
+public class IntDeclaration : Declaration{
+ public  IntDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
+)yyp), type , id ){}
+
+public override string yyname { get { return "IntDeclaration"; }}
+public override int yynum { get { return 109; }}
+public IntDeclaration(Parser yyp):base(yyp){}}
+//%+Typename+110
 public class Typename : SYMBOL{
  public  string  yytext ;
  public  Typename (Parser yyp, string  text ):base(((LSLSyntax
@@ -181,9 +205,9 @@ public class Typename : SYMBOL{
 }
 
 public override string yyname { get { return "Typename"; }}
-public override int yynum { get { return 107; }}
+public override int yynum { get { return 110; }}
 public Typename(Parser yyp):base(yyp){}}
-//%+Event+108
+//%+Event+111
 public class Event : SYMBOL{
  public  string  yytext ;
  public  Event (Parser yyp, string  text ):base(((LSLSyntax
@@ -191,17 +215,25 @@ public class Event : SYMBOL{
 }
 
 public override string yyname { get { return "Event"; }}
-public override int yynum { get { return 108; }}
+public override int yynum { get { return 111; }}
 public Event(Parser yyp):base(yyp){}}
-//%+VoidArgEvent+109
+//%+IntArgEvent+112
+public class IntArgEvent : Event{
+ public  IntArgEvent (Parser yyp, string  text ):base(((LSLSyntax
+)yyp), text ){}
+
+public override string yyname { get { return "IntArgEvent"; }}
+public override int yynum { get { return 112; }}
+public IntArgEvent(Parser yyp):base(yyp){}}
+//%+VoidArgEvent+113
 public class VoidArgEvent : Event{
  public  VoidArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "VoidArgEvent"; }}
-public override int yynum { get { return 109; }}
+public override int yynum { get { return 113; }}
 public VoidArgEvent(Parser yyp):base(yyp){}}
-//%+CompoundStatement+110
+//%+CompoundStatement+114
 public class CompoundStatement : SYMBOL{
  public  CompoundStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -210,9 +242,9 @@ public class CompoundStatement : SYMBOL{
 }
 
 public override string yyname { get { return "CompoundStatement"; }}
-public override int yynum { get { return 110; }}
+public override int yynum { get { return 114; }}
 }
-//%+StatementList+111
+//%+StatementList+115
 public class StatementList : SYMBOL{
  private  void  AddStatement ( Statement  s ){ if ( s . kids . Top  is  IfStatement || s . kids . Top  is  WhileStatement || s . kids . Top  is  DoWhileStatement || s . kids . Top  is  ForLoop ) kids . Add ( s . kids . Pop ());
  else  kids . Add ( s );
@@ -226,9 +258,9 @@ public class StatementList : SYMBOL{
 }
 
 public override string yyname { get { return "StatementList"; }}
-public override int yynum { get { return 111; }}
+public override int yynum { get { return 115; }}
 public StatementList(Parser yyp):base(yyp){}}
-//%+Statement+112
+//%+Statement+116
 public class Statement : SYMBOL{
  public  Statement (Parser yyp, Declaration  d ):base(((LSLSyntax
 )yyp)){ kids . Add ( d );
@@ -274,9 +306,9 @@ public class Statement : SYMBOL{
 }
 
 public override string yyname { get { return "Statement"; }}
-public override int yynum { get { return 112; }}
+public override int yynum { get { return 116; }}
 public Statement(Parser yyp):base(yyp){}}
-//%+EmptyStatement+113
+//%+EmptyStatement+117
 public class EmptyStatement : SYMBOL{
  public  EmptyStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -284,9 +316,9 @@ public class EmptyStatement : SYMBOL{
 }
 
 public override string yyname { get { return "EmptyStatement"; }}
-public override int yynum { get { return 113; }}
+public override int yynum { get { return 117; }}
 }
-//%+Assignment+114
+//%+Assignment+118
 public class Assignment : SYMBOL{
  protected  string  m_assignmentType ;
  public  Assignment (Parser yyp, SYMBOL  lhs , SYMBOL  rhs , string  assignmentType ):base(((LSLSyntax
@@ -306,9 +338,9 @@ public class Assignment : SYMBOL{
 }
 
 public override string yyname { get { return "Assignment"; }}
-public override int yynum { get { return 114; }}
+public override int yynum { get { return 118; }}
 public Assignment(Parser yyp):base(yyp){}}
-//%+SimpleAssignment+115
+//%+SimpleAssignment+119
 public class SimpleAssignment : Assignment{
  public  SimpleAssignment (Parser yyp, SYMBOL  lhs , SYMBOL  rhs , string  assignmentType ):base(((LSLSyntax
 )yyp)){ m_assignmentType = assignmentType ;
@@ -318,9 +350,9 @@ public class SimpleAssignment : Assignment{
 }
 
 public override string yyname { get { return "SimpleAssignment"; }}
-public override int yynum { get { return 115; }}
+public override int yynum { get { return 119; }}
 public SimpleAssignment(Parser yyp):base(yyp){}}
-//%+ReturnStatement+116
+//%+ReturnStatement+120
 public class ReturnStatement : SYMBOL{
  public  ReturnStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -330,9 +362,9 @@ public class ReturnStatement : SYMBOL{
 }
 
 public override string yyname { get { return "ReturnStatement"; }}
-public override int yynum { get { return 116; }}
+public override int yynum { get { return 120; }}
 }
-//%+JumpLabel+117
+//%+JumpLabel+121
 public class JumpLabel : SYMBOL{
  private  string  m_labelName ;
  public  JumpLabel (Parser yyp, string  labelName ):base(((LSLSyntax
@@ -345,9 +377,9 @@ public class JumpLabel : SYMBOL{
 }
 
 public override string yyname { get { return "JumpLabel"; }}
-public override int yynum { get { return 117; }}
+public override int yynum { get { return 121; }}
 public JumpLabel(Parser yyp):base(yyp){}}
-//%+JumpStatement+118
+//%+JumpStatement+122
 public class JumpStatement : SYMBOL{
  private  string  m_targetName ;
  public  JumpStatement (Parser yyp, string  targetName ):base(((LSLSyntax
@@ -360,9 +392,9 @@ public class JumpStatement : SYMBOL{
 }
 
 public override string yyname { get { return "JumpStatement"; }}
-public override int yynum { get { return 118; }}
+public override int yynum { get { return 122; }}
 public JumpStatement(Parser yyp):base(yyp){}}
-//%+StateChange+119
+//%+StateChange+123
 public class StateChange : SYMBOL{
  private  string  m_newState ;
  public  StateChange (Parser yyp, string  newState ):base(((LSLSyntax
@@ -373,9 +405,9 @@ public class StateChange : SYMBOL{
 }
 
 public override string yyname { get { return "StateChange"; }}
-public override int yynum { get { return 119; }}
+public override int yynum { get { return 123; }}
 public StateChange(Parser yyp):base(yyp){}}
-//%+IfStatement+120
+//%+IfStatement+124
 public class IfStatement : SYMBOL{
  private  void  AddStatement ( Statement  s ){ if (0< s . kids . Count && s . kids . Top  is  CompoundStatement ) kids . Add ( s . kids . Pop ());
  else  kids . Add ( s );
@@ -392,9 +424,9 @@ public class IfStatement : SYMBOL{
 }
 
 public override string yyname { get { return "IfStatement"; }}
-public override int yynum { get { return 120; }}
+public override int yynum { get { return 124; }}
 public IfStatement(Parser yyp):base(yyp){}}
-//%+WhileStatement+121
+//%+WhileStatement+125
 public class WhileStatement : SYMBOL{
  public  WhileStatement (Parser yyp, SYMBOL  s , Statement  st ):base(((LSLSyntax
 )yyp)){ kids . Add ( s );
@@ -403,9 +435,9 @@ public class WhileStatement : SYMBOL{
 }
 
 public override string yyname { get { return "WhileStatement"; }}
-public override int yynum { get { return 121; }}
+public override int yynum { get { return 125; }}
 public WhileStatement(Parser yyp):base(yyp){}}
-//%+DoWhileStatement+122
+//%+DoWhileStatement+126
 public class DoWhileStatement : SYMBOL{
  public  DoWhileStatement (Parser yyp, SYMBOL  s , Statement  st ):base(((LSLSyntax
 )yyp)){ if (0< st . kids . Count && st . kids . Top  is  CompoundStatement ) kids . Add ( st . kids . Pop ());
@@ -414,9 +446,9 @@ public class DoWhileStatement : SYMBOL{
 }
 
 public override string yyname { get { return "DoWhileStatement"; }}
-public override int yynum { get { return 122; }}
+public override int yynum { get { return 126; }}
 public DoWhileStatement(Parser yyp):base(yyp){}}
-//%+ForLoop+123
+//%+ForLoop+127
 public class ForLoop : SYMBOL{
  public  ForLoop (Parser yyp, ForLoopStatement  flsa , Expression  e , ForLoopStatement  flsb , Statement  s ):base(((LSLSyntax
 )yyp)){ kids . Add ( flsa );
@@ -427,9 +459,9 @@ public class ForLoop : SYMBOL{
 }
 
 public override string yyname { get { return "ForLoop"; }}
-public override int yynum { get { return 123; }}
+public override int yynum { get { return 127; }}
 public ForLoop(Parser yyp):base(yyp){}}
-//%+ForLoopStatement+124
+//%+ForLoopStatement+128
 public class ForLoopStatement : SYMBOL{
  public  ForLoopStatement (Parser yyp, Expression  e ):base(((LSLSyntax
 )yyp)){ kids . Add ( e );
@@ -447,9 +479,9 @@ public class ForLoopStatement : SYMBOL{
 }
 
 public override string yyname { get { return "ForLoopStatement"; }}
-public override int yynum { get { return 124; }}
+public override int yynum { get { return 128; }}
 public ForLoopStatement(Parser yyp):base(yyp){}}
-//%+FunctionCall+125
+//%+FunctionCall+129
 public class FunctionCall : SYMBOL{
  private  string  m_id ;
  public  FunctionCall (Parser yyp, string  id , ArgumentList  al ):base(((LSLSyntax
@@ -463,9 +495,9 @@ public class FunctionCall : SYMBOL{
 }
 
 public override string yyname { get { return "FunctionCall"; }}
-public override int yynum { get { return 125; }}
+public override int yynum { get { return 129; }}
 public FunctionCall(Parser yyp):base(yyp){}}
-//%+ArgumentList+126
+//%+ArgumentList+130
 public class ArgumentList : SYMBOL{
  public  ArgumentList (Parser yyp, Argument  a ):base(((LSLSyntax
 )yyp)){ AddArgument ( a );
@@ -479,14 +511,14 @@ public class ArgumentList : SYMBOL{
 }
 
 public override string yyname { get { return "ArgumentList"; }}
-public override int yynum { get { return 126; }}
+public override int yynum { get { return 130; }}
 public ArgumentList(Parser yyp):base(yyp){}}
-//%+Argument+127
+//%+Argument+131
 public class Argument : SYMBOL{
 public override string yyname { get { return "Argument"; }}
-public override int yynum { get { return 127; }}
+public override int yynum { get { return 131; }}
 public Argument(Parser yyp):base(yyp){}}
-//%+ExpressionArgument+128
+//%+ExpressionArgument+132
 public class ExpressionArgument : Argument{
  public  ExpressionArgument (Parser yyp, Expression  e ):base(((LSLSyntax
 )yyp)){ if ( e  is  ConstantExpression ) while (0< e . kids . Count ) kids . Add ( e . kids . Pop ());
@@ -494,9 +526,9 @@ public class ExpressionArgument : Argument{
 }
 
 public override string yyname { get { return "ExpressionArgument"; }}
-public override int yynum { get { return 128; }}
+public override int yynum { get { return 132; }}
 public ExpressionArgument(Parser yyp):base(yyp){}}
-//%+Constant+129
+//%+Constant+133
 public class Constant : SYMBOL{
  private  string  m_type ;
  private  string  m_val ;
@@ -518,9 +550,9 @@ public class Constant : SYMBOL{
 }
 
 public override string yyname { get { return "Constant"; }}
-public override int yynum { get { return 129; }}
+public override int yynum { get { return 133; }}
 public Constant(Parser yyp):base(yyp){}}
-//%+VectorConstant+130
+//%+VectorConstant+134
 public class VectorConstant : Constant{
  public  VectorConstant (Parser yyp, Expression  valX , Expression  valY , Expression  valZ ):base(((LSLSyntax
 )yyp),"vector", null ){ kids . Add ( valX );
@@ -529,9 +561,9 @@ public class VectorConstant : Constant{
 }
 
 public override string yyname { get { return "VectorConstant"; }}
-public override int yynum { get { return 130; }}
+public override int yynum { get { return 134; }}
 public VectorConstant(Parser yyp):base(yyp){}}
-//%+RotationConstant+131
+//%+RotationConstant+135
 public class RotationConstant : Constant{
  public  RotationConstant (Parser yyp, Expression  valX , Expression  valY , Expression  valZ , Expression  valS ):base(((LSLSyntax
 )yyp),"rotation", null ){ kids . Add ( valX );
@@ -541,36 +573,36 @@ public class RotationConstant : Constant{
 }
 
 public override string yyname { get { return "RotationConstant"; }}
-public override int yynum { get { return 131; }}
+public override int yynum { get { return 135; }}
 public RotationConstant(Parser yyp):base(yyp){}}
-//%+ListConstant+132
+//%+ListConstant+136
 public class ListConstant : Constant{
  public  ListConstant (Parser yyp, ArgumentList  al ):base(((LSLSyntax
 )yyp),"list", null ){ kids . Add ( al );
 }
 
 public override string yyname { get { return "ListConstant"; }}
-public override int yynum { get { return 132; }}
+public override int yynum { get { return 136; }}
 public ListConstant(Parser yyp):base(yyp){}}
-//%+Expression+133
+//%+Expression+137
 public class Expression : SYMBOL{
  protected  void  AddExpression ( Expression  e ){ if ( e  is  ConstantExpression ) while (0< e . kids . Count ) kids . Add ( e . kids . Pop ());
  else  kids . Add ( e );
 }
 
 public override string yyname { get { return "Expression"; }}
-public override int yynum { get { return 133; }}
+public override int yynum { get { return 137; }}
 public Expression(Parser yyp):base(yyp){}}
-//%+ConstantExpression+134
+//%+ConstantExpression+138
 public class ConstantExpression : Expression{
  public  ConstantExpression (Parser yyp, Constant  c ):base(((LSLSyntax
 )yyp)){ kids . Add ( c );
 }
 
 public override string yyname { get { return "ConstantExpression"; }}
-public override int yynum { get { return 134; }}
+public override int yynum { get { return 138; }}
 public ConstantExpression(Parser yyp):base(yyp){}}
-//%+IdentExpression+135
+//%+IdentExpression+139
 public class IdentExpression : Expression{
  protected  string  m_name ;
  public  IdentExpression (Parser yyp, string  name ):base(((LSLSyntax
@@ -583,9 +615,9 @@ public class IdentExpression : Expression{
 }
 
 public override string yyname { get { return "IdentExpression"; }}
-public override int yynum { get { return 135; }}
+public override int yynum { get { return 139; }}
 public IdentExpression(Parser yyp):base(yyp){}}
-//%+IdentDotExpression+136
+//%+IdentDotExpression+140
 public class IdentDotExpression : IdentExpression{
  private  string  m_member ;
  public  IdentDotExpression (Parser yyp, string  name , string  member ):base(((LSLSyntax
@@ -599,18 +631,18 @@ public class IdentDotExpression : IdentExpression{
 }
 
 public override string yyname { get { return "IdentDotExpression"; }}
-public override int yynum { get { return 136; }}
+public override int yynum { get { return 140; }}
 public IdentDotExpression(Parser yyp):base(yyp){}}
-//%+FunctionCallExpression+137
+//%+FunctionCallExpression+141
 public class FunctionCallExpression : Expression{
  public  FunctionCallExpression (Parser yyp, FunctionCall  fc ):base(((LSLSyntax
 )yyp)){ kids . Add ( fc );
 }
 
 public override string yyname { get { return "FunctionCallExpression"; }}
-public override int yynum { get { return 137; }}
+public override int yynum { get { return 141; }}
 public FunctionCallExpression(Parser yyp):base(yyp){}}
-//%+BinaryExpression+138
+//%+BinaryExpression+142
 public class BinaryExpression : Expression{
  private  string  m_expressionSymbol ;
  public  BinaryExpression (Parser yyp, Expression  lhs , Expression  rhs , string  expressionSymbol ):base(((LSLSyntax
@@ -625,9 +657,9 @@ public class BinaryExpression : Expression{
 }
 
 public override string yyname { get { return "BinaryExpression"; }}
-public override int yynum { get { return 138; }}
+public override int yynum { get { return 142; }}
 public BinaryExpression(Parser yyp):base(yyp){}}
-//%+UnaryExpression+139
+//%+UnaryExpression+143
 public class UnaryExpression : Expression{
  private  string  m_unarySymbol ;
  public  UnaryExpression (Parser yyp, string  unarySymbol , Expression  e ):base(((LSLSyntax
@@ -641,9 +673,9 @@ public class UnaryExpression : Expression{
 }
 
 public override string yyname { get { return "UnaryExpression"; }}
-public override int yynum { get { return 139; }}
+public override int yynum { get { return 143; }}
 public UnaryExpression(Parser yyp):base(yyp){}}
-//%+TypecastExpression+140
+//%+TypecastExpression+144
 public class TypecastExpression : Expression{
  private  string  m_typecastType ;
  public  TypecastExpression (Parser yyp, string  typecastType , SYMBOL  rhs ):base(((LSLSyntax
@@ -657,18 +689,18 @@ public class TypecastExpression : Expression{
 }
 
 public override string yyname { get { return "TypecastExpression"; }}
-public override int yynum { get { return 140; }}
+public override int yynum { get { return 144; }}
 public TypecastExpression(Parser yyp):base(yyp){}}
-//%+ParenthesisExpression+141
+//%+ParenthesisExpression+145
 public class ParenthesisExpression : Expression{
  public  ParenthesisExpression (Parser yyp, SYMBOL  s ):base(((LSLSyntax
 )yyp)){ kids . Add ( s );
 }
 
 public override string yyname { get { return "ParenthesisExpression"; }}
-public override int yynum { get { return 141; }}
+public override int yynum { get { return 145; }}
 public ParenthesisExpression(Parser yyp):base(yyp){}}
-//%+IncrementDecrementExpression+142
+//%+IncrementDecrementExpression+146
 public class IncrementDecrementExpression : Expression{
  private  string  m_name ;
  private  string  m_operation ;
@@ -696,7 +728,7 @@ public class IncrementDecrementExpression : Expression{
 }
 
 public override string yyname { get { return "IncrementDecrementExpression"; }}
-public override int yynum { get { return 142; }}
+public override int yynum { get { return 146; }}
 public IncrementDecrementExpression(Parser yyp):base(yyp){}}
 
 public class LSLProgramRoot_1 : LSLProgramRoot {
@@ -810,13 +842,25 @@ public class StateBody_2 : StateBody {
 
 public class StateBody_3 : StateBody {
   public StateBody_3(Parser yyq):base(yyq,
-	((VoidArgStateEvent)(yyq.StackAt(0).m_value))
+	((IntArgStateEvent)(yyq.StackAt(0).m_value))
 	){}}
 
 public class StateBody_4 : StateBody {
   public StateBody_4(Parser yyq):base(yyq,
 	((StateBody)(yyq.StackAt(1).m_value))
 	, 
+	((IntArgStateEvent)(yyq.StackAt(0).m_value))
+	){}}
+
+public class StateBody_5 : StateBody {
+  public StateBody_5(Parser yyq):base(yyq,
+	((VoidArgStateEvent)(yyq.StackAt(0).m_value))
+	){}}
+
+public class StateBody_6 : StateBody {
+  public StateBody_6(Parser yyq):base(yyq,
+	((StateBody)(yyq.StackAt(1).m_value))
+	, 
 	((VoidArgStateEvent)(yyq.StackAt(0).m_value))
 	){}}
 
@@ -829,6 +873,15 @@ public class StateEvent_1 : StateEvent {
 	((CompoundStatement)(yyq.StackAt(0).m_value))
 	){}}
 
+public class IntArgStateEvent_1 : IntArgStateEvent {
+  public IntArgStateEvent_1(Parser yyq):base(yyq,
+	((IntArgEvent)(yyq.StackAt(4).m_value))
+	.yytext, 
+	((IntArgumentDeclarationList)(yyq.StackAt(2).m_value))
+	, 
+	((CompoundStatement)(yyq.StackAt(0).m_value))
+	){}}
+
 public class VoidArgStateEvent_1 : VoidArgStateEvent {
   public VoidArgStateEvent_1(Parser yyq):base(yyq,
 	((VoidArgEvent)(yyq.StackAt(3).m_value))
@@ -848,6 +901,18 @@ public class ArgumentDeclarationList_2 : ArgumentDeclarationList {
 	((Declaration)(yyq.StackAt(0).m_value))
 	){}}
 
+public class IntArgumentDeclarationList_1 : IntArgumentDeclarationList {
+  public IntArgumentDeclarationList_1(Parser yyq):base(yyq,
+	((IntDeclaration)(yyq.StackAt(0).m_value))
+	){}}
+
+public class IntDeclaration_1 : IntDeclaration {
+  public IntDeclaration_1(Parser yyq):base(yyq,
+	((INTEGER_TYPE)(yyq.StackAt(1).m_value))
+	.yytext, 
+	((IDENT)(yyq.StackAt(0).m_value))
+	.yytext){}}
+
 public class Declaration_1 : Declaration {
   public Declaration_1(Parser yyq):base(yyq,
 	((Typename)(yyq.StackAt(1).m_value))
@@ -1830,124 +1895,124 @@ public class Event_3 : Event {
 
 public class Event_4 : Event {
   public Event_4(Parser yyq):base(yyq,
-	((CHANGED_EVENT)(yyq.StackAt(0).m_value))
+	((CONTROL_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_5 : Event {
   public Event_5(Parser yyq):base(yyq,
-	((COLLISION_EVENT)(yyq.StackAt(0).m_value))
+	((DATASERVER_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_6 : Event {
   public Event_6(Parser yyq):base(yyq,
-	((COLLISION_END_EVENT)(yyq.StackAt(0).m_value))
+	((EMAIL_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_7 : Event {
   public Event_7(Parser yyq):base(yyq,
-	((COLLISION_START_EVENT)(yyq.StackAt(0).m_value))
+	((HTTP_RESPONSE_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_8 : Event {
   public Event_8(Parser yyq):base(yyq,
-	((CONTROL_EVENT)(yyq.StackAt(0).m_value))
+	((LAND_COLLISION_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_9 : Event {
   public Event_9(Parser yyq):base(yyq,
-	((DATASERVER_EVENT)(yyq.StackAt(0).m_value))
+	((LAND_COLLISION_END_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_10 : Event {
   public Event_10(Parser yyq):base(yyq,
-	((EMAIL_EVENT)(yyq.StackAt(0).m_value))
+	((LAND_COLLISION_START_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_11 : Event {
   public Event_11(Parser yyq):base(yyq,
-	((HTTP_RESPONSE_EVENT)(yyq.StackAt(0).m_value))
+	((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_12 : Event {
   public Event_12(Parser yyq):base(yyq,
-	((LAND_COLLISION_EVENT)(yyq.StackAt(0).m_value))
+	((LISTEN_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_13 : Event {
   public Event_13(Parser yyq):base(yyq,
-	((LAND_COLLISION_END_EVENT)(yyq.StackAt(0).m_value))
+	((MONEY_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_14 : Event {
   public Event_14(Parser yyq):base(yyq,
-	((LAND_COLLISION_START_EVENT)(yyq.StackAt(0).m_value))
+	((NO_SENSOR_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_15 : Event {
   public Event_15(Parser yyq):base(yyq,
-	((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value))
+	((OBJECT_REZ_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_16 : Event {
   public Event_16(Parser yyq):base(yyq,
-	((LISTEN_EVENT)(yyq.StackAt(0).m_value))
+	((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_17 : Event {
   public Event_17(Parser yyq):base(yyq,
-	((MONEY_EVENT)(yyq.StackAt(0).m_value))
+	((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_18 : Event {
-  public Event_18(Parser yyq):base(yyq,
-	((NO_SENSOR_EVENT)(yyq.StackAt(0).m_value))
+public class IntArgEvent_1 : IntArgEvent {
+  public IntArgEvent_1(Parser yyq):base(yyq,
+	((CHANGED_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_19 : Event {
-  public Event_19(Parser yyq):base(yyq,
-	((OBJECT_REZ_EVENT)(yyq.StackAt(0).m_value))
+public class IntArgEvent_2 : IntArgEvent {
+  public IntArgEvent_2(Parser yyq):base(yyq,
+	((COLLISION_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_20 : Event {
-  public Event_20(Parser yyq):base(yyq,
-	((ON_REZ_EVENT)(yyq.StackAt(0).m_value))
+public class IntArgEvent_3 : IntArgEvent {
+  public IntArgEvent_3(Parser yyq):base(yyq,
+	((COLLISION_END_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_21 : Event {
-  public Event_21(Parser yyq):base(yyq,
-	((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value))
+public class IntArgEvent_4 : IntArgEvent {
+  public IntArgEvent_4(Parser yyq):base(yyq,
+	((COLLISION_START_EVENT)(yyq.StackAt(0).m_value))
+	.yytext){}}
+
+public class IntArgEvent_5 : IntArgEvent {
+  public IntArgEvent_5(Parser yyq):base(yyq,
+	((ON_REZ_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_22 : Event {
-  public Event_22(Parser yyq):base(yyq,
+public class IntArgEvent_6 : IntArgEvent {
+  public IntArgEvent_6(Parser yyq):base(yyq,
 	((RUN_TIME_PERMISSIONS_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_23 : Event {
-  public Event_23(Parser yyq):base(yyq,
+public class IntArgEvent_7 : IntArgEvent {
+  public IntArgEvent_7(Parser yyq):base(yyq,
 	((SENSOR_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_24 : Event {
-  public Event_24(Parser yyq):base(yyq,
+public class IntArgEvent_8 : IntArgEvent {
+  public IntArgEvent_8(Parser yyq):base(yyq,
 	((TOUCH_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_25 : Event {
-  public Event_25(Parser yyq):base(yyq,
+public class IntArgEvent_9 : IntArgEvent {
+  public IntArgEvent_9(Parser yyq):base(yyq,
 	((TOUCH_END_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_26 : Event {
-  public Event_26(Parser yyq):base(yyq,
+public class IntArgEvent_10 : IntArgEvent {
+  public IntArgEvent_10(Parser yyq):base(yyq,
 	((TOUCH_START_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_27 : Event {
-  public Event_27(Parser yyq):base(yyq,
-	((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value))
-	.yytext){}}
-
 public class VoidArgEvent_1 : VoidArgEvent {
   public VoidArgEvent_1(Parser yyq):base(yyq,
 	((STATE_ENTRY_EVENT)(yyq.StackAt(0).m_value))
@@ -2014,9 +2079,9 @@ public yyLSLSyntax
 97,0,109,0,82,
 0,111,0,111,0,
 116,0,1,96,1,
-2,104,18,1,2729,
+2,104,18,1,2745,
 102,2,0,105,5,
-326,1,0,106,18,
+336,1,0,106,18,
 1,0,0,2,0,
 1,1,107,18,1,
 1,108,20,109,4,
@@ -2077,7 +2142,7 @@ public yyLSLSyntax
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,1,
-107,1,2,2,0,
+110,1,2,2,0,
 1,9,131,18,1,
 9,132,20,133,4,
 10,73,0,68,0,
@@ -2106,7 +2171,7 @@ public yyLSLSyntax
 105,0,111,0,110,
 0,76,0,105,0,
 115,0,116,0,1,
-105,1,2,2,0,
+106,1,2,2,0,
 1,21,142,18,1,
 21,143,20,144,4,
 10,67,0,79,0,
@@ -2121,709 +2186,721 @@ public yyLSLSyntax
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,124,1,2,2,
+1,128,1,2,2,
 0,1,1695,148,18,
 1,1695,143,2,0,
-1,2645,149,18,1,
-2645,150,20,151,4,
-22,82,0,73,0,
-71,0,72,0,84,
-0,95,0,66,0,
-82,0,65,0,67,
-0,69,0,1,13,
-1,1,2,0,1,
-2727,152,18,1,2727,
-153,20,154,4,48,
-71,0,108,0,111,
-0,98,0,97,0,
-108,0,70,0,117,
-0,110,0,99,0,
-116,0,105,0,111,
-0,110,0,68,0,
-101,0,102,0,105,
-0,110,0,105,0,
+1,30,149,18,1,
+30,150,20,151,4,
+22,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
 116,0,105,0,111,
-0,110,0,1,99,
+0,110,0,1,108,
 1,2,2,0,1,
-30,155,18,1,30,
-156,20,157,4,22,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
+31,152,18,1,31,
+153,20,154,4,22,
+82,0,73,0,71,
+0,72,0,84,0,
+95,0,80,0,65,
+0,82,0,69,0,
+78,0,1,17,1,
+1,2,0,1,32,
+155,18,1,32,156,
+20,157,4,20,76,
+0,69,0,70,0,
+84,0,95,0,66,
+0,82,0,65,0,
+67,0,69,0,1,
+12,1,1,2,0,
+1,1114,158,18,1,
+1114,132,2,0,1,
+1152,159,18,1,1152,
+160,20,161,4,32,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,1,119,1,
+2,2,0,1,1117,
+162,18,1,1117,163,
+20,164,4,28,80,
+0,69,0,82,0,
+67,0,69,0,78,
+0,84,0,95,0,
+69,0,81,0,85,
+0,65,0,76,0,
+83,0,1,10,1,
+1,2,0,1,40,
+165,18,1,40,132,
+2,0,1,41,166,
+18,1,41,135,2,
+0,1,42,167,18,
+1,42,168,20,169,
+4,20,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
 0,105,0,111,0,
-110,0,1,106,1,
-2,2,0,1,31,
-158,18,1,31,159,
-20,160,4,22,82,
+110,0,1,137,1,
+2,2,0,1,43,
+170,18,1,43,171,
+20,172,4,22,82,
 0,73,0,71,0,
 72,0,84,0,95,
-0,80,0,65,0,
-82,0,69,0,78,
-0,1,17,1,1,
-2,0,1,32,161,
-18,1,32,162,20,
-163,4,20,76,0,
-69,0,70,0,84,
-0,95,0,66,0,
-82,0,65,0,67,
-0,69,0,1,12,
+0,83,0,72,0,
+73,0,70,0,84,
+0,1,41,1,1,
+2,0,1,44,173,
+18,1,44,132,2,
+0,1,1159,174,18,
+1,1159,168,2,0,
+1,46,175,18,1,
+46,176,20,177,4,
+12,80,0,69,0,
+82,0,73,0,79,
+0,68,0,1,24,
 1,1,2,0,1,
-2651,164,18,1,2651,
-165,20,166,4,10,
-83,0,116,0,97,
-0,116,0,101,0,
-1,101,1,2,2,
-0,1,1114,167,18,
-1,1114,132,2,0,
-1,1152,168,18,1,
-1152,169,20,170,4,
-32,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,1,115,
-1,2,2,0,1,
-1117,171,18,1,1117,
-172,20,173,4,28,
-80,0,69,0,82,
-0,67,0,69,0,
-78,0,84,0,95,
+47,178,18,1,47,
+132,2,0,1,48,
+179,18,1,48,180,
+20,181,4,18,68,
+0,69,0,67,0,
+82,0,69,0,77,
+0,69,0,78,0,
+84,0,1,5,1,
+1,2,0,1,49,
+182,18,1,49,183,
+20,184,4,18,73,
+0,78,0,67,0,
+82,0,69,0,77,
+0,69,0,78,0,
+84,0,1,4,1,
+1,2,0,1,50,
+185,18,1,50,180,
+2,0,1,51,186,
+18,1,51,183,2,
+0,1,52,187,18,
+1,52,135,2,0,
+1,2281,188,18,1,
+2281,160,2,0,1,
+2669,189,18,1,2669,
+132,2,0,1,1730,
+190,18,1,1730,160,
+2,0,1,1731,191,
+18,1,1731,192,20,
+193,4,18,83,0,
+69,0,77,0,73,
+0,67,0,79,0,
+76,0,79,0,78,
+0,1,11,1,1,
+2,0,1,61,194,
+18,1,61,129,2,
+0,1,62,195,18,
+1,62,153,2,0,
+1,63,196,18,1,
+63,132,2,0,1,
+65,197,18,1,65,
+176,2,0,1,66,
+198,18,1,66,132,
+2,0,1,67,199,
+18,1,67,180,2,
+0,1,68,200,18,
+1,68,183,2,0,
+1,69,201,18,1,
+69,180,2,0,1,
+70,202,18,1,70,
+183,2,0,1,71,
+203,18,1,71,135,
+2,0,1,73,204,
+18,1,73,168,2,
+0,1,74,205,18,
+1,74,153,2,0,
+1,1189,206,18,1,
+1189,207,20,208,4,
+22,83,0,84,0,
+65,0,82,0,95,
 0,69,0,81,0,
 85,0,65,0,76,
-0,83,0,1,10,
-1,1,2,0,1,
-40,174,18,1,40,
-132,2,0,1,41,
-175,18,1,41,135,
-2,0,1,42,176,
-18,1,42,177,20,
-178,4,20,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,133,
-1,2,2,0,1,
-43,179,18,1,43,
-180,20,181,4,22,
-82,0,73,0,71,
-0,72,0,84,0,
-95,0,83,0,72,
-0,73,0,70,0,
-84,0,1,41,1,
-1,2,0,1,44,
-182,18,1,44,132,
-2,0,1,1159,183,
-18,1,1159,177,2,
-0,1,46,184,18,
-1,46,185,20,186,
-4,12,80,0,69,
-0,82,0,73,0,
-79,0,68,0,1,
-24,1,1,2,0,
-1,47,187,18,1,
-47,132,2,0,1,
-48,188,18,1,48,
-189,20,190,4,18,
-68,0,69,0,67,
-0,82,0,69,0,
-77,0,69,0,78,
-0,84,0,1,5,
+0,83,0,1,8,
 1,1,2,0,1,
-49,191,18,1,49,
-192,20,193,4,18,
-73,0,78,0,67,
-0,82,0,69,0,
-77,0,69,0,78,
-0,84,0,1,4,
+76,209,18,1,76,
+210,20,211,4,20,
+76,0,69,0,70,
+0,84,0,95,0,
+83,0,72,0,73,
+0,70,0,84,0,
+1,40,1,1,2,
+0,1,1153,212,18,
+1,1153,213,20,214,
+4,24,83,0,76,
+0,65,0,83,0,
+72,0,95,0,69,
+0,81,0,85,0,
+65,0,76,0,83,
+0,1,9,1,1,
+2,0,1,79,215,
+18,1,79,216,20,
+217,4,10,84,0,
+73,0,76,0,68,
+0,69,0,1,36,
 1,1,2,0,1,
-50,194,18,1,50,
-189,2,0,1,51,
-195,18,1,51,192,
-2,0,1,52,196,
-18,1,52,135,2,
-0,1,2281,197,18,
-1,2281,169,2,0,
-1,2669,198,18,1,
-2669,156,2,0,1,
-1730,199,18,1,1730,
-169,2,0,1,1731,
-200,18,1,1731,201,
-20,202,4,18,83,
-0,69,0,77,0,
-73,0,67,0,79,
-0,76,0,79,0,
-78,0,1,11,1,
-1,2,0,1,61,
-203,18,1,61,129,
-2,0,1,62,204,
-18,1,62,159,2,
-0,1,63,205,18,
-1,63,132,2,0,
-1,65,206,18,1,
-65,185,2,0,1,
-66,207,18,1,66,
-132,2,0,1,67,
-208,18,1,67,189,
-2,0,1,68,209,
-18,1,68,192,2,
-0,1,69,210,18,
-1,69,189,2,0,
-1,70,211,18,1,
-70,192,2,0,1,
-71,212,18,1,71,
-135,2,0,1,73,
-213,18,1,73,177,
-2,0,1,74,214,
-18,1,74,159,2,
-0,1,1189,215,18,
-1,1189,216,20,217,
-4,22,83,0,84,
-0,65,0,82,0,
-95,0,69,0,81,
-0,85,0,65,0,
-76,0,83,0,1,
-8,1,1,2,0,
-1,76,218,18,1,
-76,219,20,220,4,
-20,76,0,69,0,
-70,0,84,0,95,
-0,83,0,72,0,
-73,0,70,0,84,
-0,1,40,1,1,
-2,0,1,1153,221,
-18,1,1153,222,20,
-223,4,24,83,0,
-76,0,65,0,83,
-0,72,0,95,0,
-69,0,81,0,85,
-0,65,0,76,0,
-83,0,1,9,1,
-1,2,0,1,79,
-224,18,1,79,225,
-20,226,4,10,84,
-0,73,0,76,0,
-68,0,69,0,1,
-36,1,1,2,0,
-1,1195,227,18,1,
-1195,177,2,0,1,
-82,228,18,1,82,
-177,2,0,1,1123,
-229,18,1,1123,177,
-2,0,1,85,230,
-18,1,85,231,20,
-232,4,26,83,0,
-84,0,82,0,79,
-0,75,0,69,0,
-95,0,83,0,84,
+1195,218,18,1,1195,
+168,2,0,1,82,
+219,18,1,82,168,
+2,0,1,1123,220,
+18,1,1123,168,2,
+0,1,85,221,18,
+1,85,222,20,223,
+4,26,83,0,84,
 0,82,0,79,0,
-75,0,69,0,1,
-39,1,1,2,0,
-1,89,233,18,1,
-89,234,20,235,4,
-10,77,0,73,0,
-78,0,85,0,83,
-0,1,19,1,1,
-2,0,1,2318,236,
-18,1,2318,201,2,
-0,1,93,237,18,
-1,93,177,2,0,
-1,2707,238,18,1,
-2707,239,20,240,4,
-34,71,0,108,0,
-111,0,98,0,97,
-0,108,0,68,0,
-101,0,102,0,105,
-0,110,0,105,0,
-116,0,105,0,111,
-0,110,0,115,0,
-1,97,1,2,2,
-0,1,97,241,18,
-1,97,242,20,243,
-4,14,65,0,77,
-0,80,0,95,0,
+75,0,69,0,95,
+0,83,0,84,0,
+82,0,79,0,75,
+0,69,0,1,39,
+1,1,2,0,1,
+89,224,18,1,89,
+225,20,226,4,10,
+77,0,73,0,78,
+0,85,0,83,0,
+1,19,1,1,2,
+0,1,2318,227,18,
+1,2318,192,2,0,
+1,93,228,18,1,
+93,168,2,0,1,
+97,229,18,1,97,
+230,20,231,4,14,
 65,0,77,0,80,
-0,1,38,1,1,
-2,0,1,102,244,
-18,1,102,245,20,
-246,4,22,69,0,
-88,0,67,0,76,
-0,65,0,77,0,
-65,0,84,0,73,
-0,79,0,78,0,
-1,37,1,1,2,
-0,1,1775,247,18,
-1,1775,159,2,0,
-1,107,248,18,1,
-107,177,2,0,1,
-2337,249,18,1,2337,
-159,2,0,1,1224,
-250,18,1,1224,169,
-2,0,1,1225,251,
-18,1,1225,252,20,
-253,4,24,77,0,
-73,0,78,0,85,
-0,83,0,95,0,
-69,0,81,0,85,
-0,65,0,76,0,
-83,0,1,7,1,
-1,2,0,1,112,
-254,18,1,112,255,
-20,256,4,28,71,
-0,82,0,69,0,
-65,0,84,0,69,
-0,82,0,95,0,
-69,0,81,0,85,
-0,65,0,76,0,
-83,0,1,32,1,
-1,2,0,1,1188,
-257,18,1,1188,169,
-2,0,1,1231,258,
-18,1,1231,177,2,
-0,1,118,259,18,
-1,118,177,2,0,
-1,2730,260,18,1,
-2730,261,23,262,4,
-6,69,0,79,0,
-70,0,1,2,1,
-6,2,0,1,1737,
-263,18,1,1737,177,
-2,0,1,124,264,
-18,1,124,265,20,
-266,4,22,76,0,
-69,0,83,0,83,
-0,95,0,69,0,
-81,0,85,0,65,
-0,76,0,83,0,
-1,31,1,1,2,
-0,1,130,267,18,
-1,130,177,2,0,
-1,1803,268,18,1,
-1803,269,20,270,4,
-18,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,1,
-112,1,2,2,0,
-1,1804,271,18,1,
-1804,272,20,273,4,
-4,68,0,79,0,
-1,44,1,1,2,
-0,1,2364,274,18,
-1,2364,269,2,0,
-1,137,275,18,1,
-137,276,20,277,4,
-36,69,0,88,0,
+0,95,0,65,0,
+77,0,80,0,1,
+38,1,1,2,0,
+1,102,232,18,1,
+102,233,20,234,4,
+22,69,0,88,0,
 67,0,76,0,65,
 0,77,0,65,0,
 84,0,73,0,79,
-0,78,0,95,0,
-69,0,81,0,85,
-0,65,0,76,0,
-83,0,1,30,1,
-1,2,0,1,2293,
-278,18,1,2293,201,
-2,0,1,1701,279,
-18,1,1701,177,2,
-0,1,1756,280,18,
-1,1756,201,2,0,
-1,143,281,18,1,
-143,177,2,0,1,
-2299,282,18,1,2299,
-177,2,0,1,1260,
-283,18,1,1260,169,
-2,0,1,1261,284,
-18,1,1261,285,20,
-286,4,22,80,0,
-76,0,85,0,83,
+0,78,0,1,37,
+1,1,2,0,1,
+1775,235,18,1,1775,
+153,2,0,1,107,
+236,18,1,107,168,
+2,0,1,2337,237,
+18,1,2337,153,2,
+0,1,1224,238,18,
+1,1224,160,2,0,
+1,1225,239,18,1,
+1225,240,20,241,4,
+24,77,0,73,0,
+78,0,85,0,83,
 0,95,0,69,0,
 81,0,85,0,65,
 0,76,0,83,0,
-1,6,1,1,2,
-0,1,151,287,18,
-1,151,288,20,289,
-4,26,69,0,81,
-0,85,0,65,0,
-76,0,83,0,95,
-0,69,0,81,0,
-85,0,65,0,76,
-0,83,0,1,29,
-1,1,2,0,1,
-1267,290,18,1,1267,
-177,2,0,1,157,
-291,18,1,157,177,
-2,0,1,1773,292,
-18,1,1773,146,2,
-0,1,1832,293,18,
-1,1832,269,2,0,
-1,1833,294,18,1,
-1833,295,20,296,4,
-10,87,0,72,0,
-73,0,76,0,69,
-0,1,45,1,1,
-2,0,1,1834,297,
-18,1,1834,135,2,
-0,1,166,298,18,
-1,166,299,20,300,
-4,20,76,0,69,
-0,70,0,84,0,
-95,0,65,0,78,
-0,71,0,76,0,
-69,0,1,25,1,
-1,2,0,1,1840,
-301,18,1,1840,177,
-2,0,1,172,302,
-18,1,172,177,2,
-0,1,2706,303,18,
-1,2706,201,2,0,
-1,2335,304,18,1,
-2335,146,2,0,1,
-1296,305,18,1,1296,
-169,2,0,1,1297,
-306,18,1,1297,307,
-20,308,4,12,69,
-0,81,0,85,0,
-65,0,76,0,83,
-0,1,15,1,1,
-2,0,1,2413,309,
-18,1,2413,310,20,
-311,4,26,83,0,
+1,7,1,1,2,
+0,1,112,242,18,
+1,112,243,20,244,
+4,28,71,0,82,
+0,69,0,65,0,
+84,0,69,0,82,
+0,95,0,69,0,
+81,0,85,0,65,
+0,76,0,83,0,
+1,32,1,1,2,
+0,1,1188,245,18,
+1,1188,160,2,0,
+1,1231,246,18,1,
+1231,168,2,0,1,
+118,247,18,1,118,
+168,2,0,1,1737,
+248,18,1,1737,168,
+2,0,1,2734,249,
+18,1,2734,250,20,
+251,4,12,83,0,
 116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,76,0,105,0,
+0,101,0,115,0,
+1,100,1,2,2,
+0,1,124,252,18,
+1,124,253,20,254,
+4,22,76,0,69,
+0,83,0,83,0,
+95,0,69,0,81,
+0,85,0,65,0,
+76,0,83,0,1,
+31,1,1,2,0,
+1,130,255,18,1,
+130,168,2,0,1,
+2742,256,18,1,2742,
+257,20,258,4,50,
+71,0,108,0,111,
+0,98,0,97,0,
+108,0,86,0,97,
+0,114,0,105,0,
+97,0,98,0,108,
+0,101,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+1,98,1,2,2,
+0,1,1803,259,18,
+1,1803,260,20,261,
+4,18,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+1,116,1,2,2,
+0,1,1804,262,18,
+1,1804,263,20,264,
+4,4,68,0,79,
+0,1,44,1,1,
+2,0,1,2745,104,
+1,2364,265,18,1,
+2364,260,2,0,1,
+137,266,18,1,137,
+267,20,268,4,36,
+69,0,88,0,67,
+0,76,0,65,0,
+77,0,65,0,84,
+0,73,0,79,0,
+78,0,95,0,69,
+0,81,0,85,0,
+65,0,76,0,83,
+0,1,30,1,1,
+2,0,1,2293,269,
+18,1,2293,192,2,
+0,1,1701,270,18,
+1,1701,168,2,0,
+1,1756,271,18,1,
+1756,192,2,0,1,
+143,272,18,1,143,
+168,2,0,1,2299,
+273,18,1,2299,168,
+2,0,1,1260,274,
+18,1,1260,160,2,
+0,1,1261,275,18,
+1,1261,276,20,277,
+4,22,80,0,76,
+0,85,0,83,0,
+95,0,69,0,81,
+0,85,0,65,0,
+76,0,83,0,1,
+6,1,1,2,0,
+1,151,278,18,1,
+151,279,20,280,4,
+26,69,0,81,0,
+85,0,65,0,76,
+0,83,0,95,0,
+69,0,81,0,85,
+0,65,0,76,0,
+83,0,1,29,1,
+1,2,0,1,1267,
+281,18,1,1267,168,
+2,0,1,157,282,
+18,1,157,168,2,
+0,1,1773,283,18,
+1,1773,146,2,0,
+1,1832,284,18,1,
+1832,260,2,0,1,
+1833,285,18,1,1833,
+286,20,287,4,10,
+87,0,72,0,73,
+0,76,0,69,0,
+1,45,1,1,2,
+0,1,1834,288,18,
+1,1834,135,2,0,
+1,166,289,18,1,
+166,290,20,291,4,
+20,76,0,69,0,
+70,0,84,0,95,
+0,65,0,78,0,
+71,0,76,0,69,
+0,1,25,1,1,
+2,0,1,1840,292,
+18,1,1840,168,2,
+0,1,172,293,18,
+1,172,168,2,0,
+1,2335,294,18,1,
+2335,146,2,0,1,
+1296,295,18,1,1296,
+160,2,0,1,1297,
+296,18,1,1297,297,
+20,298,4,12,69,
+0,81,0,85,0,
+65,0,76,0,83,
+0,1,15,1,1,
+2,0,1,2413,299,
+18,1,2413,300,20,
+301,4,26,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,76,0,105,0,
 115,0,116,0,1,
-111,1,2,2,0,
-1,1859,312,18,1,
-1859,159,2,0,1,
-1860,313,18,1,1860,
-201,2,0,1,188,
-314,18,1,188,177,
-2,0,1,182,315,
-18,1,182,316,20,
-317,4,22,82,0,
+115,1,2,2,0,
+1,1859,302,18,1,
+1859,153,2,0,1,
+1860,303,18,1,1860,
+192,2,0,1,188,
+304,18,1,188,168,
+2,0,1,182,305,
+18,1,182,306,20,
+307,4,22,82,0,
 73,0,71,0,72,
 0,84,0,95,0,
 65,0,78,0,71,
 0,76,0,69,0,
 1,26,1,1,2,
-0,1,199,318,18,
-1,199,319,20,320,
+0,1,199,308,18,
+1,199,309,20,310,
 4,10,67,0,65,
 0,82,0,69,0,
 84,0,1,35,1,
 1,2,0,1,1871,
-321,18,1,1871,169,
-2,0,1,1872,322,
-18,1,1872,159,2,
-0,1,1873,323,18,
-1,1873,201,2,0,
-1,1875,324,18,1,
-1875,295,2,0,1,
-205,325,18,1,205,
-177,2,0,1,1882,
-326,18,1,1882,177,
-2,0,1,2227,327,
-18,1,2227,269,2,
-0,1,217,328,18,
-1,217,329,20,330,
-4,12,83,0,84,
-0,82,0,79,0,
-75,0,69,0,1,
-34,1,1,2,0,
-1,1332,331,18,1,
-1332,169,2,0,1,
-1335,332,18,1,1335,
-172,2,0,1,223,
-333,18,1,223,177,
-2,0,1,1341,334,
-18,1,1341,177,2,
-0,1,1901,335,18,
-1,1901,159,2,0,
-1,1303,336,18,1,
-1303,177,2,0,1,
-2462,337,18,1,2462,
-269,2,0,1,236,
-338,18,1,236,339,
-20,340,4,6,65,
-0,77,0,80,0,
-1,33,1,1,2,
-0,1,2466,341,18,
-1,2466,342,20,343,
-4,34,67,0,111,
-0,109,0,112,0,
-111,0,117,0,110,
-0,100,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,1,110,1,2,
-2,0,1,2467,344,
-18,1,2467,156,2,
-0,1,2468,345,18,
-1,2468,346,20,347,
-4,10,83,0,84,
-0,65,0,84,0,
-69,0,1,48,1,
-1,2,0,1,2469,
-348,18,1,2469,132,
-2,0,1,242,349,
-18,1,242,177,2,
-0,1,2471,350,18,
-1,2471,351,20,352,
-4,22,84,0,73,
-0,77,0,69,0,
-82,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-87,1,1,2,0,
-1,2472,353,18,1,
-2472,354,20,355,4,
-38,78,0,79,0,
-84,0,95,0,65,
+311,18,1,1871,160,
+2,0,1,1872,312,
+18,1,1872,153,2,
+0,1,1873,313,18,
+1,1873,192,2,0,
+1,1875,314,18,1,
+1875,286,2,0,1,
+205,315,18,1,205,
+168,2,0,1,2581,
+316,18,1,2581,156,
+2,0,1,2515,317,
+18,1,2515,318,20,
+319,4,52,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
+1,107,1,2,2,
+0,1,1882,320,18,
+1,1882,168,2,0,
+1,2227,321,18,1,
+2227,260,2,0,1,
+2660,322,18,1,2660,
+323,20,324,4,22,
+82,0,73,0,71,
+0,72,0,84,0,
+95,0,66,0,82,
+0,65,0,67,0,
+69,0,1,13,1,
+1,2,0,1,217,
+325,18,1,217,326,
+20,327,4,12,83,
+0,84,0,82,0,
+79,0,75,0,69,
+0,1,34,1,1,
+2,0,1,1332,328,
+18,1,1332,160,2,
+0,1,2743,329,18,
+1,2743,330,20,331,
+4,48,71,0,108,
+0,111,0,98,0,
+97,0,108,0,70,
+0,117,0,110,0,
+99,0,116,0,105,
+0,111,0,110,0,
+68,0,101,0,102,
+0,105,0,110,0,
+105,0,116,0,105,
+0,111,0,110,0,
+1,99,1,2,2,
+0,1,2744,332,18,
+1,2744,257,2,0,
+1,1335,333,18,1,
+1335,163,2,0,1,
+223,334,18,1,223,
+168,2,0,1,1341,
+335,18,1,1341,168,
+2,0,1,1901,336,
+18,1,1901,153,2,
+0,1,1303,337,18,
+1,1303,168,2,0,
+1,2462,338,18,1,
+2462,260,2,0,1,
+236,339,18,1,236,
+340,20,341,4,6,
+65,0,77,0,80,
+0,1,33,1,1,
+2,0,1,2466,342,
+18,1,2466,343,20,
+344,4,34,67,0,
+111,0,109,0,112,
+0,111,0,117,0,
+110,0,100,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,114,1,
+2,2,0,1,2467,
+345,18,1,2467,150,
+2,0,1,2468,346,
+18,1,2468,347,20,
+348,4,10,83,0,
+84,0,65,0,84,
+0,69,0,1,48,
+1,1,2,0,1,
+2469,349,18,1,2469,
+132,2,0,1,242,
+350,18,1,242,168,
+2,0,1,2471,351,
+18,1,2471,352,20,
+353,4,22,84,0,
+73,0,77,0,69,
+0,82,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,87,1,1,2,
+0,1,2472,354,18,
+1,2472,355,20,356,
+4,38,78,0,79,
 0,84,0,95,0,
-84,0,65,0,82,
-0,71,0,69,0,
-84,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-79,1,1,2,0,
-1,2473,356,18,1,
-2473,357,20,358,4,
-46,78,0,79,0,
-84,0,95,0,65,
+65,0,84,0,95,
+0,84,0,65,0,
+82,0,71,0,69,
 0,84,0,95,0,
-82,0,79,0,84,
-0,95,0,84,0,
-65,0,82,0,71,
-0,69,0,84,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,78,1,
-1,2,0,1,2474,
-359,18,1,2474,360,
-20,361,4,36,77,
-0,79,0,86,0,
-73,0,78,0,71,
-0,95,0,83,0,
-84,0,65,0,82,
+69,0,86,0,69,
+0,78,0,84,0,
+1,79,1,1,2,
+0,1,2473,357,18,
+1,2473,358,20,359,
+4,46,78,0,79,
 0,84,0,95,0,
+65,0,84,0,95,
+0,82,0,79,0,
+84,0,95,0,84,
+0,65,0,82,0,
+71,0,69,0,84,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,78,
+1,1,2,0,1,
+2474,360,18,1,2474,
+361,20,362,4,36,
+77,0,79,0,86,
+0,73,0,78,0,
+71,0,95,0,83,
+0,84,0,65,0,
+82,0,84,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,76,1,1,
+2,0,1,2475,363,
+18,1,2475,364,20,
+365,4,32,77,0,
+79,0,86,0,73,
+0,78,0,71,0,
+95,0,69,0,78,
+0,68,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,76,1,1,2,
-0,1,2475,362,18,
-1,2475,363,20,364,
-4,32,77,0,79,
-0,86,0,73,0,
-78,0,71,0,95,
-0,69,0,78,0,
-68,0,95,0,69,
+1,75,1,1,2,
+0,1,2476,366,18,
+1,2476,367,20,368,
+4,32,83,0,84,
+0,65,0,84,0,
+69,0,95,0,69,
+0,88,0,73,0,
+84,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
-75,1,1,2,0,
-1,2476,365,18,1,
-2476,366,20,367,4,
-32,83,0,84,0,
+86,1,1,2,0,
+1,2477,369,18,1,
+2477,370,20,371,4,
+34,83,0,84,0,
 65,0,84,0,69,
 0,95,0,69,0,
-88,0,73,0,84,
+78,0,84,0,82,
+0,89,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,85,1,1,2,
+0,1,2478,372,18,
+1,2478,373,20,374,
+4,34,84,0,79,
+0,85,0,67,0,
+72,0,95,0,83,
+0,84,0,65,0,
+82,0,84,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,89,1,1,
+2,0,1,2479,375,
+18,1,2479,376,20,
+377,4,30,84,0,
+79,0,85,0,67,
+0,72,0,95,0,
+69,0,78,0,68,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,86,
+0,84,0,1,90,
 1,1,2,0,1,
-2477,368,18,1,2477,
-369,20,370,4,34,
-83,0,84,0,65,
-0,84,0,69,0,
-95,0,69,0,78,
-0,84,0,82,0,
-89,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-85,1,1,2,0,
-1,2478,371,18,1,
-2478,372,20,373,4,
-36,72,0,84,0,
-84,0,80,0,95,
-0,82,0,69,0,
-81,0,85,0,69,
-0,83,0,84,0,
+2480,378,18,1,2480,
+379,20,380,4,22,
+84,0,79,0,85,
+0,67,0,72,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,91,1,
-1,2,0,1,2479,
-374,18,1,2479,375,
-20,376,4,34,84,
-0,79,0,85,0,
-67,0,72,0,95,
-0,83,0,84,0,
-65,0,82,0,84,
+84,0,1,88,1,
+1,2,0,1,2481,
+381,18,1,2481,382,
+20,383,4,24,83,
+0,69,0,78,0,
+83,0,79,0,82,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,89,
+0,84,0,1,84,
 1,1,2,0,1,
-2480,377,18,1,2480,
-378,20,379,4,30,
-84,0,79,0,85,
-0,67,0,72,0,
-95,0,69,0,78,
-0,68,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,90,1,1,2,
-0,1,2481,380,18,
-1,2481,381,20,382,
-4,22,84,0,79,
-0,85,0,67,0,
-72,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-88,1,1,2,0,
-1,2482,383,18,1,
-2482,384,20,385,4,
-24,83,0,69,0,
-78,0,83,0,79,
-0,82,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,84,1,1,2,
-0,1,2483,386,18,
-1,2483,387,20,388,
-4,52,82,0,85,
+2482,384,18,1,2482,
+385,20,386,4,52,
+82,0,85,0,78,
+0,95,0,84,0,
+73,0,77,0,69,
+0,95,0,80,0,
+69,0,82,0,77,
+0,73,0,83,0,
+83,0,73,0,79,
+0,78,0,83,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,83,1,
+1,2,0,1,2483,
+387,18,1,2483,388,
+20,389,4,24,79,
 0,78,0,95,0,
-84,0,73,0,77,
-0,69,0,95,0,
-80,0,69,0,82,
-0,77,0,73,0,
-83,0,83,0,73,
-0,79,0,78,0,
-83,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-83,1,1,2,0,
-1,256,389,18,1,
-256,390,20,391,4,
-14,80,0,69,0,
-82,0,67,0,69,
-0,78,0,84,0,
-1,22,1,1,2,
-0,1,1371,392,18,
-1,1371,222,2,0,
-1,2486,393,18,1,
-2486,394,20,395,4,
-32,79,0,66,0,
-74,0,69,0,67,
-0,84,0,95,0,
 82,0,69,0,90,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,80,
+0,84,0,1,81,
 1,1,2,0,1,
-2487,396,18,1,2487,
-397,20,398,4,30,
-78,0,79,0,95,
-0,83,0,69,0,
-78,0,83,0,79,
-0,82,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,77,1,1,2,
-0,1,1931,399,18,
-1,1931,269,2,0,
-1,1932,400,18,1,
-1932,401,20,402,4,
-4,73,0,70,0,
-1,42,1,1,2,
-0,1,262,403,18,
-1,262,177,2,0,
-1,1377,404,18,1,
-1377,177,2,0,1,
-2492,405,18,1,2492,
-406,20,407,4,48,
-76,0,65,0,78,
-0,68,0,95,0,
+256,390,18,1,256,
+391,20,392,4,14,
+80,0,69,0,82,
+0,67,0,69,0,
+78,0,84,0,1,
+22,1,1,2,0,
+1,1371,393,18,1,
+1371,213,2,0,1,
+2486,394,18,1,2486,
+395,20,396,4,30,
 67,0,79,0,76,
 0,76,0,73,0,
 83,0,73,0,79,
 0,78,0,95,0,
-69,0,78,0,68,
+69,0,86,0,69,
+0,78,0,84,0,
+1,62,1,1,2,
+0,1,2487,397,18,
+1,2487,398,20,399,
+4,26,67,0,72,
+0,65,0,78,0,
+71,0,69,0,68,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,70,
+0,84,0,1,61,
 1,1,2,0,1,
-1876,408,18,1,1876,
-135,2,0,1,2494,
-409,18,1,2494,410,
-20,411,4,38,72,
-0,84,0,84,0,
-80,0,95,0,82,
-0,69,0,83,0,
-80,0,79,0,78,
-0,83,0,69,0,
+1931,400,18,1,1931,
+260,2,0,1,1932,
+401,18,1,1932,402,
+20,403,4,4,73,
+0,70,0,1,42,
+1,1,2,0,1,
+262,404,18,1,262,
+168,2,0,1,1377,
+405,18,1,1377,168,
+2,0,1,2492,406,
+18,1,2492,407,20,
+408,4,22,77,0,
+79,0,78,0,69,
+0,89,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,74,1,1,2,
+0,1,1876,409,18,
+1,1876,135,2,0,
+1,2494,410,18,1,
+2494,411,20,412,4,
+36,76,0,73,0,
+78,0,75,0,95,
+0,77,0,69,0,
+83,0,83,0,65,
+0,71,0,69,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,68,1,
+84,0,1,72,1,
 1,2,0,1,2495,
-412,18,1,2495,413,
-20,414,4,22,69,
-0,77,0,65,0,
-73,0,76,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,67,1,1,
-2,0,1,1939,415,
-18,1,1939,177,2,
-0,1,2497,416,18,
-1,2497,417,20,418,
-4,26,67,0,79,
-0,78,0,84,0,
-82,0,79,0,76,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,65,
-1,1,2,0,1,
-827,419,18,1,827,
-177,2,0,1,2499,
-420,18,1,2499,421,
-20,422,4,38,67,
+413,18,1,2495,414,
+20,415,4,52,76,
+0,65,0,78,0,
+68,0,95,0,67,
 0,79,0,76,0,
 76,0,73,0,83,
 0,73,0,79,0,
-78,0,95,0,69,
+78,0,95,0,83,
+0,84,0,65,0,
+82,0,84,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,71,1,1,
+2,0,1,1939,416,
+18,1,1939,168,2,
+0,1,2497,417,18,
+1,2497,418,20,419,
+4,40,76,0,65,
 0,78,0,68,0,
+95,0,67,0,79,
+0,76,0,76,0,
+73,0,83,0,73,
+0,79,0,78,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,63,1,
-1,2,0,1,2500,
-423,18,1,2500,424,
-20,425,4,30,67,
-0,79,0,76,0,
-76,0,73,0,83,
-0,73,0,79,0,
-78,0,95,0,69,
+84,0,1,69,1,
+1,2,0,1,827,
+420,18,1,827,168,
+2,0,1,2499,421,
+18,1,2499,422,20,
+423,4,22,69,0,
+77,0,65,0,73,
+0,76,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,67,1,1,2,
+0,1,2500,424,18,
+1,2500,425,20,426,
+4,32,68,0,65,
+0,84,0,65,0,
+83,0,69,0,82,
+0,86,0,69,0,
+82,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
-62,1,1,2,0,
-1,2501,426,18,1,
-2501,427,20,428,4,
-26,67,0,72,0,
-65,0,78,0,71,
-0,69,0,68,0,
+66,1,1,2,0,
+1,2501,427,18,1,
+2501,428,20,429,4,
+26,67,0,79,0,
+78,0,84,0,82,
+0,79,0,76,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,61,1,
+84,0,1,65,1,
 1,2,0,1,2502,
-429,18,1,2502,430,
-20,431,4,24,65,
+430,18,1,2502,431,
+20,432,4,24,65,
 0,84,0,84,0,
 65,0,67,0,72,
 0,95,0,69,0,
 86,0,69,0,78,
 0,84,0,1,60,
 1,1,2,0,1,
-2503,432,18,1,2503,
-433,20,434,4,30,
+2503,433,18,1,2503,
+434,20,435,4,30,
 65,0,84,0,95,
 0,84,0,65,0,
 82,0,71,0,69,
@@ -2831,8 +2908,8 @@ public yyLSLSyntax
 69,0,86,0,69,
 0,78,0,84,0,
 1,59,1,1,2,
-0,1,2504,435,18,
-1,2504,436,20,437,
+0,1,2504,436,18,
+1,2504,437,20,438,
 4,38,65,0,84,
 0,95,0,82,0,
 79,0,84,0,95,
@@ -2842,192 +2919,224 @@ public yyLSLSyntax
 69,0,86,0,69,
 0,78,0,84,0,
 1,58,1,1,2,
-0,1,277,438,18,
-1,277,439,20,440,
+0,1,277,439,18,
+1,277,440,20,441,
 4,10,83,0,76,
 0,65,0,83,0,
 72,0,1,21,1,
 1,2,0,1,2506,
-441,18,1,2506,135,
-2,0,1,2507,442,
-18,1,2507,159,2,
-0,1,2509,443,18,
-1,2509,342,2,0,
-1,2510,444,18,1,
-2510,445,20,446,4,
-10,69,0,118,0,
-101,0,110,0,116,
-0,1,108,1,2,
-2,0,1,283,447,
-18,1,283,177,2,
-0,1,1958,448,18,
-1,1958,159,2,0,
-1,1406,449,18,1,
-1406,169,2,0,1,
-1407,450,18,1,1407,
-216,2,0,1,2522,
-451,18,1,2522,159,
-2,0,1,2524,452,
-18,1,2524,342,2,
-0,1,2526,453,18,
-1,2526,454,20,455,
-4,18,83,0,116,
-0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-1,102,1,2,2,
-0,1,299,456,18,
-1,299,457,20,458,
-4,8,83,0,84,
-0,65,0,82,0,
-1,20,1,1,2,
-0,1,1370,459,18,
-1,1370,169,2,0,
-1,305,460,18,1,
-305,177,2,0,1,
-2458,461,18,1,2458,
-269,2,0,1,2459,
-462,18,1,2459,150,
-2,0,1,2464,463,
-18,1,2464,150,2,
-0,1,1989,464,18,
-1,1989,269,2,0,
-1,1990,465,18,1,
-1990,466,20,467,4,
+442,18,1,2506,135,
+2,0,1,2507,443,
+18,1,2507,153,2,
+0,1,2509,444,18,
+1,2509,343,2,0,
+1,2510,445,18,1,
+2510,446,20,447,4,
+22,73,0,110,0,
+116,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,1,112,
+1,2,2,0,1,
+283,448,18,1,283,
+168,2,0,1,2512,
+449,18,1,2512,126,
+2,0,1,2513,450,
+18,1,2513,132,2,
+0,1,2514,451,18,
+1,2514,452,20,453,
+4,28,73,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+1,109,1,2,2,
+0,1,1958,454,18,
+1,1958,153,2,0,
+1,2516,455,18,1,
+2516,153,2,0,1,
+2518,456,18,1,2518,
+343,2,0,1,2519,
+457,18,1,2519,458,
+20,459,4,10,69,
+0,118,0,101,0,
+110,0,116,0,1,
+111,1,2,2,0,
+1,1406,460,18,1,
+1406,160,2,0,1,
+1407,461,18,1,1407,
+207,2,0,1,299,
+462,18,1,299,463,
+20,464,4,8,83,
+0,84,0,65,0,
+82,0,1,20,1,
+1,2,0,1,1370,
+465,18,1,1370,160,
+2,0,1,2529,466,
+18,1,2529,140,2,
+0,1,2531,467,18,
+1,2531,153,2,0,
+1,305,468,18,1,
+305,168,2,0,1,
+2535,469,18,1,2535,
+470,20,471,4,18,
+83,0,116,0,97,
+0,116,0,101,0,
+66,0,111,0,100,
+0,121,0,1,102,
+1,2,2,0,1,
+2458,472,18,1,2458,
+260,2,0,1,2459,
+473,18,1,2459,323,
+2,0,1,2464,474,
+18,1,2464,323,2,
+0,1,1989,475,18,
+1,1989,260,2,0,
+1,1990,476,18,1,
+1990,477,20,478,4,
 8,69,0,76,0,
 83,0,69,0,1,
 43,1,1,2,0,
-1,2470,468,18,1,
-2470,162,2,0,1,
-322,469,18,1,322,
-234,2,0,1,1933,
-470,18,1,1933,135,
-2,0,1,883,471,
-18,1,883,177,2,
-0,1,328,472,18,
-1,328,177,2,0,
-1,1443,473,18,1,
-1443,252,2,0,1,
-1449,474,18,1,1449,
-177,2,0,1,2485,
-475,18,1,2485,476,
-20,477,4,24,79,
-0,78,0,95,0,
-82,0,69,0,90,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,81,
-1,1,2,0,1,
-2565,478,18,1,2565,
-150,2,0,1,2566,
-479,18,1,2566,480,
-20,481,4,34,86,
-0,111,0,105,0,
-100,0,65,0,114,
-0,103,0,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,1,104,
-1,2,2,0,1,
-2488,482,18,1,2488,
-483,20,484,4,22,
-77,0,79,0,78,
-0,69,0,89,0,
+1,2470,479,18,1,
+2470,156,2,0,1,
+322,480,18,1,322,
+225,2,0,1,1933,
+481,18,1,1933,135,
+2,0,1,883,482,
+18,1,883,168,2,
+0,1,328,483,18,
+1,328,168,2,0,
+1,1443,484,18,1,
+1443,240,2,0,1,
+1449,485,18,1,1449,
+168,2,0,1,2485,
+486,18,1,2485,487,
+20,488,4,38,67,
+0,79,0,76,0,
+76,0,73,0,83,
+0,73,0,79,0,
+78,0,95,0,69,
+0,78,0,68,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,74,1,
-1,2,0,1,2489,
-485,18,1,2489,486,
-20,487,4,24,76,
+84,0,1,63,1,
+1,2,0,1,2488,
+489,18,1,2488,490,
+20,491,4,36,72,
+0,84,0,84,0,
+80,0,95,0,82,
+0,69,0,81,0,
+85,0,69,0,83,
+0,84,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,91,1,1,2,
+0,1,2489,492,18,
+1,2489,493,20,494,
+4,34,82,0,69,
+0,77,0,79,0,
+84,0,69,0,95,
+0,68,0,65,0,
+84,0,65,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,82,1,1,
+2,0,1,2490,495,
+18,1,2490,496,20,
+497,4,32,79,0,
+66,0,74,0,69,
+0,67,0,84,0,
+95,0,82,0,69,
+0,90,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,80,1,1,2,
+0,1,2491,498,18,
+1,2491,499,20,500,
+4,30,78,0,79,
+0,95,0,83,0,
+69,0,78,0,83,
+0,79,0,82,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,77,1,
+1,2,0,1,2493,
+501,18,1,2493,502,
+20,503,4,24,76,
 0,73,0,83,0,
 84,0,69,0,78,
 0,95,0,69,0,
 86,0,69,0,78,
 0,84,0,1,73,
 1,1,2,0,1,
-2490,488,18,1,2490,
-489,20,490,4,36,
-76,0,73,0,78,
-0,75,0,95,0,
-77,0,69,0,83,
-0,83,0,65,0,
-71,0,69,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,72,1,1,
-2,0,1,2491,491,
-18,1,2491,492,20,
-493,4,52,76,0,
-65,0,78,0,68,
-0,95,0,67,0,
-79,0,76,0,76,
-0,73,0,83,0,
-73,0,79,0,78,
-0,95,0,83,0,
-84,0,65,0,82,
-0,84,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,71,1,1,2,
-0,1,2493,494,18,
-1,2493,495,20,496,
-4,40,76,0,65,
-0,78,0,68,0,
-95,0,67,0,79,
-0,76,0,76,0,
-73,0,83,0,73,
-0,79,0,78,0,
-95,0,69,0,86,
+1413,504,18,1,1413,
+168,2,0,1,346,
+505,18,1,346,506,
+20,507,4,8,80,
+0,76,0,85,0,
+83,0,1,18,1,
+1,2,0,1,2575,
+508,18,1,2575,509,
+20,510,4,20,83,
+0,116,0,97,0,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+103,1,2,2,0,
+1,2496,511,18,1,
+2496,512,20,513,4,
+48,76,0,65,0,
+78,0,68,0,95,
+0,67,0,79,0,
+76,0,76,0,73,
+0,83,0,73,0,
+79,0,78,0,95,
 0,69,0,78,0,
-84,0,1,69,1,
-1,2,0,1,1413,
-497,18,1,1413,177,
-2,0,1,346,498,
-18,1,346,499,20,
-500,4,8,80,0,
-76,0,85,0,83,
-0,1,18,1,1,
-2,0,1,2496,501,
-18,1,2496,502,20,
-503,4,32,68,0,
-65,0,84,0,65,
-0,83,0,69,0,
-82,0,86,0,69,
-0,82,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,66,1,1,2,
-0,1,2021,504,18,
-1,2021,269,2,0,
-1,2022,505,18,1,
-2022,346,2,0,1,
-352,506,18,1,352,
-177,2,0,1,2024,
-507,18,1,2024,132,
-2,0,1,2025,508,
-18,1,2025,509,20,
-510,4,8,74,0,
+68,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+70,1,1,2,0,
+1,2577,514,18,1,
+2577,515,20,516,4,
+34,86,0,111,0,
+105,0,100,0,65,
+0,114,0,103,0,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,105,1,2,2,
+0,1,2021,517,18,
+1,2021,260,2,0,
+1,2022,518,18,1,
+2022,347,2,0,1,
+352,519,18,1,352,
+168,2,0,1,2024,
+520,18,1,2024,132,
+2,0,1,2025,521,
+18,1,2025,522,20,
+523,4,8,74,0,
 85,0,77,0,80,
 0,1,49,1,1,
-2,0,1,2026,511,
+2,0,1,2026,524,
 18,1,2026,132,2,
-0,1,2027,512,18,
-1,2027,513,20,514,
+0,1,2027,525,18,
+1,2027,526,20,527,
 4,4,65,0,84,
 0,1,23,1,1,
-2,0,1,2028,515,
+2,0,1,2028,528,
 18,1,2028,132,2,
-0,1,2029,516,18,
-1,2029,342,2,0,
-1,2030,517,18,1,
-2030,518,20,519,4,
+0,1,2029,529,18,
+1,2029,343,2,0,
+1,2030,530,18,1,
+2030,531,20,532,4,
 14,70,0,111,0,
 114,0,76,0,111,
 0,111,0,112,0,
-1,123,1,2,2,
-0,1,2031,520,18,
-1,2031,521,20,522,
+1,127,1,2,2,
+0,1,2031,533,18,
+1,2031,534,20,535,
 4,32,68,0,111,
 0,87,0,104,0,
 105,0,108,0,101,
@@ -3035,241 +3144,244 @@ public yyLSLSyntax
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,1,
-122,1,2,2,0,
-1,2032,523,18,1,
-2032,524,20,525,4,
+126,1,2,2,0,
+1,2032,536,18,1,
+2032,537,20,538,4,
 28,87,0,104,0,
 105,0,108,0,101,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,1,
-121,1,2,2,0,
-1,2033,526,18,1,
-2033,527,20,528,4,
+125,1,2,2,0,
+1,2033,539,18,1,
+2033,540,20,541,4,
 22,73,0,102,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
-0,116,0,1,120,
+0,116,0,1,124,
 1,2,2,0,1,
-2034,529,18,1,2034,
-530,20,531,4,22,
+2034,542,18,1,2034,
+543,20,544,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 67,0,104,0,97,
 0,110,0,103,0,
-101,0,1,119,1,
+101,0,1,123,1,
 2,2,0,1,1478,
-532,18,1,1478,169,
-2,0,1,1479,533,
-18,1,1479,285,2,
-0,1,2037,534,18,
-1,2037,201,2,0,
-1,2038,535,18,1,
-2038,536,20,537,4,
+545,18,1,1478,160,
+2,0,1,1479,546,
+18,1,1479,276,2,
+0,1,2037,547,18,
+1,2037,192,2,0,
+1,2038,548,18,1,
+2038,549,20,550,4,
 18,74,0,117,0,
 109,0,112,0,76,
 0,97,0,98,0,
 101,0,108,0,1,
-117,1,2,2,0,
-1,2039,538,18,1,
-2039,201,2,0,1,
-2040,539,18,1,2040,
-540,20,541,4,30,
+121,1,2,2,0,
+1,2039,551,18,1,
+2039,192,2,0,1,
+2040,552,18,1,2040,
+553,20,554,4,30,
 82,0,101,0,116,
 0,117,0,114,0,
 110,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,116,1,2,2,
-0,1,2041,542,18,
-1,2041,201,2,0,
-1,1485,543,18,1,
-1485,177,2,0,1,
-372,544,18,1,372,
-189,2,0,1,373,
-545,18,1,373,132,
-2,0,1,374,546,
-18,1,374,185,2,
-0,1,375,547,18,
+1,120,1,2,2,
+0,1,2041,555,18,
+1,2041,192,2,0,
+1,1485,556,18,1,
+1485,168,2,0,1,
+372,557,18,1,372,
+180,2,0,1,373,
+558,18,1,373,132,
+2,0,1,374,559,
+18,1,374,176,2,
+0,1,375,560,18,
 1,375,132,2,0,
-1,376,548,18,1,
-376,192,2,0,1,
-377,549,18,1,377,
+1,376,561,18,1,
+376,183,2,0,1,
+377,562,18,1,377,
 132,2,0,1,378,
-550,18,1,378,185,
-2,0,1,379,551,
+563,18,1,378,176,
+2,0,1,379,564,
 18,1,379,132,2,
-0,1,380,552,18,
-1,380,553,20,554,
+0,1,380,565,18,
+1,380,566,20,567,
 4,16,67,0,111,
 0,110,0,115,0,
 116,0,97,0,110,
-0,116,0,1,129,
+0,116,0,1,133,
 1,2,2,0,1,
-381,555,18,1,381,
-299,2,0,1,371,
-556,18,1,371,557,
-20,558,4,24,70,
+381,568,18,1,381,
+290,2,0,1,371,
+569,18,1,371,570,
+20,571,4,24,70,
 0,117,0,110,0,
 99,0,116,0,105,
 0,111,0,110,0,
 67,0,97,0,108,
-0,108,0,1,125,
-1,2,2,0,1,
-942,559,18,1,942,
-177,2,0,1,387,
-560,18,1,387,177,
-2,0,1,1514,561,
-18,1,1514,169,2,
-0,1,1515,562,18,
-1,1515,307,2,0,
-1,2606,563,18,1,
-2606,454,2,0,1,
-2074,564,18,1,2074,
-169,2,0,1,2075,
-565,18,1,2075,159,
-2,0,1,406,566,
-18,1,406,143,2,
-0,1,1521,567,18,
-1,1521,177,2,0,
-1,412,568,18,1,
-412,177,2,0,1,
-2484,569,18,1,2484,
-570,20,571,4,34,
-82,0,69,0,77,
-0,79,0,84,0,
-69,0,95,0,68,
-0,65,0,84,0,
-65,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-82,1,1,2,0,
-1,2023,572,18,1,
-2023,573,20,574,4,
-26,68,0,69,0,
-70,0,65,0,85,
-0,76,0,84,0,
-95,0,83,0,84,
-0,65,0,84,0,
-69,0,1,47,1,
-1,2,0,1,2564,
-575,18,1,2564,576,
-20,577,4,20,83,
-0,116,0,97,0,
-116,0,101,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
-103,1,2,2,0,
-1,2648,578,18,1,
-2648,579,20,580,4,
-12,83,0,116,0,
-97,0,116,0,101,
-0,115,0,1,100,
+0,108,0,1,129,
 1,2,2,0,1,
-2567,581,18,1,2567,
-576,2,0,1,1442,
-582,18,1,1442,169,
-2,0,1,2569,583,
-18,1,2569,162,2,
-0,1,2652,584,18,
-1,2652,165,2,0,
-1,2653,585,18,1,
-2653,132,2,0,1,
-2654,586,18,1,2654,
-135,2,0,1,2035,
-587,18,1,2035,201,
-2,0,1,2036,588,
-18,1,2036,589,20,
-590,4,26,74,0,
-117,0,109,0,112,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,1,
-118,1,2,2,0,
-1,431,591,18,1,
-431,143,2,0,1,
-2105,592,18,1,2105,
-269,2,0,1,2106,
-593,18,1,2106,466,
-2,0,1,1550,594,
-18,1,1550,169,2,
-0,1,437,595,18,
-1,437,177,2,0,
-1,2044,596,18,1,
-2044,597,20,598,4,
-28,69,0,109,0,
-112,0,116,0,121,
+942,572,18,1,942,
+168,2,0,1,2533,
+573,18,1,2533,343,
+2,0,1,387,574,
+18,1,387,168,2,
+0,1,2619,575,18,
+1,2619,470,2,0,
+1,1514,576,18,1,
+1514,160,2,0,1,
+1515,577,18,1,1515,
+297,2,0,1,2074,
+578,18,1,2074,160,
+2,0,1,2075,579,
+18,1,2075,153,2,
+0,1,406,580,18,
+1,406,143,2,0,
+1,1521,581,18,1,
+1521,168,2,0,1,
+412,582,18,1,412,
+168,2,0,1,2484,
+583,18,1,2484,584,
+20,585,4,42,67,
+0,79,0,76,0,
+76,0,73,0,83,
+0,73,0,79,0,
+78,0,95,0,83,
+0,84,0,65,0,
+82,0,84,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,64,1,1,
+2,0,1,2023,586,
+18,1,2023,587,20,
+588,4,26,68,0,
+69,0,70,0,65,
+0,85,0,76,0,
+84,0,95,0,83,
+0,84,0,65,0,
+84,0,69,0,1,
+47,1,1,2,0,
+1,1442,589,18,1,
+1442,160,2,0,1,
+2573,590,18,1,2573,
+515,2,0,1,2574,
+591,18,1,2574,592,
+20,593,4,32,73,
+0,110,0,116,0,
+65,0,114,0,103,
 0,83,0,116,0,
 97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,1,
-113,1,2,2,0,
-1,2045,599,18,1,
-2045,201,2,0,1,
-1555,600,18,1,1555,
-177,2,0,1,2670,
-601,18,1,2670,307,
-2,0,1,2511,602,
-18,1,2511,135,2,
-0,1,1001,603,18,
-1,1001,557,2,0,
-1,1002,604,18,1,
-1002,553,2,0,1,
-447,605,18,1,447,
-316,2,0,1,2676,
-606,18,1,2676,177,
-2,0,1,2520,607,
-18,1,2520,140,2,
-0,1,1010,608,18,
-1,1010,169,2,0,
-1,1011,609,18,1,
-1011,159,2,0,1,
-1012,610,18,1,1012,
-177,2,0,1,1013,
-611,18,1,1013,159,
-2,0,1,459,612,
-18,1,459,613,20,
-614,4,24,76,0,
-69,0,70,0,84,
-0,95,0,66,0,
-82,0,65,0,67,
-0,75,0,69,0,
-84,0,1,27,1,
-1,2,0,1,1574,
-615,18,1,1574,201,
-2,0,1,461,616,
-18,1,461,617,20,
-618,4,24,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,76,
-0,105,0,115,0,
-116,0,1,126,1,
-2,2,0,1,462,
-619,18,1,462,143,
-2,0,1,464,620,
-18,1,464,621,20,
-622,4,16,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,1,
-127,1,2,2,0,
-1,2136,623,18,1,
-2136,269,2,0,1,
-2729,104,1,2695,624,
-18,1,2695,201,2,
-0,1,1585,625,18,
-1,1585,626,20,627,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,104,1,2,
+2,0,1,2035,594,
+18,1,2035,192,2,
+0,1,2036,595,18,
+1,2036,596,20,597,
+4,26,74,0,117,
+0,109,0,112,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,122,
+1,2,2,0,1,
+431,598,18,1,431,
+143,2,0,1,2578,
+599,18,1,2578,592,
+2,0,1,2579,600,
+18,1,2579,509,2,
+0,1,2105,601,18,
+1,2105,260,2,0,
+1,2106,602,18,1,
+2106,477,2,0,1,
+1550,603,18,1,1550,
+160,2,0,1,437,
+604,18,1,437,168,
+2,0,1,2044,605,
+18,1,2044,606,20,
+607,4,28,69,0,
+109,0,112,0,116,
+0,121,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,1,117,1,2,
+2,0,1,2045,608,
+18,1,2045,192,2,
+0,1,2668,609,18,
+1,2668,610,20,611,
+4,10,83,0,116,
+0,97,0,116,0,
+101,0,1,101,1,
+2,2,0,1,1555,
+612,18,1,1555,168,
+2,0,1,2670,613,
+18,1,2670,135,2,
+0,1,2511,614,18,
+1,2511,135,2,0,
+1,1001,615,18,1,
+1001,570,2,0,1,
+1002,616,18,1,1002,
+566,2,0,1,447,
+617,18,1,447,306,
+2,0,1,2679,618,
+18,1,2679,140,2,
+0,1,2520,619,18,
+1,2520,135,2,0,
+1,1010,620,18,1,
+1010,160,2,0,1,
+1011,621,18,1,1011,
+153,2,0,1,1012,
+622,18,1,1012,168,
+2,0,1,1013,623,
+18,1,1013,153,2,
+0,1,2685,624,18,
+1,2685,150,2,0,
+1,2686,625,18,1,
+2686,297,2,0,1,
+459,626,18,1,459,
+627,20,628,4,24,
+76,0,69,0,70,
+0,84,0,95,0,
+66,0,82,0,65,
+0,67,0,75,0,
+69,0,84,0,1,
+27,1,1,2,0,
+1,1574,629,18,1,
+1574,192,2,0,1,
+461,630,18,1,461,
+631,20,632,4,24,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,76,0,105,0,
+115,0,116,0,1,
+130,1,2,2,0,
+1,462,633,18,1,
+462,143,2,0,1,
+464,634,18,1,464,
+635,20,636,4,16,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,1,131,1,2,
+2,0,1,2136,637,
+18,1,2136,260,2,
+0,1,1585,638,18,
+1,1585,639,20,640,
 4,12,82,0,69,
 0,84,0,85,0,
 82,0,78,0,1,
 50,1,1,2,0,
-1,476,628,18,1,
-476,629,20,630,4,
+1,476,641,18,1,
+476,642,20,643,4,
 30,83,0,84,0,
 82,0,73,0,78,
 0,71,0,95,0,
@@ -3277,18 +3389,18 @@ public yyLSLSyntax
 0,83,0,84,0,
 65,0,78,0,84,
 0,1,3,1,1,
-2,0,1,477,631,
-18,1,477,632,20,
-633,4,28,70,0,
+2,0,1,477,644,
+18,1,477,645,20,
+646,4,28,70,0,
 76,0,79,0,65,
 0,84,0,95,0,
 67,0,79,0,78,
 0,83,0,84,0,
 65,0,78,0,84,
 0,1,95,1,1,
-2,0,1,478,634,
-18,1,478,635,20,
-636,4,40,72,0,
+2,0,1,478,647,
+18,1,478,648,20,
+649,4,40,72,0,
 69,0,88,0,95,
 0,73,0,78,0,
 84,0,69,0,71,
@@ -3298,8 +3410,8 @@ public yyLSLSyntax
 84,0,65,0,78,
 0,84,0,1,94,
 1,1,2,0,1,
-479,637,18,1,479,
-638,20,639,4,32,
+479,650,18,1,479,
+651,20,652,4,32,
 73,0,78,0,84,
 0,69,0,71,0,
 69,0,82,0,95,
@@ -3308,1159 +3420,1128 @@ public yyLSLSyntax
 0,65,0,78,0,
 84,0,1,93,1,
 1,2,0,1,480,
-640,18,1,480,641,
-20,642,4,26,82,
+653,18,1,480,654,
+20,655,4,26,82,
 0,73,0,71,0,
 72,0,84,0,95,
 0,66,0,82,0,
 65,0,67,0,75,
 0,69,0,84,0,
 1,28,1,1,2,
-0,1,481,643,18,
-1,481,621,2,0,
-1,2718,644,18,1,
-2718,579,2,0,1,
-1048,645,18,1,1048,
-177,2,0,1,2725,
-646,18,1,2725,153,
-2,0,1,2726,647,
-18,1,2726,648,20,
-649,4,50,71,0,
+0,1,481,656,18,
+1,481,635,2,0,
+1,2711,657,18,1,
+2711,192,2,0,1,
+1048,658,18,1,1048,
+168,2,0,1,2722,
+659,18,1,2722,192,
+2,0,1,2723,660,
+18,1,2723,661,20,
+662,4,34,71,0,
 108,0,111,0,98,
 0,97,0,108,0,
-86,0,97,0,114,
-0,105,0,97,0,
-98,0,108,0,101,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,1,98,
-1,2,2,0,1,
-2563,650,18,1,2563,
-480,2,0,1,2728,
-651,18,1,2728,648,
-2,0,1,2042,652,
-18,1,2042,653,20,
-654,4,20,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,1,114,
-1,2,2,0,1,
-2043,655,18,1,2043,
-201,2,0,1,2568,
-656,18,1,2568,573,
-2,0,1,1620,657,
-18,1,1620,169,2,
-0,1,1621,658,18,
-1,1621,156,2,0,
-1,1622,659,18,1,
-1622,307,2,0,1,
-509,660,18,1,509,
-143,2,0,1,2498,
-661,18,1,2498,662,
-20,663,4,42,67,
-0,79,0,76,0,
-76,0,73,0,83,
-0,73,0,79,0,
-78,0,95,0,83,
-0,84,0,65,0,
-82,0,84,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,64,1,1,
-2,0,1,1628,664,
-18,1,1628,177,2,
-0,1,515,665,18,
-1,515,177,2,0,
-1,2505,666,18,1,
-2505,667,20,668,4,
+68,0,101,0,102,
+0,105,0,110,0,
+105,0,116,0,105,
+0,111,0,110,0,
+115,0,1,97,1,
+2,2,0,1,2042,
+663,18,1,2042,664,
+20,665,4,20,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,1,
+118,1,2,2,0,
+1,2043,666,18,1,
+2043,192,2,0,1,
+1620,667,18,1,1620,
+160,2,0,1,1621,
+668,18,1,1621,150,
+2,0,1,1622,669,
+18,1,1622,297,2,
+0,1,509,670,18,
+1,509,143,2,0,
+1,2498,671,18,1,
+2498,672,20,673,4,
+38,72,0,84,0,
+84,0,80,0,95,
+0,82,0,69,0,
+83,0,80,0,79,
+0,78,0,83,0,
+69,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+68,1,1,2,0,
+1,2576,674,18,1,
+2576,323,2,0,1,
+2741,675,18,1,2741,
+330,2,0,1,1628,
+676,18,1,1628,168,
+2,0,1,515,677,
+18,1,515,168,2,
+0,1,2580,678,18,
+1,2580,587,2,0,
+1,2505,679,18,1,
+2505,680,20,681,4,
 24,86,0,111,0,
 105,0,100,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-1,109,1,2,2,
-0,1,2663,669,18,
-1,2663,140,2,0,
-1,2665,670,18,1,
-2665,159,2,0,1,
-2667,671,18,1,2667,
-342,2,0,1,525,
-672,18,1,525,316,
-2,0,1,2197,673,
-18,1,2197,169,2,
-0,1,2198,674,18,
-1,2198,159,2,0,
-1,1591,675,18,1,
-1591,177,2,0,1,
-1094,676,18,1,1094,
-617,2,0,1,1096,
-677,18,1,1096,159,
-2,0,1,1657,678,
-18,1,1657,201,2,
-0,1,1658,679,18,
-1,1658,680,20,681,
-4,6,70,0,79,
-0,82,0,1,46,
-1,1,2,0,1,
-1659,682,18,1,1659,
-135,2,0,1,1665,
-683,18,1,1665,177,
-2,0,1,1113,684,
-18,1,1113,185,2,
-0,685,5,0,686,
-5,329,1,2,687,
-19,262,1,2,688,
-5,6,1,2651,689,
-17,690,15,691,4,
-14,37,0,83,0,
-116,0,97,0,116,
-0,101,0,115,0,
-1,-1,1,5,692,
-20,693,4,16,83,
+1,113,1,2,2,
+0,1,2746,682,18,
+1,2746,683,23,684,
+4,6,69,0,79,
+0,70,0,1,2,
+1,6,2,0,1,
+2664,685,18,1,2664,
+250,2,0,1,2667,
+686,18,1,2667,610,
+2,0,1,525,687,
+18,1,525,306,2,
+0,1,2197,688,18,
+1,2197,160,2,0,
+1,2198,689,18,1,
+2198,153,2,0,1,
+1591,690,18,1,1591,
+168,2,0,1,1094,
+691,18,1,1094,631,
+2,0,1,2681,692,
+18,1,2681,153,2,
+0,1,1096,693,18,
+1,1096,153,2,0,
+1,2683,694,18,1,
+2683,343,2,0,1,
+1657,695,18,1,1657,
+192,2,0,1,1658,
+696,18,1,1658,697,
+20,698,4,6,70,
+0,79,0,82,0,
+1,46,1,1,2,
+0,1,1659,699,18,
+1,1659,135,2,0,
+1,2692,700,18,1,
+2692,168,2,0,1,
+1665,701,18,1,1665,
+168,2,0,1,1113,
+702,18,1,1113,176,
+2,0,703,5,0,
+704,5,338,1,2,
+705,19,684,1,2,
+706,5,6,1,2668,
+707,17,708,15,709,
+4,14,37,0,83,
 0,116,0,97,0,
 116,0,101,0,115,
-0,95,0,50,0,
-1,155,1,3,1,
-3,1,2,694,22,
-1,12,1,2652,695,
-17,696,15,691,1,
--1,1,5,697,20,
-698,4,16,83,0,
-116,0,97,0,116,
-0,101,0,115,0,
-95,0,49,0,1,
-154,1,3,1,2,
-1,1,699,22,1,
-11,1,2565,700,17,
-701,15,702,4,12,
-37,0,83,0,116,
-0,97,0,116,0,
-101,0,1,-1,1,
-5,703,20,704,4,
-14,83,0,116,0,
-97,0,116,0,101,
-0,95,0,50,0,
-1,157,1,3,1,
-6,1,5,705,22,
-1,14,1,2645,706,
-17,707,15,702,1,
--1,1,5,708,20,
-709,4,14,83,0,
+0,1,-1,1,5,
+710,20,711,4,16,
+83,0,116,0,97,
+0,116,0,101,0,
+115,0,95,0,49,
+0,1,158,1,3,
+1,2,1,1,712,
+22,1,11,1,2576,
+713,17,714,15,715,
+4,12,37,0,83,
+0,116,0,97,0,
+116,0,101,0,1,
+-1,1,5,716,20,
+717,4,14,83,0,
 116,0,97,0,116,
 0,101,0,95,0,
-49,0,1,156,1,
-3,1,5,1,4,
-710,22,1,13,1,
-2718,711,17,712,15,
-713,4,30,37,0,
-76,0,83,0,76,
-0,80,0,114,0,
-111,0,103,0,114,
-0,97,0,109,0,
-82,0,111,0,111,
-0,116,0,1,-1,
-1,5,714,20,715,
-4,32,76,0,83,
-0,76,0,80,0,
-114,0,111,0,103,
-0,114,0,97,0,
-109,0,82,0,111,
-0,111,0,116,0,
-95,0,49,0,1,
-144,1,3,1,3,
-1,2,716,22,1,
-1,1,2648,717,17,
-718,15,713,1,-1,
-1,5,719,20,720,
-4,32,76,0,83,
-0,76,0,80,0,
-114,0,111,0,103,
-0,114,0,97,0,
-109,0,82,0,111,
-0,111,0,116,0,
-95,0,50,0,1,
-145,1,3,1,2,
-1,1,721,22,1,
-2,1,3,722,19,
-630,1,3,723,5,
-95,1,256,724,16,
-0,628,1,1261,725,
-16,0,628,1,509,
-726,16,0,628,1,
-1515,727,16,0,628,
-1,2021,728,17,729,
-15,730,4,24,37,
-0,73,0,102,0,
+50,0,1,161,1,
+3,1,6,1,5,
+718,22,1,14,1,
+2667,719,17,720,15,
+709,1,-1,1,5,
+721,20,722,4,16,
 83,0,116,0,97,
 0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,1,-1,
-1,5,731,20,732,
-4,26,73,0,102,
-0,83,0,116,0,
+115,0,95,0,50,
+0,1,159,1,3,
+1,3,1,2,723,
+22,1,12,1,2734,
+724,17,725,15,726,
+4,30,37,0,76,
+0,83,0,76,0,
+80,0,114,0,111,
+0,103,0,114,0,
+97,0,109,0,82,
+0,111,0,111,0,
+116,0,1,-1,1,
+5,727,20,728,4,
+32,76,0,83,0,
+76,0,80,0,114,
+0,111,0,103,0,
+114,0,97,0,109,
+0,82,0,111,0,
+111,0,116,0,95,
+0,49,0,1,148,
+1,3,1,3,1,
+2,729,22,1,1,
+1,2664,730,17,731,
+15,726,1,-1,1,
+5,732,20,733,4,
+32,76,0,83,0,
+76,0,80,0,114,
+0,111,0,103,0,
+114,0,97,0,109,
+0,82,0,111,0,
+111,0,116,0,95,
+0,50,0,1,149,
+1,3,1,2,1,
+1,734,22,1,2,
+1,2660,735,17,736,
+15,715,1,-1,1,
+5,737,20,738,4,
+14,83,0,116,0,
 97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,50,0,1,190,
-1,3,1,8,1,
-7,733,22,1,48,
-1,1775,734,16,0,
-628,1,2029,735,17,
-736,15,737,4,20,
-37,0,83,0,116,
+0,95,0,49,0,
+1,160,1,3,1,
+5,1,4,739,22,
+1,13,1,3,740,
+19,643,1,3,741,
+5,95,1,256,742,
+16,0,641,1,1261,
+743,16,0,641,1,
+509,744,16,0,641,
+1,1515,745,16,0,
+641,1,2686,746,16,
+0,641,1,2021,747,
+17,748,15,749,4,
+24,37,0,73,0,
+102,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,-1,1,5,738,
-20,739,4,24,83,
+1,-1,1,5,750,
+20,751,4,26,73,
+0,102,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,50,0,
+1,199,1,3,1,
+8,1,7,752,22,
+1,53,1,1775,753,
+16,0,641,1,2029,
+754,17,755,15,756,
+4,20,37,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,95,0,49,
-0,51,0,1,184,
-1,3,1,2,1,
-1,740,22,1,42,
-1,2030,741,17,742,
-15,737,1,-1,1,
-5,743,20,744,4,
+116,0,1,-1,1,
+5,757,20,758,4,
 24,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,50,0,
-1,183,1,3,1,
-2,1,1,745,22,
-1,41,1,2031,746,
-17,747,15,737,1,
--1,1,5,748,20,
-749,4,24,83,0,
+0,49,0,51,0,
+1,193,1,3,1,
+2,1,1,759,22,
+1,47,1,2030,760,
+17,761,15,756,1,
+-1,1,5,762,20,
+763,4,24,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-49,0,1,182,1,
+50,0,1,192,1,
 3,1,2,1,1,
-750,22,1,40,1,
-2032,751,17,752,15,
-737,1,-1,1,5,
-753,20,754,4,24,
+764,22,1,46,1,
+2031,765,17,766,15,
+756,1,-1,1,5,
+767,20,768,4,24,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,48,0,1,
-181,1,3,1,2,
-1,1,755,22,1,
-39,1,2033,756,17,
-757,15,737,1,-1,
-1,5,758,20,759,
-4,22,83,0,116,
+49,0,49,0,1,
+191,1,3,1,2,
+1,1,769,22,1,
+45,1,2032,770,17,
+771,15,756,1,-1,
+1,5,772,20,773,
+4,24,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-95,0,57,0,1,
-180,1,3,1,2,
-1,1,760,22,1,
-38,1,277,761,16,
-0,628,1,2035,762,
-17,763,15,737,1,
--1,1,5,764,20,
-765,4,22,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,56,0,
-1,179,1,3,1,
-3,1,2,766,22,
-1,37,1,2037,767,
-17,768,15,737,1,
--1,1,5,769,20,
-770,4,22,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,55,0,
-1,178,1,3,1,
-3,1,2,771,22,
-1,36,1,2039,772,
-17,773,15,737,1,
--1,1,5,774,20,
-775,4,22,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,54,0,
-1,177,1,3,1,
-3,1,2,776,22,
-1,35,1,32,777,
-16,0,628,1,2041,
-778,17,779,15,737,
-1,-1,1,5,780,
-20,781,4,22,83,
+95,0,49,0,48,
+0,1,190,1,3,
+1,2,1,1,774,
+22,1,44,1,2033,
+775,17,776,15,756,
+1,-1,1,5,777,
+20,778,4,22,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,95,0,53,
-0,1,176,1,3,
-1,3,1,2,782,
-22,1,34,1,2293,
-783,16,0,628,1,
-2043,784,17,785,15,
-737,1,-1,1,5,
-786,20,787,4,22,
+116,0,95,0,57,
+0,1,189,1,3,
+1,2,1,1,779,
+22,1,43,1,277,
+780,16,0,641,1,
+2035,781,17,782,15,
+756,1,-1,1,5,
+783,20,784,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-51,0,1,174,1,
+56,0,1,188,1,
 3,1,3,1,2,
-788,22,1,32,1,
-2045,789,17,790,15,
-737,1,-1,1,5,
-791,20,792,4,22,
+785,22,1,42,1,
+2037,786,17,787,15,
+756,1,-1,1,5,
+788,20,789,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,1,172,1,
+55,0,1,187,1,
 3,1,3,1,2,
-793,22,1,30,1,
-41,794,16,0,628,
-1,1297,795,16,0,
-628,1,43,796,16,
-0,628,1,1803,797,
-17,798,15,799,4,
-16,37,0,70,0,
-111,0,114,0,76,
-0,111,0,111,0,
-112,0,1,-1,1,
-5,800,20,801,4,
-18,70,0,111,0,
-114,0,76,0,111,
-0,111,0,112,0,
-95,0,49,0,1,
-197,1,3,1,10,
-1,9,802,22,1,
-55,1,1804,803,16,
-0,628,1,299,804,
-16,0,628,1,52,
-805,16,0,628,1,
-2318,806,16,0,628,
-1,62,807,16,0,
-628,1,2075,808,16,
-0,628,1,1574,809,
-17,810,15,737,1,
--1,1,5,811,20,
-812,4,22,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,52,0,
-1,175,1,3,1,
-3,1,2,813,22,
-1,33,1,71,814,
-16,0,628,1,76,
-815,16,0,628,1,
-1834,816,16,0,628,
-1,2337,817,16,0,
-628,1,79,818,16,
-0,628,1,1335,819,
-16,0,628,1,322,
-820,16,0,628,1,
-85,821,16,0,628,
-1,89,822,16,0,
-628,1,346,823,16,
-0,628,1,2105,824,
-17,825,15,730,1,
--1,1,5,826,20,
-827,4,26,73,0,
-102,0,83,0,116,
+790,22,1,41,1,
+2039,791,17,792,15,
+756,1,-1,1,5,
+793,20,794,4,22,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+54,0,1,186,1,
+3,1,3,1,2,
+795,22,1,40,1,
+32,796,16,0,641,
+1,2041,797,17,798,
+15,756,1,-1,1,
+5,799,20,800,4,
+22,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,95,
+0,53,0,1,185,
+1,3,1,3,1,
+2,801,22,1,39,
+1,2293,802,16,0,
+641,1,2043,803,17,
+804,15,756,1,-1,
+1,5,805,20,806,
+4,22,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
 95,0,51,0,1,
-191,1,3,1,6,
-1,5,828,22,1,
-49,1,2106,829,16,
-0,628,1,97,830,
-16,0,628,1,1860,
-831,17,832,15,833,
-4,34,37,0,68,
-0,111,0,87,0,
-104,0,105,0,108,
-0,101,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,1,-1,1,5,
-834,20,835,4,36,
-68,0,111,0,87,
-0,104,0,105,0,
-108,0,101,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,1,195,1,3,
-1,8,1,7,836,
-22,1,53,1,2364,
-837,17,838,15,799,
-1,-1,1,5,839,
-20,840,4,18,70,
-0,111,0,114,0,
-76,0,111,0,111,
-0,112,0,95,0,
-50,0,1,198,1,
-3,1,9,1,8,
-841,22,1,56,1,
-102,842,16,0,628,
-1,112,843,16,0,
-628,1,1117,844,16,
-0,628,1,1873,845,
-17,846,15,833,1,
--1,1,5,847,20,
-848,4,36,68,0,
-111,0,87,0,104,
-0,105,0,108,0,
-101,0,83,0,116,
+183,1,3,1,3,
+1,2,807,22,1,
+37,1,2045,808,17,
+809,15,756,1,-1,
+1,5,810,20,811,
+4,22,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-95,0,50,0,1,
-196,1,3,1,8,
-1,7,849,22,1,
-54,1,1876,850,16,
-0,628,1,124,851,
-16,0,628,1,2136,
-852,17,853,15,730,
-1,-1,1,5,854,
-20,855,4,26,73,
-0,102,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,52,0,
-1,192,1,3,1,
-8,1,7,856,22,
-1,50,1,381,857,
-16,0,628,1,525,
-858,16,0,628,1,
-137,859,16,0,628,
-1,1901,860,16,0,
-628,1,1153,861,16,
-0,628,1,151,862,
-16,0,628,1,1407,
-863,16,0,628,1,
-1659,864,16,0,628,
-1,2413,865,16,0,
-628,1,406,866,16,
-0,628,1,1371,867,
-16,0,628,1,166,
-868,16,0,628,1,
-1622,869,16,0,628,
-1,1931,870,17,871,
-15,872,4,30,37,
+95,0,49,0,1,
+181,1,3,1,3,
+1,2,812,22,1,
+35,1,41,813,16,
+0,641,1,1297,814,
+16,0,641,1,43,
+815,16,0,641,1,
+1803,816,17,817,15,
+818,4,16,37,0,
+70,0,111,0,114,
+0,76,0,111,0,
+111,0,112,0,1,
+-1,1,5,819,20,
+820,4,18,70,0,
+111,0,114,0,76,
+0,111,0,111,0,
+112,0,95,0,49,
+0,1,206,1,3,
+1,10,1,9,821,
+22,1,60,1,1804,
+822,16,0,641,1,
+299,823,16,0,641,
+1,52,824,16,0,
+641,1,2318,825,16,
+0,641,1,62,826,
+16,0,641,1,2075,
+827,16,0,641,1,
+1574,828,17,829,15,
+756,1,-1,1,5,
+830,20,831,4,22,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+52,0,1,184,1,
+3,1,3,1,2,
+832,22,1,38,1,
+71,833,16,0,641,
+1,76,834,16,0,
+641,1,1834,835,16,
+0,641,1,2337,836,
+16,0,641,1,79,
+837,16,0,641,1,
+1335,838,16,0,641,
+1,322,839,16,0,
+641,1,85,840,16,
+0,641,1,89,841,
+16,0,641,1,346,
+842,16,0,641,1,
+2105,843,17,844,15,
+749,1,-1,1,5,
+845,20,846,4,26,
+73,0,102,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,51,
+0,1,200,1,3,
+1,6,1,5,847,
+22,1,54,1,2106,
+848,16,0,641,1,
+97,849,16,0,641,
+1,1860,850,17,851,
+15,852,4,34,37,
+0,68,0,111,0,
+87,0,104,0,105,
+0,108,0,101,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,-1,
+1,5,853,20,854,
+4,36,68,0,111,
 0,87,0,104,0,
 105,0,108,0,101,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
-110,0,116,0,1,
--1,1,5,873,20,
-874,4,32,87,0,
+110,0,116,0,95,
+0,49,0,1,204,
+1,3,1,8,1,
+7,855,22,1,58,
+1,2364,856,17,857,
+15,818,1,-1,1,
+5,858,20,859,4,
+18,70,0,111,0,
+114,0,76,0,111,
+0,111,0,112,0,
+95,0,50,0,1,
+207,1,3,1,9,
+1,8,860,22,1,
+61,1,102,861,16,
+0,641,1,112,862,
+16,0,641,1,1117,
+863,16,0,641,1,
+1873,864,17,865,15,
+852,1,-1,1,5,
+866,20,867,4,36,
+68,0,111,0,87,
+0,104,0,105,0,
+108,0,101,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,50,
+0,1,205,1,3,
+1,8,1,7,868,
+22,1,59,1,1876,
+869,16,0,641,1,
+124,870,16,0,641,
+1,2136,871,17,872,
+15,749,1,-1,1,
+5,873,20,874,4,
+26,73,0,102,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+52,0,1,201,1,
+3,1,8,1,7,
+875,22,1,55,1,
+381,876,16,0,641,
+1,525,877,16,0,
+641,1,137,878,16,
+0,641,1,1901,879,
+16,0,641,1,1153,
+880,16,0,641,1,
+151,881,16,0,641,
+1,1407,882,16,0,
+641,1,1659,883,16,
+0,641,1,2413,884,
+16,0,641,1,406,
+885,16,0,641,1,
+1371,886,16,0,641,
+1,166,887,16,0,
+641,1,1622,888,16,
+0,641,1,1931,889,
+17,890,15,891,4,
+30,37,0,87,0,
 104,0,105,0,108,
 0,101,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
-0,95,0,49,0,
-1,193,1,3,1,
-6,1,5,875,22,
-1,51,1,1933,876,
-16,0,628,1,431,
-877,16,0,628,1,
-1585,878,16,0,628,
-1,182,879,16,0,
-628,1,1189,880,16,
-0,628,1,1443,881,
-16,0,628,1,1695,
-882,16,0,628,1,
-2198,883,16,0,628,
-1,447,884,16,0,
-628,1,2458,885,17,
-886,15,887,4,28,
-37,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-76,0,105,0,115,
-0,116,0,1,-1,
-1,5,888,20,889,
+0,1,-1,1,5,
+892,20,893,4,32,
+87,0,104,0,105,
+0,108,0,101,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,1,202,1,
+3,1,6,1,5,
+894,22,1,56,1,
+1933,895,16,0,641,
+1,431,896,16,0,
+641,1,1585,897,16,
+0,641,1,182,898,
+16,0,641,1,1189,
+899,16,0,641,1,
+1443,900,16,0,641,
+1,1695,901,16,0,
+641,1,2198,902,16,
+0,641,1,447,903,
+16,0,641,1,2458,
+904,17,905,15,906,
+4,28,37,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,76,0,105,
+0,115,0,116,0,
+1,-1,1,5,907,
+20,908,4,30,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,76,0,105,
+0,115,0,116,0,
+95,0,50,0,1,
+179,1,3,1,3,
+1,2,909,22,1,
+33,1,2459,910,17,
+911,15,912,4,36,
+37,0,67,0,111,
+0,109,0,112,0,
+111,0,117,0,110,
+0,100,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,1,-1,1,5,
+913,20,914,4,38,
+67,0,111,0,109,
+0,112,0,111,0,
+117,0,110,0,100,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,95,
+0,50,0,1,177,
+1,3,1,4,1,
+3,915,22,1,31,
+1,1958,916,16,0,
+641,1,2462,917,17,
+918,15,906,1,-1,
+1,5,919,20,920,
 4,30,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
 76,0,105,0,115,
 0,116,0,95,0,
-50,0,1,170,1,
+49,0,1,178,1,
+3,1,2,1,1,
+921,22,1,32,1,
+1657,922,17,923,15,
+756,1,-1,1,5,
+924,20,925,4,22,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+50,0,1,182,1,
 3,1,3,1,2,
-890,22,1,28,1,
-2459,891,17,892,15,
-893,4,36,37,0,
+926,22,1,36,1,
+2464,927,17,928,15,
+912,1,-1,1,5,
+929,20,930,4,38,
 67,0,111,0,109,
 0,112,0,111,0,
 117,0,110,0,100,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
-110,0,116,0,1,
--1,1,5,894,20,
-895,4,38,67,0,
-111,0,109,0,112,
-0,111,0,117,0,
-110,0,100,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,50,
-0,1,168,1,3,
-1,4,1,3,896,
-22,1,26,1,1958,
-897,16,0,628,1,
-2462,898,17,899,15,
-887,1,-1,1,5,
-900,20,901,4,30,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,76,0,
-105,0,115,0,116,
-0,95,0,49,0,
-1,169,1,3,1,
-2,1,1,902,22,
-1,27,1,1657,903,
-17,904,15,737,1,
--1,1,5,905,20,
-906,4,22,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,50,0,
-1,173,1,3,1,
-3,1,2,907,22,
-1,31,1,2464,908,
-17,909,15,893,1,
--1,1,5,910,20,
-911,4,38,67,0,
-111,0,109,0,112,
-0,111,0,117,0,
-110,0,100,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,1,167,1,3,
-1,3,1,2,912,
-22,1,25,1,199,
-913,16,0,628,1,
-459,914,16,0,628,
-1,462,915,16,0,
-628,1,217,916,16,
-0,628,1,2227,917,
-17,918,15,872,1,
--1,1,5,919,20,
-920,4,32,87,0,
-104,0,105,0,108,
-0,101,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,50,0,
-1,194,1,3,1,
-6,1,5,921,22,
-1,52,1,1225,922,
-16,0,628,1,1479,
-923,16,0,628,1,
-1731,924,16,0,628,
-1,1989,925,17,926,
-15,730,1,-1,1,
-5,927,20,928,4,
-26,73,0,102,0,
+110,0,116,0,95,
+0,49,0,1,176,
+1,3,1,3,1,
+2,931,22,1,30,
+1,199,932,16,0,
+641,1,459,933,16,
+0,641,1,462,934,
+16,0,641,1,217,
+935,16,0,641,1,
+2227,936,17,937,15,
+891,1,-1,1,5,
+938,20,939,4,32,
+87,0,104,0,105,
+0,108,0,101,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,1,189,1,
+50,0,1,203,1,
 3,1,6,1,5,
-929,22,1,47,1,
-1990,930,16,0,628,
-1,236,931,16,0,
-628,1,2670,932,16,
-0,628,1,1756,933,
-16,0,628,1,4,
-934,19,193,1,4,
-935,5,100,1,256,
-936,16,0,548,1,
-1261,937,16,0,548,
-1,509,938,16,0,
-548,1,1515,939,16,
-0,548,1,2021,728,
-1,1775,940,16,0,
-548,1,2029,735,1,
-2030,741,1,2031,746,
-1,2032,751,1,2033,
-756,1,277,941,16,
-0,548,1,2035,762,
-1,2037,767,1,2039,
-772,1,32,942,16,
-0,548,1,2041,778,
-1,2293,943,16,0,
-548,1,2043,784,1,
-2045,789,1,40,944,
-16,0,195,1,41,
-945,16,0,548,1,
-1297,946,16,0,548,
-1,43,947,16,0,
-548,1,44,948,16,
-0,195,1,1803,797,
-1,1804,949,16,0,
-548,1,299,950,16,
-0,548,1,47,951,
-16,0,191,1,52,
-952,16,0,548,1,
-2318,953,16,0,548,
-1,63,954,16,0,
-211,1,66,955,16,
-0,209,1,2075,956,
-16,0,548,1,1574,
-809,1,71,957,16,
-0,548,1,76,958,
-16,0,548,1,1834,
-959,16,0,548,1,
-2337,960,16,0,548,
-1,79,961,16,0,
-548,1,1335,962,16,
-0,548,1,322,963,
-16,0,548,1,85,
-964,16,0,548,1,
-89,965,16,0,548,
-1,346,966,16,0,
-548,1,97,967,16,
-0,548,1,2106,968,
-16,0,548,1,102,
-969,16,0,548,1,
-1860,831,1,2364,837,
-1,1114,970,16,0,
-191,1,112,971,16,
-0,548,1,1117,972,
-16,0,548,1,1873,
-845,1,1876,973,16,
-0,548,1,124,974,
-16,0,548,1,2136,
-852,1,381,975,16,
-0,548,1,525,976,
-16,0,548,1,137,
-977,16,0,548,1,
-1901,978,16,0,548,
-1,1153,979,16,0,
-548,1,151,980,16,
-0,548,1,1407,981,
-16,0,548,1,1659,
-982,16,0,548,1,
-2413,983,16,0,548,
-1,406,984,16,0,
-548,1,1371,985,16,
-0,548,1,2105,824,
-1,166,986,16,0,
-548,1,1622,987,16,
-0,548,1,1931,870,
-1,1933,988,16,0,
-548,1,431,989,16,
-0,548,1,1585,990,
-16,0,548,1,182,
-991,16,0,548,1,
-1189,992,16,0,548,
-1,1443,993,16,0,
-548,1,1695,994,16,
-0,548,1,2198,995,
-16,0,548,1,447,
-996,16,0,548,1,
-2458,885,1,2459,891,
-1,1958,997,16,0,
-548,1,2462,898,1,
-1657,903,1,2464,908,
-1,199,998,16,0,
-548,1,459,999,16,
-0,548,1,462,1000,
-16,0,548,1,217,
-1001,16,0,548,1,
-2227,917,1,1225,1002,
-16,0,548,1,1479,
-1003,16,0,548,1,
-1731,1004,16,0,548,
-1,1989,925,1,1990,
-1005,16,0,548,1,
-236,1006,16,0,548,
-1,2670,1007,16,0,
-548,1,1756,1008,16,
-0,548,1,5,1009,
-19,190,1,5,1010,
-5,100,1,256,1011,
-16,0,544,1,1261,
-1012,16,0,544,1,
-509,1013,16,0,544,
-1,1515,1014,16,0,
-544,1,2021,728,1,
-1775,1015,16,0,544,
-1,2029,735,1,2030,
-741,1,2031,746,1,
-2032,751,1,2033,756,
-1,277,1016,16,0,
-544,1,2035,762,1,
-2037,767,1,2039,772,
-1,32,1017,16,0,
-544,1,2041,778,1,
-2293,1018,16,0,544,
-1,2043,784,1,2045,
-789,1,40,1019,16,
-0,194,1,41,1020,
-16,0,544,1,1297,
-1021,16,0,544,1,
-43,1022,16,0,544,
-1,44,1023,16,0,
-194,1,1803,797,1,
-1804,1024,16,0,544,
-1,299,1025,16,0,
-544,1,47,1026,16,
-0,188,1,52,1027,
-16,0,544,1,2318,
-1028,16,0,544,1,
-63,1029,16,0,210,
-1,66,1030,16,0,
-208,1,2075,1031,16,
-0,544,1,1574,809,
-1,71,1032,16,0,
-544,1,76,1033,16,
-0,544,1,1834,1034,
-16,0,544,1,2337,
-1035,16,0,544,1,
-79,1036,16,0,544,
-1,1335,1037,16,0,
-544,1,322,1038,16,
-0,544,1,85,1039,
-16,0,544,1,89,
-1040,16,0,544,1,
-346,1041,16,0,544,
-1,97,1042,16,0,
-544,1,2106,1043,16,
-0,544,1,102,1044,
-16,0,544,1,1860,
-831,1,2364,837,1,
-1114,1045,16,0,188,
-1,112,1046,16,0,
-544,1,1117,1047,16,
-0,544,1,1873,845,
-1,1876,1048,16,0,
-544,1,124,1049,16,
-0,544,1,2136,852,
-1,381,1050,16,0,
-544,1,525,1051,16,
-0,544,1,137,1052,
-16,0,544,1,1901,
-1053,16,0,544,1,
-1153,1054,16,0,544,
-1,151,1055,16,0,
-544,1,1407,1056,16,
-0,544,1,1659,1057,
-16,0,544,1,2413,
-1058,16,0,544,1,
-406,1059,16,0,544,
-1,1371,1060,16,0,
-544,1,2105,824,1,
-166,1061,16,0,544,
-1,1622,1062,16,0,
-544,1,1931,870,1,
-1933,1063,16,0,544,
-1,431,1064,16,0,
-544,1,1585,1065,16,
-0,544,1,182,1066,
-16,0,544,1,1189,
-1067,16,0,544,1,
-1443,1068,16,0,544,
-1,1695,1069,16,0,
-544,1,2198,1070,16,
-0,544,1,447,1071,
-16,0,544,1,2458,
-885,1,2459,891,1,
-1958,1072,16,0,544,
-1,2462,898,1,1657,
-903,1,2464,908,1,
-199,1073,16,0,544,
-1,459,1074,16,0,
-544,1,462,1075,16,
-0,544,1,217,1076,
-16,0,544,1,2227,
-917,1,1225,1077,16,
-0,544,1,1479,1078,
-16,0,544,1,1731,
-1079,16,0,544,1,
-1989,925,1,1990,1080,
-16,0,544,1,236,
-1081,16,0,544,1,
-2670,1082,16,0,544,
-1,1756,1083,16,0,
-544,1,6,1084,19,
-286,1,6,1085,5,
-2,1,1114,1086,16,
-0,284,1,40,1087,
-16,0,533,1,7,
-1088,19,253,1,7,
-1089,5,2,1,1114,
-1090,16,0,251,1,
-40,1091,16,0,473,
-1,8,1092,19,217,
-1,8,1093,5,2,
-1,1114,1094,16,0,
-215,1,40,1095,16,
-0,450,1,9,1096,
-19,223,1,9,1097,
-5,2,1,1114,1098,
-16,0,221,1,40,
-1099,16,0,392,1,
-10,1100,19,173,1,
-10,1101,5,2,1,
-1114,1102,16,0,171,
-1,40,1103,16,0,
-332,1,11,1104,19,
-202,1,11,1105,5,
-146,1,1260,1106,17,
-1107,15,1108,4,34,
-37,0,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,1,
--1,1,5,1109,20,
-1110,4,38,83,0,
+940,22,1,57,1,
+1225,941,16,0,641,
+1,1479,942,16,0,
+641,1,1731,943,16,
+0,641,1,1989,944,
+17,945,15,749,1,
+-1,1,5,946,20,
+947,4,26,73,0,
+102,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+198,1,3,1,6,
+1,5,948,22,1,
+52,1,1990,949,16,
+0,641,1,236,950,
+16,0,641,1,1756,
+951,16,0,641,1,
+4,952,19,184,1,
+4,953,5,100,1,
+256,954,16,0,561,
+1,1261,955,16,0,
+561,1,509,956,16,
+0,561,1,1515,957,
+16,0,561,1,2686,
+958,16,0,561,1,
+2021,747,1,1775,959,
+16,0,561,1,2029,
+754,1,2030,760,1,
+2031,765,1,2032,770,
+1,2033,775,1,277,
+960,16,0,561,1,
+2035,781,1,2037,786,
+1,2039,791,1,32,
+961,16,0,561,1,
+2041,797,1,2293,962,
+16,0,561,1,2043,
+803,1,2045,808,1,
+40,963,16,0,186,
+1,41,964,16,0,
+561,1,1297,965,16,
+0,561,1,43,966,
+16,0,561,1,44,
+967,16,0,186,1,
+1803,816,1,1804,968,
+16,0,561,1,299,
+969,16,0,561,1,
+47,970,16,0,182,
+1,52,971,16,0,
+561,1,2318,972,16,
+0,561,1,63,973,
+16,0,202,1,66,
+974,16,0,200,1,
+2075,975,16,0,561,
+1,1574,828,1,71,
+976,16,0,561,1,
+76,977,16,0,561,
+1,1834,978,16,0,
+561,1,2337,979,16,
+0,561,1,79,980,
+16,0,561,1,1335,
+981,16,0,561,1,
+322,982,16,0,561,
+1,85,983,16,0,
+561,1,89,984,16,
+0,561,1,346,985,
+16,0,561,1,97,
+986,16,0,561,1,
+2106,987,16,0,561,
+1,102,988,16,0,
+561,1,1860,850,1,
+2364,856,1,1114,989,
+16,0,182,1,112,
+990,16,0,561,1,
+1117,991,16,0,561,
+1,1873,864,1,1876,
+992,16,0,561,1,
+124,993,16,0,561,
+1,2136,871,1,381,
+994,16,0,561,1,
+525,995,16,0,561,
+1,137,996,16,0,
+561,1,1901,997,16,
+0,561,1,1153,998,
+16,0,561,1,151,
+999,16,0,561,1,
+1407,1000,16,0,561,
+1,1659,1001,16,0,
+561,1,2413,1002,16,
+0,561,1,406,1003,
+16,0,561,1,1371,
+1004,16,0,561,1,
+2105,843,1,166,1005,
+16,0,561,1,1622,
+1006,16,0,561,1,
+1931,889,1,1933,1007,
+16,0,561,1,431,
+1008,16,0,561,1,
+1585,1009,16,0,561,
+1,182,1010,16,0,
+561,1,1189,1011,16,
+0,561,1,1443,1012,
+16,0,561,1,1695,
+1013,16,0,561,1,
+2198,1014,16,0,561,
+1,447,1015,16,0,
+561,1,2458,904,1,
+2459,910,1,1958,1016,
+16,0,561,1,2462,
+917,1,1657,922,1,
+2464,927,1,199,1017,
+16,0,561,1,459,
+1018,16,0,561,1,
+462,1019,16,0,561,
+1,217,1020,16,0,
+561,1,2227,936,1,
+1225,1021,16,0,561,
+1,1479,1022,16,0,
+561,1,1731,1023,16,
+0,561,1,1989,944,
+1,1990,1024,16,0,
+561,1,236,1025,16,
+0,561,1,1756,1026,
+16,0,561,1,5,
+1027,19,181,1,5,
+1028,5,100,1,256,
+1029,16,0,557,1,
+1261,1030,16,0,557,
+1,509,1031,16,0,
+557,1,1515,1032,16,
+0,557,1,2686,1033,
+16,0,557,1,2021,
+747,1,1775,1034,16,
+0,557,1,2029,754,
+1,2030,760,1,2031,
+765,1,2032,770,1,
+2033,775,1,277,1035,
+16,0,557,1,2035,
+781,1,2037,786,1,
+2039,791,1,32,1036,
+16,0,557,1,2041,
+797,1,2293,1037,16,
+0,557,1,2043,803,
+1,2045,808,1,40,
+1038,16,0,185,1,
+41,1039,16,0,557,
+1,1297,1040,16,0,
+557,1,43,1041,16,
+0,557,1,44,1042,
+16,0,185,1,1803,
+816,1,1804,1043,16,
+0,557,1,299,1044,
+16,0,557,1,47,
+1045,16,0,179,1,
+52,1046,16,0,557,
+1,2318,1047,16,0,
+557,1,63,1048,16,
+0,201,1,66,1049,
+16,0,199,1,2075,
+1050,16,0,557,1,
+1574,828,1,71,1051,
+16,0,557,1,76,
+1052,16,0,557,1,
+1834,1053,16,0,557,
+1,2337,1054,16,0,
+557,1,79,1055,16,
+0,557,1,1335,1056,
+16,0,557,1,322,
+1057,16,0,557,1,
+85,1058,16,0,557,
+1,89,1059,16,0,
+557,1,346,1060,16,
+0,557,1,97,1061,
+16,0,557,1,2106,
+1062,16,0,557,1,
+102,1063,16,0,557,
+1,1860,850,1,2364,
+856,1,1114,1064,16,
+0,179,1,112,1065,
+16,0,557,1,1117,
+1066,16,0,557,1,
+1873,864,1,1876,1067,
+16,0,557,1,124,
+1068,16,0,557,1,
+2136,871,1,381,1069,
+16,0,557,1,525,
+1070,16,0,557,1,
+137,1071,16,0,557,
+1,1901,1072,16,0,
+557,1,1153,1073,16,
+0,557,1,151,1074,
+16,0,557,1,1407,
+1075,16,0,557,1,
+1659,1076,16,0,557,
+1,2413,1077,16,0,
+557,1,406,1078,16,
+0,557,1,1371,1079,
+16,0,557,1,2105,
+843,1,166,1080,16,
+0,557,1,1622,1081,
+16,0,557,1,1931,
+889,1,1933,1082,16,
+0,557,1,431,1083,
+16,0,557,1,1585,
+1084,16,0,557,1,
+182,1085,16,0,557,
+1,1189,1086,16,0,
+557,1,1443,1087,16,
+0,557,1,1695,1088,
+16,0,557,1,2198,
+1089,16,0,557,1,
+447,1090,16,0,557,
+1,2458,904,1,2459,
+910,1,1958,1091,16,
+0,557,1,2462,917,
+1,1657,922,1,2464,
+927,1,199,1092,16,
+0,557,1,459,1093,
+16,0,557,1,462,
+1094,16,0,557,1,
+217,1095,16,0,557,
+1,2227,936,1,1225,
+1096,16,0,557,1,
+1479,1097,16,0,557,
+1,1731,1098,16,0,
+557,1,1989,944,1,
+1990,1099,16,0,557,
+1,236,1100,16,0,
+557,1,1756,1101,16,
+0,557,1,6,1102,
+19,277,1,6,1103,
+5,2,1,1114,1104,
+16,0,275,1,40,
+1105,16,0,546,1,
+7,1106,19,241,1,
+7,1107,5,2,1,
+1114,1108,16,0,239,
+1,40,1109,16,0,
+484,1,8,1110,19,
+208,1,8,1111,5,
+2,1,1114,1112,16,
+0,206,1,40,1113,
+16,0,461,1,9,
+1114,19,214,1,9,
+1115,5,2,1,1114,
+1116,16,0,212,1,
+40,1117,16,0,393,
+1,10,1118,19,164,
+1,10,1119,5,2,
+1,1114,1120,16,0,
+162,1,40,1121,16,
+0,333,1,11,1122,
+19,193,1,11,1123,
+5,146,1,1260,1124,
+17,1125,15,1126,4,
+34,37,0,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,50,0,49,
-0,1,225,1,3,
-1,6,1,5,1111,
-22,1,83,1,1011,
-1112,17,1113,15,1114,
-4,44,37,0,80,
-0,97,0,114,0,
-101,0,110,0,116,
-0,104,0,101,0,
-115,0,105,0,115,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,-1,1,5,
-1115,20,1116,4,46,
-80,0,97,0,114,
-0,101,0,110,0,
-116,0,104,0,101,
-0,115,0,105,0,
-115,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,50,
-0,1,272,1,3,
-1,4,1,3,1117,
-22,1,130,1,1514,
-1118,17,1119,15,1108,
-1,-1,1,5,1120,
-20,1121,4,38,83,
+1,-1,1,5,1127,
+20,1128,4,38,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
 115,0,105,0,103,
 0,110,0,109,0,
 101,0,110,0,116,
-0,95,0,49,0,
-52,0,1,218,1,
-3,1,4,1,3,
-1122,22,1,76,1,
-9,1123,17,1124,15,
-1125,4,24,37,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,1,-1,1,
-5,1126,20,1127,4,
-26,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,95,0,
-49,0,1,166,1,
-3,1,3,1,2,
-1128,22,1,24,1,
-262,1129,17,1130,15,
-1131,4,34,37,0,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
+0,95,0,50,0,
+49,0,1,234,1,
+3,1,6,1,5,
+1129,22,1,88,1,
+1011,1130,17,1131,15,
+1132,4,44,37,0,
+80,0,97,0,114,
+0,101,0,110,0,
+116,0,104,0,101,
+0,115,0,105,0,
+115,0,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,1,-1,1,
-5,1132,20,1133,4,
-36,66,0,105,0,
-110,0,97,0,114,
-0,121,0,69,0,
+5,1133,20,1134,4,
+46,80,0,97,0,
+114,0,101,0,110,
+0,116,0,104,0,
+101,0,115,0,105,
+0,115,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-53,0,1,254,1,
+50,0,1,281,1,
 3,1,4,1,3,
-1134,22,1,112,1,
-1267,1135,17,1136,15,
-1108,1,-1,1,5,
-1137,20,1138,4,36,
+1135,22,1,135,1,
+1514,1136,17,1137,15,
+1126,1,-1,1,5,
+1138,20,1139,4,38,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
 0,115,0,105,0,
 103,0,110,0,109,
 0,101,0,110,0,
-116,0,95,0,56,
-0,1,212,1,3,
-1,6,1,5,1139,
-22,1,70,1,2021,
-728,1,1521,1140,17,
-1141,15,1108,1,-1,
-1,5,1142,20,1143,
-4,36,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,1,205,
+116,0,95,0,49,
+0,52,0,1,227,
 1,3,1,4,1,
-3,1144,22,1,63,
-1,2024,1145,17,1146,
-15,1147,4,24,37,
-0,83,0,116,0,
-97,0,116,0,101,
-0,67,0,104,0,
-97,0,110,0,103,
-0,101,0,1,-1,
-1,5,1148,20,1149,
-4,26,83,0,116,
+3,1140,22,1,81,
+1,9,1141,17,1142,
+15,1143,4,24,37,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,1,-1,
+1,5,1144,20,1145,
+4,26,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,95,
+0,49,0,1,175,
+1,3,1,3,1,
+2,1146,22,1,29,
+1,262,1147,17,1148,
+15,1149,4,34,37,
+0,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,-1,
+1,5,1150,20,1151,
+4,36,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,53,0,1,263,
+1,3,1,4,1,
+3,1152,22,1,117,
+1,1267,1153,17,1154,
+15,1126,1,-1,1,
+5,1155,20,1156,4,
+36,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+56,0,1,221,1,
+3,1,6,1,5,
+1157,22,1,75,1,
+2021,747,1,1521,1158,
+17,1159,15,1126,1,
+-1,1,5,1160,20,
+1161,4,36,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+214,1,3,1,4,
+1,3,1162,22,1,
+68,1,2024,1163,17,
+1164,15,1165,4,24,
+37,0,83,0,116,
 0,97,0,116,0,
 101,0,67,0,104,
 0,97,0,110,0,
-103,0,101,0,95,
-0,49,0,1,187,
-1,3,1,3,1,
-2,1150,22,1,45,
-1,1775,1151,17,1152,
-15,1153,4,30,37,
-0,69,0,109,0,
-112,0,116,0,121,
+103,0,101,0,1,
+-1,1,5,1166,20,
+1167,4,26,83,0,
+116,0,97,0,116,
+0,101,0,67,0,
+104,0,97,0,110,
+0,103,0,101,0,
+95,0,49,0,1,
+196,1,3,1,3,
+1,2,1168,22,1,
+50,1,1775,1169,17,
+1170,15,1171,4,30,
+37,0,69,0,109,
+0,112,0,116,0,
+121,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+1,-1,1,5,1172,
+20,1173,4,32,69,
+0,109,0,112,0,
+116,0,121,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,49,
+0,1,180,1,3,
+1,1,1,0,1174,
+22,1,34,1,19,
+1175,17,1142,1,2,
+1146,1,2028,1176,17,
+1177,15,1178,4,20,
+37,0,74,0,117,
+0,109,0,112,0,
+76,0,97,0,98,
+0,101,0,108,0,
+1,-1,1,5,1179,
+20,1180,4,22,74,
+0,117,0,109,0,
+112,0,76,0,97,
+0,98,0,101,0,
+108,0,95,0,49,
+0,1,194,1,3,
+1,3,1,2,1181,
+22,1,48,1,2029,
+754,1,2281,1182,17,
+1183,15,1184,4,34,
+37,0,70,0,111,
+0,114,0,76,0,
+111,0,111,0,112,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,1,
--1,1,5,1154,20,
-1155,4,32,69,0,
-109,0,112,0,116,
-0,121,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,49,0,
-1,171,1,3,1,
-1,1,0,1156,22,
-1,29,1,19,1157,
-17,1124,1,2,1128,
-1,2028,1158,17,1159,
-15,1160,4,20,37,
-0,74,0,117,0,
-109,0,112,0,76,
-0,97,0,98,0,
-101,0,108,0,1,
--1,1,5,1161,20,
-1162,4,22,74,0,
-117,0,109,0,112,
-0,76,0,97,0,
-98,0,101,0,108,
-0,95,0,49,0,
-1,185,1,3,1,
-3,1,2,1163,22,
-1,43,1,2029,735,
-1,2281,1164,17,1165,
-15,1166,4,34,37,
-0,70,0,111,0,
-114,0,76,0,111,
-0,111,0,112,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,1,-1,
-1,5,1167,20,1168,
-4,36,70,0,111,
-0,114,0,76,0,
-111,0,111,0,112,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,50,0,1,200,
-1,3,1,2,1,
-1,1169,22,1,58,
-1,2031,746,1,2032,
-751,1,2033,756,1,
-2034,1170,16,0,587,
-1,2035,762,1,2036,
-1171,16,0,534,1,
-2037,767,1,2038,1172,
-16,0,538,1,2039,
-772,1,32,1173,17,
-1152,1,0,1156,1,
-2041,778,1,2042,1174,
-16,0,655,1,2043,
-784,1,2044,1175,16,
-0,599,1,2045,789,
-1,2299,1176,16,0,
-236,1,1296,1177,17,
-1178,15,1108,1,-1,
-1,5,1179,20,1180,
-4,38,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
+-1,1,5,1185,20,
+1186,4,36,70,0,
+111,0,114,0,76,
+0,111,0,111,0,
+112,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,50,0,1,
+209,1,3,1,2,
+1,1,1187,22,1,
+63,1,2031,765,1,
+2032,770,1,2033,775,
+1,2034,1188,16,0,
+594,1,2035,781,1,
+2036,1189,16,0,547,
+1,2037,786,1,2038,
+1190,16,0,551,1,
+2039,791,1,32,1191,
+17,1170,1,0,1174,
+1,2041,797,1,2042,
+1192,16,0,666,1,
+2043,803,1,2044,1193,
+16,0,608,1,2045,
+808,1,2299,1194,16,
+0,227,1,1296,1195,
+17,1196,15,1126,1,
+-1,1,5,1197,20,
+1198,4,38,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+95,0,50,0,48,
+0,1,233,1,3,
+1,6,1,5,1199,
+22,1,87,1,283,
+1200,17,1201,15,1149,
+1,-1,1,5,1202,
+20,1203,4,36,66,
+0,105,0,110,0,
+97,0,114,0,121,
+0,69,0,120,0,
+112,0,114,0,101,
 0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,50,0,48,0,
-1,224,1,3,1,
-6,1,5,1181,22,
-1,82,1,283,1182,
-17,1183,15,1131,1,
--1,1,5,1184,20,
-1185,4,36,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,52,0,1,
-253,1,3,1,4,
-1,3,1186,22,1,
-111,1,40,1187,17,
-1188,15,1189,4,32,
-37,0,73,0,100,
+105,0,111,0,110,
+0,95,0,52,0,
+1,262,1,3,1,
+4,1,3,1204,22,
+1,116,1,40,1205,
+17,1206,15,1207,4,
+32,37,0,73,0,
+100,0,101,0,110,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,-1,
+1,5,1208,20,1209,
+4,34,73,0,100,
 0,101,0,110,0,
 116,0,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,1,-1,1,
-5,1190,20,1191,4,
-34,73,0,100,0,
-101,0,110,0,116,
+110,0,95,0,49,
+0,1,248,1,3,
+1,2,1,1,1210,
+22,1,102,1,44,
+1211,17,1206,1,1,
+1210,1,1803,816,1,
+47,1212,17,1213,15,
+1214,4,38,37,0,
+73,0,100,0,101,
+0,110,0,116,0,
+68,0,111,0,116,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,49,0,
-1,239,1,3,1,
-2,1,1,1192,22,
-1,97,1,44,1193,
-17,1188,1,1,1192,
-1,1803,797,1,47,
-1194,17,1195,15,1196,
-4,38,37,0,73,
-0,100,0,101,0,
-110,0,116,0,68,
-0,111,0,116,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-1,-1,1,5,1197,
-20,1198,4,40,73,
-0,100,0,101,0,
-110,0,116,0,68,
-0,111,0,116,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,49,0,1,
-240,1,3,1,4,
-1,3,1199,22,1,
-98,1,48,1200,17,
-1201,15,1202,4,58,
-37,0,73,0,110,
-0,99,0,114,0,
-101,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,114,0,101,0,
-109,0,101,0,110,
-0,116,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,-1,
-1,5,1203,20,1204,
-4,60,73,0,110,
-0,99,0,114,0,
-101,0,109,0,101,
+0,1,-1,1,5,
+1215,20,1216,4,40,
+73,0,100,0,101,
 0,110,0,116,0,
-68,0,101,0,99,
-0,114,0,101,0,
-109,0,101,0,110,
-0,116,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-52,0,1,244,1,
-3,1,5,1,4,
-1205,22,1,102,1,
-49,1206,17,1207,15,
-1202,1,-1,1,5,
-1208,20,1209,4,60,
-73,0,110,0,99,
-0,114,0,101,0,
-109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,114,
-0,101,0,109,0,
-101,0,110,0,116,
+68,0,111,0,116,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,51,0,
-1,243,1,3,1,
-5,1,4,1210,22,
-1,101,1,50,1211,
-17,1212,15,1202,1,
--1,1,5,1213,20,
-1214,4,60,73,0,
+0,95,0,49,0,
+1,249,1,3,1,
+4,1,3,1217,22,
+1,103,1,48,1218,
+17,1219,15,1220,4,
+58,37,0,73,0,
+110,0,99,0,114,
+0,101,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,114,0,101,
+0,109,0,101,0,
+110,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,1,
+-1,1,5,1221,20,
+1222,4,60,73,0,
 110,0,99,0,114,
 0,101,0,109,0,
 101,0,110,0,116,
@@ -4472,12 +4553,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,50,0,1,242,
-1,3,1,3,1,
-2,1215,22,1,100,
-1,51,1216,17,1217,
-15,1202,1,-1,1,
-5,1218,20,1219,4,
+0,52,0,1,253,
+1,3,1,5,1,
+4,1223,22,1,107,
+1,49,1224,17,1225,
+15,1220,1,-1,1,
+5,1226,20,1227,4,
 60,73,0,110,0,
 99,0,114,0,101,
 0,109,0,101,0,
@@ -4489,81 +4570,80 @@ public yyLSLSyntax
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,95,0,49,
-0,1,241,1,3,
-1,3,1,2,1220,
-22,1,99,1,305,
-1221,17,1222,15,1131,
-1,-1,1,5,1223,
-20,1224,4,36,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,51,0,
-1,252,1,3,1,
-4,1,3,1225,22,
-1,110,1,525,1226,
-17,1227,15,1228,4,
-34,37,0,82,0,
-111,0,116,0,97,
-0,116,0,105,0,
-111,0,110,0,67,
+110,0,95,0,51,
+0,1,252,1,3,
+1,5,1,4,1228,
+22,1,106,1,50,
+1229,17,1230,15,1220,
+1,-1,1,5,1231,
+20,1232,4,60,73,
+0,110,0,99,0,
+114,0,101,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
+0,99,0,114,0,
+101,0,109,0,101,
+0,110,0,116,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
 0,111,0,110,0,
-115,0,116,0,97,
+95,0,50,0,1,
+251,1,3,1,3,
+1,2,1233,22,1,
+105,1,51,1234,17,
+1235,15,1220,1,-1,
+1,5,1236,20,1237,
+4,60,73,0,110,
+0,99,0,114,0,
+101,0,109,0,101,
 0,110,0,116,0,
-1,-1,1,5,1229,
-20,1230,4,36,82,
+68,0,101,0,99,
+0,114,0,101,0,
+109,0,101,0,110,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+49,0,1,250,1,
+3,1,3,1,2,
+1238,22,1,104,1,
+305,1239,17,1240,15,
+1149,1,-1,1,5,
+1241,20,1242,4,36,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,51,
+0,1,261,1,3,
+1,4,1,3,1243,
+22,1,115,1,525,
+1244,17,1245,15,1246,
+4,34,37,0,82,
 0,111,0,116,0,
 97,0,116,0,105,
 0,111,0,110,0,
 67,0,111,0,110,
 0,115,0,116,0,
 97,0,110,0,116,
-0,95,0,49,0,
-1,237,1,3,1,
-10,1,9,1231,22,
-1,95,1,63,1232,
-17,1233,15,1234,4,
-38,37,0,84,0,
-121,0,112,0,101,
-0,99,0,97,0,
-115,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,1,
--1,1,5,1235,20,
-1236,4,40,84,0,
-121,0,112,0,101,
-0,99,0,97,0,
-115,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,50,0,1,274,
-1,3,1,5,1,
-4,1237,22,1,132,
-1,66,1238,17,1239,
-15,1234,1,-1,1,
-5,1240,20,1241,4,
-40,84,0,121,0,
-112,0,101,0,99,
-0,97,0,115,0,
-116,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,51,
-0,1,275,1,3,
-1,7,1,6,1242,
-22,1,133,1,67,
-1243,17,1244,15,1234,
-1,-1,1,5,1245,
-20,1246,4,40,84,
+0,1,-1,1,5,
+1247,20,1248,4,36,
+82,0,111,0,116,
+0,97,0,116,0,
+105,0,111,0,110,
+0,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,95,0,49,
+0,1,246,1,3,
+1,10,1,9,1249,
+22,1,100,1,63,
+1250,17,1251,15,1252,
+4,38,37,0,84,
 0,121,0,112,0,
 101,0,99,0,97,
 0,115,0,116,0,
@@ -4571,12 +4651,21 @@ public yyLSLSyntax
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,55,0,1,
-279,1,3,1,8,
-1,7,1247,22,1,
-137,1,68,1248,17,
-1249,15,1234,1,-1,
-1,5,1250,20,1251,
+1,-1,1,5,1253,
+20,1254,4,40,84,
+0,121,0,112,0,
+101,0,99,0,97,
+0,115,0,116,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,50,0,1,
+283,1,3,1,5,
+1,4,1255,22,1,
+137,1,66,1256,17,
+1257,15,1252,1,-1,
+1,5,1258,20,1259,
 4,40,84,0,121,
 0,112,0,101,0,
 99,0,97,0,115,
@@ -4585,12 +4674,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-53,0,1,277,1,
-3,1,8,1,7,
-1252,22,1,135,1,
-69,1253,17,1254,15,
-1234,1,-1,1,5,
-1255,20,1256,4,40,
+51,0,1,284,1,
+3,1,7,1,6,
+1260,22,1,138,1,
+67,1261,17,1262,15,
+1252,1,-1,1,5,
+1263,20,1264,4,40,
 84,0,121,0,112,
 0,101,0,99,0,
 97,0,115,0,116,
@@ -4598,13 +4687,13 @@ public yyLSLSyntax
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,54,0,
-1,278,1,3,1,
-6,1,5,1257,22,
-1,136,1,70,1258,
-17,1259,15,1234,1,
--1,1,5,1260,20,
-1261,4,40,84,0,
+0,95,0,55,0,
+1,288,1,3,1,
+8,1,7,1265,22,
+1,142,1,68,1266,
+17,1267,15,1252,1,
+-1,1,5,1268,20,
+1269,4,40,84,0,
 121,0,112,0,101,
 0,99,0,97,0,
 115,0,116,0,69,
@@ -4612,12 +4701,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,52,0,1,276,
-1,3,1,6,1,
-5,1262,22,1,134,
-1,74,1263,17,1264,
-15,1234,1,-1,1,
-5,1265,20,1266,4,
+0,53,0,1,286,
+1,3,1,8,1,
+7,1270,22,1,140,
+1,69,1271,17,1272,
+15,1252,1,-1,1,
+5,1273,20,1274,4,
 40,84,0,121,0,
 112,0,101,0,99,
 0,97,0,115,0,
@@ -4625,238 +4714,479 @@ public yyLSLSyntax
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,95,0,57,
-0,1,281,1,3,
-1,7,1,6,1267,
-22,1,139,1,1013,
-1268,17,1269,15,1114,
-1,-1,1,5,1270,
-20,1271,4,46,80,
-0,97,0,114,0,
+110,0,95,0,54,
+0,1,287,1,3,
+1,6,1,5,1275,
+22,1,141,1,70,
+1276,17,1277,15,1252,
+1,-1,1,5,1278,
+20,1279,4,40,84,
+0,121,0,112,0,
+101,0,99,0,97,
+0,115,0,116,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,52,0,1,
+285,1,3,1,6,
+1,5,1280,22,1,
+139,1,74,1281,17,
+1282,15,1252,1,-1,
+1,5,1283,20,1284,
+4,40,84,0,121,
+0,112,0,101,0,
+99,0,97,0,115,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+57,0,1,290,1,
+3,1,7,1,6,
+1285,22,1,144,1,
+1013,1286,17,1287,15,
+1132,1,-1,1,5,
+1288,20,1289,4,46,
+80,0,97,0,114,
+0,101,0,110,0,
+116,0,104,0,101,
+0,115,0,105,0,
+115,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,49,
+0,1,280,1,3,
+1,4,1,3,1290,
+22,1,134,1,1332,
+1291,17,1292,15,1126,
+1,-1,1,5,1293,
+20,1294,4,38,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
 101,0,110,0,116,
-0,104,0,101,0,
-115,0,105,0,115,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
 0,95,0,49,0,
-1,271,1,3,1,
-4,1,3,1272,22,
-1,129,1,1332,1273,
-17,1274,15,1108,1,
--1,1,5,1275,20,
-1276,4,38,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,57,
-0,1,223,1,3,
-1,6,1,5,1277,
-22,1,81,1,2337,
-1278,17,1152,1,0,
-1156,1,1585,1279,17,
-1280,15,1281,4,32,
-37,0,82,0,101,
+57,0,1,232,1,
+3,1,6,1,5,
+1295,22,1,86,1,
+2337,1296,17,1170,1,
+0,1174,1,1585,1297,
+17,1298,15,1299,4,
+32,37,0,82,0,
+101,0,116,0,117,
+0,114,0,110,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,-1,
+1,5,1300,20,1301,
+4,34,82,0,101,
 0,116,0,117,0,
 114,0,110,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,1,-1,1,
-5,1282,20,1283,4,
-34,82,0,101,0,
-116,0,117,0,114,
-0,110,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
+116,0,95,0,50,
+0,1,239,1,3,
+1,2,1,1,1302,
+22,1,93,1,2023,
+1303,17,1304,15,1165,
+1,-1,1,5,1305,
+20,1306,4,26,83,
+0,116,0,97,0,
+116,0,101,0,67,
+0,104,0,97,0,
+110,0,103,0,101,
 0,95,0,50,0,
-1,230,1,3,1,
-2,1,1,1284,22,
-1,88,1,2023,1285,
-17,1286,15,1147,1,
--1,1,5,1287,20,
-1288,4,26,83,0,
-116,0,97,0,116,
-0,101,0,67,0,
-104,0,97,0,110,
-0,103,0,101,0,
-95,0,50,0,1,
-188,1,3,1,3,
-1,2,1289,22,1,
-46,1,2136,852,1,
-82,1290,17,1291,15,
-1292,4,32,37,0,
+1,197,1,3,1,
+3,1,2,1307,22,
+1,51,1,2136,871,
+1,82,1308,17,1309,
+15,1310,4,32,37,
+0,85,0,110,0,
+97,0,114,0,121,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,1,-1,1,5,
+1311,20,1312,4,34,
 85,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-1,-1,1,5,1293,
-20,1294,4,34,85,
+95,0,51,0,1,
+279,1,3,1,3,
+1,2,1313,22,1,
+133,1,2026,1314,17,
+1315,15,1316,4,28,
+37,0,74,0,117,
+0,109,0,112,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,-1,
+1,5,1317,20,1318,
+4,30,74,0,117,
+0,109,0,112,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,1,195,1,
+3,1,3,1,2,
+1319,22,1,49,1,
+1591,1320,17,1321,15,
+1299,1,-1,1,5,
+1322,20,1323,4,34,
+82,0,101,0,116,
+0,117,0,114,0,
+110,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+238,1,3,1,3,
+1,2,1324,22,1,
+92,1,1341,1325,17,
+1326,15,1126,1,-1,
+1,5,1327,20,1328,
+4,36,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,54,0,1,219,
+1,3,1,4,1,
+3,1329,22,1,73,
+1,2030,760,1,328,
+1330,17,1331,15,1149,
+1,-1,1,5,1332,
+20,1333,4,36,66,
+0,105,0,110,0,
+97,0,114,0,121,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,50,0,
+1,260,1,3,1,
+4,1,3,1334,22,
+1,114,1,1303,1335,
+17,1336,15,1126,1,
+-1,1,5,1337,20,
+1338,4,36,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+95,0,55,0,1,
+220,1,3,1,6,
+1,5,1339,22,1,
+74,1,1096,1340,17,
+1341,15,1342,4,26,
+37,0,70,0,117,
+0,110,0,99,0,
+116,0,105,0,111,
+0,110,0,67,0,
+97,0,108,0,108,
+0,1,-1,1,5,
+1343,20,1344,4,28,
+70,0,117,0,110,
+0,99,0,116,0,
+105,0,111,0,110,
+0,67,0,97,0,
+108,0,108,0,95,
+0,49,0,1,291,
+1,3,1,5,1,
+4,1345,22,1,145,
+1,93,1346,17,1347,
+15,1310,1,-1,1,
+5,1348,20,1349,4,
+34,85,0,110,0,
+97,0,114,0,121,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,50,0,
+1,278,1,3,1,
+3,1,2,1350,22,
+1,132,1,1550,1351,
+17,1352,15,1126,1,
+-1,1,5,1353,20,
+1354,4,38,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,51,
+0,1,226,1,3,
+1,4,1,3,1355,
+22,1,80,1,2040,
+1356,16,0,555,1,
+2106,1357,17,1170,1,
+0,1174,1,1555,1358,
+16,0,629,1,827,
+1359,17,1360,15,1149,
+1,-1,1,5,1361,
+20,1362,4,38,66,
+0,105,0,110,0,
+97,0,114,0,121,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,49,0,
+53,0,1,273,1,
+3,1,4,1,3,
+1363,22,1,127,1,
+1859,1364,16,0,303,
+1,1860,850,1,1804,
+1365,17,1170,1,0,
+1174,1,107,1366,17,
+1367,15,1310,1,-1,
+1,5,1368,20,1369,
+4,34,85,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,49,
+0,1,277,1,3,
+1,3,1,2,1370,
+22,1,131,1,1114,
+1371,17,1213,1,3,
+1217,1,1048,1372,17,
+1373,15,1149,1,-1,
+1,5,1374,20,1375,
+4,38,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,51,0,1,270,
-1,3,1,3,1,
-2,1295,22,1,128,
-1,2026,1296,17,1297,
-15,1298,4,28,37,
-0,74,0,117,0,
-109,0,112,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,1299,20,1300,4,
-30,74,0,117,0,
-109,0,112,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,1,186,1,3,
-1,3,1,2,1301,
-22,1,44,1,1591,
-1302,17,1303,15,1281,
-1,-1,1,5,1304,
-20,1305,4,34,82,
-0,101,0,116,0,
-117,0,114,0,110,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,1,229,
-1,3,1,3,1,
-2,1306,22,1,87,
-1,1341,1307,17,1308,
-15,1108,1,-1,1,
-5,1309,20,1310,4,
-36,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-54,0,1,210,1,
-3,1,4,1,3,
-1311,22,1,68,1,
-2030,741,1,328,1312,
-17,1313,15,1131,1,
--1,1,5,1314,20,
-1315,4,36,66,0,
+0,49,0,56,0,
+1,276,1,3,1,
+4,1,3,1376,22,
+1,130,1,352,1377,
+17,1378,15,1149,1,
+-1,1,5,1379,20,
+1380,4,36,66,0,
 105,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,50,0,1,
-251,1,3,1,4,
-1,3,1316,22,1,
-109,1,1303,1317,17,
-1318,15,1108,1,-1,
-1,5,1319,20,1320,
-4,36,83,0,105,
+95,0,49,0,1,
+259,1,3,1,4,
+1,3,1381,22,1,
+113,1,1872,1382,16,
+0,313,1,1873,864,
+1,118,1383,17,1384,
+15,1149,1,-1,1,
+5,1385,20,1386,4,
+38,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+49,0,52,0,1,
+272,1,3,1,4,
+1,3,1387,22,1,
+126,1,1123,1388,17,
+1389,15,1126,1,-1,
+1,5,1390,20,1391,
+4,38,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
 0,115,0,115,0,
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,55,0,1,211,
-1,3,1,6,1,
-5,1321,22,1,69,
-1,1096,1322,17,1323,
-15,1324,4,26,37,
-0,70,0,117,0,
+0,49,0,50,0,
+1,225,1,3,1,
+6,1,5,1392,22,
+1,79,1,371,1393,
+17,1394,15,1395,4,
+46,37,0,70,0,
+117,0,110,0,99,
+0,116,0,105,0,
+111,0,110,0,67,
+0,97,0,108,0,
+108,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,-1,1,
+5,1396,20,1397,4,
+48,70,0,117,0,
 110,0,99,0,116,
 0,105,0,111,0,
 110,0,67,0,97,
 0,108,0,108,0,
-1,-1,1,5,1325,
-20,1326,4,28,70,
-0,117,0,110,0,
-99,0,116,0,105,
-0,111,0,110,0,
-67,0,97,0,108,
-0,108,0,95,0,
-49,0,1,282,1,
-3,1,5,1,4,
-1327,22,1,140,1,
-93,1328,17,1329,15,
-1292,1,-1,1,5,
-1330,20,1331,4,34,
-85,0,110,0,97,
-0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,50,0,1,
-269,1,3,1,3,
-1,2,1332,22,1,
-127,1,1550,1333,17,
-1334,15,1108,1,-1,
-1,5,1335,20,1336,
-4,38,83,0,105,
+95,0,49,0,1,
+258,1,3,1,2,
+1,1,1398,22,1,
+112,1,1377,1399,17,
+1400,15,1126,1,-1,
+1,5,1401,20,1402,
+4,36,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
 0,115,0,115,0,
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,51,0,
-1,217,1,3,1,
-4,1,3,1337,22,
-1,75,1,2040,1338,
-16,0,542,1,2106,
-1339,17,1152,1,0,
-1156,1,1555,1340,16,
-0,615,1,827,1341,
-17,1342,15,1131,1,
--1,1,5,1343,20,
-1344,4,38,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
+0,53,0,1,218,
+1,3,1,4,1,
+3,1403,22,1,72,
+1,375,1404,17,1405,
+15,1220,1,-1,1,
+5,1406,20,1407,4,
+60,73,0,110,0,
+99,0,114,0,101,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+114,0,101,0,109,
+0,101,0,110,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,56,
+0,1,257,1,3,
+1,5,1,4,1408,
+22,1,111,1,377,
+1409,17,1410,15,1220,
+1,-1,1,5,1411,
+20,1412,4,60,73,
+0,110,0,99,0,
+114,0,101,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
+0,99,0,114,0,
+101,0,109,0,101,
+0,110,0,116,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,49,0,53,
-0,1,264,1,3,
-1,4,1,3,1345,
-22,1,122,1,1859,
-1346,16,0,313,1,
-1860,831,1,1804,1347,
-17,1152,1,0,1156,
-1,107,1348,17,1349,
-15,1292,1,-1,1,
-5,1350,20,1351,4,
-34,85,0,110,0,
-97,0,114,0,121,
+95,0,53,0,1,
+254,1,3,1,3,
+1,2,1413,22,1,
+108,1,379,1414,17,
+1415,15,1220,1,-1,
+1,5,1416,20,1417,
+4,60,73,0,110,
+0,99,0,114,0,
+101,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,114,0,101,0,
+109,0,101,0,110,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+55,0,1,256,1,
+3,1,5,1,4,
+1418,22,1,110,1,
+380,1419,17,1420,15,
+1421,4,38,37,0,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,1,-1,1,5,
+1422,20,1423,4,40,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,49,0,
-1,268,1,3,1,
-3,1,2,1352,22,
-1,126,1,1114,1353,
-17,1195,1,3,1199,
-1,1048,1354,17,1355,
-15,1131,1,-1,1,
-5,1356,20,1357,4,
+1,247,1,3,1,
+2,1,1,1424,22,
+1,101,1,883,1425,
+17,1426,15,1149,1,
+-1,1,5,1427,20,
+1428,4,38,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,49,0,54,
+0,1,274,1,3,
+1,4,1,3,1429,
+22,1,128,1,1628,
+1430,17,1431,15,1432,
+4,22,37,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,1,
+-1,1,5,1433,20,
+1434,4,24,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,1,212,1,
+3,1,4,1,3,
+1435,22,1,66,1,
+2075,1436,17,1170,1,
+0,1174,1,373,1437,
+17,1438,15,1220,1,
+-1,1,5,1439,20,
+1440,4,60,73,0,
+110,0,99,0,114,
+0,101,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,114,0,101,
+0,109,0,101,0,
+110,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,54,0,1,255,
+1,3,1,3,1,
+2,1441,22,1,109,
+1,130,1442,17,1443,
+15,1149,1,-1,1,
+5,1444,20,1445,4,
 38,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
@@ -4864,40 +5194,27 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,56,0,1,
-267,1,3,1,4,
-1,3,1358,22,1,
-125,1,352,1359,17,
-1360,15,1131,1,-1,
-1,5,1361,20,1362,
-4,36,66,0,105,
+49,0,51,0,1,
+271,1,3,1,4,
+1,3,1446,22,1,
+125,1,143,1447,17,
+1448,15,1149,1,-1,
+1,5,1449,20,1450,
+4,38,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,49,0,1,250,
-1,3,1,4,1,
-3,1363,22,1,108,
-1,1872,1364,16,0,
-323,1,1873,845,1,
-118,1365,17,1366,15,
-1131,1,-1,1,5,
-1367,20,1368,4,38,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,52,0,1,263,
-1,3,1,4,1,
-3,1369,22,1,121,
-1,1123,1370,17,1371,
-15,1108,1,-1,1,
-5,1372,20,1373,4,
+0,49,0,50,0,
+1,270,1,3,1,
+4,1,3,1451,22,
+1,124,1,1901,1452,
+17,1170,1,0,1174,
+1,1152,1453,17,1454,
+15,1126,1,-1,1,
+5,1455,20,1456,4,
 38,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
@@ -4905,312 +5222,66 @@ public yyLSLSyntax
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,50,0,1,
-216,1,3,1,6,
-1,5,1374,22,1,
-74,1,371,1375,17,
-1376,15,1377,4,46,
-37,0,70,0,117,
-0,110,0,99,0,
-116,0,105,0,111,
-0,110,0,67,0,
-97,0,108,0,108,
-0,69,0,120,0,
-112,0,114,0,101,
+50,0,52,0,1,
+237,1,3,1,6,
+1,5,1457,22,1,
+91,1,1406,1458,17,
+1459,15,1126,1,-1,
+1,5,1460,20,1461,
+4,38,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
 0,115,0,115,0,
-105,0,111,0,110,
-0,1,-1,1,5,
-1378,20,1379,4,48,
-70,0,117,0,110,
-0,99,0,116,0,
-105,0,111,0,110,
-0,67,0,97,0,
-108,0,108,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,49,0,1,249,
-1,3,1,2,1,
-1,1380,22,1,107,
-1,1377,1381,17,1382,
-15,1108,1,-1,1,
-5,1383,20,1384,4,
-36,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-53,0,1,209,1,
-3,1,4,1,3,
-1385,22,1,67,1,
-375,1386,17,1387,15,
-1202,1,-1,1,5,
-1388,20,1389,4,60,
-73,0,110,0,99,
-0,114,0,101,0,
-109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,114,
-0,101,0,109,0,
-101,0,110,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,56,0,
-1,248,1,3,1,
-5,1,4,1390,22,
-1,106,1,377,1391,
-17,1392,15,1202,1,
--1,1,5,1393,20,
-1394,4,60,73,0,
-110,0,99,0,114,
-0,101,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
-99,0,114,0,101,
+105,0,103,0,110,
 0,109,0,101,0,
-110,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,53,0,1,245,
-1,3,1,3,1,
-2,1395,22,1,103,
-1,379,1396,17,1397,
-15,1202,1,-1,1,
-5,1398,20,1399,4,
-60,73,0,110,0,
-99,0,114,0,101,
+110,0,116,0,95,
+0,49,0,55,0,
+1,230,1,3,1,
+4,1,3,1462,22,
+1,84,1,1659,1463,
+16,0,269,1,2413,
+1464,17,1170,1,0,
+1174,1,1159,1465,17,
+1466,15,1126,1,-1,
+1,5,1467,20,1468,
+4,38,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
 0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-114,0,101,0,109,
-0,101,0,110,0,
-116,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,55,
-0,1,247,1,3,
-1,5,1,4,1400,
-22,1,105,1,380,
-1401,17,1402,15,1403,
-4,38,37,0,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-1,-1,1,5,1404,
-20,1405,4,40,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
+110,0,116,0,95,
+0,49,0,49,0,
+1,224,1,3,1,
+6,1,5,1469,22,
+1,78,1,157,1470,
+17,1471,15,1149,1,
+-1,1,5,1472,20,
+1473,4,38,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,49,0,1,
-238,1,3,1,2,
-1,1,1406,22,1,
-96,1,883,1407,17,
-1408,15,1131,1,-1,
-1,5,1409,20,1410,
-4,38,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,49,0,54,0,
-1,265,1,3,1,
-4,1,3,1411,22,
-1,123,1,1628,1412,
-17,1413,15,1414,4,
-22,37,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,1,-1,
-1,5,1415,20,1416,
-4,24,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,1,203,1,3,
-1,4,1,3,1417,
-22,1,61,1,2075,
-1418,17,1152,1,0,
-1156,1,373,1419,17,
-1420,15,1202,1,-1,
-1,5,1421,20,1422,
-4,60,73,0,110,
-0,99,0,114,0,
-101,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,114,0,101,0,
-109,0,101,0,110,
-0,116,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-54,0,1,246,1,
-3,1,3,1,2,
-1423,22,1,104,1,
-130,1424,17,1425,15,
-1131,1,-1,1,5,
-1426,20,1427,4,38,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,51,0,1,262,
-1,3,1,4,1,
-3,1428,22,1,120,
-1,143,1429,17,1430,
-15,1131,1,-1,1,
-5,1431,20,1432,4,
-38,66,0,105,0,
-110,0,97,0,114,
-0,121,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-49,0,50,0,1,
-261,1,3,1,4,
-1,3,1433,22,1,
-119,1,1901,1434,17,
-1152,1,0,1156,1,
-1152,1435,17,1436,15,
-1108,1,-1,1,5,
-1437,20,1438,4,38,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,50,
-0,52,0,1,228,
-1,3,1,6,1,
-5,1439,22,1,86,
-1,1406,1440,17,1441,
-15,1108,1,-1,1,
-5,1442,20,1443,4,
-38,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,55,0,1,
-221,1,3,1,4,
-1,3,1444,22,1,
-79,1,1659,1445,16,
-0,278,1,2413,1446,
-17,1152,1,0,1156,
-1,1159,1447,17,1448,
-15,1108,1,-1,1,
-5,1449,20,1450,4,
-38,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,49,0,1,
-215,1,3,1,6,
-1,5,1451,22,1,
-73,1,157,1452,17,
-1453,15,1131,1,-1,
-1,5,1454,20,1455,
-4,38,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,49,0,49,0,
-1,260,1,3,1,
-4,1,3,1456,22,
-1,118,1,1413,1457,
-17,1458,15,1108,1,
--1,1,5,1459,20,
-1460,4,36,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,52,0,1,
-208,1,3,1,4,
-1,3,1461,22,1,
-66,1,2669,1462,16,
-0,303,1,1478,1463,
-17,1464,15,1108,1,
--1,1,5,1465,20,
-1466,4,38,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,53,
-0,1,219,1,3,
-1,4,1,3,1467,
-22,1,77,1,2676,
-1468,16,0,624,1,
-1621,1469,16,0,678,
-1,1574,809,1,172,
-1470,17,1471,15,1131,
-1,-1,1,5,1472,
-20,1473,4,38,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,49,0,
-48,0,1,259,1,
-3,1,4,1,3,
-1474,22,1,117,1,
-1931,870,1,1665,1475,
-17,1476,15,1166,1,
--1,1,5,1477,20,
-1478,4,36,70,0,
-111,0,114,0,76,
-0,111,0,111,0,
-112,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,1,
-199,1,3,1,2,
-1,1,1479,22,1,
-57,1,2364,837,1,
-2105,824,1,1188,1480,
-17,1481,15,1108,1,
+95,0,49,0,49,
+0,1,269,1,3,
+1,4,1,3,1474,
+22,1,123,1,1413,
+1475,17,1476,15,1126,
+1,-1,1,5,1477,
+20,1478,4,36,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
+101,0,110,0,116,
+0,95,0,52,0,
+1,217,1,3,1,
+4,1,3,1479,22,
+1,71,1,1370,1480,
+17,1481,15,1126,1,
 -1,1,5,1482,20,
 1483,4,38,83,0,
 105,0,109,0,112,
@@ -5219,11 +5290,11 @@ public yyLSLSyntax
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,50,0,51,
-0,1,227,1,3,
-1,6,1,5,1484,
-22,1,85,1,1442,
-1485,17,1486,15,1108,
+95,0,49,0,56,
+0,1,231,1,3,
+1,4,1,3,1484,
+22,1,85,1,1478,
+1485,17,1486,15,1126,
 1,-1,1,5,1487,
 20,1488,4,38,83,
 0,105,0,109,0,
@@ -5233,13 +5304,24 @@ public yyLSLSyntax
 0,110,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-54,0,1,220,1,
+53,0,1,228,1,
 3,1,4,1,3,
-1489,22,1,78,1,
-1694,1490,16,0,200,
-1,942,1491,17,1492,
-15,1131,1,-1,1,
-5,1493,20,1494,4,
+1489,22,1,82,1,
+1620,1490,17,1491,15,
+1432,1,-1,1,5,
+1492,20,1493,4,24,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+95,0,50,0,1,
+213,1,3,1,2,
+1,1,1494,22,1,
+67,1,1621,1495,16,
+0,695,1,1574,828,
+1,172,1496,17,1497,
+15,1149,1,-1,1,
+5,1498,20,1499,4,
 38,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
@@ -5247,112 +5329,29 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,55,0,1,
-266,1,3,1,4,
-1,3,1495,22,1,
-124,1,2198,1496,17,
-1152,1,0,1156,1,
-1195,1497,17,1498,15,
-1108,1,-1,1,5,
-1499,20,1500,4,38,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,48,0,1,214,
-1,3,1,6,1,
-5,1501,22,1,72,
-1,1449,1502,17,1503,
-15,1108,1,-1,1,
+49,0,48,0,1,
+268,1,3,1,4,
+1,3,1500,22,1,
+122,1,1931,889,1,
+2685,1501,16,0,659,
+1,1665,1502,17,1503,
+15,1184,1,-1,1,
 5,1504,20,1505,4,
-36,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
+36,70,0,111,0,
+114,0,76,0,111,
+0,111,0,112,0,
+83,0,116,0,97,
+0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-51,0,1,207,1,
-3,1,4,1,3,
-1506,22,1,65,1,
-1701,1507,17,1508,15,
-1166,1,-1,1,5,
-1509,20,1510,4,36,
-70,0,111,0,114,
-0,76,0,111,0,
-111,0,112,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,51,
-0,1,201,1,3,
-1,4,1,3,1511,
-22,1,59,1,447,
-1512,17,1513,15,1514,
-4,30,37,0,86,
-0,101,0,99,0,
-116,0,111,0,114,
-0,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,1,-1,1,
-5,1515,20,1516,4,
-32,86,0,101,0,
-99,0,116,0,111,
-0,114,0,67,0,
-111,0,110,0,115,
-0,116,0,97,0,
-110,0,116,0,95,
-0,49,0,1,236,
-1,3,1,8,1,
-7,1517,22,1,94,
-1,2458,885,1,2459,
-891,1,1958,1518,17,
-1152,1,0,1156,1,
-188,1519,17,1520,15,
-1131,1,-1,1,5,
-1521,20,1522,4,36,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,57,
-0,1,258,1,3,
-1,4,1,3,1523,
-22,1,116,1,2462,
-898,1,1657,903,1,
-2464,908,1,205,1524,
-17,1525,15,1131,1,
--1,1,5,1526,20,
-1527,4,36,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,56,0,1,
-257,1,3,1,4,
-1,3,1528,22,1,
-115,1,1620,1529,17,
-1530,15,1414,1,-1,
-1,5,1531,20,1532,
-4,24,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,50,
-0,1,204,1,3,
-1,2,1,1,1533,
-22,1,62,1,2227,
-917,1,1224,1534,17,
-1535,15,1108,1,-1,
-1,5,1536,20,1537,
+49,0,1,208,1,
+3,1,2,1,1,
+1506,22,1,62,1,
+2364,856,1,2105,843,
+1,2692,1507,16,0,
+657,1,1188,1508,17,
+1509,15,1126,1,-1,
+1,5,1510,20,1511,
 4,38,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -5360,349 +5359,504 @@ public yyLSLSyntax
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,50,0,50,0,
-1,226,1,3,1,
-6,1,5,1538,22,
-1,84,1,223,1539,
-17,1540,15,1131,1,
--1,1,5,1541,20,
-1542,4,36,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,55,0,1,
-256,1,3,1,4,
-1,3,1543,22,1,
-114,1,1730,1544,17,
-1545,15,1166,1,-1,
-1,5,1546,20,1547,
-4,36,70,0,111,
-0,114,0,76,0,
-111,0,111,0,112,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,52,0,1,202,
-1,3,1,4,1,
-3,1548,22,1,60,
-1,476,1549,17,1550,
-15,1551,4,18,37,
-0,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,1,-1,1,
-5,1552,20,1553,4,
-20,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,95,0,52,
-0,1,234,1,3,
-1,2,1,1,1554,
-22,1,92,1,477,
-1555,17,1556,15,1551,
-1,-1,1,5,1557,
-20,1558,4,20,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-95,0,51,0,1,
-233,1,3,1,2,
-1,1,1559,22,1,
-91,1,1231,1560,17,
-1561,15,1108,1,-1,
-1,5,1562,20,1563,
-4,36,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,57,0,1,213,
-1,3,1,6,1,
-5,1564,22,1,71,
-1,479,1565,17,1566,
-15,1551,1,-1,1,
-5,1567,20,1568,4,
-20,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,95,0,49,
-0,1,231,1,3,
-1,2,1,1,1569,
-22,1,89,1,480,
-1570,17,1571,15,1572,
-4,26,37,0,76,
-0,105,0,115,0,
-116,0,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,1,-1,
-1,5,1573,20,1574,
-4,28,76,0,105,
-0,115,0,116,0,
-67,0,111,0,110,
-0,115,0,116,0,
-97,0,110,0,116,
-0,95,0,49,0,
-1,235,1,3,1,
-4,1,3,1575,22,
-1,93,1,1485,1576,
-17,1577,15,1108,1,
--1,1,5,1578,20,
-1579,4,36,83,0,
+0,50,0,51,0,
+1,236,1,3,1,
+6,1,5,1512,22,
+1,90,1,1442,1513,
+17,1514,15,1126,1,
+-1,1,5,1515,20,
+1516,4,38,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,50,0,1,
-206,1,3,1,4,
-1,3,1580,22,1,
-64,1,1737,1581,16,
-0,280,1,1989,925,
-1,1990,1582,17,1152,
-1,0,1156,1,242,
-1583,17,1584,15,1131,
-1,-1,1,5,1585,
-20,1586,4,36,66,
+95,0,49,0,54,
+0,1,229,1,3,
+1,4,1,3,1517,
+22,1,83,1,1694,
+1518,16,0,191,1,
+942,1519,17,1520,15,
+1149,1,-1,1,5,
+1521,20,1522,4,38,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,49,
+0,55,0,1,275,
+1,3,1,4,1,
+3,1523,22,1,129,
+1,2198,1524,17,1170,
+1,0,1174,1,1195,
+1525,17,1526,15,1126,
+1,-1,1,5,1527,
+20,1528,4,38,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
+101,0,110,0,116,
+0,95,0,49,0,
+48,0,1,223,1,
+3,1,6,1,5,
+1529,22,1,77,1,
+1449,1530,17,1531,15,
+1126,1,-1,1,5,
+1532,20,1533,4,36,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,51,
+0,1,216,1,3,
+1,4,1,3,1534,
+22,1,70,1,1701,
+1535,17,1536,15,1184,
+1,-1,1,5,1537,
+20,1538,4,36,70,
+0,111,0,114,0,
+76,0,111,0,111,
+0,112,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,51,0,
+1,210,1,3,1,
+4,1,3,1539,22,
+1,64,1,447,1540,
+17,1541,15,1542,4,
+30,37,0,86,0,
+101,0,99,0,116,
+0,111,0,114,0,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,1,-1,1,5,
+1543,20,1544,4,32,
+86,0,101,0,99,
+0,116,0,111,0,
+114,0,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
+0,116,0,95,0,
+49,0,1,245,1,
+3,1,8,1,7,
+1545,22,1,99,1,
+2458,904,1,2459,910,
+1,1958,1546,17,1170,
+1,0,1174,1,188,
+1547,17,1548,15,1149,
+1,-1,1,5,1549,
+20,1550,4,36,66,
 0,105,0,110,0,
 97,0,114,0,121,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,54,0,
-1,255,1,3,1,
-4,1,3,1587,22,
-1,113,1,478,1588,
-17,1589,15,1551,1,
+0,95,0,57,0,
+1,267,1,3,1,
+4,1,3,1551,22,
+1,121,1,2462,917,
+1,1657,922,1,2464,
+927,1,205,1552,17,
+1553,15,1149,1,-1,
+1,5,1554,20,1555,
+4,36,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,56,0,1,266,
+1,3,1,4,1,
+3,1556,22,1,120,
+1,2227,936,1,1224,
+1557,17,1558,15,1126,
+1,-1,1,5,1559,
+20,1560,4,38,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
+101,0,110,0,116,
+0,95,0,50,0,
+50,0,1,235,1,
+3,1,6,1,5,
+1561,22,1,89,1,
+223,1562,17,1563,15,
+1149,1,-1,1,5,
+1564,20,1565,4,36,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,55,
+0,1,265,1,3,
+1,4,1,3,1566,
+22,1,119,1,1730,
+1567,17,1568,15,1184,
+1,-1,1,5,1569,
+20,1570,4,36,70,
+0,111,0,114,0,
+76,0,111,0,111,
+0,112,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,52,0,
+1,211,1,3,1,
+4,1,3,1571,22,
+1,65,1,476,1572,
+17,1573,15,1574,4,
+18,37,0,67,0,
+111,0,110,0,115,
+0,116,0,97,0,
+110,0,116,0,1,
+-1,1,5,1575,20,
+1576,4,20,67,0,
+111,0,110,0,115,
+0,116,0,97,0,
+110,0,116,0,95,
+0,52,0,1,243,
+1,3,1,2,1,
+1,1577,22,1,97,
+1,477,1578,17,1579,
+15,1574,1,-1,1,
+5,1580,20,1581,4,
+20,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,95,0,51,
+0,1,242,1,3,
+1,2,1,1,1582,
+22,1,96,1,1231,
+1583,17,1584,15,1126,
+1,-1,1,5,1585,
+20,1586,4,36,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
+101,0,110,0,116,
+0,95,0,57,0,
+1,222,1,3,1,
+6,1,5,1587,22,
+1,76,1,479,1588,
+17,1589,15,1574,1,
 -1,1,5,1590,20,
 1591,4,20,67,0,
 111,0,110,0,115,
 0,116,0,97,0,
 110,0,116,0,95,
-0,50,0,1,232,
+0,49,0,1,240,
 1,3,1,2,1,
-1,1592,22,1,90,
-1,1370,1593,17,1594,
-15,1108,1,-1,1,
-5,1595,20,1596,4,
-38,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
+1,1592,22,1,94,
+1,480,1593,17,1594,
+15,1595,4,26,37,
+0,76,0,105,0,
+115,0,116,0,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+1,-1,1,5,1596,
+20,1597,4,28,76,
+0,105,0,115,0,
+116,0,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
 0,116,0,95,0,
-49,0,56,0,1,
-222,1,3,1,4,
-1,3,1597,22,1,
-80,1,1001,1598,17,
-1599,15,1234,1,-1,
-1,5,1600,20,1601,
-4,40,84,0,121,
-0,112,0,101,0,
-99,0,97,0,115,
-0,116,0,69,0,
+49,0,1,244,1,
+3,1,4,1,3,
+1598,22,1,98,1,
+1485,1599,17,1600,15,
+1126,1,-1,1,5,
+1601,20,1602,4,36,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,50,
+0,1,215,1,3,
+1,4,1,3,1603,
+22,1,69,1,1737,
+1604,16,0,271,1,
+1989,944,1,1990,1605,
+17,1170,1,0,1174,
+1,242,1606,17,1607,
+15,1149,1,-1,1,
+5,1608,20,1609,4,
+36,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-56,0,1,280,1,
-3,1,5,1,4,
-1602,22,1,138,1,
-1002,1603,17,1604,15,
-1234,1,-1,1,5,
-1605,20,1606,4,40,
-84,0,121,0,112,
-0,101,0,99,0,
-97,0,115,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,49,0,
-1,273,1,3,1,
-5,1,4,1607,22,
-1,131,1,12,1608,
-19,163,1,12,1609,
-5,44,1,1901,1610,
-16,0,161,1,2075,
-1611,16,0,161,1,
-1860,831,1,1803,797,
-1,1804,1612,16,0,
-161,1,2413,1613,16,
-0,161,1,2198,1614,
-16,0,161,1,1873,
-845,1,1657,903,1,
-1989,925,1,1990,1615,
-16,0,161,1,31,
-1616,16,0,161,1,
-32,1617,16,0,161,
-1,2105,824,1,2106,
-1618,16,0,161,1,
-2227,917,1,2337,1619,
-16,0,161,1,2665,
-1620,16,0,161,1,
-2021,728,1,2458,885,
-1,2459,891,1,2462,
-898,1,2136,852,1,
-2464,908,1,2029,735,
-1,2030,741,1,2031,
-746,1,2032,751,1,
-2469,1621,16,0,468,
-1,2035,762,1,2364,
-837,1,2039,772,1,
-1931,870,1,2041,778,
-1,2507,1622,16,0,
-161,1,2043,784,1,
-2045,789,1,1775,1623,
-16,0,161,1,2568,
-1624,16,0,583,1,
-2033,756,1,2522,1625,
-16,0,161,1,2037,
-767,1,1574,809,1,
-1958,1626,16,0,161,
-1,13,1627,19,151,
-1,13,1628,5,37,
-1,2509,1629,17,1630,
-15,1631,4,36,37,
-0,86,0,111,0,
+54,0,1,264,1,
+3,1,4,1,3,
+1610,22,1,118,1,
+478,1611,17,1612,15,
+1574,1,-1,1,5,
+1613,20,1614,4,20,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,95,0,50,0,
+1,241,1,3,1,
+2,1,1,1615,22,
+1,95,1,1001,1616,
+17,1617,15,1252,1,
+-1,1,5,1618,20,
+1619,4,40,84,0,
+121,0,112,0,101,
+0,99,0,97,0,
+115,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,56,0,1,289,
+1,3,1,5,1,
+4,1620,22,1,143,
+1,1002,1621,17,1622,
+15,1252,1,-1,1,
+5,1623,20,1624,4,
+40,84,0,121,0,
+112,0,101,0,99,
+0,97,0,115,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,49,
+0,1,282,1,3,
+1,5,1,4,1625,
+22,1,136,1,12,
+1626,19,157,1,12,
+1627,5,45,1,1901,
+1628,16,0,155,1,
+2075,1629,16,0,155,
+1,1860,850,1,1803,
+816,1,2516,1630,16,
+0,155,1,2413,1631,
+16,0,155,1,1804,
+1632,16,0,155,1,
+2198,1633,16,0,155,
+1,1873,864,1,1657,
+922,1,2531,1634,16,
+0,155,1,1989,944,
+1,1990,1635,16,0,
+155,1,31,1636,16,
+0,155,1,32,1637,
+16,0,155,1,2105,
+843,1,2106,1638,16,
+0,155,1,2681,1639,
+16,0,155,1,2580,
+1640,16,0,316,1,
+2227,936,1,2337,1641,
+16,0,155,1,2021,
+747,1,2458,904,1,
+2459,910,1,2462,917,
+1,2136,871,1,2464,
+927,1,2029,754,1,
+2030,760,1,2031,765,
+1,2032,770,1,2469,
+1642,16,0,479,1,
+2035,781,1,2364,856,
+1,2039,791,1,1931,
+889,1,2041,797,1,
+2507,1643,16,0,155,
+1,2043,803,1,2045,
+808,1,1775,1644,16,
+0,155,1,2033,775,
+1,2037,786,1,1574,
+828,1,1958,1645,16,
+0,155,1,13,1646,
+19,324,1,13,1647,
+5,40,1,2509,1648,
+17,1649,15,1650,4,
+36,37,0,86,0,
+111,0,105,0,100,
+0,65,0,114,0,
+103,0,83,0,116,
+0,97,0,116,0,
+101,0,69,0,118,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,1651,20,1652,4,
+38,86,0,111,0,
 105,0,100,0,65,
 0,114,0,103,0,
 83,0,116,0,97,
 0,116,0,101,0,
 69,0,118,0,101,
 0,110,0,116,0,
-1,-1,1,5,1632,
-20,1633,4,38,86,
-0,111,0,105,0,
-100,0,65,0,114,
-0,103,0,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-49,0,1,163,1,
-3,1,5,1,4,
-1634,22,1,20,1,
-1860,831,1,1803,797,
-1,2413,1635,16,0,
-462,1,2524,1636,17,
-1637,15,1638,4,22,
-37,0,83,0,116,
-0,97,0,116,0,
-101,0,69,0,118,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,1639,20,1640,4,
-24,83,0,116,0,
+95,0,49,0,1,
+170,1,3,1,5,
+1,4,1653,22,1,
+23,1,2619,1654,16,
+0,322,1,1860,850,
+1,1803,816,1,2518,
+1655,17,1656,15,1657,
+4,34,37,0,73,
+0,110,0,116,0,
+65,0,114,0,103,
+0,83,0,116,0,
 97,0,116,0,101,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,49,0,
-1,162,1,3,1,
-6,1,5,1641,22,
-1,19,1,2526,1642,
-16,0,478,1,1873,
-845,1,1657,903,1,
-1989,925,1,32,1643,
-16,0,463,1,2567,
-1644,17,1645,15,1646,
-4,20,37,0,83,
-0,116,0,97,0,
-116,0,101,0,66,
-0,111,0,100,0,
-121,0,1,-1,1,
-5,1647,20,1648,4,
-22,83,0,116,0,
-97,0,116,0,101,
-0,66,0,111,0,
-100,0,121,0,95,
-0,49,0,1,158,
-1,3,1,2,1,
-1,1649,22,1,15,
-1,2105,824,1,2364,
-837,1,2227,917,1,
-1574,809,1,2563,1650,
-17,1651,15,1646,1,
--1,1,5,1652,20,
-1653,4,22,83,0,
-116,0,97,0,116,
-0,101,0,66,0,
-111,0,100,0,121,
-0,95,0,52,0,
-1,161,1,3,1,
-3,1,2,1654,22,
-1,18,1,2564,1655,
-17,1656,15,1646,1,
--1,1,5,1657,20,
-1658,4,22,83,0,
+0,1,-1,1,5,
+1658,20,1659,4,36,
+73,0,110,0,116,
+0,65,0,114,0,
+103,0,83,0,116,
+0,97,0,116,0,
+101,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,49,
+0,1,169,1,3,
+1,6,1,5,1660,
+22,1,22,1,2413,
+1661,16,0,473,1,
+1873,864,1,1657,922,
+1,2032,770,1,1989,
+944,1,2535,1662,16,
+0,674,1,2037,786,
+1,32,1663,16,0,
+474,1,2105,843,1,
+2573,1664,17,1665,15,
+1666,4,20,37,0,
+83,0,116,0,97,
+0,116,0,101,0,
+66,0,111,0,100,
+0,121,0,1,-1,
+1,5,1667,20,1668,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,54,0,1,
+167,1,3,1,3,
+1,2,1669,22,1,
+20,1,2574,1670,17,
+1671,15,1666,1,-1,
+1,5,1672,20,1673,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,52,0,1,
+165,1,3,1,3,
+1,2,1674,22,1,
+18,1,2575,1675,17,
+1676,15,1666,1,-1,
+1,5,1677,20,1678,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,50,0,1,
+163,1,3,1,3,
+1,2,1679,22,1,
+16,1,2578,1680,17,
+1681,15,1666,1,-1,
+1,5,1682,20,1683,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,51,0,1,
+164,1,3,1,2,
+1,1,1684,22,1,
+17,1,2227,936,1,
+1574,828,1,2021,747,
+1,2458,904,1,2459,
+910,1,2462,917,1,
+2136,871,1,2464,927,
+1,2029,754,1,2030,
+760,1,2031,765,1,
+2577,1685,17,1686,15,
+1666,1,-1,1,5,
+1687,20,1688,4,22,
+83,0,116,0,97,
+0,116,0,101,0,
+66,0,111,0,100,
+0,121,0,95,0,
+53,0,1,166,1,
+3,1,2,1,1,
+1689,22,1,19,1,
+2033,775,1,2579,1690,
+17,1691,15,1666,1,
+-1,1,5,1692,20,
+1693,4,22,83,0,
 116,0,97,0,116,
 0,101,0,66,0,
 111,0,100,0,121,
-0,95,0,50,0,
-1,159,1,3,1,
-3,1,2,1659,22,
-1,16,1,2566,1660,
-17,1661,15,1646,1,
--1,1,5,1662,20,
-1663,4,22,83,0,
+0,95,0,49,0,
+1,162,1,3,1,
+2,1,1,1694,22,
+1,15,1,2035,781,
+1,2364,856,1,2039,
+791,1,1931,889,1,
+2041,797,1,2043,803,
+1,2045,808,1,2533,
+1695,17,1696,15,1697,
+4,22,37,0,83,
+0,116,0,97,0,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+-1,1,5,1698,20,
+1699,4,24,83,0,
 116,0,97,0,116,
-0,101,0,66,0,
-111,0,100,0,121,
-0,95,0,51,0,
-1,160,1,3,1,
-2,1,1,1664,22,
-1,17,1,2458,885,
-1,2459,891,1,2462,
-898,1,2136,852,1,
-2464,908,1,2029,735,
-1,2030,741,1,2031,
-746,1,2032,751,1,
-2033,756,1,2035,762,
-1,2037,767,1,2039,
-772,1,1931,870,1,
-2041,778,1,2021,728,
-1,2043,784,1,2045,
-789,1,2606,1665,16,
-0,149,1,14,1666,
-19,144,1,14,1667,
-5,105,1,2511,1668,
-17,1669,15,1670,4,
-48,37,0,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,1,
--1,1,5,140,1,
-0,1,0,1671,22,
-1,21,1,1260,1106,
-1,1011,1112,1,1514,
-1118,1,9,1123,1,
-10,1672,17,1673,15,
-1670,1,-1,1,5,
-140,1,0,1,0,
-1671,1,262,1129,1,
-1267,1135,1,1521,1140,
-1,1773,1674,16,0,
-148,1,19,1157,1,
-20,1675,16,0,142,
-1,2281,1164,1,525,
-1226,1,30,1676,17,
-1677,15,1670,1,-1,
-1,5,1678,20,1679,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+49,0,1,168,1,
+3,1,6,1,5,
+1700,22,1,21,1,
+14,1701,19,144,1,
+14,1702,5,105,1,
+1260,1124,1,1011,1130,
+1,1514,1136,1,9,
+1141,1,10,1703,17,
+1704,15,1705,4,48,
+37,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+76,0,105,0,115,
+0,116,0,1,-1,
+1,5,140,1,0,
+1,0,1706,22,1,
+24,1,262,1147,1,
+1267,1153,1,1521,1158,
+1,1773,1707,16,0,
+148,1,19,1175,1,
+20,1708,16,0,142,
+1,2281,1182,1,525,
+1244,1,30,1709,17,
+1710,15,1705,1,-1,
+1,5,1711,20,1712,
 4,50,65,0,114,
 0,103,0,117,0,
 109,0,101,0,110,
@@ -5713,21 +5867,21 @@ public yyLSLSyntax
 0,111,0,110,0,
 76,0,105,0,115,
 0,116,0,95,0,
-50,0,1,165,1,
+50,0,1,172,1,
 3,1,4,1,3,
-1680,22,1,23,1,
-283,1182,1,40,1187,
-1,41,1681,17,1682,
-15,1683,4,26,37,
+1713,22,1,26,1,
+283,1200,1,40,1205,
+1,41,1714,17,1715,
+15,1716,4,26,37,
 0,65,0,114,0,
 103,0,117,0,109,
 0,101,0,110,0,
 116,0,76,0,105,
 0,115,0,116,0,
-1,-1,1,5,617,
-1,0,1,0,1684,
-22,1,141,1,42,
-1685,17,1686,15,1687,
+1,-1,1,5,631,
+1,0,1,0,1717,
+22,1,146,1,42,
+1718,17,1719,15,1720,
 4,38,37,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
@@ -5736,8 +5890,8 @@ public yyLSLSyntax
 0,114,0,103,0,
 117,0,109,0,101,
 0,110,0,116,0,
-1,-1,1,5,1688,
-20,1689,4,40,69,
+1,-1,1,5,1721,
+20,1722,4,40,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
@@ -5746,2811 +5900,2902 @@ public yyLSLSyntax
 117,0,109,0,101,
 0,110,0,116,0,
 95,0,49,0,1,
-285,1,3,1,2,
-1,1,1690,22,1,
-144,1,44,1193,1,
-47,1194,1,48,1200,
-1,49,1206,1,50,
-1211,1,51,1216,1,
-305,1221,1,63,1232,
-1,66,1238,1,67,
-1243,1,1478,1463,1,
-69,1253,1,70,1258,
-1,68,1248,1,74,
-1263,1,1013,1268,1,
-2335,1691,16,0,148,
-1,1332,1273,1,1048,
-1354,1,82,1290,1,
-1296,1177,1,1341,1307,
-1,328,1312,1,1303,
-1317,1,1096,1322,1,
-93,1328,1,1550,1333,
-1,352,1359,1,107,
-1348,1,1114,1353,1,
-1370,1593,1,118,1365,
-1,1123,1370,1,371,
-1375,1,1377,1381,1,
-375,1386,1,377,1391,
-1,379,1396,1,380,
-1401,1,883,1407,1,
-373,1419,1,130,1424,
-1,143,1429,1,2654,
-1692,17,1693,15,1670,
+294,1,3,1,2,
+1,1,1723,22,1,
+149,1,44,1211,1,
+47,1212,1,48,1218,
+1,49,1224,1,50,
+1229,1,51,1234,1,
+305,1239,1,63,1250,
+1,66,1256,1,67,
+1261,1,1478,1485,1,
+69,1271,1,70,1276,
+1,68,1266,1,74,
+1281,1,1013,1286,1,
+2335,1724,16,0,148,
+1,1332,1291,1,1048,
+1372,1,82,1308,1,
+1296,1195,1,1341,1325,
+1,328,1330,1,1303,
+1335,1,1096,1340,1,
+93,1346,1,1550,1351,
+1,2529,1725,16,0,
+142,1,352,1377,1,
+107,1366,1,1114,1371,
+1,1370,1480,1,118,
+1383,1,1123,1388,1,
+371,1393,1,1377,1399,
+1,375,1404,1,377,
+1409,1,379,1414,1,
+380,1419,1,883,1425,
+1,373,1437,1,130,
+1442,1,143,1447,1,
+1152,1453,1,387,1726,
+16,0,580,1,1406,
+1458,1,1159,1465,1,
+157,1470,1,1413,1475,
+1,1665,1502,1,2670,
+1727,17,1728,15,1705,
 1,-1,1,5,140,
-1,0,1,0,1671,
-1,1152,1435,1,387,
-1694,16,0,566,1,
-1406,1440,1,2663,1695,
-16,0,142,1,1159,
-1447,1,157,1452,1,
-1413,1457,1,1665,1475,
-1,412,1696,16,0,
-591,1,1094,1697,16,
-0,619,1,2520,1698,
-16,0,142,1,172,
-1470,1,827,1341,1,
-1188,1480,1,437,1699,
-16,0,660,1,1442,
-1485,1,1694,1700,16,
-0,148,1,942,1491,
-1,1195,1497,1,1449,
-1502,1,1701,1507,1,
-447,1512,1,188,1519,
-1,205,1524,1,2467,
-1701,17,1702,15,1670,
-1,-1,1,5,1703,
-20,1704,4,50,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,76,0,105,
+1,0,1,0,1706,
+1,412,1729,16,0,
+598,1,1094,1730,16,
+0,633,1,2679,1731,
+16,0,142,1,2520,
+1732,17,1733,15,1705,
+1,-1,1,5,140,
+1,0,1,0,1706,
+1,172,1496,1,827,
+1359,1,1188,1508,1,
+437,1734,16,0,670,
+1,1442,1513,1,1694,
+1735,16,0,148,1,
+942,1519,1,1195,1525,
+1,1449,1530,1,1701,
+1535,1,447,1540,1,
+188,1547,1,205,1552,
+1,2467,1736,17,1737,
+15,1705,1,-1,1,
+5,1738,20,1739,4,
+50,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,76,
+0,105,0,115,0,
+116,0,95,0,49,
+0,1,171,1,3,
+1,2,1,1,1740,
+22,1,25,1,461,
+1741,16,0,633,1,
+464,1742,17,1743,15,
+1716,1,-1,1,5,
+1744,20,1745,4,28,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,76,0,105,0,
+115,0,116,0,95,
+0,50,0,1,293,
+1,3,1,4,1,
+3,1746,22,1,148,
+1,1224,1557,1,223,
+1562,1,1730,1567,1,
+476,1572,1,477,1578,
+1,1231,1583,1,479,
+1588,1,480,1593,1,
+1485,1599,1,459,1747,
+17,1748,15,1716,1,
+-1,1,5,631,1,
+0,1,0,1717,1,
+242,1606,1,478,1611,
+1,481,1749,17,1750,
+15,1716,1,-1,1,
+5,1751,20,1752,4,
+28,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,76,0,105,
 0,115,0,116,0,
 95,0,49,0,1,
-164,1,3,1,2,
-1,1,1705,22,1,
-22,1,461,1706,16,
-0,619,1,464,1707,
-17,1708,15,1683,1,
--1,1,5,1709,20,
-1710,4,28,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,76,
-0,105,0,115,0,
-116,0,95,0,50,
-0,1,284,1,3,
-1,4,1,3,1711,
-22,1,143,1,1224,
-1534,1,223,1539,1,
-1730,1544,1,476,1549,
-1,477,1555,1,1231,
-1560,1,479,1565,1,
-480,1570,1,1485,1576,
-1,459,1712,17,1713,
-15,1683,1,-1,1,
-5,617,1,0,1,
-0,1684,1,242,1583,
-1,478,1588,1,481,
-1714,17,1715,15,1683,
-1,-1,1,5,1716,
-20,1717,4,28,65,
-0,114,0,103,0,
-117,0,109,0,101,
+292,1,3,1,2,
+1,1,1753,22,1,
+147,1,1001,1616,1,
+1002,1621,1,15,1754,
+19,298,1,15,1755,
+5,6,1,2685,1756,
+16,0,625,1,1114,
+1757,16,0,296,1,
+1621,1758,16,0,669,
+1,40,1759,16,0,
+577,1,19,1175,1,
+9,1141,1,16,1760,
+19,136,1,16,1761,
+5,141,1,2510,1762,
+16,0,614,1,256,
+1763,16,0,187,1,
+1261,1764,16,0,187,
+1,509,1765,16,0,
+187,1,9,1766,16,
+0,134,1,2686,1767,
+16,0,187,1,2021,
+747,1,1775,1768,16,
+0,187,1,2029,754,
+1,2030,760,1,2031,
+765,1,2032,770,1,
+2033,775,1,277,1769,
+16,0,187,1,2035,
+781,1,2037,786,1,
+2039,791,1,32,1770,
+16,0,187,1,2041,
+797,1,2293,1771,16,
+0,187,1,2043,803,
+1,2045,808,1,40,
+1772,16,0,166,1,
+41,1773,16,0,187,
+1,1297,1774,16,0,
+187,1,43,1775,16,
+0,187,1,44,1776,
+16,0,166,1,1803,
+816,1,1804,1777,16,
+0,187,1,299,1778,
+16,0,187,1,2480,
+1779,17,1780,15,1781,
+4,24,37,0,73,
 0,110,0,116,0,
-76,0,105,0,115,
-0,116,0,95,0,
-49,0,1,283,1,
-3,1,2,1,1,
-1718,22,1,142,1,
-1001,1598,1,1002,1603,
-1,15,1719,19,308,
-1,15,1720,5,6,
-1,2669,1721,16,0,
-601,1,1114,1722,16,
-0,306,1,1621,1723,
-16,0,659,1,40,
-1724,16,0,562,1,
-19,1157,1,9,1123,
-1,16,1725,19,136,
-1,16,1726,5,140,
-1,2510,1727,16,0,
-602,1,256,1728,16,
-0,196,1,1261,1729,
-16,0,196,1,509,
-1730,16,0,196,1,
-9,1731,16,0,134,
-1,2021,728,1,1775,
-1732,16,0,196,1,
-2029,735,1,2030,741,
-1,2031,746,1,2032,
-751,1,2033,756,1,
-277,1733,16,0,196,
-1,2035,762,1,2037,
-767,1,2039,772,1,
-32,1734,16,0,196,
-1,2041,778,1,2293,
-1735,16,0,196,1,
-2043,784,1,2045,789,
-1,40,1736,16,0,
-175,1,41,1737,16,
-0,196,1,1297,1738,
-16,0,196,1,43,
-1739,16,0,196,1,
-44,1740,16,0,175,
-1,1803,797,1,1804,
-1741,16,0,196,1,
-299,1742,16,0,196,
-1,2480,1743,17,1744,
-15,1745,4,12,37,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,-1,1,5,
+1782,20,1783,4,26,
+73,0,110,0,116,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,56,
+0,1,326,1,3,
+1,2,1,1,1784,
+22,1,181,1,52,
+1785,16,0,187,1,
+2484,1786,17,1787,15,
+1781,1,-1,1,5,
+1788,20,1789,4,26,
+73,0,110,0,116,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,52,
+0,1,322,1,3,
+1,2,1,1,1790,
+22,1,177,1,1515,
+1791,16,0,187,1,
+2318,1792,16,0,187,
+1,2491,1793,17,1794,
+15,1795,4,12,37,
 0,69,0,118,0,
 101,0,110,0,116,
 0,1,-1,1,5,
-1746,20,1747,4,16,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,50,0,53,
-0,1,317,1,3,
-1,2,1,1,1748,
-22,1,176,1,52,
-1749,16,0,196,1,
-2484,1750,17,1751,15,
-1745,1,-1,1,5,
-1752,20,1753,4,16,
+1796,20,1797,4,16,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,50,0,49,
-0,1,313,1,3,
-1,2,1,1,1754,
-22,1,172,1,1515,
-1755,16,0,196,1,
-2318,1756,16,0,196,
-1,2491,1757,17,1758,
-15,1745,1,-1,1,
-5,1759,20,1760,4,
+95,0,49,0,52,
+0,1,315,1,3,
+1,2,1,1,1798,
+22,1,170,1,62,
+1799,16,0,203,1,
+63,1800,16,0,166,
+1,2495,1801,17,1802,
+15,1795,1,-1,1,
+5,1803,20,1804,4,
 16,69,0,118,0,
 101,0,110,0,116,
 0,95,0,49,0,
-52,0,1,306,1,
+48,0,1,311,1,
 3,1,2,1,1,
-1761,22,1,165,1,
-62,1762,16,0,212,
-1,63,1763,16,0,
-175,1,2495,1764,17,
-1765,15,1745,1,-1,
-1,5,1766,20,1767,
-4,16,69,0,118,
-0,101,0,110,0,
-116,0,95,0,49,
-0,48,0,1,302,
-1,3,1,2,1,
-1,1768,22,1,161,
-1,2075,1769,16,0,
-196,1,1574,809,1,
-1479,1770,16,0,196,
-1,71,1771,16,0,
-196,1,1622,1772,16,
-0,196,1,1658,1773,
-16,0,682,1,1833,
-1774,16,0,297,1,
-1834,1775,16,0,196,
-1,2337,1776,16,0,
-196,1,79,1777,16,
-0,196,1,1335,1778,
-16,0,196,1,322,
-1779,16,0,196,1,
-76,1780,16,0,196,
-1,85,1781,16,0,
-196,1,89,1782,16,
-0,196,1,346,1783,
-16,0,196,1,97,
-1784,16,0,196,1,
-2106,1785,16,0,196,
-1,102,1786,16,0,
-196,1,1860,831,1,
-2458,885,1,2364,837,
-1,1990,1787,16,0,
-196,1,112,1788,16,
-0,196,1,1117,1789,
-16,0,196,1,1873,
-845,1,1875,1790,16,
-0,408,1,1876,1791,
-16,0,196,1,124,
-1792,16,0,196,1,
-2478,1793,17,1794,15,
-1745,1,-1,1,5,
-1795,20,1796,4,16,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,50,0,55,
-0,1,319,1,3,
-1,2,1,1,1797,
-22,1,178,1,2136,
-852,1,381,1798,16,
-0,196,1,525,1799,
-16,0,196,1,137,
-1800,16,0,196,1,
-2653,1801,16,0,586,
-1,1901,1802,16,0,
-196,1,1153,1803,16,
-0,196,1,151,1804,
-16,0,196,1,1407,
-1805,16,0,196,1,
-1659,1806,16,0,196,
-1,2413,1807,16,0,
-196,1,406,1808,16,
-0,196,1,1371,1809,
-16,0,196,1,2105,
-824,1,166,1810,16,
-0,196,1,2670,1811,
-16,0,196,1,1931,
-870,1,1932,1812,16,
-0,470,1,1933,1813,
-16,0,196,1,431,
-1814,16,0,196,1,
-1585,1815,16,0,196,
-1,182,1816,16,0,
-196,1,1189,1817,16,
-0,196,1,1443,1818,
-16,0,196,1,1695,
-1819,16,0,196,1,
-2198,1820,16,0,196,
-1,447,1821,16,0,
-196,1,199,1822,16,
-0,196,1,2459,891,
-1,1958,1823,16,0,
-196,1,2462,898,1,
-1657,903,1,2464,908,
-1,459,1824,16,0,
-196,1,462,1825,16,
-0,196,1,2471,1826,
-17,1827,15,1828,4,
-26,37,0,86,0,
-111,0,105,0,100,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,1829,20,1830,4,
-28,86,0,111,0,
-105,0,100,0,65,
+1805,22,1,166,1,
+2075,1806,16,0,187,
+1,1574,828,1,1479,
+1807,16,0,187,1,
+71,1808,16,0,187,
+1,1658,1809,16,0,
+699,1,1833,1810,16,
+0,288,1,1834,1811,
+16,0,187,1,2337,
+1812,16,0,187,1,
+79,1813,16,0,187,
+1,1335,1814,16,0,
+187,1,322,1815,16,
+0,187,1,76,1816,
+16,0,187,1,85,
+1817,16,0,187,1,
+89,1818,16,0,187,
+1,346,1819,16,0,
+187,1,97,1820,16,
+0,187,1,2106,1821,
+16,0,187,1,102,
+1822,16,0,187,1,
+1860,850,1,2458,904,
+1,2364,856,1,1990,
+1823,16,0,187,1,
+112,1824,16,0,187,
+1,1117,1825,16,0,
+187,1,1873,864,1,
+1875,1826,16,0,409,
+1,1876,1827,16,0,
+187,1,124,1828,16,
+0,187,1,2478,1829,
+17,1830,15,1781,1,
+-1,1,5,1831,20,
+1832,4,28,73,0,
+110,0,116,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,55,0,1,
-326,1,3,1,2,
-1,1,1831,22,1,
-185,1,2472,1832,17,
-1833,15,1828,1,-1,
-1,5,1834,20,1835,
+95,0,49,0,48,
+0,1,328,1,3,
+1,2,1,1,1833,
+22,1,183,1,2136,
+871,1,381,1834,16,
+0,187,1,525,1835,
+16,0,187,1,137,
+1836,16,0,187,1,
+1901,1837,16,0,187,
+1,1153,1838,16,0,
+187,1,151,1839,16,
+0,187,1,1407,1840,
+16,0,187,1,1659,
+1841,16,0,187,1,
+2413,1842,16,0,187,
+1,406,1843,16,0,
+187,1,2669,1844,16,
+0,613,1,1371,1845,
+16,0,187,1,2105,
+843,1,166,1846,16,
+0,187,1,1622,1847,
+16,0,187,1,2519,
+1848,16,0,619,1,
+1931,889,1,1932,1849,
+16,0,481,1,1933,
+1850,16,0,187,1,
+431,1851,16,0,187,
+1,1585,1852,16,0,
+187,1,182,1853,16,
+0,187,1,1189,1854,
+16,0,187,1,1443,
+1855,16,0,187,1,
+1695,1856,16,0,187,
+1,2198,1857,16,0,
+187,1,447,1858,16,
+0,187,1,199,1859,
+16,0,187,1,2459,
+910,1,1958,1860,16,
+0,187,1,2462,917,
+1,1657,922,1,2464,
+927,1,459,1861,16,
+0,187,1,462,1862,
+16,0,187,1,2471,
+1863,17,1864,15,1865,
+4,26,37,0,86,
+0,111,0,105,0,
+100,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,1,-1,
+1,5,1866,20,1867,
 4,28,86,0,111,
 0,105,0,100,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,54,0,
-1,325,1,3,1,
-2,1,1,1836,22,
-1,184,1,2473,1837,
-17,1838,15,1828,1,
--1,1,5,1839,20,
-1840,4,28,86,0,
+0,95,0,55,0,
+1,335,1,3,1,
+2,1,1,1868,22,
+1,190,1,2472,1869,
+17,1870,15,1865,1,
+-1,1,5,1871,20,
+1872,4,28,86,0,
 111,0,105,0,100,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,53,
-0,1,324,1,3,
-1,2,1,1,1841,
-22,1,183,1,2474,
-1842,17,1843,15,1828,
-1,-1,1,5,1844,
-20,1845,4,28,86,
+116,0,95,0,54,
+0,1,334,1,3,
+1,2,1,1,1873,
+22,1,189,1,2473,
+1874,17,1875,15,1865,
+1,-1,1,5,1876,
+20,1877,4,28,86,
 0,111,0,105,0,
 100,0,65,0,114,
 0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-52,0,1,323,1,
+53,0,1,333,1,
 3,1,2,1,1,
-1846,22,1,182,1,
-2475,1847,17,1848,15,
-1828,1,-1,1,5,
-1849,20,1850,4,28,
+1878,22,1,188,1,
+2474,1879,17,1880,15,
+1865,1,-1,1,5,
+1881,20,1882,4,28,
 86,0,111,0,105,
 0,100,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,51,0,1,322,
+0,52,0,1,332,
 1,3,1,2,1,
-1,1851,22,1,181,
-1,2476,1852,17,1853,
-15,1828,1,-1,1,
-5,1854,20,1855,4,
+1,1883,22,1,187,
+1,2475,1884,17,1885,
+15,1865,1,-1,1,
+5,1886,20,1887,4,
 28,86,0,111,0,
 105,0,100,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,50,0,1,
-321,1,3,1,2,
-1,1,1856,22,1,
-180,1,2477,1857,17,
-1858,15,1828,1,-1,
-1,5,1859,20,1860,
+95,0,51,0,1,
+331,1,3,1,2,
+1,1,1888,22,1,
+186,1,2476,1889,17,
+1890,15,1865,1,-1,
+1,5,1891,20,1892,
 4,28,86,0,111,
 0,105,0,100,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,49,0,
-1,320,1,3,1,
-2,1,1,1861,22,
-1,179,1,2227,917,
-1,2479,1862,17,1863,
-15,1745,1,-1,1,
-5,1864,20,1865,4,
-16,69,0,118,0,
-101,0,110,0,116,
-0,95,0,50,0,
-54,0,1,318,1,
-3,1,2,1,1,
-1866,22,1,177,1,
-1225,1867,16,0,196,
-1,2481,1868,17,1869,
-15,1745,1,-1,1,
-5,1870,20,1871,4,
-16,69,0,118,0,
-101,0,110,0,116,
 0,95,0,50,0,
-52,0,1,316,1,
-3,1,2,1,1,
-1872,22,1,175,1,
-2482,1873,17,1874,15,
-1745,1,-1,1,5,
-1875,20,1876,4,16,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,50,0,51,
-0,1,315,1,3,
-1,2,1,1,1877,
-22,1,174,1,2483,
-1878,17,1879,15,1745,
-1,-1,1,5,1880,
-20,1881,4,16,69,
+1,330,1,3,1,
+2,1,1,1893,22,
+1,185,1,2477,1894,
+17,1895,15,1865,1,
+-1,1,5,1896,20,
+1897,4,28,86,0,
+111,0,105,0,100,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,49,
+0,1,329,1,3,
+1,2,1,1,1898,
+22,1,184,1,2227,
+936,1,2479,1899,17,
+1900,15,1781,1,-1,
+1,5,1901,20,1902,
+4,26,73,0,110,
+0,116,0,65,0,
+114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,50,0,50,0,
-1,314,1,3,1,
-2,1,1,1882,22,
-1,173,1,1731,1883,
-16,0,196,1,2485,
-1884,17,1885,15,1745,
-1,-1,1,5,1886,
-20,1887,4,16,69,
+0,57,0,1,327,
+1,3,1,2,1,
+1,1903,22,1,182,
+1,1225,1904,16,0,
+187,1,2481,1905,17,
+1906,15,1781,1,-1,
+1,5,1907,20,1908,
+4,26,73,0,110,
+0,116,0,65,0,
+114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,50,0,48,0,
-1,312,1,3,1,
-2,1,1,1888,22,
-1,171,1,2486,1889,
-17,1890,15,1745,1,
--1,1,5,1891,20,
-1892,4,16,69,0,
+0,55,0,1,325,
+1,3,1,2,1,
+1,1909,22,1,180,
+1,2482,1910,17,1911,
+15,1781,1,-1,1,
+5,1912,20,1913,4,
+26,73,0,110,0,
+116,0,65,0,114,
+0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-49,0,57,0,1,
-311,1,3,1,2,
-1,1,1893,22,1,
-170,1,2487,1894,17,
-1895,15,1745,1,-1,
-1,5,1896,20,1897,
+54,0,1,324,1,
+3,1,2,1,1,
+1914,22,1,179,1,
+2483,1915,17,1916,15,
+1781,1,-1,1,5,
+1917,20,1918,4,26,
+73,0,110,0,116,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,53,
+0,1,323,1,3,
+1,2,1,1,1919,
+22,1,178,1,1731,
+1920,16,0,187,1,
+2485,1921,17,1922,15,
+1781,1,-1,1,5,
+1923,20,1924,4,26,
+73,0,110,0,116,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,51,
+0,1,321,1,3,
+1,2,1,1,1925,
+22,1,176,1,2486,
+1926,17,1927,15,1781,
+1,-1,1,5,1928,
+20,1929,4,26,73,
+0,110,0,116,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,50,0,
+1,320,1,3,1,
+2,1,1,1930,22,
+1,175,1,2487,1931,
+17,1932,15,1781,1,
+-1,1,5,1933,20,
+1934,4,26,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+319,1,3,1,2,
+1,1,1935,22,1,
+174,1,2488,1936,17,
+1937,15,1795,1,-1,
+1,5,1938,20,1939,
 4,16,69,0,118,
 0,101,0,110,0,
 116,0,95,0,49,
-0,56,0,1,310,
+0,55,0,1,318,
 1,3,1,2,1,
-1,1898,22,1,169,
-1,2488,1899,17,1900,
-15,1745,1,-1,1,
-5,1901,20,1902,4,
+1,1940,22,1,173,
+1,2489,1941,17,1942,
+15,1795,1,-1,1,
+5,1943,20,1944,4,
 16,69,0,118,0,
 101,0,110,0,116,
 0,95,0,49,0,
-55,0,1,309,1,
+54,0,1,317,1,
 3,1,2,1,1,
-1903,22,1,168,1,
-2489,1904,17,1905,15,
-1745,1,-1,1,5,
-1906,20,1907,4,16,
+1945,22,1,172,1,
+2490,1946,17,1947,15,
+1795,1,-1,1,5,
+1948,20,1949,4,16,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,49,0,54,
-0,1,308,1,3,
-1,2,1,1,1908,
-22,1,167,1,2490,
-1909,17,1910,15,1745,
-1,-1,1,5,1911,
-20,1912,4,16,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,49,0,53,0,
-1,307,1,3,1,
-2,1,1,1913,22,
-1,166,1,1989,925,
-1,2492,1914,17,1915,
-15,1745,1,-1,1,
-5,1916,20,1917,4,
+95,0,49,0,53,
+0,1,316,1,3,
+1,2,1,1,1950,
+22,1,171,1,1989,
+944,1,2492,1951,17,
+1952,15,1795,1,-1,
+1,5,1953,20,1954,
+4,16,69,0,118,
+0,101,0,110,0,
+116,0,95,0,49,
+0,51,0,1,314,
+1,3,1,2,1,
+1,1955,22,1,169,
+1,2493,1956,17,1957,
+15,1795,1,-1,1,
+5,1958,20,1959,4,
 16,69,0,118,0,
 101,0,110,0,116,
 0,95,0,49,0,
-51,0,1,305,1,
+50,0,1,313,1,
 3,1,2,1,1,
-1918,22,1,164,1,
-2493,1919,17,1920,15,
-1745,1,-1,1,5,
-1921,20,1922,4,16,
+1960,22,1,168,1,
+2494,1961,17,1962,15,
+1795,1,-1,1,5,
+1963,20,1964,4,16,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,49,0,50,
-0,1,304,1,3,
-1,2,1,1,1923,
-22,1,163,1,2494,
-1924,17,1925,15,1745,
-1,-1,1,5,1926,
-20,1927,4,16,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,49,0,49,0,
-1,303,1,3,1,
-2,1,1,1928,22,
-1,162,1,236,1929,
-16,0,196,1,2496,
-1930,17,1931,15,1745,
-1,-1,1,5,1932,
-20,1933,4,14,69,
+95,0,49,0,49,
+0,1,312,1,3,
+1,2,1,1,1965,
+22,1,167,1,236,
+1966,16,0,187,1,
+2496,1967,17,1968,15,
+1795,1,-1,1,5,
+1969,20,1970,4,14,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,57,0,1,
+310,1,3,1,2,
+1,1,1971,22,1,
+165,1,2497,1972,17,
+1973,15,1795,1,-1,
+1,5,1974,20,1975,
+4,14,69,0,118,
+0,101,0,110,0,
+116,0,95,0,56,
+0,1,309,1,3,
+1,2,1,1,1976,
+22,1,164,1,2498,
+1977,17,1978,15,1795,
+1,-1,1,5,1979,
+20,1980,4,14,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,57,0,1,301,
+0,55,0,1,308,
 1,3,1,2,1,
-1,1934,22,1,160,
-1,2497,1935,17,1936,
-15,1745,1,-1,1,
-5,1937,20,1938,4,
+1,1981,22,1,163,
+1,2499,1982,17,1983,
+15,1795,1,-1,1,
+5,1984,20,1985,4,
 14,69,0,118,0,
 101,0,110,0,116,
-0,95,0,56,0,
-1,300,1,3,1,
-2,1,1,1939,22,
-1,159,1,2498,1940,
-17,1941,15,1745,1,
--1,1,5,1942,20,
-1943,4,14,69,0,
+0,95,0,54,0,
+1,307,1,3,1,
+2,1,1,1986,22,
+1,162,1,2500,1987,
+17,1988,15,1795,1,
+-1,1,5,1989,20,
+1990,4,14,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-55,0,1,299,1,
+53,0,1,306,1,
 3,1,2,1,1,
-1944,22,1,158,1,
-2499,1945,17,1946,15,
-1745,1,-1,1,5,
-1947,20,1948,4,14,
+1991,22,1,161,1,
+2501,1992,17,1993,15,
+1795,1,-1,1,5,
+1994,20,1995,4,14,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,54,0,1,
-298,1,3,1,2,
-1,1,1949,22,1,
-157,1,2500,1950,17,
-1951,15,1745,1,-1,
-1,5,1952,20,1953,
+95,0,52,0,1,
+305,1,3,1,2,
+1,1,1996,22,1,
+160,1,2502,1997,17,
+1998,15,1795,1,-1,
+1,5,1999,20,2000,
 4,14,69,0,118,
 0,101,0,110,0,
-116,0,95,0,53,
-0,1,297,1,3,
-1,2,1,1,1954,
-22,1,156,1,2501,
-1955,17,1956,15,1745,
-1,-1,1,5,1957,
-20,1958,4,14,69,
+116,0,95,0,51,
+0,1,304,1,3,
+1,2,1,1,2001,
+22,1,159,1,2503,
+2002,17,2003,15,1795,
+1,-1,1,5,2004,
+20,2005,4,14,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,52,0,1,296,
+0,50,0,1,303,
 1,3,1,2,1,
-1,1959,22,1,155,
-1,2502,1960,17,1961,
-15,1745,1,-1,1,
-5,1962,20,1963,4,
+1,2006,22,1,158,
+1,2504,2007,17,2008,
+15,1795,1,-1,1,
+5,2009,20,2010,4,
 14,69,0,118,0,
 101,0,110,0,116,
-0,95,0,51,0,
-1,295,1,3,1,
-2,1,1,1964,22,
-1,154,1,2503,1965,
-17,1966,15,1745,1,
--1,1,5,1967,20,
-1968,4,14,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-50,0,1,294,1,
-3,1,2,1,1,
-1969,22,1,153,1,
-2504,1970,17,1971,15,
-1745,1,-1,1,5,
-1972,20,1973,4,14,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,49,0,1,
-293,1,3,1,2,
-1,1,1974,22,1,
-152,1,2505,1975,16,
-0,441,1,217,1976,
-16,0,196,1,1756,
-1977,16,0,196,1,
-17,1978,19,160,1,
-17,1979,5,118,1,
-1,1980,17,1981,15,
-1982,4,18,37,0,
-84,0,121,0,112,
-0,101,0,110,0,
-97,0,109,0,101,
-0,1,-1,1,5,
-1983,20,1984,4,20,
-84,0,121,0,112,
-0,101,0,110,0,
-97,0,109,0,101,
-0,95,0,55,0,
-1,292,1,3,1,
-2,1,1,1985,22,
-1,151,1,2,1986,
-17,1987,15,1982,1,
--1,1,5,1988,20,
-1989,4,20,84,0,
-121,0,112,0,101,
-0,110,0,97,0,
-109,0,101,0,95,
-0,54,0,1,291,
-1,3,1,2,1,
-1,1990,22,1,150,
-1,3,1991,17,1992,
-15,1982,1,-1,1,
-5,1993,20,1994,4,
+0,95,0,49,0,
+1,302,1,3,1,
+2,1,1,2011,22,
+1,157,1,2505,2012,
+16,0,442,1,217,
+2013,16,0,187,1,
+1756,2014,16,0,187,
+1,17,2015,19,154,
+1,17,2016,5,121,
+1,1,2017,17,2018,
+15,2019,4,18,37,
+0,84,0,121,0,
+112,0,101,0,110,
+0,97,0,109,0,
+101,0,1,-1,1,
+5,2020,20,2021,4,
 20,84,0,121,0,
 112,0,101,0,110,
 0,97,0,109,0,
-101,0,95,0,53,
-0,1,290,1,3,
-1,2,1,1,1995,
-22,1,149,1,4,
-1996,17,1997,15,1982,
-1,-1,1,5,1998,
-20,1999,4,20,84,
+101,0,95,0,55,
+0,1,301,1,3,
+1,2,1,1,2022,
+22,1,156,1,2,
+2023,17,2024,15,2019,
+1,-1,1,5,2025,
+20,2026,4,20,84,
 0,121,0,112,0,
 101,0,110,0,97,
 0,109,0,101,0,
-95,0,52,0,1,
-289,1,3,1,2,
-1,1,2000,22,1,
-148,1,5,2001,17,
-2002,15,1982,1,-1,
-1,5,2003,20,2004,
+95,0,54,0,1,
+300,1,3,1,2,
+1,1,2027,22,1,
+155,1,3,2028,17,
+2029,15,2019,1,-1,
+1,5,2030,20,2031,
 4,20,84,0,121,
 0,112,0,101,0,
 110,0,97,0,109,
 0,101,0,95,0,
-51,0,1,288,1,
+53,0,1,299,1,
 3,1,2,1,1,
-2005,22,1,147,1,
-6,2006,17,2007,15,
-1982,1,-1,1,5,
-2008,20,2009,4,20,
+2032,22,1,154,1,
+4,2033,17,2034,15,
+2019,1,-1,1,5,
+2035,20,2036,4,20,
 84,0,121,0,112,
 0,101,0,110,0,
 97,0,109,0,101,
-0,95,0,50,0,
-1,287,1,3,1,
-2,1,1,2010,22,
-1,146,1,7,2011,
-17,2012,15,1982,1,
--1,1,5,2013,20,
-2014,4,20,84,0,
+0,95,0,52,0,
+1,298,1,3,1,
+2,1,1,2037,22,
+1,153,1,5,2038,
+17,2039,15,2019,1,
+-1,1,5,2040,20,
+2041,4,20,84,0,
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,95,
-0,49,0,1,286,
+0,51,0,1,297,
 1,3,1,2,1,
-1,2015,22,1,145,
-1,1514,1118,1,9,
-1123,1,10,1672,1,
-262,1129,1,1267,1135,
-1,481,1714,1,1521,
-1140,1,1773,2016,16,
-0,247,1,19,1157,
-1,20,2017,16,0,
-158,1,2281,1164,1,
-525,1226,1,30,1676,
-1,283,1182,1,1010,
-2018,16,0,609,1,
-40,1187,1,41,1681,
-1,42,1685,1,44,
-1193,1,1260,1106,1,
-47,1194,1,1303,1317,
-1,49,1206,1,50,
-1211,1,48,1200,1,
-305,1221,1,51,1216,
-1,61,2019,16,0,
-204,1,63,1232,1,
-66,1238,1,67,1243,
-1,1478,1463,1,69,
-1253,1,70,1258,1,
-68,1248,1,73,2020,
-16,0,214,1,74,
-1263,1,1013,1268,1,
-2335,2021,16,0,249,
-1,328,1312,1,1048,
-1354,1,2511,1668,1,
-82,1290,1,1840,2022,
-16,0,312,1,1341,
-1307,1,2520,2023,16,
-0,451,1,1096,1322,
-1,93,1328,1,1550,
-1333,1,352,1359,1,
-1011,1112,1,107,1348,
-1,1114,1353,1,1871,
-2024,16,0,322,1,
-1370,1593,1,118,1365,
-1,1123,1370,1,1332,
-1273,1,1377,1381,1,
-375,1386,1,1882,2025,
-16,0,335,1,377,
-1391,1,827,1341,1,
-380,1401,1,130,1424,
-1,2074,2026,16,0,
-565,1,371,1375,1,
-373,1419,1,1012,2027,
-16,0,611,1,379,
-1396,1,143,1429,1,
-2654,1692,1,1152,1435,
-1,1406,1440,1,2663,
-2028,16,0,670,1,
-1159,1447,1,157,1452,
-1,1413,1457,1,883,
-1407,1,1094,2029,16,
-0,677,1,1296,1177,
-1,172,1470,1,1665,
-1475,1,1939,2030,16,
-0,448,1,1188,1480,
-1,1442,1485,1,188,
-1519,1,942,1491,1,
-1195,1497,1,1449,1502,
-1,1701,1507,1,447,
-1512,1,205,1524,1,
-2467,1701,1,464,1707,
-1,2197,2031,16,0,
-674,1,1224,1534,1,
-223,1539,1,1730,1544,
-1,476,1549,1,477,
-1555,1,1231,1560,1,
-479,1565,1,480,1570,
-1,1485,1576,1,459,
-1712,1,242,1583,1,
-478,1588,1,2506,2032,
-16,0,442,1,1001,
-1598,1,1002,1603,1,
-18,2033,19,500,1,
-18,2034,5,84,1,
-1011,1112,1,1012,2035,
-16,0,498,1,1013,
-1268,1,262,1129,1,
-1267,2036,16,0,498,
-1,515,2037,16,0,
-498,1,1521,2038,16,
-0,498,1,525,1226,
-1,283,1182,1,2299,
-2039,16,0,498,1,
-42,2040,16,0,498,
-1,40,1187,1,44,
-1193,1,47,1194,1,
-1303,2041,16,0,498,
-1,1555,2042,16,0,
-498,1,50,1211,1,
-48,1200,1,49,1206,
-1,51,1216,1,63,
-1232,1,305,1221,1,
-66,1238,1,67,1243,
-1,68,1248,1,69,
-1253,1,70,1258,1,
-73,2043,16,0,498,
-1,74,1263,1,328,
-1312,1,1048,2044,16,
-0,498,1,82,2045,
-16,0,498,1,1840,
-2046,16,0,498,1,
-1591,2047,16,0,498,
-1,1341,2048,16,0,
-498,1,1096,1322,1,
-93,1328,1,352,1359,
-1,107,2049,16,0,
-498,1,1114,1353,1,
-118,2050,16,0,498,
-1,1123,2051,16,0,
-498,1,371,1375,1,
-1628,2052,16,0,498,
-1,375,1386,1,1882,
-2053,16,0,498,1,
-377,1391,1,379,1396,
-1,380,1401,1,883,
-2054,16,0,498,1,
-373,1419,1,130,2055,
-16,0,498,1,143,
-2056,16,0,498,1,
-387,2057,16,0,498,
-1,1159,2058,16,0,
-498,1,157,2059,16,
-0,498,1,1413,2060,
-16,0,498,1,1665,
-2061,16,0,498,1,
-412,2062,16,0,498,
-1,2676,2063,16,0,
-498,1,1377,2064,16,
-0,498,1,172,2065,
-16,0,498,1,1939,
-2066,16,0,498,1,
-437,2067,16,0,498,
-1,188,2068,16,0,
-498,1,942,2069,16,
-0,498,1,1195,2070,
-16,0,498,1,1449,
-2071,16,0,498,1,
-1701,2072,16,0,498,
-1,447,1512,1,205,
-2073,16,0,498,1,
-827,2074,16,0,498,
-1,223,2075,16,0,
-498,1,476,1549,1,
-477,1555,1,1231,2076,
-16,0,498,1,479,
-1565,1,480,1570,1,
-1485,2077,16,0,498,
-1,1737,2078,16,0,
-498,1,242,2079,16,
-0,498,1,478,1588,
-1,1001,1598,1,1002,
-1603,1,19,2080,19,
-235,1,19,2081,5,
-176,1,2676,2082,16,
-0,469,1,256,2083,
-16,0,233,1,1261,
-2084,16,0,233,1,
-1011,1112,1,1012,2085,
-16,0,469,1,2458,
-885,1,262,1129,1,
-1267,2086,16,0,469,
-1,2021,728,1,1521,
-2087,16,0,469,1,
-1775,2088,16,0,233,
-1,2029,735,1,2030,
-741,1,2031,746,1,
-2032,751,1,2033,756,
-1,277,2089,16,0,
-233,1,2035,762,1,
-2037,767,1,2039,772,
-1,32,2090,16,0,
-233,1,2464,908,1,
-2293,2091,16,0,233,
-1,2043,784,1,2045,
-789,1,2299,2092,16,
-0,469,1,41,2093,
-16,0,233,1,42,
-2094,16,0,469,1,
-40,1187,1,44,1193,
-1,43,2095,16,0,
-233,1,1804,2096,16,
-0,233,1,48,1200,
-1,49,1206,1,47,
-1194,1,51,1216,1,
-52,2097,16,0,233,
-1,50,1211,1,305,
-1221,1,1096,1322,1,
-1515,2098,16,0,233,
-1,2318,2099,16,0,
-233,1,283,1182,1,
-63,1232,1,66,1238,
-1,67,1243,1,68,
-1248,1,69,1253,1,
-70,1258,1,71,2100,
-16,0,233,1,73,
-2101,16,0,469,1,
-74,1263,1,1013,1268,
-1,76,2102,16,0,
-233,1,1834,2103,16,
-0,233,1,2337,2104,
-16,0,233,1,79,
-2105,16,0,233,1,
-1335,2106,16,0,233,
-1,299,2107,16,0,
-233,1,82,2108,16,
-0,469,1,1840,2109,
-16,0,469,1,1297,
-2110,16,0,233,1,
-85,2111,16,0,233,
-1,1341,2112,16,0,
-469,1,89,2113,16,
-0,233,1,1303,2114,
-16,0,469,1,509,
-2115,16,0,233,1,
-93,1328,1,322,2116,
-16,0,233,1,97,
-2117,16,0,233,1,
-2041,778,1,1555,2118,
-16,0,469,1,827,
-2119,16,0,469,1,
-102,2120,16,0,233,
-1,1860,831,1,1803,
-797,1,2364,837,1,
-107,2121,16,0,469,
-1,1114,1353,1,112,
-2122,16,0,233,1,
-1117,2123,16,0,233,
-1,352,1359,1,1873,
-845,1,118,2124,16,
-0,469,1,1123,2125,
-16,0,469,1,371,
-1375,1,515,2126,16,
-0,469,1,1377,2127,
-16,0,469,1,124,
-2128,16,0,233,1,
-1882,2129,16,0,469,
-1,377,1391,1,379,
-1396,1,380,1401,1,
-130,2130,16,0,469,
-1,346,2131,16,0,
-233,1,2075,2132,16,
-0,233,1,373,1419,
-1,387,2133,16,0,
-469,1,137,2134,16,
-0,233,1,143,2135,
-16,0,469,1,1901,
-2136,16,0,233,1,
-1048,2137,16,0,469,
-1,1153,2138,16,0,
-233,1,375,1386,1,
-151,2139,16,0,233,
-1,1407,2140,16,0,
-233,1,1659,2141,16,
-0,233,1,2413,2142,
-16,0,233,1,1159,
-2143,16,0,469,1,
-381,2144,16,0,233,
-1,157,2145,16,0,
-469,1,1413,2146,16,
-0,469,1,883,2147,
-16,0,469,1,1371,
-2148,16,0,233,1,
-328,1312,1,2105,824,
-1,2106,2149,16,0,
-233,1,166,2150,16,
-0,233,1,525,2151,
-16,0,233,1,1622,
-2152,16,0,233,1,
-406,2153,16,0,233,
-1,1574,809,1,172,
-2154,16,0,469,1,
-1931,870,1,412,2155,
-16,0,469,1,1933,
-2156,16,0,233,1,
-1876,2157,16,0,233,
-1,431,2158,16,0,
-233,1,1585,2159,16,
-0,233,1,182,2160,
-16,0,233,1,1628,
-2161,16,0,469,1,
-1189,2162,16,0,233,
-1,437,2163,16,0,
-469,1,1591,2164,16,
-0,469,1,188,2165,
-16,0,469,1,1695,
-2166,16,0,233,1,
-2198,2167,16,0,233,
-1,1195,2168,16,0,
-469,1,1449,2169,16,
-0,469,1,1701,2170,
-16,0,469,1,447,
-2171,16,0,233,1,
-199,2172,16,0,233,
-1,2459,891,1,1958,
-2173,16,0,233,1,
-2462,898,1,1657,903,
-1,205,2174,16,0,
-469,1,459,2175,16,
-0,233,1,462,2176,
-16,0,233,1,1665,
-2177,16,0,469,1,
-217,2178,16,0,233,
-1,2227,917,1,942,
-2179,16,0,469,1,
-1225,2180,16,0,233,
-1,223,2181,16,0,
-469,1,1479,2182,16,
-0,233,1,1731,2183,
-16,0,233,1,477,
-1555,1,1231,2184,16,
-0,469,1,479,1565,
-1,480,1570,1,1485,
-2185,16,0,469,1,
-1737,2186,16,0,469,
-1,1989,925,1,1990,
-2187,16,0,233,1,
-1443,2188,16,0,233,
-1,236,2189,16,0,
-233,1,2136,852,1,
-476,1549,1,242,2190,
-16,0,469,1,478,
-1588,1,1939,2191,16,
-0,469,1,2670,2192,
-16,0,233,1,1001,
-1598,1,1002,1603,1,
-1756,2193,16,0,233,
-1,20,2194,19,458,
-1,20,2195,5,84,
-1,1011,1112,1,1012,
-2196,16,0,456,1,
-1013,1268,1,262,1129,
-1,1267,2197,16,0,
-456,1,515,2198,16,
-0,456,1,1521,2199,
-16,0,456,1,525,
-1226,1,283,1182,1,
-2299,2200,16,0,456,
-1,42,2201,16,0,
-456,1,40,1187,1,
-44,1193,1,47,1194,
-1,1303,2202,16,0,
-456,1,1555,2203,16,
-0,456,1,50,1211,
-1,48,1200,1,49,
-1206,1,51,1216,1,
-63,1232,1,305,1221,
-1,66,1238,1,67,
-1243,1,68,1248,1,
-69,1253,1,70,1258,
-1,73,2204,16,0,
-456,1,74,1263,1,
-328,2205,16,0,456,
-1,1048,2206,16,0,
-456,1,82,2207,16,
-0,456,1,1840,2208,
-16,0,456,1,1591,
-2209,16,0,456,1,
-1341,2210,16,0,456,
-1,1096,1322,1,93,
-1328,1,352,2211,16,
-0,456,1,107,2212,
-16,0,456,1,1114,
-1353,1,118,2213,16,
-0,456,1,1123,2214,
-16,0,456,1,371,
-1375,1,1628,2215,16,
-0,456,1,375,1386,
-1,1882,2216,16,0,
-456,1,377,1391,1,
-379,1396,1,380,1401,
-1,883,2217,16,0,
-456,1,373,1419,1,
-130,2218,16,0,456,
-1,143,2219,16,0,
-456,1,387,2220,16,
-0,456,1,1159,2221,
-16,0,456,1,157,
-2222,16,0,456,1,
-1413,2223,16,0,456,
-1,1665,2224,16,0,
-456,1,412,2225,16,
-0,456,1,2676,2226,
-16,0,456,1,1377,
-2227,16,0,456,1,
-172,2228,16,0,456,
-1,1939,2229,16,0,
-456,1,437,2230,16,
-0,456,1,188,2231,
-16,0,456,1,942,
-2232,16,0,456,1,
-1195,2233,16,0,456,
-1,1449,2234,16,0,
-456,1,1701,2235,16,
-0,456,1,447,1512,
-1,205,2236,16,0,
-456,1,827,2237,16,
-0,456,1,223,2238,
-16,0,456,1,476,
-1549,1,477,1555,1,
-1231,2239,16,0,456,
-1,479,1565,1,480,
-1570,1,1485,2240,16,
-0,456,1,1737,2241,
-16,0,456,1,242,
-2242,16,0,456,1,
-478,1588,1,1001,1598,
-1,1002,1603,1,21,
-2243,19,440,1,21,
-2244,5,84,1,1011,
-1112,1,1012,2245,16,
-0,438,1,1013,1268,
-1,262,1129,1,1267,
-2246,16,0,438,1,
-515,2247,16,0,438,
-1,1521,2248,16,0,
-438,1,525,1226,1,
-283,1182,1,2299,2249,
-16,0,438,1,42,
-2250,16,0,438,1,
-40,1187,1,44,1193,
-1,47,1194,1,1303,
-2251,16,0,438,1,
-1555,2252,16,0,438,
-1,50,1211,1,48,
-1200,1,49,1206,1,
-51,1216,1,63,1232,
-1,305,1221,1,66,
-1238,1,67,1243,1,
-68,1248,1,69,1253,
-1,70,1258,1,73,
-2253,16,0,438,1,
-74,1263,1,328,2254,
-16,0,438,1,1048,
-2255,16,0,438,1,
-82,2256,16,0,438,
-1,1840,2257,16,0,
-438,1,1591,2258,16,
-0,438,1,1341,2259,
-16,0,438,1,1096,
-1322,1,93,1328,1,
-352,2260,16,0,438,
-1,107,2261,16,0,
-438,1,1114,1353,1,
-118,2262,16,0,438,
-1,1123,2263,16,0,
-438,1,371,1375,1,
-1628,2264,16,0,438,
-1,375,1386,1,1882,
-2265,16,0,438,1,
-377,1391,1,379,1396,
-1,380,1401,1,883,
-2266,16,0,438,1,
-373,1419,1,130,2267,
-16,0,438,1,143,
-2268,16,0,438,1,
-387,2269,16,0,438,
-1,1159,2270,16,0,
-438,1,157,2271,16,
-0,438,1,1413,2272,
-16,0,438,1,1665,
-2273,16,0,438,1,
-412,2274,16,0,438,
-1,2676,2275,16,0,
-438,1,1377,2276,16,
-0,438,1,172,2277,
-16,0,438,1,1939,
-2278,16,0,438,1,
-437,2279,16,0,438,
-1,188,2280,16,0,
-438,1,942,2281,16,
-0,438,1,1195,2282,
-16,0,438,1,1449,
-2283,16,0,438,1,
-1701,2284,16,0,438,
-1,447,1512,1,205,
-2285,16,0,438,1,
-827,2286,16,0,438,
-1,223,2287,16,0,
-438,1,476,1549,1,
-477,1555,1,1231,2288,
-16,0,438,1,479,
-1565,1,480,1570,1,
-1485,2289,16,0,438,
-1,1737,2290,16,0,
-438,1,242,2291,16,
-0,438,1,478,1588,
-1,1001,1598,1,1002,
-1603,1,22,2292,19,
-391,1,22,2293,5,
-84,1,1011,1112,1,
-1012,2294,16,0,389,
-1,1013,1268,1,262,
-1129,1,1267,2295,16,
-0,389,1,515,2296,
-16,0,389,1,1521,
-2297,16,0,389,1,
-525,1226,1,283,1182,
-1,2299,2298,16,0,
-389,1,42,2299,16,
-0,389,1,40,1187,
-1,44,1193,1,47,
-1194,1,1303,2300,16,
-0,389,1,1555,2301,
-16,0,389,1,50,
-1211,1,48,1200,1,
-49,1206,1,51,1216,
-1,63,1232,1,305,
-1221,1,66,1238,1,
-67,1243,1,68,1248,
-1,69,1253,1,70,
-1258,1,73,2302,16,
-0,389,1,74,1263,
-1,328,2303,16,0,
-389,1,1048,2304,16,
-0,389,1,82,2305,
-16,0,389,1,1840,
-2306,16,0,389,1,
-1591,2307,16,0,389,
-1,1341,2308,16,0,
-389,1,1096,1322,1,
-93,1328,1,352,2309,
-16,0,389,1,107,
-2310,16,0,389,1,
-1114,1353,1,118,2311,
-16,0,389,1,1123,
-2312,16,0,389,1,
-371,1375,1,1628,2313,
-16,0,389,1,375,
-1386,1,1882,2314,16,
-0,389,1,377,1391,
-1,379,1396,1,380,
-1401,1,883,2315,16,
-0,389,1,373,1419,
-1,130,2316,16,0,
-389,1,143,2317,16,
-0,389,1,387,2318,
-16,0,389,1,1159,
-2319,16,0,389,1,
-157,2320,16,0,389,
-1,1413,2321,16,0,
-389,1,1665,2322,16,
-0,389,1,412,2323,
-16,0,389,1,2676,
-2324,16,0,389,1,
-1377,2325,16,0,389,
-1,172,2326,16,0,
-389,1,1939,2327,16,
-0,389,1,437,2328,
-16,0,389,1,188,
-2329,16,0,389,1,
-942,2330,16,0,389,
-1,1195,2331,16,0,
-389,1,1449,2332,16,
-0,389,1,1701,2333,
-16,0,389,1,447,
-1512,1,205,2334,16,
-0,389,1,827,2335,
-16,0,389,1,223,
-2336,16,0,389,1,
-476,1549,1,477,1555,
-1,1231,2337,16,0,
-389,1,479,1565,1,
-480,1570,1,1485,2338,
-16,0,389,1,1737,
-2339,16,0,389,1,
-242,2340,16,0,389,
-1,478,1588,1,1001,
-1598,1,1002,1603,1,
-23,2341,19,514,1,
-23,2342,5,38,1,
-1901,2343,16,0,512,
-1,2075,2344,16,0,
-512,1,1860,831,1,
-1803,797,1,1804,2345,
-16,0,512,1,2413,
-2346,16,0,512,1,
-2198,2347,16,0,512,
-1,1873,845,1,1657,
-903,1,1989,925,1,
-1990,2348,16,0,512,
-1,1775,2349,16,0,
-512,1,32,2350,16,
-0,512,1,2105,824,
-1,2106,2351,16,0,
-512,1,2364,837,1,
-2227,917,1,2337,2352,
-16,0,512,1,2021,
-728,1,2458,885,1,
-2459,891,1,2462,898,
-1,2136,852,1,2464,
-908,1,2029,735,1,
-2030,741,1,2031,746,
-1,2032,751,1,2033,
-756,1,2035,762,1,
-2037,767,1,2039,772,
-1,1931,870,1,2041,
-778,1,2043,784,1,
-2045,789,1,1574,809,
-1,1958,2353,16,0,
-512,1,24,2354,19,
-186,1,24,2355,5,
-5,1,44,2356,16,
-0,184,1,377,2357,
-16,0,550,1,40,
-2358,16,0,684,1,
-63,2359,16,0,206,
-1,373,2360,16,0,
-546,1,25,2361,19,
-300,1,25,2362,5,
-177,1,2676,2363,16,
-0,298,1,256,2364,
-16,0,555,1,1261,
-2365,16,0,555,1,
-1011,1112,1,1012,2366,
-16,0,298,1,2458,
-885,1,262,1129,1,
-1267,2367,16,0,298,
-1,2021,728,1,1521,
-2368,16,0,298,1,
-1775,2369,16,0,555,
-1,2029,735,1,2030,
-741,1,2031,746,1,
-2032,751,1,2033,756,
-1,277,2370,16,0,
-555,1,2035,762,1,
-2037,767,1,2039,772,
-1,32,2371,16,0,
-555,1,2464,908,1,
-2293,2372,16,0,555,
-1,2043,784,1,2045,
-789,1,2299,2373,16,
-0,298,1,41,2374,
-16,0,555,1,42,
-2375,16,0,298,1,
-40,1187,1,44,1193,
-1,43,2376,16,0,
-555,1,1804,2377,16,
-0,555,1,48,1200,
-1,49,1206,1,47,
-1194,1,51,1216,1,
-52,2378,16,0,555,
-1,50,1211,1,305,
-1221,1,1096,1322,1,
-1515,2379,16,0,555,
-1,2318,2380,16,0,
-555,1,62,2381,16,
-0,555,1,63,1232,
-1,66,1238,1,67,
-1243,1,68,1248,1,
-69,1253,1,70,1258,
-1,71,2382,16,0,
-555,1,283,1182,1,
-73,2383,16,0,298,
-1,74,1263,1,1013,
-1268,1,76,2384,16,
-0,555,1,1834,2385,
-16,0,555,1,2337,
-2386,16,0,555,1,
-79,2387,16,0,555,
-1,1335,2388,16,0,
-555,1,299,2389,16,
-0,555,1,82,2390,
-16,0,298,1,1840,
-2391,16,0,298,1,
-1297,2392,16,0,555,
-1,85,2393,16,0,
-555,1,1341,2394,16,
-0,298,1,89,2395,
-16,0,555,1,1303,
-2396,16,0,298,1,
-509,2397,16,0,555,
-1,93,1328,1,322,
-2398,16,0,555,1,
-97,2399,16,0,555,
-1,2041,778,1,1555,
-2400,16,0,298,1,
-827,2401,16,0,298,
-1,102,2402,16,0,
-555,1,1860,831,1,
-1803,797,1,2364,837,
-1,107,2403,16,0,
-298,1,1114,1353,1,
-112,2404,16,0,555,
-1,1117,2405,16,0,
-555,1,352,1359,1,
-1873,845,1,118,1365,
-1,1123,2406,16,0,
-298,1,371,1375,1,
-515,2407,16,0,298,
-1,1377,2408,16,0,
-298,1,124,2409,16,
-0,555,1,1882,2410,
-16,0,298,1,377,
-1391,1,379,1396,1,
-380,1401,1,130,1424,
-1,346,2411,16,0,
-555,1,2075,2412,16,
-0,555,1,373,1419,
-1,387,2413,16,0,
-298,1,137,2414,16,
-0,555,1,143,2415,
-16,0,298,1,1901,
-2416,16,0,555,1,
-1048,1354,1,1153,2417,
-16,0,555,1,375,
-1386,1,151,2418,16,
-0,555,1,1407,2419,
-16,0,555,1,1659,
-2420,16,0,555,1,
-2413,2421,16,0,555,
-1,1159,2422,16,0,
-298,1,381,2423,16,
-0,555,1,157,2424,
-16,0,298,1,1413,
-2425,16,0,298,1,
-883,2426,16,0,298,
-1,1371,2427,16,0,
-555,1,328,1312,1,
-2105,824,1,2106,2428,
-16,0,555,1,166,
-2429,16,0,555,1,
-525,2430,16,0,555,
-1,1622,2431,16,0,
-555,1,406,2432,16,
-0,555,1,1574,809,
-1,172,1470,1,1931,
-870,1,412,2433,16,
-0,298,1,1933,2434,
-16,0,555,1,1876,
-2435,16,0,555,1,
-431,2436,16,0,555,
-1,1585,2437,16,0,
-555,1,182,2438,16,
-0,555,1,1628,2439,
-16,0,298,1,1189,
-2440,16,0,555,1,
-437,2441,16,0,298,
-1,1591,2442,16,0,
-298,1,188,1519,1,
-1695,2443,16,0,555,
-1,2198,2444,16,0,
-555,1,1195,2445,16,
-0,298,1,1449,2446,
-16,0,298,1,1701,
-2447,16,0,298,1,
-447,2448,16,0,555,
-1,199,2449,16,0,
-555,1,2459,891,1,
-1958,2450,16,0,555,
-1,2462,898,1,1657,
-903,1,205,2451,16,
-0,298,1,459,2452,
-16,0,555,1,462,
-2453,16,0,555,1,
-1665,2454,16,0,298,
-1,217,2455,16,0,
-555,1,2227,917,1,
-942,1491,1,1225,2456,
-16,0,555,1,223,
-2457,16,0,298,1,
-1479,2458,16,0,555,
-1,1731,2459,16,0,
-555,1,477,1555,1,
-1231,2460,16,0,298,
-1,479,1565,1,480,
-1570,1,1485,2461,16,
-0,298,1,1737,2462,
-16,0,298,1,1989,
-925,1,1990,2463,16,
-0,555,1,1443,2464,
-16,0,555,1,236,
-2465,16,0,555,1,
-2136,852,1,476,1549,
-1,242,2466,16,0,
-298,1,478,1588,1,
-1939,2467,16,0,298,
-1,2670,2468,16,0,
-555,1,1001,1598,1,
-1002,1603,1,1756,2469,
-16,0,555,1,26,
-2470,19,317,1,26,
-2471,5,84,1,1011,
-1112,1,1012,2472,16,
-0,315,1,1013,1268,
-1,262,1129,1,1267,
-2473,16,0,315,1,
-515,2474,16,0,672,
-1,1521,2475,16,0,
-315,1,525,1226,1,
-283,1182,1,2299,2476,
-16,0,315,1,42,
-2477,16,0,315,1,
-40,1187,1,44,1193,
-1,47,1194,1,1303,
-2478,16,0,315,1,
-1555,2479,16,0,315,
-1,50,1211,1,48,
-1200,1,49,1206,1,
-51,1216,1,63,1232,
-1,305,1221,1,66,
-1238,1,67,1243,1,
-68,1248,1,69,1253,
-1,70,1258,1,73,
-2480,16,0,315,1,
-74,1263,1,328,1312,
-1,1048,1354,1,82,
-2481,16,0,315,1,
-1840,2482,16,0,315,
-1,1591,2483,16,0,
-315,1,1341,2484,16,
-0,315,1,1096,1322,
-1,93,1328,1,352,
-1359,1,107,2485,16,
-0,315,1,1114,1353,
-1,118,1365,1,1123,
-2486,16,0,315,1,
-371,1375,1,1628,2487,
-16,0,315,1,375,
-1386,1,1882,2488,16,
-0,315,1,377,1391,
-1,379,1396,1,380,
-1401,1,883,2489,16,
-0,315,1,373,1419,
-1,130,1424,1,143,
-2490,16,0,315,1,
-387,2491,16,0,315,
-1,1159,2492,16,0,
-315,1,157,2493,16,
-0,315,1,1413,2494,
-16,0,315,1,1665,
-2495,16,0,315,1,
-412,2496,16,0,315,
-1,2676,2497,16,0,
-315,1,1377,2498,16,
-0,315,1,172,1470,
-1,1939,2499,16,0,
-315,1,437,2500,16,
-0,605,1,188,1519,
-1,942,1491,1,1195,
-2501,16,0,315,1,
-1449,2502,16,0,315,
-1,1701,2503,16,0,
-315,1,447,1512,1,
-205,2504,16,0,315,
-1,827,2505,16,0,
-315,1,223,2506,16,
-0,315,1,476,1549,
-1,477,1555,1,1231,
-2507,16,0,315,1,
-479,1565,1,480,1570,
-1,1485,2508,16,0,
-315,1,1737,2509,16,
-0,315,1,242,2510,
-16,0,315,1,478,
-1588,1,1001,1598,1,
-1002,1603,1,27,2511,
-19,614,1,27,2512,
-5,95,1,256,2513,
-16,0,612,1,1261,
-2514,16,0,612,1,
-509,2515,16,0,612,
-1,1515,2516,16,0,
-612,1,2021,728,1,
-1775,2517,16,0,612,
-1,2029,735,1,2030,
-741,1,2031,746,1,
-2032,751,1,2033,756,
-1,277,2518,16,0,
-612,1,2035,762,1,
-2037,767,1,2039,772,
-1,32,2519,16,0,
-612,1,2041,778,1,
-2293,2520,16,0,612,
-1,2043,784,1,2045,
-789,1,41,2521,16,
-0,612,1,1297,2522,
-16,0,612,1,43,
-2523,16,0,612,1,
-1803,797,1,1804,2524,
-16,0,612,1,299,
-2525,16,0,612,1,
-52,2526,16,0,612,
-1,2318,2527,16,0,
-612,1,62,2528,16,
-0,612,1,2075,2529,
-16,0,612,1,1574,
-809,1,71,2530,16,
-0,612,1,76,2531,
-16,0,612,1,1834,
-2532,16,0,612,1,
-2337,2533,16,0,612,
-1,79,2534,16,0,
-612,1,1335,2535,16,
-0,612,1,322,2536,
-16,0,612,1,85,
-2537,16,0,612,1,
-89,2538,16,0,612,
-1,346,2539,16,0,
-612,1,2105,824,1,
-2106,2540,16,0,612,
-1,97,2541,16,0,
-612,1,1860,831,1,
-2364,837,1,102,2542,
-16,0,612,1,112,
-2543,16,0,612,1,
-1117,2544,16,0,612,
-1,1873,845,1,1876,
-2545,16,0,612,1,
-124,2546,16,0,612,
-1,2136,852,1,381,
-2547,16,0,612,1,
-525,2548,16,0,612,
-1,137,2549,16,0,
-612,1,1901,2550,16,
-0,612,1,1153,2551,
-16,0,612,1,151,
-2552,16,0,612,1,
-1407,2553,16,0,612,
-1,1659,2554,16,0,
-612,1,2413,2555,16,
-0,612,1,406,2556,
-16,0,612,1,1371,
-2557,16,0,612,1,
-166,2558,16,0,612,
-1,1622,2559,16,0,
-612,1,1931,870,1,
-1933,2560,16,0,612,
-1,431,2561,16,0,
-612,1,1585,2562,16,
-0,612,1,182,2563,
-16,0,612,1,1189,
-2564,16,0,612,1,
-1443,2565,16,0,612,
-1,1695,2566,16,0,
-612,1,2198,2567,16,
-0,612,1,447,2568,
-16,0,612,1,2458,
-885,1,2459,891,1,
-1958,2569,16,0,612,
-1,2462,898,1,1657,
-903,1,2464,908,1,
-199,2570,16,0,612,
-1,459,2571,16,0,
-612,1,462,2572,16,
-0,612,1,217,2573,
-16,0,612,1,2227,
-917,1,1225,2574,16,
-0,612,1,1479,2575,
-16,0,612,1,1731,
-2576,16,0,612,1,
-1989,925,1,1990,2577,
-16,0,612,1,236,
-2578,16,0,612,1,
-2670,2579,16,0,612,
-1,1756,2580,16,0,
-612,1,28,2581,19,
-642,1,28,2582,5,
-60,1,328,1312,1,
-223,1539,1,1096,1322,
-1,118,1365,1,883,
-1407,1,525,1226,1,
-1001,1598,1,130,1424,
-1,459,1712,1,1114,
-1353,1,352,1359,1,
-447,1512,1,464,1707,
-1,1011,1112,1,1013,
-1268,1,242,1583,1,
-143,1429,1,40,1187,
-1,41,1681,1,42,
-1685,1,479,1565,1,
-44,1193,1,481,1714,
-1,373,1419,1,47,
-1194,1,157,1452,1,
-49,1206,1,50,1211,
-1,48,1200,1,379,
-1396,1,380,1401,1,
-51,1216,1,476,1549,
-1,371,1375,1,478,
-1588,1,1048,1354,1,
-375,1386,1,172,1470,
-1,262,1129,1,283,
-1182,1,63,1232,1,
-67,1243,1,68,1248,
-1,69,1253,1,66,
-1238,1,461,2583,16,
-0,640,1,74,1263,
-1,377,1391,1,1002,
-1603,1,70,1258,1,
-188,1519,1,82,1290,
-1,305,1221,1,477,
-1555,1,827,1341,1,
-93,1328,1,480,1570,
-1,205,1524,1,942,
-1491,1,107,1348,1,
-29,2584,19,289,1,
-29,2585,5,84,1,
-1011,1112,1,1012,2586,
-16,0,287,1,1013,
-1268,1,262,1129,1,
-1267,2587,16,0,287,
-1,515,2588,16,0,
-287,1,1521,2589,16,
-0,287,1,525,1226,
-1,283,1182,1,2299,
-2590,16,0,287,1,
-42,2591,16,0,287,
-1,40,1187,1,44,
-1193,1,47,1194,1,
-1303,2592,16,0,287,
-1,1555,2593,16,0,
-287,1,50,1211,1,
-48,1200,1,49,1206,
-1,51,1216,1,63,
-1232,1,305,1221,1,
-66,1238,1,67,1243,
-1,68,1248,1,69,
-1253,1,70,1258,1,
-73,2594,16,0,287,
-1,74,1263,1,328,
-1312,1,1048,1354,1,
-82,2595,16,0,287,
-1,1840,2596,16,0,
-287,1,1591,2597,16,
-0,287,1,1341,2598,
-16,0,287,1,1096,
-1322,1,93,1328,1,
-352,1359,1,107,2599,
-16,0,287,1,1114,
-1353,1,118,1365,1,
-1123,2600,16,0,287,
-1,371,1375,1,1628,
-2601,16,0,287,1,
-375,1386,1,1882,2602,
-16,0,287,1,377,
-1391,1,379,1396,1,
-380,1401,1,883,2603,
-16,0,287,1,373,
-1419,1,130,1424,1,
-143,1429,1,387,2604,
-16,0,287,1,1159,
-2605,16,0,287,1,
-157,1452,1,1413,2606,
-16,0,287,1,1665,
-2607,16,0,287,1,
-412,2608,16,0,287,
-1,2676,2609,16,0,
-287,1,1377,2610,16,
-0,287,1,172,1470,
-1,1939,2611,16,0,
-287,1,437,2612,16,
-0,287,1,188,1519,
-1,942,1491,1,1195,
-2613,16,0,287,1,
-1449,2614,16,0,287,
-1,1701,2615,16,0,
-287,1,447,1512,1,
-205,2616,16,0,287,
-1,827,2617,16,0,
-287,1,223,2618,16,
-0,287,1,476,1549,
-1,477,1555,1,1231,
-2619,16,0,287,1,
-479,1565,1,480,1570,
-1,1485,2620,16,0,
-287,1,1737,2621,16,
-0,287,1,242,2622,
-16,0,287,1,478,
-1588,1,1001,1598,1,
-1002,1603,1,30,2623,
-19,277,1,30,2624,
-5,84,1,1011,1112,
-1,1012,2625,16,0,
-275,1,1013,1268,1,
-262,1129,1,1267,2626,
-16,0,275,1,515,
-2627,16,0,275,1,
-1521,2628,16,0,275,
-1,525,1226,1,283,
-1182,1,2299,2629,16,
-0,275,1,42,2630,
-16,0,275,1,40,
-1187,1,44,1193,1,
-47,1194,1,1303,2631,
-16,0,275,1,1555,
-2632,16,0,275,1,
-50,1211,1,48,1200,
-1,49,1206,1,51,
-1216,1,63,1232,1,
-305,1221,1,66,1238,
-1,67,1243,1,68,
-1248,1,69,1253,1,
-70,1258,1,73,2633,
-16,0,275,1,74,
-1263,1,328,1312,1,
-1048,1354,1,82,2634,
-16,0,275,1,1840,
-2635,16,0,275,1,
-1591,2636,16,0,275,
-1,1341,2637,16,0,
-275,1,1096,1322,1,
-93,1328,1,352,1359,
-1,107,2638,16,0,
-275,1,1114,1353,1,
-118,1365,1,1123,2639,
-16,0,275,1,371,
-1375,1,1628,2640,16,
-0,275,1,375,1386,
-1,1882,2641,16,0,
-275,1,377,1391,1,
-379,1396,1,380,1401,
-1,883,2642,16,0,
-275,1,373,1419,1,
-130,1424,1,143,1429,
-1,387,2643,16,0,
-275,1,1159,2644,16,
-0,275,1,157,1452,
-1,1413,2645,16,0,
-275,1,1665,2646,16,
-0,275,1,412,2647,
-16,0,275,1,2676,
-2648,16,0,275,1,
-1377,2649,16,0,275,
-1,172,1470,1,1939,
-2650,16,0,275,1,
-437,2651,16,0,275,
-1,188,1519,1,942,
-1491,1,1195,2652,16,
-0,275,1,1449,2653,
-16,0,275,1,1701,
-2654,16,0,275,1,
-447,1512,1,205,2655,
-16,0,275,1,827,
-2656,16,0,275,1,
-223,2657,16,0,275,
-1,476,1549,1,477,
-1555,1,1231,2658,16,
-0,275,1,479,1565,
-1,480,1570,1,1485,
-2659,16,0,275,1,
-1737,2660,16,0,275,
-1,242,2661,16,0,
-275,1,478,1588,1,
-1001,1598,1,1002,1603,
-1,31,2662,19,266,
-1,31,2663,5,84,
-1,1011,1112,1,1012,
-2664,16,0,264,1,
-1013,1268,1,262,1129,
-1,1267,2665,16,0,
-264,1,515,2666,16,
-0,264,1,1521,2667,
-16,0,264,1,525,
-1226,1,283,1182,1,
-2299,2668,16,0,264,
-1,42,2669,16,0,
-264,1,40,1187,1,
-44,1193,1,47,1194,
-1,1303,2670,16,0,
-264,1,1555,2671,16,
-0,264,1,50,1211,
-1,48,1200,1,49,
-1206,1,51,1216,1,
-63,1232,1,305,1221,
-1,66,1238,1,67,
-1243,1,68,1248,1,
-69,1253,1,70,1258,
-1,73,2672,16,0,
-264,1,74,1263,1,
-328,1312,1,1048,1354,
-1,82,2673,16,0,
-264,1,1840,2674,16,
-0,264,1,1591,2675,
-16,0,264,1,1341,
-2676,16,0,264,1,
-1096,1322,1,93,1328,
-1,352,1359,1,107,
-2677,16,0,264,1,
-1114,1353,1,118,1365,
-1,1123,2678,16,0,
-264,1,371,1375,1,
-1628,2679,16,0,264,
-1,375,1386,1,1882,
-2680,16,0,264,1,
-377,1391,1,379,1396,
-1,380,1401,1,883,
-2681,16,0,264,1,
-373,1419,1,130,1424,
-1,143,2682,16,0,
-264,1,387,2683,16,
-0,264,1,1159,2684,
-16,0,264,1,157,
-2685,16,0,264,1,
-1413,2686,16,0,264,
-1,1665,2687,16,0,
-264,1,412,2688,16,
-0,264,1,2676,2689,
-16,0,264,1,1377,
-2690,16,0,264,1,
-172,1470,1,1939,2691,
-16,0,264,1,437,
-2692,16,0,264,1,
-188,1519,1,942,1491,
-1,1195,2693,16,0,
-264,1,1449,2694,16,
-0,264,1,1701,2695,
-16,0,264,1,447,
-1512,1,205,2696,16,
-0,264,1,827,2697,
-16,0,264,1,223,
-2698,16,0,264,1,
-476,1549,1,477,1555,
-1,1231,2699,16,0,
-264,1,479,1565,1,
-480,1570,1,1485,2700,
-16,0,264,1,1737,
-2701,16,0,264,1,
-242,2702,16,0,264,
-1,478,1588,1,1001,
-1598,1,1002,1603,1,
-32,2703,19,256,1,
-32,2704,5,84,1,
-1011,1112,1,1012,2705,
-16,0,254,1,1013,
-1268,1,262,1129,1,
-1267,2706,16,0,254,
-1,515,2707,16,0,
-254,1,1521,2708,16,
-0,254,1,525,1226,
-1,283,1182,1,2299,
-2709,16,0,254,1,
-42,2710,16,0,254,
-1,40,1187,1,44,
-1193,1,47,1194,1,
-1303,2711,16,0,254,
-1,1555,2712,16,0,
-254,1,50,1211,1,
-48,1200,1,49,1206,
-1,51,1216,1,63,
-1232,1,305,1221,1,
-66,1238,1,67,1243,
-1,68,1248,1,69,
-1253,1,70,1258,1,
-73,2713,16,0,254,
-1,74,1263,1,328,
-1312,1,1048,1354,1,
-82,2714,16,0,254,
-1,1840,2715,16,0,
-254,1,1591,2716,16,
-0,254,1,1341,2717,
-16,0,254,1,1096,
-1322,1,93,1328,1,
-352,1359,1,107,2718,
-16,0,254,1,1114,
-1353,1,118,1365,1,
-1123,2719,16,0,254,
-1,371,1375,1,1628,
-2720,16,0,254,1,
-375,1386,1,1882,2721,
-16,0,254,1,377,
-1391,1,379,1396,1,
-380,1401,1,883,2722,
-16,0,254,1,373,
-1419,1,130,1424,1,
-143,2723,16,0,254,
-1,387,2724,16,0,
-254,1,1159,2725,16,
-0,254,1,157,2726,
-16,0,254,1,1413,
-2727,16,0,254,1,
-1665,2728,16,0,254,
-1,412,2729,16,0,
-254,1,2676,2730,16,
-0,254,1,1377,2731,
-16,0,254,1,172,
-1470,1,1939,2732,16,
-0,254,1,437,2733,
-16,0,254,1,188,
-1519,1,942,1491,1,
-1195,2734,16,0,254,
-1,1449,2735,16,0,
-254,1,1701,2736,16,
-0,254,1,447,1512,
-1,205,2737,16,0,
-254,1,827,2738,16,
-0,254,1,223,2739,
-16,0,254,1,476,
-1549,1,477,1555,1,
-1231,2740,16,0,254,
-1,479,1565,1,480,
-1570,1,1485,2741,16,
-0,254,1,1737,2742,
-16,0,254,1,242,
-2743,16,0,254,1,
-478,1588,1,1001,1598,
-1,1002,1603,1,33,
-2744,19,340,1,33,
-2745,5,84,1,1011,
-1112,1,1012,2746,16,
-0,338,1,1013,1268,
-1,262,1129,1,1267,
-2747,16,0,338,1,
-515,2748,16,0,338,
-1,1521,2749,16,0,
-338,1,525,1226,1,
-283,1182,1,2299,2750,
-16,0,338,1,42,
-2751,16,0,338,1,
-40,1187,1,44,1193,
-1,47,1194,1,1303,
-2752,16,0,338,1,
-1555,2753,16,0,338,
-1,50,1211,1,48,
-1200,1,49,1206,1,
-51,1216,1,63,1232,
-1,305,1221,1,66,
-1238,1,67,1243,1,
-68,1248,1,69,1253,
-1,70,1258,1,73,
-2754,16,0,338,1,
-74,1263,1,328,1312,
-1,1048,1354,1,82,
-2755,16,0,338,1,
-1840,2756,16,0,338,
-1,1591,2757,16,0,
-338,1,1341,2758,16,
-0,338,1,1096,1322,
-1,93,1328,1,352,
-1359,1,107,2759,16,
-0,338,1,1114,1353,
-1,118,1365,1,1123,
-2760,16,0,338,1,
-371,1375,1,1628,2761,
-16,0,338,1,375,
-1386,1,1882,2762,16,
-0,338,1,377,1391,
-1,379,1396,1,380,
-1401,1,883,2763,16,
-0,338,1,373,1419,
-1,130,1424,1,143,
-1429,1,387,2764,16,
-0,338,1,1159,2765,
-16,0,338,1,157,
-1452,1,1413,2766,16,
-0,338,1,1665,2767,
-16,0,338,1,412,
-2768,16,0,338,1,
-2676,2769,16,0,338,
-1,1377,2770,16,0,
-338,1,172,1470,1,
-1939,2771,16,0,338,
-1,437,2772,16,0,
-338,1,188,1519,1,
-942,1491,1,1195,2773,
-16,0,338,1,1449,
-2774,16,0,338,1,
-1701,2775,16,0,338,
-1,447,1512,1,205,
-2776,16,0,338,1,
-827,2777,16,0,338,
-1,223,2778,16,0,
-338,1,476,1549,1,
-477,1555,1,1231,2779,
-16,0,338,1,479,
-1565,1,480,1570,1,
-1485,2780,16,0,338,
-1,1737,2781,16,0,
-338,1,242,1583,1,
-478,1588,1,1001,1598,
-1,1002,1603,1,34,
-2782,19,330,1,34,
-2783,5,84,1,1011,
-1112,1,1012,2784,16,
-0,328,1,1013,1268,
-1,262,1129,1,1267,
-2785,16,0,328,1,
-515,2786,16,0,328,
-1,1521,2787,16,0,
-328,1,525,1226,1,
-283,1182,1,2299,2788,
-16,0,328,1,42,
-2789,16,0,328,1,
-40,1187,1,44,1193,
-1,47,1194,1,1303,
-2790,16,0,328,1,
-1555,2791,16,0,328,
-1,50,1211,1,48,
-1200,1,49,1206,1,
-51,1216,1,63,1232,
-1,305,1221,1,66,
-1238,1,67,1243,1,
-68,1248,1,69,1253,
-1,70,1258,1,73,
-2792,16,0,328,1,
-74,1263,1,328,1312,
-1,1048,1354,1,82,
-2793,16,0,328,1,
-1840,2794,16,0,328,
-1,1591,2795,16,0,
-328,1,1341,2796,16,
-0,328,1,1096,1322,
-1,93,1328,1,352,
-1359,1,107,2797,16,
-0,328,1,1114,1353,
-1,118,1365,1,1123,
-2798,16,0,328,1,
-371,1375,1,1628,2799,
-16,0,328,1,375,
-1386,1,1882,2800,16,
-0,328,1,377,1391,
-1,379,1396,1,380,
-1401,1,883,2801,16,
-0,328,1,373,1419,
-1,130,1424,1,143,
-1429,1,387,2802,16,
-0,328,1,1159,2803,
-16,0,328,1,157,
-1452,1,1413,2804,16,
-0,328,1,1665,2805,
-16,0,328,1,412,
-2806,16,0,328,1,
-2676,2807,16,0,328,
-1,1377,2808,16,0,
-328,1,172,1470,1,
-1939,2809,16,0,328,
-1,437,2810,16,0,
-328,1,188,1519,1,
-942,1491,1,1195,2811,
-16,0,328,1,1449,
-2812,16,0,328,1,
-1701,2813,16,0,328,
-1,447,1512,1,205,
-1524,1,827,2814,16,
-0,328,1,223,1539,
-1,476,1549,1,477,
-1555,1,1231,2815,16,
-0,328,1,479,1565,
-1,480,1570,1,1485,
-2816,16,0,328,1,
-1737,2817,16,0,328,
-1,242,1583,1,478,
-1588,1,1001,1598,1,
-1002,1603,1,35,2818,
-19,320,1,35,2819,
-5,84,1,1011,1112,
-1,1012,2820,16,0,
-318,1,1013,1268,1,
-262,1129,1,1267,2821,
-16,0,318,1,515,
-2822,16,0,318,1,
-1521,2823,16,0,318,
-1,525,1226,1,283,
-1182,1,2299,2824,16,
-0,318,1,42,2825,
-16,0,318,1,40,
-1187,1,44,1193,1,
-47,1194,1,1303,2826,
-16,0,318,1,1555,
-2827,16,0,318,1,
-50,1211,1,48,1200,
-1,49,1206,1,51,
-1216,1,63,1232,1,
-305,1221,1,66,1238,
-1,67,1243,1,68,
-1248,1,69,1253,1,
-70,1258,1,73,2828,
-16,0,318,1,74,
-1263,1,328,1312,1,
-1048,1354,1,82,2829,
-16,0,318,1,1840,
-2830,16,0,318,1,
-1591,2831,16,0,318,
-1,1341,2832,16,0,
-318,1,1096,1322,1,
-93,1328,1,352,1359,
-1,107,2833,16,0,
-318,1,1114,1353,1,
-118,1365,1,1123,2834,
-16,0,318,1,371,
-1375,1,1628,2835,16,
-0,318,1,375,1386,
-1,1882,2836,16,0,
-318,1,377,1391,1,
-379,1396,1,380,1401,
-1,883,2837,16,0,
-318,1,373,1419,1,
-130,1424,1,143,1429,
-1,387,2838,16,0,
-318,1,1159,2839,16,
-0,318,1,157,1452,
-1,1413,2840,16,0,
-318,1,1665,2841,16,
-0,318,1,412,2842,
-16,0,318,1,2676,
-2843,16,0,318,1,
-1377,2844,16,0,318,
-1,172,1470,1,1939,
-2845,16,0,318,1,
-437,2846,16,0,318,
-1,188,1519,1,942,
-1491,1,1195,2847,16,
-0,318,1,1449,2848,
-16,0,318,1,1701,
-2849,16,0,318,1,
-447,1512,1,205,1524,
-1,827,2850,16,0,
-318,1,223,2851,16,
-0,318,1,476,1549,
-1,477,1555,1,1231,
-2852,16,0,318,1,
-479,1565,1,480,1570,
-1,1485,2853,16,0,
-318,1,1737,2854,16,
-0,318,1,242,1583,
-1,478,1588,1,1001,
-1598,1,1002,1603,1,
-36,2855,19,226,1,
-36,2856,5,94,1,
-256,2857,16,0,224,
-1,1261,2858,16,0,
-224,1,509,2859,16,
-0,224,1,1515,2860,
-16,0,224,1,2021,
-728,1,1775,2861,16,
-0,224,1,2029,735,
-1,2030,741,1,2031,
-746,1,2032,751,1,
-2033,756,1,277,2862,
-16,0,224,1,2035,
-762,1,2037,767,1,
-2039,772,1,32,2863,
-16,0,224,1,2041,
-778,1,2293,2864,16,
-0,224,1,2043,784,
-1,2045,789,1,41,
-2865,16,0,224,1,
-1297,2866,16,0,224,
-1,43,2867,16,0,
-224,1,1803,797,1,
-1804,2868,16,0,224,
-1,299,2869,16,0,
-224,1,52,2870,16,
-0,224,1,2318,2871,
-16,0,224,1,2075,
-2872,16,0,224,1,
-1574,809,1,71,2873,
-16,0,224,1,76,
-2874,16,0,224,1,
-1834,2875,16,0,224,
-1,2337,2876,16,0,
-224,1,79,2877,16,
-0,224,1,1335,2878,
-16,0,224,1,322,
-2879,16,0,224,1,
-85,2880,16,0,224,
-1,89,2881,16,0,
-224,1,346,2882,16,
-0,224,1,2105,824,
-1,2106,2883,16,0,
-224,1,97,2884,16,
-0,224,1,1860,831,
-1,2364,837,1,102,
-2885,16,0,224,1,
-112,2886,16,0,224,
-1,1117,2887,16,0,
-224,1,1873,845,1,
-1876,2888,16,0,224,
-1,124,2889,16,0,
-224,1,2136,852,1,
-381,2890,16,0,224,
-1,525,2891,16,0,
-224,1,137,2892,16,
-0,224,1,1901,2893,
-16,0,224,1,1153,
-2894,16,0,224,1,
-151,2895,16,0,224,
-1,1407,2896,16,0,
-224,1,1659,2897,16,
-0,224,1,2413,2898,
-16,0,224,1,406,
-2899,16,0,224,1,
-2670,2900,16,0,224,
-1,1657,903,1,166,
-2901,16,0,224,1,
-1622,2902,16,0,224,
-1,1931,870,1,1933,
-2903,16,0,224,1,
-431,2904,16,0,224,
-1,1585,2905,16,0,
-224,1,182,2906,16,
-0,224,1,1189,2907,
-16,0,224,1,1443,
-2908,16,0,224,1,
-1695,2909,16,0,224,
-1,2198,2910,16,0,
-224,1,447,2911,16,
-0,224,1,2458,885,
-1,2459,891,1,1958,
-2912,16,0,224,1,
-2462,898,1,1371,2913,
-16,0,224,1,2464,
-908,1,199,2914,16,
-0,224,1,459,2915,
-16,0,224,1,462,
-2916,16,0,224,1,
-217,2917,16,0,224,
-1,2227,917,1,1225,
-2918,16,0,224,1,
-1479,2919,16,0,224,
-1,1731,2920,16,0,
-224,1,1989,925,1,
-1990,2921,16,0,224,
-1,236,2922,16,0,
-224,1,1756,2923,16,
-0,224,1,37,2924,
-19,246,1,37,2925,
-5,94,1,256,2926,
-16,0,244,1,1261,
-2927,16,0,244,1,
-509,2928,16,0,244,
-1,1515,2929,16,0,
-244,1,2021,728,1,
-1775,2930,16,0,244,
-1,2029,735,1,2030,
-741,1,2031,746,1,
-2032,751,1,2033,756,
-1,277,2931,16,0,
-244,1,2035,762,1,
-2037,767,1,2039,772,
-1,32,2932,16,0,
-244,1,2041,778,1,
-2293,2933,16,0,244,
-1,2043,784,1,2045,
-789,1,41,2934,16,
-0,244,1,1297,2935,
-16,0,244,1,43,
-2936,16,0,244,1,
-1803,797,1,1804,2937,
-16,0,244,1,299,
-2938,16,0,244,1,
-52,2939,16,0,244,
-1,2318,2940,16,0,
-244,1,2075,2941,16,
-0,244,1,1574,809,
-1,71,2942,16,0,
-244,1,76,2943,16,
-0,244,1,1834,2944,
-16,0,244,1,2337,
-2945,16,0,244,1,
-79,2946,16,0,244,
-1,1335,2947,16,0,
-244,1,322,2948,16,
-0,244,1,85,2949,
-16,0,244,1,89,
-2950,16,0,244,1,
-346,2951,16,0,244,
-1,2105,824,1,2106,
-2952,16,0,244,1,
-97,2953,16,0,244,
-1,1860,831,1,2364,
-837,1,102,2954,16,
-0,244,1,112,2955,
-16,0,244,1,1117,
-2956,16,0,244,1,
-1873,845,1,1876,2957,
-16,0,244,1,124,
-2958,16,0,244,1,
-2136,852,1,381,2959,
-16,0,244,1,525,
-2960,16,0,244,1,
-137,2961,16,0,244,
-1,1901,2962,16,0,
-244,1,1153,2963,16,
-0,244,1,151,2964,
-16,0,244,1,1407,
-2965,16,0,244,1,
-1659,2966,16,0,244,
-1,2413,2967,16,0,
-244,1,406,2968,16,
-0,244,1,2670,2969,
-16,0,244,1,1657,
-903,1,166,2970,16,
-0,244,1,1622,2971,
-16,0,244,1,1931,
-870,1,1933,2972,16,
-0,244,1,431,2973,
-16,0,244,1,1585,
-2974,16,0,244,1,
-182,2975,16,0,244,
-1,1189,2976,16,0,
-244,1,1443,2977,16,
-0,244,1,1695,2978,
-16,0,244,1,2198,
-2979,16,0,244,1,
-447,2980,16,0,244,
-1,2458,885,1,2459,
-891,1,1958,2981,16,
-0,244,1,2462,898,
-1,1371,2982,16,0,
-244,1,2464,908,1,
-199,2983,16,0,244,
-1,459,2984,16,0,
-244,1,462,2985,16,
-0,244,1,217,2986,
-16,0,244,1,2227,
-917,1,1225,2987,16,
-0,244,1,1479,2988,
-16,0,244,1,1731,
-2989,16,0,244,1,
-1989,925,1,1990,2990,
-16,0,244,1,236,
-2991,16,0,244,1,
-1756,2992,16,0,244,
-1,38,2993,19,243,
-1,38,2994,5,84,
-1,1011,1112,1,1012,
-2995,16,0,241,1,
-1013,1268,1,262,1129,
-1,1267,2996,16,0,
-241,1,515,2997,16,
-0,241,1,1521,2998,
-16,0,241,1,525,
-1226,1,283,1182,1,
-2299,2999,16,0,241,
-1,42,3000,16,0,
-241,1,40,1187,1,
-44,1193,1,47,1194,
-1,1303,3001,16,0,
-241,1,1555,3002,16,
-0,241,1,50,1211,
-1,48,1200,1,49,
-1206,1,51,1216,1,
-63,1232,1,305,1221,
-1,66,1238,1,67,
-1243,1,68,1248,1,
-69,1253,1,70,1258,
-1,73,3003,16,0,
-241,1,74,1263,1,
-328,1312,1,1048,1354,
-1,82,3004,16,0,
-241,1,1840,3005,16,
-0,241,1,1591,3006,
-16,0,241,1,1341,
-3007,16,0,241,1,
-1096,1322,1,93,1328,
-1,352,1359,1,107,
-3008,16,0,241,1,
-1114,1353,1,118,1365,
-1,1123,3009,16,0,
-241,1,371,1375,1,
-1628,3010,16,0,241,
-1,375,1386,1,1882,
-3011,16,0,241,1,
-377,1391,1,379,1396,
-1,380,1401,1,883,
-1407,1,373,1419,1,
-130,1424,1,143,1429,
-1,387,3012,16,0,
-241,1,1159,3013,16,
-0,241,1,157,1452,
-1,1413,3014,16,0,
-241,1,1665,3015,16,
-0,241,1,412,3016,
-16,0,241,1,2676,
-3017,16,0,241,1,
-1377,3018,16,0,241,
-1,172,1470,1,1939,
-3019,16,0,241,1,
-437,3020,16,0,241,
-1,188,1519,1,942,
-1491,1,1195,3021,16,
-0,241,1,1449,3022,
-16,0,241,1,1701,
-3023,16,0,241,1,
-447,1512,1,205,1524,
-1,827,1341,1,223,
-1539,1,476,1549,1,
-477,1555,1,1231,3024,
-16,0,241,1,479,
-1565,1,480,1570,1,
-1485,3025,16,0,241,
-1,1737,3026,16,0,
-241,1,242,1583,1,
-478,1588,1,1001,1598,
-1,1002,1603,1,39,
-3027,19,232,1,39,
-3028,5,84,1,1011,
-1112,1,1012,3029,16,
-0,230,1,1013,1268,
-1,262,1129,1,1267,
-3030,16,0,230,1,
-515,3031,16,0,230,
-1,1521,3032,16,0,
-230,1,525,1226,1,
-283,1182,1,2299,3033,
-16,0,230,1,42,
-3034,16,0,230,1,
-40,1187,1,44,1193,
-1,47,1194,1,1303,
-3035,16,0,230,1,
-1555,3036,16,0,230,
-1,50,1211,1,48,
-1200,1,49,1206,1,
-51,1216,1,63,1232,
-1,305,1221,1,66,
-1238,1,67,1243,1,
-68,1248,1,69,1253,
-1,70,1258,1,73,
-3037,16,0,230,1,
-74,1263,1,328,1312,
-1,1048,1354,1,82,
-3038,16,0,230,1,
-1840,3039,16,0,230,
-1,1591,3040,16,0,
-230,1,1341,3041,16,
-0,230,1,1096,1322,
-1,93,1328,1,352,
-1359,1,107,3042,16,
-0,230,1,1114,1353,
-1,118,1365,1,1123,
-3043,16,0,230,1,
-371,1375,1,1628,3044,
-16,0,230,1,375,
-1386,1,1882,3045,16,
-0,230,1,377,1391,
-1,379,1396,1,380,
-1401,1,883,1407,1,
-373,1419,1,130,1424,
-1,143,1429,1,387,
-3046,16,0,230,1,
-1159,3047,16,0,230,
-1,157,1452,1,1413,
-3048,16,0,230,1,
-1665,3049,16,0,230,
-1,412,3050,16,0,
-230,1,2676,3051,16,
-0,230,1,1377,3052,
-16,0,230,1,172,
-1470,1,1939,3053,16,
-0,230,1,437,3054,
-16,0,230,1,188,
-1519,1,942,1491,1,
-1195,3055,16,0,230,
-1,1449,3056,16,0,
-230,1,1701,3057,16,
-0,230,1,447,1512,
-1,205,1524,1,827,
-1341,1,223,1539,1,
-476,1549,1,477,1555,
-1,1231,3058,16,0,
-230,1,479,1565,1,
-480,1570,1,1485,3059,
-16,0,230,1,1737,
-3060,16,0,230,1,
-242,1583,1,478,1588,
-1,1001,1598,1,1002,
-1603,1,40,3061,19,
-220,1,40,3062,5,
-84,1,1011,1112,1,
-1012,3063,16,0,218,
-1,1013,1268,1,262,
-1129,1,1267,3064,16,
-0,218,1,515,3065,
-16,0,218,1,1521,
-3066,16,0,218,1,
-525,1226,1,283,1182,
-1,2299,3067,16,0,
-218,1,42,3068,16,
-0,218,1,40,1187,
-1,44,1193,1,47,
-1194,1,1303,3069,16,
-0,218,1,1555,3070,
-16,0,218,1,50,
-1211,1,48,1200,1,
-49,1206,1,51,1216,
-1,63,1232,1,305,
-1221,1,66,1238,1,
-67,1243,1,68,1248,
-1,69,1253,1,70,
-1258,1,73,3071,16,
-0,218,1,74,1263,
-1,328,1312,1,1048,
-1354,1,82,3072,16,
-0,218,1,1840,3073,
-16,0,218,1,1591,
-3074,16,0,218,1,
-1341,3075,16,0,218,
-1,1096,1322,1,93,
-1328,1,352,1359,1,
-107,3076,16,0,218,
-1,1114,1353,1,118,
-3077,16,0,218,1,
-1123,3078,16,0,218,
-1,371,1375,1,1628,
-3079,16,0,218,1,
-375,1386,1,1882,3080,
-16,0,218,1,377,
-1391,1,379,1396,1,
-380,1401,1,883,3081,
-16,0,218,1,373,
-1419,1,130,3082,16,
-0,218,1,143,3083,
-16,0,218,1,387,
-3084,16,0,218,1,
-1159,3085,16,0,218,
-1,157,3086,16,0,
-218,1,1413,3087,16,
-0,218,1,1665,3088,
-16,0,218,1,412,
-3089,16,0,218,1,
-2676,3090,16,0,218,
-1,1377,3091,16,0,
-218,1,172,3092,16,
-0,218,1,1939,3093,
-16,0,218,1,437,
-3094,16,0,218,1,
-188,3095,16,0,218,
-1,942,1491,1,1195,
-3096,16,0,218,1,
-1449,3097,16,0,218,
-1,1701,3098,16,0,
-218,1,447,1512,1,
-205,3099,16,0,218,
-1,827,3100,16,0,
-218,1,223,3101,16,
-0,218,1,476,1549,
-1,477,1555,1,1231,
-3102,16,0,218,1,
-479,1565,1,480,1570,
-1,1485,3103,16,0,
-218,1,1737,3104,16,
-0,218,1,242,3105,
-16,0,218,1,478,
-1588,1,1001,1598,1,
-1002,1603,1,41,3106,
-19,181,1,41,3107,
-5,84,1,1011,1112,
-1,1012,3108,16,0,
-179,1,1013,1268,1,
-262,1129,1,1267,3109,
-16,0,179,1,515,
-3110,16,0,179,1,
-1521,3111,16,0,179,
-1,525,1226,1,283,
-1182,1,2299,3112,16,
-0,179,1,42,3113,
-16,0,179,1,40,
-1187,1,44,1193,1,
-47,1194,1,1303,3114,
-16,0,179,1,1555,
-3115,16,0,179,1,
-50,1211,1,48,1200,
-1,49,1206,1,51,
-1216,1,63,1232,1,
-305,1221,1,66,1238,
-1,67,1243,1,68,
-1248,1,69,1253,1,
-70,1258,1,73,3116,
-16,0,179,1,74,
-1263,1,328,1312,1,
-1048,1354,1,82,3117,
-16,0,179,1,1840,
-3118,16,0,179,1,
-1591,3119,16,0,179,
-1,1341,3120,16,0,
-179,1,1096,1322,1,
-93,1328,1,352,1359,
-1,107,3121,16,0,
-179,1,1114,1353,1,
-118,3122,16,0,179,
-1,1123,3123,16,0,
-179,1,371,1375,1,
-1628,3124,16,0,179,
-1,375,1386,1,1882,
-3125,16,0,179,1,
-377,1391,1,379,1396,
-1,380,1401,1,883,
-3126,16,0,179,1,
-373,1419,1,130,3127,
-16,0,179,1,143,
-3128,16,0,179,1,
-387,3129,16,0,179,
-1,1159,3130,16,0,
-179,1,157,3131,16,
-0,179,1,1413,3132,
-16,0,179,1,1665,
-3133,16,0,179,1,
-412,3134,16,0,179,
-1,2676,3135,16,0,
-179,1,1377,3136,16,
-0,179,1,172,3137,
-16,0,179,1,1939,
-3138,16,0,179,1,
-437,3139,16,0,179,
-1,188,3140,16,0,
-179,1,942,1491,1,
-1195,3141,16,0,179,
-1,1449,3142,16,0,
-179,1,1701,3143,16,
-0,179,1,447,1512,
-1,205,3144,16,0,
-179,1,827,3145,16,
-0,179,1,223,3146,
-16,0,179,1,476,
-1549,1,477,1555,1,
-1231,3147,16,0,179,
-1,479,1565,1,480,
-1570,1,1485,3148,16,
-0,179,1,1737,3149,
-16,0,179,1,242,
-3150,16,0,179,1,
-478,1588,1,1001,1598,
-1,1002,1603,1,42,
-3151,19,402,1,42,
-3152,5,38,1,1901,
-3153,16,0,400,1,
-2075,3154,16,0,400,
-1,1860,831,1,1803,
-797,1,1804,3155,16,
-0,400,1,2413,3156,
-16,0,400,1,2198,
-3157,16,0,400,1,
-1873,845,1,1657,903,
-1,1989,925,1,1990,
-3158,16,0,400,1,
-1775,3159,16,0,400,
-1,32,3160,16,0,
-400,1,2105,824,1,
-2106,3161,16,0,400,
-1,2364,837,1,2227,
-917,1,2337,3162,16,
-0,400,1,2021,728,
-1,2458,885,1,2459,
-891,1,2462,898,1,
-2136,852,1,2464,908,
-1,2029,735,1,2030,
-741,1,2031,746,1,
-2032,751,1,2033,756,
-1,2035,762,1,2037,
-767,1,2039,772,1,
-1931,870,1,2041,778,
-1,2043,784,1,2045,
-789,1,1574,809,1,
-1958,3163,16,0,400,
-1,43,3164,19,467,
-1,43,3165,5,25,
-1,2035,762,1,2037,
-767,1,2039,772,1,
-2041,778,1,2227,917,
-1,2043,784,1,1657,
-903,1,1860,831,1,
-2136,852,1,2021,728,
-1,2459,891,1,1574,
-809,1,2105,3166,16,
-0,593,1,1931,870,
-1,1873,845,1,2031,
-746,1,1803,797,1,
-1989,3167,16,0,465,
-1,2464,908,1,2029,
-735,1,2030,741,1,
-2364,837,1,2032,751,
-1,2033,756,1,2045,
-789,1,44,3168,19,
-273,1,44,3169,5,
-38,1,1901,3170,16,
-0,271,1,2075,3171,
-16,0,271,1,1860,
-831,1,1803,797,1,
-1804,3172,16,0,271,
-1,2413,3173,16,0,
-271,1,2198,3174,16,
-0,271,1,1873,845,
-1,1657,903,1,1989,
-925,1,1990,3175,16,
-0,271,1,1775,3176,
-16,0,271,1,32,
-3177,16,0,271,1,
-2105,824,1,2106,3178,
-16,0,271,1,2364,
-837,1,2227,917,1,
-2337,3179,16,0,271,
-1,2021,728,1,2458,
-885,1,2459,891,1,
-2462,898,1,2136,852,
-1,2464,908,1,2029,
-735,1,2030,741,1,
-2031,746,1,2032,751,
-1,2033,756,1,2035,
-762,1,2037,767,1,
-2039,772,1,1931,870,
-1,2041,778,1,2043,
-784,1,2045,789,1,
-1574,809,1,1958,3180,
-16,0,271,1,45,
-3181,19,296,1,45,
-3182,5,39,1,1901,
-3183,16,0,324,1,
-2075,3184,16,0,324,
-1,1860,831,1,1803,
-797,1,1804,3185,16,
-0,324,1,2413,3186,
-16,0,324,1,2198,
-3187,16,0,324,1,
-1873,845,1,1657,903,
-1,1989,925,1,1990,
-3188,16,0,324,1,
-1775,3189,16,0,324,
-1,32,3190,16,0,
-324,1,2105,824,1,
-2106,3191,16,0,324,
-1,2364,837,1,2227,
-917,1,2337,3192,16,
-0,324,1,2021,728,
-1,2458,885,1,2459,
-891,1,2462,898,1,
-2136,852,1,2464,908,
-1,2029,735,1,2030,
-741,1,2031,746,1,
-2032,751,1,2033,756,
-1,2035,762,1,2037,
-767,1,2039,772,1,
-1931,870,1,2041,778,
-1,2043,784,1,2045,
-789,1,1832,3193,16,
-0,294,1,1574,809,
-1,1958,3194,16,0,
-324,1,46,3195,19,
-681,1,46,3196,5,
-38,1,1901,3197,16,
-0,679,1,2075,3198,
-16,0,679,1,1860,
-831,1,1803,797,1,
-1804,3199,16,0,679,
-1,2413,3200,16,0,
-679,1,2198,3201,16,
-0,679,1,1873,845,
-1,1657,903,1,1989,
-925,1,1990,3202,16,
-0,679,1,1775,3203,
-16,0,679,1,32,
-3204,16,0,679,1,
-2105,824,1,2106,3205,
-16,0,679,1,2364,
-837,1,2227,917,1,
-2337,3206,16,0,679,
-1,2021,728,1,2458,
-885,1,2459,891,1,
-2462,898,1,2136,852,
-1,2464,908,1,2029,
-735,1,2030,741,1,
-2031,746,1,2032,751,
-1,2033,756,1,2035,
-762,1,2037,767,1,
-2039,772,1,1931,870,
-1,2041,778,1,2043,
-784,1,2045,789,1,
-1574,809,1,1958,3207,
-16,0,679,1,47,
-3208,19,574,1,47,
-3209,5,19,1,0,
-3210,16,0,656,1,
-2725,3211,17,3212,15,
-3213,4,36,37,0,
-71,0,108,0,111,
-0,98,0,97,0,
-108,0,68,0,101,
-0,102,0,105,0,
-110,0,105,0,116,
-0,105,0,111,0,
-110,0,115,0,1,
--1,1,5,3214,20,
-3215,4,38,71,0,
+1,2042,22,1,152,
+1,6,2043,17,2044,
+15,2019,1,-1,1,
+5,2045,20,2046,4,
+20,84,0,121,0,
+112,0,101,0,110,
+0,97,0,109,0,
+101,0,95,0,50,
+0,1,296,1,3,
+1,2,1,1,2047,
+22,1,151,1,7,
+2048,17,2049,15,2019,
+1,-1,1,5,2050,
+20,2051,4,20,84,
+0,121,0,112,0,
+101,0,110,0,97,
+0,109,0,101,0,
+95,0,49,0,1,
+295,1,3,1,2,
+1,1,2052,22,1,
+150,1,1514,1136,1,
+9,1141,1,10,1703,
+1,262,1147,1,1267,
+1153,1,481,1749,1,
+1521,1158,1,1773,2053,
+16,0,235,1,19,
+1175,1,20,2054,16,
+0,152,1,2281,1182,
+1,525,1244,1,30,
+1709,1,283,1200,1,
+1010,2055,16,0,621,
+1,40,1205,1,41,
+1714,1,42,1718,1,
+44,1211,1,1260,1124,
+1,47,1212,1,1303,
+1335,1,49,1224,1,
+50,1229,1,48,1218,
+1,305,1239,1,51,
+1234,1,61,2056,16,
+0,195,1,63,1250,
+1,66,1256,1,67,
+1261,1,68,1266,1,
+69,1271,1,70,1276,
+1,73,2057,16,0,
+205,1,74,1281,1,
+1013,1286,1,2335,2058,
+16,0,237,1,328,
+1330,1,1048,1372,1,
+82,1308,1,2513,2059,
+17,2060,15,2061,4,
+30,37,0,73,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,1,-1,1,5,
+2062,20,2063,4,32,
+73,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,95,0,
+49,0,1,174,1,
+3,1,3,1,2,
+2064,22,1,28,1,
+2514,2065,17,2066,15,
+2067,4,54,37,0,
+73,0,110,0,116,
+0,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,76,
+0,105,0,115,0,
+116,0,1,-1,1,
+5,2068,20,2069,4,
+56,73,0,110,0,
+116,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+76,0,105,0,115,
+0,116,0,95,0,
+49,0,1,173,1,
+3,1,2,1,1,
+2070,22,1,27,1,
+2515,2071,16,0,455,
+1,1341,1325,1,2520,
+1732,1,1096,1340,1,
+93,1346,1,1550,1351,
+1,2529,2072,16,0,
+467,1,827,1359,1,
+1011,1130,1,107,1366,
+1,1114,1371,1,1871,
+2073,16,0,312,1,
+1370,1480,1,1478,1485,
+1,118,1383,1,1123,
+1388,1,1332,1291,1,
+1377,1399,1,375,1404,
+1,1882,2074,16,0,
+336,1,377,1409,1,
+352,1377,1,379,1414,
+1,380,1419,1,130,
+1442,1,2074,2075,16,
+0,579,1,371,1393,
+1,373,1437,1,1012,
+2076,16,0,623,1,
+1840,2077,16,0,302,
+1,143,1447,1,1152,
+1453,1,1406,1458,1,
+1159,1465,1,157,1470,
+1,1413,1475,1,883,
+1425,1,2670,1727,1,
+1094,2078,16,0,693,
+1,1296,1195,1,2679,
+2079,16,0,692,1,
+172,1496,1,1665,1502,
+1,1939,2080,16,0,
+454,1,1188,1508,1,
+1442,1513,1,188,1547,
+1,942,1519,1,1195,
+1525,1,1449,1530,1,
+1701,1535,1,447,1540,
+1,205,1552,1,2467,
+1736,1,464,1742,1,
+2197,2081,16,0,689,
+1,1224,1557,1,223,
+1562,1,1730,1567,1,
+476,1572,1,477,1578,
+1,1231,1583,1,479,
+1588,1,480,1593,1,
+1485,1599,1,459,1747,
+1,242,1606,1,478,
+1611,1,2506,2082,16,
+0,443,1,1001,1616,
+1,1002,1621,1,18,
+2083,19,507,1,18,
+2084,5,84,1,1011,
+1130,1,1012,2085,16,
+0,505,1,1013,1286,
+1,262,1147,1,1267,
+2086,16,0,505,1,
+515,2087,16,0,505,
+1,1521,2088,16,0,
+505,1,2692,2089,16,
+0,505,1,525,1244,
+1,283,1200,1,2299,
+2090,16,0,505,1,
+42,2091,16,0,505,
+1,40,1205,1,44,
+1211,1,47,1212,1,
+1303,2092,16,0,505,
+1,1555,2093,16,0,
+505,1,50,1229,1,
+48,1218,1,49,1224,
+1,51,1234,1,63,
+1250,1,305,1239,1,
+66,1256,1,67,1261,
+1,68,1266,1,69,
+1271,1,70,1276,1,
+73,2094,16,0,505,
+1,74,1281,1,328,
+1330,1,1048,2095,16,
+0,505,1,82,2096,
+16,0,505,1,1840,
+2097,16,0,505,1,
+1591,2098,16,0,505,
+1,1341,2099,16,0,
+505,1,1096,1340,1,
+93,1346,1,352,1377,
+1,107,2100,16,0,
+505,1,1114,1371,1,
+118,2101,16,0,505,
+1,1123,2102,16,0,
+505,1,371,1393,1,
+1628,2103,16,0,505,
+1,375,1404,1,1882,
+2104,16,0,505,1,
+377,1409,1,379,1414,
+1,380,1419,1,883,
+2105,16,0,505,1,
+373,1437,1,130,2106,
+16,0,505,1,143,
+2107,16,0,505,1,
+387,2108,16,0,505,
+1,1159,2109,16,0,
+505,1,157,2110,16,
+0,505,1,1413,2111,
+16,0,505,1,1665,
+2112,16,0,505,1,
+412,2113,16,0,505,
+1,1377,2114,16,0,
+505,1,172,2115,16,
+0,505,1,1939,2116,
+16,0,505,1,437,
+2117,16,0,505,1,
+188,2118,16,0,505,
+1,942,2119,16,0,
+505,1,1195,2120,16,
+0,505,1,1449,2121,
+16,0,505,1,1701,
+2122,16,0,505,1,
+447,1540,1,205,2123,
+16,0,505,1,827,
+2124,16,0,505,1,
+223,2125,16,0,505,
+1,476,1572,1,477,
+1578,1,1231,2126,16,
+0,505,1,479,1588,
+1,480,1593,1,1485,
+2127,16,0,505,1,
+1737,2128,16,0,505,
+1,242,2129,16,0,
+505,1,478,1611,1,
+1001,1616,1,1002,1621,
+1,19,2130,19,226,
+1,19,2131,5,176,
+1,256,2132,16,0,
+224,1,1261,2133,16,
+0,224,1,1011,1130,
+1,1012,2134,16,0,
+480,1,2458,904,1,
+2686,2135,16,0,224,
+1,262,1147,1,1267,
+2136,16,0,480,1,
+2021,747,1,1521,2137,
+16,0,480,1,2692,
+2138,16,0,480,1,
+1775,2139,16,0,224,
+1,2029,754,1,2030,
+760,1,2031,765,1,
+2032,770,1,2033,775,
+1,277,2140,16,0,
+224,1,2035,781,1,
+2037,786,1,2039,791,
+1,32,2141,16,0,
+224,1,2464,927,1,
+2293,2142,16,0,224,
+1,2043,803,1,2045,
+808,1,2299,2143,16,
+0,480,1,41,2144,
+16,0,224,1,42,
+2145,16,0,480,1,
+40,1205,1,44,1211,
+1,43,2146,16,0,
+224,1,1804,2147,16,
+0,224,1,48,1218,
+1,49,1224,1,47,
+1212,1,51,1234,1,
+52,2148,16,0,224,
+1,50,1229,1,305,
+1239,1,1096,1340,1,
+1515,2149,16,0,224,
+1,2318,2150,16,0,
+224,1,283,1200,1,
+63,1250,1,66,1256,
+1,67,1261,1,68,
+1266,1,69,1271,1,
+70,1276,1,71,2151,
+16,0,224,1,73,
+2152,16,0,480,1,
+74,1281,1,1013,1286,
+1,76,2153,16,0,
+224,1,1834,2154,16,
+0,224,1,2337,2155,
+16,0,224,1,79,
+2156,16,0,224,1,
+1335,2157,16,0,224,
+1,299,2158,16,0,
+224,1,82,2159,16,
+0,480,1,1840,2160,
+16,0,480,1,1297,
+2161,16,0,224,1,
+85,2162,16,0,224,
+1,1341,2163,16,0,
+480,1,89,2164,16,
+0,224,1,1303,2165,
+16,0,480,1,509,
+2166,16,0,224,1,
+93,1346,1,322,2167,
+16,0,224,1,97,
+2168,16,0,224,1,
+2041,797,1,1555,2169,
+16,0,480,1,827,
+2170,16,0,480,1,
+102,2171,16,0,224,
+1,1860,850,1,1803,
+816,1,2364,856,1,
+107,2172,16,0,480,
+1,1114,1371,1,112,
+2173,16,0,224,1,
+1117,2174,16,0,224,
+1,352,1377,1,1873,
+864,1,118,2175,16,
+0,480,1,1123,2176,
+16,0,480,1,371,
+1393,1,515,2177,16,
+0,480,1,1377,2178,
+16,0,480,1,124,
+2179,16,0,224,1,
+1882,2180,16,0,480,
+1,377,1409,1,379,
+1414,1,380,1419,1,
+130,2181,16,0,480,
+1,346,2182,16,0,
+224,1,2075,2183,16,
+0,224,1,373,1437,
+1,387,2184,16,0,
+480,1,137,2185,16,
+0,224,1,143,2186,
+16,0,480,1,1901,
+2187,16,0,224,1,
+1048,2188,16,0,480,
+1,1153,2189,16,0,
+224,1,375,1404,1,
+151,2190,16,0,224,
+1,1407,2191,16,0,
+224,1,1659,2192,16,
+0,224,1,2413,2193,
+16,0,224,1,1159,
+2194,16,0,480,1,
+381,2195,16,0,224,
+1,157,2196,16,0,
+480,1,1413,2197,16,
+0,480,1,883,2198,
+16,0,480,1,1371,
+2199,16,0,224,1,
+328,1330,1,2105,843,
+1,2106,2200,16,0,
+224,1,166,2201,16,
+0,224,1,525,2202,
+16,0,224,1,1622,
+2203,16,0,224,1,
+406,2204,16,0,224,
+1,1574,828,1,172,
+2205,16,0,480,1,
+1931,889,1,412,2206,
+16,0,480,1,1933,
+2207,16,0,224,1,
+1876,2208,16,0,224,
+1,431,2209,16,0,
+224,1,1585,2210,16,
+0,224,1,182,2211,
+16,0,224,1,1628,
+2212,16,0,480,1,
+1189,2213,16,0,224,
+1,437,2214,16,0,
+480,1,1591,2215,16,
+0,480,1,188,2216,
+16,0,480,1,1695,
+2217,16,0,224,1,
+2198,2218,16,0,224,
+1,1195,2219,16,0,
+480,1,1449,2220,16,
+0,480,1,1701,2221,
+16,0,480,1,447,
+2222,16,0,224,1,
+199,2223,16,0,224,
+1,2459,910,1,1958,
+2224,16,0,224,1,
+2462,917,1,1657,922,
+1,205,2225,16,0,
+480,1,459,2226,16,
+0,224,1,462,2227,
+16,0,224,1,1665,
+2228,16,0,480,1,
+217,2229,16,0,224,
+1,2227,936,1,942,
+2230,16,0,480,1,
+1225,2231,16,0,224,
+1,223,2232,16,0,
+480,1,1479,2233,16,
+0,224,1,1731,2234,
+16,0,224,1,477,
+1578,1,1231,2235,16,
+0,480,1,479,1588,
+1,480,1593,1,1485,
+2236,16,0,480,1,
+1737,2237,16,0,480,
+1,1989,944,1,1990,
+2238,16,0,224,1,
+1443,2239,16,0,224,
+1,236,2240,16,0,
+224,1,2136,871,1,
+476,1572,1,242,2241,
+16,0,480,1,478,
+1611,1,1939,2242,16,
+0,480,1,1001,1616,
+1,1002,1621,1,1756,
+2243,16,0,224,1,
+20,2244,19,464,1,
+20,2245,5,84,1,
+1011,1130,1,1012,2246,
+16,0,462,1,1013,
+1286,1,262,1147,1,
+1267,2247,16,0,462,
+1,515,2248,16,0,
+462,1,1521,2249,16,
+0,462,1,2692,2250,
+16,0,462,1,525,
+1244,1,283,1200,1,
+2299,2251,16,0,462,
+1,42,2252,16,0,
+462,1,40,1205,1,
+44,1211,1,47,1212,
+1,1303,2253,16,0,
+462,1,1555,2254,16,
+0,462,1,50,1229,
+1,48,1218,1,49,
+1224,1,51,1234,1,
+63,1250,1,305,1239,
+1,66,1256,1,67,
+1261,1,68,1266,1,
+69,1271,1,70,1276,
+1,73,2255,16,0,
+462,1,74,1281,1,
+328,2256,16,0,462,
+1,1048,2257,16,0,
+462,1,82,2258,16,
+0,462,1,1840,2259,
+16,0,462,1,1591,
+2260,16,0,462,1,
+1341,2261,16,0,462,
+1,1096,1340,1,93,
+1346,1,352,2262,16,
+0,462,1,107,2263,
+16,0,462,1,1114,
+1371,1,118,2264,16,
+0,462,1,1123,2265,
+16,0,462,1,371,
+1393,1,1628,2266,16,
+0,462,1,375,1404,
+1,1882,2267,16,0,
+462,1,377,1409,1,
+379,1414,1,380,1419,
+1,883,2268,16,0,
+462,1,373,1437,1,
+130,2269,16,0,462,
+1,143,2270,16,0,
+462,1,387,2271,16,
+0,462,1,1159,2272,
+16,0,462,1,157,
+2273,16,0,462,1,
+1413,2274,16,0,462,
+1,1665,2275,16,0,
+462,1,412,2276,16,
+0,462,1,1377,2277,
+16,0,462,1,172,
+2278,16,0,462,1,
+1939,2279,16,0,462,
+1,437,2280,16,0,
+462,1,188,2281,16,
+0,462,1,942,2282,
+16,0,462,1,1195,
+2283,16,0,462,1,
+1449,2284,16,0,462,
+1,1701,2285,16,0,
+462,1,447,1540,1,
+205,2286,16,0,462,
+1,827,2287,16,0,
+462,1,223,2288,16,
+0,462,1,476,1572,
+1,477,1578,1,1231,
+2289,16,0,462,1,
+479,1588,1,480,1593,
+1,1485,2290,16,0,
+462,1,1737,2291,16,
+0,462,1,242,2292,
+16,0,462,1,478,
+1611,1,1001,1616,1,
+1002,1621,1,21,2293,
+19,441,1,21,2294,
+5,84,1,1011,1130,
+1,1012,2295,16,0,
+439,1,1013,1286,1,
+262,1147,1,1267,2296,
+16,0,439,1,515,
+2297,16,0,439,1,
+1521,2298,16,0,439,
+1,2692,2299,16,0,
+439,1,525,1244,1,
+283,1200,1,2299,2300,
+16,0,439,1,42,
+2301,16,0,439,1,
+40,1205,1,44,1211,
+1,47,1212,1,1303,
+2302,16,0,439,1,
+1555,2303,16,0,439,
+1,50,1229,1,48,
+1218,1,49,1224,1,
+51,1234,1,63,1250,
+1,305,1239,1,66,
+1256,1,67,1261,1,
+68,1266,1,69,1271,
+1,70,1276,1,73,
+2304,16,0,439,1,
+74,1281,1,328,2305,
+16,0,439,1,1048,
+2306,16,0,439,1,
+82,2307,16,0,439,
+1,1840,2308,16,0,
+439,1,1591,2309,16,
+0,439,1,1341,2310,
+16,0,439,1,1096,
+1340,1,93,1346,1,
+352,2311,16,0,439,
+1,107,2312,16,0,
+439,1,1114,1371,1,
+118,2313,16,0,439,
+1,1123,2314,16,0,
+439,1,371,1393,1,
+1628,2315,16,0,439,
+1,375,1404,1,1882,
+2316,16,0,439,1,
+377,1409,1,379,1414,
+1,380,1419,1,883,
+2317,16,0,439,1,
+373,1437,1,130,2318,
+16,0,439,1,143,
+2319,16,0,439,1,
+387,2320,16,0,439,
+1,1159,2321,16,0,
+439,1,157,2322,16,
+0,439,1,1413,2323,
+16,0,439,1,1665,
+2324,16,0,439,1,
+412,2325,16,0,439,
+1,1377,2326,16,0,
+439,1,172,2327,16,
+0,439,1,1939,2328,
+16,0,439,1,437,
+2329,16,0,439,1,
+188,2330,16,0,439,
+1,942,2331,16,0,
+439,1,1195,2332,16,
+0,439,1,1449,2333,
+16,0,439,1,1701,
+2334,16,0,439,1,
+447,1540,1,205,2335,
+16,0,439,1,827,
+2336,16,0,439,1,
+223,2337,16,0,439,
+1,476,1572,1,477,
+1578,1,1231,2338,16,
+0,439,1,479,1588,
+1,480,1593,1,1485,
+2339,16,0,439,1,
+1737,2340,16,0,439,
+1,242,2341,16,0,
+439,1,478,1611,1,
+1001,1616,1,1002,1621,
+1,22,2342,19,392,
+1,22,2343,5,84,
+1,1011,1130,1,1012,
+2344,16,0,390,1,
+1013,1286,1,262,1147,
+1,1267,2345,16,0,
+390,1,515,2346,16,
+0,390,1,1521,2347,
+16,0,390,1,2692,
+2348,16,0,390,1,
+525,1244,1,283,1200,
+1,2299,2349,16,0,
+390,1,42,2350,16,
+0,390,1,40,1205,
+1,44,1211,1,47,
+1212,1,1303,2351,16,
+0,390,1,1555,2352,
+16,0,390,1,50,
+1229,1,48,1218,1,
+49,1224,1,51,1234,
+1,63,1250,1,305,
+1239,1,66,1256,1,
+67,1261,1,68,1266,
+1,69,1271,1,70,
+1276,1,73,2353,16,
+0,390,1,74,1281,
+1,328,2354,16,0,
+390,1,1048,2355,16,
+0,390,1,82,2356,
+16,0,390,1,1840,
+2357,16,0,390,1,
+1591,2358,16,0,390,
+1,1341,2359,16,0,
+390,1,1096,1340,1,
+93,1346,1,352,2360,
+16,0,390,1,107,
+2361,16,0,390,1,
+1114,1371,1,118,2362,
+16,0,390,1,1123,
+2363,16,0,390,1,
+371,1393,1,1628,2364,
+16,0,390,1,375,
+1404,1,1882,2365,16,
+0,390,1,377,1409,
+1,379,1414,1,380,
+1419,1,883,2366,16,
+0,390,1,373,1437,
+1,130,2367,16,0,
+390,1,143,2368,16,
+0,390,1,387,2369,
+16,0,390,1,1159,
+2370,16,0,390,1,
+157,2371,16,0,390,
+1,1413,2372,16,0,
+390,1,1665,2373,16,
+0,390,1,412,2374,
+16,0,390,1,1377,
+2375,16,0,390,1,
+172,2376,16,0,390,
+1,1939,2377,16,0,
+390,1,437,2378,16,
+0,390,1,188,2379,
+16,0,390,1,942,
+2380,16,0,390,1,
+1195,2381,16,0,390,
+1,1449,2382,16,0,
+390,1,1701,2383,16,
+0,390,1,447,1540,
+1,205,2384,16,0,
+390,1,827,2385,16,
+0,390,1,223,2386,
+16,0,390,1,476,
+1572,1,477,1578,1,
+1231,2387,16,0,390,
+1,479,1588,1,480,
+1593,1,1485,2388,16,
+0,390,1,1737,2389,
+16,0,390,1,242,
+2390,16,0,390,1,
+478,1611,1,1001,1616,
+1,1002,1621,1,23,
+2391,19,527,1,23,
+2392,5,38,1,1901,
+2393,16,0,525,1,
+2075,2394,16,0,525,
+1,1860,850,1,1803,
+816,1,1804,2395,16,
+0,525,1,2413,2396,
+16,0,525,1,2198,
+2397,16,0,525,1,
+1873,864,1,1657,922,
+1,1989,944,1,1990,
+2398,16,0,525,1,
+1775,2399,16,0,525,
+1,32,2400,16,0,
+525,1,2105,843,1,
+2106,2401,16,0,525,
+1,2364,856,1,2227,
+936,1,2337,2402,16,
+0,525,1,2021,747,
+1,2458,904,1,2459,
+910,1,2462,917,1,
+2136,871,1,2464,927,
+1,2029,754,1,2030,
+760,1,2031,765,1,
+2032,770,1,2033,775,
+1,2035,781,1,2037,
+786,1,2039,791,1,
+1931,889,1,2041,797,
+1,2043,803,1,2045,
+808,1,1574,828,1,
+1958,2403,16,0,525,
+1,24,2404,19,177,
+1,24,2405,5,5,
+1,44,2406,16,0,
+175,1,377,2407,16,
+0,563,1,40,2408,
+16,0,702,1,63,
+2409,16,0,197,1,
+373,2410,16,0,559,
+1,25,2411,19,291,
+1,25,2412,5,177,
+1,256,2413,16,0,
+568,1,1261,2414,16,
+0,568,1,1011,1130,
+1,1012,2415,16,0,
+289,1,2458,904,1,
+2686,2416,16,0,568,
+1,262,1147,1,1267,
+2417,16,0,289,1,
+2021,747,1,1521,2418,
+16,0,289,1,2692,
+2419,16,0,289,1,
+1775,2420,16,0,568,
+1,2029,754,1,2030,
+760,1,2031,765,1,
+2032,770,1,2033,775,
+1,277,2421,16,0,
+568,1,2035,781,1,
+2037,786,1,2039,791,
+1,32,2422,16,0,
+568,1,2464,927,1,
+2293,2423,16,0,568,
+1,2043,803,1,2045,
+808,1,2299,2424,16,
+0,289,1,41,2425,
+16,0,568,1,42,
+2426,16,0,289,1,
+40,1205,1,44,1211,
+1,43,2427,16,0,
+568,1,1804,2428,16,
+0,568,1,48,1218,
+1,49,1224,1,47,
+1212,1,51,1234,1,
+52,2429,16,0,568,
+1,50,1229,1,305,
+1239,1,1096,1340,1,
+1515,2430,16,0,568,
+1,2318,2431,16,0,
+568,1,62,2432,16,
+0,568,1,63,1250,
+1,66,1256,1,67,
+1261,1,68,1266,1,
+69,1271,1,70,1276,
+1,71,2433,16,0,
+568,1,283,1200,1,
+73,2434,16,0,289,
+1,74,1281,1,1013,
+1286,1,76,2435,16,
+0,568,1,1834,2436,
+16,0,568,1,2337,
+2437,16,0,568,1,
+79,2438,16,0,568,
+1,1335,2439,16,0,
+568,1,299,2440,16,
+0,568,1,82,2441,
+16,0,289,1,1840,
+2442,16,0,289,1,
+1297,2443,16,0,568,
+1,85,2444,16,0,
+568,1,1341,2445,16,
+0,289,1,89,2446,
+16,0,568,1,1303,
+2447,16,0,289,1,
+509,2448,16,0,568,
+1,93,1346,1,322,
+2449,16,0,568,1,
+97,2450,16,0,568,
+1,2041,797,1,1555,
+2451,16,0,289,1,
+827,2452,16,0,289,
+1,102,2453,16,0,
+568,1,1860,850,1,
+1803,816,1,2364,856,
+1,107,2454,16,0,
+289,1,1114,1371,1,
+112,2455,16,0,568,
+1,1117,2456,16,0,
+568,1,352,1377,1,
+1873,864,1,118,1383,
+1,1123,2457,16,0,
+289,1,371,1393,1,
+515,2458,16,0,289,
+1,1377,2459,16,0,
+289,1,124,2460,16,
+0,568,1,1882,2461,
+16,0,289,1,377,
+1409,1,379,1414,1,
+380,1419,1,130,1442,
+1,346,2462,16,0,
+568,1,2075,2463,16,
+0,568,1,373,1437,
+1,387,2464,16,0,
+289,1,137,2465,16,
+0,568,1,143,2466,
+16,0,289,1,1901,
+2467,16,0,568,1,
+1048,1372,1,1153,2468,
+16,0,568,1,375,
+1404,1,151,2469,16,
+0,568,1,1407,2470,
+16,0,568,1,1659,
+2471,16,0,568,1,
+2413,2472,16,0,568,
+1,1159,2473,16,0,
+289,1,381,2474,16,
+0,568,1,157,2475,
+16,0,289,1,1413,
+2476,16,0,289,1,
+883,2477,16,0,289,
+1,1371,2478,16,0,
+568,1,328,1330,1,
+2105,843,1,2106,2479,
+16,0,568,1,166,
+2480,16,0,568,1,
+525,2481,16,0,568,
+1,1622,2482,16,0,
+568,1,406,2483,16,
+0,568,1,1574,828,
+1,172,1496,1,1931,
+889,1,412,2484,16,
+0,289,1,1933,2485,
+16,0,568,1,1876,
+2486,16,0,568,1,
+431,2487,16,0,568,
+1,1585,2488,16,0,
+568,1,182,2489,16,
+0,568,1,1628,2490,
+16,0,289,1,1189,
+2491,16,0,568,1,
+437,2492,16,0,289,
+1,1591,2493,16,0,
+289,1,188,1547,1,
+1695,2494,16,0,568,
+1,2198,2495,16,0,
+568,1,1195,2496,16,
+0,289,1,1449,2497,
+16,0,289,1,1701,
+2498,16,0,289,1,
+447,2499,16,0,568,
+1,199,2500,16,0,
+568,1,2459,910,1,
+1958,2501,16,0,568,
+1,2462,917,1,1657,
+922,1,205,2502,16,
+0,289,1,459,2503,
+16,0,568,1,462,
+2504,16,0,568,1,
+1665,2505,16,0,289,
+1,217,2506,16,0,
+568,1,2227,936,1,
+942,1519,1,1225,2507,
+16,0,568,1,223,
+2508,16,0,289,1,
+1479,2509,16,0,568,
+1,1731,2510,16,0,
+568,1,477,1578,1,
+1231,2511,16,0,289,
+1,479,1588,1,480,
+1593,1,1485,2512,16,
+0,289,1,1737,2513,
+16,0,289,1,1989,
+944,1,1990,2514,16,
+0,568,1,1443,2515,
+16,0,568,1,236,
+2516,16,0,568,1,
+2136,871,1,476,1572,
+1,242,2517,16,0,
+289,1,478,1611,1,
+1939,2518,16,0,289,
+1,1001,1616,1,1002,
+1621,1,1756,2519,16,
+0,568,1,26,2520,
+19,307,1,26,2521,
+5,84,1,1011,1130,
+1,1012,2522,16,0,
+305,1,1013,1286,1,
+262,1147,1,1267,2523,
+16,0,305,1,515,
+2524,16,0,687,1,
+1521,2525,16,0,305,
+1,2692,2526,16,0,
+305,1,525,1244,1,
+283,1200,1,2299,2527,
+16,0,305,1,42,
+2528,16,0,305,1,
+40,1205,1,44,1211,
+1,47,1212,1,1303,
+2529,16,0,305,1,
+1555,2530,16,0,305,
+1,50,1229,1,48,
+1218,1,49,1224,1,
+51,1234,1,63,1250,
+1,305,1239,1,66,
+1256,1,67,1261,1,
+68,1266,1,69,1271,
+1,70,1276,1,73,
+2531,16,0,305,1,
+74,1281,1,328,1330,
+1,1048,1372,1,82,
+2532,16,0,305,1,
+1840,2533,16,0,305,
+1,1591,2534,16,0,
+305,1,1341,2535,16,
+0,305,1,1096,1340,
+1,93,1346,1,352,
+1377,1,107,2536,16,
+0,305,1,1114,1371,
+1,118,1383,1,1123,
+2537,16,0,305,1,
+371,1393,1,1628,2538,
+16,0,305,1,375,
+1404,1,1882,2539,16,
+0,305,1,377,1409,
+1,379,1414,1,380,
+1419,1,883,2540,16,
+0,305,1,373,1437,
+1,130,1442,1,143,
+2541,16,0,305,1,
+387,2542,16,0,305,
+1,1159,2543,16,0,
+305,1,157,2544,16,
+0,305,1,1413,2545,
+16,0,305,1,1665,
+2546,16,0,305,1,
+412,2547,16,0,305,
+1,1377,2548,16,0,
+305,1,172,1496,1,
+1939,2549,16,0,305,
+1,437,2550,16,0,
+617,1,188,1547,1,
+942,1519,1,1195,2551,
+16,0,305,1,1449,
+2552,16,0,305,1,
+1701,2553,16,0,305,
+1,447,1540,1,205,
+2554,16,0,305,1,
+827,2555,16,0,305,
+1,223,2556,16,0,
+305,1,476,1572,1,
+477,1578,1,1231,2557,
+16,0,305,1,479,
+1588,1,480,1593,1,
+1485,2558,16,0,305,
+1,1737,2559,16,0,
+305,1,242,2560,16,
+0,305,1,478,1611,
+1,1001,1616,1,1002,
+1621,1,27,2561,19,
+628,1,27,2562,5,
+95,1,256,2563,16,
+0,626,1,1261,2564,
+16,0,626,1,509,
+2565,16,0,626,1,
+1515,2566,16,0,626,
+1,2686,2567,16,0,
+626,1,2021,747,1,
+1775,2568,16,0,626,
+1,2029,754,1,2030,
+760,1,2031,765,1,
+2032,770,1,2033,775,
+1,277,2569,16,0,
+626,1,2035,781,1,
+2037,786,1,2039,791,
+1,32,2570,16,0,
+626,1,2041,797,1,
+2293,2571,16,0,626,
+1,2043,803,1,2045,
+808,1,41,2572,16,
+0,626,1,1297,2573,
+16,0,626,1,43,
+2574,16,0,626,1,
+1803,816,1,1804,2575,
+16,0,626,1,299,
+2576,16,0,626,1,
+52,2577,16,0,626,
+1,2318,2578,16,0,
+626,1,62,2579,16,
+0,626,1,2075,2580,
+16,0,626,1,1574,
+828,1,71,2581,16,
+0,626,1,76,2582,
+16,0,626,1,1834,
+2583,16,0,626,1,
+2337,2584,16,0,626,
+1,79,2585,16,0,
+626,1,1335,2586,16,
+0,626,1,322,2587,
+16,0,626,1,85,
+2588,16,0,626,1,
+89,2589,16,0,626,
+1,346,2590,16,0,
+626,1,2105,843,1,
+2106,2591,16,0,626,
+1,97,2592,16,0,
+626,1,1860,850,1,
+2364,856,1,102,2593,
+16,0,626,1,112,
+2594,16,0,626,1,
+1117,2595,16,0,626,
+1,1873,864,1,1876,
+2596,16,0,626,1,
+124,2597,16,0,626,
+1,2136,871,1,381,
+2598,16,0,626,1,
+525,2599,16,0,626,
+1,137,2600,16,0,
+626,1,1901,2601,16,
+0,626,1,1153,2602,
+16,0,626,1,151,
+2603,16,0,626,1,
+1407,2604,16,0,626,
+1,1659,2605,16,0,
+626,1,2413,2606,16,
+0,626,1,406,2607,
+16,0,626,1,1371,
+2608,16,0,626,1,
+166,2609,16,0,626,
+1,1622,2610,16,0,
+626,1,1931,889,1,
+1933,2611,16,0,626,
+1,431,2612,16,0,
+626,1,1585,2613,16,
+0,626,1,182,2614,
+16,0,626,1,1189,
+2615,16,0,626,1,
+1443,2616,16,0,626,
+1,1695,2617,16,0,
+626,1,2198,2618,16,
+0,626,1,447,2619,
+16,0,626,1,2458,
+904,1,2459,910,1,
+1958,2620,16,0,626,
+1,2462,917,1,1657,
+922,1,2464,927,1,
+199,2621,16,0,626,
+1,459,2622,16,0,
+626,1,462,2623,16,
+0,626,1,217,2624,
+16,0,626,1,2227,
+936,1,1225,2625,16,
+0,626,1,1479,2626,
+16,0,626,1,1731,
+2627,16,0,626,1,
+1989,944,1,1990,2628,
+16,0,626,1,236,
+2629,16,0,626,1,
+1756,2630,16,0,626,
+1,28,2631,19,655,
+1,28,2632,5,60,
+1,328,1330,1,223,
+1562,1,1096,1340,1,
+118,1383,1,883,1425,
+1,525,1244,1,1001,
+1616,1,130,1442,1,
+459,1747,1,1114,1371,
+1,352,1377,1,447,
+1540,1,464,1742,1,
+1011,1130,1,1013,1286,
+1,242,1606,1,143,
+1447,1,40,1205,1,
+41,1714,1,42,1718,
+1,479,1588,1,44,
+1211,1,481,1749,1,
+373,1437,1,47,1212,
+1,157,1470,1,49,
+1224,1,50,1229,1,
+48,1218,1,379,1414,
+1,380,1419,1,51,
+1234,1,476,1572,1,
+371,1393,1,478,1611,
+1,1048,1372,1,375,
+1404,1,172,1496,1,
+262,1147,1,283,1200,
+1,63,1250,1,67,
+1261,1,68,1266,1,
+69,1271,1,66,1256,
+1,461,2633,16,0,
+653,1,74,1281,1,
+377,1409,1,1002,1621,
+1,70,1276,1,188,
+1547,1,82,1308,1,
+305,1239,1,477,1578,
+1,827,1359,1,93,
+1346,1,480,1593,1,
+205,1552,1,942,1519,
+1,107,1366,1,29,
+2634,19,280,1,29,
+2635,5,84,1,1011,
+1130,1,1012,2636,16,
+0,278,1,1013,1286,
+1,262,1147,1,1267,
+2637,16,0,278,1,
+515,2638,16,0,278,
+1,1521,2639,16,0,
+278,1,2692,2640,16,
+0,278,1,525,1244,
+1,283,1200,1,2299,
+2641,16,0,278,1,
+42,2642,16,0,278,
+1,40,1205,1,44,
+1211,1,47,1212,1,
+1303,2643,16,0,278,
+1,1555,2644,16,0,
+278,1,50,1229,1,
+48,1218,1,49,1224,
+1,51,1234,1,63,
+1250,1,305,1239,1,
+66,1256,1,67,1261,
+1,68,1266,1,69,
+1271,1,70,1276,1,
+73,2645,16,0,278,
+1,74,1281,1,328,
+1330,1,1048,1372,1,
+82,2646,16,0,278,
+1,1840,2647,16,0,
+278,1,1591,2648,16,
+0,278,1,1341,2649,
+16,0,278,1,1096,
+1340,1,93,1346,1,
+352,1377,1,107,2650,
+16,0,278,1,1114,
+1371,1,118,1383,1,
+1123,2651,16,0,278,
+1,371,1393,1,1628,
+2652,16,0,278,1,
+375,1404,1,1882,2653,
+16,0,278,1,377,
+1409,1,379,1414,1,
+380,1419,1,883,2654,
+16,0,278,1,373,
+1437,1,130,1442,1,
+143,1447,1,387,2655,
+16,0,278,1,1159,
+2656,16,0,278,1,
+157,1470,1,1413,2657,
+16,0,278,1,1665,
+2658,16,0,278,1,
+412,2659,16,0,278,
+1,1377,2660,16,0,
+278,1,172,1496,1,
+1939,2661,16,0,278,
+1,437,2662,16,0,
+278,1,188,1547,1,
+942,1519,1,1195,2663,
+16,0,278,1,1449,
+2664,16,0,278,1,
+1701,2665,16,0,278,
+1,447,1540,1,205,
+2666,16,0,278,1,
+827,2667,16,0,278,
+1,223,2668,16,0,
+278,1,476,1572,1,
+477,1578,1,1231,2669,
+16,0,278,1,479,
+1588,1,480,1593,1,
+1485,2670,16,0,278,
+1,1737,2671,16,0,
+278,1,242,2672,16,
+0,278,1,478,1611,
+1,1001,1616,1,1002,
+1621,1,30,2673,19,
+268,1,30,2674,5,
+84,1,1011,1130,1,
+1012,2675,16,0,266,
+1,1013,1286,1,262,
+1147,1,1267,2676,16,
+0,266,1,515,2677,
+16,0,266,1,1521,
+2678,16,0,266,1,
+2692,2679,16,0,266,
+1,525,1244,1,283,
+1200,1,2299,2680,16,
+0,266,1,42,2681,
+16,0,266,1,40,
+1205,1,44,1211,1,
+47,1212,1,1303,2682,
+16,0,266,1,1555,
+2683,16,0,266,1,
+50,1229,1,48,1218,
+1,49,1224,1,51,
+1234,1,63,1250,1,
+305,1239,1,66,1256,
+1,67,1261,1,68,
+1266,1,69,1271,1,
+70,1276,1,73,2684,
+16,0,266,1,74,
+1281,1,328,1330,1,
+1048,1372,1,82,2685,
+16,0,266,1,1840,
+2686,16,0,266,1,
+1591,2687,16,0,266,
+1,1341,2688,16,0,
+266,1,1096,1340,1,
+93,1346,1,352,1377,
+1,107,2689,16,0,
+266,1,1114,1371,1,
+118,1383,1,1123,2690,
+16,0,266,1,371,
+1393,1,1628,2691,16,
+0,266,1,375,1404,
+1,1882,2692,16,0,
+266,1,377,1409,1,
+379,1414,1,380,1419,
+1,883,2693,16,0,
+266,1,373,1437,1,
+130,1442,1,143,1447,
+1,387,2694,16,0,
+266,1,1159,2695,16,
+0,266,1,157,1470,
+1,1413,2696,16,0,
+266,1,1665,2697,16,
+0,266,1,412,2698,
+16,0,266,1,1377,
+2699,16,0,266,1,
+172,1496,1,1939,2700,
+16,0,266,1,437,
+2701,16,0,266,1,
+188,1547,1,942,1519,
+1,1195,2702,16,0,
+266,1,1449,2703,16,
+0,266,1,1701,2704,
+16,0,266,1,447,
+1540,1,205,2705,16,
+0,266,1,827,2706,
+16,0,266,1,223,
+2707,16,0,266,1,
+476,1572,1,477,1578,
+1,1231,2708,16,0,
+266,1,479,1588,1,
+480,1593,1,1485,2709,
+16,0,266,1,1737,
+2710,16,0,266,1,
+242,2711,16,0,266,
+1,478,1611,1,1001,
+1616,1,1002,1621,1,
+31,2712,19,254,1,
+31,2713,5,84,1,
+1011,1130,1,1012,2714,
+16,0,252,1,1013,
+1286,1,262,1147,1,
+1267,2715,16,0,252,
+1,515,2716,16,0,
+252,1,1521,2717,16,
+0,252,1,2692,2718,
+16,0,252,1,525,
+1244,1,283,1200,1,
+2299,2719,16,0,252,
+1,42,2720,16,0,
+252,1,40,1205,1,
+44,1211,1,47,1212,
+1,1303,2721,16,0,
+252,1,1555,2722,16,
+0,252,1,50,1229,
+1,48,1218,1,49,
+1224,1,51,1234,1,
+63,1250,1,305,1239,
+1,66,1256,1,67,
+1261,1,68,1266,1,
+69,1271,1,70,1276,
+1,73,2723,16,0,
+252,1,74,1281,1,
+328,1330,1,1048,1372,
+1,82,2724,16,0,
+252,1,1840,2725,16,
+0,252,1,1591,2726,
+16,0,252,1,1341,
+2727,16,0,252,1,
+1096,1340,1,93,1346,
+1,352,1377,1,107,
+2728,16,0,252,1,
+1114,1371,1,118,1383,
+1,1123,2729,16,0,
+252,1,371,1393,1,
+1628,2730,16,0,252,
+1,375,1404,1,1882,
+2731,16,0,252,1,
+377,1409,1,379,1414,
+1,380,1419,1,883,
+2732,16,0,252,1,
+373,1437,1,130,1442,
+1,143,2733,16,0,
+252,1,387,2734,16,
+0,252,1,1159,2735,
+16,0,252,1,157,
+2736,16,0,252,1,
+1413,2737,16,0,252,
+1,1665,2738,16,0,
+252,1,412,2739,16,
+0,252,1,1377,2740,
+16,0,252,1,172,
+1496,1,1939,2741,16,
+0,252,1,437,2742,
+16,0,252,1,188,
+1547,1,942,1519,1,
+1195,2743,16,0,252,
+1,1449,2744,16,0,
+252,1,1701,2745,16,
+0,252,1,447,1540,
+1,205,2746,16,0,
+252,1,827,2747,16,
+0,252,1,223,2748,
+16,0,252,1,476,
+1572,1,477,1578,1,
+1231,2749,16,0,252,
+1,479,1588,1,480,
+1593,1,1485,2750,16,
+0,252,1,1737,2751,
+16,0,252,1,242,
+2752,16,0,252,1,
+478,1611,1,1001,1616,
+1,1002,1621,1,32,
+2753,19,244,1,32,
+2754,5,84,1,1011,
+1130,1,1012,2755,16,
+0,242,1,1013,1286,
+1,262,1147,1,1267,
+2756,16,0,242,1,
+515,2757,16,0,242,
+1,1521,2758,16,0,
+242,1,2692,2759,16,
+0,242,1,525,1244,
+1,283,1200,1,2299,
+2760,16,0,242,1,
+42,2761,16,0,242,
+1,40,1205,1,44,
+1211,1,47,1212,1,
+1303,2762,16,0,242,
+1,1555,2763,16,0,
+242,1,50,1229,1,
+48,1218,1,49,1224,
+1,51,1234,1,63,
+1250,1,305,1239,1,
+66,1256,1,67,1261,
+1,68,1266,1,69,
+1271,1,70,1276,1,
+73,2764,16,0,242,
+1,74,1281,1,328,
+1330,1,1048,1372,1,
+82,2765,16,0,242,
+1,1840,2766,16,0,
+242,1,1591,2767,16,
+0,242,1,1341,2768,
+16,0,242,1,1096,
+1340,1,93,1346,1,
+352,1377,1,107,2769,
+16,0,242,1,1114,
+1371,1,118,1383,1,
+1123,2770,16,0,242,
+1,371,1393,1,1628,
+2771,16,0,242,1,
+375,1404,1,1882,2772,
+16,0,242,1,377,
+1409,1,379,1414,1,
+380,1419,1,883,2773,
+16,0,242,1,373,
+1437,1,130,1442,1,
+143,2774,16,0,242,
+1,387,2775,16,0,
+242,1,1159,2776,16,
+0,242,1,157,2777,
+16,0,242,1,1413,
+2778,16,0,242,1,
+1665,2779,16,0,242,
+1,412,2780,16,0,
+242,1,1377,2781,16,
+0,242,1,172,1496,
+1,1939,2782,16,0,
+242,1,437,2783,16,
+0,242,1,188,1547,
+1,942,1519,1,1195,
+2784,16,0,242,1,
+1449,2785,16,0,242,
+1,1701,2786,16,0,
+242,1,447,1540,1,
+205,2787,16,0,242,
+1,827,2788,16,0,
+242,1,223,2789,16,
+0,242,1,476,1572,
+1,477,1578,1,1231,
+2790,16,0,242,1,
+479,1588,1,480,1593,
+1,1485,2791,16,0,
+242,1,1737,2792,16,
+0,242,1,242,2793,
+16,0,242,1,478,
+1611,1,1001,1616,1,
+1002,1621,1,33,2794,
+19,341,1,33,2795,
+5,84,1,1011,1130,
+1,1012,2796,16,0,
+339,1,1013,1286,1,
+262,1147,1,1267,2797,
+16,0,339,1,515,
+2798,16,0,339,1,
+1521,2799,16,0,339,
+1,2692,2800,16,0,
+339,1,525,1244,1,
+283,1200,1,2299,2801,
+16,0,339,1,42,
+2802,16,0,339,1,
+40,1205,1,44,1211,
+1,47,1212,1,1303,
+2803,16,0,339,1,
+1555,2804,16,0,339,
+1,50,1229,1,48,
+1218,1,49,1224,1,
+51,1234,1,63,1250,
+1,305,1239,1,66,
+1256,1,67,1261,1,
+68,1266,1,69,1271,
+1,70,1276,1,73,
+2805,16,0,339,1,
+74,1281,1,328,1330,
+1,1048,1372,1,82,
+2806,16,0,339,1,
+1840,2807,16,0,339,
+1,1591,2808,16,0,
+339,1,1341,2809,16,
+0,339,1,1096,1340,
+1,93,1346,1,352,
+1377,1,107,2810,16,
+0,339,1,1114,1371,
+1,118,1383,1,1123,
+2811,16,0,339,1,
+371,1393,1,1628,2812,
+16,0,339,1,375,
+1404,1,1882,2813,16,
+0,339,1,377,1409,
+1,379,1414,1,380,
+1419,1,883,2814,16,
+0,339,1,373,1437,
+1,130,1442,1,143,
+1447,1,387,2815,16,
+0,339,1,1159,2816,
+16,0,339,1,157,
+1470,1,1413,2817,16,
+0,339,1,1665,2818,
+16,0,339,1,412,
+2819,16,0,339,1,
+1377,2820,16,0,339,
+1,172,1496,1,1939,
+2821,16,0,339,1,
+437,2822,16,0,339,
+1,188,1547,1,942,
+1519,1,1195,2823,16,
+0,339,1,1449,2824,
+16,0,339,1,1701,
+2825,16,0,339,1,
+447,1540,1,205,2826,
+16,0,339,1,827,
+2827,16,0,339,1,
+223,2828,16,0,339,
+1,476,1572,1,477,
+1578,1,1231,2829,16,
+0,339,1,479,1588,
+1,480,1593,1,1485,
+2830,16,0,339,1,
+1737,2831,16,0,339,
+1,242,1606,1,478,
+1611,1,1001,1616,1,
+1002,1621,1,34,2832,
+19,327,1,34,2833,
+5,84,1,1011,1130,
+1,1012,2834,16,0,
+325,1,1013,1286,1,
+262,1147,1,1267,2835,
+16,0,325,1,515,
+2836,16,0,325,1,
+1521,2837,16,0,325,
+1,2692,2838,16,0,
+325,1,525,1244,1,
+283,1200,1,2299,2839,
+16,0,325,1,42,
+2840,16,0,325,1,
+40,1205,1,44,1211,
+1,47,1212,1,1303,
+2841,16,0,325,1,
+1555,2842,16,0,325,
+1,50,1229,1,48,
+1218,1,49,1224,1,
+51,1234,1,63,1250,
+1,305,1239,1,66,
+1256,1,67,1261,1,
+68,1266,1,69,1271,
+1,70,1276,1,73,
+2843,16,0,325,1,
+74,1281,1,328,1330,
+1,1048,1372,1,82,
+2844,16,0,325,1,
+1840,2845,16,0,325,
+1,1591,2846,16,0,
+325,1,1341,2847,16,
+0,325,1,1096,1340,
+1,93,1346,1,352,
+1377,1,107,2848,16,
+0,325,1,1114,1371,
+1,118,1383,1,1123,
+2849,16,0,325,1,
+371,1393,1,1628,2850,
+16,0,325,1,375,
+1404,1,1882,2851,16,
+0,325,1,377,1409,
+1,379,1414,1,380,
+1419,1,883,2852,16,
+0,325,1,373,1437,
+1,130,1442,1,143,
+1447,1,387,2853,16,
+0,325,1,1159,2854,
+16,0,325,1,157,
+1470,1,1413,2855,16,
+0,325,1,1665,2856,
+16,0,325,1,412,
+2857,16,0,325,1,
+1377,2858,16,0,325,
+1,172,1496,1,1939,
+2859,16,0,325,1,
+437,2860,16,0,325,
+1,188,1547,1,942,
+1519,1,1195,2861,16,
+0,325,1,1449,2862,
+16,0,325,1,1701,
+2863,16,0,325,1,
+447,1540,1,205,1552,
+1,827,2864,16,0,
+325,1,223,1562,1,
+476,1572,1,477,1578,
+1,1231,2865,16,0,
+325,1,479,1588,1,
+480,1593,1,1485,2866,
+16,0,325,1,1737,
+2867,16,0,325,1,
+242,1606,1,478,1611,
+1,1001,1616,1,1002,
+1621,1,35,2868,19,
+310,1,35,2869,5,
+84,1,1011,1130,1,
+1012,2870,16,0,308,
+1,1013,1286,1,262,
+1147,1,1267,2871,16,
+0,308,1,515,2872,
+16,0,308,1,1521,
+2873,16,0,308,1,
+2692,2874,16,0,308,
+1,525,1244,1,283,
+1200,1,2299,2875,16,
+0,308,1,42,2876,
+16,0,308,1,40,
+1205,1,44,1211,1,
+47,1212,1,1303,2877,
+16,0,308,1,1555,
+2878,16,0,308,1,
+50,1229,1,48,1218,
+1,49,1224,1,51,
+1234,1,63,1250,1,
+305,1239,1,66,1256,
+1,67,1261,1,68,
+1266,1,69,1271,1,
+70,1276,1,73,2879,
+16,0,308,1,74,
+1281,1,328,1330,1,
+1048,1372,1,82,2880,
+16,0,308,1,1840,
+2881,16,0,308,1,
+1591,2882,16,0,308,
+1,1341,2883,16,0,
+308,1,1096,1340,1,
+93,1346,1,352,1377,
+1,107,2884,16,0,
+308,1,1114,1371,1,
+118,1383,1,1123,2885,
+16,0,308,1,371,
+1393,1,1628,2886,16,
+0,308,1,375,1404,
+1,1882,2887,16,0,
+308,1,377,1409,1,
+379,1414,1,380,1419,
+1,883,2888,16,0,
+308,1,373,1437,1,
+130,1442,1,143,1447,
+1,387,2889,16,0,
+308,1,1159,2890,16,
+0,308,1,157,1470,
+1,1413,2891,16,0,
+308,1,1665,2892,16,
+0,308,1,412,2893,
+16,0,308,1,1377,
+2894,16,0,308,1,
+172,1496,1,1939,2895,
+16,0,308,1,437,
+2896,16,0,308,1,
+188,1547,1,942,1519,
+1,1195,2897,16,0,
+308,1,1449,2898,16,
+0,308,1,1701,2899,
+16,0,308,1,447,
+1540,1,205,1552,1,
+827,2900,16,0,308,
+1,223,2901,16,0,
+308,1,476,1572,1,
+477,1578,1,1231,2902,
+16,0,308,1,479,
+1588,1,480,1593,1,
+1485,2903,16,0,308,
+1,1737,2904,16,0,
+308,1,242,1606,1,
+478,1611,1,1001,1616,
+1,1002,1621,1,36,
+2905,19,217,1,36,
+2906,5,94,1,256,
+2907,16,0,215,1,
+1261,2908,16,0,215,
+1,509,2909,16,0,
+215,1,1515,2910,16,
+0,215,1,2686,2911,
+16,0,215,1,2021,
+747,1,1775,2912,16,
+0,215,1,2029,754,
+1,2030,760,1,2031,
+765,1,2032,770,1,
+2033,775,1,277,2913,
+16,0,215,1,2035,
+781,1,2037,786,1,
+2039,791,1,32,2914,
+16,0,215,1,2041,
+797,1,2293,2915,16,
+0,215,1,2043,803,
+1,2045,808,1,41,
+2916,16,0,215,1,
+1297,2917,16,0,215,
+1,43,2918,16,0,
+215,1,1803,816,1,
+1804,2919,16,0,215,
+1,299,2920,16,0,
+215,1,52,2921,16,
+0,215,1,2318,2922,
+16,0,215,1,2075,
+2923,16,0,215,1,
+1574,828,1,71,2924,
+16,0,215,1,76,
+2925,16,0,215,1,
+1834,2926,16,0,215,
+1,2337,2927,16,0,
+215,1,79,2928,16,
+0,215,1,1335,2929,
+16,0,215,1,322,
+2930,16,0,215,1,
+85,2931,16,0,215,
+1,89,2932,16,0,
+215,1,346,2933,16,
+0,215,1,2105,843,
+1,2106,2934,16,0,
+215,1,97,2935,16,
+0,215,1,1860,850,
+1,2364,856,1,102,
+2936,16,0,215,1,
+112,2937,16,0,215,
+1,1117,2938,16,0,
+215,1,1873,864,1,
+1876,2939,16,0,215,
+1,124,2940,16,0,
+215,1,2136,871,1,
+381,2941,16,0,215,
+1,525,2942,16,0,
+215,1,137,2943,16,
+0,215,1,1901,2944,
+16,0,215,1,1153,
+2945,16,0,215,1,
+151,2946,16,0,215,
+1,1407,2947,16,0,
+215,1,1659,2948,16,
+0,215,1,2413,2949,
+16,0,215,1,406,
+2950,16,0,215,1,
+1371,2951,16,0,215,
+1,166,2952,16,0,
+215,1,1622,2953,16,
+0,215,1,1931,889,
+1,1933,2954,16,0,
+215,1,431,2955,16,
+0,215,1,1585,2956,
+16,0,215,1,182,
+2957,16,0,215,1,
+1189,2958,16,0,215,
+1,1443,2959,16,0,
+215,1,1695,2960,16,
+0,215,1,2198,2961,
+16,0,215,1,447,
+2962,16,0,215,1,
+2458,904,1,2459,910,
+1,1958,2963,16,0,
+215,1,2462,917,1,
+1657,922,1,2464,927,
+1,199,2964,16,0,
+215,1,459,2965,16,
+0,215,1,462,2966,
+16,0,215,1,217,
+2967,16,0,215,1,
+2227,936,1,1225,2968,
+16,0,215,1,1479,
+2969,16,0,215,1,
+1731,2970,16,0,215,
+1,1989,944,1,1990,
+2971,16,0,215,1,
+236,2972,16,0,215,
+1,1756,2973,16,0,
+215,1,37,2974,19,
+234,1,37,2975,5,
+94,1,256,2976,16,
+0,232,1,1261,2977,
+16,0,232,1,509,
+2978,16,0,232,1,
+1515,2979,16,0,232,
+1,2686,2980,16,0,
+232,1,2021,747,1,
+1775,2981,16,0,232,
+1,2029,754,1,2030,
+760,1,2031,765,1,
+2032,770,1,2033,775,
+1,277,2982,16,0,
+232,1,2035,781,1,
+2037,786,1,2039,791,
+1,32,2983,16,0,
+232,1,2041,797,1,
+2293,2984,16,0,232,
+1,2043,803,1,2045,
+808,1,41,2985,16,
+0,232,1,1297,2986,
+16,0,232,1,43,
+2987,16,0,232,1,
+1803,816,1,1804,2988,
+16,0,232,1,299,
+2989,16,0,232,1,
+52,2990,16,0,232,
+1,2318,2991,16,0,
+232,1,2075,2992,16,
+0,232,1,1574,828,
+1,71,2993,16,0,
+232,1,76,2994,16,
+0,232,1,1834,2995,
+16,0,232,1,2337,
+2996,16,0,232,1,
+79,2997,16,0,232,
+1,1335,2998,16,0,
+232,1,322,2999,16,
+0,232,1,85,3000,
+16,0,232,1,89,
+3001,16,0,232,1,
+346,3002,16,0,232,
+1,2105,843,1,2106,
+3003,16,0,232,1,
+97,3004,16,0,232,
+1,1860,850,1,2364,
+856,1,102,3005,16,
+0,232,1,112,3006,
+16,0,232,1,1117,
+3007,16,0,232,1,
+1873,864,1,1876,3008,
+16,0,232,1,124,
+3009,16,0,232,1,
+2136,871,1,381,3010,
+16,0,232,1,525,
+3011,16,0,232,1,
+137,3012,16,0,232,
+1,1901,3013,16,0,
+232,1,1153,3014,16,
+0,232,1,151,3015,
+16,0,232,1,1407,
+3016,16,0,232,1,
+1659,3017,16,0,232,
+1,2413,3018,16,0,
+232,1,406,3019,16,
+0,232,1,1371,3020,
+16,0,232,1,166,
+3021,16,0,232,1,
+1622,3022,16,0,232,
+1,1931,889,1,1933,
+3023,16,0,232,1,
+431,3024,16,0,232,
+1,1585,3025,16,0,
+232,1,182,3026,16,
+0,232,1,1189,3027,
+16,0,232,1,1443,
+3028,16,0,232,1,
+1695,3029,16,0,232,
+1,2198,3030,16,0,
+232,1,447,3031,16,
+0,232,1,2458,904,
+1,2459,910,1,1958,
+3032,16,0,232,1,
+2462,917,1,1657,922,
+1,2464,927,1,199,
+3033,16,0,232,1,
+459,3034,16,0,232,
+1,462,3035,16,0,
+232,1,217,3036,16,
+0,232,1,2227,936,
+1,1225,3037,16,0,
+232,1,1479,3038,16,
+0,232,1,1731,3039,
+16,0,232,1,1989,
+944,1,1990,3040,16,
+0,232,1,236,3041,
+16,0,232,1,1756,
+3042,16,0,232,1,
+38,3043,19,231,1,
+38,3044,5,84,1,
+1011,1130,1,1012,3045,
+16,0,229,1,1013,
+1286,1,262,1147,1,
+1267,3046,16,0,229,
+1,515,3047,16,0,
+229,1,1521,3048,16,
+0,229,1,2692,3049,
+16,0,229,1,525,
+1244,1,283,1200,1,
+2299,3050,16,0,229,
+1,42,3051,16,0,
+229,1,40,1205,1,
+44,1211,1,47,1212,
+1,1303,3052,16,0,
+229,1,1555,3053,16,
+0,229,1,50,1229,
+1,48,1218,1,49,
+1224,1,51,1234,1,
+63,1250,1,305,1239,
+1,66,1256,1,67,
+1261,1,68,1266,1,
+69,1271,1,70,1276,
+1,73,3054,16,0,
+229,1,74,1281,1,
+328,1330,1,1048,1372,
+1,82,3055,16,0,
+229,1,1840,3056,16,
+0,229,1,1591,3057,
+16,0,229,1,1341,
+3058,16,0,229,1,
+1096,1340,1,93,1346,
+1,352,1377,1,107,
+3059,16,0,229,1,
+1114,1371,1,118,1383,
+1,1123,3060,16,0,
+229,1,371,1393,1,
+1628,3061,16,0,229,
+1,375,1404,1,1882,
+3062,16,0,229,1,
+377,1409,1,379,1414,
+1,380,1419,1,883,
+1425,1,373,1437,1,
+130,1442,1,143,1447,
+1,387,3063,16,0,
+229,1,1159,3064,16,
+0,229,1,157,1470,
+1,1413,3065,16,0,
+229,1,1665,3066,16,
+0,229,1,412,3067,
+16,0,229,1,1377,
+3068,16,0,229,1,
+172,1496,1,1939,3069,
+16,0,229,1,437,
+3070,16,0,229,1,
+188,1547,1,942,1519,
+1,1195,3071,16,0,
+229,1,1449,3072,16,
+0,229,1,1701,3073,
+16,0,229,1,447,
+1540,1,205,1552,1,
+827,1359,1,223,1562,
+1,476,1572,1,477,
+1578,1,1231,3074,16,
+0,229,1,479,1588,
+1,480,1593,1,1485,
+3075,16,0,229,1,
+1737,3076,16,0,229,
+1,242,1606,1,478,
+1611,1,1001,1616,1,
+1002,1621,1,39,3077,
+19,223,1,39,3078,
+5,84,1,1011,1130,
+1,1012,3079,16,0,
+221,1,1013,1286,1,
+262,1147,1,1267,3080,
+16,0,221,1,515,
+3081,16,0,221,1,
+1521,3082,16,0,221,
+1,2692,3083,16,0,
+221,1,525,1244,1,
+283,1200,1,2299,3084,
+16,0,221,1,42,
+3085,16,0,221,1,
+40,1205,1,44,1211,
+1,47,1212,1,1303,
+3086,16,0,221,1,
+1555,3087,16,0,221,
+1,50,1229,1,48,
+1218,1,49,1224,1,
+51,1234,1,63,1250,
+1,305,1239,1,66,
+1256,1,67,1261,1,
+68,1266,1,69,1271,
+1,70,1276,1,73,
+3088,16,0,221,1,
+74,1281,1,328,1330,
+1,1048,1372,1,82,
+3089,16,0,221,1,
+1840,3090,16,0,221,
+1,1591,3091,16,0,
+221,1,1341,3092,16,
+0,221,1,1096,1340,
+1,93,1346,1,352,
+1377,1,107,3093,16,
+0,221,1,1114,1371,
+1,118,1383,1,1123,
+3094,16,0,221,1,
+371,1393,1,1628,3095,
+16,0,221,1,375,
+1404,1,1882,3096,16,
+0,221,1,377,1409,
+1,379,1414,1,380,
+1419,1,883,1425,1,
+373,1437,1,130,1442,
+1,143,1447,1,387,
+3097,16,0,221,1,
+1159,3098,16,0,221,
+1,157,1470,1,1413,
+3099,16,0,221,1,
+1665,3100,16,0,221,
+1,412,3101,16,0,
+221,1,1377,3102,16,
+0,221,1,172,1496,
+1,1939,3103,16,0,
+221,1,437,3104,16,
+0,221,1,188,1547,
+1,942,1519,1,1195,
+3105,16,0,221,1,
+1449,3106,16,0,221,
+1,1701,3107,16,0,
+221,1,447,1540,1,
+205,1552,1,827,1359,
+1,223,1562,1,476,
+1572,1,477,1578,1,
+1231,3108,16,0,221,
+1,479,1588,1,480,
+1593,1,1485,3109,16,
+0,221,1,1737,3110,
+16,0,221,1,242,
+1606,1,478,1611,1,
+1001,1616,1,1002,1621,
+1,40,3111,19,211,
+1,40,3112,5,84,
+1,1011,1130,1,1012,
+3113,16,0,209,1,
+1013,1286,1,262,1147,
+1,1267,3114,16,0,
+209,1,515,3115,16,
+0,209,1,1521,3116,
+16,0,209,1,2692,
+3117,16,0,209,1,
+525,1244,1,283,1200,
+1,2299,3118,16,0,
+209,1,42,3119,16,
+0,209,1,40,1205,
+1,44,1211,1,47,
+1212,1,1303,3120,16,
+0,209,1,1555,3121,
+16,0,209,1,50,
+1229,1,48,1218,1,
+49,1224,1,51,1234,
+1,63,1250,1,305,
+1239,1,66,1256,1,
+67,1261,1,68,1266,
+1,69,1271,1,70,
+1276,1,73,3122,16,
+0,209,1,74,1281,
+1,328,1330,1,1048,
+1372,1,82,3123,16,
+0,209,1,1840,3124,
+16,0,209,1,1591,
+3125,16,0,209,1,
+1341,3126,16,0,209,
+1,1096,1340,1,93,
+1346,1,352,1377,1,
+107,3127,16,0,209,
+1,1114,1371,1,118,
+3128,16,0,209,1,
+1123,3129,16,0,209,
+1,371,1393,1,1628,
+3130,16,0,209,1,
+375,1404,1,1882,3131,
+16,0,209,1,377,
+1409,1,379,1414,1,
+380,1419,1,883,3132,
+16,0,209,1,373,
+1437,1,130,3133,16,
+0,209,1,143,3134,
+16,0,209,1,387,
+3135,16,0,209,1,
+1159,3136,16,0,209,
+1,157,3137,16,0,
+209,1,1413,3138,16,
+0,209,1,1665,3139,
+16,0,209,1,412,
+3140,16,0,209,1,
+1377,3141,16,0,209,
+1,172,3142,16,0,
+209,1,1939,3143,16,
+0,209,1,437,3144,
+16,0,209,1,188,
+3145,16,0,209,1,
+942,1519,1,1195,3146,
+16,0,209,1,1449,
+3147,16,0,209,1,
+1701,3148,16,0,209,
+1,447,1540,1,205,
+3149,16,0,209,1,
+827,3150,16,0,209,
+1,223,3151,16,0,
+209,1,476,1572,1,
+477,1578,1,1231,3152,
+16,0,209,1,479,
+1588,1,480,1593,1,
+1485,3153,16,0,209,
+1,1737,3154,16,0,
+209,1,242,3155,16,
+0,209,1,478,1611,
+1,1001,1616,1,1002,
+1621,1,41,3156,19,
+172,1,41,3157,5,
+84,1,1011,1130,1,
+1012,3158,16,0,170,
+1,1013,1286,1,262,
+1147,1,1267,3159,16,
+0,170,1,515,3160,
+16,0,170,1,1521,
+3161,16,0,170,1,
+2692,3162,16,0,170,
+1,525,1244,1,283,
+1200,1,2299,3163,16,
+0,170,1,42,3164,
+16,0,170,1,40,
+1205,1,44,1211,1,
+47,1212,1,1303,3165,
+16,0,170,1,1555,
+3166,16,0,170,1,
+50,1229,1,48,1218,
+1,49,1224,1,51,
+1234,1,63,1250,1,
+305,1239,1,66,1256,
+1,67,1261,1,68,
+1266,1,69,1271,1,
+70,1276,1,73,3167,
+16,0,170,1,74,
+1281,1,328,1330,1,
+1048,1372,1,82,3168,
+16,0,170,1,1840,
+3169,16,0,170,1,
+1591,3170,16,0,170,
+1,1341,3171,16,0,
+170,1,1096,1340,1,
+93,1346,1,352,1377,
+1,107,3172,16,0,
+170,1,1114,1371,1,
+118,3173,16,0,170,
+1,1123,3174,16,0,
+170,1,371,1393,1,
+1628,3175,16,0,170,
+1,375,1404,1,1882,
+3176,16,0,170,1,
+377,1409,1,379,1414,
+1,380,1419,1,883,
+3177,16,0,170,1,
+373,1437,1,130,3178,
+16,0,170,1,143,
+3179,16,0,170,1,
+387,3180,16,0,170,
+1,1159,3181,16,0,
+170,1,157,3182,16,
+0,170,1,1413,3183,
+16,0,170,1,1665,
+3184,16,0,170,1,
+412,3185,16,0,170,
+1,1377,3186,16,0,
+170,1,172,3187,16,
+0,170,1,1939,3188,
+16,0,170,1,437,
+3189,16,0,170,1,
+188,3190,16,0,170,
+1,942,1519,1,1195,
+3191,16,0,170,1,
+1449,3192,16,0,170,
+1,1701,3193,16,0,
+170,1,447,1540,1,
+205,3194,16,0,170,
+1,827,3195,16,0,
+170,1,223,3196,16,
+0,170,1,476,1572,
+1,477,1578,1,1231,
+3197,16,0,170,1,
+479,1588,1,480,1593,
+1,1485,3198,16,0,
+170,1,1737,3199,16,
+0,170,1,242,3200,
+16,0,170,1,478,
+1611,1,1001,1616,1,
+1002,1621,1,42,3201,
+19,403,1,42,3202,
+5,38,1,1901,3203,
+16,0,401,1,2075,
+3204,16,0,401,1,
+1860,850,1,1803,816,
+1,1804,3205,16,0,
+401,1,2413,3206,16,
+0,401,1,2198,3207,
+16,0,401,1,1873,
+864,1,1657,922,1,
+1989,944,1,1990,3208,
+16,0,401,1,1775,
+3209,16,0,401,1,
+32,3210,16,0,401,
+1,2105,843,1,2106,
+3211,16,0,401,1,
+2364,856,1,2227,936,
+1,2337,3212,16,0,
+401,1,2021,747,1,
+2458,904,1,2459,910,
+1,2462,917,1,2136,
+871,1,2464,927,1,
+2029,754,1,2030,760,
+1,2031,765,1,2032,
+770,1,2033,775,1,
+2035,781,1,2037,786,
+1,2039,791,1,1931,
+889,1,2041,797,1,
+2043,803,1,2045,808,
+1,1574,828,1,1958,
+3213,16,0,401,1,
+43,3214,19,478,1,
+43,3215,5,25,1,
+2035,781,1,2037,786,
+1,2039,791,1,2041,
+797,1,2227,936,1,
+2043,803,1,1657,922,
+1,1860,850,1,2136,
+871,1,2021,747,1,
+2459,910,1,1574,828,
+1,2105,3216,16,0,
+602,1,1931,889,1,
+1873,864,1,2031,765,
+1,1803,816,1,1989,
+3217,16,0,476,1,
+2464,927,1,2029,754,
+1,2030,760,1,2364,
+856,1,2032,770,1,
+2033,775,1,2045,808,
+1,44,3218,19,264,
+1,44,3219,5,38,
+1,1901,3220,16,0,
+262,1,2075,3221,16,
+0,262,1,1860,850,
+1,1803,816,1,1804,
+3222,16,0,262,1,
+2413,3223,16,0,262,
+1,2198,3224,16,0,
+262,1,1873,864,1,
+1657,922,1,1989,944,
+1,1990,3225,16,0,
+262,1,1775,3226,16,
+0,262,1,32,3227,
+16,0,262,1,2105,
+843,1,2106,3228,16,
+0,262,1,2364,856,
+1,2227,936,1,2337,
+3229,16,0,262,1,
+2021,747,1,2458,904,
+1,2459,910,1,2462,
+917,1,2136,871,1,
+2464,927,1,2029,754,
+1,2030,760,1,2031,
+765,1,2032,770,1,
+2033,775,1,2035,781,
+1,2037,786,1,2039,
+791,1,1931,889,1,
+2041,797,1,2043,803,
+1,2045,808,1,1574,
+828,1,1958,3230,16,
+0,262,1,45,3231,
+19,287,1,45,3232,
+5,39,1,1901,3233,
+16,0,314,1,2075,
+3234,16,0,314,1,
+1860,850,1,1803,816,
+1,1804,3235,16,0,
+314,1,2413,3236,16,
+0,314,1,2198,3237,
+16,0,314,1,1873,
+864,1,1657,922,1,
+1989,944,1,1990,3238,
+16,0,314,1,1775,
+3239,16,0,314,1,
+32,3240,16,0,314,
+1,2105,843,1,2106,
+3241,16,0,314,1,
+2364,856,1,2227,936,
+1,2337,3242,16,0,
+314,1,2021,747,1,
+2458,904,1,2459,910,
+1,2462,917,1,2136,
+871,1,2464,927,1,
+2029,754,1,2030,760,
+1,2031,765,1,2032,
+770,1,2033,775,1,
+2035,781,1,2037,786,
+1,2039,791,1,1931,
+889,1,2041,797,1,
+2043,803,1,2045,808,
+1,1832,3243,16,0,
+285,1,1574,828,1,
+1958,3244,16,0,314,
+1,46,3245,19,698,
+1,46,3246,5,38,
+1,1901,3247,16,0,
+696,1,2075,3248,16,
+0,696,1,1860,850,
+1,1803,816,1,1804,
+3249,16,0,696,1,
+2413,3250,16,0,696,
+1,2198,3251,16,0,
+696,1,1873,864,1,
+1657,922,1,1989,944,
+1,1990,3252,16,0,
+696,1,1775,3253,16,
+0,696,1,32,3254,
+16,0,696,1,2105,
+843,1,2106,3255,16,
+0,696,1,2364,856,
+1,2227,936,1,2337,
+3256,16,0,696,1,
+2021,747,1,2458,904,
+1,2459,910,1,2462,
+917,1,2136,871,1,
+2464,927,1,2029,754,
+1,2030,760,1,2031,
+765,1,2032,770,1,
+2033,775,1,2035,781,
+1,2037,786,1,2039,
+791,1,1931,889,1,
+2041,797,1,2043,803,
+1,2045,808,1,1574,
+828,1,1958,3257,16,
+0,696,1,47,3258,
+19,588,1,47,3259,
+5,19,1,0,3260,
+16,0,678,1,2741,
+3261,17,3262,15,3263,
+4,36,37,0,71,
+0,108,0,111,0,
+98,0,97,0,108,
+0,68,0,101,0,
+102,0,105,0,110,
+0,105,0,116,0,
+105,0,111,0,110,
+0,115,0,1,-1,
+1,5,3264,20,3265,
+4,38,71,0,108,
+0,111,0,98,0,
+97,0,108,0,68,
+0,101,0,102,0,
+105,0,110,0,105,
+0,116,0,105,0,
+111,0,110,0,115,
+0,95,0,52,0,
+1,153,1,3,1,
+3,1,2,3266,22,
+1,6,1,2742,3267,
+17,3268,15,3263,1,
+-1,1,5,3269,20,
+3270,4,38,71,0,
 108,0,111,0,98,
 0,97,0,108,0,
 68,0,101,0,102,
 0,105,0,110,0,
 105,0,116,0,105,
 0,111,0,110,0,
-115,0,95,0,52,
-0,1,149,1,3,
-1,3,1,2,3216,
-22,1,6,1,2726,
-3217,17,3218,15,3213,
-1,-1,1,5,3219,
-20,3220,4,38,71,
+115,0,95,0,50,
+0,1,151,1,3,
+1,3,1,2,3271,
+22,1,4,1,2743,
+3272,17,3273,15,3263,
+1,-1,1,5,3274,
+20,3275,4,38,71,
 0,108,0,111,0,
 98,0,97,0,108,
 0,68,0,101,0,
@@ -8558,23 +8803,25 @@ public yyLSLSyntax
 0,105,0,116,0,
 105,0,111,0,110,
 0,115,0,95,0,
-50,0,1,147,1,
-3,1,3,1,2,
-3221,22,1,4,1,
-2706,3222,17,3223,15,
-3224,4,52,37,0,
+51,0,1,152,1,
+3,1,2,1,1,
+3276,22,1,5,1,
+2744,3277,17,3278,15,
+3263,1,-1,1,5,
+3279,20,3280,4,38,
 71,0,108,0,111,
 0,98,0,97,0,
-108,0,86,0,97,
-0,114,0,105,0,
-97,0,98,0,108,
-0,101,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-1,-1,1,5,3225,
-20,3226,4,54,71,
+108,0,68,0,101,
+0,102,0,105,0,
+110,0,105,0,116,
+0,105,0,111,0,
+110,0,115,0,95,
+0,49,0,1,150,
+1,3,1,2,1,
+1,3281,22,1,3,
+1,2660,735,1,2711,
+3282,17,3283,15,3284,
+4,52,37,0,71,
 0,108,0,111,0,
 98,0,97,0,108,
 0,86,0,97,0,
@@ -8584,2391 +8831,2437 @@ public yyLSLSyntax
 0,99,0,108,0,
 97,0,114,0,97,
 0,116,0,105,0,
-111,0,110,0,95,
-0,49,0,1,150,
-1,3,1,3,1,
-2,3227,22,1,7,
-1,2707,3228,16,0,
-656,1,2718,3229,16,
-0,656,1,2565,700,
-1,2022,3230,16,0,
-572,1,2459,891,1,
-2645,706,1,2648,3231,
-16,0,656,1,2464,
-908,1,2466,3232,17,
-3233,15,3234,4,50,
-37,0,71,0,108,
-0,111,0,98,0,
-97,0,108,0,70,
-0,117,0,110,0,
-99,0,116,0,105,
-0,111,0,110,0,
-68,0,101,0,102,
-0,105,0,110,0,
-105,0,116,0,105,
-0,111,0,110,0,
-1,-1,1,5,3235,
-20,3236,4,52,71,
-0,108,0,111,0,
-98,0,97,0,108,
-0,70,0,117,0,
-110,0,99,0,116,
-0,105,0,111,0,
-110,0,68,0,101,
-0,102,0,105,0,
-110,0,105,0,116,
-0,105,0,111,0,
-110,0,95,0,50,
-0,1,153,1,3,
-1,7,1,6,3237,
-22,1,10,1,2652,
-695,1,2727,3238,17,
-3239,15,3213,1,-1,
-1,5,3240,20,3241,
-4,38,71,0,108,
-0,111,0,98,0,
-97,0,108,0,68,
+111,0,110,0,1,
+-1,1,5,3285,20,
+3286,4,54,71,0,
+108,0,111,0,98,
+0,97,0,108,0,
+86,0,97,0,114,
+0,105,0,97,0,
+98,0,108,0,101,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,95,0,
+50,0,1,155,1,
+3,1,5,1,4,
+3287,22,1,8,1,
+2664,3288,16,0,678,
+1,2723,3289,16,0,
+678,1,2022,3290,16,
+0,586,1,2459,910,
+1,2683,3291,17,3292,
+15,3293,4,50,37,
+0,71,0,108,0,
+111,0,98,0,97,
+0,108,0,70,0,
+117,0,110,0,99,
+0,116,0,105,0,
+111,0,110,0,68,
+0,101,0,102,0,
+105,0,110,0,105,
+0,116,0,105,0,
+111,0,110,0,1,
+-1,1,5,3294,20,
+3295,4,52,71,0,
+108,0,111,0,98,
+0,97,0,108,0,
+70,0,117,0,110,
+0,99,0,116,0,
+105,0,111,0,110,
+0,68,0,101,0,
+102,0,105,0,110,
+0,105,0,116,0,
+105,0,111,0,110,
+0,95,0,49,0,
+1,156,1,3,1,
+6,1,5,3296,22,
+1,9,1,2722,3297,
+17,3298,15,3284,1,
+-1,1,5,3299,20,
+3300,4,54,71,0,
+108,0,111,0,98,
+0,97,0,108,0,
+86,0,97,0,114,
+0,105,0,97,0,
+98,0,108,0,101,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,95,0,
+49,0,1,154,1,
+3,1,3,1,2,
+3301,22,1,7,1,
+2464,927,1,2576,713,
+1,2466,3302,17,3303,
+15,3293,1,-1,1,
+5,3304,20,3305,4,
+52,71,0,108,0,
+111,0,98,0,97,
+0,108,0,70,0,
+117,0,110,0,99,
+0,116,0,105,0,
+111,0,110,0,68,
 0,101,0,102,0,
 105,0,110,0,105,
 0,116,0,105,0,
-111,0,110,0,115,
-0,95,0,51,0,
-1,148,1,3,1,
-2,1,1,3242,22,
-1,5,1,2728,3243,
-17,3244,15,3213,1,
--1,1,5,3245,20,
-3246,4,38,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
-68,0,101,0,102,
-0,105,0,110,0,
-105,0,116,0,105,
-0,111,0,110,0,
-115,0,95,0,49,
-0,1,146,1,3,
-1,2,1,1,3247,
-22,1,3,1,2667,
-3248,17,3249,15,3234,
-1,-1,1,5,3250,
-20,3251,4,52,71,
-0,108,0,111,0,
-98,0,97,0,108,
-0,70,0,117,0,
-110,0,99,0,116,
-0,105,0,111,0,
-110,0,68,0,101,
-0,102,0,105,0,
-110,0,105,0,116,
-0,105,0,111,0,
-110,0,95,0,49,
-0,1,152,1,3,
-1,6,1,5,3252,
-22,1,9,1,2695,
-3253,17,3254,15,3224,
-1,-1,1,5,3255,
-20,3256,4,54,71,
-0,108,0,111,0,
-98,0,97,0,108,
-0,86,0,97,0,
-114,0,105,0,97,
-0,98,0,108,0,
-101,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
 111,0,110,0,95,
-0,50,0,1,151,
-1,3,1,5,1,
-4,3257,22,1,8,
-1,2651,689,1,48,
-3258,19,347,1,48,
-3259,5,54,1,0,
-3260,16,0,345,1,
-2726,3217,1,2727,3238,
-1,2728,3243,1,2075,
-3261,16,0,505,1,
-1860,831,1,1804,3262,
-16,0,505,1,2413,
-3263,16,0,505,1,
-2198,3264,16,0,505,
-1,1873,845,1,1657,
-903,1,2030,741,1,
-1989,925,1,1990,3265,
-16,0,505,1,2645,
-706,1,2459,891,1,
-1775,3266,16,0,505,
-1,32,3267,16,0,
-505,1,2718,3268,16,
-0,345,1,2105,824,
-1,2651,689,1,2652,
-695,1,2648,3269,16,
-0,345,1,2227,917,
-1,2337,3270,16,0,
-505,1,2667,3248,1,
-2695,3253,1,2565,700,
-1,1803,797,1,2458,
-885,1,1901,3271,16,
-0,505,1,2462,898,
-1,2136,852,1,2464,
-908,1,2029,735,1,
-2466,3232,1,2031,746,
-1,2032,751,1,2033,
-756,1,2035,762,1,
-2364,837,1,2039,772,
-1,1931,870,1,2041,
-778,1,2021,728,1,
-2043,784,1,2045,789,
-1,2725,3211,1,2706,
-3222,1,2707,3272,16,
-0,345,1,2037,767,
-1,1574,809,1,2106,
-3273,16,0,505,1,
-1958,3274,16,0,505,
-1,49,3275,19,510,
-1,49,3276,5,38,
-1,1901,3277,16,0,
-508,1,2075,3278,16,
-0,508,1,1860,831,
-1,1803,797,1,1804,
-3279,16,0,508,1,
-2413,3280,16,0,508,
-1,2198,3281,16,0,
-508,1,1873,845,1,
-1657,903,1,1989,925,
-1,1990,3282,16,0,
-508,1,1775,3283,16,
-0,508,1,32,3284,
-16,0,508,1,2105,
-824,1,2106,3285,16,
-0,508,1,2364,837,
-1,2227,917,1,2337,
-3286,16,0,508,1,
-2021,728,1,2458,885,
-1,2459,891,1,2462,
-898,1,2136,852,1,
-2464,908,1,2029,735,
-1,2030,741,1,2031,
-746,1,2032,751,1,
-2033,756,1,2035,762,
-1,2037,767,1,2039,
-772,1,1931,870,1,
-2041,778,1,2043,784,
-1,2045,789,1,1574,
-809,1,1958,3287,16,
-0,508,1,50,3288,
-19,627,1,50,3289,
-5,38,1,1901,3290,
-16,0,625,1,2075,
-3291,16,0,625,1,
-1860,831,1,1803,797,
-1,1804,3292,16,0,
-625,1,2413,3293,16,
-0,625,1,2198,3294,
-16,0,625,1,1873,
-845,1,1657,903,1,
-1989,925,1,1990,3295,
-16,0,625,1,1775,
-3296,16,0,625,1,
-32,3297,16,0,625,
-1,2105,824,1,2106,
-3298,16,0,625,1,
-2364,837,1,2227,917,
-1,2337,3299,16,0,
-625,1,2021,728,1,
-2458,885,1,2459,891,
-1,2462,898,1,2136,
-852,1,2464,908,1,
-2029,735,1,2030,741,
-1,2031,746,1,2032,
-751,1,2033,756,1,
-2035,762,1,2037,767,
-1,2039,772,1,1931,
-870,1,2041,778,1,
-2043,784,1,2045,789,
-1,1574,809,1,1958,
-3300,16,0,625,1,
-51,3301,19,127,1,
-51,3302,5,53,1,
-0,3303,16,0,125,
-1,2726,3217,1,2727,
-3238,1,2728,3243,1,
-2075,3304,16,0,125,
-1,1860,831,1,1804,
-3305,16,0,125,1,
-10,3306,16,0,125,
-1,2413,3307,16,0,
-125,1,2198,3308,16,
-0,125,1,1873,845,
-1,21,3309,16,0,
-125,1,1657,903,1,
-2030,741,1,1989,925,
-1,1990,3310,16,0,
-125,1,2459,891,1,
-1775,3311,16,0,125,
-1,32,3312,16,0,
-125,1,2105,824,1,
-2106,3313,16,0,125,
-1,2654,3314,16,0,
-125,1,2227,917,1,
-2337,3315,16,0,125,
-1,2667,3248,1,52,
-3316,16,0,125,1,
-2695,3253,1,1803,797,
-1,2458,885,1,1901,
-3317,16,0,125,1,
-2462,898,1,2136,852,
-1,2464,908,1,2029,
-735,1,2466,3232,1,
-2031,746,1,2032,751,
-1,2033,756,1,2035,
-762,1,2364,837,1,
-2039,772,1,1931,870,
-1,2041,778,1,2021,
-728,1,2043,784,1,
-2045,789,1,2511,3318,
-16,0,125,1,2725,
-3211,1,2706,3222,1,
-2707,3319,16,0,125,
-1,2037,767,1,1574,
-809,1,1958,3320,16,
-0,125,1,52,3321,
-19,124,1,52,3322,
-5,53,1,0,3323,
-16,0,122,1,2726,
-3217,1,2727,3238,1,
-2728,3243,1,2075,3324,
-16,0,122,1,1860,
-831,1,1804,3325,16,
-0,122,1,10,3326,
-16,0,122,1,2413,
-3327,16,0,122,1,
-2198,3328,16,0,122,
-1,1873,845,1,21,
-3329,16,0,122,1,
-1657,903,1,2030,741,
-1,1989,925,1,1990,
-3330,16,0,122,1,
-2459,891,1,1775,3331,
-16,0,122,1,32,
-3332,16,0,122,1,
-2105,824,1,2106,3333,
-16,0,122,1,2654,
-3334,16,0,122,1,
-2227,917,1,2337,3335,
-16,0,122,1,2667,
-3248,1,52,3336,16,
-0,122,1,2695,3253,
-1,1803,797,1,2458,
-885,1,1901,3337,16,
-0,122,1,2462,898,
-1,2136,852,1,2464,
-908,1,2029,735,1,
-2466,3232,1,2031,746,
-1,2032,751,1,2033,
-756,1,2035,762,1,
-2364,837,1,2039,772,
-1,1931,870,1,2041,
-778,1,2021,728,1,
-2043,784,1,2045,789,
-1,2511,3338,16,0,
-122,1,2725,3211,1,
-2706,3222,1,2707,3339,
-16,0,122,1,2037,
-767,1,1574,809,1,
-1958,3340,16,0,122,
-1,53,3341,19,121,
-1,53,3342,5,53,
-1,0,3343,16,0,
-119,1,2726,3217,1,
-2727,3238,1,2728,3243,
-1,2075,3344,16,0,
-119,1,1860,831,1,
-1804,3345,16,0,119,
-1,10,3346,16,0,
-119,1,2413,3347,16,
-0,119,1,2198,3348,
-16,0,119,1,1873,
-845,1,21,3349,16,
-0,119,1,1657,903,
-1,2030,741,1,1989,
-925,1,1990,3350,16,
-0,119,1,2459,891,
-1,1775,3351,16,0,
-119,1,32,3352,16,
-0,119,1,2105,824,
-1,2106,3353,16,0,
-119,1,2654,3354,16,
-0,119,1,2227,917,
-1,2337,3355,16,0,
-119,1,2667,3248,1,
-52,3356,16,0,119,
-1,2695,3253,1,1803,
-797,1,2458,885,1,
-1901,3357,16,0,119,
-1,2462,898,1,2136,
-852,1,2464,908,1,
-2029,735,1,2466,3232,
-1,2031,746,1,2032,
-751,1,2033,756,1,
-2035,762,1,2364,837,
-1,2039,772,1,1931,
-870,1,2041,778,1,
-2021,728,1,2043,784,
-1,2045,789,1,2511,
-3358,16,0,119,1,
-2725,3211,1,2706,3222,
-1,2707,3359,16,0,
-119,1,2037,767,1,
-1574,809,1,1958,3360,
+0,50,0,1,157,
+1,3,1,7,1,
+6,3306,22,1,10,
+1,2667,719,1,2668,
+707,1,2734,3307,16,
+0,678,1,48,3308,
+19,348,1,48,3309,
+5,54,1,0,3310,
+16,0,346,1,2075,
+3311,16,0,518,1,
+1860,850,1,1803,816,
+1,1804,3312,16,0,
+518,1,2413,3313,16,
+0,518,1,2741,3261,
+1,2742,3267,1,2743,
+3272,1,2744,3277,1,
+1873,864,1,1657,922,
+1,2030,760,1,1989,
+944,1,1990,3314,16,
+0,518,1,2459,910,
+1,1775,3315,16,0,
+518,1,32,3316,16,
+0,518,1,2105,843,
+1,2106,3317,16,0,
+518,1,2576,713,1,
+2683,3291,1,2660,735,
+1,2227,936,1,2337,
+3318,16,0,518,1,
+2667,719,1,2037,786,
+1,2021,747,1,2458,
+904,1,1901,3319,16,
+0,518,1,2462,917,
+1,2136,871,1,2464,
+927,1,2029,754,1,
+2466,3302,1,2031,765,
+1,2032,770,1,2033,
+775,1,2035,781,1,
+2364,856,1,2039,791,
+1,1931,889,1,2041,
+797,1,2043,803,1,
+2045,808,1,2664,3320,
+16,0,346,1,2198,
+3321,16,0,518,1,
+2668,707,1,2711,3282,
+1,2734,3322,16,0,
+346,1,1574,828,1,
+1958,3323,16,0,518,
+1,2722,3297,1,2723,
+3324,16,0,346,1,
+49,3325,19,523,1,
+49,3326,5,38,1,
+1901,3327,16,0,521,
+1,2075,3328,16,0,
+521,1,1860,850,1,
+1803,816,1,1804,3329,
+16,0,521,1,2413,
+3330,16,0,521,1,
+2198,3331,16,0,521,
+1,1873,864,1,1657,
+922,1,1989,944,1,
+1990,3332,16,0,521,
+1,1775,3333,16,0,
+521,1,32,3334,16,
+0,521,1,2105,843,
+1,2106,3335,16,0,
+521,1,2364,856,1,
+2227,936,1,2337,3336,
+16,0,521,1,2021,
+747,1,2458,904,1,
+2459,910,1,2462,917,
+1,2136,871,1,2464,
+927,1,2029,754,1,
+2030,760,1,2031,765,
+1,2032,770,1,2033,
+775,1,2035,781,1,
+2037,786,1,2039,791,
+1,1931,889,1,2041,
+797,1,2043,803,1,
+2045,808,1,1574,828,
+1,1958,3337,16,0,
+521,1,50,3338,19,
+640,1,50,3339,5,
+38,1,1901,3340,16,
+0,638,1,2075,3341,
+16,0,638,1,1860,
+850,1,1803,816,1,
+1804,3342,16,0,638,
+1,2413,3343,16,0,
+638,1,2198,3344,16,
+0,638,1,1873,864,
+1,1657,922,1,1989,
+944,1,1990,3345,16,
+0,638,1,1775,3346,
+16,0,638,1,32,
+3347,16,0,638,1,
+2105,843,1,2106,3348,
+16,0,638,1,2364,
+856,1,2227,936,1,
+2337,3349,16,0,638,
+1,2021,747,1,2458,
+904,1,2459,910,1,
+2462,917,1,2136,871,
+1,2464,927,1,2029,
+754,1,2030,760,1,
+2031,765,1,2032,770,
+1,2033,775,1,2035,
+781,1,2037,786,1,
+2039,791,1,1931,889,
+1,2041,797,1,2043,
+803,1,2045,808,1,
+1574,828,1,1958,3350,
+16,0,638,1,51,
+3351,19,127,1,51,
+3352,5,54,1,0,
+3353,16,0,125,1,
+2075,3354,16,0,125,
+1,1860,850,1,1804,
+3355,16,0,125,1,
+10,3356,16,0,125,
+1,2520,3357,16,0,
+125,1,2337,3358,16,
+0,125,1,2413,3359,
+16,0,125,1,2741,
+3261,1,2742,3267,1,
+2743,3272,1,2744,3277,
+1,1873,864,1,21,
+3360,16,0,125,1,
+1657,922,1,2030,760,
+1,1989,944,1,1990,
+3361,16,0,125,1,
+1775,3362,16,0,125,
+1,32,3363,16,0,
+125,1,2105,843,1,
+2106,3364,16,0,125,
+1,2683,3291,1,2227,
+936,1,1901,3365,16,
+0,125,1,52,3366,
+16,0,125,1,2670,
+3367,16,0,125,1,
+1803,816,1,2458,904,
+1,2459,910,1,2462,
+917,1,2136,871,1,
+2464,927,1,2029,754,
+1,2466,3302,1,2031,
+765,1,2032,770,1,
+2033,775,1,2035,781,
+1,2364,856,1,2039,
+791,1,1931,889,1,
+2041,797,1,2021,747,
+1,2043,803,1,2045,
+808,1,2511,3368,16,
+0,449,1,2198,3369,
+16,0,125,1,2711,
+3282,1,2037,786,1,
+1574,828,1,1958,3370,
+16,0,125,1,2722,
+3297,1,2723,3371,16,
+0,125,1,52,3372,
+19,124,1,52,3373,
+5,53,1,0,3374,
+16,0,122,1,2075,
+3375,16,0,122,1,
+1860,850,1,1804,3376,
+16,0,122,1,10,
+3377,16,0,122,1,
+2520,3378,16,0,122,
+1,2337,3379,16,0,
+122,1,2413,3380,16,
+0,122,1,2741,3261,
+1,2742,3267,1,2743,
+3272,1,2744,3277,1,
+1873,864,1,21,3381,
+16,0,122,1,1657,
+922,1,2030,760,1,
+1989,944,1,1990,3382,
+16,0,122,1,1775,
+3383,16,0,122,1,
+32,3384,16,0,122,
+1,2105,843,1,2106,
+3385,16,0,122,1,
+2683,3291,1,2227,936,
+1,1901,3386,16,0,
+122,1,52,3387,16,
+0,122,1,2670,3388,
+16,0,122,1,1803,
+816,1,2458,904,1,
+2459,910,1,2462,917,
+1,2136,871,1,2464,
+927,1,2029,754,1,
+2466,3302,1,2031,765,
+1,2032,770,1,2033,
+775,1,2035,781,1,
+2364,856,1,2039,791,
+1,1931,889,1,2041,
+797,1,2021,747,1,
+2043,803,1,2045,808,
+1,2198,3389,16,0,
+122,1,2711,3282,1,
+2037,786,1,1574,828,
+1,1958,3390,16,0,
+122,1,2722,3297,1,
+2723,3391,16,0,122,
+1,53,3392,19,121,
+1,53,3393,5,53,
+1,0,3394,16,0,
+119,1,2075,3395,16,
+0,119,1,1860,850,
+1,1804,3396,16,0,
+119,1,10,3397,16,
+0,119,1,2520,3398,
+16,0,119,1,2337,
+3399,16,0,119,1,
+2413,3400,16,0,119,
+1,2741,3261,1,2742,
+3267,1,2743,3272,1,
+2744,3277,1,1873,864,
+1,21,3401,16,0,
+119,1,1657,922,1,
+2030,760,1,1989,944,
+1,1990,3402,16,0,
+119,1,1775,3403,16,
+0,119,1,32,3404,
+16,0,119,1,2105,
+843,1,2106,3405,16,
+0,119,1,2683,3291,
+1,2227,936,1,1901,
+3406,16,0,119,1,
+52,3407,16,0,119,
+1,2670,3408,16,0,
+119,1,1803,816,1,
+2458,904,1,2459,910,
+1,2462,917,1,2136,
+871,1,2464,927,1,
+2029,754,1,2466,3302,
+1,2031,765,1,2032,
+770,1,2033,775,1,
+2035,781,1,2364,856,
+1,2039,791,1,1931,
+889,1,2041,797,1,
+2021,747,1,2043,803,
+1,2045,808,1,2198,
+3409,16,0,119,1,
+2711,3282,1,2037,786,
+1,1574,828,1,1958,
+3410,16,0,119,1,
+2722,3297,1,2723,3411,
 16,0,119,1,54,
-3361,19,118,1,54,
-3362,5,53,1,0,
-3363,16,0,116,1,
-2726,3217,1,2727,3238,
-1,2728,3243,1,2075,
-3364,16,0,116,1,
-1860,831,1,1804,3365,
-16,0,116,1,10,
-3366,16,0,116,1,
-2413,3367,16,0,116,
-1,2198,3368,16,0,
-116,1,1873,845,1,
-21,3369,16,0,116,
-1,1657,903,1,2030,
-741,1,1989,925,1,
-1990,3370,16,0,116,
-1,2459,891,1,1775,
-3371,16,0,116,1,
-32,3372,16,0,116,
-1,2105,824,1,2106,
-3373,16,0,116,1,
-2654,3374,16,0,116,
-1,2227,917,1,2337,
-3375,16,0,116,1,
-2667,3248,1,52,3376,
-16,0,116,1,2695,
-3253,1,1803,797,1,
-2458,885,1,1901,3377,
-16,0,116,1,2462,
-898,1,2136,852,1,
-2464,908,1,2029,735,
-1,2466,3232,1,2031,
-746,1,2032,751,1,
-2033,756,1,2035,762,
-1,2364,837,1,2039,
-772,1,1931,870,1,
-2041,778,1,2021,728,
-1,2043,784,1,2045,
-789,1,2511,3378,16,
-0,116,1,2725,3211,
-1,2706,3222,1,2707,
-3379,16,0,116,1,
-2037,767,1,1574,809,
-1,1958,3380,16,0,
-116,1,55,3381,19,
-115,1,55,3382,5,
-53,1,0,3383,16,
-0,113,1,2726,3217,
-1,2727,3238,1,2728,
-3243,1,2075,3384,16,
-0,113,1,1860,831,
-1,1804,3385,16,0,
-113,1,10,3386,16,
-0,113,1,2413,3387,
-16,0,113,1,2198,
-3388,16,0,113,1,
-1873,845,1,21,3389,
-16,0,113,1,1657,
-903,1,2030,741,1,
-1989,925,1,1990,3390,
-16,0,113,1,2459,
-891,1,1775,3391,16,
-0,113,1,32,3392,
-16,0,113,1,2105,
-824,1,2106,3393,16,
-0,113,1,2654,3394,
-16,0,113,1,2227,
-917,1,2337,3395,16,
-0,113,1,2667,3248,
-1,52,3396,16,0,
-113,1,2695,3253,1,
-1803,797,1,2458,885,
-1,1901,3397,16,0,
-113,1,2462,898,1,
-2136,852,1,2464,908,
-1,2029,735,1,2466,
-3232,1,2031,746,1,
-2032,751,1,2033,756,
-1,2035,762,1,2364,
-837,1,2039,772,1,
-1931,870,1,2041,778,
-1,2021,728,1,2043,
-784,1,2045,789,1,
-2511,3398,16,0,113,
-1,2725,3211,1,2706,
-3222,1,2707,3399,16,
-0,113,1,2037,767,
-1,1574,809,1,1958,
-3400,16,0,113,1,
-56,3401,19,112,1,
-56,3402,5,53,1,
-0,3403,16,0,110,
-1,2726,3217,1,2727,
-3238,1,2728,3243,1,
-2075,3404,16,0,110,
-1,1860,831,1,1804,
-3405,16,0,110,1,
-10,3406,16,0,110,
-1,2413,3407,16,0,
-110,1,2198,3408,16,
-0,110,1,1873,845,
-1,21,3409,16,0,
-110,1,1657,903,1,
-2030,741,1,1989,925,
-1,1990,3410,16,0,
-110,1,2459,891,1,
-1775,3411,16,0,110,
-1,32,3412,16,0,
-110,1,2105,824,1,
-2106,3413,16,0,110,
-1,2654,3414,16,0,
-110,1,2227,917,1,
-2337,3415,16,0,110,
-1,2667,3248,1,52,
-3416,16,0,110,1,
-2695,3253,1,1803,797,
-1,2458,885,1,1901,
-3417,16,0,110,1,
-2462,898,1,2136,852,
-1,2464,908,1,2029,
-735,1,2466,3232,1,
-2031,746,1,2032,751,
-1,2033,756,1,2035,
-762,1,2364,837,1,
-2039,772,1,1931,870,
-1,2041,778,1,2021,
-728,1,2043,784,1,
-2045,789,1,2511,3418,
-16,0,110,1,2725,
-3211,1,2706,3222,1,
-2707,3419,16,0,110,
-1,2037,767,1,1574,
-809,1,1958,3420,16,
-0,110,1,57,3421,
-19,109,1,57,3422,
-5,53,1,0,3423,
-16,0,107,1,2726,
-3217,1,2727,3238,1,
-2728,3243,1,2075,3424,
-16,0,107,1,1860,
-831,1,1804,3425,16,
-0,107,1,10,3426,
-16,0,107,1,2413,
-3427,16,0,107,1,
-2198,3428,16,0,107,
-1,1873,845,1,21,
-3429,16,0,107,1,
-1657,903,1,2030,741,
-1,1989,925,1,1990,
-3430,16,0,107,1,
-2459,891,1,1775,3431,
-16,0,107,1,32,
-3432,16,0,107,1,
-2105,824,1,2106,3433,
-16,0,107,1,2654,
-3434,16,0,107,1,
-2227,917,1,2337,3435,
-16,0,107,1,2667,
-3248,1,52,3436,16,
-0,107,1,2695,3253,
-1,1803,797,1,2458,
-885,1,1901,3437,16,
-0,107,1,2462,898,
-1,2136,852,1,2464,
-908,1,2029,735,1,
-2466,3232,1,2031,746,
-1,2032,751,1,2033,
-756,1,2035,762,1,
-2364,837,1,2039,772,
-1,1931,870,1,2041,
-778,1,2021,728,1,
-2043,784,1,2045,789,
-1,2511,3438,16,0,
-107,1,2725,3211,1,
-2706,3222,1,2707,3439,
-16,0,107,1,2037,
-767,1,1574,809,1,
-1958,3440,16,0,107,
-1,58,3441,19,437,
-1,58,3442,5,12,
-1,2524,1636,1,2526,
-3443,16,0,435,1,
-2564,1655,1,2566,1660,
-1,2567,1644,1,2606,
-3444,16,0,435,1,
-2459,891,1,2563,1650,
-1,2464,908,1,2569,
-3445,16,0,435,1,
-2470,3446,16,0,435,
-1,2509,1629,1,59,
-3447,19,434,1,59,
-3448,5,12,1,2524,
-1636,1,2526,3449,16,
-0,432,1,2564,1655,
-1,2566,1660,1,2567,
-1644,1,2606,3450,16,
-0,432,1,2459,891,
-1,2563,1650,1,2464,
-908,1,2569,3451,16,
-0,432,1,2470,3452,
-16,0,432,1,2509,
-1629,1,60,3453,19,
-431,1,60,3454,5,
-12,1,2524,1636,1,
-2526,3455,16,0,429,
-1,2564,1655,1,2566,
-1660,1,2567,1644,1,
-2606,3456,16,0,429,
-1,2459,891,1,2563,
-1650,1,2464,908,1,
-2569,3457,16,0,429,
-1,2470,3458,16,0,
-429,1,2509,1629,1,
-61,3459,19,428,1,
-61,3460,5,12,1,
-2524,1636,1,2526,3461,
-16,0,426,1,2564,
-1655,1,2566,1660,1,
-2567,1644,1,2606,3462,
-16,0,426,1,2459,
-891,1,2563,1650,1,
-2464,908,1,2569,3463,
-16,0,426,1,2470,
-3464,16,0,426,1,
-2509,1629,1,62,3465,
-19,425,1,62,3466,
-5,12,1,2524,1636,
-1,2526,3467,16,0,
-423,1,2564,1655,1,
-2566,1660,1,2567,1644,
-1,2606,3468,16,0,
-423,1,2459,891,1,
-2563,1650,1,2464,908,
-1,2569,3469,16,0,
-423,1,2470,3470,16,
-0,423,1,2509,1629,
-1,63,3471,19,422,
-1,63,3472,5,12,
-1,2524,1636,1,2526,
-3473,16,0,420,1,
-2564,1655,1,2566,1660,
-1,2567,1644,1,2606,
-3474,16,0,420,1,
-2459,891,1,2563,1650,
-1,2464,908,1,2569,
-3475,16,0,420,1,
-2470,3476,16,0,420,
-1,2509,1629,1,64,
-3477,19,663,1,64,
-3478,5,12,1,2524,
-1636,1,2526,3479,16,
-0,661,1,2564,1655,
-1,2566,1660,1,2567,
-1644,1,2606,3480,16,
-0,661,1,2459,891,
-1,2563,1650,1,2464,
-908,1,2569,3481,16,
-0,661,1,2470,3482,
-16,0,661,1,2509,
-1629,1,65,3483,19,
-418,1,65,3484,5,
-12,1,2524,1636,1,
-2526,3485,16,0,416,
-1,2564,1655,1,2566,
-1660,1,2567,1644,1,
-2606,3486,16,0,416,
-1,2459,891,1,2563,
-1650,1,2464,908,1,
-2569,3487,16,0,416,
-1,2470,3488,16,0,
-416,1,2509,1629,1,
-66,3489,19,503,1,
-66,3490,5,12,1,
-2524,1636,1,2526,3491,
-16,0,501,1,2564,
-1655,1,2566,1660,1,
-2567,1644,1,2606,3492,
-16,0,501,1,2459,
-891,1,2563,1650,1,
-2464,908,1,2569,3493,
-16,0,501,1,2470,
-3494,16,0,501,1,
-2509,1629,1,67,3495,
-19,414,1,67,3496,
-5,12,1,2524,1636,
-1,2526,3497,16,0,
-412,1,2564,1655,1,
-2566,1660,1,2567,1644,
-1,2606,3498,16,0,
-412,1,2459,891,1,
-2563,1650,1,2464,908,
-1,2569,3499,16,0,
-412,1,2470,3500,16,
-0,412,1,2509,1629,
-1,68,3501,19,411,
-1,68,3502,5,12,
-1,2524,1636,1,2526,
-3503,16,0,409,1,
-2564,1655,1,2566,1660,
-1,2567,1644,1,2606,
-3504,16,0,409,1,
-2459,891,1,2563,1650,
-1,2464,908,1,2569,
-3505,16,0,409,1,
-2470,3506,16,0,409,
-1,2509,1629,1,69,
-3507,19,496,1,69,
-3508,5,12,1,2524,
-1636,1,2526,3509,16,
-0,494,1,2564,1655,
-1,2566,1660,1,2567,
-1644,1,2606,3510,16,
-0,494,1,2459,891,
-1,2563,1650,1,2464,
-908,1,2569,3511,16,
-0,494,1,2470,3512,
-16,0,494,1,2509,
-1629,1,70,3513,19,
-407,1,70,3514,5,
-12,1,2524,1636,1,
-2526,3515,16,0,405,
-1,2564,1655,1,2566,
-1660,1,2567,1644,1,
-2606,3516,16,0,405,
-1,2459,891,1,2563,
-1650,1,2464,908,1,
-2569,3517,16,0,405,
-1,2470,3518,16,0,
-405,1,2509,1629,1,
-71,3519,19,493,1,
-71,3520,5,12,1,
-2524,1636,1,2526,3521,
-16,0,491,1,2564,
-1655,1,2566,1660,1,
-2567,1644,1,2606,3522,
-16,0,491,1,2459,
-891,1,2563,1650,1,
-2464,908,1,2569,3523,
-16,0,491,1,2470,
-3524,16,0,491,1,
-2509,1629,1,72,3525,
-19,490,1,72,3526,
-5,12,1,2524,1636,
-1,2526,3527,16,0,
-488,1,2564,1655,1,
-2566,1660,1,2567,1644,
-1,2606,3528,16,0,
-488,1,2459,891,1,
-2563,1650,1,2464,908,
-1,2569,3529,16,0,
-488,1,2470,3530,16,
-0,488,1,2509,1629,
-1,73,3531,19,487,
-1,73,3532,5,12,
-1,2524,1636,1,2526,
-3533,16,0,485,1,
-2564,1655,1,2566,1660,
-1,2567,1644,1,2606,
-3534,16,0,485,1,
-2459,891,1,2563,1650,
-1,2464,908,1,2569,
-3535,16,0,485,1,
-2470,3536,16,0,485,
-1,2509,1629,1,74,
-3537,19,484,1,74,
-3538,5,12,1,2524,
-1636,1,2526,3539,16,
-0,482,1,2564,1655,
-1,2566,1660,1,2567,
-1644,1,2606,3540,16,
-0,482,1,2459,891,
-1,2563,1650,1,2464,
-908,1,2569,3541,16,
-0,482,1,2470,3542,
-16,0,482,1,2509,
-1629,1,75,3543,19,
-364,1,75,3544,5,
-12,1,2524,1636,1,
-2526,3545,16,0,362,
-1,2564,1655,1,2566,
-1660,1,2567,1644,1,
-2606,3546,16,0,362,
-1,2459,891,1,2563,
-1650,1,2464,908,1,
-2569,3547,16,0,362,
-1,2470,3548,16,0,
-362,1,2509,1629,1,
-76,3549,19,361,1,
-76,3550,5,12,1,
-2524,1636,1,2526,3551,
-16,0,359,1,2564,
-1655,1,2566,1660,1,
-2567,1644,1,2606,3552,
-16,0,359,1,2459,
-891,1,2563,1650,1,
-2464,908,1,2569,3553,
-16,0,359,1,2470,
-3554,16,0,359,1,
-2509,1629,1,77,3555,
-19,398,1,77,3556,
-5,12,1,2524,1636,
-1,2526,3557,16,0,
-396,1,2564,1655,1,
-2566,1660,1,2567,1644,
-1,2606,3558,16,0,
-396,1,2459,891,1,
-2563,1650,1,2464,908,
-1,2569,3559,16,0,
-396,1,2470,3560,16,
-0,396,1,2509,1629,
-1,78,3561,19,358,
-1,78,3562,5,12,
-1,2524,1636,1,2526,
-3563,16,0,356,1,
-2564,1655,1,2566,1660,
-1,2567,1644,1,2606,
-3564,16,0,356,1,
-2459,891,1,2563,1650,
-1,2464,908,1,2569,
-3565,16,0,356,1,
-2470,3566,16,0,356,
-1,2509,1629,1,79,
-3567,19,355,1,79,
-3568,5,12,1,2524,
-1636,1,2526,3569,16,
-0,353,1,2564,1655,
-1,2566,1660,1,2567,
-1644,1,2606,3570,16,
-0,353,1,2459,891,
-1,2563,1650,1,2464,
-908,1,2569,3571,16,
-0,353,1,2470,3572,
-16,0,353,1,2509,
-1629,1,80,3573,19,
-395,1,80,3574,5,
-12,1,2524,1636,1,
-2526,3575,16,0,393,
-1,2564,1655,1,2566,
-1660,1,2567,1644,1,
-2606,3576,16,0,393,
-1,2459,891,1,2563,
-1650,1,2464,908,1,
-2569,3577,16,0,393,
-1,2470,3578,16,0,
-393,1,2509,1629,1,
-81,3579,19,477,1,
-81,3580,5,12,1,
-2524,1636,1,2526,3581,
-16,0,475,1,2564,
-1655,1,2566,1660,1,
-2567,1644,1,2606,3582,
-16,0,475,1,2459,
-891,1,2563,1650,1,
-2464,908,1,2569,3583,
-16,0,475,1,2470,
-3584,16,0,475,1,
-2509,1629,1,82,3585,
-19,571,1,82,3586,
-5,12,1,2524,1636,
-1,2526,3587,16,0,
-569,1,2564,1655,1,
-2566,1660,1,2567,1644,
-1,2606,3588,16,0,
-569,1,2459,891,1,
-2563,1650,1,2464,908,
-1,2569,3589,16,0,
-569,1,2470,3590,16,
-0,569,1,2509,1629,
-1,83,3591,19,388,
-1,83,3592,5,12,
-1,2524,1636,1,2526,
-3593,16,0,386,1,
-2564,1655,1,2566,1660,
-1,2567,1644,1,2606,
-3594,16,0,386,1,
-2459,891,1,2563,1650,
-1,2464,908,1,2569,
-3595,16,0,386,1,
-2470,3596,16,0,386,
-1,2509,1629,1,84,
-3597,19,385,1,84,
-3598,5,12,1,2524,
-1636,1,2526,3599,16,
-0,383,1,2564,1655,
-1,2566,1660,1,2567,
-1644,1,2606,3600,16,
-0,383,1,2459,891,
-1,2563,1650,1,2464,
-908,1,2569,3601,16,
-0,383,1,2470,3602,
-16,0,383,1,2509,
-1629,1,85,3603,19,
-370,1,85,3604,5,
-12,1,2524,1636,1,
-2526,3605,16,0,368,
-1,2564,1655,1,2566,
-1660,1,2567,1644,1,
-2606,3606,16,0,368,
-1,2459,891,1,2563,
-1650,1,2464,908,1,
-2569,3607,16,0,368,
-1,2470,3608,16,0,
-368,1,2509,1629,1,
-86,3609,19,367,1,
-86,3610,5,12,1,
-2524,1636,1,2526,3611,
-16,0,365,1,2564,
-1655,1,2566,1660,1,
-2567,1644,1,2606,3612,
-16,0,365,1,2459,
-891,1,2563,1650,1,
-2464,908,1,2569,3613,
-16,0,365,1,2470,
-3614,16,0,365,1,
-2509,1629,1,87,3615,
-19,352,1,87,3616,
-5,12,1,2524,1636,
-1,2526,3617,16,0,
-350,1,2564,1655,1,
-2566,1660,1,2567,1644,
-1,2606,3618,16,0,
-350,1,2459,891,1,
-2563,1650,1,2464,908,
-1,2569,3619,16,0,
-350,1,2470,3620,16,
-0,350,1,2509,1629,
-1,88,3621,19,382,
-1,88,3622,5,12,
-1,2524,1636,1,2526,
-3623,16,0,380,1,
-2564,1655,1,2566,1660,
-1,2567,1644,1,2606,
-3624,16,0,380,1,
-2459,891,1,2563,1650,
-1,2464,908,1,2569,
-3625,16,0,380,1,
-2470,3626,16,0,380,
-1,2509,1629,1,89,
-3627,19,376,1,89,
-3628,5,12,1,2524,
-1636,1,2526,3629,16,
-0,374,1,2564,1655,
-1,2566,1660,1,2567,
-1644,1,2606,3630,16,
-0,374,1,2459,891,
-1,2563,1650,1,2464,
-908,1,2569,3631,16,
-0,374,1,2470,3632,
-16,0,374,1,2509,
-1629,1,90,3633,19,
-379,1,90,3634,5,
-12,1,2524,1636,1,
-2526,3635,16,0,377,
-1,2564,1655,1,2566,
-1660,1,2567,1644,1,
-2606,3636,16,0,377,
-1,2459,891,1,2563,
-1650,1,2464,908,1,
-2569,3637,16,0,377,
-1,2470,3638,16,0,
-377,1,2509,1629,1,
-91,3639,19,373,1,
-91,3640,5,12,1,
-2524,1636,1,2526,3641,
-16,0,371,1,2564,
-1655,1,2566,1660,1,
-2567,1644,1,2606,3642,
-16,0,371,1,2459,
-891,1,2563,1650,1,
-2464,908,1,2569,3643,
-16,0,371,1,2470,
-3644,16,0,371,1,
-2509,1629,1,92,3645,
-19,133,1,92,3646,
-5,125,1,0,3647,
-16,0,585,1,1,
-1980,1,2,1986,1,
-3,1991,1,4,1996,
-1,5,2001,1,6,
-2006,1,7,2011,1,
-8,3648,16,0,131,
-1,1515,3649,16,0,
-174,1,2021,728,1,
-2022,3650,16,0,507,
-1,256,3651,16,0,
-182,1,2025,3652,16,
-0,511,1,18,3653,
-16,0,138,1,2027,
-3654,16,0,515,1,
-2695,3253,1,2029,735,
-1,2030,741,1,2031,
-746,1,2032,751,1,
-2033,756,1,277,3655,
-16,0,182,1,2035,
-762,1,2037,767,1,
-2039,772,1,32,3656,
-16,0,174,1,2041,
-778,1,2293,3657,16,
-0,182,1,2043,784,
-1,2045,789,1,41,
-3658,16,0,182,1,
-1297,3659,16,0,174,
-1,43,3660,16,0,
-182,1,46,3661,16,
-0,187,1,1804,3662,
-16,0,174,1,299,
-3663,16,0,182,1,
-2725,3211,1,52,3664,
-16,0,174,1,509,
-3665,16,0,182,1,
-2318,3666,16,0,174,
-1,62,3667,16,0,
-205,1,65,3668,16,
-0,207,1,2075,3669,
-16,0,174,1,1574,
-809,1,71,3670,16,
-0,182,1,1775,3671,
-16,0,174,1,76,
-3672,16,0,182,1,
-1834,3673,16,0,174,
-1,2337,3674,16,0,
-174,1,79,3675,16,
-0,182,1,1335,3676,
-16,0,174,1,322,
-3677,16,0,182,1,
-85,3678,16,0,182,
-1,1261,3679,16,0,
-174,1,89,3680,16,
-0,182,1,346,3681,
-16,0,182,1,97,
-3682,16,0,182,1,
-2106,3683,16,0,174,
-1,102,3684,16,0,
-182,1,1860,831,1,
-1803,797,1,2364,837,
-1,1113,3685,16,0,
-167,1,112,3686,16,
-0,182,1,1117,3687,
-16,0,174,1,1873,
-845,1,1876,3688,16,
-0,174,1,372,3689,
-16,0,545,1,374,
-3690,16,0,547,1,
-124,3691,16,0,182,
-1,376,3692,16,0,
-549,1,378,3693,16,
-0,551,1,2136,852,
-1,381,3694,16,0,
-182,1,525,3695,16,
-0,182,1,137,3696,
-16,0,182,1,1901,
-3697,16,0,174,1,
-1153,3698,16,0,174,
-1,151,3699,16,0,
-182,1,1407,3700,16,
-0,174,1,1659,3701,
-16,0,174,1,2413,
-3702,16,0,174,1,
-406,3703,16,0,182,
-1,2667,3248,1,1371,
-3704,16,0,174,1,
-2105,824,1,166,3705,
-16,0,182,1,1622,
-3706,16,0,182,1,
-1931,870,1,1933,3707,
-16,0,174,1,431,
-3708,16,0,182,1,
-1585,3709,16,0,182,
-1,182,3710,16,0,
-182,1,1189,3711,16,
-0,174,1,1443,3712,
-16,0,174,1,1695,
-3713,16,0,174,1,
-2198,3714,16,0,174,
-1,2706,3222,1,2707,
-3715,16,0,585,1,
-2458,885,1,2459,891,
-1,1958,3716,16,0,
-174,1,2462,898,1,
-1657,903,1,2464,908,
-1,2466,3232,1,459,
-3717,16,0,182,1,
-2468,3718,16,0,348,
-1,447,3719,16,0,
-182,1,199,3720,16,
-0,182,1,2726,3217,
-1,2727,3238,1,2728,
-3243,1,2227,917,1,
-1225,3721,16,0,174,
-1,1479,3722,16,0,
-174,1,1731,3723,16,
-0,182,1,462,3724,
-16,0,182,1,1989,
-925,1,1990,3725,16,
-0,174,1,236,3726,
-16,0,182,1,217,
-3727,16,0,182,1,
-2670,3728,16,0,182,
-1,1756,3729,16,0,
-174,1,93,3730,19,
-639,1,93,3731,5,
-95,1,256,3732,16,
-0,637,1,1261,3733,
-16,0,637,1,509,
-3734,16,0,637,1,
-1515,3735,16,0,637,
-1,2021,728,1,1775,
-3736,16,0,637,1,
-2029,735,1,2030,741,
-1,2031,746,1,2032,
-751,1,2033,756,1,
-277,3737,16,0,637,
-1,2035,762,1,2037,
-767,1,2039,772,1,
-32,3738,16,0,637,
-1,2041,778,1,2293,
-3739,16,0,637,1,
-2043,784,1,2045,789,
-1,41,3740,16,0,
-637,1,1297,3741,16,
-0,637,1,43,3742,
-16,0,637,1,1803,
-797,1,1804,3743,16,
-0,637,1,299,3744,
-16,0,637,1,52,
-3745,16,0,637,1,
-2318,3746,16,0,637,
-1,62,3747,16,0,
-637,1,2075,3748,16,
-0,637,1,1574,809,
-1,71,3749,16,0,
-637,1,76,3750,16,
-0,637,1,1834,3751,
-16,0,637,1,2337,
-3752,16,0,637,1,
-79,3753,16,0,637,
-1,1335,3754,16,0,
-637,1,322,3755,16,
-0,637,1,85,3756,
-16,0,637,1,89,
-3757,16,0,637,1,
-346,3758,16,0,637,
-1,2105,824,1,2106,
-3759,16,0,637,1,
-97,3760,16,0,637,
-1,1860,831,1,2364,
-837,1,102,3761,16,
-0,637,1,112,3762,
-16,0,637,1,1117,
-3763,16,0,637,1,
-1873,845,1,1876,3764,
-16,0,637,1,124,
-3765,16,0,637,1,
-2136,852,1,381,3766,
-16,0,637,1,525,
-3767,16,0,637,1,
-137,3768,16,0,637,
-1,1901,3769,16,0,
-637,1,1153,3770,16,
-0,637,1,151,3771,
-16,0,637,1,1407,
-3772,16,0,637,1,
-1659,3773,16,0,637,
-1,2413,3774,16,0,
-637,1,406,3775,16,
-0,637,1,1371,3776,
-16,0,637,1,166,
-3777,16,0,637,1,
-1622,3778,16,0,637,
-1,1931,870,1,1933,
-3779,16,0,637,1,
-431,3780,16,0,637,
-1,1585,3781,16,0,
-637,1,182,3782,16,
-0,637,1,1189,3783,
-16,0,637,1,1443,
-3784,16,0,637,1,
-1695,3785,16,0,637,
-1,2198,3786,16,0,
-637,1,447,3787,16,
-0,637,1,2458,885,
-1,2459,891,1,1958,
-3788,16,0,637,1,
-2462,898,1,1657,903,
-1,2464,908,1,199,
-3789,16,0,637,1,
-459,3790,16,0,637,
-1,462,3791,16,0,
-637,1,217,3792,16,
-0,637,1,2227,917,
-1,1225,3793,16,0,
-637,1,1479,3794,16,
-0,637,1,1731,3795,
-16,0,637,1,1989,
-925,1,1990,3796,16,
-0,637,1,236,3797,
-16,0,637,1,2670,
-3798,16,0,637,1,
-1756,3799,16,0,637,
-1,94,3800,19,636,
-1,94,3801,5,95,
-1,256,3802,16,0,
-634,1,1261,3803,16,
-0,634,1,509,3804,
-16,0,634,1,1515,
-3805,16,0,634,1,
-2021,728,1,1775,3806,
-16,0,634,1,2029,
-735,1,2030,741,1,
-2031,746,1,2032,751,
-1,2033,756,1,277,
-3807,16,0,634,1,
-2035,762,1,2037,767,
-1,2039,772,1,32,
-3808,16,0,634,1,
-2041,778,1,2293,3809,
-16,0,634,1,2043,
-784,1,2045,789,1,
-41,3810,16,0,634,
-1,1297,3811,16,0,
-634,1,43,3812,16,
-0,634,1,1803,797,
-1,1804,3813,16,0,
-634,1,299,3814,16,
-0,634,1,52,3815,
-16,0,634,1,2318,
-3816,16,0,634,1,
-62,3817,16,0,634,
-1,2075,3818,16,0,
-634,1,1574,809,1,
-71,3819,16,0,634,
-1,76,3820,16,0,
-634,1,1834,3821,16,
-0,634,1,2337,3822,
-16,0,634,1,79,
-3823,16,0,634,1,
-1335,3824,16,0,634,
-1,322,3825,16,0,
-634,1,85,3826,16,
-0,634,1,89,3827,
-16,0,634,1,346,
-3828,16,0,634,1,
-2105,824,1,2106,3829,
-16,0,634,1,97,
-3830,16,0,634,1,
-1860,831,1,2364,837,
-1,102,3831,16,0,
-634,1,112,3832,16,
-0,634,1,1117,3833,
-16,0,634,1,1873,
-845,1,1876,3834,16,
-0,634,1,124,3835,
-16,0,634,1,2136,
-852,1,381,3836,16,
-0,634,1,525,3837,
-16,0,634,1,137,
-3838,16,0,634,1,
-1901,3839,16,0,634,
-1,1153,3840,16,0,
-634,1,151,3841,16,
-0,634,1,1407,3842,
-16,0,634,1,1659,
-3843,16,0,634,1,
-2413,3844,16,0,634,
-1,406,3845,16,0,
-634,1,1371,3846,16,
-0,634,1,166,3847,
-16,0,634,1,1622,
-3848,16,0,634,1,
-1931,870,1,1933,3849,
-16,0,634,1,431,
-3850,16,0,634,1,
-1585,3851,16,0,634,
-1,182,3852,16,0,
-634,1,1189,3853,16,
-0,634,1,1443,3854,
-16,0,634,1,1695,
-3855,16,0,634,1,
-2198,3856,16,0,634,
-1,447,3857,16,0,
-634,1,2458,885,1,
-2459,891,1,1958,3858,
-16,0,634,1,2462,
-898,1,1657,903,1,
-2464,908,1,199,3859,
-16,0,634,1,459,
-3860,16,0,634,1,
-462,3861,16,0,634,
-1,217,3862,16,0,
-634,1,2227,917,1,
-1225,3863,16,0,634,
-1,1479,3864,16,0,
-634,1,1731,3865,16,
-0,634,1,1989,925,
-1,1990,3866,16,0,
-634,1,236,3867,16,
-0,634,1,2670,3868,
-16,0,634,1,1756,
-3869,16,0,634,1,
-95,3870,19,633,1,
-95,3871,5,95,1,
-256,3872,16,0,631,
-1,1261,3873,16,0,
-631,1,509,3874,16,
-0,631,1,1515,3875,
-16,0,631,1,2021,
-728,1,1775,3876,16,
-0,631,1,2029,735,
-1,2030,741,1,2031,
-746,1,2032,751,1,
-2033,756,1,277,3877,
-16,0,631,1,2035,
-762,1,2037,767,1,
-2039,772,1,32,3878,
-16,0,631,1,2041,
-778,1,2293,3879,16,
-0,631,1,2043,784,
-1,2045,789,1,41,
-3880,16,0,631,1,
-1297,3881,16,0,631,
-1,43,3882,16,0,
-631,1,1803,797,1,
-1804,3883,16,0,631,
-1,299,3884,16,0,
-631,1,52,3885,16,
-0,631,1,2318,3886,
-16,0,631,1,62,
-3887,16,0,631,1,
-2075,3888,16,0,631,
-1,1574,809,1,71,
-3889,16,0,631,1,
-76,3890,16,0,631,
-1,1834,3891,16,0,
-631,1,2337,3892,16,
-0,631,1,79,3893,
-16,0,631,1,1335,
-3894,16,0,631,1,
-322,3895,16,0,631,
-1,85,3896,16,0,
-631,1,89,3897,16,
-0,631,1,346,3898,
-16,0,631,1,2105,
-824,1,2106,3899,16,
-0,631,1,97,3900,
-16,0,631,1,1860,
-831,1,2364,837,1,
-102,3901,16,0,631,
-1,112,3902,16,0,
-631,1,1117,3903,16,
-0,631,1,1873,845,
-1,1876,3904,16,0,
-631,1,124,3905,16,
-0,631,1,2136,852,
-1,381,3906,16,0,
-631,1,525,3907,16,
-0,631,1,137,3908,
-16,0,631,1,1901,
-3909,16,0,631,1,
-1153,3910,16,0,631,
-1,151,3911,16,0,
-631,1,1407,3912,16,
-0,631,1,1659,3913,
-16,0,631,1,2413,
-3914,16,0,631,1,
-406,3915,16,0,631,
-1,1371,3916,16,0,
-631,1,166,3917,16,
-0,631,1,1622,3918,
-16,0,631,1,1931,
-870,1,1933,3919,16,
-0,631,1,431,3920,
-16,0,631,1,1585,
-3921,16,0,631,1,
-182,3922,16,0,631,
-1,1189,3923,16,0,
-631,1,1443,3924,16,
-0,631,1,1695,3925,
-16,0,631,1,2198,
-3926,16,0,631,1,
-447,3927,16,0,631,
-1,2458,885,1,2459,
-891,1,1958,3928,16,
-0,631,1,2462,898,
-1,1657,903,1,2464,
-908,1,199,3929,16,
-0,631,1,459,3930,
-16,0,631,1,462,
-3931,16,0,631,1,
-217,3932,16,0,631,
-1,2227,917,1,1225,
-3933,16,0,631,1,
-1479,3934,16,0,631,
-1,1731,3935,16,0,
-631,1,1989,925,1,
-1990,3936,16,0,631,
-1,236,3937,16,0,
-631,1,2670,3938,16,
-0,631,1,1756,3939,
-16,0,631,1,96,
-3940,19,103,1,96,
-3941,5,1,1,0,
-3942,16,0,104,1,
-97,3943,19,240,1,
-97,3944,5,1,1,
-0,3945,16,0,238,
-1,98,3946,19,649,
-1,98,3947,5,2,
-1,0,3948,16,0,
-651,1,2707,3949,16,
-0,647,1,99,3950,
-19,154,1,99,3951,
-5,2,1,0,3952,
-16,0,152,1,2707,
-3953,16,0,646,1,
-100,3954,19,580,1,
-100,3955,5,2,1,
-0,3956,16,0,578,
-1,2707,3957,16,0,
-644,1,101,3958,19,
-166,1,101,3959,5,
-4,1,0,3960,16,
-0,584,1,2707,3961,
-16,0,584,1,2718,
-3962,16,0,164,1,
-2648,3963,16,0,164,
-1,102,3964,19,455,
-1,102,3965,5,2,
-1,2470,3966,16,0,
-453,1,2569,3967,16,
-0,563,1,103,3968,
-19,577,1,103,3969,
-5,4,1,2470,3970,
-16,0,581,1,2526,
-3971,16,0,575,1,
-2569,3972,16,0,581,
-1,2606,3973,16,0,
-575,1,104,3974,19,
-481,1,104,3975,5,
-4,1,2470,3976,16,
-0,479,1,2526,3977,
-16,0,650,1,2569,
-3978,16,0,479,1,
-2606,3979,16,0,650,
-1,105,3980,19,141,
-1,105,3981,5,3,
-1,2511,3982,16,0,
-607,1,2654,3983,16,
-0,669,1,10,3984,
-16,0,139,1,106,
-3985,19,157,1,106,
-3986,5,17,1,0,
-3987,16,0,198,1,
-2075,3988,16,0,658,
-1,2337,3989,16,0,
-658,1,2413,3990,16,
-0,658,1,10,3991,
-16,0,344,1,2511,
-3992,16,0,344,1,
-1901,3993,16,0,658,
-1,2198,3994,16,0,
-658,1,2707,3995,16,
-0,198,1,21,3996,
-16,0,155,1,2106,
-3997,16,0,658,1,
-2654,3998,16,0,344,
-1,1804,3999,16,0,
-658,1,1990,4000,16,
-0,658,1,32,4001,
-16,0,658,1,1958,
-4002,16,0,658,1,
-1775,4003,16,0,658,
-1,107,4004,19,130,
-1,107,4005,5,18,
-1,0,4006,16,0,
-128,1,2075,4007,16,
-0,137,1,2337,4008,
-16,0,137,1,2413,
-4009,16,0,137,1,
-10,4010,16,0,137,
-1,2511,4011,16,0,
-137,1,2198,4012,16,
-0,137,1,1901,4013,
-16,0,137,1,52,
-4014,16,0,203,1,
-2707,4015,16,0,128,
-1,21,4016,16,0,
-137,1,2106,4017,16,
-0,137,1,2654,4018,
-16,0,137,1,1804,
-4019,16,0,137,1,
-1990,4020,16,0,137,
-1,32,4021,16,0,
-137,1,1958,4022,16,
-0,137,1,1775,4023,
-16,0,137,1,108,
-4024,19,446,1,108,
-4025,5,4,1,2470,
-4026,16,0,444,1,
-2526,4027,16,0,444,
-1,2569,4028,16,0,
-444,1,2606,4029,16,
-0,444,1,109,4030,
-19,668,1,109,4031,
-5,4,1,2470,4032,
-16,0,666,1,2526,
-4033,16,0,666,1,
-2569,4034,16,0,666,
-1,2606,4035,16,0,
-666,1,110,4036,19,
-343,1,110,4037,5,
-15,1,2665,4038,16,
-0,671,1,2075,4039,
-16,0,516,1,2337,
-4040,16,0,516,1,
-2507,4041,16,0,443,
-1,2413,4042,16,0,
-516,1,1901,4043,16,
-0,516,1,2198,4044,
-16,0,516,1,2106,
-4045,16,0,516,1,
-2522,4046,16,0,452,
-1,1804,4047,16,0,
-516,1,1990,4048,16,
-0,516,1,31,4049,
-16,0,341,1,32,
-4050,16,0,516,1,
-1958,4051,16,0,516,
-1,1775,4052,16,0,
-516,1,111,4053,19,
-311,1,111,4054,5,
-1,1,32,4055,16,
-0,309,1,112,4056,
-19,270,1,112,4057,
-5,11,1,2075,4058,
-16,0,592,1,2337,
-4059,16,0,274,1,
-2413,4060,16,0,461,
-1,1901,4061,16,0,
-399,1,2198,4062,16,
-0,327,1,2106,4063,
-16,0,623,1,1804,
-4064,16,0,293,1,
-1990,4065,16,0,504,
-1,32,4066,16,0,
-337,1,1958,4067,16,
-0,464,1,1775,4068,
-16,0,268,1,113,
-4069,19,598,1,113,
-4070,5,11,1,2075,
-4071,16,0,596,1,
-2337,4072,16,0,596,
-1,2413,4073,16,0,
-596,1,1901,4074,16,
-0,596,1,2198,4075,
-16,0,596,1,2106,
-4076,16,0,596,1,
-1804,4077,16,0,596,
-1,1990,4078,16,0,
-596,1,32,4079,16,
-0,596,1,1958,4080,
-16,0,596,1,1775,
-4081,16,0,596,1,
-114,4082,19,654,1,
-114,4083,5,11,1,
-2075,4084,16,0,652,
-1,2337,4085,16,0,
-652,1,2413,4086,16,
-0,652,1,1901,4087,
-16,0,652,1,2198,
-4088,16,0,652,1,
-2106,4089,16,0,652,
-1,1804,4090,16,0,
-652,1,1990,4091,16,
-0,652,1,32,4092,
-16,0,652,1,1958,
-4093,16,0,652,1,
-1775,4094,16,0,652,
-1,115,4095,19,170,
-1,115,4096,5,31,
-1,1901,4097,16,0,
-657,1,1479,4098,16,
-0,561,1,2075,4099,
-16,0,657,1,1695,
-4100,16,0,199,1,
-1756,4101,16,0,197,
-1,2413,4102,16,0,
-657,1,2198,4103,16,
-0,657,1,1876,4104,
-16,0,673,1,1659,
-4105,16,0,197,1,
-1443,4106,16,0,532,
-1,1117,4107,16,0,
-168,1,1990,4108,16,
-0,657,1,1189,4109,
-16,0,250,1,1775,
-4110,16,0,657,1,
-32,4111,16,0,657,
-1,2106,4112,16,0,
-657,1,1515,4113,16,
-0,594,1,2337,4114,
-16,0,657,1,52,
-4115,16,0,608,1,
-1804,4116,16,0,657,
-1,1261,4117,16,0,
-305,1,1153,4118,16,
-0,257,1,1225,4119,
-16,0,283,1,1335,
-4120,16,0,459,1,
-1933,4121,16,0,564,
-1,1834,4122,16,0,
-321,1,1297,4123,16,
-0,331,1,1407,4124,
-16,0,582,1,2318,
-4125,16,0,197,1,
-1958,4126,16,0,657,
-1,1371,4127,16,0,
-449,1,116,4128,19,
-541,1,116,4129,5,
-11,1,2075,4130,16,
-0,539,1,2337,4131,
-16,0,539,1,2413,
-4132,16,0,539,1,
-1901,4133,16,0,539,
-1,2198,4134,16,0,
-539,1,2106,4135,16,
-0,539,1,1804,4136,
-16,0,539,1,1990,
-4137,16,0,539,1,
-32,4138,16,0,539,
-1,1958,4139,16,0,
-539,1,1775,4140,16,
-0,539,1,117,4141,
-19,537,1,117,4142,
-5,11,1,2075,4143,
-16,0,535,1,2337,
-4144,16,0,535,1,
-2413,4145,16,0,535,
-1,1901,4146,16,0,
-535,1,2198,4147,16,
-0,535,1,2106,4148,
-16,0,535,1,1804,
-4149,16,0,535,1,
-1990,4150,16,0,535,
-1,32,4151,16,0,
-535,1,1958,4152,16,
-0,535,1,1775,4153,
-16,0,535,1,118,
-4154,19,590,1,118,
-4155,5,11,1,2075,
-4156,16,0,588,1,
-2337,4157,16,0,588,
-1,2413,4158,16,0,
-588,1,1901,4159,16,
-0,588,1,2198,4160,
-16,0,588,1,2106,
-4161,16,0,588,1,
-1804,4162,16,0,588,
-1,1990,4163,16,0,
-588,1,32,4164,16,
-0,588,1,1958,4165,
-16,0,588,1,1775,
-4166,16,0,588,1,
-119,4167,19,531,1,
-119,4168,5,11,1,
-2075,4169,16,0,529,
-1,2337,4170,16,0,
-529,1,2413,4171,16,
-0,529,1,1901,4172,
+3412,19,118,1,54,
+3413,5,53,1,0,
+3414,16,0,116,1,
+2075,3415,16,0,116,
+1,1860,850,1,1804,
+3416,16,0,116,1,
+10,3417,16,0,116,
+1,2520,3418,16,0,
+116,1,2337,3419,16,
+0,116,1,2413,3420,
+16,0,116,1,2741,
+3261,1,2742,3267,1,
+2743,3272,1,2744,3277,
+1,1873,864,1,21,
+3421,16,0,116,1,
+1657,922,1,2030,760,
+1,1989,944,1,1990,
+3422,16,0,116,1,
+1775,3423,16,0,116,
+1,32,3424,16,0,
+116,1,2105,843,1,
+2106,3425,16,0,116,
+1,2683,3291,1,2227,
+936,1,1901,3426,16,
+0,116,1,52,3427,
+16,0,116,1,2670,
+3428,16,0,116,1,
+1803,816,1,2458,904,
+1,2459,910,1,2462,
+917,1,2136,871,1,
+2464,927,1,2029,754,
+1,2466,3302,1,2031,
+765,1,2032,770,1,
+2033,775,1,2035,781,
+1,2364,856,1,2039,
+791,1,1931,889,1,
+2041,797,1,2021,747,
+1,2043,803,1,2045,
+808,1,2198,3429,16,
+0,116,1,2711,3282,
+1,2037,786,1,1574,
+828,1,1958,3430,16,
+0,116,1,2722,3297,
+1,2723,3431,16,0,
+116,1,55,3432,19,
+115,1,55,3433,5,
+53,1,0,3434,16,
+0,113,1,2075,3435,
+16,0,113,1,1860,
+850,1,1804,3436,16,
+0,113,1,10,3437,
+16,0,113,1,2520,
+3438,16,0,113,1,
+2337,3439,16,0,113,
+1,2413,3440,16,0,
+113,1,2741,3261,1,
+2742,3267,1,2743,3272,
+1,2744,3277,1,1873,
+864,1,21,3441,16,
+0,113,1,1657,922,
+1,2030,760,1,1989,
+944,1,1990,3442,16,
+0,113,1,1775,3443,
+16,0,113,1,32,
+3444,16,0,113,1,
+2105,843,1,2106,3445,
+16,0,113,1,2683,
+3291,1,2227,936,1,
+1901,3446,16,0,113,
+1,52,3447,16,0,
+113,1,2670,3448,16,
+0,113,1,1803,816,
+1,2458,904,1,2459,
+910,1,2462,917,1,
+2136,871,1,2464,927,
+1,2029,754,1,2466,
+3302,1,2031,765,1,
+2032,770,1,2033,775,
+1,2035,781,1,2364,
+856,1,2039,791,1,
+1931,889,1,2041,797,
+1,2021,747,1,2043,
+803,1,2045,808,1,
+2198,3449,16,0,113,
+1,2711,3282,1,2037,
+786,1,1574,828,1,
+1958,3450,16,0,113,
+1,2722,3297,1,2723,
+3451,16,0,113,1,
+56,3452,19,112,1,
+56,3453,5,53,1,
+0,3454,16,0,110,
+1,2075,3455,16,0,
+110,1,1860,850,1,
+1804,3456,16,0,110,
+1,10,3457,16,0,
+110,1,2520,3458,16,
+0,110,1,2337,3459,
+16,0,110,1,2413,
+3460,16,0,110,1,
+2741,3261,1,2742,3267,
+1,2743,3272,1,2744,
+3277,1,1873,864,1,
+21,3461,16,0,110,
+1,1657,922,1,2030,
+760,1,1989,944,1,
+1990,3462,16,0,110,
+1,1775,3463,16,0,
+110,1,32,3464,16,
+0,110,1,2105,843,
+1,2106,3465,16,0,
+110,1,2683,3291,1,
+2227,936,1,1901,3466,
+16,0,110,1,52,
+3467,16,0,110,1,
+2670,3468,16,0,110,
+1,1803,816,1,2458,
+904,1,2459,910,1,
+2462,917,1,2136,871,
+1,2464,927,1,2029,
+754,1,2466,3302,1,
+2031,765,1,2032,770,
+1,2033,775,1,2035,
+781,1,2364,856,1,
+2039,791,1,1931,889,
+1,2041,797,1,2021,
+747,1,2043,803,1,
+2045,808,1,2198,3469,
+16,0,110,1,2711,
+3282,1,2037,786,1,
+1574,828,1,1958,3470,
+16,0,110,1,2722,
+3297,1,2723,3471,16,
+0,110,1,57,3472,
+19,109,1,57,3473,
+5,53,1,0,3474,
+16,0,107,1,2075,
+3475,16,0,107,1,
+1860,850,1,1804,3476,
+16,0,107,1,10,
+3477,16,0,107,1,
+2520,3478,16,0,107,
+1,2337,3479,16,0,
+107,1,2413,3480,16,
+0,107,1,2741,3261,
+1,2742,3267,1,2743,
+3272,1,2744,3277,1,
+1873,864,1,21,3481,
+16,0,107,1,1657,
+922,1,2030,760,1,
+1989,944,1,1990,3482,
+16,0,107,1,1775,
+3483,16,0,107,1,
+32,3484,16,0,107,
+1,2105,843,1,2106,
+3485,16,0,107,1,
+2683,3291,1,2227,936,
+1,1901,3486,16,0,
+107,1,52,3487,16,
+0,107,1,2670,3488,
+16,0,107,1,1803,
+816,1,2458,904,1,
+2459,910,1,2462,917,
+1,2136,871,1,2464,
+927,1,2029,754,1,
+2466,3302,1,2031,765,
+1,2032,770,1,2033,
+775,1,2035,781,1,
+2364,856,1,2039,791,
+1,1931,889,1,2041,
+797,1,2021,747,1,
+2043,803,1,2045,808,
+1,2198,3489,16,0,
+107,1,2711,3282,1,
+2037,786,1,1574,828,
+1,1958,3490,16,0,
+107,1,2722,3297,1,
+2723,3491,16,0,107,
+1,58,3492,19,438,
+1,58,3493,5,15,
+1,2581,3494,16,0,
+436,1,2518,1655,1,
+2459,910,1,2535,3495,
+16,0,436,1,2573,
+1664,1,2574,1670,1,
+2464,927,1,2577,1685,
+1,2578,1680,1,2533,
+1695,1,2470,3496,16,
+0,436,1,2619,3497,
+16,0,436,1,2509,
+1648,1,2575,1675,1,
+2579,1690,1,59,3498,
+19,435,1,59,3499,
+5,15,1,2581,3500,
+16,0,433,1,2518,
+1655,1,2459,910,1,
+2535,3501,16,0,433,
+1,2573,1664,1,2574,
+1670,1,2464,927,1,
+2577,1685,1,2578,1680,
+1,2533,1695,1,2470,
+3502,16,0,433,1,
+2619,3503,16,0,433,
+1,2509,1648,1,2575,
+1675,1,2579,1690,1,
+60,3504,19,432,1,
+60,3505,5,15,1,
+2581,3506,16,0,430,
+1,2518,1655,1,2459,
+910,1,2535,3507,16,
+0,430,1,2573,1664,
+1,2574,1670,1,2464,
+927,1,2577,1685,1,
+2578,1680,1,2533,1695,
+1,2470,3508,16,0,
+430,1,2619,3509,16,
+0,430,1,2509,1648,
+1,2575,1675,1,2579,
+1690,1,61,3510,19,
+399,1,61,3511,5,
+15,1,2581,3512,16,
+0,397,1,2518,1655,
+1,2459,910,1,2535,
+3513,16,0,397,1,
+2573,1664,1,2574,1670,
+1,2464,927,1,2577,
+1685,1,2578,1680,1,
+2533,1695,1,2470,3514,
+16,0,397,1,2619,
+3515,16,0,397,1,
+2509,1648,1,2575,1675,
+1,2579,1690,1,62,
+3516,19,396,1,62,
+3517,5,15,1,2581,
+3518,16,0,394,1,
+2518,1655,1,2459,910,
+1,2535,3519,16,0,
+394,1,2573,1664,1,
+2574,1670,1,2464,927,
+1,2577,1685,1,2578,
+1680,1,2533,1695,1,
+2470,3520,16,0,394,
+1,2619,3521,16,0,
+394,1,2509,1648,1,
+2575,1675,1,2579,1690,
+1,63,3522,19,488,
+1,63,3523,5,15,
+1,2581,3524,16,0,
+486,1,2518,1655,1,
+2459,910,1,2535,3525,
+16,0,486,1,2573,
+1664,1,2574,1670,1,
+2464,927,1,2577,1685,
+1,2578,1680,1,2533,
+1695,1,2470,3526,16,
+0,486,1,2619,3527,
+16,0,486,1,2509,
+1648,1,2575,1675,1,
+2579,1690,1,64,3528,
+19,585,1,64,3529,
+5,15,1,2581,3530,
+16,0,583,1,2518,
+1655,1,2459,910,1,
+2535,3531,16,0,583,
+1,2573,1664,1,2574,
+1670,1,2464,927,1,
+2577,1685,1,2578,1680,
+1,2533,1695,1,2470,
+3532,16,0,583,1,
+2619,3533,16,0,583,
+1,2509,1648,1,2575,
+1675,1,2579,1690,1,
+65,3534,19,429,1,
+65,3535,5,15,1,
+2581,3536,16,0,427,
+1,2518,1655,1,2459,
+910,1,2535,3537,16,
+0,427,1,2573,1664,
+1,2574,1670,1,2464,
+927,1,2577,1685,1,
+2578,1680,1,2533,1695,
+1,2470,3538,16,0,
+427,1,2619,3539,16,
+0,427,1,2509,1648,
+1,2575,1675,1,2579,
+1690,1,66,3540,19,
+426,1,66,3541,5,
+15,1,2581,3542,16,
+0,424,1,2518,1655,
+1,2459,910,1,2535,
+3543,16,0,424,1,
+2573,1664,1,2574,1670,
+1,2464,927,1,2577,
+1685,1,2578,1680,1,
+2533,1695,1,2470,3544,
+16,0,424,1,2619,
+3545,16,0,424,1,
+2509,1648,1,2575,1675,
+1,2579,1690,1,67,
+3546,19,423,1,67,
+3547,5,15,1,2581,
+3548,16,0,421,1,
+2518,1655,1,2459,910,
+1,2535,3549,16,0,
+421,1,2573,1664,1,
+2574,1670,1,2464,927,
+1,2577,1685,1,2578,
+1680,1,2533,1695,1,
+2470,3550,16,0,421,
+1,2619,3551,16,0,
+421,1,2509,1648,1,
+2575,1675,1,2579,1690,
+1,68,3552,19,673,
+1,68,3553,5,15,
+1,2581,3554,16,0,
+671,1,2518,1655,1,
+2459,910,1,2535,3555,
+16,0,671,1,2573,
+1664,1,2574,1670,1,
+2464,927,1,2577,1685,
+1,2578,1680,1,2533,
+1695,1,2470,3556,16,
+0,671,1,2619,3557,
+16,0,671,1,2509,
+1648,1,2575,1675,1,
+2579,1690,1,69,3558,
+19,419,1,69,3559,
+5,15,1,2581,3560,
+16,0,417,1,2518,
+1655,1,2459,910,1,
+2535,3561,16,0,417,
+1,2573,1664,1,2574,
+1670,1,2464,927,1,
+2577,1685,1,2578,1680,
+1,2533,1695,1,2470,
+3562,16,0,417,1,
+2619,3563,16,0,417,
+1,2509,1648,1,2575,
+1675,1,2579,1690,1,
+70,3564,19,513,1,
+70,3565,5,15,1,
+2581,3566,16,0,511,
+1,2518,1655,1,2459,
+910,1,2535,3567,16,
+0,511,1,2573,1664,
+1,2574,1670,1,2464,
+927,1,2577,1685,1,
+2578,1680,1,2533,1695,
+1,2470,3568,16,0,
+511,1,2619,3569,16,
+0,511,1,2509,1648,
+1,2575,1675,1,2579,
+1690,1,71,3570,19,
+415,1,71,3571,5,
+15,1,2581,3572,16,
+0,413,1,2518,1655,
+1,2459,910,1,2535,
+3573,16,0,413,1,
+2573,1664,1,2574,1670,
+1,2464,927,1,2577,
+1685,1,2578,1680,1,
+2533,1695,1,2470,3574,
+16,0,413,1,2619,
+3575,16,0,413,1,
+2509,1648,1,2575,1675,
+1,2579,1690,1,72,
+3576,19,412,1,72,
+3577,5,15,1,2581,
+3578,16,0,410,1,
+2518,1655,1,2459,910,
+1,2535,3579,16,0,
+410,1,2573,1664,1,
+2574,1670,1,2464,927,
+1,2577,1685,1,2578,
+1680,1,2533,1695,1,
+2470,3580,16,0,410,
+1,2619,3581,16,0,
+410,1,2509,1648,1,
+2575,1675,1,2579,1690,
+1,73,3582,19,503,
+1,73,3583,5,15,
+1,2581,3584,16,0,
+501,1,2518,1655,1,
+2459,910,1,2535,3585,
+16,0,501,1,2573,
+1664,1,2574,1670,1,
+2464,927,1,2577,1685,
+1,2578,1680,1,2533,
+1695,1,2470,3586,16,
+0,501,1,2619,3587,
+16,0,501,1,2509,
+1648,1,2575,1675,1,
+2579,1690,1,74,3588,
+19,408,1,74,3589,
+5,15,1,2581,3590,
+16,0,406,1,2518,
+1655,1,2459,910,1,
+2535,3591,16,0,406,
+1,2573,1664,1,2574,
+1670,1,2464,927,1,
+2577,1685,1,2578,1680,
+1,2533,1695,1,2470,
+3592,16,0,406,1,
+2619,3593,16,0,406,
+1,2509,1648,1,2575,
+1675,1,2579,1690,1,
+75,3594,19,365,1,
+75,3595,5,15,1,
+2581,3596,16,0,363,
+1,2518,1655,1,2459,
+910,1,2535,3597,16,
+0,363,1,2573,1664,
+1,2574,1670,1,2464,
+927,1,2577,1685,1,
+2578,1680,1,2533,1695,
+1,2470,3598,16,0,
+363,1,2619,3599,16,
+0,363,1,2509,1648,
+1,2575,1675,1,2579,
+1690,1,76,3600,19,
+362,1,76,3601,5,
+15,1,2581,3602,16,
+0,360,1,2518,1655,
+1,2459,910,1,2535,
+3603,16,0,360,1,
+2573,1664,1,2574,1670,
+1,2464,927,1,2577,
+1685,1,2578,1680,1,
+2533,1695,1,2470,3604,
+16,0,360,1,2619,
+3605,16,0,360,1,
+2509,1648,1,2575,1675,
+1,2579,1690,1,77,
+3606,19,500,1,77,
+3607,5,15,1,2581,
+3608,16,0,498,1,
+2518,1655,1,2459,910,
+1,2535,3609,16,0,
+498,1,2573,1664,1,
+2574,1670,1,2464,927,
+1,2577,1685,1,2578,
+1680,1,2533,1695,1,
+2470,3610,16,0,498,
+1,2619,3611,16,0,
+498,1,2509,1648,1,
+2575,1675,1,2579,1690,
+1,78,3612,19,359,
+1,78,3613,5,15,
+1,2581,3614,16,0,
+357,1,2518,1655,1,
+2459,910,1,2535,3615,
+16,0,357,1,2573,
+1664,1,2574,1670,1,
+2464,927,1,2577,1685,
+1,2578,1680,1,2533,
+1695,1,2470,3616,16,
+0,357,1,2619,3617,
+16,0,357,1,2509,
+1648,1,2575,1675,1,
+2579,1690,1,79,3618,
+19,356,1,79,3619,
+5,15,1,2581,3620,
+16,0,354,1,2518,
+1655,1,2459,910,1,
+2535,3621,16,0,354,
+1,2573,1664,1,2574,
+1670,1,2464,927,1,
+2577,1685,1,2578,1680,
+1,2533,1695,1,2470,
+3622,16,0,354,1,
+2619,3623,16,0,354,
+1,2509,1648,1,2575,
+1675,1,2579,1690,1,
+80,3624,19,497,1,
+80,3625,5,15,1,
+2581,3626,16,0,495,
+1,2518,1655,1,2459,
+910,1,2535,3627,16,
+0,495,1,2573,1664,
+1,2574,1670,1,2464,
+927,1,2577,1685,1,
+2578,1680,1,2533,1695,
+1,2470,3628,16,0,
+495,1,2619,3629,16,
+0,495,1,2509,1648,
+1,2575,1675,1,2579,
+1690,1,81,3630,19,
+389,1,81,3631,5,
+15,1,2581,3632,16,
+0,387,1,2518,1655,
+1,2459,910,1,2535,
+3633,16,0,387,1,
+2573,1664,1,2574,1670,
+1,2464,927,1,2577,
+1685,1,2578,1680,1,
+2533,1695,1,2470,3634,
+16,0,387,1,2619,
+3635,16,0,387,1,
+2509,1648,1,2575,1675,
+1,2579,1690,1,82,
+3636,19,494,1,82,
+3637,5,15,1,2581,
+3638,16,0,492,1,
+2518,1655,1,2459,910,
+1,2535,3639,16,0,
+492,1,2573,1664,1,
+2574,1670,1,2464,927,
+1,2577,1685,1,2578,
+1680,1,2533,1695,1,
+2470,3640,16,0,492,
+1,2619,3641,16,0,
+492,1,2509,1648,1,
+2575,1675,1,2579,1690,
+1,83,3642,19,386,
+1,83,3643,5,15,
+1,2581,3644,16,0,
+384,1,2518,1655,1,
+2459,910,1,2535,3645,
+16,0,384,1,2573,
+1664,1,2574,1670,1,
+2464,927,1,2577,1685,
+1,2578,1680,1,2533,
+1695,1,2470,3646,16,
+0,384,1,2619,3647,
+16,0,384,1,2509,
+1648,1,2575,1675,1,
+2579,1690,1,84,3648,
+19,383,1,84,3649,
+5,15,1,2581,3650,
+16,0,381,1,2518,
+1655,1,2459,910,1,
+2535,3651,16,0,381,
+1,2573,1664,1,2574,
+1670,1,2464,927,1,
+2577,1685,1,2578,1680,
+1,2533,1695,1,2470,
+3652,16,0,381,1,
+2619,3653,16,0,381,
+1,2509,1648,1,2575,
+1675,1,2579,1690,1,
+85,3654,19,371,1,
+85,3655,5,15,1,
+2581,3656,16,0,369,
+1,2518,1655,1,2459,
+910,1,2535,3657,16,
+0,369,1,2573,1664,
+1,2574,1670,1,2464,
+927,1,2577,1685,1,
+2578,1680,1,2533,1695,
+1,2470,3658,16,0,
+369,1,2619,3659,16,
+0,369,1,2509,1648,
+1,2575,1675,1,2579,
+1690,1,86,3660,19,
+368,1,86,3661,5,
+15,1,2581,3662,16,
+0,366,1,2518,1655,
+1,2459,910,1,2535,
+3663,16,0,366,1,
+2573,1664,1,2574,1670,
+1,2464,927,1,2577,
+1685,1,2578,1680,1,
+2533,1695,1,2470,3664,
+16,0,366,1,2619,
+3665,16,0,366,1,
+2509,1648,1,2575,1675,
+1,2579,1690,1,87,
+3666,19,353,1,87,
+3667,5,15,1,2581,
+3668,16,0,351,1,
+2518,1655,1,2459,910,
+1,2535,3669,16,0,
+351,1,2573,1664,1,
+2574,1670,1,2464,927,
+1,2577,1685,1,2578,
+1680,1,2533,1695,1,
+2470,3670,16,0,351,
+1,2619,3671,16,0,
+351,1,2509,1648,1,
+2575,1675,1,2579,1690,
+1,88,3672,19,380,
+1,88,3673,5,15,
+1,2581,3674,16,0,
+378,1,2518,1655,1,
+2459,910,1,2535,3675,
+16,0,378,1,2573,
+1664,1,2574,1670,1,
+2464,927,1,2577,1685,
+1,2578,1680,1,2533,
+1695,1,2470,3676,16,
+0,378,1,2619,3677,
+16,0,378,1,2509,
+1648,1,2575,1675,1,
+2579,1690,1,89,3678,
+19,374,1,89,3679,
+5,15,1,2581,3680,
+16,0,372,1,2518,
+1655,1,2459,910,1,
+2535,3681,16,0,372,
+1,2573,1664,1,2574,
+1670,1,2464,927,1,
+2577,1685,1,2578,1680,
+1,2533,1695,1,2470,
+3682,16,0,372,1,
+2619,3683,16,0,372,
+1,2509,1648,1,2575,
+1675,1,2579,1690,1,
+90,3684,19,377,1,
+90,3685,5,15,1,
+2581,3686,16,0,375,
+1,2518,1655,1,2459,
+910,1,2535,3687,16,
+0,375,1,2573,1664,
+1,2574,1670,1,2464,
+927,1,2577,1685,1,
+2578,1680,1,2533,1695,
+1,2470,3688,16,0,
+375,1,2619,3689,16,
+0,375,1,2509,1648,
+1,2575,1675,1,2579,
+1690,1,91,3690,19,
+491,1,91,3691,5,
+15,1,2581,3692,16,
+0,489,1,2518,1655,
+1,2459,910,1,2535,
+3693,16,0,489,1,
+2573,1664,1,2574,1670,
+1,2464,927,1,2577,
+1685,1,2578,1680,1,
+2533,1695,1,2470,3694,
+16,0,489,1,2619,
+3695,16,0,489,1,
+2509,1648,1,2575,1675,
+1,2579,1690,1,92,
+3696,19,133,1,92,
+3697,5,126,1,0,
+3698,16,0,189,1,
+1,2017,1,2,2023,
+1,3,2028,1,4,
+2033,1,5,2038,1,
+6,2043,1,7,2048,
+1,8,3699,16,0,
+131,1,1515,3700,16,
+0,165,1,2686,3701,
+16,0,173,1,2021,
+747,1,2022,3702,16,
+0,520,1,256,3703,
+16,0,173,1,2025,
+3704,16,0,524,1,
+18,3705,16,0,138,
+1,2027,3706,16,0,
+528,1,2029,754,1,
+2030,760,1,2031,765,
+1,2032,770,1,2033,
+775,1,277,3707,16,
+0,173,1,2035,781,
+1,2037,786,1,2039,
+791,1,32,3708,16,
+0,165,1,2041,797,
+1,2293,3709,16,0,
+173,1,2043,803,1,
+2711,3282,1,2045,808,
+1,41,3710,16,0,
+173,1,1297,3711,16,
+0,165,1,43,3712,
+16,0,173,1,1989,
+944,1,46,3713,16,
+0,178,1,1804,3714,
+16,0,165,1,299,
+3715,16,0,173,1,
+52,3716,16,0,165,
+1,509,3717,16,0,
+173,1,2318,3718,16,
+0,165,1,62,3719,
+16,0,196,1,65,
+3720,16,0,198,1,
+2075,3721,16,0,165,
+1,1574,828,1,2743,
+3272,1,71,3722,16,
+0,173,1,1775,3723,
+16,0,165,1,76,
+3724,16,0,173,1,
+1834,3725,16,0,165,
+1,2337,3726,16,0,
+165,1,79,3727,16,
+0,173,1,1335,3728,
+16,0,165,1,2512,
+3729,16,0,450,1,
+322,3730,16,0,173,
+1,85,3731,16,0,
+173,1,1261,3732,16,
+0,165,1,89,3733,
+16,0,173,1,346,
+3734,16,0,173,1,
+97,3735,16,0,173,
+1,2106,3736,16,0,
+165,1,102,3737,16,
+0,173,1,1860,850,
+1,1803,816,1,2364,
+856,1,1113,3738,16,
+0,158,1,112,3739,
+16,0,173,1,1117,
+3740,16,0,165,1,
+1873,864,1,1876,3741,
+16,0,165,1,372,
+3742,16,0,558,1,
+374,3743,16,0,560,
+1,124,3744,16,0,
+173,1,376,3745,16,
+0,562,1,378,3746,
+16,0,564,1,2136,
+871,1,381,3747,16,
+0,173,1,525,3748,
+16,0,173,1,137,
+3749,16,0,173,1,
+1901,3750,16,0,165,
+1,1153,3751,16,0,
+165,1,151,3752,16,
+0,173,1,1407,3753,
+16,0,165,1,1659,
+3754,16,0,165,1,
+2413,3755,16,0,165,
+1,406,3756,16,0,
+173,1,1371,3757,16,
+0,165,1,2105,843,
+1,166,3758,16,0,
+173,1,1622,3759,16,
+0,173,1,2683,3291,
+1,1931,889,1,1933,
+3760,16,0,165,1,
+431,3761,16,0,173,
+1,1585,3762,16,0,
+173,1,182,3763,16,
+0,173,1,1189,3764,
+16,0,165,1,1443,
+3765,16,0,165,1,
+1695,3766,16,0,165,
+1,2198,3767,16,0,
+165,1,447,3768,16,
+0,173,1,2458,904,
+1,2459,910,1,1958,
+3769,16,0,165,1,
+2462,917,1,1657,922,
+1,2464,927,1,2466,
+3302,1,459,3770,16,
+0,173,1,2468,3771,
+16,0,349,1,462,
+3772,16,0,173,1,
+2722,3297,1,2723,3773,
+16,0,189,1,199,
+3774,16,0,173,1,
+217,3775,16,0,173,
+1,2227,936,1,1225,
+3776,16,0,165,1,
+1479,3777,16,0,165,
+1,1731,3778,16,0,
+173,1,2741,3261,1,
+2742,3267,1,1990,3779,
+16,0,165,1,2744,
+3277,1,236,3780,16,
+0,173,1,1756,3781,
+16,0,165,1,93,
+3782,19,652,1,93,
+3783,5,95,1,256,
+3784,16,0,650,1,
+1261,3785,16,0,650,
+1,509,3786,16,0,
+650,1,1515,3787,16,
+0,650,1,2686,3788,
+16,0,650,1,2021,
+747,1,1775,3789,16,
+0,650,1,2029,754,
+1,2030,760,1,2031,
+765,1,2032,770,1,
+2033,775,1,277,3790,
+16,0,650,1,2035,
+781,1,2037,786,1,
+2039,791,1,32,3791,
+16,0,650,1,2041,
+797,1,2293,3792,16,
+0,650,1,2043,803,
+1,2045,808,1,41,
+3793,16,0,650,1,
+1297,3794,16,0,650,
+1,43,3795,16,0,
+650,1,1803,816,1,
+1804,3796,16,0,650,
+1,299,3797,16,0,
+650,1,52,3798,16,
+0,650,1,2318,3799,
+16,0,650,1,62,
+3800,16,0,650,1,
+2075,3801,16,0,650,
+1,1574,828,1,71,
+3802,16,0,650,1,
+76,3803,16,0,650,
+1,1834,3804,16,0,
+650,1,2337,3805,16,
+0,650,1,79,3806,
+16,0,650,1,1335,
+3807,16,0,650,1,
+322,3808,16,0,650,
+1,85,3809,16,0,
+650,1,89,3810,16,
+0,650,1,346,3811,
+16,0,650,1,2105,
+843,1,2106,3812,16,
+0,650,1,97,3813,
+16,0,650,1,1860,
+850,1,2364,856,1,
+102,3814,16,0,650,
+1,112,3815,16,0,
+650,1,1117,3816,16,
+0,650,1,1873,864,
+1,1876,3817,16,0,
+650,1,124,3818,16,
+0,650,1,2136,871,
+1,381,3819,16,0,
+650,1,525,3820,16,
+0,650,1,137,3821,
+16,0,650,1,1901,
+3822,16,0,650,1,
+1153,3823,16,0,650,
+1,151,3824,16,0,
+650,1,1407,3825,16,
+0,650,1,1659,3826,
+16,0,650,1,2413,
+3827,16,0,650,1,
+406,3828,16,0,650,
+1,1371,3829,16,0,
+650,1,166,3830,16,
+0,650,1,1622,3831,
+16,0,650,1,1931,
+889,1,1933,3832,16,
+0,650,1,431,3833,
+16,0,650,1,1585,
+3834,16,0,650,1,
+182,3835,16,0,650,
+1,1189,3836,16,0,
+650,1,1443,3837,16,
+0,650,1,1695,3838,
+16,0,650,1,2198,
+3839,16,0,650,1,
+447,3840,16,0,650,
+1,2458,904,1,2459,
+910,1,1958,3841,16,
+0,650,1,2462,917,
+1,1657,922,1,2464,
+927,1,199,3842,16,
+0,650,1,459,3843,
+16,0,650,1,462,
+3844,16,0,650,1,
+217,3845,16,0,650,
+1,2227,936,1,1225,
+3846,16,0,650,1,
+1479,3847,16,0,650,
+1,1731,3848,16,0,
+650,1,1989,944,1,
+1990,3849,16,0,650,
+1,236,3850,16,0,
+650,1,1756,3851,16,
+0,650,1,94,3852,
+19,649,1,94,3853,
+5,95,1,256,3854,
+16,0,647,1,1261,
+3855,16,0,647,1,
+509,3856,16,0,647,
+1,1515,3857,16,0,
+647,1,2686,3858,16,
+0,647,1,2021,747,
+1,1775,3859,16,0,
+647,1,2029,754,1,
+2030,760,1,2031,765,
+1,2032,770,1,2033,
+775,1,277,3860,16,
+0,647,1,2035,781,
+1,2037,786,1,2039,
+791,1,32,3861,16,
+0,647,1,2041,797,
+1,2293,3862,16,0,
+647,1,2043,803,1,
+2045,808,1,41,3863,
+16,0,647,1,1297,
+3864,16,0,647,1,
+43,3865,16,0,647,
+1,1803,816,1,1804,
+3866,16,0,647,1,
+299,3867,16,0,647,
+1,52,3868,16,0,
+647,1,2318,3869,16,
+0,647,1,62,3870,
+16,0,647,1,2075,
+3871,16,0,647,1,
+1574,828,1,71,3872,
+16,0,647,1,76,
+3873,16,0,647,1,
+1834,3874,16,0,647,
+1,2337,3875,16,0,
+647,1,79,3876,16,
+0,647,1,1335,3877,
+16,0,647,1,322,
+3878,16,0,647,1,
+85,3879,16,0,647,
+1,89,3880,16,0,
+647,1,346,3881,16,
+0,647,1,2105,843,
+1,2106,3882,16,0,
+647,1,97,3883,16,
+0,647,1,1860,850,
+1,2364,856,1,102,
+3884,16,0,647,1,
+112,3885,16,0,647,
+1,1117,3886,16,0,
+647,1,1873,864,1,
+1876,3887,16,0,647,
+1,124,3888,16,0,
+647,1,2136,871,1,
+381,3889,16,0,647,
+1,525,3890,16,0,
+647,1,137,3891,16,
+0,647,1,1901,3892,
+16,0,647,1,1153,
+3893,16,0,647,1,
+151,3894,16,0,647,
+1,1407,3895,16,0,
+647,1,1659,3896,16,
+0,647,1,2413,3897,
+16,0,647,1,406,
+3898,16,0,647,1,
+1371,3899,16,0,647,
+1,166,3900,16,0,
+647,1,1622,3901,16,
+0,647,1,1931,889,
+1,1933,3902,16,0,
+647,1,431,3903,16,
+0,647,1,1585,3904,
+16,0,647,1,182,
+3905,16,0,647,1,
+1189,3906,16,0,647,
+1,1443,3907,16,0,
+647,1,1695,3908,16,
+0,647,1,2198,3909,
+16,0,647,1,447,
+3910,16,0,647,1,
+2458,904,1,2459,910,
+1,1958,3911,16,0,
+647,1,2462,917,1,
+1657,922,1,2464,927,
+1,199,3912,16,0,
+647,1,459,3913,16,
+0,647,1,462,3914,
+16,0,647,1,217,
+3915,16,0,647,1,
+2227,936,1,1225,3916,
+16,0,647,1,1479,
+3917,16,0,647,1,
+1731,3918,16,0,647,
+1,1989,944,1,1990,
+3919,16,0,647,1,
+236,3920,16,0,647,
+1,1756,3921,16,0,
+647,1,95,3922,19,
+646,1,95,3923,5,
+95,1,256,3924,16,
+0,644,1,1261,3925,
+16,0,644,1,509,
+3926,16,0,644,1,
+1515,3927,16,0,644,
+1,2686,3928,16,0,
+644,1,2021,747,1,
+1775,3929,16,0,644,
+1,2029,754,1,2030,
+760,1,2031,765,1,
+2032,770,1,2033,775,
+1,277,3930,16,0,
+644,1,2035,781,1,
+2037,786,1,2039,791,
+1,32,3931,16,0,
+644,1,2041,797,1,
+2293,3932,16,0,644,
+1,2043,803,1,2045,
+808,1,41,3933,16,
+0,644,1,1297,3934,
+16,0,644,1,43,
+3935,16,0,644,1,
+1803,816,1,1804,3936,
+16,0,644,1,299,
+3937,16,0,644,1,
+52,3938,16,0,644,
+1,2318,3939,16,0,
+644,1,62,3940,16,
+0,644,1,2075,3941,
+16,0,644,1,1574,
+828,1,71,3942,16,
+0,644,1,76,3943,
+16,0,644,1,1834,
+3944,16,0,644,1,
+2337,3945,16,0,644,
+1,79,3946,16,0,
+644,1,1335,3947,16,
+0,644,1,322,3948,
+16,0,644,1,85,
+3949,16,0,644,1,
+89,3950,16,0,644,
+1,346,3951,16,0,
+644,1,2105,843,1,
+2106,3952,16,0,644,
+1,97,3953,16,0,
+644,1,1860,850,1,
+2364,856,1,102,3954,
+16,0,644,1,112,
+3955,16,0,644,1,
+1117,3956,16,0,644,
+1,1873,864,1,1876,
+3957,16,0,644,1,
+124,3958,16,0,644,
+1,2136,871,1,381,
+3959,16,0,644,1,
+525,3960,16,0,644,
+1,137,3961,16,0,
+644,1,1901,3962,16,
+0,644,1,1153,3963,
+16,0,644,1,151,
+3964,16,0,644,1,
+1407,3965,16,0,644,
+1,1659,3966,16,0,
+644,1,2413,3967,16,
+0,644,1,406,3968,
+16,0,644,1,1371,
+3969,16,0,644,1,
+166,3970,16,0,644,
+1,1622,3971,16,0,
+644,1,1931,889,1,
+1933,3972,16,0,644,
+1,431,3973,16,0,
+644,1,1585,3974,16,
+0,644,1,182,3975,
+16,0,644,1,1189,
+3976,16,0,644,1,
+1443,3977,16,0,644,
+1,1695,3978,16,0,
+644,1,2198,3979,16,
+0,644,1,447,3980,
+16,0,644,1,2458,
+904,1,2459,910,1,
+1958,3981,16,0,644,
+1,2462,917,1,1657,
+922,1,2464,927,1,
+199,3982,16,0,644,
+1,459,3983,16,0,
+644,1,462,3984,16,
+0,644,1,217,3985,
+16,0,644,1,2227,
+936,1,1225,3986,16,
+0,644,1,1479,3987,
+16,0,644,1,1731,
+3988,16,0,644,1,
+1989,944,1,1990,3989,
+16,0,644,1,236,
+3990,16,0,644,1,
+1756,3991,16,0,644,
+1,96,3992,19,103,
+1,96,3993,5,1,
+1,0,3994,16,0,
+104,1,97,3995,19,
+662,1,97,3996,5,
+1,1,0,3997,16,
+0,660,1,98,3998,
+19,258,1,98,3999,
+5,2,1,0,4000,
+16,0,332,1,2723,
+4001,16,0,256,1,
+99,4002,19,331,1,
+99,4003,5,2,1,
+0,4004,16,0,329,
+1,2723,4005,16,0,
+675,1,100,4006,19,
+251,1,100,4007,5,
+2,1,0,4008,16,
+0,685,1,2723,4009,
+16,0,249,1,101,
+4010,19,611,1,101,
+4011,5,4,1,0,
+4012,16,0,609,1,
+2723,4013,16,0,609,
+1,2734,4014,16,0,
+686,1,2664,4015,16,
+0,686,1,102,4016,
+19,471,1,102,4017,
+5,2,1,2470,4018,
+16,0,469,1,2581,
+4019,16,0,575,1,
+103,4020,19,510,1,
+103,4021,5,4,1,
+2619,4022,16,0,508,
+1,2535,4023,16,0,
+508,1,2470,4024,16,
+0,600,1,2581,4025,
+16,0,600,1,104,
+4026,19,593,1,104,
+4027,5,4,1,2619,
+4028,16,0,591,1,
+2535,4029,16,0,591,
+1,2470,4030,16,0,
+599,1,2581,4031,16,
+0,599,1,105,4032,
+19,516,1,105,4033,
+5,4,1,2619,4034,
+16,0,590,1,2535,
+4035,16,0,590,1,
+2470,4036,16,0,514,
+1,2581,4037,16,0,
+514,1,106,4038,19,
+141,1,106,4039,5,
+3,1,2520,4040,16,
+0,466,1,2670,4041,
+16,0,618,1,10,
+4042,16,0,139,1,
+107,4043,19,319,1,
+107,4044,5,1,1,
+2511,4045,16,0,317,
+1,108,4046,19,151,
+1,108,4047,5,17,
+1,0,4048,16,0,
+624,1,2075,4049,16,
+0,668,1,2520,4050,
+16,0,345,1,2337,
+4051,16,0,668,1,
+2413,4052,16,0,668,
+1,10,4053,16,0,
+345,1,2198,4054,16,
+0,668,1,1901,4055,
+16,0,668,1,2723,
+4056,16,0,624,1,
+2670,4057,16,0,345,
+1,21,4058,16,0,
+149,1,2106,4059,16,
+0,668,1,1804,4060,
+16,0,668,1,1990,
+4061,16,0,668,1,
+32,4062,16,0,668,
+1,1958,4063,16,0,
+668,1,1775,4064,16,
+0,668,1,109,4065,
+19,453,1,109,4066,
+5,1,1,2511,4067,
+16,0,451,1,110,
+4068,19,130,1,110,
+4069,5,18,1,0,
+4070,16,0,128,1,
+2075,4071,16,0,137,
+1,2520,4072,16,0,
+137,1,2337,4073,16,
+0,137,1,2413,4074,
+16,0,137,1,10,
+4075,16,0,137,1,
+2198,4076,16,0,137,
+1,1901,4077,16,0,
+137,1,52,4078,16,
+0,194,1,2670,4079,
+16,0,137,1,21,
+4080,16,0,137,1,
+2106,4081,16,0,137,
+1,1804,4082,16,0,
+137,1,1990,4083,16,
+0,137,1,2723,4084,
+16,0,128,1,32,
+4085,16,0,137,1,
+1958,4086,16,0,137,
+1,1775,4087,16,0,
+137,1,111,4088,19,
+459,1,111,4089,5,
+4,1,2619,4090,16,
+0,457,1,2535,4091,
+16,0,457,1,2470,
+4092,16,0,457,1,
+2581,4093,16,0,457,
+1,112,4094,19,447,
+1,112,4095,5,4,
+1,2619,4096,16,0,
+445,1,2535,4097,16,
+0,445,1,2470,4098,
+16,0,445,1,2581,
+4099,16,0,445,1,
+113,4100,19,681,1,
+113,4101,5,4,1,
+2619,4102,16,0,679,
+1,2535,4103,16,0,
+679,1,2470,4104,16,
+0,679,1,2581,4105,
+16,0,679,1,114,
+4106,19,344,1,114,
+4107,5,16,1,2516,
+4108,16,0,456,1,
+2075,4109,16,0,529,
+1,2337,4110,16,0,
+529,1,2507,4111,16,
+0,444,1,2413,4112,
 16,0,529,1,2198,
-4173,16,0,529,1,
-2106,4174,16,0,529,
-1,1804,4175,16,0,
-529,1,1990,4176,16,
-0,529,1,32,4177,
-16,0,529,1,1958,
-4178,16,0,529,1,
-1775,4179,16,0,529,
-1,120,4180,19,528,
-1,120,4181,5,11,
-1,2075,4182,16,0,
-526,1,2337,4183,16,
-0,526,1,2413,4184,
-16,0,526,1,1901,
-4185,16,0,526,1,
-2198,4186,16,0,526,
-1,2106,4187,16,0,
-526,1,1804,4188,16,
-0,526,1,1990,4189,
-16,0,526,1,32,
-4190,16,0,526,1,
-1958,4191,16,0,526,
-1,1775,4192,16,0,
-526,1,121,4193,19,
-525,1,121,4194,5,
-11,1,2075,4195,16,
-0,523,1,2337,4196,
-16,0,523,1,2413,
-4197,16,0,523,1,
-1901,4198,16,0,523,
-1,2198,4199,16,0,
-523,1,2106,4200,16,
-0,523,1,1804,4201,
-16,0,523,1,1990,
-4202,16,0,523,1,
-32,4203,16,0,523,
-1,1958,4204,16,0,
-523,1,1775,4205,16,
-0,523,1,122,4206,
-19,522,1,122,4207,
-5,11,1,2075,4208,
-16,0,520,1,2337,
-4209,16,0,520,1,
-2413,4210,16,0,520,
-1,1901,4211,16,0,
-520,1,2198,4212,16,
-0,520,1,2106,4213,
-16,0,520,1,1804,
-4214,16,0,520,1,
-1990,4215,16,0,520,
-1,32,4216,16,0,
-520,1,1958,4217,16,
-0,520,1,1775,4218,
-16,0,520,1,123,
-4219,19,519,1,123,
-4220,5,11,1,2075,
-4221,16,0,517,1,
-2337,4222,16,0,517,
-1,2413,4223,16,0,
-517,1,1901,4224,16,
-0,517,1,2198,4225,
-16,0,517,1,2106,
-4226,16,0,517,1,
-1804,4227,16,0,517,
-1,1990,4228,16,0,
-517,1,32,4229,16,
-0,517,1,1958,4230,
-16,0,517,1,1775,
-4231,16,0,517,1,
-124,4232,19,147,1,
-124,4233,5,3,1,
-1756,4234,16,0,292,
-1,2318,4235,16,0,
-304,1,1659,4236,16,
-0,145,1,125,4237,
-19,558,1,125,4238,
-5,68,1,1901,4239,
-16,0,556,1,1479,
-4240,16,0,556,1,
-112,4241,16,0,556,
-1,2293,4242,16,0,
-556,1,1804,4243,16,
-0,556,1,431,4244,
-16,0,556,1,1443,
-4245,16,0,556,1,
-1756,4246,16,0,556,
-1,124,4247,16,0,
-556,1,525,4248,16,
-0,556,1,236,4249,
-16,0,556,1,346,
-4250,16,0,556,1,
-1876,4251,16,0,556,
-1,1659,4252,16,0,
-556,1,1225,4253,16,
-0,556,1,1117,4254,
-16,0,556,1,137,
-4255,16,0,556,1,
-2318,4256,16,0,556,
-1,2670,4257,16,0,
-556,1,1775,4258,16,
-0,556,1,32,4259,
-16,0,556,1,1407,
-4260,16,0,556,1,
-256,4261,16,0,556,
-1,459,4262,16,0,
-556,1,406,4263,16,
-0,556,1,41,4264,
-16,0,556,1,151,
-4265,16,0,556,1,
-43,4266,16,0,556,
-1,1585,4267,16,0,
-556,1,1990,4268,16,
-0,556,1,2337,4269,
-16,0,556,1,509,
-4270,16,0,556,1,
-52,4271,16,0,556,
-1,381,4272,16,0,
-556,1,447,4273,16,
-0,556,1,166,4274,
-16,0,556,1,462,
-4275,16,0,556,1,
-277,4276,16,0,556,
-1,1695,4277,16,0,
-556,1,62,4278,16,
-0,603,1,1153,4279,
-16,0,556,1,2106,
-4280,16,0,556,1,
-1335,4281,16,0,556,
-1,71,4282,16,0,
-556,1,182,4283,16,
-0,556,1,76,4284,
-16,0,556,1,79,
-4285,16,0,556,1,
-1933,4286,16,0,556,
-1,299,4287,16,0,
-556,1,85,4288,16,
-0,556,1,1515,4289,
-16,0,556,1,2198,
-4290,16,0,556,1,
-89,4291,16,0,556,
-1,1834,4292,16,0,
-556,1,1622,4293,16,
-0,556,1,2413,4294,
-16,0,556,1,2075,
-4295,16,0,556,1,
-1731,4296,16,0,556,
-1,97,4297,16,0,
-556,1,1297,4298,16,
-0,556,1,1189,4299,
-16,0,556,1,102,
-4300,16,0,556,1,
-1261,4301,16,0,556,
-1,322,4302,16,0,
-556,1,1958,4303,16,
-0,556,1,199,4304,
-16,0,556,1,1371,
-4305,16,0,556,1,
-217,4306,16,0,556,
-1,126,4307,19,618,
-1,126,4308,5,2,
-1,459,4309,16,0,
-616,1,41,4310,16,
-0,676,1,127,4311,
-19,622,1,127,4312,
-5,3,1,462,4313,
-16,0,620,1,459,
-4314,16,0,643,1,
-41,4315,16,0,643,
-1,128,4316,19,4317,
-4,36,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,1,128,
-4312,1,129,4318,19,
-554,1,129,4319,5,
-68,1,1901,4320,16,
-0,552,1,1479,4321,
-16,0,552,1,112,
-4322,16,0,552,1,
-2293,4323,16,0,552,
-1,1804,4324,16,0,
-552,1,431,4325,16,
-0,552,1,1443,4326,
-16,0,552,1,1756,
-4327,16,0,552,1,
-124,4328,16,0,552,
-1,525,4329,16,0,
-552,1,236,4330,16,
-0,552,1,346,4331,
-16,0,552,1,1876,
-4332,16,0,552,1,
-1659,4333,16,0,552,
-1,1225,4334,16,0,
-552,1,1117,4335,16,
-0,552,1,137,4336,
-16,0,552,1,2318,
-4337,16,0,552,1,
-2670,4338,16,0,552,
-1,1775,4339,16,0,
-552,1,32,4340,16,
-0,552,1,1407,4341,
-16,0,552,1,256,
-4342,16,0,552,1,
-459,4343,16,0,552,
-1,406,4344,16,0,
-552,1,41,4345,16,
-0,552,1,151,4346,
-16,0,552,1,43,
-4347,16,0,552,1,
-1585,4348,16,0,552,
-1,1990,4349,16,0,
-552,1,2337,4350,16,
-0,552,1,509,4351,
-16,0,552,1,52,
-4352,16,0,552,1,
-381,4353,16,0,552,
-1,447,4354,16,0,
-552,1,166,4355,16,
-0,552,1,462,4356,
-16,0,552,1,277,
-4357,16,0,552,1,
-1695,4358,16,0,552,
-1,62,4359,16,0,
-604,1,1153,4360,16,
-0,552,1,2106,4361,
-16,0,552,1,1335,
-4362,16,0,552,1,
-71,4363,16,0,552,
-1,182,4364,16,0,
-552,1,76,4365,16,
-0,552,1,79,4366,
-16,0,552,1,1933,
-4367,16,0,552,1,
-299,4368,16,0,552,
-1,85,4369,16,0,
-552,1,1515,4370,16,
-0,552,1,2198,4371,
-16,0,552,1,89,
-4372,16,0,552,1,
-1834,4373,16,0,552,
-1,1622,4374,16,0,
-552,1,2413,4375,16,
-0,552,1,2075,4376,
-16,0,552,1,1731,
-4377,16,0,552,1,
-97,4378,16,0,552,
-1,1297,4379,16,0,
-552,1,1189,4380,16,
-0,552,1,102,4381,
-16,0,552,1,1261,
-4382,16,0,552,1,
-322,4383,16,0,552,
-1,1958,4384,16,0,
-552,1,199,4385,16,
-0,552,1,1371,4386,
-16,0,552,1,217,
-4387,16,0,552,1,
-130,4388,19,4389,4,
-28,86,0,101,0,
-99,0,116,0,111,
-0,114,0,67,0,
+4113,16,0,529,1,
+1901,4114,16,0,529,
+1,2531,4115,16,0,
+573,1,2681,4116,16,
+0,694,1,2106,4117,
+16,0,529,1,1804,
+4118,16,0,529,1,
+1990,4119,16,0,529,
+1,31,4120,16,0,
+342,1,32,4121,16,
+0,529,1,1958,4122,
+16,0,529,1,1775,
+4123,16,0,529,1,
+115,4124,19,301,1,
+115,4125,5,1,1,
+32,4126,16,0,299,
+1,116,4127,19,261,
+1,116,4128,5,11,
+1,2075,4129,16,0,
+601,1,2337,4130,16,
+0,265,1,2413,4131,
+16,0,472,1,1901,
+4132,16,0,400,1,
+2198,4133,16,0,321,
+1,2106,4134,16,0,
+637,1,1804,4135,16,
+0,284,1,1990,4136,
+16,0,517,1,32,
+4137,16,0,338,1,
+1958,4138,16,0,475,
+1,1775,4139,16,0,
+259,1,117,4140,19,
+607,1,117,4141,5,
+11,1,2075,4142,16,
+0,605,1,2337,4143,
+16,0,605,1,2413,
+4144,16,0,605,1,
+1901,4145,16,0,605,
+1,2198,4146,16,0,
+605,1,2106,4147,16,
+0,605,1,1804,4148,
+16,0,605,1,1990,
+4149,16,0,605,1,
+32,4150,16,0,605,
+1,1958,4151,16,0,
+605,1,1775,4152,16,
+0,605,1,118,4153,
+19,665,1,118,4154,
+5,11,1,2075,4155,
+16,0,663,1,2337,
+4156,16,0,663,1,
+2413,4157,16,0,663,
+1,1901,4158,16,0,
+663,1,2198,4159,16,
+0,663,1,2106,4160,
+16,0,663,1,1804,
+4161,16,0,663,1,
+1990,4162,16,0,663,
+1,32,4163,16,0,
+663,1,1958,4164,16,
+0,663,1,1775,4165,
+16,0,663,1,119,
+4166,19,161,1,119,
+4167,5,31,1,1901,
+4168,16,0,667,1,
+1479,4169,16,0,576,
+1,2075,4170,16,0,
+667,1,1695,4171,16,
+0,190,1,1756,4172,
+16,0,188,1,2413,
+4173,16,0,667,1,
+2198,4174,16,0,667,
+1,1876,4175,16,0,
+688,1,1659,4176,16,
+0,188,1,1443,4177,
+16,0,545,1,1117,
+4178,16,0,159,1,
+1990,4179,16,0,667,
+1,1189,4180,16,0,
+238,1,1775,4181,16,
+0,667,1,32,4182,
+16,0,667,1,2106,
+4183,16,0,667,1,
+1515,4184,16,0,603,
+1,2337,4185,16,0,
+667,1,52,4186,16,
+0,620,1,1804,4187,
+16,0,667,1,1261,
+4188,16,0,295,1,
+1153,4189,16,0,245,
+1,1225,4190,16,0,
+274,1,1335,4191,16,
+0,465,1,1933,4192,
+16,0,578,1,1834,
+4193,16,0,311,1,
+1297,4194,16,0,328,
+1,1407,4195,16,0,
+589,1,2318,4196,16,
+0,188,1,1958,4197,
+16,0,667,1,1371,
+4198,16,0,460,1,
+120,4199,19,554,1,
+120,4200,5,11,1,
+2075,4201,16,0,552,
+1,2337,4202,16,0,
+552,1,2413,4203,16,
+0,552,1,1901,4204,
+16,0,552,1,2198,
+4205,16,0,552,1,
+2106,4206,16,0,552,
+1,1804,4207,16,0,
+552,1,1990,4208,16,
+0,552,1,32,4209,
+16,0,552,1,1958,
+4210,16,0,552,1,
+1775,4211,16,0,552,
+1,121,4212,19,550,
+1,121,4213,5,11,
+1,2075,4214,16,0,
+548,1,2337,4215,16,
+0,548,1,2413,4216,
+16,0,548,1,1901,
+4217,16,0,548,1,
+2198,4218,16,0,548,
+1,2106,4219,16,0,
+548,1,1804,4220,16,
+0,548,1,1990,4221,
+16,0,548,1,32,
+4222,16,0,548,1,
+1958,4223,16,0,548,
+1,1775,4224,16,0,
+548,1,122,4225,19,
+597,1,122,4226,5,
+11,1,2075,4227,16,
+0,595,1,2337,4228,
+16,0,595,1,2413,
+4229,16,0,595,1,
+1901,4230,16,0,595,
+1,2198,4231,16,0,
+595,1,2106,4232,16,
+0,595,1,1804,4233,
+16,0,595,1,1990,
+4234,16,0,595,1,
+32,4235,16,0,595,
+1,1958,4236,16,0,
+595,1,1775,4237,16,
+0,595,1,123,4238,
+19,544,1,123,4239,
+5,11,1,2075,4240,
+16,0,542,1,2337,
+4241,16,0,542,1,
+2413,4242,16,0,542,
+1,1901,4243,16,0,
+542,1,2198,4244,16,
+0,542,1,2106,4245,
+16,0,542,1,1804,
+4246,16,0,542,1,
+1990,4247,16,0,542,
+1,32,4248,16,0,
+542,1,1958,4249,16,
+0,542,1,1775,4250,
+16,0,542,1,124,
+4251,19,541,1,124,
+4252,5,11,1,2075,
+4253,16,0,539,1,
+2337,4254,16,0,539,
+1,2413,4255,16,0,
+539,1,1901,4256,16,
+0,539,1,2198,4257,
+16,0,539,1,2106,
+4258,16,0,539,1,
+1804,4259,16,0,539,
+1,1990,4260,16,0,
+539,1,32,4261,16,
+0,539,1,1958,4262,
+16,0,539,1,1775,
+4263,16,0,539,1,
+125,4264,19,538,1,
+125,4265,5,11,1,
+2075,4266,16,0,536,
+1,2337,4267,16,0,
+536,1,2413,4268,16,
+0,536,1,1901,4269,
+16,0,536,1,2198,
+4270,16,0,536,1,
+2106,4271,16,0,536,
+1,1804,4272,16,0,
+536,1,1990,4273,16,
+0,536,1,32,4274,
+16,0,536,1,1958,
+4275,16,0,536,1,
+1775,4276,16,0,536,
+1,126,4277,19,535,
+1,126,4278,5,11,
+1,2075,4279,16,0,
+533,1,2337,4280,16,
+0,533,1,2413,4281,
+16,0,533,1,1901,
+4282,16,0,533,1,
+2198,4283,16,0,533,
+1,2106,4284,16,0,
+533,1,1804,4285,16,
+0,533,1,1990,4286,
+16,0,533,1,32,
+4287,16,0,533,1,
+1958,4288,16,0,533,
+1,1775,4289,16,0,
+533,1,127,4290,19,
+532,1,127,4291,5,
+11,1,2075,4292,16,
+0,530,1,2337,4293,
+16,0,530,1,2413,
+4294,16,0,530,1,
+1901,4295,16,0,530,
+1,2198,4296,16,0,
+530,1,2106,4297,16,
+0,530,1,1804,4298,
+16,0,530,1,1990,
+4299,16,0,530,1,
+32,4300,16,0,530,
+1,1958,4301,16,0,
+530,1,1775,4302,16,
+0,530,1,128,4303,
+19,147,1,128,4304,
+5,3,1,1756,4305,
+16,0,283,1,2318,
+4306,16,0,294,1,
+1659,4307,16,0,145,
+1,129,4308,19,571,
+1,129,4309,5,68,
+1,1901,4310,16,0,
+569,1,1479,4311,16,
+0,569,1,112,4312,
+16,0,569,1,2293,
+4313,16,0,569,1,
+1804,4314,16,0,569,
+1,431,4315,16,0,
+569,1,1443,4316,16,
+0,569,1,1756,4317,
+16,0,569,1,124,
+4318,16,0,569,1,
+525,4319,16,0,569,
+1,236,4320,16,0,
+569,1,346,4321,16,
+0,569,1,1876,4322,
+16,0,569,1,1659,
+4323,16,0,569,1,
+1225,4324,16,0,569,
+1,1117,4325,16,0,
+569,1,137,4326,16,
+0,569,1,2318,4327,
+16,0,569,1,1775,
+4328,16,0,569,1,
+32,4329,16,0,569,
+1,1407,4330,16,0,
+569,1,256,4331,16,
+0,569,1,459,4332,
+16,0,569,1,406,
+4333,16,0,569,1,
+41,4334,16,0,569,
+1,151,4335,16,0,
+569,1,43,4336,16,
+0,569,1,1585,4337,
+16,0,569,1,2686,
+4338,16,0,569,1,
+1990,4339,16,0,569,
+1,2337,4340,16,0,
+569,1,509,4341,16,
+0,569,1,52,4342,
+16,0,569,1,381,
+4343,16,0,569,1,
+447,4344,16,0,569,
+1,166,4345,16,0,
+569,1,462,4346,16,
+0,569,1,277,4347,
+16,0,569,1,1695,
+4348,16,0,569,1,
+62,4349,16,0,615,
+1,1153,4350,16,0,
+569,1,2106,4351,16,
+0,569,1,1335,4352,
+16,0,569,1,71,
+4353,16,0,569,1,
+182,4354,16,0,569,
+1,76,4355,16,0,
+569,1,79,4356,16,
+0,569,1,1933,4357,
+16,0,569,1,299,
+4358,16,0,569,1,
+85,4359,16,0,569,
+1,1515,4360,16,0,
+569,1,2198,4361,16,
+0,569,1,89,4362,
+16,0,569,1,1834,
+4363,16,0,569,1,
+1622,4364,16,0,569,
+1,2413,4365,16,0,
+569,1,2075,4366,16,
+0,569,1,1731,4367,
+16,0,569,1,97,
+4368,16,0,569,1,
+1297,4369,16,0,569,
+1,1189,4370,16,0,
+569,1,102,4371,16,
+0,569,1,1261,4372,
+16,0,569,1,322,
+4373,16,0,569,1,
+1958,4374,16,0,569,
+1,199,4375,16,0,
+569,1,1371,4376,16,
+0,569,1,217,4377,
+16,0,569,1,130,
+4378,19,632,1,130,
+4379,5,2,1,459,
+4380,16,0,630,1,
+41,4381,16,0,691,
+1,131,4382,19,636,
+1,131,4383,5,3,
+1,462,4384,16,0,
+634,1,459,4385,16,
+0,656,1,41,4386,
+16,0,656,1,132,
+4387,19,4388,4,36,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,1,132,4383,1,
+133,4389,19,567,1,
+133,4390,5,68,1,
+1901,4391,16,0,565,
+1,1479,4392,16,0,
+565,1,112,4393,16,
+0,565,1,2293,4394,
+16,0,565,1,1804,
+4395,16,0,565,1,
+431,4396,16,0,565,
+1,1443,4397,16,0,
+565,1,1756,4398,16,
+0,565,1,124,4399,
+16,0,565,1,525,
+4400,16,0,565,1,
+236,4401,16,0,565,
+1,346,4402,16,0,
+565,1,1876,4403,16,
+0,565,1,1659,4404,
+16,0,565,1,1225,
+4405,16,0,565,1,
+1117,4406,16,0,565,
+1,137,4407,16,0,
+565,1,2318,4408,16,
+0,565,1,1775,4409,
+16,0,565,1,32,
+4410,16,0,565,1,
+1407,4411,16,0,565,
+1,256,4412,16,0,
+565,1,459,4413,16,
+0,565,1,406,4414,
+16,0,565,1,41,
+4415,16,0,565,1,
+151,4416,16,0,565,
+1,43,4417,16,0,
+565,1,1585,4418,16,
+0,565,1,2686,4419,
+16,0,565,1,1990,
+4420,16,0,565,1,
+2337,4421,16,0,565,
+1,509,4422,16,0,
+565,1,52,4423,16,
+0,565,1,381,4424,
+16,0,565,1,447,
+4425,16,0,565,1,
+166,4426,16,0,565,
+1,462,4427,16,0,
+565,1,277,4428,16,
+0,565,1,1695,4429,
+16,0,565,1,62,
+4430,16,0,616,1,
+1153,4431,16,0,565,
+1,2106,4432,16,0,
+565,1,1335,4433,16,
+0,565,1,71,4434,
+16,0,565,1,182,
+4435,16,0,565,1,
+76,4436,16,0,565,
+1,79,4437,16,0,
+565,1,1933,4438,16,
+0,565,1,299,4439,
+16,0,565,1,85,
+4440,16,0,565,1,
+1515,4441,16,0,565,
+1,2198,4442,16,0,
+565,1,89,4443,16,
+0,565,1,1834,4444,
+16,0,565,1,1622,
+4445,16,0,565,1,
+2413,4446,16,0,565,
+1,2075,4447,16,0,
+565,1,1731,4448,16,
+0,565,1,97,4449,
+16,0,565,1,1297,
+4450,16,0,565,1,
+1189,4451,16,0,565,
+1,102,4452,16,0,
+565,1,1261,4453,16,
+0,565,1,322,4454,
+16,0,565,1,1958,
+4455,16,0,565,1,
+199,4456,16,0,565,
+1,1371,4457,16,0,
+565,1,217,4458,16,
+0,565,1,134,4459,
+19,4460,4,28,86,
+0,101,0,99,0,
+116,0,111,0,114,
+0,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,1,134,4390,
+1,135,4461,19,4462,
+4,32,82,0,111,
+0,116,0,97,0,
+116,0,105,0,111,
+0,110,0,67,0,
 111,0,110,0,115,
 0,116,0,97,0,
 110,0,116,0,1,
-130,4319,1,131,4390,
-19,4391,4,32,82,
-0,111,0,116,0,
-97,0,116,0,105,
-0,111,0,110,0,
+135,4390,1,136,4463,
+19,4464,4,24,76,
+0,105,0,115,0,
+116,0,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
+0,116,0,1,136,
+4390,1,137,4465,19,
+169,1,137,4466,5,
+67,1,1901,4467,16,
+0,612,1,1479,4468,
+16,0,556,1,112,
+4469,16,0,247,1,
+2293,4470,16,0,273,
+1,1804,4471,16,0,
+612,1,431,4472,16,
+0,604,1,1443,4473,
+16,0,485,1,1756,
+4474,16,0,701,1,
+124,4475,16,0,255,
+1,525,4476,16,0,
+304,1,236,4477,16,
+0,350,1,346,4478,
+16,0,519,1,1876,
+4479,16,0,320,1,
+1659,4480,16,0,701,
+1,1225,4481,16,0,
+246,1,1117,4482,16,
+0,220,1,137,4483,
+16,0,272,1,2318,
+4484,16,0,701,1,
+1775,4485,16,0,612,
+1,32,4486,16,0,
+612,1,1407,4487,16,
+0,504,1,256,4488,
+16,0,404,1,459,
+4489,16,0,167,1,
+406,4490,16,0,582,
+1,41,4491,16,0,
+167,1,151,4492,16,
+0,282,1,43,4493,
+16,0,658,1,2686,
+4494,16,0,700,1,
+1990,4495,16,0,612,
+1,2337,4496,16,0,
+612,1,509,4497,16,
+0,677,1,52,4498,
+16,0,622,1,381,
+4499,16,0,574,1,
+447,4500,16,0,304,
+1,166,4501,16,0,
+293,1,462,4502,16,
+0,167,1,277,4503,
+16,0,448,1,1695,
+4504,16,0,270,1,
+1261,4505,16,0,281,
+1,1153,4506,16,0,
+174,1,2106,4507,16,
+0,612,1,1335,4508,
+16,0,335,1,71,
+4509,16,0,204,1,
+182,4510,16,0,304,
+1,76,4511,16,0,
+572,1,79,4512,16,
+0,219,1,1933,4513,
+16,0,416,1,299,
+4514,16,0,468,1,
+85,4515,16,0,482,
+1,1515,4516,16,0,
+581,1,2198,4517,16,
+0,612,1,89,4518,
+16,0,228,1,1834,
+4519,16,0,292,1,
+1622,4520,16,0,676,
+1,2413,4521,16,0,
+612,1,2075,4522,16,
+0,612,1,1731,4523,
+16,0,248,1,97,
+4524,16,0,420,1,
+1297,4525,16,0,337,
+1,1189,4526,16,0,
+218,1,102,4527,16,
+0,236,1,1585,4528,
+16,0,690,1,322,
+4529,16,0,483,1,
+1958,4530,16,0,612,
+1,199,4531,16,0,
+315,1,1371,4532,16,
+0,405,1,217,4533,
+16,0,334,1,138,
+4534,19,4535,4,36,
 67,0,111,0,110,
 0,115,0,116,0,
 97,0,110,0,116,
-0,1,131,4319,1,
-132,4392,19,4393,4,
-24,76,0,105,0,
-115,0,116,0,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-1,132,4319,1,133,
-4394,19,178,1,133,
-4395,5,67,1,1901,
-4396,16,0,600,1,
-1479,4397,16,0,543,
-1,112,4398,16,0,
-259,1,2293,4399,16,
-0,282,1,1804,4400,
-16,0,600,1,431,
-4401,16,0,595,1,
-1443,4402,16,0,474,
-1,1756,4403,16,0,
-683,1,124,4404,16,
-0,267,1,525,4405,
-16,0,314,1,236,
-4406,16,0,349,1,
-346,4407,16,0,506,
-1,1876,4408,16,0,
-326,1,1659,4409,16,
-0,683,1,1225,4410,
-16,0,258,1,1117,
-4411,16,0,229,1,
-137,4412,16,0,281,
-1,2318,4413,16,0,
-683,1,2670,4414,16,
-0,606,1,1775,4415,
-16,0,600,1,32,
-4416,16,0,600,1,
-1407,4417,16,0,497,
-1,256,4418,16,0,
-403,1,459,4419,16,
-0,176,1,406,4420,
-16,0,568,1,41,
-4421,16,0,176,1,
-151,4422,16,0,291,
-1,43,4423,16,0,
-645,1,1990,4424,16,
-0,600,1,2337,4425,
-16,0,600,1,509,
-4426,16,0,665,1,
-52,4427,16,0,610,
-1,381,4428,16,0,
-560,1,447,4429,16,
-0,314,1,166,4430,
-16,0,302,1,462,
-4431,16,0,176,1,
-277,4432,16,0,447,
-1,1695,4433,16,0,
-279,1,1261,4434,16,
-0,290,1,1153,4435,
-16,0,183,1,2106,
-4436,16,0,600,1,
-1335,4437,16,0,334,
-1,71,4438,16,0,
-213,1,182,4439,16,
-0,314,1,76,4440,
-16,0,559,1,79,
-4441,16,0,228,1,
-1933,4442,16,0,415,
-1,299,4443,16,0,
-460,1,85,4444,16,
-0,471,1,1515,4445,
-16,0,567,1,2198,
-4446,16,0,600,1,
-89,4447,16,0,237,
-1,1834,4448,16,0,
-301,1,1622,4449,16,
-0,664,1,2413,4450,
-16,0,600,1,2075,
-4451,16,0,600,1,
-1731,4452,16,0,263,
-1,97,4453,16,0,
-419,1,1297,4454,16,
-0,336,1,1189,4455,
-16,0,227,1,102,
-4456,16,0,248,1,
-1585,4457,16,0,675,
-1,322,4458,16,0,
-472,1,1958,4459,16,
-0,600,1,199,4460,
-16,0,325,1,1371,
-4461,16,0,404,1,
-217,4462,16,0,333,
-1,134,4463,19,4464,
-4,36,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,69,0,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,1,138,4466,1,
+139,4536,19,4537,4,
+30,73,0,100,0,
+101,0,110,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,1,139,4466,1,
+140,4538,19,4539,4,
+36,73,0,100,0,
+101,0,110,0,116,
+0,68,0,111,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,140,4466,
+1,141,4540,19,4541,
+4,44,70,0,117,
+0,110,0,99,0,
+116,0,105,0,111,
+0,110,0,67,0,
+97,0,108,0,108,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,1,141,4466,1,
+142,4542,19,4543,4,
+32,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
-0,110,0,1,134,
-4395,1,135,4465,19,
-4466,4,30,73,0,
-100,0,101,0,110,
-0,116,0,69,0,
+0,110,0,1,142,
+4466,1,143,4544,19,
+4545,4,30,85,0,
+110,0,97,0,114,
+0,121,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
-0,110,0,1,135,
-4395,1,136,4467,19,
-4468,4,36,73,0,
-100,0,101,0,110,
-0,116,0,68,0,
-111,0,116,0,69,
+0,110,0,1,143,
+4466,1,144,4546,19,
+4547,4,36,84,0,
+121,0,112,0,101,
+0,99,0,97,0,
+115,0,116,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,1,
-136,4395,1,137,4469,
-19,4470,4,44,70,
-0,117,0,110,0,
-99,0,116,0,105,
-0,111,0,110,0,
-67,0,97,0,108,
-0,108,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,137,
-4395,1,138,4471,19,
-4472,4,32,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-1,138,4395,1,139,
-4473,19,4474,4,30,
-85,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-1,139,4395,1,140,
-4475,19,4476,4,36,
-84,0,121,0,112,
-0,101,0,99,0,
-97,0,115,0,116,
+144,4466,1,145,4548,
+19,4549,4,42,80,
+0,97,0,114,0,
+101,0,110,0,116,
+0,104,0,101,0,
+115,0,105,0,115,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,1,140,4395,1,
-141,4477,19,4478,4,
-42,80,0,97,0,
-114,0,101,0,110,
-0,116,0,104,0,
-101,0,115,0,105,
-0,115,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,141,
-4395,1,142,4479,19,
-4480,4,56,73,0,
-110,0,99,0,114,
-0,101,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
+0,1,145,4466,1,
+146,4550,19,4551,4,
+56,73,0,110,0,
 99,0,114,0,101,
 0,109,0,101,0,
-110,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,1,
-142,4395,1,144,4481,
-19,715,1,144,3941,
-1,145,4482,19,720,
-1,145,3941,1,146,
-4483,19,3246,1,146,
-3944,1,147,4484,19,
-3220,1,147,3944,1,
-148,4485,19,3241,1,
-148,3944,1,149,4486,
-19,3215,1,149,3944,
-1,150,4487,19,3226,
-1,150,3947,1,151,
-4488,19,3256,1,151,
-3947,1,152,4489,19,
-3251,1,152,3951,1,
-153,4490,19,3236,1,
-153,3951,1,154,4491,
-19,698,1,154,3955,
-1,155,4492,19,693,
-1,155,3955,1,156,
-4493,19,709,1,156,
-3959,1,157,4494,19,
-704,1,157,3959,1,
-158,4495,19,1648,1,
-158,3965,1,159,4496,
-19,1658,1,159,3965,
-1,160,4497,19,1663,
-1,160,3965,1,161,
-4498,19,1653,1,161,
-3965,1,162,4499,19,
-1640,1,162,3969,1,
-163,4500,19,1633,1,
-163,3975,1,164,4501,
-19,1704,1,164,3981,
-1,165,4502,19,1679,
-1,165,3981,1,166,
-4503,19,1127,1,166,
-3986,1,167,4504,19,
-911,1,167,4037,1,
-168,4505,19,895,1,
-168,4037,1,169,4506,
-19,901,1,169,4054,
-1,170,4507,19,889,
-1,170,4054,1,171,
-4508,19,1155,1,171,
-4070,1,172,4509,19,
-792,1,172,4057,1,
-173,4510,19,906,1,
-173,4057,1,174,4511,
-19,787,1,174,4057,
-1,175,4512,19,812,
-1,175,4057,1,176,
-4513,19,781,1,176,
-4057,1,177,4514,19,
-775,1,177,4057,1,
-178,4515,19,770,1,
-178,4057,1,179,4516,
-19,765,1,179,4057,
-1,180,4517,19,759,
-1,180,4057,1,181,
-4518,19,754,1,181,
-4057,1,182,4519,19,
-749,1,182,4057,1,
-183,4520,19,744,1,
-183,4057,1,184,4521,
-19,739,1,184,4057,
-1,185,4522,19,1162,
-1,185,4142,1,186,
-4523,19,1300,1,186,
-4155,1,187,4524,19,
-1149,1,187,4168,1,
-188,4525,19,1288,1,
-188,4168,1,189,4526,
-19,928,1,189,4181,
-1,190,4527,19,732,
-1,190,4181,1,191,
-4528,19,827,1,191,
-4181,1,192,4529,19,
-855,1,192,4181,1,
-193,4530,19,874,1,
-193,4194,1,194,4531,
-19,920,1,194,4194,
-1,195,4532,19,835,
-1,195,4207,1,196,
-4533,19,848,1,196,
-4207,1,197,4534,19,
-801,1,197,4220,1,
-198,4535,19,840,1,
-198,4220,1,199,4536,
-19,1478,1,199,4233,
-1,200,4537,19,1168,
-1,200,4233,1,201,
-4538,19,1510,1,201,
-4233,1,202,4539,19,
-1547,1,202,4233,1,
-203,4540,19,1416,1,
-203,4083,1,204,4541,
-19,1532,1,204,4083,
-1,205,4542,19,1143,
-1,205,4096,1,206,
-4543,19,1579,1,206,
-4096,1,207,4544,19,
-1505,1,207,4096,1,
-208,4545,19,1460,1,
-208,4096,1,209,4546,
-19,1384,1,209,4096,
-1,210,4547,19,1310,
-1,210,4096,1,211,
-4548,19,1320,1,211,
-4096,1,212,4549,19,
-1138,1,212,4096,1,
-213,4550,19,1563,1,
-213,4096,1,214,4551,
-19,1500,1,214,4096,
-1,215,4552,19,1450,
-1,215,4096,1,216,
-4553,19,1373,1,216,
-4096,1,217,4554,19,
-1336,1,217,4096,1,
-218,4555,19,1121,1,
-218,4096,1,219,4556,
-19,1466,1,219,4096,
-1,220,4557,19,1488,
-1,220,4096,1,221,
-4558,19,1443,1,221,
-4096,1,222,4559,19,
-1596,1,222,4096,1,
-223,4560,19,1276,1,
-223,4096,1,224,4561,
-19,1180,1,224,4096,
-1,225,4562,19,1110,
-1,225,4096,1,226,
-4563,19,1537,1,226,
-4096,1,227,4564,19,
-1483,1,227,4096,1,
-228,4565,19,1438,1,
-228,4096,1,229,4566,
-19,1305,1,229,4129,
-1,230,4567,19,1283,
-1,230,4129,1,231,
-4568,19,1568,1,231,
-4319,1,232,4569,19,
-1591,1,232,4319,1,
-233,4570,19,1558,1,
-233,4319,1,234,4571,
-19,1553,1,234,4319,
-1,235,4572,19,1574,
-1,235,4319,1,236,
-4573,19,1516,1,236,
-4319,1,237,4574,19,
-1230,1,237,4319,1,
-238,4575,19,1405,1,
-238,4395,1,239,4576,
-19,1191,1,239,4395,
-1,240,4577,19,1198,
-1,240,4395,1,241,
-4578,19,1219,1,241,
-4395,1,242,4579,19,
-1214,1,242,4395,1,
-243,4580,19,1209,1,
-243,4395,1,244,4581,
-19,1204,1,244,4395,
-1,245,4582,19,1394,
-1,245,4395,1,246,
-4583,19,1422,1,246,
-4395,1,247,4584,19,
-1399,1,247,4395,1,
-248,4585,19,1389,1,
-248,4395,1,249,4586,
-19,1379,1,249,4395,
-1,250,4587,19,1362,
-1,250,4395,1,251,
-4588,19,1315,1,251,
-4395,1,252,4589,19,
-1224,1,252,4395,1,
-253,4590,19,1185,1,
-253,4395,1,254,4591,
-19,1133,1,254,4395,
-1,255,4592,19,1586,
-1,255,4395,1,256,
-4593,19,1542,1,256,
-4395,1,257,4594,19,
-1527,1,257,4395,1,
-258,4595,19,1522,1,
-258,4395,1,259,4596,
-19,1473,1,259,4395,
-1,260,4597,19,1455,
-1,260,4395,1,261,
-4598,19,1432,1,261,
-4395,1,262,4599,19,
-1427,1,262,4395,1,
-263,4600,19,1368,1,
-263,4395,1,264,4601,
-19,1344,1,264,4395,
-1,265,4602,19,1410,
-1,265,4395,1,266,
-4603,19,1494,1,266,
-4395,1,267,4604,19,
-1357,1,267,4395,1,
-268,4605,19,1351,1,
-268,4395,1,269,4606,
-19,1331,1,269,4395,
-1,270,4607,19,1294,
-1,270,4395,1,271,
-4608,19,1271,1,271,
-4395,1,272,4609,19,
-1116,1,272,4395,1,
-273,4610,19,1606,1,
-273,4395,1,274,4611,
-19,1236,1,274,4395,
-1,275,4612,19,1241,
-1,275,4395,1,276,
-4613,19,1261,1,276,
-4395,1,277,4614,19,
-1251,1,277,4395,1,
-278,4615,19,1256,1,
-278,4395,1,279,4616,
-19,1246,1,279,4395,
-1,280,4617,19,1601,
-1,280,4395,1,281,
-4618,19,1266,1,281,
-4395,1,282,4619,19,
-1326,1,282,4238,1,
-283,4620,19,1717,1,
-283,4308,1,284,4621,
-19,1710,1,284,4308,
-1,285,4622,19,1689,
-1,285,4312,1,286,
-4623,19,2014,1,286,
-4005,1,287,4624,19,
-2009,1,287,4005,1,
-288,4625,19,2004,1,
-288,4005,1,289,4626,
-19,1999,1,289,4005,
-1,290,4627,19,1994,
-1,290,4005,1,291,
-4628,19,1989,1,291,
-4005,1,292,4629,19,
-1984,1,292,4005,1,
-293,4630,19,1973,1,
-293,4025,1,294,4631,
-19,1968,1,294,4025,
-1,295,4632,19,1963,
-1,295,4025,1,296,
-4633,19,1958,1,296,
-4025,1,297,4634,19,
-1953,1,297,4025,1,
-298,4635,19,1948,1,
-298,4025,1,299,4636,
-19,1943,1,299,4025,
-1,300,4637,19,1938,
-1,300,4025,1,301,
-4638,19,1933,1,301,
-4025,1,302,4639,19,
-1767,1,302,4025,1,
-303,4640,19,1927,1,
-303,4025,1,304,4641,
-19,1922,1,304,4025,
-1,305,4642,19,1917,
-1,305,4025,1,306,
-4643,19,1760,1,306,
-4025,1,307,4644,19,
-1912,1,307,4025,1,
-308,4645,19,1907,1,
-308,4025,1,309,4646,
-19,1902,1,309,4025,
-1,310,4647,19,1897,
-1,310,4025,1,311,
-4648,19,1892,1,311,
-4025,1,312,4649,19,
-1887,1,312,4025,1,
-313,4650,19,1753,1,
-313,4025,1,314,4651,
-19,1881,1,314,4025,
-1,315,4652,19,1876,
-1,315,4025,1,316,
-4653,19,1871,1,316,
-4025,1,317,4654,19,
-1747,1,317,4025,1,
-318,4655,19,1865,1,
-318,4025,1,319,4656,
-19,1796,1,319,4025,
-1,320,4657,19,1860,
-1,320,4031,1,321,
-4658,19,1855,1,321,
-4031,1,322,4659,19,
-1850,1,322,4031,1,
-323,4660,19,1845,1,
-323,4031,1,324,4661,
-19,1840,1,324,4031,
-1,325,4662,19,1835,
-1,325,4031,1,326,
-4663,19,1830,1,326,
-4031,1,327,4664,19,
-4665,4,50,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
 110,0,116,0,68,
 0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,95,
-0,51,0,1,327,
-3981,1,328,4666,19,
-4667,4,28,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,76,
-0,105,0,115,0,
-116,0,95,0,51,
-0,1,328,4308,1,
-329,4668,19,4669,4,
-50,65,0,114,0,
-103,0,117,0,109,
+114,0,101,0,109,
 0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,76,
-0,105,0,115,0,
-116,0,95,0,52,
-0,1,329,3981,1,
-330,4670,19,4671,4,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,146,4466,
+1,148,4552,19,728,
+1,148,3993,1,149,
+4553,19,733,1,149,
+3993,1,150,4554,19,
+3280,1,150,3996,1,
+151,4555,19,3270,1,
+151,3996,1,152,4556,
+19,3275,1,152,3996,
+1,153,4557,19,3265,
+1,153,3996,1,154,
+4558,19,3300,1,154,
+3999,1,155,4559,19,
+3286,1,155,3999,1,
+156,4560,19,3295,1,
+156,4003,1,157,4561,
+19,3305,1,157,4003,
+1,158,4562,19,711,
+1,158,4007,1,159,
+4563,19,722,1,159,
+4007,1,160,4564,19,
+738,1,160,4011,1,
+161,4565,19,717,1,
+161,4011,1,162,4566,
+19,1693,1,162,4017,
+1,163,4567,19,1678,
+1,163,4017,1,164,
+4568,19,1683,1,164,
+4017,1,165,4569,19,
+1673,1,165,4017,1,
+166,4570,19,1688,1,
+166,4017,1,167,4571,
+19,1668,1,167,4017,
+1,168,4572,19,1699,
+1,168,4021,1,169,
+4573,19,1659,1,169,
+4027,1,170,4574,19,
+1652,1,170,4033,1,
+171,4575,19,1739,1,
+171,4039,1,172,4576,
+19,1712,1,172,4039,
+1,173,4577,19,2069,
+1,173,4044,1,174,
+4578,19,2063,1,174,
+4066,1,175,4579,19,
+1145,1,175,4047,1,
+176,4580,19,930,1,
+176,4107,1,177,4581,
+19,914,1,177,4107,
+1,178,4582,19,920,
+1,178,4125,1,179,
+4583,19,908,1,179,
+4125,1,180,4584,19,
+1173,1,180,4141,1,
+181,4585,19,811,1,
+181,4128,1,182,4586,
+19,925,1,182,4128,
+1,183,4587,19,806,
+1,183,4128,1,184,
+4588,19,831,1,184,
+4128,1,185,4589,19,
+800,1,185,4128,1,
+186,4590,19,794,1,
+186,4128,1,187,4591,
+19,789,1,187,4128,
+1,188,4592,19,784,
+1,188,4128,1,189,
+4593,19,778,1,189,
+4128,1,190,4594,19,
+773,1,190,4128,1,
+191,4595,19,768,1,
+191,4128,1,192,4596,
+19,763,1,192,4128,
+1,193,4597,19,758,
+1,193,4128,1,194,
+4598,19,1180,1,194,
+4213,1,195,4599,19,
+1318,1,195,4226,1,
+196,4600,19,1167,1,
+196,4239,1,197,4601,
+19,1306,1,197,4239,
+1,198,4602,19,947,
+1,198,4252,1,199,
+4603,19,751,1,199,
+4252,1,200,4604,19,
+846,1,200,4252,1,
+201,4605,19,874,1,
+201,4252,1,202,4606,
+19,893,1,202,4265,
+1,203,4607,19,939,
+1,203,4265,1,204,
+4608,19,854,1,204,
+4278,1,205,4609,19,
+867,1,205,4278,1,
+206,4610,19,820,1,
+206,4291,1,207,4611,
+19,859,1,207,4291,
+1,208,4612,19,1505,
+1,208,4304,1,209,
+4613,19,1186,1,209,
+4304,1,210,4614,19,
+1538,1,210,4304,1,
+211,4615,19,1570,1,
+211,4304,1,212,4616,
+19,1434,1,212,4154,
+1,213,4617,19,1493,
+1,213,4154,1,214,
+4618,19,1161,1,214,
+4167,1,215,4619,19,
+1602,1,215,4167,1,
+216,4620,19,1533,1,
+216,4167,1,217,4621,
+19,1478,1,217,4167,
+1,218,4622,19,1402,
+1,218,4167,1,219,
+4623,19,1328,1,219,
+4167,1,220,4624,19,
+1338,1,220,4167,1,
+221,4625,19,1156,1,
+221,4167,1,222,4626,
+19,1586,1,222,4167,
+1,223,4627,19,1528,
+1,223,4167,1,224,
+4628,19,1468,1,224,
+4167,1,225,4629,19,
+1391,1,225,4167,1,
+226,4630,19,1354,1,
+226,4167,1,227,4631,
+19,1139,1,227,4167,
+1,228,4632,19,1488,
+1,228,4167,1,229,
+4633,19,1516,1,229,
+4167,1,230,4634,19,
+1461,1,230,4167,1,
+231,4635,19,1483,1,
+231,4167,1,232,4636,
+19,1294,1,232,4167,
+1,233,4637,19,1198,
+1,233,4167,1,234,
+4638,19,1128,1,234,
+4167,1,235,4639,19,
+1560,1,235,4167,1,
+236,4640,19,1511,1,
+236,4167,1,237,4641,
+19,1456,1,237,4167,
+1,238,4642,19,1323,
+1,238,4200,1,239,
+4643,19,1301,1,239,
+4200,1,240,4644,19,
+1591,1,240,4390,1,
+241,4645,19,1614,1,
+241,4390,1,242,4646,
+19,1581,1,242,4390,
+1,243,4647,19,1576,
+1,243,4390,1,244,
+4648,19,1597,1,244,
+4390,1,245,4649,19,
+1544,1,245,4390,1,
+246,4650,19,1248,1,
+246,4390,1,247,4651,
+19,1423,1,247,4466,
+1,248,4652,19,1209,
+1,248,4466,1,249,
+4653,19,1216,1,249,
+4466,1,250,4654,19,
+1237,1,250,4466,1,
+251,4655,19,1232,1,
+251,4466,1,252,4656,
+19,1227,1,252,4466,
+1,253,4657,19,1222,
+1,253,4466,1,254,
+4658,19,1412,1,254,
+4466,1,255,4659,19,
+1440,1,255,4466,1,
+256,4660,19,1417,1,
+256,4466,1,257,4661,
+19,1407,1,257,4466,
+1,258,4662,19,1397,
+1,258,4466,1,259,
+4663,19,1380,1,259,
+4466,1,260,4664,19,
+1333,1,260,4466,1,
+261,4665,19,1242,1,
+261,4466,1,262,4666,
+19,1203,1,262,4466,
+1,263,4667,19,1151,
+1,263,4466,1,264,
+4668,19,1609,1,264,
+4466,1,265,4669,19,
+1565,1,265,4466,1,
+266,4670,19,1555,1,
+266,4466,1,267,4671,
+19,1550,1,267,4466,
+1,268,4672,19,1499,
+1,268,4466,1,269,
+4673,19,1473,1,269,
+4466,1,270,4674,19,
+1450,1,270,4466,1,
+271,4675,19,1445,1,
+271,4466,1,272,4676,
+19,1386,1,272,4466,
+1,273,4677,19,1362,
+1,273,4466,1,274,
+4678,19,1428,1,274,
+4466,1,275,4679,19,
+1522,1,275,4466,1,
+276,4680,19,1375,1,
+276,4466,1,277,4681,
+19,1369,1,277,4466,
+1,278,4682,19,1349,
+1,278,4466,1,279,
+4683,19,1312,1,279,
+4466,1,280,4684,19,
+1289,1,280,4466,1,
+281,4685,19,1134,1,
+281,4466,1,282,4686,
+19,1624,1,282,4466,
+1,283,4687,19,1254,
+1,283,4466,1,284,
+4688,19,1259,1,284,
+4466,1,285,4689,19,
+1279,1,285,4466,1,
+286,4690,19,1269,1,
+286,4466,1,287,4691,
+19,1274,1,287,4466,
+1,288,4692,19,1264,
+1,288,4466,1,289,
+4693,19,1619,1,289,
+4466,1,290,4694,19,
+1284,1,290,4466,1,
+291,4695,19,1344,1,
+291,4309,1,292,4696,
+19,1752,1,292,4379,
+1,293,4697,19,1745,
+1,293,4379,1,294,
+4698,19,1722,1,294,
+4383,1,295,4699,19,
+2051,1,295,4069,1,
+296,4700,19,2046,1,
+296,4069,1,297,4701,
+19,2041,1,297,4069,
+1,298,4702,19,2036,
+1,298,4069,1,299,
+4703,19,2031,1,299,
+4069,1,300,4704,19,
+2026,1,300,4069,1,
+301,4705,19,2021,1,
+301,4069,1,302,4706,
+19,2010,1,302,4089,
+1,303,4707,19,2005,
+1,303,4089,1,304,
+4708,19,2000,1,304,
+4089,1,305,4709,19,
+1995,1,305,4089,1,
+306,4710,19,1990,1,
+306,4089,1,307,4711,
+19,1985,1,307,4089,
+1,308,4712,19,1980,
+1,308,4089,1,309,
+4713,19,1975,1,309,
+4089,1,310,4714,19,
+1970,1,310,4089,1,
+311,4715,19,1804,1,
+311,4089,1,312,4716,
+19,1964,1,312,4089,
+1,313,4717,19,1959,
+1,313,4089,1,314,
+4718,19,1954,1,314,
+4089,1,315,4719,19,
+1797,1,315,4089,1,
+316,4720,19,1949,1,
+316,4089,1,317,4721,
+19,1944,1,317,4089,
+1,318,4722,19,1939,
+1,318,4089,1,319,
+4723,19,1934,1,319,
+4095,1,320,4724,19,
+1929,1,320,4095,1,
+321,4725,19,1924,1,
+321,4095,1,322,4726,
+19,1789,1,322,4095,
+1,323,4727,19,1918,
+1,323,4095,1,324,
+4728,19,1913,1,324,
+4095,1,325,4729,19,
+1908,1,325,4095,1,
+326,4730,19,1783,1,
+326,4095,1,327,4731,
+19,1902,1,327,4095,
+1,328,4732,19,1832,
+1,328,4095,1,329,
+4733,19,1897,1,329,
+4101,1,330,4734,19,
+1892,1,330,4101,1,
+331,4735,19,1887,1,
+331,4101,1,332,4736,
+19,1882,1,332,4101,
+1,333,4737,19,1877,
+1,333,4101,1,334,
+4738,19,1872,1,334,
+4101,1,335,4739,19,
+1867,1,335,4101,1,
+336,4740,19,4741,4,
 50,65,0,114,0,
 103,0,117,0,109,
 0,101,0,110,0,
@@ -10978,16 +11271,48 @@ public yyLSLSyntax
 0,116,0,105,0,
 111,0,110,0,76,
 0,105,0,115,0,
-116,0,95,0,53,
-0,1,330,3981,1,
-331,4672,19,4673,4,
+116,0,95,0,51,
+0,1,336,4039,1,
+337,4742,19,4743,4,
 28,65,0,114,0,
 103,0,117,0,109,
 0,101,0,110,0,
 116,0,76,0,105,
 0,115,0,116,0,
+95,0,51,0,1,
+337,4379,1,338,4744,
+19,4745,4,50,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
 95,0,52,0,1,
-331,4308,2,0,0};
+338,4039,1,339,4746,
+19,4747,4,50,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
+95,0,53,0,1,
+339,4039,1,340,4748,
+19,4749,4,28,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+76,0,105,0,115,
+0,116,0,95,0,
+52,0,1,340,4379,
+2,0,0};
 new Sfactory(this,"ExpressionArgument_1",new SCreator(ExpressionArgument_1_factory));
 new Sfactory(this,"SimpleAssignment_8",new SCreator(SimpleAssignment_8_factory));
 new Sfactory(this,"SimpleAssignment_9",new SCreator(SimpleAssignment_9_factory));
@@ -11012,6 +11337,7 @@ new Sfactory(this,"IdentDotExpression_1",new SCreator(IdentDotExpression_1_facto
 new Sfactory(this,"ArgumentList_4",new SCreator(ArgumentList_4_factory));
 new Sfactory(this,"Typename",new SCreator(Typename_factory));
 new Sfactory(this,"IfStatement_1",new SCreator(IfStatement_1_factory));
+new Sfactory(this,"RotationConstant_1",new SCreator(RotationConstant_1_factory));
 new Sfactory(this,"Assignment",new SCreator(Assignment_factory));
 new Sfactory(this,"CompoundStatement_1",new SCreator(CompoundStatement_1_factory));
 new Sfactory(this,"CompoundStatement_2",new SCreator(CompoundStatement_2_factory));
@@ -11044,6 +11370,7 @@ new Sfactory(this,"States_1",new SCreator(States_1_factory));
 new Sfactory(this,"States_2",new SCreator(States_2_factory));
 new Sfactory(this,"FunctionCallExpression_1",new SCreator(FunctionCallExpression_1_factory));
 new Sfactory(this,"ForLoopStatement",new SCreator(ForLoopStatement_factory));
+new Sfactory(this,"IntArgStateEvent_1",new SCreator(IntArgStateEvent_1_factory));
 new Sfactory(this,"DoWhileStatement_1",new SCreator(DoWhileStatement_1_factory));
 new Sfactory(this,"DoWhileStatement_2",new SCreator(DoWhileStatement_2_factory));
 new Sfactory(this,"ForLoopStatement_4",new SCreator(ForLoopStatement_4_factory));
@@ -11056,11 +11383,10 @@ new Sfactory(this,"SimpleAssignment_17",new SCreator(SimpleAssignment_17_factory
 new Sfactory(this,"SimpleAssignment_18",new SCreator(SimpleAssignment_18_factory));
 new Sfactory(this,"JumpStatement_1",new SCreator(JumpStatement_1_factory));
 new Sfactory(this,"GlobalDefinitions",new SCreator(GlobalDefinitions_factory));
+new Sfactory(this,"ConstantExpression_1",new SCreator(ConstantExpression_1_factory));
 new Sfactory(this,"VoidArgEvent_4",new SCreator(VoidArgEvent_4_factory));
 new Sfactory(this,"FunctionCall_1",new SCreator(FunctionCall_1_factory));
-new Sfactory(this,"ArgumentList_3",new SCreator(ArgumentList_3_factory));
 new Sfactory(this,"Assignment_2",new SCreator(Assignment_2_factory));
-new Sfactory(this,"VoidArgEvent_1",new SCreator(VoidArgEvent_1_factory));
 new Sfactory(this,"TypecastExpression_1",new SCreator(TypecastExpression_1_factory));
 new Sfactory(this,"SimpleAssignment_21",new SCreator(SimpleAssignment_21_factory));
 new Sfactory(this,"SimpleAssignment_22",new SCreator(SimpleAssignment_22_factory));
@@ -11075,10 +11401,13 @@ new Sfactory(this,"GlobalDefinitions_1",new SCreator(GlobalDefinitions_1_factory
 new Sfactory(this,"GlobalDefinitions_2",new SCreator(GlobalDefinitions_2_factory));
 new Sfactory(this,"IncrementDecrementExpression",new SCreator(IncrementDecrementExpression_factory));
 new Sfactory(this,"GlobalVariableDeclaration",new SCreator(GlobalVariableDeclaration_factory));
-new Sfactory(this,"ArgumentDeclarationList_3",new SCreator(ArgumentDeclarationList_3_factory));
+new Sfactory(this,"IntArgumentDeclarationList_1",new SCreator(IntArgumentDeclarationList_1_factory));
+new Sfactory(this,"IntDeclaration_1",new SCreator(IntDeclaration_1_factory));
+new Sfactory(this,"ArgumentDeclarationList_5",new SCreator(ArgumentDeclarationList_5_factory));
 new Sfactory(this,"Event_11",new SCreator(Event_11_factory));
 new Sfactory(this,"TypecastExpression_2",new SCreator(TypecastExpression_2_factory));
 new Sfactory(this,"TypecastExpression_3",new SCreator(TypecastExpression_3_factory));
+new Sfactory(this,"TypecastExpression_4",new SCreator(TypecastExpression_4_factory));
 new Sfactory(this,"TypecastExpression_5",new SCreator(TypecastExpression_5_factory));
 new Sfactory(this,"TypecastExpression_8",new SCreator(TypecastExpression_8_factory));
 new Sfactory(this,"Constant_1",new SCreator(Constant_1_factory));
@@ -11089,15 +11418,17 @@ new Sfactory(this,"BinaryExpression_1",new SCreator(BinaryExpression_1_factory))
 new Sfactory(this,"IfStatement_2",new SCreator(IfStatement_2_factory));
 new Sfactory(this,"IfStatement_3",new SCreator(IfStatement_3_factory));
 new Sfactory(this,"IfStatement_4",new SCreator(IfStatement_4_factory));
-new Sfactory(this,"ReturnStatement",new SCreator(ReturnStatement_factory));
 new Sfactory(this,"Event_2",new SCreator(Event_2_factory));
+new Sfactory(this,"JumpLabel_1",new SCreator(JumpLabel_1_factory));
 new Sfactory(this,"RotationConstant",new SCreator(RotationConstant_factory));
 new Sfactory(this,"Statement_12",new SCreator(Statement_12_factory));
+new Sfactory(this,"Statement_13",new SCreator(Statement_13_factory));
 new Sfactory(this,"UnaryExpression_1",new SCreator(UnaryExpression_1_factory));
 new Sfactory(this,"UnaryExpression_2",new SCreator(UnaryExpression_2_factory));
 new Sfactory(this,"UnaryExpression_3",new SCreator(UnaryExpression_3_factory));
 new Sfactory(this,"ArgumentList_1",new SCreator(ArgumentList_1_factory));
 new Sfactory(this,"ArgumentList_2",new SCreator(ArgumentList_2_factory));
+new Sfactory(this,"ArgumentList_3",new SCreator(ArgumentList_3_factory));
 new Sfactory(this,"Constant",new SCreator(Constant_factory));
 new Sfactory(this,"State",new SCreator(State_factory));
 new Sfactory(this,"Event_13",new SCreator(Event_13_factory));
@@ -11108,15 +11439,14 @@ new Sfactory(this,"IncrementDecrementExpression_2",new SCreator(IncrementDecreme
 new Sfactory(this,"GlobalVariableDeclaration_1",new SCreator(GlobalVariableDeclaration_1_factory));
 new Sfactory(this,"GlobalVariableDeclaration_2",new SCreator(GlobalVariableDeclaration_2_factory));
 new Sfactory(this,"IncrementDecrementExpression_5",new SCreator(IncrementDecrementExpression_5_factory));
-new Sfactory(this,"GlobalFunctionDefinition_2",new SCreator(GlobalFunctionDefinition_2_factory));
+new Sfactory(this,"ReturnStatement",new SCreator(ReturnStatement_factory));
 new Sfactory(this,"IncrementDecrementExpression_7",new SCreator(IncrementDecrementExpression_7_factory));
 new Sfactory(this,"IncrementDecrementExpression_8",new SCreator(IncrementDecrementExpression_8_factory));
 new Sfactory(this,"Assignment_1",new SCreator(Assignment_1_factory));
-new Sfactory(this,"Event_21",new SCreator(Event_21_factory));
-new Sfactory(this,"Event_22",new SCreator(Event_22_factory));
+new Sfactory(this,"IntArgEvent_9",new SCreator(IntArgEvent_9_factory));
+new Sfactory(this,"IntArgEvent_10",new SCreator(IntArgEvent_10_factory));
 new Sfactory(this,"CompoundStatement",new SCreator(CompoundStatement_factory));
-new Sfactory(this,"RotationConstant_1",new SCreator(RotationConstant_1_factory));
-new Sfactory(this,"TypecastExpression",new SCreator(TypecastExpression_factory));
+new Sfactory(this,"IntArgumentDeclarationList",new SCreator(IntArgumentDeclarationList_factory));
 new Sfactory(this,"SimpleAssignment_3",new SCreator(SimpleAssignment_3_factory));
 new Sfactory(this,"SimpleAssignment_4",new SCreator(SimpleAssignment_4_factory));
 new Sfactory(this,"Statement_1",new SCreator(Statement_1_factory));
@@ -11143,10 +11473,12 @@ new Sfactory(this,"IncrementDecrementExpression_3",new SCreator(IncrementDecreme
 new Sfactory(this,"IncrementDecrementExpression_4",new SCreator(IncrementDecrementExpression_4_factory));
 new Sfactory(this,"IncrementDecrementExpression_6",new SCreator(IncrementDecrementExpression_6_factory));
 new Sfactory(this,"StateEvent",new SCreator(StateEvent_factory));
-new Sfactory(this,"Event_20",new SCreator(Event_20_factory));
-new Sfactory(this,"Event_23",new SCreator(Event_23_factory));
-new Sfactory(this,"Event_24",new SCreator(Event_24_factory));
-new Sfactory(this,"Event_26",new SCreator(Event_26_factory));
+new Sfactory(this,"IntArgEvent_3",new SCreator(IntArgEvent_3_factory));
+new Sfactory(this,"IntArgEvent_4",new SCreator(IntArgEvent_4_factory));
+new Sfactory(this,"IntArgEvent_5",new SCreator(IntArgEvent_5_factory));
+new Sfactory(this,"IntArgEvent_6",new SCreator(IntArgEvent_6_factory));
+new Sfactory(this,"IntArgEvent_7",new SCreator(IntArgEvent_7_factory));
+new Sfactory(this,"IntArgEvent_8",new SCreator(IntArgEvent_8_factory));
 new Sfactory(this,"SimpleAssignment_10",new SCreator(SimpleAssignment_10_factory));
 new Sfactory(this,"Event",new SCreator(Event_factory));
 new Sfactory(this,"SimpleAssignment_14",new SCreator(SimpleAssignment_14_factory));
@@ -11154,7 +11486,7 @@ new Sfactory(this,"SimpleAssignment_16",new SCreator(SimpleAssignment_16_factory
 new Sfactory(this,"Statement_10",new SCreator(Statement_10_factory));
 new Sfactory(this,"Statement_11",new SCreator(Statement_11_factory));
 new Sfactory(this,"SimpleAssignment",new SCreator(SimpleAssignment_factory));
-new Sfactory(this,"Statement_13",new SCreator(Statement_13_factory));
+new Sfactory(this,"TypecastExpression",new SCreator(TypecastExpression_factory));
 new Sfactory(this,"Event_15",new SCreator(Event_15_factory));
 new Sfactory(this,"Event_16",new SCreator(Event_16_factory));
 new Sfactory(this,"SimpleAssignment_20",new SCreator(SimpleAssignment_20_factory));
@@ -11168,53 +11500,55 @@ new Sfactory(this,"StateBody_1",new SCreator(StateBody_1_factory));
 new Sfactory(this,"StatementList_2",new SCreator(StatementList_2_factory));
 new Sfactory(this,"StateBody_3",new SCreator(StateBody_3_factory));
 new Sfactory(this,"StateBody_4",new SCreator(StateBody_4_factory));
-new Sfactory(this,"BinaryExpression_16",new SCreator(BinaryExpression_16_factory));
-new Sfactory(this,"BinaryExpression_17",new SCreator(BinaryExpression_17_factory));
+new Sfactory(this,"StateBody_5",new SCreator(StateBody_5_factory));
+new Sfactory(this,"StateBody_6",new SCreator(StateBody_6_factory));
 new Sfactory(this,"BinaryExpression_18",new SCreator(BinaryExpression_18_factory));
-new Sfactory(this,"Event_25",new SCreator(Event_25_factory));
+new Sfactory(this,"ArgumentDeclarationList_3",new SCreator(ArgumentDeclarationList_3_factory));
 new Sfactory(this,"Event_9",new SCreator(Event_9_factory));
 new Sfactory(this,"Statement",new SCreator(Statement_factory));
 new Sfactory(this,"JumpStatement",new SCreator(JumpStatement_factory));
 new Sfactory(this,"BinaryExpression_11",new SCreator(BinaryExpression_11_factory));
-new Sfactory(this,"BinaryExpression_12",new SCreator(BinaryExpression_12_factory));
+new Sfactory(this,"IntArgEvent",new SCreator(IntArgEvent_factory));
 new Sfactory(this,"BinaryExpression_13",new SCreator(BinaryExpression_13_factory));
 new Sfactory(this,"BinaryExpression_14",new SCreator(BinaryExpression_14_factory));
 new Sfactory(this,"BinaryExpression_15",new SCreator(BinaryExpression_15_factory));
+new Sfactory(this,"BinaryExpression_16",new SCreator(BinaryExpression_16_factory));
 new Sfactory(this,"BinaryExpression_6",new SCreator(BinaryExpression_6_factory));
 new Sfactory(this,"BinaryExpression_7",new SCreator(BinaryExpression_7_factory));
 new Sfactory(this,"ArgumentList",new SCreator(ArgumentList_factory));
+new Sfactory(this,"BinaryExpression_12",new SCreator(BinaryExpression_12_factory));
 new Sfactory(this,"Event_10",new SCreator(Event_10_factory));
-new Sfactory(this,"ConstantExpression_1",new SCreator(ConstantExpression_1_factory));
+new Sfactory(this,"GlobalFunctionDefinition_2",new SCreator(GlobalFunctionDefinition_2_factory));
 new Sfactory(this,"Event_12",new SCreator(Event_12_factory));
 new Sfactory(this,"StateChange_2",new SCreator(StateChange_2_factory));
 new Sfactory(this,"Event_17",new SCreator(Event_17_factory));
-new Sfactory(this,"Event_18",new SCreator(Event_18_factory));
-new Sfactory(this,"Event_19",new SCreator(Event_19_factory));
+new Sfactory(this,"VoidArgEvent_1",new SCreator(VoidArgEvent_1_factory));
 new Sfactory(this,"BinaryExpression_10",new SCreator(BinaryExpression_10_factory));
 new Sfactory(this,"VoidArgEvent_5",new SCreator(VoidArgEvent_5_factory));
 new Sfactory(this,"VoidArgEvent_7",new SCreator(VoidArgEvent_7_factory));
+new Sfactory(this,"BinaryExpression_17",new SCreator(BinaryExpression_17_factory));
 new Sfactory(this,"StateEvent_1",new SCreator(StateEvent_1_factory));
 new Sfactory(this,"VectorConstant",new SCreator(VectorConstant_factory));
-new Sfactory(this,"EmptyStatement_1",new SCreator(EmptyStatement_1_factory));
-new Sfactory(this,"TypecastExpression_4",new SCreator(TypecastExpression_4_factory));
+new Sfactory(this,"IntDeclaration",new SCreator(IntDeclaration_factory));
+new Sfactory(this,"IntArgStateEvent",new SCreator(IntArgStateEvent_factory));
 new Sfactory(this,"TypecastExpression_6",new SCreator(TypecastExpression_6_factory));
 new Sfactory(this,"TypecastExpression_7",new SCreator(TypecastExpression_7_factory));
 new Sfactory(this,"FunctionCall",new SCreator(FunctionCall_factory));
-new Sfactory(this,"Event_27",new SCreator(Event_27_factory));
 new Sfactory(this,"ListConstant_1",new SCreator(ListConstant_1_factory));
 new Sfactory(this,"Event_6",new SCreator(Event_6_factory));
 new Sfactory(this,"Declaration_1",new SCreator(Declaration_1_factory));
+new Sfactory(this,"EmptyStatement_1",new SCreator(EmptyStatement_1_factory));
 new Sfactory(this,"SimpleAssignment_7",new SCreator(SimpleAssignment_7_factory));
 new Sfactory(this,"ForLoop",new SCreator(ForLoop_factory));
 new Sfactory(this,"ForLoop_2",new SCreator(ForLoop_2_factory));
 new Sfactory(this,"GlobalFunctionDefinition_1",new SCreator(GlobalFunctionDefinition_1_factory));
-new Sfactory(this,"JumpLabel_1",new SCreator(JumpLabel_1_factory));
 new Sfactory(this,"IfStatement",new SCreator(IfStatement_factory));
 new Sfactory(this,"ForLoopStatement_1",new SCreator(ForLoopStatement_1_factory));
 new Sfactory(this,"ForLoopStatement_2",new SCreator(ForLoopStatement_2_factory));
 new Sfactory(this,"ForLoopStatement_3",new SCreator(ForLoopStatement_3_factory));
 new Sfactory(this,"ArgumentDeclarationList_4",new SCreator(ArgumentDeclarationList_4_factory));
-new Sfactory(this,"ArgumentDeclarationList_5",new SCreator(ArgumentDeclarationList_5_factory));
+new Sfactory(this,"IntArgEvent_1",new SCreator(IntArgEvent_1_factory));
+new Sfactory(this,"IntArgEvent_2",new SCreator(IntArgEvent_2_factory));
 new Sfactory(this,"WhileStatement",new SCreator(WhileStatement_factory));
 new Sfactory(this,"ForLoop_1",new SCreator(ForLoop_1_factory));
 new Sfactory(this,"Constant_2",new SCreator(Constant_2_factory));
@@ -11249,6 +11583,7 @@ public static object IdentDotExpression_1_factory(Parser yyp) { return new Ident
 public static object ArgumentList_4_factory(Parser yyp) { return new ArgumentList_4(yyp); }
 public static object Typename_factory(Parser yyp) { return new Typename(yyp); }
 public static object IfStatement_1_factory(Parser yyp) { return new IfStatement_1(yyp); }
+public static object RotationConstant_1_factory(Parser yyp) { return new RotationConstant_1(yyp); }
 public static object Assignment_factory(Parser yyp) { return new Assignment(yyp); }
 public static object CompoundStatement_1_factory(Parser yyp) { return new CompoundStatement_1(yyp); }
 public static object CompoundStatement_2_factory(Parser yyp) { return new CompoundStatement_2(yyp); }
@@ -11281,6 +11616,7 @@ public static object States_1_factory(Parser yyp) { return new States_1(yyp); }
 public static object States_2_factory(Parser yyp) { return new States_2(yyp); }
 public static object FunctionCallExpression_1_factory(Parser yyp) { return new FunctionCallExpression_1(yyp); }
 public static object ForLoopStatement_factory(Parser yyp) { return new ForLoopStatement(yyp); }
+public static object IntArgStateEvent_1_factory(Parser yyp) { return new IntArgStateEvent_1(yyp); }
 public static object DoWhileStatement_1_factory(Parser yyp) { return new DoWhileStatement_1(yyp); }
 public static object DoWhileStatement_2_factory(Parser yyp) { return new DoWhileStatement_2(yyp); }
 public static object ForLoopStatement_4_factory(Parser yyp) { return new ForLoopStatement_4(yyp); }
@@ -11293,11 +11629,10 @@ public static object SimpleAssignment_17_factory(Parser yyp) { return new Simple
 public static object SimpleAssignment_18_factory(Parser yyp) { return new SimpleAssignment_18(yyp); }
 public static object JumpStatement_1_factory(Parser yyp) { return new JumpStatement_1(yyp); }
 public static object GlobalDefinitions_factory(Parser yyp) { return new GlobalDefinitions(yyp); }
+public static object ConstantExpression_1_factory(Parser yyp) { return new ConstantExpression_1(yyp); }
 public static object VoidArgEvent_4_factory(Parser yyp) { return new VoidArgEvent_4(yyp); }
 public static object FunctionCall_1_factory(Parser yyp) { return new FunctionCall_1(yyp); }
-public static object ArgumentList_3_factory(Parser yyp) { return new ArgumentList_3(yyp); }
 public static object Assignment_2_factory(Parser yyp) { return new Assignment_2(yyp); }
-public static object VoidArgEvent_1_factory(Parser yyp) { return new VoidArgEvent_1(yyp); }
 public static object TypecastExpression_1_factory(Parser yyp) { return new TypecastExpression_1(yyp); }
 public static object SimpleAssignment_21_factory(Parser yyp) { return new SimpleAssignment_21(yyp); }
 public static object SimpleAssignment_22_factory(Parser yyp) { return new SimpleAssignment_22(yyp); }
@@ -11312,10 +11647,13 @@ public static object GlobalDefinitions_1_factory(Parser yyp) { return new Global
 public static object GlobalDefinitions_2_factory(Parser yyp) { return new GlobalDefinitions_2(yyp); }
 public static object IncrementDecrementExpression_factory(Parser yyp) { return new IncrementDecrementExpression(yyp); }
 public static object GlobalVariableDeclaration_factory(Parser yyp) { return new GlobalVariableDeclaration(yyp); }
-public static object ArgumentDeclarationList_3_factory(Parser yyp) { return new ArgumentDeclarationList_3(yyp); }
+public static object IntArgumentDeclarationList_1_factory(Parser yyp) { return new IntArgumentDeclarationList_1(yyp); }
+public static object IntDeclaration_1_factory(Parser yyp) { return new IntDeclaration_1(yyp); }
+public static object ArgumentDeclarationList_5_factory(Parser yyp) { return new ArgumentDeclarationList_5(yyp); }
 public static object Event_11_factory(Parser yyp) { return new Event_11(yyp); }
 public static object TypecastExpression_2_factory(Parser yyp) { return new TypecastExpression_2(yyp); }
 public static object TypecastExpression_3_factory(Parser yyp) { return new TypecastExpression_3(yyp); }
+public static object TypecastExpression_4_factory(Parser yyp) { return new TypecastExpression_4(yyp); }
 public static object TypecastExpression_5_factory(Parser yyp) { return new TypecastExpression_5(yyp); }
 public static object TypecastExpression_8_factory(Parser yyp) { return new TypecastExpression_8(yyp); }
 public static object Constant_1_factory(Parser yyp) { return new Constant_1(yyp); }
@@ -11326,15 +11664,17 @@ public static object BinaryExpression_1_factory(Parser yyp) { return new BinaryE
 public static object IfStatement_2_factory(Parser yyp) { return new IfStatement_2(yyp); }
 public static object IfStatement_3_factory(Parser yyp) { return new IfStatement_3(yyp); }
 public static object IfStatement_4_factory(Parser yyp) { return new IfStatement_4(yyp); }
-public static object ReturnStatement_factory(Parser yyp) { return new ReturnStatement(yyp); }
 public static object Event_2_factory(Parser yyp) { return new Event_2(yyp); }
+public static object JumpLabel_1_factory(Parser yyp) { return new JumpLabel_1(yyp); }
 public static object RotationConstant_factory(Parser yyp) { return new RotationConstant(yyp); }
 public static object Statement_12_factory(Parser yyp) { return new Statement_12(yyp); }
+public static object Statement_13_factory(Parser yyp) { return new Statement_13(yyp); }
 public static object UnaryExpression_1_factory(Parser yyp) { return new UnaryExpression_1(yyp); }
 public static object UnaryExpression_2_factory(Parser yyp) { return new UnaryExpression_2(yyp); }
 public static object UnaryExpression_3_factory(Parser yyp) { return new UnaryExpression_3(yyp); }
 public static object ArgumentList_1_factory(Parser yyp) { return new ArgumentList_1(yyp); }
 public static object ArgumentList_2_factory(Parser yyp) { return new ArgumentList_2(yyp); }
+public static object ArgumentList_3_factory(Parser yyp) { return new ArgumentList_3(yyp); }
 public static object Constant_factory(Parser yyp) { return new Constant(yyp); }
 public static object State_factory(Parser yyp) { return new State(yyp); }
 public static object Event_13_factory(Parser yyp) { return new Event_13(yyp); }
@@ -11345,15 +11685,14 @@ public static object IncrementDecrementExpression_2_factory(Parser yyp) { return
 public static object GlobalVariableDeclaration_1_factory(Parser yyp) { return new GlobalVariableDeclaration_1(yyp); }
 public static object GlobalVariableDeclaration_2_factory(Parser yyp) { return new GlobalVariableDeclaration_2(yyp); }
 public static object IncrementDecrementExpression_5_factory(Parser yyp) { return new IncrementDecrementExpression_5(yyp); }
-public static object GlobalFunctionDefinition_2_factory(Parser yyp) { return new GlobalFunctionDefinition_2(yyp); }
+public static object ReturnStatement_factory(Parser yyp) { return new ReturnStatement(yyp); }
 public static object IncrementDecrementExpression_7_factory(Parser yyp) { return new IncrementDecrementExpression_7(yyp); }
 public static object IncrementDecrementExpression_8_factory(Parser yyp) { return new IncrementDecrementExpression_8(yyp); }
 public static object Assignment_1_factory(Parser yyp) { return new Assignment_1(yyp); }
-public static object Event_21_factory(Parser yyp) { return new Event_21(yyp); }
-public static object Event_22_factory(Parser yyp) { return new Event_22(yyp); }
+public static object IntArgEvent_9_factory(Parser yyp) { return new IntArgEvent_9(yyp); }
+public static object IntArgEvent_10_factory(Parser yyp) { return new IntArgEvent_10(yyp); }
 public static object CompoundStatement_factory(Parser yyp) { return new CompoundStatement(yyp); }
-public static object RotationConstant_1_factory(Parser yyp) { return new RotationConstant_1(yyp); }
-public static object TypecastExpression_factory(Parser yyp) { return new TypecastExpression(yyp); }
+public static object IntArgumentDeclarationList_factory(Parser yyp) { return new IntArgumentDeclarationList(yyp); }
 public static object SimpleAssignment_3_factory(Parser yyp) { return new SimpleAssignment_3(yyp); }
 public static object SimpleAssignment_4_factory(Parser yyp) { return new SimpleAssignment_4(yyp); }
 public static object Statement_1_factory(Parser yyp) { return new Statement_1(yyp); }
@@ -11380,10 +11719,12 @@ public static object IncrementDecrementExpression_3_factory(Parser yyp) { return
 public static object IncrementDecrementExpression_4_factory(Parser yyp) { return new IncrementDecrementExpression_4(yyp); }
 public static object IncrementDecrementExpression_6_factory(Parser yyp) { return new IncrementDecrementExpression_6(yyp); }
 public static object StateEvent_factory(Parser yyp) { return new StateEvent(yyp); }
-public static object Event_20_factory(Parser yyp) { return new Event_20(yyp); }
-public static object Event_23_factory(Parser yyp) { return new Event_23(yyp); }
-public static object Event_24_factory(Parser yyp) { return new Event_24(yyp); }
-public static object Event_26_factory(Parser yyp) { return new Event_26(yyp); }
+public static object IntArgEvent_3_factory(Parser yyp) { return new IntArgEvent_3(yyp); }
+public static object IntArgEvent_4_factory(Parser yyp) { return new IntArgEvent_4(yyp); }
+public static object IntArgEvent_5_factory(Parser yyp) { return new IntArgEvent_5(yyp); }
+public static object IntArgEvent_6_factory(Parser yyp) { return new IntArgEvent_6(yyp); }
+public static object IntArgEvent_7_factory(Parser yyp) { return new IntArgEvent_7(yyp); }
+public static object IntArgEvent_8_factory(Parser yyp) { return new IntArgEvent_8(yyp); }
 public static object SimpleAssignment_10_factory(Parser yyp) { return new SimpleAssignment_10(yyp); }
 public static object Event_factory(Parser yyp) { return new Event(yyp); }
 public static object SimpleAssignment_14_factory(Parser yyp) { return new SimpleAssignment_14(yyp); }
@@ -11391,7 +11732,7 @@ public static object SimpleAssignment_16_factory(Parser yyp) { return new Simple
 public static object Statement_10_factory(Parser yyp) { return new Statement_10(yyp); }
 public static object Statement_11_factory(Parser yyp) { return new Statement_11(yyp); }
 public static object SimpleAssignment_factory(Parser yyp) { return new SimpleAssignment(yyp); }
-public static object Statement_13_factory(Parser yyp) { return new Statement_13(yyp); }
+public static object TypecastExpression_factory(Parser yyp) { return new TypecastExpression(yyp); }
 public static object Event_15_factory(Parser yyp) { return new Event_15(yyp); }
 public static object Event_16_factory(Parser yyp) { return new Event_16(yyp); }
 public static object SimpleAssignment_20_factory(Parser yyp) { return new SimpleAssignment_20(yyp); }
@@ -11405,53 +11746,55 @@ public static object StateBody_1_factory(Parser yyp) { return new StateBody_1(yy
 public static object StatementList_2_factory(Parser yyp) { return new StatementList_2(yyp); }
 public static object StateBody_3_factory(Parser yyp) { return new StateBody_3(yyp); }
 public static object StateBody_4_factory(Parser yyp) { return new StateBody_4(yyp); }
-public static object BinaryExpression_16_factory(Parser yyp) { return new BinaryExpression_16(yyp); }
-public static object BinaryExpression_17_factory(Parser yyp) { return new BinaryExpression_17(yyp); }
+public static object StateBody_5_factory(Parser yyp) { return new StateBody_5(yyp); }
+public static object StateBody_6_factory(Parser yyp) { return new StateBody_6(yyp); }
 public static object BinaryExpression_18_factory(Parser yyp) { return new BinaryExpression_18(yyp); }
-public static object Event_25_factory(Parser yyp) { return new Event_25(yyp); }
+public static object ArgumentDeclarationList_3_factory(Parser yyp) { return new ArgumentDeclarationList_3(yyp); }
 public static object Event_9_factory(Parser yyp) { return new Event_9(yyp); }
 public static object Statement_factory(Parser yyp) { return new Statement(yyp); }
 public static object JumpStatement_factory(Parser yyp) { return new JumpStatement(yyp); }
 public static object BinaryExpression_11_factory(Parser yyp) { return new BinaryExpression_11(yyp); }
-public static object BinaryExpression_12_factory(Parser yyp) { return new BinaryExpression_12(yyp); }
+public static object IntArgEvent_factory(Parser yyp) { return new IntArgEvent(yyp); }
 public static object BinaryExpression_13_factory(Parser yyp) { return new BinaryExpression_13(yyp); }
 public static object BinaryExpression_14_factory(Parser yyp) { return new BinaryExpression_14(yyp); }
 public static object BinaryExpression_15_factory(Parser yyp) { return new BinaryExpression_15(yyp); }
+public static object BinaryExpression_16_factory(Parser yyp) { return new BinaryExpression_16(yyp); }
 public static object BinaryExpression_6_factory(Parser yyp) { return new BinaryExpression_6(yyp); }
 public static object BinaryExpression_7_factory(Parser yyp) { return new BinaryExpression_7(yyp); }
 public static object ArgumentList_factory(Parser yyp) { return new ArgumentList(yyp); }
+public static object BinaryExpression_12_factory(Parser yyp) { return new BinaryExpression_12(yyp); }
 public static object Event_10_factory(Parser yyp) { return new Event_10(yyp); }
-public static object ConstantExpression_1_factory(Parser yyp) { return new ConstantExpression_1(yyp); }
+public static object GlobalFunctionDefinition_2_factory(Parser yyp) { return new GlobalFunctionDefinition_2(yyp); }
 public static object Event_12_factory(Parser yyp) { return new Event_12(yyp); }
 public static object StateChange_2_factory(Parser yyp) { return new StateChange_2(yyp); }
 public static object Event_17_factory(Parser yyp) { return new Event_17(yyp); }
-public static object Event_18_factory(Parser yyp) { return new Event_18(yyp); }
-public static object Event_19_factory(Parser yyp) { return new Event_19(yyp); }
+public static object VoidArgEvent_1_factory(Parser yyp) { return new VoidArgEvent_1(yyp); }
 public static object BinaryExpression_10_factory(Parser yyp) { return new BinaryExpression_10(yyp); }
 public static object VoidArgEvent_5_factory(Parser yyp) { return new VoidArgEvent_5(yyp); }
 public static object VoidArgEvent_7_factory(Parser yyp) { return new VoidArgEvent_7(yyp); }
+public static object BinaryExpression_17_factory(Parser yyp) { return new BinaryExpression_17(yyp); }
 public static object StateEvent_1_factory(Parser yyp) { return new StateEvent_1(yyp); }
 public static object VectorConstant_factory(Parser yyp) { return new VectorConstant(yyp); }
-public static object EmptyStatement_1_factory(Parser yyp) { return new EmptyStatement_1(yyp); }
-public static object TypecastExpression_4_factory(Parser yyp) { return new TypecastExpression_4(yyp); }
+public static object IntDeclaration_factory(Parser yyp) { return new IntDeclaration(yyp); }
+public static object IntArgStateEvent_factory(Parser yyp) { return new IntArgStateEvent(yyp); }
 public static object TypecastExpression_6_factory(Parser yyp) { return new TypecastExpression_6(yyp); }
 public static object TypecastExpression_7_factory(Parser yyp) { return new TypecastExpression_7(yyp); }
 public static object FunctionCall_factory(Parser yyp) { return new FunctionCall(yyp); }
-public static object Event_27_factory(Parser yyp) { return new Event_27(yyp); }
 public static object ListConstant_1_factory(Parser yyp) { return new ListConstant_1(yyp); }
 public static object Event_6_factory(Parser yyp) { return new Event_6(yyp); }
 public static object Declaration_1_factory(Parser yyp) { return new Declaration_1(yyp); }
+public static object EmptyStatement_1_factory(Parser yyp) { return new EmptyStatement_1(yyp); }
 public static object SimpleAssignment_7_factory(Parser yyp) { return new SimpleAssignment_7(yyp); }
 public static object ForLoop_factory(Parser yyp) { return new ForLoop(yyp); }
 public static object ForLoop_2_factory(Parser yyp) { return new ForLoop_2(yyp); }
 public static object GlobalFunctionDefinition_1_factory(Parser yyp) { return new GlobalFunctionDefinition_1(yyp); }
-public static object JumpLabel_1_factory(Parser yyp) { return new JumpLabel_1(yyp); }
 public static object IfStatement_factory(Parser yyp) { return new IfStatement(yyp); }
 public static object ForLoopStatement_1_factory(Parser yyp) { return new ForLoopStatement_1(yyp); }
 public static object ForLoopStatement_2_factory(Parser yyp) { return new ForLoopStatement_2(yyp); }
 public static object ForLoopStatement_3_factory(Parser yyp) { return new ForLoopStatement_3(yyp); }
 public static object ArgumentDeclarationList_4_factory(Parser yyp) { return new ArgumentDeclarationList_4(yyp); }
-public static object ArgumentDeclarationList_5_factory(Parser yyp) { return new ArgumentDeclarationList_5(yyp); }
+public static object IntArgEvent_1_factory(Parser yyp) { return new IntArgEvent_1(yyp); }
+public static object IntArgEvent_2_factory(Parser yyp) { return new IntArgEvent_2(yyp); }
 public static object WhileStatement_factory(Parser yyp) { return new WhileStatement(yyp); }
 public static object ForLoop_1_factory(Parser yyp) { return new ForLoop_1(yyp); }
 public static object Constant_2_factory(Parser yyp) { return new Constant_2(yyp); }
-- 
cgit v1.1


From ec4d96acc9f6fe63cbf8666f0fd946d483b90111 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 16 Nov 2013 02:58:06 +0000
Subject: refactor common code out of no argument LSL event regression tests

---
 .../Shared/CodeTools/Tests/LSL_EventTests.cs       | 27 +++++++++++-----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
index 42d2d7b..ccfc04e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
@@ -44,8 +44,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            TestCompile("default { moving_end() {} }", false);
-            TestCompile("default { moving_end(integer n) {} }", true);
+            TestVoidArgEvent("moving_end");
         }
 
         [Test]
@@ -54,8 +53,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            TestCompile("default { moving_start() {} }", false);
-            TestCompile("default { moving_start(integer n) {} }", true);
+            TestVoidArgEvent("moving_start");
         }
 
         [Test]
@@ -64,8 +62,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            TestCompile("default { not_at_rot_target() {} }", false);
-            TestCompile("default { not_at_rot_target(integer n) {} }", true);
+            TestVoidArgEvent("not_at_rot_target");
         }
 
         [Test]
@@ -74,8 +71,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            TestCompile("default { not_at_target() {} }", false);
-            TestCompile("default { not_at_target(integer n) {} }", true);
+            TestVoidArgEvent("not_at_target");
         }
 
         [Test]
@@ -84,8 +80,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            TestCompile("default { state_entry() {} }", false);
-            TestCompile("default { state_entry(integer n) {} }", true);
+            TestVoidArgEvent("state_entry");
         }
 
         [Test]
@@ -94,8 +89,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            TestCompile("default { state_exit() {} }", false);
-            TestCompile("default { state_exit(integer n) {} }", true);
+            TestVoidArgEvent("state_exit");
         }
 
         [Test]
@@ -104,8 +98,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
-            TestCompile("default { timer() {} }", false);
-            TestCompile("default { timer(integer n) {} }", true);
+            TestVoidArgEvent("timer");
+        }
+
+        private void TestVoidArgEvent(string eventName)
+        {
+            TestCompile("default { " + eventName + "() {} }", false);
+            TestCompile("default { " + eventName + "(integer n) {} }", true);
         }
 
         [Test]
-- 
cgit v1.1


From 79c1ed8cb99e7b418790d2529fa3cc45078148e2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 16 Nov 2013 03:00:03 +0000
Subject: Add syntax checking for no_sensor() no-arg event

---
 .../Shared/CodeTools/Tests/LSL_EventTests.cs       |    9 +
 .../ScriptEngine/Shared/CodeTools/lsl.parser.cs    | 9950 ++++++++++----------
 2 files changed, 4985 insertions(+), 4974 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
index ccfc04e..81e0ab9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
@@ -57,6 +57,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         }
 
         [Test]
+        public void TestNoSensorEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestVoidArgEvent("no_sensor");
+        }
+
+        [Test]
         public void TestNotAtRotTargetEvent()
         {
             TestHelpers.InMethod();
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
index 3b1567f..9b4b205 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
@@ -1945,21 +1945,16 @@ public class Event_13 : Event {
 
 public class Event_14 : Event {
   public Event_14(Parser yyq):base(yyq,
-	((NO_SENSOR_EVENT)(yyq.StackAt(0).m_value))
+	((OBJECT_REZ_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_15 : Event {
   public Event_15(Parser yyq):base(yyq,
-	((OBJECT_REZ_EVENT)(yyq.StackAt(0).m_value))
+	((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_16 : Event {
   public Event_16(Parser yyq):base(yyq,
-	((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value))
-	.yytext){}}
-
-public class Event_17 : Event {
-  public Event_17(Parser yyq):base(yyq,
 	((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
@@ -2035,16 +2030,21 @@ public class VoidArgEvent_4 : VoidArgEvent {
 
 public class VoidArgEvent_5 : VoidArgEvent {
   public VoidArgEvent_5(Parser yyq):base(yyq,
-	((NOT_AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value))
+	((NO_SENSOR_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class VoidArgEvent_6 : VoidArgEvent {
   public VoidArgEvent_6(Parser yyq):base(yyq,
-	((NOT_AT_TARGET_EVENT)(yyq.StackAt(0).m_value))
+	((NOT_AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class VoidArgEvent_7 : VoidArgEvent {
   public VoidArgEvent_7(Parser yyq):base(yyq,
+	((NOT_AT_TARGET_EVENT)(yyq.StackAt(0).m_value))
+	.yytext){}}
+
+public class VoidArgEvent_8 : VoidArgEvent {
+  public VoidArgEvent_8(Parser yyq):base(yyq,
 	((TIMER_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 public class yyLSLSyntax
@@ -2683,347 +2683,360 @@ public yyLSLSyntax
 0,84,0,1,78,
 1,1,2,0,1,
 2474,360,18,1,2474,
-361,20,362,4,36,
+361,20,362,4,30,
+78,0,79,0,95,
+0,83,0,69,0,
+78,0,83,0,79,
+0,82,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,77,1,1,2,
+0,1,2475,363,18,
+1,2475,364,20,365,
+4,36,77,0,79,
+0,86,0,73,0,
+78,0,71,0,95,
+0,83,0,84,0,
+65,0,82,0,84,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,76,
+1,1,2,0,1,
+2476,366,18,1,2476,
+367,20,368,4,32,
 77,0,79,0,86,
 0,73,0,78,0,
-71,0,95,0,83,
+71,0,95,0,69,
+0,78,0,68,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,75,1,
+1,2,0,1,2477,
+369,18,1,2477,370,
+20,371,4,32,83,
 0,84,0,65,0,
-82,0,84,0,95,
+84,0,69,0,95,
+0,69,0,88,0,
+73,0,84,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,76,1,1,
-2,0,1,2475,363,
-18,1,2475,364,20,
-365,4,32,77,0,
-79,0,86,0,73,
-0,78,0,71,0,
+0,1,86,1,1,
+2,0,1,2478,372,
+18,1,2478,373,20,
+374,4,34,83,0,
+84,0,65,0,84,
+0,69,0,95,0,
+69,0,78,0,84,
+0,82,0,89,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,85,1,
+1,2,0,1,2479,
+375,18,1,2479,376,
+20,377,4,34,84,
+0,79,0,85,0,
+67,0,72,0,95,
+0,83,0,84,0,
+65,0,82,0,84,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,89,
+1,1,2,0,1,
+2480,378,18,1,2480,
+379,20,380,4,30,
+84,0,79,0,85,
+0,67,0,72,0,
 95,0,69,0,78,
 0,68,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,75,1,1,2,
-0,1,2476,366,18,
-1,2476,367,20,368,
-4,32,83,0,84,
-0,65,0,84,0,
-69,0,95,0,69,
-0,88,0,73,0,
-84,0,95,0,69,
+1,90,1,1,2,
+0,1,2481,381,18,
+1,2481,382,20,383,
+4,22,84,0,79,
+0,85,0,67,0,
+72,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
-86,1,1,2,0,
-1,2477,369,18,1,
-2477,370,20,371,4,
-34,83,0,84,0,
-65,0,84,0,69,
-0,95,0,69,0,
-78,0,84,0,82,
-0,89,0,95,0,
+88,1,1,2,0,
+1,2482,384,18,1,
+2482,385,20,386,4,
+24,83,0,69,0,
+78,0,83,0,79,
+0,82,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,85,1,1,2,
-0,1,2478,372,18,
-1,2478,373,20,374,
-4,34,84,0,79,
-0,85,0,67,0,
-72,0,95,0,83,
-0,84,0,65,0,
-82,0,84,0,95,
+1,84,1,1,2,
+0,1,2483,387,18,
+1,2483,388,20,389,
+4,52,82,0,85,
+0,78,0,95,0,
+84,0,73,0,77,
+0,69,0,95,0,
+80,0,69,0,82,
+0,77,0,73,0,
+83,0,83,0,73,
+0,79,0,78,0,
+83,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+83,1,1,2,0,
+1,256,390,18,1,
+256,391,20,392,4,
+14,80,0,69,0,
+82,0,67,0,69,
+0,78,0,84,0,
+1,22,1,1,2,
+0,1,1371,393,18,
+1,1371,213,2,0,
+1,2486,394,18,1,
+2486,395,20,396,4,
+38,67,0,79,0,
+76,0,76,0,73,
+0,83,0,73,0,
+79,0,78,0,95,
+0,69,0,78,0,
+68,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+63,1,1,2,0,
+1,2487,397,18,1,
+2487,398,20,399,4,
+30,67,0,79,0,
+76,0,76,0,73,
+0,83,0,73,0,
+79,0,78,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,89,1,1,
-2,0,1,2479,375,
-18,1,2479,376,20,
-377,4,30,84,0,
-79,0,85,0,67,
-0,72,0,95,0,
-69,0,78,0,68,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,90,
-1,1,2,0,1,
-2480,378,18,1,2480,
-379,20,380,4,22,
-84,0,79,0,85,
-0,67,0,72,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,88,1,
-1,2,0,1,2481,
-381,18,1,2481,382,
-20,383,4,24,83,
-0,69,0,78,0,
-83,0,79,0,82,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,84,
-1,1,2,0,1,
-2482,384,18,1,2482,
-385,20,386,4,52,
-82,0,85,0,78,
-0,95,0,84,0,
-73,0,77,0,69,
-0,95,0,80,0,
-69,0,82,0,77,
-0,73,0,83,0,
-83,0,73,0,79,
-0,78,0,83,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,83,1,
-1,2,0,1,2483,
-387,18,1,2483,388,
-20,389,4,24,79,
-0,78,0,95,0,
-82,0,69,0,90,
+0,1,62,1,1,
+2,0,1,1931,400,
+18,1,1931,260,2,
+0,1,1932,401,18,
+1,1932,402,20,403,
+4,4,73,0,70,
+0,1,42,1,1,
+2,0,1,262,404,
+18,1,262,168,2,
+0,1,1377,405,18,
+1,1377,168,2,0,
+1,2492,406,18,1,
+2492,407,20,408,4,
+22,77,0,79,0,
+78,0,69,0,89,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,81,
+0,84,0,1,74,
 1,1,2,0,1,
-256,390,18,1,256,
-391,20,392,4,14,
-80,0,69,0,82,
-0,67,0,69,0,
+1876,409,18,1,1876,
+135,2,0,1,2494,
+410,18,1,2494,411,
+20,412,4,36,76,
+0,73,0,78,0,
+75,0,95,0,77,
+0,69,0,83,0,
+83,0,65,0,71,
+0,69,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,72,1,1,2,
+0,1,2495,413,18,
+1,2495,414,20,415,
+4,52,76,0,65,
+0,78,0,68,0,
+95,0,67,0,79,
+0,76,0,76,0,
+73,0,83,0,73,
+0,79,0,78,0,
+95,0,83,0,84,
+0,65,0,82,0,
+84,0,95,0,69,
+0,86,0,69,0,
 78,0,84,0,1,
-22,1,1,2,0,
-1,1371,393,18,1,
-1371,213,2,0,1,
-2486,394,18,1,2486,
-395,20,396,4,30,
+71,1,1,2,0,
+1,1939,416,18,1,
+1939,168,2,0,1,
+2497,417,18,1,2497,
+418,20,419,4,40,
+76,0,65,0,78,
+0,68,0,95,0,
 67,0,79,0,76,
 0,76,0,73,0,
 83,0,73,0,79,
 0,78,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,62,1,1,2,
-0,1,2487,397,18,
-1,2487,398,20,399,
-4,26,67,0,72,
-0,65,0,78,0,
-71,0,69,0,68,
+1,69,1,1,2,
+0,1,827,420,18,
+1,827,168,2,0,
+1,2499,421,18,1,
+2499,422,20,423,4,
+22,69,0,77,0,
+65,0,73,0,76,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,61,
-1,1,2,0,1,
-1931,400,18,1,1931,
-260,2,0,1,1932,
-401,18,1,1932,402,
-20,403,4,4,73,
-0,70,0,1,42,
+0,84,0,1,67,
 1,1,2,0,1,
-262,404,18,1,262,
-168,2,0,1,1377,
-405,18,1,1377,168,
-2,0,1,2492,406,
-18,1,2492,407,20,
-408,4,22,77,0,
-79,0,78,0,69,
-0,89,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,74,1,1,2,
-0,1,1876,409,18,
-1,1876,135,2,0,
-1,2494,410,18,1,
-2494,411,20,412,4,
-36,76,0,73,0,
-78,0,75,0,95,
-0,77,0,69,0,
-83,0,83,0,65,
-0,71,0,69,0,
+2500,424,18,1,2500,
+425,20,426,4,32,
+68,0,65,0,84,
+0,65,0,83,0,
+69,0,82,0,86,
+0,69,0,82,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,72,1,
-1,2,0,1,2495,
-413,18,1,2495,414,
-20,415,4,52,76,
-0,65,0,78,0,
-68,0,95,0,67,
-0,79,0,76,0,
-76,0,73,0,83,
-0,73,0,79,0,
-78,0,95,0,83,
-0,84,0,65,0,
-82,0,84,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,71,1,1,
-2,0,1,1939,416,
-18,1,1939,168,2,
-0,1,2497,417,18,
-1,2497,418,20,419,
-4,40,76,0,65,
-0,78,0,68,0,
-95,0,67,0,79,
-0,76,0,76,0,
-73,0,83,0,73,
+84,0,1,66,1,
+1,2,0,1,2501,
+427,18,1,2501,428,
+20,429,4,26,67,
 0,79,0,78,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,69,1,
-1,2,0,1,827,
-420,18,1,827,168,
-2,0,1,2499,421,
-18,1,2499,422,20,
-423,4,22,69,0,
-77,0,65,0,73,
+84,0,82,0,79,
 0,76,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,67,1,1,2,
-0,1,2500,424,18,
-1,2500,425,20,426,
-4,32,68,0,65,
+1,65,1,1,2,
+0,1,2502,430,18,
+1,2502,431,20,432,
+4,24,65,0,84,
 0,84,0,65,0,
-83,0,69,0,82,
-0,86,0,69,0,
-82,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-66,1,1,2,0,
-1,2501,427,18,1,
-2501,428,20,429,4,
-26,67,0,79,0,
-78,0,84,0,82,
-0,79,0,76,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,65,1,
-1,2,0,1,2502,
-430,18,1,2502,431,
-20,432,4,24,65,
-0,84,0,84,0,
-65,0,67,0,72,
+67,0,72,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,60,1,1,
+2,0,1,2503,433,
+18,1,2503,434,20,
+435,4,30,65,0,
+84,0,95,0,84,
+0,65,0,82,0,
+71,0,69,0,84,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,60,
+0,84,0,1,59,
 1,1,2,0,1,
-2503,433,18,1,2503,
-434,20,435,4,30,
+2504,436,18,1,2504,
+437,20,438,4,38,
 65,0,84,0,95,
-0,84,0,65,0,
-82,0,71,0,69,
-0,84,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,59,1,1,2,
-0,1,2504,436,18,
-1,2504,437,20,438,
-4,38,65,0,84,
-0,95,0,82,0,
-79,0,84,0,95,
-0,84,0,65,0,
-82,0,71,0,69,
-0,84,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,58,1,1,2,
-0,1,277,439,18,
-1,277,440,20,441,
-4,10,83,0,76,
-0,65,0,83,0,
-72,0,1,21,1,
-1,2,0,1,2506,
-442,18,1,2506,135,
-2,0,1,2507,443,
-18,1,2507,153,2,
-0,1,2509,444,18,
-1,2509,343,2,0,
-1,2510,445,18,1,
-2510,446,20,447,4,
-22,73,0,110,0,
-116,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,1,112,
-1,2,2,0,1,
-283,448,18,1,283,
-168,2,0,1,2512,
-449,18,1,2512,126,
-2,0,1,2513,450,
-18,1,2513,132,2,
-0,1,2514,451,18,
-1,2514,452,20,453,
-4,28,73,0,110,
-0,116,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-1,109,1,2,2,
-0,1,1958,454,18,
-1,1958,153,2,0,
-1,2516,455,18,1,
-2516,153,2,0,1,
-2518,456,18,1,2518,
-343,2,0,1,2519,
-457,18,1,2519,458,
-20,459,4,10,69,
-0,118,0,101,0,
-110,0,116,0,1,
-111,1,2,2,0,
-1,1406,460,18,1,
-1406,160,2,0,1,
-1407,461,18,1,1407,
-207,2,0,1,299,
-462,18,1,299,463,
-20,464,4,8,83,
-0,84,0,65,0,
-82,0,1,20,1,
-1,2,0,1,1370,
-465,18,1,1370,160,
-2,0,1,2529,466,
-18,1,2529,140,2,
-0,1,2531,467,18,
-1,2531,153,2,0,
-1,305,468,18,1,
-305,168,2,0,1,
-2535,469,18,1,2535,
-470,20,471,4,18,
-83,0,116,0,97,
-0,116,0,101,0,
-66,0,111,0,100,
-0,121,0,1,102,
+0,82,0,79,0,
+84,0,95,0,84,
+0,65,0,82,0,
+71,0,69,0,84,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,58,
+1,1,2,0,1,
+277,439,18,1,277,
+440,20,441,4,10,
+83,0,76,0,65,
+0,83,0,72,0,
+1,21,1,1,2,
+0,1,2506,442,18,
+1,2506,135,2,0,
+1,2507,443,18,1,
+2507,153,2,0,1,
+2509,444,18,1,2509,
+343,2,0,1,2510,
+445,18,1,2510,446,
+20,447,4,22,73,
+0,110,0,116,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,112,1,2,
+2,0,1,283,448,
+18,1,283,168,2,
+0,1,2512,449,18,
+1,2512,126,2,0,
+1,2513,450,18,1,
+2513,132,2,0,1,
+2514,451,18,1,2514,
+452,20,453,4,28,
+73,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,1,109,
 1,2,2,0,1,
-2458,472,18,1,2458,
-260,2,0,1,2459,
-473,18,1,2459,323,
-2,0,1,2464,474,
-18,1,2464,323,2,
-0,1,1989,475,18,
-1,1989,260,2,0,
-1,1990,476,18,1,
-1990,477,20,478,4,
-8,69,0,76,0,
-83,0,69,0,1,
-43,1,1,2,0,
-1,2470,479,18,1,
-2470,156,2,0,1,
-322,480,18,1,322,
-225,2,0,1,1933,
-481,18,1,1933,135,
-2,0,1,883,482,
-18,1,883,168,2,
-0,1,328,483,18,
-1,328,168,2,0,
-1,1443,484,18,1,
-1443,240,2,0,1,
-1449,485,18,1,1449,
-168,2,0,1,2485,
-486,18,1,2485,487,
-20,488,4,38,67,
-0,79,0,76,0,
-76,0,73,0,83,
-0,73,0,79,0,
-78,0,95,0,69,
-0,78,0,68,0,
+1958,454,18,1,1958,
+153,2,0,1,2516,
+455,18,1,2516,153,
+2,0,1,2518,456,
+18,1,2518,343,2,
+0,1,2519,457,18,
+1,2519,458,20,459,
+4,10,69,0,118,
+0,101,0,110,0,
+116,0,1,111,1,
+2,2,0,1,1406,
+460,18,1,1406,160,
+2,0,1,1407,461,
+18,1,1407,207,2,
+0,1,299,462,18,
+1,299,463,20,464,
+4,8,83,0,84,
+0,65,0,82,0,
+1,20,1,1,2,
+0,1,1370,465,18,
+1,1370,160,2,0,
+1,2529,466,18,1,
+2529,140,2,0,1,
+2531,467,18,1,2531,
+153,2,0,1,305,
+468,18,1,305,168,
+2,0,1,2535,469,
+18,1,2535,470,20,
+471,4,18,83,0,
+116,0,97,0,116,
+0,101,0,66,0,
+111,0,100,0,121,
+0,1,102,1,2,
+2,0,1,2458,472,
+18,1,2458,260,2,
+0,1,2459,473,18,
+1,2459,323,2,0,
+1,2464,474,18,1,
+2464,323,2,0,1,
+1989,475,18,1,1989,
+260,2,0,1,1990,
+476,18,1,1990,477,
+20,478,4,8,69,
+0,76,0,83,0,
+69,0,1,43,1,
+1,2,0,1,2470,
+479,18,1,2470,156,
+2,0,1,322,480,
+18,1,322,225,2,
+0,1,1933,481,18,
+1,1933,135,2,0,
+1,883,482,18,1,
+883,168,2,0,1,
+328,483,18,1,328,
+168,2,0,1,1443,
+484,18,1,1443,240,
+2,0,1,1449,485,
+18,1,1449,168,2,
+0,1,2485,486,18,
+1,2485,487,20,488,
+4,42,67,0,79,
+0,76,0,76,0,
+73,0,83,0,73,
+0,79,0,78,0,
+95,0,83,0,84,
+0,65,0,82,0,
+84,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+64,1,1,2,0,
+1,2488,489,18,1,
+2488,490,20,491,4,
+26,67,0,72,0,
+65,0,78,0,71,
+0,69,0,68,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,63,1,
-1,2,0,1,2488,
-489,18,1,2488,490,
-20,491,4,36,72,
+84,0,1,61,1,
+1,2,0,1,2489,
+492,18,1,2489,493,
+20,494,4,36,72,
 0,84,0,84,0,
 80,0,95,0,82,
 0,69,0,81,0,
@@ -3032,8 +3045,8 @@ public yyLSLSyntax
 69,0,86,0,69,
 0,78,0,84,0,
 1,91,1,1,2,
-0,1,2489,492,18,
-1,2489,493,20,494,
+0,1,2490,495,18,
+1,2490,496,20,497,
 4,34,82,0,69,
 0,77,0,79,0,
 84,0,69,0,95,
@@ -3042,9 +3055,9 @@ public yyLSLSyntax
 0,69,0,86,0,
 69,0,78,0,84,
 0,1,82,1,1,
-2,0,1,2490,495,
-18,1,2490,496,20,
-497,4,32,79,0,
+2,0,1,2491,498,
+18,1,2491,499,20,
+500,4,32,79,0,
 66,0,74,0,69,
 0,67,0,84,0,
 95,0,82,0,69,
@@ -3052,213 +3065,200 @@ public yyLSLSyntax
 69,0,86,0,69,
 0,78,0,84,0,
 1,80,1,1,2,
-0,1,2491,498,18,
-1,2491,499,20,500,
-4,30,78,0,79,
-0,95,0,83,0,
-69,0,78,0,83,
-0,79,0,82,0,
+0,1,2493,501,18,
+1,2493,502,20,503,
+4,24,76,0,73,
+0,83,0,84,0,
+69,0,78,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,73,1,1,
+2,0,1,1413,504,
+18,1,1413,168,2,
+0,1,346,505,18,
+1,346,506,20,507,
+4,8,80,0,76,
+0,85,0,83,0,
+1,18,1,1,2,
+0,1,2575,508,18,
+1,2575,509,20,510,
+4,20,83,0,116,
+0,97,0,116,0,
+101,0,69,0,118,
+0,101,0,110,0,
+116,0,1,103,1,
+2,2,0,1,2496,
+511,18,1,2496,512,
+20,513,4,48,76,
+0,65,0,78,0,
+68,0,95,0,67,
+0,79,0,76,0,
+76,0,73,0,83,
+0,73,0,79,0,
+78,0,95,0,69,
+0,78,0,68,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,77,1,
-1,2,0,1,2493,
-501,18,1,2493,502,
-20,503,4,24,76,
-0,73,0,83,0,
-84,0,69,0,78,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,73,
-1,1,2,0,1,
-1413,504,18,1,1413,
-168,2,0,1,346,
-505,18,1,346,506,
-20,507,4,8,80,
-0,76,0,85,0,
-83,0,1,18,1,
-1,2,0,1,2575,
-508,18,1,2575,509,
-20,510,4,20,83,
+84,0,1,70,1,
+1,2,0,1,2577,
+514,18,1,2577,515,
+20,516,4,34,86,
+0,111,0,105,0,
+100,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,1,105,
+1,2,2,0,1,
+2021,517,18,1,2021,
+260,2,0,1,2022,
+518,18,1,2022,347,
+2,0,1,352,519,
+18,1,352,168,2,
+0,1,2024,520,18,
+1,2024,132,2,0,
+1,2025,521,18,1,
+2025,522,20,523,4,
+8,74,0,85,0,
+77,0,80,0,1,
+49,1,1,2,0,
+1,2026,524,18,1,
+2026,132,2,0,1,
+2027,525,18,1,2027,
+526,20,527,4,4,
+65,0,84,0,1,
+23,1,1,2,0,
+1,2028,528,18,1,
+2028,132,2,0,1,
+2029,529,18,1,2029,
+343,2,0,1,2030,
+530,18,1,2030,531,
+20,532,4,14,70,
+0,111,0,114,0,
+76,0,111,0,111,
+0,112,0,1,127,
+1,2,2,0,1,
+2031,533,18,1,2031,
+534,20,535,4,32,
+68,0,111,0,87,
+0,104,0,105,0,
+108,0,101,0,83,
 0,116,0,97,0,
-116,0,101,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
-103,1,2,2,0,
-1,2496,511,18,1,
-2496,512,20,513,4,
-48,76,0,65,0,
-78,0,68,0,95,
-0,67,0,79,0,
-76,0,76,0,73,
-0,83,0,73,0,
-79,0,78,0,95,
-0,69,0,78,0,
-68,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-70,1,1,2,0,
-1,2577,514,18,1,
-2577,515,20,516,4,
-34,86,0,111,0,
-105,0,100,0,65,
-0,114,0,103,0,
-83,0,116,0,97,
-0,116,0,101,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,105,1,2,2,
-0,1,2021,517,18,
-1,2021,260,2,0,
-1,2022,518,18,1,
-2022,347,2,0,1,
-352,519,18,1,352,
-168,2,0,1,2024,
-520,18,1,2024,132,
-2,0,1,2025,521,
-18,1,2025,522,20,
-523,4,8,74,0,
-85,0,77,0,80,
-0,1,49,1,1,
-2,0,1,2026,524,
-18,1,2026,132,2,
-0,1,2027,525,18,
-1,2027,526,20,527,
-4,4,65,0,84,
-0,1,23,1,1,
-2,0,1,2028,528,
-18,1,2028,132,2,
-0,1,2029,529,18,
-1,2029,343,2,0,
-1,2030,530,18,1,
-2030,531,20,532,4,
-14,70,0,111,0,
-114,0,76,0,111,
-0,111,0,112,0,
-1,127,1,2,2,
-0,1,2031,533,18,
-1,2031,534,20,535,
-4,32,68,0,111,
-0,87,0,104,0,
-105,0,108,0,101,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,1,
-126,1,2,2,0,
-1,2032,536,18,1,
-2032,537,20,538,4,
-28,87,0,104,0,
-105,0,108,0,101,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,1,
-125,1,2,2,0,
-1,2033,539,18,1,
-2033,540,20,541,4,
-22,73,0,102,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,126,1,
+2,2,0,1,2032,
+536,18,1,2032,537,
+20,538,4,28,87,
+0,104,0,105,0,
+108,0,101,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,125,1,
+2,2,0,1,2033,
+539,18,1,2033,540,
+20,541,4,22,73,
+0,102,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,1,124,1,2,
+2,0,1,2034,542,
+18,1,2034,543,20,
+544,4,22,83,0,
+116,0,97,0,116,
+0,101,0,67,0,
+104,0,97,0,110,
+0,103,0,101,0,
+1,123,1,2,2,
+0,1,1478,545,18,
+1,1478,160,2,0,
+1,1479,546,18,1,
+1479,276,2,0,1,
+2037,547,18,1,2037,
+192,2,0,1,2038,
+548,18,1,2038,549,
+20,550,4,18,74,
+0,117,0,109,0,
+112,0,76,0,97,
+0,98,0,101,0,
+108,0,1,121,1,
+2,2,0,1,2039,
+551,18,1,2039,192,
+2,0,1,2040,552,
+18,1,2040,553,20,
+554,4,30,82,0,
+101,0,116,0,117,
+0,114,0,110,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
-0,116,0,1,124,
-1,2,2,0,1,
-2034,542,18,1,2034,
-543,20,544,4,22,
-83,0,116,0,97,
-0,116,0,101,0,
-67,0,104,0,97,
-0,110,0,103,0,
-101,0,1,123,1,
-2,2,0,1,1478,
-545,18,1,1478,160,
-2,0,1,1479,546,
-18,1,1479,276,2,
-0,1,2037,547,18,
-1,2037,192,2,0,
-1,2038,548,18,1,
-2038,549,20,550,4,
-18,74,0,117,0,
-109,0,112,0,76,
-0,97,0,98,0,
-101,0,108,0,1,
-121,1,2,2,0,
-1,2039,551,18,1,
-2039,192,2,0,1,
-2040,552,18,1,2040,
-553,20,554,4,30,
-82,0,101,0,116,
-0,117,0,114,0,
-110,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-1,120,1,2,2,
-0,1,2041,555,18,
-1,2041,192,2,0,
-1,1485,556,18,1,
-1485,168,2,0,1,
-372,557,18,1,372,
-180,2,0,1,373,
-558,18,1,373,132,
-2,0,1,374,559,
-18,1,374,176,2,
-0,1,375,560,18,
-1,375,132,2,0,
-1,376,561,18,1,
-376,183,2,0,1,
-377,562,18,1,377,
-132,2,0,1,378,
-563,18,1,378,176,
-2,0,1,379,564,
-18,1,379,132,2,
-0,1,380,565,18,
-1,380,566,20,567,
-4,16,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,1,133,
-1,2,2,0,1,
-381,568,18,1,381,
-290,2,0,1,371,
-569,18,1,371,570,
-20,571,4,24,70,
-0,117,0,110,0,
-99,0,116,0,105,
-0,111,0,110,0,
-67,0,97,0,108,
-0,108,0,1,129,
+0,116,0,1,120,
 1,2,2,0,1,
-942,572,18,1,942,
-168,2,0,1,2533,
-573,18,1,2533,343,
-2,0,1,387,574,
-18,1,387,168,2,
-0,1,2619,575,18,
-1,2619,470,2,0,
-1,1514,576,18,1,
-1514,160,2,0,1,
-1515,577,18,1,1515,
-297,2,0,1,2074,
-578,18,1,2074,160,
-2,0,1,2075,579,
-18,1,2075,153,2,
-0,1,406,580,18,
-1,406,143,2,0,
-1,1521,581,18,1,
-1521,168,2,0,1,
-412,582,18,1,412,
-168,2,0,1,2484,
-583,18,1,2484,584,
-20,585,4,42,67,
-0,79,0,76,0,
-76,0,73,0,83,
-0,73,0,79,0,
-78,0,95,0,83,
-0,84,0,65,0,
-82,0,84,0,95,
+2041,555,18,1,2041,
+192,2,0,1,1485,
+556,18,1,1485,168,
+2,0,1,372,557,
+18,1,372,180,2,
+0,1,373,558,18,
+1,373,132,2,0,
+1,374,559,18,1,
+374,176,2,0,1,
+375,560,18,1,375,
+132,2,0,1,376,
+561,18,1,376,183,
+2,0,1,377,562,
+18,1,377,132,2,
+0,1,378,563,18,
+1,378,176,2,0,
+1,379,564,18,1,
+379,132,2,0,1,
+380,565,18,1,380,
+566,20,567,4,16,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,1,133,1,2,
+2,0,1,381,568,
+18,1,381,290,2,
+0,1,371,569,18,
+1,371,570,20,571,
+4,24,70,0,117,
+0,110,0,99,0,
+116,0,105,0,111,
+0,110,0,67,0,
+97,0,108,0,108,
+0,1,129,1,2,
+2,0,1,942,572,
+18,1,942,168,2,
+0,1,2533,573,18,
+1,2533,343,2,0,
+1,387,574,18,1,
+387,168,2,0,1,
+2619,575,18,1,2619,
+470,2,0,1,1514,
+576,18,1,1514,160,
+2,0,1,1515,577,
+18,1,1515,297,2,
+0,1,2074,578,18,
+1,2074,160,2,0,
+1,2075,579,18,1,
+2075,153,2,0,1,
+406,580,18,1,406,
+143,2,0,1,1521,
+581,18,1,1521,168,
+2,0,1,412,582,
+18,1,412,168,2,
+0,1,2484,583,18,
+1,2484,584,20,585,
+4,24,79,0,78,
+0,95,0,82,0,
+69,0,90,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,64,1,1,
+0,1,81,1,1,
 2,0,1,2023,586,
 18,1,2023,587,20,
 588,4,26,68,0,
@@ -6055,7 +6055,7 @@ public yyLSLSyntax
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,56,
+116,0,95,0,57,
 0,1,326,1,3,
 1,2,1,1,1784,
 22,1,181,1,52,
@@ -6067,7 +6067,7 @@ public yyLSLSyntax
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,52,
+116,0,95,0,53,
 0,1,322,1,3,
 1,2,1,1,1790,
 22,1,177,1,1515,
@@ -6127,85 +6127,85 @@ public yyLSLSyntax
 1,1876,1827,16,0,
 187,1,124,1828,16,
 0,187,1,2478,1829,
-17,1830,15,1781,1,
--1,1,5,1831,20,
-1832,4,28,73,0,
-110,0,116,0,65,
+17,1830,15,1831,4,
+26,37,0,86,0,
+111,0,105,0,100,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,1832,20,1833,4,
+28,86,0,111,0,
+105,0,100,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,49,0,48,
-0,1,328,1,3,
-1,2,1,1,1833,
-22,1,183,1,2136,
-871,1,381,1834,16,
-0,187,1,525,1835,
-16,0,187,1,137,
-1836,16,0,187,1,
-1901,1837,16,0,187,
-1,1153,1838,16,0,
-187,1,151,1839,16,
-0,187,1,1407,1840,
-16,0,187,1,1659,
-1841,16,0,187,1,
-2413,1842,16,0,187,
-1,406,1843,16,0,
-187,1,2669,1844,16,
-0,613,1,1371,1845,
-16,0,187,1,2105,
-843,1,166,1846,16,
-0,187,1,1622,1847,
-16,0,187,1,2519,
-1848,16,0,619,1,
-1931,889,1,1932,1849,
-16,0,481,1,1933,
-1850,16,0,187,1,
-431,1851,16,0,187,
-1,1585,1852,16,0,
-187,1,182,1853,16,
-0,187,1,1189,1854,
-16,0,187,1,1443,
-1855,16,0,187,1,
-1695,1856,16,0,187,
-1,2198,1857,16,0,
-187,1,447,1858,16,
-0,187,1,199,1859,
-16,0,187,1,2459,
-910,1,1958,1860,16,
-0,187,1,2462,917,
-1,1657,922,1,2464,
-927,1,459,1861,16,
-0,187,1,462,1862,
-16,0,187,1,2471,
-1863,17,1864,15,1865,
-4,26,37,0,86,
-0,111,0,105,0,
-100,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,1,-1,
+95,0,49,0,1,
+328,1,3,1,2,
+1,1,1834,22,1,
+183,1,2136,871,1,
+381,1835,16,0,187,
+1,525,1836,16,0,
+187,1,137,1837,16,
+0,187,1,1901,1838,
+16,0,187,1,1153,
+1839,16,0,187,1,
+151,1840,16,0,187,
+1,1407,1841,16,0,
+187,1,1659,1842,16,
+0,187,1,2413,1843,
+16,0,187,1,406,
+1844,16,0,187,1,
+2669,1845,16,0,613,
+1,1371,1846,16,0,
+187,1,2105,843,1,
+166,1847,16,0,187,
+1,1622,1848,16,0,
+187,1,2519,1849,16,
+0,619,1,1931,889,
+1,1932,1850,16,0,
+481,1,1933,1851,16,
+0,187,1,431,1852,
+16,0,187,1,1585,
+1853,16,0,187,1,
+182,1854,16,0,187,
+1,1189,1855,16,0,
+187,1,1443,1856,16,
+0,187,1,1695,1857,
+16,0,187,1,2198,
+1858,16,0,187,1,
+447,1859,16,0,187,
+1,199,1860,16,0,
+187,1,2459,910,1,
+1958,1861,16,0,187,
+1,2462,917,1,1657,
+922,1,2464,927,1,
+459,1862,16,0,187,
+1,462,1863,16,0,
+187,1,2471,1864,17,
+1865,15,1831,1,-1,
 1,5,1866,20,1867,
 4,28,86,0,111,
 0,105,0,100,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,55,0,
+0,95,0,56,0,
 1,335,1,3,1,
 2,1,1,1868,22,
 1,190,1,2472,1869,
-17,1870,15,1865,1,
+17,1870,15,1831,1,
 -1,1,5,1871,20,
 1872,4,28,86,0,
 111,0,105,0,100,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,54,
+116,0,95,0,55,
 0,1,334,1,3,
 1,2,1,1,1873,
 22,1,189,1,2473,
-1874,17,1875,15,1865,
+1874,17,1875,15,1831,
 1,-1,1,5,1876,
 20,1877,4,28,86,
 0,111,0,105,0,
@@ -6213,816 +6213,899 @@ public yyLSLSyntax
 0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-53,0,1,333,1,
+54,0,1,333,1,
 3,1,2,1,1,
 1878,22,1,188,1,
 2474,1879,17,1880,15,
-1865,1,-1,1,5,
+1831,1,-1,1,5,
 1881,20,1882,4,28,
 86,0,111,0,105,
 0,100,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,52,0,1,332,
+0,53,0,1,332,
 1,3,1,2,1,
 1,1883,22,1,187,
 1,2475,1884,17,1885,
-15,1865,1,-1,1,
+15,1831,1,-1,1,
 5,1886,20,1887,4,
 28,86,0,111,0,
 105,0,100,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,51,0,1,
+95,0,52,0,1,
 331,1,3,1,2,
 1,1,1888,22,1,
 186,1,2476,1889,17,
-1890,15,1865,1,-1,
+1890,15,1831,1,-1,
 1,5,1891,20,1892,
 4,28,86,0,111,
 0,105,0,100,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,50,0,
+0,95,0,51,0,
 1,330,1,3,1,
 2,1,1,1893,22,
 1,185,1,2477,1894,
-17,1895,15,1865,1,
+17,1895,15,1831,1,
 -1,1,5,1896,20,
 1897,4,28,86,0,
 111,0,105,0,100,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,49,
+116,0,95,0,50,
 0,1,329,1,3,
 1,2,1,1,1898,
 22,1,184,1,2227,
 936,1,2479,1899,17,
 1900,15,1781,1,-1,
 1,5,1901,20,1902,
+4,28,73,0,110,
+0,116,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,49,0,48,0,
+1,327,1,3,1,
+2,1,1,1903,22,
+1,182,1,1225,1904,
+16,0,187,1,2481,
+1905,17,1906,15,1781,
+1,-1,1,5,1907,
+20,1908,4,26,73,
+0,110,0,116,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,56,0,
+1,325,1,3,1,
+2,1,1,1909,22,
+1,180,1,2482,1910,
+17,1911,15,1781,1,
+-1,1,5,1912,20,
+1913,4,26,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,55,0,1,
+324,1,3,1,2,
+1,1,1914,22,1,
+179,1,2483,1915,17,
+1916,15,1781,1,-1,
+1,5,1917,20,1918,
 4,26,73,0,110,
 0,116,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,57,0,1,327,
+0,54,0,1,323,
 1,3,1,2,1,
-1,1903,22,1,182,
-1,1225,1904,16,0,
-187,1,2481,1905,17,
-1906,15,1781,1,-1,
-1,5,1907,20,1908,
+1,1919,22,1,178,
+1,1731,1920,16,0,
+187,1,2485,1921,17,
+1922,15,1781,1,-1,
+1,5,1923,20,1924,
 4,26,73,0,110,
 0,116,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,55,0,1,325,
+0,52,0,1,321,
 1,3,1,2,1,
-1,1909,22,1,180,
-1,2482,1910,17,1911,
+1,1925,22,1,176,
+1,2486,1926,17,1927,
 15,1781,1,-1,1,
-5,1912,20,1913,4,
+5,1928,20,1929,4,
 26,73,0,110,0,
 116,0,65,0,114,
 0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-54,0,1,324,1,
+51,0,1,320,1,
 3,1,2,1,1,
-1914,22,1,179,1,
-2483,1915,17,1916,15,
-1781,1,-1,1,5,
-1917,20,1918,4,26,
-73,0,110,0,116,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,95,0,53,
-0,1,323,1,3,
-1,2,1,1,1919,
-22,1,178,1,1731,
-1920,16,0,187,1,
-2485,1921,17,1922,15,
+1930,22,1,175,1,
+2487,1931,17,1932,15,
 1781,1,-1,1,5,
-1923,20,1924,4,26,
+1933,20,1934,4,26,
 73,0,110,0,116,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,51,
-0,1,321,1,3,
-1,2,1,1,1925,
-22,1,176,1,2486,
-1926,17,1927,15,1781,
-1,-1,1,5,1928,
-20,1929,4,26,73,
+116,0,95,0,50,
+0,1,319,1,3,
+1,2,1,1,1935,
+22,1,174,1,2488,
+1936,17,1937,15,1781,
+1,-1,1,5,1938,
+20,1939,4,26,73,
 0,110,0,116,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,50,0,
-1,320,1,3,1,
-2,1,1,1930,22,
-1,175,1,2487,1931,
-17,1932,15,1781,1,
--1,1,5,1933,20,
-1934,4,26,73,0,
-110,0,116,0,65,
-0,114,0,103,0,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,49,0,1,
-319,1,3,1,2,
-1,1,1935,22,1,
-174,1,2488,1936,17,
-1937,15,1795,1,-1,
-1,5,1938,20,1939,
+0,95,0,49,0,
+1,318,1,3,1,
+2,1,1,1940,22,
+1,173,1,2489,1941,
+17,1942,15,1795,1,
+-1,1,5,1943,20,
+1944,4,16,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+49,0,54,0,1,
+317,1,3,1,2,
+1,1,1945,22,1,
+172,1,2490,1946,17,
+1947,15,1795,1,-1,
+1,5,1948,20,1949,
 4,16,69,0,118,
 0,101,0,110,0,
 116,0,95,0,49,
-0,55,0,1,318,
+0,53,0,1,316,
 1,3,1,2,1,
-1,1940,22,1,173,
-1,2489,1941,17,1942,
-15,1795,1,-1,1,
-5,1943,20,1944,4,
-16,69,0,118,0,
-101,0,110,0,116,
-0,95,0,49,0,
-54,0,1,317,1,
-3,1,2,1,1,
-1945,22,1,172,1,
-2490,1946,17,1947,15,
-1795,1,-1,1,5,
-1948,20,1949,4,16,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,49,0,53,
-0,1,316,1,3,
-1,2,1,1,1950,
-22,1,171,1,1989,
-944,1,2492,1951,17,
-1952,15,1795,1,-1,
-1,5,1953,20,1954,
+1,1950,22,1,171,
+1,1989,944,1,2492,
+1951,17,1952,15,1795,
+1,-1,1,5,1953,
+20,1954,4,16,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,49,0,51,0,
+1,314,1,3,1,
+2,1,1,1955,22,
+1,169,1,2493,1956,
+17,1957,15,1795,1,
+-1,1,5,1958,20,
+1959,4,16,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+49,0,50,0,1,
+313,1,3,1,2,
+1,1,1960,22,1,
+168,1,2494,1961,17,
+1962,15,1795,1,-1,
+1,5,1963,20,1964,
 4,16,69,0,118,
 0,101,0,110,0,
 116,0,95,0,49,
-0,51,0,1,314,
+0,49,0,1,312,
 1,3,1,2,1,
-1,1955,22,1,169,
-1,2493,1956,17,1957,
-15,1795,1,-1,1,
-5,1958,20,1959,4,
-16,69,0,118,0,
-101,0,110,0,116,
-0,95,0,49,0,
-50,0,1,313,1,
-3,1,2,1,1,
-1960,22,1,168,1,
-2494,1961,17,1962,15,
-1795,1,-1,1,5,
-1963,20,1964,4,16,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,49,0,49,
-0,1,312,1,3,
-1,2,1,1,1965,
-22,1,167,1,236,
-1966,16,0,187,1,
-2496,1967,17,1968,15,
-1795,1,-1,1,5,
-1969,20,1970,4,14,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,57,0,1,
-310,1,3,1,2,
-1,1,1971,22,1,
-165,1,2497,1972,17,
-1973,15,1795,1,-1,
-1,5,1974,20,1975,
+1,1965,22,1,167,
+1,236,1966,16,0,
+187,1,2496,1967,17,
+1968,15,1795,1,-1,
+1,5,1969,20,1970,
 4,14,69,0,118,
 0,101,0,110,0,
-116,0,95,0,56,
-0,1,309,1,3,
-1,2,1,1,1976,
-22,1,164,1,2498,
-1977,17,1978,15,1795,
-1,-1,1,5,1979,
-20,1980,4,14,69,
+116,0,95,0,57,
+0,1,310,1,3,
+1,2,1,1,1971,
+22,1,165,1,2497,
+1972,17,1973,15,1795,
+1,-1,1,5,1974,
+20,1975,4,14,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,55,0,1,308,
+0,56,0,1,309,
 1,3,1,2,1,
-1,1981,22,1,163,
-1,2499,1982,17,1983,
+1,1976,22,1,164,
+1,2498,1977,17,1978,
 15,1795,1,-1,1,
-5,1984,20,1985,4,
+5,1979,20,1980,4,
 14,69,0,118,0,
 101,0,110,0,116,
-0,95,0,54,0,
-1,307,1,3,1,
-2,1,1,1986,22,
-1,162,1,2500,1987,
-17,1988,15,1795,1,
--1,1,5,1989,20,
-1990,4,14,69,0,
+0,95,0,55,0,
+1,308,1,3,1,
+2,1,1,1981,22,
+1,163,1,2499,1982,
+17,1983,15,1795,1,
+-1,1,5,1984,20,
+1985,4,14,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-53,0,1,306,1,
+54,0,1,307,1,
 3,1,2,1,1,
-1991,22,1,161,1,
-2501,1992,17,1993,15,
+1986,22,1,162,1,
+2500,1987,17,1988,15,
 1795,1,-1,1,5,
-1994,20,1995,4,14,
+1989,20,1990,4,14,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,52,0,1,
-305,1,3,1,2,
-1,1,1996,22,1,
-160,1,2502,1997,17,
-1998,15,1795,1,-1,
-1,5,1999,20,2000,
+95,0,53,0,1,
+306,1,3,1,2,
+1,1,1991,22,1,
+161,1,2501,1992,17,
+1993,15,1795,1,-1,
+1,5,1994,20,1995,
 4,14,69,0,118,
 0,101,0,110,0,
-116,0,95,0,51,
-0,1,304,1,3,
-1,2,1,1,2001,
-22,1,159,1,2503,
-2002,17,2003,15,1795,
-1,-1,1,5,2004,
-20,2005,4,14,69,
+116,0,95,0,52,
+0,1,305,1,3,
+1,2,1,1,1996,
+22,1,160,1,2502,
+1997,17,1998,15,1795,
+1,-1,1,5,1999,
+20,2000,4,14,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,50,0,1,303,
+0,51,0,1,304,
 1,3,1,2,1,
-1,2006,22,1,158,
-1,2504,2007,17,2008,
+1,2001,22,1,159,
+1,2503,2002,17,2003,
 15,1795,1,-1,1,
-5,2009,20,2010,4,
+5,2004,20,2005,4,
 14,69,0,118,0,
 101,0,110,0,116,
-0,95,0,49,0,
-1,302,1,3,1,
-2,1,1,2011,22,
-1,157,1,2505,2012,
-16,0,442,1,217,
-2013,16,0,187,1,
-1756,2014,16,0,187,
-1,17,2015,19,154,
-1,17,2016,5,121,
-1,1,2017,17,2018,
-15,2019,4,18,37,
-0,84,0,121,0,
-112,0,101,0,110,
-0,97,0,109,0,
-101,0,1,-1,1,
-5,2020,20,2021,4,
+0,95,0,50,0,
+1,303,1,3,1,
+2,1,1,2006,22,
+1,158,1,2504,2007,
+17,2008,15,1795,1,
+-1,1,5,2009,20,
+2010,4,14,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+49,0,1,302,1,
+3,1,2,1,1,
+2011,22,1,157,1,
+2505,2012,16,0,442,
+1,217,2013,16,0,
+187,1,1756,2014,16,
+0,187,1,17,2015,
+19,154,1,17,2016,
+5,121,1,1,2017,
+17,2018,15,2019,4,
+18,37,0,84,0,
+121,0,112,0,101,
+0,110,0,97,0,
+109,0,101,0,1,
+-1,1,5,2020,20,
+2021,4,20,84,0,
+121,0,112,0,101,
+0,110,0,97,0,
+109,0,101,0,95,
+0,55,0,1,301,
+1,3,1,2,1,
+1,2022,22,1,156,
+1,2,2023,17,2024,
+15,2019,1,-1,1,
+5,2025,20,2026,4,
 20,84,0,121,0,
 112,0,101,0,110,
 0,97,0,109,0,
-101,0,95,0,55,
-0,1,301,1,3,
-1,2,1,1,2022,
-22,1,156,1,2,
-2023,17,2024,15,2019,
-1,-1,1,5,2025,
-20,2026,4,20,84,
+101,0,95,0,54,
+0,1,300,1,3,
+1,2,1,1,2027,
+22,1,155,1,3,
+2028,17,2029,15,2019,
+1,-1,1,5,2030,
+20,2031,4,20,84,
 0,121,0,112,0,
 101,0,110,0,97,
 0,109,0,101,0,
-95,0,54,0,1,
-300,1,3,1,2,
-1,1,2027,22,1,
-155,1,3,2028,17,
-2029,15,2019,1,-1,
-1,5,2030,20,2031,
+95,0,53,0,1,
+299,1,3,1,2,
+1,1,2032,22,1,
+154,1,4,2033,17,
+2034,15,2019,1,-1,
+1,5,2035,20,2036,
 4,20,84,0,121,
 0,112,0,101,0,
 110,0,97,0,109,
 0,101,0,95,0,
-53,0,1,299,1,
+52,0,1,298,1,
 3,1,2,1,1,
-2032,22,1,154,1,
-4,2033,17,2034,15,
+2037,22,1,153,1,
+5,2038,17,2039,15,
 2019,1,-1,1,5,
-2035,20,2036,4,20,
+2040,20,2041,4,20,
 84,0,121,0,112,
 0,101,0,110,0,
 97,0,109,0,101,
-0,95,0,52,0,
-1,298,1,3,1,
-2,1,1,2037,22,
-1,153,1,5,2038,
-17,2039,15,2019,1,
--1,1,5,2040,20,
-2041,4,20,84,0,
+0,95,0,51,0,
+1,297,1,3,1,
+2,1,1,2042,22,
+1,152,1,6,2043,
+17,2044,15,2019,1,
+-1,1,5,2045,20,
+2046,4,20,84,0,
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,95,
-0,51,0,1,297,
+0,50,0,1,296,
 1,3,1,2,1,
-1,2042,22,1,152,
-1,6,2043,17,2044,
+1,2047,22,1,151,
+1,7,2048,17,2049,
 15,2019,1,-1,1,
-5,2045,20,2046,4,
+5,2050,20,2051,4,
 20,84,0,121,0,
 112,0,101,0,110,
 0,97,0,109,0,
-101,0,95,0,50,
-0,1,296,1,3,
-1,2,1,1,2047,
-22,1,151,1,7,
-2048,17,2049,15,2019,
-1,-1,1,5,2050,
-20,2051,4,20,84,
-0,121,0,112,0,
-101,0,110,0,97,
-0,109,0,101,0,
-95,0,49,0,1,
-295,1,3,1,2,
-1,1,2052,22,1,
-150,1,1514,1136,1,
-9,1141,1,10,1703,
-1,262,1147,1,1267,
-1153,1,481,1749,1,
-1521,1158,1,1773,2053,
-16,0,235,1,19,
-1175,1,20,2054,16,
-0,152,1,2281,1182,
-1,525,1244,1,30,
-1709,1,283,1200,1,
-1010,2055,16,0,621,
-1,40,1205,1,41,
-1714,1,42,1718,1,
-44,1211,1,1260,1124,
-1,47,1212,1,1303,
-1335,1,49,1224,1,
-50,1229,1,48,1218,
-1,305,1239,1,51,
-1234,1,61,2056,16,
-0,195,1,63,1250,
-1,66,1256,1,67,
-1261,1,68,1266,1,
-69,1271,1,70,1276,
-1,73,2057,16,0,
-205,1,74,1281,1,
-1013,1286,1,2335,2058,
-16,0,237,1,328,
-1330,1,1048,1372,1,
-82,1308,1,2513,2059,
-17,2060,15,2061,4,
-30,37,0,73,0,
-110,0,116,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,1,-1,1,5,
-2062,20,2063,4,32,
+101,0,95,0,49,
+0,1,295,1,3,
+1,2,1,1,2052,
+22,1,150,1,1514,
+1136,1,9,1141,1,
+10,1703,1,262,1147,
+1,1267,1153,1,481,
+1749,1,1521,1158,1,
+1773,2053,16,0,235,
+1,19,1175,1,20,
+2054,16,0,152,1,
+2281,1182,1,525,1244,
+1,30,1709,1,283,
+1200,1,1010,2055,16,
+0,621,1,40,1205,
+1,41,1714,1,42,
+1718,1,44,1211,1,
+1260,1124,1,47,1212,
+1,1303,1335,1,49,
+1224,1,50,1229,1,
+48,1218,1,305,1239,
+1,51,1234,1,61,
+2056,16,0,195,1,
+63,1250,1,66,1256,
+1,67,1261,1,68,
+1266,1,69,1271,1,
+70,1276,1,73,2057,
+16,0,205,1,74,
+1281,1,1013,1286,1,
+2335,2058,16,0,237,
+1,328,1330,1,1048,
+1372,1,82,1308,1,
+2513,2059,17,2060,15,
+2061,4,30,37,0,
 73,0,110,0,116,
 0,68,0,101,0,
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
-0,110,0,95,0,
-49,0,1,174,1,
-3,1,3,1,2,
-2064,22,1,28,1,
-2514,2065,17,2066,15,
-2067,4,54,37,0,
-73,0,110,0,116,
-0,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,76,
-0,105,0,115,0,
-116,0,1,-1,1,
-5,2068,20,2069,4,
-56,73,0,110,0,
-116,0,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
+0,110,0,1,-1,
+1,5,2062,20,2063,
+4,32,73,0,110,
 0,116,0,68,0,
 101,0,99,0,108,
 0,97,0,114,0,
 97,0,116,0,105,
 0,111,0,110,0,
-76,0,105,0,115,
-0,116,0,95,0,
-49,0,1,173,1,
-3,1,2,1,1,
-2070,22,1,27,1,
-2515,2071,16,0,455,
-1,1341,1325,1,2520,
-1732,1,1096,1340,1,
-93,1346,1,1550,1351,
-1,2529,2072,16,0,
-467,1,827,1359,1,
-1011,1130,1,107,1366,
-1,1114,1371,1,1871,
-2073,16,0,312,1,
-1370,1480,1,1478,1485,
-1,118,1383,1,1123,
-1388,1,1332,1291,1,
-1377,1399,1,375,1404,
-1,1882,2074,16,0,
-336,1,377,1409,1,
-352,1377,1,379,1414,
-1,380,1419,1,130,
-1442,1,2074,2075,16,
-0,579,1,371,1393,
-1,373,1437,1,1012,
-2076,16,0,623,1,
-1840,2077,16,0,302,
-1,143,1447,1,1152,
-1453,1,1406,1458,1,
-1159,1465,1,157,1470,
-1,1413,1475,1,883,
-1425,1,2670,1727,1,
-1094,2078,16,0,693,
-1,1296,1195,1,2679,
-2079,16,0,692,1,
-172,1496,1,1665,1502,
-1,1939,2080,16,0,
-454,1,1188,1508,1,
-1442,1513,1,188,1547,
-1,942,1519,1,1195,
-1525,1,1449,1530,1,
-1701,1535,1,447,1540,
-1,205,1552,1,2467,
-1736,1,464,1742,1,
-2197,2081,16,0,689,
-1,1224,1557,1,223,
-1562,1,1730,1567,1,
-476,1572,1,477,1578,
-1,1231,1583,1,479,
-1588,1,480,1593,1,
-1485,1599,1,459,1747,
-1,242,1606,1,478,
-1611,1,2506,2082,16,
-0,443,1,1001,1616,
-1,1002,1621,1,18,
-2083,19,507,1,18,
-2084,5,84,1,1011,
-1130,1,1012,2085,16,
-0,505,1,1013,1286,
-1,262,1147,1,1267,
-2086,16,0,505,1,
-515,2087,16,0,505,
-1,1521,2088,16,0,
-505,1,2692,2089,16,
-0,505,1,525,1244,
-1,283,1200,1,2299,
-2090,16,0,505,1,
-42,2091,16,0,505,
-1,40,1205,1,44,
-1211,1,47,1212,1,
-1303,2092,16,0,505,
-1,1555,2093,16,0,
-505,1,50,1229,1,
-48,1218,1,49,1224,
-1,51,1234,1,63,
-1250,1,305,1239,1,
-66,1256,1,67,1261,
-1,68,1266,1,69,
-1271,1,70,1276,1,
-73,2094,16,0,505,
-1,74,1281,1,328,
-1330,1,1048,2095,16,
-0,505,1,82,2096,
-16,0,505,1,1840,
-2097,16,0,505,1,
-1591,2098,16,0,505,
-1,1341,2099,16,0,
-505,1,1096,1340,1,
-93,1346,1,352,1377,
-1,107,2100,16,0,
-505,1,1114,1371,1,
-118,2101,16,0,505,
-1,1123,2102,16,0,
-505,1,371,1393,1,
-1628,2103,16,0,505,
-1,375,1404,1,1882,
-2104,16,0,505,1,
-377,1409,1,379,1414,
-1,380,1419,1,883,
-2105,16,0,505,1,
-373,1437,1,130,2106,
-16,0,505,1,143,
-2107,16,0,505,1,
-387,2108,16,0,505,
-1,1159,2109,16,0,
-505,1,157,2110,16,
-0,505,1,1413,2111,
-16,0,505,1,1665,
-2112,16,0,505,1,
-412,2113,16,0,505,
-1,1377,2114,16,0,
-505,1,172,2115,16,
-0,505,1,1939,2116,
-16,0,505,1,437,
-2117,16,0,505,1,
-188,2118,16,0,505,
-1,942,2119,16,0,
-505,1,1195,2120,16,
-0,505,1,1449,2121,
-16,0,505,1,1701,
-2122,16,0,505,1,
-447,1540,1,205,2123,
-16,0,505,1,827,
-2124,16,0,505,1,
-223,2125,16,0,505,
-1,476,1572,1,477,
-1578,1,1231,2126,16,
-0,505,1,479,1588,
-1,480,1593,1,1485,
-2127,16,0,505,1,
-1737,2128,16,0,505,
-1,242,2129,16,0,
-505,1,478,1611,1,
+95,0,49,0,1,
+174,1,3,1,3,
+1,2,2064,22,1,
+28,1,2514,2065,17,
+2066,15,2067,4,54,
+37,0,73,0,110,
+0,116,0,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,76,0,105,0,
+115,0,116,0,1,
+-1,1,5,2068,20,
+2069,4,56,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
+95,0,49,0,1,
+173,1,3,1,2,
+1,1,2070,22,1,
+27,1,2515,2071,16,
+0,455,1,1341,1325,
+1,2520,1732,1,1096,
+1340,1,93,1346,1,
+1550,1351,1,2529,2072,
+16,0,467,1,827,
+1359,1,1011,1130,1,
+107,1366,1,1114,1371,
+1,1871,2073,16,0,
+312,1,1370,1480,1,
+1478,1485,1,118,1383,
+1,1123,1388,1,1332,
+1291,1,1377,1399,1,
+375,1404,1,1882,2074,
+16,0,336,1,377,
+1409,1,352,1377,1,
+379,1414,1,380,1419,
+1,130,1442,1,2074,
+2075,16,0,579,1,
+371,1393,1,373,1437,
+1,1012,2076,16,0,
+623,1,1840,2077,16,
+0,302,1,143,1447,
+1,1152,1453,1,1406,
+1458,1,1159,1465,1,
+157,1470,1,1413,1475,
+1,883,1425,1,2670,
+1727,1,1094,2078,16,
+0,693,1,1296,1195,
+1,2679,2079,16,0,
+692,1,172,1496,1,
+1665,1502,1,1939,2080,
+16,0,454,1,1188,
+1508,1,1442,1513,1,
+188,1547,1,942,1519,
+1,1195,1525,1,1449,
+1530,1,1701,1535,1,
+447,1540,1,205,1552,
+1,2467,1736,1,464,
+1742,1,2197,2081,16,
+0,689,1,1224,1557,
+1,223,1562,1,1730,
+1567,1,476,1572,1,
+477,1578,1,1231,1583,
+1,479,1588,1,480,
+1593,1,1485,1599,1,
+459,1747,1,242,1606,
+1,478,1611,1,2506,
+2082,16,0,443,1,
 1001,1616,1,1002,1621,
-1,19,2130,19,226,
-1,19,2131,5,176,
-1,256,2132,16,0,
-224,1,1261,2133,16,
-0,224,1,1011,1130,
-1,1012,2134,16,0,
-480,1,2458,904,1,
-2686,2135,16,0,224,
-1,262,1147,1,1267,
-2136,16,0,480,1,
-2021,747,1,1521,2137,
-16,0,480,1,2692,
-2138,16,0,480,1,
-1775,2139,16,0,224,
-1,2029,754,1,2030,
-760,1,2031,765,1,
-2032,770,1,2033,775,
-1,277,2140,16,0,
-224,1,2035,781,1,
-2037,786,1,2039,791,
-1,32,2141,16,0,
-224,1,2464,927,1,
-2293,2142,16,0,224,
-1,2043,803,1,2045,
-808,1,2299,2143,16,
-0,480,1,41,2144,
-16,0,224,1,42,
-2145,16,0,480,1,
-40,1205,1,44,1211,
-1,43,2146,16,0,
-224,1,1804,2147,16,
-0,224,1,48,1218,
-1,49,1224,1,47,
-1212,1,51,1234,1,
-52,2148,16,0,224,
-1,50,1229,1,305,
-1239,1,1096,1340,1,
-1515,2149,16,0,224,
-1,2318,2150,16,0,
-224,1,283,1200,1,
-63,1250,1,66,1256,
+1,18,2083,19,507,
+1,18,2084,5,84,
+1,1011,1130,1,1012,
+2085,16,0,505,1,
+1013,1286,1,262,1147,
+1,1267,2086,16,0,
+505,1,515,2087,16,
+0,505,1,1521,2088,
+16,0,505,1,2692,
+2089,16,0,505,1,
+525,1244,1,283,1200,
+1,2299,2090,16,0,
+505,1,42,2091,16,
+0,505,1,40,1205,
+1,44,1211,1,47,
+1212,1,1303,2092,16,
+0,505,1,1555,2093,
+16,0,505,1,50,
+1229,1,48,1218,1,
+49,1224,1,51,1234,
+1,63,1250,1,305,
+1239,1,66,1256,1,
+67,1261,1,68,1266,
+1,69,1271,1,70,
+1276,1,73,2094,16,
+0,505,1,74,1281,
+1,328,1330,1,1048,
+2095,16,0,505,1,
+82,2096,16,0,505,
+1,1840,2097,16,0,
+505,1,1591,2098,16,
+0,505,1,1341,2099,
+16,0,505,1,1096,
+1340,1,93,1346,1,
+352,1377,1,107,2100,
+16,0,505,1,1114,
+1371,1,118,2101,16,
+0,505,1,1123,2102,
+16,0,505,1,371,
+1393,1,1628,2103,16,
+0,505,1,375,1404,
+1,1882,2104,16,0,
+505,1,377,1409,1,
+379,1414,1,380,1419,
+1,883,2105,16,0,
+505,1,373,1437,1,
+130,2106,16,0,505,
+1,143,2107,16,0,
+505,1,387,2108,16,
+0,505,1,1159,2109,
+16,0,505,1,157,
+2110,16,0,505,1,
+1413,2111,16,0,505,
+1,1665,2112,16,0,
+505,1,412,2113,16,
+0,505,1,1377,2114,
+16,0,505,1,172,
+2115,16,0,505,1,
+1939,2116,16,0,505,
+1,437,2117,16,0,
+505,1,188,2118,16,
+0,505,1,942,2119,
+16,0,505,1,1195,
+2120,16,0,505,1,
+1449,2121,16,0,505,
+1,1701,2122,16,0,
+505,1,447,1540,1,
+205,2123,16,0,505,
+1,827,2124,16,0,
+505,1,223,2125,16,
+0,505,1,476,1572,
+1,477,1578,1,1231,
+2126,16,0,505,1,
+479,1588,1,480,1593,
+1,1485,2127,16,0,
+505,1,1737,2128,16,
+0,505,1,242,2129,
+16,0,505,1,478,
+1611,1,1001,1616,1,
+1002,1621,1,19,2130,
+19,226,1,19,2131,
+5,176,1,256,2132,
+16,0,224,1,1261,
+2133,16,0,224,1,
+1011,1130,1,1012,2134,
+16,0,480,1,2458,
+904,1,2686,2135,16,
+0,224,1,262,1147,
+1,1267,2136,16,0,
+480,1,2021,747,1,
+1521,2137,16,0,480,
+1,2692,2138,16,0,
+480,1,1775,2139,16,
+0,224,1,2029,754,
+1,2030,760,1,2031,
+765,1,2032,770,1,
+2033,775,1,277,2140,
+16,0,224,1,2035,
+781,1,2037,786,1,
+2039,791,1,32,2141,
+16,0,224,1,2464,
+927,1,2293,2142,16,
+0,224,1,2043,803,
+1,2045,808,1,2299,
+2143,16,0,480,1,
+41,2144,16,0,224,
+1,42,2145,16,0,
+480,1,40,1205,1,
+44,1211,1,43,2146,
+16,0,224,1,1804,
+2147,16,0,224,1,
+48,1218,1,49,1224,
+1,47,1212,1,51,
+1234,1,52,2148,16,
+0,224,1,50,1229,
+1,305,1239,1,1096,
+1340,1,1515,2149,16,
+0,224,1,2318,2150,
+16,0,224,1,283,
+1200,1,63,1250,1,
+66,1256,1,67,1261,
+1,68,1266,1,69,
+1271,1,70,1276,1,
+71,2151,16,0,224,
+1,73,2152,16,0,
+480,1,74,1281,1,
+1013,1286,1,76,2153,
+16,0,224,1,1834,
+2154,16,0,224,1,
+2337,2155,16,0,224,
+1,79,2156,16,0,
+224,1,1335,2157,16,
+0,224,1,299,2158,
+16,0,224,1,82,
+2159,16,0,480,1,
+1840,2160,16,0,480,
+1,1297,2161,16,0,
+224,1,85,2162,16,
+0,224,1,1341,2163,
+16,0,480,1,89,
+2164,16,0,224,1,
+1303,2165,16,0,480,
+1,509,2166,16,0,
+224,1,93,1346,1,
+322,2167,16,0,224,
+1,97,2168,16,0,
+224,1,2041,797,1,
+1555,2169,16,0,480,
+1,827,2170,16,0,
+480,1,102,2171,16,
+0,224,1,1860,850,
+1,1803,816,1,2364,
+856,1,107,2172,16,
+0,480,1,1114,1371,
+1,112,2173,16,0,
+224,1,1117,2174,16,
+0,224,1,352,1377,
+1,1873,864,1,118,
+2175,16,0,480,1,
+1123,2176,16,0,480,
+1,371,1393,1,515,
+2177,16,0,480,1,
+1377,2178,16,0,480,
+1,124,2179,16,0,
+224,1,1882,2180,16,
+0,480,1,377,1409,
+1,379,1414,1,380,
+1419,1,130,2181,16,
+0,480,1,346,2182,
+16,0,224,1,2075,
+2183,16,0,224,1,
+373,1437,1,387,2184,
+16,0,480,1,137,
+2185,16,0,224,1,
+143,2186,16,0,480,
+1,1901,2187,16,0,
+224,1,1048,2188,16,
+0,480,1,1153,2189,
+16,0,224,1,375,
+1404,1,151,2190,16,
+0,224,1,1407,2191,
+16,0,224,1,1659,
+2192,16,0,224,1,
+2413,2193,16,0,224,
+1,1159,2194,16,0,
+480,1,381,2195,16,
+0,224,1,157,2196,
+16,0,480,1,1413,
+2197,16,0,480,1,
+883,2198,16,0,480,
+1,1371,2199,16,0,
+224,1,328,1330,1,
+2105,843,1,2106,2200,
+16,0,224,1,166,
+2201,16,0,224,1,
+525,2202,16,0,224,
+1,1622,2203,16,0,
+224,1,406,2204,16,
+0,224,1,1574,828,
+1,172,2205,16,0,
+480,1,1931,889,1,
+412,2206,16,0,480,
+1,1933,2207,16,0,
+224,1,1876,2208,16,
+0,224,1,431,2209,
+16,0,224,1,1585,
+2210,16,0,224,1,
+182,2211,16,0,224,
+1,1628,2212,16,0,
+480,1,1189,2213,16,
+0,224,1,437,2214,
+16,0,480,1,1591,
+2215,16,0,480,1,
+188,2216,16,0,480,
+1,1695,2217,16,0,
+224,1,2198,2218,16,
+0,224,1,1195,2219,
+16,0,480,1,1449,
+2220,16,0,480,1,
+1701,2221,16,0,480,
+1,447,2222,16,0,
+224,1,199,2223,16,
+0,224,1,2459,910,
+1,1958,2224,16,0,
+224,1,2462,917,1,
+1657,922,1,205,2225,
+16,0,480,1,459,
+2226,16,0,224,1,
+462,2227,16,0,224,
+1,1665,2228,16,0,
+480,1,217,2229,16,
+0,224,1,2227,936,
+1,942,2230,16,0,
+480,1,1225,2231,16,
+0,224,1,223,2232,
+16,0,480,1,1479,
+2233,16,0,224,1,
+1731,2234,16,0,224,
+1,477,1578,1,1231,
+2235,16,0,480,1,
+479,1588,1,480,1593,
+1,1485,2236,16,0,
+480,1,1737,2237,16,
+0,480,1,1989,944,
+1,1990,2238,16,0,
+224,1,1443,2239,16,
+0,224,1,236,2240,
+16,0,224,1,2136,
+871,1,476,1572,1,
+242,2241,16,0,480,
+1,478,1611,1,1939,
+2242,16,0,480,1,
+1001,1616,1,1002,1621,
+1,1756,2243,16,0,
+224,1,20,2244,19,
+464,1,20,2245,5,
+84,1,1011,1130,1,
+1012,2246,16,0,462,
+1,1013,1286,1,262,
+1147,1,1267,2247,16,
+0,462,1,515,2248,
+16,0,462,1,1521,
+2249,16,0,462,1,
+2692,2250,16,0,462,
+1,525,1244,1,283,
+1200,1,2299,2251,16,
+0,462,1,42,2252,
+16,0,462,1,40,
+1205,1,44,1211,1,
+47,1212,1,1303,2253,
+16,0,462,1,1555,
+2254,16,0,462,1,
+50,1229,1,48,1218,
+1,49,1224,1,51,
+1234,1,63,1250,1,
+305,1239,1,66,1256,
 1,67,1261,1,68,
 1266,1,69,1271,1,
-70,1276,1,71,2151,
-16,0,224,1,73,
-2152,16,0,480,1,
-74,1281,1,1013,1286,
-1,76,2153,16,0,
-224,1,1834,2154,16,
-0,224,1,2337,2155,
-16,0,224,1,79,
-2156,16,0,224,1,
-1335,2157,16,0,224,
-1,299,2158,16,0,
-224,1,82,2159,16,
-0,480,1,1840,2160,
-16,0,480,1,1297,
-2161,16,0,224,1,
-85,2162,16,0,224,
-1,1341,2163,16,0,
-480,1,89,2164,16,
-0,224,1,1303,2165,
-16,0,480,1,509,
-2166,16,0,224,1,
-93,1346,1,322,2167,
-16,0,224,1,97,
-2168,16,0,224,1,
-2041,797,1,1555,2169,
-16,0,480,1,827,
-2170,16,0,480,1,
-102,2171,16,0,224,
-1,1860,850,1,1803,
-816,1,2364,856,1,
-107,2172,16,0,480,
-1,1114,1371,1,112,
-2173,16,0,224,1,
-1117,2174,16,0,224,
-1,352,1377,1,1873,
-864,1,118,2175,16,
-0,480,1,1123,2176,
-16,0,480,1,371,
-1393,1,515,2177,16,
-0,480,1,1377,2178,
-16,0,480,1,124,
-2179,16,0,224,1,
-1882,2180,16,0,480,
-1,377,1409,1,379,
-1414,1,380,1419,1,
-130,2181,16,0,480,
-1,346,2182,16,0,
-224,1,2075,2183,16,
-0,224,1,373,1437,
-1,387,2184,16,0,
-480,1,137,2185,16,
-0,224,1,143,2186,
-16,0,480,1,1901,
-2187,16,0,224,1,
-1048,2188,16,0,480,
-1,1153,2189,16,0,
-224,1,375,1404,1,
-151,2190,16,0,224,
-1,1407,2191,16,0,
-224,1,1659,2192,16,
-0,224,1,2413,2193,
-16,0,224,1,1159,
-2194,16,0,480,1,
-381,2195,16,0,224,
-1,157,2196,16,0,
-480,1,1413,2197,16,
-0,480,1,883,2198,
-16,0,480,1,1371,
-2199,16,0,224,1,
-328,1330,1,2105,843,
-1,2106,2200,16,0,
-224,1,166,2201,16,
-0,224,1,525,2202,
-16,0,224,1,1622,
-2203,16,0,224,1,
-406,2204,16,0,224,
-1,1574,828,1,172,
-2205,16,0,480,1,
-1931,889,1,412,2206,
-16,0,480,1,1933,
-2207,16,0,224,1,
-1876,2208,16,0,224,
-1,431,2209,16,0,
-224,1,1585,2210,16,
-0,224,1,182,2211,
-16,0,224,1,1628,
-2212,16,0,480,1,
-1189,2213,16,0,224,
-1,437,2214,16,0,
-480,1,1591,2215,16,
-0,480,1,188,2216,
-16,0,480,1,1695,
-2217,16,0,224,1,
-2198,2218,16,0,224,
-1,1195,2219,16,0,
-480,1,1449,2220,16,
-0,480,1,1701,2221,
-16,0,480,1,447,
-2222,16,0,224,1,
-199,2223,16,0,224,
-1,2459,910,1,1958,
-2224,16,0,224,1,
-2462,917,1,1657,922,
-1,205,2225,16,0,
-480,1,459,2226,16,
-0,224,1,462,2227,
-16,0,224,1,1665,
-2228,16,0,480,1,
-217,2229,16,0,224,
-1,2227,936,1,942,
-2230,16,0,480,1,
-1225,2231,16,0,224,
-1,223,2232,16,0,
-480,1,1479,2233,16,
-0,224,1,1731,2234,
-16,0,224,1,477,
-1578,1,1231,2235,16,
-0,480,1,479,1588,
-1,480,1593,1,1485,
-2236,16,0,480,1,
-1737,2237,16,0,480,
-1,1989,944,1,1990,
-2238,16,0,224,1,
-1443,2239,16,0,224,
-1,236,2240,16,0,
-224,1,2136,871,1,
-476,1572,1,242,2241,
-16,0,480,1,478,
-1611,1,1939,2242,16,
-0,480,1,1001,1616,
-1,1002,1621,1,1756,
-2243,16,0,224,1,
-20,2244,19,464,1,
-20,2245,5,84,1,
-1011,1130,1,1012,2246,
-16,0,462,1,1013,
+70,1276,1,73,2255,
+16,0,462,1,74,
+1281,1,328,2256,16,
+0,462,1,1048,2257,
+16,0,462,1,82,
+2258,16,0,462,1,
+1840,2259,16,0,462,
+1,1591,2260,16,0,
+462,1,1341,2261,16,
+0,462,1,1096,1340,
+1,93,1346,1,352,
+2262,16,0,462,1,
+107,2263,16,0,462,
+1,1114,1371,1,118,
+2264,16,0,462,1,
+1123,2265,16,0,462,
+1,371,1393,1,1628,
+2266,16,0,462,1,
+375,1404,1,1882,2267,
+16,0,462,1,377,
+1409,1,379,1414,1,
+380,1419,1,883,2268,
+16,0,462,1,373,
+1437,1,130,2269,16,
+0,462,1,143,2270,
+16,0,462,1,387,
+2271,16,0,462,1,
+1159,2272,16,0,462,
+1,157,2273,16,0,
+462,1,1413,2274,16,
+0,462,1,1665,2275,
+16,0,462,1,412,
+2276,16,0,462,1,
+1377,2277,16,0,462,
+1,172,2278,16,0,
+462,1,1939,2279,16,
+0,462,1,437,2280,
+16,0,462,1,188,
+2281,16,0,462,1,
+942,2282,16,0,462,
+1,1195,2283,16,0,
+462,1,1449,2284,16,
+0,462,1,1701,2285,
+16,0,462,1,447,
+1540,1,205,2286,16,
+0,462,1,827,2287,
+16,0,462,1,223,
+2288,16,0,462,1,
+476,1572,1,477,1578,
+1,1231,2289,16,0,
+462,1,479,1588,1,
+480,1593,1,1485,2290,
+16,0,462,1,1737,
+2291,16,0,462,1,
+242,2292,16,0,462,
+1,478,1611,1,1001,
+1616,1,1002,1621,1,
+21,2293,19,441,1,
+21,2294,5,84,1,
+1011,1130,1,1012,2295,
+16,0,439,1,1013,
 1286,1,262,1147,1,
-1267,2247,16,0,462,
-1,515,2248,16,0,
-462,1,1521,2249,16,
-0,462,1,2692,2250,
-16,0,462,1,525,
+1267,2296,16,0,439,
+1,515,2297,16,0,
+439,1,1521,2298,16,
+0,439,1,2692,2299,
+16,0,439,1,525,
 1244,1,283,1200,1,
-2299,2251,16,0,462,
-1,42,2252,16,0,
-462,1,40,1205,1,
+2299,2300,16,0,439,
+1,42,2301,16,0,
+439,1,40,1205,1,
 44,1211,1,47,1212,
-1,1303,2253,16,0,
-462,1,1555,2254,16,
-0,462,1,50,1229,
+1,1303,2302,16,0,
+439,1,1555,2303,16,
+0,439,1,50,1229,
 1,48,1218,1,49,
 1224,1,51,1234,1,
 63,1250,1,305,1239,
 1,66,1256,1,67,
 1261,1,68,1266,1,
 69,1271,1,70,1276,
-1,73,2255,16,0,
-462,1,74,1281,1,
-328,2256,16,0,462,
-1,1048,2257,16,0,
-462,1,82,2258,16,
-0,462,1,1840,2259,
-16,0,462,1,1591,
-2260,16,0,462,1,
-1341,2261,16,0,462,
+1,73,2304,16,0,
+439,1,74,1281,1,
+328,2305,16,0,439,
+1,1048,2306,16,0,
+439,1,82,2307,16,
+0,439,1,1840,2308,
+16,0,439,1,1591,
+2309,16,0,439,1,
+1341,2310,16,0,439,
 1,1096,1340,1,93,
-1346,1,352,2262,16,
-0,462,1,107,2263,
-16,0,462,1,1114,
-1371,1,118,2264,16,
-0,462,1,1123,2265,
-16,0,462,1,371,
-1393,1,1628,2266,16,
-0,462,1,375,1404,
-1,1882,2267,16,0,
-462,1,377,1409,1,
+1346,1,352,2311,16,
+0,439,1,107,2312,
+16,0,439,1,1114,
+1371,1,118,2313,16,
+0,439,1,1123,2314,
+16,0,439,1,371,
+1393,1,1628,2315,16,
+0,439,1,375,1404,
+1,1882,2316,16,0,
+439,1,377,1409,1,
 379,1414,1,380,1419,
-1,883,2268,16,0,
-462,1,373,1437,1,
-130,2269,16,0,462,
-1,143,2270,16,0,
-462,1,387,2271,16,
-0,462,1,1159,2272,
-16,0,462,1,157,
-2273,16,0,462,1,
-1413,2274,16,0,462,
-1,1665,2275,16,0,
-462,1,412,2276,16,
-0,462,1,1377,2277,
-16,0,462,1,172,
-2278,16,0,462,1,
-1939,2279,16,0,462,
-1,437,2280,16,0,
-462,1,188,2281,16,
-0,462,1,942,2282,
-16,0,462,1,1195,
-2283,16,0,462,1,
-1449,2284,16,0,462,
-1,1701,2285,16,0,
-462,1,447,1540,1,
-205,2286,16,0,462,
-1,827,2287,16,0,
-462,1,223,2288,16,
-0,462,1,476,1572,
+1,883,2317,16,0,
+439,1,373,1437,1,
+130,2318,16,0,439,
+1,143,2319,16,0,
+439,1,387,2320,16,
+0,439,1,1159,2321,
+16,0,439,1,157,
+2322,16,0,439,1,
+1413,2323,16,0,439,
+1,1665,2324,16,0,
+439,1,412,2325,16,
+0,439,1,1377,2326,
+16,0,439,1,172,
+2327,16,0,439,1,
+1939,2328,16,0,439,
+1,437,2329,16,0,
+439,1,188,2330,16,
+0,439,1,942,2331,
+16,0,439,1,1195,
+2332,16,0,439,1,
+1449,2333,16,0,439,
+1,1701,2334,16,0,
+439,1,447,1540,1,
+205,2335,16,0,439,
+1,827,2336,16,0,
+439,1,223,2337,16,
+0,439,1,476,1572,
 1,477,1578,1,1231,
-2289,16,0,462,1,
+2338,16,0,439,1,
 479,1588,1,480,1593,
-1,1485,2290,16,0,
-462,1,1737,2291,16,
-0,462,1,242,2292,
-16,0,462,1,478,
+1,1485,2339,16,0,
+439,1,1737,2340,16,
+0,439,1,242,2341,
+16,0,439,1,478,
 1611,1,1001,1616,1,
-1002,1621,1,21,2293,
-19,441,1,21,2294,
+1002,1621,1,22,2342,
+19,392,1,22,2343,
 5,84,1,1011,1130,
-1,1012,2295,16,0,
-439,1,1013,1286,1,
-262,1147,1,1267,2296,
-16,0,439,1,515,
-2297,16,0,439,1,
-1521,2298,16,0,439,
-1,2692,2299,16,0,
-439,1,525,1244,1,
-283,1200,1,2299,2300,
-16,0,439,1,42,
-2301,16,0,439,1,
+1,1012,2344,16,0,
+390,1,1013,1286,1,
+262,1147,1,1267,2345,
+16,0,390,1,515,
+2346,16,0,390,1,
+1521,2347,16,0,390,
+1,2692,2348,16,0,
+390,1,525,1244,1,
+283,1200,1,2299,2349,
+16,0,390,1,42,
+2350,16,0,390,1,
 40,1205,1,44,1211,
 1,47,1212,1,1303,
-2302,16,0,439,1,
-1555,2303,16,0,439,
+2351,16,0,390,1,
+1555,2352,16,0,390,
 1,50,1229,1,48,
 1218,1,49,1224,1,
 51,1234,1,63,1250,
@@ -7030,1376 +7113,1367 @@ public yyLSLSyntax
 1256,1,67,1261,1,
 68,1266,1,69,1271,
 1,70,1276,1,73,
-2304,16,0,439,1,
-74,1281,1,328,2305,
-16,0,439,1,1048,
-2306,16,0,439,1,
-82,2307,16,0,439,
-1,1840,2308,16,0,
-439,1,1591,2309,16,
-0,439,1,1341,2310,
-16,0,439,1,1096,
+2353,16,0,390,1,
+74,1281,1,328,2354,
+16,0,390,1,1048,
+2355,16,0,390,1,
+82,2356,16,0,390,
+1,1840,2357,16,0,
+390,1,1591,2358,16,
+0,390,1,1341,2359,
+16,0,390,1,1096,
 1340,1,93,1346,1,
-352,2311,16,0,439,
-1,107,2312,16,0,
-439,1,1114,1371,1,
-118,2313,16,0,439,
-1,1123,2314,16,0,
-439,1,371,1393,1,
-1628,2315,16,0,439,
+352,2360,16,0,390,
+1,107,2361,16,0,
+390,1,1114,1371,1,
+118,2362,16,0,390,
+1,1123,2363,16,0,
+390,1,371,1393,1,
+1628,2364,16,0,390,
 1,375,1404,1,1882,
-2316,16,0,439,1,
+2365,16,0,390,1,
 377,1409,1,379,1414,
 1,380,1419,1,883,
-2317,16,0,439,1,
-373,1437,1,130,2318,
-16,0,439,1,143,
-2319,16,0,439,1,
-387,2320,16,0,439,
-1,1159,2321,16,0,
-439,1,157,2322,16,
-0,439,1,1413,2323,
-16,0,439,1,1665,
-2324,16,0,439,1,
-412,2325,16,0,439,
-1,1377,2326,16,0,
-439,1,172,2327,16,
-0,439,1,1939,2328,
-16,0,439,1,437,
-2329,16,0,439,1,
-188,2330,16,0,439,
-1,942,2331,16,0,
-439,1,1195,2332,16,
-0,439,1,1449,2333,
-16,0,439,1,1701,
-2334,16,0,439,1,
-447,1540,1,205,2335,
-16,0,439,1,827,
-2336,16,0,439,1,
-223,2337,16,0,439,
+2366,16,0,390,1,
+373,1437,1,130,2367,
+16,0,390,1,143,
+2368,16,0,390,1,
+387,2369,16,0,390,
+1,1159,2370,16,0,
+390,1,157,2371,16,
+0,390,1,1413,2372,
+16,0,390,1,1665,
+2373,16,0,390,1,
+412,2374,16,0,390,
+1,1377,2375,16,0,
+390,1,172,2376,16,
+0,390,1,1939,2377,
+16,0,390,1,437,
+2378,16,0,390,1,
+188,2379,16,0,390,
+1,942,2380,16,0,
+390,1,1195,2381,16,
+0,390,1,1449,2382,
+16,0,390,1,1701,
+2383,16,0,390,1,
+447,1540,1,205,2384,
+16,0,390,1,827,
+2385,16,0,390,1,
+223,2386,16,0,390,
 1,476,1572,1,477,
-1578,1,1231,2338,16,
-0,439,1,479,1588,
+1578,1,1231,2387,16,
+0,390,1,479,1588,
 1,480,1593,1,1485,
-2339,16,0,439,1,
-1737,2340,16,0,439,
-1,242,2341,16,0,
-439,1,478,1611,1,
+2388,16,0,390,1,
+1737,2389,16,0,390,
+1,242,2390,16,0,
+390,1,478,1611,1,
 1001,1616,1,1002,1621,
-1,22,2342,19,392,
-1,22,2343,5,84,
+1,23,2391,19,527,
+1,23,2392,5,38,
+1,1901,2393,16,0,
+525,1,2075,2394,16,
+0,525,1,1860,850,
+1,1803,816,1,1804,
+2395,16,0,525,1,
+2413,2396,16,0,525,
+1,2198,2397,16,0,
+525,1,1873,864,1,
+1657,922,1,1989,944,
+1,1990,2398,16,0,
+525,1,1775,2399,16,
+0,525,1,32,2400,
+16,0,525,1,2105,
+843,1,2106,2401,16,
+0,525,1,2364,856,
+1,2227,936,1,2337,
+2402,16,0,525,1,
+2021,747,1,2458,904,
+1,2459,910,1,2462,
+917,1,2136,871,1,
+2464,927,1,2029,754,
+1,2030,760,1,2031,
+765,1,2032,770,1,
+2033,775,1,2035,781,
+1,2037,786,1,2039,
+791,1,1931,889,1,
+2041,797,1,2043,803,
+1,2045,808,1,1574,
+828,1,1958,2403,16,
+0,525,1,24,2404,
+19,177,1,24,2405,
+5,5,1,44,2406,
+16,0,175,1,377,
+2407,16,0,563,1,
+40,2408,16,0,702,
+1,63,2409,16,0,
+197,1,373,2410,16,
+0,559,1,25,2411,
+19,291,1,25,2412,
+5,177,1,256,2413,
+16,0,568,1,1261,
+2414,16,0,568,1,
+1011,1130,1,1012,2415,
+16,0,289,1,2458,
+904,1,2686,2416,16,
+0,568,1,262,1147,
+1,1267,2417,16,0,
+289,1,2021,747,1,
+1521,2418,16,0,289,
+1,2692,2419,16,0,
+289,1,1775,2420,16,
+0,568,1,2029,754,
+1,2030,760,1,2031,
+765,1,2032,770,1,
+2033,775,1,277,2421,
+16,0,568,1,2035,
+781,1,2037,786,1,
+2039,791,1,32,2422,
+16,0,568,1,2464,
+927,1,2293,2423,16,
+0,568,1,2043,803,
+1,2045,808,1,2299,
+2424,16,0,289,1,
+41,2425,16,0,568,
+1,42,2426,16,0,
+289,1,40,1205,1,
+44,1211,1,43,2427,
+16,0,568,1,1804,
+2428,16,0,568,1,
+48,1218,1,49,1224,
+1,47,1212,1,51,
+1234,1,52,2429,16,
+0,568,1,50,1229,
+1,305,1239,1,1096,
+1340,1,1515,2430,16,
+0,568,1,2318,2431,
+16,0,568,1,62,
+2432,16,0,568,1,
+63,1250,1,66,1256,
+1,67,1261,1,68,
+1266,1,69,1271,1,
+70,1276,1,71,2433,
+16,0,568,1,283,
+1200,1,73,2434,16,
+0,289,1,74,1281,
+1,1013,1286,1,76,
+2435,16,0,568,1,
+1834,2436,16,0,568,
+1,2337,2437,16,0,
+568,1,79,2438,16,
+0,568,1,1335,2439,
+16,0,568,1,299,
+2440,16,0,568,1,
+82,2441,16,0,289,
+1,1840,2442,16,0,
+289,1,1297,2443,16,
+0,568,1,85,2444,
+16,0,568,1,1341,
+2445,16,0,289,1,
+89,2446,16,0,568,
+1,1303,2447,16,0,
+289,1,509,2448,16,
+0,568,1,93,1346,
+1,322,2449,16,0,
+568,1,97,2450,16,
+0,568,1,2041,797,
+1,1555,2451,16,0,
+289,1,827,2452,16,
+0,289,1,102,2453,
+16,0,568,1,1860,
+850,1,1803,816,1,
+2364,856,1,107,2454,
+16,0,289,1,1114,
+1371,1,112,2455,16,
+0,568,1,1117,2456,
+16,0,568,1,352,
+1377,1,1873,864,1,
+118,1383,1,1123,2457,
+16,0,289,1,371,
+1393,1,515,2458,16,
+0,289,1,1377,2459,
+16,0,289,1,124,
+2460,16,0,568,1,
+1882,2461,16,0,289,
+1,377,1409,1,379,
+1414,1,380,1419,1,
+130,1442,1,346,2462,
+16,0,568,1,2075,
+2463,16,0,568,1,
+373,1437,1,387,2464,
+16,0,289,1,137,
+2465,16,0,568,1,
+143,2466,16,0,289,
+1,1901,2467,16,0,
+568,1,1048,1372,1,
+1153,2468,16,0,568,
+1,375,1404,1,151,
+2469,16,0,568,1,
+1407,2470,16,0,568,
+1,1659,2471,16,0,
+568,1,2413,2472,16,
+0,568,1,1159,2473,
+16,0,289,1,381,
+2474,16,0,568,1,
+157,2475,16,0,289,
+1,1413,2476,16,0,
+289,1,883,2477,16,
+0,289,1,1371,2478,
+16,0,568,1,328,
+1330,1,2105,843,1,
+2106,2479,16,0,568,
+1,166,2480,16,0,
+568,1,525,2481,16,
+0,568,1,1622,2482,
+16,0,568,1,406,
+2483,16,0,568,1,
+1574,828,1,172,1496,
+1,1931,889,1,412,
+2484,16,0,289,1,
+1933,2485,16,0,568,
+1,1876,2486,16,0,
+568,1,431,2487,16,
+0,568,1,1585,2488,
+16,0,568,1,182,
+2489,16,0,568,1,
+1628,2490,16,0,289,
+1,1189,2491,16,0,
+568,1,437,2492,16,
+0,289,1,1591,2493,
+16,0,289,1,188,
+1547,1,1695,2494,16,
+0,568,1,2198,2495,
+16,0,568,1,1195,
+2496,16,0,289,1,
+1449,2497,16,0,289,
+1,1701,2498,16,0,
+289,1,447,2499,16,
+0,568,1,199,2500,
+16,0,568,1,2459,
+910,1,1958,2501,16,
+0,568,1,2462,917,
+1,1657,922,1,205,
+2502,16,0,289,1,
+459,2503,16,0,568,
+1,462,2504,16,0,
+568,1,1665,2505,16,
+0,289,1,217,2506,
+16,0,568,1,2227,
+936,1,942,1519,1,
+1225,2507,16,0,568,
+1,223,2508,16,0,
+289,1,1479,2509,16,
+0,568,1,1731,2510,
+16,0,568,1,477,
+1578,1,1231,2511,16,
+0,289,1,479,1588,
+1,480,1593,1,1485,
+2512,16,0,289,1,
+1737,2513,16,0,289,
+1,1989,944,1,1990,
+2514,16,0,568,1,
+1443,2515,16,0,568,
+1,236,2516,16,0,
+568,1,2136,871,1,
+476,1572,1,242,2517,
+16,0,289,1,478,
+1611,1,1939,2518,16,
+0,289,1,1001,1616,
+1,1002,1621,1,1756,
+2519,16,0,568,1,
+26,2520,19,307,1,
+26,2521,5,84,1,
+1011,1130,1,1012,2522,
+16,0,305,1,1013,
+1286,1,262,1147,1,
+1267,2523,16,0,305,
+1,515,2524,16,0,
+687,1,1521,2525,16,
+0,305,1,2692,2526,
+16,0,305,1,525,
+1244,1,283,1200,1,
+2299,2527,16,0,305,
+1,42,2528,16,0,
+305,1,40,1205,1,
+44,1211,1,47,1212,
+1,1303,2529,16,0,
+305,1,1555,2530,16,
+0,305,1,50,1229,
+1,48,1218,1,49,
+1224,1,51,1234,1,
+63,1250,1,305,1239,
+1,66,1256,1,67,
+1261,1,68,1266,1,
+69,1271,1,70,1276,
+1,73,2531,16,0,
+305,1,74,1281,1,
+328,1330,1,1048,1372,
+1,82,2532,16,0,
+305,1,1840,2533,16,
+0,305,1,1591,2534,
+16,0,305,1,1341,
+2535,16,0,305,1,
+1096,1340,1,93,1346,
+1,352,1377,1,107,
+2536,16,0,305,1,
+1114,1371,1,118,1383,
+1,1123,2537,16,0,
+305,1,371,1393,1,
+1628,2538,16,0,305,
+1,375,1404,1,1882,
+2539,16,0,305,1,
+377,1409,1,379,1414,
+1,380,1419,1,883,
+2540,16,0,305,1,
+373,1437,1,130,1442,
+1,143,2541,16,0,
+305,1,387,2542,16,
+0,305,1,1159,2543,
+16,0,305,1,157,
+2544,16,0,305,1,
+1413,2545,16,0,305,
+1,1665,2546,16,0,
+305,1,412,2547,16,
+0,305,1,1377,2548,
+16,0,305,1,172,
+1496,1,1939,2549,16,
+0,305,1,437,2550,
+16,0,617,1,188,
+1547,1,942,1519,1,
+1195,2551,16,0,305,
+1,1449,2552,16,0,
+305,1,1701,2553,16,
+0,305,1,447,1540,
+1,205,2554,16,0,
+305,1,827,2555,16,
+0,305,1,223,2556,
+16,0,305,1,476,
+1572,1,477,1578,1,
+1231,2557,16,0,305,
+1,479,1588,1,480,
+1593,1,1485,2558,16,
+0,305,1,1737,2559,
+16,0,305,1,242,
+2560,16,0,305,1,
+478,1611,1,1001,1616,
+1,1002,1621,1,27,
+2561,19,628,1,27,
+2562,5,95,1,256,
+2563,16,0,626,1,
+1261,2564,16,0,626,
+1,509,2565,16,0,
+626,1,1515,2566,16,
+0,626,1,2686,2567,
+16,0,626,1,2021,
+747,1,1775,2568,16,
+0,626,1,2029,754,
+1,2030,760,1,2031,
+765,1,2032,770,1,
+2033,775,1,277,2569,
+16,0,626,1,2035,
+781,1,2037,786,1,
+2039,791,1,32,2570,
+16,0,626,1,2041,
+797,1,2293,2571,16,
+0,626,1,2043,803,
+1,2045,808,1,41,
+2572,16,0,626,1,
+1297,2573,16,0,626,
+1,43,2574,16,0,
+626,1,1803,816,1,
+1804,2575,16,0,626,
+1,299,2576,16,0,
+626,1,52,2577,16,
+0,626,1,2318,2578,
+16,0,626,1,62,
+2579,16,0,626,1,
+2075,2580,16,0,626,
+1,1574,828,1,71,
+2581,16,0,626,1,
+76,2582,16,0,626,
+1,1834,2583,16,0,
+626,1,2337,2584,16,
+0,626,1,79,2585,
+16,0,626,1,1335,
+2586,16,0,626,1,
+322,2587,16,0,626,
+1,85,2588,16,0,
+626,1,89,2589,16,
+0,626,1,346,2590,
+16,0,626,1,2105,
+843,1,2106,2591,16,
+0,626,1,97,2592,
+16,0,626,1,1860,
+850,1,2364,856,1,
+102,2593,16,0,626,
+1,112,2594,16,0,
+626,1,1117,2595,16,
+0,626,1,1873,864,
+1,1876,2596,16,0,
+626,1,124,2597,16,
+0,626,1,2136,871,
+1,381,2598,16,0,
+626,1,525,2599,16,
+0,626,1,137,2600,
+16,0,626,1,1901,
+2601,16,0,626,1,
+1153,2602,16,0,626,
+1,151,2603,16,0,
+626,1,1407,2604,16,
+0,626,1,1659,2605,
+16,0,626,1,2413,
+2606,16,0,626,1,
+406,2607,16,0,626,
+1,1371,2608,16,0,
+626,1,166,2609,16,
+0,626,1,1622,2610,
+16,0,626,1,1931,
+889,1,1933,2611,16,
+0,626,1,431,2612,
+16,0,626,1,1585,
+2613,16,0,626,1,
+182,2614,16,0,626,
+1,1189,2615,16,0,
+626,1,1443,2616,16,
+0,626,1,1695,2617,
+16,0,626,1,2198,
+2618,16,0,626,1,
+447,2619,16,0,626,
+1,2458,904,1,2459,
+910,1,1958,2620,16,
+0,626,1,2462,917,
+1,1657,922,1,2464,
+927,1,199,2621,16,
+0,626,1,459,2622,
+16,0,626,1,462,
+2623,16,0,626,1,
+217,2624,16,0,626,
+1,2227,936,1,1225,
+2625,16,0,626,1,
+1479,2626,16,0,626,
+1,1731,2627,16,0,
+626,1,1989,944,1,
+1990,2628,16,0,626,
+1,236,2629,16,0,
+626,1,1756,2630,16,
+0,626,1,28,2631,
+19,655,1,28,2632,
+5,60,1,328,1330,
+1,223,1562,1,1096,
+1340,1,118,1383,1,
+883,1425,1,525,1244,
+1,1001,1616,1,130,
+1442,1,459,1747,1,
+1114,1371,1,352,1377,
+1,447,1540,1,464,
+1742,1,1011,1130,1,
+1013,1286,1,242,1606,
+1,143,1447,1,40,
+1205,1,41,1714,1,
+42,1718,1,479,1588,
+1,44,1211,1,481,
+1749,1,373,1437,1,
+47,1212,1,157,1470,
+1,49,1224,1,50,
+1229,1,48,1218,1,
+379,1414,1,380,1419,
+1,51,1234,1,476,
+1572,1,371,1393,1,
+478,1611,1,1048,1372,
+1,375,1404,1,172,
+1496,1,262,1147,1,
+283,1200,1,63,1250,
+1,67,1261,1,68,
+1266,1,69,1271,1,
+66,1256,1,461,2633,
+16,0,653,1,74,
+1281,1,377,1409,1,
+1002,1621,1,70,1276,
+1,188,1547,1,82,
+1308,1,305,1239,1,
+477,1578,1,827,1359,
+1,93,1346,1,480,
+1593,1,205,1552,1,
+942,1519,1,107,1366,
+1,29,2634,19,280,
+1,29,2635,5,84,
 1,1011,1130,1,1012,
-2344,16,0,390,1,
+2636,16,0,278,1,
 1013,1286,1,262,1147,
-1,1267,2345,16,0,
-390,1,515,2346,16,
-0,390,1,1521,2347,
-16,0,390,1,2692,
-2348,16,0,390,1,
+1,1267,2637,16,0,
+278,1,515,2638,16,
+0,278,1,1521,2639,
+16,0,278,1,2692,
+2640,16,0,278,1,
 525,1244,1,283,1200,
-1,2299,2349,16,0,
-390,1,42,2350,16,
-0,390,1,40,1205,
+1,2299,2641,16,0,
+278,1,42,2642,16,
+0,278,1,40,1205,
 1,44,1211,1,47,
-1212,1,1303,2351,16,
-0,390,1,1555,2352,
-16,0,390,1,50,
+1212,1,1303,2643,16,
+0,278,1,1555,2644,
+16,0,278,1,50,
 1229,1,48,1218,1,
 49,1224,1,51,1234,
 1,63,1250,1,305,
 1239,1,66,1256,1,
 67,1261,1,68,1266,
 1,69,1271,1,70,
-1276,1,73,2353,16,
-0,390,1,74,1281,
-1,328,2354,16,0,
-390,1,1048,2355,16,
-0,390,1,82,2356,
-16,0,390,1,1840,
-2357,16,0,390,1,
-1591,2358,16,0,390,
-1,1341,2359,16,0,
-390,1,1096,1340,1,
-93,1346,1,352,2360,
-16,0,390,1,107,
-2361,16,0,390,1,
-1114,1371,1,118,2362,
-16,0,390,1,1123,
-2363,16,0,390,1,
-371,1393,1,1628,2364,
-16,0,390,1,375,
-1404,1,1882,2365,16,
-0,390,1,377,1409,
-1,379,1414,1,380,
-1419,1,883,2366,16,
-0,390,1,373,1437,
-1,130,2367,16,0,
-390,1,143,2368,16,
-0,390,1,387,2369,
-16,0,390,1,1159,
-2370,16,0,390,1,
-157,2371,16,0,390,
-1,1413,2372,16,0,
-390,1,1665,2373,16,
-0,390,1,412,2374,
-16,0,390,1,1377,
-2375,16,0,390,1,
-172,2376,16,0,390,
-1,1939,2377,16,0,
-390,1,437,2378,16,
-0,390,1,188,2379,
-16,0,390,1,942,
-2380,16,0,390,1,
-1195,2381,16,0,390,
-1,1449,2382,16,0,
-390,1,1701,2383,16,
-0,390,1,447,1540,
-1,205,2384,16,0,
-390,1,827,2385,16,
-0,390,1,223,2386,
-16,0,390,1,476,
+1276,1,73,2645,16,
+0,278,1,74,1281,
+1,328,1330,1,1048,
+1372,1,82,2646,16,
+0,278,1,1840,2647,
+16,0,278,1,1591,
+2648,16,0,278,1,
+1341,2649,16,0,278,
+1,1096,1340,1,93,
+1346,1,352,1377,1,
+107,2650,16,0,278,
+1,1114,1371,1,118,
+1383,1,1123,2651,16,
+0,278,1,371,1393,
+1,1628,2652,16,0,
+278,1,375,1404,1,
+1882,2653,16,0,278,
+1,377,1409,1,379,
+1414,1,380,1419,1,
+883,2654,16,0,278,
+1,373,1437,1,130,
+1442,1,143,1447,1,
+387,2655,16,0,278,
+1,1159,2656,16,0,
+278,1,157,1470,1,
+1413,2657,16,0,278,
+1,1665,2658,16,0,
+278,1,412,2659,16,
+0,278,1,1377,2660,
+16,0,278,1,172,
+1496,1,1939,2661,16,
+0,278,1,437,2662,
+16,0,278,1,188,
+1547,1,942,1519,1,
+1195,2663,16,0,278,
+1,1449,2664,16,0,
+278,1,1701,2665,16,
+0,278,1,447,1540,
+1,205,2666,16,0,
+278,1,827,2667,16,
+0,278,1,223,2668,
+16,0,278,1,476,
 1572,1,477,1578,1,
-1231,2387,16,0,390,
+1231,2669,16,0,278,
 1,479,1588,1,480,
-1593,1,1485,2388,16,
-0,390,1,1737,2389,
-16,0,390,1,242,
-2390,16,0,390,1,
+1593,1,1485,2670,16,
+0,278,1,1737,2671,
+16,0,278,1,242,
+2672,16,0,278,1,
 478,1611,1,1001,1616,
-1,1002,1621,1,23,
-2391,19,527,1,23,
-2392,5,38,1,1901,
-2393,16,0,525,1,
-2075,2394,16,0,525,
-1,1860,850,1,1803,
-816,1,1804,2395,16,
-0,525,1,2413,2396,
-16,0,525,1,2198,
-2397,16,0,525,1,
-1873,864,1,1657,922,
-1,1989,944,1,1990,
-2398,16,0,525,1,
-1775,2399,16,0,525,
-1,32,2400,16,0,
-525,1,2105,843,1,
-2106,2401,16,0,525,
-1,2364,856,1,2227,
-936,1,2337,2402,16,
-0,525,1,2021,747,
-1,2458,904,1,2459,
-910,1,2462,917,1,
-2136,871,1,2464,927,
-1,2029,754,1,2030,
-760,1,2031,765,1,
-2032,770,1,2033,775,
-1,2035,781,1,2037,
-786,1,2039,791,1,
-1931,889,1,2041,797,
-1,2043,803,1,2045,
-808,1,1574,828,1,
-1958,2403,16,0,525,
-1,24,2404,19,177,
-1,24,2405,5,5,
-1,44,2406,16,0,
-175,1,377,2407,16,
-0,563,1,40,2408,
-16,0,702,1,63,
-2409,16,0,197,1,
-373,2410,16,0,559,
-1,25,2411,19,291,
-1,25,2412,5,177,
-1,256,2413,16,0,
-568,1,1261,2414,16,
-0,568,1,1011,1130,
-1,1012,2415,16,0,
-289,1,2458,904,1,
-2686,2416,16,0,568,
-1,262,1147,1,1267,
-2417,16,0,289,1,
-2021,747,1,1521,2418,
-16,0,289,1,2692,
-2419,16,0,289,1,
-1775,2420,16,0,568,
-1,2029,754,1,2030,
-760,1,2031,765,1,
-2032,770,1,2033,775,
-1,277,2421,16,0,
-568,1,2035,781,1,
-2037,786,1,2039,791,
-1,32,2422,16,0,
-568,1,2464,927,1,
-2293,2423,16,0,568,
-1,2043,803,1,2045,
-808,1,2299,2424,16,
-0,289,1,41,2425,
-16,0,568,1,42,
-2426,16,0,289,1,
-40,1205,1,44,1211,
-1,43,2427,16,0,
-568,1,1804,2428,16,
-0,568,1,48,1218,
-1,49,1224,1,47,
-1212,1,51,1234,1,
-52,2429,16,0,568,
-1,50,1229,1,305,
-1239,1,1096,1340,1,
-1515,2430,16,0,568,
-1,2318,2431,16,0,
-568,1,62,2432,16,
-0,568,1,63,1250,
-1,66,1256,1,67,
-1261,1,68,1266,1,
-69,1271,1,70,1276,
-1,71,2433,16,0,
-568,1,283,1200,1,
-73,2434,16,0,289,
-1,74,1281,1,1013,
-1286,1,76,2435,16,
-0,568,1,1834,2436,
-16,0,568,1,2337,
-2437,16,0,568,1,
-79,2438,16,0,568,
-1,1335,2439,16,0,
-568,1,299,2440,16,
-0,568,1,82,2441,
-16,0,289,1,1840,
-2442,16,0,289,1,
-1297,2443,16,0,568,
-1,85,2444,16,0,
-568,1,1341,2445,16,
-0,289,1,89,2446,
-16,0,568,1,1303,
-2447,16,0,289,1,
-509,2448,16,0,568,
-1,93,1346,1,322,
-2449,16,0,568,1,
-97,2450,16,0,568,
-1,2041,797,1,1555,
-2451,16,0,289,1,
-827,2452,16,0,289,
-1,102,2453,16,0,
-568,1,1860,850,1,
-1803,816,1,2364,856,
-1,107,2454,16,0,
-289,1,1114,1371,1,
-112,2455,16,0,568,
-1,1117,2456,16,0,
-568,1,352,1377,1,
-1873,864,1,118,1383,
-1,1123,2457,16,0,
-289,1,371,1393,1,
-515,2458,16,0,289,
-1,1377,2459,16,0,
-289,1,124,2460,16,
-0,568,1,1882,2461,
-16,0,289,1,377,
-1409,1,379,1414,1,
-380,1419,1,130,1442,
-1,346,2462,16,0,
-568,1,2075,2463,16,
-0,568,1,373,1437,
-1,387,2464,16,0,
-289,1,137,2465,16,
-0,568,1,143,2466,
-16,0,289,1,1901,
-2467,16,0,568,1,
-1048,1372,1,1153,2468,
-16,0,568,1,375,
-1404,1,151,2469,16,
-0,568,1,1407,2470,
-16,0,568,1,1659,
-2471,16,0,568,1,
-2413,2472,16,0,568,
-1,1159,2473,16,0,
-289,1,381,2474,16,
-0,568,1,157,2475,
-16,0,289,1,1413,
-2476,16,0,289,1,
-883,2477,16,0,289,
-1,1371,2478,16,0,
-568,1,328,1330,1,
-2105,843,1,2106,2479,
-16,0,568,1,166,
-2480,16,0,568,1,
-525,2481,16,0,568,
-1,1622,2482,16,0,
-568,1,406,2483,16,
-0,568,1,1574,828,
-1,172,1496,1,1931,
-889,1,412,2484,16,
-0,289,1,1933,2485,
-16,0,568,1,1876,
-2486,16,0,568,1,
-431,2487,16,0,568,
-1,1585,2488,16,0,
-568,1,182,2489,16,
-0,568,1,1628,2490,
-16,0,289,1,1189,
-2491,16,0,568,1,
-437,2492,16,0,289,
-1,1591,2493,16,0,
-289,1,188,1547,1,
-1695,2494,16,0,568,
-1,2198,2495,16,0,
-568,1,1195,2496,16,
-0,289,1,1449,2497,
-16,0,289,1,1701,
-2498,16,0,289,1,
-447,2499,16,0,568,
-1,199,2500,16,0,
-568,1,2459,910,1,
-1958,2501,16,0,568,
-1,2462,917,1,1657,
-922,1,205,2502,16,
-0,289,1,459,2503,
-16,0,568,1,462,
-2504,16,0,568,1,
-1665,2505,16,0,289,
-1,217,2506,16,0,
-568,1,2227,936,1,
-942,1519,1,1225,2507,
-16,0,568,1,223,
-2508,16,0,289,1,
-1479,2509,16,0,568,
-1,1731,2510,16,0,
-568,1,477,1578,1,
-1231,2511,16,0,289,
-1,479,1588,1,480,
-1593,1,1485,2512,16,
-0,289,1,1737,2513,
-16,0,289,1,1989,
-944,1,1990,2514,16,
-0,568,1,1443,2515,
-16,0,568,1,236,
-2516,16,0,568,1,
-2136,871,1,476,1572,
-1,242,2517,16,0,
-289,1,478,1611,1,
-1939,2518,16,0,289,
-1,1001,1616,1,1002,
-1621,1,1756,2519,16,
-0,568,1,26,2520,
-19,307,1,26,2521,
-5,84,1,1011,1130,
-1,1012,2522,16,0,
-305,1,1013,1286,1,
-262,1147,1,1267,2523,
-16,0,305,1,515,
-2524,16,0,687,1,
-1521,2525,16,0,305,
-1,2692,2526,16,0,
-305,1,525,1244,1,
-283,1200,1,2299,2527,
-16,0,305,1,42,
-2528,16,0,305,1,
-40,1205,1,44,1211,
-1,47,1212,1,1303,
-2529,16,0,305,1,
-1555,2530,16,0,305,
-1,50,1229,1,48,
-1218,1,49,1224,1,
-51,1234,1,63,1250,
-1,305,1239,1,66,
-1256,1,67,1261,1,
-68,1266,1,69,1271,
-1,70,1276,1,73,
-2531,16,0,305,1,
-74,1281,1,328,1330,
-1,1048,1372,1,82,
-2532,16,0,305,1,
-1840,2533,16,0,305,
-1,1591,2534,16,0,
-305,1,1341,2535,16,
-0,305,1,1096,1340,
-1,93,1346,1,352,
-1377,1,107,2536,16,
-0,305,1,1114,1371,
-1,118,1383,1,1123,
-2537,16,0,305,1,
-371,1393,1,1628,2538,
-16,0,305,1,375,
-1404,1,1882,2539,16,
-0,305,1,377,1409,
-1,379,1414,1,380,
-1419,1,883,2540,16,
-0,305,1,373,1437,
-1,130,1442,1,143,
-2541,16,0,305,1,
-387,2542,16,0,305,
-1,1159,2543,16,0,
-305,1,157,2544,16,
-0,305,1,1413,2545,
-16,0,305,1,1665,
-2546,16,0,305,1,
-412,2547,16,0,305,
-1,1377,2548,16,0,
-305,1,172,1496,1,
-1939,2549,16,0,305,
-1,437,2550,16,0,
-617,1,188,1547,1,
-942,1519,1,1195,2551,
-16,0,305,1,1449,
-2552,16,0,305,1,
-1701,2553,16,0,305,
-1,447,1540,1,205,
-2554,16,0,305,1,
-827,2555,16,0,305,
-1,223,2556,16,0,
-305,1,476,1572,1,
-477,1578,1,1231,2557,
-16,0,305,1,479,
-1588,1,480,1593,1,
-1485,2558,16,0,305,
-1,1737,2559,16,0,
-305,1,242,2560,16,
-0,305,1,478,1611,
-1,1001,1616,1,1002,
-1621,1,27,2561,19,
-628,1,27,2562,5,
-95,1,256,2563,16,
-0,626,1,1261,2564,
-16,0,626,1,509,
-2565,16,0,626,1,
-1515,2566,16,0,626,
-1,2686,2567,16,0,
-626,1,2021,747,1,
-1775,2568,16,0,626,
-1,2029,754,1,2030,
-760,1,2031,765,1,
-2032,770,1,2033,775,
-1,277,2569,16,0,
-626,1,2035,781,1,
-2037,786,1,2039,791,
-1,32,2570,16,0,
-626,1,2041,797,1,
-2293,2571,16,0,626,
-1,2043,803,1,2045,
-808,1,41,2572,16,
-0,626,1,1297,2573,
-16,0,626,1,43,
-2574,16,0,626,1,
-1803,816,1,1804,2575,
-16,0,626,1,299,
-2576,16,0,626,1,
-52,2577,16,0,626,
-1,2318,2578,16,0,
-626,1,62,2579,16,
-0,626,1,2075,2580,
-16,0,626,1,1574,
-828,1,71,2581,16,
-0,626,1,76,2582,
-16,0,626,1,1834,
-2583,16,0,626,1,
-2337,2584,16,0,626,
-1,79,2585,16,0,
-626,1,1335,2586,16,
-0,626,1,322,2587,
-16,0,626,1,85,
-2588,16,0,626,1,
-89,2589,16,0,626,
-1,346,2590,16,0,
-626,1,2105,843,1,
-2106,2591,16,0,626,
-1,97,2592,16,0,
-626,1,1860,850,1,
-2364,856,1,102,2593,
-16,0,626,1,112,
-2594,16,0,626,1,
-1117,2595,16,0,626,
-1,1873,864,1,1876,
-2596,16,0,626,1,
-124,2597,16,0,626,
-1,2136,871,1,381,
-2598,16,0,626,1,
-525,2599,16,0,626,
-1,137,2600,16,0,
-626,1,1901,2601,16,
-0,626,1,1153,2602,
-16,0,626,1,151,
-2603,16,0,626,1,
-1407,2604,16,0,626,
-1,1659,2605,16,0,
-626,1,2413,2606,16,
-0,626,1,406,2607,
-16,0,626,1,1371,
-2608,16,0,626,1,
-166,2609,16,0,626,
-1,1622,2610,16,0,
-626,1,1931,889,1,
-1933,2611,16,0,626,
-1,431,2612,16,0,
-626,1,1585,2613,16,
-0,626,1,182,2614,
-16,0,626,1,1189,
-2615,16,0,626,1,
-1443,2616,16,0,626,
-1,1695,2617,16,0,
-626,1,2198,2618,16,
-0,626,1,447,2619,
-16,0,626,1,2458,
-904,1,2459,910,1,
-1958,2620,16,0,626,
-1,2462,917,1,1657,
-922,1,2464,927,1,
-199,2621,16,0,626,
-1,459,2622,16,0,
-626,1,462,2623,16,
-0,626,1,217,2624,
-16,0,626,1,2227,
-936,1,1225,2625,16,
-0,626,1,1479,2626,
-16,0,626,1,1731,
-2627,16,0,626,1,
-1989,944,1,1990,2628,
-16,0,626,1,236,
-2629,16,0,626,1,
-1756,2630,16,0,626,
-1,28,2631,19,655,
-1,28,2632,5,60,
-1,328,1330,1,223,
-1562,1,1096,1340,1,
-118,1383,1,883,1425,
-1,525,1244,1,1001,
-1616,1,130,1442,1,
-459,1747,1,1114,1371,
-1,352,1377,1,447,
-1540,1,464,1742,1,
-1011,1130,1,1013,1286,
-1,242,1606,1,143,
-1447,1,40,1205,1,
-41,1714,1,42,1718,
-1,479,1588,1,44,
-1211,1,481,1749,1,
-373,1437,1,47,1212,
-1,157,1470,1,49,
-1224,1,50,1229,1,
-48,1218,1,379,1414,
-1,380,1419,1,51,
-1234,1,476,1572,1,
-371,1393,1,478,1611,
-1,1048,1372,1,375,
-1404,1,172,1496,1,
-262,1147,1,283,1200,
-1,63,1250,1,67,
-1261,1,68,1266,1,
-69,1271,1,66,1256,
-1,461,2633,16,0,
-653,1,74,1281,1,
-377,1409,1,1002,1621,
-1,70,1276,1,188,
-1547,1,82,1308,1,
-305,1239,1,477,1578,
-1,827,1359,1,93,
-1346,1,480,1593,1,
-205,1552,1,942,1519,
-1,107,1366,1,29,
-2634,19,280,1,29,
-2635,5,84,1,1011,
-1130,1,1012,2636,16,
-0,278,1,1013,1286,
+1,1002,1621,1,30,
+2673,19,268,1,30,
+2674,5,84,1,1011,
+1130,1,1012,2675,16,
+0,266,1,1013,1286,
 1,262,1147,1,1267,
-2637,16,0,278,1,
-515,2638,16,0,278,
-1,1521,2639,16,0,
-278,1,2692,2640,16,
-0,278,1,525,1244,
+2676,16,0,266,1,
+515,2677,16,0,266,
+1,1521,2678,16,0,
+266,1,2692,2679,16,
+0,266,1,525,1244,
 1,283,1200,1,2299,
-2641,16,0,278,1,
-42,2642,16,0,278,
+2680,16,0,266,1,
+42,2681,16,0,266,
 1,40,1205,1,44,
 1211,1,47,1212,1,
-1303,2643,16,0,278,
-1,1555,2644,16,0,
-278,1,50,1229,1,
+1303,2682,16,0,266,
+1,1555,2683,16,0,
+266,1,50,1229,1,
 48,1218,1,49,1224,
 1,51,1234,1,63,
 1250,1,305,1239,1,
 66,1256,1,67,1261,
 1,68,1266,1,69,
 1271,1,70,1276,1,
-73,2645,16,0,278,
+73,2684,16,0,266,
 1,74,1281,1,328,
 1330,1,1048,1372,1,
-82,2646,16,0,278,
-1,1840,2647,16,0,
-278,1,1591,2648,16,
-0,278,1,1341,2649,
-16,0,278,1,1096,
+82,2685,16,0,266,
+1,1840,2686,16,0,
+266,1,1591,2687,16,
+0,266,1,1341,2688,
+16,0,266,1,1096,
 1340,1,93,1346,1,
-352,1377,1,107,2650,
-16,0,278,1,1114,
+352,1377,1,107,2689,
+16,0,266,1,1114,
 1371,1,118,1383,1,
-1123,2651,16,0,278,
+1123,2690,16,0,266,
 1,371,1393,1,1628,
-2652,16,0,278,1,
-375,1404,1,1882,2653,
-16,0,278,1,377,
+2691,16,0,266,1,
+375,1404,1,1882,2692,
+16,0,266,1,377,
 1409,1,379,1414,1,
-380,1419,1,883,2654,
-16,0,278,1,373,
+380,1419,1,883,2693,
+16,0,266,1,373,
 1437,1,130,1442,1,
-143,1447,1,387,2655,
-16,0,278,1,1159,
-2656,16,0,278,1,
-157,1470,1,1413,2657,
-16,0,278,1,1665,
-2658,16,0,278,1,
-412,2659,16,0,278,
-1,1377,2660,16,0,
-278,1,172,1496,1,
-1939,2661,16,0,278,
-1,437,2662,16,0,
-278,1,188,1547,1,
-942,1519,1,1195,2663,
-16,0,278,1,1449,
-2664,16,0,278,1,
-1701,2665,16,0,278,
+143,1447,1,387,2694,
+16,0,266,1,1159,
+2695,16,0,266,1,
+157,1470,1,1413,2696,
+16,0,266,1,1665,
+2697,16,0,266,1,
+412,2698,16,0,266,
+1,1377,2699,16,0,
+266,1,172,1496,1,
+1939,2700,16,0,266,
+1,437,2701,16,0,
+266,1,188,1547,1,
+942,1519,1,1195,2702,
+16,0,266,1,1449,
+2703,16,0,266,1,
+1701,2704,16,0,266,
 1,447,1540,1,205,
-2666,16,0,278,1,
-827,2667,16,0,278,
-1,223,2668,16,0,
-278,1,476,1572,1,
-477,1578,1,1231,2669,
-16,0,278,1,479,
+2705,16,0,266,1,
+827,2706,16,0,266,
+1,223,2707,16,0,
+266,1,476,1572,1,
+477,1578,1,1231,2708,
+16,0,266,1,479,
 1588,1,480,1593,1,
-1485,2670,16,0,278,
-1,1737,2671,16,0,
-278,1,242,2672,16,
-0,278,1,478,1611,
+1485,2709,16,0,266,
+1,1737,2710,16,0,
+266,1,242,2711,16,
+0,266,1,478,1611,
 1,1001,1616,1,1002,
-1621,1,30,2673,19,
-268,1,30,2674,5,
+1621,1,31,2712,19,
+254,1,31,2713,5,
 84,1,1011,1130,1,
-1012,2675,16,0,266,
+1012,2714,16,0,252,
 1,1013,1286,1,262,
-1147,1,1267,2676,16,
-0,266,1,515,2677,
-16,0,266,1,1521,
-2678,16,0,266,1,
-2692,2679,16,0,266,
+1147,1,1267,2715,16,
+0,252,1,515,2716,
+16,0,252,1,1521,
+2717,16,0,252,1,
+2692,2718,16,0,252,
 1,525,1244,1,283,
-1200,1,2299,2680,16,
-0,266,1,42,2681,
-16,0,266,1,40,
+1200,1,2299,2719,16,
+0,252,1,42,2720,
+16,0,252,1,40,
 1205,1,44,1211,1,
-47,1212,1,1303,2682,
-16,0,266,1,1555,
-2683,16,0,266,1,
+47,1212,1,1303,2721,
+16,0,252,1,1555,
+2722,16,0,252,1,
 50,1229,1,48,1218,
 1,49,1224,1,51,
 1234,1,63,1250,1,
 305,1239,1,66,1256,
 1,67,1261,1,68,
 1266,1,69,1271,1,
-70,1276,1,73,2684,
-16,0,266,1,74,
+70,1276,1,73,2723,
+16,0,252,1,74,
 1281,1,328,1330,1,
-1048,1372,1,82,2685,
-16,0,266,1,1840,
-2686,16,0,266,1,
-1591,2687,16,0,266,
-1,1341,2688,16,0,
-266,1,1096,1340,1,
+1048,1372,1,82,2724,
+16,0,252,1,1840,
+2725,16,0,252,1,
+1591,2726,16,0,252,
+1,1341,2727,16,0,
+252,1,1096,1340,1,
 93,1346,1,352,1377,
-1,107,2689,16,0,
-266,1,1114,1371,1,
-118,1383,1,1123,2690,
-16,0,266,1,371,
-1393,1,1628,2691,16,
-0,266,1,375,1404,
-1,1882,2692,16,0,
-266,1,377,1409,1,
+1,107,2728,16,0,
+252,1,1114,1371,1,
+118,1383,1,1123,2729,
+16,0,252,1,371,
+1393,1,1628,2730,16,
+0,252,1,375,1404,
+1,1882,2731,16,0,
+252,1,377,1409,1,
 379,1414,1,380,1419,
-1,883,2693,16,0,
-266,1,373,1437,1,
-130,1442,1,143,1447,
-1,387,2694,16,0,
-266,1,1159,2695,16,
-0,266,1,157,1470,
-1,1413,2696,16,0,
-266,1,1665,2697,16,
-0,266,1,412,2698,
-16,0,266,1,1377,
-2699,16,0,266,1,
-172,1496,1,1939,2700,
-16,0,266,1,437,
-2701,16,0,266,1,
+1,883,2732,16,0,
+252,1,373,1437,1,
+130,1442,1,143,2733,
+16,0,252,1,387,
+2734,16,0,252,1,
+1159,2735,16,0,252,
+1,157,2736,16,0,
+252,1,1413,2737,16,
+0,252,1,1665,2738,
+16,0,252,1,412,
+2739,16,0,252,1,
+1377,2740,16,0,252,
+1,172,1496,1,1939,
+2741,16,0,252,1,
+437,2742,16,0,252,
+1,188,1547,1,942,
+1519,1,1195,2743,16,
+0,252,1,1449,2744,
+16,0,252,1,1701,
+2745,16,0,252,1,
+447,1540,1,205,2746,
+16,0,252,1,827,
+2747,16,0,252,1,
+223,2748,16,0,252,
+1,476,1572,1,477,
+1578,1,1231,2749,16,
+0,252,1,479,1588,
+1,480,1593,1,1485,
+2750,16,0,252,1,
+1737,2751,16,0,252,
+1,242,2752,16,0,
+252,1,478,1611,1,
+1001,1616,1,1002,1621,
+1,32,2753,19,244,
+1,32,2754,5,84,
+1,1011,1130,1,1012,
+2755,16,0,242,1,
+1013,1286,1,262,1147,
+1,1267,2756,16,0,
+242,1,515,2757,16,
+0,242,1,1521,2758,
+16,0,242,1,2692,
+2759,16,0,242,1,
+525,1244,1,283,1200,
+1,2299,2760,16,0,
+242,1,42,2761,16,
+0,242,1,40,1205,
+1,44,1211,1,47,
+1212,1,1303,2762,16,
+0,242,1,1555,2763,
+16,0,242,1,50,
+1229,1,48,1218,1,
+49,1224,1,51,1234,
+1,63,1250,1,305,
+1239,1,66,1256,1,
+67,1261,1,68,1266,
+1,69,1271,1,70,
+1276,1,73,2764,16,
+0,242,1,74,1281,
+1,328,1330,1,1048,
+1372,1,82,2765,16,
+0,242,1,1840,2766,
+16,0,242,1,1591,
+2767,16,0,242,1,
+1341,2768,16,0,242,
+1,1096,1340,1,93,
+1346,1,352,1377,1,
+107,2769,16,0,242,
+1,1114,1371,1,118,
+1383,1,1123,2770,16,
+0,242,1,371,1393,
+1,1628,2771,16,0,
+242,1,375,1404,1,
+1882,2772,16,0,242,
+1,377,1409,1,379,
+1414,1,380,1419,1,
+883,2773,16,0,242,
+1,373,1437,1,130,
+1442,1,143,2774,16,
+0,242,1,387,2775,
+16,0,242,1,1159,
+2776,16,0,242,1,
+157,2777,16,0,242,
+1,1413,2778,16,0,
+242,1,1665,2779,16,
+0,242,1,412,2780,
+16,0,242,1,1377,
+2781,16,0,242,1,
+172,1496,1,1939,2782,
+16,0,242,1,437,
+2783,16,0,242,1,
 188,1547,1,942,1519,
-1,1195,2702,16,0,
-266,1,1449,2703,16,
-0,266,1,1701,2704,
-16,0,266,1,447,
-1540,1,205,2705,16,
-0,266,1,827,2706,
-16,0,266,1,223,
-2707,16,0,266,1,
+1,1195,2784,16,0,
+242,1,1449,2785,16,
+0,242,1,1701,2786,
+16,0,242,1,447,
+1540,1,205,2787,16,
+0,242,1,827,2788,
+16,0,242,1,223,
+2789,16,0,242,1,
 476,1572,1,477,1578,
-1,1231,2708,16,0,
-266,1,479,1588,1,
-480,1593,1,1485,2709,
-16,0,266,1,1737,
-2710,16,0,266,1,
-242,2711,16,0,266,
+1,1231,2790,16,0,
+242,1,479,1588,1,
+480,1593,1,1485,2791,
+16,0,242,1,1737,
+2792,16,0,242,1,
+242,2793,16,0,242,
 1,478,1611,1,1001,
 1616,1,1002,1621,1,
-31,2712,19,254,1,
-31,2713,5,84,1,
-1011,1130,1,1012,2714,
-16,0,252,1,1013,
+33,2794,19,341,1,
+33,2795,5,84,1,
+1011,1130,1,1012,2796,
+16,0,339,1,1013,
 1286,1,262,1147,1,
-1267,2715,16,0,252,
-1,515,2716,16,0,
-252,1,1521,2717,16,
-0,252,1,2692,2718,
-16,0,252,1,525,
+1267,2797,16,0,339,
+1,515,2798,16,0,
+339,1,1521,2799,16,
+0,339,1,2692,2800,
+16,0,339,1,525,
 1244,1,283,1200,1,
-2299,2719,16,0,252,
-1,42,2720,16,0,
-252,1,40,1205,1,
+2299,2801,16,0,339,
+1,42,2802,16,0,
+339,1,40,1205,1,
 44,1211,1,47,1212,
-1,1303,2721,16,0,
-252,1,1555,2722,16,
-0,252,1,50,1229,
+1,1303,2803,16,0,
+339,1,1555,2804,16,
+0,339,1,50,1229,
 1,48,1218,1,49,
 1224,1,51,1234,1,
 63,1250,1,305,1239,
 1,66,1256,1,67,
 1261,1,68,1266,1,
 69,1271,1,70,1276,
-1,73,2723,16,0,
-252,1,74,1281,1,
+1,73,2805,16,0,
+339,1,74,1281,1,
 328,1330,1,1048,1372,
-1,82,2724,16,0,
-252,1,1840,2725,16,
-0,252,1,1591,2726,
-16,0,252,1,1341,
-2727,16,0,252,1,
+1,82,2806,16,0,
+339,1,1840,2807,16,
+0,339,1,1591,2808,
+16,0,339,1,1341,
+2809,16,0,339,1,
 1096,1340,1,93,1346,
 1,352,1377,1,107,
-2728,16,0,252,1,
+2810,16,0,339,1,
 1114,1371,1,118,1383,
-1,1123,2729,16,0,
-252,1,371,1393,1,
-1628,2730,16,0,252,
+1,1123,2811,16,0,
+339,1,371,1393,1,
+1628,2812,16,0,339,
 1,375,1404,1,1882,
-2731,16,0,252,1,
+2813,16,0,339,1,
 377,1409,1,379,1414,
 1,380,1419,1,883,
-2732,16,0,252,1,
+2814,16,0,339,1,
 373,1437,1,130,1442,
-1,143,2733,16,0,
-252,1,387,2734,16,
-0,252,1,1159,2735,
-16,0,252,1,157,
-2736,16,0,252,1,
-1413,2737,16,0,252,
-1,1665,2738,16,0,
-252,1,412,2739,16,
-0,252,1,1377,2740,
-16,0,252,1,172,
-1496,1,1939,2741,16,
-0,252,1,437,2742,
-16,0,252,1,188,
-1547,1,942,1519,1,
-1195,2743,16,0,252,
-1,1449,2744,16,0,
-252,1,1701,2745,16,
-0,252,1,447,1540,
-1,205,2746,16,0,
-252,1,827,2747,16,
-0,252,1,223,2748,
-16,0,252,1,476,
-1572,1,477,1578,1,
-1231,2749,16,0,252,
-1,479,1588,1,480,
-1593,1,1485,2750,16,
-0,252,1,1737,2751,
-16,0,252,1,242,
-2752,16,0,252,1,
+1,143,1447,1,387,
+2815,16,0,339,1,
+1159,2816,16,0,339,
+1,157,1470,1,1413,
+2817,16,0,339,1,
+1665,2818,16,0,339,
+1,412,2819,16,0,
+339,1,1377,2820,16,
+0,339,1,172,1496,
+1,1939,2821,16,0,
+339,1,437,2822,16,
+0,339,1,188,1547,
+1,942,1519,1,1195,
+2823,16,0,339,1,
+1449,2824,16,0,339,
+1,1701,2825,16,0,
+339,1,447,1540,1,
+205,2826,16,0,339,
+1,827,2827,16,0,
+339,1,223,2828,16,
+0,339,1,476,1572,
+1,477,1578,1,1231,
+2829,16,0,339,1,
+479,1588,1,480,1593,
+1,1485,2830,16,0,
+339,1,1737,2831,16,
+0,339,1,242,1606,
+1,478,1611,1,1001,
+1616,1,1002,1621,1,
+34,2832,19,327,1,
+34,2833,5,84,1,
+1011,1130,1,1012,2834,
+16,0,325,1,1013,
+1286,1,262,1147,1,
+1267,2835,16,0,325,
+1,515,2836,16,0,
+325,1,1521,2837,16,
+0,325,1,2692,2838,
+16,0,325,1,525,
+1244,1,283,1200,1,
+2299,2839,16,0,325,
+1,42,2840,16,0,
+325,1,40,1205,1,
+44,1211,1,47,1212,
+1,1303,2841,16,0,
+325,1,1555,2842,16,
+0,325,1,50,1229,
+1,48,1218,1,49,
+1224,1,51,1234,1,
+63,1250,1,305,1239,
+1,66,1256,1,67,
+1261,1,68,1266,1,
+69,1271,1,70,1276,
+1,73,2843,16,0,
+325,1,74,1281,1,
+328,1330,1,1048,1372,
+1,82,2844,16,0,
+325,1,1840,2845,16,
+0,325,1,1591,2846,
+16,0,325,1,1341,
+2847,16,0,325,1,
+1096,1340,1,93,1346,
+1,352,1377,1,107,
+2848,16,0,325,1,
+1114,1371,1,118,1383,
+1,1123,2849,16,0,
+325,1,371,1393,1,
+1628,2850,16,0,325,
+1,375,1404,1,1882,
+2851,16,0,325,1,
+377,1409,1,379,1414,
+1,380,1419,1,883,
+2852,16,0,325,1,
+373,1437,1,130,1442,
+1,143,1447,1,387,
+2853,16,0,325,1,
+1159,2854,16,0,325,
+1,157,1470,1,1413,
+2855,16,0,325,1,
+1665,2856,16,0,325,
+1,412,2857,16,0,
+325,1,1377,2858,16,
+0,325,1,172,1496,
+1,1939,2859,16,0,
+325,1,437,2860,16,
+0,325,1,188,1547,
+1,942,1519,1,1195,
+2861,16,0,325,1,
+1449,2862,16,0,325,
+1,1701,2863,16,0,
+325,1,447,1540,1,
+205,1552,1,827,2864,
+16,0,325,1,223,
+1562,1,476,1572,1,
+477,1578,1,1231,2865,
+16,0,325,1,479,
+1588,1,480,1593,1,
+1485,2866,16,0,325,
+1,1737,2867,16,0,
+325,1,242,1606,1,
 478,1611,1,1001,1616,
-1,1002,1621,1,32,
-2753,19,244,1,32,
-2754,5,84,1,1011,
-1130,1,1012,2755,16,
-0,242,1,1013,1286,
+1,1002,1621,1,35,
+2868,19,310,1,35,
+2869,5,84,1,1011,
+1130,1,1012,2870,16,
+0,308,1,1013,1286,
 1,262,1147,1,1267,
-2756,16,0,242,1,
-515,2757,16,0,242,
-1,1521,2758,16,0,
-242,1,2692,2759,16,
-0,242,1,525,1244,
+2871,16,0,308,1,
+515,2872,16,0,308,
+1,1521,2873,16,0,
+308,1,2692,2874,16,
+0,308,1,525,1244,
 1,283,1200,1,2299,
-2760,16,0,242,1,
-42,2761,16,0,242,
+2875,16,0,308,1,
+42,2876,16,0,308,
 1,40,1205,1,44,
 1211,1,47,1212,1,
-1303,2762,16,0,242,
-1,1555,2763,16,0,
-242,1,50,1229,1,
+1303,2877,16,0,308,
+1,1555,2878,16,0,
+308,1,50,1229,1,
 48,1218,1,49,1224,
 1,51,1234,1,63,
 1250,1,305,1239,1,
 66,1256,1,67,1261,
 1,68,1266,1,69,
 1271,1,70,1276,1,
-73,2764,16,0,242,
+73,2879,16,0,308,
 1,74,1281,1,328,
 1330,1,1048,1372,1,
-82,2765,16,0,242,
-1,1840,2766,16,0,
-242,1,1591,2767,16,
-0,242,1,1341,2768,
-16,0,242,1,1096,
+82,2880,16,0,308,
+1,1840,2881,16,0,
+308,1,1591,2882,16,
+0,308,1,1341,2883,
+16,0,308,1,1096,
 1340,1,93,1346,1,
-352,1377,1,107,2769,
-16,0,242,1,1114,
+352,1377,1,107,2884,
+16,0,308,1,1114,
 1371,1,118,1383,1,
-1123,2770,16,0,242,
+1123,2885,16,0,308,
 1,371,1393,1,1628,
-2771,16,0,242,1,
-375,1404,1,1882,2772,
-16,0,242,1,377,
+2886,16,0,308,1,
+375,1404,1,1882,2887,
+16,0,308,1,377,
 1409,1,379,1414,1,
-380,1419,1,883,2773,
-16,0,242,1,373,
+380,1419,1,883,2888,
+16,0,308,1,373,
 1437,1,130,1442,1,
-143,2774,16,0,242,
-1,387,2775,16,0,
-242,1,1159,2776,16,
-0,242,1,157,2777,
-16,0,242,1,1413,
-2778,16,0,242,1,
-1665,2779,16,0,242,
-1,412,2780,16,0,
-242,1,1377,2781,16,
-0,242,1,172,1496,
-1,1939,2782,16,0,
-242,1,437,2783,16,
-0,242,1,188,1547,
-1,942,1519,1,1195,
-2784,16,0,242,1,
-1449,2785,16,0,242,
-1,1701,2786,16,0,
-242,1,447,1540,1,
-205,2787,16,0,242,
-1,827,2788,16,0,
-242,1,223,2789,16,
-0,242,1,476,1572,
-1,477,1578,1,1231,
-2790,16,0,242,1,
-479,1588,1,480,1593,
-1,1485,2791,16,0,
-242,1,1737,2792,16,
-0,242,1,242,2793,
-16,0,242,1,478,
-1611,1,1001,1616,1,
-1002,1621,1,33,2794,
-19,341,1,33,2795,
-5,84,1,1011,1130,
-1,1012,2796,16,0,
-339,1,1013,1286,1,
-262,1147,1,1267,2797,
-16,0,339,1,515,
-2798,16,0,339,1,
-1521,2799,16,0,339,
-1,2692,2800,16,0,
-339,1,525,1244,1,
-283,1200,1,2299,2801,
-16,0,339,1,42,
-2802,16,0,339,1,
-40,1205,1,44,1211,
-1,47,1212,1,1303,
-2803,16,0,339,1,
-1555,2804,16,0,339,
-1,50,1229,1,48,
-1218,1,49,1224,1,
-51,1234,1,63,1250,
-1,305,1239,1,66,
-1256,1,67,1261,1,
-68,1266,1,69,1271,
-1,70,1276,1,73,
-2805,16,0,339,1,
-74,1281,1,328,1330,
-1,1048,1372,1,82,
-2806,16,0,339,1,
-1840,2807,16,0,339,
-1,1591,2808,16,0,
-339,1,1341,2809,16,
-0,339,1,1096,1340,
-1,93,1346,1,352,
-1377,1,107,2810,16,
-0,339,1,1114,1371,
-1,118,1383,1,1123,
-2811,16,0,339,1,
-371,1393,1,1628,2812,
-16,0,339,1,375,
-1404,1,1882,2813,16,
-0,339,1,377,1409,
-1,379,1414,1,380,
-1419,1,883,2814,16,
-0,339,1,373,1437,
-1,130,1442,1,143,
-1447,1,387,2815,16,
-0,339,1,1159,2816,
-16,0,339,1,157,
-1470,1,1413,2817,16,
-0,339,1,1665,2818,
-16,0,339,1,412,
-2819,16,0,339,1,
-1377,2820,16,0,339,
-1,172,1496,1,1939,
-2821,16,0,339,1,
-437,2822,16,0,339,
-1,188,1547,1,942,
-1519,1,1195,2823,16,
-0,339,1,1449,2824,
-16,0,339,1,1701,
-2825,16,0,339,1,
-447,1540,1,205,2826,
-16,0,339,1,827,
-2827,16,0,339,1,
-223,2828,16,0,339,
-1,476,1572,1,477,
-1578,1,1231,2829,16,
-0,339,1,479,1588,
-1,480,1593,1,1485,
-2830,16,0,339,1,
-1737,2831,16,0,339,
-1,242,1606,1,478,
-1611,1,1001,1616,1,
-1002,1621,1,34,2832,
-19,327,1,34,2833,
-5,84,1,1011,1130,
-1,1012,2834,16,0,
-325,1,1013,1286,1,
-262,1147,1,1267,2835,
-16,0,325,1,515,
-2836,16,0,325,1,
-1521,2837,16,0,325,
-1,2692,2838,16,0,
-325,1,525,1244,1,
-283,1200,1,2299,2839,
-16,0,325,1,42,
-2840,16,0,325,1,
-40,1205,1,44,1211,
-1,47,1212,1,1303,
-2841,16,0,325,1,
-1555,2842,16,0,325,
-1,50,1229,1,48,
-1218,1,49,1224,1,
-51,1234,1,63,1250,
-1,305,1239,1,66,
-1256,1,67,1261,1,
-68,1266,1,69,1271,
-1,70,1276,1,73,
-2843,16,0,325,1,
-74,1281,1,328,1330,
-1,1048,1372,1,82,
-2844,16,0,325,1,
-1840,2845,16,0,325,
-1,1591,2846,16,0,
-325,1,1341,2847,16,
-0,325,1,1096,1340,
-1,93,1346,1,352,
-1377,1,107,2848,16,
-0,325,1,1114,1371,
-1,118,1383,1,1123,
-2849,16,0,325,1,
-371,1393,1,1628,2850,
-16,0,325,1,375,
-1404,1,1882,2851,16,
-0,325,1,377,1409,
-1,379,1414,1,380,
-1419,1,883,2852,16,
-0,325,1,373,1437,
-1,130,1442,1,143,
-1447,1,387,2853,16,
-0,325,1,1159,2854,
-16,0,325,1,157,
-1470,1,1413,2855,16,
-0,325,1,1665,2856,
-16,0,325,1,412,
-2857,16,0,325,1,
-1377,2858,16,0,325,
-1,172,1496,1,1939,
-2859,16,0,325,1,
-437,2860,16,0,325,
-1,188,1547,1,942,
-1519,1,1195,2861,16,
-0,325,1,1449,2862,
-16,0,325,1,1701,
-2863,16,0,325,1,
-447,1540,1,205,1552,
-1,827,2864,16,0,
-325,1,223,1562,1,
-476,1572,1,477,1578,
-1,1231,2865,16,0,
-325,1,479,1588,1,
-480,1593,1,1485,2866,
-16,0,325,1,1737,
-2867,16,0,325,1,
-242,1606,1,478,1611,
-1,1001,1616,1,1002,
-1621,1,35,2868,19,
-310,1,35,2869,5,
+143,1447,1,387,2889,
+16,0,308,1,1159,
+2890,16,0,308,1,
+157,1470,1,1413,2891,
+16,0,308,1,1665,
+2892,16,0,308,1,
+412,2893,16,0,308,
+1,1377,2894,16,0,
+308,1,172,1496,1,
+1939,2895,16,0,308,
+1,437,2896,16,0,
+308,1,188,1547,1,
+942,1519,1,1195,2897,
+16,0,308,1,1449,
+2898,16,0,308,1,
+1701,2899,16,0,308,
+1,447,1540,1,205,
+1552,1,827,2900,16,
+0,308,1,223,2901,
+16,0,308,1,476,
+1572,1,477,1578,1,
+1231,2902,16,0,308,
+1,479,1588,1,480,
+1593,1,1485,2903,16,
+0,308,1,1737,2904,
+16,0,308,1,242,
+1606,1,478,1611,1,
+1001,1616,1,1002,1621,
+1,36,2905,19,217,
+1,36,2906,5,94,
+1,256,2907,16,0,
+215,1,1261,2908,16,
+0,215,1,509,2909,
+16,0,215,1,1515,
+2910,16,0,215,1,
+2686,2911,16,0,215,
+1,2021,747,1,1775,
+2912,16,0,215,1,
+2029,754,1,2030,760,
+1,2031,765,1,2032,
+770,1,2033,775,1,
+277,2913,16,0,215,
+1,2035,781,1,2037,
+786,1,2039,791,1,
+32,2914,16,0,215,
+1,2041,797,1,2293,
+2915,16,0,215,1,
+2043,803,1,2045,808,
+1,41,2916,16,0,
+215,1,1297,2917,16,
+0,215,1,43,2918,
+16,0,215,1,1803,
+816,1,1804,2919,16,
+0,215,1,299,2920,
+16,0,215,1,52,
+2921,16,0,215,1,
+2318,2922,16,0,215,
+1,2075,2923,16,0,
+215,1,1574,828,1,
+71,2924,16,0,215,
+1,76,2925,16,0,
+215,1,1834,2926,16,
+0,215,1,2337,2927,
+16,0,215,1,79,
+2928,16,0,215,1,
+1335,2929,16,0,215,
+1,322,2930,16,0,
+215,1,85,2931,16,
+0,215,1,89,2932,
+16,0,215,1,346,
+2933,16,0,215,1,
+2105,843,1,2106,2934,
+16,0,215,1,97,
+2935,16,0,215,1,
+1860,850,1,2364,856,
+1,102,2936,16,0,
+215,1,112,2937,16,
+0,215,1,1117,2938,
+16,0,215,1,1873,
+864,1,1876,2939,16,
+0,215,1,124,2940,
+16,0,215,1,2136,
+871,1,381,2941,16,
+0,215,1,525,2942,
+16,0,215,1,137,
+2943,16,0,215,1,
+1901,2944,16,0,215,
+1,1153,2945,16,0,
+215,1,151,2946,16,
+0,215,1,1407,2947,
+16,0,215,1,1659,
+2948,16,0,215,1,
+2413,2949,16,0,215,
+1,406,2950,16,0,
+215,1,1371,2951,16,
+0,215,1,166,2952,
+16,0,215,1,1622,
+2953,16,0,215,1,
+1931,889,1,1933,2954,
+16,0,215,1,431,
+2955,16,0,215,1,
+1585,2956,16,0,215,
+1,182,2957,16,0,
+215,1,1189,2958,16,
+0,215,1,1443,2959,
+16,0,215,1,1695,
+2960,16,0,215,1,
+2198,2961,16,0,215,
+1,447,2962,16,0,
+215,1,2458,904,1,
+2459,910,1,1958,2963,
+16,0,215,1,2462,
+917,1,1657,922,1,
+2464,927,1,199,2964,
+16,0,215,1,459,
+2965,16,0,215,1,
+462,2966,16,0,215,
+1,217,2967,16,0,
+215,1,2227,936,1,
+1225,2968,16,0,215,
+1,1479,2969,16,0,
+215,1,1731,2970,16,
+0,215,1,1989,944,
+1,1990,2971,16,0,
+215,1,236,2972,16,
+0,215,1,1756,2973,
+16,0,215,1,37,
+2974,19,234,1,37,
+2975,5,94,1,256,
+2976,16,0,232,1,
+1261,2977,16,0,232,
+1,509,2978,16,0,
+232,1,1515,2979,16,
+0,232,1,2686,2980,
+16,0,232,1,2021,
+747,1,1775,2981,16,
+0,232,1,2029,754,
+1,2030,760,1,2031,
+765,1,2032,770,1,
+2033,775,1,277,2982,
+16,0,232,1,2035,
+781,1,2037,786,1,
+2039,791,1,32,2983,
+16,0,232,1,2041,
+797,1,2293,2984,16,
+0,232,1,2043,803,
+1,2045,808,1,41,
+2985,16,0,232,1,
+1297,2986,16,0,232,
+1,43,2987,16,0,
+232,1,1803,816,1,
+1804,2988,16,0,232,
+1,299,2989,16,0,
+232,1,52,2990,16,
+0,232,1,2318,2991,
+16,0,232,1,2075,
+2992,16,0,232,1,
+1574,828,1,71,2993,
+16,0,232,1,76,
+2994,16,0,232,1,
+1834,2995,16,0,232,
+1,2337,2996,16,0,
+232,1,79,2997,16,
+0,232,1,1335,2998,
+16,0,232,1,322,
+2999,16,0,232,1,
+85,3000,16,0,232,
+1,89,3001,16,0,
+232,1,346,3002,16,
+0,232,1,2105,843,
+1,2106,3003,16,0,
+232,1,97,3004,16,
+0,232,1,1860,850,
+1,2364,856,1,102,
+3005,16,0,232,1,
+112,3006,16,0,232,
+1,1117,3007,16,0,
+232,1,1873,864,1,
+1876,3008,16,0,232,
+1,124,3009,16,0,
+232,1,2136,871,1,
+381,3010,16,0,232,
+1,525,3011,16,0,
+232,1,137,3012,16,
+0,232,1,1901,3013,
+16,0,232,1,1153,
+3014,16,0,232,1,
+151,3015,16,0,232,
+1,1407,3016,16,0,
+232,1,1659,3017,16,
+0,232,1,2413,3018,
+16,0,232,1,406,
+3019,16,0,232,1,
+1371,3020,16,0,232,
+1,166,3021,16,0,
+232,1,1622,3022,16,
+0,232,1,1931,889,
+1,1933,3023,16,0,
+232,1,431,3024,16,
+0,232,1,1585,3025,
+16,0,232,1,182,
+3026,16,0,232,1,
+1189,3027,16,0,232,
+1,1443,3028,16,0,
+232,1,1695,3029,16,
+0,232,1,2198,3030,
+16,0,232,1,447,
+3031,16,0,232,1,
+2458,904,1,2459,910,
+1,1958,3032,16,0,
+232,1,2462,917,1,
+1657,922,1,2464,927,
+1,199,3033,16,0,
+232,1,459,3034,16,
+0,232,1,462,3035,
+16,0,232,1,217,
+3036,16,0,232,1,
+2227,936,1,1225,3037,
+16,0,232,1,1479,
+3038,16,0,232,1,
+1731,3039,16,0,232,
+1,1989,944,1,1990,
+3040,16,0,232,1,
+236,3041,16,0,232,
+1,1756,3042,16,0,
+232,1,38,3043,19,
+231,1,38,3044,5,
 84,1,1011,1130,1,
-1012,2870,16,0,308,
+1012,3045,16,0,229,
 1,1013,1286,1,262,
-1147,1,1267,2871,16,
-0,308,1,515,2872,
-16,0,308,1,1521,
-2873,16,0,308,1,
-2692,2874,16,0,308,
+1147,1,1267,3046,16,
+0,229,1,515,3047,
+16,0,229,1,1521,
+3048,16,0,229,1,
+2692,3049,16,0,229,
 1,525,1244,1,283,
-1200,1,2299,2875,16,
-0,308,1,42,2876,
-16,0,308,1,40,
+1200,1,2299,3050,16,
+0,229,1,42,3051,
+16,0,229,1,40,
 1205,1,44,1211,1,
-47,1212,1,1303,2877,
-16,0,308,1,1555,
-2878,16,0,308,1,
+47,1212,1,1303,3052,
+16,0,229,1,1555,
+3053,16,0,229,1,
 50,1229,1,48,1218,
 1,49,1224,1,51,
 1234,1,63,1250,1,
 305,1239,1,66,1256,
 1,67,1261,1,68,
 1266,1,69,1271,1,
-70,1276,1,73,2879,
-16,0,308,1,74,
+70,1276,1,73,3054,
+16,0,229,1,74,
 1281,1,328,1330,1,
-1048,1372,1,82,2880,
-16,0,308,1,1840,
-2881,16,0,308,1,
-1591,2882,16,0,308,
-1,1341,2883,16,0,
-308,1,1096,1340,1,
+1048,1372,1,82,3055,
+16,0,229,1,1840,
+3056,16,0,229,1,
+1591,3057,16,0,229,
+1,1341,3058,16,0,
+229,1,1096,1340,1,
 93,1346,1,352,1377,
-1,107,2884,16,0,
-308,1,1114,1371,1,
-118,1383,1,1123,2885,
-16,0,308,1,371,
-1393,1,1628,2886,16,
-0,308,1,375,1404,
-1,1882,2887,16,0,
-308,1,377,1409,1,
+1,107,3059,16,0,
+229,1,1114,1371,1,
+118,1383,1,1123,3060,
+16,0,229,1,371,
+1393,1,1628,3061,16,
+0,229,1,375,1404,
+1,1882,3062,16,0,
+229,1,377,1409,1,
 379,1414,1,380,1419,
-1,883,2888,16,0,
-308,1,373,1437,1,
-130,1442,1,143,1447,
-1,387,2889,16,0,
-308,1,1159,2890,16,
-0,308,1,157,1470,
-1,1413,2891,16,0,
-308,1,1665,2892,16,
-0,308,1,412,2893,
-16,0,308,1,1377,
-2894,16,0,308,1,
-172,1496,1,1939,2895,
-16,0,308,1,437,
-2896,16,0,308,1,
-188,1547,1,942,1519,
-1,1195,2897,16,0,
-308,1,1449,2898,16,
-0,308,1,1701,2899,
-16,0,308,1,447,
-1540,1,205,1552,1,
-827,2900,16,0,308,
-1,223,2901,16,0,
-308,1,476,1572,1,
-477,1578,1,1231,2902,
-16,0,308,1,479,
-1588,1,480,1593,1,
-1485,2903,16,0,308,
-1,1737,2904,16,0,
-308,1,242,1606,1,
-478,1611,1,1001,1616,
-1,1002,1621,1,36,
-2905,19,217,1,36,
-2906,5,94,1,256,
-2907,16,0,215,1,
-1261,2908,16,0,215,
-1,509,2909,16,0,
-215,1,1515,2910,16,
-0,215,1,2686,2911,
-16,0,215,1,2021,
-747,1,1775,2912,16,
-0,215,1,2029,754,
-1,2030,760,1,2031,
-765,1,2032,770,1,
-2033,775,1,277,2913,
-16,0,215,1,2035,
-781,1,2037,786,1,
-2039,791,1,32,2914,
-16,0,215,1,2041,
-797,1,2293,2915,16,
-0,215,1,2043,803,
-1,2045,808,1,41,
-2916,16,0,215,1,
-1297,2917,16,0,215,
-1,43,2918,16,0,
-215,1,1803,816,1,
-1804,2919,16,0,215,
-1,299,2920,16,0,
-215,1,52,2921,16,
-0,215,1,2318,2922,
-16,0,215,1,2075,
-2923,16,0,215,1,
-1574,828,1,71,2924,
-16,0,215,1,76,
-2925,16,0,215,1,
-1834,2926,16,0,215,
-1,2337,2927,16,0,
-215,1,79,2928,16,
-0,215,1,1335,2929,
-16,0,215,1,322,
-2930,16,0,215,1,
-85,2931,16,0,215,
-1,89,2932,16,0,
-215,1,346,2933,16,
-0,215,1,2105,843,
-1,2106,2934,16,0,
-215,1,97,2935,16,
-0,215,1,1860,850,
-1,2364,856,1,102,
-2936,16,0,215,1,
-112,2937,16,0,215,
-1,1117,2938,16,0,
-215,1,1873,864,1,
-1876,2939,16,0,215,
-1,124,2940,16,0,
-215,1,2136,871,1,
-381,2941,16,0,215,
-1,525,2942,16,0,
-215,1,137,2943,16,
-0,215,1,1901,2944,
-16,0,215,1,1153,
-2945,16,0,215,1,
-151,2946,16,0,215,
-1,1407,2947,16,0,
-215,1,1659,2948,16,
-0,215,1,2413,2949,
-16,0,215,1,406,
-2950,16,0,215,1,
-1371,2951,16,0,215,
-1,166,2952,16,0,
-215,1,1622,2953,16,
-0,215,1,1931,889,
-1,1933,2954,16,0,
-215,1,431,2955,16,
-0,215,1,1585,2956,
-16,0,215,1,182,
-2957,16,0,215,1,
-1189,2958,16,0,215,
-1,1443,2959,16,0,
-215,1,1695,2960,16,
-0,215,1,2198,2961,
-16,0,215,1,447,
-2962,16,0,215,1,
-2458,904,1,2459,910,
-1,1958,2963,16,0,
-215,1,2462,917,1,
-1657,922,1,2464,927,
-1,199,2964,16,0,
-215,1,459,2965,16,
-0,215,1,462,2966,
-16,0,215,1,217,
-2967,16,0,215,1,
-2227,936,1,1225,2968,
-16,0,215,1,1479,
-2969,16,0,215,1,
-1731,2970,16,0,215,
-1,1989,944,1,1990,
-2971,16,0,215,1,
-236,2972,16,0,215,
-1,1756,2973,16,0,
-215,1,37,2974,19,
-234,1,37,2975,5,
-94,1,256,2976,16,
-0,232,1,1261,2977,
-16,0,232,1,509,
-2978,16,0,232,1,
-1515,2979,16,0,232,
-1,2686,2980,16,0,
-232,1,2021,747,1,
-1775,2981,16,0,232,
-1,2029,754,1,2030,
-760,1,2031,765,1,
-2032,770,1,2033,775,
-1,277,2982,16,0,
-232,1,2035,781,1,
-2037,786,1,2039,791,
-1,32,2983,16,0,
-232,1,2041,797,1,
-2293,2984,16,0,232,
-1,2043,803,1,2045,
-808,1,41,2985,16,
-0,232,1,1297,2986,
-16,0,232,1,43,
-2987,16,0,232,1,
-1803,816,1,1804,2988,
-16,0,232,1,299,
-2989,16,0,232,1,
-52,2990,16,0,232,
-1,2318,2991,16,0,
-232,1,2075,2992,16,
-0,232,1,1574,828,
-1,71,2993,16,0,
-232,1,76,2994,16,
-0,232,1,1834,2995,
-16,0,232,1,2337,
-2996,16,0,232,1,
-79,2997,16,0,232,
-1,1335,2998,16,0,
-232,1,322,2999,16,
-0,232,1,85,3000,
-16,0,232,1,89,
-3001,16,0,232,1,
-346,3002,16,0,232,
-1,2105,843,1,2106,
-3003,16,0,232,1,
-97,3004,16,0,232,
-1,1860,850,1,2364,
-856,1,102,3005,16,
-0,232,1,112,3006,
-16,0,232,1,1117,
-3007,16,0,232,1,
-1873,864,1,1876,3008,
-16,0,232,1,124,
-3009,16,0,232,1,
-2136,871,1,381,3010,
-16,0,232,1,525,
-3011,16,0,232,1,
-137,3012,16,0,232,
-1,1901,3013,16,0,
-232,1,1153,3014,16,
-0,232,1,151,3015,
-16,0,232,1,1407,
-3016,16,0,232,1,
-1659,3017,16,0,232,
-1,2413,3018,16,0,
-232,1,406,3019,16,
-0,232,1,1371,3020,
-16,0,232,1,166,
-3021,16,0,232,1,
-1622,3022,16,0,232,
-1,1931,889,1,1933,
-3023,16,0,232,1,
-431,3024,16,0,232,
-1,1585,3025,16,0,
-232,1,182,3026,16,
-0,232,1,1189,3027,
-16,0,232,1,1443,
-3028,16,0,232,1,
-1695,3029,16,0,232,
-1,2198,3030,16,0,
-232,1,447,3031,16,
-0,232,1,2458,904,
-1,2459,910,1,1958,
-3032,16,0,232,1,
-2462,917,1,1657,922,
-1,2464,927,1,199,
-3033,16,0,232,1,
-459,3034,16,0,232,
-1,462,3035,16,0,
-232,1,217,3036,16,
-0,232,1,2227,936,
-1,1225,3037,16,0,
-232,1,1479,3038,16,
-0,232,1,1731,3039,
-16,0,232,1,1989,
-944,1,1990,3040,16,
-0,232,1,236,3041,
-16,0,232,1,1756,
-3042,16,0,232,1,
-38,3043,19,231,1,
-38,3044,5,84,1,
-1011,1130,1,1012,3045,
-16,0,229,1,1013,
+1,883,1425,1,373,
+1437,1,130,1442,1,
+143,1447,1,387,3063,
+16,0,229,1,1159,
+3064,16,0,229,1,
+157,1470,1,1413,3065,
+16,0,229,1,1665,
+3066,16,0,229,1,
+412,3067,16,0,229,
+1,1377,3068,16,0,
+229,1,172,1496,1,
+1939,3069,16,0,229,
+1,437,3070,16,0,
+229,1,188,1547,1,
+942,1519,1,1195,3071,
+16,0,229,1,1449,
+3072,16,0,229,1,
+1701,3073,16,0,229,
+1,447,1540,1,205,
+1552,1,827,1359,1,
+223,1562,1,476,1572,
+1,477,1578,1,1231,
+3074,16,0,229,1,
+479,1588,1,480,1593,
+1,1485,3075,16,0,
+229,1,1737,3076,16,
+0,229,1,242,1606,
+1,478,1611,1,1001,
+1616,1,1002,1621,1,
+39,3077,19,223,1,
+39,3078,5,84,1,
+1011,1130,1,1012,3079,
+16,0,221,1,1013,
 1286,1,262,1147,1,
-1267,3046,16,0,229,
-1,515,3047,16,0,
-229,1,1521,3048,16,
-0,229,1,2692,3049,
-16,0,229,1,525,
+1267,3080,16,0,221,
+1,515,3081,16,0,
+221,1,1521,3082,16,
+0,221,1,2692,3083,
+16,0,221,1,525,
 1244,1,283,1200,1,
-2299,3050,16,0,229,
-1,42,3051,16,0,
-229,1,40,1205,1,
+2299,3084,16,0,221,
+1,42,3085,16,0,
+221,1,40,1205,1,
 44,1211,1,47,1212,
-1,1303,3052,16,0,
-229,1,1555,3053,16,
-0,229,1,50,1229,
+1,1303,3086,16,0,
+221,1,1555,3087,16,
+0,221,1,50,1229,
 1,48,1218,1,49,
 1224,1,51,1234,1,
 63,1250,1,305,1239,
 1,66,1256,1,67,
 1261,1,68,1266,1,
 69,1271,1,70,1276,
-1,73,3054,16,0,
-229,1,74,1281,1,
+1,73,3088,16,0,
+221,1,74,1281,1,
 328,1330,1,1048,1372,
-1,82,3055,16,0,
-229,1,1840,3056,16,
-0,229,1,1591,3057,
-16,0,229,1,1341,
-3058,16,0,229,1,
+1,82,3089,16,0,
+221,1,1840,3090,16,
+0,221,1,1591,3091,
+16,0,221,1,1341,
+3092,16,0,221,1,
 1096,1340,1,93,1346,
 1,352,1377,1,107,
-3059,16,0,229,1,
+3093,16,0,221,1,
 1114,1371,1,118,1383,
-1,1123,3060,16,0,
-229,1,371,1393,1,
-1628,3061,16,0,229,
+1,1123,3094,16,0,
+221,1,371,1393,1,
+1628,3095,16,0,221,
 1,375,1404,1,1882,
-3062,16,0,229,1,
+3096,16,0,221,1,
 377,1409,1,379,1414,
 1,380,1419,1,883,
 1425,1,373,1437,1,
 130,1442,1,143,1447,
-1,387,3063,16,0,
-229,1,1159,3064,16,
-0,229,1,157,1470,
-1,1413,3065,16,0,
-229,1,1665,3066,16,
-0,229,1,412,3067,
-16,0,229,1,1377,
-3068,16,0,229,1,
-172,1496,1,1939,3069,
-16,0,229,1,437,
-3070,16,0,229,1,
+1,387,3097,16,0,
+221,1,1159,3098,16,
+0,221,1,157,1470,
+1,1413,3099,16,0,
+221,1,1665,3100,16,
+0,221,1,412,3101,
+16,0,221,1,1377,
+3102,16,0,221,1,
+172,1496,1,1939,3103,
+16,0,221,1,437,
+3104,16,0,221,1,
 188,1547,1,942,1519,
-1,1195,3071,16,0,
-229,1,1449,3072,16,
-0,229,1,1701,3073,
-16,0,229,1,447,
+1,1195,3105,16,0,
+221,1,1449,3106,16,
+0,221,1,1701,3107,
+16,0,221,1,447,
 1540,1,205,1552,1,
 827,1359,1,223,1562,
 1,476,1572,1,477,
-1578,1,1231,3074,16,
-0,229,1,479,1588,
+1578,1,1231,3108,16,
+0,221,1,479,1588,
 1,480,1593,1,1485,
-3075,16,0,229,1,
-1737,3076,16,0,229,
+3109,16,0,221,1,
+1737,3110,16,0,221,
 1,242,1606,1,478,
 1611,1,1001,1616,1,
-1002,1621,1,39,3077,
-19,223,1,39,3078,
+1002,1621,1,40,3111,
+19,211,1,40,3112,
 5,84,1,1011,1130,
-1,1012,3079,16,0,
-221,1,1013,1286,1,
-262,1147,1,1267,3080,
-16,0,221,1,515,
-3081,16,0,221,1,
-1521,3082,16,0,221,
-1,2692,3083,16,0,
-221,1,525,1244,1,
-283,1200,1,2299,3084,
-16,0,221,1,42,
-3085,16,0,221,1,
+1,1012,3113,16,0,
+209,1,1013,1286,1,
+262,1147,1,1267,3114,
+16,0,209,1,515,
+3115,16,0,209,1,
+1521,3116,16,0,209,
+1,2692,3117,16,0,
+209,1,525,1244,1,
+283,1200,1,2299,3118,
+16,0,209,1,42,
+3119,16,0,209,1,
 40,1205,1,44,1211,
 1,47,1212,1,1303,
-3086,16,0,221,1,
-1555,3087,16,0,221,
+3120,16,0,209,1,
+1555,3121,16,0,209,
 1,50,1229,1,48,
 1218,1,49,1224,1,
 51,1234,1,63,1250,
@@ -8407,229 +8481,207 @@ public yyLSLSyntax
 1256,1,67,1261,1,
 68,1266,1,69,1271,
 1,70,1276,1,73,
-3088,16,0,221,1,
+3122,16,0,209,1,
 74,1281,1,328,1330,
 1,1048,1372,1,82,
-3089,16,0,221,1,
-1840,3090,16,0,221,
-1,1591,3091,16,0,
-221,1,1341,3092,16,
-0,221,1,1096,1340,
+3123,16,0,209,1,
+1840,3124,16,0,209,
+1,1591,3125,16,0,
+209,1,1341,3126,16,
+0,209,1,1096,1340,
 1,93,1346,1,352,
-1377,1,107,3093,16,
-0,221,1,1114,1371,
-1,118,1383,1,1123,
-3094,16,0,221,1,
-371,1393,1,1628,3095,
-16,0,221,1,375,
-1404,1,1882,3096,16,
-0,221,1,377,1409,
-1,379,1414,1,380,
-1419,1,883,1425,1,
-373,1437,1,130,1442,
-1,143,1447,1,387,
-3097,16,0,221,1,
-1159,3098,16,0,221,
-1,157,1470,1,1413,
-3099,16,0,221,1,
-1665,3100,16,0,221,
-1,412,3101,16,0,
-221,1,1377,3102,16,
-0,221,1,172,1496,
-1,1939,3103,16,0,
-221,1,437,3104,16,
-0,221,1,188,1547,
-1,942,1519,1,1195,
-3105,16,0,221,1,
-1449,3106,16,0,221,
-1,1701,3107,16,0,
-221,1,447,1540,1,
-205,1552,1,827,1359,
-1,223,1562,1,476,
+1377,1,107,3127,16,
+0,209,1,1114,1371,
+1,118,3128,16,0,
+209,1,1123,3129,16,
+0,209,1,371,1393,
+1,1628,3130,16,0,
+209,1,375,1404,1,
+1882,3131,16,0,209,
+1,377,1409,1,379,
+1414,1,380,1419,1,
+883,3132,16,0,209,
+1,373,1437,1,130,
+3133,16,0,209,1,
+143,3134,16,0,209,
+1,387,3135,16,0,
+209,1,1159,3136,16,
+0,209,1,157,3137,
+16,0,209,1,1413,
+3138,16,0,209,1,
+1665,3139,16,0,209,
+1,412,3140,16,0,
+209,1,1377,3141,16,
+0,209,1,172,3142,
+16,0,209,1,1939,
+3143,16,0,209,1,
+437,3144,16,0,209,
+1,188,3145,16,0,
+209,1,942,1519,1,
+1195,3146,16,0,209,
+1,1449,3147,16,0,
+209,1,1701,3148,16,
+0,209,1,447,1540,
+1,205,3149,16,0,
+209,1,827,3150,16,
+0,209,1,223,3151,
+16,0,209,1,476,
 1572,1,477,1578,1,
-1231,3108,16,0,221,
+1231,3152,16,0,209,
 1,479,1588,1,480,
-1593,1,1485,3109,16,
-0,221,1,1737,3110,
-16,0,221,1,242,
-1606,1,478,1611,1,
-1001,1616,1,1002,1621,
-1,40,3111,19,211,
-1,40,3112,5,84,
-1,1011,1130,1,1012,
-3113,16,0,209,1,
-1013,1286,1,262,1147,
-1,1267,3114,16,0,
-209,1,515,3115,16,
-0,209,1,1521,3116,
-16,0,209,1,2692,
-3117,16,0,209,1,
-525,1244,1,283,1200,
-1,2299,3118,16,0,
-209,1,42,3119,16,
-0,209,1,40,1205,
-1,44,1211,1,47,
-1212,1,1303,3120,16,
-0,209,1,1555,3121,
-16,0,209,1,50,
-1229,1,48,1218,1,
-49,1224,1,51,1234,
-1,63,1250,1,305,
-1239,1,66,1256,1,
-67,1261,1,68,1266,
-1,69,1271,1,70,
-1276,1,73,3122,16,
-0,209,1,74,1281,
-1,328,1330,1,1048,
-1372,1,82,3123,16,
-0,209,1,1840,3124,
-16,0,209,1,1591,
-3125,16,0,209,1,
-1341,3126,16,0,209,
-1,1096,1340,1,93,
-1346,1,352,1377,1,
-107,3127,16,0,209,
-1,1114,1371,1,118,
-3128,16,0,209,1,
-1123,3129,16,0,209,
-1,371,1393,1,1628,
-3130,16,0,209,1,
-375,1404,1,1882,3131,
-16,0,209,1,377,
-1409,1,379,1414,1,
-380,1419,1,883,3132,
-16,0,209,1,373,
-1437,1,130,3133,16,
-0,209,1,143,3134,
-16,0,209,1,387,
-3135,16,0,209,1,
-1159,3136,16,0,209,
-1,157,3137,16,0,
-209,1,1413,3138,16,
-0,209,1,1665,3139,
-16,0,209,1,412,
-3140,16,0,209,1,
-1377,3141,16,0,209,
-1,172,3142,16,0,
-209,1,1939,3143,16,
-0,209,1,437,3144,
-16,0,209,1,188,
-3145,16,0,209,1,
-942,1519,1,1195,3146,
-16,0,209,1,1449,
-3147,16,0,209,1,
-1701,3148,16,0,209,
-1,447,1540,1,205,
-3149,16,0,209,1,
-827,3150,16,0,209,
-1,223,3151,16,0,
-209,1,476,1572,1,
-477,1578,1,1231,3152,
-16,0,209,1,479,
-1588,1,480,1593,1,
-1485,3153,16,0,209,
-1,1737,3154,16,0,
-209,1,242,3155,16,
-0,209,1,478,1611,
-1,1001,1616,1,1002,
-1621,1,41,3156,19,
-172,1,41,3157,5,
-84,1,1011,1130,1,
-1012,3158,16,0,170,
-1,1013,1286,1,262,
-1147,1,1267,3159,16,
-0,170,1,515,3160,
-16,0,170,1,1521,
-3161,16,0,170,1,
-2692,3162,16,0,170,
-1,525,1244,1,283,
-1200,1,2299,3163,16,
-0,170,1,42,3164,
-16,0,170,1,40,
-1205,1,44,1211,1,
-47,1212,1,1303,3165,
-16,0,170,1,1555,
-3166,16,0,170,1,
-50,1229,1,48,1218,
-1,49,1224,1,51,
-1234,1,63,1250,1,
-305,1239,1,66,1256,
-1,67,1261,1,68,
-1266,1,69,1271,1,
-70,1276,1,73,3167,
-16,0,170,1,74,
-1281,1,328,1330,1,
-1048,1372,1,82,3168,
-16,0,170,1,1840,
-3169,16,0,170,1,
-1591,3170,16,0,170,
-1,1341,3171,16,0,
-170,1,1096,1340,1,
-93,1346,1,352,1377,
-1,107,3172,16,0,
-170,1,1114,1371,1,
-118,3173,16,0,170,
-1,1123,3174,16,0,
-170,1,371,1393,1,
-1628,3175,16,0,170,
-1,375,1404,1,1882,
-3176,16,0,170,1,
-377,1409,1,379,1414,
-1,380,1419,1,883,
-3177,16,0,170,1,
-373,1437,1,130,3178,
-16,0,170,1,143,
-3179,16,0,170,1,
-387,3180,16,0,170,
-1,1159,3181,16,0,
-170,1,157,3182,16,
-0,170,1,1413,3183,
-16,0,170,1,1665,
-3184,16,0,170,1,
-412,3185,16,0,170,
-1,1377,3186,16,0,
-170,1,172,3187,16,
-0,170,1,1939,3188,
-16,0,170,1,437,
-3189,16,0,170,1,
-188,3190,16,0,170,
-1,942,1519,1,1195,
-3191,16,0,170,1,
-1449,3192,16,0,170,
-1,1701,3193,16,0,
-170,1,447,1540,1,
-205,3194,16,0,170,
-1,827,3195,16,0,
-170,1,223,3196,16,
-0,170,1,476,1572,
-1,477,1578,1,1231,
-3197,16,0,170,1,
-479,1588,1,480,1593,
-1,1485,3198,16,0,
-170,1,1737,3199,16,
-0,170,1,242,3200,
-16,0,170,1,478,
-1611,1,1001,1616,1,
-1002,1621,1,42,3201,
-19,403,1,42,3202,
-5,38,1,1901,3203,
-16,0,401,1,2075,
-3204,16,0,401,1,
+1593,1,1485,3153,16,
+0,209,1,1737,3154,
+16,0,209,1,242,
+3155,16,0,209,1,
+478,1611,1,1001,1616,
+1,1002,1621,1,41,
+3156,19,172,1,41,
+3157,5,84,1,1011,
+1130,1,1012,3158,16,
+0,170,1,1013,1286,
+1,262,1147,1,1267,
+3159,16,0,170,1,
+515,3160,16,0,170,
+1,1521,3161,16,0,
+170,1,2692,3162,16,
+0,170,1,525,1244,
+1,283,1200,1,2299,
+3163,16,0,170,1,
+42,3164,16,0,170,
+1,40,1205,1,44,
+1211,1,47,1212,1,
+1303,3165,16,0,170,
+1,1555,3166,16,0,
+170,1,50,1229,1,
+48,1218,1,49,1224,
+1,51,1234,1,63,
+1250,1,305,1239,1,
+66,1256,1,67,1261,
+1,68,1266,1,69,
+1271,1,70,1276,1,
+73,3167,16,0,170,
+1,74,1281,1,328,
+1330,1,1048,1372,1,
+82,3168,16,0,170,
+1,1840,3169,16,0,
+170,1,1591,3170,16,
+0,170,1,1341,3171,
+16,0,170,1,1096,
+1340,1,93,1346,1,
+352,1377,1,107,3172,
+16,0,170,1,1114,
+1371,1,118,3173,16,
+0,170,1,1123,3174,
+16,0,170,1,371,
+1393,1,1628,3175,16,
+0,170,1,375,1404,
+1,1882,3176,16,0,
+170,1,377,1409,1,
+379,1414,1,380,1419,
+1,883,3177,16,0,
+170,1,373,1437,1,
+130,3178,16,0,170,
+1,143,3179,16,0,
+170,1,387,3180,16,
+0,170,1,1159,3181,
+16,0,170,1,157,
+3182,16,0,170,1,
+1413,3183,16,0,170,
+1,1665,3184,16,0,
+170,1,412,3185,16,
+0,170,1,1377,3186,
+16,0,170,1,172,
+3187,16,0,170,1,
+1939,3188,16,0,170,
+1,437,3189,16,0,
+170,1,188,3190,16,
+0,170,1,942,1519,
+1,1195,3191,16,0,
+170,1,1449,3192,16,
+0,170,1,1701,3193,
+16,0,170,1,447,
+1540,1,205,3194,16,
+0,170,1,827,3195,
+16,0,170,1,223,
+3196,16,0,170,1,
+476,1572,1,477,1578,
+1,1231,3197,16,0,
+170,1,479,1588,1,
+480,1593,1,1485,3198,
+16,0,170,1,1737,
+3199,16,0,170,1,
+242,3200,16,0,170,
+1,478,1611,1,1001,
+1616,1,1002,1621,1,
+42,3201,19,403,1,
+42,3202,5,38,1,
+1901,3203,16,0,401,
+1,2075,3204,16,0,
+401,1,1860,850,1,
+1803,816,1,1804,3205,
+16,0,401,1,2413,
+3206,16,0,401,1,
+2198,3207,16,0,401,
+1,1873,864,1,1657,
+922,1,1989,944,1,
+1990,3208,16,0,401,
+1,1775,3209,16,0,
+401,1,32,3210,16,
+0,401,1,2105,843,
+1,2106,3211,16,0,
+401,1,2364,856,1,
+2227,936,1,2337,3212,
+16,0,401,1,2021,
+747,1,2458,904,1,
+2459,910,1,2462,917,
+1,2136,871,1,2464,
+927,1,2029,754,1,
+2030,760,1,2031,765,
+1,2032,770,1,2033,
+775,1,2035,781,1,
+2037,786,1,2039,791,
+1,1931,889,1,2041,
+797,1,2043,803,1,
+2045,808,1,1574,828,
+1,1958,3213,16,0,
+401,1,43,3214,19,
+478,1,43,3215,5,
+25,1,2035,781,1,
+2037,786,1,2039,791,
+1,2041,797,1,2227,
+936,1,2043,803,1,
+1657,922,1,1860,850,
+1,2136,871,1,2021,
+747,1,2459,910,1,
+1574,828,1,2105,3216,
+16,0,602,1,1931,
+889,1,1873,864,1,
+2031,765,1,1803,816,
+1,1989,3217,16,0,
+476,1,2464,927,1,
+2029,754,1,2030,760,
+1,2364,856,1,2032,
+770,1,2033,775,1,
+2045,808,1,44,3218,
+19,264,1,44,3219,
+5,38,1,1901,3220,
+16,0,262,1,2075,
+3221,16,0,262,1,
 1860,850,1,1803,816,
-1,1804,3205,16,0,
-401,1,2413,3206,16,
-0,401,1,2198,3207,
-16,0,401,1,1873,
+1,1804,3222,16,0,
+262,1,2413,3223,16,
+0,262,1,2198,3224,
+16,0,262,1,1873,
 864,1,1657,922,1,
-1989,944,1,1990,3208,
-16,0,401,1,1775,
-3209,16,0,401,1,
-32,3210,16,0,401,
+1989,944,1,1990,3225,
+16,0,262,1,1775,
+3226,16,0,262,1,
+32,3227,16,0,262,
 1,2105,843,1,2106,
-3211,16,0,401,1,
+3228,16,0,262,1,
 2364,856,1,2227,936,
-1,2337,3212,16,0,
-401,1,2021,747,1,
+1,2337,3229,16,0,
+262,1,2021,747,1,
 2458,904,1,2459,910,
 1,2462,917,1,2136,
 871,1,2464,927,1,
@@ -8641,76 +8693,59 @@ public yyLSLSyntax
 889,1,2041,797,1,
 2043,803,1,2045,808,
 1,1574,828,1,1958,
-3213,16,0,401,1,
-43,3214,19,478,1,
-43,3215,5,25,1,
-2035,781,1,2037,786,
-1,2039,791,1,2041,
-797,1,2227,936,1,
-2043,803,1,1657,922,
-1,1860,850,1,2136,
-871,1,2021,747,1,
-2459,910,1,1574,828,
-1,2105,3216,16,0,
-602,1,1931,889,1,
-1873,864,1,2031,765,
-1,1803,816,1,1989,
-3217,16,0,476,1,
-2464,927,1,2029,754,
-1,2030,760,1,2364,
-856,1,2032,770,1,
-2033,775,1,2045,808,
-1,44,3218,19,264,
-1,44,3219,5,38,
-1,1901,3220,16,0,
-262,1,2075,3221,16,
-0,262,1,1860,850,
-1,1803,816,1,1804,
-3222,16,0,262,1,
-2413,3223,16,0,262,
-1,2198,3224,16,0,
-262,1,1873,864,1,
-1657,922,1,1989,944,
-1,1990,3225,16,0,
-262,1,1775,3226,16,
-0,262,1,32,3227,
-16,0,262,1,2105,
-843,1,2106,3228,16,
-0,262,1,2364,856,
-1,2227,936,1,2337,
-3229,16,0,262,1,
-2021,747,1,2458,904,
-1,2459,910,1,2462,
-917,1,2136,871,1,
-2464,927,1,2029,754,
-1,2030,760,1,2031,
-765,1,2032,770,1,
-2033,775,1,2035,781,
-1,2037,786,1,2039,
-791,1,1931,889,1,
-2041,797,1,2043,803,
-1,2045,808,1,1574,
-828,1,1958,3230,16,
-0,262,1,45,3231,
-19,287,1,45,3232,
-5,39,1,1901,3233,
-16,0,314,1,2075,
-3234,16,0,314,1,
+3230,16,0,262,1,
+45,3231,19,287,1,
+45,3232,5,39,1,
+1901,3233,16,0,314,
+1,2075,3234,16,0,
+314,1,1860,850,1,
+1803,816,1,1804,3235,
+16,0,314,1,2413,
+3236,16,0,314,1,
+2198,3237,16,0,314,
+1,1873,864,1,1657,
+922,1,1989,944,1,
+1990,3238,16,0,314,
+1,1775,3239,16,0,
+314,1,32,3240,16,
+0,314,1,2105,843,
+1,2106,3241,16,0,
+314,1,2364,856,1,
+2227,936,1,2337,3242,
+16,0,314,1,2021,
+747,1,2458,904,1,
+2459,910,1,2462,917,
+1,2136,871,1,2464,
+927,1,2029,754,1,
+2030,760,1,2031,765,
+1,2032,770,1,2033,
+775,1,2035,781,1,
+2037,786,1,2039,791,
+1,1931,889,1,2041,
+797,1,2043,803,1,
+2045,808,1,1832,3243,
+16,0,285,1,1574,
+828,1,1958,3244,16,
+0,314,1,46,3245,
+19,698,1,46,3246,
+5,38,1,1901,3247,
+16,0,696,1,2075,
+3248,16,0,696,1,
 1860,850,1,1803,816,
-1,1804,3235,16,0,
-314,1,2413,3236,16,
-0,314,1,2198,3237,
-16,0,314,1,1873,
+1,1804,3249,16,0,
+696,1,2413,3250,16,
+0,696,1,2198,3251,
+16,0,696,1,1873,
 864,1,1657,922,1,
-1989,944,1,1990,3238,
-16,0,314,1,1775,
-3239,16,0,314,1,
-32,3240,16,0,314,
+1989,944,1,1990,3252,
+16,0,696,1,1775,
+3253,16,0,696,1,
+32,3254,16,0,696,
 1,2105,843,1,2106,
-3241,16,0,314,1,
+3255,16,0,696,1,
 2364,856,1,2227,936,
-1,2337,3242,16,0,
-314,1,2021,747,1,
+1,2337,3256,16,0,
+696,1,2021,747,1,
 2458,904,1,2459,910,
 1,2462,917,1,2136,
 871,1,2464,927,1,
@@ -8721,54 +8756,61 @@ public yyLSLSyntax
 1,2039,791,1,1931,
 889,1,2041,797,1,
 2043,803,1,2045,808,
-1,1832,3243,16,0,
-285,1,1574,828,1,
-1958,3244,16,0,314,
-1,46,3245,19,698,
-1,46,3246,5,38,
-1,1901,3247,16,0,
-696,1,2075,3248,16,
-0,696,1,1860,850,
-1,1803,816,1,1804,
-3249,16,0,696,1,
-2413,3250,16,0,696,
-1,2198,3251,16,0,
-696,1,1873,864,1,
-1657,922,1,1989,944,
-1,1990,3252,16,0,
-696,1,1775,3253,16,
-0,696,1,32,3254,
-16,0,696,1,2105,
-843,1,2106,3255,16,
-0,696,1,2364,856,
-1,2227,936,1,2337,
-3256,16,0,696,1,
-2021,747,1,2458,904,
-1,2459,910,1,2462,
-917,1,2136,871,1,
-2464,927,1,2029,754,
-1,2030,760,1,2031,
-765,1,2032,770,1,
-2033,775,1,2035,781,
-1,2037,786,1,2039,
-791,1,1931,889,1,
-2041,797,1,2043,803,
-1,2045,808,1,1574,
-828,1,1958,3257,16,
-0,696,1,47,3258,
-19,588,1,47,3259,
-5,19,1,0,3260,
-16,0,678,1,2741,
-3261,17,3262,15,3263,
-4,36,37,0,71,
+1,1574,828,1,1958,
+3257,16,0,696,1,
+47,3258,19,588,1,
+47,3259,5,19,1,
+0,3260,16,0,678,
+1,2741,3261,17,3262,
+15,3263,4,36,37,
+0,71,0,108,0,
+111,0,98,0,97,
+0,108,0,68,0,
+101,0,102,0,105,
+0,110,0,105,0,
+116,0,105,0,111,
+0,110,0,115,0,
+1,-1,1,5,3264,
+20,3265,4,38,71,
 0,108,0,111,0,
 98,0,97,0,108,
 0,68,0,101,0,
 102,0,105,0,110,
 0,105,0,116,0,
 105,0,111,0,110,
-0,115,0,1,-1,
-1,5,3264,20,3265,
+0,115,0,95,0,
+52,0,1,153,1,
+3,1,3,1,2,
+3266,22,1,6,1,
+2742,3267,17,3268,15,
+3263,1,-1,1,5,
+3269,20,3270,4,38,
+71,0,108,0,111,
+0,98,0,97,0,
+108,0,68,0,101,
+0,102,0,105,0,
+110,0,105,0,116,
+0,105,0,111,0,
+110,0,115,0,95,
+0,50,0,1,151,
+1,3,1,3,1,
+2,3271,22,1,4,
+1,2743,3272,17,3273,
+15,3263,1,-1,1,
+5,3274,20,3275,4,
+38,71,0,108,0,
+111,0,98,0,97,
+0,108,0,68,0,
+101,0,102,0,105,
+0,110,0,105,0,
+116,0,105,0,111,
+0,110,0,115,0,
+95,0,51,0,1,
+152,1,3,1,2,
+1,1,3276,22,1,
+5,1,2744,3277,17,
+3278,15,3263,1,-1,
+1,5,3279,20,3280,
 4,38,71,0,108,
 0,111,0,98,0,
 97,0,108,0,68,
@@ -8776,95 +8818,89 @@ public yyLSLSyntax
 105,0,110,0,105,
 0,116,0,105,0,
 111,0,110,0,115,
-0,95,0,52,0,
-1,153,1,3,1,
-3,1,2,3266,22,
-1,6,1,2742,3267,
-17,3268,15,3263,1,
--1,1,5,3269,20,
-3270,4,38,71,0,
+0,95,0,49,0,
+1,150,1,3,1,
+2,1,1,3281,22,
+1,3,1,2660,735,
+1,2711,3282,17,3283,
+15,3284,4,52,37,
+0,71,0,108,0,
+111,0,98,0,97,
+0,108,0,86,0,
+97,0,114,0,105,
+0,97,0,98,0,
+108,0,101,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,1,-1,1,5,
+3285,20,3286,4,54,
+71,0,108,0,111,
+0,98,0,97,0,
+108,0,86,0,97,
+0,114,0,105,0,
+97,0,98,0,108,
+0,101,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+95,0,50,0,1,
+155,1,3,1,5,
+1,4,3287,22,1,
+8,1,2664,3288,16,
+0,678,1,2723,3289,
+16,0,678,1,2022,
+3290,16,0,586,1,
+2459,910,1,2683,3291,
+17,3292,15,3293,4,
+50,37,0,71,0,
 108,0,111,0,98,
 0,97,0,108,0,
-68,0,101,0,102,
-0,105,0,110,0,
-105,0,116,0,105,
-0,111,0,110,0,
-115,0,95,0,50,
-0,1,151,1,3,
-1,3,1,2,3271,
-22,1,4,1,2743,
-3272,17,3273,15,3263,
-1,-1,1,5,3274,
-20,3275,4,38,71,
-0,108,0,111,0,
-98,0,97,0,108,
+70,0,117,0,110,
+0,99,0,116,0,
+105,0,111,0,110,
 0,68,0,101,0,
 102,0,105,0,110,
 0,105,0,116,0,
 105,0,111,0,110,
-0,115,0,95,0,
-51,0,1,152,1,
-3,1,2,1,1,
-3276,22,1,5,1,
-2744,3277,17,3278,15,
-3263,1,-1,1,5,
-3279,20,3280,4,38,
+0,1,-1,1,5,
+3294,20,3295,4,52,
 71,0,108,0,111,
 0,98,0,97,0,
-108,0,68,0,101,
-0,102,0,105,0,
-110,0,105,0,116,
-0,105,0,111,0,
-110,0,115,0,95,
-0,49,0,1,150,
-1,3,1,2,1,
-1,3281,22,1,3,
-1,2660,735,1,2711,
-3282,17,3283,15,3284,
-4,52,37,0,71,
-0,108,0,111,0,
-98,0,97,0,108,
-0,86,0,97,0,
-114,0,105,0,97,
-0,98,0,108,0,
-101,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,1,
--1,1,5,3285,20,
-3286,4,54,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
-86,0,97,0,114,
-0,105,0,97,0,
-98,0,108,0,101,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
+108,0,70,0,117,
+0,110,0,99,0,
+116,0,105,0,111,
+0,110,0,68,0,
+101,0,102,0,105,
+0,110,0,105,0,
 116,0,105,0,111,
 0,110,0,95,0,
-50,0,1,155,1,
-3,1,5,1,4,
-3287,22,1,8,1,
-2664,3288,16,0,678,
-1,2723,3289,16,0,
-678,1,2022,3290,16,
-0,586,1,2459,910,
-1,2683,3291,17,3292,
-15,3293,4,50,37,
-0,71,0,108,0,
-111,0,98,0,97,
-0,108,0,70,0,
-117,0,110,0,99,
-0,116,0,105,0,
-111,0,110,0,68,
-0,101,0,102,0,
-105,0,110,0,105,
-0,116,0,105,0,
-111,0,110,0,1,
--1,1,5,3294,20,
-3295,4,52,71,0,
+49,0,1,156,1,
+3,1,6,1,5,
+3296,22,1,9,1,
+2722,3297,17,3298,15,
+3284,1,-1,1,5,
+3299,20,3300,4,54,
+71,0,108,0,111,
+0,98,0,97,0,
+108,0,86,0,97,
+0,114,0,105,0,
+97,0,98,0,108,
+0,101,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+95,0,49,0,1,
+154,1,3,1,3,
+1,2,3301,22,1,
+7,1,2464,927,1,
+2576,713,1,2466,3302,
+17,3303,15,3293,1,
+-1,1,5,3304,20,
+3305,4,52,71,0,
 108,0,111,0,98,
 0,97,0,108,0,
 70,0,117,0,110,
@@ -8874,139 +8910,74 @@ public yyLSLSyntax
 102,0,105,0,110,
 0,105,0,116,0,
 105,0,111,0,110,
-0,95,0,49,0,
-1,156,1,3,1,
-6,1,5,3296,22,
-1,9,1,2722,3297,
-17,3298,15,3284,1,
--1,1,5,3299,20,
-3300,4,54,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
-86,0,97,0,114,
-0,105,0,97,0,
-98,0,108,0,101,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,95,0,
-49,0,1,154,1,
-3,1,3,1,2,
-3301,22,1,7,1,
-2464,927,1,2576,713,
-1,2466,3302,17,3303,
-15,3293,1,-1,1,
-5,3304,20,3305,4,
-52,71,0,108,0,
-111,0,98,0,97,
-0,108,0,70,0,
-117,0,110,0,99,
-0,116,0,105,0,
-111,0,110,0,68,
-0,101,0,102,0,
-105,0,110,0,105,
-0,116,0,105,0,
-111,0,110,0,95,
-0,50,0,1,157,
-1,3,1,7,1,
-6,3306,22,1,10,
-1,2667,719,1,2668,
-707,1,2734,3307,16,
-0,678,1,48,3308,
-19,348,1,48,3309,
-5,54,1,0,3310,
-16,0,346,1,2075,
-3311,16,0,518,1,
-1860,850,1,1803,816,
-1,1804,3312,16,0,
-518,1,2413,3313,16,
-0,518,1,2741,3261,
-1,2742,3267,1,2743,
-3272,1,2744,3277,1,
-1873,864,1,1657,922,
-1,2030,760,1,1989,
-944,1,1990,3314,16,
-0,518,1,2459,910,
-1,1775,3315,16,0,
-518,1,32,3316,16,
-0,518,1,2105,843,
-1,2106,3317,16,0,
-518,1,2576,713,1,
-2683,3291,1,2660,735,
-1,2227,936,1,2337,
-3318,16,0,518,1,
-2667,719,1,2037,786,
-1,2021,747,1,2458,
-904,1,1901,3319,16,
-0,518,1,2462,917,
-1,2136,871,1,2464,
-927,1,2029,754,1,
-2466,3302,1,2031,765,
-1,2032,770,1,2033,
-775,1,2035,781,1,
-2364,856,1,2039,791,
-1,1931,889,1,2041,
-797,1,2043,803,1,
-2045,808,1,2664,3320,
-16,0,346,1,2198,
-3321,16,0,518,1,
-2668,707,1,2711,3282,
-1,2734,3322,16,0,
-346,1,1574,828,1,
-1958,3323,16,0,518,
-1,2722,3297,1,2723,
-3324,16,0,346,1,
-49,3325,19,523,1,
-49,3326,5,38,1,
-1901,3327,16,0,521,
-1,2075,3328,16,0,
-521,1,1860,850,1,
-1803,816,1,1804,3329,
-16,0,521,1,2413,
-3330,16,0,521,1,
-2198,3331,16,0,521,
-1,1873,864,1,1657,
-922,1,1989,944,1,
-1990,3332,16,0,521,
-1,1775,3333,16,0,
-521,1,32,3334,16,
-0,521,1,2105,843,
-1,2106,3335,16,0,
-521,1,2364,856,1,
-2227,936,1,2337,3336,
-16,0,521,1,2021,
-747,1,2458,904,1,
-2459,910,1,2462,917,
-1,2136,871,1,2464,
-927,1,2029,754,1,
-2030,760,1,2031,765,
-1,2032,770,1,2033,
-775,1,2035,781,1,
-2037,786,1,2039,791,
-1,1931,889,1,2041,
-797,1,2043,803,1,
-2045,808,1,1574,828,
-1,1958,3337,16,0,
-521,1,50,3338,19,
-640,1,50,3339,5,
-38,1,1901,3340,16,
-0,638,1,2075,3341,
-16,0,638,1,1860,
+0,95,0,50,0,
+1,157,1,3,1,
+7,1,6,3306,22,
+1,10,1,2667,719,
+1,2668,707,1,2734,
+3307,16,0,678,1,
+48,3308,19,348,1,
+48,3309,5,54,1,
+0,3310,16,0,346,
+1,2075,3311,16,0,
+518,1,1860,850,1,
+1803,816,1,1804,3312,
+16,0,518,1,2413,
+3313,16,0,518,1,
+2741,3261,1,2742,3267,
+1,2743,3272,1,2744,
+3277,1,1873,864,1,
+1657,922,1,2030,760,
+1,1989,944,1,1990,
+3314,16,0,518,1,
+2459,910,1,1775,3315,
+16,0,518,1,32,
+3316,16,0,518,1,
+2105,843,1,2106,3317,
+16,0,518,1,2576,
+713,1,2683,3291,1,
+2660,735,1,2227,936,
+1,2337,3318,16,0,
+518,1,2667,719,1,
+2037,786,1,2021,747,
+1,2458,904,1,1901,
+3319,16,0,518,1,
+2462,917,1,2136,871,
+1,2464,927,1,2029,
+754,1,2466,3302,1,
+2031,765,1,2032,770,
+1,2033,775,1,2035,
+781,1,2364,856,1,
+2039,791,1,1931,889,
+1,2041,797,1,2043,
+803,1,2045,808,1,
+2664,3320,16,0,346,
+1,2198,3321,16,0,
+518,1,2668,707,1,
+2711,3282,1,2734,3322,
+16,0,346,1,1574,
+828,1,1958,3323,16,
+0,518,1,2722,3297,
+1,2723,3324,16,0,
+346,1,49,3325,19,
+523,1,49,3326,5,
+38,1,1901,3327,16,
+0,521,1,2075,3328,
+16,0,521,1,1860,
 850,1,1803,816,1,
-1804,3342,16,0,638,
-1,2413,3343,16,0,
-638,1,2198,3344,16,
-0,638,1,1873,864,
+1804,3329,16,0,521,
+1,2413,3330,16,0,
+521,1,2198,3331,16,
+0,521,1,1873,864,
 1,1657,922,1,1989,
-944,1,1990,3345,16,
-0,638,1,1775,3346,
-16,0,638,1,32,
-3347,16,0,638,1,
-2105,843,1,2106,3348,
-16,0,638,1,2364,
+944,1,1990,3332,16,
+0,521,1,1775,3333,
+16,0,521,1,32,
+3334,16,0,521,1,
+2105,843,1,2106,3335,
+16,0,521,1,2364,
 856,1,2227,936,1,
-2337,3349,16,0,638,
+2337,3336,16,0,521,
 1,2021,747,1,2458,
 904,1,2459,910,1,
 2462,917,1,2136,871,
@@ -9018,81 +8989,157 @@ public yyLSLSyntax
 2039,791,1,1931,889,
 1,2041,797,1,2043,
 803,1,2045,808,1,
-1574,828,1,1958,3350,
-16,0,638,1,51,
-3351,19,127,1,51,
-3352,5,54,1,0,
-3353,16,0,125,1,
-2075,3354,16,0,125,
-1,1860,850,1,1804,
-3355,16,0,125,1,
-10,3356,16,0,125,
-1,2520,3357,16,0,
-125,1,2337,3358,16,
-0,125,1,2413,3359,
-16,0,125,1,2741,
-3261,1,2742,3267,1,
-2743,3272,1,2744,3277,
-1,1873,864,1,21,
-3360,16,0,125,1,
-1657,922,1,2030,760,
+1574,828,1,1958,3337,
+16,0,521,1,50,
+3338,19,640,1,50,
+3339,5,38,1,1901,
+3340,16,0,638,1,
+2075,3341,16,0,638,
+1,1860,850,1,1803,
+816,1,1804,3342,16,
+0,638,1,2413,3343,
+16,0,638,1,2198,
+3344,16,0,638,1,
+1873,864,1,1657,922,
 1,1989,944,1,1990,
-3361,16,0,125,1,
-1775,3362,16,0,125,
-1,32,3363,16,0,
-125,1,2105,843,1,
-2106,3364,16,0,125,
-1,2683,3291,1,2227,
-936,1,1901,3365,16,
-0,125,1,52,3366,
-16,0,125,1,2670,
-3367,16,0,125,1,
-1803,816,1,2458,904,
-1,2459,910,1,2462,
-917,1,2136,871,1,
-2464,927,1,2029,754,
-1,2466,3302,1,2031,
-765,1,2032,770,1,
-2033,775,1,2035,781,
-1,2364,856,1,2039,
-791,1,1931,889,1,
-2041,797,1,2021,747,
+3345,16,0,638,1,
+1775,3346,16,0,638,
+1,32,3347,16,0,
+638,1,2105,843,1,
+2106,3348,16,0,638,
+1,2364,856,1,2227,
+936,1,2337,3349,16,
+0,638,1,2021,747,
+1,2458,904,1,2459,
+910,1,2462,917,1,
+2136,871,1,2464,927,
+1,2029,754,1,2030,
+760,1,2031,765,1,
+2032,770,1,2033,775,
+1,2035,781,1,2037,
+786,1,2039,791,1,
+1931,889,1,2041,797,
 1,2043,803,1,2045,
-808,1,2511,3368,16,
-0,449,1,2198,3369,
-16,0,125,1,2711,
+808,1,1574,828,1,
+1958,3350,16,0,638,
+1,51,3351,19,127,
+1,51,3352,5,54,
+1,0,3353,16,0,
+125,1,2075,3354,16,
+0,125,1,1860,850,
+1,1804,3355,16,0,
+125,1,10,3356,16,
+0,125,1,2520,3357,
+16,0,125,1,2337,
+3358,16,0,125,1,
+2413,3359,16,0,125,
+1,2741,3261,1,2742,
+3267,1,2743,3272,1,
+2744,3277,1,1873,864,
+1,21,3360,16,0,
+125,1,1657,922,1,
+2030,760,1,1989,944,
+1,1990,3361,16,0,
+125,1,1775,3362,16,
+0,125,1,32,3363,
+16,0,125,1,2105,
+843,1,2106,3364,16,
+0,125,1,2683,3291,
+1,2227,936,1,1901,
+3365,16,0,125,1,
+52,3366,16,0,125,
+1,2670,3367,16,0,
+125,1,1803,816,1,
+2458,904,1,2459,910,
+1,2462,917,1,2136,
+871,1,2464,927,1,
+2029,754,1,2466,3302,
+1,2031,765,1,2032,
+770,1,2033,775,1,
+2035,781,1,2364,856,
+1,2039,791,1,1931,
+889,1,2041,797,1,
+2021,747,1,2043,803,
+1,2045,808,1,2511,
+3368,16,0,449,1,
+2198,3369,16,0,125,
+1,2711,3282,1,2037,
+786,1,1574,828,1,
+1958,3370,16,0,125,
+1,2722,3297,1,2723,
+3371,16,0,125,1,
+52,3372,19,124,1,
+52,3373,5,53,1,
+0,3374,16,0,122,
+1,2075,3375,16,0,
+122,1,1860,850,1,
+1804,3376,16,0,122,
+1,10,3377,16,0,
+122,1,2520,3378,16,
+0,122,1,2337,3379,
+16,0,122,1,2413,
+3380,16,0,122,1,
+2741,3261,1,2742,3267,
+1,2743,3272,1,2744,
+3277,1,1873,864,1,
+21,3381,16,0,122,
+1,1657,922,1,2030,
+760,1,1989,944,1,
+1990,3382,16,0,122,
+1,1775,3383,16,0,
+122,1,32,3384,16,
+0,122,1,2105,843,
+1,2106,3385,16,0,
+122,1,2683,3291,1,
+2227,936,1,1901,3386,
+16,0,122,1,52,
+3387,16,0,122,1,
+2670,3388,16,0,122,
+1,1803,816,1,2458,
+904,1,2459,910,1,
+2462,917,1,2136,871,
+1,2464,927,1,2029,
+754,1,2466,3302,1,
+2031,765,1,2032,770,
+1,2033,775,1,2035,
+781,1,2364,856,1,
+2039,791,1,1931,889,
+1,2041,797,1,2021,
+747,1,2043,803,1,
+2045,808,1,2198,3389,
+16,0,122,1,2711,
 3282,1,2037,786,1,
-1574,828,1,1958,3370,
-16,0,125,1,2722,
-3297,1,2723,3371,16,
-0,125,1,52,3372,
-19,124,1,52,3373,
-5,53,1,0,3374,
-16,0,122,1,2075,
-3375,16,0,122,1,
-1860,850,1,1804,3376,
-16,0,122,1,10,
-3377,16,0,122,1,
-2520,3378,16,0,122,
-1,2337,3379,16,0,
-122,1,2413,3380,16,
-0,122,1,2741,3261,
+1574,828,1,1958,3390,
+16,0,122,1,2722,
+3297,1,2723,3391,16,
+0,122,1,53,3392,
+19,121,1,53,3393,
+5,53,1,0,3394,
+16,0,119,1,2075,
+3395,16,0,119,1,
+1860,850,1,1804,3396,
+16,0,119,1,10,
+3397,16,0,119,1,
+2520,3398,16,0,119,
+1,2337,3399,16,0,
+119,1,2413,3400,16,
+0,119,1,2741,3261,
 1,2742,3267,1,2743,
 3272,1,2744,3277,1,
-1873,864,1,21,3381,
-16,0,122,1,1657,
+1873,864,1,21,3401,
+16,0,119,1,1657,
 922,1,2030,760,1,
-1989,944,1,1990,3382,
-16,0,122,1,1775,
-3383,16,0,122,1,
-32,3384,16,0,122,
+1989,944,1,1990,3402,
+16,0,119,1,1775,
+3403,16,0,119,1,
+32,3404,16,0,119,
 1,2105,843,1,2106,
-3385,16,0,122,1,
+3405,16,0,119,1,
 2683,3291,1,2227,936,
-1,1901,3386,16,0,
-122,1,52,3387,16,
-0,122,1,2670,3388,
-16,0,122,1,1803,
+1,1901,3406,16,0,
+119,1,52,3407,16,
+0,119,1,2670,3408,
+16,0,119,1,1803,
 816,1,2458,904,1,
 2459,910,1,2462,917,
 1,2136,871,1,2464,
@@ -9104,40 +9151,40 @@ public yyLSLSyntax
 1,1931,889,1,2041,
 797,1,2021,747,1,
 2043,803,1,2045,808,
-1,2198,3389,16,0,
-122,1,2711,3282,1,
+1,2198,3409,16,0,
+119,1,2711,3282,1,
 2037,786,1,1574,828,
-1,1958,3390,16,0,
-122,1,2722,3297,1,
-2723,3391,16,0,122,
-1,53,3392,19,121,
-1,53,3393,5,53,
-1,0,3394,16,0,
-119,1,2075,3395,16,
-0,119,1,1860,850,
-1,1804,3396,16,0,
-119,1,10,3397,16,
-0,119,1,2520,3398,
-16,0,119,1,2337,
-3399,16,0,119,1,
-2413,3400,16,0,119,
+1,1958,3410,16,0,
+119,1,2722,3297,1,
+2723,3411,16,0,119,
+1,54,3412,19,118,
+1,54,3413,5,53,
+1,0,3414,16,0,
+116,1,2075,3415,16,
+0,116,1,1860,850,
+1,1804,3416,16,0,
+116,1,10,3417,16,
+0,116,1,2520,3418,
+16,0,116,1,2337,
+3419,16,0,116,1,
+2413,3420,16,0,116,
 1,2741,3261,1,2742,
 3267,1,2743,3272,1,
 2744,3277,1,1873,864,
-1,21,3401,16,0,
-119,1,1657,922,1,
+1,21,3421,16,0,
+116,1,1657,922,1,
 2030,760,1,1989,944,
-1,1990,3402,16,0,
-119,1,1775,3403,16,
-0,119,1,32,3404,
-16,0,119,1,2105,
-843,1,2106,3405,16,
-0,119,1,2683,3291,
+1,1990,3422,16,0,
+116,1,1775,3423,16,
+0,116,1,32,3424,
+16,0,116,1,2105,
+843,1,2106,3425,16,
+0,116,1,2683,3291,
 1,2227,936,1,1901,
-3406,16,0,119,1,
-52,3407,16,0,119,
-1,2670,3408,16,0,
-119,1,1803,816,1,
+3426,16,0,116,1,
+52,3427,16,0,116,
+1,2670,3428,16,0,
+116,1,1803,816,1,
 2458,904,1,2459,910,
 1,2462,917,1,2136,
 871,1,2464,927,1,
@@ -9149,39 +9196,39 @@ public yyLSLSyntax
 889,1,2041,797,1,
 2021,747,1,2043,803,
 1,2045,808,1,2198,
-3409,16,0,119,1,
+3429,16,0,116,1,
 2711,3282,1,2037,786,
 1,1574,828,1,1958,
-3410,16,0,119,1,
-2722,3297,1,2723,3411,
-16,0,119,1,54,
-3412,19,118,1,54,
-3413,5,53,1,0,
-3414,16,0,116,1,
-2075,3415,16,0,116,
+3430,16,0,116,1,
+2722,3297,1,2723,3431,
+16,0,116,1,55,
+3432,19,115,1,55,
+3433,5,53,1,0,
+3434,16,0,113,1,
+2075,3435,16,0,113,
 1,1860,850,1,1804,
-3416,16,0,116,1,
-10,3417,16,0,116,
-1,2520,3418,16,0,
-116,1,2337,3419,16,
-0,116,1,2413,3420,
-16,0,116,1,2741,
+3436,16,0,113,1,
+10,3437,16,0,113,
+1,2520,3438,16,0,
+113,1,2337,3439,16,
+0,113,1,2413,3440,
+16,0,113,1,2741,
 3261,1,2742,3267,1,
 2743,3272,1,2744,3277,
 1,1873,864,1,21,
-3421,16,0,116,1,
+3441,16,0,113,1,
 1657,922,1,2030,760,
 1,1989,944,1,1990,
-3422,16,0,116,1,
-1775,3423,16,0,116,
-1,32,3424,16,0,
-116,1,2105,843,1,
-2106,3425,16,0,116,
+3442,16,0,113,1,
+1775,3443,16,0,113,
+1,32,3444,16,0,
+113,1,2105,843,1,
+2106,3445,16,0,113,
 1,2683,3291,1,2227,
-936,1,1901,3426,16,
-0,116,1,52,3427,
-16,0,116,1,2670,
-3428,16,0,116,1,
+936,1,1901,3446,16,
+0,113,1,52,3447,
+16,0,113,1,2670,
+3448,16,0,113,1,
 1803,816,1,2458,904,
 1,2459,910,1,2462,
 917,1,2136,871,1,
@@ -9193,40 +9240,40 @@ public yyLSLSyntax
 791,1,1931,889,1,
 2041,797,1,2021,747,
 1,2043,803,1,2045,
-808,1,2198,3429,16,
-0,116,1,2711,3282,
+808,1,2198,3449,16,
+0,113,1,2711,3282,
 1,2037,786,1,1574,
-828,1,1958,3430,16,
-0,116,1,2722,3297,
-1,2723,3431,16,0,
-116,1,55,3432,19,
-115,1,55,3433,5,
-53,1,0,3434,16,
-0,113,1,2075,3435,
-16,0,113,1,1860,
-850,1,1804,3436,16,
-0,113,1,10,3437,
-16,0,113,1,2520,
-3438,16,0,113,1,
-2337,3439,16,0,113,
-1,2413,3440,16,0,
-113,1,2741,3261,1,
+828,1,1958,3450,16,
+0,113,1,2722,3297,
+1,2723,3451,16,0,
+113,1,56,3452,19,
+112,1,56,3453,5,
+53,1,0,3454,16,
+0,110,1,2075,3455,
+16,0,110,1,1860,
+850,1,1804,3456,16,
+0,110,1,10,3457,
+16,0,110,1,2520,
+3458,16,0,110,1,
+2337,3459,16,0,110,
+1,2413,3460,16,0,
+110,1,2741,3261,1,
 2742,3267,1,2743,3272,
 1,2744,3277,1,1873,
-864,1,21,3441,16,
-0,113,1,1657,922,
+864,1,21,3461,16,
+0,110,1,1657,922,
 1,2030,760,1,1989,
-944,1,1990,3442,16,
-0,113,1,1775,3443,
-16,0,113,1,32,
-3444,16,0,113,1,
-2105,843,1,2106,3445,
-16,0,113,1,2683,
+944,1,1990,3462,16,
+0,110,1,1775,3463,
+16,0,110,1,32,
+3464,16,0,110,1,
+2105,843,1,2106,3465,
+16,0,110,1,2683,
 3291,1,2227,936,1,
-1901,3446,16,0,113,
-1,52,3447,16,0,
-113,1,2670,3448,16,
-0,113,1,1803,816,
+1901,3466,16,0,110,
+1,52,3467,16,0,
+110,1,2670,3468,16,
+0,110,1,1803,816,
 1,2458,904,1,2459,
 910,1,2462,917,1,
 2136,871,1,2464,927,
@@ -9238,39 +9285,39 @@ public yyLSLSyntax
 1931,889,1,2041,797,
 1,2021,747,1,2043,
 803,1,2045,808,1,
-2198,3449,16,0,113,
+2198,3469,16,0,110,
 1,2711,3282,1,2037,
 786,1,1574,828,1,
-1958,3450,16,0,113,
+1958,3470,16,0,110,
 1,2722,3297,1,2723,
-3451,16,0,113,1,
-56,3452,19,112,1,
-56,3453,5,53,1,
-0,3454,16,0,110,
-1,2075,3455,16,0,
-110,1,1860,850,1,
-1804,3456,16,0,110,
-1,10,3457,16,0,
-110,1,2520,3458,16,
-0,110,1,2337,3459,
-16,0,110,1,2413,
-3460,16,0,110,1,
+3471,16,0,110,1,
+57,3472,19,109,1,
+57,3473,5,53,1,
+0,3474,16,0,107,
+1,2075,3475,16,0,
+107,1,1860,850,1,
+1804,3476,16,0,107,
+1,10,3477,16,0,
+107,1,2520,3478,16,
+0,107,1,2337,3479,
+16,0,107,1,2413,
+3480,16,0,107,1,
 2741,3261,1,2742,3267,
 1,2743,3272,1,2744,
 3277,1,1873,864,1,
-21,3461,16,0,110,
+21,3481,16,0,107,
 1,1657,922,1,2030,
 760,1,1989,944,1,
-1990,3462,16,0,110,
-1,1775,3463,16,0,
-110,1,32,3464,16,
-0,110,1,2105,843,
-1,2106,3465,16,0,
-110,1,2683,3291,1,
-2227,936,1,1901,3466,
-16,0,110,1,52,
-3467,16,0,110,1,
-2670,3468,16,0,110,
+1990,3482,16,0,107,
+1,1775,3483,16,0,
+107,1,32,3484,16,
+0,107,1,2105,843,
+1,2106,3485,16,0,
+107,1,2683,3291,1,
+2227,936,1,1901,3486,
+16,0,107,1,52,
+3487,16,0,107,1,
+2670,3488,16,0,107,
 1,1803,816,1,2458,
 904,1,2459,910,1,
 2462,917,1,2136,871,
@@ -9282,1986 +9329,1973 @@ public yyLSLSyntax
 2039,791,1,1931,889,
 1,2041,797,1,2021,
 747,1,2043,803,1,
-2045,808,1,2198,3469,
-16,0,110,1,2711,
+2045,808,1,2198,3489,
+16,0,107,1,2711,
 3282,1,2037,786,1,
-1574,828,1,1958,3470,
-16,0,110,1,2722,
-3297,1,2723,3471,16,
-0,110,1,57,3472,
-19,109,1,57,3473,
-5,53,1,0,3474,
-16,0,107,1,2075,
-3475,16,0,107,1,
-1860,850,1,1804,3476,
-16,0,107,1,10,
-3477,16,0,107,1,
-2520,3478,16,0,107,
-1,2337,3479,16,0,
-107,1,2413,3480,16,
-0,107,1,2741,3261,
-1,2742,3267,1,2743,
-3272,1,2744,3277,1,
-1873,864,1,21,3481,
-16,0,107,1,1657,
-922,1,2030,760,1,
-1989,944,1,1990,3482,
-16,0,107,1,1775,
-3483,16,0,107,1,
-32,3484,16,0,107,
-1,2105,843,1,2106,
-3485,16,0,107,1,
-2683,3291,1,2227,936,
-1,1901,3486,16,0,
-107,1,52,3487,16,
-0,107,1,2670,3488,
-16,0,107,1,1803,
-816,1,2458,904,1,
-2459,910,1,2462,917,
-1,2136,871,1,2464,
-927,1,2029,754,1,
-2466,3302,1,2031,765,
-1,2032,770,1,2033,
-775,1,2035,781,1,
-2364,856,1,2039,791,
-1,1931,889,1,2041,
-797,1,2021,747,1,
-2043,803,1,2045,808,
-1,2198,3489,16,0,
-107,1,2711,3282,1,
-2037,786,1,1574,828,
-1,1958,3490,16,0,
-107,1,2722,3297,1,
-2723,3491,16,0,107,
-1,58,3492,19,438,
-1,58,3493,5,15,
-1,2581,3494,16,0,
-436,1,2518,1655,1,
-2459,910,1,2535,3495,
-16,0,436,1,2573,
-1664,1,2574,1670,1,
-2464,927,1,2577,1685,
-1,2578,1680,1,2533,
-1695,1,2470,3496,16,
-0,436,1,2619,3497,
-16,0,436,1,2509,
-1648,1,2575,1675,1,
-2579,1690,1,59,3498,
-19,435,1,59,3499,
-5,15,1,2581,3500,
-16,0,433,1,2518,
+1574,828,1,1958,3490,
+16,0,107,1,2722,
+3297,1,2723,3491,16,
+0,107,1,58,3492,
+19,438,1,58,3493,
+5,15,1,2581,3494,
+16,0,436,1,2518,
 1655,1,2459,910,1,
-2535,3501,16,0,433,
+2535,3495,16,0,436,
 1,2573,1664,1,2574,
 1670,1,2464,927,1,
 2577,1685,1,2578,1680,
 1,2533,1695,1,2470,
-3502,16,0,433,1,
-2619,3503,16,0,433,
+3496,16,0,436,1,
+2619,3497,16,0,436,
 1,2509,1648,1,2575,
 1675,1,2579,1690,1,
-60,3504,19,432,1,
-60,3505,5,15,1,
-2581,3506,16,0,430,
+59,3498,19,435,1,
+59,3499,5,15,1,
+2581,3500,16,0,433,
 1,2518,1655,1,2459,
-910,1,2535,3507,16,
-0,430,1,2573,1664,
+910,1,2535,3501,16,
+0,433,1,2573,1664,
 1,2574,1670,1,2464,
 927,1,2577,1685,1,
 2578,1680,1,2533,1695,
-1,2470,3508,16,0,
-430,1,2619,3509,16,
-0,430,1,2509,1648,
+1,2470,3502,16,0,
+433,1,2619,3503,16,
+0,433,1,2509,1648,
 1,2575,1675,1,2579,
-1690,1,61,3510,19,
-399,1,61,3511,5,
-15,1,2581,3512,16,
-0,397,1,2518,1655,
+1690,1,60,3504,19,
+432,1,60,3505,5,
+15,1,2581,3506,16,
+0,430,1,2518,1655,
 1,2459,910,1,2535,
-3513,16,0,397,1,
+3507,16,0,430,1,
 2573,1664,1,2574,1670,
 1,2464,927,1,2577,
 1685,1,2578,1680,1,
-2533,1695,1,2470,3514,
-16,0,397,1,2619,
-3515,16,0,397,1,
+2533,1695,1,2470,3508,
+16,0,430,1,2619,
+3509,16,0,430,1,
 2509,1648,1,2575,1675,
-1,2579,1690,1,62,
-3516,19,396,1,62,
-3517,5,15,1,2581,
-3518,16,0,394,1,
+1,2579,1690,1,61,
+3510,19,491,1,61,
+3511,5,15,1,2581,
+3512,16,0,489,1,
 2518,1655,1,2459,910,
-1,2535,3519,16,0,
-394,1,2573,1664,1,
+1,2535,3513,16,0,
+489,1,2573,1664,1,
 2574,1670,1,2464,927,
 1,2577,1685,1,2578,
 1680,1,2533,1695,1,
-2470,3520,16,0,394,
-1,2619,3521,16,0,
-394,1,2509,1648,1,
+2470,3514,16,0,489,
+1,2619,3515,16,0,
+489,1,2509,1648,1,
 2575,1675,1,2579,1690,
-1,63,3522,19,488,
-1,63,3523,5,15,
-1,2581,3524,16,0,
-486,1,2518,1655,1,
-2459,910,1,2535,3525,
-16,0,486,1,2573,
+1,62,3516,19,399,
+1,62,3517,5,15,
+1,2581,3518,16,0,
+397,1,2518,1655,1,
+2459,910,1,2535,3519,
+16,0,397,1,2573,
 1664,1,2574,1670,1,
 2464,927,1,2577,1685,
 1,2578,1680,1,2533,
-1695,1,2470,3526,16,
-0,486,1,2619,3527,
-16,0,486,1,2509,
+1695,1,2470,3520,16,
+0,397,1,2619,3521,
+16,0,397,1,2509,
 1648,1,2575,1675,1,
-2579,1690,1,64,3528,
-19,585,1,64,3529,
-5,15,1,2581,3530,
-16,0,583,1,2518,
+2579,1690,1,63,3522,
+19,396,1,63,3523,
+5,15,1,2581,3524,
+16,0,394,1,2518,
 1655,1,2459,910,1,
-2535,3531,16,0,583,
+2535,3525,16,0,394,
 1,2573,1664,1,2574,
 1670,1,2464,927,1,
 2577,1685,1,2578,1680,
 1,2533,1695,1,2470,
-3532,16,0,583,1,
-2619,3533,16,0,583,
+3526,16,0,394,1,
+2619,3527,16,0,394,
 1,2509,1648,1,2575,
 1675,1,2579,1690,1,
-65,3534,19,429,1,
-65,3535,5,15,1,
-2581,3536,16,0,427,
+64,3528,19,488,1,
+64,3529,5,15,1,
+2581,3530,16,0,486,
 1,2518,1655,1,2459,
-910,1,2535,3537,16,
-0,427,1,2573,1664,
+910,1,2535,3531,16,
+0,486,1,2573,1664,
 1,2574,1670,1,2464,
 927,1,2577,1685,1,
 2578,1680,1,2533,1695,
-1,2470,3538,16,0,
-427,1,2619,3539,16,
-0,427,1,2509,1648,
+1,2470,3532,16,0,
+486,1,2619,3533,16,
+0,486,1,2509,1648,
 1,2575,1675,1,2579,
-1690,1,66,3540,19,
-426,1,66,3541,5,
-15,1,2581,3542,16,
-0,424,1,2518,1655,
+1690,1,65,3534,19,
+429,1,65,3535,5,
+15,1,2581,3536,16,
+0,427,1,2518,1655,
 1,2459,910,1,2535,
-3543,16,0,424,1,
+3537,16,0,427,1,
 2573,1664,1,2574,1670,
 1,2464,927,1,2577,
 1685,1,2578,1680,1,
-2533,1695,1,2470,3544,
-16,0,424,1,2619,
-3545,16,0,424,1,
+2533,1695,1,2470,3538,
+16,0,427,1,2619,
+3539,16,0,427,1,
 2509,1648,1,2575,1675,
-1,2579,1690,1,67,
-3546,19,423,1,67,
-3547,5,15,1,2581,
-3548,16,0,421,1,
+1,2579,1690,1,66,
+3540,19,426,1,66,
+3541,5,15,1,2581,
+3542,16,0,424,1,
 2518,1655,1,2459,910,
-1,2535,3549,16,0,
-421,1,2573,1664,1,
+1,2535,3543,16,0,
+424,1,2573,1664,1,
 2574,1670,1,2464,927,
 1,2577,1685,1,2578,
 1680,1,2533,1695,1,
-2470,3550,16,0,421,
-1,2619,3551,16,0,
-421,1,2509,1648,1,
+2470,3544,16,0,424,
+1,2619,3545,16,0,
+424,1,2509,1648,1,
 2575,1675,1,2579,1690,
-1,68,3552,19,673,
-1,68,3553,5,15,
-1,2581,3554,16,0,
-671,1,2518,1655,1,
-2459,910,1,2535,3555,
-16,0,671,1,2573,
+1,67,3546,19,423,
+1,67,3547,5,15,
+1,2581,3548,16,0,
+421,1,2518,1655,1,
+2459,910,1,2535,3549,
+16,0,421,1,2573,
 1664,1,2574,1670,1,
 2464,927,1,2577,1685,
 1,2578,1680,1,2533,
-1695,1,2470,3556,16,
-0,671,1,2619,3557,
-16,0,671,1,2509,
+1695,1,2470,3550,16,
+0,421,1,2619,3551,
+16,0,421,1,2509,
 1648,1,2575,1675,1,
-2579,1690,1,69,3558,
-19,419,1,69,3559,
-5,15,1,2581,3560,
-16,0,417,1,2518,
+2579,1690,1,68,3552,
+19,673,1,68,3553,
+5,15,1,2581,3554,
+16,0,671,1,2518,
 1655,1,2459,910,1,
-2535,3561,16,0,417,
+2535,3555,16,0,671,
 1,2573,1664,1,2574,
 1670,1,2464,927,1,
 2577,1685,1,2578,1680,
 1,2533,1695,1,2470,
-3562,16,0,417,1,
-2619,3563,16,0,417,
+3556,16,0,671,1,
+2619,3557,16,0,671,
 1,2509,1648,1,2575,
 1675,1,2579,1690,1,
-70,3564,19,513,1,
-70,3565,5,15,1,
-2581,3566,16,0,511,
+69,3558,19,419,1,
+69,3559,5,15,1,
+2581,3560,16,0,417,
 1,2518,1655,1,2459,
-910,1,2535,3567,16,
-0,511,1,2573,1664,
+910,1,2535,3561,16,
+0,417,1,2573,1664,
 1,2574,1670,1,2464,
 927,1,2577,1685,1,
 2578,1680,1,2533,1695,
-1,2470,3568,16,0,
-511,1,2619,3569,16,
-0,511,1,2509,1648,
+1,2470,3562,16,0,
+417,1,2619,3563,16,
+0,417,1,2509,1648,
 1,2575,1675,1,2579,
-1690,1,71,3570,19,
-415,1,71,3571,5,
-15,1,2581,3572,16,
-0,413,1,2518,1655,
+1690,1,70,3564,19,
+513,1,70,3565,5,
+15,1,2581,3566,16,
+0,511,1,2518,1655,
 1,2459,910,1,2535,
-3573,16,0,413,1,
+3567,16,0,511,1,
 2573,1664,1,2574,1670,
 1,2464,927,1,2577,
 1685,1,2578,1680,1,
-2533,1695,1,2470,3574,
-16,0,413,1,2619,
-3575,16,0,413,1,
+2533,1695,1,2470,3568,
+16,0,511,1,2619,
+3569,16,0,511,1,
 2509,1648,1,2575,1675,
-1,2579,1690,1,72,
-3576,19,412,1,72,
-3577,5,15,1,2581,
-3578,16,0,410,1,
+1,2579,1690,1,71,
+3570,19,415,1,71,
+3571,5,15,1,2581,
+3572,16,0,413,1,
 2518,1655,1,2459,910,
-1,2535,3579,16,0,
-410,1,2573,1664,1,
+1,2535,3573,16,0,
+413,1,2573,1664,1,
 2574,1670,1,2464,927,
 1,2577,1685,1,2578,
 1680,1,2533,1695,1,
-2470,3580,16,0,410,
-1,2619,3581,16,0,
-410,1,2509,1648,1,
+2470,3574,16,0,413,
+1,2619,3575,16,0,
+413,1,2509,1648,1,
 2575,1675,1,2579,1690,
-1,73,3582,19,503,
-1,73,3583,5,15,
-1,2581,3584,16,0,
-501,1,2518,1655,1,
-2459,910,1,2535,3585,
-16,0,501,1,2573,
+1,72,3576,19,412,
+1,72,3577,5,15,
+1,2581,3578,16,0,
+410,1,2518,1655,1,
+2459,910,1,2535,3579,
+16,0,410,1,2573,
 1664,1,2574,1670,1,
 2464,927,1,2577,1685,
 1,2578,1680,1,2533,
-1695,1,2470,3586,16,
-0,501,1,2619,3587,
-16,0,501,1,2509,
+1695,1,2470,3580,16,
+0,410,1,2619,3581,
+16,0,410,1,2509,
 1648,1,2575,1675,1,
-2579,1690,1,74,3588,
-19,408,1,74,3589,
-5,15,1,2581,3590,
-16,0,406,1,2518,
+2579,1690,1,73,3582,
+19,503,1,73,3583,
+5,15,1,2581,3584,
+16,0,501,1,2518,
 1655,1,2459,910,1,
-2535,3591,16,0,406,
+2535,3585,16,0,501,
 1,2573,1664,1,2574,
 1670,1,2464,927,1,
 2577,1685,1,2578,1680,
 1,2533,1695,1,2470,
-3592,16,0,406,1,
-2619,3593,16,0,406,
+3586,16,0,501,1,
+2619,3587,16,0,501,
 1,2509,1648,1,2575,
 1675,1,2579,1690,1,
-75,3594,19,365,1,
-75,3595,5,15,1,
-2581,3596,16,0,363,
+74,3588,19,408,1,
+74,3589,5,15,1,
+2581,3590,16,0,406,
 1,2518,1655,1,2459,
-910,1,2535,3597,16,
-0,363,1,2573,1664,
+910,1,2535,3591,16,
+0,406,1,2573,1664,
 1,2574,1670,1,2464,
 927,1,2577,1685,1,
 2578,1680,1,2533,1695,
-1,2470,3598,16,0,
-363,1,2619,3599,16,
-0,363,1,2509,1648,
+1,2470,3592,16,0,
+406,1,2619,3593,16,
+0,406,1,2509,1648,
 1,2575,1675,1,2579,
-1690,1,76,3600,19,
-362,1,76,3601,5,
-15,1,2581,3602,16,
-0,360,1,2518,1655,
+1690,1,75,3594,19,
+368,1,75,3595,5,
+15,1,2581,3596,16,
+0,366,1,2518,1655,
 1,2459,910,1,2535,
-3603,16,0,360,1,
+3597,16,0,366,1,
 2573,1664,1,2574,1670,
 1,2464,927,1,2577,
 1685,1,2578,1680,1,
-2533,1695,1,2470,3604,
-16,0,360,1,2619,
-3605,16,0,360,1,
+2533,1695,1,2470,3598,
+16,0,366,1,2619,
+3599,16,0,366,1,
 2509,1648,1,2575,1675,
-1,2579,1690,1,77,
-3606,19,500,1,77,
-3607,5,15,1,2581,
-3608,16,0,498,1,
+1,2579,1690,1,76,
+3600,19,365,1,76,
+3601,5,15,1,2581,
+3602,16,0,363,1,
 2518,1655,1,2459,910,
-1,2535,3609,16,0,
-498,1,2573,1664,1,
+1,2535,3603,16,0,
+363,1,2573,1664,1,
 2574,1670,1,2464,927,
 1,2577,1685,1,2578,
 1680,1,2533,1695,1,
-2470,3610,16,0,498,
-1,2619,3611,16,0,
-498,1,2509,1648,1,
+2470,3604,16,0,363,
+1,2619,3605,16,0,
+363,1,2509,1648,1,
 2575,1675,1,2579,1690,
-1,78,3612,19,359,
-1,78,3613,5,15,
-1,2581,3614,16,0,
-357,1,2518,1655,1,
-2459,910,1,2535,3615,
-16,0,357,1,2573,
+1,77,3606,19,362,
+1,77,3607,5,15,
+1,2581,3608,16,0,
+360,1,2518,1655,1,
+2459,910,1,2535,3609,
+16,0,360,1,2573,
 1664,1,2574,1670,1,
 2464,927,1,2577,1685,
 1,2578,1680,1,2533,
-1695,1,2470,3616,16,
-0,357,1,2619,3617,
-16,0,357,1,2509,
+1695,1,2470,3610,16,
+0,360,1,2619,3611,
+16,0,360,1,2509,
 1648,1,2575,1675,1,
-2579,1690,1,79,3618,
-19,356,1,79,3619,
-5,15,1,2581,3620,
-16,0,354,1,2518,
+2579,1690,1,78,3612,
+19,359,1,78,3613,
+5,15,1,2581,3614,
+16,0,357,1,2518,
 1655,1,2459,910,1,
-2535,3621,16,0,354,
+2535,3615,16,0,357,
 1,2573,1664,1,2574,
 1670,1,2464,927,1,
 2577,1685,1,2578,1680,
 1,2533,1695,1,2470,
-3622,16,0,354,1,
-2619,3623,16,0,354,
+3616,16,0,357,1,
+2619,3617,16,0,357,
 1,2509,1648,1,2575,
 1675,1,2579,1690,1,
-80,3624,19,497,1,
-80,3625,5,15,1,
-2581,3626,16,0,495,
+79,3618,19,356,1,
+79,3619,5,15,1,
+2581,3620,16,0,354,
 1,2518,1655,1,2459,
-910,1,2535,3627,16,
-0,495,1,2573,1664,
+910,1,2535,3621,16,
+0,354,1,2573,1664,
 1,2574,1670,1,2464,
 927,1,2577,1685,1,
 2578,1680,1,2533,1695,
-1,2470,3628,16,0,
-495,1,2619,3629,16,
-0,495,1,2509,1648,
+1,2470,3622,16,0,
+354,1,2619,3623,16,
+0,354,1,2509,1648,
 1,2575,1675,1,2579,
-1690,1,81,3630,19,
-389,1,81,3631,5,
-15,1,2581,3632,16,
-0,387,1,2518,1655,
+1690,1,80,3624,19,
+500,1,80,3625,5,
+15,1,2581,3626,16,
+0,498,1,2518,1655,
 1,2459,910,1,2535,
-3633,16,0,387,1,
+3627,16,0,498,1,
 2573,1664,1,2574,1670,
 1,2464,927,1,2577,
 1685,1,2578,1680,1,
-2533,1695,1,2470,3634,
-16,0,387,1,2619,
-3635,16,0,387,1,
+2533,1695,1,2470,3628,
+16,0,498,1,2619,
+3629,16,0,498,1,
 2509,1648,1,2575,1675,
-1,2579,1690,1,82,
-3636,19,494,1,82,
-3637,5,15,1,2581,
-3638,16,0,492,1,
+1,2579,1690,1,81,
+3630,19,585,1,81,
+3631,5,15,1,2581,
+3632,16,0,583,1,
 2518,1655,1,2459,910,
-1,2535,3639,16,0,
-492,1,2573,1664,1,
+1,2535,3633,16,0,
+583,1,2573,1664,1,
 2574,1670,1,2464,927,
 1,2577,1685,1,2578,
 1680,1,2533,1695,1,
-2470,3640,16,0,492,
-1,2619,3641,16,0,
-492,1,2509,1648,1,
+2470,3634,16,0,583,
+1,2619,3635,16,0,
+583,1,2509,1648,1,
 2575,1675,1,2579,1690,
-1,83,3642,19,386,
-1,83,3643,5,15,
-1,2581,3644,16,0,
-384,1,2518,1655,1,
-2459,910,1,2535,3645,
-16,0,384,1,2573,
+1,82,3636,19,497,
+1,82,3637,5,15,
+1,2581,3638,16,0,
+495,1,2518,1655,1,
+2459,910,1,2535,3639,
+16,0,495,1,2573,
 1664,1,2574,1670,1,
 2464,927,1,2577,1685,
 1,2578,1680,1,2533,
-1695,1,2470,3646,16,
-0,384,1,2619,3647,
-16,0,384,1,2509,
+1695,1,2470,3640,16,
+0,495,1,2619,3641,
+16,0,495,1,2509,
 1648,1,2575,1675,1,
-2579,1690,1,84,3648,
-19,383,1,84,3649,
-5,15,1,2581,3650,
-16,0,381,1,2518,
+2579,1690,1,83,3642,
+19,389,1,83,3643,
+5,15,1,2581,3644,
+16,0,387,1,2518,
 1655,1,2459,910,1,
-2535,3651,16,0,381,
+2535,3645,16,0,387,
 1,2573,1664,1,2574,
 1670,1,2464,927,1,
 2577,1685,1,2578,1680,
 1,2533,1695,1,2470,
-3652,16,0,381,1,
-2619,3653,16,0,381,
+3646,16,0,387,1,
+2619,3647,16,0,387,
 1,2509,1648,1,2575,
 1675,1,2579,1690,1,
-85,3654,19,371,1,
-85,3655,5,15,1,
-2581,3656,16,0,369,
+84,3648,19,386,1,
+84,3649,5,15,1,
+2581,3650,16,0,384,
 1,2518,1655,1,2459,
-910,1,2535,3657,16,
-0,369,1,2573,1664,
+910,1,2535,3651,16,
+0,384,1,2573,1664,
 1,2574,1670,1,2464,
 927,1,2577,1685,1,
 2578,1680,1,2533,1695,
-1,2470,3658,16,0,
-369,1,2619,3659,16,
-0,369,1,2509,1648,
+1,2470,3652,16,0,
+384,1,2619,3653,16,
+0,384,1,2509,1648,
 1,2575,1675,1,2579,
-1690,1,86,3660,19,
-368,1,86,3661,5,
-15,1,2581,3662,16,
-0,366,1,2518,1655,
+1690,1,85,3654,19,
+374,1,85,3655,5,
+15,1,2581,3656,16,
+0,372,1,2518,1655,
 1,2459,910,1,2535,
-3663,16,0,366,1,
+3657,16,0,372,1,
 2573,1664,1,2574,1670,
 1,2464,927,1,2577,
 1685,1,2578,1680,1,
-2533,1695,1,2470,3664,
-16,0,366,1,2619,
-3665,16,0,366,1,
+2533,1695,1,2470,3658,
+16,0,372,1,2619,
+3659,16,0,372,1,
 2509,1648,1,2575,1675,
-1,2579,1690,1,87,
-3666,19,353,1,87,
-3667,5,15,1,2581,
-3668,16,0,351,1,
+1,2579,1690,1,86,
+3660,19,371,1,86,
+3661,5,15,1,2581,
+3662,16,0,369,1,
 2518,1655,1,2459,910,
-1,2535,3669,16,0,
-351,1,2573,1664,1,
+1,2535,3663,16,0,
+369,1,2573,1664,1,
 2574,1670,1,2464,927,
 1,2577,1685,1,2578,
 1680,1,2533,1695,1,
-2470,3670,16,0,351,
-1,2619,3671,16,0,
-351,1,2509,1648,1,
+2470,3664,16,0,369,
+1,2619,3665,16,0,
+369,1,2509,1648,1,
 2575,1675,1,2579,1690,
-1,88,3672,19,380,
-1,88,3673,5,15,
-1,2581,3674,16,0,
-378,1,2518,1655,1,
-2459,910,1,2535,3675,
-16,0,378,1,2573,
+1,87,3666,19,353,
+1,87,3667,5,15,
+1,2581,3668,16,0,
+351,1,2518,1655,1,
+2459,910,1,2535,3669,
+16,0,351,1,2573,
 1664,1,2574,1670,1,
 2464,927,1,2577,1685,
 1,2578,1680,1,2533,
-1695,1,2470,3676,16,
-0,378,1,2619,3677,
-16,0,378,1,2509,
+1695,1,2470,3670,16,
+0,351,1,2619,3671,
+16,0,351,1,2509,
 1648,1,2575,1675,1,
-2579,1690,1,89,3678,
-19,374,1,89,3679,
-5,15,1,2581,3680,
-16,0,372,1,2518,
+2579,1690,1,88,3672,
+19,383,1,88,3673,
+5,15,1,2581,3674,
+16,0,381,1,2518,
 1655,1,2459,910,1,
-2535,3681,16,0,372,
+2535,3675,16,0,381,
 1,2573,1664,1,2574,
 1670,1,2464,927,1,
 2577,1685,1,2578,1680,
 1,2533,1695,1,2470,
-3682,16,0,372,1,
-2619,3683,16,0,372,
+3676,16,0,381,1,
+2619,3677,16,0,381,
 1,2509,1648,1,2575,
 1675,1,2579,1690,1,
-90,3684,19,377,1,
-90,3685,5,15,1,
-2581,3686,16,0,375,
+89,3678,19,377,1,
+89,3679,5,15,1,
+2581,3680,16,0,375,
 1,2518,1655,1,2459,
-910,1,2535,3687,16,
+910,1,2535,3681,16,
 0,375,1,2573,1664,
 1,2574,1670,1,2464,
 927,1,2577,1685,1,
 2578,1680,1,2533,1695,
-1,2470,3688,16,0,
-375,1,2619,3689,16,
+1,2470,3682,16,0,
+375,1,2619,3683,16,
 0,375,1,2509,1648,
 1,2575,1675,1,2579,
-1690,1,91,3690,19,
-491,1,91,3691,5,
-15,1,2581,3692,16,
-0,489,1,2518,1655,
+1690,1,90,3684,19,
+380,1,90,3685,5,
+15,1,2581,3686,16,
+0,378,1,2518,1655,
 1,2459,910,1,2535,
-3693,16,0,489,1,
+3687,16,0,378,1,
 2573,1664,1,2574,1670,
 1,2464,927,1,2577,
 1685,1,2578,1680,1,
-2533,1695,1,2470,3694,
-16,0,489,1,2619,
-3695,16,0,489,1,
+2533,1695,1,2470,3688,
+16,0,378,1,2619,
+3689,16,0,378,1,
 2509,1648,1,2575,1675,
-1,2579,1690,1,92,
-3696,19,133,1,92,
-3697,5,126,1,0,
-3698,16,0,189,1,
-1,2017,1,2,2023,
-1,3,2028,1,4,
-2033,1,5,2038,1,
-6,2043,1,7,2048,
-1,8,3699,16,0,
-131,1,1515,3700,16,
-0,165,1,2686,3701,
-16,0,173,1,2021,
-747,1,2022,3702,16,
-0,520,1,256,3703,
-16,0,173,1,2025,
-3704,16,0,524,1,
-18,3705,16,0,138,
-1,2027,3706,16,0,
-528,1,2029,754,1,
-2030,760,1,2031,765,
-1,2032,770,1,2033,
-775,1,277,3707,16,
-0,173,1,2035,781,
-1,2037,786,1,2039,
-791,1,32,3708,16,
-0,165,1,2041,797,
-1,2293,3709,16,0,
-173,1,2043,803,1,
-2711,3282,1,2045,808,
-1,41,3710,16,0,
-173,1,1297,3711,16,
-0,165,1,43,3712,
-16,0,173,1,1989,
-944,1,46,3713,16,
-0,178,1,1804,3714,
-16,0,165,1,299,
-3715,16,0,173,1,
-52,3716,16,0,165,
-1,509,3717,16,0,
-173,1,2318,3718,16,
-0,165,1,62,3719,
-16,0,196,1,65,
-3720,16,0,198,1,
-2075,3721,16,0,165,
-1,1574,828,1,2743,
-3272,1,71,3722,16,
-0,173,1,1775,3723,
-16,0,165,1,76,
-3724,16,0,173,1,
-1834,3725,16,0,165,
-1,2337,3726,16,0,
-165,1,79,3727,16,
-0,173,1,1335,3728,
-16,0,165,1,2512,
-3729,16,0,450,1,
-322,3730,16,0,173,
-1,85,3731,16,0,
-173,1,1261,3732,16,
-0,165,1,89,3733,
-16,0,173,1,346,
-3734,16,0,173,1,
-97,3735,16,0,173,
-1,2106,3736,16,0,
-165,1,102,3737,16,
-0,173,1,1860,850,
-1,1803,816,1,2364,
-856,1,1113,3738,16,
-0,158,1,112,3739,
-16,0,173,1,1117,
-3740,16,0,165,1,
-1873,864,1,1876,3741,
-16,0,165,1,372,
-3742,16,0,558,1,
-374,3743,16,0,560,
-1,124,3744,16,0,
-173,1,376,3745,16,
-0,562,1,378,3746,
-16,0,564,1,2136,
-871,1,381,3747,16,
-0,173,1,525,3748,
-16,0,173,1,137,
-3749,16,0,173,1,
-1901,3750,16,0,165,
-1,1153,3751,16,0,
-165,1,151,3752,16,
-0,173,1,1407,3753,
-16,0,165,1,1659,
-3754,16,0,165,1,
-2413,3755,16,0,165,
-1,406,3756,16,0,
-173,1,1371,3757,16,
-0,165,1,2105,843,
-1,166,3758,16,0,
-173,1,1622,3759,16,
-0,173,1,2683,3291,
+1,2579,1690,1,91,
+3690,19,494,1,91,
+3691,5,15,1,2581,
+3692,16,0,492,1,
+2518,1655,1,2459,910,
+1,2535,3693,16,0,
+492,1,2573,1664,1,
+2574,1670,1,2464,927,
+1,2577,1685,1,2578,
+1680,1,2533,1695,1,
+2470,3694,16,0,492,
+1,2619,3695,16,0,
+492,1,2509,1648,1,
+2575,1675,1,2579,1690,
+1,92,3696,19,133,
+1,92,3697,5,126,
+1,0,3698,16,0,
+189,1,1,2017,1,
+2,2023,1,3,2028,
+1,4,2033,1,5,
+2038,1,6,2043,1,
+7,2048,1,8,3699,
+16,0,131,1,1515,
+3700,16,0,165,1,
+2686,3701,16,0,173,
+1,2021,747,1,2022,
+3702,16,0,520,1,
+256,3703,16,0,173,
+1,2025,3704,16,0,
+524,1,18,3705,16,
+0,138,1,2027,3706,
+16,0,528,1,2029,
+754,1,2030,760,1,
+2031,765,1,2032,770,
+1,2033,775,1,277,
+3707,16,0,173,1,
+2035,781,1,2037,786,
+1,2039,791,1,32,
+3708,16,0,165,1,
+2041,797,1,2293,3709,
+16,0,173,1,2043,
+803,1,2711,3282,1,
+2045,808,1,41,3710,
+16,0,173,1,1297,
+3711,16,0,165,1,
+43,3712,16,0,173,
+1,1989,944,1,46,
+3713,16,0,178,1,
+1804,3714,16,0,165,
+1,299,3715,16,0,
+173,1,52,3716,16,
+0,165,1,509,3717,
+16,0,173,1,2318,
+3718,16,0,165,1,
+62,3719,16,0,196,
+1,65,3720,16,0,
+198,1,2075,3721,16,
+0,165,1,1574,828,
+1,2743,3272,1,71,
+3722,16,0,173,1,
+1775,3723,16,0,165,
+1,76,3724,16,0,
+173,1,1834,3725,16,
+0,165,1,2337,3726,
+16,0,165,1,79,
+3727,16,0,173,1,
+1335,3728,16,0,165,
+1,2512,3729,16,0,
+450,1,322,3730,16,
+0,173,1,85,3731,
+16,0,173,1,1261,
+3732,16,0,165,1,
+89,3733,16,0,173,
+1,346,3734,16,0,
+173,1,97,3735,16,
+0,173,1,2106,3736,
+16,0,165,1,102,
+3737,16,0,173,1,
+1860,850,1,1803,816,
+1,2364,856,1,1113,
+3738,16,0,158,1,
+112,3739,16,0,173,
+1,1117,3740,16,0,
+165,1,1873,864,1,
+1876,3741,16,0,165,
+1,372,3742,16,0,
+558,1,374,3743,16,
+0,560,1,124,3744,
+16,0,173,1,376,
+3745,16,0,562,1,
+378,3746,16,0,564,
+1,2136,871,1,381,
+3747,16,0,173,1,
+525,3748,16,0,173,
+1,137,3749,16,0,
+173,1,1901,3750,16,
+0,165,1,1153,3751,
+16,0,165,1,151,
+3752,16,0,173,1,
+1407,3753,16,0,165,
+1,1659,3754,16,0,
+165,1,2413,3755,16,
+0,165,1,406,3756,
+16,0,173,1,1371,
+3757,16,0,165,1,
+2105,843,1,166,3758,
+16,0,173,1,1622,
+3759,16,0,173,1,
+2683,3291,1,1931,889,
+1,1933,3760,16,0,
+165,1,431,3761,16,
+0,173,1,1585,3762,
+16,0,173,1,182,
+3763,16,0,173,1,
+1189,3764,16,0,165,
+1,1443,3765,16,0,
+165,1,1695,3766,16,
+0,165,1,2198,3767,
+16,0,165,1,447,
+3768,16,0,173,1,
+2458,904,1,2459,910,
+1,1958,3769,16,0,
+165,1,2462,917,1,
+1657,922,1,2464,927,
+1,2466,3302,1,459,
+3770,16,0,173,1,
+2468,3771,16,0,349,
+1,462,3772,16,0,
+173,1,2722,3297,1,
+2723,3773,16,0,189,
+1,199,3774,16,0,
+173,1,217,3775,16,
+0,173,1,2227,936,
+1,1225,3776,16,0,
+165,1,1479,3777,16,
+0,165,1,1731,3778,
+16,0,173,1,2741,
+3261,1,2742,3267,1,
+1990,3779,16,0,165,
+1,2744,3277,1,236,
+3780,16,0,173,1,
+1756,3781,16,0,165,
+1,93,3782,19,652,
+1,93,3783,5,95,
+1,256,3784,16,0,
+650,1,1261,3785,16,
+0,650,1,509,3786,
+16,0,650,1,1515,
+3787,16,0,650,1,
+2686,3788,16,0,650,
+1,2021,747,1,1775,
+3789,16,0,650,1,
+2029,754,1,2030,760,
+1,2031,765,1,2032,
+770,1,2033,775,1,
+277,3790,16,0,650,
+1,2035,781,1,2037,
+786,1,2039,791,1,
+32,3791,16,0,650,
+1,2041,797,1,2293,
+3792,16,0,650,1,
+2043,803,1,2045,808,
+1,41,3793,16,0,
+650,1,1297,3794,16,
+0,650,1,43,3795,
+16,0,650,1,1803,
+816,1,1804,3796,16,
+0,650,1,299,3797,
+16,0,650,1,52,
+3798,16,0,650,1,
+2318,3799,16,0,650,
+1,62,3800,16,0,
+650,1,2075,3801,16,
+0,650,1,1574,828,
+1,71,3802,16,0,
+650,1,76,3803,16,
+0,650,1,1834,3804,
+16,0,650,1,2337,
+3805,16,0,650,1,
+79,3806,16,0,650,
+1,1335,3807,16,0,
+650,1,322,3808,16,
+0,650,1,85,3809,
+16,0,650,1,89,
+3810,16,0,650,1,
+346,3811,16,0,650,
+1,2105,843,1,2106,
+3812,16,0,650,1,
+97,3813,16,0,650,
+1,1860,850,1,2364,
+856,1,102,3814,16,
+0,650,1,112,3815,
+16,0,650,1,1117,
+3816,16,0,650,1,
+1873,864,1,1876,3817,
+16,0,650,1,124,
+3818,16,0,650,1,
+2136,871,1,381,3819,
+16,0,650,1,525,
+3820,16,0,650,1,
+137,3821,16,0,650,
+1,1901,3822,16,0,
+650,1,1153,3823,16,
+0,650,1,151,3824,
+16,0,650,1,1407,
+3825,16,0,650,1,
+1659,3826,16,0,650,
+1,2413,3827,16,0,
+650,1,406,3828,16,
+0,650,1,1371,3829,
+16,0,650,1,166,
+3830,16,0,650,1,
+1622,3831,16,0,650,
 1,1931,889,1,1933,
-3760,16,0,165,1,
-431,3761,16,0,173,
-1,1585,3762,16,0,
-173,1,182,3763,16,
-0,173,1,1189,3764,
-16,0,165,1,1443,
-3765,16,0,165,1,
-1695,3766,16,0,165,
-1,2198,3767,16,0,
-165,1,447,3768,16,
-0,173,1,2458,904,
+3832,16,0,650,1,
+431,3833,16,0,650,
+1,1585,3834,16,0,
+650,1,182,3835,16,
+0,650,1,1189,3836,
+16,0,650,1,1443,
+3837,16,0,650,1,
+1695,3838,16,0,650,
+1,2198,3839,16,0,
+650,1,447,3840,16,
+0,650,1,2458,904,
 1,2459,910,1,1958,
-3769,16,0,165,1,
+3841,16,0,650,1,
 2462,917,1,1657,922,
-1,2464,927,1,2466,
-3302,1,459,3770,16,
-0,173,1,2468,3771,
-16,0,349,1,462,
-3772,16,0,173,1,
-2722,3297,1,2723,3773,
-16,0,189,1,199,
-3774,16,0,173,1,
-217,3775,16,0,173,
-1,2227,936,1,1225,
-3776,16,0,165,1,
-1479,3777,16,0,165,
-1,1731,3778,16,0,
-173,1,2741,3261,1,
-2742,3267,1,1990,3779,
-16,0,165,1,2744,
-3277,1,236,3780,16,
-0,173,1,1756,3781,
-16,0,165,1,93,
-3782,19,652,1,93,
-3783,5,95,1,256,
-3784,16,0,650,1,
-1261,3785,16,0,650,
-1,509,3786,16,0,
-650,1,1515,3787,16,
-0,650,1,2686,3788,
-16,0,650,1,2021,
-747,1,1775,3789,16,
-0,650,1,2029,754,
+1,2464,927,1,199,
+3842,16,0,650,1,
+459,3843,16,0,650,
+1,462,3844,16,0,
+650,1,217,3845,16,
+0,650,1,2227,936,
+1,1225,3846,16,0,
+650,1,1479,3847,16,
+0,650,1,1731,3848,
+16,0,650,1,1989,
+944,1,1990,3849,16,
+0,650,1,236,3850,
+16,0,650,1,1756,
+3851,16,0,650,1,
+94,3852,19,649,1,
+94,3853,5,95,1,
+256,3854,16,0,647,
+1,1261,3855,16,0,
+647,1,509,3856,16,
+0,647,1,1515,3857,
+16,0,647,1,2686,
+3858,16,0,647,1,
+2021,747,1,1775,3859,
+16,0,647,1,2029,
+754,1,2030,760,1,
+2031,765,1,2032,770,
+1,2033,775,1,277,
+3860,16,0,647,1,
+2035,781,1,2037,786,
+1,2039,791,1,32,
+3861,16,0,647,1,
+2041,797,1,2293,3862,
+16,0,647,1,2043,
+803,1,2045,808,1,
+41,3863,16,0,647,
+1,1297,3864,16,0,
+647,1,43,3865,16,
+0,647,1,1803,816,
+1,1804,3866,16,0,
+647,1,299,3867,16,
+0,647,1,52,3868,
+16,0,647,1,2318,
+3869,16,0,647,1,
+62,3870,16,0,647,
+1,2075,3871,16,0,
+647,1,1574,828,1,
+71,3872,16,0,647,
+1,76,3873,16,0,
+647,1,1834,3874,16,
+0,647,1,2337,3875,
+16,0,647,1,79,
+3876,16,0,647,1,
+1335,3877,16,0,647,
+1,322,3878,16,0,
+647,1,85,3879,16,
+0,647,1,89,3880,
+16,0,647,1,346,
+3881,16,0,647,1,
+2105,843,1,2106,3882,
+16,0,647,1,97,
+3883,16,0,647,1,
+1860,850,1,2364,856,
+1,102,3884,16,0,
+647,1,112,3885,16,
+0,647,1,1117,3886,
+16,0,647,1,1873,
+864,1,1876,3887,16,
+0,647,1,124,3888,
+16,0,647,1,2136,
+871,1,381,3889,16,
+0,647,1,525,3890,
+16,0,647,1,137,
+3891,16,0,647,1,
+1901,3892,16,0,647,
+1,1153,3893,16,0,
+647,1,151,3894,16,
+0,647,1,1407,3895,
+16,0,647,1,1659,
+3896,16,0,647,1,
+2413,3897,16,0,647,
+1,406,3898,16,0,
+647,1,1371,3899,16,
+0,647,1,166,3900,
+16,0,647,1,1622,
+3901,16,0,647,1,
+1931,889,1,1933,3902,
+16,0,647,1,431,
+3903,16,0,647,1,
+1585,3904,16,0,647,
+1,182,3905,16,0,
+647,1,1189,3906,16,
+0,647,1,1443,3907,
+16,0,647,1,1695,
+3908,16,0,647,1,
+2198,3909,16,0,647,
+1,447,3910,16,0,
+647,1,2458,904,1,
+2459,910,1,1958,3911,
+16,0,647,1,2462,
+917,1,1657,922,1,
+2464,927,1,199,3912,
+16,0,647,1,459,
+3913,16,0,647,1,
+462,3914,16,0,647,
+1,217,3915,16,0,
+647,1,2227,936,1,
+1225,3916,16,0,647,
+1,1479,3917,16,0,
+647,1,1731,3918,16,
+0,647,1,1989,944,
+1,1990,3919,16,0,
+647,1,236,3920,16,
+0,647,1,1756,3921,
+16,0,647,1,95,
+3922,19,646,1,95,
+3923,5,95,1,256,
+3924,16,0,644,1,
+1261,3925,16,0,644,
+1,509,3926,16,0,
+644,1,1515,3927,16,
+0,644,1,2686,3928,
+16,0,644,1,2021,
+747,1,1775,3929,16,
+0,644,1,2029,754,
 1,2030,760,1,2031,
 765,1,2032,770,1,
-2033,775,1,277,3790,
-16,0,650,1,2035,
+2033,775,1,277,3930,
+16,0,644,1,2035,
 781,1,2037,786,1,
-2039,791,1,32,3791,
-16,0,650,1,2041,
-797,1,2293,3792,16,
-0,650,1,2043,803,
+2039,791,1,32,3931,
+16,0,644,1,2041,
+797,1,2293,3932,16,
+0,644,1,2043,803,
 1,2045,808,1,41,
-3793,16,0,650,1,
-1297,3794,16,0,650,
-1,43,3795,16,0,
-650,1,1803,816,1,
-1804,3796,16,0,650,
-1,299,3797,16,0,
-650,1,52,3798,16,
-0,650,1,2318,3799,
-16,0,650,1,62,
-3800,16,0,650,1,
-2075,3801,16,0,650,
+3933,16,0,644,1,
+1297,3934,16,0,644,
+1,43,3935,16,0,
+644,1,1803,816,1,
+1804,3936,16,0,644,
+1,299,3937,16,0,
+644,1,52,3938,16,
+0,644,1,2318,3939,
+16,0,644,1,62,
+3940,16,0,644,1,
+2075,3941,16,0,644,
 1,1574,828,1,71,
-3802,16,0,650,1,
-76,3803,16,0,650,
-1,1834,3804,16,0,
-650,1,2337,3805,16,
-0,650,1,79,3806,
-16,0,650,1,1335,
-3807,16,0,650,1,
-322,3808,16,0,650,
-1,85,3809,16,0,
-650,1,89,3810,16,
-0,650,1,346,3811,
-16,0,650,1,2105,
-843,1,2106,3812,16,
-0,650,1,97,3813,
-16,0,650,1,1860,
+3942,16,0,644,1,
+76,3943,16,0,644,
+1,1834,3944,16,0,
+644,1,2337,3945,16,
+0,644,1,79,3946,
+16,0,644,1,1335,
+3947,16,0,644,1,
+322,3948,16,0,644,
+1,85,3949,16,0,
+644,1,89,3950,16,
+0,644,1,346,3951,
+16,0,644,1,2105,
+843,1,2106,3952,16,
+0,644,1,97,3953,
+16,0,644,1,1860,
 850,1,2364,856,1,
-102,3814,16,0,650,
-1,112,3815,16,0,
-650,1,1117,3816,16,
-0,650,1,1873,864,
-1,1876,3817,16,0,
-650,1,124,3818,16,
-0,650,1,2136,871,
-1,381,3819,16,0,
-650,1,525,3820,16,
-0,650,1,137,3821,
-16,0,650,1,1901,
-3822,16,0,650,1,
-1153,3823,16,0,650,
-1,151,3824,16,0,
-650,1,1407,3825,16,
-0,650,1,1659,3826,
-16,0,650,1,2413,
-3827,16,0,650,1,
-406,3828,16,0,650,
-1,1371,3829,16,0,
-650,1,166,3830,16,
-0,650,1,1622,3831,
-16,0,650,1,1931,
-889,1,1933,3832,16,
-0,650,1,431,3833,
-16,0,650,1,1585,
-3834,16,0,650,1,
-182,3835,16,0,650,
-1,1189,3836,16,0,
-650,1,1443,3837,16,
-0,650,1,1695,3838,
-16,0,650,1,2198,
-3839,16,0,650,1,
-447,3840,16,0,650,
+102,3954,16,0,644,
+1,112,3955,16,0,
+644,1,1117,3956,16,
+0,644,1,1873,864,
+1,1876,3957,16,0,
+644,1,124,3958,16,
+0,644,1,2136,871,
+1,381,3959,16,0,
+644,1,525,3960,16,
+0,644,1,137,3961,
+16,0,644,1,1901,
+3962,16,0,644,1,
+1153,3963,16,0,644,
+1,151,3964,16,0,
+644,1,1407,3965,16,
+0,644,1,1659,3966,
+16,0,644,1,2413,
+3967,16,0,644,1,
+406,3968,16,0,644,
+1,1371,3969,16,0,
+644,1,166,3970,16,
+0,644,1,1622,3971,
+16,0,644,1,1931,
+889,1,1933,3972,16,
+0,644,1,431,3973,
+16,0,644,1,1585,
+3974,16,0,644,1,
+182,3975,16,0,644,
+1,1189,3976,16,0,
+644,1,1443,3977,16,
+0,644,1,1695,3978,
+16,0,644,1,2198,
+3979,16,0,644,1,
+447,3980,16,0,644,
 1,2458,904,1,2459,
-910,1,1958,3841,16,
-0,650,1,2462,917,
+910,1,1958,3981,16,
+0,644,1,2462,917,
 1,1657,922,1,2464,
-927,1,199,3842,16,
-0,650,1,459,3843,
-16,0,650,1,462,
-3844,16,0,650,1,
-217,3845,16,0,650,
+927,1,199,3982,16,
+0,644,1,459,3983,
+16,0,644,1,462,
+3984,16,0,644,1,
+217,3985,16,0,644,
 1,2227,936,1,1225,
-3846,16,0,650,1,
-1479,3847,16,0,650,
-1,1731,3848,16,0,
-650,1,1989,944,1,
-1990,3849,16,0,650,
-1,236,3850,16,0,
-650,1,1756,3851,16,
-0,650,1,94,3852,
-19,649,1,94,3853,
-5,95,1,256,3854,
-16,0,647,1,1261,
-3855,16,0,647,1,
-509,3856,16,0,647,
-1,1515,3857,16,0,
-647,1,2686,3858,16,
-0,647,1,2021,747,
-1,1775,3859,16,0,
-647,1,2029,754,1,
-2030,760,1,2031,765,
-1,2032,770,1,2033,
-775,1,277,3860,16,
-0,647,1,2035,781,
-1,2037,786,1,2039,
-791,1,32,3861,16,
-0,647,1,2041,797,
-1,2293,3862,16,0,
-647,1,2043,803,1,
-2045,808,1,41,3863,
-16,0,647,1,1297,
-3864,16,0,647,1,
-43,3865,16,0,647,
-1,1803,816,1,1804,
-3866,16,0,647,1,
-299,3867,16,0,647,
-1,52,3868,16,0,
-647,1,2318,3869,16,
-0,647,1,62,3870,
-16,0,647,1,2075,
-3871,16,0,647,1,
-1574,828,1,71,3872,
-16,0,647,1,76,
-3873,16,0,647,1,
-1834,3874,16,0,647,
-1,2337,3875,16,0,
-647,1,79,3876,16,
-0,647,1,1335,3877,
-16,0,647,1,322,
-3878,16,0,647,1,
-85,3879,16,0,647,
-1,89,3880,16,0,
-647,1,346,3881,16,
-0,647,1,2105,843,
-1,2106,3882,16,0,
-647,1,97,3883,16,
-0,647,1,1860,850,
-1,2364,856,1,102,
-3884,16,0,647,1,
-112,3885,16,0,647,
-1,1117,3886,16,0,
-647,1,1873,864,1,
-1876,3887,16,0,647,
-1,124,3888,16,0,
-647,1,2136,871,1,
-381,3889,16,0,647,
-1,525,3890,16,0,
-647,1,137,3891,16,
-0,647,1,1901,3892,
-16,0,647,1,1153,
-3893,16,0,647,1,
-151,3894,16,0,647,
-1,1407,3895,16,0,
-647,1,1659,3896,16,
-0,647,1,2413,3897,
-16,0,647,1,406,
-3898,16,0,647,1,
-1371,3899,16,0,647,
-1,166,3900,16,0,
-647,1,1622,3901,16,
-0,647,1,1931,889,
-1,1933,3902,16,0,
-647,1,431,3903,16,
-0,647,1,1585,3904,
-16,0,647,1,182,
-3905,16,0,647,1,
-1189,3906,16,0,647,
-1,1443,3907,16,0,
-647,1,1695,3908,16,
-0,647,1,2198,3909,
-16,0,647,1,447,
-3910,16,0,647,1,
-2458,904,1,2459,910,
-1,1958,3911,16,0,
-647,1,2462,917,1,
-1657,922,1,2464,927,
-1,199,3912,16,0,
-647,1,459,3913,16,
-0,647,1,462,3914,
-16,0,647,1,217,
-3915,16,0,647,1,
-2227,936,1,1225,3916,
-16,0,647,1,1479,
-3917,16,0,647,1,
-1731,3918,16,0,647,
-1,1989,944,1,1990,
-3919,16,0,647,1,
-236,3920,16,0,647,
-1,1756,3921,16,0,
-647,1,95,3922,19,
-646,1,95,3923,5,
-95,1,256,3924,16,
-0,644,1,1261,3925,
-16,0,644,1,509,
-3926,16,0,644,1,
-1515,3927,16,0,644,
-1,2686,3928,16,0,
-644,1,2021,747,1,
-1775,3929,16,0,644,
-1,2029,754,1,2030,
-760,1,2031,765,1,
-2032,770,1,2033,775,
-1,277,3930,16,0,
-644,1,2035,781,1,
-2037,786,1,2039,791,
-1,32,3931,16,0,
-644,1,2041,797,1,
-2293,3932,16,0,644,
-1,2043,803,1,2045,
-808,1,41,3933,16,
-0,644,1,1297,3934,
-16,0,644,1,43,
-3935,16,0,644,1,
-1803,816,1,1804,3936,
-16,0,644,1,299,
-3937,16,0,644,1,
-52,3938,16,0,644,
-1,2318,3939,16,0,
-644,1,62,3940,16,
-0,644,1,2075,3941,
-16,0,644,1,1574,
-828,1,71,3942,16,
-0,644,1,76,3943,
-16,0,644,1,1834,
-3944,16,0,644,1,
-2337,3945,16,0,644,
-1,79,3946,16,0,
-644,1,1335,3947,16,
-0,644,1,322,3948,
-16,0,644,1,85,
-3949,16,0,644,1,
-89,3950,16,0,644,
-1,346,3951,16,0,
-644,1,2105,843,1,
-2106,3952,16,0,644,
-1,97,3953,16,0,
-644,1,1860,850,1,
-2364,856,1,102,3954,
-16,0,644,1,112,
-3955,16,0,644,1,
-1117,3956,16,0,644,
-1,1873,864,1,1876,
-3957,16,0,644,1,
-124,3958,16,0,644,
-1,2136,871,1,381,
-3959,16,0,644,1,
-525,3960,16,0,644,
-1,137,3961,16,0,
-644,1,1901,3962,16,
-0,644,1,1153,3963,
-16,0,644,1,151,
-3964,16,0,644,1,
-1407,3965,16,0,644,
-1,1659,3966,16,0,
-644,1,2413,3967,16,
-0,644,1,406,3968,
-16,0,644,1,1371,
-3969,16,0,644,1,
-166,3970,16,0,644,
-1,1622,3971,16,0,
-644,1,1931,889,1,
-1933,3972,16,0,644,
-1,431,3973,16,0,
-644,1,1585,3974,16,
-0,644,1,182,3975,
-16,0,644,1,1189,
-3976,16,0,644,1,
-1443,3977,16,0,644,
-1,1695,3978,16,0,
-644,1,2198,3979,16,
-0,644,1,447,3980,
-16,0,644,1,2458,
-904,1,2459,910,1,
-1958,3981,16,0,644,
-1,2462,917,1,1657,
-922,1,2464,927,1,
-199,3982,16,0,644,
-1,459,3983,16,0,
-644,1,462,3984,16,
-0,644,1,217,3985,
-16,0,644,1,2227,
-936,1,1225,3986,16,
-0,644,1,1479,3987,
-16,0,644,1,1731,
-3988,16,0,644,1,
-1989,944,1,1990,3989,
-16,0,644,1,236,
-3990,16,0,644,1,
-1756,3991,16,0,644,
-1,96,3992,19,103,
-1,96,3993,5,1,
-1,0,3994,16,0,
-104,1,97,3995,19,
-662,1,97,3996,5,
-1,1,0,3997,16,
-0,660,1,98,3998,
-19,258,1,98,3999,
-5,2,1,0,4000,
-16,0,332,1,2723,
-4001,16,0,256,1,
-99,4002,19,331,1,
-99,4003,5,2,1,
-0,4004,16,0,329,
-1,2723,4005,16,0,
-675,1,100,4006,19,
-251,1,100,4007,5,
-2,1,0,4008,16,
-0,685,1,2723,4009,
-16,0,249,1,101,
-4010,19,611,1,101,
-4011,5,4,1,0,
-4012,16,0,609,1,
-2723,4013,16,0,609,
-1,2734,4014,16,0,
-686,1,2664,4015,16,
-0,686,1,102,4016,
-19,471,1,102,4017,
-5,2,1,2470,4018,
-16,0,469,1,2581,
-4019,16,0,575,1,
-103,4020,19,510,1,
-103,4021,5,4,1,
-2619,4022,16,0,508,
-1,2535,4023,16,0,
-508,1,2470,4024,16,
-0,600,1,2581,4025,
-16,0,600,1,104,
-4026,19,593,1,104,
-4027,5,4,1,2619,
-4028,16,0,591,1,
-2535,4029,16,0,591,
-1,2470,4030,16,0,
-599,1,2581,4031,16,
-0,599,1,105,4032,
-19,516,1,105,4033,
-5,4,1,2619,4034,
-16,0,590,1,2535,
-4035,16,0,590,1,
-2470,4036,16,0,514,
-1,2581,4037,16,0,
-514,1,106,4038,19,
-141,1,106,4039,5,
-3,1,2520,4040,16,
-0,466,1,2670,4041,
-16,0,618,1,10,
-4042,16,0,139,1,
-107,4043,19,319,1,
-107,4044,5,1,1,
-2511,4045,16,0,317,
-1,108,4046,19,151,
-1,108,4047,5,17,
-1,0,4048,16,0,
-624,1,2075,4049,16,
-0,668,1,2520,4050,
-16,0,345,1,2337,
-4051,16,0,668,1,
-2413,4052,16,0,668,
-1,10,4053,16,0,
-345,1,2198,4054,16,
-0,668,1,1901,4055,
-16,0,668,1,2723,
-4056,16,0,624,1,
-2670,4057,16,0,345,
-1,21,4058,16,0,
-149,1,2106,4059,16,
-0,668,1,1804,4060,
-16,0,668,1,1990,
-4061,16,0,668,1,
-32,4062,16,0,668,
-1,1958,4063,16,0,
-668,1,1775,4064,16,
-0,668,1,109,4065,
-19,453,1,109,4066,
-5,1,1,2511,4067,
-16,0,451,1,110,
-4068,19,130,1,110,
-4069,5,18,1,0,
-4070,16,0,128,1,
-2075,4071,16,0,137,
-1,2520,4072,16,0,
-137,1,2337,4073,16,
-0,137,1,2413,4074,
-16,0,137,1,10,
-4075,16,0,137,1,
-2198,4076,16,0,137,
-1,1901,4077,16,0,
-137,1,52,4078,16,
-0,194,1,2670,4079,
-16,0,137,1,21,
-4080,16,0,137,1,
-2106,4081,16,0,137,
-1,1804,4082,16,0,
-137,1,1990,4083,16,
-0,137,1,2723,4084,
-16,0,128,1,32,
-4085,16,0,137,1,
-1958,4086,16,0,137,
-1,1775,4087,16,0,
-137,1,111,4088,19,
-459,1,111,4089,5,
-4,1,2619,4090,16,
-0,457,1,2535,4091,
-16,0,457,1,2470,
-4092,16,0,457,1,
-2581,4093,16,0,457,
-1,112,4094,19,447,
-1,112,4095,5,4,
-1,2619,4096,16,0,
-445,1,2535,4097,16,
-0,445,1,2470,4098,
-16,0,445,1,2581,
-4099,16,0,445,1,
-113,4100,19,681,1,
-113,4101,5,4,1,
-2619,4102,16,0,679,
-1,2535,4103,16,0,
-679,1,2470,4104,16,
-0,679,1,2581,4105,
-16,0,679,1,114,
-4106,19,344,1,114,
-4107,5,16,1,2516,
-4108,16,0,456,1,
-2075,4109,16,0,529,
-1,2337,4110,16,0,
-529,1,2507,4111,16,
-0,444,1,2413,4112,
-16,0,529,1,2198,
-4113,16,0,529,1,
-1901,4114,16,0,529,
-1,2531,4115,16,0,
-573,1,2681,4116,16,
-0,694,1,2106,4117,
-16,0,529,1,1804,
-4118,16,0,529,1,
-1990,4119,16,0,529,
-1,31,4120,16,0,
-342,1,32,4121,16,
-0,529,1,1958,4122,
-16,0,529,1,1775,
-4123,16,0,529,1,
-115,4124,19,301,1,
-115,4125,5,1,1,
-32,4126,16,0,299,
-1,116,4127,19,261,
-1,116,4128,5,11,
-1,2075,4129,16,0,
-601,1,2337,4130,16,
-0,265,1,2413,4131,
-16,0,472,1,1901,
-4132,16,0,400,1,
-2198,4133,16,0,321,
-1,2106,4134,16,0,
-637,1,1804,4135,16,
-0,284,1,1990,4136,
-16,0,517,1,32,
-4137,16,0,338,1,
-1958,4138,16,0,475,
-1,1775,4139,16,0,
-259,1,117,4140,19,
-607,1,117,4141,5,
-11,1,2075,4142,16,
-0,605,1,2337,4143,
-16,0,605,1,2413,
-4144,16,0,605,1,
-1901,4145,16,0,605,
-1,2198,4146,16,0,
-605,1,2106,4147,16,
-0,605,1,1804,4148,
-16,0,605,1,1990,
-4149,16,0,605,1,
-32,4150,16,0,605,
-1,1958,4151,16,0,
-605,1,1775,4152,16,
-0,605,1,118,4153,
-19,665,1,118,4154,
-5,11,1,2075,4155,
-16,0,663,1,2337,
-4156,16,0,663,1,
-2413,4157,16,0,663,
-1,1901,4158,16,0,
-663,1,2198,4159,16,
-0,663,1,2106,4160,
-16,0,663,1,1804,
-4161,16,0,663,1,
-1990,4162,16,0,663,
-1,32,4163,16,0,
-663,1,1958,4164,16,
-0,663,1,1775,4165,
-16,0,663,1,119,
-4166,19,161,1,119,
-4167,5,31,1,1901,
-4168,16,0,667,1,
-1479,4169,16,0,576,
-1,2075,4170,16,0,
-667,1,1695,4171,16,
-0,190,1,1756,4172,
-16,0,188,1,2413,
-4173,16,0,667,1,
-2198,4174,16,0,667,
-1,1876,4175,16,0,
-688,1,1659,4176,16,
-0,188,1,1443,4177,
-16,0,545,1,1117,
-4178,16,0,159,1,
-1990,4179,16,0,667,
-1,1189,4180,16,0,
-238,1,1775,4181,16,
-0,667,1,32,4182,
-16,0,667,1,2106,
-4183,16,0,667,1,
-1515,4184,16,0,603,
-1,2337,4185,16,0,
-667,1,52,4186,16,
-0,620,1,1804,4187,
-16,0,667,1,1261,
-4188,16,0,295,1,
-1153,4189,16,0,245,
-1,1225,4190,16,0,
-274,1,1335,4191,16,
-0,465,1,1933,4192,
-16,0,578,1,1834,
-4193,16,0,311,1,
-1297,4194,16,0,328,
-1,1407,4195,16,0,
-589,1,2318,4196,16,
-0,188,1,1958,4197,
-16,0,667,1,1371,
-4198,16,0,460,1,
-120,4199,19,554,1,
-120,4200,5,11,1,
-2075,4201,16,0,552,
-1,2337,4202,16,0,
-552,1,2413,4203,16,
-0,552,1,1901,4204,
-16,0,552,1,2198,
-4205,16,0,552,1,
-2106,4206,16,0,552,
-1,1804,4207,16,0,
-552,1,1990,4208,16,
-0,552,1,32,4209,
-16,0,552,1,1958,
-4210,16,0,552,1,
-1775,4211,16,0,552,
-1,121,4212,19,550,
-1,121,4213,5,11,
-1,2075,4214,16,0,
-548,1,2337,4215,16,
-0,548,1,2413,4216,
-16,0,548,1,1901,
-4217,16,0,548,1,
-2198,4218,16,0,548,
-1,2106,4219,16,0,
-548,1,1804,4220,16,
-0,548,1,1990,4221,
-16,0,548,1,32,
-4222,16,0,548,1,
-1958,4223,16,0,548,
-1,1775,4224,16,0,
-548,1,122,4225,19,
-597,1,122,4226,5,
-11,1,2075,4227,16,
-0,595,1,2337,4228,
-16,0,595,1,2413,
-4229,16,0,595,1,
-1901,4230,16,0,595,
-1,2198,4231,16,0,
-595,1,2106,4232,16,
-0,595,1,1804,4233,
-16,0,595,1,1990,
-4234,16,0,595,1,
-32,4235,16,0,595,
-1,1958,4236,16,0,
-595,1,1775,4237,16,
-0,595,1,123,4238,
-19,544,1,123,4239,
-5,11,1,2075,4240,
-16,0,542,1,2337,
-4241,16,0,542,1,
-2413,4242,16,0,542,
-1,1901,4243,16,0,
-542,1,2198,4244,16,
-0,542,1,2106,4245,
-16,0,542,1,1804,
-4246,16,0,542,1,
-1990,4247,16,0,542,
-1,32,4248,16,0,
-542,1,1958,4249,16,
-0,542,1,1775,4250,
-16,0,542,1,124,
-4251,19,541,1,124,
-4252,5,11,1,2075,
-4253,16,0,539,1,
-2337,4254,16,0,539,
-1,2413,4255,16,0,
-539,1,1901,4256,16,
-0,539,1,2198,4257,
-16,0,539,1,2106,
-4258,16,0,539,1,
-1804,4259,16,0,539,
-1,1990,4260,16,0,
-539,1,32,4261,16,
-0,539,1,1958,4262,
-16,0,539,1,1775,
-4263,16,0,539,1,
-125,4264,19,538,1,
-125,4265,5,11,1,
-2075,4266,16,0,536,
-1,2337,4267,16,0,
-536,1,2413,4268,16,
-0,536,1,1901,4269,
-16,0,536,1,2198,
-4270,16,0,536,1,
-2106,4271,16,0,536,
-1,1804,4272,16,0,
-536,1,1990,4273,16,
-0,536,1,32,4274,
-16,0,536,1,1958,
-4275,16,0,536,1,
-1775,4276,16,0,536,
-1,126,4277,19,535,
-1,126,4278,5,11,
-1,2075,4279,16,0,
-533,1,2337,4280,16,
-0,533,1,2413,4281,
-16,0,533,1,1901,
-4282,16,0,533,1,
-2198,4283,16,0,533,
-1,2106,4284,16,0,
-533,1,1804,4285,16,
-0,533,1,1990,4286,
-16,0,533,1,32,
-4287,16,0,533,1,
-1958,4288,16,0,533,
-1,1775,4289,16,0,
-533,1,127,4290,19,
-532,1,127,4291,5,
-11,1,2075,4292,16,
-0,530,1,2337,4293,
-16,0,530,1,2413,
-4294,16,0,530,1,
-1901,4295,16,0,530,
-1,2198,4296,16,0,
-530,1,2106,4297,16,
-0,530,1,1804,4298,
-16,0,530,1,1990,
-4299,16,0,530,1,
-32,4300,16,0,530,
-1,1958,4301,16,0,
-530,1,1775,4302,16,
-0,530,1,128,4303,
-19,147,1,128,4304,
-5,3,1,1756,4305,
-16,0,283,1,2318,
-4306,16,0,294,1,
-1659,4307,16,0,145,
-1,129,4308,19,571,
-1,129,4309,5,68,
-1,1901,4310,16,0,
-569,1,1479,4311,16,
-0,569,1,112,4312,
-16,0,569,1,2293,
-4313,16,0,569,1,
-1804,4314,16,0,569,
-1,431,4315,16,0,
-569,1,1443,4316,16,
-0,569,1,1756,4317,
-16,0,569,1,124,
-4318,16,0,569,1,
-525,4319,16,0,569,
-1,236,4320,16,0,
-569,1,346,4321,16,
-0,569,1,1876,4322,
-16,0,569,1,1659,
-4323,16,0,569,1,
-1225,4324,16,0,569,
-1,1117,4325,16,0,
-569,1,137,4326,16,
-0,569,1,2318,4327,
-16,0,569,1,1775,
-4328,16,0,569,1,
-32,4329,16,0,569,
-1,1407,4330,16,0,
-569,1,256,4331,16,
-0,569,1,459,4332,
-16,0,569,1,406,
-4333,16,0,569,1,
-41,4334,16,0,569,
-1,151,4335,16,0,
-569,1,43,4336,16,
-0,569,1,1585,4337,
-16,0,569,1,2686,
-4338,16,0,569,1,
-1990,4339,16,0,569,
-1,2337,4340,16,0,
-569,1,509,4341,16,
-0,569,1,52,4342,
-16,0,569,1,381,
-4343,16,0,569,1,
-447,4344,16,0,569,
-1,166,4345,16,0,
-569,1,462,4346,16,
-0,569,1,277,4347,
-16,0,569,1,1695,
-4348,16,0,569,1,
-62,4349,16,0,615,
-1,1153,4350,16,0,
-569,1,2106,4351,16,
-0,569,1,1335,4352,
-16,0,569,1,71,
-4353,16,0,569,1,
-182,4354,16,0,569,
-1,76,4355,16,0,
-569,1,79,4356,16,
-0,569,1,1933,4357,
-16,0,569,1,299,
-4358,16,0,569,1,
-85,4359,16,0,569,
-1,1515,4360,16,0,
-569,1,2198,4361,16,
-0,569,1,89,4362,
-16,0,569,1,1834,
-4363,16,0,569,1,
-1622,4364,16,0,569,
-1,2413,4365,16,0,
-569,1,2075,4366,16,
-0,569,1,1731,4367,
-16,0,569,1,97,
-4368,16,0,569,1,
-1297,4369,16,0,569,
-1,1189,4370,16,0,
-569,1,102,4371,16,
-0,569,1,1261,4372,
-16,0,569,1,322,
-4373,16,0,569,1,
-1958,4374,16,0,569,
-1,199,4375,16,0,
-569,1,1371,4376,16,
-0,569,1,217,4377,
-16,0,569,1,130,
-4378,19,632,1,130,
-4379,5,2,1,459,
-4380,16,0,630,1,
-41,4381,16,0,691,
-1,131,4382,19,636,
-1,131,4383,5,3,
-1,462,4384,16,0,
-634,1,459,4385,16,
-0,656,1,41,4386,
-16,0,656,1,132,
-4387,19,4388,4,36,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,1,132,4383,1,
-133,4389,19,567,1,
-133,4390,5,68,1,
-1901,4391,16,0,565,
-1,1479,4392,16,0,
-565,1,112,4393,16,
-0,565,1,2293,4394,
-16,0,565,1,1804,
-4395,16,0,565,1,
-431,4396,16,0,565,
-1,1443,4397,16,0,
-565,1,1756,4398,16,
-0,565,1,124,4399,
-16,0,565,1,525,
-4400,16,0,565,1,
-236,4401,16,0,565,
-1,346,4402,16,0,
-565,1,1876,4403,16,
-0,565,1,1659,4404,
-16,0,565,1,1225,
-4405,16,0,565,1,
-1117,4406,16,0,565,
-1,137,4407,16,0,
-565,1,2318,4408,16,
-0,565,1,1775,4409,
-16,0,565,1,32,
-4410,16,0,565,1,
-1407,4411,16,0,565,
-1,256,4412,16,0,
-565,1,459,4413,16,
-0,565,1,406,4414,
-16,0,565,1,41,
-4415,16,0,565,1,
-151,4416,16,0,565,
-1,43,4417,16,0,
-565,1,1585,4418,16,
-0,565,1,2686,4419,
-16,0,565,1,1990,
-4420,16,0,565,1,
-2337,4421,16,0,565,
-1,509,4422,16,0,
-565,1,52,4423,16,
-0,565,1,381,4424,
-16,0,565,1,447,
-4425,16,0,565,1,
-166,4426,16,0,565,
-1,462,4427,16,0,
-565,1,277,4428,16,
-0,565,1,1695,4429,
-16,0,565,1,62,
-4430,16,0,616,1,
-1153,4431,16,0,565,
-1,2106,4432,16,0,
-565,1,1335,4433,16,
-0,565,1,71,4434,
-16,0,565,1,182,
-4435,16,0,565,1,
-76,4436,16,0,565,
-1,79,4437,16,0,
-565,1,1933,4438,16,
-0,565,1,299,4439,
-16,0,565,1,85,
-4440,16,0,565,1,
-1515,4441,16,0,565,
-1,2198,4442,16,0,
-565,1,89,4443,16,
-0,565,1,1834,4444,
-16,0,565,1,1622,
-4445,16,0,565,1,
-2413,4446,16,0,565,
-1,2075,4447,16,0,
-565,1,1731,4448,16,
-0,565,1,97,4449,
-16,0,565,1,1297,
-4450,16,0,565,1,
-1189,4451,16,0,565,
-1,102,4452,16,0,
-565,1,1261,4453,16,
-0,565,1,322,4454,
-16,0,565,1,1958,
-4455,16,0,565,1,
-199,4456,16,0,565,
-1,1371,4457,16,0,
-565,1,217,4458,16,
-0,565,1,134,4459,
-19,4460,4,28,86,
-0,101,0,99,0,
-116,0,111,0,114,
-0,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,1,134,4390,
-1,135,4461,19,4462,
-4,32,82,0,111,
-0,116,0,97,0,
-116,0,105,0,111,
-0,110,0,67,0,
+3986,16,0,644,1,
+1479,3987,16,0,644,
+1,1731,3988,16,0,
+644,1,1989,944,1,
+1990,3989,16,0,644,
+1,236,3990,16,0,
+644,1,1756,3991,16,
+0,644,1,96,3992,
+19,103,1,96,3993,
+5,1,1,0,3994,
+16,0,104,1,97,
+3995,19,662,1,97,
+3996,5,1,1,0,
+3997,16,0,660,1,
+98,3998,19,258,1,
+98,3999,5,2,1,
+0,4000,16,0,332,
+1,2723,4001,16,0,
+256,1,99,4002,19,
+331,1,99,4003,5,
+2,1,0,4004,16,
+0,329,1,2723,4005,
+16,0,675,1,100,
+4006,19,251,1,100,
+4007,5,2,1,0,
+4008,16,0,685,1,
+2723,4009,16,0,249,
+1,101,4010,19,611,
+1,101,4011,5,4,
+1,0,4012,16,0,
+609,1,2723,4013,16,
+0,609,1,2734,4014,
+16,0,686,1,2664,
+4015,16,0,686,1,
+102,4016,19,471,1,
+102,4017,5,2,1,
+2470,4018,16,0,469,
+1,2581,4019,16,0,
+575,1,103,4020,19,
+510,1,103,4021,5,
+4,1,2619,4022,16,
+0,508,1,2535,4023,
+16,0,508,1,2470,
+4024,16,0,600,1,
+2581,4025,16,0,600,
+1,104,4026,19,593,
+1,104,4027,5,4,
+1,2619,4028,16,0,
+591,1,2535,4029,16,
+0,591,1,2470,4030,
+16,0,599,1,2581,
+4031,16,0,599,1,
+105,4032,19,516,1,
+105,4033,5,4,1,
+2619,4034,16,0,590,
+1,2535,4035,16,0,
+590,1,2470,4036,16,
+0,514,1,2581,4037,
+16,0,514,1,106,
+4038,19,141,1,106,
+4039,5,3,1,2520,
+4040,16,0,466,1,
+2670,4041,16,0,618,
+1,10,4042,16,0,
+139,1,107,4043,19,
+319,1,107,4044,5,
+1,1,2511,4045,16,
+0,317,1,108,4046,
+19,151,1,108,4047,
+5,17,1,0,4048,
+16,0,624,1,2075,
+4049,16,0,668,1,
+2520,4050,16,0,345,
+1,2337,4051,16,0,
+668,1,2413,4052,16,
+0,668,1,10,4053,
+16,0,345,1,2198,
+4054,16,0,668,1,
+1901,4055,16,0,668,
+1,2723,4056,16,0,
+624,1,2670,4057,16,
+0,345,1,21,4058,
+16,0,149,1,2106,
+4059,16,0,668,1,
+1804,4060,16,0,668,
+1,1990,4061,16,0,
+668,1,32,4062,16,
+0,668,1,1958,4063,
+16,0,668,1,1775,
+4064,16,0,668,1,
+109,4065,19,453,1,
+109,4066,5,1,1,
+2511,4067,16,0,451,
+1,110,4068,19,130,
+1,110,4069,5,18,
+1,0,4070,16,0,
+128,1,2075,4071,16,
+0,137,1,2520,4072,
+16,0,137,1,2337,
+4073,16,0,137,1,
+2413,4074,16,0,137,
+1,10,4075,16,0,
+137,1,2198,4076,16,
+0,137,1,1901,4077,
+16,0,137,1,52,
+4078,16,0,194,1,
+2670,4079,16,0,137,
+1,21,4080,16,0,
+137,1,2106,4081,16,
+0,137,1,1804,4082,
+16,0,137,1,1990,
+4083,16,0,137,1,
+2723,4084,16,0,128,
+1,32,4085,16,0,
+137,1,1958,4086,16,
+0,137,1,1775,4087,
+16,0,137,1,111,
+4088,19,459,1,111,
+4089,5,4,1,2619,
+4090,16,0,457,1,
+2535,4091,16,0,457,
+1,2470,4092,16,0,
+457,1,2581,4093,16,
+0,457,1,112,4094,
+19,447,1,112,4095,
+5,4,1,2619,4096,
+16,0,445,1,2535,
+4097,16,0,445,1,
+2470,4098,16,0,445,
+1,2581,4099,16,0,
+445,1,113,4100,19,
+681,1,113,4101,5,
+4,1,2619,4102,16,
+0,679,1,2535,4103,
+16,0,679,1,2470,
+4104,16,0,679,1,
+2581,4105,16,0,679,
+1,114,4106,19,344,
+1,114,4107,5,16,
+1,2516,4108,16,0,
+456,1,2075,4109,16,
+0,529,1,2337,4110,
+16,0,529,1,2507,
+4111,16,0,444,1,
+2413,4112,16,0,529,
+1,2198,4113,16,0,
+529,1,1901,4114,16,
+0,529,1,2531,4115,
+16,0,573,1,2681,
+4116,16,0,694,1,
+2106,4117,16,0,529,
+1,1804,4118,16,0,
+529,1,1990,4119,16,
+0,529,1,31,4120,
+16,0,342,1,32,
+4121,16,0,529,1,
+1958,4122,16,0,529,
+1,1775,4123,16,0,
+529,1,115,4124,19,
+301,1,115,4125,5,
+1,1,32,4126,16,
+0,299,1,116,4127,
+19,261,1,116,4128,
+5,11,1,2075,4129,
+16,0,601,1,2337,
+4130,16,0,265,1,
+2413,4131,16,0,472,
+1,1901,4132,16,0,
+400,1,2198,4133,16,
+0,321,1,2106,4134,
+16,0,637,1,1804,
+4135,16,0,284,1,
+1990,4136,16,0,517,
+1,32,4137,16,0,
+338,1,1958,4138,16,
+0,475,1,1775,4139,
+16,0,259,1,117,
+4140,19,607,1,117,
+4141,5,11,1,2075,
+4142,16,0,605,1,
+2337,4143,16,0,605,
+1,2413,4144,16,0,
+605,1,1901,4145,16,
+0,605,1,2198,4146,
+16,0,605,1,2106,
+4147,16,0,605,1,
+1804,4148,16,0,605,
+1,1990,4149,16,0,
+605,1,32,4150,16,
+0,605,1,1958,4151,
+16,0,605,1,1775,
+4152,16,0,605,1,
+118,4153,19,665,1,
+118,4154,5,11,1,
+2075,4155,16,0,663,
+1,2337,4156,16,0,
+663,1,2413,4157,16,
+0,663,1,1901,4158,
+16,0,663,1,2198,
+4159,16,0,663,1,
+2106,4160,16,0,663,
+1,1804,4161,16,0,
+663,1,1990,4162,16,
+0,663,1,32,4163,
+16,0,663,1,1958,
+4164,16,0,663,1,
+1775,4165,16,0,663,
+1,119,4166,19,161,
+1,119,4167,5,31,
+1,1901,4168,16,0,
+667,1,1479,4169,16,
+0,576,1,2075,4170,
+16,0,667,1,1695,
+4171,16,0,190,1,
+1756,4172,16,0,188,
+1,2413,4173,16,0,
+667,1,2198,4174,16,
+0,667,1,1876,4175,
+16,0,688,1,1659,
+4176,16,0,188,1,
+1443,4177,16,0,545,
+1,1117,4178,16,0,
+159,1,1990,4179,16,
+0,667,1,1189,4180,
+16,0,238,1,1775,
+4181,16,0,667,1,
+32,4182,16,0,667,
+1,2106,4183,16,0,
+667,1,1515,4184,16,
+0,603,1,2337,4185,
+16,0,667,1,52,
+4186,16,0,620,1,
+1804,4187,16,0,667,
+1,1261,4188,16,0,
+295,1,1153,4189,16,
+0,245,1,1225,4190,
+16,0,274,1,1335,
+4191,16,0,465,1,
+1933,4192,16,0,578,
+1,1834,4193,16,0,
+311,1,1297,4194,16,
+0,328,1,1407,4195,
+16,0,589,1,2318,
+4196,16,0,188,1,
+1958,4197,16,0,667,
+1,1371,4198,16,0,
+460,1,120,4199,19,
+554,1,120,4200,5,
+11,1,2075,4201,16,
+0,552,1,2337,4202,
+16,0,552,1,2413,
+4203,16,0,552,1,
+1901,4204,16,0,552,
+1,2198,4205,16,0,
+552,1,2106,4206,16,
+0,552,1,1804,4207,
+16,0,552,1,1990,
+4208,16,0,552,1,
+32,4209,16,0,552,
+1,1958,4210,16,0,
+552,1,1775,4211,16,
+0,552,1,121,4212,
+19,550,1,121,4213,
+5,11,1,2075,4214,
+16,0,548,1,2337,
+4215,16,0,548,1,
+2413,4216,16,0,548,
+1,1901,4217,16,0,
+548,1,2198,4218,16,
+0,548,1,2106,4219,
+16,0,548,1,1804,
+4220,16,0,548,1,
+1990,4221,16,0,548,
+1,32,4222,16,0,
+548,1,1958,4223,16,
+0,548,1,1775,4224,
+16,0,548,1,122,
+4225,19,597,1,122,
+4226,5,11,1,2075,
+4227,16,0,595,1,
+2337,4228,16,0,595,
+1,2413,4229,16,0,
+595,1,1901,4230,16,
+0,595,1,2198,4231,
+16,0,595,1,2106,
+4232,16,0,595,1,
+1804,4233,16,0,595,
+1,1990,4234,16,0,
+595,1,32,4235,16,
+0,595,1,1958,4236,
+16,0,595,1,1775,
+4237,16,0,595,1,
+123,4238,19,544,1,
+123,4239,5,11,1,
+2075,4240,16,0,542,
+1,2337,4241,16,0,
+542,1,2413,4242,16,
+0,542,1,1901,4243,
+16,0,542,1,2198,
+4244,16,0,542,1,
+2106,4245,16,0,542,
+1,1804,4246,16,0,
+542,1,1990,4247,16,
+0,542,1,32,4248,
+16,0,542,1,1958,
+4249,16,0,542,1,
+1775,4250,16,0,542,
+1,124,4251,19,541,
+1,124,4252,5,11,
+1,2075,4253,16,0,
+539,1,2337,4254,16,
+0,539,1,2413,4255,
+16,0,539,1,1901,
+4256,16,0,539,1,
+2198,4257,16,0,539,
+1,2106,4258,16,0,
+539,1,1804,4259,16,
+0,539,1,1990,4260,
+16,0,539,1,32,
+4261,16,0,539,1,
+1958,4262,16,0,539,
+1,1775,4263,16,0,
+539,1,125,4264,19,
+538,1,125,4265,5,
+11,1,2075,4266,16,
+0,536,1,2337,4267,
+16,0,536,1,2413,
+4268,16,0,536,1,
+1901,4269,16,0,536,
+1,2198,4270,16,0,
+536,1,2106,4271,16,
+0,536,1,1804,4272,
+16,0,536,1,1990,
+4273,16,0,536,1,
+32,4274,16,0,536,
+1,1958,4275,16,0,
+536,1,1775,4276,16,
+0,536,1,126,4277,
+19,535,1,126,4278,
+5,11,1,2075,4279,
+16,0,533,1,2337,
+4280,16,0,533,1,
+2413,4281,16,0,533,
+1,1901,4282,16,0,
+533,1,2198,4283,16,
+0,533,1,2106,4284,
+16,0,533,1,1804,
+4285,16,0,533,1,
+1990,4286,16,0,533,
+1,32,4287,16,0,
+533,1,1958,4288,16,
+0,533,1,1775,4289,
+16,0,533,1,127,
+4290,19,532,1,127,
+4291,5,11,1,2075,
+4292,16,0,530,1,
+2337,4293,16,0,530,
+1,2413,4294,16,0,
+530,1,1901,4295,16,
+0,530,1,2198,4296,
+16,0,530,1,2106,
+4297,16,0,530,1,
+1804,4298,16,0,530,
+1,1990,4299,16,0,
+530,1,32,4300,16,
+0,530,1,1958,4301,
+16,0,530,1,1775,
+4302,16,0,530,1,
+128,4303,19,147,1,
+128,4304,5,3,1,
+1756,4305,16,0,283,
+1,2318,4306,16,0,
+294,1,1659,4307,16,
+0,145,1,129,4308,
+19,571,1,129,4309,
+5,68,1,1901,4310,
+16,0,569,1,1479,
+4311,16,0,569,1,
+112,4312,16,0,569,
+1,2293,4313,16,0,
+569,1,1804,4314,16,
+0,569,1,431,4315,
+16,0,569,1,1443,
+4316,16,0,569,1,
+1756,4317,16,0,569,
+1,124,4318,16,0,
+569,1,525,4319,16,
+0,569,1,236,4320,
+16,0,569,1,346,
+4321,16,0,569,1,
+1876,4322,16,0,569,
+1,1659,4323,16,0,
+569,1,1225,4324,16,
+0,569,1,1117,4325,
+16,0,569,1,137,
+4326,16,0,569,1,
+2318,4327,16,0,569,
+1,1775,4328,16,0,
+569,1,32,4329,16,
+0,569,1,1407,4330,
+16,0,569,1,256,
+4331,16,0,569,1,
+459,4332,16,0,569,
+1,406,4333,16,0,
+569,1,41,4334,16,
+0,569,1,151,4335,
+16,0,569,1,43,
+4336,16,0,569,1,
+1585,4337,16,0,569,
+1,2686,4338,16,0,
+569,1,1990,4339,16,
+0,569,1,2337,4340,
+16,0,569,1,509,
+4341,16,0,569,1,
+52,4342,16,0,569,
+1,381,4343,16,0,
+569,1,447,4344,16,
+0,569,1,166,4345,
+16,0,569,1,462,
+4346,16,0,569,1,
+277,4347,16,0,569,
+1,1695,4348,16,0,
+569,1,62,4349,16,
+0,615,1,1153,4350,
+16,0,569,1,2106,
+4351,16,0,569,1,
+1335,4352,16,0,569,
+1,71,4353,16,0,
+569,1,182,4354,16,
+0,569,1,76,4355,
+16,0,569,1,79,
+4356,16,0,569,1,
+1933,4357,16,0,569,
+1,299,4358,16,0,
+569,1,85,4359,16,
+0,569,1,1515,4360,
+16,0,569,1,2198,
+4361,16,0,569,1,
+89,4362,16,0,569,
+1,1834,4363,16,0,
+569,1,1622,4364,16,
+0,569,1,2413,4365,
+16,0,569,1,2075,
+4366,16,0,569,1,
+1731,4367,16,0,569,
+1,97,4368,16,0,
+569,1,1297,4369,16,
+0,569,1,1189,4370,
+16,0,569,1,102,
+4371,16,0,569,1,
+1261,4372,16,0,569,
+1,322,4373,16,0,
+569,1,1958,4374,16,
+0,569,1,199,4375,
+16,0,569,1,1371,
+4376,16,0,569,1,
+217,4377,16,0,569,
+1,130,4378,19,632,
+1,130,4379,5,2,
+1,459,4380,16,0,
+630,1,41,4381,16,
+0,691,1,131,4382,
+19,636,1,131,4383,
+5,3,1,462,4384,
+16,0,634,1,459,
+4385,16,0,656,1,
+41,4386,16,0,656,
+1,132,4387,19,4388,
+4,36,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,1,132,
+4383,1,133,4389,19,
+567,1,133,4390,5,
+68,1,1901,4391,16,
+0,565,1,1479,4392,
+16,0,565,1,112,
+4393,16,0,565,1,
+2293,4394,16,0,565,
+1,1804,4395,16,0,
+565,1,431,4396,16,
+0,565,1,1443,4397,
+16,0,565,1,1756,
+4398,16,0,565,1,
+124,4399,16,0,565,
+1,525,4400,16,0,
+565,1,236,4401,16,
+0,565,1,346,4402,
+16,0,565,1,1876,
+4403,16,0,565,1,
+1659,4404,16,0,565,
+1,1225,4405,16,0,
+565,1,1117,4406,16,
+0,565,1,137,4407,
+16,0,565,1,2318,
+4408,16,0,565,1,
+1775,4409,16,0,565,
+1,32,4410,16,0,
+565,1,1407,4411,16,
+0,565,1,256,4412,
+16,0,565,1,459,
+4413,16,0,565,1,
+406,4414,16,0,565,
+1,41,4415,16,0,
+565,1,151,4416,16,
+0,565,1,43,4417,
+16,0,565,1,1585,
+4418,16,0,565,1,
+2686,4419,16,0,565,
+1,1990,4420,16,0,
+565,1,2337,4421,16,
+0,565,1,509,4422,
+16,0,565,1,52,
+4423,16,0,565,1,
+381,4424,16,0,565,
+1,447,4425,16,0,
+565,1,166,4426,16,
+0,565,1,462,4427,
+16,0,565,1,277,
+4428,16,0,565,1,
+1695,4429,16,0,565,
+1,62,4430,16,0,
+616,1,1153,4431,16,
+0,565,1,2106,4432,
+16,0,565,1,1335,
+4433,16,0,565,1,
+71,4434,16,0,565,
+1,182,4435,16,0,
+565,1,76,4436,16,
+0,565,1,79,4437,
+16,0,565,1,1933,
+4438,16,0,565,1,
+299,4439,16,0,565,
+1,85,4440,16,0,
+565,1,1515,4441,16,
+0,565,1,2198,4442,
+16,0,565,1,89,
+4443,16,0,565,1,
+1834,4444,16,0,565,
+1,1622,4445,16,0,
+565,1,2413,4446,16,
+0,565,1,2075,4447,
+16,0,565,1,1731,
+4448,16,0,565,1,
+97,4449,16,0,565,
+1,1297,4450,16,0,
+565,1,1189,4451,16,
+0,565,1,102,4452,
+16,0,565,1,1261,
+4453,16,0,565,1,
+322,4454,16,0,565,
+1,1958,4455,16,0,
+565,1,199,4456,16,
+0,565,1,1371,4457,
+16,0,565,1,217,
+4458,16,0,565,1,
+134,4459,19,4460,4,
+28,86,0,101,0,
+99,0,116,0,111,
+0,114,0,67,0,
 111,0,110,0,115,
 0,116,0,97,0,
 110,0,116,0,1,
-135,4390,1,136,4463,
-19,4464,4,24,76,
-0,105,0,115,0,
-116,0,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,1,136,
-4390,1,137,4465,19,
-169,1,137,4466,5,
-67,1,1901,4467,16,
-0,612,1,1479,4468,
-16,0,556,1,112,
-4469,16,0,247,1,
-2293,4470,16,0,273,
-1,1804,4471,16,0,
-612,1,431,4472,16,
-0,604,1,1443,4473,
-16,0,485,1,1756,
-4474,16,0,701,1,
-124,4475,16,0,255,
-1,525,4476,16,0,
-304,1,236,4477,16,
-0,350,1,346,4478,
-16,0,519,1,1876,
-4479,16,0,320,1,
-1659,4480,16,0,701,
-1,1225,4481,16,0,
-246,1,1117,4482,16,
-0,220,1,137,4483,
-16,0,272,1,2318,
-4484,16,0,701,1,
-1775,4485,16,0,612,
-1,32,4486,16,0,
-612,1,1407,4487,16,
-0,504,1,256,4488,
-16,0,404,1,459,
-4489,16,0,167,1,
-406,4490,16,0,582,
-1,41,4491,16,0,
-167,1,151,4492,16,
-0,282,1,43,4493,
-16,0,658,1,2686,
-4494,16,0,700,1,
-1990,4495,16,0,612,
-1,2337,4496,16,0,
-612,1,509,4497,16,
-0,677,1,52,4498,
-16,0,622,1,381,
-4499,16,0,574,1,
-447,4500,16,0,304,
-1,166,4501,16,0,
-293,1,462,4502,16,
-0,167,1,277,4503,
-16,0,448,1,1695,
-4504,16,0,270,1,
-1261,4505,16,0,281,
-1,1153,4506,16,0,
-174,1,2106,4507,16,
-0,612,1,1335,4508,
-16,0,335,1,71,
-4509,16,0,204,1,
-182,4510,16,0,304,
-1,76,4511,16,0,
-572,1,79,4512,16,
-0,219,1,1933,4513,
-16,0,416,1,299,
-4514,16,0,468,1,
-85,4515,16,0,482,
-1,1515,4516,16,0,
-581,1,2198,4517,16,
-0,612,1,89,4518,
-16,0,228,1,1834,
-4519,16,0,292,1,
-1622,4520,16,0,676,
-1,2413,4521,16,0,
-612,1,2075,4522,16,
-0,612,1,1731,4523,
-16,0,248,1,97,
-4524,16,0,420,1,
-1297,4525,16,0,337,
-1,1189,4526,16,0,
-218,1,102,4527,16,
-0,236,1,1585,4528,
-16,0,690,1,322,
-4529,16,0,483,1,
-1958,4530,16,0,612,
-1,199,4531,16,0,
-315,1,1371,4532,16,
-0,405,1,217,4533,
-16,0,334,1,138,
-4534,19,4535,4,36,
+134,4390,1,135,4461,
+19,4462,4,32,82,
+0,111,0,116,0,
+97,0,116,0,105,
+0,111,0,110,0,
 67,0,111,0,110,
 0,115,0,116,0,
 97,0,110,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,138,4466,1,
-139,4536,19,4537,4,
-30,73,0,100,0,
-101,0,110,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,139,4466,1,
-140,4538,19,4539,4,
-36,73,0,100,0,
-101,0,110,0,116,
-0,68,0,111,0,
-116,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,1,140,4466,
-1,141,4540,19,4541,
-4,44,70,0,117,
-0,110,0,99,0,
-116,0,105,0,111,
-0,110,0,67,0,
-97,0,108,0,108,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,141,4466,1,
-142,4542,19,4543,4,
-32,66,0,105,0,
-110,0,97,0,114,
-0,121,0,69,0,
+0,1,135,4390,1,
+136,4463,19,4464,4,
+24,76,0,105,0,
+115,0,116,0,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+1,136,4390,1,137,
+4465,19,169,1,137,
+4466,5,67,1,1901,
+4467,16,0,612,1,
+1479,4468,16,0,556,
+1,112,4469,16,0,
+247,1,2293,4470,16,
+0,273,1,1804,4471,
+16,0,612,1,431,
+4472,16,0,604,1,
+1443,4473,16,0,485,
+1,1756,4474,16,0,
+701,1,124,4475,16,
+0,255,1,525,4476,
+16,0,304,1,236,
+4477,16,0,350,1,
+346,4478,16,0,519,
+1,1876,4479,16,0,
+320,1,1659,4480,16,
+0,701,1,1225,4481,
+16,0,246,1,1117,
+4482,16,0,220,1,
+137,4483,16,0,272,
+1,2318,4484,16,0,
+701,1,1775,4485,16,
+0,612,1,32,4486,
+16,0,612,1,1407,
+4487,16,0,504,1,
+256,4488,16,0,404,
+1,459,4489,16,0,
+167,1,406,4490,16,
+0,582,1,41,4491,
+16,0,167,1,151,
+4492,16,0,282,1,
+43,4493,16,0,658,
+1,2686,4494,16,0,
+700,1,1990,4495,16,
+0,612,1,2337,4496,
+16,0,612,1,509,
+4497,16,0,677,1,
+52,4498,16,0,622,
+1,381,4499,16,0,
+574,1,447,4500,16,
+0,304,1,166,4501,
+16,0,293,1,462,
+4502,16,0,167,1,
+277,4503,16,0,448,
+1,1695,4504,16,0,
+270,1,1261,4505,16,
+0,281,1,1153,4506,
+16,0,174,1,2106,
+4507,16,0,612,1,
+1335,4508,16,0,335,
+1,71,4509,16,0,
+204,1,182,4510,16,
+0,304,1,76,4511,
+16,0,572,1,79,
+4512,16,0,219,1,
+1933,4513,16,0,416,
+1,299,4514,16,0,
+468,1,85,4515,16,
+0,482,1,1515,4516,
+16,0,581,1,2198,
+4517,16,0,612,1,
+89,4518,16,0,228,
+1,1834,4519,16,0,
+292,1,1622,4520,16,
+0,676,1,2413,4521,
+16,0,612,1,2075,
+4522,16,0,612,1,
+1731,4523,16,0,248,
+1,97,4524,16,0,
+420,1,1297,4525,16,
+0,337,1,1189,4526,
+16,0,218,1,102,
+4527,16,0,236,1,
+1585,4528,16,0,690,
+1,322,4529,16,0,
+483,1,1958,4530,16,
+0,612,1,199,4531,
+16,0,315,1,1371,
+4532,16,0,405,1,
+217,4533,16,0,334,
+1,138,4534,19,4535,
+4,36,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
+0,116,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
-0,110,0,1,142,
-4466,1,143,4544,19,
-4545,4,30,85,0,
-110,0,97,0,114,
-0,121,0,69,0,
+0,110,0,1,138,
+4466,1,139,4536,19,
+4537,4,30,73,0,
+100,0,101,0,110,
+0,116,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
-0,110,0,1,143,
-4466,1,144,4546,19,
-4547,4,36,84,0,
-121,0,112,0,101,
-0,99,0,97,0,
-115,0,116,0,69,
+0,110,0,1,139,
+4466,1,140,4538,19,
+4539,4,36,73,0,
+100,0,101,0,110,
+0,116,0,68,0,
+111,0,116,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,1,
-144,4466,1,145,4548,
-19,4549,4,42,80,
-0,97,0,114,0,
-101,0,110,0,116,
-0,104,0,101,0,
-115,0,105,0,115,
+140,4466,1,141,4540,
+19,4541,4,44,70,
+0,117,0,110,0,
+99,0,116,0,105,
+0,111,0,110,0,
+67,0,97,0,108,
+0,108,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,141,
+4466,1,142,4542,19,
+4543,4,32,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+1,142,4466,1,143,
+4544,19,4545,4,30,
+85,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+1,143,4466,1,144,
+4546,19,4547,4,36,
+84,0,121,0,112,
+0,101,0,99,0,
+97,0,115,0,116,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,1,145,4466,1,
-146,4550,19,4551,4,
-56,73,0,110,0,
+0,1,144,4466,1,
+145,4548,19,4549,4,
+42,80,0,97,0,
+114,0,101,0,110,
+0,116,0,104,0,
+101,0,115,0,105,
+0,115,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,145,
+4466,1,146,4550,19,
+4551,4,56,73,0,
+110,0,99,0,114,
+0,101,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
 99,0,114,0,101,
 0,109,0,101,0,
+110,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,1,
+146,4466,1,148,4552,
+19,728,1,148,3993,
+1,149,4553,19,733,
+1,149,3993,1,150,
+4554,19,3280,1,150,
+3996,1,151,4555,19,
+3270,1,151,3996,1,
+152,4556,19,3275,1,
+152,3996,1,153,4557,
+19,3265,1,153,3996,
+1,154,4558,19,3300,
+1,154,3999,1,155,
+4559,19,3286,1,155,
+3999,1,156,4560,19,
+3295,1,156,4003,1,
+157,4561,19,3305,1,
+157,4003,1,158,4562,
+19,711,1,158,4007,
+1,159,4563,19,722,
+1,159,4007,1,160,
+4564,19,738,1,160,
+4011,1,161,4565,19,
+717,1,161,4011,1,
+162,4566,19,1693,1,
+162,4017,1,163,4567,
+19,1678,1,163,4017,
+1,164,4568,19,1683,
+1,164,4017,1,165,
+4569,19,1673,1,165,
+4017,1,166,4570,19,
+1688,1,166,4017,1,
+167,4571,19,1668,1,
+167,4017,1,168,4572,
+19,1699,1,168,4021,
+1,169,4573,19,1659,
+1,169,4027,1,170,
+4574,19,1652,1,170,
+4033,1,171,4575,19,
+1739,1,171,4039,1,
+172,4576,19,1712,1,
+172,4039,1,173,4577,
+19,2069,1,173,4044,
+1,174,4578,19,2063,
+1,174,4066,1,175,
+4579,19,1145,1,175,
+4047,1,176,4580,19,
+930,1,176,4107,1,
+177,4581,19,914,1,
+177,4107,1,178,4582,
+19,920,1,178,4125,
+1,179,4583,19,908,
+1,179,4125,1,180,
+4584,19,1173,1,180,
+4141,1,181,4585,19,
+811,1,181,4128,1,
+182,4586,19,925,1,
+182,4128,1,183,4587,
+19,806,1,183,4128,
+1,184,4588,19,831,
+1,184,4128,1,185,
+4589,19,800,1,185,
+4128,1,186,4590,19,
+794,1,186,4128,1,
+187,4591,19,789,1,
+187,4128,1,188,4592,
+19,784,1,188,4128,
+1,189,4593,19,778,
+1,189,4128,1,190,
+4594,19,773,1,190,
+4128,1,191,4595,19,
+768,1,191,4128,1,
+192,4596,19,763,1,
+192,4128,1,193,4597,
+19,758,1,193,4128,
+1,194,4598,19,1180,
+1,194,4213,1,195,
+4599,19,1318,1,195,
+4226,1,196,4600,19,
+1167,1,196,4239,1,
+197,4601,19,1306,1,
+197,4239,1,198,4602,
+19,947,1,198,4252,
+1,199,4603,19,751,
+1,199,4252,1,200,
+4604,19,846,1,200,
+4252,1,201,4605,19,
+874,1,201,4252,1,
+202,4606,19,893,1,
+202,4265,1,203,4607,
+19,939,1,203,4265,
+1,204,4608,19,854,
+1,204,4278,1,205,
+4609,19,867,1,205,
+4278,1,206,4610,19,
+820,1,206,4291,1,
+207,4611,19,859,1,
+207,4291,1,208,4612,
+19,1505,1,208,4304,
+1,209,4613,19,1186,
+1,209,4304,1,210,
+4614,19,1538,1,210,
+4304,1,211,4615,19,
+1570,1,211,4304,1,
+212,4616,19,1434,1,
+212,4154,1,213,4617,
+19,1493,1,213,4154,
+1,214,4618,19,1161,
+1,214,4167,1,215,
+4619,19,1602,1,215,
+4167,1,216,4620,19,
+1533,1,216,4167,1,
+217,4621,19,1478,1,
+217,4167,1,218,4622,
+19,1402,1,218,4167,
+1,219,4623,19,1328,
+1,219,4167,1,220,
+4624,19,1338,1,220,
+4167,1,221,4625,19,
+1156,1,221,4167,1,
+222,4626,19,1586,1,
+222,4167,1,223,4627,
+19,1528,1,223,4167,
+1,224,4628,19,1468,
+1,224,4167,1,225,
+4629,19,1391,1,225,
+4167,1,226,4630,19,
+1354,1,226,4167,1,
+227,4631,19,1139,1,
+227,4167,1,228,4632,
+19,1488,1,228,4167,
+1,229,4633,19,1516,
+1,229,4167,1,230,
+4634,19,1461,1,230,
+4167,1,231,4635,19,
+1483,1,231,4167,1,
+232,4636,19,1294,1,
+232,4167,1,233,4637,
+19,1198,1,233,4167,
+1,234,4638,19,1128,
+1,234,4167,1,235,
+4639,19,1560,1,235,
+4167,1,236,4640,19,
+1511,1,236,4167,1,
+237,4641,19,1456,1,
+237,4167,1,238,4642,
+19,1323,1,238,4200,
+1,239,4643,19,1301,
+1,239,4200,1,240,
+4644,19,1591,1,240,
+4390,1,241,4645,19,
+1614,1,241,4390,1,
+242,4646,19,1581,1,
+242,4390,1,243,4647,
+19,1576,1,243,4390,
+1,244,4648,19,1597,
+1,244,4390,1,245,
+4649,19,1544,1,245,
+4390,1,246,4650,19,
+1248,1,246,4390,1,
+247,4651,19,1423,1,
+247,4466,1,248,4652,
+19,1209,1,248,4466,
+1,249,4653,19,1216,
+1,249,4466,1,250,
+4654,19,1237,1,250,
+4466,1,251,4655,19,
+1232,1,251,4466,1,
+252,4656,19,1227,1,
+252,4466,1,253,4657,
+19,1222,1,253,4466,
+1,254,4658,19,1412,
+1,254,4466,1,255,
+4659,19,1440,1,255,
+4466,1,256,4660,19,
+1417,1,256,4466,1,
+257,4661,19,1407,1,
+257,4466,1,258,4662,
+19,1397,1,258,4466,
+1,259,4663,19,1380,
+1,259,4466,1,260,
+4664,19,1333,1,260,
+4466,1,261,4665,19,
+1242,1,261,4466,1,
+262,4666,19,1203,1,
+262,4466,1,263,4667,
+19,1151,1,263,4466,
+1,264,4668,19,1609,
+1,264,4466,1,265,
+4669,19,1565,1,265,
+4466,1,266,4670,19,
+1555,1,266,4466,1,
+267,4671,19,1550,1,
+267,4466,1,268,4672,
+19,1499,1,268,4466,
+1,269,4673,19,1473,
+1,269,4466,1,270,
+4674,19,1450,1,270,
+4466,1,271,4675,19,
+1445,1,271,4466,1,
+272,4676,19,1386,1,
+272,4466,1,273,4677,
+19,1362,1,273,4466,
+1,274,4678,19,1428,
+1,274,4466,1,275,
+4679,19,1522,1,275,
+4466,1,276,4680,19,
+1375,1,276,4466,1,
+277,4681,19,1369,1,
+277,4466,1,278,4682,
+19,1349,1,278,4466,
+1,279,4683,19,1312,
+1,279,4466,1,280,
+4684,19,1289,1,280,
+4466,1,281,4685,19,
+1134,1,281,4466,1,
+282,4686,19,1624,1,
+282,4466,1,283,4687,
+19,1254,1,283,4466,
+1,284,4688,19,1259,
+1,284,4466,1,285,
+4689,19,1279,1,285,
+4466,1,286,4690,19,
+1269,1,286,4466,1,
+287,4691,19,1274,1,
+287,4466,1,288,4692,
+19,1264,1,288,4466,
+1,289,4693,19,1619,
+1,289,4466,1,290,
+4694,19,1284,1,290,
+4466,1,291,4695,19,
+1344,1,291,4309,1,
+292,4696,19,1752,1,
+292,4379,1,293,4697,
+19,1745,1,293,4379,
+1,294,4698,19,1722,
+1,294,4383,1,295,
+4699,19,2051,1,295,
+4069,1,296,4700,19,
+2046,1,296,4069,1,
+297,4701,19,2041,1,
+297,4069,1,298,4702,
+19,2036,1,298,4069,
+1,299,4703,19,2031,
+1,299,4069,1,300,
+4704,19,2026,1,300,
+4069,1,301,4705,19,
+2021,1,301,4069,1,
+302,4706,19,2010,1,
+302,4089,1,303,4707,
+19,2005,1,303,4089,
+1,304,4708,19,2000,
+1,304,4089,1,305,
+4709,19,1995,1,305,
+4089,1,306,4710,19,
+1990,1,306,4089,1,
+307,4711,19,1985,1,
+307,4089,1,308,4712,
+19,1980,1,308,4089,
+1,309,4713,19,1975,
+1,309,4089,1,310,
+4714,19,1970,1,310,
+4089,1,311,4715,19,
+1804,1,311,4089,1,
+312,4716,19,1964,1,
+312,4089,1,313,4717,
+19,1959,1,313,4089,
+1,314,4718,19,1954,
+1,314,4089,1,315,
+4719,19,1797,1,315,
+4089,1,316,4720,19,
+1949,1,316,4089,1,
+317,4721,19,1944,1,
+317,4089,1,318,4722,
+19,1939,1,318,4095,
+1,319,4723,19,1934,
+1,319,4095,1,320,
+4724,19,1929,1,320,
+4095,1,321,4725,19,
+1924,1,321,4095,1,
+322,4726,19,1789,1,
+322,4095,1,323,4727,
+19,1918,1,323,4095,
+1,324,4728,19,1913,
+1,324,4095,1,325,
+4729,19,1908,1,325,
+4095,1,326,4730,19,
+1783,1,326,4095,1,
+327,4731,19,1902,1,
+327,4095,1,328,4732,
+19,1833,1,328,4101,
+1,329,4733,19,1897,
+1,329,4101,1,330,
+4734,19,1892,1,330,
+4101,1,331,4735,19,
+1887,1,331,4101,1,
+332,4736,19,1882,1,
+332,4101,1,333,4737,
+19,1877,1,333,4101,
+1,334,4738,19,1872,
+1,334,4101,1,335,
+4739,19,1867,1,335,
+4101,1,336,4740,19,
+4741,4,50,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
 110,0,116,0,68,
 0,101,0,99,0,
-114,0,101,0,109,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,76,0,105,0,
+115,0,116,0,95,
+0,51,0,1,336,
+4039,1,337,4742,19,
+4743,4,28,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,76,
+0,105,0,115,0,
+116,0,95,0,51,
+0,1,337,4379,1,
+338,4744,19,4745,4,
+50,65,0,114,0,
+103,0,117,0,109,
 0,101,0,110,0,
-116,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,1,146,4466,
-1,148,4552,19,728,
-1,148,3993,1,149,
-4553,19,733,1,149,
-3993,1,150,4554,19,
-3280,1,150,3996,1,
-151,4555,19,3270,1,
-151,3996,1,152,4556,
-19,3275,1,152,3996,
-1,153,4557,19,3265,
-1,153,3996,1,154,
-4558,19,3300,1,154,
-3999,1,155,4559,19,
-3286,1,155,3999,1,
-156,4560,19,3295,1,
-156,4003,1,157,4561,
-19,3305,1,157,4003,
-1,158,4562,19,711,
-1,158,4007,1,159,
-4563,19,722,1,159,
-4007,1,160,4564,19,
-738,1,160,4011,1,
-161,4565,19,717,1,
-161,4011,1,162,4566,
-19,1693,1,162,4017,
-1,163,4567,19,1678,
-1,163,4017,1,164,
-4568,19,1683,1,164,
-4017,1,165,4569,19,
-1673,1,165,4017,1,
-166,4570,19,1688,1,
-166,4017,1,167,4571,
-19,1668,1,167,4017,
-1,168,4572,19,1699,
-1,168,4021,1,169,
-4573,19,1659,1,169,
-4027,1,170,4574,19,
-1652,1,170,4033,1,
-171,4575,19,1739,1,
-171,4039,1,172,4576,
-19,1712,1,172,4039,
-1,173,4577,19,2069,
-1,173,4044,1,174,
-4578,19,2063,1,174,
-4066,1,175,4579,19,
-1145,1,175,4047,1,
-176,4580,19,930,1,
-176,4107,1,177,4581,
-19,914,1,177,4107,
-1,178,4582,19,920,
-1,178,4125,1,179,
-4583,19,908,1,179,
-4125,1,180,4584,19,
-1173,1,180,4141,1,
-181,4585,19,811,1,
-181,4128,1,182,4586,
-19,925,1,182,4128,
-1,183,4587,19,806,
-1,183,4128,1,184,
-4588,19,831,1,184,
-4128,1,185,4589,19,
-800,1,185,4128,1,
-186,4590,19,794,1,
-186,4128,1,187,4591,
-19,789,1,187,4128,
-1,188,4592,19,784,
-1,188,4128,1,189,
-4593,19,778,1,189,
-4128,1,190,4594,19,
-773,1,190,4128,1,
-191,4595,19,768,1,
-191,4128,1,192,4596,
-19,763,1,192,4128,
-1,193,4597,19,758,
-1,193,4128,1,194,
-4598,19,1180,1,194,
-4213,1,195,4599,19,
-1318,1,195,4226,1,
-196,4600,19,1167,1,
-196,4239,1,197,4601,
-19,1306,1,197,4239,
-1,198,4602,19,947,
-1,198,4252,1,199,
-4603,19,751,1,199,
-4252,1,200,4604,19,
-846,1,200,4252,1,
-201,4605,19,874,1,
-201,4252,1,202,4606,
-19,893,1,202,4265,
-1,203,4607,19,939,
-1,203,4265,1,204,
-4608,19,854,1,204,
-4278,1,205,4609,19,
-867,1,205,4278,1,
-206,4610,19,820,1,
-206,4291,1,207,4611,
-19,859,1,207,4291,
-1,208,4612,19,1505,
-1,208,4304,1,209,
-4613,19,1186,1,209,
-4304,1,210,4614,19,
-1538,1,210,4304,1,
-211,4615,19,1570,1,
-211,4304,1,212,4616,
-19,1434,1,212,4154,
-1,213,4617,19,1493,
-1,213,4154,1,214,
-4618,19,1161,1,214,
-4167,1,215,4619,19,
-1602,1,215,4167,1,
-216,4620,19,1533,1,
-216,4167,1,217,4621,
-19,1478,1,217,4167,
-1,218,4622,19,1402,
-1,218,4167,1,219,
-4623,19,1328,1,219,
-4167,1,220,4624,19,
-1338,1,220,4167,1,
-221,4625,19,1156,1,
-221,4167,1,222,4626,
-19,1586,1,222,4167,
-1,223,4627,19,1528,
-1,223,4167,1,224,
-4628,19,1468,1,224,
-4167,1,225,4629,19,
-1391,1,225,4167,1,
-226,4630,19,1354,1,
-226,4167,1,227,4631,
-19,1139,1,227,4167,
-1,228,4632,19,1488,
-1,228,4167,1,229,
-4633,19,1516,1,229,
-4167,1,230,4634,19,
-1461,1,230,4167,1,
-231,4635,19,1483,1,
-231,4167,1,232,4636,
-19,1294,1,232,4167,
-1,233,4637,19,1198,
-1,233,4167,1,234,
-4638,19,1128,1,234,
-4167,1,235,4639,19,
-1560,1,235,4167,1,
-236,4640,19,1511,1,
-236,4167,1,237,4641,
-19,1456,1,237,4167,
-1,238,4642,19,1323,
-1,238,4200,1,239,
-4643,19,1301,1,239,
-4200,1,240,4644,19,
-1591,1,240,4390,1,
-241,4645,19,1614,1,
-241,4390,1,242,4646,
-19,1581,1,242,4390,
-1,243,4647,19,1576,
-1,243,4390,1,244,
-4648,19,1597,1,244,
-4390,1,245,4649,19,
-1544,1,245,4390,1,
-246,4650,19,1248,1,
-246,4390,1,247,4651,
-19,1423,1,247,4466,
-1,248,4652,19,1209,
-1,248,4466,1,249,
-4653,19,1216,1,249,
-4466,1,250,4654,19,
-1237,1,250,4466,1,
-251,4655,19,1232,1,
-251,4466,1,252,4656,
-19,1227,1,252,4466,
-1,253,4657,19,1222,
-1,253,4466,1,254,
-4658,19,1412,1,254,
-4466,1,255,4659,19,
-1440,1,255,4466,1,
-256,4660,19,1417,1,
-256,4466,1,257,4661,
-19,1407,1,257,4466,
-1,258,4662,19,1397,
-1,258,4466,1,259,
-4663,19,1380,1,259,
-4466,1,260,4664,19,
-1333,1,260,4466,1,
-261,4665,19,1242,1,
-261,4466,1,262,4666,
-19,1203,1,262,4466,
-1,263,4667,19,1151,
-1,263,4466,1,264,
-4668,19,1609,1,264,
-4466,1,265,4669,19,
-1565,1,265,4466,1,
-266,4670,19,1555,1,
-266,4466,1,267,4671,
-19,1550,1,267,4466,
-1,268,4672,19,1499,
-1,268,4466,1,269,
-4673,19,1473,1,269,
-4466,1,270,4674,19,
-1450,1,270,4466,1,
-271,4675,19,1445,1,
-271,4466,1,272,4676,
-19,1386,1,272,4466,
-1,273,4677,19,1362,
-1,273,4466,1,274,
-4678,19,1428,1,274,
-4466,1,275,4679,19,
-1522,1,275,4466,1,
-276,4680,19,1375,1,
-276,4466,1,277,4681,
-19,1369,1,277,4466,
-1,278,4682,19,1349,
-1,278,4466,1,279,
-4683,19,1312,1,279,
-4466,1,280,4684,19,
-1289,1,280,4466,1,
-281,4685,19,1134,1,
-281,4466,1,282,4686,
-19,1624,1,282,4466,
-1,283,4687,19,1254,
-1,283,4466,1,284,
-4688,19,1259,1,284,
-4466,1,285,4689,19,
-1279,1,285,4466,1,
-286,4690,19,1269,1,
-286,4466,1,287,4691,
-19,1274,1,287,4466,
-1,288,4692,19,1264,
-1,288,4466,1,289,
-4693,19,1619,1,289,
-4466,1,290,4694,19,
-1284,1,290,4466,1,
-291,4695,19,1344,1,
-291,4309,1,292,4696,
-19,1752,1,292,4379,
-1,293,4697,19,1745,
-1,293,4379,1,294,
-4698,19,1722,1,294,
-4383,1,295,4699,19,
-2051,1,295,4069,1,
-296,4700,19,2046,1,
-296,4069,1,297,4701,
-19,2041,1,297,4069,
-1,298,4702,19,2036,
-1,298,4069,1,299,
-4703,19,2031,1,299,
-4069,1,300,4704,19,
-2026,1,300,4069,1,
-301,4705,19,2021,1,
-301,4069,1,302,4706,
-19,2010,1,302,4089,
-1,303,4707,19,2005,
-1,303,4089,1,304,
-4708,19,2000,1,304,
-4089,1,305,4709,19,
-1995,1,305,4089,1,
-306,4710,19,1990,1,
-306,4089,1,307,4711,
-19,1985,1,307,4089,
-1,308,4712,19,1980,
-1,308,4089,1,309,
-4713,19,1975,1,309,
-4089,1,310,4714,19,
-1970,1,310,4089,1,
-311,4715,19,1804,1,
-311,4089,1,312,4716,
-19,1964,1,312,4089,
-1,313,4717,19,1959,
-1,313,4089,1,314,
-4718,19,1954,1,314,
-4089,1,315,4719,19,
-1797,1,315,4089,1,
-316,4720,19,1949,1,
-316,4089,1,317,4721,
-19,1944,1,317,4089,
-1,318,4722,19,1939,
-1,318,4089,1,319,
-4723,19,1934,1,319,
-4095,1,320,4724,19,
-1929,1,320,4095,1,
-321,4725,19,1924,1,
-321,4095,1,322,4726,
-19,1789,1,322,4095,
-1,323,4727,19,1918,
-1,323,4095,1,324,
-4728,19,1913,1,324,
-4095,1,325,4729,19,
-1908,1,325,4095,1,
-326,4730,19,1783,1,
-326,4095,1,327,4731,
-19,1902,1,327,4095,
-1,328,4732,19,1832,
-1,328,4095,1,329,
-4733,19,1897,1,329,
-4101,1,330,4734,19,
-1892,1,330,4101,1,
-331,4735,19,1887,1,
-331,4101,1,332,4736,
-19,1882,1,332,4101,
-1,333,4737,19,1877,
-1,333,4101,1,334,
-4738,19,1872,1,334,
-4101,1,335,4739,19,
-1867,1,335,4101,1,
-336,4740,19,4741,4,
+116,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,76,
+0,105,0,115,0,
+116,0,95,0,52,
+0,1,338,4039,1,
+339,4746,19,4747,4,
 50,65,0,114,0,
 103,0,117,0,109,
 0,101,0,110,0,
@@ -11271,48 +11305,16 @@ public yyLSLSyntax
 0,116,0,105,0,
 111,0,110,0,76,
 0,105,0,115,0,
-116,0,95,0,51,
-0,1,336,4039,1,
-337,4742,19,4743,4,
+116,0,95,0,53,
+0,1,339,4039,1,
+340,4748,19,4749,4,
 28,65,0,114,0,
 103,0,117,0,109,
 0,101,0,110,0,
 116,0,76,0,105,
 0,115,0,116,0,
-95,0,51,0,1,
-337,4379,1,338,4744,
-19,4745,4,50,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
 95,0,52,0,1,
-338,4039,1,339,4746,
-19,4747,4,50,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
-95,0,53,0,1,
-339,4039,1,340,4748,
-19,4749,4,28,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-76,0,105,0,115,
-0,116,0,95,0,
-52,0,1,340,4379,
-2,0,0};
+340,4379,2,0,0};
 new Sfactory(this,"ExpressionArgument_1",new SCreator(ExpressionArgument_1_factory));
 new Sfactory(this,"SimpleAssignment_8",new SCreator(SimpleAssignment_8_factory));
 new Sfactory(this,"SimpleAssignment_9",new SCreator(SimpleAssignment_9_factory));
@@ -11521,11 +11523,11 @@ new Sfactory(this,"Event_10",new SCreator(Event_10_factory));
 new Sfactory(this,"GlobalFunctionDefinition_2",new SCreator(GlobalFunctionDefinition_2_factory));
 new Sfactory(this,"Event_12",new SCreator(Event_12_factory));
 new Sfactory(this,"StateChange_2",new SCreator(StateChange_2_factory));
-new Sfactory(this,"Event_17",new SCreator(Event_17_factory));
 new Sfactory(this,"VoidArgEvent_1",new SCreator(VoidArgEvent_1_factory));
 new Sfactory(this,"BinaryExpression_10",new SCreator(BinaryExpression_10_factory));
 new Sfactory(this,"VoidArgEvent_5",new SCreator(VoidArgEvent_5_factory));
 new Sfactory(this,"VoidArgEvent_7",new SCreator(VoidArgEvent_7_factory));
+new Sfactory(this,"VoidArgEvent_8",new SCreator(VoidArgEvent_8_factory));
 new Sfactory(this,"BinaryExpression_17",new SCreator(BinaryExpression_17_factory));
 new Sfactory(this,"StateEvent_1",new SCreator(StateEvent_1_factory));
 new Sfactory(this,"VectorConstant",new SCreator(VectorConstant_factory));
@@ -11767,11 +11769,11 @@ public static object Event_10_factory(Parser yyp) { return new Event_10(yyp); }
 public static object GlobalFunctionDefinition_2_factory(Parser yyp) { return new GlobalFunctionDefinition_2(yyp); }
 public static object Event_12_factory(Parser yyp) { return new Event_12(yyp); }
 public static object StateChange_2_factory(Parser yyp) { return new StateChange_2(yyp); }
-public static object Event_17_factory(Parser yyp) { return new Event_17(yyp); }
 public static object VoidArgEvent_1_factory(Parser yyp) { return new VoidArgEvent_1(yyp); }
 public static object BinaryExpression_10_factory(Parser yyp) { return new BinaryExpression_10(yyp); }
 public static object VoidArgEvent_5_factory(Parser yyp) { return new VoidArgEvent_5(yyp); }
 public static object VoidArgEvent_7_factory(Parser yyp) { return new VoidArgEvent_7(yyp); }
+public static object VoidArgEvent_8_factory(Parser yyp) { return new VoidArgEvent_8(yyp); }
 public static object BinaryExpression_17_factory(Parser yyp) { return new BinaryExpression_17(yyp); }
 public static object StateEvent_1_factory(Parser yyp) { return new StateEvent_1(yyp); }
 public static object VectorConstant_factory(Parser yyp) { return new VectorConstant(yyp); }
-- 
cgit v1.1


From f94d07f2e21e29caf877d1f98e5a9457523e1a70 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 16 Nov 2013 03:02:57 +0000
Subject: Add regression test to check that specifying a non-existent event
 raise a syntax error

This was the case before any of the recent changes
---
 .../Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
index 81e0ab9..53ce405 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
@@ -39,6 +39,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         CSCodeGenerator m_cg = new CSCodeGenerator();
 
         [Test]
+        public void TestBadEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestCompile("default { bad() {} }", true);
+        }
+
+        [Test]
         public void TestMovingEndEvent()
         {
             TestHelpers.InMethod();
-- 
cgit v1.1


From 9ba5a7e190497be05a4e1f54ba3140366750277a Mon Sep 17 00:00:00 2001
From: Latif Khalifa
Date: Sun, 17 Nov 2013 13:43:05 +0100
Subject: Normalize viewer version string to accomodate new style version
 reporting in the viewers

---
 OpenSim/Framework/AgentCircuitData.cs | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index ffcc584..acf925a 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -128,7 +128,30 @@ namespace OpenSim.Framework
         /// <summary>
         /// Viewer's version string as reported by the viewer at login
         /// </summary>
-        public string Viewer;
+        private string ViewerInternal;
+
+        /// <summary>
+        /// Viewer's version string
+        /// </summary>
+        public string Viewer
+        {
+            set { ViewerInternal = value; }
+            // Try to return consistent viewer string taking into account
+            // that viewers have chaagned how version is reported
+            // See http://opensimulator.org/mantis/view.php?id=6851
+            get
+            {
+                // Old style version string contains viewer name followed by a space followed by a version number
+                if (ViewerInternal.Contains(" "))
+                {
+                    return ViewerInternal;
+                }
+                else // New style version contains no spaces, just version number
+                {
+                    return Channel + " " + ViewerInternal;
+                }
+            }
+        }
 
         /// <summary>
         /// The channel strinf sent by the viewer at login
-- 
cgit v1.1


From b71952df49784167a4c2eed218424064b90bfd63 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 19 Nov 2013 23:36:44 +0000
Subject: Stop AgentCircuitData.Viewer.get() from throwing an error if no
 Viewer has been set.

Continue to return null instead.
---
 OpenSim/Framework/AgentCircuitData.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index acf925a..51f0a1e 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Framework
             get
             {
                 // Old style version string contains viewer name followed by a space followed by a version number
-                if (ViewerInternal.Contains(" "))
+                if (ViewerInternal == null || ViewerInternal.Contains(" "))
                 {
                     return ViewerInternal;
                 }
-- 
cgit v1.1


From f9984a9685ac92a34272f7231a0ec4097fc31a79 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 19 Nov 2013 23:39:52 +0000
Subject: rename private field ACD.ViewerInternal to m_viewerInternal in line
 with conventions used elsewhere in code

---
 OpenSim/Framework/AgentCircuitData.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 51f0a1e..f2fe494 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -128,27 +128,28 @@ namespace OpenSim.Framework
         /// <summary>
         /// Viewer's version string as reported by the viewer at login
         /// </summary>
-        private string ViewerInternal;
+        private string m_viewerInternal;
 
         /// <summary>
         /// Viewer's version string
         /// </summary>
         public string Viewer
         {
-            set { ViewerInternal = value; }
+            set { m_viewerInternal = value; }
+
             // Try to return consistent viewer string taking into account
             // that viewers have chaagned how version is reported
             // See http://opensimulator.org/mantis/view.php?id=6851
             get
             {
                 // Old style version string contains viewer name followed by a space followed by a version number
-                if (ViewerInternal == null || ViewerInternal.Contains(" "))
+                if (m_viewerInternal == null || m_viewerInternal.Contains(" "))
                 {
-                    return ViewerInternal;
+                    return m_viewerInternal;
                 }
                 else // New style version contains no spaces, just version number
                 {
-                    return Channel + " " + ViewerInternal;
+                    return Channel + " " + m_viewerInternal;
                 }
             }
         }
-- 
cgit v1.1


From b44c69807d1c804f2ae1e9c77a0f4d2dbff1b6e1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 19 Nov 2013 23:53:15 +0000
Subject: Fix bug where "show modules" would accidentally list all the shared
 modules again as "non-shared"

Addresses http://opensimulator.org/mantis/view.php?id=6860
---
 OpenSim/Region/Application/OpenSim.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 12250df..e31c3fc 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -766,7 +766,7 @@ namespace OpenSim
                             foreach (IRegionModuleBase module in sharedModules.OrderBy(m => m.Name))
                                 MainConsole.Instance.OutputFormat("New Region Module (Shared): {0}", module.Name);
 
-                            foreach (IRegionModuleBase module in sharedModules.OrderBy(m => m.Name))
+                            foreach (IRegionModuleBase module in nonSharedModules.OrderBy(m => m.Name))
                                 MainConsole.Instance.OutputFormat("New Region Module (Non-Shared): {0}", module.Name);
                         }
                     );
-- 
cgit v1.1


From c896b4179ebc4bdc89b4373e93f4b04174f0c758 Mon Sep 17 00:00:00 2001
From: Eva Comaroski
Date: Sun, 17 Nov 2013 12:06:32 +0000
Subject: Added admin_authenticate_user command

---
 .../RemoteController/RemoteAdminPlugin.cs          | 136 +++++++++++++++++++++
 1 file changed, 136 insertions(+)

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 8b66ee1..354f587 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Xml;
 using System.Net;
@@ -51,6 +52,7 @@ using OpenSim.Services.Interfaces;
 using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using PermissionMask = OpenSim.Framework.PermissionMask;
+using RegionInfo = OpenSim.Framework.RegionInfo;
 
 namespace OpenSim.ApplicationPlugins.RemoteController
 {
@@ -145,6 +147,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     availableMethods["admin_create_user_email"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcCreateUserMethod);
                     availableMethods["admin_exists_user"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcUserExistsMethod);
                     availableMethods["admin_update_user"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcUpdateUserAccountMethod);
+                    availableMethods["admin_authenticate_user"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAuthenticateUserMethod);
 
                     // Region state management
                     availableMethods["admin_load_xml"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcLoadXMLMethod);
@@ -1281,6 +1284,139 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         }
 
         /// <summary>
+        /// Authenticate an user.
+        /// <summary>
+        /// <param name="request">incoming XML RPC request</param>
+        /// <remarks>
+        /// XmlRpcAuthenticateUserMethod takes the following XMLRPC
+        /// parameters
+        /// <list type="table">
+        /// <listheader><term>parameter name</term><description>description</description></listheader>
+        /// <item><term>password</term>
+        ///       <description>admin password as set in OpenSim.ini</description></item>
+        /// <item><term>user_firstname</term>
+        ///       <description>avatar's first name</description></item>
+        /// <item><term>user_lastname</term>
+        ///       <description>avatar's last name</description></item>
+        /// <item><term>user_password</term>
+        ///       <description>MD5 hash of avatar's password</description></item>
+        /// <item><term>token_lifetime</term>
+        ///       <description>the lifetime of the returned token (upper bounded to 30s)</description></item>
+        /// </list>
+        ///
+        /// XmlRpcAuthenticateUserMethod returns
+        /// <list type="table">
+        /// <listheader><term>name</term><description>description</description></listheader>
+        /// <item><term>success</term>
+        ///       <description>true or false</description></item>
+        /// <item><term>token</term>
+        ///       <description>the authentication token sent by OpenSim</description></item>
+        /// <item><term>error</term>
+        ///       <description>error message if success is false</description></item>
+        /// </list>
+        /// </remarks>
+        private void XmlRpcAuthenticateUserMethod(XmlRpcRequest request, XmlRpcResponse response,
+                                                   IPEndPoint remoteClient)
+        {
+            m_log.Info("[RADMIN]: AuthenticateUser: new request");
+
+            var responseData = (Hashtable)response.Value;
+            var requestData = (Hashtable)request.Params[0];
+
+            lock (m_requestLock)
+            {
+                try
+                {
+                    CheckStringParameters(requestData, responseData, new[]
+                                                                         {
+                                                                             "user_firstname",
+                                                                             "user_lastname",
+                                                                             "user_password",
+                                                                             "token_lifetime"
+                                                                         });
+
+                    var firstName = (string)requestData["user_firstname"];
+                    var lastName = (string)requestData["user_lastname"];
+                    var password = (string)requestData["user_password"];
+
+                    var scene = m_application.SceneManager.CurrentOrFirstScene;
+
+                    if (scene.Equals(null))
+                    {
+                        m_log.Debug("scene does not exist");
+                        throw new Exception("Scene does not exist.");
+                    }
+
+                    var scopeID = scene.RegionInfo.ScopeID;
+                    var account = scene.UserAccountService.GetUserAccount(scopeID, firstName, lastName);
+
+                    if (account.Equals(null) || account.PrincipalID.Equals(UUID.Zero))
+                    {
+                        m_log.DebugFormat("avatar {0} {1} does not exist", firstName, lastName);
+                        throw new Exception(String.Format("avatar {0} {1} does not exist", firstName, lastName));
+                    }
+
+                    if (String.IsNullOrEmpty(password))
+                    {
+                        m_log.DebugFormat("[RADMIN]: AuthenticateUser: no password provided for {0} {1}", firstName,
+                                          lastName);
+                        throw new Exception(String.Format("no password provided for {0} {1}", firstName,
+                                          lastName));
+                    }
+
+                    int lifetime;
+                    if (int.TryParse((string)requestData["token_lifetime"], NumberStyles.Integer, CultureInfo.InvariantCulture, out lifetime) == false)
+                    {
+                        m_log.DebugFormat("[RADMIN]: AuthenticateUser: no token lifetime provided for {0} {1}", firstName,
+                                          lastName);
+                        throw new Exception(String.Format("no token lifetime provided for {0} {1}", firstName,
+                                          lastName));
+                    }
+
+                    // Upper bound on lifetime set to 30s.
+                    if (lifetime > 30)
+                    {
+                        m_log.DebugFormat("[RADMIN]: AuthenticateUser: token lifetime longer than 30s for {0} {1}", firstName,
+                                          lastName);
+                        throw new Exception(String.Format("token lifetime longer than 30s for {0} {1}", firstName,
+                                          lastName));
+                    }
+
+                    var authModule = scene.RequestModuleInterface<IAuthenticationService>();
+                    if (authModule == null)
+                    {
+                        m_log.Debug("[RADMIN]: AuthenticateUser: no authentication module loded");
+                        throw new Exception("no authentication module loaded");
+                    }
+
+                    var token = authModule.Authenticate(account.PrincipalID, password, lifetime);
+                    if (String.IsNullOrEmpty(token))
+                    {
+                        m_log.DebugFormat("[RADMIN]: AuthenticateUser: authentication failed for {0} {1}", firstName,
+                            lastName);
+                        throw new Exception(String.Format("authentication failed for {0} {1}", firstName,
+                            lastName));
+                    }
+
+                    m_log.DebugFormat("[RADMIN]: AuthenticateUser: account for user {0} {1} identified with token {2}",
+                        firstName, lastName, token);
+
+                    responseData["token"] = token;
+                    responseData["success"] = true;
+
+                }
+                catch (Exception e)
+                {
+                    responseData["success"] = false;
+                    responseData["error"] = e.Message;
+                    throw e;
+                }
+
+                m_log.Info("[RADMIN]: AuthenticateUser: request complete");
+            }
+        }
+
+        /// <summary>
         /// Load an OAR file into a region..
         /// <summary>
         /// <param name="request">incoming XML RPC request</param>
-- 
cgit v1.1


From ff4e7de7769b7eaa1b4fd3917e59f362b708226a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Nov 2013 00:53:09 +0000
Subject: Fix issue where sitting on non-root linked prims would send camera to
 wrong position in third-person and mouselook

We now specify sits as offsets from the root prim, as the viewer expects.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 +++++++-
 OpenSim/Region/Framework/Scenes/ScenePresence.cs      | 9 +++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 20bc59c..29751ff 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5218,7 +5218,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " +
                 data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle);
             update.ObjectData = objectData;
-            update.ParentID = data.ParentID;
+
+            SceneObjectPart parentPart = data.ParentPart;
+            if (parentPart != null)
+                update.ParentID = parentPart.ParentGroup.LocalId;
+            else
+                update.ParentID = 0;
+
             update.PathCurve = 16;
             update.PathScaleX = 100;
             update.PathScaleY = 100;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 7243db1..ea8e4fe 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2312,8 +2312,10 @@ namespace OpenSim.Region.Framework.Scenes
                 cameraEyeOffset = part.GetCameraEyeOffset();
                 forceMouselook = part.GetForceMouselook();
 
+                // An viewer expects to specify sit positions as offsets to the root prim, even if a child prim is
+                // being sat upon.
                 ControllingClient.SendSitResponse(
-                    part.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
+                    part.ParentGroup.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
 
                 m_requestedSitTargetUUID = part.UUID;
 
@@ -2592,7 +2594,10 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 else
                 {
-                    m_pos -= part.AbsolutePosition;
+                    // An viewer expects to specify sit positions as offsets to the root prim, even if a child prim is
+                    // being sat upon.
+                    m_pos -= part.GroupPosition;
+
                     ParentPosition = part.AbsolutePosition;
 
 //                        m_log.DebugFormat(
-- 
cgit v1.1


From 9f4a548a49e4d7e10fd33d2c684cae8b177ac418 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Nov 2013 01:03:53 +0000
Subject: Fix false positive test failure in
 TestRepeatSameDrawContainingImageReusingTexture() and
 TestRepeatSameDrawContainingImage() if localhost has a webserver set up.

Use 0.0.0.0 instead of localhost
---
 .../Scripting/VectorRender/Tests/VectorRenderModuleTests.cs           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
index 41baccc..7119137 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
             TestHelpers.InMethod();
 
             string dtText
-                = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://localhost/shouldnotexist.png";
+                = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://0.0.0.0/shouldnotexist.png";
 
             SetupScene(false);
             SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
@@ -307,7 +307,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
             TestHelpers.InMethod();
 
             string dtText
-                = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://localhost/shouldnotexist.png";
+                = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://0.0.0.0/shouldnotexist.png";
 
             SetupScene(true);
             SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
-- 
cgit v1.1


From 9bdd3dc7de46507b490a2eae5160123a28133d63 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Nov 2013 01:12:20 +0000
Subject: Still send CameraEyeOffset in UDP SendSitReponse even if at offset is
 Vector3.Zero

As far as I can see it's valid to change the eye offset even if you aren't changing the at target.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 29751ff..1ac9d7f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -2635,11 +2635,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             AvatarSitResponsePacket avatarSitResponse = new AvatarSitResponsePacket();
             avatarSitResponse.SitObject.ID = TargetID;
-            if (CameraAtOffset != Vector3.Zero)
-            {
-                avatarSitResponse.SitTransform.CameraAtOffset = CameraAtOffset;
-                avatarSitResponse.SitTransform.CameraEyeOffset = CameraEyeOffset;
-            }
+            avatarSitResponse.SitTransform.CameraAtOffset = CameraAtOffset;
+            avatarSitResponse.SitTransform.CameraEyeOffset = CameraEyeOffset;
             avatarSitResponse.SitTransform.ForceMouselook = ForceMouseLook;
             avatarSitResponse.SitTransform.AutoPilot = autopilot;
             avatarSitResponse.SitTransform.SitPosition = OffsetPos;
-- 
cgit v1.1


From ed1029712a85206430fee1d4897d473517728dab Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Nov 2013 01:18:07 +0000
Subject: Add line accidentally left out of recent non-root prim sit fix

Original commit is ff4e7de7
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ea8e4fe..17b6126 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2314,6 +2314,8 @@ namespace OpenSim.Region.Framework.Scenes
 
                 // An viewer expects to specify sit positions as offsets to the root prim, even if a child prim is
                 // being sat upon.
+                offset += part.OffsetPosition;
+
                 ControllingClient.SendSitResponse(
                     part.ParentGroup.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
 
-- 
cgit v1.1


From bd5c414618ef7fb02e3e62172c8f2bf7d7964cbf Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Nov 2013 01:29:55 +0000
Subject: Stop .NET 4 complaining on Windows when it tries to load in DLLs that
 haven't been marked as trusted in the operating system.

This is done by adding <loadFromRemoteSources enabled="true" /> to the execute *.config files.
This tells .NET 4 to trust the DLLs, which is safe in our case since we are not loading DLLs from locations that untrusted users may specify
Addresses http://opensimulator.org/mantis/view.php?id=6853 and http://opensimulator.org/mantis/view.php?id=6846
As far as I know, CAS policy checks have never been performed in Mono
---
 bin/OpenSim.32BitLaunch.exe.config   | 1 +
 bin/OpenSim.ConsoleClient.exe.config | 1 +
 bin/OpenSim.exe.config               | 1 +
 bin/Robust.32BitLaunch.exe.config    | 1 +
 bin/Robust.exe.config                | 1 +
 bin/pCampBot.exe.config              | 3 +++
 6 files changed, 8 insertions(+)

diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config
index 6a6b3c8..a07ace3 100644
--- a/bin/OpenSim.32BitLaunch.exe.config
+++ b/bin/OpenSim.32BitLaunch.exe.config
@@ -4,6 +4,7 @@
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
   </configSections>
   <runtime>
+    <loadFromRemoteSources enabled="true" />
     <gcConcurrent enabled="true" />
 	<gcServer enabled="true" />
   </runtime>
diff --git a/bin/OpenSim.ConsoleClient.exe.config b/bin/OpenSim.ConsoleClient.exe.config
index 7aa974c..3a50408 100644
--- a/bin/OpenSim.ConsoleClient.exe.config
+++ b/bin/OpenSim.ConsoleClient.exe.config
@@ -4,6 +4,7 @@
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
   </configSections>
   <runtime>
+    <loadFromRemoteSources enabled="true" />
     <gcConcurrent enabled="true" />
 	<gcServer enabled="true" />
   </runtime>
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index b2cb4e5..1ec3c9c 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -4,6 +4,7 @@
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
   </configSections>
   <runtime>
+    <loadFromRemoteSources enabled="true" />
     <gcConcurrent enabled="true" />
 	<gcServer enabled="true" />
   </runtime>
diff --git a/bin/Robust.32BitLaunch.exe.config b/bin/Robust.32BitLaunch.exe.config
index ec17049..f2802a2 100644
--- a/bin/Robust.32BitLaunch.exe.config
+++ b/bin/Robust.32BitLaunch.exe.config
@@ -4,6 +4,7 @@
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
   </configSections>
   <runtime>
+    <loadFromRemoteSources enabled="true" />
     <gcConcurrent enabled="true" />
 	<gcServer enabled="true" />
   </runtime>
diff --git a/bin/Robust.exe.config b/bin/Robust.exe.config
index 62975fd..6ffdfef 100644
--- a/bin/Robust.exe.config
+++ b/bin/Robust.exe.config
@@ -4,6 +4,7 @@
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
   </configSections>
   <runtime>
+    <loadFromRemoteSources enabled="true" />
     <gcConcurrent enabled="true" />
 	<gcServer enabled="true" />
   </runtime>
diff --git a/bin/pCampBot.exe.config b/bin/pCampBot.exe.config
index 9cfb7e9..7912991 100755
--- a/bin/pCampBot.exe.config
+++ b/bin/pCampBot.exe.config
@@ -3,6 +3,9 @@
   <configSections>
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
   </configSections>
+  <runtime>
+    <loadFromRemoteSources enabled="true" />
+  </runtime>
   <appSettings>
   </appSettings>
   <log4net>
-- 
cgit v1.1


From 70e651a8d1d0c2a48c4f26cd1c70bee098c11a57 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Nov 2013 01:32:29 +0000
Subject: Fix non-root prim sit positions for prims where a sit target has been
 specified as well.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 17b6126..127ad40 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2590,7 +2590,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     //Quaternion result = (sitTargetOrient * vq) * nq;
 
-                    m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT;
+                    m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT - part.GroupPosition;
                     Rotation = sitTargetOrient;
                     ParentPosition = part.AbsolutePosition;
                 }
-- 
cgit v1.1


From 78649eb0999a5f97cc541c94ec98d1d06ed957cb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Nov 2013 01:35:08 +0000
Subject: Refix fix for sitting on non-root linked prims with explicit sit
 targets.

I forgot that m_post is being set inconsistently between non-explicit and explicit ragets
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 127ad40..c88025c 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2590,7 +2590,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     //Quaternion result = (sitTargetOrient * vq) * nq;
 
-                    m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT - part.GroupPosition;
+                    m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT + part.OffsetPosition;
                     Rotation = sitTargetOrient;
                     ParentPosition = part.AbsolutePosition;
                 }
-- 
cgit v1.1


From 8217b52d3a05fcc78bee7cac5724b6e28cffe7f7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Nov 2013 01:40:48 +0000
Subject: Remove old *.exe.config files that related to programs that have long
 been deleted or renamed

---
 bin/OpenSim.Services.exe.config | 33 ---------------------------------
 bin/OpenSimExport.exe.config    | 28 ----------------------------
 bin/SimpleApp.exe.config        | 28 ----------------------------
 3 files changed, 89 deletions(-)
 delete mode 100644 bin/OpenSim.Services.exe.config
 delete mode 100644 bin/OpenSimExport.exe.config
 delete mode 100644 bin/SimpleApp.exe.config

diff --git a/bin/OpenSim.Services.exe.config b/bin/OpenSim.Services.exe.config
deleted file mode 100644
index c2d93c0..0000000
--- a/bin/OpenSim.Services.exe.config
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-  </configSections>
-  <runtime>
-    <gcConcurrent enabled="true" />
-	<gcServer enabled="true" />
-  </runtime>
-  <appSettings>
-  </appSettings>
-  <log4net>
-    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
-      </layout>
-    </appender>
-
-    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSim.log" />
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-  </log4net>
-</configuration>
diff --git a/bin/OpenSimExport.exe.config b/bin/OpenSimExport.exe.config
deleted file mode 100644
index 3fcb22d..0000000
--- a/bin/OpenSimExport.exe.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-  </configSections>
-  <appSettings>
-  </appSettings>
-  <log4net>
-    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
-      </layout>
-    </appender>
-    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSimExport.log" />
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-  </log4net>
-</configuration>
diff --git a/bin/SimpleApp.exe.config b/bin/SimpleApp.exe.config
deleted file mode 100644
index c4d9c22..0000000
--- a/bin/SimpleApp.exe.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-  </configSections>
-  <appSettings>
-  </appSettings>
-  <log4net>
-    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
-      </layout>
-    </appender>
-    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="SimpleApp.log" />
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-  </log4net>
-</configuration>
-- 
cgit v1.1


From f3f3d390f7751365fe2bf2e53558c405f8446487 Mon Sep 17 00:00:00 2001
From: Fernando Oliveira
Date: Fri, 22 Nov 2013 23:38:04 -0200
Subject: Fixed the update StoreRegionWindlightSettings() wasn't updating
 regionwindlight table, raising PrimaryKey violation;

Signed-off-by: Fernando Oliveira <fernando@oliveira.eti.br>
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
---
 OpenSim/Data/PGSQL/PGSQLSimulationData.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
index 69b0beb..354d749 100644
--- a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
@@ -824,7 +824,7 @@ namespace OpenSim.Data.PGSQL
 
         public void StoreRegionWindlightSettings(RegionLightShareData wl)
         {
-            string sql = @"select count (region_id) from regionwindlight where ""region_id"" = :region_id ;";
+            string sql = @"select region_id from regionwindlight where ""region_id"" = :region_id limit 1;";
             bool exists = false;
             using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             {
@@ -832,7 +832,8 @@ namespace OpenSim.Data.PGSQL
                 using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                 {
                     cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID.ToString() ));
-                    exists = cmd.ExecuteNonQuery() > 0;
+                    NpgsqlDataReader dr = cmd.ExecuteReader();
+                    exists = dr.Read();
                 }
             }
             if (exists)
@@ -975,7 +976,7 @@ namespace OpenSim.Data.PGSQL
                 conn.Open();
                 using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                 {
-                    cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID));
+                    cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID.ToString()));
                     cmd.Parameters.Add(_Database.CreateParameter("water_color_r", wl.waterColor.X));
                     cmd.Parameters.Add(_Database.CreateParameter("water_color_g", wl.waterColor.Y));
                     cmd.Parameters.Add(_Database.CreateParameter("water_color_b", wl.waterColor.Z));
@@ -993,7 +994,7 @@ namespace OpenSim.Data.PGSQL
                     cmd.Parameters.Add(_Database.CreateParameter("big_wave_direction_y", wl.bigWaveDirection.Y));
                     cmd.Parameters.Add(_Database.CreateParameter("little_wave_direction_x", wl.littleWaveDirection.X));
                     cmd.Parameters.Add(_Database.CreateParameter("little_wave_direction_y", wl.littleWaveDirection.Y));
-                    cmd.Parameters.Add(_Database.CreateParameter("normal_map_texture", wl.normalMapTexture));
+                    cmd.Parameters.Add(_Database.CreateParameter("normal_map_texture", wl.normalMapTexture.ToString()));
                     cmd.Parameters.Add(_Database.CreateParameter("horizon_r", wl.horizon.X));
                     cmd.Parameters.Add(_Database.CreateParameter("horizon_g", wl.horizon.Y));
                     cmd.Parameters.Add(_Database.CreateParameter("horizon_b", wl.horizon.Z));
-- 
cgit v1.1


From 65304260af283211443a2872c46f6609d3e45649 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Nov 2013 02:09:03 +0000
Subject: fix avatar rotation when sitting on a linked part

Need to take into account rotation of linked prim now that we are always specifying sits wrt the root prim
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c88025c..7a1017f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2591,7 +2591,7 @@ namespace OpenSim.Region.Framework.Scenes
                     //Quaternion result = (sitTargetOrient * vq) * nq;
 
                     m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT + part.OffsetPosition;
-                    Rotation = sitTargetOrient;
+                    Rotation = part.RotationOffset * sitTargetOrient;
                     ParentPosition = part.AbsolutePosition;
                 }
                 else
-- 
cgit v1.1


From 5aa3236ebeb4bbbdd5b539bfe0841029cf01fb9f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Nov 2013 02:27:03 +0000
Subject: Revert "fix avatar rotation when sitting on a linked part"

Reverting for now to place on separate branch

This reverts commit 65304260af283211443a2872c46f6609d3e45649.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 7a1017f..c88025c 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2591,7 +2591,7 @@ namespace OpenSim.Region.Framework.Scenes
                     //Quaternion result = (sitTargetOrient * vq) * nq;
 
                     m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT + part.OffsetPosition;
-                    Rotation = part.RotationOffset * sitTargetOrient;
+                    Rotation = sitTargetOrient;
                     ParentPosition = part.AbsolutePosition;
                 }
                 else
-- 
cgit v1.1


From 910f07dffa001fbb6c3dd7f5ae3cfbaad161864e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Nov 2013 02:27:26 +0000
Subject: Revert "Refix fix for sitting on non-root linked prims with explicit
 sit targets."

This reverts commit 78649eb0999a5f97cc541c94ec98d1d06ed957cb.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c88025c..127ad40 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2590,7 +2590,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     //Quaternion result = (sitTargetOrient * vq) * nq;
 
-                    m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT + part.OffsetPosition;
+                    m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT - part.GroupPosition;
                     Rotation = sitTargetOrient;
                     ParentPosition = part.AbsolutePosition;
                 }
-- 
cgit v1.1


From eb172be5412a631db115346b4e75e5731b989920 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Nov 2013 02:28:30 +0000
Subject: Revert "Fix non-root prim sit positions for prims where a sit target
 has been specified as well."

Revert to place on separate branch for now

This reverts commit 70e651a8d1d0c2a48c4f26cd1c70bee098c11a57.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 127ad40..17b6126 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2590,7 +2590,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     //Quaternion result = (sitTargetOrient * vq) * nq;
 
-                    m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT - part.GroupPosition;
+                    m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT;
                     Rotation = sitTargetOrient;
                     ParentPosition = part.AbsolutePosition;
                 }
-- 
cgit v1.1


From a68d1fad73f1b11ef5c1be84da0689586a2c7870 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Nov 2013 02:29:14 +0000
Subject: Revert "Still send CameraEyeOffset in UDP SendSitReponse even if at
 offset is Vector3.Zero"

This reverts commit 9bdd3dc7de46507b490a2eae5160123a28133d63.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 1ac9d7f..29751ff 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -2635,8 +2635,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             AvatarSitResponsePacket avatarSitResponse = new AvatarSitResponsePacket();
             avatarSitResponse.SitObject.ID = TargetID;
-            avatarSitResponse.SitTransform.CameraAtOffset = CameraAtOffset;
-            avatarSitResponse.SitTransform.CameraEyeOffset = CameraEyeOffset;
+            if (CameraAtOffset != Vector3.Zero)
+            {
+                avatarSitResponse.SitTransform.CameraAtOffset = CameraAtOffset;
+                avatarSitResponse.SitTransform.CameraEyeOffset = CameraEyeOffset;
+            }
             avatarSitResponse.SitTransform.ForceMouselook = ForceMouseLook;
             avatarSitResponse.SitTransform.AutoPilot = autopilot;
             avatarSitResponse.SitTransform.SitPosition = OffsetPos;
-- 
cgit v1.1


From 1999b218fd679166d64c9c7bfabb0c16fbf8aa92 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Nov 2013 02:31:17 +0000
Subject: Revert "Add line accidentally left out of recent non-root prim sit
 fix"

Reverting to place on new branch

This reverts commit ed1029712a85206430fee1d4897d473517728dab.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 17b6126..ea8e4fe 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2314,8 +2314,6 @@ namespace OpenSim.Region.Framework.Scenes
 
                 // An viewer expects to specify sit positions as offsets to the root prim, even if a child prim is
                 // being sat upon.
-                offset += part.OffsetPosition;
-
                 ControllingClient.SendSitResponse(
                     part.ParentGroup.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
 
-- 
cgit v1.1


From 60e049ea39f9b347ac1395c2373d17a983ab7ff3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Nov 2013 02:31:39 +0000
Subject: Revert "Fix issue where sitting on non-root linked prims would send
 camera to wrong position in third-person and mouselook"

Reverting to place on separate branch

This reverts commit ff4e7de7769b7eaa1b4fd3917e59f362b708226a.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 +-------
 OpenSim/Region/Framework/Scenes/ScenePresence.cs      | 9 ++-------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 29751ff..20bc59c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5218,13 +5218,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " +
                 data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle);
             update.ObjectData = objectData;
-
-            SceneObjectPart parentPart = data.ParentPart;
-            if (parentPart != null)
-                update.ParentID = parentPart.ParentGroup.LocalId;
-            else
-                update.ParentID = 0;
-
+            update.ParentID = data.ParentID;
             update.PathCurve = 16;
             update.PathScaleX = 100;
             update.PathScaleY = 100;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ea8e4fe..7243db1 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2312,10 +2312,8 @@ namespace OpenSim.Region.Framework.Scenes
                 cameraEyeOffset = part.GetCameraEyeOffset();
                 forceMouselook = part.GetForceMouselook();
 
-                // An viewer expects to specify sit positions as offsets to the root prim, even if a child prim is
-                // being sat upon.
                 ControllingClient.SendSitResponse(
-                    part.ParentGroup.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
+                    part.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
 
                 m_requestedSitTargetUUID = part.UUID;
 
@@ -2594,10 +2592,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 else
                 {
-                    // An viewer expects to specify sit positions as offsets to the root prim, even if a child prim is
-                    // being sat upon.
-                    m_pos -= part.GroupPosition;
-
+                    m_pos -= part.AbsolutePosition;
                     ParentPosition = part.AbsolutePosition;
 
 //                        m_log.DebugFormat(
-- 
cgit v1.1


From 0ad45531a18ad577b36818fbe5f51f23ff4a2a9b Mon Sep 17 00:00:00 2001
From: Fernando Oliveira
Date: Mon, 25 Nov 2013 21:20:56 -0200
Subject: Corrected case to get columns from Regions table from PostgreSQL
 http://opensimulator.org/mantis/view.php?id=6865

Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
---
 OpenSim/Data/PGSQL/PGSQLRegionData.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Data/PGSQL/PGSQLRegionData.cs b/OpenSim/Data/PGSQL/PGSQLRegionData.cs
index 8a46559..f3e4064 100644
--- a/OpenSim/Data/PGSQL/PGSQLRegionData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLRegionData.cs
@@ -206,7 +206,7 @@ namespace OpenSim.Data.PGSQL
 
                     DataTable schemaTable = result.GetSchemaTable();
                     foreach (DataRow row in schemaTable.Rows)
-                        m_ColumnNames.Add(row["ColumnName"].ToString());
+                        m_ColumnNames.Add(row["column_name"].ToString());
                 }
 
                 foreach (string s in m_ColumnNames)
@@ -376,7 +376,7 @@ namespace OpenSim.Data.PGSQL
 
         private List<RegionData> Get(int regionFlags, UUID scopeID)
         {
-            string sql = "SELECT * FROM " + m_Realm + " WHERE (flags & " + regionFlags.ToString() + ") <> 0";
+            string sql = "SELECT * FROM " + m_Realm + " WHERE (\"flags\" & " + regionFlags.ToString() + ") <> 0";
             if (scopeID != UUID.Zero)
                 sql += " AND \"ScopeID\" = :scopeID";
 
-- 
cgit v1.1


From 36d146bf272f33eb54de80579b163f27f2703fd4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 26 Nov 2013 00:43:35 +0000
Subject: fix position changes when sitting on a prim with position and/or
 orientation explicitly specified

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 31 +++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 7a1017f..42a9b4d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2267,7 +2267,6 @@ namespace OpenSim.Region.Framework.Scenes
                 m_sitAvatarHeight = PhysicsActor.Size.Z;
 
             bool canSit = false;
-            Vector3 pos = part.AbsolutePosition + offset;
 
             if (part.IsSitTargetSet && part.SitTargetAvatar == UUID.Zero)
             {
@@ -2277,10 +2276,24 @@ namespace OpenSim.Region.Framework.Scenes
 
                 offset = part.SitTargetPosition;
                 sitOrientation = part.SitTargetOrientation;
+
+//                m_log.DebugFormat("Old sit orient {0}", sitOrientation);
+                if (part.IsRoot)
+                    sitOrientation = sitOrientation;
+                else
+                    sitOrientation = part.RotationOffset * sitOrientation;
+//                m_log.DebugFormat("New sit orient {0}", sitOrientation);
+
+//                m_log.DebugFormat("Old sit offset {0}", offset);
+                offset = offset * sitOrientation;
+//                m_log.DebugFormat("New sit offset {0}", offset);
+
                 canSit = true;
             }
             else
             {
+                Vector3 pos = part.AbsolutePosition + offset;
+
                 if (Util.GetDistanceTo(AbsolutePosition, pos) <= 10)
                 {
 //                    m_log.DebugFormat(
@@ -2590,8 +2603,20 @@ namespace OpenSim.Region.Framework.Scenes
 
                     //Quaternion result = (sitTargetOrient * vq) * nq;
 
-                    m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT + part.OffsetPosition;
-                    Rotation = part.RotationOffset * sitTargetOrient;
+                    Vector3 newPos = sitTargetPos + SIT_TARGET_ADJUSTMENT;
+
+                    if (part.IsRoot)
+                        Rotation = sitTargetOrient;
+                    else
+                        Rotation = part.RotationOffset * sitTargetOrient;
+
+//                    m_log.DebugFormat("Old offset2 {0}", newPos);
+                    newPos = newPos * Rotation;
+//                    m_log.DebugFormat("New offset2 {0}", newPos);
+
+                    newPos += part.OffsetPosition;
+
+                    m_pos = newPos;
                     ParentPosition = part.AbsolutePosition;
                 }
                 else
-- 
cgit v1.1


From a3c72dafe6459f20297a937bb4bca3dc00a24c9f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 26 Nov 2013 01:40:55 +0000
Subject: Only translate linked prim specified offset pos by the link prim
 rotation, not any specified avatar rotation as well.

Don't translate root prim position by avatar rotation.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 28 +++++++++++++-----------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 42a9b4d..a73d140 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2277,16 +2277,15 @@ namespace OpenSim.Region.Framework.Scenes
                 offset = part.SitTargetPosition;
                 sitOrientation = part.SitTargetOrientation;
 
-//                m_log.DebugFormat("Old sit orient {0}", sitOrientation);
-                if (part.IsRoot)
-                    sitOrientation = sitOrientation;
-                else
+                if (!part.IsRoot)
+                {
+                    //                m_log.DebugFormat("Old sit orient {0}", sitOrientation);
                     sitOrientation = part.RotationOffset * sitOrientation;
-//                m_log.DebugFormat("New sit orient {0}", sitOrientation);
-
+                    //                m_log.DebugFormat("New sit orient {0}", sitOrientation);
 //                m_log.DebugFormat("Old sit offset {0}", offset);
-                offset = offset * sitOrientation;
+                    offset = offset * part.RotationOffset;
 //                m_log.DebugFormat("New sit offset {0}", offset);
+                }
 
                 canSit = true;
             }
@@ -2604,19 +2603,22 @@ namespace OpenSim.Region.Framework.Scenes
                     //Quaternion result = (sitTargetOrient * vq) * nq;
 
                     Vector3 newPos = sitTargetPos + SIT_TARGET_ADJUSTMENT;
+                    Quaternion newRot;
 
                     if (part.IsRoot)
-                        Rotation = sitTargetOrient;
+                    {
+                        newRot = sitTargetOrient;
+                    }
                     else
-                        Rotation = part.RotationOffset * sitTargetOrient;
-
-//                    m_log.DebugFormat("Old offset2 {0}", newPos);
-                    newPos = newPos * Rotation;
-//                    m_log.DebugFormat("New offset2 {0}", newPos);
+                    {
+                        newPos = newPos * part.RotationOffset;
+                        newRot = part.RotationOffset * sitTargetOrient;
+                    }
 
                     newPos += part.OffsetPosition;
 
                     m_pos = newPos;
+                    Rotation = newRot;
                     ParentPosition = part.AbsolutePosition;
                 }
                 else
-- 
cgit v1.1


From 5a9ec0748b901051ce0ec54e332ae4af002d570e Mon Sep 17 00:00:00 2001
From: dahlia
Date: Tue, 26 Nov 2013 17:18:44 -0800
Subject: add a "rotate scene" console command. Seems to work for
 prims/sculpts/mesh but not for foliage, don't know why. Also doesn't work on
 terrain. Successive use of this command will likely introduce floating point
 error accumulation. Back up your region before using it :)

---
 OpenSim/Region/Application/OpenSim.cs | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index e31c3fc..beb546d 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -296,6 +296,11 @@ namespace OpenSim
                                           "Change the scale of a named prim", 
                                           HandleEditScale);
 
+            m_console.Commands.AddCommand("Objects", false, "rotate scene",
+                                          "rotate scene <degrees>",
+                                          "Rotates all scene objects around x:128, y:128",
+                                          HandleRotateScene);
+
             m_console.Commands.AddCommand("Users", false, "kick user",
                                           "kick user <first> <last> [--force] [message]",
                                           "Kick a user off the simulator",
@@ -505,6 +510,34 @@ namespace OpenSim
             }
         }
 
+        private void HandleRotateScene(string module, string[] args)
+        {
+            string usage = "Usage: rotate scene <angle in degrees>";
+
+            if (args.Length != 3)
+            {
+                MainConsole.Instance.Output(usage);
+                return;
+            }
+            
+            float angle = (float)(Convert.ToSingle(args[2]) / 180.0 * Math.PI);
+            OpenMetaverse.Quaternion rot = OpenMetaverse.Quaternion.CreateFromAxisAngle(0, 0, 1, angle);
+
+            SceneManager.ForEachSelectedScene(delegate(Scene scene) 
+            {
+                scene.ForEachSOG(delegate(SceneObjectGroup sog)
+                {
+                    if (sog.AttachmentPoint == 0)
+                    {
+                        sog.RootPart.UpdateRotation(rot * sog.GroupRotation);
+                        Vector3 offset = sog.AbsolutePosition - new Vector3(128.0f, 128.0f, 0.0f);
+                        offset *= rot;
+                        sog.UpdateGroupPosition(new Vector3(128.0f, 128.0f, 0.0f) + offset);
+                    }
+                });
+            });
+        }
+
         /// <summary>
         /// Creates a new region based on the parameters specified.   This will ask the user questions on the console
         /// </summary>
-- 
cgit v1.1


From 0785210e29c75b09084321dca0569c9e4b73f858 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 27 Nov 2013 02:08:22 +0000
Subject: Fix stand positions rather than having the stand jump to the root
 prim.

---
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  | 10 ++++
 OpenSim/Region/Framework/Scenes/ScenePresence.cs   | 56 +++++++++++++++++++---
 2 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 1ac9d7f..c1aae3f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5076,6 +5076,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 ScenePresence presence = (ScenePresence)entity;
 
+//                m_log.DebugFormat(
+//                    "[LLCLIENTVIEW]: Sending terse update to {0} with position {1} in {2}", Name, presence.OffsetPosition, m_scene.Name);
+
                 attachPoint = presence.State;
                 collisionPlane = presence.CollisionPlane;
                 position = presence.OffsetPosition;
@@ -5195,6 +5198,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data)
         {
+//            m_log.DebugFormat(
+//                "[LLCLIENTVIEW]: Sending full update to {0} with position {1} in {2}", Name, data.OffsetPosition, m_scene.Name);
+
             byte[] objectData = new byte[76];
 
             data.CollisionPlane.ToBytes(objectData, 0);
@@ -12646,6 +12652,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             if (p is ScenePresence)
             {
+//                m_log.DebugFormat(
+//                    "[LLCLIENTVIEW]: Immediately sending terse agent update for {0} to {1} in {2}", 
+//                    p.Name, Name, Scene.Name);
+
                 // 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
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a73d140..f9b598f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -499,6 +499,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 else
                 {
+//                    m_log.DebugFormat("[SCENE PRESENCE]: Fetching abs pos where PhysicsActor == null and parent part {0} for {1}", Name, Scene.Name);
                     // Obtain the correct position of a seated avatar.
                     // In addition to providing the correct position while
                     // the avatar is seated, this value will also
@@ -515,14 +516,14 @@ namespace OpenSim.Region.Framework.Scenes
                     SceneObjectPart sitPart = ParentPart;
 
                     if (sitPart != null)
-                        return sitPart.AbsolutePosition + (m_pos * sitPart.GetWorldRotation());
+                        return sitPart.AbsolutePosition;
                 }
                 
                 return m_pos;
             }
             set
             {
-//                m_log.DebugFormat("[SCENE PRESENCE]: Setting position of {0} in {1} to {2}", Name, Scene.Name, value);
+//                m_log.DebugFormat("[SCENE PRESENCE]: Setting position of {0} to {1} in {2}", Name, value, Scene.Name);
 //                Util.PrintCallStack();
 
                 if (PhysicsActor != null)
@@ -2174,8 +2175,6 @@ namespace OpenSim.Region.Framework.Scenes
 //            m_log.DebugFormat("[SCENE PRESENCE]: StandUp() for {0}", Name);
 
             SitGround = false;
-            if (PhysicsActor == null)
-                AddToPhysicalScene(false);
 
             if (ParentID != 0)
             {
@@ -2198,11 +2197,53 @@ namespace OpenSim.Region.Framework.Scenes
                 ParentPosition = part.GetWorldPosition();
                 ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
 
-                m_pos += ParentPosition + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight);
-                ParentPosition = Vector3.Zero;
-
                 ParentID = 0;
                 ParentPart = null;
+
+                Quaternion standRotation;
+
+                if (part.SitTargetAvatar == UUID)
+                {
+                    standRotation = part.GetWorldRotation();
+
+                    if (!part.IsRoot)
+                        standRotation = standRotation * part.SitTargetOrientation;
+//                        standRotation = part.RotationOffset * part.SitTargetOrientation;
+//                    else
+//                        standRotation = part.SitTargetOrientation;
+
+                }
+                else
+                {
+                    standRotation = Rotation;
+                }
+
+                //Vector3 standPos = ParentPosition + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight);
+                //Vector3 standPos = ParentPosition;
+
+//                Vector3 standPositionAdjustment 
+//                    = part.SitTargetPosition + new Vector3(0.5f, 0f, m_sitAvatarHeight / 2f);
+                Vector3 adjustmentForSitPosition = part.SitTargetPosition * part.GetWorldRotation();
+
+                // XXX: This is based on the physics capsule sizes.  Need to find a better way to read this rather than
+                // hardcoding here.
+                Vector3 adjustmentForSitPose = new Vector3(0.74f, 0f, 0f) * standRotation;
+
+                Vector3 standPos = ParentPosition + adjustmentForSitPosition + adjustmentForSitPose;
+
+                m_log.DebugFormat(
+                    "[SCENE PRESENCE]: Setting stand to pos {0}, (adjustmentForSitPosition {1}, adjustmentForSitPose {2}) rotation {3} for {4} in {5}", 
+                    standPos, adjustmentForSitPosition, adjustmentForSitPose, standRotation, Name, Scene.Name);
+
+                Rotation = standRotation;
+                AbsolutePosition = standPos;
+                ParentPosition = Vector3.Zero;
+
+                // We need to wait until we have calculated proper stand positions before sitting up the physical 
+                // avatar to avoid race conditions.
+                if (PhysicsActor == null)
+                    AddToPhysicalScene(false);
+
                 SendAvatarDataToAllAgents();
                 m_requestedSitTargetID = 0;
 
@@ -2859,6 +2900,7 @@ namespace OpenSim.Region.Framework.Scenes
                 lastTerseUpdateToAllClientsTick = currentTick;
                 lastPositionSentToAllClients = OffsetPosition;
 
+//                Console.WriteLine("Scheduled update for {0} in {1}", Name, Scene.Name);
                 m_scene.ForEachClient(SendTerseUpdateToClient);
             }
             TriggerScenePresenceUpdated();
-- 
cgit v1.1


From e52a8d388fb1fe85b78b5b584cbb7d5444f464c0 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Tue, 26 Nov 2013 21:07:37 -0800
Subject: "rotate scene" command now uses Constants.RegionSize / 2 to pick the
 center of rotation and center can be optionally overridden in the command
 line

---
 OpenSim/Region/Application/OpenSim.cs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index beb546d..c2d9942 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -512,9 +512,12 @@ namespace OpenSim
 
         private void HandleRotateScene(string module, string[] args)
         {
-            string usage = "Usage: rotate scene <angle in degrees>";
+            string usage = "Usage: rotate scene <angle in degrees> [centerX centerY] (centerX and centerY are optional and default to Constants.RegionSize / 2";
 
-            if (args.Length != 3)
+            float centerX = Constants.RegionSize * 0.5f;
+            float centerY = Constants.RegionSize * 0.5f;
+
+            if (args.Length < 3 || args.Length == 4)
             {
                 MainConsole.Instance.Output(usage);
                 return;
@@ -523,6 +526,14 @@ namespace OpenSim
             float angle = (float)(Convert.ToSingle(args[2]) / 180.0 * Math.PI);
             OpenMetaverse.Quaternion rot = OpenMetaverse.Quaternion.CreateFromAxisAngle(0, 0, 1, angle);
 
+            if (args.Length > 4)
+            {
+                centerX = Convert.ToSingle(args[3]);
+                centerY = Convert.ToSingle(args[4]);
+            }
+
+            Vector3 center = new Vector3(centerX, centerY, 0.0f);
+
             SceneManager.ForEachSelectedScene(delegate(Scene scene) 
             {
                 scene.ForEachSOG(delegate(SceneObjectGroup sog)
@@ -530,9 +541,9 @@ namespace OpenSim
                     if (sog.AttachmentPoint == 0)
                     {
                         sog.RootPart.UpdateRotation(rot * sog.GroupRotation);
-                        Vector3 offset = sog.AbsolutePosition - new Vector3(128.0f, 128.0f, 0.0f);
+                        Vector3 offset = sog.AbsolutePosition - center;
                         offset *= rot;
-                        sog.UpdateGroupPosition(new Vector3(128.0f, 128.0f, 0.0f) + offset);
+                        sog.UpdateGroupPosition(center + offset);
                     }
                 });
             });
-- 
cgit v1.1


From 73dadef8df794868f8db59cc2dca0cae090bb536 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Wed, 27 Nov 2013 12:01:09 -0800
Subject: Change the log level for the LOGIN DISABLED and LOGIN ENABLED
 messages is the RegionReady module to be warn so that the message will show
 up in the log for simulators running in a more production mode (knowing when
 logins are functional is useful).

---
 .../Scripting/RegionReadyModule/RegionReadyModule.cs                | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
index c550c44..c717128 100644
--- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
@@ -105,7 +105,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
                 m_scene.LoginLock = true;
                 m_scene.EventManager.OnEmptyScriptCompileQueue += OnEmptyScriptCompileQueue;
 
-                m_log.InfoFormat("[RegionReady]: Region {0} - LOGINS DISABLED DURING INITIALIZATION.", m_scene.Name);
+                // Warn level because the region cannot be used while logins are disabled
+                m_log.WarnFormat("[RegionReady]: Region {0} - LOGINS DISABLED DURING INITIALIZATION.", m_scene.Name);
 
                 if (m_uri != string.Empty)
                 {
@@ -215,7 +216,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
                 // m_log.InfoFormat("[RegionReady]: Logins enabled for {0}, Oar {1}",
                 //                 m_scene.RegionInfo.RegionName, m_oarFileLoading.ToString());
 
-                m_log.InfoFormat(
+                // Warn level because the region cannot be used while logins are disabled
+                m_log.WarnFormat(
                     "[RegionReady]: INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", m_scene.Name);
             }
 
-- 
cgit v1.1


From 13017034b16bc4f406a2013b88ac3b88efa34c89 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 28 Nov 2013 00:23:27 +0000
Subject: minor: Change ProfileServiceURL reference in OpenSim.ini.example to
 be consistent

---
 bin/OpenSim.ini.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index d3f9156..28c16cf 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1043,7 +1043,7 @@
 
 
 [UserProfiles]
-  ;# {ProfileURL} {} {Set url to UserProfilesService} {}
+  ;# {ProfileServiceURL} {} {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
-- 
cgit v1.1


From a64377149d43f2c79bd39bb0accd863bb601f6a9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 29 Nov 2013 00:44:53 +0000
Subject: Add parameter checking for land_collision, land_collision_start and
 land_collision_end lsl events

Wrong number of parmeters now generates syntax error on compile, as seen on LL grid
---
 .../Shared/CodeTools/Tests/LSL_EventTests.cs       |    38 +-
 .../ScriptEngine/Shared/CodeTools/lsl.parser.cs    | 15929 ++++++++++---------
 2 files changed, 8174 insertions(+), 7793 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
index 53ce405..5dcdf1a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
@@ -213,7 +213,35 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("touch_end");
-        }           
+        }  
+
+        [Test]
+        public void TestLandCollisionEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestVectorArgEvent("land_collision");
+        }
+
+        [Test]
+        public void TestLandCollisionStartEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestVectorArgEvent("land_collision_start");
+        }
+
+        [Test]
+        public void TestLandCollisionEndEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestVectorArgEvent("land_collision_end");
+        }
+
 
         private void TestIntArgEvent(string eventName)
         {
@@ -223,6 +251,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TestCompile("default { " + eventName + "(integer n, integer o) {{}} }", true);
         }
 
+        private void TestVectorArgEvent(string eventName)
+        {
+            TestCompile("default { " + eventName + "(vector v) {} }", false);
+            TestCompile("default { " + eventName + "{{}} }", true);
+            TestCompile("default { " + eventName + "(string s) {{}} }", true);
+            TestCompile("default { " + eventName + "(vector v, vector w) {{}} }", true);
+        }
+
         private void TestCompile(string script, bool expectException)
         {
             bool gotException = false;
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
index 9b4b205..1a14205 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
@@ -130,23 +130,31 @@ public class StateEvent : SYMBOL{
 public override string yyname { get { return "StateEvent"; }}
 public override int yynum { get { return 103; }}
 public StateEvent(Parser yyp):base(yyp){}}
-//%+IntArgStateEvent+104
-public class IntArgStateEvent : StateEvent{
- public  IntArgStateEvent (Parser yyp, string  name , IntArgumentDeclarationList  iadl , CompoundStatement  cs ):base(((LSLSyntax
-)yyp), name , iadl , cs ){}
-
-public override string yyname { get { return "IntArgStateEvent"; }}
-public override int yynum { get { return 104; }}
-public IntArgStateEvent(Parser yyp):base(yyp){}}
-//%+VoidArgStateEvent+105
+//%+VoidArgStateEvent+104
 public class VoidArgStateEvent : StateEvent{
  public  VoidArgStateEvent (Parser yyp, string  name , CompoundStatement  cs ):base(((LSLSyntax
 )yyp), name , cs ){}
 
 public override string yyname { get { return "VoidArgStateEvent"; }}
-public override int yynum { get { return 105; }}
+public override int yynum { get { return 104; }}
 public VoidArgStateEvent(Parser yyp):base(yyp){}}
-//%+ArgumentDeclarationList+106
+//%+IntArgStateEvent+105
+public class IntArgStateEvent : StateEvent{
+ public  IntArgStateEvent (Parser yyp, string  name , IntArgumentDeclarationList  adl , CompoundStatement  cs ):base(((LSLSyntax
+)yyp), name , adl , cs ){}
+
+public override string yyname { get { return "IntArgStateEvent"; }}
+public override int yynum { get { return 105; }}
+public IntArgStateEvent(Parser yyp):base(yyp){}}
+//%+VectorArgStateEvent+106
+public class VectorArgStateEvent : StateEvent{
+ public  VectorArgStateEvent (Parser yyp, string  name , VectorArgumentDeclarationList  adl , CompoundStatement  cs ):base(((LSLSyntax
+)yyp), name , adl , cs ){}
+
+public override string yyname { get { return "VectorArgStateEvent"; }}
+public override int yynum { get { return 106; }}
+public VectorArgStateEvent(Parser yyp):base(yyp){}}
+//%+ArgumentDeclarationList+107
 public class ArgumentDeclarationList : SYMBOL{
  public  ArgumentDeclarationList (Parser yyp, Declaration  d ):base(((LSLSyntax
 )yyp)){ kids . Add ( d );
@@ -157,17 +165,25 @@ public class ArgumentDeclarationList : SYMBOL{
 }
 
 public override string yyname { get { return "ArgumentDeclarationList"; }}
-public override int yynum { get { return 106; }}
+public override int yynum { get { return 107; }}
 public ArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+IntArgumentDeclarationList+107
+//%+IntArgumentDeclarationList+108
 public class IntArgumentDeclarationList : ArgumentDeclarationList{
  public  IntArgumentDeclarationList (Parser yyp, IntDeclaration  d ):base(((LSLSyntax
 )yyp), d ){}
 
 public override string yyname { get { return "IntArgumentDeclarationList"; }}
-public override int yynum { get { return 107; }}
+public override int yynum { get { return 108; }}
 public IntArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+Declaration+108
+//%+VectorArgumentDeclarationList+109
+public class VectorArgumentDeclarationList : ArgumentDeclarationList{
+ public  VectorArgumentDeclarationList (Parser yyp, VectorDeclaration  d ):base(((LSLSyntax
+)yyp), d ){}
+
+public override string yyname { get { return "VectorArgumentDeclarationList"; }}
+public override int yynum { get { return 109; }}
+public VectorArgumentDeclarationList(Parser yyp):base(yyp){}}
+//%+Declaration+110
 public class Declaration : SYMBOL{
  private  string  m_datatype ;
  private  string  m_id ;
@@ -187,17 +203,25 @@ public class Declaration : SYMBOL{
 }
 
 public override string yyname { get { return "Declaration"; }}
-public override int yynum { get { return 108; }}
+public override int yynum { get { return 110; }}
 public Declaration(Parser yyp):base(yyp){}}
-//%+IntDeclaration+109
+//%+IntDeclaration+111
 public class IntDeclaration : Declaration{
  public  IntDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
 )yyp), type , id ){}
 
 public override string yyname { get { return "IntDeclaration"; }}
-public override int yynum { get { return 109; }}
+public override int yynum { get { return 111; }}
 public IntDeclaration(Parser yyp):base(yyp){}}
-//%+Typename+110
+//%+VectorDeclaration+112
+public class VectorDeclaration : Declaration{
+ public  VectorDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
+)yyp), type , id ){}
+
+public override string yyname { get { return "VectorDeclaration"; }}
+public override int yynum { get { return 112; }}
+public VectorDeclaration(Parser yyp):base(yyp){}}
+//%+Typename+113
 public class Typename : SYMBOL{
  public  string  yytext ;
  public  Typename (Parser yyp, string  text ):base(((LSLSyntax
@@ -205,9 +229,9 @@ public class Typename : SYMBOL{
 }
 
 public override string yyname { get { return "Typename"; }}
-public override int yynum { get { return 110; }}
+public override int yynum { get { return 113; }}
 public Typename(Parser yyp):base(yyp){}}
-//%+Event+111
+//%+Event+114
 public class Event : SYMBOL{
  public  string  yytext ;
  public  Event (Parser yyp, string  text ):base(((LSLSyntax
@@ -215,25 +239,33 @@ public class Event : SYMBOL{
 }
 
 public override string yyname { get { return "Event"; }}
-public override int yynum { get { return 111; }}
+public override int yynum { get { return 114; }}
 public Event(Parser yyp):base(yyp){}}
-//%+IntArgEvent+112
+//%+VoidArgEvent+115
+public class VoidArgEvent : Event{
+ public  VoidArgEvent (Parser yyp, string  text ):base(((LSLSyntax
+)yyp), text ){}
+
+public override string yyname { get { return "VoidArgEvent"; }}
+public override int yynum { get { return 115; }}
+public VoidArgEvent(Parser yyp):base(yyp){}}
+//%+IntArgEvent+116
 public class IntArgEvent : Event{
  public  IntArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "IntArgEvent"; }}
-public override int yynum { get { return 112; }}
+public override int yynum { get { return 116; }}
 public IntArgEvent(Parser yyp):base(yyp){}}
-//%+VoidArgEvent+113
-public class VoidArgEvent : Event{
- public  VoidArgEvent (Parser yyp, string  text ):base(((LSLSyntax
+//%+VectorArgEvent+117
+public class VectorArgEvent : Event{
+ public  VectorArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
-public override string yyname { get { return "VoidArgEvent"; }}
-public override int yynum { get { return 113; }}
-public VoidArgEvent(Parser yyp):base(yyp){}}
-//%+CompoundStatement+114
+public override string yyname { get { return "VectorArgEvent"; }}
+public override int yynum { get { return 117; }}
+public VectorArgEvent(Parser yyp):base(yyp){}}
+//%+CompoundStatement+118
 public class CompoundStatement : SYMBOL{
  public  CompoundStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -242,9 +274,9 @@ public class CompoundStatement : SYMBOL{
 }
 
 public override string yyname { get { return "CompoundStatement"; }}
-public override int yynum { get { return 114; }}
+public override int yynum { get { return 118; }}
 }
-//%+StatementList+115
+//%+StatementList+119
 public class StatementList : SYMBOL{
  private  void  AddStatement ( Statement  s ){ if ( s . kids . Top  is  IfStatement || s . kids . Top  is  WhileStatement || s . kids . Top  is  DoWhileStatement || s . kids . Top  is  ForLoop ) kids . Add ( s . kids . Pop ());
  else  kids . Add ( s );
@@ -258,9 +290,9 @@ public class StatementList : SYMBOL{
 }
 
 public override string yyname { get { return "StatementList"; }}
-public override int yynum { get { return 115; }}
+public override int yynum { get { return 119; }}
 public StatementList(Parser yyp):base(yyp){}}
-//%+Statement+116
+//%+Statement+120
 public class Statement : SYMBOL{
  public  Statement (Parser yyp, Declaration  d ):base(((LSLSyntax
 )yyp)){ kids . Add ( d );
@@ -306,9 +338,9 @@ public class Statement : SYMBOL{
 }
 
 public override string yyname { get { return "Statement"; }}
-public override int yynum { get { return 116; }}
+public override int yynum { get { return 120; }}
 public Statement(Parser yyp):base(yyp){}}
-//%+EmptyStatement+117
+//%+EmptyStatement+121
 public class EmptyStatement : SYMBOL{
  public  EmptyStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -316,9 +348,9 @@ public class EmptyStatement : SYMBOL{
 }
 
 public override string yyname { get { return "EmptyStatement"; }}
-public override int yynum { get { return 117; }}
+public override int yynum { get { return 121; }}
 }
-//%+Assignment+118
+//%+Assignment+122
 public class Assignment : SYMBOL{
  protected  string  m_assignmentType ;
  public  Assignment (Parser yyp, SYMBOL  lhs , SYMBOL  rhs , string  assignmentType ):base(((LSLSyntax
@@ -338,9 +370,9 @@ public class Assignment : SYMBOL{
 }
 
 public override string yyname { get { return "Assignment"; }}
-public override int yynum { get { return 118; }}
+public override int yynum { get { return 122; }}
 public Assignment(Parser yyp):base(yyp){}}
-//%+SimpleAssignment+119
+//%+SimpleAssignment+123
 public class SimpleAssignment : Assignment{
  public  SimpleAssignment (Parser yyp, SYMBOL  lhs , SYMBOL  rhs , string  assignmentType ):base(((LSLSyntax
 )yyp)){ m_assignmentType = assignmentType ;
@@ -350,9 +382,9 @@ public class SimpleAssignment : Assignment{
 }
 
 public override string yyname { get { return "SimpleAssignment"; }}
-public override int yynum { get { return 119; }}
+public override int yynum { get { return 123; }}
 public SimpleAssignment(Parser yyp):base(yyp){}}
-//%+ReturnStatement+120
+//%+ReturnStatement+124
 public class ReturnStatement : SYMBOL{
  public  ReturnStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -362,9 +394,9 @@ public class ReturnStatement : SYMBOL{
 }
 
 public override string yyname { get { return "ReturnStatement"; }}
-public override int yynum { get { return 120; }}
+public override int yynum { get { return 124; }}
 }
-//%+JumpLabel+121
+//%+JumpLabel+125
 public class JumpLabel : SYMBOL{
  private  string  m_labelName ;
  public  JumpLabel (Parser yyp, string  labelName ):base(((LSLSyntax
@@ -377,9 +409,9 @@ public class JumpLabel : SYMBOL{
 }
 
 public override string yyname { get { return "JumpLabel"; }}
-public override int yynum { get { return 121; }}
+public override int yynum { get { return 125; }}
 public JumpLabel(Parser yyp):base(yyp){}}
-//%+JumpStatement+122
+//%+JumpStatement+126
 public class JumpStatement : SYMBOL{
  private  string  m_targetName ;
  public  JumpStatement (Parser yyp, string  targetName ):base(((LSLSyntax
@@ -392,9 +424,9 @@ public class JumpStatement : SYMBOL{
 }
 
 public override string yyname { get { return "JumpStatement"; }}
-public override int yynum { get { return 122; }}
+public override int yynum { get { return 126; }}
 public JumpStatement(Parser yyp):base(yyp){}}
-//%+StateChange+123
+//%+StateChange+127
 public class StateChange : SYMBOL{
  private  string  m_newState ;
  public  StateChange (Parser yyp, string  newState ):base(((LSLSyntax
@@ -405,9 +437,9 @@ public class StateChange : SYMBOL{
 }
 
 public override string yyname { get { return "StateChange"; }}
-public override int yynum { get { return 123; }}
+public override int yynum { get { return 127; }}
 public StateChange(Parser yyp):base(yyp){}}
-//%+IfStatement+124
+//%+IfStatement+128
 public class IfStatement : SYMBOL{
  private  void  AddStatement ( Statement  s ){ if (0< s . kids . Count && s . kids . Top  is  CompoundStatement ) kids . Add ( s . kids . Pop ());
  else  kids . Add ( s );
@@ -424,9 +456,9 @@ public class IfStatement : SYMBOL{
 }
 
 public override string yyname { get { return "IfStatement"; }}
-public override int yynum { get { return 124; }}
+public override int yynum { get { return 128; }}
 public IfStatement(Parser yyp):base(yyp){}}
-//%+WhileStatement+125
+//%+WhileStatement+129
 public class WhileStatement : SYMBOL{
  public  WhileStatement (Parser yyp, SYMBOL  s , Statement  st ):base(((LSLSyntax
 )yyp)){ kids . Add ( s );
@@ -435,9 +467,9 @@ public class WhileStatement : SYMBOL{
 }
 
 public override string yyname { get { return "WhileStatement"; }}
-public override int yynum { get { return 125; }}
+public override int yynum { get { return 129; }}
 public WhileStatement(Parser yyp):base(yyp){}}
-//%+DoWhileStatement+126
+//%+DoWhileStatement+130
 public class DoWhileStatement : SYMBOL{
  public  DoWhileStatement (Parser yyp, SYMBOL  s , Statement  st ):base(((LSLSyntax
 )yyp)){ if (0< st . kids . Count && st . kids . Top  is  CompoundStatement ) kids . Add ( st . kids . Pop ());
@@ -446,9 +478,9 @@ public class DoWhileStatement : SYMBOL{
 }
 
 public override string yyname { get { return "DoWhileStatement"; }}
-public override int yynum { get { return 126; }}
+public override int yynum { get { return 130; }}
 public DoWhileStatement(Parser yyp):base(yyp){}}
-//%+ForLoop+127
+//%+ForLoop+131
 public class ForLoop : SYMBOL{
  public  ForLoop (Parser yyp, ForLoopStatement  flsa , Expression  e , ForLoopStatement  flsb , Statement  s ):base(((LSLSyntax
 )yyp)){ kids . Add ( flsa );
@@ -459,9 +491,9 @@ public class ForLoop : SYMBOL{
 }
 
 public override string yyname { get { return "ForLoop"; }}
-public override int yynum { get { return 127; }}
+public override int yynum { get { return 131; }}
 public ForLoop(Parser yyp):base(yyp){}}
-//%+ForLoopStatement+128
+//%+ForLoopStatement+132
 public class ForLoopStatement : SYMBOL{
  public  ForLoopStatement (Parser yyp, Expression  e ):base(((LSLSyntax
 )yyp)){ kids . Add ( e );
@@ -479,9 +511,9 @@ public class ForLoopStatement : SYMBOL{
 }
 
 public override string yyname { get { return "ForLoopStatement"; }}
-public override int yynum { get { return 128; }}
+public override int yynum { get { return 132; }}
 public ForLoopStatement(Parser yyp):base(yyp){}}
-//%+FunctionCall+129
+//%+FunctionCall+133
 public class FunctionCall : SYMBOL{
  private  string  m_id ;
  public  FunctionCall (Parser yyp, string  id , ArgumentList  al ):base(((LSLSyntax
@@ -495,9 +527,9 @@ public class FunctionCall : SYMBOL{
 }
 
 public override string yyname { get { return "FunctionCall"; }}
-public override int yynum { get { return 129; }}
+public override int yynum { get { return 133; }}
 public FunctionCall(Parser yyp):base(yyp){}}
-//%+ArgumentList+130
+//%+ArgumentList+134
 public class ArgumentList : SYMBOL{
  public  ArgumentList (Parser yyp, Argument  a ):base(((LSLSyntax
 )yyp)){ AddArgument ( a );
@@ -511,14 +543,14 @@ public class ArgumentList : SYMBOL{
 }
 
 public override string yyname { get { return "ArgumentList"; }}
-public override int yynum { get { return 130; }}
+public override int yynum { get { return 134; }}
 public ArgumentList(Parser yyp):base(yyp){}}
-//%+Argument+131
+//%+Argument+135
 public class Argument : SYMBOL{
 public override string yyname { get { return "Argument"; }}
-public override int yynum { get { return 131; }}
+public override int yynum { get { return 135; }}
 public Argument(Parser yyp):base(yyp){}}
-//%+ExpressionArgument+132
+//%+ExpressionArgument+136
 public class ExpressionArgument : Argument{
  public  ExpressionArgument (Parser yyp, Expression  e ):base(((LSLSyntax
 )yyp)){ if ( e  is  ConstantExpression ) while (0< e . kids . Count ) kids . Add ( e . kids . Pop ());
@@ -526,9 +558,9 @@ public class ExpressionArgument : Argument{
 }
 
 public override string yyname { get { return "ExpressionArgument"; }}
-public override int yynum { get { return 132; }}
+public override int yynum { get { return 136; }}
 public ExpressionArgument(Parser yyp):base(yyp){}}
-//%+Constant+133
+//%+Constant+137
 public class Constant : SYMBOL{
  private  string  m_type ;
  private  string  m_val ;
@@ -550,9 +582,9 @@ public class Constant : SYMBOL{
 }
 
 public override string yyname { get { return "Constant"; }}
-public override int yynum { get { return 133; }}
+public override int yynum { get { return 137; }}
 public Constant(Parser yyp):base(yyp){}}
-//%+VectorConstant+134
+//%+VectorConstant+138
 public class VectorConstant : Constant{
  public  VectorConstant (Parser yyp, Expression  valX , Expression  valY , Expression  valZ ):base(((LSLSyntax
 )yyp),"vector", null ){ kids . Add ( valX );
@@ -561,9 +593,9 @@ public class VectorConstant : Constant{
 }
 
 public override string yyname { get { return "VectorConstant"; }}
-public override int yynum { get { return 134; }}
+public override int yynum { get { return 138; }}
 public VectorConstant(Parser yyp):base(yyp){}}
-//%+RotationConstant+135
+//%+RotationConstant+139
 public class RotationConstant : Constant{
  public  RotationConstant (Parser yyp, Expression  valX , Expression  valY , Expression  valZ , Expression  valS ):base(((LSLSyntax
 )yyp),"rotation", null ){ kids . Add ( valX );
@@ -573,36 +605,36 @@ public class RotationConstant : Constant{
 }
 
 public override string yyname { get { return "RotationConstant"; }}
-public override int yynum { get { return 135; }}
+public override int yynum { get { return 139; }}
 public RotationConstant(Parser yyp):base(yyp){}}
-//%+ListConstant+136
+//%+ListConstant+140
 public class ListConstant : Constant{
  public  ListConstant (Parser yyp, ArgumentList  al ):base(((LSLSyntax
 )yyp),"list", null ){ kids . Add ( al );
 }
 
 public override string yyname { get { return "ListConstant"; }}
-public override int yynum { get { return 136; }}
+public override int yynum { get { return 140; }}
 public ListConstant(Parser yyp):base(yyp){}}
-//%+Expression+137
+//%+Expression+141
 public class Expression : SYMBOL{
  protected  void  AddExpression ( Expression  e ){ if ( e  is  ConstantExpression ) while (0< e . kids . Count ) kids . Add ( e . kids . Pop ());
  else  kids . Add ( e );
 }
 
 public override string yyname { get { return "Expression"; }}
-public override int yynum { get { return 137; }}
+public override int yynum { get { return 141; }}
 public Expression(Parser yyp):base(yyp){}}
-//%+ConstantExpression+138
+//%+ConstantExpression+142
 public class ConstantExpression : Expression{
  public  ConstantExpression (Parser yyp, Constant  c ):base(((LSLSyntax
 )yyp)){ kids . Add ( c );
 }
 
 public override string yyname { get { return "ConstantExpression"; }}
-public override int yynum { get { return 138; }}
+public override int yynum { get { return 142; }}
 public ConstantExpression(Parser yyp):base(yyp){}}
-//%+IdentExpression+139
+//%+IdentExpression+143
 public class IdentExpression : Expression{
  protected  string  m_name ;
  public  IdentExpression (Parser yyp, string  name ):base(((LSLSyntax
@@ -615,9 +647,9 @@ public class IdentExpression : Expression{
 }
 
 public override string yyname { get { return "IdentExpression"; }}
-public override int yynum { get { return 139; }}
+public override int yynum { get { return 143; }}
 public IdentExpression(Parser yyp):base(yyp){}}
-//%+IdentDotExpression+140
+//%+IdentDotExpression+144
 public class IdentDotExpression : IdentExpression{
  private  string  m_member ;
  public  IdentDotExpression (Parser yyp, string  name , string  member ):base(((LSLSyntax
@@ -631,18 +663,18 @@ public class IdentDotExpression : IdentExpression{
 }
 
 public override string yyname { get { return "IdentDotExpression"; }}
-public override int yynum { get { return 140; }}
+public override int yynum { get { return 144; }}
 public IdentDotExpression(Parser yyp):base(yyp){}}
-//%+FunctionCallExpression+141
+//%+FunctionCallExpression+145
 public class FunctionCallExpression : Expression{
  public  FunctionCallExpression (Parser yyp, FunctionCall  fc ):base(((LSLSyntax
 )yyp)){ kids . Add ( fc );
 }
 
 public override string yyname { get { return "FunctionCallExpression"; }}
-public override int yynum { get { return 141; }}
+public override int yynum { get { return 145; }}
 public FunctionCallExpression(Parser yyp):base(yyp){}}
-//%+BinaryExpression+142
+//%+BinaryExpression+146
 public class BinaryExpression : Expression{
  private  string  m_expressionSymbol ;
  public  BinaryExpression (Parser yyp, Expression  lhs , Expression  rhs , string  expressionSymbol ):base(((LSLSyntax
@@ -657,9 +689,9 @@ public class BinaryExpression : Expression{
 }
 
 public override string yyname { get { return "BinaryExpression"; }}
-public override int yynum { get { return 142; }}
+public override int yynum { get { return 146; }}
 public BinaryExpression(Parser yyp):base(yyp){}}
-//%+UnaryExpression+143
+//%+UnaryExpression+147
 public class UnaryExpression : Expression{
  private  string  m_unarySymbol ;
  public  UnaryExpression (Parser yyp, string  unarySymbol , Expression  e ):base(((LSLSyntax
@@ -673,9 +705,9 @@ public class UnaryExpression : Expression{
 }
 
 public override string yyname { get { return "UnaryExpression"; }}
-public override int yynum { get { return 143; }}
+public override int yynum { get { return 147; }}
 public UnaryExpression(Parser yyp):base(yyp){}}
-//%+TypecastExpression+144
+//%+TypecastExpression+148
 public class TypecastExpression : Expression{
  private  string  m_typecastType ;
  public  TypecastExpression (Parser yyp, string  typecastType , SYMBOL  rhs ):base(((LSLSyntax
@@ -689,18 +721,18 @@ public class TypecastExpression : Expression{
 }
 
 public override string yyname { get { return "TypecastExpression"; }}
-public override int yynum { get { return 144; }}
+public override int yynum { get { return 148; }}
 public TypecastExpression(Parser yyp):base(yyp){}}
-//%+ParenthesisExpression+145
+//%+ParenthesisExpression+149
 public class ParenthesisExpression : Expression{
  public  ParenthesisExpression (Parser yyp, SYMBOL  s ):base(((LSLSyntax
 )yyp)){ kids . Add ( s );
 }
 
 public override string yyname { get { return "ParenthesisExpression"; }}
-public override int yynum { get { return 145; }}
+public override int yynum { get { return 149; }}
 public ParenthesisExpression(Parser yyp):base(yyp){}}
-//%+IncrementDecrementExpression+146
+//%+IncrementDecrementExpression+150
 public class IncrementDecrementExpression : Expression{
  private  string  m_name ;
  private  string  m_operation ;
@@ -728,7 +760,7 @@ public class IncrementDecrementExpression : Expression{
 }
 
 public override string yyname { get { return "IncrementDecrementExpression"; }}
-public override int yynum { get { return 146; }}
+public override int yynum { get { return 150; }}
 public IncrementDecrementExpression(Parser yyp):base(yyp){}}
 
 public class LSLProgramRoot_1 : LSLProgramRoot {
@@ -842,26 +874,38 @@ public class StateBody_2 : StateBody {
 
 public class StateBody_3 : StateBody {
   public StateBody_3(Parser yyq):base(yyq,
-	((IntArgStateEvent)(yyq.StackAt(0).m_value))
+	((VoidArgStateEvent)(yyq.StackAt(0).m_value))
 	){}}
 
 public class StateBody_4 : StateBody {
   public StateBody_4(Parser yyq):base(yyq,
 	((StateBody)(yyq.StackAt(1).m_value))
 	, 
-	((IntArgStateEvent)(yyq.StackAt(0).m_value))
+	((VoidArgStateEvent)(yyq.StackAt(0).m_value))
 	){}}
 
 public class StateBody_5 : StateBody {
   public StateBody_5(Parser yyq):base(yyq,
-	((VoidArgStateEvent)(yyq.StackAt(0).m_value))
+	((IntArgStateEvent)(yyq.StackAt(0).m_value))
 	){}}
 
 public class StateBody_6 : StateBody {
   public StateBody_6(Parser yyq):base(yyq,
 	((StateBody)(yyq.StackAt(1).m_value))
 	, 
-	((VoidArgStateEvent)(yyq.StackAt(0).m_value))
+	((IntArgStateEvent)(yyq.StackAt(0).m_value))
+	){}}
+
+public class StateBody_7 : StateBody {
+  public StateBody_7(Parser yyq):base(yyq,
+	((VectorArgStateEvent)(yyq.StackAt(0).m_value))
+	){}}
+
+public class StateBody_8 : StateBody {
+  public StateBody_8(Parser yyq):base(yyq,
+	((StateBody)(yyq.StackAt(1).m_value))
+	, 
+	((VectorArgStateEvent)(yyq.StackAt(0).m_value))
 	){}}
 
 public class StateEvent_1 : StateEvent {
@@ -873,6 +917,13 @@ public class StateEvent_1 : StateEvent {
 	((CompoundStatement)(yyq.StackAt(0).m_value))
 	){}}
 
+public class VoidArgStateEvent_1 : VoidArgStateEvent {
+  public VoidArgStateEvent_1(Parser yyq):base(yyq,
+	((VoidArgEvent)(yyq.StackAt(3).m_value))
+	.yytext, 
+	((CompoundStatement)(yyq.StackAt(0).m_value))
+	){}}
+
 public class IntArgStateEvent_1 : IntArgStateEvent {
   public IntArgStateEvent_1(Parser yyq):base(yyq,
 	((IntArgEvent)(yyq.StackAt(4).m_value))
@@ -882,10 +933,12 @@ public class IntArgStateEvent_1 : IntArgStateEvent {
 	((CompoundStatement)(yyq.StackAt(0).m_value))
 	){}}
 
-public class VoidArgStateEvent_1 : VoidArgStateEvent {
-  public VoidArgStateEvent_1(Parser yyq):base(yyq,
-	((VoidArgEvent)(yyq.StackAt(3).m_value))
+public class VectorArgStateEvent_1 : VectorArgStateEvent {
+  public VectorArgStateEvent_1(Parser yyq):base(yyq,
+	((VectorArgEvent)(yyq.StackAt(4).m_value))
 	.yytext, 
+	((VectorArgumentDeclarationList)(yyq.StackAt(2).m_value))
+	, 
 	((CompoundStatement)(yyq.StackAt(0).m_value))
 	){}}
 
@@ -906,6 +959,18 @@ public class IntArgumentDeclarationList_1 : IntArgumentDeclarationList {
 	((IntDeclaration)(yyq.StackAt(0).m_value))
 	){}}
 
+public class VectorArgumentDeclarationList_1 : VectorArgumentDeclarationList {
+  public VectorArgumentDeclarationList_1(Parser yyq):base(yyq,
+	((VectorDeclaration)(yyq.StackAt(0).m_value))
+	){}}
+
+public class Declaration_1 : Declaration {
+  public Declaration_1(Parser yyq):base(yyq,
+	((Typename)(yyq.StackAt(1).m_value))
+	.yytext, 
+	((IDENT)(yyq.StackAt(0).m_value))
+	.yytext){}}
+
 public class IntDeclaration_1 : IntDeclaration {
   public IntDeclaration_1(Parser yyq):base(yyq,
 	((INTEGER_TYPE)(yyq.StackAt(1).m_value))
@@ -913,9 +978,9 @@ public class IntDeclaration_1 : IntDeclaration {
 	((IDENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Declaration_1 : Declaration {
-  public Declaration_1(Parser yyq):base(yyq,
-	((Typename)(yyq.StackAt(1).m_value))
+public class VectorDeclaration_1 : VectorDeclaration {
+  public VectorDeclaration_1(Parser yyq):base(yyq,
+	((VECTOR_TYPE)(yyq.StackAt(1).m_value))
 	.yytext, 
 	((IDENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
@@ -1915,47 +1980,72 @@ public class Event_7 : Event {
 
 public class Event_8 : Event {
   public Event_8(Parser yyq):base(yyq,
-	((LAND_COLLISION_EVENT)(yyq.StackAt(0).m_value))
+	((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_9 : Event {
   public Event_9(Parser yyq):base(yyq,
-	((LAND_COLLISION_END_EVENT)(yyq.StackAt(0).m_value))
+	((LISTEN_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_10 : Event {
   public Event_10(Parser yyq):base(yyq,
-	((LAND_COLLISION_START_EVENT)(yyq.StackAt(0).m_value))
+	((MONEY_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_11 : Event {
   public Event_11(Parser yyq):base(yyq,
-	((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value))
+	((OBJECT_REZ_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_12 : Event {
   public Event_12(Parser yyq):base(yyq,
-	((LISTEN_EVENT)(yyq.StackAt(0).m_value))
+	((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_13 : Event {
   public Event_13(Parser yyq):base(yyq,
-	((MONEY_EVENT)(yyq.StackAt(0).m_value))
+	((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_14 : Event {
-  public Event_14(Parser yyq):base(yyq,
-	((OBJECT_REZ_EVENT)(yyq.StackAt(0).m_value))
+public class VoidArgEvent_1 : VoidArgEvent {
+  public VoidArgEvent_1(Parser yyq):base(yyq,
+	((STATE_ENTRY_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_15 : Event {
-  public Event_15(Parser yyq):base(yyq,
-	((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value))
+public class VoidArgEvent_2 : VoidArgEvent {
+  public VoidArgEvent_2(Parser yyq):base(yyq,
+	((STATE_EXIT_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class Event_16 : Event {
-  public Event_16(Parser yyq):base(yyq,
-	((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value))
+public class VoidArgEvent_3 : VoidArgEvent {
+  public VoidArgEvent_3(Parser yyq):base(yyq,
+	((MOVING_END_EVENT)(yyq.StackAt(0).m_value))
+	.yytext){}}
+
+public class VoidArgEvent_4 : VoidArgEvent {
+  public VoidArgEvent_4(Parser yyq):base(yyq,
+	((MOVING_START_EVENT)(yyq.StackAt(0).m_value))
+	.yytext){}}
+
+public class VoidArgEvent_5 : VoidArgEvent {
+  public VoidArgEvent_5(Parser yyq):base(yyq,
+	((NO_SENSOR_EVENT)(yyq.StackAt(0).m_value))
+	.yytext){}}
+
+public class VoidArgEvent_6 : VoidArgEvent {
+  public VoidArgEvent_6(Parser yyq):base(yyq,
+	((NOT_AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value))
+	.yytext){}}
+
+public class VoidArgEvent_7 : VoidArgEvent {
+  public VoidArgEvent_7(Parser yyq):base(yyq,
+	((NOT_AT_TARGET_EVENT)(yyq.StackAt(0).m_value))
+	.yytext){}}
+
+public class VoidArgEvent_8 : VoidArgEvent {
+  public VoidArgEvent_8(Parser yyq):base(yyq,
+	((TIMER_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class IntArgEvent_1 : IntArgEvent {
@@ -2008,44 +2098,19 @@ public class IntArgEvent_10 : IntArgEvent {
 	((TOUCH_START_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class VoidArgEvent_1 : VoidArgEvent {
-  public VoidArgEvent_1(Parser yyq):base(yyq,
-	((STATE_ENTRY_EVENT)(yyq.StackAt(0).m_value))
-	.yytext){}}
-
-public class VoidArgEvent_2 : VoidArgEvent {
-  public VoidArgEvent_2(Parser yyq):base(yyq,
-	((STATE_EXIT_EVENT)(yyq.StackAt(0).m_value))
-	.yytext){}}
-
-public class VoidArgEvent_3 : VoidArgEvent {
-  public VoidArgEvent_3(Parser yyq):base(yyq,
-	((MOVING_END_EVENT)(yyq.StackAt(0).m_value))
-	.yytext){}}
-
-public class VoidArgEvent_4 : VoidArgEvent {
-  public VoidArgEvent_4(Parser yyq):base(yyq,
-	((MOVING_START_EVENT)(yyq.StackAt(0).m_value))
-	.yytext){}}
-
-public class VoidArgEvent_5 : VoidArgEvent {
-  public VoidArgEvent_5(Parser yyq):base(yyq,
-	((NO_SENSOR_EVENT)(yyq.StackAt(0).m_value))
-	.yytext){}}
-
-public class VoidArgEvent_6 : VoidArgEvent {
-  public VoidArgEvent_6(Parser yyq):base(yyq,
-	((NOT_AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value))
+public class VectorArgEvent_1 : VectorArgEvent {
+  public VectorArgEvent_1(Parser yyq):base(yyq,
+	((LAND_COLLISION_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class VoidArgEvent_7 : VoidArgEvent {
-  public VoidArgEvent_7(Parser yyq):base(yyq,
-	((NOT_AT_TARGET_EVENT)(yyq.StackAt(0).m_value))
+public class VectorArgEvent_2 : VectorArgEvent {
+  public VectorArgEvent_2(Parser yyq):base(yyq,
+	((LAND_COLLISION_END_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class VoidArgEvent_8 : VoidArgEvent {
-  public VoidArgEvent_8(Parser yyq):base(yyq,
-	((TIMER_EVENT)(yyq.StackAt(0).m_value))
+public class VectorArgEvent_3 : VectorArgEvent {
+  public VectorArgEvent_3(Parser yyq):base(yyq,
+	((LAND_COLLISION_START_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 public class yyLSLSyntax
 : YyParser {
@@ -2079,9 +2144,9 @@ public yyLSLSyntax
 97,0,109,0,82,
 0,111,0,111,0,
 116,0,1,96,1,
-2,104,18,1,2745,
+2,104,18,1,2761,
 102,2,0,105,5,
-336,1,0,106,18,
+346,1,0,106,18,
 1,0,0,2,0,
 1,1,107,18,1,
 1,108,20,109,4,
@@ -2142,7 +2207,7 @@ public yyLSLSyntax
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,1,
-110,1,2,2,0,
+113,1,2,2,0,
 1,9,131,18,1,
 9,132,20,133,4,
 10,73,0,68,0,
@@ -2171,7 +2236,7 @@ public yyLSLSyntax
 105,0,111,0,110,
 0,76,0,105,0,
 115,0,116,0,1,
-106,1,2,2,0,
+107,1,2,2,0,
 1,21,142,18,1,
 21,143,20,144,4,
 10,67,0,79,0,
@@ -2186,7 +2251,7 @@ public yyLSLSyntax
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,128,1,2,2,
+1,132,1,2,2,
 0,1,1695,148,18,
 1,1695,143,2,0,
 1,30,149,18,1,
@@ -2195,7 +2260,7 @@ public yyLSLSyntax
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
-0,110,0,1,108,
+0,110,0,1,110,
 1,2,2,0,1,
 31,152,18,1,31,
 153,20,154,4,22,
@@ -2222,7 +2287,7 @@ public yyLSLSyntax
 0,115,0,105,0,
 103,0,110,0,109,
 0,101,0,110,0,
-116,0,1,119,1,
+116,0,1,123,1,
 2,2,0,1,1117,
 162,18,1,1117,163,
 20,164,4,28,80,
@@ -2242,7 +2307,7 @@ public yyLSLSyntax
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,1,137,1,
+110,0,1,141,1,
 2,2,0,1,43,
 170,18,1,43,171,
 20,172,4,22,82,
@@ -2284,155 +2349,218 @@ public yyLSLSyntax
 1,52,135,2,0,
 1,2281,188,18,1,
 2281,160,2,0,1,
-2669,189,18,1,2669,
-132,2,0,1,1730,
-190,18,1,1730,160,
-2,0,1,1731,191,
-18,1,1731,192,20,
-193,4,18,83,0,
-69,0,77,0,73,
-0,67,0,79,0,
-76,0,79,0,78,
-0,1,11,1,1,
-2,0,1,61,194,
-18,1,61,129,2,
-0,1,62,195,18,
-1,62,153,2,0,
-1,63,196,18,1,
-63,132,2,0,1,
-65,197,18,1,65,
-176,2,0,1,66,
-198,18,1,66,132,
-2,0,1,67,199,
-18,1,67,180,2,
-0,1,68,200,18,
-1,68,183,2,0,
-1,69,201,18,1,
-69,180,2,0,1,
-70,202,18,1,70,
-183,2,0,1,71,
-203,18,1,71,135,
-2,0,1,73,204,
-18,1,73,168,2,
-0,1,74,205,18,
-1,74,153,2,0,
-1,1189,206,18,1,
-1189,207,20,208,4,
-22,83,0,84,0,
-65,0,82,0,95,
-0,69,0,81,0,
-85,0,65,0,76,
-0,83,0,1,8,
-1,1,2,0,1,
-76,209,18,1,76,
-210,20,211,4,20,
-76,0,69,0,70,
-0,84,0,95,0,
-83,0,72,0,73,
-0,70,0,84,0,
-1,40,1,1,2,
-0,1,1153,212,18,
-1,1153,213,20,214,
-4,24,83,0,76,
-0,65,0,83,0,
-72,0,95,0,69,
-0,81,0,85,0,
-65,0,76,0,83,
-0,1,9,1,1,
-2,0,1,79,215,
-18,1,79,216,20,
-217,4,10,84,0,
-73,0,76,0,68,
-0,69,0,1,36,
-1,1,2,0,1,
-1195,218,18,1,1195,
-168,2,0,1,82,
-219,18,1,82,168,
-2,0,1,1123,220,
-18,1,1123,168,2,
-0,1,85,221,18,
-1,85,222,20,223,
-4,26,83,0,84,
-0,82,0,79,0,
-75,0,69,0,95,
-0,83,0,84,0,
-82,0,79,0,75,
-0,69,0,1,39,
-1,1,2,0,1,
-89,224,18,1,89,
-225,20,226,4,10,
-77,0,73,0,78,
-0,85,0,83,0,
-1,19,1,1,2,
-0,1,2318,227,18,
-1,2318,192,2,0,
-1,93,228,18,1,
-93,168,2,0,1,
-97,229,18,1,97,
-230,20,231,4,14,
-65,0,77,0,80,
-0,95,0,65,0,
-77,0,80,0,1,
-38,1,1,2,0,
-1,102,232,18,1,
-102,233,20,234,4,
-22,69,0,88,0,
-67,0,76,0,65,
-0,77,0,65,0,
-84,0,73,0,79,
-0,78,0,1,37,
-1,1,2,0,1,
-1775,235,18,1,1775,
-153,2,0,1,107,
-236,18,1,107,168,
-2,0,1,2337,237,
-18,1,2337,153,2,
-0,1,1224,238,18,
-1,1224,160,2,0,
-1,1225,239,18,1,
-1225,240,20,241,4,
-24,77,0,73,0,
-78,0,85,0,83,
-0,95,0,69,0,
-81,0,85,0,65,
-0,76,0,83,0,
-1,7,1,1,2,
-0,1,112,242,18,
-1,112,243,20,244,
-4,28,71,0,82,
-0,69,0,65,0,
-84,0,69,0,82,
-0,95,0,69,0,
-81,0,85,0,65,
-0,76,0,83,0,
-1,32,1,1,2,
-0,1,1188,245,18,
-1,1188,160,2,0,
-1,1231,246,18,1,
-1231,168,2,0,1,
-118,247,18,1,118,
-168,2,0,1,1737,
-248,18,1,1737,168,
-2,0,1,2734,249,
-18,1,2734,250,20,
-251,4,12,83,0,
-116,0,97,0,116,
-0,101,0,115,0,
-1,100,1,2,2,
-0,1,124,252,18,
-1,124,253,20,254,
-4,22,76,0,69,
-0,83,0,83,0,
+1730,189,18,1,1730,
+160,2,0,1,1731,
+190,18,1,1731,191,
+20,192,4,18,83,
+0,69,0,77,0,
+73,0,67,0,79,
+0,76,0,79,0,
+78,0,1,11,1,
+1,2,0,1,61,
+193,18,1,61,129,
+2,0,1,62,194,
+18,1,62,153,2,
+0,1,63,195,18,
+1,63,132,2,0,
+1,65,196,18,1,
+65,176,2,0,1,
+66,197,18,1,66,
+132,2,0,1,67,
+198,18,1,67,180,
+2,0,1,68,199,
+18,1,68,183,2,
+0,1,69,200,18,
+1,69,180,2,0,
+1,70,201,18,1,
+70,183,2,0,1,
+71,202,18,1,71,
+135,2,0,1,73,
+203,18,1,73,168,
+2,0,1,74,204,
+18,1,74,153,2,
+0,1,1189,205,18,
+1,1189,206,20,207,
+4,22,83,0,84,
+0,65,0,82,0,
 95,0,69,0,81,
 0,85,0,65,0,
 76,0,83,0,1,
-31,1,1,2,0,
-1,130,255,18,1,
-130,168,2,0,1,
-2742,256,18,1,2742,
-257,20,258,4,50,
-71,0,108,0,111,
-0,98,0,97,0,
+8,1,1,2,0,
+1,76,208,18,1,
+76,209,20,210,4,
+20,76,0,69,0,
+70,0,84,0,95,
+0,83,0,72,0,
+73,0,70,0,84,
+0,1,40,1,1,
+2,0,1,1153,211,
+18,1,1153,212,20,
+213,4,24,83,0,
+76,0,65,0,83,
+0,72,0,95,0,
+69,0,81,0,85,
+0,65,0,76,0,
+83,0,1,9,1,
+1,2,0,1,79,
+214,18,1,79,215,
+20,216,4,10,84,
+0,73,0,76,0,
+68,0,69,0,1,
+36,1,1,2,0,
+1,1195,217,18,1,
+1195,168,2,0,1,
+82,218,18,1,82,
+168,2,0,1,1123,
+219,18,1,1123,168,
+2,0,1,85,220,
+18,1,85,221,20,
+222,4,26,83,0,
+84,0,82,0,79,
+0,75,0,69,0,
+95,0,83,0,84,
+0,82,0,79,0,
+75,0,69,0,1,
+39,1,1,2,0,
+1,2699,223,18,1,
+2699,224,20,225,4,
+34,67,0,111,0,
+109,0,112,0,111,
+0,117,0,110,0,
+100,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+1,118,1,2,2,
+0,1,89,226,18,
+1,89,227,20,228,
+4,10,77,0,73,
+0,78,0,85,0,
+83,0,1,19,1,
+1,2,0,1,2318,
+229,18,1,2318,191,
+2,0,1,93,230,
+18,1,93,168,2,
+0,1,2708,231,18,
+1,2708,168,2,0,
+1,97,232,18,1,
+97,233,20,234,4,
+14,65,0,77,0,
+80,0,95,0,65,
+0,77,0,80,0,
+1,38,1,1,2,
+0,1,102,235,18,
+1,102,236,20,237,
+4,22,69,0,88,
+0,67,0,76,0,
+65,0,77,0,65,
+0,84,0,73,0,
+79,0,78,0,1,
+37,1,1,2,0,
+1,1775,238,18,1,
+1775,153,2,0,1,
+107,239,18,1,107,
+168,2,0,1,2337,
+240,18,1,2337,153,
+2,0,1,1224,241,
+18,1,1224,160,2,
+0,1,1225,242,18,
+1,1225,243,20,244,
+4,24,77,0,73,
+0,78,0,85,0,
+83,0,95,0,69,
+0,81,0,85,0,
+65,0,76,0,83,
+0,1,7,1,1,
+2,0,1,112,245,
+18,1,112,246,20,
+247,4,28,71,0,
+82,0,69,0,65,
+0,84,0,69,0,
+82,0,95,0,69,
+0,81,0,85,0,
+65,0,76,0,83,
+0,1,32,1,1,
+2,0,1,1188,248,
+18,1,1188,160,2,
+0,1,1231,249,18,
+1,1231,168,2,0,
+1,118,250,18,1,
+118,168,2,0,1,
+1737,251,18,1,1737,
+168,2,0,1,124,
+252,18,1,124,253,
+20,254,4,22,76,
+0,69,0,83,0,
+83,0,95,0,69,
+0,81,0,85,0,
+65,0,76,0,83,
+0,1,31,1,1,
+2,0,1,2738,255,
+18,1,2738,191,2,
+0,1,130,256,18,
+1,130,168,2,0,
+1,1803,257,18,1,
+1803,258,20,259,4,
+18,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,1,
+120,1,2,2,0,
+1,1804,260,18,1,
+1804,261,20,262,4,
+4,68,0,79,0,
+1,44,1,1,2,
+0,1,2591,263,18,
+1,2591,264,20,265,
+4,20,83,0,116,
+0,97,0,116,0,
+101,0,69,0,118,
+0,101,0,110,0,
+116,0,1,103,1,
+2,2,0,1,2364,
+266,18,1,2364,258,
+2,0,1,137,267,
+18,1,137,268,20,
+269,4,36,69,0,
+88,0,67,0,76,
+0,65,0,77,0,
+65,0,84,0,73,
+0,79,0,78,0,
+95,0,69,0,81,
+0,85,0,65,0,
+76,0,83,0,1,
+30,1,1,2,0,
+1,2293,270,18,1,
+2293,191,2,0,1,
+1701,271,18,1,1701,
+168,2,0,1,1756,
+272,18,1,1756,191,
+2,0,1,2527,273,
+18,1,2527,224,2,
+0,1,143,274,18,
+1,143,168,2,0,
+1,2299,275,18,1,
+2299,168,2,0,1,
+1260,276,18,1,1260,
+160,2,0,1,1261,
+277,18,1,1261,278,
+20,279,4,22,80,
+0,76,0,85,0,
+83,0,95,0,69,
+0,81,0,85,0,
+65,0,76,0,83,
+0,1,6,1,1,
+2,0,1,2528,280,
+18,1,2528,281,20,
+282,4,10,69,0,
+118,0,101,0,110,
+0,116,0,1,114,
+1,2,2,0,1,
+2758,283,18,1,2758,
+284,20,285,4,50,
+71,0,108,0,111,
+0,98,0,97,0,
 108,0,86,0,97,
 0,114,0,105,0,
 97,0,98,0,108,
@@ -2442,51 +2570,14 @@ public yyLSLSyntax
 97,0,116,0,105,
 0,111,0,110,0,
 1,98,1,2,2,
-0,1,1803,259,18,
-1,1803,260,20,261,
-4,18,83,0,116,
+0,1,2680,286,18,
+1,2680,287,20,288,
+4,12,83,0,116,
 0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-1,116,1,2,2,
-0,1,1804,262,18,
-1,1804,263,20,264,
-4,4,68,0,79,
-0,1,44,1,1,
-2,0,1,2745,104,
-1,2364,265,18,1,
-2364,260,2,0,1,
-137,266,18,1,137,
-267,20,268,4,36,
-69,0,88,0,67,
-0,76,0,65,0,
-77,0,65,0,84,
-0,73,0,79,0,
-78,0,95,0,69,
-0,81,0,85,0,
-65,0,76,0,83,
-0,1,30,1,1,
-2,0,1,2293,269,
-18,1,2293,192,2,
-0,1,1701,270,18,
-1,1701,168,2,0,
-1,1756,271,18,1,
-1756,192,2,0,1,
-143,272,18,1,143,
-168,2,0,1,2299,
-273,18,1,2299,168,
-2,0,1,1260,274,
-18,1,1260,160,2,
-0,1,1261,275,18,
-1,1261,276,20,277,
-4,22,80,0,76,
-0,85,0,83,0,
-95,0,69,0,81,
-0,85,0,65,0,
-76,0,83,0,1,
-6,1,1,2,0,
-1,151,278,18,1,
-151,279,20,280,4,
+101,0,115,0,1,
+100,1,2,2,0,
+1,151,289,18,1,
+151,290,20,291,4,
 26,69,0,81,0,
 85,0,65,0,76,
 0,83,0,95,0,
@@ -2494,183 +2585,284 @@ public yyLSLSyntax
 0,65,0,76,0,
 83,0,1,29,1,
 1,2,0,1,1267,
-281,18,1,1267,168,
-2,0,1,157,282,
+292,18,1,1267,168,
+2,0,1,157,293,
 18,1,157,168,2,
-0,1,1773,283,18,
+0,1,1773,294,18,
 1,1773,146,2,0,
-1,1832,284,18,1,
-1832,260,2,0,1,
-1833,285,18,1,1833,
-286,20,287,4,10,
+1,1832,295,18,1,
+1832,258,2,0,1,
+1833,296,18,1,1833,
+297,20,298,4,10,
 87,0,72,0,73,
 0,76,0,69,0,
 1,45,1,1,2,
-0,1,1834,288,18,
+0,1,1834,299,18,
 1,1834,135,2,0,
-1,166,289,18,1,
-166,290,20,291,4,
+1,166,300,18,1,
+166,301,20,302,4,
 20,76,0,69,0,
 70,0,84,0,95,
 0,65,0,78,0,
 71,0,76,0,69,
 0,1,25,1,1,
-2,0,1,1840,292,
+2,0,1,1840,303,
 18,1,1840,168,2,
-0,1,172,293,18,
+0,1,172,304,18,
 1,172,168,2,0,
-1,2335,294,18,1,
+1,2335,305,18,1,
 2335,146,2,0,1,
-1296,295,18,1,1296,
+1296,306,18,1,1296,
 160,2,0,1,1297,
-296,18,1,1297,297,
-20,298,4,12,69,
+307,18,1,1297,308,
+20,309,4,12,69,
 0,81,0,85,0,
 65,0,76,0,83,
 0,1,15,1,1,
-2,0,1,2413,299,
-18,1,2413,300,20,
-301,4,26,83,0,
+2,0,1,2413,310,
+18,1,2413,311,20,
+312,4,26,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,76,0,105,0,
 115,0,116,0,1,
-115,1,2,2,0,
-1,1859,302,18,1,
+119,1,2,2,0,
+1,1859,313,18,1,
 1859,153,2,0,1,
-1860,303,18,1,1860,
-192,2,0,1,188,
-304,18,1,188,168,
-2,0,1,182,305,
-18,1,182,306,20,
-307,4,22,82,0,
+1860,314,18,1,1860,
+191,2,0,1,188,
+315,18,1,188,168,
+2,0,1,182,316,
+18,1,182,317,20,
+318,4,22,82,0,
 73,0,71,0,72,
 0,84,0,95,0,
 65,0,78,0,71,
 0,76,0,69,0,
 1,26,1,1,2,
-0,1,199,308,18,
-1,199,309,20,310,
+0,1,199,319,18,
+1,199,320,20,321,
 4,10,67,0,65,
 0,82,0,69,0,
 84,0,1,35,1,
 1,2,0,1,1871,
-311,18,1,1871,160,
-2,0,1,1872,312,
+322,18,1,1871,160,
+2,0,1,1872,323,
 18,1,1872,153,2,
-0,1,1873,313,18,
-1,1873,192,2,0,
-1,1875,314,18,1,
-1875,286,2,0,1,
-205,315,18,1,205,
-168,2,0,1,2581,
-316,18,1,2581,156,
-2,0,1,2515,317,
-18,1,2515,318,20,
-319,4,52,73,0,
-110,0,116,0,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
-1,107,1,2,2,
-0,1,1882,320,18,
-1,1882,168,2,0,
-1,2227,321,18,1,
-2227,260,2,0,1,
-2660,322,18,1,2660,
-323,20,324,4,22,
-82,0,73,0,71,
-0,72,0,84,0,
-95,0,66,0,82,
-0,65,0,67,0,
-69,0,1,13,1,
-1,2,0,1,217,
-325,18,1,217,326,
-20,327,4,12,83,
-0,84,0,82,0,
-79,0,75,0,69,
-0,1,34,1,1,
-2,0,1,1332,328,
-18,1,1332,160,2,
-0,1,2743,329,18,
-1,2743,330,20,331,
-4,48,71,0,108,
-0,111,0,98,0,
-97,0,108,0,70,
-0,117,0,110,0,
-99,0,116,0,105,
-0,111,0,110,0,
-68,0,101,0,102,
-0,105,0,110,0,
-105,0,116,0,105,
-0,111,0,110,0,
-1,99,1,2,2,
-0,1,2744,332,18,
-1,2744,257,2,0,
-1,1335,333,18,1,
-1335,163,2,0,1,
-223,334,18,1,223,
-168,2,0,1,1341,
-335,18,1,1341,168,
-2,0,1,1901,336,
-18,1,1901,153,2,
-0,1,1303,337,18,
-1,1303,168,2,0,
-1,2462,338,18,1,
-2462,260,2,0,1,
-236,339,18,1,236,
-340,20,341,4,6,
-65,0,77,0,80,
-0,1,33,1,1,
-2,0,1,2466,342,
-18,1,2466,343,20,
-344,4,34,67,0,
-111,0,109,0,112,
-0,111,0,117,0,
-110,0,100,0,83,
+0,1,1873,324,18,
+1,1873,191,2,0,
+1,1875,325,18,1,
+1875,297,2,0,1,
+205,326,18,1,205,
+168,2,0,1,2515,
+327,18,1,2515,135,
+2,0,1,1882,328,
+18,1,1882,168,2,
+0,1,2227,329,18,
+1,2227,258,2,0,
+1,2589,330,18,1,
+2589,331,20,332,4,
+32,73,0,110,0,
+116,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,1,105,
+1,2,2,0,1,
+2590,333,18,1,2590,
+334,20,335,4,34,
+86,0,111,0,105,
+0,100,0,65,0,
+114,0,103,0,83,
 0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,114,1,
-2,2,0,1,2467,
-345,18,1,2467,150,
-2,0,1,2468,346,
-18,1,2468,347,20,
-348,4,10,83,0,
-84,0,65,0,84,
-0,69,0,1,48,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+104,1,2,2,0,
+1,217,336,18,1,
+217,337,20,338,4,
+12,83,0,84,0,
+82,0,79,0,75,
+0,69,0,1,34,
 1,1,2,0,1,
-2469,349,18,1,2469,
-132,2,0,1,242,
-350,18,1,242,168,
-2,0,1,2471,351,
-18,1,2471,352,20,
-353,4,22,84,0,
-73,0,77,0,69,
-0,82,0,95,0,
+1332,339,18,1,1332,
+160,2,0,1,1335,
+340,18,1,1335,163,
+2,0,1,223,341,
+18,1,223,168,2,
+0,1,1341,342,18,
+1,1341,168,2,0,
+1,1901,343,18,1,
+1901,153,2,0,1,
+1303,344,18,1,1303,
+168,2,0,1,2462,
+345,18,1,2462,258,
+2,0,1,236,346,
+18,1,236,347,20,
+348,4,6,65,0,
+77,0,80,0,1,
+33,1,1,2,0,
+1,2466,349,18,1,
+2466,224,2,0,1,
+2467,350,18,1,2467,
+150,2,0,1,2468,
+351,18,1,2468,352,
+20,353,4,10,83,
+0,84,0,65,0,
+84,0,69,0,1,
+48,1,1,2,0,
+1,2469,354,18,1,
+2469,132,2,0,1,
+242,355,18,1,242,
+168,2,0,1,2471,
+356,18,1,2471,357,
+20,358,4,52,76,
+0,65,0,78,0,
+68,0,95,0,67,
+0,79,0,76,0,
+76,0,73,0,83,
+0,73,0,79,0,
+78,0,95,0,83,
+0,84,0,65,0,
+82,0,84,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,71,1,1,
+2,0,1,2472,359,
+18,1,2472,360,20,
+361,4,48,76,0,
+65,0,78,0,68,
+0,95,0,67,0,
+79,0,76,0,76,
+0,73,0,83,0,
+73,0,79,0,78,
+0,95,0,69,0,
+78,0,68,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,70,1,1,
+2,0,1,2473,362,
+18,1,2473,363,20,
+364,4,40,76,0,
+65,0,78,0,68,
+0,95,0,67,0,
+79,0,76,0,76,
+0,73,0,83,0,
+73,0,79,0,78,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,69,
+1,1,2,0,1,
+2474,365,18,1,2474,
+366,20,367,4,34,
+84,0,79,0,85,
+0,67,0,72,0,
+95,0,83,0,84,
+0,65,0,82,0,
+84,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+89,1,1,2,0,
+1,2475,368,18,1,
+2475,369,20,370,4,
+30,84,0,79,0,
+85,0,67,0,72,
+0,95,0,69,0,
+78,0,68,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,90,1,1,
+2,0,1,2476,371,
+18,1,2476,372,20,
+373,4,22,84,0,
+79,0,85,0,67,
+0,72,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,87,1,1,2,
-0,1,2472,354,18,
-1,2472,355,20,356,
-4,38,78,0,79,
-0,84,0,95,0,
-65,0,84,0,95,
-0,84,0,65,0,
-82,0,71,0,69,
+1,88,1,1,2,
+0,1,2477,374,18,
+1,2477,375,20,376,
+4,24,83,0,69,
+0,78,0,83,0,
+79,0,82,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,84,1,1,
+2,0,1,2478,377,
+18,1,2478,378,20,
+379,4,52,82,0,
+85,0,78,0,95,
+0,84,0,73,0,
+77,0,69,0,95,
+0,80,0,69,0,
+82,0,77,0,73,
+0,83,0,83,0,
+73,0,79,0,78,
+0,83,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,83,1,1,2,
+0,1,2479,380,18,
+1,2479,381,20,382,
+4,24,79,0,78,
+0,95,0,82,0,
+69,0,90,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,81,1,1,
+2,0,1,2480,383,
+18,1,2480,384,20,
+385,4,42,67,0,
+79,0,76,0,76,
+0,73,0,83,0,
+73,0,79,0,78,
+0,95,0,83,0,
+84,0,65,0,82,
 0,84,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,79,1,1,2,
-0,1,2473,357,18,
-1,2473,358,20,359,
+1,64,1,1,2,
+0,1,2481,386,18,
+1,2481,387,20,388,
+4,38,67,0,79,
+0,76,0,76,0,
+73,0,83,0,73,
+0,79,0,78,0,
+95,0,69,0,78,
+0,68,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,63,1,1,2,
+0,1,2482,389,18,
+1,2482,390,20,391,
+4,30,67,0,79,
+0,76,0,76,0,
+73,0,83,0,73,
+0,79,0,78,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,62,1,
+1,2,0,1,2483,
+392,18,1,2483,393,
+20,394,4,26,67,
+0,72,0,65,0,
+78,0,71,0,69,
+0,68,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,61,1,1,2,
+0,1,256,395,18,
+1,256,396,20,397,
+4,14,80,0,69,
+0,82,0,67,0,
+69,0,78,0,84,
+0,1,22,1,1,
+2,0,1,1371,398,
+18,1,1371,212,2,
+0,1,2486,399,18,
+1,2486,400,20,401,
 4,46,78,0,79,
 0,84,0,95,0,
 65,0,84,0,95,
@@ -2682,8 +2874,8 @@ public yyLSLSyntax
 86,0,69,0,78,
 0,84,0,1,78,
 1,1,2,0,1,
-2474,360,18,1,2474,
-361,20,362,4,30,
+2487,402,18,1,2487,
+403,20,404,4,30,
 78,0,79,0,95,
 0,83,0,69,0,
 78,0,83,0,79,
@@ -2691,146 +2883,50 @@ public yyLSLSyntax
 69,0,86,0,69,
 0,78,0,84,0,
 1,77,1,1,2,
-0,1,2475,363,18,
-1,2475,364,20,365,
-4,36,77,0,79,
-0,86,0,73,0,
-78,0,71,0,95,
-0,83,0,84,0,
-65,0,82,0,84,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,76,
-1,1,2,0,1,
-2476,366,18,1,2476,
-367,20,368,4,32,
-77,0,79,0,86,
-0,73,0,78,0,
-71,0,95,0,69,
-0,78,0,68,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,75,1,
-1,2,0,1,2477,
-369,18,1,2477,370,
-20,371,4,32,83,
-0,84,0,65,0,
-84,0,69,0,95,
-0,69,0,88,0,
-73,0,84,0,95,
+0,1,1931,405,18,
+1,1931,258,2,0,
+1,1932,406,18,1,
+1932,407,20,408,4,
+4,73,0,70,0,
+1,42,1,1,2,
+0,1,262,409,18,
+1,262,168,2,0,
+1,1377,410,18,1,
+1377,168,2,0,1,
+2492,411,18,1,2492,
+412,20,413,4,36,
+72,0,84,0,84,
+0,80,0,95,0,
+82,0,69,0,81,
+0,85,0,69,0,
+83,0,84,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,86,1,1,
-2,0,1,2478,372,
-18,1,2478,373,20,
-374,4,34,83,0,
-84,0,65,0,84,
-0,69,0,95,0,
-69,0,78,0,84,
-0,82,0,89,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,85,1,
-1,2,0,1,2479,
-375,18,1,2479,376,
-20,377,4,34,84,
-0,79,0,85,0,
-67,0,72,0,95,
-0,83,0,84,0,
-65,0,82,0,84,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,89,
-1,1,2,0,1,
-2480,378,18,1,2480,
-379,20,380,4,30,
-84,0,79,0,85,
-0,67,0,72,0,
-95,0,69,0,78,
-0,68,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,90,1,1,2,
-0,1,2481,381,18,
-1,2481,382,20,383,
-4,22,84,0,79,
-0,85,0,67,0,
-72,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-88,1,1,2,0,
-1,2482,384,18,1,
-2482,385,20,386,4,
-24,83,0,69,0,
-78,0,83,0,79,
-0,82,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,84,1,1,2,
-0,1,2483,387,18,
-1,2483,388,20,389,
-4,52,82,0,85,
-0,78,0,95,0,
-84,0,73,0,77,
-0,69,0,95,0,
-80,0,69,0,82,
-0,77,0,73,0,
-83,0,83,0,73,
-0,79,0,78,0,
-83,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-83,1,1,2,0,
-1,256,390,18,1,
-256,391,20,392,4,
-14,80,0,69,0,
-82,0,67,0,69,
-0,78,0,84,0,
-1,22,1,1,2,
-0,1,1371,393,18,
-1,1371,213,2,0,
-1,2486,394,18,1,
-2486,395,20,396,4,
-38,67,0,79,0,
-76,0,76,0,73,
-0,83,0,73,0,
-79,0,78,0,95,
-0,69,0,78,0,
-68,0,95,0,69,
+0,1,91,1,1,
+2,0,1,1876,414,
+18,1,1876,135,2,
+0,1,2494,415,18,
+1,2494,416,20,417,
+4,32,79,0,66,
+0,74,0,69,0,
+67,0,84,0,95,
+0,82,0,69,0,
+90,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
-63,1,1,2,0,
-1,2487,397,18,1,
-2487,398,20,399,4,
-30,67,0,79,0,
-76,0,76,0,73,
-0,83,0,73,0,
-79,0,78,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,62,1,1,
-2,0,1,1931,400,
-18,1,1931,260,2,
-0,1,1932,401,18,
-1,1932,402,20,403,
-4,4,73,0,70,
-0,1,42,1,1,
-2,0,1,262,404,
-18,1,262,168,2,
-0,1,1377,405,18,
-1,1377,168,2,0,
-1,2492,406,18,1,
-2492,407,20,408,4,
+80,1,1,2,0,
+1,2495,418,18,1,
+2495,419,20,420,4,
 22,77,0,79,0,
 78,0,69,0,89,
 0,95,0,69,0,
 86,0,69,0,78,
 0,84,0,1,74,
 1,1,2,0,1,
-1876,409,18,1,1876,
-135,2,0,1,2494,
-410,18,1,2494,411,
-20,412,4,36,76,
+1939,421,18,1,1939,
+168,2,0,1,2497,
+422,18,1,2497,423,
+20,424,4,36,76,
 0,73,0,78,0,
 75,0,95,0,77,
 0,69,0,83,0,
@@ -2839,45 +2935,18 @@ public yyLSLSyntax
 69,0,86,0,69,
 0,78,0,84,0,
 1,72,1,1,2,
-0,1,2495,413,18,
-1,2495,414,20,415,
-4,52,76,0,65,
-0,78,0,68,0,
-95,0,67,0,79,
-0,76,0,76,0,
-73,0,83,0,73,
-0,79,0,78,0,
-95,0,83,0,84,
-0,65,0,82,0,
-84,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-71,1,1,2,0,
-1,1939,416,18,1,
-1939,168,2,0,1,
-2497,417,18,1,2497,
-418,20,419,4,40,
-76,0,65,0,78,
-0,68,0,95,0,
-67,0,79,0,76,
-0,76,0,73,0,
-83,0,73,0,79,
-0,78,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,69,1,1,2,
-0,1,827,420,18,
+0,1,827,425,18,
 1,827,168,2,0,
-1,2499,421,18,1,
-2499,422,20,423,4,
+1,2499,426,18,1,
+2499,427,20,428,4,
 22,69,0,77,0,
 65,0,73,0,76,
 0,95,0,69,0,
 86,0,69,0,78,
 0,84,0,1,67,
 1,1,2,0,1,
-2500,424,18,1,2500,
-425,20,426,4,32,
+2500,429,18,1,2500,
+430,20,431,4,32,
 68,0,65,0,84,
 0,65,0,83,0,
 69,0,82,0,86,
@@ -2886,25 +2955,25 @@ public yyLSLSyntax
 0,69,0,78,0,
 84,0,1,66,1,
 1,2,0,1,2501,
-427,18,1,2501,428,
-20,429,4,26,67,
+432,18,1,2501,433,
+20,434,4,26,67,
 0,79,0,78,0,
 84,0,82,0,79,
 0,76,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
 1,65,1,1,2,
-0,1,2502,430,18,
-1,2502,431,20,432,
+0,1,2502,435,18,
+1,2502,436,20,437,
 4,24,65,0,84,
 0,84,0,65,0,
 67,0,72,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
 0,1,60,1,1,
-2,0,1,2503,433,
-18,1,2503,434,20,
-435,4,30,65,0,
+2,0,1,2503,438,
+18,1,2503,439,20,
+440,4,30,65,0,
 84,0,95,0,84,
 0,65,0,82,0,
 71,0,69,0,84,
@@ -2912,8 +2981,8 @@ public yyLSLSyntax
 86,0,69,0,78,
 0,84,0,1,59,
 1,1,2,0,1,
-2504,436,18,1,2504,
-437,20,438,4,38,
+2504,441,18,1,2504,
+442,20,443,4,38,
 65,0,84,0,95,
 0,82,0,79,0,
 84,0,95,0,84,
@@ -2923,646 +2992,666 @@ public yyLSLSyntax
 86,0,69,0,78,
 0,84,0,1,58,
 1,1,2,0,1,
-277,439,18,1,277,
-440,20,441,4,10,
+277,444,18,1,277,
+445,20,446,4,10,
 83,0,76,0,65,
 0,83,0,72,0,
 1,21,1,1,2,
-0,1,2506,442,18,
+0,1,2506,447,18,
 1,2506,135,2,0,
-1,2507,443,18,1,
-2507,153,2,0,1,
-2509,444,18,1,2509,
-343,2,0,1,2510,
-445,18,1,2510,446,
-20,447,4,22,73,
+1,2507,448,18,1,
+2507,114,2,0,1,
+2508,449,18,1,2508,
+132,2,0,1,2509,
+450,18,1,2509,451,
+20,452,4,34,86,
+0,101,0,99,0,
+116,0,111,0,114,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,1,112,
+1,2,2,0,1,
+2510,453,18,1,2510,
+454,20,455,4,58,
+86,0,101,0,99,
+0,116,0,111,0,
+114,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+76,0,105,0,115,
+0,116,0,1,109,
+1,2,2,0,1,
+283,456,18,1,283,
+168,2,0,1,2513,
+457,18,1,2513,224,
+2,0,1,2514,458,
+18,1,2514,459,20,
+460,4,22,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,116,1,2,2,
+0,1,1958,461,18,
+1,1958,153,2,0,
+1,2516,462,18,1,
+2516,126,2,0,1,
+2517,463,18,1,2517,
+132,2,0,1,2518,
+464,18,1,2518,465,
+20,466,4,28,73,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,1,111,1,
+2,2,0,1,2519,
+467,18,1,2519,468,
+20,469,4,52,73,
 0,110,0,116,0,
 65,0,114,0,103,
-0,69,0,118,0,
+0,117,0,109,0,
 101,0,110,0,116,
-0,1,112,1,2,
-2,0,1,283,448,
-18,1,283,168,2,
-0,1,2512,449,18,
-1,2512,126,2,0,
-1,2513,450,18,1,
-2513,132,2,0,1,
-2514,451,18,1,2514,
-452,20,453,4,28,
-73,0,110,0,116,
 0,68,0,101,0,
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
-0,110,0,1,109,
+0,110,0,76,0,
+105,0,115,0,116,
+0,1,108,1,2,
+2,0,1,1406,470,
+18,1,1406,160,2,
+0,1,1407,471,18,
+1,1407,206,2,0,
+1,2522,472,18,1,
+2522,224,2,0,1,
+2523,473,18,1,2523,
+474,20,475,4,24,
+86,0,111,0,105,
+0,100,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+115,1,2,2,0,
+1,2524,476,18,1,
+2524,135,2,0,1,
+2525,477,18,1,2525,
+153,2,0,1,299,
+478,18,1,299,479,
+20,480,4,8,83,
+0,84,0,65,0,
+82,0,1,20,1,
+1,2,0,1,1370,
+481,18,1,1370,160,
+2,0,1,2529,482,
+18,1,2529,135,2,
+0,1,305,483,18,
+1,305,168,2,0,
+1,2458,484,18,1,
+2458,258,2,0,1,
+2459,485,18,1,2459,
+486,20,487,4,22,
+82,0,73,0,71,
+0,72,0,84,0,
+95,0,66,0,82,
+0,65,0,67,0,
+69,0,1,13,1,
+1,2,0,1,2538,
+488,18,1,2538,140,
+2,0,1,2540,489,
+18,1,2540,153,2,
+0,1,2542,490,18,
+1,2542,224,2,0,
+1,2464,491,18,1,
+2464,486,2,0,1,
+2544,492,18,1,2544,
+493,20,494,4,18,
+83,0,116,0,97,
+0,116,0,101,0,
+66,0,111,0,100,
+0,121,0,1,102,
 1,2,2,0,1,
-1958,454,18,1,1958,
-153,2,0,1,2516,
-455,18,1,2516,153,
-2,0,1,2518,456,
-18,1,2518,343,2,
-0,1,2519,457,18,
-1,2519,458,20,459,
-4,10,69,0,118,
-0,101,0,110,0,
-116,0,1,111,1,
-2,2,0,1,1406,
-460,18,1,1406,160,
-2,0,1,1407,461,
-18,1,1407,207,2,
-0,1,299,462,18,
-1,299,463,20,464,
-4,8,83,0,84,
-0,65,0,82,0,
-1,20,1,1,2,
-0,1,1370,465,18,
-1,1370,160,2,0,
-1,2529,466,18,1,
-2529,140,2,0,1,
-2531,467,18,1,2531,
-153,2,0,1,305,
-468,18,1,305,168,
-2,0,1,2535,469,
-18,1,2535,470,20,
-471,4,18,83,0,
-116,0,97,0,116,
-0,101,0,66,0,
-111,0,100,0,121,
-0,1,102,1,2,
-2,0,1,2458,472,
-18,1,2458,260,2,
-0,1,2459,473,18,
-1,2459,323,2,0,
-1,2464,474,18,1,
-2464,323,2,0,1,
-1989,475,18,1,1989,
-260,2,0,1,1990,
-476,18,1,1990,477,
-20,478,4,8,69,
+1989,495,18,1,1989,
+258,2,0,1,1990,
+496,18,1,1990,497,
+20,498,4,8,69,
 0,76,0,83,0,
 69,0,1,43,1,
 1,2,0,1,2470,
-479,18,1,2470,156,
-2,0,1,322,480,
-18,1,322,225,2,
-0,1,1933,481,18,
+499,18,1,2470,156,
+2,0,1,322,500,
+18,1,322,227,2,
+0,1,1933,501,18,
 1,1933,135,2,0,
-1,883,482,18,1,
+1,883,502,18,1,
 883,168,2,0,1,
-328,483,18,1,328,
-168,2,0,1,1443,
-484,18,1,1443,240,
-2,0,1,1449,485,
-18,1,1449,168,2,
-0,1,2485,486,18,
-1,2485,487,20,488,
-4,42,67,0,79,
-0,76,0,76,0,
-73,0,83,0,73,
-0,79,0,78,0,
-95,0,83,0,84,
-0,65,0,82,0,
+2760,503,18,1,2760,
+284,2,0,1,328,
+504,18,1,328,168,
+2,0,1,1443,505,
+18,1,1443,243,2,
+0,1,1449,506,18,
+1,1449,168,2,0,
+1,2485,507,18,1,
+2485,508,20,509,4,
+38,78,0,79,0,
+84,0,95,0,65,
+0,84,0,95,0,
+84,0,65,0,82,
+0,71,0,69,0,
 84,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
-64,1,1,2,0,
-1,2488,489,18,1,
-2488,490,20,491,4,
-26,67,0,72,0,
-65,0,78,0,71,
-0,69,0,68,0,
+79,1,1,2,0,
+1,2488,510,18,1,
+2488,511,20,512,4,
+36,77,0,79,0,
+86,0,73,0,78,
+0,71,0,95,0,
+83,0,84,0,65,
+0,82,0,84,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,61,1,
+84,0,1,76,1,
 1,2,0,1,2489,
-492,18,1,2489,493,
-20,494,4,36,72,
-0,84,0,84,0,
-80,0,95,0,82,
-0,69,0,81,0,
-85,0,69,0,83,
-0,84,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,91,1,1,2,
-0,1,2490,495,18,
-1,2490,496,20,497,
-4,34,82,0,69,
-0,77,0,79,0,
-84,0,69,0,95,
-0,68,0,65,0,
-84,0,65,0,95,
+513,18,1,2489,514,
+20,515,4,32,77,
+0,79,0,86,0,
+73,0,78,0,71,
+0,95,0,69,0,
+78,0,68,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,82,1,1,
-2,0,1,2491,498,
-18,1,2491,499,20,
-500,4,32,79,0,
-66,0,74,0,69,
-0,67,0,84,0,
-95,0,82,0,69,
-0,90,0,95,0,
+0,1,75,1,1,
+2,0,1,2490,516,
+18,1,2490,517,20,
+518,4,32,83,0,
+84,0,65,0,84,
+0,69,0,95,0,
+69,0,88,0,73,
+0,84,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,80,1,1,2,
-0,1,2493,501,18,
-1,2493,502,20,503,
-4,24,76,0,73,
-0,83,0,84,0,
-69,0,78,0,95,
+1,86,1,1,2,
+0,1,2491,519,18,
+1,2491,520,20,521,
+4,34,83,0,84,
+0,65,0,84,0,
+69,0,95,0,69,
+0,78,0,84,0,
+82,0,89,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,73,1,1,
-2,0,1,1413,504,
-18,1,1413,168,2,
-0,1,346,505,18,
-1,346,506,20,507,
-4,8,80,0,76,
-0,85,0,83,0,
-1,18,1,1,2,
-0,1,2575,508,18,
-1,2575,509,20,510,
-4,20,83,0,116,
-0,97,0,116,0,
-101,0,69,0,118,
-0,101,0,110,0,
-116,0,1,103,1,
-2,2,0,1,2496,
-511,18,1,2496,512,
-20,513,4,48,76,
-0,65,0,78,0,
-68,0,95,0,67,
-0,79,0,76,0,
-76,0,73,0,83,
-0,73,0,79,0,
-78,0,95,0,69,
-0,78,0,68,0,
+0,1,85,1,1,
+2,0,1,2493,522,
+18,1,2493,523,20,
+524,4,34,82,0,
+69,0,77,0,79,
+0,84,0,69,0,
+95,0,68,0,65,
+0,84,0,65,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,70,1,
-1,2,0,1,2577,
-514,18,1,2577,515,
-20,516,4,34,86,
-0,111,0,105,0,
-100,0,65,0,114,
-0,103,0,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,1,105,
-1,2,2,0,1,
-2021,517,18,1,2021,
-260,2,0,1,2022,
-518,18,1,2022,347,
-2,0,1,352,519,
-18,1,352,168,2,
-0,1,2024,520,18,
-1,2024,132,2,0,
-1,2025,521,18,1,
-2025,522,20,523,4,
-8,74,0,85,0,
-77,0,80,0,1,
-49,1,1,2,0,
-1,2026,524,18,1,
-2026,132,2,0,1,
-2027,525,18,1,2027,
-526,20,527,4,4,
-65,0,84,0,1,
-23,1,1,2,0,
-1,2028,528,18,1,
-2028,132,2,0,1,
-2029,529,18,1,2029,
-343,2,0,1,2030,
-530,18,1,2030,531,
-20,532,4,14,70,
-0,111,0,114,0,
-76,0,111,0,111,
-0,112,0,1,127,
-1,2,2,0,1,
-2031,533,18,1,2031,
-534,20,535,4,32,
-68,0,111,0,87,
-0,104,0,105,0,
-108,0,101,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,126,1,
-2,2,0,1,2032,
-536,18,1,2032,537,
-20,538,4,28,87,
-0,104,0,105,0,
-108,0,101,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,125,1,
-2,2,0,1,2033,
-539,18,1,2033,540,
-20,541,4,22,73,
-0,102,0,83,0,
+84,0,1,82,1,
+1,2,0,1,1413,
+525,18,1,1413,168,
+2,0,1,346,526,
+18,1,346,527,20,
+528,4,8,80,0,
+76,0,85,0,83,
+0,1,18,1,1,
+2,0,1,2496,529,
+18,1,2496,530,20,
+531,4,24,76,0,
+73,0,83,0,84,
+0,69,0,78,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,73,1,
+1,2,0,1,2021,
+532,18,1,2021,258,
+2,0,1,2022,533,
+18,1,2022,352,2,
+0,1,352,534,18,
+1,352,168,2,0,
+1,2024,535,18,1,
+2024,132,2,0,1,
+2025,536,18,1,2025,
+537,20,538,4,8,
+74,0,85,0,77,
+0,80,0,1,49,
+1,1,2,0,1,
+2026,539,18,1,2026,
+132,2,0,1,2027,
+540,18,1,2027,541,
+20,542,4,4,65,
+0,84,0,1,23,
+1,1,2,0,1,
+2028,543,18,1,2028,
+132,2,0,1,2029,
+544,18,1,2029,224,
+2,0,1,2030,545,
+18,1,2030,546,20,
+547,4,14,70,0,
+111,0,114,0,76,
+0,111,0,111,0,
+112,0,1,131,1,
+2,2,0,1,2031,
+548,18,1,2031,549,
+20,550,4,32,68,
+0,111,0,87,0,
+104,0,105,0,108,
+0,101,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
-0,1,124,1,2,
-2,0,1,2034,542,
-18,1,2034,543,20,
-544,4,22,83,0,
+0,1,130,1,2,
+2,0,1,2032,551,
+18,1,2032,552,20,
+553,4,28,87,0,
+104,0,105,0,108,
+0,101,0,83,0,
 116,0,97,0,116,
-0,101,0,67,0,
-104,0,97,0,110,
-0,103,0,101,0,
-1,123,1,2,2,
-0,1,1478,545,18,
-1,1478,160,2,0,
-1,1479,546,18,1,
-1479,276,2,0,1,
-2037,547,18,1,2037,
-192,2,0,1,2038,
-548,18,1,2038,549,
-20,550,4,18,74,
-0,117,0,109,0,
-112,0,76,0,97,
-0,98,0,101,0,
-108,0,1,121,1,
-2,2,0,1,2039,
-551,18,1,2039,192,
-2,0,1,2040,552,
-18,1,2040,553,20,
-554,4,30,82,0,
-101,0,116,0,117,
-0,114,0,110,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,1,120,
-1,2,2,0,1,
-2041,555,18,1,2041,
-192,2,0,1,1485,
-556,18,1,1485,168,
-2,0,1,372,557,
-18,1,372,180,2,
-0,1,373,558,18,
-1,373,132,2,0,
-1,374,559,18,1,
-374,176,2,0,1,
-375,560,18,1,375,
-132,2,0,1,376,
-561,18,1,376,183,
-2,0,1,377,562,
-18,1,377,132,2,
-0,1,378,563,18,
-1,378,176,2,0,
-1,379,564,18,1,
-379,132,2,0,1,
-380,565,18,1,380,
-566,20,567,4,16,
-67,0,111,0,110,
-0,115,0,116,0,
-97,0,110,0,116,
-0,1,133,1,2,
-2,0,1,381,568,
-18,1,381,290,2,
-0,1,371,569,18,
-1,371,570,20,571,
-4,24,70,0,117,
-0,110,0,99,0,
-116,0,105,0,111,
-0,110,0,67,0,
-97,0,108,0,108,
+0,101,0,109,0,
+101,0,110,0,116,
 0,1,129,1,2,
-2,0,1,942,572,
-18,1,942,168,2,
-0,1,2533,573,18,
-1,2533,343,2,0,
-1,387,574,18,1,
-387,168,2,0,1,
-2619,575,18,1,2619,
-470,2,0,1,1514,
-576,18,1,1514,160,
-2,0,1,1515,577,
-18,1,1515,297,2,
-0,1,2074,578,18,
-1,2074,160,2,0,
-1,2075,579,18,1,
-2075,153,2,0,1,
-406,580,18,1,406,
-143,2,0,1,1521,
-581,18,1,1521,168,
-2,0,1,412,582,
-18,1,412,168,2,
-0,1,2484,583,18,
-1,2484,584,20,585,
-4,24,79,0,78,
-0,95,0,82,0,
-69,0,90,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,81,1,1,
-2,0,1,2023,586,
-18,1,2023,587,20,
-588,4,26,68,0,
-69,0,70,0,65,
-0,85,0,76,0,
-84,0,95,0,83,
-0,84,0,65,0,
-84,0,69,0,1,
-47,1,1,2,0,
-1,1442,589,18,1,
-1442,160,2,0,1,
-2573,590,18,1,2573,
-515,2,0,1,2574,
-591,18,1,2574,592,
-20,593,4,32,73,
+2,0,1,2033,554,
+18,1,2033,555,20,
+556,4,22,73,0,
+102,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+1,128,1,2,2,
+0,1,2034,557,18,
+1,2034,558,20,559,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,67,0,104,
+0,97,0,110,0,
+103,0,101,0,1,
+127,1,2,2,0,
+1,1478,560,18,1,
+1478,160,2,0,1,
+1479,561,18,1,1479,
+278,2,0,1,2037,
+562,18,1,2037,191,
+2,0,1,2038,563,
+18,1,2038,564,20,
+565,4,18,74,0,
+117,0,109,0,112,
+0,76,0,97,0,
+98,0,101,0,108,
+0,1,125,1,2,
+2,0,1,2039,566,
+18,1,2039,191,2,
+0,1,2040,567,18,
+1,2040,568,20,569,
+4,30,82,0,101,
+0,116,0,117,0,
+114,0,110,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,124,1,
+2,2,0,1,2041,
+570,18,1,2041,191,
+2,0,1,1485,571,
+18,1,1485,168,2,
+0,1,372,572,18,
+1,372,180,2,0,
+1,373,573,18,1,
+373,132,2,0,1,
+374,574,18,1,374,
+176,2,0,1,375,
+575,18,1,375,132,
+2,0,1,376,576,
+18,1,376,183,2,
+0,1,377,577,18,
+1,377,132,2,0,
+1,378,578,18,1,
+378,176,2,0,1,
+379,579,18,1,379,
+132,2,0,1,380,
+580,18,1,380,581,
+20,582,4,16,67,
+0,111,0,110,0,
+115,0,116,0,97,
 0,110,0,116,0,
+1,137,1,2,2,
+0,1,381,583,18,
+1,381,301,2,0,
+1,371,584,18,1,
+371,585,20,586,4,
+24,70,0,117,0,
+110,0,99,0,116,
+0,105,0,111,0,
+110,0,67,0,97,
+0,108,0,108,0,
+1,133,1,2,2,
+0,1,942,587,18,
+1,942,168,2,0,
+1,387,588,18,1,
+387,168,2,0,1,
+1514,589,18,1,1514,
+160,2,0,1,1515,
+590,18,1,1515,308,
+2,0,1,2074,591,
+18,1,2074,160,2,
+0,1,2075,592,18,
+1,2075,153,2,0,
+1,406,593,18,1,
+406,143,2,0,1,
+1521,594,18,1,1521,
+168,2,0,1,412,
+595,18,1,412,168,
+2,0,1,2484,596,
+18,1,2484,597,20,
+598,4,22,84,0,
+73,0,77,0,69,
+0,82,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,87,1,1,2,
+0,1,2023,599,18,
+1,2023,600,20,601,
+4,26,68,0,69,
+0,70,0,65,0,
+85,0,76,0,84,
+0,95,0,83,0,
+84,0,65,0,84,
+0,69,0,1,47,
+1,1,2,0,1,
+1442,602,18,1,1442,
+160,2,0,1,2035,
+603,18,1,2035,191,
+2,0,1,2036,604,
+18,1,2036,605,20,
+606,4,26,74,0,
+117,0,109,0,112,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,1,
+126,1,2,2,0,
+1,431,607,18,1,
+431,143,2,0,1,
+2105,608,18,1,2105,
+258,2,0,1,2106,
+609,18,1,2106,497,
+2,0,1,1550,610,
+18,1,1550,160,2,
+0,1,437,611,18,
+1,437,168,2,0,
+1,2044,612,18,1,
+2044,613,20,614,4,
+28,69,0,109,0,
+112,0,116,0,121,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,1,
+121,1,2,2,0,
+1,2045,615,18,1,
+2045,191,2,0,1,
+2586,616,18,1,2586,
+264,2,0,1,1555,
+617,18,1,1555,168,
+2,0,1,2588,618,
+18,1,2588,619,20,
+620,4,38,86,0,
+101,0,99,0,116,
+0,111,0,114,0,
 65,0,114,0,103,
 0,83,0,116,0,
 97,0,116,0,101,
 0,69,0,118,0,
 101,0,110,0,116,
-0,1,104,1,2,
-2,0,1,2035,594,
-18,1,2035,192,2,
-0,1,2036,595,18,
-1,2036,596,20,597,
-4,26,74,0,117,
-0,109,0,112,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,1,122,
-1,2,2,0,1,
-431,598,18,1,431,
-143,2,0,1,2578,
-599,18,1,2578,592,
-2,0,1,2579,600,
-18,1,2579,509,2,
-0,1,2105,601,18,
-1,2105,260,2,0,
-1,2106,602,18,1,
-2106,477,2,0,1,
-1550,603,18,1,1550,
-160,2,0,1,437,
-604,18,1,437,168,
-2,0,1,2044,605,
-18,1,2044,606,20,
-607,4,28,69,0,
-109,0,112,0,116,
-0,121,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,1,117,1,2,
-2,0,1,2045,608,
-18,1,2045,192,2,
-0,1,2668,609,18,
-1,2668,610,20,611,
-4,10,83,0,116,
-0,97,0,116,0,
-101,0,1,101,1,
-2,2,0,1,1555,
-612,18,1,1555,168,
-2,0,1,2670,613,
-18,1,2670,135,2,
-0,1,2511,614,18,
-1,2511,135,2,0,
-1,1001,615,18,1,
-1001,570,2,0,1,
-1002,616,18,1,1002,
-566,2,0,1,447,
-617,18,1,447,306,
-2,0,1,2679,618,
-18,1,2679,140,2,
-0,1,2520,619,18,
-1,2520,135,2,0,
-1,1010,620,18,1,
-1010,160,2,0,1,
-1011,621,18,1,1011,
-153,2,0,1,1012,
-622,18,1,1012,168,
-2,0,1,1013,623,
-18,1,1013,153,2,
-0,1,2685,624,18,
-1,2685,150,2,0,
-1,2686,625,18,1,
-2686,297,2,0,1,
-459,626,18,1,459,
-627,20,628,4,24,
-76,0,69,0,70,
-0,84,0,95,0,
-66,0,82,0,65,
-0,67,0,75,0,
-69,0,84,0,1,
-27,1,1,2,0,
-1,1574,629,18,1,
-1574,192,2,0,1,
-461,630,18,1,461,
-631,20,632,4,24,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,76,0,105,0,
-115,0,116,0,1,
-130,1,2,2,0,
-1,462,633,18,1,
-462,143,2,0,1,
-464,634,18,1,464,
-635,20,636,4,16,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,1,131,1,2,
-2,0,1,2136,637,
-18,1,2136,260,2,
-0,1,1585,638,18,
-1,1585,639,20,640,
-4,12,82,0,69,
-0,84,0,85,0,
-82,0,78,0,1,
-50,1,1,2,0,
-1,476,641,18,1,
-476,642,20,643,4,
-30,83,0,84,0,
-82,0,73,0,78,
-0,71,0,95,0,
-67,0,79,0,78,
-0,83,0,84,0,
-65,0,78,0,84,
-0,1,3,1,1,
-2,0,1,477,644,
-18,1,477,645,20,
-646,4,28,70,0,
-76,0,79,0,65,
-0,84,0,95,0,
-67,0,79,0,78,
-0,83,0,84,0,
-65,0,78,0,84,
-0,1,95,1,1,
-2,0,1,478,647,
-18,1,478,648,20,
-649,4,40,72,0,
-69,0,88,0,95,
-0,73,0,78,0,
-84,0,69,0,71,
-0,69,0,82,0,
+0,1,106,1,2,
+2,0,1,2511,621,
+18,1,2511,153,2,
+0,1,1001,622,18,
+1,1001,585,2,0,
+1,1002,623,18,1,
+1002,581,2,0,1,
+447,624,18,1,447,
+317,2,0,1,2593,
+625,18,1,2593,156,
+2,0,1,2520,626,
+18,1,2520,153,2,
+0,1,1010,627,18,
+1,1010,160,2,0,
+1,1011,628,18,1,
+1011,153,2,0,1,
+1012,629,18,1,1012,
+168,2,0,1,1013,
+630,18,1,1013,153,
+2,0,1,2685,631,
+18,1,2685,132,2,
+0,1,2686,632,18,
+1,2686,135,2,0,
+1,459,633,18,1,
+459,634,20,635,4,
+24,76,0,69,0,
+70,0,84,0,95,
+0,66,0,82,0,
+65,0,67,0,75,
+0,69,0,84,0,
+1,27,1,1,2,
+0,1,1574,636,18,
+1,1574,191,2,0,
+1,461,637,18,1,
+461,638,20,639,4,
+24,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,76,0,105,
+0,115,0,116,0,
+1,134,1,2,2,
+0,1,462,640,18,
+1,462,143,2,0,
+1,464,641,18,1,
+464,642,20,643,4,
+16,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,1,135,1,
+2,2,0,1,2136,
+644,18,1,2136,258,
+2,0,1,2695,645,
+18,1,2695,140,2,
+0,1,2697,646,18,
+1,2697,153,2,0,
+1,1585,647,18,1,
+1585,648,20,649,4,
+12,82,0,69,0,
+84,0,85,0,82,
+0,78,0,1,50,
+1,1,2,0,1,
+2701,650,18,1,2701,
+150,2,0,1,2702,
+651,18,1,2702,308,
+2,0,1,476,652,
+18,1,476,653,20,
+654,4,30,83,0,
+84,0,82,0,73,
+0,78,0,71,0,
 95,0,67,0,79,
 0,78,0,83,0,
 84,0,65,0,78,
-0,84,0,1,94,
+0,84,0,1,3,
 1,1,2,0,1,
-479,650,18,1,479,
-651,20,652,4,32,
-73,0,78,0,84,
-0,69,0,71,0,
-69,0,82,0,95,
-0,67,0,79,0,
-78,0,83,0,84,
-0,65,0,78,0,
-84,0,1,93,1,
-1,2,0,1,480,
-653,18,1,480,654,
-20,655,4,26,82,
-0,73,0,71,0,
-72,0,84,0,95,
-0,66,0,82,0,
-65,0,67,0,75,
-0,69,0,84,0,
-1,28,1,1,2,
-0,1,481,656,18,
-1,481,635,2,0,
-1,2711,657,18,1,
-2711,192,2,0,1,
-1048,658,18,1,1048,
-168,2,0,1,2722,
-659,18,1,2722,192,
-2,0,1,2723,660,
-18,1,2723,661,20,
-662,4,34,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
+477,655,18,1,477,
+656,20,657,4,28,
+70,0,76,0,79,
+0,65,0,84,0,
+95,0,67,0,79,
+0,78,0,83,0,
+84,0,65,0,78,
+0,84,0,1,95,
+1,1,2,0,1,
+478,658,18,1,478,
+659,20,660,4,40,
+72,0,69,0,88,
+0,95,0,73,0,
+78,0,84,0,69,
+0,71,0,69,0,
+82,0,95,0,67,
+0,79,0,78,0,
+83,0,84,0,65,
+0,78,0,84,0,
+1,94,1,1,2,
+0,1,479,661,18,
+1,479,662,20,663,
+4,32,73,0,78,
+0,84,0,69,0,
+71,0,69,0,82,
+0,95,0,67,0,
+79,0,78,0,83,
+0,84,0,65,0,
+78,0,84,0,1,
+93,1,1,2,0,
+1,480,664,18,1,
+480,665,20,666,4,
+26,82,0,73,0,
+71,0,72,0,84,
+0,95,0,66,0,
+82,0,65,0,67,
+0,75,0,69,0,
+84,0,1,28,1,
+1,2,0,1,481,
+667,18,1,481,642,
+2,0,1,2632,668,
+18,1,2632,493,2,
+0,1,1048,669,18,
+1,1048,168,2,0,
+1,2727,670,18,1,
+2727,191,2,0,1,
+2042,671,18,1,2042,
+672,20,673,4,20,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+1,122,1,2,2,
+0,1,2043,674,18,
+1,2043,191,2,0,
+1,1620,675,18,1,
+1620,160,2,0,1,
+1621,676,18,1,1621,
+150,2,0,1,1622,
+677,18,1,1622,308,
+2,0,1,509,678,
+18,1,509,143,2,
+0,1,2498,679,18,
+1,2498,680,20,681,
+4,38,72,0,84,
+0,84,0,80,0,
+95,0,82,0,69,
+0,83,0,80,0,
+79,0,78,0,83,
+0,69,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,68,1,1,2,
+0,1,2739,682,18,
+1,2739,683,20,684,
+4,34,71,0,108,
+0,111,0,98,0,
+97,0,108,0,68,
+0,101,0,102,0,
+105,0,110,0,105,
+0,116,0,105,0,
+111,0,110,0,115,
+0,1,97,1,2,
+2,0,1,1628,685,
+18,1,1628,168,2,
+0,1,515,686,18,
+1,515,168,2,0,
+1,2505,687,18,1,
+2505,688,20,689,4,
+28,86,0,101,0,
+99,0,116,0,111,
+0,114,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+117,1,2,2,0,
+1,2583,690,18,1,
+2583,619,2,0,1,
+2584,691,18,1,2584,
+331,2,0,1,2585,
+692,18,1,2585,334,
+2,0,1,2750,693,
+18,1,2750,287,2,
+0,1,2587,694,18,
+1,2587,486,2,0,
+1,525,695,18,1,
+525,317,2,0,1,
+2197,696,18,1,2197,
+160,2,0,1,2198,
+697,18,1,2198,153,
+2,0,1,1591,698,
+18,1,1591,168,2,
+0,1,2757,699,18,
+1,2757,700,20,701,
+4,48,71,0,108,
+0,111,0,98,0,
+97,0,108,0,70,
+0,117,0,110,0,
+99,0,116,0,105,
+0,111,0,110,0,
 68,0,101,0,102,
 0,105,0,110,0,
 105,0,116,0,105,
 0,111,0,110,0,
-115,0,1,97,1,
-2,2,0,1,2042,
-663,18,1,2042,664,
-20,665,4,20,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,1,
-118,1,2,2,0,
-1,2043,666,18,1,
-2043,192,2,0,1,
-1620,667,18,1,1620,
-160,2,0,1,1621,
-668,18,1,1621,150,
-2,0,1,1622,669,
-18,1,1622,297,2,
-0,1,509,670,18,
-1,509,143,2,0,
-1,2498,671,18,1,
-2498,672,20,673,4,
-38,72,0,84,0,
-84,0,80,0,95,
-0,82,0,69,0,
-83,0,80,0,79,
-0,78,0,83,0,
-69,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-68,1,1,2,0,
-1,2576,674,18,1,
-2576,323,2,0,1,
-2741,675,18,1,2741,
-330,2,0,1,1628,
-676,18,1,1628,168,
-2,0,1,515,677,
-18,1,515,168,2,
-0,1,2580,678,18,
-1,2580,587,2,0,
-1,2505,679,18,1,
-2505,680,20,681,4,
-24,86,0,111,0,
-105,0,100,0,65,
-0,114,0,103,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,113,1,2,2,
-0,1,2746,682,18,
-1,2746,683,23,684,
+1,99,1,2,2,
+0,1,2592,702,18,
+1,2592,600,2,0,
+1,2759,703,18,1,
+2759,700,2,0,1,
+2675,704,18,1,2675,
+486,2,0,1,2761,
+104,1,2762,705,18,
+1,2762,706,23,707,
 4,6,69,0,79,
 0,70,0,1,2,
 1,6,2,0,1,
-2664,685,18,1,2664,
-250,2,0,1,2667,
-686,18,1,2667,610,
-2,0,1,525,687,
-18,1,525,306,2,
-0,1,2197,688,18,
-1,2197,160,2,0,
-1,2198,689,18,1,
-2198,153,2,0,1,
-1591,690,18,1,1591,
-168,2,0,1,1094,
-691,18,1,1094,631,
-2,0,1,2681,692,
-18,1,2681,153,2,
-0,1,1096,693,18,
-1,1096,153,2,0,
-1,2683,694,18,1,
-2683,343,2,0,1,
-1657,695,18,1,1657,
-192,2,0,1,1658,
-696,18,1,1658,697,
-20,698,4,6,70,
-0,79,0,82,0,
-1,46,1,1,2,
-0,1,1659,699,18,
-1,1659,135,2,0,
-1,2692,700,18,1,
-2692,168,2,0,1,
-1665,701,18,1,1665,
-168,2,0,1,1113,
-702,18,1,1113,176,
-2,0,703,5,0,
-704,5,338,1,2,
-705,19,684,1,2,
-706,5,6,1,2668,
-707,17,708,15,709,
-4,14,37,0,83,
-0,116,0,97,0,
-116,0,101,0,115,
-0,1,-1,1,5,
-710,20,711,4,16,
-83,0,116,0,97,
-0,116,0,101,0,
-115,0,95,0,49,
-0,1,158,1,3,
-1,2,1,1,712,
-22,1,11,1,2576,
-713,17,714,15,715,
-4,12,37,0,83,
-0,116,0,97,0,
-116,0,101,0,1,
--1,1,5,716,20,
-717,4,14,83,0,
+1094,708,18,1,1094,
+638,2,0,1,1096,
+709,18,1,1096,153,
+2,0,1,2683,710,
+18,1,2683,711,20,
+712,4,10,83,0,
 116,0,97,0,116,
-0,101,0,95,0,
-50,0,1,161,1,
-3,1,6,1,5,
-718,22,1,14,1,
-2667,719,17,720,15,
-709,1,-1,1,5,
-721,20,722,4,16,
-83,0,116,0,97,
-0,116,0,101,0,
-115,0,95,0,50,
-0,1,159,1,3,
-1,3,1,2,723,
-22,1,12,1,2734,
-724,17,725,15,726,
+0,101,0,1,101,
+1,2,2,0,1,
+2684,713,18,1,2684,
+711,2,0,1,1657,
+714,18,1,1657,191,
+2,0,1,1658,715,
+18,1,1658,716,20,
+717,4,6,70,0,
+79,0,82,0,1,
+46,1,1,2,0,
+1,1659,718,18,1,
+1659,135,2,0,1,
+1665,719,18,1,1665,
+168,2,0,1,1113,
+720,18,1,1113,176,
+2,0,721,5,0,
+722,5,347,1,2,
+723,19,707,1,2,
+724,5,6,1,2750,
+725,17,726,15,727,
 4,30,37,0,76,
 0,83,0,76,0,
 80,0,114,0,111,
@@ -3570,363 +3659,395 @@ public yyLSLSyntax
 97,0,109,0,82,
 0,111,0,111,0,
 116,0,1,-1,1,
-5,727,20,728,4,
+5,728,20,729,4,
 32,76,0,83,0,
 76,0,80,0,114,
 0,111,0,103,0,
 114,0,97,0,109,
 0,82,0,111,0,
 111,0,116,0,95,
-0,49,0,1,148,
+0,49,0,1,152,
 1,3,1,3,1,
-2,729,22,1,1,
-1,2664,730,17,731,
-15,726,1,-1,1,
-5,732,20,733,4,
-32,76,0,83,0,
-76,0,80,0,114,
-0,111,0,103,0,
-114,0,97,0,109,
-0,82,0,111,0,
-111,0,116,0,95,
-0,50,0,1,149,
-1,3,1,2,1,
-1,734,22,1,2,
-1,2660,735,17,736,
-15,715,1,-1,1,
-5,737,20,738,4,
-14,83,0,116,0,
+2,730,22,1,1,
+1,2675,731,17,732,
+15,733,4,12,37,
+0,83,0,116,0,
 97,0,116,0,101,
-0,95,0,49,0,
-1,160,1,3,1,
-5,1,4,739,22,
-1,13,1,3,740,
-19,643,1,3,741,
-5,95,1,256,742,
-16,0,641,1,1261,
-743,16,0,641,1,
-509,744,16,0,641,
-1,1515,745,16,0,
-641,1,2686,746,16,
-0,641,1,2021,747,
-17,748,15,749,4,
-24,37,0,73,0,
+0,1,-1,1,5,
+734,20,735,4,14,
+83,0,116,0,97,
+0,116,0,101,0,
+95,0,49,0,1,
+164,1,3,1,5,
+1,4,736,22,1,
+13,1,2587,737,17,
+738,15,733,1,-1,
+1,5,739,20,740,
+4,14,83,0,116,
+0,97,0,116,0,
+101,0,95,0,50,
+0,1,165,1,3,
+1,6,1,5,741,
+22,1,14,1,2684,
+742,17,743,15,744,
+4,14,37,0,83,
+0,116,0,97,0,
+116,0,101,0,115,
+0,1,-1,1,5,
+745,20,746,4,16,
+83,0,116,0,97,
+0,116,0,101,0,
+115,0,95,0,49,
+0,1,162,1,3,
+1,2,1,1,747,
+22,1,11,1,2680,
+748,17,749,15,727,
+1,-1,1,5,750,
+20,751,4,32,76,
+0,83,0,76,0,
+80,0,114,0,111,
+0,103,0,114,0,
+97,0,109,0,82,
+0,111,0,111,0,
+116,0,95,0,50,
+0,1,153,1,3,
+1,2,1,1,752,
+22,1,2,1,2683,
+753,17,754,15,744,
+1,-1,1,5,755,
+20,756,4,16,83,
+0,116,0,97,0,
+116,0,101,0,115,
+0,95,0,50,0,
+1,163,1,3,1,
+3,1,2,757,22,
+1,12,1,3,758,
+19,654,1,3,759,
+5,95,1,256,760,
+16,0,652,1,1261,
+761,16,0,652,1,
+509,762,16,0,652,
+1,1515,763,16,0,
+652,1,2021,764,17,
+765,15,766,4,24,
+37,0,73,0,102,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,1,
+-1,1,5,767,20,
+768,4,26,73,0,
 102,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,-1,1,5,750,
-20,751,4,26,73,
-0,102,0,83,0,
+95,0,50,0,1,
+208,1,3,1,8,
+1,7,769,22,1,
+58,1,1775,770,16,
+0,652,1,2029,771,
+17,772,15,773,4,
+20,37,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
-0,95,0,50,0,
-1,199,1,3,1,
-8,1,7,752,22,
-1,53,1,1775,753,
-16,0,641,1,2029,
-754,17,755,15,756,
-4,20,37,0,83,
+0,1,-1,1,5,
+774,20,775,4,24,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,51,0,1,
+202,1,3,1,2,
+1,1,776,22,1,
+52,1,2030,777,17,
+778,15,773,1,-1,
+1,5,779,20,780,
+4,24,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,50,
+0,1,201,1,3,
+1,2,1,1,781,
+22,1,51,1,2031,
+782,17,783,15,773,
+1,-1,1,5,784,
+20,785,4,24,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,1,-1,1,
-5,757,20,758,4,
+116,0,95,0,49,
+0,49,0,1,200,
+1,3,1,2,1,
+1,786,22,1,50,
+1,2032,787,17,788,
+15,773,1,-1,1,
+5,789,20,790,4,
 24,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,51,0,
-1,193,1,3,1,
-2,1,1,759,22,
-1,47,1,2030,760,
-17,761,15,756,1,
--1,1,5,762,20,
-763,4,24,83,0,
+0,49,0,48,0,
+1,199,1,3,1,
+2,1,1,791,22,
+1,49,1,2033,792,
+17,793,15,773,1,
+-1,1,5,794,20,
+795,4,22,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
-0,95,0,49,0,
-50,0,1,192,1,
-3,1,2,1,1,
-764,22,1,46,1,
-2031,765,17,766,15,
-756,1,-1,1,5,
-767,20,768,4,24,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,49,0,1,
-191,1,3,1,2,
-1,1,769,22,1,
-45,1,2032,770,17,
-771,15,756,1,-1,
-1,5,772,20,773,
-4,24,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,48,
-0,1,190,1,3,
-1,2,1,1,774,
-22,1,44,1,2033,
-775,17,776,15,756,
-1,-1,1,5,777,
-20,778,4,22,83,
+0,95,0,57,0,
+1,198,1,3,1,
+2,1,1,796,22,
+1,48,1,277,797,
+16,0,652,1,2035,
+798,17,799,15,773,
+1,-1,1,5,800,
+20,801,4,22,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,95,0,57,
-0,1,189,1,3,
-1,2,1,1,779,
-22,1,43,1,277,
-780,16,0,641,1,
-2035,781,17,782,15,
-756,1,-1,1,5,
-783,20,784,4,22,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-56,0,1,188,1,
-3,1,3,1,2,
-785,22,1,42,1,
-2037,786,17,787,15,
-756,1,-1,1,5,
-788,20,789,4,22,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-55,0,1,187,1,
-3,1,3,1,2,
-790,22,1,41,1,
-2039,791,17,792,15,
-756,1,-1,1,5,
-793,20,794,4,22,
+116,0,95,0,56,
+0,1,197,1,3,
+1,3,1,2,802,
+22,1,47,1,2037,
+803,17,804,15,773,
+1,-1,1,5,805,
+20,806,4,22,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,55,
+0,1,196,1,3,
+1,3,1,2,807,
+22,1,46,1,2039,
+808,17,809,15,773,
+1,-1,1,5,810,
+20,811,4,22,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,54,
+0,1,195,1,3,
+1,3,1,2,812,
+22,1,45,1,32,
+813,16,0,652,1,
+2041,814,17,815,15,
+773,1,-1,1,5,
+816,20,817,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-54,0,1,186,1,
+53,0,1,194,1,
 3,1,3,1,2,
-795,22,1,40,1,
-32,796,16,0,641,
-1,2041,797,17,798,
-15,756,1,-1,1,
-5,799,20,800,4,
+818,22,1,44,1,
+2293,819,16,0,652,
+1,2043,820,17,821,
+15,773,1,-1,1,
+5,822,20,823,4,
 22,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,53,0,1,185,
+0,51,0,1,192,
 1,3,1,3,1,
-2,801,22,1,39,
-1,2293,802,16,0,
-641,1,2043,803,17,
-804,15,756,1,-1,
-1,5,805,20,806,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-95,0,51,0,1,
-183,1,3,1,3,
-1,2,807,22,1,
-37,1,2045,808,17,
-809,15,756,1,-1,
-1,5,810,20,811,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,1,
-181,1,3,1,3,
-1,2,812,22,1,
-35,1,41,813,16,
-0,641,1,1297,814,
-16,0,641,1,43,
-815,16,0,641,1,
-1803,816,17,817,15,
-818,4,16,37,0,
-70,0,111,0,114,
-0,76,0,111,0,
-111,0,112,0,1,
--1,1,5,819,20,
-820,4,18,70,0,
-111,0,114,0,76,
-0,111,0,111,0,
-112,0,95,0,49,
-0,1,206,1,3,
-1,10,1,9,821,
-22,1,60,1,1804,
-822,16,0,641,1,
-299,823,16,0,641,
-1,52,824,16,0,
-641,1,2318,825,16,
-0,641,1,62,826,
-16,0,641,1,2075,
-827,16,0,641,1,
-1574,828,17,829,15,
-756,1,-1,1,5,
-830,20,831,4,22,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-52,0,1,184,1,
-3,1,3,1,2,
-832,22,1,38,1,
-71,833,16,0,641,
-1,76,834,16,0,
-641,1,1834,835,16,
-0,641,1,2337,836,
-16,0,641,1,79,
-837,16,0,641,1,
-1335,838,16,0,641,
-1,322,839,16,0,
-641,1,85,840,16,
-0,641,1,89,841,
-16,0,641,1,346,
-842,16,0,641,1,
-2105,843,17,844,15,
-749,1,-1,1,5,
-845,20,846,4,26,
-73,0,102,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,51,
-0,1,200,1,3,
-1,6,1,5,847,
-22,1,54,1,2106,
-848,16,0,641,1,
-97,849,16,0,641,
-1,1860,850,17,851,
-15,852,4,34,37,
-0,68,0,111,0,
-87,0,104,0,105,
-0,108,0,101,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,1,-1,
-1,5,853,20,854,
-4,36,68,0,111,
-0,87,0,104,0,
-105,0,108,0,101,
-0,83,0,116,0,
+2,824,22,1,42,
+1,2045,825,17,826,
+15,773,1,-1,1,
+5,827,20,828,4,
+22,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,1,204,
-1,3,1,8,1,
-7,855,22,1,58,
-1,2364,856,17,857,
-15,818,1,-1,1,
-5,858,20,859,4,
-18,70,0,111,0,
-114,0,76,0,111,
-0,111,0,112,0,
-95,0,50,0,1,
-207,1,3,1,9,
-1,8,860,22,1,
-61,1,102,861,16,
-0,641,1,112,862,
-16,0,641,1,1117,
-863,16,0,641,1,
-1873,864,17,865,15,
-852,1,-1,1,5,
-866,20,867,4,36,
+0,49,0,1,190,
+1,3,1,3,1,
+2,829,22,1,40,
+1,41,830,16,0,
+652,1,1297,831,16,
+0,652,1,43,832,
+16,0,652,1,1803,
+833,17,834,15,835,
+4,16,37,0,70,
+0,111,0,114,0,
+76,0,111,0,111,
+0,112,0,1,-1,
+1,5,836,20,837,
+4,18,70,0,111,
+0,114,0,76,0,
+111,0,111,0,112,
+0,95,0,49,0,
+1,215,1,3,1,
+10,1,9,838,22,
+1,65,1,1804,839,
+16,0,652,1,299,
+840,16,0,652,1,
+52,841,16,0,652,
+1,2318,842,16,0,
+652,1,62,843,16,
+0,652,1,2075,844,
+16,0,652,1,1574,
+845,17,846,15,773,
+1,-1,1,5,847,
+20,848,4,22,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,52,
+0,1,193,1,3,
+1,3,1,2,849,
+22,1,43,1,71,
+850,16,0,652,1,
+76,851,16,0,652,
+1,1834,852,16,0,
+652,1,2337,853,16,
+0,652,1,79,854,
+16,0,652,1,1335,
+855,16,0,652,1,
+322,856,16,0,652,
+1,85,857,16,0,
+652,1,89,858,16,
+0,652,1,346,859,
+16,0,652,1,2105,
+860,17,861,15,766,
+1,-1,1,5,862,
+20,863,4,26,73,
+0,102,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,51,0,
+1,209,1,3,1,
+6,1,5,864,22,
+1,59,1,2106,865,
+16,0,652,1,97,
+866,16,0,652,1,
+1860,867,17,868,15,
+869,4,34,37,0,
 68,0,111,0,87,
 0,104,0,105,0,
 108,0,101,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,95,0,50,
-0,1,205,1,3,
-1,8,1,7,868,
-22,1,59,1,1876,
-869,16,0,641,1,
-124,870,16,0,641,
-1,2136,871,17,872,
-15,749,1,-1,1,
-5,873,20,874,4,
-26,73,0,102,0,
+116,0,1,-1,1,
+5,870,20,871,4,
+36,68,0,111,0,
+87,0,104,0,105,
+0,108,0,101,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-52,0,1,201,1,
+49,0,1,213,1,
 3,1,8,1,7,
-875,22,1,55,1,
-381,876,16,0,641,
-1,525,877,16,0,
-641,1,137,878,16,
-0,641,1,1901,879,
-16,0,641,1,1153,
-880,16,0,641,1,
-151,881,16,0,641,
-1,1407,882,16,0,
-641,1,1659,883,16,
-0,641,1,2413,884,
-16,0,641,1,406,
-885,16,0,641,1,
-1371,886,16,0,641,
-1,166,887,16,0,
-641,1,1622,888,16,
-0,641,1,1931,889,
-17,890,15,891,4,
-30,37,0,87,0,
+872,22,1,63,1,
+2364,873,17,874,15,
+835,1,-1,1,5,
+875,20,876,4,18,
+70,0,111,0,114,
+0,76,0,111,0,
+111,0,112,0,95,
+0,50,0,1,216,
+1,3,1,9,1,
+8,877,22,1,66,
+1,102,878,16,0,
+652,1,112,879,16,
+0,652,1,1117,880,
+16,0,652,1,1873,
+881,17,882,15,869,
+1,-1,1,5,883,
+20,884,4,36,68,
+0,111,0,87,0,
 104,0,105,0,108,
 0,101,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
-0,1,-1,1,5,
-892,20,893,4,32,
-87,0,104,0,105,
-0,108,0,101,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,1,202,1,
-3,1,6,1,5,
-894,22,1,56,1,
-1933,895,16,0,641,
-1,431,896,16,0,
-641,1,1585,897,16,
-0,641,1,182,898,
-16,0,641,1,1189,
-899,16,0,641,1,
-1443,900,16,0,641,
-1,1695,901,16,0,
-641,1,2198,902,16,
-0,641,1,447,903,
-16,0,641,1,2458,
-904,17,905,15,906,
+0,95,0,50,0,
+1,214,1,3,1,
+8,1,7,885,22,
+1,64,1,1876,886,
+16,0,652,1,124,
+887,16,0,652,1,
+2136,888,17,889,15,
+766,1,-1,1,5,
+890,20,891,4,26,
+73,0,102,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,52,
+0,1,210,1,3,
+1,8,1,7,892,
+22,1,60,1,381,
+893,16,0,652,1,
+525,894,16,0,652,
+1,137,895,16,0,
+652,1,1901,896,16,
+0,652,1,1153,897,
+16,0,652,1,151,
+898,16,0,652,1,
+1407,899,16,0,652,
+1,1659,900,16,0,
+652,1,2413,901,16,
+0,652,1,406,902,
+16,0,652,1,1371,
+903,16,0,652,1,
+166,904,16,0,652,
+1,1622,905,16,0,
+652,1,1931,906,17,
+907,15,908,4,30,
+37,0,87,0,104,
+0,105,0,108,0,
+101,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+1,-1,1,5,909,
+20,910,4,32,87,
+0,104,0,105,0,
+108,0,101,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,49,
+0,1,211,1,3,
+1,6,1,5,911,
+22,1,61,1,1933,
+912,16,0,652,1,
+431,913,16,0,652,
+1,1585,914,16,0,
+652,1,182,915,16,
+0,652,1,1189,916,
+16,0,652,1,1443,
+917,16,0,652,1,
+1695,918,16,0,652,
+1,2198,919,16,0,
+652,1,2702,920,16,
+0,652,1,447,921,
+16,0,652,1,2458,
+922,17,923,15,924,
 4,28,37,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,76,0,105,
 0,115,0,116,0,
-1,-1,1,5,907,
-20,908,4,30,83,
+1,-1,1,5,925,
+20,926,4,30,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,76,0,105,
 0,115,0,116,0,
 95,0,50,0,1,
-179,1,3,1,3,
-1,2,909,22,1,
-33,1,2459,910,17,
-911,15,912,4,36,
+188,1,3,1,3,
+1,2,927,22,1,
+38,1,2459,928,17,
+929,15,930,4,36,
 37,0,67,0,111,
 0,109,0,112,0,
 111,0,117,0,110,
@@ -3935,7 +4056,7 @@ public yyLSLSyntax
 0,101,0,109,0,
 101,0,110,0,116,
 0,1,-1,1,5,
-913,20,914,4,38,
+931,20,932,4,38,
 67,0,111,0,109,
 0,112,0,111,0,
 117,0,110,0,100,
@@ -3943,35 +4064,35 @@ public yyLSLSyntax
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,50,0,1,177,
+0,50,0,1,186,
 1,3,1,4,1,
-3,915,22,1,31,
-1,1958,916,16,0,
-641,1,2462,917,17,
-918,15,906,1,-1,
-1,5,919,20,920,
+3,933,22,1,36,
+1,1958,934,16,0,
+652,1,2462,935,17,
+936,15,924,1,-1,
+1,5,937,20,938,
 4,30,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
 76,0,105,0,115,
 0,116,0,95,0,
-49,0,1,178,1,
+49,0,1,187,1,
 3,1,2,1,1,
-921,22,1,32,1,
-1657,922,17,923,15,
-756,1,-1,1,5,
-924,20,925,4,22,
+939,22,1,37,1,
+1657,940,17,941,15,
+773,1,-1,1,5,
+942,20,943,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-50,0,1,182,1,
+50,0,1,191,1,
 3,1,3,1,2,
-926,22,1,36,1,
-2464,927,17,928,15,
-912,1,-1,1,5,
-929,20,930,4,38,
+944,22,1,41,1,
+2464,945,17,946,15,
+930,1,-1,1,5,
+947,20,948,4,38,
 67,0,111,0,109,
 0,112,0,111,0,
 117,0,110,0,100,
@@ -3979,281 +4100,281 @@ public yyLSLSyntax
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,1,176,
+0,49,0,1,185,
 1,3,1,3,1,
-2,931,22,1,30,
-1,199,932,16,0,
-641,1,459,933,16,
-0,641,1,462,934,
-16,0,641,1,217,
-935,16,0,641,1,
-2227,936,17,937,15,
-891,1,-1,1,5,
-938,20,939,4,32,
+2,949,22,1,35,
+1,199,950,16,0,
+652,1,459,951,16,
+0,652,1,462,952,
+16,0,652,1,217,
+953,16,0,652,1,
+2227,954,17,955,15,
+908,1,-1,1,5,
+956,20,957,4,32,
 87,0,104,0,105,
 0,108,0,101,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-50,0,1,203,1,
+50,0,1,212,1,
 3,1,6,1,5,
-940,22,1,57,1,
-1225,941,16,0,641,
-1,1479,942,16,0,
-641,1,1731,943,16,
-0,641,1,1989,944,
-17,945,15,749,1,
--1,1,5,946,20,
-947,4,26,73,0,
+958,22,1,62,1,
+1225,959,16,0,652,
+1,1479,960,16,0,
+652,1,1731,961,16,
+0,652,1,1989,962,
+17,963,15,766,1,
+-1,1,5,964,20,
+965,4,26,73,0,
 102,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
 95,0,49,0,1,
-198,1,3,1,6,
-1,5,948,22,1,
-52,1,1990,949,16,
-0,641,1,236,950,
-16,0,641,1,1756,
-951,16,0,641,1,
-4,952,19,184,1,
-4,953,5,100,1,
-256,954,16,0,561,
-1,1261,955,16,0,
-561,1,509,956,16,
-0,561,1,1515,957,
-16,0,561,1,2686,
-958,16,0,561,1,
-2021,747,1,1775,959,
-16,0,561,1,2029,
-754,1,2030,760,1,
-2031,765,1,2032,770,
-1,2033,775,1,277,
-960,16,0,561,1,
-2035,781,1,2037,786,
-1,2039,791,1,32,
-961,16,0,561,1,
-2041,797,1,2293,962,
-16,0,561,1,2043,
-803,1,2045,808,1,
-40,963,16,0,186,
-1,41,964,16,0,
-561,1,1297,965,16,
-0,561,1,43,966,
-16,0,561,1,44,
-967,16,0,186,1,
-1803,816,1,1804,968,
-16,0,561,1,299,
-969,16,0,561,1,
-47,970,16,0,182,
-1,52,971,16,0,
-561,1,2318,972,16,
-0,561,1,63,973,
-16,0,202,1,66,
-974,16,0,200,1,
-2075,975,16,0,561,
-1,1574,828,1,71,
-976,16,0,561,1,
-76,977,16,0,561,
-1,1834,978,16,0,
-561,1,2337,979,16,
-0,561,1,79,980,
-16,0,561,1,1335,
-981,16,0,561,1,
-322,982,16,0,561,
-1,85,983,16,0,
-561,1,89,984,16,
-0,561,1,346,985,
-16,0,561,1,97,
-986,16,0,561,1,
-2106,987,16,0,561,
-1,102,988,16,0,
-561,1,1860,850,1,
-2364,856,1,1114,989,
-16,0,182,1,112,
-990,16,0,561,1,
-1117,991,16,0,561,
-1,1873,864,1,1876,
-992,16,0,561,1,
-124,993,16,0,561,
-1,2136,871,1,381,
-994,16,0,561,1,
-525,995,16,0,561,
-1,137,996,16,0,
-561,1,1901,997,16,
-0,561,1,1153,998,
-16,0,561,1,151,
-999,16,0,561,1,
-1407,1000,16,0,561,
-1,1659,1001,16,0,
-561,1,2413,1002,16,
-0,561,1,406,1003,
-16,0,561,1,1371,
-1004,16,0,561,1,
-2105,843,1,166,1005,
-16,0,561,1,1622,
-1006,16,0,561,1,
-1931,889,1,1933,1007,
-16,0,561,1,431,
-1008,16,0,561,1,
-1585,1009,16,0,561,
-1,182,1010,16,0,
-561,1,1189,1011,16,
-0,561,1,1443,1012,
-16,0,561,1,1695,
-1013,16,0,561,1,
-2198,1014,16,0,561,
-1,447,1015,16,0,
-561,1,2458,904,1,
-2459,910,1,1958,1016,
-16,0,561,1,2462,
-917,1,1657,922,1,
-2464,927,1,199,1017,
-16,0,561,1,459,
-1018,16,0,561,1,
-462,1019,16,0,561,
-1,217,1020,16,0,
-561,1,2227,936,1,
-1225,1021,16,0,561,
-1,1479,1022,16,0,
-561,1,1731,1023,16,
-0,561,1,1989,944,
-1,1990,1024,16,0,
-561,1,236,1025,16,
-0,561,1,1756,1026,
-16,0,561,1,5,
-1027,19,181,1,5,
-1028,5,100,1,256,
-1029,16,0,557,1,
-1261,1030,16,0,557,
-1,509,1031,16,0,
-557,1,1515,1032,16,
-0,557,1,2686,1033,
-16,0,557,1,2021,
-747,1,1775,1034,16,
-0,557,1,2029,754,
-1,2030,760,1,2031,
-765,1,2032,770,1,
-2033,775,1,277,1035,
-16,0,557,1,2035,
-781,1,2037,786,1,
-2039,791,1,32,1036,
-16,0,557,1,2041,
-797,1,2293,1037,16,
-0,557,1,2043,803,
-1,2045,808,1,40,
-1038,16,0,185,1,
-41,1039,16,0,557,
-1,1297,1040,16,0,
-557,1,43,1041,16,
-0,557,1,44,1042,
-16,0,185,1,1803,
-816,1,1804,1043,16,
-0,557,1,299,1044,
-16,0,557,1,47,
-1045,16,0,179,1,
-52,1046,16,0,557,
-1,2318,1047,16,0,
-557,1,63,1048,16,
-0,201,1,66,1049,
+207,1,3,1,6,
+1,5,966,22,1,
+57,1,1990,967,16,
+0,652,1,236,968,
+16,0,652,1,1756,
+969,16,0,652,1,
+4,970,19,184,1,
+4,971,5,100,1,
+256,972,16,0,576,
+1,1261,973,16,0,
+576,1,509,974,16,
+0,576,1,1515,975,
+16,0,576,1,2021,
+764,1,1775,976,16,
+0,576,1,2029,771,
+1,2030,777,1,2031,
+782,1,2032,787,1,
+2033,792,1,277,977,
+16,0,576,1,2035,
+798,1,2037,803,1,
+2039,808,1,32,978,
+16,0,576,1,2041,
+814,1,2293,979,16,
+0,576,1,2043,820,
+1,2045,825,1,40,
+980,16,0,186,1,
+41,981,16,0,576,
+1,1297,982,16,0,
+576,1,43,983,16,
+0,576,1,44,984,
+16,0,186,1,1803,
+833,1,1804,985,16,
+0,576,1,299,986,
+16,0,576,1,47,
+987,16,0,182,1,
+52,988,16,0,576,
+1,2318,989,16,0,
+576,1,63,990,16,
+0,201,1,66,991,
 16,0,199,1,2075,
-1050,16,0,557,1,
-1574,828,1,71,1051,
-16,0,557,1,76,
-1052,16,0,557,1,
-1834,1053,16,0,557,
-1,2337,1054,16,0,
-557,1,79,1055,16,
-0,557,1,1335,1056,
-16,0,557,1,322,
-1057,16,0,557,1,
-85,1058,16,0,557,
-1,89,1059,16,0,
-557,1,346,1060,16,
-0,557,1,97,1061,
-16,0,557,1,2106,
-1062,16,0,557,1,
-102,1063,16,0,557,
-1,1860,850,1,2364,
-856,1,1114,1064,16,
-0,179,1,112,1065,
-16,0,557,1,1117,
-1066,16,0,557,1,
-1873,864,1,1876,1067,
-16,0,557,1,124,
-1068,16,0,557,1,
-2136,871,1,381,1069,
-16,0,557,1,525,
-1070,16,0,557,1,
-137,1071,16,0,557,
-1,1901,1072,16,0,
-557,1,1153,1073,16,
-0,557,1,151,1074,
-16,0,557,1,1407,
-1075,16,0,557,1,
-1659,1076,16,0,557,
-1,2413,1077,16,0,
-557,1,406,1078,16,
-0,557,1,1371,1079,
-16,0,557,1,2105,
-843,1,166,1080,16,
-0,557,1,1622,1081,
-16,0,557,1,1931,
-889,1,1933,1082,16,
-0,557,1,431,1083,
-16,0,557,1,1585,
-1084,16,0,557,1,
-182,1085,16,0,557,
-1,1189,1086,16,0,
-557,1,1443,1087,16,
-0,557,1,1695,1088,
-16,0,557,1,2198,
-1089,16,0,557,1,
-447,1090,16,0,557,
-1,2458,904,1,2459,
-910,1,1958,1091,16,
-0,557,1,2462,917,
-1,1657,922,1,2464,
-927,1,199,1092,16,
-0,557,1,459,1093,
-16,0,557,1,462,
-1094,16,0,557,1,
-217,1095,16,0,557,
-1,2227,936,1,1225,
-1096,16,0,557,1,
-1479,1097,16,0,557,
-1,1731,1098,16,0,
-557,1,1989,944,1,
-1990,1099,16,0,557,
-1,236,1100,16,0,
-557,1,1756,1101,16,
-0,557,1,6,1102,
-19,277,1,6,1103,
-5,2,1,1114,1104,
-16,0,275,1,40,
-1105,16,0,546,1,
-7,1106,19,241,1,
-7,1107,5,2,1,
-1114,1108,16,0,239,
-1,40,1109,16,0,
-484,1,8,1110,19,
-208,1,8,1111,5,
-2,1,1114,1112,16,
-0,206,1,40,1113,
-16,0,461,1,9,
-1114,19,214,1,9,
-1115,5,2,1,1114,
-1116,16,0,212,1,
-40,1117,16,0,393,
-1,10,1118,19,164,
-1,10,1119,5,2,
-1,1114,1120,16,0,
-162,1,40,1121,16,
-0,333,1,11,1122,
-19,193,1,11,1123,
-5,146,1,1260,1124,
-17,1125,15,1126,4,
+992,16,0,576,1,
+1574,845,1,71,993,
+16,0,576,1,76,
+994,16,0,576,1,
+1834,995,16,0,576,
+1,2337,996,16,0,
+576,1,79,997,16,
+0,576,1,1335,998,
+16,0,576,1,322,
+999,16,0,576,1,
+85,1000,16,0,576,
+1,89,1001,16,0,
+576,1,346,1002,16,
+0,576,1,97,1003,
+16,0,576,1,2106,
+1004,16,0,576,1,
+102,1005,16,0,576,
+1,1860,867,1,2364,
+873,1,1114,1006,16,
+0,182,1,112,1007,
+16,0,576,1,1117,
+1008,16,0,576,1,
+1873,881,1,1876,1009,
+16,0,576,1,124,
+1010,16,0,576,1,
+2136,888,1,381,1011,
+16,0,576,1,525,
+1012,16,0,576,1,
+137,1013,16,0,576,
+1,1901,1014,16,0,
+576,1,1153,1015,16,
+0,576,1,151,1016,
+16,0,576,1,1407,
+1017,16,0,576,1,
+1659,1018,16,0,576,
+1,2413,1019,16,0,
+576,1,406,1020,16,
+0,576,1,1371,1021,
+16,0,576,1,2105,
+860,1,166,1022,16,
+0,576,1,1622,1023,
+16,0,576,1,1931,
+906,1,1933,1024,16,
+0,576,1,431,1025,
+16,0,576,1,1585,
+1026,16,0,576,1,
+182,1027,16,0,576,
+1,1189,1028,16,0,
+576,1,1443,1029,16,
+0,576,1,1695,1030,
+16,0,576,1,2198,
+1031,16,0,576,1,
+2702,1032,16,0,576,
+1,447,1033,16,0,
+576,1,2458,922,1,
+2459,928,1,1958,1034,
+16,0,576,1,2462,
+935,1,1657,940,1,
+2464,945,1,199,1035,
+16,0,576,1,459,
+1036,16,0,576,1,
+462,1037,16,0,576,
+1,217,1038,16,0,
+576,1,2227,954,1,
+1225,1039,16,0,576,
+1,1479,1040,16,0,
+576,1,1731,1041,16,
+0,576,1,1989,962,
+1,1990,1042,16,0,
+576,1,236,1043,16,
+0,576,1,1756,1044,
+16,0,576,1,5,
+1045,19,181,1,5,
+1046,5,100,1,256,
+1047,16,0,572,1,
+1261,1048,16,0,572,
+1,509,1049,16,0,
+572,1,1515,1050,16,
+0,572,1,2021,764,
+1,1775,1051,16,0,
+572,1,2029,771,1,
+2030,777,1,2031,782,
+1,2032,787,1,2033,
+792,1,277,1052,16,
+0,572,1,2035,798,
+1,2037,803,1,2039,
+808,1,32,1053,16,
+0,572,1,2041,814,
+1,2293,1054,16,0,
+572,1,2043,820,1,
+2045,825,1,40,1055,
+16,0,185,1,41,
+1056,16,0,572,1,
+1297,1057,16,0,572,
+1,43,1058,16,0,
+572,1,44,1059,16,
+0,185,1,1803,833,
+1,1804,1060,16,0,
+572,1,299,1061,16,
+0,572,1,47,1062,
+16,0,179,1,52,
+1063,16,0,572,1,
+2318,1064,16,0,572,
+1,63,1065,16,0,
+200,1,66,1066,16,
+0,198,1,2075,1067,
+16,0,572,1,1574,
+845,1,71,1068,16,
+0,572,1,76,1069,
+16,0,572,1,1834,
+1070,16,0,572,1,
+2337,1071,16,0,572,
+1,79,1072,16,0,
+572,1,1335,1073,16,
+0,572,1,322,1074,
+16,0,572,1,85,
+1075,16,0,572,1,
+89,1076,16,0,572,
+1,346,1077,16,0,
+572,1,97,1078,16,
+0,572,1,2106,1079,
+16,0,572,1,102,
+1080,16,0,572,1,
+1860,867,1,2364,873,
+1,1114,1081,16,0,
+179,1,112,1082,16,
+0,572,1,1117,1083,
+16,0,572,1,1873,
+881,1,1876,1084,16,
+0,572,1,124,1085,
+16,0,572,1,2136,
+888,1,381,1086,16,
+0,572,1,525,1087,
+16,0,572,1,137,
+1088,16,0,572,1,
+1901,1089,16,0,572,
+1,1153,1090,16,0,
+572,1,151,1091,16,
+0,572,1,1407,1092,
+16,0,572,1,1659,
+1093,16,0,572,1,
+2413,1094,16,0,572,
+1,406,1095,16,0,
+572,1,1371,1096,16,
+0,572,1,2105,860,
+1,166,1097,16,0,
+572,1,1622,1098,16,
+0,572,1,1931,906,
+1,1933,1099,16,0,
+572,1,431,1100,16,
+0,572,1,1585,1101,
+16,0,572,1,182,
+1102,16,0,572,1,
+1189,1103,16,0,572,
+1,1443,1104,16,0,
+572,1,1695,1105,16,
+0,572,1,2198,1106,
+16,0,572,1,2702,
+1107,16,0,572,1,
+447,1108,16,0,572,
+1,2458,922,1,2459,
+928,1,1958,1109,16,
+0,572,1,2462,935,
+1,1657,940,1,2464,
+945,1,199,1110,16,
+0,572,1,459,1111,
+16,0,572,1,462,
+1112,16,0,572,1,
+217,1113,16,0,572,
+1,2227,954,1,1225,
+1114,16,0,572,1,
+1479,1115,16,0,572,
+1,1731,1116,16,0,
+572,1,1989,962,1,
+1990,1117,16,0,572,
+1,236,1118,16,0,
+572,1,1756,1119,16,
+0,572,1,6,1120,
+19,279,1,6,1121,
+5,2,1,1114,1122,
+16,0,277,1,40,
+1123,16,0,561,1,
+7,1124,19,244,1,
+7,1125,5,2,1,
+1114,1126,16,0,242,
+1,40,1127,16,0,
+505,1,8,1128,19,
+207,1,8,1129,5,
+2,1,1114,1130,16,
+0,205,1,40,1131,
+16,0,471,1,9,
+1132,19,213,1,9,
+1133,5,2,1,1114,
+1134,16,0,211,1,
+40,1135,16,0,398,
+1,10,1136,19,164,
+1,10,1137,5,2,
+1,1114,1138,16,0,
+162,1,40,1139,16,
+0,340,1,11,1140,
+19,192,1,11,1141,
+5,146,1,1260,1142,
+17,1143,15,1144,4,
 34,37,0,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
@@ -4261,8 +4382,8 @@ public yyLSLSyntax
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-1,-1,1,5,1127,
-20,1128,4,38,83,
+1,-1,1,5,1145,
+20,1146,4,38,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
@@ -4270,11 +4391,11 @@ public yyLSLSyntax
 0,110,0,109,0,
 101,0,110,0,116,
 0,95,0,50,0,
-49,0,1,234,1,
+49,0,1,243,1,
 3,1,6,1,5,
-1129,22,1,88,1,
-1011,1130,17,1131,15,
-1132,4,44,37,0,
+1147,22,1,93,1,
+1011,1148,17,1149,15,
+1150,4,44,37,0,
 80,0,97,0,114,
 0,101,0,110,0,
 116,0,104,0,101,
@@ -4284,7 +4405,7 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,1,-1,1,
-5,1133,20,1134,4,
+5,1151,20,1152,4,
 46,80,0,97,0,
 114,0,101,0,110,
 0,116,0,104,0,
@@ -4294,12 +4415,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-50,0,1,281,1,
+50,0,1,290,1,
 3,1,4,1,3,
-1135,22,1,135,1,
-1514,1136,17,1137,15,
-1126,1,-1,1,5,
-1138,20,1139,4,38,
+1153,22,1,140,1,
+1514,1154,17,1155,15,
+1144,1,-1,1,5,
+1156,20,1157,4,38,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
@@ -4307,27 +4428,27 @@ public yyLSLSyntax
 103,0,110,0,109,
 0,101,0,110,0,
 116,0,95,0,49,
-0,52,0,1,227,
+0,52,0,1,236,
 1,3,1,4,1,
-3,1140,22,1,81,
-1,9,1141,17,1142,
-15,1143,4,24,37,
+3,1158,22,1,86,
+1,9,1159,17,1160,
+15,1161,4,24,37,
 0,68,0,101,0,
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
 0,110,0,1,-1,
-1,5,1144,20,1145,
+1,5,1162,20,1163,
 4,26,68,0,101,
 0,99,0,108,0,
 97,0,114,0,97,
 0,116,0,105,0,
 111,0,110,0,95,
-0,49,0,1,175,
+0,49,0,1,182,
 1,3,1,3,1,
-2,1146,22,1,29,
-1,262,1147,17,1148,
-15,1149,4,34,37,
+2,1164,22,1,32,
+1,262,1165,17,1166,
+15,1167,4,34,37,
 0,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
@@ -4335,7 +4456,7 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,1,-1,
-1,5,1150,20,1151,
+1,5,1168,20,1169,
 4,36,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
@@ -4343,12 +4464,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,53,0,1,263,
+0,53,0,1,272,
 1,3,1,4,1,
-3,1152,22,1,117,
-1,1267,1153,17,1154,
-15,1126,1,-1,1,
-5,1155,20,1156,4,
+3,1170,22,1,122,
+1,1267,1171,17,1172,
+15,1144,1,-1,1,
+5,1173,20,1174,4,
 36,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
@@ -4356,13 +4477,13 @@ public yyLSLSyntax
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-56,0,1,221,1,
+56,0,1,230,1,
 3,1,6,1,5,
-1157,22,1,75,1,
-2021,747,1,1521,1158,
-17,1159,15,1126,1,
--1,1,5,1160,20,
-1161,4,36,83,0,
+1175,22,1,80,1,
+2021,764,1,1521,1176,
+17,1177,15,1144,1,
+-1,1,5,1178,20,
+1179,4,36,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
@@ -4370,61 +4491,61 @@ public yyLSLSyntax
 110,0,109,0,101,
 0,110,0,116,0,
 95,0,49,0,1,
-214,1,3,1,4,
-1,3,1162,22,1,
-68,1,2024,1163,17,
-1164,15,1165,4,24,
+223,1,3,1,4,
+1,3,1180,22,1,
+73,1,2024,1181,17,
+1182,15,1183,4,24,
 37,0,83,0,116,
 0,97,0,116,0,
 101,0,67,0,104,
 0,97,0,110,0,
 103,0,101,0,1,
--1,1,5,1166,20,
-1167,4,26,83,0,
+-1,1,5,1184,20,
+1185,4,26,83,0,
 116,0,97,0,116,
 0,101,0,67,0,
 104,0,97,0,110,
 0,103,0,101,0,
 95,0,49,0,1,
-196,1,3,1,3,
-1,2,1168,22,1,
-50,1,1775,1169,17,
-1170,15,1171,4,30,
+205,1,3,1,3,
+1,2,1186,22,1,
+55,1,1775,1187,17,
+1188,15,1189,4,30,
 37,0,69,0,109,
 0,112,0,116,0,
 121,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,-1,1,5,1172,
-20,1173,4,32,69,
+1,-1,1,5,1190,
+20,1191,4,32,69,
 0,109,0,112,0,
 116,0,121,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,95,0,49,
-0,1,180,1,3,
-1,1,1,0,1174,
-22,1,34,1,19,
-1175,17,1142,1,2,
-1146,1,2028,1176,17,
-1177,15,1178,4,20,
+0,1,189,1,3,
+1,1,1,0,1192,
+22,1,39,1,19,
+1193,17,1160,1,2,
+1164,1,2028,1194,17,
+1195,15,1196,4,20,
 37,0,74,0,117,
 0,109,0,112,0,
 76,0,97,0,98,
 0,101,0,108,0,
-1,-1,1,5,1179,
-20,1180,4,22,74,
+1,-1,1,5,1197,
+20,1198,4,22,74,
 0,117,0,109,0,
 112,0,76,0,97,
 0,98,0,101,0,
 108,0,95,0,49,
-0,1,194,1,3,
-1,3,1,2,1181,
-22,1,48,1,2029,
-754,1,2281,1182,17,
-1183,15,1184,4,34,
+0,1,203,1,3,
+1,3,1,2,1199,
+22,1,53,1,2029,
+771,1,2281,1200,17,
+1201,15,1202,4,34,
 37,0,70,0,111,
 0,114,0,76,0,
 111,0,111,0,112,
@@ -4432,8 +4553,8 @@ public yyLSLSyntax
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,1,
--1,1,5,1185,20,
-1186,4,36,70,0,
+-1,1,5,1203,20,
+1204,4,36,70,0,
 111,0,114,0,76,
 0,111,0,111,0,
 112,0,83,0,116,
@@ -4441,26 +4562,26 @@ public yyLSLSyntax
 101,0,109,0,101,
 0,110,0,116,0,
 95,0,50,0,1,
-209,1,3,1,2,
-1,1,1187,22,1,
-63,1,2031,765,1,
-2032,770,1,2033,775,
-1,2034,1188,16,0,
-594,1,2035,781,1,
-2036,1189,16,0,547,
-1,2037,786,1,2038,
-1190,16,0,551,1,
-2039,791,1,32,1191,
-17,1170,1,0,1174,
-1,2041,797,1,2042,
-1192,16,0,666,1,
-2043,803,1,2044,1193,
-16,0,608,1,2045,
-808,1,2299,1194,16,
-0,227,1,1296,1195,
-17,1196,15,1126,1,
--1,1,5,1197,20,
-1198,4,38,83,0,
+218,1,3,1,2,
+1,1,1205,22,1,
+68,1,2031,782,1,
+2032,787,1,2033,792,
+1,2034,1206,16,0,
+603,1,2035,798,1,
+2036,1207,16,0,562,
+1,2037,803,1,2038,
+1208,16,0,566,1,
+2039,808,1,32,1209,
+17,1188,1,0,1192,
+1,2041,814,1,2042,
+1210,16,0,674,1,
+2043,820,1,2044,1211,
+16,0,615,1,2045,
+825,1,2299,1212,16,
+0,229,1,1296,1213,
+17,1214,15,1144,1,
+-1,1,5,1215,20,
+1216,4,38,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
@@ -4468,12 +4589,12 @@ public yyLSLSyntax
 110,0,109,0,101,
 0,110,0,116,0,
 95,0,50,0,48,
-0,1,233,1,3,
-1,6,1,5,1199,
-22,1,87,1,283,
-1200,17,1201,15,1149,
-1,-1,1,5,1202,
-20,1203,4,36,66,
+0,1,242,1,3,
+1,6,1,5,1217,
+22,1,92,1,283,
+1218,17,1219,15,1167,
+1,-1,1,5,1220,
+20,1221,4,36,66,
 0,105,0,110,0,
 97,0,114,0,121,
 0,69,0,120,0,
@@ -4481,10 +4602,10 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,52,0,
-1,262,1,3,1,
-4,1,3,1204,22,
-1,116,1,40,1205,
-17,1206,15,1207,4,
+1,271,1,3,1,
+4,1,3,1222,22,
+1,121,1,40,1223,
+17,1224,15,1225,4,
 32,37,0,73,0,
 100,0,101,0,110,
 0,116,0,69,0,
@@ -4492,7 +4613,7 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,1,-1,
-1,5,1208,20,1209,
+1,5,1226,20,1227,
 4,34,73,0,100,
 0,101,0,110,0,
 116,0,69,0,120,
@@ -4500,13 +4621,13 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,49,
-0,1,248,1,3,
-1,2,1,1,1210,
-22,1,102,1,44,
-1211,17,1206,1,1,
-1210,1,1803,816,1,
-47,1212,17,1213,15,
-1214,4,38,37,0,
+0,1,257,1,3,
+1,2,1,1,1228,
+22,1,107,1,44,
+1229,17,1224,1,1,
+1228,1,1803,833,1,
+47,1230,17,1231,15,
+1232,4,38,37,0,
 73,0,100,0,101,
 0,110,0,116,0,
 68,0,111,0,116,
@@ -4515,7 +4636,7 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,1,-1,1,5,
-1215,20,1216,4,40,
+1233,20,1234,4,40,
 73,0,100,0,101,
 0,110,0,116,0,
 68,0,111,0,116,
@@ -4524,10 +4645,10 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,49,0,
-1,249,1,3,1,
-4,1,3,1217,22,
-1,103,1,48,1218,
-17,1219,15,1220,4,
+1,258,1,3,1,
+4,1,3,1235,22,
+1,108,1,48,1236,
+17,1237,15,1238,4,
 58,37,0,73,0,
 110,0,99,0,114,
 0,101,0,109,0,
@@ -4540,8 +4661,8 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,1,
--1,1,5,1221,20,
-1222,4,60,73,0,
+-1,1,5,1239,20,
+1240,4,60,73,0,
 110,0,99,0,114,
 0,101,0,109,0,
 101,0,110,0,116,
@@ -4553,12 +4674,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,52,0,1,253,
+0,52,0,1,262,
 1,3,1,5,1,
-4,1223,22,1,107,
-1,49,1224,17,1225,
-15,1220,1,-1,1,
-5,1226,20,1227,4,
+4,1241,22,1,112,
+1,49,1242,17,1243,
+15,1238,1,-1,1,
+5,1244,20,1245,4,
 60,73,0,110,0,
 99,0,114,0,101,
 0,109,0,101,0,
@@ -4571,12 +4692,12 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,51,
-0,1,252,1,3,
-1,5,1,4,1228,
-22,1,106,1,50,
-1229,17,1230,15,1220,
-1,-1,1,5,1231,
-20,1232,4,60,73,
+0,1,261,1,3,
+1,5,1,4,1246,
+22,1,111,1,50,
+1247,17,1248,15,1238,
+1,-1,1,5,1249,
+20,1250,4,60,73,
 0,110,0,99,0,
 114,0,101,0,109,
 0,101,0,110,0,
@@ -4589,11 +4710,11 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,50,0,1,
-251,1,3,1,3,
-1,2,1233,22,1,
-105,1,51,1234,17,
-1235,15,1220,1,-1,
-1,5,1236,20,1237,
+260,1,3,1,3,
+1,2,1251,22,1,
+110,1,51,1252,17,
+1253,15,1238,1,-1,
+1,5,1254,20,1255,
 4,60,73,0,110,
 0,99,0,114,0,
 101,0,109,0,101,
@@ -4606,12 +4727,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,1,250,1,
+49,0,1,259,1,
 3,1,3,1,2,
-1238,22,1,104,1,
-305,1239,17,1240,15,
-1149,1,-1,1,5,
-1241,20,1242,4,36,
+1256,22,1,109,1,
+305,1257,17,1258,15,
+1167,1,-1,1,5,
+1259,20,1260,4,36,
 66,0,105,0,110,
 0,97,0,114,0,
 121,0,69,0,120,
@@ -4619,10 +4740,10 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,51,
-0,1,261,1,3,
-1,4,1,3,1243,
-22,1,115,1,525,
-1244,17,1245,15,1246,
+0,1,270,1,3,
+1,4,1,3,1261,
+22,1,120,1,525,
+1262,17,1263,15,1264,
 4,34,37,0,82,
 0,111,0,116,0,
 97,0,116,0,105,
@@ -4631,7 +4752,7 @@ public yyLSLSyntax
 0,115,0,116,0,
 97,0,110,0,116,
 0,1,-1,1,5,
-1247,20,1248,4,36,
+1265,20,1266,4,36,
 82,0,111,0,116,
 0,97,0,116,0,
 105,0,111,0,110,
@@ -4639,10 +4760,10 @@ public yyLSLSyntax
 110,0,115,0,116,
 0,97,0,110,0,
 116,0,95,0,49,
-0,1,246,1,3,
-1,10,1,9,1249,
-22,1,100,1,63,
-1250,17,1251,15,1252,
+0,1,255,1,3,
+1,10,1,9,1267,
+22,1,105,1,63,
+1268,17,1269,15,1270,
 4,38,37,0,84,
 0,121,0,112,0,
 101,0,99,0,97,
@@ -4651,8 +4772,8 @@ public yyLSLSyntax
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-1,-1,1,5,1253,
-20,1254,4,40,84,
+1,-1,1,5,1271,
+20,1272,4,40,84,
 0,121,0,112,0,
 101,0,99,0,97,
 0,115,0,116,0,
@@ -4661,11 +4782,11 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,50,0,1,
-283,1,3,1,5,
-1,4,1255,22,1,
-137,1,66,1256,17,
-1257,15,1252,1,-1,
-1,5,1258,20,1259,
+292,1,3,1,5,
+1,4,1273,22,1,
+142,1,66,1274,17,
+1275,15,1270,1,-1,
+1,5,1276,20,1277,
 4,40,84,0,121,
 0,112,0,101,0,
 99,0,97,0,115,
@@ -4674,12 +4795,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-51,0,1,284,1,
+51,0,1,293,1,
 3,1,7,1,6,
-1260,22,1,138,1,
-67,1261,17,1262,15,
-1252,1,-1,1,5,
-1263,20,1264,4,40,
+1278,22,1,143,1,
+67,1279,17,1280,15,
+1270,1,-1,1,5,
+1281,20,1282,4,40,
 84,0,121,0,112,
 0,101,0,99,0,
 97,0,115,0,116,
@@ -4688,12 +4809,12 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,55,0,
-1,288,1,3,1,
-8,1,7,1265,22,
-1,142,1,68,1266,
-17,1267,15,1252,1,
--1,1,5,1268,20,
-1269,4,40,84,0,
+1,297,1,3,1,
+8,1,7,1283,22,
+1,147,1,68,1284,
+17,1285,15,1270,1,
+-1,1,5,1286,20,
+1287,4,40,84,0,
 121,0,112,0,101,
 0,99,0,97,0,
 115,0,116,0,69,
@@ -4701,12 +4822,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,53,0,1,286,
+0,53,0,1,295,
 1,3,1,8,1,
-7,1270,22,1,140,
-1,69,1271,17,1272,
-15,1252,1,-1,1,
-5,1273,20,1274,4,
+7,1288,22,1,145,
+1,69,1289,17,1290,
+15,1270,1,-1,1,
+5,1291,20,1292,4,
 40,84,0,121,0,
 112,0,101,0,99,
 0,97,0,115,0,
@@ -4715,12 +4836,12 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,54,
-0,1,287,1,3,
-1,6,1,5,1275,
-22,1,141,1,70,
-1276,17,1277,15,1252,
-1,-1,1,5,1278,
-20,1279,4,40,84,
+0,1,296,1,3,
+1,6,1,5,1293,
+22,1,146,1,70,
+1294,17,1295,15,1270,
+1,-1,1,5,1296,
+20,1297,4,40,84,
 0,121,0,112,0,
 101,0,99,0,97,
 0,115,0,116,0,
@@ -4729,11 +4850,11 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,52,0,1,
-285,1,3,1,6,
-1,5,1280,22,1,
-139,1,74,1281,17,
-1282,15,1252,1,-1,
-1,5,1283,20,1284,
+294,1,3,1,6,
+1,5,1298,22,1,
+144,1,74,1299,17,
+1300,15,1270,1,-1,
+1,5,1301,20,1302,
 4,40,84,0,121,
 0,112,0,101,0,
 99,0,97,0,115,
@@ -4742,12 +4863,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-57,0,1,290,1,
+57,0,1,299,1,
 3,1,7,1,6,
-1285,22,1,144,1,
-1013,1286,17,1287,15,
-1132,1,-1,1,5,
-1288,20,1289,4,46,
+1303,22,1,149,1,
+1013,1304,17,1305,15,
+1150,1,-1,1,5,
+1306,20,1307,4,46,
 80,0,97,0,114,
 0,101,0,110,0,
 116,0,104,0,101,
@@ -4757,12 +4878,12 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,49,
-0,1,280,1,3,
-1,4,1,3,1290,
-22,1,134,1,1332,
-1291,17,1292,15,1126,
-1,-1,1,5,1293,
-20,1294,4,38,83,
+0,1,289,1,3,
+1,4,1,3,1308,
+22,1,139,1,1332,
+1309,17,1310,15,1144,
+1,-1,1,5,1311,
+20,1312,4,38,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
@@ -4770,12 +4891,12 @@ public yyLSLSyntax
 0,110,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-57,0,1,232,1,
+57,0,1,241,1,
 3,1,6,1,5,
-1295,22,1,86,1,
-2337,1296,17,1170,1,
-0,1174,1,1585,1297,
-17,1298,15,1299,4,
+1313,22,1,91,1,
+2337,1314,17,1188,1,
+0,1192,1,1585,1315,
+17,1316,15,1317,4,
 32,37,0,82,0,
 101,0,116,0,117,
 0,114,0,110,0,
@@ -4783,7 +4904,7 @@ public yyLSLSyntax
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,1,-1,
-1,5,1300,20,1301,
+1,5,1318,20,1319,
 4,34,82,0,101,
 0,116,0,117,0,
 114,0,110,0,83,
@@ -4791,22 +4912,22 @@ public yyLSLSyntax
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,95,0,50,
-0,1,239,1,3,
-1,2,1,1,1302,
-22,1,93,1,2023,
-1303,17,1304,15,1165,
-1,-1,1,5,1305,
-20,1306,4,26,83,
+0,1,248,1,3,
+1,2,1,1,1320,
+22,1,98,1,2023,
+1321,17,1322,15,1183,
+1,-1,1,5,1323,
+20,1324,4,26,83,
 0,116,0,97,0,
 116,0,101,0,67,
 0,104,0,97,0,
 110,0,103,0,101,
 0,95,0,50,0,
-1,197,1,3,1,
-3,1,2,1307,22,
-1,51,1,2136,871,
-1,82,1308,17,1309,
-15,1310,4,32,37,
+1,206,1,3,1,
+3,1,2,1325,22,
+1,56,1,2136,888,
+1,82,1326,17,1327,
+15,1328,4,32,37,
 0,85,0,110,0,
 97,0,114,0,121,
 0,69,0,120,0,
@@ -4814,7 +4935,7 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,1,-1,1,5,
-1311,20,1312,4,34,
+1329,20,1330,4,34,
 85,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
@@ -4822,29 +4943,29 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,51,0,1,
-279,1,3,1,3,
-1,2,1313,22,1,
-133,1,2026,1314,17,
-1315,15,1316,4,28,
+288,1,3,1,3,
+1,2,1331,22,1,
+138,1,2026,1332,17,
+1333,15,1334,4,28,
 37,0,74,0,117,
 0,109,0,112,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,1,-1,
-1,5,1317,20,1318,
+1,5,1335,20,1336,
 4,30,74,0,117,
 0,109,0,112,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,1,195,1,
+49,0,1,204,1,
 3,1,3,1,2,
-1319,22,1,49,1,
-1591,1320,17,1321,15,
-1299,1,-1,1,5,
-1322,20,1323,4,34,
+1337,22,1,54,1,
+1591,1338,17,1339,15,
+1317,1,-1,1,5,
+1340,20,1341,4,34,
 82,0,101,0,116,
 0,117,0,114,0,
 110,0,83,0,116,
@@ -4852,11 +4973,11 @@ public yyLSLSyntax
 101,0,109,0,101,
 0,110,0,116,0,
 95,0,49,0,1,
-238,1,3,1,3,
-1,2,1324,22,1,
-92,1,1341,1325,17,
-1326,15,1126,1,-1,
-1,5,1327,20,1328,
+247,1,3,1,3,
+1,2,1342,22,1,
+97,1,1341,1343,17,
+1344,15,1144,1,-1,
+1,5,1345,20,1346,
 4,36,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -4864,13 +4985,13 @@ public yyLSLSyntax
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,54,0,1,219,
+0,54,0,1,228,
 1,3,1,4,1,
-3,1329,22,1,73,
-1,2030,760,1,328,
-1330,17,1331,15,1149,
-1,-1,1,5,1332,
-20,1333,4,36,66,
+3,1347,22,1,78,
+1,2030,777,1,328,
+1348,17,1349,15,1167,
+1,-1,1,5,1350,
+20,1351,4,36,66,
 0,105,0,110,0,
 97,0,114,0,121,
 0,69,0,120,0,
@@ -4878,12 +4999,12 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,50,0,
-1,260,1,3,1,
-4,1,3,1334,22,
-1,114,1,1303,1335,
-17,1336,15,1126,1,
--1,1,5,1337,20,
-1338,4,36,83,0,
+1,269,1,3,1,
+4,1,3,1352,22,
+1,119,1,1303,1353,
+17,1354,15,1144,1,
+-1,1,5,1355,20,
+1356,4,36,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
@@ -4891,28 +5012,28 @@ public yyLSLSyntax
 110,0,109,0,101,
 0,110,0,116,0,
 95,0,55,0,1,
-220,1,3,1,6,
-1,5,1339,22,1,
-74,1,1096,1340,17,
-1341,15,1342,4,26,
+229,1,3,1,6,
+1,5,1357,22,1,
+79,1,1096,1358,17,
+1359,15,1360,4,26,
 37,0,70,0,117,
 0,110,0,99,0,
 116,0,105,0,111,
 0,110,0,67,0,
 97,0,108,0,108,
 0,1,-1,1,5,
-1343,20,1344,4,28,
+1361,20,1362,4,28,
 70,0,117,0,110,
 0,99,0,116,0,
 105,0,111,0,110,
 0,67,0,97,0,
 108,0,108,0,95,
-0,49,0,1,291,
+0,49,0,1,300,
 1,3,1,5,1,
-4,1345,22,1,145,
-1,93,1346,17,1347,
-15,1310,1,-1,1,
-5,1348,20,1349,4,
+4,1363,22,1,150,
+1,93,1364,17,1365,
+15,1328,1,-1,1,
+5,1366,20,1367,4,
 34,85,0,110,0,
 97,0,114,0,121,
 0,69,0,120,0,
@@ -4920,12 +5041,12 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,50,0,
-1,278,1,3,1,
-3,1,2,1350,22,
-1,132,1,1550,1351,
-17,1352,15,1126,1,
--1,1,5,1353,20,
-1354,4,38,83,0,
+1,287,1,3,1,
+3,1,2,1368,22,
+1,137,1,1550,1369,
+17,1370,15,1144,1,
+-1,1,5,1371,20,
+1372,4,38,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
@@ -4933,16 +5054,16 @@ public yyLSLSyntax
 110,0,109,0,101,
 0,110,0,116,0,
 95,0,49,0,51,
-0,1,226,1,3,
-1,4,1,3,1355,
-22,1,80,1,2040,
-1356,16,0,555,1,
-2106,1357,17,1170,1,
-0,1174,1,1555,1358,
-16,0,629,1,827,
-1359,17,1360,15,1149,
-1,-1,1,5,1361,
-20,1362,4,38,66,
+0,1,235,1,3,
+1,4,1,3,1373,
+22,1,85,1,2040,
+1374,16,0,570,1,
+2106,1375,17,1188,1,
+0,1192,1,1555,1376,
+16,0,636,1,827,
+1377,17,1378,15,1167,
+1,-1,1,5,1379,
+20,1380,4,38,66,
 0,105,0,110,0,
 97,0,114,0,121,
 0,69,0,120,0,
@@ -4950,15 +5071,15 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,49,0,
-53,0,1,273,1,
+53,0,1,282,1,
 3,1,4,1,3,
-1363,22,1,127,1,
-1859,1364,16,0,303,
-1,1860,850,1,1804,
-1365,17,1170,1,0,
-1174,1,107,1366,17,
-1367,15,1310,1,-1,
-1,5,1368,20,1369,
+1381,22,1,132,1,
+1859,1382,16,0,314,
+1,1860,867,1,1804,
+1383,17,1188,1,0,
+1192,1,107,1384,17,
+1385,15,1328,1,-1,
+1,5,1386,20,1387,
 4,34,85,0,110,
 0,97,0,114,0,
 121,0,69,0,120,
@@ -4966,27 +5087,15 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,49,
-0,1,277,1,3,
-1,3,1,2,1370,
-22,1,131,1,1114,
-1371,17,1213,1,3,
-1217,1,1048,1372,17,
-1373,15,1149,1,-1,
-1,5,1374,20,1375,
-4,38,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,49,0,56,0,
-1,276,1,3,1,
-4,1,3,1376,22,
-1,130,1,352,1377,
-17,1378,15,1149,1,
--1,1,5,1379,20,
-1380,4,36,66,0,
+0,1,286,1,3,
+1,3,1,2,1388,
+22,1,136,1,1114,
+1389,17,1231,1,3,
+1235,1,2701,1390,16,
+0,255,1,352,1391,
+17,1392,15,1167,1,
+-1,1,5,1393,20,
+1394,4,36,66,0,
 105,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
@@ -4994,13 +5103,13 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,49,0,1,
-259,1,3,1,4,
-1,3,1381,22,1,
-113,1,1872,1382,16,
-0,313,1,1873,864,
-1,118,1383,17,1384,
-15,1149,1,-1,1,
-5,1385,20,1386,4,
+268,1,3,1,4,
+1,3,1395,22,1,
+118,1,1872,1396,16,
+0,324,1,1873,881,
+1,118,1397,17,1398,
+15,1167,1,-1,1,
+5,1399,20,1400,4,
 38,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
@@ -5009,11 +5118,11 @@ public yyLSLSyntax
 115,0,105,0,111,
 0,110,0,95,0,
 49,0,52,0,1,
-272,1,3,1,4,
-1,3,1387,22,1,
-126,1,1123,1388,17,
-1389,15,1126,1,-1,
-1,5,1390,20,1391,
+281,1,3,1,4,
+1,3,1401,22,1,
+131,1,1123,1402,17,
+1403,15,1144,1,-1,
+1,5,1404,20,1405,
 4,38,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -5022,10 +5131,10 @@ public yyLSLSyntax
 0,109,0,101,0,
 110,0,116,0,95,
 0,49,0,50,0,
-1,225,1,3,1,
-6,1,5,1392,22,
-1,79,1,371,1393,
-17,1394,15,1395,4,
+1,234,1,3,1,
+6,1,5,1406,22,
+1,84,1,371,1407,
+17,1408,15,1409,4,
 46,37,0,70,0,
 117,0,110,0,99,
 0,116,0,105,0,
@@ -5036,7 +5145,7 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,1,-1,1,
-5,1396,20,1397,4,
+5,1410,20,1411,4,
 48,70,0,117,0,
 110,0,99,0,116,
 0,105,0,111,0,
@@ -5047,11 +5156,11 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,49,0,1,
-258,1,3,1,2,
-1,1,1398,22,1,
-112,1,1377,1399,17,
-1400,15,1126,1,-1,
-1,5,1401,20,1402,
+267,1,3,1,2,
+1,1,1412,22,1,
+117,1,1377,1413,17,
+1414,15,1144,1,-1,
+1,5,1415,20,1416,
 4,36,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -5059,12 +5168,12 @@ public yyLSLSyntax
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,53,0,1,218,
+0,53,0,1,227,
 1,3,1,4,1,
-3,1403,22,1,72,
-1,375,1404,17,1405,
-15,1220,1,-1,1,
-5,1406,20,1407,4,
+3,1417,22,1,77,
+1,375,1418,17,1419,
+15,1238,1,-1,1,
+5,1420,20,1421,4,
 60,73,0,110,0,
 99,0,114,0,101,
 0,109,0,101,0,
@@ -5077,12 +5186,12 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,56,
-0,1,257,1,3,
-1,5,1,4,1408,
-22,1,111,1,377,
-1409,17,1410,15,1220,
-1,-1,1,5,1411,
-20,1412,4,60,73,
+0,1,266,1,3,
+1,5,1,4,1422,
+22,1,116,1,377,
+1423,17,1424,15,1238,
+1,-1,1,5,1425,
+20,1426,4,60,73,
 0,110,0,99,0,
 114,0,101,0,109,
 0,101,0,110,0,
@@ -5095,11 +5204,11 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,53,0,1,
-254,1,3,1,3,
-1,2,1413,22,1,
-108,1,379,1414,17,
-1415,15,1220,1,-1,
-1,5,1416,20,1417,
+263,1,3,1,3,
+1,2,1427,22,1,
+113,1,379,1428,17,
+1429,15,1238,1,-1,
+1,5,1430,20,1431,
 4,60,73,0,110,
 0,99,0,114,0,
 101,0,109,0,101,
@@ -5112,11 +5221,11 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-55,0,1,256,1,
+55,0,1,265,1,
 3,1,5,1,4,
-1418,22,1,110,1,
-380,1419,17,1420,15,
-1421,4,38,37,0,
+1432,22,1,115,1,
+380,1433,17,1434,15,
+1435,4,38,37,0,
 67,0,111,0,110,
 0,115,0,116,0,
 97,0,110,0,116,
@@ -5125,7 +5234,7 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,1,-1,1,5,
-1422,20,1423,4,40,
+1436,20,1437,4,40,
 67,0,111,0,110,
 0,115,0,116,0,
 97,0,110,0,116,
@@ -5134,12 +5243,12 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,49,0,
-1,247,1,3,1,
-2,1,1,1424,22,
-1,101,1,883,1425,
-17,1426,15,1149,1,
--1,1,5,1427,20,
-1428,4,38,66,0,
+1,256,1,3,1,
+2,1,1,1438,22,
+1,106,1,883,1439,
+17,1440,15,1167,1,
+-1,1,5,1441,20,
+1442,4,38,66,0,
 105,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
@@ -5147,29 +5256,29 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,49,0,54,
-0,1,274,1,3,
-1,4,1,3,1429,
-22,1,128,1,1628,
-1430,17,1431,15,1432,
+0,1,283,1,3,
+1,4,1,3,1443,
+22,1,133,1,1628,
+1444,17,1445,15,1446,
 4,22,37,0,65,
 0,115,0,115,0,
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,1,
--1,1,5,1433,20,
-1434,4,24,65,0,
+-1,1,5,1447,20,
+1448,4,24,65,0,
 115,0,115,0,105,
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,1,212,1,
+49,0,1,221,1,
 3,1,4,1,3,
-1435,22,1,66,1,
-2075,1436,17,1170,1,
-0,1174,1,373,1437,
-17,1438,15,1220,1,
--1,1,5,1439,20,
-1440,4,60,73,0,
+1449,22,1,71,1,
+2075,1450,17,1188,1,
+0,1192,1,373,1451,
+17,1452,15,1238,1,
+-1,1,5,1453,20,
+1454,4,60,73,0,
 110,0,99,0,114,
 0,101,0,109,0,
 101,0,110,0,116,
@@ -5181,12 +5290,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,54,0,1,255,
+0,54,0,1,264,
 1,3,1,3,1,
-2,1441,22,1,109,
-1,130,1442,17,1443,
-15,1149,1,-1,1,
-5,1444,20,1445,4,
+2,1455,22,1,114,
+1,130,1456,17,1457,
+15,1167,1,-1,1,
+5,1458,20,1459,4,
 38,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
@@ -5195,11 +5304,11 @@ public yyLSLSyntax
 115,0,105,0,111,
 0,110,0,95,0,
 49,0,51,0,1,
-271,1,3,1,4,
-1,3,1446,22,1,
-125,1,143,1447,17,
-1448,15,1149,1,-1,
-1,5,1449,20,1450,
+280,1,3,1,4,
+1,3,1460,22,1,
+130,1,143,1461,17,
+1462,15,1167,1,-1,
+1,5,1463,20,1464,
 4,38,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
@@ -5208,42 +5317,26 @@ public yyLSLSyntax
 0,115,0,105,0,
 111,0,110,0,95,
 0,49,0,50,0,
-1,270,1,3,1,
-4,1,3,1451,22,
-1,124,1,1901,1452,
-17,1170,1,0,1174,
-1,1152,1453,17,1454,
-15,1126,1,-1,1,
-5,1455,20,1456,4,
-38,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-50,0,52,0,1,
-237,1,3,1,6,
-1,5,1457,22,1,
-91,1,1406,1458,17,
-1459,15,1126,1,-1,
-1,5,1460,20,1461,
-4,38,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,55,0,
-1,230,1,3,1,
-4,1,3,1462,22,
-1,84,1,1659,1463,
-16,0,269,1,2413,
-1464,17,1170,1,0,
-1174,1,1159,1465,17,
-1466,15,1126,1,-1,
-1,5,1467,20,1468,
+1,279,1,3,1,
+4,1,3,1465,22,
+1,129,1,1901,1466,
+17,1188,1,0,1192,
+1,1048,1467,17,1468,
+15,1167,1,-1,1,
+5,1469,20,1470,4,
+38,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+49,0,56,0,1,
+285,1,3,1,4,
+1,3,1471,22,1,
+135,1,1152,1472,17,
+1473,15,1144,1,-1,
+1,5,1474,20,1475,
 4,38,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -5251,52 +5344,68 @@ public yyLSLSyntax
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,49,0,
-1,224,1,3,1,
-6,1,5,1469,22,
-1,78,1,157,1470,
-17,1471,15,1149,1,
--1,1,5,1472,20,
-1473,4,38,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,49,0,49,
-0,1,269,1,3,
-1,4,1,3,1474,
-22,1,123,1,1413,
-1475,17,1476,15,1126,
-1,-1,1,5,1477,
-20,1478,4,36,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,52,0,
-1,217,1,3,1,
-4,1,3,1479,22,
-1,71,1,1370,1480,
-17,1481,15,1126,1,
--1,1,5,1482,20,
-1483,4,38,83,0,
+0,50,0,52,0,
+1,246,1,3,1,
+6,1,5,1476,22,
+1,96,1,1406,1477,
+17,1478,15,1144,1,
+-1,1,5,1479,20,
+1480,4,38,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,55,
+0,1,239,1,3,
+1,4,1,3,1481,
+22,1,89,1,1659,
+1482,16,0,270,1,
+2413,1483,17,1188,1,
+0,1192,1,1159,1484,
+17,1485,15,1144,1,
+-1,1,5,1486,20,
+1487,4,38,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,49,0,56,
-0,1,231,1,3,
-1,4,1,3,1484,
-22,1,85,1,1478,
-1485,17,1486,15,1126,
-1,-1,1,5,1487,
-20,1488,4,38,83,
+95,0,49,0,49,
+0,1,233,1,3,
+1,6,1,5,1488,
+22,1,83,1,157,
+1489,17,1490,15,1167,
+1,-1,1,5,1491,
+20,1492,4,38,66,
+0,105,0,110,0,
+97,0,114,0,121,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,49,0,
+49,0,1,278,1,
+3,1,4,1,3,
+1493,22,1,128,1,
+1413,1494,17,1495,15,
+1144,1,-1,1,5,
+1496,20,1497,4,36,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,52,
+0,1,226,1,3,
+1,4,1,3,1498,
+22,1,76,1,1370,
+1499,17,1500,15,1144,
+1,-1,1,5,1501,
+20,1502,4,38,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
@@ -5304,39 +5413,51 @@ public yyLSLSyntax
 0,110,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-53,0,1,228,1,
+56,0,1,240,1,
 3,1,4,1,3,
-1489,22,1,82,1,
-1620,1490,17,1491,15,
-1432,1,-1,1,5,
-1492,20,1493,4,24,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,50,0,1,
-213,1,3,1,2,
-1,1,1494,22,1,
-67,1,1621,1495,16,
-0,695,1,1574,828,
-1,172,1496,17,1497,
-15,1149,1,-1,1,
-5,1498,20,1499,4,
-38,66,0,105,0,
-110,0,97,0,114,
-0,121,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-49,0,48,0,1,
-268,1,3,1,4,
-1,3,1500,22,1,
-122,1,1931,889,1,
-2685,1501,16,0,659,
-1,1665,1502,17,1503,
-15,1184,1,-1,1,
-5,1504,20,1505,4,
+1503,22,1,90,1,
+1478,1504,17,1505,15,
+1144,1,-1,1,5,
+1506,20,1507,4,38,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,49,
+0,53,0,1,237,
+1,3,1,4,1,
+3,1508,22,1,87,
+1,1620,1509,17,1510,
+15,1446,1,-1,1,
+5,1511,20,1512,4,
+24,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
+101,0,110,0,116,
+0,95,0,50,0,
+1,222,1,3,1,
+2,1,1,1513,22,
+1,72,1,1621,1514,
+16,0,714,1,1574,
+845,1,172,1515,17,
+1516,15,1167,1,-1,
+1,5,1517,20,1518,
+4,38,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,49,0,48,0,
+1,277,1,3,1,
+4,1,3,1519,22,
+1,127,1,1931,906,
+1,1665,1520,17,1521,
+15,1202,1,-1,1,
+5,1522,20,1523,4,
 36,70,0,111,0,
 114,0,76,0,111,
 0,111,0,112,0,
@@ -5344,14 +5465,26 @@ public yyLSLSyntax
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,1,208,1,
+49,0,1,217,1,
 3,1,2,1,1,
-1506,22,1,62,1,
-2364,856,1,2105,843,
-1,2692,1507,16,0,
-657,1,1188,1508,17,
-1509,15,1126,1,-1,
-1,5,1510,20,1511,
+1524,22,1,67,1,
+2364,873,1,2105,860,
+1,1188,1525,17,1526,
+15,1144,1,-1,1,
+5,1527,20,1528,4,
+38,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+50,0,51,0,1,
+245,1,3,1,6,
+1,5,1529,22,1,
+95,1,1442,1530,17,
+1531,15,1144,1,-1,
+1,5,1532,20,1533,
 4,38,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -5359,102 +5492,90 @@ public yyLSLSyntax
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,50,0,51,0,
-1,236,1,3,1,
-6,1,5,1512,22,
-1,90,1,1442,1513,
-17,1514,15,1126,1,
--1,1,5,1515,20,
-1516,4,38,83,0,
+0,49,0,54,0,
+1,238,1,3,1,
+4,1,3,1534,22,
+1,88,1,1694,1535,
+16,0,190,1,942,
+1536,17,1537,15,1167,
+1,-1,1,5,1538,
+20,1539,4,38,66,
+0,105,0,110,0,
+97,0,114,0,121,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,49,0,
+55,0,1,284,1,
+3,1,4,1,3,
+1540,22,1,134,1,
+2198,1541,17,1188,1,
+0,1192,1,1195,1542,
+17,1543,15,1144,1,
+-1,1,5,1544,20,
+1545,4,38,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,49,0,54,
-0,1,229,1,3,
-1,4,1,3,1517,
-22,1,83,1,1694,
-1518,16,0,191,1,
-942,1519,17,1520,15,
-1149,1,-1,1,5,
-1521,20,1522,4,38,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,55,0,1,275,
-1,3,1,4,1,
-3,1523,22,1,129,
-1,2198,1524,17,1170,
-1,0,1174,1,1195,
-1525,17,1526,15,1126,
-1,-1,1,5,1527,
-20,1528,4,38,83,
+95,0,49,0,48,
+0,1,232,1,3,
+1,6,1,5,1546,
+22,1,82,1,1449,
+1547,17,1548,15,1144,
+1,-1,1,5,1549,
+20,1550,4,36,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
 115,0,105,0,103,
 0,110,0,109,0,
 101,0,110,0,116,
-0,95,0,49,0,
-48,0,1,223,1,
-3,1,6,1,5,
-1529,22,1,77,1,
-1449,1530,17,1531,15,
-1126,1,-1,1,5,
-1532,20,1533,4,36,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,51,
-0,1,216,1,3,
-1,4,1,3,1534,
-22,1,70,1,1701,
-1535,17,1536,15,1184,
-1,-1,1,5,1537,
-20,1538,4,36,70,
-0,111,0,114,0,
-76,0,111,0,111,
-0,112,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
 0,95,0,51,0,
-1,210,1,3,1,
-4,1,3,1539,22,
-1,64,1,447,1540,
-17,1541,15,1542,4,
-30,37,0,86,0,
-101,0,99,0,116,
-0,111,0,114,0,
-67,0,111,0,110,
-0,115,0,116,0,
-97,0,110,0,116,
-0,1,-1,1,5,
-1543,20,1544,4,32,
-86,0,101,0,99,
-0,116,0,111,0,
-114,0,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,95,0,
-49,0,1,245,1,
-3,1,8,1,7,
-1545,22,1,99,1,
-2458,904,1,2459,910,
-1,1958,1546,17,1170,
-1,0,1174,1,188,
-1547,17,1548,15,1149,
-1,-1,1,5,1549,
-20,1550,4,36,66,
+1,225,1,3,1,
+4,1,3,1551,22,
+1,75,1,1701,1552,
+17,1553,15,1202,1,
+-1,1,5,1554,20,
+1555,4,36,70,0,
+111,0,114,0,76,
+0,111,0,111,0,
+112,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,51,0,1,
+219,1,3,1,4,
+1,3,1556,22,1,
+69,1,447,1557,17,
+1558,15,1559,4,30,
+37,0,86,0,101,
+0,99,0,116,0,
+111,0,114,0,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+1,-1,1,5,1560,
+20,1561,4,32,86,
+0,101,0,99,0,
+116,0,111,0,114,
+0,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,95,0,49,
+0,1,254,1,3,
+1,8,1,7,1562,
+22,1,104,1,2708,
+1563,16,0,670,1,
+2458,922,1,2459,928,
+1,1958,1564,17,1188,
+1,0,1192,1,188,
+1565,17,1566,15,1167,
+1,-1,1,5,1567,
+20,1568,4,36,66,
 0,105,0,110,0,
 97,0,114,0,121,
 0,69,0,120,0,
@@ -5462,13 +5583,13 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,57,0,
-1,267,1,3,1,
-4,1,3,1551,22,
-1,121,1,2462,917,
-1,1657,922,1,2464,
-927,1,205,1552,17,
-1553,15,1149,1,-1,
-1,5,1554,20,1555,
+1,276,1,3,1,
+4,1,3,1569,22,
+1,126,1,2462,935,
+1,1657,940,1,2464,
+945,1,205,1570,17,
+1571,15,1167,1,-1,
+1,5,1572,20,1573,
 4,36,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
@@ -5476,13 +5597,13 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,56,0,1,266,
+0,56,0,1,275,
 1,3,1,4,1,
-3,1556,22,1,120,
-1,2227,936,1,1224,
-1557,17,1558,15,1126,
-1,-1,1,5,1559,
-20,1560,4,38,83,
+3,1574,22,1,125,
+1,2227,954,1,1224,
+1575,17,1576,15,1144,
+1,-1,1,5,1577,
+20,1578,4,38,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
@@ -5490,12 +5611,12 @@ public yyLSLSyntax
 0,110,0,109,0,
 101,0,110,0,116,
 0,95,0,50,0,
-50,0,1,235,1,
+50,0,1,244,1,
 3,1,6,1,5,
-1561,22,1,89,1,
-223,1562,17,1563,15,
-1149,1,-1,1,5,
-1564,20,1565,4,36,
+1579,22,1,94,1,
+223,1580,17,1581,15,
+1167,1,-1,1,5,
+1582,20,1583,4,36,
 66,0,105,0,110,
 0,97,0,114,0,
 121,0,69,0,120,
@@ -5503,12 +5624,12 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,55,
-0,1,265,1,3,
-1,4,1,3,1566,
-22,1,119,1,1730,
-1567,17,1568,15,1184,
-1,-1,1,5,1569,
-20,1570,4,36,70,
+0,1,274,1,3,
+1,4,1,3,1584,
+22,1,124,1,1730,
+1585,17,1586,15,1202,
+1,-1,1,5,1587,
+20,1588,4,36,70,
 0,111,0,114,0,
 76,0,111,0,111,
 0,112,0,83,0,
@@ -5516,35 +5637,35 @@ public yyLSLSyntax
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,52,0,
-1,211,1,3,1,
-4,1,3,1571,22,
-1,65,1,476,1572,
-17,1573,15,1574,4,
+1,220,1,3,1,
+4,1,3,1589,22,
+1,70,1,476,1590,
+17,1591,15,1592,4,
 18,37,0,67,0,
 111,0,110,0,115,
 0,116,0,97,0,
 110,0,116,0,1,
--1,1,5,1575,20,
-1576,4,20,67,0,
+-1,1,5,1593,20,
+1594,4,20,67,0,
 111,0,110,0,115,
 0,116,0,97,0,
 110,0,116,0,95,
-0,52,0,1,243,
+0,52,0,1,252,
 1,3,1,2,1,
-1,1577,22,1,97,
-1,477,1578,17,1579,
-15,1574,1,-1,1,
-5,1580,20,1581,4,
+1,1595,22,1,102,
+1,477,1596,17,1597,
+15,1592,1,-1,1,
+5,1598,20,1599,4,
 20,67,0,111,0,
 110,0,115,0,116,
 0,97,0,110,0,
 116,0,95,0,51,
-0,1,242,1,3,
-1,2,1,1,1582,
-22,1,96,1,1231,
-1583,17,1584,15,1126,
-1,-1,1,5,1585,
-20,1586,4,36,83,
+0,1,251,1,3,
+1,2,1,1,1600,
+22,1,101,1,1231,
+1601,17,1602,15,1144,
+1,-1,1,5,1603,
+20,1604,4,36,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
@@ -5552,38 +5673,38 @@ public yyLSLSyntax
 0,110,0,109,0,
 101,0,110,0,116,
 0,95,0,57,0,
-1,222,1,3,1,
-6,1,5,1587,22,
-1,76,1,479,1588,
-17,1589,15,1574,1,
--1,1,5,1590,20,
-1591,4,20,67,0,
+1,231,1,3,1,
+6,1,5,1605,22,
+1,81,1,479,1606,
+17,1607,15,1592,1,
+-1,1,5,1608,20,
+1609,4,20,67,0,
 111,0,110,0,115,
 0,116,0,97,0,
 110,0,116,0,95,
-0,49,0,1,240,
+0,49,0,1,249,
 1,3,1,2,1,
-1,1592,22,1,94,
-1,480,1593,17,1594,
-15,1595,4,26,37,
+1,1610,22,1,99,
+1,480,1611,17,1612,
+15,1613,4,26,37,
 0,76,0,105,0,
 115,0,116,0,67,
 0,111,0,110,0,
 115,0,116,0,97,
 0,110,0,116,0,
-1,-1,1,5,1596,
-20,1597,4,28,76,
+1,-1,1,5,1614,
+20,1615,4,28,76,
 0,105,0,115,0,
 116,0,67,0,111,
 0,110,0,115,0,
 116,0,97,0,110,
 0,116,0,95,0,
-49,0,1,244,1,
+49,0,1,253,1,
 3,1,4,1,3,
-1598,22,1,98,1,
-1485,1599,17,1600,15,
-1126,1,-1,1,5,
-1601,20,1602,4,36,
+1616,22,1,103,1,
+1485,1617,17,1618,15,
+1144,1,-1,1,5,
+1619,20,1620,4,36,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
@@ -5591,15 +5712,15 @@ public yyLSLSyntax
 103,0,110,0,109,
 0,101,0,110,0,
 116,0,95,0,50,
-0,1,215,1,3,
-1,4,1,3,1603,
-22,1,69,1,1737,
-1604,16,0,271,1,
-1989,944,1,1990,1605,
-17,1170,1,0,1174,
-1,242,1606,17,1607,
-15,1149,1,-1,1,
-5,1608,20,1609,4,
+0,1,224,1,3,
+1,4,1,3,1621,
+22,1,74,1,1737,
+1622,16,0,272,1,
+1989,962,1,1990,1623,
+17,1188,1,0,1192,
+1,242,1624,17,1625,
+15,1167,1,-1,1,
+5,1626,20,1627,4,
 36,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
@@ -5607,22 +5728,22 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-54,0,1,264,1,
+54,0,1,273,1,
 3,1,4,1,3,
-1610,22,1,118,1,
-478,1611,17,1612,15,
-1574,1,-1,1,5,
-1613,20,1614,4,20,
+1628,22,1,123,1,
+478,1629,17,1630,15,
+1592,1,-1,1,5,
+1631,20,1632,4,20,
 67,0,111,0,110,
 0,115,0,116,0,
 97,0,110,0,116,
 0,95,0,50,0,
-1,241,1,3,1,
-2,1,1,1615,22,
-1,95,1,1001,1616,
-17,1617,15,1252,1,
--1,1,5,1618,20,
-1619,4,40,84,0,
+1,250,1,3,1,
+2,1,1,1633,22,
+1,100,1,1001,1634,
+17,1635,15,1270,1,
+-1,1,5,1636,20,
+1637,4,40,84,0,
 121,0,112,0,101,
 0,99,0,97,0,
 115,0,116,0,69,
@@ -5630,12 +5751,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,56,0,1,289,
+0,56,0,1,298,
 1,3,1,5,1,
-4,1620,22,1,143,
-1,1002,1621,17,1622,
-15,1252,1,-1,1,
-5,1623,20,1624,4,
+4,1638,22,1,148,
+1,1002,1639,17,1640,
+15,1270,1,-1,1,
+5,1641,20,1642,4,
 40,84,0,121,0,
 112,0,101,0,99,
 0,97,0,115,0,
@@ -5644,319 +5765,264 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,49,
-0,1,282,1,3,
-1,5,1,4,1625,
-22,1,136,1,12,
-1626,19,157,1,12,
-1627,5,45,1,1901,
-1628,16,0,155,1,
-2075,1629,16,0,155,
-1,1860,850,1,1803,
-816,1,2516,1630,16,
-0,155,1,2413,1631,
-16,0,155,1,1804,
-1632,16,0,155,1,
-2198,1633,16,0,155,
-1,1873,864,1,1657,
-922,1,2531,1634,16,
-0,155,1,1989,944,
-1,1990,1635,16,0,
-155,1,31,1636,16,
-0,155,1,32,1637,
+0,1,291,1,3,
+1,5,1,4,1643,
+22,1,141,1,12,
+1644,19,157,1,12,
+1645,5,46,1,1901,
+1646,16,0,155,1,
+2075,1647,16,0,155,
+1,1860,867,1,1803,
+833,1,1804,1648,16,
+0,155,1,2520,1649,
+16,0,155,1,2413,
+1650,16,0,155,1,
+2525,1651,16,0,155,
+1,1873,881,1,1657,
+940,1,1989,962,1,
+1990,1652,16,0,155,
+1,31,1653,16,0,
+155,1,32,1654,16,
+0,155,1,2540,1655,
 16,0,155,1,2105,
-843,1,2106,1638,16,
-0,155,1,2681,1639,
-16,0,155,1,2580,
-1640,16,0,316,1,
-2227,936,1,2337,1641,
-16,0,155,1,2021,
-747,1,2458,904,1,
-2459,910,1,2462,917,
-1,2136,871,1,2464,
-927,1,2029,754,1,
-2030,760,1,2031,765,
-1,2032,770,1,2469,
-1642,16,0,479,1,
-2035,781,1,2364,856,
-1,2039,791,1,1931,
-889,1,2041,797,1,
-2507,1643,16,0,155,
-1,2043,803,1,2045,
-808,1,1775,1644,16,
-0,155,1,2033,775,
-1,2037,786,1,1574,
-828,1,1958,1645,16,
-0,155,1,13,1646,
-19,324,1,13,1647,
-5,40,1,2509,1648,
-17,1649,15,1650,4,
-36,37,0,86,0,
-111,0,105,0,100,
+860,1,2106,1656,16,
+0,155,1,2043,820,
+1,2227,954,1,2337,
+1657,16,0,155,1,
+2198,1658,16,0,155,
+1,2021,764,1,2458,
+922,1,2459,928,1,
+2462,935,1,2136,888,
+1,2464,945,1,2029,
+771,1,2030,777,1,
+2031,782,1,2032,787,
+1,2469,1659,16,0,
+499,1,2035,798,1,
+2364,873,1,2039,808,
+1,1931,906,1,2041,
+814,1,2697,1660,16,
+0,155,1,2045,825,
+1,2511,1661,16,0,
+155,1,2592,1662,16,
+0,625,1,1775,1663,
+16,0,155,1,2033,
+792,1,2037,803,1,
+1574,845,1,1958,1664,
+16,0,155,1,13,
+1665,19,487,1,13,
+1666,5,43,1,2513,
+1667,17,1668,15,1669,
+4,40,37,0,86,
+0,101,0,99,0,
+116,0,111,0,114,
 0,65,0,114,0,
 103,0,83,0,116,
 0,97,0,116,0,
 101,0,69,0,118,
 0,101,0,110,0,
 116,0,1,-1,1,
-5,1651,20,1652,4,
-38,86,0,111,0,
-105,0,100,0,65,
+5,1670,20,1671,4,
+42,86,0,101,0,
+99,0,116,0,111,
+0,114,0,65,0,
+114,0,103,0,83,
+0,116,0,97,0,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,49,0,1,177,
+1,3,1,6,1,
+5,1672,22,1,26,
+1,1860,867,1,1803,
+833,1,2522,1673,17,
+1674,15,1675,4,34,
+37,0,73,0,110,
+0,116,0,65,0,
+114,0,103,0,83,
+0,116,0,97,0,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+-1,1,5,1676,20,
+1677,4,36,73,0,
+110,0,116,0,65,
 0,114,0,103,0,
 83,0,116,0,97,
 0,116,0,101,0,
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,49,0,1,
-170,1,3,1,5,
-1,4,1653,22,1,
-23,1,2619,1654,16,
-0,322,1,1860,850,
-1,1803,816,1,2518,
-1655,17,1656,15,1657,
-4,34,37,0,73,
-0,110,0,116,0,
-65,0,114,0,103,
-0,83,0,116,0,
-97,0,116,0,101,
-0,69,0,118,0,
-101,0,110,0,116,
-0,1,-1,1,5,
-1658,20,1659,4,36,
-73,0,110,0,116,
+176,1,3,1,6,
+1,5,1678,22,1,
+25,1,2632,1679,16,
+0,704,1,2527,1680,
+17,1681,15,1682,4,
+36,37,0,86,0,
+111,0,105,0,100,
 0,65,0,114,0,
 103,0,83,0,116,
 0,97,0,116,0,
 101,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,49,
-0,1,169,1,3,
-1,6,1,5,1660,
-22,1,22,1,2413,
-1661,16,0,473,1,
-1873,864,1,1657,922,
-1,2032,770,1,1989,
-944,1,2535,1662,16,
-0,674,1,2037,786,
-1,32,1663,16,0,
-474,1,2105,843,1,
-2573,1664,17,1665,15,
-1666,4,20,37,0,
-83,0,116,0,97,
-0,116,0,101,0,
-66,0,111,0,100,
-0,121,0,1,-1,
-1,5,1667,20,1668,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-95,0,54,0,1,
-167,1,3,1,3,
-1,2,1669,22,1,
-20,1,2574,1670,17,
-1671,15,1666,1,-1,
-1,5,1672,20,1673,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-95,0,52,0,1,
-165,1,3,1,3,
-1,2,1674,22,1,
-18,1,2575,1675,17,
-1676,15,1666,1,-1,
-1,5,1677,20,1678,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-95,0,50,0,1,
-163,1,3,1,3,
-1,2,1679,22,1,
-16,1,2578,1680,17,
-1681,15,1666,1,-1,
-1,5,1682,20,1683,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-95,0,51,0,1,
-164,1,3,1,2,
-1,1,1684,22,1,
-17,1,2227,936,1,
-1574,828,1,2021,747,
-1,2458,904,1,2459,
-910,1,2462,917,1,
-2136,871,1,2464,927,
-1,2029,754,1,2030,
-760,1,2031,765,1,
-2577,1685,17,1686,15,
-1666,1,-1,1,5,
-1687,20,1688,4,22,
-83,0,116,0,97,
-0,116,0,101,0,
-66,0,111,0,100,
-0,121,0,95,0,
-53,0,1,166,1,
-3,1,2,1,1,
-1689,22,1,19,1,
-2033,775,1,2579,1690,
-17,1691,15,1666,1,
--1,1,5,1692,20,
-1693,4,22,83,0,
-116,0,97,0,116,
-0,101,0,66,0,
-111,0,100,0,121,
-0,95,0,49,0,
-1,162,1,3,1,
-2,1,1,1694,22,
-1,15,1,2035,781,
-1,2364,856,1,2039,
-791,1,1931,889,1,
-2041,797,1,2043,803,
-1,2045,808,1,2533,
-1695,17,1696,15,1697,
-4,22,37,0,83,
-0,116,0,97,0,
-116,0,101,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
--1,1,5,1698,20,
-1699,4,24,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-49,0,1,168,1,
-3,1,6,1,5,
-1700,22,1,21,1,
-14,1701,19,144,1,
-14,1702,5,105,1,
-1260,1124,1,1011,1130,
-1,1514,1136,1,9,
-1141,1,10,1703,17,
-1704,15,1705,4,48,
-37,0,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-76,0,105,0,115,
-0,116,0,1,-1,
-1,5,140,1,0,
-1,0,1706,22,1,
-24,1,262,1147,1,
-1267,1153,1,1521,1158,
-1,1773,1707,16,0,
-148,1,19,1175,1,
-20,1708,16,0,142,
-1,2281,1182,1,525,
-1244,1,30,1709,17,
-1710,15,1705,1,-1,
-1,5,1711,20,1712,
-4,50,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-76,0,105,0,115,
-0,116,0,95,0,
-50,0,1,172,1,
-3,1,4,1,3,
-1713,22,1,26,1,
-283,1200,1,40,1205,
-1,41,1714,17,1715,
-15,1716,4,26,37,
-0,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,76,0,105,
-0,115,0,116,0,
-1,-1,1,5,631,
-1,0,1,0,1717,
-22,1,146,1,42,
-1718,17,1719,15,1720,
-4,38,37,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-1,-1,1,5,1721,
-20,1722,4,40,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,65,
+116,0,1,-1,1,
+5,1683,20,1684,4,
+38,86,0,111,0,
+105,0,100,0,65,
 0,114,0,103,0,
-117,0,109,0,101,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
 0,110,0,116,0,
 95,0,49,0,1,
-294,1,3,1,2,
-1,1,1723,22,1,
-149,1,44,1211,1,
-47,1212,1,48,1218,
-1,49,1224,1,50,
-1229,1,51,1234,1,
-305,1239,1,63,1250,
-1,66,1256,1,67,
-1261,1,1478,1485,1,
-69,1271,1,70,1276,
-1,68,1266,1,74,
-1281,1,1013,1286,1,
-2335,1724,16,0,148,
-1,1332,1291,1,1048,
-1372,1,82,1308,1,
-1296,1195,1,1341,1325,
-1,328,1330,1,1303,
-1335,1,1096,1340,1,
-93,1346,1,1550,1351,
-1,2529,1725,16,0,
-142,1,352,1377,1,
-107,1366,1,1114,1371,
-1,1370,1480,1,118,
-1383,1,1123,1388,1,
-371,1393,1,1377,1399,
-1,375,1404,1,377,
-1409,1,379,1414,1,
-380,1419,1,883,1425,
-1,373,1437,1,130,
-1442,1,143,1447,1,
-1152,1453,1,387,1726,
-16,0,580,1,1406,
-1458,1,1159,1465,1,
-157,1470,1,1413,1475,
-1,1665,1502,1,2670,
-1727,17,1728,15,1705,
-1,-1,1,5,140,
-1,0,1,0,1706,
-1,412,1729,16,0,
-598,1,1094,1730,16,
-0,633,1,2679,1731,
-16,0,142,1,2520,
-1732,17,1733,15,1705,
-1,-1,1,5,140,
-1,0,1,0,1706,
-1,172,1496,1,827,
-1359,1,1188,1508,1,
-437,1734,16,0,670,
-1,1442,1513,1,1694,
-1735,16,0,148,1,
-942,1519,1,1195,1525,
-1,1449,1530,1,1701,
-1535,1,447,1540,1,
-188,1547,1,205,1552,
-1,2467,1736,17,1737,
-15,1705,1,-1,1,
-5,1738,20,1739,4,
+175,1,3,1,5,
+1,4,1685,22,1,
+24,1,1657,940,1,
+1989,962,1,2037,803,
+1,32,1686,16,0,
+491,1,2105,860,1,
+2542,1687,17,1688,15,
+1689,4,22,37,0,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,-1,1,5,1690,
+20,1691,4,24,83,
+0,116,0,97,0,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,49,0,1,174,
+1,3,1,6,1,
+5,1692,22,1,23,
+1,2544,1693,16,0,
+694,1,2045,825,1,
+2227,954,1,1574,845,
+1,2584,1694,17,1695,
+15,1696,4,20,37,
+0,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,1,
+-1,1,5,1697,20,
+1698,4,22,83,0,
+116,0,97,0,116,
+0,101,0,66,0,
+111,0,100,0,121,
+0,95,0,54,0,
+1,171,1,3,1,
+3,1,2,1699,22,
+1,20,1,2585,1700,
+17,1701,15,1696,1,
+-1,1,5,1702,20,
+1703,4,22,83,0,
+116,0,97,0,116,
+0,101,0,66,0,
+111,0,100,0,121,
+0,95,0,52,0,
+1,169,1,3,1,
+3,1,2,1704,22,
+1,18,1,2586,1705,
+17,1706,15,1696,1,
+-1,1,5,1707,20,
+1708,4,22,83,0,
+116,0,97,0,116,
+0,101,0,66,0,
+111,0,100,0,121,
+0,95,0,50,0,
+1,167,1,3,1,
+3,1,2,1709,22,
+1,16,1,2021,764,
+1,2458,922,1,2459,
+928,1,2462,935,1,
+2136,888,1,2464,945,
+1,2029,771,1,2030,
+777,1,2031,782,1,
+2032,787,1,2033,792,
+1,2035,798,1,2364,
+873,1,2583,1710,17,
+1711,15,1696,1,-1,
+1,5,1712,20,1713,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,56,0,1,
+173,1,3,1,3,
+1,2,1714,22,1,
+22,1,2039,808,1,
+1931,906,1,2041,814,
+1,1873,881,1,2588,
+1715,17,1716,15,1696,
+1,-1,1,5,1717,
+20,1718,4,22,83,
+0,116,0,97,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,95,0,55,
+0,1,172,1,3,
+1,2,1,1,1719,
+22,1,21,1,2589,
+1720,17,1721,15,1696,
+1,-1,1,5,1722,
+20,1723,4,22,83,
+0,116,0,97,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,95,0,53,
+0,1,170,1,3,
+1,2,1,1,1724,
+22,1,19,1,2590,
+1725,17,1726,15,1696,
+1,-1,1,5,1727,
+20,1728,4,22,83,
+0,116,0,97,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,95,0,51,
+0,1,168,1,3,
+1,2,1,1,1729,
+22,1,17,1,2591,
+1730,17,1731,15,1696,
+1,-1,1,5,1732,
+20,1733,4,22,83,
+0,116,0,97,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,95,0,49,
+0,1,166,1,3,
+1,2,1,1,1734,
+22,1,15,1,2413,
+1735,16,0,485,1,
+2043,820,1,14,1736,
+19,144,1,14,1737,
+5,105,1,1260,1142,
+1,1011,1148,1,1514,
+1154,1,9,1159,1,
+10,1738,17,1739,15,
+1740,4,48,37,0,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,76,0,
+105,0,115,0,116,
+0,1,-1,1,5,
+140,1,0,1,0,
+1741,22,1,27,1,
+262,1165,1,1267,1171,
+1,1521,1176,1,1773,
+1742,16,0,148,1,
+19,1193,1,20,1743,
+16,0,142,1,2281,
+1200,1,525,1262,1,
+2538,1744,16,0,142,
+1,30,1745,17,1746,
+15,1740,1,-1,1,
+5,1747,20,1748,4,
 50,65,0,114,0,
 103,0,117,0,109,
 0,101,0,110,0,
@@ -5966,651 +6032,869 @@ public yyLSLSyntax
 0,116,0,105,0,
 111,0,110,0,76,
 0,105,0,115,0,
-116,0,95,0,49,
-0,1,171,1,3,
-1,2,1,1,1740,
-22,1,25,1,461,
-1741,16,0,633,1,
-464,1742,17,1743,15,
-1716,1,-1,1,5,
-1744,20,1745,4,28,
+116,0,95,0,50,
+0,1,179,1,3,
+1,4,1,3,1749,
+22,1,29,1,283,
+1218,1,40,1223,1,
+41,1750,17,1751,15,
+1752,4,26,37,0,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
 0,76,0,105,0,
-115,0,116,0,95,
-0,50,0,1,293,
-1,3,1,4,1,
-3,1746,22,1,148,
-1,1224,1557,1,223,
-1562,1,1730,1567,1,
-476,1572,1,477,1578,
-1,1231,1583,1,479,
-1588,1,480,1593,1,
-1485,1599,1,459,1747,
-17,1748,15,1716,1,
--1,1,5,631,1,
-0,1,0,1717,1,
-242,1606,1,478,1611,
-1,481,1749,17,1750,
-15,1716,1,-1,1,
-5,1751,20,1752,4,
-28,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,76,0,105,
+115,0,116,0,1,
+-1,1,5,638,1,
+0,1,0,1753,22,
+1,151,1,42,1754,
+17,1755,15,1756,4,
+38,37,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,1,
+-1,1,5,1757,20,
+1758,4,40,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,95,
+0,49,0,1,303,
+1,3,1,2,1,
+1,1759,22,1,154,
+1,44,1229,1,47,
+1230,1,48,1236,1,
+49,1242,1,50,1247,
+1,51,1252,1,305,
+1257,1,63,1268,1,
+66,1274,1,67,1279,
+1,1478,1504,1,69,
+1289,1,70,1294,1,
+68,1284,1,74,1299,
+1,1013,1304,1,2335,
+1760,16,0,148,1,
+1332,1309,1,1048,1467,
+1,82,1326,1,1296,
+1213,1,1341,1343,1,
+328,1348,1,1303,1353,
+1,1096,1358,1,93,
+1364,1,1550,1369,1,
+2529,1761,17,1762,15,
+1740,1,-1,1,5,
+140,1,0,1,0,
+1741,1,352,1391,1,
+107,1384,1,1114,1389,
+1,1370,1499,1,118,
+1397,1,1123,1402,1,
+371,1407,1,1377,1413,
+1,375,1418,1,377,
+1423,1,379,1428,1,
+380,1433,1,883,1439,
+1,373,1451,1,130,
+1456,1,143,1461,1,
+1152,1472,1,387,1763,
+16,0,593,1,1406,
+1477,1,1159,1484,1,
+157,1489,1,1413,1494,
+1,1665,1520,1,412,
+1764,16,0,607,1,
+1094,1765,16,0,640,
+1,172,1515,1,2686,
+1766,17,1767,15,1740,
+1,-1,1,5,140,
+1,0,1,0,1741,
+1,827,1377,1,1188,
+1525,1,2695,1768,16,
+0,142,1,437,1769,
+16,0,678,1,1442,
+1530,1,1694,1770,16,
+0,148,1,942,1536,
+1,1195,1542,1,1449,
+1547,1,1701,1552,1,
+447,1557,1,188,1565,
+1,205,1570,1,2467,
+1771,17,1772,15,1740,
+1,-1,1,5,1773,
+20,1774,4,50,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
 0,115,0,116,0,
 95,0,49,0,1,
-292,1,3,1,2,
-1,1,1753,22,1,
-147,1,1001,1616,1,
-1002,1621,1,15,1754,
-19,298,1,15,1755,
-5,6,1,2685,1756,
-16,0,625,1,1114,
-1757,16,0,296,1,
-1621,1758,16,0,669,
-1,40,1759,16,0,
-577,1,19,1175,1,
-9,1141,1,16,1760,
-19,136,1,16,1761,
-5,141,1,2510,1762,
-16,0,614,1,256,
-1763,16,0,187,1,
-1261,1764,16,0,187,
-1,509,1765,16,0,
-187,1,9,1766,16,
-0,134,1,2686,1767,
-16,0,187,1,2021,
-747,1,1775,1768,16,
-0,187,1,2029,754,
-1,2030,760,1,2031,
-765,1,2032,770,1,
-2033,775,1,277,1769,
+178,1,3,1,2,
+1,1,1775,22,1,
+28,1,461,1776,16,
+0,640,1,464,1777,
+17,1778,15,1752,1,
+-1,1,5,1779,20,
+1780,4,28,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,76,
+0,105,0,115,0,
+116,0,95,0,50,
+0,1,302,1,3,
+1,4,1,3,1781,
+22,1,153,1,1224,
+1575,1,223,1580,1,
+1730,1585,1,476,1590,
+1,477,1596,1,1231,
+1601,1,479,1606,1,
+480,1611,1,1485,1617,
+1,459,1782,17,1783,
+15,1752,1,-1,1,
+5,638,1,0,1,
+0,1753,1,242,1624,
+1,478,1629,1,481,
+1784,17,1785,15,1752,
+1,-1,1,5,1786,
+20,1787,4,28,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+76,0,105,0,115,
+0,116,0,95,0,
+49,0,1,301,1,
+3,1,2,1,1,
+1788,22,1,152,1,
+1001,1634,1,1002,1639,
+1,15,1789,19,309,
+1,15,1790,5,6,
+1,1114,1791,16,0,
+307,1,1621,1792,16,
+0,677,1,2701,1793,
+16,0,651,1,40,
+1794,16,0,590,1,
+19,1193,1,9,1159,
+1,16,1795,19,136,
+1,16,1796,5,142,
+1,2514,1797,16,0,
+327,1,256,1798,16,
+0,187,1,1261,1799,
+16,0,187,1,509,
+1800,16,0,187,1,
+9,1801,16,0,134,
+1,2523,1802,16,0,
+476,1,2528,1803,16,
+0,482,1,2029,771,
+1,2030,777,1,2031,
+782,1,2032,787,1,
+2033,792,1,277,1804,
 16,0,187,1,2035,
-781,1,2037,786,1,
-2039,791,1,32,1770,
+798,1,2037,803,1,
+2039,808,1,32,1805,
 16,0,187,1,2041,
-797,1,2293,1771,16,
-0,187,1,2043,803,
-1,2045,808,1,40,
-1772,16,0,166,1,
-41,1773,16,0,187,
-1,1297,1774,16,0,
-187,1,43,1775,16,
-0,187,1,44,1776,
+814,1,2293,1806,16,
+0,187,1,2043,820,
+1,2045,825,1,40,
+1807,16,0,166,1,
+41,1808,16,0,187,
+1,1297,1809,16,0,
+187,1,43,1810,16,
+0,187,1,44,1811,
 16,0,166,1,1803,
-816,1,1804,1777,16,
-0,187,1,299,1778,
+833,1,1804,1812,16,
+0,187,1,299,1813,
 16,0,187,1,2480,
-1779,17,1780,15,1781,
+1814,17,1815,15,1816,
 4,24,37,0,73,
 0,110,0,116,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
 0,1,-1,1,5,
-1782,20,1783,4,26,
+1817,20,1818,4,26,
 73,0,110,0,116,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,57,
-0,1,326,1,3,
-1,2,1,1,1784,
-22,1,181,1,52,
-1785,16,0,187,1,
-2484,1786,17,1787,15,
-1781,1,-1,1,5,
-1788,20,1789,4,26,
-73,0,110,0,116,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,95,0,53,
-0,1,322,1,3,
-1,2,1,1,1790,
-22,1,177,1,1515,
-1791,16,0,187,1,
-2318,1792,16,0,187,
-1,2491,1793,17,1794,
-15,1795,4,12,37,
-0,69,0,118,0,
-101,0,110,0,116,
-0,1,-1,1,5,
-1796,20,1797,4,16,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,49,0,52,
-0,1,315,1,3,
-1,2,1,1,1798,
-22,1,170,1,62,
-1799,16,0,203,1,
-63,1800,16,0,166,
-1,2495,1801,17,1802,
-15,1795,1,-1,1,
-5,1803,20,1804,4,
-16,69,0,118,0,
-101,0,110,0,116,
-0,95,0,49,0,
-48,0,1,311,1,
-3,1,2,1,1,
-1805,22,1,166,1,
-2075,1806,16,0,187,
-1,1574,828,1,1479,
-1807,16,0,187,1,
-71,1808,16,0,187,
-1,1658,1809,16,0,
-699,1,1833,1810,16,
-0,288,1,1834,1811,
-16,0,187,1,2337,
-1812,16,0,187,1,
-79,1813,16,0,187,
-1,1335,1814,16,0,
-187,1,322,1815,16,
-0,187,1,76,1816,
-16,0,187,1,85,
-1817,16,0,187,1,
-89,1818,16,0,187,
-1,346,1819,16,0,
-187,1,97,1820,16,
-0,187,1,2106,1821,
-16,0,187,1,102,
-1822,16,0,187,1,
-1860,850,1,2458,904,
-1,2364,856,1,1990,
-1823,16,0,187,1,
-112,1824,16,0,187,
-1,1117,1825,16,0,
-187,1,1873,864,1,
-1875,1826,16,0,409,
-1,1876,1827,16,0,
-187,1,124,1828,16,
-0,187,1,2478,1829,
-17,1830,15,1831,4,
-26,37,0,86,0,
+116,0,95,0,52,
+0,1,335,1,3,
+1,2,1,1,1819,
+22,1,186,1,52,
+1820,16,0,187,1,
+2484,1821,17,1822,15,
+1823,4,26,37,0,
+86,0,111,0,105,
+0,100,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+-1,1,5,1824,20,
+1825,4,28,86,0,
 111,0,105,0,100,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,1,-1,1,
-5,1832,20,1833,4,
+116,0,95,0,56,
+0,1,331,1,3,
+1,2,1,1,1826,
+22,1,182,1,1515,
+1827,16,0,187,1,
+2318,1828,16,0,187,
+1,2491,1829,17,1830,
+15,1823,1,-1,1,
+5,1831,20,1832,4,
 28,86,0,111,0,
 105,0,100,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,49,0,1,
-328,1,3,1,2,
-1,1,1834,22,1,
-183,1,2136,871,1,
-381,1835,16,0,187,
-1,525,1836,16,0,
-187,1,137,1837,16,
-0,187,1,1901,1838,
-16,0,187,1,1153,
-1839,16,0,187,1,
-151,1840,16,0,187,
-1,1407,1841,16,0,
-187,1,1659,1842,16,
-0,187,1,2413,1843,
-16,0,187,1,406,
-1844,16,0,187,1,
-2669,1845,16,0,613,
-1,1371,1846,16,0,
-187,1,2105,843,1,
-166,1847,16,0,187,
-1,1622,1848,16,0,
-187,1,2519,1849,16,
-0,619,1,1931,889,
-1,1932,1850,16,0,
-481,1,1933,1851,16,
-0,187,1,431,1852,
+324,1,3,1,2,
+1,1,1833,22,1,
+175,1,62,1834,16,
+0,202,1,63,1835,
+16,0,166,1,2495,
+1836,17,1837,15,1838,
+4,12,37,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+-1,1,5,1839,20,
+1840,4,16,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+49,0,48,0,1,
+320,1,3,1,2,
+1,1,1841,22,1,
+171,1,2075,1842,16,
+0,187,1,1574,845,
+1,1479,1843,16,0,
+187,1,71,1844,16,
+0,187,1,1658,1845,
+16,0,718,1,1775,
+1846,16,0,187,1,
+1833,1847,16,0,299,
+1,1834,1848,16,0,
+187,1,2337,1849,16,
+0,187,1,79,1850,
+16,0,187,1,1335,
+1851,16,0,187,1,
+322,1852,16,0,187,
+1,76,1853,16,0,
+187,1,85,1854,16,
+0,187,1,89,1855,
+16,0,187,1,2685,
+1856,16,0,632,1,
+346,1857,16,0,187,
+1,97,1858,16,0,
+187,1,2106,1859,16,
+0,187,1,102,1860,
+16,0,187,1,1860,
+867,1,2458,922,1,
+2364,873,1,1990,1861,
+16,0,187,1,112,
+1862,16,0,187,1,
+1117,1863,16,0,187,
+1,1873,881,1,1875,
+1864,16,0,414,1,
+1876,1865,16,0,187,
+1,124,1866,16,0,
+187,1,2478,1867,17,
+1868,15,1816,1,-1,
+1,5,1869,20,1870,
+4,26,73,0,110,
+0,116,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,54,0,1,337,
+1,3,1,2,1,
+1,1871,22,1,188,
+1,2136,888,1,381,
+1872,16,0,187,1,
+525,1873,16,0,187,
+1,137,1874,16,0,
+187,1,2021,764,1,
+1901,1875,16,0,187,
+1,1153,1876,16,0,
+187,1,151,1877,16,
+0,187,1,1407,1878,
+16,0,187,1,1659,
+1879,16,0,187,1,
+2413,1880,16,0,187,
+1,406,1881,16,0,
+187,1,1371,1882,16,
+0,187,1,2105,860,
+1,166,1883,16,0,
+187,1,1622,1884,16,
+0,187,1,1931,906,
+1,1932,1885,16,0,
+501,1,1933,1886,16,
+0,187,1,431,1887,
 16,0,187,1,1585,
-1853,16,0,187,1,
-182,1854,16,0,187,
-1,1189,1855,16,0,
-187,1,1443,1856,16,
-0,187,1,1695,1857,
+1888,16,0,187,1,
+182,1889,16,0,187,
+1,1189,1890,16,0,
+187,1,1443,1891,16,
+0,187,1,1695,1892,
 16,0,187,1,2198,
-1858,16,0,187,1,
-447,1859,16,0,187,
-1,199,1860,16,0,
-187,1,2459,910,1,
-1958,1861,16,0,187,
-1,2462,917,1,1657,
-922,1,2464,927,1,
-459,1862,16,0,187,
-1,462,1863,16,0,
-187,1,2471,1864,17,
-1865,15,1831,1,-1,
-1,5,1866,20,1867,
-4,28,86,0,111,
-0,105,0,100,0,
+1893,16,0,187,1,
+2702,1894,16,0,187,
+1,447,1895,16,0,
+187,1,199,1896,16,
+0,187,1,2459,928,
+1,1958,1897,16,0,
+187,1,2462,935,1,
+1657,940,1,2464,945,
+1,459,1898,16,0,
+187,1,462,1899,16,
+0,187,1,2471,1900,
+17,1901,15,1902,4,
+30,37,0,86,0,
+101,0,99,0,116,
+0,111,0,114,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,56,0,
-1,335,1,3,1,
-2,1,1,1868,22,
-1,190,1,2472,1869,
-17,1870,15,1831,1,
--1,1,5,1871,20,
-1872,4,28,86,0,
-111,0,105,0,100,
+0,1,-1,1,5,
+1903,20,1904,4,32,
+86,0,101,0,99,
+0,116,0,111,0,
+114,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+51,0,1,344,1,
+3,1,2,1,1,
+1905,22,1,195,1,
+2472,1906,17,1907,15,
+1902,1,-1,1,5,
+1908,20,1909,4,32,
+86,0,101,0,99,
+0,116,0,111,0,
+114,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+50,0,1,343,1,
+3,1,2,1,1,
+1910,22,1,194,1,
+2473,1911,17,1912,15,
+1902,1,-1,1,5,
+1913,20,1914,4,32,
+86,0,101,0,99,
+0,116,0,111,0,
+114,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+49,0,1,342,1,
+3,1,2,1,1,
+1915,22,1,193,1,
+2474,1916,17,1917,15,
+1816,1,-1,1,5,
+1918,20,1919,4,28,
+73,0,110,0,116,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,55,
-0,1,334,1,3,
-1,2,1,1,1873,
-22,1,189,1,2473,
-1874,17,1875,15,1831,
-1,-1,1,5,1876,
-20,1877,4,28,86,
-0,111,0,105,0,
-100,0,65,0,114,
+116,0,95,0,49,
+0,48,0,1,341,
+1,3,1,2,1,
+1,1920,22,1,192,
+1,2475,1921,17,1922,
+15,1816,1,-1,1,
+5,1923,20,1924,4,
+26,73,0,110,0,
+116,0,65,0,114,
 0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-54,0,1,333,1,
+57,0,1,340,1,
 3,1,2,1,1,
-1878,22,1,188,1,
-2474,1879,17,1880,15,
-1831,1,-1,1,5,
-1881,20,1882,4,28,
-86,0,111,0,105,
-0,100,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,53,0,1,332,
-1,3,1,2,1,
-1,1883,22,1,187,
-1,2475,1884,17,1885,
-15,1831,1,-1,1,
-5,1886,20,1887,4,
-28,86,0,111,0,
-105,0,100,0,65,
-0,114,0,103,0,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,52,0,1,
-331,1,3,1,2,
-1,1,1888,22,1,
-186,1,2476,1889,17,
-1890,15,1831,1,-1,
-1,5,1891,20,1892,
-4,28,86,0,111,
-0,105,0,100,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,95,0,51,0,
-1,330,1,3,1,
-2,1,1,1893,22,
-1,185,1,2477,1894,
-17,1895,15,1831,1,
--1,1,5,1896,20,
-1897,4,28,86,0,
-111,0,105,0,100,
+1925,22,1,191,1,
+2476,1926,17,1927,15,
+1816,1,-1,1,5,
+1928,20,1929,4,26,
+73,0,110,0,116,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,50,
-0,1,329,1,3,
-1,2,1,1,1898,
-22,1,184,1,2227,
-936,1,2479,1899,17,
-1900,15,1781,1,-1,
-1,5,1901,20,1902,
-4,28,73,0,110,
-0,116,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,49,0,48,0,
-1,327,1,3,1,
-2,1,1,1903,22,
-1,182,1,1225,1904,
-16,0,187,1,2481,
-1905,17,1906,15,1781,
-1,-1,1,5,1907,
-20,1908,4,26,73,
+116,0,95,0,56,
+0,1,339,1,3,
+1,2,1,1,1930,
+22,1,190,1,2477,
+1931,17,1932,15,1816,
+1,-1,1,5,1933,
+20,1934,4,26,73,
 0,110,0,116,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,56,0,
-1,325,1,3,1,
-2,1,1,1909,22,
-1,180,1,2482,1910,
-17,1911,15,1781,1,
--1,1,5,1912,20,
-1913,4,26,73,0,
-110,0,116,0,65,
-0,114,0,103,0,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,55,0,1,
-324,1,3,1,2,
-1,1,1914,22,1,
-179,1,2483,1915,17,
-1916,15,1781,1,-1,
-1,5,1917,20,1918,
-4,26,73,0,110,
-0,116,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,54,0,1,323,
-1,3,1,2,1,
-1,1919,22,1,178,
-1,1731,1920,16,0,
-187,1,2485,1921,17,
-1922,15,1781,1,-1,
-1,5,1923,20,1924,
-4,26,73,0,110,
-0,116,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,52,0,1,321,
-1,3,1,2,1,
-1,1925,22,1,176,
-1,2486,1926,17,1927,
-15,1781,1,-1,1,
-5,1928,20,1929,4,
+0,95,0,55,0,
+1,338,1,3,1,
+2,1,1,1935,22,
+1,189,1,2227,954,
+1,2479,1936,17,1937,
+15,1816,1,-1,1,
+5,1938,20,1939,4,
+26,73,0,110,0,
+116,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+53,0,1,336,1,
+3,1,2,1,1,
+1940,22,1,187,1,
+1225,1941,16,0,187,
+1,2481,1942,17,1943,
+15,1816,1,-1,1,
+5,1944,20,1945,4,
 26,73,0,110,0,
 116,0,65,0,114,
 0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-51,0,1,320,1,
+51,0,1,334,1,
 3,1,2,1,1,
-1930,22,1,175,1,
-2487,1931,17,1932,15,
-1781,1,-1,1,5,
-1933,20,1934,4,26,
+1946,22,1,185,1,
+2482,1947,17,1948,15,
+1816,1,-1,1,5,
+1949,20,1950,4,26,
 73,0,110,0,116,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
 116,0,95,0,50,
-0,1,319,1,3,
-1,2,1,1,1935,
-22,1,174,1,2488,
-1936,17,1937,15,1781,
-1,-1,1,5,1938,
-20,1939,4,26,73,
+0,1,333,1,3,
+1,2,1,1,1951,
+22,1,184,1,2483,
+1952,17,1953,15,1816,
+1,-1,1,5,1954,
+20,1955,4,26,73,
 0,110,0,116,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
 0,95,0,49,0,
-1,318,1,3,1,
-2,1,1,1940,22,
-1,173,1,2489,1941,
-17,1942,15,1795,1,
--1,1,5,1943,20,
-1944,4,16,69,0,
+1,332,1,3,1,
+2,1,1,1956,22,
+1,183,1,1731,1957,
+16,0,187,1,2485,
+1958,17,1959,15,1823,
+1,-1,1,5,1960,
+20,1961,4,28,86,
+0,111,0,105,0,
+100,0,65,0,114,
+0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-49,0,54,0,1,
-317,1,3,1,2,
-1,1,1945,22,1,
-172,1,2490,1946,17,
-1947,15,1795,1,-1,
-1,5,1948,20,1949,
-4,16,69,0,118,
-0,101,0,110,0,
-116,0,95,0,49,
-0,53,0,1,316,
-1,3,1,2,1,
-1,1950,22,1,171,
-1,1989,944,1,2492,
-1951,17,1952,15,1795,
-1,-1,1,5,1953,
-20,1954,4,16,69,
+55,0,1,330,1,
+3,1,2,1,1,
+1962,22,1,181,1,
+2486,1963,17,1964,15,
+1823,1,-1,1,5,
+1965,20,1966,4,28,
+86,0,111,0,105,
+0,100,0,65,0,
+114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,49,0,51,0,
-1,314,1,3,1,
-2,1,1,1955,22,
-1,169,1,2493,1956,
-17,1957,15,1795,1,
--1,1,5,1958,20,
-1959,4,16,69,0,
+0,54,0,1,329,
+1,3,1,2,1,
+1,1967,22,1,180,
+1,2487,1968,17,1969,
+15,1823,1,-1,1,
+5,1970,20,1971,4,
+28,86,0,111,0,
+105,0,100,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,53,0,1,
+328,1,3,1,2,
+1,1,1972,22,1,
+179,1,2488,1973,17,
+1974,15,1823,1,-1,
+1,5,1975,20,1976,
+4,28,86,0,111,
+0,105,0,100,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,52,0,
+1,327,1,3,1,
+2,1,1,1977,22,
+1,178,1,2489,1978,
+17,1979,15,1823,1,
+-1,1,5,1980,20,
+1981,4,28,86,0,
+111,0,105,0,100,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,51,
+0,1,326,1,3,
+1,2,1,1,1982,
+22,1,177,1,2490,
+1983,17,1984,15,1823,
+1,-1,1,5,1985,
+20,1986,4,28,86,
+0,111,0,105,0,
+100,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+50,0,1,325,1,
+3,1,2,1,1,
+1987,22,1,176,1,
+1989,962,1,2492,1988,
+17,1989,15,1838,1,
+-1,1,5,1990,20,
+1991,4,16,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-49,0,50,0,1,
-313,1,3,1,2,
-1,1,1960,22,1,
-168,1,2494,1961,17,
-1962,15,1795,1,-1,
-1,5,1963,20,1964,
+49,0,51,0,1,
+323,1,3,1,2,
+1,1,1992,22,1,
+174,1,2493,1993,17,
+1994,15,1838,1,-1,
+1,5,1995,20,1996,
 4,16,69,0,118,
 0,101,0,110,0,
 116,0,95,0,49,
-0,49,0,1,312,
-1,3,1,2,1,
-1,1965,22,1,167,
-1,236,1966,16,0,
-187,1,2496,1967,17,
-1968,15,1795,1,-1,
-1,5,1969,20,1970,
-4,14,69,0,118,
-0,101,0,110,0,
-116,0,95,0,57,
-0,1,310,1,3,
-1,2,1,1,1971,
-22,1,165,1,2497,
-1972,17,1973,15,1795,
-1,-1,1,5,1974,
-20,1975,4,14,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,56,0,1,309,
+0,50,0,1,322,
 1,3,1,2,1,
-1,1976,22,1,164,
-1,2498,1977,17,1978,
-15,1795,1,-1,1,
-5,1979,20,1980,4,
+1,1997,22,1,173,
+1,2494,1998,17,1999,
+15,1838,1,-1,1,
+5,2000,20,2001,4,
+16,69,0,118,0,
+101,0,110,0,116,
+0,95,0,49,0,
+49,0,1,321,1,
+3,1,2,1,1,
+2002,22,1,172,1,
+236,2003,16,0,187,
+1,2496,2004,17,2005,
+15,1838,1,-1,1,
+5,2006,20,2007,4,
 14,69,0,118,0,
 101,0,110,0,116,
-0,95,0,55,0,
-1,308,1,3,1,
-2,1,1,1981,22,
-1,163,1,2499,1982,
-17,1983,15,1795,1,
--1,1,5,1984,20,
-1985,4,14,69,0,
+0,95,0,57,0,
+1,319,1,3,1,
+2,1,1,2008,22,
+1,170,1,2497,2009,
+17,2010,15,1838,1,
+-1,1,5,2011,20,
+2012,4,14,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-54,0,1,307,1,
+56,0,1,318,1,
 3,1,2,1,1,
-1986,22,1,162,1,
-2500,1987,17,1988,15,
-1795,1,-1,1,5,
-1989,20,1990,4,14,
+2013,22,1,169,1,
+2498,2014,17,2015,15,
+1838,1,-1,1,5,
+2016,20,2017,4,14,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,53,0,1,
-306,1,3,1,2,
-1,1,1991,22,1,
-161,1,2501,1992,17,
-1993,15,1795,1,-1,
-1,5,1994,20,1995,
+95,0,55,0,1,
+317,1,3,1,2,
+1,1,2018,22,1,
+168,1,2499,2019,17,
+2020,15,1838,1,-1,
+1,5,2021,20,2022,
 4,14,69,0,118,
 0,101,0,110,0,
-116,0,95,0,52,
-0,1,305,1,3,
-1,2,1,1,1996,
-22,1,160,1,2502,
-1997,17,1998,15,1795,
-1,-1,1,5,1999,
-20,2000,4,14,69,
+116,0,95,0,54,
+0,1,316,1,3,
+1,2,1,1,2023,
+22,1,167,1,2500,
+2024,17,2025,15,1838,
+1,-1,1,5,2026,
+20,2027,4,14,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,51,0,1,304,
+0,53,0,1,315,
 1,3,1,2,1,
-1,2001,22,1,159,
-1,2503,2002,17,2003,
-15,1795,1,-1,1,
-5,2004,20,2005,4,
+1,2028,22,1,166,
+1,2501,2029,17,2030,
+15,1838,1,-1,1,
+5,2031,20,2032,4,
 14,69,0,118,0,
 101,0,110,0,116,
-0,95,0,50,0,
-1,303,1,3,1,
-2,1,1,2006,22,
-1,158,1,2504,2007,
-17,2008,15,1795,1,
--1,1,5,2009,20,
-2010,4,14,69,0,
+0,95,0,52,0,
+1,314,1,3,1,
+2,1,1,2033,22,
+1,165,1,2502,2034,
+17,2035,15,1838,1,
+-1,1,5,2036,20,
+2037,4,14,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-49,0,1,302,1,
+51,0,1,313,1,
 3,1,2,1,1,
-2011,22,1,157,1,
-2505,2012,16,0,442,
-1,217,2013,16,0,
-187,1,1756,2014,16,
-0,187,1,17,2015,
-19,154,1,17,2016,
-5,121,1,1,2017,
-17,2018,15,2019,4,
+2038,22,1,164,1,
+2503,2039,17,2040,15,
+1838,1,-1,1,5,
+2041,20,2042,4,14,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,50,0,1,
+312,1,3,1,2,
+1,1,2043,22,1,
+163,1,2504,2044,17,
+2045,15,1838,1,-1,
+1,5,2046,20,2047,
+4,14,69,0,118,
+0,101,0,110,0,
+116,0,95,0,49,
+0,1,311,1,3,
+1,2,1,1,2048,
+22,1,162,1,2505,
+2049,16,0,447,1,
+217,2050,16,0,187,
+1,1756,2051,16,0,
+187,1,17,2052,19,
+154,1,17,2053,5,
+124,1,2510,2054,16,
+0,621,1,1,2055,
+17,2056,15,2057,4,
 18,37,0,84,0,
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,1,
--1,1,5,2020,20,
-2021,4,20,84,0,
+-1,1,5,2058,20,
+2059,4,20,84,0,
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,95,
-0,55,0,1,301,
+0,55,0,1,310,
 1,3,1,2,1,
-1,2022,22,1,156,
-1,2,2023,17,2024,
-15,2019,1,-1,1,
-5,2025,20,2026,4,
+1,2060,22,1,161,
+1,2,2061,17,2062,
+15,2057,1,-1,1,
+5,2063,20,2064,4,
 20,84,0,121,0,
 112,0,101,0,110,
 0,97,0,109,0,
 101,0,95,0,54,
-0,1,300,1,3,
-1,2,1,1,2027,
-22,1,155,1,3,
-2028,17,2029,15,2019,
-1,-1,1,5,2030,
-20,2031,4,20,84,
+0,1,309,1,3,
+1,2,1,1,2065,
+22,1,160,1,3,
+2066,17,2067,15,2057,
+1,-1,1,5,2068,
+20,2069,4,20,84,
 0,121,0,112,0,
 101,0,110,0,97,
 0,109,0,101,0,
 95,0,53,0,1,
-299,1,3,1,2,
-1,1,2032,22,1,
-154,1,4,2033,17,
-2034,15,2019,1,-1,
-1,5,2035,20,2036,
+308,1,3,1,2,
+1,1,2070,22,1,
+159,1,4,2071,17,
+2072,15,2057,1,-1,
+1,5,2073,20,2074,
 4,20,84,0,121,
 0,112,0,101,0,
 110,0,97,0,109,
 0,101,0,95,0,
-52,0,1,298,1,
+52,0,1,307,1,
 3,1,2,1,1,
-2037,22,1,153,1,
-5,2038,17,2039,15,
-2019,1,-1,1,5,
-2040,20,2041,4,20,
+2075,22,1,158,1,
+5,2076,17,2077,15,
+2057,1,-1,1,5,
+2078,20,2079,4,20,
 84,0,121,0,112,
 0,101,0,110,0,
 97,0,109,0,101,
 0,95,0,51,0,
-1,297,1,3,1,
-2,1,1,2042,22,
-1,152,1,6,2043,
-17,2044,15,2019,1,
--1,1,5,2045,20,
-2046,4,20,84,0,
+1,306,1,3,1,
+2,1,1,2080,22,
+1,157,1,6,2081,
+17,2082,15,2057,1,
+-1,1,5,2083,20,
+2084,4,20,84,0,
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,95,
-0,50,0,1,296,
+0,50,0,1,305,
 1,3,1,2,1,
-1,2047,22,1,151,
-1,7,2048,17,2049,
-15,2019,1,-1,1,
-5,2050,20,2051,4,
+1,2085,22,1,156,
+1,7,2086,17,2087,
+15,2057,1,-1,1,
+5,2088,20,2089,4,
 20,84,0,121,0,
 112,0,101,0,110,
 0,97,0,109,0,
 101,0,95,0,49,
-0,1,295,1,3,
-1,2,1,1,2052,
-22,1,150,1,1514,
-1136,1,9,1141,1,
-10,1703,1,262,1147,
-1,1267,1153,1,481,
-1749,1,1521,1158,1,
-1773,2053,16,0,235,
-1,19,1175,1,20,
-2054,16,0,152,1,
-2281,1182,1,525,1244,
-1,30,1709,1,283,
-1200,1,1010,2055,16,
-0,621,1,40,1205,
-1,41,1714,1,42,
-1718,1,44,1211,1,
-1260,1124,1,47,1212,
-1,1303,1335,1,49,
-1224,1,50,1229,1,
-48,1218,1,305,1239,
-1,51,1234,1,61,
-2056,16,0,195,1,
-63,1250,1,66,1256,
-1,67,1261,1,68,
-1266,1,69,1271,1,
-70,1276,1,73,2057,
-16,0,205,1,74,
-1281,1,1013,1286,1,
-2335,2058,16,0,237,
-1,328,1330,1,1048,
-1372,1,82,1308,1,
-2513,2059,17,2060,15,
-2061,4,30,37,0,
+0,1,304,1,3,
+1,2,1,1,2090,
+22,1,155,1,2518,
+2091,17,2092,15,2093,
+4,54,37,0,73,
+0,110,0,116,0,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,76,0,
+105,0,115,0,116,
+0,1,-1,1,5,
+2094,20,2095,4,56,
 73,0,110,0,116,
+0,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,76,
+0,105,0,115,0,
+116,0,95,0,49,
+0,1,180,1,3,
+1,2,1,1,2096,
+22,1,30,1,9,
+1159,1,10,1738,1,
+262,1165,1,1267,1171,
+1,2524,2097,16,0,
+477,1,1521,1176,1,
+1773,2098,16,0,238,
+1,19,1193,1,20,
+2099,16,0,152,1,
+2281,1200,1,525,1262,
+1,2538,2100,16,0,
+489,1,30,1745,1,
+1002,1639,1,283,1218,
+1,1010,2101,16,0,
+628,1,40,1223,1,
+41,1750,1,42,1754,
+1,44,1229,1,1260,
+1142,1,47,1230,1,
+1303,1353,1,49,1242,
+1,50,1247,1,48,
+1236,1,51,1252,1,
+1514,1154,1,61,2102,
+16,0,194,1,63,
+1268,1,305,1257,1,
+66,1274,1,67,1279,
+1,68,1284,1,69,
+1289,1,70,1294,1,
+73,2103,16,0,204,
+1,74,1299,1,1013,
+1304,1,2335,2104,16,
+0,240,1,1332,1309,
+1,1048,1467,1,82,
+1326,1,1840,2105,16,
+0,313,1,1341,1343,
+1,2517,2106,17,2107,
+15,2108,4,30,37,
+0,73,0,110,0,
+116,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,1,
+-1,1,5,2109,20,
+2110,4,32,73,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,95,0,49,0,
+1,183,1,3,1,
+3,1,2,2111,22,
+1,33,1,2519,2112,
+16,0,626,1,1094,
+2113,16,0,709,1,
+1096,1358,1,93,1364,
+1,1550,1369,1,2529,
+1761,1,827,1377,1,
+1011,1148,1,107,1384,
+1,1114,1389,1,328,
+1348,1,1871,2114,16,
+0,323,1,1370,1499,
+1,1478,1504,1,118,
+1397,1,1123,1402,1,
+371,1407,1,1377,1413,
+1,375,1418,1,1882,
+2115,16,0,343,1,
+377,1423,1,352,1391,
+1,379,1428,1,380,
+1433,1,130,1456,1,
+2074,2116,16,0,592,
+1,373,1451,1,1012,
+2117,16,0,630,1,
+143,1461,1,1152,1472,
+1,1406,1477,1,1159,
+1484,1,157,1489,1,
+1413,1494,1,883,1439,
+1,1296,1213,1,172,
+1515,1,2686,1766,1,
+1665,1520,1,1939,2118,
+16,0,461,1,1188,
+1525,1,2695,2119,16,
+0,646,1,1442,1530,
+1,188,1565,1,942,
+1536,1,1195,1542,1,
+1449,1547,1,1701,1552,
+1,447,1557,1,205,
+1570,1,2467,1771,1,
+464,1777,1,2197,2120,
+16,0,697,1,1224,
+1575,1,223,1580,1,
+1730,1585,1,476,1590,
+1,477,1596,1,1231,
+1601,1,479,1606,1,
+480,1611,1,1485,1617,
+1,459,1782,1,242,
+1624,1,478,1629,1,
+481,1784,1,1001,1634,
+1,2508,2121,17,2122,
+15,2123,4,36,37,
+0,86,0,101,0,
+99,0,116,0,111,
+0,114,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+1,-1,1,5,2124,
+20,2125,4,38,86,
+0,101,0,99,0,
+116,0,111,0,114,
 0,68,0,101,0,
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
-0,110,0,1,-1,
-1,5,2062,20,2063,
-4,32,73,0,110,
+0,110,0,95,0,
+49,0,1,184,1,
+3,1,3,1,2,
+2126,22,1,34,1,
+2509,2127,17,2128,15,
+2129,4,60,37,0,
+86,0,101,0,99,
+0,116,0,111,0,
+114,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
 0,116,0,68,0,
 101,0,99,0,108,
 0,97,0,114,0,
 97,0,116,0,105,
 0,111,0,110,0,
-95,0,49,0,1,
-174,1,3,1,3,
-1,2,2064,22,1,
-28,1,2514,2065,17,
-2066,15,2067,4,54,
-37,0,73,0,110,
-0,116,0,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,1,
--1,1,5,2068,20,
-2069,4,56,73,0,
-110,0,116,0,65,
+76,0,105,0,115,
+0,116,0,1,-1,
+1,5,2130,20,2131,
+4,62,86,0,101,
+0,99,0,116,0,
+111,0,114,0,65,
 0,114,0,103,0,
 117,0,109,0,101,
 0,110,0,116,0,
@@ -6621,2170 +6905,2107 @@ public yyLSLSyntax
 110,0,76,0,105,
 0,115,0,116,0,
 95,0,49,0,1,
-173,1,3,1,2,
-1,1,2070,22,1,
-27,1,2515,2071,16,
-0,455,1,1341,1325,
-1,2520,1732,1,1096,
-1340,1,93,1346,1,
-1550,1351,1,2529,2072,
-16,0,467,1,827,
-1359,1,1011,1130,1,
-107,1366,1,1114,1371,
-1,1871,2073,16,0,
-312,1,1370,1480,1,
-1478,1485,1,118,1383,
-1,1123,1388,1,1332,
-1291,1,1377,1399,1,
-375,1404,1,1882,2074,
-16,0,336,1,377,
-1409,1,352,1377,1,
-379,1414,1,380,1419,
-1,130,1442,1,2074,
-2075,16,0,579,1,
-371,1393,1,373,1437,
-1,1012,2076,16,0,
-623,1,1840,2077,16,
-0,302,1,143,1447,
-1,1152,1453,1,1406,
-1458,1,1159,1465,1,
-157,1470,1,1413,1475,
-1,883,1425,1,2670,
-1727,1,1094,2078,16,
-0,693,1,1296,1195,
-1,2679,2079,16,0,
-692,1,172,1496,1,
-1665,1502,1,1939,2080,
-16,0,454,1,1188,
-1508,1,1442,1513,1,
-188,1547,1,942,1519,
-1,1195,1525,1,1449,
-1530,1,1701,1535,1,
-447,1540,1,205,1552,
-1,2467,1736,1,464,
-1742,1,2197,2081,16,
-0,689,1,1224,1557,
-1,223,1562,1,1730,
-1567,1,476,1572,1,
-477,1578,1,1231,1583,
-1,479,1588,1,480,
-1593,1,1485,1599,1,
-459,1747,1,242,1606,
-1,478,1611,1,2506,
-2082,16,0,443,1,
-1001,1616,1,1002,1621,
-1,18,2083,19,507,
-1,18,2084,5,84,
-1,1011,1130,1,1012,
-2085,16,0,505,1,
-1013,1286,1,262,1147,
-1,1267,2086,16,0,
-505,1,515,2087,16,
-0,505,1,1521,2088,
-16,0,505,1,2692,
-2089,16,0,505,1,
-525,1244,1,283,1200,
-1,2299,2090,16,0,
-505,1,42,2091,16,
-0,505,1,40,1205,
-1,44,1211,1,47,
-1212,1,1303,2092,16,
-0,505,1,1555,2093,
-16,0,505,1,50,
-1229,1,48,1218,1,
-49,1224,1,51,1234,
-1,63,1250,1,305,
-1239,1,66,1256,1,
-67,1261,1,68,1266,
-1,69,1271,1,70,
-1276,1,73,2094,16,
-0,505,1,74,1281,
-1,328,1330,1,1048,
-2095,16,0,505,1,
-82,2096,16,0,505,
-1,1840,2097,16,0,
-505,1,1591,2098,16,
-0,505,1,1341,2099,
-16,0,505,1,1096,
-1340,1,93,1346,1,
-352,1377,1,107,2100,
-16,0,505,1,1114,
-1371,1,118,2101,16,
-0,505,1,1123,2102,
-16,0,505,1,371,
-1393,1,1628,2103,16,
-0,505,1,375,1404,
-1,1882,2104,16,0,
-505,1,377,1409,1,
-379,1414,1,380,1419,
-1,883,2105,16,0,
-505,1,373,1437,1,
-130,2106,16,0,505,
-1,143,2107,16,0,
-505,1,387,2108,16,
-0,505,1,1159,2109,
-16,0,505,1,157,
-2110,16,0,505,1,
-1413,2111,16,0,505,
-1,1665,2112,16,0,
-505,1,412,2113,16,
-0,505,1,1377,2114,
-16,0,505,1,172,
-2115,16,0,505,1,
-1939,2116,16,0,505,
-1,437,2117,16,0,
-505,1,188,2118,16,
-0,505,1,942,2119,
-16,0,505,1,1195,
-2120,16,0,505,1,
-1449,2121,16,0,505,
-1,1701,2122,16,0,
-505,1,447,1540,1,
-205,2123,16,0,505,
-1,827,2124,16,0,
-505,1,223,2125,16,
-0,505,1,476,1572,
-1,477,1578,1,1231,
-2126,16,0,505,1,
-479,1588,1,480,1593,
-1,1485,2127,16,0,
-505,1,1737,2128,16,
-0,505,1,242,2129,
-16,0,505,1,478,
-1611,1,1001,1616,1,
-1002,1621,1,19,2130,
-19,226,1,19,2131,
-5,176,1,256,2132,
-16,0,224,1,1261,
-2133,16,0,224,1,
-1011,1130,1,1012,2134,
-16,0,480,1,2458,
-904,1,2686,2135,16,
-0,224,1,262,1147,
-1,1267,2136,16,0,
-480,1,2021,747,1,
-1521,2137,16,0,480,
-1,2692,2138,16,0,
-480,1,1775,2139,16,
-0,224,1,2029,754,
-1,2030,760,1,2031,
-765,1,2032,770,1,
-2033,775,1,277,2140,
-16,0,224,1,2035,
-781,1,2037,786,1,
-2039,791,1,32,2141,
-16,0,224,1,2464,
-927,1,2293,2142,16,
-0,224,1,2043,803,
-1,2045,808,1,2299,
-2143,16,0,480,1,
-41,2144,16,0,224,
-1,42,2145,16,0,
-480,1,40,1205,1,
-44,1211,1,43,2146,
-16,0,224,1,1804,
-2147,16,0,224,1,
-48,1218,1,49,1224,
-1,47,1212,1,51,
-1234,1,52,2148,16,
-0,224,1,50,1229,
-1,305,1239,1,1096,
-1340,1,1515,2149,16,
-0,224,1,2318,2150,
-16,0,224,1,283,
-1200,1,63,1250,1,
-66,1256,1,67,1261,
-1,68,1266,1,69,
-1271,1,70,1276,1,
-71,2151,16,0,224,
-1,73,2152,16,0,
-480,1,74,1281,1,
-1013,1286,1,76,2153,
-16,0,224,1,1834,
-2154,16,0,224,1,
-2337,2155,16,0,224,
-1,79,2156,16,0,
-224,1,1335,2157,16,
-0,224,1,299,2158,
-16,0,224,1,82,
-2159,16,0,480,1,
-1840,2160,16,0,480,
-1,1297,2161,16,0,
-224,1,85,2162,16,
-0,224,1,1341,2163,
-16,0,480,1,89,
-2164,16,0,224,1,
-1303,2165,16,0,480,
-1,509,2166,16,0,
-224,1,93,1346,1,
-322,2167,16,0,224,
-1,97,2168,16,0,
-224,1,2041,797,1,
-1555,2169,16,0,480,
-1,827,2170,16,0,
-480,1,102,2171,16,
-0,224,1,1860,850,
-1,1803,816,1,2364,
-856,1,107,2172,16,
-0,480,1,1114,1371,
-1,112,2173,16,0,
-224,1,1117,2174,16,
-0,224,1,352,1377,
-1,1873,864,1,118,
-2175,16,0,480,1,
-1123,2176,16,0,480,
-1,371,1393,1,515,
-2177,16,0,480,1,
-1377,2178,16,0,480,
-1,124,2179,16,0,
-224,1,1882,2180,16,
-0,480,1,377,1409,
-1,379,1414,1,380,
-1419,1,130,2181,16,
-0,480,1,346,2182,
-16,0,224,1,2075,
-2183,16,0,224,1,
-373,1437,1,387,2184,
-16,0,480,1,137,
-2185,16,0,224,1,
-143,2186,16,0,480,
-1,1901,2187,16,0,
-224,1,1048,2188,16,
-0,480,1,1153,2189,
-16,0,224,1,375,
-1404,1,151,2190,16,
-0,224,1,1407,2191,
-16,0,224,1,1659,
-2192,16,0,224,1,
-2413,2193,16,0,224,
-1,1159,2194,16,0,
-480,1,381,2195,16,
-0,224,1,157,2196,
-16,0,480,1,1413,
-2197,16,0,480,1,
-883,2198,16,0,480,
-1,1371,2199,16,0,
-224,1,328,1330,1,
-2105,843,1,2106,2200,
-16,0,224,1,166,
-2201,16,0,224,1,
-525,2202,16,0,224,
-1,1622,2203,16,0,
-224,1,406,2204,16,
-0,224,1,1574,828,
-1,172,2205,16,0,
-480,1,1931,889,1,
-412,2206,16,0,480,
-1,1933,2207,16,0,
-224,1,1876,2208,16,
-0,224,1,431,2209,
-16,0,224,1,1585,
-2210,16,0,224,1,
-182,2211,16,0,224,
-1,1628,2212,16,0,
-480,1,1189,2213,16,
-0,224,1,437,2214,
-16,0,480,1,1591,
-2215,16,0,480,1,
-188,2216,16,0,480,
-1,1695,2217,16,0,
-224,1,2198,2218,16,
-0,224,1,1195,2219,
-16,0,480,1,1449,
-2220,16,0,480,1,
-1701,2221,16,0,480,
-1,447,2222,16,0,
-224,1,199,2223,16,
-0,224,1,2459,910,
-1,1958,2224,16,0,
-224,1,2462,917,1,
-1657,922,1,205,2225,
-16,0,480,1,459,
-2226,16,0,224,1,
-462,2227,16,0,224,
-1,1665,2228,16,0,
-480,1,217,2229,16,
-0,224,1,2227,936,
-1,942,2230,16,0,
-480,1,1225,2231,16,
-0,224,1,223,2232,
-16,0,480,1,1479,
-2233,16,0,224,1,
-1731,2234,16,0,224,
-1,477,1578,1,1231,
-2235,16,0,480,1,
-479,1588,1,480,1593,
-1,1485,2236,16,0,
-480,1,1737,2237,16,
-0,480,1,1989,944,
-1,1990,2238,16,0,
-224,1,1443,2239,16,
-0,224,1,236,2240,
-16,0,224,1,2136,
-871,1,476,1572,1,
-242,2241,16,0,480,
-1,478,1611,1,1939,
-2242,16,0,480,1,
-1001,1616,1,1002,1621,
-1,1756,2243,16,0,
-224,1,20,2244,19,
-464,1,20,2245,5,
-84,1,1011,1130,1,
-1012,2246,16,0,462,
-1,1013,1286,1,262,
-1147,1,1267,2247,16,
-0,462,1,515,2248,
-16,0,462,1,1521,
-2249,16,0,462,1,
-2692,2250,16,0,462,
-1,525,1244,1,283,
-1200,1,2299,2251,16,
-0,462,1,42,2252,
-16,0,462,1,40,
-1205,1,44,1211,1,
-47,1212,1,1303,2253,
-16,0,462,1,1555,
-2254,16,0,462,1,
-50,1229,1,48,1218,
-1,49,1224,1,51,
-1234,1,63,1250,1,
-305,1239,1,66,1256,
-1,67,1261,1,68,
-1266,1,69,1271,1,
-70,1276,1,73,2255,
-16,0,462,1,74,
-1281,1,328,2256,16,
-0,462,1,1048,2257,
-16,0,462,1,82,
-2258,16,0,462,1,
-1840,2259,16,0,462,
-1,1591,2260,16,0,
-462,1,1341,2261,16,
-0,462,1,1096,1340,
-1,93,1346,1,352,
-2262,16,0,462,1,
-107,2263,16,0,462,
-1,1114,1371,1,118,
-2264,16,0,462,1,
-1123,2265,16,0,462,
-1,371,1393,1,1628,
-2266,16,0,462,1,
-375,1404,1,1882,2267,
-16,0,462,1,377,
-1409,1,379,1414,1,
-380,1419,1,883,2268,
-16,0,462,1,373,
-1437,1,130,2269,16,
-0,462,1,143,2270,
-16,0,462,1,387,
-2271,16,0,462,1,
-1159,2272,16,0,462,
-1,157,2273,16,0,
-462,1,1413,2274,16,
-0,462,1,1665,2275,
-16,0,462,1,412,
-2276,16,0,462,1,
-1377,2277,16,0,462,
-1,172,2278,16,0,
-462,1,1939,2279,16,
-0,462,1,437,2280,
-16,0,462,1,188,
-2281,16,0,462,1,
-942,2282,16,0,462,
-1,1195,2283,16,0,
-462,1,1449,2284,16,
-0,462,1,1701,2285,
-16,0,462,1,447,
-1540,1,205,2286,16,
-0,462,1,827,2287,
-16,0,462,1,223,
-2288,16,0,462,1,
-476,1572,1,477,1578,
-1,1231,2289,16,0,
-462,1,479,1588,1,
-480,1593,1,1485,2290,
-16,0,462,1,1737,
-2291,16,0,462,1,
-242,2292,16,0,462,
-1,478,1611,1,1001,
-1616,1,1002,1621,1,
-21,2293,19,441,1,
-21,2294,5,84,1,
-1011,1130,1,1012,2295,
-16,0,439,1,1013,
-1286,1,262,1147,1,
-1267,2296,16,0,439,
-1,515,2297,16,0,
-439,1,1521,2298,16,
-0,439,1,2692,2299,
-16,0,439,1,525,
-1244,1,283,1200,1,
-2299,2300,16,0,439,
-1,42,2301,16,0,
-439,1,40,1205,1,
-44,1211,1,47,1212,
-1,1303,2302,16,0,
-439,1,1555,2303,16,
-0,439,1,50,1229,
-1,48,1218,1,49,
-1224,1,51,1234,1,
-63,1250,1,305,1239,
-1,66,1256,1,67,
-1261,1,68,1266,1,
-69,1271,1,70,1276,
-1,73,2304,16,0,
-439,1,74,1281,1,
-328,2305,16,0,439,
-1,1048,2306,16,0,
-439,1,82,2307,16,
-0,439,1,1840,2308,
-16,0,439,1,1591,
-2309,16,0,439,1,
-1341,2310,16,0,439,
-1,1096,1340,1,93,
-1346,1,352,2311,16,
-0,439,1,107,2312,
-16,0,439,1,1114,
-1371,1,118,2313,16,
-0,439,1,1123,2314,
-16,0,439,1,371,
-1393,1,1628,2315,16,
-0,439,1,375,1404,
-1,1882,2316,16,0,
-439,1,377,1409,1,
-379,1414,1,380,1419,
-1,883,2317,16,0,
-439,1,373,1437,1,
-130,2318,16,0,439,
-1,143,2319,16,0,
-439,1,387,2320,16,
-0,439,1,1159,2321,
-16,0,439,1,157,
-2322,16,0,439,1,
-1413,2323,16,0,439,
-1,1665,2324,16,0,
-439,1,412,2325,16,
-0,439,1,1377,2326,
-16,0,439,1,172,
-2327,16,0,439,1,
-1939,2328,16,0,439,
-1,437,2329,16,0,
-439,1,188,2330,16,
-0,439,1,942,2331,
-16,0,439,1,1195,
-2332,16,0,439,1,
-1449,2333,16,0,439,
-1,1701,2334,16,0,
-439,1,447,1540,1,
-205,2335,16,0,439,
-1,827,2336,16,0,
-439,1,223,2337,16,
-0,439,1,476,1572,
-1,477,1578,1,1231,
-2338,16,0,439,1,
-479,1588,1,480,1593,
-1,1485,2339,16,0,
-439,1,1737,2340,16,
-0,439,1,242,2341,
-16,0,439,1,478,
-1611,1,1001,1616,1,
-1002,1621,1,22,2342,
-19,392,1,22,2343,
-5,84,1,1011,1130,
-1,1012,2344,16,0,
-390,1,1013,1286,1,
-262,1147,1,1267,2345,
-16,0,390,1,515,
-2346,16,0,390,1,
-1521,2347,16,0,390,
-1,2692,2348,16,0,
-390,1,525,1244,1,
-283,1200,1,2299,2349,
-16,0,390,1,42,
-2350,16,0,390,1,
-40,1205,1,44,1211,
-1,47,1212,1,1303,
-2351,16,0,390,1,
-1555,2352,16,0,390,
-1,50,1229,1,48,
-1218,1,49,1224,1,
-51,1234,1,63,1250,
-1,305,1239,1,66,
-1256,1,67,1261,1,
-68,1266,1,69,1271,
-1,70,1276,1,73,
-2353,16,0,390,1,
-74,1281,1,328,2354,
-16,0,390,1,1048,
-2355,16,0,390,1,
-82,2356,16,0,390,
-1,1840,2357,16,0,
-390,1,1591,2358,16,
-0,390,1,1341,2359,
-16,0,390,1,1096,
-1340,1,93,1346,1,
-352,2360,16,0,390,
-1,107,2361,16,0,
-390,1,1114,1371,1,
-118,2362,16,0,390,
-1,1123,2363,16,0,
-390,1,371,1393,1,
-1628,2364,16,0,390,
-1,375,1404,1,1882,
-2365,16,0,390,1,
-377,1409,1,379,1414,
-1,380,1419,1,883,
-2366,16,0,390,1,
-373,1437,1,130,2367,
-16,0,390,1,143,
-2368,16,0,390,1,
-387,2369,16,0,390,
-1,1159,2370,16,0,
-390,1,157,2371,16,
-0,390,1,1413,2372,
-16,0,390,1,1665,
-2373,16,0,390,1,
-412,2374,16,0,390,
-1,1377,2375,16,0,
-390,1,172,2376,16,
-0,390,1,1939,2377,
-16,0,390,1,437,
-2378,16,0,390,1,
-188,2379,16,0,390,
-1,942,2380,16,0,
-390,1,1195,2381,16,
-0,390,1,1449,2382,
-16,0,390,1,1701,
-2383,16,0,390,1,
-447,1540,1,205,2384,
-16,0,390,1,827,
-2385,16,0,390,1,
-223,2386,16,0,390,
-1,476,1572,1,477,
-1578,1,1231,2387,16,
-0,390,1,479,1588,
-1,480,1593,1,1485,
-2388,16,0,390,1,
-1737,2389,16,0,390,
-1,242,2390,16,0,
-390,1,478,1611,1,
-1001,1616,1,1002,1621,
-1,23,2391,19,527,
-1,23,2392,5,38,
-1,1901,2393,16,0,
-525,1,2075,2394,16,
-0,525,1,1860,850,
-1,1803,816,1,1804,
-2395,16,0,525,1,
-2413,2396,16,0,525,
-1,2198,2397,16,0,
-525,1,1873,864,1,
-1657,922,1,1989,944,
-1,1990,2398,16,0,
-525,1,1775,2399,16,
-0,525,1,32,2400,
-16,0,525,1,2105,
-843,1,2106,2401,16,
-0,525,1,2364,856,
-1,2227,936,1,2337,
-2402,16,0,525,1,
-2021,747,1,2458,904,
-1,2459,910,1,2462,
-917,1,2136,871,1,
-2464,927,1,2029,754,
-1,2030,760,1,2031,
-765,1,2032,770,1,
-2033,775,1,2035,781,
-1,2037,786,1,2039,
-791,1,1931,889,1,
-2041,797,1,2043,803,
-1,2045,808,1,1574,
-828,1,1958,2403,16,
-0,525,1,24,2404,
-19,177,1,24,2405,
-5,5,1,44,2406,
-16,0,175,1,377,
-2407,16,0,563,1,
-40,2408,16,0,702,
-1,63,2409,16,0,
-197,1,373,2410,16,
-0,559,1,25,2411,
-19,291,1,25,2412,
-5,177,1,256,2413,
-16,0,568,1,1261,
-2414,16,0,568,1,
-1011,1130,1,1012,2415,
-16,0,289,1,2458,
-904,1,2686,2416,16,
-0,568,1,262,1147,
-1,1267,2417,16,0,
-289,1,2021,747,1,
-1521,2418,16,0,289,
-1,2692,2419,16,0,
-289,1,1775,2420,16,
-0,568,1,2029,754,
-1,2030,760,1,2031,
-765,1,2032,770,1,
-2033,775,1,277,2421,
-16,0,568,1,2035,
-781,1,2037,786,1,
-2039,791,1,32,2422,
-16,0,568,1,2464,
-927,1,2293,2423,16,
-0,568,1,2043,803,
-1,2045,808,1,2299,
-2424,16,0,289,1,
-41,2425,16,0,568,
-1,42,2426,16,0,
-289,1,40,1205,1,
-44,1211,1,43,2427,
-16,0,568,1,1804,
-2428,16,0,568,1,
-48,1218,1,49,1224,
-1,47,1212,1,51,
-1234,1,52,2429,16,
-0,568,1,50,1229,
-1,305,1239,1,1096,
-1340,1,1515,2430,16,
-0,568,1,2318,2431,
-16,0,568,1,62,
-2432,16,0,568,1,
-63,1250,1,66,1256,
-1,67,1261,1,68,
-1266,1,69,1271,1,
-70,1276,1,71,2433,
-16,0,568,1,283,
-1200,1,73,2434,16,
-0,289,1,74,1281,
-1,1013,1286,1,76,
-2435,16,0,568,1,
-1834,2436,16,0,568,
-1,2337,2437,16,0,
-568,1,79,2438,16,
-0,568,1,1335,2439,
-16,0,568,1,299,
-2440,16,0,568,1,
-82,2441,16,0,289,
-1,1840,2442,16,0,
-289,1,1297,2443,16,
-0,568,1,85,2444,
-16,0,568,1,1341,
-2445,16,0,289,1,
-89,2446,16,0,568,
-1,1303,2447,16,0,
-289,1,509,2448,16,
-0,568,1,93,1346,
-1,322,2449,16,0,
-568,1,97,2450,16,
-0,568,1,2041,797,
-1,1555,2451,16,0,
-289,1,827,2452,16,
-0,289,1,102,2453,
-16,0,568,1,1860,
-850,1,1803,816,1,
-2364,856,1,107,2454,
-16,0,289,1,1114,
-1371,1,112,2455,16,
-0,568,1,1117,2456,
-16,0,568,1,352,
-1377,1,1873,864,1,
-118,1383,1,1123,2457,
-16,0,289,1,371,
-1393,1,515,2458,16,
-0,289,1,1377,2459,
-16,0,289,1,124,
-2460,16,0,568,1,
-1882,2461,16,0,289,
-1,377,1409,1,379,
-1414,1,380,1419,1,
-130,1442,1,346,2462,
-16,0,568,1,2075,
-2463,16,0,568,1,
-373,1437,1,387,2464,
-16,0,289,1,137,
-2465,16,0,568,1,
-143,2466,16,0,289,
-1,1901,2467,16,0,
-568,1,1048,1372,1,
-1153,2468,16,0,568,
-1,375,1404,1,151,
-2469,16,0,568,1,
-1407,2470,16,0,568,
-1,1659,2471,16,0,
-568,1,2413,2472,16,
-0,568,1,1159,2473,
-16,0,289,1,381,
-2474,16,0,568,1,
-157,2475,16,0,289,
-1,1413,2476,16,0,
-289,1,883,2477,16,
-0,289,1,1371,2478,
-16,0,568,1,328,
-1330,1,2105,843,1,
-2106,2479,16,0,568,
-1,166,2480,16,0,
-568,1,525,2481,16,
-0,568,1,1622,2482,
-16,0,568,1,406,
-2483,16,0,568,1,
-1574,828,1,172,1496,
-1,1931,889,1,412,
-2484,16,0,289,1,
-1933,2485,16,0,568,
-1,1876,2486,16,0,
-568,1,431,2487,16,
-0,568,1,1585,2488,
-16,0,568,1,182,
-2489,16,0,568,1,
-1628,2490,16,0,289,
-1,1189,2491,16,0,
-568,1,437,2492,16,
-0,289,1,1591,2493,
+181,1,3,1,2,
+1,1,2132,22,1,
+31,1,18,2133,19,
+528,1,18,2134,5,
+84,1,1011,1148,1,
+1012,2135,16,0,526,
+1,1013,1304,1,262,
+1165,1,1267,2136,16,
+0,526,1,515,2137,
+16,0,526,1,1521,
+2138,16,0,526,1,
+525,1262,1,283,1218,
+1,2299,2139,16,0,
+526,1,42,2140,16,
+0,526,1,40,1223,
+1,44,1229,1,47,
+1230,1,1303,2141,16,
+0,526,1,1555,2142,
+16,0,526,1,50,
+1247,1,48,1236,1,
+49,1242,1,51,1252,
+1,63,1268,1,305,
+1257,1,66,1274,1,
+67,1279,1,68,1284,
+1,69,1289,1,70,
+1294,1,73,2143,16,
+0,526,1,74,1299,
+1,328,1348,1,1048,
+2144,16,0,526,1,
+82,2145,16,0,526,
+1,1840,2146,16,0,
+526,1,1591,2147,16,
+0,526,1,1341,2148,
+16,0,526,1,1096,
+1358,1,93,1364,1,
+352,1391,1,107,2149,
+16,0,526,1,1114,
+1389,1,118,2150,16,
+0,526,1,1123,2151,
+16,0,526,1,371,
+1407,1,1628,2152,16,
+0,526,1,375,1418,
+1,1882,2153,16,0,
+526,1,377,1423,1,
+379,1428,1,380,1433,
+1,883,2154,16,0,
+526,1,373,1451,1,
+130,2155,16,0,526,
+1,143,2156,16,0,
+526,1,387,2157,16,
+0,526,1,1159,2158,
+16,0,526,1,157,
+2159,16,0,526,1,
+1413,2160,16,0,526,
+1,1665,2161,16,0,
+526,1,412,2162,16,
+0,526,1,1377,2163,
+16,0,526,1,172,
+2164,16,0,526,1,
+1939,2165,16,0,526,
+1,437,2166,16,0,
+526,1,188,2167,16,
+0,526,1,942,2168,
+16,0,526,1,1195,
+2169,16,0,526,1,
+1449,2170,16,0,526,
+1,1701,2171,16,0,
+526,1,447,1557,1,
+2708,2172,16,0,526,
+1,205,2173,16,0,
+526,1,827,2174,16,
+0,526,1,223,2175,
+16,0,526,1,476,
+1590,1,477,1596,1,
+1231,2176,16,0,526,
+1,479,1606,1,480,
+1611,1,1485,2177,16,
+0,526,1,1737,2178,
+16,0,526,1,242,
+2179,16,0,526,1,
+478,1629,1,1001,1634,
+1,1002,1639,1,19,
+2180,19,228,1,19,
+2181,5,176,1,256,
+2182,16,0,226,1,
+1261,2183,16,0,226,
+1,1011,1148,1,1012,
+2184,16,0,500,1,
+2458,922,1,262,1165,
+1,1267,2185,16,0,
+500,1,2021,764,1,
+1521,2186,16,0,500,
+1,1775,2187,16,0,
+226,1,2029,771,1,
+2030,777,1,2031,782,
+1,2032,787,1,2033,
+792,1,277,2188,16,
+0,226,1,2035,798,
+1,2037,803,1,2039,
+808,1,32,2189,16,
+0,226,1,2464,945,
+1,2293,2190,16,0,
+226,1,2043,820,1,
+2045,825,1,2299,2191,
+16,0,500,1,41,
+2192,16,0,226,1,
+42,2193,16,0,500,
+1,40,1223,1,44,
+1229,1,43,2194,16,
+0,226,1,1804,2195,
+16,0,226,1,48,
+1236,1,49,1242,1,
+47,1230,1,51,1252,
+1,52,2196,16,0,
+226,1,50,1247,1,
+305,1257,1,1096,1358,
+1,1515,2197,16,0,
+226,1,2318,2198,16,
+0,226,1,283,1218,
+1,63,1268,1,66,
+1274,1,67,1279,1,
+68,1284,1,69,1289,
+1,70,1294,1,71,
+2199,16,0,226,1,
+73,2200,16,0,500,
+1,74,1299,1,1013,
+1304,1,76,2201,16,
+0,226,1,1834,2202,
+16,0,226,1,2337,
+2203,16,0,226,1,
+79,2204,16,0,226,
+1,1335,2205,16,0,
+226,1,299,2206,16,
+0,226,1,82,2207,
+16,0,500,1,1840,
+2208,16,0,500,1,
+1297,2209,16,0,226,
+1,85,2210,16,0,
+226,1,1341,2211,16,
+0,500,1,89,2212,
+16,0,226,1,1303,
+2213,16,0,500,1,
+509,2214,16,0,226,
+1,93,1364,1,322,
+2215,16,0,226,1,
+97,2216,16,0,226,
+1,2041,814,1,1555,
+2217,16,0,500,1,
+827,2218,16,0,500,
+1,102,2219,16,0,
+226,1,1860,867,1,
+1803,833,1,2364,873,
+1,107,2220,16,0,
+500,1,1114,1389,1,
+112,2221,16,0,226,
+1,1117,2222,16,0,
+226,1,352,1391,1,
+1873,881,1,118,2223,
+16,0,500,1,1123,
+2224,16,0,500,1,
+371,1407,1,515,2225,
+16,0,500,1,1377,
+2226,16,0,500,1,
+124,2227,16,0,226,
+1,1882,2228,16,0,
+500,1,377,1423,1,
+379,1428,1,380,1433,
+1,130,2229,16,0,
+500,1,346,2230,16,
+0,226,1,2075,2231,
+16,0,226,1,373,
+1451,1,387,2232,16,
+0,500,1,137,2233,
+16,0,226,1,143,
+2234,16,0,500,1,
+1901,2235,16,0,226,
+1,1048,2236,16,0,
+500,1,1153,2237,16,
+0,226,1,375,1418,
+1,151,2238,16,0,
+226,1,1407,2239,16,
+0,226,1,1659,2240,
+16,0,226,1,2413,
+2241,16,0,226,1,
+1159,2242,16,0,500,
+1,381,2243,16,0,
+226,1,157,2244,16,
+0,500,1,1413,2245,
+16,0,500,1,883,
+2246,16,0,500,1,
+1371,2247,16,0,226,
+1,328,1348,1,2105,
+860,1,2106,2248,16,
+0,226,1,166,2249,
+16,0,226,1,525,
+2250,16,0,226,1,
+1622,2251,16,0,226,
+1,406,2252,16,0,
+226,1,1574,845,1,
+172,2253,16,0,500,
+1,1931,906,1,412,
+2254,16,0,500,1,
+1933,2255,16,0,226,
+1,1876,2256,16,0,
+226,1,431,2257,16,
+0,226,1,1585,2258,
+16,0,226,1,182,
+2259,16,0,226,1,
+1628,2260,16,0,500,
+1,1189,2261,16,0,
+226,1,437,2262,16,
+0,500,1,1591,2263,
+16,0,500,1,188,
+2264,16,0,500,1,
+1695,2265,16,0,226,
+1,2198,2266,16,0,
+226,1,1195,2267,16,
+0,500,1,2702,2268,
+16,0,226,1,1449,
+2269,16,0,500,1,
+1701,2270,16,0,500,
+1,447,2271,16,0,
+226,1,2708,2272,16,
+0,500,1,199,2273,
+16,0,226,1,2459,
+928,1,1958,2274,16,
+0,226,1,2462,935,
+1,1657,940,1,205,
+2275,16,0,500,1,
+459,2276,16,0,226,
+1,462,2277,16,0,
+226,1,1665,2278,16,
+0,500,1,217,2279,
+16,0,226,1,2227,
+954,1,942,2280,16,
+0,500,1,1225,2281,
+16,0,226,1,223,
+2282,16,0,500,1,
+1479,2283,16,0,226,
+1,1731,2284,16,0,
+226,1,477,1596,1,
+1231,2285,16,0,500,
+1,479,1606,1,480,
+1611,1,1485,2286,16,
+0,500,1,1737,2287,
+16,0,500,1,1989,
+962,1,1990,2288,16,
+0,226,1,1443,2289,
+16,0,226,1,236,
+2290,16,0,226,1,
+2136,888,1,476,1590,
+1,242,2291,16,0,
+500,1,478,1629,1,
+1939,2292,16,0,500,
+1,1001,1634,1,1002,
+1639,1,1756,2293,16,
+0,226,1,20,2294,
+19,480,1,20,2295,
+5,84,1,1011,1148,
+1,1012,2296,16,0,
+478,1,1013,1304,1,
+262,1165,1,1267,2297,
+16,0,478,1,515,
+2298,16,0,478,1,
+1521,2299,16,0,478,
+1,525,1262,1,283,
+1218,1,2299,2300,16,
+0,478,1,42,2301,
+16,0,478,1,40,
+1223,1,44,1229,1,
+47,1230,1,1303,2302,
+16,0,478,1,1555,
+2303,16,0,478,1,
+50,1247,1,48,1236,
+1,49,1242,1,51,
+1252,1,63,1268,1,
+305,1257,1,66,1274,
+1,67,1279,1,68,
+1284,1,69,1289,1,
+70,1294,1,73,2304,
+16,0,478,1,74,
+1299,1,328,2305,16,
+0,478,1,1048,2306,
+16,0,478,1,82,
+2307,16,0,478,1,
+1840,2308,16,0,478,
+1,1591,2309,16,0,
+478,1,1341,2310,16,
+0,478,1,1096,1358,
+1,93,1364,1,352,
+2311,16,0,478,1,
+107,2312,16,0,478,
+1,1114,1389,1,118,
+2313,16,0,478,1,
+1123,2314,16,0,478,
+1,371,1407,1,1628,
+2315,16,0,478,1,
+375,1418,1,1882,2316,
+16,0,478,1,377,
+1423,1,379,1428,1,
+380,1433,1,883,2317,
+16,0,478,1,373,
+1451,1,130,2318,16,
+0,478,1,143,2319,
+16,0,478,1,387,
+2320,16,0,478,1,
+1159,2321,16,0,478,
+1,157,2322,16,0,
+478,1,1413,2323,16,
+0,478,1,1665,2324,
+16,0,478,1,412,
+2325,16,0,478,1,
+1377,2326,16,0,478,
+1,172,2327,16,0,
+478,1,1939,2328,16,
+0,478,1,437,2329,
+16,0,478,1,188,
+2330,16,0,478,1,
+942,2331,16,0,478,
+1,1195,2332,16,0,
+478,1,1449,2333,16,
+0,478,1,1701,2334,
+16,0,478,1,447,
+1557,1,2708,2335,16,
+0,478,1,205,2336,
+16,0,478,1,827,
+2337,16,0,478,1,
+223,2338,16,0,478,
+1,476,1590,1,477,
+1596,1,1231,2339,16,
+0,478,1,479,1606,
+1,480,1611,1,1485,
+2340,16,0,478,1,
+1737,2341,16,0,478,
+1,242,2342,16,0,
+478,1,478,1629,1,
+1001,1634,1,1002,1639,
+1,21,2343,19,446,
+1,21,2344,5,84,
+1,1011,1148,1,1012,
+2345,16,0,444,1,
+1013,1304,1,262,1165,
+1,1267,2346,16,0,
+444,1,515,2347,16,
+0,444,1,1521,2348,
+16,0,444,1,525,
+1262,1,283,1218,1,
+2299,2349,16,0,444,
+1,42,2350,16,0,
+444,1,40,1223,1,
+44,1229,1,47,1230,
+1,1303,2351,16,0,
+444,1,1555,2352,16,
+0,444,1,50,1247,
+1,48,1236,1,49,
+1242,1,51,1252,1,
+63,1268,1,305,1257,
+1,66,1274,1,67,
+1279,1,68,1284,1,
+69,1289,1,70,1294,
+1,73,2353,16,0,
+444,1,74,1299,1,
+328,2354,16,0,444,
+1,1048,2355,16,0,
+444,1,82,2356,16,
+0,444,1,1840,2357,
+16,0,444,1,1591,
+2358,16,0,444,1,
+1341,2359,16,0,444,
+1,1096,1358,1,93,
+1364,1,352,2360,16,
+0,444,1,107,2361,
+16,0,444,1,1114,
+1389,1,118,2362,16,
+0,444,1,1123,2363,
+16,0,444,1,371,
+1407,1,1628,2364,16,
+0,444,1,375,1418,
+1,1882,2365,16,0,
+444,1,377,1423,1,
+379,1428,1,380,1433,
+1,883,2366,16,0,
+444,1,373,1451,1,
+130,2367,16,0,444,
+1,143,2368,16,0,
+444,1,387,2369,16,
+0,444,1,1159,2370,
+16,0,444,1,157,
+2371,16,0,444,1,
+1413,2372,16,0,444,
+1,1665,2373,16,0,
+444,1,412,2374,16,
+0,444,1,1377,2375,
+16,0,444,1,172,
+2376,16,0,444,1,
+1939,2377,16,0,444,
+1,437,2378,16,0,
+444,1,188,2379,16,
+0,444,1,942,2380,
+16,0,444,1,1195,
+2381,16,0,444,1,
+1449,2382,16,0,444,
+1,1701,2383,16,0,
+444,1,447,1557,1,
+2708,2384,16,0,444,
+1,205,2385,16,0,
+444,1,827,2386,16,
+0,444,1,223,2387,
+16,0,444,1,476,
+1590,1,477,1596,1,
+1231,2388,16,0,444,
+1,479,1606,1,480,
+1611,1,1485,2389,16,
+0,444,1,1737,2390,
+16,0,444,1,242,
+2391,16,0,444,1,
+478,1629,1,1001,1634,
+1,1002,1639,1,22,
+2392,19,397,1,22,
+2393,5,84,1,1011,
+1148,1,1012,2394,16,
+0,395,1,1013,1304,
+1,262,1165,1,1267,
+2395,16,0,395,1,
+515,2396,16,0,395,
+1,1521,2397,16,0,
+395,1,525,1262,1,
+283,1218,1,2299,2398,
+16,0,395,1,42,
+2399,16,0,395,1,
+40,1223,1,44,1229,
+1,47,1230,1,1303,
+2400,16,0,395,1,
+1555,2401,16,0,395,
+1,50,1247,1,48,
+1236,1,49,1242,1,
+51,1252,1,63,1268,
+1,305,1257,1,66,
+1274,1,67,1279,1,
+68,1284,1,69,1289,
+1,70,1294,1,73,
+2402,16,0,395,1,
+74,1299,1,328,2403,
+16,0,395,1,1048,
+2404,16,0,395,1,
+82,2405,16,0,395,
+1,1840,2406,16,0,
+395,1,1591,2407,16,
+0,395,1,1341,2408,
+16,0,395,1,1096,
+1358,1,93,1364,1,
+352,2409,16,0,395,
+1,107,2410,16,0,
+395,1,1114,1389,1,
+118,2411,16,0,395,
+1,1123,2412,16,0,
+395,1,371,1407,1,
+1628,2413,16,0,395,
+1,375,1418,1,1882,
+2414,16,0,395,1,
+377,1423,1,379,1428,
+1,380,1433,1,883,
+2415,16,0,395,1,
+373,1451,1,130,2416,
+16,0,395,1,143,
+2417,16,0,395,1,
+387,2418,16,0,395,
+1,1159,2419,16,0,
+395,1,157,2420,16,
+0,395,1,1413,2421,
+16,0,395,1,1665,
+2422,16,0,395,1,
+412,2423,16,0,395,
+1,1377,2424,16,0,
+395,1,172,2425,16,
+0,395,1,1939,2426,
+16,0,395,1,437,
+2427,16,0,395,1,
+188,2428,16,0,395,
+1,942,2429,16,0,
+395,1,1195,2430,16,
+0,395,1,1449,2431,
+16,0,395,1,1701,
+2432,16,0,395,1,
+447,1557,1,2708,2433,
+16,0,395,1,205,
+2434,16,0,395,1,
+827,2435,16,0,395,
+1,223,2436,16,0,
+395,1,476,1590,1,
+477,1596,1,1231,2437,
+16,0,395,1,479,
+1606,1,480,1611,1,
+1485,2438,16,0,395,
+1,1737,2439,16,0,
+395,1,242,2440,16,
+0,395,1,478,1629,
+1,1001,1634,1,1002,
+1639,1,23,2441,19,
+542,1,23,2442,5,
+38,1,1901,2443,16,
+0,540,1,2075,2444,
+16,0,540,1,1860,
+867,1,1803,833,1,
+1804,2445,16,0,540,
+1,2413,2446,16,0,
+540,1,2198,2447,16,
+0,540,1,1873,881,
+1,1657,940,1,1989,
+962,1,1990,2448,16,
+0,540,1,1775,2449,
+16,0,540,1,32,
+2450,16,0,540,1,
+2105,860,1,2106,2451,
+16,0,540,1,2364,
+873,1,2227,954,1,
+2337,2452,16,0,540,
+1,2021,764,1,2458,
+922,1,2459,928,1,
+2462,935,1,2136,888,
+1,2464,945,1,2029,
+771,1,2030,777,1,
+2031,782,1,2032,787,
+1,2033,792,1,2035,
+798,1,2037,803,1,
+2039,808,1,1931,906,
+1,2041,814,1,2043,
+820,1,2045,825,1,
+1574,845,1,1958,2453,
+16,0,540,1,24,
+2454,19,177,1,24,
+2455,5,5,1,44,
+2456,16,0,175,1,
+377,2457,16,0,578,
+1,40,2458,16,0,
+720,1,63,2459,16,
+0,196,1,373,2460,
+16,0,574,1,25,
+2461,19,302,1,25,
+2462,5,177,1,256,
+2463,16,0,583,1,
+1261,2464,16,0,583,
+1,1011,1148,1,1012,
+2465,16,0,300,1,
+2458,922,1,262,1165,
+1,1267,2466,16,0,
+300,1,2021,764,1,
+1521,2467,16,0,300,
+1,1775,2468,16,0,
+583,1,2029,771,1,
+2030,777,1,2031,782,
+1,2032,787,1,2033,
+792,1,277,2469,16,
+0,583,1,2035,798,
+1,2037,803,1,2039,
+808,1,32,2470,16,
+0,583,1,2464,945,
+1,2293,2471,16,0,
+583,1,2043,820,1,
+2045,825,1,2299,2472,
+16,0,300,1,41,
+2473,16,0,583,1,
+42,2474,16,0,300,
+1,40,1223,1,44,
+1229,1,43,2475,16,
+0,583,1,1804,2476,
+16,0,583,1,48,
+1236,1,49,1242,1,
+47,1230,1,51,1252,
+1,52,2477,16,0,
+583,1,50,1247,1,
+305,1257,1,1096,1358,
+1,1515,2478,16,0,
+583,1,2318,2479,16,
+0,583,1,62,2480,
+16,0,583,1,63,
+1268,1,66,1274,1,
+67,1279,1,68,1284,
+1,69,1289,1,70,
+1294,1,71,2481,16,
+0,583,1,283,1218,
+1,73,2482,16,0,
+300,1,74,1299,1,
+1013,1304,1,76,2483,
+16,0,583,1,1834,
+2484,16,0,583,1,
+2337,2485,16,0,583,
+1,79,2486,16,0,
+583,1,1335,2487,16,
+0,583,1,299,2488,
+16,0,583,1,82,
+2489,16,0,300,1,
+1840,2490,16,0,300,
+1,1297,2491,16,0,
+583,1,85,2492,16,
+0,583,1,1341,2493,
+16,0,300,1,89,
+2494,16,0,583,1,
+1303,2495,16,0,300,
+1,509,2496,16,0,
+583,1,93,1364,1,
+322,2497,16,0,583,
+1,97,2498,16,0,
+583,1,2041,814,1,
+1555,2499,16,0,300,
+1,827,2500,16,0,
+300,1,102,2501,16,
+0,583,1,1860,867,
+1,1803,833,1,2364,
+873,1,107,2502,16,
+0,300,1,1114,1389,
+1,112,2503,16,0,
+583,1,1117,2504,16,
+0,583,1,352,1391,
+1,1873,881,1,118,
+1397,1,1123,2505,16,
+0,300,1,371,1407,
+1,515,2506,16,0,
+300,1,1377,2507,16,
+0,300,1,124,2508,
+16,0,583,1,1882,
+2509,16,0,300,1,
+377,1423,1,379,1428,
+1,380,1433,1,130,
+1456,1,346,2510,16,
+0,583,1,2075,2511,
+16,0,583,1,373,
+1451,1,387,2512,16,
+0,300,1,137,2513,
+16,0,583,1,143,
+2514,16,0,300,1,
+1901,2515,16,0,583,
+1,1048,1467,1,1153,
+2516,16,0,583,1,
+375,1418,1,151,2517,
+16,0,583,1,1407,
+2518,16,0,583,1,
+1659,2519,16,0,583,
+1,2413,2520,16,0,
+583,1,1159,2521,16,
+0,300,1,381,2522,
+16,0,583,1,157,
+2523,16,0,300,1,
+1413,2524,16,0,300,
+1,883,2525,16,0,
+300,1,1371,2526,16,
+0,583,1,328,1348,
+1,2105,860,1,2106,
+2527,16,0,583,1,
+166,2528,16,0,583,
+1,525,2529,16,0,
+583,1,1622,2530,16,
+0,583,1,406,2531,
+16,0,583,1,1574,
+845,1,172,1515,1,
+1931,906,1,412,2532,
+16,0,300,1,1933,
+2533,16,0,583,1,
+1876,2534,16,0,583,
+1,431,2535,16,0,
+583,1,1585,2536,16,
+0,583,1,182,2537,
+16,0,583,1,1628,
+2538,16,0,300,1,
+1189,2539,16,0,583,
+1,437,2540,16,0,
+300,1,1591,2541,16,
+0,300,1,188,1565,
+1,1695,2542,16,0,
+583,1,2198,2543,16,
+0,583,1,1195,2544,
+16,0,300,1,2702,
+2545,16,0,583,1,
+1449,2546,16,0,300,
+1,1701,2547,16,0,
+300,1,447,2548,16,
+0,583,1,2708,2549,
+16,0,300,1,199,
+2550,16,0,583,1,
+2459,928,1,1958,2551,
+16,0,583,1,2462,
+935,1,1657,940,1,
+205,2552,16,0,300,
+1,459,2553,16,0,
+583,1,462,2554,16,
+0,583,1,1665,2555,
+16,0,300,1,217,
+2556,16,0,583,1,
+2227,954,1,942,1536,
+1,1225,2557,16,0,
+583,1,223,2558,16,
+0,300,1,1479,2559,
+16,0,583,1,1731,
+2560,16,0,583,1,
+477,1596,1,1231,2561,
+16,0,300,1,479,
+1606,1,480,1611,1,
+1485,2562,16,0,300,
+1,1737,2563,16,0,
+300,1,1989,962,1,
+1990,2564,16,0,583,
+1,1443,2565,16,0,
+583,1,236,2566,16,
+0,583,1,2136,888,
+1,476,1590,1,242,
+2567,16,0,300,1,
+478,1629,1,1939,2568,
+16,0,300,1,1001,
+1634,1,1002,1639,1,
+1756,2569,16,0,583,
+1,26,2570,19,318,
+1,26,2571,5,84,
+1,1011,1148,1,1012,
+2572,16,0,316,1,
+1013,1304,1,262,1165,
+1,1267,2573,16,0,
+316,1,515,2574,16,
+0,695,1,1521,2575,
+16,0,316,1,525,
+1262,1,283,1218,1,
+2299,2576,16,0,316,
+1,42,2577,16,0,
+316,1,40,1223,1,
+44,1229,1,47,1230,
+1,1303,2578,16,0,
+316,1,1555,2579,16,
+0,316,1,50,1247,
+1,48,1236,1,49,
+1242,1,51,1252,1,
+63,1268,1,305,1257,
+1,66,1274,1,67,
+1279,1,68,1284,1,
+69,1289,1,70,1294,
+1,73,2580,16,0,
+316,1,74,1299,1,
+328,1348,1,1048,1467,
+1,82,2581,16,0,
+316,1,1840,2582,16,
+0,316,1,1591,2583,
+16,0,316,1,1341,
+2584,16,0,316,1,
+1096,1358,1,93,1364,
+1,352,1391,1,107,
+2585,16,0,316,1,
+1114,1389,1,118,1397,
+1,1123,2586,16,0,
+316,1,371,1407,1,
+1628,2587,16,0,316,
+1,375,1418,1,1882,
+2588,16,0,316,1,
+377,1423,1,379,1428,
+1,380,1433,1,883,
+2589,16,0,316,1,
+373,1451,1,130,1456,
+1,143,2590,16,0,
+316,1,387,2591,16,
+0,316,1,1159,2592,
+16,0,316,1,157,
+2593,16,0,316,1,
+1413,2594,16,0,316,
+1,1665,2595,16,0,
+316,1,412,2596,16,
+0,316,1,1377,2597,
+16,0,316,1,172,
+1515,1,1939,2598,16,
+0,316,1,437,2599,
+16,0,624,1,188,
+1565,1,942,1536,1,
+1195,2600,16,0,316,
+1,1449,2601,16,0,
+316,1,1701,2602,16,
+0,316,1,447,1557,
+1,2708,2603,16,0,
+316,1,205,2604,16,
+0,316,1,827,2605,
+16,0,316,1,223,
+2606,16,0,316,1,
+476,1590,1,477,1596,
+1,1231,2607,16,0,
+316,1,479,1606,1,
+480,1611,1,1485,2608,
+16,0,316,1,1737,
+2609,16,0,316,1,
+242,2610,16,0,316,
+1,478,1629,1,1001,
+1634,1,1002,1639,1,
+27,2611,19,635,1,
+27,2612,5,95,1,
+256,2613,16,0,633,
+1,1261,2614,16,0,
+633,1,509,2615,16,
+0,633,1,1515,2616,
+16,0,633,1,2021,
+764,1,1775,2617,16,
+0,633,1,2029,771,
+1,2030,777,1,2031,
+782,1,2032,787,1,
+2033,792,1,277,2618,
+16,0,633,1,2035,
+798,1,2037,803,1,
+2039,808,1,32,2619,
+16,0,633,1,2041,
+814,1,2293,2620,16,
+0,633,1,2043,820,
+1,2045,825,1,41,
+2621,16,0,633,1,
+1297,2622,16,0,633,
+1,43,2623,16,0,
+633,1,1803,833,1,
+1804,2624,16,0,633,
+1,299,2625,16,0,
+633,1,52,2626,16,
+0,633,1,2318,2627,
+16,0,633,1,62,
+2628,16,0,633,1,
+2075,2629,16,0,633,
+1,1574,845,1,71,
+2630,16,0,633,1,
+76,2631,16,0,633,
+1,1834,2632,16,0,
+633,1,2337,2633,16,
+0,633,1,79,2634,
+16,0,633,1,1335,
+2635,16,0,633,1,
+322,2636,16,0,633,
+1,85,2637,16,0,
+633,1,89,2638,16,
+0,633,1,346,2639,
+16,0,633,1,2105,
+860,1,2106,2640,16,
+0,633,1,97,2641,
+16,0,633,1,1860,
+867,1,2364,873,1,
+102,2642,16,0,633,
+1,112,2643,16,0,
+633,1,1117,2644,16,
+0,633,1,1873,881,
+1,1876,2645,16,0,
+633,1,124,2646,16,
+0,633,1,2136,888,
+1,381,2647,16,0,
+633,1,525,2648,16,
+0,633,1,137,2649,
+16,0,633,1,1901,
+2650,16,0,633,1,
+1153,2651,16,0,633,
+1,151,2652,16,0,
+633,1,1407,2653,16,
+0,633,1,1659,2654,
+16,0,633,1,2413,
+2655,16,0,633,1,
+406,2656,16,0,633,
+1,1371,2657,16,0,
+633,1,166,2658,16,
+0,633,1,1622,2659,
+16,0,633,1,1931,
+906,1,1933,2660,16,
+0,633,1,431,2661,
+16,0,633,1,1585,
+2662,16,0,633,1,
+182,2663,16,0,633,
+1,1189,2664,16,0,
+633,1,1443,2665,16,
+0,633,1,1695,2666,
+16,0,633,1,2198,
+2667,16,0,633,1,
+2702,2668,16,0,633,
+1,447,2669,16,0,
+633,1,2458,922,1,
+2459,928,1,1958,2670,
+16,0,633,1,2462,
+935,1,1657,940,1,
+2464,945,1,199,2671,
+16,0,633,1,459,
+2672,16,0,633,1,
+462,2673,16,0,633,
+1,217,2674,16,0,
+633,1,2227,954,1,
+1225,2675,16,0,633,
+1,1479,2676,16,0,
+633,1,1731,2677,16,
+0,633,1,1989,962,
+1,1990,2678,16,0,
+633,1,236,2679,16,
+0,633,1,1756,2680,
+16,0,633,1,28,
+2681,19,666,1,28,
+2682,5,60,1,328,
+1348,1,223,1580,1,
+1096,1358,1,118,1397,
+1,883,1439,1,525,
+1262,1,1001,1634,1,
+130,1456,1,459,1782,
+1,1114,1389,1,352,
+1391,1,447,1557,1,
+464,1777,1,1011,1148,
+1,1013,1304,1,242,
+1624,1,143,1461,1,
+40,1223,1,41,1750,
+1,42,1754,1,479,
+1606,1,44,1229,1,
+481,1784,1,373,1451,
+1,47,1230,1,157,
+1489,1,49,1242,1,
+50,1247,1,48,1236,
+1,379,1428,1,380,
+1433,1,51,1252,1,
+476,1590,1,371,1407,
+1,478,1629,1,1048,
+1467,1,375,1418,1,
+172,1515,1,262,1165,
+1,283,1218,1,63,
+1268,1,67,1279,1,
+68,1284,1,69,1289,
+1,66,1274,1,461,
+2683,16,0,664,1,
+74,1299,1,377,1423,
+1,1002,1639,1,70,
+1294,1,188,1565,1,
+82,1326,1,305,1257,
+1,477,1596,1,827,
+1377,1,93,1364,1,
+480,1611,1,205,1570,
+1,942,1536,1,107,
+1384,1,29,2684,19,
+291,1,29,2685,5,
+84,1,1011,1148,1,
+1012,2686,16,0,289,
+1,1013,1304,1,262,
+1165,1,1267,2687,16,
+0,289,1,515,2688,
+16,0,289,1,1521,
+2689,16,0,289,1,
+525,1262,1,283,1218,
+1,2299,2690,16,0,
+289,1,42,2691,16,
+0,289,1,40,1223,
+1,44,1229,1,47,
+1230,1,1303,2692,16,
+0,289,1,1555,2693,
+16,0,289,1,50,
+1247,1,48,1236,1,
+49,1242,1,51,1252,
+1,63,1268,1,305,
+1257,1,66,1274,1,
+67,1279,1,68,1284,
+1,69,1289,1,70,
+1294,1,73,2694,16,
+0,289,1,74,1299,
+1,328,1348,1,1048,
+1467,1,82,2695,16,
+0,289,1,1840,2696,
+16,0,289,1,1591,
+2697,16,0,289,1,
+1341,2698,16,0,289,
+1,1096,1358,1,93,
+1364,1,352,1391,1,
+107,2699,16,0,289,
+1,1114,1389,1,118,
+1397,1,1123,2700,16,
+0,289,1,371,1407,
+1,1628,2701,16,0,
+289,1,375,1418,1,
+1882,2702,16,0,289,
+1,377,1423,1,379,
+1428,1,380,1433,1,
+883,2703,16,0,289,
+1,373,1451,1,130,
+1456,1,143,1461,1,
+387,2704,16,0,289,
+1,1159,2705,16,0,
+289,1,157,1489,1,
+1413,2706,16,0,289,
+1,1665,2707,16,0,
+289,1,412,2708,16,
+0,289,1,1377,2709,
+16,0,289,1,172,
+1515,1,1939,2710,16,
+0,289,1,437,2711,
 16,0,289,1,188,
-1547,1,1695,2494,16,
-0,568,1,2198,2495,
-16,0,568,1,1195,
-2496,16,0,289,1,
-1449,2497,16,0,289,
-1,1701,2498,16,0,
-289,1,447,2499,16,
-0,568,1,199,2500,
-16,0,568,1,2459,
-910,1,1958,2501,16,
-0,568,1,2462,917,
-1,1657,922,1,205,
-2502,16,0,289,1,
-459,2503,16,0,568,
-1,462,2504,16,0,
-568,1,1665,2505,16,
-0,289,1,217,2506,
-16,0,568,1,2227,
-936,1,942,1519,1,
-1225,2507,16,0,568,
-1,223,2508,16,0,
-289,1,1479,2509,16,
-0,568,1,1731,2510,
-16,0,568,1,477,
-1578,1,1231,2511,16,
-0,289,1,479,1588,
-1,480,1593,1,1485,
-2512,16,0,289,1,
-1737,2513,16,0,289,
-1,1989,944,1,1990,
-2514,16,0,568,1,
-1443,2515,16,0,568,
-1,236,2516,16,0,
-568,1,2136,871,1,
-476,1572,1,242,2517,
-16,0,289,1,478,
-1611,1,1939,2518,16,
-0,289,1,1001,1616,
-1,1002,1621,1,1756,
-2519,16,0,568,1,
-26,2520,19,307,1,
-26,2521,5,84,1,
-1011,1130,1,1012,2522,
-16,0,305,1,1013,
-1286,1,262,1147,1,
-1267,2523,16,0,305,
-1,515,2524,16,0,
-687,1,1521,2525,16,
-0,305,1,2692,2526,
-16,0,305,1,525,
-1244,1,283,1200,1,
-2299,2527,16,0,305,
-1,42,2528,16,0,
-305,1,40,1205,1,
-44,1211,1,47,1212,
-1,1303,2529,16,0,
-305,1,1555,2530,16,
-0,305,1,50,1229,
-1,48,1218,1,49,
-1224,1,51,1234,1,
-63,1250,1,305,1239,
-1,66,1256,1,67,
-1261,1,68,1266,1,
-69,1271,1,70,1276,
-1,73,2531,16,0,
-305,1,74,1281,1,
-328,1330,1,1048,1372,
-1,82,2532,16,0,
-305,1,1840,2533,16,
-0,305,1,1591,2534,
-16,0,305,1,1341,
-2535,16,0,305,1,
-1096,1340,1,93,1346,
-1,352,1377,1,107,
-2536,16,0,305,1,
-1114,1371,1,118,1383,
-1,1123,2537,16,0,
-305,1,371,1393,1,
-1628,2538,16,0,305,
-1,375,1404,1,1882,
-2539,16,0,305,1,
-377,1409,1,379,1414,
-1,380,1419,1,883,
-2540,16,0,305,1,
-373,1437,1,130,1442,
-1,143,2541,16,0,
-305,1,387,2542,16,
-0,305,1,1159,2543,
-16,0,305,1,157,
-2544,16,0,305,1,
-1413,2545,16,0,305,
-1,1665,2546,16,0,
-305,1,412,2547,16,
-0,305,1,1377,2548,
-16,0,305,1,172,
-1496,1,1939,2549,16,
-0,305,1,437,2550,
-16,0,617,1,188,
-1547,1,942,1519,1,
-1195,2551,16,0,305,
-1,1449,2552,16,0,
-305,1,1701,2553,16,
-0,305,1,447,1540,
-1,205,2554,16,0,
-305,1,827,2555,16,
-0,305,1,223,2556,
-16,0,305,1,476,
-1572,1,477,1578,1,
-1231,2557,16,0,305,
-1,479,1588,1,480,
-1593,1,1485,2558,16,
-0,305,1,1737,2559,
-16,0,305,1,242,
-2560,16,0,305,1,
-478,1611,1,1001,1616,
-1,1002,1621,1,27,
-2561,19,628,1,27,
-2562,5,95,1,256,
-2563,16,0,626,1,
-1261,2564,16,0,626,
-1,509,2565,16,0,
-626,1,1515,2566,16,
-0,626,1,2686,2567,
-16,0,626,1,2021,
-747,1,1775,2568,16,
-0,626,1,2029,754,
-1,2030,760,1,2031,
-765,1,2032,770,1,
-2033,775,1,277,2569,
-16,0,626,1,2035,
-781,1,2037,786,1,
-2039,791,1,32,2570,
-16,0,626,1,2041,
-797,1,2293,2571,16,
-0,626,1,2043,803,
-1,2045,808,1,41,
-2572,16,0,626,1,
-1297,2573,16,0,626,
-1,43,2574,16,0,
-626,1,1803,816,1,
-1804,2575,16,0,626,
-1,299,2576,16,0,
-626,1,52,2577,16,
-0,626,1,2318,2578,
-16,0,626,1,62,
-2579,16,0,626,1,
-2075,2580,16,0,626,
-1,1574,828,1,71,
-2581,16,0,626,1,
-76,2582,16,0,626,
-1,1834,2583,16,0,
-626,1,2337,2584,16,
-0,626,1,79,2585,
-16,0,626,1,1335,
-2586,16,0,626,1,
-322,2587,16,0,626,
-1,85,2588,16,0,
-626,1,89,2589,16,
-0,626,1,346,2590,
-16,0,626,1,2105,
-843,1,2106,2591,16,
-0,626,1,97,2592,
-16,0,626,1,1860,
-850,1,2364,856,1,
-102,2593,16,0,626,
-1,112,2594,16,0,
-626,1,1117,2595,16,
-0,626,1,1873,864,
-1,1876,2596,16,0,
-626,1,124,2597,16,
-0,626,1,2136,871,
-1,381,2598,16,0,
-626,1,525,2599,16,
-0,626,1,137,2600,
-16,0,626,1,1901,
-2601,16,0,626,1,
-1153,2602,16,0,626,
-1,151,2603,16,0,
-626,1,1407,2604,16,
-0,626,1,1659,2605,
-16,0,626,1,2413,
-2606,16,0,626,1,
-406,2607,16,0,626,
-1,1371,2608,16,0,
-626,1,166,2609,16,
-0,626,1,1622,2610,
-16,0,626,1,1931,
-889,1,1933,2611,16,
-0,626,1,431,2612,
-16,0,626,1,1585,
-2613,16,0,626,1,
-182,2614,16,0,626,
-1,1189,2615,16,0,
-626,1,1443,2616,16,
-0,626,1,1695,2617,
-16,0,626,1,2198,
-2618,16,0,626,1,
-447,2619,16,0,626,
-1,2458,904,1,2459,
-910,1,1958,2620,16,
-0,626,1,2462,917,
-1,1657,922,1,2464,
-927,1,199,2621,16,
-0,626,1,459,2622,
-16,0,626,1,462,
-2623,16,0,626,1,
-217,2624,16,0,626,
-1,2227,936,1,1225,
-2625,16,0,626,1,
-1479,2626,16,0,626,
-1,1731,2627,16,0,
-626,1,1989,944,1,
-1990,2628,16,0,626,
-1,236,2629,16,0,
-626,1,1756,2630,16,
-0,626,1,28,2631,
-19,655,1,28,2632,
-5,60,1,328,1330,
-1,223,1562,1,1096,
-1340,1,118,1383,1,
-883,1425,1,525,1244,
-1,1001,1616,1,130,
-1442,1,459,1747,1,
-1114,1371,1,352,1377,
-1,447,1540,1,464,
-1742,1,1011,1130,1,
-1013,1286,1,242,1606,
-1,143,1447,1,40,
-1205,1,41,1714,1,
-42,1718,1,479,1588,
-1,44,1211,1,481,
-1749,1,373,1437,1,
-47,1212,1,157,1470,
-1,49,1224,1,50,
-1229,1,48,1218,1,
-379,1414,1,380,1419,
-1,51,1234,1,476,
-1572,1,371,1393,1,
-478,1611,1,1048,1372,
-1,375,1404,1,172,
-1496,1,262,1147,1,
-283,1200,1,63,1250,
-1,67,1261,1,68,
-1266,1,69,1271,1,
-66,1256,1,461,2633,
-16,0,653,1,74,
-1281,1,377,1409,1,
-1002,1621,1,70,1276,
-1,188,1547,1,82,
-1308,1,305,1239,1,
-477,1578,1,827,1359,
-1,93,1346,1,480,
-1593,1,205,1552,1,
-942,1519,1,107,1366,
-1,29,2634,19,280,
-1,29,2635,5,84,
-1,1011,1130,1,1012,
-2636,16,0,278,1,
-1013,1286,1,262,1147,
-1,1267,2637,16,0,
-278,1,515,2638,16,
-0,278,1,1521,2639,
-16,0,278,1,2692,
-2640,16,0,278,1,
-525,1244,1,283,1200,
-1,2299,2641,16,0,
-278,1,42,2642,16,
-0,278,1,40,1205,
-1,44,1211,1,47,
-1212,1,1303,2643,16,
-0,278,1,1555,2644,
-16,0,278,1,50,
-1229,1,48,1218,1,
-49,1224,1,51,1234,
-1,63,1250,1,305,
-1239,1,66,1256,1,
-67,1261,1,68,1266,
-1,69,1271,1,70,
-1276,1,73,2645,16,
-0,278,1,74,1281,
-1,328,1330,1,1048,
-1372,1,82,2646,16,
-0,278,1,1840,2647,
-16,0,278,1,1591,
-2648,16,0,278,1,
-1341,2649,16,0,278,
-1,1096,1340,1,93,
-1346,1,352,1377,1,
-107,2650,16,0,278,
-1,1114,1371,1,118,
-1383,1,1123,2651,16,
-0,278,1,371,1393,
-1,1628,2652,16,0,
-278,1,375,1404,1,
-1882,2653,16,0,278,
-1,377,1409,1,379,
-1414,1,380,1419,1,
-883,2654,16,0,278,
-1,373,1437,1,130,
-1442,1,143,1447,1,
-387,2655,16,0,278,
-1,1159,2656,16,0,
-278,1,157,1470,1,
-1413,2657,16,0,278,
-1,1665,2658,16,0,
-278,1,412,2659,16,
-0,278,1,1377,2660,
-16,0,278,1,172,
-1496,1,1939,2661,16,
-0,278,1,437,2662,
-16,0,278,1,188,
-1547,1,942,1519,1,
-1195,2663,16,0,278,
-1,1449,2664,16,0,
-278,1,1701,2665,16,
-0,278,1,447,1540,
-1,205,2666,16,0,
-278,1,827,2667,16,
-0,278,1,223,2668,
-16,0,278,1,476,
-1572,1,477,1578,1,
-1231,2669,16,0,278,
-1,479,1588,1,480,
-1593,1,1485,2670,16,
-0,278,1,1737,2671,
-16,0,278,1,242,
-2672,16,0,278,1,
-478,1611,1,1001,1616,
-1,1002,1621,1,30,
-2673,19,268,1,30,
-2674,5,84,1,1011,
-1130,1,1012,2675,16,
-0,266,1,1013,1286,
-1,262,1147,1,1267,
-2676,16,0,266,1,
-515,2677,16,0,266,
-1,1521,2678,16,0,
-266,1,2692,2679,16,
-0,266,1,525,1244,
-1,283,1200,1,2299,
-2680,16,0,266,1,
-42,2681,16,0,266,
-1,40,1205,1,44,
-1211,1,47,1212,1,
-1303,2682,16,0,266,
-1,1555,2683,16,0,
-266,1,50,1229,1,
-48,1218,1,49,1224,
-1,51,1234,1,63,
-1250,1,305,1239,1,
-66,1256,1,67,1261,
-1,68,1266,1,69,
-1271,1,70,1276,1,
-73,2684,16,0,266,
-1,74,1281,1,328,
-1330,1,1048,1372,1,
-82,2685,16,0,266,
-1,1840,2686,16,0,
-266,1,1591,2687,16,
-0,266,1,1341,2688,
-16,0,266,1,1096,
-1340,1,93,1346,1,
-352,1377,1,107,2689,
-16,0,266,1,1114,
-1371,1,118,1383,1,
-1123,2690,16,0,266,
-1,371,1393,1,1628,
-2691,16,0,266,1,
-375,1404,1,1882,2692,
-16,0,266,1,377,
-1409,1,379,1414,1,
-380,1419,1,883,2693,
-16,0,266,1,373,
-1437,1,130,1442,1,
-143,1447,1,387,2694,
-16,0,266,1,1159,
-2695,16,0,266,1,
-157,1470,1,1413,2696,
-16,0,266,1,1665,
-2697,16,0,266,1,
-412,2698,16,0,266,
-1,1377,2699,16,0,
-266,1,172,1496,1,
-1939,2700,16,0,266,
-1,437,2701,16,0,
-266,1,188,1547,1,
-942,1519,1,1195,2702,
-16,0,266,1,1449,
-2703,16,0,266,1,
-1701,2704,16,0,266,
-1,447,1540,1,205,
-2705,16,0,266,1,
-827,2706,16,0,266,
-1,223,2707,16,0,
-266,1,476,1572,1,
-477,1578,1,1231,2708,
-16,0,266,1,479,
-1588,1,480,1593,1,
-1485,2709,16,0,266,
-1,1737,2710,16,0,
-266,1,242,2711,16,
-0,266,1,478,1611,
-1,1001,1616,1,1002,
-1621,1,31,2712,19,
-254,1,31,2713,5,
-84,1,1011,1130,1,
-1012,2714,16,0,252,
-1,1013,1286,1,262,
-1147,1,1267,2715,16,
-0,252,1,515,2716,
-16,0,252,1,1521,
-2717,16,0,252,1,
-2692,2718,16,0,252,
-1,525,1244,1,283,
-1200,1,2299,2719,16,
-0,252,1,42,2720,
+1565,1,942,1536,1,
+1195,2712,16,0,289,
+1,1449,2713,16,0,
+289,1,1701,2714,16,
+0,289,1,447,1557,
+1,2708,2715,16,0,
+289,1,205,2716,16,
+0,289,1,827,2717,
+16,0,289,1,223,
+2718,16,0,289,1,
+476,1590,1,477,1596,
+1,1231,2719,16,0,
+289,1,479,1606,1,
+480,1611,1,1485,2720,
+16,0,289,1,1737,
+2721,16,0,289,1,
+242,2722,16,0,289,
+1,478,1629,1,1001,
+1634,1,1002,1639,1,
+30,2723,19,269,1,
+30,2724,5,84,1,
+1011,1148,1,1012,2725,
+16,0,267,1,1013,
+1304,1,262,1165,1,
+1267,2726,16,0,267,
+1,515,2727,16,0,
+267,1,1521,2728,16,
+0,267,1,525,1262,
+1,283,1218,1,2299,
+2729,16,0,267,1,
+42,2730,16,0,267,
+1,40,1223,1,44,
+1229,1,47,1230,1,
+1303,2731,16,0,267,
+1,1555,2732,16,0,
+267,1,50,1247,1,
+48,1236,1,49,1242,
+1,51,1252,1,63,
+1268,1,305,1257,1,
+66,1274,1,67,1279,
+1,68,1284,1,69,
+1289,1,70,1294,1,
+73,2733,16,0,267,
+1,74,1299,1,328,
+1348,1,1048,1467,1,
+82,2734,16,0,267,
+1,1840,2735,16,0,
+267,1,1591,2736,16,
+0,267,1,1341,2737,
+16,0,267,1,1096,
+1358,1,93,1364,1,
+352,1391,1,107,2738,
+16,0,267,1,1114,
+1389,1,118,1397,1,
+1123,2739,16,0,267,
+1,371,1407,1,1628,
+2740,16,0,267,1,
+375,1418,1,1882,2741,
+16,0,267,1,377,
+1423,1,379,1428,1,
+380,1433,1,883,2742,
+16,0,267,1,373,
+1451,1,130,1456,1,
+143,1461,1,387,2743,
+16,0,267,1,1159,
+2744,16,0,267,1,
+157,1489,1,1413,2745,
+16,0,267,1,1665,
+2746,16,0,267,1,
+412,2747,16,0,267,
+1,1377,2748,16,0,
+267,1,172,1515,1,
+1939,2749,16,0,267,
+1,437,2750,16,0,
+267,1,188,1565,1,
+942,1536,1,1195,2751,
+16,0,267,1,1449,
+2752,16,0,267,1,
+1701,2753,16,0,267,
+1,447,1557,1,2708,
+2754,16,0,267,1,
+205,2755,16,0,267,
+1,827,2756,16,0,
+267,1,223,2757,16,
+0,267,1,476,1590,
+1,477,1596,1,1231,
+2758,16,0,267,1,
+479,1606,1,480,1611,
+1,1485,2759,16,0,
+267,1,1737,2760,16,
+0,267,1,242,2761,
+16,0,267,1,478,
+1629,1,1001,1634,1,
+1002,1639,1,31,2762,
+19,254,1,31,2763,
+5,84,1,1011,1148,
+1,1012,2764,16,0,
+252,1,1013,1304,1,
+262,1165,1,1267,2765,
+16,0,252,1,515,
+2766,16,0,252,1,
+1521,2767,16,0,252,
+1,525,1262,1,283,
+1218,1,2299,2768,16,
+0,252,1,42,2769,
 16,0,252,1,40,
-1205,1,44,1211,1,
-47,1212,1,1303,2721,
+1223,1,44,1229,1,
+47,1230,1,1303,2770,
 16,0,252,1,1555,
-2722,16,0,252,1,
-50,1229,1,48,1218,
-1,49,1224,1,51,
-1234,1,63,1250,1,
-305,1239,1,66,1256,
-1,67,1261,1,68,
-1266,1,69,1271,1,
-70,1276,1,73,2723,
+2771,16,0,252,1,
+50,1247,1,48,1236,
+1,49,1242,1,51,
+1252,1,63,1268,1,
+305,1257,1,66,1274,
+1,67,1279,1,68,
+1284,1,69,1289,1,
+70,1294,1,73,2772,
 16,0,252,1,74,
-1281,1,328,1330,1,
-1048,1372,1,82,2724,
+1299,1,328,1348,1,
+1048,1467,1,82,2773,
 16,0,252,1,1840,
-2725,16,0,252,1,
-1591,2726,16,0,252,
-1,1341,2727,16,0,
-252,1,1096,1340,1,
-93,1346,1,352,1377,
-1,107,2728,16,0,
-252,1,1114,1371,1,
-118,1383,1,1123,2729,
+2774,16,0,252,1,
+1591,2775,16,0,252,
+1,1341,2776,16,0,
+252,1,1096,1358,1,
+93,1364,1,352,1391,
+1,107,2777,16,0,
+252,1,1114,1389,1,
+118,1397,1,1123,2778,
 16,0,252,1,371,
-1393,1,1628,2730,16,
-0,252,1,375,1404,
-1,1882,2731,16,0,
-252,1,377,1409,1,
-379,1414,1,380,1419,
-1,883,2732,16,0,
-252,1,373,1437,1,
-130,1442,1,143,2733,
+1407,1,1628,2779,16,
+0,252,1,375,1418,
+1,1882,2780,16,0,
+252,1,377,1423,1,
+379,1428,1,380,1433,
+1,883,2781,16,0,
+252,1,373,1451,1,
+130,1456,1,143,2782,
 16,0,252,1,387,
-2734,16,0,252,1,
-1159,2735,16,0,252,
-1,157,2736,16,0,
-252,1,1413,2737,16,
-0,252,1,1665,2738,
+2783,16,0,252,1,
+1159,2784,16,0,252,
+1,157,2785,16,0,
+252,1,1413,2786,16,
+0,252,1,1665,2787,
 16,0,252,1,412,
-2739,16,0,252,1,
-1377,2740,16,0,252,
-1,172,1496,1,1939,
-2741,16,0,252,1,
-437,2742,16,0,252,
-1,188,1547,1,942,
-1519,1,1195,2743,16,
-0,252,1,1449,2744,
+2788,16,0,252,1,
+1377,2789,16,0,252,
+1,172,1515,1,1939,
+2790,16,0,252,1,
+437,2791,16,0,252,
+1,188,1565,1,942,
+1536,1,1195,2792,16,
+0,252,1,1449,2793,
 16,0,252,1,1701,
-2745,16,0,252,1,
-447,1540,1,205,2746,
-16,0,252,1,827,
-2747,16,0,252,1,
-223,2748,16,0,252,
-1,476,1572,1,477,
-1578,1,1231,2749,16,
-0,252,1,479,1588,
-1,480,1593,1,1485,
-2750,16,0,252,1,
-1737,2751,16,0,252,
-1,242,2752,16,0,
-252,1,478,1611,1,
-1001,1616,1,1002,1621,
-1,32,2753,19,244,
-1,32,2754,5,84,
-1,1011,1130,1,1012,
-2755,16,0,242,1,
-1013,1286,1,262,1147,
-1,1267,2756,16,0,
-242,1,515,2757,16,
-0,242,1,1521,2758,
-16,0,242,1,2692,
-2759,16,0,242,1,
-525,1244,1,283,1200,
-1,2299,2760,16,0,
-242,1,42,2761,16,
-0,242,1,40,1205,
-1,44,1211,1,47,
-1212,1,1303,2762,16,
-0,242,1,1555,2763,
-16,0,242,1,50,
-1229,1,48,1218,1,
-49,1224,1,51,1234,
-1,63,1250,1,305,
-1239,1,66,1256,1,
-67,1261,1,68,1266,
-1,69,1271,1,70,
-1276,1,73,2764,16,
-0,242,1,74,1281,
-1,328,1330,1,1048,
-1372,1,82,2765,16,
-0,242,1,1840,2766,
-16,0,242,1,1591,
-2767,16,0,242,1,
-1341,2768,16,0,242,
-1,1096,1340,1,93,
-1346,1,352,1377,1,
-107,2769,16,0,242,
-1,1114,1371,1,118,
-1383,1,1123,2770,16,
-0,242,1,371,1393,
-1,1628,2771,16,0,
-242,1,375,1404,1,
-1882,2772,16,0,242,
-1,377,1409,1,379,
-1414,1,380,1419,1,
-883,2773,16,0,242,
-1,373,1437,1,130,
-1442,1,143,2774,16,
-0,242,1,387,2775,
-16,0,242,1,1159,
-2776,16,0,242,1,
-157,2777,16,0,242,
-1,1413,2778,16,0,
-242,1,1665,2779,16,
-0,242,1,412,2780,
-16,0,242,1,1377,
-2781,16,0,242,1,
-172,1496,1,1939,2782,
-16,0,242,1,437,
-2783,16,0,242,1,
-188,1547,1,942,1519,
-1,1195,2784,16,0,
-242,1,1449,2785,16,
-0,242,1,1701,2786,
-16,0,242,1,447,
-1540,1,205,2787,16,
-0,242,1,827,2788,
-16,0,242,1,223,
-2789,16,0,242,1,
-476,1572,1,477,1578,
-1,1231,2790,16,0,
-242,1,479,1588,1,
-480,1593,1,1485,2791,
-16,0,242,1,1737,
-2792,16,0,242,1,
-242,2793,16,0,242,
-1,478,1611,1,1001,
-1616,1,1002,1621,1,
-33,2794,19,341,1,
-33,2795,5,84,1,
-1011,1130,1,1012,2796,
-16,0,339,1,1013,
-1286,1,262,1147,1,
-1267,2797,16,0,339,
-1,515,2798,16,0,
-339,1,1521,2799,16,
-0,339,1,2692,2800,
-16,0,339,1,525,
-1244,1,283,1200,1,
-2299,2801,16,0,339,
-1,42,2802,16,0,
-339,1,40,1205,1,
-44,1211,1,47,1212,
-1,1303,2803,16,0,
-339,1,1555,2804,16,
-0,339,1,50,1229,
-1,48,1218,1,49,
-1224,1,51,1234,1,
-63,1250,1,305,1239,
-1,66,1256,1,67,
-1261,1,68,1266,1,
-69,1271,1,70,1276,
-1,73,2805,16,0,
-339,1,74,1281,1,
-328,1330,1,1048,1372,
-1,82,2806,16,0,
-339,1,1840,2807,16,
-0,339,1,1591,2808,
-16,0,339,1,1341,
-2809,16,0,339,1,
-1096,1340,1,93,1346,
-1,352,1377,1,107,
-2810,16,0,339,1,
-1114,1371,1,118,1383,
-1,1123,2811,16,0,
-339,1,371,1393,1,
-1628,2812,16,0,339,
-1,375,1404,1,1882,
-2813,16,0,339,1,
-377,1409,1,379,1414,
-1,380,1419,1,883,
-2814,16,0,339,1,
-373,1437,1,130,1442,
-1,143,1447,1,387,
-2815,16,0,339,1,
-1159,2816,16,0,339,
-1,157,1470,1,1413,
-2817,16,0,339,1,
-1665,2818,16,0,339,
-1,412,2819,16,0,
-339,1,1377,2820,16,
-0,339,1,172,1496,
-1,1939,2821,16,0,
-339,1,437,2822,16,
-0,339,1,188,1547,
-1,942,1519,1,1195,
-2823,16,0,339,1,
-1449,2824,16,0,339,
-1,1701,2825,16,0,
-339,1,447,1540,1,
-205,2826,16,0,339,
-1,827,2827,16,0,
-339,1,223,2828,16,
-0,339,1,476,1572,
-1,477,1578,1,1231,
-2829,16,0,339,1,
-479,1588,1,480,1593,
-1,1485,2830,16,0,
-339,1,1737,2831,16,
-0,339,1,242,1606,
-1,478,1611,1,1001,
-1616,1,1002,1621,1,
-34,2832,19,327,1,
-34,2833,5,84,1,
-1011,1130,1,1012,2834,
-16,0,325,1,1013,
-1286,1,262,1147,1,
-1267,2835,16,0,325,
-1,515,2836,16,0,
-325,1,1521,2837,16,
-0,325,1,2692,2838,
-16,0,325,1,525,
-1244,1,283,1200,1,
-2299,2839,16,0,325,
-1,42,2840,16,0,
-325,1,40,1205,1,
-44,1211,1,47,1212,
-1,1303,2841,16,0,
-325,1,1555,2842,16,
-0,325,1,50,1229,
-1,48,1218,1,49,
-1224,1,51,1234,1,
-63,1250,1,305,1239,
-1,66,1256,1,67,
-1261,1,68,1266,1,
-69,1271,1,70,1276,
-1,73,2843,16,0,
-325,1,74,1281,1,
-328,1330,1,1048,1372,
-1,82,2844,16,0,
-325,1,1840,2845,16,
-0,325,1,1591,2846,
-16,0,325,1,1341,
-2847,16,0,325,1,
-1096,1340,1,93,1346,
-1,352,1377,1,107,
-2848,16,0,325,1,
-1114,1371,1,118,1383,
-1,1123,2849,16,0,
-325,1,371,1393,1,
-1628,2850,16,0,325,
-1,375,1404,1,1882,
-2851,16,0,325,1,
-377,1409,1,379,1414,
-1,380,1419,1,883,
-2852,16,0,325,1,
-373,1437,1,130,1442,
-1,143,1447,1,387,
-2853,16,0,325,1,
-1159,2854,16,0,325,
-1,157,1470,1,1413,
-2855,16,0,325,1,
-1665,2856,16,0,325,
-1,412,2857,16,0,
-325,1,1377,2858,16,
-0,325,1,172,1496,
-1,1939,2859,16,0,
-325,1,437,2860,16,
-0,325,1,188,1547,
-1,942,1519,1,1195,
-2861,16,0,325,1,
-1449,2862,16,0,325,
-1,1701,2863,16,0,
-325,1,447,1540,1,
-205,1552,1,827,2864,
-16,0,325,1,223,
-1562,1,476,1572,1,
-477,1578,1,1231,2865,
-16,0,325,1,479,
-1588,1,480,1593,1,
-1485,2866,16,0,325,
-1,1737,2867,16,0,
-325,1,242,1606,1,
-478,1611,1,1001,1616,
-1,1002,1621,1,35,
-2868,19,310,1,35,
-2869,5,84,1,1011,
-1130,1,1012,2870,16,
-0,308,1,1013,1286,
-1,262,1147,1,1267,
-2871,16,0,308,1,
-515,2872,16,0,308,
-1,1521,2873,16,0,
-308,1,2692,2874,16,
-0,308,1,525,1244,
-1,283,1200,1,2299,
-2875,16,0,308,1,
-42,2876,16,0,308,
-1,40,1205,1,44,
-1211,1,47,1212,1,
-1303,2877,16,0,308,
-1,1555,2878,16,0,
-308,1,50,1229,1,
-48,1218,1,49,1224,
-1,51,1234,1,63,
-1250,1,305,1239,1,
-66,1256,1,67,1261,
-1,68,1266,1,69,
-1271,1,70,1276,1,
-73,2879,16,0,308,
-1,74,1281,1,328,
-1330,1,1048,1372,1,
-82,2880,16,0,308,
-1,1840,2881,16,0,
-308,1,1591,2882,16,
-0,308,1,1341,2883,
-16,0,308,1,1096,
-1340,1,93,1346,1,
-352,1377,1,107,2884,
-16,0,308,1,1114,
-1371,1,118,1383,1,
-1123,2885,16,0,308,
-1,371,1393,1,1628,
-2886,16,0,308,1,
-375,1404,1,1882,2887,
-16,0,308,1,377,
-1409,1,379,1414,1,
-380,1419,1,883,2888,
-16,0,308,1,373,
-1437,1,130,1442,1,
-143,1447,1,387,2889,
-16,0,308,1,1159,
-2890,16,0,308,1,
-157,1470,1,1413,2891,
-16,0,308,1,1665,
-2892,16,0,308,1,
-412,2893,16,0,308,
-1,1377,2894,16,0,
-308,1,172,1496,1,
-1939,2895,16,0,308,
-1,437,2896,16,0,
-308,1,188,1547,1,
-942,1519,1,1195,2897,
-16,0,308,1,1449,
-2898,16,0,308,1,
-1701,2899,16,0,308,
-1,447,1540,1,205,
-1552,1,827,2900,16,
-0,308,1,223,2901,
-16,0,308,1,476,
-1572,1,477,1578,1,
-1231,2902,16,0,308,
-1,479,1588,1,480,
-1593,1,1485,2903,16,
-0,308,1,1737,2904,
-16,0,308,1,242,
-1606,1,478,1611,1,
-1001,1616,1,1002,1621,
-1,36,2905,19,217,
-1,36,2906,5,94,
-1,256,2907,16,0,
-215,1,1261,2908,16,
-0,215,1,509,2909,
-16,0,215,1,1515,
-2910,16,0,215,1,
-2686,2911,16,0,215,
-1,2021,747,1,1775,
-2912,16,0,215,1,
-2029,754,1,2030,760,
-1,2031,765,1,2032,
-770,1,2033,775,1,
-277,2913,16,0,215,
-1,2035,781,1,2037,
-786,1,2039,791,1,
-32,2914,16,0,215,
-1,2041,797,1,2293,
-2915,16,0,215,1,
-2043,803,1,2045,808,
-1,41,2916,16,0,
-215,1,1297,2917,16,
-0,215,1,43,2918,
-16,0,215,1,1803,
-816,1,1804,2919,16,
-0,215,1,299,2920,
-16,0,215,1,52,
-2921,16,0,215,1,
-2318,2922,16,0,215,
-1,2075,2923,16,0,
-215,1,1574,828,1,
-71,2924,16,0,215,
-1,76,2925,16,0,
-215,1,1834,2926,16,
-0,215,1,2337,2927,
-16,0,215,1,79,
-2928,16,0,215,1,
-1335,2929,16,0,215,
-1,322,2930,16,0,
-215,1,85,2931,16,
-0,215,1,89,2932,
-16,0,215,1,346,
-2933,16,0,215,1,
-2105,843,1,2106,2934,
-16,0,215,1,97,
-2935,16,0,215,1,
-1860,850,1,2364,856,
-1,102,2936,16,0,
-215,1,112,2937,16,
-0,215,1,1117,2938,
-16,0,215,1,1873,
-864,1,1876,2939,16,
-0,215,1,124,2940,
-16,0,215,1,2136,
-871,1,381,2941,16,
-0,215,1,525,2942,
-16,0,215,1,137,
-2943,16,0,215,1,
-1901,2944,16,0,215,
-1,1153,2945,16,0,
-215,1,151,2946,16,
-0,215,1,1407,2947,
-16,0,215,1,1659,
-2948,16,0,215,1,
-2413,2949,16,0,215,
-1,406,2950,16,0,
-215,1,1371,2951,16,
-0,215,1,166,2952,
-16,0,215,1,1622,
-2953,16,0,215,1,
-1931,889,1,1933,2954,
-16,0,215,1,431,
-2955,16,0,215,1,
-1585,2956,16,0,215,
-1,182,2957,16,0,
-215,1,1189,2958,16,
-0,215,1,1443,2959,
-16,0,215,1,1695,
-2960,16,0,215,1,
-2198,2961,16,0,215,
-1,447,2962,16,0,
-215,1,2458,904,1,
-2459,910,1,1958,2963,
-16,0,215,1,2462,
-917,1,1657,922,1,
-2464,927,1,199,2964,
-16,0,215,1,459,
-2965,16,0,215,1,
-462,2966,16,0,215,
-1,217,2967,16,0,
-215,1,2227,936,1,
-1225,2968,16,0,215,
-1,1479,2969,16,0,
-215,1,1731,2970,16,
-0,215,1,1989,944,
-1,1990,2971,16,0,
-215,1,236,2972,16,
-0,215,1,1756,2973,
-16,0,215,1,37,
-2974,19,234,1,37,
-2975,5,94,1,256,
-2976,16,0,232,1,
-1261,2977,16,0,232,
-1,509,2978,16,0,
-232,1,1515,2979,16,
-0,232,1,2686,2980,
-16,0,232,1,2021,
-747,1,1775,2981,16,
-0,232,1,2029,754,
-1,2030,760,1,2031,
-765,1,2032,770,1,
-2033,775,1,277,2982,
-16,0,232,1,2035,
-781,1,2037,786,1,
-2039,791,1,32,2983,
-16,0,232,1,2041,
-797,1,2293,2984,16,
-0,232,1,2043,803,
-1,2045,808,1,41,
-2985,16,0,232,1,
-1297,2986,16,0,232,
-1,43,2987,16,0,
-232,1,1803,816,1,
-1804,2988,16,0,232,
-1,299,2989,16,0,
-232,1,52,2990,16,
-0,232,1,2318,2991,
-16,0,232,1,2075,
-2992,16,0,232,1,
-1574,828,1,71,2993,
-16,0,232,1,76,
-2994,16,0,232,1,
-1834,2995,16,0,232,
-1,2337,2996,16,0,
-232,1,79,2997,16,
-0,232,1,1335,2998,
-16,0,232,1,322,
-2999,16,0,232,1,
-85,3000,16,0,232,
-1,89,3001,16,0,
-232,1,346,3002,16,
-0,232,1,2105,843,
-1,2106,3003,16,0,
-232,1,97,3004,16,
-0,232,1,1860,850,
-1,2364,856,1,102,
-3005,16,0,232,1,
-112,3006,16,0,232,
-1,1117,3007,16,0,
-232,1,1873,864,1,
-1876,3008,16,0,232,
-1,124,3009,16,0,
-232,1,2136,871,1,
-381,3010,16,0,232,
-1,525,3011,16,0,
-232,1,137,3012,16,
-0,232,1,1901,3013,
-16,0,232,1,1153,
-3014,16,0,232,1,
-151,3015,16,0,232,
-1,1407,3016,16,0,
-232,1,1659,3017,16,
-0,232,1,2413,3018,
-16,0,232,1,406,
-3019,16,0,232,1,
-1371,3020,16,0,232,
-1,166,3021,16,0,
-232,1,1622,3022,16,
-0,232,1,1931,889,
-1,1933,3023,16,0,
-232,1,431,3024,16,
-0,232,1,1585,3025,
-16,0,232,1,182,
-3026,16,0,232,1,
-1189,3027,16,0,232,
-1,1443,3028,16,0,
-232,1,1695,3029,16,
-0,232,1,2198,3030,
-16,0,232,1,447,
-3031,16,0,232,1,
-2458,904,1,2459,910,
-1,1958,3032,16,0,
-232,1,2462,917,1,
-1657,922,1,2464,927,
-1,199,3033,16,0,
-232,1,459,3034,16,
-0,232,1,462,3035,
-16,0,232,1,217,
-3036,16,0,232,1,
-2227,936,1,1225,3037,
-16,0,232,1,1479,
-3038,16,0,232,1,
-1731,3039,16,0,232,
-1,1989,944,1,1990,
-3040,16,0,232,1,
-236,3041,16,0,232,
-1,1756,3042,16,0,
-232,1,38,3043,19,
-231,1,38,3044,5,
-84,1,1011,1130,1,
-1012,3045,16,0,229,
-1,1013,1286,1,262,
-1147,1,1267,3046,16,
-0,229,1,515,3047,
-16,0,229,1,1521,
-3048,16,0,229,1,
-2692,3049,16,0,229,
-1,525,1244,1,283,
-1200,1,2299,3050,16,
-0,229,1,42,3051,
-16,0,229,1,40,
-1205,1,44,1211,1,
-47,1212,1,1303,3052,
-16,0,229,1,1555,
-3053,16,0,229,1,
-50,1229,1,48,1218,
-1,49,1224,1,51,
-1234,1,63,1250,1,
-305,1239,1,66,1256,
-1,67,1261,1,68,
-1266,1,69,1271,1,
-70,1276,1,73,3054,
-16,0,229,1,74,
-1281,1,328,1330,1,
-1048,1372,1,82,3055,
-16,0,229,1,1840,
-3056,16,0,229,1,
-1591,3057,16,0,229,
-1,1341,3058,16,0,
-229,1,1096,1340,1,
-93,1346,1,352,1377,
-1,107,3059,16,0,
-229,1,1114,1371,1,
-118,1383,1,1123,3060,
-16,0,229,1,371,
-1393,1,1628,3061,16,
-0,229,1,375,1404,
-1,1882,3062,16,0,
-229,1,377,1409,1,
-379,1414,1,380,1419,
-1,883,1425,1,373,
-1437,1,130,1442,1,
-143,1447,1,387,3063,
-16,0,229,1,1159,
-3064,16,0,229,1,
-157,1470,1,1413,3065,
-16,0,229,1,1665,
-3066,16,0,229,1,
-412,3067,16,0,229,
-1,1377,3068,16,0,
-229,1,172,1496,1,
-1939,3069,16,0,229,
-1,437,3070,16,0,
-229,1,188,1547,1,
-942,1519,1,1195,3071,
-16,0,229,1,1449,
-3072,16,0,229,1,
-1701,3073,16,0,229,
-1,447,1540,1,205,
-1552,1,827,1359,1,
-223,1562,1,476,1572,
-1,477,1578,1,1231,
-3074,16,0,229,1,
-479,1588,1,480,1593,
-1,1485,3075,16,0,
-229,1,1737,3076,16,
-0,229,1,242,1606,
-1,478,1611,1,1001,
-1616,1,1002,1621,1,
-39,3077,19,223,1,
-39,3078,5,84,1,
-1011,1130,1,1012,3079,
-16,0,221,1,1013,
-1286,1,262,1147,1,
-1267,3080,16,0,221,
-1,515,3081,16,0,
-221,1,1521,3082,16,
-0,221,1,2692,3083,
-16,0,221,1,525,
-1244,1,283,1200,1,
-2299,3084,16,0,221,
-1,42,3085,16,0,
-221,1,40,1205,1,
-44,1211,1,47,1212,
-1,1303,3086,16,0,
-221,1,1555,3087,16,
-0,221,1,50,1229,
-1,48,1218,1,49,
-1224,1,51,1234,1,
-63,1250,1,305,1239,
-1,66,1256,1,67,
-1261,1,68,1266,1,
-69,1271,1,70,1276,
-1,73,3088,16,0,
-221,1,74,1281,1,
-328,1330,1,1048,1372,
-1,82,3089,16,0,
-221,1,1840,3090,16,
-0,221,1,1591,3091,
-16,0,221,1,1341,
-3092,16,0,221,1,
-1096,1340,1,93,1346,
-1,352,1377,1,107,
-3093,16,0,221,1,
-1114,1371,1,118,1383,
-1,1123,3094,16,0,
-221,1,371,1393,1,
-1628,3095,16,0,221,
-1,375,1404,1,1882,
-3096,16,0,221,1,
-377,1409,1,379,1414,
-1,380,1419,1,883,
-1425,1,373,1437,1,
-130,1442,1,143,1447,
-1,387,3097,16,0,
-221,1,1159,3098,16,
-0,221,1,157,1470,
-1,1413,3099,16,0,
-221,1,1665,3100,16,
-0,221,1,412,3101,
-16,0,221,1,1377,
-3102,16,0,221,1,
-172,1496,1,1939,3103,
-16,0,221,1,437,
-3104,16,0,221,1,
-188,1547,1,942,1519,
-1,1195,3105,16,0,
-221,1,1449,3106,16,
-0,221,1,1701,3107,
-16,0,221,1,447,
-1540,1,205,1552,1,
-827,1359,1,223,1562,
-1,476,1572,1,477,
-1578,1,1231,3108,16,
-0,221,1,479,1588,
-1,480,1593,1,1485,
-3109,16,0,221,1,
-1737,3110,16,0,221,
-1,242,1606,1,478,
-1611,1,1001,1616,1,
-1002,1621,1,40,3111,
-19,211,1,40,3112,
-5,84,1,1011,1130,
-1,1012,3113,16,0,
-209,1,1013,1286,1,
-262,1147,1,1267,3114,
-16,0,209,1,515,
-3115,16,0,209,1,
-1521,3116,16,0,209,
-1,2692,3117,16,0,
-209,1,525,1244,1,
-283,1200,1,2299,3118,
-16,0,209,1,42,
-3119,16,0,209,1,
-40,1205,1,44,1211,
-1,47,1212,1,1303,
-3120,16,0,209,1,
-1555,3121,16,0,209,
-1,50,1229,1,48,
-1218,1,49,1224,1,
-51,1234,1,63,1250,
-1,305,1239,1,66,
-1256,1,67,1261,1,
-68,1266,1,69,1271,
-1,70,1276,1,73,
-3122,16,0,209,1,
-74,1281,1,328,1330,
-1,1048,1372,1,82,
-3123,16,0,209,1,
-1840,3124,16,0,209,
-1,1591,3125,16,0,
-209,1,1341,3126,16,
-0,209,1,1096,1340,
-1,93,1346,1,352,
-1377,1,107,3127,16,
-0,209,1,1114,1371,
-1,118,3128,16,0,
-209,1,1123,3129,16,
-0,209,1,371,1393,
-1,1628,3130,16,0,
-209,1,375,1404,1,
-1882,3131,16,0,209,
-1,377,1409,1,379,
-1414,1,380,1419,1,
-883,3132,16,0,209,
-1,373,1437,1,130,
-3133,16,0,209,1,
-143,3134,16,0,209,
-1,387,3135,16,0,
-209,1,1159,3136,16,
-0,209,1,157,3137,
-16,0,209,1,1413,
-3138,16,0,209,1,
-1665,3139,16,0,209,
-1,412,3140,16,0,
-209,1,1377,3141,16,
-0,209,1,172,3142,
-16,0,209,1,1939,
-3143,16,0,209,1,
-437,3144,16,0,209,
-1,188,3145,16,0,
-209,1,942,1519,1,
-1195,3146,16,0,209,
-1,1449,3147,16,0,
-209,1,1701,3148,16,
-0,209,1,447,1540,
-1,205,3149,16,0,
-209,1,827,3150,16,
-0,209,1,223,3151,
-16,0,209,1,476,
-1572,1,477,1578,1,
-1231,3152,16,0,209,
-1,479,1588,1,480,
-1593,1,1485,3153,16,
-0,209,1,1737,3154,
-16,0,209,1,242,
-3155,16,0,209,1,
-478,1611,1,1001,1616,
-1,1002,1621,1,41,
-3156,19,172,1,41,
-3157,5,84,1,1011,
-1130,1,1012,3158,16,
-0,170,1,1013,1286,
-1,262,1147,1,1267,
-3159,16,0,170,1,
-515,3160,16,0,170,
-1,1521,3161,16,0,
-170,1,2692,3162,16,
-0,170,1,525,1244,
-1,283,1200,1,2299,
-3163,16,0,170,1,
-42,3164,16,0,170,
-1,40,1205,1,44,
-1211,1,47,1212,1,
-1303,3165,16,0,170,
-1,1555,3166,16,0,
-170,1,50,1229,1,
-48,1218,1,49,1224,
-1,51,1234,1,63,
-1250,1,305,1239,1,
-66,1256,1,67,1261,
-1,68,1266,1,69,
-1271,1,70,1276,1,
-73,3167,16,0,170,
-1,74,1281,1,328,
-1330,1,1048,1372,1,
-82,3168,16,0,170,
-1,1840,3169,16,0,
-170,1,1591,3170,16,
-0,170,1,1341,3171,
+2794,16,0,252,1,
+447,1557,1,2708,2795,
+16,0,252,1,205,
+2796,16,0,252,1,
+827,2797,16,0,252,
+1,223,2798,16,0,
+252,1,476,1590,1,
+477,1596,1,1231,2799,
+16,0,252,1,479,
+1606,1,480,1611,1,
+1485,2800,16,0,252,
+1,1737,2801,16,0,
+252,1,242,2802,16,
+0,252,1,478,1629,
+1,1001,1634,1,1002,
+1639,1,32,2803,19,
+247,1,32,2804,5,
+84,1,1011,1148,1,
+1012,2805,16,0,245,
+1,1013,1304,1,262,
+1165,1,1267,2806,16,
+0,245,1,515,2807,
+16,0,245,1,1521,
+2808,16,0,245,1,
+525,1262,1,283,1218,
+1,2299,2809,16,0,
+245,1,42,2810,16,
+0,245,1,40,1223,
+1,44,1229,1,47,
+1230,1,1303,2811,16,
+0,245,1,1555,2812,
+16,0,245,1,50,
+1247,1,48,1236,1,
+49,1242,1,51,1252,
+1,63,1268,1,305,
+1257,1,66,1274,1,
+67,1279,1,68,1284,
+1,69,1289,1,70,
+1294,1,73,2813,16,
+0,245,1,74,1299,
+1,328,1348,1,1048,
+1467,1,82,2814,16,
+0,245,1,1840,2815,
+16,0,245,1,1591,
+2816,16,0,245,1,
+1341,2817,16,0,245,
+1,1096,1358,1,93,
+1364,1,352,1391,1,
+107,2818,16,0,245,
+1,1114,1389,1,118,
+1397,1,1123,2819,16,
+0,245,1,371,1407,
+1,1628,2820,16,0,
+245,1,375,1418,1,
+1882,2821,16,0,245,
+1,377,1423,1,379,
+1428,1,380,1433,1,
+883,2822,16,0,245,
+1,373,1451,1,130,
+1456,1,143,2823,16,
+0,245,1,387,2824,
+16,0,245,1,1159,
+2825,16,0,245,1,
+157,2826,16,0,245,
+1,1413,2827,16,0,
+245,1,1665,2828,16,
+0,245,1,412,2829,
+16,0,245,1,1377,
+2830,16,0,245,1,
+172,1515,1,1939,2831,
+16,0,245,1,437,
+2832,16,0,245,1,
+188,1565,1,942,1536,
+1,1195,2833,16,0,
+245,1,1449,2834,16,
+0,245,1,1701,2835,
+16,0,245,1,447,
+1557,1,2708,2836,16,
+0,245,1,205,2837,
+16,0,245,1,827,
+2838,16,0,245,1,
+223,2839,16,0,245,
+1,476,1590,1,477,
+1596,1,1231,2840,16,
+0,245,1,479,1606,
+1,480,1611,1,1485,
+2841,16,0,245,1,
+1737,2842,16,0,245,
+1,242,2843,16,0,
+245,1,478,1629,1,
+1001,1634,1,1002,1639,
+1,33,2844,19,348,
+1,33,2845,5,84,
+1,1011,1148,1,1012,
+2846,16,0,346,1,
+1013,1304,1,262,1165,
+1,1267,2847,16,0,
+346,1,515,2848,16,
+0,346,1,1521,2849,
+16,0,346,1,525,
+1262,1,283,1218,1,
+2299,2850,16,0,346,
+1,42,2851,16,0,
+346,1,40,1223,1,
+44,1229,1,47,1230,
+1,1303,2852,16,0,
+346,1,1555,2853,16,
+0,346,1,50,1247,
+1,48,1236,1,49,
+1242,1,51,1252,1,
+63,1268,1,305,1257,
+1,66,1274,1,67,
+1279,1,68,1284,1,
+69,1289,1,70,1294,
+1,73,2854,16,0,
+346,1,74,1299,1,
+328,1348,1,1048,1467,
+1,82,2855,16,0,
+346,1,1840,2856,16,
+0,346,1,1591,2857,
+16,0,346,1,1341,
+2858,16,0,346,1,
+1096,1358,1,93,1364,
+1,352,1391,1,107,
+2859,16,0,346,1,
+1114,1389,1,118,1397,
+1,1123,2860,16,0,
+346,1,371,1407,1,
+1628,2861,16,0,346,
+1,375,1418,1,1882,
+2862,16,0,346,1,
+377,1423,1,379,1428,
+1,380,1433,1,883,
+2863,16,0,346,1,
+373,1451,1,130,1456,
+1,143,1461,1,387,
+2864,16,0,346,1,
+1159,2865,16,0,346,
+1,157,1489,1,1413,
+2866,16,0,346,1,
+1665,2867,16,0,346,
+1,412,2868,16,0,
+346,1,1377,2869,16,
+0,346,1,172,1515,
+1,1939,2870,16,0,
+346,1,437,2871,16,
+0,346,1,188,1565,
+1,942,1536,1,1195,
+2872,16,0,346,1,
+1449,2873,16,0,346,
+1,1701,2874,16,0,
+346,1,447,1557,1,
+2708,2875,16,0,346,
+1,205,2876,16,0,
+346,1,827,2877,16,
+0,346,1,223,2878,
+16,0,346,1,476,
+1590,1,477,1596,1,
+1231,2879,16,0,346,
+1,479,1606,1,480,
+1611,1,1485,2880,16,
+0,346,1,1737,2881,
+16,0,346,1,242,
+1624,1,478,1629,1,
+1001,1634,1,1002,1639,
+1,34,2882,19,338,
+1,34,2883,5,84,
+1,1011,1148,1,1012,
+2884,16,0,336,1,
+1013,1304,1,262,1165,
+1,1267,2885,16,0,
+336,1,515,2886,16,
+0,336,1,1521,2887,
+16,0,336,1,525,
+1262,1,283,1218,1,
+2299,2888,16,0,336,
+1,42,2889,16,0,
+336,1,40,1223,1,
+44,1229,1,47,1230,
+1,1303,2890,16,0,
+336,1,1555,2891,16,
+0,336,1,50,1247,
+1,48,1236,1,49,
+1242,1,51,1252,1,
+63,1268,1,305,1257,
+1,66,1274,1,67,
+1279,1,68,1284,1,
+69,1289,1,70,1294,
+1,73,2892,16,0,
+336,1,74,1299,1,
+328,1348,1,1048,1467,
+1,82,2893,16,0,
+336,1,1840,2894,16,
+0,336,1,1591,2895,
+16,0,336,1,1341,
+2896,16,0,336,1,
+1096,1358,1,93,1364,
+1,352,1391,1,107,
+2897,16,0,336,1,
+1114,1389,1,118,1397,
+1,1123,2898,16,0,
+336,1,371,1407,1,
+1628,2899,16,0,336,
+1,375,1418,1,1882,
+2900,16,0,336,1,
+377,1423,1,379,1428,
+1,380,1433,1,883,
+2901,16,0,336,1,
+373,1451,1,130,1456,
+1,143,1461,1,387,
+2902,16,0,336,1,
+1159,2903,16,0,336,
+1,157,1489,1,1413,
+2904,16,0,336,1,
+1665,2905,16,0,336,
+1,412,2906,16,0,
+336,1,1377,2907,16,
+0,336,1,172,1515,
+1,1939,2908,16,0,
+336,1,437,2909,16,
+0,336,1,188,1565,
+1,942,1536,1,1195,
+2910,16,0,336,1,
+1449,2911,16,0,336,
+1,1701,2912,16,0,
+336,1,447,1557,1,
+2708,2913,16,0,336,
+1,205,1570,1,827,
+2914,16,0,336,1,
+223,1580,1,476,1590,
+1,477,1596,1,1231,
+2915,16,0,336,1,
+479,1606,1,480,1611,
+1,1485,2916,16,0,
+336,1,1737,2917,16,
+0,336,1,242,1624,
+1,478,1629,1,1001,
+1634,1,1002,1639,1,
+35,2918,19,321,1,
+35,2919,5,84,1,
+1011,1148,1,1012,2920,
+16,0,319,1,1013,
+1304,1,262,1165,1,
+1267,2921,16,0,319,
+1,515,2922,16,0,
+319,1,1521,2923,16,
+0,319,1,525,1262,
+1,283,1218,1,2299,
+2924,16,0,319,1,
+42,2925,16,0,319,
+1,40,1223,1,44,
+1229,1,47,1230,1,
+1303,2926,16,0,319,
+1,1555,2927,16,0,
+319,1,50,1247,1,
+48,1236,1,49,1242,
+1,51,1252,1,63,
+1268,1,305,1257,1,
+66,1274,1,67,1279,
+1,68,1284,1,69,
+1289,1,70,1294,1,
+73,2928,16,0,319,
+1,74,1299,1,328,
+1348,1,1048,1467,1,
+82,2929,16,0,319,
+1,1840,2930,16,0,
+319,1,1591,2931,16,
+0,319,1,1341,2932,
+16,0,319,1,1096,
+1358,1,93,1364,1,
+352,1391,1,107,2933,
+16,0,319,1,1114,
+1389,1,118,1397,1,
+1123,2934,16,0,319,
+1,371,1407,1,1628,
+2935,16,0,319,1,
+375,1418,1,1882,2936,
+16,0,319,1,377,
+1423,1,379,1428,1,
+380,1433,1,883,2937,
+16,0,319,1,373,
+1451,1,130,1456,1,
+143,1461,1,387,2938,
+16,0,319,1,1159,
+2939,16,0,319,1,
+157,1489,1,1413,2940,
+16,0,319,1,1665,
+2941,16,0,319,1,
+412,2942,16,0,319,
+1,1377,2943,16,0,
+319,1,172,1515,1,
+1939,2944,16,0,319,
+1,437,2945,16,0,
+319,1,188,1565,1,
+942,1536,1,1195,2946,
+16,0,319,1,1449,
+2947,16,0,319,1,
+1701,2948,16,0,319,
+1,447,1557,1,2708,
+2949,16,0,319,1,
+205,1570,1,827,2950,
+16,0,319,1,223,
+2951,16,0,319,1,
+476,1590,1,477,1596,
+1,1231,2952,16,0,
+319,1,479,1606,1,
+480,1611,1,1485,2953,
+16,0,319,1,1737,
+2954,16,0,319,1,
+242,1624,1,478,1629,
+1,1001,1634,1,1002,
+1639,1,36,2955,19,
+216,1,36,2956,5,
+94,1,256,2957,16,
+0,214,1,1261,2958,
+16,0,214,1,509,
+2959,16,0,214,1,
+1515,2960,16,0,214,
+1,2021,764,1,1775,
+2961,16,0,214,1,
+2029,771,1,2030,777,
+1,2031,782,1,2032,
+787,1,2033,792,1,
+277,2962,16,0,214,
+1,2035,798,1,2037,
+803,1,2039,808,1,
+32,2963,16,0,214,
+1,2041,814,1,2293,
+2964,16,0,214,1,
+2043,820,1,2045,825,
+1,41,2965,16,0,
+214,1,1297,2966,16,
+0,214,1,43,2967,
+16,0,214,1,1803,
+833,1,1804,2968,16,
+0,214,1,299,2969,
+16,0,214,1,52,
+2970,16,0,214,1,
+2318,2971,16,0,214,
+1,2075,2972,16,0,
+214,1,1574,845,1,
+71,2973,16,0,214,
+1,76,2974,16,0,
+214,1,1834,2975,16,
+0,214,1,2337,2976,
+16,0,214,1,79,
+2977,16,0,214,1,
+1335,2978,16,0,214,
+1,322,2979,16,0,
+214,1,85,2980,16,
+0,214,1,89,2981,
+16,0,214,1,346,
+2982,16,0,214,1,
+2105,860,1,2106,2983,
+16,0,214,1,97,
+2984,16,0,214,1,
+1860,867,1,2364,873,
+1,102,2985,16,0,
+214,1,112,2986,16,
+0,214,1,1117,2987,
+16,0,214,1,1873,
+881,1,1876,2988,16,
+0,214,1,124,2989,
+16,0,214,1,2136,
+888,1,381,2990,16,
+0,214,1,525,2991,
+16,0,214,1,137,
+2992,16,0,214,1,
+1901,2993,16,0,214,
+1,1153,2994,16,0,
+214,1,151,2995,16,
+0,214,1,1407,2996,
+16,0,214,1,1659,
+2997,16,0,214,1,
+2413,2998,16,0,214,
+1,406,2999,16,0,
+214,1,1371,3000,16,
+0,214,1,166,3001,
+16,0,214,1,1622,
+3002,16,0,214,1,
+1931,906,1,1933,3003,
+16,0,214,1,431,
+3004,16,0,214,1,
+1585,3005,16,0,214,
+1,182,3006,16,0,
+214,1,1189,3007,16,
+0,214,1,1443,3008,
+16,0,214,1,1695,
+3009,16,0,214,1,
+2198,3010,16,0,214,
+1,2702,3011,16,0,
+214,1,447,3012,16,
+0,214,1,2458,922,
+1,2459,928,1,1958,
+3013,16,0,214,1,
+2462,935,1,1657,940,
+1,2464,945,1,199,
+3014,16,0,214,1,
+459,3015,16,0,214,
+1,462,3016,16,0,
+214,1,217,3017,16,
+0,214,1,2227,954,
+1,1225,3018,16,0,
+214,1,1479,3019,16,
+0,214,1,1731,3020,
+16,0,214,1,1989,
+962,1,1990,3021,16,
+0,214,1,236,3022,
+16,0,214,1,1756,
+3023,16,0,214,1,
+37,3024,19,237,1,
+37,3025,5,94,1,
+256,3026,16,0,235,
+1,1261,3027,16,0,
+235,1,509,3028,16,
+0,235,1,1515,3029,
+16,0,235,1,2021,
+764,1,1775,3030,16,
+0,235,1,2029,771,
+1,2030,777,1,2031,
+782,1,2032,787,1,
+2033,792,1,277,3031,
+16,0,235,1,2035,
+798,1,2037,803,1,
+2039,808,1,32,3032,
+16,0,235,1,2041,
+814,1,2293,3033,16,
+0,235,1,2043,820,
+1,2045,825,1,41,
+3034,16,0,235,1,
+1297,3035,16,0,235,
+1,43,3036,16,0,
+235,1,1803,833,1,
+1804,3037,16,0,235,
+1,299,3038,16,0,
+235,1,52,3039,16,
+0,235,1,2318,3040,
+16,0,235,1,2075,
+3041,16,0,235,1,
+1574,845,1,71,3042,
+16,0,235,1,76,
+3043,16,0,235,1,
+1834,3044,16,0,235,
+1,2337,3045,16,0,
+235,1,79,3046,16,
+0,235,1,1335,3047,
+16,0,235,1,322,
+3048,16,0,235,1,
+85,3049,16,0,235,
+1,89,3050,16,0,
+235,1,346,3051,16,
+0,235,1,2105,860,
+1,2106,3052,16,0,
+235,1,97,3053,16,
+0,235,1,1860,867,
+1,2364,873,1,102,
+3054,16,0,235,1,
+112,3055,16,0,235,
+1,1117,3056,16,0,
+235,1,1873,881,1,
+1876,3057,16,0,235,
+1,124,3058,16,0,
+235,1,2136,888,1,
+381,3059,16,0,235,
+1,525,3060,16,0,
+235,1,137,3061,16,
+0,235,1,1901,3062,
+16,0,235,1,1153,
+3063,16,0,235,1,
+151,3064,16,0,235,
+1,1407,3065,16,0,
+235,1,1659,3066,16,
+0,235,1,2413,3067,
+16,0,235,1,406,
+3068,16,0,235,1,
+1371,3069,16,0,235,
+1,166,3070,16,0,
+235,1,1622,3071,16,
+0,235,1,1931,906,
+1,1933,3072,16,0,
+235,1,431,3073,16,
+0,235,1,1585,3074,
+16,0,235,1,182,
+3075,16,0,235,1,
+1189,3076,16,0,235,
+1,1443,3077,16,0,
+235,1,1695,3078,16,
+0,235,1,2198,3079,
+16,0,235,1,2702,
+3080,16,0,235,1,
+447,3081,16,0,235,
+1,2458,922,1,2459,
+928,1,1958,3082,16,
+0,235,1,2462,935,
+1,1657,940,1,2464,
+945,1,199,3083,16,
+0,235,1,459,3084,
+16,0,235,1,462,
+3085,16,0,235,1,
+217,3086,16,0,235,
+1,2227,954,1,1225,
+3087,16,0,235,1,
+1479,3088,16,0,235,
+1,1731,3089,16,0,
+235,1,1989,962,1,
+1990,3090,16,0,235,
+1,236,3091,16,0,
+235,1,1756,3092,16,
+0,235,1,38,3093,
+19,234,1,38,3094,
+5,84,1,1011,1148,
+1,1012,3095,16,0,
+232,1,1013,1304,1,
+262,1165,1,1267,3096,
+16,0,232,1,515,
+3097,16,0,232,1,
+1521,3098,16,0,232,
+1,525,1262,1,283,
+1218,1,2299,3099,16,
+0,232,1,42,3100,
+16,0,232,1,40,
+1223,1,44,1229,1,
+47,1230,1,1303,3101,
+16,0,232,1,1555,
+3102,16,0,232,1,
+50,1247,1,48,1236,
+1,49,1242,1,51,
+1252,1,63,1268,1,
+305,1257,1,66,1274,
+1,67,1279,1,68,
+1284,1,69,1289,1,
+70,1294,1,73,3103,
+16,0,232,1,74,
+1299,1,328,1348,1,
+1048,1467,1,82,3104,
+16,0,232,1,1840,
+3105,16,0,232,1,
+1591,3106,16,0,232,
+1,1341,3107,16,0,
+232,1,1096,1358,1,
+93,1364,1,352,1391,
+1,107,3108,16,0,
+232,1,1114,1389,1,
+118,1397,1,1123,3109,
+16,0,232,1,371,
+1407,1,1628,3110,16,
+0,232,1,375,1418,
+1,1882,3111,16,0,
+232,1,377,1423,1,
+379,1428,1,380,1433,
+1,883,1439,1,373,
+1451,1,130,1456,1,
+143,1461,1,387,3112,
+16,0,232,1,1159,
+3113,16,0,232,1,
+157,1489,1,1413,3114,
+16,0,232,1,1665,
+3115,16,0,232,1,
+412,3116,16,0,232,
+1,1377,3117,16,0,
+232,1,172,1515,1,
+1939,3118,16,0,232,
+1,437,3119,16,0,
+232,1,188,1565,1,
+942,1536,1,1195,3120,
+16,0,232,1,1449,
+3121,16,0,232,1,
+1701,3122,16,0,232,
+1,447,1557,1,2708,
+3123,16,0,232,1,
+205,1570,1,827,1377,
+1,223,1580,1,476,
+1590,1,477,1596,1,
+1231,3124,16,0,232,
+1,479,1606,1,480,
+1611,1,1485,3125,16,
+0,232,1,1737,3126,
+16,0,232,1,242,
+1624,1,478,1629,1,
+1001,1634,1,1002,1639,
+1,39,3127,19,222,
+1,39,3128,5,84,
+1,1011,1148,1,1012,
+3129,16,0,220,1,
+1013,1304,1,262,1165,
+1,1267,3130,16,0,
+220,1,515,3131,16,
+0,220,1,1521,3132,
+16,0,220,1,525,
+1262,1,283,1218,1,
+2299,3133,16,0,220,
+1,42,3134,16,0,
+220,1,40,1223,1,
+44,1229,1,47,1230,
+1,1303,3135,16,0,
+220,1,1555,3136,16,
+0,220,1,50,1247,
+1,48,1236,1,49,
+1242,1,51,1252,1,
+63,1268,1,305,1257,
+1,66,1274,1,67,
+1279,1,68,1284,1,
+69,1289,1,70,1294,
+1,73,3137,16,0,
+220,1,74,1299,1,
+328,1348,1,1048,1467,
+1,82,3138,16,0,
+220,1,1840,3139,16,
+0,220,1,1591,3140,
+16,0,220,1,1341,
+3141,16,0,220,1,
+1096,1358,1,93,1364,
+1,352,1391,1,107,
+3142,16,0,220,1,
+1114,1389,1,118,1397,
+1,1123,3143,16,0,
+220,1,371,1407,1,
+1628,3144,16,0,220,
+1,375,1418,1,1882,
+3145,16,0,220,1,
+377,1423,1,379,1428,
+1,380,1433,1,883,
+1439,1,373,1451,1,
+130,1456,1,143,1461,
+1,387,3146,16,0,
+220,1,1159,3147,16,
+0,220,1,157,1489,
+1,1413,3148,16,0,
+220,1,1665,3149,16,
+0,220,1,412,3150,
+16,0,220,1,1377,
+3151,16,0,220,1,
+172,1515,1,1939,3152,
+16,0,220,1,437,
+3153,16,0,220,1,
+188,1565,1,942,1536,
+1,1195,3154,16,0,
+220,1,1449,3155,16,
+0,220,1,1701,3156,
+16,0,220,1,447,
+1557,1,2708,3157,16,
+0,220,1,205,1570,
+1,827,1377,1,223,
+1580,1,476,1590,1,
+477,1596,1,1231,3158,
+16,0,220,1,479,
+1606,1,480,1611,1,
+1485,3159,16,0,220,
+1,1737,3160,16,0,
+220,1,242,1624,1,
+478,1629,1,1001,1634,
+1,1002,1639,1,40,
+3161,19,210,1,40,
+3162,5,84,1,1011,
+1148,1,1012,3163,16,
+0,208,1,1013,1304,
+1,262,1165,1,1267,
+3164,16,0,208,1,
+515,3165,16,0,208,
+1,1521,3166,16,0,
+208,1,525,1262,1,
+283,1218,1,2299,3167,
+16,0,208,1,42,
+3168,16,0,208,1,
+40,1223,1,44,1229,
+1,47,1230,1,1303,
+3169,16,0,208,1,
+1555,3170,16,0,208,
+1,50,1247,1,48,
+1236,1,49,1242,1,
+51,1252,1,63,1268,
+1,305,1257,1,66,
+1274,1,67,1279,1,
+68,1284,1,69,1289,
+1,70,1294,1,73,
+3171,16,0,208,1,
+74,1299,1,328,1348,
+1,1048,1467,1,82,
+3172,16,0,208,1,
+1840,3173,16,0,208,
+1,1591,3174,16,0,
+208,1,1341,3175,16,
+0,208,1,1096,1358,
+1,93,1364,1,352,
+1391,1,107,3176,16,
+0,208,1,1114,1389,
+1,118,3177,16,0,
+208,1,1123,3178,16,
+0,208,1,371,1407,
+1,1628,3179,16,0,
+208,1,375,1418,1,
+1882,3180,16,0,208,
+1,377,1423,1,379,
+1428,1,380,1433,1,
+883,3181,16,0,208,
+1,373,1451,1,130,
+3182,16,0,208,1,
+143,3183,16,0,208,
+1,387,3184,16,0,
+208,1,1159,3185,16,
+0,208,1,157,3186,
+16,0,208,1,1413,
+3187,16,0,208,1,
+1665,3188,16,0,208,
+1,412,3189,16,0,
+208,1,1377,3190,16,
+0,208,1,172,3191,
+16,0,208,1,1939,
+3192,16,0,208,1,
+437,3193,16,0,208,
+1,188,3194,16,0,
+208,1,942,1536,1,
+1195,3195,16,0,208,
+1,1449,3196,16,0,
+208,1,1701,3197,16,
+0,208,1,447,1557,
+1,2708,3198,16,0,
+208,1,205,3199,16,
+0,208,1,827,3200,
+16,0,208,1,223,
+3201,16,0,208,1,
+476,1590,1,477,1596,
+1,1231,3202,16,0,
+208,1,479,1606,1,
+480,1611,1,1485,3203,
+16,0,208,1,1737,
+3204,16,0,208,1,
+242,3205,16,0,208,
+1,478,1629,1,1001,
+1634,1,1002,1639,1,
+41,3206,19,172,1,
+41,3207,5,84,1,
+1011,1148,1,1012,3208,
+16,0,170,1,1013,
+1304,1,262,1165,1,
+1267,3209,16,0,170,
+1,515,3210,16,0,
+170,1,1521,3211,16,
+0,170,1,525,1262,
+1,283,1218,1,2299,
+3212,16,0,170,1,
+42,3213,16,0,170,
+1,40,1223,1,44,
+1229,1,47,1230,1,
+1303,3214,16,0,170,
+1,1555,3215,16,0,
+170,1,50,1247,1,
+48,1236,1,49,1242,
+1,51,1252,1,63,
+1268,1,305,1257,1,
+66,1274,1,67,1279,
+1,68,1284,1,69,
+1289,1,70,1294,1,
+73,3216,16,0,170,
+1,74,1299,1,328,
+1348,1,1048,1467,1,
+82,3217,16,0,170,
+1,1840,3218,16,0,
+170,1,1591,3219,16,
+0,170,1,1341,3220,
 16,0,170,1,1096,
-1340,1,93,1346,1,
-352,1377,1,107,3172,
+1358,1,93,1364,1,
+352,1391,1,107,3221,
 16,0,170,1,1114,
-1371,1,118,3173,16,
-0,170,1,1123,3174,
+1389,1,118,3222,16,
+0,170,1,1123,3223,
 16,0,170,1,371,
-1393,1,1628,3175,16,
-0,170,1,375,1404,
-1,1882,3176,16,0,
-170,1,377,1409,1,
-379,1414,1,380,1419,
-1,883,3177,16,0,
-170,1,373,1437,1,
-130,3178,16,0,170,
-1,143,3179,16,0,
-170,1,387,3180,16,
-0,170,1,1159,3181,
+1407,1,1628,3224,16,
+0,170,1,375,1418,
+1,1882,3225,16,0,
+170,1,377,1423,1,
+379,1428,1,380,1433,
+1,883,3226,16,0,
+170,1,373,1451,1,
+130,3227,16,0,170,
+1,143,3228,16,0,
+170,1,387,3229,16,
+0,170,1,1159,3230,
 16,0,170,1,157,
-3182,16,0,170,1,
-1413,3183,16,0,170,
-1,1665,3184,16,0,
-170,1,412,3185,16,
-0,170,1,1377,3186,
+3231,16,0,170,1,
+1413,3232,16,0,170,
+1,1665,3233,16,0,
+170,1,412,3234,16,
+0,170,1,1377,3235,
 16,0,170,1,172,
-3187,16,0,170,1,
-1939,3188,16,0,170,
-1,437,3189,16,0,
-170,1,188,3190,16,
-0,170,1,942,1519,
-1,1195,3191,16,0,
-170,1,1449,3192,16,
-0,170,1,1701,3193,
+3236,16,0,170,1,
+1939,3237,16,0,170,
+1,437,3238,16,0,
+170,1,188,3239,16,
+0,170,1,942,1536,
+1,1195,3240,16,0,
+170,1,1449,3241,16,
+0,170,1,1701,3242,
 16,0,170,1,447,
-1540,1,205,3194,16,
-0,170,1,827,3195,
-16,0,170,1,223,
-3196,16,0,170,1,
-476,1572,1,477,1578,
-1,1231,3197,16,0,
-170,1,479,1588,1,
-480,1593,1,1485,3198,
-16,0,170,1,1737,
-3199,16,0,170,1,
-242,3200,16,0,170,
-1,478,1611,1,1001,
-1616,1,1002,1621,1,
-42,3201,19,403,1,
-42,3202,5,38,1,
-1901,3203,16,0,401,
-1,2075,3204,16,0,
-401,1,1860,850,1,
-1803,816,1,1804,3205,
-16,0,401,1,2413,
-3206,16,0,401,1,
-2198,3207,16,0,401,
-1,1873,864,1,1657,
-922,1,1989,944,1,
-1990,3208,16,0,401,
-1,1775,3209,16,0,
-401,1,32,3210,16,
-0,401,1,2105,843,
-1,2106,3211,16,0,
-401,1,2364,856,1,
-2227,936,1,2337,3212,
-16,0,401,1,2021,
-747,1,2458,904,1,
-2459,910,1,2462,917,
-1,2136,871,1,2464,
-927,1,2029,754,1,
-2030,760,1,2031,765,
-1,2032,770,1,2033,
-775,1,2035,781,1,
-2037,786,1,2039,791,
-1,1931,889,1,2041,
-797,1,2043,803,1,
-2045,808,1,1574,828,
-1,1958,3213,16,0,
-401,1,43,3214,19,
-478,1,43,3215,5,
-25,1,2035,781,1,
-2037,786,1,2039,791,
-1,2041,797,1,2227,
-936,1,2043,803,1,
-1657,922,1,1860,850,
-1,2136,871,1,2021,
-747,1,2459,910,1,
-1574,828,1,2105,3216,
-16,0,602,1,1931,
-889,1,1873,864,1,
-2031,765,1,1803,816,
-1,1989,3217,16,0,
-476,1,2464,927,1,
-2029,754,1,2030,760,
-1,2364,856,1,2032,
-770,1,2033,775,1,
-2045,808,1,44,3218,
-19,264,1,44,3219,
-5,38,1,1901,3220,
-16,0,262,1,2075,
-3221,16,0,262,1,
-1860,850,1,1803,816,
-1,1804,3222,16,0,
-262,1,2413,3223,16,
-0,262,1,2198,3224,
-16,0,262,1,1873,
-864,1,1657,922,1,
-1989,944,1,1990,3225,
-16,0,262,1,1775,
-3226,16,0,262,1,
-32,3227,16,0,262,
-1,2105,843,1,2106,
-3228,16,0,262,1,
-2364,856,1,2227,936,
-1,2337,3229,16,0,
-262,1,2021,747,1,
-2458,904,1,2459,910,
-1,2462,917,1,2136,
-871,1,2464,927,1,
-2029,754,1,2030,760,
-1,2031,765,1,2032,
-770,1,2033,775,1,
-2035,781,1,2037,786,
-1,2039,791,1,1931,
-889,1,2041,797,1,
-2043,803,1,2045,808,
-1,1574,828,1,1958,
-3230,16,0,262,1,
-45,3231,19,287,1,
-45,3232,5,39,1,
-1901,3233,16,0,314,
-1,2075,3234,16,0,
-314,1,1860,850,1,
-1803,816,1,1804,3235,
-16,0,314,1,2413,
-3236,16,0,314,1,
-2198,3237,16,0,314,
-1,1873,864,1,1657,
-922,1,1989,944,1,
-1990,3238,16,0,314,
-1,1775,3239,16,0,
-314,1,32,3240,16,
-0,314,1,2105,843,
-1,2106,3241,16,0,
-314,1,2364,856,1,
-2227,936,1,2337,3242,
-16,0,314,1,2021,
-747,1,2458,904,1,
-2459,910,1,2462,917,
-1,2136,871,1,2464,
-927,1,2029,754,1,
-2030,760,1,2031,765,
-1,2032,770,1,2033,
-775,1,2035,781,1,
-2037,786,1,2039,791,
-1,1931,889,1,2041,
-797,1,2043,803,1,
-2045,808,1,1832,3243,
-16,0,285,1,1574,
-828,1,1958,3244,16,
-0,314,1,46,3245,
-19,698,1,46,3246,
-5,38,1,1901,3247,
-16,0,696,1,2075,
-3248,16,0,696,1,
-1860,850,1,1803,816,
-1,1804,3249,16,0,
-696,1,2413,3250,16,
-0,696,1,2198,3251,
-16,0,696,1,1873,
-864,1,1657,922,1,
-1989,944,1,1990,3252,
-16,0,696,1,1775,
-3253,16,0,696,1,
-32,3254,16,0,696,
-1,2105,843,1,2106,
-3255,16,0,696,1,
-2364,856,1,2227,936,
-1,2337,3256,16,0,
-696,1,2021,747,1,
-2458,904,1,2459,910,
-1,2462,917,1,2136,
-871,1,2464,927,1,
-2029,754,1,2030,760,
-1,2031,765,1,2032,
-770,1,2033,775,1,
-2035,781,1,2037,786,
-1,2039,791,1,1931,
-889,1,2041,797,1,
-2043,803,1,2045,808,
-1,1574,828,1,1958,
-3257,16,0,696,1,
-47,3258,19,588,1,
-47,3259,5,19,1,
-0,3260,16,0,678,
-1,2741,3261,17,3262,
-15,3263,4,36,37,
-0,71,0,108,0,
-111,0,98,0,97,
-0,108,0,68,0,
-101,0,102,0,105,
-0,110,0,105,0,
-116,0,105,0,111,
-0,110,0,115,0,
-1,-1,1,5,3264,
-20,3265,4,38,71,
-0,108,0,111,0,
-98,0,97,0,108,
-0,68,0,101,0,
-102,0,105,0,110,
-0,105,0,116,0,
-105,0,111,0,110,
-0,115,0,95,0,
-52,0,1,153,1,
-3,1,3,1,2,
-3266,22,1,6,1,
-2742,3267,17,3268,15,
-3263,1,-1,1,5,
-3269,20,3270,4,38,
+1557,1,2708,3243,16,
+0,170,1,205,3244,
+16,0,170,1,827,
+3245,16,0,170,1,
+223,3246,16,0,170,
+1,476,1590,1,477,
+1596,1,1231,3247,16,
+0,170,1,479,1606,
+1,480,1611,1,1485,
+3248,16,0,170,1,
+1737,3249,16,0,170,
+1,242,3250,16,0,
+170,1,478,1629,1,
+1001,1634,1,1002,1639,
+1,42,3251,19,408,
+1,42,3252,5,38,
+1,1901,3253,16,0,
+406,1,2075,3254,16,
+0,406,1,1860,867,
+1,1803,833,1,1804,
+3255,16,0,406,1,
+2413,3256,16,0,406,
+1,2198,3257,16,0,
+406,1,1873,881,1,
+1657,940,1,1989,962,
+1,1990,3258,16,0,
+406,1,1775,3259,16,
+0,406,1,32,3260,
+16,0,406,1,2105,
+860,1,2106,3261,16,
+0,406,1,2364,873,
+1,2227,954,1,2337,
+3262,16,0,406,1,
+2021,764,1,2458,922,
+1,2459,928,1,2462,
+935,1,2136,888,1,
+2464,945,1,2029,771,
+1,2030,777,1,2031,
+782,1,2032,787,1,
+2033,792,1,2035,798,
+1,2037,803,1,2039,
+808,1,1931,906,1,
+2041,814,1,2043,820,
+1,2045,825,1,1574,
+845,1,1958,3263,16,
+0,406,1,43,3264,
+19,498,1,43,3265,
+5,25,1,2035,798,
+1,2037,803,1,2039,
+808,1,2041,814,1,
+2227,954,1,2043,820,
+1,1657,940,1,1860,
+867,1,2136,888,1,
+2021,764,1,2459,928,
+1,1574,845,1,2105,
+3266,16,0,609,1,
+1931,906,1,1873,881,
+1,2031,782,1,1803,
+833,1,1989,3267,16,
+0,496,1,2464,945,
+1,2029,771,1,2030,
+777,1,2364,873,1,
+2032,787,1,2033,792,
+1,2045,825,1,44,
+3268,19,262,1,44,
+3269,5,38,1,1901,
+3270,16,0,260,1,
+2075,3271,16,0,260,
+1,1860,867,1,1803,
+833,1,1804,3272,16,
+0,260,1,2413,3273,
+16,0,260,1,2198,
+3274,16,0,260,1,
+1873,881,1,1657,940,
+1,1989,962,1,1990,
+3275,16,0,260,1,
+1775,3276,16,0,260,
+1,32,3277,16,0,
+260,1,2105,860,1,
+2106,3278,16,0,260,
+1,2364,873,1,2227,
+954,1,2337,3279,16,
+0,260,1,2021,764,
+1,2458,922,1,2459,
+928,1,2462,935,1,
+2136,888,1,2464,945,
+1,2029,771,1,2030,
+777,1,2031,782,1,
+2032,787,1,2033,792,
+1,2035,798,1,2037,
+803,1,2039,808,1,
+1931,906,1,2041,814,
+1,2043,820,1,2045,
+825,1,1574,845,1,
+1958,3280,16,0,260,
+1,45,3281,19,298,
+1,45,3282,5,39,
+1,1901,3283,16,0,
+325,1,2075,3284,16,
+0,325,1,1860,867,
+1,1803,833,1,1804,
+3285,16,0,325,1,
+2413,3286,16,0,325,
+1,2198,3287,16,0,
+325,1,1873,881,1,
+1657,940,1,1989,962,
+1,1990,3288,16,0,
+325,1,1775,3289,16,
+0,325,1,32,3290,
+16,0,325,1,2105,
+860,1,2106,3291,16,
+0,325,1,2364,873,
+1,2227,954,1,2337,
+3292,16,0,325,1,
+2021,764,1,2458,922,
+1,2459,928,1,2462,
+935,1,2136,888,1,
+2464,945,1,2029,771,
+1,2030,777,1,2031,
+782,1,2032,787,1,
+2033,792,1,2035,798,
+1,2037,803,1,2039,
+808,1,1931,906,1,
+2041,814,1,2043,820,
+1,2045,825,1,1832,
+3293,16,0,296,1,
+1574,845,1,1958,3294,
+16,0,325,1,46,
+3295,19,717,1,46,
+3296,5,38,1,1901,
+3297,16,0,715,1,
+2075,3298,16,0,715,
+1,1860,867,1,1803,
+833,1,1804,3299,16,
+0,715,1,2413,3300,
+16,0,715,1,2198,
+3301,16,0,715,1,
+1873,881,1,1657,940,
+1,1989,962,1,1990,
+3302,16,0,715,1,
+1775,3303,16,0,715,
+1,32,3304,16,0,
+715,1,2105,860,1,
+2106,3305,16,0,715,
+1,2364,873,1,2227,
+954,1,2337,3306,16,
+0,715,1,2021,764,
+1,2458,922,1,2459,
+928,1,2462,935,1,
+2136,888,1,2464,945,
+1,2029,771,1,2030,
+777,1,2031,782,1,
+2032,787,1,2033,792,
+1,2035,798,1,2037,
+803,1,2039,808,1,
+1931,906,1,2041,814,
+1,2043,820,1,2045,
+825,1,1574,845,1,
+1958,3307,16,0,715,
+1,47,3308,19,601,
+1,47,3309,5,19,
+1,0,3310,16,0,
+702,1,2760,3311,17,
+3312,15,3313,4,36,
+37,0,71,0,108,
+0,111,0,98,0,
+97,0,108,0,68,
+0,101,0,102,0,
+105,0,110,0,105,
+0,116,0,105,0,
+111,0,110,0,115,
+0,1,-1,1,5,
+3314,20,3315,4,38,
 71,0,108,0,111,
 0,98,0,97,0,
 108,0,68,0,101,
@@ -8792,38 +9013,14 @@ public yyLSLSyntax
 110,0,105,0,116,
 0,105,0,111,0,
 110,0,115,0,95,
-0,50,0,1,151,
-1,3,1,3,1,
-2,3271,22,1,4,
-1,2743,3272,17,3273,
-15,3263,1,-1,1,
-5,3274,20,3275,4,
-38,71,0,108,0,
-111,0,98,0,97,
-0,108,0,68,0,
-101,0,102,0,105,
-0,110,0,105,0,
-116,0,105,0,111,
-0,110,0,115,0,
-95,0,51,0,1,
-152,1,3,1,2,
-1,1,3276,22,1,
-5,1,2744,3277,17,
-3278,15,3263,1,-1,
-1,5,3279,20,3280,
-4,38,71,0,108,
-0,111,0,98,0,
-97,0,108,0,68,
-0,101,0,102,0,
-105,0,110,0,105,
-0,116,0,105,0,
-111,0,110,0,115,
-0,95,0,49,0,
-1,150,1,3,1,
-2,1,1,3281,22,
-1,3,1,2660,735,
-1,2711,3282,17,3283,
-15,3284,4,52,37,
+0,49,0,1,154,
+1,3,1,2,1,
+1,3316,22,1,3,
+1,2022,3317,16,0,
+599,1,2675,731,1,
+2750,3318,16,0,702,
+1,2738,3319,17,3320,
+15,3321,4,52,37,
 0,71,0,108,0,
 111,0,98,0,97,
 0,108,0,86,0,
@@ -8835,7 +9032,7 @@ public yyLSLSyntax
 0,97,0,116,0,
 105,0,111,0,110,
 0,1,-1,1,5,
-3285,20,3286,4,54,
+3322,20,3323,4,54,
 71,0,108,0,111,
 0,98,0,97,0,
 108,0,86,0,97,
@@ -8846,1839 +9043,1961 @@ public yyLSLSyntax
 0,97,0,114,0,
 97,0,116,0,105,
 0,111,0,110,0,
-95,0,50,0,1,
-155,1,3,1,5,
-1,4,3287,22,1,
-8,1,2664,3288,16,
-0,678,1,2723,3289,
-16,0,678,1,2022,
-3290,16,0,586,1,
-2459,910,1,2683,3291,
-17,3292,15,3293,4,
-50,37,0,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
-70,0,117,0,110,
-0,99,0,116,0,
-105,0,111,0,110,
-0,68,0,101,0,
-102,0,105,0,110,
-0,105,0,116,0,
-105,0,111,0,110,
-0,1,-1,1,5,
-3294,20,3295,4,52,
-71,0,108,0,111,
-0,98,0,97,0,
-108,0,70,0,117,
-0,110,0,99,0,
-116,0,105,0,111,
-0,110,0,68,0,
+95,0,49,0,1,
+158,1,3,1,3,
+1,2,3324,22,1,
+7,1,2680,3325,16,
+0,702,1,2459,928,
+1,2757,3326,17,3327,
+15,3313,1,-1,1,
+5,3328,20,3329,4,
+38,71,0,108,0,
+111,0,98,0,97,
+0,108,0,68,0,
 101,0,102,0,105,
 0,110,0,105,0,
 116,0,105,0,111,
-0,110,0,95,0,
-49,0,1,156,1,
-3,1,6,1,5,
-3296,22,1,9,1,
-2722,3297,17,3298,15,
-3284,1,-1,1,5,
-3299,20,3300,4,54,
-71,0,108,0,111,
-0,98,0,97,0,
-108,0,86,0,97,
-0,114,0,105,0,
-97,0,98,0,108,
-0,101,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-95,0,49,0,1,
-154,1,3,1,3,
-1,2,3301,22,1,
-7,1,2464,927,1,
-2576,713,1,2466,3302,
-17,3303,15,3293,1,
--1,1,5,3304,20,
-3305,4,52,71,0,
+0,110,0,115,0,
+95,0,52,0,1,
+157,1,3,1,3,
+1,2,3330,22,1,
+6,1,2758,3331,17,
+3332,15,3313,1,-1,
+1,5,3333,20,3334,
+4,38,71,0,108,
+0,111,0,98,0,
+97,0,108,0,68,
+0,101,0,102,0,
+105,0,110,0,105,
+0,116,0,105,0,
+111,0,110,0,115,
+0,95,0,50,0,
+1,155,1,3,1,
+3,1,2,3335,22,
+1,4,1,2759,3336,
+17,3337,15,3313,1,
+-1,1,5,3338,20,
+3339,4,38,71,0,
 108,0,111,0,98,
 0,97,0,108,0,
-70,0,117,0,110,
-0,99,0,116,0,
-105,0,111,0,110,
-0,68,0,101,0,
-102,0,105,0,110,
-0,105,0,116,0,
-105,0,111,0,110,
-0,95,0,50,0,
-1,157,1,3,1,
-7,1,6,3306,22,
-1,10,1,2667,719,
-1,2668,707,1,2734,
-3307,16,0,678,1,
-48,3308,19,348,1,
-48,3309,5,54,1,
-0,3310,16,0,346,
-1,2075,3311,16,0,
-518,1,1860,850,1,
-1803,816,1,1804,3312,
-16,0,518,1,2413,
-3313,16,0,518,1,
-2741,3261,1,2742,3267,
-1,2743,3272,1,2744,
-3277,1,1873,864,1,
-1657,922,1,2030,760,
-1,1989,944,1,1990,
-3314,16,0,518,1,
-2459,910,1,1775,3315,
-16,0,518,1,32,
-3316,16,0,518,1,
-2105,843,1,2106,3317,
-16,0,518,1,2576,
-713,1,2683,3291,1,
-2660,735,1,2227,936,
-1,2337,3318,16,0,
-518,1,2667,719,1,
-2037,786,1,2021,747,
-1,2458,904,1,1901,
-3319,16,0,518,1,
-2462,917,1,2136,871,
-1,2464,927,1,2029,
-754,1,2466,3302,1,
-2031,765,1,2032,770,
-1,2033,775,1,2035,
-781,1,2364,856,1,
-2039,791,1,1931,889,
-1,2041,797,1,2043,
-803,1,2045,808,1,
-2664,3320,16,0,346,
-1,2198,3321,16,0,
-518,1,2668,707,1,
-2711,3282,1,2734,3322,
-16,0,346,1,1574,
-828,1,1958,3323,16,
-0,518,1,2722,3297,
-1,2723,3324,16,0,
-346,1,49,3325,19,
-523,1,49,3326,5,
-38,1,1901,3327,16,
-0,521,1,2075,3328,
-16,0,521,1,1860,
-850,1,1803,816,1,
-1804,3329,16,0,521,
-1,2413,3330,16,0,
-521,1,2198,3331,16,
-0,521,1,1873,864,
-1,1657,922,1,1989,
-944,1,1990,3332,16,
-0,521,1,1775,3333,
-16,0,521,1,32,
-3334,16,0,521,1,
-2105,843,1,2106,3335,
-16,0,521,1,2364,
-856,1,2227,936,1,
-2337,3336,16,0,521,
-1,2021,747,1,2458,
-904,1,2459,910,1,
-2462,917,1,2136,871,
-1,2464,927,1,2029,
-754,1,2030,760,1,
-2031,765,1,2032,770,
-1,2033,775,1,2035,
-781,1,2037,786,1,
-2039,791,1,1931,889,
-1,2041,797,1,2043,
-803,1,2045,808,1,
-1574,828,1,1958,3337,
-16,0,521,1,50,
-3338,19,640,1,50,
-3339,5,38,1,1901,
-3340,16,0,638,1,
-2075,3341,16,0,638,
-1,1860,850,1,1803,
-816,1,1804,3342,16,
-0,638,1,2413,3343,
-16,0,638,1,2198,
-3344,16,0,638,1,
-1873,864,1,1657,922,
-1,1989,944,1,1990,
-3345,16,0,638,1,
-1775,3346,16,0,638,
-1,32,3347,16,0,
-638,1,2105,843,1,
-2106,3348,16,0,638,
-1,2364,856,1,2227,
-936,1,2337,3349,16,
-0,638,1,2021,747,
-1,2458,904,1,2459,
-910,1,2462,917,1,
-2136,871,1,2464,927,
-1,2029,754,1,2030,
-760,1,2031,765,1,
-2032,770,1,2033,775,
-1,2035,781,1,2037,
-786,1,2039,791,1,
-1931,889,1,2041,797,
-1,2043,803,1,2045,
-808,1,1574,828,1,
-1958,3350,16,0,638,
-1,51,3351,19,127,
-1,51,3352,5,54,
-1,0,3353,16,0,
-125,1,2075,3354,16,
-0,125,1,1860,850,
-1,1804,3355,16,0,
-125,1,10,3356,16,
-0,125,1,2520,3357,
-16,0,125,1,2337,
-3358,16,0,125,1,
-2413,3359,16,0,125,
-1,2741,3261,1,2742,
-3267,1,2743,3272,1,
-2744,3277,1,1873,864,
-1,21,3360,16,0,
-125,1,1657,922,1,
-2030,760,1,1989,944,
-1,1990,3361,16,0,
-125,1,1775,3362,16,
-0,125,1,32,3363,
-16,0,125,1,2105,
-843,1,2106,3364,16,
-0,125,1,2683,3291,
-1,2227,936,1,1901,
-3365,16,0,125,1,
-52,3366,16,0,125,
-1,2670,3367,16,0,
-125,1,1803,816,1,
-2458,904,1,2459,910,
-1,2462,917,1,2136,
-871,1,2464,927,1,
-2029,754,1,2466,3302,
-1,2031,765,1,2032,
-770,1,2033,775,1,
-2035,781,1,2364,856,
-1,2039,791,1,1931,
-889,1,2041,797,1,
-2021,747,1,2043,803,
-1,2045,808,1,2511,
-3368,16,0,449,1,
-2198,3369,16,0,125,
-1,2711,3282,1,2037,
-786,1,1574,828,1,
-1958,3370,16,0,125,
-1,2722,3297,1,2723,
-3371,16,0,125,1,
-52,3372,19,124,1,
-52,3373,5,53,1,
-0,3374,16,0,122,
-1,2075,3375,16,0,
-122,1,1860,850,1,
-1804,3376,16,0,122,
-1,10,3377,16,0,
-122,1,2520,3378,16,
-0,122,1,2337,3379,
-16,0,122,1,2413,
-3380,16,0,122,1,
-2741,3261,1,2742,3267,
-1,2743,3272,1,2744,
-3277,1,1873,864,1,
-21,3381,16,0,122,
-1,1657,922,1,2030,
-760,1,1989,944,1,
-1990,3382,16,0,122,
-1,1775,3383,16,0,
-122,1,32,3384,16,
-0,122,1,2105,843,
-1,2106,3385,16,0,
-122,1,2683,3291,1,
-2227,936,1,1901,3386,
-16,0,122,1,52,
-3387,16,0,122,1,
-2670,3388,16,0,122,
-1,1803,816,1,2458,
-904,1,2459,910,1,
-2462,917,1,2136,871,
-1,2464,927,1,2029,
-754,1,2466,3302,1,
-2031,765,1,2032,770,
-1,2033,775,1,2035,
-781,1,2364,856,1,
-2039,791,1,1931,889,
-1,2041,797,1,2021,
-747,1,2043,803,1,
-2045,808,1,2198,3389,
-16,0,122,1,2711,
-3282,1,2037,786,1,
-1574,828,1,1958,3390,
-16,0,122,1,2722,
-3297,1,2723,3391,16,
-0,122,1,53,3392,
-19,121,1,53,3393,
-5,53,1,0,3394,
-16,0,119,1,2075,
-3395,16,0,119,1,
-1860,850,1,1804,3396,
-16,0,119,1,10,
-3397,16,0,119,1,
-2520,3398,16,0,119,
-1,2337,3399,16,0,
-119,1,2413,3400,16,
-0,119,1,2741,3261,
-1,2742,3267,1,2743,
-3272,1,2744,3277,1,
-1873,864,1,21,3401,
-16,0,119,1,1657,
-922,1,2030,760,1,
-1989,944,1,1990,3402,
-16,0,119,1,1775,
-3403,16,0,119,1,
-32,3404,16,0,119,
-1,2105,843,1,2106,
-3405,16,0,119,1,
-2683,3291,1,2227,936,
-1,1901,3406,16,0,
-119,1,52,3407,16,
-0,119,1,2670,3408,
-16,0,119,1,1803,
-816,1,2458,904,1,
-2459,910,1,2462,917,
-1,2136,871,1,2464,
-927,1,2029,754,1,
-2466,3302,1,2031,765,
-1,2032,770,1,2033,
-775,1,2035,781,1,
-2364,856,1,2039,791,
-1,1931,889,1,2041,
-797,1,2021,747,1,
-2043,803,1,2045,808,
-1,2198,3409,16,0,
-119,1,2711,3282,1,
-2037,786,1,1574,828,
-1,1958,3410,16,0,
-119,1,2722,3297,1,
-2723,3411,16,0,119,
-1,54,3412,19,118,
-1,54,3413,5,53,
-1,0,3414,16,0,
-116,1,2075,3415,16,
-0,116,1,1860,850,
-1,1804,3416,16,0,
-116,1,10,3417,16,
-0,116,1,2520,3418,
-16,0,116,1,2337,
-3419,16,0,116,1,
-2413,3420,16,0,116,
-1,2741,3261,1,2742,
-3267,1,2743,3272,1,
-2744,3277,1,1873,864,
-1,21,3421,16,0,
-116,1,1657,922,1,
-2030,760,1,1989,944,
-1,1990,3422,16,0,
-116,1,1775,3423,16,
-0,116,1,32,3424,
-16,0,116,1,2105,
-843,1,2106,3425,16,
-0,116,1,2683,3291,
-1,2227,936,1,1901,
-3426,16,0,116,1,
-52,3427,16,0,116,
-1,2670,3428,16,0,
-116,1,1803,816,1,
-2458,904,1,2459,910,
-1,2462,917,1,2136,
-871,1,2464,927,1,
-2029,754,1,2466,3302,
-1,2031,765,1,2032,
-770,1,2033,775,1,
-2035,781,1,2364,856,
-1,2039,791,1,1931,
-889,1,2041,797,1,
-2021,747,1,2043,803,
-1,2045,808,1,2198,
-3429,16,0,116,1,
-2711,3282,1,2037,786,
-1,1574,828,1,1958,
-3430,16,0,116,1,
-2722,3297,1,2723,3431,
-16,0,116,1,55,
-3432,19,115,1,55,
-3433,5,53,1,0,
-3434,16,0,113,1,
-2075,3435,16,0,113,
-1,1860,850,1,1804,
-3436,16,0,113,1,
-10,3437,16,0,113,
-1,2520,3438,16,0,
-113,1,2337,3439,16,
-0,113,1,2413,3440,
-16,0,113,1,2741,
-3261,1,2742,3267,1,
-2743,3272,1,2744,3277,
-1,1873,864,1,21,
-3441,16,0,113,1,
-1657,922,1,2030,760,
-1,1989,944,1,1990,
-3442,16,0,113,1,
-1775,3443,16,0,113,
-1,32,3444,16,0,
-113,1,2105,843,1,
-2106,3445,16,0,113,
-1,2683,3291,1,2227,
-936,1,1901,3446,16,
-0,113,1,52,3447,
-16,0,113,1,2670,
-3448,16,0,113,1,
-1803,816,1,2458,904,
-1,2459,910,1,2462,
-917,1,2136,871,1,
-2464,927,1,2029,754,
-1,2466,3302,1,2031,
-765,1,2032,770,1,
-2033,775,1,2035,781,
-1,2364,856,1,2039,
-791,1,1931,889,1,
-2041,797,1,2021,747,
-1,2043,803,1,2045,
-808,1,2198,3449,16,
-0,113,1,2711,3282,
-1,2037,786,1,1574,
-828,1,1958,3450,16,
-0,113,1,2722,3297,
-1,2723,3451,16,0,
-113,1,56,3452,19,
-112,1,56,3453,5,
-53,1,0,3454,16,
-0,110,1,2075,3455,
+68,0,101,0,102,
+0,105,0,110,0,
+105,0,116,0,105,
+0,111,0,110,0,
+115,0,95,0,51,
+0,1,156,1,3,
+1,2,1,1,3340,
+22,1,5,1,2464,
+945,1,2466,3341,17,
+3342,15,3343,4,50,
+37,0,71,0,108,
+0,111,0,98,0,
+97,0,108,0,70,
+0,117,0,110,0,
+99,0,116,0,105,
+0,111,0,110,0,
+68,0,101,0,102,
+0,105,0,110,0,
+105,0,116,0,105,
+0,111,0,110,0,
+1,-1,1,5,3344,
+20,3345,4,52,71,
+0,108,0,111,0,
+98,0,97,0,108,
+0,70,0,117,0,
+110,0,99,0,116,
+0,105,0,111,0,
+110,0,68,0,101,
+0,102,0,105,0,
+110,0,105,0,116,
+0,105,0,111,0,
+110,0,95,0,50,
+0,1,161,1,3,
+1,7,1,6,3346,
+22,1,10,1,2727,
+3347,17,3348,15,3321,
+1,-1,1,5,3349,
+20,3350,4,54,71,
+0,108,0,111,0,
+98,0,97,0,108,
+0,86,0,97,0,
+114,0,105,0,97,
+0,98,0,108,0,
+101,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,95,
+0,50,0,1,159,
+1,3,1,5,1,
+4,3351,22,1,8,
+1,2739,3352,16,0,
+702,1,2683,753,1,
+2684,742,1,2587,737,
+1,2699,3353,17,3354,
+15,3343,1,-1,1,
+5,3355,20,3356,4,
+52,71,0,108,0,
+111,0,98,0,97,
+0,108,0,70,0,
+117,0,110,0,99,
+0,116,0,105,0,
+111,0,110,0,68,
+0,101,0,102,0,
+105,0,110,0,105,
+0,116,0,105,0,
+111,0,110,0,95,
+0,49,0,1,160,
+1,3,1,6,1,
+5,3357,22,1,9,
+1,48,3358,19,353,
+1,48,3359,5,54,
+1,0,3360,16,0,
+351,1,2462,935,1,
+2075,3361,16,0,533,
+1,1860,867,1,1803,
+833,1,1804,3362,16,
+0,533,1,2757,3326,
+1,2738,3319,1,2739,
+3363,16,0,351,1,
+2413,3364,16,0,533,
+1,2198,3365,16,0,
+533,1,1873,881,1,
+1657,940,1,2030,777,
+1,2750,3366,16,0,
+351,1,1989,962,1,
+1990,3367,16,0,533,
+1,2459,928,1,1775,
+3368,16,0,533,1,
+32,3369,16,0,533,
+1,2758,3331,1,2105,
+860,1,2760,3311,1,
+2045,825,1,2683,753,
+1,2684,742,1,2227,
+954,1,2337,3370,16,
+0,533,1,2021,764,
+1,2458,922,1,1901,
+3371,16,0,533,1,
+2680,3372,16,0,351,
+1,2136,888,1,2464,
+945,1,2029,771,1,
+2466,3341,1,2031,782,
+1,2032,787,1,2033,
+792,1,2675,731,1,
+2035,798,1,2364,873,
+1,2039,808,1,1931,
+906,1,2041,814,1,
+2587,737,1,2043,820,
+1,2699,3353,1,2727,
+3347,1,2037,803,1,
+1574,845,1,2759,3336,
+1,2106,3373,16,0,
+533,1,1958,3374,16,
+0,533,1,49,3375,
+19,538,1,49,3376,
+5,38,1,1901,3377,
+16,0,536,1,2075,
+3378,16,0,536,1,
+1860,867,1,1803,833,
+1,1804,3379,16,0,
+536,1,2413,3380,16,
+0,536,1,2198,3381,
+16,0,536,1,1873,
+881,1,1657,940,1,
+1989,962,1,1990,3382,
+16,0,536,1,1775,
+3383,16,0,536,1,
+32,3384,16,0,536,
+1,2105,860,1,2106,
+3385,16,0,536,1,
+2364,873,1,2227,954,
+1,2337,3386,16,0,
+536,1,2021,764,1,
+2458,922,1,2459,928,
+1,2462,935,1,2136,
+888,1,2464,945,1,
+2029,771,1,2030,777,
+1,2031,782,1,2032,
+787,1,2033,792,1,
+2035,798,1,2037,803,
+1,2039,808,1,1931,
+906,1,2041,814,1,
+2043,820,1,2045,825,
+1,1574,845,1,1958,
+3387,16,0,536,1,
+50,3388,19,649,1,
+50,3389,5,38,1,
+1901,3390,16,0,647,
+1,2075,3391,16,0,
+647,1,1860,867,1,
+1803,833,1,1804,3392,
+16,0,647,1,2413,
+3393,16,0,647,1,
+2198,3394,16,0,647,
+1,1873,881,1,1657,
+940,1,1989,962,1,
+1990,3395,16,0,647,
+1,1775,3396,16,0,
+647,1,32,3397,16,
+0,647,1,2105,860,
+1,2106,3398,16,0,
+647,1,2364,873,1,
+2227,954,1,2337,3399,
+16,0,647,1,2021,
+764,1,2458,922,1,
+2459,928,1,2462,935,
+1,2136,888,1,2464,
+945,1,2029,771,1,
+2030,777,1,2031,782,
+1,2032,787,1,2033,
+792,1,2035,798,1,
+2037,803,1,2039,808,
+1,1931,906,1,2041,
+814,1,2043,820,1,
+2045,825,1,1574,845,
+1,1958,3400,16,0,
+647,1,51,3401,19,
+127,1,51,3402,5,
+54,1,0,3403,16,
+0,125,1,2727,3347,
+1,2075,3404,16,0,
+125,1,1860,867,1,
+2515,3405,16,0,462,
+1,1804,3406,16,0,
+125,1,10,3407,16,
+0,125,1,2757,3326,
+1,2738,3319,1,2739,
+3408,16,0,125,1,
+2413,3409,16,0,125,
+1,2198,3410,16,0,
+125,1,1657,940,1,
+1873,881,1,21,3411,
+16,0,125,1,2529,
+3412,16,0,125,1,
+2030,777,1,1989,962,
+1,1990,3413,16,0,
+125,1,2459,928,1,
+1775,3414,16,0,125,
+1,32,3415,16,0,
+125,1,2758,3331,1,
+2105,860,1,2760,3311,
+1,2045,825,1,2686,
+3416,16,0,125,1,
+2227,954,1,2337,3417,
+16,0,125,1,52,
+3418,16,0,125,1,
+1803,833,1,2458,922,
+1,1901,3419,16,0,
+125,1,2462,935,1,
+2136,888,1,2464,945,
+1,2029,771,1,2466,
+3341,1,2031,782,1,
+2032,787,1,2033,792,
+1,2035,798,1,2364,
+873,1,2039,808,1,
+1931,906,1,2041,814,
+1,2021,764,1,2043,
+820,1,2699,3353,1,
+2037,803,1,1574,845,
+1,2759,3336,1,2106,
+3420,16,0,125,1,
+1958,3421,16,0,125,
+1,52,3422,19,124,
+1,52,3423,5,53,
+1,0,3424,16,0,
+122,1,2727,3347,1,
+2075,3425,16,0,122,
+1,1860,867,1,1804,
+3426,16,0,122,1,
+10,3427,16,0,122,
+1,2757,3326,1,2738,
+3319,1,2739,3428,16,
+0,122,1,2413,3429,
+16,0,122,1,2198,
+3430,16,0,122,1,
+1657,940,1,1873,881,
+1,21,3431,16,0,
+122,1,2529,3432,16,
+0,122,1,2030,777,
+1,1989,962,1,1990,
+3433,16,0,122,1,
+2459,928,1,1775,3434,
+16,0,122,1,32,
+3435,16,0,122,1,
+2758,3331,1,2105,860,
+1,2760,3311,1,2045,
+825,1,2686,3436,16,
+0,122,1,2227,954,
+1,2337,3437,16,0,
+122,1,52,3438,16,
+0,122,1,1803,833,
+1,2458,922,1,1901,
+3439,16,0,122,1,
+2462,935,1,2136,888,
+1,2464,945,1,2029,
+771,1,2466,3341,1,
+2031,782,1,2032,787,
+1,2033,792,1,2035,
+798,1,2364,873,1,
+2039,808,1,1931,906,
+1,2041,814,1,2021,
+764,1,2043,820,1,
+2699,3353,1,2037,803,
+1,1574,845,1,2759,
+3336,1,2106,3440,16,
+0,122,1,1958,3441,
+16,0,122,1,53,
+3442,19,121,1,53,
+3443,5,53,1,0,
+3444,16,0,119,1,
+2727,3347,1,2075,3445,
+16,0,119,1,1860,
+867,1,1804,3446,16,
+0,119,1,10,3447,
+16,0,119,1,2757,
+3326,1,2738,3319,1,
+2739,3448,16,0,119,
+1,2413,3449,16,0,
+119,1,2198,3450,16,
+0,119,1,1657,940,
+1,1873,881,1,21,
+3451,16,0,119,1,
+2529,3452,16,0,119,
+1,2030,777,1,1989,
+962,1,1990,3453,16,
+0,119,1,2459,928,
+1,1775,3454,16,0,
+119,1,32,3455,16,
+0,119,1,2758,3331,
+1,2105,860,1,2760,
+3311,1,2045,825,1,
+2686,3456,16,0,119,
+1,2227,954,1,2337,
+3457,16,0,119,1,
+52,3458,16,0,119,
+1,1803,833,1,2458,
+922,1,1901,3459,16,
+0,119,1,2462,935,
+1,2136,888,1,2464,
+945,1,2029,771,1,
+2466,3341,1,2031,782,
+1,2032,787,1,2033,
+792,1,2035,798,1,
+2364,873,1,2039,808,
+1,1931,906,1,2041,
+814,1,2021,764,1,
+2043,820,1,2699,3353,
+1,2037,803,1,1574,
+845,1,2759,3336,1,
+2106,3460,16,0,119,
+1,1958,3461,16,0,
+119,1,54,3462,19,
+118,1,54,3463,5,
+53,1,0,3464,16,
+0,116,1,2727,3347,
+1,2075,3465,16,0,
+116,1,1860,867,1,
+1804,3466,16,0,116,
+1,10,3467,16,0,
+116,1,2757,3326,1,
+2738,3319,1,2739,3468,
+16,0,116,1,2413,
+3469,16,0,116,1,
+2198,3470,16,0,116,
+1,1657,940,1,1873,
+881,1,21,3471,16,
+0,116,1,2529,3472,
+16,0,116,1,2030,
+777,1,1989,962,1,
+1990,3473,16,0,116,
+1,2459,928,1,1775,
+3474,16,0,116,1,
+32,3475,16,0,116,
+1,2758,3331,1,2105,
+860,1,2760,3311,1,
+2045,825,1,2686,3476,
+16,0,116,1,2227,
+954,1,2337,3477,16,
+0,116,1,52,3478,
+16,0,116,1,1803,
+833,1,2458,922,1,
+1901,3479,16,0,116,
+1,2462,935,1,2136,
+888,1,2464,945,1,
+2029,771,1,2466,3341,
+1,2031,782,1,2032,
+787,1,2033,792,1,
+2035,798,1,2364,873,
+1,2039,808,1,1931,
+906,1,2041,814,1,
+2021,764,1,2043,820,
+1,2699,3353,1,2037,
+803,1,1574,845,1,
+2759,3336,1,2106,3480,
+16,0,116,1,1958,
+3481,16,0,116,1,
+55,3482,19,115,1,
+55,3483,5,54,1,
+0,3484,16,0,113,
+1,2727,3347,1,2075,
+3485,16,0,113,1,
+1860,867,1,1804,3486,
+16,0,113,1,10,
+3487,16,0,113,1,
+2757,3326,1,2738,3319,
+1,2739,3488,16,0,
+113,1,2413,3489,16,
+0,113,1,2198,3490,
+16,0,113,1,1657,
+940,1,1873,881,1,
+21,3491,16,0,113,
+1,2529,3492,16,0,
+113,1,2030,777,1,
+1989,962,1,1990,3493,
+16,0,113,1,2459,
+928,1,1775,3494,16,
+0,113,1,32,3495,
+16,0,113,1,2758,
+3331,1,2105,860,1,
+2760,3311,1,2045,825,
+1,2686,3496,16,0,
+113,1,2227,954,1,
+2337,3497,16,0,113,
+1,52,3498,16,0,
+113,1,1803,833,1,
+2458,922,1,1901,3499,
+16,0,113,1,2462,
+935,1,2136,888,1,
+2464,945,1,2029,771,
+1,2466,3341,1,2031,
+782,1,2032,787,1,
+2033,792,1,2035,798,
+1,2364,873,1,2039,
+808,1,1931,906,1,
+2041,814,1,2021,764,
+1,2043,820,1,2699,
+3353,1,2037,803,1,
+1574,845,1,2759,3336,
+1,2106,3500,16,0,
+113,1,1958,3501,16,
+0,113,1,2506,3502,
+16,0,448,1,56,
+3503,19,112,1,56,
+3504,5,53,1,0,
+3505,16,0,110,1,
+2727,3347,1,2075,3506,
 16,0,110,1,1860,
-850,1,1804,3456,16,
-0,110,1,10,3457,
-16,0,110,1,2520,
-3458,16,0,110,1,
-2337,3459,16,0,110,
-1,2413,3460,16,0,
-110,1,2741,3261,1,
-2742,3267,1,2743,3272,
-1,2744,3277,1,1873,
-864,1,21,3461,16,
-0,110,1,1657,922,
-1,2030,760,1,1989,
-944,1,1990,3462,16,
-0,110,1,1775,3463,
-16,0,110,1,32,
-3464,16,0,110,1,
-2105,843,1,2106,3465,
-16,0,110,1,2683,
-3291,1,2227,936,1,
-1901,3466,16,0,110,
-1,52,3467,16,0,
-110,1,2670,3468,16,
-0,110,1,1803,816,
-1,2458,904,1,2459,
-910,1,2462,917,1,
-2136,871,1,2464,927,
-1,2029,754,1,2466,
-3302,1,2031,765,1,
-2032,770,1,2033,775,
-1,2035,781,1,2364,
-856,1,2039,791,1,
-1931,889,1,2041,797,
-1,2021,747,1,2043,
-803,1,2045,808,1,
-2198,3469,16,0,110,
-1,2711,3282,1,2037,
-786,1,1574,828,1,
-1958,3470,16,0,110,
-1,2722,3297,1,2723,
-3471,16,0,110,1,
-57,3472,19,109,1,
-57,3473,5,53,1,
-0,3474,16,0,107,
-1,2075,3475,16,0,
-107,1,1860,850,1,
-1804,3476,16,0,107,
-1,10,3477,16,0,
-107,1,2520,3478,16,
-0,107,1,2337,3479,
+867,1,1804,3507,16,
+0,110,1,10,3508,
+16,0,110,1,2757,
+3326,1,2738,3319,1,
+2739,3509,16,0,110,
+1,2413,3510,16,0,
+110,1,2198,3511,16,
+0,110,1,1657,940,
+1,1873,881,1,21,
+3512,16,0,110,1,
+2529,3513,16,0,110,
+1,2030,777,1,1989,
+962,1,1990,3514,16,
+0,110,1,2459,928,
+1,1775,3515,16,0,
+110,1,32,3516,16,
+0,110,1,2758,3331,
+1,2105,860,1,2760,
+3311,1,2045,825,1,
+2686,3517,16,0,110,
+1,2227,954,1,2337,
+3518,16,0,110,1,
+52,3519,16,0,110,
+1,1803,833,1,2458,
+922,1,1901,3520,16,
+0,110,1,2462,935,
+1,2136,888,1,2464,
+945,1,2029,771,1,
+2466,3341,1,2031,782,
+1,2032,787,1,2033,
+792,1,2035,798,1,
+2364,873,1,2039,808,
+1,1931,906,1,2041,
+814,1,2021,764,1,
+2043,820,1,2699,3353,
+1,2037,803,1,1574,
+845,1,2759,3336,1,
+2106,3521,16,0,110,
+1,1958,3522,16,0,
+110,1,57,3523,19,
+109,1,57,3524,5,
+53,1,0,3525,16,
+0,107,1,2727,3347,
+1,2075,3526,16,0,
+107,1,1860,867,1,
+1804,3527,16,0,107,
+1,10,3528,16,0,
+107,1,2757,3326,1,
+2738,3319,1,2739,3529,
 16,0,107,1,2413,
-3480,16,0,107,1,
-2741,3261,1,2742,3267,
-1,2743,3272,1,2744,
-3277,1,1873,864,1,
-21,3481,16,0,107,
-1,1657,922,1,2030,
-760,1,1989,944,1,
-1990,3482,16,0,107,
-1,1775,3483,16,0,
-107,1,32,3484,16,
-0,107,1,2105,843,
-1,2106,3485,16,0,
-107,1,2683,3291,1,
-2227,936,1,1901,3486,
-16,0,107,1,52,
-3487,16,0,107,1,
-2670,3488,16,0,107,
-1,1803,816,1,2458,
-904,1,2459,910,1,
-2462,917,1,2136,871,
-1,2464,927,1,2029,
-754,1,2466,3302,1,
-2031,765,1,2032,770,
-1,2033,775,1,2035,
-781,1,2364,856,1,
-2039,791,1,1931,889,
-1,2041,797,1,2021,
-747,1,2043,803,1,
-2045,808,1,2198,3489,
-16,0,107,1,2711,
-3282,1,2037,786,1,
-1574,828,1,1958,3490,
-16,0,107,1,2722,
-3297,1,2723,3491,16,
-0,107,1,58,3492,
-19,438,1,58,3493,
-5,15,1,2581,3494,
-16,0,436,1,2518,
-1655,1,2459,910,1,
-2535,3495,16,0,436,
-1,2573,1664,1,2574,
-1670,1,2464,927,1,
-2577,1685,1,2578,1680,
-1,2533,1695,1,2470,
-3496,16,0,436,1,
-2619,3497,16,0,436,
-1,2509,1648,1,2575,
-1675,1,2579,1690,1,
-59,3498,19,435,1,
-59,3499,5,15,1,
-2581,3500,16,0,433,
-1,2518,1655,1,2459,
-910,1,2535,3501,16,
-0,433,1,2573,1664,
-1,2574,1670,1,2464,
-927,1,2577,1685,1,
-2578,1680,1,2533,1695,
-1,2470,3502,16,0,
-433,1,2619,3503,16,
-0,433,1,2509,1648,
-1,2575,1675,1,2579,
-1690,1,60,3504,19,
-432,1,60,3505,5,
-15,1,2581,3506,16,
-0,430,1,2518,1655,
-1,2459,910,1,2535,
-3507,16,0,430,1,
-2573,1664,1,2574,1670,
-1,2464,927,1,2577,
-1685,1,2578,1680,1,
-2533,1695,1,2470,3508,
-16,0,430,1,2619,
-3509,16,0,430,1,
-2509,1648,1,2575,1675,
-1,2579,1690,1,61,
-3510,19,491,1,61,
-3511,5,15,1,2581,
-3512,16,0,489,1,
-2518,1655,1,2459,910,
-1,2535,3513,16,0,
-489,1,2573,1664,1,
-2574,1670,1,2464,927,
-1,2577,1685,1,2578,
-1680,1,2533,1695,1,
-2470,3514,16,0,489,
-1,2619,3515,16,0,
-489,1,2509,1648,1,
-2575,1675,1,2579,1690,
-1,62,3516,19,399,
-1,62,3517,5,15,
-1,2581,3518,16,0,
-397,1,2518,1655,1,
-2459,910,1,2535,3519,
-16,0,397,1,2573,
-1664,1,2574,1670,1,
-2464,927,1,2577,1685,
-1,2578,1680,1,2533,
-1695,1,2470,3520,16,
-0,397,1,2619,3521,
-16,0,397,1,2509,
-1648,1,2575,1675,1,
-2579,1690,1,63,3522,
-19,396,1,63,3523,
-5,15,1,2581,3524,
-16,0,394,1,2518,
-1655,1,2459,910,1,
-2535,3525,16,0,394,
-1,2573,1664,1,2574,
-1670,1,2464,927,1,
-2577,1685,1,2578,1680,
-1,2533,1695,1,2470,
-3526,16,0,394,1,
-2619,3527,16,0,394,
-1,2509,1648,1,2575,
-1675,1,2579,1690,1,
-64,3528,19,488,1,
-64,3529,5,15,1,
-2581,3530,16,0,486,
-1,2518,1655,1,2459,
-910,1,2535,3531,16,
-0,486,1,2573,1664,
-1,2574,1670,1,2464,
-927,1,2577,1685,1,
-2578,1680,1,2533,1695,
-1,2470,3532,16,0,
-486,1,2619,3533,16,
-0,486,1,2509,1648,
-1,2575,1675,1,2579,
-1690,1,65,3534,19,
-429,1,65,3535,5,
-15,1,2581,3536,16,
-0,427,1,2518,1655,
-1,2459,910,1,2535,
-3537,16,0,427,1,
-2573,1664,1,2574,1670,
-1,2464,927,1,2577,
-1685,1,2578,1680,1,
-2533,1695,1,2470,3538,
-16,0,427,1,2619,
-3539,16,0,427,1,
-2509,1648,1,2575,1675,
-1,2579,1690,1,66,
-3540,19,426,1,66,
-3541,5,15,1,2581,
-3542,16,0,424,1,
-2518,1655,1,2459,910,
-1,2535,3543,16,0,
-424,1,2573,1664,1,
-2574,1670,1,2464,927,
-1,2577,1685,1,2578,
-1680,1,2533,1695,1,
-2470,3544,16,0,424,
-1,2619,3545,16,0,
-424,1,2509,1648,1,
-2575,1675,1,2579,1690,
-1,67,3546,19,423,
-1,67,3547,5,15,
-1,2581,3548,16,0,
-421,1,2518,1655,1,
-2459,910,1,2535,3549,
-16,0,421,1,2573,
-1664,1,2574,1670,1,
-2464,927,1,2577,1685,
-1,2578,1680,1,2533,
-1695,1,2470,3550,16,
-0,421,1,2619,3551,
-16,0,421,1,2509,
-1648,1,2575,1675,1,
-2579,1690,1,68,3552,
-19,673,1,68,3553,
-5,15,1,2581,3554,
-16,0,671,1,2518,
-1655,1,2459,910,1,
-2535,3555,16,0,671,
-1,2573,1664,1,2574,
-1670,1,2464,927,1,
-2577,1685,1,2578,1680,
-1,2533,1695,1,2470,
-3556,16,0,671,1,
-2619,3557,16,0,671,
-1,2509,1648,1,2575,
-1675,1,2579,1690,1,
-69,3558,19,419,1,
-69,3559,5,15,1,
-2581,3560,16,0,417,
-1,2518,1655,1,2459,
-910,1,2535,3561,16,
-0,417,1,2573,1664,
-1,2574,1670,1,2464,
-927,1,2577,1685,1,
-2578,1680,1,2533,1695,
-1,2470,3562,16,0,
-417,1,2619,3563,16,
-0,417,1,2509,1648,
-1,2575,1675,1,2579,
-1690,1,70,3564,19,
-513,1,70,3565,5,
-15,1,2581,3566,16,
-0,511,1,2518,1655,
-1,2459,910,1,2535,
-3567,16,0,511,1,
-2573,1664,1,2574,1670,
-1,2464,927,1,2577,
-1685,1,2578,1680,1,
-2533,1695,1,2470,3568,
-16,0,511,1,2619,
-3569,16,0,511,1,
-2509,1648,1,2575,1675,
-1,2579,1690,1,71,
-3570,19,415,1,71,
-3571,5,15,1,2581,
-3572,16,0,413,1,
-2518,1655,1,2459,910,
-1,2535,3573,16,0,
-413,1,2573,1664,1,
-2574,1670,1,2464,927,
-1,2577,1685,1,2578,
-1680,1,2533,1695,1,
-2470,3574,16,0,413,
-1,2619,3575,16,0,
-413,1,2509,1648,1,
-2575,1675,1,2579,1690,
-1,72,3576,19,412,
-1,72,3577,5,15,
-1,2581,3578,16,0,
-410,1,2518,1655,1,
-2459,910,1,2535,3579,
-16,0,410,1,2573,
-1664,1,2574,1670,1,
-2464,927,1,2577,1685,
-1,2578,1680,1,2533,
-1695,1,2470,3580,16,
-0,410,1,2619,3581,
-16,0,410,1,2509,
-1648,1,2575,1675,1,
-2579,1690,1,73,3582,
-19,503,1,73,3583,
-5,15,1,2581,3584,
-16,0,501,1,2518,
-1655,1,2459,910,1,
-2535,3585,16,0,501,
-1,2573,1664,1,2574,
-1670,1,2464,927,1,
-2577,1685,1,2578,1680,
-1,2533,1695,1,2470,
-3586,16,0,501,1,
-2619,3587,16,0,501,
-1,2509,1648,1,2575,
-1675,1,2579,1690,1,
-74,3588,19,408,1,
-74,3589,5,15,1,
-2581,3590,16,0,406,
-1,2518,1655,1,2459,
-910,1,2535,3591,16,
-0,406,1,2573,1664,
-1,2574,1670,1,2464,
-927,1,2577,1685,1,
-2578,1680,1,2533,1695,
-1,2470,3592,16,0,
-406,1,2619,3593,16,
-0,406,1,2509,1648,
-1,2575,1675,1,2579,
-1690,1,75,3594,19,
-368,1,75,3595,5,
-15,1,2581,3596,16,
-0,366,1,2518,1655,
-1,2459,910,1,2535,
-3597,16,0,366,1,
-2573,1664,1,2574,1670,
-1,2464,927,1,2577,
-1685,1,2578,1680,1,
-2533,1695,1,2470,3598,
-16,0,366,1,2619,
-3599,16,0,366,1,
-2509,1648,1,2575,1675,
-1,2579,1690,1,76,
-3600,19,365,1,76,
-3601,5,15,1,2581,
-3602,16,0,363,1,
-2518,1655,1,2459,910,
-1,2535,3603,16,0,
-363,1,2573,1664,1,
-2574,1670,1,2464,927,
-1,2577,1685,1,2578,
-1680,1,2533,1695,1,
-2470,3604,16,0,363,
-1,2619,3605,16,0,
-363,1,2509,1648,1,
-2575,1675,1,2579,1690,
-1,77,3606,19,362,
-1,77,3607,5,15,
-1,2581,3608,16,0,
-360,1,2518,1655,1,
-2459,910,1,2535,3609,
-16,0,360,1,2573,
-1664,1,2574,1670,1,
-2464,927,1,2577,1685,
-1,2578,1680,1,2533,
-1695,1,2470,3610,16,
-0,360,1,2619,3611,
-16,0,360,1,2509,
-1648,1,2575,1675,1,
-2579,1690,1,78,3612,
-19,359,1,78,3613,
-5,15,1,2581,3614,
-16,0,357,1,2518,
-1655,1,2459,910,1,
-2535,3615,16,0,357,
-1,2573,1664,1,2574,
-1670,1,2464,927,1,
-2577,1685,1,2578,1680,
-1,2533,1695,1,2470,
-3616,16,0,357,1,
-2619,3617,16,0,357,
-1,2509,1648,1,2575,
-1675,1,2579,1690,1,
-79,3618,19,356,1,
-79,3619,5,15,1,
-2581,3620,16,0,354,
-1,2518,1655,1,2459,
-910,1,2535,3621,16,
-0,354,1,2573,1664,
-1,2574,1670,1,2464,
-927,1,2577,1685,1,
-2578,1680,1,2533,1695,
-1,2470,3622,16,0,
-354,1,2619,3623,16,
-0,354,1,2509,1648,
-1,2575,1675,1,2579,
-1690,1,80,3624,19,
-500,1,80,3625,5,
-15,1,2581,3626,16,
-0,498,1,2518,1655,
-1,2459,910,1,2535,
-3627,16,0,498,1,
-2573,1664,1,2574,1670,
-1,2464,927,1,2577,
-1685,1,2578,1680,1,
-2533,1695,1,2470,3628,
-16,0,498,1,2619,
-3629,16,0,498,1,
-2509,1648,1,2575,1675,
-1,2579,1690,1,81,
-3630,19,585,1,81,
-3631,5,15,1,2581,
-3632,16,0,583,1,
-2518,1655,1,2459,910,
-1,2535,3633,16,0,
-583,1,2573,1664,1,
-2574,1670,1,2464,927,
-1,2577,1685,1,2578,
-1680,1,2533,1695,1,
-2470,3634,16,0,583,
-1,2619,3635,16,0,
-583,1,2509,1648,1,
-2575,1675,1,2579,1690,
-1,82,3636,19,497,
-1,82,3637,5,15,
-1,2581,3638,16,0,
-495,1,2518,1655,1,
-2459,910,1,2535,3639,
-16,0,495,1,2573,
-1664,1,2574,1670,1,
-2464,927,1,2577,1685,
-1,2578,1680,1,2533,
-1695,1,2470,3640,16,
-0,495,1,2619,3641,
-16,0,495,1,2509,
-1648,1,2575,1675,1,
-2579,1690,1,83,3642,
-19,389,1,83,3643,
-5,15,1,2581,3644,
-16,0,387,1,2518,
-1655,1,2459,910,1,
-2535,3645,16,0,387,
-1,2573,1664,1,2574,
-1670,1,2464,927,1,
-2577,1685,1,2578,1680,
-1,2533,1695,1,2470,
-3646,16,0,387,1,
-2619,3647,16,0,387,
-1,2509,1648,1,2575,
-1675,1,2579,1690,1,
-84,3648,19,386,1,
-84,3649,5,15,1,
-2581,3650,16,0,384,
-1,2518,1655,1,2459,
-910,1,2535,3651,16,
-0,384,1,2573,1664,
-1,2574,1670,1,2464,
-927,1,2577,1685,1,
-2578,1680,1,2533,1695,
-1,2470,3652,16,0,
-384,1,2619,3653,16,
-0,384,1,2509,1648,
-1,2575,1675,1,2579,
-1690,1,85,3654,19,
-374,1,85,3655,5,
-15,1,2581,3656,16,
-0,372,1,2518,1655,
-1,2459,910,1,2535,
-3657,16,0,372,1,
-2573,1664,1,2574,1670,
-1,2464,927,1,2577,
-1685,1,2578,1680,1,
-2533,1695,1,2470,3658,
-16,0,372,1,2619,
-3659,16,0,372,1,
-2509,1648,1,2575,1675,
-1,2579,1690,1,86,
-3660,19,371,1,86,
-3661,5,15,1,2581,
-3662,16,0,369,1,
-2518,1655,1,2459,910,
-1,2535,3663,16,0,
-369,1,2573,1664,1,
-2574,1670,1,2464,927,
-1,2577,1685,1,2578,
-1680,1,2533,1695,1,
-2470,3664,16,0,369,
-1,2619,3665,16,0,
-369,1,2509,1648,1,
-2575,1675,1,2579,1690,
-1,87,3666,19,353,
-1,87,3667,5,15,
-1,2581,3668,16,0,
-351,1,2518,1655,1,
-2459,910,1,2535,3669,
-16,0,351,1,2573,
-1664,1,2574,1670,1,
-2464,927,1,2577,1685,
-1,2578,1680,1,2533,
-1695,1,2470,3670,16,
-0,351,1,2619,3671,
-16,0,351,1,2509,
-1648,1,2575,1675,1,
-2579,1690,1,88,3672,
-19,383,1,88,3673,
-5,15,1,2581,3674,
-16,0,381,1,2518,
-1655,1,2459,910,1,
-2535,3675,16,0,381,
-1,2573,1664,1,2574,
-1670,1,2464,927,1,
-2577,1685,1,2578,1680,
-1,2533,1695,1,2470,
-3676,16,0,381,1,
-2619,3677,16,0,381,
-1,2509,1648,1,2575,
-1675,1,2579,1690,1,
-89,3678,19,377,1,
-89,3679,5,15,1,
-2581,3680,16,0,375,
-1,2518,1655,1,2459,
-910,1,2535,3681,16,
-0,375,1,2573,1664,
-1,2574,1670,1,2464,
-927,1,2577,1685,1,
-2578,1680,1,2533,1695,
-1,2470,3682,16,0,
-375,1,2619,3683,16,
-0,375,1,2509,1648,
-1,2575,1675,1,2579,
-1690,1,90,3684,19,
-380,1,90,3685,5,
-15,1,2581,3686,16,
-0,378,1,2518,1655,
-1,2459,910,1,2535,
-3687,16,0,378,1,
-2573,1664,1,2574,1670,
-1,2464,927,1,2577,
-1685,1,2578,1680,1,
-2533,1695,1,2470,3688,
-16,0,378,1,2619,
-3689,16,0,378,1,
-2509,1648,1,2575,1675,
-1,2579,1690,1,91,
-3690,19,494,1,91,
-3691,5,15,1,2581,
-3692,16,0,492,1,
-2518,1655,1,2459,910,
-1,2535,3693,16,0,
-492,1,2573,1664,1,
-2574,1670,1,2464,927,
-1,2577,1685,1,2578,
-1680,1,2533,1695,1,
-2470,3694,16,0,492,
-1,2619,3695,16,0,
-492,1,2509,1648,1,
-2575,1675,1,2579,1690,
-1,92,3696,19,133,
-1,92,3697,5,126,
-1,0,3698,16,0,
-189,1,1,2017,1,
-2,2023,1,3,2028,
-1,4,2033,1,5,
-2038,1,6,2043,1,
-7,2048,1,8,3699,
-16,0,131,1,1515,
-3700,16,0,165,1,
-2686,3701,16,0,173,
-1,2021,747,1,2022,
-3702,16,0,520,1,
-256,3703,16,0,173,
-1,2025,3704,16,0,
-524,1,18,3705,16,
-0,138,1,2027,3706,
-16,0,528,1,2029,
-754,1,2030,760,1,
-2031,765,1,2032,770,
-1,2033,775,1,277,
-3707,16,0,173,1,
-2035,781,1,2037,786,
-1,2039,791,1,32,
-3708,16,0,165,1,
-2041,797,1,2293,3709,
-16,0,173,1,2043,
-803,1,2711,3282,1,
-2045,808,1,41,3710,
-16,0,173,1,1297,
-3711,16,0,165,1,
-43,3712,16,0,173,
-1,1989,944,1,46,
-3713,16,0,178,1,
-1804,3714,16,0,165,
-1,299,3715,16,0,
-173,1,52,3716,16,
-0,165,1,509,3717,
-16,0,173,1,2318,
-3718,16,0,165,1,
-62,3719,16,0,196,
-1,65,3720,16,0,
-198,1,2075,3721,16,
-0,165,1,1574,828,
-1,2743,3272,1,71,
-3722,16,0,173,1,
-1775,3723,16,0,165,
-1,76,3724,16,0,
-173,1,1834,3725,16,
-0,165,1,2337,3726,
-16,0,165,1,79,
-3727,16,0,173,1,
-1335,3728,16,0,165,
-1,2512,3729,16,0,
-450,1,322,3730,16,
-0,173,1,85,3731,
-16,0,173,1,1261,
-3732,16,0,165,1,
-89,3733,16,0,173,
-1,346,3734,16,0,
-173,1,97,3735,16,
-0,173,1,2106,3736,
-16,0,165,1,102,
-3737,16,0,173,1,
-1860,850,1,1803,816,
-1,2364,856,1,1113,
-3738,16,0,158,1,
-112,3739,16,0,173,
-1,1117,3740,16,0,
-165,1,1873,864,1,
-1876,3741,16,0,165,
-1,372,3742,16,0,
-558,1,374,3743,16,
-0,560,1,124,3744,
-16,0,173,1,376,
-3745,16,0,562,1,
-378,3746,16,0,564,
-1,2136,871,1,381,
-3747,16,0,173,1,
-525,3748,16,0,173,
-1,137,3749,16,0,
-173,1,1901,3750,16,
-0,165,1,1153,3751,
-16,0,165,1,151,
-3752,16,0,173,1,
-1407,3753,16,0,165,
-1,1659,3754,16,0,
-165,1,2413,3755,16,
-0,165,1,406,3756,
-16,0,173,1,1371,
-3757,16,0,165,1,
-2105,843,1,166,3758,
-16,0,173,1,1622,
-3759,16,0,173,1,
-2683,3291,1,1931,889,
-1,1933,3760,16,0,
-165,1,431,3761,16,
-0,173,1,1585,3762,
+3530,16,0,107,1,
+2198,3531,16,0,107,
+1,1657,940,1,1873,
+881,1,21,3532,16,
+0,107,1,2529,3533,
+16,0,107,1,2030,
+777,1,1989,962,1,
+1990,3534,16,0,107,
+1,2459,928,1,1775,
+3535,16,0,107,1,
+32,3536,16,0,107,
+1,2758,3331,1,2105,
+860,1,2760,3311,1,
+2045,825,1,2686,3537,
+16,0,107,1,2227,
+954,1,2337,3538,16,
+0,107,1,52,3539,
+16,0,107,1,1803,
+833,1,2458,922,1,
+1901,3540,16,0,107,
+1,2462,935,1,2136,
+888,1,2464,945,1,
+2029,771,1,2466,3341,
+1,2031,782,1,2032,
+787,1,2033,792,1,
+2035,798,1,2364,873,
+1,2039,808,1,1931,
+906,1,2041,814,1,
+2021,764,1,2043,820,
+1,2699,3353,1,2037,
+803,1,1574,845,1,
+2759,3336,1,2106,3541,
+16,0,107,1,1958,
+3542,16,0,107,1,
+58,3543,19,443,1,
+58,3544,5,18,1,
+2590,1725,1,2591,1730,
+1,2593,3545,16,0,
+441,1,2632,3546,16,
+0,441,1,2522,1673,
+1,2588,1715,1,2527,
+1680,1,2459,928,1,
+2464,945,1,2542,1687,
+1,2544,3547,16,0,
+441,1,2583,1710,1,
+2584,1694,1,2585,1700,
+1,2586,1705,1,2513,
+1667,1,2470,3548,16,
+0,441,1,2589,1720,
+1,59,3549,19,440,
+1,59,3550,5,18,
+1,2590,1725,1,2591,
+1730,1,2593,3551,16,
+0,438,1,2632,3552,
+16,0,438,1,2522,
+1673,1,2588,1715,1,
+2527,1680,1,2459,928,
+1,2464,945,1,2542,
+1687,1,2544,3553,16,
+0,438,1,2583,1710,
+1,2584,1694,1,2585,
+1700,1,2586,1705,1,
+2513,1667,1,2470,3554,
+16,0,438,1,2589,
+1720,1,60,3555,19,
+437,1,60,3556,5,
+18,1,2590,1725,1,
+2591,1730,1,2593,3557,
+16,0,435,1,2632,
+3558,16,0,435,1,
+2522,1673,1,2588,1715,
+1,2527,1680,1,2459,
+928,1,2464,945,1,
+2542,1687,1,2544,3559,
+16,0,435,1,2583,
+1710,1,2584,1694,1,
+2585,1700,1,2586,1705,
+1,2513,1667,1,2470,
+3560,16,0,435,1,
+2589,1720,1,61,3561,
+19,394,1,61,3562,
+5,18,1,2590,1725,
+1,2591,1730,1,2593,
+3563,16,0,392,1,
+2632,3564,16,0,392,
+1,2522,1673,1,2588,
+1715,1,2527,1680,1,
+2459,928,1,2464,945,
+1,2542,1687,1,2544,
+3565,16,0,392,1,
+2583,1710,1,2584,1694,
+1,2585,1700,1,2586,
+1705,1,2513,1667,1,
+2470,3566,16,0,392,
+1,2589,1720,1,62,
+3567,19,391,1,62,
+3568,5,18,1,2590,
+1725,1,2591,1730,1,
+2593,3569,16,0,389,
+1,2632,3570,16,0,
+389,1,2522,1673,1,
+2588,1715,1,2527,1680,
+1,2459,928,1,2464,
+945,1,2542,1687,1,
+2544,3571,16,0,389,
+1,2583,1710,1,2584,
+1694,1,2585,1700,1,
+2586,1705,1,2513,1667,
+1,2470,3572,16,0,
+389,1,2589,1720,1,
+63,3573,19,388,1,
+63,3574,5,18,1,
+2590,1725,1,2591,1730,
+1,2593,3575,16,0,
+386,1,2632,3576,16,
+0,386,1,2522,1673,
+1,2588,1715,1,2527,
+1680,1,2459,928,1,
+2464,945,1,2542,1687,
+1,2544,3577,16,0,
+386,1,2583,1710,1,
+2584,1694,1,2585,1700,
+1,2586,1705,1,2513,
+1667,1,2470,3578,16,
+0,386,1,2589,1720,
+1,64,3579,19,385,
+1,64,3580,5,18,
+1,2590,1725,1,2591,
+1730,1,2593,3581,16,
+0,383,1,2632,3582,
+16,0,383,1,2522,
+1673,1,2588,1715,1,
+2527,1680,1,2459,928,
+1,2464,945,1,2542,
+1687,1,2544,3583,16,
+0,383,1,2583,1710,
+1,2584,1694,1,2585,
+1700,1,2586,1705,1,
+2513,1667,1,2470,3584,
+16,0,383,1,2589,
+1720,1,65,3585,19,
+434,1,65,3586,5,
+18,1,2590,1725,1,
+2591,1730,1,2593,3587,
+16,0,432,1,2632,
+3588,16,0,432,1,
+2522,1673,1,2588,1715,
+1,2527,1680,1,2459,
+928,1,2464,945,1,
+2542,1687,1,2544,3589,
+16,0,432,1,2583,
+1710,1,2584,1694,1,
+2585,1700,1,2586,1705,
+1,2513,1667,1,2470,
+3590,16,0,432,1,
+2589,1720,1,66,3591,
+19,431,1,66,3592,
+5,18,1,2590,1725,
+1,2591,1730,1,2593,
+3593,16,0,429,1,
+2632,3594,16,0,429,
+1,2522,1673,1,2588,
+1715,1,2527,1680,1,
+2459,928,1,2464,945,
+1,2542,1687,1,2544,
+3595,16,0,429,1,
+2583,1710,1,2584,1694,
+1,2585,1700,1,2586,
+1705,1,2513,1667,1,
+2470,3596,16,0,429,
+1,2589,1720,1,67,
+3597,19,428,1,67,
+3598,5,18,1,2590,
+1725,1,2591,1730,1,
+2593,3599,16,0,426,
+1,2632,3600,16,0,
+426,1,2522,1673,1,
+2588,1715,1,2527,1680,
+1,2459,928,1,2464,
+945,1,2542,1687,1,
+2544,3601,16,0,426,
+1,2583,1710,1,2584,
+1694,1,2585,1700,1,
+2586,1705,1,2513,1667,
+1,2470,3602,16,0,
+426,1,2589,1720,1,
+68,3603,19,681,1,
+68,3604,5,18,1,
+2590,1725,1,2591,1730,
+1,2593,3605,16,0,
+679,1,2632,3606,16,
+0,679,1,2522,1673,
+1,2588,1715,1,2527,
+1680,1,2459,928,1,
+2464,945,1,2542,1687,
+1,2544,3607,16,0,
+679,1,2583,1710,1,
+2584,1694,1,2585,1700,
+1,2586,1705,1,2513,
+1667,1,2470,3608,16,
+0,679,1,2589,1720,
+1,69,3609,19,364,
+1,69,3610,5,18,
+1,2590,1725,1,2591,
+1730,1,2593,3611,16,
+0,362,1,2632,3612,
+16,0,362,1,2522,
+1673,1,2588,1715,1,
+2527,1680,1,2459,928,
+1,2464,945,1,2542,
+1687,1,2544,3613,16,
+0,362,1,2583,1710,
+1,2584,1694,1,2585,
+1700,1,2586,1705,1,
+2513,1667,1,2470,3614,
+16,0,362,1,2589,
+1720,1,70,3615,19,
+361,1,70,3616,5,
+18,1,2590,1725,1,
+2591,1730,1,2593,3617,
+16,0,359,1,2632,
+3618,16,0,359,1,
+2522,1673,1,2588,1715,
+1,2527,1680,1,2459,
+928,1,2464,945,1,
+2542,1687,1,2544,3619,
+16,0,359,1,2583,
+1710,1,2584,1694,1,
+2585,1700,1,2586,1705,
+1,2513,1667,1,2470,
+3620,16,0,359,1,
+2589,1720,1,71,3621,
+19,358,1,71,3622,
+5,18,1,2590,1725,
+1,2591,1730,1,2593,
+3623,16,0,356,1,
+2632,3624,16,0,356,
+1,2522,1673,1,2588,
+1715,1,2527,1680,1,
+2459,928,1,2464,945,
+1,2542,1687,1,2544,
+3625,16,0,356,1,
+2583,1710,1,2584,1694,
+1,2585,1700,1,2586,
+1705,1,2513,1667,1,
+2470,3626,16,0,356,
+1,2589,1720,1,72,
+3627,19,424,1,72,
+3628,5,18,1,2590,
+1725,1,2591,1730,1,
+2593,3629,16,0,422,
+1,2632,3630,16,0,
+422,1,2522,1673,1,
+2588,1715,1,2527,1680,
+1,2459,928,1,2464,
+945,1,2542,1687,1,
+2544,3631,16,0,422,
+1,2583,1710,1,2584,
+1694,1,2585,1700,1,
+2586,1705,1,2513,1667,
+1,2470,3632,16,0,
+422,1,2589,1720,1,
+73,3633,19,531,1,
+73,3634,5,18,1,
+2590,1725,1,2591,1730,
+1,2593,3635,16,0,
+529,1,2632,3636,16,
+0,529,1,2522,1673,
+1,2588,1715,1,2527,
+1680,1,2459,928,1,
+2464,945,1,2542,1687,
+1,2544,3637,16,0,
+529,1,2583,1710,1,
+2584,1694,1,2585,1700,
+1,2586,1705,1,2513,
+1667,1,2470,3638,16,
+0,529,1,2589,1720,
+1,74,3639,19,420,
+1,74,3640,5,18,
+1,2590,1725,1,2591,
+1730,1,2593,3641,16,
+0,418,1,2632,3642,
+16,0,418,1,2522,
+1673,1,2588,1715,1,
+2527,1680,1,2459,928,
+1,2464,945,1,2542,
+1687,1,2544,3643,16,
+0,418,1,2583,1710,
+1,2584,1694,1,2585,
+1700,1,2586,1705,1,
+2513,1667,1,2470,3644,
+16,0,418,1,2589,
+1720,1,75,3645,19,
+515,1,75,3646,5,
+18,1,2590,1725,1,
+2591,1730,1,2593,3647,
+16,0,513,1,2632,
+3648,16,0,513,1,
+2522,1673,1,2588,1715,
+1,2527,1680,1,2459,
+928,1,2464,945,1,
+2542,1687,1,2544,3649,
+16,0,513,1,2583,
+1710,1,2584,1694,1,
+2585,1700,1,2586,1705,
+1,2513,1667,1,2470,
+3650,16,0,513,1,
+2589,1720,1,76,3651,
+19,512,1,76,3652,
+5,18,1,2590,1725,
+1,2591,1730,1,2593,
+3653,16,0,510,1,
+2632,3654,16,0,510,
+1,2522,1673,1,2588,
+1715,1,2527,1680,1,
+2459,928,1,2464,945,
+1,2542,1687,1,2544,
+3655,16,0,510,1,
+2583,1710,1,2584,1694,
+1,2585,1700,1,2586,
+1705,1,2513,1667,1,
+2470,3656,16,0,510,
+1,2589,1720,1,77,
+3657,19,404,1,77,
+3658,5,18,1,2590,
+1725,1,2591,1730,1,
+2593,3659,16,0,402,
+1,2632,3660,16,0,
+402,1,2522,1673,1,
+2588,1715,1,2527,1680,
+1,2459,928,1,2464,
+945,1,2542,1687,1,
+2544,3661,16,0,402,
+1,2583,1710,1,2584,
+1694,1,2585,1700,1,
+2586,1705,1,2513,1667,
+1,2470,3662,16,0,
+402,1,2589,1720,1,
+78,3663,19,401,1,
+78,3664,5,18,1,
+2590,1725,1,2591,1730,
+1,2593,3665,16,0,
+399,1,2632,3666,16,
+0,399,1,2522,1673,
+1,2588,1715,1,2527,
+1680,1,2459,928,1,
+2464,945,1,2542,1687,
+1,2544,3667,16,0,
+399,1,2583,1710,1,
+2584,1694,1,2585,1700,
+1,2586,1705,1,2513,
+1667,1,2470,3668,16,
+0,399,1,2589,1720,
+1,79,3669,19,509,
+1,79,3670,5,18,
+1,2590,1725,1,2591,
+1730,1,2593,3671,16,
+0,507,1,2632,3672,
+16,0,507,1,2522,
+1673,1,2588,1715,1,
+2527,1680,1,2459,928,
+1,2464,945,1,2542,
+1687,1,2544,3673,16,
+0,507,1,2583,1710,
+1,2584,1694,1,2585,
+1700,1,2586,1705,1,
+2513,1667,1,2470,3674,
+16,0,507,1,2589,
+1720,1,80,3675,19,
+417,1,80,3676,5,
+18,1,2590,1725,1,
+2591,1730,1,2593,3677,
+16,0,415,1,2632,
+3678,16,0,415,1,
+2522,1673,1,2588,1715,
+1,2527,1680,1,2459,
+928,1,2464,945,1,
+2542,1687,1,2544,3679,
+16,0,415,1,2583,
+1710,1,2584,1694,1,
+2585,1700,1,2586,1705,
+1,2513,1667,1,2470,
+3680,16,0,415,1,
+2589,1720,1,81,3681,
+19,382,1,81,3682,
+5,18,1,2590,1725,
+1,2591,1730,1,2593,
+3683,16,0,380,1,
+2632,3684,16,0,380,
+1,2522,1673,1,2588,
+1715,1,2527,1680,1,
+2459,928,1,2464,945,
+1,2542,1687,1,2544,
+3685,16,0,380,1,
+2583,1710,1,2584,1694,
+1,2585,1700,1,2586,
+1705,1,2513,1667,1,
+2470,3686,16,0,380,
+1,2589,1720,1,82,
+3687,19,524,1,82,
+3688,5,18,1,2590,
+1725,1,2591,1730,1,
+2593,3689,16,0,522,
+1,2632,3690,16,0,
+522,1,2522,1673,1,
+2588,1715,1,2527,1680,
+1,2459,928,1,2464,
+945,1,2542,1687,1,
+2544,3691,16,0,522,
+1,2583,1710,1,2584,
+1694,1,2585,1700,1,
+2586,1705,1,2513,1667,
+1,2470,3692,16,0,
+522,1,2589,1720,1,
+83,3693,19,379,1,
+83,3694,5,18,1,
+2590,1725,1,2591,1730,
+1,2593,3695,16,0,
+377,1,2632,3696,16,
+0,377,1,2522,1673,
+1,2588,1715,1,2527,
+1680,1,2459,928,1,
+2464,945,1,2542,1687,
+1,2544,3697,16,0,
+377,1,2583,1710,1,
+2584,1694,1,2585,1700,
+1,2586,1705,1,2513,
+1667,1,2470,3698,16,
+0,377,1,2589,1720,
+1,84,3699,19,376,
+1,84,3700,5,18,
+1,2590,1725,1,2591,
+1730,1,2593,3701,16,
+0,374,1,2632,3702,
+16,0,374,1,2522,
+1673,1,2588,1715,1,
+2527,1680,1,2459,928,
+1,2464,945,1,2542,
+1687,1,2544,3703,16,
+0,374,1,2583,1710,
+1,2584,1694,1,2585,
+1700,1,2586,1705,1,
+2513,1667,1,2470,3704,
+16,0,374,1,2589,
+1720,1,85,3705,19,
+521,1,85,3706,5,
+18,1,2590,1725,1,
+2591,1730,1,2593,3707,
+16,0,519,1,2632,
+3708,16,0,519,1,
+2522,1673,1,2588,1715,
+1,2527,1680,1,2459,
+928,1,2464,945,1,
+2542,1687,1,2544,3709,
+16,0,519,1,2583,
+1710,1,2584,1694,1,
+2585,1700,1,2586,1705,
+1,2513,1667,1,2470,
+3710,16,0,519,1,
+2589,1720,1,86,3711,
+19,518,1,86,3712,
+5,18,1,2590,1725,
+1,2591,1730,1,2593,
+3713,16,0,516,1,
+2632,3714,16,0,516,
+1,2522,1673,1,2588,
+1715,1,2527,1680,1,
+2459,928,1,2464,945,
+1,2542,1687,1,2544,
+3715,16,0,516,1,
+2583,1710,1,2584,1694,
+1,2585,1700,1,2586,
+1705,1,2513,1667,1,
+2470,3716,16,0,516,
+1,2589,1720,1,87,
+3717,19,598,1,87,
+3718,5,18,1,2590,
+1725,1,2591,1730,1,
+2593,3719,16,0,596,
+1,2632,3720,16,0,
+596,1,2522,1673,1,
+2588,1715,1,2527,1680,
+1,2459,928,1,2464,
+945,1,2542,1687,1,
+2544,3721,16,0,596,
+1,2583,1710,1,2584,
+1694,1,2585,1700,1,
+2586,1705,1,2513,1667,
+1,2470,3722,16,0,
+596,1,2589,1720,1,
+88,3723,19,373,1,
+88,3724,5,18,1,
+2590,1725,1,2591,1730,
+1,2593,3725,16,0,
+371,1,2632,3726,16,
+0,371,1,2522,1673,
+1,2588,1715,1,2527,
+1680,1,2459,928,1,
+2464,945,1,2542,1687,
+1,2544,3727,16,0,
+371,1,2583,1710,1,
+2584,1694,1,2585,1700,
+1,2586,1705,1,2513,
+1667,1,2470,3728,16,
+0,371,1,2589,1720,
+1,89,3729,19,367,
+1,89,3730,5,18,
+1,2590,1725,1,2591,
+1730,1,2593,3731,16,
+0,365,1,2632,3732,
+16,0,365,1,2522,
+1673,1,2588,1715,1,
+2527,1680,1,2459,928,
+1,2464,945,1,2542,
+1687,1,2544,3733,16,
+0,365,1,2583,1710,
+1,2584,1694,1,2585,
+1700,1,2586,1705,1,
+2513,1667,1,2470,3734,
+16,0,365,1,2589,
+1720,1,90,3735,19,
+370,1,90,3736,5,
+18,1,2590,1725,1,
+2591,1730,1,2593,3737,
+16,0,368,1,2632,
+3738,16,0,368,1,
+2522,1673,1,2588,1715,
+1,2527,1680,1,2459,
+928,1,2464,945,1,
+2542,1687,1,2544,3739,
+16,0,368,1,2583,
+1710,1,2584,1694,1,
+2585,1700,1,2586,1705,
+1,2513,1667,1,2470,
+3740,16,0,368,1,
+2589,1720,1,91,3741,
+19,413,1,91,3742,
+5,18,1,2590,1725,
+1,2591,1730,1,2593,
+3743,16,0,411,1,
+2632,3744,16,0,411,
+1,2522,1673,1,2588,
+1715,1,2527,1680,1,
+2459,928,1,2464,945,
+1,2542,1687,1,2544,
+3745,16,0,411,1,
+2583,1710,1,2584,1694,
+1,2585,1700,1,2586,
+1705,1,2513,1667,1,
+2470,3746,16,0,411,
+1,2589,1720,1,92,
+3747,19,133,1,92,
+3748,5,127,1,0,
+3749,16,0,631,1,
+1,2055,1,2,2061,
+1,3,2066,1,4,
+2071,1,5,2076,1,
+6,2081,1,7,2086,
+1,8,3750,16,0,
+131,1,1515,3751,16,
+0,165,1,2021,764,
+1,2022,3752,16,0,
+535,1,256,3753,16,
+0,173,1,2025,3754,
+16,0,539,1,18,
+3755,16,0,138,1,
+2027,3756,16,0,543,
+1,2029,771,1,2030,
+777,1,2031,782,1,
+2699,3353,1,2033,792,
+1,277,3757,16,0,
+173,1,2035,798,1,
+2037,803,1,2039,808,
+1,32,3758,16,0,
+165,1,2032,787,1,
+2293,3759,16,0,173,
+1,2043,820,1,2045,
+825,1,41,3760,16,
+0,173,1,1297,3761,
+16,0,165,1,43,
+3762,16,0,173,1,
+46,3763,16,0,178,
+1,1804,3764,16,0,
+165,1,299,3765,16,
+0,173,1,52,3766,
+16,0,165,1,2727,
+3347,1,509,3767,16,
+0,173,1,2318,3768,
+16,0,165,1,62,
+3769,16,0,195,1,
+65,3770,16,0,197,
+1,2075,3771,16,0,
+165,1,1574,845,1,
+71,3772,16,0,173,
+1,1775,3773,16,0,
+165,1,76,3774,16,
+0,173,1,2507,3775,
+16,0,449,1,2337,
+3776,16,0,165,1,
+79,3777,16,0,173,
+1,1335,3778,16,0,
+165,1,322,3779,16,
+0,173,1,85,3780,
+16,0,173,1,2516,
+3781,16,0,463,1,
+2760,3311,1,1261,3782,
+16,0,165,1,89,
+3783,16,0,173,1,
+346,3784,16,0,173,
+1,97,3785,16,0,
+173,1,2041,814,1,
+102,3786,16,0,173,
+1,1860,867,1,1803,
+833,1,2364,873,1,
+1113,3787,16,0,158,
+1,112,3788,16,0,
+173,1,1117,3789,16,
+0,165,1,1873,881,
+1,1876,3790,16,0,
+165,1,372,3791,16,
+0,573,1,374,3792,
+16,0,575,1,124,
+3793,16,0,173,1,
+376,3794,16,0,577,
+1,378,3795,16,0,
+579,1,2136,888,1,
+381,3796,16,0,173,
+1,525,3797,16,0,
+173,1,1834,3798,16,
+0,165,1,137,3799,
+16,0,173,1,1901,
+3800,16,0,165,1,
+1153,3801,16,0,165,
+1,151,3802,16,0,
+173,1,1407,3803,16,
+0,165,1,1659,3804,
+16,0,165,1,2413,
+3805,16,0,165,1,
+406,3806,16,0,173,
+1,1371,3807,16,0,
+165,1,2105,860,1,
+2106,3808,16,0,165,
+1,166,3809,16,0,
+173,1,1622,3810,16,
+0,173,1,1931,906,
+1,1933,3811,16,0,
+165,1,431,3812,16,
+0,173,1,1585,3813,
 16,0,173,1,182,
-3763,16,0,173,1,
-1189,3764,16,0,165,
-1,1443,3765,16,0,
-165,1,1695,3766,16,
-0,165,1,2198,3767,
-16,0,165,1,447,
-3768,16,0,173,1,
-2458,904,1,2459,910,
-1,1958,3769,16,0,
-165,1,2462,917,1,
-1657,922,1,2464,927,
-1,2466,3302,1,459,
-3770,16,0,173,1,
-2468,3771,16,0,349,
-1,462,3772,16,0,
-173,1,2722,3297,1,
-2723,3773,16,0,189,
-1,199,3774,16,0,
-173,1,217,3775,16,
-0,173,1,2227,936,
-1,1225,3776,16,0,
-165,1,1479,3777,16,
-0,165,1,1731,3778,
-16,0,173,1,2741,
-3261,1,2742,3267,1,
-1990,3779,16,0,165,
-1,2744,3277,1,236,
-3780,16,0,173,1,
-1756,3781,16,0,165,
-1,93,3782,19,652,
-1,93,3783,5,95,
-1,256,3784,16,0,
-650,1,1261,3785,16,
-0,650,1,509,3786,
-16,0,650,1,1515,
-3787,16,0,650,1,
-2686,3788,16,0,650,
-1,2021,747,1,1775,
-3789,16,0,650,1,
-2029,754,1,2030,760,
-1,2031,765,1,2032,
-770,1,2033,775,1,
-277,3790,16,0,650,
-1,2035,781,1,2037,
-786,1,2039,791,1,
-32,3791,16,0,650,
-1,2041,797,1,2293,
-3792,16,0,650,1,
-2043,803,1,2045,808,
-1,41,3793,16,0,
-650,1,1297,3794,16,
-0,650,1,43,3795,
-16,0,650,1,1803,
-816,1,1804,3796,16,
-0,650,1,299,3797,
-16,0,650,1,52,
-3798,16,0,650,1,
-2318,3799,16,0,650,
-1,62,3800,16,0,
-650,1,2075,3801,16,
-0,650,1,1574,828,
-1,71,3802,16,0,
-650,1,76,3803,16,
-0,650,1,1834,3804,
-16,0,650,1,2337,
-3805,16,0,650,1,
-79,3806,16,0,650,
-1,1335,3807,16,0,
-650,1,322,3808,16,
-0,650,1,85,3809,
-16,0,650,1,89,
-3810,16,0,650,1,
-346,3811,16,0,650,
-1,2105,843,1,2106,
-3812,16,0,650,1,
-97,3813,16,0,650,
-1,1860,850,1,2364,
-856,1,102,3814,16,
-0,650,1,112,3815,
-16,0,650,1,1117,
-3816,16,0,650,1,
-1873,864,1,1876,3817,
-16,0,650,1,124,
-3818,16,0,650,1,
-2136,871,1,381,3819,
-16,0,650,1,525,
-3820,16,0,650,1,
-137,3821,16,0,650,
-1,1901,3822,16,0,
-650,1,1153,3823,16,
-0,650,1,151,3824,
-16,0,650,1,1407,
-3825,16,0,650,1,
-1659,3826,16,0,650,
-1,2413,3827,16,0,
-650,1,406,3828,16,
-0,650,1,1371,3829,
-16,0,650,1,166,
-3830,16,0,650,1,
-1622,3831,16,0,650,
-1,1931,889,1,1933,
-3832,16,0,650,1,
-431,3833,16,0,650,
-1,1585,3834,16,0,
-650,1,182,3835,16,
-0,650,1,1189,3836,
-16,0,650,1,1443,
-3837,16,0,650,1,
-1695,3838,16,0,650,
-1,2198,3839,16,0,
-650,1,447,3840,16,
-0,650,1,2458,904,
-1,2459,910,1,1958,
-3841,16,0,650,1,
-2462,917,1,1657,922,
-1,2464,927,1,199,
-3842,16,0,650,1,
-459,3843,16,0,650,
-1,462,3844,16,0,
-650,1,217,3845,16,
-0,650,1,2227,936,
-1,1225,3846,16,0,
-650,1,1479,3847,16,
-0,650,1,1731,3848,
-16,0,650,1,1989,
-944,1,1990,3849,16,
-0,650,1,236,3850,
-16,0,650,1,1756,
-3851,16,0,650,1,
-94,3852,19,649,1,
-94,3853,5,95,1,
-256,3854,16,0,647,
-1,1261,3855,16,0,
-647,1,509,3856,16,
-0,647,1,1515,3857,
-16,0,647,1,2686,
-3858,16,0,647,1,
-2021,747,1,1775,3859,
-16,0,647,1,2029,
-754,1,2030,760,1,
-2031,765,1,2032,770,
-1,2033,775,1,277,
-3860,16,0,647,1,
-2035,781,1,2037,786,
-1,2039,791,1,32,
-3861,16,0,647,1,
-2041,797,1,2293,3862,
-16,0,647,1,2043,
-803,1,2045,808,1,
-41,3863,16,0,647,
-1,1297,3864,16,0,
-647,1,43,3865,16,
-0,647,1,1803,816,
-1,1804,3866,16,0,
-647,1,299,3867,16,
-0,647,1,52,3868,
-16,0,647,1,2318,
-3869,16,0,647,1,
-62,3870,16,0,647,
-1,2075,3871,16,0,
-647,1,1574,828,1,
-71,3872,16,0,647,
-1,76,3873,16,0,
-647,1,1834,3874,16,
-0,647,1,2337,3875,
-16,0,647,1,79,
-3876,16,0,647,1,
-1335,3877,16,0,647,
-1,322,3878,16,0,
-647,1,85,3879,16,
-0,647,1,89,3880,
-16,0,647,1,346,
-3881,16,0,647,1,
-2105,843,1,2106,3882,
-16,0,647,1,97,
-3883,16,0,647,1,
-1860,850,1,2364,856,
-1,102,3884,16,0,
-647,1,112,3885,16,
-0,647,1,1117,3886,
-16,0,647,1,1873,
-864,1,1876,3887,16,
-0,647,1,124,3888,
-16,0,647,1,2136,
-871,1,381,3889,16,
-0,647,1,525,3890,
-16,0,647,1,137,
-3891,16,0,647,1,
-1901,3892,16,0,647,
-1,1153,3893,16,0,
-647,1,151,3894,16,
-0,647,1,1407,3895,
-16,0,647,1,1659,
-3896,16,0,647,1,
-2413,3897,16,0,647,
-1,406,3898,16,0,
-647,1,1371,3899,16,
-0,647,1,166,3900,
-16,0,647,1,1622,
-3901,16,0,647,1,
-1931,889,1,1933,3902,
-16,0,647,1,431,
-3903,16,0,647,1,
-1585,3904,16,0,647,
-1,182,3905,16,0,
-647,1,1189,3906,16,
-0,647,1,1443,3907,
-16,0,647,1,1695,
-3908,16,0,647,1,
-2198,3909,16,0,647,
-1,447,3910,16,0,
-647,1,2458,904,1,
-2459,910,1,1958,3911,
-16,0,647,1,2462,
-917,1,1657,922,1,
-2464,927,1,199,3912,
-16,0,647,1,459,
-3913,16,0,647,1,
-462,3914,16,0,647,
-1,217,3915,16,0,
-647,1,2227,936,1,
-1225,3916,16,0,647,
-1,1479,3917,16,0,
-647,1,1731,3918,16,
-0,647,1,1989,944,
-1,1990,3919,16,0,
-647,1,236,3920,16,
-0,647,1,1756,3921,
-16,0,647,1,95,
-3922,19,646,1,95,
-3923,5,95,1,256,
-3924,16,0,644,1,
-1261,3925,16,0,644,
-1,509,3926,16,0,
-644,1,1515,3927,16,
-0,644,1,2686,3928,
-16,0,644,1,2021,
-747,1,1775,3929,16,
-0,644,1,2029,754,
-1,2030,760,1,2031,
-765,1,2032,770,1,
-2033,775,1,277,3930,
-16,0,644,1,2035,
-781,1,2037,786,1,
-2039,791,1,32,3931,
-16,0,644,1,2041,
-797,1,2293,3932,16,
-0,644,1,2043,803,
-1,2045,808,1,41,
-3933,16,0,644,1,
-1297,3934,16,0,644,
-1,43,3935,16,0,
-644,1,1803,816,1,
-1804,3936,16,0,644,
-1,299,3937,16,0,
-644,1,52,3938,16,
-0,644,1,2318,3939,
-16,0,644,1,62,
-3940,16,0,644,1,
-2075,3941,16,0,644,
-1,1574,828,1,71,
-3942,16,0,644,1,
-76,3943,16,0,644,
-1,1834,3944,16,0,
-644,1,2337,3945,16,
-0,644,1,79,3946,
-16,0,644,1,1335,
-3947,16,0,644,1,
-322,3948,16,0,644,
-1,85,3949,16,0,
-644,1,89,3950,16,
-0,644,1,346,3951,
-16,0,644,1,2105,
-843,1,2106,3952,16,
-0,644,1,97,3953,
-16,0,644,1,1860,
-850,1,2364,856,1,
-102,3954,16,0,644,
-1,112,3955,16,0,
-644,1,1117,3956,16,
-0,644,1,1873,864,
-1,1876,3957,16,0,
-644,1,124,3958,16,
-0,644,1,2136,871,
-1,381,3959,16,0,
-644,1,525,3960,16,
-0,644,1,137,3961,
-16,0,644,1,1901,
-3962,16,0,644,1,
-1153,3963,16,0,644,
-1,151,3964,16,0,
-644,1,1407,3965,16,
-0,644,1,1659,3966,
-16,0,644,1,2413,
-3967,16,0,644,1,
-406,3968,16,0,644,
-1,1371,3969,16,0,
-644,1,166,3970,16,
-0,644,1,1622,3971,
-16,0,644,1,1931,
-889,1,1933,3972,16,
-0,644,1,431,3973,
-16,0,644,1,1585,
-3974,16,0,644,1,
-182,3975,16,0,644,
-1,1189,3976,16,0,
-644,1,1443,3977,16,
-0,644,1,1695,3978,
-16,0,644,1,2198,
-3979,16,0,644,1,
-447,3980,16,0,644,
-1,2458,904,1,2459,
-910,1,1958,3981,16,
-0,644,1,2462,917,
-1,1657,922,1,2464,
-927,1,199,3982,16,
-0,644,1,459,3983,
-16,0,644,1,462,
-3984,16,0,644,1,
-217,3985,16,0,644,
-1,2227,936,1,1225,
-3986,16,0,644,1,
-1479,3987,16,0,644,
-1,1731,3988,16,0,
-644,1,1989,944,1,
-1990,3989,16,0,644,
-1,236,3990,16,0,
-644,1,1756,3991,16,
-0,644,1,96,3992,
-19,103,1,96,3993,
-5,1,1,0,3994,
-16,0,104,1,97,
-3995,19,662,1,97,
-3996,5,1,1,0,
-3997,16,0,660,1,
-98,3998,19,258,1,
-98,3999,5,2,1,
-0,4000,16,0,332,
-1,2723,4001,16,0,
-256,1,99,4002,19,
-331,1,99,4003,5,
-2,1,0,4004,16,
-0,329,1,2723,4005,
-16,0,675,1,100,
-4006,19,251,1,100,
-4007,5,2,1,0,
-4008,16,0,685,1,
-2723,4009,16,0,249,
-1,101,4010,19,611,
-1,101,4011,5,4,
-1,0,4012,16,0,
-609,1,2723,4013,16,
-0,609,1,2734,4014,
-16,0,686,1,2664,
-4015,16,0,686,1,
-102,4016,19,471,1,
-102,4017,5,2,1,
-2470,4018,16,0,469,
-1,2581,4019,16,0,
-575,1,103,4020,19,
-510,1,103,4021,5,
-4,1,2619,4022,16,
-0,508,1,2535,4023,
-16,0,508,1,2470,
-4024,16,0,600,1,
-2581,4025,16,0,600,
-1,104,4026,19,593,
-1,104,4027,5,4,
-1,2619,4028,16,0,
-591,1,2535,4029,16,
-0,591,1,2470,4030,
-16,0,599,1,2581,
-4031,16,0,599,1,
-105,4032,19,516,1,
-105,4033,5,4,1,
-2619,4034,16,0,590,
-1,2535,4035,16,0,
-590,1,2470,4036,16,
-0,514,1,2581,4037,
-16,0,514,1,106,
-4038,19,141,1,106,
-4039,5,3,1,2520,
-4040,16,0,466,1,
-2670,4041,16,0,618,
-1,10,4042,16,0,
-139,1,107,4043,19,
-319,1,107,4044,5,
-1,1,2511,4045,16,
-0,317,1,108,4046,
-19,151,1,108,4047,
-5,17,1,0,4048,
-16,0,624,1,2075,
-4049,16,0,668,1,
-2520,4050,16,0,345,
-1,2337,4051,16,0,
-668,1,2413,4052,16,
-0,668,1,10,4053,
-16,0,345,1,2198,
-4054,16,0,668,1,
-1901,4055,16,0,668,
-1,2723,4056,16,0,
-624,1,2670,4057,16,
-0,345,1,21,4058,
-16,0,149,1,2106,
-4059,16,0,668,1,
-1804,4060,16,0,668,
-1,1990,4061,16,0,
-668,1,32,4062,16,
-0,668,1,1958,4063,
-16,0,668,1,1775,
-4064,16,0,668,1,
-109,4065,19,453,1,
-109,4066,5,1,1,
-2511,4067,16,0,451,
-1,110,4068,19,130,
-1,110,4069,5,18,
-1,0,4070,16,0,
-128,1,2075,4071,16,
-0,137,1,2520,4072,
+3814,16,0,173,1,
+1189,3815,16,0,165,
+1,1443,3816,16,0,
+165,1,1695,3817,16,
+0,165,1,2198,3818,
+16,0,165,1,2702,
+3819,16,0,173,1,
+447,3820,16,0,173,
+1,2458,922,1,2459,
+928,1,1958,3821,16,
+0,165,1,2462,935,
+1,1657,940,1,2464,
+945,1,2466,3341,1,
+459,3822,16,0,173,
+1,2468,3823,16,0,
+354,1,462,3824,16,
+0,173,1,199,3825,
+16,0,173,1,217,
+3826,16,0,173,1,
+2227,954,1,1225,3827,
+16,0,165,1,1479,
+3828,16,0,165,1,
+1731,3829,16,0,173,
+1,2738,3319,1,2739,
+3830,16,0,631,1,
+1989,962,1,1990,3831,
+16,0,165,1,236,
+3832,16,0,173,1,
+2757,3326,1,2758,3331,
+1,2759,3336,1,1756,
+3833,16,0,165,1,
+93,3834,19,663,1,
+93,3835,5,95,1,
+256,3836,16,0,661,
+1,1261,3837,16,0,
+661,1,509,3838,16,
+0,661,1,1515,3839,
+16,0,661,1,2021,
+764,1,1775,3840,16,
+0,661,1,2029,771,
+1,2030,777,1,2031,
+782,1,2032,787,1,
+2033,792,1,277,3841,
+16,0,661,1,2035,
+798,1,2037,803,1,
+2039,808,1,32,3842,
+16,0,661,1,2041,
+814,1,2293,3843,16,
+0,661,1,2043,820,
+1,2045,825,1,41,
+3844,16,0,661,1,
+1297,3845,16,0,661,
+1,43,3846,16,0,
+661,1,1803,833,1,
+1804,3847,16,0,661,
+1,299,3848,16,0,
+661,1,52,3849,16,
+0,661,1,2318,3850,
+16,0,661,1,62,
+3851,16,0,661,1,
+2075,3852,16,0,661,
+1,1574,845,1,71,
+3853,16,0,661,1,
+76,3854,16,0,661,
+1,1834,3855,16,0,
+661,1,2337,3856,16,
+0,661,1,79,3857,
+16,0,661,1,1335,
+3858,16,0,661,1,
+322,3859,16,0,661,
+1,85,3860,16,0,
+661,1,89,3861,16,
+0,661,1,346,3862,
+16,0,661,1,2105,
+860,1,2106,3863,16,
+0,661,1,97,3864,
+16,0,661,1,1860,
+867,1,2364,873,1,
+102,3865,16,0,661,
+1,112,3866,16,0,
+661,1,1117,3867,16,
+0,661,1,1873,881,
+1,1876,3868,16,0,
+661,1,124,3869,16,
+0,661,1,2136,888,
+1,381,3870,16,0,
+661,1,525,3871,16,
+0,661,1,137,3872,
+16,0,661,1,1901,
+3873,16,0,661,1,
+1153,3874,16,0,661,
+1,151,3875,16,0,
+661,1,1407,3876,16,
+0,661,1,1659,3877,
+16,0,661,1,2413,
+3878,16,0,661,1,
+406,3879,16,0,661,
+1,1371,3880,16,0,
+661,1,166,3881,16,
+0,661,1,1622,3882,
+16,0,661,1,1931,
+906,1,1933,3883,16,
+0,661,1,431,3884,
+16,0,661,1,1585,
+3885,16,0,661,1,
+182,3886,16,0,661,
+1,1189,3887,16,0,
+661,1,1443,3888,16,
+0,661,1,1695,3889,
+16,0,661,1,2198,
+3890,16,0,661,1,
+2702,3891,16,0,661,
+1,447,3892,16,0,
+661,1,2458,922,1,
+2459,928,1,1958,3893,
+16,0,661,1,2462,
+935,1,1657,940,1,
+2464,945,1,199,3894,
+16,0,661,1,459,
+3895,16,0,661,1,
+462,3896,16,0,661,
+1,217,3897,16,0,
+661,1,2227,954,1,
+1225,3898,16,0,661,
+1,1479,3899,16,0,
+661,1,1731,3900,16,
+0,661,1,1989,962,
+1,1990,3901,16,0,
+661,1,236,3902,16,
+0,661,1,1756,3903,
+16,0,661,1,94,
+3904,19,660,1,94,
+3905,5,95,1,256,
+3906,16,0,658,1,
+1261,3907,16,0,658,
+1,509,3908,16,0,
+658,1,1515,3909,16,
+0,658,1,2021,764,
+1,1775,3910,16,0,
+658,1,2029,771,1,
+2030,777,1,2031,782,
+1,2032,787,1,2033,
+792,1,277,3911,16,
+0,658,1,2035,798,
+1,2037,803,1,2039,
+808,1,32,3912,16,
+0,658,1,2041,814,
+1,2293,3913,16,0,
+658,1,2043,820,1,
+2045,825,1,41,3914,
+16,0,658,1,1297,
+3915,16,0,658,1,
+43,3916,16,0,658,
+1,1803,833,1,1804,
+3917,16,0,658,1,
+299,3918,16,0,658,
+1,52,3919,16,0,
+658,1,2318,3920,16,
+0,658,1,62,3921,
+16,0,658,1,2075,
+3922,16,0,658,1,
+1574,845,1,71,3923,
+16,0,658,1,76,
+3924,16,0,658,1,
+1834,3925,16,0,658,
+1,2337,3926,16,0,
+658,1,79,3927,16,
+0,658,1,1335,3928,
+16,0,658,1,322,
+3929,16,0,658,1,
+85,3930,16,0,658,
+1,89,3931,16,0,
+658,1,346,3932,16,
+0,658,1,2105,860,
+1,2106,3933,16,0,
+658,1,97,3934,16,
+0,658,1,1860,867,
+1,2364,873,1,102,
+3935,16,0,658,1,
+112,3936,16,0,658,
+1,1117,3937,16,0,
+658,1,1873,881,1,
+1876,3938,16,0,658,
+1,124,3939,16,0,
+658,1,2136,888,1,
+381,3940,16,0,658,
+1,525,3941,16,0,
+658,1,137,3942,16,
+0,658,1,1901,3943,
+16,0,658,1,1153,
+3944,16,0,658,1,
+151,3945,16,0,658,
+1,1407,3946,16,0,
+658,1,1659,3947,16,
+0,658,1,2413,3948,
+16,0,658,1,406,
+3949,16,0,658,1,
+1371,3950,16,0,658,
+1,166,3951,16,0,
+658,1,1622,3952,16,
+0,658,1,1931,906,
+1,1933,3953,16,0,
+658,1,431,3954,16,
+0,658,1,1585,3955,
+16,0,658,1,182,
+3956,16,0,658,1,
+1189,3957,16,0,658,
+1,1443,3958,16,0,
+658,1,1695,3959,16,
+0,658,1,2198,3960,
+16,0,658,1,2702,
+3961,16,0,658,1,
+447,3962,16,0,658,
+1,2458,922,1,2459,
+928,1,1958,3963,16,
+0,658,1,2462,935,
+1,1657,940,1,2464,
+945,1,199,3964,16,
+0,658,1,459,3965,
+16,0,658,1,462,
+3966,16,0,658,1,
+217,3967,16,0,658,
+1,2227,954,1,1225,
+3968,16,0,658,1,
+1479,3969,16,0,658,
+1,1731,3970,16,0,
+658,1,1989,962,1,
+1990,3971,16,0,658,
+1,236,3972,16,0,
+658,1,1756,3973,16,
+0,658,1,95,3974,
+19,657,1,95,3975,
+5,95,1,256,3976,
+16,0,655,1,1261,
+3977,16,0,655,1,
+509,3978,16,0,655,
+1,1515,3979,16,0,
+655,1,2021,764,1,
+1775,3980,16,0,655,
+1,2029,771,1,2030,
+777,1,2031,782,1,
+2032,787,1,2033,792,
+1,277,3981,16,0,
+655,1,2035,798,1,
+2037,803,1,2039,808,
+1,32,3982,16,0,
+655,1,2041,814,1,
+2293,3983,16,0,655,
+1,2043,820,1,2045,
+825,1,41,3984,16,
+0,655,1,1297,3985,
+16,0,655,1,43,
+3986,16,0,655,1,
+1803,833,1,1804,3987,
+16,0,655,1,299,
+3988,16,0,655,1,
+52,3989,16,0,655,
+1,2318,3990,16,0,
+655,1,62,3991,16,
+0,655,1,2075,3992,
+16,0,655,1,1574,
+845,1,71,3993,16,
+0,655,1,76,3994,
+16,0,655,1,1834,
+3995,16,0,655,1,
+2337,3996,16,0,655,
+1,79,3997,16,0,
+655,1,1335,3998,16,
+0,655,1,322,3999,
+16,0,655,1,85,
+4000,16,0,655,1,
+89,4001,16,0,655,
+1,346,4002,16,0,
+655,1,2105,860,1,
+2106,4003,16,0,655,
+1,97,4004,16,0,
+655,1,1860,867,1,
+2364,873,1,102,4005,
+16,0,655,1,112,
+4006,16,0,655,1,
+1117,4007,16,0,655,
+1,1873,881,1,1876,
+4008,16,0,655,1,
+124,4009,16,0,655,
+1,2136,888,1,381,
+4010,16,0,655,1,
+525,4011,16,0,655,
+1,137,4012,16,0,
+655,1,1901,4013,16,
+0,655,1,1153,4014,
+16,0,655,1,151,
+4015,16,0,655,1,
+1407,4016,16,0,655,
+1,1659,4017,16,0,
+655,1,2413,4018,16,
+0,655,1,406,4019,
+16,0,655,1,1371,
+4020,16,0,655,1,
+166,4021,16,0,655,
+1,1622,4022,16,0,
+655,1,1931,906,1,
+1933,4023,16,0,655,
+1,431,4024,16,0,
+655,1,1585,4025,16,
+0,655,1,182,4026,
+16,0,655,1,1189,
+4027,16,0,655,1,
+1443,4028,16,0,655,
+1,1695,4029,16,0,
+655,1,2198,4030,16,
+0,655,1,2702,4031,
+16,0,655,1,447,
+4032,16,0,655,1,
+2458,922,1,2459,928,
+1,1958,4033,16,0,
+655,1,2462,935,1,
+1657,940,1,2464,945,
+1,199,4034,16,0,
+655,1,459,4035,16,
+0,655,1,462,4036,
+16,0,655,1,217,
+4037,16,0,655,1,
+2227,954,1,1225,4038,
+16,0,655,1,1479,
+4039,16,0,655,1,
+1731,4040,16,0,655,
+1,1989,962,1,1990,
+4041,16,0,655,1,
+236,4042,16,0,655,
+1,1756,4043,16,0,
+655,1,96,4044,19,
+103,1,96,4045,5,
+1,1,0,4046,16,
+0,104,1,97,4047,
+19,684,1,97,4048,
+5,1,1,0,4049,
+16,0,682,1,98,
+4050,19,285,1,98,
+4051,5,2,1,0,
+4052,16,0,503,1,
+2739,4053,16,0,283,
+1,99,4054,19,701,
+1,99,4055,5,2,
+1,0,4056,16,0,
+703,1,2739,4057,16,
+0,699,1,100,4058,
+19,288,1,100,4059,
+5,2,1,0,4060,
+16,0,286,1,2739,
+4061,16,0,693,1,
+101,4062,19,712,1,
+101,4063,5,4,1,
+0,4064,16,0,713,
+1,2739,4065,16,0,
+713,1,2680,4066,16,
+0,710,1,2750,4067,
+16,0,710,1,102,
+4068,19,494,1,102,
+4069,5,2,1,2470,
+4070,16,0,492,1,
+2593,4071,16,0,668,
+1,103,4072,19,265,
+1,103,4073,5,4,
+1,2544,4074,16,0,
+616,1,2470,4075,16,
+0,263,1,2632,4076,
+16,0,616,1,2593,
+4077,16,0,263,1,
+104,4078,19,335,1,
+104,4079,5,4,1,
+2544,4080,16,0,692,
+1,2470,4081,16,0,
+333,1,2632,4082,16,
+0,692,1,2593,4083,
+16,0,333,1,105,
+4084,19,332,1,105,
+4085,5,4,1,2544,
+4086,16,0,691,1,
+2470,4087,16,0,330,
+1,2632,4088,16,0,
+691,1,2593,4089,16,
+0,330,1,106,4090,
+19,620,1,106,4091,
+5,4,1,2544,4092,
+16,0,690,1,2470,
+4093,16,0,618,1,
+2632,4094,16,0,690,
+1,2593,4095,16,0,
+618,1,107,4096,19,
+141,1,107,4097,5,
+3,1,2529,4098,16,
+0,488,1,2686,4099,
+16,0,645,1,10,
+4100,16,0,139,1,
+108,4101,19,469,1,
+108,4102,5,1,1,
+2515,4103,16,0,467,
+1,109,4104,19,455,
+1,109,4105,5,1,
+1,2506,4106,16,0,
+453,1,110,4107,19,
+151,1,110,4108,5,
+17,1,0,4109,16,
+0,650,1,2739,4110,
+16,0,650,1,2075,
+4111,16,0,676,1,
+2337,4112,16,0,676,
+1,2413,4113,16,0,
+676,1,10,4114,16,
+0,350,1,2529,4115,
+16,0,350,1,1901,
+4116,16,0,676,1,
+2198,4117,16,0,676,
+1,21,4118,16,0,
+149,1,2106,4119,16,
+0,676,1,1804,4120,
+16,0,676,1,1990,
+4121,16,0,676,1,
+32,4122,16,0,676,
+1,1958,4123,16,0,
+676,1,2686,4124,16,
+0,350,1,1775,4125,
+16,0,676,1,111,
+4126,19,466,1,111,
+4127,5,1,1,2515,
+4128,16,0,464,1,
+112,4129,19,452,1,
+112,4130,5,1,1,
+2506,4131,16,0,450,
+1,113,4132,19,130,
+1,113,4133,5,18,
+1,0,4134,16,0,
+128,1,2739,4135,16,
+0,128,1,2075,4136,
 16,0,137,1,2337,
-4073,16,0,137,1,
-2413,4074,16,0,137,
-1,10,4075,16,0,
-137,1,2198,4076,16,
-0,137,1,1901,4077,
-16,0,137,1,52,
-4078,16,0,194,1,
-2670,4079,16,0,137,
-1,21,4080,16,0,
-137,1,2106,4081,16,
-0,137,1,1804,4082,
+4137,16,0,137,1,
+2413,4138,16,0,137,
+1,10,4139,16,0,
+137,1,2198,4140,16,
+0,137,1,2529,4141,
+16,0,137,1,1901,
+4142,16,0,137,1,
+52,4143,16,0,193,
+1,21,4144,16,0,
+137,1,2106,4145,16,
+0,137,1,1804,4146,
 16,0,137,1,1990,
-4083,16,0,137,1,
-2723,4084,16,0,128,
-1,32,4085,16,0,
-137,1,1958,4086,16,
-0,137,1,1775,4087,
-16,0,137,1,111,
-4088,19,459,1,111,
-4089,5,4,1,2619,
-4090,16,0,457,1,
-2535,4091,16,0,457,
-1,2470,4092,16,0,
-457,1,2581,4093,16,
-0,457,1,112,4094,
-19,447,1,112,4095,
-5,4,1,2619,4096,
-16,0,445,1,2535,
-4097,16,0,445,1,
-2470,4098,16,0,445,
-1,2581,4099,16,0,
-445,1,113,4100,19,
-681,1,113,4101,5,
-4,1,2619,4102,16,
-0,679,1,2535,4103,
-16,0,679,1,2470,
-4104,16,0,679,1,
-2581,4105,16,0,679,
-1,114,4106,19,344,
-1,114,4107,5,16,
-1,2516,4108,16,0,
-456,1,2075,4109,16,
-0,529,1,2337,4110,
-16,0,529,1,2507,
-4111,16,0,444,1,
-2413,4112,16,0,529,
-1,2198,4113,16,0,
-529,1,1901,4114,16,
-0,529,1,2531,4115,
-16,0,573,1,2681,
-4116,16,0,694,1,
-2106,4117,16,0,529,
-1,1804,4118,16,0,
-529,1,1990,4119,16,
-0,529,1,31,4120,
-16,0,342,1,32,
-4121,16,0,529,1,
-1958,4122,16,0,529,
-1,1775,4123,16,0,
-529,1,115,4124,19,
-301,1,115,4125,5,
-1,1,32,4126,16,
-0,299,1,116,4127,
-19,261,1,116,4128,
-5,11,1,2075,4129,
-16,0,601,1,2337,
-4130,16,0,265,1,
-2413,4131,16,0,472,
-1,1901,4132,16,0,
-400,1,2198,4133,16,
-0,321,1,2106,4134,
-16,0,637,1,1804,
-4135,16,0,284,1,
-1990,4136,16,0,517,
-1,32,4137,16,0,
-338,1,1958,4138,16,
-0,475,1,1775,4139,
-16,0,259,1,117,
-4140,19,607,1,117,
-4141,5,11,1,2075,
-4142,16,0,605,1,
-2337,4143,16,0,605,
-1,2413,4144,16,0,
-605,1,1901,4145,16,
-0,605,1,2198,4146,
-16,0,605,1,2106,
-4147,16,0,605,1,
-1804,4148,16,0,605,
-1,1990,4149,16,0,
-605,1,32,4150,16,
-0,605,1,1958,4151,
-16,0,605,1,1775,
-4152,16,0,605,1,
-118,4153,19,665,1,
-118,4154,5,11,1,
-2075,4155,16,0,663,
-1,2337,4156,16,0,
-663,1,2413,4157,16,
-0,663,1,1901,4158,
-16,0,663,1,2198,
-4159,16,0,663,1,
-2106,4160,16,0,663,
-1,1804,4161,16,0,
-663,1,1990,4162,16,
-0,663,1,32,4163,
-16,0,663,1,1958,
-4164,16,0,663,1,
-1775,4165,16,0,663,
-1,119,4166,19,161,
-1,119,4167,5,31,
-1,1901,4168,16,0,
-667,1,1479,4169,16,
-0,576,1,2075,4170,
-16,0,667,1,1695,
-4171,16,0,190,1,
-1756,4172,16,0,188,
-1,2413,4173,16,0,
-667,1,2198,4174,16,
-0,667,1,1876,4175,
-16,0,688,1,1659,
-4176,16,0,188,1,
-1443,4177,16,0,545,
-1,1117,4178,16,0,
-159,1,1990,4179,16,
-0,667,1,1189,4180,
-16,0,238,1,1775,
-4181,16,0,667,1,
-32,4182,16,0,667,
-1,2106,4183,16,0,
-667,1,1515,4184,16,
-0,603,1,2337,4185,
-16,0,667,1,52,
-4186,16,0,620,1,
-1804,4187,16,0,667,
-1,1261,4188,16,0,
-295,1,1153,4189,16,
-0,245,1,1225,4190,
-16,0,274,1,1335,
-4191,16,0,465,1,
-1933,4192,16,0,578,
-1,1834,4193,16,0,
-311,1,1297,4194,16,
-0,328,1,1407,4195,
-16,0,589,1,2318,
-4196,16,0,188,1,
-1958,4197,16,0,667,
-1,1371,4198,16,0,
-460,1,120,4199,19,
-554,1,120,4200,5,
-11,1,2075,4201,16,
-0,552,1,2337,4202,
-16,0,552,1,2413,
-4203,16,0,552,1,
-1901,4204,16,0,552,
-1,2198,4205,16,0,
-552,1,2106,4206,16,
-0,552,1,1804,4207,
-16,0,552,1,1990,
-4208,16,0,552,1,
-32,4209,16,0,552,
-1,1958,4210,16,0,
-552,1,1775,4211,16,
-0,552,1,121,4212,
-19,550,1,121,4213,
-5,11,1,2075,4214,
+4147,16,0,137,1,
+32,4148,16,0,137,
+1,1958,4149,16,0,
+137,1,2686,4150,16,
+0,137,1,1775,4151,
+16,0,137,1,114,
+4152,19,282,1,114,
+4153,5,4,1,2544,
+4154,16,0,280,1,
+2470,4155,16,0,280,
+1,2632,4156,16,0,
+280,1,2593,4157,16,
+0,280,1,115,4158,
+19,475,1,115,4159,
+5,4,1,2544,4160,
+16,0,473,1,2470,
+4161,16,0,473,1,
+2632,4162,16,0,473,
+1,2593,4163,16,0,
+473,1,116,4164,19,
+460,1,116,4165,5,
+4,1,2544,4166,16,
+0,458,1,2470,4167,
+16,0,458,1,2632,
+4168,16,0,458,1,
+2593,4169,16,0,458,
+1,117,4170,19,689,
+1,117,4171,5,4,
+1,2544,4172,16,0,
+687,1,2470,4173,16,
+0,687,1,2632,4174,
+16,0,687,1,2593,
+4175,16,0,687,1,
+118,4176,19,225,1,
+118,4177,5,17,1,
+2075,4178,16,0,544,
+1,2520,4179,16,0,
+472,1,2337,4180,16,
+0,544,1,2413,4181,
+16,0,544,1,2525,
+4182,16,0,273,1,
+2511,4183,16,0,457,
+1,1901,4184,16,0,
+544,1,2198,4185,16,
+0,544,1,2106,4186,
+16,0,544,1,2540,
+4187,16,0,490,1,
+1804,4188,16,0,544,
+1,1990,4189,16,0,
+544,1,31,4190,16,
+0,349,1,32,4191,
+16,0,544,1,2697,
+4192,16,0,223,1,
+1958,4193,16,0,544,
+1,1775,4194,16,0,
+544,1,119,4195,19,
+312,1,119,4196,5,
+1,1,32,4197,16,
+0,310,1,120,4198,
+19,259,1,120,4199,
+5,11,1,2075,4200,
+16,0,608,1,2337,
+4201,16,0,266,1,
+2413,4202,16,0,484,
+1,1901,4203,16,0,
+405,1,2198,4204,16,
+0,329,1,2106,4205,
+16,0,644,1,1804,
+4206,16,0,295,1,
+1990,4207,16,0,532,
+1,32,4208,16,0,
+345,1,1958,4209,16,
+0,495,1,1775,4210,
+16,0,257,1,121,
+4211,19,614,1,121,
+4212,5,11,1,2075,
+4213,16,0,612,1,
+2337,4214,16,0,612,
+1,2413,4215,16,0,
+612,1,1901,4216,16,
+0,612,1,2198,4217,
+16,0,612,1,2106,
+4218,16,0,612,1,
+1804,4219,16,0,612,
+1,1990,4220,16,0,
+612,1,32,4221,16,
+0,612,1,1958,4222,
+16,0,612,1,1775,
+4223,16,0,612,1,
+122,4224,19,673,1,
+122,4225,5,11,1,
+2075,4226,16,0,671,
+1,2337,4227,16,0,
+671,1,2413,4228,16,
+0,671,1,1901,4229,
+16,0,671,1,2198,
+4230,16,0,671,1,
+2106,4231,16,0,671,
+1,1804,4232,16,0,
+671,1,1990,4233,16,
+0,671,1,32,4234,
+16,0,671,1,1958,
+4235,16,0,671,1,
+1775,4236,16,0,671,
+1,123,4237,19,161,
+1,123,4238,5,31,
+1,1901,4239,16,0,
+675,1,1479,4240,16,
+0,589,1,2075,4241,
+16,0,675,1,1695,
+4242,16,0,189,1,
+1756,4243,16,0,188,
+1,2413,4244,16,0,
+675,1,2198,4245,16,
+0,675,1,1876,4246,
+16,0,696,1,1659,
+4247,16,0,188,1,
+1443,4248,16,0,560,
+1,1117,4249,16,0,
+159,1,1990,4250,16,
+0,675,1,1189,4251,
+16,0,241,1,1775,
+4252,16,0,675,1,
+32,4253,16,0,675,
+1,2106,4254,16,0,
+675,1,1515,4255,16,
+0,610,1,2337,4256,
+16,0,675,1,52,
+4257,16,0,627,1,
+1804,4258,16,0,675,
+1,1261,4259,16,0,
+306,1,1153,4260,16,
+0,248,1,1225,4261,
+16,0,276,1,1335,
+4262,16,0,481,1,
+1933,4263,16,0,591,
+1,1834,4264,16,0,
+322,1,1297,4265,16,
+0,339,1,1407,4266,
+16,0,602,1,2318,
+4267,16,0,188,1,
+1958,4268,16,0,675,
+1,1371,4269,16,0,
+470,1,124,4270,19,
+569,1,124,4271,5,
+11,1,2075,4272,16,
+0,567,1,2337,4273,
+16,0,567,1,2413,
+4274,16,0,567,1,
+1901,4275,16,0,567,
+1,2198,4276,16,0,
+567,1,2106,4277,16,
+0,567,1,1804,4278,
+16,0,567,1,1990,
+4279,16,0,567,1,
+32,4280,16,0,567,
+1,1958,4281,16,0,
+567,1,1775,4282,16,
+0,567,1,125,4283,
+19,565,1,125,4284,
+5,11,1,2075,4285,
+16,0,563,1,2337,
+4286,16,0,563,1,
+2413,4287,16,0,563,
+1,1901,4288,16,0,
+563,1,2198,4289,16,
+0,563,1,2106,4290,
+16,0,563,1,1804,
+4291,16,0,563,1,
+1990,4292,16,0,563,
+1,32,4293,16,0,
+563,1,1958,4294,16,
+0,563,1,1775,4295,
+16,0,563,1,126,
+4296,19,606,1,126,
+4297,5,11,1,2075,
+4298,16,0,604,1,
+2337,4299,16,0,604,
+1,2413,4300,16,0,
+604,1,1901,4301,16,
+0,604,1,2198,4302,
+16,0,604,1,2106,
+4303,16,0,604,1,
+1804,4304,16,0,604,
+1,1990,4305,16,0,
+604,1,32,4306,16,
+0,604,1,1958,4307,
+16,0,604,1,1775,
+4308,16,0,604,1,
+127,4309,19,559,1,
+127,4310,5,11,1,
+2075,4311,16,0,557,
+1,2337,4312,16,0,
+557,1,2413,4313,16,
+0,557,1,1901,4314,
+16,0,557,1,2198,
+4315,16,0,557,1,
+2106,4316,16,0,557,
+1,1804,4317,16,0,
+557,1,1990,4318,16,
+0,557,1,32,4319,
+16,0,557,1,1958,
+4320,16,0,557,1,
+1775,4321,16,0,557,
+1,128,4322,19,556,
+1,128,4323,5,11,
+1,2075,4324,16,0,
+554,1,2337,4325,16,
+0,554,1,2413,4326,
+16,0,554,1,1901,
+4327,16,0,554,1,
+2198,4328,16,0,554,
+1,2106,4329,16,0,
+554,1,1804,4330,16,
+0,554,1,1990,4331,
+16,0,554,1,32,
+4332,16,0,554,1,
+1958,4333,16,0,554,
+1,1775,4334,16,0,
+554,1,129,4335,19,
+553,1,129,4336,5,
+11,1,2075,4337,16,
+0,551,1,2337,4338,
+16,0,551,1,2413,
+4339,16,0,551,1,
+1901,4340,16,0,551,
+1,2198,4341,16,0,
+551,1,2106,4342,16,
+0,551,1,1804,4343,
+16,0,551,1,1990,
+4344,16,0,551,1,
+32,4345,16,0,551,
+1,1958,4346,16,0,
+551,1,1775,4347,16,
+0,551,1,130,4348,
+19,550,1,130,4349,
+5,11,1,2075,4350,
 16,0,548,1,2337,
-4215,16,0,548,1,
-2413,4216,16,0,548,
-1,1901,4217,16,0,
-548,1,2198,4218,16,
-0,548,1,2106,4219,
+4351,16,0,548,1,
+2413,4352,16,0,548,
+1,1901,4353,16,0,
+548,1,2198,4354,16,
+0,548,1,2106,4355,
 16,0,548,1,1804,
-4220,16,0,548,1,
-1990,4221,16,0,548,
-1,32,4222,16,0,
-548,1,1958,4223,16,
-0,548,1,1775,4224,
-16,0,548,1,122,
-4225,19,597,1,122,
-4226,5,11,1,2075,
-4227,16,0,595,1,
-2337,4228,16,0,595,
-1,2413,4229,16,0,
-595,1,1901,4230,16,
-0,595,1,2198,4231,
-16,0,595,1,2106,
-4232,16,0,595,1,
-1804,4233,16,0,595,
-1,1990,4234,16,0,
-595,1,32,4235,16,
-0,595,1,1958,4236,
-16,0,595,1,1775,
-4237,16,0,595,1,
-123,4238,19,544,1,
-123,4239,5,11,1,
-2075,4240,16,0,542,
-1,2337,4241,16,0,
-542,1,2413,4242,16,
-0,542,1,1901,4243,
-16,0,542,1,2198,
-4244,16,0,542,1,
-2106,4245,16,0,542,
-1,1804,4246,16,0,
-542,1,1990,4247,16,
-0,542,1,32,4248,
-16,0,542,1,1958,
-4249,16,0,542,1,
-1775,4250,16,0,542,
-1,124,4251,19,541,
-1,124,4252,5,11,
-1,2075,4253,16,0,
-539,1,2337,4254,16,
-0,539,1,2413,4255,
-16,0,539,1,1901,
-4256,16,0,539,1,
-2198,4257,16,0,539,
-1,2106,4258,16,0,
-539,1,1804,4259,16,
-0,539,1,1990,4260,
-16,0,539,1,32,
-4261,16,0,539,1,
-1958,4262,16,0,539,
-1,1775,4263,16,0,
-539,1,125,4264,19,
-538,1,125,4265,5,
-11,1,2075,4266,16,
-0,536,1,2337,4267,
-16,0,536,1,2413,
-4268,16,0,536,1,
-1901,4269,16,0,536,
-1,2198,4270,16,0,
-536,1,2106,4271,16,
-0,536,1,1804,4272,
-16,0,536,1,1990,
-4273,16,0,536,1,
-32,4274,16,0,536,
-1,1958,4275,16,0,
-536,1,1775,4276,16,
-0,536,1,126,4277,
-19,535,1,126,4278,
-5,11,1,2075,4279,
-16,0,533,1,2337,
-4280,16,0,533,1,
-2413,4281,16,0,533,
-1,1901,4282,16,0,
-533,1,2198,4283,16,
-0,533,1,2106,4284,
-16,0,533,1,1804,
-4285,16,0,533,1,
-1990,4286,16,0,533,
-1,32,4287,16,0,
-533,1,1958,4288,16,
-0,533,1,1775,4289,
-16,0,533,1,127,
-4290,19,532,1,127,
-4291,5,11,1,2075,
-4292,16,0,530,1,
-2337,4293,16,0,530,
-1,2413,4294,16,0,
-530,1,1901,4295,16,
-0,530,1,2198,4296,
-16,0,530,1,2106,
-4297,16,0,530,1,
-1804,4298,16,0,530,
-1,1990,4299,16,0,
-530,1,32,4300,16,
-0,530,1,1958,4301,
-16,0,530,1,1775,
-4302,16,0,530,1,
-128,4303,19,147,1,
-128,4304,5,3,1,
-1756,4305,16,0,283,
-1,2318,4306,16,0,
-294,1,1659,4307,16,
-0,145,1,129,4308,
-19,571,1,129,4309,
-5,68,1,1901,4310,
-16,0,569,1,1479,
-4311,16,0,569,1,
-112,4312,16,0,569,
-1,2293,4313,16,0,
-569,1,1804,4314,16,
-0,569,1,431,4315,
-16,0,569,1,1443,
-4316,16,0,569,1,
-1756,4317,16,0,569,
-1,124,4318,16,0,
-569,1,525,4319,16,
-0,569,1,236,4320,
-16,0,569,1,346,
-4321,16,0,569,1,
-1876,4322,16,0,569,
-1,1659,4323,16,0,
-569,1,1225,4324,16,
-0,569,1,1117,4325,
-16,0,569,1,137,
-4326,16,0,569,1,
-2318,4327,16,0,569,
-1,1775,4328,16,0,
-569,1,32,4329,16,
-0,569,1,1407,4330,
-16,0,569,1,256,
-4331,16,0,569,1,
-459,4332,16,0,569,
-1,406,4333,16,0,
-569,1,41,4334,16,
-0,569,1,151,4335,
-16,0,569,1,43,
-4336,16,0,569,1,
-1585,4337,16,0,569,
-1,2686,4338,16,0,
-569,1,1990,4339,16,
-0,569,1,2337,4340,
-16,0,569,1,509,
-4341,16,0,569,1,
-52,4342,16,0,569,
-1,381,4343,16,0,
-569,1,447,4344,16,
-0,569,1,166,4345,
-16,0,569,1,462,
-4346,16,0,569,1,
-277,4347,16,0,569,
-1,1695,4348,16,0,
-569,1,62,4349,16,
-0,615,1,1153,4350,
-16,0,569,1,2106,
-4351,16,0,569,1,
-1335,4352,16,0,569,
-1,71,4353,16,0,
-569,1,182,4354,16,
-0,569,1,76,4355,
-16,0,569,1,79,
-4356,16,0,569,1,
-1933,4357,16,0,569,
-1,299,4358,16,0,
-569,1,85,4359,16,
-0,569,1,1515,4360,
-16,0,569,1,2198,
-4361,16,0,569,1,
-89,4362,16,0,569,
-1,1834,4363,16,0,
-569,1,1622,4364,16,
-0,569,1,2413,4365,
-16,0,569,1,2075,
-4366,16,0,569,1,
-1731,4367,16,0,569,
-1,97,4368,16,0,
-569,1,1297,4369,16,
-0,569,1,1189,4370,
-16,0,569,1,102,
-4371,16,0,569,1,
-1261,4372,16,0,569,
-1,322,4373,16,0,
-569,1,1958,4374,16,
-0,569,1,199,4375,
-16,0,569,1,1371,
-4376,16,0,569,1,
-217,4377,16,0,569,
-1,130,4378,19,632,
-1,130,4379,5,2,
-1,459,4380,16,0,
-630,1,41,4381,16,
-0,691,1,131,4382,
-19,636,1,131,4383,
-5,3,1,462,4384,
-16,0,634,1,459,
-4385,16,0,656,1,
-41,4386,16,0,656,
-1,132,4387,19,4388,
+4356,16,0,548,1,
+1990,4357,16,0,548,
+1,32,4358,16,0,
+548,1,1958,4359,16,
+0,548,1,1775,4360,
+16,0,548,1,131,
+4361,19,547,1,131,
+4362,5,11,1,2075,
+4363,16,0,545,1,
+2337,4364,16,0,545,
+1,2413,4365,16,0,
+545,1,1901,4366,16,
+0,545,1,2198,4367,
+16,0,545,1,2106,
+4368,16,0,545,1,
+1804,4369,16,0,545,
+1,1990,4370,16,0,
+545,1,32,4371,16,
+0,545,1,1958,4372,
+16,0,545,1,1775,
+4373,16,0,545,1,
+132,4374,19,147,1,
+132,4375,5,3,1,
+1756,4376,16,0,294,
+1,2318,4377,16,0,
+305,1,1659,4378,16,
+0,145,1,133,4379,
+19,586,1,133,4380,
+5,68,1,1901,4381,
+16,0,584,1,1479,
+4382,16,0,584,1,
+112,4383,16,0,584,
+1,2293,4384,16,0,
+584,1,1804,4385,16,
+0,584,1,431,4386,
+16,0,584,1,1443,
+4387,16,0,584,1,
+1756,4388,16,0,584,
+1,124,4389,16,0,
+584,1,525,4390,16,
+0,584,1,236,4391,
+16,0,584,1,346,
+4392,16,0,584,1,
+1876,4393,16,0,584,
+1,1659,4394,16,0,
+584,1,1225,4395,16,
+0,584,1,1117,4396,
+16,0,584,1,137,
+4397,16,0,584,1,
+2318,4398,16,0,584,
+1,1775,4399,16,0,
+584,1,32,4400,16,
+0,584,1,1407,4401,
+16,0,584,1,256,
+4402,16,0,584,1,
+459,4403,16,0,584,
+1,406,4404,16,0,
+584,1,41,4405,16,
+0,584,1,151,4406,
+16,0,584,1,43,
+4407,16,0,584,1,
+1585,4408,16,0,584,
+1,1990,4409,16,0,
+584,1,2337,4410,16,
+0,584,1,509,4411,
+16,0,584,1,52,
+4412,16,0,584,1,
+381,4413,16,0,584,
+1,447,4414,16,0,
+584,1,166,4415,16,
+0,584,1,462,4416,
+16,0,584,1,277,
+4417,16,0,584,1,
+1695,4418,16,0,584,
+1,62,4419,16,0,
+622,1,1153,4420,16,
+0,584,1,2106,4421,
+16,0,584,1,1335,
+4422,16,0,584,1,
+71,4423,16,0,584,
+1,182,4424,16,0,
+584,1,76,4425,16,
+0,584,1,79,4426,
+16,0,584,1,1933,
+4427,16,0,584,1,
+299,4428,16,0,584,
+1,85,4429,16,0,
+584,1,2702,4430,16,
+0,584,1,1515,4431,
+16,0,584,1,2198,
+4432,16,0,584,1,
+89,4433,16,0,584,
+1,1834,4434,16,0,
+584,1,1622,4435,16,
+0,584,1,2413,4436,
+16,0,584,1,2075,
+4437,16,0,584,1,
+1731,4438,16,0,584,
+1,97,4439,16,0,
+584,1,1297,4440,16,
+0,584,1,1189,4441,
+16,0,584,1,102,
+4442,16,0,584,1,
+1261,4443,16,0,584,
+1,322,4444,16,0,
+584,1,1958,4445,16,
+0,584,1,199,4446,
+16,0,584,1,1371,
+4447,16,0,584,1,
+217,4448,16,0,584,
+1,134,4449,19,639,
+1,134,4450,5,2,
+1,459,4451,16,0,
+637,1,41,4452,16,
+0,708,1,135,4453,
+19,643,1,135,4454,
+5,3,1,462,4455,
+16,0,641,1,459,
+4456,16,0,667,1,
+41,4457,16,0,667,
+1,136,4458,19,4459,
 4,36,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
@@ -10686,197 +11005,197 @@ public yyLSLSyntax
 110,0,65,0,114,
 0,103,0,117,0,
 109,0,101,0,110,
-0,116,0,1,132,
-4383,1,133,4389,19,
-567,1,133,4390,5,
-68,1,1901,4391,16,
-0,565,1,1479,4392,
-16,0,565,1,112,
-4393,16,0,565,1,
-2293,4394,16,0,565,
-1,1804,4395,16,0,
-565,1,431,4396,16,
-0,565,1,1443,4397,
-16,0,565,1,1756,
-4398,16,0,565,1,
-124,4399,16,0,565,
-1,525,4400,16,0,
-565,1,236,4401,16,
-0,565,1,346,4402,
-16,0,565,1,1876,
-4403,16,0,565,1,
-1659,4404,16,0,565,
-1,1225,4405,16,0,
-565,1,1117,4406,16,
-0,565,1,137,4407,
-16,0,565,1,2318,
-4408,16,0,565,1,
-1775,4409,16,0,565,
-1,32,4410,16,0,
-565,1,1407,4411,16,
-0,565,1,256,4412,
-16,0,565,1,459,
-4413,16,0,565,1,
-406,4414,16,0,565,
-1,41,4415,16,0,
-565,1,151,4416,16,
-0,565,1,43,4417,
-16,0,565,1,1585,
-4418,16,0,565,1,
-2686,4419,16,0,565,
-1,1990,4420,16,0,
-565,1,2337,4421,16,
-0,565,1,509,4422,
-16,0,565,1,52,
-4423,16,0,565,1,
-381,4424,16,0,565,
-1,447,4425,16,0,
-565,1,166,4426,16,
-0,565,1,462,4427,
-16,0,565,1,277,
-4428,16,0,565,1,
-1695,4429,16,0,565,
-1,62,4430,16,0,
-616,1,1153,4431,16,
-0,565,1,2106,4432,
-16,0,565,1,1335,
-4433,16,0,565,1,
-71,4434,16,0,565,
-1,182,4435,16,0,
-565,1,76,4436,16,
-0,565,1,79,4437,
-16,0,565,1,1933,
-4438,16,0,565,1,
-299,4439,16,0,565,
-1,85,4440,16,0,
-565,1,1515,4441,16,
-0,565,1,2198,4442,
-16,0,565,1,89,
-4443,16,0,565,1,
-1834,4444,16,0,565,
-1,1622,4445,16,0,
-565,1,2413,4446,16,
-0,565,1,2075,4447,
-16,0,565,1,1731,
-4448,16,0,565,1,
-97,4449,16,0,565,
-1,1297,4450,16,0,
-565,1,1189,4451,16,
-0,565,1,102,4452,
-16,0,565,1,1261,
-4453,16,0,565,1,
-322,4454,16,0,565,
-1,1958,4455,16,0,
-565,1,199,4456,16,
-0,565,1,1371,4457,
-16,0,565,1,217,
-4458,16,0,565,1,
-134,4459,19,4460,4,
+0,116,0,1,136,
+4454,1,137,4460,19,
+582,1,137,4461,5,
+68,1,1901,4462,16,
+0,580,1,1479,4463,
+16,0,580,1,112,
+4464,16,0,580,1,
+2293,4465,16,0,580,
+1,1804,4466,16,0,
+580,1,431,4467,16,
+0,580,1,1443,4468,
+16,0,580,1,1756,
+4469,16,0,580,1,
+124,4470,16,0,580,
+1,525,4471,16,0,
+580,1,236,4472,16,
+0,580,1,346,4473,
+16,0,580,1,1876,
+4474,16,0,580,1,
+1659,4475,16,0,580,
+1,1225,4476,16,0,
+580,1,1117,4477,16,
+0,580,1,137,4478,
+16,0,580,1,2318,
+4479,16,0,580,1,
+1775,4480,16,0,580,
+1,32,4481,16,0,
+580,1,1407,4482,16,
+0,580,1,256,4483,
+16,0,580,1,459,
+4484,16,0,580,1,
+406,4485,16,0,580,
+1,41,4486,16,0,
+580,1,151,4487,16,
+0,580,1,43,4488,
+16,0,580,1,1585,
+4489,16,0,580,1,
+1990,4490,16,0,580,
+1,2337,4491,16,0,
+580,1,509,4492,16,
+0,580,1,52,4493,
+16,0,580,1,381,
+4494,16,0,580,1,
+447,4495,16,0,580,
+1,166,4496,16,0,
+580,1,462,4497,16,
+0,580,1,277,4498,
+16,0,580,1,1695,
+4499,16,0,580,1,
+62,4500,16,0,623,
+1,1153,4501,16,0,
+580,1,2106,4502,16,
+0,580,1,1335,4503,
+16,0,580,1,71,
+4504,16,0,580,1,
+182,4505,16,0,580,
+1,76,4506,16,0,
+580,1,79,4507,16,
+0,580,1,1933,4508,
+16,0,580,1,299,
+4509,16,0,580,1,
+85,4510,16,0,580,
+1,2702,4511,16,0,
+580,1,1515,4512,16,
+0,580,1,2198,4513,
+16,0,580,1,89,
+4514,16,0,580,1,
+1834,4515,16,0,580,
+1,1622,4516,16,0,
+580,1,2413,4517,16,
+0,580,1,2075,4518,
+16,0,580,1,1731,
+4519,16,0,580,1,
+97,4520,16,0,580,
+1,1297,4521,16,0,
+580,1,1189,4522,16,
+0,580,1,102,4523,
+16,0,580,1,1261,
+4524,16,0,580,1,
+322,4525,16,0,580,
+1,1958,4526,16,0,
+580,1,199,4527,16,
+0,580,1,1371,4528,
+16,0,580,1,217,
+4529,16,0,580,1,
+138,4530,19,4531,4,
 28,86,0,101,0,
 99,0,116,0,111,
 0,114,0,67,0,
 111,0,110,0,115,
 0,116,0,97,0,
 110,0,116,0,1,
-134,4390,1,135,4461,
-19,4462,4,32,82,
+138,4461,1,139,4532,
+19,4533,4,32,82,
 0,111,0,116,0,
 97,0,116,0,105,
 0,111,0,110,0,
 67,0,111,0,110,
 0,115,0,116,0,
 97,0,110,0,116,
-0,1,135,4390,1,
-136,4463,19,4464,4,
+0,1,139,4461,1,
+140,4534,19,4535,4,
 24,76,0,105,0,
 115,0,116,0,67,
 0,111,0,110,0,
 115,0,116,0,97,
 0,110,0,116,0,
-1,136,4390,1,137,
-4465,19,169,1,137,
-4466,5,67,1,1901,
-4467,16,0,612,1,
-1479,4468,16,0,556,
-1,112,4469,16,0,
-247,1,2293,4470,16,
-0,273,1,1804,4471,
-16,0,612,1,431,
-4472,16,0,604,1,
-1443,4473,16,0,485,
-1,1756,4474,16,0,
-701,1,124,4475,16,
-0,255,1,525,4476,
-16,0,304,1,236,
-4477,16,0,350,1,
-346,4478,16,0,519,
-1,1876,4479,16,0,
-320,1,1659,4480,16,
-0,701,1,1225,4481,
-16,0,246,1,1117,
-4482,16,0,220,1,
-137,4483,16,0,272,
-1,2318,4484,16,0,
-701,1,1775,4485,16,
-0,612,1,32,4486,
-16,0,612,1,1407,
-4487,16,0,504,1,
-256,4488,16,0,404,
-1,459,4489,16,0,
-167,1,406,4490,16,
-0,582,1,41,4491,
+1,140,4461,1,141,
+4536,19,169,1,141,
+4537,5,67,1,1901,
+4538,16,0,617,1,
+1479,4539,16,0,571,
+1,112,4540,16,0,
+250,1,2293,4541,16,
+0,275,1,1804,4542,
+16,0,617,1,431,
+4543,16,0,611,1,
+1443,4544,16,0,506,
+1,1756,4545,16,0,
+719,1,124,4546,16,
+0,256,1,525,4547,
+16,0,315,1,236,
+4548,16,0,355,1,
+346,4549,16,0,534,
+1,1876,4550,16,0,
+328,1,1659,4551,16,
+0,719,1,1225,4552,
+16,0,249,1,1117,
+4553,16,0,219,1,
+137,4554,16,0,274,
+1,2318,4555,16,0,
+719,1,1775,4556,16,
+0,617,1,32,4557,
+16,0,617,1,1407,
+4558,16,0,525,1,
+256,4559,16,0,409,
+1,459,4560,16,0,
+167,1,406,4561,16,
+0,595,1,41,4562,
 16,0,167,1,151,
-4492,16,0,282,1,
-43,4493,16,0,658,
-1,2686,4494,16,0,
-700,1,1990,4495,16,
-0,612,1,2337,4496,
-16,0,612,1,509,
-4497,16,0,677,1,
-52,4498,16,0,622,
-1,381,4499,16,0,
-574,1,447,4500,16,
-0,304,1,166,4501,
-16,0,293,1,462,
-4502,16,0,167,1,
-277,4503,16,0,448,
-1,1695,4504,16,0,
-270,1,1261,4505,16,
-0,281,1,1153,4506,
-16,0,174,1,2106,
-4507,16,0,612,1,
-1335,4508,16,0,335,
-1,71,4509,16,0,
-204,1,182,4510,16,
-0,304,1,76,4511,
-16,0,572,1,79,
-4512,16,0,219,1,
-1933,4513,16,0,416,
-1,299,4514,16,0,
-468,1,85,4515,16,
-0,482,1,1515,4516,
-16,0,581,1,2198,
-4517,16,0,612,1,
-89,4518,16,0,228,
-1,1834,4519,16,0,
-292,1,1622,4520,16,
-0,676,1,2413,4521,
-16,0,612,1,2075,
-4522,16,0,612,1,
-1731,4523,16,0,248,
-1,97,4524,16,0,
-420,1,1297,4525,16,
-0,337,1,1189,4526,
-16,0,218,1,102,
-4527,16,0,236,1,
-1585,4528,16,0,690,
-1,322,4529,16,0,
-483,1,1958,4530,16,
-0,612,1,199,4531,
-16,0,315,1,1371,
-4532,16,0,405,1,
-217,4533,16,0,334,
-1,138,4534,19,4535,
+4563,16,0,293,1,
+43,4564,16,0,669,
+1,1990,4565,16,0,
+617,1,2337,4566,16,
+0,617,1,509,4567,
+16,0,686,1,52,
+4568,16,0,629,1,
+381,4569,16,0,588,
+1,447,4570,16,0,
+315,1,166,4571,16,
+0,304,1,462,4572,
+16,0,167,1,277,
+4573,16,0,456,1,
+1695,4574,16,0,271,
+1,1261,4575,16,0,
+292,1,1153,4576,16,
+0,174,1,2106,4577,
+16,0,617,1,1335,
+4578,16,0,342,1,
+71,4579,16,0,203,
+1,182,4580,16,0,
+315,1,76,4581,16,
+0,587,1,79,4582,
+16,0,218,1,1933,
+4583,16,0,421,1,
+299,4584,16,0,483,
+1,85,4585,16,0,
+502,1,2702,4586,16,
+0,231,1,1515,4587,
+16,0,594,1,2198,
+4588,16,0,617,1,
+89,4589,16,0,230,
+1,1834,4590,16,0,
+303,1,1622,4591,16,
+0,685,1,2413,4592,
+16,0,617,1,2075,
+4593,16,0,617,1,
+1731,4594,16,0,251,
+1,97,4595,16,0,
+425,1,1297,4596,16,
+0,344,1,1189,4597,
+16,0,217,1,102,
+4598,16,0,239,1,
+1585,4599,16,0,698,
+1,322,4600,16,0,
+504,1,1958,4601,16,
+0,617,1,199,4602,
+16,0,326,1,1371,
+4603,16,0,410,1,
+217,4604,16,0,341,
+1,142,4605,19,4606,
 4,36,67,0,111,
 0,110,0,115,0,
 116,0,97,0,110,
@@ -10884,17 +11203,17 @@ public yyLSLSyntax
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
-0,110,0,1,138,
-4466,1,139,4536,19,
-4537,4,30,73,0,
+0,110,0,1,142,
+4537,1,143,4607,19,
+4608,4,30,73,0,
 100,0,101,0,110,
 0,116,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
-0,110,0,1,139,
-4466,1,140,4538,19,
-4539,4,36,73,0,
+0,110,0,1,143,
+4537,1,144,4609,19,
+4610,4,36,73,0,
 100,0,101,0,110,
 0,116,0,68,0,
 111,0,116,0,69,
@@ -10902,8 +11221,8 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,1,
-140,4466,1,141,4540,
-19,4541,4,44,70,
+144,4537,1,145,4611,
+19,4612,4,44,70,
 0,117,0,110,0,
 99,0,116,0,105,
 0,111,0,110,0,
@@ -10912,25 +11231,25 @@ public yyLSLSyntax
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
-0,110,0,1,141,
-4466,1,142,4542,19,
-4543,4,32,66,0,
+0,110,0,1,145,
+4537,1,146,4613,19,
+4614,4,32,66,0,
 105,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-1,142,4466,1,143,
-4544,19,4545,4,30,
+1,146,4537,1,147,
+4615,19,4616,4,30,
 85,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-1,143,4466,1,144,
-4546,19,4547,4,36,
+1,147,4537,1,148,
+4617,19,4618,4,36,
 84,0,121,0,112,
 0,101,0,99,0,
 97,0,115,0,116,
@@ -10938,8 +11257,8 @@ public yyLSLSyntax
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,1,144,4466,1,
-145,4548,19,4549,4,
+0,1,148,4537,1,
+149,4619,19,4620,4,
 42,80,0,97,0,
 114,0,101,0,110,
 0,116,0,104,0,
@@ -10948,9 +11267,9 @@ public yyLSLSyntax
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
-0,110,0,1,145,
-4466,1,146,4550,19,
-4551,4,56,73,0,
+0,110,0,1,149,
+4537,1,150,4621,19,
+4622,4,56,73,0,
 110,0,99,0,114,
 0,101,0,109,0,
 101,0,110,0,116,
@@ -10962,309 +11281,317 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,1,
-146,4466,1,148,4552,
-19,728,1,148,3993,
-1,149,4553,19,733,
-1,149,3993,1,150,
-4554,19,3280,1,150,
-3996,1,151,4555,19,
-3270,1,151,3996,1,
-152,4556,19,3275,1,
-152,3996,1,153,4557,
-19,3265,1,153,3996,
-1,154,4558,19,3300,
-1,154,3999,1,155,
-4559,19,3286,1,155,
-3999,1,156,4560,19,
-3295,1,156,4003,1,
-157,4561,19,3305,1,
-157,4003,1,158,4562,
-19,711,1,158,4007,
-1,159,4563,19,722,
-1,159,4007,1,160,
-4564,19,738,1,160,
-4011,1,161,4565,19,
-717,1,161,4011,1,
-162,4566,19,1693,1,
-162,4017,1,163,4567,
-19,1678,1,163,4017,
-1,164,4568,19,1683,
-1,164,4017,1,165,
-4569,19,1673,1,165,
-4017,1,166,4570,19,
-1688,1,166,4017,1,
-167,4571,19,1668,1,
-167,4017,1,168,4572,
-19,1699,1,168,4021,
-1,169,4573,19,1659,
-1,169,4027,1,170,
-4574,19,1652,1,170,
-4033,1,171,4575,19,
-1739,1,171,4039,1,
-172,4576,19,1712,1,
-172,4039,1,173,4577,
-19,2069,1,173,4044,
-1,174,4578,19,2063,
-1,174,4066,1,175,
-4579,19,1145,1,175,
-4047,1,176,4580,19,
-930,1,176,4107,1,
-177,4581,19,914,1,
-177,4107,1,178,4582,
-19,920,1,178,4125,
-1,179,4583,19,908,
-1,179,4125,1,180,
-4584,19,1173,1,180,
-4141,1,181,4585,19,
-811,1,181,4128,1,
-182,4586,19,925,1,
-182,4128,1,183,4587,
-19,806,1,183,4128,
-1,184,4588,19,831,
-1,184,4128,1,185,
-4589,19,800,1,185,
-4128,1,186,4590,19,
-794,1,186,4128,1,
-187,4591,19,789,1,
-187,4128,1,188,4592,
-19,784,1,188,4128,
-1,189,4593,19,778,
-1,189,4128,1,190,
-4594,19,773,1,190,
-4128,1,191,4595,19,
-768,1,191,4128,1,
-192,4596,19,763,1,
-192,4128,1,193,4597,
-19,758,1,193,4128,
-1,194,4598,19,1180,
-1,194,4213,1,195,
-4599,19,1318,1,195,
-4226,1,196,4600,19,
-1167,1,196,4239,1,
-197,4601,19,1306,1,
-197,4239,1,198,4602,
-19,947,1,198,4252,
-1,199,4603,19,751,
-1,199,4252,1,200,
-4604,19,846,1,200,
-4252,1,201,4605,19,
-874,1,201,4252,1,
-202,4606,19,893,1,
-202,4265,1,203,4607,
-19,939,1,203,4265,
-1,204,4608,19,854,
-1,204,4278,1,205,
-4609,19,867,1,205,
-4278,1,206,4610,19,
-820,1,206,4291,1,
-207,4611,19,859,1,
-207,4291,1,208,4612,
-19,1505,1,208,4304,
-1,209,4613,19,1186,
-1,209,4304,1,210,
-4614,19,1538,1,210,
-4304,1,211,4615,19,
-1570,1,211,4304,1,
-212,4616,19,1434,1,
-212,4154,1,213,4617,
-19,1493,1,213,4154,
-1,214,4618,19,1161,
-1,214,4167,1,215,
-4619,19,1602,1,215,
-4167,1,216,4620,19,
-1533,1,216,4167,1,
-217,4621,19,1478,1,
-217,4167,1,218,4622,
-19,1402,1,218,4167,
-1,219,4623,19,1328,
-1,219,4167,1,220,
-4624,19,1338,1,220,
-4167,1,221,4625,19,
-1156,1,221,4167,1,
-222,4626,19,1586,1,
-222,4167,1,223,4627,
-19,1528,1,223,4167,
-1,224,4628,19,1468,
-1,224,4167,1,225,
-4629,19,1391,1,225,
-4167,1,226,4630,19,
-1354,1,226,4167,1,
-227,4631,19,1139,1,
-227,4167,1,228,4632,
-19,1488,1,228,4167,
-1,229,4633,19,1516,
-1,229,4167,1,230,
-4634,19,1461,1,230,
-4167,1,231,4635,19,
-1483,1,231,4167,1,
-232,4636,19,1294,1,
-232,4167,1,233,4637,
-19,1198,1,233,4167,
-1,234,4638,19,1128,
-1,234,4167,1,235,
-4639,19,1560,1,235,
-4167,1,236,4640,19,
-1511,1,236,4167,1,
-237,4641,19,1456,1,
-237,4167,1,238,4642,
-19,1323,1,238,4200,
-1,239,4643,19,1301,
-1,239,4200,1,240,
-4644,19,1591,1,240,
-4390,1,241,4645,19,
-1614,1,241,4390,1,
-242,4646,19,1581,1,
-242,4390,1,243,4647,
-19,1576,1,243,4390,
-1,244,4648,19,1597,
-1,244,4390,1,245,
-4649,19,1544,1,245,
-4390,1,246,4650,19,
-1248,1,246,4390,1,
-247,4651,19,1423,1,
-247,4466,1,248,4652,
-19,1209,1,248,4466,
-1,249,4653,19,1216,
-1,249,4466,1,250,
-4654,19,1237,1,250,
-4466,1,251,4655,19,
-1232,1,251,4466,1,
-252,4656,19,1227,1,
-252,4466,1,253,4657,
-19,1222,1,253,4466,
-1,254,4658,19,1412,
-1,254,4466,1,255,
-4659,19,1440,1,255,
-4466,1,256,4660,19,
-1417,1,256,4466,1,
-257,4661,19,1407,1,
-257,4466,1,258,4662,
-19,1397,1,258,4466,
-1,259,4663,19,1380,
-1,259,4466,1,260,
-4664,19,1333,1,260,
-4466,1,261,4665,19,
-1242,1,261,4466,1,
-262,4666,19,1203,1,
-262,4466,1,263,4667,
-19,1151,1,263,4466,
-1,264,4668,19,1609,
-1,264,4466,1,265,
-4669,19,1565,1,265,
-4466,1,266,4670,19,
-1555,1,266,4466,1,
-267,4671,19,1550,1,
-267,4466,1,268,4672,
-19,1499,1,268,4466,
-1,269,4673,19,1473,
-1,269,4466,1,270,
-4674,19,1450,1,270,
-4466,1,271,4675,19,
-1445,1,271,4466,1,
-272,4676,19,1386,1,
-272,4466,1,273,4677,
-19,1362,1,273,4466,
-1,274,4678,19,1428,
-1,274,4466,1,275,
-4679,19,1522,1,275,
-4466,1,276,4680,19,
-1375,1,276,4466,1,
-277,4681,19,1369,1,
-277,4466,1,278,4682,
-19,1349,1,278,4466,
-1,279,4683,19,1312,
-1,279,4466,1,280,
-4684,19,1289,1,280,
-4466,1,281,4685,19,
-1134,1,281,4466,1,
-282,4686,19,1624,1,
-282,4466,1,283,4687,
-19,1254,1,283,4466,
-1,284,4688,19,1259,
-1,284,4466,1,285,
-4689,19,1279,1,285,
-4466,1,286,4690,19,
-1269,1,286,4466,1,
-287,4691,19,1274,1,
-287,4466,1,288,4692,
-19,1264,1,288,4466,
-1,289,4693,19,1619,
-1,289,4466,1,290,
-4694,19,1284,1,290,
-4466,1,291,4695,19,
-1344,1,291,4309,1,
-292,4696,19,1752,1,
-292,4379,1,293,4697,
-19,1745,1,293,4379,
-1,294,4698,19,1722,
-1,294,4383,1,295,
-4699,19,2051,1,295,
-4069,1,296,4700,19,
-2046,1,296,4069,1,
-297,4701,19,2041,1,
-297,4069,1,298,4702,
-19,2036,1,298,4069,
-1,299,4703,19,2031,
-1,299,4069,1,300,
-4704,19,2026,1,300,
-4069,1,301,4705,19,
-2021,1,301,4069,1,
-302,4706,19,2010,1,
-302,4089,1,303,4707,
-19,2005,1,303,4089,
-1,304,4708,19,2000,
-1,304,4089,1,305,
-4709,19,1995,1,305,
-4089,1,306,4710,19,
-1990,1,306,4089,1,
-307,4711,19,1985,1,
-307,4089,1,308,4712,
-19,1980,1,308,4089,
-1,309,4713,19,1975,
-1,309,4089,1,310,
-4714,19,1970,1,310,
-4089,1,311,4715,19,
-1804,1,311,4089,1,
-312,4716,19,1964,1,
-312,4089,1,313,4717,
-19,1959,1,313,4089,
-1,314,4718,19,1954,
-1,314,4089,1,315,
-4719,19,1797,1,315,
-4089,1,316,4720,19,
-1949,1,316,4089,1,
-317,4721,19,1944,1,
-317,4089,1,318,4722,
-19,1939,1,318,4095,
-1,319,4723,19,1934,
-1,319,4095,1,320,
-4724,19,1929,1,320,
-4095,1,321,4725,19,
-1924,1,321,4095,1,
-322,4726,19,1789,1,
-322,4095,1,323,4727,
-19,1918,1,323,4095,
-1,324,4728,19,1913,
-1,324,4095,1,325,
-4729,19,1908,1,325,
-4095,1,326,4730,19,
-1783,1,326,4095,1,
-327,4731,19,1902,1,
-327,4095,1,328,4732,
-19,1833,1,328,4101,
-1,329,4733,19,1897,
-1,329,4101,1,330,
-4734,19,1892,1,330,
-4101,1,331,4735,19,
-1887,1,331,4101,1,
-332,4736,19,1882,1,
-332,4101,1,333,4737,
-19,1877,1,333,4101,
-1,334,4738,19,1872,
-1,334,4101,1,335,
-4739,19,1867,1,335,
-4101,1,336,4740,19,
-4741,4,50,65,0,
+150,4537,1,152,4623,
+19,729,1,152,4045,
+1,153,4624,19,751,
+1,153,4045,1,154,
+4625,19,3315,1,154,
+4048,1,155,4626,19,
+3334,1,155,4048,1,
+156,4627,19,3339,1,
+156,4048,1,157,4628,
+19,3329,1,157,4048,
+1,158,4629,19,3323,
+1,158,4051,1,159,
+4630,19,3350,1,159,
+4051,1,160,4631,19,
+3356,1,160,4055,1,
+161,4632,19,3345,1,
+161,4055,1,162,4633,
+19,746,1,162,4059,
+1,163,4634,19,756,
+1,163,4059,1,164,
+4635,19,735,1,164,
+4063,1,165,4636,19,
+740,1,165,4063,1,
+166,4637,19,1733,1,
+166,4069,1,167,4638,
+19,1708,1,167,4069,
+1,168,4639,19,1728,
+1,168,4069,1,169,
+4640,19,1703,1,169,
+4069,1,170,4641,19,
+1723,1,170,4069,1,
+171,4642,19,1698,1,
+171,4069,1,172,4643,
+19,1718,1,172,4069,
+1,173,4644,19,1713,
+1,173,4069,1,174,
+4645,19,1691,1,174,
+4073,1,175,4646,19,
+1684,1,175,4079,1,
+176,4647,19,1677,1,
+176,4085,1,177,4648,
+19,1671,1,177,4091,
+1,178,4649,19,1774,
+1,178,4097,1,179,
+4650,19,1748,1,179,
+4097,1,180,4651,19,
+2095,1,180,4102,1,
+181,4652,19,2131,1,
+181,4105,1,182,4653,
+19,1163,1,182,4108,
+1,183,4654,19,2110,
+1,183,4127,1,184,
+4655,19,2125,1,184,
+4130,1,185,4656,19,
+948,1,185,4177,1,
+186,4657,19,932,1,
+186,4177,1,187,4658,
+19,938,1,187,4196,
+1,188,4659,19,926,
+1,188,4196,1,189,
+4660,19,1191,1,189,
+4212,1,190,4661,19,
+828,1,190,4199,1,
+191,4662,19,943,1,
+191,4199,1,192,4663,
+19,823,1,192,4199,
+1,193,4664,19,848,
+1,193,4199,1,194,
+4665,19,817,1,194,
+4199,1,195,4666,19,
+811,1,195,4199,1,
+196,4667,19,806,1,
+196,4199,1,197,4668,
+19,801,1,197,4199,
+1,198,4669,19,795,
+1,198,4199,1,199,
+4670,19,790,1,199,
+4199,1,200,4671,19,
+785,1,200,4199,1,
+201,4672,19,780,1,
+201,4199,1,202,4673,
+19,775,1,202,4199,
+1,203,4674,19,1198,
+1,203,4284,1,204,
+4675,19,1336,1,204,
+4297,1,205,4676,19,
+1185,1,205,4310,1,
+206,4677,19,1324,1,
+206,4310,1,207,4678,
+19,965,1,207,4323,
+1,208,4679,19,768,
+1,208,4323,1,209,
+4680,19,863,1,209,
+4323,1,210,4681,19,
+891,1,210,4323,1,
+211,4682,19,910,1,
+211,4336,1,212,4683,
+19,957,1,212,4336,
+1,213,4684,19,871,
+1,213,4349,1,214,
+4685,19,884,1,214,
+4349,1,215,4686,19,
+837,1,215,4362,1,
+216,4687,19,876,1,
+216,4362,1,217,4688,
+19,1523,1,217,4375,
+1,218,4689,19,1204,
+1,218,4375,1,219,
+4690,19,1555,1,219,
+4375,1,220,4691,19,
+1588,1,220,4375,1,
+221,4692,19,1448,1,
+221,4225,1,222,4693,
+19,1512,1,222,4225,
+1,223,4694,19,1179,
+1,223,4238,1,224,
+4695,19,1620,1,224,
+4238,1,225,4696,19,
+1550,1,225,4238,1,
+226,4697,19,1497,1,
+226,4238,1,227,4698,
+19,1416,1,227,4238,
+1,228,4699,19,1346,
+1,228,4238,1,229,
+4700,19,1356,1,229,
+4238,1,230,4701,19,
+1174,1,230,4238,1,
+231,4702,19,1604,1,
+231,4238,1,232,4703,
+19,1545,1,232,4238,
+1,233,4704,19,1487,
+1,233,4238,1,234,
+4705,19,1405,1,234,
+4238,1,235,4706,19,
+1372,1,235,4238,1,
+236,4707,19,1157,1,
+236,4238,1,237,4708,
+19,1507,1,237,4238,
+1,238,4709,19,1533,
+1,238,4238,1,239,
+4710,19,1480,1,239,
+4238,1,240,4711,19,
+1502,1,240,4238,1,
+241,4712,19,1312,1,
+241,4238,1,242,4713,
+19,1216,1,242,4238,
+1,243,4714,19,1146,
+1,243,4238,1,244,
+4715,19,1578,1,244,
+4238,1,245,4716,19,
+1528,1,245,4238,1,
+246,4717,19,1475,1,
+246,4238,1,247,4718,
+19,1341,1,247,4271,
+1,248,4719,19,1319,
+1,248,4271,1,249,
+4720,19,1609,1,249,
+4461,1,250,4721,19,
+1632,1,250,4461,1,
+251,4722,19,1599,1,
+251,4461,1,252,4723,
+19,1594,1,252,4461,
+1,253,4724,19,1615,
+1,253,4461,1,254,
+4725,19,1561,1,254,
+4461,1,255,4726,19,
+1266,1,255,4461,1,
+256,4727,19,1437,1,
+256,4537,1,257,4728,
+19,1227,1,257,4537,
+1,258,4729,19,1234,
+1,258,4537,1,259,
+4730,19,1255,1,259,
+4537,1,260,4731,19,
+1250,1,260,4537,1,
+261,4732,19,1245,1,
+261,4537,1,262,4733,
+19,1240,1,262,4537,
+1,263,4734,19,1426,
+1,263,4537,1,264,
+4735,19,1454,1,264,
+4537,1,265,4736,19,
+1431,1,265,4537,1,
+266,4737,19,1421,1,
+266,4537,1,267,4738,
+19,1411,1,267,4537,
+1,268,4739,19,1394,
+1,268,4537,1,269,
+4740,19,1351,1,269,
+4537,1,270,4741,19,
+1260,1,270,4537,1,
+271,4742,19,1221,1,
+271,4537,1,272,4743,
+19,1169,1,272,4537,
+1,273,4744,19,1627,
+1,273,4537,1,274,
+4745,19,1583,1,274,
+4537,1,275,4746,19,
+1573,1,275,4537,1,
+276,4747,19,1568,1,
+276,4537,1,277,4748,
+19,1518,1,277,4537,
+1,278,4749,19,1492,
+1,278,4537,1,279,
+4750,19,1464,1,279,
+4537,1,280,4751,19,
+1459,1,280,4537,1,
+281,4752,19,1400,1,
+281,4537,1,282,4753,
+19,1380,1,282,4537,
+1,283,4754,19,1442,
+1,283,4537,1,284,
+4755,19,1539,1,284,
+4537,1,285,4756,19,
+1470,1,285,4537,1,
+286,4757,19,1387,1,
+286,4537,1,287,4758,
+19,1367,1,287,4537,
+1,288,4759,19,1330,
+1,288,4537,1,289,
+4760,19,1307,1,289,
+4537,1,290,4761,19,
+1152,1,290,4537,1,
+291,4762,19,1642,1,
+291,4537,1,292,4763,
+19,1272,1,292,4537,
+1,293,4764,19,1277,
+1,293,4537,1,294,
+4765,19,1297,1,294,
+4537,1,295,4766,19,
+1287,1,295,4537,1,
+296,4767,19,1292,1,
+296,4537,1,297,4768,
+19,1282,1,297,4537,
+1,298,4769,19,1637,
+1,298,4537,1,299,
+4770,19,1302,1,299,
+4537,1,300,4771,19,
+1362,1,300,4380,1,
+301,4772,19,1787,1,
+301,4450,1,302,4773,
+19,1780,1,302,4450,
+1,303,4774,19,1758,
+1,303,4454,1,304,
+4775,19,2089,1,304,
+4133,1,305,4776,19,
+2084,1,305,4133,1,
+306,4777,19,2079,1,
+306,4133,1,307,4778,
+19,2074,1,307,4133,
+1,308,4779,19,2069,
+1,308,4133,1,309,
+4780,19,2064,1,309,
+4133,1,310,4781,19,
+2059,1,310,4133,1,
+311,4782,19,2047,1,
+311,4153,1,312,4783,
+19,2042,1,312,4153,
+1,313,4784,19,2037,
+1,313,4153,1,314,
+4785,19,2032,1,314,
+4153,1,315,4786,19,
+2027,1,315,4153,1,
+316,4787,19,2022,1,
+316,4153,1,317,4788,
+19,2017,1,317,4153,
+1,318,4789,19,2012,
+1,318,4153,1,319,
+4790,19,2007,1,319,
+4153,1,320,4791,19,
+1840,1,320,4153,1,
+321,4792,19,2001,1,
+321,4153,1,322,4793,
+19,1996,1,322,4153,
+1,323,4794,19,1991,
+1,323,4153,1,324,
+4795,19,1832,1,324,
+4159,1,325,4796,19,
+1986,1,325,4159,1,
+326,4797,19,1981,1,
+326,4159,1,327,4798,
+19,1976,1,327,4159,
+1,328,4799,19,1971,
+1,328,4159,1,329,
+4800,19,1966,1,329,
+4159,1,330,4801,19,
+1961,1,330,4159,1,
+331,4802,19,1825,1,
+331,4159,1,332,4803,
+19,1955,1,332,4165,
+1,333,4804,19,1950,
+1,333,4165,1,334,
+4805,19,1945,1,334,
+4165,1,335,4806,19,
+1818,1,335,4165,1,
+336,4807,19,1939,1,
+336,4165,1,337,4808,
+19,1870,1,337,4165,
+1,338,4809,19,1934,
+1,338,4165,1,339,
+4810,19,1929,1,339,
+4165,1,340,4811,19,
+1924,1,340,4165,1,
+341,4812,19,1919,1,
+341,4165,1,342,4813,
+19,1914,1,342,4171,
+1,343,4814,19,1909,
+1,343,4171,1,344,
+4815,19,1904,1,344,
+4171,1,345,4816,19,
+4817,4,50,65,0,
 114,0,103,0,117,
 0,109,0,101,0,
 110,0,116,0,68,
@@ -11274,16 +11601,16 @@ public yyLSLSyntax
 105,0,111,0,110,
 0,76,0,105,0,
 115,0,116,0,95,
-0,51,0,1,336,
-4039,1,337,4742,19,
-4743,4,28,65,0,
+0,51,0,1,345,
+4097,1,346,4818,19,
+4819,4,28,65,0,
 114,0,103,0,117,
 0,109,0,101,0,
 110,0,116,0,76,
 0,105,0,115,0,
 116,0,95,0,51,
-0,1,337,4379,1,
-338,4744,19,4745,4,
+0,1,346,4450,1,
+347,4820,19,4821,4,
 50,65,0,114,0,
 103,0,117,0,109,
 0,101,0,110,0,
@@ -11294,8 +11621,8 @@ public yyLSLSyntax
 111,0,110,0,76,
 0,105,0,115,0,
 116,0,95,0,52,
-0,1,338,4039,1,
-339,4746,19,4747,4,
+0,1,347,4097,1,
+348,4822,19,4823,4,
 50,65,0,114,0,
 103,0,117,0,109,
 0,101,0,110,0,
@@ -11306,26 +11633,28 @@ public yyLSLSyntax
 111,0,110,0,76,
 0,105,0,115,0,
 116,0,95,0,53,
-0,1,339,4039,1,
-340,4748,19,4749,4,
+0,1,348,4097,1,
+349,4824,19,4825,4,
 28,65,0,114,0,
 103,0,117,0,109,
 0,101,0,110,0,
 116,0,76,0,105,
 0,115,0,116,0,
 95,0,52,0,1,
-340,4379,2,0,0};
+349,4450,2,0,0};
 new Sfactory(this,"ExpressionArgument_1",new SCreator(ExpressionArgument_1_factory));
+new Sfactory(this,"VectorArgStateEvent",new SCreator(VectorArgStateEvent_factory));
 new Sfactory(this,"SimpleAssignment_8",new SCreator(SimpleAssignment_8_factory));
 new Sfactory(this,"SimpleAssignment_9",new SCreator(SimpleAssignment_9_factory));
 new Sfactory(this,"StatementList_1",new SCreator(StatementList_1_factory));
+new Sfactory(this,"StatementList_2",new SCreator(StatementList_2_factory));
 new Sfactory(this,"StateChange_1",new SCreator(StateChange_1_factory));
 new Sfactory(this,"EmptyStatement",new SCreator(EmptyStatement_factory));
 new Sfactory(this,"Declaration",new SCreator(Declaration_factory));
 new Sfactory(this,"IdentExpression",new SCreator(IdentExpression_factory));
 new Sfactory(this,"error",new SCreator(error_factory));
 new Sfactory(this,"BinaryExpression_2",new SCreator(BinaryExpression_2_factory));
-new Sfactory(this,"BinaryExpression_3",new SCreator(BinaryExpression_3_factory));
+new Sfactory(this,"State_2",new SCreator(State_2_factory));
 new Sfactory(this,"BinaryExpression_4",new SCreator(BinaryExpression_4_factory));
 new Sfactory(this,"BinaryExpression_5",new SCreator(BinaryExpression_5_factory));
 new Sfactory(this,"ReturnStatement_2",new SCreator(ReturnStatement_2_factory));
@@ -11344,11 +11673,11 @@ new Sfactory(this,"Assignment",new SCreator(Assignment_factory));
 new Sfactory(this,"CompoundStatement_1",new SCreator(CompoundStatement_1_factory));
 new Sfactory(this,"CompoundStatement_2",new SCreator(CompoundStatement_2_factory));
 new Sfactory(this,"BinaryExpression_8",new SCreator(BinaryExpression_8_factory));
+new Sfactory(this,"VectorArgEvent",new SCreator(VectorArgEvent_factory));
 new Sfactory(this,"ReturnStatement_1",new SCreator(ReturnStatement_1_factory));
 new Sfactory(this,"IdentDotExpression",new SCreator(IdentDotExpression_factory));
 new Sfactory(this,"Argument",new SCreator(Argument_factory));
-new Sfactory(this,"State_2",new SCreator(State_2_factory));
-new Sfactory(this,"WhileStatement_1",new SCreator(WhileStatement_1_factory));
+new Sfactory(this,"VectorDeclaration_1",new SCreator(VectorDeclaration_1_factory));
 new Sfactory(this,"GlobalDefinitions_3",new SCreator(GlobalDefinitions_3_factory));
 new Sfactory(this,"GlobalDefinitions_4",new SCreator(GlobalDefinitions_4_factory));
 new Sfactory(this,"Event_1",new SCreator(Event_1_factory));
@@ -11373,6 +11702,8 @@ new Sfactory(this,"States_2",new SCreator(States_2_factory));
 new Sfactory(this,"FunctionCallExpression_1",new SCreator(FunctionCallExpression_1_factory));
 new Sfactory(this,"ForLoopStatement",new SCreator(ForLoopStatement_factory));
 new Sfactory(this,"IntArgStateEvent_1",new SCreator(IntArgStateEvent_1_factory));
+new Sfactory(this,"IntArgEvent_6",new SCreator(IntArgEvent_6_factory));
+new Sfactory(this,"IntArgEvent_9",new SCreator(IntArgEvent_9_factory));
 new Sfactory(this,"DoWhileStatement_1",new SCreator(DoWhileStatement_1_factory));
 new Sfactory(this,"DoWhileStatement_2",new SCreator(DoWhileStatement_2_factory));
 new Sfactory(this,"ForLoopStatement_4",new SCreator(ForLoopStatement_4_factory));
@@ -11388,9 +11719,9 @@ new Sfactory(this,"GlobalDefinitions",new SCreator(GlobalDefinitions_factory));
 new Sfactory(this,"ConstantExpression_1",new SCreator(ConstantExpression_1_factory));
 new Sfactory(this,"VoidArgEvent_4",new SCreator(VoidArgEvent_4_factory));
 new Sfactory(this,"FunctionCall_1",new SCreator(FunctionCall_1_factory));
+new Sfactory(this,"VoidArgEvent_6",new SCreator(VoidArgEvent_6_factory));
 new Sfactory(this,"Assignment_2",new SCreator(Assignment_2_factory));
 new Sfactory(this,"TypecastExpression_1",new SCreator(TypecastExpression_1_factory));
-new Sfactory(this,"SimpleAssignment_21",new SCreator(SimpleAssignment_21_factory));
 new Sfactory(this,"SimpleAssignment_22",new SCreator(SimpleAssignment_22_factory));
 new Sfactory(this,"SimpleAssignment_23",new SCreator(SimpleAssignment_23_factory));
 new Sfactory(this,"TypecastExpression_9",new SCreator(TypecastExpression_9_factory));
@@ -11398,7 +11729,6 @@ new Sfactory(this,"VoidArgEvent_2",new SCreator(VoidArgEvent_2_factory));
 new Sfactory(this,"VoidArgEvent_3",new SCreator(VoidArgEvent_3_factory));
 new Sfactory(this,"ArgumentDeclarationList_1",new SCreator(ArgumentDeclarationList_1_factory));
 new Sfactory(this,"ArgumentDeclarationList_2",new SCreator(ArgumentDeclarationList_2_factory));
-new Sfactory(this,"VoidArgEvent_6",new SCreator(VoidArgEvent_6_factory));
 new Sfactory(this,"GlobalDefinitions_1",new SCreator(GlobalDefinitions_1_factory));
 new Sfactory(this,"GlobalDefinitions_2",new SCreator(GlobalDefinitions_2_factory));
 new Sfactory(this,"IncrementDecrementExpression",new SCreator(IncrementDecrementExpression_factory));
@@ -11407,6 +11737,7 @@ new Sfactory(this,"IntArgumentDeclarationList_1",new SCreator(IntArgumentDeclara
 new Sfactory(this,"IntDeclaration_1",new SCreator(IntDeclaration_1_factory));
 new Sfactory(this,"ArgumentDeclarationList_5",new SCreator(ArgumentDeclarationList_5_factory));
 new Sfactory(this,"Event_11",new SCreator(Event_11_factory));
+new Sfactory(this,"VectorArgumentDeclarationList_1",new SCreator(VectorArgumentDeclarationList_1_factory));
 new Sfactory(this,"TypecastExpression_2",new SCreator(TypecastExpression_2_factory));
 new Sfactory(this,"TypecastExpression_3",new SCreator(TypecastExpression_3_factory));
 new Sfactory(this,"TypecastExpression_4",new SCreator(TypecastExpression_4_factory));
@@ -11417,6 +11748,7 @@ new Sfactory(this,"Expression",new SCreator(Expression_factory));
 new Sfactory(this,"Constant_3",new SCreator(Constant_3_factory));
 new Sfactory(this,"Constant_4",new SCreator(Constant_4_factory));
 new Sfactory(this,"BinaryExpression_1",new SCreator(BinaryExpression_1_factory));
+new Sfactory(this,"BinaryExpression_3",new SCreator(BinaryExpression_3_factory));
 new Sfactory(this,"IfStatement_2",new SCreator(IfStatement_2_factory));
 new Sfactory(this,"IfStatement_3",new SCreator(IfStatement_3_factory));
 new Sfactory(this,"IfStatement_4",new SCreator(IfStatement_4_factory));
@@ -11434,7 +11766,6 @@ new Sfactory(this,"ArgumentList_3",new SCreator(ArgumentList_3_factory));
 new Sfactory(this,"Constant",new SCreator(Constant_factory));
 new Sfactory(this,"State",new SCreator(State_factory));
 new Sfactory(this,"Event_13",new SCreator(Event_13_factory));
-new Sfactory(this,"Event_14",new SCreator(Event_14_factory));
 new Sfactory(this,"LSLProgramRoot",new SCreator(LSLProgramRoot_factory));
 new Sfactory(this,"StateChange",new SCreator(StateChange_factory));
 new Sfactory(this,"IncrementDecrementExpression_2",new SCreator(IncrementDecrementExpression_2_factory));
@@ -11445,7 +11776,7 @@ new Sfactory(this,"ReturnStatement",new SCreator(ReturnStatement_factory));
 new Sfactory(this,"IncrementDecrementExpression_7",new SCreator(IncrementDecrementExpression_7_factory));
 new Sfactory(this,"IncrementDecrementExpression_8",new SCreator(IncrementDecrementExpression_8_factory));
 new Sfactory(this,"Assignment_1",new SCreator(Assignment_1_factory));
-new Sfactory(this,"IntArgEvent_9",new SCreator(IntArgEvent_9_factory));
+new Sfactory(this,"ArgumentDeclarationList_3",new SCreator(ArgumentDeclarationList_3_factory));
 new Sfactory(this,"IntArgEvent_10",new SCreator(IntArgEvent_10_factory));
 new Sfactory(this,"CompoundStatement",new SCreator(CompoundStatement_factory));
 new Sfactory(this,"IntArgumentDeclarationList",new SCreator(IntArgumentDeclarationList_factory));
@@ -11453,11 +11784,9 @@ new Sfactory(this,"SimpleAssignment_3",new SCreator(SimpleAssignment_3_factory))
 new Sfactory(this,"SimpleAssignment_4",new SCreator(SimpleAssignment_4_factory));
 new Sfactory(this,"Statement_1",new SCreator(Statement_1_factory));
 new Sfactory(this,"Statement_2",new SCreator(Statement_2_factory));
-new Sfactory(this,"Statement_3",new SCreator(Statement_3_factory));
 new Sfactory(this,"Statement_4",new SCreator(Statement_4_factory));
 new Sfactory(this,"Statement_5",new SCreator(Statement_5_factory));
 new Sfactory(this,"Statement_6",new SCreator(Statement_6_factory));
-new Sfactory(this,"Statement_7",new SCreator(Statement_7_factory));
 new Sfactory(this,"Statement_8",new SCreator(Statement_8_factory));
 new Sfactory(this,"Statement_9",new SCreator(Statement_9_factory));
 new Sfactory(this,"ExpressionArgument",new SCreator(ExpressionArgument_factory));
@@ -11478,10 +11807,12 @@ new Sfactory(this,"StateEvent",new SCreator(StateEvent_factory));
 new Sfactory(this,"IntArgEvent_3",new SCreator(IntArgEvent_3_factory));
 new Sfactory(this,"IntArgEvent_4",new SCreator(IntArgEvent_4_factory));
 new Sfactory(this,"IntArgEvent_5",new SCreator(IntArgEvent_5_factory));
-new Sfactory(this,"IntArgEvent_6",new SCreator(IntArgEvent_6_factory));
+new Sfactory(this,"Statement_3",new SCreator(Statement_3_factory));
 new Sfactory(this,"IntArgEvent_7",new SCreator(IntArgEvent_7_factory));
 new Sfactory(this,"IntArgEvent_8",new SCreator(IntArgEvent_8_factory));
 new Sfactory(this,"SimpleAssignment_10",new SCreator(SimpleAssignment_10_factory));
+new Sfactory(this,"Statement_7",new SCreator(Statement_7_factory));
+new Sfactory(this,"VectorArgEvent_2",new SCreator(VectorArgEvent_2_factory));
 new Sfactory(this,"Event",new SCreator(Event_factory));
 new Sfactory(this,"SimpleAssignment_14",new SCreator(SimpleAssignment_14_factory));
 new Sfactory(this,"SimpleAssignment_16",new SCreator(SimpleAssignment_16_factory));
@@ -11489,9 +11820,9 @@ new Sfactory(this,"Statement_10",new SCreator(Statement_10_factory));
 new Sfactory(this,"Statement_11",new SCreator(Statement_11_factory));
 new Sfactory(this,"SimpleAssignment",new SCreator(SimpleAssignment_factory));
 new Sfactory(this,"TypecastExpression",new SCreator(TypecastExpression_factory));
-new Sfactory(this,"Event_15",new SCreator(Event_15_factory));
-new Sfactory(this,"Event_16",new SCreator(Event_16_factory));
+new Sfactory(this,"VectorArgStateEvent_1",new SCreator(VectorArgStateEvent_1_factory));
 new Sfactory(this,"SimpleAssignment_20",new SCreator(SimpleAssignment_20_factory));
+new Sfactory(this,"SimpleAssignment_21",new SCreator(SimpleAssignment_21_factory));
 new Sfactory(this,"SimpleAssignment_24",new SCreator(SimpleAssignment_24_factory));
 new Sfactory(this,"SimpleAssignment_1",new SCreator(SimpleAssignment_1_factory));
 new Sfactory(this,"SimpleAssignment_2",new SCreator(SimpleAssignment_2_factory));
@@ -11499,13 +11830,13 @@ new Sfactory(this,"BinaryExpression",new SCreator(BinaryExpression_factory));
 new Sfactory(this,"FunctionCallExpression",new SCreator(FunctionCallExpression_factory));
 new Sfactory(this,"SimpleAssignment_6",new SCreator(SimpleAssignment_6_factory));
 new Sfactory(this,"StateBody_1",new SCreator(StateBody_1_factory));
-new Sfactory(this,"StatementList_2",new SCreator(StatementList_2_factory));
+new Sfactory(this,"StateBody_2",new SCreator(StateBody_2_factory));
 new Sfactory(this,"StateBody_3",new SCreator(StateBody_3_factory));
 new Sfactory(this,"StateBody_4",new SCreator(StateBody_4_factory));
 new Sfactory(this,"StateBody_5",new SCreator(StateBody_5_factory));
 new Sfactory(this,"StateBody_6",new SCreator(StateBody_6_factory));
-new Sfactory(this,"BinaryExpression_18",new SCreator(BinaryExpression_18_factory));
-new Sfactory(this,"ArgumentDeclarationList_3",new SCreator(ArgumentDeclarationList_3_factory));
+new Sfactory(this,"StateBody_7",new SCreator(StateBody_7_factory));
+new Sfactory(this,"StateBody_8",new SCreator(StateBody_8_factory));
 new Sfactory(this,"Event_9",new SCreator(Event_9_factory));
 new Sfactory(this,"Statement",new SCreator(Statement_factory));
 new Sfactory(this,"JumpStatement",new SCreator(JumpStatement_factory));
@@ -11518,7 +11849,7 @@ new Sfactory(this,"BinaryExpression_16",new SCreator(BinaryExpression_16_factory
 new Sfactory(this,"BinaryExpression_6",new SCreator(BinaryExpression_6_factory));
 new Sfactory(this,"BinaryExpression_7",new SCreator(BinaryExpression_7_factory));
 new Sfactory(this,"ArgumentList",new SCreator(ArgumentList_factory));
-new Sfactory(this,"BinaryExpression_12",new SCreator(BinaryExpression_12_factory));
+new Sfactory(this,"VectorDeclaration",new SCreator(VectorDeclaration_factory));
 new Sfactory(this,"Event_10",new SCreator(Event_10_factory));
 new Sfactory(this,"GlobalFunctionDefinition_2",new SCreator(GlobalFunctionDefinition_2_factory));
 new Sfactory(this,"Event_12",new SCreator(Event_12_factory));
@@ -11526,17 +11857,21 @@ new Sfactory(this,"StateChange_2",new SCreator(StateChange_2_factory));
 new Sfactory(this,"VoidArgEvent_1",new SCreator(VoidArgEvent_1_factory));
 new Sfactory(this,"BinaryExpression_10",new SCreator(BinaryExpression_10_factory));
 new Sfactory(this,"VoidArgEvent_5",new SCreator(VoidArgEvent_5_factory));
+new Sfactory(this,"BinaryExpression_12",new SCreator(BinaryExpression_12_factory));
 new Sfactory(this,"VoidArgEvent_7",new SCreator(VoidArgEvent_7_factory));
 new Sfactory(this,"VoidArgEvent_8",new SCreator(VoidArgEvent_8_factory));
 new Sfactory(this,"BinaryExpression_17",new SCreator(BinaryExpression_17_factory));
 new Sfactory(this,"StateEvent_1",new SCreator(StateEvent_1_factory));
 new Sfactory(this,"VectorConstant",new SCreator(VectorConstant_factory));
+new Sfactory(this,"VectorArgEvent_1",new SCreator(VectorArgEvent_1_factory));
 new Sfactory(this,"IntDeclaration",new SCreator(IntDeclaration_factory));
+new Sfactory(this,"VectorArgEvent_3",new SCreator(VectorArgEvent_3_factory));
 new Sfactory(this,"IntArgStateEvent",new SCreator(IntArgStateEvent_factory));
 new Sfactory(this,"TypecastExpression_6",new SCreator(TypecastExpression_6_factory));
 new Sfactory(this,"TypecastExpression_7",new SCreator(TypecastExpression_7_factory));
 new Sfactory(this,"FunctionCall",new SCreator(FunctionCall_factory));
 new Sfactory(this,"ListConstant_1",new SCreator(ListConstant_1_factory));
+new Sfactory(this,"BinaryExpression_18",new SCreator(BinaryExpression_18_factory));
 new Sfactory(this,"Event_6",new SCreator(Event_6_factory));
 new Sfactory(this,"Declaration_1",new SCreator(Declaration_1_factory));
 new Sfactory(this,"EmptyStatement_1",new SCreator(EmptyStatement_1_factory));
@@ -11555,23 +11890,26 @@ new Sfactory(this,"WhileStatement",new SCreator(WhileStatement_factory));
 new Sfactory(this,"ForLoop_1",new SCreator(ForLoop_1_factory));
 new Sfactory(this,"Constant_2",new SCreator(Constant_2_factory));
 new Sfactory(this,"VoidArgEvent",new SCreator(VoidArgEvent_factory));
-new Sfactory(this,"StateBody_2",new SCreator(StateBody_2_factory));
+new Sfactory(this,"WhileStatement_1",new SCreator(WhileStatement_1_factory));
 new Sfactory(this,"WhileStatement_2",new SCreator(WhileStatement_2_factory));
 new Sfactory(this,"IdentExpression_1",new SCreator(IdentExpression_1_factory));
+new Sfactory(this,"VectorArgumentDeclarationList",new SCreator(VectorArgumentDeclarationList_factory));
 new Sfactory(this,"States",new SCreator(States_factory));
 new Sfactory(this,"VoidArgStateEvent",new SCreator(VoidArgStateEvent_factory));
 }
 public static object ExpressionArgument_1_factory(Parser yyp) { return new ExpressionArgument_1(yyp); }
+public static object VectorArgStateEvent_factory(Parser yyp) { return new VectorArgStateEvent(yyp); }
 public static object SimpleAssignment_8_factory(Parser yyp) { return new SimpleAssignment_8(yyp); }
 public static object SimpleAssignment_9_factory(Parser yyp) { return new SimpleAssignment_9(yyp); }
 public static object StatementList_1_factory(Parser yyp) { return new StatementList_1(yyp); }
+public static object StatementList_2_factory(Parser yyp) { return new StatementList_2(yyp); }
 public static object StateChange_1_factory(Parser yyp) { return new StateChange_1(yyp); }
 public static object EmptyStatement_factory(Parser yyp) { return new EmptyStatement(yyp); }
 public static object Declaration_factory(Parser yyp) { return new Declaration(yyp); }
 public static object IdentExpression_factory(Parser yyp) { return new IdentExpression(yyp); }
 public static object error_factory(Parser yyp) { return new error(yyp); }
 public static object BinaryExpression_2_factory(Parser yyp) { return new BinaryExpression_2(yyp); }
-public static object BinaryExpression_3_factory(Parser yyp) { return new BinaryExpression_3(yyp); }
+public static object State_2_factory(Parser yyp) { return new State_2(yyp); }
 public static object BinaryExpression_4_factory(Parser yyp) { return new BinaryExpression_4(yyp); }
 public static object BinaryExpression_5_factory(Parser yyp) { return new BinaryExpression_5(yyp); }
 public static object ReturnStatement_2_factory(Parser yyp) { return new ReturnStatement_2(yyp); }
@@ -11590,11 +11928,11 @@ public static object Assignment_factory(Parser yyp) { return new Assignment(yyp)
 public static object CompoundStatement_1_factory(Parser yyp) { return new CompoundStatement_1(yyp); }
 public static object CompoundStatement_2_factory(Parser yyp) { return new CompoundStatement_2(yyp); }
 public static object BinaryExpression_8_factory(Parser yyp) { return new BinaryExpression_8(yyp); }
+public static object VectorArgEvent_factory(Parser yyp) { return new VectorArgEvent(yyp); }
 public static object ReturnStatement_1_factory(Parser yyp) { return new ReturnStatement_1(yyp); }
 public static object IdentDotExpression_factory(Parser yyp) { return new IdentDotExpression(yyp); }
 public static object Argument_factory(Parser yyp) { return new Argument(yyp); }
-public static object State_2_factory(Parser yyp) { return new State_2(yyp); }
-public static object WhileStatement_1_factory(Parser yyp) { return new WhileStatement_1(yyp); }
+public static object VectorDeclaration_1_factory(Parser yyp) { return new VectorDeclaration_1(yyp); }
 public static object GlobalDefinitions_3_factory(Parser yyp) { return new GlobalDefinitions_3(yyp); }
 public static object GlobalDefinitions_4_factory(Parser yyp) { return new GlobalDefinitions_4(yyp); }
 public static object Event_1_factory(Parser yyp) { return new Event_1(yyp); }
@@ -11619,6 +11957,8 @@ public static object States_2_factory(Parser yyp) { return new States_2(yyp); }
 public static object FunctionCallExpression_1_factory(Parser yyp) { return new FunctionCallExpression_1(yyp); }
 public static object ForLoopStatement_factory(Parser yyp) { return new ForLoopStatement(yyp); }
 public static object IntArgStateEvent_1_factory(Parser yyp) { return new IntArgStateEvent_1(yyp); }
+public static object IntArgEvent_6_factory(Parser yyp) { return new IntArgEvent_6(yyp); }
+public static object IntArgEvent_9_factory(Parser yyp) { return new IntArgEvent_9(yyp); }
 public static object DoWhileStatement_1_factory(Parser yyp) { return new DoWhileStatement_1(yyp); }
 public static object DoWhileStatement_2_factory(Parser yyp) { return new DoWhileStatement_2(yyp); }
 public static object ForLoopStatement_4_factory(Parser yyp) { return new ForLoopStatement_4(yyp); }
@@ -11634,9 +11974,9 @@ public static object GlobalDefinitions_factory(Parser yyp) { return new GlobalDe
 public static object ConstantExpression_1_factory(Parser yyp) { return new ConstantExpression_1(yyp); }
 public static object VoidArgEvent_4_factory(Parser yyp) { return new VoidArgEvent_4(yyp); }
 public static object FunctionCall_1_factory(Parser yyp) { return new FunctionCall_1(yyp); }
+public static object VoidArgEvent_6_factory(Parser yyp) { return new VoidArgEvent_6(yyp); }
 public static object Assignment_2_factory(Parser yyp) { return new Assignment_2(yyp); }
 public static object TypecastExpression_1_factory(Parser yyp) { return new TypecastExpression_1(yyp); }
-public static object SimpleAssignment_21_factory(Parser yyp) { return new SimpleAssignment_21(yyp); }
 public static object SimpleAssignment_22_factory(Parser yyp) { return new SimpleAssignment_22(yyp); }
 public static object SimpleAssignment_23_factory(Parser yyp) { return new SimpleAssignment_23(yyp); }
 public static object TypecastExpression_9_factory(Parser yyp) { return new TypecastExpression_9(yyp); }
@@ -11644,7 +11984,6 @@ public static object VoidArgEvent_2_factory(Parser yyp) { return new VoidArgEven
 public static object VoidArgEvent_3_factory(Parser yyp) { return new VoidArgEvent_3(yyp); }
 public static object ArgumentDeclarationList_1_factory(Parser yyp) { return new ArgumentDeclarationList_1(yyp); }
 public static object ArgumentDeclarationList_2_factory(Parser yyp) { return new ArgumentDeclarationList_2(yyp); }
-public static object VoidArgEvent_6_factory(Parser yyp) { return new VoidArgEvent_6(yyp); }
 public static object GlobalDefinitions_1_factory(Parser yyp) { return new GlobalDefinitions_1(yyp); }
 public static object GlobalDefinitions_2_factory(Parser yyp) { return new GlobalDefinitions_2(yyp); }
 public static object IncrementDecrementExpression_factory(Parser yyp) { return new IncrementDecrementExpression(yyp); }
@@ -11653,6 +11992,7 @@ public static object IntArgumentDeclarationList_1_factory(Parser yyp) { return n
 public static object IntDeclaration_1_factory(Parser yyp) { return new IntDeclaration_1(yyp); }
 public static object ArgumentDeclarationList_5_factory(Parser yyp) { return new ArgumentDeclarationList_5(yyp); }
 public static object Event_11_factory(Parser yyp) { return new Event_11(yyp); }
+public static object VectorArgumentDeclarationList_1_factory(Parser yyp) { return new VectorArgumentDeclarationList_1(yyp); }
 public static object TypecastExpression_2_factory(Parser yyp) { return new TypecastExpression_2(yyp); }
 public static object TypecastExpression_3_factory(Parser yyp) { return new TypecastExpression_3(yyp); }
 public static object TypecastExpression_4_factory(Parser yyp) { return new TypecastExpression_4(yyp); }
@@ -11663,6 +12003,7 @@ public static object Expression_factory(Parser yyp) { return new Expression(yyp)
 public static object Constant_3_factory(Parser yyp) { return new Constant_3(yyp); }
 public static object Constant_4_factory(Parser yyp) { return new Constant_4(yyp); }
 public static object BinaryExpression_1_factory(Parser yyp) { return new BinaryExpression_1(yyp); }
+public static object BinaryExpression_3_factory(Parser yyp) { return new BinaryExpression_3(yyp); }
 public static object IfStatement_2_factory(Parser yyp) { return new IfStatement_2(yyp); }
 public static object IfStatement_3_factory(Parser yyp) { return new IfStatement_3(yyp); }
 public static object IfStatement_4_factory(Parser yyp) { return new IfStatement_4(yyp); }
@@ -11680,7 +12021,6 @@ public static object ArgumentList_3_factory(Parser yyp) { return new ArgumentLis
 public static object Constant_factory(Parser yyp) { return new Constant(yyp); }
 public static object State_factory(Parser yyp) { return new State(yyp); }
 public static object Event_13_factory(Parser yyp) { return new Event_13(yyp); }
-public static object Event_14_factory(Parser yyp) { return new Event_14(yyp); }
 public static object LSLProgramRoot_factory(Parser yyp) { return new LSLProgramRoot(yyp); }
 public static object StateChange_factory(Parser yyp) { return new StateChange(yyp); }
 public static object IncrementDecrementExpression_2_factory(Parser yyp) { return new IncrementDecrementExpression_2(yyp); }
@@ -11691,7 +12031,7 @@ public static object ReturnStatement_factory(Parser yyp) { return new ReturnStat
 public static object IncrementDecrementExpression_7_factory(Parser yyp) { return new IncrementDecrementExpression_7(yyp); }
 public static object IncrementDecrementExpression_8_factory(Parser yyp) { return new IncrementDecrementExpression_8(yyp); }
 public static object Assignment_1_factory(Parser yyp) { return new Assignment_1(yyp); }
-public static object IntArgEvent_9_factory(Parser yyp) { return new IntArgEvent_9(yyp); }
+public static object ArgumentDeclarationList_3_factory(Parser yyp) { return new ArgumentDeclarationList_3(yyp); }
 public static object IntArgEvent_10_factory(Parser yyp) { return new IntArgEvent_10(yyp); }
 public static object CompoundStatement_factory(Parser yyp) { return new CompoundStatement(yyp); }
 public static object IntArgumentDeclarationList_factory(Parser yyp) { return new IntArgumentDeclarationList(yyp); }
@@ -11699,11 +12039,9 @@ public static object SimpleAssignment_3_factory(Parser yyp) { return new SimpleA
 public static object SimpleAssignment_4_factory(Parser yyp) { return new SimpleAssignment_4(yyp); }
 public static object Statement_1_factory(Parser yyp) { return new Statement_1(yyp); }
 public static object Statement_2_factory(Parser yyp) { return new Statement_2(yyp); }
-public static object Statement_3_factory(Parser yyp) { return new Statement_3(yyp); }
 public static object Statement_4_factory(Parser yyp) { return new Statement_4(yyp); }
 public static object Statement_5_factory(Parser yyp) { return new Statement_5(yyp); }
 public static object Statement_6_factory(Parser yyp) { return new Statement_6(yyp); }
-public static object Statement_7_factory(Parser yyp) { return new Statement_7(yyp); }
 public static object Statement_8_factory(Parser yyp) { return new Statement_8(yyp); }
 public static object Statement_9_factory(Parser yyp) { return new Statement_9(yyp); }
 public static object ExpressionArgument_factory(Parser yyp) { return new ExpressionArgument(yyp); }
@@ -11724,10 +12062,12 @@ public static object StateEvent_factory(Parser yyp) { return new StateEvent(yyp)
 public static object IntArgEvent_3_factory(Parser yyp) { return new IntArgEvent_3(yyp); }
 public static object IntArgEvent_4_factory(Parser yyp) { return new IntArgEvent_4(yyp); }
 public static object IntArgEvent_5_factory(Parser yyp) { return new IntArgEvent_5(yyp); }
-public static object IntArgEvent_6_factory(Parser yyp) { return new IntArgEvent_6(yyp); }
+public static object Statement_3_factory(Parser yyp) { return new Statement_3(yyp); }
 public static object IntArgEvent_7_factory(Parser yyp) { return new IntArgEvent_7(yyp); }
 public static object IntArgEvent_8_factory(Parser yyp) { return new IntArgEvent_8(yyp); }
 public static object SimpleAssignment_10_factory(Parser yyp) { return new SimpleAssignment_10(yyp); }
+public static object Statement_7_factory(Parser yyp) { return new Statement_7(yyp); }
+public static object VectorArgEvent_2_factory(Parser yyp) { return new VectorArgEvent_2(yyp); }
 public static object Event_factory(Parser yyp) { return new Event(yyp); }
 public static object SimpleAssignment_14_factory(Parser yyp) { return new SimpleAssignment_14(yyp); }
 public static object SimpleAssignment_16_factory(Parser yyp) { return new SimpleAssignment_16(yyp); }
@@ -11735,9 +12075,9 @@ public static object Statement_10_factory(Parser yyp) { return new Statement_10(
 public static object Statement_11_factory(Parser yyp) { return new Statement_11(yyp); }
 public static object SimpleAssignment_factory(Parser yyp) { return new SimpleAssignment(yyp); }
 public static object TypecastExpression_factory(Parser yyp) { return new TypecastExpression(yyp); }
-public static object Event_15_factory(Parser yyp) { return new Event_15(yyp); }
-public static object Event_16_factory(Parser yyp) { return new Event_16(yyp); }
+public static object VectorArgStateEvent_1_factory(Parser yyp) { return new VectorArgStateEvent_1(yyp); }
 public static object SimpleAssignment_20_factory(Parser yyp) { return new SimpleAssignment_20(yyp); }
+public static object SimpleAssignment_21_factory(Parser yyp) { return new SimpleAssignment_21(yyp); }
 public static object SimpleAssignment_24_factory(Parser yyp) { return new SimpleAssignment_24(yyp); }
 public static object SimpleAssignment_1_factory(Parser yyp) { return new SimpleAssignment_1(yyp); }
 public static object SimpleAssignment_2_factory(Parser yyp) { return new SimpleAssignment_2(yyp); }
@@ -11745,13 +12085,13 @@ public static object BinaryExpression_factory(Parser yyp) { return new BinaryExp
 public static object FunctionCallExpression_factory(Parser yyp) { return new FunctionCallExpression(yyp); }
 public static object SimpleAssignment_6_factory(Parser yyp) { return new SimpleAssignment_6(yyp); }
 public static object StateBody_1_factory(Parser yyp) { return new StateBody_1(yyp); }
-public static object StatementList_2_factory(Parser yyp) { return new StatementList_2(yyp); }
+public static object StateBody_2_factory(Parser yyp) { return new StateBody_2(yyp); }
 public static object StateBody_3_factory(Parser yyp) { return new StateBody_3(yyp); }
 public static object StateBody_4_factory(Parser yyp) { return new StateBody_4(yyp); }
 public static object StateBody_5_factory(Parser yyp) { return new StateBody_5(yyp); }
 public static object StateBody_6_factory(Parser yyp) { return new StateBody_6(yyp); }
-public static object BinaryExpression_18_factory(Parser yyp) { return new BinaryExpression_18(yyp); }
-public static object ArgumentDeclarationList_3_factory(Parser yyp) { return new ArgumentDeclarationList_3(yyp); }
+public static object StateBody_7_factory(Parser yyp) { return new StateBody_7(yyp); }
+public static object StateBody_8_factory(Parser yyp) { return new StateBody_8(yyp); }
 public static object Event_9_factory(Parser yyp) { return new Event_9(yyp); }
 public static object Statement_factory(Parser yyp) { return new Statement(yyp); }
 public static object JumpStatement_factory(Parser yyp) { return new JumpStatement(yyp); }
@@ -11764,7 +12104,7 @@ public static object BinaryExpression_16_factory(Parser yyp) { return new Binary
 public static object BinaryExpression_6_factory(Parser yyp) { return new BinaryExpression_6(yyp); }
 public static object BinaryExpression_7_factory(Parser yyp) { return new BinaryExpression_7(yyp); }
 public static object ArgumentList_factory(Parser yyp) { return new ArgumentList(yyp); }
-public static object BinaryExpression_12_factory(Parser yyp) { return new BinaryExpression_12(yyp); }
+public static object VectorDeclaration_factory(Parser yyp) { return new VectorDeclaration(yyp); }
 public static object Event_10_factory(Parser yyp) { return new Event_10(yyp); }
 public static object GlobalFunctionDefinition_2_factory(Parser yyp) { return new GlobalFunctionDefinition_2(yyp); }
 public static object Event_12_factory(Parser yyp) { return new Event_12(yyp); }
@@ -11772,17 +12112,21 @@ public static object StateChange_2_factory(Parser yyp) { return new StateChange_
 public static object VoidArgEvent_1_factory(Parser yyp) { return new VoidArgEvent_1(yyp); }
 public static object BinaryExpression_10_factory(Parser yyp) { return new BinaryExpression_10(yyp); }
 public static object VoidArgEvent_5_factory(Parser yyp) { return new VoidArgEvent_5(yyp); }
+public static object BinaryExpression_12_factory(Parser yyp) { return new BinaryExpression_12(yyp); }
 public static object VoidArgEvent_7_factory(Parser yyp) { return new VoidArgEvent_7(yyp); }
 public static object VoidArgEvent_8_factory(Parser yyp) { return new VoidArgEvent_8(yyp); }
 public static object BinaryExpression_17_factory(Parser yyp) { return new BinaryExpression_17(yyp); }
 public static object StateEvent_1_factory(Parser yyp) { return new StateEvent_1(yyp); }
 public static object VectorConstant_factory(Parser yyp) { return new VectorConstant(yyp); }
+public static object VectorArgEvent_1_factory(Parser yyp) { return new VectorArgEvent_1(yyp); }
 public static object IntDeclaration_factory(Parser yyp) { return new IntDeclaration(yyp); }
+public static object VectorArgEvent_3_factory(Parser yyp) { return new VectorArgEvent_3(yyp); }
 public static object IntArgStateEvent_factory(Parser yyp) { return new IntArgStateEvent(yyp); }
 public static object TypecastExpression_6_factory(Parser yyp) { return new TypecastExpression_6(yyp); }
 public static object TypecastExpression_7_factory(Parser yyp) { return new TypecastExpression_7(yyp); }
 public static object FunctionCall_factory(Parser yyp) { return new FunctionCall(yyp); }
 public static object ListConstant_1_factory(Parser yyp) { return new ListConstant_1(yyp); }
+public static object BinaryExpression_18_factory(Parser yyp) { return new BinaryExpression_18(yyp); }
 public static object Event_6_factory(Parser yyp) { return new Event_6(yyp); }
 public static object Declaration_1_factory(Parser yyp) { return new Declaration_1(yyp); }
 public static object EmptyStatement_1_factory(Parser yyp) { return new EmptyStatement_1(yyp); }
@@ -11801,9 +12145,10 @@ public static object WhileStatement_factory(Parser yyp) { return new WhileStatem
 public static object ForLoop_1_factory(Parser yyp) { return new ForLoop_1(yyp); }
 public static object Constant_2_factory(Parser yyp) { return new Constant_2(yyp); }
 public static object VoidArgEvent_factory(Parser yyp) { return new VoidArgEvent(yyp); }
-public static object StateBody_2_factory(Parser yyp) { return new StateBody_2(yyp); }
+public static object WhileStatement_1_factory(Parser yyp) { return new WhileStatement_1(yyp); }
 public static object WhileStatement_2_factory(Parser yyp) { return new WhileStatement_2(yyp); }
 public static object IdentExpression_1_factory(Parser yyp) { return new IdentExpression_1(yyp); }
+public static object VectorArgumentDeclarationList_factory(Parser yyp) { return new VectorArgumentDeclarationList(yyp); }
 public static object States_factory(Parser yyp) { return new States(yyp); }
 public static object VoidArgStateEvent_factory(Parser yyp) { return new VoidArgStateEvent(yyp); }
 }
-- 
cgit v1.1


From f9193e3c51f0de6047906549640c59dc05b7e9d5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 29 Nov 2013 01:50:12 +0000
Subject: Restore SP.AbsolutePosition to properly return actual absolute
 position when sitting

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index f9b598f..a52263b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -516,7 +516,7 @@ namespace OpenSim.Region.Framework.Scenes
                     SceneObjectPart sitPart = ParentPart;
 
                     if (sitPart != null)
-                        return sitPart.AbsolutePosition;
+                        return sitPart.AbsolutePosition + (m_pos * sitPart.GetWorldRotation());
                 }
                 
                 return m_pos;
-- 
cgit v1.1


From 868c0c27469067d25add501569e5fb12f8a79c12 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 29 Nov 2013 01:56:49 +0000
Subject: Fix regression where sitting on ground stopped working.

This was due to the PhysicsActor no longer being recreated on stand from ground.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a52263b..0fb5477 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2174,11 +2174,12 @@ namespace OpenSim.Region.Framework.Scenes
         {
 //            m_log.DebugFormat("[SCENE PRESENCE]: StandUp() for {0}", Name);
 
+            bool satOnObject = IsSatOnObject;
+            SceneObjectPart part = ParentPart;
             SitGround = false;
 
-            if (ParentID != 0)
+            if (satOnObject)
             {
-                SceneObjectPart part = ParentPart;
                 TaskInventoryDictionary taskIDict = part.TaskInventory;
                 if (taskIDict != null)
                 {
@@ -2238,19 +2239,21 @@ namespace OpenSim.Region.Framework.Scenes
                 Rotation = standRotation;
                 AbsolutePosition = standPos;
                 ParentPosition = Vector3.Zero;
+            }
 
-                // We need to wait until we have calculated proper stand positions before sitting up the physical 
-                // avatar to avoid race conditions.
-                if (PhysicsActor == null)
-                    AddToPhysicalScene(false);
+            // We need to wait until we have calculated proper stand positions before sitting up the physical 
+            // avatar to avoid race conditions.
+            if (PhysicsActor == null)
+                AddToPhysicalScene(false);
 
+            if (satOnObject)
+            {
                 SendAvatarDataToAllAgents();
                 m_requestedSitTargetID = 0;
 
                 part.RemoveSittingAvatar(UUID);
 
-                if (part != null)
-                    part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
+                part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
             }
 
             Animator.TrySetMovementAnimation("STAND");
-- 
cgit v1.1


From 84bfde3bdf8c49697475693264db2445d02e5fdf Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 29 Nov 2013 02:45:14 +0000
Subject: Comment out debug sit message accidently left active

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 0fb5477..a74069d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2232,9 +2232,9 @@ namespace OpenSim.Region.Framework.Scenes
 
                 Vector3 standPos = ParentPosition + adjustmentForSitPosition + adjustmentForSitPose;
 
-                m_log.DebugFormat(
-                    "[SCENE PRESENCE]: Setting stand to pos {0}, (adjustmentForSitPosition {1}, adjustmentForSitPose {2}) rotation {3} for {4} in {5}", 
-                    standPos, adjustmentForSitPosition, adjustmentForSitPose, standRotation, Name, Scene.Name);
+//                m_log.DebugFormat(
+//                    "[SCENE PRESENCE]: Setting stand to pos {0}, (adjustmentForSitPosition {1}, adjustmentForSitPose {2}) rotation {3} for {4} in {5}", 
+//                    standPos, adjustmentForSitPosition, adjustmentForSitPose, standRotation, Name, Scene.Name);
 
                 Rotation = standRotation;
                 AbsolutePosition = standPos;
-- 
cgit v1.1


From 5f0e763062d347f188e01ad5febc1bd59e32b367 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 29 Nov 2013 02:48:59 +0000
Subject: Remove unused sp.ParentPosition, which has not been used for some
 time

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 10 ----------
 OpenSim/Region/Framework/Scenes/ScenePresence.cs   | 13 ++-----------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index dcbb509..ea9d0d8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -789,16 +789,6 @@ namespace OpenSim.Region.Framework.Scenes
                         m_log.ErrorFormat("[SCENEOBJECTPART]: GROUP POSITION. {0}", e);
                     }
                 }
-                
-                // TODO if we decide to do sitting in a more SL compatible way (multiple avatars per prim), this has to be fixed, too
-                if (SitTargetAvatar != UUID.Zero)
-                {
-                    ScenePresence avatar;
-                    if (ParentGroup.Scene.TryGetScenePresence(SitTargetAvatar, out avatar))
-                    {
-                        avatar.ParentPosition = GetWorldPosition();
-                    }
-                }
             }
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a74069d..9cb9303 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -480,8 +480,6 @@ namespace OpenSim.Region.Framework.Scenes
             get { return (IClientCore)ControllingClient; }
         }
 
-        public Vector3 ParentPosition { get; set; }
-
         /// <summary>
         /// Position of this avatar relative to the region the avatar is in
         /// </summary>
@@ -540,10 +538,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 // Don't update while sitting.  The PhysicsActor above is null whilst sitting.
                 if (ParentID == 0)
-                {
                     m_pos = value;
-                    ParentPosition = Vector3.Zero;
-                }
 
                 //m_log.DebugFormat(
                 //    "[ENTITY BASE]: In {0} set AbsolutePosition of {1} to {2}",
@@ -2195,7 +2190,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
 
-                ParentPosition = part.GetWorldPosition();
+                Vector3 sitPartWorldPosition = part.GetWorldPosition();
                 ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
 
                 ParentID = 0;
@@ -2230,7 +2225,7 @@ namespace OpenSim.Region.Framework.Scenes
                 // hardcoding here.
                 Vector3 adjustmentForSitPose = new Vector3(0.74f, 0f, 0f) * standRotation;
 
-                Vector3 standPos = ParentPosition + adjustmentForSitPosition + adjustmentForSitPose;
+                Vector3 standPos = sitPartWorldPosition + adjustmentForSitPosition + adjustmentForSitPose;
 
 //                m_log.DebugFormat(
 //                    "[SCENE PRESENCE]: Setting stand to pos {0}, (adjustmentForSitPosition {1}, adjustmentForSitPose {2}) rotation {3} for {4} in {5}", 
@@ -2238,7 +2233,6 @@ namespace OpenSim.Region.Framework.Scenes
 
                 Rotation = standRotation;
                 AbsolutePosition = standPos;
-                ParentPosition = Vector3.Zero;
             }
 
             // We need to wait until we have calculated proper stand positions before sitting up the physical 
@@ -2663,7 +2657,6 @@ namespace OpenSim.Region.Framework.Scenes
 
                     m_pos = newPos;
                     Rotation = newRot;
-                    ParentPosition = part.AbsolutePosition;
                 }
                 else
                 {
@@ -2671,8 +2664,6 @@ namespace OpenSim.Region.Framework.Scenes
                     // being sat upon.
                     m_pos -= part.GroupPosition;
 
-                    ParentPosition = part.AbsolutePosition;
-
 //                        m_log.DebugFormat(
 //                            "[SCENE PRESENCE]: Sitting {0} at position {1} ({2} + {3}) on part {4} {5} without sit target",
 //                            Name, part.AbsolutePosition, m_pos, ParentPosition, part.Name, part.LocalId);
-- 
cgit v1.1


From 8b3a4367ea8d7a0a8b6fbbf261b61f28b5cbab51 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 29 Nov 2013 02:51:35 +0000
Subject: Still send CameraEyeOffset in UDP SendSitReponse even if at offset is
 Vector3.Zero

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 8592650..c1aae3f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -2635,11 +2635,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             AvatarSitResponsePacket avatarSitResponse = new AvatarSitResponsePacket();
             avatarSitResponse.SitObject.ID = TargetID;
-            if (CameraAtOffset != Vector3.Zero)
-            {
-                avatarSitResponse.SitTransform.CameraAtOffset = CameraAtOffset;
-                avatarSitResponse.SitTransform.CameraEyeOffset = CameraEyeOffset;
-            }
+            avatarSitResponse.SitTransform.CameraAtOffset = CameraAtOffset;
+            avatarSitResponse.SitTransform.CameraEyeOffset = CameraEyeOffset;
             avatarSitResponse.SitTransform.ForceMouselook = ForceMouseLook;
             avatarSitResponse.SitTransform.AutoPilot = autopilot;
             avatarSitResponse.SitTransform.SitPosition = OffsetPos;
-- 
cgit v1.1


From 4bd4f1cd832b543fd60b73d75c494bf7422f86f0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 30 Nov 2013 01:14:12 +0000
Subject: Remove nudgehack from SP.HandleAgentUpdate by making MovementFlag a
 uint rather than a byte

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 25 ++++++------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 9cb9303..a34c44c 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -351,7 +351,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Record user movement inputs.
         /// </summary>
-        public byte MovementFlag { get; private set; }
+        public uint MovementFlag { get; private set; }
 
         private bool m_updateflag;
 
@@ -1695,10 +1695,7 @@ namespace OpenSim.Region.Framework.Scenes
                     else
                         dirVectors = Dir_Vectors;
 
-                    // The fact that MovementFlag is a byte needs to be fixed
-                    // it really should be a uint
                     // A DIR_CONTROL_FLAG occurs when the user is trying to move in a particular direction.
-                    uint nudgehack = 250;
                     foreach (Dir_ControlFlags DCF in DIR_CONTROL_FLAGS)
                     {
                         if (((uint)flags & (uint)DCF) != 0)
@@ -1715,29 +1712,19 @@ namespace OpenSim.Region.Framework.Scenes
                                 // Why did I get this?
                             }
 
-                            if ((MovementFlag & (byte)(uint)DCF) == 0)
-                            {
-                                if (DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACKWARD_NUDGE ||
-                                    DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_LEFT_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_RIGHT_NUDGE)
-                                {
-                                    MovementFlag |= (byte)nudgehack;
-                                }
-
+                            if ((MovementFlag & (uint)DCF) == 0)
+                            {   
                                 //m_log.DebugFormat("[SCENE PRESENCE]: Updating MovementFlag for {0} with {1}", Name, DCF);
-                                MovementFlag += (byte)(uint)DCF;
+                                MovementFlag += (uint)DCF;
                                 update_movementflag = true;
                             }
                         }
                         else
                         {
-                            if ((MovementFlag & (byte)(uint)DCF) != 0 ||
-                                ((DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACKWARD_NUDGE ||
-                                DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_LEFT_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_RIGHT_NUDGE)
-                                && ((MovementFlag & (byte)nudgehack) == nudgehack))
-                                ) // This or is for Nudge forward
+                            if ((MovementFlag & (uint)DCF) != 0)
                             {
                                 //m_log.DebugFormat("[SCENE PRESENCE]: Updating MovementFlag for {0} with lack of {1}", Name, DCF);
-                                MovementFlag -= ((byte)(uint)DCF);
+                                MovementFlag -= (uint)DCF;
                                 update_movementflag = true;
 
                                 /*
-- 
cgit v1.1


From 4cde02a2a36dd7f6afce49e5e6db78af021ab14b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 30 Nov 2013 01:44:30 +0000
Subject: Implement most effects of AGENT_CONTROL_STOP

AGENT_CONTROL_STOP is specified to SP.HandleAgentUpdate if the user holds down the space bar on a viewer.
For a stopped avatar, this prevents fly or walk/run (though not rotate) until released.
For a walking/running avatar, this reduces movement to half speed.
For a flying avatar, this stops the avatar.
These are observed behaviours on the LL grid - there was no previous OpenSimulator implementation
This commit introduces an optional parameter to SP.AddNewMovement(), which means that it will no longer compile on .NET 3.5 or earlier versions of Mono than 2.8
Currently, this does not work for jumping, and if used whilst flying the avatar continues the fly animation even though it does not move
---
 .../Scenes/Animation/ScenePresenceAnimator.cs      |  17 ++-
 OpenSim/Region/Framework/Scenes/ScenePresence.cs   | 131 ++++++++++++++-------
 2 files changed, 104 insertions(+), 44 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index 3b5a5bd..5beee73 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -403,11 +403,18 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                 Falling = false;
                 // Walking / crouchwalking / running
                 if (move.Z < 0f)
+                {
                     return "CROUCHWALK";
-                else if (m_scenePresence.SetAlwaysRun)
-                    return "RUN";
-                else
-                    return "WALK";
+                }
+                // We need to prevent these animations if the user tries to make their avatar walk or run whilst
+                // specifying AGENT_CONTROL_STOP (pressing down space on viewers).
+                else if (!m_scenePresence.AgentControlStopActive)
+                {
+                    if (m_scenePresence.SetAlwaysRun)
+                        return "RUN";
+                    else
+                        return "WALK";
+                }
             }
             else if (!m_jumping)
             {
@@ -435,6 +442,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         /// <returns>'true' if the animation was changed</returns>
         public bool UpdateMovementAnimations()
         {
+//            m_log.DebugFormat("[SCENE PRESENCE ANIMATOR]: Updating movement animations for {0}", m_scenePresence.Name);
+
             bool ret = false;
             lock (m_animations)
             {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a34c44c..7a6a334 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -355,6 +355,11 @@ namespace OpenSim.Region.Framework.Scenes
 
         private bool m_updateflag;
 
+        /// <summary>
+        /// Is the agent stop control flag currently active?
+        /// </summary>
+        public bool AgentControlStopActive { get; private set; }
+
         public bool Updated
         {
             set { m_updateflag = value; }
@@ -768,6 +773,14 @@ namespace OpenSim.Region.Framework.Scenes
             set { m_speedModifier = value; }
         }
 
+        /// <summary>
+        /// Modifier for agent movement if we get an AGENT_CONTROL_STOP whilst walking or running
+        /// </summary>
+        /// <remarks>
+        /// AGENT_CONTRL_STOP comes about if user holds down space key on viewers.
+        /// </remarks>
+        private float AgentControlStopSlowWhilstMoving = 0.5f;
+
         private bool m_forceFly;
 
         public bool ForceFly
@@ -1634,7 +1647,6 @@ namespace OpenSim.Region.Framework.Scenes
             if ((oldState & (uint)AgentState.Editing) != 0 && State == (uint)AgentState.None)
                 ControllingClient.SendAgentTerseUpdate(this);
 
-
             PhysicsActor actor = PhysicsActor;
             if (actor == null)
             {
@@ -1712,7 +1724,7 @@ namespace OpenSim.Region.Framework.Scenes
                                 // Why did I get this?
                             }
 
-                            if ((MovementFlag & (uint)DCF) == 0)
+                            if (((MovementFlag & (uint)DCF) == 0) & !AgentControlStopActive)
                             {   
                                 //m_log.DebugFormat("[SCENE PRESENCE]: Updating MovementFlag for {0} with {1}", Name, DCF);
                                 MovementFlag += (uint)DCF;
@@ -1744,6 +1756,13 @@ namespace OpenSim.Region.Framework.Scenes
                         i++;
                     }
 
+                    // Detect AGENT_CONTROL_STOP state changes
+                    if (AgentControlStopActive != ((flags & AgentManager.ControlFlags.AGENT_CONTROL_STOP) != 0))
+                    {
+                        AgentControlStopActive = !AgentControlStopActive;
+                        update_movementflag = true;
+                    }
+
                     if (MovingToTarget)
                     {
                         // If the user has pressed a key then we want to cancel any move to target.
@@ -1769,53 +1788,79 @@ namespace OpenSim.Region.Framework.Scenes
                 // Only do this if we're flying
                 if (Flying && !ForceFly)
                 {
-                    // Landing detection code
-
-                    // Are the landing controls requirements filled?
-                    bool controlland = (((flags & AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) ||
-                                        ((flags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG) != 0));
-
-                   //m_log.Debug("[CONTROL]: " +flags);
-                    // Applies a satisfying roll effect to the avatar when flying.
-                    if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT) != 0 && (flags & AgentManager.ControlFlags.AGENT_CONTROL_YAW_POS) != 0)
+                    // Need to stop in mid air if user holds down AGENT_CONTROL_STOP
+                    if (AgentControlStopActive)
                     {
-                        ApplyFlyingRoll(
-                            FLY_ROLL_RADIANS_PER_UPDATE, 
-                            (flags & AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) != 0, 
-                            (flags & AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0);
-                    } 
-                    else if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT) != 0 &&
-                             (flags & AgentManager.ControlFlags.AGENT_CONTROL_YAW_NEG) != 0)
-                    {
-                        ApplyFlyingRoll(
-                            -FLY_ROLL_RADIANS_PER_UPDATE, 
-                            (flags & AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) != 0, 
-                            (flags & AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0);                      
+                        agent_control_v3 = Vector3.Zero;
                     }
                     else
                     {
-                        if (m_AngularVelocity.Z != 0)
-                            m_AngularVelocity.Z += CalculateFlyingRollResetToZero(FLY_ROLL_RESET_RADIANS_PER_UPDATE);                        
-                    }                  
+                        // Landing detection code
 
-                    if (Flying && IsColliding && controlland)
-                    {
-                        // nesting this check because LengthSquared() is expensive and we don't 
-                        // want to do it every step when flying.
-                        if ((Velocity.LengthSquared() <= LAND_VELOCITYMAG_MAX))
-                            StopFlying();
+                        // Are the landing controls requirements filled?
+                        bool controlland = (((flags & AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) ||
+                                            ((flags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG) != 0));
+
+                       //m_log.Debug("[CONTROL]: " +flags);
+                        // Applies a satisfying roll effect to the avatar when flying.
+                        if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT) != 0 && (flags & AgentManager.ControlFlags.AGENT_CONTROL_YAW_POS) != 0)
+                        {
+                            ApplyFlyingRoll(
+                                FLY_ROLL_RADIANS_PER_UPDATE, 
+                                (flags & AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) != 0, 
+                                (flags & AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0);
+                        } 
+                        else if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT) != 0 &&
+                                 (flags & AgentManager.ControlFlags.AGENT_CONTROL_YAW_NEG) != 0)
+                        {
+                            ApplyFlyingRoll(
+                                -FLY_ROLL_RADIANS_PER_UPDATE, 
+                                (flags & AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) != 0, 
+                                (flags & AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0);                      
+                        }
+                        else
+                        {
+                            if (m_AngularVelocity.Z != 0)
+                                m_AngularVelocity.Z += CalculateFlyingRollResetToZero(FLY_ROLL_RESET_RADIANS_PER_UPDATE);                        
+                        }                  
+
+                        if (Flying && IsColliding && controlland)
+                        {
+                            // nesting this check because LengthSquared() is expensive and we don't 
+                            // want to do it every step when flying.
+                            if ((Velocity.LengthSquared() <= LAND_VELOCITYMAG_MAX))
+                                StopFlying();
+                        }
                     }
                 }
 
+//                m_log.DebugFormat("[SCENE PRESENCE]: MovementFlag {0} for {1}", MovementFlag, Name);
+
                 // If the agent update does move the avatar, then calculate the force ready for the velocity update,
                 // which occurs later in the main scene loop
-                if (update_movementflag || (update_rotation && DCFlagKeyPressed))
+                // We also need to update if the user rotates their avatar whilst it is slow walking/running (if they
+                // held down AGENT_CONTROL_STOP whilst normal walking/running).  However, we do not want to update
+                // if the user rotated whilst holding down AGENT_CONTROL_STOP when already still (which locks the 
+                // avatar location in place).
+                if (update_movementflag 
+                    || (update_rotation && DCFlagKeyPressed && (!AgentControlStopActive || MovementFlag != 0)))
                 {
-//                    m_log.DebugFormat(
-//                        "[SCENE PRESENCE]: In {0} adding velocity of {1} to {2}, umf = {3}, ur = {4}",
-//                        m_scene.RegionInfo.RegionName, agent_control_v3, Name, update_movementflag, update_rotation);
+//                    if (update_movementflag || !AgentControlStopActive || MovementFlag != 0)
+//                    {
+//                        m_log.DebugFormat(
+//                            "[SCENE PRESENCE]: In {0} adding velocity of {1} to {2}, umf = {3}, mf = {4}, ur = {5}",
+//                            m_scene.RegionInfo.RegionName, agent_control_v3, Name, 
+//                            update_movementflag, MovementFlag, update_rotation);
+
+                        float speedModifier;
+
+                        if (AgentControlStopActive)
+                            speedModifier = 0.5f;
+                        else
+                            speedModifier = 1;
 
-                    AddNewMovement(agent_control_v3);
+                        AddNewMovement(agent_control_v3, speedModifier);
+//                    }
                 }
 //                else
 //                {
@@ -1828,7 +1873,10 @@ namespace OpenSim.Region.Framework.Scenes
 //                }
 
                 if (update_movementflag && ParentID == 0)
+                {
+//                    m_log.DebugFormat("[SCENE PRESENCE]: Updating movement animations for {0}", Name);
                     Animator.UpdateMovementAnimations();
+                }
 
                 SendControlsToScripts(flagsForScripts);
             }
@@ -2711,10 +2759,13 @@ namespace OpenSim.Region.Framework.Scenes
         /// Rotate the avatar to the given rotation and apply a movement in the given relative vector
         /// </summary>
         /// <param name="vec">The vector in which to move.  This is relative to the rotation argument</param>
-        public void AddNewMovement(Vector3 vec)
+        /// <param name="thisAddSpeedModifier">
+        /// Optional additional speed modifier for this particular add.  Default is 1</param>
+        public void AddNewMovement(Vector3 vec, float thisAddSpeedModifier = 1)
         {
 //            m_log.DebugFormat(
-//                "[SCENE PRESENCE]: Adding new movement {0} with rotation {1} for {2}", vec, Rotation, Name);
+//                "[SCENE PRESENCE]: Adding new movement {0} with rotation {1}, thisAddSpeedModifier {2} for {3}", 
+//                vec, Rotation, thisAddSpeedModifier, Name);
 
             Vector3 direc = vec * Rotation;
             direc.Normalize();
@@ -2732,7 +2783,7 @@ namespace OpenSim.Region.Framework.Scenes
             if ((vec.Z == 0f) && !Flying)
                 direc.Z = 0f; // Prevent camera WASD up.
 
-            direc *= 0.03f * 128f * SpeedModifier;
+            direc *= 0.03f * 128f * SpeedModifier * thisAddSpeedModifier;
 
 //            m_log.DebugFormat("[SCENE PRESENCE]: Force to apply before modification was {0} for {1}", direc, Name);
 
-- 
cgit v1.1


From 96018afab40fc59b890448f2fa826cd296650b48 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 30 Nov 2013 01:52:45 +0000
Subject: Remove unused SP.Updated flag, which appears unused for many years
 and was only set true once and never reset

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 7a6a334..d74d92b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -353,19 +353,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public uint MovementFlag { get; private set; }
 
-        private bool m_updateflag;
-
         /// <summary>
         /// Is the agent stop control flag currently active?
         /// </summary>
         public bool AgentControlStopActive { get; private set; }
 
-        public bool Updated
-        {
-            set { m_updateflag = value; }
-            get { return m_updateflag; }
-        }
-
         private bool m_invulnerable = true;
 
         public bool Invulnerable
@@ -3688,8 +3680,6 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 Vector3 force = m_forceToApply.Value;
 
-                Updated = true;
-
                 Velocity = force;
 
                 m_forceToApply = null;
-- 
cgit v1.1


From 8ebad908008d098dd01f2218e3e125e54ce2c784 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 30 Nov 2013 01:56:46 +0000
Subject: Actually use the SP.AgentControlStopSlowWhilstMoving parameter
 intoroduced for slow walk/run in 4cfe02a rather than the magic number

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d74d92b..1dc7e20 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1847,7 +1847,7 @@ namespace OpenSim.Region.Framework.Scenes
                         float speedModifier;
 
                         if (AgentControlStopActive)
-                            speedModifier = 0.5f;
+                            speedModifier = AgentControlStopSlowWhilstMoving;
                         else
                             speedModifier = 1;
 
-- 
cgit v1.1


From 62a2d7836fb36f66a0e42b20f4596e517eb52354 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Dec 2013 02:27:40 +0000
Subject: Ignore X and Y body rotations when sent by mouse look.

Fixes http://opensimulator.org/mantis/view.php?id=3274
When not in mouselook, avatar only sends rotations around the Z plane (since that's the only way an avatar can rotate).
However, in mouselook it also sends X and Y information.  But sending X and Y in terse updates causes issues with wrong camera movement in mouselook.
So strip out X and Y components for now.  If this is an issue, then could strip out before sending avatar terse update, though this generates more cpu work.
Thanks to mirceakitsune for suggesting an initial fix
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 1dc7e20..dae20a5 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1648,12 +1648,24 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (AllowMovement && !SitGround)
             {
-                Quaternion bodyRotation = agentData.BodyRotation;
+//                m_log.DebugFormat("[SCENE PRESENCE]: Initial body rotation {0} for {1}", agentData.BodyRotation, Name);
+
                 bool update_rotation = false;
 
-                if (bodyRotation != Rotation)
+                // Whilst not in mouselook, an avatar will transmit only the Z rotation as this is the only axis
+                // it rotates around.
+                // In mouselook, X and Y co-ordinate will also be sent but when used in Rotation, these cause unwanted
+                // excessive up and down movements of the camera when looking up and down.
+                // See http://opensimulator.org/mantis/view.php?id=3274
+                // This does not affect head movement, since this is controlled entirely by camera movement rather than
+                // body rotation.  It does not affect sitting avatar since it's the sitting part rotation that takes
+                // effect, not the avatar rotation.
+                // However, if we do need to store X and Y rotations in the future, another solution needs to be found
+                // for the mouselook bug.  Possibly, one could strip out X and Y rotations before sending the avatar
+                // update messages.
+                if (agentData.BodyRotation.Z != Rotation.Z || agentData.BodyRotation.W != Rotation.W)
                 {
-                    Rotation = bodyRotation;
+                    Rotation = new Quaternion(0, 0, agentData.BodyRotation.Z, agentData.BodyRotation.W);
                     update_rotation = true;
                 }
 
-- 
cgit v1.1


From 17b32b764acd815400d9eb903aaec6dcebd60ac7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 5 Dec 2013 02:10:46 +0000
Subject: Fix regression where mouse look flight direction no longer worked by
 zeroing x/y rot before sending agent updates, instead of before any agent
 update processing

It turns out that the x/y rot data in mouselook is needed to implement this and to push the avatar against the ground if walking in mouselook.
Doing this in the terse send so that we preserve mouselook rotation information
---
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  | 25 +++++++++++++++++++++-
 OpenSim/Region/Framework/Scenes/ScenePresence.cs   | 15 ++-----------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index c1aae3f..a04ded5 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5091,7 +5091,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //                acceleration = new Vector3(1, 0, 0);
                 
                 angularVelocity = presence.AngularVelocity;
+
+                // Whilst not in mouselook, an avatar will transmit only the Z rotation as this is the only axis
+                // it rotates around.
+                // In mouselook, X and Y co-ordinate will also be sent but when used in Rotation, these cause unwanted
+                // excessive up and down movements of the camera when looking up and down.
+                // See http://opensimulator.org/mantis/view.php?id=3274
+                // This does not affect head movement, since this is controlled entirely by camera movement rather than
+                // body rotation.  It does not affect sitting avatar since it's the sitting part rotation that takes
+                // effect, not the avatar rotation.
                 rotation = presence.Rotation;
+                rotation.X = 0;
+                rotation.Y = 0;
 
                 if (sendTexture)
                     textureEntry = presence.Appearance.Texture.GetBytes();
@@ -5207,7 +5218,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             data.OffsetPosition.ToBytes(objectData, 16);
 //            data.Velocity.ToBytes(objectData, 28);
 //            data.Acceleration.ToBytes(objectData, 40);
-            data.Rotation.ToBytes(objectData, 52);
+
+            // Whilst not in mouselook, an avatar will transmit only the Z rotation as this is the only axis
+            // it rotates around.
+            // In mouselook, X and Y co-ordinate will also be sent but when used in Rotation, these cause unwanted
+            // excessive up and down movements of the camera when looking up and down.
+            // See http://opensimulator.org/mantis/view.php?id=3274
+            // This does not affect head movement, since this is controlled entirely by camera movement rather than
+            // body rotation.  It does not affect sitting avatar since it's the sitting part rotation that takes
+            // effect, not the avatar rotation.
+            Quaternion rot = data.Rotation;
+            rot.X = 0;
+            rot.Y = 0;
+            rot.ToBytes(objectData, 52);
             //data.AngularVelocity.ToBytes(objectData, 64);
 
             ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock();
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index dae20a5..7ed3a4b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1652,20 +1652,9 @@ namespace OpenSim.Region.Framework.Scenes
 
                 bool update_rotation = false;
 
-                // Whilst not in mouselook, an avatar will transmit only the Z rotation as this is the only axis
-                // it rotates around.
-                // In mouselook, X and Y co-ordinate will also be sent but when used in Rotation, these cause unwanted
-                // excessive up and down movements of the camera when looking up and down.
-                // See http://opensimulator.org/mantis/view.php?id=3274
-                // This does not affect head movement, since this is controlled entirely by camera movement rather than
-                // body rotation.  It does not affect sitting avatar since it's the sitting part rotation that takes
-                // effect, not the avatar rotation.
-                // However, if we do need to store X and Y rotations in the future, another solution needs to be found
-                // for the mouselook bug.  Possibly, one could strip out X and Y rotations before sending the avatar
-                // update messages.
-                if (agentData.BodyRotation.Z != Rotation.Z || agentData.BodyRotation.W != Rotation.W)
+                if (agentData.BodyRotation != Rotation)
                 {
-                    Rotation = new Quaternion(0, 0, agentData.BodyRotation.Z, agentData.BodyRotation.W);
+                    Rotation = agentData.BodyRotation;
                     update_rotation = true;
                 }
 
-- 
cgit v1.1


From 16aaba77d49baad0dc581ffbf69d71181b9be70f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 6 Dec 2013 00:30:44 +0000
Subject: Properly set InventoryType.Snapshot when a snapshot is uploaded

Resolves http://opensimulator.org/mantis/view.php?id=6857
This prevents the inventory service complaining later about an attempt to change an invariant
---
 OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 1d4c7f0..66d2138 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -501,6 +501,10 @@ namespace OpenSim.Region.ClientStack.Linden
                 inType = 1;
                 assType = 1;
             }
+            else if (inventoryType == "snapshot")
+            {
+                inType = (sbyte)InventoryType.Snapshot;
+            }
             else if (inventoryType == "animation")
             {
                 inType = 19;
-- 
cgit v1.1


From bb4f4d9480df4c17ea31288c069993305c7e1582 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 6 Dec 2013 00:38:18 +0000
Subject: minor: Use enums for setting inv/asset types on data upload rather
 than magic numbers

---
 .../ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 66d2138..a4fe81c 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -498,8 +498,8 @@ namespace OpenSim.Region.ClientStack.Linden
 
             if (inventoryType == "sound")
             {
-                inType = 1;
-                assType = 1;
+                inType = (sbyte)InventoryType.Sound;
+                assType = (sbyte)AssetType.Sound;
             }
             else if (inventoryType == "snapshot")
             {
@@ -507,19 +507,19 @@ namespace OpenSim.Region.ClientStack.Linden
             }
             else if (inventoryType == "animation")
             {
-                inType = 19;
-                assType = 20;
+                inType = (sbyte)InventoryType.Animation;
+                assType = (sbyte)AssetType.Animation;
             }
             else if (inventoryType == "wearable")
             {
-                inType = 18;
+                inType = (sbyte)InventoryType.Wearable;
                 switch (assetType)
                 {
                     case "bodypart":
-                        assType = 13;
+                        assType = (sbyte)AssetType.Bodypart;
                         break;
                     case "clothing":
-                        assType = 5;
+                        assType = (sbyte)AssetType.Clothing;
                         break;
                 }
             }
-- 
cgit v1.1


From 9b76a46df0b93e57a1bcb2cfa28248998b8ed841 Mon Sep 17 00:00:00 2001
From: Fernando Oliveira
Date: Thu, 28 Nov 2013 00:10:36 -0200
Subject: Reversing back to the row["ColumnName"] case field name.
 http://opensimulator.org/mantis/view.php?id=6868

---
 OpenSim/Data/PGSQL/PGSQLRegionData.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Data/PGSQL/PGSQLRegionData.cs b/OpenSim/Data/PGSQL/PGSQLRegionData.cs
index f3e4064..b3076f0 100644
--- a/OpenSim/Data/PGSQL/PGSQLRegionData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLRegionData.cs
@@ -206,7 +206,7 @@ namespace OpenSim.Data.PGSQL
 
                     DataTable schemaTable = result.GetSchemaTable();
                     foreach (DataRow row in schemaTable.Rows)
-                        m_ColumnNames.Add(row["column_name"].ToString());
+                        m_ColumnNames.Add(row["ColumnName"].ToString());
                 }
 
                 foreach (string s in m_ColumnNames)
-- 
cgit v1.1


From 823a175f07297e7a8a973ddf0223e60d3ea7c933 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 5 Dec 2013 20:06:04 -0500
Subject: Stop writing partner id to record when updating profile data. This
 should be changed only by admin in backend.

---
 OpenSim/Data/MySQL/MySQLUserProfilesData.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index 4c6c8e3..dc88f94 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -736,7 +736,6 @@ namespace OpenSim.Data.MySQL
             string query = string.Empty;
             
             query += "UPDATE userprofile SET ";
-            query += "profilePartner=?profilePartner, ";
             query += "profileURL=?profileURL, ";
             query += "profileImage=?image, ";
             query += "profileAboutText=?abouttext,";
@@ -752,7 +751,6 @@ namespace OpenSim.Data.MySQL
                     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());
-- 
cgit v1.1


From 04f8fc1ce91e1cda9294d2737ef10ab3fce06982 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 5 Dec 2013 20:25:28 -0500
Subject: Adding profile partners fix to SQLite and PgSQL drivers

---
 OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs   | 2 --
 OpenSim/Data/SQLite/SQLiteUserProfilesData.cs | 2 --
 2 files changed, 4 deletions(-)

diff --git a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
index e3cbf7f..f4e41b4 100644
--- a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
@@ -715,7 +715,6 @@ namespace OpenSim.Data.PGSQL
             string query = string.Empty;
             
             query += "UPDATE userprofile SET ";
-            query += "profilePartner=:profilePartner, ";
             query += "profileURL=:profileURL, ";
             query += "profileImage=:image, ";
             query += "profileAboutText=:abouttext,";
@@ -731,7 +730,6 @@ namespace OpenSim.Data.PGSQL
                     using (NpgsqlCommand cmd = new NpgsqlCommand(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());
diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
index cc1dac1..8c1bcd4 100644
--- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
@@ -679,7 +679,6 @@ namespace OpenSim.Data.SQLite
             string query = string.Empty;
             
             query += "UPDATE userprofile SET ";
-            query += "profilePartner=:profilePartner, ";
             query += "profileURL=:profileURL, ";
             query += "profileImage=:image, ";
             query += "profileAboutText=:abouttext,";
@@ -693,7 +692,6 @@ namespace OpenSim.Data.SQLite
                 {
                     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());
-- 
cgit v1.1


From 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Fri, 6 Dec 2013 02:52:13 -0500
Subject: Add support for user preferences (im via email)

---
 OpenSim/Data/IProfilesData.cs                      |  2 +
 OpenSim/Data/MySQL/MySQLUserProfilesData.cs        | 39 +++++-----
 .../Data/MySQL/Resources/UserProfiles.migrations   | 10 +++
 OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs        | 29 ++++----
 .../Data/PGSQL/Resources/UserProfiles.migrations   |  9 +++
 .../Data/SQLite/Resources/UserProfiles.migrations  | 12 ++++
 OpenSim/Data/SQLite/SQLiteUserProfilesData.cs      | 83 ++++++++++++++++++++++
 OpenSim/Framework/UserProfiles.cs                  |  8 +++
 .../Avatar/UserProfiles/UserProfileModule.cs       | 67 +++++++++++++++++
 .../LocalUserProfilesServiceConnector.cs           |  2 +
 .../Handlers/Profiles/UserProfilesConnector.cs     |  2 +
 .../Handlers/Profiles/UserProfilesHandlers.cs      | 53 ++++++++++++++
 .../Services/Interfaces/IUserProfilesService.cs    |  5 ++
 .../UserProfilesService/UserProfilesService.cs     | 12 ++++
 14 files changed, 297 insertions(+), 36 deletions(-)

diff --git a/OpenSim/Data/IProfilesData.cs b/OpenSim/Data/IProfilesData.cs
index 0de7f68..7fb075d 100644
--- a/OpenSim/Data/IProfilesData.cs
+++ b/OpenSim/Data/IProfilesData.cs
@@ -48,6 +48,8 @@ namespace OpenSim.Data
         bool UpdateAvatarProperties(ref UserProfileProperties props, ref string result);
         bool UpdateAvatarInterests(UserProfileProperties up, ref string result);
         bool GetClassifiedInfo(ref UserClassifiedAdd ad, ref string result);
+        bool UpdateUserPreferences(ref UserPreferences pref,  ref string result);
+        bool GetUserPreferences(ref UserPreferences pref, 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/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index dc88f94..63492c2 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -895,7 +895,7 @@ namespace OpenSim.Data.MySQL
         }
         
         #region User Preferences
-        public OSDArray GetUserPreferences(UUID avatarId)
+        public bool GetUserPreferences(ref UserPreferences pref, ref string result)
         {
             string query = string.Empty;
             
@@ -912,19 +912,16 @@ namespace OpenSim.Data.MySQL
                     dbcon.Open();
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
+                        cmd.Parameters.AddWithValue("?Id", pref.UserId.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);
+                                bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail);
+                                bool.TryParse((string)reader["visible"], out pref.Visible);
+                                pref.EMail = (string)reader["email"];
                             }
                             else
                             {
@@ -947,17 +944,19 @@ namespace OpenSim.Data.MySQL
             {
                 m_log.DebugFormat("[PROFILES_DATA]" +
                                  ": Get preferences exception {0}", e.Message);
+                result = e.Message;
+                return false;
             }
-            return data;
+            return true;
         }
         
-        public bool UpdateUserPreferences(bool emailIm, bool visible, UUID avatarId )
+        public bool UpdateUserPreferences(ref UserPreferences pref, ref string result)
         {           
             string query = string.Empty;
-            
-            query += "UPDATE userpsettings SET ";
+
+            query += "UPDATE usersettings SET ";
             query += "imviaemail=?ImViaEmail, ";
-            query += "visible=?Visible,";
+            query += "visible=?Visible ";
             query += "WHERE useruuid=?uuid";
             
             try
@@ -967,14 +966,11 @@ namespace OpenSim.Data.MySQL
                     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();
-                        }
+                        cmd.Parameters.AddWithValue("?ImViaEmail", pref.IMViaEmail);
+                        cmd.Parameters.AddWithValue("?Visible", pref.Visible);
+                        cmd.Parameters.AddWithValue("?uuid", pref.UserId.ToString());
+
+                        cmd.ExecuteNonQuery();
                     }
                 }
             }
@@ -982,6 +978,7 @@ namespace OpenSim.Data.MySQL
             {
                 m_log.DebugFormat("[PROFILES_DATA]" +
                                  ": AgentInterestsUpdate exception {0}", e.Message);
+                result = e.Message;
                 return false;
             }
             return true;
diff --git a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
index c29f1ab..bd325da 100644
--- a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
@@ -81,3 +81,13 @@ CREATE TABLE IF NOT EXISTS `userdata` (
 
 commit;
 
+:VERSION 3         # -------------------------------
+begin;
+CREATE TABLE IF NOT EXISTS `usersettings` (
+  `useruuid` varchar(36) NOT NULL,
+  `imviaemail` enum('true','false') NOT NULL,
+  `visible` enum('true','false') NOT NULL,
+  `email` varchar(254) NOT NULL,
+  PRIMARY KEY (`useruuid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+commit;
\ No newline at end of file
diff --git a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
index f4e41b4..46f57d8 100644
--- a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
@@ -874,7 +874,7 @@ namespace OpenSim.Data.PGSQL
         }
         
         #region User Preferences
-        public OSDArray GetUserPreferences(UUID avatarId)
+        public bool GetUserPreferences(ref UserPreferences pref, ref string result)
         {
             string query = string.Empty;
             
@@ -891,19 +891,16 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("Id", avatarId.ToString());
+                        cmd.Parameters.AddWithValue("Id", pref.UserId.ToString());
                         
                         using (NpgsqlDataReader 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);
+                                bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail);
+                                bool.TryParse((string)reader["visible"], out pref.Visible);
+                                pref.EMail = (string)reader["email"];
                             }
                             else
                             {
@@ -926,15 +923,16 @@ namespace OpenSim.Data.PGSQL
             {
                 m_log.DebugFormat("[PROFILES_DATA]" +
                                  ": Get preferences exception {0}", e.Message);
+                result = e.Message;
             }
-            return data;
+            return true;
         }
-        
-        public bool UpdateUserPreferences(bool emailIm, bool visible, UUID avatarId )
+
+        public bool UpdateUserPreferences(ref UserPreferences pref,  ref string result)
         {           
             string query = string.Empty;
             
-            query += "UPDATE userpsettings SET ";
+            query += "UPDATE usersettings SET ";
             query += "imviaemail=:ImViaEmail, ";
             query += "visible=:Visible,";
             query += "WHERE useruuid=:uuid";
@@ -946,9 +944,9 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("ImViaEmail", emailIm.ToString().ToLower ());
-                        cmd.Parameters.AddWithValue("WantText", visible.ToString().ToLower ());
-                        cmd.Parameters.AddWithValue("uuid", avatarId.ToString());
+                        cmd.Parameters.AddWithValue("ImViaEmail", pref.IMViaEmail.ToString().ToLower ());
+                        cmd.Parameters.AddWithValue("Visible", pref.Visible.ToString().ToLower ());
+                        cmd.Parameters.AddWithValue("uuid", pref.UserId.ToString());
                         
                         lock(Lock)
                         {
@@ -961,6 +959,7 @@ namespace OpenSim.Data.PGSQL
             {
                 m_log.DebugFormat("[PROFILES_DATA]" +
                                  ": AgentInterestsUpdate exception {0}", e.Message);
+                result = e.Message;
                 return false;
             }
             return true;
diff --git a/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
index f23c870..4fcaa8e 100644
--- a/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
@@ -81,3 +81,12 @@ CREATE TABLE userdata (
 
 commit;
 
+:VERSION 3        # -------------------------------
+begin;
+CREATE TABLE usersettings (
+    "useruuid" char(36) NOT NULL,
+    "imviaemail" bytea NOT NULL,
+    "visible" bytea NOT NULL,
+    PRIMARY KEY ("useruuid")
+);
+commit;
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Resources/UserProfiles.migrations b/OpenSim/Data/SQLite/Resources/UserProfiles.migrations
index 16581f6..86434e8 100644
--- a/OpenSim/Data/SQLite/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/SQLite/Resources/UserProfiles.migrations
@@ -88,3 +88,15 @@ CREATE TABLE IF NOT EXISTS userdata (
 
 commit;
 
+
+:VERSION 3         # -------------------------------
+ 
+begin;
+CREATE TABLE IF NOT EXISTS usersettings (
+  useruuid char(36) NOT NULL,
+  imviaemail binary(1) NOT NULL,
+  visible binary(1) NOT NULL,
+  email varchar(254) NOT NULL,
+  PRIMARY KEY (useruuid)
+)
+commit;
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
index 8c1bcd4..916a226 100644
--- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
@@ -747,6 +747,89 @@ namespace OpenSim.Data.SQLite
             }
             return true;
         }
+
+        public bool UpdateUserPreferences(ref UserPreferences pref, ref string result)
+        {           
+            string query = string.Empty;
+            
+            query += "UPDATE usersettings SET ";
+            query += "imviaemail=:ImViaEmail, ";
+            query += "visible=:Visible ";
+            query += "WHERE useruuid=:uuid";
+            
+            try
+            {
+                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+                {
+                    cmd.CommandText = query;
+                    cmd.Parameters.AddWithValue(":ImViaEmail", pref.IMViaEmail);
+                    cmd.Parameters.AddWithValue(":Visible", pref.Visible);
+                    cmd.Parameters.AddWithValue(":uuid", pref.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 GetUserPreferences(ref UserPreferences pref, ref string result)
+        {
+            IDataReader reader = null;
+            string query = string.Empty;
+            
+            query += "SELECT imviaemail,visible,email FROM ";
+            query += "usersettings WHERE ";
+            query += "useruuid = :Id";
+            
+            OSDArray data = new OSDArray();
+            
+            try
+            {
+                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+                {
+                    cmd.CommandText = query;
+                    cmd.Parameters.AddWithValue("?Id", pref.UserId.ToString());
+                        
+                    using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                    {
+                        if(reader.Read())
+                        {
+                            bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail);
+                            bool.TryParse((string)reader["visible"], out pref.Visible);
+                            pref.EMail = (string)reader["email"];
+                         }
+                         else
+                         {
+                            query = "INSERT INTO usersettings VALUES ";
+                            query += "(:Id,'false','false', '')";
+                            
+                            using (SqliteCommand put = (SqliteCommand)m_connection.CreateCommand())
+                            {
+                                put.Parameters.AddWithValue(":Id", pref.UserId.ToString());
+                                put.ExecuteNonQuery();
+                                    
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                  ": Get preferences exception {0}", e.Message);
+                result = e.Message;
+                return false;
+            }
+            return true;
+        }
+
         public bool GetUserAppData(ref UserAppData props, ref string result)
         {
             IDataReader reader = null;
diff --git a/OpenSim/Framework/UserProfiles.cs b/OpenSim/Framework/UserProfiles.cs
index 6133591..492f6b9 100644
--- a/OpenSim/Framework/UserProfiles.cs
+++ b/OpenSim/Framework/UserProfiles.cs
@@ -90,6 +90,14 @@ namespace OpenSim.Framework
         public UUID TargetId;
         public string Notes;
     }
+
+    public class UserPreferences
+    {
+        public UUID UserId;
+        public bool IMViaEmail = false;
+        public bool Visible = false;
+        public string EMail = string.Empty;
+    }
     
     public class UserAccountProperties
     {
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 56ff2bd..b21082f 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -270,6 +270,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             // Notes
             client.AddGenericPacketHandler("avatarnotesrequest", NotesRequest);
             client.OnAvatarNotesUpdate += NotesUpdate;
+
+            // Preferences
+            client.OnUserInfoRequest += UserPreferencesRequest;
+            client.OnUpdateUserInfo += UpdateUserPreferences;
         }
         #endregion Region Event Handlers
 
@@ -799,6 +803,69 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         }
         #endregion Notes
 
+        #region User Preferences
+        /// <summary>
+        /// Updates the user preferences.
+        /// </summary>
+        /// <param name='imViaEmail'>
+        /// Im via email.
+        /// </param>
+        /// <param name='visible'>
+        /// Visible.
+        /// </param>
+        /// <param name='remoteClient'>
+        /// Remote client.
+        /// </param>
+        public void UpdateUserPreferences(bool imViaEmail, bool visible, IClientAPI remoteClient)
+        {
+            UserPreferences pref = new UserPreferences();
+
+            pref.UserId = remoteClient.AgentId;
+            pref.IMViaEmail = imViaEmail;
+            pref.Visible = visible;
+
+            string serverURI = string.Empty;
+            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+
+            object Pref = pref;
+            if(!JsonRpcRequest(ref Pref, "user_preferences_update", serverURI, UUID.Random().ToString()))
+            {
+                m_log.InfoFormat("[PROFILES]: UserPreferences update error");
+                remoteClient.SendAgentAlertMessage("Error updating preferences", false);
+                return;   
+            }
+        }
+        
+        /// <summary>
+        /// Users the preferences request.
+        /// </summary>
+        /// <param name='remoteClient'>
+        /// Remote client.
+        /// </param>
+        public void UserPreferencesRequest(IClientAPI remoteClient)
+        {
+            UserPreferences pref = new UserPreferences();
+
+            pref.UserId = remoteClient.AgentId;
+
+            string serverURI = string.Empty;
+            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+
+
+            object Pref = (object)pref;
+            if(!JsonRpcRequest(ref Pref, "user_preferences_request", serverURI, UUID.Random().ToString()))
+            {
+                m_log.InfoFormat("[PROFILES]: UserPreferences request error");
+                remoteClient.SendAgentAlertMessage("Error requesting preferences", false);
+                return;
+            }
+            pref = (UserPreferences) Pref;
+
+            remoteClient.SendUserInfoReply(pref.IMViaEmail, pref.Visible, pref.EMail);
+       
+        }
+        #endregion User Preferences
+
         #region Avatar Properties
         /// <summary>
         /// Update the avatars interests .
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
index 323535a..4701ee6 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
@@ -153,6 +153,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
             Server.AddJsonRPCHandler("avatar_properties_request", handler.AvatarPropertiesRequest);
             Server.AddJsonRPCHandler("avatar_properties_update", handler.AvatarPropertiesUpdate);
             Server.AddJsonRPCHandler("avatar_interests_update", handler.AvatarInterestsUpdate);
+            Server.AddJsonRPCHandler("user_preferences_update", handler.UserPreferenecesUpdate);
+            Server.AddJsonRPCHandler("user_preferences_request", handler.UserPreferencesRequest);
             Server.AddJsonRPCHandler("image_assets_request", handler.AvatarImageAssetsRequest);
             Server.AddJsonRPCHandler("user_data_request", handler.RequestUserAppData);
             Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData);
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
index 28dbbc2..6403882 100644
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
@@ -104,6 +104,8 @@ namespace OpenSim.Server.Handlers.Profiles
             Server.AddJsonRPCHandler("avatar_properties_request", handler.AvatarPropertiesRequest);
             Server.AddJsonRPCHandler("avatar_properties_update", handler.AvatarPropertiesUpdate);
             Server.AddJsonRPCHandler("avatar_interests_update", handler.AvatarInterestsUpdate);
+            Server.AddJsonRPCHandler("user_preferences_update", handler.UserPreferenecesUpdate);
+            Server.AddJsonRPCHandler("user_preferences_request", handler.UserPreferencesRequest);
             Server.AddJsonRPCHandler("image_assets_request", handler.AvatarImageAssetsRequest);
             Server.AddJsonRPCHandler("user_data_request", handler.RequestUserAppData);
             Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData);
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
index f5f0794..d30cc22 100644
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
@@ -381,6 +381,59 @@ namespace OpenSim.Server.Handlers
         }
         #endregion Interests
 
+        #region User Preferences
+        public bool UserPreferencesRequest(OSDMap json, ref JsonRpcResponse response)
+        {
+            if(!json.ContainsKey("params"))
+            {
+                response.Error.Code = ErrorCode.ParseError;
+                m_log.DebugFormat ("User Preferences Request");
+                return false;
+            }
+
+            string result = string.Empty;
+            UserPreferences prefs = new UserPreferences();
+            object Prefs = (object)prefs;
+            OSD.DeserializeMembers(ref Prefs, (OSDMap)json["params"]);
+            if(Service.UserPreferencesRequest(ref prefs, ref result))
+            {
+                response.Result = OSD.SerializeMembers(prefs);
+                return true;
+            }
+            
+            response.Error.Code = ErrorCode.InternalError;
+            response.Error.Message = string.Format("{0}", result);
+            m_log.InfoFormat("[PROFILES]: User preferences request error - {0}", response.Error.Message);
+            return false;
+        }
+
+        public bool UserPreferenecesUpdate(OSDMap json, ref JsonRpcResponse response)
+        {
+            if(!json.ContainsKey("params"))
+            {
+                response.Error.Code = ErrorCode.ParseError;
+                response.Error.Message = "no parameters supplied";
+                m_log.DebugFormat ("User Preferences Update Request");
+                return false;
+            }
+            
+            string result = string.Empty;
+            UserPreferences prefs = new UserPreferences();
+            object Prefs = (object)prefs;
+            OSD.DeserializeMembers(ref Prefs, (OSDMap)json["params"]);
+            if(Service.UserPreferencesUpdate(ref prefs, ref result))
+            {
+                response.Result = OSD.SerializeMembers(prefs);
+                return true;
+            }
+            
+            response.Error.Code = ErrorCode.InternalError;
+            response.Error.Message = string.Format("{0}", result);
+            m_log.InfoFormat("[PROFILES]: User preferences update error - {0}", response.Error.Message);
+            return false;
+        }
+        #endregion User Preferences
+
         #region Utility
         public bool AvatarImageAssetsRequest(OSDMap json, ref JsonRpcResponse response)
         {
diff --git a/OpenSim/Services/Interfaces/IUserProfilesService.cs b/OpenSim/Services/Interfaces/IUserProfilesService.cs
index 319d307..121baa8 100644
--- a/OpenSim/Services/Interfaces/IUserProfilesService.cs
+++ b/OpenSim/Services/Interfaces/IUserProfilesService.cs
@@ -57,6 +57,11 @@ namespace OpenSim.Services.Interfaces
         bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result);
         bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result);
         #endregion Profile Properties
+
+        #region User Preferences
+        bool UserPreferencesRequest(ref UserPreferences pref, ref string result);
+        bool UserPreferencesUpdate(ref UserPreferences pref, ref string result);
+        #endregion User Preferences
         
         #region Interests
         bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result);
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
index d00f34d..69c7b91 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
@@ -163,6 +163,18 @@ namespace OpenSim.Services.ProfilesService
         }
         #endregion Interests
 
+        #region User Preferences
+        public bool UserPreferencesUpdate(ref UserPreferences pref, ref string result)
+        {
+            return ProfilesData.UpdateUserPreferences(ref pref, ref result);
+        }
+
+        public bool UserPreferencesRequest(ref UserPreferences pref, ref string result)
+        {
+            return ProfilesData.GetUserPreferences(ref pref, ref result);
+        }
+        #endregion User Preferences
+
         #region Utility
         public OSD AvatarImageAssetsRequest(UUID avatarId)
         {
-- 
cgit v1.1


From 1496de7ce99079d3d7bf046db088c3d6e2a97bcb Mon Sep 17 00:00:00 2001
From: dahlia
Date: Fri, 6 Dec 2013 15:58:19 -0800
Subject: use System.IO.Compression.DeflateStream for mesh decompression in an
 attempt to reduce mesh asset decoding failures

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 14 +++++---------
 prebuild.xml                                  |  1 -
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 1f08b03..e313a30 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -40,7 +40,6 @@ using log4net;
 using Nini.Config;
 using System.Reflection;
 using System.IO;
-using ComponentAce.Compression.Libs.zlib;
 
 namespace OpenSim.Region.Physics.Meshing
 {
@@ -549,7 +548,6 @@ namespace OpenSim.Region.Physics.Meshing
             return true;
         }
 
-
         /// <summary>
         /// decompresses a gzipped OSD object
         /// </summary>
@@ -564,15 +562,13 @@ namespace OpenSim.Region.Physics.Meshing
             {
                 using (MemoryStream outMs = new MemoryStream())
                 {
-                    using (ZOutputStream zOut = new ZOutputStream(outMs))
+                    using (DeflateStream decompressionStream = new DeflateStream(inMs, CompressionMode.Decompress))
                     {
                         byte[] readBuffer = new byte[2048];
-                        int readLen = 0;
-                        while ((readLen = inMs.Read(readBuffer, 0, readBuffer.Length)) > 0)
-                        {
-                            zOut.Write(readBuffer, 0, readLen);
-                        }
-                        zOut.Flush();
+                        inMs.Read(readBuffer, 0, 2); // skip first 2 bytes in header
+
+                        decompressionStream.CopyTo(outMs);
+
                         outMs.Seek(0, SeekOrigin.Begin);
 
                         byte[] decompressedBuf = outMs.GetBuffer();
diff --git a/prebuild.xml b/prebuild.xml
index de3b89b..f6e0f4b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -585,7 +585,6 @@
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
       <Reference name="log4net" path="../../../../bin/"/>
-      <Reference name="zlib.net" path="../../../../bin/"/>
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
-- 
cgit v1.1


From 4058e5f709990cc502d5479fb4065bf232ee3a8d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 6 Dec 2013 16:01:29 -0800
Subject: Fixed misleading comment

---
 OpenSim/Services/Interfaces/IHypergridServices.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/OpenSim/Services/Interfaces/IHypergridServices.cs b/OpenSim/Services/Interfaces/IHypergridServices.cs
index f9e7f08..05e175a 100644
--- a/OpenSim/Services/Interfaces/IHypergridServices.cs
+++ b/OpenSim/Services/Interfaces/IHypergridServices.cs
@@ -43,9 +43,6 @@ namespace OpenSim.Services.Interfaces
 
     }
 
-    /// <summary>
-    /// HG1.5 only
-    /// </summary>
     public interface IUserAgentService
     {
         bool LoginAgentToGrid(AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason);
-- 
cgit v1.1


From c0380d1bfe596afe33659cc69ae99a09018f9908 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Fri, 6 Dec 2013 16:24:44 -0800
Subject: apparently mono DeflateStream has no CopyTo method =(

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index e313a30..d96de4a 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -566,8 +566,12 @@ namespace OpenSim.Region.Physics.Meshing
                     {
                         byte[] readBuffer = new byte[2048];
                         inMs.Read(readBuffer, 0, 2); // skip first 2 bytes in header
+                        int readLen = 0;
 
-                        decompressionStream.CopyTo(outMs);
+                        while ((readLen = decompressionStream.Read(readBuffer, 0, readBuffer.Length)) > 0)
+                            outMs.Write(readBuffer, 0, readLen);
+
+                        outMs.Flush();
 
                         outMs.Seek(0, SeekOrigin.Begin);
 
-- 
cgit v1.1


From 958a8f274b8a25703935ab4092f190e9d54b8559 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 7 Dec 2013 01:29:15 +0000
Subject: Revert "Add support for user preferences (im via email)"

This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
---
 OpenSim/Data/IProfilesData.cs                      |  2 -
 OpenSim/Data/MySQL/MySQLUserProfilesData.cs        | 39 +++++-----
 .../Data/MySQL/Resources/UserProfiles.migrations   | 10 ---
 OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs        | 29 ++++----
 .../Data/PGSQL/Resources/UserProfiles.migrations   |  9 ---
 .../Data/SQLite/Resources/UserProfiles.migrations  | 12 ----
 OpenSim/Data/SQLite/SQLiteUserProfilesData.cs      | 83 ----------------------
 OpenSim/Framework/UserProfiles.cs                  |  8 ---
 .../Avatar/UserProfiles/UserProfileModule.cs       | 67 -----------------
 .../LocalUserProfilesServiceConnector.cs           |  2 -
 .../Handlers/Profiles/UserProfilesConnector.cs     |  2 -
 .../Handlers/Profiles/UserProfilesHandlers.cs      | 53 --------------
 .../Services/Interfaces/IUserProfilesService.cs    |  5 --
 .../UserProfilesService/UserProfilesService.cs     | 12 ----
 14 files changed, 36 insertions(+), 297 deletions(-)

diff --git a/OpenSim/Data/IProfilesData.cs b/OpenSim/Data/IProfilesData.cs
index 7fb075d..0de7f68 100644
--- a/OpenSim/Data/IProfilesData.cs
+++ b/OpenSim/Data/IProfilesData.cs
@@ -48,8 +48,6 @@ namespace OpenSim.Data
         bool UpdateAvatarProperties(ref UserProfileProperties props, ref string result);
         bool UpdateAvatarInterests(UserProfileProperties up, ref string result);
         bool GetClassifiedInfo(ref UserClassifiedAdd ad, ref string result);
-        bool UpdateUserPreferences(ref UserPreferences pref,  ref string result);
-        bool GetUserPreferences(ref UserPreferences pref, 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/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index 63492c2..dc88f94 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -895,7 +895,7 @@ namespace OpenSim.Data.MySQL
         }
         
         #region User Preferences
-        public bool GetUserPreferences(ref UserPreferences pref, ref string result)
+        public OSDArray GetUserPreferences(UUID avatarId)
         {
             string query = string.Empty;
             
@@ -912,16 +912,19 @@ namespace OpenSim.Data.MySQL
                     dbcon.Open();
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("?Id", pref.UserId.ToString());
+                        cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
                         
                         using (MySqlDataReader reader = cmd.ExecuteReader())
                         {
                             if(reader.HasRows)
                             {
                                 reader.Read();
-                                bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail);
-                                bool.TryParse((string)reader["visible"], out pref.Visible);
-                                pref.EMail = (string)reader["email"];
+                                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
                             {
@@ -944,19 +947,17 @@ namespace OpenSim.Data.MySQL
             {
                 m_log.DebugFormat("[PROFILES_DATA]" +
                                  ": Get preferences exception {0}", e.Message);
-                result = e.Message;
-                return false;
             }
-            return true;
+            return data;
         }
         
-        public bool UpdateUserPreferences(ref UserPreferences pref, ref string result)
+        public bool UpdateUserPreferences(bool emailIm, bool visible, UUID avatarId )
         {           
             string query = string.Empty;
-
-            query += "UPDATE usersettings SET ";
+            
+            query += "UPDATE userpsettings SET ";
             query += "imviaemail=?ImViaEmail, ";
-            query += "visible=?Visible ";
+            query += "visible=?Visible,";
             query += "WHERE useruuid=?uuid";
             
             try
@@ -966,11 +967,14 @@ namespace OpenSim.Data.MySQL
                     dbcon.Open();
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("?ImViaEmail", pref.IMViaEmail);
-                        cmd.Parameters.AddWithValue("?Visible", pref.Visible);
-                        cmd.Parameters.AddWithValue("?uuid", pref.UserId.ToString());
-
-                        cmd.ExecuteNonQuery();
+                        cmd.Parameters.AddWithValue("?ImViaEmail", emailIm.ToString().ToLower ());
+                        cmd.Parameters.AddWithValue("?WantText", visible.ToString().ToLower ());
+                        cmd.Parameters.AddWithValue("?uuid", avatarId.ToString());
+                        
+                        lock(Lock)
+                        {
+                            cmd.ExecuteNonQuery();
+                        }
                     }
                 }
             }
@@ -978,7 +982,6 @@ namespace OpenSim.Data.MySQL
             {
                 m_log.DebugFormat("[PROFILES_DATA]" +
                                  ": AgentInterestsUpdate exception {0}", e.Message);
-                result = e.Message;
                 return false;
             }
             return true;
diff --git a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
index bd325da..c29f1ab 100644
--- a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
@@ -81,13 +81,3 @@ CREATE TABLE IF NOT EXISTS `userdata` (
 
 commit;
 
-:VERSION 3         # -------------------------------
-begin;
-CREATE TABLE IF NOT EXISTS `usersettings` (
-  `useruuid` varchar(36) NOT NULL,
-  `imviaemail` enum('true','false') NOT NULL,
-  `visible` enum('true','false') NOT NULL,
-  `email` varchar(254) NOT NULL,
-  PRIMARY KEY (`useruuid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-commit;
\ No newline at end of file
diff --git a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
index 46f57d8..f4e41b4 100644
--- a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
@@ -874,7 +874,7 @@ namespace OpenSim.Data.PGSQL
         }
         
         #region User Preferences
-        public bool GetUserPreferences(ref UserPreferences pref, ref string result)
+        public OSDArray GetUserPreferences(UUID avatarId)
         {
             string query = string.Empty;
             
@@ -891,16 +891,19 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("Id", pref.UserId.ToString());
+                        cmd.Parameters.AddWithValue("Id", avatarId.ToString());
                         
                         using (NpgsqlDataReader reader = cmd.ExecuteReader())
                         {
                             if(reader.HasRows)
                             {
                                 reader.Read();
-                                bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail);
-                                bool.TryParse((string)reader["visible"], out pref.Visible);
-                                pref.EMail = (string)reader["email"];
+                                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
                             {
@@ -923,16 +926,15 @@ namespace OpenSim.Data.PGSQL
             {
                 m_log.DebugFormat("[PROFILES_DATA]" +
                                  ": Get preferences exception {0}", e.Message);
-                result = e.Message;
             }
-            return true;
+            return data;
         }
-
-        public bool UpdateUserPreferences(ref UserPreferences pref,  ref string result)
+        
+        public bool UpdateUserPreferences(bool emailIm, bool visible, UUID avatarId )
         {           
             string query = string.Empty;
             
-            query += "UPDATE usersettings SET ";
+            query += "UPDATE userpsettings SET ";
             query += "imviaemail=:ImViaEmail, ";
             query += "visible=:Visible,";
             query += "WHERE useruuid=:uuid";
@@ -944,9 +946,9 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("ImViaEmail", pref.IMViaEmail.ToString().ToLower ());
-                        cmd.Parameters.AddWithValue("Visible", pref.Visible.ToString().ToLower ());
-                        cmd.Parameters.AddWithValue("uuid", pref.UserId.ToString());
+                        cmd.Parameters.AddWithValue("ImViaEmail", emailIm.ToString().ToLower ());
+                        cmd.Parameters.AddWithValue("WantText", visible.ToString().ToLower ());
+                        cmd.Parameters.AddWithValue("uuid", avatarId.ToString());
                         
                         lock(Lock)
                         {
@@ -959,7 +961,6 @@ namespace OpenSim.Data.PGSQL
             {
                 m_log.DebugFormat("[PROFILES_DATA]" +
                                  ": AgentInterestsUpdate exception {0}", e.Message);
-                result = e.Message;
                 return false;
             }
             return true;
diff --git a/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
index 4fcaa8e..f23c870 100644
--- a/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
@@ -81,12 +81,3 @@ CREATE TABLE userdata (
 
 commit;
 
-:VERSION 3        # -------------------------------
-begin;
-CREATE TABLE usersettings (
-    "useruuid" char(36) NOT NULL,
-    "imviaemail" bytea NOT NULL,
-    "visible" bytea NOT NULL,
-    PRIMARY KEY ("useruuid")
-);
-commit;
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Resources/UserProfiles.migrations b/OpenSim/Data/SQLite/Resources/UserProfiles.migrations
index 86434e8..16581f6 100644
--- a/OpenSim/Data/SQLite/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/SQLite/Resources/UserProfiles.migrations
@@ -88,15 +88,3 @@ CREATE TABLE IF NOT EXISTS userdata (
 
 commit;
 
-
-:VERSION 3         # -------------------------------
- 
-begin;
-CREATE TABLE IF NOT EXISTS usersettings (
-  useruuid char(36) NOT NULL,
-  imviaemail binary(1) NOT NULL,
-  visible binary(1) NOT NULL,
-  email varchar(254) NOT NULL,
-  PRIMARY KEY (useruuid)
-)
-commit;
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
index 916a226..8c1bcd4 100644
--- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
@@ -747,89 +747,6 @@ namespace OpenSim.Data.SQLite
             }
             return true;
         }
-
-        public bool UpdateUserPreferences(ref UserPreferences pref, ref string result)
-        {           
-            string query = string.Empty;
-            
-            query += "UPDATE usersettings SET ";
-            query += "imviaemail=:ImViaEmail, ";
-            query += "visible=:Visible ";
-            query += "WHERE useruuid=:uuid";
-            
-            try
-            {
-                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
-                {
-                    cmd.CommandText = query;
-                    cmd.Parameters.AddWithValue(":ImViaEmail", pref.IMViaEmail);
-                    cmd.Parameters.AddWithValue(":Visible", pref.Visible);
-                    cmd.Parameters.AddWithValue(":uuid", pref.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 GetUserPreferences(ref UserPreferences pref, ref string result)
-        {
-            IDataReader reader = null;
-            string query = string.Empty;
-            
-            query += "SELECT imviaemail,visible,email FROM ";
-            query += "usersettings WHERE ";
-            query += "useruuid = :Id";
-            
-            OSDArray data = new OSDArray();
-            
-            try
-            {
-                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
-                {
-                    cmd.CommandText = query;
-                    cmd.Parameters.AddWithValue("?Id", pref.UserId.ToString());
-                        
-                    using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
-                    {
-                        if(reader.Read())
-                        {
-                            bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail);
-                            bool.TryParse((string)reader["visible"], out pref.Visible);
-                            pref.EMail = (string)reader["email"];
-                         }
-                         else
-                         {
-                            query = "INSERT INTO usersettings VALUES ";
-                            query += "(:Id,'false','false', '')";
-                            
-                            using (SqliteCommand put = (SqliteCommand)m_connection.CreateCommand())
-                            {
-                                put.Parameters.AddWithValue(":Id", pref.UserId.ToString());
-                                put.ExecuteNonQuery();
-                                    
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                  ": Get preferences exception {0}", e.Message);
-                result = e.Message;
-                return false;
-            }
-            return true;
-        }
-
         public bool GetUserAppData(ref UserAppData props, ref string result)
         {
             IDataReader reader = null;
diff --git a/OpenSim/Framework/UserProfiles.cs b/OpenSim/Framework/UserProfiles.cs
index 492f6b9..6133591 100644
--- a/OpenSim/Framework/UserProfiles.cs
+++ b/OpenSim/Framework/UserProfiles.cs
@@ -90,14 +90,6 @@ namespace OpenSim.Framework
         public UUID TargetId;
         public string Notes;
     }
-
-    public class UserPreferences
-    {
-        public UUID UserId;
-        public bool IMViaEmail = false;
-        public bool Visible = false;
-        public string EMail = string.Empty;
-    }
     
     public class UserAccountProperties
     {
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index b21082f..56ff2bd 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -270,10 +270,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             // Notes
             client.AddGenericPacketHandler("avatarnotesrequest", NotesRequest);
             client.OnAvatarNotesUpdate += NotesUpdate;
-
-            // Preferences
-            client.OnUserInfoRequest += UserPreferencesRequest;
-            client.OnUpdateUserInfo += UpdateUserPreferences;
         }
         #endregion Region Event Handlers
 
@@ -803,69 +799,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         }
         #endregion Notes
 
-        #region User Preferences
-        /// <summary>
-        /// Updates the user preferences.
-        /// </summary>
-        /// <param name='imViaEmail'>
-        /// Im via email.
-        /// </param>
-        /// <param name='visible'>
-        /// Visible.
-        /// </param>
-        /// <param name='remoteClient'>
-        /// Remote client.
-        /// </param>
-        public void UpdateUserPreferences(bool imViaEmail, bool visible, IClientAPI remoteClient)
-        {
-            UserPreferences pref = new UserPreferences();
-
-            pref.UserId = remoteClient.AgentId;
-            pref.IMViaEmail = imViaEmail;
-            pref.Visible = visible;
-
-            string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
-
-            object Pref = pref;
-            if(!JsonRpcRequest(ref Pref, "user_preferences_update", serverURI, UUID.Random().ToString()))
-            {
-                m_log.InfoFormat("[PROFILES]: UserPreferences update error");
-                remoteClient.SendAgentAlertMessage("Error updating preferences", false);
-                return;   
-            }
-        }
-        
-        /// <summary>
-        /// Users the preferences request.
-        /// </summary>
-        /// <param name='remoteClient'>
-        /// Remote client.
-        /// </param>
-        public void UserPreferencesRequest(IClientAPI remoteClient)
-        {
-            UserPreferences pref = new UserPreferences();
-
-            pref.UserId = remoteClient.AgentId;
-
-            string serverURI = string.Empty;
-            bool foreign = GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
-
-
-            object Pref = (object)pref;
-            if(!JsonRpcRequest(ref Pref, "user_preferences_request", serverURI, UUID.Random().ToString()))
-            {
-                m_log.InfoFormat("[PROFILES]: UserPreferences request error");
-                remoteClient.SendAgentAlertMessage("Error requesting preferences", false);
-                return;
-            }
-            pref = (UserPreferences) Pref;
-
-            remoteClient.SendUserInfoReply(pref.IMViaEmail, pref.Visible, pref.EMail);
-       
-        }
-        #endregion User Preferences
-
         #region Avatar Properties
         /// <summary>
         /// Update the avatars interests .
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
index 4701ee6..323535a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
@@ -153,8 +153,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
             Server.AddJsonRPCHandler("avatar_properties_request", handler.AvatarPropertiesRequest);
             Server.AddJsonRPCHandler("avatar_properties_update", handler.AvatarPropertiesUpdate);
             Server.AddJsonRPCHandler("avatar_interests_update", handler.AvatarInterestsUpdate);
-            Server.AddJsonRPCHandler("user_preferences_update", handler.UserPreferenecesUpdate);
-            Server.AddJsonRPCHandler("user_preferences_request", handler.UserPreferencesRequest);
             Server.AddJsonRPCHandler("image_assets_request", handler.AvatarImageAssetsRequest);
             Server.AddJsonRPCHandler("user_data_request", handler.RequestUserAppData);
             Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData);
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
index 6403882..28dbbc2 100644
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
@@ -104,8 +104,6 @@ namespace OpenSim.Server.Handlers.Profiles
             Server.AddJsonRPCHandler("avatar_properties_request", handler.AvatarPropertiesRequest);
             Server.AddJsonRPCHandler("avatar_properties_update", handler.AvatarPropertiesUpdate);
             Server.AddJsonRPCHandler("avatar_interests_update", handler.AvatarInterestsUpdate);
-            Server.AddJsonRPCHandler("user_preferences_update", handler.UserPreferenecesUpdate);
-            Server.AddJsonRPCHandler("user_preferences_request", handler.UserPreferencesRequest);
             Server.AddJsonRPCHandler("image_assets_request", handler.AvatarImageAssetsRequest);
             Server.AddJsonRPCHandler("user_data_request", handler.RequestUserAppData);
             Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData);
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
index d30cc22..f5f0794 100644
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
@@ -381,59 +381,6 @@ namespace OpenSim.Server.Handlers
         }
         #endregion Interests
 
-        #region User Preferences
-        public bool UserPreferencesRequest(OSDMap json, ref JsonRpcResponse response)
-        {
-            if(!json.ContainsKey("params"))
-            {
-                response.Error.Code = ErrorCode.ParseError;
-                m_log.DebugFormat ("User Preferences Request");
-                return false;
-            }
-
-            string result = string.Empty;
-            UserPreferences prefs = new UserPreferences();
-            object Prefs = (object)prefs;
-            OSD.DeserializeMembers(ref Prefs, (OSDMap)json["params"]);
-            if(Service.UserPreferencesRequest(ref prefs, ref result))
-            {
-                response.Result = OSD.SerializeMembers(prefs);
-                return true;
-            }
-            
-            response.Error.Code = ErrorCode.InternalError;
-            response.Error.Message = string.Format("{0}", result);
-            m_log.InfoFormat("[PROFILES]: User preferences request error - {0}", response.Error.Message);
-            return false;
-        }
-
-        public bool UserPreferenecesUpdate(OSDMap json, ref JsonRpcResponse response)
-        {
-            if(!json.ContainsKey("params"))
-            {
-                response.Error.Code = ErrorCode.ParseError;
-                response.Error.Message = "no parameters supplied";
-                m_log.DebugFormat ("User Preferences Update Request");
-                return false;
-            }
-            
-            string result = string.Empty;
-            UserPreferences prefs = new UserPreferences();
-            object Prefs = (object)prefs;
-            OSD.DeserializeMembers(ref Prefs, (OSDMap)json["params"]);
-            if(Service.UserPreferencesUpdate(ref prefs, ref result))
-            {
-                response.Result = OSD.SerializeMembers(prefs);
-                return true;
-            }
-            
-            response.Error.Code = ErrorCode.InternalError;
-            response.Error.Message = string.Format("{0}", result);
-            m_log.InfoFormat("[PROFILES]: User preferences update error - {0}", response.Error.Message);
-            return false;
-        }
-        #endregion User Preferences
-
         #region Utility
         public bool AvatarImageAssetsRequest(OSDMap json, ref JsonRpcResponse response)
         {
diff --git a/OpenSim/Services/Interfaces/IUserProfilesService.cs b/OpenSim/Services/Interfaces/IUserProfilesService.cs
index 121baa8..319d307 100644
--- a/OpenSim/Services/Interfaces/IUserProfilesService.cs
+++ b/OpenSim/Services/Interfaces/IUserProfilesService.cs
@@ -57,11 +57,6 @@ namespace OpenSim.Services.Interfaces
         bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result);
         bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result);
         #endregion Profile Properties
-
-        #region User Preferences
-        bool UserPreferencesRequest(ref UserPreferences pref, ref string result);
-        bool UserPreferencesUpdate(ref UserPreferences pref, ref string result);
-        #endregion User Preferences
         
         #region Interests
         bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result);
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
index 69c7b91..d00f34d 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
@@ -163,18 +163,6 @@ namespace OpenSim.Services.ProfilesService
         }
         #endregion Interests
 
-        #region User Preferences
-        public bool UserPreferencesUpdate(ref UserPreferences pref, ref string result)
-        {
-            return ProfilesData.UpdateUserPreferences(ref pref, ref result);
-        }
-
-        public bool UserPreferencesRequest(ref UserPreferences pref, ref string result)
-        {
-            return ProfilesData.GetUserPreferences(ref pref, ref result);
-        }
-        #endregion User Preferences
-
         #region Utility
         public OSD AvatarImageAssetsRequest(UUID avatarId)
         {
-- 
cgit v1.1


From 08750501617ca332ab196b2f25030e3c635c9dd6 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Tue, 10 Dec 2013 13:57:18 -0800
Subject: Add console utility commands "scale scene" and "translate scene".
 Note that repeated use of these commands will induce floating point
 accumulation errors. Please back up your region before using.

---
 OpenSim/Region/Application/OpenSim.cs | 90 ++++++++++++++++++++++++++++++++++-
 1 file changed, 88 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index c2d9942..0a6ae98 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -297,10 +297,20 @@ namespace OpenSim
                                           HandleEditScale);
 
             m_console.Commands.AddCommand("Objects", false, "rotate scene",
-                                          "rotate scene <degrees>",
-                                          "Rotates all scene objects around x:128, y:128",
+                                          "rotate scene <degrees> [centerX, centerY]",
+                                          "Rotates all scene objects around centerX, centerY (defailt 128, 128) (please back up your region before using)",
                                           HandleRotateScene);
 
+            m_console.Commands.AddCommand("Objects", false, "scale scene",
+                                          "scale scene <factor>",
+                                          "Scales the scene objects (please back up your region before using)",
+                                          HandleScaleScene);
+
+            m_console.Commands.AddCommand("Objects", false, "translate scene",
+                                          "translate scene xOffset yOffset zOffset",
+                                          "translates the scene objects (please back up your region before using)",
+                                          HandleTranslateScene);
+
             m_console.Commands.AddCommand("Users", false, "kick user",
                                           "kick user <first> <last> [--force] [message]",
                                           "Kick a user off the simulator",
@@ -549,6 +559,82 @@ namespace OpenSim
             });
         }
 
+        private void HandleScaleScene(string module, string[] args)
+        {
+            string usage = "Usage: scale scene <factor>";
+
+            if (args.Length < 3)
+            {
+                MainConsole.Instance.Output(usage);
+                return;
+            }
+
+            float factor = (float)(Convert.ToSingle(args[2]));
+
+            float minZ = float.MaxValue;
+
+            SceneManager.ForEachSelectedScene(delegate(Scene scene)
+            {
+                scene.ForEachSOG(delegate(SceneObjectGroup sog)
+                {
+                    if (sog.AttachmentPoint == 0)
+                    {
+                        if (sog.RootPart.AbsolutePosition.Z < minZ)
+                            minZ = sog.RootPart.AbsolutePosition.Z;
+                    }
+                });
+            });
+
+            SceneManager.ForEachSelectedScene(delegate(Scene scene)
+            {
+                scene.ForEachSOG(delegate(SceneObjectGroup sog)
+                {
+                    if (sog.AttachmentPoint == 0)
+                    {
+                        Vector3 tmpRootPos = sog.RootPart.AbsolutePosition;
+                        tmpRootPos.Z -= minZ;
+                        tmpRootPos *= factor;
+                        tmpRootPos.Z += minZ;
+
+                        foreach (SceneObjectPart sop in sog.Parts)
+                        {
+                            if (sop.ParentID != 0)
+                                sop.OffsetPosition *= factor;
+                            sop.Scale *= factor;
+                        }
+
+                        sog.UpdateGroupPosition(tmpRootPos);
+                    }
+                });
+            });
+        }
+
+        private void HandleTranslateScene(string module, string[] args)
+        {
+            string usage = "Usage: translate scene <xOffset, yOffset, zOffset>";
+
+            if (args.Length < 5)
+            {
+                MainConsole.Instance.Output(usage);
+                return;
+            }
+
+            float xOFfset = (float)Convert.ToSingle(args[2]);
+            float yOffset = (float)Convert.ToSingle(args[3]);
+            float zOffset = (float)Convert.ToSingle(args[4]);
+
+            Vector3 offset = new Vector3(xOFfset, yOffset, zOffset);
+
+            SceneManager.ForEachSelectedScene(delegate(Scene scene)
+            {
+                scene.ForEachSOG(delegate(SceneObjectGroup sog)
+                {
+                    if (sog.AttachmentPoint == 0)
+                        sog.UpdateGroupPosition(sog.AbsolutePosition + offset);
+                });
+            });
+        }
+
         /// <summary>
         /// Creates a new region based on the parameters specified.   This will ask the user questions on the console
         /// </summary>
-- 
cgit v1.1


From 97934e00e667b6f432340a54671221a970a048d7 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 11 Dec 2013 00:12:36 +0000
Subject: This is the Avination Entity Transfer Module. Surprisingly, it still
 compiles but I don't know if it runs. Will probably crash and burn as the
 supporting code isn't there yet.

---
 .../EntityTransfer/EntityTransferModule.cs         | 421 ++++++++++-----------
 .../Framework/Interfaces/IEntityTransferModule.cs  |  32 +-
 2 files changed, 214 insertions(+), 239 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index aa8a4db..ef5239a 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -409,7 +409,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// <param name="sp"></param>
         /// <param name="position"></param>
         /// <param name="lookAt"></param>
-        /// <param name="teleportFlags"></param
+        /// <param name="teleportFlags"></param>
         private void TeleportAgentWithinRegion(ScenePresence sp, Vector3 position, Vector3 lookAt, uint teleportFlags)
         {
             m_log.DebugFormat(
@@ -444,11 +444,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 position.Z = newPosZ;
             }
 
+            if (sp.Flying)
+                teleportFlags |= (uint)TeleportFlags.IsFlying;
+
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.Transferring);
 
             sp.ControllingClient.SendTeleportStart(teleportFlags);
 
             sp.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags);
+            sp.TeleportFlags = (Constants.TeleportFlags)teleportFlags;
             sp.Velocity = Vector3.Zero;
             sp.Teleport(position);
 
@@ -652,8 +656,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // This may be a costly operation. The reg.ExternalEndPoint field is not a passive field,
             // it's actually doing a lot of work.
             IPEndPoint endPoint = finalDestination.ExternalEndPoint;
-
-            if (endPoint.Address == null)
+            if (endPoint == null || endPoint.Address == null)
             {
                 sp.ControllingClient.SendTeleportFailed("Remote Region appears to be down");
 
@@ -692,6 +695,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // both regions
             if (sp.ParentID != (uint)0)
                 sp.StandUp();
+            else if (sp.Flying)
+                teleportFlags |= (uint)TeleportFlags.IsFlying;
 
             if (DisableInterRegionTeleportCancellation)
                 teleportFlags |= (uint)TeleportFlags.DisableCancel;
@@ -1319,11 +1324,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         #region Teleport Home
 
-        public virtual void TriggerTeleportHome(UUID id, IClientAPI client)     
-        {                                                                       
-            TeleportHome(id, client);                                           
-        }                                                                       
-                          
+        public virtual void TriggerTeleportHome(UUID id, IClientAPI client)
+        {
+            TeleportHome(id, client);
+        }
+
         public virtual bool TeleportHome(UUID id, IClientAPI client)
         {
             m_log.DebugFormat(
@@ -1334,6 +1339,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             if (uinfo != null)
             {
+                if (uinfo.HomeRegionID == UUID.Zero)
+                {
+                    // can't find the Home region: Tell viewer and abort
+                    client.SendTeleportFailed("You don't have a home position set.");
+                    return false;
+                }
                 GridRegion regionInfo = Scene.GridService.GetRegionByUUID(UUID.Zero, uinfo.HomeRegionID);
                 if (regionInfo == null)
                 {
@@ -1353,9 +1364,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
             else
             {
-                m_log.ErrorFormat(
-                    "[ENTITY TRANSFER MODULE]: No grid user information found for {0} {1}.  Cannot send home.",
-                    client.Name, client.AgentId);
+                // can't find the Home region: Tell viewer and abort
+                client.SendTeleportFailed("Your home region could not be found.");
             }
             return false;
         }
@@ -1365,15 +1375,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         #region Agent Crossings
 
-        public bool Cross(ScenePresence agent, bool isFlying)
+        public GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out uint xDest, out uint yDest, out string version, out Vector3 newpos)
         {
-            Scene scene = agent.Scene;
-            Vector3 pos = agent.AbsolutePosition;
+            version = String.Empty;
+            newpos = new Vector3(pos.X, pos.Y, pos.Z);
 
 //            m_log.DebugFormat(
 //                "[ENTITY TRANSFER MODULE]: Crossing agent {0} at pos {1} in {2}", agent.Name, pos, scene.Name);
 
-            Vector3 newpos = new Vector3(pos.X, pos.Y, pos.Z);
             uint neighbourx = scene.RegionInfo.RegionLocX;
             uint neighboury = scene.RegionInfo.RegionLocY;
             const float boundaryDistance = 1.7f;
@@ -1394,52 +1403,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 }
                 else if (scene.TestBorderCross(pos + southCross, Cardinals.S))
                 {
-                    Border b = scene.GetCrossedBorder(pos + southCross, Cardinals.S);
-                    if (b.TriggerRegionX == 0 && b.TriggerRegionY == 0)
-                    {
-                        neighboury--;
-                        newpos.Y = Constants.RegionSize - enterDistance;
-                    }
-                    else
-                    {
-                        agent.IsInTransit = true;
-
-                        neighboury = b.TriggerRegionY;
-                        neighbourx = b.TriggerRegionX;
-
-                        Vector3 newposition = pos;
-                        newposition.X += (scene.RegionInfo.RegionLocX - neighbourx) * Constants.RegionSize;
-                        newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
-                        agent.ControllingClient.SendAgentAlertMessage(
-                            String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
-                        InformClientToInitiateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
-                        return true;
-                    }
-                }
-
-                Border ba = scene.GetCrossedBorder(pos + westCross, Cardinals.W);
-                if (ba.TriggerRegionX == 0 && ba.TriggerRegionY == 0)
-                {
-                    neighbourx--;
-                    newpos.X = Constants.RegionSize - enterDistance;
-                }
-                else
-                {
-                    agent.IsInTransit = true;
-
-                    neighboury = ba.TriggerRegionY;
-                    neighbourx = ba.TriggerRegionX;
-
-                    Vector3 newposition = pos;
-                    newposition.X += (scene.RegionInfo.RegionLocX - neighbourx) * Constants.RegionSize;
-                    newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
-                    agent.ControllingClient.SendAgentAlertMessage(
-                            String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
-                    InformClientToInitiateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
-
-                    return true;
+                    neighboury--;
+                    newpos.Y = Constants.RegionSize - enterDistance;
                 }
 
+                neighbourx--;
+                newpos.X = Constants.RegionSize - enterDistance;
             }
             else if (scene.TestBorderCross(pos + eastCross, Cardinals.E))
             {
@@ -1449,26 +1418,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                 if (scene.TestBorderCross(pos + southCross, Cardinals.S))
                 {
-                    Border ba = scene.GetCrossedBorder(pos + southCross, Cardinals.S);
-                    if (ba.TriggerRegionX == 0 && ba.TriggerRegionY == 0)
-                    {
-                        neighboury--;
-                        newpos.Y = Constants.RegionSize - enterDistance;
-                    }
-                    else
-                    {
-                        agent.IsInTransit = true;
-
-                        neighboury = ba.TriggerRegionY;
-                        neighbourx = ba.TriggerRegionX;
-                        Vector3 newposition = pos;
-                        newposition.X += (scene.RegionInfo.RegionLocX - neighbourx) * Constants.RegionSize;
-                        newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
-                        agent.ControllingClient.SendAgentAlertMessage(
-                            String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
-                        InformClientToInitiateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
-                        return true;
-                    }
+                    neighboury--;
+                    newpos.Y = Constants.RegionSize - enterDistance;
                 }
                 else if (scene.TestBorderCross(pos + northCross, Cardinals.N))
                 {
@@ -1480,25 +1431,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             else if (scene.TestBorderCross(pos + southCross, Cardinals.S))
             {
                 Border b = scene.GetCrossedBorder(pos + southCross, Cardinals.S);
-                if (b.TriggerRegionX == 0 && b.TriggerRegionY == 0)
-                {
-                    neighboury--;
-                    newpos.Y = Constants.RegionSize - enterDistance;
-                }
-                else
-                {
-                    agent.IsInTransit = true;
-
-                    neighboury = b.TriggerRegionY;
-                    neighbourx = b.TriggerRegionX;
-                    Vector3 newposition = pos;
-                    newposition.X += (scene.RegionInfo.RegionLocX - neighbourx) * Constants.RegionSize;
-                    newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
-                    agent.ControllingClient.SendAgentAlertMessage(
-                            String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
-                    InformClientToInitiateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
-                    return true;
-                }
+                neighboury--;
+                newpos.Y = Constants.RegionSize - enterDistance;
             }
             else if (scene.TestBorderCross(pos + northCross, Cardinals.N))
             {
@@ -1532,19 +1466,22 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
             */
 
-            ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize));
+            xDest = neighbourx;
+            yDest = neighboury;
 
             int x = (int)(neighbourx * Constants.RegionSize), y = (int)(neighboury * Constants.RegionSize);
 
+            ulong neighbourHandle = Utils.UIntsToLong((uint)x, (uint)y);
+
             ExpiringCache<ulong, DateTime> r;
             DateTime banUntil;
 
-            if (m_bannedRegions.TryGetValue(agent.ControllingClient.AgentId, out r))
+            if (m_bannedRegions.TryGetValue(agentID, out r))
             {
                 if (r.TryGetValue(neighbourHandle, out banUntil))
                 {
                     if (DateTime.Now < banUntil)
-                        return false;
+                        return null;
                     r.Remove(neighbourHandle);
                 }
             }
@@ -1556,28 +1493,43 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             GridRegion neighbourRegion = scene.GridService.GetRegionByPosition(scene.RegionInfo.ScopeID, (int)x, (int)y);
 
             string reason;
-            string version;
-            if (!scene.SimulationService.QueryAccess(neighbourRegion, agent.ControllingClient.AgentId, newpos, out version, out reason))
+            if (!scene.SimulationService.QueryAccess(neighbourRegion, agentID, newpos, out version, out reason))
             {
-                agent.ControllingClient.SendAlertMessage("Cannot region cross into banned parcel");
                 if (r == null)
                 {
                     r = new ExpiringCache<ulong, DateTime>();
                     r.Add(neighbourHandle, DateTime.Now + TimeSpan.FromSeconds(15), TimeSpan.FromSeconds(15));
 
-                    m_bannedRegions.Add(agent.ControllingClient.AgentId, r, TimeSpan.FromSeconds(45));
+                    m_bannedRegions.Add(agentID, r, TimeSpan.FromSeconds(45));
                 }
                 else
                 {
                     r.Add(neighbourHandle, DateTime.Now + TimeSpan.FromSeconds(15), TimeSpan.FromSeconds(15));
                 }
+                return null;
+            }
+
+            return neighbourRegion;
+        }
+
+        public bool Cross(ScenePresence agent, bool isFlying)
+        {
+            uint x;
+            uint y;
+            Vector3 newpos;
+            string version;
+
+            GridRegion neighbourRegion = GetDestination(agent.Scene, agent.UUID, agent.AbsolutePosition, out x, out y, out version, out newpos);
+            if (neighbourRegion == null)
+            {
+                agent.ControllingClient.SendAlertMessage("Cannot region cross into banned parcel");
                 return false;
             }
 
             agent.IsInTransit = true;
 
             CrossAgentToNewRegionDelegate d = CrossAgentToNewRegionAsync;
-            d.BeginInvoke(agent, newpos, neighbourx, neighboury, neighbourRegion, isFlying, version, CrossAgentToNewRegionCompleted, d);
+            d.BeginInvoke(agent, newpos, neighbourRegion, isFlying, version, CrossAgentToNewRegionCompleted, d);
 
             return true;
         }
@@ -1659,52 +1611,49 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             icon.EndInvoke(iar);
         }
 
-        public delegate ScenePresence CrossAgentToNewRegionDelegate(ScenePresence agent, Vector3 pos, uint neighbourx, uint neighboury, GridRegion neighbourRegion, bool isFlying, string version);
+        public bool CrossAgentToNewRegionPrep(ScenePresence agent, GridRegion neighbourRegion)
+        {
+            if (neighbourRegion == null)
+                return false;
+            
+            m_entityTransferStateMachine.SetInTransit(agent.UUID);
+
+            agent.RemoveFromPhysicalScene();
+
+            return true;
+        }
 
         /// <summary>
         /// This Closes child agents on neighbouring regions
         /// Calls an asynchronous method to do so..  so it doesn't lag the sim.
         /// </summary>
-        protected ScenePresence CrossAgentToNewRegionAsync(
-            ScenePresence agent, Vector3 pos, uint neighbourx, uint neighboury, GridRegion neighbourRegion,
+        public ScenePresence CrossAgentToNewRegionAsync(
+            ScenePresence agent, Vector3 pos, GridRegion neighbourRegion,
             bool isFlying, string version)
         {
-            if (neighbourRegion == null)
+            if (!CrossAgentToNewRegionPrep(agent, neighbourRegion))
+            {
+                m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
                 return agent;
+            }
 
-            if (!m_entityTransferStateMachine.SetInTransit(agent.UUID))
+            if (!CrossAgentIntoNewRegionMain(agent, pos, neighbourRegion, isFlying))
             {
-                m_log.ErrorFormat(
-                    "[ENTITY TRANSFER MODULE]: Problem crossing user {0} to new region {1} from {2} - agent is already in transit",
-                    agent.Name, neighbourRegion.RegionName, agent.Scene.RegionInfo.RegionName);
+                m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
                 return agent;
             }
 
-            bool transitWasReset = false;
+            CrossAgentToNewRegionPost(agent, pos, neighbourRegion, isFlying, version);
+            return agent;
+        }
 
+        public bool CrossAgentIntoNewRegionMain(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying)
+        {
             try
             {
-                ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize));
-
-                m_log.DebugFormat(
-                    "[ENTITY TRANSFER MODULE]: Crossing agent {0} {1} to {2}-{3} running version {4}",
-                    agent.Firstname, agent.Lastname, neighbourx, neighboury, version);
-
-                Scene m_scene = agent.Scene;
-
-                if (!agent.ValidateAttachments())
-                    m_log.DebugFormat(
-                        "[ENTITY TRANSFER MODULE]: Failed validation of all attachments for region crossing of {0} from {1} to {2}.  Continuing.",
-                        agent.Name, agent.Scene.RegionInfo.RegionName, neighbourRegion.RegionName);
-
-                pos = pos + agent.Velocity;
-                Vector3 vel2 = new Vector3(agent.Velocity.X, agent.Velocity.Y, 0);
-
-                agent.RemoveFromPhysicalScene();
-
-                AgentData cAgent = new AgentData();
+                AgentData cAgent = new AgentData(); 
                 agent.CopyTo(cAgent);
-                cAgent.Position = pos;
+                cAgent.Position = pos + agent.Velocity;
                 if (isFlying)
                     cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
 
@@ -1714,7 +1663,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 // Beyond this point, extra cleanup is needed beyond removing transit state
                 m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.Transferring);
 
-                if (!m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent))
+                if (!agent.Scene.SimulationService.UpdateAgent(neighbourRegion, cAgent))
                 {
                     // region doesn't take it
                     m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp);
@@ -1726,88 +1675,108 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     ReInstantiateScripts(agent);
                     agent.AddToPhysicalScene(isFlying);
 
-                    return agent;
+                    return false;
                 }
 
-                //m_log.Debug("BEFORE CROSS");
-                //Scene.DumpChildrenSeeds(UUID);
-                //DumpKnownRegions();
-                string agentcaps;
-                if (!agent.KnownRegions.TryGetValue(neighbourRegion.RegionHandle, out agentcaps))
-                {
-                    m_log.ErrorFormat("[ENTITY TRANSFER MODULE]: No ENTITY TRANSFER MODULE information for region handle {0}, exiting CrossToNewRegion.",
-                                     neighbourRegion.RegionHandle);
-                    return agent;
-                }
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat(
+                    "[ENTITY TRANSFER MODULE]: Problem crossing user {0} to new region {1} from {2}.  Exception {3}{4}",
+                    agent.Name, neighbourRegion.RegionName, agent.Scene.RegionInfo.RegionName, e.Message, e.StackTrace);
 
-                // No turning back
-                agent.IsChildAgent = true;
+                // TODO: Might be worth attempting other restoration here such as reinstantiation of scripts, etc.
+                return false;
+            }
 
-                string capsPath = neighbourRegion.ServerURI + CapsUtil.GetCapsSeedPath(agentcaps);
+            return true;
+        }
 
-                m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID);
+        public void CrossAgentToNewRegionPost(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion,
+            bool isFlying, string version)
+        {
+            agent.ControllingClient.RequestClientInfo();
 
-                if (m_eqModule != null)
-                {
-                    m_eqModule.CrossRegion(
-                        neighbourHandle, pos, vel2 /* agent.Velocity */, neighbourRegion.ExternalEndPoint,
-                        capsPath, agent.UUID, agent.ControllingClient.SessionId);
-                }
-                else
-                {
-                    agent.ControllingClient.CrossRegion(neighbourHandle, pos, agent.Velocity, neighbourRegion.ExternalEndPoint,
-                                                capsPath);
-                }
+            string agentcaps;
+            if (!agent.KnownRegions.TryGetValue(neighbourRegion.RegionHandle, out agentcaps))
+            {
+                m_log.ErrorFormat("[ENTITY TRANSFER MODULE]: No ENTITY TRANSFER MODULE information for region handle {0}, exiting CrossToNewRegion.",
+                                 neighbourRegion.RegionHandle);
+                return;
+            }
 
-                // SUCCESS!
-                m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.ReceivedAtDestination);
+            // No turning back
+            agent.IsChildAgent = true;
 
-                // Unlike a teleport, here we do not wait for the destination region to confirm the receipt.
-                m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp);
+            string capsPath = neighbourRegion.ServerURI + CapsUtil.GetCapsSeedPath(agentcaps);
 
-                agent.MakeChildAgent();
+            m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID);
 
-                // FIXME: Possibly this should occur lower down after other commands to close other agents,
-                // but not sure yet what the side effects would be.
-                m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
-                transitWasReset = true;
+            Vector3 vel2 = new Vector3(agent.Velocity.X, agent.Velocity.Y, 0);
+
+            if (m_eqModule != null)
+            {
+                m_eqModule.CrossRegion(
+                    neighbourRegion.RegionHandle, pos + agent.Velocity, vel2 /* agent.Velocity */, neighbourRegion.ExternalEndPoint,
+                    capsPath, agent.UUID, agent.ControllingClient.SessionId);
+            }
+            else
+            {
+                agent.ControllingClient.CrossRegion(neighbourRegion.RegionHandle, pos + agent.Velocity, agent.Velocity, neighbourRegion.ExternalEndPoint,
+                                            capsPath);
+            }
 
-                // now we have a child agent in this region. Request all interesting data about other (root) agents
-                agent.SendOtherAgentsAvatarDataToMe();
-                agent.SendOtherAgentsAppearanceToMe();
+            // SUCCESS!
+            m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.ReceivedAtDestination);
 
-                // Backwards compatibility. Best effort
-                if (version == "Unknown" || version == string.Empty)
-                {
-                    m_log.DebugFormat("[ENTITY TRANSFER MODULE]: neighbor with old version, passing attachments one by one...");
-                    Thread.Sleep(3000); // wait a little now that we're not waiting for the callback
-                    CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true);
-                }
+            // Unlike a teleport, here we do not wait for the destination region to confirm the receipt.
+            m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp);
 
-                // Next, let's close the child agent connections that are too far away.
-                agent.CloseChildAgents(neighbourx, neighboury);
+            agent.MakeChildAgent();
 
-                AgentHasMovedAway(agent, false);
-    
-                //m_log.Debug("AFTER CROSS");
-                //Scene.DumpChildrenSeeds(UUID);
-                //DumpKnownRegions();
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat(
-                    "[ENTITY TRANSFER MODULE]: Problem crossing user {0} to new region {1} from {2}.  Exception {3}{4}",
-                    agent.Name, neighbourRegion.RegionName, agent.Scene.RegionInfo.RegionName, e.Message, e.StackTrace);
+            // FIXME: Possibly this should occur lower down after other commands to close other agents,
+            // but not sure yet what the side effects would be.
+            m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
 
-                // TODO: Might be worth attempting other restoration here such as reinstantiation of scripts, etc.
-            }
-            finally
+            // now we have a child agent in this region. Request all interesting data about other (root) agents
+            agent.SendOtherAgentsAvatarDataToMe();
+            agent.SendOtherAgentsAppearanceToMe();
+
+            // Backwards compatibility. Best effort
+            if (version == "Unknown" || version == string.Empty)
             {
-                if (!transitWasReset)
-                    m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
+                m_log.DebugFormat("[ENTITY TRANSFER MODULE]: neighbor with old version, passing attachments one by one...");
+                Thread.Sleep(3000); // wait a little now that we're not waiting for the callback
+                CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true);
             }
 
-            return agent;
+            // Next, let's close the child agent connections that are too far away.
+            uint neighbourx;
+            uint neighboury;
+
+            Utils.LongToUInts(neighbourRegion.RegionHandle, out neighbourx, out neighboury);
+
+            neighbourx /= Constants.RegionSize;
+            neighboury /= Constants.RegionSize;
+
+            agent.CloseChildAgents(neighbourx, neighboury);
+
+            AgentHasMovedAway(agent, false);
+
+            // the user may change their profile information in other region,
+            // so the userinfo in UserProfileCache is not reliable any more, delete it
+            // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE!
+//            if (agent.Scene.NeedSceneCacheClear(agent.UUID))
+//            {
+//                m_log.DebugFormat(
+//                    "[ENTITY TRANSFER MODULE]: User {0} is going to another region", agent.UUID);
+//            }
+
+            //m_log.Debug("AFTER CROSS");
+            //Scene.DumpChildrenSeeds(UUID);
+            //DumpKnownRegions();
+
+            return;
         }
          
         private void CrossAgentToNewRegionCompleted(IAsyncResult iar)
@@ -1878,10 +1847,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 agent.Id0 = currentAgentCircuit.Id0;
             }
 
-            InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
-            d.BeginInvoke(sp, agent, region, region.ExternalEndPoint, true,
+            IPEndPoint external = region.ExternalEndPoint;
+            if (external != null)
+            {
+                InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
+                d.BeginInvoke(sp, agent, region, external, true,
                           InformClientOfNeighbourCompleted,
                           d);
+            }
         }
         #endregion
 
@@ -2478,30 +2451,31 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             Utils.LongToUInts(newRegionHandle, out x, out y);
             GridRegion destination = scene.GridService.GetRegionByPosition(scene.RegionInfo.ScopeID, (int)x, (int)y);
 
-            if (destination == null || !CrossPrimGroupIntoNewRegion(destination, pos, grp, silent))
+            if (destination != null)
             {
-                m_log.InfoFormat("[ENTITY TRANSFER MODULE] cross region transfer failed for object {0}",grp.UUID);
+                if (CrossPrimGroupIntoNewRegion(destination, pos, grp, silent))
+                    return; // we did it
+            }
 
-                // We are going to move the object back to the old position so long as the old position
-                // is in the region
-                oldGroupPosition.X = Util.Clamp<float>(oldGroupPosition.X,1.0f,(float)Constants.RegionSize-1);
-                oldGroupPosition.Y = Util.Clamp<float>(oldGroupPosition.Y,1.0f,(float)Constants.RegionSize-1);
-                oldGroupPosition.Z = Util.Clamp<float>(oldGroupPosition.Z,1.0f,4096.0f);
+            // no one or failed lets go back and tell physics to go on
+            oldGroupPosition.X = Util.Clamp<float>(oldGroupPosition.X, 0.5f, (float)Constants.RegionSize - 0.5f);
+            oldGroupPosition.Y = Util.Clamp<float>(oldGroupPosition.Y, 0.5f, (float)Constants.RegionSize - 0.5f);
+            oldGroupPosition.Z = Util.Clamp<float>(oldGroupPosition.Z, 0.5f, 4096.0f);
 
-                grp.RootPart.GroupPosition = oldGroupPosition;
+            grp.AbsolutePosition = oldGroupPosition;
+            grp.Velocity = Vector3.Zero;
 
-                // Need to turn off the physics flags, otherwise the object will continue to attempt to
-                // move out of the region creating an infinite loop of failed attempts to cross
-                grp.UpdatePrimFlags(grp.RootPart.LocalId,false,grp.IsTemporary,grp.IsPhantom,false);
+            if (grp.RootPart.PhysActor != null)
+                grp.RootPart.PhysActor.CrossingFailure();
 
-                if (grp.RootPart.KeyframeMotion != null)
-                    grp.RootPart.KeyframeMotion.CrossingFailure();
+            if (grp.RootPart.KeyframeMotion != null)
+                grp.RootPart.KeyframeMotion.CrossingFailure();
 
-                grp.ScheduleGroupForFullUpdate();
-            }
+            grp.ScheduleGroupForFullUpdate();
         }
 
 
+
         /// <summary>
         /// Move the given scene object into a new region
         /// </summary>
@@ -2552,17 +2526,30 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                             grp, e);
                     }
                 }
+/*
+ * done on caller ( not in attachments crossing for now)
                 else
                 {
+
                     if (!grp.IsDeleted)
                     {
                         PhysicsActor pa = grp.RootPart.PhysActor;
                         if (pa != null)
+                        {
                             pa.CrossingFailure();
+                            if (grp.RootPart.KeyframeMotion != null)
+                            {
+                                // moved to KeyframeMotion.CrossingFailure
+//                                grp.RootPart.Velocity = Vector3.Zero;
+                                grp.RootPart.KeyframeMotion.CrossingFailure();
+//                                grp.SendGroupRootTerseUpdate();
+                            }
+                        }
                     }
 
                     m_log.ErrorFormat("[ENTITY TRANSFER MODULE]: Prim crossing failed for {0}", grp);
                 }
+ */
             }
             else
             {
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 1c43a25..1949a90 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -35,6 +35,8 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
+    public delegate ScenePresence CrossAgentToNewRegionDelegate(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
+
     public interface IEntityTransferModule
     {
         /// <summary>
@@ -50,30 +52,11 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name='teleportFlags'></param>
         void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, Vector3 lookAt, uint teleportFlags);
 
-        /// <summary>
-        /// Teleport an agent directly to a given region without checking whether the region should be subsituted.
-        /// </summary>
-        /// <remarks>
-        /// Please use Teleport() instead unless you know exactly what you're doing.
-        /// Do not use for same region teleports.
-        /// </remarks>
-        /// <param name='sp'></param>
-        /// <param name='reg'></param>
-        /// <param name='finalDestination'>/param>
-        /// <param name='position'></param>
-        /// <param name='lookAt'></param>
-        /// <param name='teleportFlags'></param>
-        void DoTeleport(
-            ScenePresence sp, GridRegion reg, GridRegion finalDestination,
-            Vector3 position, Vector3 lookAt, uint teleportFlags);
-
-        /// <summary>
-        /// Teleports the agent for the given client to their home destination.
-        /// </summary>
-        /// <param name='id'></param>
-        /// <param name='client'></param>
         bool TeleportHome(UUID id, IClientAPI client);
 
+        void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination,
+            Vector3 position, Vector3 lookAt, uint teleportFlags);
+
         /// <summary>
         /// Show whether the given agent is being teleported.
         /// </summary>
@@ -89,7 +72,12 @@ namespace OpenSim.Region.Framework.Interfaces
 
         void EnableChildAgent(ScenePresence agent, GridRegion region);
 
+        GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out uint xDest, out uint yDest, out string version, out Vector3 newpos);
+
         void Cross(SceneObjectGroup sog, Vector3 position, bool silent);
+
+        ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
+
     }
 
     public interface IUserAgentVerificationModule
-- 
cgit v1.1


From 5b73b9c4a85335ba837280688b903fef44be8f35 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 11 Dec 2013 01:39:56 +0000
Subject: Committing the Avination Scene Presence and related texture code -
 Parts of region crossing code - New bakes handling code - Bakes now sent from
 sim to sim without central storage - Appearance handling changes - Some
 changes to sitting - A number of unrelated fixes and improvements

---
 OpenSim/Framework/AvatarAppearance.cs              |  313 ++++--
 OpenSim/Framework/ChildAgentDataUpdate.cs          |   18 +-
 OpenSim/Framework/IClientAPI.cs                    |    2 +-
 OpenSim/Framework/IImprovedAssetCache.cs           |    1 +
 OpenSim/Framework/ILandObject.cs                   |    1 +
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  |   17 +-
 .../Region/CoreModules/Asset/CenomeAssetCache.cs   |    6 +
 OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs |    4 +
 .../Region/CoreModules/Asset/FlotsamAssetCache.cs  |  169 +++-
 .../CoreModules/Asset/GlynnTuckerAssetCache.cs     |    5 +
 .../Avatar/AvatarFactory/AvatarFactoryModule.cs    |  556 +++++++++--
 .../Tests/AvatarFactoryModuleTests.cs              |    8 +-
 .../Region/CoreModules/World/Land/LandObject.cs    |   13 +
 .../Framework/Interfaces/IAvatarFactoryModule.cs   |    6 +-
 .../Region/Framework/Scenes/SceneObjectGroup.cs    |   42 +
 OpenSim/Region/Framework/Scenes/ScenePresence.cs   | 1019 +++++++++++++-------
 .../Server/IRCClientView.cs                        |    2 +-
 .../World/NPC/Tests/NPCModuleTests.cs              |    2 +
 OpenSim/Tests/Performance/NPCPerformanceTests.cs   |    4 +-
 19 files changed, 1595 insertions(+), 593 deletions(-)

diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 157feb5..b7a0adf 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -40,8 +40,17 @@ namespace OpenSim.Framework
     /// </summary>
     public class AvatarAppearance
     {
+        // SL box diferent to size
+        const float AVBOXAJUST = 0.2f;
+        // constrains  for ubitode physics
+        const float AVBOXMINX = 0.2f;
+        const float AVBOXMINY = 0.3f;
+        const float AVBOXMINZ = 1.2f;
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        // this is viewer capabilities and weared things dependent
+        // should be only used as initial default value ( V1 viewers )
         public readonly static int VISUALPARAM_COUNT = 218;
 
         public readonly static int TEXTURE_COUNT = 21;
@@ -53,7 +62,12 @@ namespace OpenSim.Framework
         protected AvatarWearable[] m_wearables;
         protected Dictionary<int, List<AvatarAttachment>> m_attachments;
         protected float m_avatarHeight = 0;
-        protected UUID[] m_texturehashes;
+        protected Vector3 m_avatarSize = new Vector3(0.45f, 0.6f, 1.9f); // sl Z cloud value
+        protected Vector3 m_avatarBoxSize = new Vector3(0.45f, 0.6f, 1.9f);
+        protected float m_avatarFeetOffset = 0;
+        protected float m_avatarAnimOffset = 0;
+        protected WearableCacheItem[] m_cacheitems;
+        protected bool m_cacheItemsDirty = true;
 
         public virtual int Serial
         {
@@ -67,6 +81,21 @@ namespace OpenSim.Framework
             set { m_visualparams = value; }
         }
 
+        public virtual Vector3 AvatarSize
+        {
+            get { return m_avatarSize; }
+        }
+
+        public virtual Vector3 AvatarBoxSize
+        {
+            get { return m_avatarBoxSize; }
+        }
+
+        public virtual float AvatarFeetOffset
+        {
+            get { return m_avatarFeetOffset + m_avatarAnimOffset; }
+        }
+
         public virtual Primitive.TextureEntry Texture
         {
             get { return m_texture; }
@@ -88,6 +117,18 @@ namespace OpenSim.Framework
             get { return m_avatarHeight; }
             set { m_avatarHeight = value; }
         }
+        
+        public virtual WearableCacheItem[] WearableCacheItems
+        {
+            get { return m_cacheitems; }
+            set { m_cacheitems = value; }
+        }
+
+        public virtual bool WearableCacheItemsDirty
+        {
+            get { return m_cacheItemsDirty; }
+            set { m_cacheItemsDirty = value; }
+        }
 
         public AvatarAppearance()
         {
@@ -97,10 +138,9 @@ namespace OpenSim.Framework
             SetDefaultWearables();
             SetDefaultTexture();
             SetDefaultParams();
-            SetHeight();
+//            SetHeight();
+            SetSize(new Vector3(0.45f,0.6f,1.9f));
             m_attachments = new Dictionary<int, List<AvatarAttachment>>();
-
-            ResetTextureHashes();
         }
 
         public AvatarAppearance(OSDMap map)
@@ -108,7 +148,35 @@ namespace OpenSim.Framework
 //            m_log.WarnFormat("[AVATAR APPEARANCE]: create appearance from OSDMap");
 
             Unpack(map);
-            SetHeight();
+//            SetHeight(); done in Unpack
+        }
+
+        public AvatarAppearance(AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams)
+        {
+//            m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance");
+
+            m_serial = 0;
+
+            if (wearables != null)
+                m_wearables = wearables;
+            else
+                SetDefaultWearables();
+
+            if (textureEntry != null)
+                m_texture = textureEntry;
+            else
+                SetDefaultTexture();
+
+            if (visualParams != null)
+                m_visualparams = visualParams;
+            else
+                SetDefaultParams();
+
+//            SetHeight();
+            if(m_avatarHeight == 0)
+                SetSize(new Vector3(0.45f,0.6f,1.9f));
+
+            m_attachments = new Dictionary<int, List<AvatarAttachment>>();
         }
 
         public AvatarAppearance(AvatarAppearance appearance) : this(appearance, true)
@@ -125,11 +193,10 @@ namespace OpenSim.Framework
                 SetDefaultWearables();
                 SetDefaultTexture();
                 SetDefaultParams();
-                SetHeight();
+//                SetHeight();
+                SetSize(new Vector3(0.45f, 0.6f, 1.9f));
                 m_attachments = new Dictionary<int, List<AvatarAttachment>>();
 
-                ResetTextureHashes();
-                
                 return;
             }
 
@@ -145,10 +212,6 @@ namespace OpenSim.Framework
                     SetWearable(i,appearance.Wearables[i]);
             }
 
-            m_texturehashes = new UUID[AvatarAppearance.TEXTURE_COUNT];
-            for (int i = 0; i < AvatarAppearance.TEXTURE_COUNT; i++)
-                m_texturehashes[i] = new UUID(appearance.m_texturehashes[i]);
-
             m_texture = null;
             if (appearance.Texture != null)
             {
@@ -160,7 +223,8 @@ namespace OpenSim.Framework
             if (appearance.VisualParams != null)
                 m_visualparams = (byte[])appearance.VisualParams.Clone();
 
-            m_avatarHeight = appearance.m_avatarHeight;
+//            m_avatarHeight = appearance.m_avatarHeight;
+            SetSize(appearance.AvatarSize);
 
             // Copy the attachment, force append mode since that ensures consistency
             m_attachments = new Dictionary<int, List<AvatarAttachment>>();
@@ -183,37 +247,6 @@ namespace OpenSim.Framework
             }
         }
 
-        public void ResetTextureHashes()
-        {
-            m_texturehashes = new UUID[AvatarAppearance.TEXTURE_COUNT];
-            for (uint i = 0; i < AvatarAppearance.TEXTURE_COUNT; i++)
-                m_texturehashes[i] = UUID.Zero;
-        }
-                
-        public UUID GetTextureHash(int textureIndex)
-        {
-            return m_texturehashes[NormalizeBakedTextureIndex(textureIndex)];
-        }
-        
-        public void SetTextureHash(int textureIndex, UUID textureHash)
-        {
-            m_texturehashes[NormalizeBakedTextureIndex(textureIndex)] = new UUID(textureHash);
-        }
-        
-        /// <summary>
-        /// Normalizes the texture index to the actual bake index, this is done to
-        /// accommodate older viewers that send the BAKE_INDICES index rather than
-        /// the actual texture index
-        /// </summary>
-        private int NormalizeBakedTextureIndex(int textureIndex)
-        {
-            // Earlier viewer send the index into the baked index array, just trying to be careful here
-            if (textureIndex < BAKE_INDICES.Length)
-                return BAKE_INDICES[textureIndex];
-            
-            return textureIndex;
-        }
-        
         public void ClearWearables()
         {
             m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES];
@@ -237,7 +270,12 @@ namespace OpenSim.Framework
             m_serial = 0;
 
             SetDefaultTexture();
-            ResetTextureHashes();
+            
+            //for (int i = 0; i < BAKE_INDICES.Length; i++)
+            // {
+            //     int idx = BAKE_INDICES[i];
+            //     m_texture.FaceTextures[idx].TextureID = UUID.Zero;
+            // }
         }
         
         protected virtual void SetDefaultParams()
@@ -249,6 +287,21 @@ namespace OpenSim.Framework
 //            }
         }
 
+        /// <summary>
+        /// Invalidate all of the baked textures in the appearance, useful
+        /// if you know that none are valid
+        /// </summary>
+        public virtual void ResetBakedTextures()
+        {
+            SetDefaultTexture();
+            
+            //for (int i = 0; i < BAKE_INDICES.Length; i++)
+            // {
+            //     int idx = BAKE_INDICES[i];
+            //     m_texture.FaceTextures[idx].TextureID = UUID.Zero;
+            // }
+        }
+        
         protected virtual void SetDefaultTexture()
         {
             m_texture = new Primitive.TextureEntry(new UUID(AppearanceManager.DEFAULT_AVATAR_TEXTURE));
@@ -313,22 +366,33 @@ namespace OpenSim.Framework
             // made. We determine if any of the visual parameters actually
             // changed to know if the appearance should be saved later
             bool changed = false;
-            for (int i = 0; i < AvatarAppearance.VISUALPARAM_COUNT; i++)
+
+            int newsize = visualParams.Length;
+
+            if (newsize != m_visualparams.Length)
+            {
+                changed = true;
+                m_visualparams = (byte[])visualParams.Clone();
+            }
+            else
             {
-                if (visualParams[i] != m_visualparams[i])
+
+                for (int i = 0; i < newsize; i++)
                 {
-// DEBUG ON
-//                    m_log.WarnFormat("[AVATARAPPEARANCE] vparams changed [{0}] {1} ==> {2}",
-//                                     i,m_visualparams[i],visualParams[i]);
-// DEBUG OFF
-                    m_visualparams[i] = visualParams[i];
-                    changed = true;
+                    if (visualParams[i] != m_visualparams[i])
+                    {
+                        // DEBUG ON
+                        //                    m_log.WarnFormat("[AVATARAPPEARANCE] vparams changed [{0}] {1} ==> {2}",
+                        //                                     i,m_visualparams[i],visualParams[i]);
+                        // DEBUG OFF
+                        m_visualparams[i] = visualParams[i];
+                        changed = true;
+                    }
                 }
             }
-
             // Reset the height if the visual parameters actually changed
-            if (changed)
-                SetHeight();
+//           if (changed)
+//                SetHeight();
 
             return changed;
         }
@@ -344,6 +408,7 @@ namespace OpenSim.Framework
         /// </summary>
         public virtual void SetHeight()
         {
+/*
             // Start with shortest possible female avatar height
             m_avatarHeight = 1.14597f;
             // Add offset for male avatars
@@ -356,6 +421,35 @@ namespace OpenSim.Framework
                             + 0.07f     * (float)m_visualparams[(int)VPElement.SHOES_PLATFORM_HEIGHT] / 255.0f
                             + 0.08f     * (float)m_visualparams[(int)VPElement.SHOES_HEEL_HEIGHT]     / 255.0f
                             + 0.076f    * (float)m_visualparams[(int)VPElement.SHAPE_NECK_LENGTH]     / 255.0f;
+*/
+        }
+
+        public void SetSize(Vector3 avSize)
+        {
+            if (avSize.X > 32f)
+                avSize.X = 32f;
+            else if (avSize.X < 0.1f)
+                avSize.X = 0.1f;
+
+            if (avSize.Y > 32f)
+                avSize.Y = 32f;
+            else if (avSize.Y < 0.1f)
+                avSize.Y = 0.1f;
+            if (avSize.Z > 32f)
+                avSize.Z = 32f;
+            else if (avSize.Z < 0.1f)
+                avSize.Z = 0.1f;
+
+            m_avatarSize = avSize;
+            m_avatarBoxSize = avSize;
+            m_avatarBoxSize.Z += AVBOXAJUST;
+            if (m_avatarBoxSize.X < AVBOXMINX)
+                m_avatarBoxSize.X = AVBOXMINX;
+            if (m_avatarBoxSize.Y < AVBOXMINY)
+                m_avatarBoxSize.Y = AVBOXMINY;
+            if (m_avatarBoxSize.Z < AVBOXMINZ)
+                m_avatarBoxSize.Z = AVBOXMINZ;
+            m_avatarHeight = m_avatarSize.Z;
         }
 
         public virtual void SetWearable(int wearableId, AvatarWearable wearable)
@@ -386,7 +480,8 @@ namespace OpenSim.Framework
             }
 
             s += "Visual Params: ";
-            for (uint j = 0; j < AvatarAppearance.VISUALPARAM_COUNT; j++)
+            //            for (uint j = 0; j < AvatarAppearance.VISUALPARAM_COUNT; j++)
+            for (uint j = 0; j < m_visualparams.Length; j++)
                 s += String.Format("{0},",m_visualparams[j]);
             s += "\n";
 
@@ -402,18 +497,16 @@ namespace OpenSim.Framework
         /// </remarks>
         public List<AvatarAttachment> GetAttachments()
         {
-            List<AvatarAttachment> alist = new List<AvatarAttachment>();
-
             lock (m_attachments)
             {
+				List<AvatarAttachment> alist = new List<AvatarAttachment>();
                 foreach (KeyValuePair<int, List<AvatarAttachment>> kvp in m_attachments)
                 {
                     foreach (AvatarAttachment attach in kvp.Value)
                         alist.Add(new AvatarAttachment(attach));
                 }
-            }
-
-            return alist;
+				return alist;
+			}
         }
 
         internal void AppendAttachment(AvatarAttachment attach)
@@ -557,7 +650,6 @@ namespace OpenSim.Framework
                         return kvp.Key;
                 }
             }
-
             return 0;
         }
 
@@ -607,12 +699,6 @@ namespace OpenSim.Framework
             data["serial"] = OSD.FromInteger(m_serial);
             data["height"] = OSD.FromReal(m_avatarHeight);
 
-            // Hashes
-            OSDArray hashes = new OSDArray(AvatarAppearance.TEXTURE_COUNT);
-            for (uint i = 0; i < AvatarAppearance.TEXTURE_COUNT; i++)
-                hashes.Add(OSD.FromUUID(m_texturehashes[i]));
-            data["hashes"] = hashes;
-
             // Wearables
             OSDArray wears = new OSDArray(AvatarWearable.MAX_WEARABLES);
             for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
@@ -634,12 +720,14 @@ namespace OpenSim.Framework
             OSDBinary visualparams = new OSDBinary(m_visualparams);
             data["visualparams"] = visualparams;
 
-            // Attachments
-            List<AvatarAttachment> attachments = GetAttachments();
-            OSDArray attachs = new OSDArray(attachments.Count);
-            foreach (AvatarAttachment attach in GetAttachments())
-                attachs.Add(attach.Pack());
-            data["attachments"] = attachs;
+            lock (m_attachments)
+            {
+                // Attachments
+                OSDArray attachs = new OSDArray(m_attachments.Count);
+                foreach (AvatarAttachment attach in GetAttachments())
+                    attachs.Add(attach.Pack());
+                data["attachments"] = attachs;
+            }
 
             return data;
         }
@@ -653,29 +741,11 @@ namespace OpenSim.Framework
             if ((data != null) && (data["serial"] != null))
                 m_serial = data["serial"].AsInteger();
             if ((data != null) && (data["height"] != null))
-                m_avatarHeight = (float)data["height"].AsReal();
+//                m_avatarHeight = (float)data["height"].AsReal();
+                SetSize(new Vector3(0.45f,0.6f, (float)data["height"].AsReal()));
 
             try
             {
-                // Hashes
-                m_texturehashes = new UUID[AvatarAppearance.TEXTURE_COUNT];
-                if ((data != null) && (data["hashes"] != null) && (data["hashes"]).Type == OSDType.Array)
-                {
-                    OSDArray hashes = (OSDArray)(data["hashes"]);
-                    for (int i = 0; i < AvatarAppearance.TEXTURE_COUNT; i++)
-                    {
-                        UUID hashID = UUID.Zero;
-                        if (i < hashes.Count && hashes[i] != null)
-                            hashID = hashes[i].AsUUID();
-                        m_texturehashes[i] = hashID;
-                    }
-                }
-                else
-                {
-                    for (uint i = 0; i < AvatarAppearance.TEXTURE_COUNT; i++)
-                        m_texturehashes[i] = UUID.Zero;
-                }
-                
                 // Wearables
                 SetDefaultWearables();
                 if ((data != null) && (data["wearables"] != null) && (data["wearables"]).Type == OSDType.Array)
@@ -1505,7 +1575,58 @@ namespace OpenSim.Framework
             SHAPE_EYELID_INNER_CORNER_UP = 214,
             SKIRT_SKIRT_RED = 215,
             SKIRT_SKIRT_GREEN = 216,
-            SKIRT_SKIRT_BLUE = 217
+            SKIRT_SKIRT_BLUE = 217, 
+
+            /// <summary>
+            /// Avatar Physics section.  These are 0 type visual params which get transmitted.
+            /// </summary>
+
+            /// <summary>
+            /// Breast Part 1 
+            /// </summary>
+            BREAST_PHYSICS_MASS = 218,
+            BREAST_PHYSICS_GRAVITY = 219,
+            BREAST_PHYSICS_DRAG = 220,
+            BREAST_PHYSICS_UPDOWN_MAX_EFFECT = 221,
+            BREAST_PHYSICS_UPDOWN_SPRING = 222,
+            BREAST_PHYSICS_UPDOWN_GAIN = 223,
+            BREAST_PHYSICS_UPDOWN_DAMPING = 224,
+            BREAST_PHYSICS_INOUT_MAX_EFFECT = 225,
+            BREAST_PHYSICS_INOUT_SPRING = 226,
+            BREAST_PHYSICS_INOUT_GAIN = 227,
+            BREAST_PHYSICS_INOUT_DAMPING = 228,
+            /// <summary>
+            /// Belly
+            /// </summary>
+            BELLY_PHYISCS_MASS = 229,
+            BELLY_PHYSICS_GRAVITY = 230,
+            BELLY_PHYSICS_DRAG = 231,
+            BELLY_PHYISCS_UPDOWN_MAX_EFFECT = 232,
+            BELLY_PHYSICS_UPDOWN_SPRING = 233,
+            BELLY_PHYSICS_UPDOWN_GAIN = 234,
+            BELLY_PHYSICS_UPDOWN_DAMPING = 235,
+
+            /// <summary>
+            /// Butt
+            /// </summary>
+            BUTT_PHYSICS_MASS = 236,
+            BUTT_PHYSICS_GRAVITY = 237,
+            BUTT_PHYSICS_DRAG = 238,
+            BUTT_PHYSICS_UPDOWN_MAX_EFFECT = 239,
+            BUTT_PHYSICS_UPDOWN_SPRING = 240,
+            BUTT_PHYSICS_UPDOWN_GAIN = 241,
+            BUTT_PHYSICS_UPDOWN_DAMPING = 242,
+            BUTT_PHYSICS_LEFTRIGHT_MAX_EFFECT = 243,
+            BUTT_PHYSICS_LEFTRIGHT_SPRING = 244,
+            BUTT_PHYSICS_LEFTRIGHT_GAIN = 245,
+            BUTT_PHYSICS_LEFTRIGHT_DAMPING = 246,
+            /// <summary>
+            /// Breast Part 2
+            /// </summary>
+            BREAST_PHYSICS_LEFTRIGHT_MAX_EFFECT = 247,
+            BREAST_PHYSICS_LEFTRIGHT_SPRING= 248,
+            BREAST_PHYSICS_LEFTRIGHT_GAIN = 249,
+            BREAST_PHYSICS_LEFTRIGHT_DAMPING = 250
         }
         #endregion
     }
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 18d008c..2a8e67d 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -230,12 +230,14 @@ namespace OpenSim.Framework
 
     public class ControllerData
     {
+        public UUID ObjectID;
         public UUID ItemID;
         public uint IgnoreControls;
         public uint EventControls;
 
-        public ControllerData(UUID item, uint ignore, uint ev)
+        public ControllerData(UUID obj, UUID item, uint ignore, uint ev)
         {
+            ObjectID = obj;
             ItemID = item;
             IgnoreControls = ignore;
             EventControls = ev;
@@ -249,6 +251,7 @@ namespace OpenSim.Framework
         public OSDMap PackUpdateMessage()
         {
             OSDMap controldata = new OSDMap();
+            controldata["object"] = OSD.FromUUID(ObjectID);
             controldata["item"] = OSD.FromUUID(ItemID);
             controldata["ignore"] = OSD.FromInteger(IgnoreControls);
             controldata["event"] = OSD.FromInteger(EventControls);
@@ -259,6 +262,8 @@ namespace OpenSim.Framework
 
         public void UnpackUpdateMessage(OSDMap args)
         {
+            if (args["object"] != null)
+                ObjectID = args["object"].AsUUID();
             if (args["item"] != null)
                 ItemID = args["item"].AsUUID();
             if (args["ignore"] != null)
@@ -317,6 +322,8 @@ namespace OpenSim.Framework
         public Animation AnimState = null;
 
         public UUID GranterID;
+        public UUID ParentPart;
+        public Vector3 SitOffset;
 
         // Appearance
         public AvatarAppearance Appearance;
@@ -488,6 +495,10 @@ namespace OpenSim.Framework
                 }
                 args["attach_objects"] = attObjs;
             }
+
+            args["parent_part"] = OSD.FromUUID(ParentPart);
+            args["sit_offset"] = OSD.FromString(SitOffset.ToString());
+
             return args;
         }
 
@@ -719,6 +730,11 @@ namespace OpenSim.Framework
                     }
                 }
             }
+
+            if (args["parent_part"] != null)
+                ParentPart = args["parent_part"].AsUUID();
+            if (args["sit_offset"] != null)
+                Vector3.TryParse(args["sit_offset"].AsString(), out SitOffset);
         }
 
         public AgentData()
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 98358e5..e36edb2 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Framework
 
     public delegate void CachedTextureRequest(IClientAPI remoteClient, int serial, List<CachedTextureRequestArg> cachedTextureRequest);
 
-    public delegate void SetAppearance(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams, List<CachedTextureRequestArg> cachedTextureData);
+    public delegate void SetAppearance(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 AvSize, WearableCacheItem[] CacheItems);
 
     public delegate void StartAnim(IClientAPI remoteClient, UUID animID);
 
diff --git a/OpenSim/Framework/IImprovedAssetCache.cs b/OpenSim/Framework/IImprovedAssetCache.cs
index 251215a..a0b8b55 100644
--- a/OpenSim/Framework/IImprovedAssetCache.cs
+++ b/OpenSim/Framework/IImprovedAssetCache.cs
@@ -33,6 +33,7 @@ namespace OpenSim.Framework
     {
         void Cache(AssetBase asset);
         AssetBase Get(string id);
+        bool Check(string id);
         void Expire(string id);
         void Clear();
     }
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
index 4f98d7b..7a24d1e 100644
--- a/OpenSim/Framework/ILandObject.cs
+++ b/OpenSim/Framework/ILandObject.cs
@@ -70,6 +70,7 @@ namespace OpenSim.Framework
         void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client);
         bool IsEitherBannedOrRestricted(UUID avatar);
         bool IsBannedFromLand(UUID avatar);
+        bool CanBeOnThisLand(UUID avatar, float posHeight);
         bool IsRestrictedFromLand(UUID avatar);
         bool IsInLandAccessList(UUID avatar);
         void SendLandUpdateToClient(IClientAPI remote_client);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index a04ded5..6cb7332 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -6437,26 +6437,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // Temporarily protect ourselves from the mantis #951 failure.
                 // However, we could do this for several other handlers where a failure isn't terminal
                 // for the client session anyway, in order to protect ourselves against bad code in plugins
+                Vector3 avSize = appear.AgentData.Size;
                 try
                 {
                     byte[] visualparams = new byte[appear.VisualParam.Length];
                     for (int i = 0; i < appear.VisualParam.Length; i++)
                         visualparams[i] = appear.VisualParam[i].ParamValue;
+                    //var b = appear.WearableData[0]; 
 
                     Primitive.TextureEntry te = null;
                     if (appear.ObjectData.TextureEntry.Length > 1)
                         te = new Primitive.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length);
 
-                    List<CachedTextureRequestArg> hashes = new List<CachedTextureRequestArg>();
-                    for (int i = 0; i < appear.WearableData.Length; i++)
-                    {
-                        CachedTextureRequestArg arg = new CachedTextureRequestArg();
-                        arg.BakedTextureIndex = appear.WearableData[i].TextureIndex;
-                        arg.WearableHashID = appear.WearableData[i].CacheID;
-                        hashes.Add(arg);
-                    }
+                    WearableCacheItem[] cacheitems = new WearableCacheItem[appear.WearableData.Length];
+                    for (int i=0; i<appear.WearableData.Length;i++)
+                        cacheitems[i] = new WearableCacheItem(){CacheId = appear.WearableData[i].CacheID,TextureIndex=Convert.ToUInt32(appear.WearableData[i].TextureIndex)};
+
+
 
-                    handlerSetAppearance(sender, te, visualparams, hashes);
+                    handlerSetAppearance(sender, te, visualparams,avSize, cacheitems);
                 }
                 catch (Exception e)
                 {
diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
index e40caec..f43305f 100644
--- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
@@ -194,6 +194,12 @@ namespace OpenSim.Region.CoreModules.Asset
 
         #region IImprovedAssetCache Members
 
+
+        public bool Check(string id)
+        {
+            return false;
+        }
+
         /// <summary>
         /// Cache asset.
         /// </summary>
diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
index 9742a5c..58ce61a 100644
--- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
@@ -112,6 +112,10 @@ namespace OpenSim.Region.CoreModules.Asset
         ////////////////////////////////////////////////////////////
         // IImprovedAssetCache
         //
+        public bool Check(string id)
+        {
+            return false;
+        }
 
         public void Cache(AssetBase asset)
         {
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 08d4fc0..f1fee63 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -248,57 +248,70 @@ namespace OpenSim.Region.CoreModules.Asset
 
         private void UpdateFileCache(string key, AssetBase asset)
         {
-            string filename = GetFileName(asset.ID);
-
-            try
+            // TODO: Spawn this off to some seperate thread to do the actual writing
+            if (asset != null)
             {
-                // If the file is already cached just update access time.
-                if (File.Exists(filename))
-                {
-                    lock (m_CurrentlyWriting)
-                    {
-                        if (!m_CurrentlyWriting.Contains(filename))
-                            File.SetLastAccessTime(filename, DateTime.Now);
-                    }
-                }
-                else
+                string filename = GetFileName(key);
+
+                try
                 {
-                    // Once we start writing, make sure we flag that we're writing
-                    // that object to the cache so that we don't try to write the
-                    // same file multiple times.
-                    lock (m_CurrentlyWriting)
+                    // If the file is already cached, don't cache it, just touch it so access time is updated
+                    if (File.Exists(filename))
                     {
-#if WAIT_ON_INPROGRESS_REQUESTS
-                        if (m_CurrentlyWriting.ContainsKey(filename))
+                        // We don't really want to know about sharing
+                        // violations here. If the file is locked, then
+                        // the other thread has updated the time for us.
+                        try
                         {
-                            return;
+                            lock (m_CurrentlyWriting)
+                            {
+                                if (!m_CurrentlyWriting.Contains(filename))
+                                    File.SetLastAccessTime(filename, DateTime.Now);
+                            }
                         }
-                        else
-                        {
-                            m_CurrentlyWriting.Add(filename, new ManualResetEvent(false));
-                       }
-
-#else
-                        if (m_CurrentlyWriting.Contains(filename))
+                        catch
                         {
-                            return;
                         }
-                        else
+                    } else {
+
+                        // Once we start writing, make sure we flag that we're writing
+                        // that object to the cache so that we don't try to write the 
+                        // same file multiple times.
+                        lock (m_CurrentlyWriting)
                         {
-                            m_CurrentlyWriting.Add(filename);
-                        }
+#if WAIT_ON_INPROGRESS_REQUESTS
+                            if (m_CurrentlyWriting.ContainsKey(filename))
+                            {
+                                return;
+                            }
+                            else
+                            {
+                                m_CurrentlyWriting.Add(filename, new ManualResetEvent(false));
+                            }
+
+#else
+                            if (m_CurrentlyWriting.Contains(filename))
+                            {
+                                return;
+                            }
+                            else
+                            {
+                                m_CurrentlyWriting.Add(filename);
+                            }
 #endif
-                    }
 
-                    Util.FireAndForget(
-                        delegate { WriteFileCache(filename, asset); });
+                        }
+
+                        Util.FireAndForget(
+                            delegate { WriteFileCache(filename, asset); });
+                    }
+                }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat(
+                        "[FLOTSAM ASSET CACHE]: Failed to update cache for asset {0}.  Exception {1} {2}",
+                        asset.ID, e.Message, e.StackTrace);
                 }
-            }
-            catch (Exception e)
-            {
-                m_log.WarnFormat(
-                    "[FLOTSAM ASSET CACHE]: Failed to update cache for asset {0}.  Exception {1} {2}",
-                    asset.ID, e.Message, e.StackTrace);
             }
         }
 
@@ -332,6 +345,17 @@ namespace OpenSim.Region.CoreModules.Asset
             return asset;
         }
 
+        private bool CheckFromMemoryCache(string id)
+        {
+            AssetBase asset = null;
+
+            if (m_MemoryCache.TryGetValue(id, out asset))
+                return true;
+
+            return false;
+        }
+
+
         /// <summary>
         /// Try to get an asset from the file cache.
         /// </summary>
@@ -396,6 +420,7 @@ namespace OpenSim.Region.CoreModules.Asset
                     m_log.WarnFormat(
                         "[FLOTSAM ASSET CACHE]: Failed to get file {0} for asset {1}.  Exception {2} {3}",
                         filename, id, e.Message, e.StackTrace);
+
                 }
                 finally
                 {
@@ -407,6 +432,50 @@ namespace OpenSim.Region.CoreModules.Asset
             return asset;
         }
 
+        private bool CheckFromFileCache(string id)
+        {
+            bool found = false;
+
+            string filename = GetFileName(id);
+            if (File.Exists(filename))
+            {
+                // actually check if we can open it, and so update expire
+                FileStream stream = null;
+                try
+                {
+                    stream = File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.Read);
+                    if (stream != null)
+                    {
+                        found = true;
+                        stream.Close();
+                    }
+
+                }
+                catch (System.Runtime.Serialization.SerializationException e)
+                {
+                    found = false;
+                    m_log.ErrorFormat(
+                        "[FLOTSAM ASSET CACHE]: Failed to check file {0} for asset {1}.  Exception {2} {3}",
+                        filename, id, e.Message, e.StackTrace);
+
+                    // If there was a problem deserializing the asset, the asset may
+                    // either be corrupted OR was serialized under an old format
+                    // {different version of AssetBase} -- we should attempt to
+                    // delete it and re-cache
+                    File.Delete(filename);
+                }
+                catch (Exception e)
+                {
+                    found = false;
+                    m_log.ErrorFormat(
+                        "[FLOTSAM ASSET CACHE]: Failed to check file {0} for asset {1}.  Exception {2} {3}",
+                        filename, id, e.Message, e.StackTrace);
+                }
+            }
+
+            return found;
+        }
+
         public AssetBase Get(string id)
         {
             m_Requests++;
@@ -434,11 +503,26 @@ namespace OpenSim.Region.CoreModules.Asset
             return asset;
         }
 
+        public bool Check(string id)
+        {
+            if (m_MemoryCacheEnabled && CheckFromMemoryCache(id))
+                return true;
+
+            if (m_FileCacheEnabled && CheckFromFileCache(id))
+                return true;
+            return false;
+        }
+
         public AssetBase GetCached(string id)
         {
             return Get(id);
         }
 
+        public AssetBase CheckCached(string id)
+        {
+            return Get(id);
+        }
+
         public void Expire(string id)
         {
             if (m_LogLevel >= 2)
@@ -983,6 +1067,11 @@ namespace OpenSim.Region.CoreModules.Asset
             return asset.Data;
         }
 
+        public bool CheckData(string id)
+        {
+            return Check(id); ;
+        }
+
         public bool Get(string id, object sender, AssetRetrieved handler)
         {
             AssetBase asset = Get(id);
diff --git a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
index 9592ca0..ce9b546 100644
--- a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
@@ -115,6 +115,11 @@ namespace OpenSim.Region.CoreModules.Asset
         // IImprovedAssetCache
         //
 
+        public bool Check(string id)
+        {
+            return false;
+        }
+
         public void Cache(AssetBase asset)
         {
             if (asset != null)
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index aea768e..09cc998 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -145,33 +145,37 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         /// <param name="sp"></param>
         /// <param name="texture"></param>
         /// <param name="visualParam"></param>
-        public void SetAppearance(IScenePresence sp, AvatarAppearance appearance)
+        public void SetAppearance(IScenePresence sp, AvatarAppearance appearance, WearableCacheItem[] cacheItems)
         {
-            DoSetAppearance(sp, appearance.Texture, appearance.VisualParams, new List<CachedTextureRequestArg>());
+            SetAppearance(sp, appearance.Texture, appearance.VisualParams, cacheItems);
         }
 
-        /// <summary>
-        /// Set appearance data (texture asset IDs and slider settings) 
-        /// </summary>
-        /// <param name="sp"></param>
-        /// <param name="texture"></param>
-        /// <param name="visualParam"></param>
-        public void SetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams)
+
+        public void SetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 avSize, WearableCacheItem[] cacheItems)
         {
-            DoSetAppearance(sp, textureEntry, visualParams, new List<CachedTextureRequestArg>());
+            float oldoff = sp.Appearance.AvatarFeetOffset;
+            Vector3 oldbox = sp.Appearance.AvatarBoxSize;
+
+            SetAppearance(sp, textureEntry, visualParams, cacheItems);
+            sp.Appearance.SetSize(avSize);
+
+            float off = sp.Appearance.AvatarFeetOffset;
+            Vector3 box = sp.Appearance.AvatarBoxSize;
+            if (oldoff != off || oldbox != box)
+                ((ScenePresence)sp).SetSize(box, off);
         }
-        
+
         /// <summary>
         /// Set appearance data (texture asset IDs and slider settings) 
         /// </summary>
         /// <param name="sp"></param>
         /// <param name="texture"></param>
         /// <param name="visualParam"></param>
-        protected void DoSetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams, List<CachedTextureRequestArg> hashes)
+        public void SetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams, WearableCacheItem[] cacheItems)
         {
-            // m_log.DebugFormat(
-            //     "[AVFACTORY]: start SetAppearance for {0}, te {1}, visualParams {2}",
-            //     sp.Name, textureEntry, visualParams);
+//            m_log.DebugFormat(
+//                "[AVFACTORY]: start SetAppearance for {0}, te {1}, visualParams {2}",
+//                sp.Name, textureEntry, visualParams);
 
             // TODO: This is probably not necessary any longer, just assume the
             // textureEntry set implies that the appearance transaction is complete
@@ -190,36 +194,38 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                     //                    m_log.DebugFormat(
                     //                        "[AVFACTORY]: Setting visual params for {0} to {1}",
                     //                        client.Name, string.Join(", ", visualParamsStrings));
-
+/*
                     float oldHeight = sp.Appearance.AvatarHeight;
                     changed = sp.Appearance.SetVisualParams(visualParams);
 
                     if (sp.Appearance.AvatarHeight != oldHeight && sp.Appearance.AvatarHeight > 0)
                         ((ScenePresence)sp).SetHeight(sp.Appearance.AvatarHeight);
-                }
+ */
+//                    float oldoff = sp.Appearance.AvatarFeetOffset;
+//                    Vector3 oldbox = sp.Appearance.AvatarBoxSize;
+                    changed = sp.Appearance.SetVisualParams(visualParams);
+//                    float off = sp.Appearance.AvatarFeetOffset;
+//                    Vector3 box = sp.Appearance.AvatarBoxSize;
+//                    if(oldoff != off || oldbox != box)
+//                        ((ScenePresence)sp).SetSize(box,off);
 
+                }
+            
                 // Process the baked texture array
                 if (textureEntry != null)
                 {
-                    // m_log.DebugFormat("[AVFACTORY]: Received texture update for {0} {1}", sp.Name, sp.UUID); 
-                    // WriteBakedTexturesReport(sp, m_log.DebugFormat);
+                    m_log.DebugFormat("[AVFACTORY]: Received texture update for {0} {1}", sp.Name, sp.UUID);
+
+//                    WriteBakedTexturesReport(sp, m_log.DebugFormat);
 
                     changed = sp.Appearance.SetTextureEntries(textureEntry) || changed;
 
-                    // WriteBakedTexturesReport(sp, m_log.DebugFormat);
+//                    WriteBakedTexturesReport(sp, m_log.DebugFormat);
 
                     // If bake textures are missing and this is not an NPC, request a rebake from client
                     if (!ValidateBakedTextureCache(sp) && (((ScenePresence)sp).PresenceType != PresenceType.Npc))
                         RequestRebake(sp, true);
 
-                    // Save the wearble hashes in the appearance
-                    sp.Appearance.ResetTextureHashes();
-                    if (m_reusetextures)
-                    {
-                        foreach (CachedTextureRequestArg arg in hashes)
-                            sp.Appearance.SetTextureHash(arg.BakedTextureIndex,arg.WearableHashID);
-                    }
-                        
                     // This appears to be set only in the final stage of the appearance
                     // update transaction. In theory, we should be able to do an immediate
                     // appearance send and save here.
@@ -253,13 +259,13 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
         public bool SendAppearance(UUID agentId)
         {
-            // m_log.DebugFormat("[AVFACTORY]: Sending appearance for {0}", agentId);
+//            m_log.DebugFormat("[AVFACTORY]: Sending appearance for {0}", agentId);
 
             ScenePresence sp = m_scene.GetScenePresence(agentId);
             if (sp == null)
             {
                 // This is expected if the user has gone away.
-                // m_log.DebugFormat("[AVFACTORY]: Agent {0} no longer in the scene", agentId);
+//                m_log.DebugFormat("[AVFACTORY]: Agent {0} no longer in the scene", agentId);
                 return false;
             }
 
@@ -277,6 +283,17 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             return GetBakedTextureFaces(sp);
         }
 
+        public WearableCacheItem[] GetCachedItems(UUID agentId)
+        {
+            ScenePresence sp = m_scene.GetScenePresence(agentId);
+            WearableCacheItem[] items = sp.Appearance.WearableCacheItems;
+            //foreach (WearableCacheItem item in items)
+            //{
+               
+            //}
+            return items;
+        }
+
         public bool SaveBakedTextures(UUID agentId)
         {
             ScenePresence sp = m_scene.GetScenePresence(agentId);
@@ -336,7 +353,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         /// <param name="agentId"></param>
         public void QueueAppearanceSend(UUID agentid)
         {
-            // m_log.DebugFormat("[AVFACTORY]: Queue appearance send for {0}", agentid);
+//            m_log.DebugFormat("[AVFACTORY]: Queue appearance send for {0}", agentid);
 
             // 10000 ticks per millisecond, 1000 milliseconds per second
             long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_sendtime * 1000 * 10000);
@@ -349,7 +366,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
         public void QueueAppearanceSave(UUID agentid)
         {
-            // m_log.DebugFormat("[AVFACTORY]: Queueing appearance save for {0}", agentid);
+//            m_log.DebugFormat("[AVFACTORY]: Queueing appearance save for {0}", agentid);
 
             // 10000 ticks per millisecond, 1000 milliseconds per second
             long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_savetime * 1000 * 10000);
@@ -363,6 +380,53 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         public bool ValidateBakedTextureCache(IScenePresence sp)
         {
             bool defonly = true; // are we only using default textures
+            IImprovedAssetCache cache = m_scene.RequestModuleInterface<IImprovedAssetCache>();
+            IBakedTextureModule bakedModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
+            WearableCacheItem[] wearableCache = null;
+
+            // Cache wearable data for teleport.
+            // Only makes sense if there's a bake module and a cache module
+            if (bakedModule != null && cache != null)
+            {
+                try
+                {
+                    wearableCache = bakedModule.Get(sp.UUID);
+                }
+                catch (Exception)
+                {
+
+                }
+                if (wearableCache != null)
+                {
+                    for (int i = 0; i < wearableCache.Length; i++)
+                    {
+                       cache.Cache(wearableCache[i].TextureAsset);
+                    }
+                }
+            }
+            /*
+             IBakedTextureModule bakedModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
+            if (invService.GetRootFolder(userID) != null)
+            {
+                WearableCacheItem[] wearableCache = null;
+                if (bakedModule != null)
+                {
+                    try
+                    {
+                        wearableCache = bakedModule.Get(userID);
+                        appearance.WearableCacheItems = wearableCache;
+                        appearance.WearableCacheItemsDirty = false;
+                        foreach (WearableCacheItem item in wearableCache)
+                        {
+                            appearance.Texture.FaceTextures[item.TextureIndex].TextureID = item.TextureID;
+                        }
+                    }
+                    catch (Exception)
+                    {
+                        
+                    }
+                }
+             */
 
             // Process the texture entry
             for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++)
@@ -370,13 +434,36 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 int idx = AvatarAppearance.BAKE_INDICES[i];
                 Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx];
 
-                // if there is no texture entry, skip it
+                // No face, so lets check our baked service cache, teleport or login.
                 if (face == null)
-                    continue;
+                {
+                    if (wearableCache != null)
+                    {
+                        // If we find the an appearance item, set it as the textureentry and the face
+                        WearableCacheItem searchitem = WearableCacheItem.SearchTextureIndex((uint) idx, wearableCache);
+                        if (searchitem != null)
+                        {
+                            sp.Appearance.Texture.FaceTextures[idx] = sp.Appearance.Texture.CreateFace((uint) idx);
+                            sp.Appearance.Texture.FaceTextures[idx].TextureID = searchitem.TextureID;
+                            face = sp.Appearance.Texture.FaceTextures[idx];
+                        }
+                        else
+                        {
+                            // if there is no texture entry and no baked cache, skip it
+                            continue;
+                        }
+                    }
+                    else
+                    {
+                        //No texture entry face and no cache.  Skip this face.
+                        continue;
+                    }
+                }
+                    
 
-                // m_log.DebugFormat(
-                //     "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}",
-                //     face.TextureID, idx, client.Name, client.AgentId);
+//                m_log.DebugFormat(
+//                    "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}",
+//                    face.TextureID, idx, client.Name, client.AgentId);
 
                 // if the texture is one of the "defaults" then skip it
                 // this should probably be more intelligent (skirt texture doesnt matter
@@ -387,11 +474,19 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 
                 defonly = false; // found a non-default texture reference
 
-                if (m_scene.AssetService.Get(face.TextureID.ToString()) == null)
-                    return false;
+                if (cache != null)
+                {
+                    if (!cache.Check(face.TextureID.ToString()))
+                        return false;
+                }
+                else
+                {
+                    if (m_scene.AssetService.Get(face.TextureID.ToString()) == null)
+                        return false;
+                }
             }
 
-            // m_log.DebugFormat("[AVFACTORY]: Completed texture check for {0} {1}", sp.Name, sp.UUID);
+//            m_log.DebugFormat("[AVFACTORY]: Completed texture check for {0} {1}", sp.Name, sp.UUID);
 
             // If we only found default textures, then the appearance is not cached
             return (defonly ? false : true);
@@ -400,6 +495,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         public int RequestRebake(IScenePresence sp, bool missingTexturesOnly)
         {
             int texturesRebaked = 0;
+            IImprovedAssetCache cache = m_scene.RequestModuleInterface<IImprovedAssetCache>();
 
             for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++)
             {
@@ -410,9 +506,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 if (face == null)
                     continue;
 
-                // m_log.DebugFormat(
-                //     "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}",
-                //     face.TextureID, idx, client.Name, client.AgentId);
+//                m_log.DebugFormat(
+//                    "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}",
+//                    face.TextureID, idx, client.Name, client.AgentId);
 
                 // if the texture is one of the "defaults" then skip it
                 // this should probably be more intelligent (skirt texture doesnt matter
@@ -423,21 +519,36 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
                 if (missingTexturesOnly)
                 {
-                    if (m_scene.AssetService.Get(face.TextureID.ToString()) != null)
+                    if (cache != null)
                     {
-                        continue;
+                        if (cache.Check(face.TextureID.ToString()))
+                            continue;
+                        else
+                        {
+                            m_log.DebugFormat(
+                                "[AVFACTORY]: Missing baked texture {0} ({1}) for {2}, requesting rebake.",
+                                face.TextureID, idx, sp.Name);
+                        }
                     }
                     else
                     {
-                        // On inter-simulator teleports, this occurs if baked textures are not being stored by the
-                        // grid asset service (which means that they are not available to the new region and so have
-                        // to be re-requested from the client).
-                        //
-                        // The only available core OpenSimulator behaviour right now
-                        // is not to store these textures, temporarily or otherwise.
-                        m_log.DebugFormat(
-                            "[AVFACTORY]: Missing baked texture {0} ({1}) for {2}, requesting rebake.",
-                            face.TextureID, idx, sp.Name);
+                        if (m_scene.AssetService.Get(face.TextureID.ToString()) != null)
+                        {
+                            continue;
+                        }
+
+                        else
+                        {
+                            // On inter-simulator teleports, this occurs if baked textures are not being stored by the
+                            // grid asset service (which means that they are not available to the new region and so have
+                            // to be re-requested from the client).
+                            //
+                            // The only available core OpenSimulator behaviour right now
+                            // is not to store these textures, temporarily or otherwise.
+                            m_log.DebugFormat(
+                                "[AVFACTORY]: Missing baked texture {0} ({1}) for {2}, requesting rebake.",
+                                face.TextureID, idx, sp.Name);
+                        }
                     }
                 }
                 else
@@ -476,9 +587,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 if (bakeType == BakeType.Unknown)
                     continue;
 
-                // m_log.DebugFormat(
-                //     "[AVFACTORY]: NPC avatar {0} has texture id {1} : {2}",
-                //     acd.AgentID, i, acd.Appearance.Texture.FaceTextures[i]);
+//                m_log.DebugFormat(
+//                    "[AVFACTORY]: NPC avatar {0} has texture id {1} : {2}",
+//                    acd.AgentID, i, acd.Appearance.Texture.FaceTextures[i]);
 
                 int ftIndex = (int)AppearanceManager.BakeTypeToAgentTextureIndex(bakeType);
                 Primitive.TextureEntryFace texture = faceTextures[ftIndex];    // this will be null if there's no such baked texture
@@ -502,7 +613,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                     UUID avatarID = kvp.Key;
                     long sendTime = kvp.Value;
 
-                    // m_log.DebugFormat("[AVFACTORY]: Handling queued appearance updates for {0}, update delta to now is {1}", avatarID, sendTime - now);
+//                    m_log.DebugFormat("[AVFACTORY]: Handling queued appearance updates for {0}, update delta to now is {1}", avatarID, sendTime - now);
 
                     if (sendTime < now)
                     {
@@ -548,11 +659,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             if (sp == null)
             {
                 // This is expected if the user has gone away.
-                // m_log.DebugFormat("[AVFACTORY]: Agent {0} no longer in the scene", agentid);
+//                m_log.DebugFormat("[AVFACTORY]: Agent {0} no longer in the scene", agentid);
                 return;
             }
 
-            // m_log.DebugFormat("[AVFACTORY]: Saving appearance for avatar {0}", agentid);
+//            m_log.DebugFormat("[AVFACTORY]: Saving appearance for avatar {0}", agentid);
 
             // This could take awhile since it needs to pull inventory
             // We need to do it at the point of save so that there is a sufficient delay for any upload of new body part/shape
@@ -579,26 +690,70 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         private void SetAppearanceAssets(UUID userID, AvatarAppearance appearance)
         {
             IInventoryService invService = m_scene.InventoryService;
-
+            bool resetwearable = false;
             if (invService.GetRootFolder(userID) != null)
             {
                 for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
                 {
                     for (int j = 0; j < appearance.Wearables[i].Count; j++)
                     {
+                        // Check if the default wearables are not set
                         if (appearance.Wearables[i][j].ItemID == UUID.Zero)
+                        {
+                            switch ((WearableType) i)
+                            {
+                                case WearableType.Eyes:
+                                case WearableType.Hair:
+                                case WearableType.Shape:
+                                case WearableType.Skin:
+                                //case WearableType.Underpants:
+                                    TryAndRepairBrokenWearable((WearableType)i, invService, userID, appearance);
+                                    resetwearable = true;
+                                    m_log.Warn("[AVFACTORY]: UUID.Zero Wearables, passing fake values.");
+                                    resetwearable = true;
+                                    break;
+
+                            }
                             continue;
+                        }
 
-                        // Ignore ruth's assets
+                        // Ignore ruth's assets except for the body parts! missing body parts fail avatar appearance on V1
                         if (appearance.Wearables[i][j].ItemID == AvatarWearable.DefaultWearables[i][0].ItemID)
+                        {
+                            switch ((WearableType)i)
+                            {
+                                case WearableType.Eyes:
+                                case WearableType.Hair:
+                                case WearableType.Shape:
+                                case WearableType.Skin:
+                                //case WearableType.Underpants:
+                                    TryAndRepairBrokenWearable((WearableType)i, invService, userID, appearance);
+                            
+                                    m_log.WarnFormat("[AVFACTORY]: {0} Default Wearables, passing existing values.", (WearableType)i);
+                                    resetwearable = true;
+                                    break;
+
+                            }
                             continue;
-
+                        }
+                        
                         InventoryItemBase baseItem = new InventoryItemBase(appearance.Wearables[i][j].ItemID, userID);
                         baseItem = invService.GetItem(baseItem);
 
                         if (baseItem != null)
                         {
                             appearance.Wearables[i].Add(appearance.Wearables[i][j].ItemID, baseItem.AssetID);
+                            int unmodifiedWearableIndexForClosure = i;
+                            m_scene.AssetService.Get(baseItem.AssetID.ToString(), this,
+                                                                      delegate(string x, object y, AssetBase z)
+                                                                      {
+                                                                          if (z == null)
+                                                                          {
+                                                                              TryAndRepairBrokenWearable(
+                                                                                  (WearableType)unmodifiedWearableIndexForClosure, invService,
+                                                                                  userID, appearance);
+                                                                          }
+                                                                      });
                         }
                         else
                         {
@@ -606,17 +761,236 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                                 "[AVFACTORY]: Can't find inventory item {0} for {1}, setting to default",
                                 appearance.Wearables[i][j].ItemID, (WearableType)i);
 
-                            appearance.Wearables[i].RemoveItem(appearance.Wearables[i][j].ItemID);
+                            TryAndRepairBrokenWearable((WearableType)i, invService, userID, appearance);
+                            resetwearable = true;
+                            
                         }
                     }
                 }
+
+                // I don't know why we have to test for this again...  but the above switches do not capture these scenarios for some reason....
+                if (appearance.Wearables[(int) WearableType.Eyes] == null)
+                {
+                    m_log.WarnFormat("[AVFACTORY]: {0} Eyes are Null, passing existing values.", (WearableType.Eyes));
+                    
+                    TryAndRepairBrokenWearable(WearableType.Eyes, invService, userID, appearance);
+                    resetwearable = true;
+                }
+                else
+                {
+                    if (appearance.Wearables[(int) WearableType.Eyes][0].ItemID == UUID.Zero)
+                    {
+                        m_log.WarnFormat("[AVFACTORY]: Eyes are UUID.Zero are broken, {0} {1}",
+                                         appearance.Wearables[(int) WearableType.Eyes][0].ItemID,
+                                         appearance.Wearables[(int) WearableType.Eyes][0].AssetID);
+                        TryAndRepairBrokenWearable(WearableType.Eyes, invService, userID, appearance);
+                        resetwearable = true;
+
+                    }
+
+                }
+                // I don't know why we have to test for this again...  but the above switches do not capture these scenarios for some reason....
+                if (appearance.Wearables[(int)WearableType.Shape] == null)
+                {
+                    m_log.WarnFormat("[AVFACTORY]: {0} shape is Null, passing existing values.", (WearableType.Shape));
+
+                    TryAndRepairBrokenWearable(WearableType.Shape, invService, userID, appearance);
+                    resetwearable = true;
+                }
+                else
+                {
+                    if (appearance.Wearables[(int)WearableType.Shape][0].ItemID == UUID.Zero)
+                    {
+                        m_log.WarnFormat("[AVFACTORY]: Shape is UUID.Zero and broken, {0} {1}",
+                                         appearance.Wearables[(int)WearableType.Shape][0].ItemID,
+                                         appearance.Wearables[(int)WearableType.Shape][0].AssetID);
+                        TryAndRepairBrokenWearable(WearableType.Shape, invService, userID, appearance);
+                        resetwearable = true;
+
+                    }
+
+                }
+                // I don't know why we have to test for this again...  but the above switches do not capture these scenarios for some reason....
+                if (appearance.Wearables[(int)WearableType.Hair] == null)
+                {
+                    m_log.WarnFormat("[AVFACTORY]: {0} Hair is Null, passing existing values.", (WearableType.Hair));
+
+                    TryAndRepairBrokenWearable(WearableType.Hair, invService, userID, appearance);
+                    resetwearable = true;
+                }
+                else
+                {
+                    if (appearance.Wearables[(int)WearableType.Hair][0].ItemID == UUID.Zero)
+                    {
+                        m_log.WarnFormat("[AVFACTORY]: Hair is UUID.Zero and broken, {0} {1}",
+                                         appearance.Wearables[(int)WearableType.Hair][0].ItemID,
+                                         appearance.Wearables[(int)WearableType.Hair][0].AssetID);
+                        TryAndRepairBrokenWearable(WearableType.Hair, invService, userID, appearance);
+                        resetwearable = true;
+
+                    }
+
+                }
+                // I don't know why we have to test for this again...  but the above switches do not capture these scenarios for some reason....
+                if (appearance.Wearables[(int)WearableType.Skin] == null)
+                {
+                    m_log.WarnFormat("[AVFACTORY]: {0} Skin is Null, passing existing values.", (WearableType.Skin));
+
+                    TryAndRepairBrokenWearable(WearableType.Skin, invService, userID, appearance);
+                    resetwearable = true;
+                }
+                else
+                {
+                    if (appearance.Wearables[(int)WearableType.Skin][0].ItemID == UUID.Zero)
+                    {
+                        m_log.WarnFormat("[AVFACTORY]: Skin is UUID.Zero and broken, {0} {1}",
+                                         appearance.Wearables[(int)WearableType.Skin][0].ItemID,
+                                         appearance.Wearables[(int)WearableType.Skin][0].AssetID);
+                        TryAndRepairBrokenWearable(WearableType.Skin, invService, userID, appearance);
+                        resetwearable = true;
+
+                    }
+
+                }
+                if (resetwearable)
+                {
+                    ScenePresence presence = null;
+                    if (m_scene.TryGetScenePresence(userID, out presence))
+                    {
+                        presence.ControllingClient.SendWearables(presence.Appearance.Wearables,
+                                                                 presence.Appearance.Serial++);
+                    }
+                }
+
             }
             else
             {
                 m_log.WarnFormat("[AVFACTORY]: user {0} has no inventory, appearance isn't going to work", userID);
             }
         }
+        private void TryAndRepairBrokenWearable(WearableType type, IInventoryService invService, UUID userID,AvatarAppearance appearance)
+        {
+            UUID defaultwearable = GetDefaultItem(type);
+            if (defaultwearable != UUID.Zero)
+            {
+                UUID newInvItem = UUID.Random();
+                InventoryItemBase itembase = new InventoryItemBase(newInvItem, userID)
+                                                 {
+                                                     AssetID =
+                                                         defaultwearable,
+                                                     AssetType
+                                                         =
+                                                         (int)
+                                                         AssetType
+                                                             .Bodypart,
+                                                     CreatorId
+                                                         =
+                                                         userID
+                                                         .ToString
+                                                         (),
+                                                     //InvType = (int)InventoryType.Wearable,
+
+                                                     Description
+                                                         =
+                                                         "Failed Wearable Replacement",
+                                                     Folder =
+                                                         invService
+                                                         .GetFolderForType
+                                                         (userID,
+                                                          AssetType
+                                                              .Bodypart)
+                                                         .ID,
+                                                     Flags = (uint) type,
+                                                     Name = Enum.GetName(typeof (WearableType), type),
+                                                     BasePermissions = (uint) PermissionMask.Copy,
+                                                     CurrentPermissions = (uint) PermissionMask.Copy,
+                                                     EveryOnePermissions = (uint) PermissionMask.Copy,
+                                                     GroupPermissions = (uint) PermissionMask.Copy,
+                                                     NextPermissions = (uint) PermissionMask.Copy
+                                                 };
+                invService.AddItem(itembase);
+                UUID LinkInvItem = UUID.Random();
+                itembase = new InventoryItemBase(LinkInvItem, userID)
+                               {
+                                   AssetID =
+                                       newInvItem,
+                                   AssetType
+                                       =
+                                       (int)
+                                       AssetType
+                                           .Link,
+                                   CreatorId
+                                       =
+                                       userID
+                                       .ToString
+                                       (),
+                                   InvType = (int) InventoryType.Wearable,
+
+                                   Description
+                                       =
+                                       "Failed Wearable Replacement",
+                                   Folder =
+                                       invService
+                                       .GetFolderForType
+                                       (userID,
+                                        AssetType
+                                            .CurrentOutfitFolder)
+                                       .ID,
+                                   Flags = (uint) type,
+                                   Name = Enum.GetName(typeof (WearableType), type),
+                                   BasePermissions = (uint) PermissionMask.Copy,
+                                   CurrentPermissions = (uint) PermissionMask.Copy,
+                                   EveryOnePermissions = (uint) PermissionMask.Copy,
+                                   GroupPermissions = (uint) PermissionMask.Copy,
+                                   NextPermissions = (uint) PermissionMask.Copy
+                               };
+                invService.AddItem(itembase);
+                appearance.Wearables[(int)type] = new AvatarWearable(newInvItem, GetDefaultItem(type));
+                ScenePresence presence = null;
+                if (m_scene.TryGetScenePresence(userID, out presence))
+                {
+                    m_scene.SendInventoryUpdate(presence.ControllingClient,
+                                                invService.GetFolderForType(userID,
+                                                                            AssetType
+                                                                                .CurrentOutfitFolder),
+                                                false, true);
+                }
+            }
+        }
+        private UUID GetDefaultItem(WearableType wearable)
+        {
+            // These are ruth
+            UUID ret = UUID.Zero;
+            switch (wearable)
+            {
+                case WearableType.Eyes:
+                    ret = new UUID("4bb6fa4d-1cd2-498a-a84c-95c1a0e745a7");
+                    break;
+                case WearableType.Hair:
+                    ret = new UUID("d342e6c0-b9d2-11dc-95ff-0800200c9a66");
+                    break;
+                case WearableType.Pants:
+                    ret = new UUID("00000000-38f9-1111-024e-222222111120");
+                    break;
+                case WearableType.Shape:
+                    ret = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");
+                    break;
+                case WearableType.Shirt:
+                    ret = new UUID("00000000-38f9-1111-024e-222222111110");
+                    break;
+                case WearableType.Skin:
+                    ret = new UUID("77c41e39-38f9-f75a-024e-585989bbabbb");
+                    break;
+                case WearableType.Undershirt:
+                    ret = new UUID("16499ebb-3208-ec27-2def-481881728f47");
+                    break;
+                case WearableType.Underpants:
+                    ret = new UUID("4ac2e9c7-3671-d229-316a-67717730841d");
+                    break;
+            }
 
+            return ret;
+        }
         #endregion
 
         #region Client Event Handlers
@@ -626,12 +1000,17 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         /// <param name="client"></param>
         private void Client_OnRequestWearables(IClientAPI client)
         {
-            // m_log.DebugFormat("[AVFACTORY]: Client_OnRequestWearables called for {0} ({1})", client.Name, client.AgentId);
-            ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
-            if (sp != null)
-                client.SendWearables(sp.Appearance.Wearables, sp.Appearance.Serial++);
-            else
-                m_log.WarnFormat("[AVFACTORY]: Client_OnRequestWearables unable to find presence for {0}", client.AgentId);
+            Util.FireAndForget(delegate(object x)
+            {
+                Thread.Sleep(4000);
+
+                // m_log.DebugFormat("[AVFACTORY]: Client_OnRequestWearables called for {0} ({1})", client.Name, client.AgentId);
+                ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
+                if (sp != null)
+                    client.SendWearables(sp.Appearance.Wearables, sp.Appearance.Serial++);
+                else
+                    m_log.WarnFormat("[AVFACTORY]: Client_OnRequestWearables unable to find presence for {0}", client.AgentId);
+            });
         }
         
         /// <summary>
@@ -640,12 +1019,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         /// <param name="client"></param>
         /// <param name="texture"></param>
         /// <param name="visualParam"></param>
-        private void Client_OnSetAppearance(IClientAPI client, Primitive.TextureEntry textureEntry, byte[] visualParams, List<CachedTextureRequestArg> hashes)
+        private void Client_OnSetAppearance(IClientAPI client, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 avSize, WearableCacheItem[] cacheItems)
         {
             // m_log.WarnFormat("[AVFACTORY]: Client_OnSetAppearance called for {0} ({1})", client.Name, client.AgentId);
             ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
             if (sp != null)
-                DoSetAppearance(sp, textureEntry, visualParams, hashes);
+                SetAppearance(sp, textureEntry, visualParams,avSize, cacheItems);
             else
                 m_log.WarnFormat("[AVFACTORY]: Client_OnSetAppearance unable to find presence for {0}", client.AgentId);
         }
@@ -702,7 +1081,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         /// <param name="cachedTextureRequest"></param>
         private void Client_OnCachedTextureRequest(IClientAPI client, int serial, List<CachedTextureRequestArg> cachedTextureRequest)
         {
-            // m_log.DebugFormat("[AVFACTORY]: Client_OnCachedTextureRequest called for {0} ({1})", client.Name, client.AgentId);
+            // 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>();
@@ -713,20 +1092,23 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 
                 if (m_reusetextures)
                 {
-                    if (sp.Appearance.GetTextureHash(index) == request.WearableHashID)
-                    {
-                        Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[index];
-                        if (face != null)
-                            texture = face.TextureID;
-                    }
-                    else
-                    {
-                        // We know that that hash is wrong, null it out
-                        // and wait for the setappearance call
-                        sp.Appearance.SetTextureHash(index,UUID.Zero);
-                    }
-
-                    // m_log.WarnFormat("[AVFACTORY]: use texture {0} for index {1}; hash={2}",texture,index,request.WearableHashID);
+                    // 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();
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
index 1830d41..ff4c6c9 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
@@ -61,10 +61,10 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             for (byte i = 0; i < visualParams.Length; i++)
                 visualParams[i] = i;
 
-            afm.SetAppearance(sp, new Primitive.TextureEntry(TestHelpers.ParseTail(0x10)), visualParams);
+//            afm.SetAppearance(sp, new Primitive.TextureEntry(TestHelpers.ParseTail(0x10)), visualParams);
 
             // TODO: Check baked texture
-            Assert.AreEqual(visualParams, sp.Appearance.VisualParams);
+//            Assert.AreEqual(visualParams, sp.Appearance.VisualParams);
         }
 
         [Test]
@@ -102,6 +102,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             Primitive.TextureEntryFace eyesFace = bakedTextureEntry.CreateFace(eyesFaceIndex);
             eyesFace.TextureID = eyesTextureId;
 
+/*
             afm.SetAppearance(sp, bakedTextureEntry, visualParams);
             afm.SaveBakedTextures(userId);
 //            Dictionary<BakeType, Primitive.TextureEntryFace> bakedTextures = afm.GetBakedTextureFaces(userId);
@@ -113,6 +114,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             Assert.That(eyesBake, Is.Not.Null);
             Assert.That(eyesBake.Temporary, Is.False);
             Assert.That(eyesBake.Local, Is.False);
+*/
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index e55c9ed..e54c849 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -414,6 +414,19 @@ namespace OpenSim.Region.CoreModules.World.Land
             return false;
         }
 
+        public bool CanBeOnThisLand(UUID avatar, float posHeight)
+        {
+            if (posHeight < LandChannel.BAN_LINE_SAFETY_HIEGHT && IsBannedFromLand(avatar))
+            {
+                return false;
+            }
+            else if (IsRestrictedFromLand(avatar))
+            {
+                return false;
+            }
+            return true;
+        }
+
         public bool HasGroupAccess(UUID avatar)
         {
             if (LandData.GroupID != UUID.Zero && (LandData.Flags & (uint)ParcelFlags.UseAccessGroup) == (uint)ParcelFlags.UseAccessGroup)
diff --git a/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs b/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
index 34aca33..d25c930 100644
--- a/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
@@ -35,8 +35,8 @@ namespace OpenSim.Region.Framework.Interfaces
 
     public interface IAvatarFactoryModule
     {
-        void SetAppearance(IScenePresence sp, AvatarAppearance appearance);
-        void SetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams);
+        void SetAppearance(IScenePresence sp, AvatarAppearance appearance, WearableCacheItem[] cacheItems);
+        void SetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams, WearableCacheItem[] cacheItems);
 
         /// <summary>
         /// Send the appearance of an avatar to others in the scene.
@@ -52,6 +52,8 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <returns>An empty list if this agent has no baked textures (e.g. because it's a child agent)</returns>
         Dictionary<BakeType, Primitive.TextureEntryFace> GetBakedTextureFaces(UUID agentId);
 
+
+        WearableCacheItem[] GetCachedItems(UUID agentId);
         /// <summary>
         /// Save the baked textures for the given agent permanently in the asset database.
         /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 4b4e4ba..f16a8e6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -118,6 +118,7 @@ namespace OpenSim.Region.Framework.Scenes
         private bool m_hasGroupChanged = false;
         private long timeFirstChanged;
         private long timeLastChanged;
+        private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>();
 
         /// <summary>
         /// This indicates whether the object has changed such that it needs to be repersisted to permenant storage
@@ -1096,6 +1097,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+
         /// <summary>
         ///
         /// </summary>
@@ -1105,6 +1107,46 @@ namespace OpenSim.Region.Framework.Scenes
             part.ParentID = m_rootPart.LocalId;
             part.ClearUndoState();
         }
+        /// <summary>
+        /// Add the avatar to this linkset (avatar is sat).
+        /// </summary>
+        /// <param name="agentID"></param>
+        public void AddAvatar(UUID agentID)
+        {
+            ScenePresence presence;
+            if (m_scene.TryGetScenePresence(agentID, out presence))
+            {
+                if (!m_linkedAvatars.Contains(presence))
+                {
+                    m_linkedAvatars.Add(presence);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Delete the avatar from this linkset (avatar is unsat).
+        /// </summary>
+        /// <param name="agentID"></param>
+        public void DeleteAvatar(UUID agentID)
+        {
+            ScenePresence presence;
+            if (m_scene.TryGetScenePresence(agentID, out presence))
+            {
+                if (m_linkedAvatars.Contains(presence))
+                {
+                    m_linkedAvatars.Remove(presence);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the list of linked presences (avatars sat on this group)
+        /// </summary>
+        /// <param name="agentID"></param>
+        public List<ScenePresence> GetLinkedAvatars()
+        {
+            return m_linkedAvatars;
+        }
 
         public ushort GetTimeDilation()
         {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 7ed3a4b..edb8ca8 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -65,6 +65,7 @@ namespace OpenSim.Region.Framework.Scenes
 
     struct ScriptControllers
     {
+        public UUID objectID;
         public UUID itemID;
         public ScriptControlled ignoreControls;
         public ScriptControlled eventControls;
@@ -120,7 +121,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// rotation, prim cut, prim twist, prim taper, and prim shear. See mantis
         /// issue #1716
         /// </summary>
-        public static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.0f, 0.0f, 0.418f);
+        public static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.0f, 0.0f, 0.4f);
 
         /// <summary>
         /// Movement updates for agents in neighboring regions are sent directly to clients.
@@ -142,8 +143,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// <remarks>
         /// TODO: For some reason, we effectively have a list both here and in Appearance.  Need to work out if this is
         /// necessary.
-        /// NOTE: To avoid deadlocks, do not lock m_attachments and then perform other tasks under that lock.  Take a copy
-        /// of the list and act on that instead.
         /// </remarks>
         private List<SceneObjectGroup> m_attachments = new List<SceneObjectGroup>();
 
@@ -162,6 +161,10 @@ namespace OpenSim.Region.Framework.Scenes
         private Vector3 m_lastPosition;
         private Quaternion m_lastRotation;
         private Vector3 m_lastVelocity;
+        private Vector3 m_lastSize = new Vector3(0.45f,0.6f,1.9f);
+
+        private bool m_followCamAuto = false;
+
 
         private Vector3? m_forceToApply;
         private int m_userFlags;
@@ -194,6 +197,7 @@ namespace OpenSim.Region.Framework.Scenes
 //        private int m_lastColCount = -1;		//KF: Look for Collision chnages
 //        private int m_updateCount = 0;			//KF: Update Anims for a while
 //        private static readonly int UPDATE_COUNT = 10;		// how many frames to update for
+        private List<uint> m_lastColliders = new List<uint>();
 
         private TeleportFlags m_teleportFlags;
         public TeleportFlags TeleportFlags
@@ -249,8 +253,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public bool LandAtTarget { get; private set; }
 
-        private bool m_followCamAuto;
-
         private int m_movementUpdateCount;
         private const int NumMovementsBetweenRayCast = 5;
 
@@ -258,6 +260,13 @@ namespace OpenSim.Region.Framework.Scenes
         //private int m_moveToPositionStateStatus;
         //*****************************************************
 
+        private bool m_collisionEventFlag = false;
+        private object m_collisionEventLock = new Object();
+
+        private int m_movementAnimationUpdateCounter = 0;
+
+        public Vector3 PrevSitOffset { get; set; }
+
         protected AvatarAppearance m_appearance;
 
         public AvatarAppearance Appearance
@@ -397,6 +406,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         protected Vector3 m_lastCameraPosition;
 
+        private Vector4 m_lastCameraCollisionPlane = new Vector4(0f, 0f, 0f, 1);
+        private bool m_doingCamRayCast = false;
+
         public Vector3 CameraPosition { get; set; }
 
         public Quaternion CameraRotation
@@ -477,6 +489,10 @@ namespace OpenSim.Region.Framework.Scenes
             get { return (IClientCore)ControllingClient; }
         }
 
+        public UUID COF { get; set; }
+
+//        public Vector3 ParentPosition { get; set; }
+
         /// <summary>
         /// Position of this avatar relative to the region the avatar is in
         /// </summary>
@@ -603,7 +619,24 @@ namespace OpenSim.Region.Framework.Scenes
 //                    Scene.RegionInfo.RegionName, Name, m_velocity);
             }
         }
+/*
+        public override Vector3 AngularVelocity
+        {
+            get
+            {
+                if (PhysicsActor != null)
+                {
+                    m_rotationalvelocity = PhysicsActor.RotationalVelocity;
+
+                    //                    m_log.DebugFormat(
+                    //                        "[SCENE PRESENCE]: Set velocity {0} for {1} in {2} via getting Velocity!",
+                    //                        m_velocity, Name, Scene.RegionInfo.RegionName);
+                }
 
+                return m_rotationalvelocity;
+            }
+        }
+*/
         private Quaternion m_bodyRot = Quaternion.Identity;
 
         /// <summary>
@@ -626,8 +659,16 @@ namespace OpenSim.Region.Framework.Scenes
                 m_bodyRot = value;
 
                 if (PhysicsActor != null)
-                    PhysicsActor.Orientation = m_bodyRot;
-
+                {
+                    try
+                    {
+                        PhysicsActor.Orientation = m_bodyRot;
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error("[SCENE PRESENCE]: Orientation " + e.Message);
+                    }
+                }
 //                m_log.DebugFormat("[SCENE PRESENCE]: Body rot for {0} set to {1}", Name, m_bodyRot);
             }
         }
@@ -641,12 +682,20 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         public bool IsChildAgent { get; set; }
+        public bool IsLoggingIn { get; set; }
 
         /// <summary>
         /// If the avatar is sitting, the local ID of the prim that it's sitting on.  If not sitting then zero.
         /// </summary>
         public uint ParentID { get; set; }
 
+        public UUID ParentUUID
+        {
+            get { return m_parentUUID; }
+            set { m_parentUUID = value; }
+        }
+        private UUID m_parentUUID = UUID.Zero;
+
         /// <summary>
         /// Are we sitting on an object?
         /// </summary>
@@ -804,6 +853,7 @@ namespace OpenSim.Region.Framework.Scenes
             AttachmentsSyncLock = new Object();
             AllowMovement = true;
             IsChildAgent = true;
+            IsLoggingIn = false;
             m_sendCoarseLocationsMethod = SendCoarseLocationsDefault;
             Animator = new ScenePresenceAnimator(this);
             PresenceType = type;
@@ -849,6 +899,33 @@ namespace OpenSim.Region.Framework.Scenes
             m_stateMachine = new ScenePresenceStateMachine(this);
         }
 
+        private void RegionHeartbeatEnd(Scene scene)
+        {
+            if (IsChildAgent)
+                return;
+
+            m_movementAnimationUpdateCounter ++;
+            if (m_movementAnimationUpdateCounter >= 2)
+            {
+                m_movementAnimationUpdateCounter = 0;
+                if (Animator != null)
+                {
+                    // If the parentID == 0 we are not sitting
+                    // if !SitGournd then we are not sitting on the ground
+                    // Fairly straightforward, now here comes the twist
+                    // if ParentUUID is NOT UUID.Zero, we are looking to
+                    // be sat on an object that isn't there yet. Should
+                    // be treated as if sat.
+                    if(ParentID == 0 && !SitGround && ParentUUID == UUID.Zero) // skip it if sitting
+                        Animator.UpdateMovementAnimations();
+                }
+                else
+                {
+                    m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
+                }
+            }
+        }
+
         public void RegisterToEvents()
         {
             ControllingClient.OnCompleteMovementToRegion += CompleteMovement;
@@ -919,6 +996,38 @@ namespace OpenSim.Region.Framework.Scenes
 //                "[SCENE]: Upgrading child to root agent for {0} in {1}",
 //                Name, m_scene.RegionInfo.RegionName);
 
+            if (ParentUUID != UUID.Zero)
+            {
+                m_log.DebugFormat("[SCENE PRESENCE]: Sitting avatar back on prim {0}", ParentUUID);
+                SceneObjectPart part = m_scene.GetSceneObjectPart(ParentUUID);
+                if (part == null)
+                {
+                    m_log.ErrorFormat("[SCENE PRESENCE]: Can't find prim {0} to sit on", ParentUUID);
+                }
+                else
+                {
+                    part.ParentGroup.AddAvatar(UUID);
+                    if (part.SitTargetPosition != Vector3.Zero)
+                        part.SitTargetAvatar = UUID;
+//                    ParentPosition = part.GetWorldPosition();
+                    ParentID = part.LocalId;
+                    ParentPart = part;
+                    m_pos = PrevSitOffset;
+//                    pos = ParentPosition;
+                    pos = part.GetWorldPosition();
+                }
+                ParentUUID = UUID.Zero;
+
+                IsChildAgent = false;
+
+//                Animator.TrySetMovementAnimation("SIT");
+            }
+            else
+            {
+                IsChildAgent = false;
+                IsLoggingIn = false;
+            }
+
             //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count);
 
             IsChildAgent = false;
@@ -936,70 +1045,106 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene);
 
-            // Moved this from SendInitialData to ensure that Appearance is initialized
-            // before the inventory is processed in MakeRootAgent. This fixes a race condition
-            // related to the handling of attachments
-            //m_scene.GetAvatarAppearance(ControllingClient, out Appearance);
+            UUID groupUUID = UUID.Zero;
+            string GroupName = string.Empty;
+            ulong groupPowers = 0;
 
-            if (m_scene.TestBorderCross(pos, Cardinals.E))
+            // ----------------------------------
+            // Previous Agent Difference - AGNI sends an unsolicited AgentDataUpdate upon root agent status
+            try
             {
-                Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E);
-                pos.X = crossedBorder.BorderLine.Z - 1;
+                if (gm != null)
+                {
+                    groupUUID = ControllingClient.ActiveGroupId;
+                    GroupRecord record = gm.GetGroupRecord(groupUUID);
+                    if (record != null)
+                        GroupName = record.GroupName;
+                    GroupMembershipData groupMembershipData = gm.GetMembershipData(groupUUID, m_uuid);
+                    if (groupMembershipData != null)
+                        groupPowers = groupMembershipData.GroupPowers;
+                }
+                ControllingClient.SendAgentDataUpdate(m_uuid, groupUUID, Firstname, Lastname, groupPowers, GroupName,
+                                                      Grouptitle);
             }
-
-            if (m_scene.TestBorderCross(pos, Cardinals.N))
+            catch (Exception e)
             {
-                Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.N);
-                pos.Y = crossedBorder.BorderLine.Z - 1;
+                m_log.Debug("[AGENTUPDATE]: " + e.ToString());
             }
+            // ------------------------------------
 
-            CheckAndAdjustLandingPoint(ref pos);
-
-            if (pos.X < 0f || pos.Y < 0f || pos.Z < 0f)
+            if (ParentID == 0)
             {
-                m_log.WarnFormat(
-                    "[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Clamping",
-                    pos, Name, UUID);
+                // Moved this from SendInitialData to ensure that Appearance is initialized
+                // before the inventory is processed in MakeRootAgent. This fixes a race condition
+                // related to the handling of attachments
+                //m_scene.GetAvatarAppearance(ControllingClient, out Appearance);
+                if (m_scene.TestBorderCross(pos, Cardinals.E))
+                {
+                    Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E);
+                    pos.X = crossedBorder.BorderLine.Z - 1;
+                }
 
-                if (pos.X < 0f) pos.X = 0f;
-                if (pos.Y < 0f) pos.Y = 0f;
-                if (pos.Z < 0f) pos.Z = 0f;
-            }
+                if (m_scene.TestBorderCross(pos, Cardinals.N))
+                {
+                    Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.N);
+                    pos.Y = crossedBorder.BorderLine.Z - 1;
+                }
 
-            float localAVHeight = 1.56f;
-            if (Appearance.AvatarHeight > 0)
-                localAVHeight = Appearance.AvatarHeight;
+                CheckAndAdjustLandingPoint(ref pos);
 
-            float posZLimit = 0;
+                if (pos.X < 0f || pos.Y < 0f || pos.Z < 0f)
+                {
+                    m_log.WarnFormat(
+                        "[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Clamping",
+                        pos, Name, UUID);
 
-            if (pos.X < Constants.RegionSize && pos.Y < Constants.RegionSize)
-                posZLimit = (float)m_scene.Heightmap[(int)pos.X, (int)pos.Y];
-            
-            float newPosZ = posZLimit + localAVHeight / 2;
-            if (posZLimit >= (pos.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
-            {
-                pos.Z = newPosZ;
-            }
-            AbsolutePosition = pos;
+                    if (pos.X < 0f) pos.X = 0f;
+                    if (pos.Y < 0f) pos.Y = 0f;
+                    if (pos.Z < 0f) pos.Z = 0f;
+                }
 
-            AddToPhysicalScene(isFlying);
+                float localAVHeight = 1.56f;
+                if (Appearance.AvatarHeight > 0)
+                    localAVHeight = Appearance.AvatarHeight;
 
-            // XXX: This is to trigger any secondary teleport needed for a megaregion when the user has teleported to a 
-            // location outside the 'root region' (the south-west 256x256 corner).  This is the earlist we can do it
-            // since it requires a physics actor to be present.  If it is left any later, then physics appears to reset
-            // the value to a negative position which does not trigger the border cross.
-            // This may not be the best location for this.
-            CheckForBorderCrossing();
+                float posZLimit = 0;
 
-            if (ForceFly)
-            {
-                Flying = true;
-            }
-            else if (FlyDisabled)
-            {
-                Flying = false;
-            }
+                if (pos.X < Constants.RegionSize && pos.Y < Constants.RegionSize)
+                    posZLimit = (float)m_scene.Heightmap[(int)pos.X, (int)pos.Y];
+                
+                float newPosZ = posZLimit + localAVHeight / 2;
+                if (posZLimit >= (pos.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
+                {
+                    pos.Z = newPosZ;
+                }
+                AbsolutePosition = pos;
+
+                if (m_teleportFlags == TeleportFlags.Default)
+                {
+                    Vector3 vel = Velocity;
+                    AddToPhysicalScene(isFlying);
+                    if (PhysicsActor != null)
+                        PhysicsActor.SetMomentum(vel);
+                }
+                else
+                    AddToPhysicalScene(isFlying);
+
+                // XXX: This is to trigger any secondary teleport needed for a megaregion when the user has teleported to a 
+                // location outside the 'root region' (the south-west 256x256 corner).  This is the earlist we can do it
+                // since it requires a physics actor to be present.  If it is left any later, then physics appears to reset
+                // the value to a negative position which does not trigger the border cross.
+                // This may not be the best location for this.
+                CheckForBorderCrossing();
 
+                if (ForceFly)
+                {
+                    Flying = true;
+                }
+                else if (FlyDisabled)
+                {
+                    Flying = false;
+                }
+            }
             // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying 
             // avatar to return to the standing position in mid-air.  On login it looks like this is being sent
             // elsewhere anyway
@@ -1031,31 +1176,28 @@ namespace OpenSim.Region.Framework.Scenes
                 // and CHANGED_REGION) when the attachments have been rezzed in the new region.  This cannot currently
                 // be done in AttachmentsModule.CopyAttachments(AgentData ad, IScenePresence sp) itself since we are
                 // not transporting the required data.
-                //
-                // We must take a copy of the attachments list here (rather than locking) to avoid a deadlock where a script in one of 
-                // the attachments may start processing an event (which locks ScriptInstance.m_Script) that then calls a method here
-                // which needs to lock m_attachments.  ResumeScripts() needs to take a ScriptInstance.m_Script lock to try to unset the Suspend status.
-                //
-                // FIXME: In theory, this deadlock should not arise since scripts should not be processing events until ResumeScripts().
-                // But XEngine starts all scripts unsuspended.  Starting them suspended will not currently work because script rezzing
-                // is placed in an asynchronous queue in XEngine and so the ResumeScripts() call will almost certainly execute before the 
-                // script is rezzed.  This means the ResumeScripts() does absolutely nothing when using XEngine.
-                List<SceneObjectGroup> attachments = GetAttachments();
-
-                if (attachments.Count > 0)
+                lock (m_attachments)
                 {
-                    m_log.DebugFormat(
-                        "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name);
-
-                    // Resume scripts
-                    foreach (SceneObjectGroup sog in attachments)
+                    if (HasAttachments())
                     {
-                        sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource());
-                        sog.ResumeScripts();
+                        m_log.DebugFormat(
+                            "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name);
+
+                        // Resume scripts
+                        Util.FireAndForget(delegate(object x) {
+                            foreach (SceneObjectGroup sog in m_attachments)
+                            {
+                                sog.ScheduleGroupForFullUpdate();
+                                sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource());
+                                sog.ResumeScripts();
+                            }
+                        });
                     }
                 }
             }
 
+            SendAvatarDataToAllAgents();
+
             // send the animations of the other presences to me
             m_scene.ForEachRootScenePresence(delegate(ScenePresence presence)
             {
@@ -1066,6 +1208,7 @@ namespace OpenSim.Region.Framework.Scenes
             // If we don't reset the movement flag here, an avatar that crosses to a neighbouring sim and returns will
             // stall on the border crossing since the existing child agent will still have the last movement
             // recorded, which stops the input from being processed.
+
             MovementFlag = 0;
 
             m_scene.EventManager.TriggerOnMakeRootAgent(this);
@@ -1097,12 +1240,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// </remarks>
         public void MakeChildAgent()
         {
+            m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
+
             m_log.DebugFormat("[SCENE PRESENCE]: Making {0} a child agent in {1}", Name, Scene.RegionInfo.RegionName);
 
             // Reset these so that teleporting in and walking out isn't seen
             // as teleporting back
             TeleportFlags = TeleportFlags.Default;
 
+            MovementFlag = 0;
+
             // It looks like Animator is set to null somewhere, and MakeChild
             // is called after that. Probably in aborted teleports.
             if (Animator == null)
@@ -1110,6 +1257,7 @@ namespace OpenSim.Region.Framework.Scenes
             else
                 Animator.ResetAnimations();
 
+            
 //            m_log.DebugFormat(
 //                 "[SCENE PRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}",
 //                 Name, UUID, m_scene.RegionInfo.RegionName);
@@ -1121,6 +1269,7 @@ namespace OpenSim.Region.Framework.Scenes
             IsChildAgent = true;
             m_scene.SwapRootAgentCount(true);
             RemoveFromPhysicalScene();
+            ParentID = 0; // Child agents can't be sitting
 
             // FIXME: Set RegionHandle to the region handle of the scene this agent is moving into
             
@@ -1136,9 +1285,9 @@ namespace OpenSim.Region.Framework.Scenes
             {
 //                PhysicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients;
                 PhysicsActor.OnOutOfBounds -= OutOfBoundsCall;
-                m_scene.PhysicsScene.RemoveAvatar(PhysicsActor);
-                PhysicsActor.UnSubscribeEvents();
                 PhysicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate;
+                PhysicsActor.UnSubscribeEvents();
+                m_scene.PhysicsScene.RemoveAvatar(PhysicsActor);
                 PhysicsActor = null;
             }
 //            else
@@ -1155,7 +1304,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="pos"></param>
         public void Teleport(Vector3 pos)
         {
-            TeleportWithMomentum(pos, null);
+            TeleportWithMomentum(pos, Vector3.Zero);
         }
 
         public void TeleportWithMomentum(Vector3 pos, Vector3? v)
@@ -1179,6 +1328,41 @@ namespace OpenSim.Region.Framework.Scenes
             SendTerseUpdateToAllClients();
         }
 
+        public void avnLocalTeleport(Vector3 newpos, Vector3? newvel, bool rotateToVelXY)
+        {
+            CheckLandingPoint(ref newpos);
+            AbsolutePosition = newpos;
+
+            if (newvel.HasValue)
+            {
+                if ((Vector3)newvel == Vector3.Zero)
+                {
+                    if (PhysicsActor != null)
+                        PhysicsActor.SetMomentum(Vector3.Zero);
+                    m_velocity = Vector3.Zero;
+                }
+                else
+                {
+                    if (PhysicsActor != null)
+                        PhysicsActor.SetMomentum((Vector3)newvel);
+                    m_velocity = (Vector3)newvel;
+
+                    if (rotateToVelXY)
+                    {
+                        Vector3 lookAt = (Vector3)newvel;
+                        lookAt.Z = 0;
+                        lookAt.Normalize();
+                        ControllingClient.SendLocalTeleport(newpos, lookAt, (uint)TeleportFlags.ViaLocation);
+                        return;
+                    }
+                }
+            }
+
+            SendTerseUpdateToAllClients();
+        }
+
+
+
         public void StopFlying()
         {
             Vector3 pos = AbsolutePosition; 
@@ -1367,6 +1551,14 @@ namespace OpenSim.Region.Framework.Scenes
                 PhysicsActor.Size = new Vector3(0.45f, 0.6f, height);
         }
 
+        public void SetSize(Vector3 size, float feetoffset)
+        {
+// TODO: Merge the physics bits
+//            if (PhysicsActor != null && !IsChildAgent)
+//                PhysicsActor.setAvatarSize(size, feetoffset);
+            
+        }
+
         private bool WaitForUpdateAgent(IClientAPI client)
         {
             // Before the source region executes UpdateAgent
@@ -1426,7 +1618,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             Vector3 look = Velocity;
 
-            if ((look.X == 0) && (look.Y == 0) && (look.Z == 0))
+            //            if ((look.X == 0) && (look.Y == 0) && (look.Z == 0))
+            if ((Math.Abs(look.X) < 0.1) && (Math.Abs(look.Y) < 0.1) && (Math.Abs(look.Z) < 0.1))
             {
                 look = new Vector3(0.99f, 0.042f, 0);
             }
@@ -1489,11 +1682,12 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
                 if (m_agentTransfer != null)
-                    Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); });
+                    m_agentTransfer.EnableChildAgents(this);
 
                 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
                 if (friendsModule != null)
                     friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
+
             }
 
             // XXX: If we force an update here, then multiple attachments do appear correctly on a destination region
@@ -1519,36 +1713,69 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="collisionPoint"></param>
         /// <param name="localid"></param>
         /// <param name="distance"></param>
+        /// 
+
+        private void UpdateCameraCollisionPlane(Vector4 plane)
+        {
+            if (m_lastCameraCollisionPlane != plane)
+            {
+                m_lastCameraCollisionPlane = plane;
+                ControllingClient.SendCameraConstraint(plane);
+            }
+        }
+
         public void RayCastCameraCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 pNormal)
         {
             const float POSITION_TOLERANCE = 0.02f;
-            const float VELOCITY_TOLERANCE = 0.02f;
             const float ROTATION_TOLERANCE = 0.02f;
 
-            if (m_followCamAuto)
+            m_doingCamRayCast = false;
+            if (hitYN && localid != LocalId)
             {
-                if (hitYN)
+                SceneObjectGroup group = m_scene.GetGroupByPrim(localid);
+                bool IsPrim = group != null;
+                if (IsPrim)
                 {
-                    CameraConstraintActive = true;
-                    //m_log.DebugFormat("[RAYCASTRESULT]: {0}, {1}, {2}, {3}", hitYN, collisionPoint, localid, distance);
-                    
-                    Vector3 normal = Vector3.Normalize(new Vector3(0f, 0f, collisionPoint.Z) - collisionPoint);
-                    ControllingClient.SendCameraConstraint(new Vector4(normal.X, normal.Y, normal.Z, -1 * Vector3.Distance(new Vector3(0,0,collisionPoint.Z),collisionPoint)));
+                    SceneObjectPart part = group.GetPart(localid);
+                    if (part != null && !part.VolumeDetectActive)
+                    {
+                        CameraConstraintActive = true;
+                        pNormal.X = (float) Math.Round(pNormal.X, 2);
+                        pNormal.Y = (float) Math.Round(pNormal.Y, 2);
+                        pNormal.Z = (float) Math.Round(pNormal.Z, 2);
+                        pNormal.Normalize();
+                        collisionPoint.X = (float) Math.Round(collisionPoint.X, 1);
+                        collisionPoint.Y = (float) Math.Round(collisionPoint.Y, 1);
+                        collisionPoint.Z = (float) Math.Round(collisionPoint.Z, 1);
+
+                        Vector4 plane = new Vector4(pNormal.X, pNormal.Y, pNormal.Z,
+                                                    Vector3.Dot(collisionPoint, pNormal));
+                        UpdateCameraCollisionPlane(plane);
+                    }
                 }
                 else
                 {
-                    if (!m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) ||
-                        !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) ||
-                        !Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE))
-                    {
-                        if (CameraConstraintActive)
-                        {
-                            ControllingClient.SendCameraConstraint(new Vector4(0f, 0.5f, 0.9f, -3000f));
-                            CameraConstraintActive = false;
-                        }
-                    }
+                    CameraConstraintActive = true;
+                    pNormal.X = (float) Math.Round(pNormal.X, 2);
+                    pNormal.Y = (float) Math.Round(pNormal.Y, 2);
+                    pNormal.Z = (float) Math.Round(pNormal.Z, 2);
+                    pNormal.Normalize();
+                    collisionPoint.X = (float) Math.Round(collisionPoint.X, 1);
+                    collisionPoint.Y = (float) Math.Round(collisionPoint.Y, 1);
+                    collisionPoint.Z = (float) Math.Round(collisionPoint.Z, 1);
+
+                    Vector4 plane = new Vector4(pNormal.X, pNormal.Y, pNormal.Z,
+                                                Vector3.Dot(collisionPoint, pNormal));
+                    UpdateCameraCollisionPlane(plane);
                 }
             }
+            else if (!m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) ||
+                     !Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE))
+            {
+                Vector4 plane = new Vector4(0.9f, 0.0f, 0.361f, -9000f); // not right...
+                UpdateCameraCollisionPlane(plane);
+                CameraConstraintActive = false;
+            }
         }
 
         /// <summary>
@@ -1622,6 +1849,41 @@ namespace OpenSim.Region.Framework.Scenes
                 StandUp();
             }
 
+            // Raycast from the avatar's head to the camera to see if there's anything blocking the view
+            // this exclude checks may not be complete
+
+            if (m_movementUpdateCount % NumMovementsBetweenRayCast == 0 && m_scene.PhysicsScene.SupportsRayCast())
+            {
+                if (!m_doingCamRayCast && !m_mouseLook && ParentID == 0)
+                {
+                    Vector3 posAdjusted = AbsolutePosition;
+//                    posAdjusted.Z += 0.5f * Appearance.AvatarSize.Z - 0.5f;
+                    posAdjusted.Z += 1.0f; // viewer current camera focus point
+                    Vector3 tocam = CameraPosition - posAdjusted;
+                    tocam.X = (float)Math.Round(tocam.X, 1);
+                    tocam.Y = (float)Math.Round(tocam.Y, 1);
+                    tocam.Z = (float)Math.Round(tocam.Z, 1);
+
+                    float distTocamlen = tocam.Length();
+                    if (distTocamlen > 0.3f)
+                    {
+                        tocam *= (1.0f / distTocamlen);
+                        posAdjusted.X = (float)Math.Round(posAdjusted.X, 1);
+                        posAdjusted.Y = (float)Math.Round(posAdjusted.Y, 1);
+                        posAdjusted.Z = (float)Math.Round(posAdjusted.Z, 1);
+
+                        m_doingCamRayCast = true;
+                        m_scene.PhysicsScene.RaycastWorld(posAdjusted, tocam, distTocamlen + 1.0f, RayCastCameraCallback);
+                    }
+                }
+                else if (CameraConstraintActive && (m_mouseLook || ParentID != 0))
+                {
+                    Vector4 plane = new Vector4(0.9f, 0.0f, 0.361f, -10000f); // not right...
+                    UpdateCameraCollisionPlane(plane);
+                    CameraConstraintActive = false;
+                }
+            }
+
             uint flagsForScripts = (uint)flags;
             flags = RemoveIgnoredControls(flags, IgnoredControls);
 
@@ -2180,7 +2442,8 @@ namespace OpenSim.Region.Framework.Scenes
 //            m_log.DebugFormat("[SCENE PRESENCE]: Resetting move to target for {0}", Name);
 
             MovingToTarget = false;
-            MoveToPositionTarget = Vector3.Zero;
+//            MoveToPositionTarget = Vector3.Zero;
+            m_forceToApply = null; // cancel possible last action
 
             // We need to reset the control flag as the ScenePresenceAnimator uses this to determine the correct
             // resting animation (e.g. hover or stand).  NPCs don't have a client that will quickly reset this flag.
@@ -2203,6 +2466,9 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (satOnObject)
             {
+                PrevSitOffset = m_pos; // Save sit offset
+                UnRegisterSeatControls(part.ParentGroup.UUID);
+
                 TaskInventoryDictionary taskIDict = part.TaskInventory;
                 if (taskIDict != null)
                 {
@@ -2218,6 +2484,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
 
+                part.ParentGroup.DeleteAvatar(UUID);
                 Vector3 sitPartWorldPosition = part.GetWorldPosition();
                 ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
 
@@ -2278,6 +2545,9 @@ namespace OpenSim.Region.Framework.Scenes
                 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
             }
 
+            else if (PhysicsActor == null)
+                AddToPhysicalScene(false);
+
             Animator.TrySetMovementAnimation("STAND");
             TriggerScenePresenceUpdated();
         }
@@ -2326,11 +2596,8 @@ namespace OpenSim.Region.Framework.Scenes
             if (part == null)
                 return;
 
-            // TODO: determine position to sit at based on scene geometry; don't trust offset from client
-            // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it
-
             if (PhysicsActor != null)
-                m_sitAvatarHeight = PhysicsActor.Size.Z;
+                m_sitAvatarHeight = PhysicsActor.Size.Z * 0.5f;
 
             bool canSit = false;
 
@@ -2357,33 +2624,32 @@ namespace OpenSim.Region.Framework.Scenes
             }
             else
             {
+                if (PhysicsSit(part,offset)) // physics engine 
+                    return;
+
                 Vector3 pos = part.AbsolutePosition + offset;
 
                 if (Util.GetDistanceTo(AbsolutePosition, pos) <= 10)
                 {
-//                    m_log.DebugFormat(
-//                        "[SCENE PRESENCE]: Sitting {0} on {1} {2} because sit target is unset and within 10m",
-//                        Name, part.Name, part.LocalId);
-
                     AbsolutePosition = pos + new Vector3(0.0f, 0.0f, m_sitAvatarHeight);
                     canSit = true;
                 }
-//                else
-//                {
-//                    m_log.DebugFormat(
-//                        "[SCENE PRESENCE]: Ignoring sit request of {0} on {1} {2} because sit target is unset and outside 10m",
-//                        Name, part.Name, part.LocalId);
-//                }
             }
 
             if (canSit)
             {
+
                 if (PhysicsActor != null)
                 {
                     // We can remove the physicsActor until they stand up.
                     RemoveFromPhysicalScene();
                 }
 
+                if (MovingToTarget)
+                    ResetMoveToTarget();
+
+                Velocity = Vector3.Zero;
+
                 part.AddSittingAvatar(UUID);
 
                 cameraAtOffset = part.GetCameraAtOffset();
@@ -2427,14 +2693,6 @@ namespace OpenSim.Region.Framework.Scenes
                 m_requestedSitTargetID = part.LocalId;
                 m_requestedSitTargetUUID = part.UUID;
 
-//                m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset);
-
-                if (m_scene.PhysicsScene.SupportsRayCast())
-                {
-                    //m_scene.PhysicsScene.RaycastWorld(Vector3.Zero,Vector3.Zero, 0.01f,new RaycastCallback());
-                    //SitRayCastAvatarPosition(part);
-                    //return;
-                }
             }
             else
             {
@@ -2444,197 +2702,115 @@ namespace OpenSim.Region.Framework.Scenes
             SendSitResponse(targetID, offset, Quaternion.Identity);
         }
 
-        /*
-        public void SitRayCastAvatarPosition(SceneObjectPart part)
+        // returns  false if does not suport so older sit can be tried
+        public bool PhysicsSit(SceneObjectPart part, Vector3 offset)
         {
-            Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset;
-            Vector3 StartRayCastPosition = AbsolutePosition;
-            Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition);
-            float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition);
-            m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastAvatarPositionResponse);
-        }
-
-        public void SitRayCastAvatarPositionResponse(bool hitYN, Vector3 collisionPoint, uint localid, float pdistance, Vector3 normal)
-        {
-            SceneObjectPart part =  FindNextAvailableSitTarget(m_requestedSitTargetUUID);
-            if (part != null)
-            {
-                if (hitYN)
-                {
-                    if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f))
-                    {
-                        SitRaycastFindEdge(collisionPoint, normal);
-                        m_log.DebugFormat("[SIT]: Raycast Avatar Position succeeded at point: {0}, normal:{1}", collisionPoint, normal);
-                    }
-                    else
-                    {
-                        SitRayCastAvatarPositionCameraZ(part);
-                    }
-                }
-                else
-                {
-                    SitRayCastAvatarPositionCameraZ(part);
-                }
-            }
-            else
+// TODO: Pull in these bits
+            return false;
+/*
+            if (part == null || part.ParentGroup.IsAttachment)
             {
-                ControllingClient.SendAlertMessage("Sit position no longer exists");
-                m_requestedSitTargetUUID = UUID.Zero;
-                m_requestedSitTargetID = 0;
-                m_requestedSitOffset = Vector3.Zero;
+                return true;
             }
 
-        }
-
-        public void SitRayCastAvatarPositionCameraZ(SceneObjectPart part)
-        {
-            // Next, try to raycast from the camera Z position
-            Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset;
-            Vector3 StartRayCastPosition = AbsolutePosition; StartRayCastPosition.Z = CameraPosition.Z;
-            Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition);
-            float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition);
-            m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastAvatarPositionCameraZResponse);
-        }
+            if ( m_scene.PhysicsScene == null)
+                return false;
 
-        public void SitRayCastAvatarPositionCameraZResponse(bool hitYN, Vector3 collisionPoint, uint localid, float pdistance, Vector3 normal)
-        {
-            SceneObjectPart part = FindNextAvailableSitTarget(m_requestedSitTargetUUID);
-            if (part != null)
+            if (part.PhysActor == null)
             {
-                if (hitYN)
-                {
-                    if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f))
-                    {
-                        SitRaycastFindEdge(collisionPoint, normal);
-                        m_log.DebugFormat("[SIT]: Raycast Avatar Position + CameraZ succeeded at point: {0}, normal:{1}", collisionPoint, normal);
-                    }
-                    else
-                    {
-                        SitRayCastCameraPosition(part);
-                    }
-                }
+                // none physcis shape
+                if (part.PhysicsShapeType == (byte)PhysicsShapeType.None)
+                    ControllingClient.SendAlertMessage(" There is no suitable surface to sit on, try another spot.");
                 else
-                {
-                    SitRayCastCameraPosition(part);
+                { // non physical phantom  TODO
+                    ControllingClient.SendAlertMessage(" There is no suitable surface to sit on, try another spot.");
+                    return false;
                 }
-            }
-            else
-            {
-                ControllingClient.SendAlertMessage("Sit position no longer exists");
-                m_requestedSitTargetUUID = UUID.Zero;
-                m_requestedSitTargetID = 0;
-                m_requestedSitOffset = Vector3.Zero;
+                return true;
             }
 
-        }
 
-        public void SitRayCastCameraPosition(SceneObjectPart part)
-        {
-            // Next, try to raycast from the camera position
-            Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset;
-            Vector3 StartRayCastPosition = CameraPosition;
-            Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition);
-            float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition);
-            m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastCameraPositionResponse);
-        }
+            // not doing autopilot
+            m_requestedSitTargetID = 0; 
 
-        public void SitRayCastCameraPositionResponse(bool hitYN, Vector3 collisionPoint, uint localid, float pdistance, Vector3 normal)
-        {
-            SceneObjectPart part = FindNextAvailableSitTarget(m_requestedSitTargetUUID);
-            if (part != null)
-            {
-                if (hitYN)
-                {
-                    if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f))
-                    {
-                        SitRaycastFindEdge(collisionPoint, normal);
-                        m_log.DebugFormat("[SIT]: Raycast Camera Position succeeded at point: {0}, normal:{1}", collisionPoint, normal);
-                    }
-                    else
-                    {
-                        SitRayHorizontal(part);
-                    }
-                }
-                else
-                {
-                    SitRayHorizontal(part);
-                }
-            }
-            else
-            {
-                ControllingClient.SendAlertMessage("Sit position no longer exists");
-                m_requestedSitTargetUUID = UUID.Zero;
-                m_requestedSitTargetID = 0;
-                m_requestedSitOffset = Vector3.Zero;
-            }
+            if (m_scene.PhysicsScene.SitAvatar(part.PhysActor, AbsolutePosition, CameraPosition, offset, new Vector3(0.35f, 0, 0.65f), PhysicsSitResponse) != 0)
+                return true;
 
+            return false;
+*/
         }
 
-        public void SitRayHorizontal(SceneObjectPart part)
+
+        private bool CanEnterLandPosition(Vector3 testPos)
         {
-            // Next, try to raycast from the avatar position to fwd
-            Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset;
-            Vector3 StartRayCastPosition = CameraPosition;
-            Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition);
-            float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition);
-            m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastHorizontalResponse);
+            ILandObject land = m_scene.LandChannel.GetLandObject(testPos.X, testPos.Y);
+
+            if (land == null || land.LandData.Name == "NO_LAND")
+                return true;
+
+            return land.CanBeOnThisLand(UUID,testPos.Z);
         }
 
-        public void SitRayCastHorizontalResponse(bool hitYN, Vector3 collisionPoint, uint localid, float pdistance, Vector3 normal)
+        // status
+        //          < 0 ignore
+        //          0   bad sit spot
+        public void PhysicsSitResponse(int status, uint partID, Vector3 offset, Quaternion Orientation)
         {
-            SceneObjectPart part = FindNextAvailableSitTarget(m_requestedSitTargetUUID);
-            if (part != null)
+            if (status < 0)
+                return;
+
+            if (status == 0)
             {
-                if (hitYN)
-                {
-                    if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f))
-                    {
-                        SitRaycastFindEdge(collisionPoint, normal);
-                        m_log.DebugFormat("[SIT]: Raycast Horizontal Position succeeded at point: {0}, normal:{1}", collisionPoint, normal);
-                        // Next, try to raycast from the camera position
-                        Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset;
-                        Vector3 StartRayCastPosition = CameraPosition;
-                        Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition);
-                        float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition);
-                        //m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastResponseAvatarPosition);
-                    }
-                    else
-                    {
-                        ControllingClient.SendAlertMessage("Sit position not accessable.");
-                        m_requestedSitTargetUUID = UUID.Zero;
-                        m_requestedSitTargetID = 0;
-                        m_requestedSitOffset = Vector3.Zero;
-                    }
-                }
-                else
-                {
-                    ControllingClient.SendAlertMessage("Sit position not accessable.");
-                    m_requestedSitTargetUUID = UUID.Zero;
-                    m_requestedSitTargetID = 0;
-                    m_requestedSitOffset = Vector3.Zero;
-                }
+                ControllingClient.SendAlertMessage(" There is no suitable surface to sit on, try another spot.");
+                return;
             }
-            else
+
+            SceneObjectPart part = m_scene.GetSceneObjectPart(partID);
+            if (part == null)
+                return;
+
+            Vector3 targetPos = part.GetWorldPosition() + offset * part.GetWorldRotation();     
+            if(!CanEnterLandPosition(targetPos))
             {
-                ControllingClient.SendAlertMessage("Sit position no longer exists");
-                m_requestedSitTargetUUID = UUID.Zero;
-                m_requestedSitTargetID = 0;
-                m_requestedSitOffset = Vector3.Zero;
+                ControllingClient.SendAlertMessage(" Sit position on restricted land, try another spot");
+                return;
             }
 
-        }
+            RemoveFromPhysicalScene();
 
-        private void SitRaycastFindEdge(Vector3 collisionPoint, Vector3 collisionNormal)
-        {
-            int i = 0;
-            //throw new NotImplementedException();
-            //m_requestedSitTargetUUID = UUID.Zero;
-            //m_requestedSitTargetID = 0;
-            //m_requestedSitOffset = Vector3.Zero;
+            if (MovingToTarget)
+                ResetMoveToTarget();
+
+            Velocity = Vector3.Zero;
+
+            part.AddSittingAvatar(UUID);
+
+            Vector3 cameraAtOffset = part.GetCameraAtOffset();
+            Vector3 cameraEyeOffset = part.GetCameraEyeOffset();
+            bool forceMouselook = part.GetForceMouselook();
+
+            ControllingClient.SendSitResponse(
+                part.UUID, offset, Orientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
+
+            // not using autopilot
+
+            Rotation = Orientation;
+            m_pos = offset;
+
+            m_requestedSitTargetID = 0;
+            part.ParentGroup.AddAvatar(UUID);
+
+            ParentPart = part;
+            ParentID = part.LocalId;
+            if(status == 3)
+                Animator.TrySetMovementAnimation("SIT_GROUND");
+            else
+                Animator.TrySetMovementAnimation("SIT");
+            SendAvatarDataToAllAgents();
 
-            SendSitResponse(ControllingClient, m_requestedSitTargetUUID, collisionPoint - m_requestedSitOffset, Quaternion.Identity);
+            part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
         }
-        */
+
 
         public void HandleAgentSit(IClientAPI remoteClient, UUID agentID)
         {
@@ -2654,6 +2830,7 @@ namespace OpenSim.Region.Framework.Scenes
                     return;
                 }
 
+
                 if (part.SitTargetAvatar == UUID)
                 {
                     Vector3 sitTargetPos = part.SitTargetPosition;
@@ -2668,29 +2845,39 @@ namespace OpenSim.Region.Framework.Scenes
 
                     //Quaternion result = (sitTargetOrient * vq) * nq;
 
-                    Vector3 newPos = sitTargetPos + SIT_TARGET_ADJUSTMENT;
-                    Quaternion newRot;
+                    double x, y, z, m;
 
-                    if (part.IsRoot)
-                    {
-                        newRot = sitTargetOrient;
-                    }
-                    else
+                    Quaternion r = sitTargetOrient;
+                    m = r.X * r.X + r.Y * r.Y + r.Z * r.Z + r.W * r.W;
+
+                    if (Math.Abs(1.0 - m) > 0.000001)
                     {
-                        newPos = newPos * part.RotationOffset;
-                        newRot = part.RotationOffset * sitTargetOrient;
+                        m = 1.0 / Math.Sqrt(m);
+                        r.X *= (float)m;
+                        r.Y *= (float)m;
+                        r.Z *= (float)m;
+                        r.W *= (float)m;
                     }
 
-                    newPos += part.OffsetPosition;
+                    x = 2 * (r.X * r.Z + r.Y * r.W);
+                    y = 2 * (-r.X * r.W + r.Y * r.Z);
+                    z = -r.X * r.X - r.Y * r.Y + r.Z * r.Z + r.W * r.W;
+
+                    Vector3 up = new Vector3((float)x, (float)y, (float)z);
+                    Vector3 sitOffset = up * Appearance.AvatarHeight * 0.02638f;
 
-                    m_pos = newPos;
-                    Rotation = newRot;
+                    m_pos = sitTargetPos + sitOffset + SIT_TARGET_ADJUSTMENT;
+
+//                    m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT - sitOffset;
+                    Rotation = sitTargetOrient;
+//                    ParentPosition = part.AbsolutePosition;
+                    part.ParentGroup.AddAvatar(UUID);
                 }
                 else
                 {
-                    // An viewer expects to specify sit positions as offsets to the root prim, even if a child prim is
-                    // being sat upon.
-                    m_pos -= part.GroupPosition;
+                    m_pos -= part.AbsolutePosition;
+//                    ParentPosition = part.AbsolutePosition;
+                    part.ParentGroup.AddAvatar(UUID);
 
 //                        m_log.DebugFormat(
 //                            "[SCENE PRESENCE]: Sitting {0} at position {1} ({2} + {3}) on part {4} {5} without sit target",
@@ -2807,8 +2994,8 @@ namespace OpenSim.Region.Framework.Scenes
                         direc.Z *= 2.6f;
 
                         // TODO: PreJump and jump happen too quickly.  Many times prejump gets ignored.
-                        Animator.TrySetMovementAnimation("PREJUMP");
-                        Animator.TrySetMovementAnimation("JUMP");
+//                        Animator.TrySetMovementAnimation("PREJUMP");
+//                        Animator.TrySetMovementAnimation("JUMP");
                     }
                 }
             }
@@ -2817,6 +3004,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             // TODO: Add the force instead of only setting it to support multiple forces per frame?
             m_forceToApply = direc;
+            Animator.UpdateMovementAnimations();
         }
 
         #endregion
@@ -2834,16 +3022,12 @@ namespace OpenSim.Region.Framework.Scenes
                 // NOTE: Velocity is not the same as m_velocity. Velocity will attempt to
                 // grab the latest PhysicsActor velocity, whereas m_velocity is often
                 // storing a requested force instead of an actual traveling velocity
+                if (Appearance.AvatarSize != m_lastSize && !IsLoggingIn)
+                    SendAvatarDataToAllAgents();
 
-                // Throw away duplicate or insignificant updates
-                if (
-                    // If the velocity has become zero, send it no matter what.
-                       (Velocity != m_lastVelocity && Velocity == Vector3.Zero)
-                    // otherwise, if things have changed reasonably, send the update
-                    || (!Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE)
-                        || !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE)
-                        || !m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE)))
-
+                if (!Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) ||
+                    !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) ||
+                    !m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE))
                 {
                     SendTerseUpdateToAllClients();
 
@@ -3003,9 +3187,7 @@ namespace OpenSim.Region.Framework.Scenes
             // again here... this comes after the cached appearance check because the avatars
             // appearance goes into the avatar update packet
             SendAvatarDataToAllAgents();
-
-            // This invocation always shows up in the viewer logs as an error.
-            // SendAppearanceToAgent(this);
+            SendAppearanceToAgent(this);
 
             // If we are using the the cached appearance then send it out to everyone
             if (cachedappearance)
@@ -3036,6 +3218,8 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
             }
 
+            m_lastSize = Appearance.AvatarSize;
+
             int count = 0;
             m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
                                          {
@@ -3143,6 +3327,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             avatar.ControllingClient.SendAppearance(
                 UUID, Appearance.VisualParams, Appearance.Texture.GetBytes());
+
+            
         }
 
         #endregion
@@ -3216,8 +3402,9 @@ namespace OpenSim.Region.Framework.Scenes
 
             // If we don't have a PhysActor, we can't cross anyway
             // Also don't do this while sat, sitting avatars cross with the
-            // object they sit on.
-            if (ParentID != 0 || PhysicsActor == null)
+            // object they sit on. ParentUUID denoted a pending sit, don't
+            // interfere with it.
+            if (ParentID != 0 || PhysicsActor == null || ParentUUID != UUID.Zero)
                 return;
 
             if (!IsInTransit)
@@ -3561,6 +3748,9 @@ namespace OpenSim.Region.Framework.Scenes
             cAgent.AlwaysRun = SetAlwaysRun;
 
             cAgent.Appearance = new AvatarAppearance(Appearance);
+
+            cAgent.ParentPart = ParentUUID;
+            cAgent.SitOffset = PrevSitOffset;
             
             lock (scriptedcontrols)
             {
@@ -3569,7 +3759,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 foreach (ScriptControllers c in scriptedcontrols.Values)
                 {
-                    controls[i++] = new ControllerData(c.itemID, (uint)c.ignoreControls, (uint)c.eventControls);
+                    controls[i++] = new ControllerData(c.objectID, c.itemID, (uint)c.ignoreControls, (uint)c.eventControls);
                 }
                 cAgent.Controllers = controls;
             }
@@ -3603,6 +3793,8 @@ namespace OpenSim.Region.Framework.Scenes
             CameraAtAxis = cAgent.AtAxis;
             CameraLeftAxis = cAgent.LeftAxis;
             CameraUpAxis = cAgent.UpAxis;
+            ParentUUID = cAgent.ParentPart;
+            PrevSitOffset = cAgent.SitOffset;
 
             // When we get to the point of re-computing neighbors everytime this
             // changes, then start using the agent's drawdistance rather than the 
@@ -3640,6 +3832,7 @@ namespace OpenSim.Region.Framework.Scenes
                         foreach (ControllerData c in cAgent.Controllers)
                         {
                             ScriptControllers sc = new ScriptControllers();
+                            sc.objectID = c.ObjectID;
                             sc.itemID = c.ItemID;
                             sc.ignoreControls = (ScriptControlled)c.IgnoreControls;
                             sc.eventControls = (ScriptControlled)c.EventControls;
@@ -3705,20 +3898,27 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             if (Appearance.AvatarHeight == 0)
-                Appearance.SetHeight();
+//                Appearance.SetHeight();
+                Appearance.SetSize(new Vector3(0.45f,0.6f,1.9f));
 
             PhysicsScene scene = m_scene.PhysicsScene;
 
             Vector3 pVec = AbsolutePosition;
 
+/*
+            PhysicsActor = scene.AddAvatar(
+                LocalId, Firstname + "." + Lastname, pVec,
+                new Vector3(0.45f, 0.6f, Appearance.AvatarHeight), isFlying);
+*/
+
             PhysicsActor = scene.AddAvatar(
                 LocalId, Firstname + "." + Lastname, pVec,
-                new Vector3(0f, 0f, Appearance.AvatarHeight), isFlying);
+                Appearance.AvatarBoxSize, isFlying);
 
             //PhysicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients;
             PhysicsActor.OnCollisionUpdate += PhysicsCollisionUpdate;
             PhysicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong
-            PhysicsActor.SubscribeEvents(500);
+            PhysicsActor.SubscribeEvents(100);
             PhysicsActor.LocalID = LocalId;
         }
 
@@ -3732,6 +3932,7 @@ namespace OpenSim.Region.Framework.Scenes
                 ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar.  You may not be able to move until you relog.", true);
         }
 
+
         /// <summary>
         /// Event called by the physics plugin to tell the avatar about a collision.
         /// </summary>
@@ -3745,7 +3946,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="e"></param>
         public void PhysicsCollisionUpdate(EventArgs e)
         {
-            if (IsChildAgent)
+            if (IsChildAgent || Animator == null)
                 return;
             
             //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f))
@@ -3762,7 +3963,6 @@ namespace OpenSim.Region.Framework.Scenes
             CollisionEventUpdate collisionData = (CollisionEventUpdate)e;
             Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList;
 
-            CollisionPlane = Vector4.UnitW;
 
 //            // No collisions at all means we may be flying. Update always
 //            // to make falling work
@@ -3772,34 +3972,7 @@ namespace OpenSim.Region.Framework.Scenes
 //                m_lastColCount = coldata.Count;
 //            }
 
-            if (coldata.Count != 0)
-            {
-                switch (Animator.CurrentMovementAnimation)
-                {
-                    case "STAND":
-                    case "WALK":
-                    case "RUN":
-                    case "CROUCH":
-                    case "CROUCHWALK":
-                        {
-                            ContactPoint lowest;
-                            lowest.SurfaceNormal = Vector3.Zero;
-                            lowest.Position = Vector3.Zero;
-                            lowest.Position.Z = Single.NaN;
-
-                            foreach (ContactPoint contact in coldata.Values)
-                            {
-                                if (Single.IsNaN(lowest.Position.Z) || contact.Position.Z < lowest.Position.Z)
-                                {
-                                    lowest = contact;
-                                }
-                            }
-
-                            CollisionPlane = new Vector4(-lowest.SurfaceNormal, -Vector3.Dot(lowest.Position, lowest.SurfaceNormal));
-                        }
-                        break;
-                }
-            }
+            CollisionPlane = Vector4.UnitW;
 
             // Gods do not take damage and Invulnerable is set depending on parcel/region flags
             if (Invulnerable || GodLevel > 0)
@@ -3898,6 +4071,12 @@ namespace OpenSim.Region.Framework.Scenes
             // m_reprioritizationTimer.Dispose(); 
 
             RemoveFromPhysicalScene();
+          
+            m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
+
+//            if (Animator != null)
+//                Animator.Close();
+            Animator = null;
 
             LifecycleState = ScenePresenceState.Removed;
         }
@@ -4133,10 +4312,18 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void RegisterControlEventsToScript(int controls, int accept, int pass_on, uint Obj_localID, UUID Script_item_UUID)
         {
+            SceneObjectPart p = m_scene.GetSceneObjectPart(Obj_localID);
+            if (p == null)
+                return;
+
+            ControllingClient.SendTakeControls(controls, false, false);
+            ControllingClient.SendTakeControls(controls, true, false);
+
             ScriptControllers obj = new ScriptControllers();
             obj.ignoreControls = ScriptControlled.CONTROL_ZERO;
             obj.eventControls = ScriptControlled.CONTROL_ZERO;
 
+            obj.objectID = p.ParentGroup.UUID;
             obj.itemID = Script_item_UUID;
             if (pass_on == 0 && accept == 0)
             {
@@ -4185,6 +4372,21 @@ namespace OpenSim.Region.Framework.Scenes
             ControllingClient.SendTakeControls(int.MaxValue, false, false);
         }
 
+        private void UnRegisterSeatControls(UUID obj)
+        {
+            List<UUID> takers = new List<UUID>();
+
+            foreach (ScriptControllers c in scriptedcontrols.Values)
+            {
+                if (c.objectID == obj)
+                    takers.Add(c.itemID);
+            }
+            foreach (UUID t in takers)
+            {
+                UnRegisterControlEventsToScript(0, t);
+            }
+        }
+
         public void UnRegisterControlEventsToScript(uint Obj_localID, UUID Script_item_UUID)
         {
             ScriptControllers takecontrols;
@@ -4514,6 +4716,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         private void CheckAndAdjustLandingPoint(ref Vector3 pos)
         {
+            string reason;
+
+            // Honor bans
+            if (!m_scene.TestLandRestrictions(UUID, out reason, ref pos.X, ref pos.Y))
+                return;
+
             SceneObjectGroup telehub = null;
             if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero && (telehub = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject)) != null)
             {
@@ -4553,11 +4761,119 @@ namespace OpenSim.Region.Framework.Scenes
                         pos = land.LandData.UserLocation;
                     }
                 }
-
+                
                 land.SendLandUpdateToClient(ControllingClient);
             }
         }
 
+        private DetectedObject CreateDetObject(SceneObjectPart obj)
+        {
+            DetectedObject detobj = new DetectedObject();
+            detobj.keyUUID = obj.UUID;
+            detobj.nameStr = obj.Name;
+            detobj.ownerUUID = obj.OwnerID;
+            detobj.posVector = obj.AbsolutePosition;
+            detobj.rotQuat = obj.GetWorldRotation();
+            detobj.velVector = obj.Velocity;
+            detobj.colliderType = 0;
+            detobj.groupUUID = obj.GroupID;
+
+            return detobj;
+        }
+
+        private DetectedObject CreateDetObject(ScenePresence av)
+        {
+            DetectedObject detobj = new DetectedObject();
+            detobj.keyUUID = av.UUID;
+            detobj.nameStr = av.ControllingClient.Name;
+            detobj.ownerUUID = av.UUID;
+            detobj.posVector = av.AbsolutePosition;
+            detobj.rotQuat = av.Rotation;
+            detobj.velVector = av.Velocity;
+            detobj.colliderType = 0;
+            detobj.groupUUID = av.ControllingClient.ActiveGroupId;
+
+            return detobj;
+        }
+
+        private DetectedObject CreateDetObjectForGround()
+        {
+            DetectedObject detobj = new DetectedObject();
+            detobj.keyUUID = UUID.Zero;
+            detobj.nameStr = "";
+            detobj.ownerUUID = UUID.Zero;
+            detobj.posVector = AbsolutePosition;
+            detobj.rotQuat = Quaternion.Identity;
+            detobj.velVector = Vector3.Zero;
+            detobj.colliderType = 0;
+            detobj.groupUUID = UUID.Zero;
+
+            return detobj;
+        }
+
+        private ColliderArgs CreateColliderArgs(SceneObjectPart dest, List<uint> colliders)
+        {
+            ColliderArgs colliderArgs = new ColliderArgs();
+            List<DetectedObject> colliding = new List<DetectedObject>();
+            foreach (uint localId in colliders)
+            {
+                if (localId == 0)
+                    continue;
+
+                SceneObjectPart obj = m_scene.GetSceneObjectPart(localId);
+                if (obj != null)
+                {
+                    if (!dest.CollisionFilteredOut(obj.UUID, obj.Name))
+                        colliding.Add(CreateDetObject(obj));
+                }
+                else
+                {
+                    ScenePresence av = m_scene.GetScenePresence(localId);
+                    if (av != null && (!av.IsChildAgent))
+                    {
+                        if (!dest.CollisionFilteredOut(av.UUID, av.Name))
+                            colliding.Add(CreateDetObject(av));
+                    }
+                }
+            }
+
+            colliderArgs.Colliders = colliding;
+
+            return colliderArgs;
+        }
+
+        private delegate void ScriptCollidingNotification(uint localID, ColliderArgs message);
+
+        private void SendCollisionEvent(SceneObjectGroup dest, scriptEvents ev, List<uint> colliders, ScriptCollidingNotification notify)
+        {
+            ColliderArgs CollidingMessage;
+
+            if (colliders.Count > 0)
+            {
+                if ((dest.RootPart.ScriptEvents & ev) != 0)
+                {
+                    CollidingMessage = CreateColliderArgs(dest.RootPart, colliders);
+
+                    if (CollidingMessage.Colliders.Count > 0)
+                        notify(dest.RootPart.LocalId, CollidingMessage);
+                }
+            }
+        }
+
+        private void SendLandCollisionEvent(SceneObjectGroup dest, scriptEvents ev, ScriptCollidingNotification notify)
+        {
+            if ((dest.RootPart.ScriptEvents & ev) != 0)
+            {
+                ColliderArgs LandCollidingMessage = new ColliderArgs();
+                List<DetectedObject> colliding = new List<DetectedObject>();
+
+                colliding.Add(CreateDetObjectForGround());
+                LandCollidingMessage.Colliders = colliding;
+
+                notify(dest.RootPart.LocalId, LandCollidingMessage);
+            }
+        }
+
         private void TeleportFlagsDebug() {
     
             // Some temporary debugging help to show all the TeleportFlags we have...
@@ -4582,6 +4898,5 @@ namespace OpenSim.Region.Framework.Scenes
             m_log.InfoFormat("[SCENE PRESENCE]: TELEPORT ******************");
     
         }
-
     }
 }
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index a4fc4ae..b3fdd22 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -908,7 +908,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
             // Mimicking LLClientView which gets always set appearance from client.
             AvatarAppearance appearance;
             m_scene.GetAvatarAppearance(this, out appearance);
-            OnSetAppearance(this, appearance.Texture, (byte[])appearance.VisualParams.Clone(), new List<CachedTextureRequestArg>());
+            OnSetAppearance(this, appearance.Texture, (byte[])appearance.VisualParams.Clone(),appearance.AvatarSize, new WearableCacheItem[0]);
         }
 
         public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args)
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index f841d5c..e1ef4d0 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -110,6 +110,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
             // ScenePresence.SendInitialData() to reset our entire appearance.
             m_scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId));
 
+/*
             m_afMod.SetAppearance(sp, originalTe, null);
 
             UUID npcId = m_npcMod.CreateNPC("John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, m_scene, sp.Appearance);
@@ -125,6 +126,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
 
             // Have to account for both SP and NPC.
             Assert.That(m_scene.AuthenticateHandler.GetAgentCircuits().Count, Is.EqualTo(2));
+*/
         }
 
         [Test]
diff --git a/OpenSim/Tests/Performance/NPCPerformanceTests.cs b/OpenSim/Tests/Performance/NPCPerformanceTests.cs
index 2026a88..eb09061 100644
--- a/OpenSim/Tests/Performance/NPCPerformanceTests.cs
+++ b/OpenSim/Tests/Performance/NPCPerformanceTests.cs
@@ -144,6 +144,7 @@ namespace OpenSim.Tests.Performance
             // ScenePresence.SendInitialData() to reset our entire appearance.
             scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId));
 
+/*
             afm.SetAppearance(sp, originalTe, null);
 
             INPCModule npcModule = scene.RequestModuleInterface<INPCModule>();
@@ -185,6 +186,7 @@ namespace OpenSim.Tests.Performance
                 endGcMemory / 1024 / 1024,
                 startGcMemory / 1024 / 1024,
                 (endGcMemory - startGcMemory) / 1024 / 1024);
+*/
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1


From 92aad6f1bb45974927fa43d6fd30f98337dee3f0 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 11 Dec 2013 01:44:03 +0000
Subject: Add missing files *blush*

---
 OpenSim/Framework/WearableCacheItem.cs             | 157 +++++++++++++++++++++
 .../Framework/Interfaces/IBakedTextureModule.cs    |  19 +++
 2 files changed, 176 insertions(+)
 create mode 100644 OpenSim/Framework/WearableCacheItem.cs
 create mode 100644 OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs

diff --git a/OpenSim/Framework/WearableCacheItem.cs b/OpenSim/Framework/WearableCacheItem.cs
new file mode 100644
index 0000000..1aecf79
--- /dev/null
+++ b/OpenSim/Framework/WearableCacheItem.cs
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+
+namespace OpenSim.Framework
+{
+    [Serializable]
+    public class WearableCacheItem
+    {
+        public uint TextureIndex { get; set; }
+        public UUID CacheId { get; set; }
+        public UUID TextureID { get; set; }
+        public AssetBase TextureAsset { get; set; }
+
+
+        public static WearableCacheItem[] GetDefaultCacheItem()
+        {
+            int itemmax = 21;
+            WearableCacheItem[] retitems = new WearableCacheItem[itemmax];
+            for (uint i=0;i<itemmax;i++)
+                retitems[i] = new WearableCacheItem() {CacheId = UUID.Zero, TextureID = UUID.Zero, TextureIndex = i + 1};
+            return retitems;
+        }
+        public static WearableCacheItem[] FromOSD(OSD pInput, IImprovedAssetCache dataCache)
+        {
+            List<WearableCacheItem> ret = new List<WearableCacheItem>();
+            if (pInput.Type == OSDType.Array)
+            {
+                OSDArray itemarray = (OSDArray) pInput;
+                foreach (OSDMap item in itemarray)
+                {
+                    ret.Add(new WearableCacheItem()
+                                {
+                                    TextureIndex = item["textureindex"].AsUInteger(),
+                                    CacheId = item["cacheid"].AsUUID(),
+                                    TextureID = item["textureid"].AsUUID()
+                                });
+                    
+                    if (dataCache != null && item.ContainsKey("assetdata"))
+                    {
+                        AssetBase asset = new AssetBase(item["textureid"].AsUUID(),"BakedTexture",(sbyte)AssetType.Texture,UUID.Zero.ToString());
+                        asset.Temporary = true;
+                        asset.Data = item["assetdata"].AsBinary();
+                        dataCache.Cache(asset);
+                    }
+                }
+            }
+            else if (pInput.Type == OSDType.Map)
+            {
+                OSDMap item = (OSDMap) pInput;
+                ret.Add(new WearableCacheItem(){
+                                    TextureIndex = item["textureindex"].AsUInteger(),
+                                    CacheId = item["cacheid"].AsUUID(),
+                                    TextureID = item["textureid"].AsUUID()
+                                });
+                if (dataCache != null && item.ContainsKey("assetdata"))
+                {
+                    string assetCreator = item["assetcreator"].AsString();
+                    string assetName = item["assetname"].AsString();
+                    AssetBase asset = new AssetBase(item["textureid"].AsUUID(), assetName, (sbyte)AssetType.Texture, assetCreator);
+                    asset.Temporary = true;
+                    asset.Data = item["assetdata"].AsBinary();
+                    dataCache.Cache(asset);
+                }
+            }
+            else
+            {
+                return new WearableCacheItem[0];
+            }
+            return ret.ToArray();
+
+        }
+        public static OSD ToOSD(WearableCacheItem[] pcacheItems, IImprovedAssetCache dataCache)
+        {
+            OSDArray arr = new OSDArray();
+            foreach (WearableCacheItem item in pcacheItems)
+            {
+                OSDMap itemmap = new OSDMap();
+                itemmap.Add("textureindex", OSD.FromUInteger(item.TextureIndex));
+                itemmap.Add("cacheid", OSD.FromUUID(item.CacheId));
+                itemmap.Add("textureid", OSD.FromUUID(item.TextureID));
+                if (dataCache != null)
+                {
+                    if (dataCache.Check(item.TextureID.ToString()))
+                    {
+                        AssetBase assetItem = dataCache.Get(item.TextureID.ToString());
+                        if (assetItem != null)
+                        {
+                            itemmap.Add("assetdata", OSD.FromBinary(assetItem.Data));
+                            itemmap.Add("assetcreator", OSD.FromString(assetItem.CreatorID));
+                            itemmap.Add("assetname", OSD.FromString(assetItem.Name));
+                        }
+                    }
+                }
+                arr.Add(itemmap);
+            }
+            return arr;
+        }
+        public static WearableCacheItem SearchTextureIndex(uint pTextureIndex,WearableCacheItem[] pcacheItems)
+        {
+            for (int i = 0; i < pcacheItems.Length; i++)
+            {
+                if (pcacheItems[i].TextureIndex == pTextureIndex)
+                    return pcacheItems[i];
+            }
+            return null;
+        }
+        public static WearableCacheItem SearchTextureCacheId(UUID pCacheId, WearableCacheItem[] pcacheItems)
+        {
+            for (int i = 0; i < pcacheItems.Length; i++)
+            {
+                if (pcacheItems[i].CacheId == pCacheId)
+                    return pcacheItems[i];
+            }
+            return null;
+        }
+        public static WearableCacheItem SearchTextureTextureId(UUID pTextureId, WearableCacheItem[] pcacheItems)
+        {
+            for (int i = 0; i < pcacheItems.Length; i++)
+            {
+                if (pcacheItems[i].TextureID == pTextureId)
+                    return pcacheItems[i];
+            }
+            return null;
+        }
+    }
+
+
+}
diff --git a/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs
new file mode 100644
index 0000000..21ed44f
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs
@@ -0,0 +1,19 @@
+////////////////////////////////////////////////////////////////
+//
+// (c) 2009, 2010 Careminster Limited and Melanie Thielker
+//
+// All rights reserved
+//
+using System;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Interfaces
+{
+    public interface IBakedTextureModule
+    {
+        WearableCacheItem[] Get(UUID id);
+        void Store(UUID id, WearableCacheItem[] data);
+    }
+}
-- 
cgit v1.1


From 82ebb86d5808847fefcbe1affe24201ce4270ac2 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 11 Dec 2013 01:51:57 +0000
Subject: Replace proprietary file header with BSD one

---
 .../Framework/Interfaces/IBakedTextureModule.cs    | 33 ++++++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs
index 21ed44f..b536a49 100644
--- a/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs
@@ -1,9 +1,30 @@
-////////////////////////////////////////////////////////////////
-//
-// (c) 2009, 2010 Careminster Limited and Melanie Thielker
-//
-// All rights reserved
-//
+/*
+ * 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.Framework;
-- 
cgit v1.1


From 1d605642f78f46fed9e4cd38b117555717f87309 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 11 Dec 2013 23:59:52 +0000
Subject: Refix sitting on child prims by reinserting relevant code back into
 SP.HandleAgentSit()

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 25 +++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index edb8ca8..0282ad0 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2868,14 +2868,33 @@ namespace OpenSim.Region.Framework.Scenes
 
                     m_pos = sitTargetPos + sitOffset + SIT_TARGET_ADJUSTMENT;
 
-//                    m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT - sitOffset;
-                    Rotation = sitTargetOrient;
+                    Vector3 newPos = sitTargetPos + sitOffset + SIT_TARGET_ADJUSTMENT;
+                    Quaternion newRot;
+
+                    if (part.IsRoot)
+                    {
+                        newRot = sitTargetOrient;
+                    }
+                    else
+                    {
+                        newPos = newPos * part.RotationOffset;
+                        newRot = part.RotationOffset * sitTargetOrient;
+                    }
+
+                    newPos += part.OffsetPosition;
+
+                    m_pos = newPos;
+                    Rotation = newRot;
+
 //                    ParentPosition = part.AbsolutePosition;
                     part.ParentGroup.AddAvatar(UUID);
                 }
                 else
                 {
-                    m_pos -= part.AbsolutePosition;
+                    // An viewer expects to specify sit positions as offsets to the root prim, even if a child prim is
+                    // being sat upon.
+                    m_pos -= part.GroupPosition;
+
 //                    ParentPosition = part.AbsolutePosition;
                     part.ParentGroup.AddAvatar(UUID);
 
-- 
cgit v1.1


From 11f177d6a88820c02547f916c39100a1c01e3bc1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 13 Dec 2013 23:30:08 +0000
Subject: Eliminate unnecessary line from my previous commit 1d605642

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 0282ad0..cf98ef2 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2866,8 +2866,6 @@ namespace OpenSim.Region.Framework.Scenes
                     Vector3 up = new Vector3((float)x, (float)y, (float)z);
                     Vector3 sitOffset = up * Appearance.AvatarHeight * 0.02638f;
 
-                    m_pos = sitTargetPos + sitOffset + SIT_TARGET_ADJUSTMENT;
-
                     Vector3 newPos = sitTargetPos + sitOffset + SIT_TARGET_ADJUSTMENT;
                     Quaternion newRot;
 
-- 
cgit v1.1


From 54cc22976868dcdc0dd0143a0134fba7392af525 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 14 Dec 2013 00:10:32 +0000
Subject: Fix TestSitAndStandWithNoSitTarget NPC and SP tests.

These stopped working because current code calculates sit heights based on avatar physics rather than appearance data.
Also changed BasicPhysics to not divide Z param of all set sizes by 2 - there's no obvious good reason for this and basicphysics is only used in tests
---
 OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs   | 2 +-
 OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | 8 ++------
 OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs   | 9 +--------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
index acaeb90..c097a79 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // printing out npc.AbsolutePosition will give <0, 0, 0.8454993> not <0, 0, 0.845499337>
             Assert.That(
                 m_sp.AbsolutePosition,
-                Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, 0.845499337f)));
+                Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, sp.PhysicsActor.Size.Z / 2)));
 
             m_sp.StandUp();
 
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index e1ef4d0..d552229 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -337,7 +337,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
         public void TestSitAndStandWithNoSitTarget()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
+//            TestHelpers.EnableLogging();
 
             ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, TestHelpers.ParseTail(0x1));
 
@@ -355,13 +355,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
             Assert.That(part.SitTargetAvatar, Is.EqualTo(UUID.Zero));
             Assert.That(npc.ParentID, Is.EqualTo(part.LocalId));
 
-            // FIXME: This is different for live avatars - z position is adjusted.  This is half the height of the
-            // default avatar.
-            // Curiously, Vector3.ToString() will not display the last two places of the float.  For example,
-            // printing out npc.AbsolutePosition will give <0, 0, 0.8454993> not <0, 0, 0.845499337>
             Assert.That(
                 npc.AbsolutePosition,
-                Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, 0.845499337f)));
+                Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, sp.PhysicsActor.Size.Z / 2)));
 
             m_npcMod.Stand(npc.UUID, m_scene);
 
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
index e43136a..0d17e0e 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
@@ -118,14 +118,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
 
         public override Vector3 Position { get; set; }
 
-        public override Vector3 Size
-        {
-            get { return _size; }
-            set {
-                  _size = value;
-                  _size.Z = _size.Z / 2.0f;
-                }
-        }
+        public override Vector3 Size { get; set; }
 
         public override PrimitiveBaseShape Shape
         {
-- 
cgit v1.1


From d2d4ae541b9e9e51225b7a9699346efdfc0b9b1a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 14 Dec 2013 00:19:04 +0000
Subject: Fix build break in test from previous commit 54cc229 - hadn't
 realized ScenePresence inst var name was slightly different

---
 OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
index c097a79..eff8c7a 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // printing out npc.AbsolutePosition will give <0, 0, 0.8454993> not <0, 0, 0.845499337>
             Assert.That(
                 m_sp.AbsolutePosition,
-                Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, sp.PhysicsActor.Size.Z / 2)));
+                Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, m_sp.PhysicsActor.Size.Z / 2)));
 
             m_sp.StandUp();
 
-- 
cgit v1.1


From bcb8c4068e4d9ddbd1d4f29c7528f089d11f1d02 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 14 Dec 2013 00:36:25 +0000
Subject: Comment out sit position checks in TestSitAndStandWithSitTarget() in
 SP and NPC tests until positions are known to be stable.

Also resolve issues with NoSitTarget() tests where I was trying to use a destroyed PhysActor
---
 .../Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs | 14 ++++++--------
 .../OptionalModules/World/NPC/Tests/NPCModuleTests.cs      |  8 +++++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
index eff8c7a..0911f00 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
@@ -111,15 +111,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene).RootPart;
 
+            // We need to preserve this here because phys actor is removed by the sit.
+            Vector3 spPhysActorSize = m_sp.PhysicsActor.Size;
             m_sp.HandleAgentRequestSit(m_sp.ControllingClient, m_sp.UUID, part.UUID, Vector3.Zero);
 
-            // FIXME: This is different for live avatars - z position is adjusted.  This is half the height of the
-            // default avatar.
-            // Curiously, Vector3.ToString() will not display the last two places of the float.  For example,
-            // printing out npc.AbsolutePosition will give <0, 0, 0.8454993> not <0, 0, 0.845499337>
             Assert.That(
                 m_sp.AbsolutePosition,
-                Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, m_sp.PhysicsActor.Size.Z / 2)));
+                Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, spPhysActorSize.Z / 2)));
 
             m_sp.StandUp();
 
@@ -147,9 +145,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             Assert.That(part.SitTargetAvatar, Is.EqualTo(m_sp.UUID));
             Assert.That(m_sp.ParentID, Is.EqualTo(part.LocalId));
-            Assert.That(
-                m_sp.AbsolutePosition,
-                Is.EqualTo(part.AbsolutePosition + part.SitTargetPosition + ScenePresence.SIT_TARGET_ADJUSTMENT));
+//            Assert.That(
+//                m_sp.AbsolutePosition,
+//                Is.EqualTo(part.AbsolutePosition + part.SitTargetPosition + ScenePresence.SIT_TARGET_ADJUSTMENT));
             Assert.That(m_sp.PhysicsActor, Is.Null);
 
             Assert.That(part.GetSittingAvatarsCount(), Is.EqualTo(1));
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index d552229..7f9e440 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -323,9 +323,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
 
             Assert.That(part.SitTargetAvatar, Is.EqualTo(npcId));
             Assert.That(npc.ParentID, Is.EqualTo(part.LocalId));
-            Assert.That(
-                npc.AbsolutePosition,
-                Is.EqualTo(part.AbsolutePosition + part.SitTargetPosition + ScenePresence.SIT_TARGET_ADJUSTMENT));
+//            Assert.That(
+//                npc.AbsolutePosition,
+//                Is.EqualTo(part.AbsolutePosition + part.SitTargetPosition + ScenePresence.SIT_TARGET_ADJUSTMENT));
 
             m_npcMod.Stand(npc.UUID, m_scene);
 
@@ -355,6 +355,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
             Assert.That(part.SitTargetAvatar, Is.EqualTo(UUID.Zero));
             Assert.That(npc.ParentID, Is.EqualTo(part.LocalId));
 
+            // We should really be using the NPC size but this would mean preserving the physics actor since it is
+            // removed on sit.
             Assert.That(
                 npc.AbsolutePosition,
                 Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, sp.PhysicsActor.Size.Z / 2)));
-- 
cgit v1.1


From 5ddd8182385585f06c0f784cee27c7aa61b3da54 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 14 Dec 2013 00:43:10 +0000
Subject: minor: Make wind console commands print out to console rather than
 log

---
 .../Region/CoreModules/World/Wind/WindModule.cs    | 35 +++++++++++++---------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
index 9de588c..dad8bcb 100644
--- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
@@ -216,13 +216,13 @@ namespace OpenSim.Region.CoreModules
                 // FIXME: If console region is root then this will be printed by every module.  Currently, there is no
                 // way to prevent this, short of making the entire module shared (which is complete overkill).
                 // One possibility is to return a bool to signal whether the module has completely handled the command
-                m_log.InfoFormat("[WIND]: Please change to a specific region in order to set Sun parameters.");
+                MainConsole.Instance.Output("Please change to a specific region in order to set Sun parameters.");
                 return;
             }
 
             if (m_scene.ConsoleScene() != m_scene)
             {
-                m_log.InfoFormat("[WIND]: Console Scene is not my scene.");
+                MainConsole.Instance.Output("Console Scene is not my scene.");
                 return;
             }
         }
@@ -233,7 +233,9 @@ namespace OpenSim.Region.CoreModules
         private void HandleConsoleCommand(string module, string[] cmdparams)
         {
             ValidateConsole();
-            m_log.Info("[WIND] The wind command can be used to change the currently active wind model plugin and update the parameters for wind plugins.");
+
+            MainConsole.Instance.Output(
+                "The wind command can be used to change the currently active wind model plugin and update the parameters for wind plugins.");
         }
 
         /// <summary>
@@ -246,7 +248,9 @@ namespace OpenSim.Region.CoreModules
             if ((cmdparams.Length != 4)
                 || !cmdparams[1].Equals("base"))
             {
-                m_log.Info("[WIND] Invalid parameters to change parameters for Wind module base, usage: wind base <parameter> <value>");
+                MainConsole.Instance.Output(
+                    "Invalid parameters to change parameters for Wind module base, usage: wind base <parameter> <value>");
+
                 return;
             }
 
@@ -261,7 +265,9 @@ namespace OpenSim.Region.CoreModules
                     }
                     else
                     {
-                        m_log.InfoFormat("[WIND] Invalid value {0} specified for {1}", cmdparams[3], cmdparams[2]);
+                        MainConsole.Instance.OutputFormat(
+                            "Invalid value {0} specified for {1}", cmdparams[3], cmdparams[2]);
+
                         return;
                     }
 
@@ -271,22 +277,23 @@ namespace OpenSim.Region.CoreModules
 
                     if (desiredPlugin.Equals(m_activeWindPlugin.Name))
                     {
-                        m_log.InfoFormat("[WIND] Wind model plugin {0} is already active", cmdparams[3]);
+                        MainConsole.Instance.OutputFormat("Wind model plugin {0} is already active", cmdparams[3]);
+
                         return;
                     }
 
                     if (m_availableWindPlugins.ContainsKey(desiredPlugin))
                     {
                         m_activeWindPlugin = m_availableWindPlugins[cmdparams[3]];
-                        m_log.InfoFormat("[WIND] {0} wind model plugin now active", m_activeWindPlugin.Name);
+
+                        MainConsole.Instance.OutputFormat("{0} wind model plugin now active", m_activeWindPlugin.Name);
                     }
                     else
                     {
-                        m_log.InfoFormat("[WIND] Could not find wind model plugin {0}", desiredPlugin);
+                        MainConsole.Instance.OutputFormat("Could not find wind model plugin {0}", desiredPlugin);
                     }
                     break;
             }
-
         }
 
         /// <summary>
@@ -300,7 +307,7 @@ namespace OpenSim.Region.CoreModules
             if ((cmdparams.Length != 4)
                 && (cmdparams.Length != 3))
             {
-                m_log.Info("[WIND] Usage: wind <plugin> <param> [value]");
+                MainConsole.Instance.Output("Usage: wind <plugin> <param> [value]");
                 return;
             }
 
@@ -311,7 +318,7 @@ namespace OpenSim.Region.CoreModules
             {
                 if (!float.TryParse(cmdparams[3], out value))
                 {
-                    m_log.InfoFormat("[WIND] Invalid value {0}", cmdparams[3]);
+                    MainConsole.Instance.OutputFormat("Invalid value {0}", cmdparams[3]);
                 }
 
                 try
@@ -320,7 +327,7 @@ namespace OpenSim.Region.CoreModules
                 }
                 catch (Exception e)
                 {
-                    m_log.InfoFormat("[WIND] {0}", e.Message);
+                    MainConsole.Instance.OutputFormat("{0}", e.Message);
                 }
             }
             else
@@ -328,11 +335,11 @@ namespace OpenSim.Region.CoreModules
                 try
                 {
                     value = WindParamGet(plugin, param);
-                    m_log.InfoFormat("[WIND] {0} : {1}", param, value);
+                    MainConsole.Instance.OutputFormat("{0} : {1}", param, value);
                 }
                 catch (Exception e)
                 {
-                    m_log.InfoFormat("[WIND] {0}", e.Message);
+                    MainConsole.Instance.OutputFormat("{0}", e.Message);
                 }
             }
 
-- 
cgit v1.1


From d656ec2a0766cf2a6ff6ad9cd8e2d42ada547d6c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 14 Dec 2013 01:07:37 +0000
Subject: Make WindParamSet success a console message rather than a log
 message.

This effectively disables the log message as requested by http://opensimulator.org/mantis/view.php?id=6890
---
 OpenSim/Region/CoreModules/World/Wind/WindModule.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
index dad8bcb..35014f5 100644
--- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
@@ -324,6 +324,7 @@ namespace OpenSim.Region.CoreModules
                 try
                 {
                     WindParamSet(plugin, param, value);
+                    MainConsole.Instance.OutputFormat("{0} set to {1}", param, value);
                 }
                 catch (Exception e)
                 {
@@ -373,13 +374,11 @@ namespace OpenSim.Region.CoreModules
             {
                 IWindModelPlugin windPlugin = m_availableWindPlugins[plugin];
                 windPlugin.WindParamSet(param, value);
-                m_log.InfoFormat("[WIND] {0} set to {1}", param, value);
             }
             else
             {
                 throw new Exception(String.Format("Could not find plugin {0}", plugin));
             }
-
         }
 
         public float WindParamGet(string plugin, string param)
-- 
cgit v1.1


From 63ccc3dbf595d56fb9f08ee9575b81f3b39ca290 Mon Sep 17 00:00:00 2001
From: Eva Comaroski
Date: Fri, 6 Dec 2013 13:12:35 +0000
Subject: Convert if-blocks to return statements in small functions such as
 GetStartParameter().

---
 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 5804aa8..b261b9f 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1709,9 +1709,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         public bool GetScriptState(UUID itemID)
         {
             IScriptInstance instance = GetInstance(itemID);
-            if (instance != null)
-                return instance.Running;
-            return false;
+            return instance != null && instance.Running;
         }
 
         public void ApiResetScript(UUID itemID)
@@ -1755,9 +1753,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         public DetectParams GetDetectParams(UUID itemID, int idx)
         {
             IScriptInstance instance = GetInstance(itemID);
-            if (instance != null)
-                return instance.GetDetectParams(idx);
-            return null;
+            return instance != null ? instance.GetDetectParams(idx) : null;
         }
 
         public void SetMinEventDelay(UUID itemID, double delay)
@@ -1770,9 +1766,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         public UUID GetDetectID(UUID itemID, int idx)
         {
             IScriptInstance instance = GetInstance(itemID);
-            if (instance != null)
-                return instance.GetDetectID(idx);
-            return UUID.Zero;
+            return instance != null ? instance.GetDetectID(idx) : UUID.Zero;
         }
 
         public void SetState(UUID itemID, string newState)
@@ -1786,9 +1780,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         public int GetStartParameter(UUID itemID)
         {
             IScriptInstance instance = GetInstance(itemID);
-            if (instance == null)
-                return 0;
-            return instance.StartParam;
+            return instance == null ? 0 : instance.StartParam;
         }
 
         public void OnShutdown()
@@ -1822,9 +1814,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         public IScriptApi GetApi(UUID itemID, string name)
         {
             IScriptInstance instance = GetInstance(itemID);
-            if (instance == null)
-                return null;
-            return instance.GetApi(name);
+            return instance == null ? null : instance.GetApi(name);
         }
 
         public void OnGetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID)
-- 
cgit v1.1


From 996a6c2eeacf25456d2ffc12e59c34240cf8a578 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 14 Dec 2013 01:34:28 +0000
Subject: After previous discussion, put eye-catcher 'SCRIPT READY' messages to
 console rather than log as warning

The problem with logging at warn is that these aren't actually warnings, and so are false positives to scripts that monitor for problems.
Ideally, log4net would have a separate "status" logging level, but currently we will compromise by putting them to console, as they are user-oriented
---
 OpenSim/Framework/Servers/BaseOpenSimServer.cs                    | 4 ++--
 .../Scripting/RegionReadyModule/RegionReadyModule.cs              | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 4ab6908..566772d 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -135,8 +135,8 @@ namespace OpenSim.Framework.Servers
             
             TimeSpan timeTaken = DateTime.Now - m_startuptime;
             
-            m_log.InfoFormat(
-                "[STARTUP]: Non-script portion of startup took {0}m {1}s.  PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED.",
+            MainConsole.Instance.OutputFormat(
+                "PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED.  Non-script portion of startup took {0}m {1}s.",
                 timeTaken.Minutes, timeTaken.Seconds);
         }
 
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
index c717128..eb386fe 100644
--- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
@@ -216,9 +216,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
                 // m_log.InfoFormat("[RegionReady]: Logins enabled for {0}, Oar {1}",
                 //                 m_scene.RegionInfo.RegionName, m_oarFileLoading.ToString());
 
-                // Warn level because the region cannot be used while logins are disabled
-                m_log.WarnFormat(
-                    "[RegionReady]: INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", m_scene.Name);
+                // Putting this out to console to make it eye-catching for people who are running OpenSimulator
+                // without info log messages enabled.  Making this a warning is arguably misleading since it isn't a 
+                // warning, and monitor scripts looking for warn/error/fatal messages will received false positives.
+                // Arguably, log4net needs a status log level (like Apache).
+                MainConsole.Instance.OutputFormat("INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", m_scene.Name);
             }
 
             m_scene.SceneGridService.InformNeighborsThatRegionisUp(
-- 
cgit v1.1


From e7a294e739abc1e255d205a83aeadb679f098569 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 14 Dec 2013 01:48:03 +0000
Subject: Wrap analysis of the particle system in the UUID Gatherer in a
 separate try/catch as sometimes it appears that this can be corrupt.

As per Oren's suggestion.
---
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 502c748..3e074b9 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -181,9 +181,18 @@ namespace OpenSim.Region.Framework.Scenes
 
                     if (part.ParticleSystem.Length > 0)
                     {
-                        Primitive.ParticleSystem ps = new Primitive.ParticleSystem(part.ParticleSystem, 0);
-                        if (ps.Texture != UUID.Zero)
-                            assetUuids[ps.Texture] = AssetType.Texture;
+                        try
+                        {
+                            Primitive.ParticleSystem ps = new Primitive.ParticleSystem(part.ParticleSystem, 0);
+                            if (ps.Texture != UUID.Zero)
+                                assetUuids[ps.Texture] = AssetType.Texture;
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.WarnFormat(
+                                "[UUID GATHERER]: Could not check particle system for part {0} {1} in object {2} {3} since it is corrupt.  Continuing.", 
+                                part.Name, part.UUID, sceneObject.Name, sceneObject.UUID);
+                        }
                     }
 
                     TaskInventoryDictionary taskDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();
-- 
cgit v1.1


From 957449e62cda67a641162043e21cd102f6f99080 Mon Sep 17 00:00:00 2001
From: Kevin Cozens
Date: Mon, 9 Dec 2013 03:15:40 -0500
Subject: ParseNotecardToList() returned data past end of notecard text (mantis
 #6881).

---
 OpenSim/Framework/SLUtil.cs | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs
index 537de7a..cb73e8f 100644
--- a/OpenSim/Framework/SLUtil.cs
+++ b/OpenSim/Framework/SLUtil.cs
@@ -247,12 +247,18 @@ namespace OpenSim.Framework
         /// <returns></returns>
         public static List<string> ParseNotecardToList(string rawInput)
         {
-            string[] input = rawInput.Replace("\r", "").Split('\n');
+            string[] input;
             int idx = 0;
             int level = 0;
             List<string> output = new List<string>();
             string[] words;
 
+            //The Linden format always ends with a } after the input data.
+            //Strip off trailing } so there is nothing after the input data.
+            int i = rawInput.LastIndexOf("}");
+            rawInput = rawInput.Remove(i, rawInput.Length-i);
+            input = rawInput.Replace("\r", "").Split('\n');
+
             while (idx < input.Length)
             {
                 if (input[idx] == "{")
@@ -287,24 +293,18 @@ namespace OpenSim.Framework
                         break;
                     if (words[0] == "Text")
                     {
-                        int len = int.Parse(words[2]);
-                        idx++;
+                        idx++;  //Now points to first line of notecard text
 
-                        int count = -1;
+                        //Number of lines in notecard.
+                        int lines = input.Length - idx;
+                        int line = 0;
 
-                        while (count < len && idx < input.Length)
+                        while (line < lines)
                         {
-                            // int l = input[idx].Length;
-                            string ln = input[idx];
-
-                            int need = len-count-1;
-                            if (ln.Length > need)
-                                ln = ln.Substring(0, need);
-
-//                            m_log.DebugFormat("[PARSE NOTECARD]: Adding line {0}", ln);
-                            output.Add(ln);
-                            count += ln.Length + 1;
+//                            m_log.DebugFormat("[PARSE NOTECARD]: Adding line {0}", input[idx]);
+                            output.Add(input[idx]);
                             idx++;
+                            line++;
                         }
 
                         return output;
-- 
cgit v1.1


From 51da52f904965425eda4dee3832525bee23bc303 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 14 Dec 2013 02:48:29 +0000
Subject: Extend TestLlGetNotecardLine() regression test to contain chars that
 are two bytes in utf8

---
 OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs
index c92bcdb..42d1b3b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         {
             TestHelpers.InMethod();
 
-            string[] ncLines = { "One", "Two", "Three" };
+            string[] ncLines = { "One", "Twoè", "Three" };
 
             TaskInventoryItem ncItem 
                 = TaskInventoryHelpers.AddNotecard(m_scene, m_so.RootPart, "nc", "1", "10", string.Join("\n", ncLines));
-- 
cgit v1.1


From f69e91dc2dfe4de573093199e02e78bcdcff0e9b Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 16 Dec 2013 22:08:02 +0000
Subject: This is the acutal sitting avatar crossing code. This commit
 implements the actual crossing mechanics for seated avatars, using the
 supporting code from the previous commits. Physics is not supported yet,
 although some few bits for them are already in place due to the earlier code
 drops. With this commit, crossing sitting avatar by "editing" the prim across
 the border, by using llSetPos or keyframe motion may already be possible.
 Vehicles will come next.

---
 .../Region/Framework/Scenes/SceneObjectGroup.cs    | 154 ++++++++++++++++++++-
 1 file changed, 152 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index f16a8e6..a2e4417 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -429,6 +429,12 @@ namespace OpenSim.Region.Framework.Scenes
             return (IsAttachment || (m_rootPart.Shape.PCode == 9 && m_rootPart.Shape.State != 0));
         }
         
+        private struct avtocrossInfo
+        {
+            public ScenePresence av;
+            public uint ParentID;
+        }
+
         /// <summary>
         /// The absolute position of this scene object in the scene
         /// </summary>
@@ -456,13 +462,124 @@ namespace OpenSim.Region.Framework.Scenes
                             || Scene.TestBorderCross(val, Cardinals.S))
                         && !IsAttachmentCheckFull() && (!Scene.LoadingPrims))
                     {
+                        IEntityTransferModule entityTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
+                        uint x = 0;
+                        uint y = 0;
+                        string version = String.Empty;
+                        Vector3 newpos = Vector3.Zero;
+                        OpenSim.Services.Interfaces.GridRegion destination = null;
+
                         if (m_rootPart.KeyframeMotion != null)
                             m_rootPart.KeyframeMotion.StartCrossingCheck();
 
-                        m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
+                        bool canCross = true;
+                        foreach (ScenePresence av in m_linkedAvatars)
+                        {
+                            // We need to cross these agents. First, let's find
+                            // out if any of them can't cross for some reason.
+                            // We have to deny the crossing entirely if any
+                            // of them are banned. Alternatively, we could
+                            // unsit banned agents....
+
+
+                            // We set the avatar position as being the object
+                            // position to get the region to send to
+                            if ((destination = entityTransfer.GetDestination(m_scene, av.UUID, val, out x, out y, out version, out newpos)) == null)
+                            {
+                                canCross = false;
+                                break;
+                            }
+
+                            m_log.DebugFormat("[SCENE OBJECT]: Avatar {0} needs to be crossed to {1}", av.Name, destination.RegionName);
+                        }
+
+                        if (canCross)
+                        {
+                            // We unparent the SP quietly so that it won't
+                            // be made to stand up
+
+                            List<avtocrossInfo> avsToCross = new List<avtocrossInfo>();
+
+                            foreach (ScenePresence av in m_linkedAvatars)
+                            {
+                                avtocrossInfo avinfo = new avtocrossInfo();
+                                SceneObjectPart parentPart = m_scene.GetSceneObjectPart(av.ParentID);
+                                if (parentPart != null)
+                                    av.ParentUUID = parentPart.UUID;
+
+                                avinfo.av = av;
+                                avinfo.ParentID = av.ParentID;
+                                avsToCross.Add(avinfo);
+
+                                av.PrevSitOffset = av.OffsetPosition;
+                                av.ParentID = 0;
+                            }
+
+                            //                            m_linkedAvatars.Clear();
+                            m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
+
+                            // Normalize
+                            if (val.X >= Constants.RegionSize)
+                                val.X -= Constants.RegionSize;
+                            if (val.Y >= Constants.RegionSize)
+                                val.Y -= Constants.RegionSize;
+                            if (val.X < 0)
+                                val.X += Constants.RegionSize;
+                            if (val.Y < 0)
+                                val.Y += Constants.RegionSize;
+
+                            // If it's deleted, crossing was successful
+                            if (IsDeleted)
+                            {
+                                //                                foreach (ScenePresence av in m_linkedAvatars)
+                                foreach (avtocrossInfo avinfo in avsToCross)
+                                {
+                                    ScenePresence av = avinfo.av;
+                                    if (!av.IsInTransit) // just in case...
+                                    {
+                                        m_log.DebugFormat("[SCENE OBJECT]: Crossing avatar {0} to {1}", av.Name, val);
+
+                                        av.IsInTransit = true;
+
+                                        CrossAgentToNewRegionDelegate d = entityTransfer.CrossAgentToNewRegionAsync;
+                                        d.BeginInvoke(av, val, destination, av.Flying, version, CrossAgentToNewRegionCompleted, d);
+                                    }
+                                    else
+                                        m_log.DebugFormat("[SCENE OBJECT]: Crossing avatar alreasy in transit {0} to {1}", av.Name, val);
+                                }
+                                avsToCross.Clear();
+                                return;
+                            }
+                            else // cross failed, put avas back ??
+                            {
+                                foreach (avtocrossInfo avinfo in avsToCross)
+                                {
+                                    ScenePresence av = avinfo.av;
+                                    av.ParentUUID = UUID.Zero;
+                                    av.ParentID = avinfo.ParentID;
+//                                    m_linkedAvatars.Add(av);
+                                }
+                            }
+                            avsToCross.Clear();
+
+                        }
+                        else
+                        {
+                            if (m_rootPart.KeyframeMotion != null)
+                                m_rootPart.KeyframeMotion.CrossingFailure();
+
+                            if (RootPart.PhysActor != null)
+                            {
+                                RootPart.PhysActor.CrossingFailure();
+                            }
+                        }
+                        Vector3 oldp = AbsolutePosition;
+                        val.X = Util.Clamp<float>(oldp.X, 0.5f, (float)Constants.RegionSize - 0.5f);
+                        val.Y = Util.Clamp<float>(oldp.Y, 0.5f, (float)Constants.RegionSize - 0.5f);
+                        val.Z = Util.Clamp<float>(oldp.Z, 0.5f, 4096.0f);
                     }
                 }
-                
+
                 if (RootPart.GetStatusSandbox())
                 {
                     if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10)
@@ -496,6 +613,39 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public override Vector3 Velocity
+        {
+            get { return RootPart.Velocity; }
+            set { RootPart.Velocity = value; }
+        }
+
+        private void CrossAgentToNewRegionCompleted(IAsyncResult iar)
+        {
+            CrossAgentToNewRegionDelegate icon = (CrossAgentToNewRegionDelegate)iar.AsyncState;
+            ScenePresence agent = icon.EndInvoke(iar);
+
+            //// If the cross was successful, this agent is a child agent
+            if (agent.IsChildAgent)
+            {
+                if (agent.ParentUUID != UUID.Zero)
+                {
+                    agent.ParentPart = null;
+//                    agent.ParentPosition = Vector3.Zero;
+//                    agent.ParentUUID = UUID.Zero;
+                }
+            }
+
+            agent.ParentUUID = UUID.Zero;
+//                agent.Reset();
+//            else // Not successful
+//                agent.RestoreInCurrentScene();
+
+            // In any case
+            agent.IsInTransit = false;
+
+            m_log.DebugFormat("[SCENE OBJECT]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname);
+        }
+
         public override uint LocalId
         {
             get { return m_rootPart.LocalId; }
-- 
cgit v1.1


From b03ec6137f462486a3469f6ba4bbd363dc85295f Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Mon, 16 Dec 2013 15:10:09 -0500
Subject: Populate user preferences with UserAccount email if it is present,
 else return an error indicating no email is on record for the user.

---
 OpenSim/Data/MySQL/MySQLUserProfilesData.cs        | 16 +++---
 OpenSim/Data/SQLite/SQLiteUserProfilesData.cs      |  3 +-
 .../UserProfilesService/UserProfilesService.cs     | 61 ++++++++++++++++++++++
 3 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index 63492c2..0bf9595 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -925,15 +925,19 @@ namespace OpenSim.Data.MySQL
                             }
                             else
                             {
+                                dbcon.Close();
+                                dbcon.Open();
+                                
+                                query = "INSERT INTO usersettings VALUES ";
+                                query += "(?uuid,'false','false', ?Email)";
+
                                 using (MySqlCommand put = new MySqlCommand(query, dbcon))
                                 {
-                                    query = "INSERT INTO usersettings VALUES ";
-                                    query += "(?Id,'false','false', '')";
                                     
-                                    lock(Lock)
-                                    {
-                                        put.ExecuteNonQuery();
-                                    }
+                                    put.Parameters.AddWithValue("?Email", pref.EMail);
+                                    put.Parameters.AddWithValue("?uuid", pref.UserId.ToString());
+
+                                    put.ExecuteNonQuery();
                                 }
                             }
                         }
diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
index 916a226..90d45e9 100644
--- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
@@ -808,11 +808,12 @@ namespace OpenSim.Data.SQLite
                          else
                          {
                             query = "INSERT INTO usersettings VALUES ";
-                            query += "(:Id,'false','false', '')";
+                            query += "(:Id,'false','false', :Email)";
                             
                             using (SqliteCommand put = (SqliteCommand)m_connection.CreateCommand())
                             {
                                 put.Parameters.AddWithValue(":Id", pref.UserId.ToString());
+                                put.Parameters.AddWithValue(":Email", pref.EMail);
                                 put.ExecuteNonQuery();
                                     
                             }
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
index 69c7b91..dd26cdc 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
@@ -37,6 +37,7 @@ using OpenSim.Data;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
+using OpenSim.Services.UserAccountService;
 
 namespace OpenSim.Services.ProfilesService
 {
@@ -166,11 +167,71 @@ namespace OpenSim.Services.ProfilesService
         #region User Preferences
         public bool UserPreferencesUpdate(ref UserPreferences pref, ref string result)
         {
+            if(string.IsNullOrEmpty(pref.EMail))
+            {
+                UserAccount account = new UserAccount();
+                if(userAccounts is UserAccountService.UserAccountService)
+                {
+                    try
+                    {
+                        account = userAccounts.GetUserAccount(UUID.Zero, pref.UserId);
+                        if(string.IsNullOrEmpty(account.Email))
+                        {
+                            result = "No Email address on record!";
+                            return false;
+                        }
+                        else
+                            pref.EMail = account.Email;
+                    }
+                    catch
+                    {
+                        m_log.Info ("[PROFILES]: UserAccountService Exception: Could not get user account");
+                        result = "Missing Email address!";
+                        return false;
+                    }
+                }
+                else
+                {
+                    m_log.Info ("[PROFILES]: UserAccountService: Could not get user account");
+                    result = "Missing Email address!";
+                    return false;
+                }
+            }
             return ProfilesData.UpdateUserPreferences(ref pref, ref result);
         }
 
         public bool UserPreferencesRequest(ref UserPreferences pref, ref string result)
         {
+            if(string.IsNullOrEmpty(pref.EMail))
+            {
+                UserAccount account = new UserAccount();
+                if(userAccounts is UserAccountService.UserAccountService)
+                {
+                    try
+                    {
+                        account = userAccounts.GetUserAccount(UUID.Zero, pref.UserId);
+                        if(string.IsNullOrEmpty(account.Email))
+                        {
+                            result = "No Email address on record!";
+                            return false;
+                        }
+                        else
+                            pref.EMail = account.Email;
+                    }
+                    catch
+                    {
+                        m_log.Info ("[PROFILES]: UserAccountService Exception: Could not get user account");
+                        result = "Missing Email address!";
+                        return false;
+                    }
+                }
+                else
+                {
+                    m_log.Info ("[PROFILES]: UserAccountService: Could not get user account");
+                    result = "Missing Email address!";
+                    return false;
+                }
+            }
             return ProfilesData.GetUserPreferences(ref pref, ref result);
         }
         #endregion User Preferences
-- 
cgit v1.1


From 141d771a931140402cfa0575cf31e7116540f7d0 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Mon, 16 Dec 2013 15:43:34 -0500
Subject: Fix issue with editing notes for other avatars

---
 OpenSim/Data/MySQL/MySQLUserProfilesData.cs                         | 4 ++++
 OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index 0bf9595..6ed3b06 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -546,6 +546,10 @@ namespace OpenSim.Data.MySQL
                                 reader.Read();
                                 notes.Notes = OSD.FromString((string)reader["notes"]);
                             }
+                            else
+                            {
+                                notes.Notes = OSD.FromString("");
+                            }
                         }
                     }
                 }
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index b21082f..bfa30e6 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -758,8 +758,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             IClientAPI remoteClient = (IClientAPI)sender;
             string serverURI = string.Empty;
             GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
-            note.TargetId = remoteClient.AgentId;
-            UUID.TryParse(args[0], out note.UserId);
+            note.UserId = remoteClient.AgentId;
+            UUID.TryParse(args[0], out note.TargetId);
 
             object Note = (object)note;
             if(!JsonRpcRequest(ref Note, "avatarnotesrequest", serverURI, UUID.Random().ToString()))
-- 
cgit v1.1


From a5ca15c42893681a777d091c737d5c7615af4f48 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 18 Dec 2013 23:35:38 +0000
Subject: Create regression test TestSendAgentGroupDataUpdate() for groups
 agent data sending

---
 .../Linden/Caps/EventQueue/EventQueueGetModule.cs  |  6 +-
 .../Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs | 65 +++++++++++++++++++++-
 .../Tests/Common/Mock/TestEventQueueGetModule.cs   |  3 +-
 prebuild.xml                                       |  5 +-
 4 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index c28ba94..0dbdbaf 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -295,9 +295,9 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             // Register an event queue for the client
 
-            //m_log.DebugFormat(
-            //    "[EVENTQUEUE]: OnRegisterCaps: agentID {0} caps {1} region {2}",
-            //    agentID, caps, m_scene.RegionInfo.RegionName);
+            m_log.DebugFormat(
+                "[EVENTQUEUE]: OnRegisterCaps: agentID {0} caps {1} region {2}",
+                agentID, caps, m_scene.RegionInfo.RegionName);
 
             // Let's instantiate a Queue for this agent right now
             TryGetQueue(agentID);
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
index c1bdacb..26d2597 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
@@ -26,13 +26,23 @@
  */
 
 using System;
+using System.Collections;
+using System.Net;
 using System.Reflection;
 using Nini.Config;
 using NUnit.Framework;
 using OpenMetaverse;
+using OpenMetaverse.Messages.Linden;
+using OpenMetaverse.Packets;
+using OpenMetaverse.StructuredData;
 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.Framework.Scenes;
+using OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
 
@@ -44,11 +54,28 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests
     [TestFixture]
     public class GroupsModuleTests : OpenSimTestCase
     {
+        [SetUp]
+        public override void SetUp()
+        {
+            base.SetUp();
+
+            uint port = 9999;
+            uint sslPort = 9998;
+
+            // 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.
+            MainServer.RemoveHttpServer(port);
+
+            BaseHttpServer server = new BaseHttpServer(port, false, sslPort, "");
+            MainServer.AddHttpServer(server);
+            MainServer.Instance = server;
+        }
+
         [Test]
-        public void TestBasic()
+        public void TestSendAgentGroupDataUpdate()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
+//            TestHelpers.EnableLogging();
             
             TestScene scene = new SceneHelpers().SetupScene();
             IConfigSource configSource = new IniConfigSource();
@@ -56,8 +83,40 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests
             config.Set("Enabled", true);
             config.Set("Module", "GroupsModule");            
             config.Set("DebugEnabled", true);
+
+            GroupsModule gm = new GroupsModule();
+            EventQueueGetModule eqgm = new EventQueueGetModule();
+
+            // We need a capabilities module active so that adding the scene presence creates an event queue in the
+            // EventQueueGetModule
             SceneHelpers.SetupSceneModules(
-                scene, configSource, new object[] { new MockGroupsServicesConnector() });
+                scene, configSource, gm, new MockGroupsServicesConnector(), new CapabilitiesModule(), eqgm);
+
+            ScenePresence sp = SceneHelpers.AddScenePresence(scene, TestHelpers.ParseStem("1"));
+
+            gm.SendAgentGroupDataUpdate(sp.ControllingClient);
+
+            Hashtable eventsResponse = eqgm.GetEvents(UUID.Zero, sp.UUID);
+
+            Assert.That((int)eventsResponse["int_response_code"], Is.EqualTo((int)HttpStatusCode.OK));
+
+//            Console.WriteLine("Response [{0}]", (string)eventsResponse["str_response_string"]);
+
+            OSDMap rawOsd = (OSDMap)OSDParser.DeserializeLLSDXml((string)eventsResponse["str_response_string"]);
+            OSDArray eventsOsd = (OSDArray)rawOsd["events"];
+
+            bool foundUpdate = false;
+            foreach (OSD osd in eventsOsd)
+            {
+                OSDMap eventOsd = (OSDMap)osd;
+
+                if (eventOsd["message"] == "AgentGroupDataUpdate")
+                    foundUpdate = true;
+            }
+
+            Assert.That(foundUpdate, Is.True, "Did not find AgentGroupDataUpdate in response");
+
+            // TODO: More checking of more actual event data.           
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
index 6707019..e666433 100644
--- a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
+++ b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
@@ -38,6 +38,7 @@ using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
+using OpenSim.Region.ClientStack.Linden;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
@@ -164,7 +165,7 @@ namespace OpenSim.Tests.Common
             throw new System.NotImplementedException ();
         }
 
-        public OSD BuildEvent (string eventName, OSD eventBody)
+        public OSD BuildEvent(string eventName, OSD eventBody)
         {
             Console.WriteLine("TWO");
             throw new System.NotImplementedException ();
diff --git a/prebuild.xml b/prebuild.xml
index f6e0f4b..5b18195 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2839,8 +2839,9 @@
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Region.Framework"/>
       <Reference name="OpenSim.Region.CoreModules"/>
+      <Reference name="OpenSim.Region.ClientStack.LindenCaps"/>
+      <Reference name="OpenSim.Region.Framework"/>
       <Reference name="OpenSim.Region.OptionalModules"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
       <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
@@ -3200,6 +3201,7 @@
       <Reference name="System.Drawing"/>
       <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
       <Reference name="OpenMetaverse" path="../../../bin/"/>
+      <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
       <Reference name="OpenSim.Data"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Serialization"/>
@@ -3208,6 +3210,7 @@
       <Reference name="OpenSim.Framework.Monitoring"/>
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
+      <Reference name="OpenSim.Region.ClientStack.LindenCaps"/>
       <Reference name="OpenSim.Region.Framework"/>
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="OpenSim.Region.OptionalModules"/>
-- 
cgit v1.1


From e298bf41fff5045cb7fc9e87cc4114f9d8d6c9df Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 19 Dec 2013 01:24:36 +0000
Subject: Add missing viewer param elements for butt and breast physics.

Patch from http://opensimulator.org/mantis/view.php?id=6864 except with tabs replaced by spaces
Thanks cinderblocks!
---
 OpenSim/Framework/AvatarAppearance.cs | 76 ++++++++++++++++++++++++++++++++++-
 1 file changed, 75 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 157feb5..024eeeb 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -1505,7 +1505,81 @@ namespace OpenSim.Framework
             SHAPE_EYELID_INNER_CORNER_UP = 214,
             SKIRT_SKIRT_RED = 215,
             SKIRT_SKIRT_GREEN = 216,
-            SKIRT_SKIRT_BLUE = 217
+            SKIRT_SKIRT_BLUE = 217,
+            /// Breast_Physics_UpDown_Controller - -1-+1
+            PHYSICS_BREAST_UPDOWN_CONTROLLER = 218,
+            /// Breast_Physics_InOut_Controller -1-+1
+            PHYSICS_BREAST_PHYSICS_INOUT_CONTROLLER = 219,
+            /// Belly_Physics_UpDown_Controller - -1-+1
+            PHYSICS_BELLY_PHYSICS_UPDOWN_CONTROLLER = 220,
+            /// Butt_Physics_UpDown_Controller - -1-+1
+            PHYSICS_BUTT_PHYSICS_UPDOWN_CONTROLLER = 221,
+            /// Breast_Physics_LeftRight_Controller -1-+1
+            PHYSICS_BREAST_PHYSICS_LEFTRIGHT_CONTROLLER = 222,
+            /// Breast_Physics_Mass - +0.1-+1
+            PHYSICS_BREAST_PHYSICS_MASS = 223,
+            /// Breast_Physics_Gravity - 0-+30
+            PHYSICS_BREAST_PHYSICS_GRAVITY = 224,
+            /// Breast_Physics_Drag - 0-+10
+            PHYSICS_BREAST_PHYSICS_DRAG = 225,
+            /// Breast_Physics_UpDown_Max_Effect - 0-+3
+            PHYSICS_BREAST_UPDOWN_MAX_EFFECT = 226,
+            /// Breast_Physics_UpDown_Spring - 0-+100
+            PHYSICS_BREAST_UPDOWN_SPRING = 227,
+            /// Breast_Physics_UpDown_Gain - +1-+100
+            PHYSICS_BREAST_UPDOWN_GAIN = 228,
+            /// Breast_Physics_UpDown_Damping - 0-+1
+            PHYSICS_BREAST_UPDOWN_DAMPING = 229,
+            /// Breast_Physics_InOut_Max_Effect - 0-+3
+            PHYSICS_BREAST_INOUT_MAX_EFFECT = 230,
+            /// Breast_Physics_InOut_Gain = +1-+100
+            PHYSICS_BREAST_INOUT_GAIN = 231,
+            /// Breast_Physics_InOut_Damping - 0-+1
+            PHYSICS_BREAST_INOUT_DAMPING = 232,
+            /// Belly_Physics_Mass - +0.1-+1
+            PHYSICS_BELLY_PHYSICS_MASS = 233,
+            /// Belly_Physics_Gravity - 0-+30
+            PHYSICS_BELLY_PHYSICS_GRAVITY = 234,
+            /// Belly_Physics_Drag - 0-+10
+            PHYSICS_BELLY_PHYSICS_DRAG = 235,
+            /// Belly_Physics_UpDown_Max_Effect - 0-+3
+            PHYSICS_BELLY_PHYSICS_UPDOWN_MAX_EFFECT = 236,
+            /// Belly_Physics_UpDown_Spring - 0-+100
+            PHYSICS_BELLY_PHYSICS_UPDOWN_SPRING = 237,
+            /// Belly_Physics_UpDown_Gain - +1-+100
+            PHYSICS_BELLY_PHYSICS_UPDOWN_GAIN = 238,
+            /// Belly_Physics_UpDown_Damping - 0-+1
+            PHYSICS_BELLY_PHYSICS_UPDOWN_DAMPING = 239,
+            /// Butt_Physics_Mass - +0.1-+1
+            PHYSICS_BUTT_PHYSICS_MASS = 240,
+            /// Butt_Physics_Gravity - 0-+30
+            PHYSICS_BUTT_PHYSICS_GRAVITY = 241,
+            /// Butt_Physics_Drag - 0-+10
+            PHYSICS_BUTT_PHYSICS_DRAG = 242,
+            /// Butt_Physics_UpDown_Max_Effect - 0-+30
+            PHYSICS_BUTT_PHYSICS_UPDOWN_MAX_EFFECT = 243,
+            /// Butt_Physics_UpDown_Spring - 0-+100
+            PHYSICS_BUTT_PHYSICS_UPDOWN_SPRING = 244,
+            /// Butt_Physics_UpDown_Gain - +1-+100
+            PHYSICS_BUTT_PHYSICS_UPDOWN_GAIN = 245,
+            /// Butt_Physics_UpDown_Damping - 0-+1
+            PHYSICS_BUTT_PHYSICS_UPDOWN_DAMPING = 246,
+            /// Butt_Physics_LeftRight_Max_Effect - 0-+3
+            PHYSICS_BUTT_PHYSICS_LEFTRIGHT_MAX_EFFECT = 247,
+            /// Butt_Physics_LeftRight_Spring - 0-+100
+            PHYSICS_BUTT_PHYSICS_LEFTRIGHT_SPRING = 248,
+            /// Butt_Physics_LeftRight_Gain - +1-+100
+            PHYSICS_BUTT_PHYSICS_LEFTRIGHT_GAIN = 249,
+            /// Butt_Physics_LeftRight_Damping - 0-+1
+            PHYSICS_BUTT_PHYSICS_LEFTRIGHT_DAMPING = 250,
+            /// Breast_Physics_LeftRight_Max_Effect = 0-+3
+            PHYSICS_BREAST_PHYSICS_LEFTRIGHT_MAX_EFFECT = 251,
+            /// Breast_Physics_LeftRight_Spring - 0-+100
+            PHYSICS_BREAST_PHYSICS_LEFTRIGHT_SPRING = 252,
+            /// Breast_Physics_LeftRight_Gain - +1-+100
+            PHYSICS_BREAST_PHYSICS_LEFT_RIGHT_GAIN = 253,
+            /// Breast_Physics_LeftRight_Damping - 0-+1
+            PHYSICS_BREAST_LEFTRIGHT_DAMPING = 254
         }
         #endregion
     }
-- 
cgit v1.1


From b757ab2586a68e3e79ea364fa2aa944f8431b8c0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 21 Dec 2013 00:08:36 +0000
Subject: Add lsl event argument checking for attach and on_rez

---
 .../Shared/CodeTools/Tests/LSL_EventTests.cs       |    26 +
 .../ScriptEngine/Shared/CodeTools/lsl.parser.cs    | 17529 ++++++++++---------
 2 files changed, 8954 insertions(+), 8601 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
index 5dcdf1a..4e27c00 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
@@ -48,6 +48,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         }
 
         [Test]
+        public void TestAttachEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestKeyArgEvent("attach");
+        }
+
+        [Test]
+        public void TestObjectRezEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestKeyArgEvent("object_rez");
+        }
+
+        [Test]
         public void TestMovingEndEvent()
         {
             TestHelpers.InMethod();
@@ -251,6 +269,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TestCompile("default { " + eventName + "(integer n, integer o) {{}} }", true);
         }
 
+        private void TestKeyArgEvent(string eventName)
+        {
+            TestCompile("default { " + eventName + "(key k) {} }", false);
+            TestCompile("default { " + eventName + "{{}} }", true);
+            TestCompile("default { " + eventName + "(string s) {{}} }", true);
+            TestCompile("default { " + eventName + "(key k, key l) {{}} }", true);
+        }
+
         private void TestVectorArgEvent(string eventName)
         {
             TestCompile("default { " + eventName + "(vector v) {} }", false);
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
index 1a14205..6f44c87 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
@@ -138,23 +138,31 @@ public class VoidArgStateEvent : StateEvent{
 public override string yyname { get { return "VoidArgStateEvent"; }}
 public override int yynum { get { return 104; }}
 public VoidArgStateEvent(Parser yyp):base(yyp){}}
-//%+IntArgStateEvent+105
+//%+KeyArgStateEvent+105
+public class KeyArgStateEvent : StateEvent{
+ public  KeyArgStateEvent (Parser yyp, string  name , KeyArgumentDeclarationList  adl , CompoundStatement  cs ):base(((LSLSyntax
+)yyp), name , adl , cs ){}
+
+public override string yyname { get { return "KeyArgStateEvent"; }}
+public override int yynum { get { return 105; }}
+public KeyArgStateEvent(Parser yyp):base(yyp){}}
+//%+IntArgStateEvent+106
 public class IntArgStateEvent : StateEvent{
  public  IntArgStateEvent (Parser yyp, string  name , IntArgumentDeclarationList  adl , CompoundStatement  cs ):base(((LSLSyntax
 )yyp), name , adl , cs ){}
 
 public override string yyname { get { return "IntArgStateEvent"; }}
-public override int yynum { get { return 105; }}
+public override int yynum { get { return 106; }}
 public IntArgStateEvent(Parser yyp):base(yyp){}}
-//%+VectorArgStateEvent+106
+//%+VectorArgStateEvent+107
 public class VectorArgStateEvent : StateEvent{
  public  VectorArgStateEvent (Parser yyp, string  name , VectorArgumentDeclarationList  adl , CompoundStatement  cs ):base(((LSLSyntax
 )yyp), name , adl , cs ){}
 
 public override string yyname { get { return "VectorArgStateEvent"; }}
-public override int yynum { get { return 106; }}
+public override int yynum { get { return 107; }}
 public VectorArgStateEvent(Parser yyp):base(yyp){}}
-//%+ArgumentDeclarationList+107
+//%+ArgumentDeclarationList+108
 public class ArgumentDeclarationList : SYMBOL{
  public  ArgumentDeclarationList (Parser yyp, Declaration  d ):base(((LSLSyntax
 )yyp)){ kids . Add ( d );
@@ -165,25 +173,33 @@ public class ArgumentDeclarationList : SYMBOL{
 }
 
 public override string yyname { get { return "ArgumentDeclarationList"; }}
-public override int yynum { get { return 107; }}
+public override int yynum { get { return 108; }}
 public ArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+IntArgumentDeclarationList+108
+//%+KeyArgumentDeclarationList+109
+public class KeyArgumentDeclarationList : ArgumentDeclarationList{
+ public  KeyArgumentDeclarationList (Parser yyp, KeyDeclaration  d ):base(((LSLSyntax
+)yyp), d ){}
+
+public override string yyname { get { return "KeyArgumentDeclarationList"; }}
+public override int yynum { get { return 109; }}
+public KeyArgumentDeclarationList(Parser yyp):base(yyp){}}
+//%+IntArgumentDeclarationList+110
 public class IntArgumentDeclarationList : ArgumentDeclarationList{
  public  IntArgumentDeclarationList (Parser yyp, IntDeclaration  d ):base(((LSLSyntax
 )yyp), d ){}
 
 public override string yyname { get { return "IntArgumentDeclarationList"; }}
-public override int yynum { get { return 108; }}
+public override int yynum { get { return 110; }}
 public IntArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+VectorArgumentDeclarationList+109
+//%+VectorArgumentDeclarationList+111
 public class VectorArgumentDeclarationList : ArgumentDeclarationList{
  public  VectorArgumentDeclarationList (Parser yyp, VectorDeclaration  d ):base(((LSLSyntax
 )yyp), d ){}
 
 public override string yyname { get { return "VectorArgumentDeclarationList"; }}
-public override int yynum { get { return 109; }}
+public override int yynum { get { return 111; }}
 public VectorArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+Declaration+110
+//%+Declaration+112
 public class Declaration : SYMBOL{
  private  string  m_datatype ;
  private  string  m_id ;
@@ -203,25 +219,33 @@ public class Declaration : SYMBOL{
 }
 
 public override string yyname { get { return "Declaration"; }}
-public override int yynum { get { return 110; }}
+public override int yynum { get { return 112; }}
 public Declaration(Parser yyp):base(yyp){}}
-//%+IntDeclaration+111
+//%+KeyDeclaration+113
+public class KeyDeclaration : Declaration{
+ public  KeyDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
+)yyp), type , id ){}
+
+public override string yyname { get { return "KeyDeclaration"; }}
+public override int yynum { get { return 113; }}
+public KeyDeclaration(Parser yyp):base(yyp){}}
+//%+IntDeclaration+114
 public class IntDeclaration : Declaration{
  public  IntDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
 )yyp), type , id ){}
 
 public override string yyname { get { return "IntDeclaration"; }}
-public override int yynum { get { return 111; }}
+public override int yynum { get { return 114; }}
 public IntDeclaration(Parser yyp):base(yyp){}}
-//%+VectorDeclaration+112
+//%+VectorDeclaration+115
 public class VectorDeclaration : Declaration{
  public  VectorDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
 )yyp), type , id ){}
 
 public override string yyname { get { return "VectorDeclaration"; }}
-public override int yynum { get { return 112; }}
+public override int yynum { get { return 115; }}
 public VectorDeclaration(Parser yyp):base(yyp){}}
-//%+Typename+113
+//%+Typename+116
 public class Typename : SYMBOL{
  public  string  yytext ;
  public  Typename (Parser yyp, string  text ):base(((LSLSyntax
@@ -229,9 +253,9 @@ public class Typename : SYMBOL{
 }
 
 public override string yyname { get { return "Typename"; }}
-public override int yynum { get { return 113; }}
+public override int yynum { get { return 116; }}
 public Typename(Parser yyp):base(yyp){}}
-//%+Event+114
+//%+Event+117
 public class Event : SYMBOL{
  public  string  yytext ;
  public  Event (Parser yyp, string  text ):base(((LSLSyntax
@@ -239,33 +263,41 @@ public class Event : SYMBOL{
 }
 
 public override string yyname { get { return "Event"; }}
-public override int yynum { get { return 114; }}
+public override int yynum { get { return 117; }}
 public Event(Parser yyp):base(yyp){}}
-//%+VoidArgEvent+115
+//%+VoidArgEvent+118
 public class VoidArgEvent : Event{
  public  VoidArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "VoidArgEvent"; }}
-public override int yynum { get { return 115; }}
+public override int yynum { get { return 118; }}
 public VoidArgEvent(Parser yyp):base(yyp){}}
-//%+IntArgEvent+116
+//%+KeyArgEvent+119
+public class KeyArgEvent : Event{
+ public  KeyArgEvent (Parser yyp, string  text ):base(((LSLSyntax
+)yyp), text ){}
+
+public override string yyname { get { return "KeyArgEvent"; }}
+public override int yynum { get { return 119; }}
+public KeyArgEvent(Parser yyp):base(yyp){}}
+//%+IntArgEvent+120
 public class IntArgEvent : Event{
  public  IntArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "IntArgEvent"; }}
-public override int yynum { get { return 116; }}
+public override int yynum { get { return 120; }}
 public IntArgEvent(Parser yyp):base(yyp){}}
-//%+VectorArgEvent+117
+//%+VectorArgEvent+121
 public class VectorArgEvent : Event{
  public  VectorArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "VectorArgEvent"; }}
-public override int yynum { get { return 117; }}
+public override int yynum { get { return 121; }}
 public VectorArgEvent(Parser yyp):base(yyp){}}
-//%+CompoundStatement+118
+//%+CompoundStatement+122
 public class CompoundStatement : SYMBOL{
  public  CompoundStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -274,9 +306,9 @@ public class CompoundStatement : SYMBOL{
 }
 
 public override string yyname { get { return "CompoundStatement"; }}
-public override int yynum { get { return 118; }}
+public override int yynum { get { return 122; }}
 }
-//%+StatementList+119
+//%+StatementList+123
 public class StatementList : SYMBOL{
  private  void  AddStatement ( Statement  s ){ if ( s . kids . Top  is  IfStatement || s . kids . Top  is  WhileStatement || s . kids . Top  is  DoWhileStatement || s . kids . Top  is  ForLoop ) kids . Add ( s . kids . Pop ());
  else  kids . Add ( s );
@@ -290,9 +322,9 @@ public class StatementList : SYMBOL{
 }
 
 public override string yyname { get { return "StatementList"; }}
-public override int yynum { get { return 119; }}
+public override int yynum { get { return 123; }}
 public StatementList(Parser yyp):base(yyp){}}
-//%+Statement+120
+//%+Statement+124
 public class Statement : SYMBOL{
  public  Statement (Parser yyp, Declaration  d ):base(((LSLSyntax
 )yyp)){ kids . Add ( d );
@@ -338,9 +370,9 @@ public class Statement : SYMBOL{
 }
 
 public override string yyname { get { return "Statement"; }}
-public override int yynum { get { return 120; }}
+public override int yynum { get { return 124; }}
 public Statement(Parser yyp):base(yyp){}}
-//%+EmptyStatement+121
+//%+EmptyStatement+125
 public class EmptyStatement : SYMBOL{
  public  EmptyStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -348,9 +380,9 @@ public class EmptyStatement : SYMBOL{
 }
 
 public override string yyname { get { return "EmptyStatement"; }}
-public override int yynum { get { return 121; }}
+public override int yynum { get { return 125; }}
 }
-//%+Assignment+122
+//%+Assignment+126
 public class Assignment : SYMBOL{
  protected  string  m_assignmentType ;
  public  Assignment (Parser yyp, SYMBOL  lhs , SYMBOL  rhs , string  assignmentType ):base(((LSLSyntax
@@ -370,9 +402,9 @@ public class Assignment : SYMBOL{
 }
 
 public override string yyname { get { return "Assignment"; }}
-public override int yynum { get { return 122; }}
+public override int yynum { get { return 126; }}
 public Assignment(Parser yyp):base(yyp){}}
-//%+SimpleAssignment+123
+//%+SimpleAssignment+127
 public class SimpleAssignment : Assignment{
  public  SimpleAssignment (Parser yyp, SYMBOL  lhs , SYMBOL  rhs , string  assignmentType ):base(((LSLSyntax
 )yyp)){ m_assignmentType = assignmentType ;
@@ -382,9 +414,9 @@ public class SimpleAssignment : Assignment{
 }
 
 public override string yyname { get { return "SimpleAssignment"; }}
-public override int yynum { get { return 123; }}
+public override int yynum { get { return 127; }}
 public SimpleAssignment(Parser yyp):base(yyp){}}
-//%+ReturnStatement+124
+//%+ReturnStatement+128
 public class ReturnStatement : SYMBOL{
  public  ReturnStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -394,9 +426,9 @@ public class ReturnStatement : SYMBOL{
 }
 
 public override string yyname { get { return "ReturnStatement"; }}
-public override int yynum { get { return 124; }}
+public override int yynum { get { return 128; }}
 }
-//%+JumpLabel+125
+//%+JumpLabel+129
 public class JumpLabel : SYMBOL{
  private  string  m_labelName ;
  public  JumpLabel (Parser yyp, string  labelName ):base(((LSLSyntax
@@ -409,9 +441,9 @@ public class JumpLabel : SYMBOL{
 }
 
 public override string yyname { get { return "JumpLabel"; }}
-public override int yynum { get { return 125; }}
+public override int yynum { get { return 129; }}
 public JumpLabel(Parser yyp):base(yyp){}}
-//%+JumpStatement+126
+//%+JumpStatement+130
 public class JumpStatement : SYMBOL{
  private  string  m_targetName ;
  public  JumpStatement (Parser yyp, string  targetName ):base(((LSLSyntax
@@ -424,9 +456,9 @@ public class JumpStatement : SYMBOL{
 }
 
 public override string yyname { get { return "JumpStatement"; }}
-public override int yynum { get { return 126; }}
+public override int yynum { get { return 130; }}
 public JumpStatement(Parser yyp):base(yyp){}}
-//%+StateChange+127
+//%+StateChange+131
 public class StateChange : SYMBOL{
  private  string  m_newState ;
  public  StateChange (Parser yyp, string  newState ):base(((LSLSyntax
@@ -437,9 +469,9 @@ public class StateChange : SYMBOL{
 }
 
 public override string yyname { get { return "StateChange"; }}
-public override int yynum { get { return 127; }}
+public override int yynum { get { return 131; }}
 public StateChange(Parser yyp):base(yyp){}}
-//%+IfStatement+128
+//%+IfStatement+132
 public class IfStatement : SYMBOL{
  private  void  AddStatement ( Statement  s ){ if (0< s . kids . Count && s . kids . Top  is  CompoundStatement ) kids . Add ( s . kids . Pop ());
  else  kids . Add ( s );
@@ -456,9 +488,9 @@ public class IfStatement : SYMBOL{
 }
 
 public override string yyname { get { return "IfStatement"; }}
-public override int yynum { get { return 128; }}
+public override int yynum { get { return 132; }}
 public IfStatement(Parser yyp):base(yyp){}}
-//%+WhileStatement+129
+//%+WhileStatement+133
 public class WhileStatement : SYMBOL{
  public  WhileStatement (Parser yyp, SYMBOL  s , Statement  st ):base(((LSLSyntax
 )yyp)){ kids . Add ( s );
@@ -467,9 +499,9 @@ public class WhileStatement : SYMBOL{
 }
 
 public override string yyname { get { return "WhileStatement"; }}
-public override int yynum { get { return 129; }}
+public override int yynum { get { return 133; }}
 public WhileStatement(Parser yyp):base(yyp){}}
-//%+DoWhileStatement+130
+//%+DoWhileStatement+134
 public class DoWhileStatement : SYMBOL{
  public  DoWhileStatement (Parser yyp, SYMBOL  s , Statement  st ):base(((LSLSyntax
 )yyp)){ if (0< st . kids . Count && st . kids . Top  is  CompoundStatement ) kids . Add ( st . kids . Pop ());
@@ -478,9 +510,9 @@ public class DoWhileStatement : SYMBOL{
 }
 
 public override string yyname { get { return "DoWhileStatement"; }}
-public override int yynum { get { return 130; }}
+public override int yynum { get { return 134; }}
 public DoWhileStatement(Parser yyp):base(yyp){}}
-//%+ForLoop+131
+//%+ForLoop+135
 public class ForLoop : SYMBOL{
  public  ForLoop (Parser yyp, ForLoopStatement  flsa , Expression  e , ForLoopStatement  flsb , Statement  s ):base(((LSLSyntax
 )yyp)){ kids . Add ( flsa );
@@ -491,9 +523,9 @@ public class ForLoop : SYMBOL{
 }
 
 public override string yyname { get { return "ForLoop"; }}
-public override int yynum { get { return 131; }}
+public override int yynum { get { return 135; }}
 public ForLoop(Parser yyp):base(yyp){}}
-//%+ForLoopStatement+132
+//%+ForLoopStatement+136
 public class ForLoopStatement : SYMBOL{
  public  ForLoopStatement (Parser yyp, Expression  e ):base(((LSLSyntax
 )yyp)){ kids . Add ( e );
@@ -511,9 +543,9 @@ public class ForLoopStatement : SYMBOL{
 }
 
 public override string yyname { get { return "ForLoopStatement"; }}
-public override int yynum { get { return 132; }}
+public override int yynum { get { return 136; }}
 public ForLoopStatement(Parser yyp):base(yyp){}}
-//%+FunctionCall+133
+//%+FunctionCall+137
 public class FunctionCall : SYMBOL{
  private  string  m_id ;
  public  FunctionCall (Parser yyp, string  id , ArgumentList  al ):base(((LSLSyntax
@@ -527,9 +559,9 @@ public class FunctionCall : SYMBOL{
 }
 
 public override string yyname { get { return "FunctionCall"; }}
-public override int yynum { get { return 133; }}
+public override int yynum { get { return 137; }}
 public FunctionCall(Parser yyp):base(yyp){}}
-//%+ArgumentList+134
+//%+ArgumentList+138
 public class ArgumentList : SYMBOL{
  public  ArgumentList (Parser yyp, Argument  a ):base(((LSLSyntax
 )yyp)){ AddArgument ( a );
@@ -543,14 +575,14 @@ public class ArgumentList : SYMBOL{
 }
 
 public override string yyname { get { return "ArgumentList"; }}
-public override int yynum { get { return 134; }}
+public override int yynum { get { return 138; }}
 public ArgumentList(Parser yyp):base(yyp){}}
-//%+Argument+135
+//%+Argument+139
 public class Argument : SYMBOL{
 public override string yyname { get { return "Argument"; }}
-public override int yynum { get { return 135; }}
+public override int yynum { get { return 139; }}
 public Argument(Parser yyp):base(yyp){}}
-//%+ExpressionArgument+136
+//%+ExpressionArgument+140
 public class ExpressionArgument : Argument{
  public  ExpressionArgument (Parser yyp, Expression  e ):base(((LSLSyntax
 )yyp)){ if ( e  is  ConstantExpression ) while (0< e . kids . Count ) kids . Add ( e . kids . Pop ());
@@ -558,9 +590,9 @@ public class ExpressionArgument : Argument{
 }
 
 public override string yyname { get { return "ExpressionArgument"; }}
-public override int yynum { get { return 136; }}
+public override int yynum { get { return 140; }}
 public ExpressionArgument(Parser yyp):base(yyp){}}
-//%+Constant+137
+//%+Constant+141
 public class Constant : SYMBOL{
  private  string  m_type ;
  private  string  m_val ;
@@ -582,9 +614,9 @@ public class Constant : SYMBOL{
 }
 
 public override string yyname { get { return "Constant"; }}
-public override int yynum { get { return 137; }}
+public override int yynum { get { return 141; }}
 public Constant(Parser yyp):base(yyp){}}
-//%+VectorConstant+138
+//%+VectorConstant+142
 public class VectorConstant : Constant{
  public  VectorConstant (Parser yyp, Expression  valX , Expression  valY , Expression  valZ ):base(((LSLSyntax
 )yyp),"vector", null ){ kids . Add ( valX );
@@ -593,9 +625,9 @@ public class VectorConstant : Constant{
 }
 
 public override string yyname { get { return "VectorConstant"; }}
-public override int yynum { get { return 138; }}
+public override int yynum { get { return 142; }}
 public VectorConstant(Parser yyp):base(yyp){}}
-//%+RotationConstant+139
+//%+RotationConstant+143
 public class RotationConstant : Constant{
  public  RotationConstant (Parser yyp, Expression  valX , Expression  valY , Expression  valZ , Expression  valS ):base(((LSLSyntax
 )yyp),"rotation", null ){ kids . Add ( valX );
@@ -605,36 +637,36 @@ public class RotationConstant : Constant{
 }
 
 public override string yyname { get { return "RotationConstant"; }}
-public override int yynum { get { return 139; }}
+public override int yynum { get { return 143; }}
 public RotationConstant(Parser yyp):base(yyp){}}
-//%+ListConstant+140
+//%+ListConstant+144
 public class ListConstant : Constant{
  public  ListConstant (Parser yyp, ArgumentList  al ):base(((LSLSyntax
 )yyp),"list", null ){ kids . Add ( al );
 }
 
 public override string yyname { get { return "ListConstant"; }}
-public override int yynum { get { return 140; }}
+public override int yynum { get { return 144; }}
 public ListConstant(Parser yyp):base(yyp){}}
-//%+Expression+141
+//%+Expression+145
 public class Expression : SYMBOL{
  protected  void  AddExpression ( Expression  e ){ if ( e  is  ConstantExpression ) while (0< e . kids . Count ) kids . Add ( e . kids . Pop ());
  else  kids . Add ( e );
 }
 
 public override string yyname { get { return "Expression"; }}
-public override int yynum { get { return 141; }}
+public override int yynum { get { return 145; }}
 public Expression(Parser yyp):base(yyp){}}
-//%+ConstantExpression+142
+//%+ConstantExpression+146
 public class ConstantExpression : Expression{
  public  ConstantExpression (Parser yyp, Constant  c ):base(((LSLSyntax
 )yyp)){ kids . Add ( c );
 }
 
 public override string yyname { get { return "ConstantExpression"; }}
-public override int yynum { get { return 142; }}
+public override int yynum { get { return 146; }}
 public ConstantExpression(Parser yyp):base(yyp){}}
-//%+IdentExpression+143
+//%+IdentExpression+147
 public class IdentExpression : Expression{
  protected  string  m_name ;
  public  IdentExpression (Parser yyp, string  name ):base(((LSLSyntax
@@ -647,9 +679,9 @@ public class IdentExpression : Expression{
 }
 
 public override string yyname { get { return "IdentExpression"; }}
-public override int yynum { get { return 143; }}
+public override int yynum { get { return 147; }}
 public IdentExpression(Parser yyp):base(yyp){}}
-//%+IdentDotExpression+144
+//%+IdentDotExpression+148
 public class IdentDotExpression : IdentExpression{
  private  string  m_member ;
  public  IdentDotExpression (Parser yyp, string  name , string  member ):base(((LSLSyntax
@@ -663,18 +695,18 @@ public class IdentDotExpression : IdentExpression{
 }
 
 public override string yyname { get { return "IdentDotExpression"; }}
-public override int yynum { get { return 144; }}
+public override int yynum { get { return 148; }}
 public IdentDotExpression(Parser yyp):base(yyp){}}
-//%+FunctionCallExpression+145
+//%+FunctionCallExpression+149
 public class FunctionCallExpression : Expression{
  public  FunctionCallExpression (Parser yyp, FunctionCall  fc ):base(((LSLSyntax
 )yyp)){ kids . Add ( fc );
 }
 
 public override string yyname { get { return "FunctionCallExpression"; }}
-public override int yynum { get { return 145; }}
+public override int yynum { get { return 149; }}
 public FunctionCallExpression(Parser yyp):base(yyp){}}
-//%+BinaryExpression+146
+//%+BinaryExpression+150
 public class BinaryExpression : Expression{
  private  string  m_expressionSymbol ;
  public  BinaryExpression (Parser yyp, Expression  lhs , Expression  rhs , string  expressionSymbol ):base(((LSLSyntax
@@ -689,9 +721,9 @@ public class BinaryExpression : Expression{
 }
 
 public override string yyname { get { return "BinaryExpression"; }}
-public override int yynum { get { return 146; }}
+public override int yynum { get { return 150; }}
 public BinaryExpression(Parser yyp):base(yyp){}}
-//%+UnaryExpression+147
+//%+UnaryExpression+151
 public class UnaryExpression : Expression{
  private  string  m_unarySymbol ;
  public  UnaryExpression (Parser yyp, string  unarySymbol , Expression  e ):base(((LSLSyntax
@@ -705,9 +737,9 @@ public class UnaryExpression : Expression{
 }
 
 public override string yyname { get { return "UnaryExpression"; }}
-public override int yynum { get { return 147; }}
+public override int yynum { get { return 151; }}
 public UnaryExpression(Parser yyp):base(yyp){}}
-//%+TypecastExpression+148
+//%+TypecastExpression+152
 public class TypecastExpression : Expression{
  private  string  m_typecastType ;
  public  TypecastExpression (Parser yyp, string  typecastType , SYMBOL  rhs ):base(((LSLSyntax
@@ -721,18 +753,18 @@ public class TypecastExpression : Expression{
 }
 
 public override string yyname { get { return "TypecastExpression"; }}
-public override int yynum { get { return 148; }}
+public override int yynum { get { return 152; }}
 public TypecastExpression(Parser yyp):base(yyp){}}
-//%+ParenthesisExpression+149
+//%+ParenthesisExpression+153
 public class ParenthesisExpression : Expression{
  public  ParenthesisExpression (Parser yyp, SYMBOL  s ):base(((LSLSyntax
 )yyp)){ kids . Add ( s );
 }
 
 public override string yyname { get { return "ParenthesisExpression"; }}
-public override int yynum { get { return 149; }}
+public override int yynum { get { return 153; }}
 public ParenthesisExpression(Parser yyp):base(yyp){}}
-//%+IncrementDecrementExpression+150
+//%+IncrementDecrementExpression+154
 public class IncrementDecrementExpression : Expression{
  private  string  m_name ;
  private  string  m_operation ;
@@ -760,7 +792,7 @@ public class IncrementDecrementExpression : Expression{
 }
 
 public override string yyname { get { return "IncrementDecrementExpression"; }}
-public override int yynum { get { return 150; }}
+public override int yynum { get { return 154; }}
 public IncrementDecrementExpression(Parser yyp):base(yyp){}}
 
 public class LSLProgramRoot_1 : LSLProgramRoot {
@@ -886,25 +918,37 @@ public class StateBody_4 : StateBody {
 
 public class StateBody_5 : StateBody {
   public StateBody_5(Parser yyq):base(yyq,
-	((IntArgStateEvent)(yyq.StackAt(0).m_value))
+	((KeyArgStateEvent)(yyq.StackAt(0).m_value))
 	){}}
 
 public class StateBody_6 : StateBody {
   public StateBody_6(Parser yyq):base(yyq,
 	((StateBody)(yyq.StackAt(1).m_value))
 	, 
-	((IntArgStateEvent)(yyq.StackAt(0).m_value))
+	((KeyArgStateEvent)(yyq.StackAt(0).m_value))
 	){}}
 
 public class StateBody_7 : StateBody {
   public StateBody_7(Parser yyq):base(yyq,
-	((VectorArgStateEvent)(yyq.StackAt(0).m_value))
+	((IntArgStateEvent)(yyq.StackAt(0).m_value))
 	){}}
 
 public class StateBody_8 : StateBody {
   public StateBody_8(Parser yyq):base(yyq,
 	((StateBody)(yyq.StackAt(1).m_value))
 	, 
+	((IntArgStateEvent)(yyq.StackAt(0).m_value))
+	){}}
+
+public class StateBody_9 : StateBody {
+  public StateBody_9(Parser yyq):base(yyq,
+	((VectorArgStateEvent)(yyq.StackAt(0).m_value))
+	){}}
+
+public class StateBody_10 : StateBody {
+  public StateBody_10(Parser yyq):base(yyq,
+	((StateBody)(yyq.StackAt(1).m_value))
+	, 
 	((VectorArgStateEvent)(yyq.StackAt(0).m_value))
 	){}}
 
@@ -924,6 +968,15 @@ public class VoidArgStateEvent_1 : VoidArgStateEvent {
 	((CompoundStatement)(yyq.StackAt(0).m_value))
 	){}}
 
+public class KeyArgStateEvent_1 : KeyArgStateEvent {
+  public KeyArgStateEvent_1(Parser yyq):base(yyq,
+	((KeyArgEvent)(yyq.StackAt(4).m_value))
+	.yytext, 
+	((KeyArgumentDeclarationList)(yyq.StackAt(2).m_value))
+	, 
+	((CompoundStatement)(yyq.StackAt(0).m_value))
+	){}}
+
 public class IntArgStateEvent_1 : IntArgStateEvent {
   public IntArgStateEvent_1(Parser yyq):base(yyq,
 	((IntArgEvent)(yyq.StackAt(4).m_value))
@@ -954,6 +1007,11 @@ public class ArgumentDeclarationList_2 : ArgumentDeclarationList {
 	((Declaration)(yyq.StackAt(0).m_value))
 	){}}
 
+public class KeyArgumentDeclarationList_1 : KeyArgumentDeclarationList {
+  public KeyArgumentDeclarationList_1(Parser yyq):base(yyq,
+	((KeyDeclaration)(yyq.StackAt(0).m_value))
+	){}}
+
 public class IntArgumentDeclarationList_1 : IntArgumentDeclarationList {
   public IntArgumentDeclarationList_1(Parser yyq):base(yyq,
 	((IntDeclaration)(yyq.StackAt(0).m_value))
@@ -971,6 +1029,13 @@ public class Declaration_1 : Declaration {
 	((IDENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
+public class KeyDeclaration_1 : KeyDeclaration {
+  public KeyDeclaration_1(Parser yyq):base(yyq,
+	((KEY_TYPE)(yyq.StackAt(1).m_value))
+	.yytext, 
+	((IDENT)(yyq.StackAt(0).m_value))
+	.yytext){}}
+
 public class IntDeclaration_1 : IntDeclaration {
   public IntDeclaration_1(Parser yyq):base(yyq,
 	((INTEGER_TYPE)(yyq.StackAt(1).m_value))
@@ -1955,56 +2020,46 @@ public class Event_2 : Event {
 
 public class Event_3 : Event {
   public Event_3(Parser yyq):base(yyq,
-	((ATTACH_EVENT)(yyq.StackAt(0).m_value))
+	((CONTROL_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_4 : Event {
   public Event_4(Parser yyq):base(yyq,
-	((CONTROL_EVENT)(yyq.StackAt(0).m_value))
+	((DATASERVER_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_5 : Event {
   public Event_5(Parser yyq):base(yyq,
-	((DATASERVER_EVENT)(yyq.StackAt(0).m_value))
+	((EMAIL_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_6 : Event {
   public Event_6(Parser yyq):base(yyq,
-	((EMAIL_EVENT)(yyq.StackAt(0).m_value))
+	((HTTP_RESPONSE_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_7 : Event {
   public Event_7(Parser yyq):base(yyq,
-	((HTTP_RESPONSE_EVENT)(yyq.StackAt(0).m_value))
+	((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_8 : Event {
   public Event_8(Parser yyq):base(yyq,
-	((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value))
+	((LISTEN_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_9 : Event {
   public Event_9(Parser yyq):base(yyq,
-	((LISTEN_EVENT)(yyq.StackAt(0).m_value))
+	((MONEY_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_10 : Event {
   public Event_10(Parser yyq):base(yyq,
-	((MONEY_EVENT)(yyq.StackAt(0).m_value))
+	((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_11 : Event {
   public Event_11(Parser yyq):base(yyq,
-	((OBJECT_REZ_EVENT)(yyq.StackAt(0).m_value))
-	.yytext){}}
-
-public class Event_12 : Event {
-  public Event_12(Parser yyq):base(yyq,
-	((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value))
-	.yytext){}}
-
-public class Event_13 : Event {
-  public Event_13(Parser yyq):base(yyq,
 	((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
@@ -2048,6 +2103,16 @@ public class VoidArgEvent_8 : VoidArgEvent {
 	((TIMER_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
+public class KeyArgEvent_1 : KeyArgEvent {
+  public KeyArgEvent_1(Parser yyq):base(yyq,
+	((ATTACH_EVENT)(yyq.StackAt(0).m_value))
+	.yytext){}}
+
+public class KeyArgEvent_2 : KeyArgEvent {
+  public KeyArgEvent_2(Parser yyq):base(yyq,
+	((OBJECT_REZ_EVENT)(yyq.StackAt(0).m_value))
+	.yytext){}}
+
 public class IntArgEvent_1 : IntArgEvent {
   public IntArgEvent_1(Parser yyq):base(yyq,
 	((CHANGED_EVENT)(yyq.StackAt(0).m_value))
@@ -2128,11 +2193,11 @@ public class ArgumentList_3 : ArgumentList {
 public class ArgumentDeclarationList_4 : ArgumentDeclarationList {
   public ArgumentDeclarationList_4(Parser yyq):base(yyq){}}
 
-public class ArgumentDeclarationList_5 : ArgumentDeclarationList {
-  public ArgumentDeclarationList_5(Parser yyq):base(yyq){}}
-
 public class ArgumentList_4 : ArgumentList {
   public ArgumentList_4(Parser yyq):base(yyq){}}
+
+public class ArgumentDeclarationList_5 : ArgumentDeclarationList {
+  public ArgumentDeclarationList_5(Parser yyq):base(yyq){}}
 public yyLSLSyntax
 ():base() { arr = new int[] { 
 101,4,6,52,0,
@@ -2144,9 +2209,9 @@ public yyLSLSyntax
 97,0,109,0,82,
 0,111,0,111,0,
 116,0,1,96,1,
-2,104,18,1,2761,
+2,104,18,1,2777,
 102,2,0,105,5,
-346,1,0,106,18,
+356,1,0,106,18,
 1,0,0,2,0,
 1,1,107,18,1,
 1,108,20,109,4,
@@ -2207,7 +2272,7 @@ public yyLSLSyntax
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,1,
-113,1,2,2,0,
+116,1,2,2,0,
 1,9,131,18,1,
 9,132,20,133,4,
 10,73,0,68,0,
@@ -2236,7 +2301,7 @@ public yyLSLSyntax
 105,0,111,0,110,
 0,76,0,105,0,
 115,0,116,0,1,
-107,1,2,2,0,
+108,1,2,2,0,
 1,21,142,18,1,
 21,143,20,144,4,
 10,67,0,79,0,
@@ -2251,46 +2316,53 @@ public yyLSLSyntax
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,132,1,2,2,
+1,136,1,2,2,
 0,1,1695,148,18,
 1,1695,143,2,0,
-1,30,149,18,1,
-30,150,20,151,4,
+1,2645,149,18,1,
+2645,150,20,151,4,
+18,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,1,
+102,1,2,2,0,
+1,30,152,18,1,
+30,153,20,154,4,
 22,68,0,101,0,
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
-0,110,0,1,110,
+0,110,0,1,112,
 1,2,2,0,1,
-31,152,18,1,31,
-153,20,154,4,22,
+31,155,18,1,31,
+156,20,157,4,22,
 82,0,73,0,71,
 0,72,0,84,0,
 95,0,80,0,65,
 0,82,0,69,0,
 78,0,1,17,1,
 1,2,0,1,32,
-155,18,1,32,156,
-20,157,4,20,76,
+158,18,1,32,159,
+20,160,4,20,76,
 0,69,0,70,0,
 84,0,95,0,66,
 0,82,0,65,0,
 67,0,69,0,1,
 12,1,1,2,0,
-1,1114,158,18,1,
+1,1114,161,18,1,
 1114,132,2,0,1,
-1152,159,18,1,1152,
-160,20,161,4,32,
+1152,162,18,1,1152,
+163,20,164,4,32,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
 0,115,0,105,0,
 103,0,110,0,109,
 0,101,0,110,0,
-116,0,1,123,1,
+116,0,1,127,1,
 2,2,0,1,1117,
-162,18,1,1117,163,
-20,164,4,28,80,
+165,18,1,1117,166,
+20,167,4,28,80,
 0,69,0,82,0,
 67,0,69,0,78,
 0,84,0,95,0,
@@ -2298,682 +2370,700 @@ public yyLSLSyntax
 0,65,0,76,0,
 83,0,1,10,1,
 1,2,0,1,40,
-165,18,1,40,132,
-2,0,1,41,166,
+168,18,1,40,132,
+2,0,1,41,169,
 18,1,41,135,2,
-0,1,42,167,18,
-1,42,168,20,169,
+0,1,42,170,18,
+1,42,171,20,172,
 4,20,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,1,141,1,
+110,0,1,145,1,
 2,2,0,1,43,
-170,18,1,43,171,
-20,172,4,22,82,
+173,18,1,43,174,
+20,175,4,22,82,
 0,73,0,71,0,
 72,0,84,0,95,
 0,83,0,72,0,
 73,0,70,0,84,
 0,1,41,1,1,
-2,0,1,44,173,
+2,0,1,44,176,
 18,1,44,132,2,
-0,1,1159,174,18,
-1,1159,168,2,0,
-1,46,175,18,1,
-46,176,20,177,4,
+0,1,1159,177,18,
+1,1159,171,2,0,
+1,46,178,18,1,
+46,179,20,180,4,
 12,80,0,69,0,
 82,0,73,0,79,
 0,68,0,1,24,
 1,1,2,0,1,
-47,178,18,1,47,
+47,181,18,1,47,
 132,2,0,1,48,
-179,18,1,48,180,
-20,181,4,18,68,
+182,18,1,48,183,
+20,184,4,18,68,
 0,69,0,67,0,
 82,0,69,0,77,
 0,69,0,78,0,
 84,0,1,5,1,
 1,2,0,1,49,
-182,18,1,49,183,
-20,184,4,18,73,
+185,18,1,49,186,
+20,187,4,18,73,
 0,78,0,67,0,
 82,0,69,0,77,
 0,69,0,78,0,
 84,0,1,4,1,
 1,2,0,1,50,
-185,18,1,50,180,
-2,0,1,51,186,
-18,1,51,183,2,
-0,1,52,187,18,
+188,18,1,50,183,
+2,0,1,51,189,
+18,1,51,186,2,
+0,1,52,190,18,
 1,52,135,2,0,
-1,2281,188,18,1,
-2281,160,2,0,1,
-1730,189,18,1,1730,
-160,2,0,1,1731,
-190,18,1,1731,191,
-20,192,4,18,83,
-0,69,0,77,0,
-73,0,67,0,79,
-0,76,0,79,0,
-78,0,1,11,1,
-1,2,0,1,61,
-193,18,1,61,129,
-2,0,1,62,194,
-18,1,62,153,2,
-0,1,63,195,18,
+1,2281,191,18,1,
+2281,163,2,0,1,
+2754,192,18,1,2754,
+193,20,194,4,18,
+83,0,69,0,77,
+0,73,0,67,0,
+79,0,76,0,79,
+0,78,0,1,11,
+1,1,2,0,1,
+2755,195,18,1,2755,
+196,20,197,4,34,
+71,0,108,0,111,
+0,98,0,97,0,
+108,0,68,0,101,
+0,102,0,105,0,
+110,0,105,0,116,
+0,105,0,111,0,
+110,0,115,0,1,
+97,1,2,2,0,
+1,1730,198,18,1,
+1730,163,2,0,1,
+1731,199,18,1,1731,
+193,2,0,1,61,
+200,18,1,61,129,
+2,0,1,62,201,
+18,1,62,156,2,
+0,1,63,202,18,
 1,63,132,2,0,
-1,65,196,18,1,
-65,176,2,0,1,
-66,197,18,1,66,
+1,65,203,18,1,
+65,179,2,0,1,
+66,204,18,1,66,
 132,2,0,1,67,
-198,18,1,67,180,
-2,0,1,68,199,
-18,1,68,183,2,
-0,1,69,200,18,
-1,69,180,2,0,
-1,70,201,18,1,
-70,183,2,0,1,
-71,202,18,1,71,
+205,18,1,67,183,
+2,0,1,68,206,
+18,1,68,186,2,
+0,1,69,207,18,
+1,69,183,2,0,
+1,70,208,18,1,
+70,186,2,0,1,
+71,209,18,1,71,
 135,2,0,1,73,
-203,18,1,73,168,
-2,0,1,74,204,
-18,1,74,153,2,
-0,1,1189,205,18,
-1,1189,206,20,207,
+210,18,1,73,171,
+2,0,1,74,211,
+18,1,74,156,2,
+0,1,1189,212,18,
+1,1189,213,20,214,
 4,22,83,0,84,
 0,65,0,82,0,
 95,0,69,0,81,
 0,85,0,65,0,
 76,0,83,0,1,
 8,1,1,2,0,
-1,76,208,18,1,
-76,209,20,210,4,
+1,76,215,18,1,
+76,216,20,217,4,
 20,76,0,69,0,
 70,0,84,0,95,
 0,83,0,72,0,
 73,0,70,0,84,
 0,1,40,1,1,
-2,0,1,1153,211,
-18,1,1153,212,20,
-213,4,24,83,0,
+2,0,1,1153,218,
+18,1,1153,219,20,
+220,4,24,83,0,
 76,0,65,0,83,
 0,72,0,95,0,
 69,0,81,0,85,
 0,65,0,76,0,
 83,0,1,9,1,
 1,2,0,1,79,
-214,18,1,79,215,
-20,216,4,10,84,
+221,18,1,79,222,
+20,223,4,10,84,
 0,73,0,76,0,
 68,0,69,0,1,
 36,1,1,2,0,
-1,1195,217,18,1,
-1195,168,2,0,1,
-82,218,18,1,82,
-168,2,0,1,1123,
-219,18,1,1123,168,
-2,0,1,85,220,
-18,1,85,221,20,
-222,4,26,83,0,
+1,1195,224,18,1,
+1195,171,2,0,1,
+82,225,18,1,82,
+171,2,0,1,1123,
+226,18,1,1123,171,
+2,0,1,85,227,
+18,1,85,228,20,
+229,4,26,83,0,
 84,0,82,0,79,
 0,75,0,69,0,
 95,0,83,0,84,
 0,82,0,79,0,
 75,0,69,0,1,
 39,1,1,2,0,
-1,2699,223,18,1,
-2699,224,20,225,4,
-34,67,0,111,0,
-109,0,112,0,111,
-0,117,0,110,0,
-100,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-1,118,1,2,2,
-0,1,89,226,18,
-1,89,227,20,228,
-4,10,77,0,73,
-0,78,0,85,0,
-83,0,1,19,1,
-1,2,0,1,2318,
-229,18,1,2318,191,
-2,0,1,93,230,
-18,1,93,168,2,
-0,1,2708,231,18,
-1,2708,168,2,0,
-1,97,232,18,1,
-97,233,20,234,4,
-14,65,0,77,0,
-80,0,95,0,65,
-0,77,0,80,0,
-1,38,1,1,2,
-0,1,102,235,18,
-1,102,236,20,237,
-4,22,69,0,88,
-0,67,0,76,0,
-65,0,77,0,65,
-0,84,0,73,0,
-79,0,78,0,1,
-37,1,1,2,0,
-1,1775,238,18,1,
-1775,153,2,0,1,
-107,239,18,1,107,
-168,2,0,1,2337,
-240,18,1,2337,153,
-2,0,1,1224,241,
-18,1,1224,160,2,
-0,1,1225,242,18,
-1,1225,243,20,244,
-4,24,77,0,73,
-0,78,0,85,0,
-83,0,95,0,69,
-0,81,0,85,0,
-65,0,76,0,83,
-0,1,7,1,1,
-2,0,1,112,245,
-18,1,112,246,20,
-247,4,28,71,0,
-82,0,69,0,65,
-0,84,0,69,0,
-82,0,95,0,69,
-0,81,0,85,0,
-65,0,76,0,83,
-0,1,32,1,1,
-2,0,1,1188,248,
-18,1,1188,160,2,
-0,1,1231,249,18,
-1,1231,168,2,0,
-1,118,250,18,1,
-118,168,2,0,1,
-1737,251,18,1,1737,
-168,2,0,1,124,
-252,18,1,124,253,
-20,254,4,22,76,
-0,69,0,83,0,
-83,0,95,0,69,
-0,81,0,85,0,
-65,0,76,0,83,
-0,1,31,1,1,
-2,0,1,2738,255,
-18,1,2738,191,2,
-0,1,130,256,18,
-1,130,168,2,0,
-1,1803,257,18,1,
-1803,258,20,259,4,
+1,2547,230,18,1,
+2547,140,2,0,1,
+89,231,18,1,89,
+232,20,233,4,10,
+77,0,73,0,78,
+0,85,0,83,0,
+1,19,1,1,2,
+0,1,2318,234,18,
+1,2318,193,2,0,
+1,93,235,18,1,
+93,171,2,0,1,
+97,236,18,1,97,
+237,20,238,4,14,
+65,0,77,0,80,
+0,95,0,65,0,
+77,0,80,0,1,
+38,1,1,2,0,
+1,102,239,18,1,
+102,240,20,241,4,
+22,69,0,88,0,
+67,0,76,0,65,
+0,77,0,65,0,
+84,0,73,0,79,
+0,78,0,1,37,
+1,1,2,0,1,
+1775,242,18,1,1775,
+156,2,0,1,107,
+243,18,1,107,171,
+2,0,1,2337,244,
+18,1,2337,156,2,
+0,1,1224,245,18,
+1,1224,163,2,0,
+1,1225,246,18,1,
+1225,247,20,248,4,
+24,77,0,73,0,
+78,0,85,0,83,
+0,95,0,69,0,
+81,0,85,0,65,
+0,76,0,83,0,
+1,7,1,1,2,
+0,1,112,249,18,
+1,112,250,20,251,
+4,28,71,0,82,
+0,69,0,65,0,
+84,0,69,0,82,
+0,95,0,69,0,
+81,0,85,0,65,
+0,76,0,83,0,
+1,32,1,1,2,
+0,1,1188,252,18,
+1,1188,163,2,0,
+1,1231,253,18,1,
+1231,171,2,0,1,
+118,254,18,1,118,
+171,2,0,1,1737,
+255,18,1,1737,171,
+2,0,1,124,256,
+18,1,124,257,20,
+258,4,22,76,0,
+69,0,83,0,83,
+0,95,0,69,0,
+81,0,85,0,65,
+0,76,0,83,0,
+1,31,1,1,2,
+0,1,130,259,18,
+1,130,171,2,0,
+1,1803,260,18,1,
+1803,261,20,262,4,
 18,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,1,
-120,1,2,2,0,
-1,1804,260,18,1,
-1804,261,20,262,4,
+124,1,2,2,0,
+1,1804,263,18,1,
+1804,264,20,265,4,
 4,68,0,79,0,
 1,44,1,1,2,
-0,1,2591,263,18,
-1,2591,264,20,265,
-4,20,83,0,116,
-0,97,0,116,0,
-101,0,69,0,118,
-0,101,0,110,0,
-116,0,1,103,1,
-2,2,0,1,2364,
-266,18,1,2364,258,
-2,0,1,137,267,
-18,1,137,268,20,
-269,4,36,69,0,
-88,0,67,0,76,
-0,65,0,77,0,
-65,0,84,0,73,
-0,79,0,78,0,
-95,0,69,0,81,
-0,85,0,65,0,
-76,0,83,0,1,
-30,1,1,2,0,
-1,2293,270,18,1,
-2293,191,2,0,1,
-1701,271,18,1,1701,
-168,2,0,1,1756,
-272,18,1,1756,191,
-2,0,1,2527,273,
-18,1,2527,224,2,
-0,1,143,274,18,
-1,143,168,2,0,
-1,2299,275,18,1,
-2299,168,2,0,1,
-1260,276,18,1,1260,
-160,2,0,1,1261,
-277,18,1,1261,278,
-20,279,4,22,80,
-0,76,0,85,0,
-83,0,95,0,69,
-0,81,0,85,0,
-65,0,76,0,83,
-0,1,6,1,1,
-2,0,1,2528,280,
-18,1,2528,281,20,
-282,4,10,69,0,
-118,0,101,0,110,
-0,116,0,1,114,
-1,2,2,0,1,
-2758,283,18,1,2758,
-284,20,285,4,50,
-71,0,108,0,111,
-0,98,0,97,0,
-108,0,86,0,97,
-0,114,0,105,0,
-97,0,98,0,108,
-0,101,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-1,98,1,2,2,
-0,1,2680,286,18,
-1,2680,287,20,288,
-4,12,83,0,116,
+0,1,2364,266,18,
+1,2364,261,2,0,
+1,137,267,18,1,
+137,268,20,269,4,
+36,69,0,88,0,
+67,0,76,0,65,
+0,77,0,65,0,
+84,0,73,0,79,
+0,78,0,95,0,
+69,0,81,0,85,
+0,65,0,76,0,
+83,0,1,30,1,
+1,2,0,1,2293,
+270,18,1,2293,193,
+2,0,1,1701,271,
+18,1,1701,171,2,
+0,1,1756,272,18,
+1,1756,193,2,0,
+1,2527,273,18,1,
+2527,274,20,275,4,
+28,75,0,101,0,
+121,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,1,
+113,1,2,2,0,
+1,143,276,18,1,
+143,171,2,0,1,
+2299,277,18,1,2299,
+171,2,0,1,1260,
+278,18,1,1260,163,
+2,0,1,1261,279,
+18,1,1261,280,20,
+281,4,22,80,0,
+76,0,85,0,83,
+0,95,0,69,0,
+81,0,85,0,65,
+0,76,0,83,0,
+1,6,1,1,2,
+0,1,2528,282,18,
+1,2528,283,20,284,
+4,52,75,0,101,
+0,121,0,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
 0,97,0,116,0,
-101,0,115,0,1,
-100,1,2,2,0,
-1,151,289,18,1,
-151,290,20,291,4,
+105,0,111,0,110,
+0,76,0,105,0,
+115,0,116,0,1,
+109,1,2,2,0,
+1,151,285,18,1,
+151,286,20,287,4,
 26,69,0,81,0,
 85,0,65,0,76,
 0,83,0,95,0,
 69,0,81,0,85,
 0,65,0,76,0,
 83,0,1,29,1,
-1,2,0,1,1267,
-292,18,1,1267,168,
-2,0,1,157,293,
-18,1,157,168,2,
-0,1,1773,294,18,
-1,1773,146,2,0,
-1,1832,295,18,1,
-1832,258,2,0,1,
-1833,296,18,1,1833,
-297,20,298,4,10,
-87,0,72,0,73,
-0,76,0,69,0,
-1,45,1,1,2,
-0,1,1834,299,18,
-1,1834,135,2,0,
-1,166,300,18,1,
-166,301,20,302,4,
-20,76,0,69,0,
-70,0,84,0,95,
-0,65,0,78,0,
-71,0,76,0,69,
-0,1,25,1,1,
-2,0,1,1840,303,
-18,1,1840,168,2,
-0,1,172,304,18,
-1,172,168,2,0,
-1,2335,305,18,1,
-2335,146,2,0,1,
-1296,306,18,1,1296,
-160,2,0,1,1297,
-307,18,1,1297,308,
-20,309,4,12,69,
-0,81,0,85,0,
-65,0,76,0,83,
-0,1,15,1,1,
-2,0,1,2413,310,
-18,1,2413,311,20,
-312,4,26,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,76,0,105,0,
-115,0,116,0,1,
-119,1,2,2,0,
-1,1859,313,18,1,
-1859,153,2,0,1,
-1860,314,18,1,1860,
-191,2,0,1,188,
-315,18,1,188,168,
-2,0,1,182,316,
-18,1,182,317,20,
-318,4,22,82,0,
-73,0,71,0,72,
+1,2,0,1,2605,
+288,18,1,2605,159,
+2,0,1,1267,289,
+18,1,1267,171,2,
+0,1,157,290,18,
+1,157,171,2,0,
+1,1773,291,18,1,
+1773,146,2,0,1,
+1832,292,18,1,1832,
+261,2,0,1,1833,
+293,18,1,1833,294,
+20,295,4,10,87,
+0,72,0,73,0,
+76,0,69,0,1,
+45,1,1,2,0,
+1,1834,296,18,1,
+1834,135,2,0,1,
+2773,297,18,1,2773,
+298,20,299,4,48,
+71,0,108,0,111,
+0,98,0,97,0,
+108,0,70,0,117,
+0,110,0,99,0,
+116,0,105,0,111,
+0,110,0,68,0,
+101,0,102,0,105,
+0,110,0,105,0,
+116,0,105,0,111,
+0,110,0,1,99,
+1,2,2,0,1,
+166,300,18,1,166,
+301,20,302,4,20,
+76,0,69,0,70,
 0,84,0,95,0,
 65,0,78,0,71,
 0,76,0,69,0,
-1,26,1,1,2,
-0,1,199,319,18,
-1,199,320,20,321,
-4,10,67,0,65,
-0,82,0,69,0,
-84,0,1,35,1,
-1,2,0,1,1871,
-322,18,1,1871,160,
-2,0,1,1872,323,
-18,1,1872,153,2,
-0,1,1873,324,18,
-1,1873,191,2,0,
-1,1875,325,18,1,
-1875,297,2,0,1,
-205,326,18,1,205,
-168,2,0,1,2515,
-327,18,1,2515,135,
-2,0,1,1882,328,
-18,1,1882,168,2,
-0,1,2227,329,18,
-1,2227,258,2,0,
-1,2589,330,18,1,
-2589,331,20,332,4,
-32,73,0,110,0,
-116,0,65,0,114,
-0,103,0,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,1,105,
-1,2,2,0,1,
-2590,333,18,1,2590,
-334,20,335,4,34,
-86,0,111,0,105,
-0,100,0,65,0,
-114,0,103,0,83,
-0,116,0,97,0,
-116,0,101,0,69,
+1,25,1,1,2,
+0,1,2776,303,18,
+1,2776,304,20,305,
+4,50,71,0,108,
+0,111,0,98,0,
+97,0,108,0,86,
+0,97,0,114,0,
+105,0,97,0,98,
+0,108,0,101,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,1,98,1,
+2,2,0,1,1840,
+306,18,1,1840,171,
+2,0,1,172,307,
+18,1,172,171,2,
+0,1,2335,308,18,
+1,2335,146,2,0,
+1,1296,309,18,1,
+1296,163,2,0,1,
+1297,310,18,1,1297,
+311,20,312,4,12,
+69,0,81,0,85,
+0,65,0,76,0,
+83,0,1,15,1,
+1,2,0,1,2413,
+313,18,1,2413,314,
+20,315,4,26,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,76,0,105,
+0,115,0,116,0,
+1,123,1,2,2,
+0,1,1859,316,18,
+1,1859,156,2,0,
+1,1860,317,18,1,
+1860,193,2,0,1,
+188,318,18,1,188,
+171,2,0,1,182,
+319,18,1,182,320,
+20,321,4,22,82,
+0,73,0,71,0,
+72,0,84,0,95,
+0,65,0,78,0,
+71,0,76,0,69,
+0,1,26,1,1,
+2,0,1,199,322,
+18,1,199,323,20,
+324,4,10,67,0,
+65,0,82,0,69,
+0,84,0,1,35,
+1,1,2,0,1,
+1871,325,18,1,1871,
+163,2,0,1,1872,
+326,18,1,1872,156,
+2,0,1,1873,327,
+18,1,1873,193,2,
+0,1,1875,328,18,
+1,1875,294,2,0,
+1,205,329,18,1,
+205,171,2,0,1,
+2515,330,18,1,2515,
+135,2,0,1,1882,
+331,18,1,1882,171,
+2,0,1,2227,332,
+18,1,2227,261,2,
+0,1,217,333,18,
+1,217,334,20,335,
+4,12,83,0,84,
+0,82,0,79,0,
+75,0,69,0,1,
+34,1,1,2,0,
+1,1332,336,18,1,
+1332,163,2,0,1,
+2743,337,18,1,2743,
+193,2,0,1,1335,
+338,18,1,1335,166,
+2,0,1,223,339,
+18,1,223,171,2,
+0,1,1341,340,18,
+1,1341,171,2,0,
+1,2599,341,18,1,
+2599,342,20,343,4,
+38,86,0,101,0,
+99,0,116,0,111,
+0,114,0,65,0,
+114,0,103,0,83,
+0,116,0,97,0,
+116,0,101,0,69,
 0,118,0,101,0,
 110,0,116,0,1,
-104,1,2,2,0,
-1,217,336,18,1,
-217,337,20,338,4,
-12,83,0,84,0,
-82,0,79,0,75,
-0,69,0,1,34,
-1,1,2,0,1,
-1332,339,18,1,1332,
-160,2,0,1,1335,
-340,18,1,1335,163,
-2,0,1,223,341,
-18,1,223,168,2,
-0,1,1341,342,18,
-1,1341,168,2,0,
-1,1901,343,18,1,
-1901,153,2,0,1,
-1303,344,18,1,1303,
-168,2,0,1,2462,
-345,18,1,2462,258,
-2,0,1,236,346,
-18,1,236,347,20,
-348,4,6,65,0,
+107,1,2,2,0,
+1,1901,344,18,1,
+1901,156,2,0,1,
+1303,345,18,1,1303,
+171,2,0,1,2462,
+346,18,1,2462,261,
+2,0,1,236,347,
+18,1,236,348,20,
+349,4,6,65,0,
 77,0,80,0,1,
 33,1,1,2,0,
-1,2466,349,18,1,
-2466,224,2,0,1,
-2467,350,18,1,2467,
-150,2,0,1,2468,
-351,18,1,2468,352,
-20,353,4,10,83,
-0,84,0,65,0,
-84,0,69,0,1,
-48,1,1,2,0,
-1,2469,354,18,1,
-2469,132,2,0,1,
-242,355,18,1,242,
-168,2,0,1,2471,
-356,18,1,2471,357,
-20,358,4,52,76,
-0,65,0,78,0,
-68,0,95,0,67,
-0,79,0,76,0,
-76,0,73,0,83,
-0,73,0,79,0,
-78,0,95,0,83,
+1,2466,350,18,1,
+2466,351,20,352,4,
+34,67,0,111,0,
+109,0,112,0,111,
+0,117,0,110,0,
+100,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+1,122,1,2,2,
+0,1,2467,353,18,
+1,2467,153,2,0,
+1,2468,354,18,1,
+2468,355,20,356,4,
+10,83,0,84,0,
+65,0,84,0,69,
+0,1,48,1,1,
+2,0,1,2469,357,
+18,1,2469,132,2,
+0,1,242,358,18,
+1,242,171,2,0,
+1,2471,359,18,1,
+2471,360,20,361,4,
+52,76,0,65,0,
+78,0,68,0,95,
+0,67,0,79,0,
+76,0,76,0,73,
+0,83,0,73,0,
+79,0,78,0,95,
+0,83,0,84,0,
+65,0,82,0,84,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,71,
+1,1,2,0,1,
+2472,362,18,1,2472,
+363,20,364,4,48,
+76,0,65,0,78,
+0,68,0,95,0,
+67,0,79,0,76,
+0,76,0,73,0,
+83,0,73,0,79,
+0,78,0,95,0,
+69,0,78,0,68,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,70,
+1,1,2,0,1,
+2473,365,18,1,2473,
+366,20,367,4,40,
+76,0,65,0,78,
+0,68,0,95,0,
+67,0,79,0,76,
+0,76,0,73,0,
+83,0,73,0,79,
+0,78,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,69,1,1,2,
+0,1,2474,368,18,
+1,2474,369,20,370,
+4,34,84,0,79,
+0,85,0,67,0,
+72,0,95,0,83,
 0,84,0,65,0,
 82,0,84,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,71,1,1,
-2,0,1,2472,359,
-18,1,2472,360,20,
-361,4,48,76,0,
-65,0,78,0,68,
-0,95,0,67,0,
-79,0,76,0,76,
-0,73,0,83,0,
-73,0,79,0,78,
-0,95,0,69,0,
-78,0,68,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,70,1,1,
-2,0,1,2473,362,
-18,1,2473,363,20,
-364,4,40,76,0,
-65,0,78,0,68,
-0,95,0,67,0,
-79,0,76,0,76,
-0,73,0,83,0,
-73,0,79,0,78,
+0,1,89,1,1,
+2,0,1,2475,371,
+18,1,2475,372,20,
+373,4,30,84,0,
+79,0,85,0,67,
+0,72,0,95,0,
+69,0,78,0,68,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,69,
+0,84,0,1,90,
 1,1,2,0,1,
-2474,365,18,1,2474,
-366,20,367,4,34,
+2476,374,18,1,2476,
+375,20,376,4,22,
 84,0,79,0,85,
 0,67,0,72,0,
-95,0,83,0,84,
-0,65,0,82,0,
-84,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-89,1,1,2,0,
-1,2475,368,18,1,
-2475,369,20,370,4,
-30,84,0,79,0,
-85,0,67,0,72,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,88,1,
+1,2,0,1,2477,
+377,18,1,2477,378,
+20,379,4,24,83,
+0,69,0,78,0,
+83,0,79,0,82,
 0,95,0,69,0,
-78,0,68,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,90,1,1,
-2,0,1,2476,371,
-18,1,2476,372,20,
-373,4,22,84,0,
-79,0,85,0,67,
-0,72,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,88,1,1,2,
-0,1,2477,374,18,
-1,2477,375,20,376,
-4,24,83,0,69,
+86,0,69,0,78,
+0,84,0,1,84,
+1,1,2,0,1,
+2478,380,18,1,2478,
+381,20,382,4,52,
+82,0,85,0,78,
+0,95,0,84,0,
+73,0,77,0,69,
+0,95,0,80,0,
+69,0,82,0,77,
+0,73,0,83,0,
+83,0,73,0,79,
 0,78,0,83,0,
-79,0,82,0,95,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,83,1,
+1,2,0,1,2479,
+383,18,1,2479,384,
+20,385,4,24,79,
+0,78,0,95,0,
+82,0,69,0,90,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,81,
+1,1,2,0,1,
+2480,386,18,1,2480,
+387,20,388,4,42,
+67,0,79,0,76,
+0,76,0,73,0,
+83,0,73,0,79,
+0,78,0,95,0,
+83,0,84,0,65,
+0,82,0,84,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,64,1,
+1,2,0,1,2481,
+389,18,1,2481,390,
+20,391,4,38,67,
+0,79,0,76,0,
+76,0,73,0,83,
+0,73,0,79,0,
+78,0,95,0,69,
+0,78,0,68,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,63,1,
+1,2,0,1,2482,
+392,18,1,2482,393,
+20,394,4,30,67,
+0,79,0,76,0,
+76,0,73,0,83,
+0,73,0,79,0,
+78,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+62,1,1,2,0,
+1,2483,395,18,1,
+2483,396,20,397,4,
+26,67,0,72,0,
+65,0,78,0,71,
+0,69,0,68,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,61,1,
+1,2,0,1,256,
+398,18,1,256,399,
+20,400,4,14,80,
+0,69,0,82,0,
+67,0,69,0,78,
+0,84,0,1,22,
+1,1,2,0,1,
+1371,401,18,1,1371,
+219,2,0,1,2486,
+402,18,1,2486,403,
+20,404,4,22,84,
+0,73,0,77,0,
+69,0,82,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,84,1,1,
-2,0,1,2478,377,
-18,1,2478,378,20,
-379,4,52,82,0,
-85,0,78,0,95,
-0,84,0,73,0,
-77,0,69,0,95,
-0,80,0,69,0,
-82,0,77,0,73,
-0,83,0,83,0,
-73,0,79,0,78,
-0,83,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,83,1,1,2,
-0,1,2479,380,18,
-1,2479,381,20,382,
-4,24,79,0,78,
-0,95,0,82,0,
-69,0,90,0,95,
+0,1,87,1,1,
+2,0,1,2487,405,
+18,1,2487,406,20,
+407,4,38,78,0,
+79,0,84,0,95,
+0,65,0,84,0,
+95,0,84,0,65,
+0,82,0,71,0,
+69,0,84,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,81,1,1,
-2,0,1,2480,383,
-18,1,2480,384,20,
-385,4,42,67,0,
-79,0,76,0,76,
-0,73,0,83,0,
-73,0,79,0,78,
-0,95,0,83,0,
-84,0,65,0,82,
-0,84,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,64,1,1,2,
-0,1,2481,386,18,
-1,2481,387,20,388,
-4,38,67,0,79,
-0,76,0,76,0,
-73,0,83,0,73,
-0,79,0,78,0,
-95,0,69,0,78,
-0,68,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,63,1,1,2,
-0,1,2482,389,18,
-1,2482,390,20,391,
-4,30,67,0,79,
-0,76,0,76,0,
-73,0,83,0,73,
-0,79,0,78,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,62,1,
-1,2,0,1,2483,
-392,18,1,2483,393,
-20,394,4,26,67,
-0,72,0,65,0,
-78,0,71,0,69,
-0,68,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,61,1,1,2,
-0,1,256,395,18,
-1,256,396,20,397,
-4,14,80,0,69,
-0,82,0,67,0,
-69,0,78,0,84,
-0,1,22,1,1,
-2,0,1,1371,398,
-18,1,1371,212,2,
-0,1,2486,399,18,
-1,2486,400,20,401,
-4,46,78,0,79,
-0,84,0,95,0,
-65,0,84,0,95,
-0,82,0,79,0,
-84,0,95,0,84,
-0,65,0,82,0,
-71,0,69,0,84,
+0,1,79,1,1,
+2,0,1,1931,408,
+18,1,1931,261,2,
+0,1,1932,409,18,
+1,1932,410,20,411,
+4,4,73,0,70,
+0,1,42,1,1,
+2,0,1,262,412,
+18,1,262,171,2,
+0,1,1377,413,18,
+1,1377,171,2,0,
+1,2492,414,18,1,
+2492,415,20,416,4,
+32,83,0,84,0,
+65,0,84,0,69,
+0,95,0,69,0,
+88,0,73,0,84,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,78,
+0,84,0,1,86,
 1,1,2,0,1,
-2487,402,18,1,2487,
-403,20,404,4,30,
-78,0,79,0,95,
-0,83,0,69,0,
-78,0,83,0,79,
-0,82,0,95,0,
+1876,417,18,1,1876,
+135,2,0,1,2494,
+418,18,1,2494,419,
+20,420,4,36,72,
+0,84,0,84,0,
+80,0,95,0,82,
+0,69,0,81,0,
+85,0,69,0,83,
+0,84,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,77,1,1,2,
-0,1,1931,405,18,
-1,1931,258,2,0,
-1,1932,406,18,1,
-1932,407,20,408,4,
-4,73,0,70,0,
-1,42,1,1,2,
-0,1,262,409,18,
-1,262,168,2,0,
-1,1377,410,18,1,
-1377,168,2,0,1,
-2492,411,18,1,2492,
-412,20,413,4,36,
-72,0,84,0,84,
-0,80,0,95,0,
-82,0,69,0,81,
-0,85,0,69,0,
-83,0,84,0,95,
+1,91,1,1,2,
+0,1,2495,421,18,
+1,2495,422,20,423,
+4,34,82,0,69,
+0,77,0,79,0,
+84,0,69,0,95,
+0,68,0,65,0,
+84,0,65,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,91,1,1,
-2,0,1,1876,414,
-18,1,1876,135,2,
-0,1,2494,415,18,
-1,2494,416,20,417,
-4,32,79,0,66,
-0,74,0,69,0,
-67,0,84,0,95,
-0,82,0,69,0,
-90,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-80,1,1,2,0,
-1,2495,418,18,1,
-2495,419,20,420,4,
-22,77,0,79,0,
-78,0,69,0,89,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,74,
-1,1,2,0,1,
-1939,421,18,1,1939,
-168,2,0,1,2497,
-422,18,1,2497,423,
-20,424,4,36,76,
-0,73,0,78,0,
-75,0,95,0,77,
-0,69,0,83,0,
-83,0,65,0,71,
+0,1,82,1,1,
+2,0,1,1939,424,
+18,1,1939,171,2,
+0,1,2497,425,18,
+1,2497,426,20,427,
+4,24,76,0,73,
+0,83,0,84,0,
+69,0,78,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,73,1,1,
+2,0,1,827,428,
+18,1,827,171,2,
+0,1,2499,429,18,
+1,2499,430,20,431,
+4,38,72,0,84,
+0,84,0,80,0,
+95,0,82,0,69,
+0,83,0,80,0,
+79,0,78,0,83,
 0,69,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,72,1,1,2,
-0,1,827,425,18,
-1,827,168,2,0,
-1,2499,426,18,1,
-2499,427,20,428,4,
-22,69,0,77,0,
-65,0,73,0,76,
+1,68,1,1,2,
+0,1,2500,432,18,
+1,2500,433,20,434,
+4,22,69,0,77,
+0,65,0,73,0,
+76,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+67,1,1,2,0,
+1,2501,435,18,1,
+2501,436,20,437,4,
+32,68,0,65,0,
+84,0,65,0,83,
+0,69,0,82,0,
+86,0,69,0,82,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,67,
+0,84,0,1,66,
 1,1,2,0,1,
-2500,429,18,1,2500,
-430,20,431,4,32,
-68,0,65,0,84,
-0,65,0,83,0,
-69,0,82,0,86,
-0,69,0,82,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,66,1,
-1,2,0,1,2501,
-432,18,1,2501,433,
-20,434,4,26,67,
-0,79,0,78,0,
-84,0,82,0,79,
-0,76,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,65,1,1,2,
-0,1,2502,435,18,
-1,2502,436,20,437,
-4,24,65,0,84,
-0,84,0,65,0,
-67,0,72,0,95,
+2502,438,18,1,2502,
+439,20,440,4,26,
+67,0,79,0,78,
+0,84,0,82,0,
+79,0,76,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,60,1,1,
-2,0,1,2503,438,
-18,1,2503,439,20,
-440,4,30,65,0,
+0,1,65,1,1,
+2,0,1,2503,441,
+18,1,2503,442,20,
+443,4,30,65,0,
 84,0,95,0,84,
 0,65,0,82,0,
 71,0,69,0,84,
@@ -2981,8 +3071,8 @@ public yyLSLSyntax
 86,0,69,0,78,
 0,84,0,1,59,
 1,1,2,0,1,
-2504,441,18,1,2504,
-442,20,443,4,38,
+2504,444,18,1,2504,
+445,20,446,4,38,
 65,0,84,0,95,
 0,82,0,79,0,
 84,0,95,0,84,
@@ -2992,29 +3082,29 @@ public yyLSLSyntax
 86,0,69,0,78,
 0,84,0,1,58,
 1,1,2,0,1,
-277,444,18,1,277,
-445,20,446,4,10,
+277,447,18,1,277,
+448,20,449,4,10,
 83,0,76,0,65,
 0,83,0,72,0,
 1,21,1,1,2,
-0,1,2506,447,18,
+0,1,2506,450,18,
 1,2506,135,2,0,
-1,2507,448,18,1,
+1,2507,451,18,1,
 2507,114,2,0,1,
-2508,449,18,1,2508,
+2508,452,18,1,2508,
 132,2,0,1,2509,
-450,18,1,2509,451,
-20,452,4,34,86,
+453,18,1,2509,454,
+20,455,4,34,86,
 0,101,0,99,0,
 116,0,111,0,114,
 0,68,0,101,0,
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
-0,110,0,1,112,
+0,110,0,1,115,
 1,2,2,0,1,
-2510,453,18,1,2510,
-454,20,455,4,58,
+2510,456,18,1,2510,
+457,20,458,4,58,
 86,0,101,0,99,
 0,116,0,111,0,
 114,0,65,0,114,
@@ -3026,36 +3116,36 @@ public yyLSLSyntax
 97,0,116,0,105,
 0,111,0,110,0,
 76,0,105,0,115,
-0,116,0,1,109,
+0,116,0,1,111,
 1,2,2,0,1,
-283,456,18,1,283,
-168,2,0,1,2513,
-457,18,1,2513,224,
-2,0,1,2514,458,
-18,1,2514,459,20,
-460,4,22,73,0,
+283,459,18,1,283,
+171,2,0,1,2513,
+460,18,1,2513,351,
+2,0,1,2514,461,
+18,1,2514,462,20,
+463,4,22,73,0,
 110,0,116,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-1,116,1,2,2,
-0,1,1958,461,18,
-1,1958,153,2,0,
-1,2516,462,18,1,
+1,120,1,2,2,
+0,1,1958,464,18,
+1,1958,156,2,0,
+1,2516,465,18,1,
 2516,126,2,0,1,
-2517,463,18,1,2517,
+2517,466,18,1,2517,
 132,2,0,1,2518,
-464,18,1,2518,465,
-20,466,4,28,73,
+467,18,1,2518,468,
+20,469,4,28,73,
 0,110,0,116,0,
 68,0,101,0,99,
 0,108,0,97,0,
 114,0,97,0,116,
 0,105,0,111,0,
-110,0,1,111,1,
+110,0,1,114,1,
 2,2,0,1,2519,
-467,18,1,2519,468,
-20,469,4,52,73,
+470,18,1,2519,471,
+20,472,4,52,73,
 0,110,0,116,0,
 65,0,114,0,103,
 0,117,0,109,0,
@@ -3066,1638 +3156,1616 @@ public yyLSLSyntax
 116,0,105,0,111,
 0,110,0,76,0,
 105,0,115,0,116,
-0,1,108,1,2,
-2,0,1,1406,470,
-18,1,1406,160,2,
-0,1,1407,471,18,
-1,1407,206,2,0,
-1,2522,472,18,1,
-2522,224,2,0,1,
-2523,473,18,1,2523,
-474,20,475,4,24,
-86,0,111,0,105,
-0,100,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
-115,1,2,2,0,
-1,2524,476,18,1,
-2524,135,2,0,1,
-2525,477,18,1,2525,
-153,2,0,1,299,
-478,18,1,299,479,
-20,480,4,8,83,
-0,84,0,65,0,
-82,0,1,20,1,
-1,2,0,1,1370,
-481,18,1,1370,160,
-2,0,1,2529,482,
-18,1,2529,135,2,
-0,1,305,483,18,
-1,305,168,2,0,
-1,2458,484,18,1,
-2458,258,2,0,1,
-2459,485,18,1,2459,
-486,20,487,4,22,
-82,0,73,0,71,
-0,72,0,84,0,
-95,0,66,0,82,
-0,65,0,67,0,
-69,0,1,13,1,
-1,2,0,1,2538,
-488,18,1,2538,140,
-2,0,1,2540,489,
-18,1,2540,153,2,
-0,1,2542,490,18,
-1,2542,224,2,0,
-1,2464,491,18,1,
-2464,486,2,0,1,
-2544,492,18,1,2544,
-493,20,494,4,18,
-83,0,116,0,97,
-0,116,0,101,0,
-66,0,111,0,100,
-0,121,0,1,102,
-1,2,2,0,1,
-1989,495,18,1,1989,
-258,2,0,1,1990,
-496,18,1,1990,497,
-20,498,4,8,69,
-0,76,0,83,0,
-69,0,1,43,1,
-1,2,0,1,2470,
-499,18,1,2470,156,
-2,0,1,322,500,
-18,1,322,227,2,
-0,1,1933,501,18,
-1,1933,135,2,0,
-1,883,502,18,1,
-883,168,2,0,1,
-2760,503,18,1,2760,
-284,2,0,1,328,
-504,18,1,328,168,
-2,0,1,1443,505,
-18,1,1443,243,2,
-0,1,1449,506,18,
-1,1449,168,2,0,
-1,2485,507,18,1,
-2485,508,20,509,4,
-38,78,0,79,0,
-84,0,95,0,65,
+0,1,110,1,2,
+2,0,1,1406,473,
+18,1,1406,163,2,
+0,1,1407,474,18,
+1,1407,213,2,0,
+1,2522,475,18,1,
+2522,351,2,0,1,
+2523,476,18,1,2523,
+477,20,478,4,22,
+75,0,101,0,121,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,1,119,1,
+2,2,0,1,2524,
+479,18,1,2524,135,
+2,0,1,2525,480,
+18,1,2525,117,2,
+0,1,2526,481,18,
+1,2526,132,2,0,
+1,299,482,18,1,
+299,483,20,484,4,
+8,83,0,84,0,
+65,0,82,0,1,
+20,1,1,2,0,
+1,1370,485,18,1,
+1370,163,2,0,1,
+2529,486,18,1,2529,
+156,2,0,1,2531,
+487,18,1,2531,351,
+2,0,1,2532,488,
+18,1,2532,489,20,
+490,4,24,86,0,
+111,0,105,0,100,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,1,118,1,
+2,2,0,1,305,
+491,18,1,305,171,
+2,0,1,2534,492,
+18,1,2534,156,2,
+0,1,2458,493,18,
+1,2458,261,2,0,
+1,2459,494,18,1,
+2459,495,20,496,4,
+22,82,0,73,0,
+71,0,72,0,84,
+0,95,0,66,0,
+82,0,65,0,67,
+0,69,0,1,13,
+1,1,2,0,1,
+2538,497,18,1,2538,
+135,2,0,1,2601,
+498,18,1,2601,499,
+20,500,4,32,75,
+0,101,0,121,0,
+65,0,114,0,103,
+0,83,0,116,0,
+97,0,116,0,101,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,105,1,2,
+2,0,1,2464,501,
+18,1,2464,495,2,
+0,1,1989,502,18,
+1,1989,261,2,0,
+1,1990,503,18,1,
+1990,504,20,505,4,
+8,69,0,76,0,
+83,0,69,0,1,
+43,1,1,2,0,
+1,2470,506,18,1,
+2470,159,2,0,1,
+322,507,18,1,322,
+232,2,0,1,2551,
+508,18,1,2551,351,
+2,0,1,1933,509,
+18,1,1933,135,2,
+0,1,2553,510,18,
+1,2553,150,2,0,
+1,883,511,18,1,
+883,171,2,0,1,
+328,512,18,1,328,
+171,2,0,1,1443,
+513,18,1,1443,247,
+2,0,1,2766,514,
+18,1,2766,515,20,
+516,4,12,83,0,
+116,0,97,0,116,
+0,101,0,115,0,
+1,100,1,2,2,
+0,1,1449,517,18,
+1,1449,171,2,0,
+1,2485,518,18,1,
+2485,519,20,520,4,
+24,65,0,84,0,
+84,0,65,0,67,
+0,72,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,60,1,1,2,
+0,1,2488,521,18,
+1,2488,522,20,523,
+4,46,78,0,79,
 0,84,0,95,0,
-84,0,65,0,82,
-0,71,0,69,0,
-84,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-79,1,1,2,0,
-1,2488,510,18,1,
-2488,511,20,512,4,
-36,77,0,79,0,
-86,0,73,0,78,
-0,71,0,95,0,
-83,0,84,0,65,
-0,82,0,84,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,76,1,
-1,2,0,1,2489,
-513,18,1,2489,514,
-20,515,4,32,77,
-0,79,0,86,0,
-73,0,78,0,71,
+65,0,84,0,95,
+0,82,0,79,0,
+84,0,95,0,84,
+0,65,0,82,0,
+71,0,69,0,84,
 0,95,0,69,0,
-78,0,68,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,75,1,1,
-2,0,1,2490,516,
-18,1,2490,517,20,
-518,4,32,83,0,
-84,0,65,0,84,
-0,69,0,95,0,
-69,0,88,0,73,
-0,84,0,95,0,
+86,0,69,0,78,
+0,84,0,1,78,
+1,1,2,0,1,
+2489,524,18,1,2489,
+525,20,526,4,30,
+78,0,79,0,95,
+0,83,0,69,0,
+78,0,83,0,79,
+0,82,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,86,1,1,2,
-0,1,2491,519,18,
-1,2491,520,20,521,
-4,34,83,0,84,
-0,65,0,84,0,
-69,0,95,0,69,
-0,78,0,84,0,
-82,0,89,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,85,1,1,
-2,0,1,2493,522,
-18,1,2493,523,20,
-524,4,34,82,0,
-69,0,77,0,79,
-0,84,0,69,0,
-95,0,68,0,65,
-0,84,0,65,0,
+1,77,1,1,2,
+0,1,2490,527,18,
+1,2490,528,20,529,
+4,36,77,0,79,
+0,86,0,73,0,
+78,0,71,0,95,
+0,83,0,84,0,
+65,0,82,0,84,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,76,
+1,1,2,0,1,
+2491,530,18,1,2491,
+531,20,532,4,32,
+77,0,79,0,86,
+0,73,0,78,0,
+71,0,95,0,69,
+0,78,0,68,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,82,1,
-1,2,0,1,1413,
-525,18,1,1413,168,
-2,0,1,346,526,
-18,1,346,527,20,
-528,4,8,80,0,
-76,0,85,0,83,
-0,1,18,1,1,
-2,0,1,2496,529,
-18,1,2496,530,20,
-531,4,24,76,0,
-73,0,83,0,84,
-0,69,0,78,0,
-95,0,69,0,86,
+84,0,1,75,1,
+1,2,0,1,2493,
+533,18,1,2493,534,
+20,535,4,34,83,
+0,84,0,65,0,
+84,0,69,0,95,
 0,69,0,78,0,
-84,0,1,73,1,
-1,2,0,1,2021,
-532,18,1,2021,258,
-2,0,1,2022,533,
-18,1,2022,352,2,
-0,1,352,534,18,
-1,352,168,2,0,
-1,2024,535,18,1,
-2024,132,2,0,1,
-2025,536,18,1,2025,
-537,20,538,4,8,
-74,0,85,0,77,
-0,80,0,1,49,
-1,1,2,0,1,
-2026,539,18,1,2026,
-132,2,0,1,2027,
-540,18,1,2027,541,
-20,542,4,4,65,
-0,84,0,1,23,
+84,0,82,0,89,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,85,
 1,1,2,0,1,
-2028,543,18,1,2028,
-132,2,0,1,2029,
-544,18,1,2029,224,
-2,0,1,2030,545,
-18,1,2030,546,20,
-547,4,14,70,0,
-111,0,114,0,76,
-0,111,0,111,0,
-112,0,1,131,1,
-2,2,0,1,2031,
-548,18,1,2031,549,
-20,550,4,32,68,
-0,111,0,87,0,
-104,0,105,0,108,
-0,101,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,1,130,1,2,
-2,0,1,2032,551,
-18,1,2032,552,20,
-553,4,28,87,0,
-104,0,105,0,108,
-0,101,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,1,129,1,2,
-2,0,1,2033,554,
-18,1,2033,555,20,
-556,4,22,73,0,
-102,0,83,0,116,
+1413,536,18,1,1413,
+171,2,0,1,346,
+537,18,1,346,538,
+20,539,4,8,80,
+0,76,0,85,0,
+83,0,1,18,1,
+1,2,0,1,2496,
+540,18,1,2496,541,
+20,542,4,22,77,
+0,79,0,78,0,
+69,0,89,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,74,1,1,
+2,0,1,2021,543,
+18,1,2021,261,2,
+0,1,2022,544,18,
+1,2022,355,2,0,
+1,352,545,18,1,
+352,171,2,0,1,
+2024,546,18,1,2024,
+132,2,0,1,2025,
+547,18,1,2025,548,
+20,549,4,8,74,
+0,85,0,77,0,
+80,0,1,49,1,
+1,2,0,1,2026,
+550,18,1,2026,132,
+2,0,1,2027,551,
+18,1,2027,552,20,
+553,4,4,65,0,
+84,0,1,23,1,
+1,2,0,1,2028,
+554,18,1,2028,132,
+2,0,1,2029,555,
+18,1,2029,351,2,
+0,1,2030,556,18,
+1,2030,557,20,558,
+4,14,70,0,111,
+0,114,0,76,0,
+111,0,111,0,112,
+0,1,135,1,2,
+2,0,1,2031,559,
+18,1,2031,560,20,
+561,4,32,68,0,
+111,0,87,0,104,
+0,105,0,108,0,
+101,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,128,1,2,2,
-0,1,2034,557,18,
-1,2034,558,20,559,
-4,22,83,0,116,
+1,134,1,2,2,
+0,1,2032,562,18,
+1,2032,563,20,564,
+4,28,87,0,104,
+0,105,0,108,0,
+101,0,83,0,116,
 0,97,0,116,0,
-101,0,67,0,104,
-0,97,0,110,0,
-103,0,101,0,1,
-127,1,2,2,0,
-1,1478,560,18,1,
-1478,160,2,0,1,
-1479,561,18,1,1479,
-278,2,0,1,2037,
-562,18,1,2037,191,
-2,0,1,2038,563,
-18,1,2038,564,20,
-565,4,18,74,0,
-117,0,109,0,112,
-0,76,0,97,0,
-98,0,101,0,108,
-0,1,125,1,2,
-2,0,1,2039,566,
-18,1,2039,191,2,
-0,1,2040,567,18,
-1,2040,568,20,569,
-4,30,82,0,101,
-0,116,0,117,0,
-114,0,110,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,124,1,
-2,2,0,1,2041,
-570,18,1,2041,191,
-2,0,1,1485,571,
-18,1,1485,168,2,
-0,1,372,572,18,
-1,372,180,2,0,
-1,373,573,18,1,
-373,132,2,0,1,
-374,574,18,1,374,
-176,2,0,1,375,
-575,18,1,375,132,
-2,0,1,376,576,
-18,1,376,183,2,
-0,1,377,577,18,
-1,377,132,2,0,
-1,378,578,18,1,
-378,176,2,0,1,
-379,579,18,1,379,
-132,2,0,1,380,
-580,18,1,380,581,
-20,582,4,16,67,
-0,111,0,110,0,
-115,0,116,0,97,
+101,0,109,0,101,
 0,110,0,116,0,
-1,137,1,2,2,
-0,1,381,583,18,
-1,381,301,2,0,
-1,371,584,18,1,
-371,585,20,586,4,
-24,70,0,117,0,
-110,0,99,0,116,
-0,105,0,111,0,
-110,0,67,0,97,
-0,108,0,108,0,
 1,133,1,2,2,
-0,1,942,587,18,
-1,942,168,2,0,
-1,387,588,18,1,
-387,168,2,0,1,
-1514,589,18,1,1514,
-160,2,0,1,1515,
-590,18,1,1515,308,
-2,0,1,2074,591,
-18,1,2074,160,2,
-0,1,2075,592,18,
-1,2075,153,2,0,
-1,406,593,18,1,
-406,143,2,0,1,
-1521,594,18,1,1521,
-168,2,0,1,412,
-595,18,1,412,168,
-2,0,1,2484,596,
-18,1,2484,597,20,
-598,4,22,84,0,
-73,0,77,0,69,
-0,82,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,87,1,1,2,
-0,1,2023,599,18,
-1,2023,600,20,601,
-4,26,68,0,69,
-0,70,0,65,0,
-85,0,76,0,84,
-0,95,0,83,0,
-84,0,65,0,84,
-0,69,0,1,47,
-1,1,2,0,1,
-1442,602,18,1,1442,
-160,2,0,1,2035,
-603,18,1,2035,191,
-2,0,1,2036,604,
-18,1,2036,605,20,
-606,4,26,74,0,
-117,0,109,0,112,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,1,
-126,1,2,2,0,
-1,431,607,18,1,
-431,143,2,0,1,
-2105,608,18,1,2105,
-258,2,0,1,2106,
-609,18,1,2106,497,
-2,0,1,1550,610,
-18,1,1550,160,2,
-0,1,437,611,18,
-1,437,168,2,0,
-1,2044,612,18,1,
-2044,613,20,614,4,
-28,69,0,109,0,
-112,0,116,0,121,
+0,1,2033,565,18,
+1,2033,566,20,567,
+4,22,73,0,102,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,1,
-121,1,2,2,0,
-1,2045,615,18,1,
-2045,191,2,0,1,
-2586,616,18,1,2586,
-264,2,0,1,1555,
-617,18,1,1555,168,
-2,0,1,2588,618,
-18,1,2588,619,20,
-620,4,38,86,0,
-101,0,99,0,116,
-0,111,0,114,0,
-65,0,114,0,103,
-0,83,0,116,0,
+132,1,2,2,0,
+1,2034,568,18,1,
+2034,569,20,570,4,
+22,83,0,116,0,
 97,0,116,0,101,
-0,69,0,118,0,
+0,67,0,104,0,
+97,0,110,0,103,
+0,101,0,1,131,
+1,2,2,0,1,
+1478,571,18,1,1478,
+163,2,0,1,1479,
+572,18,1,1479,280,
+2,0,1,2037,573,
+18,1,2037,193,2,
+0,1,2038,574,18,
+1,2038,575,20,576,
+4,18,74,0,117,
+0,109,0,112,0,
+76,0,97,0,98,
+0,101,0,108,0,
+1,129,1,2,2,
+0,1,2039,577,18,
+1,2039,193,2,0,
+1,2040,578,18,1,
+2040,579,20,580,4,
+30,82,0,101,0,
+116,0,117,0,114,
+0,110,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
 101,0,110,0,116,
-0,1,106,1,2,
-2,0,1,2511,621,
-18,1,2511,153,2,
-0,1,1001,622,18,
-1,1001,585,2,0,
-1,1002,623,18,1,
-1002,581,2,0,1,
-447,624,18,1,447,
-317,2,0,1,2593,
-625,18,1,2593,156,
-2,0,1,2520,626,
-18,1,2520,153,2,
-0,1,1010,627,18,
-1,1010,160,2,0,
-1,1011,628,18,1,
-1011,153,2,0,1,
-1012,629,18,1,1012,
-168,2,0,1,1013,
-630,18,1,1013,153,
-2,0,1,2685,631,
-18,1,2685,132,2,
-0,1,2686,632,18,
-1,2686,135,2,0,
-1,459,633,18,1,
-459,634,20,635,4,
-24,76,0,69,0,
-70,0,84,0,95,
-0,66,0,82,0,
-65,0,67,0,75,
-0,69,0,84,0,
-1,27,1,1,2,
-0,1,1574,636,18,
-1,1574,191,2,0,
-1,461,637,18,1,
-461,638,20,639,4,
-24,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,76,0,105,
-0,115,0,116,0,
-1,134,1,2,2,
-0,1,462,640,18,
-1,462,143,2,0,
-1,464,641,18,1,
-464,642,20,643,4,
-16,65,0,114,0,
-103,0,117,0,109,
+0,1,128,1,2,
+2,0,1,2041,581,
+18,1,2041,193,2,
+0,1,1485,582,18,
+1,1485,171,2,0,
+1,372,583,18,1,
+372,183,2,0,1,
+373,584,18,1,373,
+132,2,0,1,374,
+585,18,1,374,179,
+2,0,1,375,586,
+18,1,375,132,2,
+0,1,376,587,18,
+1,376,186,2,0,
+1,377,588,18,1,
+377,132,2,0,1,
+378,589,18,1,378,
+179,2,0,1,379,
+590,18,1,379,132,
+2,0,1,380,591,
+18,1,380,592,20,
+593,4,16,67,0,
+111,0,110,0,115,
+0,116,0,97,0,
+110,0,116,0,1,
+141,1,2,2,0,
+1,381,594,18,1,
+381,301,2,0,1,
+371,595,18,1,371,
+596,20,597,4,24,
+70,0,117,0,110,
+0,99,0,116,0,
+105,0,111,0,110,
+0,67,0,97,0,
+108,0,108,0,1,
+137,1,2,2,0,
+1,942,598,18,1,
+942,171,2,0,1,
+2533,599,18,1,2533,
+135,2,0,1,387,
+600,18,1,387,171,
+2,0,1,2536,601,
+18,1,2536,351,2,
+0,1,2537,602,18,
+1,2537,603,20,604,
+4,10,69,0,118,
 0,101,0,110,0,
-116,0,1,135,1,
-2,2,0,1,2136,
-644,18,1,2136,258,
-2,0,1,2695,645,
-18,1,2695,140,2,
-0,1,2697,646,18,
-1,2697,153,2,0,
-1,1585,647,18,1,
-1585,648,20,649,4,
-12,82,0,69,0,
-84,0,85,0,82,
-0,78,0,1,50,
-1,1,2,0,1,
-2701,650,18,1,2701,
-150,2,0,1,2702,
-651,18,1,2702,308,
-2,0,1,476,652,
-18,1,476,653,20,
-654,4,30,83,0,
-84,0,82,0,73,
-0,78,0,71,0,
-95,0,67,0,79,
-0,78,0,83,0,
-84,0,65,0,78,
-0,84,0,1,3,
-1,1,2,0,1,
-477,655,18,1,477,
-656,20,657,4,28,
-70,0,76,0,79,
-0,65,0,84,0,
-95,0,67,0,79,
-0,78,0,83,0,
-84,0,65,0,78,
-0,84,0,1,95,
+116,0,1,117,1,
+2,2,0,1,1514,
+605,18,1,1514,163,
+2,0,1,1515,606,
+18,1,1515,311,2,
+0,1,2549,607,18,
+1,2549,156,2,0,
+1,2074,608,18,1,
+2074,163,2,0,1,
+2075,609,18,1,2075,
+156,2,0,1,406,
+610,18,1,406,143,
+2,0,1,1521,611,
+18,1,1521,171,2,
+0,1,412,612,18,
+1,412,171,2,0,
+1,2484,613,18,1,
+2484,614,20,615,4,
+32,79,0,66,0,
+74,0,69,0,67,
+0,84,0,95,0,
+82,0,69,0,90,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,80,
 1,1,2,0,1,
-478,658,18,1,478,
-659,20,660,4,40,
-72,0,69,0,88,
-0,95,0,73,0,
-78,0,84,0,69,
-0,71,0,69,0,
-82,0,95,0,67,
-0,79,0,78,0,
-83,0,84,0,65,
-0,78,0,84,0,
-1,94,1,1,2,
-0,1,479,661,18,
-1,479,662,20,663,
-4,32,73,0,78,
+2023,616,18,1,2023,
+617,20,618,4,26,
+68,0,69,0,70,
+0,65,0,85,0,
+76,0,84,0,95,
+0,83,0,84,0,
+65,0,84,0,69,
+0,1,47,1,1,
+2,0,1,1442,619,
+18,1,1442,163,2,
+0,1,2035,620,18,
+1,2035,193,2,0,
+1,2036,621,18,1,
+2036,622,20,623,4,
+26,74,0,117,0,
+109,0,112,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,130,1,
+2,2,0,1,431,
+624,18,1,431,143,
+2,0,1,2105,625,
+18,1,2105,261,2,
+0,1,2106,626,18,
+1,2106,504,2,0,
+1,1550,627,18,1,
+1550,163,2,0,1,
+437,628,18,1,437,
+171,2,0,1,2044,
+629,18,1,2044,630,
+20,631,4,28,69,
+0,109,0,112,0,
+116,0,121,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,125,1,
+2,2,0,1,2045,
+632,18,1,2045,193,
+2,0,1,1555,633,
+18,1,1555,171,2,
+0,1,2511,634,18,
+1,2511,156,2,0,
+1,1001,635,18,1,
+1001,596,2,0,1,
+1002,636,18,1,1002,
+592,2,0,1,447,
+637,18,1,447,320,
+2,0,1,2593,638,
+18,1,2593,342,2,
+0,1,2594,639,18,
+1,2594,640,20,641,
+4,32,73,0,110,
+0,116,0,65,0,
+114,0,103,0,83,
+0,116,0,97,0,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+106,1,2,2,0,
+1,2595,642,18,1,
+2595,499,2,0,1,
+2596,643,18,1,2596,
+644,20,645,4,34,
+86,0,111,0,105,
+0,100,0,65,0,
+114,0,103,0,83,
+0,116,0,97,0,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+104,1,2,2,0,
+1,2520,646,18,1,
+2520,156,2,0,1,
+1010,647,18,1,1010,
+163,2,0,1,1011,
+648,18,1,1011,156,
+2,0,1,1012,649,
+18,1,1012,171,2,
+0,1,1013,650,18,
+1,1013,156,2,0,
+1,2602,651,18,1,
+2602,644,2,0,1,
+2603,652,18,1,2603,
+653,20,654,4,20,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,103,1,2,2,
+0,1,459,655,18,
+1,459,656,20,657,
+4,24,76,0,69,
+0,70,0,84,0,
+95,0,66,0,82,
+0,65,0,67,0,
+75,0,69,0,84,
+0,1,27,1,1,
+2,0,1,1574,658,
+18,1,1574,193,2,
+0,1,461,659,18,
+1,461,660,20,661,
+4,24,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,76,0,
+105,0,115,0,116,
+0,1,138,1,2,
+2,0,1,462,662,
+18,1,462,143,2,
+0,1,464,663,18,
+1,464,664,20,665,
+4,16,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,1,139,
+1,2,2,0,1,
+2136,666,18,1,2136,
+261,2,0,1,2696,
+667,18,1,2696,515,
+2,0,1,1585,668,
+18,1,1585,669,20,
+670,4,12,82,0,
+69,0,84,0,85,
+0,82,0,78,0,
+1,50,1,1,2,
+0,1,2700,671,18,
+1,2700,672,20,673,
+4,10,83,0,116,
+0,97,0,116,0,
+101,0,1,101,1,
+2,2,0,1,2701,
+674,18,1,2701,132,
+2,0,1,2702,675,
+18,1,2702,135,2,
+0,1,476,676,18,
+1,476,677,20,678,
+4,30,83,0,84,
+0,82,0,73,0,
+78,0,71,0,95,
+0,67,0,79,0,
+78,0,83,0,84,
+0,65,0,78,0,
+84,0,1,3,1,
+1,2,0,1,477,
+679,18,1,477,680,
+20,681,4,28,70,
+0,76,0,79,0,
+65,0,84,0,95,
+0,67,0,79,0,
+78,0,83,0,84,
+0,65,0,78,0,
+84,0,1,95,1,
+1,2,0,1,478,
+682,18,1,478,683,
+20,684,4,40,72,
+0,69,0,88,0,
+95,0,73,0,78,
 0,84,0,69,0,
 71,0,69,0,82,
 0,95,0,67,0,
 79,0,78,0,83,
 0,84,0,65,0,
 78,0,84,0,1,
-93,1,1,2,0,
-1,480,664,18,1,
-480,665,20,666,4,
-26,82,0,73,0,
-71,0,72,0,84,
-0,95,0,66,0,
-82,0,65,0,67,
-0,75,0,69,0,
-84,0,1,28,1,
-1,2,0,1,481,
-667,18,1,481,642,
-2,0,1,2632,668,
-18,1,2632,493,2,
-0,1,1048,669,18,
-1,1048,168,2,0,
-1,2727,670,18,1,
-2727,191,2,0,1,
-2042,671,18,1,2042,
-672,20,673,4,20,
+94,1,1,2,0,
+1,479,685,18,1,
+479,686,20,687,4,
+32,73,0,78,0,
+84,0,69,0,71,
+0,69,0,82,0,
+95,0,67,0,79,
+0,78,0,83,0,
+84,0,65,0,78,
+0,84,0,1,93,
+1,1,2,0,1,
+480,688,18,1,480,
+689,20,690,4,26,
+82,0,73,0,71,
+0,72,0,84,0,
+95,0,66,0,82,
+0,65,0,67,0,
+75,0,69,0,84,
+0,1,28,1,1,
+2,0,1,481,691,
+18,1,481,664,2,
+0,1,2711,692,18,
+1,2711,140,2,0,
+1,2713,693,18,1,
+2713,156,2,0,1,
+2715,694,18,1,2715,
+351,2,0,1,2717,
+695,18,1,2717,153,
+2,0,1,2718,696,
+18,1,2718,311,2,
+0,1,1048,697,18,
+1,1048,171,2,0,
+1,2724,698,18,1,
+2724,171,2,0,1,
+2042,699,18,1,2042,
+700,20,701,4,20,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-1,122,1,2,2,
-0,1,2043,674,18,
-1,2043,191,2,0,
-1,1620,675,18,1,
-1620,160,2,0,1,
-1621,676,18,1,1621,
-150,2,0,1,1622,
-677,18,1,1622,308,
-2,0,1,509,678,
+1,126,1,2,2,
+0,1,2043,702,18,
+1,2043,193,2,0,
+1,1620,703,18,1,
+1620,163,2,0,1,
+1621,704,18,1,1621,
+153,2,0,1,1622,
+705,18,1,1622,311,
+2,0,1,509,706,
 18,1,509,143,2,
-0,1,2498,679,18,
-1,2498,680,20,681,
-4,38,72,0,84,
-0,84,0,80,0,
-95,0,82,0,69,
-0,83,0,80,0,
-79,0,78,0,83,
-0,69,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,68,1,1,2,
-0,1,2739,682,18,
-1,2739,683,20,684,
-4,34,71,0,108,
-0,111,0,98,0,
-97,0,108,0,68,
-0,101,0,102,0,
-105,0,110,0,105,
-0,116,0,105,0,
-111,0,110,0,115,
-0,1,97,1,2,
-2,0,1,1628,685,
-18,1,1628,168,2,
-0,1,515,686,18,
-1,515,168,2,0,
-1,2505,687,18,1,
-2505,688,20,689,4,
-28,86,0,101,0,
-99,0,116,0,111,
-0,114,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
-117,1,2,2,0,
-1,2583,690,18,1,
-2583,619,2,0,1,
-2584,691,18,1,2584,
-331,2,0,1,2585,
-692,18,1,2585,334,
-2,0,1,2750,693,
-18,1,2750,287,2,
-0,1,2587,694,18,
-1,2587,486,2,0,
-1,525,695,18,1,
-525,317,2,0,1,
-2197,696,18,1,2197,
-160,2,0,1,2198,
-697,18,1,2198,153,
-2,0,1,1591,698,
-18,1,1591,168,2,
-0,1,2757,699,18,
-1,2757,700,20,701,
-4,48,71,0,108,
-0,111,0,98,0,
-97,0,108,0,70,
-0,117,0,110,0,
-99,0,116,0,105,
-0,111,0,110,0,
-68,0,101,0,102,
-0,105,0,110,0,
-105,0,116,0,105,
-0,111,0,110,0,
-1,99,1,2,2,
-0,1,2592,702,18,
-1,2592,600,2,0,
-1,2759,703,18,1,
-2759,700,2,0,1,
-2675,704,18,1,2675,
-486,2,0,1,2761,
-104,1,2762,705,18,
-1,2762,706,23,707,
-4,6,69,0,79,
-0,70,0,1,2,
-1,6,2,0,1,
-1094,708,18,1,1094,
-638,2,0,1,1096,
-709,18,1,1096,153,
-2,0,1,2683,710,
-18,1,2683,711,20,
-712,4,10,83,0,
-116,0,97,0,116,
-0,101,0,1,101,
-1,2,2,0,1,
-2684,713,18,1,2684,
-711,2,0,1,1657,
-714,18,1,1657,191,
-2,0,1,1658,715,
-18,1,1658,716,20,
-717,4,6,70,0,
-79,0,82,0,1,
-46,1,1,2,0,
-1,1659,718,18,1,
-1659,135,2,0,1,
-1665,719,18,1,1665,
-168,2,0,1,1113,
-720,18,1,1113,176,
-2,0,721,5,0,
-722,5,347,1,2,
-723,19,707,1,2,
-724,5,6,1,2750,
-725,17,726,15,727,
-4,30,37,0,76,
-0,83,0,76,0,
-80,0,114,0,111,
-0,103,0,114,0,
-97,0,109,0,82,
-0,111,0,111,0,
-116,0,1,-1,1,
-5,728,20,729,4,
-32,76,0,83,0,
-76,0,80,0,114,
-0,111,0,103,0,
-114,0,97,0,109,
-0,82,0,111,0,
-111,0,116,0,95,
-0,49,0,1,152,
-1,3,1,3,1,
-2,730,22,1,1,
-1,2675,731,17,732,
-15,733,4,12,37,
-0,83,0,116,0,
-97,0,116,0,101,
-0,1,-1,1,5,
-734,20,735,4,14,
+0,1,2498,707,18,
+1,2498,708,20,709,
+4,36,76,0,73,
+0,78,0,75,0,
+95,0,77,0,69,
+0,83,0,83,0,
+65,0,71,0,69,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,72,
+1,1,2,0,1,
+1628,710,18,1,1628,
+171,2,0,1,515,
+711,18,1,515,171,
+2,0,1,2699,712,
+18,1,2699,672,2,
+0,1,2505,713,18,
+1,2505,714,20,715,
+4,28,86,0,101,
+0,99,0,116,0,
+111,0,114,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,121,1,2,2,
+0,1,525,716,18,
+1,525,320,2,0,
+1,2197,717,18,1,
+2197,163,2,0,1,
+2198,718,18,1,2198,
+156,2,0,1,1591,
+719,18,1,1591,171,
+2,0,1,2597,720,
+18,1,2597,653,2,
+0,1,2598,721,18,
+1,2598,495,2,0,
+1,1094,722,18,1,
+1094,660,2,0,1,
+2600,723,18,1,2600,
+640,2,0,1,1096,
+724,18,1,1096,156,
+2,0,1,2604,725,
+18,1,2604,617,2,
+0,1,1657,726,18,
+1,1657,193,2,0,
+1,1658,727,18,1,
+1658,728,20,729,4,
+6,70,0,79,0,
+82,0,1,46,1,
+1,2,0,1,1659,
+730,18,1,1659,135,
+2,0,1,2774,731,
+18,1,2774,304,2,
+0,1,2775,732,18,
+1,2775,298,2,0,
+1,2690,733,18,1,
+2690,495,2,0,1,
+2777,104,1,2778,734,
+18,1,2778,735,23,
+736,4,6,69,0,
+79,0,70,0,1,
+2,1,6,2,0,
+1,1665,737,18,1,
+1665,171,2,0,1,
+1113,738,18,1,1113,
+179,2,0,739,5,
+0,740,5,356,1,
+2,741,19,736,1,
+2,742,5,6,1,
+2700,743,17,744,15,
+745,4,14,37,0,
 83,0,116,0,97,
 0,116,0,101,0,
+115,0,1,-1,1,
+5,746,20,747,4,
+16,83,0,116,0,
+97,0,116,0,101,
+0,115,0,95,0,
+49,0,1,166,1,
+3,1,2,1,1,
+748,22,1,11,1,
+2696,749,17,750,15,
+751,4,30,37,0,
+76,0,83,0,76,
+0,80,0,114,0,
+111,0,103,0,114,
+0,97,0,109,0,
+82,0,111,0,111,
+0,116,0,1,-1,
+1,5,752,20,753,
+4,32,76,0,83,
+0,76,0,80,0,
+114,0,111,0,103,
+0,114,0,97,0,
+109,0,82,0,111,
+0,111,0,116,0,
+95,0,50,0,1,
+157,1,3,1,2,
+1,1,754,22,1,
+2,1,2598,755,17,
+756,15,757,4,12,
+37,0,83,0,116,
+0,97,0,116,0,
+101,0,1,-1,1,
+5,758,20,759,4,
+14,83,0,116,0,
+97,0,116,0,101,
+0,95,0,50,0,
+1,169,1,3,1,
+6,1,5,760,22,
+1,14,1,2699,761,
+17,762,15,745,1,
+-1,1,5,763,20,
+764,4,16,83,0,
+116,0,97,0,116,
+0,101,0,115,0,
+95,0,50,0,1,
+167,1,3,1,3,
+1,2,765,22,1,
+12,1,2766,766,17,
+767,15,751,1,-1,
+1,5,768,20,769,
+4,32,76,0,83,
+0,76,0,80,0,
+114,0,111,0,103,
+0,114,0,97,0,
+109,0,82,0,111,
+0,111,0,116,0,
 95,0,49,0,1,
-164,1,3,1,5,
-1,4,736,22,1,
-13,1,2587,737,17,
-738,15,733,1,-1,
-1,5,739,20,740,
+156,1,3,1,3,
+1,2,770,22,1,
+1,1,2690,771,17,
+772,15,757,1,-1,
+1,5,773,20,774,
 4,14,83,0,116,
 0,97,0,116,0,
-101,0,95,0,50,
-0,1,165,1,3,
-1,6,1,5,741,
-22,1,14,1,2684,
-742,17,743,15,744,
-4,14,37,0,83,
-0,116,0,97,0,
-116,0,101,0,115,
-0,1,-1,1,5,
-745,20,746,4,16,
-83,0,116,0,97,
-0,116,0,101,0,
-115,0,95,0,49,
-0,1,162,1,3,
-1,2,1,1,747,
-22,1,11,1,2680,
-748,17,749,15,727,
-1,-1,1,5,750,
-20,751,4,32,76,
-0,83,0,76,0,
-80,0,114,0,111,
-0,103,0,114,0,
-97,0,109,0,82,
-0,111,0,111,0,
-116,0,95,0,50,
-0,1,153,1,3,
-1,2,1,1,752,
-22,1,2,1,2683,
-753,17,754,15,744,
-1,-1,1,5,755,
-20,756,4,16,83,
-0,116,0,97,0,
-116,0,101,0,115,
-0,95,0,50,0,
-1,163,1,3,1,
-3,1,2,757,22,
-1,12,1,3,758,
-19,654,1,3,759,
-5,95,1,256,760,
-16,0,652,1,1261,
-761,16,0,652,1,
-509,762,16,0,652,
-1,1515,763,16,0,
-652,1,2021,764,17,
-765,15,766,4,24,
-37,0,73,0,102,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,1,
--1,1,5,767,20,
-768,4,26,73,0,
+101,0,95,0,49,
+0,1,168,1,3,
+1,5,1,4,775,
+22,1,13,1,3,
+776,19,678,1,3,
+777,5,95,1,256,
+778,16,0,676,1,
+1261,779,16,0,676,
+1,509,780,16,0,
+676,1,1515,781,16,
+0,676,1,2021,782,
+17,783,15,784,4,
+24,37,0,73,0,
 102,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-95,0,50,0,1,
-208,1,3,1,8,
-1,7,769,22,1,
-58,1,1775,770,16,
-0,652,1,2029,771,
-17,772,15,773,4,
-20,37,0,83,0,
+1,-1,1,5,785,
+20,786,4,26,73,
+0,102,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
-0,1,-1,1,5,
-774,20,775,4,24,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,51,0,1,
-202,1,3,1,2,
-1,1,776,22,1,
-52,1,2030,777,17,
-778,15,773,1,-1,
-1,5,779,20,780,
-4,24,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,50,
-0,1,201,1,3,
-1,2,1,1,781,
-22,1,51,1,2031,
-782,17,783,15,773,
-1,-1,1,5,784,
-20,785,4,24,83,
+0,95,0,50,0,
+1,217,1,3,1,
+8,1,7,787,22,
+1,63,1,1775,788,
+16,0,676,1,2029,
+789,17,790,15,791,
+4,20,37,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,95,0,49,
-0,49,0,1,200,
-1,3,1,2,1,
-1,786,22,1,50,
-1,2032,787,17,788,
-15,773,1,-1,1,
-5,789,20,790,4,
+116,0,1,-1,1,
+5,792,20,793,4,
 24,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,48,0,
-1,199,1,3,1,
-2,1,1,791,22,
-1,49,1,2033,792,
-17,793,15,773,1,
--1,1,5,794,20,
-795,4,22,83,0,
+0,49,0,51,0,
+1,211,1,3,1,
+2,1,1,794,22,
+1,57,1,2030,795,
+17,796,15,791,1,
+-1,1,5,797,20,
+798,4,24,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
-0,95,0,57,0,
-1,198,1,3,1,
-2,1,1,796,22,
-1,48,1,277,797,
-16,0,652,1,2035,
-798,17,799,15,773,
-1,-1,1,5,800,
-20,801,4,22,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,56,
-0,1,197,1,3,
-1,3,1,2,802,
-22,1,47,1,2037,
-803,17,804,15,773,
-1,-1,1,5,805,
-20,806,4,22,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,55,
-0,1,196,1,3,
-1,3,1,2,807,
-22,1,46,1,2039,
-808,17,809,15,773,
-1,-1,1,5,810,
-20,811,4,22,83,
+0,95,0,49,0,
+50,0,1,210,1,
+3,1,2,1,1,
+799,22,1,56,1,
+2031,800,17,801,15,
+791,1,-1,1,5,
+802,20,803,4,24,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,49,0,1,
+209,1,3,1,2,
+1,1,804,22,1,
+55,1,2032,805,17,
+806,15,791,1,-1,
+1,5,807,20,808,
+4,24,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,48,
+0,1,208,1,3,
+1,2,1,1,809,
+22,1,54,1,2033,
+810,17,811,15,791,
+1,-1,1,5,812,
+20,813,4,22,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,95,0,54,
-0,1,195,1,3,
-1,3,1,2,812,
-22,1,45,1,32,
-813,16,0,652,1,
-2041,814,17,815,15,
-773,1,-1,1,5,
-816,20,817,4,22,
+116,0,95,0,57,
+0,1,207,1,3,
+1,2,1,1,814,
+22,1,53,1,277,
+815,16,0,676,1,
+2035,816,17,817,15,
+791,1,-1,1,5,
+818,20,819,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-53,0,1,194,1,
+56,0,1,206,1,
 3,1,3,1,2,
-818,22,1,44,1,
-2293,819,16,0,652,
-1,2043,820,17,821,
-15,773,1,-1,1,
-5,822,20,823,4,
-22,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,51,0,1,192,
-1,3,1,3,1,
-2,824,22,1,42,
-1,2045,825,17,826,
-15,773,1,-1,1,
-5,827,20,828,4,
+820,22,1,52,1,
+2037,821,17,822,15,
+791,1,-1,1,5,
+823,20,824,4,22,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+55,0,1,205,1,
+3,1,3,1,2,
+825,22,1,51,1,
+2039,826,17,827,15,
+791,1,-1,1,5,
+828,20,829,4,22,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+54,0,1,204,1,
+3,1,3,1,2,
+830,22,1,50,1,
+32,831,16,0,676,
+1,2041,832,17,833,
+15,791,1,-1,1,
+5,834,20,835,4,
 22,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,1,190,
+0,53,0,1,203,
 1,3,1,3,1,
-2,829,22,1,40,
-1,41,830,16,0,
-652,1,1297,831,16,
-0,652,1,43,832,
-16,0,652,1,1803,
-833,17,834,15,835,
-4,16,37,0,70,
-0,111,0,114,0,
-76,0,111,0,111,
-0,112,0,1,-1,
-1,5,836,20,837,
-4,18,70,0,111,
-0,114,0,76,0,
-111,0,111,0,112,
-0,95,0,49,0,
-1,215,1,3,1,
-10,1,9,838,22,
-1,65,1,1804,839,
-16,0,652,1,299,
-840,16,0,652,1,
-52,841,16,0,652,
-1,2318,842,16,0,
-652,1,62,843,16,
-0,652,1,2075,844,
-16,0,652,1,1574,
-845,17,846,15,773,
-1,-1,1,5,847,
-20,848,4,22,83,
+2,836,22,1,49,
+1,2293,837,16,0,
+676,1,2043,838,17,
+839,15,791,1,-1,
+1,5,840,20,841,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,51,0,1,
+201,1,3,1,3,
+1,2,842,22,1,
+47,1,2045,843,17,
+844,15,791,1,-1,
+1,5,845,20,846,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+199,1,3,1,3,
+1,2,847,22,1,
+45,1,41,848,16,
+0,676,1,1297,849,
+16,0,676,1,43,
+850,16,0,676,1,
+1803,851,17,852,15,
+853,4,16,37,0,
+70,0,111,0,114,
+0,76,0,111,0,
+111,0,112,0,1,
+-1,1,5,854,20,
+855,4,18,70,0,
+111,0,114,0,76,
+0,111,0,111,0,
+112,0,95,0,49,
+0,1,224,1,3,
+1,10,1,9,856,
+22,1,70,1,1804,
+857,16,0,676,1,
+299,858,16,0,676,
+1,52,859,16,0,
+676,1,2318,860,16,
+0,676,1,62,861,
+16,0,676,1,2075,
+862,16,0,676,1,
+1574,863,17,864,15,
+791,1,-1,1,5,
+865,20,866,4,22,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+52,0,1,202,1,
+3,1,3,1,2,
+867,22,1,48,1,
+71,868,16,0,676,
+1,76,869,16,0,
+676,1,1834,870,16,
+0,676,1,2337,871,
+16,0,676,1,79,
+872,16,0,676,1,
+1335,873,16,0,676,
+1,322,874,16,0,
+676,1,85,875,16,
+0,676,1,89,876,
+16,0,676,1,346,
+877,16,0,676,1,
+2105,878,17,879,15,
+784,1,-1,1,5,
+880,20,881,4,26,
+73,0,102,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,95,0,52,
-0,1,193,1,3,
-1,3,1,2,849,
-22,1,43,1,71,
-850,16,0,652,1,
-76,851,16,0,652,
-1,1834,852,16,0,
-652,1,2337,853,16,
-0,652,1,79,854,
-16,0,652,1,1335,
-855,16,0,652,1,
-322,856,16,0,652,
-1,85,857,16,0,
-652,1,89,858,16,
-0,652,1,346,859,
-16,0,652,1,2105,
-860,17,861,15,766,
-1,-1,1,5,862,
-20,863,4,26,73,
-0,102,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,51,0,
-1,209,1,3,1,
-6,1,5,864,22,
-1,59,1,2106,865,
-16,0,652,1,97,
-866,16,0,652,1,
-1860,867,17,868,15,
-869,4,34,37,0,
+116,0,95,0,51,
+0,1,218,1,3,
+1,6,1,5,882,
+22,1,64,1,2106,
+883,16,0,676,1,
+97,884,16,0,676,
+1,1860,885,17,886,
+15,887,4,34,37,
+0,68,0,111,0,
+87,0,104,0,105,
+0,108,0,101,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,-1,
+1,5,888,20,889,
+4,36,68,0,111,
+0,87,0,104,0,
+105,0,108,0,101,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,95,
+0,49,0,1,222,
+1,3,1,8,1,
+7,890,22,1,68,
+1,2364,891,17,892,
+15,853,1,-1,1,
+5,893,20,894,4,
+18,70,0,111,0,
+114,0,76,0,111,
+0,111,0,112,0,
+95,0,50,0,1,
+225,1,3,1,9,
+1,8,895,22,1,
+71,1,102,896,16,
+0,676,1,112,897,
+16,0,676,1,1117,
+898,16,0,676,1,
+1873,899,17,900,15,
+887,1,-1,1,5,
+901,20,902,4,36,
 68,0,111,0,87,
 0,104,0,105,0,
 108,0,101,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,1,-1,1,
-5,870,20,871,4,
-36,68,0,111,0,
-87,0,104,0,105,
-0,108,0,101,0,
+116,0,95,0,50,
+0,1,223,1,3,
+1,8,1,7,903,
+22,1,69,1,1876,
+904,16,0,676,1,
+124,905,16,0,676,
+1,2136,906,17,907,
+15,784,1,-1,1,
+5,908,20,909,4,
+26,73,0,102,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,1,213,1,
+52,0,1,219,1,
 3,1,8,1,7,
-872,22,1,63,1,
-2364,873,17,874,15,
-835,1,-1,1,5,
-875,20,876,4,18,
-70,0,111,0,114,
-0,76,0,111,0,
-111,0,112,0,95,
-0,50,0,1,216,
-1,3,1,9,1,
-8,877,22,1,66,
-1,102,878,16,0,
-652,1,112,879,16,
-0,652,1,1117,880,
-16,0,652,1,1873,
-881,17,882,15,869,
-1,-1,1,5,883,
-20,884,4,36,68,
-0,111,0,87,0,
-104,0,105,0,108,
-0,101,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,50,0,
-1,214,1,3,1,
-8,1,7,885,22,
-1,64,1,1876,886,
-16,0,652,1,124,
-887,16,0,652,1,
-2136,888,17,889,15,
-766,1,-1,1,5,
-890,20,891,4,26,
-73,0,102,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,52,
-0,1,210,1,3,
-1,8,1,7,892,
-22,1,60,1,381,
-893,16,0,652,1,
-525,894,16,0,652,
-1,137,895,16,0,
-652,1,1901,896,16,
-0,652,1,1153,897,
-16,0,652,1,151,
-898,16,0,652,1,
-1407,899,16,0,652,
-1,1659,900,16,0,
-652,1,2413,901,16,
-0,652,1,406,902,
-16,0,652,1,1371,
-903,16,0,652,1,
-166,904,16,0,652,
-1,1622,905,16,0,
-652,1,1931,906,17,
-907,15,908,4,30,
-37,0,87,0,104,
-0,105,0,108,0,
-101,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-1,-1,1,5,909,
-20,910,4,32,87,
+910,22,1,65,1,
+2718,911,16,0,676,
+1,381,912,16,0,
+676,1,525,913,16,
+0,676,1,137,914,
+16,0,676,1,1901,
+915,16,0,676,1,
+1153,916,16,0,676,
+1,151,917,16,0,
+676,1,1407,918,16,
+0,676,1,1659,919,
+16,0,676,1,2413,
+920,16,0,676,1,
+406,921,16,0,676,
+1,1371,922,16,0,
+676,1,166,923,16,
+0,676,1,1622,924,
+16,0,676,1,1931,
+925,17,926,15,927,
+4,30,37,0,87,
 0,104,0,105,0,
 108,0,101,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,95,0,49,
-0,1,211,1,3,
-1,6,1,5,911,
-22,1,61,1,1933,
-912,16,0,652,1,
-431,913,16,0,652,
-1,1585,914,16,0,
-652,1,182,915,16,
-0,652,1,1189,916,
-16,0,652,1,1443,
-917,16,0,652,1,
-1695,918,16,0,652,
-1,2198,919,16,0,
-652,1,2702,920,16,
-0,652,1,447,921,
-16,0,652,1,2458,
-922,17,923,15,924,
-4,28,37,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,76,0,105,
-0,115,0,116,0,
-1,-1,1,5,925,
-20,926,4,30,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,76,0,105,
-0,115,0,116,0,
-95,0,50,0,1,
-188,1,3,1,3,
-1,2,927,22,1,
-38,1,2459,928,17,
-929,15,930,4,36,
-37,0,67,0,111,
-0,109,0,112,0,
-111,0,117,0,110,
-0,100,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,1,-1,1,5,
-931,20,932,4,38,
-67,0,111,0,109,
-0,112,0,111,0,
-117,0,110,0,100,
+116,0,1,-1,1,
+5,928,20,929,4,
+32,87,0,104,0,
+105,0,108,0,101,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,50,0,1,186,
-1,3,1,4,1,
-3,933,22,1,36,
-1,1958,934,16,0,
-652,1,2462,935,17,
-936,15,924,1,-1,
-1,5,937,20,938,
-4,30,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-76,0,105,0,115,
-0,116,0,95,0,
-49,0,1,187,1,
-3,1,2,1,1,
-939,22,1,37,1,
-1657,940,17,941,15,
-773,1,-1,1,5,
-942,20,943,4,22,
+0,49,0,1,220,
+1,3,1,6,1,
+5,930,22,1,66,
+1,1933,931,16,0,
+676,1,431,932,16,
+0,676,1,1585,933,
+16,0,676,1,182,
+934,16,0,676,1,
+1189,935,16,0,676,
+1,1443,936,16,0,
+676,1,1695,937,16,
+0,676,1,2198,938,
+16,0,676,1,447,
+939,16,0,676,1,
+2458,940,17,941,15,
+942,4,28,37,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
-0,116,0,95,0,
-50,0,1,191,1,
-3,1,3,1,2,
-944,22,1,41,1,
-2464,945,17,946,15,
-930,1,-1,1,5,
-947,20,948,4,38,
-67,0,111,0,109,
-0,112,0,111,0,
-117,0,110,0,100,
-0,83,0,116,0,
+0,116,0,76,0,
+105,0,115,0,116,
+0,1,-1,1,5,
+943,20,944,4,30,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,76,0,
+105,0,115,0,116,
+0,95,0,50,0,
+1,197,1,3,1,
+3,1,2,945,22,
+1,43,1,2459,946,
+17,947,15,948,4,
+36,37,0,67,0,
+111,0,109,0,112,
+0,111,0,117,0,
+110,0,100,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,949,20,950,4,
+38,67,0,111,0,
+109,0,112,0,111,
+0,117,0,110,0,
+100,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,50,0,1,
+195,1,3,1,4,
+1,3,951,22,1,
+41,1,1958,952,16,
+0,676,1,2462,953,
+17,954,15,942,1,
+-1,1,5,955,20,
+956,4,30,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,76,0,105,0,
+115,0,116,0,95,
+0,49,0,1,196,
+1,3,1,2,1,
+1,957,22,1,42,
+1,1657,958,17,959,
+15,791,1,-1,1,
+5,960,20,961,4,
+22,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,1,185,
+0,50,0,1,200,
 1,3,1,3,1,
-2,949,22,1,35,
-1,199,950,16,0,
-652,1,459,951,16,
-0,652,1,462,952,
-16,0,652,1,217,
-953,16,0,652,1,
-2227,954,17,955,15,
-908,1,-1,1,5,
-956,20,957,4,32,
-87,0,104,0,105,
-0,108,0,101,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-50,0,1,212,1,
-3,1,6,1,5,
-958,22,1,62,1,
-1225,959,16,0,652,
-1,1479,960,16,0,
-652,1,1731,961,16,
-0,652,1,1989,962,
-17,963,15,766,1,
--1,1,5,964,20,
-965,4,26,73,0,
-102,0,83,0,116,
+2,962,22,1,46,
+1,2464,963,17,964,
+15,948,1,-1,1,
+5,965,20,966,4,
+38,67,0,111,0,
+109,0,112,0,111,
+0,117,0,110,0,
+100,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
 95,0,49,0,1,
-207,1,3,1,6,
-1,5,966,22,1,
-57,1,1990,967,16,
-0,652,1,236,968,
-16,0,652,1,1756,
-969,16,0,652,1,
-4,970,19,184,1,
-4,971,5,100,1,
-256,972,16,0,576,
-1,1261,973,16,0,
-576,1,509,974,16,
-0,576,1,1515,975,
-16,0,576,1,2021,
-764,1,1775,976,16,
-0,576,1,2029,771,
-1,2030,777,1,2031,
-782,1,2032,787,1,
-2033,792,1,277,977,
-16,0,576,1,2035,
-798,1,2037,803,1,
-2039,808,1,32,978,
-16,0,576,1,2041,
-814,1,2293,979,16,
-0,576,1,2043,820,
-1,2045,825,1,40,
-980,16,0,186,1,
-41,981,16,0,576,
-1,1297,982,16,0,
-576,1,43,983,16,
-0,576,1,44,984,
-16,0,186,1,1803,
-833,1,1804,985,16,
-0,576,1,299,986,
-16,0,576,1,47,
-987,16,0,182,1,
-52,988,16,0,576,
-1,2318,989,16,0,
-576,1,63,990,16,
-0,201,1,66,991,
-16,0,199,1,2075,
-992,16,0,576,1,
-1574,845,1,71,993,
-16,0,576,1,76,
-994,16,0,576,1,
-1834,995,16,0,576,
-1,2337,996,16,0,
-576,1,79,997,16,
-0,576,1,1335,998,
-16,0,576,1,322,
-999,16,0,576,1,
-85,1000,16,0,576,
-1,89,1001,16,0,
-576,1,346,1002,16,
-0,576,1,97,1003,
-16,0,576,1,2106,
-1004,16,0,576,1,
-102,1005,16,0,576,
-1,1860,867,1,2364,
-873,1,1114,1006,16,
-0,182,1,112,1007,
-16,0,576,1,1117,
-1008,16,0,576,1,
-1873,881,1,1876,1009,
-16,0,576,1,124,
-1010,16,0,576,1,
-2136,888,1,381,1011,
-16,0,576,1,525,
-1012,16,0,576,1,
-137,1013,16,0,576,
-1,1901,1014,16,0,
-576,1,1153,1015,16,
-0,576,1,151,1016,
-16,0,576,1,1407,
-1017,16,0,576,1,
-1659,1018,16,0,576,
-1,2413,1019,16,0,
-576,1,406,1020,16,
-0,576,1,1371,1021,
-16,0,576,1,2105,
-860,1,166,1022,16,
-0,576,1,1622,1023,
-16,0,576,1,1931,
-906,1,1933,1024,16,
-0,576,1,431,1025,
-16,0,576,1,1585,
-1026,16,0,576,1,
-182,1027,16,0,576,
-1,1189,1028,16,0,
-576,1,1443,1029,16,
-0,576,1,1695,1030,
-16,0,576,1,2198,
-1031,16,0,576,1,
-2702,1032,16,0,576,
-1,447,1033,16,0,
-576,1,2458,922,1,
-2459,928,1,1958,1034,
-16,0,576,1,2462,
-935,1,1657,940,1,
-2464,945,1,199,1035,
-16,0,576,1,459,
-1036,16,0,576,1,
-462,1037,16,0,576,
-1,217,1038,16,0,
-576,1,2227,954,1,
-1225,1039,16,0,576,
-1,1479,1040,16,0,
-576,1,1731,1041,16,
-0,576,1,1989,962,
-1,1990,1042,16,0,
-576,1,236,1043,16,
-0,576,1,1756,1044,
-16,0,576,1,5,
-1045,19,181,1,5,
-1046,5,100,1,256,
-1047,16,0,572,1,
-1261,1048,16,0,572,
-1,509,1049,16,0,
-572,1,1515,1050,16,
-0,572,1,2021,764,
-1,1775,1051,16,0,
-572,1,2029,771,1,
-2030,777,1,2031,782,
-1,2032,787,1,2033,
-792,1,277,1052,16,
-0,572,1,2035,798,
-1,2037,803,1,2039,
-808,1,32,1053,16,
-0,572,1,2041,814,
-1,2293,1054,16,0,
-572,1,2043,820,1,
-2045,825,1,40,1055,
-16,0,185,1,41,
-1056,16,0,572,1,
-1297,1057,16,0,572,
-1,43,1058,16,0,
-572,1,44,1059,16,
-0,185,1,1803,833,
-1,1804,1060,16,0,
-572,1,299,1061,16,
-0,572,1,47,1062,
-16,0,179,1,52,
-1063,16,0,572,1,
-2318,1064,16,0,572,
-1,63,1065,16,0,
-200,1,66,1066,16,
-0,198,1,2075,1067,
-16,0,572,1,1574,
-845,1,71,1068,16,
-0,572,1,76,1069,
-16,0,572,1,1834,
-1070,16,0,572,1,
-2337,1071,16,0,572,
-1,79,1072,16,0,
-572,1,1335,1073,16,
-0,572,1,322,1074,
-16,0,572,1,85,
-1075,16,0,572,1,
-89,1076,16,0,572,
-1,346,1077,16,0,
-572,1,97,1078,16,
-0,572,1,2106,1079,
-16,0,572,1,102,
-1080,16,0,572,1,
-1860,867,1,2364,873,
-1,1114,1081,16,0,
-179,1,112,1082,16,
-0,572,1,1117,1083,
-16,0,572,1,1873,
-881,1,1876,1084,16,
-0,572,1,124,1085,
-16,0,572,1,2136,
-888,1,381,1086,16,
-0,572,1,525,1087,
-16,0,572,1,137,
-1088,16,0,572,1,
-1901,1089,16,0,572,
-1,1153,1090,16,0,
-572,1,151,1091,16,
-0,572,1,1407,1092,
-16,0,572,1,1659,
-1093,16,0,572,1,
-2413,1094,16,0,572,
-1,406,1095,16,0,
-572,1,1371,1096,16,
-0,572,1,2105,860,
-1,166,1097,16,0,
-572,1,1622,1098,16,
-0,572,1,1931,906,
-1,1933,1099,16,0,
-572,1,431,1100,16,
-0,572,1,1585,1101,
-16,0,572,1,182,
-1102,16,0,572,1,
-1189,1103,16,0,572,
-1,1443,1104,16,0,
-572,1,1695,1105,16,
-0,572,1,2198,1106,
-16,0,572,1,2702,
-1107,16,0,572,1,
-447,1108,16,0,572,
-1,2458,922,1,2459,
-928,1,1958,1109,16,
-0,572,1,2462,935,
-1,1657,940,1,2464,
-945,1,199,1110,16,
-0,572,1,459,1111,
-16,0,572,1,462,
-1112,16,0,572,1,
-217,1113,16,0,572,
-1,2227,954,1,1225,
-1114,16,0,572,1,
-1479,1115,16,0,572,
-1,1731,1116,16,0,
-572,1,1989,962,1,
-1990,1117,16,0,572,
-1,236,1118,16,0,
-572,1,1756,1119,16,
-0,572,1,6,1120,
-19,279,1,6,1121,
-5,2,1,1114,1122,
-16,0,277,1,40,
-1123,16,0,561,1,
-7,1124,19,244,1,
-7,1125,5,2,1,
-1114,1126,16,0,242,
-1,40,1127,16,0,
-505,1,8,1128,19,
-207,1,8,1129,5,
-2,1,1114,1130,16,
-0,205,1,40,1131,
-16,0,471,1,9,
-1132,19,213,1,9,
-1133,5,2,1,1114,
-1134,16,0,211,1,
-40,1135,16,0,398,
-1,10,1136,19,164,
-1,10,1137,5,2,
-1,1114,1138,16,0,
-162,1,40,1139,16,
-0,340,1,11,1140,
-19,192,1,11,1141,
-5,146,1,1260,1142,
-17,1143,15,1144,4,
-34,37,0,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-1,-1,1,5,1145,
-20,1146,4,38,83,
+194,1,3,1,3,
+1,2,967,22,1,
+40,1,199,968,16,
+0,676,1,459,969,
+16,0,676,1,462,
+970,16,0,676,1,
+217,971,16,0,676,
+1,2227,972,17,973,
+15,927,1,-1,1,
+5,974,20,975,4,
+32,87,0,104,0,
+105,0,108,0,101,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,95,
+0,50,0,1,221,
+1,3,1,6,1,
+5,976,22,1,67,
+1,1225,977,16,0,
+676,1,1479,978,16,
+0,676,1,1731,979,
+16,0,676,1,1989,
+980,17,981,15,784,
+1,-1,1,5,982,
+20,983,4,26,73,
+0,102,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,49,0,
+1,216,1,3,1,
+6,1,5,984,22,
+1,62,1,1990,985,
+16,0,676,1,236,
+986,16,0,676,1,
+1756,987,16,0,676,
+1,4,988,19,187,
+1,4,989,5,100,
+1,256,990,16,0,
+587,1,1261,991,16,
+0,587,1,509,992,
+16,0,587,1,1515,
+993,16,0,587,1,
+2021,782,1,1775,994,
+16,0,587,1,2029,
+789,1,2030,795,1,
+2031,800,1,2032,805,
+1,2033,810,1,277,
+995,16,0,587,1,
+2035,816,1,2037,821,
+1,2039,826,1,32,
+996,16,0,587,1,
+2041,832,1,2293,997,
+16,0,587,1,2043,
+838,1,2045,843,1,
+40,998,16,0,189,
+1,41,999,16,0,
+587,1,1297,1000,16,
+0,587,1,43,1001,
+16,0,587,1,44,
+1002,16,0,189,1,
+1803,851,1,1804,1003,
+16,0,587,1,299,
+1004,16,0,587,1,
+47,1005,16,0,185,
+1,52,1006,16,0,
+587,1,2318,1007,16,
+0,587,1,63,1008,
+16,0,208,1,66,
+1009,16,0,206,1,
+2075,1010,16,0,587,
+1,1574,863,1,71,
+1011,16,0,587,1,
+76,1012,16,0,587,
+1,1834,1013,16,0,
+587,1,2337,1014,16,
+0,587,1,79,1015,
+16,0,587,1,1335,
+1016,16,0,587,1,
+322,1017,16,0,587,
+1,85,1018,16,0,
+587,1,89,1019,16,
+0,587,1,346,1020,
+16,0,587,1,97,
+1021,16,0,587,1,
+2106,1022,16,0,587,
+1,102,1023,16,0,
+587,1,1860,885,1,
+2364,891,1,1114,1024,
+16,0,185,1,112,
+1025,16,0,587,1,
+1117,1026,16,0,587,
+1,1873,899,1,1876,
+1027,16,0,587,1,
+124,1028,16,0,587,
+1,2136,906,1,2718,
+1029,16,0,587,1,
+381,1030,16,0,587,
+1,525,1031,16,0,
+587,1,137,1032,16,
+0,587,1,1901,1033,
+16,0,587,1,1153,
+1034,16,0,587,1,
+151,1035,16,0,587,
+1,1407,1036,16,0,
+587,1,1659,1037,16,
+0,587,1,2413,1038,
+16,0,587,1,406,
+1039,16,0,587,1,
+1371,1040,16,0,587,
+1,2105,878,1,166,
+1041,16,0,587,1,
+1622,1042,16,0,587,
+1,1931,925,1,1933,
+1043,16,0,587,1,
+431,1044,16,0,587,
+1,1585,1045,16,0,
+587,1,182,1046,16,
+0,587,1,1189,1047,
+16,0,587,1,1443,
+1048,16,0,587,1,
+1695,1049,16,0,587,
+1,2198,1050,16,0,
+587,1,447,1051,16,
+0,587,1,2458,940,
+1,2459,946,1,1958,
+1052,16,0,587,1,
+2462,953,1,1657,958,
+1,2464,963,1,199,
+1053,16,0,587,1,
+459,1054,16,0,587,
+1,462,1055,16,0,
+587,1,217,1056,16,
+0,587,1,2227,972,
+1,1225,1057,16,0,
+587,1,1479,1058,16,
+0,587,1,1731,1059,
+16,0,587,1,1989,
+980,1,1990,1060,16,
+0,587,1,236,1061,
+16,0,587,1,1756,
+1062,16,0,587,1,
+5,1063,19,184,1,
+5,1064,5,100,1,
+256,1065,16,0,583,
+1,1261,1066,16,0,
+583,1,509,1067,16,
+0,583,1,1515,1068,
+16,0,583,1,2021,
+782,1,1775,1069,16,
+0,583,1,2029,789,
+1,2030,795,1,2031,
+800,1,2032,805,1,
+2033,810,1,277,1070,
+16,0,583,1,2035,
+816,1,2037,821,1,
+2039,826,1,32,1071,
+16,0,583,1,2041,
+832,1,2293,1072,16,
+0,583,1,2043,838,
+1,2045,843,1,40,
+1073,16,0,188,1,
+41,1074,16,0,583,
+1,1297,1075,16,0,
+583,1,43,1076,16,
+0,583,1,44,1077,
+16,0,188,1,1803,
+851,1,1804,1078,16,
+0,583,1,299,1079,
+16,0,583,1,47,
+1080,16,0,182,1,
+52,1081,16,0,583,
+1,2318,1082,16,0,
+583,1,63,1083,16,
+0,207,1,66,1084,
+16,0,205,1,2075,
+1085,16,0,583,1,
+1574,863,1,71,1086,
+16,0,583,1,76,
+1087,16,0,583,1,
+1834,1088,16,0,583,
+1,2337,1089,16,0,
+583,1,79,1090,16,
+0,583,1,1335,1091,
+16,0,583,1,322,
+1092,16,0,583,1,
+85,1093,16,0,583,
+1,89,1094,16,0,
+583,1,346,1095,16,
+0,583,1,97,1096,
+16,0,583,1,2106,
+1097,16,0,583,1,
+102,1098,16,0,583,
+1,1860,885,1,2364,
+891,1,1114,1099,16,
+0,182,1,112,1100,
+16,0,583,1,1117,
+1101,16,0,583,1,
+1873,899,1,1876,1102,
+16,0,583,1,124,
+1103,16,0,583,1,
+2136,906,1,2718,1104,
+16,0,583,1,381,
+1105,16,0,583,1,
+525,1106,16,0,583,
+1,137,1107,16,0,
+583,1,1901,1108,16,
+0,583,1,1153,1109,
+16,0,583,1,151,
+1110,16,0,583,1,
+1407,1111,16,0,583,
+1,1659,1112,16,0,
+583,1,2413,1113,16,
+0,583,1,406,1114,
+16,0,583,1,1371,
+1115,16,0,583,1,
+2105,878,1,166,1116,
+16,0,583,1,1622,
+1117,16,0,583,1,
+1931,925,1,1933,1118,
+16,0,583,1,431,
+1119,16,0,583,1,
+1585,1120,16,0,583,
+1,182,1121,16,0,
+583,1,1189,1122,16,
+0,583,1,1443,1123,
+16,0,583,1,1695,
+1124,16,0,583,1,
+2198,1125,16,0,583,
+1,447,1126,16,0,
+583,1,2458,940,1,
+2459,946,1,1958,1127,
+16,0,583,1,2462,
+953,1,1657,958,1,
+2464,963,1,199,1128,
+16,0,583,1,459,
+1129,16,0,583,1,
+462,1130,16,0,583,
+1,217,1131,16,0,
+583,1,2227,972,1,
+1225,1132,16,0,583,
+1,1479,1133,16,0,
+583,1,1731,1134,16,
+0,583,1,1989,980,
+1,1990,1135,16,0,
+583,1,236,1136,16,
+0,583,1,1756,1137,
+16,0,583,1,6,
+1138,19,281,1,6,
+1139,5,2,1,1114,
+1140,16,0,279,1,
+40,1141,16,0,572,
+1,7,1142,19,248,
+1,7,1143,5,2,
+1,1114,1144,16,0,
+246,1,40,1145,16,
+0,513,1,8,1146,
+19,214,1,8,1147,
+5,2,1,1114,1148,
+16,0,212,1,40,
+1149,16,0,474,1,
+9,1150,19,220,1,
+9,1151,5,2,1,
+1114,1152,16,0,218,
+1,40,1153,16,0,
+401,1,10,1154,19,
+167,1,10,1155,5,
+2,1,1114,1156,16,
+0,165,1,40,1157,
+16,0,338,1,11,
+1158,19,194,1,11,
+1159,5,146,1,1260,
+1160,17,1161,15,1162,
+4,34,37,0,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
 115,0,105,0,103,
 0,110,0,109,0,
 101,0,110,0,116,
-0,95,0,50,0,
-49,0,1,243,1,
-3,1,6,1,5,
-1147,22,1,93,1,
-1011,1148,17,1149,15,
-1150,4,44,37,0,
-80,0,97,0,114,
-0,101,0,110,0,
-116,0,104,0,101,
-0,115,0,105,0,
-115,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,1,-1,1,
-5,1151,20,1152,4,
-46,80,0,97,0,
-114,0,101,0,110,
-0,116,0,104,0,
-101,0,115,0,105,
-0,115,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-50,0,1,290,1,
-3,1,4,1,3,
-1153,22,1,140,1,
-1514,1154,17,1155,15,
-1144,1,-1,1,5,
-1156,20,1157,4,38,
+0,1,-1,1,5,
+1163,20,1164,4,38,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
 0,115,0,105,0,
 103,0,110,0,109,
 0,101,0,110,0,
-116,0,95,0,49,
-0,52,0,1,236,
-1,3,1,4,1,
-3,1158,22,1,86,
-1,9,1159,17,1160,
-15,1161,4,24,37,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,1,-1,
-1,5,1162,20,1163,
-4,26,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,95,
-0,49,0,1,182,
-1,3,1,3,1,
-2,1164,22,1,32,
-1,262,1165,17,1166,
-15,1167,4,34,37,
-0,66,0,105,0,
-110,0,97,0,114,
-0,121,0,69,0,
+116,0,95,0,50,
+0,49,0,1,252,
+1,3,1,6,1,
+5,1165,22,1,98,
+1,1011,1166,17,1167,
+15,1168,4,44,37,
+0,80,0,97,0,
+114,0,101,0,110,
+0,116,0,104,0,
+101,0,115,0,105,
+0,115,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,1,-1,
-1,5,1168,20,1169,
-4,36,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
+1,5,1169,20,1170,
+4,46,80,0,97,
+0,114,0,101,0,
+110,0,116,0,104,
+0,101,0,115,0,
+105,0,115,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,53,0,1,272,
+0,50,0,1,299,
 1,3,1,4,1,
-3,1170,22,1,122,
-1,1267,1171,17,1172,
-15,1144,1,-1,1,
-5,1173,20,1174,4,
-36,83,0,105,0,
+3,1171,22,1,145,
+1,1514,1172,17,1173,
+15,1162,1,-1,1,
+5,1174,20,1175,4,
+38,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
 115,0,115,0,105,
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-56,0,1,230,1,
-3,1,6,1,5,
-1175,22,1,80,1,
-2021,764,1,1521,1176,
-17,1177,15,1144,1,
--1,1,5,1178,20,
-1179,4,36,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
+49,0,52,0,1,
+245,1,3,1,4,
+1,3,1176,22,1,
+91,1,9,1177,17,
+1178,15,1179,4,24,
+37,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,1,
+-1,1,5,1180,20,
+1181,4,26,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
 95,0,49,0,1,
-223,1,3,1,4,
-1,3,1180,22,1,
-73,1,2024,1181,17,
-1182,15,1183,4,24,
-37,0,83,0,116,
-0,97,0,116,0,
-101,0,67,0,104,
-0,97,0,110,0,
-103,0,101,0,1,
--1,1,5,1184,20,
-1185,4,26,83,0,
+190,1,3,1,3,
+1,2,1182,22,1,
+36,1,262,1183,17,
+1184,15,1185,4,34,
+37,0,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,1,
+-1,1,5,1186,20,
+1187,4,36,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,53,0,1,
+281,1,3,1,4,
+1,3,1188,22,1,
+127,1,1267,1189,17,
+1190,15,1162,1,-1,
+1,5,1191,20,1192,
+4,36,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,56,0,1,239,
+1,3,1,6,1,
+5,1193,22,1,85,
+1,2021,782,1,1521,
+1194,17,1195,15,1162,
+1,-1,1,5,1196,
+20,1197,4,36,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
+101,0,110,0,116,
+0,95,0,49,0,
+1,232,1,3,1,
+4,1,3,1198,22,
+1,78,1,2024,1199,
+17,1200,15,1201,4,
+24,37,0,83,0,
 116,0,97,0,116,
 0,101,0,67,0,
 104,0,97,0,110,
 0,103,0,101,0,
-95,0,49,0,1,
-205,1,3,1,3,
-1,2,1186,22,1,
-55,1,1775,1187,17,
-1188,15,1189,4,30,
-37,0,69,0,109,
-0,112,0,116,0,
-121,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-1,-1,1,5,1190,
-20,1191,4,32,69,
-0,109,0,112,0,
-116,0,121,0,83,
+1,-1,1,5,1202,
+20,1203,4,26,83,
 0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,1,189,1,3,
-1,1,1,0,1192,
-22,1,39,1,19,
-1193,17,1160,1,2,
-1164,1,2028,1194,17,
-1195,15,1196,4,20,
-37,0,74,0,117,
-0,109,0,112,0,
-76,0,97,0,98,
-0,101,0,108,0,
-1,-1,1,5,1197,
-20,1198,4,22,74,
-0,117,0,109,0,
-112,0,76,0,97,
-0,98,0,101,0,
-108,0,95,0,49,
-0,1,203,1,3,
-1,3,1,2,1199,
-22,1,53,1,2029,
-771,1,2281,1200,17,
-1201,15,1202,4,34,
-37,0,70,0,111,
-0,114,0,76,0,
-111,0,111,0,112,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,1,
--1,1,5,1203,20,
-1204,4,36,70,0,
+116,0,101,0,67,
+0,104,0,97,0,
+110,0,103,0,101,
+0,95,0,49,0,
+1,214,1,3,1,
+3,1,2,1204,22,
+1,60,1,1775,1205,
+17,1206,15,1207,4,
+30,37,0,69,0,
+109,0,112,0,116,
+0,121,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,1,-1,1,5,
+1208,20,1209,4,32,
+69,0,109,0,112,
+0,116,0,121,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,1,198,1,
+3,1,1,1,0,
+1210,22,1,44,1,
+19,1211,17,1178,1,
+2,1182,1,2028,1212,
+17,1213,15,1214,4,
+20,37,0,74,0,
+117,0,109,0,112,
+0,76,0,97,0,
+98,0,101,0,108,
+0,1,-1,1,5,
+1215,20,1216,4,22,
+74,0,117,0,109,
+0,112,0,76,0,
+97,0,98,0,101,
+0,108,0,95,0,
+49,0,1,212,1,
+3,1,3,1,2,
+1217,22,1,58,1,
+2029,789,1,2281,1218,
+17,1219,15,1220,4,
+34,37,0,70,0,
 111,0,114,0,76,
 0,111,0,111,0,
 112,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-95,0,50,0,1,
-218,1,3,1,2,
-1,1,1205,22,1,
-68,1,2031,782,1,
-2032,787,1,2033,792,
-1,2034,1206,16,0,
-603,1,2035,798,1,
-2036,1207,16,0,562,
-1,2037,803,1,2038,
-1208,16,0,566,1,
-2039,808,1,32,1209,
-17,1188,1,0,1192,
-1,2041,814,1,2042,
-1210,16,0,674,1,
-2043,820,1,2044,1211,
-16,0,615,1,2045,
-825,1,2299,1212,16,
-0,229,1,1296,1213,
-17,1214,15,1144,1,
--1,1,5,1215,20,
-1216,4,38,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,50,0,48,
-0,1,242,1,3,
-1,6,1,5,1217,
-22,1,92,1,283,
-1218,17,1219,15,1167,
-1,-1,1,5,1220,
-20,1221,4,36,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,52,0,
-1,271,1,3,1,
-4,1,3,1222,22,
-1,121,1,40,1223,
-17,1224,15,1225,4,
-32,37,0,73,0,
-100,0,101,0,110,
-0,116,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,-1,
-1,5,1226,20,1227,
-4,34,73,0,100,
-0,101,0,110,0,
-116,0,69,0,120,
+1,-1,1,5,1221,
+20,1222,4,36,70,
+0,111,0,114,0,
+76,0,111,0,111,
+0,112,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,50,0,
+1,227,1,3,1,
+2,1,1,1223,22,
+1,73,1,2031,800,
+1,2032,805,1,2033,
+810,1,2034,1224,16,
+0,620,1,2035,816,
+1,2036,1225,16,0,
+573,1,2037,821,1,
+2038,1226,16,0,577,
+1,2039,826,1,32,
+1227,17,1206,1,0,
+1210,1,2041,832,1,
+2042,1228,16,0,702,
+1,2043,838,1,2044,
+1229,16,0,632,1,
+2045,843,1,2299,1230,
+16,0,234,1,1296,
+1231,17,1232,15,1162,
+1,-1,1,5,1233,
+20,1234,4,38,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
+101,0,110,0,116,
+0,95,0,50,0,
+48,0,1,251,1,
+3,1,6,1,5,
+1235,22,1,97,1,
+283,1236,17,1237,15,
+1185,1,-1,1,5,
+1238,20,1239,4,36,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,95,0,49,
-0,1,257,1,3,
-1,2,1,1,1228,
-22,1,107,1,44,
-1229,17,1224,1,1,
-1228,1,1803,833,1,
-47,1230,17,1231,15,
-1232,4,38,37,0,
-73,0,100,0,101,
-0,110,0,116,0,
-68,0,111,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,-1,1,5,
-1233,20,1234,4,40,
-73,0,100,0,101,
-0,110,0,116,0,
-68,0,111,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,49,0,
-1,258,1,3,1,
-4,1,3,1235,22,
-1,108,1,48,1236,
-17,1237,15,1238,4,
-58,37,0,73,0,
-110,0,99,0,114,
-0,101,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
-99,0,114,0,101,
-0,109,0,101,0,
+110,0,95,0,52,
+0,1,280,1,3,
+1,4,1,3,1240,
+22,1,126,1,40,
+1241,17,1242,15,1243,
+4,32,37,0,73,
+0,100,0,101,0,
 110,0,116,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,1,
--1,1,5,1239,20,
-1240,4,60,73,0,
-110,0,99,0,114,
-0,101,0,109,0,
+-1,1,5,1244,20,
+1245,4,34,73,0,
+100,0,101,0,110,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+49,0,1,266,1,
+3,1,2,1,1,
+1246,22,1,112,1,
+44,1247,17,1242,1,
+1,1246,1,1803,851,
+1,47,1248,17,1249,
+15,1250,4,38,37,
+0,73,0,100,0,
 101,0,110,0,116,
-0,68,0,101,0,
-99,0,114,0,101,
-0,109,0,101,0,
-110,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,52,0,1,262,
-1,3,1,5,1,
-4,1241,22,1,112,
-1,49,1242,17,1243,
-15,1238,1,-1,1,
-5,1244,20,1245,4,
-60,73,0,110,0,
-99,0,114,0,101,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-114,0,101,0,109,
-0,101,0,110,0,
+0,68,0,111,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,-1,1,
+5,1251,20,1252,4,
+40,73,0,100,0,
+101,0,110,0,116,
+0,68,0,111,0,
 116,0,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,95,0,51,
-0,1,261,1,3,
-1,5,1,4,1246,
-22,1,111,1,50,
-1247,17,1248,15,1238,
-1,-1,1,5,1249,
-20,1250,4,60,73,
+110,0,95,0,49,
+0,1,267,1,3,
+1,4,1,3,1253,
+22,1,113,1,48,
+1254,17,1255,15,1256,
+4,58,37,0,73,
 0,110,0,99,0,
 114,0,101,0,109,
 0,101,0,110,0,
@@ -4709,12 +4777,25 @@ public yyLSLSyntax
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,50,0,1,
-260,1,3,1,3,
-1,2,1251,22,1,
-110,1,51,1252,17,
-1253,15,1238,1,-1,
-1,5,1254,20,1255,
+1,-1,1,5,1257,
+20,1258,4,60,73,
+0,110,0,99,0,
+114,0,101,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
+0,99,0,114,0,
+101,0,109,0,101,
+0,110,0,116,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,52,0,1,
+271,1,3,1,5,
+1,4,1259,22,1,
+117,1,49,1260,17,
+1261,15,1256,1,-1,
+1,5,1262,20,1263,
 4,60,73,0,110,
 0,99,0,114,0,
 101,0,109,0,101,
@@ -4727,80 +4808,79 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,1,259,1,
-3,1,3,1,2,
-1256,22,1,109,1,
-305,1257,17,1258,15,
-1167,1,-1,1,5,
-1259,20,1260,4,36,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,51,
-0,1,270,1,3,
-1,4,1,3,1261,
-22,1,120,1,525,
-1262,17,1263,15,1264,
-4,34,37,0,82,
-0,111,0,116,0,
-97,0,116,0,105,
-0,111,0,110,0,
-67,0,111,0,110,
-0,115,0,116,0,
-97,0,110,0,116,
-0,1,-1,1,5,
-1265,20,1266,4,36,
+51,0,1,270,1,
+3,1,5,1,4,
+1264,22,1,116,1,
+50,1265,17,1266,15,
+1256,1,-1,1,5,
+1267,20,1268,4,60,
+73,0,110,0,99,
+0,114,0,101,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,114,
+0,101,0,109,0,
+101,0,110,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,50,0,
+1,269,1,3,1,
+3,1,2,1269,22,
+1,115,1,51,1270,
+17,1271,15,1256,1,
+-1,1,5,1272,20,
+1273,4,60,73,0,
+110,0,99,0,114,
+0,101,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,114,0,101,
+0,109,0,101,0,
+110,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,49,0,1,268,
+1,3,1,3,1,
+2,1274,22,1,114,
+1,305,1275,17,1276,
+15,1185,1,-1,1,
+5,1277,20,1278,4,
+36,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+51,0,1,279,1,
+3,1,4,1,3,
+1279,22,1,125,1,
+525,1280,17,1281,15,
+1282,4,34,37,0,
 82,0,111,0,116,
 0,97,0,116,0,
 105,0,111,0,110,
 0,67,0,111,0,
 110,0,115,0,116,
 0,97,0,110,0,
-116,0,95,0,49,
-0,1,255,1,3,
-1,10,1,9,1267,
-22,1,105,1,63,
-1268,17,1269,15,1270,
-4,38,37,0,84,
-0,121,0,112,0,
-101,0,99,0,97,
-0,115,0,116,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-1,-1,1,5,1271,
-20,1272,4,40,84,
-0,121,0,112,0,
-101,0,99,0,97,
-0,115,0,116,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,50,0,1,
-292,1,3,1,5,
-1,4,1273,22,1,
-142,1,66,1274,17,
-1275,15,1270,1,-1,
-1,5,1276,20,1277,
-4,40,84,0,121,
-0,112,0,101,0,
-99,0,97,0,115,
-0,116,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-51,0,1,293,1,
-3,1,7,1,6,
-1278,22,1,143,1,
-67,1279,17,1280,15,
-1270,1,-1,1,5,
-1281,20,1282,4,40,
+116,0,1,-1,1,
+5,1283,20,1284,4,
+36,82,0,111,0,
+116,0,97,0,116,
+0,105,0,111,0,
+110,0,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
+0,116,0,95,0,
+49,0,1,264,1,
+3,1,10,1,9,
+1285,22,1,110,1,
+63,1286,17,1287,15,
+1288,4,38,37,0,
 84,0,121,0,112,
 0,101,0,99,0,
 97,0,115,0,116,
@@ -4808,13 +4888,22 @@ public yyLSLSyntax
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,55,0,
-1,297,1,3,1,
-8,1,7,1283,22,
-1,147,1,68,1284,
-17,1285,15,1270,1,
--1,1,5,1286,20,
-1287,4,40,84,0,
+0,1,-1,1,5,
+1289,20,1290,4,40,
+84,0,121,0,112,
+0,101,0,99,0,
+97,0,115,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,50,0,
+1,301,1,3,1,
+5,1,4,1291,22,
+1,147,1,66,1292,
+17,1293,15,1288,1,
+-1,1,5,1294,20,
+1295,4,40,84,0,
 121,0,112,0,101,
 0,99,0,97,0,
 115,0,116,0,69,
@@ -4822,12 +4911,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,53,0,1,295,
-1,3,1,8,1,
-7,1288,22,1,145,
-1,69,1289,17,1290,
-15,1270,1,-1,1,
-5,1291,20,1292,4,
+0,51,0,1,302,
+1,3,1,7,1,
+6,1296,22,1,148,
+1,67,1297,17,1298,
+15,1288,1,-1,1,
+5,1299,20,1300,4,
 40,84,0,121,0,
 112,0,101,0,99,
 0,97,0,115,0,
@@ -4835,13 +4924,13 @@ public yyLSLSyntax
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,95,0,54,
-0,1,296,1,3,
-1,6,1,5,1293,
-22,1,146,1,70,
-1294,17,1295,15,1270,
-1,-1,1,5,1296,
-20,1297,4,40,84,
+110,0,95,0,55,
+0,1,306,1,3,
+1,8,1,7,1301,
+22,1,152,1,68,
+1302,17,1303,15,1288,
+1,-1,1,5,1304,
+20,1305,4,40,84,
 0,121,0,112,0,
 101,0,99,0,97,
 0,115,0,116,0,
@@ -4849,12 +4938,12 @@ public yyLSLSyntax
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,52,0,1,
-294,1,3,1,6,
-1,5,1298,22,1,
-144,1,74,1299,17,
-1300,15,1270,1,-1,
-1,5,1301,20,1302,
+95,0,53,0,1,
+304,1,3,1,8,
+1,7,1306,22,1,
+150,1,69,1307,17,
+1308,15,1288,1,-1,
+1,5,1309,20,1310,
 4,40,84,0,121,
 0,112,0,101,0,
 99,0,97,0,115,
@@ -4863,352 +4952,356 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-57,0,1,299,1,
-3,1,7,1,6,
-1303,22,1,149,1,
-1013,1304,17,1305,15,
-1150,1,-1,1,5,
-1306,20,1307,4,46,
-80,0,97,0,114,
-0,101,0,110,0,
-116,0,104,0,101,
-0,115,0,105,0,
-115,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,1,289,1,3,
-1,4,1,3,1308,
-22,1,139,1,1332,
-1309,17,1310,15,1144,
-1,-1,1,5,1311,
-20,1312,4,38,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,49,0,
-57,0,1,241,1,
+54,0,1,305,1,
 3,1,6,1,5,
-1313,22,1,91,1,
-2337,1314,17,1188,1,
-0,1192,1,1585,1315,
-17,1316,15,1317,4,
-32,37,0,82,0,
+1311,22,1,151,1,
+70,1312,17,1313,15,
+1288,1,-1,1,5,
+1314,20,1315,4,40,
+84,0,121,0,112,
+0,101,0,99,0,
+97,0,115,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,52,0,
+1,303,1,3,1,
+6,1,5,1316,22,
+1,149,1,74,1317,
+17,1318,15,1288,1,
+-1,1,5,1319,20,
+1320,4,40,84,0,
+121,0,112,0,101,
+0,99,0,97,0,
+115,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,57,0,1,308,
+1,3,1,7,1,
+6,1321,22,1,154,
+1,1013,1322,17,1323,
+15,1168,1,-1,1,
+5,1324,20,1325,4,
+46,80,0,97,0,
+114,0,101,0,110,
+0,116,0,104,0,
+101,0,115,0,105,
+0,115,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+49,0,1,298,1,
+3,1,4,1,3,
+1326,22,1,144,1,
+1332,1327,17,1328,15,
+1162,1,-1,1,5,
+1329,20,1330,4,38,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,49,
+0,57,0,1,250,
+1,3,1,6,1,
+5,1331,22,1,96,
+1,2337,1332,17,1206,
+1,0,1210,1,1585,
+1333,17,1334,15,1335,
+4,32,37,0,82,
+0,101,0,116,0,
+117,0,114,0,110,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,1,
+-1,1,5,1336,20,
+1337,4,34,82,0,
 101,0,116,0,117,
 0,114,0,110,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
-0,116,0,1,-1,
-1,5,1318,20,1319,
-4,34,82,0,101,
-0,116,0,117,0,
-114,0,110,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,50,
-0,1,248,1,3,
-1,2,1,1,1320,
-22,1,98,1,2023,
-1321,17,1322,15,1183,
-1,-1,1,5,1323,
-20,1324,4,26,83,
-0,116,0,97,0,
-116,0,101,0,67,
-0,104,0,97,0,
-110,0,103,0,101,
-0,95,0,50,0,
-1,206,1,3,1,
-3,1,2,1325,22,
-1,56,1,2136,888,
-1,82,1326,17,1327,
-15,1328,4,32,37,
-0,85,0,110,0,
+0,116,0,95,0,
+50,0,1,257,1,
+3,1,2,1,1,
+1338,22,1,103,1,
+2023,1339,17,1340,15,
+1201,1,-1,1,5,
+1341,20,1342,4,26,
+83,0,116,0,97,
+0,116,0,101,0,
+67,0,104,0,97,
+0,110,0,103,0,
+101,0,95,0,50,
+0,1,215,1,3,
+1,3,1,2,1343,
+22,1,61,1,2136,
+906,1,82,1344,17,
+1345,15,1346,4,32,
+37,0,85,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,-1,1,
+5,1347,20,1348,4,
+34,85,0,110,0,
 97,0,114,0,121,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,1,-1,1,5,
-1329,20,1330,4,34,
-85,0,110,0,97,
+0,95,0,51,0,
+1,297,1,3,1,
+3,1,2,1349,22,
+1,143,1,2026,1350,
+17,1351,15,1352,4,
+28,37,0,74,0,
+117,0,109,0,112,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,1,
+-1,1,5,1353,20,
+1354,4,30,74,0,
+117,0,109,0,112,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,95,
+0,49,0,1,213,
+1,3,1,3,1,
+2,1355,22,1,59,
+1,1591,1356,17,1357,
+15,1335,1,-1,1,
+5,1358,20,1359,4,
+34,82,0,101,0,
+116,0,117,0,114,
+0,110,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,49,0,
+1,256,1,3,1,
+3,1,2,1360,22,
+1,102,1,1341,1361,
+17,1362,15,1162,1,
+-1,1,5,1363,20,
+1364,4,36,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+95,0,54,0,1,
+237,1,3,1,4,
+1,3,1365,22,1,
+83,1,2030,795,1,
+328,1366,17,1367,15,
+1185,1,-1,1,5,
+1368,20,1369,4,36,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,50,
+0,1,278,1,3,
+1,4,1,3,1370,
+22,1,124,1,1303,
+1371,17,1372,15,1162,
+1,-1,1,5,1373,
+20,1374,4,36,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
+101,0,110,0,116,
+0,95,0,55,0,
+1,238,1,3,1,
+6,1,5,1375,22,
+1,84,1,1096,1376,
+17,1377,15,1378,4,
+26,37,0,70,0,
+117,0,110,0,99,
+0,116,0,105,0,
+111,0,110,0,67,
+0,97,0,108,0,
+108,0,1,-1,1,
+5,1379,20,1380,4,
+28,70,0,117,0,
+110,0,99,0,116,
+0,105,0,111,0,
+110,0,67,0,97,
+0,108,0,108,0,
+95,0,49,0,1,
+309,1,3,1,5,
+1,4,1381,22,1,
+155,1,93,1382,17,
+1383,15,1346,1,-1,
+1,5,1384,20,1385,
+4,34,85,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,50,
+0,1,296,1,3,
+1,3,1,2,1386,
+22,1,142,1,1550,
+1387,17,1388,15,1162,
+1,-1,1,5,1389,
+20,1390,4,38,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
+101,0,110,0,116,
+0,95,0,49,0,
+51,0,1,244,1,
+3,1,4,1,3,
+1391,22,1,90,1,
+2040,1392,16,0,581,
+1,2106,1393,17,1206,
+1,0,1210,1,1555,
+1394,16,0,658,1,
+827,1395,17,1396,15,
+1185,1,-1,1,5,
+1397,20,1398,4,38,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,49,
+0,53,0,1,291,
+1,3,1,4,1,
+3,1399,22,1,137,
+1,1859,1400,16,0,
+317,1,1860,885,1,
+1804,1401,17,1206,1,
+0,1210,1,107,1402,
+17,1403,15,1346,1,
+-1,1,5,1404,20,
+1405,4,34,85,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+49,0,1,295,1,
+3,1,3,1,2,
+1406,22,1,141,1,
+1114,1407,17,1249,1,
+3,1253,1,1048,1408,
+17,1409,15,1185,1,
+-1,1,5,1410,20,
+1411,4,38,66,0,
+105,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,51,0,1,
-288,1,3,1,3,
-1,2,1331,22,1,
-138,1,2026,1332,17,
-1333,15,1334,4,28,
-37,0,74,0,117,
-0,109,0,112,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,1,-1,
-1,5,1335,20,1336,
-4,30,74,0,117,
-0,109,0,112,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,1,204,1,
-3,1,3,1,2,
-1337,22,1,54,1,
-1591,1338,17,1339,15,
-1317,1,-1,1,5,
-1340,20,1341,4,34,
-82,0,101,0,116,
-0,117,0,114,0,
-110,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,1,
-247,1,3,1,3,
-1,2,1342,22,1,
-97,1,1341,1343,17,
-1344,15,1144,1,-1,
-1,5,1345,20,1346,
-4,36,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,54,0,1,228,
-1,3,1,4,1,
-3,1347,22,1,78,
-1,2030,777,1,328,
-1348,17,1349,15,1167,
-1,-1,1,5,1350,
-20,1351,4,36,66,
+95,0,49,0,56,
+0,1,294,1,3,
+1,4,1,3,1412,
+22,1,140,1,352,
+1413,17,1414,15,1185,
+1,-1,1,5,1415,
+20,1416,4,36,66,
 0,105,0,110,0,
 97,0,114,0,121,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,50,0,
-1,269,1,3,1,
-4,1,3,1352,22,
-1,119,1,1303,1353,
-17,1354,15,1144,1,
--1,1,5,1355,20,
-1356,4,36,83,0,
+0,95,0,49,0,
+1,277,1,3,1,
+4,1,3,1417,22,
+1,123,1,1872,1418,
+16,0,327,1,1873,
+899,1,118,1419,17,
+1420,15,1185,1,-1,
+1,5,1421,20,1422,
+4,38,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,49,0,52,0,
+1,290,1,3,1,
+4,1,3,1423,22,
+1,136,1,1123,1424,
+17,1425,15,1162,1,
+-1,1,5,1426,20,
+1427,4,38,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,55,0,1,
-229,1,3,1,6,
-1,5,1357,22,1,
-79,1,1096,1358,17,
-1359,15,1360,4,26,
-37,0,70,0,117,
+95,0,49,0,50,
+0,1,243,1,3,
+1,6,1,5,1428,
+22,1,89,1,371,
+1429,17,1430,15,1431,
+4,46,37,0,70,
+0,117,0,110,0,
+99,0,116,0,105,
+0,111,0,110,0,
+67,0,97,0,108,
+0,108,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,-1,
+1,5,1432,20,1433,
+4,48,70,0,117,
 0,110,0,99,0,
 116,0,105,0,111,
 0,110,0,67,0,
 97,0,108,0,108,
-0,1,-1,1,5,
-1361,20,1362,4,28,
-70,0,117,0,110,
-0,99,0,116,0,
-105,0,111,0,110,
-0,67,0,97,0,
-108,0,108,0,95,
-0,49,0,1,300,
-1,3,1,5,1,
-4,1363,22,1,150,
-1,93,1364,17,1365,
-15,1328,1,-1,1,
-5,1366,20,1367,4,
-34,85,0,110,0,
-97,0,114,0,121,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,50,0,
-1,287,1,3,1,
-3,1,2,1368,22,
-1,137,1,1550,1369,
-17,1370,15,1144,1,
--1,1,5,1371,20,
-1372,4,38,83,0,
+0,95,0,49,0,
+1,276,1,3,1,
+2,1,1,1434,22,
+1,122,1,1377,1435,
+17,1436,15,1162,1,
+-1,1,5,1437,20,
+1438,4,36,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,49,0,51,
-0,1,235,1,3,
-1,4,1,3,1373,
-22,1,85,1,2040,
-1374,16,0,570,1,
-2106,1375,17,1188,1,
-0,1192,1,1555,1376,
-16,0,636,1,827,
-1377,17,1378,15,1167,
-1,-1,1,5,1379,
-20,1380,4,38,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,49,0,
-53,0,1,282,1,
-3,1,4,1,3,
-1381,22,1,132,1,
-1859,1382,16,0,314,
-1,1860,867,1,1804,
-1383,17,1188,1,0,
-1192,1,107,1384,17,
-1385,15,1328,1,-1,
-1,5,1386,20,1387,
-4,34,85,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,1,286,1,3,
-1,3,1,2,1388,
-22,1,136,1,1114,
-1389,17,1231,1,3,
-1235,1,2701,1390,16,
-0,255,1,352,1391,
-17,1392,15,1167,1,
--1,1,5,1393,20,
-1394,4,36,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,49,0,1,
-268,1,3,1,4,
-1,3,1395,22,1,
-118,1,1872,1396,16,
-0,324,1,1873,881,
-1,118,1397,17,1398,
-15,1167,1,-1,1,
-5,1399,20,1400,4,
-38,66,0,105,0,
-110,0,97,0,114,
-0,121,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-49,0,52,0,1,
-281,1,3,1,4,
-1,3,1401,22,1,
-131,1,1123,1402,17,
-1403,15,1144,1,-1,
-1,5,1404,20,1405,
-4,38,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,50,0,
-1,234,1,3,1,
-6,1,5,1406,22,
-1,84,1,371,1407,
-17,1408,15,1409,4,
-46,37,0,70,0,
-117,0,110,0,99,
-0,116,0,105,0,
-111,0,110,0,67,
-0,97,0,108,0,
-108,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,1,-1,1,
-5,1410,20,1411,4,
-48,70,0,117,0,
-110,0,99,0,116,
-0,105,0,111,0,
-110,0,67,0,97,
-0,108,0,108,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,49,0,1,
-267,1,3,1,2,
-1,1,1412,22,1,
-117,1,1377,1413,17,
-1414,15,1144,1,-1,
-1,5,1415,20,1416,
-4,36,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,53,0,1,227,
-1,3,1,4,1,
-3,1417,22,1,77,
-1,375,1418,17,1419,
-15,1238,1,-1,1,
-5,1420,20,1421,4,
-60,73,0,110,0,
-99,0,114,0,101,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-114,0,101,0,109,
-0,101,0,110,0,
-116,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,56,
-0,1,266,1,3,
-1,5,1,4,1422,
-22,1,116,1,377,
-1423,17,1424,15,1238,
-1,-1,1,5,1425,
-20,1426,4,60,73,
-0,110,0,99,0,
-114,0,101,0,109,
-0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,114,0,
-101,0,109,0,101,
-0,110,0,116,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
 95,0,53,0,1,
-263,1,3,1,3,
-1,2,1427,22,1,
-113,1,379,1428,17,
-1429,15,1238,1,-1,
-1,5,1430,20,1431,
+236,1,3,1,4,
+1,3,1439,22,1,
+82,1,375,1440,17,
+1441,15,1256,1,-1,
+1,5,1442,20,1443,
 4,60,73,0,110,
 0,99,0,114,0,
 101,0,109,0,101,
@@ -5221,64 +5314,30 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-55,0,1,265,1,
+56,0,1,275,1,
 3,1,5,1,4,
-1432,22,1,115,1,
-380,1433,17,1434,15,
-1435,4,38,37,0,
-67,0,111,0,110,
-0,115,0,116,0,
-97,0,110,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,-1,1,5,
-1436,20,1437,4,40,
-67,0,111,0,110,
-0,115,0,116,0,
-97,0,110,0,116,
+1444,22,1,121,1,
+377,1445,17,1446,15,
+1256,1,-1,1,5,
+1447,20,1448,4,60,
+73,0,110,0,99,
+0,114,0,101,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,114,
+0,101,0,109,0,
+101,0,110,0,116,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,49,0,
-1,256,1,3,1,
-2,1,1,1438,22,
-1,106,1,883,1439,
-17,1440,15,1167,1,
--1,1,5,1441,20,
-1442,4,38,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,49,0,54,
-0,1,283,1,3,
-1,4,1,3,1443,
-22,1,133,1,1628,
-1444,17,1445,15,1446,
-4,22,37,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,1,
--1,1,5,1447,20,
-1448,4,24,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,1,221,1,
-3,1,4,1,3,
-1449,22,1,71,1,
-2075,1450,17,1188,1,
-0,1192,1,373,1451,
-17,1452,15,1238,1,
--1,1,5,1453,20,
-1454,4,60,73,0,
+0,95,0,53,0,
+1,272,1,3,1,
+3,1,2,1449,22,
+1,118,1,379,1450,
+17,1451,15,1256,1,
+-1,1,5,1452,20,
+1453,4,60,73,0,
 110,0,99,0,114,
 0,101,0,109,0,
 101,0,110,0,116,
@@ -5290,25 +5349,81 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,54,0,1,264,
-1,3,1,3,1,
-2,1455,22,1,114,
-1,130,1456,17,1457,
-15,1167,1,-1,1,
+0,55,0,1,274,
+1,3,1,5,1,
+4,1454,22,1,120,
+1,380,1455,17,1456,
+15,1457,4,38,37,
+0,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,-1,1,
 5,1458,20,1459,4,
-38,66,0,105,0,
-110,0,97,0,114,
-0,121,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-49,0,51,0,1,
-280,1,3,1,4,
-1,3,1460,22,1,
-130,1,143,1461,17,
-1462,15,1167,1,-1,
-1,5,1463,20,1464,
+40,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,49,
+0,1,265,1,3,
+1,2,1,1,1460,
+22,1,111,1,883,
+1461,17,1462,15,1185,
+1,-1,1,5,1463,
+20,1464,4,38,66,
+0,105,0,110,0,
+97,0,114,0,121,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,49,0,
+54,0,1,292,1,
+3,1,4,1,3,
+1465,22,1,138,1,
+1628,1466,17,1467,15,
+1468,4,22,37,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+1,-1,1,5,1469,
+20,1470,4,24,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,49,0,1,230,
+1,3,1,4,1,
+3,1471,22,1,76,
+1,2075,1472,17,1206,
+1,0,1210,1,373,
+1473,17,1474,15,1256,
+1,-1,1,5,1475,
+20,1476,4,60,73,
+0,110,0,99,0,
+114,0,101,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
+0,99,0,114,0,
+101,0,109,0,101,
+0,110,0,116,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,54,0,1,
+273,1,3,1,3,
+1,2,1477,22,1,
+119,1,130,1478,17,
+1479,15,1185,1,-1,
+1,5,1480,20,1481,
 4,38,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
@@ -5316,27 +5431,27 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,49,0,50,0,
-1,279,1,3,1,
-4,1,3,1465,22,
-1,129,1,1901,1466,
-17,1188,1,0,1192,
-1,1048,1467,17,1468,
-15,1167,1,-1,1,
-5,1469,20,1470,4,
-38,66,0,105,0,
-110,0,97,0,114,
-0,121,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-49,0,56,0,1,
-285,1,3,1,4,
-1,3,1471,22,1,
-135,1,1152,1472,17,
-1473,15,1144,1,-1,
-1,5,1474,20,1475,
+0,49,0,51,0,
+1,289,1,3,1,
+4,1,3,1482,22,
+1,135,1,143,1483,
+17,1484,15,1185,1,
+-1,1,5,1485,20,
+1486,4,38,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,49,0,50,
+0,1,288,1,3,
+1,4,1,3,1487,
+22,1,134,1,1901,
+1488,17,1206,1,0,
+1210,1,1152,1489,17,
+1490,15,1162,1,-1,
+1,5,1491,20,1492,
 4,38,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -5345,12 +5460,12 @@ public yyLSLSyntax
 0,109,0,101,0,
 110,0,116,0,95,
 0,50,0,52,0,
-1,246,1,3,1,
-6,1,5,1476,22,
-1,96,1,1406,1477,
-17,1478,15,1144,1,
--1,1,5,1479,20,
-1480,4,38,83,0,
+1,255,1,3,1,
+6,1,5,1493,22,
+1,101,1,1406,1494,
+17,1495,15,1162,1,
+-1,1,5,1496,20,
+1497,4,38,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
@@ -5358,15 +5473,15 @@ public yyLSLSyntax
 110,0,109,0,101,
 0,110,0,116,0,
 95,0,49,0,55,
-0,1,239,1,3,
-1,4,1,3,1481,
-22,1,89,1,1659,
-1482,16,0,270,1,
-2413,1483,17,1188,1,
-0,1192,1,1159,1484,
-17,1485,15,1144,1,
--1,1,5,1486,20,
-1487,4,38,83,0,
+0,1,248,1,3,
+1,4,1,3,1498,
+22,1,94,1,1659,
+1499,16,0,270,1,
+2413,1500,17,1206,1,
+0,1210,1,1159,1501,
+17,1502,15,1162,1,
+-1,1,5,1503,20,
+1504,4,38,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
@@ -5374,12 +5489,12 @@ public yyLSLSyntax
 110,0,109,0,101,
 0,110,0,116,0,
 95,0,49,0,49,
-0,1,233,1,3,
-1,6,1,5,1488,
-22,1,83,1,157,
-1489,17,1490,15,1167,
-1,-1,1,5,1491,
-20,1492,4,38,66,
+0,1,242,1,3,
+1,6,1,5,1505,
+22,1,88,1,157,
+1506,17,1507,15,1185,
+1,-1,1,5,1508,
+20,1509,4,38,66,
 0,105,0,110,0,
 97,0,114,0,121,
 0,69,0,120,0,
@@ -5387,12 +5502,12 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,49,0,
-49,0,1,278,1,
+49,0,1,287,1,
 3,1,4,1,3,
-1493,22,1,128,1,
-1413,1494,17,1495,15,
-1144,1,-1,1,5,
-1496,20,1497,4,36,
+1510,22,1,133,1,
+1413,1511,17,1512,15,
+1162,1,-1,1,5,
+1513,20,1514,4,36,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
@@ -5400,12 +5515,12 @@ public yyLSLSyntax
 103,0,110,0,109,
 0,101,0,110,0,
 116,0,95,0,52,
-0,1,226,1,3,
-1,4,1,3,1498,
-22,1,76,1,1370,
-1499,17,1500,15,1144,
-1,-1,1,5,1501,
-20,1502,4,38,83,
+0,1,235,1,3,
+1,4,1,3,1515,
+22,1,81,1,1370,
+1516,17,1517,15,1162,
+1,-1,1,5,1518,
+20,1519,4,38,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
@@ -5413,12 +5528,12 @@ public yyLSLSyntax
 0,110,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-56,0,1,240,1,
+56,0,1,249,1,
 3,1,4,1,3,
-1503,22,1,90,1,
-1478,1504,17,1505,15,
-1144,1,-1,1,5,
-1506,20,1507,4,38,
+1520,22,1,95,1,
+1478,1521,17,1522,15,
+1162,1,-1,1,5,
+1523,20,1524,4,38,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
@@ -5426,24 +5541,24 @@ public yyLSLSyntax
 103,0,110,0,109,
 0,101,0,110,0,
 116,0,95,0,49,
-0,53,0,1,237,
+0,53,0,1,246,
 1,3,1,4,1,
-3,1508,22,1,87,
-1,1620,1509,17,1510,
-15,1446,1,-1,1,
-5,1511,20,1512,4,
+3,1525,22,1,92,
+1,1620,1526,17,1527,
+15,1468,1,-1,1,
+5,1528,20,1529,4,
 24,65,0,115,0,
 115,0,105,0,103,
 0,110,0,109,0,
 101,0,110,0,116,
 0,95,0,50,0,
-1,222,1,3,1,
-2,1,1,1513,22,
-1,72,1,1621,1514,
-16,0,714,1,1574,
-845,1,172,1515,17,
-1516,15,1167,1,-1,
-1,5,1517,20,1518,
+1,231,1,3,1,
+2,1,1,1530,22,
+1,77,1,1621,1531,
+16,0,726,1,1574,
+863,1,172,1532,17,
+1533,15,1185,1,-1,
+1,5,1534,20,1535,
 4,38,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
@@ -5452,12 +5567,12 @@ public yyLSLSyntax
 0,115,0,105,0,
 111,0,110,0,95,
 0,49,0,48,0,
-1,277,1,3,1,
-4,1,3,1519,22,
-1,127,1,1931,906,
-1,1665,1520,17,1521,
-15,1202,1,-1,1,
-5,1522,20,1523,4,
+1,286,1,3,1,
+4,1,3,1536,22,
+1,132,1,1931,925,
+1,1665,1537,17,1538,
+15,1220,1,-1,1,
+5,1539,20,1540,4,
 36,70,0,111,0,
 114,0,76,0,111,
 0,111,0,112,0,
@@ -5465,13 +5580,13 @@ public yyLSLSyntax
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,1,217,1,
+49,0,1,226,1,
 3,1,2,1,1,
-1524,22,1,67,1,
-2364,873,1,2105,860,
-1,1188,1525,17,1526,
-15,1144,1,-1,1,
-5,1527,20,1528,4,
+1541,22,1,72,1,
+2364,891,1,2105,878,
+1,1188,1542,17,1543,
+15,1162,1,-1,1,
+5,1544,20,1545,4,
 38,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
@@ -5480,11 +5595,11 @@ public yyLSLSyntax
 109,0,101,0,110,
 0,116,0,95,0,
 50,0,51,0,1,
-245,1,3,1,6,
-1,5,1529,22,1,
-95,1,1442,1530,17,
-1531,15,1144,1,-1,
-1,5,1532,20,1533,
+254,1,3,1,6,
+1,5,1546,22,1,
+100,1,1442,1547,17,
+1548,15,1162,1,-1,
+1,5,1549,20,1550,
 4,38,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -5493,13 +5608,13 @@ public yyLSLSyntax
 0,109,0,101,0,
 110,0,116,0,95,
 0,49,0,54,0,
-1,238,1,3,1,
-4,1,3,1534,22,
-1,88,1,1694,1535,
-16,0,190,1,942,
-1536,17,1537,15,1167,
-1,-1,1,5,1538,
-20,1539,4,38,66,
+1,247,1,3,1,
+4,1,3,1551,22,
+1,93,1,1694,1552,
+16,0,199,1,942,
+1553,17,1554,15,1185,
+1,-1,1,5,1555,
+20,1556,4,38,66,
 0,105,0,110,0,
 97,0,114,0,121,
 0,69,0,120,0,
@@ -5507,14 +5622,14 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,49,0,
-55,0,1,284,1,
+55,0,1,293,1,
 3,1,4,1,3,
-1540,22,1,134,1,
-2198,1541,17,1188,1,
-0,1192,1,1195,1542,
-17,1543,15,1144,1,
--1,1,5,1544,20,
-1545,4,38,83,0,
+1557,22,1,139,1,
+2198,1558,17,1206,1,
+0,1210,1,1195,1559,
+17,1560,15,1162,1,
+-1,1,5,1561,20,
+1562,4,38,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
@@ -5522,12 +5637,12 @@ public yyLSLSyntax
 110,0,109,0,101,
 0,110,0,116,0,
 95,0,49,0,48,
-0,1,232,1,3,
-1,6,1,5,1546,
-22,1,82,1,1449,
-1547,17,1548,15,1144,
-1,-1,1,5,1549,
-20,1550,4,36,83,
+0,1,241,1,3,
+1,6,1,5,1563,
+22,1,87,1,1449,
+1564,17,1565,15,1162,
+1,-1,1,5,1566,
+20,1567,4,36,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
@@ -5535,12 +5650,12 @@ public yyLSLSyntax
 0,110,0,109,0,
 101,0,110,0,116,
 0,95,0,51,0,
-1,225,1,3,1,
-4,1,3,1551,22,
-1,75,1,1701,1552,
-17,1553,15,1202,1,
--1,1,5,1554,20,
-1555,4,36,70,0,
+1,234,1,3,1,
+4,1,3,1568,22,
+1,80,1,1701,1569,
+17,1570,15,1220,1,
+-1,1,5,1571,20,
+1572,4,36,70,0,
 111,0,114,0,76,
 0,111,0,111,0,
 112,0,83,0,116,
@@ -5548,48 +5663,48 @@ public yyLSLSyntax
 101,0,109,0,101,
 0,110,0,116,0,
 95,0,51,0,1,
-219,1,3,1,4,
-1,3,1556,22,1,
-69,1,447,1557,17,
-1558,15,1559,4,30,
+228,1,3,1,4,
+1,3,1573,22,1,
+74,1,447,1574,17,
+1575,15,1576,4,30,
 37,0,86,0,101,
 0,99,0,116,0,
 111,0,114,0,67,
 0,111,0,110,0,
 115,0,116,0,97,
 0,110,0,116,0,
-1,-1,1,5,1560,
-20,1561,4,32,86,
+1,-1,1,5,1577,
+20,1578,4,32,86,
 0,101,0,99,0,
 116,0,111,0,114,
 0,67,0,111,0,
 110,0,115,0,116,
 0,97,0,110,0,
 116,0,95,0,49,
-0,1,254,1,3,
-1,8,1,7,1562,
-22,1,104,1,2708,
-1563,16,0,670,1,
-2458,922,1,2459,928,
-1,1958,1564,17,1188,
-1,0,1192,1,188,
-1565,17,1566,15,1167,
-1,-1,1,5,1567,
-20,1568,4,36,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,57,0,
-1,276,1,3,1,
-4,1,3,1569,22,
-1,126,1,2462,935,
-1,1657,940,1,2464,
-945,1,205,1570,17,
-1571,15,1167,1,-1,
-1,5,1572,20,1573,
+0,1,263,1,3,
+1,8,1,7,1579,
+22,1,109,1,2458,
+940,1,2459,946,1,
+1958,1580,17,1206,1,
+0,1210,1,188,1581,
+17,1582,15,1185,1,
+-1,1,5,1583,20,
+1584,4,36,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,57,0,1,
+285,1,3,1,4,
+1,3,1585,22,1,
+131,1,2462,953,1,
+1657,958,1,2464,963,
+1,2717,1586,16,0,
+192,1,205,1587,17,
+1588,15,1185,1,-1,
+1,5,1589,20,1590,
 4,36,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
@@ -5597,114 +5712,14 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,56,0,1,275,
+0,56,0,1,284,
 1,3,1,4,1,
-3,1574,22,1,125,
-1,2227,954,1,1224,
-1575,17,1576,15,1144,
-1,-1,1,5,1577,
-20,1578,4,38,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,50,0,
-50,0,1,244,1,
-3,1,6,1,5,
-1579,22,1,94,1,
-223,1580,17,1581,15,
-1167,1,-1,1,5,
-1582,20,1583,4,36,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,55,
-0,1,274,1,3,
-1,4,1,3,1584,
-22,1,124,1,1730,
-1585,17,1586,15,1202,
-1,-1,1,5,1587,
-20,1588,4,36,70,
-0,111,0,114,0,
-76,0,111,0,111,
-0,112,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,52,0,
-1,220,1,3,1,
-4,1,3,1589,22,
-1,70,1,476,1590,
-17,1591,15,1592,4,
-18,37,0,67,0,
-111,0,110,0,115,
-0,116,0,97,0,
-110,0,116,0,1,
--1,1,5,1593,20,
-1594,4,20,67,0,
-111,0,110,0,115,
-0,116,0,97,0,
-110,0,116,0,95,
-0,52,0,1,252,
-1,3,1,2,1,
-1,1595,22,1,102,
-1,477,1596,17,1597,
-15,1592,1,-1,1,
-5,1598,20,1599,4,
-20,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,95,0,51,
-0,1,251,1,3,
-1,2,1,1,1600,
-22,1,101,1,1231,
-1601,17,1602,15,1144,
-1,-1,1,5,1603,
-20,1604,4,36,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,57,0,
-1,231,1,3,1,
-6,1,5,1605,22,
-1,81,1,479,1606,
-17,1607,15,1592,1,
--1,1,5,1608,20,
-1609,4,20,67,0,
-111,0,110,0,115,
-0,116,0,97,0,
-110,0,116,0,95,
-0,49,0,1,249,
-1,3,1,2,1,
-1,1610,22,1,99,
-1,480,1611,17,1612,
-15,1613,4,26,37,
-0,76,0,105,0,
-115,0,116,0,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-1,-1,1,5,1614,
-20,1615,4,28,76,
-0,105,0,115,0,
-116,0,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,95,0,
-49,0,1,253,1,
-3,1,4,1,3,
-1616,22,1,103,1,
-1485,1617,17,1618,15,
-1144,1,-1,1,5,
-1619,20,1620,4,36,
+3,1591,22,1,130,
+1,2724,1592,16,0,
+337,1,2227,972,1,
+1224,1593,17,1594,15,
+1162,1,-1,1,5,
+1595,20,1596,4,38,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
@@ -5712,15 +5727,12 @@ public yyLSLSyntax
 103,0,110,0,109,
 0,101,0,110,0,
 116,0,95,0,50,
-0,1,224,1,3,
-1,4,1,3,1621,
-22,1,74,1,1737,
-1622,16,0,272,1,
-1989,962,1,1990,1623,
-17,1188,1,0,1192,
-1,242,1624,17,1625,
-15,1167,1,-1,1,
-5,1626,20,1627,4,
+0,50,0,1,253,
+1,3,1,6,1,
+5,1597,22,1,99,
+1,223,1598,17,1599,
+15,1185,1,-1,1,
+5,1600,20,1601,4,
 36,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
@@ -5728,301 +5740,449 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-54,0,1,273,1,
+55,0,1,283,1,
 3,1,4,1,3,
-1628,22,1,123,1,
-478,1629,17,1630,15,
-1592,1,-1,1,5,
-1631,20,1632,4,20,
+1602,22,1,129,1,
+1730,1603,17,1604,15,
+1220,1,-1,1,5,
+1605,20,1606,4,36,
+70,0,111,0,114,
+0,76,0,111,0,
+111,0,112,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,52,
+0,1,229,1,3,
+1,4,1,3,1607,
+22,1,75,1,476,
+1608,17,1609,15,1610,
+4,18,37,0,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+1,-1,1,5,1611,
+20,1612,4,20,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+95,0,52,0,1,
+261,1,3,1,2,
+1,1,1613,22,1,
+107,1,477,1614,17,
+1615,15,1610,1,-1,
+1,5,1616,20,1617,
+4,20,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
+0,116,0,95,0,
+51,0,1,260,1,
+3,1,2,1,1,
+1618,22,1,106,1,
+1231,1619,17,1620,15,
+1162,1,-1,1,5,
+1621,20,1622,4,36,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,57,
+0,1,240,1,3,
+1,6,1,5,1623,
+22,1,86,1,479,
+1624,17,1625,15,1610,
+1,-1,1,5,1626,
+20,1627,4,20,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+95,0,49,0,1,
+258,1,3,1,2,
+1,1,1628,22,1,
+104,1,480,1629,17,
+1630,15,1631,4,26,
+37,0,76,0,105,
+0,115,0,116,0,
 67,0,111,0,110,
 0,115,0,116,0,
 97,0,110,0,116,
-0,95,0,50,0,
-1,250,1,3,1,
-2,1,1,1633,22,
-1,100,1,1001,1634,
-17,1635,15,1270,1,
--1,1,5,1636,20,
-1637,4,40,84,0,
-121,0,112,0,101,
-0,99,0,97,0,
-115,0,116,0,69,
+0,1,-1,1,5,
+1632,20,1633,4,28,
+76,0,105,0,115,
+0,116,0,67,0,
+111,0,110,0,115,
+0,116,0,97,0,
+110,0,116,0,95,
+0,49,0,1,262,
+1,3,1,4,1,
+3,1634,22,1,108,
+1,1485,1635,17,1636,
+15,1162,1,-1,1,
+5,1637,20,1638,4,
+36,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+50,0,1,233,1,
+3,1,4,1,3,
+1639,22,1,79,1,
+1737,1640,16,0,272,
+1,1989,980,1,1990,
+1641,17,1206,1,0,
+1210,1,242,1642,17,
+1643,15,1185,1,-1,
+1,5,1644,20,1645,
+4,36,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,56,0,1,298,
-1,3,1,5,1,
-4,1638,22,1,148,
-1,1002,1639,17,1640,
-15,1270,1,-1,1,
-5,1641,20,1642,4,
-40,84,0,121,0,
-112,0,101,0,99,
-0,97,0,115,0,
-116,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,1,291,1,3,
-1,5,1,4,1643,
-22,1,141,1,12,
-1644,19,157,1,12,
-1645,5,46,1,1901,
-1646,16,0,155,1,
-2075,1647,16,0,155,
-1,1860,867,1,1803,
-833,1,1804,1648,16,
-0,155,1,2520,1649,
-16,0,155,1,2413,
-1650,16,0,155,1,
-2525,1651,16,0,155,
-1,1873,881,1,1657,
-940,1,1989,962,1,
-1990,1652,16,0,155,
-1,31,1653,16,0,
-155,1,32,1654,16,
-0,155,1,2540,1655,
-16,0,155,1,2105,
-860,1,2106,1656,16,
-0,155,1,2043,820,
-1,2227,954,1,2337,
-1657,16,0,155,1,
-2198,1658,16,0,155,
-1,2021,764,1,2458,
-922,1,2459,928,1,
-2462,935,1,2136,888,
-1,2464,945,1,2029,
-771,1,2030,777,1,
-2031,782,1,2032,787,
-1,2469,1659,16,0,
-499,1,2035,798,1,
-2364,873,1,2039,808,
-1,1931,906,1,2041,
-814,1,2697,1660,16,
-0,155,1,2045,825,
-1,2511,1661,16,0,
-155,1,2592,1662,16,
-0,625,1,1775,1663,
-16,0,155,1,2033,
-792,1,2037,803,1,
-1574,845,1,1958,1664,
-16,0,155,1,13,
-1665,19,487,1,13,
-1666,5,43,1,2513,
-1667,17,1668,15,1669,
-4,40,37,0,86,
-0,101,0,99,0,
-116,0,111,0,114,
-0,65,0,114,0,
-103,0,83,0,116,
-0,97,0,116,0,
-101,0,69,0,118,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,1670,20,1671,4,
-42,86,0,101,0,
-99,0,116,0,111,
-0,114,0,65,0,
-114,0,103,0,83,
-0,116,0,97,0,
-116,0,101,0,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,49,0,1,177,
-1,3,1,6,1,
-5,1672,22,1,26,
-1,1860,867,1,1803,
-833,1,2522,1673,17,
-1674,15,1675,4,34,
-37,0,73,0,110,
-0,116,0,65,0,
-114,0,103,0,83,
-0,116,0,97,0,
-116,0,101,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
--1,1,5,1676,20,
-1677,4,36,73,0,
-110,0,116,0,65,
+0,54,0,1,282,
+1,3,1,4,1,
+3,1646,22,1,128,
+1,478,1647,17,1648,
+15,1610,1,-1,1,
+5,1649,20,1650,4,
+20,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,95,0,50,
+0,1,259,1,3,
+1,2,1,1,1651,
+22,1,105,1,1001,
+1652,17,1653,15,1288,
+1,-1,1,5,1654,
+20,1655,4,40,84,
+0,121,0,112,0,
+101,0,99,0,97,
+0,115,0,116,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,56,0,1,
+307,1,3,1,5,
+1,4,1656,22,1,
+153,1,1002,1657,17,
+1658,15,1288,1,-1,
+1,5,1659,20,1660,
+4,40,84,0,121,
+0,112,0,101,0,
+99,0,97,0,115,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+49,0,1,300,1,
+3,1,5,1,4,
+1661,22,1,146,1,
+12,1662,19,160,1,
+12,1663,5,47,1,
+1901,1664,16,0,158,
+1,2075,1665,16,0,
+158,1,1860,885,1,
+1803,851,1,1804,1666,
+16,0,158,1,2520,
+1667,16,0,158,1,
+2413,1668,16,0,158,
+1,2198,1669,16,0,
+158,1,1657,958,1,
+1873,899,1,2529,1670,
+16,0,158,1,2534,
+1671,16,0,158,1,
+1990,1672,16,0,158,
+1,31,1673,16,0,
+158,1,32,1674,16,
+0,158,1,2105,878,
+1,2106,1675,16,0,
+158,1,2549,1676,16,
+0,158,1,2604,1677,
+16,0,288,1,2227,
+972,1,2337,1678,16,
+0,158,1,2021,782,
+1,2458,940,1,2459,
+946,1,2462,953,1,
+2136,906,1,2464,963,
+1,2029,789,1,2030,
+795,1,2031,800,1,
+2032,805,1,2469,1679,
+16,0,506,1,2035,
+816,1,2364,891,1,
+2039,826,1,1931,925,
+1,2041,832,1,2043,
+838,1,2045,843,1,
+2511,1680,16,0,158,
+1,1775,1681,16,0,
+158,1,1989,980,1,
+2033,810,1,2037,821,
+1,2713,1682,16,0,
+158,1,1574,863,1,
+1958,1683,16,0,158,
+1,13,1684,19,496,
+1,13,1685,5,46,
+1,2536,1686,17,1687,
+15,1688,4,36,37,
+0,86,0,111,0,
+105,0,100,0,65,
+0,114,0,103,0,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,-1,1,5,1689,
+20,1690,4,38,86,
+0,111,0,105,0,
+100,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+49,0,1,181,1,
+3,1,5,1,4,
+1691,22,1,26,1,
+2513,1692,17,1693,15,
+1694,4,40,37,0,
+86,0,101,0,99,
+0,116,0,111,0,
+114,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,1,-1,
+1,5,1695,20,1696,
+4,42,86,0,101,
+0,99,0,116,0,
+111,0,114,0,65,
 0,114,0,103,0,
 83,0,116,0,97,
 0,116,0,101,0,
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,49,0,1,
-176,1,3,1,6,
-1,5,1678,22,1,
-25,1,2632,1679,16,
-0,704,1,2527,1680,
-17,1681,15,1682,4,
-36,37,0,86,0,
-111,0,105,0,100,
+184,1,3,1,6,
+1,5,1697,22,1,
+29,1,1860,885,1,
+2522,1698,17,1699,15,
+1700,4,34,37,0,
+73,0,110,0,116,
 0,65,0,114,0,
 103,0,83,0,116,
 0,97,0,116,0,
 101,0,69,0,118,
 0,101,0,110,0,
 116,0,1,-1,1,
-5,1683,20,1684,4,
-38,86,0,111,0,
-105,0,100,0,65,
-0,114,0,103,0,
-83,0,116,0,97,
-0,116,0,101,0,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,49,0,1,
-175,1,3,1,5,
-1,4,1685,22,1,
-24,1,1657,940,1,
-1989,962,1,2037,803,
-1,32,1686,16,0,
-491,1,2105,860,1,
-2542,1687,17,1688,15,
-1689,4,22,37,0,
+5,1701,20,1702,4,
+36,73,0,110,0,
+116,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+49,0,1,183,1,
+3,1,6,1,5,
+1703,22,1,28,1,
+1873,899,1,1657,958,
+1,2531,1704,17,1705,
+15,1706,4,34,37,
+0,75,0,101,0,
+121,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,1,-1,
+1,5,1707,20,1708,
+4,36,75,0,101,
+0,121,0,65,0,
+114,0,103,0,83,
+0,116,0,97,0,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,49,0,1,182,
+1,3,1,6,1,
+5,1709,22,1,27,
+1,1989,980,1,2645,
+1710,16,0,733,1,
+2037,821,1,32,1711,
+16,0,501,1,2105,
+878,1,2464,963,1,
+2551,1712,17,1713,15,
+1714,4,22,37,0,
 83,0,116,0,97,
 0,116,0,101,0,
 69,0,118,0,101,
 0,110,0,116,0,
-1,-1,1,5,1690,
-20,1691,4,24,83,
+1,-1,1,5,1715,
+20,1716,4,24,83,
 0,116,0,97,0,
 116,0,101,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,49,0,1,174,
+0,49,0,1,180,
 1,3,1,6,1,
-5,1692,22,1,23,
-1,2544,1693,16,0,
-694,1,2045,825,1,
-2227,954,1,1574,845,
-1,2584,1694,17,1695,
-15,1696,4,20,37,
-0,83,0,116,0,
-97,0,116,0,101,
-0,66,0,111,0,
-100,0,121,0,1,
--1,1,5,1697,20,
-1698,4,22,83,0,
-116,0,97,0,116,
-0,101,0,66,0,
-111,0,100,0,121,
-0,95,0,54,0,
-1,171,1,3,1,
-3,1,2,1699,22,
-1,20,1,2585,1700,
-17,1701,15,1696,1,
--1,1,5,1702,20,
-1703,4,22,83,0,
-116,0,97,0,116,
-0,101,0,66,0,
-111,0,100,0,121,
-0,95,0,52,0,
-1,169,1,3,1,
-3,1,2,1704,22,
-1,18,1,2586,1705,
-17,1706,15,1696,1,
--1,1,5,1707,20,
-1708,4,22,83,0,
+5,1717,22,1,25,
+1,2553,1718,16,0,
+721,1,2227,972,1,
+1574,863,1,1803,851,
+1,2458,940,1,2459,
+946,1,2462,953,1,
+2136,906,1,2599,1719,
+17,1720,15,1721,4,
+20,37,0,83,0,
 116,0,97,0,116,
 0,101,0,66,0,
 111,0,100,0,121,
-0,95,0,50,0,
-1,167,1,3,1,
-3,1,2,1709,22,
-1,16,1,2021,764,
-1,2458,922,1,2459,
-928,1,2462,935,1,
-2136,888,1,2464,945,
-1,2029,771,1,2030,
-777,1,2031,782,1,
-2032,787,1,2033,792,
-1,2035,798,1,2364,
-873,1,2583,1710,17,
-1711,15,1696,1,-1,
-1,5,1712,20,1713,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-95,0,56,0,1,
-173,1,3,1,3,
-1,2,1714,22,1,
-22,1,2039,808,1,
-1931,906,1,2041,814,
-1,1873,881,1,2588,
-1715,17,1716,15,1696,
-1,-1,1,5,1717,
-20,1718,4,22,83,
-0,116,0,97,0,
-116,0,101,0,66,
-0,111,0,100,0,
-121,0,95,0,55,
-0,1,172,1,3,
-1,2,1,1,1719,
-22,1,21,1,2589,
-1720,17,1721,15,1696,
-1,-1,1,5,1722,
-20,1723,4,22,83,
-0,116,0,97,0,
-116,0,101,0,66,
-0,111,0,100,0,
-121,0,95,0,53,
-0,1,170,1,3,
-1,2,1,1,1724,
-22,1,19,1,2590,
-1725,17,1726,15,1696,
+0,1,-1,1,5,
+1722,20,1723,4,22,
+83,0,116,0,97,
+0,116,0,101,0,
+66,0,111,0,100,
+0,121,0,95,0,
+57,0,1,178,1,
+3,1,2,1,1,
+1724,22,1,23,1,
+2029,789,1,2030,795,
+1,2031,800,1,2032,
+805,1,2033,810,1,
+2035,816,1,2364,891,
+1,2039,826,1,1931,
+925,1,2041,832,1,
+2021,782,1,2043,838,
+1,2045,843,1,2593,
+1725,17,1726,15,1721,
 1,-1,1,5,1727,
-20,1728,4,22,83,
-0,116,0,97,0,
-116,0,101,0,66,
-0,111,0,100,0,
-121,0,95,0,51,
-0,1,168,1,3,
-1,2,1,1,1729,
-22,1,17,1,2591,
-1730,17,1731,15,1696,
-1,-1,1,5,1732,
-20,1733,4,22,83,
+20,1728,4,24,83,
 0,116,0,97,0,
 116,0,101,0,66,
 0,111,0,100,0,
 121,0,95,0,49,
-0,1,166,1,3,
-1,2,1,1,1734,
-22,1,15,1,2413,
-1735,16,0,485,1,
-2043,820,1,14,1736,
-19,144,1,14,1737,
-5,105,1,1260,1142,
-1,1011,1148,1,1514,
-1154,1,9,1159,1,
-10,1738,17,1739,15,
-1740,4,48,37,0,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,76,0,
-105,0,115,0,116,
-0,1,-1,1,5,
-140,1,0,1,0,
-1741,22,1,27,1,
-262,1165,1,1267,1171,
-1,1521,1176,1,1773,
-1742,16,0,148,1,
-19,1193,1,20,1743,
-16,0,142,1,2281,
-1200,1,525,1262,1,
-2538,1744,16,0,142,
-1,30,1745,17,1746,
-15,1740,1,-1,1,
+0,48,0,1,179,
+1,3,1,3,1,
+2,1729,22,1,24,
+1,2594,1730,17,1731,
+15,1721,1,-1,1,
+5,1732,20,1733,4,
+22,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,95,
+0,56,0,1,177,
+1,3,1,3,1,
+2,1734,22,1,22,
+1,2595,1735,17,1736,
+15,1721,1,-1,1,
+5,1737,20,1738,4,
+22,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,95,
+0,54,0,1,175,
+1,3,1,3,1,
+2,1739,22,1,20,
+1,2596,1740,17,1741,
+15,1721,1,-1,1,
+5,1742,20,1743,4,
+22,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,95,
+0,52,0,1,173,
+1,3,1,3,1,
+2,1744,22,1,18,
+1,2597,1745,17,1746,
+15,1721,1,-1,1,
 5,1747,20,1748,4,
+22,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,95,
+0,50,0,1,171,
+1,3,1,3,1,
+2,1749,22,1,16,
+1,2413,1750,16,0,
+494,1,2600,1751,17,
+1752,15,1721,1,-1,
+1,5,1753,20,1754,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,55,0,1,
+176,1,3,1,2,
+1,1,1755,22,1,
+21,1,2601,1756,17,
+1757,15,1721,1,-1,
+1,5,1758,20,1759,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,53,0,1,
+174,1,3,1,2,
+1,1,1760,22,1,
+19,1,2602,1761,17,
+1762,15,1721,1,-1,
+1,5,1763,20,1764,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,51,0,1,
+172,1,3,1,2,
+1,1,1765,22,1,
+17,1,2603,1766,17,
+1767,15,1721,1,-1,
+1,5,1768,20,1769,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,49,0,1,
+170,1,3,1,2,
+1,1,1770,22,1,
+15,1,14,1771,19,
+144,1,14,1772,5,
+105,1,1260,1160,1,
+1011,1166,1,1514,1172,
+1,9,1177,1,10,
+1773,17,1774,15,1775,
+4,48,37,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
+1,-1,1,5,140,
+1,0,1,0,1776,
+22,1,30,1,262,
+1183,1,1267,1189,1,
+1521,1194,1,1773,1777,
+16,0,148,1,19,
+1211,1,20,1778,16,
+0,142,1,2281,1218,
+1,525,1280,1,2538,
+1779,17,1780,15,1775,
+1,-1,1,5,140,
+1,0,1,0,1776,
+1,30,1781,17,1782,
+15,1775,1,-1,1,
+5,1783,20,1784,4,
 50,65,0,114,0,
 103,0,117,0,109,
 0,101,0,110,0,
@@ -6033,719 +6193,715 @@ public yyLSLSyntax
 111,0,110,0,76,
 0,105,0,115,0,
 116,0,95,0,50,
-0,1,179,1,3,
-1,4,1,3,1749,
-22,1,29,1,283,
-1218,1,40,1223,1,
-41,1750,17,1751,15,
-1752,4,26,37,0,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,76,0,105,0,
-115,0,116,0,1,
--1,1,5,638,1,
-0,1,0,1753,22,
-1,151,1,42,1754,
-17,1755,15,1756,4,
-38,37,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,1,
--1,1,5,1757,20,
-1758,4,40,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,1,303,
-1,3,1,2,1,
-1,1759,22,1,154,
-1,44,1229,1,47,
-1230,1,48,1236,1,
-49,1242,1,50,1247,
-1,51,1252,1,305,
-1257,1,63,1268,1,
-66,1274,1,67,1279,
-1,1478,1504,1,69,
-1289,1,70,1294,1,
-68,1284,1,74,1299,
-1,1013,1304,1,2335,
-1760,16,0,148,1,
-1332,1309,1,1048,1467,
-1,82,1326,1,1296,
-1213,1,1341,1343,1,
-328,1348,1,1303,1353,
-1,1096,1358,1,93,
-1364,1,1550,1369,1,
-2529,1761,17,1762,15,
-1740,1,-1,1,5,
-140,1,0,1,0,
-1741,1,352,1391,1,
-107,1384,1,1114,1389,
-1,1370,1499,1,118,
-1397,1,1123,1402,1,
-371,1407,1,1377,1413,
-1,375,1418,1,377,
-1423,1,379,1428,1,
-380,1433,1,883,1439,
-1,373,1451,1,130,
-1456,1,143,1461,1,
-1152,1472,1,387,1763,
-16,0,593,1,1406,
-1477,1,1159,1484,1,
-157,1489,1,1413,1494,
-1,1665,1520,1,412,
-1764,16,0,607,1,
-1094,1765,16,0,640,
-1,172,1515,1,2686,
-1766,17,1767,15,1740,
-1,-1,1,5,140,
-1,0,1,0,1741,
-1,827,1377,1,1188,
-1525,1,2695,1768,16,
-0,142,1,437,1769,
-16,0,678,1,1442,
-1530,1,1694,1770,16,
-0,148,1,942,1536,
-1,1195,1542,1,1449,
-1547,1,1701,1552,1,
-447,1557,1,188,1565,
-1,205,1570,1,2467,
-1771,17,1772,15,1740,
-1,-1,1,5,1773,
-20,1774,4,50,65,
+0,1,186,1,3,
+1,4,1,3,1785,
+22,1,32,1,283,
+1236,1,2547,1786,16,
+0,142,1,40,1241,
+1,41,1787,17,1788,
+15,1789,4,26,37,
+0,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,76,0,105,
+0,115,0,116,0,
+1,-1,1,5,660,
+1,0,1,0,1790,
+22,1,156,1,42,
+1791,17,1792,15,1793,
+4,38,37,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+1,-1,1,5,1794,
+20,1795,4,40,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,65,
 0,114,0,103,0,
 117,0,109,0,101,
 0,110,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
 95,0,49,0,1,
-178,1,3,1,2,
-1,1,1775,22,1,
-28,1,461,1776,16,
-0,640,1,464,1777,
-17,1778,15,1752,1,
--1,1,5,1779,20,
-1780,4,28,65,0,
+312,1,3,1,2,
+1,1,1796,22,1,
+159,1,44,1247,1,
+47,1248,1,48,1254,
+1,49,1260,1,50,
+1265,1,51,1270,1,
+305,1275,1,63,1286,
+1,66,1292,1,67,
+1297,1,1478,1521,1,
+69,1307,1,70,1312,
+1,68,1302,1,74,
+1317,1,1013,1322,1,
+2335,1797,16,0,148,
+1,1332,1327,1,1048,
+1408,1,82,1344,1,
+1296,1231,1,1341,1361,
+1,328,1366,1,1303,
+1371,1,1096,1376,1,
+93,1382,1,1550,1387,
+1,352,1413,1,107,
+1402,1,1114,1407,1,
+1370,1516,1,118,1419,
+1,1123,1424,1,371,
+1429,1,1377,1435,1,
+375,1440,1,377,1445,
+1,379,1450,1,380,
+1455,1,883,1461,1,
+373,1473,1,130,1478,
+1,143,1483,1,1152,
+1489,1,387,1798,16,
+0,610,1,1406,1494,
+1,1159,1501,1,157,
+1506,1,1413,1511,1,
+1665,1537,1,412,1799,
+16,0,624,1,1094,
+1800,16,0,662,1,
+172,1532,1,827,1395,
+1,1188,1542,1,437,
+1801,16,0,706,1,
+1442,1547,1,1694,1802,
+16,0,148,1,942,
+1553,1,1195,1559,1,
+2702,1803,17,1804,15,
+1775,1,-1,1,5,
+140,1,0,1,0,
+1776,1,1449,1564,1,
+1701,1569,1,447,1574,
+1,2711,1805,16,0,
+142,1,188,1581,1,
+205,1587,1,2467,1806,
+17,1807,15,1775,1,
+-1,1,5,1808,20,
+1809,4,50,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,76,0,105,0,
+115,0,116,0,95,
+0,49,0,1,185,
+1,3,1,2,1,
+1,1810,22,1,31,
+1,461,1811,16,0,
+662,1,464,1812,17,
+1813,15,1789,1,-1,
+1,5,1814,20,1815,
+4,28,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,76,0,
+105,0,115,0,116,
+0,95,0,50,0,
+1,311,1,3,1,
+4,1,3,1816,22,
+1,158,1,1224,1593,
+1,223,1598,1,1730,
+1603,1,476,1608,1,
+477,1614,1,1231,1619,
+1,479,1624,1,480,
+1629,1,1485,1635,1,
+459,1817,17,1818,15,
+1789,1,-1,1,5,
+660,1,0,1,0,
+1790,1,242,1642,1,
+478,1647,1,481,1819,
+17,1820,15,1789,1,
+-1,1,5,1821,20,
+1822,4,28,65,0,
 114,0,103,0,117,
 0,109,0,101,0,
 110,0,116,0,76,
 0,105,0,115,0,
-116,0,95,0,50,
-0,1,302,1,3,
-1,4,1,3,1781,
-22,1,153,1,1224,
-1575,1,223,1580,1,
-1730,1585,1,476,1590,
-1,477,1596,1,1231,
-1601,1,479,1606,1,
-480,1611,1,1485,1617,
-1,459,1782,17,1783,
-15,1752,1,-1,1,
-5,638,1,0,1,
-0,1753,1,242,1624,
-1,478,1629,1,481,
-1784,17,1785,15,1752,
-1,-1,1,5,1786,
-20,1787,4,28,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-76,0,105,0,115,
-0,116,0,95,0,
-49,0,1,301,1,
-3,1,2,1,1,
-1788,22,1,152,1,
-1001,1634,1,1002,1639,
-1,15,1789,19,309,
-1,15,1790,5,6,
-1,1114,1791,16,0,
-307,1,1621,1792,16,
-0,677,1,2701,1793,
-16,0,651,1,40,
-1794,16,0,590,1,
-19,1193,1,9,1159,
-1,16,1795,19,136,
-1,16,1796,5,142,
-1,2514,1797,16,0,
-327,1,256,1798,16,
-0,187,1,1261,1799,
-16,0,187,1,509,
-1800,16,0,187,1,
-9,1801,16,0,134,
-1,2523,1802,16,0,
-476,1,2528,1803,16,
-0,482,1,2029,771,
-1,2030,777,1,2031,
-782,1,2032,787,1,
-2033,792,1,277,1804,
-16,0,187,1,2035,
-798,1,2037,803,1,
-2039,808,1,32,1805,
-16,0,187,1,2041,
-814,1,2293,1806,16,
-0,187,1,2043,820,
-1,2045,825,1,40,
-1807,16,0,166,1,
-41,1808,16,0,187,
-1,1297,1809,16,0,
-187,1,43,1810,16,
-0,187,1,44,1811,
-16,0,166,1,1803,
-833,1,1804,1812,16,
-0,187,1,299,1813,
-16,0,187,1,2480,
-1814,17,1815,15,1816,
+116,0,95,0,49,
+0,1,310,1,3,
+1,2,1,1,1823,
+22,1,157,1,1001,
+1652,1,1002,1657,1,
+15,1824,19,312,1,
+15,1825,5,6,1,
+2717,1826,16,0,696,
+1,1114,1827,16,0,
+310,1,1621,1828,16,
+0,705,1,40,1829,
+16,0,606,1,19,
+1211,1,9,1177,1,
+16,1830,19,136,1,
+16,1831,5,143,1,
+2514,1832,16,0,330,
+1,256,1833,16,0,
+190,1,1261,1834,16,
+0,190,1,509,1835,
+16,0,190,1,9,
+1836,16,0,134,1,
+2523,1837,16,0,479,
+1,1775,1838,16,0,
+190,1,2029,789,1,
+2532,1839,16,0,599,
+1,2031,800,1,2032,
+805,1,2033,810,1,
+277,1840,16,0,190,
+1,2537,1841,16,0,
+497,1,2037,821,1,
+2039,826,1,32,1842,
+16,0,190,1,2041,
+832,1,2293,1843,16,
+0,190,1,2043,838,
+1,2045,843,1,40,
+1844,16,0,169,1,
+41,1845,16,0,190,
+1,1297,1846,16,0,
+190,1,43,1847,16,
+0,190,1,44,1848,
+16,0,169,1,1803,
+851,1,1804,1849,16,
+0,190,1,299,1850,
+16,0,190,1,2480,
+1851,17,1852,15,1853,
 4,24,37,0,73,
 0,110,0,116,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
 0,1,-1,1,5,
-1817,20,1818,4,26,
+1854,20,1855,4,26,
 73,0,110,0,116,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
 116,0,95,0,52,
-0,1,335,1,3,
-1,2,1,1,1819,
-22,1,186,1,52,
-1820,16,0,187,1,
-2484,1821,17,1822,15,
-1823,4,26,37,0,
-86,0,111,0,105,
-0,100,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
--1,1,5,1824,20,
-1825,4,28,86,0,
-111,0,105,0,100,
+0,1,344,1,3,
+1,2,1,1,1856,
+22,1,191,1,52,
+1857,16,0,190,1,
+2484,1858,17,1859,15,
+1860,4,24,37,0,
+75,0,101,0,121,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,56,
-0,1,331,1,3,
-1,2,1,1,1826,
-22,1,182,1,1515,
-1827,16,0,187,1,
-2318,1828,16,0,187,
-1,2491,1829,17,1830,
-15,1823,1,-1,1,
-5,1831,20,1832,4,
-28,86,0,111,0,
-105,0,100,0,65,
-0,114,0,103,0,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,49,0,1,
-324,1,3,1,2,
-1,1,1833,22,1,
-175,1,62,1834,16,
-0,202,1,63,1835,
-16,0,166,1,2495,
-1836,17,1837,15,1838,
-4,12,37,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
--1,1,5,1839,20,
-1840,4,16,69,0,
+116,0,1,-1,1,
+5,1861,20,1862,4,
+26,75,0,101,0,
+121,0,65,0,114,
+0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-49,0,48,0,1,
-320,1,3,1,2,
-1,1,1841,22,1,
-171,1,2075,1842,16,
-0,187,1,1574,845,
-1,1479,1843,16,0,
-187,1,71,1844,16,
-0,187,1,1658,1845,
-16,0,718,1,1775,
-1846,16,0,187,1,
-1833,1847,16,0,299,
-1,1834,1848,16,0,
-187,1,2337,1849,16,
-0,187,1,79,1850,
-16,0,187,1,1335,
-1851,16,0,187,1,
-322,1852,16,0,187,
-1,76,1853,16,0,
-187,1,85,1854,16,
-0,187,1,89,1855,
-16,0,187,1,2685,
-1856,16,0,632,1,
-346,1857,16,0,187,
-1,97,1858,16,0,
-187,1,2106,1859,16,
-0,187,1,102,1860,
-16,0,187,1,1860,
-867,1,2458,922,1,
-2364,873,1,1990,1861,
-16,0,187,1,112,
-1862,16,0,187,1,
-1117,1863,16,0,187,
-1,1873,881,1,1875,
-1864,16,0,414,1,
-1876,1865,16,0,187,
-1,124,1866,16,0,
-187,1,2478,1867,17,
-1868,15,1816,1,-1,
-1,5,1869,20,1870,
-4,26,73,0,110,
-0,116,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,54,0,1,337,
-1,3,1,2,1,
-1,1871,22,1,188,
-1,2136,888,1,381,
-1872,16,0,187,1,
-525,1873,16,0,187,
-1,137,1874,16,0,
-187,1,2021,764,1,
-1901,1875,16,0,187,
-1,1153,1876,16,0,
-187,1,151,1877,16,
-0,187,1,1407,1878,
-16,0,187,1,1659,
-1879,16,0,187,1,
-2413,1880,16,0,187,
-1,406,1881,16,0,
-187,1,1371,1882,16,
-0,187,1,2105,860,
-1,166,1883,16,0,
-187,1,1622,1884,16,
-0,187,1,1931,906,
-1,1932,1885,16,0,
-501,1,1933,1886,16,
-0,187,1,431,1887,
-16,0,187,1,1585,
-1888,16,0,187,1,
-182,1889,16,0,187,
-1,1189,1890,16,0,
-187,1,1443,1891,16,
-0,187,1,1695,1892,
-16,0,187,1,2198,
-1893,16,0,187,1,
-2702,1894,16,0,187,
-1,447,1895,16,0,
-187,1,199,1896,16,
-0,187,1,2459,928,
-1,1958,1897,16,0,
-187,1,2462,935,1,
-1657,940,1,2464,945,
-1,459,1898,16,0,
-187,1,462,1899,16,
-0,187,1,2471,1900,
-17,1901,15,1902,4,
-30,37,0,86,0,
-101,0,99,0,116,
-0,111,0,114,0,
+50,0,1,340,1,
+3,1,2,1,1,
+1863,22,1,187,1,
+1515,1864,16,0,190,
+1,2318,1865,16,0,
+190,1,2491,1866,17,
+1867,15,1868,4,26,
+37,0,86,0,111,
+0,105,0,100,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
 0,1,-1,1,5,
-1903,20,1904,4,32,
-86,0,101,0,99,
-0,116,0,111,0,
-114,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-51,0,1,344,1,
-3,1,2,1,1,
-1905,22,1,195,1,
-2472,1906,17,1907,15,
-1902,1,-1,1,5,
-1908,20,1909,4,32,
-86,0,101,0,99,
-0,116,0,111,0,
-114,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-50,0,1,343,1,
-3,1,2,1,1,
-1910,22,1,194,1,
-2473,1911,17,1912,15,
-1902,1,-1,1,5,
-1913,20,1914,4,32,
-86,0,101,0,99,
-0,116,0,111,0,
-114,0,65,0,114,
-0,103,0,69,0,
+1869,20,1870,4,28,
+86,0,111,0,105,
+0,100,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,51,0,1,333,
+1,3,1,2,1,
+1,1871,22,1,180,
+1,62,1872,16,0,
+209,1,63,1873,16,
+0,169,1,2495,1874,
+17,1875,15,1876,4,
+12,37,0,69,0,
 118,0,101,0,110,
-0,116,0,95,0,
-49,0,1,342,1,
-3,1,2,1,1,
-1915,22,1,193,1,
-2474,1916,17,1917,15,
-1816,1,-1,1,5,
-1918,20,1919,4,28,
+0,116,0,1,-1,
+1,5,1877,20,1878,
+4,16,69,0,118,
+0,101,0,110,0,
+116,0,95,0,49,
+0,48,0,1,329,
+1,3,1,2,1,
+1,1879,22,1,176,
+1,2075,1880,16,0,
+190,1,1574,863,1,
+1479,1881,16,0,190,
+1,71,1882,16,0,
+190,1,1658,1883,16,
+0,730,1,1833,1884,
+16,0,296,1,1834,
+1885,16,0,190,1,
+2337,1886,16,0,190,
+1,79,1887,16,0,
+190,1,1335,1888,16,
+0,190,1,322,1889,
+16,0,190,1,76,
+1890,16,0,190,1,
+85,1891,16,0,190,
+1,2030,795,1,89,
+1892,16,0,190,1,
+2035,816,1,346,1893,
+16,0,190,1,97,
+1894,16,0,190,1,
+2106,1895,16,0,190,
+1,102,1896,16,0,
+190,1,1860,885,1,
+2458,940,1,2364,891,
+1,1990,1897,16,0,
+190,1,112,1898,16,
+0,190,1,1117,1899,
+16,0,190,1,1873,
+899,1,1875,1900,16,
+0,417,1,1876,1901,
+16,0,190,1,124,
+1902,16,0,190,1,
+2478,1903,17,1904,15,
+1853,1,-1,1,5,
+1905,20,1906,4,26,
 73,0,110,0,116,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
+116,0,95,0,54,
+0,1,346,1,3,
+1,2,1,1,1907,
+22,1,193,1,2136,
+906,1,2718,1908,16,
+0,190,1,381,1909,
+16,0,190,1,525,
+1910,16,0,190,1,
+137,1911,16,0,190,
+1,2021,782,1,1901,
+1912,16,0,190,1,
+1153,1913,16,0,190,
+1,151,1914,16,0,
+190,1,1407,1915,16,
+0,190,1,1659,1916,
+16,0,190,1,2413,
+1917,16,0,190,1,
+406,1918,16,0,190,
+1,1371,1919,16,0,
+190,1,2105,878,1,
+166,1920,16,0,190,
+1,1622,1921,16,0,
+190,1,1931,925,1,
+1932,1922,16,0,509,
+1,1933,1923,16,0,
+190,1,431,1924,16,
+0,190,1,1585,1925,
+16,0,190,1,182,
+1926,16,0,190,1,
+1189,1927,16,0,190,
+1,1443,1928,16,0,
+190,1,1695,1929,16,
+0,190,1,2198,1930,
+16,0,190,1,2701,
+1931,16,0,675,1,
+447,1932,16,0,190,
+1,199,1933,16,0,
+190,1,2459,946,1,
+1958,1934,16,0,190,
+1,2462,953,1,1657,
+958,1,2464,963,1,
+459,1935,16,0,190,
+1,462,1936,16,0,
+190,1,2471,1937,17,
+1938,15,1939,4,30,
+37,0,86,0,101,
+0,99,0,116,0,
+111,0,114,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,-1,1,5,1940,
+20,1941,4,32,86,
+0,101,0,99,0,
+116,0,111,0,114,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,51,
+0,1,353,1,3,
+1,2,1,1,1942,
+22,1,200,1,2472,
+1943,17,1944,15,1939,
+1,-1,1,5,1945,
+20,1946,4,32,86,
+0,101,0,99,0,
+116,0,111,0,114,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,50,
+0,1,352,1,3,
+1,2,1,1,1947,
+22,1,199,1,2473,
+1948,17,1949,15,1939,
+1,-1,1,5,1950,
+20,1951,4,32,86,
+0,101,0,99,0,
+116,0,111,0,114,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
 116,0,95,0,49,
-0,48,0,1,341,
-1,3,1,2,1,
-1,1920,22,1,192,
-1,2475,1921,17,1922,
-15,1816,1,-1,1,
-5,1923,20,1924,4,
-26,73,0,110,0,
-116,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-57,0,1,340,1,
+0,1,351,1,3,
+1,2,1,1,1952,
+22,1,198,1,2474,
+1953,17,1954,15,1853,
+1,-1,1,5,1955,
+20,1956,4,28,73,
+0,110,0,116,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,49,0,
+48,0,1,350,1,
 3,1,2,1,1,
-1925,22,1,191,1,
-2476,1926,17,1927,15,
-1816,1,-1,1,5,
-1928,20,1929,4,26,
+1957,22,1,197,1,
+2475,1958,17,1959,15,
+1853,1,-1,1,5,
+1960,20,1961,4,26,
 73,0,110,0,116,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,56,
-0,1,339,1,3,
-1,2,1,1,1930,
-22,1,190,1,2477,
-1931,17,1932,15,1816,
-1,-1,1,5,1933,
-20,1934,4,26,73,
+116,0,95,0,57,
+0,1,349,1,3,
+1,2,1,1,1962,
+22,1,196,1,2476,
+1963,17,1964,15,1853,
+1,-1,1,5,1965,
+20,1966,4,26,73,
 0,110,0,116,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,55,0,
-1,338,1,3,1,
-2,1,1,1935,22,
-1,189,1,2227,954,
-1,2479,1936,17,1937,
-15,1816,1,-1,1,
-5,1938,20,1939,4,
-26,73,0,110,0,
-116,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-53,0,1,336,1,
-3,1,2,1,1,
-1940,22,1,187,1,
-1225,1941,16,0,187,
-1,2481,1942,17,1943,
-15,1816,1,-1,1,
-5,1944,20,1945,4,
-26,73,0,110,0,
-116,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-51,0,1,334,1,
-3,1,2,1,1,
-1946,22,1,185,1,
-2482,1947,17,1948,15,
-1816,1,-1,1,5,
-1949,20,1950,4,26,
+0,95,0,56,0,
+1,348,1,3,1,
+2,1,1,1967,22,
+1,195,1,2477,1968,
+17,1969,15,1853,1,
+-1,1,5,1970,20,
+1971,4,26,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,55,0,1,
+347,1,3,1,2,
+1,1,1972,22,1,
+194,1,2227,972,1,
+2479,1973,17,1974,15,
+1853,1,-1,1,5,
+1975,20,1976,4,26,
 73,0,110,0,116,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,50,
-0,1,333,1,3,
-1,2,1,1,1951,
-22,1,184,1,2483,
-1952,17,1953,15,1816,
-1,-1,1,5,1954,
-20,1955,4,26,73,
+116,0,95,0,53,
+0,1,345,1,3,
+1,2,1,1,1977,
+22,1,192,1,1225,
+1978,16,0,190,1,
+2481,1979,17,1980,15,
+1853,1,-1,1,5,
+1981,20,1982,4,26,
+73,0,110,0,116,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,51,
+0,1,343,1,3,
+1,2,1,1,1983,
+22,1,190,1,2482,
+1984,17,1985,15,1853,
+1,-1,1,5,1986,
+20,1987,4,26,73,
+0,110,0,116,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,50,0,
+1,342,1,3,1,
+2,1,1,1988,22,
+1,189,1,2483,1989,
+17,1990,15,1853,1,
+-1,1,5,1991,20,
+1992,4,26,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+341,1,3,1,2,
+1,1,1993,22,1,
+188,1,1731,1994,16,
+0,190,1,2485,1995,
+17,1996,15,1860,1,
+-1,1,5,1997,20,
+1998,4,26,75,0,
+101,0,121,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
 0,110,0,116,0,
+95,0,49,0,1,
+339,1,3,1,2,
+1,1,1999,22,1,
+186,1,2486,2000,17,
+2001,15,1868,1,-1,
+1,5,2002,20,2003,
+4,28,86,0,111,
+0,105,0,100,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,49,0,
-1,332,1,3,1,
-2,1,1,1956,22,
-1,183,1,1731,1957,
-16,0,187,1,2485,
-1958,17,1959,15,1823,
-1,-1,1,5,1960,
-20,1961,4,28,86,
+0,95,0,56,0,
+1,338,1,3,1,
+2,1,1,2004,22,
+1,185,1,2487,2005,
+17,2006,15,1868,1,
+-1,1,5,2007,20,
+2008,4,28,86,0,
+111,0,105,0,100,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,55,
+0,1,337,1,3,
+1,2,1,1,2009,
+22,1,184,1,2488,
+2010,17,2011,15,1868,
+1,-1,1,5,2012,
+20,2013,4,28,86,
 0,111,0,105,0,
 100,0,65,0,114,
 0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-55,0,1,330,1,
+54,0,1,336,1,
 3,1,2,1,1,
-1962,22,1,181,1,
-2486,1963,17,1964,15,
-1823,1,-1,1,5,
-1965,20,1966,4,28,
+2014,22,1,183,1,
+2489,2015,17,2016,15,
+1868,1,-1,1,5,
+2017,20,2018,4,28,
 86,0,111,0,105,
 0,100,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,54,0,1,329,
+0,53,0,1,335,
 1,3,1,2,1,
-1,1967,22,1,180,
-1,2487,1968,17,1969,
-15,1823,1,-1,1,
-5,1970,20,1971,4,
+1,2019,22,1,182,
+1,2490,2020,17,2021,
+15,1868,1,-1,1,
+5,2022,20,2023,4,
 28,86,0,111,0,
 105,0,100,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,53,0,1,
-328,1,3,1,2,
-1,1,1972,22,1,
-179,1,2488,1973,17,
-1974,15,1823,1,-1,
-1,5,1975,20,1976,
-4,28,86,0,111,
-0,105,0,100,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,95,0,52,0,
-1,327,1,3,1,
-2,1,1,1977,22,
-1,178,1,2489,1978,
-17,1979,15,1823,1,
--1,1,5,1980,20,
-1981,4,28,86,0,
-111,0,105,0,100,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,95,0,51,
-0,1,326,1,3,
-1,2,1,1,1982,
-22,1,177,1,2490,
-1983,17,1984,15,1823,
-1,-1,1,5,1985,
-20,1986,4,28,86,
-0,111,0,105,0,
-100,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-50,0,1,325,1,
-3,1,2,1,1,
-1987,22,1,176,1,
-1989,962,1,2492,1988,
-17,1989,15,1838,1,
--1,1,5,1990,20,
-1991,4,16,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-49,0,51,0,1,
-323,1,3,1,2,
-1,1,1992,22,1,
-174,1,2493,1993,17,
-1994,15,1838,1,-1,
-1,5,1995,20,1996,
+95,0,52,0,1,
+334,1,3,1,2,
+1,1,2024,22,1,
+181,1,1989,980,1,
+2492,2025,17,2026,15,
+1868,1,-1,1,5,
+2027,20,2028,4,28,
+86,0,111,0,105,
+0,100,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,50,0,1,332,
+1,3,1,2,1,
+1,2029,22,1,179,
+1,2493,2030,17,2031,
+15,1868,1,-1,1,
+5,2032,20,2033,4,
+28,86,0,111,0,
+105,0,100,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+331,1,3,1,2,
+1,1,2034,22,1,
+178,1,2494,2035,17,
+2036,15,1876,1,-1,
+1,5,2037,20,2038,
 4,16,69,0,118,
 0,101,0,110,0,
 116,0,95,0,49,
-0,50,0,1,322,
+0,49,0,1,330,
 1,3,1,2,1,
-1,1997,22,1,173,
-1,2494,1998,17,1999,
-15,1838,1,-1,1,
-5,2000,20,2001,4,
-16,69,0,118,0,
-101,0,110,0,116,
-0,95,0,49,0,
-49,0,1,321,1,
-3,1,2,1,1,
-2002,22,1,172,1,
-236,2003,16,0,187,
-1,2496,2004,17,2005,
-15,1838,1,-1,1,
-5,2006,20,2007,4,
+1,2039,22,1,177,
+1,236,2040,16,0,
+190,1,2496,2041,17,
+2042,15,1876,1,-1,
+1,5,2043,20,2044,
+4,14,69,0,118,
+0,101,0,110,0,
+116,0,95,0,57,
+0,1,328,1,3,
+1,2,1,1,2045,
+22,1,175,1,2497,
+2046,17,2047,15,1876,
+1,-1,1,5,2048,
+20,2049,4,14,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,56,0,1,327,
+1,3,1,2,1,
+1,2050,22,1,174,
+1,2498,2051,17,2052,
+15,1876,1,-1,1,
+5,2053,20,2054,4,
 14,69,0,118,0,
 101,0,110,0,116,
-0,95,0,57,0,
-1,319,1,3,1,
-2,1,1,2008,22,
-1,170,1,2497,2009,
-17,2010,15,1838,1,
--1,1,5,2011,20,
-2012,4,14,69,0,
+0,95,0,55,0,
+1,326,1,3,1,
+2,1,1,2055,22,
+1,173,1,2499,2056,
+17,2057,15,1876,1,
+-1,1,5,2058,20,
+2059,4,14,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-56,0,1,318,1,
+54,0,1,325,1,
 3,1,2,1,1,
-2013,22,1,169,1,
-2498,2014,17,2015,15,
-1838,1,-1,1,5,
-2016,20,2017,4,14,
+2060,22,1,172,1,
+2500,2061,17,2062,15,
+1876,1,-1,1,5,
+2063,20,2064,4,14,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,55,0,1,
-317,1,3,1,2,
-1,1,2018,22,1,
-168,1,2499,2019,17,
-2020,15,1838,1,-1,
-1,5,2021,20,2022,
+95,0,53,0,1,
+324,1,3,1,2,
+1,1,2065,22,1,
+171,1,2501,2066,17,
+2067,15,1876,1,-1,
+1,5,2068,20,2069,
 4,14,69,0,118,
 0,101,0,110,0,
-116,0,95,0,54,
-0,1,316,1,3,
-1,2,1,1,2023,
-22,1,167,1,2500,
-2024,17,2025,15,1838,
-1,-1,1,5,2026,
-20,2027,4,14,69,
+116,0,95,0,52,
+0,1,323,1,3,
+1,2,1,1,2070,
+22,1,170,1,2502,
+2071,17,2072,15,1876,
+1,-1,1,5,2073,
+20,2074,4,14,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,53,0,1,315,
+0,51,0,1,322,
 1,3,1,2,1,
-1,2028,22,1,166,
-1,2501,2029,17,2030,
-15,1838,1,-1,1,
-5,2031,20,2032,4,
+1,2075,22,1,169,
+1,2503,2076,17,2077,
+15,1876,1,-1,1,
+5,2078,20,2079,4,
 14,69,0,118,0,
 101,0,110,0,116,
-0,95,0,52,0,
-1,314,1,3,1,
-2,1,1,2033,22,
-1,165,1,2502,2034,
-17,2035,15,1838,1,
--1,1,5,2036,20,
-2037,4,14,69,0,
+0,95,0,50,0,
+1,321,1,3,1,
+2,1,1,2080,22,
+1,168,1,2504,2081,
+17,2082,15,1876,1,
+-1,1,5,2083,20,
+2084,4,14,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-51,0,1,313,1,
+49,0,1,320,1,
 3,1,2,1,1,
-2038,22,1,164,1,
-2503,2039,17,2040,15,
-1838,1,-1,1,5,
-2041,20,2042,4,14,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,50,0,1,
-312,1,3,1,2,
-1,1,2043,22,1,
-163,1,2504,2044,17,
-2045,15,1838,1,-1,
-1,5,2046,20,2047,
-4,14,69,0,118,
-0,101,0,110,0,
-116,0,95,0,49,
-0,1,311,1,3,
-1,2,1,1,2048,
-22,1,162,1,2505,
-2049,16,0,447,1,
-217,2050,16,0,187,
-1,1756,2051,16,0,
-187,1,17,2052,19,
-154,1,17,2053,5,
-124,1,2510,2054,16,
-0,621,1,1,2055,
-17,2056,15,2057,4,
-18,37,0,84,0,
-121,0,112,0,101,
-0,110,0,97,0,
-109,0,101,0,1,
--1,1,5,2058,20,
-2059,4,20,84,0,
-121,0,112,0,101,
-0,110,0,97,0,
-109,0,101,0,95,
-0,55,0,1,310,
-1,3,1,2,1,
-1,2060,22,1,161,
-1,2,2061,17,2062,
-15,2057,1,-1,1,
-5,2063,20,2064,4,
-20,84,0,121,0,
-112,0,101,0,110,
-0,97,0,109,0,
-101,0,95,0,54,
-0,1,309,1,3,
-1,2,1,1,2065,
-22,1,160,1,3,
-2066,17,2067,15,2057,
-1,-1,1,5,2068,
-20,2069,4,20,84,
+2085,22,1,167,1,
+2505,2086,16,0,450,
+1,217,2087,16,0,
+190,1,1756,2088,16,
+0,190,1,17,2089,
+19,157,1,17,2090,
+5,127,1,2510,2091,
+16,0,634,1,1,
+2092,17,2093,15,2094,
+4,18,37,0,84,
 0,121,0,112,0,
 101,0,110,0,97,
 0,109,0,101,0,
-95,0,53,0,1,
-308,1,3,1,2,
-1,1,2070,22,1,
-159,1,4,2071,17,
-2072,15,2057,1,-1,
-1,5,2073,20,2074,
+1,-1,1,5,2095,
+20,2096,4,20,84,
+0,121,0,112,0,
+101,0,110,0,97,
+0,109,0,101,0,
+95,0,55,0,1,
+319,1,3,1,2,
+1,1,2097,22,1,
+166,1,2,2098,17,
+2099,15,2094,1,-1,
+1,5,2100,20,2101,
 4,20,84,0,121,
 0,112,0,101,0,
 110,0,97,0,109,
 0,101,0,95,0,
-52,0,1,307,1,
+54,0,1,318,1,
 3,1,2,1,1,
-2075,22,1,158,1,
-5,2076,17,2077,15,
-2057,1,-1,1,5,
-2078,20,2079,4,20,
+2102,22,1,165,1,
+3,2103,17,2104,15,
+2094,1,-1,1,5,
+2105,20,2106,4,20,
 84,0,121,0,112,
 0,101,0,110,0,
 97,0,109,0,101,
-0,95,0,51,0,
-1,306,1,3,1,
-2,1,1,2080,22,
-1,157,1,6,2081,
-17,2082,15,2057,1,
--1,1,5,2083,20,
-2084,4,20,84,0,
+0,95,0,53,0,
+1,317,1,3,1,
+2,1,1,2107,22,
+1,164,1,4,2108,
+17,2109,15,2094,1,
+-1,1,5,2110,20,
+2111,4,20,84,0,
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,95,
-0,50,0,1,305,
+0,52,0,1,316,
 1,3,1,2,1,
-1,2085,22,1,156,
-1,7,2086,17,2087,
-15,2057,1,-1,1,
-5,2088,20,2089,4,
+1,2112,22,1,163,
+1,5,2113,17,2114,
+15,2094,1,-1,1,
+5,2115,20,2116,4,
 20,84,0,121,0,
 112,0,101,0,110,
 0,97,0,109,0,
-101,0,95,0,49,
-0,1,304,1,3,
-1,2,1,1,2090,
-22,1,155,1,2518,
-2091,17,2092,15,2093,
-4,54,37,0,73,
-0,110,0,116,0,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,76,0,
-105,0,115,0,116,
-0,1,-1,1,5,
-2094,20,2095,4,56,
+101,0,95,0,51,
+0,1,315,1,3,
+1,2,1,1,2117,
+22,1,162,1,6,
+2118,17,2119,15,2094,
+1,-1,1,5,2120,
+20,2121,4,20,84,
+0,121,0,112,0,
+101,0,110,0,97,
+0,109,0,101,0,
+95,0,50,0,1,
+314,1,3,1,2,
+1,1,2122,22,1,
+161,1,7,2123,17,
+2124,15,2094,1,-1,
+1,5,2125,20,2126,
+4,20,84,0,121,
+0,112,0,101,0,
+110,0,97,0,109,
+0,101,0,95,0,
+49,0,1,313,1,
+3,1,2,1,1,
+2127,22,1,160,1,
+2518,2128,17,2129,15,
+2130,4,54,37,0,
 73,0,110,0,116,
 0,65,0,114,0,
 103,0,117,0,109,
@@ -6756,2283 +6912,2328 @@ public yyLSLSyntax
 0,116,0,105,0,
 111,0,110,0,76,
 0,105,0,115,0,
-116,0,95,0,49,
-0,1,180,1,3,
-1,2,1,1,2096,
-22,1,30,1,9,
-1159,1,10,1738,1,
-262,1165,1,1267,1171,
-1,2524,2097,16,0,
-477,1,1521,1176,1,
-1773,2098,16,0,238,
-1,19,1193,1,20,
-2099,16,0,152,1,
-2281,1200,1,525,1262,
-1,2538,2100,16,0,
-489,1,30,1745,1,
-1002,1639,1,283,1218,
-1,1010,2101,16,0,
-628,1,40,1223,1,
-41,1750,1,42,1754,
-1,44,1229,1,1260,
-1142,1,47,1230,1,
-1303,1353,1,49,1242,
-1,50,1247,1,48,
-1236,1,51,1252,1,
-1514,1154,1,61,2102,
-16,0,194,1,63,
-1268,1,305,1257,1,
-66,1274,1,67,1279,
-1,68,1284,1,69,
-1289,1,70,1294,1,
-73,2103,16,0,204,
-1,74,1299,1,1013,
-1304,1,2335,2104,16,
-0,240,1,1332,1309,
-1,1048,1467,1,82,
-1326,1,1840,2105,16,
-0,313,1,1341,1343,
-1,2517,2106,17,2107,
-15,2108,4,30,37,
-0,73,0,110,0,
-116,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,1,
--1,1,5,2109,20,
-2110,4,32,73,0,
+116,0,1,-1,1,
+5,2131,20,2132,4,
+56,73,0,110,0,
+116,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+76,0,105,0,115,
+0,116,0,95,0,
+49,0,1,188,1,
+3,1,2,1,1,
+2133,22,1,34,1,
+9,1177,1,10,1773,
+1,262,1183,1,1267,
+1189,1,1521,1194,1,
+1773,2134,16,0,242,
+1,2527,2135,17,2136,
+15,2137,4,54,37,
+0,75,0,101,0,
+121,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+76,0,105,0,115,
+0,116,0,1,-1,
+1,5,2138,20,2139,
+4,56,75,0,101,
+0,121,0,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
 110,0,116,0,68,
 0,101,0,99,0,
 108,0,97,0,114,
 0,97,0,116,0,
 105,0,111,0,110,
-0,95,0,49,0,
-1,183,1,3,1,
-3,1,2,2111,22,
-1,33,1,2519,2112,
-16,0,626,1,1094,
-2113,16,0,709,1,
-1096,1358,1,93,1364,
-1,1550,1369,1,2529,
-1761,1,827,1377,1,
-1011,1148,1,107,1384,
-1,1114,1389,1,328,
-1348,1,1871,2114,16,
-0,323,1,1370,1499,
-1,1478,1504,1,118,
-1397,1,1123,1402,1,
-371,1407,1,1377,1413,
-1,375,1418,1,1882,
-2115,16,0,343,1,
-377,1423,1,352,1391,
-1,379,1428,1,380,
-1433,1,130,1456,1,
-2074,2116,16,0,592,
-1,373,1451,1,1012,
-2117,16,0,630,1,
-143,1461,1,1152,1472,
-1,1406,1477,1,1159,
-1484,1,157,1489,1,
-1413,1494,1,883,1439,
-1,1296,1213,1,172,
-1515,1,2686,1766,1,
-1665,1520,1,1939,2118,
-16,0,461,1,1188,
-1525,1,2695,2119,16,
-0,646,1,1442,1530,
-1,188,1565,1,942,
-1536,1,1195,1542,1,
-1449,1547,1,1701,1552,
-1,447,1557,1,205,
-1570,1,2467,1771,1,
-464,1777,1,2197,2120,
-16,0,697,1,1224,
-1575,1,223,1580,1,
-1730,1585,1,476,1590,
-1,477,1596,1,1231,
-1601,1,479,1606,1,
-480,1611,1,1485,1617,
-1,459,1782,1,242,
-1624,1,478,1629,1,
-481,1784,1,1001,1634,
-1,2508,2121,17,2122,
-15,2123,4,36,37,
-0,86,0,101,0,
-99,0,116,0,111,
-0,114,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-1,-1,1,5,2124,
-20,2125,4,38,86,
+0,76,0,105,0,
+115,0,116,0,95,
+0,49,0,1,187,
+1,3,1,2,1,
+1,2140,22,1,33,
+1,2528,2141,16,0,
+486,1,19,1211,1,
+20,2142,16,0,155,
+1,2281,1218,1,2533,
+2143,16,0,492,1,
+2538,1779,1,30,1781,
+1,1002,1657,1,283,
+1236,1,2547,2144,16,
+0,607,1,1010,2145,
+16,0,648,1,40,
+1241,1,41,1787,1,
+42,1791,1,44,1247,
+1,1260,1160,1,47,
+1248,1,48,1254,1,
+49,1260,1,50,1265,
+1,51,1270,1,305,
+1275,1,1514,1172,1,
+525,1280,1,61,2146,
+16,0,201,1,63,
+1286,1,66,1292,1,
+67,1297,1,68,1302,
+1,69,1307,1,70,
+1312,1,73,2147,16,
+0,211,1,74,1317,
+1,1013,1322,1,2335,
+2148,16,0,244,1,
+1332,1327,1,1048,1408,
+1,82,1344,1,1840,
+2149,16,0,316,1,
+1341,1361,1,2517,2150,
+17,2151,15,2152,4,
+30,37,0,73,0,
+110,0,116,0,68,
 0,101,0,99,0,
-116,0,111,0,114,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,1,-1,1,5,
+2153,20,2154,4,32,
+73,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,95,0,
+49,0,1,192,1,
+3,1,3,1,2,
+2155,22,1,38,1,
+2519,2156,16,0,646,
+1,1303,1371,1,1096,
+1376,1,93,1382,1,
+1550,1387,1,2526,2157,
+17,2158,15,2159,4,
+30,37,0,75,0,
+101,0,121,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,1,-1,1,5,
+2160,20,2161,4,32,
+75,0,101,0,121,
 0,68,0,101,0,
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
 0,110,0,95,0,
-49,0,1,184,1,
+49,0,1,191,1,
 3,1,3,1,2,
-2126,22,1,34,1,
-2509,2127,17,2128,15,
-2129,4,60,37,0,
+2162,22,1,37,1,
+827,1395,1,1011,1166,
+1,107,1402,1,1114,
+1407,1,328,1366,1,
+1871,2163,16,0,326,
+1,1370,1516,1,1478,
+1521,1,118,1419,1,
+1123,1424,1,371,1429,
+1,1377,1435,1,375,
+1440,1,1882,2164,16,
+0,344,1,377,1445,
+1,352,1413,1,379,
+1450,1,380,1455,1,
+130,1478,1,2074,2165,
+16,0,609,1,373,
+1473,1,1012,2166,16,
+0,650,1,143,1483,
+1,1152,1489,1,1406,
+1494,1,1159,1501,1,
+157,1506,1,1413,1511,
+1,883,1461,1,1094,
+2167,16,0,724,1,
+1296,1231,1,172,1532,
+1,1665,1537,1,1939,
+2168,16,0,464,1,
+1188,1542,1,1442,1547,
+1,188,1581,1,942,
+1553,1,1195,1559,1,
+2702,1803,1,1449,1564,
+1,1701,1569,1,447,
+1574,1,2711,2169,16,
+0,693,1,205,1587,
+1,2467,1806,1,464,
+1812,1,2197,2170,16,
+0,718,1,1224,1593,
+1,223,1598,1,1730,
+1603,1,476,1608,1,
+477,1614,1,1231,1619,
+1,479,1624,1,480,
+1629,1,1485,1635,1,
+459,1817,1,242,1642,
+1,478,1647,1,481,
+1819,1,1001,1652,1,
+2508,2171,17,2172,15,
+2173,4,36,37,0,
 86,0,101,0,99,
 0,116,0,111,0,
-114,0,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-76,0,105,0,115,
-0,116,0,1,-1,
-1,5,2130,20,2131,
-4,62,86,0,101,
-0,99,0,116,0,
-111,0,114,0,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
+114,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,1,
+-1,1,5,2174,20,
+2175,4,38,86,0,
+101,0,99,0,116,
+0,111,0,114,0,
 68,0,101,0,99,
 0,108,0,97,0,
 114,0,97,0,116,
 0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
-95,0,49,0,1,
-181,1,3,1,2,
-1,1,2132,22,1,
-31,1,18,2133,19,
-528,1,18,2134,5,
-84,1,1011,1148,1,
-1012,2135,16,0,526,
-1,1013,1304,1,262,
-1165,1,1267,2136,16,
-0,526,1,515,2137,
-16,0,526,1,1521,
-2138,16,0,526,1,
-525,1262,1,283,1218,
-1,2299,2139,16,0,
-526,1,42,2140,16,
-0,526,1,40,1223,
-1,44,1229,1,47,
-1230,1,1303,2141,16,
-0,526,1,1555,2142,
-16,0,526,1,50,
-1247,1,48,1236,1,
-49,1242,1,51,1252,
-1,63,1268,1,305,
-1257,1,66,1274,1,
-67,1279,1,68,1284,
-1,69,1289,1,70,
-1294,1,73,2143,16,
-0,526,1,74,1299,
-1,328,1348,1,1048,
-2144,16,0,526,1,
-82,2145,16,0,526,
-1,1840,2146,16,0,
-526,1,1591,2147,16,
-0,526,1,1341,2148,
-16,0,526,1,1096,
-1358,1,93,1364,1,
-352,1391,1,107,2149,
-16,0,526,1,1114,
-1389,1,118,2150,16,
-0,526,1,1123,2151,
-16,0,526,1,371,
-1407,1,1628,2152,16,
-0,526,1,375,1418,
-1,1882,2153,16,0,
-526,1,377,1423,1,
-379,1428,1,380,1433,
-1,883,2154,16,0,
-526,1,373,1451,1,
-130,2155,16,0,526,
-1,143,2156,16,0,
-526,1,387,2157,16,
-0,526,1,1159,2158,
-16,0,526,1,157,
-2159,16,0,526,1,
-1413,2160,16,0,526,
-1,1665,2161,16,0,
-526,1,412,2162,16,
-0,526,1,1377,2163,
-16,0,526,1,172,
-2164,16,0,526,1,
-1939,2165,16,0,526,
-1,437,2166,16,0,
-526,1,188,2167,16,
-0,526,1,942,2168,
-16,0,526,1,1195,
-2169,16,0,526,1,
-1449,2170,16,0,526,
-1,1701,2171,16,0,
-526,1,447,1557,1,
-2708,2172,16,0,526,
-1,205,2173,16,0,
-526,1,827,2174,16,
-0,526,1,223,2175,
-16,0,526,1,476,
-1590,1,477,1596,1,
-1231,2176,16,0,526,
-1,479,1606,1,480,
-1611,1,1485,2177,16,
-0,526,1,1737,2178,
-16,0,526,1,242,
-2179,16,0,526,1,
-478,1629,1,1001,1634,
-1,1002,1639,1,19,
-2180,19,228,1,19,
-2181,5,176,1,256,
-2182,16,0,226,1,
-1261,2183,16,0,226,
-1,1011,1148,1,1012,
-2184,16,0,500,1,
-2458,922,1,262,1165,
-1,1267,2185,16,0,
-500,1,2021,764,1,
-1521,2186,16,0,500,
-1,1775,2187,16,0,
-226,1,2029,771,1,
-2030,777,1,2031,782,
-1,2032,787,1,2033,
-792,1,277,2188,16,
-0,226,1,2035,798,
-1,2037,803,1,2039,
-808,1,32,2189,16,
-0,226,1,2464,945,
-1,2293,2190,16,0,
-226,1,2043,820,1,
-2045,825,1,2299,2191,
-16,0,500,1,41,
-2192,16,0,226,1,
-42,2193,16,0,500,
-1,40,1223,1,44,
-1229,1,43,2194,16,
-0,226,1,1804,2195,
-16,0,226,1,48,
-1236,1,49,1242,1,
-47,1230,1,51,1252,
-1,52,2196,16,0,
-226,1,50,1247,1,
-305,1257,1,1096,1358,
-1,1515,2197,16,0,
-226,1,2318,2198,16,
-0,226,1,283,1218,
-1,63,1268,1,66,
-1274,1,67,1279,1,
-68,1284,1,69,1289,
-1,70,1294,1,71,
-2199,16,0,226,1,
-73,2200,16,0,500,
-1,74,1299,1,1013,
-1304,1,76,2201,16,
-0,226,1,1834,2202,
-16,0,226,1,2337,
-2203,16,0,226,1,
-79,2204,16,0,226,
-1,1335,2205,16,0,
-226,1,299,2206,16,
-0,226,1,82,2207,
-16,0,500,1,1840,
-2208,16,0,500,1,
-1297,2209,16,0,226,
-1,85,2210,16,0,
-226,1,1341,2211,16,
-0,500,1,89,2212,
-16,0,226,1,1303,
-2213,16,0,500,1,
-509,2214,16,0,226,
-1,93,1364,1,322,
-2215,16,0,226,1,
-97,2216,16,0,226,
-1,2041,814,1,1555,
-2217,16,0,500,1,
-827,2218,16,0,500,
-1,102,2219,16,0,
-226,1,1860,867,1,
-1803,833,1,2364,873,
-1,107,2220,16,0,
-500,1,1114,1389,1,
-112,2221,16,0,226,
-1,1117,2222,16,0,
-226,1,352,1391,1,
-1873,881,1,118,2223,
-16,0,500,1,1123,
-2224,16,0,500,1,
-371,1407,1,515,2225,
-16,0,500,1,1377,
-2226,16,0,500,1,
-124,2227,16,0,226,
-1,1882,2228,16,0,
-500,1,377,1423,1,
-379,1428,1,380,1433,
-1,130,2229,16,0,
-500,1,346,2230,16,
-0,226,1,2075,2231,
-16,0,226,1,373,
-1451,1,387,2232,16,
-0,500,1,137,2233,
-16,0,226,1,143,
-2234,16,0,500,1,
-1901,2235,16,0,226,
-1,1048,2236,16,0,
-500,1,1153,2237,16,
-0,226,1,375,1418,
-1,151,2238,16,0,
-226,1,1407,2239,16,
-0,226,1,1659,2240,
-16,0,226,1,2413,
-2241,16,0,226,1,
-1159,2242,16,0,500,
-1,381,2243,16,0,
-226,1,157,2244,16,
-0,500,1,1413,2245,
-16,0,500,1,883,
-2246,16,0,500,1,
-1371,2247,16,0,226,
-1,328,1348,1,2105,
-860,1,2106,2248,16,
-0,226,1,166,2249,
-16,0,226,1,525,
-2250,16,0,226,1,
-1622,2251,16,0,226,
-1,406,2252,16,0,
-226,1,1574,845,1,
-172,2253,16,0,500,
-1,1931,906,1,412,
-2254,16,0,500,1,
-1933,2255,16,0,226,
-1,1876,2256,16,0,
-226,1,431,2257,16,
-0,226,1,1585,2258,
-16,0,226,1,182,
-2259,16,0,226,1,
-1628,2260,16,0,500,
-1,1189,2261,16,0,
-226,1,437,2262,16,
-0,500,1,1591,2263,
-16,0,500,1,188,
-2264,16,0,500,1,
-1695,2265,16,0,226,
-1,2198,2266,16,0,
-226,1,1195,2267,16,
-0,500,1,2702,2268,
-16,0,226,1,1449,
-2269,16,0,500,1,
-1701,2270,16,0,500,
-1,447,2271,16,0,
-226,1,2708,2272,16,
-0,500,1,199,2273,
-16,0,226,1,2459,
-928,1,1958,2274,16,
-0,226,1,2462,935,
-1,1657,940,1,205,
-2275,16,0,500,1,
-459,2276,16,0,226,
-1,462,2277,16,0,
-226,1,1665,2278,16,
-0,500,1,217,2279,
-16,0,226,1,2227,
-954,1,942,2280,16,
-0,500,1,1225,2281,
-16,0,226,1,223,
-2282,16,0,500,1,
-1479,2283,16,0,226,
-1,1731,2284,16,0,
-226,1,477,1596,1,
-1231,2285,16,0,500,
-1,479,1606,1,480,
-1611,1,1485,2286,16,
-0,500,1,1737,2287,
-16,0,500,1,1989,
-962,1,1990,2288,16,
-0,226,1,1443,2289,
-16,0,226,1,236,
-2290,16,0,226,1,
-2136,888,1,476,1590,
-1,242,2291,16,0,
-500,1,478,1629,1,
-1939,2292,16,0,500,
-1,1001,1634,1,1002,
-1639,1,1756,2293,16,
-0,226,1,20,2294,
-19,480,1,20,2295,
-5,84,1,1011,1148,
-1,1012,2296,16,0,
-478,1,1013,1304,1,
-262,1165,1,1267,2297,
-16,0,478,1,515,
-2298,16,0,478,1,
-1521,2299,16,0,478,
-1,525,1262,1,283,
-1218,1,2299,2300,16,
-0,478,1,42,2301,
-16,0,478,1,40,
-1223,1,44,1229,1,
-47,1230,1,1303,2302,
-16,0,478,1,1555,
-2303,16,0,478,1,
-50,1247,1,48,1236,
-1,49,1242,1,51,
-1252,1,63,1268,1,
-305,1257,1,66,1274,
-1,67,1279,1,68,
-1284,1,69,1289,1,
-70,1294,1,73,2304,
-16,0,478,1,74,
-1299,1,328,2305,16,
-0,478,1,1048,2306,
-16,0,478,1,82,
-2307,16,0,478,1,
-1840,2308,16,0,478,
-1,1591,2309,16,0,
-478,1,1341,2310,16,
-0,478,1,1096,1358,
-1,93,1364,1,352,
-2311,16,0,478,1,
-107,2312,16,0,478,
-1,1114,1389,1,118,
-2313,16,0,478,1,
-1123,2314,16,0,478,
-1,371,1407,1,1628,
-2315,16,0,478,1,
-375,1418,1,1882,2316,
-16,0,478,1,377,
-1423,1,379,1428,1,
-380,1433,1,883,2317,
-16,0,478,1,373,
-1451,1,130,2318,16,
-0,478,1,143,2319,
-16,0,478,1,387,
-2320,16,0,478,1,
-1159,2321,16,0,478,
-1,157,2322,16,0,
-478,1,1413,2323,16,
-0,478,1,1665,2324,
-16,0,478,1,412,
-2325,16,0,478,1,
-1377,2326,16,0,478,
-1,172,2327,16,0,
-478,1,1939,2328,16,
-0,478,1,437,2329,
-16,0,478,1,188,
-2330,16,0,478,1,
-942,2331,16,0,478,
-1,1195,2332,16,0,
-478,1,1449,2333,16,
-0,478,1,1701,2334,
-16,0,478,1,447,
-1557,1,2708,2335,16,
-0,478,1,205,2336,
-16,0,478,1,827,
-2337,16,0,478,1,
-223,2338,16,0,478,
-1,476,1590,1,477,
-1596,1,1231,2339,16,
-0,478,1,479,1606,
-1,480,1611,1,1485,
-2340,16,0,478,1,
-1737,2341,16,0,478,
-1,242,2342,16,0,
-478,1,478,1629,1,
-1001,1634,1,1002,1639,
-1,21,2343,19,446,
-1,21,2344,5,84,
-1,1011,1148,1,1012,
-2345,16,0,444,1,
-1013,1304,1,262,1165,
-1,1267,2346,16,0,
-444,1,515,2347,16,
-0,444,1,1521,2348,
-16,0,444,1,525,
-1262,1,283,1218,1,
-2299,2349,16,0,444,
-1,42,2350,16,0,
-444,1,40,1223,1,
-44,1229,1,47,1230,
-1,1303,2351,16,0,
-444,1,1555,2352,16,
-0,444,1,50,1247,
-1,48,1236,1,49,
-1242,1,51,1252,1,
-63,1268,1,305,1257,
-1,66,1274,1,67,
-1279,1,68,1284,1,
-69,1289,1,70,1294,
-1,73,2353,16,0,
-444,1,74,1299,1,
-328,2354,16,0,444,
-1,1048,2355,16,0,
-444,1,82,2356,16,
-0,444,1,1840,2357,
-16,0,444,1,1591,
-2358,16,0,444,1,
-1341,2359,16,0,444,
-1,1096,1358,1,93,
-1364,1,352,2360,16,
-0,444,1,107,2361,
-16,0,444,1,1114,
-1389,1,118,2362,16,
-0,444,1,1123,2363,
-16,0,444,1,371,
-1407,1,1628,2364,16,
-0,444,1,375,1418,
-1,1882,2365,16,0,
-444,1,377,1423,1,
-379,1428,1,380,1433,
-1,883,2366,16,0,
-444,1,373,1451,1,
-130,2367,16,0,444,
-1,143,2368,16,0,
-444,1,387,2369,16,
-0,444,1,1159,2370,
-16,0,444,1,157,
-2371,16,0,444,1,
-1413,2372,16,0,444,
-1,1665,2373,16,0,
-444,1,412,2374,16,
-0,444,1,1377,2375,
-16,0,444,1,172,
-2376,16,0,444,1,
-1939,2377,16,0,444,
-1,437,2378,16,0,
-444,1,188,2379,16,
-0,444,1,942,2380,
-16,0,444,1,1195,
-2381,16,0,444,1,
-1449,2382,16,0,444,
-1,1701,2383,16,0,
-444,1,447,1557,1,
-2708,2384,16,0,444,
+110,0,95,0,49,
+0,1,193,1,3,
+1,3,1,2,2176,
+22,1,39,1,2509,
+2177,17,2178,15,2179,
+4,60,37,0,86,
+0,101,0,99,0,
+116,0,111,0,114,
+0,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,76,
+0,105,0,115,0,
+116,0,1,-1,1,
+5,2180,20,2181,4,
+62,86,0,101,0,
+99,0,116,0,111,
+0,114,0,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,76,0,105,0,
+115,0,116,0,95,
+0,49,0,1,189,
+1,3,1,2,1,
+1,2182,22,1,35,
+1,18,2183,19,539,
+1,18,2184,5,84,
+1,1011,1166,1,1012,
+2185,16,0,537,1,
+1013,1322,1,262,1183,
+1,1267,2186,16,0,
+537,1,515,2187,16,
+0,537,1,1521,2188,
+16,0,537,1,525,
+1280,1,283,1236,1,
+2299,2189,16,0,537,
+1,42,2190,16,0,
+537,1,40,1241,1,
+44,1247,1,47,1248,
+1,1303,2191,16,0,
+537,1,1555,2192,16,
+0,537,1,50,1265,
+1,48,1254,1,49,
+1260,1,51,1270,1,
+63,1286,1,305,1275,
+1,66,1292,1,67,
+1297,1,68,1302,1,
+69,1307,1,70,1312,
+1,73,2193,16,0,
+537,1,74,1317,1,
+328,1366,1,1048,2194,
+16,0,537,1,82,
+2195,16,0,537,1,
+1840,2196,16,0,537,
+1,1591,2197,16,0,
+537,1,1341,2198,16,
+0,537,1,1096,1376,
+1,93,1382,1,352,
+1413,1,107,2199,16,
+0,537,1,1114,1407,
+1,118,2200,16,0,
+537,1,1123,2201,16,
+0,537,1,371,1429,
+1,1628,2202,16,0,
+537,1,375,1440,1,
+1882,2203,16,0,537,
+1,377,1445,1,379,
+1450,1,380,1455,1,
+883,2204,16,0,537,
+1,373,1473,1,130,
+2205,16,0,537,1,
+143,2206,16,0,537,
+1,387,2207,16,0,
+537,1,1159,2208,16,
+0,537,1,157,2209,
+16,0,537,1,1413,
+2210,16,0,537,1,
+1665,2211,16,0,537,
+1,412,2212,16,0,
+537,1,1377,2213,16,
+0,537,1,172,2214,
+16,0,537,1,1939,
+2215,16,0,537,1,
+437,2216,16,0,537,
+1,188,2217,16,0,
+537,1,942,2218,16,
+0,537,1,1195,2219,
+16,0,537,1,1449,
+2220,16,0,537,1,
+1701,2221,16,0,537,
+1,447,1574,1,205,
+2222,16,0,537,1,
+827,2223,16,0,537,
+1,2724,2224,16,0,
+537,1,223,2225,16,
+0,537,1,476,1608,
+1,477,1614,1,1231,
+2226,16,0,537,1,
+479,1624,1,480,1629,
+1,1485,2227,16,0,
+537,1,1737,2228,16,
+0,537,1,242,2229,
+16,0,537,1,478,
+1647,1,1001,1652,1,
+1002,1657,1,19,2230,
+19,233,1,19,2231,
+5,176,1,256,2232,
+16,0,231,1,1261,
+2233,16,0,231,1,
+1011,1166,1,1012,2234,
+16,0,507,1,2458,
+940,1,262,1183,1,
+1267,2235,16,0,507,
+1,2021,782,1,1521,
+2236,16,0,507,1,
+1775,2237,16,0,231,
+1,2029,789,1,2030,
+795,1,2031,800,1,
+2032,805,1,2033,810,
+1,277,2238,16,0,
+231,1,2035,816,1,
+2037,821,1,2039,826,
+1,32,2239,16,0,
+231,1,2464,963,1,
+2293,2240,16,0,231,
+1,2043,838,1,2045,
+843,1,2299,2241,16,
+0,507,1,41,2242,
+16,0,231,1,42,
+2243,16,0,507,1,
+40,1241,1,44,1247,
+1,43,2244,16,0,
+231,1,1804,2245,16,
+0,231,1,48,1254,
+1,49,1260,1,47,
+1248,1,51,1270,1,
+52,2246,16,0,231,
+1,50,1265,1,305,
+1275,1,1096,1376,1,
+1515,2247,16,0,231,
+1,2318,2248,16,0,
+231,1,283,1236,1,
+63,1286,1,66,1292,
+1,67,1297,1,68,
+1302,1,69,1307,1,
+70,1312,1,71,2249,
+16,0,231,1,73,
+2250,16,0,507,1,
+74,1317,1,1013,1322,
+1,76,2251,16,0,
+231,1,1834,2252,16,
+0,231,1,2337,2253,
+16,0,231,1,79,
+2254,16,0,231,1,
+1335,2255,16,0,231,
+1,299,2256,16,0,
+231,1,82,2257,16,
+0,507,1,1840,2258,
+16,0,507,1,1297,
+2259,16,0,231,1,
+85,2260,16,0,231,
+1,1341,2261,16,0,
+507,1,89,2262,16,
+0,231,1,1303,2263,
+16,0,507,1,509,
+2264,16,0,231,1,
+93,1382,1,322,2265,
+16,0,231,1,97,
+2266,16,0,231,1,
+2041,832,1,1555,2267,
+16,0,507,1,827,
+2268,16,0,507,1,
+102,2269,16,0,231,
+1,1860,885,1,1803,
+851,1,2364,891,1,
+107,2270,16,0,507,
+1,1114,1407,1,112,
+2271,16,0,231,1,
+1117,2272,16,0,231,
+1,352,1413,1,1873,
+899,1,118,2273,16,
+0,507,1,1123,2274,
+16,0,507,1,371,
+1429,1,515,2275,16,
+0,507,1,1377,2276,
+16,0,507,1,124,
+2277,16,0,231,1,
+1882,2278,16,0,507,
+1,377,1445,1,379,
+1450,1,380,1455,1,
+130,2279,16,0,507,
+1,346,2280,16,0,
+231,1,2075,2281,16,
+0,231,1,373,1473,
+1,387,2282,16,0,
+507,1,137,2283,16,
+0,231,1,143,2284,
+16,0,507,1,1901,
+2285,16,0,231,1,
+1048,2286,16,0,507,
+1,1153,2287,16,0,
+231,1,375,1440,1,
+151,2288,16,0,231,
+1,1407,2289,16,0,
+231,1,1659,2290,16,
+0,231,1,2413,2291,
+16,0,231,1,1159,
+2292,16,0,507,1,
+381,2293,16,0,231,
+1,157,2294,16,0,
+507,1,1413,2295,16,
+0,507,1,883,2296,
+16,0,507,1,1371,
+2297,16,0,231,1,
+328,1366,1,2105,878,
+1,2106,2298,16,0,
+231,1,166,2299,16,
+0,231,1,525,2300,
+16,0,231,1,1622,
+2301,16,0,231,1,
+406,2302,16,0,231,
+1,1574,863,1,172,
+2303,16,0,507,1,
+1931,925,1,412,2304,
+16,0,507,1,1933,
+2305,16,0,231,1,
+1876,2306,16,0,231,
+1,431,2307,16,0,
+231,1,1585,2308,16,
+0,231,1,182,2309,
+16,0,231,1,1628,
+2310,16,0,507,1,
+1189,2311,16,0,231,
+1,437,2312,16,0,
+507,1,1591,2313,16,
+0,507,1,188,2314,
+16,0,507,1,1695,
+2315,16,0,231,1,
+2198,2316,16,0,231,
+1,1195,2317,16,0,
+507,1,1449,2318,16,
+0,507,1,1701,2319,
+16,0,507,1,447,
+2320,16,0,231,1,
+199,2321,16,0,231,
+1,2459,946,1,1958,
+2322,16,0,231,1,
+2462,953,1,1657,958,
+1,205,2323,16,0,
+507,1,459,2324,16,
+0,231,1,462,2325,
+16,0,231,1,1665,
+2326,16,0,507,1,
+2724,2327,16,0,507,
+1,2718,2328,16,0,
+231,1,217,2329,16,
+0,231,1,2227,972,
+1,942,2330,16,0,
+507,1,1225,2331,16,
+0,231,1,223,2332,
+16,0,507,1,1479,
+2333,16,0,231,1,
+1731,2334,16,0,231,
+1,477,1614,1,1231,
+2335,16,0,507,1,
+479,1624,1,480,1629,
+1,1485,2336,16,0,
+507,1,1737,2337,16,
+0,507,1,1989,980,
+1,1990,2338,16,0,
+231,1,1443,2339,16,
+0,231,1,236,2340,
+16,0,231,1,2136,
+906,1,476,1608,1,
+242,2341,16,0,507,
+1,478,1647,1,1939,
+2342,16,0,507,1,
+1001,1652,1,1002,1657,
+1,1756,2343,16,0,
+231,1,20,2344,19,
+484,1,20,2345,5,
+84,1,1011,1166,1,
+1012,2346,16,0,482,
+1,1013,1322,1,262,
+1183,1,1267,2347,16,
+0,482,1,515,2348,
+16,0,482,1,1521,
+2349,16,0,482,1,
+525,1280,1,283,1236,
+1,2299,2350,16,0,
+482,1,42,2351,16,
+0,482,1,40,1241,
+1,44,1247,1,47,
+1248,1,1303,2352,16,
+0,482,1,1555,2353,
+16,0,482,1,50,
+1265,1,48,1254,1,
+49,1260,1,51,1270,
+1,63,1286,1,305,
+1275,1,66,1292,1,
+67,1297,1,68,1302,
+1,69,1307,1,70,
+1312,1,73,2354,16,
+0,482,1,74,1317,
+1,328,2355,16,0,
+482,1,1048,2356,16,
+0,482,1,82,2357,
+16,0,482,1,1840,
+2358,16,0,482,1,
+1591,2359,16,0,482,
+1,1341,2360,16,0,
+482,1,1096,1376,1,
+93,1382,1,352,2361,
+16,0,482,1,107,
+2362,16,0,482,1,
+1114,1407,1,118,2363,
+16,0,482,1,1123,
+2364,16,0,482,1,
+371,1429,1,1628,2365,
+16,0,482,1,375,
+1440,1,1882,2366,16,
+0,482,1,377,1445,
+1,379,1450,1,380,
+1455,1,883,2367,16,
+0,482,1,373,1473,
+1,130,2368,16,0,
+482,1,143,2369,16,
+0,482,1,387,2370,
+16,0,482,1,1159,
+2371,16,0,482,1,
+157,2372,16,0,482,
+1,1413,2373,16,0,
+482,1,1665,2374,16,
+0,482,1,412,2375,
+16,0,482,1,1377,
+2376,16,0,482,1,
+172,2377,16,0,482,
+1,1939,2378,16,0,
+482,1,437,2379,16,
+0,482,1,188,2380,
+16,0,482,1,942,
+2381,16,0,482,1,
+1195,2382,16,0,482,
+1,1449,2383,16,0,
+482,1,1701,2384,16,
+0,482,1,447,1574,
 1,205,2385,16,0,
-444,1,827,2386,16,
-0,444,1,223,2387,
-16,0,444,1,476,
-1590,1,477,1596,1,
-1231,2388,16,0,444,
-1,479,1606,1,480,
-1611,1,1485,2389,16,
-0,444,1,1737,2390,
-16,0,444,1,242,
-2391,16,0,444,1,
-478,1629,1,1001,1634,
-1,1002,1639,1,22,
-2392,19,397,1,22,
-2393,5,84,1,1011,
-1148,1,1012,2394,16,
-0,395,1,1013,1304,
-1,262,1165,1,1267,
-2395,16,0,395,1,
-515,2396,16,0,395,
-1,1521,2397,16,0,
-395,1,525,1262,1,
-283,1218,1,2299,2398,
-16,0,395,1,42,
-2399,16,0,395,1,
-40,1223,1,44,1229,
-1,47,1230,1,1303,
-2400,16,0,395,1,
-1555,2401,16,0,395,
-1,50,1247,1,48,
-1236,1,49,1242,1,
-51,1252,1,63,1268,
-1,305,1257,1,66,
-1274,1,67,1279,1,
-68,1284,1,69,1289,
-1,70,1294,1,73,
-2402,16,0,395,1,
-74,1299,1,328,2403,
-16,0,395,1,1048,
-2404,16,0,395,1,
-82,2405,16,0,395,
-1,1840,2406,16,0,
-395,1,1591,2407,16,
-0,395,1,1341,2408,
-16,0,395,1,1096,
-1358,1,93,1364,1,
-352,2409,16,0,395,
-1,107,2410,16,0,
-395,1,1114,1389,1,
-118,2411,16,0,395,
-1,1123,2412,16,0,
-395,1,371,1407,1,
-1628,2413,16,0,395,
-1,375,1418,1,1882,
-2414,16,0,395,1,
-377,1423,1,379,1428,
-1,380,1433,1,883,
-2415,16,0,395,1,
-373,1451,1,130,2416,
-16,0,395,1,143,
-2417,16,0,395,1,
-387,2418,16,0,395,
-1,1159,2419,16,0,
-395,1,157,2420,16,
-0,395,1,1413,2421,
-16,0,395,1,1665,
-2422,16,0,395,1,
-412,2423,16,0,395,
-1,1377,2424,16,0,
-395,1,172,2425,16,
-0,395,1,1939,2426,
-16,0,395,1,437,
-2427,16,0,395,1,
-188,2428,16,0,395,
-1,942,2429,16,0,
-395,1,1195,2430,16,
-0,395,1,1449,2431,
-16,0,395,1,1701,
-2432,16,0,395,1,
-447,1557,1,2708,2433,
-16,0,395,1,205,
-2434,16,0,395,1,
-827,2435,16,0,395,
-1,223,2436,16,0,
-395,1,476,1590,1,
-477,1596,1,1231,2437,
-16,0,395,1,479,
-1606,1,480,1611,1,
-1485,2438,16,0,395,
-1,1737,2439,16,0,
-395,1,242,2440,16,
-0,395,1,478,1629,
-1,1001,1634,1,1002,
-1639,1,23,2441,19,
-542,1,23,2442,5,
-38,1,1901,2443,16,
-0,540,1,2075,2444,
-16,0,540,1,1860,
-867,1,1803,833,1,
-1804,2445,16,0,540,
-1,2413,2446,16,0,
-540,1,2198,2447,16,
-0,540,1,1873,881,
-1,1657,940,1,1989,
-962,1,1990,2448,16,
-0,540,1,1775,2449,
-16,0,540,1,32,
-2450,16,0,540,1,
-2105,860,1,2106,2451,
-16,0,540,1,2364,
-873,1,2227,954,1,
-2337,2452,16,0,540,
-1,2021,764,1,2458,
-922,1,2459,928,1,
-2462,935,1,2136,888,
-1,2464,945,1,2029,
-771,1,2030,777,1,
-2031,782,1,2032,787,
-1,2033,792,1,2035,
-798,1,2037,803,1,
-2039,808,1,1931,906,
-1,2041,814,1,2043,
-820,1,2045,825,1,
-1574,845,1,1958,2453,
-16,0,540,1,24,
-2454,19,177,1,24,
-2455,5,5,1,44,
-2456,16,0,175,1,
-377,2457,16,0,578,
-1,40,2458,16,0,
-720,1,63,2459,16,
-0,196,1,373,2460,
-16,0,574,1,25,
-2461,19,302,1,25,
-2462,5,177,1,256,
-2463,16,0,583,1,
-1261,2464,16,0,583,
-1,1011,1148,1,1012,
-2465,16,0,300,1,
-2458,922,1,262,1165,
-1,1267,2466,16,0,
-300,1,2021,764,1,
-1521,2467,16,0,300,
-1,1775,2468,16,0,
-583,1,2029,771,1,
-2030,777,1,2031,782,
-1,2032,787,1,2033,
-792,1,277,2469,16,
-0,583,1,2035,798,
-1,2037,803,1,2039,
-808,1,32,2470,16,
-0,583,1,2464,945,
-1,2293,2471,16,0,
-583,1,2043,820,1,
-2045,825,1,2299,2472,
-16,0,300,1,41,
-2473,16,0,583,1,
-42,2474,16,0,300,
-1,40,1223,1,44,
-1229,1,43,2475,16,
-0,583,1,1804,2476,
-16,0,583,1,48,
-1236,1,49,1242,1,
-47,1230,1,51,1252,
-1,52,2477,16,0,
-583,1,50,1247,1,
-305,1257,1,1096,1358,
-1,1515,2478,16,0,
-583,1,2318,2479,16,
-0,583,1,62,2480,
-16,0,583,1,63,
-1268,1,66,1274,1,
-67,1279,1,68,1284,
-1,69,1289,1,70,
-1294,1,71,2481,16,
-0,583,1,283,1218,
-1,73,2482,16,0,
-300,1,74,1299,1,
-1013,1304,1,76,2483,
-16,0,583,1,1834,
-2484,16,0,583,1,
-2337,2485,16,0,583,
-1,79,2486,16,0,
-583,1,1335,2487,16,
-0,583,1,299,2488,
-16,0,583,1,82,
-2489,16,0,300,1,
-1840,2490,16,0,300,
-1,1297,2491,16,0,
-583,1,85,2492,16,
-0,583,1,1341,2493,
-16,0,300,1,89,
-2494,16,0,583,1,
-1303,2495,16,0,300,
-1,509,2496,16,0,
-583,1,93,1364,1,
-322,2497,16,0,583,
-1,97,2498,16,0,
-583,1,2041,814,1,
-1555,2499,16,0,300,
-1,827,2500,16,0,
-300,1,102,2501,16,
-0,583,1,1860,867,
-1,1803,833,1,2364,
-873,1,107,2502,16,
-0,300,1,1114,1389,
-1,112,2503,16,0,
-583,1,1117,2504,16,
-0,583,1,352,1391,
-1,1873,881,1,118,
-1397,1,1123,2505,16,
-0,300,1,371,1407,
-1,515,2506,16,0,
-300,1,1377,2507,16,
-0,300,1,124,2508,
-16,0,583,1,1882,
-2509,16,0,300,1,
-377,1423,1,379,1428,
-1,380,1433,1,130,
-1456,1,346,2510,16,
-0,583,1,2075,2511,
-16,0,583,1,373,
-1451,1,387,2512,16,
-0,300,1,137,2513,
-16,0,583,1,143,
-2514,16,0,300,1,
-1901,2515,16,0,583,
-1,1048,1467,1,1153,
-2516,16,0,583,1,
-375,1418,1,151,2517,
-16,0,583,1,1407,
-2518,16,0,583,1,
-1659,2519,16,0,583,
-1,2413,2520,16,0,
-583,1,1159,2521,16,
-0,300,1,381,2522,
-16,0,583,1,157,
-2523,16,0,300,1,
-1413,2524,16,0,300,
-1,883,2525,16,0,
-300,1,1371,2526,16,
-0,583,1,328,1348,
-1,2105,860,1,2106,
-2527,16,0,583,1,
-166,2528,16,0,583,
-1,525,2529,16,0,
-583,1,1622,2530,16,
-0,583,1,406,2531,
-16,0,583,1,1574,
-845,1,172,1515,1,
-1931,906,1,412,2532,
-16,0,300,1,1933,
-2533,16,0,583,1,
-1876,2534,16,0,583,
-1,431,2535,16,0,
-583,1,1585,2536,16,
-0,583,1,182,2537,
-16,0,583,1,1628,
-2538,16,0,300,1,
-1189,2539,16,0,583,
-1,437,2540,16,0,
-300,1,1591,2541,16,
-0,300,1,188,1565,
-1,1695,2542,16,0,
-583,1,2198,2543,16,
-0,583,1,1195,2544,
-16,0,300,1,2702,
-2545,16,0,583,1,
-1449,2546,16,0,300,
-1,1701,2547,16,0,
-300,1,447,2548,16,
-0,583,1,2708,2549,
-16,0,300,1,199,
-2550,16,0,583,1,
-2459,928,1,1958,2551,
-16,0,583,1,2462,
-935,1,1657,940,1,
-205,2552,16,0,300,
-1,459,2553,16,0,
-583,1,462,2554,16,
-0,583,1,1665,2555,
-16,0,300,1,217,
-2556,16,0,583,1,
-2227,954,1,942,1536,
-1,1225,2557,16,0,
-583,1,223,2558,16,
-0,300,1,1479,2559,
-16,0,583,1,1731,
-2560,16,0,583,1,
-477,1596,1,1231,2561,
-16,0,300,1,479,
-1606,1,480,1611,1,
-1485,2562,16,0,300,
-1,1737,2563,16,0,
-300,1,1989,962,1,
-1990,2564,16,0,583,
-1,1443,2565,16,0,
-583,1,236,2566,16,
-0,583,1,2136,888,
-1,476,1590,1,242,
-2567,16,0,300,1,
-478,1629,1,1939,2568,
-16,0,300,1,1001,
-1634,1,1002,1639,1,
-1756,2569,16,0,583,
-1,26,2570,19,318,
-1,26,2571,5,84,
-1,1011,1148,1,1012,
-2572,16,0,316,1,
-1013,1304,1,262,1165,
-1,1267,2573,16,0,
-316,1,515,2574,16,
-0,695,1,1521,2575,
-16,0,316,1,525,
-1262,1,283,1218,1,
-2299,2576,16,0,316,
-1,42,2577,16,0,
-316,1,40,1223,1,
-44,1229,1,47,1230,
-1,1303,2578,16,0,
-316,1,1555,2579,16,
-0,316,1,50,1247,
-1,48,1236,1,49,
-1242,1,51,1252,1,
-63,1268,1,305,1257,
-1,66,1274,1,67,
-1279,1,68,1284,1,
-69,1289,1,70,1294,
-1,73,2580,16,0,
-316,1,74,1299,1,
-328,1348,1,1048,1467,
-1,82,2581,16,0,
-316,1,1840,2582,16,
-0,316,1,1591,2583,
-16,0,316,1,1341,
-2584,16,0,316,1,
-1096,1358,1,93,1364,
-1,352,1391,1,107,
-2585,16,0,316,1,
-1114,1389,1,118,1397,
-1,1123,2586,16,0,
-316,1,371,1407,1,
-1628,2587,16,0,316,
-1,375,1418,1,1882,
-2588,16,0,316,1,
-377,1423,1,379,1428,
-1,380,1433,1,883,
-2589,16,0,316,1,
-373,1451,1,130,1456,
-1,143,2590,16,0,
-316,1,387,2591,16,
-0,316,1,1159,2592,
-16,0,316,1,157,
-2593,16,0,316,1,
-1413,2594,16,0,316,
-1,1665,2595,16,0,
-316,1,412,2596,16,
-0,316,1,1377,2597,
-16,0,316,1,172,
-1515,1,1939,2598,16,
-0,316,1,437,2599,
-16,0,624,1,188,
-1565,1,942,1536,1,
-1195,2600,16,0,316,
-1,1449,2601,16,0,
-316,1,1701,2602,16,
-0,316,1,447,1557,
-1,2708,2603,16,0,
-316,1,205,2604,16,
-0,316,1,827,2605,
-16,0,316,1,223,
-2606,16,0,316,1,
-476,1590,1,477,1596,
-1,1231,2607,16,0,
-316,1,479,1606,1,
-480,1611,1,1485,2608,
-16,0,316,1,1737,
-2609,16,0,316,1,
-242,2610,16,0,316,
-1,478,1629,1,1001,
-1634,1,1002,1639,1,
-27,2611,19,635,1,
-27,2612,5,95,1,
-256,2613,16,0,633,
-1,1261,2614,16,0,
-633,1,509,2615,16,
-0,633,1,1515,2616,
-16,0,633,1,2021,
-764,1,1775,2617,16,
-0,633,1,2029,771,
-1,2030,777,1,2031,
-782,1,2032,787,1,
-2033,792,1,277,2618,
-16,0,633,1,2035,
-798,1,2037,803,1,
-2039,808,1,32,2619,
-16,0,633,1,2041,
-814,1,2293,2620,16,
-0,633,1,2043,820,
-1,2045,825,1,41,
-2621,16,0,633,1,
-1297,2622,16,0,633,
-1,43,2623,16,0,
-633,1,1803,833,1,
-1804,2624,16,0,633,
-1,299,2625,16,0,
-633,1,52,2626,16,
-0,633,1,2318,2627,
-16,0,633,1,62,
-2628,16,0,633,1,
-2075,2629,16,0,633,
-1,1574,845,1,71,
-2630,16,0,633,1,
-76,2631,16,0,633,
-1,1834,2632,16,0,
-633,1,2337,2633,16,
-0,633,1,79,2634,
-16,0,633,1,1335,
-2635,16,0,633,1,
-322,2636,16,0,633,
-1,85,2637,16,0,
-633,1,89,2638,16,
-0,633,1,346,2639,
-16,0,633,1,2105,
-860,1,2106,2640,16,
-0,633,1,97,2641,
-16,0,633,1,1860,
-867,1,2364,873,1,
-102,2642,16,0,633,
-1,112,2643,16,0,
-633,1,1117,2644,16,
-0,633,1,1873,881,
-1,1876,2645,16,0,
-633,1,124,2646,16,
-0,633,1,2136,888,
-1,381,2647,16,0,
-633,1,525,2648,16,
-0,633,1,137,2649,
-16,0,633,1,1901,
-2650,16,0,633,1,
-1153,2651,16,0,633,
-1,151,2652,16,0,
-633,1,1407,2653,16,
-0,633,1,1659,2654,
-16,0,633,1,2413,
-2655,16,0,633,1,
-406,2656,16,0,633,
-1,1371,2657,16,0,
-633,1,166,2658,16,
-0,633,1,1622,2659,
-16,0,633,1,1931,
-906,1,1933,2660,16,
-0,633,1,431,2661,
-16,0,633,1,1585,
-2662,16,0,633,1,
-182,2663,16,0,633,
-1,1189,2664,16,0,
-633,1,1443,2665,16,
-0,633,1,1695,2666,
-16,0,633,1,2198,
-2667,16,0,633,1,
-2702,2668,16,0,633,
-1,447,2669,16,0,
-633,1,2458,922,1,
-2459,928,1,1958,2670,
-16,0,633,1,2462,
-935,1,1657,940,1,
-2464,945,1,199,2671,
-16,0,633,1,459,
-2672,16,0,633,1,
-462,2673,16,0,633,
-1,217,2674,16,0,
-633,1,2227,954,1,
-1225,2675,16,0,633,
-1,1479,2676,16,0,
-633,1,1731,2677,16,
-0,633,1,1989,962,
-1,1990,2678,16,0,
-633,1,236,2679,16,
-0,633,1,1756,2680,
-16,0,633,1,28,
-2681,19,666,1,28,
-2682,5,60,1,328,
-1348,1,223,1580,1,
-1096,1358,1,118,1397,
-1,883,1439,1,525,
-1262,1,1001,1634,1,
-130,1456,1,459,1782,
-1,1114,1389,1,352,
-1391,1,447,1557,1,
-464,1777,1,1011,1148,
-1,1013,1304,1,242,
-1624,1,143,1461,1,
-40,1223,1,41,1750,
-1,42,1754,1,479,
-1606,1,44,1229,1,
-481,1784,1,373,1451,
-1,47,1230,1,157,
-1489,1,49,1242,1,
-50,1247,1,48,1236,
-1,379,1428,1,380,
-1433,1,51,1252,1,
-476,1590,1,371,1407,
-1,478,1629,1,1048,
-1467,1,375,1418,1,
-172,1515,1,262,1165,
-1,283,1218,1,63,
-1268,1,67,1279,1,
-68,1284,1,69,1289,
-1,66,1274,1,461,
-2683,16,0,664,1,
-74,1299,1,377,1423,
-1,1002,1639,1,70,
-1294,1,188,1565,1,
-82,1326,1,305,1257,
-1,477,1596,1,827,
-1377,1,93,1364,1,
-480,1611,1,205,1570,
-1,942,1536,1,107,
-1384,1,29,2684,19,
-291,1,29,2685,5,
-84,1,1011,1148,1,
-1012,2686,16,0,289,
-1,1013,1304,1,262,
-1165,1,1267,2687,16,
-0,289,1,515,2688,
-16,0,289,1,1521,
-2689,16,0,289,1,
-525,1262,1,283,1218,
-1,2299,2690,16,0,
-289,1,42,2691,16,
-0,289,1,40,1223,
-1,44,1229,1,47,
-1230,1,1303,2692,16,
-0,289,1,1555,2693,
-16,0,289,1,50,
-1247,1,48,1236,1,
-49,1242,1,51,1252,
-1,63,1268,1,305,
-1257,1,66,1274,1,
-67,1279,1,68,1284,
-1,69,1289,1,70,
-1294,1,73,2694,16,
-0,289,1,74,1299,
-1,328,1348,1,1048,
-1467,1,82,2695,16,
-0,289,1,1840,2696,
-16,0,289,1,1591,
-2697,16,0,289,1,
-1341,2698,16,0,289,
-1,1096,1358,1,93,
-1364,1,352,1391,1,
-107,2699,16,0,289,
-1,1114,1389,1,118,
-1397,1,1123,2700,16,
-0,289,1,371,1407,
-1,1628,2701,16,0,
-289,1,375,1418,1,
-1882,2702,16,0,289,
-1,377,1423,1,379,
-1428,1,380,1433,1,
-883,2703,16,0,289,
-1,373,1451,1,130,
-1456,1,143,1461,1,
-387,2704,16,0,289,
-1,1159,2705,16,0,
-289,1,157,1489,1,
-1413,2706,16,0,289,
-1,1665,2707,16,0,
-289,1,412,2708,16,
-0,289,1,1377,2709,
-16,0,289,1,172,
-1515,1,1939,2710,16,
-0,289,1,437,2711,
-16,0,289,1,188,
-1565,1,942,1536,1,
-1195,2712,16,0,289,
-1,1449,2713,16,0,
-289,1,1701,2714,16,
-0,289,1,447,1557,
-1,2708,2715,16,0,
-289,1,205,2716,16,
-0,289,1,827,2717,
-16,0,289,1,223,
-2718,16,0,289,1,
-476,1590,1,477,1596,
-1,1231,2719,16,0,
-289,1,479,1606,1,
-480,1611,1,1485,2720,
-16,0,289,1,1737,
-2721,16,0,289,1,
-242,2722,16,0,289,
-1,478,1629,1,1001,
-1634,1,1002,1639,1,
-30,2723,19,269,1,
-30,2724,5,84,1,
-1011,1148,1,1012,2725,
-16,0,267,1,1013,
-1304,1,262,1165,1,
-1267,2726,16,0,267,
-1,515,2727,16,0,
-267,1,1521,2728,16,
-0,267,1,525,1262,
-1,283,1218,1,2299,
-2729,16,0,267,1,
-42,2730,16,0,267,
-1,40,1223,1,44,
-1229,1,47,1230,1,
-1303,2731,16,0,267,
-1,1555,2732,16,0,
-267,1,50,1247,1,
-48,1236,1,49,1242,
-1,51,1252,1,63,
-1268,1,305,1257,1,
-66,1274,1,67,1279,
-1,68,1284,1,69,
-1289,1,70,1294,1,
-73,2733,16,0,267,
-1,74,1299,1,328,
-1348,1,1048,1467,1,
-82,2734,16,0,267,
-1,1840,2735,16,0,
-267,1,1591,2736,16,
-0,267,1,1341,2737,
-16,0,267,1,1096,
-1358,1,93,1364,1,
-352,1391,1,107,2738,
-16,0,267,1,1114,
-1389,1,118,1397,1,
-1123,2739,16,0,267,
-1,371,1407,1,1628,
-2740,16,0,267,1,
-375,1418,1,1882,2741,
-16,0,267,1,377,
-1423,1,379,1428,1,
-380,1433,1,883,2742,
-16,0,267,1,373,
-1451,1,130,1456,1,
-143,1461,1,387,2743,
-16,0,267,1,1159,
-2744,16,0,267,1,
-157,1489,1,1413,2745,
-16,0,267,1,1665,
-2746,16,0,267,1,
-412,2747,16,0,267,
-1,1377,2748,16,0,
-267,1,172,1515,1,
-1939,2749,16,0,267,
-1,437,2750,16,0,
-267,1,188,1565,1,
-942,1536,1,1195,2751,
-16,0,267,1,1449,
-2752,16,0,267,1,
-1701,2753,16,0,267,
-1,447,1557,1,2708,
-2754,16,0,267,1,
-205,2755,16,0,267,
-1,827,2756,16,0,
-267,1,223,2757,16,
-0,267,1,476,1590,
-1,477,1596,1,1231,
-2758,16,0,267,1,
-479,1606,1,480,1611,
-1,1485,2759,16,0,
-267,1,1737,2760,16,
-0,267,1,242,2761,
-16,0,267,1,478,
-1629,1,1001,1634,1,
-1002,1639,1,31,2762,
-19,254,1,31,2763,
-5,84,1,1011,1148,
-1,1012,2764,16,0,
-252,1,1013,1304,1,
-262,1165,1,1267,2765,
-16,0,252,1,515,
-2766,16,0,252,1,
-1521,2767,16,0,252,
-1,525,1262,1,283,
-1218,1,2299,2768,16,
-0,252,1,42,2769,
-16,0,252,1,40,
-1223,1,44,1229,1,
-47,1230,1,1303,2770,
-16,0,252,1,1555,
-2771,16,0,252,1,
-50,1247,1,48,1236,
-1,49,1242,1,51,
-1252,1,63,1268,1,
-305,1257,1,66,1274,
-1,67,1279,1,68,
-1284,1,69,1289,1,
-70,1294,1,73,2772,
-16,0,252,1,74,
-1299,1,328,1348,1,
-1048,1467,1,82,2773,
-16,0,252,1,1840,
-2774,16,0,252,1,
-1591,2775,16,0,252,
-1,1341,2776,16,0,
-252,1,1096,1358,1,
-93,1364,1,352,1391,
-1,107,2777,16,0,
-252,1,1114,1389,1,
-118,1397,1,1123,2778,
-16,0,252,1,371,
-1407,1,1628,2779,16,
-0,252,1,375,1418,
-1,1882,2780,16,0,
-252,1,377,1423,1,
-379,1428,1,380,1433,
-1,883,2781,16,0,
-252,1,373,1451,1,
-130,1456,1,143,2782,
-16,0,252,1,387,
-2783,16,0,252,1,
-1159,2784,16,0,252,
-1,157,2785,16,0,
-252,1,1413,2786,16,
-0,252,1,1665,2787,
-16,0,252,1,412,
-2788,16,0,252,1,
-1377,2789,16,0,252,
-1,172,1515,1,1939,
-2790,16,0,252,1,
-437,2791,16,0,252,
-1,188,1565,1,942,
-1536,1,1195,2792,16,
-0,252,1,1449,2793,
-16,0,252,1,1701,
-2794,16,0,252,1,
-447,1557,1,2708,2795,
-16,0,252,1,205,
-2796,16,0,252,1,
-827,2797,16,0,252,
-1,223,2798,16,0,
-252,1,476,1590,1,
-477,1596,1,1231,2799,
-16,0,252,1,479,
-1606,1,480,1611,1,
-1485,2800,16,0,252,
-1,1737,2801,16,0,
-252,1,242,2802,16,
-0,252,1,478,1629,
-1,1001,1634,1,1002,
-1639,1,32,2803,19,
-247,1,32,2804,5,
-84,1,1011,1148,1,
-1012,2805,16,0,245,
-1,1013,1304,1,262,
-1165,1,1267,2806,16,
-0,245,1,515,2807,
-16,0,245,1,1521,
-2808,16,0,245,1,
-525,1262,1,283,1218,
-1,2299,2809,16,0,
-245,1,42,2810,16,
-0,245,1,40,1223,
-1,44,1229,1,47,
-1230,1,1303,2811,16,
-0,245,1,1555,2812,
-16,0,245,1,50,
-1247,1,48,1236,1,
-49,1242,1,51,1252,
-1,63,1268,1,305,
-1257,1,66,1274,1,
-67,1279,1,68,1284,
-1,69,1289,1,70,
-1294,1,73,2813,16,
-0,245,1,74,1299,
-1,328,1348,1,1048,
-1467,1,82,2814,16,
-0,245,1,1840,2815,
-16,0,245,1,1591,
-2816,16,0,245,1,
-1341,2817,16,0,245,
-1,1096,1358,1,93,
-1364,1,352,1391,1,
-107,2818,16,0,245,
-1,1114,1389,1,118,
-1397,1,1123,2819,16,
-0,245,1,371,1407,
-1,1628,2820,16,0,
-245,1,375,1418,1,
-1882,2821,16,0,245,
-1,377,1423,1,379,
-1428,1,380,1433,1,
-883,2822,16,0,245,
-1,373,1451,1,130,
-1456,1,143,2823,16,
-0,245,1,387,2824,
-16,0,245,1,1159,
-2825,16,0,245,1,
-157,2826,16,0,245,
-1,1413,2827,16,0,
-245,1,1665,2828,16,
-0,245,1,412,2829,
-16,0,245,1,1377,
-2830,16,0,245,1,
-172,1515,1,1939,2831,
-16,0,245,1,437,
-2832,16,0,245,1,
-188,1565,1,942,1536,
-1,1195,2833,16,0,
-245,1,1449,2834,16,
-0,245,1,1701,2835,
-16,0,245,1,447,
-1557,1,2708,2836,16,
-0,245,1,205,2837,
-16,0,245,1,827,
-2838,16,0,245,1,
-223,2839,16,0,245,
-1,476,1590,1,477,
-1596,1,1231,2840,16,
-0,245,1,479,1606,
-1,480,1611,1,1485,
-2841,16,0,245,1,
-1737,2842,16,0,245,
-1,242,2843,16,0,
-245,1,478,1629,1,
-1001,1634,1,1002,1639,
-1,33,2844,19,348,
-1,33,2845,5,84,
-1,1011,1148,1,1012,
-2846,16,0,346,1,
-1013,1304,1,262,1165,
-1,1267,2847,16,0,
-346,1,515,2848,16,
-0,346,1,1521,2849,
-16,0,346,1,525,
-1262,1,283,1218,1,
-2299,2850,16,0,346,
-1,42,2851,16,0,
-346,1,40,1223,1,
-44,1229,1,47,1230,
-1,1303,2852,16,0,
-346,1,1555,2853,16,
-0,346,1,50,1247,
-1,48,1236,1,49,
-1242,1,51,1252,1,
-63,1268,1,305,1257,
-1,66,1274,1,67,
-1279,1,68,1284,1,
-69,1289,1,70,1294,
-1,73,2854,16,0,
-346,1,74,1299,1,
-328,1348,1,1048,1467,
-1,82,2855,16,0,
-346,1,1840,2856,16,
-0,346,1,1591,2857,
-16,0,346,1,1341,
-2858,16,0,346,1,
-1096,1358,1,93,1364,
-1,352,1391,1,107,
-2859,16,0,346,1,
-1114,1389,1,118,1397,
-1,1123,2860,16,0,
-346,1,371,1407,1,
-1628,2861,16,0,346,
-1,375,1418,1,1882,
-2862,16,0,346,1,
-377,1423,1,379,1428,
-1,380,1433,1,883,
-2863,16,0,346,1,
-373,1451,1,130,1456,
-1,143,1461,1,387,
-2864,16,0,346,1,
-1159,2865,16,0,346,
-1,157,1489,1,1413,
-2866,16,0,346,1,
-1665,2867,16,0,346,
-1,412,2868,16,0,
-346,1,1377,2869,16,
-0,346,1,172,1515,
-1,1939,2870,16,0,
-346,1,437,2871,16,
-0,346,1,188,1565,
-1,942,1536,1,1195,
-2872,16,0,346,1,
-1449,2873,16,0,346,
-1,1701,2874,16,0,
-346,1,447,1557,1,
-2708,2875,16,0,346,
-1,205,2876,16,0,
-346,1,827,2877,16,
-0,346,1,223,2878,
-16,0,346,1,476,
-1590,1,477,1596,1,
-1231,2879,16,0,346,
-1,479,1606,1,480,
-1611,1,1485,2880,16,
-0,346,1,1737,2881,
-16,0,346,1,242,
-1624,1,478,1629,1,
-1001,1634,1,1002,1639,
-1,34,2882,19,338,
-1,34,2883,5,84,
-1,1011,1148,1,1012,
-2884,16,0,336,1,
-1013,1304,1,262,1165,
-1,1267,2885,16,0,
-336,1,515,2886,16,
-0,336,1,1521,2887,
-16,0,336,1,525,
-1262,1,283,1218,1,
-2299,2888,16,0,336,
-1,42,2889,16,0,
-336,1,40,1223,1,
-44,1229,1,47,1230,
-1,1303,2890,16,0,
-336,1,1555,2891,16,
-0,336,1,50,1247,
-1,48,1236,1,49,
-1242,1,51,1252,1,
-63,1268,1,305,1257,
-1,66,1274,1,67,
-1279,1,68,1284,1,
-69,1289,1,70,1294,
-1,73,2892,16,0,
-336,1,74,1299,1,
-328,1348,1,1048,1467,
-1,82,2893,16,0,
-336,1,1840,2894,16,
-0,336,1,1591,2895,
-16,0,336,1,1341,
-2896,16,0,336,1,
-1096,1358,1,93,1364,
-1,352,1391,1,107,
-2897,16,0,336,1,
-1114,1389,1,118,1397,
-1,1123,2898,16,0,
-336,1,371,1407,1,
-1628,2899,16,0,336,
-1,375,1418,1,1882,
-2900,16,0,336,1,
-377,1423,1,379,1428,
-1,380,1433,1,883,
-2901,16,0,336,1,
-373,1451,1,130,1456,
-1,143,1461,1,387,
-2902,16,0,336,1,
-1159,2903,16,0,336,
-1,157,1489,1,1413,
-2904,16,0,336,1,
-1665,2905,16,0,336,
-1,412,2906,16,0,
-336,1,1377,2907,16,
-0,336,1,172,1515,
-1,1939,2908,16,0,
-336,1,437,2909,16,
-0,336,1,188,1565,
-1,942,1536,1,1195,
-2910,16,0,336,1,
-1449,2911,16,0,336,
-1,1701,2912,16,0,
-336,1,447,1557,1,
-2708,2913,16,0,336,
-1,205,1570,1,827,
-2914,16,0,336,1,
-223,1580,1,476,1590,
-1,477,1596,1,1231,
-2915,16,0,336,1,
-479,1606,1,480,1611,
-1,1485,2916,16,0,
-336,1,1737,2917,16,
-0,336,1,242,1624,
-1,478,1629,1,1001,
-1634,1,1002,1639,1,
-35,2918,19,321,1,
-35,2919,5,84,1,
-1011,1148,1,1012,2920,
+482,1,827,2386,16,
+0,482,1,2724,2387,
+16,0,482,1,223,
+2388,16,0,482,1,
+476,1608,1,477,1614,
+1,1231,2389,16,0,
+482,1,479,1624,1,
+480,1629,1,1485,2390,
+16,0,482,1,1737,
+2391,16,0,482,1,
+242,2392,16,0,482,
+1,478,1647,1,1001,
+1652,1,1002,1657,1,
+21,2393,19,449,1,
+21,2394,5,84,1,
+1011,1166,1,1012,2395,
+16,0,447,1,1013,
+1322,1,262,1183,1,
+1267,2396,16,0,447,
+1,515,2397,16,0,
+447,1,1521,2398,16,
+0,447,1,525,1280,
+1,283,1236,1,2299,
+2399,16,0,447,1,
+42,2400,16,0,447,
+1,40,1241,1,44,
+1247,1,47,1248,1,
+1303,2401,16,0,447,
+1,1555,2402,16,0,
+447,1,50,1265,1,
+48,1254,1,49,1260,
+1,51,1270,1,63,
+1286,1,305,1275,1,
+66,1292,1,67,1297,
+1,68,1302,1,69,
+1307,1,70,1312,1,
+73,2403,16,0,447,
+1,74,1317,1,328,
+2404,16,0,447,1,
+1048,2405,16,0,447,
+1,82,2406,16,0,
+447,1,1840,2407,16,
+0,447,1,1591,2408,
+16,0,447,1,1341,
+2409,16,0,447,1,
+1096,1376,1,93,1382,
+1,352,2410,16,0,
+447,1,107,2411,16,
+0,447,1,1114,1407,
+1,118,2412,16,0,
+447,1,1123,2413,16,
+0,447,1,371,1429,
+1,1628,2414,16,0,
+447,1,375,1440,1,
+1882,2415,16,0,447,
+1,377,1445,1,379,
+1450,1,380,1455,1,
+883,2416,16,0,447,
+1,373,1473,1,130,
+2417,16,0,447,1,
+143,2418,16,0,447,
+1,387,2419,16,0,
+447,1,1159,2420,16,
+0,447,1,157,2421,
+16,0,447,1,1413,
+2422,16,0,447,1,
+1665,2423,16,0,447,
+1,412,2424,16,0,
+447,1,1377,2425,16,
+0,447,1,172,2426,
+16,0,447,1,1939,
+2427,16,0,447,1,
+437,2428,16,0,447,
+1,188,2429,16,0,
+447,1,942,2430,16,
+0,447,1,1195,2431,
+16,0,447,1,1449,
+2432,16,0,447,1,
+1701,2433,16,0,447,
+1,447,1574,1,205,
+2434,16,0,447,1,
+827,2435,16,0,447,
+1,2724,2436,16,0,
+447,1,223,2437,16,
+0,447,1,476,1608,
+1,477,1614,1,1231,
+2438,16,0,447,1,
+479,1624,1,480,1629,
+1,1485,2439,16,0,
+447,1,1737,2440,16,
+0,447,1,242,2441,
+16,0,447,1,478,
+1647,1,1001,1652,1,
+1002,1657,1,22,2442,
+19,400,1,22,2443,
+5,84,1,1011,1166,
+1,1012,2444,16,0,
+398,1,1013,1322,1,
+262,1183,1,1267,2445,
+16,0,398,1,515,
+2446,16,0,398,1,
+1521,2447,16,0,398,
+1,525,1280,1,283,
+1236,1,2299,2448,16,
+0,398,1,42,2449,
+16,0,398,1,40,
+1241,1,44,1247,1,
+47,1248,1,1303,2450,
+16,0,398,1,1555,
+2451,16,0,398,1,
+50,1265,1,48,1254,
+1,49,1260,1,51,
+1270,1,63,1286,1,
+305,1275,1,66,1292,
+1,67,1297,1,68,
+1302,1,69,1307,1,
+70,1312,1,73,2452,
+16,0,398,1,74,
+1317,1,328,2453,16,
+0,398,1,1048,2454,
+16,0,398,1,82,
+2455,16,0,398,1,
+1840,2456,16,0,398,
+1,1591,2457,16,0,
+398,1,1341,2458,16,
+0,398,1,1096,1376,
+1,93,1382,1,352,
+2459,16,0,398,1,
+107,2460,16,0,398,
+1,1114,1407,1,118,
+2461,16,0,398,1,
+1123,2462,16,0,398,
+1,371,1429,1,1628,
+2463,16,0,398,1,
+375,1440,1,1882,2464,
+16,0,398,1,377,
+1445,1,379,1450,1,
+380,1455,1,883,2465,
+16,0,398,1,373,
+1473,1,130,2466,16,
+0,398,1,143,2467,
+16,0,398,1,387,
+2468,16,0,398,1,
+1159,2469,16,0,398,
+1,157,2470,16,0,
+398,1,1413,2471,16,
+0,398,1,1665,2472,
+16,0,398,1,412,
+2473,16,0,398,1,
+1377,2474,16,0,398,
+1,172,2475,16,0,
+398,1,1939,2476,16,
+0,398,1,437,2477,
+16,0,398,1,188,
+2478,16,0,398,1,
+942,2479,16,0,398,
+1,1195,2480,16,0,
+398,1,1449,2481,16,
+0,398,1,1701,2482,
+16,0,398,1,447,
+1574,1,205,2483,16,
+0,398,1,827,2484,
+16,0,398,1,2724,
+2485,16,0,398,1,
+223,2486,16,0,398,
+1,476,1608,1,477,
+1614,1,1231,2487,16,
+0,398,1,479,1624,
+1,480,1629,1,1485,
+2488,16,0,398,1,
+1737,2489,16,0,398,
+1,242,2490,16,0,
+398,1,478,1647,1,
+1001,1652,1,1002,1657,
+1,23,2491,19,553,
+1,23,2492,5,38,
+1,1901,2493,16,0,
+551,1,2075,2494,16,
+0,551,1,1860,885,
+1,1803,851,1,1804,
+2495,16,0,551,1,
+2413,2496,16,0,551,
+1,2198,2497,16,0,
+551,1,1873,899,1,
+1657,958,1,1989,980,
+1,1990,2498,16,0,
+551,1,1775,2499,16,
+0,551,1,32,2500,
+16,0,551,1,2105,
+878,1,2106,2501,16,
+0,551,1,2364,891,
+1,2227,972,1,2337,
+2502,16,0,551,1,
+2021,782,1,2458,940,
+1,2459,946,1,2462,
+953,1,2136,906,1,
+2464,963,1,2029,789,
+1,2030,795,1,2031,
+800,1,2032,805,1,
+2033,810,1,2035,816,
+1,2037,821,1,2039,
+826,1,1931,925,1,
+2041,832,1,2043,838,
+1,2045,843,1,1574,
+863,1,1958,2503,16,
+0,551,1,24,2504,
+19,180,1,24,2505,
+5,5,1,44,2506,
+16,0,178,1,377,
+2507,16,0,589,1,
+40,2508,16,0,738,
+1,63,2509,16,0,
+203,1,373,2510,16,
+0,585,1,25,2511,
+19,302,1,25,2512,
+5,177,1,256,2513,
+16,0,594,1,1261,
+2514,16,0,594,1,
+1011,1166,1,1012,2515,
+16,0,300,1,2458,
+940,1,262,1183,1,
+1267,2516,16,0,300,
+1,2021,782,1,1521,
+2517,16,0,300,1,
+1775,2518,16,0,594,
+1,2029,789,1,2030,
+795,1,2031,800,1,
+2032,805,1,2033,810,
+1,277,2519,16,0,
+594,1,2035,816,1,
+2037,821,1,2039,826,
+1,32,2520,16,0,
+594,1,2464,963,1,
+2293,2521,16,0,594,
+1,2043,838,1,2045,
+843,1,2299,2522,16,
+0,300,1,41,2523,
+16,0,594,1,42,
+2524,16,0,300,1,
+40,1241,1,44,1247,
+1,43,2525,16,0,
+594,1,1804,2526,16,
+0,594,1,48,1254,
+1,49,1260,1,47,
+1248,1,51,1270,1,
+52,2527,16,0,594,
+1,50,1265,1,305,
+1275,1,1096,1376,1,
+1515,2528,16,0,594,
+1,2318,2529,16,0,
+594,1,62,2530,16,
+0,594,1,63,1286,
+1,66,1292,1,67,
+1297,1,68,1302,1,
+69,1307,1,70,1312,
+1,71,2531,16,0,
+594,1,283,1236,1,
+73,2532,16,0,300,
+1,74,1317,1,1013,
+1322,1,76,2533,16,
+0,594,1,1834,2534,
+16,0,594,1,2337,
+2535,16,0,594,1,
+79,2536,16,0,594,
+1,1335,2537,16,0,
+594,1,299,2538,16,
+0,594,1,82,2539,
+16,0,300,1,1840,
+2540,16,0,300,1,
+1297,2541,16,0,594,
+1,85,2542,16,0,
+594,1,1341,2543,16,
+0,300,1,89,2544,
+16,0,594,1,1303,
+2545,16,0,300,1,
+509,2546,16,0,594,
+1,93,1382,1,322,
+2547,16,0,594,1,
+97,2548,16,0,594,
+1,2041,832,1,1555,
+2549,16,0,300,1,
+827,2550,16,0,300,
+1,102,2551,16,0,
+594,1,1860,885,1,
+1803,851,1,2364,891,
+1,107,2552,16,0,
+300,1,1114,1407,1,
+112,2553,16,0,594,
+1,1117,2554,16,0,
+594,1,352,1413,1,
+1873,899,1,118,1419,
+1,1123,2555,16,0,
+300,1,371,1429,1,
+515,2556,16,0,300,
+1,1377,2557,16,0,
+300,1,124,2558,16,
+0,594,1,1882,2559,
+16,0,300,1,377,
+1445,1,379,1450,1,
+380,1455,1,130,1478,
+1,346,2560,16,0,
+594,1,2075,2561,16,
+0,594,1,373,1473,
+1,387,2562,16,0,
+300,1,137,2563,16,
+0,594,1,143,2564,
+16,0,300,1,1901,
+2565,16,0,594,1,
+1048,1408,1,1153,2566,
+16,0,594,1,375,
+1440,1,151,2567,16,
+0,594,1,1407,2568,
+16,0,594,1,1659,
+2569,16,0,594,1,
+2413,2570,16,0,594,
+1,1159,2571,16,0,
+300,1,381,2572,16,
+0,594,1,157,2573,
+16,0,300,1,1413,
+2574,16,0,300,1,
+883,2575,16,0,300,
+1,1371,2576,16,0,
+594,1,328,1366,1,
+2105,878,1,2106,2577,
+16,0,594,1,166,
+2578,16,0,594,1,
+525,2579,16,0,594,
+1,1622,2580,16,0,
+594,1,406,2581,16,
+0,594,1,1574,863,
+1,172,1532,1,1931,
+925,1,412,2582,16,
+0,300,1,1933,2583,
+16,0,594,1,1876,
+2584,16,0,594,1,
+431,2585,16,0,594,
+1,1585,2586,16,0,
+594,1,182,2587,16,
+0,594,1,1628,2588,
+16,0,300,1,1189,
+2589,16,0,594,1,
+437,2590,16,0,300,
+1,1591,2591,16,0,
+300,1,188,1581,1,
+1695,2592,16,0,594,
+1,2198,2593,16,0,
+594,1,1195,2594,16,
+0,300,1,1449,2595,
+16,0,300,1,1701,
+2596,16,0,300,1,
+447,2597,16,0,594,
+1,199,2598,16,0,
+594,1,2459,946,1,
+1958,2599,16,0,594,
+1,2462,953,1,1657,
+958,1,205,2600,16,
+0,300,1,459,2601,
+16,0,594,1,462,
+2602,16,0,594,1,
+1665,2603,16,0,300,
+1,2724,2604,16,0,
+300,1,2718,2605,16,
+0,594,1,217,2606,
+16,0,594,1,2227,
+972,1,942,1553,1,
+1225,2607,16,0,594,
+1,223,2608,16,0,
+300,1,1479,2609,16,
+0,594,1,1731,2610,
+16,0,594,1,477,
+1614,1,1231,2611,16,
+0,300,1,479,1624,
+1,480,1629,1,1485,
+2612,16,0,300,1,
+1737,2613,16,0,300,
+1,1989,980,1,1990,
+2614,16,0,594,1,
+1443,2615,16,0,594,
+1,236,2616,16,0,
+594,1,2136,906,1,
+476,1608,1,242,2617,
+16,0,300,1,478,
+1647,1,1939,2618,16,
+0,300,1,1001,1652,
+1,1002,1657,1,1756,
+2619,16,0,594,1,
+26,2620,19,321,1,
+26,2621,5,84,1,
+1011,1166,1,1012,2622,
 16,0,319,1,1013,
-1304,1,262,1165,1,
-1267,2921,16,0,319,
-1,515,2922,16,0,
-319,1,1521,2923,16,
-0,319,1,525,1262,
-1,283,1218,1,2299,
-2924,16,0,319,1,
-42,2925,16,0,319,
-1,40,1223,1,44,
-1229,1,47,1230,1,
-1303,2926,16,0,319,
-1,1555,2927,16,0,
-319,1,50,1247,1,
-48,1236,1,49,1242,
-1,51,1252,1,63,
-1268,1,305,1257,1,
-66,1274,1,67,1279,
-1,68,1284,1,69,
-1289,1,70,1294,1,
-73,2928,16,0,319,
-1,74,1299,1,328,
-1348,1,1048,1467,1,
-82,2929,16,0,319,
-1,1840,2930,16,0,
-319,1,1591,2931,16,
-0,319,1,1341,2932,
+1322,1,262,1183,1,
+1267,2623,16,0,319,
+1,515,2624,16,0,
+716,1,1521,2625,16,
+0,319,1,525,1280,
+1,283,1236,1,2299,
+2626,16,0,319,1,
+42,2627,16,0,319,
+1,40,1241,1,44,
+1247,1,47,1248,1,
+1303,2628,16,0,319,
+1,1555,2629,16,0,
+319,1,50,1265,1,
+48,1254,1,49,1260,
+1,51,1270,1,63,
+1286,1,305,1275,1,
+66,1292,1,67,1297,
+1,68,1302,1,69,
+1307,1,70,1312,1,
+73,2630,16,0,319,
+1,74,1317,1,328,
+1366,1,1048,1408,1,
+82,2631,16,0,319,
+1,1840,2632,16,0,
+319,1,1591,2633,16,
+0,319,1,1341,2634,
 16,0,319,1,1096,
-1358,1,93,1364,1,
-352,1391,1,107,2933,
+1376,1,93,1382,1,
+352,1413,1,107,2635,
 16,0,319,1,1114,
-1389,1,118,1397,1,
-1123,2934,16,0,319,
-1,371,1407,1,1628,
-2935,16,0,319,1,
-375,1418,1,1882,2936,
+1407,1,118,1419,1,
+1123,2636,16,0,319,
+1,371,1429,1,1628,
+2637,16,0,319,1,
+375,1440,1,1882,2638,
 16,0,319,1,377,
-1423,1,379,1428,1,
-380,1433,1,883,2937,
+1445,1,379,1450,1,
+380,1455,1,883,2639,
 16,0,319,1,373,
-1451,1,130,1456,1,
-143,1461,1,387,2938,
-16,0,319,1,1159,
-2939,16,0,319,1,
-157,1489,1,1413,2940,
-16,0,319,1,1665,
-2941,16,0,319,1,
-412,2942,16,0,319,
-1,1377,2943,16,0,
-319,1,172,1515,1,
-1939,2944,16,0,319,
-1,437,2945,16,0,
-319,1,188,1565,1,
-942,1536,1,1195,2946,
-16,0,319,1,1449,
-2947,16,0,319,1,
-1701,2948,16,0,319,
-1,447,1557,1,2708,
-2949,16,0,319,1,
-205,1570,1,827,2950,
-16,0,319,1,223,
-2951,16,0,319,1,
-476,1590,1,477,1596,
-1,1231,2952,16,0,
-319,1,479,1606,1,
-480,1611,1,1485,2953,
-16,0,319,1,1737,
-2954,16,0,319,1,
-242,1624,1,478,1629,
-1,1001,1634,1,1002,
-1639,1,36,2955,19,
-216,1,36,2956,5,
-94,1,256,2957,16,
-0,214,1,1261,2958,
-16,0,214,1,509,
-2959,16,0,214,1,
-1515,2960,16,0,214,
-1,2021,764,1,1775,
-2961,16,0,214,1,
-2029,771,1,2030,777,
-1,2031,782,1,2032,
-787,1,2033,792,1,
-277,2962,16,0,214,
-1,2035,798,1,2037,
-803,1,2039,808,1,
-32,2963,16,0,214,
-1,2041,814,1,2293,
-2964,16,0,214,1,
-2043,820,1,2045,825,
-1,41,2965,16,0,
-214,1,1297,2966,16,
-0,214,1,43,2967,
-16,0,214,1,1803,
-833,1,1804,2968,16,
-0,214,1,299,2969,
-16,0,214,1,52,
-2970,16,0,214,1,
-2318,2971,16,0,214,
-1,2075,2972,16,0,
-214,1,1574,845,1,
-71,2973,16,0,214,
-1,76,2974,16,0,
-214,1,1834,2975,16,
-0,214,1,2337,2976,
-16,0,214,1,79,
-2977,16,0,214,1,
-1335,2978,16,0,214,
-1,322,2979,16,0,
-214,1,85,2980,16,
-0,214,1,89,2981,
-16,0,214,1,346,
-2982,16,0,214,1,
-2105,860,1,2106,2983,
-16,0,214,1,97,
-2984,16,0,214,1,
-1860,867,1,2364,873,
-1,102,2985,16,0,
-214,1,112,2986,16,
-0,214,1,1117,2987,
-16,0,214,1,1873,
-881,1,1876,2988,16,
-0,214,1,124,2989,
-16,0,214,1,2136,
-888,1,381,2990,16,
-0,214,1,525,2991,
-16,0,214,1,137,
-2992,16,0,214,1,
-1901,2993,16,0,214,
-1,1153,2994,16,0,
-214,1,151,2995,16,
-0,214,1,1407,2996,
-16,0,214,1,1659,
-2997,16,0,214,1,
-2413,2998,16,0,214,
-1,406,2999,16,0,
-214,1,1371,3000,16,
-0,214,1,166,3001,
-16,0,214,1,1622,
-3002,16,0,214,1,
-1931,906,1,1933,3003,
-16,0,214,1,431,
-3004,16,0,214,1,
-1585,3005,16,0,214,
-1,182,3006,16,0,
-214,1,1189,3007,16,
-0,214,1,1443,3008,
-16,0,214,1,1695,
-3009,16,0,214,1,
-2198,3010,16,0,214,
-1,2702,3011,16,0,
-214,1,447,3012,16,
-0,214,1,2458,922,
-1,2459,928,1,1958,
-3013,16,0,214,1,
-2462,935,1,1657,940,
-1,2464,945,1,199,
-3014,16,0,214,1,
-459,3015,16,0,214,
-1,462,3016,16,0,
-214,1,217,3017,16,
-0,214,1,2227,954,
-1,1225,3018,16,0,
-214,1,1479,3019,16,
-0,214,1,1731,3020,
-16,0,214,1,1989,
-962,1,1990,3021,16,
-0,214,1,236,3022,
-16,0,214,1,1756,
-3023,16,0,214,1,
-37,3024,19,237,1,
-37,3025,5,94,1,
-256,3026,16,0,235,
-1,1261,3027,16,0,
-235,1,509,3028,16,
-0,235,1,1515,3029,
-16,0,235,1,2021,
-764,1,1775,3030,16,
-0,235,1,2029,771,
-1,2030,777,1,2031,
-782,1,2032,787,1,
-2033,792,1,277,3031,
-16,0,235,1,2035,
-798,1,2037,803,1,
-2039,808,1,32,3032,
-16,0,235,1,2041,
-814,1,2293,3033,16,
-0,235,1,2043,820,
-1,2045,825,1,41,
-3034,16,0,235,1,
-1297,3035,16,0,235,
-1,43,3036,16,0,
-235,1,1803,833,1,
-1804,3037,16,0,235,
-1,299,3038,16,0,
-235,1,52,3039,16,
-0,235,1,2318,3040,
-16,0,235,1,2075,
-3041,16,0,235,1,
-1574,845,1,71,3042,
-16,0,235,1,76,
-3043,16,0,235,1,
-1834,3044,16,0,235,
-1,2337,3045,16,0,
-235,1,79,3046,16,
-0,235,1,1335,3047,
-16,0,235,1,322,
-3048,16,0,235,1,
-85,3049,16,0,235,
-1,89,3050,16,0,
-235,1,346,3051,16,
-0,235,1,2105,860,
-1,2106,3052,16,0,
-235,1,97,3053,16,
-0,235,1,1860,867,
-1,2364,873,1,102,
-3054,16,0,235,1,
-112,3055,16,0,235,
-1,1117,3056,16,0,
-235,1,1873,881,1,
-1876,3057,16,0,235,
-1,124,3058,16,0,
-235,1,2136,888,1,
-381,3059,16,0,235,
-1,525,3060,16,0,
-235,1,137,3061,16,
-0,235,1,1901,3062,
-16,0,235,1,1153,
-3063,16,0,235,1,
-151,3064,16,0,235,
-1,1407,3065,16,0,
-235,1,1659,3066,16,
-0,235,1,2413,3067,
-16,0,235,1,406,
-3068,16,0,235,1,
-1371,3069,16,0,235,
-1,166,3070,16,0,
-235,1,1622,3071,16,
-0,235,1,1931,906,
-1,1933,3072,16,0,
-235,1,431,3073,16,
-0,235,1,1585,3074,
-16,0,235,1,182,
-3075,16,0,235,1,
-1189,3076,16,0,235,
-1,1443,3077,16,0,
-235,1,1695,3078,16,
-0,235,1,2198,3079,
-16,0,235,1,2702,
-3080,16,0,235,1,
-447,3081,16,0,235,
-1,2458,922,1,2459,
-928,1,1958,3082,16,
-0,235,1,2462,935,
-1,1657,940,1,2464,
-945,1,199,3083,16,
-0,235,1,459,3084,
-16,0,235,1,462,
-3085,16,0,235,1,
-217,3086,16,0,235,
-1,2227,954,1,1225,
-3087,16,0,235,1,
-1479,3088,16,0,235,
-1,1731,3089,16,0,
-235,1,1989,962,1,
-1990,3090,16,0,235,
-1,236,3091,16,0,
-235,1,1756,3092,16,
-0,235,1,38,3093,
-19,234,1,38,3094,
-5,84,1,1011,1148,
-1,1012,3095,16,0,
-232,1,1013,1304,1,
-262,1165,1,1267,3096,
-16,0,232,1,515,
-3097,16,0,232,1,
-1521,3098,16,0,232,
-1,525,1262,1,283,
-1218,1,2299,3099,16,
-0,232,1,42,3100,
-16,0,232,1,40,
-1223,1,44,1229,1,
-47,1230,1,1303,3101,
-16,0,232,1,1555,
-3102,16,0,232,1,
-50,1247,1,48,1236,
-1,49,1242,1,51,
-1252,1,63,1268,1,
-305,1257,1,66,1274,
-1,67,1279,1,68,
-1284,1,69,1289,1,
-70,1294,1,73,3103,
-16,0,232,1,74,
-1299,1,328,1348,1,
-1048,1467,1,82,3104,
-16,0,232,1,1840,
-3105,16,0,232,1,
-1591,3106,16,0,232,
-1,1341,3107,16,0,
-232,1,1096,1358,1,
-93,1364,1,352,1391,
-1,107,3108,16,0,
-232,1,1114,1389,1,
-118,1397,1,1123,3109,
-16,0,232,1,371,
-1407,1,1628,3110,16,
-0,232,1,375,1418,
-1,1882,3111,16,0,
-232,1,377,1423,1,
-379,1428,1,380,1433,
-1,883,1439,1,373,
-1451,1,130,1456,1,
-143,1461,1,387,3112,
-16,0,232,1,1159,
-3113,16,0,232,1,
-157,1489,1,1413,3114,
-16,0,232,1,1665,
-3115,16,0,232,1,
-412,3116,16,0,232,
-1,1377,3117,16,0,
-232,1,172,1515,1,
-1939,3118,16,0,232,
-1,437,3119,16,0,
-232,1,188,1565,1,
-942,1536,1,1195,3120,
-16,0,232,1,1449,
-3121,16,0,232,1,
-1701,3122,16,0,232,
-1,447,1557,1,2708,
-3123,16,0,232,1,
-205,1570,1,827,1377,
-1,223,1580,1,476,
-1590,1,477,1596,1,
-1231,3124,16,0,232,
-1,479,1606,1,480,
-1611,1,1485,3125,16,
-0,232,1,1737,3126,
-16,0,232,1,242,
-1624,1,478,1629,1,
-1001,1634,1,1002,1639,
-1,39,3127,19,222,
-1,39,3128,5,84,
-1,1011,1148,1,1012,
-3129,16,0,220,1,
-1013,1304,1,262,1165,
-1,1267,3130,16,0,
-220,1,515,3131,16,
-0,220,1,1521,3132,
-16,0,220,1,525,
-1262,1,283,1218,1,
-2299,3133,16,0,220,
-1,42,3134,16,0,
-220,1,40,1223,1,
-44,1229,1,47,1230,
-1,1303,3135,16,0,
-220,1,1555,3136,16,
-0,220,1,50,1247,
-1,48,1236,1,49,
-1242,1,51,1252,1,
-63,1268,1,305,1257,
-1,66,1274,1,67,
-1279,1,68,1284,1,
-69,1289,1,70,1294,
-1,73,3137,16,0,
-220,1,74,1299,1,
-328,1348,1,1048,1467,
-1,82,3138,16,0,
-220,1,1840,3139,16,
-0,220,1,1591,3140,
-16,0,220,1,1341,
-3141,16,0,220,1,
-1096,1358,1,93,1364,
-1,352,1391,1,107,
-3142,16,0,220,1,
-1114,1389,1,118,1397,
-1,1123,3143,16,0,
-220,1,371,1407,1,
-1628,3144,16,0,220,
-1,375,1418,1,1882,
-3145,16,0,220,1,
-377,1423,1,379,1428,
-1,380,1433,1,883,
-1439,1,373,1451,1,
-130,1456,1,143,1461,
-1,387,3146,16,0,
-220,1,1159,3147,16,
-0,220,1,157,1489,
-1,1413,3148,16,0,
-220,1,1665,3149,16,
-0,220,1,412,3150,
-16,0,220,1,1377,
-3151,16,0,220,1,
-172,1515,1,1939,3152,
-16,0,220,1,437,
-3153,16,0,220,1,
-188,1565,1,942,1536,
-1,1195,3154,16,0,
-220,1,1449,3155,16,
-0,220,1,1701,3156,
-16,0,220,1,447,
-1557,1,2708,3157,16,
-0,220,1,205,1570,
-1,827,1377,1,223,
-1580,1,476,1590,1,
-477,1596,1,1231,3158,
-16,0,220,1,479,
-1606,1,480,1611,1,
-1485,3159,16,0,220,
-1,1737,3160,16,0,
-220,1,242,1624,1,
-478,1629,1,1001,1634,
-1,1002,1639,1,40,
-3161,19,210,1,40,
-3162,5,84,1,1011,
-1148,1,1012,3163,16,
-0,208,1,1013,1304,
-1,262,1165,1,1267,
-3164,16,0,208,1,
-515,3165,16,0,208,
-1,1521,3166,16,0,
-208,1,525,1262,1,
-283,1218,1,2299,3167,
-16,0,208,1,42,
-3168,16,0,208,1,
-40,1223,1,44,1229,
-1,47,1230,1,1303,
-3169,16,0,208,1,
-1555,3170,16,0,208,
-1,50,1247,1,48,
-1236,1,49,1242,1,
-51,1252,1,63,1268,
-1,305,1257,1,66,
-1274,1,67,1279,1,
-68,1284,1,69,1289,
-1,70,1294,1,73,
-3171,16,0,208,1,
-74,1299,1,328,1348,
-1,1048,1467,1,82,
-3172,16,0,208,1,
-1840,3173,16,0,208,
-1,1591,3174,16,0,
-208,1,1341,3175,16,
-0,208,1,1096,1358,
-1,93,1364,1,352,
-1391,1,107,3176,16,
-0,208,1,1114,1389,
-1,118,3177,16,0,
-208,1,1123,3178,16,
-0,208,1,371,1407,
-1,1628,3179,16,0,
-208,1,375,1418,1,
-1882,3180,16,0,208,
-1,377,1423,1,379,
-1428,1,380,1433,1,
-883,3181,16,0,208,
-1,373,1451,1,130,
-3182,16,0,208,1,
-143,3183,16,0,208,
-1,387,3184,16,0,
-208,1,1159,3185,16,
-0,208,1,157,3186,
-16,0,208,1,1413,
-3187,16,0,208,1,
-1665,3188,16,0,208,
-1,412,3189,16,0,
-208,1,1377,3190,16,
-0,208,1,172,3191,
-16,0,208,1,1939,
-3192,16,0,208,1,
-437,3193,16,0,208,
-1,188,3194,16,0,
-208,1,942,1536,1,
-1195,3195,16,0,208,
-1,1449,3196,16,0,
-208,1,1701,3197,16,
-0,208,1,447,1557,
-1,2708,3198,16,0,
-208,1,205,3199,16,
-0,208,1,827,3200,
-16,0,208,1,223,
-3201,16,0,208,1,
-476,1590,1,477,1596,
-1,1231,3202,16,0,
-208,1,479,1606,1,
-480,1611,1,1485,3203,
-16,0,208,1,1737,
-3204,16,0,208,1,
-242,3205,16,0,208,
-1,478,1629,1,1001,
-1634,1,1002,1639,1,
-41,3206,19,172,1,
-41,3207,5,84,1,
-1011,1148,1,1012,3208,
-16,0,170,1,1013,
-1304,1,262,1165,1,
-1267,3209,16,0,170,
-1,515,3210,16,0,
-170,1,1521,3211,16,
-0,170,1,525,1262,
-1,283,1218,1,2299,
-3212,16,0,170,1,
-42,3213,16,0,170,
-1,40,1223,1,44,
-1229,1,47,1230,1,
-1303,3214,16,0,170,
-1,1555,3215,16,0,
-170,1,50,1247,1,
-48,1236,1,49,1242,
-1,51,1252,1,63,
-1268,1,305,1257,1,
-66,1274,1,67,1279,
-1,68,1284,1,69,
-1289,1,70,1294,1,
-73,3216,16,0,170,
-1,74,1299,1,328,
-1348,1,1048,1467,1,
-82,3217,16,0,170,
-1,1840,3218,16,0,
-170,1,1591,3219,16,
-0,170,1,1341,3220,
-16,0,170,1,1096,
-1358,1,93,1364,1,
-352,1391,1,107,3221,
-16,0,170,1,1114,
-1389,1,118,3222,16,
-0,170,1,1123,3223,
-16,0,170,1,371,
-1407,1,1628,3224,16,
-0,170,1,375,1418,
-1,1882,3225,16,0,
-170,1,377,1423,1,
-379,1428,1,380,1433,
-1,883,3226,16,0,
-170,1,373,1451,1,
-130,3227,16,0,170,
-1,143,3228,16,0,
-170,1,387,3229,16,
-0,170,1,1159,3230,
-16,0,170,1,157,
-3231,16,0,170,1,
-1413,3232,16,0,170,
-1,1665,3233,16,0,
-170,1,412,3234,16,
-0,170,1,1377,3235,
-16,0,170,1,172,
-3236,16,0,170,1,
-1939,3237,16,0,170,
-1,437,3238,16,0,
-170,1,188,3239,16,
-0,170,1,942,1536,
-1,1195,3240,16,0,
-170,1,1449,3241,16,
-0,170,1,1701,3242,
-16,0,170,1,447,
-1557,1,2708,3243,16,
-0,170,1,205,3244,
-16,0,170,1,827,
-3245,16,0,170,1,
-223,3246,16,0,170,
-1,476,1590,1,477,
-1596,1,1231,3247,16,
-0,170,1,479,1606,
-1,480,1611,1,1485,
-3248,16,0,170,1,
-1737,3249,16,0,170,
-1,242,3250,16,0,
-170,1,478,1629,1,
-1001,1634,1,1002,1639,
-1,42,3251,19,408,
-1,42,3252,5,38,
-1,1901,3253,16,0,
-406,1,2075,3254,16,
-0,406,1,1860,867,
-1,1803,833,1,1804,
-3255,16,0,406,1,
-2413,3256,16,0,406,
-1,2198,3257,16,0,
-406,1,1873,881,1,
-1657,940,1,1989,962,
-1,1990,3258,16,0,
-406,1,1775,3259,16,
-0,406,1,32,3260,
-16,0,406,1,2105,
-860,1,2106,3261,16,
-0,406,1,2364,873,
-1,2227,954,1,2337,
-3262,16,0,406,1,
-2021,764,1,2458,922,
-1,2459,928,1,2462,
-935,1,2136,888,1,
-2464,945,1,2029,771,
-1,2030,777,1,2031,
-782,1,2032,787,1,
-2033,792,1,2035,798,
-1,2037,803,1,2039,
-808,1,1931,906,1,
-2041,814,1,2043,820,
-1,2045,825,1,1574,
-845,1,1958,3263,16,
-0,406,1,43,3264,
-19,498,1,43,3265,
-5,25,1,2035,798,
-1,2037,803,1,2039,
-808,1,2041,814,1,
-2227,954,1,2043,820,
-1,1657,940,1,1860,
-867,1,2136,888,1,
-2021,764,1,2459,928,
-1,1574,845,1,2105,
-3266,16,0,609,1,
-1931,906,1,1873,881,
-1,2031,782,1,1803,
-833,1,1989,3267,16,
-0,496,1,2464,945,
-1,2029,771,1,2030,
-777,1,2364,873,1,
-2032,787,1,2033,792,
-1,2045,825,1,44,
-3268,19,262,1,44,
-3269,5,38,1,1901,
-3270,16,0,260,1,
-2075,3271,16,0,260,
-1,1860,867,1,1803,
-833,1,1804,3272,16,
-0,260,1,2413,3273,
-16,0,260,1,2198,
-3274,16,0,260,1,
-1873,881,1,1657,940,
-1,1989,962,1,1990,
-3275,16,0,260,1,
-1775,3276,16,0,260,
-1,32,3277,16,0,
-260,1,2105,860,1,
-2106,3278,16,0,260,
-1,2364,873,1,2227,
-954,1,2337,3279,16,
-0,260,1,2021,764,
-1,2458,922,1,2459,
-928,1,2462,935,1,
-2136,888,1,2464,945,
-1,2029,771,1,2030,
-777,1,2031,782,1,
-2032,787,1,2033,792,
-1,2035,798,1,2037,
-803,1,2039,808,1,
-1931,906,1,2041,814,
-1,2043,820,1,2045,
-825,1,1574,845,1,
-1958,3280,16,0,260,
-1,45,3281,19,298,
-1,45,3282,5,39,
-1,1901,3283,16,0,
-325,1,2075,3284,16,
-0,325,1,1860,867,
-1,1803,833,1,1804,
-3285,16,0,325,1,
-2413,3286,16,0,325,
-1,2198,3287,16,0,
-325,1,1873,881,1,
-1657,940,1,1989,962,
-1,1990,3288,16,0,
-325,1,1775,3289,16,
-0,325,1,32,3290,
-16,0,325,1,2105,
-860,1,2106,3291,16,
-0,325,1,2364,873,
-1,2227,954,1,2337,
-3292,16,0,325,1,
-2021,764,1,2458,922,
-1,2459,928,1,2462,
-935,1,2136,888,1,
-2464,945,1,2029,771,
-1,2030,777,1,2031,
-782,1,2032,787,1,
-2033,792,1,2035,798,
-1,2037,803,1,2039,
-808,1,1931,906,1,
-2041,814,1,2043,820,
-1,2045,825,1,1832,
-3293,16,0,296,1,
-1574,845,1,1958,3294,
-16,0,325,1,46,
-3295,19,717,1,46,
-3296,5,38,1,1901,
-3297,16,0,715,1,
-2075,3298,16,0,715,
-1,1860,867,1,1803,
-833,1,1804,3299,16,
-0,715,1,2413,3300,
-16,0,715,1,2198,
-3301,16,0,715,1,
-1873,881,1,1657,940,
-1,1989,962,1,1990,
-3302,16,0,715,1,
-1775,3303,16,0,715,
-1,32,3304,16,0,
-715,1,2105,860,1,
-2106,3305,16,0,715,
-1,2364,873,1,2227,
-954,1,2337,3306,16,
-0,715,1,2021,764,
-1,2458,922,1,2459,
-928,1,2462,935,1,
-2136,888,1,2464,945,
-1,2029,771,1,2030,
-777,1,2031,782,1,
-2032,787,1,2033,792,
-1,2035,798,1,2037,
-803,1,2039,808,1,
-1931,906,1,2041,814,
-1,2043,820,1,2045,
-825,1,1574,845,1,
-1958,3307,16,0,715,
-1,47,3308,19,601,
-1,47,3309,5,19,
-1,0,3310,16,0,
-702,1,2760,3311,17,
-3312,15,3313,4,36,
-37,0,71,0,108,
-0,111,0,98,0,
-97,0,108,0,68,
-0,101,0,102,0,
-105,0,110,0,105,
-0,116,0,105,0,
-111,0,110,0,115,
-0,1,-1,1,5,
-3314,20,3315,4,38,
-71,0,108,0,111,
-0,98,0,97,0,
-108,0,68,0,101,
-0,102,0,105,0,
-110,0,105,0,116,
-0,105,0,111,0,
-110,0,115,0,95,
-0,49,0,1,154,
-1,3,1,2,1,
-1,3316,22,1,3,
-1,2022,3317,16,0,
-599,1,2675,731,1,
-2750,3318,16,0,702,
-1,2738,3319,17,3320,
-15,3321,4,52,37,
+1473,1,130,1478,1,
+143,2640,16,0,319,
+1,387,2641,16,0,
+319,1,1159,2642,16,
+0,319,1,157,2643,
+16,0,319,1,1413,
+2644,16,0,319,1,
+1665,2645,16,0,319,
+1,412,2646,16,0,
+319,1,1377,2647,16,
+0,319,1,172,1532,
+1,1939,2648,16,0,
+319,1,437,2649,16,
+0,637,1,188,1581,
+1,942,1553,1,1195,
+2650,16,0,319,1,
+1449,2651,16,0,319,
+1,1701,2652,16,0,
+319,1,447,1574,1,
+205,2653,16,0,319,
+1,827,2654,16,0,
+319,1,2724,2655,16,
+0,319,1,223,2656,
+16,0,319,1,476,
+1608,1,477,1614,1,
+1231,2657,16,0,319,
+1,479,1624,1,480,
+1629,1,1485,2658,16,
+0,319,1,1737,2659,
+16,0,319,1,242,
+2660,16,0,319,1,
+478,1647,1,1001,1652,
+1,1002,1657,1,27,
+2661,19,657,1,27,
+2662,5,95,1,256,
+2663,16,0,655,1,
+1261,2664,16,0,655,
+1,509,2665,16,0,
+655,1,1515,2666,16,
+0,655,1,2021,782,
+1,1775,2667,16,0,
+655,1,2029,789,1,
+2030,795,1,2031,800,
+1,2032,805,1,2033,
+810,1,277,2668,16,
+0,655,1,2035,816,
+1,2037,821,1,2039,
+826,1,32,2669,16,
+0,655,1,2041,832,
+1,2293,2670,16,0,
+655,1,2043,838,1,
+2045,843,1,41,2671,
+16,0,655,1,1297,
+2672,16,0,655,1,
+43,2673,16,0,655,
+1,1803,851,1,1804,
+2674,16,0,655,1,
+299,2675,16,0,655,
+1,52,2676,16,0,
+655,1,2318,2677,16,
+0,655,1,62,2678,
+16,0,655,1,2075,
+2679,16,0,655,1,
+1574,863,1,71,2680,
+16,0,655,1,76,
+2681,16,0,655,1,
+1834,2682,16,0,655,
+1,2337,2683,16,0,
+655,1,79,2684,16,
+0,655,1,1335,2685,
+16,0,655,1,322,
+2686,16,0,655,1,
+85,2687,16,0,655,
+1,89,2688,16,0,
+655,1,346,2689,16,
+0,655,1,2105,878,
+1,2106,2690,16,0,
+655,1,97,2691,16,
+0,655,1,1860,885,
+1,2364,891,1,102,
+2692,16,0,655,1,
+112,2693,16,0,655,
+1,1117,2694,16,0,
+655,1,1873,899,1,
+1876,2695,16,0,655,
+1,124,2696,16,0,
+655,1,2136,906,1,
+2718,2697,16,0,655,
+1,381,2698,16,0,
+655,1,525,2699,16,
+0,655,1,137,2700,
+16,0,655,1,1901,
+2701,16,0,655,1,
+1153,2702,16,0,655,
+1,151,2703,16,0,
+655,1,1407,2704,16,
+0,655,1,1659,2705,
+16,0,655,1,2413,
+2706,16,0,655,1,
+406,2707,16,0,655,
+1,1371,2708,16,0,
+655,1,166,2709,16,
+0,655,1,1622,2710,
+16,0,655,1,1931,
+925,1,1933,2711,16,
+0,655,1,431,2712,
+16,0,655,1,1585,
+2713,16,0,655,1,
+182,2714,16,0,655,
+1,1189,2715,16,0,
+655,1,1443,2716,16,
+0,655,1,1695,2717,
+16,0,655,1,2198,
+2718,16,0,655,1,
+447,2719,16,0,655,
+1,2458,940,1,2459,
+946,1,1958,2720,16,
+0,655,1,2462,953,
+1,1657,958,1,2464,
+963,1,199,2721,16,
+0,655,1,459,2722,
+16,0,655,1,462,
+2723,16,0,655,1,
+217,2724,16,0,655,
+1,2227,972,1,1225,
+2725,16,0,655,1,
+1479,2726,16,0,655,
+1,1731,2727,16,0,
+655,1,1989,980,1,
+1990,2728,16,0,655,
+1,236,2729,16,0,
+655,1,1756,2730,16,
+0,655,1,28,2731,
+19,690,1,28,2732,
+5,60,1,328,1366,
+1,223,1598,1,1096,
+1376,1,118,1419,1,
+883,1461,1,525,1280,
+1,1001,1652,1,130,
+1478,1,459,1817,1,
+1114,1407,1,352,1413,
+1,447,1574,1,464,
+1812,1,1011,1166,1,
+1013,1322,1,242,1642,
+1,143,1483,1,40,
+1241,1,41,1787,1,
+42,1791,1,479,1624,
+1,44,1247,1,481,
+1819,1,373,1473,1,
+47,1248,1,157,1506,
+1,49,1260,1,50,
+1265,1,48,1254,1,
+379,1450,1,380,1455,
+1,51,1270,1,476,
+1608,1,371,1429,1,
+478,1647,1,1048,1408,
+1,375,1440,1,172,
+1532,1,262,1183,1,
+283,1236,1,63,1286,
+1,67,1297,1,68,
+1302,1,69,1307,1,
+66,1292,1,461,2733,
+16,0,688,1,74,
+1317,1,377,1445,1,
+1002,1657,1,70,1312,
+1,188,1581,1,82,
+1344,1,305,1275,1,
+477,1614,1,827,1395,
+1,93,1382,1,480,
+1629,1,205,1587,1,
+942,1553,1,107,1402,
+1,29,2734,19,287,
+1,29,2735,5,84,
+1,1011,1166,1,1012,
+2736,16,0,285,1,
+1013,1322,1,262,1183,
+1,1267,2737,16,0,
+285,1,515,2738,16,
+0,285,1,1521,2739,
+16,0,285,1,525,
+1280,1,283,1236,1,
+2299,2740,16,0,285,
+1,42,2741,16,0,
+285,1,40,1241,1,
+44,1247,1,47,1248,
+1,1303,2742,16,0,
+285,1,1555,2743,16,
+0,285,1,50,1265,
+1,48,1254,1,49,
+1260,1,51,1270,1,
+63,1286,1,305,1275,
+1,66,1292,1,67,
+1297,1,68,1302,1,
+69,1307,1,70,1312,
+1,73,2744,16,0,
+285,1,74,1317,1,
+328,1366,1,1048,1408,
+1,82,2745,16,0,
+285,1,1840,2746,16,
+0,285,1,1591,2747,
+16,0,285,1,1341,
+2748,16,0,285,1,
+1096,1376,1,93,1382,
+1,352,1413,1,107,
+2749,16,0,285,1,
+1114,1407,1,118,1419,
+1,1123,2750,16,0,
+285,1,371,1429,1,
+1628,2751,16,0,285,
+1,375,1440,1,1882,
+2752,16,0,285,1,
+377,1445,1,379,1450,
+1,380,1455,1,883,
+2753,16,0,285,1,
+373,1473,1,130,1478,
+1,143,1483,1,387,
+2754,16,0,285,1,
+1159,2755,16,0,285,
+1,157,1506,1,1413,
+2756,16,0,285,1,
+1665,2757,16,0,285,
+1,412,2758,16,0,
+285,1,1377,2759,16,
+0,285,1,172,1532,
+1,1939,2760,16,0,
+285,1,437,2761,16,
+0,285,1,188,1581,
+1,942,1553,1,1195,
+2762,16,0,285,1,
+1449,2763,16,0,285,
+1,1701,2764,16,0,
+285,1,447,1574,1,
+205,2765,16,0,285,
+1,827,2766,16,0,
+285,1,2724,2767,16,
+0,285,1,223,2768,
+16,0,285,1,476,
+1608,1,477,1614,1,
+1231,2769,16,0,285,
+1,479,1624,1,480,
+1629,1,1485,2770,16,
+0,285,1,1737,2771,
+16,0,285,1,242,
+2772,16,0,285,1,
+478,1647,1,1001,1652,
+1,1002,1657,1,30,
+2773,19,269,1,30,
+2774,5,84,1,1011,
+1166,1,1012,2775,16,
+0,267,1,1013,1322,
+1,262,1183,1,1267,
+2776,16,0,267,1,
+515,2777,16,0,267,
+1,1521,2778,16,0,
+267,1,525,1280,1,
+283,1236,1,2299,2779,
+16,0,267,1,42,
+2780,16,0,267,1,
+40,1241,1,44,1247,
+1,47,1248,1,1303,
+2781,16,0,267,1,
+1555,2782,16,0,267,
+1,50,1265,1,48,
+1254,1,49,1260,1,
+51,1270,1,63,1286,
+1,305,1275,1,66,
+1292,1,67,1297,1,
+68,1302,1,69,1307,
+1,70,1312,1,73,
+2783,16,0,267,1,
+74,1317,1,328,1366,
+1,1048,1408,1,82,
+2784,16,0,267,1,
+1840,2785,16,0,267,
+1,1591,2786,16,0,
+267,1,1341,2787,16,
+0,267,1,1096,1376,
+1,93,1382,1,352,
+1413,1,107,2788,16,
+0,267,1,1114,1407,
+1,118,1419,1,1123,
+2789,16,0,267,1,
+371,1429,1,1628,2790,
+16,0,267,1,375,
+1440,1,1882,2791,16,
+0,267,1,377,1445,
+1,379,1450,1,380,
+1455,1,883,2792,16,
+0,267,1,373,1473,
+1,130,1478,1,143,
+1483,1,387,2793,16,
+0,267,1,1159,2794,
+16,0,267,1,157,
+1506,1,1413,2795,16,
+0,267,1,1665,2796,
+16,0,267,1,412,
+2797,16,0,267,1,
+1377,2798,16,0,267,
+1,172,1532,1,1939,
+2799,16,0,267,1,
+437,2800,16,0,267,
+1,188,1581,1,942,
+1553,1,1195,2801,16,
+0,267,1,1449,2802,
+16,0,267,1,1701,
+2803,16,0,267,1,
+447,1574,1,205,2804,
+16,0,267,1,827,
+2805,16,0,267,1,
+2724,2806,16,0,267,
+1,223,2807,16,0,
+267,1,476,1608,1,
+477,1614,1,1231,2808,
+16,0,267,1,479,
+1624,1,480,1629,1,
+1485,2809,16,0,267,
+1,1737,2810,16,0,
+267,1,242,2811,16,
+0,267,1,478,1647,
+1,1001,1652,1,1002,
+1657,1,31,2812,19,
+258,1,31,2813,5,
+84,1,1011,1166,1,
+1012,2814,16,0,256,
+1,1013,1322,1,262,
+1183,1,1267,2815,16,
+0,256,1,515,2816,
+16,0,256,1,1521,
+2817,16,0,256,1,
+525,1280,1,283,1236,
+1,2299,2818,16,0,
+256,1,42,2819,16,
+0,256,1,40,1241,
+1,44,1247,1,47,
+1248,1,1303,2820,16,
+0,256,1,1555,2821,
+16,0,256,1,50,
+1265,1,48,1254,1,
+49,1260,1,51,1270,
+1,63,1286,1,305,
+1275,1,66,1292,1,
+67,1297,1,68,1302,
+1,69,1307,1,70,
+1312,1,73,2822,16,
+0,256,1,74,1317,
+1,328,1366,1,1048,
+1408,1,82,2823,16,
+0,256,1,1840,2824,
+16,0,256,1,1591,
+2825,16,0,256,1,
+1341,2826,16,0,256,
+1,1096,1376,1,93,
+1382,1,352,1413,1,
+107,2827,16,0,256,
+1,1114,1407,1,118,
+1419,1,1123,2828,16,
+0,256,1,371,1429,
+1,1628,2829,16,0,
+256,1,375,1440,1,
+1882,2830,16,0,256,
+1,377,1445,1,379,
+1450,1,380,1455,1,
+883,2831,16,0,256,
+1,373,1473,1,130,
+1478,1,143,2832,16,
+0,256,1,387,2833,
+16,0,256,1,1159,
+2834,16,0,256,1,
+157,2835,16,0,256,
+1,1413,2836,16,0,
+256,1,1665,2837,16,
+0,256,1,412,2838,
+16,0,256,1,1377,
+2839,16,0,256,1,
+172,1532,1,1939,2840,
+16,0,256,1,437,
+2841,16,0,256,1,
+188,1581,1,942,1553,
+1,1195,2842,16,0,
+256,1,1449,2843,16,
+0,256,1,1701,2844,
+16,0,256,1,447,
+1574,1,205,2845,16,
+0,256,1,827,2846,
+16,0,256,1,2724,
+2847,16,0,256,1,
+223,2848,16,0,256,
+1,476,1608,1,477,
+1614,1,1231,2849,16,
+0,256,1,479,1624,
+1,480,1629,1,1485,
+2850,16,0,256,1,
+1737,2851,16,0,256,
+1,242,2852,16,0,
+256,1,478,1647,1,
+1001,1652,1,1002,1657,
+1,32,2853,19,251,
+1,32,2854,5,84,
+1,1011,1166,1,1012,
+2855,16,0,249,1,
+1013,1322,1,262,1183,
+1,1267,2856,16,0,
+249,1,515,2857,16,
+0,249,1,1521,2858,
+16,0,249,1,525,
+1280,1,283,1236,1,
+2299,2859,16,0,249,
+1,42,2860,16,0,
+249,1,40,1241,1,
+44,1247,1,47,1248,
+1,1303,2861,16,0,
+249,1,1555,2862,16,
+0,249,1,50,1265,
+1,48,1254,1,49,
+1260,1,51,1270,1,
+63,1286,1,305,1275,
+1,66,1292,1,67,
+1297,1,68,1302,1,
+69,1307,1,70,1312,
+1,73,2863,16,0,
+249,1,74,1317,1,
+328,1366,1,1048,1408,
+1,82,2864,16,0,
+249,1,1840,2865,16,
+0,249,1,1591,2866,
+16,0,249,1,1341,
+2867,16,0,249,1,
+1096,1376,1,93,1382,
+1,352,1413,1,107,
+2868,16,0,249,1,
+1114,1407,1,118,1419,
+1,1123,2869,16,0,
+249,1,371,1429,1,
+1628,2870,16,0,249,
+1,375,1440,1,1882,
+2871,16,0,249,1,
+377,1445,1,379,1450,
+1,380,1455,1,883,
+2872,16,0,249,1,
+373,1473,1,130,1478,
+1,143,2873,16,0,
+249,1,387,2874,16,
+0,249,1,1159,2875,
+16,0,249,1,157,
+2876,16,0,249,1,
+1413,2877,16,0,249,
+1,1665,2878,16,0,
+249,1,412,2879,16,
+0,249,1,1377,2880,
+16,0,249,1,172,
+1532,1,1939,2881,16,
+0,249,1,437,2882,
+16,0,249,1,188,
+1581,1,942,1553,1,
+1195,2883,16,0,249,
+1,1449,2884,16,0,
+249,1,1701,2885,16,
+0,249,1,447,1574,
+1,205,2886,16,0,
+249,1,827,2887,16,
+0,249,1,2724,2888,
+16,0,249,1,223,
+2889,16,0,249,1,
+476,1608,1,477,1614,
+1,1231,2890,16,0,
+249,1,479,1624,1,
+480,1629,1,1485,2891,
+16,0,249,1,1737,
+2892,16,0,249,1,
+242,2893,16,0,249,
+1,478,1647,1,1001,
+1652,1,1002,1657,1,
+33,2894,19,349,1,
+33,2895,5,84,1,
+1011,1166,1,1012,2896,
+16,0,347,1,1013,
+1322,1,262,1183,1,
+1267,2897,16,0,347,
+1,515,2898,16,0,
+347,1,1521,2899,16,
+0,347,1,525,1280,
+1,283,1236,1,2299,
+2900,16,0,347,1,
+42,2901,16,0,347,
+1,40,1241,1,44,
+1247,1,47,1248,1,
+1303,2902,16,0,347,
+1,1555,2903,16,0,
+347,1,50,1265,1,
+48,1254,1,49,1260,
+1,51,1270,1,63,
+1286,1,305,1275,1,
+66,1292,1,67,1297,
+1,68,1302,1,69,
+1307,1,70,1312,1,
+73,2904,16,0,347,
+1,74,1317,1,328,
+1366,1,1048,1408,1,
+82,2905,16,0,347,
+1,1840,2906,16,0,
+347,1,1591,2907,16,
+0,347,1,1341,2908,
+16,0,347,1,1096,
+1376,1,93,1382,1,
+352,1413,1,107,2909,
+16,0,347,1,1114,
+1407,1,118,1419,1,
+1123,2910,16,0,347,
+1,371,1429,1,1628,
+2911,16,0,347,1,
+375,1440,1,1882,2912,
+16,0,347,1,377,
+1445,1,379,1450,1,
+380,1455,1,883,2913,
+16,0,347,1,373,
+1473,1,130,1478,1,
+143,1483,1,387,2914,
+16,0,347,1,1159,
+2915,16,0,347,1,
+157,1506,1,1413,2916,
+16,0,347,1,1665,
+2917,16,0,347,1,
+412,2918,16,0,347,
+1,1377,2919,16,0,
+347,1,172,1532,1,
+1939,2920,16,0,347,
+1,437,2921,16,0,
+347,1,188,1581,1,
+942,1553,1,1195,2922,
+16,0,347,1,1449,
+2923,16,0,347,1,
+1701,2924,16,0,347,
+1,447,1574,1,205,
+2925,16,0,347,1,
+827,2926,16,0,347,
+1,2724,2927,16,0,
+347,1,223,2928,16,
+0,347,1,476,1608,
+1,477,1614,1,1231,
+2929,16,0,347,1,
+479,1624,1,480,1629,
+1,1485,2930,16,0,
+347,1,1737,2931,16,
+0,347,1,242,1642,
+1,478,1647,1,1001,
+1652,1,1002,1657,1,
+34,2932,19,335,1,
+34,2933,5,84,1,
+1011,1166,1,1012,2934,
+16,0,333,1,1013,
+1322,1,262,1183,1,
+1267,2935,16,0,333,
+1,515,2936,16,0,
+333,1,1521,2937,16,
+0,333,1,525,1280,
+1,283,1236,1,2299,
+2938,16,0,333,1,
+42,2939,16,0,333,
+1,40,1241,1,44,
+1247,1,47,1248,1,
+1303,2940,16,0,333,
+1,1555,2941,16,0,
+333,1,50,1265,1,
+48,1254,1,49,1260,
+1,51,1270,1,63,
+1286,1,305,1275,1,
+66,1292,1,67,1297,
+1,68,1302,1,69,
+1307,1,70,1312,1,
+73,2942,16,0,333,
+1,74,1317,1,328,
+1366,1,1048,1408,1,
+82,2943,16,0,333,
+1,1840,2944,16,0,
+333,1,1591,2945,16,
+0,333,1,1341,2946,
+16,0,333,1,1096,
+1376,1,93,1382,1,
+352,1413,1,107,2947,
+16,0,333,1,1114,
+1407,1,118,1419,1,
+1123,2948,16,0,333,
+1,371,1429,1,1628,
+2949,16,0,333,1,
+375,1440,1,1882,2950,
+16,0,333,1,377,
+1445,1,379,1450,1,
+380,1455,1,883,2951,
+16,0,333,1,373,
+1473,1,130,1478,1,
+143,1483,1,387,2952,
+16,0,333,1,1159,
+2953,16,0,333,1,
+157,1506,1,1413,2954,
+16,0,333,1,1665,
+2955,16,0,333,1,
+412,2956,16,0,333,
+1,1377,2957,16,0,
+333,1,172,1532,1,
+1939,2958,16,0,333,
+1,437,2959,16,0,
+333,1,188,1581,1,
+942,1553,1,1195,2960,
+16,0,333,1,1449,
+2961,16,0,333,1,
+1701,2962,16,0,333,
+1,447,1574,1,205,
+1587,1,827,2963,16,
+0,333,1,2724,2964,
+16,0,333,1,223,
+1598,1,476,1608,1,
+477,1614,1,1231,2965,
+16,0,333,1,479,
+1624,1,480,1629,1,
+1485,2966,16,0,333,
+1,1737,2967,16,0,
+333,1,242,1642,1,
+478,1647,1,1001,1652,
+1,1002,1657,1,35,
+2968,19,324,1,35,
+2969,5,84,1,1011,
+1166,1,1012,2970,16,
+0,322,1,1013,1322,
+1,262,1183,1,1267,
+2971,16,0,322,1,
+515,2972,16,0,322,
+1,1521,2973,16,0,
+322,1,525,1280,1,
+283,1236,1,2299,2974,
+16,0,322,1,42,
+2975,16,0,322,1,
+40,1241,1,44,1247,
+1,47,1248,1,1303,
+2976,16,0,322,1,
+1555,2977,16,0,322,
+1,50,1265,1,48,
+1254,1,49,1260,1,
+51,1270,1,63,1286,
+1,305,1275,1,66,
+1292,1,67,1297,1,
+68,1302,1,69,1307,
+1,70,1312,1,73,
+2978,16,0,322,1,
+74,1317,1,328,1366,
+1,1048,1408,1,82,
+2979,16,0,322,1,
+1840,2980,16,0,322,
+1,1591,2981,16,0,
+322,1,1341,2982,16,
+0,322,1,1096,1376,
+1,93,1382,1,352,
+1413,1,107,2983,16,
+0,322,1,1114,1407,
+1,118,1419,1,1123,
+2984,16,0,322,1,
+371,1429,1,1628,2985,
+16,0,322,1,375,
+1440,1,1882,2986,16,
+0,322,1,377,1445,
+1,379,1450,1,380,
+1455,1,883,2987,16,
+0,322,1,373,1473,
+1,130,1478,1,143,
+1483,1,387,2988,16,
+0,322,1,1159,2989,
+16,0,322,1,157,
+1506,1,1413,2990,16,
+0,322,1,1665,2991,
+16,0,322,1,412,
+2992,16,0,322,1,
+1377,2993,16,0,322,
+1,172,1532,1,1939,
+2994,16,0,322,1,
+437,2995,16,0,322,
+1,188,1581,1,942,
+1553,1,1195,2996,16,
+0,322,1,1449,2997,
+16,0,322,1,1701,
+2998,16,0,322,1,
+447,1574,1,205,1587,
+1,827,2999,16,0,
+322,1,2724,3000,16,
+0,322,1,223,3001,
+16,0,322,1,476,
+1608,1,477,1614,1,
+1231,3002,16,0,322,
+1,479,1624,1,480,
+1629,1,1485,3003,16,
+0,322,1,1737,3004,
+16,0,322,1,242,
+1642,1,478,1647,1,
+1001,1652,1,1002,1657,
+1,36,3005,19,223,
+1,36,3006,5,94,
+1,256,3007,16,0,
+221,1,1261,3008,16,
+0,221,1,509,3009,
+16,0,221,1,1515,
+3010,16,0,221,1,
+2021,782,1,1775,3011,
+16,0,221,1,2029,
+789,1,2030,795,1,
+2031,800,1,2032,805,
+1,2033,810,1,277,
+3012,16,0,221,1,
+2035,816,1,2037,821,
+1,2039,826,1,32,
+3013,16,0,221,1,
+2041,832,1,2293,3014,
+16,0,221,1,2043,
+838,1,2045,843,1,
+41,3015,16,0,221,
+1,1297,3016,16,0,
+221,1,43,3017,16,
+0,221,1,1803,851,
+1,1804,3018,16,0,
+221,1,299,3019,16,
+0,221,1,52,3020,
+16,0,221,1,2318,
+3021,16,0,221,1,
+2075,3022,16,0,221,
+1,1574,863,1,71,
+3023,16,0,221,1,
+76,3024,16,0,221,
+1,1834,3025,16,0,
+221,1,2337,3026,16,
+0,221,1,79,3027,
+16,0,221,1,1335,
+3028,16,0,221,1,
+322,3029,16,0,221,
+1,85,3030,16,0,
+221,1,89,3031,16,
+0,221,1,346,3032,
+16,0,221,1,2105,
+878,1,2106,3033,16,
+0,221,1,97,3034,
+16,0,221,1,1860,
+885,1,2364,891,1,
+102,3035,16,0,221,
+1,112,3036,16,0,
+221,1,1117,3037,16,
+0,221,1,1873,899,
+1,1876,3038,16,0,
+221,1,124,3039,16,
+0,221,1,2136,906,
+1,2718,3040,16,0,
+221,1,381,3041,16,
+0,221,1,525,3042,
+16,0,221,1,137,
+3043,16,0,221,1,
+1901,3044,16,0,221,
+1,1153,3045,16,0,
+221,1,151,3046,16,
+0,221,1,1407,3047,
+16,0,221,1,1659,
+3048,16,0,221,1,
+2413,3049,16,0,221,
+1,406,3050,16,0,
+221,1,1371,3051,16,
+0,221,1,166,3052,
+16,0,221,1,1622,
+3053,16,0,221,1,
+1931,925,1,1933,3054,
+16,0,221,1,431,
+3055,16,0,221,1,
+1585,3056,16,0,221,
+1,182,3057,16,0,
+221,1,1189,3058,16,
+0,221,1,1443,3059,
+16,0,221,1,1695,
+3060,16,0,221,1,
+2198,3061,16,0,221,
+1,447,3062,16,0,
+221,1,2458,940,1,
+2459,946,1,1958,3063,
+16,0,221,1,2462,
+953,1,1657,958,1,
+2464,963,1,199,3064,
+16,0,221,1,459,
+3065,16,0,221,1,
+462,3066,16,0,221,
+1,217,3067,16,0,
+221,1,2227,972,1,
+1225,3068,16,0,221,
+1,1479,3069,16,0,
+221,1,1731,3070,16,
+0,221,1,1989,980,
+1,1990,3071,16,0,
+221,1,236,3072,16,
+0,221,1,1756,3073,
+16,0,221,1,37,
+3074,19,241,1,37,
+3075,5,94,1,256,
+3076,16,0,239,1,
+1261,3077,16,0,239,
+1,509,3078,16,0,
+239,1,1515,3079,16,
+0,239,1,2021,782,
+1,1775,3080,16,0,
+239,1,2029,789,1,
+2030,795,1,2031,800,
+1,2032,805,1,2033,
+810,1,277,3081,16,
+0,239,1,2035,816,
+1,2037,821,1,2039,
+826,1,32,3082,16,
+0,239,1,2041,832,
+1,2293,3083,16,0,
+239,1,2043,838,1,
+2045,843,1,41,3084,
+16,0,239,1,1297,
+3085,16,0,239,1,
+43,3086,16,0,239,
+1,1803,851,1,1804,
+3087,16,0,239,1,
+299,3088,16,0,239,
+1,52,3089,16,0,
+239,1,2318,3090,16,
+0,239,1,2075,3091,
+16,0,239,1,1574,
+863,1,71,3092,16,
+0,239,1,76,3093,
+16,0,239,1,1834,
+3094,16,0,239,1,
+2337,3095,16,0,239,
+1,79,3096,16,0,
+239,1,1335,3097,16,
+0,239,1,322,3098,
+16,0,239,1,85,
+3099,16,0,239,1,
+89,3100,16,0,239,
+1,346,3101,16,0,
+239,1,2105,878,1,
+2106,3102,16,0,239,
+1,97,3103,16,0,
+239,1,1860,885,1,
+2364,891,1,102,3104,
+16,0,239,1,112,
+3105,16,0,239,1,
+1117,3106,16,0,239,
+1,1873,899,1,1876,
+3107,16,0,239,1,
+124,3108,16,0,239,
+1,2136,906,1,2718,
+3109,16,0,239,1,
+381,3110,16,0,239,
+1,525,3111,16,0,
+239,1,137,3112,16,
+0,239,1,1901,3113,
+16,0,239,1,1153,
+3114,16,0,239,1,
+151,3115,16,0,239,
+1,1407,3116,16,0,
+239,1,1659,3117,16,
+0,239,1,2413,3118,
+16,0,239,1,406,
+3119,16,0,239,1,
+1371,3120,16,0,239,
+1,166,3121,16,0,
+239,1,1622,3122,16,
+0,239,1,1931,925,
+1,1933,3123,16,0,
+239,1,431,3124,16,
+0,239,1,1585,3125,
+16,0,239,1,182,
+3126,16,0,239,1,
+1189,3127,16,0,239,
+1,1443,3128,16,0,
+239,1,1695,3129,16,
+0,239,1,2198,3130,
+16,0,239,1,447,
+3131,16,0,239,1,
+2458,940,1,2459,946,
+1,1958,3132,16,0,
+239,1,2462,953,1,
+1657,958,1,2464,963,
+1,199,3133,16,0,
+239,1,459,3134,16,
+0,239,1,462,3135,
+16,0,239,1,217,
+3136,16,0,239,1,
+2227,972,1,1225,3137,
+16,0,239,1,1479,
+3138,16,0,239,1,
+1731,3139,16,0,239,
+1,1989,980,1,1990,
+3140,16,0,239,1,
+236,3141,16,0,239,
+1,1756,3142,16,0,
+239,1,38,3143,19,
+238,1,38,3144,5,
+84,1,1011,1166,1,
+1012,3145,16,0,236,
+1,1013,1322,1,262,
+1183,1,1267,3146,16,
+0,236,1,515,3147,
+16,0,236,1,1521,
+3148,16,0,236,1,
+525,1280,1,283,1236,
+1,2299,3149,16,0,
+236,1,42,3150,16,
+0,236,1,40,1241,
+1,44,1247,1,47,
+1248,1,1303,3151,16,
+0,236,1,1555,3152,
+16,0,236,1,50,
+1265,1,48,1254,1,
+49,1260,1,51,1270,
+1,63,1286,1,305,
+1275,1,66,1292,1,
+67,1297,1,68,1302,
+1,69,1307,1,70,
+1312,1,73,3153,16,
+0,236,1,74,1317,
+1,328,1366,1,1048,
+1408,1,82,3154,16,
+0,236,1,1840,3155,
+16,0,236,1,1591,
+3156,16,0,236,1,
+1341,3157,16,0,236,
+1,1096,1376,1,93,
+1382,1,352,1413,1,
+107,3158,16,0,236,
+1,1114,1407,1,118,
+1419,1,1123,3159,16,
+0,236,1,371,1429,
+1,1628,3160,16,0,
+236,1,375,1440,1,
+1882,3161,16,0,236,
+1,377,1445,1,379,
+1450,1,380,1455,1,
+883,1461,1,373,1473,
+1,130,1478,1,143,
+1483,1,387,3162,16,
+0,236,1,1159,3163,
+16,0,236,1,157,
+1506,1,1413,3164,16,
+0,236,1,1665,3165,
+16,0,236,1,412,
+3166,16,0,236,1,
+1377,3167,16,0,236,
+1,172,1532,1,1939,
+3168,16,0,236,1,
+437,3169,16,0,236,
+1,188,1581,1,942,
+1553,1,1195,3170,16,
+0,236,1,1449,3171,
+16,0,236,1,1701,
+3172,16,0,236,1,
+447,1574,1,205,1587,
+1,827,1395,1,2724,
+3173,16,0,236,1,
+223,1598,1,476,1608,
+1,477,1614,1,1231,
+3174,16,0,236,1,
+479,1624,1,480,1629,
+1,1485,3175,16,0,
+236,1,1737,3176,16,
+0,236,1,242,1642,
+1,478,1647,1,1001,
+1652,1,1002,1657,1,
+39,3177,19,229,1,
+39,3178,5,84,1,
+1011,1166,1,1012,3179,
+16,0,227,1,1013,
+1322,1,262,1183,1,
+1267,3180,16,0,227,
+1,515,3181,16,0,
+227,1,1521,3182,16,
+0,227,1,525,1280,
+1,283,1236,1,2299,
+3183,16,0,227,1,
+42,3184,16,0,227,
+1,40,1241,1,44,
+1247,1,47,1248,1,
+1303,3185,16,0,227,
+1,1555,3186,16,0,
+227,1,50,1265,1,
+48,1254,1,49,1260,
+1,51,1270,1,63,
+1286,1,305,1275,1,
+66,1292,1,67,1297,
+1,68,1302,1,69,
+1307,1,70,1312,1,
+73,3187,16,0,227,
+1,74,1317,1,328,
+1366,1,1048,1408,1,
+82,3188,16,0,227,
+1,1840,3189,16,0,
+227,1,1591,3190,16,
+0,227,1,1341,3191,
+16,0,227,1,1096,
+1376,1,93,1382,1,
+352,1413,1,107,3192,
+16,0,227,1,1114,
+1407,1,118,1419,1,
+1123,3193,16,0,227,
+1,371,1429,1,1628,
+3194,16,0,227,1,
+375,1440,1,1882,3195,
+16,0,227,1,377,
+1445,1,379,1450,1,
+380,1455,1,883,1461,
+1,373,1473,1,130,
+1478,1,143,1483,1,
+387,3196,16,0,227,
+1,1159,3197,16,0,
+227,1,157,1506,1,
+1413,3198,16,0,227,
+1,1665,3199,16,0,
+227,1,412,3200,16,
+0,227,1,1377,3201,
+16,0,227,1,172,
+1532,1,1939,3202,16,
+0,227,1,437,3203,
+16,0,227,1,188,
+1581,1,942,1553,1,
+1195,3204,16,0,227,
+1,1449,3205,16,0,
+227,1,1701,3206,16,
+0,227,1,447,1574,
+1,205,1587,1,827,
+1395,1,2724,3207,16,
+0,227,1,223,1598,
+1,476,1608,1,477,
+1614,1,1231,3208,16,
+0,227,1,479,1624,
+1,480,1629,1,1485,
+3209,16,0,227,1,
+1737,3210,16,0,227,
+1,242,1642,1,478,
+1647,1,1001,1652,1,
+1002,1657,1,40,3211,
+19,217,1,40,3212,
+5,84,1,1011,1166,
+1,1012,3213,16,0,
+215,1,1013,1322,1,
+262,1183,1,1267,3214,
+16,0,215,1,515,
+3215,16,0,215,1,
+1521,3216,16,0,215,
+1,525,1280,1,283,
+1236,1,2299,3217,16,
+0,215,1,42,3218,
+16,0,215,1,40,
+1241,1,44,1247,1,
+47,1248,1,1303,3219,
+16,0,215,1,1555,
+3220,16,0,215,1,
+50,1265,1,48,1254,
+1,49,1260,1,51,
+1270,1,63,1286,1,
+305,1275,1,66,1292,
+1,67,1297,1,68,
+1302,1,69,1307,1,
+70,1312,1,73,3221,
+16,0,215,1,74,
+1317,1,328,1366,1,
+1048,1408,1,82,3222,
+16,0,215,1,1840,
+3223,16,0,215,1,
+1591,3224,16,0,215,
+1,1341,3225,16,0,
+215,1,1096,1376,1,
+93,1382,1,352,1413,
+1,107,3226,16,0,
+215,1,1114,1407,1,
+118,3227,16,0,215,
+1,1123,3228,16,0,
+215,1,371,1429,1,
+1628,3229,16,0,215,
+1,375,1440,1,1882,
+3230,16,0,215,1,
+377,1445,1,379,1450,
+1,380,1455,1,883,
+3231,16,0,215,1,
+373,1473,1,130,3232,
+16,0,215,1,143,
+3233,16,0,215,1,
+387,3234,16,0,215,
+1,1159,3235,16,0,
+215,1,157,3236,16,
+0,215,1,1413,3237,
+16,0,215,1,1665,
+3238,16,0,215,1,
+412,3239,16,0,215,
+1,1377,3240,16,0,
+215,1,172,3241,16,
+0,215,1,1939,3242,
+16,0,215,1,437,
+3243,16,0,215,1,
+188,3244,16,0,215,
+1,942,1553,1,1195,
+3245,16,0,215,1,
+1449,3246,16,0,215,
+1,1701,3247,16,0,
+215,1,447,1574,1,
+205,3248,16,0,215,
+1,827,3249,16,0,
+215,1,2724,3250,16,
+0,215,1,223,3251,
+16,0,215,1,476,
+1608,1,477,1614,1,
+1231,3252,16,0,215,
+1,479,1624,1,480,
+1629,1,1485,3253,16,
+0,215,1,1737,3254,
+16,0,215,1,242,
+3255,16,0,215,1,
+478,1647,1,1001,1652,
+1,1002,1657,1,41,
+3256,19,175,1,41,
+3257,5,84,1,1011,
+1166,1,1012,3258,16,
+0,173,1,1013,1322,
+1,262,1183,1,1267,
+3259,16,0,173,1,
+515,3260,16,0,173,
+1,1521,3261,16,0,
+173,1,525,1280,1,
+283,1236,1,2299,3262,
+16,0,173,1,42,
+3263,16,0,173,1,
+40,1241,1,44,1247,
+1,47,1248,1,1303,
+3264,16,0,173,1,
+1555,3265,16,0,173,
+1,50,1265,1,48,
+1254,1,49,1260,1,
+51,1270,1,63,1286,
+1,305,1275,1,66,
+1292,1,67,1297,1,
+68,1302,1,69,1307,
+1,70,1312,1,73,
+3266,16,0,173,1,
+74,1317,1,328,1366,
+1,1048,1408,1,82,
+3267,16,0,173,1,
+1840,3268,16,0,173,
+1,1591,3269,16,0,
+173,1,1341,3270,16,
+0,173,1,1096,1376,
+1,93,1382,1,352,
+1413,1,107,3271,16,
+0,173,1,1114,1407,
+1,118,3272,16,0,
+173,1,1123,3273,16,
+0,173,1,371,1429,
+1,1628,3274,16,0,
+173,1,375,1440,1,
+1882,3275,16,0,173,
+1,377,1445,1,379,
+1450,1,380,1455,1,
+883,3276,16,0,173,
+1,373,1473,1,130,
+3277,16,0,173,1,
+143,3278,16,0,173,
+1,387,3279,16,0,
+173,1,1159,3280,16,
+0,173,1,157,3281,
+16,0,173,1,1413,
+3282,16,0,173,1,
+1665,3283,16,0,173,
+1,412,3284,16,0,
+173,1,1377,3285,16,
+0,173,1,172,3286,
+16,0,173,1,1939,
+3287,16,0,173,1,
+437,3288,16,0,173,
+1,188,3289,16,0,
+173,1,942,1553,1,
+1195,3290,16,0,173,
+1,1449,3291,16,0,
+173,1,1701,3292,16,
+0,173,1,447,1574,
+1,205,3293,16,0,
+173,1,827,3294,16,
+0,173,1,2724,3295,
+16,0,173,1,223,
+3296,16,0,173,1,
+476,1608,1,477,1614,
+1,1231,3297,16,0,
+173,1,479,1624,1,
+480,1629,1,1485,3298,
+16,0,173,1,1737,
+3299,16,0,173,1,
+242,3300,16,0,173,
+1,478,1647,1,1001,
+1652,1,1002,1657,1,
+42,3301,19,411,1,
+42,3302,5,38,1,
+1901,3303,16,0,409,
+1,2075,3304,16,0,
+409,1,1860,885,1,
+1803,851,1,1804,3305,
+16,0,409,1,2413,
+3306,16,0,409,1,
+2198,3307,16,0,409,
+1,1873,899,1,1657,
+958,1,1989,980,1,
+1990,3308,16,0,409,
+1,1775,3309,16,0,
+409,1,32,3310,16,
+0,409,1,2105,878,
+1,2106,3311,16,0,
+409,1,2364,891,1,
+2227,972,1,2337,3312,
+16,0,409,1,2021,
+782,1,2458,940,1,
+2459,946,1,2462,953,
+1,2136,906,1,2464,
+963,1,2029,789,1,
+2030,795,1,2031,800,
+1,2032,805,1,2033,
+810,1,2035,816,1,
+2037,821,1,2039,826,
+1,1931,925,1,2041,
+832,1,2043,838,1,
+2045,843,1,1574,863,
+1,1958,3313,16,0,
+409,1,43,3314,19,
+505,1,43,3315,5,
+25,1,2035,816,1,
+2037,821,1,2039,826,
+1,2041,832,1,2227,
+972,1,2043,838,1,
+1657,958,1,1860,885,
+1,2136,906,1,2021,
+782,1,2459,946,1,
+1574,863,1,2105,3316,
+16,0,626,1,1931,
+925,1,1873,899,1,
+2031,800,1,1803,851,
+1,1989,3317,16,0,
+503,1,2464,963,1,
+2029,789,1,2030,795,
+1,2364,891,1,2032,
+805,1,2033,810,1,
+2045,843,1,44,3318,
+19,265,1,44,3319,
+5,38,1,1901,3320,
+16,0,263,1,2075,
+3321,16,0,263,1,
+1860,885,1,1803,851,
+1,1804,3322,16,0,
+263,1,2413,3323,16,
+0,263,1,2198,3324,
+16,0,263,1,1873,
+899,1,1657,958,1,
+1989,980,1,1990,3325,
+16,0,263,1,1775,
+3326,16,0,263,1,
+32,3327,16,0,263,
+1,2105,878,1,2106,
+3328,16,0,263,1,
+2364,891,1,2227,972,
+1,2337,3329,16,0,
+263,1,2021,782,1,
+2458,940,1,2459,946,
+1,2462,953,1,2136,
+906,1,2464,963,1,
+2029,789,1,2030,795,
+1,2031,800,1,2032,
+805,1,2033,810,1,
+2035,816,1,2037,821,
+1,2039,826,1,1931,
+925,1,2041,832,1,
+2043,838,1,2045,843,
+1,1574,863,1,1958,
+3330,16,0,263,1,
+45,3331,19,295,1,
+45,3332,5,39,1,
+1901,3333,16,0,328,
+1,2075,3334,16,0,
+328,1,1860,885,1,
+1803,851,1,1804,3335,
+16,0,328,1,2413,
+3336,16,0,328,1,
+2198,3337,16,0,328,
+1,1873,899,1,1657,
+958,1,1989,980,1,
+1990,3338,16,0,328,
+1,1775,3339,16,0,
+328,1,32,3340,16,
+0,328,1,2105,878,
+1,2106,3341,16,0,
+328,1,2364,891,1,
+2227,972,1,2337,3342,
+16,0,328,1,2021,
+782,1,2458,940,1,
+2459,946,1,2462,953,
+1,2136,906,1,2464,
+963,1,2029,789,1,
+2030,795,1,2031,800,
+1,2032,805,1,2033,
+810,1,2035,816,1,
+2037,821,1,2039,826,
+1,1931,925,1,2041,
+832,1,2043,838,1,
+2045,843,1,1832,3343,
+16,0,293,1,1574,
+863,1,1958,3344,16,
+0,328,1,46,3345,
+19,729,1,46,3346,
+5,38,1,1901,3347,
+16,0,727,1,2075,
+3348,16,0,727,1,
+1860,885,1,1803,851,
+1,1804,3349,16,0,
+727,1,2413,3350,16,
+0,727,1,2198,3351,
+16,0,727,1,1873,
+899,1,1657,958,1,
+1989,980,1,1990,3352,
+16,0,727,1,1775,
+3353,16,0,727,1,
+32,3354,16,0,727,
+1,2105,878,1,2106,
+3355,16,0,727,1,
+2364,891,1,2227,972,
+1,2337,3356,16,0,
+727,1,2021,782,1,
+2458,940,1,2459,946,
+1,2462,953,1,2136,
+906,1,2464,963,1,
+2029,789,1,2030,795,
+1,2031,800,1,2032,
+805,1,2033,810,1,
+2035,816,1,2037,821,
+1,2039,826,1,1931,
+925,1,2041,832,1,
+2043,838,1,2045,843,
+1,1574,863,1,1958,
+3357,16,0,727,1,
+47,3358,19,618,1,
+47,3359,5,19,1,
+0,3360,16,0,725,
+1,2776,3361,17,3362,
+15,3363,4,36,37,
 0,71,0,108,0,
 111,0,98,0,97,
-0,108,0,86,0,
-97,0,114,0,105,
-0,97,0,98,0,
-108,0,101,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
+0,108,0,68,0,
+101,0,102,0,105,
+0,110,0,105,0,
+116,0,105,0,111,
+0,110,0,115,0,
+1,-1,1,5,3364,
+20,3365,4,38,71,
+0,108,0,111,0,
+98,0,97,0,108,
+0,68,0,101,0,
+102,0,105,0,110,
+0,105,0,116,0,
 105,0,111,0,110,
-0,1,-1,1,5,
-3322,20,3323,4,54,
+0,115,0,95,0,
+49,0,1,158,1,
+3,1,2,1,1,
+3366,22,1,3,1,
+2743,3367,17,3368,15,
+3369,4,52,37,0,
 71,0,108,0,111,
 0,98,0,97,0,
 108,0,86,0,97,
@@ -9043,27 +9244,25 @@ public yyLSLSyntax
 0,97,0,114,0,
 97,0,116,0,105,
 0,111,0,110,0,
-95,0,49,0,1,
-158,1,3,1,3,
-1,2,3324,22,1,
-7,1,2680,3325,16,
-0,702,1,2459,928,
-1,2757,3326,17,3327,
-15,3313,1,-1,1,
-5,3328,20,3329,4,
-38,71,0,108,0,
-111,0,98,0,97,
-0,108,0,68,0,
-101,0,102,0,105,
-0,110,0,105,0,
-116,0,105,0,111,
-0,110,0,115,0,
-95,0,52,0,1,
-157,1,3,1,3,
-1,2,3330,22,1,
-6,1,2758,3331,17,
-3332,15,3313,1,-1,
-1,5,3333,20,3334,
+1,-1,1,5,3370,
+20,3371,4,54,71,
+0,108,0,111,0,
+98,0,97,0,108,
+0,86,0,97,0,
+114,0,105,0,97,
+0,98,0,108,0,
+101,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,95,
+0,50,0,1,163,
+1,3,1,5,1,
+4,3372,22,1,8,
+1,2022,3373,16,0,
+616,1,2775,3374,17,
+3375,15,3363,1,-1,
+1,5,3376,20,3377,
 4,38,71,0,108,
 0,111,0,98,0,
 97,0,108,0,68,
@@ -9071,53 +9270,53 @@ public yyLSLSyntax
 105,0,110,0,105,
 0,116,0,105,0,
 111,0,110,0,115,
-0,95,0,50,0,
-1,155,1,3,1,
-3,1,2,3335,22,
-1,4,1,2759,3336,
-17,3337,15,3313,1,
--1,1,5,3338,20,
-3339,4,38,71,0,
+0,95,0,51,0,
+1,160,1,3,1,
+2,1,1,3378,22,
+1,5,1,2699,761,
+1,2715,3379,17,3380,
+15,3381,4,50,37,
+0,71,0,108,0,
+111,0,98,0,97,
+0,108,0,70,0,
+117,0,110,0,99,
+0,116,0,105,0,
+111,0,110,0,68,
+0,101,0,102,0,
+105,0,110,0,105,
+0,116,0,105,0,
+111,0,110,0,1,
+-1,1,5,3382,20,
+3383,4,52,71,0,
+108,0,111,0,98,
+0,97,0,108,0,
+70,0,117,0,110,
+0,99,0,116,0,
+105,0,111,0,110,
+0,68,0,101,0,
+102,0,105,0,110,
+0,105,0,116,0,
+105,0,111,0,110,
+0,95,0,49,0,
+1,164,1,3,1,
+6,1,5,3384,22,
+1,9,1,2774,3385,
+17,3386,15,3363,1,
+-1,1,5,3387,20,
+3388,4,38,71,0,
 108,0,111,0,98,
 0,97,0,108,0,
 68,0,101,0,102,
 0,105,0,110,0,
 105,0,116,0,105,
 0,111,0,110,0,
-115,0,95,0,51,
-0,1,156,1,3,
-1,2,1,1,3340,
-22,1,5,1,2464,
-945,1,2466,3341,17,
-3342,15,3343,4,50,
-37,0,71,0,108,
-0,111,0,98,0,
-97,0,108,0,70,
-0,117,0,110,0,
-99,0,116,0,105,
-0,111,0,110,0,
-68,0,101,0,102,
-0,105,0,110,0,
-105,0,116,0,105,
-0,111,0,110,0,
-1,-1,1,5,3344,
-20,3345,4,52,71,
-0,108,0,111,0,
-98,0,97,0,108,
-0,70,0,117,0,
-110,0,99,0,116,
-0,105,0,111,0,
-110,0,68,0,101,
-0,102,0,105,0,
-110,0,105,0,116,
-0,105,0,111,0,
-110,0,95,0,50,
-0,1,161,1,3,
-1,7,1,6,3346,
-22,1,10,1,2727,
-3347,17,3348,15,3321,
-1,-1,1,5,3349,
-20,3350,4,54,71,
+115,0,95,0,50,
+0,1,159,1,3,
+1,3,1,2,3389,
+22,1,4,1,2754,
+3390,17,3391,15,3369,
+1,-1,1,5,3392,
+20,3393,4,54,71,
 0,108,0,111,0,
 98,0,97,0,108,
 0,86,0,97,0,
@@ -9128,15 +9327,15 @@ public yyLSLSyntax
 97,0,114,0,97,
 0,116,0,105,0,
 111,0,110,0,95,
-0,50,0,1,159,
-1,3,1,5,1,
-4,3351,22,1,8,
-1,2739,3352,16,0,
-702,1,2683,753,1,
-2684,742,1,2587,737,
-1,2699,3353,17,3354,
-15,3343,1,-1,1,
-5,3355,20,3356,4,
+0,49,0,1,162,
+1,3,1,3,1,
+2,3394,22,1,7,
+1,2755,3395,16,0,
+725,1,2598,755,1,
+2464,963,1,2459,946,
+1,2466,3396,17,3397,
+15,3381,1,-1,1,
+5,3398,20,3399,4,
 52,71,0,108,0,
 111,0,98,0,97,
 0,108,0,70,0,
@@ -9147,2482 +9346,2560 @@ public yyLSLSyntax
 105,0,110,0,105,
 0,116,0,105,0,
 111,0,110,0,95,
-0,49,0,1,160,
-1,3,1,6,1,
-5,3357,22,1,9,
-1,48,3358,19,353,
-1,48,3359,5,54,
-1,0,3360,16,0,
-351,1,2462,935,1,
-2075,3361,16,0,533,
-1,1860,867,1,1803,
-833,1,1804,3362,16,
-0,533,1,2757,3326,
-1,2738,3319,1,2739,
-3363,16,0,351,1,
-2413,3364,16,0,533,
-1,2198,3365,16,0,
-533,1,1873,881,1,
-1657,940,1,2030,777,
-1,2750,3366,16,0,
-351,1,1989,962,1,
-1990,3367,16,0,533,
-1,2459,928,1,1775,
-3368,16,0,533,1,
-32,3369,16,0,533,
-1,2758,3331,1,2105,
-860,1,2760,3311,1,
-2045,825,1,2683,753,
-1,2684,742,1,2227,
-954,1,2337,3370,16,
-0,533,1,2021,764,
-1,2458,922,1,1901,
-3371,16,0,533,1,
-2680,3372,16,0,351,
-1,2136,888,1,2464,
-945,1,2029,771,1,
-2466,3341,1,2031,782,
-1,2032,787,1,2033,
-792,1,2675,731,1,
-2035,798,1,2364,873,
-1,2039,808,1,1931,
-906,1,2041,814,1,
-2587,737,1,2043,820,
-1,2699,3353,1,2727,
-3347,1,2037,803,1,
-1574,845,1,2759,3336,
-1,2106,3373,16,0,
-533,1,1958,3374,16,
-0,533,1,49,3375,
-19,538,1,49,3376,
-5,38,1,1901,3377,
-16,0,536,1,2075,
-3378,16,0,536,1,
-1860,867,1,1803,833,
-1,1804,3379,16,0,
-536,1,2413,3380,16,
-0,536,1,2198,3381,
-16,0,536,1,1873,
-881,1,1657,940,1,
-1989,962,1,1990,3382,
-16,0,536,1,1775,
-3383,16,0,536,1,
-32,3384,16,0,536,
-1,2105,860,1,2106,
-3385,16,0,536,1,
-2364,873,1,2227,954,
-1,2337,3386,16,0,
-536,1,2021,764,1,
-2458,922,1,2459,928,
-1,2462,935,1,2136,
-888,1,2464,945,1,
-2029,771,1,2030,777,
-1,2031,782,1,2032,
-787,1,2033,792,1,
-2035,798,1,2037,803,
-1,2039,808,1,1931,
-906,1,2041,814,1,
-2043,820,1,2045,825,
-1,1574,845,1,1958,
-3387,16,0,536,1,
-50,3388,19,649,1,
-50,3389,5,38,1,
-1901,3390,16,0,647,
-1,2075,3391,16,0,
-647,1,1860,867,1,
-1803,833,1,1804,3392,
-16,0,647,1,2413,
-3393,16,0,647,1,
-2198,3394,16,0,647,
-1,1873,881,1,1657,
-940,1,1989,962,1,
-1990,3395,16,0,647,
-1,1775,3396,16,0,
-647,1,32,3397,16,
-0,647,1,2105,860,
-1,2106,3398,16,0,
-647,1,2364,873,1,
-2227,954,1,2337,3399,
-16,0,647,1,2021,
-764,1,2458,922,1,
-2459,928,1,2462,935,
-1,2136,888,1,2464,
-945,1,2029,771,1,
-2030,777,1,2031,782,
-1,2032,787,1,2033,
-792,1,2035,798,1,
-2037,803,1,2039,808,
-1,1931,906,1,2041,
-814,1,2043,820,1,
-2045,825,1,1574,845,
-1,1958,3400,16,0,
-647,1,51,3401,19,
-127,1,51,3402,5,
-54,1,0,3403,16,
-0,125,1,2727,3347,
-1,2075,3404,16,0,
-125,1,1860,867,1,
-2515,3405,16,0,462,
-1,1804,3406,16,0,
-125,1,10,3407,16,
-0,125,1,2757,3326,
-1,2738,3319,1,2739,
-3408,16,0,125,1,
-2413,3409,16,0,125,
-1,2198,3410,16,0,
-125,1,1657,940,1,
-1873,881,1,21,3411,
-16,0,125,1,2529,
-3412,16,0,125,1,
-2030,777,1,1989,962,
-1,1990,3413,16,0,
-125,1,2459,928,1,
-1775,3414,16,0,125,
-1,32,3415,16,0,
-125,1,2758,3331,1,
-2105,860,1,2760,3311,
-1,2045,825,1,2686,
-3416,16,0,125,1,
-2227,954,1,2337,3417,
-16,0,125,1,52,
-3418,16,0,125,1,
-1803,833,1,2458,922,
-1,1901,3419,16,0,
-125,1,2462,935,1,
-2136,888,1,2464,945,
-1,2029,771,1,2466,
-3341,1,2031,782,1,
-2032,787,1,2033,792,
-1,2035,798,1,2364,
-873,1,2039,808,1,
-1931,906,1,2041,814,
-1,2021,764,1,2043,
-820,1,2699,3353,1,
-2037,803,1,1574,845,
-1,2759,3336,1,2106,
-3420,16,0,125,1,
-1958,3421,16,0,125,
-1,52,3422,19,124,
-1,52,3423,5,53,
-1,0,3424,16,0,
-122,1,2727,3347,1,
-2075,3425,16,0,122,
-1,1860,867,1,1804,
-3426,16,0,122,1,
-10,3427,16,0,122,
-1,2757,3326,1,2738,
-3319,1,2739,3428,16,
-0,122,1,2413,3429,
+0,50,0,1,165,
+1,3,1,7,1,
+6,3400,22,1,10,
+1,2690,771,1,2766,
+3401,16,0,725,1,
+2696,3402,16,0,725,
+1,2773,3403,17,3404,
+15,3363,1,-1,1,
+5,3405,20,3406,4,
+38,71,0,108,0,
+111,0,98,0,97,
+0,108,0,68,0,
+101,0,102,0,105,
+0,110,0,105,0,
+116,0,105,0,111,
+0,110,0,115,0,
+95,0,52,0,1,
+161,1,3,1,3,
+1,2,3407,22,1,
+6,1,2700,743,1,
+48,3408,19,356,1,
+48,3409,5,54,1,
+0,3410,16,0,354,
+1,2075,3411,16,0,
+544,1,2773,3403,1,
+1860,885,1,1804,3412,
+16,0,544,1,2413,
+3413,16,0,544,1,
+2743,3367,1,1873,899,
+1,1657,958,1,2030,
+795,1,1989,980,1,
+1990,3414,16,0,544,
+1,2754,3390,1,2755,
+3415,16,0,354,1,
+1775,3416,16,0,544,
+1,32,3417,16,0,
+544,1,2105,878,1,
+2106,3418,16,0,544,
+1,2699,761,1,2766,
+3419,16,0,354,1,
+2227,972,1,2337,3420,
+16,0,544,1,2774,
+3385,1,2775,3374,1,
+2776,3361,1,2696,3421,
+16,0,354,1,1803,
+851,1,2458,940,1,
+1901,3422,16,0,544,
+1,2462,953,1,2136,
+906,1,2464,963,1,
+2029,789,1,2466,3396,
+1,2031,800,1,2032,
+805,1,2033,810,1,
+2035,816,1,2690,771,
+1,2364,891,1,2715,
+3379,1,2039,826,1,
+1931,925,1,2041,832,
+1,2021,782,1,2043,
+838,1,2045,843,1,
+2700,743,1,2198,3423,
+16,0,544,1,2598,
+755,1,2037,821,1,
+1574,863,1,1958,3424,
+16,0,544,1,2459,
+946,1,49,3425,19,
+549,1,49,3426,5,
+38,1,1901,3427,16,
+0,547,1,2075,3428,
+16,0,547,1,1860,
+885,1,1803,851,1,
+1804,3429,16,0,547,
+1,2413,3430,16,0,
+547,1,2198,3431,16,
+0,547,1,1873,899,
+1,1657,958,1,1989,
+980,1,1990,3432,16,
+0,547,1,1775,3433,
+16,0,547,1,32,
+3434,16,0,547,1,
+2105,878,1,2106,3435,
+16,0,547,1,2364,
+891,1,2227,972,1,
+2337,3436,16,0,547,
+1,2021,782,1,2458,
+940,1,2459,946,1,
+2462,953,1,2136,906,
+1,2464,963,1,2029,
+789,1,2030,795,1,
+2031,800,1,2032,805,
+1,2033,810,1,2035,
+816,1,2037,821,1,
+2039,826,1,1931,925,
+1,2041,832,1,2043,
+838,1,2045,843,1,
+1574,863,1,1958,3437,
+16,0,547,1,50,
+3438,19,670,1,50,
+3439,5,38,1,1901,
+3440,16,0,668,1,
+2075,3441,16,0,668,
+1,1860,885,1,1803,
+851,1,1804,3442,16,
+0,668,1,2413,3443,
+16,0,668,1,2198,
+3444,16,0,668,1,
+1873,899,1,1657,958,
+1,1989,980,1,1990,
+3445,16,0,668,1,
+1775,3446,16,0,668,
+1,32,3447,16,0,
+668,1,2105,878,1,
+2106,3448,16,0,668,
+1,2364,891,1,2227,
+972,1,2337,3449,16,
+0,668,1,2021,782,
+1,2458,940,1,2459,
+946,1,2462,953,1,
+2136,906,1,2464,963,
+1,2029,789,1,2030,
+795,1,2031,800,1,
+2032,805,1,2033,810,
+1,2035,816,1,2037,
+821,1,2039,826,1,
+1931,925,1,2041,832,
+1,2043,838,1,2045,
+843,1,1574,863,1,
+1958,3450,16,0,668,
+1,51,3451,19,127,
+1,51,3452,5,54,
+1,0,3453,16,0,
+125,1,2538,3454,16,
+0,125,1,2075,3455,
+16,0,125,1,1860,
+885,1,2515,3456,16,
+0,465,1,1804,3457,
+16,0,125,1,10,
+3458,16,0,125,1,
+2413,3459,16,0,125,
+1,2743,3367,1,1873,
+899,1,21,3460,16,
+0,125,1,1657,958,
+1,2030,795,1,2773,
+3403,1,1990,3461,16,
+0,125,1,2754,3390,
+1,2755,3462,16,0,
+125,1,1775,3463,16,
+0,125,1,32,3464,
+16,0,125,1,2105,
+878,1,2106,3465,16,
+0,125,1,2227,972,
+1,2337,3466,16,0,
+125,1,2774,3385,1,
+2775,3374,1,2776,3361,
+1,52,3467,16,0,
+125,1,1803,851,1,
+2458,940,1,1901,3468,
+16,0,125,1,2462,
+953,1,2136,906,1,
+2464,963,1,2029,789,
+1,2466,3396,1,2031,
+800,1,2032,805,1,
+2033,810,1,2035,816,
+1,2364,891,1,2715,
+3379,1,2039,826,1,
+1931,925,1,2041,832,
+1,2021,782,1,2043,
+838,1,2045,843,1,
+2702,3469,16,0,125,
+1,2198,3470,16,0,
+125,1,1989,980,1,
+2037,821,1,1574,863,
+1,1958,3471,16,0,
+125,1,2459,946,1,
+52,3472,19,124,1,
+52,3473,5,53,1,
+0,3474,16,0,122,
+1,2075,3475,16,0,
+122,1,1860,885,1,
+1804,3476,16,0,122,
+1,10,3477,16,0,
+122,1,2413,3478,16,
+0,122,1,2743,3367,
+1,1873,899,1,21,
+3479,16,0,122,1,
+1657,958,1,2030,795,
+1,2773,3403,1,1990,
+3480,16,0,122,1,
+2754,3390,1,2755,3481,
+16,0,122,1,2538,
+3482,16,0,122,1,
+32,3483,16,0,122,
+1,2105,878,1,2106,
+3484,16,0,122,1,
+2227,972,1,2337,3485,
 16,0,122,1,2198,
-3430,16,0,122,1,
-1657,940,1,1873,881,
-1,21,3431,16,0,
-122,1,2529,3432,16,
-0,122,1,2030,777,
-1,1989,962,1,1990,
-3433,16,0,122,1,
-2459,928,1,1775,3434,
-16,0,122,1,32,
-3435,16,0,122,1,
-2758,3331,1,2105,860,
-1,2760,3311,1,2045,
-825,1,2686,3436,16,
-0,122,1,2227,954,
-1,2337,3437,16,0,
-122,1,52,3438,16,
-0,122,1,1803,833,
-1,2458,922,1,1901,
-3439,16,0,122,1,
-2462,935,1,2136,888,
-1,2464,945,1,2029,
-771,1,2466,3341,1,
-2031,782,1,2032,787,
-1,2033,792,1,2035,
-798,1,2364,873,1,
-2039,808,1,1931,906,
-1,2041,814,1,2021,
-764,1,2043,820,1,
-2699,3353,1,2037,803,
-1,1574,845,1,2759,
-3336,1,2106,3440,16,
-0,122,1,1958,3441,
-16,0,122,1,53,
-3442,19,121,1,53,
-3443,5,53,1,0,
-3444,16,0,119,1,
-2727,3347,1,2075,3445,
-16,0,119,1,1860,
-867,1,1804,3446,16,
-0,119,1,10,3447,
-16,0,119,1,2757,
-3326,1,2738,3319,1,
-2739,3448,16,0,119,
-1,2413,3449,16,0,
-119,1,2198,3450,16,
-0,119,1,1657,940,
-1,1873,881,1,21,
-3451,16,0,119,1,
-2529,3452,16,0,119,
-1,2030,777,1,1989,
-962,1,1990,3453,16,
-0,119,1,2459,928,
-1,1775,3454,16,0,
-119,1,32,3455,16,
-0,119,1,2758,3331,
-1,2105,860,1,2760,
-3311,1,2045,825,1,
-2686,3456,16,0,119,
-1,2227,954,1,2337,
-3457,16,0,119,1,
-52,3458,16,0,119,
-1,1803,833,1,2458,
-922,1,1901,3459,16,
-0,119,1,2462,935,
-1,2136,888,1,2464,
-945,1,2029,771,1,
-2466,3341,1,2031,782,
-1,2032,787,1,2033,
-792,1,2035,798,1,
-2364,873,1,2039,808,
-1,1931,906,1,2041,
-814,1,2021,764,1,
-2043,820,1,2699,3353,
-1,2037,803,1,1574,
-845,1,2759,3336,1,
-2106,3460,16,0,119,
-1,1958,3461,16,0,
-119,1,54,3462,19,
-118,1,54,3463,5,
-53,1,0,3464,16,
-0,116,1,2727,3347,
-1,2075,3465,16,0,
-116,1,1860,867,1,
-1804,3466,16,0,116,
-1,10,3467,16,0,
-116,1,2757,3326,1,
-2738,3319,1,2739,3468,
+3486,16,0,122,1,
+2775,3374,1,2776,3361,
+1,52,3487,16,0,
+122,1,1803,851,1,
+2458,940,1,1901,3488,
+16,0,122,1,2462,
+953,1,2136,906,1,
+2464,963,1,2029,789,
+1,2466,3396,1,2031,
+800,1,2032,805,1,
+2033,810,1,2035,816,
+1,2364,891,1,2715,
+3379,1,2039,826,1,
+1931,925,1,2041,832,
+1,2021,782,1,2043,
+838,1,2045,843,1,
+2702,3489,16,0,122,
+1,1775,3490,16,0,
+122,1,1989,980,1,
+2774,3385,1,2037,821,
+1,1574,863,1,1958,
+3491,16,0,122,1,
+2459,946,1,53,3492,
+19,121,1,53,3493,
+5,53,1,0,3494,
+16,0,119,1,2075,
+3495,16,0,119,1,
+1860,885,1,1804,3496,
+16,0,119,1,10,
+3497,16,0,119,1,
+2413,3498,16,0,119,
+1,2743,3367,1,1873,
+899,1,21,3499,16,
+0,119,1,1657,958,
+1,2030,795,1,2773,
+3403,1,1990,3500,16,
+0,119,1,2754,3390,
+1,2755,3501,16,0,
+119,1,2538,3502,16,
+0,119,1,32,3503,
+16,0,119,1,2105,
+878,1,2106,3504,16,
+0,119,1,2227,972,
+1,2337,3505,16,0,
+119,1,2198,3506,16,
+0,119,1,2775,3374,
+1,2776,3361,1,52,
+3507,16,0,119,1,
+1803,851,1,2458,940,
+1,1901,3508,16,0,
+119,1,2462,953,1,
+2136,906,1,2464,963,
+1,2029,789,1,2466,
+3396,1,2031,800,1,
+2032,805,1,2033,810,
+1,2035,816,1,2364,
+891,1,2715,3379,1,
+2039,826,1,1931,925,
+1,2041,832,1,2021,
+782,1,2043,838,1,
+2045,843,1,2702,3509,
+16,0,119,1,1775,
+3510,16,0,119,1,
+1989,980,1,2774,3385,
+1,2037,821,1,1574,
+863,1,1958,3511,16,
+0,119,1,2459,946,
+1,54,3512,19,118,
+1,54,3513,5,54,
+1,0,3514,16,0,
+116,1,2538,3515,16,
+0,116,1,2075,3516,
+16,0,116,1,1860,
+885,1,1804,3517,16,
+0,116,1,10,3518,
 16,0,116,1,2413,
-3469,16,0,116,1,
-2198,3470,16,0,116,
-1,1657,940,1,1873,
-881,1,21,3471,16,
-0,116,1,2529,3472,
-16,0,116,1,2030,
-777,1,1989,962,1,
-1990,3473,16,0,116,
-1,2459,928,1,1775,
-3474,16,0,116,1,
-32,3475,16,0,116,
-1,2758,3331,1,2105,
-860,1,2760,3311,1,
-2045,825,1,2686,3476,
-16,0,116,1,2227,
-954,1,2337,3477,16,
-0,116,1,52,3478,
-16,0,116,1,1803,
-833,1,2458,922,1,
-1901,3479,16,0,116,
-1,2462,935,1,2136,
-888,1,2464,945,1,
-2029,771,1,2466,3341,
-1,2031,782,1,2032,
-787,1,2033,792,1,
-2035,798,1,2364,873,
-1,2039,808,1,1931,
-906,1,2041,814,1,
-2021,764,1,2043,820,
-1,2699,3353,1,2037,
-803,1,1574,845,1,
-2759,3336,1,2106,3480,
-16,0,116,1,1958,
-3481,16,0,116,1,
-55,3482,19,115,1,
-55,3483,5,54,1,
-0,3484,16,0,113,
-1,2727,3347,1,2075,
-3485,16,0,113,1,
-1860,867,1,1804,3486,
-16,0,113,1,10,
-3487,16,0,113,1,
-2757,3326,1,2738,3319,
-1,2739,3488,16,0,
-113,1,2413,3489,16,
-0,113,1,2198,3490,
-16,0,113,1,1657,
-940,1,1873,881,1,
-21,3491,16,0,113,
-1,2529,3492,16,0,
-113,1,2030,777,1,
-1989,962,1,1990,3493,
-16,0,113,1,2459,
-928,1,1775,3494,16,
-0,113,1,32,3495,
-16,0,113,1,2758,
-3331,1,2105,860,1,
-2760,3311,1,2045,825,
-1,2686,3496,16,0,
-113,1,2227,954,1,
-2337,3497,16,0,113,
-1,52,3498,16,0,
-113,1,1803,833,1,
-2458,922,1,1901,3499,
+3519,16,0,116,1,
+2524,3520,16,0,480,
+1,2743,3367,1,1873,
+899,1,21,3521,16,
+0,116,1,1657,958,
+1,2030,795,1,2773,
+3403,1,1990,3522,16,
+0,116,1,2754,3390,
+1,2755,3523,16,0,
+116,1,1775,3524,16,
+0,116,1,32,3525,
+16,0,116,1,2105,
+878,1,2106,3526,16,
+0,116,1,2227,972,
+1,2337,3527,16,0,
+116,1,2774,3385,1,
+2775,3374,1,2776,3361,
+1,52,3528,16,0,
+116,1,1803,851,1,
+2458,940,1,1901,3529,
+16,0,116,1,2462,
+953,1,2136,906,1,
+2464,963,1,2029,789,
+1,2466,3396,1,2031,
+800,1,2032,805,1,
+2033,810,1,2035,816,
+1,2364,891,1,2715,
+3379,1,2039,826,1,
+1931,925,1,2041,832,
+1,2021,782,1,2043,
+838,1,2045,843,1,
+2702,3530,16,0,116,
+1,2198,3531,16,0,
+116,1,1989,980,1,
+2037,821,1,1574,863,
+1,1958,3532,16,0,
+116,1,2459,946,1,
+55,3533,19,115,1,
+55,3534,5,54,1,
+0,3535,16,0,113,
+1,2538,3536,16,0,
+113,1,2075,3537,16,
+0,113,1,1860,885,
+1,1804,3538,16,0,
+113,1,10,3539,16,
+0,113,1,2413,3540,
+16,0,113,1,2743,
+3367,1,1873,899,1,
+21,3541,16,0,113,
+1,1657,958,1,2030,
+795,1,2773,3403,1,
+1990,3542,16,0,113,
+1,2754,3390,1,2755,
+3543,16,0,113,1,
+1775,3544,16,0,113,
+1,32,3545,16,0,
+113,1,2105,878,1,
+2041,832,1,2227,972,
+1,2337,3546,16,0,
+113,1,2774,3385,1,
+2775,3374,1,2776,3361,
+1,52,3547,16,0,
+113,1,1803,851,1,
+2458,940,1,1901,3548,
 16,0,113,1,2462,
-935,1,2136,888,1,
-2464,945,1,2029,771,
-1,2466,3341,1,2031,
-782,1,2032,787,1,
-2033,792,1,2035,798,
-1,2364,873,1,2039,
-808,1,1931,906,1,
-2041,814,1,2021,764,
-1,2043,820,1,2699,
-3353,1,2037,803,1,
-1574,845,1,2759,3336,
-1,2106,3500,16,0,
-113,1,1958,3501,16,
-0,113,1,2506,3502,
-16,0,448,1,56,
-3503,19,112,1,56,
-3504,5,53,1,0,
-3505,16,0,110,1,
-2727,3347,1,2075,3506,
-16,0,110,1,1860,
-867,1,1804,3507,16,
-0,110,1,10,3508,
-16,0,110,1,2757,
-3326,1,2738,3319,1,
-2739,3509,16,0,110,
-1,2413,3510,16,0,
-110,1,2198,3511,16,
-0,110,1,1657,940,
-1,1873,881,1,21,
-3512,16,0,110,1,
-2529,3513,16,0,110,
-1,2030,777,1,1989,
-962,1,1990,3514,16,
-0,110,1,2459,928,
-1,1775,3515,16,0,
-110,1,32,3516,16,
-0,110,1,2758,3331,
-1,2105,860,1,2760,
-3311,1,2045,825,1,
-2686,3517,16,0,110,
-1,2227,954,1,2337,
-3518,16,0,110,1,
-52,3519,16,0,110,
-1,1803,833,1,2458,
-922,1,1901,3520,16,
-0,110,1,2462,935,
-1,2136,888,1,2464,
-945,1,2029,771,1,
-2466,3341,1,2031,782,
-1,2032,787,1,2033,
-792,1,2035,798,1,
-2364,873,1,2039,808,
-1,1931,906,1,2041,
-814,1,2021,764,1,
-2043,820,1,2699,3353,
-1,2037,803,1,1574,
-845,1,2759,3336,1,
-2106,3521,16,0,110,
-1,1958,3522,16,0,
-110,1,57,3523,19,
-109,1,57,3524,5,
-53,1,0,3525,16,
-0,107,1,2727,3347,
-1,2075,3526,16,0,
-107,1,1860,867,1,
-1804,3527,16,0,107,
-1,10,3528,16,0,
-107,1,2757,3326,1,
-2738,3319,1,2739,3529,
+953,1,2136,906,1,
+2464,963,1,2029,789,
+1,2466,3396,1,2031,
+800,1,2032,805,1,
+2033,810,1,2035,816,
+1,2364,891,1,2715,
+3379,1,2039,826,1,
+1931,925,1,2506,3549,
+16,0,451,1,2021,
+782,1,2043,838,1,
+2045,843,1,2702,3550,
+16,0,113,1,2198,
+3551,16,0,113,1,
+1989,980,1,2037,821,
+1,1574,863,1,2106,
+3552,16,0,113,1,
+1958,3553,16,0,113,
+1,2459,946,1,56,
+3554,19,112,1,56,
+3555,5,53,1,0,
+3556,16,0,110,1,
+2075,3557,16,0,110,
+1,1860,885,1,1804,
+3558,16,0,110,1,
+10,3559,16,0,110,
+1,2413,3560,16,0,
+110,1,2743,3367,1,
+1873,899,1,21,3561,
+16,0,110,1,1657,
+958,1,2030,795,1,
+2773,3403,1,1990,3562,
+16,0,110,1,2754,
+3390,1,2755,3563,16,
+0,110,1,2538,3564,
+16,0,110,1,32,
+3565,16,0,110,1,
+2105,878,1,2106,3566,
+16,0,110,1,2227,
+972,1,2337,3567,16,
+0,110,1,2198,3568,
+16,0,110,1,2775,
+3374,1,2776,3361,1,
+52,3569,16,0,110,
+1,1803,851,1,2458,
+940,1,1901,3570,16,
+0,110,1,2462,953,
+1,2136,906,1,2464,
+963,1,2029,789,1,
+2466,3396,1,2031,800,
+1,2032,805,1,2033,
+810,1,2035,816,1,
+2364,891,1,2715,3379,
+1,2039,826,1,1931,
+925,1,2041,832,1,
+2021,782,1,2043,838,
+1,2045,843,1,2702,
+3571,16,0,110,1,
+1775,3572,16,0,110,
+1,1989,980,1,2774,
+3385,1,2037,821,1,
+1574,863,1,1958,3573,
+16,0,110,1,2459,
+946,1,57,3574,19,
+109,1,57,3575,5,
+53,1,0,3576,16,
+0,107,1,2075,3577,
+16,0,107,1,1860,
+885,1,1804,3578,16,
+0,107,1,10,3579,
 16,0,107,1,2413,
-3530,16,0,107,1,
-2198,3531,16,0,107,
-1,1657,940,1,1873,
-881,1,21,3532,16,
-0,107,1,2529,3533,
-16,0,107,1,2030,
-777,1,1989,962,1,
-1990,3534,16,0,107,
-1,2459,928,1,1775,
-3535,16,0,107,1,
-32,3536,16,0,107,
-1,2758,3331,1,2105,
-860,1,2760,3311,1,
-2045,825,1,2686,3537,
-16,0,107,1,2227,
-954,1,2337,3538,16,
-0,107,1,52,3539,
+3580,16,0,107,1,
+2743,3367,1,1873,899,
+1,21,3581,16,0,
+107,1,1657,958,1,
+2030,795,1,2773,3403,
+1,1990,3582,16,0,
+107,1,2754,3390,1,
+2755,3583,16,0,107,
+1,2538,3584,16,0,
+107,1,32,3585,16,
+0,107,1,2105,878,
+1,2106,3586,16,0,
+107,1,2227,972,1,
+2337,3587,16,0,107,
+1,2198,3588,16,0,
+107,1,2775,3374,1,
+2776,3361,1,52,3589,
 16,0,107,1,1803,
-833,1,2458,922,1,
-1901,3540,16,0,107,
-1,2462,935,1,2136,
-888,1,2464,945,1,
-2029,771,1,2466,3341,
-1,2031,782,1,2032,
-787,1,2033,792,1,
-2035,798,1,2364,873,
-1,2039,808,1,1931,
-906,1,2041,814,1,
-2021,764,1,2043,820,
-1,2699,3353,1,2037,
-803,1,1574,845,1,
-2759,3336,1,2106,3541,
-16,0,107,1,1958,
-3542,16,0,107,1,
-58,3543,19,443,1,
-58,3544,5,18,1,
-2590,1725,1,2591,1730,
-1,2593,3545,16,0,
-441,1,2632,3546,16,
-0,441,1,2522,1673,
-1,2588,1715,1,2527,
-1680,1,2459,928,1,
-2464,945,1,2542,1687,
-1,2544,3547,16,0,
-441,1,2583,1710,1,
-2584,1694,1,2585,1700,
-1,2586,1705,1,2513,
-1667,1,2470,3548,16,
-0,441,1,2589,1720,
-1,59,3549,19,440,
-1,59,3550,5,18,
-1,2590,1725,1,2591,
-1730,1,2593,3551,16,
-0,438,1,2632,3552,
-16,0,438,1,2522,
-1673,1,2588,1715,1,
-2527,1680,1,2459,928,
-1,2464,945,1,2542,
-1687,1,2544,3553,16,
-0,438,1,2583,1710,
-1,2584,1694,1,2585,
-1700,1,2586,1705,1,
-2513,1667,1,2470,3554,
-16,0,438,1,2589,
-1720,1,60,3555,19,
-437,1,60,3556,5,
-18,1,2590,1725,1,
-2591,1730,1,2593,3557,
-16,0,435,1,2632,
-3558,16,0,435,1,
-2522,1673,1,2588,1715,
-1,2527,1680,1,2459,
-928,1,2464,945,1,
-2542,1687,1,2544,3559,
-16,0,435,1,2583,
-1710,1,2584,1694,1,
-2585,1700,1,2586,1705,
-1,2513,1667,1,2470,
-3560,16,0,435,1,
-2589,1720,1,61,3561,
-19,394,1,61,3562,
-5,18,1,2590,1725,
-1,2591,1730,1,2593,
-3563,16,0,392,1,
-2632,3564,16,0,392,
-1,2522,1673,1,2588,
-1715,1,2527,1680,1,
-2459,928,1,2464,945,
-1,2542,1687,1,2544,
-3565,16,0,392,1,
-2583,1710,1,2584,1694,
-1,2585,1700,1,2586,
-1705,1,2513,1667,1,
-2470,3566,16,0,392,
-1,2589,1720,1,62,
-3567,19,391,1,62,
-3568,5,18,1,2590,
-1725,1,2591,1730,1,
-2593,3569,16,0,389,
-1,2632,3570,16,0,
-389,1,2522,1673,1,
-2588,1715,1,2527,1680,
-1,2459,928,1,2464,
-945,1,2542,1687,1,
-2544,3571,16,0,389,
-1,2583,1710,1,2584,
-1694,1,2585,1700,1,
-2586,1705,1,2513,1667,
-1,2470,3572,16,0,
-389,1,2589,1720,1,
-63,3573,19,388,1,
-63,3574,5,18,1,
-2590,1725,1,2591,1730,
-1,2593,3575,16,0,
-386,1,2632,3576,16,
-0,386,1,2522,1673,
-1,2588,1715,1,2527,
-1680,1,2459,928,1,
-2464,945,1,2542,1687,
-1,2544,3577,16,0,
-386,1,2583,1710,1,
-2584,1694,1,2585,1700,
-1,2586,1705,1,2513,
-1667,1,2470,3578,16,
-0,386,1,2589,1720,
-1,64,3579,19,385,
-1,64,3580,5,18,
-1,2590,1725,1,2591,
-1730,1,2593,3581,16,
-0,383,1,2632,3582,
-16,0,383,1,2522,
-1673,1,2588,1715,1,
-2527,1680,1,2459,928,
-1,2464,945,1,2542,
-1687,1,2544,3583,16,
-0,383,1,2583,1710,
-1,2584,1694,1,2585,
-1700,1,2586,1705,1,
-2513,1667,1,2470,3584,
-16,0,383,1,2589,
-1720,1,65,3585,19,
-434,1,65,3586,5,
-18,1,2590,1725,1,
-2591,1730,1,2593,3587,
-16,0,432,1,2632,
-3588,16,0,432,1,
-2522,1673,1,2588,1715,
-1,2527,1680,1,2459,
-928,1,2464,945,1,
-2542,1687,1,2544,3589,
-16,0,432,1,2583,
-1710,1,2584,1694,1,
-2585,1700,1,2586,1705,
-1,2513,1667,1,2470,
-3590,16,0,432,1,
-2589,1720,1,66,3591,
-19,431,1,66,3592,
-5,18,1,2590,1725,
-1,2591,1730,1,2593,
-3593,16,0,429,1,
-2632,3594,16,0,429,
-1,2522,1673,1,2588,
-1715,1,2527,1680,1,
-2459,928,1,2464,945,
-1,2542,1687,1,2544,
-3595,16,0,429,1,
-2583,1710,1,2584,1694,
-1,2585,1700,1,2586,
-1705,1,2513,1667,1,
-2470,3596,16,0,429,
-1,2589,1720,1,67,
-3597,19,428,1,67,
-3598,5,18,1,2590,
-1725,1,2591,1730,1,
-2593,3599,16,0,426,
-1,2632,3600,16,0,
-426,1,2522,1673,1,
-2588,1715,1,2527,1680,
-1,2459,928,1,2464,
-945,1,2542,1687,1,
-2544,3601,16,0,426,
-1,2583,1710,1,2584,
-1694,1,2585,1700,1,
-2586,1705,1,2513,1667,
-1,2470,3602,16,0,
-426,1,2589,1720,1,
-68,3603,19,681,1,
-68,3604,5,18,1,
-2590,1725,1,2591,1730,
-1,2593,3605,16,0,
-679,1,2632,3606,16,
-0,679,1,2522,1673,
-1,2588,1715,1,2527,
-1680,1,2459,928,1,
-2464,945,1,2542,1687,
-1,2544,3607,16,0,
-679,1,2583,1710,1,
-2584,1694,1,2585,1700,
-1,2586,1705,1,2513,
-1667,1,2470,3608,16,
-0,679,1,2589,1720,
-1,69,3609,19,364,
-1,69,3610,5,18,
-1,2590,1725,1,2591,
-1730,1,2593,3611,16,
-0,362,1,2632,3612,
-16,0,362,1,2522,
-1673,1,2588,1715,1,
-2527,1680,1,2459,928,
-1,2464,945,1,2542,
-1687,1,2544,3613,16,
-0,362,1,2583,1710,
-1,2584,1694,1,2585,
-1700,1,2586,1705,1,
-2513,1667,1,2470,3614,
-16,0,362,1,2589,
-1720,1,70,3615,19,
-361,1,70,3616,5,
-18,1,2590,1725,1,
-2591,1730,1,2593,3617,
-16,0,359,1,2632,
-3618,16,0,359,1,
-2522,1673,1,2588,1715,
-1,2527,1680,1,2459,
-928,1,2464,945,1,
-2542,1687,1,2544,3619,
-16,0,359,1,2583,
-1710,1,2584,1694,1,
-2585,1700,1,2586,1705,
-1,2513,1667,1,2470,
-3620,16,0,359,1,
-2589,1720,1,71,3621,
-19,358,1,71,3622,
-5,18,1,2590,1725,
-1,2591,1730,1,2593,
-3623,16,0,356,1,
-2632,3624,16,0,356,
-1,2522,1673,1,2588,
-1715,1,2527,1680,1,
-2459,928,1,2464,945,
-1,2542,1687,1,2544,
-3625,16,0,356,1,
-2583,1710,1,2584,1694,
-1,2585,1700,1,2586,
-1705,1,2513,1667,1,
-2470,3626,16,0,356,
-1,2589,1720,1,72,
-3627,19,424,1,72,
-3628,5,18,1,2590,
-1725,1,2591,1730,1,
-2593,3629,16,0,422,
-1,2632,3630,16,0,
-422,1,2522,1673,1,
-2588,1715,1,2527,1680,
-1,2459,928,1,2464,
-945,1,2542,1687,1,
-2544,3631,16,0,422,
-1,2583,1710,1,2584,
-1694,1,2585,1700,1,
-2586,1705,1,2513,1667,
-1,2470,3632,16,0,
-422,1,2589,1720,1,
-73,3633,19,531,1,
-73,3634,5,18,1,
-2590,1725,1,2591,1730,
-1,2593,3635,16,0,
-529,1,2632,3636,16,
-0,529,1,2522,1673,
-1,2588,1715,1,2527,
-1680,1,2459,928,1,
-2464,945,1,2542,1687,
-1,2544,3637,16,0,
-529,1,2583,1710,1,
-2584,1694,1,2585,1700,
-1,2586,1705,1,2513,
-1667,1,2470,3638,16,
-0,529,1,2589,1720,
-1,74,3639,19,420,
-1,74,3640,5,18,
-1,2590,1725,1,2591,
-1730,1,2593,3641,16,
-0,418,1,2632,3642,
-16,0,418,1,2522,
-1673,1,2588,1715,1,
-2527,1680,1,2459,928,
-1,2464,945,1,2542,
-1687,1,2544,3643,16,
-0,418,1,2583,1710,
-1,2584,1694,1,2585,
-1700,1,2586,1705,1,
-2513,1667,1,2470,3644,
-16,0,418,1,2589,
-1720,1,75,3645,19,
-515,1,75,3646,5,
-18,1,2590,1725,1,
-2591,1730,1,2593,3647,
-16,0,513,1,2632,
-3648,16,0,513,1,
-2522,1673,1,2588,1715,
-1,2527,1680,1,2459,
-928,1,2464,945,1,
-2542,1687,1,2544,3649,
-16,0,513,1,2583,
-1710,1,2584,1694,1,
-2585,1700,1,2586,1705,
-1,2513,1667,1,2470,
-3650,16,0,513,1,
-2589,1720,1,76,3651,
-19,512,1,76,3652,
-5,18,1,2590,1725,
-1,2591,1730,1,2593,
-3653,16,0,510,1,
-2632,3654,16,0,510,
-1,2522,1673,1,2588,
-1715,1,2527,1680,1,
-2459,928,1,2464,945,
-1,2542,1687,1,2544,
-3655,16,0,510,1,
-2583,1710,1,2584,1694,
-1,2585,1700,1,2586,
-1705,1,2513,1667,1,
-2470,3656,16,0,510,
-1,2589,1720,1,77,
-3657,19,404,1,77,
-3658,5,18,1,2590,
-1725,1,2591,1730,1,
-2593,3659,16,0,402,
-1,2632,3660,16,0,
-402,1,2522,1673,1,
-2588,1715,1,2527,1680,
-1,2459,928,1,2464,
-945,1,2542,1687,1,
-2544,3661,16,0,402,
-1,2583,1710,1,2584,
-1694,1,2585,1700,1,
-2586,1705,1,2513,1667,
-1,2470,3662,16,0,
-402,1,2589,1720,1,
-78,3663,19,401,1,
-78,3664,5,18,1,
-2590,1725,1,2591,1730,
-1,2593,3665,16,0,
-399,1,2632,3666,16,
-0,399,1,2522,1673,
-1,2588,1715,1,2527,
-1680,1,2459,928,1,
-2464,945,1,2542,1687,
-1,2544,3667,16,0,
-399,1,2583,1710,1,
-2584,1694,1,2585,1700,
-1,2586,1705,1,2513,
-1667,1,2470,3668,16,
-0,399,1,2589,1720,
-1,79,3669,19,509,
-1,79,3670,5,18,
-1,2590,1725,1,2591,
-1730,1,2593,3671,16,
-0,507,1,2632,3672,
-16,0,507,1,2522,
-1673,1,2588,1715,1,
-2527,1680,1,2459,928,
-1,2464,945,1,2542,
-1687,1,2544,3673,16,
-0,507,1,2583,1710,
-1,2584,1694,1,2585,
-1700,1,2586,1705,1,
-2513,1667,1,2470,3674,
-16,0,507,1,2589,
-1720,1,80,3675,19,
-417,1,80,3676,5,
-18,1,2590,1725,1,
-2591,1730,1,2593,3677,
-16,0,415,1,2632,
-3678,16,0,415,1,
-2522,1673,1,2588,1715,
-1,2527,1680,1,2459,
-928,1,2464,945,1,
-2542,1687,1,2544,3679,
-16,0,415,1,2583,
-1710,1,2584,1694,1,
-2585,1700,1,2586,1705,
-1,2513,1667,1,2470,
-3680,16,0,415,1,
-2589,1720,1,81,3681,
-19,382,1,81,3682,
-5,18,1,2590,1725,
-1,2591,1730,1,2593,
-3683,16,0,380,1,
-2632,3684,16,0,380,
-1,2522,1673,1,2588,
-1715,1,2527,1680,1,
-2459,928,1,2464,945,
-1,2542,1687,1,2544,
-3685,16,0,380,1,
-2583,1710,1,2584,1694,
-1,2585,1700,1,2586,
-1705,1,2513,1667,1,
-2470,3686,16,0,380,
-1,2589,1720,1,82,
-3687,19,524,1,82,
-3688,5,18,1,2590,
-1725,1,2591,1730,1,
-2593,3689,16,0,522,
-1,2632,3690,16,0,
-522,1,2522,1673,1,
-2588,1715,1,2527,1680,
-1,2459,928,1,2464,
-945,1,2542,1687,1,
-2544,3691,16,0,522,
-1,2583,1710,1,2584,
-1694,1,2585,1700,1,
-2586,1705,1,2513,1667,
-1,2470,3692,16,0,
-522,1,2589,1720,1,
-83,3693,19,379,1,
-83,3694,5,18,1,
-2590,1725,1,2591,1730,
-1,2593,3695,16,0,
-377,1,2632,3696,16,
-0,377,1,2522,1673,
-1,2588,1715,1,2527,
-1680,1,2459,928,1,
-2464,945,1,2542,1687,
-1,2544,3697,16,0,
-377,1,2583,1710,1,
-2584,1694,1,2585,1700,
-1,2586,1705,1,2513,
-1667,1,2470,3698,16,
-0,377,1,2589,1720,
-1,84,3699,19,376,
-1,84,3700,5,18,
-1,2590,1725,1,2591,
-1730,1,2593,3701,16,
-0,374,1,2632,3702,
-16,0,374,1,2522,
-1673,1,2588,1715,1,
-2527,1680,1,2459,928,
-1,2464,945,1,2542,
-1687,1,2544,3703,16,
-0,374,1,2583,1710,
-1,2584,1694,1,2585,
-1700,1,2586,1705,1,
-2513,1667,1,2470,3704,
-16,0,374,1,2589,
-1720,1,85,3705,19,
-521,1,85,3706,5,
-18,1,2590,1725,1,
-2591,1730,1,2593,3707,
-16,0,519,1,2632,
-3708,16,0,519,1,
-2522,1673,1,2588,1715,
-1,2527,1680,1,2459,
-928,1,2464,945,1,
-2542,1687,1,2544,3709,
-16,0,519,1,2583,
-1710,1,2584,1694,1,
-2585,1700,1,2586,1705,
-1,2513,1667,1,2470,
-3710,16,0,519,1,
-2589,1720,1,86,3711,
-19,518,1,86,3712,
-5,18,1,2590,1725,
-1,2591,1730,1,2593,
-3713,16,0,516,1,
-2632,3714,16,0,516,
-1,2522,1673,1,2588,
-1715,1,2527,1680,1,
-2459,928,1,2464,945,
-1,2542,1687,1,2544,
-3715,16,0,516,1,
-2583,1710,1,2584,1694,
-1,2585,1700,1,2586,
-1705,1,2513,1667,1,
-2470,3716,16,0,516,
-1,2589,1720,1,87,
-3717,19,598,1,87,
-3718,5,18,1,2590,
-1725,1,2591,1730,1,
-2593,3719,16,0,596,
-1,2632,3720,16,0,
-596,1,2522,1673,1,
-2588,1715,1,2527,1680,
-1,2459,928,1,2464,
-945,1,2542,1687,1,
-2544,3721,16,0,596,
-1,2583,1710,1,2584,
-1694,1,2585,1700,1,
-2586,1705,1,2513,1667,
-1,2470,3722,16,0,
-596,1,2589,1720,1,
-88,3723,19,373,1,
-88,3724,5,18,1,
-2590,1725,1,2591,1730,
-1,2593,3725,16,0,
-371,1,2632,3726,16,
-0,371,1,2522,1673,
-1,2588,1715,1,2527,
-1680,1,2459,928,1,
-2464,945,1,2542,1687,
-1,2544,3727,16,0,
-371,1,2583,1710,1,
-2584,1694,1,2585,1700,
-1,2586,1705,1,2513,
-1667,1,2470,3728,16,
-0,371,1,2589,1720,
-1,89,3729,19,367,
-1,89,3730,5,18,
-1,2590,1725,1,2591,
-1730,1,2593,3731,16,
-0,365,1,2632,3732,
-16,0,365,1,2522,
-1673,1,2588,1715,1,
-2527,1680,1,2459,928,
-1,2464,945,1,2542,
-1687,1,2544,3733,16,
-0,365,1,2583,1710,
-1,2584,1694,1,2585,
-1700,1,2586,1705,1,
-2513,1667,1,2470,3734,
-16,0,365,1,2589,
-1720,1,90,3735,19,
-370,1,90,3736,5,
-18,1,2590,1725,1,
-2591,1730,1,2593,3737,
-16,0,368,1,2632,
-3738,16,0,368,1,
-2522,1673,1,2588,1715,
-1,2527,1680,1,2459,
-928,1,2464,945,1,
-2542,1687,1,2544,3739,
-16,0,368,1,2583,
-1710,1,2584,1694,1,
-2585,1700,1,2586,1705,
-1,2513,1667,1,2470,
-3740,16,0,368,1,
-2589,1720,1,91,3741,
-19,413,1,91,3742,
-5,18,1,2590,1725,
-1,2591,1730,1,2593,
-3743,16,0,411,1,
-2632,3744,16,0,411,
-1,2522,1673,1,2588,
-1715,1,2527,1680,1,
-2459,928,1,2464,945,
-1,2542,1687,1,2544,
-3745,16,0,411,1,
-2583,1710,1,2584,1694,
-1,2585,1700,1,2586,
-1705,1,2513,1667,1,
-2470,3746,16,0,411,
-1,2589,1720,1,92,
-3747,19,133,1,92,
-3748,5,127,1,0,
-3749,16,0,631,1,
-1,2055,1,2,2061,
-1,3,2066,1,4,
-2071,1,5,2076,1,
-6,2081,1,7,2086,
-1,8,3750,16,0,
-131,1,1515,3751,16,
-0,165,1,2021,764,
-1,2022,3752,16,0,
-535,1,256,3753,16,
-0,173,1,2025,3754,
-16,0,539,1,18,
-3755,16,0,138,1,
-2027,3756,16,0,543,
-1,2029,771,1,2030,
-777,1,2031,782,1,
-2699,3353,1,2033,792,
-1,277,3757,16,0,
-173,1,2035,798,1,
-2037,803,1,2039,808,
-1,32,3758,16,0,
-165,1,2032,787,1,
-2293,3759,16,0,173,
-1,2043,820,1,2045,
-825,1,41,3760,16,
-0,173,1,1297,3761,
-16,0,165,1,43,
-3762,16,0,173,1,
-46,3763,16,0,178,
-1,1804,3764,16,0,
-165,1,299,3765,16,
-0,173,1,52,3766,
-16,0,165,1,2727,
-3347,1,509,3767,16,
-0,173,1,2318,3768,
-16,0,165,1,62,
-3769,16,0,195,1,
-65,3770,16,0,197,
-1,2075,3771,16,0,
-165,1,1574,845,1,
-71,3772,16,0,173,
-1,1775,3773,16,0,
-165,1,76,3774,16,
-0,173,1,2507,3775,
-16,0,449,1,2337,
-3776,16,0,165,1,
-79,3777,16,0,173,
-1,1335,3778,16,0,
-165,1,322,3779,16,
-0,173,1,85,3780,
-16,0,173,1,2516,
-3781,16,0,463,1,
-2760,3311,1,1261,3782,
-16,0,165,1,89,
-3783,16,0,173,1,
-346,3784,16,0,173,
-1,97,3785,16,0,
-173,1,2041,814,1,
-102,3786,16,0,173,
-1,1860,867,1,1803,
-833,1,2364,873,1,
-1113,3787,16,0,158,
-1,112,3788,16,0,
-173,1,1117,3789,16,
-0,165,1,1873,881,
-1,1876,3790,16,0,
-165,1,372,3791,16,
-0,573,1,374,3792,
-16,0,575,1,124,
-3793,16,0,173,1,
-376,3794,16,0,577,
-1,378,3795,16,0,
-579,1,2136,888,1,
-381,3796,16,0,173,
-1,525,3797,16,0,
-173,1,1834,3798,16,
-0,165,1,137,3799,
-16,0,173,1,1901,
-3800,16,0,165,1,
-1153,3801,16,0,165,
-1,151,3802,16,0,
-173,1,1407,3803,16,
-0,165,1,1659,3804,
-16,0,165,1,2413,
-3805,16,0,165,1,
-406,3806,16,0,173,
-1,1371,3807,16,0,
-165,1,2105,860,1,
-2106,3808,16,0,165,
-1,166,3809,16,0,
-173,1,1622,3810,16,
-0,173,1,1931,906,
-1,1933,3811,16,0,
-165,1,431,3812,16,
-0,173,1,1585,3813,
-16,0,173,1,182,
-3814,16,0,173,1,
-1189,3815,16,0,165,
-1,1443,3816,16,0,
-165,1,1695,3817,16,
-0,165,1,2198,3818,
-16,0,165,1,2702,
-3819,16,0,173,1,
-447,3820,16,0,173,
-1,2458,922,1,2459,
-928,1,1958,3821,16,
-0,165,1,2462,935,
-1,1657,940,1,2464,
-945,1,2466,3341,1,
-459,3822,16,0,173,
-1,2468,3823,16,0,
-354,1,462,3824,16,
-0,173,1,199,3825,
-16,0,173,1,217,
-3826,16,0,173,1,
-2227,954,1,1225,3827,
-16,0,165,1,1479,
-3828,16,0,165,1,
-1731,3829,16,0,173,
-1,2738,3319,1,2739,
-3830,16,0,631,1,
-1989,962,1,1990,3831,
-16,0,165,1,236,
-3832,16,0,173,1,
-2757,3326,1,2758,3331,
-1,2759,3336,1,1756,
-3833,16,0,165,1,
-93,3834,19,663,1,
-93,3835,5,95,1,
-256,3836,16,0,661,
-1,1261,3837,16,0,
-661,1,509,3838,16,
-0,661,1,1515,3839,
-16,0,661,1,2021,
-764,1,1775,3840,16,
-0,661,1,2029,771,
-1,2030,777,1,2031,
-782,1,2032,787,1,
-2033,792,1,277,3841,
-16,0,661,1,2035,
-798,1,2037,803,1,
-2039,808,1,32,3842,
-16,0,661,1,2041,
-814,1,2293,3843,16,
-0,661,1,2043,820,
-1,2045,825,1,41,
-3844,16,0,661,1,
-1297,3845,16,0,661,
-1,43,3846,16,0,
-661,1,1803,833,1,
-1804,3847,16,0,661,
-1,299,3848,16,0,
-661,1,52,3849,16,
-0,661,1,2318,3850,
-16,0,661,1,62,
-3851,16,0,661,1,
-2075,3852,16,0,661,
-1,1574,845,1,71,
-3853,16,0,661,1,
-76,3854,16,0,661,
-1,1834,3855,16,0,
-661,1,2337,3856,16,
-0,661,1,79,3857,
-16,0,661,1,1335,
-3858,16,0,661,1,
-322,3859,16,0,661,
-1,85,3860,16,0,
-661,1,89,3861,16,
-0,661,1,346,3862,
-16,0,661,1,2105,
-860,1,2106,3863,16,
-0,661,1,97,3864,
-16,0,661,1,1860,
-867,1,2364,873,1,
-102,3865,16,0,661,
-1,112,3866,16,0,
-661,1,1117,3867,16,
-0,661,1,1873,881,
-1,1876,3868,16,0,
-661,1,124,3869,16,
-0,661,1,2136,888,
-1,381,3870,16,0,
-661,1,525,3871,16,
-0,661,1,137,3872,
-16,0,661,1,1901,
-3873,16,0,661,1,
-1153,3874,16,0,661,
-1,151,3875,16,0,
-661,1,1407,3876,16,
-0,661,1,1659,3877,
-16,0,661,1,2413,
-3878,16,0,661,1,
-406,3879,16,0,661,
-1,1371,3880,16,0,
-661,1,166,3881,16,
-0,661,1,1622,3882,
-16,0,661,1,1931,
-906,1,1933,3883,16,
-0,661,1,431,3884,
-16,0,661,1,1585,
-3885,16,0,661,1,
-182,3886,16,0,661,
-1,1189,3887,16,0,
-661,1,1443,3888,16,
-0,661,1,1695,3889,
-16,0,661,1,2198,
-3890,16,0,661,1,
-2702,3891,16,0,661,
-1,447,3892,16,0,
-661,1,2458,922,1,
-2459,928,1,1958,3893,
-16,0,661,1,2462,
-935,1,1657,940,1,
-2464,945,1,199,3894,
-16,0,661,1,459,
-3895,16,0,661,1,
-462,3896,16,0,661,
-1,217,3897,16,0,
-661,1,2227,954,1,
-1225,3898,16,0,661,
-1,1479,3899,16,0,
-661,1,1731,3900,16,
-0,661,1,1989,962,
-1,1990,3901,16,0,
-661,1,236,3902,16,
-0,661,1,1756,3903,
-16,0,661,1,94,
-3904,19,660,1,94,
-3905,5,95,1,256,
-3906,16,0,658,1,
-1261,3907,16,0,658,
-1,509,3908,16,0,
-658,1,1515,3909,16,
-0,658,1,2021,764,
-1,1775,3910,16,0,
-658,1,2029,771,1,
-2030,777,1,2031,782,
-1,2032,787,1,2033,
-792,1,277,3911,16,
-0,658,1,2035,798,
-1,2037,803,1,2039,
-808,1,32,3912,16,
-0,658,1,2041,814,
-1,2293,3913,16,0,
-658,1,2043,820,1,
-2045,825,1,41,3914,
-16,0,658,1,1297,
-3915,16,0,658,1,
-43,3916,16,0,658,
-1,1803,833,1,1804,
-3917,16,0,658,1,
-299,3918,16,0,658,
-1,52,3919,16,0,
-658,1,2318,3920,16,
-0,658,1,62,3921,
-16,0,658,1,2075,
-3922,16,0,658,1,
-1574,845,1,71,3923,
-16,0,658,1,76,
-3924,16,0,658,1,
-1834,3925,16,0,658,
-1,2337,3926,16,0,
-658,1,79,3927,16,
-0,658,1,1335,3928,
-16,0,658,1,322,
-3929,16,0,658,1,
-85,3930,16,0,658,
-1,89,3931,16,0,
-658,1,346,3932,16,
-0,658,1,2105,860,
-1,2106,3933,16,0,
-658,1,97,3934,16,
-0,658,1,1860,867,
-1,2364,873,1,102,
-3935,16,0,658,1,
-112,3936,16,0,658,
-1,1117,3937,16,0,
-658,1,1873,881,1,
-1876,3938,16,0,658,
-1,124,3939,16,0,
-658,1,2136,888,1,
-381,3940,16,0,658,
-1,525,3941,16,0,
-658,1,137,3942,16,
-0,658,1,1901,3943,
-16,0,658,1,1153,
-3944,16,0,658,1,
-151,3945,16,0,658,
-1,1407,3946,16,0,
-658,1,1659,3947,16,
-0,658,1,2413,3948,
-16,0,658,1,406,
-3949,16,0,658,1,
-1371,3950,16,0,658,
-1,166,3951,16,0,
-658,1,1622,3952,16,
-0,658,1,1931,906,
-1,1933,3953,16,0,
-658,1,431,3954,16,
-0,658,1,1585,3955,
-16,0,658,1,182,
-3956,16,0,658,1,
-1189,3957,16,0,658,
-1,1443,3958,16,0,
-658,1,1695,3959,16,
-0,658,1,2198,3960,
-16,0,658,1,2702,
-3961,16,0,658,1,
-447,3962,16,0,658,
-1,2458,922,1,2459,
-928,1,1958,3963,16,
-0,658,1,2462,935,
-1,1657,940,1,2464,
-945,1,199,3964,16,
-0,658,1,459,3965,
-16,0,658,1,462,
-3966,16,0,658,1,
-217,3967,16,0,658,
-1,2227,954,1,1225,
-3968,16,0,658,1,
-1479,3969,16,0,658,
-1,1731,3970,16,0,
-658,1,1989,962,1,
-1990,3971,16,0,658,
-1,236,3972,16,0,
-658,1,1756,3973,16,
-0,658,1,95,3974,
-19,657,1,95,3975,
-5,95,1,256,3976,
-16,0,655,1,1261,
-3977,16,0,655,1,
-509,3978,16,0,655,
-1,1515,3979,16,0,
-655,1,2021,764,1,
-1775,3980,16,0,655,
-1,2029,771,1,2030,
-777,1,2031,782,1,
-2032,787,1,2033,792,
-1,277,3981,16,0,
-655,1,2035,798,1,
-2037,803,1,2039,808,
-1,32,3982,16,0,
-655,1,2041,814,1,
-2293,3983,16,0,655,
-1,2043,820,1,2045,
-825,1,41,3984,16,
-0,655,1,1297,3985,
-16,0,655,1,43,
-3986,16,0,655,1,
-1803,833,1,1804,3987,
-16,0,655,1,299,
-3988,16,0,655,1,
-52,3989,16,0,655,
-1,2318,3990,16,0,
-655,1,62,3991,16,
-0,655,1,2075,3992,
-16,0,655,1,1574,
-845,1,71,3993,16,
-0,655,1,76,3994,
-16,0,655,1,1834,
-3995,16,0,655,1,
-2337,3996,16,0,655,
-1,79,3997,16,0,
-655,1,1335,3998,16,
-0,655,1,322,3999,
-16,0,655,1,85,
-4000,16,0,655,1,
-89,4001,16,0,655,
-1,346,4002,16,0,
-655,1,2105,860,1,
-2106,4003,16,0,655,
-1,97,4004,16,0,
-655,1,1860,867,1,
-2364,873,1,102,4005,
-16,0,655,1,112,
-4006,16,0,655,1,
-1117,4007,16,0,655,
-1,1873,881,1,1876,
-4008,16,0,655,1,
-124,4009,16,0,655,
-1,2136,888,1,381,
-4010,16,0,655,1,
-525,4011,16,0,655,
-1,137,4012,16,0,
-655,1,1901,4013,16,
-0,655,1,1153,4014,
-16,0,655,1,151,
-4015,16,0,655,1,
-1407,4016,16,0,655,
-1,1659,4017,16,0,
-655,1,2413,4018,16,
-0,655,1,406,4019,
-16,0,655,1,1371,
-4020,16,0,655,1,
-166,4021,16,0,655,
-1,1622,4022,16,0,
-655,1,1931,906,1,
-1933,4023,16,0,655,
-1,431,4024,16,0,
-655,1,1585,4025,16,
-0,655,1,182,4026,
-16,0,655,1,1189,
-4027,16,0,655,1,
-1443,4028,16,0,655,
-1,1695,4029,16,0,
-655,1,2198,4030,16,
-0,655,1,2702,4031,
-16,0,655,1,447,
-4032,16,0,655,1,
-2458,922,1,2459,928,
-1,1958,4033,16,0,
-655,1,2462,935,1,
-1657,940,1,2464,945,
-1,199,4034,16,0,
-655,1,459,4035,16,
-0,655,1,462,4036,
-16,0,655,1,217,
-4037,16,0,655,1,
-2227,954,1,1225,4038,
-16,0,655,1,1479,
-4039,16,0,655,1,
-1731,4040,16,0,655,
-1,1989,962,1,1990,
-4041,16,0,655,1,
-236,4042,16,0,655,
-1,1756,4043,16,0,
-655,1,96,4044,19,
-103,1,96,4045,5,
-1,1,0,4046,16,
-0,104,1,97,4047,
-19,684,1,97,4048,
-5,1,1,0,4049,
-16,0,682,1,98,
-4050,19,285,1,98,
-4051,5,2,1,0,
-4052,16,0,503,1,
-2739,4053,16,0,283,
-1,99,4054,19,701,
-1,99,4055,5,2,
-1,0,4056,16,0,
-703,1,2739,4057,16,
-0,699,1,100,4058,
-19,288,1,100,4059,
-5,2,1,0,4060,
-16,0,286,1,2739,
-4061,16,0,693,1,
-101,4062,19,712,1,
-101,4063,5,4,1,
-0,4064,16,0,713,
-1,2739,4065,16,0,
-713,1,2680,4066,16,
-0,710,1,2750,4067,
-16,0,710,1,102,
-4068,19,494,1,102,
-4069,5,2,1,2470,
-4070,16,0,492,1,
-2593,4071,16,0,668,
-1,103,4072,19,265,
-1,103,4073,5,4,
-1,2544,4074,16,0,
-616,1,2470,4075,16,
-0,263,1,2632,4076,
-16,0,616,1,2593,
-4077,16,0,263,1,
-104,4078,19,335,1,
-104,4079,5,4,1,
-2544,4080,16,0,692,
-1,2470,4081,16,0,
-333,1,2632,4082,16,
-0,692,1,2593,4083,
-16,0,333,1,105,
-4084,19,332,1,105,
-4085,5,4,1,2544,
-4086,16,0,691,1,
-2470,4087,16,0,330,
-1,2632,4088,16,0,
-691,1,2593,4089,16,
-0,330,1,106,4090,
-19,620,1,106,4091,
-5,4,1,2544,4092,
-16,0,690,1,2470,
-4093,16,0,618,1,
-2632,4094,16,0,690,
-1,2593,4095,16,0,
-618,1,107,4096,19,
-141,1,107,4097,5,
-3,1,2529,4098,16,
-0,488,1,2686,4099,
-16,0,645,1,10,
-4100,16,0,139,1,
-108,4101,19,469,1,
-108,4102,5,1,1,
-2515,4103,16,0,467,
-1,109,4104,19,455,
-1,109,4105,5,1,
-1,2506,4106,16,0,
-453,1,110,4107,19,
-151,1,110,4108,5,
-17,1,0,4109,16,
-0,650,1,2739,4110,
-16,0,650,1,2075,
-4111,16,0,676,1,
-2337,4112,16,0,676,
-1,2413,4113,16,0,
-676,1,10,4114,16,
-0,350,1,2529,4115,
-16,0,350,1,1901,
-4116,16,0,676,1,
-2198,4117,16,0,676,
-1,21,4118,16,0,
-149,1,2106,4119,16,
-0,676,1,1804,4120,
-16,0,676,1,1990,
-4121,16,0,676,1,
-32,4122,16,0,676,
-1,1958,4123,16,0,
-676,1,2686,4124,16,
-0,350,1,1775,4125,
-16,0,676,1,111,
-4126,19,466,1,111,
-4127,5,1,1,2515,
-4128,16,0,464,1,
-112,4129,19,452,1,
-112,4130,5,1,1,
-2506,4131,16,0,450,
-1,113,4132,19,130,
-1,113,4133,5,18,
-1,0,4134,16,0,
-128,1,2739,4135,16,
-0,128,1,2075,4136,
-16,0,137,1,2337,
-4137,16,0,137,1,
-2413,4138,16,0,137,
-1,10,4139,16,0,
-137,1,2198,4140,16,
-0,137,1,2529,4141,
-16,0,137,1,1901,
-4142,16,0,137,1,
-52,4143,16,0,193,
-1,21,4144,16,0,
-137,1,2106,4145,16,
-0,137,1,1804,4146,
-16,0,137,1,1990,
-4147,16,0,137,1,
-32,4148,16,0,137,
-1,1958,4149,16,0,
-137,1,2686,4150,16,
-0,137,1,1775,4151,
-16,0,137,1,114,
-4152,19,282,1,114,
-4153,5,4,1,2544,
-4154,16,0,280,1,
-2470,4155,16,0,280,
-1,2632,4156,16,0,
-280,1,2593,4157,16,
-0,280,1,115,4158,
-19,475,1,115,4159,
-5,4,1,2544,4160,
-16,0,473,1,2470,
-4161,16,0,473,1,
-2632,4162,16,0,473,
-1,2593,4163,16,0,
-473,1,116,4164,19,
-460,1,116,4165,5,
-4,1,2544,4166,16,
-0,458,1,2470,4167,
-16,0,458,1,2632,
-4168,16,0,458,1,
-2593,4169,16,0,458,
-1,117,4170,19,689,
-1,117,4171,5,4,
-1,2544,4172,16,0,
-687,1,2470,4173,16,
-0,687,1,2632,4174,
-16,0,687,1,2593,
-4175,16,0,687,1,
-118,4176,19,225,1,
-118,4177,5,17,1,
-2075,4178,16,0,544,
-1,2520,4179,16,0,
-472,1,2337,4180,16,
-0,544,1,2413,4181,
-16,0,544,1,2525,
-4182,16,0,273,1,
-2511,4183,16,0,457,
-1,1901,4184,16,0,
-544,1,2198,4185,16,
-0,544,1,2106,4186,
-16,0,544,1,2540,
-4187,16,0,490,1,
-1804,4188,16,0,544,
-1,1990,4189,16,0,
-544,1,31,4190,16,
-0,349,1,32,4191,
-16,0,544,1,2697,
-4192,16,0,223,1,
-1958,4193,16,0,544,
-1,1775,4194,16,0,
-544,1,119,4195,19,
-312,1,119,4196,5,
-1,1,32,4197,16,
-0,310,1,120,4198,
-19,259,1,120,4199,
-5,11,1,2075,4200,
-16,0,608,1,2337,
-4201,16,0,266,1,
-2413,4202,16,0,484,
-1,1901,4203,16,0,
-405,1,2198,4204,16,
-0,329,1,2106,4205,
-16,0,644,1,1804,
-4206,16,0,295,1,
-1990,4207,16,0,532,
-1,32,4208,16,0,
-345,1,1958,4209,16,
-0,495,1,1775,4210,
-16,0,257,1,121,
-4211,19,614,1,121,
-4212,5,11,1,2075,
-4213,16,0,612,1,
-2337,4214,16,0,612,
-1,2413,4215,16,0,
-612,1,1901,4216,16,
-0,612,1,2198,4217,
-16,0,612,1,2106,
-4218,16,0,612,1,
-1804,4219,16,0,612,
-1,1990,4220,16,0,
-612,1,32,4221,16,
-0,612,1,1958,4222,
-16,0,612,1,1775,
-4223,16,0,612,1,
-122,4224,19,673,1,
-122,4225,5,11,1,
-2075,4226,16,0,671,
-1,2337,4227,16,0,
-671,1,2413,4228,16,
-0,671,1,1901,4229,
-16,0,671,1,2198,
-4230,16,0,671,1,
-2106,4231,16,0,671,
-1,1804,4232,16,0,
-671,1,1990,4233,16,
-0,671,1,32,4234,
-16,0,671,1,1958,
-4235,16,0,671,1,
-1775,4236,16,0,671,
-1,123,4237,19,161,
-1,123,4238,5,31,
-1,1901,4239,16,0,
-675,1,1479,4240,16,
-0,589,1,2075,4241,
-16,0,675,1,1695,
-4242,16,0,189,1,
-1756,4243,16,0,188,
-1,2413,4244,16,0,
-675,1,2198,4245,16,
-0,675,1,1876,4246,
-16,0,696,1,1659,
-4247,16,0,188,1,
-1443,4248,16,0,560,
-1,1117,4249,16,0,
-159,1,1990,4250,16,
-0,675,1,1189,4251,
-16,0,241,1,1775,
-4252,16,0,675,1,
-32,4253,16,0,675,
-1,2106,4254,16,0,
-675,1,1515,4255,16,
-0,610,1,2337,4256,
-16,0,675,1,52,
-4257,16,0,627,1,
-1804,4258,16,0,675,
-1,1261,4259,16,0,
-306,1,1153,4260,16,
-0,248,1,1225,4261,
-16,0,276,1,1335,
-4262,16,0,481,1,
-1933,4263,16,0,591,
-1,1834,4264,16,0,
-322,1,1297,4265,16,
-0,339,1,1407,4266,
-16,0,602,1,2318,
-4267,16,0,188,1,
-1958,4268,16,0,675,
-1,1371,4269,16,0,
-470,1,124,4270,19,
-569,1,124,4271,5,
-11,1,2075,4272,16,
-0,567,1,2337,4273,
-16,0,567,1,2413,
-4274,16,0,567,1,
-1901,4275,16,0,567,
-1,2198,4276,16,0,
-567,1,2106,4277,16,
-0,567,1,1804,4278,
-16,0,567,1,1990,
-4279,16,0,567,1,
-32,4280,16,0,567,
-1,1958,4281,16,0,
-567,1,1775,4282,16,
-0,567,1,125,4283,
-19,565,1,125,4284,
-5,11,1,2075,4285,
-16,0,563,1,2337,
-4286,16,0,563,1,
-2413,4287,16,0,563,
-1,1901,4288,16,0,
-563,1,2198,4289,16,
-0,563,1,2106,4290,
-16,0,563,1,1804,
-4291,16,0,563,1,
-1990,4292,16,0,563,
-1,32,4293,16,0,
-563,1,1958,4294,16,
-0,563,1,1775,4295,
-16,0,563,1,126,
-4296,19,606,1,126,
-4297,5,11,1,2075,
-4298,16,0,604,1,
-2337,4299,16,0,604,
-1,2413,4300,16,0,
-604,1,1901,4301,16,
-0,604,1,2198,4302,
-16,0,604,1,2106,
-4303,16,0,604,1,
-1804,4304,16,0,604,
-1,1990,4305,16,0,
-604,1,32,4306,16,
-0,604,1,1958,4307,
-16,0,604,1,1775,
-4308,16,0,604,1,
-127,4309,19,559,1,
-127,4310,5,11,1,
-2075,4311,16,0,557,
-1,2337,4312,16,0,
-557,1,2413,4313,16,
-0,557,1,1901,4314,
-16,0,557,1,2198,
-4315,16,0,557,1,
-2106,4316,16,0,557,
-1,1804,4317,16,0,
-557,1,1990,4318,16,
-0,557,1,32,4319,
-16,0,557,1,1958,
-4320,16,0,557,1,
-1775,4321,16,0,557,
-1,128,4322,19,556,
-1,128,4323,5,11,
-1,2075,4324,16,0,
-554,1,2337,4325,16,
-0,554,1,2413,4326,
-16,0,554,1,1901,
-4327,16,0,554,1,
-2198,4328,16,0,554,
-1,2106,4329,16,0,
-554,1,1804,4330,16,
-0,554,1,1990,4331,
-16,0,554,1,32,
-4332,16,0,554,1,
-1958,4333,16,0,554,
-1,1775,4334,16,0,
-554,1,129,4335,19,
-553,1,129,4336,5,
-11,1,2075,4337,16,
-0,551,1,2337,4338,
-16,0,551,1,2413,
-4339,16,0,551,1,
-1901,4340,16,0,551,
-1,2198,4341,16,0,
-551,1,2106,4342,16,
-0,551,1,1804,4343,
-16,0,551,1,1990,
-4344,16,0,551,1,
-32,4345,16,0,551,
-1,1958,4346,16,0,
-551,1,1775,4347,16,
-0,551,1,130,4348,
-19,550,1,130,4349,
-5,11,1,2075,4350,
-16,0,548,1,2337,
-4351,16,0,548,1,
-2413,4352,16,0,548,
-1,1901,4353,16,0,
-548,1,2198,4354,16,
-0,548,1,2106,4355,
-16,0,548,1,1804,
-4356,16,0,548,1,
-1990,4357,16,0,548,
-1,32,4358,16,0,
-548,1,1958,4359,16,
-0,548,1,1775,4360,
-16,0,548,1,131,
-4361,19,547,1,131,
-4362,5,11,1,2075,
-4363,16,0,545,1,
-2337,4364,16,0,545,
-1,2413,4365,16,0,
-545,1,1901,4366,16,
-0,545,1,2198,4367,
-16,0,545,1,2106,
-4368,16,0,545,1,
-1804,4369,16,0,545,
-1,1990,4370,16,0,
-545,1,32,4371,16,
-0,545,1,1958,4372,
-16,0,545,1,1775,
-4373,16,0,545,1,
-132,4374,19,147,1,
-132,4375,5,3,1,
-1756,4376,16,0,294,
-1,2318,4377,16,0,
-305,1,1659,4378,16,
-0,145,1,133,4379,
-19,586,1,133,4380,
-5,68,1,1901,4381,
-16,0,584,1,1479,
-4382,16,0,584,1,
-112,4383,16,0,584,
-1,2293,4384,16,0,
-584,1,1804,4385,16,
-0,584,1,431,4386,
-16,0,584,1,1443,
-4387,16,0,584,1,
-1756,4388,16,0,584,
-1,124,4389,16,0,
-584,1,525,4390,16,
-0,584,1,236,4391,
-16,0,584,1,346,
-4392,16,0,584,1,
-1876,4393,16,0,584,
-1,1659,4394,16,0,
-584,1,1225,4395,16,
-0,584,1,1117,4396,
-16,0,584,1,137,
-4397,16,0,584,1,
-2318,4398,16,0,584,
-1,1775,4399,16,0,
-584,1,32,4400,16,
-0,584,1,1407,4401,
-16,0,584,1,256,
-4402,16,0,584,1,
-459,4403,16,0,584,
-1,406,4404,16,0,
-584,1,41,4405,16,
-0,584,1,151,4406,
-16,0,584,1,43,
-4407,16,0,584,1,
-1585,4408,16,0,584,
-1,1990,4409,16,0,
-584,1,2337,4410,16,
-0,584,1,509,4411,
-16,0,584,1,52,
-4412,16,0,584,1,
-381,4413,16,0,584,
-1,447,4414,16,0,
-584,1,166,4415,16,
-0,584,1,462,4416,
-16,0,584,1,277,
-4417,16,0,584,1,
-1695,4418,16,0,584,
-1,62,4419,16,0,
-622,1,1153,4420,16,
-0,584,1,2106,4421,
-16,0,584,1,1335,
-4422,16,0,584,1,
-71,4423,16,0,584,
-1,182,4424,16,0,
-584,1,76,4425,16,
-0,584,1,79,4426,
-16,0,584,1,1933,
-4427,16,0,584,1,
-299,4428,16,0,584,
-1,85,4429,16,0,
-584,1,2702,4430,16,
-0,584,1,1515,4431,
-16,0,584,1,2198,
-4432,16,0,584,1,
-89,4433,16,0,584,
-1,1834,4434,16,0,
-584,1,1622,4435,16,
-0,584,1,2413,4436,
-16,0,584,1,2075,
-4437,16,0,584,1,
-1731,4438,16,0,584,
-1,97,4439,16,0,
-584,1,1297,4440,16,
-0,584,1,1189,4441,
-16,0,584,1,102,
-4442,16,0,584,1,
-1261,4443,16,0,584,
-1,322,4444,16,0,
-584,1,1958,4445,16,
-0,584,1,199,4446,
-16,0,584,1,1371,
-4447,16,0,584,1,
-217,4448,16,0,584,
-1,134,4449,19,639,
-1,134,4450,5,2,
-1,459,4451,16,0,
-637,1,41,4452,16,
-0,708,1,135,4453,
-19,643,1,135,4454,
-5,3,1,462,4455,
-16,0,641,1,459,
-4456,16,0,667,1,
-41,4457,16,0,667,
-1,136,4458,19,4459,
-4,36,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,1,136,
-4454,1,137,4460,19,
-582,1,137,4461,5,
-68,1,1901,4462,16,
-0,580,1,1479,4463,
-16,0,580,1,112,
-4464,16,0,580,1,
-2293,4465,16,0,580,
-1,1804,4466,16,0,
-580,1,431,4467,16,
-0,580,1,1443,4468,
-16,0,580,1,1756,
-4469,16,0,580,1,
-124,4470,16,0,580,
-1,525,4471,16,0,
-580,1,236,4472,16,
-0,580,1,346,4473,
-16,0,580,1,1876,
-4474,16,0,580,1,
-1659,4475,16,0,580,
-1,1225,4476,16,0,
-580,1,1117,4477,16,
-0,580,1,137,4478,
-16,0,580,1,2318,
-4479,16,0,580,1,
-1775,4480,16,0,580,
-1,32,4481,16,0,
-580,1,1407,4482,16,
-0,580,1,256,4483,
-16,0,580,1,459,
-4484,16,0,580,1,
-406,4485,16,0,580,
-1,41,4486,16,0,
-580,1,151,4487,16,
-0,580,1,43,4488,
-16,0,580,1,1585,
-4489,16,0,580,1,
-1990,4490,16,0,580,
-1,2337,4491,16,0,
-580,1,509,4492,16,
-0,580,1,52,4493,
-16,0,580,1,381,
-4494,16,0,580,1,
-447,4495,16,0,580,
-1,166,4496,16,0,
-580,1,462,4497,16,
-0,580,1,277,4498,
-16,0,580,1,1695,
-4499,16,0,580,1,
-62,4500,16,0,623,
-1,1153,4501,16,0,
-580,1,2106,4502,16,
-0,580,1,1335,4503,
-16,0,580,1,71,
-4504,16,0,580,1,
-182,4505,16,0,580,
-1,76,4506,16,0,
-580,1,79,4507,16,
-0,580,1,1933,4508,
-16,0,580,1,299,
-4509,16,0,580,1,
-85,4510,16,0,580,
-1,2702,4511,16,0,
-580,1,1515,4512,16,
-0,580,1,2198,4513,
-16,0,580,1,89,
-4514,16,0,580,1,
-1834,4515,16,0,580,
-1,1622,4516,16,0,
-580,1,2413,4517,16,
-0,580,1,2075,4518,
-16,0,580,1,1731,
-4519,16,0,580,1,
-97,4520,16,0,580,
-1,1297,4521,16,0,
-580,1,1189,4522,16,
-0,580,1,102,4523,
-16,0,580,1,1261,
-4524,16,0,580,1,
-322,4525,16,0,580,
-1,1958,4526,16,0,
-580,1,199,4527,16,
-0,580,1,1371,4528,
-16,0,580,1,217,
-4529,16,0,580,1,
-138,4530,19,4531,4,
-28,86,0,101,0,
-99,0,116,0,111,
-0,114,0,67,0,
+851,1,2458,940,1,
+1901,3590,16,0,107,
+1,2462,953,1,2136,
+906,1,2464,963,1,
+2029,789,1,2466,3396,
+1,2031,800,1,2032,
+805,1,2033,810,1,
+2035,816,1,2364,891,
+1,2715,3379,1,2039,
+826,1,1931,925,1,
+2041,832,1,2021,782,
+1,2043,838,1,2045,
+843,1,2702,3591,16,
+0,107,1,1775,3592,
+16,0,107,1,1989,
+980,1,2774,3385,1,
+2037,821,1,1574,863,
+1,1958,3593,16,0,
+107,1,2459,946,1,
+58,3594,19,446,1,
+58,3595,5,21,1,
+2553,3596,16,0,444,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3597,16,0,444,
+1,2536,1686,1,2464,
+963,1,2605,3598,16,
+0,444,1,2470,3599,
+16,0,444,1,2513,
+1692,1,2551,1712,1,
+59,3600,19,443,1,
+59,3601,5,21,1,
+2553,3602,16,0,441,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3603,16,0,441,
+1,2536,1686,1,2464,
+963,1,2605,3604,16,
+0,441,1,2470,3605,
+16,0,441,1,2513,
+1692,1,2551,1712,1,
+60,3606,19,520,1,
+60,3607,5,21,1,
+2553,3608,16,0,518,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3609,16,0,518,
+1,2536,1686,1,2464,
+963,1,2605,3610,16,
+0,518,1,2470,3611,
+16,0,518,1,2513,
+1692,1,2551,1712,1,
+61,3612,19,397,1,
+61,3613,5,21,1,
+2553,3614,16,0,395,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3615,16,0,395,
+1,2536,1686,1,2464,
+963,1,2605,3616,16,
+0,395,1,2470,3617,
+16,0,395,1,2513,
+1692,1,2551,1712,1,
+62,3618,19,394,1,
+62,3619,5,21,1,
+2553,3620,16,0,392,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3621,16,0,392,
+1,2536,1686,1,2464,
+963,1,2605,3622,16,
+0,392,1,2470,3623,
+16,0,392,1,2513,
+1692,1,2551,1712,1,
+63,3624,19,391,1,
+63,3625,5,21,1,
+2553,3626,16,0,389,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3627,16,0,389,
+1,2536,1686,1,2464,
+963,1,2605,3628,16,
+0,389,1,2470,3629,
+16,0,389,1,2513,
+1692,1,2551,1712,1,
+64,3630,19,388,1,
+64,3631,5,21,1,
+2553,3632,16,0,386,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3633,16,0,386,
+1,2536,1686,1,2464,
+963,1,2605,3634,16,
+0,386,1,2470,3635,
+16,0,386,1,2513,
+1692,1,2551,1712,1,
+65,3636,19,440,1,
+65,3637,5,21,1,
+2553,3638,16,0,438,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3639,16,0,438,
+1,2536,1686,1,2464,
+963,1,2605,3640,16,
+0,438,1,2470,3641,
+16,0,438,1,2513,
+1692,1,2551,1712,1,
+66,3642,19,437,1,
+66,3643,5,21,1,
+2553,3644,16,0,435,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3645,16,0,435,
+1,2536,1686,1,2464,
+963,1,2605,3646,16,
+0,435,1,2470,3647,
+16,0,435,1,2513,
+1692,1,2551,1712,1,
+67,3648,19,434,1,
+67,3649,5,21,1,
+2553,3650,16,0,432,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3651,16,0,432,
+1,2536,1686,1,2464,
+963,1,2605,3652,16,
+0,432,1,2470,3653,
+16,0,432,1,2513,
+1692,1,2551,1712,1,
+68,3654,19,431,1,
+68,3655,5,21,1,
+2553,3656,16,0,429,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3657,16,0,429,
+1,2536,1686,1,2464,
+963,1,2605,3658,16,
+0,429,1,2470,3659,
+16,0,429,1,2513,
+1692,1,2551,1712,1,
+69,3660,19,367,1,
+69,3661,5,21,1,
+2553,3662,16,0,365,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3663,16,0,365,
+1,2536,1686,1,2464,
+963,1,2605,3664,16,
+0,365,1,2470,3665,
+16,0,365,1,2513,
+1692,1,2551,1712,1,
+70,3666,19,364,1,
+70,3667,5,21,1,
+2553,3668,16,0,362,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3669,16,0,362,
+1,2536,1686,1,2464,
+963,1,2605,3670,16,
+0,362,1,2470,3671,
+16,0,362,1,2513,
+1692,1,2551,1712,1,
+71,3672,19,361,1,
+71,3673,5,21,1,
+2553,3674,16,0,359,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3675,16,0,359,
+1,2536,1686,1,2464,
+963,1,2605,3676,16,
+0,359,1,2470,3677,
+16,0,359,1,2513,
+1692,1,2551,1712,1,
+72,3678,19,709,1,
+72,3679,5,21,1,
+2553,3680,16,0,707,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3681,16,0,707,
+1,2536,1686,1,2464,
+963,1,2605,3682,16,
+0,707,1,2470,3683,
+16,0,707,1,2513,
+1692,1,2551,1712,1,
+73,3684,19,427,1,
+73,3685,5,21,1,
+2553,3686,16,0,425,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3687,16,0,425,
+1,2536,1686,1,2464,
+963,1,2605,3688,16,
+0,425,1,2470,3689,
+16,0,425,1,2513,
+1692,1,2551,1712,1,
+74,3690,19,542,1,
+74,3691,5,21,1,
+2553,3692,16,0,540,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3693,16,0,540,
+1,2536,1686,1,2464,
+963,1,2605,3694,16,
+0,540,1,2470,3695,
+16,0,540,1,2513,
+1692,1,2551,1712,1,
+75,3696,19,532,1,
+75,3697,5,21,1,
+2553,3698,16,0,530,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3699,16,0,530,
+1,2536,1686,1,2464,
+963,1,2605,3700,16,
+0,530,1,2470,3701,
+16,0,530,1,2513,
+1692,1,2551,1712,1,
+76,3702,19,529,1,
+76,3703,5,21,1,
+2553,3704,16,0,527,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3705,16,0,527,
+1,2536,1686,1,2464,
+963,1,2605,3706,16,
+0,527,1,2470,3707,
+16,0,527,1,2513,
+1692,1,2551,1712,1,
+77,3708,19,526,1,
+77,3709,5,21,1,
+2553,3710,16,0,524,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3711,16,0,524,
+1,2536,1686,1,2464,
+963,1,2605,3712,16,
+0,524,1,2470,3713,
+16,0,524,1,2513,
+1692,1,2551,1712,1,
+78,3714,19,523,1,
+78,3715,5,21,1,
+2553,3716,16,0,521,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3717,16,0,521,
+1,2536,1686,1,2464,
+963,1,2605,3718,16,
+0,521,1,2470,3719,
+16,0,521,1,2513,
+1692,1,2551,1712,1,
+79,3720,19,407,1,
+79,3721,5,21,1,
+2553,3722,16,0,405,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3723,16,0,405,
+1,2536,1686,1,2464,
+963,1,2605,3724,16,
+0,405,1,2470,3725,
+16,0,405,1,2513,
+1692,1,2551,1712,1,
+80,3726,19,615,1,
+80,3727,5,21,1,
+2553,3728,16,0,613,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3729,16,0,613,
+1,2536,1686,1,2464,
+963,1,2605,3730,16,
+0,613,1,2470,3731,
+16,0,613,1,2513,
+1692,1,2551,1712,1,
+81,3732,19,385,1,
+81,3733,5,21,1,
+2553,3734,16,0,383,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3735,16,0,383,
+1,2536,1686,1,2464,
+963,1,2605,3736,16,
+0,383,1,2470,3737,
+16,0,383,1,2513,
+1692,1,2551,1712,1,
+82,3738,19,423,1,
+82,3739,5,21,1,
+2553,3740,16,0,421,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3741,16,0,421,
+1,2536,1686,1,2464,
+963,1,2605,3742,16,
+0,421,1,2470,3743,
+16,0,421,1,2513,
+1692,1,2551,1712,1,
+83,3744,19,382,1,
+83,3745,5,21,1,
+2553,3746,16,0,380,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3747,16,0,380,
+1,2536,1686,1,2464,
+963,1,2605,3748,16,
+0,380,1,2470,3749,
+16,0,380,1,2513,
+1692,1,2551,1712,1,
+84,3750,19,379,1,
+84,3751,5,21,1,
+2553,3752,16,0,377,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3753,16,0,377,
+1,2536,1686,1,2464,
+963,1,2605,3754,16,
+0,377,1,2470,3755,
+16,0,377,1,2513,
+1692,1,2551,1712,1,
+85,3756,19,535,1,
+85,3757,5,21,1,
+2553,3758,16,0,533,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3759,16,0,533,
+1,2536,1686,1,2464,
+963,1,2605,3760,16,
+0,533,1,2470,3761,
+16,0,533,1,2513,
+1692,1,2551,1712,1,
+86,3762,19,416,1,
+86,3763,5,21,1,
+2553,3764,16,0,414,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3765,16,0,414,
+1,2536,1686,1,2464,
+963,1,2605,3766,16,
+0,414,1,2470,3767,
+16,0,414,1,2513,
+1692,1,2551,1712,1,
+87,3768,19,404,1,
+87,3769,5,21,1,
+2553,3770,16,0,402,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3771,16,0,402,
+1,2536,1686,1,2464,
+963,1,2605,3772,16,
+0,402,1,2470,3773,
+16,0,402,1,2513,
+1692,1,2551,1712,1,
+88,3774,19,376,1,
+88,3775,5,21,1,
+2553,3776,16,0,374,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3777,16,0,374,
+1,2536,1686,1,2464,
+963,1,2605,3778,16,
+0,374,1,2470,3779,
+16,0,374,1,2513,
+1692,1,2551,1712,1,
+89,3780,19,370,1,
+89,3781,5,21,1,
+2553,3782,16,0,368,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3783,16,0,368,
+1,2536,1686,1,2464,
+963,1,2605,3784,16,
+0,368,1,2470,3785,
+16,0,368,1,2513,
+1692,1,2551,1712,1,
+90,3786,19,373,1,
+90,3787,5,21,1,
+2553,3788,16,0,371,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3789,16,0,371,
+1,2536,1686,1,2464,
+963,1,2605,3790,16,
+0,371,1,2470,3791,
+16,0,371,1,2513,
+1692,1,2551,1712,1,
+91,3792,19,420,1,
+91,3793,5,21,1,
+2553,3794,16,0,418,
+1,2596,1740,1,2593,
+1725,1,2594,1730,1,
+2595,1735,1,2522,1698,
+1,2597,1745,1,2599,
+1719,1,2600,1751,1,
+2601,1756,1,2602,1761,
+1,2603,1766,1,2531,
+1704,1,2459,946,1,
+2645,3795,16,0,418,
+1,2536,1686,1,2464,
+963,1,2605,3796,16,
+0,418,1,2470,3797,
+16,0,418,1,2513,
+1692,1,2551,1712,1,
+92,3798,19,133,1,
+92,3799,5,128,1,
+0,3800,16,0,674,
+1,1,2092,1,2,
+2098,1,3,2103,1,
+4,2108,1,5,2113,
+1,6,2118,1,7,
+2123,1,8,3801,16,
+0,131,1,1515,3802,
+16,0,168,1,2773,
+3403,1,2021,782,1,
+2022,3803,16,0,546,
+1,2525,3804,16,0,
+481,1,2025,3805,16,
+0,550,1,18,3806,
+16,0,138,1,2027,
+3807,16,0,554,1,
+2029,789,1,2030,795,
+1,2031,800,1,2032,
+805,1,256,3808,16,
+0,176,1,277,3809,
+16,0,176,1,2035,
+816,1,2037,821,1,
+2039,826,1,32,3810,
+16,0,168,1,2041,
+832,1,2293,3811,16,
+0,176,1,2043,838,
+1,2045,843,1,2715,
+3379,1,41,3812,16,
+0,176,1,1297,3813,
+16,0,168,1,43,
+3814,16,0,176,1,
+46,3815,16,0,181,
+1,1804,3816,16,0,
+168,1,299,3817,16,
+0,176,1,52,3818,
+16,0,168,1,509,
+3819,16,0,176,1,
+2318,3820,16,0,168,
+1,62,3821,16,0,
+202,1,65,3822,16,
+0,204,1,2075,3823,
+16,0,168,1,1574,
+863,1,2743,3367,1,
+71,3824,16,0,176,
+1,1775,3825,16,0,
+168,1,76,3826,16,
+0,176,1,1834,3827,
+16,0,168,1,2337,
+3828,16,0,168,1,
+79,3829,16,0,176,
+1,1335,3830,16,0,
+168,1,322,3831,16,
+0,176,1,85,3832,
+16,0,176,1,2516,
+3833,16,0,466,1,
+1261,3834,16,0,168,
+1,89,3835,16,0,
+176,1,2033,810,1,
+346,3836,16,0,176,
+1,97,3837,16,0,
+176,1,2106,3838,16,
+0,168,1,2774,3385,
+1,102,3839,16,0,
+176,1,2776,3361,1,
+1803,851,1,2364,891,
+1,1113,3840,16,0,
+161,1,112,3841,16,
+0,176,1,1117,3842,
+16,0,168,1,2775,
+3374,1,1873,899,1,
+1876,3843,16,0,168,
+1,372,3844,16,0,
+584,1,374,3845,16,
+0,586,1,124,3846,
+16,0,176,1,376,
+3847,16,0,588,1,
+378,3848,16,0,590,
+1,2136,906,1,2718,
+3849,16,0,176,1,
+381,3850,16,0,176,
+1,525,3851,16,0,
+176,1,137,3852,16,
+0,176,1,1901,3853,
+16,0,168,1,1153,
+3854,16,0,168,1,
+151,3855,16,0,176,
+1,1407,3856,16,0,
+168,1,1659,3857,16,
+0,168,1,2413,3858,
+16,0,168,1,406,
+3859,16,0,176,1,
+1371,3860,16,0,168,
+1,1860,885,1,2105,
+878,1,166,3861,16,
+0,176,1,1622,3862,
+16,0,176,1,1931,
+925,1,1933,3863,16,
+0,168,1,431,3864,
+16,0,176,1,1585,
+3865,16,0,176,1,
+182,3866,16,0,176,
+1,1189,3867,16,0,
+168,1,1443,3868,16,
+0,168,1,1695,3869,
+16,0,168,1,2198,
+3870,16,0,168,1,
+447,3871,16,0,176,
+1,2458,940,1,2459,
+946,1,1958,3872,16,
+0,168,1,2462,953,
+1,1657,958,1,2464,
+963,1,2466,3396,1,
+459,3873,16,0,176,
+1,2468,3874,16,0,
+357,1,462,3875,16,
+0,176,1,199,3876,
+16,0,176,1,217,
+3877,16,0,176,1,
+2227,972,1,1225,3878,
+16,0,168,1,1479,
+3879,16,0,168,1,
+1731,3880,16,0,176,
+1,1989,980,1,1990,
+3881,16,0,168,1,
+236,3882,16,0,176,
+1,2754,3390,1,2755,
+3883,16,0,674,1,
+2507,3884,16,0,452,
+1,1756,3885,16,0,
+168,1,93,3886,19,
+687,1,93,3887,5,
+95,1,256,3888,16,
+0,685,1,1261,3889,
+16,0,685,1,509,
+3890,16,0,685,1,
+1515,3891,16,0,685,
+1,2021,782,1,1775,
+3892,16,0,685,1,
+2029,789,1,2030,795,
+1,2031,800,1,2032,
+805,1,2033,810,1,
+277,3893,16,0,685,
+1,2035,816,1,2037,
+821,1,2039,826,1,
+32,3894,16,0,685,
+1,2041,832,1,2293,
+3895,16,0,685,1,
+2043,838,1,2045,843,
+1,41,3896,16,0,
+685,1,1297,3897,16,
+0,685,1,43,3898,
+16,0,685,1,1803,
+851,1,1804,3899,16,
+0,685,1,299,3900,
+16,0,685,1,52,
+3901,16,0,685,1,
+2318,3902,16,0,685,
+1,62,3903,16,0,
+685,1,2075,3904,16,
+0,685,1,1574,863,
+1,71,3905,16,0,
+685,1,76,3906,16,
+0,685,1,1834,3907,
+16,0,685,1,2337,
+3908,16,0,685,1,
+79,3909,16,0,685,
+1,1335,3910,16,0,
+685,1,322,3911,16,
+0,685,1,85,3912,
+16,0,685,1,89,
+3913,16,0,685,1,
+346,3914,16,0,685,
+1,2105,878,1,2106,
+3915,16,0,685,1,
+97,3916,16,0,685,
+1,1860,885,1,2364,
+891,1,102,3917,16,
+0,685,1,112,3918,
+16,0,685,1,1117,
+3919,16,0,685,1,
+1873,899,1,1876,3920,
+16,0,685,1,124,
+3921,16,0,685,1,
+2136,906,1,2718,3922,
+16,0,685,1,381,
+3923,16,0,685,1,
+525,3924,16,0,685,
+1,137,3925,16,0,
+685,1,1901,3926,16,
+0,685,1,1153,3927,
+16,0,685,1,151,
+3928,16,0,685,1,
+1407,3929,16,0,685,
+1,1659,3930,16,0,
+685,1,2413,3931,16,
+0,685,1,406,3932,
+16,0,685,1,1371,
+3933,16,0,685,1,
+166,3934,16,0,685,
+1,1622,3935,16,0,
+685,1,1931,925,1,
+1933,3936,16,0,685,
+1,431,3937,16,0,
+685,1,1585,3938,16,
+0,685,1,182,3939,
+16,0,685,1,1189,
+3940,16,0,685,1,
+1443,3941,16,0,685,
+1,1695,3942,16,0,
+685,1,2198,3943,16,
+0,685,1,447,3944,
+16,0,685,1,2458,
+940,1,2459,946,1,
+1958,3945,16,0,685,
+1,2462,953,1,1657,
+958,1,2464,963,1,
+199,3946,16,0,685,
+1,459,3947,16,0,
+685,1,462,3948,16,
+0,685,1,217,3949,
+16,0,685,1,2227,
+972,1,1225,3950,16,
+0,685,1,1479,3951,
+16,0,685,1,1731,
+3952,16,0,685,1,
+1989,980,1,1990,3953,
+16,0,685,1,236,
+3954,16,0,685,1,
+1756,3955,16,0,685,
+1,94,3956,19,684,
+1,94,3957,5,95,
+1,256,3958,16,0,
+682,1,1261,3959,16,
+0,682,1,509,3960,
+16,0,682,1,1515,
+3961,16,0,682,1,
+2021,782,1,1775,3962,
+16,0,682,1,2029,
+789,1,2030,795,1,
+2031,800,1,2032,805,
+1,2033,810,1,277,
+3963,16,0,682,1,
+2035,816,1,2037,821,
+1,2039,826,1,32,
+3964,16,0,682,1,
+2041,832,1,2293,3965,
+16,0,682,1,2043,
+838,1,2045,843,1,
+41,3966,16,0,682,
+1,1297,3967,16,0,
+682,1,43,3968,16,
+0,682,1,1803,851,
+1,1804,3969,16,0,
+682,1,299,3970,16,
+0,682,1,52,3971,
+16,0,682,1,2318,
+3972,16,0,682,1,
+62,3973,16,0,682,
+1,2075,3974,16,0,
+682,1,1574,863,1,
+71,3975,16,0,682,
+1,76,3976,16,0,
+682,1,1834,3977,16,
+0,682,1,2337,3978,
+16,0,682,1,79,
+3979,16,0,682,1,
+1335,3980,16,0,682,
+1,322,3981,16,0,
+682,1,85,3982,16,
+0,682,1,89,3983,
+16,0,682,1,346,
+3984,16,0,682,1,
+2105,878,1,2106,3985,
+16,0,682,1,97,
+3986,16,0,682,1,
+1860,885,1,2364,891,
+1,102,3987,16,0,
+682,1,112,3988,16,
+0,682,1,1117,3989,
+16,0,682,1,1873,
+899,1,1876,3990,16,
+0,682,1,124,3991,
+16,0,682,1,2136,
+906,1,2718,3992,16,
+0,682,1,381,3993,
+16,0,682,1,525,
+3994,16,0,682,1,
+137,3995,16,0,682,
+1,1901,3996,16,0,
+682,1,1153,3997,16,
+0,682,1,151,3998,
+16,0,682,1,1407,
+3999,16,0,682,1,
+1659,4000,16,0,682,
+1,2413,4001,16,0,
+682,1,406,4002,16,
+0,682,1,1371,4003,
+16,0,682,1,166,
+4004,16,0,682,1,
+1622,4005,16,0,682,
+1,1931,925,1,1933,
+4006,16,0,682,1,
+431,4007,16,0,682,
+1,1585,4008,16,0,
+682,1,182,4009,16,
+0,682,1,1189,4010,
+16,0,682,1,1443,
+4011,16,0,682,1,
+1695,4012,16,0,682,
+1,2198,4013,16,0,
+682,1,447,4014,16,
+0,682,1,2458,940,
+1,2459,946,1,1958,
+4015,16,0,682,1,
+2462,953,1,1657,958,
+1,2464,963,1,199,
+4016,16,0,682,1,
+459,4017,16,0,682,
+1,462,4018,16,0,
+682,1,217,4019,16,
+0,682,1,2227,972,
+1,1225,4020,16,0,
+682,1,1479,4021,16,
+0,682,1,1731,4022,
+16,0,682,1,1989,
+980,1,1990,4023,16,
+0,682,1,236,4024,
+16,0,682,1,1756,
+4025,16,0,682,1,
+95,4026,19,681,1,
+95,4027,5,95,1,
+256,4028,16,0,679,
+1,1261,4029,16,0,
+679,1,509,4030,16,
+0,679,1,1515,4031,
+16,0,679,1,2021,
+782,1,1775,4032,16,
+0,679,1,2029,789,
+1,2030,795,1,2031,
+800,1,2032,805,1,
+2033,810,1,277,4033,
+16,0,679,1,2035,
+816,1,2037,821,1,
+2039,826,1,32,4034,
+16,0,679,1,2041,
+832,1,2293,4035,16,
+0,679,1,2043,838,
+1,2045,843,1,41,
+4036,16,0,679,1,
+1297,4037,16,0,679,
+1,43,4038,16,0,
+679,1,1803,851,1,
+1804,4039,16,0,679,
+1,299,4040,16,0,
+679,1,52,4041,16,
+0,679,1,2318,4042,
+16,0,679,1,62,
+4043,16,0,679,1,
+2075,4044,16,0,679,
+1,1574,863,1,71,
+4045,16,0,679,1,
+76,4046,16,0,679,
+1,1834,4047,16,0,
+679,1,2337,4048,16,
+0,679,1,79,4049,
+16,0,679,1,1335,
+4050,16,0,679,1,
+322,4051,16,0,679,
+1,85,4052,16,0,
+679,1,89,4053,16,
+0,679,1,346,4054,
+16,0,679,1,2105,
+878,1,2106,4055,16,
+0,679,1,97,4056,
+16,0,679,1,1860,
+885,1,2364,891,1,
+102,4057,16,0,679,
+1,112,4058,16,0,
+679,1,1117,4059,16,
+0,679,1,1873,899,
+1,1876,4060,16,0,
+679,1,124,4061,16,
+0,679,1,2136,906,
+1,2718,4062,16,0,
+679,1,381,4063,16,
+0,679,1,525,4064,
+16,0,679,1,137,
+4065,16,0,679,1,
+1901,4066,16,0,679,
+1,1153,4067,16,0,
+679,1,151,4068,16,
+0,679,1,1407,4069,
+16,0,679,1,1659,
+4070,16,0,679,1,
+2413,4071,16,0,679,
+1,406,4072,16,0,
+679,1,1371,4073,16,
+0,679,1,166,4074,
+16,0,679,1,1622,
+4075,16,0,679,1,
+1931,925,1,1933,4076,
+16,0,679,1,431,
+4077,16,0,679,1,
+1585,4078,16,0,679,
+1,182,4079,16,0,
+679,1,1189,4080,16,
+0,679,1,1443,4081,
+16,0,679,1,1695,
+4082,16,0,679,1,
+2198,4083,16,0,679,
+1,447,4084,16,0,
+679,1,2458,940,1,
+2459,946,1,1958,4085,
+16,0,679,1,2462,
+953,1,1657,958,1,
+2464,963,1,199,4086,
+16,0,679,1,459,
+4087,16,0,679,1,
+462,4088,16,0,679,
+1,217,4089,16,0,
+679,1,2227,972,1,
+1225,4090,16,0,679,
+1,1479,4091,16,0,
+679,1,1731,4092,16,
+0,679,1,1989,980,
+1,1990,4093,16,0,
+679,1,236,4094,16,
+0,679,1,1756,4095,
+16,0,679,1,96,
+4096,19,103,1,96,
+4097,5,1,1,0,
+4098,16,0,104,1,
+97,4099,19,197,1,
+97,4100,5,1,1,
+0,4101,16,0,195,
+1,98,4102,19,305,
+1,98,4103,5,2,
+1,0,4104,16,0,
+303,1,2755,4105,16,
+0,731,1,99,4106,
+19,299,1,99,4107,
+5,2,1,0,4108,
+16,0,732,1,2755,
+4109,16,0,297,1,
+100,4110,19,516,1,
+100,4111,5,2,1,
+0,4112,16,0,667,
+1,2755,4113,16,0,
+514,1,101,4114,19,
+673,1,101,4115,5,
+4,1,0,4116,16,
+0,671,1,2696,4117,
+16,0,712,1,2766,
+4118,16,0,712,1,
+2755,4119,16,0,671,
+1,102,4120,19,151,
+1,102,4121,5,2,
+1,2470,4122,16,0,
+510,1,2605,4123,16,
+0,149,1,103,4124,
+19,654,1,103,4125,
+5,4,1,2553,4126,
+16,0,720,1,2645,
+4127,16,0,720,1,
+2470,4128,16,0,652,
+1,2605,4129,16,0,
+652,1,104,4130,19,
+645,1,104,4131,5,
+4,1,2553,4132,16,
+0,643,1,2645,4133,
+16,0,643,1,2470,
+4134,16,0,651,1,
+2605,4135,16,0,651,
+1,105,4136,19,500,
+1,105,4137,5,4,
+1,2553,4138,16,0,
+642,1,2645,4139,16,
+0,642,1,2470,4140,
+16,0,498,1,2605,
+4141,16,0,498,1,
+106,4142,19,641,1,
+106,4143,5,4,1,
+2553,4144,16,0,639,
+1,2645,4145,16,0,
+639,1,2470,4146,16,
+0,723,1,2605,4147,
+16,0,723,1,107,
+4148,19,343,1,107,
+4149,5,4,1,2553,
+4150,16,0,638,1,
+2645,4151,16,0,638,
+1,2470,4152,16,0,
+341,1,2605,4153,16,
+0,341,1,108,4154,
+19,141,1,108,4155,
+5,3,1,2702,4156,
+16,0,692,1,2538,
+4157,16,0,230,1,
+10,4158,16,0,139,
+1,109,4159,19,284,
+1,109,4160,5,1,
+1,2524,4161,16,0,
+282,1,110,4162,19,
+472,1,110,4163,5,
+1,1,2515,4164,16,
+0,470,1,111,4165,
+19,458,1,111,4166,
+5,1,1,2506,4167,
+16,0,456,1,112,
+4168,19,154,1,112,
+4169,5,17,1,0,
+4170,16,0,695,1,
+2702,4171,16,0,353,
+1,2075,4172,16,0,
+704,1,2337,4173,16,
+0,704,1,2413,4174,
+16,0,704,1,10,
+4175,16,0,353,1,
+1901,4176,16,0,704,
+1,2198,4177,16,0,
+704,1,2106,4178,16,
+0,704,1,2755,4179,
+16,0,695,1,21,
+4180,16,0,152,1,
+2538,4181,16,0,353,
+1,1804,4182,16,0,
+704,1,1990,4183,16,
+0,704,1,32,4184,
+16,0,704,1,1958,
+4185,16,0,704,1,
+1775,4186,16,0,704,
+1,113,4187,19,275,
+1,113,4188,5,1,
+1,2524,4189,16,0,
+273,1,114,4190,19,
+469,1,114,4191,5,
+1,1,2515,4192,16,
+0,467,1,115,4193,
+19,455,1,115,4194,
+5,1,1,2506,4195,
+16,0,453,1,116,
+4196,19,130,1,116,
+4197,5,18,1,0,
+4198,16,0,128,1,
+2702,4199,16,0,137,
+1,2075,4200,16,0,
+137,1,2337,4201,16,
+0,137,1,2413,4202,
+16,0,137,1,10,
+4203,16,0,137,1,
+2198,4204,16,0,137,
+1,1901,4205,16,0,
+137,1,52,4206,16,
+0,200,1,2106,4207,
+16,0,137,1,2755,
+4208,16,0,128,1,
+21,4209,16,0,137,
+1,2538,4210,16,0,
+137,1,1804,4211,16,
+0,137,1,1990,4212,
+16,0,137,1,32,
+4213,16,0,137,1,
+1958,4214,16,0,137,
+1,1775,4215,16,0,
+137,1,117,4216,19,
+604,1,117,4217,5,
+4,1,2553,4218,16,
+0,602,1,2645,4219,
+16,0,602,1,2470,
+4220,16,0,602,1,
+2605,4221,16,0,602,
+1,118,4222,19,490,
+1,118,4223,5,4,
+1,2553,4224,16,0,
+488,1,2645,4225,16,
+0,488,1,2470,4226,
+16,0,488,1,2605,
+4227,16,0,488,1,
+119,4228,19,478,1,
+119,4229,5,4,1,
+2553,4230,16,0,476,
+1,2645,4231,16,0,
+476,1,2470,4232,16,
+0,476,1,2605,4233,
+16,0,476,1,120,
+4234,19,463,1,120,
+4235,5,4,1,2553,
+4236,16,0,461,1,
+2645,4237,16,0,461,
+1,2470,4238,16,0,
+461,1,2605,4239,16,
+0,461,1,121,4240,
+19,715,1,121,4241,
+5,4,1,2553,4242,
+16,0,713,1,2645,
+4243,16,0,713,1,
+2470,4244,16,0,713,
+1,2605,4245,16,0,
+713,1,122,4246,19,
+352,1,122,4247,5,
+18,1,2075,4248,16,
+0,555,1,2520,4249,
+16,0,475,1,2337,
+4250,16,0,555,1,
+2413,4251,16,0,555,
+1,2511,4252,16,0,
+460,1,2713,4253,16,
+0,694,1,2529,4254,
+16,0,487,1,1901,
+4255,16,0,555,1,
+2198,4256,16,0,555,
+1,2534,4257,16,0,
+601,1,2106,4258,16,
+0,555,1,1804,4259,
+16,0,555,1,1990,
+4260,16,0,555,1,
+31,4261,16,0,350,
+1,32,4262,16,0,
+555,1,2549,4263,16,
+0,508,1,1958,4264,
+16,0,555,1,1775,
+4265,16,0,555,1,
+123,4266,19,315,1,
+123,4267,5,1,1,
+32,4268,16,0,313,
+1,124,4269,19,262,
+1,124,4270,5,11,
+1,2075,4271,16,0,
+625,1,2337,4272,16,
+0,266,1,2413,4273,
+16,0,493,1,1901,
+4274,16,0,408,1,
+2198,4275,16,0,332,
+1,2106,4276,16,0,
+666,1,1804,4277,16,
+0,292,1,1990,4278,
+16,0,543,1,32,
+4279,16,0,346,1,
+1958,4280,16,0,502,
+1,1775,4281,16,0,
+260,1,125,4282,19,
+631,1,125,4283,5,
+11,1,2075,4284,16,
+0,629,1,2337,4285,
+16,0,629,1,2413,
+4286,16,0,629,1,
+1901,4287,16,0,629,
+1,2198,4288,16,0,
+629,1,2106,4289,16,
+0,629,1,1804,4290,
+16,0,629,1,1990,
+4291,16,0,629,1,
+32,4292,16,0,629,
+1,1958,4293,16,0,
+629,1,1775,4294,16,
+0,629,1,126,4295,
+19,701,1,126,4296,
+5,11,1,2075,4297,
+16,0,699,1,2337,
+4298,16,0,699,1,
+2413,4299,16,0,699,
+1,1901,4300,16,0,
+699,1,2198,4301,16,
+0,699,1,2106,4302,
+16,0,699,1,1804,
+4303,16,0,699,1,
+1990,4304,16,0,699,
+1,32,4305,16,0,
+699,1,1958,4306,16,
+0,699,1,1775,4307,
+16,0,699,1,127,
+4308,19,164,1,127,
+4309,5,31,1,1901,
+4310,16,0,703,1,
+1479,4311,16,0,605,
+1,2075,4312,16,0,
+703,1,1695,4313,16,
+0,198,1,1756,4314,
+16,0,191,1,2413,
+4315,16,0,703,1,
+2198,4316,16,0,703,
+1,1876,4317,16,0,
+717,1,1659,4318,16,
+0,191,1,1443,4319,
+16,0,571,1,1117,
+4320,16,0,162,1,
+1990,4321,16,0,703,
+1,1189,4322,16,0,
+245,1,1775,4323,16,
+0,703,1,32,4324,
+16,0,703,1,2106,
+4325,16,0,703,1,
+1515,4326,16,0,627,
+1,2337,4327,16,0,
+703,1,52,4328,16,
+0,647,1,1804,4329,
+16,0,703,1,1261,
+4330,16,0,309,1,
+1153,4331,16,0,252,
+1,1225,4332,16,0,
+278,1,1335,4333,16,
+0,485,1,1933,4334,
+16,0,608,1,1834,
+4335,16,0,325,1,
+1297,4336,16,0,336,
+1,1407,4337,16,0,
+619,1,2318,4338,16,
+0,191,1,1958,4339,
+16,0,703,1,1371,
+4340,16,0,473,1,
+128,4341,19,580,1,
+128,4342,5,11,1,
+2075,4343,16,0,578,
+1,2337,4344,16,0,
+578,1,2413,4345,16,
+0,578,1,1901,4346,
+16,0,578,1,2198,
+4347,16,0,578,1,
+2106,4348,16,0,578,
+1,1804,4349,16,0,
+578,1,1990,4350,16,
+0,578,1,32,4351,
+16,0,578,1,1958,
+4352,16,0,578,1,
+1775,4353,16,0,578,
+1,129,4354,19,576,
+1,129,4355,5,11,
+1,2075,4356,16,0,
+574,1,2337,4357,16,
+0,574,1,2413,4358,
+16,0,574,1,1901,
+4359,16,0,574,1,
+2198,4360,16,0,574,
+1,2106,4361,16,0,
+574,1,1804,4362,16,
+0,574,1,1990,4363,
+16,0,574,1,32,
+4364,16,0,574,1,
+1958,4365,16,0,574,
+1,1775,4366,16,0,
+574,1,130,4367,19,
+623,1,130,4368,5,
+11,1,2075,4369,16,
+0,621,1,2337,4370,
+16,0,621,1,2413,
+4371,16,0,621,1,
+1901,4372,16,0,621,
+1,2198,4373,16,0,
+621,1,2106,4374,16,
+0,621,1,1804,4375,
+16,0,621,1,1990,
+4376,16,0,621,1,
+32,4377,16,0,621,
+1,1958,4378,16,0,
+621,1,1775,4379,16,
+0,621,1,131,4380,
+19,570,1,131,4381,
+5,11,1,2075,4382,
+16,0,568,1,2337,
+4383,16,0,568,1,
+2413,4384,16,0,568,
+1,1901,4385,16,0,
+568,1,2198,4386,16,
+0,568,1,2106,4387,
+16,0,568,1,1804,
+4388,16,0,568,1,
+1990,4389,16,0,568,
+1,32,4390,16,0,
+568,1,1958,4391,16,
+0,568,1,1775,4392,
+16,0,568,1,132,
+4393,19,567,1,132,
+4394,5,11,1,2075,
+4395,16,0,565,1,
+2337,4396,16,0,565,
+1,2413,4397,16,0,
+565,1,1901,4398,16,
+0,565,1,2198,4399,
+16,0,565,1,2106,
+4400,16,0,565,1,
+1804,4401,16,0,565,
+1,1990,4402,16,0,
+565,1,32,4403,16,
+0,565,1,1958,4404,
+16,0,565,1,1775,
+4405,16,0,565,1,
+133,4406,19,564,1,
+133,4407,5,11,1,
+2075,4408,16,0,562,
+1,2337,4409,16,0,
+562,1,2413,4410,16,
+0,562,1,1901,4411,
+16,0,562,1,2198,
+4412,16,0,562,1,
+2106,4413,16,0,562,
+1,1804,4414,16,0,
+562,1,1990,4415,16,
+0,562,1,32,4416,
+16,0,562,1,1958,
+4417,16,0,562,1,
+1775,4418,16,0,562,
+1,134,4419,19,561,
+1,134,4420,5,11,
+1,2075,4421,16,0,
+559,1,2337,4422,16,
+0,559,1,2413,4423,
+16,0,559,1,1901,
+4424,16,0,559,1,
+2198,4425,16,0,559,
+1,2106,4426,16,0,
+559,1,1804,4427,16,
+0,559,1,1990,4428,
+16,0,559,1,32,
+4429,16,0,559,1,
+1958,4430,16,0,559,
+1,1775,4431,16,0,
+559,1,135,4432,19,
+558,1,135,4433,5,
+11,1,2075,4434,16,
+0,556,1,2337,4435,
+16,0,556,1,2413,
+4436,16,0,556,1,
+1901,4437,16,0,556,
+1,2198,4438,16,0,
+556,1,2106,4439,16,
+0,556,1,1804,4440,
+16,0,556,1,1990,
+4441,16,0,556,1,
+32,4442,16,0,556,
+1,1958,4443,16,0,
+556,1,1775,4444,16,
+0,556,1,136,4445,
+19,147,1,136,4446,
+5,3,1,1756,4447,
+16,0,291,1,2318,
+4448,16,0,308,1,
+1659,4449,16,0,145,
+1,137,4450,19,597,
+1,137,4451,5,68,
+1,1901,4452,16,0,
+595,1,1479,4453,16,
+0,595,1,112,4454,
+16,0,595,1,2293,
+4455,16,0,595,1,
+1804,4456,16,0,595,
+1,431,4457,16,0,
+595,1,1443,4458,16,
+0,595,1,1756,4459,
+16,0,595,1,124,
+4460,16,0,595,1,
+525,4461,16,0,595,
+1,236,4462,16,0,
+595,1,346,4463,16,
+0,595,1,1876,4464,
+16,0,595,1,1659,
+4465,16,0,595,1,
+1225,4466,16,0,595,
+1,1117,4467,16,0,
+595,1,137,4468,16,
+0,595,1,2318,4469,
+16,0,595,1,1775,
+4470,16,0,595,1,
+32,4471,16,0,595,
+1,2718,4472,16,0,
+595,1,1407,4473,16,
+0,595,1,256,4474,
+16,0,595,1,459,
+4475,16,0,595,1,
+406,4476,16,0,595,
+1,41,4477,16,0,
+595,1,151,4478,16,
+0,595,1,43,4479,
+16,0,595,1,1585,
+4480,16,0,595,1,
+1990,4481,16,0,595,
+1,2337,4482,16,0,
+595,1,509,4483,16,
+0,595,1,52,4484,
+16,0,595,1,381,
+4485,16,0,595,1,
+447,4486,16,0,595,
+1,166,4487,16,0,
+595,1,462,4488,16,
+0,595,1,277,4489,
+16,0,595,1,1695,
+4490,16,0,595,1,
+62,4491,16,0,635,
+1,1153,4492,16,0,
+595,1,2106,4493,16,
+0,595,1,1335,4494,
+16,0,595,1,71,
+4495,16,0,595,1,
+182,4496,16,0,595,
+1,76,4497,16,0,
+595,1,79,4498,16,
+0,595,1,1933,4499,
+16,0,595,1,299,
+4500,16,0,595,1,
+85,4501,16,0,595,
+1,1515,4502,16,0,
+595,1,2198,4503,16,
+0,595,1,89,4504,
+16,0,595,1,1834,
+4505,16,0,595,1,
+1622,4506,16,0,595,
+1,2413,4507,16,0,
+595,1,2075,4508,16,
+0,595,1,1731,4509,
+16,0,595,1,97,
+4510,16,0,595,1,
+1297,4511,16,0,595,
+1,1189,4512,16,0,
+595,1,102,4513,16,
+0,595,1,1261,4514,
+16,0,595,1,322,
+4515,16,0,595,1,
+1958,4516,16,0,595,
+1,199,4517,16,0,
+595,1,1371,4518,16,
+0,595,1,217,4519,
+16,0,595,1,138,
+4520,19,661,1,138,
+4521,5,2,1,459,
+4522,16,0,659,1,
+41,4523,16,0,722,
+1,139,4524,19,665,
+1,139,4525,5,3,
+1,462,4526,16,0,
+663,1,459,4527,16,
+0,691,1,41,4528,
+16,0,691,1,140,
+4529,19,4530,4,36,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,1,140,4525,1,
+141,4531,19,593,1,
+141,4532,5,68,1,
+1901,4533,16,0,591,
+1,1479,4534,16,0,
+591,1,112,4535,16,
+0,591,1,2293,4536,
+16,0,591,1,1804,
+4537,16,0,591,1,
+431,4538,16,0,591,
+1,1443,4539,16,0,
+591,1,1756,4540,16,
+0,591,1,124,4541,
+16,0,591,1,525,
+4542,16,0,591,1,
+236,4543,16,0,591,
+1,346,4544,16,0,
+591,1,1876,4545,16,
+0,591,1,1659,4546,
+16,0,591,1,1225,
+4547,16,0,591,1,
+1117,4548,16,0,591,
+1,137,4549,16,0,
+591,1,2318,4550,16,
+0,591,1,1775,4551,
+16,0,591,1,32,
+4552,16,0,591,1,
+2718,4553,16,0,591,
+1,1407,4554,16,0,
+591,1,256,4555,16,
+0,591,1,459,4556,
+16,0,591,1,406,
+4557,16,0,591,1,
+41,4558,16,0,591,
+1,151,4559,16,0,
+591,1,43,4560,16,
+0,591,1,1585,4561,
+16,0,591,1,1990,
+4562,16,0,591,1,
+2337,4563,16,0,591,
+1,509,4564,16,0,
+591,1,52,4565,16,
+0,591,1,381,4566,
+16,0,591,1,447,
+4567,16,0,591,1,
+166,4568,16,0,591,
+1,462,4569,16,0,
+591,1,277,4570,16,
+0,591,1,1695,4571,
+16,0,591,1,62,
+4572,16,0,636,1,
+1153,4573,16,0,591,
+1,2106,4574,16,0,
+591,1,1335,4575,16,
+0,591,1,71,4576,
+16,0,591,1,182,
+4577,16,0,591,1,
+76,4578,16,0,591,
+1,79,4579,16,0,
+591,1,1933,4580,16,
+0,591,1,299,4581,
+16,0,591,1,85,
+4582,16,0,591,1,
+1515,4583,16,0,591,
+1,2198,4584,16,0,
+591,1,89,4585,16,
+0,591,1,1834,4586,
+16,0,591,1,1622,
+4587,16,0,591,1,
+2413,4588,16,0,591,
+1,2075,4589,16,0,
+591,1,1731,4590,16,
+0,591,1,97,4591,
+16,0,591,1,1297,
+4592,16,0,591,1,
+1189,4593,16,0,591,
+1,102,4594,16,0,
+591,1,1261,4595,16,
+0,591,1,322,4596,
+16,0,591,1,1958,
+4597,16,0,591,1,
+199,4598,16,0,591,
+1,1371,4599,16,0,
+591,1,217,4600,16,
+0,591,1,142,4601,
+19,4602,4,28,86,
+0,101,0,99,0,
+116,0,111,0,114,
+0,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,1,142,4532,
+1,143,4603,19,4604,
+4,32,82,0,111,
+0,116,0,97,0,
+116,0,105,0,111,
+0,110,0,67,0,
 111,0,110,0,115,
 0,116,0,97,0,
 110,0,116,0,1,
-138,4461,1,139,4532,
-19,4533,4,32,82,
-0,111,0,116,0,
-97,0,116,0,105,
-0,111,0,110,0,
+143,4532,1,144,4605,
+19,4606,4,24,76,
+0,105,0,115,0,
+116,0,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
+0,116,0,1,144,
+4532,1,145,4607,19,
+172,1,145,4608,5,
+67,1,1901,4609,16,
+0,633,1,1479,4610,
+16,0,582,1,112,
+4611,16,0,254,1,
+2293,4612,16,0,277,
+1,1804,4613,16,0,
+633,1,431,4614,16,
+0,628,1,1443,4615,
+16,0,517,1,1756,
+4616,16,0,737,1,
+124,4617,16,0,259,
+1,525,4618,16,0,
+318,1,236,4619,16,
+0,358,1,346,4620,
+16,0,545,1,1876,
+4621,16,0,331,1,
+1659,4622,16,0,737,
+1,1225,4623,16,0,
+253,1,1117,4624,16,
+0,226,1,137,4625,
+16,0,276,1,2318,
+4626,16,0,737,1,
+1775,4627,16,0,633,
+1,32,4628,16,0,
+633,1,2718,4629,16,
+0,698,1,1407,4630,
+16,0,536,1,256,
+4631,16,0,412,1,
+459,4632,16,0,170,
+1,406,4633,16,0,
+612,1,41,4634,16,
+0,170,1,151,4635,
+16,0,290,1,43,
+4636,16,0,697,1,
+1990,4637,16,0,633,
+1,2337,4638,16,0,
+633,1,509,4639,16,
+0,711,1,52,4640,
+16,0,649,1,381,
+4641,16,0,600,1,
+447,4642,16,0,318,
+1,166,4643,16,0,
+307,1,462,4644,16,
+0,170,1,277,4645,
+16,0,459,1,1695,
+4646,16,0,271,1,
+1261,4647,16,0,289,
+1,1153,4648,16,0,
+177,1,2106,4649,16,
+0,633,1,1335,4650,
+16,0,340,1,71,
+4651,16,0,210,1,
+182,4652,16,0,318,
+1,76,4653,16,0,
+598,1,79,4654,16,
+0,225,1,1933,4655,
+16,0,424,1,299,
+4656,16,0,491,1,
+85,4657,16,0,511,
+1,1515,4658,16,0,
+611,1,2198,4659,16,
+0,633,1,89,4660,
+16,0,235,1,1834,
+4661,16,0,306,1,
+1622,4662,16,0,710,
+1,2413,4663,16,0,
+633,1,2075,4664,16,
+0,633,1,1731,4665,
+16,0,255,1,97,
+4666,16,0,428,1,
+1297,4667,16,0,345,
+1,1189,4668,16,0,
+224,1,102,4669,16,
+0,243,1,1585,4670,
+16,0,719,1,322,
+4671,16,0,512,1,
+1958,4672,16,0,633,
+1,199,4673,16,0,
+329,1,1371,4674,16,
+0,413,1,217,4675,
+16,0,339,1,146,
+4676,19,4677,4,36,
 67,0,111,0,110,
 0,115,0,116,0,
 97,0,110,0,116,
-0,1,139,4461,1,
-140,4534,19,4535,4,
-24,76,0,105,0,
-115,0,116,0,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-1,140,4461,1,141,
-4536,19,169,1,141,
-4537,5,67,1,1901,
-4538,16,0,617,1,
-1479,4539,16,0,571,
-1,112,4540,16,0,
-250,1,2293,4541,16,
-0,275,1,1804,4542,
-16,0,617,1,431,
-4543,16,0,611,1,
-1443,4544,16,0,506,
-1,1756,4545,16,0,
-719,1,124,4546,16,
-0,256,1,525,4547,
-16,0,315,1,236,
-4548,16,0,355,1,
-346,4549,16,0,534,
-1,1876,4550,16,0,
-328,1,1659,4551,16,
-0,719,1,1225,4552,
-16,0,249,1,1117,
-4553,16,0,219,1,
-137,4554,16,0,274,
-1,2318,4555,16,0,
-719,1,1775,4556,16,
-0,617,1,32,4557,
-16,0,617,1,1407,
-4558,16,0,525,1,
-256,4559,16,0,409,
-1,459,4560,16,0,
-167,1,406,4561,16,
-0,595,1,41,4562,
-16,0,167,1,151,
-4563,16,0,293,1,
-43,4564,16,0,669,
-1,1990,4565,16,0,
-617,1,2337,4566,16,
-0,617,1,509,4567,
-16,0,686,1,52,
-4568,16,0,629,1,
-381,4569,16,0,588,
-1,447,4570,16,0,
-315,1,166,4571,16,
-0,304,1,462,4572,
-16,0,167,1,277,
-4573,16,0,456,1,
-1695,4574,16,0,271,
-1,1261,4575,16,0,
-292,1,1153,4576,16,
-0,174,1,2106,4577,
-16,0,617,1,1335,
-4578,16,0,342,1,
-71,4579,16,0,203,
-1,182,4580,16,0,
-315,1,76,4581,16,
-0,587,1,79,4582,
-16,0,218,1,1933,
-4583,16,0,421,1,
-299,4584,16,0,483,
-1,85,4585,16,0,
-502,1,2702,4586,16,
-0,231,1,1515,4587,
-16,0,594,1,2198,
-4588,16,0,617,1,
-89,4589,16,0,230,
-1,1834,4590,16,0,
-303,1,1622,4591,16,
-0,685,1,2413,4592,
-16,0,617,1,2075,
-4593,16,0,617,1,
-1731,4594,16,0,251,
-1,97,4595,16,0,
-425,1,1297,4596,16,
-0,344,1,1189,4597,
-16,0,217,1,102,
-4598,16,0,239,1,
-1585,4599,16,0,698,
-1,322,4600,16,0,
-504,1,1958,4601,16,
-0,617,1,199,4602,
-16,0,326,1,1371,
-4603,16,0,410,1,
-217,4604,16,0,341,
-1,142,4605,19,4606,
-4,36,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,69,0,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,1,146,4608,1,
+147,4678,19,4679,4,
+30,73,0,100,0,
+101,0,110,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,1,147,4608,1,
+148,4680,19,4681,4,
+36,73,0,100,0,
+101,0,110,0,116,
+0,68,0,111,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,148,4608,
+1,149,4682,19,4683,
+4,44,70,0,117,
+0,110,0,99,0,
+116,0,105,0,111,
+0,110,0,67,0,
+97,0,108,0,108,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,1,149,4608,1,
+150,4684,19,4685,4,
+32,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
-0,110,0,1,142,
-4537,1,143,4607,19,
-4608,4,30,73,0,
-100,0,101,0,110,
-0,116,0,69,0,
+0,110,0,1,150,
+4608,1,151,4686,19,
+4687,4,30,85,0,
+110,0,97,0,114,
+0,121,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
-0,110,0,1,143,
-4537,1,144,4609,19,
-4610,4,36,73,0,
-100,0,101,0,110,
-0,116,0,68,0,
-111,0,116,0,69,
+0,110,0,1,151,
+4608,1,152,4688,19,
+4689,4,36,84,0,
+121,0,112,0,101,
+0,99,0,97,0,
+115,0,116,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,1,
-144,4537,1,145,4611,
-19,4612,4,44,70,
-0,117,0,110,0,
-99,0,116,0,105,
-0,111,0,110,0,
-67,0,97,0,108,
-0,108,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,145,
-4537,1,146,4613,19,
-4614,4,32,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-1,146,4537,1,147,
-4615,19,4616,4,30,
-85,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-1,147,4537,1,148,
-4617,19,4618,4,36,
-84,0,121,0,112,
-0,101,0,99,0,
-97,0,115,0,116,
+152,4608,1,153,4690,
+19,4691,4,42,80,
+0,97,0,114,0,
+101,0,110,0,116,
+0,104,0,101,0,
+115,0,105,0,115,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,1,148,4537,1,
-149,4619,19,4620,4,
-42,80,0,97,0,
-114,0,101,0,110,
-0,116,0,104,0,
-101,0,115,0,105,
-0,115,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,149,
-4537,1,150,4621,19,
-4622,4,56,73,0,
-110,0,99,0,114,
-0,101,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
+0,1,153,4608,1,
+154,4692,19,4693,4,
+56,73,0,110,0,
 99,0,114,0,101,
 0,109,0,101,0,
-110,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,1,
-150,4537,1,152,4623,
-19,729,1,152,4045,
-1,153,4624,19,751,
-1,153,4045,1,154,
-4625,19,3315,1,154,
-4048,1,155,4626,19,
-3334,1,155,4048,1,
-156,4627,19,3339,1,
-156,4048,1,157,4628,
-19,3329,1,157,4048,
-1,158,4629,19,3323,
-1,158,4051,1,159,
-4630,19,3350,1,159,
-4051,1,160,4631,19,
-3356,1,160,4055,1,
-161,4632,19,3345,1,
-161,4055,1,162,4633,
-19,746,1,162,4059,
-1,163,4634,19,756,
-1,163,4059,1,164,
-4635,19,735,1,164,
-4063,1,165,4636,19,
-740,1,165,4063,1,
-166,4637,19,1733,1,
-166,4069,1,167,4638,
-19,1708,1,167,4069,
-1,168,4639,19,1728,
-1,168,4069,1,169,
-4640,19,1703,1,169,
-4069,1,170,4641,19,
-1723,1,170,4069,1,
-171,4642,19,1698,1,
-171,4069,1,172,4643,
-19,1718,1,172,4069,
-1,173,4644,19,1713,
-1,173,4069,1,174,
-4645,19,1691,1,174,
-4073,1,175,4646,19,
-1684,1,175,4079,1,
-176,4647,19,1677,1,
-176,4085,1,177,4648,
-19,1671,1,177,4091,
-1,178,4649,19,1774,
-1,178,4097,1,179,
-4650,19,1748,1,179,
-4097,1,180,4651,19,
-2095,1,180,4102,1,
-181,4652,19,2131,1,
-181,4105,1,182,4653,
-19,1163,1,182,4108,
-1,183,4654,19,2110,
-1,183,4127,1,184,
-4655,19,2125,1,184,
-4130,1,185,4656,19,
-948,1,185,4177,1,
-186,4657,19,932,1,
-186,4177,1,187,4658,
-19,938,1,187,4196,
-1,188,4659,19,926,
-1,188,4196,1,189,
-4660,19,1191,1,189,
-4212,1,190,4661,19,
-828,1,190,4199,1,
-191,4662,19,943,1,
-191,4199,1,192,4663,
-19,823,1,192,4199,
-1,193,4664,19,848,
-1,193,4199,1,194,
-4665,19,817,1,194,
-4199,1,195,4666,19,
-811,1,195,4199,1,
-196,4667,19,806,1,
-196,4199,1,197,4668,
-19,801,1,197,4199,
-1,198,4669,19,795,
-1,198,4199,1,199,
-4670,19,790,1,199,
-4199,1,200,4671,19,
-785,1,200,4199,1,
-201,4672,19,780,1,
-201,4199,1,202,4673,
-19,775,1,202,4199,
-1,203,4674,19,1198,
-1,203,4284,1,204,
-4675,19,1336,1,204,
-4297,1,205,4676,19,
-1185,1,205,4310,1,
-206,4677,19,1324,1,
-206,4310,1,207,4678,
-19,965,1,207,4323,
-1,208,4679,19,768,
-1,208,4323,1,209,
-4680,19,863,1,209,
-4323,1,210,4681,19,
-891,1,210,4323,1,
-211,4682,19,910,1,
-211,4336,1,212,4683,
-19,957,1,212,4336,
-1,213,4684,19,871,
-1,213,4349,1,214,
-4685,19,884,1,214,
-4349,1,215,4686,19,
-837,1,215,4362,1,
-216,4687,19,876,1,
-216,4362,1,217,4688,
-19,1523,1,217,4375,
-1,218,4689,19,1204,
-1,218,4375,1,219,
-4690,19,1555,1,219,
-4375,1,220,4691,19,
-1588,1,220,4375,1,
-221,4692,19,1448,1,
-221,4225,1,222,4693,
-19,1512,1,222,4225,
-1,223,4694,19,1179,
-1,223,4238,1,224,
-4695,19,1620,1,224,
-4238,1,225,4696,19,
-1550,1,225,4238,1,
-226,4697,19,1497,1,
-226,4238,1,227,4698,
-19,1416,1,227,4238,
-1,228,4699,19,1346,
-1,228,4238,1,229,
-4700,19,1356,1,229,
-4238,1,230,4701,19,
-1174,1,230,4238,1,
-231,4702,19,1604,1,
-231,4238,1,232,4703,
-19,1545,1,232,4238,
-1,233,4704,19,1487,
-1,233,4238,1,234,
-4705,19,1405,1,234,
-4238,1,235,4706,19,
-1372,1,235,4238,1,
-236,4707,19,1157,1,
-236,4238,1,237,4708,
-19,1507,1,237,4238,
-1,238,4709,19,1533,
-1,238,4238,1,239,
-4710,19,1480,1,239,
-4238,1,240,4711,19,
-1502,1,240,4238,1,
-241,4712,19,1312,1,
-241,4238,1,242,4713,
-19,1216,1,242,4238,
-1,243,4714,19,1146,
-1,243,4238,1,244,
-4715,19,1578,1,244,
-4238,1,245,4716,19,
-1528,1,245,4238,1,
-246,4717,19,1475,1,
-246,4238,1,247,4718,
-19,1341,1,247,4271,
-1,248,4719,19,1319,
-1,248,4271,1,249,
-4720,19,1609,1,249,
-4461,1,250,4721,19,
-1632,1,250,4461,1,
-251,4722,19,1599,1,
-251,4461,1,252,4723,
-19,1594,1,252,4461,
-1,253,4724,19,1615,
-1,253,4461,1,254,
-4725,19,1561,1,254,
-4461,1,255,4726,19,
-1266,1,255,4461,1,
-256,4727,19,1437,1,
-256,4537,1,257,4728,
-19,1227,1,257,4537,
-1,258,4729,19,1234,
-1,258,4537,1,259,
-4730,19,1255,1,259,
-4537,1,260,4731,19,
-1250,1,260,4537,1,
-261,4732,19,1245,1,
-261,4537,1,262,4733,
-19,1240,1,262,4537,
-1,263,4734,19,1426,
-1,263,4537,1,264,
-4735,19,1454,1,264,
-4537,1,265,4736,19,
-1431,1,265,4537,1,
-266,4737,19,1421,1,
-266,4537,1,267,4738,
-19,1411,1,267,4537,
-1,268,4739,19,1394,
-1,268,4537,1,269,
-4740,19,1351,1,269,
-4537,1,270,4741,19,
-1260,1,270,4537,1,
-271,4742,19,1221,1,
-271,4537,1,272,4743,
-19,1169,1,272,4537,
-1,273,4744,19,1627,
-1,273,4537,1,274,
-4745,19,1583,1,274,
-4537,1,275,4746,19,
-1573,1,275,4537,1,
-276,4747,19,1568,1,
-276,4537,1,277,4748,
-19,1518,1,277,4537,
-1,278,4749,19,1492,
-1,278,4537,1,279,
-4750,19,1464,1,279,
-4537,1,280,4751,19,
-1459,1,280,4537,1,
-281,4752,19,1400,1,
-281,4537,1,282,4753,
-19,1380,1,282,4537,
-1,283,4754,19,1442,
-1,283,4537,1,284,
-4755,19,1539,1,284,
-4537,1,285,4756,19,
-1470,1,285,4537,1,
-286,4757,19,1387,1,
-286,4537,1,287,4758,
-19,1367,1,287,4537,
-1,288,4759,19,1330,
-1,288,4537,1,289,
-4760,19,1307,1,289,
-4537,1,290,4761,19,
-1152,1,290,4537,1,
-291,4762,19,1642,1,
-291,4537,1,292,4763,
-19,1272,1,292,4537,
-1,293,4764,19,1277,
-1,293,4537,1,294,
-4765,19,1297,1,294,
-4537,1,295,4766,19,
-1287,1,295,4537,1,
-296,4767,19,1292,1,
-296,4537,1,297,4768,
-19,1282,1,297,4537,
-1,298,4769,19,1637,
-1,298,4537,1,299,
-4770,19,1302,1,299,
-4537,1,300,4771,19,
-1362,1,300,4380,1,
-301,4772,19,1787,1,
-301,4450,1,302,4773,
-19,1780,1,302,4450,
-1,303,4774,19,1758,
-1,303,4454,1,304,
-4775,19,2089,1,304,
-4133,1,305,4776,19,
-2084,1,305,4133,1,
-306,4777,19,2079,1,
-306,4133,1,307,4778,
-19,2074,1,307,4133,
-1,308,4779,19,2069,
-1,308,4133,1,309,
-4780,19,2064,1,309,
-4133,1,310,4781,19,
-2059,1,310,4133,1,
-311,4782,19,2047,1,
-311,4153,1,312,4783,
-19,2042,1,312,4153,
-1,313,4784,19,2037,
-1,313,4153,1,314,
-4785,19,2032,1,314,
-4153,1,315,4786,19,
-2027,1,315,4153,1,
-316,4787,19,2022,1,
-316,4153,1,317,4788,
-19,2017,1,317,4153,
-1,318,4789,19,2012,
-1,318,4153,1,319,
-4790,19,2007,1,319,
-4153,1,320,4791,19,
-1840,1,320,4153,1,
-321,4792,19,2001,1,
-321,4153,1,322,4793,
-19,1996,1,322,4153,
-1,323,4794,19,1991,
-1,323,4153,1,324,
-4795,19,1832,1,324,
-4159,1,325,4796,19,
-1986,1,325,4159,1,
-326,4797,19,1981,1,
-326,4159,1,327,4798,
-19,1976,1,327,4159,
-1,328,4799,19,1971,
-1,328,4159,1,329,
-4800,19,1966,1,329,
-4159,1,330,4801,19,
-1961,1,330,4159,1,
-331,4802,19,1825,1,
-331,4159,1,332,4803,
-19,1955,1,332,4165,
-1,333,4804,19,1950,
-1,333,4165,1,334,
-4805,19,1945,1,334,
-4165,1,335,4806,19,
-1818,1,335,4165,1,
-336,4807,19,1939,1,
-336,4165,1,337,4808,
-19,1870,1,337,4165,
-1,338,4809,19,1934,
-1,338,4165,1,339,
-4810,19,1929,1,339,
-4165,1,340,4811,19,
-1924,1,340,4165,1,
-341,4812,19,1919,1,
-341,4165,1,342,4813,
-19,1914,1,342,4171,
-1,343,4814,19,1909,
-1,343,4171,1,344,
-4815,19,1904,1,344,
-4171,1,345,4816,19,
-4817,4,50,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
 110,0,116,0,68,
 0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,95,
-0,51,0,1,345,
-4097,1,346,4818,19,
-4819,4,28,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,76,
-0,105,0,115,0,
-116,0,95,0,51,
-0,1,346,4450,1,
-347,4820,19,4821,4,
-50,65,0,114,0,
-103,0,117,0,109,
+114,0,101,0,109,
 0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,76,
-0,105,0,115,0,
-116,0,95,0,52,
-0,1,347,4097,1,
-348,4822,19,4823,4,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,154,4608,
+1,156,4694,19,769,
+1,156,4097,1,157,
+4695,19,753,1,157,
+4097,1,158,4696,19,
+3365,1,158,4100,1,
+159,4697,19,3388,1,
+159,4100,1,160,4698,
+19,3377,1,160,4100,
+1,161,4699,19,3406,
+1,161,4100,1,162,
+4700,19,3393,1,162,
+4103,1,163,4701,19,
+3371,1,163,4103,1,
+164,4702,19,3383,1,
+164,4107,1,165,4703,
+19,3399,1,165,4107,
+1,166,4704,19,747,
+1,166,4111,1,167,
+4705,19,764,1,167,
+4111,1,168,4706,19,
+774,1,168,4115,1,
+169,4707,19,759,1,
+169,4115,1,170,4708,
+19,1769,1,170,4121,
+1,171,4709,19,1748,
+1,171,4121,1,172,
+4710,19,1764,1,172,
+4121,1,173,4711,19,
+1743,1,173,4121,1,
+174,4712,19,1759,1,
+174,4121,1,175,4713,
+19,1738,1,175,4121,
+1,176,4714,19,1754,
+1,176,4121,1,177,
+4715,19,1733,1,177,
+4121,1,178,4716,19,
+1723,1,178,4121,1,
+179,4717,19,1728,1,
+179,4121,1,180,4718,
+19,1716,1,180,4125,
+1,181,4719,19,1690,
+1,181,4131,1,182,
+4720,19,1708,1,182,
+4137,1,183,4721,19,
+1702,1,183,4143,1,
+184,4722,19,1696,1,
+184,4149,1,185,4723,
+19,1809,1,185,4155,
+1,186,4724,19,1784,
+1,186,4155,1,187,
+4725,19,2139,1,187,
+4160,1,188,4726,19,
+2132,1,188,4163,1,
+189,4727,19,2181,1,
+189,4166,1,190,4728,
+19,1181,1,190,4169,
+1,191,4729,19,2161,
+1,191,4188,1,192,
+4730,19,2154,1,192,
+4191,1,193,4731,19,
+2175,1,193,4194,1,
+194,4732,19,966,1,
+194,4247,1,195,4733,
+19,950,1,195,4247,
+1,196,4734,19,956,
+1,196,4267,1,197,
+4735,19,944,1,197,
+4267,1,198,4736,19,
+1209,1,198,4283,1,
+199,4737,19,846,1,
+199,4270,1,200,4738,
+19,961,1,200,4270,
+1,201,4739,19,841,
+1,201,4270,1,202,
+4740,19,866,1,202,
+4270,1,203,4741,19,
+835,1,203,4270,1,
+204,4742,19,829,1,
+204,4270,1,205,4743,
+19,824,1,205,4270,
+1,206,4744,19,819,
+1,206,4270,1,207,
+4745,19,813,1,207,
+4270,1,208,4746,19,
+808,1,208,4270,1,
+209,4747,19,803,1,
+209,4270,1,210,4748,
+19,798,1,210,4270,
+1,211,4749,19,793,
+1,211,4270,1,212,
+4750,19,1216,1,212,
+4355,1,213,4751,19,
+1354,1,213,4368,1,
+214,4752,19,1203,1,
+214,4381,1,215,4753,
+19,1342,1,215,4381,
+1,216,4754,19,983,
+1,216,4394,1,217,
+4755,19,786,1,217,
+4394,1,218,4756,19,
+881,1,218,4394,1,
+219,4757,19,909,1,
+219,4394,1,220,4758,
+19,929,1,220,4407,
+1,221,4759,19,975,
+1,221,4407,1,222,
+4760,19,889,1,222,
+4420,1,223,4761,19,
+902,1,223,4420,1,
+224,4762,19,855,1,
+224,4433,1,225,4763,
+19,894,1,225,4433,
+1,226,4764,19,1540,
+1,226,4446,1,227,
+4765,19,1222,1,227,
+4446,1,228,4766,19,
+1572,1,228,4446,1,
+229,4767,19,1606,1,
+229,4446,1,230,4768,
+19,1470,1,230,4296,
+1,231,4769,19,1529,
+1,231,4296,1,232,
+4770,19,1197,1,232,
+4309,1,233,4771,19,
+1638,1,233,4309,1,
+234,4772,19,1567,1,
+234,4309,1,235,4773,
+19,1514,1,235,4309,
+1,236,4774,19,1438,
+1,236,4309,1,237,
+4775,19,1364,1,237,
+4309,1,238,4776,19,
+1374,1,238,4309,1,
+239,4777,19,1192,1,
+239,4309,1,240,4778,
+19,1622,1,240,4309,
+1,241,4779,19,1562,
+1,241,4309,1,242,
+4780,19,1504,1,242,
+4309,1,243,4781,19,
+1427,1,243,4309,1,
+244,4782,19,1390,1,
+244,4309,1,245,4783,
+19,1175,1,245,4309,
+1,246,4784,19,1524,
+1,246,4309,1,247,
+4785,19,1550,1,247,
+4309,1,248,4786,19,
+1497,1,248,4309,1,
+249,4787,19,1519,1,
+249,4309,1,250,4788,
+19,1330,1,250,4309,
+1,251,4789,19,1234,
+1,251,4309,1,252,
+4790,19,1164,1,252,
+4309,1,253,4791,19,
+1596,1,253,4309,1,
+254,4792,19,1545,1,
+254,4309,1,255,4793,
+19,1492,1,255,4309,
+1,256,4794,19,1359,
+1,256,4342,1,257,
+4795,19,1337,1,257,
+4342,1,258,4796,19,
+1627,1,258,4532,1,
+259,4797,19,1650,1,
+259,4532,1,260,4798,
+19,1617,1,260,4532,
+1,261,4799,19,1612,
+1,261,4532,1,262,
+4800,19,1633,1,262,
+4532,1,263,4801,19,
+1578,1,263,4532,1,
+264,4802,19,1284,1,
+264,4532,1,265,4803,
+19,1459,1,265,4608,
+1,266,4804,19,1245,
+1,266,4608,1,267,
+4805,19,1252,1,267,
+4608,1,268,4806,19,
+1273,1,268,4608,1,
+269,4807,19,1268,1,
+269,4608,1,270,4808,
+19,1263,1,270,4608,
+1,271,4809,19,1258,
+1,271,4608,1,272,
+4810,19,1448,1,272,
+4608,1,273,4811,19,
+1476,1,273,4608,1,
+274,4812,19,1453,1,
+274,4608,1,275,4813,
+19,1443,1,275,4608,
+1,276,4814,19,1433,
+1,276,4608,1,277,
+4815,19,1416,1,277,
+4608,1,278,4816,19,
+1369,1,278,4608,1,
+279,4817,19,1278,1,
+279,4608,1,280,4818,
+19,1239,1,280,4608,
+1,281,4819,19,1187,
+1,281,4608,1,282,
+4820,19,1645,1,282,
+4608,1,283,4821,19,
+1601,1,283,4608,1,
+284,4822,19,1590,1,
+284,4608,1,285,4823,
+19,1584,1,285,4608,
+1,286,4824,19,1535,
+1,286,4608,1,287,
+4825,19,1509,1,287,
+4608,1,288,4826,19,
+1486,1,288,4608,1,
+289,4827,19,1481,1,
+289,4608,1,290,4828,
+19,1422,1,290,4608,
+1,291,4829,19,1398,
+1,291,4608,1,292,
+4830,19,1464,1,292,
+4608,1,293,4831,19,
+1556,1,293,4608,1,
+294,4832,19,1411,1,
+294,4608,1,295,4833,
+19,1405,1,295,4608,
+1,296,4834,19,1385,
+1,296,4608,1,297,
+4835,19,1348,1,297,
+4608,1,298,4836,19,
+1325,1,298,4608,1,
+299,4837,19,1170,1,
+299,4608,1,300,4838,
+19,1660,1,300,4608,
+1,301,4839,19,1290,
+1,301,4608,1,302,
+4840,19,1295,1,302,
+4608,1,303,4841,19,
+1315,1,303,4608,1,
+304,4842,19,1305,1,
+304,4608,1,305,4843,
+19,1310,1,305,4608,
+1,306,4844,19,1300,
+1,306,4608,1,307,
+4845,19,1655,1,307,
+4608,1,308,4846,19,
+1320,1,308,4608,1,
+309,4847,19,1380,1,
+309,4451,1,310,4848,
+19,1822,1,310,4521,
+1,311,4849,19,1815,
+1,311,4521,1,312,
+4850,19,1795,1,312,
+4525,1,313,4851,19,
+2126,1,313,4197,1,
+314,4852,19,2121,1,
+314,4197,1,315,4853,
+19,2116,1,315,4197,
+1,316,4854,19,2111,
+1,316,4197,1,317,
+4855,19,2106,1,317,
+4197,1,318,4856,19,
+2101,1,318,4197,1,
+319,4857,19,2096,1,
+319,4197,1,320,4858,
+19,2084,1,320,4217,
+1,321,4859,19,2079,
+1,321,4217,1,322,
+4860,19,2074,1,322,
+4217,1,323,4861,19,
+2069,1,323,4217,1,
+324,4862,19,2064,1,
+324,4217,1,325,4863,
+19,2059,1,325,4217,
+1,326,4864,19,2054,
+1,326,4217,1,327,
+4865,19,2049,1,327,
+4217,1,328,4866,19,
+2044,1,328,4217,1,
+329,4867,19,1878,1,
+329,4217,1,330,4868,
+19,2038,1,330,4217,
+1,331,4869,19,2033,
+1,331,4223,1,332,
+4870,19,2028,1,332,
+4223,1,333,4871,19,
+1870,1,333,4223,1,
+334,4872,19,2023,1,
+334,4223,1,335,4873,
+19,2018,1,335,4223,
+1,336,4874,19,2013,
+1,336,4223,1,337,
+4875,19,2008,1,337,
+4223,1,338,4876,19,
+2003,1,338,4223,1,
+339,4877,19,1998,1,
+339,4229,1,340,4878,
+19,1862,1,340,4229,
+1,341,4879,19,1992,
+1,341,4235,1,342,
+4880,19,1987,1,342,
+4235,1,343,4881,19,
+1982,1,343,4235,1,
+344,4882,19,1855,1,
+344,4235,1,345,4883,
+19,1976,1,345,4235,
+1,346,4884,19,1906,
+1,346,4235,1,347,
+4885,19,1971,1,347,
+4235,1,348,4886,19,
+1966,1,348,4235,1,
+349,4887,19,1961,1,
+349,4235,1,350,4888,
+19,1956,1,350,4235,
+1,351,4889,19,1951,
+1,351,4241,1,352,
+4890,19,1946,1,352,
+4241,1,353,4891,19,
+1941,1,353,4241,1,
+354,4892,19,4893,4,
 50,65,0,114,0,
 103,0,117,0,109,
 0,101,0,110,0,
@@ -11632,16 +11909,48 @@ public yyLSLSyntax
 0,116,0,105,0,
 111,0,110,0,76,
 0,105,0,115,0,
-116,0,95,0,53,
-0,1,348,4097,1,
-349,4824,19,4825,4,
+116,0,95,0,51,
+0,1,354,4155,1,
+355,4894,19,4895,4,
 28,65,0,114,0,
 103,0,117,0,109,
 0,101,0,110,0,
 116,0,76,0,105,
 0,115,0,116,0,
+95,0,51,0,1,
+355,4521,1,356,4896,
+19,4897,4,50,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
 95,0,52,0,1,
-349,4450,2,0,0};
+356,4155,1,357,4898,
+19,4899,4,28,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+76,0,105,0,115,
+0,116,0,95,0,
+52,0,1,357,4521,
+1,358,4900,19,4901,
+4,50,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+76,0,105,0,115,
+0,116,0,95,0,
+53,0,1,358,4155,
+2,0,0};
 new Sfactory(this,"ExpressionArgument_1",new SCreator(ExpressionArgument_1_factory));
 new Sfactory(this,"VectorArgStateEvent",new SCreator(VectorArgStateEvent_factory));
 new Sfactory(this,"SimpleAssignment_8",new SCreator(SimpleAssignment_8_factory));
@@ -11654,11 +11963,11 @@ new Sfactory(this,"Declaration",new SCreator(Declaration_factory));
 new Sfactory(this,"IdentExpression",new SCreator(IdentExpression_factory));
 new Sfactory(this,"error",new SCreator(error_factory));
 new Sfactory(this,"BinaryExpression_2",new SCreator(BinaryExpression_2_factory));
-new Sfactory(this,"State_2",new SCreator(State_2_factory));
+new Sfactory(this,"BinaryExpression_3",new SCreator(BinaryExpression_3_factory));
 new Sfactory(this,"BinaryExpression_4",new SCreator(BinaryExpression_4_factory));
 new Sfactory(this,"BinaryExpression_5",new SCreator(BinaryExpression_5_factory));
 new Sfactory(this,"ReturnStatement_2",new SCreator(ReturnStatement_2_factory));
-new Sfactory(this,"SimpleAssignment_19",new SCreator(SimpleAssignment_19_factory));
+new Sfactory(this,"VectorDeclaration_1",new SCreator(VectorDeclaration_1_factory));
 new Sfactory(this,"BinaryExpression_9",new SCreator(BinaryExpression_9_factory));
 new Sfactory(this,"VectorConstant_1",new SCreator(VectorConstant_1_factory));
 new Sfactory(this,"ParenthesisExpression",new SCreator(ParenthesisExpression_factory));
@@ -11670,6 +11979,7 @@ new Sfactory(this,"Typename",new SCreator(Typename_factory));
 new Sfactory(this,"IfStatement_1",new SCreator(IfStatement_1_factory));
 new Sfactory(this,"RotationConstant_1",new SCreator(RotationConstant_1_factory));
 new Sfactory(this,"Assignment",new SCreator(Assignment_factory));
+new Sfactory(this,"IfStatement_4",new SCreator(IfStatement_4_factory));
 new Sfactory(this,"CompoundStatement_1",new SCreator(CompoundStatement_1_factory));
 new Sfactory(this,"CompoundStatement_2",new SCreator(CompoundStatement_2_factory));
 new Sfactory(this,"BinaryExpression_8",new SCreator(BinaryExpression_8_factory));
@@ -11677,7 +11987,7 @@ new Sfactory(this,"VectorArgEvent",new SCreator(VectorArgEvent_factory));
 new Sfactory(this,"ReturnStatement_1",new SCreator(ReturnStatement_1_factory));
 new Sfactory(this,"IdentDotExpression",new SCreator(IdentDotExpression_factory));
 new Sfactory(this,"Argument",new SCreator(Argument_factory));
-new Sfactory(this,"VectorDeclaration_1",new SCreator(VectorDeclaration_1_factory));
+new Sfactory(this,"State_2",new SCreator(State_2_factory));
 new Sfactory(this,"GlobalDefinitions_3",new SCreator(GlobalDefinitions_3_factory));
 new Sfactory(this,"GlobalDefinitions_4",new SCreator(GlobalDefinitions_4_factory));
 new Sfactory(this,"Event_1",new SCreator(Event_1_factory));
@@ -11700,6 +12010,7 @@ new Sfactory(this,"LSLProgramRoot_2",new SCreator(LSLProgramRoot_2_factory));
 new Sfactory(this,"States_1",new SCreator(States_1_factory));
 new Sfactory(this,"States_2",new SCreator(States_2_factory));
 new Sfactory(this,"FunctionCallExpression_1",new SCreator(FunctionCallExpression_1_factory));
+new Sfactory(this,"KeyArgEvent_1",new SCreator(KeyArgEvent_1_factory));
 new Sfactory(this,"ForLoopStatement",new SCreator(ForLoopStatement_factory));
 new Sfactory(this,"IntArgStateEvent_1",new SCreator(IntArgStateEvent_1_factory));
 new Sfactory(this,"IntArgEvent_6",new SCreator(IntArgEvent_6_factory));
@@ -11712,6 +12023,7 @@ new Sfactory(this,"SimpleAssignment_12",new SCreator(SimpleAssignment_12_factory
 new Sfactory(this,"SimpleAssignment_13",new SCreator(SimpleAssignment_13_factory));
 new Sfactory(this,"JumpLabel",new SCreator(JumpLabel_factory));
 new Sfactory(this,"SimpleAssignment_15",new SCreator(SimpleAssignment_15_factory));
+new Sfactory(this,"StateBody_10",new SCreator(StateBody_10_factory));
 new Sfactory(this,"SimpleAssignment_17",new SCreator(SimpleAssignment_17_factory));
 new Sfactory(this,"SimpleAssignment_18",new SCreator(SimpleAssignment_18_factory));
 new Sfactory(this,"JumpStatement_1",new SCreator(JumpStatement_1_factory));
@@ -11719,14 +12031,13 @@ new Sfactory(this,"GlobalDefinitions",new SCreator(GlobalDefinitions_factory));
 new Sfactory(this,"ConstantExpression_1",new SCreator(ConstantExpression_1_factory));
 new Sfactory(this,"VoidArgEvent_4",new SCreator(VoidArgEvent_4_factory));
 new Sfactory(this,"FunctionCall_1",new SCreator(FunctionCall_1_factory));
-new Sfactory(this,"VoidArgEvent_6",new SCreator(VoidArgEvent_6_factory));
 new Sfactory(this,"Assignment_2",new SCreator(Assignment_2_factory));
 new Sfactory(this,"TypecastExpression_1",new SCreator(TypecastExpression_1_factory));
 new Sfactory(this,"SimpleAssignment_22",new SCreator(SimpleAssignment_22_factory));
 new Sfactory(this,"SimpleAssignment_23",new SCreator(SimpleAssignment_23_factory));
 new Sfactory(this,"TypecastExpression_9",new SCreator(TypecastExpression_9_factory));
 new Sfactory(this,"VoidArgEvent_2",new SCreator(VoidArgEvent_2_factory));
-new Sfactory(this,"VoidArgEvent_3",new SCreator(VoidArgEvent_3_factory));
+new Sfactory(this,"Event_9",new SCreator(Event_9_factory));
 new Sfactory(this,"ArgumentDeclarationList_1",new SCreator(ArgumentDeclarationList_1_factory));
 new Sfactory(this,"ArgumentDeclarationList_2",new SCreator(ArgumentDeclarationList_2_factory));
 new Sfactory(this,"GlobalDefinitions_1",new SCreator(GlobalDefinitions_1_factory));
@@ -11738,8 +12049,9 @@ new Sfactory(this,"IntDeclaration_1",new SCreator(IntDeclaration_1_factory));
 new Sfactory(this,"ArgumentDeclarationList_5",new SCreator(ArgumentDeclarationList_5_factory));
 new Sfactory(this,"Event_11",new SCreator(Event_11_factory));
 new Sfactory(this,"VectorArgumentDeclarationList_1",new SCreator(VectorArgumentDeclarationList_1_factory));
+new Sfactory(this,"KeyArgumentDeclarationList",new SCreator(KeyArgumentDeclarationList_factory));
 new Sfactory(this,"TypecastExpression_2",new SCreator(TypecastExpression_2_factory));
-new Sfactory(this,"TypecastExpression_3",new SCreator(TypecastExpression_3_factory));
+new Sfactory(this,"KeyArgStateEvent",new SCreator(KeyArgStateEvent_factory));
 new Sfactory(this,"TypecastExpression_4",new SCreator(TypecastExpression_4_factory));
 new Sfactory(this,"TypecastExpression_5",new SCreator(TypecastExpression_5_factory));
 new Sfactory(this,"TypecastExpression_8",new SCreator(TypecastExpression_8_factory));
@@ -11747,11 +12059,11 @@ new Sfactory(this,"Constant_1",new SCreator(Constant_1_factory));
 new Sfactory(this,"Expression",new SCreator(Expression_factory));
 new Sfactory(this,"Constant_3",new SCreator(Constant_3_factory));
 new Sfactory(this,"Constant_4",new SCreator(Constant_4_factory));
+new Sfactory(this,"IntArgEvent_5",new SCreator(IntArgEvent_5_factory));
 new Sfactory(this,"BinaryExpression_1",new SCreator(BinaryExpression_1_factory));
-new Sfactory(this,"BinaryExpression_3",new SCreator(BinaryExpression_3_factory));
 new Sfactory(this,"IfStatement_2",new SCreator(IfStatement_2_factory));
 new Sfactory(this,"IfStatement_3",new SCreator(IfStatement_3_factory));
-new Sfactory(this,"IfStatement_4",new SCreator(IfStatement_4_factory));
+new Sfactory(this,"KeyArgEvent",new SCreator(KeyArgEvent_factory));
 new Sfactory(this,"Event_2",new SCreator(Event_2_factory));
 new Sfactory(this,"JumpLabel_1",new SCreator(JumpLabel_1_factory));
 new Sfactory(this,"RotationConstant",new SCreator(RotationConstant_factory));
@@ -11765,7 +12077,7 @@ new Sfactory(this,"ArgumentList_2",new SCreator(ArgumentList_2_factory));
 new Sfactory(this,"ArgumentList_3",new SCreator(ArgumentList_3_factory));
 new Sfactory(this,"Constant",new SCreator(Constant_factory));
 new Sfactory(this,"State",new SCreator(State_factory));
-new Sfactory(this,"Event_13",new SCreator(Event_13_factory));
+new Sfactory(this,"KeyArgStateEvent_1",new SCreator(KeyArgStateEvent_1_factory));
 new Sfactory(this,"LSLProgramRoot",new SCreator(LSLProgramRoot_factory));
 new Sfactory(this,"StateChange",new SCreator(StateChange_factory));
 new Sfactory(this,"IncrementDecrementExpression_2",new SCreator(IncrementDecrementExpression_2_factory));
@@ -11776,9 +12088,11 @@ new Sfactory(this,"ReturnStatement",new SCreator(ReturnStatement_factory));
 new Sfactory(this,"IncrementDecrementExpression_7",new SCreator(IncrementDecrementExpression_7_factory));
 new Sfactory(this,"IncrementDecrementExpression_8",new SCreator(IncrementDecrementExpression_8_factory));
 new Sfactory(this,"Assignment_1",new SCreator(Assignment_1_factory));
+new Sfactory(this,"KeyDeclaration",new SCreator(KeyDeclaration_factory));
 new Sfactory(this,"ArgumentDeclarationList_3",new SCreator(ArgumentDeclarationList_3_factory));
 new Sfactory(this,"IntArgEvent_10",new SCreator(IntArgEvent_10_factory));
 new Sfactory(this,"CompoundStatement",new SCreator(CompoundStatement_factory));
+new Sfactory(this,"TypecastExpression_3",new SCreator(TypecastExpression_3_factory));
 new Sfactory(this,"IntArgumentDeclarationList",new SCreator(IntArgumentDeclarationList_factory));
 new Sfactory(this,"SimpleAssignment_3",new SCreator(SimpleAssignment_3_factory));
 new Sfactory(this,"SimpleAssignment_4",new SCreator(SimpleAssignment_4_factory));
@@ -11806,7 +12120,7 @@ new Sfactory(this,"IncrementDecrementExpression_6",new SCreator(IncrementDecreme
 new Sfactory(this,"StateEvent",new SCreator(StateEvent_factory));
 new Sfactory(this,"IntArgEvent_3",new SCreator(IntArgEvent_3_factory));
 new Sfactory(this,"IntArgEvent_4",new SCreator(IntArgEvent_4_factory));
-new Sfactory(this,"IntArgEvent_5",new SCreator(IntArgEvent_5_factory));
+new Sfactory(this,"KeyDeclaration_1",new SCreator(KeyDeclaration_1_factory));
 new Sfactory(this,"Statement_3",new SCreator(Statement_3_factory));
 new Sfactory(this,"IntArgEvent_7",new SCreator(IntArgEvent_7_factory));
 new Sfactory(this,"IntArgEvent_8",new SCreator(IntArgEvent_8_factory));
@@ -11821,6 +12135,7 @@ new Sfactory(this,"Statement_11",new SCreator(Statement_11_factory));
 new Sfactory(this,"SimpleAssignment",new SCreator(SimpleAssignment_factory));
 new Sfactory(this,"TypecastExpression",new SCreator(TypecastExpression_factory));
 new Sfactory(this,"VectorArgStateEvent_1",new SCreator(VectorArgStateEvent_1_factory));
+new Sfactory(this,"SimpleAssignment_19",new SCreator(SimpleAssignment_19_factory));
 new Sfactory(this,"SimpleAssignment_20",new SCreator(SimpleAssignment_20_factory));
 new Sfactory(this,"SimpleAssignment_21",new SCreator(SimpleAssignment_21_factory));
 new Sfactory(this,"SimpleAssignment_24",new SCreator(SimpleAssignment_24_factory));
@@ -11837,7 +12152,7 @@ new Sfactory(this,"StateBody_5",new SCreator(StateBody_5_factory));
 new Sfactory(this,"StateBody_6",new SCreator(StateBody_6_factory));
 new Sfactory(this,"StateBody_7",new SCreator(StateBody_7_factory));
 new Sfactory(this,"StateBody_8",new SCreator(StateBody_8_factory));
-new Sfactory(this,"Event_9",new SCreator(Event_9_factory));
+new Sfactory(this,"StateBody_9",new SCreator(StateBody_9_factory));
 new Sfactory(this,"Statement",new SCreator(Statement_factory));
 new Sfactory(this,"JumpStatement",new SCreator(JumpStatement_factory));
 new Sfactory(this,"BinaryExpression_11",new SCreator(BinaryExpression_11_factory));
@@ -11852,9 +12167,10 @@ new Sfactory(this,"ArgumentList",new SCreator(ArgumentList_factory));
 new Sfactory(this,"VectorDeclaration",new SCreator(VectorDeclaration_factory));
 new Sfactory(this,"Event_10",new SCreator(Event_10_factory));
 new Sfactory(this,"GlobalFunctionDefinition_2",new SCreator(GlobalFunctionDefinition_2_factory));
-new Sfactory(this,"Event_12",new SCreator(Event_12_factory));
+new Sfactory(this,"VoidArgEvent_6",new SCreator(VoidArgEvent_6_factory));
 new Sfactory(this,"StateChange_2",new SCreator(StateChange_2_factory));
 new Sfactory(this,"VoidArgEvent_1",new SCreator(VoidArgEvent_1_factory));
+new Sfactory(this,"VoidArgEvent_3",new SCreator(VoidArgEvent_3_factory));
 new Sfactory(this,"BinaryExpression_10",new SCreator(BinaryExpression_10_factory));
 new Sfactory(this,"VoidArgEvent_5",new SCreator(VoidArgEvent_5_factory));
 new Sfactory(this,"BinaryExpression_12",new SCreator(BinaryExpression_12_factory));
@@ -11873,11 +12189,13 @@ new Sfactory(this,"FunctionCall",new SCreator(FunctionCall_factory));
 new Sfactory(this,"ListConstant_1",new SCreator(ListConstant_1_factory));
 new Sfactory(this,"BinaryExpression_18",new SCreator(BinaryExpression_18_factory));
 new Sfactory(this,"Event_6",new SCreator(Event_6_factory));
+new Sfactory(this,"KeyArgEvent_2",new SCreator(KeyArgEvent_2_factory));
 new Sfactory(this,"Declaration_1",new SCreator(Declaration_1_factory));
 new Sfactory(this,"EmptyStatement_1",new SCreator(EmptyStatement_1_factory));
 new Sfactory(this,"SimpleAssignment_7",new SCreator(SimpleAssignment_7_factory));
 new Sfactory(this,"ForLoop",new SCreator(ForLoop_factory));
 new Sfactory(this,"ForLoop_2",new SCreator(ForLoop_2_factory));
+new Sfactory(this,"KeyArgumentDeclarationList_1",new SCreator(KeyArgumentDeclarationList_1_factory));
 new Sfactory(this,"GlobalFunctionDefinition_1",new SCreator(GlobalFunctionDefinition_1_factory));
 new Sfactory(this,"IfStatement",new SCreator(IfStatement_factory));
 new Sfactory(this,"ForLoopStatement_1",new SCreator(ForLoopStatement_1_factory));
@@ -11909,11 +12227,11 @@ public static object Declaration_factory(Parser yyp) { return new Declaration(yy
 public static object IdentExpression_factory(Parser yyp) { return new IdentExpression(yyp); }
 public static object error_factory(Parser yyp) { return new error(yyp); }
 public static object BinaryExpression_2_factory(Parser yyp) { return new BinaryExpression_2(yyp); }
-public static object State_2_factory(Parser yyp) { return new State_2(yyp); }
+public static object BinaryExpression_3_factory(Parser yyp) { return new BinaryExpression_3(yyp); }
 public static object BinaryExpression_4_factory(Parser yyp) { return new BinaryExpression_4(yyp); }
 public static object BinaryExpression_5_factory(Parser yyp) { return new BinaryExpression_5(yyp); }
 public static object ReturnStatement_2_factory(Parser yyp) { return new ReturnStatement_2(yyp); }
-public static object SimpleAssignment_19_factory(Parser yyp) { return new SimpleAssignment_19(yyp); }
+public static object VectorDeclaration_1_factory(Parser yyp) { return new VectorDeclaration_1(yyp); }
 public static object BinaryExpression_9_factory(Parser yyp) { return new BinaryExpression_9(yyp); }
 public static object VectorConstant_1_factory(Parser yyp) { return new VectorConstant_1(yyp); }
 public static object ParenthesisExpression_factory(Parser yyp) { return new ParenthesisExpression(yyp); }
@@ -11925,6 +12243,7 @@ public static object Typename_factory(Parser yyp) { return new Typename(yyp); }
 public static object IfStatement_1_factory(Parser yyp) { return new IfStatement_1(yyp); }
 public static object RotationConstant_1_factory(Parser yyp) { return new RotationConstant_1(yyp); }
 public static object Assignment_factory(Parser yyp) { return new Assignment(yyp); }
+public static object IfStatement_4_factory(Parser yyp) { return new IfStatement_4(yyp); }
 public static object CompoundStatement_1_factory(Parser yyp) { return new CompoundStatement_1(yyp); }
 public static object CompoundStatement_2_factory(Parser yyp) { return new CompoundStatement_2(yyp); }
 public static object BinaryExpression_8_factory(Parser yyp) { return new BinaryExpression_8(yyp); }
@@ -11932,7 +12251,7 @@ public static object VectorArgEvent_factory(Parser yyp) { return new VectorArgEv
 public static object ReturnStatement_1_factory(Parser yyp) { return new ReturnStatement_1(yyp); }
 public static object IdentDotExpression_factory(Parser yyp) { return new IdentDotExpression(yyp); }
 public static object Argument_factory(Parser yyp) { return new Argument(yyp); }
-public static object VectorDeclaration_1_factory(Parser yyp) { return new VectorDeclaration_1(yyp); }
+public static object State_2_factory(Parser yyp) { return new State_2(yyp); }
 public static object GlobalDefinitions_3_factory(Parser yyp) { return new GlobalDefinitions_3(yyp); }
 public static object GlobalDefinitions_4_factory(Parser yyp) { return new GlobalDefinitions_4(yyp); }
 public static object Event_1_factory(Parser yyp) { return new Event_1(yyp); }
@@ -11955,6 +12274,7 @@ public static object LSLProgramRoot_2_factory(Parser yyp) { return new LSLProgra
 public static object States_1_factory(Parser yyp) { return new States_1(yyp); }
 public static object States_2_factory(Parser yyp) { return new States_2(yyp); }
 public static object FunctionCallExpression_1_factory(Parser yyp) { return new FunctionCallExpression_1(yyp); }
+public static object KeyArgEvent_1_factory(Parser yyp) { return new KeyArgEvent_1(yyp); }
 public static object ForLoopStatement_factory(Parser yyp) { return new ForLoopStatement(yyp); }
 public static object IntArgStateEvent_1_factory(Parser yyp) { return new IntArgStateEvent_1(yyp); }
 public static object IntArgEvent_6_factory(Parser yyp) { return new IntArgEvent_6(yyp); }
@@ -11967,6 +12287,7 @@ public static object SimpleAssignment_12_factory(Parser yyp) { return new Simple
 public static object SimpleAssignment_13_factory(Parser yyp) { return new SimpleAssignment_13(yyp); }
 public static object JumpLabel_factory(Parser yyp) { return new JumpLabel(yyp); }
 public static object SimpleAssignment_15_factory(Parser yyp) { return new SimpleAssignment_15(yyp); }
+public static object StateBody_10_factory(Parser yyp) { return new StateBody_10(yyp); }
 public static object SimpleAssignment_17_factory(Parser yyp) { return new SimpleAssignment_17(yyp); }
 public static object SimpleAssignment_18_factory(Parser yyp) { return new SimpleAssignment_18(yyp); }
 public static object JumpStatement_1_factory(Parser yyp) { return new JumpStatement_1(yyp); }
@@ -11974,14 +12295,13 @@ public static object GlobalDefinitions_factory(Parser yyp) { return new GlobalDe
 public static object ConstantExpression_1_factory(Parser yyp) { return new ConstantExpression_1(yyp); }
 public static object VoidArgEvent_4_factory(Parser yyp) { return new VoidArgEvent_4(yyp); }
 public static object FunctionCall_1_factory(Parser yyp) { return new FunctionCall_1(yyp); }
-public static object VoidArgEvent_6_factory(Parser yyp) { return new VoidArgEvent_6(yyp); }
 public static object Assignment_2_factory(Parser yyp) { return new Assignment_2(yyp); }
 public static object TypecastExpression_1_factory(Parser yyp) { return new TypecastExpression_1(yyp); }
 public static object SimpleAssignment_22_factory(Parser yyp) { return new SimpleAssignment_22(yyp); }
 public static object SimpleAssignment_23_factory(Parser yyp) { return new SimpleAssignment_23(yyp); }
 public static object TypecastExpression_9_factory(Parser yyp) { return new TypecastExpression_9(yyp); }
 public static object VoidArgEvent_2_factory(Parser yyp) { return new VoidArgEvent_2(yyp); }
-public static object VoidArgEvent_3_factory(Parser yyp) { return new VoidArgEvent_3(yyp); }
+public static object Event_9_factory(Parser yyp) { return new Event_9(yyp); }
 public static object ArgumentDeclarationList_1_factory(Parser yyp) { return new ArgumentDeclarationList_1(yyp); }
 public static object ArgumentDeclarationList_2_factory(Parser yyp) { return new ArgumentDeclarationList_2(yyp); }
 public static object GlobalDefinitions_1_factory(Parser yyp) { return new GlobalDefinitions_1(yyp); }
@@ -11993,8 +12313,9 @@ public static object IntDeclaration_1_factory(Parser yyp) { return new IntDeclar
 public static object ArgumentDeclarationList_5_factory(Parser yyp) { return new ArgumentDeclarationList_5(yyp); }
 public static object Event_11_factory(Parser yyp) { return new Event_11(yyp); }
 public static object VectorArgumentDeclarationList_1_factory(Parser yyp) { return new VectorArgumentDeclarationList_1(yyp); }
+public static object KeyArgumentDeclarationList_factory(Parser yyp) { return new KeyArgumentDeclarationList(yyp); }
 public static object TypecastExpression_2_factory(Parser yyp) { return new TypecastExpression_2(yyp); }
-public static object TypecastExpression_3_factory(Parser yyp) { return new TypecastExpression_3(yyp); }
+public static object KeyArgStateEvent_factory(Parser yyp) { return new KeyArgStateEvent(yyp); }
 public static object TypecastExpression_4_factory(Parser yyp) { return new TypecastExpression_4(yyp); }
 public static object TypecastExpression_5_factory(Parser yyp) { return new TypecastExpression_5(yyp); }
 public static object TypecastExpression_8_factory(Parser yyp) { return new TypecastExpression_8(yyp); }
@@ -12002,11 +12323,11 @@ public static object Constant_1_factory(Parser yyp) { return new Constant_1(yyp)
 public static object Expression_factory(Parser yyp) { return new Expression(yyp); }
 public static object Constant_3_factory(Parser yyp) { return new Constant_3(yyp); }
 public static object Constant_4_factory(Parser yyp) { return new Constant_4(yyp); }
+public static object IntArgEvent_5_factory(Parser yyp) { return new IntArgEvent_5(yyp); }
 public static object BinaryExpression_1_factory(Parser yyp) { return new BinaryExpression_1(yyp); }
-public static object BinaryExpression_3_factory(Parser yyp) { return new BinaryExpression_3(yyp); }
 public static object IfStatement_2_factory(Parser yyp) { return new IfStatement_2(yyp); }
 public static object IfStatement_3_factory(Parser yyp) { return new IfStatement_3(yyp); }
-public static object IfStatement_4_factory(Parser yyp) { return new IfStatement_4(yyp); }
+public static object KeyArgEvent_factory(Parser yyp) { return new KeyArgEvent(yyp); }
 public static object Event_2_factory(Parser yyp) { return new Event_2(yyp); }
 public static object JumpLabel_1_factory(Parser yyp) { return new JumpLabel_1(yyp); }
 public static object RotationConstant_factory(Parser yyp) { return new RotationConstant(yyp); }
@@ -12020,7 +12341,7 @@ public static object ArgumentList_2_factory(Parser yyp) { return new ArgumentLis
 public static object ArgumentList_3_factory(Parser yyp) { return new ArgumentList_3(yyp); }
 public static object Constant_factory(Parser yyp) { return new Constant(yyp); }
 public static object State_factory(Parser yyp) { return new State(yyp); }
-public static object Event_13_factory(Parser yyp) { return new Event_13(yyp); }
+public static object KeyArgStateEvent_1_factory(Parser yyp) { return new KeyArgStateEvent_1(yyp); }
 public static object LSLProgramRoot_factory(Parser yyp) { return new LSLProgramRoot(yyp); }
 public static object StateChange_factory(Parser yyp) { return new StateChange(yyp); }
 public static object IncrementDecrementExpression_2_factory(Parser yyp) { return new IncrementDecrementExpression_2(yyp); }
@@ -12031,9 +12352,11 @@ public static object ReturnStatement_factory(Parser yyp) { return new ReturnStat
 public static object IncrementDecrementExpression_7_factory(Parser yyp) { return new IncrementDecrementExpression_7(yyp); }
 public static object IncrementDecrementExpression_8_factory(Parser yyp) { return new IncrementDecrementExpression_8(yyp); }
 public static object Assignment_1_factory(Parser yyp) { return new Assignment_1(yyp); }
+public static object KeyDeclaration_factory(Parser yyp) { return new KeyDeclaration(yyp); }
 public static object ArgumentDeclarationList_3_factory(Parser yyp) { return new ArgumentDeclarationList_3(yyp); }
 public static object IntArgEvent_10_factory(Parser yyp) { return new IntArgEvent_10(yyp); }
 public static object CompoundStatement_factory(Parser yyp) { return new CompoundStatement(yyp); }
+public static object TypecastExpression_3_factory(Parser yyp) { return new TypecastExpression_3(yyp); }
 public static object IntArgumentDeclarationList_factory(Parser yyp) { return new IntArgumentDeclarationList(yyp); }
 public static object SimpleAssignment_3_factory(Parser yyp) { return new SimpleAssignment_3(yyp); }
 public static object SimpleAssignment_4_factory(Parser yyp) { return new SimpleAssignment_4(yyp); }
@@ -12061,7 +12384,7 @@ public static object IncrementDecrementExpression_6_factory(Parser yyp) { return
 public static object StateEvent_factory(Parser yyp) { return new StateEvent(yyp); }
 public static object IntArgEvent_3_factory(Parser yyp) { return new IntArgEvent_3(yyp); }
 public static object IntArgEvent_4_factory(Parser yyp) { return new IntArgEvent_4(yyp); }
-public static object IntArgEvent_5_factory(Parser yyp) { return new IntArgEvent_5(yyp); }
+public static object KeyDeclaration_1_factory(Parser yyp) { return new KeyDeclaration_1(yyp); }
 public static object Statement_3_factory(Parser yyp) { return new Statement_3(yyp); }
 public static object IntArgEvent_7_factory(Parser yyp) { return new IntArgEvent_7(yyp); }
 public static object IntArgEvent_8_factory(Parser yyp) { return new IntArgEvent_8(yyp); }
@@ -12076,6 +12399,7 @@ public static object Statement_11_factory(Parser yyp) { return new Statement_11(
 public static object SimpleAssignment_factory(Parser yyp) { return new SimpleAssignment(yyp); }
 public static object TypecastExpression_factory(Parser yyp) { return new TypecastExpression(yyp); }
 public static object VectorArgStateEvent_1_factory(Parser yyp) { return new VectorArgStateEvent_1(yyp); }
+public static object SimpleAssignment_19_factory(Parser yyp) { return new SimpleAssignment_19(yyp); }
 public static object SimpleAssignment_20_factory(Parser yyp) { return new SimpleAssignment_20(yyp); }
 public static object SimpleAssignment_21_factory(Parser yyp) { return new SimpleAssignment_21(yyp); }
 public static object SimpleAssignment_24_factory(Parser yyp) { return new SimpleAssignment_24(yyp); }
@@ -12092,7 +12416,7 @@ public static object StateBody_5_factory(Parser yyp) { return new StateBody_5(yy
 public static object StateBody_6_factory(Parser yyp) { return new StateBody_6(yyp); }
 public static object StateBody_7_factory(Parser yyp) { return new StateBody_7(yyp); }
 public static object StateBody_8_factory(Parser yyp) { return new StateBody_8(yyp); }
-public static object Event_9_factory(Parser yyp) { return new Event_9(yyp); }
+public static object StateBody_9_factory(Parser yyp) { return new StateBody_9(yyp); }
 public static object Statement_factory(Parser yyp) { return new Statement(yyp); }
 public static object JumpStatement_factory(Parser yyp) { return new JumpStatement(yyp); }
 public static object BinaryExpression_11_factory(Parser yyp) { return new BinaryExpression_11(yyp); }
@@ -12107,9 +12431,10 @@ public static object ArgumentList_factory(Parser yyp) { return new ArgumentList(
 public static object VectorDeclaration_factory(Parser yyp) { return new VectorDeclaration(yyp); }
 public static object Event_10_factory(Parser yyp) { return new Event_10(yyp); }
 public static object GlobalFunctionDefinition_2_factory(Parser yyp) { return new GlobalFunctionDefinition_2(yyp); }
-public static object Event_12_factory(Parser yyp) { return new Event_12(yyp); }
+public static object VoidArgEvent_6_factory(Parser yyp) { return new VoidArgEvent_6(yyp); }
 public static object StateChange_2_factory(Parser yyp) { return new StateChange_2(yyp); }
 public static object VoidArgEvent_1_factory(Parser yyp) { return new VoidArgEvent_1(yyp); }
+public static object VoidArgEvent_3_factory(Parser yyp) { return new VoidArgEvent_3(yyp); }
 public static object BinaryExpression_10_factory(Parser yyp) { return new BinaryExpression_10(yyp); }
 public static object VoidArgEvent_5_factory(Parser yyp) { return new VoidArgEvent_5(yyp); }
 public static object BinaryExpression_12_factory(Parser yyp) { return new BinaryExpression_12(yyp); }
@@ -12128,11 +12453,13 @@ public static object FunctionCall_factory(Parser yyp) { return new FunctionCall(
 public static object ListConstant_1_factory(Parser yyp) { return new ListConstant_1(yyp); }
 public static object BinaryExpression_18_factory(Parser yyp) { return new BinaryExpression_18(yyp); }
 public static object Event_6_factory(Parser yyp) { return new Event_6(yyp); }
+public static object KeyArgEvent_2_factory(Parser yyp) { return new KeyArgEvent_2(yyp); }
 public static object Declaration_1_factory(Parser yyp) { return new Declaration_1(yyp); }
 public static object EmptyStatement_1_factory(Parser yyp) { return new EmptyStatement_1(yyp); }
 public static object SimpleAssignment_7_factory(Parser yyp) { return new SimpleAssignment_7(yyp); }
 public static object ForLoop_factory(Parser yyp) { return new ForLoop(yyp); }
 public static object ForLoop_2_factory(Parser yyp) { return new ForLoop_2(yyp); }
+public static object KeyArgumentDeclarationList_1_factory(Parser yyp) { return new KeyArgumentDeclarationList_1(yyp); }
 public static object GlobalFunctionDefinition_1_factory(Parser yyp) { return new GlobalFunctionDefinition_1(yyp); }
 public static object IfStatement_factory(Parser yyp) { return new IfStatement(yyp); }
 public static object ForLoopStatement_1_factory(Parser yyp) { return new ForLoopStatement_1(yyp); }
-- 
cgit v1.1


From a5e478054723cb28403e9d2f4fef1ac306e673c1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 21 Dec 2013 00:37:56 +0000
Subject: Add lsl event arg checking for at_rot_target

---
 .../Shared/CodeTools/Tests/LSL_EventTests.cs       |    16 +
 .../ScriptEngine/Shared/CodeTools/lsl.parser.cs    | 18231 ++++++++++---------
 2 files changed, 9319 insertions(+), 8928 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
index 4e27c00..854b4bf 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
@@ -260,6 +260,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TestVectorArgEvent("land_collision_end");
         }
 
+        [Test]
+        public void TestAtRotTargetEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntRotRotArgEvent("at_rot_target");
+        }
 
         private void TestIntArgEvent(string eventName)
         {
@@ -285,6 +293,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TestCompile("default { " + eventName + "(vector v, vector w) {{}} }", true);
         }
 
+        private void TestIntRotRotArgEvent(string eventName)
+        {
+            TestCompile("default { " + eventName + "(integer n, rotation r, rotation s) {} }", false);
+            TestCompile("default { " + eventName + "{{}} }", true);
+            TestCompile("default { " + eventName + "(string s) {{}} }", true);
+            TestCompile("default { " + eventName + "(integer n, rotation r, rotation s, rotation t) {{}} }", true);
+        }
+
         private void TestCompile(string script, bool expectException)
         {
             bool gotException = false;
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
index 6f44c87..a4938a0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
@@ -162,44 +162,69 @@ public class VectorArgStateEvent : StateEvent{
 public override string yyname { get { return "VectorArgStateEvent"; }}
 public override int yynum { get { return 107; }}
 public VectorArgStateEvent(Parser yyp):base(yyp){}}
-//%+ArgumentDeclarationList+108
+//%+IntRotRotArgStateEvent+108
+public class IntRotRotArgStateEvent : StateEvent{
+ public  IntRotRotArgStateEvent (Parser yyp, string  name , IntRotRotArgumentDeclarationList  adl , CompoundStatement  cs ):base(((LSLSyntax
+)yyp), name , adl , cs ){}
+
+public override string yyname { get { return "IntRotRotArgStateEvent"; }}
+public override int yynum { get { return 108; }}
+public IntRotRotArgStateEvent(Parser yyp):base(yyp){}}
+//%+ArgumentDeclarationList+109
 public class ArgumentDeclarationList : SYMBOL{
  public  ArgumentDeclarationList (Parser yyp, Declaration  d ):base(((LSLSyntax
 )yyp)){ kids . Add ( d );
 }
+ public  ArgumentDeclarationList (Parser yyp, Declaration  d , Declaration  d2 ):base(((LSLSyntax
+)yyp)){ kids . Add ( d );
+ kids . Add ( d2 );
+}
+ public  ArgumentDeclarationList (Parser yyp, Declaration  d , Declaration  d2 , Declaration  d3 ):base(((LSLSyntax
+)yyp)){ kids . Add ( d );
+ kids . Add ( d2 );
+ kids . Add ( d3 );
+}
  public  ArgumentDeclarationList (Parser yyp, ArgumentDeclarationList  adl , Declaration  d ):base(((LSLSyntax
 )yyp)){ while (0< adl . kids . Count ) kids . Add ( adl . kids . Pop ());
  kids . Add ( d );
 }
 
 public override string yyname { get { return "ArgumentDeclarationList"; }}
-public override int yynum { get { return 108; }}
+public override int yynum { get { return 109; }}
 public ArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+KeyArgumentDeclarationList+109
+//%+KeyArgumentDeclarationList+110
 public class KeyArgumentDeclarationList : ArgumentDeclarationList{
  public  KeyArgumentDeclarationList (Parser yyp, KeyDeclaration  d ):base(((LSLSyntax
 )yyp), d ){}
 
 public override string yyname { get { return "KeyArgumentDeclarationList"; }}
-public override int yynum { get { return 109; }}
+public override int yynum { get { return 110; }}
 public KeyArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+IntArgumentDeclarationList+110
+//%+IntArgumentDeclarationList+111
 public class IntArgumentDeclarationList : ArgumentDeclarationList{
  public  IntArgumentDeclarationList (Parser yyp, IntDeclaration  d ):base(((LSLSyntax
 )yyp), d ){}
 
 public override string yyname { get { return "IntArgumentDeclarationList"; }}
-public override int yynum { get { return 110; }}
+public override int yynum { get { return 111; }}
 public IntArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+VectorArgumentDeclarationList+111
+//%+VectorArgumentDeclarationList+112
 public class VectorArgumentDeclarationList : ArgumentDeclarationList{
  public  VectorArgumentDeclarationList (Parser yyp, VectorDeclaration  d ):base(((LSLSyntax
 )yyp), d ){}
 
 public override string yyname { get { return "VectorArgumentDeclarationList"; }}
-public override int yynum { get { return 111; }}
+public override int yynum { get { return 112; }}
 public VectorArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+Declaration+112
+//%+IntRotRotArgumentDeclarationList+113
+public class IntRotRotArgumentDeclarationList : ArgumentDeclarationList{
+ public  IntRotRotArgumentDeclarationList (Parser yyp, Declaration  d1 , Declaration  d2 , Declaration  d3 ):base(((LSLSyntax
+)yyp), d1 , d2 , d3 ){}
+
+public override string yyname { get { return "IntRotRotArgumentDeclarationList"; }}
+public override int yynum { get { return 113; }}
+public IntRotRotArgumentDeclarationList(Parser yyp):base(yyp){}}
+//%+Declaration+114
 public class Declaration : SYMBOL{
  private  string  m_datatype ;
  private  string  m_id ;
@@ -219,33 +244,41 @@ public class Declaration : SYMBOL{
 }
 
 public override string yyname { get { return "Declaration"; }}
-public override int yynum { get { return 112; }}
+public override int yynum { get { return 114; }}
 public Declaration(Parser yyp):base(yyp){}}
-//%+KeyDeclaration+113
+//%+KeyDeclaration+115
 public class KeyDeclaration : Declaration{
  public  KeyDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
 )yyp), type , id ){}
 
 public override string yyname { get { return "KeyDeclaration"; }}
-public override int yynum { get { return 113; }}
+public override int yynum { get { return 115; }}
 public KeyDeclaration(Parser yyp):base(yyp){}}
-//%+IntDeclaration+114
+//%+IntDeclaration+116
 public class IntDeclaration : Declaration{
  public  IntDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
 )yyp), type , id ){}
 
 public override string yyname { get { return "IntDeclaration"; }}
-public override int yynum { get { return 114; }}
+public override int yynum { get { return 116; }}
 public IntDeclaration(Parser yyp):base(yyp){}}
-//%+VectorDeclaration+115
+//%+VectorDeclaration+117
 public class VectorDeclaration : Declaration{
  public  VectorDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
 )yyp), type , id ){}
 
 public override string yyname { get { return "VectorDeclaration"; }}
-public override int yynum { get { return 115; }}
+public override int yynum { get { return 117; }}
 public VectorDeclaration(Parser yyp):base(yyp){}}
-//%+Typename+116
+//%+RotDeclaration+118
+public class RotDeclaration : Declaration{
+ public  RotDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
+)yyp), type , id ){}
+
+public override string yyname { get { return "RotDeclaration"; }}
+public override int yynum { get { return 118; }}
+public RotDeclaration(Parser yyp):base(yyp){}}
+//%+Typename+119
 public class Typename : SYMBOL{
  public  string  yytext ;
  public  Typename (Parser yyp, string  text ):base(((LSLSyntax
@@ -253,9 +286,9 @@ public class Typename : SYMBOL{
 }
 
 public override string yyname { get { return "Typename"; }}
-public override int yynum { get { return 116; }}
+public override int yynum { get { return 119; }}
 public Typename(Parser yyp):base(yyp){}}
-//%+Event+117
+//%+Event+120
 public class Event : SYMBOL{
  public  string  yytext ;
  public  Event (Parser yyp, string  text ):base(((LSLSyntax
@@ -263,41 +296,49 @@ public class Event : SYMBOL{
 }
 
 public override string yyname { get { return "Event"; }}
-public override int yynum { get { return 117; }}
+public override int yynum { get { return 120; }}
 public Event(Parser yyp):base(yyp){}}
-//%+VoidArgEvent+118
+//%+VoidArgEvent+121
 public class VoidArgEvent : Event{
  public  VoidArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "VoidArgEvent"; }}
-public override int yynum { get { return 118; }}
+public override int yynum { get { return 121; }}
 public VoidArgEvent(Parser yyp):base(yyp){}}
-//%+KeyArgEvent+119
+//%+KeyArgEvent+122
 public class KeyArgEvent : Event{
  public  KeyArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "KeyArgEvent"; }}
-public override int yynum { get { return 119; }}
+public override int yynum { get { return 122; }}
 public KeyArgEvent(Parser yyp):base(yyp){}}
-//%+IntArgEvent+120
+//%+IntArgEvent+123
 public class IntArgEvent : Event{
  public  IntArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "IntArgEvent"; }}
-public override int yynum { get { return 120; }}
+public override int yynum { get { return 123; }}
 public IntArgEvent(Parser yyp):base(yyp){}}
-//%+VectorArgEvent+121
+//%+VectorArgEvent+124
 public class VectorArgEvent : Event{
  public  VectorArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "VectorArgEvent"; }}
-public override int yynum { get { return 121; }}
+public override int yynum { get { return 124; }}
 public VectorArgEvent(Parser yyp):base(yyp){}}
-//%+CompoundStatement+122
+//%+IntRotRotArgEvent+125
+public class IntRotRotArgEvent : Event{
+ public  IntRotRotArgEvent (Parser yyp, string  text ):base(((LSLSyntax
+)yyp), text ){}
+
+public override string yyname { get { return "IntRotRotArgEvent"; }}
+public override int yynum { get { return 125; }}
+public IntRotRotArgEvent(Parser yyp):base(yyp){}}
+//%+CompoundStatement+126
 public class CompoundStatement : SYMBOL{
  public  CompoundStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -306,9 +347,9 @@ public class CompoundStatement : SYMBOL{
 }
 
 public override string yyname { get { return "CompoundStatement"; }}
-public override int yynum { get { return 122; }}
+public override int yynum { get { return 126; }}
 }
-//%+StatementList+123
+//%+StatementList+127
 public class StatementList : SYMBOL{
  private  void  AddStatement ( Statement  s ){ if ( s . kids . Top  is  IfStatement || s . kids . Top  is  WhileStatement || s . kids . Top  is  DoWhileStatement || s . kids . Top  is  ForLoop ) kids . Add ( s . kids . Pop ());
  else  kids . Add ( s );
@@ -322,9 +363,9 @@ public class StatementList : SYMBOL{
 }
 
 public override string yyname { get { return "StatementList"; }}
-public override int yynum { get { return 123; }}
+public override int yynum { get { return 127; }}
 public StatementList(Parser yyp):base(yyp){}}
-//%+Statement+124
+//%+Statement+128
 public class Statement : SYMBOL{
  public  Statement (Parser yyp, Declaration  d ):base(((LSLSyntax
 )yyp)){ kids . Add ( d );
@@ -370,9 +411,9 @@ public class Statement : SYMBOL{
 }
 
 public override string yyname { get { return "Statement"; }}
-public override int yynum { get { return 124; }}
+public override int yynum { get { return 128; }}
 public Statement(Parser yyp):base(yyp){}}
-//%+EmptyStatement+125
+//%+EmptyStatement+129
 public class EmptyStatement : SYMBOL{
  public  EmptyStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -380,9 +421,9 @@ public class EmptyStatement : SYMBOL{
 }
 
 public override string yyname { get { return "EmptyStatement"; }}
-public override int yynum { get { return 125; }}
+public override int yynum { get { return 129; }}
 }
-//%+Assignment+126
+//%+Assignment+130
 public class Assignment : SYMBOL{
  protected  string  m_assignmentType ;
  public  Assignment (Parser yyp, SYMBOL  lhs , SYMBOL  rhs , string  assignmentType ):base(((LSLSyntax
@@ -402,9 +443,9 @@ public class Assignment : SYMBOL{
 }
 
 public override string yyname { get { return "Assignment"; }}
-public override int yynum { get { return 126; }}
+public override int yynum { get { return 130; }}
 public Assignment(Parser yyp):base(yyp){}}
-//%+SimpleAssignment+127
+//%+SimpleAssignment+131
 public class SimpleAssignment : Assignment{
  public  SimpleAssignment (Parser yyp, SYMBOL  lhs , SYMBOL  rhs , string  assignmentType ):base(((LSLSyntax
 )yyp)){ m_assignmentType = assignmentType ;
@@ -414,9 +455,9 @@ public class SimpleAssignment : Assignment{
 }
 
 public override string yyname { get { return "SimpleAssignment"; }}
-public override int yynum { get { return 127; }}
+public override int yynum { get { return 131; }}
 public SimpleAssignment(Parser yyp):base(yyp){}}
-//%+ReturnStatement+128
+//%+ReturnStatement+132
 public class ReturnStatement : SYMBOL{
  public  ReturnStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -426,9 +467,9 @@ public class ReturnStatement : SYMBOL{
 }
 
 public override string yyname { get { return "ReturnStatement"; }}
-public override int yynum { get { return 128; }}
+public override int yynum { get { return 132; }}
 }
-//%+JumpLabel+129
+//%+JumpLabel+133
 public class JumpLabel : SYMBOL{
  private  string  m_labelName ;
  public  JumpLabel (Parser yyp, string  labelName ):base(((LSLSyntax
@@ -441,9 +482,9 @@ public class JumpLabel : SYMBOL{
 }
 
 public override string yyname { get { return "JumpLabel"; }}
-public override int yynum { get { return 129; }}
+public override int yynum { get { return 133; }}
 public JumpLabel(Parser yyp):base(yyp){}}
-//%+JumpStatement+130
+//%+JumpStatement+134
 public class JumpStatement : SYMBOL{
  private  string  m_targetName ;
  public  JumpStatement (Parser yyp, string  targetName ):base(((LSLSyntax
@@ -456,9 +497,9 @@ public class JumpStatement : SYMBOL{
 }
 
 public override string yyname { get { return "JumpStatement"; }}
-public override int yynum { get { return 130; }}
+public override int yynum { get { return 134; }}
 public JumpStatement(Parser yyp):base(yyp){}}
-//%+StateChange+131
+//%+StateChange+135
 public class StateChange : SYMBOL{
  private  string  m_newState ;
  public  StateChange (Parser yyp, string  newState ):base(((LSLSyntax
@@ -469,9 +510,9 @@ public class StateChange : SYMBOL{
 }
 
 public override string yyname { get { return "StateChange"; }}
-public override int yynum { get { return 131; }}
+public override int yynum { get { return 135; }}
 public StateChange(Parser yyp):base(yyp){}}
-//%+IfStatement+132
+//%+IfStatement+136
 public class IfStatement : SYMBOL{
  private  void  AddStatement ( Statement  s ){ if (0< s . kids . Count && s . kids . Top  is  CompoundStatement ) kids . Add ( s . kids . Pop ());
  else  kids . Add ( s );
@@ -488,9 +529,9 @@ public class IfStatement : SYMBOL{
 }
 
 public override string yyname { get { return "IfStatement"; }}
-public override int yynum { get { return 132; }}
+public override int yynum { get { return 136; }}
 public IfStatement(Parser yyp):base(yyp){}}
-//%+WhileStatement+133
+//%+WhileStatement+137
 public class WhileStatement : SYMBOL{
  public  WhileStatement (Parser yyp, SYMBOL  s , Statement  st ):base(((LSLSyntax
 )yyp)){ kids . Add ( s );
@@ -499,9 +540,9 @@ public class WhileStatement : SYMBOL{
 }
 
 public override string yyname { get { return "WhileStatement"; }}
-public override int yynum { get { return 133; }}
+public override int yynum { get { return 137; }}
 public WhileStatement(Parser yyp):base(yyp){}}
-//%+DoWhileStatement+134
+//%+DoWhileStatement+138
 public class DoWhileStatement : SYMBOL{
  public  DoWhileStatement (Parser yyp, SYMBOL  s , Statement  st ):base(((LSLSyntax
 )yyp)){ if (0< st . kids . Count && st . kids . Top  is  CompoundStatement ) kids . Add ( st . kids . Pop ());
@@ -510,9 +551,9 @@ public class DoWhileStatement : SYMBOL{
 }
 
 public override string yyname { get { return "DoWhileStatement"; }}
-public override int yynum { get { return 134; }}
+public override int yynum { get { return 138; }}
 public DoWhileStatement(Parser yyp):base(yyp){}}
-//%+ForLoop+135
+//%+ForLoop+139
 public class ForLoop : SYMBOL{
  public  ForLoop (Parser yyp, ForLoopStatement  flsa , Expression  e , ForLoopStatement  flsb , Statement  s ):base(((LSLSyntax
 )yyp)){ kids . Add ( flsa );
@@ -523,9 +564,9 @@ public class ForLoop : SYMBOL{
 }
 
 public override string yyname { get { return "ForLoop"; }}
-public override int yynum { get { return 135; }}
+public override int yynum { get { return 139; }}
 public ForLoop(Parser yyp):base(yyp){}}
-//%+ForLoopStatement+136
+//%+ForLoopStatement+140
 public class ForLoopStatement : SYMBOL{
  public  ForLoopStatement (Parser yyp, Expression  e ):base(((LSLSyntax
 )yyp)){ kids . Add ( e );
@@ -543,9 +584,9 @@ public class ForLoopStatement : SYMBOL{
 }
 
 public override string yyname { get { return "ForLoopStatement"; }}
-public override int yynum { get { return 136; }}
+public override int yynum { get { return 140; }}
 public ForLoopStatement(Parser yyp):base(yyp){}}
-//%+FunctionCall+137
+//%+FunctionCall+141
 public class FunctionCall : SYMBOL{
  private  string  m_id ;
  public  FunctionCall (Parser yyp, string  id , ArgumentList  al ):base(((LSLSyntax
@@ -559,9 +600,9 @@ public class FunctionCall : SYMBOL{
 }
 
 public override string yyname { get { return "FunctionCall"; }}
-public override int yynum { get { return 137; }}
+public override int yynum { get { return 141; }}
 public FunctionCall(Parser yyp):base(yyp){}}
-//%+ArgumentList+138
+//%+ArgumentList+142
 public class ArgumentList : SYMBOL{
  public  ArgumentList (Parser yyp, Argument  a ):base(((LSLSyntax
 )yyp)){ AddArgument ( a );
@@ -575,14 +616,14 @@ public class ArgumentList : SYMBOL{
 }
 
 public override string yyname { get { return "ArgumentList"; }}
-public override int yynum { get { return 138; }}
+public override int yynum { get { return 142; }}
 public ArgumentList(Parser yyp):base(yyp){}}
-//%+Argument+139
+//%+Argument+143
 public class Argument : SYMBOL{
 public override string yyname { get { return "Argument"; }}
-public override int yynum { get { return 139; }}
+public override int yynum { get { return 143; }}
 public Argument(Parser yyp):base(yyp){}}
-//%+ExpressionArgument+140
+//%+ExpressionArgument+144
 public class ExpressionArgument : Argument{
  public  ExpressionArgument (Parser yyp, Expression  e ):base(((LSLSyntax
 )yyp)){ if ( e  is  ConstantExpression ) while (0< e . kids . Count ) kids . Add ( e . kids . Pop ());
@@ -590,9 +631,9 @@ public class ExpressionArgument : Argument{
 }
 
 public override string yyname { get { return "ExpressionArgument"; }}
-public override int yynum { get { return 140; }}
+public override int yynum { get { return 144; }}
 public ExpressionArgument(Parser yyp):base(yyp){}}
-//%+Constant+141
+//%+Constant+145
 public class Constant : SYMBOL{
  private  string  m_type ;
  private  string  m_val ;
@@ -614,9 +655,9 @@ public class Constant : SYMBOL{
 }
 
 public override string yyname { get { return "Constant"; }}
-public override int yynum { get { return 141; }}
+public override int yynum { get { return 145; }}
 public Constant(Parser yyp):base(yyp){}}
-//%+VectorConstant+142
+//%+VectorConstant+146
 public class VectorConstant : Constant{
  public  VectorConstant (Parser yyp, Expression  valX , Expression  valY , Expression  valZ ):base(((LSLSyntax
 )yyp),"vector", null ){ kids . Add ( valX );
@@ -625,9 +666,9 @@ public class VectorConstant : Constant{
 }
 
 public override string yyname { get { return "VectorConstant"; }}
-public override int yynum { get { return 142; }}
+public override int yynum { get { return 146; }}
 public VectorConstant(Parser yyp):base(yyp){}}
-//%+RotationConstant+143
+//%+RotationConstant+147
 public class RotationConstant : Constant{
  public  RotationConstant (Parser yyp, Expression  valX , Expression  valY , Expression  valZ , Expression  valS ):base(((LSLSyntax
 )yyp),"rotation", null ){ kids . Add ( valX );
@@ -637,36 +678,36 @@ public class RotationConstant : Constant{
 }
 
 public override string yyname { get { return "RotationConstant"; }}
-public override int yynum { get { return 143; }}
+public override int yynum { get { return 147; }}
 public RotationConstant(Parser yyp):base(yyp){}}
-//%+ListConstant+144
+//%+ListConstant+148
 public class ListConstant : Constant{
  public  ListConstant (Parser yyp, ArgumentList  al ):base(((LSLSyntax
 )yyp),"list", null ){ kids . Add ( al );
 }
 
 public override string yyname { get { return "ListConstant"; }}
-public override int yynum { get { return 144; }}
+public override int yynum { get { return 148; }}
 public ListConstant(Parser yyp):base(yyp){}}
-//%+Expression+145
+//%+Expression+149
 public class Expression : SYMBOL{
  protected  void  AddExpression ( Expression  e ){ if ( e  is  ConstantExpression ) while (0< e . kids . Count ) kids . Add ( e . kids . Pop ());
  else  kids . Add ( e );
 }
 
 public override string yyname { get { return "Expression"; }}
-public override int yynum { get { return 145; }}
+public override int yynum { get { return 149; }}
 public Expression(Parser yyp):base(yyp){}}
-//%+ConstantExpression+146
+//%+ConstantExpression+150
 public class ConstantExpression : Expression{
  public  ConstantExpression (Parser yyp, Constant  c ):base(((LSLSyntax
 )yyp)){ kids . Add ( c );
 }
 
 public override string yyname { get { return "ConstantExpression"; }}
-public override int yynum { get { return 146; }}
+public override int yynum { get { return 150; }}
 public ConstantExpression(Parser yyp):base(yyp){}}
-//%+IdentExpression+147
+//%+IdentExpression+151
 public class IdentExpression : Expression{
  protected  string  m_name ;
  public  IdentExpression (Parser yyp, string  name ):base(((LSLSyntax
@@ -679,9 +720,9 @@ public class IdentExpression : Expression{
 }
 
 public override string yyname { get { return "IdentExpression"; }}
-public override int yynum { get { return 147; }}
+public override int yynum { get { return 151; }}
 public IdentExpression(Parser yyp):base(yyp){}}
-//%+IdentDotExpression+148
+//%+IdentDotExpression+152
 public class IdentDotExpression : IdentExpression{
  private  string  m_member ;
  public  IdentDotExpression (Parser yyp, string  name , string  member ):base(((LSLSyntax
@@ -695,18 +736,18 @@ public class IdentDotExpression : IdentExpression{
 }
 
 public override string yyname { get { return "IdentDotExpression"; }}
-public override int yynum { get { return 148; }}
+public override int yynum { get { return 152; }}
 public IdentDotExpression(Parser yyp):base(yyp){}}
-//%+FunctionCallExpression+149
+//%+FunctionCallExpression+153
 public class FunctionCallExpression : Expression{
  public  FunctionCallExpression (Parser yyp, FunctionCall  fc ):base(((LSLSyntax
 )yyp)){ kids . Add ( fc );
 }
 
 public override string yyname { get { return "FunctionCallExpression"; }}
-public override int yynum { get { return 149; }}
+public override int yynum { get { return 153; }}
 public FunctionCallExpression(Parser yyp):base(yyp){}}
-//%+BinaryExpression+150
+//%+BinaryExpression+154
 public class BinaryExpression : Expression{
  private  string  m_expressionSymbol ;
  public  BinaryExpression (Parser yyp, Expression  lhs , Expression  rhs , string  expressionSymbol ):base(((LSLSyntax
@@ -721,9 +762,9 @@ public class BinaryExpression : Expression{
 }
 
 public override string yyname { get { return "BinaryExpression"; }}
-public override int yynum { get { return 150; }}
+public override int yynum { get { return 154; }}
 public BinaryExpression(Parser yyp):base(yyp){}}
-//%+UnaryExpression+151
+//%+UnaryExpression+155
 public class UnaryExpression : Expression{
  private  string  m_unarySymbol ;
  public  UnaryExpression (Parser yyp, string  unarySymbol , Expression  e ):base(((LSLSyntax
@@ -737,9 +778,9 @@ public class UnaryExpression : Expression{
 }
 
 public override string yyname { get { return "UnaryExpression"; }}
-public override int yynum { get { return 151; }}
+public override int yynum { get { return 155; }}
 public UnaryExpression(Parser yyp):base(yyp){}}
-//%+TypecastExpression+152
+//%+TypecastExpression+156
 public class TypecastExpression : Expression{
  private  string  m_typecastType ;
  public  TypecastExpression (Parser yyp, string  typecastType , SYMBOL  rhs ):base(((LSLSyntax
@@ -753,18 +794,18 @@ public class TypecastExpression : Expression{
 }
 
 public override string yyname { get { return "TypecastExpression"; }}
-public override int yynum { get { return 152; }}
+public override int yynum { get { return 156; }}
 public TypecastExpression(Parser yyp):base(yyp){}}
-//%+ParenthesisExpression+153
+//%+ParenthesisExpression+157
 public class ParenthesisExpression : Expression{
  public  ParenthesisExpression (Parser yyp, SYMBOL  s ):base(((LSLSyntax
 )yyp)){ kids . Add ( s );
 }
 
 public override string yyname { get { return "ParenthesisExpression"; }}
-public override int yynum { get { return 153; }}
+public override int yynum { get { return 157; }}
 public ParenthesisExpression(Parser yyp):base(yyp){}}
-//%+IncrementDecrementExpression+154
+//%+IncrementDecrementExpression+158
 public class IncrementDecrementExpression : Expression{
  private  string  m_name ;
  private  string  m_operation ;
@@ -792,7 +833,7 @@ public class IncrementDecrementExpression : Expression{
 }
 
 public override string yyname { get { return "IncrementDecrementExpression"; }}
-public override int yynum { get { return 154; }}
+public override int yynum { get { return 158; }}
 public IncrementDecrementExpression(Parser yyp):base(yyp){}}
 
 public class LSLProgramRoot_1 : LSLProgramRoot {
@@ -952,6 +993,18 @@ public class StateBody_10 : StateBody {
 	((VectorArgStateEvent)(yyq.StackAt(0).m_value))
 	){}}
 
+public class StateBody_11 : StateBody {
+  public StateBody_11(Parser yyq):base(yyq,
+	((IntRotRotArgStateEvent)(yyq.StackAt(0).m_value))
+	){}}
+
+public class StateBody_12 : StateBody {
+  public StateBody_12(Parser yyq):base(yyq,
+	((StateBody)(yyq.StackAt(1).m_value))
+	, 
+	((IntRotRotArgStateEvent)(yyq.StackAt(0).m_value))
+	){}}
+
 public class StateEvent_1 : StateEvent {
   public StateEvent_1(Parser yyq):base(yyq,
 	((Event)(yyq.StackAt(4).m_value))
@@ -995,6 +1048,15 @@ public class VectorArgStateEvent_1 : VectorArgStateEvent {
 	((CompoundStatement)(yyq.StackAt(0).m_value))
 	){}}
 
+public class IntRotRotArgStateEvent_1 : IntRotRotArgStateEvent {
+  public IntRotRotArgStateEvent_1(Parser yyq):base(yyq,
+	((IntRotRotArgEvent)(yyq.StackAt(4).m_value))
+	.yytext, 
+	((IntRotRotArgumentDeclarationList)(yyq.StackAt(2).m_value))
+	, 
+	((CompoundStatement)(yyq.StackAt(0).m_value))
+	){}}
+
 public class ArgumentDeclarationList_1 : ArgumentDeclarationList {
   public ArgumentDeclarationList_1(Parser yyq):base(yyq,
 	((Declaration)(yyq.StackAt(0).m_value))
@@ -1022,6 +1084,15 @@ public class VectorArgumentDeclarationList_1 : VectorArgumentDeclarationList {
 	((VectorDeclaration)(yyq.StackAt(0).m_value))
 	){}}
 
+public class IntRotRotArgumentDeclarationList_1 : IntRotRotArgumentDeclarationList {
+  public IntRotRotArgumentDeclarationList_1(Parser yyq):base(yyq,
+	((IntDeclaration)(yyq.StackAt(4).m_value))
+	, 
+	((RotDeclaration)(yyq.StackAt(2).m_value))
+	, 
+	((RotDeclaration)(yyq.StackAt(0).m_value))
+	){}}
+
 public class Declaration_1 : Declaration {
   public Declaration_1(Parser yyq):base(yyq,
 	((Typename)(yyq.StackAt(1).m_value))
@@ -1050,6 +1121,13 @@ public class VectorDeclaration_1 : VectorDeclaration {
 	((IDENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
+public class RotDeclaration_1 : RotDeclaration {
+  public RotDeclaration_1(Parser yyq):base(yyq,
+	((ROTATION_TYPE)(yyq.StackAt(1).m_value))
+	.yytext, 
+	((IDENT)(yyq.StackAt(0).m_value))
+	.yytext){}}
+
 public class CompoundStatement_1 : CompoundStatement {
   public CompoundStatement_1(Parser yyq):base(yyq){}}
 
@@ -2010,56 +2088,51 @@ public class Typename_7 : Typename {
 
 public class Event_1 : Event {
   public Event_1(Parser yyq):base(yyq,
-	((AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value))
+	((AT_TARGET_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_2 : Event {
   public Event_2(Parser yyq):base(yyq,
-	((AT_TARGET_EVENT)(yyq.StackAt(0).m_value))
+	((CONTROL_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_3 : Event {
   public Event_3(Parser yyq):base(yyq,
-	((CONTROL_EVENT)(yyq.StackAt(0).m_value))
+	((DATASERVER_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_4 : Event {
   public Event_4(Parser yyq):base(yyq,
-	((DATASERVER_EVENT)(yyq.StackAt(0).m_value))
+	((EMAIL_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_5 : Event {
   public Event_5(Parser yyq):base(yyq,
-	((EMAIL_EVENT)(yyq.StackAt(0).m_value))
+	((HTTP_RESPONSE_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_6 : Event {
   public Event_6(Parser yyq):base(yyq,
-	((HTTP_RESPONSE_EVENT)(yyq.StackAt(0).m_value))
+	((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_7 : Event {
   public Event_7(Parser yyq):base(yyq,
-	((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value))
+	((LISTEN_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_8 : Event {
   public Event_8(Parser yyq):base(yyq,
-	((LISTEN_EVENT)(yyq.StackAt(0).m_value))
+	((MONEY_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_9 : Event {
   public Event_9(Parser yyq):base(yyq,
-	((MONEY_EVENT)(yyq.StackAt(0).m_value))
+	((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_10 : Event {
   public Event_10(Parser yyq):base(yyq,
-	((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value))
-	.yytext){}}
-
-public class Event_11 : Event {
-  public Event_11(Parser yyq):base(yyq,
 	((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
@@ -2177,6 +2250,11 @@ public class VectorArgEvent_3 : VectorArgEvent {
   public VectorArgEvent_3(Parser yyq):base(yyq,
 	((LAND_COLLISION_START_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
+
+public class IntRotRotArgEvent_1 : IntRotRotArgEvent {
+  public IntRotRotArgEvent_1(Parser yyq):base(yyq,
+	((AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value))
+	.yytext){}}
 public class yyLSLSyntax
 : YyParser {
   public override object Action(Parser yyq,SYMBOL yysym, int yyact) {
@@ -2209,9 +2287,9 @@ public yyLSLSyntax
 97,0,109,0,82,
 0,111,0,111,0,
 116,0,1,96,1,
-2,104,18,1,2777,
+2,104,18,1,2799,
 102,2,0,105,5,
-356,1,0,106,18,
+370,1,0,106,18,
 1,0,0,2,0,
 1,1,107,18,1,
 1,108,20,109,4,
@@ -2272,7 +2350,7 @@ public yyLSLSyntax
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,1,
-116,1,2,2,0,
+119,1,2,2,0,
 1,9,131,18,1,
 9,132,20,133,4,
 10,73,0,68,0,
@@ -2286,529 +2364,510 @@ public yyLSLSyntax
 65,0,82,0,69,
 0,78,0,1,16,
 1,1,2,0,1,
-18,137,18,1,18,
-129,2,0,1,19,
-138,18,1,19,132,
-2,0,1,20,139,
-18,1,20,140,20,
-141,4,46,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,1,
-108,1,2,2,0,
-1,21,142,18,1,
-21,143,20,144,4,
-10,67,0,79,0,
-77,0,77,0,65,
-0,1,14,1,1,
-2,0,1,1694,145,
-18,1,1694,146,20,
-147,4,32,70,0,
-111,0,114,0,76,
-0,111,0,111,0,
-112,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-1,136,1,2,2,
-0,1,1695,148,18,
-1,1695,143,2,0,
-1,2645,149,18,1,
-2645,150,20,151,4,
-18,83,0,116,0,
-97,0,116,0,101,
-0,66,0,111,0,
-100,0,121,0,1,
-102,1,2,2,0,
-1,30,152,18,1,
-30,153,20,154,4,
-22,68,0,101,0,
+2796,137,18,1,2796,
+138,20,139,4,50,
+71,0,108,0,111,
+0,98,0,97,0,
+108,0,86,0,97,
+0,114,0,105,0,
+97,0,98,0,108,
+0,101,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+1,98,1,2,2,
+0,1,2797,140,18,
+1,2797,141,20,142,
+4,48,71,0,108,
+0,111,0,98,0,
+97,0,108,0,70,
+0,117,0,110,0,
+99,0,116,0,105,
+0,111,0,110,0,
+68,0,101,0,102,
+0,105,0,110,0,
+105,0,116,0,105,
+0,111,0,110,0,
+1,99,1,2,2,
+0,1,2798,143,18,
+1,2798,138,2,0,
+1,2799,104,1,2800,
+144,18,1,2800,145,
+23,146,4,6,69,
+0,79,0,70,0,
+1,2,1,6,2,
+0,1,18,147,18,
+1,18,129,2,0,
+1,19,148,18,1,
+19,132,2,0,1,
+20,149,18,1,20,
+150,20,151,4,46,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
-0,110,0,1,112,
+0,110,0,76,0,
+105,0,115,0,116,
+0,1,109,1,2,
+2,0,1,21,152,
+18,1,21,153,20,
+154,4,10,67,0,
+79,0,77,0,77,
+0,65,0,1,14,
+1,1,2,0,1,
+1694,155,18,1,1694,
+156,20,157,4,32,
+70,0,111,0,114,
+0,76,0,111,0,
+111,0,112,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,140,1,
+2,2,0,1,1695,
+158,18,1,1695,153,
+2,0,1,30,159,
+18,1,30,160,20,
+161,4,22,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+1,114,1,2,2,
+0,1,31,162,18,
+1,31,163,20,164,
+4,22,82,0,73,
+0,71,0,72,0,
+84,0,95,0,80,
+0,65,0,82,0,
+69,0,78,0,1,
+17,1,1,2,0,
+1,32,165,18,1,
+32,166,20,167,4,
+20,76,0,69,0,
+70,0,84,0,95,
+0,66,0,82,0,
+65,0,67,0,69,
+0,1,12,1,1,
+2,0,1,1114,168,
+18,1,1114,132,2,
+0,1,2735,169,18,
+1,2735,163,2,0,
+1,1152,170,18,1,
+1152,171,20,172,4,
+32,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,1,131,
 1,2,2,0,1,
-31,155,18,1,31,
-156,20,157,4,22,
+1117,173,18,1,1117,
+174,20,175,4,28,
+80,0,69,0,82,
+0,67,0,69,0,
+78,0,84,0,95,
+0,69,0,81,0,
+85,0,65,0,76,
+0,83,0,1,10,
+1,1,2,0,1,
+40,176,18,1,40,
+132,2,0,1,41,
+177,18,1,41,135,
+2,0,1,42,178,
+18,1,42,179,20,
+180,4,20,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,149,
+1,2,2,0,1,
+43,181,18,1,43,
+182,20,183,4,22,
 82,0,73,0,71,
 0,72,0,84,0,
-95,0,80,0,65,
+95,0,83,0,72,
+0,73,0,70,0,
+84,0,1,41,1,
+1,2,0,1,44,
+184,18,1,44,132,
+2,0,1,1159,185,
+18,1,1159,179,2,
+0,1,46,186,18,
+1,46,187,20,188,
+4,12,80,0,69,
+0,82,0,73,0,
+79,0,68,0,1,
+24,1,1,2,0,
+1,47,189,18,1,
+47,132,2,0,1,
+48,190,18,1,48,
+191,20,192,4,18,
+68,0,69,0,67,
 0,82,0,69,0,
-78,0,1,17,1,
-1,2,0,1,32,
-158,18,1,32,159,
-20,160,4,20,76,
-0,69,0,70,0,
-84,0,95,0,66,
-0,82,0,65,0,
-67,0,69,0,1,
-12,1,1,2,0,
-1,1114,161,18,1,
-1114,132,2,0,1,
-1152,162,18,1,1152,
-163,20,164,4,32,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,1,127,1,
-2,2,0,1,1117,
-165,18,1,1117,166,
-20,167,4,28,80,
-0,69,0,82,0,
-67,0,69,0,78,
-0,84,0,95,0,
-69,0,81,0,85,
-0,65,0,76,0,
-83,0,1,10,1,
-1,2,0,1,40,
-168,18,1,40,132,
-2,0,1,41,169,
-18,1,41,135,2,
-0,1,42,170,18,
-1,42,171,20,172,
-4,20,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,1,145,1,
-2,2,0,1,43,
-173,18,1,43,174,
-20,175,4,22,82,
-0,73,0,71,0,
-72,0,84,0,95,
-0,83,0,72,0,
-73,0,70,0,84,
-0,1,41,1,1,
-2,0,1,44,176,
-18,1,44,132,2,
-0,1,1159,177,18,
-1,1159,171,2,0,
-1,46,178,18,1,
-46,179,20,180,4,
-12,80,0,69,0,
-82,0,73,0,79,
-0,68,0,1,24,
+77,0,69,0,78,
+0,84,0,1,5,
 1,1,2,0,1,
-47,181,18,1,47,
-132,2,0,1,48,
-182,18,1,48,183,
-20,184,4,18,68,
-0,69,0,67,0,
-82,0,69,0,77,
-0,69,0,78,0,
-84,0,1,5,1,
-1,2,0,1,49,
-185,18,1,49,186,
-20,187,4,18,73,
-0,78,0,67,0,
-82,0,69,0,77,
-0,69,0,78,0,
-84,0,1,4,1,
-1,2,0,1,50,
-188,18,1,50,183,
-2,0,1,51,189,
-18,1,51,186,2,
-0,1,52,190,18,
-1,52,135,2,0,
-1,2281,191,18,1,
-2281,163,2,0,1,
-2754,192,18,1,2754,
-193,20,194,4,18,
+49,193,18,1,49,
+194,20,195,4,18,
+73,0,78,0,67,
+0,82,0,69,0,
+77,0,69,0,78,
+0,84,0,1,4,
+1,1,2,0,1,
+50,196,18,1,50,
+191,2,0,1,51,
+197,18,1,51,194,
+2,0,1,52,198,
+18,1,52,135,2,
+0,1,2281,199,18,
+1,2281,171,2,0,
+1,1730,200,18,1,
+1730,171,2,0,1,
+1731,201,18,1,1731,
+202,20,203,4,18,
 83,0,69,0,77,
 0,73,0,67,0,
 79,0,76,0,79,
 0,78,0,1,11,
 1,1,2,0,1,
-2755,195,18,1,2755,
-196,20,197,4,34,
-71,0,108,0,111,
-0,98,0,97,0,
-108,0,68,0,101,
-0,102,0,105,0,
-110,0,105,0,116,
-0,105,0,111,0,
-110,0,115,0,1,
-97,1,2,2,0,
-1,1730,198,18,1,
-1730,163,2,0,1,
-1731,199,18,1,1731,
-193,2,0,1,61,
-200,18,1,61,129,
-2,0,1,62,201,
-18,1,62,156,2,
-0,1,63,202,18,
-1,63,132,2,0,
-1,65,203,18,1,
-65,179,2,0,1,
-66,204,18,1,66,
-132,2,0,1,67,
-205,18,1,67,183,
-2,0,1,68,206,
-18,1,68,186,2,
-0,1,69,207,18,
-1,69,183,2,0,
-1,70,208,18,1,
-70,186,2,0,1,
-71,209,18,1,71,
-135,2,0,1,73,
-210,18,1,73,171,
-2,0,1,74,211,
-18,1,74,156,2,
-0,1,1189,212,18,
-1,1189,213,20,214,
-4,22,83,0,84,
-0,65,0,82,0,
-95,0,69,0,81,
-0,85,0,65,0,
-76,0,83,0,1,
-8,1,1,2,0,
-1,76,215,18,1,
-76,216,20,217,4,
-20,76,0,69,0,
-70,0,84,0,95,
-0,83,0,72,0,
-73,0,70,0,84,
-0,1,40,1,1,
-2,0,1,1153,218,
-18,1,1153,219,20,
-220,4,24,83,0,
-76,0,65,0,83,
-0,72,0,95,0,
-69,0,81,0,85,
-0,65,0,76,0,
-83,0,1,9,1,
-1,2,0,1,79,
-221,18,1,79,222,
-20,223,4,10,84,
-0,73,0,76,0,
-68,0,69,0,1,
-36,1,1,2,0,
-1,1195,224,18,1,
-1195,171,2,0,1,
-82,225,18,1,82,
-171,2,0,1,1123,
-226,18,1,1123,171,
-2,0,1,85,227,
-18,1,85,228,20,
-229,4,26,83,0,
-84,0,82,0,79,
-0,75,0,69,0,
-95,0,83,0,84,
-0,82,0,79,0,
-75,0,69,0,1,
-39,1,1,2,0,
-1,2547,230,18,1,
-2547,140,2,0,1,
-89,231,18,1,89,
-232,20,233,4,10,
-77,0,73,0,78,
-0,85,0,83,0,
-1,19,1,1,2,
-0,1,2318,234,18,
-1,2318,193,2,0,
-1,93,235,18,1,
-93,171,2,0,1,
-97,236,18,1,97,
-237,20,238,4,14,
-65,0,77,0,80,
-0,95,0,65,0,
-77,0,80,0,1,
-38,1,1,2,0,
-1,102,239,18,1,
-102,240,20,241,4,
-22,69,0,88,0,
-67,0,76,0,65,
-0,77,0,65,0,
-84,0,73,0,79,
-0,78,0,1,37,
-1,1,2,0,1,
-1775,242,18,1,1775,
-156,2,0,1,107,
-243,18,1,107,171,
-2,0,1,2337,244,
-18,1,2337,156,2,
-0,1,1224,245,18,
-1,1224,163,2,0,
-1,1225,246,18,1,
-1225,247,20,248,4,
-24,77,0,73,0,
-78,0,85,0,83,
-0,95,0,69,0,
-81,0,85,0,65,
-0,76,0,83,0,
-1,7,1,1,2,
-0,1,112,249,18,
-1,112,250,20,251,
-4,28,71,0,82,
-0,69,0,65,0,
-84,0,69,0,82,
-0,95,0,69,0,
-81,0,85,0,65,
-0,76,0,83,0,
-1,32,1,1,2,
-0,1,1188,252,18,
-1,1188,163,2,0,
-1,1231,253,18,1,
-1231,171,2,0,1,
-118,254,18,1,118,
-171,2,0,1,1737,
-255,18,1,1737,171,
-2,0,1,124,256,
-18,1,124,257,20,
-258,4,22,76,0,
-69,0,83,0,83,
+61,204,18,1,61,
+129,2,0,1,62,
+205,18,1,62,163,
+2,0,1,63,206,
+18,1,63,132,2,
+0,1,65,207,18,
+1,65,187,2,0,
+1,66,208,18,1,
+66,132,2,0,1,
+67,209,18,1,67,
+191,2,0,1,68,
+210,18,1,68,194,
+2,0,1,69,211,
+18,1,69,191,2,
+0,1,70,212,18,
+1,70,194,2,0,
+1,71,213,18,1,
+71,135,2,0,1,
+73,214,18,1,73,
+179,2,0,1,74,
+215,18,1,74,163,
+2,0,1,1189,216,
+18,1,1189,217,20,
+218,4,22,83,0,
+84,0,65,0,82,
 0,95,0,69,0,
 81,0,85,0,65,
 0,76,0,83,0,
-1,31,1,1,2,
-0,1,130,259,18,
-1,130,171,2,0,
-1,1803,260,18,1,
-1803,261,20,262,4,
-18,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,1,
-124,1,2,2,0,
-1,1804,263,18,1,
-1804,264,20,265,4,
-4,68,0,79,0,
-1,44,1,1,2,
-0,1,2364,266,18,
-1,2364,261,2,0,
-1,137,267,18,1,
-137,268,20,269,4,
-36,69,0,88,0,
-67,0,76,0,65,
-0,77,0,65,0,
-84,0,73,0,79,
-0,78,0,95,0,
-69,0,81,0,85,
-0,65,0,76,0,
-83,0,1,30,1,
-1,2,0,1,2293,
-270,18,1,2293,193,
-2,0,1,1701,271,
-18,1,1701,171,2,
-0,1,1756,272,18,
-1,1756,193,2,0,
-1,2527,273,18,1,
-2527,274,20,275,4,
-28,75,0,101,0,
-121,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,1,
-113,1,2,2,0,
-1,143,276,18,1,
-143,171,2,0,1,
-2299,277,18,1,2299,
-171,2,0,1,1260,
-278,18,1,1260,163,
-2,0,1,1261,279,
-18,1,1261,280,20,
-281,4,22,80,0,
-76,0,85,0,83,
-0,95,0,69,0,
+1,8,1,1,2,
+0,1,76,219,18,
+1,76,220,20,221,
+4,20,76,0,69,
+0,70,0,84,0,
+95,0,83,0,72,
+0,73,0,70,0,
+84,0,1,40,1,
+1,2,0,1,1153,
+222,18,1,1153,223,
+20,224,4,24,83,
+0,76,0,65,0,
+83,0,72,0,95,
+0,69,0,81,0,
+85,0,65,0,76,
+0,83,0,1,9,
+1,1,2,0,1,
+79,225,18,1,79,
+226,20,227,4,10,
+84,0,73,0,76,
+0,68,0,69,0,
+1,36,1,1,2,
+0,1,1195,228,18,
+1,1195,179,2,0,
+1,82,229,18,1,
+82,179,2,0,1,
+1123,230,18,1,1123,
+179,2,0,1,85,
+231,18,1,85,232,
+20,233,4,26,83,
+0,84,0,82,0,
+79,0,75,0,69,
+0,95,0,83,0,
+84,0,82,0,79,
+0,75,0,69,0,
+1,39,1,1,2,
+0,1,2547,234,18,
+1,2547,235,20,236,
+4,24,86,0,111,
+0,105,0,100,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,121,1,2,
+2,0,1,89,237,
+18,1,89,238,20,
+239,4,10,77,0,
+73,0,78,0,85,
+0,83,0,1,19,
+1,1,2,0,1,
+2318,240,18,1,2318,
+202,2,0,1,2788,
+241,18,1,2788,242,
+20,243,4,12,83,
+0,116,0,97,0,
+116,0,101,0,115,
+0,1,100,1,2,
+2,0,1,93,244,
+18,1,93,179,2,
+0,1,97,245,18,
+1,97,246,20,247,
+4,14,65,0,77,
+0,80,0,95,0,
+65,0,77,0,80,
+0,1,38,1,1,
+2,0,1,2795,248,
+18,1,2795,141,2,
+0,1,102,249,18,
+1,102,250,20,251,
+4,22,69,0,88,
+0,67,0,76,0,
+65,0,77,0,65,
+0,84,0,73,0,
+79,0,78,0,1,
+37,1,1,2,0,
+1,1775,252,18,1,
+1775,163,2,0,1,
+107,253,18,1,107,
+179,2,0,1,2337,
+254,18,1,2337,163,
+2,0,1,1224,255,
+18,1,1224,171,2,
+0,1,1225,256,18,
+1,1225,257,20,258,
+4,24,77,0,73,
+0,78,0,85,0,
+83,0,95,0,69,
+0,81,0,85,0,
+65,0,76,0,83,
+0,1,7,1,1,
+2,0,1,112,259,
+18,1,112,260,20,
+261,4,28,71,0,
+82,0,69,0,65,
+0,84,0,69,0,
+82,0,95,0,69,
+0,81,0,85,0,
+65,0,76,0,83,
+0,1,32,1,1,
+2,0,1,1188,262,
+18,1,1188,171,2,
+0,1,1231,263,18,
+1,1231,179,2,0,
+1,118,264,18,1,
+118,179,2,0,1,
+1737,265,18,1,1737,
+179,2,0,1,124,
+266,18,1,124,267,
+20,268,4,22,76,
+0,69,0,83,0,
+83,0,95,0,69,
+0,81,0,85,0,
+65,0,76,0,83,
+0,1,31,1,1,
+2,0,1,2737,269,
+18,1,2737,270,20,
+271,4,34,67,0,
+111,0,109,0,112,
+0,111,0,117,0,
+110,0,100,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,126,1,
+2,2,0,1,130,
+272,18,1,130,179,
+2,0,1,1803,273,
+18,1,1803,274,20,
+275,4,18,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,1,128,1,2,
+2,0,1,1804,276,
+18,1,1804,277,20,
+278,4,4,68,0,
+79,0,1,44,1,
+1,2,0,1,2364,
+279,18,1,2364,274,
+2,0,1,137,280,
+18,1,137,281,20,
+282,4,36,69,0,
+88,0,67,0,76,
+0,65,0,77,0,
+65,0,84,0,73,
+0,79,0,78,0,
+95,0,69,0,81,
+0,85,0,65,0,
+76,0,83,0,1,
+30,1,1,2,0,
+1,2293,283,18,1,
+2293,202,2,0,1,
+1701,284,18,1,1701,
+179,2,0,1,1756,
+285,18,1,1756,202,
+2,0,1,2527,286,
+18,1,2527,163,2,
+0,1,143,287,18,
+1,143,179,2,0,
+1,2299,288,18,1,
+2299,179,2,0,1,
+1260,289,18,1,1260,
+171,2,0,1,1261,
+290,18,1,1261,291,
+20,292,4,22,80,
+0,76,0,85,0,
+83,0,95,0,69,
+0,81,0,85,0,
+65,0,76,0,83,
+0,1,6,1,1,
+2,0,1,151,293,
+18,1,151,294,20,
+295,4,26,69,0,
 81,0,85,0,65,
 0,76,0,83,0,
-1,6,1,1,2,
-0,1,2528,282,18,
-1,2528,283,20,284,
-4,52,75,0,101,
-0,121,0,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,1,
-109,1,2,2,0,
-1,151,285,18,1,
-151,286,20,287,4,
-26,69,0,81,0,
-85,0,65,0,76,
-0,83,0,95,0,
-69,0,81,0,85,
-0,65,0,76,0,
-83,0,1,29,1,
-1,2,0,1,2605,
-288,18,1,2605,159,
-2,0,1,1267,289,
-18,1,1267,171,2,
-0,1,157,290,18,
-1,157,171,2,0,
-1,1773,291,18,1,
-1773,146,2,0,1,
-1832,292,18,1,1832,
-261,2,0,1,1833,
-293,18,1,1833,294,
-20,295,4,10,87,
-0,72,0,73,0,
-76,0,69,0,1,
-45,1,1,2,0,
-1,1834,296,18,1,
-1834,135,2,0,1,
-2773,297,18,1,2773,
-298,20,299,4,48,
-71,0,108,0,111,
-0,98,0,97,0,
-108,0,70,0,117,
-0,110,0,99,0,
-116,0,105,0,111,
-0,110,0,68,0,
-101,0,102,0,105,
-0,110,0,105,0,
-116,0,105,0,111,
-0,110,0,1,99,
-1,2,2,0,1,
-166,300,18,1,166,
-301,20,302,4,20,
-76,0,69,0,70,
-0,84,0,95,0,
-65,0,78,0,71,
-0,76,0,69,0,
-1,25,1,1,2,
-0,1,2776,303,18,
-1,2776,304,20,305,
-4,50,71,0,108,
-0,111,0,98,0,
-97,0,108,0,86,
-0,97,0,114,0,
-105,0,97,0,98,
-0,108,0,101,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,1,98,1,
-2,2,0,1,1840,
-306,18,1,1840,171,
-2,0,1,172,307,
-18,1,172,171,2,
-0,1,2335,308,18,
-1,2335,146,2,0,
-1,1296,309,18,1,
-1296,163,2,0,1,
-1297,310,18,1,1297,
-311,20,312,4,12,
+95,0,69,0,81,
+0,85,0,65,0,
+76,0,83,0,1,
+29,1,1,2,0,
+1,1267,296,18,1,
+1267,179,2,0,1,
+2765,297,18,1,2765,
+202,2,0,1,157,
+298,18,1,157,179,
+2,0,1,1773,299,
+18,1,1773,156,2,
+0,1,1832,300,18,
+1,1832,274,2,0,
+1,1833,301,18,1,
+1833,302,20,303,4,
+10,87,0,72,0,
+73,0,76,0,69,
+0,1,45,1,1,
+2,0,1,1834,304,
+18,1,1834,135,2,
+0,1,166,305,18,
+1,166,306,20,307,
+4,20,76,0,69,
+0,70,0,84,0,
+95,0,65,0,78,
+0,71,0,76,0,
+69,0,1,25,1,
+1,2,0,1,1840,
+308,18,1,1840,179,
+2,0,1,172,309,
+18,1,172,179,2,
+0,1,2335,310,18,
+1,2335,156,2,0,
+1,1296,311,18,1,
+1296,171,2,0,1,
+1297,312,18,1,1297,
+313,20,314,4,12,
 69,0,81,0,85,
 0,65,0,76,0,
 83,0,1,15,1,
 1,2,0,1,2413,
-313,18,1,2413,314,
-20,315,4,26,83,
+315,18,1,2413,316,
+20,317,4,26,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,76,0,105,
 0,115,0,116,0,
-1,123,1,2,2,
-0,1,1859,316,18,
-1,1859,156,2,0,
-1,1860,317,18,1,
-1860,193,2,0,1,
-188,318,18,1,188,
-171,2,0,1,182,
-319,18,1,182,320,
-20,321,4,22,82,
+1,127,1,2,2,
+0,1,1859,318,18,
+1,1859,163,2,0,
+1,1860,319,18,1,
+1860,202,2,0,1,
+188,320,18,1,188,
+179,2,0,1,182,
+321,18,1,182,322,
+20,323,4,22,82,
 0,73,0,71,0,
 72,0,84,0,95,
 0,65,0,78,0,
 71,0,76,0,69,
 0,1,26,1,1,
-2,0,1,199,322,
-18,1,199,323,20,
-324,4,10,67,0,
+2,0,1,199,324,
+18,1,199,325,20,
+326,4,10,67,0,
 65,0,82,0,69,
 0,84,0,1,35,
 1,1,2,0,1,
-1871,325,18,1,1871,
-163,2,0,1,1872,
-326,18,1,1872,156,
-2,0,1,1873,327,
-18,1,1873,193,2,
-0,1,1875,328,18,
-1,1875,294,2,0,
-1,205,329,18,1,
-205,171,2,0,1,
-2515,330,18,1,2515,
-135,2,0,1,1882,
-331,18,1,1882,171,
-2,0,1,2227,332,
-18,1,2227,261,2,
-0,1,217,333,18,
-1,217,334,20,335,
-4,12,83,0,84,
-0,82,0,79,0,
-75,0,69,0,1,
-34,1,1,2,0,
-1,1332,336,18,1,
-1332,163,2,0,1,
-2743,337,18,1,2743,
-193,2,0,1,1335,
-338,18,1,1335,166,
-2,0,1,223,339,
-18,1,223,171,2,
-0,1,1341,340,18,
-1,1341,171,2,0,
-1,2599,341,18,1,
-2599,342,20,343,4,
-38,86,0,101,0,
-99,0,116,0,111,
-0,114,0,65,0,
-114,0,103,0,83,
-0,116,0,97,0,
-116,0,101,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
-107,1,2,2,0,
-1,1901,344,18,1,
-1901,156,2,0,1,
-1303,345,18,1,1303,
-171,2,0,1,2462,
-346,18,1,2462,261,
-2,0,1,236,347,
-18,1,236,348,20,
-349,4,6,65,0,
-77,0,80,0,1,
-33,1,1,2,0,
-1,2466,350,18,1,
-2466,351,20,352,4,
-34,67,0,111,0,
-109,0,112,0,111,
-0,117,0,110,0,
-100,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-1,122,1,2,2,
-0,1,2467,353,18,
-1,2467,153,2,0,
-1,2468,354,18,1,
-2468,355,20,356,4,
+1871,327,18,1,1871,
+171,2,0,1,1872,
+328,18,1,1872,163,
+2,0,1,1873,329,
+18,1,1873,202,2,
+0,1,1875,330,18,
+1,1875,302,2,0,
+1,205,331,18,1,
+205,179,2,0,1,
+1882,332,18,1,1882,
+179,2,0,1,2227,
+333,18,1,2227,274,
+2,0,1,217,334,
+18,1,217,335,20,
+336,4,12,83,0,
+84,0,82,0,79,
+0,75,0,69,0,
+1,34,1,1,2,
+0,1,1332,337,18,
+1,1332,171,2,0,
+1,1335,338,18,1,
+1335,174,2,0,1,
+223,339,18,1,223,
+179,2,0,1,1341,
+340,18,1,1341,179,
+2,0,1,1901,341,
+18,1,1901,163,2,
+0,1,1303,342,18,
+1,1303,179,2,0,
+1,2462,343,18,1,
+2462,274,2,0,1,
+236,344,18,1,236,
+345,20,346,4,6,
+65,0,77,0,80,
+0,1,33,1,1,
+2,0,1,2466,347,
+18,1,2466,270,2,
+0,1,2467,348,18,
+1,2467,160,2,0,
+1,2468,349,18,1,
+2468,350,20,351,4,
 10,83,0,84,0,
 65,0,84,0,69,
 0,1,48,1,1,
-2,0,1,2469,357,
+2,0,1,2469,352,
 18,1,2469,132,2,
-0,1,242,358,18,
-1,242,171,2,0,
-1,2471,359,18,1,
-2471,360,20,361,4,
+0,1,242,353,18,
+1,242,179,2,0,
+1,2471,354,18,1,
+2471,355,20,356,4,
+38,65,0,84,0,
+95,0,82,0,79,
+0,84,0,95,0,
+84,0,65,0,82,
+0,71,0,69,0,
+84,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+58,1,1,2,0,
+1,2472,357,18,1,
+2472,358,20,359,4,
 52,76,0,65,0,
 78,0,68,0,95,
 0,67,0,79,0,
@@ -2821,8 +2880,8 @@ public yyLSLSyntax
 86,0,69,0,78,
 0,84,0,1,71,
 1,1,2,0,1,
-2472,362,18,1,2472,
-363,20,364,4,48,
+2473,360,18,1,2473,
+361,20,362,4,48,
 76,0,65,0,78,
 0,68,0,95,0,
 67,0,79,0,76,
@@ -2834,8 +2893,8 @@ public yyLSLSyntax
 86,0,69,0,78,
 0,84,0,1,70,
 1,1,2,0,1,
-2473,365,18,1,2473,
-366,20,367,4,40,
+2474,363,18,1,2474,
+364,20,365,4,40,
 76,0,65,0,78,
 0,68,0,95,0,
 67,0,79,0,76,
@@ -2845,8 +2904,8 @@ public yyLSLSyntax
 69,0,86,0,69,
 0,78,0,84,0,
 1,69,1,1,2,
-0,1,2474,368,18,
-1,2474,369,20,370,
+0,1,2475,366,18,
+1,2475,367,20,368,
 4,34,84,0,79,
 0,85,0,67,0,
 72,0,95,0,83,
@@ -2855,9 +2914,9 @@ public yyLSLSyntax
 0,69,0,86,0,
 69,0,78,0,84,
 0,1,89,1,1,
-2,0,1,2475,371,
-18,1,2475,372,20,
-373,4,30,84,0,
+2,0,1,2476,369,
+18,1,2476,370,20,
+371,4,30,84,0,
 79,0,85,0,67,
 0,72,0,95,0,
 69,0,78,0,68,
@@ -2865,24 +2924,24 @@ public yyLSLSyntax
 86,0,69,0,78,
 0,84,0,1,90,
 1,1,2,0,1,
-2476,374,18,1,2476,
-375,20,376,4,22,
+2477,372,18,1,2477,
+373,20,374,4,22,
 84,0,79,0,85,
 0,67,0,72,0,
 95,0,69,0,86,
 0,69,0,78,0,
 84,0,1,88,1,
-1,2,0,1,2477,
-377,18,1,2477,378,
-20,379,4,24,83,
+1,2,0,1,2478,
+375,18,1,2478,376,
+20,377,4,24,83,
 0,69,0,78,0,
 83,0,79,0,82,
 0,95,0,69,0,
 86,0,69,0,78,
 0,84,0,1,84,
 1,1,2,0,1,
-2478,380,18,1,2478,
-381,20,382,4,52,
+2479,378,18,1,2479,
+379,20,380,4,52,
 82,0,85,0,78,
 0,95,0,84,0,
 73,0,77,0,69,
@@ -2894,17 +2953,17 @@ public yyLSLSyntax
 95,0,69,0,86,
 0,69,0,78,0,
 84,0,1,83,1,
-1,2,0,1,2479,
-383,18,1,2479,384,
-20,385,4,24,79,
+1,2,0,1,2480,
+381,18,1,2480,382,
+20,383,4,24,79,
 0,78,0,95,0,
 82,0,69,0,90,
 0,95,0,69,0,
 86,0,69,0,78,
 0,84,0,1,81,
 1,1,2,0,1,
-2480,386,18,1,2480,
-387,20,388,4,42,
+2481,384,18,1,2481,
+385,20,386,4,42,
 67,0,79,0,76,
 0,76,0,73,0,
 83,0,73,0,79,
@@ -2914,9 +2973,9 @@ public yyLSLSyntax
 95,0,69,0,86,
 0,69,0,78,0,
 84,0,1,64,1,
-1,2,0,1,2481,
-389,18,1,2481,390,
-20,391,4,38,67,
+1,2,0,1,2482,
+387,18,1,2482,388,
+20,389,4,38,67,
 0,79,0,76,0,
 76,0,73,0,83,
 0,73,0,79,0,
@@ -2925,9 +2984,9 @@ public yyLSLSyntax
 95,0,69,0,86,
 0,69,0,78,0,
 84,0,1,63,1,
-1,2,0,1,2482,
-392,18,1,2482,393,
-20,394,4,30,67,
+1,2,0,1,2483,
+390,18,1,2483,391,
+20,392,4,30,67,
 0,79,0,76,0,
 76,0,73,0,83,
 0,73,0,79,0,
@@ -2935,692 +2994,755 @@ public yyLSLSyntax
 0,86,0,69,0,
 78,0,84,0,1,
 62,1,1,2,0,
-1,2483,395,18,1,
-2483,396,20,397,4,
-26,67,0,72,0,
-65,0,78,0,71,
-0,69,0,68,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,61,1,
-1,2,0,1,256,
-398,18,1,256,399,
-20,400,4,14,80,
-0,69,0,82,0,
-67,0,69,0,78,
-0,84,0,1,22,
-1,1,2,0,1,
-1371,401,18,1,1371,
-219,2,0,1,2486,
-402,18,1,2486,403,
-20,404,4,22,84,
-0,73,0,77,0,
-69,0,82,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,87,1,1,
-2,0,1,2487,405,
-18,1,2487,406,20,
-407,4,38,78,0,
-79,0,84,0,95,
-0,65,0,84,0,
-95,0,84,0,65,
-0,82,0,71,0,
-69,0,84,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,79,1,1,
-2,0,1,1931,408,
-18,1,1931,261,2,
-0,1,1932,409,18,
-1,1932,410,20,411,
-4,4,73,0,70,
-0,1,42,1,1,
-2,0,1,262,412,
-18,1,262,171,2,
-0,1,1377,413,18,
-1,1377,171,2,0,
-1,2492,414,18,1,
-2492,415,20,416,4,
-32,83,0,84,0,
-65,0,84,0,69,
-0,95,0,69,0,
-88,0,73,0,84,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,86,
-1,1,2,0,1,
-1876,417,18,1,1876,
-135,2,0,1,2494,
-418,18,1,2494,419,
-20,420,4,36,72,
-0,84,0,84,0,
-80,0,95,0,82,
-0,69,0,81,0,
-85,0,69,0,83,
-0,84,0,95,0,
-69,0,86,0,69,
+1,256,393,18,1,
+256,394,20,395,4,
+14,80,0,69,0,
+82,0,67,0,69,
 0,78,0,84,0,
-1,91,1,1,2,
-0,1,2495,421,18,
-1,2495,422,20,423,
-4,34,82,0,69,
-0,77,0,79,0,
-84,0,69,0,95,
-0,68,0,65,0,
-84,0,65,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,82,1,1,
-2,0,1,1939,424,
-18,1,1939,171,2,
-0,1,2497,425,18,
-1,2497,426,20,427,
-4,24,76,0,73,
-0,83,0,84,0,
-69,0,78,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,73,1,1,
-2,0,1,827,428,
-18,1,827,171,2,
-0,1,2499,429,18,
-1,2499,430,20,431,
-4,38,72,0,84,
-0,84,0,80,0,
-95,0,82,0,69,
-0,83,0,80,0,
-79,0,78,0,83,
-0,69,0,95,0,
+1,22,1,1,2,
+0,1,1371,396,18,
+1,1371,223,2,0,
+1,2486,397,18,1,
+2486,398,20,399,4,
+24,65,0,84,0,
+84,0,65,0,67,
+0,72,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,68,1,1,2,
-0,1,2500,432,18,
-1,2500,433,20,434,
-4,22,69,0,77,
-0,65,0,73,0,
-76,0,95,0,69,
+1,60,1,1,2,
+0,1,2487,400,18,
+1,2487,401,20,402,
+4,22,84,0,73,
+0,77,0,69,0,
+82,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
-67,1,1,2,0,
-1,2501,435,18,1,
-2501,436,20,437,4,
-32,68,0,65,0,
-84,0,65,0,83,
-0,69,0,82,0,
-86,0,69,0,82,
+87,1,1,2,0,
+1,1931,403,18,1,
+1931,274,2,0,1,
+1932,404,18,1,1932,
+405,20,406,4,4,
+73,0,70,0,1,
+42,1,1,2,0,
+1,262,407,18,1,
+262,179,2,0,1,
+1377,408,18,1,1377,
+179,2,0,1,2492,
+409,18,1,2492,410,
+20,411,4,32,77,
+0,79,0,86,0,
+73,0,78,0,71,
 0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,66,
-1,1,2,0,1,
-2502,438,18,1,2502,
-439,20,440,4,26,
-67,0,79,0,78,
-0,84,0,82,0,
-79,0,76,0,95,
+78,0,68,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,65,1,1,
-2,0,1,2503,441,
-18,1,2503,442,20,
-443,4,30,65,0,
-84,0,95,0,84,
-0,65,0,82,0,
-71,0,69,0,84,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,59,
-1,1,2,0,1,
-2504,444,18,1,2504,
-445,20,446,4,38,
-65,0,84,0,95,
-0,82,0,79,0,
-84,0,95,0,84,
-0,65,0,82,0,
-71,0,69,0,84,
+0,1,75,1,1,
+2,0,1,1876,412,
+18,1,1876,135,2,
+0,1,2494,413,18,
+1,2494,414,20,415,
+4,34,83,0,84,
+0,65,0,84,0,
+69,0,95,0,69,
+0,78,0,84,0,
+82,0,89,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,85,1,1,
+2,0,1,2495,416,
+18,1,2495,417,20,
+418,4,36,72,0,
+84,0,84,0,80,
+0,95,0,82,0,
+69,0,81,0,85,
+0,69,0,83,0,
+84,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+91,1,1,2,0,
+1,1939,419,18,1,
+1939,179,2,0,1,
+2497,420,18,1,2497,
+421,20,422,4,22,
+77,0,79,0,78,
+0,69,0,89,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,74,1,
+1,2,0,1,827,
+423,18,1,827,179,
+2,0,1,2499,424,
+18,1,2499,425,20,
+426,4,36,76,0,
+73,0,78,0,75,
+0,95,0,77,0,
+69,0,83,0,83,
+0,65,0,71,0,
+69,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+72,1,1,2,0,
+1,2500,427,18,1,
+2500,428,20,429,4,
+38,72,0,84,0,
+84,0,80,0,95,
+0,82,0,69,0,
+83,0,80,0,79,
+0,78,0,83,0,
+69,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+68,1,1,2,0,
+1,2501,430,18,1,
+2501,431,20,432,4,
+22,69,0,77,0,
+65,0,73,0,76,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,58,
+0,84,0,1,67,
 1,1,2,0,1,
-277,447,18,1,277,
-448,20,449,4,10,
-83,0,76,0,65,
-0,83,0,72,0,
-1,21,1,1,2,
-0,1,2506,450,18,
-1,2506,135,2,0,
-1,2507,451,18,1,
-2507,114,2,0,1,
-2508,452,18,1,2508,
-132,2,0,1,2509,
-453,18,1,2509,454,
-20,455,4,34,86,
+2502,433,18,1,2502,
+434,20,435,4,32,
+68,0,65,0,84,
+0,65,0,83,0,
+69,0,82,0,86,
+0,69,0,82,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,66,1,
+1,2,0,1,2503,
+436,18,1,2503,437,
+20,438,4,26,67,
+0,79,0,78,0,
+84,0,82,0,79,
+0,76,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,65,1,1,2,
+0,1,2504,439,18,
+1,2504,440,20,441,
+4,30,65,0,84,
+0,95,0,84,0,
+65,0,82,0,71,
+0,69,0,84,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,59,1,
+1,2,0,1,277,
+442,18,1,277,443,
+20,444,4,10,83,
+0,76,0,65,0,
+83,0,72,0,1,
+21,1,1,2,0,
+1,2506,445,18,1,
+2506,135,2,0,1,
+2507,446,18,1,2507,
+126,2,0,1,2508,
+447,18,1,2508,132,
+2,0,1,2509,448,
+18,1,2509,449,20,
+450,4,28,73,0,
+110,0,116,0,68,
 0,101,0,99,0,
-116,0,111,0,114,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,1,116,1,2,
+2,0,1,2510,451,
+18,1,2510,153,2,
+0,1,283,452,18,
+1,283,179,2,0,
+1,2512,453,18,1,
+2512,132,2,0,1,
+2513,454,18,1,2513,
+455,20,456,4,28,
+82,0,111,0,116,
 0,68,0,101,0,
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
-0,110,0,1,115,
+0,110,0,1,118,
 1,2,2,0,1,
-2510,456,18,1,2510,
-457,20,458,4,58,
-86,0,101,0,99,
-0,116,0,111,0,
-114,0,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-76,0,105,0,115,
-0,116,0,1,111,
+2514,457,18,1,2514,
+153,2,0,1,1958,
+458,18,1,1958,163,
+2,0,1,2516,459,
+18,1,2516,455,2,
+0,1,2517,460,18,
+1,2517,461,20,462,
+4,64,73,0,110,
+0,116,0,82,0,
+111,0,116,0,82,
+0,111,0,116,0,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,76,0,
+105,0,115,0,116,
+0,1,113,1,2,
+2,0,1,2518,463,
+18,1,2518,163,2,
+0,1,1406,464,18,
+1,1406,171,2,0,
+1,1407,465,18,1,
+1407,217,2,0,1,
+2522,466,18,1,2522,
+135,2,0,1,2523,
+467,18,1,2523,114,
+2,0,1,2524,468,
+18,1,2524,132,2,
+0,1,2525,469,18,
+1,2525,470,20,471,
+4,34,86,0,101,
+0,99,0,116,0,
+111,0,114,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,1,117,1,2,
+2,0,1,2526,472,
+18,1,2526,473,20,
+474,4,58,86,0,
+101,0,99,0,116,
+0,111,0,114,0,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,76,0,
+105,0,115,0,116,
+0,1,112,1,2,
+2,0,1,299,475,
+18,1,299,476,20,
+477,4,8,83,0,
+84,0,65,0,82,
+0,1,20,1,1,
+2,0,1,1370,478,
+18,1,1370,171,2,
+0,1,2529,479,18,
+1,2529,270,2,0,
+1,2530,480,18,1,
+2530,481,20,482,4,
+22,73,0,110,0,
+116,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,1,123,
 1,2,2,0,1,
-283,459,18,1,283,
-171,2,0,1,2513,
-460,18,1,2513,351,
-2,0,1,2514,461,
-18,1,2514,462,20,
-463,4,22,73,0,
+2531,483,18,1,2531,
+135,2,0,1,305,
+484,18,1,305,179,
+2,0,1,2534,485,
+18,1,2534,486,20,
+487,4,52,73,0,
 110,0,116,0,65,
 0,114,0,103,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,120,1,2,2,
-0,1,1958,464,18,
-1,1958,156,2,0,
-1,2516,465,18,1,
-2516,126,2,0,1,
-2517,466,18,1,2517,
-132,2,0,1,2518,
-467,18,1,2518,468,
-20,469,4,28,73,
+117,0,109,0,101,
 0,110,0,116,0,
 68,0,101,0,99,
 0,108,0,97,0,
 114,0,97,0,116,
 0,105,0,111,0,
-110,0,1,114,1,
-2,2,0,1,2519,
-470,18,1,2519,471,
-20,472,4,52,73,
-0,110,0,116,0,
+110,0,76,0,105,
+0,115,0,116,0,
+1,111,1,2,2,
+0,1,2535,488,18,
+1,2535,163,2,0,
+1,2458,489,18,1,
+2458,274,2,0,1,
+2459,490,18,1,2459,
+491,20,492,4,22,
+82,0,73,0,71,
+0,72,0,84,0,
+95,0,66,0,82,
+0,65,0,67,0,
+69,0,1,13,1,
+1,2,0,1,2538,
+493,18,1,2538,494,
+20,495,4,22,75,
+0,101,0,121,0,
 65,0,114,0,103,
-0,117,0,109,0,
+0,69,0,118,0,
 101,0,110,0,116,
+0,1,122,1,2,
+2,0,1,2539,496,
+18,1,2539,135,2,
+0,1,2540,497,18,
+1,2540,117,2,0,
+1,2541,498,18,1,
+2541,132,2,0,1,
+2542,499,18,1,2542,
+500,20,501,4,28,
+75,0,101,0,121,
 0,68,0,101,0,
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
-0,110,0,76,0,
-105,0,115,0,116,
-0,1,110,1,2,
-2,0,1,1406,473,
-18,1,1406,163,2,
-0,1,1407,474,18,
-1,1407,213,2,0,
-1,2522,475,18,1,
-2522,351,2,0,1,
-2523,476,18,1,2523,
-477,20,478,4,22,
-75,0,101,0,121,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,1,119,1,
-2,2,0,1,2524,
-479,18,1,2524,135,
-2,0,1,2525,480,
-18,1,2525,117,2,
-0,1,2526,481,18,
-1,2526,132,2,0,
-1,299,482,18,1,
-299,483,20,484,4,
-8,83,0,84,0,
-65,0,82,0,1,
-20,1,1,2,0,
-1,1370,485,18,1,
-1370,163,2,0,1,
-2529,486,18,1,2529,
-156,2,0,1,2531,
-487,18,1,2531,351,
-2,0,1,2532,488,
-18,1,2532,489,20,
-490,4,24,86,0,
-111,0,105,0,100,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,1,118,1,
-2,2,0,1,305,
-491,18,1,305,171,
-2,0,1,2534,492,
-18,1,2534,156,2,
-0,1,2458,493,18,
-1,2458,261,2,0,
-1,2459,494,18,1,
-2459,495,20,496,4,
-22,82,0,73,0,
-71,0,72,0,84,
-0,95,0,66,0,
-82,0,65,0,67,
-0,69,0,1,13,
-1,1,2,0,1,
-2538,497,18,1,2538,
-135,2,0,1,2601,
-498,18,1,2601,499,
-20,500,4,32,75,
-0,101,0,121,0,
-65,0,114,0,103,
-0,83,0,116,0,
-97,0,116,0,101,
-0,69,0,118,0,
-101,0,110,0,116,
-0,1,105,1,2,
-2,0,1,2464,501,
-18,1,2464,495,2,
-0,1,1989,502,18,
-1,1989,261,2,0,
-1,1990,503,18,1,
-1990,504,20,505,4,
-8,69,0,76,0,
-83,0,69,0,1,
-43,1,1,2,0,
-1,2470,506,18,1,
-2470,159,2,0,1,
-322,507,18,1,322,
-232,2,0,1,2551,
-508,18,1,2551,351,
-2,0,1,1933,509,
+0,110,0,1,115,
+1,2,2,0,1,
+2464,502,18,1,2464,
+491,2,0,1,2544,
+503,18,1,2544,163,
+2,0,1,1989,504,
+18,1,1989,274,2,
+0,1,1990,505,18,
+1,1990,506,20,507,
+4,8,69,0,76,
+0,83,0,69,0,
+1,43,1,1,2,
+0,1,2548,508,18,
+1,2548,135,2,0,
+1,2470,509,18,1,
+2470,166,2,0,1,
+322,510,18,1,322,
+238,2,0,1,2551,
+511,18,1,2551,270,
+2,0,1,1933,512,
 18,1,1933,135,2,
-0,1,2553,510,18,
-1,2553,150,2,0,
-1,883,511,18,1,
-883,171,2,0,1,
-328,512,18,1,328,
-171,2,0,1,1443,
-513,18,1,1443,247,
-2,0,1,2766,514,
-18,1,2766,515,20,
-516,4,12,83,0,
-116,0,97,0,116,
-0,101,0,115,0,
-1,100,1,2,2,
-0,1,1449,517,18,
-1,1449,171,2,0,
-1,2485,518,18,1,
-2485,519,20,520,4,
-24,65,0,84,0,
-84,0,65,0,67,
-0,72,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,60,1,1,2,
-0,1,2488,521,18,
-1,2488,522,20,523,
-4,46,78,0,79,
+0,1,2553,513,18,
+1,2553,135,2,0,
+1,883,514,18,1,
+883,179,2,0,1,
+328,515,18,1,328,
+179,2,0,1,1443,
+516,18,1,1443,257,
+2,0,1,2562,517,
+18,1,2562,150,2,
+0,1,1449,518,18,
+1,1449,179,2,0,
+1,2485,519,18,1,
+2485,520,20,521,4,
+32,79,0,66,0,
+74,0,69,0,67,
 0,84,0,95,0,
-65,0,84,0,95,
-0,82,0,79,0,
-84,0,95,0,84,
-0,65,0,82,0,
-71,0,69,0,84,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,78,
-1,1,2,0,1,
-2489,524,18,1,2489,
-525,20,526,4,30,
-78,0,79,0,95,
-0,83,0,69,0,
-78,0,83,0,79,
-0,82,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,77,1,1,2,
-0,1,2490,527,18,
-1,2490,528,20,529,
-4,36,77,0,79,
-0,86,0,73,0,
-78,0,71,0,95,
-0,83,0,84,0,
-65,0,82,0,84,
+82,0,69,0,90,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,76,
+0,84,0,1,80,
 1,1,2,0,1,
-2491,530,18,1,2491,
-531,20,532,4,32,
-77,0,79,0,86,
-0,73,0,78,0,
-71,0,95,0,69,
-0,78,0,68,0,
+2566,522,18,1,2566,
+270,2,0,1,2488,
+523,18,1,2488,524,
+20,525,4,38,78,
+0,79,0,84,0,
+95,0,65,0,84,
+0,95,0,84,0,
+65,0,82,0,71,
+0,69,0,84,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,75,1,
-1,2,0,1,2493,
-533,18,1,2493,534,
-20,535,4,34,83,
+84,0,1,79,1,
+1,2,0,1,2489,
+526,18,1,2489,527,
+20,528,4,46,78,
+0,79,0,84,0,
+95,0,65,0,84,
+0,95,0,82,0,
+79,0,84,0,95,
 0,84,0,65,0,
-84,0,69,0,95,
+82,0,71,0,69,
+0,84,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,78,1,1,2,
+0,1,2490,529,18,
+1,2490,530,20,531,
+4,30,78,0,79,
+0,95,0,83,0,
+69,0,78,0,83,
+0,79,0,82,0,
+95,0,69,0,86,
 0,69,0,78,0,
-84,0,82,0,89,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,85,
+84,0,1,77,1,
+1,2,0,1,2491,
+532,18,1,2491,533,
+20,534,4,36,77,
+0,79,0,86,0,
+73,0,78,0,71,
+0,95,0,83,0,
+84,0,65,0,82,
+0,84,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,76,1,1,2,
+0,1,2493,535,18,
+1,2493,536,20,537,
+4,32,83,0,84,
+0,65,0,84,0,
+69,0,95,0,69,
+0,88,0,73,0,
+84,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+86,1,1,2,0,
+1,1413,538,18,1,
+1413,179,2,0,1,
+346,539,18,1,346,
+540,20,541,4,8,
+80,0,76,0,85,
+0,83,0,1,18,
 1,1,2,0,1,
-1413,536,18,1,1413,
-171,2,0,1,346,
-537,18,1,346,538,
-20,539,4,8,80,
-0,76,0,85,0,
-83,0,1,18,1,
-1,2,0,1,2496,
-540,18,1,2496,541,
-20,542,4,22,77,
-0,79,0,78,0,
-69,0,89,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,74,1,1,
-2,0,1,2021,543,
-18,1,2021,261,2,
-0,1,2022,544,18,
-1,2022,355,2,0,
-1,352,545,18,1,
-352,171,2,0,1,
-2024,546,18,1,2024,
-132,2,0,1,2025,
-547,18,1,2025,548,
-20,549,4,8,74,
-0,85,0,77,0,
-80,0,1,49,1,
-1,2,0,1,2026,
-550,18,1,2026,132,
-2,0,1,2027,551,
-18,1,2027,552,20,
-553,4,4,65,0,
-84,0,1,23,1,
-1,2,0,1,2028,
-554,18,1,2028,132,
-2,0,1,2029,555,
-18,1,2029,351,2,
-0,1,2030,556,18,
-1,2030,557,20,558,
-4,14,70,0,111,
-0,114,0,76,0,
-111,0,111,0,112,
+2496,542,18,1,2496,
+543,20,544,4,34,
+82,0,69,0,77,
+0,79,0,84,0,
+69,0,95,0,68,
+0,65,0,84,0,
+65,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+82,1,1,2,0,
+1,2021,545,18,1,
+2021,274,2,0,1,
+2022,546,18,1,2022,
+350,2,0,1,352,
+547,18,1,352,179,
+2,0,1,2024,548,
+18,1,2024,132,2,
+0,1,2025,549,18,
+1,2025,550,20,551,
+4,8,74,0,85,
+0,77,0,80,0,
+1,49,1,1,2,
+0,1,2026,552,18,
+1,2026,132,2,0,
+1,2027,553,18,1,
+2027,554,20,555,4,
+4,65,0,84,0,
+1,23,1,1,2,
+0,1,2028,556,18,
+1,2028,132,2,0,
+1,2029,557,18,1,
+2029,270,2,0,1,
+2030,558,18,1,2030,
+559,20,560,4,14,
+70,0,111,0,114,
+0,76,0,111,0,
+111,0,112,0,1,
+139,1,2,2,0,
+1,2031,561,18,1,
+2031,562,20,563,4,
+32,68,0,111,0,
+87,0,104,0,105,
+0,108,0,101,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,138,
+1,2,2,0,1,
+2032,564,18,1,2032,
+565,20,566,4,28,
+87,0,104,0,105,
+0,108,0,101,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,137,
+1,2,2,0,1,
+2033,567,18,1,2033,
+568,20,569,4,22,
+73,0,102,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,136,1,
+2,2,0,1,2034,
+570,18,1,2034,571,
+20,572,4,22,83,
+0,116,0,97,0,
+116,0,101,0,67,
+0,104,0,97,0,
+110,0,103,0,101,
 0,1,135,1,2,
-2,0,1,2031,559,
-18,1,2031,560,20,
-561,4,32,68,0,
-111,0,87,0,104,
-0,105,0,108,0,
-101,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-1,134,1,2,2,
-0,1,2032,562,18,
-1,2032,563,20,564,
-4,28,87,0,104,
-0,105,0,108,0,
-101,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-1,133,1,2,2,
-0,1,2033,565,18,
-1,2033,566,20,567,
-4,22,73,0,102,
+2,0,1,1478,573,
+18,1,1478,171,2,
+0,1,1479,574,18,
+1,1479,291,2,0,
+1,2037,575,18,1,
+2037,202,2,0,1,
+2038,576,18,1,2038,
+577,20,578,4,18,
+74,0,117,0,109,
+0,112,0,76,0,
+97,0,98,0,101,
+0,108,0,1,133,
+1,2,2,0,1,
+2039,579,18,1,2039,
+202,2,0,1,2040,
+580,18,1,2040,581,
+20,582,4,30,82,
+0,101,0,116,0,
+117,0,114,0,110,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,1,
 132,1,2,2,0,
-1,2034,568,18,1,
-2034,569,20,570,4,
-22,83,0,116,0,
+1,2041,583,18,1,
+2041,202,2,0,1,
+1485,584,18,1,1485,
+179,2,0,1,372,
+585,18,1,372,191,
+2,0,1,373,586,
+18,1,373,132,2,
+0,1,374,587,18,
+1,374,187,2,0,
+1,375,588,18,1,
+375,132,2,0,1,
+376,589,18,1,376,
+194,2,0,1,377,
+590,18,1,377,132,
+2,0,1,378,591,
+18,1,378,187,2,
+0,1,379,592,18,
+1,379,132,2,0,
+1,380,593,18,1,
+380,594,20,595,4,
+16,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,1,145,1,
+2,2,0,1,381,
+596,18,1,381,306,
+2,0,1,2610,597,
+18,1,2610,598,20,
+599,4,38,86,0,
+101,0,99,0,116,
+0,111,0,114,0,
+65,0,114,0,103,
+0,83,0,116,0,
 97,0,116,0,101,
-0,67,0,104,0,
-97,0,110,0,103,
-0,101,0,1,131,
-1,2,2,0,1,
-1478,571,18,1,1478,
-163,2,0,1,1479,
-572,18,1,1479,280,
-2,0,1,2037,573,
-18,1,2037,193,2,
-0,1,2038,574,18,
-1,2038,575,20,576,
-4,18,74,0,117,
-0,109,0,112,0,
-76,0,97,0,98,
-0,101,0,108,0,
-1,129,1,2,2,
-0,1,2039,577,18,
-1,2039,193,2,0,
-1,2040,578,18,1,
-2040,579,20,580,4,
-30,82,0,101,0,
-116,0,117,0,114,
-0,110,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
+0,69,0,118,0,
 101,0,110,0,116,
-0,1,128,1,2,
-2,0,1,2041,581,
-18,1,2041,193,2,
-0,1,1485,582,18,
-1,1485,171,2,0,
-1,372,583,18,1,
-372,183,2,0,1,
-373,584,18,1,373,
-132,2,0,1,374,
-585,18,1,374,179,
-2,0,1,375,586,
-18,1,375,132,2,
-0,1,376,587,18,
-1,376,186,2,0,
-1,377,588,18,1,
-377,132,2,0,1,
-378,589,18,1,378,
-179,2,0,1,379,
-590,18,1,379,132,
-2,0,1,380,591,
-18,1,380,592,20,
-593,4,16,67,0,
-111,0,110,0,115,
-0,116,0,97,0,
-110,0,116,0,1,
-141,1,2,2,0,
-1,381,594,18,1,
-381,301,2,0,1,
-371,595,18,1,371,
-596,20,597,4,24,
-70,0,117,0,110,
-0,99,0,116,0,
-105,0,111,0,110,
-0,67,0,97,0,
-108,0,108,0,1,
-137,1,2,2,0,
-1,942,598,18,1,
-942,171,2,0,1,
-2533,599,18,1,2533,
-135,2,0,1,387,
-600,18,1,387,171,
-2,0,1,2536,601,
-18,1,2536,351,2,
-0,1,2537,602,18,
-1,2537,603,20,604,
-4,10,69,0,118,
-0,101,0,110,0,
-116,0,1,117,1,
-2,2,0,1,1514,
-605,18,1,1514,163,
-2,0,1,1515,606,
-18,1,1515,311,2,
-0,1,2549,607,18,
-1,2549,156,2,0,
-1,2074,608,18,1,
-2074,163,2,0,1,
-2075,609,18,1,2075,
-156,2,0,1,406,
-610,18,1,406,143,
-2,0,1,1521,611,
-18,1,1521,171,2,
-0,1,412,612,18,
-1,412,171,2,0,
-1,2484,613,18,1,
-2484,614,20,615,4,
-32,79,0,66,0,
-74,0,69,0,67,
-0,84,0,95,0,
-82,0,69,0,90,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,80,
-1,1,2,0,1,
-2023,616,18,1,2023,
-617,20,618,4,26,
-68,0,69,0,70,
-0,65,0,85,0,
-76,0,84,0,95,
-0,83,0,84,0,
-65,0,84,0,69,
-0,1,47,1,1,
-2,0,1,1442,619,
-18,1,1442,163,2,
-0,1,2035,620,18,
-1,2035,193,2,0,
-1,2036,621,18,1,
-2036,622,20,623,4,
-26,74,0,117,0,
-109,0,112,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,130,1,
-2,2,0,1,431,
-624,18,1,431,143,
-2,0,1,2105,625,
-18,1,2105,261,2,
-0,1,2106,626,18,
-1,2106,504,2,0,
-1,1550,627,18,1,
-1550,163,2,0,1,
-437,628,18,1,437,
-171,2,0,1,2044,
-629,18,1,2044,630,
-20,631,4,28,69,
-0,109,0,112,0,
-116,0,121,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,125,1,
-2,2,0,1,2045,
-632,18,1,2045,193,
-2,0,1,1555,633,
-18,1,1555,171,2,
-0,1,2511,634,18,
-1,2511,156,2,0,
-1,1001,635,18,1,
-1001,596,2,0,1,
-1002,636,18,1,1002,
-592,2,0,1,447,
-637,18,1,447,320,
-2,0,1,2593,638,
-18,1,2593,342,2,
-0,1,2594,639,18,
-1,2594,640,20,641,
-4,32,73,0,110,
+0,1,107,1,2,
+2,0,1,2611,600,
+18,1,2611,601,20,
+602,4,32,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,106,1,2,2,
+0,1,371,603,18,
+1,371,604,20,605,
+4,24,70,0,117,
+0,110,0,99,0,
+116,0,105,0,111,
+0,110,0,67,0,
+97,0,108,0,108,
+0,1,141,1,2,
+2,0,1,942,606,
+18,1,942,179,2,
+0,1,2533,607,18,
+1,2533,449,2,0,
+1,387,608,18,1,
+387,179,2,0,1,
+2616,609,18,1,2616,
+610,20,611,4,44,
+73,0,110,0,116,
+0,82,0,111,0,
+116,0,82,0,111,
 0,116,0,65,0,
 114,0,103,0,83,
 0,116,0,97,0,
 116,0,101,0,69,
 0,118,0,101,0,
 110,0,116,0,1,
-106,1,2,2,0,
-1,2595,642,18,1,
-2595,499,2,0,1,
-2596,643,18,1,2596,
-644,20,645,4,34,
-86,0,111,0,105,
-0,100,0,65,0,
-114,0,103,0,83,
+108,1,2,2,0,
+1,2617,612,18,1,
+2617,598,2,0,1,
+2537,613,18,1,2537,
+270,2,0,1,2619,
+614,18,1,2619,615,
+20,616,4,32,75,
+0,101,0,121,0,
+65,0,114,0,103,
+0,83,0,116,0,
+97,0,116,0,101,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,105,1,2,
+2,0,1,2620,617,
+18,1,2620,618,20,
+619,4,34,86,0,
+111,0,105,0,100,
+0,65,0,114,0,
+103,0,83,0,116,
+0,97,0,116,0,
+101,0,69,0,118,
+0,101,0,110,0,
+116,0,1,104,1,
+2,2,0,1,2621,
+620,18,1,2621,621,
+20,622,4,20,83,
 0,116,0,97,0,
 116,0,101,0,69,
 0,118,0,101,0,
 110,0,116,0,1,
-104,1,2,2,0,
-1,2520,646,18,1,
-2520,156,2,0,1,
-1010,647,18,1,1010,
-163,2,0,1,1011,
-648,18,1,1011,156,
-2,0,1,1012,649,
-18,1,1012,171,2,
-0,1,1013,650,18,
-1,1013,156,2,0,
-1,2602,651,18,1,
-2602,644,2,0,1,
-2603,652,18,1,2603,
-653,20,654,4,20,
-83,0,116,0,97,
-0,116,0,101,0,
-69,0,118,0,101,
+103,1,2,2,0,
+1,2622,623,18,1,
+2622,624,20,625,4,
+26,68,0,69,0,
+70,0,65,0,85,
+0,76,0,84,0,
+95,0,83,0,84,
+0,65,0,84,0,
+69,0,1,47,1,
+1,2,0,1,2623,
+626,18,1,2623,166,
+2,0,1,2543,627,
+18,1,2543,628,20,
+629,4,52,75,0,
+101,0,121,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
 0,110,0,116,0,
-1,103,1,2,2,
-0,1,459,655,18,
-1,459,656,20,657,
-4,24,76,0,69,
-0,70,0,84,0,
-95,0,66,0,82,
-0,65,0,67,0,
-75,0,69,0,84,
-0,1,27,1,1,
-2,0,1,1574,658,
-18,1,1574,193,2,
-0,1,461,659,18,
-1,461,660,20,661,
-4,24,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,76,0,
-105,0,115,0,116,
-0,1,138,1,2,
-2,0,1,462,662,
-18,1,462,143,2,
-0,1,464,663,18,
-1,464,664,20,665,
-4,16,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,1,139,
-1,2,2,0,1,
-2136,666,18,1,2136,
-261,2,0,1,2696,
-667,18,1,2696,515,
-2,0,1,1585,668,
-18,1,1585,669,20,
-670,4,12,82,0,
-69,0,84,0,85,
-0,82,0,78,0,
-1,50,1,1,2,
-0,1,2700,671,18,
-1,2700,672,20,673,
-4,10,83,0,116,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
+1,110,1,2,2,
+0,1,2546,630,18,
+1,2546,270,2,0,
+1,1514,631,18,1,
+1514,171,2,0,1,
+1515,632,18,1,1515,
+313,2,0,1,2549,
+633,18,1,2549,163,
+2,0,1,2074,634,
+18,1,2074,171,2,
+0,1,2075,635,18,
+1,2075,163,2,0,
+1,2552,636,18,1,
+2552,637,20,638,4,
+10,69,0,118,0,
+101,0,110,0,116,
+0,1,120,1,2,
+2,0,1,406,639,
+18,1,406,153,2,
+0,1,1521,640,18,
+1,1521,179,2,0,
+1,412,641,18,1,
+412,179,2,0,1,
+2484,642,18,1,2484,
+643,20,644,4,26,
+67,0,72,0,65,
+0,78,0,71,0,
+69,0,68,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,61,1,1,
+2,0,1,2023,645,
+18,1,2023,624,2,
+0,1,2564,646,18,
+1,2564,163,2,0,
+1,1442,647,18,1,
+1442,171,2,0,1,
+2035,648,18,1,2035,
+202,2,0,1,2036,
+649,18,1,2036,650,
+20,651,4,26,74,
+0,117,0,109,0,
+112,0,83,0,116,
 0,97,0,116,0,
-101,0,1,101,1,
-2,2,0,1,2701,
-674,18,1,2701,132,
-2,0,1,2702,675,
-18,1,2702,135,2,
-0,1,476,676,18,
-1,476,677,20,678,
+101,0,109,0,101,
+0,110,0,116,0,
+1,134,1,2,2,
+0,1,431,652,18,
+1,431,153,2,0,
+1,2105,653,18,1,
+2105,274,2,0,1,
+2106,654,18,1,2106,
+506,2,0,1,1550,
+655,18,1,1550,171,
+2,0,1,437,656,
+18,1,437,179,2,
+0,1,2044,657,18,
+1,2044,658,20,659,
+4,28,69,0,109,
+0,112,0,116,0,
+121,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+1,129,1,2,2,
+0,1,2045,660,18,
+1,2045,202,2,0,
+1,1555,661,18,1,
+1555,179,2,0,1,
+2511,662,18,1,2511,
+111,2,0,1,1001,
+663,18,1,1001,604,
+2,0,1,1002,664,
+18,1,1002,594,2,
+0,1,447,665,18,
+1,447,322,2,0,
+1,2520,666,18,1,
+2520,270,2,0,1,
+1010,667,18,1,1010,
+171,2,0,1,1011,
+668,18,1,1011,163,
+2,0,1,1012,669,
+18,1,1012,179,2,
+0,1,1013,670,18,
+1,1013,163,2,0,
+1,459,671,18,1,
+459,672,20,673,4,
+24,76,0,69,0,
+70,0,84,0,95,
+0,66,0,82,0,
+65,0,67,0,75,
+0,69,0,84,0,
+1,27,1,1,2,
+0,1,1574,674,18,
+1,1574,202,2,0,
+1,461,675,18,1,
+461,676,20,677,4,
+24,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,76,0,105,
+0,115,0,116,0,
+1,142,1,2,2,
+0,1,462,678,18,
+1,462,153,2,0,
+1,464,679,18,1,
+464,680,20,681,4,
+16,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,1,143,1,
+2,2,0,1,2136,
+682,18,1,2136,274,
+2,0,1,2612,683,
+18,1,2612,615,2,
+0,1,2613,684,18,
+1,2613,618,2,0,
+1,2614,685,18,1,
+2614,621,2,0,1,
+2615,686,18,1,2615,
+491,2,0,1,1585,
+687,18,1,1585,688,
+20,689,4,12,82,
+0,69,0,84,0,
+85,0,82,0,78,
+0,1,50,1,1,
+2,0,1,2618,690,
+18,1,2618,601,2,
+0,1,476,691,18,
+1,476,692,20,693,
 4,30,83,0,84,
 0,82,0,73,0,
 78,0,71,0,95,
@@ -3629,8 +3751,8 @@ public yyLSLSyntax
 0,65,0,78,0,
 84,0,1,3,1,
 1,2,0,1,477,
-679,18,1,477,680,
-20,681,4,28,70,
+694,18,1,477,695,
+20,696,4,28,70,
 0,76,0,79,0,
 65,0,84,0,95,
 0,67,0,79,0,
@@ -3638,8 +3760,8 @@ public yyLSLSyntax
 0,65,0,78,0,
 84,0,1,95,1,
 1,2,0,1,478,
-682,18,1,478,683,
-20,684,4,40,72,
+697,18,1,478,698,
+20,699,4,40,72,
 0,69,0,88,0,
 95,0,73,0,78,
 0,84,0,69,0,
@@ -3649,8 +3771,8 @@ public yyLSLSyntax
 0,84,0,65,0,
 78,0,84,0,1,
 94,1,1,2,0,
-1,479,685,18,1,
-479,686,20,687,4,
+1,479,700,18,1,
+479,701,20,702,4,
 32,73,0,78,0,
 84,0,69,0,71,
 0,69,0,82,0,
@@ -3659,933 +3781,968 @@ public yyLSLSyntax
 84,0,65,0,78,
 0,84,0,1,93,
 1,1,2,0,1,
-480,688,18,1,480,
-689,20,690,4,26,
+480,703,18,1,480,
+704,20,705,4,26,
 82,0,73,0,71,
 0,72,0,84,0,
 95,0,66,0,82,
 0,65,0,67,0,
 75,0,69,0,84,
 0,1,28,1,1,
-2,0,1,481,691,
-18,1,481,664,2,
-0,1,2711,692,18,
-1,2711,140,2,0,
-1,2713,693,18,1,
-2713,156,2,0,1,
-2715,694,18,1,2715,
-351,2,0,1,2717,
-695,18,1,2717,153,
-2,0,1,2718,696,
-18,1,2718,311,2,
-0,1,1048,697,18,
-1,1048,171,2,0,
-1,2724,698,18,1,
-2724,171,2,0,1,
-2042,699,18,1,2042,
-700,20,701,4,20,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-1,126,1,2,2,
-0,1,2043,702,18,
-1,2043,193,2,0,
-1,1620,703,18,1,
-1620,163,2,0,1,
-1621,704,18,1,1621,
-153,2,0,1,1622,
-705,18,1,1622,311,
-2,0,1,509,706,
-18,1,509,143,2,
-0,1,2498,707,18,
-1,2498,708,20,709,
-4,36,76,0,73,
-0,78,0,75,0,
-95,0,77,0,69,
-0,83,0,83,0,
-65,0,71,0,69,
+2,0,1,481,706,
+18,1,481,680,2,
+0,1,2711,707,18,
+1,2711,491,2,0,
+1,2718,708,18,1,
+2718,242,2,0,1,
+1048,709,18,1,1048,
+179,2,0,1,2721,
+710,18,1,2721,711,
+20,712,4,10,83,
+0,116,0,97,0,
+116,0,101,0,1,
+101,1,2,2,0,
+1,2722,713,18,1,
+2722,711,2,0,1,
+2723,714,18,1,2723,
+132,2,0,1,2724,
+715,18,1,2724,135,
+2,0,1,2042,716,
+18,1,2042,717,20,
+718,4,20,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,1,130,
+1,2,2,0,1,
+2043,719,18,1,2043,
+202,2,0,1,2568,
+720,18,1,2568,721,
+20,722,4,18,83,
+0,116,0,97,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,1,102,1,
+2,2,0,1,2733,
+723,18,1,2733,150,
+2,0,1,1620,724,
+18,1,1620,171,2,
+0,1,1621,725,18,
+1,1621,160,2,0,
+1,1622,726,18,1,
+1622,313,2,0,1,
+509,727,18,1,509,
+153,2,0,1,2498,
+728,18,1,2498,729,
+20,730,4,24,76,
+0,73,0,83,0,
+84,0,69,0,78,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,72,
+0,84,0,1,73,
 1,1,2,0,1,
-1628,710,18,1,1628,
-171,2,0,1,515,
-711,18,1,515,171,
-2,0,1,2699,712,
-18,1,2699,672,2,
-0,1,2505,713,18,
-1,2505,714,20,715,
-4,28,86,0,101,
-0,99,0,116,0,
-111,0,114,0,65,
+2739,731,18,1,2739,
+160,2,0,1,2740,
+732,18,1,2740,313,
+2,0,1,1628,733,
+18,1,1628,179,2,
+0,1,515,734,18,
+1,515,179,2,0,
+1,2505,735,18,1,
+2505,736,20,737,4,
+34,73,0,110,0,
+116,0,82,0,111,
+0,116,0,82,0,
+111,0,116,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-1,121,1,2,2,
-0,1,525,716,18,
-1,525,320,2,0,
-1,2197,717,18,1,
-2197,163,2,0,1,
-2198,718,18,1,2198,
-156,2,0,1,1591,
-719,18,1,1591,171,
-2,0,1,2597,720,
-18,1,2597,653,2,
-0,1,2598,721,18,
-1,2598,495,2,0,
-1,1094,722,18,1,
-1094,660,2,0,1,
-2600,723,18,1,2600,
-640,2,0,1,1096,
-724,18,1,1096,156,
-2,0,1,2604,725,
-18,1,2604,617,2,
-0,1,1657,726,18,
-1,1657,193,2,0,
-1,1658,727,18,1,
-1658,728,20,729,4,
-6,70,0,79,0,
-82,0,1,46,1,
-1,2,0,1,1659,
-730,18,1,1659,135,
-2,0,1,2774,731,
-18,1,2774,304,2,
-0,1,2775,732,18,
-1,2775,298,2,0,
-1,2690,733,18,1,
-2690,495,2,0,1,
-2777,104,1,2778,734,
-18,1,2778,735,23,
-736,4,6,69,0,
-79,0,70,0,1,
-2,1,6,2,0,
-1,1665,737,18,1,
-1665,171,2,0,1,
-1113,738,18,1,1113,
-179,2,0,739,5,
-0,740,5,356,1,
-2,741,19,736,1,
-2,742,5,6,1,
-2700,743,17,744,15,
-745,4,14,37,0,
-83,0,116,0,97,
-0,116,0,101,0,
-115,0,1,-1,1,
-5,746,20,747,4,
-16,83,0,116,0,
-97,0,116,0,101,
-0,115,0,95,0,
-49,0,1,166,1,
-3,1,2,1,1,
-748,22,1,11,1,
-2696,749,17,750,15,
-751,4,30,37,0,
-76,0,83,0,76,
-0,80,0,114,0,
-111,0,103,0,114,
-0,97,0,109,0,
-82,0,111,0,111,
-0,116,0,1,-1,
-1,5,752,20,753,
-4,32,76,0,83,
-0,76,0,80,0,
-114,0,111,0,103,
-0,114,0,97,0,
-109,0,82,0,111,
-0,111,0,116,0,
-95,0,50,0,1,
-157,1,3,1,2,
-1,1,754,22,1,
-2,1,2598,755,17,
-756,15,757,4,12,
-37,0,83,0,116,
-0,97,0,116,0,
-101,0,1,-1,1,
-5,758,20,759,4,
-14,83,0,116,0,
-97,0,116,0,101,
-0,95,0,50,0,
-1,169,1,3,1,
-6,1,5,760,22,
-1,14,1,2699,761,
-17,762,15,745,1,
--1,1,5,763,20,
-764,4,16,83,0,
+1,125,1,2,2,
+0,1,2746,738,18,
+1,2746,179,2,0,
+1,2664,739,18,1,
+2664,721,2,0,1,
+525,740,18,1,525,
+322,2,0,1,2197,
+741,18,1,2197,171,
+2,0,1,2198,742,
+18,1,2198,163,2,
+0,1,1591,743,18,
+1,1591,179,2,0,
+1,2521,744,18,1,
+2521,745,20,746,4,
+28,86,0,101,0,
+99,0,116,0,111,
+0,114,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+124,1,2,2,0,
+1,1094,747,18,1,
+1094,676,2,0,1,
+1096,748,18,1,1096,
+163,2,0,1,1657,
+749,18,1,1657,202,
+2,0,1,1658,750,
+18,1,1658,751,20,
+752,4,6,70,0,
+79,0,82,0,1,
+46,1,1,2,0,
+1,1659,753,18,1,
+1659,135,2,0,1,
+2609,754,18,1,2609,
+610,2,0,1,2776,
+755,18,1,2776,202,
+2,0,1,2777,756,
+18,1,2777,757,20,
+758,4,34,71,0,
+108,0,111,0,98,
+0,97,0,108,0,
+68,0,101,0,102,
+0,105,0,110,0,
+105,0,116,0,105,
+0,111,0,110,0,
+115,0,1,97,1,
+2,2,0,1,1665,
+759,18,1,1665,179,
+2,0,1,1113,760,
+18,1,1113,187,2,
+0,761,5,0,762,
+5,365,1,2,763,
+19,146,1,2,764,
+5,6,1,2711,765,
+17,766,15,767,4,
+12,37,0,83,0,
 116,0,97,0,116,
-0,101,0,115,0,
-95,0,50,0,1,
-167,1,3,1,3,
-1,2,765,22,1,
-12,1,2766,766,17,
-767,15,751,1,-1,
+0,101,0,1,-1,
 1,5,768,20,769,
-4,32,76,0,83,
-0,76,0,80,0,
-114,0,111,0,103,
-0,114,0,97,0,
-109,0,82,0,111,
-0,111,0,116,0,
-95,0,49,0,1,
-156,1,3,1,3,
-1,2,770,22,1,
-1,1,2690,771,17,
-772,15,757,1,-1,
-1,5,773,20,774,
 4,14,83,0,116,
 0,97,0,116,0,
 101,0,95,0,49,
-0,1,168,1,3,
-1,5,1,4,775,
-22,1,13,1,3,
-776,19,678,1,3,
-777,5,95,1,256,
-778,16,0,676,1,
-1261,779,16,0,676,
-1,509,780,16,0,
-676,1,1515,781,16,
-0,676,1,2021,782,
-17,783,15,784,4,
-24,37,0,73,0,
-102,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-1,-1,1,5,785,
-20,786,4,26,73,
-0,102,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,50,0,
-1,217,1,3,1,
-8,1,7,787,22,
-1,63,1,1775,788,
-16,0,676,1,2029,
-789,17,790,15,791,
-4,20,37,0,83,
+0,1,172,1,3,
+1,5,1,4,770,
+22,1,13,1,2718,
+771,17,772,15,773,
+4,30,37,0,76,
+0,83,0,76,0,
+80,0,114,0,111,
+0,103,0,114,0,
+97,0,109,0,82,
+0,111,0,111,0,
+116,0,1,-1,1,
+5,774,20,775,4,
+32,76,0,83,0,
+76,0,80,0,114,
+0,111,0,103,0,
+114,0,97,0,109,
+0,82,0,111,0,
+111,0,116,0,95,
+0,50,0,1,161,
+1,3,1,2,1,
+1,776,22,1,2,
+1,2721,777,17,778,
+15,779,4,14,37,
+0,83,0,116,0,
+97,0,116,0,101,
+0,115,0,1,-1,
+1,5,780,20,781,
+4,16,83,0,116,
+0,97,0,116,0,
+101,0,115,0,95,
+0,50,0,1,171,
+1,3,1,3,1,
+2,782,22,1,12,
+1,2788,783,17,784,
+15,773,1,-1,1,
+5,785,20,786,4,
+32,76,0,83,0,
+76,0,80,0,114,
+0,111,0,103,0,
+114,0,97,0,109,
+0,82,0,111,0,
+111,0,116,0,95,
+0,49,0,1,160,
+1,3,1,3,1,
+2,787,22,1,1,
+1,2722,788,17,789,
+15,779,1,-1,1,
+5,790,20,791,4,
+16,83,0,116,0,
+97,0,116,0,101,
+0,115,0,95,0,
+49,0,1,170,1,
+3,1,2,1,1,
+792,22,1,11,1,
+2615,793,17,794,15,
+767,1,-1,1,5,
+795,20,796,4,14,
+83,0,116,0,97,
+0,116,0,101,0,
+95,0,50,0,1,
+173,1,3,1,6,
+1,5,797,22,1,
+14,1,3,798,19,
+693,1,3,799,5,
+95,1,256,800,16,
+0,691,1,1261,801,
+16,0,691,1,509,
+802,16,0,691,1,
+1515,803,16,0,691,
+1,2021,804,17,805,
+15,806,4,24,37,
+0,73,0,102,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,-1,
+1,5,807,20,808,
+4,26,73,0,102,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,95,
+0,50,0,1,226,
+1,3,1,8,1,
+7,809,22,1,68,
+1,1775,810,16,0,
+691,1,2029,811,17,
+812,15,813,4,20,
+37,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+1,-1,1,5,814,
+20,815,4,24,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,1,-1,1,
-5,792,20,793,4,
+116,0,95,0,49,
+0,51,0,1,220,
+1,3,1,2,1,
+1,816,22,1,62,
+1,2030,817,17,818,
+15,813,1,-1,1,
+5,819,20,820,4,
 24,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,51,0,
-1,211,1,3,1,
-2,1,1,794,22,
-1,57,1,2030,795,
-17,796,15,791,1,
--1,1,5,797,20,
-798,4,24,83,0,
+0,49,0,50,0,
+1,219,1,3,1,
+2,1,1,821,22,
+1,61,1,2031,822,
+17,823,15,813,1,
+-1,1,5,824,20,
+825,4,24,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-50,0,1,210,1,
+49,0,1,218,1,
 3,1,2,1,1,
-799,22,1,56,1,
-2031,800,17,801,15,
-791,1,-1,1,5,
-802,20,803,4,24,
+826,22,1,60,1,
+2032,827,17,828,15,
+813,1,-1,1,5,
+829,20,830,4,24,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,49,0,1,
-209,1,3,1,2,
-1,1,804,22,1,
-55,1,2032,805,17,
-806,15,791,1,-1,
-1,5,807,20,808,
-4,24,83,0,116,
+49,0,48,0,1,
+217,1,3,1,2,
+1,1,831,22,1,
+59,1,2033,832,17,
+833,15,813,1,-1,
+1,5,834,20,835,
+4,22,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-95,0,49,0,48,
-0,1,208,1,3,
-1,2,1,1,809,
-22,1,54,1,2033,
-810,17,811,15,791,
-1,-1,1,5,812,
-20,813,4,22,83,
+95,0,57,0,1,
+216,1,3,1,2,
+1,1,836,22,1,
+58,1,277,837,16,
+0,691,1,2035,838,
+17,839,15,813,1,
+-1,1,5,840,20,
+841,4,22,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,56,0,
+1,215,1,3,1,
+3,1,2,842,22,
+1,57,1,2037,843,
+17,844,15,813,1,
+-1,1,5,845,20,
+846,4,22,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,55,0,
+1,214,1,3,1,
+3,1,2,847,22,
+1,56,1,2039,848,
+17,849,15,813,1,
+-1,1,5,850,20,
+851,4,22,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,54,0,
+1,213,1,3,1,
+3,1,2,852,22,
+1,55,1,32,853,
+16,0,691,1,2041,
+854,17,855,15,813,
+1,-1,1,5,856,
+20,857,4,22,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,95,0,57,
-0,1,207,1,3,
-1,2,1,1,814,
-22,1,53,1,277,
-815,16,0,676,1,
-2035,816,17,817,15,
-791,1,-1,1,5,
-818,20,819,4,22,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-56,0,1,206,1,
-3,1,3,1,2,
-820,22,1,52,1,
-2037,821,17,822,15,
-791,1,-1,1,5,
-823,20,824,4,22,
+116,0,95,0,53,
+0,1,212,1,3,
+1,3,1,2,858,
+22,1,54,1,2293,
+859,16,0,691,1,
+2043,860,17,861,15,
+813,1,-1,1,5,
+862,20,863,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-55,0,1,205,1,
+51,0,1,210,1,
 3,1,3,1,2,
-825,22,1,51,1,
-2039,826,17,827,15,
-791,1,-1,1,5,
-828,20,829,4,22,
+864,22,1,52,1,
+2045,865,17,866,15,
+813,1,-1,1,5,
+867,20,868,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-54,0,1,204,1,
+49,0,1,208,1,
 3,1,3,1,2,
-830,22,1,50,1,
-32,831,16,0,676,
-1,2041,832,17,833,
-15,791,1,-1,1,
-5,834,20,835,4,
-22,83,0,116,0,
+869,22,1,50,1,
+41,870,16,0,691,
+1,1297,871,16,0,
+691,1,43,872,16,
+0,691,1,1803,873,
+17,874,15,875,4,
+16,37,0,70,0,
+111,0,114,0,76,
+0,111,0,111,0,
+112,0,1,-1,1,
+5,876,20,877,4,
+18,70,0,111,0,
+114,0,76,0,111,
+0,111,0,112,0,
+95,0,49,0,1,
+233,1,3,1,10,
+1,9,878,22,1,
+75,1,1804,879,16,
+0,691,1,299,880,
+16,0,691,1,52,
+881,16,0,691,1,
+2318,882,16,0,691,
+1,62,883,16,0,
+691,1,2075,884,16,
+0,691,1,1574,885,
+17,886,15,813,1,
+-1,1,5,887,20,
+888,4,22,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,52,0,
+1,211,1,3,1,
+3,1,2,889,22,
+1,53,1,71,890,
+16,0,691,1,76,
+891,16,0,691,1,
+1834,892,16,0,691,
+1,2337,893,16,0,
+691,1,79,894,16,
+0,691,1,1335,895,
+16,0,691,1,322,
+896,16,0,691,1,
+85,897,16,0,691,
+1,89,898,16,0,
+691,1,346,899,16,
+0,691,1,2105,900,
+17,901,15,806,1,
+-1,1,5,902,20,
+903,4,26,73,0,
+102,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,51,0,1,
+227,1,3,1,6,
+1,5,904,22,1,
+69,1,2106,905,16,
+0,691,1,97,906,
+16,0,691,1,1860,
+907,17,908,15,909,
+4,34,37,0,68,
+0,111,0,87,0,
+104,0,105,0,108,
+0,101,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,1,-1,1,5,
+910,20,911,4,36,
+68,0,111,0,87,
+0,104,0,105,0,
+108,0,101,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,49,
+0,1,231,1,3,
+1,8,1,7,912,
+22,1,73,1,2364,
+913,17,914,15,875,
+1,-1,1,5,915,
+20,916,4,18,70,
+0,111,0,114,0,
+76,0,111,0,111,
+0,112,0,95,0,
+50,0,1,234,1,
+3,1,9,1,8,
+917,22,1,76,1,
+102,918,16,0,691,
+1,112,919,16,0,
+691,1,1117,920,16,
+0,691,1,1873,921,
+17,922,15,909,1,
+-1,1,5,923,20,
+924,4,36,68,0,
+111,0,87,0,104,
+0,105,0,108,0,
+101,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,50,0,1,
+232,1,3,1,8,
+1,7,925,22,1,
+74,1,1876,926,16,
+0,691,1,124,927,
+16,0,691,1,2136,
+928,17,929,15,806,
+1,-1,1,5,930,
+20,931,4,26,73,
+0,102,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,52,0,
+1,228,1,3,1,
+8,1,7,932,22,
+1,70,1,381,933,
+16,0,691,1,525,
+934,16,0,691,1,
+137,935,16,0,691,
+1,1901,936,16,0,
+691,1,1153,937,16,
+0,691,1,151,938,
+16,0,691,1,1407,
+939,16,0,691,1,
+1659,940,16,0,691,
+1,2413,941,16,0,
+691,1,406,942,16,
+0,691,1,1371,943,
+16,0,691,1,166,
+944,16,0,691,1,
+1622,945,16,0,691,
+1,1931,946,17,947,
+15,948,4,30,37,
+0,87,0,104,0,
+105,0,108,0,101,
+0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
-110,0,116,0,95,
-0,53,0,1,203,
-1,3,1,3,1,
-2,836,22,1,49,
-1,2293,837,16,0,
-676,1,2043,838,17,
-839,15,791,1,-1,
-1,5,840,20,841,
-4,22,83,0,116,
+110,0,116,0,1,
+-1,1,5,949,20,
+950,4,32,87,0,
+104,0,105,0,108,
+0,101,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,49,0,
+1,229,1,3,1,
+6,1,5,951,22,
+1,71,1,1933,952,
+16,0,691,1,431,
+953,16,0,691,1,
+1585,954,16,0,691,
+1,182,955,16,0,
+691,1,1189,956,16,
+0,691,1,1443,957,
+16,0,691,1,1695,
+958,16,0,691,1,
+2198,959,16,0,691,
+1,447,960,16,0,
+691,1,2458,961,17,
+962,15,963,4,28,
+37,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-95,0,51,0,1,
-201,1,3,1,3,
-1,2,842,22,1,
-47,1,2045,843,17,
-844,15,791,1,-1,
-1,5,845,20,846,
-4,22,83,0,116,
+76,0,105,0,115,
+0,116,0,1,-1,
+1,5,964,20,965,
+4,30,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-95,0,49,0,1,
-199,1,3,1,3,
-1,2,847,22,1,
-45,1,41,848,16,
-0,676,1,1297,849,
-16,0,676,1,43,
-850,16,0,676,1,
-1803,851,17,852,15,
-853,4,16,37,0,
-70,0,111,0,114,
-0,76,0,111,0,
-111,0,112,0,1,
--1,1,5,854,20,
-855,4,18,70,0,
-111,0,114,0,76,
-0,111,0,111,0,
-112,0,95,0,49,
-0,1,224,1,3,
-1,10,1,9,856,
-22,1,70,1,1804,
-857,16,0,676,1,
-299,858,16,0,676,
-1,52,859,16,0,
-676,1,2318,860,16,
-0,676,1,62,861,
-16,0,676,1,2075,
-862,16,0,676,1,
-1574,863,17,864,15,
-791,1,-1,1,5,
-865,20,866,4,22,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
+76,0,105,0,115,
 0,116,0,95,0,
-52,0,1,202,1,
+50,0,1,206,1,
 3,1,3,1,2,
-867,22,1,48,1,
-71,868,16,0,676,
-1,76,869,16,0,
-676,1,1834,870,16,
-0,676,1,2337,871,
-16,0,676,1,79,
-872,16,0,676,1,
-1335,873,16,0,676,
-1,322,874,16,0,
-676,1,85,875,16,
-0,676,1,89,876,
-16,0,676,1,346,
-877,16,0,676,1,
-2105,878,17,879,15,
-784,1,-1,1,5,
-880,20,881,4,26,
-73,0,102,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,51,
-0,1,218,1,3,
-1,6,1,5,882,
-22,1,64,1,2106,
-883,16,0,676,1,
-97,884,16,0,676,
-1,1860,885,17,886,
-15,887,4,34,37,
-0,68,0,111,0,
-87,0,104,0,105,
-0,108,0,101,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,1,-1,
-1,5,888,20,889,
-4,36,68,0,111,
-0,87,0,104,0,
-105,0,108,0,101,
+966,22,1,48,1,
+2459,967,17,968,15,
+969,4,36,37,0,
+67,0,111,0,109,
+0,112,0,111,0,
+117,0,110,0,100,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,1,222,
-1,3,1,8,1,
-7,890,22,1,68,
-1,2364,891,17,892,
-15,853,1,-1,1,
-5,893,20,894,4,
-18,70,0,111,0,
-114,0,76,0,111,
-0,111,0,112,0,
-95,0,50,0,1,
-225,1,3,1,9,
-1,8,895,22,1,
-71,1,102,896,16,
-0,676,1,112,897,
-16,0,676,1,1117,
-898,16,0,676,1,
-1873,899,17,900,15,
-887,1,-1,1,5,
-901,20,902,4,36,
-68,0,111,0,87,
-0,104,0,105,0,
-108,0,101,0,83,
+110,0,116,0,1,
+-1,1,5,970,20,
+971,4,38,67,0,
+111,0,109,0,112,
+0,111,0,117,0,
+110,0,100,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,95,0,50,
-0,1,223,1,3,
-1,8,1,7,903,
-22,1,69,1,1876,
-904,16,0,676,1,
-124,905,16,0,676,
-1,2136,906,17,907,
-15,784,1,-1,1,
-5,908,20,909,4,
-26,73,0,102,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-52,0,1,219,1,
-3,1,8,1,7,
-910,22,1,65,1,
-2718,911,16,0,676,
-1,381,912,16,0,
-676,1,525,913,16,
-0,676,1,137,914,
-16,0,676,1,1901,
-915,16,0,676,1,
-1153,916,16,0,676,
-1,151,917,16,0,
-676,1,1407,918,16,
-0,676,1,1659,919,
-16,0,676,1,2413,
-920,16,0,676,1,
-406,921,16,0,676,
-1,1371,922,16,0,
-676,1,166,923,16,
-0,676,1,1622,924,
-16,0,676,1,1931,
-925,17,926,15,927,
-4,30,37,0,87,
-0,104,0,105,0,
-108,0,101,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,928,20,929,4,
-32,87,0,104,0,
-105,0,108,0,101,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,1,220,
-1,3,1,6,1,
-5,930,22,1,66,
-1,1933,931,16,0,
-676,1,431,932,16,
-0,676,1,1585,933,
-16,0,676,1,182,
-934,16,0,676,1,
-1189,935,16,0,676,
-1,1443,936,16,0,
-676,1,1695,937,16,
-0,676,1,2198,938,
-16,0,676,1,447,
-939,16,0,676,1,
-2458,940,17,941,15,
-942,4,28,37,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,76,0,
-105,0,115,0,116,
-0,1,-1,1,5,
-943,20,944,4,30,
+0,1,204,1,3,
+1,4,1,3,972,
+22,1,46,1,1958,
+973,16,0,691,1,
+2462,974,17,975,15,
+963,1,-1,1,5,
+976,20,977,4,30,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,76,0,
 105,0,115,0,116,
+0,95,0,49,0,
+1,205,1,3,1,
+2,1,1,978,22,
+1,47,1,1657,979,
+17,980,15,813,1,
+-1,1,5,981,20,
+982,4,22,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
 0,95,0,50,0,
-1,197,1,3,1,
-3,1,2,945,22,
-1,43,1,2459,946,
-17,947,15,948,4,
-36,37,0,67,0,
+1,209,1,3,1,
+3,1,2,983,22,
+1,51,1,2464,984,
+17,985,15,969,1,
+-1,1,5,986,20,
+987,4,38,67,0,
 111,0,109,0,112,
 0,111,0,117,0,
 110,0,100,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,1,-1,1,
-5,949,20,950,4,
-38,67,0,111,0,
-109,0,112,0,111,
-0,117,0,110,0,
-100,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-95,0,50,0,1,
-195,1,3,1,4,
-1,3,951,22,1,
-41,1,1958,952,16,
-0,676,1,2462,953,
-17,954,15,942,1,
--1,1,5,955,20,
-956,4,30,83,0,
+116,0,95,0,49,
+0,1,203,1,3,
+1,3,1,2,988,
+22,1,45,1,199,
+989,16,0,691,1,
+459,990,16,0,691,
+1,462,991,16,0,
+691,1,217,992,16,
+0,691,1,2227,993,
+17,994,15,948,1,
+-1,1,5,995,20,
+996,4,32,87,0,
+104,0,105,0,108,
+0,101,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
-0,76,0,105,0,
-115,0,116,0,95,
-0,49,0,1,196,
-1,3,1,2,1,
-1,957,22,1,42,
-1,1657,958,17,959,
-15,791,1,-1,1,
-5,960,20,961,4,
-22,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,50,0,1,200,
-1,3,1,3,1,
-2,962,22,1,46,
-1,2464,963,17,964,
-15,948,1,-1,1,
-5,965,20,966,4,
-38,67,0,111,0,
-109,0,112,0,111,
-0,117,0,110,0,
-100,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,1,
-194,1,3,1,3,
-1,2,967,22,1,
-40,1,199,968,16,
-0,676,1,459,969,
-16,0,676,1,462,
-970,16,0,676,1,
-217,971,16,0,676,
-1,2227,972,17,973,
-15,927,1,-1,1,
-5,974,20,975,4,
-32,87,0,104,0,
-105,0,108,0,101,
+0,95,0,50,0,
+1,230,1,3,1,
+6,1,5,997,22,
+1,72,1,1225,998,
+16,0,691,1,1479,
+999,16,0,691,1,
+1731,1000,16,0,691,
+1,2740,1001,16,0,
+691,1,1989,1002,17,
+1003,15,806,1,-1,
+1,5,1004,20,1005,
+4,26,73,0,102,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,50,0,1,221,
+0,49,0,1,225,
 1,3,1,6,1,
-5,976,22,1,67,
-1,1225,977,16,0,
-676,1,1479,978,16,
-0,676,1,1731,979,
-16,0,676,1,1989,
-980,17,981,15,784,
-1,-1,1,5,982,
-20,983,4,26,73,
-0,102,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
+5,1006,22,1,67,
+1,1990,1007,16,0,
+691,1,236,1008,16,
+0,691,1,1756,1009,
+16,0,691,1,4,
+1010,19,195,1,4,
+1011,5,100,1,256,
+1012,16,0,589,1,
+1261,1013,16,0,589,
+1,509,1014,16,0,
+589,1,1515,1015,16,
+0,589,1,2021,804,
+1,1775,1016,16,0,
+589,1,2029,811,1,
+2030,817,1,2031,822,
+1,2032,827,1,2033,
+832,1,277,1017,16,
+0,589,1,2035,838,
+1,2037,843,1,2039,
+848,1,32,1018,16,
+0,589,1,2041,854,
+1,2293,1019,16,0,
+589,1,2043,860,1,
+2045,865,1,40,1020,
+16,0,197,1,41,
+1021,16,0,589,1,
+1297,1022,16,0,589,
+1,43,1023,16,0,
+589,1,44,1024,16,
+0,197,1,1803,873,
+1,1804,1025,16,0,
+589,1,299,1026,16,
+0,589,1,47,1027,
+16,0,193,1,52,
+1028,16,0,589,1,
+2318,1029,16,0,589,
+1,63,1030,16,0,
+212,1,66,1031,16,
+0,210,1,2075,1032,
+16,0,589,1,1574,
+885,1,71,1033,16,
+0,589,1,76,1034,
+16,0,589,1,1834,
+1035,16,0,589,1,
+2337,1036,16,0,589,
+1,79,1037,16,0,
+589,1,1335,1038,16,
+0,589,1,322,1039,
+16,0,589,1,85,
+1040,16,0,589,1,
+89,1041,16,0,589,
+1,346,1042,16,0,
+589,1,97,1043,16,
+0,589,1,2106,1044,
+16,0,589,1,102,
+1045,16,0,589,1,
+1860,907,1,2364,913,
+1,1114,1046,16,0,
+193,1,112,1047,16,
+0,589,1,1117,1048,
+16,0,589,1,1873,
+921,1,1876,1049,16,
+0,589,1,124,1050,
+16,0,589,1,2136,
+928,1,381,1051,16,
+0,589,1,525,1052,
+16,0,589,1,137,
+1053,16,0,589,1,
+1901,1054,16,0,589,
+1,1153,1055,16,0,
+589,1,151,1056,16,
+0,589,1,1407,1057,
+16,0,589,1,1659,
+1058,16,0,589,1,
+2413,1059,16,0,589,
+1,406,1060,16,0,
+589,1,1371,1061,16,
+0,589,1,2105,900,
+1,166,1062,16,0,
+589,1,1622,1063,16,
+0,589,1,1931,946,
+1,1933,1064,16,0,
+589,1,431,1065,16,
+0,589,1,1585,1066,
+16,0,589,1,182,
+1067,16,0,589,1,
+1189,1068,16,0,589,
+1,1443,1069,16,0,
+589,1,1695,1070,16,
+0,589,1,2198,1071,
+16,0,589,1,447,
+1072,16,0,589,1,
+2458,961,1,2459,967,
+1,1958,1073,16,0,
+589,1,2462,974,1,
+1657,979,1,2464,984,
+1,199,1074,16,0,
+589,1,459,1075,16,
+0,589,1,462,1076,
+16,0,589,1,217,
+1077,16,0,589,1,
+2227,993,1,1225,1078,
+16,0,589,1,1479,
+1079,16,0,589,1,
+1731,1080,16,0,589,
+1,2740,1081,16,0,
+589,1,1989,1002,1,
+1990,1082,16,0,589,
+1,236,1083,16,0,
+589,1,1756,1084,16,
+0,589,1,5,1085,
+19,192,1,5,1086,
+5,100,1,256,1087,
+16,0,585,1,1261,
+1088,16,0,585,1,
+509,1089,16,0,585,
+1,1515,1090,16,0,
+585,1,2021,804,1,
+1775,1091,16,0,585,
+1,2029,811,1,2030,
+817,1,2031,822,1,
+2032,827,1,2033,832,
+1,277,1092,16,0,
+585,1,2035,838,1,
+2037,843,1,2039,848,
+1,32,1093,16,0,
+585,1,2041,854,1,
+2293,1094,16,0,585,
+1,2043,860,1,2045,
+865,1,40,1095,16,
+0,196,1,41,1096,
+16,0,585,1,1297,
+1097,16,0,585,1,
+43,1098,16,0,585,
+1,44,1099,16,0,
+196,1,1803,873,1,
+1804,1100,16,0,585,
+1,299,1101,16,0,
+585,1,47,1102,16,
+0,190,1,52,1103,
+16,0,585,1,2318,
+1104,16,0,585,1,
+63,1105,16,0,211,
+1,66,1106,16,0,
+209,1,2075,1107,16,
+0,585,1,1574,885,
+1,71,1108,16,0,
+585,1,76,1109,16,
+0,585,1,1834,1110,
+16,0,585,1,2337,
+1111,16,0,585,1,
+79,1112,16,0,585,
+1,1335,1113,16,0,
+585,1,322,1114,16,
+0,585,1,85,1115,
+16,0,585,1,89,
+1116,16,0,585,1,
+346,1117,16,0,585,
+1,97,1118,16,0,
+585,1,2106,1119,16,
+0,585,1,102,1120,
+16,0,585,1,1860,
+907,1,2364,913,1,
+1114,1121,16,0,190,
+1,112,1122,16,0,
+585,1,1117,1123,16,
+0,585,1,1873,921,
+1,1876,1124,16,0,
+585,1,124,1125,16,
+0,585,1,2136,928,
+1,381,1126,16,0,
+585,1,525,1127,16,
+0,585,1,137,1128,
+16,0,585,1,1901,
+1129,16,0,585,1,
+1153,1130,16,0,585,
+1,151,1131,16,0,
+585,1,1407,1132,16,
+0,585,1,1659,1133,
+16,0,585,1,2413,
+1134,16,0,585,1,
+406,1135,16,0,585,
+1,1371,1136,16,0,
+585,1,2105,900,1,
+166,1137,16,0,585,
+1,1622,1138,16,0,
+585,1,1931,946,1,
+1933,1139,16,0,585,
+1,431,1140,16,0,
+585,1,1585,1141,16,
+0,585,1,182,1142,
+16,0,585,1,1189,
+1143,16,0,585,1,
+1443,1144,16,0,585,
+1,1695,1145,16,0,
+585,1,2198,1146,16,
+0,585,1,447,1147,
+16,0,585,1,2458,
+961,1,2459,967,1,
+1958,1148,16,0,585,
+1,2462,974,1,1657,
+979,1,2464,984,1,
+199,1149,16,0,585,
+1,459,1150,16,0,
+585,1,462,1151,16,
+0,585,1,217,1152,
+16,0,585,1,2227,
+993,1,1225,1153,16,
+0,585,1,1479,1154,
+16,0,585,1,1731,
+1155,16,0,585,1,
+2740,1156,16,0,585,
+1,1989,1002,1,1990,
+1157,16,0,585,1,
+236,1158,16,0,585,
+1,1756,1159,16,0,
+585,1,6,1160,19,
+292,1,6,1161,5,
+2,1,1114,1162,16,
+0,290,1,40,1163,
+16,0,574,1,7,
+1164,19,258,1,7,
+1165,5,2,1,1114,
+1166,16,0,256,1,
+40,1167,16,0,516,
+1,8,1168,19,218,
+1,8,1169,5,2,
+1,1114,1170,16,0,
+216,1,40,1171,16,
+0,465,1,9,1172,
+19,224,1,9,1173,
+5,2,1,1114,1174,
+16,0,222,1,40,
+1175,16,0,396,1,
+10,1176,19,175,1,
+10,1177,5,2,1,
+1114,1178,16,0,173,
+1,40,1179,16,0,
+338,1,11,1180,19,
+203,1,11,1181,5,
+146,1,1260,1182,17,
+1183,15,1184,4,34,
+37,0,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,1,
+-1,1,5,1185,20,
+1186,4,38,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+95,0,50,0,49,
+0,1,261,1,3,
+1,6,1,5,1187,
+22,1,103,1,1011,
+1188,17,1189,15,1190,
+4,44,37,0,80,
+0,97,0,114,0,
 101,0,110,0,116,
-0,95,0,49,0,
-1,216,1,3,1,
-6,1,5,984,22,
-1,62,1,1990,985,
-16,0,676,1,236,
-986,16,0,676,1,
-1756,987,16,0,676,
-1,4,988,19,187,
-1,4,989,5,100,
-1,256,990,16,0,
-587,1,1261,991,16,
-0,587,1,509,992,
-16,0,587,1,1515,
-993,16,0,587,1,
-2021,782,1,1775,994,
-16,0,587,1,2029,
-789,1,2030,795,1,
-2031,800,1,2032,805,
-1,2033,810,1,277,
-995,16,0,587,1,
-2035,816,1,2037,821,
-1,2039,826,1,32,
-996,16,0,587,1,
-2041,832,1,2293,997,
-16,0,587,1,2043,
-838,1,2045,843,1,
-40,998,16,0,189,
-1,41,999,16,0,
-587,1,1297,1000,16,
-0,587,1,43,1001,
-16,0,587,1,44,
-1002,16,0,189,1,
-1803,851,1,1804,1003,
-16,0,587,1,299,
-1004,16,0,587,1,
-47,1005,16,0,185,
-1,52,1006,16,0,
-587,1,2318,1007,16,
-0,587,1,63,1008,
-16,0,208,1,66,
-1009,16,0,206,1,
-2075,1010,16,0,587,
-1,1574,863,1,71,
-1011,16,0,587,1,
-76,1012,16,0,587,
-1,1834,1013,16,0,
-587,1,2337,1014,16,
-0,587,1,79,1015,
-16,0,587,1,1335,
-1016,16,0,587,1,
-322,1017,16,0,587,
-1,85,1018,16,0,
-587,1,89,1019,16,
-0,587,1,346,1020,
-16,0,587,1,97,
-1021,16,0,587,1,
-2106,1022,16,0,587,
-1,102,1023,16,0,
-587,1,1860,885,1,
-2364,891,1,1114,1024,
-16,0,185,1,112,
-1025,16,0,587,1,
-1117,1026,16,0,587,
-1,1873,899,1,1876,
-1027,16,0,587,1,
-124,1028,16,0,587,
-1,2136,906,1,2718,
-1029,16,0,587,1,
-381,1030,16,0,587,
-1,525,1031,16,0,
-587,1,137,1032,16,
-0,587,1,1901,1033,
-16,0,587,1,1153,
-1034,16,0,587,1,
-151,1035,16,0,587,
-1,1407,1036,16,0,
-587,1,1659,1037,16,
-0,587,1,2413,1038,
-16,0,587,1,406,
-1039,16,0,587,1,
-1371,1040,16,0,587,
-1,2105,878,1,166,
-1041,16,0,587,1,
-1622,1042,16,0,587,
-1,1931,925,1,1933,
-1043,16,0,587,1,
-431,1044,16,0,587,
-1,1585,1045,16,0,
-587,1,182,1046,16,
-0,587,1,1189,1047,
-16,0,587,1,1443,
-1048,16,0,587,1,
-1695,1049,16,0,587,
-1,2198,1050,16,0,
-587,1,447,1051,16,
-0,587,1,2458,940,
-1,2459,946,1,1958,
-1052,16,0,587,1,
-2462,953,1,1657,958,
-1,2464,963,1,199,
-1053,16,0,587,1,
-459,1054,16,0,587,
-1,462,1055,16,0,
-587,1,217,1056,16,
-0,587,1,2227,972,
-1,1225,1057,16,0,
-587,1,1479,1058,16,
-0,587,1,1731,1059,
-16,0,587,1,1989,
-980,1,1990,1060,16,
-0,587,1,236,1061,
-16,0,587,1,1756,
-1062,16,0,587,1,
-5,1063,19,184,1,
-5,1064,5,100,1,
-256,1065,16,0,583,
-1,1261,1066,16,0,
-583,1,509,1067,16,
-0,583,1,1515,1068,
-16,0,583,1,2021,
-782,1,1775,1069,16,
-0,583,1,2029,789,
-1,2030,795,1,2031,
-800,1,2032,805,1,
-2033,810,1,277,1070,
-16,0,583,1,2035,
-816,1,2037,821,1,
-2039,826,1,32,1071,
-16,0,583,1,2041,
-832,1,2293,1072,16,
-0,583,1,2043,838,
-1,2045,843,1,40,
-1073,16,0,188,1,
-41,1074,16,0,583,
-1,1297,1075,16,0,
-583,1,43,1076,16,
-0,583,1,44,1077,
-16,0,188,1,1803,
-851,1,1804,1078,16,
-0,583,1,299,1079,
-16,0,583,1,47,
-1080,16,0,182,1,
-52,1081,16,0,583,
-1,2318,1082,16,0,
-583,1,63,1083,16,
-0,207,1,66,1084,
-16,0,205,1,2075,
-1085,16,0,583,1,
-1574,863,1,71,1086,
-16,0,583,1,76,
-1087,16,0,583,1,
-1834,1088,16,0,583,
-1,2337,1089,16,0,
-583,1,79,1090,16,
-0,583,1,1335,1091,
-16,0,583,1,322,
-1092,16,0,583,1,
-85,1093,16,0,583,
-1,89,1094,16,0,
-583,1,346,1095,16,
-0,583,1,97,1096,
-16,0,583,1,2106,
-1097,16,0,583,1,
-102,1098,16,0,583,
-1,1860,885,1,2364,
-891,1,1114,1099,16,
-0,182,1,112,1100,
-16,0,583,1,1117,
-1101,16,0,583,1,
-1873,899,1,1876,1102,
-16,0,583,1,124,
-1103,16,0,583,1,
-2136,906,1,2718,1104,
-16,0,583,1,381,
-1105,16,0,583,1,
-525,1106,16,0,583,
-1,137,1107,16,0,
-583,1,1901,1108,16,
-0,583,1,1153,1109,
-16,0,583,1,151,
-1110,16,0,583,1,
-1407,1111,16,0,583,
-1,1659,1112,16,0,
-583,1,2413,1113,16,
-0,583,1,406,1114,
-16,0,583,1,1371,
-1115,16,0,583,1,
-2105,878,1,166,1116,
-16,0,583,1,1622,
-1117,16,0,583,1,
-1931,925,1,1933,1118,
-16,0,583,1,431,
-1119,16,0,583,1,
-1585,1120,16,0,583,
-1,182,1121,16,0,
-583,1,1189,1122,16,
-0,583,1,1443,1123,
-16,0,583,1,1695,
-1124,16,0,583,1,
-2198,1125,16,0,583,
-1,447,1126,16,0,
-583,1,2458,940,1,
-2459,946,1,1958,1127,
-16,0,583,1,2462,
-953,1,1657,958,1,
-2464,963,1,199,1128,
-16,0,583,1,459,
-1129,16,0,583,1,
-462,1130,16,0,583,
-1,217,1131,16,0,
-583,1,2227,972,1,
-1225,1132,16,0,583,
-1,1479,1133,16,0,
-583,1,1731,1134,16,
-0,583,1,1989,980,
-1,1990,1135,16,0,
-583,1,236,1136,16,
-0,583,1,1756,1137,
-16,0,583,1,6,
-1138,19,281,1,6,
-1139,5,2,1,1114,
-1140,16,0,279,1,
-40,1141,16,0,572,
-1,7,1142,19,248,
-1,7,1143,5,2,
-1,1114,1144,16,0,
-246,1,40,1145,16,
-0,513,1,8,1146,
-19,214,1,8,1147,
-5,2,1,1114,1148,
-16,0,212,1,40,
-1149,16,0,474,1,
-9,1150,19,220,1,
-9,1151,5,2,1,
-1114,1152,16,0,218,
-1,40,1153,16,0,
-401,1,10,1154,19,
-167,1,10,1155,5,
-2,1,1114,1156,16,
-0,165,1,40,1157,
-16,0,338,1,11,
-1158,19,194,1,11,
-1159,5,146,1,1260,
-1160,17,1161,15,1162,
-4,34,37,0,83,
+0,104,0,101,0,
+115,0,105,0,115,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,1,-1,1,5,
+1191,20,1192,4,46,
+80,0,97,0,114,
+0,101,0,110,0,
+116,0,104,0,101,
+0,115,0,105,0,
+115,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,50,
+0,1,308,1,3,
+1,4,1,3,1193,
+22,1,150,1,1514,
+1194,17,1195,15,1184,
+1,-1,1,5,1196,
+20,1197,4,38,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
 115,0,105,0,103,
 0,110,0,109,0,
 101,0,110,0,116,
-0,1,-1,1,5,
-1163,20,1164,4,38,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,50,
-0,49,0,1,252,
-1,3,1,6,1,
-5,1165,22,1,98,
-1,1011,1166,17,1167,
-15,1168,4,44,37,
-0,80,0,97,0,
-114,0,101,0,110,
-0,116,0,104,0,
-101,0,115,0,105,
-0,115,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,-1,
-1,5,1169,20,1170,
-4,46,80,0,97,
-0,114,0,101,0,
-110,0,116,0,104,
-0,101,0,115,0,
-105,0,115,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,50,0,1,299,
-1,3,1,4,1,
-3,1171,22,1,145,
-1,1514,1172,17,1173,
-15,1162,1,-1,1,
-5,1174,20,1175,4,
-38,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,52,0,1,
-245,1,3,1,4,
-1,3,1176,22,1,
-91,1,9,1177,17,
-1178,15,1179,4,24,
-37,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,1,
--1,1,5,1180,20,
-1181,4,26,68,0,
-101,0,99,0,108,
+0,95,0,49,0,
+52,0,1,254,1,
+3,1,4,1,3,
+1198,22,1,96,1,
+9,1199,17,1200,15,
+1201,4,24,37,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,1,-1,1,
+5,1202,20,1203,4,
+26,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,95,0,
+49,0,1,198,1,
+3,1,3,1,2,
+1204,22,1,40,1,
+262,1205,17,1206,15,
+1207,4,34,37,0,
+66,0,105,0,110,
 0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-95,0,49,0,1,
-190,1,3,1,3,
-1,2,1182,22,1,
-36,1,262,1183,17,
-1184,15,1185,4,34,
-37,0,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,-1,1,
+5,1208,20,1209,4,
+36,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+53,0,1,290,1,
+3,1,4,1,3,
+1210,22,1,132,1,
+1267,1211,17,1212,15,
+1184,1,-1,1,5,
+1213,20,1214,4,36,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
 0,115,0,105,0,
-111,0,110,0,1,
--1,1,5,1186,20,
-1187,4,36,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,53,0,1,
-281,1,3,1,4,
-1,3,1188,22,1,
-127,1,1267,1189,17,
-1190,15,1162,1,-1,
-1,5,1191,20,1192,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,56,
+0,1,248,1,3,
+1,6,1,5,1215,
+22,1,90,1,2021,
+804,1,1521,1216,17,
+1217,15,1184,1,-1,
+1,5,1218,20,1219,
 4,36,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -4593,209 +4750,178 @@ public yyLSLSyntax
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,56,0,1,239,
-1,3,1,6,1,
-5,1193,22,1,85,
-1,2021,782,1,1521,
-1194,17,1195,15,1162,
-1,-1,1,5,1196,
-20,1197,4,36,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,49,0,
-1,232,1,3,1,
-4,1,3,1198,22,
-1,78,1,2024,1199,
-17,1200,15,1201,4,
-24,37,0,83,0,
-116,0,97,0,116,
-0,101,0,67,0,
-104,0,97,0,110,
-0,103,0,101,0,
-1,-1,1,5,1202,
-20,1203,4,26,83,
-0,116,0,97,0,
-116,0,101,0,67,
-0,104,0,97,0,
-110,0,103,0,101,
-0,95,0,49,0,
-1,214,1,3,1,
-3,1,2,1204,22,
-1,60,1,1775,1205,
-17,1206,15,1207,4,
-30,37,0,69,0,
+0,49,0,1,241,
+1,3,1,4,1,
+3,1220,22,1,83,
+1,2024,1221,17,1222,
+15,1223,4,24,37,
+0,83,0,116,0,
+97,0,116,0,101,
+0,67,0,104,0,
+97,0,110,0,103,
+0,101,0,1,-1,
+1,5,1224,20,1225,
+4,26,83,0,116,
+0,97,0,116,0,
+101,0,67,0,104,
+0,97,0,110,0,
+103,0,101,0,95,
+0,49,0,1,223,
+1,3,1,3,1,
+2,1226,22,1,65,
+1,1775,1227,17,1228,
+15,1229,4,30,37,
+0,69,0,109,0,
+112,0,116,0,121,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,1,
+-1,1,5,1230,20,
+1231,4,32,69,0,
 109,0,112,0,116,
 0,121,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
-0,1,-1,1,5,
-1208,20,1209,4,32,
-69,0,109,0,112,
-0,116,0,121,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,1,198,1,
-3,1,1,1,0,
-1210,22,1,44,1,
-19,1211,17,1178,1,
-2,1182,1,2028,1212,
-17,1213,15,1214,4,
-20,37,0,74,0,
+0,95,0,49,0,
+1,207,1,3,1,
+1,1,0,1232,22,
+1,49,1,19,1233,
+17,1200,1,2,1204,
+1,2028,1234,17,1235,
+15,1236,4,20,37,
+0,74,0,117,0,
+109,0,112,0,76,
+0,97,0,98,0,
+101,0,108,0,1,
+-1,1,5,1237,20,
+1238,4,22,74,0,
 117,0,109,0,112,
 0,76,0,97,0,
 98,0,101,0,108,
-0,1,-1,1,5,
-1215,20,1216,4,22,
-74,0,117,0,109,
-0,112,0,76,0,
-97,0,98,0,101,
-0,108,0,95,0,
-49,0,1,212,1,
-3,1,3,1,2,
-1217,22,1,58,1,
-2029,789,1,2281,1218,
-17,1219,15,1220,4,
-34,37,0,70,0,
-111,0,114,0,76,
-0,111,0,111,0,
-112,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-1,-1,1,5,1221,
-20,1222,4,36,70,
-0,111,0,114,0,
-76,0,111,0,111,
-0,112,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,50,0,
-1,227,1,3,1,
-2,1,1,1223,22,
-1,73,1,2031,800,
-1,2032,805,1,2033,
-810,1,2034,1224,16,
-0,620,1,2035,816,
-1,2036,1225,16,0,
-573,1,2037,821,1,
-2038,1226,16,0,577,
-1,2039,826,1,32,
-1227,17,1206,1,0,
-1210,1,2041,832,1,
-2042,1228,16,0,702,
-1,2043,838,1,2044,
-1229,16,0,632,1,
-2045,843,1,2299,1230,
-16,0,234,1,1296,
-1231,17,1232,15,1162,
-1,-1,1,5,1233,
-20,1234,4,38,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,50,0,
-48,0,1,251,1,
-3,1,6,1,5,
-1235,22,1,97,1,
-283,1236,17,1237,15,
-1185,1,-1,1,5,
-1238,20,1239,4,36,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,52,
-0,1,280,1,3,
-1,4,1,3,1240,
-22,1,126,1,40,
-1241,17,1242,15,1243,
-4,32,37,0,73,
-0,100,0,101,0,
-110,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,1,
--1,1,5,1244,20,
-1245,4,34,73,0,
-100,0,101,0,110,
-0,116,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-49,0,1,266,1,
-3,1,2,1,1,
-1246,22,1,112,1,
-44,1247,17,1242,1,
-1,1246,1,1803,851,
-1,47,1248,17,1249,
-15,1250,4,38,37,
-0,73,0,100,0,
-101,0,110,0,116,
-0,68,0,111,0,
+0,95,0,49,0,
+1,221,1,3,1,
+3,1,2,1239,22,
+1,63,1,2029,811,
+1,2281,1240,17,1241,
+15,1242,4,34,37,
+0,70,0,111,0,
+114,0,76,0,111,
+0,111,0,112,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,-1,
+1,5,1243,20,1244,
+4,36,70,0,111,
+0,114,0,76,0,
+111,0,111,0,112,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,95,
+0,50,0,1,236,
+1,3,1,2,1,
+1,1245,22,1,78,
+1,2031,822,1,2032,
+827,1,2033,832,1,
+2034,1246,16,0,648,
+1,2035,838,1,2036,
+1247,16,0,575,1,
+2037,843,1,2038,1248,
+16,0,579,1,2039,
+848,1,32,1249,17,
+1228,1,0,1232,1,
+2041,854,1,2042,1250,
+16,0,719,1,2043,
+860,1,2044,1251,16,
+0,660,1,2045,865,
+1,2299,1252,16,0,
+240,1,1296,1253,17,
+1254,15,1184,1,-1,
+1,5,1255,20,1256,
+4,38,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,50,0,48,0,
+1,260,1,3,1,
+6,1,5,1257,22,
+1,102,1,283,1258,
+17,1259,15,1207,1,
+-1,1,5,1260,20,
+1261,4,36,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,52,0,1,
+289,1,3,1,4,
+1,3,1262,22,1,
+131,1,40,1263,17,
+1264,15,1265,4,32,
+37,0,73,0,100,
+0,101,0,110,0,
 116,0,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,1,-1,1,
-5,1251,20,1252,4,
-40,73,0,100,0,
+5,1266,20,1267,4,
+34,73,0,100,0,
 101,0,110,0,116,
-0,68,0,111,0,
-116,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,1,267,1,3,
-1,4,1,3,1253,
-22,1,113,1,48,
-1254,17,1255,15,1256,
-4,58,37,0,73,
-0,110,0,99,0,
-114,0,101,0,109,
-0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,114,0,
-101,0,109,0,101,
-0,110,0,116,0,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,49,0,
+1,275,1,3,1,
+2,1,1,1268,22,
+1,117,1,44,1269,
+17,1264,1,1,1268,
+1,1803,873,1,47,
+1270,17,1271,15,1272,
+4,38,37,0,73,
+0,100,0,101,0,
+110,0,116,0,68,
+0,111,0,116,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-1,-1,1,5,1257,
-20,1258,4,60,73,
-0,110,0,99,0,
-114,0,101,0,109,
-0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,114,0,
-101,0,109,0,101,
-0,110,0,116,0,
+1,-1,1,5,1273,
+20,1274,4,40,73,
+0,100,0,101,0,
+110,0,116,0,68,
+0,111,0,116,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,52,0,1,
-271,1,3,1,5,
-1,4,1259,22,1,
-117,1,49,1260,17,
-1261,15,1256,1,-1,
-1,5,1262,20,1263,
+95,0,49,0,1,
+276,1,3,1,4,
+1,3,1275,22,1,
+118,1,48,1276,17,
+1277,15,1278,4,58,
+37,0,73,0,110,
+0,99,0,114,0,
+101,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,114,0,101,0,
+109,0,101,0,110,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,-1,
+1,5,1279,20,1280,
 4,60,73,0,110,
 0,99,0,114,0,
 101,0,109,0,101,
@@ -4808,12 +4934,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-51,0,1,270,1,
+52,0,1,280,1,
 3,1,5,1,4,
-1264,22,1,116,1,
-50,1265,17,1266,15,
-1256,1,-1,1,5,
-1267,20,1268,4,60,
+1281,22,1,122,1,
+49,1282,17,1283,15,
+1278,1,-1,1,5,
+1284,20,1285,4,60,
 73,0,110,0,99,
 0,114,0,101,0,
 109,0,101,0,110,
@@ -4825,13 +4951,13 @@ public yyLSLSyntax
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,50,0,
-1,269,1,3,1,
-3,1,2,1269,22,
-1,115,1,51,1270,
-17,1271,15,1256,1,
--1,1,5,1272,20,
-1273,4,60,73,0,
+0,95,0,51,0,
+1,279,1,3,1,
+5,1,4,1286,22,
+1,121,1,50,1287,
+17,1288,15,1278,1,
+-1,1,5,1289,20,
+1290,4,60,73,0,
 110,0,99,0,114,
 0,101,0,109,0,
 101,0,110,0,116,
@@ -4843,107 +4969,85 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,49,0,1,268,
+0,50,0,1,278,
 1,3,1,3,1,
-2,1274,22,1,114,
-1,305,1275,17,1276,
-15,1185,1,-1,1,
-5,1277,20,1278,4,
-36,66,0,105,0,
-110,0,97,0,114,
-0,121,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-51,0,1,279,1,
-3,1,4,1,3,
-1279,22,1,125,1,
-525,1280,17,1281,15,
-1282,4,34,37,0,
-82,0,111,0,116,
-0,97,0,116,0,
-105,0,111,0,110,
-0,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,1,-1,1,
-5,1283,20,1284,4,
-36,82,0,111,0,
-116,0,97,0,116,
-0,105,0,111,0,
-110,0,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,95,0,
-49,0,1,264,1,
-3,1,10,1,9,
-1285,22,1,110,1,
-63,1286,17,1287,15,
-1288,4,38,37,0,
-84,0,121,0,112,
-0,101,0,99,0,
-97,0,115,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,-1,1,5,
-1289,20,1290,4,40,
-84,0,121,0,112,
+2,1291,22,1,120,
+1,51,1292,17,1293,
+15,1278,1,-1,1,
+5,1294,20,1295,4,
+60,73,0,110,0,
+99,0,114,0,101,
+0,109,0,101,0,
+110,0,116,0,68,
 0,101,0,99,0,
-97,0,115,0,116,
+114,0,101,0,109,
+0,101,0,110,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,49,
+0,1,277,1,3,
+1,3,1,2,1296,
+22,1,119,1,305,
+1297,17,1298,15,1207,
+1,-1,1,5,1299,
+20,1300,4,36,66,
+0,105,0,110,0,
+97,0,114,0,121,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,50,0,
-1,301,1,3,1,
-5,1,4,1291,22,
-1,147,1,66,1292,
-17,1293,15,1288,1,
--1,1,5,1294,20,
-1295,4,40,84,0,
-121,0,112,0,101,
-0,99,0,97,0,
+0,95,0,51,0,
+1,288,1,3,1,
+4,1,3,1301,22,
+1,130,1,525,1302,
+17,1303,15,1304,4,
+34,37,0,82,0,
+111,0,116,0,97,
+0,116,0,105,0,
+111,0,110,0,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+1,-1,1,5,1305,
+20,1306,4,36,82,
+0,111,0,116,0,
+97,0,116,0,105,
+0,111,0,110,0,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,95,0,49,0,
+1,273,1,3,1,
+10,1,9,1307,22,
+1,115,1,63,1308,
+17,1309,15,1310,4,
+38,37,0,84,0,
+121,0,112,0,101,
+0,99,0,97,0,
+115,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,1,
+-1,1,5,1311,20,
+1312,4,40,84,0,
+121,0,112,0,101,
+0,99,0,97,0,
 115,0,116,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,51,0,1,302,
-1,3,1,7,1,
-6,1296,22,1,148,
-1,67,1297,17,1298,
-15,1288,1,-1,1,
-5,1299,20,1300,4,
-40,84,0,121,0,
-112,0,101,0,99,
-0,97,0,115,0,
-116,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,55,
-0,1,306,1,3,
-1,8,1,7,1301,
-22,1,152,1,68,
-1302,17,1303,15,1288,
-1,-1,1,5,1304,
-20,1305,4,40,84,
-0,121,0,112,0,
-101,0,99,0,97,
-0,115,0,116,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,53,0,1,
-304,1,3,1,8,
-1,7,1306,22,1,
-150,1,69,1307,17,
-1308,15,1288,1,-1,
-1,5,1309,20,1310,
+0,50,0,1,310,
+1,3,1,5,1,
+4,1313,22,1,152,
+1,2739,1314,16,0,
+755,1,66,1315,17,
+1316,15,1310,1,-1,
+1,5,1317,20,1318,
 4,40,84,0,121,
 0,112,0,101,0,
 99,0,97,0,115,
@@ -4952,12 +5056,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-54,0,1,305,1,
-3,1,6,1,5,
-1311,22,1,151,1,
-70,1312,17,1313,15,
-1288,1,-1,1,5,
-1314,20,1315,4,40,
+51,0,1,311,1,
+3,1,7,1,6,
+1319,22,1,153,1,
+67,1320,17,1321,15,
+1310,1,-1,1,5,
+1322,20,1323,4,40,
 84,0,121,0,112,
 0,101,0,99,0,
 97,0,115,0,116,
@@ -4965,13 +5069,13 @@ public yyLSLSyntax
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,52,0,
-1,303,1,3,1,
-6,1,5,1316,22,
-1,149,1,74,1317,
-17,1318,15,1288,1,
--1,1,5,1319,20,
-1320,4,40,84,0,
+0,95,0,55,0,
+1,315,1,3,1,
+8,1,7,1324,22,
+1,157,1,68,1325,
+17,1326,15,1310,1,
+-1,1,5,1327,20,
+1328,4,40,84,0,
 121,0,112,0,101,
 0,99,0,97,0,
 115,0,116,0,69,
@@ -4979,190 +5083,68 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,57,0,1,308,
-1,3,1,7,1,
-6,1321,22,1,154,
-1,1013,1322,17,1323,
-15,1168,1,-1,1,
-5,1324,20,1325,4,
-46,80,0,97,0,
-114,0,101,0,110,
-0,116,0,104,0,
-101,0,115,0,105,
-0,115,0,69,0,
+0,53,0,1,313,
+1,3,1,8,1,
+7,1329,22,1,155,
+1,69,1330,17,1331,
+15,1310,1,-1,1,
+5,1332,20,1333,4,
+40,84,0,121,0,
+112,0,101,0,99,
+0,97,0,115,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,54,
+0,1,314,1,3,
+1,6,1,5,1334,
+22,1,156,1,70,
+1335,17,1336,15,1310,
+1,-1,1,5,1337,
+20,1338,4,40,84,
+0,121,0,112,0,
+101,0,99,0,97,
+0,115,0,116,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,52,0,1,
+312,1,3,1,6,
+1,5,1339,22,1,
+154,1,74,1340,17,
+1341,15,1310,1,-1,
+1,5,1342,20,1343,
+4,40,84,0,121,
+0,112,0,101,0,
+99,0,97,0,115,
+0,116,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,1,298,1,
-3,1,4,1,3,
-1326,22,1,144,1,
-1332,1327,17,1328,15,
-1162,1,-1,1,5,
-1329,20,1330,4,38,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
+57,0,1,317,1,
+3,1,7,1,6,
+1344,22,1,159,1,
+1013,1345,17,1346,15,
+1190,1,-1,1,5,
+1347,20,1348,4,46,
+80,0,97,0,114,
 0,101,0,110,0,
-116,0,95,0,49,
-0,57,0,1,250,
-1,3,1,6,1,
-5,1331,22,1,96,
-1,2337,1332,17,1206,
-1,0,1210,1,1585,
-1333,17,1334,15,1335,
-4,32,37,0,82,
-0,101,0,116,0,
-117,0,114,0,110,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,1,
--1,1,5,1336,20,
-1337,4,34,82,0,
-101,0,116,0,117,
-0,114,0,110,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-50,0,1,257,1,
-3,1,2,1,1,
-1338,22,1,103,1,
-2023,1339,17,1340,15,
-1201,1,-1,1,5,
-1341,20,1342,4,26,
-83,0,116,0,97,
-0,116,0,101,0,
-67,0,104,0,97,
-0,110,0,103,0,
-101,0,95,0,50,
-0,1,215,1,3,
-1,3,1,2,1343,
-22,1,61,1,2136,
-906,1,82,1344,17,
-1345,15,1346,4,32,
-37,0,85,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,1,-1,1,
-5,1347,20,1348,4,
-34,85,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,51,0,
-1,297,1,3,1,
-3,1,2,1349,22,
-1,143,1,2026,1350,
-17,1351,15,1352,4,
-28,37,0,74,0,
-117,0,109,0,112,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,1,
--1,1,5,1353,20,
-1354,4,30,74,0,
-117,0,109,0,112,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,1,213,
-1,3,1,3,1,
-2,1355,22,1,59,
-1,1591,1356,17,1357,
-15,1335,1,-1,1,
-5,1358,20,1359,4,
-34,82,0,101,0,
-116,0,117,0,114,
-0,110,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,49,0,
-1,256,1,3,1,
-3,1,2,1360,22,
-1,102,1,1341,1361,
-17,1362,15,1162,1,
--1,1,5,1363,20,
-1364,4,36,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,54,0,1,
-237,1,3,1,4,
-1,3,1365,22,1,
-83,1,2030,795,1,
-328,1366,17,1367,15,
-1185,1,-1,1,5,
-1368,20,1369,4,36,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,50,
-0,1,278,1,3,
-1,4,1,3,1370,
-22,1,124,1,1303,
-1371,17,1372,15,1162,
-1,-1,1,5,1373,
-20,1374,4,36,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,55,0,
-1,238,1,3,1,
-6,1,5,1375,22,
-1,84,1,1096,1376,
-17,1377,15,1378,4,
-26,37,0,70,0,
-117,0,110,0,99,
-0,116,0,105,0,
-111,0,110,0,67,
-0,97,0,108,0,
-108,0,1,-1,1,
-5,1379,20,1380,4,
-28,70,0,117,0,
-110,0,99,0,116,
-0,105,0,111,0,
-110,0,67,0,97,
-0,108,0,108,0,
-95,0,49,0,1,
-309,1,3,1,5,
-1,4,1381,22,1,
-155,1,93,1382,17,
-1383,15,1346,1,-1,
-1,5,1384,20,1385,
-4,34,85,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
+116,0,104,0,101,
+0,115,0,105,0,
+115,0,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,95,0,50,
-0,1,296,1,3,
-1,3,1,2,1386,
-22,1,142,1,1550,
-1387,17,1388,15,1162,
-1,-1,1,5,1389,
-20,1390,4,38,83,
+110,0,95,0,49,
+0,1,307,1,3,
+1,4,1,3,1349,
+22,1,149,1,1332,
+1350,17,1351,15,1184,
+1,-1,1,5,1352,
+20,1353,4,38,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
@@ -5170,243 +5152,319 @@ public yyLSLSyntax
 0,110,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-51,0,1,244,1,
-3,1,4,1,3,
-1391,22,1,90,1,
-2040,1392,16,0,581,
-1,2106,1393,17,1206,
-1,0,1210,1,1555,
-1394,16,0,658,1,
-827,1395,17,1396,15,
-1185,1,-1,1,5,
-1397,20,1398,4,38,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,53,0,1,291,
-1,3,1,4,1,
-3,1399,22,1,137,
-1,1859,1400,16,0,
-317,1,1860,885,1,
-1804,1401,17,1206,1,
-0,1210,1,107,1402,
-17,1403,15,1346,1,
--1,1,5,1404,20,
-1405,4,34,85,0,
-110,0,97,0,114,
-0,121,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-49,0,1,295,1,
-3,1,3,1,2,
-1406,22,1,141,1,
-1114,1407,17,1249,1,
-3,1253,1,1048,1408,
-17,1409,15,1185,1,
--1,1,5,1410,20,
-1411,4,38,66,0,
-105,0,110,0,97,
+57,0,1,259,1,
+3,1,6,1,5,
+1354,22,1,101,1,
+2337,1355,17,1228,1,
+0,1232,1,1585,1356,
+17,1357,15,1358,4,
+32,37,0,82,0,
+101,0,116,0,117,
+0,114,0,110,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,-1,
+1,5,1359,20,1360,
+4,34,82,0,101,
+0,116,0,117,0,
+114,0,110,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,50,
+0,1,266,1,3,
+1,2,1,1,1361,
+22,1,108,1,2023,
+1362,17,1363,15,1223,
+1,-1,1,5,1364,
+20,1365,4,26,83,
+0,116,0,97,0,
+116,0,101,0,67,
+0,104,0,97,0,
+110,0,103,0,101,
+0,95,0,50,0,
+1,224,1,3,1,
+3,1,2,1366,22,
+1,66,1,2136,928,
+1,82,1367,17,1368,
+15,1369,4,32,37,
+0,85,0,110,0,
+97,0,114,0,121,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,1,-1,1,5,
+1370,20,1371,4,34,
+85,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,49,0,56,
-0,1,294,1,3,
-1,4,1,3,1412,
-22,1,140,1,352,
-1413,17,1414,15,1185,
-1,-1,1,5,1415,
-20,1416,4,36,66,
+95,0,51,0,1,
+306,1,3,1,3,
+1,2,1372,22,1,
+148,1,2026,1373,17,
+1374,15,1375,4,28,
+37,0,74,0,117,
+0,109,0,112,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,-1,
+1,5,1376,20,1377,
+4,30,74,0,117,
+0,109,0,112,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,1,222,1,
+3,1,3,1,2,
+1378,22,1,64,1,
+1591,1379,17,1380,15,
+1358,1,-1,1,5,
+1381,20,1382,4,34,
+82,0,101,0,116,
+0,117,0,114,0,
+110,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+265,1,3,1,3,
+1,2,1383,22,1,
+107,1,1341,1384,17,
+1385,15,1184,1,-1,
+1,5,1386,20,1387,
+4,36,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,54,0,1,246,
+1,3,1,4,1,
+3,1388,22,1,88,
+1,2030,817,1,328,
+1389,17,1390,15,1207,
+1,-1,1,5,1391,
+20,1392,4,36,66,
 0,105,0,110,0,
 97,0,114,0,121,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,49,0,
-1,277,1,3,1,
-4,1,3,1417,22,
-1,123,1,1872,1418,
-16,0,327,1,1873,
-899,1,118,1419,17,
-1420,15,1185,1,-1,
-1,5,1421,20,1422,
-4,38,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,49,0,52,0,
-1,290,1,3,1,
-4,1,3,1423,22,
-1,136,1,1123,1424,
-17,1425,15,1162,1,
--1,1,5,1426,20,
-1427,4,38,83,0,
+0,95,0,50,0,
+1,287,1,3,1,
+4,1,3,1393,22,
+1,129,1,1303,1394,
+17,1395,15,1184,1,
+-1,1,5,1396,20,
+1397,4,36,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,49,0,50,
-0,1,243,1,3,
-1,6,1,5,1428,
-22,1,89,1,371,
-1429,17,1430,15,1431,
-4,46,37,0,70,
-0,117,0,110,0,
-99,0,116,0,105,
-0,111,0,110,0,
-67,0,97,0,108,
-0,108,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,-1,
-1,5,1432,20,1433,
-4,48,70,0,117,
+95,0,55,0,1,
+247,1,3,1,6,
+1,5,1398,22,1,
+89,1,1096,1399,17,
+1400,15,1401,4,26,
+37,0,70,0,117,
 0,110,0,99,0,
 116,0,105,0,111,
 0,110,0,67,0,
 97,0,108,0,108,
+0,1,-1,1,5,
+1402,20,1403,4,28,
+70,0,117,0,110,
+0,99,0,116,0,
+105,0,111,0,110,
+0,67,0,97,0,
+108,0,108,0,95,
+0,49,0,1,318,
+1,3,1,5,1,
+4,1404,22,1,160,
+1,93,1405,17,1406,
+15,1369,1,-1,1,
+5,1407,20,1408,4,
+34,85,0,110,0,
+97,0,114,0,121,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,49,0,
-1,276,1,3,1,
-2,1,1,1434,22,
-1,122,1,1377,1435,
-17,1436,15,1162,1,
--1,1,5,1437,20,
-1438,4,36,83,0,
+0,95,0,50,0,
+1,305,1,3,1,
+3,1,2,1409,22,
+1,147,1,1550,1410,
+17,1411,15,1184,1,
+-1,1,5,1412,20,
+1413,4,38,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,53,0,1,
-236,1,3,1,4,
-1,3,1439,22,1,
-82,1,375,1440,17,
-1441,15,1256,1,-1,
-1,5,1442,20,1443,
-4,60,73,0,110,
-0,99,0,114,0,
-101,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,114,0,101,0,
-109,0,101,0,110,
-0,116,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-56,0,1,275,1,
-3,1,5,1,4,
-1444,22,1,121,1,
-377,1445,17,1446,15,
-1256,1,-1,1,5,
-1447,20,1448,4,60,
-73,0,110,0,99,
-0,114,0,101,0,
-109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,114,
-0,101,0,109,0,
-101,0,110,0,116,
+95,0,49,0,51,
+0,1,253,1,3,
+1,4,1,3,1414,
+22,1,95,1,2040,
+1415,16,0,583,1,
+2106,1416,17,1228,1,
+0,1232,1,1555,1417,
+16,0,674,1,827,
+1418,17,1419,15,1207,
+1,-1,1,5,1420,
+20,1421,4,38,66,
+0,105,0,110,0,
+97,0,114,0,121,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,53,0,
-1,272,1,3,1,
-3,1,2,1449,22,
-1,118,1,379,1450,
-17,1451,15,1256,1,
--1,1,5,1452,20,
-1453,4,60,73,0,
-110,0,99,0,114,
-0,101,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
-99,0,114,0,101,
-0,109,0,101,0,
-110,0,116,0,69,
+0,95,0,49,0,
+53,0,1,300,1,
+3,1,4,1,3,
+1422,22,1,142,1,
+1859,1423,16,0,319,
+1,1860,907,1,1804,
+1424,17,1228,1,0,
+1232,1,107,1425,17,
+1426,15,1369,1,-1,
+1,5,1427,20,1428,
+4,34,85,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,49,
+0,1,304,1,3,
+1,3,1,2,1429,
+22,1,146,1,1114,
+1430,17,1271,1,3,
+1275,1,1048,1431,17,
+1432,15,1207,1,-1,
+1,5,1433,20,1434,
+4,38,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,55,0,1,274,
-1,3,1,5,1,
-4,1454,22,1,120,
-1,380,1455,17,1456,
-15,1457,4,38,37,
-0,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,69,0,120,
+0,49,0,56,0,
+1,303,1,3,1,
+4,1,3,1435,22,
+1,145,1,352,1436,
+17,1437,15,1207,1,
+-1,1,5,1438,20,
+1439,4,36,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,49,0,1,
+286,1,3,1,4,
+1,3,1440,22,1,
+128,1,1872,1441,16,
+0,329,1,1873,921,
+1,118,1442,17,1443,
+15,1207,1,-1,1,
+5,1444,20,1445,4,
+38,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+49,0,52,0,1,
+299,1,3,1,4,
+1,3,1446,22,1,
+141,1,1123,1447,17,
+1448,15,1184,1,-1,
+1,5,1449,20,1450,
+4,38,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,49,0,50,0,
+1,252,1,3,1,
+6,1,5,1451,22,
+1,94,1,371,1452,
+17,1453,15,1454,4,
+46,37,0,70,0,
+117,0,110,0,99,
+0,116,0,105,0,
+111,0,110,0,67,
+0,97,0,108,0,
+108,0,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,1,-1,1,
-5,1458,20,1459,4,
-40,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
+5,1455,20,1456,4,
+48,70,0,117,0,
+110,0,99,0,116,
 0,105,0,111,0,
-110,0,95,0,49,
-0,1,265,1,3,
-1,2,1,1,1460,
-22,1,111,1,883,
-1461,17,1462,15,1185,
-1,-1,1,5,1463,
-20,1464,4,38,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,49,0,
-54,0,1,292,1,
-3,1,4,1,3,
-1465,22,1,138,1,
-1628,1466,17,1467,15,
-1468,4,22,37,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-1,-1,1,5,1469,
-20,1470,4,24,65,
+110,0,67,0,97,
+0,108,0,108,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,49,0,1,
+285,1,3,1,2,
+1,1,1457,22,1,
+127,1,1377,1458,17,
+1459,15,1184,1,-1,
+1,5,1460,20,1461,
+4,36,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
 0,115,0,115,0,
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,1,230,
+0,53,0,1,245,
 1,3,1,4,1,
-3,1471,22,1,76,
-1,2075,1472,17,1206,
-1,0,1210,1,373,
-1473,17,1474,15,1256,
-1,-1,1,5,1475,
-20,1476,4,60,73,
+3,1462,22,1,87,
+1,375,1463,17,1464,
+15,1278,1,-1,1,
+5,1465,20,1466,4,
+60,73,0,110,0,
+99,0,114,0,101,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+114,0,101,0,109,
+0,101,0,110,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,56,
+0,1,284,1,3,
+1,5,1,4,1467,
+22,1,126,1,377,
+1468,17,1469,15,1278,
+1,-1,1,5,1470,
+20,1471,4,60,73,
 0,110,0,99,0,
 114,0,101,0,109,
 0,101,0,110,0,
@@ -5418,147 +5476,112 @@ public yyLSLSyntax
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,54,0,1,
-273,1,3,1,3,
-1,2,1477,22,1,
-119,1,130,1478,17,
-1479,15,1185,1,-1,
-1,5,1480,20,1481,
-4,38,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,49,0,51,0,
-1,289,1,3,1,
-4,1,3,1482,22,
-1,135,1,143,1483,
-17,1484,15,1185,1,
--1,1,5,1485,20,
-1486,4,38,66,0,
+95,0,53,0,1,
+281,1,3,1,3,
+1,2,1472,22,1,
+123,1,379,1473,17,
+1474,15,1278,1,-1,
+1,5,1475,20,1476,
+4,60,73,0,110,
+0,99,0,114,0,
+101,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,114,0,101,0,
+109,0,101,0,110,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+55,0,1,283,1,
+3,1,5,1,4,
+1477,22,1,125,1,
+380,1478,17,1479,15,
+1480,4,38,37,0,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,1,-1,1,5,
+1481,20,1482,4,40,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,49,0,
+1,274,1,3,1,
+2,1,1,1483,22,
+1,116,1,883,1484,
+17,1485,15,1207,1,
+-1,1,5,1486,20,
+1487,4,38,66,0,
 105,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,49,0,50,
-0,1,288,1,3,
-1,4,1,3,1487,
-22,1,134,1,1901,
-1488,17,1206,1,0,
-1210,1,1152,1489,17,
-1490,15,1162,1,-1,
-1,5,1491,20,1492,
-4,38,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
+95,0,49,0,54,
+0,1,301,1,3,
+1,4,1,3,1488,
+22,1,143,1,1628,
+1489,17,1490,15,1491,
+4,22,37,0,65,
 0,115,0,115,0,
 105,0,103,0,110,
 0,109,0,101,0,
-110,0,116,0,95,
-0,50,0,52,0,
-1,255,1,3,1,
-6,1,5,1493,22,
-1,101,1,1406,1494,
-17,1495,15,1162,1,
--1,1,5,1496,20,
-1497,4,38,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,55,
-0,1,248,1,3,
-1,4,1,3,1498,
-22,1,94,1,1659,
-1499,16,0,270,1,
-2413,1500,17,1206,1,
-0,1210,1,1159,1501,
-17,1502,15,1162,1,
--1,1,5,1503,20,
-1504,4,38,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,49,
-0,1,242,1,3,
-1,6,1,5,1505,
-22,1,88,1,157,
-1506,17,1507,15,1185,
-1,-1,1,5,1508,
-20,1509,4,38,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,49,0,
-49,0,1,287,1,
+110,0,116,0,1,
+-1,1,5,1492,20,
+1493,4,24,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,1,239,1,
 3,1,4,1,3,
-1510,22,1,133,1,
-1413,1511,17,1512,15,
-1162,1,-1,1,5,
-1513,20,1514,4,36,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,52,
-0,1,235,1,3,
-1,4,1,3,1515,
-22,1,81,1,1370,
-1516,17,1517,15,1162,
-1,-1,1,5,1518,
-20,1519,4,38,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
+1494,22,1,81,1,
+2075,1495,17,1228,1,
+0,1232,1,373,1496,
+17,1497,15,1278,1,
+-1,1,5,1498,20,
+1499,4,60,73,0,
+110,0,99,0,114,
+0,101,0,109,0,
 101,0,110,0,116,
-0,95,0,49,0,
-56,0,1,249,1,
-3,1,4,1,3,
-1520,22,1,95,1,
-1478,1521,17,1522,15,
-1162,1,-1,1,5,
-1523,20,1524,4,38,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
+0,68,0,101,0,
+99,0,114,0,101,
+0,109,0,101,0,
+110,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
 0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,53,0,1,246,
-1,3,1,4,1,
-3,1525,22,1,92,
-1,1620,1526,17,1527,
-15,1468,1,-1,1,
-5,1528,20,1529,4,
-24,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,50,0,
-1,231,1,3,1,
-2,1,1,1530,22,
-1,77,1,1621,1531,
-16,0,726,1,1574,
-863,1,172,1532,17,
-1533,15,1185,1,-1,
-1,5,1534,20,1535,
+111,0,110,0,95,
+0,54,0,1,282,
+1,3,1,3,1,
+2,1500,22,1,124,
+1,130,1501,17,1502,
+15,1207,1,-1,1,
+5,1503,20,1504,4,
+38,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+49,0,51,0,1,
+298,1,3,1,4,
+1,3,1505,22,1,
+140,1,143,1506,17,
+1507,15,1207,1,-1,
+1,5,1508,20,1509,
 4,38,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
@@ -5566,27 +5589,14 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,49,0,48,0,
-1,286,1,3,1,
-4,1,3,1536,22,
-1,132,1,1931,925,
-1,1665,1537,17,1538,
-15,1220,1,-1,1,
-5,1539,20,1540,4,
-36,70,0,111,0,
-114,0,76,0,111,
-0,111,0,112,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,1,226,1,
-3,1,2,1,1,
-1541,22,1,72,1,
-2364,891,1,2105,878,
-1,1188,1542,17,1543,
-15,1162,1,-1,1,
-5,1544,20,1545,4,
+0,49,0,50,0,
+1,297,1,3,1,
+4,1,3,1510,22,
+1,139,1,1901,1511,
+17,1228,1,0,1232,
+1,1152,1512,17,1513,
+15,1184,1,-1,1,
+5,1514,20,1515,4,
 38,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
@@ -5594,12 +5604,12 @@ public yyLSLSyntax
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-50,0,51,0,1,
-254,1,3,1,6,
-1,5,1546,22,1,
-100,1,1442,1547,17,
-1548,15,1162,1,-1,
-1,5,1549,20,1550,
+50,0,52,0,1,
+264,1,3,1,6,
+1,5,1516,22,1,
+106,1,1406,1517,17,
+1518,15,1184,1,-1,
+1,5,1519,20,1520,
 4,38,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -5607,236 +5617,223 @@ public yyLSLSyntax
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,54,0,
-1,247,1,3,1,
-4,1,3,1551,22,
-1,93,1,1694,1552,
-16,0,199,1,942,
-1553,17,1554,15,1185,
-1,-1,1,5,1555,
-20,1556,4,38,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
+0,49,0,55,0,
+1,257,1,3,1,
+4,1,3,1521,22,
+1,99,1,1659,1522,
+16,0,283,1,2413,
+1523,17,1228,1,0,
+1232,1,1159,1524,17,
+1525,15,1184,1,-1,
+1,5,1526,20,1527,
+4,38,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
 0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,49,0,
-55,0,1,293,1,
-3,1,4,1,3,
-1557,22,1,139,1,
-2198,1558,17,1206,1,
-0,1210,1,1195,1559,
-17,1560,15,1162,1,
--1,1,5,1561,20,
-1562,4,38,83,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,49,0,49,0,
+1,251,1,3,1,
+6,1,5,1528,22,
+1,93,1,157,1529,
+17,1530,15,1207,1,
+-1,1,5,1531,20,
+1532,4,38,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,49,0,49,
+0,1,296,1,3,
+1,4,1,3,1533,
+22,1,138,1,1413,
+1534,17,1535,15,1184,
+1,-1,1,5,1536,
+20,1537,4,36,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
+101,0,110,0,116,
+0,95,0,52,0,
+1,244,1,3,1,
+4,1,3,1538,22,
+1,86,1,1370,1539,
+17,1540,15,1184,1,
+-1,1,5,1541,20,
+1542,4,38,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,49,0,48,
-0,1,241,1,3,
-1,6,1,5,1563,
-22,1,87,1,1449,
-1564,17,1565,15,1162,
-1,-1,1,5,1566,
-20,1567,4,36,83,
+95,0,49,0,56,
+0,1,258,1,3,
+1,4,1,3,1543,
+22,1,100,1,1478,
+1544,17,1545,15,1184,
+1,-1,1,5,1546,
+20,1547,4,38,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
 115,0,105,0,103,
 0,110,0,109,0,
 101,0,110,0,116,
-0,95,0,51,0,
-1,234,1,3,1,
-4,1,3,1568,22,
-1,80,1,1701,1569,
-17,1570,15,1220,1,
--1,1,5,1571,20,
-1572,4,36,70,0,
-111,0,114,0,76,
-0,111,0,111,0,
-112,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-95,0,51,0,1,
-228,1,3,1,4,
-1,3,1573,22,1,
-74,1,447,1574,17,
-1575,15,1576,4,30,
-37,0,86,0,101,
-0,99,0,116,0,
-111,0,114,0,67,
-0,111,0,110,0,
-115,0,116,0,97,
+0,95,0,49,0,
+53,0,1,255,1,
+3,1,4,1,3,
+1548,22,1,97,1,
+1620,1549,17,1550,15,
+1491,1,-1,1,5,
+1551,20,1552,4,24,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
 0,110,0,116,0,
-1,-1,1,5,1577,
-20,1578,4,32,86,
-0,101,0,99,0,
-116,0,111,0,114,
-0,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,95,0,49,
-0,1,263,1,3,
-1,8,1,7,1579,
-22,1,109,1,2458,
-940,1,2459,946,1,
-1958,1580,17,1206,1,
-0,1210,1,188,1581,
-17,1582,15,1185,1,
--1,1,5,1583,20,
-1584,4,36,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,57,0,1,
-285,1,3,1,4,
-1,3,1585,22,1,
-131,1,2462,953,1,
-1657,958,1,2464,963,
-1,2717,1586,16,0,
-192,1,205,1587,17,
-1588,15,1185,1,-1,
-1,5,1589,20,1590,
-4,36,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,56,0,1,284,
-1,3,1,4,1,
-3,1591,22,1,130,
-1,2724,1592,16,0,
-337,1,2227,972,1,
-1224,1593,17,1594,15,
-1162,1,-1,1,5,
-1595,20,1596,4,38,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,50,
-0,50,0,1,253,
-1,3,1,6,1,
-5,1597,22,1,99,
-1,223,1598,17,1599,
-15,1185,1,-1,1,
-5,1600,20,1601,4,
-36,66,0,105,0,
+95,0,50,0,1,
+240,1,3,1,2,
+1,1,1553,22,1,
+82,1,1621,1554,16,
+0,749,1,1574,885,
+1,172,1555,17,1556,
+15,1207,1,-1,1,
+5,1557,20,1558,4,
+38,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-55,0,1,283,1,
-3,1,4,1,3,
-1602,22,1,129,1,
-1730,1603,17,1604,15,
-1220,1,-1,1,5,
-1605,20,1606,4,36,
+49,0,48,0,1,
+295,1,3,1,4,
+1,3,1559,22,1,
+137,1,1931,946,1,
+1665,1560,17,1561,15,
+1242,1,-1,1,5,
+1562,20,1563,4,36,
 70,0,111,0,114,
 0,76,0,111,0,
 111,0,112,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,95,0,52,
-0,1,229,1,3,
-1,4,1,3,1607,
-22,1,75,1,476,
-1608,17,1609,15,1610,
-4,18,37,0,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-1,-1,1,5,1611,
-20,1612,4,20,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-95,0,52,0,1,
-261,1,3,1,2,
-1,1,1613,22,1,
-107,1,477,1614,17,
-1615,15,1610,1,-1,
-1,5,1616,20,1617,
-4,20,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,95,0,
-51,0,1,260,1,
-3,1,2,1,1,
-1618,22,1,106,1,
-1231,1619,17,1620,15,
-1162,1,-1,1,5,
-1621,20,1622,4,36,
+116,0,95,0,49,
+0,1,235,1,3,
+1,2,1,1,1564,
+22,1,77,1,2364,
+913,1,2105,900,1,
+1188,1565,17,1566,15,
+1184,1,-1,1,5,
+1567,20,1568,4,38,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
 0,115,0,105,0,
 103,0,110,0,109,
 0,101,0,110,0,
-116,0,95,0,57,
-0,1,240,1,3,
-1,6,1,5,1623,
-22,1,86,1,479,
-1624,17,1625,15,1610,
-1,-1,1,5,1626,
-20,1627,4,20,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-95,0,49,0,1,
-258,1,3,1,2,
-1,1,1628,22,1,
-104,1,480,1629,17,
-1630,15,1631,4,26,
-37,0,76,0,105,
-0,115,0,116,0,
-67,0,111,0,110,
-0,115,0,116,0,
-97,0,110,0,116,
-0,1,-1,1,5,
-1632,20,1633,4,28,
-76,0,105,0,115,
-0,116,0,67,0,
-111,0,110,0,115,
-0,116,0,97,0,
-110,0,116,0,95,
-0,49,0,1,262,
-1,3,1,4,1,
-3,1634,22,1,108,
-1,1485,1635,17,1636,
-15,1162,1,-1,1,
-5,1637,20,1638,4,
-36,83,0,105,0,
+116,0,95,0,50,
+0,51,0,1,263,
+1,3,1,6,1,
+5,1569,22,1,105,
+1,1442,1570,17,1571,
+15,1184,1,-1,1,
+5,1572,20,1573,4,
+38,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
 115,0,115,0,105,
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-50,0,1,233,1,
-3,1,4,1,3,
-1639,22,1,79,1,
-1737,1640,16,0,272,
-1,1989,980,1,1990,
-1641,17,1206,1,0,
-1210,1,242,1642,17,
-1643,15,1185,1,-1,
-1,5,1644,20,1645,
+49,0,54,0,1,
+256,1,3,1,4,
+1,3,1574,22,1,
+98,1,1694,1575,16,
+0,201,1,942,1576,
+17,1577,15,1207,1,
+-1,1,5,1578,20,
+1579,4,38,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,49,0,55,
+0,1,302,1,3,
+1,4,1,3,1580,
+22,1,144,1,2198,
+1581,17,1228,1,0,
+1232,1,1195,1582,17,
+1583,15,1184,1,-1,
+1,5,1584,20,1585,
+4,38,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,49,0,48,0,
+1,250,1,3,1,
+6,1,5,1586,22,
+1,92,1,1449,1587,
+17,1588,15,1184,1,
+-1,1,5,1589,20,
+1590,4,36,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+95,0,51,0,1,
+243,1,3,1,4,
+1,3,1591,22,1,
+85,1,1701,1592,17,
+1593,15,1242,1,-1,
+1,5,1594,20,1595,
+4,36,70,0,111,
+0,114,0,76,0,
+111,0,111,0,112,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,95,
+0,51,0,1,237,
+1,3,1,4,1,
+3,1596,22,1,79,
+1,447,1597,17,1598,
+15,1599,4,30,37,
+0,86,0,101,0,
+99,0,116,0,111,
+0,114,0,67,0,
+111,0,110,0,115,
+0,116,0,97,0,
+110,0,116,0,1,
+-1,1,5,1600,20,
+1601,4,32,86,0,
+101,0,99,0,116,
+0,111,0,114,0,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,95,0,49,0,
+1,272,1,3,1,
+8,1,7,1602,22,
+1,114,1,2458,961,
+1,2459,967,1,1958,
+1603,17,1228,1,0,
+1232,1,188,1604,17,
+1605,15,1207,1,-1,
+1,5,1606,20,1607,
 4,36,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
@@ -5844,35 +5841,168 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,54,0,1,282,
+0,57,0,1,294,
+1,3,1,4,1,
+3,1608,22,1,136,
+1,2462,974,1,1657,
+979,1,2464,984,1,
+205,1609,17,1610,15,
+1207,1,-1,1,5,
+1611,20,1612,4,36,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,56,
+0,1,293,1,3,
+1,4,1,3,1613,
+22,1,135,1,2227,
+993,1,1224,1614,17,
+1615,15,1184,1,-1,
+1,5,1616,20,1617,
+4,38,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,50,0,50,0,
+1,262,1,3,1,
+6,1,5,1618,22,
+1,104,1,223,1619,
+17,1620,15,1207,1,
+-1,1,5,1621,20,
+1622,4,36,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,55,0,1,
+292,1,3,1,4,
+1,3,1623,22,1,
+134,1,1730,1624,17,
+1625,15,1242,1,-1,
+1,5,1626,20,1627,
+4,36,70,0,111,
+0,114,0,76,0,
+111,0,111,0,112,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,95,
+0,52,0,1,238,
 1,3,1,4,1,
-3,1646,22,1,128,
-1,478,1647,17,1648,
-15,1610,1,-1,1,
-5,1649,20,1650,4,
+3,1628,22,1,80,
+1,476,1629,17,1630,
+15,1631,4,18,37,
+0,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,1,-1,1,
+5,1632,20,1633,4,
 20,67,0,111,0,
 110,0,115,0,116,
 0,97,0,110,0,
-116,0,95,0,50,
-0,1,259,1,3,
-1,2,1,1,1651,
-22,1,105,1,1001,
-1652,17,1653,15,1288,
-1,-1,1,5,1654,
-20,1655,4,40,84,
-0,121,0,112,0,
-101,0,99,0,97,
+116,0,95,0,52,
+0,1,270,1,3,
+1,2,1,1,1634,
+22,1,112,1,477,
+1635,17,1636,15,1631,
+1,-1,1,5,1637,
+20,1638,4,20,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+95,0,51,0,1,
+269,1,3,1,2,
+1,1,1639,22,1,
+111,1,1231,1640,17,
+1641,15,1184,1,-1,
+1,5,1642,20,1643,
+4,36,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,57,0,1,249,
+1,3,1,6,1,
+5,1644,22,1,91,
+1,479,1645,17,1646,
+15,1631,1,-1,1,
+5,1647,20,1648,4,
+20,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,95,0,49,
+0,1,267,1,3,
+1,2,1,1,1649,
+22,1,109,1,480,
+1650,17,1651,15,1652,
+4,26,37,0,76,
+0,105,0,115,0,
+116,0,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
+0,116,0,1,-1,
+1,5,1653,20,1654,
+4,28,76,0,105,
 0,115,0,116,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,95,0,49,0,
+1,271,1,3,1,
+4,1,3,1655,22,
+1,113,1,1485,1656,
+17,1657,15,1184,1,
+-1,1,5,1658,20,
+1659,4,36,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+95,0,50,0,1,
+242,1,3,1,4,
+1,3,1660,22,1,
+84,1,1737,1661,16,
+0,285,1,1989,1002,
+1,1990,1662,17,1228,
+1,0,1232,1,2746,
+1663,16,0,297,1,
+242,1664,17,1665,15,
+1207,1,-1,1,5,
+1666,20,1667,4,36,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,54,
+0,1,291,1,3,
+1,4,1,3,1668,
+22,1,133,1,478,
+1669,17,1670,15,1631,
+1,-1,1,5,1671,
+20,1672,4,20,67,
 0,111,0,110,0,
-95,0,56,0,1,
-307,1,3,1,5,
-1,4,1656,22,1,
-153,1,1002,1657,17,
-1658,15,1288,1,-1,
-1,5,1659,20,1660,
+115,0,116,0,97,
+0,110,0,116,0,
+95,0,50,0,1,
+268,1,3,1,2,
+1,1,1673,22,1,
+110,1,1001,1674,17,
+1675,15,1310,1,-1,
+1,5,1676,20,1677,
 4,40,84,0,121,
 0,112,0,101,0,
 99,0,97,0,115,
@@ -5881,120 +6011,209 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,1,300,1,
-3,1,5,1,4,
-1661,22,1,146,1,
-12,1662,19,160,1,
-12,1663,5,47,1,
-1901,1664,16,0,158,
-1,2075,1665,16,0,
-158,1,1860,885,1,
-1803,851,1,1804,1666,
-16,0,158,1,2520,
-1667,16,0,158,1,
-2413,1668,16,0,158,
-1,2198,1669,16,0,
-158,1,1657,958,1,
-1873,899,1,2529,1670,
-16,0,158,1,2534,
-1671,16,0,158,1,
-1990,1672,16,0,158,
-1,31,1673,16,0,
-158,1,32,1674,16,
-0,158,1,2105,878,
-1,2106,1675,16,0,
-158,1,2549,1676,16,
-0,158,1,2604,1677,
-16,0,288,1,2227,
-972,1,2337,1678,16,
-0,158,1,2021,782,
-1,2458,940,1,2459,
-946,1,2462,953,1,
-2136,906,1,2464,963,
-1,2029,789,1,2030,
-795,1,2031,800,1,
-2032,805,1,2469,1679,
-16,0,506,1,2035,
-816,1,2364,891,1,
-2039,826,1,1931,925,
-1,2041,832,1,2043,
-838,1,2045,843,1,
-2511,1680,16,0,158,
-1,1775,1681,16,0,
-158,1,1989,980,1,
-2033,810,1,2037,821,
-1,2713,1682,16,0,
-158,1,1574,863,1,
-1958,1683,16,0,158,
-1,13,1684,19,496,
-1,13,1685,5,46,
-1,2536,1686,17,1687,
-15,1688,4,36,37,
-0,86,0,111,0,
-105,0,100,0,65,
-0,114,0,103,0,
-83,0,116,0,97,
-0,116,0,101,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,-1,1,5,1689,
-20,1690,4,38,86,
-0,111,0,105,0,
-100,0,65,0,114,
-0,103,0,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-49,0,1,181,1,
+56,0,1,316,1,
 3,1,5,1,4,
-1691,22,1,26,1,
-2513,1692,17,1693,15,
-1694,4,40,37,0,
-86,0,101,0,99,
-0,116,0,111,0,
-114,0,65,0,114,
-0,103,0,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,1,-1,
-1,5,1695,20,1696,
-4,42,86,0,101,
-0,99,0,116,0,
-111,0,114,0,65,
-0,114,0,103,0,
+1678,22,1,158,1,
+1002,1679,17,1680,15,
+1310,1,-1,1,5,
+1681,20,1682,4,40,
+84,0,121,0,112,
+0,101,0,99,0,
+97,0,115,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,49,0,
+1,309,1,3,1,
+5,1,4,1683,22,
+1,151,1,12,1684,
+19,167,1,12,1685,
+5,48,1,1901,1686,
+16,0,165,1,2033,
+832,1,2622,1687,16,
+0,626,1,1860,907,
+1,1803,873,1,1804,
+1688,16,0,165,1,
+2735,1689,16,0,165,
+1,2518,1690,16,0,
+165,1,2413,1691,16,
+0,165,1,2198,1692,
+16,0,165,1,2527,
+1693,16,0,165,1,
+1657,979,1,1989,1002,
+1,2535,1694,16,0,
+165,1,31,1695,16,
+0,165,1,32,1696,
+16,0,165,1,2105,
+900,1,2106,1697,16,
+0,165,1,2544,1698,
+16,0,165,1,2549,
+1699,16,0,165,1,
+2227,993,1,2337,1700,
+16,0,165,1,2564,
+1701,16,0,165,1,
+2021,804,1,2458,961,
+1,2459,967,1,2462,
+974,1,2136,928,1,
+2464,984,1,2029,811,
+1,2030,817,1,2031,
+822,1,2032,827,1,
+2469,1702,16,0,509,
+1,2035,838,1,2364,
+913,1,2039,848,1,
+1931,946,1,2041,854,
+1,1873,921,1,2043,
+860,1,2045,865,1,
+1775,1703,16,0,165,
+1,1990,1704,16,0,
+165,1,2075,1705,16,
+0,165,1,2037,843,
+1,1574,885,1,1958,
+1706,16,0,165,1,
+13,1707,19,492,1,
+13,1708,5,49,1,
+2616,1709,17,1710,15,
+1711,4,20,37,0,
 83,0,116,0,97,
 0,116,0,101,0,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,49,0,1,
-184,1,3,1,6,
-1,5,1697,22,1,
-29,1,1860,885,1,
-2522,1698,17,1699,15,
-1700,4,34,37,0,
+66,0,111,0,100,
+0,121,0,1,-1,
+1,5,1712,20,1713,
+4,24,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,49,0,49,
+0,1,184,1,3,
+1,2,1,1,1714,
+22,1,25,1,2617,
+1715,17,1716,15,1711,
+1,-1,1,5,1717,
+20,1718,4,22,83,
+0,116,0,97,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,95,0,57,
+0,1,182,1,3,
+1,2,1,1,1719,
+22,1,23,1,2618,
+1720,17,1721,15,1711,
+1,-1,1,5,1722,
+20,1723,4,22,83,
+0,116,0,97,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,95,0,55,
+0,1,180,1,3,
+1,2,1,1,1724,
+22,1,21,1,2619,
+1725,17,1726,15,1711,
+1,-1,1,5,1727,
+20,1728,4,22,83,
+0,116,0,97,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,95,0,53,
+0,1,178,1,3,
+1,2,1,1,1729,
+22,1,19,1,2620,
+1730,17,1731,15,1711,
+1,-1,1,5,1732,
+20,1733,4,22,83,
+0,116,0,97,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,95,0,51,
+0,1,176,1,3,
+1,2,1,1,1734,
+22,1,17,1,2621,
+1735,17,1736,15,1711,
+1,-1,1,5,1737,
+20,1738,4,22,83,
+0,116,0,97,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,95,0,49,
+0,1,174,1,3,
+1,2,1,1,1739,
+22,1,15,1,1860,
+907,1,1803,873,1,
+2520,1740,17,1741,15,
+1742,4,46,37,0,
 73,0,110,0,116,
+0,82,0,111,0,
+116,0,82,0,111,
+0,116,0,65,0,
+114,0,103,0,83,
+0,116,0,97,0,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+-1,1,5,1743,20,
+1744,4,48,73,0,
+110,0,116,0,82,
+0,111,0,116,0,
+82,0,111,0,116,
 0,65,0,114,0,
 103,0,83,0,116,
 0,97,0,116,0,
 101,0,69,0,118,
 0,101,0,110,0,
-116,0,1,-1,1,
-5,1701,20,1702,4,
-36,73,0,110,0,
-116,0,65,0,114,
-0,103,0,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-49,0,1,183,1,
-3,1,6,1,5,
-1703,22,1,28,1,
-1873,899,1,1657,958,
-1,2531,1704,17,1705,
-15,1706,4,34,37,
+116,0,95,0,49,
+0,1,191,1,3,
+1,6,1,5,1745,
+22,1,32,1,2413,
+1746,16,0,490,1,
+1657,979,1,1873,921,
+1,2529,1747,17,1748,
+15,1749,4,40,37,
+0,86,0,101,0,
+99,0,116,0,111,
+0,114,0,65,0,
+114,0,103,0,83,
+0,116,0,97,0,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+-1,1,5,1750,20,
+1751,4,42,86,0,
+101,0,99,0,116,
+0,111,0,114,0,
+65,0,114,0,103,
+0,83,0,116,0,
+97,0,116,0,101,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,49,0,
+1,190,1,3,1,
+6,1,5,1752,22,
+1,31,1,2664,1753,
+16,0,707,1,1989,
+1002,1,2537,1754,17,
+1755,15,1756,4,34,
+37,0,73,0,110,
+0,116,0,65,0,
+114,0,103,0,83,
+0,116,0,97,0,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+-1,1,5,1757,20,
+1758,4,36,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+189,1,3,1,6,
+1,5,1759,22,1,
+30,1,32,1760,16,
+0,502,1,2105,900,
+1,2546,1761,17,1762,
+15,1763,4,34,37,
 0,75,0,101,0,
 121,0,65,0,114,
 0,103,0,83,0,
@@ -6002,7 +6221,7 @@ public yyLSLSyntax
 0,101,0,69,0,
 118,0,101,0,110,
 0,116,0,1,-1,
-1,5,1707,20,1708,
+1,5,1764,20,1765,
 4,36,75,0,101,
 0,121,0,65,0,
 114,0,103,0,83,
@@ -6010,154 +6229,145 @@ public yyLSLSyntax
 116,0,101,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,49,0,1,182,
+0,49,0,1,188,
 1,3,1,6,1,
-5,1709,22,1,27,
-1,1989,980,1,2645,
-1710,16,0,733,1,
-2037,821,1,32,1711,
-16,0,501,1,2105,
-878,1,2464,963,1,
-2551,1712,17,1713,15,
-1714,4,22,37,0,
-83,0,116,0,97,
-0,116,0,101,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,-1,1,5,1715,
-20,1716,4,24,83,
+5,1766,22,1,29,
+1,2364,913,1,2551,
+1767,17,1768,15,1769,
+4,36,37,0,86,
+0,111,0,105,0,
+100,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,1,-1,
+1,5,1770,20,1771,
+4,38,86,0,111,
+0,105,0,100,0,
+65,0,114,0,103,
+0,83,0,116,0,
+97,0,116,0,101,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,49,0,
+1,187,1,3,1,
+5,1,4,1772,22,
+1,28,1,2227,993,
+1,1574,885,1,2566,
+1773,17,1774,15,1775,
+4,22,37,0,83,
 0,116,0,97,0,
 116,0,101,0,69,
 0,118,0,101,0,
-110,0,116,0,95,
-0,49,0,1,180,
-1,3,1,6,1,
-5,1717,22,1,25,
-1,2553,1718,16,0,
-721,1,2227,972,1,
-1574,863,1,1803,851,
-1,2458,940,1,2459,
-946,1,2462,953,1,
-2136,906,1,2599,1719,
-17,1720,15,1721,4,
-20,37,0,83,0,
+110,0,116,0,1,
+-1,1,5,1776,20,
+1777,4,24,83,0,
 116,0,97,0,116,
-0,101,0,66,0,
-111,0,100,0,121,
-0,1,-1,1,5,
-1722,20,1723,4,22,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+49,0,1,186,1,
+3,1,6,1,5,
+1778,22,1,27,1,
+2458,961,1,2459,967,
+1,2462,974,1,2136,
+928,1,2464,984,1,
+2029,811,1,2030,817,
+1,2031,822,1,2032,
+827,1,2033,832,1,
+2035,838,1,2037,843,
+1,2039,848,1,1931,
+946,1,2041,854,1,
+2021,804,1,2043,860,
+1,2045,865,1,2568,
+1779,16,0,686,1,
+2609,1780,17,1781,15,
+1711,1,-1,1,5,
+1782,20,1783,4,24,
 83,0,116,0,97,
 0,116,0,101,0,
 66,0,111,0,100,
 0,121,0,95,0,
-57,0,1,178,1,
-3,1,2,1,1,
-1724,22,1,23,1,
-2029,789,1,2030,795,
-1,2031,800,1,2032,
-805,1,2033,810,1,
-2035,816,1,2364,891,
-1,2039,826,1,1931,
-925,1,2041,832,1,
-2021,782,1,2043,838,
-1,2045,843,1,2593,
-1725,17,1726,15,1721,
-1,-1,1,5,1727,
-20,1728,4,24,83,
+49,0,50,0,1,
+185,1,3,1,3,
+1,2,1784,22,1,
+26,1,2610,1785,17,
+1786,15,1711,1,-1,
+1,5,1787,20,1788,
+4,24,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,49,0,48,
+0,1,183,1,3,
+1,3,1,2,1789,
+22,1,24,1,2611,
+1790,17,1791,15,1711,
+1,-1,1,5,1792,
+20,1793,4,22,83,
 0,116,0,97,0,
 116,0,101,0,66,
 0,111,0,100,0,
-121,0,95,0,49,
-0,48,0,1,179,
-1,3,1,3,1,
-2,1729,22,1,24,
-1,2594,1730,17,1731,
-15,1721,1,-1,1,
-5,1732,20,1733,4,
-22,83,0,116,0,
-97,0,116,0,101,
-0,66,0,111,0,
-100,0,121,0,95,
-0,56,0,1,177,
-1,3,1,3,1,
-2,1734,22,1,22,
-1,2595,1735,17,1736,
-15,1721,1,-1,1,
-5,1737,20,1738,4,
-22,83,0,116,0,
-97,0,116,0,101,
-0,66,0,111,0,
-100,0,121,0,95,
-0,54,0,1,175,
-1,3,1,3,1,
-2,1739,22,1,20,
-1,2596,1740,17,1741,
-15,1721,1,-1,1,
-5,1742,20,1743,4,
-22,83,0,116,0,
-97,0,116,0,101,
-0,66,0,111,0,
-100,0,121,0,95,
-0,52,0,1,173,
-1,3,1,3,1,
-2,1744,22,1,18,
-1,2597,1745,17,1746,
-15,1721,1,-1,1,
-5,1747,20,1748,4,
-22,83,0,116,0,
-97,0,116,0,101,
-0,66,0,111,0,
-100,0,121,0,95,
-0,50,0,1,171,
+121,0,95,0,56,
+0,1,181,1,3,
+1,3,1,2,1794,
+22,1,22,1,2612,
+1795,17,1796,15,1711,
+1,-1,1,5,1797,
+20,1798,4,22,83,
+0,116,0,97,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,95,0,54,
+0,1,179,1,3,
+1,3,1,2,1799,
+22,1,20,1,2613,
+1800,17,1801,15,1711,
+1,-1,1,5,1802,
+20,1803,4,22,83,
+0,116,0,97,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,95,0,52,
+0,1,177,1,3,
+1,3,1,2,1804,
+22,1,18,1,2614,
+1805,17,1806,15,1711,
+1,-1,1,5,1807,
+20,1808,4,22,83,
+0,116,0,97,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,95,0,50,
+0,1,175,1,3,
+1,3,1,2,1809,
+22,1,16,1,14,
+1810,19,154,1,14,
+1811,5,109,1,2512,
+1812,17,1813,15,1814,
+4,30,37,0,82,
+0,111,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,1,-1,1,
+5,1815,20,1816,4,
+32,82,0,111,0,
+116,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,95,
+0,49,0,1,202,
 1,3,1,3,1,
-2,1749,22,1,16,
-1,2413,1750,16,0,
-494,1,2600,1751,17,
-1752,15,1721,1,-1,
-1,5,1753,20,1754,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-95,0,55,0,1,
-176,1,3,1,2,
-1,1,1755,22,1,
-21,1,2601,1756,17,
-1757,15,1721,1,-1,
-1,5,1758,20,1759,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-95,0,53,0,1,
-174,1,3,1,2,
-1,1,1760,22,1,
-19,1,2602,1761,17,
-1762,15,1721,1,-1,
-1,5,1763,20,1764,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-95,0,51,0,1,
-172,1,3,1,2,
-1,1,1765,22,1,
-17,1,2603,1766,17,
-1767,15,1721,1,-1,
-1,5,1768,20,1769,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-95,0,49,0,1,
-170,1,3,1,2,
-1,1,1770,22,1,
-15,1,14,1771,19,
-144,1,14,1772,5,
-105,1,1260,1160,1,
-1011,1166,1,1514,1172,
-1,9,1177,1,10,
-1773,17,1774,15,1775,
+2,1817,22,1,44,
+1,2513,1818,16,0,
+457,1,1260,1182,1,
+1011,1188,1,1514,1194,
+1,9,1199,1,10,
+1819,17,1820,15,1821,
 4,48,37,0,65,
 0,114,0,103,0,
 117,0,109,0,101,
@@ -6168,47 +6378,43 @@ public yyLSLSyntax
 0,105,0,111,0,
 110,0,76,0,105,
 0,115,0,116,0,
-1,-1,1,5,140,
-1,0,1,0,1776,
-22,1,30,1,262,
-1183,1,1267,1189,1,
-1521,1194,1,1773,1777,
-16,0,148,1,19,
-1211,1,20,1778,16,
-0,142,1,2281,1218,
-1,525,1280,1,2538,
-1779,17,1780,15,1775,
-1,-1,1,5,140,
-1,0,1,0,1776,
-1,30,1781,17,1782,
-15,1775,1,-1,1,
-5,1783,20,1784,4,
-50,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,76,
-0,105,0,115,0,
-116,0,95,0,50,
-0,1,186,1,3,
-1,4,1,3,1785,
-22,1,32,1,283,
-1236,1,2547,1786,16,
-0,142,1,40,1241,
-1,41,1787,17,1788,
-15,1789,4,26,37,
+1,-1,1,5,150,
+1,0,1,0,1822,
+22,1,33,1,262,
+1205,1,1267,1211,1,
+1521,1216,1,1773,1823,
+16,0,158,1,19,
+1233,1,20,1824,16,
+0,152,1,2281,1240,
+1,525,1302,1,30,
+1825,17,1826,15,1821,
+1,-1,1,5,1827,
+20,1828,4,50,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
+95,0,50,0,1,
+193,1,3,1,4,
+1,3,1829,22,1,
+35,1,1002,1679,1,
+283,1258,1,40,1263,
+1,41,1830,17,1831,
+15,1832,4,26,37,
 0,65,0,114,0,
 103,0,117,0,109,
 0,101,0,110,0,
 116,0,76,0,105,
 0,115,0,116,0,
-1,-1,1,5,660,
-1,0,1,0,1790,
-22,1,156,1,42,
-1791,17,1792,15,1793,
+1,-1,1,5,676,
+1,0,1,0,1833,
+22,1,161,1,42,
+1834,17,1835,15,1836,
 4,38,37,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
@@ -6217,8 +6423,8 @@ public yyLSLSyntax
 0,114,0,103,0,
 117,0,109,0,101,
 0,110,0,116,0,
-1,-1,1,5,1794,
-20,1795,4,40,69,
+1,-1,1,5,1837,
+20,1838,4,40,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
@@ -6227,682 +6433,756 @@ public yyLSLSyntax
 117,0,109,0,101,
 0,110,0,116,0,
 95,0,49,0,1,
-312,1,3,1,2,
-1,1,1796,22,1,
-159,1,44,1247,1,
-47,1248,1,48,1254,
-1,49,1260,1,50,
-1265,1,51,1270,1,
-305,1275,1,63,1286,
-1,66,1292,1,67,
-1297,1,1478,1521,1,
-69,1307,1,70,1312,
-1,68,1302,1,74,
-1317,1,1013,1322,1,
-2335,1797,16,0,148,
-1,1332,1327,1,1048,
-1408,1,82,1344,1,
-1296,1231,1,1341,1361,
-1,328,1366,1,1303,
-1371,1,1096,1376,1,
-93,1382,1,1550,1387,
-1,352,1413,1,107,
-1402,1,1114,1407,1,
-1370,1516,1,118,1419,
-1,1123,1424,1,371,
-1429,1,1377,1435,1,
-375,1440,1,377,1445,
-1,379,1450,1,380,
-1455,1,883,1461,1,
-373,1473,1,130,1478,
-1,143,1483,1,1152,
-1489,1,387,1798,16,
-0,610,1,1406,1494,
-1,1159,1501,1,157,
-1506,1,1413,1511,1,
-1665,1537,1,412,1799,
-16,0,624,1,1094,
-1800,16,0,662,1,
-172,1532,1,827,1395,
-1,1188,1542,1,437,
-1801,16,0,706,1,
-1442,1547,1,1694,1802,
-16,0,148,1,942,
-1553,1,1195,1559,1,
-2702,1803,17,1804,15,
-1775,1,-1,1,5,
-140,1,0,1,0,
-1776,1,1449,1564,1,
-1701,1569,1,447,1574,
-1,2711,1805,16,0,
-142,1,188,1581,1,
-205,1587,1,2467,1806,
-17,1807,15,1775,1,
--1,1,5,1808,20,
-1809,4,50,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,95,
-0,49,0,1,185,
-1,3,1,2,1,
-1,1810,22,1,31,
-1,461,1811,16,0,
-662,1,464,1812,17,
-1813,15,1789,1,-1,
-1,5,1814,20,1815,
-4,28,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,76,0,
-105,0,115,0,116,
-0,95,0,50,0,
-1,311,1,3,1,
-4,1,3,1816,22,
-1,158,1,1224,1593,
-1,223,1598,1,1730,
-1603,1,476,1608,1,
-477,1614,1,1231,1619,
-1,479,1624,1,480,
-1629,1,1485,1635,1,
-459,1817,17,1818,15,
-1789,1,-1,1,5,
-660,1,0,1,0,
-1790,1,242,1642,1,
-478,1647,1,481,1819,
-17,1820,15,1789,1,
--1,1,5,1821,20,
-1822,4,28,65,0,
+321,1,3,1,2,
+1,1,1839,22,1,
+164,1,2553,1840,17,
+1841,15,1821,1,-1,
+1,5,150,1,0,
+1,0,1822,1,44,
+1269,1,47,1270,1,
+48,1276,1,49,1282,
+1,50,1287,1,51,
+1292,1,2562,1842,16,
+0,152,1,305,1297,
+1,2733,1843,16,0,
+152,1,63,1308,1,
+66,1315,1,67,1320,
+1,1478,1544,1,69,
+1330,1,70,1335,1,
+68,1325,1,74,1340,
+1,1013,1345,1,2335,
+1844,16,0,158,1,
+1332,1350,1,1048,1431,
+1,82,1367,1,1296,
+1253,1,1341,1384,1,
+328,1389,1,1303,1394,
+1,1096,1399,1,93,
+1405,1,1550,1410,1,
+352,1436,1,107,1425,
+1,1114,1430,1,1370,
+1539,1,118,1442,1,
+1123,1447,1,371,1452,
+1,1377,1458,1,375,
+1463,1,377,1468,1,
+379,1473,1,380,1478,
+1,883,1484,1,373,
+1496,1,130,1501,1,
+143,1506,1,1152,1512,
+1,387,1845,16,0,
+639,1,1406,1517,1,
+1159,1524,1,157,1529,
+1,1413,1534,1,1665,
+1560,1,412,1846,16,
+0,652,1,1094,1847,
+16,0,678,1,172,
+1555,1,827,1418,1,
+1188,1565,1,437,1848,
+16,0,727,1,1442,
+1570,1,1694,1849,16,
+0,158,1,942,1576,
+1,1195,1582,1,1449,
+1587,1,1701,1592,1,
+447,1597,1,188,1604,
+1,205,1609,1,2467,
+1850,17,1851,15,1821,
+1,-1,1,5,1852,
+20,1853,4,50,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
+95,0,49,0,1,
+192,1,3,1,2,
+1,1,1854,22,1,
+34,1,461,1855,16,
+0,678,1,464,1856,
+17,1857,15,1832,1,
+-1,1,5,1858,20,
+1859,4,28,65,0,
 114,0,103,0,117,
 0,109,0,101,0,
 110,0,116,0,76,
 0,105,0,115,0,
-116,0,95,0,49,
-0,1,310,1,3,
-1,2,1,1,1823,
-22,1,157,1,1001,
-1652,1,1002,1657,1,
-15,1824,19,312,1,
-15,1825,5,6,1,
-2717,1826,16,0,696,
-1,1114,1827,16,0,
-310,1,1621,1828,16,
-0,705,1,40,1829,
-16,0,606,1,19,
-1211,1,9,1177,1,
-16,1830,19,136,1,
-16,1831,5,143,1,
-2514,1832,16,0,330,
-1,256,1833,16,0,
-190,1,1261,1834,16,
-0,190,1,509,1835,
-16,0,190,1,9,
-1836,16,0,134,1,
-2523,1837,16,0,479,
-1,1775,1838,16,0,
-190,1,2029,789,1,
-2532,1839,16,0,599,
-1,2031,800,1,2032,
-805,1,2033,810,1,
-277,1840,16,0,190,
-1,2537,1841,16,0,
-497,1,2037,821,1,
-2039,826,1,32,1842,
-16,0,190,1,2041,
-832,1,2293,1843,16,
-0,190,1,2043,838,
-1,2045,843,1,40,
-1844,16,0,169,1,
-41,1845,16,0,190,
-1,1297,1846,16,0,
-190,1,43,1847,16,
-0,190,1,44,1848,
-16,0,169,1,1803,
-851,1,1804,1849,16,
-0,190,1,299,1850,
-16,0,190,1,2480,
-1851,17,1852,15,1853,
-4,24,37,0,73,
+116,0,95,0,50,
+0,1,320,1,3,
+1,4,1,3,1860,
+22,1,163,1,2724,
+1861,17,1862,15,1821,
+1,-1,1,5,150,
+1,0,1,0,1822,
+1,1224,1614,1,223,
+1619,1,1730,1624,1,
+476,1629,1,477,1635,
+1,1231,1640,1,479,
+1645,1,480,1650,1,
+1485,1656,1,459,1863,
+17,1864,15,1832,1,
+-1,1,5,676,1,
+0,1,0,1833,1,
+242,1664,1,478,1669,
+1,481,1865,17,1866,
+15,1832,1,-1,1,
+5,1867,20,1868,4,
+28,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,76,0,105,
+0,115,0,116,0,
+95,0,49,0,1,
+319,1,3,1,2,
+1,1,1869,22,1,
+162,1,1001,1674,1,
+2508,1870,17,1871,15,
+1872,4,30,37,0,
+73,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,1,-1,
+1,5,1873,20,1874,
+4,32,73,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+95,0,49,0,1,
+200,1,3,1,3,
+1,2,1875,22,1,
+42,1,2509,1876,16,
+0,451,1,15,1877,
+19,314,1,15,1878,
+5,6,1,2739,1879,
+16,0,732,1,1114,
+1880,16,0,312,1,
+1621,1881,16,0,726,
+1,40,1882,16,0,
+632,1,19,1233,1,
+9,1199,1,16,1883,
+19,136,1,16,1884,
+5,144,1,256,1885,
+16,0,198,1,1261,
+1886,16,0,198,1,
+509,1887,16,0,198,
+1,9,1888,16,0,
+134,1,2521,1889,16,
+0,466,1,2021,804,
+1,1775,1890,16,0,
+198,1,2530,1891,16,
+0,483,1,2029,811,
+1,2030,817,1,2031,
+822,1,2032,827,1,
+2033,832,1,277,1892,
+16,0,198,1,2035,
+838,1,2538,1893,16,
+0,496,1,2037,843,
+1,2039,848,1,32,
+1894,16,0,198,1,
+2041,854,1,2293,1895,
+16,0,198,1,2043,
+860,1,2547,1896,16,
+0,508,1,40,1897,
+16,0,177,1,41,
+1898,16,0,198,1,
+1297,1899,16,0,198,
+1,43,1900,16,0,
+198,1,44,1901,16,
+0,177,1,1803,873,
+1,1804,1902,16,0,
+198,1,299,1903,16,
+0,198,1,2480,1904,
+17,1905,15,1906,4,
+24,37,0,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,-1,1,5,1907,
+20,1908,4,26,73,
 0,110,0,116,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,1,-1,1,5,
-1854,20,1855,4,26,
-73,0,110,0,116,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,95,0,52,
-0,1,344,1,3,
-1,2,1,1,1856,
-22,1,191,1,52,
-1857,16,0,190,1,
-2484,1858,17,1859,15,
-1860,4,24,37,0,
-75,0,101,0,121,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,1861,20,1862,4,
-26,75,0,101,0,
-121,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-50,0,1,340,1,
-3,1,2,1,1,
-1863,22,1,187,1,
-1515,1864,16,0,190,
-1,2318,1865,16,0,
-190,1,2491,1866,17,
-1867,15,1868,4,26,
-37,0,86,0,111,
-0,105,0,100,0,
+0,95,0,53,0,
+1,353,1,3,1,
+2,1,1,1909,22,
+1,196,1,52,1910,
+16,0,198,1,2484,
+1911,17,1912,15,1906,
+1,-1,1,5,1913,
+20,1914,4,26,73,
+0,110,0,116,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,1,-1,1,5,
-1869,20,1870,4,28,
+0,95,0,49,0,
+1,349,1,3,1,
+2,1,1,1915,22,
+1,192,1,1515,1916,
+16,0,198,1,2318,
+1917,16,0,198,1,
+2491,1918,17,1919,15,
+1920,4,26,37,0,
 86,0,111,0,105,
 0,100,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
-110,0,116,0,95,
-0,51,0,1,333,
-1,3,1,2,1,
-1,1871,22,1,180,
-1,62,1872,16,0,
-209,1,63,1873,16,
-0,169,1,2495,1874,
-17,1875,15,1876,4,
-12,37,0,69,0,
-118,0,101,0,110,
-0,116,0,1,-1,
-1,5,1877,20,1878,
-4,16,69,0,118,
-0,101,0,110,0,
-116,0,95,0,49,
-0,48,0,1,329,
-1,3,1,2,1,
-1,1879,22,1,176,
-1,2075,1880,16,0,
-190,1,1574,863,1,
-1479,1881,16,0,190,
-1,71,1882,16,0,
-190,1,1658,1883,16,
-0,730,1,1833,1884,
-16,0,296,1,1834,
-1885,16,0,190,1,
-2337,1886,16,0,190,
-1,79,1887,16,0,
-190,1,1335,1888,16,
-0,190,1,322,1889,
-16,0,190,1,76,
-1890,16,0,190,1,
-85,1891,16,0,190,
-1,2030,795,1,89,
-1892,16,0,190,1,
-2035,816,1,346,1893,
-16,0,190,1,97,
-1894,16,0,190,1,
-2106,1895,16,0,190,
-1,102,1896,16,0,
-190,1,1860,885,1,
-2458,940,1,2364,891,
-1,1990,1897,16,0,
-190,1,112,1898,16,
-0,190,1,1117,1899,
-16,0,190,1,1873,
-899,1,1875,1900,16,
-0,417,1,1876,1901,
-16,0,190,1,124,
-1902,16,0,190,1,
-2478,1903,17,1904,15,
-1853,1,-1,1,5,
-1905,20,1906,4,26,
-73,0,110,0,116,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,95,0,54,
-0,1,346,1,3,
-1,2,1,1,1907,
-22,1,193,1,2136,
-906,1,2718,1908,16,
-0,190,1,381,1909,
-16,0,190,1,525,
-1910,16,0,190,1,
-137,1911,16,0,190,
-1,2021,782,1,1901,
-1912,16,0,190,1,
-1153,1913,16,0,190,
-1,151,1914,16,0,
-190,1,1407,1915,16,
-0,190,1,1659,1916,
-16,0,190,1,2413,
-1917,16,0,190,1,
-406,1918,16,0,190,
-1,1371,1919,16,0,
-190,1,2105,878,1,
-166,1920,16,0,190,
-1,1622,1921,16,0,
-190,1,1931,925,1,
-1932,1922,16,0,509,
-1,1933,1923,16,0,
-190,1,431,1924,16,
-0,190,1,1585,1925,
-16,0,190,1,182,
-1926,16,0,190,1,
-1189,1927,16,0,190,
-1,1443,1928,16,0,
-190,1,1695,1929,16,
-0,190,1,2198,1930,
-16,0,190,1,2701,
-1931,16,0,675,1,
-447,1932,16,0,190,
-1,199,1933,16,0,
-190,1,2459,946,1,
-1958,1934,16,0,190,
-1,2462,953,1,1657,
-958,1,2464,963,1,
-459,1935,16,0,190,
-1,462,1936,16,0,
-190,1,2471,1937,17,
-1938,15,1939,4,30,
-37,0,86,0,101,
-0,99,0,116,0,
-111,0,114,0,65,
-0,114,0,103,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,-1,1,5,1940,
-20,1941,4,32,86,
-0,101,0,99,0,
-116,0,111,0,114,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,95,0,51,
-0,1,353,1,3,
-1,2,1,1,1942,
-22,1,200,1,2472,
-1943,17,1944,15,1939,
-1,-1,1,5,1945,
-20,1946,4,32,86,
-0,101,0,99,0,
-116,0,111,0,114,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,95,0,50,
-0,1,352,1,3,
-1,2,1,1,1947,
-22,1,199,1,2473,
-1948,17,1949,15,1939,
-1,-1,1,5,1950,
-20,1951,4,32,86,
-0,101,0,99,0,
-116,0,111,0,114,
+110,0,116,0,1,
+-1,1,5,1921,20,
+1922,4,28,86,0,
+111,0,105,0,100,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,49,
-0,1,351,1,3,
-1,2,1,1,1952,
-22,1,198,1,2474,
-1953,17,1954,15,1853,
-1,-1,1,5,1955,
-20,1956,4,28,73,
-0,110,0,116,0,
-65,0,114,0,103,
+116,0,95,0,52,
+0,1,342,1,3,
+1,2,1,1,1923,
+22,1,185,1,62,
+1924,16,0,213,1,
+63,1925,16,0,177,
+1,2495,1926,17,1927,
+15,1928,4,12,37,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,49,0,
-48,0,1,350,1,
-3,1,2,1,1,
-1957,22,1,197,1,
-2475,1958,17,1959,15,
-1853,1,-1,1,5,
-1960,20,1961,4,26,
-73,0,110,0,116,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,95,0,57,
-0,1,349,1,3,
-1,2,1,1,1962,
-22,1,196,1,2476,
-1963,17,1964,15,1853,
-1,-1,1,5,1965,
-20,1966,4,26,73,
+0,1,-1,1,5,
+1929,20,1930,4,16,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,49,0,48,
+0,1,338,1,3,
+1,2,1,1,1931,
+22,1,181,1,2740,
+1932,16,0,198,1,
+2075,1933,16,0,198,
+1,1574,885,1,1479,
+1934,16,0,198,1,
+71,1935,16,0,198,
+1,1658,1936,16,0,
+753,1,1833,1937,16,
+0,304,1,1834,1938,
+16,0,198,1,2337,
+1939,16,0,198,1,
+79,1940,16,0,198,
+1,1335,1941,16,0,
+198,1,322,1942,16,
+0,198,1,76,1943,
+16,0,198,1,85,
+1944,16,0,198,1,
+89,1945,16,0,198,
+1,346,1946,16,0,
+198,1,97,1947,16,
+0,198,1,2106,1948,
+16,0,198,1,102,
+1949,16,0,198,1,
+1860,907,1,2458,961,
+1,2364,913,1,1990,
+1950,16,0,198,1,
+112,1951,16,0,198,
+1,1117,1952,16,0,
+198,1,1873,921,1,
+1875,1953,16,0,412,
+1,1876,1954,16,0,
+198,1,2552,1955,16,
+0,513,1,124,1956,
+16,0,198,1,2478,
+1957,17,1958,15,1906,
+1,-1,1,5,1959,
+20,1960,4,26,73,
 0,110,0,116,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,56,0,
-1,348,1,3,1,
-2,1,1,1967,22,
-1,195,1,2477,1968,
-17,1969,15,1853,1,
--1,1,5,1970,20,
-1971,4,26,73,0,
-110,0,116,0,65,
-0,114,0,103,0,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,55,0,1,
-347,1,3,1,2,
-1,1,1972,22,1,
-194,1,2227,972,1,
-2479,1973,17,1974,15,
-1853,1,-1,1,5,
-1975,20,1976,4,26,
+0,95,0,55,0,
+1,355,1,3,1,
+2,1,1,1961,22,
+1,198,1,2136,928,
+1,381,1962,16,0,
+198,1,525,1963,16,
+0,198,1,2723,1964,
+16,0,715,1,137,
+1965,16,0,198,1,
+1901,1966,16,0,198,
+1,1153,1967,16,0,
+198,1,151,1968,16,
+0,198,1,1407,1969,
+16,0,198,1,1659,
+1970,16,0,198,1,
+2413,1971,16,0,198,
+1,406,1972,16,0,
+198,1,1371,1973,16,
+0,198,1,2105,900,
+1,166,1974,16,0,
+198,1,2045,865,1,
+1622,1975,16,0,198,
+1,1931,946,1,1932,
+1976,16,0,512,1,
+1933,1977,16,0,198,
+1,431,1978,16,0,
+198,1,1585,1979,16,
+0,198,1,182,1980,
+16,0,198,1,1189,
+1981,16,0,198,1,
+1443,1982,16,0,198,
+1,1695,1983,16,0,
+198,1,2198,1984,16,
+0,198,1,447,1985,
+16,0,198,1,199,
+1986,16,0,198,1,
+2459,967,1,1958,1987,
+16,0,198,1,2462,
+974,1,1657,979,1,
+2464,984,1,459,1988,
+16,0,198,1,462,
+1989,16,0,198,1,
+2471,1990,17,1991,15,
+1992,4,36,37,0,
 73,0,110,0,116,
+0,82,0,111,0,
+116,0,82,0,111,
+0,116,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+-1,1,5,1993,20,
+1994,4,38,73,0,
+110,0,116,0,82,
+0,111,0,116,0,
+82,0,111,0,116,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,53,
-0,1,345,1,3,
-1,2,1,1,1977,
-22,1,192,1,1225,
-1978,16,0,190,1,
-2481,1979,17,1980,15,
-1853,1,-1,1,5,
-1981,20,1982,4,26,
-73,0,110,0,116,
+116,0,95,0,49,
+0,1,362,1,3,
+1,2,1,1,1995,
+22,1,205,1,2472,
+1996,17,1997,15,1998,
+4,30,37,0,86,
+0,101,0,99,0,
+116,0,111,0,114,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,51,
-0,1,343,1,3,
-1,2,1,1,1983,
-22,1,190,1,2482,
-1984,17,1985,15,1853,
-1,-1,1,5,1986,
-20,1987,4,26,73,
-0,110,0,116,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,95,0,50,0,
-1,342,1,3,1,
-2,1,1,1988,22,
-1,189,1,2483,1989,
-17,1990,15,1853,1,
--1,1,5,1991,20,
-1992,4,26,73,0,
+116,0,1,-1,1,
+5,1999,20,2000,4,
+32,86,0,101,0,
+99,0,116,0,111,
+0,114,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,51,0,1,361,
+1,3,1,2,1,
+1,2001,22,1,204,
+1,2473,2002,17,2003,
+15,1998,1,-1,1,
+5,2004,20,2005,4,
+32,86,0,101,0,
+99,0,116,0,111,
+0,114,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,50,0,1,360,
+1,3,1,2,1,
+1,2006,22,1,203,
+1,2474,2007,17,2008,
+15,1998,1,-1,1,
+5,2009,20,2010,4,
+32,86,0,101,0,
+99,0,116,0,111,
+0,114,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,49,0,1,359,
+1,3,1,2,1,
+1,2011,22,1,202,
+1,2475,2012,17,2013,
+15,1906,1,-1,1,
+5,2014,20,2015,4,
+28,73,0,110,0,
+116,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+49,0,48,0,1,
+358,1,3,1,2,
+1,1,2016,22,1,
+201,1,2476,2017,17,
+2018,15,1906,1,-1,
+1,5,2019,20,2020,
+4,26,73,0,110,
+0,116,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,57,0,1,357,
+1,3,1,2,1,
+1,2021,22,1,200,
+1,2477,2022,17,2023,
+15,1906,1,-1,1,
+5,2024,20,2025,4,
+26,73,0,110,0,
+116,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+56,0,1,356,1,
+3,1,2,1,1,
+2026,22,1,199,1,
+2227,993,1,2479,2027,
+17,2028,15,1906,1,
+-1,1,5,2029,20,
+2030,4,26,73,0,
 110,0,116,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,49,0,1,
-341,1,3,1,2,
-1,1,1993,22,1,
-188,1,1731,1994,16,
-0,190,1,2485,1995,
-17,1996,15,1860,1,
--1,1,5,1997,20,
-1998,4,26,75,0,
-101,0,121,0,65,
+95,0,54,0,1,
+354,1,3,1,2,
+1,1,2031,22,1,
+197,1,1225,2032,16,
+0,198,1,2481,2033,
+17,2034,15,1906,1,
+-1,1,5,2035,20,
+2036,4,26,73,0,
+110,0,116,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,49,0,1,
-339,1,3,1,2,
-1,1,1999,22,1,
-186,1,2486,2000,17,
-2001,15,1868,1,-1,
-1,5,2002,20,2003,
-4,28,86,0,111,
-0,105,0,100,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,95,0,56,0,
-1,338,1,3,1,
-2,1,1,2004,22,
-1,185,1,2487,2005,
-17,2006,15,1868,1,
--1,1,5,2007,20,
-2008,4,28,86,0,
-111,0,105,0,100,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,95,0,55,
-0,1,337,1,3,
-1,2,1,1,2009,
-22,1,184,1,2488,
-2010,17,2011,15,1868,
-1,-1,1,5,2012,
-20,2013,4,28,86,
-0,111,0,105,0,
-100,0,65,0,114,
+95,0,52,0,1,
+352,1,3,1,2,
+1,1,2037,22,1,
+195,1,2482,2038,17,
+2039,15,1906,1,-1,
+1,5,2040,20,2041,
+4,26,73,0,110,
+0,116,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,51,0,1,351,
+1,3,1,2,1,
+1,2042,22,1,194,
+1,2483,2043,17,2044,
+15,1906,1,-1,1,
+5,2045,20,2046,4,
+26,73,0,110,0,
+116,0,65,0,114,
 0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-54,0,1,336,1,
+50,0,1,350,1,
 3,1,2,1,1,
-2014,22,1,183,1,
-2489,2015,17,2016,15,
-1868,1,-1,1,5,
-2017,20,2018,4,28,
-86,0,111,0,105,
-0,100,0,65,0,
+2047,22,1,193,1,
+1731,2048,16,0,198,
+1,2485,2049,17,2050,
+15,2051,4,24,37,
+0,75,0,101,0,
+121,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,1,-1,
+1,5,2052,20,2053,
+4,26,75,0,101,
+0,121,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,53,0,1,335,
+0,50,0,1,348,
 1,3,1,2,1,
-1,2019,22,1,182,
-1,2490,2020,17,2021,
-15,1868,1,-1,1,
-5,2022,20,2023,4,
-28,86,0,111,0,
-105,0,100,0,65,
-0,114,0,103,0,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,52,0,1,
-334,1,3,1,2,
-1,1,2024,22,1,
-181,1,1989,980,1,
-2492,2025,17,2026,15,
-1868,1,-1,1,5,
-2027,20,2028,4,28,
+1,2054,22,1,191,
+1,2486,2055,17,2056,
+15,2051,1,-1,1,
+5,2057,20,2058,4,
+26,75,0,101,0,
+121,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+49,0,1,347,1,
+3,1,2,1,1,
+2059,22,1,190,1,
+2487,2060,17,2061,15,
+1920,1,-1,1,5,
+2062,20,2063,4,28,
 86,0,111,0,105,
 0,100,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,50,0,1,332,
+0,56,0,1,346,
 1,3,1,2,1,
-1,2029,22,1,179,
-1,2493,2030,17,2031,
-15,1868,1,-1,1,
-5,2032,20,2033,4,
+1,2064,22,1,189,
+1,2488,2065,17,2066,
+15,1920,1,-1,1,
+5,2067,20,2068,4,
 28,86,0,111,0,
 105,0,100,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,49,0,1,
-331,1,3,1,2,
-1,1,2034,22,1,
-178,1,2494,2035,17,
-2036,15,1876,1,-1,
-1,5,2037,20,2038,
-4,16,69,0,118,
+95,0,55,0,1,
+345,1,3,1,2,
+1,1,2069,22,1,
+188,1,2489,2070,17,
+2071,15,1920,1,-1,
+1,5,2072,20,2073,
+4,28,86,0,111,
+0,105,0,100,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,54,0,
+1,344,1,3,1,
+2,1,1,2074,22,
+1,187,1,2490,2075,
+17,2076,15,1920,1,
+-1,1,5,2077,20,
+2078,4,28,86,0,
+111,0,105,0,100,
+0,65,0,114,0,
+103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,49,
-0,49,0,1,330,
-1,3,1,2,1,
-1,2039,22,1,177,
-1,236,2040,16,0,
-190,1,2496,2041,17,
-2042,15,1876,1,-1,
-1,5,2043,20,2044,
-4,14,69,0,118,
+116,0,95,0,53,
+0,1,343,1,3,
+1,2,1,1,2079,
+22,1,186,1,1989,
+1002,1,2492,2080,17,
+2081,15,1920,1,-1,
+1,5,2082,20,2083,
+4,28,86,0,111,
+0,105,0,100,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,51,0,
+1,341,1,3,1,
+2,1,1,2084,22,
+1,184,1,2493,2085,
+17,2086,15,1920,1,
+-1,1,5,2087,20,
+2088,4,28,86,0,
+111,0,105,0,100,
+0,65,0,114,0,
+103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,57,
-0,1,328,1,3,
-1,2,1,1,2045,
-22,1,175,1,2497,
-2046,17,2047,15,1876,
-1,-1,1,5,2048,
-20,2049,4,14,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,56,0,1,327,
-1,3,1,2,1,
-1,2050,22,1,174,
-1,2498,2051,17,2052,
-15,1876,1,-1,1,
-5,2053,20,2054,4,
+116,0,95,0,50,
+0,1,340,1,3,
+1,2,1,1,2089,
+22,1,183,1,2494,
+2090,17,2091,15,1920,
+1,-1,1,5,2092,
+20,2093,4,28,86,
+0,111,0,105,0,
+100,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+49,0,1,339,1,
+3,1,2,1,1,
+2094,22,1,182,1,
+236,2095,16,0,198,
+1,2496,2096,17,2097,
+15,1928,1,-1,1,
+5,2098,20,2099,4,
 14,69,0,118,0,
 101,0,110,0,116,
-0,95,0,55,0,
-1,326,1,3,1,
-2,1,1,2055,22,
-1,173,1,2499,2056,
-17,2057,15,1876,1,
--1,1,5,2058,20,
-2059,4,14,69,0,
+0,95,0,57,0,
+1,337,1,3,1,
+2,1,1,2100,22,
+1,180,1,2497,2101,
+17,2102,15,1928,1,
+-1,1,5,2103,20,
+2104,4,14,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-54,0,1,325,1,
+56,0,1,336,1,
 3,1,2,1,1,
-2060,22,1,172,1,
-2500,2061,17,2062,15,
-1876,1,-1,1,5,
-2063,20,2064,4,14,
+2105,22,1,179,1,
+2498,2106,17,2107,15,
+1928,1,-1,1,5,
+2108,20,2109,4,14,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,53,0,1,
-324,1,3,1,2,
-1,1,2065,22,1,
-171,1,2501,2066,17,
-2067,15,1876,1,-1,
-1,5,2068,20,2069,
+95,0,55,0,1,
+335,1,3,1,2,
+1,1,2110,22,1,
+178,1,2499,2111,17,
+2112,15,1928,1,-1,
+1,5,2113,20,2114,
 4,14,69,0,118,
 0,101,0,110,0,
-116,0,95,0,52,
-0,1,323,1,3,
-1,2,1,1,2070,
-22,1,170,1,2502,
-2071,17,2072,15,1876,
-1,-1,1,5,2073,
-20,2074,4,14,69,
+116,0,95,0,54,
+0,1,334,1,3,
+1,2,1,1,2115,
+22,1,177,1,2500,
+2116,17,2117,15,1928,
+1,-1,1,5,2118,
+20,2119,4,14,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,51,0,1,322,
+0,53,0,1,333,
 1,3,1,2,1,
-1,2075,22,1,169,
-1,2503,2076,17,2077,
-15,1876,1,-1,1,
-5,2078,20,2079,4,
+1,2120,22,1,176,
+1,2501,2121,17,2122,
+15,1928,1,-1,1,
+5,2123,20,2124,4,
 14,69,0,118,0,
 101,0,110,0,116,
-0,95,0,50,0,
-1,321,1,3,1,
-2,1,1,2080,22,
-1,168,1,2504,2081,
-17,2082,15,1876,1,
--1,1,5,2083,20,
-2084,4,14,69,0,
+0,95,0,52,0,
+1,332,1,3,1,
+2,1,1,2125,22,
+1,175,1,2502,2126,
+17,2127,15,1928,1,
+-1,1,5,2128,20,
+2129,4,14,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-49,0,1,320,1,
+51,0,1,331,1,
 3,1,2,1,1,
-2085,22,1,167,1,
-2505,2086,16,0,450,
-1,217,2087,16,0,
-190,1,1756,2088,16,
-0,190,1,17,2089,
-19,157,1,17,2090,
-5,127,1,2510,2091,
-16,0,634,1,1,
-2092,17,2093,15,2094,
-4,18,37,0,84,
-0,121,0,112,0,
-101,0,110,0,97,
-0,109,0,101,0,
-1,-1,1,5,2095,
-20,2096,4,20,84,
-0,121,0,112,0,
-101,0,110,0,97,
-0,109,0,101,0,
-95,0,55,0,1,
-319,1,3,1,2,
-1,1,2097,22,1,
-166,1,2,2098,17,
-2099,15,2094,1,-1,
-1,5,2100,20,2101,
+2130,22,1,174,1,
+2503,2131,17,2132,15,
+1928,1,-1,1,5,
+2133,20,2134,4,14,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,50,0,1,
+330,1,3,1,2,
+1,1,2135,22,1,
+173,1,2504,2136,17,
+2137,15,1928,1,-1,
+1,5,2138,20,2139,
+4,14,69,0,118,
+0,101,0,110,0,
+116,0,95,0,49,
+0,1,329,1,3,
+1,2,1,1,2140,
+22,1,172,1,2505,
+2141,16,0,445,1,
+217,2142,16,0,198,
+1,1756,2143,16,0,
+198,1,17,2144,19,
+164,1,17,2145,5,
+130,1,1,2146,17,
+2147,15,2148,4,18,
+37,0,84,0,121,
+0,112,0,101,0,
+110,0,97,0,109,
+0,101,0,1,-1,
+1,5,2149,20,2150,
 4,20,84,0,121,
 0,112,0,101,0,
 110,0,97,0,109,
 0,101,0,95,0,
-54,0,1,318,1,
+55,0,1,328,1,
 3,1,2,1,1,
-2102,22,1,165,1,
-3,2103,17,2104,15,
-2094,1,-1,1,5,
-2105,20,2106,4,20,
+2151,22,1,171,1,
+2,2152,17,2153,15,
+2148,1,-1,1,5,
+2154,20,2155,4,20,
 84,0,121,0,112,
 0,101,0,110,0,
 97,0,109,0,101,
-0,95,0,53,0,
-1,317,1,3,1,
-2,1,1,2107,22,
-1,164,1,4,2108,
-17,2109,15,2094,1,
--1,1,5,2110,20,
-2111,4,20,84,0,
+0,95,0,54,0,
+1,327,1,3,1,
+2,1,1,2156,22,
+1,170,1,3,2157,
+17,2158,15,2148,1,
+-1,1,5,2159,20,
+2160,4,20,84,0,
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,95,
-0,52,0,1,316,
+0,53,0,1,326,
 1,3,1,2,1,
-1,2112,22,1,163,
-1,5,2113,17,2114,
-15,2094,1,-1,1,
-5,2115,20,2116,4,
+1,2161,22,1,169,
+1,4,2162,17,2163,
+15,2148,1,-1,1,
+5,2164,20,2165,4,
 20,84,0,121,0,
 112,0,101,0,110,
 0,97,0,109,0,
-101,0,95,0,51,
-0,1,315,1,3,
-1,2,1,1,2117,
-22,1,162,1,6,
-2118,17,2119,15,2094,
-1,-1,1,5,2120,
-20,2121,4,20,84,
+101,0,95,0,52,
+0,1,325,1,3,
+1,2,1,1,2166,
+22,1,168,1,5,
+2167,17,2168,15,2148,
+1,-1,1,5,2169,
+20,2170,4,20,84,
 0,121,0,112,0,
 101,0,110,0,97,
 0,109,0,101,0,
-95,0,50,0,1,
-314,1,3,1,2,
-1,1,2122,22,1,
-161,1,7,2123,17,
-2124,15,2094,1,-1,
-1,5,2125,20,2126,
+95,0,51,0,1,
+324,1,3,1,2,
+1,1,2171,22,1,
+167,1,6,2172,17,
+2173,15,2148,1,-1,
+1,5,2174,20,2175,
 4,20,84,0,121,
 0,112,0,101,0,
 110,0,97,0,109,
 0,101,0,95,0,
-49,0,1,313,1,
+50,0,1,323,1,
 3,1,2,1,1,
-2127,22,1,160,1,
-2518,2128,17,2129,15,
-2130,4,54,37,0,
-73,0,110,0,116,
+2176,22,1,166,1,
+7,2177,17,2178,15,
+2148,1,-1,1,5,
+2179,20,2180,4,20,
+84,0,121,0,112,
+0,101,0,110,0,
+97,0,109,0,101,
+0,95,0,49,0,
+1,322,1,3,1,
+2,1,1,2181,22,
+1,165,1,1514,1194,
+1,9,1199,1,10,
+1819,1,262,1205,1,
+1267,1211,1,2524,2182,
+17,2183,15,2184,4,
+36,37,0,86,0,
+101,0,99,0,116,
+0,111,0,114,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,1,-1,1,
+5,2185,20,2186,4,
+38,86,0,101,0,
+99,0,116,0,111,
+0,114,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+95,0,49,0,1,
+201,1,3,1,3,
+1,2,2187,22,1,
+43,1,2525,2188,17,
+2189,15,2190,4,60,
+37,0,86,0,101,
+0,99,0,116,0,
+111,0,114,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
+1,-1,1,5,2191,
+20,2192,4,62,86,
+0,101,0,99,0,
+116,0,111,0,114,
 0,65,0,114,0,
 103,0,117,0,109,
 0,101,0,110,0,
@@ -6912,42 +7192,17 @@ public yyLSLSyntax
 0,116,0,105,0,
 111,0,110,0,76,
 0,105,0,115,0,
-116,0,1,-1,1,
-5,2131,20,2132,4,
-56,73,0,110,0,
-116,0,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-76,0,105,0,115,
-0,116,0,95,0,
-49,0,1,188,1,
-3,1,2,1,1,
-2133,22,1,34,1,
-9,1177,1,10,1773,
-1,262,1183,1,1267,
-1189,1,1521,1194,1,
-1773,2134,16,0,242,
-1,2527,2135,17,2136,
-15,2137,4,54,37,
-0,75,0,101,0,
-121,0,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-76,0,105,0,115,
-0,116,0,1,-1,
-1,5,2138,20,2139,
-4,56,75,0,101,
-0,121,0,65,0,
+116,0,95,0,49,
+0,1,196,1,3,
+1,2,1,1,2193,
+22,1,38,1,1773,
+2194,16,0,252,1,
+19,1233,1,20,2195,
+16,0,162,1,2281,
+1240,1,2533,2196,17,
+2197,15,2198,4,54,
+37,0,73,0,110,
+0,116,0,65,0,
 114,0,103,0,117,
 0,109,0,101,0,
 110,0,116,0,68,
@@ -6956,147 +7211,89 @@ public yyLSLSyntax
 0,97,0,116,0,
 105,0,111,0,110,
 0,76,0,105,0,
-115,0,116,0,95,
-0,49,0,1,187,
-1,3,1,2,1,
-1,2140,22,1,33,
-1,2528,2141,16,0,
-486,1,19,1211,1,
-20,2142,16,0,155,
-1,2281,1218,1,2533,
-2143,16,0,492,1,
-2538,1779,1,30,1781,
-1,1002,1657,1,283,
-1236,1,2547,2144,16,
-0,607,1,1010,2145,
-16,0,648,1,40,
-1241,1,41,1787,1,
-42,1791,1,44,1247,
-1,1260,1160,1,47,
-1248,1,48,1254,1,
-49,1260,1,50,1265,
-1,51,1270,1,305,
-1275,1,1514,1172,1,
-525,1280,1,61,2146,
-16,0,201,1,63,
-1286,1,66,1292,1,
-67,1297,1,68,1302,
-1,69,1307,1,70,
-1312,1,73,2147,16,
-0,211,1,74,1317,
-1,1013,1322,1,2335,
-2148,16,0,244,1,
-1332,1327,1,1048,1408,
-1,82,1344,1,1840,
-2149,16,0,316,1,
-1341,1361,1,2517,2150,
-17,2151,15,2152,4,
-30,37,0,73,0,
-110,0,116,0,68,
+115,0,116,0,1,
+-1,1,5,2199,20,
+2200,4,56,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
+95,0,49,0,1,
+195,1,3,1,2,
+1,1,2201,22,1,
+37,1,2534,2202,16,
+0,488,1,30,1825,
+1,2541,2203,17,2204,
+15,2205,4,30,37,
+0,75,0,101,0,
+121,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,1,
+-1,1,5,2206,20,
+2207,4,32,75,0,
+101,0,121,0,68,
 0,101,0,99,0,
 108,0,97,0,114,
 0,97,0,116,0,
 105,0,111,0,110,
-0,1,-1,1,5,
-2153,20,2154,4,32,
+0,95,0,49,0,
+1,199,1,3,1,
+3,1,2,2208,22,
+1,41,1,283,1258,
+1,2543,2209,16,0,
+503,1,2548,2210,16,
+0,633,1,1010,2211,
+16,0,668,1,40,
+1263,1,41,1830,1,
+42,1834,1,2553,1840,
+1,44,1269,1,1260,
+1182,1,47,1270,1,
+1303,1394,1,49,1282,
+1,50,1287,1,48,
+1276,1,2562,2212,16,
+0,646,1,305,1297,
+1,51,1292,1,2733,
+2213,16,0,169,1,
+61,2214,16,0,205,
+1,63,1308,1,1521,
+1216,1,66,1315,1,
+67,1320,1,68,1325,
+1,69,1330,1,70,
+1335,1,73,2215,16,
+0,215,1,74,1340,
+1,1013,1345,1,2335,
+2216,16,0,254,1,
+1332,1350,1,1048,1431,
+1,82,1367,1,1840,
+2217,16,0,318,1,
+2516,2218,17,2219,15,
+2220,4,66,37,0,
 73,0,110,0,116,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,95,0,
-49,0,1,192,1,
-3,1,3,1,2,
-2155,22,1,38,1,
-2519,2156,16,0,646,
-1,1303,1371,1,1096,
-1376,1,93,1382,1,
-1550,1387,1,2526,2157,
-17,2158,15,2159,4,
-30,37,0,75,0,
-101,0,121,0,68,
+0,82,0,111,0,
+116,0,82,0,111,
+0,116,0,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
 0,101,0,99,0,
 108,0,97,0,114,
 0,97,0,116,0,
 105,0,111,0,110,
-0,1,-1,1,5,
-2160,20,2161,4,32,
-75,0,101,0,121,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,95,0,
-49,0,1,191,1,
-3,1,3,1,2,
-2162,22,1,37,1,
-827,1395,1,1011,1166,
-1,107,1402,1,1114,
-1407,1,328,1366,1,
-1871,2163,16,0,326,
-1,1370,1516,1,1478,
-1521,1,118,1419,1,
-1123,1424,1,371,1429,
-1,1377,1435,1,375,
-1440,1,1882,2164,16,
-0,344,1,377,1445,
-1,352,1413,1,379,
-1450,1,380,1455,1,
-130,1478,1,2074,2165,
-16,0,609,1,373,
-1473,1,1012,2166,16,
-0,650,1,143,1483,
-1,1152,1489,1,1406,
-1494,1,1159,1501,1,
-157,1506,1,1413,1511,
-1,883,1461,1,1094,
-2167,16,0,724,1,
-1296,1231,1,172,1532,
-1,1665,1537,1,1939,
-2168,16,0,464,1,
-1188,1542,1,1442,1547,
-1,188,1581,1,942,
-1553,1,1195,1559,1,
-2702,1803,1,1449,1564,
-1,1701,1569,1,447,
-1574,1,2711,2169,16,
-0,693,1,205,1587,
-1,2467,1806,1,464,
-1812,1,2197,2170,16,
-0,718,1,1224,1593,
-1,223,1598,1,1730,
-1603,1,476,1608,1,
-477,1614,1,1231,1619,
-1,479,1624,1,480,
-1629,1,1485,1635,1,
-459,1817,1,242,1642,
-1,478,1647,1,481,
-1819,1,1001,1652,1,
-2508,2171,17,2172,15,
-2173,4,36,37,0,
-86,0,101,0,99,
-0,116,0,111,0,
-114,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,1,
--1,1,5,2174,20,
-2175,4,38,86,0,
-101,0,99,0,116,
-0,111,0,114,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,95,0,49,
-0,1,193,1,3,
-1,3,1,2,2176,
-22,1,39,1,2509,
-2177,17,2178,15,2179,
-4,60,37,0,86,
-0,101,0,99,0,
-116,0,111,0,114,
+0,76,0,105,0,
+115,0,116,0,1,
+-1,1,5,2221,20,
+2222,4,68,73,0,
+110,0,116,0,82,
+0,111,0,116,0,
+82,0,111,0,116,
 0,65,0,114,0,
 103,0,117,0,109,
 0,101,0,110,0,
@@ -7106,11 +7303,23 @@ public yyLSLSyntax
 0,116,0,105,0,
 111,0,110,0,76,
 0,105,0,115,0,
-116,0,1,-1,1,
-5,2180,20,2181,4,
-62,86,0,101,0,
-99,0,116,0,111,
-0,114,0,65,0,
+116,0,95,0,49,
+0,1,197,1,3,
+1,6,1,5,2223,
+22,1,39,1,2517,
+2224,16,0,463,1,
+328,1389,1,1094,2225,
+16,0,748,1,1096,
+1399,1,93,1405,1,
+1550,1410,1,525,1302,
+1,2526,2226,16,0,
+286,1,1002,1679,1,
+827,1418,1,1011,1188,
+1,107,1425,1,1114,
+1430,1,2542,2227,17,
+2228,15,2229,4,54,
+37,0,75,0,101,
+0,121,0,65,0,
 114,0,103,0,117,
 0,109,0,101,0,
 110,0,116,0,68,
@@ -7119,2133 +7328,2151 @@ public yyLSLSyntax
 0,97,0,116,0,
 105,0,111,0,110,
 0,76,0,105,0,
-115,0,116,0,95,
-0,49,0,1,189,
-1,3,1,2,1,
-1,2182,22,1,35,
-1,18,2183,19,539,
-1,18,2184,5,84,
-1,1011,1166,1,1012,
-2185,16,0,537,1,
-1013,1322,1,262,1183,
-1,1267,2186,16,0,
-537,1,515,2187,16,
-0,537,1,1521,2188,
-16,0,537,1,525,
-1280,1,283,1236,1,
-2299,2189,16,0,537,
-1,42,2190,16,0,
-537,1,40,1241,1,
-44,1247,1,47,1248,
-1,1303,2191,16,0,
-537,1,1555,2192,16,
-0,537,1,50,1265,
-1,48,1254,1,49,
-1260,1,51,1270,1,
-63,1286,1,305,1275,
-1,66,1292,1,67,
-1297,1,68,1302,1,
-69,1307,1,70,1312,
-1,73,2193,16,0,
-537,1,74,1317,1,
-328,1366,1,1048,2194,
-16,0,537,1,82,
-2195,16,0,537,1,
-1840,2196,16,0,537,
-1,1591,2197,16,0,
-537,1,1341,2198,16,
-0,537,1,1096,1376,
-1,93,1382,1,352,
-1413,1,107,2199,16,
-0,537,1,1114,1407,
-1,118,2200,16,0,
-537,1,1123,2201,16,
-0,537,1,371,1429,
-1,1628,2202,16,0,
-537,1,375,1440,1,
-1882,2203,16,0,537,
-1,377,1445,1,379,
-1450,1,380,1455,1,
-883,2204,16,0,537,
-1,373,1473,1,130,
-2205,16,0,537,1,
-143,2206,16,0,537,
-1,387,2207,16,0,
-537,1,1159,2208,16,
-0,537,1,157,2209,
-16,0,537,1,1413,
-2210,16,0,537,1,
-1665,2211,16,0,537,
-1,412,2212,16,0,
-537,1,1377,2213,16,
-0,537,1,172,2214,
-16,0,537,1,1939,
-2215,16,0,537,1,
-437,2216,16,0,537,
-1,188,2217,16,0,
-537,1,942,2218,16,
-0,537,1,1195,2219,
-16,0,537,1,1449,
-2220,16,0,537,1,
-1701,2221,16,0,537,
-1,447,1574,1,205,
-2222,16,0,537,1,
-827,2223,16,0,537,
-1,2724,2224,16,0,
-537,1,223,2225,16,
-0,537,1,476,1608,
-1,477,1614,1,1231,
-2226,16,0,537,1,
-479,1624,1,480,1629,
-1,1485,2227,16,0,
-537,1,1737,2228,16,
-0,537,1,242,2229,
-16,0,537,1,478,
-1647,1,1001,1652,1,
-1002,1657,1,19,2230,
-19,233,1,19,2231,
-5,176,1,256,2232,
-16,0,231,1,1261,
-2233,16,0,231,1,
-1011,1166,1,1012,2234,
-16,0,507,1,2458,
-940,1,262,1183,1,
-1267,2235,16,0,507,
-1,2021,782,1,1521,
-2236,16,0,507,1,
-1775,2237,16,0,231,
-1,2029,789,1,2030,
-795,1,2031,800,1,
-2032,805,1,2033,810,
-1,277,2238,16,0,
-231,1,2035,816,1,
-2037,821,1,2039,826,
-1,32,2239,16,0,
-231,1,2464,963,1,
-2293,2240,16,0,231,
-1,2043,838,1,2045,
-843,1,2299,2241,16,
-0,507,1,41,2242,
-16,0,231,1,42,
-2243,16,0,507,1,
-40,1241,1,44,1247,
-1,43,2244,16,0,
-231,1,1804,2245,16,
-0,231,1,48,1254,
-1,49,1260,1,47,
-1248,1,51,1270,1,
-52,2246,16,0,231,
-1,50,1265,1,305,
-1275,1,1096,1376,1,
-1515,2247,16,0,231,
-1,2318,2248,16,0,
-231,1,283,1236,1,
-63,1286,1,66,1292,
-1,67,1297,1,68,
-1302,1,69,1307,1,
-70,1312,1,71,2249,
-16,0,231,1,73,
-2250,16,0,507,1,
-74,1317,1,1013,1322,
-1,76,2251,16,0,
-231,1,1834,2252,16,
-0,231,1,2337,2253,
-16,0,231,1,79,
-2254,16,0,231,1,
-1335,2255,16,0,231,
-1,299,2256,16,0,
-231,1,82,2257,16,
-0,507,1,1840,2258,
-16,0,507,1,1297,
-2259,16,0,231,1,
-85,2260,16,0,231,
-1,1341,2261,16,0,
-507,1,89,2262,16,
-0,231,1,1303,2263,
-16,0,507,1,509,
-2264,16,0,231,1,
-93,1382,1,322,2265,
-16,0,231,1,97,
-2266,16,0,231,1,
-2041,832,1,1555,2267,
-16,0,507,1,827,
-2268,16,0,507,1,
-102,2269,16,0,231,
-1,1860,885,1,1803,
-851,1,2364,891,1,
-107,2270,16,0,507,
-1,1114,1407,1,112,
-2271,16,0,231,1,
-1117,2272,16,0,231,
-1,352,1413,1,1873,
-899,1,118,2273,16,
-0,507,1,1123,2274,
-16,0,507,1,371,
-1429,1,515,2275,16,
-0,507,1,1377,2276,
-16,0,507,1,124,
-2277,16,0,231,1,
-1882,2278,16,0,507,
-1,377,1445,1,379,
-1450,1,380,1455,1,
-130,2279,16,0,507,
-1,346,2280,16,0,
-231,1,2075,2281,16,
-0,231,1,373,1473,
-1,387,2282,16,0,
-507,1,137,2283,16,
-0,231,1,143,2284,
-16,0,507,1,1901,
-2285,16,0,231,1,
-1048,2286,16,0,507,
-1,1153,2287,16,0,
-231,1,375,1440,1,
-151,2288,16,0,231,
-1,1407,2289,16,0,
-231,1,1659,2290,16,
-0,231,1,2413,2291,
+115,0,116,0,1,
+-1,1,5,2230,20,
+2231,4,56,75,0,
+101,0,121,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
+95,0,49,0,1,
+194,1,3,1,2,
+1,1,2232,22,1,
+36,1,1871,2233,16,
+0,328,1,1370,1539,
+1,1478,1544,1,118,
+1442,1,1123,1447,1,
+371,1452,1,1377,1458,
+1,375,1463,1,1882,
+2234,16,0,341,1,
+377,1468,1,352,1436,
+1,379,1473,1,1341,
+1384,1,130,1501,1,
+2074,2235,16,0,635,
+1,373,1496,1,1012,
+2236,16,0,670,1,
+380,1478,1,143,1506,
+1,1152,1512,1,1406,
+1517,1,1159,1524,1,
+157,1529,1,1413,1534,
+1,883,1484,1,2512,
+1812,1,1296,1253,1,
+172,1555,1,1665,1560,
+1,1939,2237,16,0,
+458,1,1188,1565,1,
+1442,1570,1,188,1604,
+1,942,1576,1,1195,
+1582,1,1449,1587,1,
+1701,1592,1,447,1597,
+1,205,1609,1,2467,
+1850,1,464,1856,1,
+2724,1861,1,2197,2238,
+16,0,742,1,1224,
+1614,1,223,1619,1,
+1730,1624,1,476,1629,
+1,477,1635,1,1231,
+1640,1,479,1645,1,
+480,1650,1,1485,1656,
+1,459,1863,1,242,
+1664,1,478,1669,1,
+481,1865,1,1001,1674,
+1,2508,1870,1,18,
+2239,19,541,1,18,
+2240,5,84,1,1011,
+1188,1,1012,2241,16,
+0,539,1,1013,1345,
+1,262,1205,1,1267,
+2242,16,0,539,1,
+515,2243,16,0,539,
+1,1521,2244,16,0,
+539,1,525,1302,1,
+283,1258,1,2299,2245,
+16,0,539,1,42,
+2246,16,0,539,1,
+40,1263,1,44,1269,
+1,47,1270,1,1303,
+2247,16,0,539,1,
+1555,2248,16,0,539,
+1,50,1287,1,48,
+1276,1,49,1282,1,
+51,1292,1,63,1308,
+1,305,1297,1,66,
+1315,1,67,1320,1,
+68,1325,1,69,1330,
+1,70,1335,1,73,
+2249,16,0,539,1,
+74,1340,1,328,1389,
+1,1048,2250,16,0,
+539,1,82,2251,16,
+0,539,1,1840,2252,
+16,0,539,1,1591,
+2253,16,0,539,1,
+1341,2254,16,0,539,
+1,1096,1399,1,93,
+1405,1,352,1436,1,
+107,2255,16,0,539,
+1,1114,1430,1,118,
+2256,16,0,539,1,
+1123,2257,16,0,539,
+1,371,1452,1,1628,
+2258,16,0,539,1,
+375,1463,1,1882,2259,
+16,0,539,1,377,
+1468,1,379,1473,1,
+380,1478,1,883,2260,
+16,0,539,1,373,
+1496,1,130,2261,16,
+0,539,1,143,2262,
+16,0,539,1,387,
+2263,16,0,539,1,
+1159,2264,16,0,539,
+1,157,2265,16,0,
+539,1,1413,2266,16,
+0,539,1,1665,2267,
+16,0,539,1,412,
+2268,16,0,539,1,
+1377,2269,16,0,539,
+1,172,2270,16,0,
+539,1,1939,2271,16,
+0,539,1,437,2272,
+16,0,539,1,188,
+2273,16,0,539,1,
+942,2274,16,0,539,
+1,1195,2275,16,0,
+539,1,1449,2276,16,
+0,539,1,1701,2277,
+16,0,539,1,447,
+1597,1,205,2278,16,
+0,539,1,827,2279,
+16,0,539,1,223,
+2280,16,0,539,1,
+476,1629,1,477,1635,
+1,1231,2281,16,0,
+539,1,479,1645,1,
+480,1650,1,1485,2282,
+16,0,539,1,1737,
+2283,16,0,539,1,
+2746,2284,16,0,539,
+1,242,2285,16,0,
+539,1,478,1669,1,
+1001,1674,1,1002,1679,
+1,19,2286,19,239,
+1,19,2287,5,176,
+1,256,2288,16,0,
+237,1,1261,2289,16,
+0,237,1,1011,1188,
+1,1012,2290,16,0,
+510,1,2458,961,1,
+262,1205,1,1267,2291,
+16,0,510,1,2021,
+804,1,1521,2292,16,
+0,510,1,1775,2293,
+16,0,237,1,2029,
+811,1,2030,817,1,
+2031,822,1,2032,827,
+1,2033,832,1,277,
+2294,16,0,237,1,
+2035,838,1,2037,843,
+1,2039,848,1,32,
+2295,16,0,237,1,
+2464,984,1,2293,2296,
+16,0,237,1,2043,
+860,1,2045,865,1,
+2299,2297,16,0,510,
+1,41,2298,16,0,
+237,1,42,2299,16,
+0,510,1,40,1263,
+1,44,1269,1,43,
+2300,16,0,237,1,
+1804,2301,16,0,237,
+1,48,1276,1,49,
+1282,1,47,1270,1,
+51,1292,1,52,2302,
+16,0,237,1,50,
+1287,1,305,1297,1,
+1096,1399,1,1515,2303,
+16,0,237,1,2318,
+2304,16,0,237,1,
+283,1258,1,63,1308,
+1,66,1315,1,67,
+1320,1,68,1325,1,
+69,1330,1,70,1335,
+1,71,2305,16,0,
+237,1,2746,2306,16,
+0,510,1,73,2307,
+16,0,510,1,74,
+1340,1,1013,1345,1,
+76,2308,16,0,237,
+1,1834,2309,16,0,
+237,1,2337,2310,16,
+0,237,1,79,2311,
+16,0,237,1,1335,
+2312,16,0,237,1,
+299,2313,16,0,237,
+1,82,2314,16,0,
+510,1,1840,2315,16,
+0,510,1,1297,2316,
+16,0,237,1,85,
+2317,16,0,237,1,
+1341,2318,16,0,510,
+1,89,2319,16,0,
+237,1,1303,2320,16,
+0,510,1,509,2321,
+16,0,237,1,93,
+1405,1,322,2322,16,
+0,237,1,97,2323,
+16,0,237,1,2041,
+854,1,1555,2324,16,
+0,510,1,827,2325,
+16,0,510,1,102,
+2326,16,0,237,1,
+1860,907,1,1803,873,
+1,2364,913,1,107,
+2327,16,0,510,1,
+1114,1430,1,112,2328,
+16,0,237,1,1117,
+2329,16,0,237,1,
+352,1436,1,1873,921,
+1,118,2330,16,0,
+510,1,1123,2331,16,
+0,510,1,371,1452,
+1,515,2332,16,0,
+510,1,1377,2333,16,
+0,510,1,124,2334,
+16,0,237,1,1882,
+2335,16,0,510,1,
+377,1468,1,379,1473,
+1,380,1478,1,130,
+2336,16,0,510,1,
+346,2337,16,0,237,
+1,2075,2338,16,0,
+237,1,373,1496,1,
+387,2339,16,0,510,
+1,137,2340,16,0,
+237,1,143,2341,16,
+0,510,1,1901,2342,
+16,0,237,1,1048,
+2343,16,0,510,1,
+1153,2344,16,0,237,
+1,375,1463,1,151,
+2345,16,0,237,1,
+1407,2346,16,0,237,
+1,2740,2347,16,0,
+237,1,2413,2348,16,
+0,237,1,1159,2349,
+16,0,510,1,381,
+2350,16,0,237,1,
+157,2351,16,0,510,
+1,1413,2352,16,0,
+510,1,883,2353,16,
+0,510,1,1371,2354,
+16,0,237,1,328,
+1389,1,2105,900,1,
+2106,2355,16,0,237,
+1,166,2356,16,0,
+237,1,525,2357,16,
+0,237,1,1622,2358,
+16,0,237,1,406,
+2359,16,0,237,1,
+1574,885,1,172,2360,
+16,0,510,1,1931,
+946,1,412,2361,16,
+0,510,1,1933,2362,
+16,0,237,1,1876,
+2363,16,0,237,1,
+431,2364,16,0,237,
+1,1585,2365,16,0,
+237,1,182,2366,16,
+0,237,1,1628,2367,
+16,0,510,1,1189,
+2368,16,0,237,1,
+437,2369,16,0,510,
+1,1591,2370,16,0,
+510,1,188,2371,16,
+0,510,1,1695,2372,
+16,0,237,1,2198,
+2373,16,0,237,1,
+1195,2374,16,0,510,
+1,1449,2375,16,0,
+510,1,1701,2376,16,
+0,510,1,447,2377,
+16,0,237,1,199,
+2378,16,0,237,1,
+2459,967,1,1958,2379,
+16,0,237,1,2462,
+974,1,1657,979,1,
+205,2380,16,0,510,
+1,1659,2381,16,0,
+237,1,459,2382,16,
+0,237,1,462,2383,
+16,0,237,1,1665,
+2384,16,0,510,1,
+217,2385,16,0,237,
+1,2227,993,1,942,
+2386,16,0,510,1,
+1225,2387,16,0,237,
+1,223,2388,16,0,
+510,1,1479,2389,16,
+0,237,1,1731,2390,
+16,0,237,1,477,
+1635,1,1231,2391,16,
+0,510,1,479,1645,
+1,480,1650,1,1485,
+2392,16,0,510,1,
+1737,2393,16,0,510,
+1,1989,1002,1,1990,
+2394,16,0,237,1,
+1443,2395,16,0,237,
+1,236,2396,16,0,
+237,1,2136,928,1,
+476,1629,1,242,2397,
+16,0,510,1,478,
+1669,1,1939,2398,16,
+0,510,1,1001,1674,
+1,1002,1679,1,1756,
+2399,16,0,237,1,
+20,2400,19,477,1,
+20,2401,5,84,1,
+1011,1188,1,1012,2402,
+16,0,475,1,1013,
+1345,1,262,1205,1,
+1267,2403,16,0,475,
+1,515,2404,16,0,
+475,1,1521,2405,16,
+0,475,1,525,1302,
+1,283,1258,1,2299,
+2406,16,0,475,1,
+42,2407,16,0,475,
+1,40,1263,1,44,
+1269,1,47,1270,1,
+1303,2408,16,0,475,
+1,1555,2409,16,0,
+475,1,50,1287,1,
+48,1276,1,49,1282,
+1,51,1292,1,63,
+1308,1,305,1297,1,
+66,1315,1,67,1320,
+1,68,1325,1,69,
+1330,1,70,1335,1,
+73,2410,16,0,475,
+1,74,1340,1,328,
+2411,16,0,475,1,
+1048,2412,16,0,475,
+1,82,2413,16,0,
+475,1,1840,2414,16,
+0,475,1,1591,2415,
+16,0,475,1,1341,
+2416,16,0,475,1,
+1096,1399,1,93,1405,
+1,352,2417,16,0,
+475,1,107,2418,16,
+0,475,1,1114,1430,
+1,118,2419,16,0,
+475,1,1123,2420,16,
+0,475,1,371,1452,
+1,1628,2421,16,0,
+475,1,375,1463,1,
+1882,2422,16,0,475,
+1,377,1468,1,379,
+1473,1,380,1478,1,
+883,2423,16,0,475,
+1,373,1496,1,130,
+2424,16,0,475,1,
+143,2425,16,0,475,
+1,387,2426,16,0,
+475,1,1159,2427,16,
+0,475,1,157,2428,
+16,0,475,1,1413,
+2429,16,0,475,1,
+1665,2430,16,0,475,
+1,412,2431,16,0,
+475,1,1377,2432,16,
+0,475,1,172,2433,
+16,0,475,1,1939,
+2434,16,0,475,1,
+437,2435,16,0,475,
+1,188,2436,16,0,
+475,1,942,2437,16,
+0,475,1,1195,2438,
+16,0,475,1,1449,
+2439,16,0,475,1,
+1701,2440,16,0,475,
+1,447,1597,1,205,
+2441,16,0,475,1,
+827,2442,16,0,475,
+1,223,2443,16,0,
+475,1,476,1629,1,
+477,1635,1,1231,2444,
+16,0,475,1,479,
+1645,1,480,1650,1,
+1485,2445,16,0,475,
+1,1737,2446,16,0,
+475,1,2746,2447,16,
+0,475,1,242,2448,
+16,0,475,1,478,
+1669,1,1001,1674,1,
+1002,1679,1,21,2449,
+19,444,1,21,2450,
+5,84,1,1011,1188,
+1,1012,2451,16,0,
+442,1,1013,1345,1,
+262,1205,1,1267,2452,
+16,0,442,1,515,
+2453,16,0,442,1,
+1521,2454,16,0,442,
+1,525,1302,1,283,
+1258,1,2299,2455,16,
+0,442,1,42,2456,
+16,0,442,1,40,
+1263,1,44,1269,1,
+47,1270,1,1303,2457,
+16,0,442,1,1555,
+2458,16,0,442,1,
+50,1287,1,48,1276,
+1,49,1282,1,51,
+1292,1,63,1308,1,
+305,1297,1,66,1315,
+1,67,1320,1,68,
+1325,1,69,1330,1,
+70,1335,1,73,2459,
+16,0,442,1,74,
+1340,1,328,2460,16,
+0,442,1,1048,2461,
+16,0,442,1,82,
+2462,16,0,442,1,
+1840,2463,16,0,442,
+1,1591,2464,16,0,
+442,1,1341,2465,16,
+0,442,1,1096,1399,
+1,93,1405,1,352,
+2466,16,0,442,1,
+107,2467,16,0,442,
+1,1114,1430,1,118,
+2468,16,0,442,1,
+1123,2469,16,0,442,
+1,371,1452,1,1628,
+2470,16,0,442,1,
+375,1463,1,1882,2471,
+16,0,442,1,377,
+1468,1,379,1473,1,
+380,1478,1,883,2472,
+16,0,442,1,373,
+1496,1,130,2473,16,
+0,442,1,143,2474,
+16,0,442,1,387,
+2475,16,0,442,1,
+1159,2476,16,0,442,
+1,157,2477,16,0,
+442,1,1413,2478,16,
+0,442,1,1665,2479,
+16,0,442,1,412,
+2480,16,0,442,1,
+1377,2481,16,0,442,
+1,172,2482,16,0,
+442,1,1939,2483,16,
+0,442,1,437,2484,
+16,0,442,1,188,
+2485,16,0,442,1,
+942,2486,16,0,442,
+1,1195,2487,16,0,
+442,1,1449,2488,16,
+0,442,1,1701,2489,
+16,0,442,1,447,
+1597,1,205,2490,16,
+0,442,1,827,2491,
+16,0,442,1,223,
+2492,16,0,442,1,
+476,1629,1,477,1635,
+1,1231,2493,16,0,
+442,1,479,1645,1,
+480,1650,1,1485,2494,
+16,0,442,1,1737,
+2495,16,0,442,1,
+2746,2496,16,0,442,
+1,242,2497,16,0,
+442,1,478,1669,1,
+1001,1674,1,1002,1679,
+1,22,2498,19,395,
+1,22,2499,5,84,
+1,1011,1188,1,1012,
+2500,16,0,393,1,
+1013,1345,1,262,1205,
+1,1267,2501,16,0,
+393,1,515,2502,16,
+0,393,1,1521,2503,
+16,0,393,1,525,
+1302,1,283,1258,1,
+2299,2504,16,0,393,
+1,42,2505,16,0,
+393,1,40,1263,1,
+44,1269,1,47,1270,
+1,1303,2506,16,0,
+393,1,1555,2507,16,
+0,393,1,50,1287,
+1,48,1276,1,49,
+1282,1,51,1292,1,
+63,1308,1,305,1297,
+1,66,1315,1,67,
+1320,1,68,1325,1,
+69,1330,1,70,1335,
+1,73,2508,16,0,
+393,1,74,1340,1,
+328,2509,16,0,393,
+1,1048,2510,16,0,
+393,1,82,2511,16,
+0,393,1,1840,2512,
+16,0,393,1,1591,
+2513,16,0,393,1,
+1341,2514,16,0,393,
+1,1096,1399,1,93,
+1405,1,352,2515,16,
+0,393,1,107,2516,
+16,0,393,1,1114,
+1430,1,118,2517,16,
+0,393,1,1123,2518,
+16,0,393,1,371,
+1452,1,1628,2519,16,
+0,393,1,375,1463,
+1,1882,2520,16,0,
+393,1,377,1468,1,
+379,1473,1,380,1478,
+1,883,2521,16,0,
+393,1,373,1496,1,
+130,2522,16,0,393,
+1,143,2523,16,0,
+393,1,387,2524,16,
+0,393,1,1159,2525,
+16,0,393,1,157,
+2526,16,0,393,1,
+1413,2527,16,0,393,
+1,1665,2528,16,0,
+393,1,412,2529,16,
+0,393,1,1377,2530,
+16,0,393,1,172,
+2531,16,0,393,1,
+1939,2532,16,0,393,
+1,437,2533,16,0,
+393,1,188,2534,16,
+0,393,1,942,2535,
+16,0,393,1,1195,
+2536,16,0,393,1,
+1449,2537,16,0,393,
+1,1701,2538,16,0,
+393,1,447,1597,1,
+205,2539,16,0,393,
+1,827,2540,16,0,
+393,1,223,2541,16,
+0,393,1,476,1629,
+1,477,1635,1,1231,
+2542,16,0,393,1,
+479,1645,1,480,1650,
+1,1485,2543,16,0,
+393,1,1737,2544,16,
+0,393,1,2746,2545,
+16,0,393,1,242,
+2546,16,0,393,1,
+478,1669,1,1001,1674,
+1,1002,1679,1,23,
+2547,19,555,1,23,
+2548,5,38,1,1901,
+2549,16,0,553,1,
+2075,2550,16,0,553,
+1,1860,907,1,1803,
+873,1,1804,2551,16,
+0,553,1,2413,2552,
+16,0,553,1,2198,
+2553,16,0,553,1,
+1873,921,1,1657,979,
+1,1989,1002,1,1990,
+2554,16,0,553,1,
+1775,2555,16,0,553,
+1,32,2556,16,0,
+553,1,2105,900,1,
+2106,2557,16,0,553,
+1,2364,913,1,2227,
+993,1,2337,2558,16,
+0,553,1,2021,804,
+1,2458,961,1,2459,
+967,1,2462,974,1,
+2136,928,1,2464,984,
+1,2029,811,1,2030,
+817,1,2031,822,1,
+2032,827,1,2033,832,
+1,2035,838,1,2037,
+843,1,2039,848,1,
+1931,946,1,2041,854,
+1,2043,860,1,2045,
+865,1,1574,885,1,
+1958,2559,16,0,553,
+1,24,2560,19,188,
+1,24,2561,5,5,
+1,44,2562,16,0,
+186,1,377,2563,16,
+0,591,1,40,2564,
+16,0,760,1,63,
+2565,16,0,207,1,
+373,2566,16,0,587,
+1,25,2567,19,307,
+1,25,2568,5,177,
+1,256,2569,16,0,
+596,1,1261,2570,16,
+0,596,1,1011,1188,
+1,1012,2571,16,0,
+305,1,2458,961,1,
+262,1205,1,1267,2572,
+16,0,305,1,2021,
+804,1,1521,2573,16,
+0,305,1,1775,2574,
+16,0,596,1,2029,
+811,1,2030,817,1,
+2031,822,1,2032,827,
+1,2033,832,1,277,
+2575,16,0,596,1,
+2035,838,1,2037,843,
+1,2039,848,1,32,
+2576,16,0,596,1,
+2464,984,1,2293,2577,
+16,0,596,1,2043,
+860,1,2045,865,1,
+2299,2578,16,0,305,
+1,41,2579,16,0,
+596,1,42,2580,16,
+0,305,1,40,1263,
+1,44,1269,1,43,
+2581,16,0,596,1,
+1804,2582,16,0,596,
+1,48,1276,1,49,
+1282,1,47,1270,1,
+51,1292,1,52,2583,
+16,0,596,1,50,
+1287,1,305,1297,1,
+1096,1399,1,1515,2584,
+16,0,596,1,2318,
+2585,16,0,596,1,
+62,2586,16,0,596,
+1,63,1308,1,66,
+1315,1,67,1320,1,
+68,1325,1,69,1330,
+1,70,1335,1,71,
+2587,16,0,596,1,
+283,1258,1,73,2588,
+16,0,305,1,74,
+1340,1,1013,1345,1,
+76,2589,16,0,596,
+1,1834,2590,16,0,
+596,1,2337,2591,16,
+0,596,1,79,2592,
+16,0,596,1,1335,
+2593,16,0,596,1,
+299,2594,16,0,596,
+1,82,2595,16,0,
+305,1,1840,2596,16,
+0,305,1,1297,2597,
+16,0,596,1,85,
+2598,16,0,596,1,
+1341,2599,16,0,305,
+1,89,2600,16,0,
+596,1,1303,2601,16,
+0,305,1,509,2602,
+16,0,596,1,93,
+1405,1,322,2603,16,
+0,596,1,97,2604,
+16,0,596,1,2041,
+854,1,1555,2605,16,
+0,305,1,827,2606,
+16,0,305,1,102,
+2607,16,0,596,1,
+1860,907,1,1803,873,
+1,2364,913,1,107,
+2608,16,0,305,1,
+1114,1430,1,112,2609,
+16,0,596,1,1117,
+2610,16,0,596,1,
+352,1436,1,1873,921,
+1,118,1442,1,1123,
+2611,16,0,305,1,
+371,1452,1,515,2612,
+16,0,305,1,1377,
+2613,16,0,305,1,
+124,2614,16,0,596,
+1,1882,2615,16,0,
+305,1,377,1468,1,
+379,1473,1,380,1478,
+1,130,1501,1,346,
+2616,16,0,596,1,
+2075,2617,16,0,596,
+1,373,1496,1,387,
+2618,16,0,305,1,
+137,2619,16,0,596,
+1,143,2620,16,0,
+305,1,1901,2621,16,
+0,596,1,1048,1431,
+1,1153,2622,16,0,
+596,1,375,1463,1,
+151,2623,16,0,596,
+1,1407,2624,16,0,
+596,1,2740,2625,16,
+0,596,1,2413,2626,
+16,0,596,1,1159,
+2627,16,0,305,1,
+381,2628,16,0,596,
+1,157,2629,16,0,
+305,1,1413,2630,16,
+0,305,1,883,2631,
+16,0,305,1,1371,
+2632,16,0,596,1,
+328,1389,1,2105,900,
+1,2106,2633,16,0,
+596,1,166,2634,16,
+0,596,1,525,2635,
+16,0,596,1,1622,
+2636,16,0,596,1,
+406,2637,16,0,596,
+1,1574,885,1,172,
+1555,1,1931,946,1,
+412,2638,16,0,305,
+1,1933,2639,16,0,
+596,1,1876,2640,16,
+0,596,1,431,2641,
+16,0,596,1,1585,
+2642,16,0,596,1,
+182,2643,16,0,596,
+1,1628,2644,16,0,
+305,1,1189,2645,16,
+0,596,1,437,2646,
+16,0,305,1,1591,
+2647,16,0,305,1,
+188,1604,1,1695,2648,
+16,0,596,1,2198,
+2649,16,0,596,1,
+1195,2650,16,0,305,
+1,1449,2651,16,0,
+305,1,1701,2652,16,
+0,305,1,447,2653,
+16,0,596,1,199,
+2654,16,0,596,1,
+2459,967,1,1958,2655,
+16,0,596,1,2462,
+974,1,1657,979,1,
+205,2656,16,0,305,
+1,1659,2657,16,0,
+596,1,459,2658,16,
+0,596,1,462,2659,
+16,0,596,1,1665,
+2660,16,0,305,1,
+217,2661,16,0,596,
+1,2227,993,1,942,
+1576,1,1225,2662,16,
+0,596,1,223,2663,
+16,0,305,1,1479,
+2664,16,0,596,1,
+1731,2665,16,0,596,
+1,477,1635,1,1231,
+2666,16,0,305,1,
+479,1645,1,480,1650,
+1,1485,2667,16,0,
+305,1,1737,2668,16,
+0,305,1,1989,1002,
+1,1990,2669,16,0,
+596,1,1443,2670,16,
+0,596,1,236,2671,
+16,0,596,1,2136,
+928,1,476,1629,1,
+242,2672,16,0,305,
+1,478,1669,1,1939,
+2673,16,0,305,1,
+2746,2674,16,0,305,
+1,1001,1674,1,1002,
+1679,1,1756,2675,16,
+0,596,1,26,2676,
+19,323,1,26,2677,
+5,84,1,1011,1188,
+1,1012,2678,16,0,
+321,1,1013,1345,1,
+262,1205,1,1267,2679,
+16,0,321,1,515,
+2680,16,0,740,1,
+1521,2681,16,0,321,
+1,525,1302,1,283,
+1258,1,2299,2682,16,
+0,321,1,42,2683,
+16,0,321,1,40,
+1263,1,44,1269,1,
+47,1270,1,1303,2684,
+16,0,321,1,1555,
+2685,16,0,321,1,
+50,1287,1,48,1276,
+1,49,1282,1,51,
+1292,1,63,1308,1,
+305,1297,1,66,1315,
+1,67,1320,1,68,
+1325,1,69,1330,1,
+70,1335,1,73,2686,
+16,0,321,1,74,
+1340,1,328,1389,1,
+1048,1431,1,82,2687,
+16,0,321,1,1840,
+2688,16,0,321,1,
+1591,2689,16,0,321,
+1,1341,2690,16,0,
+321,1,1096,1399,1,
+93,1405,1,352,1436,
+1,107,2691,16,0,
+321,1,1114,1430,1,
+118,1442,1,1123,2692,
+16,0,321,1,371,
+1452,1,1628,2693,16,
+0,321,1,375,1463,
+1,1882,2694,16,0,
+321,1,377,1468,1,
+379,1473,1,380,1478,
+1,883,2695,16,0,
+321,1,373,1496,1,
+130,1501,1,143,2696,
+16,0,321,1,387,
+2697,16,0,321,1,
+1159,2698,16,0,321,
+1,157,2699,16,0,
+321,1,1413,2700,16,
+0,321,1,1665,2701,
+16,0,321,1,412,
+2702,16,0,321,1,
+1377,2703,16,0,321,
+1,172,1555,1,1939,
+2704,16,0,321,1,
+437,2705,16,0,665,
+1,188,1604,1,942,
+1576,1,1195,2706,16,
+0,321,1,1449,2707,
+16,0,321,1,1701,
+2708,16,0,321,1,
+447,1597,1,205,2709,
+16,0,321,1,827,
+2710,16,0,321,1,
+223,2711,16,0,321,
+1,476,1629,1,477,
+1635,1,1231,2712,16,
+0,321,1,479,1645,
+1,480,1650,1,1485,
+2713,16,0,321,1,
+1737,2714,16,0,321,
+1,2746,2715,16,0,
+321,1,242,2716,16,
+0,321,1,478,1669,
+1,1001,1674,1,1002,
+1679,1,27,2717,19,
+673,1,27,2718,5,
+95,1,256,2719,16,
+0,671,1,1261,2720,
+16,0,671,1,509,
+2721,16,0,671,1,
+1515,2722,16,0,671,
+1,2021,804,1,1775,
+2723,16,0,671,1,
+2029,811,1,2030,817,
+1,2031,822,1,2032,
+827,1,2033,832,1,
+277,2724,16,0,671,
+1,2035,838,1,2037,
+843,1,2039,848,1,
+32,2725,16,0,671,
+1,2041,854,1,2293,
+2726,16,0,671,1,
+2043,860,1,2045,865,
+1,41,2727,16,0,
+671,1,1297,2728,16,
+0,671,1,43,2729,
+16,0,671,1,1803,
+873,1,1804,2730,16,
+0,671,1,299,2731,
+16,0,671,1,52,
+2732,16,0,671,1,
+2318,2733,16,0,671,
+1,62,2734,16,0,
+671,1,2075,2735,16,
+0,671,1,1574,885,
+1,71,2736,16,0,
+671,1,76,2737,16,
+0,671,1,1834,2738,
+16,0,671,1,2337,
+2739,16,0,671,1,
+79,2740,16,0,671,
+1,1335,2741,16,0,
+671,1,322,2742,16,
+0,671,1,85,2743,
+16,0,671,1,89,
+2744,16,0,671,1,
+346,2745,16,0,671,
+1,2105,900,1,2106,
+2746,16,0,671,1,
+97,2747,16,0,671,
+1,1860,907,1,2364,
+913,1,102,2748,16,
+0,671,1,112,2749,
+16,0,671,1,1117,
+2750,16,0,671,1,
+1873,921,1,1876,2751,
+16,0,671,1,124,
+2752,16,0,671,1,
+2136,928,1,381,2753,
+16,0,671,1,525,
+2754,16,0,671,1,
+137,2755,16,0,671,
+1,1901,2756,16,0,
+671,1,1153,2757,16,
+0,671,1,151,2758,
+16,0,671,1,1407,
+2759,16,0,671,1,
+1659,2760,16,0,671,
+1,2413,2761,16,0,
+671,1,406,2762,16,
+0,671,1,1371,2763,
+16,0,671,1,166,
+2764,16,0,671,1,
+1622,2765,16,0,671,
+1,1931,946,1,1933,
+2766,16,0,671,1,
+431,2767,16,0,671,
+1,1585,2768,16,0,
+671,1,182,2769,16,
+0,671,1,1189,2770,
+16,0,671,1,1443,
+2771,16,0,671,1,
+1695,2772,16,0,671,
+1,2198,2773,16,0,
+671,1,447,2774,16,
+0,671,1,2458,961,
+1,2459,967,1,1958,
+2775,16,0,671,1,
+2462,974,1,1657,979,
+1,2464,984,1,199,
+2776,16,0,671,1,
+459,2777,16,0,671,
+1,462,2778,16,0,
+671,1,217,2779,16,
+0,671,1,2227,993,
+1,1225,2780,16,0,
+671,1,1479,2781,16,
+0,671,1,1731,2782,
+16,0,671,1,2740,
+2783,16,0,671,1,
+1989,1002,1,1990,2784,
+16,0,671,1,236,
+2785,16,0,671,1,
+1756,2786,16,0,671,
+1,28,2787,19,705,
+1,28,2788,5,60,
+1,328,1389,1,223,
+1619,1,1096,1399,1,
+118,1442,1,883,1484,
+1,525,1302,1,1001,
+1674,1,130,1501,1,
+459,1863,1,1114,1430,
+1,352,1436,1,447,
+1597,1,464,1856,1,
+1011,1188,1,1013,1345,
+1,242,1664,1,143,
+1506,1,40,1263,1,
+41,1830,1,42,1834,
+1,479,1645,1,44,
+1269,1,481,1865,1,
+373,1496,1,47,1270,
+1,157,1529,1,49,
+1282,1,50,1287,1,
+48,1276,1,379,1473,
+1,380,1478,1,51,
+1292,1,476,1629,1,
+371,1452,1,478,1669,
+1,1048,1431,1,375,
+1463,1,172,1555,1,
+262,1205,1,283,1258,
+1,63,1308,1,67,
+1320,1,68,1325,1,
+69,1330,1,66,1315,
+1,461,2789,16,0,
+703,1,74,1340,1,
+377,1468,1,1002,1679,
+1,70,1335,1,188,
+1604,1,82,1367,1,
+305,1297,1,477,1635,
+1,827,1418,1,93,
+1405,1,480,1650,1,
+205,1609,1,942,1576,
+1,107,1425,1,29,
+2790,19,295,1,29,
+2791,5,84,1,1011,
+1188,1,1012,2792,16,
+0,293,1,1013,1345,
+1,262,1205,1,1267,
+2793,16,0,293,1,
+515,2794,16,0,293,
+1,1521,2795,16,0,
+293,1,525,1302,1,
+283,1258,1,2299,2796,
+16,0,293,1,42,
+2797,16,0,293,1,
+40,1263,1,44,1269,
+1,47,1270,1,1303,
+2798,16,0,293,1,
+1555,2799,16,0,293,
+1,50,1287,1,48,
+1276,1,49,1282,1,
+51,1292,1,63,1308,
+1,305,1297,1,66,
+1315,1,67,1320,1,
+68,1325,1,69,1330,
+1,70,1335,1,73,
+2800,16,0,293,1,
+74,1340,1,328,1389,
+1,1048,1431,1,82,
+2801,16,0,293,1,
+1840,2802,16,0,293,
+1,1591,2803,16,0,
+293,1,1341,2804,16,
+0,293,1,1096,1399,
+1,93,1405,1,352,
+1436,1,107,2805,16,
+0,293,1,1114,1430,
+1,118,1442,1,1123,
+2806,16,0,293,1,
+371,1452,1,1628,2807,
+16,0,293,1,375,
+1463,1,1882,2808,16,
+0,293,1,377,1468,
+1,379,1473,1,380,
+1478,1,883,2809,16,
+0,293,1,373,1496,
+1,130,1501,1,143,
+1506,1,387,2810,16,
+0,293,1,1159,2811,
+16,0,293,1,157,
+1529,1,1413,2812,16,
+0,293,1,1665,2813,
+16,0,293,1,412,
+2814,16,0,293,1,
+1377,2815,16,0,293,
+1,172,1555,1,1939,
+2816,16,0,293,1,
+437,2817,16,0,293,
+1,188,1604,1,942,
+1576,1,1195,2818,16,
+0,293,1,1449,2819,
+16,0,293,1,1701,
+2820,16,0,293,1,
+447,1597,1,205,2821,
+16,0,293,1,827,
+2822,16,0,293,1,
+223,2823,16,0,293,
+1,476,1629,1,477,
+1635,1,1231,2824,16,
+0,293,1,479,1645,
+1,480,1650,1,1485,
+2825,16,0,293,1,
+1737,2826,16,0,293,
+1,2746,2827,16,0,
+293,1,242,2828,16,
+0,293,1,478,1669,
+1,1001,1674,1,1002,
+1679,1,30,2829,19,
+282,1,30,2830,5,
+84,1,1011,1188,1,
+1012,2831,16,0,280,
+1,1013,1345,1,262,
+1205,1,1267,2832,16,
+0,280,1,515,2833,
+16,0,280,1,1521,
+2834,16,0,280,1,
+525,1302,1,283,1258,
+1,2299,2835,16,0,
+280,1,42,2836,16,
+0,280,1,40,1263,
+1,44,1269,1,47,
+1270,1,1303,2837,16,
+0,280,1,1555,2838,
+16,0,280,1,50,
+1287,1,48,1276,1,
+49,1282,1,51,1292,
+1,63,1308,1,305,
+1297,1,66,1315,1,
+67,1320,1,68,1325,
+1,69,1330,1,70,
+1335,1,73,2839,16,
+0,280,1,74,1340,
+1,328,1389,1,1048,
+1431,1,82,2840,16,
+0,280,1,1840,2841,
+16,0,280,1,1591,
+2842,16,0,280,1,
+1341,2843,16,0,280,
+1,1096,1399,1,93,
+1405,1,352,1436,1,
+107,2844,16,0,280,
+1,1114,1430,1,118,
+1442,1,1123,2845,16,
+0,280,1,371,1452,
+1,1628,2846,16,0,
+280,1,375,1463,1,
+1882,2847,16,0,280,
+1,377,1468,1,379,
+1473,1,380,1478,1,
+883,2848,16,0,280,
+1,373,1496,1,130,
+1501,1,143,1506,1,
+387,2849,16,0,280,
+1,1159,2850,16,0,
+280,1,157,1529,1,
+1413,2851,16,0,280,
+1,1665,2852,16,0,
+280,1,412,2853,16,
+0,280,1,1377,2854,
+16,0,280,1,172,
+1555,1,1939,2855,16,
+0,280,1,437,2856,
+16,0,280,1,188,
+1604,1,942,1576,1,
+1195,2857,16,0,280,
+1,1449,2858,16,0,
+280,1,1701,2859,16,
+0,280,1,447,1597,
+1,205,2860,16,0,
+280,1,827,2861,16,
+0,280,1,223,2862,
+16,0,280,1,476,
+1629,1,477,1635,1,
+1231,2863,16,0,280,
+1,479,1645,1,480,
+1650,1,1485,2864,16,
+0,280,1,1737,2865,
+16,0,280,1,2746,
+2866,16,0,280,1,
+242,2867,16,0,280,
+1,478,1669,1,1001,
+1674,1,1002,1679,1,
+31,2868,19,268,1,
+31,2869,5,84,1,
+1011,1188,1,1012,2870,
+16,0,266,1,1013,
+1345,1,262,1205,1,
+1267,2871,16,0,266,
+1,515,2872,16,0,
+266,1,1521,2873,16,
+0,266,1,525,1302,
+1,283,1258,1,2299,
+2874,16,0,266,1,
+42,2875,16,0,266,
+1,40,1263,1,44,
+1269,1,47,1270,1,
+1303,2876,16,0,266,
+1,1555,2877,16,0,
+266,1,50,1287,1,
+48,1276,1,49,1282,
+1,51,1292,1,63,
+1308,1,305,1297,1,
+66,1315,1,67,1320,
+1,68,1325,1,69,
+1330,1,70,1335,1,
+73,2878,16,0,266,
+1,74,1340,1,328,
+1389,1,1048,1431,1,
+82,2879,16,0,266,
+1,1840,2880,16,0,
+266,1,1591,2881,16,
+0,266,1,1341,2882,
+16,0,266,1,1096,
+1399,1,93,1405,1,
+352,1436,1,107,2883,
+16,0,266,1,1114,
+1430,1,118,1442,1,
+1123,2884,16,0,266,
+1,371,1452,1,1628,
+2885,16,0,266,1,
+375,1463,1,1882,2886,
+16,0,266,1,377,
+1468,1,379,1473,1,
+380,1478,1,883,2887,
+16,0,266,1,373,
+1496,1,130,1501,1,
+143,2888,16,0,266,
+1,387,2889,16,0,
+266,1,1159,2890,16,
+0,266,1,157,2891,
+16,0,266,1,1413,
+2892,16,0,266,1,
+1665,2893,16,0,266,
+1,412,2894,16,0,
+266,1,1377,2895,16,
+0,266,1,172,1555,
+1,1939,2896,16,0,
+266,1,437,2897,16,
+0,266,1,188,1604,
+1,942,1576,1,1195,
+2898,16,0,266,1,
+1449,2899,16,0,266,
+1,1701,2900,16,0,
+266,1,447,1597,1,
+205,2901,16,0,266,
+1,827,2902,16,0,
+266,1,223,2903,16,
+0,266,1,476,1629,
+1,477,1635,1,1231,
+2904,16,0,266,1,
+479,1645,1,480,1650,
+1,1485,2905,16,0,
+266,1,1737,2906,16,
+0,266,1,2746,2907,
+16,0,266,1,242,
+2908,16,0,266,1,
+478,1669,1,1001,1674,
+1,1002,1679,1,32,
+2909,19,261,1,32,
+2910,5,84,1,1011,
+1188,1,1012,2911,16,
+0,259,1,1013,1345,
+1,262,1205,1,1267,
+2912,16,0,259,1,
+515,2913,16,0,259,
+1,1521,2914,16,0,
+259,1,525,1302,1,
+283,1258,1,2299,2915,
+16,0,259,1,42,
+2916,16,0,259,1,
+40,1263,1,44,1269,
+1,47,1270,1,1303,
+2917,16,0,259,1,
+1555,2918,16,0,259,
+1,50,1287,1,48,
+1276,1,49,1282,1,
+51,1292,1,63,1308,
+1,305,1297,1,66,
+1315,1,67,1320,1,
+68,1325,1,69,1330,
+1,70,1335,1,73,
+2919,16,0,259,1,
+74,1340,1,328,1389,
+1,1048,1431,1,82,
+2920,16,0,259,1,
+1840,2921,16,0,259,
+1,1591,2922,16,0,
+259,1,1341,2923,16,
+0,259,1,1096,1399,
+1,93,1405,1,352,
+1436,1,107,2924,16,
+0,259,1,1114,1430,
+1,118,1442,1,1123,
+2925,16,0,259,1,
+371,1452,1,1628,2926,
+16,0,259,1,375,
+1463,1,1882,2927,16,
+0,259,1,377,1468,
+1,379,1473,1,380,
+1478,1,883,2928,16,
+0,259,1,373,1496,
+1,130,1501,1,143,
+2929,16,0,259,1,
+387,2930,16,0,259,
+1,1159,2931,16,0,
+259,1,157,2932,16,
+0,259,1,1413,2933,
+16,0,259,1,1665,
+2934,16,0,259,1,
+412,2935,16,0,259,
+1,1377,2936,16,0,
+259,1,172,1555,1,
+1939,2937,16,0,259,
+1,437,2938,16,0,
+259,1,188,1604,1,
+942,1576,1,1195,2939,
+16,0,259,1,1449,
+2940,16,0,259,1,
+1701,2941,16,0,259,
+1,447,1597,1,205,
+2942,16,0,259,1,
+827,2943,16,0,259,
+1,223,2944,16,0,
+259,1,476,1629,1,
+477,1635,1,1231,2945,
+16,0,259,1,479,
+1645,1,480,1650,1,
+1485,2946,16,0,259,
+1,1737,2947,16,0,
+259,1,2746,2948,16,
+0,259,1,242,2949,
+16,0,259,1,478,
+1669,1,1001,1674,1,
+1002,1679,1,33,2950,
+19,346,1,33,2951,
+5,84,1,1011,1188,
+1,1012,2952,16,0,
+344,1,1013,1345,1,
+262,1205,1,1267,2953,
+16,0,344,1,515,
+2954,16,0,344,1,
+1521,2955,16,0,344,
+1,525,1302,1,283,
+1258,1,2299,2956,16,
+0,344,1,42,2957,
+16,0,344,1,40,
+1263,1,44,1269,1,
+47,1270,1,1303,2958,
+16,0,344,1,1555,
+2959,16,0,344,1,
+50,1287,1,48,1276,
+1,49,1282,1,51,
+1292,1,63,1308,1,
+305,1297,1,66,1315,
+1,67,1320,1,68,
+1325,1,69,1330,1,
+70,1335,1,73,2960,
+16,0,344,1,74,
+1340,1,328,1389,1,
+1048,1431,1,82,2961,
+16,0,344,1,1840,
+2962,16,0,344,1,
+1591,2963,16,0,344,
+1,1341,2964,16,0,
+344,1,1096,1399,1,
+93,1405,1,352,1436,
+1,107,2965,16,0,
+344,1,1114,1430,1,
+118,1442,1,1123,2966,
+16,0,344,1,371,
+1452,1,1628,2967,16,
+0,344,1,375,1463,
+1,1882,2968,16,0,
+344,1,377,1468,1,
+379,1473,1,380,1478,
+1,883,2969,16,0,
+344,1,373,1496,1,
+130,1501,1,143,1506,
+1,387,2970,16,0,
+344,1,1159,2971,16,
+0,344,1,157,1529,
+1,1413,2972,16,0,
+344,1,1665,2973,16,
+0,344,1,412,2974,
+16,0,344,1,1377,
+2975,16,0,344,1,
+172,1555,1,1939,2976,
+16,0,344,1,437,
+2977,16,0,344,1,
+188,1604,1,942,1576,
+1,1195,2978,16,0,
+344,1,1449,2979,16,
+0,344,1,1701,2980,
+16,0,344,1,447,
+1597,1,205,2981,16,
+0,344,1,827,2982,
+16,0,344,1,223,
+2983,16,0,344,1,
+476,1629,1,477,1635,
+1,1231,2984,16,0,
+344,1,479,1645,1,
+480,1650,1,1485,2985,
+16,0,344,1,1737,
+2986,16,0,344,1,
+2746,2987,16,0,344,
+1,242,1664,1,478,
+1669,1,1001,1674,1,
+1002,1679,1,34,2988,
+19,336,1,34,2989,
+5,84,1,1011,1188,
+1,1012,2990,16,0,
+334,1,1013,1345,1,
+262,1205,1,1267,2991,
+16,0,334,1,515,
+2992,16,0,334,1,
+1521,2993,16,0,334,
+1,525,1302,1,283,
+1258,1,2299,2994,16,
+0,334,1,42,2995,
+16,0,334,1,40,
+1263,1,44,1269,1,
+47,1270,1,1303,2996,
+16,0,334,1,1555,
+2997,16,0,334,1,
+50,1287,1,48,1276,
+1,49,1282,1,51,
+1292,1,63,1308,1,
+305,1297,1,66,1315,
+1,67,1320,1,68,
+1325,1,69,1330,1,
+70,1335,1,73,2998,
+16,0,334,1,74,
+1340,1,328,1389,1,
+1048,1431,1,82,2999,
+16,0,334,1,1840,
+3000,16,0,334,1,
+1591,3001,16,0,334,
+1,1341,3002,16,0,
+334,1,1096,1399,1,
+93,1405,1,352,1436,
+1,107,3003,16,0,
+334,1,1114,1430,1,
+118,1442,1,1123,3004,
+16,0,334,1,371,
+1452,1,1628,3005,16,
+0,334,1,375,1463,
+1,1882,3006,16,0,
+334,1,377,1468,1,
+379,1473,1,380,1478,
+1,883,3007,16,0,
+334,1,373,1496,1,
+130,1501,1,143,1506,
+1,387,3008,16,0,
+334,1,1159,3009,16,
+0,334,1,157,1529,
+1,1413,3010,16,0,
+334,1,1665,3011,16,
+0,334,1,412,3012,
+16,0,334,1,1377,
+3013,16,0,334,1,
+172,1555,1,1939,3014,
+16,0,334,1,437,
+3015,16,0,334,1,
+188,1604,1,942,1576,
+1,1195,3016,16,0,
+334,1,1449,3017,16,
+0,334,1,1701,3018,
+16,0,334,1,447,
+1597,1,205,1609,1,
+827,3019,16,0,334,
+1,223,1619,1,476,
+1629,1,477,1635,1,
+1231,3020,16,0,334,
+1,479,1645,1,480,
+1650,1,1485,3021,16,
+0,334,1,1737,3022,
+16,0,334,1,2746,
+3023,16,0,334,1,
+242,1664,1,478,1669,
+1,1001,1674,1,1002,
+1679,1,35,3024,19,
+326,1,35,3025,5,
+84,1,1011,1188,1,
+1012,3026,16,0,324,
+1,1013,1345,1,262,
+1205,1,1267,3027,16,
+0,324,1,515,3028,
+16,0,324,1,1521,
+3029,16,0,324,1,
+525,1302,1,283,1258,
+1,2299,3030,16,0,
+324,1,42,3031,16,
+0,324,1,40,1263,
+1,44,1269,1,47,
+1270,1,1303,3032,16,
+0,324,1,1555,3033,
+16,0,324,1,50,
+1287,1,48,1276,1,
+49,1282,1,51,1292,
+1,63,1308,1,305,
+1297,1,66,1315,1,
+67,1320,1,68,1325,
+1,69,1330,1,70,
+1335,1,73,3034,16,
+0,324,1,74,1340,
+1,328,1389,1,1048,
+1431,1,82,3035,16,
+0,324,1,1840,3036,
+16,0,324,1,1591,
+3037,16,0,324,1,
+1341,3038,16,0,324,
+1,1096,1399,1,93,
+1405,1,352,1436,1,
+107,3039,16,0,324,
+1,1114,1430,1,118,
+1442,1,1123,3040,16,
+0,324,1,371,1452,
+1,1628,3041,16,0,
+324,1,375,1463,1,
+1882,3042,16,0,324,
+1,377,1468,1,379,
+1473,1,380,1478,1,
+883,3043,16,0,324,
+1,373,1496,1,130,
+1501,1,143,1506,1,
+387,3044,16,0,324,
+1,1159,3045,16,0,
+324,1,157,1529,1,
+1413,3046,16,0,324,
+1,1665,3047,16,0,
+324,1,412,3048,16,
+0,324,1,1377,3049,
+16,0,324,1,172,
+1555,1,1939,3050,16,
+0,324,1,437,3051,
+16,0,324,1,188,
+1604,1,942,1576,1,
+1195,3052,16,0,324,
+1,1449,3053,16,0,
+324,1,1701,3054,16,
+0,324,1,447,1597,
+1,205,1609,1,827,
+3055,16,0,324,1,
+223,3056,16,0,324,
+1,476,1629,1,477,
+1635,1,1231,3057,16,
+0,324,1,479,1645,
+1,480,1650,1,1485,
+3058,16,0,324,1,
+1737,3059,16,0,324,
+1,2746,3060,16,0,
+324,1,242,1664,1,
+478,1669,1,1001,1674,
+1,1002,1679,1,36,
+3061,19,227,1,36,
+3062,5,94,1,256,
+3063,16,0,225,1,
+1261,3064,16,0,225,
+1,509,3065,16,0,
+225,1,1515,3066,16,
+0,225,1,2021,804,
+1,1775,3067,16,0,
+225,1,2029,811,1,
+2030,817,1,2031,822,
+1,2032,827,1,2033,
+832,1,277,3068,16,
+0,225,1,2035,838,
+1,2037,843,1,2039,
+848,1,32,3069,16,
+0,225,1,2041,854,
+1,2293,3070,16,0,
+225,1,2043,860,1,
+2045,865,1,41,3071,
+16,0,225,1,1297,
+3072,16,0,225,1,
+43,3073,16,0,225,
+1,1803,873,1,1804,
+3074,16,0,225,1,
+299,3075,16,0,225,
+1,52,3076,16,0,
+225,1,2318,3077,16,
+0,225,1,2075,3078,
+16,0,225,1,1574,
+885,1,71,3079,16,
+0,225,1,76,3080,
+16,0,225,1,1834,
+3081,16,0,225,1,
+2337,3082,16,0,225,
+1,79,3083,16,0,
+225,1,1335,3084,16,
+0,225,1,322,3085,
+16,0,225,1,85,
+3086,16,0,225,1,
+89,3087,16,0,225,
+1,346,3088,16,0,
+225,1,2105,900,1,
+2106,3089,16,0,225,
+1,97,3090,16,0,
+225,1,1860,907,1,
+2364,913,1,102,3091,
+16,0,225,1,112,
+3092,16,0,225,1,
+1117,3093,16,0,225,
+1,1873,921,1,1876,
+3094,16,0,225,1,
+124,3095,16,0,225,
+1,2136,928,1,381,
+3096,16,0,225,1,
+525,3097,16,0,225,
+1,137,3098,16,0,
+225,1,1901,3099,16,
+0,225,1,1153,3100,
+16,0,225,1,151,
+3101,16,0,225,1,
+1407,3102,16,0,225,
+1,1659,3103,16,0,
+225,1,2413,3104,16,
+0,225,1,406,3105,
+16,0,225,1,1371,
+3106,16,0,225,1,
+166,3107,16,0,225,
+1,1622,3108,16,0,
+225,1,1931,946,1,
+1933,3109,16,0,225,
+1,431,3110,16,0,
+225,1,1585,3111,16,
+0,225,1,182,3112,
+16,0,225,1,1189,
+3113,16,0,225,1,
+1443,3114,16,0,225,
+1,1695,3115,16,0,
+225,1,2198,3116,16,
+0,225,1,447,3117,
+16,0,225,1,2458,
+961,1,2459,967,1,
+1958,3118,16,0,225,
+1,2462,974,1,1657,
+979,1,2464,984,1,
+199,3119,16,0,225,
+1,459,3120,16,0,
+225,1,462,3121,16,
+0,225,1,217,3122,
+16,0,225,1,2227,
+993,1,1225,3123,16,
+0,225,1,1479,3124,
+16,0,225,1,1731,
+3125,16,0,225,1,
+2740,3126,16,0,225,
+1,1989,1002,1,1990,
+3127,16,0,225,1,
+236,3128,16,0,225,
+1,1756,3129,16,0,
+225,1,37,3130,19,
+251,1,37,3131,5,
+94,1,256,3132,16,
+0,249,1,1261,3133,
+16,0,249,1,509,
+3134,16,0,249,1,
+1515,3135,16,0,249,
+1,2021,804,1,1775,
+3136,16,0,249,1,
+2029,811,1,2030,817,
+1,2031,822,1,2032,
+827,1,2033,832,1,
+277,3137,16,0,249,
+1,2035,838,1,2037,
+843,1,2039,848,1,
+32,3138,16,0,249,
+1,2041,854,1,2293,
+3139,16,0,249,1,
+2043,860,1,2045,865,
+1,41,3140,16,0,
+249,1,1297,3141,16,
+0,249,1,43,3142,
+16,0,249,1,1803,
+873,1,1804,3143,16,
+0,249,1,299,3144,
+16,0,249,1,52,
+3145,16,0,249,1,
+2318,3146,16,0,249,
+1,2075,3147,16,0,
+249,1,1574,885,1,
+71,3148,16,0,249,
+1,76,3149,16,0,
+249,1,1834,3150,16,
+0,249,1,2337,3151,
+16,0,249,1,79,
+3152,16,0,249,1,
+1335,3153,16,0,249,
+1,322,3154,16,0,
+249,1,85,3155,16,
+0,249,1,89,3156,
+16,0,249,1,346,
+3157,16,0,249,1,
+2105,900,1,2106,3158,
+16,0,249,1,97,
+3159,16,0,249,1,
+1860,907,1,2364,913,
+1,102,3160,16,0,
+249,1,112,3161,16,
+0,249,1,1117,3162,
+16,0,249,1,1873,
+921,1,1876,3163,16,
+0,249,1,124,3164,
+16,0,249,1,2136,
+928,1,381,3165,16,
+0,249,1,525,3166,
+16,0,249,1,137,
+3167,16,0,249,1,
+1901,3168,16,0,249,
+1,1153,3169,16,0,
+249,1,151,3170,16,
+0,249,1,1407,3171,
+16,0,249,1,1659,
+3172,16,0,249,1,
+2413,3173,16,0,249,
+1,406,3174,16,0,
+249,1,1371,3175,16,
+0,249,1,166,3176,
+16,0,249,1,1622,
+3177,16,0,249,1,
+1931,946,1,1933,3178,
+16,0,249,1,431,
+3179,16,0,249,1,
+1585,3180,16,0,249,
+1,182,3181,16,0,
+249,1,1189,3182,16,
+0,249,1,1443,3183,
+16,0,249,1,1695,
+3184,16,0,249,1,
+2198,3185,16,0,249,
+1,447,3186,16,0,
+249,1,2458,961,1,
+2459,967,1,1958,3187,
+16,0,249,1,2462,
+974,1,1657,979,1,
+2464,984,1,199,3188,
+16,0,249,1,459,
+3189,16,0,249,1,
+462,3190,16,0,249,
+1,217,3191,16,0,
+249,1,2227,993,1,
+1225,3192,16,0,249,
+1,1479,3193,16,0,
+249,1,1731,3194,16,
+0,249,1,2740,3195,
+16,0,249,1,1989,
+1002,1,1990,3196,16,
+0,249,1,236,3197,
+16,0,249,1,1756,
+3198,16,0,249,1,
+38,3199,19,247,1,
+38,3200,5,84,1,
+1011,1188,1,1012,3201,
+16,0,245,1,1013,
+1345,1,262,1205,1,
+1267,3202,16,0,245,
+1,515,3203,16,0,
+245,1,1521,3204,16,
+0,245,1,525,1302,
+1,283,1258,1,2299,
+3205,16,0,245,1,
+42,3206,16,0,245,
+1,40,1263,1,44,
+1269,1,47,1270,1,
+1303,3207,16,0,245,
+1,1555,3208,16,0,
+245,1,50,1287,1,
+48,1276,1,49,1282,
+1,51,1292,1,63,
+1308,1,305,1297,1,
+66,1315,1,67,1320,
+1,68,1325,1,69,
+1330,1,70,1335,1,
+73,3209,16,0,245,
+1,74,1340,1,328,
+1389,1,1048,1431,1,
+82,3210,16,0,245,
+1,1840,3211,16,0,
+245,1,1591,3212,16,
+0,245,1,1341,3213,
+16,0,245,1,1096,
+1399,1,93,1405,1,
+352,1436,1,107,3214,
+16,0,245,1,1114,
+1430,1,118,1442,1,
+1123,3215,16,0,245,
+1,371,1452,1,1628,
+3216,16,0,245,1,
+375,1463,1,1882,3217,
+16,0,245,1,377,
+1468,1,379,1473,1,
+380,1478,1,883,1484,
+1,373,1496,1,130,
+1501,1,143,1506,1,
+387,3218,16,0,245,
+1,1159,3219,16,0,
+245,1,157,1529,1,
+1413,3220,16,0,245,
+1,1665,3221,16,0,
+245,1,412,3222,16,
+0,245,1,1377,3223,
+16,0,245,1,172,
+1555,1,1939,3224,16,
+0,245,1,437,3225,
+16,0,245,1,188,
+1604,1,942,1576,1,
+1195,3226,16,0,245,
+1,1449,3227,16,0,
+245,1,1701,3228,16,
+0,245,1,447,1597,
+1,205,1609,1,827,
+1418,1,223,1619,1,
+476,1629,1,477,1635,
+1,1231,3229,16,0,
+245,1,479,1645,1,
+480,1650,1,1485,3230,
+16,0,245,1,1737,
+3231,16,0,245,1,
+2746,3232,16,0,245,
+1,242,1664,1,478,
+1669,1,1001,1674,1,
+1002,1679,1,39,3233,
+19,233,1,39,3234,
+5,84,1,1011,1188,
+1,1012,3235,16,0,
+231,1,1013,1345,1,
+262,1205,1,1267,3236,
+16,0,231,1,515,
+3237,16,0,231,1,
+1521,3238,16,0,231,
+1,525,1302,1,283,
+1258,1,2299,3239,16,
+0,231,1,42,3240,
+16,0,231,1,40,
+1263,1,44,1269,1,
+47,1270,1,1303,3241,
+16,0,231,1,1555,
+3242,16,0,231,1,
+50,1287,1,48,1276,
+1,49,1282,1,51,
+1292,1,63,1308,1,
+305,1297,1,66,1315,
+1,67,1320,1,68,
+1325,1,69,1330,1,
+70,1335,1,73,3243,
+16,0,231,1,74,
+1340,1,328,1389,1,
+1048,1431,1,82,3244,
+16,0,231,1,1840,
+3245,16,0,231,1,
+1591,3246,16,0,231,
+1,1341,3247,16,0,
+231,1,1096,1399,1,
+93,1405,1,352,1436,
+1,107,3248,16,0,
+231,1,1114,1430,1,
+118,1442,1,1123,3249,
+16,0,231,1,371,
+1452,1,1628,3250,16,
+0,231,1,375,1463,
+1,1882,3251,16,0,
+231,1,377,1468,1,
+379,1473,1,380,1478,
+1,883,1484,1,373,
+1496,1,130,1501,1,
+143,1506,1,387,3252,
 16,0,231,1,1159,
-2292,16,0,507,1,
-381,2293,16,0,231,
-1,157,2294,16,0,
-507,1,1413,2295,16,
-0,507,1,883,2296,
-16,0,507,1,1371,
-2297,16,0,231,1,
-328,1366,1,2105,878,
-1,2106,2298,16,0,
-231,1,166,2299,16,
-0,231,1,525,2300,
-16,0,231,1,1622,
-2301,16,0,231,1,
-406,2302,16,0,231,
-1,1574,863,1,172,
-2303,16,0,507,1,
-1931,925,1,412,2304,
-16,0,507,1,1933,
-2305,16,0,231,1,
-1876,2306,16,0,231,
-1,431,2307,16,0,
-231,1,1585,2308,16,
-0,231,1,182,2309,
-16,0,231,1,1628,
-2310,16,0,507,1,
-1189,2311,16,0,231,
-1,437,2312,16,0,
-507,1,1591,2313,16,
-0,507,1,188,2314,
-16,0,507,1,1695,
-2315,16,0,231,1,
-2198,2316,16,0,231,
-1,1195,2317,16,0,
-507,1,1449,2318,16,
-0,507,1,1701,2319,
-16,0,507,1,447,
-2320,16,0,231,1,
-199,2321,16,0,231,
-1,2459,946,1,1958,
-2322,16,0,231,1,
-2462,953,1,1657,958,
-1,205,2323,16,0,
-507,1,459,2324,16,
-0,231,1,462,2325,
+3253,16,0,231,1,
+157,1529,1,1413,3254,
 16,0,231,1,1665,
-2326,16,0,507,1,
-2724,2327,16,0,507,
-1,2718,2328,16,0,
-231,1,217,2329,16,
-0,231,1,2227,972,
-1,942,2330,16,0,
-507,1,1225,2331,16,
-0,231,1,223,2332,
-16,0,507,1,1479,
-2333,16,0,231,1,
-1731,2334,16,0,231,
-1,477,1614,1,1231,
-2335,16,0,507,1,
-479,1624,1,480,1629,
-1,1485,2336,16,0,
-507,1,1737,2337,16,
-0,507,1,1989,980,
-1,1990,2338,16,0,
-231,1,1443,2339,16,
-0,231,1,236,2340,
-16,0,231,1,2136,
-906,1,476,1608,1,
-242,2341,16,0,507,
-1,478,1647,1,1939,
-2342,16,0,507,1,
-1001,1652,1,1002,1657,
-1,1756,2343,16,0,
-231,1,20,2344,19,
-484,1,20,2345,5,
-84,1,1011,1166,1,
-1012,2346,16,0,482,
-1,1013,1322,1,262,
-1183,1,1267,2347,16,
-0,482,1,515,2348,
-16,0,482,1,1521,
-2349,16,0,482,1,
-525,1280,1,283,1236,
-1,2299,2350,16,0,
-482,1,42,2351,16,
-0,482,1,40,1241,
-1,44,1247,1,47,
-1248,1,1303,2352,16,
-0,482,1,1555,2353,
-16,0,482,1,50,
-1265,1,48,1254,1,
-49,1260,1,51,1270,
-1,63,1286,1,305,
-1275,1,66,1292,1,
-67,1297,1,68,1302,
-1,69,1307,1,70,
-1312,1,73,2354,16,
-0,482,1,74,1317,
-1,328,2355,16,0,
-482,1,1048,2356,16,
-0,482,1,82,2357,
-16,0,482,1,1840,
-2358,16,0,482,1,
-1591,2359,16,0,482,
-1,1341,2360,16,0,
-482,1,1096,1376,1,
-93,1382,1,352,2361,
-16,0,482,1,107,
-2362,16,0,482,1,
-1114,1407,1,118,2363,
-16,0,482,1,1123,
-2364,16,0,482,1,
-371,1429,1,1628,2365,
-16,0,482,1,375,
-1440,1,1882,2366,16,
-0,482,1,377,1445,
-1,379,1450,1,380,
-1455,1,883,2367,16,
-0,482,1,373,1473,
-1,130,2368,16,0,
-482,1,143,2369,16,
-0,482,1,387,2370,
-16,0,482,1,1159,
-2371,16,0,482,1,
-157,2372,16,0,482,
-1,1413,2373,16,0,
-482,1,1665,2374,16,
-0,482,1,412,2375,
-16,0,482,1,1377,
-2376,16,0,482,1,
-172,2377,16,0,482,
-1,1939,2378,16,0,
-482,1,437,2379,16,
-0,482,1,188,2380,
-16,0,482,1,942,
-2381,16,0,482,1,
-1195,2382,16,0,482,
-1,1449,2383,16,0,
-482,1,1701,2384,16,
-0,482,1,447,1574,
-1,205,2385,16,0,
-482,1,827,2386,16,
-0,482,1,2724,2387,
-16,0,482,1,223,
-2388,16,0,482,1,
-476,1608,1,477,1614,
-1,1231,2389,16,0,
-482,1,479,1624,1,
-480,1629,1,1485,2390,
-16,0,482,1,1737,
-2391,16,0,482,1,
-242,2392,16,0,482,
-1,478,1647,1,1001,
-1652,1,1002,1657,1,
-21,2393,19,449,1,
-21,2394,5,84,1,
-1011,1166,1,1012,2395,
-16,0,447,1,1013,
-1322,1,262,1183,1,
-1267,2396,16,0,447,
-1,515,2397,16,0,
-447,1,1521,2398,16,
-0,447,1,525,1280,
-1,283,1236,1,2299,
-2399,16,0,447,1,
-42,2400,16,0,447,
-1,40,1241,1,44,
-1247,1,47,1248,1,
-1303,2401,16,0,447,
-1,1555,2402,16,0,
-447,1,50,1265,1,
-48,1254,1,49,1260,
-1,51,1270,1,63,
-1286,1,305,1275,1,
-66,1292,1,67,1297,
-1,68,1302,1,69,
-1307,1,70,1312,1,
-73,2403,16,0,447,
-1,74,1317,1,328,
-2404,16,0,447,1,
-1048,2405,16,0,447,
-1,82,2406,16,0,
-447,1,1840,2407,16,
-0,447,1,1591,2408,
-16,0,447,1,1341,
-2409,16,0,447,1,
-1096,1376,1,93,1382,
-1,352,2410,16,0,
-447,1,107,2411,16,
-0,447,1,1114,1407,
-1,118,2412,16,0,
-447,1,1123,2413,16,
-0,447,1,371,1429,
-1,1628,2414,16,0,
-447,1,375,1440,1,
-1882,2415,16,0,447,
-1,377,1445,1,379,
-1450,1,380,1455,1,
-883,2416,16,0,447,
-1,373,1473,1,130,
-2417,16,0,447,1,
-143,2418,16,0,447,
-1,387,2419,16,0,
-447,1,1159,2420,16,
-0,447,1,157,2421,
-16,0,447,1,1413,
-2422,16,0,447,1,
-1665,2423,16,0,447,
-1,412,2424,16,0,
-447,1,1377,2425,16,
-0,447,1,172,2426,
-16,0,447,1,1939,
-2427,16,0,447,1,
-437,2428,16,0,447,
-1,188,2429,16,0,
-447,1,942,2430,16,
-0,447,1,1195,2431,
-16,0,447,1,1449,
-2432,16,0,447,1,
-1701,2433,16,0,447,
-1,447,1574,1,205,
-2434,16,0,447,1,
-827,2435,16,0,447,
-1,2724,2436,16,0,
-447,1,223,2437,16,
-0,447,1,476,1608,
-1,477,1614,1,1231,
-2438,16,0,447,1,
-479,1624,1,480,1629,
-1,1485,2439,16,0,
-447,1,1737,2440,16,
-0,447,1,242,2441,
-16,0,447,1,478,
-1647,1,1001,1652,1,
-1002,1657,1,22,2442,
-19,400,1,22,2443,
-5,84,1,1011,1166,
-1,1012,2444,16,0,
-398,1,1013,1322,1,
-262,1183,1,1267,2445,
-16,0,398,1,515,
-2446,16,0,398,1,
-1521,2447,16,0,398,
-1,525,1280,1,283,
-1236,1,2299,2448,16,
-0,398,1,42,2449,
-16,0,398,1,40,
-1241,1,44,1247,1,
-47,1248,1,1303,2450,
-16,0,398,1,1555,
-2451,16,0,398,1,
-50,1265,1,48,1254,
-1,49,1260,1,51,
-1270,1,63,1286,1,
-305,1275,1,66,1292,
-1,67,1297,1,68,
-1302,1,69,1307,1,
-70,1312,1,73,2452,
-16,0,398,1,74,
-1317,1,328,2453,16,
-0,398,1,1048,2454,
-16,0,398,1,82,
-2455,16,0,398,1,
-1840,2456,16,0,398,
-1,1591,2457,16,0,
-398,1,1341,2458,16,
-0,398,1,1096,1376,
-1,93,1382,1,352,
-2459,16,0,398,1,
-107,2460,16,0,398,
-1,1114,1407,1,118,
-2461,16,0,398,1,
-1123,2462,16,0,398,
-1,371,1429,1,1628,
-2463,16,0,398,1,
-375,1440,1,1882,2464,
-16,0,398,1,377,
-1445,1,379,1450,1,
-380,1455,1,883,2465,
-16,0,398,1,373,
-1473,1,130,2466,16,
-0,398,1,143,2467,
-16,0,398,1,387,
-2468,16,0,398,1,
-1159,2469,16,0,398,
-1,157,2470,16,0,
-398,1,1413,2471,16,
-0,398,1,1665,2472,
-16,0,398,1,412,
-2473,16,0,398,1,
-1377,2474,16,0,398,
-1,172,2475,16,0,
-398,1,1939,2476,16,
-0,398,1,437,2477,
-16,0,398,1,188,
-2478,16,0,398,1,
-942,2479,16,0,398,
-1,1195,2480,16,0,
-398,1,1449,2481,16,
-0,398,1,1701,2482,
-16,0,398,1,447,
-1574,1,205,2483,16,
-0,398,1,827,2484,
-16,0,398,1,2724,
-2485,16,0,398,1,
-223,2486,16,0,398,
-1,476,1608,1,477,
-1614,1,1231,2487,16,
-0,398,1,479,1624,
-1,480,1629,1,1485,
-2488,16,0,398,1,
-1737,2489,16,0,398,
-1,242,2490,16,0,
-398,1,478,1647,1,
-1001,1652,1,1002,1657,
-1,23,2491,19,553,
-1,23,2492,5,38,
-1,1901,2493,16,0,
-551,1,2075,2494,16,
-0,551,1,1860,885,
-1,1803,851,1,1804,
-2495,16,0,551,1,
-2413,2496,16,0,551,
-1,2198,2497,16,0,
-551,1,1873,899,1,
-1657,958,1,1989,980,
-1,1990,2498,16,0,
-551,1,1775,2499,16,
-0,551,1,32,2500,
-16,0,551,1,2105,
-878,1,2106,2501,16,
-0,551,1,2364,891,
-1,2227,972,1,2337,
-2502,16,0,551,1,
-2021,782,1,2458,940,
-1,2459,946,1,2462,
-953,1,2136,906,1,
-2464,963,1,2029,789,
-1,2030,795,1,2031,
-800,1,2032,805,1,
-2033,810,1,2035,816,
-1,2037,821,1,2039,
-826,1,1931,925,1,
-2041,832,1,2043,838,
-1,2045,843,1,1574,
-863,1,1958,2503,16,
-0,551,1,24,2504,
-19,180,1,24,2505,
-5,5,1,44,2506,
-16,0,178,1,377,
-2507,16,0,589,1,
-40,2508,16,0,738,
-1,63,2509,16,0,
-203,1,373,2510,16,
-0,585,1,25,2511,
-19,302,1,25,2512,
-5,177,1,256,2513,
-16,0,594,1,1261,
-2514,16,0,594,1,
-1011,1166,1,1012,2515,
-16,0,300,1,2458,
-940,1,262,1183,1,
-1267,2516,16,0,300,
-1,2021,782,1,1521,
-2517,16,0,300,1,
-1775,2518,16,0,594,
-1,2029,789,1,2030,
-795,1,2031,800,1,
-2032,805,1,2033,810,
-1,277,2519,16,0,
-594,1,2035,816,1,
-2037,821,1,2039,826,
-1,32,2520,16,0,
-594,1,2464,963,1,
-2293,2521,16,0,594,
-1,2043,838,1,2045,
-843,1,2299,2522,16,
-0,300,1,41,2523,
-16,0,594,1,42,
-2524,16,0,300,1,
-40,1241,1,44,1247,
-1,43,2525,16,0,
-594,1,1804,2526,16,
-0,594,1,48,1254,
-1,49,1260,1,47,
-1248,1,51,1270,1,
-52,2527,16,0,594,
-1,50,1265,1,305,
-1275,1,1096,1376,1,
-1515,2528,16,0,594,
-1,2318,2529,16,0,
-594,1,62,2530,16,
-0,594,1,63,1286,
-1,66,1292,1,67,
-1297,1,68,1302,1,
-69,1307,1,70,1312,
-1,71,2531,16,0,
-594,1,283,1236,1,
-73,2532,16,0,300,
-1,74,1317,1,1013,
-1322,1,76,2533,16,
-0,594,1,1834,2534,
-16,0,594,1,2337,
-2535,16,0,594,1,
-79,2536,16,0,594,
-1,1335,2537,16,0,
-594,1,299,2538,16,
-0,594,1,82,2539,
-16,0,300,1,1840,
-2540,16,0,300,1,
-1297,2541,16,0,594,
-1,85,2542,16,0,
-594,1,1341,2543,16,
-0,300,1,89,2544,
-16,0,594,1,1303,
-2545,16,0,300,1,
-509,2546,16,0,594,
-1,93,1382,1,322,
-2547,16,0,594,1,
-97,2548,16,0,594,
-1,2041,832,1,1555,
-2549,16,0,300,1,
-827,2550,16,0,300,
-1,102,2551,16,0,
-594,1,1860,885,1,
-1803,851,1,2364,891,
-1,107,2552,16,0,
-300,1,1114,1407,1,
-112,2553,16,0,594,
-1,1117,2554,16,0,
-594,1,352,1413,1,
-1873,899,1,118,1419,
-1,1123,2555,16,0,
-300,1,371,1429,1,
-515,2556,16,0,300,
-1,1377,2557,16,0,
-300,1,124,2558,16,
-0,594,1,1882,2559,
-16,0,300,1,377,
-1445,1,379,1450,1,
-380,1455,1,130,1478,
-1,346,2560,16,0,
-594,1,2075,2561,16,
-0,594,1,373,1473,
-1,387,2562,16,0,
-300,1,137,2563,16,
-0,594,1,143,2564,
-16,0,300,1,1901,
-2565,16,0,594,1,
-1048,1408,1,1153,2566,
-16,0,594,1,375,
-1440,1,151,2567,16,
-0,594,1,1407,2568,
-16,0,594,1,1659,
-2569,16,0,594,1,
-2413,2570,16,0,594,
-1,1159,2571,16,0,
-300,1,381,2572,16,
-0,594,1,157,2573,
-16,0,300,1,1413,
-2574,16,0,300,1,
-883,2575,16,0,300,
-1,1371,2576,16,0,
-594,1,328,1366,1,
-2105,878,1,2106,2577,
-16,0,594,1,166,
-2578,16,0,594,1,
-525,2579,16,0,594,
-1,1622,2580,16,0,
-594,1,406,2581,16,
-0,594,1,1574,863,
-1,172,1532,1,1931,
-925,1,412,2582,16,
-0,300,1,1933,2583,
-16,0,594,1,1876,
-2584,16,0,594,1,
-431,2585,16,0,594,
-1,1585,2586,16,0,
-594,1,182,2587,16,
-0,594,1,1628,2588,
-16,0,300,1,1189,
-2589,16,0,594,1,
-437,2590,16,0,300,
-1,1591,2591,16,0,
-300,1,188,1581,1,
-1695,2592,16,0,594,
-1,2198,2593,16,0,
-594,1,1195,2594,16,
-0,300,1,1449,2595,
-16,0,300,1,1701,
-2596,16,0,300,1,
-447,2597,16,0,594,
-1,199,2598,16,0,
-594,1,2459,946,1,
-1958,2599,16,0,594,
-1,2462,953,1,1657,
-958,1,205,2600,16,
-0,300,1,459,2601,
-16,0,594,1,462,
-2602,16,0,594,1,
-1665,2603,16,0,300,
-1,2724,2604,16,0,
-300,1,2718,2605,16,
-0,594,1,217,2606,
-16,0,594,1,2227,
-972,1,942,1553,1,
-1225,2607,16,0,594,
-1,223,2608,16,0,
-300,1,1479,2609,16,
-0,594,1,1731,2610,
-16,0,594,1,477,
-1614,1,1231,2611,16,
-0,300,1,479,1624,
-1,480,1629,1,1485,
-2612,16,0,300,1,
-1737,2613,16,0,300,
-1,1989,980,1,1990,
-2614,16,0,594,1,
-1443,2615,16,0,594,
-1,236,2616,16,0,
-594,1,2136,906,1,
-476,1608,1,242,2617,
-16,0,300,1,478,
-1647,1,1939,2618,16,
-0,300,1,1001,1652,
-1,1002,1657,1,1756,
-2619,16,0,594,1,
-26,2620,19,321,1,
-26,2621,5,84,1,
-1011,1166,1,1012,2622,
-16,0,319,1,1013,
-1322,1,262,1183,1,
-1267,2623,16,0,319,
-1,515,2624,16,0,
-716,1,1521,2625,16,
-0,319,1,525,1280,
-1,283,1236,1,2299,
-2626,16,0,319,1,
-42,2627,16,0,319,
-1,40,1241,1,44,
-1247,1,47,1248,1,
-1303,2628,16,0,319,
-1,1555,2629,16,0,
-319,1,50,1265,1,
-48,1254,1,49,1260,
-1,51,1270,1,63,
-1286,1,305,1275,1,
-66,1292,1,67,1297,
-1,68,1302,1,69,
-1307,1,70,1312,1,
-73,2630,16,0,319,
-1,74,1317,1,328,
-1366,1,1048,1408,1,
-82,2631,16,0,319,
-1,1840,2632,16,0,
-319,1,1591,2633,16,
-0,319,1,1341,2634,
-16,0,319,1,1096,
-1376,1,93,1382,1,
-352,1413,1,107,2635,
-16,0,319,1,1114,
-1407,1,118,1419,1,
-1123,2636,16,0,319,
-1,371,1429,1,1628,
-2637,16,0,319,1,
-375,1440,1,1882,2638,
-16,0,319,1,377,
-1445,1,379,1450,1,
-380,1455,1,883,2639,
-16,0,319,1,373,
-1473,1,130,1478,1,
-143,2640,16,0,319,
-1,387,2641,16,0,
-319,1,1159,2642,16,
-0,319,1,157,2643,
-16,0,319,1,1413,
-2644,16,0,319,1,
-1665,2645,16,0,319,
-1,412,2646,16,0,
-319,1,1377,2647,16,
-0,319,1,172,1532,
-1,1939,2648,16,0,
-319,1,437,2649,16,
-0,637,1,188,1581,
-1,942,1553,1,1195,
-2650,16,0,319,1,
-1449,2651,16,0,319,
-1,1701,2652,16,0,
-319,1,447,1574,1,
-205,2653,16,0,319,
-1,827,2654,16,0,
-319,1,2724,2655,16,
-0,319,1,223,2656,
-16,0,319,1,476,
-1608,1,477,1614,1,
-1231,2657,16,0,319,
-1,479,1624,1,480,
-1629,1,1485,2658,16,
-0,319,1,1737,2659,
-16,0,319,1,242,
-2660,16,0,319,1,
-478,1647,1,1001,1652,
-1,1002,1657,1,27,
-2661,19,657,1,27,
-2662,5,95,1,256,
-2663,16,0,655,1,
-1261,2664,16,0,655,
-1,509,2665,16,0,
-655,1,1515,2666,16,
-0,655,1,2021,782,
-1,1775,2667,16,0,
-655,1,2029,789,1,
-2030,795,1,2031,800,
-1,2032,805,1,2033,
-810,1,277,2668,16,
-0,655,1,2035,816,
-1,2037,821,1,2039,
-826,1,32,2669,16,
-0,655,1,2041,832,
-1,2293,2670,16,0,
-655,1,2043,838,1,
-2045,843,1,41,2671,
-16,0,655,1,1297,
-2672,16,0,655,1,
-43,2673,16,0,655,
-1,1803,851,1,1804,
-2674,16,0,655,1,
-299,2675,16,0,655,
-1,52,2676,16,0,
-655,1,2318,2677,16,
-0,655,1,62,2678,
-16,0,655,1,2075,
-2679,16,0,655,1,
-1574,863,1,71,2680,
-16,0,655,1,76,
-2681,16,0,655,1,
-1834,2682,16,0,655,
-1,2337,2683,16,0,
-655,1,79,2684,16,
-0,655,1,1335,2685,
-16,0,655,1,322,
-2686,16,0,655,1,
-85,2687,16,0,655,
-1,89,2688,16,0,
-655,1,346,2689,16,
-0,655,1,2105,878,
-1,2106,2690,16,0,
-655,1,97,2691,16,
-0,655,1,1860,885,
-1,2364,891,1,102,
-2692,16,0,655,1,
-112,2693,16,0,655,
-1,1117,2694,16,0,
-655,1,1873,899,1,
-1876,2695,16,0,655,
-1,124,2696,16,0,
-655,1,2136,906,1,
-2718,2697,16,0,655,
-1,381,2698,16,0,
-655,1,525,2699,16,
-0,655,1,137,2700,
-16,0,655,1,1901,
-2701,16,0,655,1,
-1153,2702,16,0,655,
-1,151,2703,16,0,
-655,1,1407,2704,16,
-0,655,1,1659,2705,
-16,0,655,1,2413,
-2706,16,0,655,1,
-406,2707,16,0,655,
-1,1371,2708,16,0,
-655,1,166,2709,16,
-0,655,1,1622,2710,
-16,0,655,1,1931,
-925,1,1933,2711,16,
-0,655,1,431,2712,
-16,0,655,1,1585,
-2713,16,0,655,1,
-182,2714,16,0,655,
-1,1189,2715,16,0,
-655,1,1443,2716,16,
-0,655,1,1695,2717,
-16,0,655,1,2198,
-2718,16,0,655,1,
-447,2719,16,0,655,
-1,2458,940,1,2459,
-946,1,1958,2720,16,
-0,655,1,2462,953,
-1,1657,958,1,2464,
-963,1,199,2721,16,
-0,655,1,459,2722,
-16,0,655,1,462,
-2723,16,0,655,1,
-217,2724,16,0,655,
-1,2227,972,1,1225,
-2725,16,0,655,1,
-1479,2726,16,0,655,
-1,1731,2727,16,0,
-655,1,1989,980,1,
-1990,2728,16,0,655,
-1,236,2729,16,0,
-655,1,1756,2730,16,
-0,655,1,28,2731,
-19,690,1,28,2732,
-5,60,1,328,1366,
-1,223,1598,1,1096,
-1376,1,118,1419,1,
-883,1461,1,525,1280,
-1,1001,1652,1,130,
-1478,1,459,1817,1,
-1114,1407,1,352,1413,
-1,447,1574,1,464,
-1812,1,1011,1166,1,
-1013,1322,1,242,1642,
-1,143,1483,1,40,
-1241,1,41,1787,1,
-42,1791,1,479,1624,
-1,44,1247,1,481,
-1819,1,373,1473,1,
-47,1248,1,157,1506,
-1,49,1260,1,50,
-1265,1,48,1254,1,
-379,1450,1,380,1455,
-1,51,1270,1,476,
-1608,1,371,1429,1,
-478,1647,1,1048,1408,
-1,375,1440,1,172,
-1532,1,262,1183,1,
-283,1236,1,63,1286,
-1,67,1297,1,68,
-1302,1,69,1307,1,
-66,1292,1,461,2733,
-16,0,688,1,74,
-1317,1,377,1445,1,
-1002,1657,1,70,1312,
-1,188,1581,1,82,
-1344,1,305,1275,1,
-477,1614,1,827,1395,
-1,93,1382,1,480,
-1629,1,205,1587,1,
-942,1553,1,107,1402,
-1,29,2734,19,287,
-1,29,2735,5,84,
-1,1011,1166,1,1012,
-2736,16,0,285,1,
-1013,1322,1,262,1183,
-1,1267,2737,16,0,
-285,1,515,2738,16,
-0,285,1,1521,2739,
-16,0,285,1,525,
-1280,1,283,1236,1,
-2299,2740,16,0,285,
-1,42,2741,16,0,
-285,1,40,1241,1,
-44,1247,1,47,1248,
-1,1303,2742,16,0,
-285,1,1555,2743,16,
-0,285,1,50,1265,
-1,48,1254,1,49,
-1260,1,51,1270,1,
-63,1286,1,305,1275,
-1,66,1292,1,67,
-1297,1,68,1302,1,
-69,1307,1,70,1312,
-1,73,2744,16,0,
-285,1,74,1317,1,
-328,1366,1,1048,1408,
-1,82,2745,16,0,
-285,1,1840,2746,16,
-0,285,1,1591,2747,
-16,0,285,1,1341,
-2748,16,0,285,1,
-1096,1376,1,93,1382,
-1,352,1413,1,107,
-2749,16,0,285,1,
-1114,1407,1,118,1419,
-1,1123,2750,16,0,
-285,1,371,1429,1,
-1628,2751,16,0,285,
-1,375,1440,1,1882,
-2752,16,0,285,1,
-377,1445,1,379,1450,
-1,380,1455,1,883,
-2753,16,0,285,1,
-373,1473,1,130,1478,
-1,143,1483,1,387,
-2754,16,0,285,1,
-1159,2755,16,0,285,
-1,157,1506,1,1413,
-2756,16,0,285,1,
-1665,2757,16,0,285,
-1,412,2758,16,0,
-285,1,1377,2759,16,
-0,285,1,172,1532,
-1,1939,2760,16,0,
-285,1,437,2761,16,
-0,285,1,188,1581,
-1,942,1553,1,1195,
-2762,16,0,285,1,
-1449,2763,16,0,285,
-1,1701,2764,16,0,
-285,1,447,1574,1,
-205,2765,16,0,285,
-1,827,2766,16,0,
-285,1,2724,2767,16,
-0,285,1,223,2768,
-16,0,285,1,476,
-1608,1,477,1614,1,
-1231,2769,16,0,285,
-1,479,1624,1,480,
-1629,1,1485,2770,16,
-0,285,1,1737,2771,
-16,0,285,1,242,
-2772,16,0,285,1,
-478,1647,1,1001,1652,
-1,1002,1657,1,30,
-2773,19,269,1,30,
-2774,5,84,1,1011,
-1166,1,1012,2775,16,
-0,267,1,1013,1322,
-1,262,1183,1,1267,
-2776,16,0,267,1,
-515,2777,16,0,267,
-1,1521,2778,16,0,
-267,1,525,1280,1,
-283,1236,1,2299,2779,
-16,0,267,1,42,
-2780,16,0,267,1,
-40,1241,1,44,1247,
-1,47,1248,1,1303,
-2781,16,0,267,1,
-1555,2782,16,0,267,
-1,50,1265,1,48,
-1254,1,49,1260,1,
-51,1270,1,63,1286,
-1,305,1275,1,66,
-1292,1,67,1297,1,
-68,1302,1,69,1307,
-1,70,1312,1,73,
-2783,16,0,267,1,
-74,1317,1,328,1366,
-1,1048,1408,1,82,
-2784,16,0,267,1,
-1840,2785,16,0,267,
-1,1591,2786,16,0,
-267,1,1341,2787,16,
-0,267,1,1096,1376,
-1,93,1382,1,352,
-1413,1,107,2788,16,
-0,267,1,1114,1407,
-1,118,1419,1,1123,
-2789,16,0,267,1,
-371,1429,1,1628,2790,
-16,0,267,1,375,
-1440,1,1882,2791,16,
-0,267,1,377,1445,
-1,379,1450,1,380,
-1455,1,883,2792,16,
-0,267,1,373,1473,
-1,130,1478,1,143,
-1483,1,387,2793,16,
-0,267,1,1159,2794,
-16,0,267,1,157,
-1506,1,1413,2795,16,
-0,267,1,1665,2796,
-16,0,267,1,412,
-2797,16,0,267,1,
-1377,2798,16,0,267,
-1,172,1532,1,1939,
-2799,16,0,267,1,
-437,2800,16,0,267,
-1,188,1581,1,942,
-1553,1,1195,2801,16,
-0,267,1,1449,2802,
-16,0,267,1,1701,
-2803,16,0,267,1,
-447,1574,1,205,2804,
-16,0,267,1,827,
-2805,16,0,267,1,
-2724,2806,16,0,267,
-1,223,2807,16,0,
-267,1,476,1608,1,
-477,1614,1,1231,2808,
-16,0,267,1,479,
-1624,1,480,1629,1,
-1485,2809,16,0,267,
-1,1737,2810,16,0,
-267,1,242,2811,16,
-0,267,1,478,1647,
-1,1001,1652,1,1002,
-1657,1,31,2812,19,
-258,1,31,2813,5,
-84,1,1011,1166,1,
-1012,2814,16,0,256,
-1,1013,1322,1,262,
-1183,1,1267,2815,16,
-0,256,1,515,2816,
-16,0,256,1,1521,
-2817,16,0,256,1,
-525,1280,1,283,1236,
-1,2299,2818,16,0,
-256,1,42,2819,16,
-0,256,1,40,1241,
-1,44,1247,1,47,
-1248,1,1303,2820,16,
-0,256,1,1555,2821,
-16,0,256,1,50,
-1265,1,48,1254,1,
-49,1260,1,51,1270,
-1,63,1286,1,305,
-1275,1,66,1292,1,
-67,1297,1,68,1302,
-1,69,1307,1,70,
-1312,1,73,2822,16,
-0,256,1,74,1317,
-1,328,1366,1,1048,
-1408,1,82,2823,16,
-0,256,1,1840,2824,
-16,0,256,1,1591,
-2825,16,0,256,1,
-1341,2826,16,0,256,
-1,1096,1376,1,93,
-1382,1,352,1413,1,
-107,2827,16,0,256,
-1,1114,1407,1,118,
-1419,1,1123,2828,16,
-0,256,1,371,1429,
-1,1628,2829,16,0,
-256,1,375,1440,1,
-1882,2830,16,0,256,
-1,377,1445,1,379,
-1450,1,380,1455,1,
-883,2831,16,0,256,
-1,373,1473,1,130,
-1478,1,143,2832,16,
-0,256,1,387,2833,
-16,0,256,1,1159,
-2834,16,0,256,1,
-157,2835,16,0,256,
-1,1413,2836,16,0,
-256,1,1665,2837,16,
-0,256,1,412,2838,
-16,0,256,1,1377,
-2839,16,0,256,1,
-172,1532,1,1939,2840,
-16,0,256,1,437,
-2841,16,0,256,1,
-188,1581,1,942,1553,
-1,1195,2842,16,0,
-256,1,1449,2843,16,
-0,256,1,1701,2844,
-16,0,256,1,447,
-1574,1,205,2845,16,
-0,256,1,827,2846,
-16,0,256,1,2724,
-2847,16,0,256,1,
-223,2848,16,0,256,
-1,476,1608,1,477,
-1614,1,1231,2849,16,
-0,256,1,479,1624,
-1,480,1629,1,1485,
-2850,16,0,256,1,
-1737,2851,16,0,256,
-1,242,2852,16,0,
-256,1,478,1647,1,
-1001,1652,1,1002,1657,
-1,32,2853,19,251,
-1,32,2854,5,84,
-1,1011,1166,1,1012,
-2855,16,0,249,1,
-1013,1322,1,262,1183,
-1,1267,2856,16,0,
-249,1,515,2857,16,
-0,249,1,1521,2858,
-16,0,249,1,525,
-1280,1,283,1236,1,
-2299,2859,16,0,249,
-1,42,2860,16,0,
-249,1,40,1241,1,
-44,1247,1,47,1248,
-1,1303,2861,16,0,
-249,1,1555,2862,16,
-0,249,1,50,1265,
-1,48,1254,1,49,
-1260,1,51,1270,1,
-63,1286,1,305,1275,
-1,66,1292,1,67,
-1297,1,68,1302,1,
-69,1307,1,70,1312,
-1,73,2863,16,0,
-249,1,74,1317,1,
-328,1366,1,1048,1408,
-1,82,2864,16,0,
-249,1,1840,2865,16,
-0,249,1,1591,2866,
-16,0,249,1,1341,
-2867,16,0,249,1,
-1096,1376,1,93,1382,
-1,352,1413,1,107,
-2868,16,0,249,1,
-1114,1407,1,118,1419,
-1,1123,2869,16,0,
-249,1,371,1429,1,
-1628,2870,16,0,249,
-1,375,1440,1,1882,
-2871,16,0,249,1,
-377,1445,1,379,1450,
-1,380,1455,1,883,
-2872,16,0,249,1,
-373,1473,1,130,1478,
-1,143,2873,16,0,
-249,1,387,2874,16,
-0,249,1,1159,2875,
-16,0,249,1,157,
-2876,16,0,249,1,
-1413,2877,16,0,249,
-1,1665,2878,16,0,
-249,1,412,2879,16,
-0,249,1,1377,2880,
-16,0,249,1,172,
-1532,1,1939,2881,16,
-0,249,1,437,2882,
-16,0,249,1,188,
-1581,1,942,1553,1,
-1195,2883,16,0,249,
-1,1449,2884,16,0,
-249,1,1701,2885,16,
-0,249,1,447,1574,
-1,205,2886,16,0,
-249,1,827,2887,16,
-0,249,1,2724,2888,
-16,0,249,1,223,
-2889,16,0,249,1,
-476,1608,1,477,1614,
-1,1231,2890,16,0,
-249,1,479,1624,1,
-480,1629,1,1485,2891,
-16,0,249,1,1737,
-2892,16,0,249,1,
-242,2893,16,0,249,
-1,478,1647,1,1001,
-1652,1,1002,1657,1,
-33,2894,19,349,1,
-33,2895,5,84,1,
-1011,1166,1,1012,2896,
-16,0,347,1,1013,
-1322,1,262,1183,1,
-1267,2897,16,0,347,
-1,515,2898,16,0,
-347,1,1521,2899,16,
-0,347,1,525,1280,
-1,283,1236,1,2299,
-2900,16,0,347,1,
-42,2901,16,0,347,
-1,40,1241,1,44,
-1247,1,47,1248,1,
-1303,2902,16,0,347,
-1,1555,2903,16,0,
-347,1,50,1265,1,
-48,1254,1,49,1260,
-1,51,1270,1,63,
-1286,1,305,1275,1,
-66,1292,1,67,1297,
-1,68,1302,1,69,
-1307,1,70,1312,1,
-73,2904,16,0,347,
-1,74,1317,1,328,
-1366,1,1048,1408,1,
-82,2905,16,0,347,
-1,1840,2906,16,0,
-347,1,1591,2907,16,
-0,347,1,1341,2908,
-16,0,347,1,1096,
-1376,1,93,1382,1,
-352,1413,1,107,2909,
-16,0,347,1,1114,
-1407,1,118,1419,1,
-1123,2910,16,0,347,
-1,371,1429,1,1628,
-2911,16,0,347,1,
-375,1440,1,1882,2912,
-16,0,347,1,377,
-1445,1,379,1450,1,
-380,1455,1,883,2913,
-16,0,347,1,373,
-1473,1,130,1478,1,
-143,1483,1,387,2914,
-16,0,347,1,1159,
-2915,16,0,347,1,
-157,1506,1,1413,2916,
-16,0,347,1,1665,
-2917,16,0,347,1,
-412,2918,16,0,347,
-1,1377,2919,16,0,
-347,1,172,1532,1,
-1939,2920,16,0,347,
-1,437,2921,16,0,
-347,1,188,1581,1,
-942,1553,1,1195,2922,
-16,0,347,1,1449,
-2923,16,0,347,1,
-1701,2924,16,0,347,
-1,447,1574,1,205,
-2925,16,0,347,1,
-827,2926,16,0,347,
-1,2724,2927,16,0,
-347,1,223,2928,16,
-0,347,1,476,1608,
-1,477,1614,1,1231,
-2929,16,0,347,1,
-479,1624,1,480,1629,
-1,1485,2930,16,0,
-347,1,1737,2931,16,
-0,347,1,242,1642,
-1,478,1647,1,1001,
-1652,1,1002,1657,1,
-34,2932,19,335,1,
-34,2933,5,84,1,
-1011,1166,1,1012,2934,
-16,0,333,1,1013,
-1322,1,262,1183,1,
-1267,2935,16,0,333,
-1,515,2936,16,0,
-333,1,1521,2937,16,
-0,333,1,525,1280,
-1,283,1236,1,2299,
-2938,16,0,333,1,
-42,2939,16,0,333,
-1,40,1241,1,44,
-1247,1,47,1248,1,
-1303,2940,16,0,333,
-1,1555,2941,16,0,
-333,1,50,1265,1,
-48,1254,1,49,1260,
-1,51,1270,1,63,
-1286,1,305,1275,1,
-66,1292,1,67,1297,
-1,68,1302,1,69,
-1307,1,70,1312,1,
-73,2942,16,0,333,
-1,74,1317,1,328,
-1366,1,1048,1408,1,
-82,2943,16,0,333,
-1,1840,2944,16,0,
-333,1,1591,2945,16,
-0,333,1,1341,2946,
-16,0,333,1,1096,
-1376,1,93,1382,1,
-352,1413,1,107,2947,
-16,0,333,1,1114,
-1407,1,118,1419,1,
-1123,2948,16,0,333,
-1,371,1429,1,1628,
-2949,16,0,333,1,
-375,1440,1,1882,2950,
-16,0,333,1,377,
-1445,1,379,1450,1,
-380,1455,1,883,2951,
-16,0,333,1,373,
-1473,1,130,1478,1,
-143,1483,1,387,2952,
-16,0,333,1,1159,
-2953,16,0,333,1,
-157,1506,1,1413,2954,
-16,0,333,1,1665,
-2955,16,0,333,1,
-412,2956,16,0,333,
-1,1377,2957,16,0,
-333,1,172,1532,1,
-1939,2958,16,0,333,
-1,437,2959,16,0,
-333,1,188,1581,1,
-942,1553,1,1195,2960,
-16,0,333,1,1449,
-2961,16,0,333,1,
-1701,2962,16,0,333,
-1,447,1574,1,205,
-1587,1,827,2963,16,
-0,333,1,2724,2964,
-16,0,333,1,223,
-1598,1,476,1608,1,
-477,1614,1,1231,2965,
-16,0,333,1,479,
-1624,1,480,1629,1,
-1485,2966,16,0,333,
-1,1737,2967,16,0,
-333,1,242,1642,1,
-478,1647,1,1001,1652,
-1,1002,1657,1,35,
-2968,19,324,1,35,
-2969,5,84,1,1011,
-1166,1,1012,2970,16,
-0,322,1,1013,1322,
-1,262,1183,1,1267,
-2971,16,0,322,1,
-515,2972,16,0,322,
-1,1521,2973,16,0,
-322,1,525,1280,1,
-283,1236,1,2299,2974,
-16,0,322,1,42,
-2975,16,0,322,1,
-40,1241,1,44,1247,
-1,47,1248,1,1303,
-2976,16,0,322,1,
-1555,2977,16,0,322,
-1,50,1265,1,48,
-1254,1,49,1260,1,
-51,1270,1,63,1286,
-1,305,1275,1,66,
-1292,1,67,1297,1,
-68,1302,1,69,1307,
-1,70,1312,1,73,
-2978,16,0,322,1,
-74,1317,1,328,1366,
-1,1048,1408,1,82,
-2979,16,0,322,1,
-1840,2980,16,0,322,
-1,1591,2981,16,0,
-322,1,1341,2982,16,
-0,322,1,1096,1376,
-1,93,1382,1,352,
-1413,1,107,2983,16,
-0,322,1,1114,1407,
-1,118,1419,1,1123,
-2984,16,0,322,1,
-371,1429,1,1628,2985,
-16,0,322,1,375,
-1440,1,1882,2986,16,
-0,322,1,377,1445,
-1,379,1450,1,380,
-1455,1,883,2987,16,
-0,322,1,373,1473,
-1,130,1478,1,143,
-1483,1,387,2988,16,
-0,322,1,1159,2989,
-16,0,322,1,157,
-1506,1,1413,2990,16,
-0,322,1,1665,2991,
-16,0,322,1,412,
-2992,16,0,322,1,
-1377,2993,16,0,322,
-1,172,1532,1,1939,
-2994,16,0,322,1,
-437,2995,16,0,322,
-1,188,1581,1,942,
-1553,1,1195,2996,16,
-0,322,1,1449,2997,
-16,0,322,1,1701,
-2998,16,0,322,1,
-447,1574,1,205,1587,
-1,827,2999,16,0,
-322,1,2724,3000,16,
-0,322,1,223,3001,
-16,0,322,1,476,
-1608,1,477,1614,1,
-1231,3002,16,0,322,
-1,479,1624,1,480,
-1629,1,1485,3003,16,
-0,322,1,1737,3004,
-16,0,322,1,242,
-1642,1,478,1647,1,
-1001,1652,1,1002,1657,
-1,36,3005,19,223,
-1,36,3006,5,94,
-1,256,3007,16,0,
-221,1,1261,3008,16,
-0,221,1,509,3009,
-16,0,221,1,1515,
-3010,16,0,221,1,
-2021,782,1,1775,3011,
-16,0,221,1,2029,
-789,1,2030,795,1,
-2031,800,1,2032,805,
-1,2033,810,1,277,
-3012,16,0,221,1,
-2035,816,1,2037,821,
-1,2039,826,1,32,
-3013,16,0,221,1,
-2041,832,1,2293,3014,
-16,0,221,1,2043,
-838,1,2045,843,1,
-41,3015,16,0,221,
-1,1297,3016,16,0,
-221,1,43,3017,16,
-0,221,1,1803,851,
-1,1804,3018,16,0,
-221,1,299,3019,16,
-0,221,1,52,3020,
-16,0,221,1,2318,
-3021,16,0,221,1,
-2075,3022,16,0,221,
-1,1574,863,1,71,
-3023,16,0,221,1,
-76,3024,16,0,221,
-1,1834,3025,16,0,
-221,1,2337,3026,16,
-0,221,1,79,3027,
-16,0,221,1,1335,
-3028,16,0,221,1,
-322,3029,16,0,221,
-1,85,3030,16,0,
-221,1,89,3031,16,
-0,221,1,346,3032,
-16,0,221,1,2105,
-878,1,2106,3033,16,
-0,221,1,97,3034,
-16,0,221,1,1860,
-885,1,2364,891,1,
-102,3035,16,0,221,
-1,112,3036,16,0,
-221,1,1117,3037,16,
-0,221,1,1873,899,
-1,1876,3038,16,0,
-221,1,124,3039,16,
-0,221,1,2136,906,
-1,2718,3040,16,0,
-221,1,381,3041,16,
-0,221,1,525,3042,
-16,0,221,1,137,
-3043,16,0,221,1,
-1901,3044,16,0,221,
-1,1153,3045,16,0,
-221,1,151,3046,16,
-0,221,1,1407,3047,
-16,0,221,1,1659,
-3048,16,0,221,1,
-2413,3049,16,0,221,
-1,406,3050,16,0,
-221,1,1371,3051,16,
-0,221,1,166,3052,
-16,0,221,1,1622,
-3053,16,0,221,1,
-1931,925,1,1933,3054,
-16,0,221,1,431,
-3055,16,0,221,1,
-1585,3056,16,0,221,
-1,182,3057,16,0,
-221,1,1189,3058,16,
-0,221,1,1443,3059,
-16,0,221,1,1695,
-3060,16,0,221,1,
-2198,3061,16,0,221,
-1,447,3062,16,0,
-221,1,2458,940,1,
-2459,946,1,1958,3063,
-16,0,221,1,2462,
-953,1,1657,958,1,
-2464,963,1,199,3064,
-16,0,221,1,459,
-3065,16,0,221,1,
-462,3066,16,0,221,
-1,217,3067,16,0,
-221,1,2227,972,1,
-1225,3068,16,0,221,
-1,1479,3069,16,0,
-221,1,1731,3070,16,
-0,221,1,1989,980,
-1,1990,3071,16,0,
-221,1,236,3072,16,
-0,221,1,1756,3073,
-16,0,221,1,37,
-3074,19,241,1,37,
-3075,5,94,1,256,
-3076,16,0,239,1,
-1261,3077,16,0,239,
-1,509,3078,16,0,
-239,1,1515,3079,16,
-0,239,1,2021,782,
-1,1775,3080,16,0,
-239,1,2029,789,1,
-2030,795,1,2031,800,
-1,2032,805,1,2033,
-810,1,277,3081,16,
-0,239,1,2035,816,
-1,2037,821,1,2039,
-826,1,32,3082,16,
-0,239,1,2041,832,
-1,2293,3083,16,0,
-239,1,2043,838,1,
-2045,843,1,41,3084,
-16,0,239,1,1297,
-3085,16,0,239,1,
-43,3086,16,0,239,
-1,1803,851,1,1804,
-3087,16,0,239,1,
-299,3088,16,0,239,
-1,52,3089,16,0,
-239,1,2318,3090,16,
-0,239,1,2075,3091,
-16,0,239,1,1574,
-863,1,71,3092,16,
-0,239,1,76,3093,
-16,0,239,1,1834,
-3094,16,0,239,1,
-2337,3095,16,0,239,
-1,79,3096,16,0,
-239,1,1335,3097,16,
-0,239,1,322,3098,
-16,0,239,1,85,
-3099,16,0,239,1,
-89,3100,16,0,239,
-1,346,3101,16,0,
-239,1,2105,878,1,
-2106,3102,16,0,239,
-1,97,3103,16,0,
-239,1,1860,885,1,
-2364,891,1,102,3104,
-16,0,239,1,112,
-3105,16,0,239,1,
-1117,3106,16,0,239,
-1,1873,899,1,1876,
-3107,16,0,239,1,
-124,3108,16,0,239,
-1,2136,906,1,2718,
-3109,16,0,239,1,
-381,3110,16,0,239,
-1,525,3111,16,0,
-239,1,137,3112,16,
-0,239,1,1901,3113,
-16,0,239,1,1153,
-3114,16,0,239,1,
-151,3115,16,0,239,
-1,1407,3116,16,0,
-239,1,1659,3117,16,
-0,239,1,2413,3118,
-16,0,239,1,406,
-3119,16,0,239,1,
-1371,3120,16,0,239,
-1,166,3121,16,0,
-239,1,1622,3122,16,
-0,239,1,1931,925,
-1,1933,3123,16,0,
-239,1,431,3124,16,
-0,239,1,1585,3125,
-16,0,239,1,182,
-3126,16,0,239,1,
-1189,3127,16,0,239,
-1,1443,3128,16,0,
-239,1,1695,3129,16,
-0,239,1,2198,3130,
-16,0,239,1,447,
-3131,16,0,239,1,
-2458,940,1,2459,946,
-1,1958,3132,16,0,
-239,1,2462,953,1,
-1657,958,1,2464,963,
-1,199,3133,16,0,
-239,1,459,3134,16,
-0,239,1,462,3135,
-16,0,239,1,217,
-3136,16,0,239,1,
-2227,972,1,1225,3137,
-16,0,239,1,1479,
-3138,16,0,239,1,
-1731,3139,16,0,239,
-1,1989,980,1,1990,
-3140,16,0,239,1,
-236,3141,16,0,239,
-1,1756,3142,16,0,
-239,1,38,3143,19,
-238,1,38,3144,5,
-84,1,1011,1166,1,
-1012,3145,16,0,236,
-1,1013,1322,1,262,
-1183,1,1267,3146,16,
-0,236,1,515,3147,
-16,0,236,1,1521,
-3148,16,0,236,1,
-525,1280,1,283,1236,
-1,2299,3149,16,0,
-236,1,42,3150,16,
-0,236,1,40,1241,
-1,44,1247,1,47,
-1248,1,1303,3151,16,
-0,236,1,1555,3152,
-16,0,236,1,50,
-1265,1,48,1254,1,
-49,1260,1,51,1270,
-1,63,1286,1,305,
-1275,1,66,1292,1,
-67,1297,1,68,1302,
-1,69,1307,1,70,
-1312,1,73,3153,16,
-0,236,1,74,1317,
-1,328,1366,1,1048,
-1408,1,82,3154,16,
-0,236,1,1840,3155,
-16,0,236,1,1591,
-3156,16,0,236,1,
-1341,3157,16,0,236,
-1,1096,1376,1,93,
-1382,1,352,1413,1,
-107,3158,16,0,236,
-1,1114,1407,1,118,
-1419,1,1123,3159,16,
-0,236,1,371,1429,
-1,1628,3160,16,0,
-236,1,375,1440,1,
-1882,3161,16,0,236,
-1,377,1445,1,379,
-1450,1,380,1455,1,
-883,1461,1,373,1473,
-1,130,1478,1,143,
-1483,1,387,3162,16,
-0,236,1,1159,3163,
-16,0,236,1,157,
-1506,1,1413,3164,16,
-0,236,1,1665,3165,
-16,0,236,1,412,
-3166,16,0,236,1,
-1377,3167,16,0,236,
-1,172,1532,1,1939,
-3168,16,0,236,1,
-437,3169,16,0,236,
-1,188,1581,1,942,
-1553,1,1195,3170,16,
-0,236,1,1449,3171,
-16,0,236,1,1701,
-3172,16,0,236,1,
-447,1574,1,205,1587,
-1,827,1395,1,2724,
-3173,16,0,236,1,
-223,1598,1,476,1608,
-1,477,1614,1,1231,
-3174,16,0,236,1,
-479,1624,1,480,1629,
-1,1485,3175,16,0,
-236,1,1737,3176,16,
-0,236,1,242,1642,
-1,478,1647,1,1001,
-1652,1,1002,1657,1,
-39,3177,19,229,1,
-39,3178,5,84,1,
-1011,1166,1,1012,3179,
-16,0,227,1,1013,
-1322,1,262,1183,1,
-1267,3180,16,0,227,
-1,515,3181,16,0,
-227,1,1521,3182,16,
-0,227,1,525,1280,
-1,283,1236,1,2299,
-3183,16,0,227,1,
-42,3184,16,0,227,
-1,40,1241,1,44,
-1247,1,47,1248,1,
-1303,3185,16,0,227,
-1,1555,3186,16,0,
-227,1,50,1265,1,
-48,1254,1,49,1260,
-1,51,1270,1,63,
-1286,1,305,1275,1,
-66,1292,1,67,1297,
-1,68,1302,1,69,
-1307,1,70,1312,1,
-73,3187,16,0,227,
-1,74,1317,1,328,
-1366,1,1048,1408,1,
-82,3188,16,0,227,
-1,1840,3189,16,0,
-227,1,1591,3190,16,
-0,227,1,1341,3191,
-16,0,227,1,1096,
-1376,1,93,1382,1,
-352,1413,1,107,3192,
-16,0,227,1,1114,
-1407,1,118,1419,1,
-1123,3193,16,0,227,
-1,371,1429,1,1628,
-3194,16,0,227,1,
-375,1440,1,1882,3195,
-16,0,227,1,377,
-1445,1,379,1450,1,
-380,1455,1,883,1461,
-1,373,1473,1,130,
-1478,1,143,1483,1,
-387,3196,16,0,227,
-1,1159,3197,16,0,
-227,1,157,1506,1,
-1413,3198,16,0,227,
-1,1665,3199,16,0,
-227,1,412,3200,16,
-0,227,1,1377,3201,
-16,0,227,1,172,
-1532,1,1939,3202,16,
-0,227,1,437,3203,
-16,0,227,1,188,
-1581,1,942,1553,1,
-1195,3204,16,0,227,
-1,1449,3205,16,0,
-227,1,1701,3206,16,
-0,227,1,447,1574,
-1,205,1587,1,827,
-1395,1,2724,3207,16,
-0,227,1,223,1598,
-1,476,1608,1,477,
-1614,1,1231,3208,16,
-0,227,1,479,1624,
-1,480,1629,1,1485,
-3209,16,0,227,1,
-1737,3210,16,0,227,
-1,242,1642,1,478,
-1647,1,1001,1652,1,
-1002,1657,1,40,3211,
-19,217,1,40,3212,
-5,84,1,1011,1166,
-1,1012,3213,16,0,
-215,1,1013,1322,1,
-262,1183,1,1267,3214,
-16,0,215,1,515,
-3215,16,0,215,1,
-1521,3216,16,0,215,
-1,525,1280,1,283,
-1236,1,2299,3217,16,
-0,215,1,42,3218,
-16,0,215,1,40,
-1241,1,44,1247,1,
-47,1248,1,1303,3219,
-16,0,215,1,1555,
-3220,16,0,215,1,
-50,1265,1,48,1254,
-1,49,1260,1,51,
-1270,1,63,1286,1,
-305,1275,1,66,1292,
-1,67,1297,1,68,
-1302,1,69,1307,1,
-70,1312,1,73,3221,
-16,0,215,1,74,
-1317,1,328,1366,1,
-1048,1408,1,82,3222,
-16,0,215,1,1840,
-3223,16,0,215,1,
-1591,3224,16,0,215,
-1,1341,3225,16,0,
-215,1,1096,1376,1,
-93,1382,1,352,1413,
-1,107,3226,16,0,
-215,1,1114,1407,1,
-118,3227,16,0,215,
-1,1123,3228,16,0,
-215,1,371,1429,1,
-1628,3229,16,0,215,
-1,375,1440,1,1882,
-3230,16,0,215,1,
-377,1445,1,379,1450,
-1,380,1455,1,883,
-3231,16,0,215,1,
-373,1473,1,130,3232,
-16,0,215,1,143,
-3233,16,0,215,1,
-387,3234,16,0,215,
-1,1159,3235,16,0,
-215,1,157,3236,16,
-0,215,1,1413,3237,
-16,0,215,1,1665,
-3238,16,0,215,1,
-412,3239,16,0,215,
-1,1377,3240,16,0,
-215,1,172,3241,16,
-0,215,1,1939,3242,
-16,0,215,1,437,
-3243,16,0,215,1,
-188,3244,16,0,215,
-1,942,1553,1,1195,
-3245,16,0,215,1,
-1449,3246,16,0,215,
-1,1701,3247,16,0,
-215,1,447,1574,1,
-205,3248,16,0,215,
-1,827,3249,16,0,
-215,1,2724,3250,16,
-0,215,1,223,3251,
-16,0,215,1,476,
-1608,1,477,1614,1,
-1231,3252,16,0,215,
-1,479,1624,1,480,
-1629,1,1485,3253,16,
-0,215,1,1737,3254,
-16,0,215,1,242,
-3255,16,0,215,1,
-478,1647,1,1001,1652,
-1,1002,1657,1,41,
-3256,19,175,1,41,
-3257,5,84,1,1011,
-1166,1,1012,3258,16,
-0,173,1,1013,1322,
-1,262,1183,1,1267,
-3259,16,0,173,1,
-515,3260,16,0,173,
-1,1521,3261,16,0,
-173,1,525,1280,1,
-283,1236,1,2299,3262,
-16,0,173,1,42,
-3263,16,0,173,1,
-40,1241,1,44,1247,
-1,47,1248,1,1303,
-3264,16,0,173,1,
-1555,3265,16,0,173,
-1,50,1265,1,48,
-1254,1,49,1260,1,
-51,1270,1,63,1286,
-1,305,1275,1,66,
-1292,1,67,1297,1,
-68,1302,1,69,1307,
-1,70,1312,1,73,
-3266,16,0,173,1,
-74,1317,1,328,1366,
-1,1048,1408,1,82,
-3267,16,0,173,1,
-1840,3268,16,0,173,
-1,1591,3269,16,0,
-173,1,1341,3270,16,
-0,173,1,1096,1376,
-1,93,1382,1,352,
-1413,1,107,3271,16,
-0,173,1,1114,1407,
-1,118,3272,16,0,
-173,1,1123,3273,16,
-0,173,1,371,1429,
-1,1628,3274,16,0,
-173,1,375,1440,1,
-1882,3275,16,0,173,
-1,377,1445,1,379,
-1450,1,380,1455,1,
-883,3276,16,0,173,
-1,373,1473,1,130,
-3277,16,0,173,1,
-143,3278,16,0,173,
-1,387,3279,16,0,
-173,1,1159,3280,16,
-0,173,1,157,3281,
-16,0,173,1,1413,
-3282,16,0,173,1,
-1665,3283,16,0,173,
-1,412,3284,16,0,
-173,1,1377,3285,16,
-0,173,1,172,3286,
-16,0,173,1,1939,
-3287,16,0,173,1,
-437,3288,16,0,173,
-1,188,3289,16,0,
-173,1,942,1553,1,
-1195,3290,16,0,173,
-1,1449,3291,16,0,
-173,1,1701,3292,16,
-0,173,1,447,1574,
-1,205,3293,16,0,
-173,1,827,3294,16,
-0,173,1,2724,3295,
-16,0,173,1,223,
-3296,16,0,173,1,
-476,1608,1,477,1614,
-1,1231,3297,16,0,
-173,1,479,1624,1,
-480,1629,1,1485,3298,
-16,0,173,1,1737,
-3299,16,0,173,1,
-242,3300,16,0,173,
-1,478,1647,1,1001,
-1652,1,1002,1657,1,
-42,3301,19,411,1,
-42,3302,5,38,1,
-1901,3303,16,0,409,
-1,2075,3304,16,0,
-409,1,1860,885,1,
-1803,851,1,1804,3305,
-16,0,409,1,2413,
-3306,16,0,409,1,
-2198,3307,16,0,409,
-1,1873,899,1,1657,
-958,1,1989,980,1,
-1990,3308,16,0,409,
-1,1775,3309,16,0,
-409,1,32,3310,16,
-0,409,1,2105,878,
-1,2106,3311,16,0,
-409,1,2364,891,1,
-2227,972,1,2337,3312,
-16,0,409,1,2021,
-782,1,2458,940,1,
-2459,946,1,2462,953,
-1,2136,906,1,2464,
-963,1,2029,789,1,
-2030,795,1,2031,800,
-1,2032,805,1,2033,
-810,1,2035,816,1,
-2037,821,1,2039,826,
-1,1931,925,1,2041,
-832,1,2043,838,1,
-2045,843,1,1574,863,
-1,1958,3313,16,0,
-409,1,43,3314,19,
-505,1,43,3315,5,
-25,1,2035,816,1,
-2037,821,1,2039,826,
-1,2041,832,1,2227,
-972,1,2043,838,1,
-1657,958,1,1860,885,
-1,2136,906,1,2021,
-782,1,2459,946,1,
-1574,863,1,2105,3316,
-16,0,626,1,1931,
-925,1,1873,899,1,
-2031,800,1,1803,851,
-1,1989,3317,16,0,
-503,1,2464,963,1,
-2029,789,1,2030,795,
-1,2364,891,1,2032,
-805,1,2033,810,1,
-2045,843,1,44,3318,
-19,265,1,44,3319,
-5,38,1,1901,3320,
-16,0,263,1,2075,
-3321,16,0,263,1,
-1860,885,1,1803,851,
-1,1804,3322,16,0,
-263,1,2413,3323,16,
-0,263,1,2198,3324,
-16,0,263,1,1873,
-899,1,1657,958,1,
-1989,980,1,1990,3325,
-16,0,263,1,1775,
-3326,16,0,263,1,
-32,3327,16,0,263,
-1,2105,878,1,2106,
-3328,16,0,263,1,
-2364,891,1,2227,972,
-1,2337,3329,16,0,
-263,1,2021,782,1,
-2458,940,1,2459,946,
-1,2462,953,1,2136,
-906,1,2464,963,1,
-2029,789,1,2030,795,
-1,2031,800,1,2032,
-805,1,2033,810,1,
-2035,816,1,2037,821,
-1,2039,826,1,1931,
-925,1,2041,832,1,
-2043,838,1,2045,843,
-1,1574,863,1,1958,
-3330,16,0,263,1,
-45,3331,19,295,1,
-45,3332,5,39,1,
-1901,3333,16,0,328,
-1,2075,3334,16,0,
-328,1,1860,885,1,
-1803,851,1,1804,3335,
-16,0,328,1,2413,
-3336,16,0,328,1,
-2198,3337,16,0,328,
-1,1873,899,1,1657,
-958,1,1989,980,1,
-1990,3338,16,0,328,
-1,1775,3339,16,0,
-328,1,32,3340,16,
-0,328,1,2105,878,
-1,2106,3341,16,0,
-328,1,2364,891,1,
-2227,972,1,2337,3342,
-16,0,328,1,2021,
-782,1,2458,940,1,
-2459,946,1,2462,953,
-1,2136,906,1,2464,
-963,1,2029,789,1,
-2030,795,1,2031,800,
-1,2032,805,1,2033,
-810,1,2035,816,1,
-2037,821,1,2039,826,
-1,1931,925,1,2041,
-832,1,2043,838,1,
-2045,843,1,1832,3343,
-16,0,293,1,1574,
-863,1,1958,3344,16,
-0,328,1,46,3345,
-19,729,1,46,3346,
-5,38,1,1901,3347,
-16,0,727,1,2075,
-3348,16,0,727,1,
-1860,885,1,1803,851,
-1,1804,3349,16,0,
-727,1,2413,3350,16,
-0,727,1,2198,3351,
-16,0,727,1,1873,
-899,1,1657,958,1,
-1989,980,1,1990,3352,
-16,0,727,1,1775,
-3353,16,0,727,1,
-32,3354,16,0,727,
-1,2105,878,1,2106,
-3355,16,0,727,1,
-2364,891,1,2227,972,
-1,2337,3356,16,0,
-727,1,2021,782,1,
-2458,940,1,2459,946,
-1,2462,953,1,2136,
-906,1,2464,963,1,
-2029,789,1,2030,795,
-1,2031,800,1,2032,
-805,1,2033,810,1,
-2035,816,1,2037,821,
-1,2039,826,1,1931,
-925,1,2041,832,1,
-2043,838,1,2045,843,
-1,1574,863,1,1958,
-3357,16,0,727,1,
-47,3358,19,618,1,
-47,3359,5,19,1,
-0,3360,16,0,725,
-1,2776,3361,17,3362,
-15,3363,4,36,37,
-0,71,0,108,0,
-111,0,98,0,97,
-0,108,0,68,0,
-101,0,102,0,105,
-0,110,0,105,0,
-116,0,105,0,111,
-0,110,0,115,0,
-1,-1,1,5,3364,
-20,3365,4,38,71,
-0,108,0,111,0,
-98,0,97,0,108,
-0,68,0,101,0,
-102,0,105,0,110,
-0,105,0,116,0,
-105,0,111,0,110,
-0,115,0,95,0,
-49,0,1,158,1,
-3,1,2,1,1,
-3366,22,1,3,1,
-2743,3367,17,3368,15,
-3369,4,52,37,0,
-71,0,108,0,111,
-0,98,0,97,0,
-108,0,86,0,97,
-0,114,0,105,0,
-97,0,98,0,108,
-0,101,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-1,-1,1,5,3370,
-20,3371,4,54,71,
+3255,16,0,231,1,
+412,3256,16,0,231,
+1,1377,3257,16,0,
+231,1,172,1555,1,
+1939,3258,16,0,231,
+1,437,3259,16,0,
+231,1,188,1604,1,
+942,1576,1,1195,3260,
+16,0,231,1,1449,
+3261,16,0,231,1,
+1701,3262,16,0,231,
+1,447,1597,1,205,
+1609,1,827,1418,1,
+223,1619,1,476,1629,
+1,477,1635,1,1231,
+3263,16,0,231,1,
+479,1645,1,480,1650,
+1,1485,3264,16,0,
+231,1,1737,3265,16,
+0,231,1,2746,3266,
+16,0,231,1,242,
+1664,1,478,1669,1,
+1001,1674,1,1002,1679,
+1,40,3267,19,221,
+1,40,3268,5,84,
+1,1011,1188,1,1012,
+3269,16,0,219,1,
+1013,1345,1,262,1205,
+1,1267,3270,16,0,
+219,1,515,3271,16,
+0,219,1,1521,3272,
+16,0,219,1,525,
+1302,1,283,1258,1,
+2299,3273,16,0,219,
+1,42,3274,16,0,
+219,1,40,1263,1,
+44,1269,1,47,1270,
+1,1303,3275,16,0,
+219,1,1555,3276,16,
+0,219,1,50,1287,
+1,48,1276,1,49,
+1282,1,51,1292,1,
+63,1308,1,305,1297,
+1,66,1315,1,67,
+1320,1,68,1325,1,
+69,1330,1,70,1335,
+1,73,3277,16,0,
+219,1,74,1340,1,
+328,1389,1,1048,1431,
+1,82,3278,16,0,
+219,1,1840,3279,16,
+0,219,1,1591,3280,
+16,0,219,1,1341,
+3281,16,0,219,1,
+1096,1399,1,93,1405,
+1,352,1436,1,107,
+3282,16,0,219,1,
+1114,1430,1,118,3283,
+16,0,219,1,1123,
+3284,16,0,219,1,
+371,1452,1,1628,3285,
+16,0,219,1,375,
+1463,1,1882,3286,16,
+0,219,1,377,1468,
+1,379,1473,1,380,
+1478,1,883,3287,16,
+0,219,1,373,1496,
+1,130,3288,16,0,
+219,1,143,3289,16,
+0,219,1,387,3290,
+16,0,219,1,1159,
+3291,16,0,219,1,
+157,3292,16,0,219,
+1,1413,3293,16,0,
+219,1,1665,3294,16,
+0,219,1,412,3295,
+16,0,219,1,1377,
+3296,16,0,219,1,
+172,3297,16,0,219,
+1,1939,3298,16,0,
+219,1,437,3299,16,
+0,219,1,188,3300,
+16,0,219,1,942,
+1576,1,1195,3301,16,
+0,219,1,1449,3302,
+16,0,219,1,1701,
+3303,16,0,219,1,
+447,1597,1,205,3304,
+16,0,219,1,827,
+3305,16,0,219,1,
+223,3306,16,0,219,
+1,476,1629,1,477,
+1635,1,1231,3307,16,
+0,219,1,479,1645,
+1,480,1650,1,1485,
+3308,16,0,219,1,
+1737,3309,16,0,219,
+1,2746,3310,16,0,
+219,1,242,3311,16,
+0,219,1,478,1669,
+1,1001,1674,1,1002,
+1679,1,41,3312,19,
+183,1,41,3313,5,
+84,1,1011,1188,1,
+1012,3314,16,0,181,
+1,1013,1345,1,262,
+1205,1,1267,3315,16,
+0,181,1,515,3316,
+16,0,181,1,1521,
+3317,16,0,181,1,
+525,1302,1,283,1258,
+1,2299,3318,16,0,
+181,1,42,3319,16,
+0,181,1,40,1263,
+1,44,1269,1,47,
+1270,1,1303,3320,16,
+0,181,1,1555,3321,
+16,0,181,1,50,
+1287,1,48,1276,1,
+49,1282,1,51,1292,
+1,63,1308,1,305,
+1297,1,66,1315,1,
+67,1320,1,68,1325,
+1,69,1330,1,70,
+1335,1,73,3322,16,
+0,181,1,74,1340,
+1,328,1389,1,1048,
+1431,1,82,3323,16,
+0,181,1,1840,3324,
+16,0,181,1,1591,
+3325,16,0,181,1,
+1341,3326,16,0,181,
+1,1096,1399,1,93,
+1405,1,352,1436,1,
+107,3327,16,0,181,
+1,1114,1430,1,118,
+3328,16,0,181,1,
+1123,3329,16,0,181,
+1,371,1452,1,1628,
+3330,16,0,181,1,
+375,1463,1,1882,3331,
+16,0,181,1,377,
+1468,1,379,1473,1,
+380,1478,1,883,3332,
+16,0,181,1,373,
+1496,1,130,3333,16,
+0,181,1,143,3334,
+16,0,181,1,387,
+3335,16,0,181,1,
+1159,3336,16,0,181,
+1,157,3337,16,0,
+181,1,1413,3338,16,
+0,181,1,1665,3339,
+16,0,181,1,412,
+3340,16,0,181,1,
+1377,3341,16,0,181,
+1,172,3342,16,0,
+181,1,1939,3343,16,
+0,181,1,437,3344,
+16,0,181,1,188,
+3345,16,0,181,1,
+942,1576,1,1195,3346,
+16,0,181,1,1449,
+3347,16,0,181,1,
+1701,3348,16,0,181,
+1,447,1597,1,205,
+3349,16,0,181,1,
+827,3350,16,0,181,
+1,223,3351,16,0,
+181,1,476,1629,1,
+477,1635,1,1231,3352,
+16,0,181,1,479,
+1645,1,480,1650,1,
+1485,3353,16,0,181,
+1,1737,3354,16,0,
+181,1,2746,3355,16,
+0,181,1,242,3356,
+16,0,181,1,478,
+1669,1,1001,1674,1,
+1002,1679,1,42,3357,
+19,406,1,42,3358,
+5,38,1,1901,3359,
+16,0,404,1,2075,
+3360,16,0,404,1,
+1860,907,1,1803,873,
+1,1804,3361,16,0,
+404,1,2413,3362,16,
+0,404,1,2198,3363,
+16,0,404,1,1873,
+921,1,1657,979,1,
+1989,1002,1,1990,3364,
+16,0,404,1,1775,
+3365,16,0,404,1,
+32,3366,16,0,404,
+1,2105,900,1,2106,
+3367,16,0,404,1,
+2364,913,1,2227,993,
+1,2337,3368,16,0,
+404,1,2021,804,1,
+2458,961,1,2459,967,
+1,2462,974,1,2136,
+928,1,2464,984,1,
+2029,811,1,2030,817,
+1,2031,822,1,2032,
+827,1,2033,832,1,
+2035,838,1,2037,843,
+1,2039,848,1,1931,
+946,1,2041,854,1,
+2043,860,1,2045,865,
+1,1574,885,1,1958,
+3369,16,0,404,1,
+43,3370,19,507,1,
+43,3371,5,25,1,
+2035,838,1,2037,843,
+1,2039,848,1,2041,
+854,1,2227,993,1,
+2043,860,1,1657,979,
+1,1860,907,1,2136,
+928,1,2021,804,1,
+2459,967,1,1574,885,
+1,2105,3372,16,0,
+654,1,1931,946,1,
+1873,921,1,2031,822,
+1,1803,873,1,1989,
+3373,16,0,505,1,
+2464,984,1,2029,811,
+1,2030,817,1,2364,
+913,1,2032,827,1,
+2033,832,1,2045,865,
+1,44,3374,19,278,
+1,44,3375,5,38,
+1,1901,3376,16,0,
+276,1,2075,3377,16,
+0,276,1,1860,907,
+1,1803,873,1,1804,
+3378,16,0,276,1,
+2413,3379,16,0,276,
+1,2198,3380,16,0,
+276,1,1873,921,1,
+1657,979,1,1989,1002,
+1,1990,3381,16,0,
+276,1,1775,3382,16,
+0,276,1,32,3383,
+16,0,276,1,2105,
+900,1,2106,3384,16,
+0,276,1,2364,913,
+1,2227,993,1,2337,
+3385,16,0,276,1,
+2021,804,1,2458,961,
+1,2459,967,1,2462,
+974,1,2136,928,1,
+2464,984,1,2029,811,
+1,2030,817,1,2031,
+822,1,2032,827,1,
+2033,832,1,2035,838,
+1,2037,843,1,2039,
+848,1,1931,946,1,
+2041,854,1,2043,860,
+1,2045,865,1,1574,
+885,1,1958,3386,16,
+0,276,1,45,3387,
+19,303,1,45,3388,
+5,39,1,1901,3389,
+16,0,330,1,2075,
+3390,16,0,330,1,
+1860,907,1,1803,873,
+1,1804,3391,16,0,
+330,1,2413,3392,16,
+0,330,1,2198,3393,
+16,0,330,1,1873,
+921,1,1657,979,1,
+1989,1002,1,1990,3394,
+16,0,330,1,1775,
+3395,16,0,330,1,
+32,3396,16,0,330,
+1,2105,900,1,2106,
+3397,16,0,330,1,
+2364,913,1,2227,993,
+1,2337,3398,16,0,
+330,1,2021,804,1,
+2458,961,1,2459,967,
+1,2462,974,1,2136,
+928,1,2464,984,1,
+2029,811,1,2030,817,
+1,2031,822,1,2032,
+827,1,2033,832,1,
+2035,838,1,2037,843,
+1,2039,848,1,1931,
+946,1,2041,854,1,
+2043,860,1,2045,865,
+1,1832,3399,16,0,
+301,1,1574,885,1,
+1958,3400,16,0,330,
+1,46,3401,19,752,
+1,46,3402,5,38,
+1,1901,3403,16,0,
+750,1,2075,3404,16,
+0,750,1,1860,907,
+1,1803,873,1,1804,
+3405,16,0,750,1,
+2413,3406,16,0,750,
+1,2198,3407,16,0,
+750,1,1873,921,1,
+1657,979,1,1989,1002,
+1,1990,3408,16,0,
+750,1,1775,3409,16,
+0,750,1,32,3410,
+16,0,750,1,2105,
+900,1,2106,3411,16,
+0,750,1,2364,913,
+1,2227,993,1,2337,
+3412,16,0,750,1,
+2021,804,1,2458,961,
+1,2459,967,1,2462,
+974,1,2136,928,1,
+2464,984,1,2029,811,
+1,2030,817,1,2031,
+822,1,2032,827,1,
+2033,832,1,2035,838,
+1,2037,843,1,2039,
+848,1,1931,946,1,
+2041,854,1,2043,860,
+1,2045,865,1,1574,
+885,1,1958,3413,16,
+0,750,1,47,3414,
+19,625,1,47,3415,
+5,19,1,0,3416,
+16,0,623,1,2776,
+3417,17,3418,15,3419,
+4,52,37,0,71,
 0,108,0,111,0,
 98,0,97,0,108,
 0,86,0,97,0,
@@ -9255,87 +9482,101 @@ public yyLSLSyntax
 0,99,0,108,0,
 97,0,114,0,97,
 0,116,0,105,0,
-111,0,110,0,95,
-0,50,0,1,163,
-1,3,1,5,1,
-4,3372,22,1,8,
-1,2022,3373,16,0,
-616,1,2775,3374,17,
-3375,15,3363,1,-1,
-1,5,3376,20,3377,
-4,38,71,0,108,
+111,0,110,0,1,
+-1,1,5,3420,20,
+3421,4,54,71,0,
+108,0,111,0,98,
+0,97,0,108,0,
+86,0,97,0,114,
+0,105,0,97,0,
+98,0,108,0,101,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,95,0,
+49,0,1,166,1,
+3,1,3,1,2,
+3422,22,1,7,1,
+2777,3423,16,0,623,
+1,2711,765,1,2788,
+3424,16,0,623,1,
+2722,788,1,2022,3425,
+16,0,645,1,2459,
+967,1,2795,3426,17,
+3427,15,3428,4,36,
+37,0,71,0,108,
 0,111,0,98,0,
 97,0,108,0,68,
 0,101,0,102,0,
 105,0,110,0,105,
 0,116,0,105,0,
 111,0,110,0,115,
-0,95,0,51,0,
-1,160,1,3,1,
-2,1,1,3378,22,
-1,5,1,2699,761,
-1,2715,3379,17,3380,
-15,3381,4,50,37,
-0,71,0,108,0,
+0,1,-1,1,5,
+3429,20,3430,4,38,
+71,0,108,0,111,
+0,98,0,97,0,
+108,0,68,0,101,
+0,102,0,105,0,
+110,0,105,0,116,
+0,105,0,111,0,
+110,0,115,0,95,
+0,52,0,1,165,
+1,3,1,3,1,
+2,3431,22,1,6,
+1,2796,3432,17,3433,
+15,3428,1,-1,1,
+5,3434,20,3435,4,
+38,71,0,108,0,
 111,0,98,0,97,
-0,108,0,70,0,
-117,0,110,0,99,
-0,116,0,105,0,
-111,0,110,0,68,
+0,108,0,68,0,
+101,0,102,0,105,
+0,110,0,105,0,
+116,0,105,0,111,
+0,110,0,115,0,
+95,0,50,0,1,
+163,1,3,1,3,
+1,2,3436,22,1,
+4,1,2797,3437,17,
+3438,15,3428,1,-1,
+1,5,3439,20,3440,
+4,38,71,0,108,
+0,111,0,98,0,
+97,0,108,0,68,
 0,101,0,102,0,
 105,0,110,0,105,
 0,116,0,105,0,
-111,0,110,0,1,
--1,1,5,3382,20,
-3383,4,52,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
-70,0,117,0,110,
-0,99,0,116,0,
-105,0,111,0,110,
-0,68,0,101,0,
-102,0,105,0,110,
-0,105,0,116,0,
-105,0,111,0,110,
-0,95,0,49,0,
+111,0,110,0,115,
+0,95,0,51,0,
 1,164,1,3,1,
-6,1,5,3384,22,
-1,9,1,2774,3385,
-17,3386,15,3363,1,
--1,1,5,3387,20,
-3388,4,38,71,0,
+2,1,1,3441,22,
+1,5,1,2798,3442,
+17,3443,15,3428,1,
+-1,1,5,3444,20,
+3445,4,38,71,0,
 108,0,111,0,98,
 0,97,0,108,0,
 68,0,101,0,102,
 0,105,0,110,0,
 105,0,116,0,105,
 0,111,0,110,0,
-115,0,95,0,50,
-0,1,159,1,3,
-1,3,1,2,3389,
-22,1,4,1,2754,
-3390,17,3391,15,3369,
-1,-1,1,5,3392,
-20,3393,4,54,71,
+115,0,95,0,49,
+0,1,162,1,3,
+1,2,1,1,3446,
+22,1,3,1,2466,
+3447,17,3448,15,3449,
+4,50,37,0,71,
 0,108,0,111,0,
 98,0,97,0,108,
-0,86,0,97,0,
-114,0,105,0,97,
-0,98,0,108,0,
-101,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,95,
-0,49,0,1,162,
-1,3,1,3,1,
-2,3394,22,1,7,
-1,2755,3395,16,0,
-725,1,2598,755,1,
-2464,963,1,2459,946,
-1,2466,3396,17,3397,
-15,3381,1,-1,1,
-5,3398,20,3399,4,
+0,70,0,117,0,
+110,0,99,0,116,
+0,105,0,111,0,
+110,0,68,0,101,
+0,102,0,105,0,
+110,0,105,0,116,
+0,105,0,111,0,
+110,0,1,-1,1,
+5,3450,20,3451,4,
 52,71,0,108,0,
 111,0,98,0,97,
 0,108,0,70,0,
@@ -9346,2599 +9587,2676 @@ public yyLSLSyntax
 105,0,110,0,105,
 0,116,0,105,0,
 111,0,110,0,95,
-0,50,0,1,165,
+0,50,0,1,169,
 1,3,1,7,1,
-6,3400,22,1,10,
-1,2690,771,1,2766,
-3401,16,0,725,1,
-2696,3402,16,0,725,
-1,2773,3403,17,3404,
-15,3363,1,-1,1,
-5,3405,20,3406,4,
-38,71,0,108,0,
-111,0,98,0,97,
-0,108,0,68,0,
-101,0,102,0,105,
-0,110,0,105,0,
-116,0,105,0,111,
-0,110,0,115,0,
-95,0,52,0,1,
-161,1,3,1,3,
-1,2,3407,22,1,
-6,1,2700,743,1,
-48,3408,19,356,1,
-48,3409,5,54,1,
-0,3410,16,0,354,
-1,2075,3411,16,0,
-544,1,2773,3403,1,
-1860,885,1,1804,3412,
-16,0,544,1,2413,
-3413,16,0,544,1,
-2743,3367,1,1873,899,
-1,1657,958,1,2030,
-795,1,1989,980,1,
-1990,3414,16,0,544,
-1,2754,3390,1,2755,
-3415,16,0,354,1,
-1775,3416,16,0,544,
-1,32,3417,16,0,
-544,1,2105,878,1,
-2106,3418,16,0,544,
-1,2699,761,1,2766,
-3419,16,0,354,1,
-2227,972,1,2337,3420,
-16,0,544,1,2774,
-3385,1,2775,3374,1,
-2776,3361,1,2696,3421,
-16,0,354,1,1803,
-851,1,2458,940,1,
-1901,3422,16,0,544,
-1,2462,953,1,2136,
-906,1,2464,963,1,
-2029,789,1,2466,3396,
-1,2031,800,1,2032,
-805,1,2033,810,1,
-2035,816,1,2690,771,
-1,2364,891,1,2715,
-3379,1,2039,826,1,
-1931,925,1,2041,832,
-1,2021,782,1,2043,
-838,1,2045,843,1,
-2700,743,1,2198,3423,
-16,0,544,1,2598,
-755,1,2037,821,1,
-1574,863,1,1958,3424,
-16,0,544,1,2459,
-946,1,49,3425,19,
-549,1,49,3426,5,
-38,1,1901,3427,16,
-0,547,1,2075,3428,
-16,0,547,1,1860,
-885,1,1803,851,1,
-1804,3429,16,0,547,
-1,2413,3430,16,0,
-547,1,2198,3431,16,
-0,547,1,1873,899,
-1,1657,958,1,1989,
-980,1,1990,3432,16,
-0,547,1,1775,3433,
-16,0,547,1,32,
-3434,16,0,547,1,
-2105,878,1,2106,3435,
-16,0,547,1,2364,
-891,1,2227,972,1,
-2337,3436,16,0,547,
-1,2021,782,1,2458,
-940,1,2459,946,1,
-2462,953,1,2136,906,
-1,2464,963,1,2029,
-789,1,2030,795,1,
-2031,800,1,2032,805,
-1,2033,810,1,2035,
-816,1,2037,821,1,
-2039,826,1,1931,925,
-1,2041,832,1,2043,
-838,1,2045,843,1,
-1574,863,1,1958,3437,
-16,0,547,1,50,
-3438,19,670,1,50,
-3439,5,38,1,1901,
-3440,16,0,668,1,
-2075,3441,16,0,668,
-1,1860,885,1,1803,
-851,1,1804,3442,16,
-0,668,1,2413,3443,
-16,0,668,1,2198,
-3444,16,0,668,1,
-1873,899,1,1657,958,
-1,1989,980,1,1990,
-3445,16,0,668,1,
-1775,3446,16,0,668,
-1,32,3447,16,0,
-668,1,2105,878,1,
-2106,3448,16,0,668,
-1,2364,891,1,2227,
-972,1,2337,3449,16,
-0,668,1,2021,782,
-1,2458,940,1,2459,
-946,1,2462,953,1,
-2136,906,1,2464,963,
-1,2029,789,1,2030,
-795,1,2031,800,1,
-2032,805,1,2033,810,
-1,2035,816,1,2037,
-821,1,2039,826,1,
-1931,925,1,2041,832,
-1,2043,838,1,2045,
-843,1,1574,863,1,
-1958,3450,16,0,668,
-1,51,3451,19,127,
-1,51,3452,5,54,
-1,0,3453,16,0,
-125,1,2538,3454,16,
-0,125,1,2075,3455,
-16,0,125,1,1860,
-885,1,2515,3456,16,
-0,465,1,1804,3457,
-16,0,125,1,10,
-3458,16,0,125,1,
-2413,3459,16,0,125,
-1,2743,3367,1,1873,
-899,1,21,3460,16,
-0,125,1,1657,958,
-1,2030,795,1,2773,
-3403,1,1990,3461,16,
-0,125,1,2754,3390,
-1,2755,3462,16,0,
-125,1,1775,3463,16,
-0,125,1,32,3464,
-16,0,125,1,2105,
-878,1,2106,3465,16,
-0,125,1,2227,972,
-1,2337,3466,16,0,
-125,1,2774,3385,1,
-2775,3374,1,2776,3361,
-1,52,3467,16,0,
-125,1,1803,851,1,
-2458,940,1,1901,3468,
-16,0,125,1,2462,
-953,1,2136,906,1,
-2464,963,1,2029,789,
-1,2466,3396,1,2031,
-800,1,2032,805,1,
-2033,810,1,2035,816,
-1,2364,891,1,2715,
-3379,1,2039,826,1,
-1931,925,1,2041,832,
-1,2021,782,1,2043,
-838,1,2045,843,1,
-2702,3469,16,0,125,
-1,2198,3470,16,0,
-125,1,1989,980,1,
-2037,821,1,1574,863,
-1,1958,3471,16,0,
-125,1,2459,946,1,
-52,3472,19,124,1,
-52,3473,5,53,1,
-0,3474,16,0,122,
-1,2075,3475,16,0,
-122,1,1860,885,1,
-1804,3476,16,0,122,
-1,10,3477,16,0,
-122,1,2413,3478,16,
-0,122,1,2743,3367,
-1,1873,899,1,21,
-3479,16,0,122,1,
-1657,958,1,2030,795,
-1,2773,3403,1,1990,
-3480,16,0,122,1,
-2754,3390,1,2755,3481,
-16,0,122,1,2538,
-3482,16,0,122,1,
-32,3483,16,0,122,
-1,2105,878,1,2106,
-3484,16,0,122,1,
-2227,972,1,2337,3485,
-16,0,122,1,2198,
-3486,16,0,122,1,
-2775,3374,1,2776,3361,
-1,52,3487,16,0,
-122,1,1803,851,1,
-2458,940,1,1901,3488,
-16,0,122,1,2462,
-953,1,2136,906,1,
-2464,963,1,2029,789,
-1,2466,3396,1,2031,
-800,1,2032,805,1,
-2033,810,1,2035,816,
-1,2364,891,1,2715,
-3379,1,2039,826,1,
-1931,925,1,2041,832,
-1,2021,782,1,2043,
-838,1,2045,843,1,
-2702,3489,16,0,122,
-1,1775,3490,16,0,
-122,1,1989,980,1,
-2774,3385,1,2037,821,
-1,1574,863,1,1958,
-3491,16,0,122,1,
-2459,946,1,53,3492,
-19,121,1,53,3493,
-5,53,1,0,3494,
-16,0,119,1,2075,
-3495,16,0,119,1,
-1860,885,1,1804,3496,
-16,0,119,1,10,
-3497,16,0,119,1,
-2413,3498,16,0,119,
-1,2743,3367,1,1873,
-899,1,21,3499,16,
-0,119,1,1657,958,
-1,2030,795,1,2773,
-3403,1,1990,3500,16,
-0,119,1,2754,3390,
-1,2755,3501,16,0,
-119,1,2538,3502,16,
-0,119,1,32,3503,
-16,0,119,1,2105,
-878,1,2106,3504,16,
-0,119,1,2227,972,
-1,2337,3505,16,0,
-119,1,2198,3506,16,
-0,119,1,2775,3374,
-1,2776,3361,1,52,
-3507,16,0,119,1,
-1803,851,1,2458,940,
-1,1901,3508,16,0,
-119,1,2462,953,1,
-2136,906,1,2464,963,
-1,2029,789,1,2466,
-3396,1,2031,800,1,
-2032,805,1,2033,810,
-1,2035,816,1,2364,
-891,1,2715,3379,1,
-2039,826,1,1931,925,
-1,2041,832,1,2021,
-782,1,2043,838,1,
-2045,843,1,2702,3509,
-16,0,119,1,1775,
-3510,16,0,119,1,
-1989,980,1,2774,3385,
-1,2037,821,1,1574,
-863,1,1958,3511,16,
-0,119,1,2459,946,
-1,54,3512,19,118,
-1,54,3513,5,54,
-1,0,3514,16,0,
-116,1,2538,3515,16,
-0,116,1,2075,3516,
-16,0,116,1,1860,
-885,1,1804,3517,16,
-0,116,1,10,3518,
-16,0,116,1,2413,
-3519,16,0,116,1,
-2524,3520,16,0,480,
-1,2743,3367,1,1873,
-899,1,21,3521,16,
-0,116,1,1657,958,
-1,2030,795,1,2773,
-3403,1,1990,3522,16,
-0,116,1,2754,3390,
-1,2755,3523,16,0,
-116,1,1775,3524,16,
-0,116,1,32,3525,
-16,0,116,1,2105,
-878,1,2106,3526,16,
-0,116,1,2227,972,
-1,2337,3527,16,0,
-116,1,2774,3385,1,
-2775,3374,1,2776,3361,
-1,52,3528,16,0,
-116,1,1803,851,1,
-2458,940,1,1901,3529,
-16,0,116,1,2462,
-953,1,2136,906,1,
-2464,963,1,2029,789,
-1,2466,3396,1,2031,
-800,1,2032,805,1,
-2033,810,1,2035,816,
-1,2364,891,1,2715,
-3379,1,2039,826,1,
-1931,925,1,2041,832,
-1,2021,782,1,2043,
-838,1,2045,843,1,
-2702,3530,16,0,116,
-1,2198,3531,16,0,
-116,1,1989,980,1,
-2037,821,1,1574,863,
-1,1958,3532,16,0,
-116,1,2459,946,1,
-55,3533,19,115,1,
-55,3534,5,54,1,
-0,3535,16,0,113,
-1,2538,3536,16,0,
-113,1,2075,3537,16,
-0,113,1,1860,885,
-1,1804,3538,16,0,
-113,1,10,3539,16,
-0,113,1,2413,3540,
-16,0,113,1,2743,
-3367,1,1873,899,1,
-21,3541,16,0,113,
-1,1657,958,1,2030,
-795,1,2773,3403,1,
-1990,3542,16,0,113,
-1,2754,3390,1,2755,
-3543,16,0,113,1,
-1775,3544,16,0,113,
-1,32,3545,16,0,
-113,1,2105,878,1,
-2041,832,1,2227,972,
-1,2337,3546,16,0,
-113,1,2774,3385,1,
-2775,3374,1,2776,3361,
-1,52,3547,16,0,
-113,1,1803,851,1,
-2458,940,1,1901,3548,
-16,0,113,1,2462,
-953,1,2136,906,1,
-2464,963,1,2029,789,
-1,2466,3396,1,2031,
-800,1,2032,805,1,
-2033,810,1,2035,816,
-1,2364,891,1,2715,
-3379,1,2039,826,1,
-1931,925,1,2506,3549,
-16,0,451,1,2021,
-782,1,2043,838,1,
-2045,843,1,2702,3550,
-16,0,113,1,2198,
-3551,16,0,113,1,
-1989,980,1,2037,821,
-1,1574,863,1,2106,
-3552,16,0,113,1,
-1958,3553,16,0,113,
-1,2459,946,1,56,
-3554,19,112,1,56,
-3555,5,53,1,0,
-3556,16,0,110,1,
-2075,3557,16,0,110,
-1,1860,885,1,1804,
-3558,16,0,110,1,
-10,3559,16,0,110,
-1,2413,3560,16,0,
-110,1,2743,3367,1,
-1873,899,1,21,3561,
-16,0,110,1,1657,
-958,1,2030,795,1,
-2773,3403,1,1990,3562,
-16,0,110,1,2754,
-3390,1,2755,3563,16,
-0,110,1,2538,3564,
-16,0,110,1,32,
-3565,16,0,110,1,
-2105,878,1,2106,3566,
-16,0,110,1,2227,
-972,1,2337,3567,16,
-0,110,1,2198,3568,
-16,0,110,1,2775,
-3374,1,2776,3361,1,
-52,3569,16,0,110,
-1,1803,851,1,2458,
-940,1,1901,3570,16,
-0,110,1,2462,953,
-1,2136,906,1,2464,
-963,1,2029,789,1,
-2466,3396,1,2031,800,
-1,2032,805,1,2033,
-810,1,2035,816,1,
-2364,891,1,2715,3379,
-1,2039,826,1,1931,
-925,1,2041,832,1,
-2021,782,1,2043,838,
-1,2045,843,1,2702,
-3571,16,0,110,1,
-1775,3572,16,0,110,
-1,1989,980,1,2774,
-3385,1,2037,821,1,
-1574,863,1,1958,3573,
-16,0,110,1,2459,
-946,1,57,3574,19,
-109,1,57,3575,5,
-53,1,0,3576,16,
-0,107,1,2075,3577,
-16,0,107,1,1860,
-885,1,1804,3578,16,
-0,107,1,10,3579,
+6,3452,22,1,10,
+1,2615,793,1,2765,
+3453,17,3454,15,3419,
+1,-1,1,5,3455,
+20,3456,4,54,71,
+0,108,0,111,0,
+98,0,97,0,108,
+0,86,0,97,0,
+114,0,105,0,97,
+0,98,0,108,0,
+101,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,95,
+0,50,0,1,167,
+1,3,1,5,1,
+4,3457,22,1,8,
+1,2464,984,1,2718,
+3458,16,0,623,1,
+2721,777,1,2737,3459,
+17,3460,15,3449,1,
+-1,1,5,3461,20,
+3462,4,52,71,0,
+108,0,111,0,98,
+0,97,0,108,0,
+70,0,117,0,110,
+0,99,0,116,0,
+105,0,111,0,110,
+0,68,0,101,0,
+102,0,105,0,110,
+0,105,0,116,0,
+105,0,111,0,110,
+0,95,0,49,0,
+1,168,1,3,1,
+6,1,5,3463,22,
+1,9,1,48,3464,
+19,351,1,48,3465,
+5,54,1,0,3466,
+16,0,349,1,2075,
+3467,16,0,546,1,
+1860,907,1,1804,3468,
+16,0,546,1,2737,
+3459,1,2337,3469,16,
+0,546,1,2413,3470,
+16,0,546,1,2198,
+3471,16,0,546,1,
+1873,921,1,1657,979,
+1,2030,817,1,2032,
+827,1,1989,1002,1,
+1990,3472,16,0,546,
+1,2035,838,1,1775,
+3473,16,0,546,1,
+32,3474,16,0,546,
+1,2105,900,1,2106,
+3475,16,0,546,1,
+2721,777,1,2765,3453,
+1,2227,993,1,1901,
+3476,16,0,546,1,
+2776,3417,1,2777,3477,
+16,0,349,1,1803,
+873,1,2458,961,1,
+2459,967,1,2788,3478,
+16,0,349,1,2462,
+974,1,2136,928,1,
+2464,984,1,2029,811,
+1,2466,3447,1,2031,
+822,1,2795,3426,1,
+2796,3432,1,2797,3437,
+1,2798,3442,1,2364,
+913,1,2039,848,1,
+1931,946,1,2041,854,
+1,2021,804,1,2043,
+860,1,2045,865,1,
+2033,832,1,2711,765,
+1,2037,843,1,1574,
+885,1,2718,3479,16,
+0,349,1,1958,3480,
+16,0,546,1,2722,
+788,1,2615,793,1,
+49,3481,19,551,1,
+49,3482,5,38,1,
+1901,3483,16,0,549,
+1,2075,3484,16,0,
+549,1,1860,907,1,
+1803,873,1,1804,3485,
+16,0,549,1,2413,
+3486,16,0,549,1,
+2198,3487,16,0,549,
+1,1873,921,1,1657,
+979,1,1989,1002,1,
+1990,3488,16,0,549,
+1,1775,3489,16,0,
+549,1,32,3490,16,
+0,549,1,2105,900,
+1,2106,3491,16,0,
+549,1,2364,913,1,
+2227,993,1,2337,3492,
+16,0,549,1,2021,
+804,1,2458,961,1,
+2459,967,1,2462,974,
+1,2136,928,1,2464,
+984,1,2029,811,1,
+2030,817,1,2031,822,
+1,2032,827,1,2033,
+832,1,2035,838,1,
+2037,843,1,2039,848,
+1,1931,946,1,2041,
+854,1,2043,860,1,
+2045,865,1,1574,885,
+1,1958,3493,16,0,
+549,1,50,3494,19,
+689,1,50,3495,5,
+38,1,1901,3496,16,
+0,687,1,2075,3497,
+16,0,687,1,1860,
+907,1,1803,873,1,
+1804,3498,16,0,687,
+1,2413,3499,16,0,
+687,1,2198,3500,16,
+0,687,1,1873,921,
+1,1657,979,1,1989,
+1002,1,1990,3501,16,
+0,687,1,1775,3502,
+16,0,687,1,32,
+3503,16,0,687,1,
+2105,900,1,2106,3504,
+16,0,687,1,2364,
+913,1,2227,993,1,
+2337,3505,16,0,687,
+1,2021,804,1,2458,
+961,1,2459,967,1,
+2462,974,1,2136,928,
+1,2464,984,1,2029,
+811,1,2030,817,1,
+2031,822,1,2032,827,
+1,2033,832,1,2035,
+838,1,2037,843,1,
+2039,848,1,1931,946,
+1,2041,854,1,2043,
+860,1,2045,865,1,
+1574,885,1,1958,3506,
+16,0,687,1,51,
+3507,19,127,1,51,
+3508,5,55,1,0,
+3509,16,0,125,1,
+2075,3510,16,0,125,
+1,1860,907,1,10,
+3511,16,0,125,1,
+2737,3459,1,2337,3512,
+16,0,125,1,2413,
+3513,16,0,125,1,
+2198,3514,16,0,125,
+1,1873,921,1,21,
+3515,16,0,125,1,
+1657,979,1,2531,3516,
+16,0,446,1,2032,
+827,1,1989,1002,1,
+1990,3517,16,0,125,
+1,2458,961,1,1775,
+3518,16,0,125,1,
+32,3519,16,0,125,
+1,2105,900,1,2106,
+3520,16,0,125,1,
+2765,3453,1,2553,3521,
+16,0,125,1,2227,
+993,1,1901,3522,16,
+0,125,1,2776,3417,
+1,52,3523,16,0,
+125,1,1803,873,1,
+1804,3524,16,0,125,
+1,2459,967,1,2462,
+974,1,2136,928,1,
+2464,984,1,2029,811,
+1,2466,3447,1,2031,
+822,1,2795,3426,1,
+2796,3432,1,2797,3437,
+1,2798,3442,1,2364,
+913,1,2039,848,1,
+1931,946,1,2041,854,
+1,2021,804,1,2043,
+860,1,2045,865,1,
+2724,3525,16,0,125,
+1,2030,817,1,2033,
+832,1,2035,838,1,
+2037,843,1,2777,3526,
+16,0,125,1,1574,
+885,1,1958,3527,16,
+0,125,1,2506,3528,
+16,0,446,1,52,
+3529,19,124,1,52,
+3530,5,53,1,0,
+3531,16,0,122,1,
+2075,3532,16,0,122,
+1,1860,907,1,1804,
+3533,16,0,122,1,
+10,3534,16,0,122,
+1,2737,3459,1,2337,
+3535,16,0,122,1,
+2413,3536,16,0,122,
+1,2198,3537,16,0,
+122,1,1873,921,1,
+21,3538,16,0,122,
+1,1657,979,1,2030,
+817,1,2032,827,1,
+1989,1002,1,1990,3539,
+16,0,122,1,2035,
+838,1,1775,3540,16,
+0,122,1,32,3541,
+16,0,122,1,2105,
+900,1,2106,3542,16,
+0,122,1,2765,3453,
+1,2553,3543,16,0,
+122,1,2227,993,1,
+1901,3544,16,0,122,
+1,2776,3417,1,52,
+3545,16,0,122,1,
+1803,873,1,2458,961,
+1,2459,967,1,2462,
+974,1,2136,928,1,
+2464,984,1,2029,811,
+1,2466,3447,1,2031,
+822,1,2795,3426,1,
+2796,3432,1,2797,3437,
+1,2798,3442,1,2364,
+913,1,2039,848,1,
+1931,946,1,2041,854,
+1,2021,804,1,2043,
+860,1,2045,865,1,
+2033,832,1,2037,843,
+1,2777,3546,16,0,
+122,1,1574,885,1,
+1958,3547,16,0,122,
+1,2724,3548,16,0,
+122,1,53,3549,19,
+121,1,53,3550,5,
+53,1,0,3551,16,
+0,119,1,2075,3552,
+16,0,119,1,1860,
+907,1,1804,3553,16,
+0,119,1,10,3554,
+16,0,119,1,2737,
+3459,1,2337,3555,16,
+0,119,1,2413,3556,
+16,0,119,1,2198,
+3557,16,0,119,1,
+1873,921,1,21,3558,
+16,0,119,1,1657,
+979,1,2030,817,1,
+2032,827,1,1989,1002,
+1,1990,3559,16,0,
+119,1,2035,838,1,
+1775,3560,16,0,119,
+1,32,3561,16,0,
+119,1,2105,900,1,
+2106,3562,16,0,119,
+1,2765,3453,1,2553,
+3563,16,0,119,1,
+2227,993,1,1901,3564,
+16,0,119,1,2776,
+3417,1,52,3565,16,
+0,119,1,1803,873,
+1,2458,961,1,2459,
+967,1,2462,974,1,
+2136,928,1,2464,984,
+1,2029,811,1,2466,
+3447,1,2031,822,1,
+2795,3426,1,2796,3432,
+1,2797,3437,1,2798,
+3442,1,2364,913,1,
+2039,848,1,1931,946,
+1,2041,854,1,2021,
+804,1,2043,860,1,
+2045,865,1,2033,832,
+1,2037,843,1,2777,
+3566,16,0,119,1,
+1574,885,1,1958,3567,
+16,0,119,1,2724,
+3568,16,0,119,1,
+54,3569,19,118,1,
+54,3570,5,54,1,
+0,3571,16,0,116,
+1,2539,3572,16,0,
+497,1,1860,907,1,
+1804,3573,16,0,116,
+1,10,3574,16,0,
+116,1,2737,3459,1,
+2337,3575,16,0,116,
+1,2413,3576,16,0,
+116,1,2198,3577,16,
+0,116,1,1873,921,
+1,21,3578,16,0,
+116,1,1657,979,1,
+2030,817,1,2032,827,
+1,1989,1002,1,1990,
+3579,16,0,116,1,
+2035,838,1,1775,3580,
+16,0,116,1,32,
+3581,16,0,116,1,
+2105,900,1,2106,3582,
+16,0,116,1,2765,
+3453,1,2553,3583,16,
+0,116,1,2227,993,
+1,1901,3584,16,0,
+116,1,2776,3417,1,
+52,3585,16,0,116,
+1,1803,873,1,2458,
+961,1,2459,967,1,
+2462,974,1,2136,928,
+1,2464,984,1,2029,
+811,1,2466,3447,1,
+2031,822,1,2795,3426,
+1,2796,3432,1,2797,
+3437,1,2798,3442,1,
+2364,913,1,2039,848,
+1,1931,946,1,2041,
+854,1,2021,804,1,
+2043,860,1,2045,865,
+1,2033,832,1,2075,
+3586,16,0,116,1,
+2037,843,1,2777,3587,
+16,0,116,1,1574,
+885,1,1958,3588,16,
+0,116,1,2724,3589,
+16,0,116,1,55,
+3590,19,115,1,55,
+3591,5,54,1,0,
+3592,16,0,113,1,
+2075,3593,16,0,113,
+1,1860,907,1,1804,
+3594,16,0,113,1,
+10,3595,16,0,113,
+1,2737,3459,1,2337,
+3596,16,0,113,1,
+2413,3597,16,0,113,
+1,2198,3598,16,0,
+113,1,1873,921,1,
+21,3599,16,0,113,
+1,1657,979,1,2030,
+817,1,2032,827,1,
+1989,1002,1,1990,3600,
+16,0,113,1,2035,
+838,1,1775,3601,16,
+0,113,1,32,3602,
+16,0,113,1,2105,
+900,1,2106,3603,16,
+0,113,1,2765,3453,
+1,2553,3604,16,0,
+113,1,2227,993,1,
+1901,3605,16,0,113,
+1,2776,3417,1,52,
+3606,16,0,113,1,
+1803,873,1,2458,961,
+1,2459,967,1,2462,
+974,1,2136,928,1,
+2464,984,1,2029,811,
+1,2466,3447,1,2031,
+822,1,2795,3426,1,
+2796,3432,1,2797,3437,
+1,2798,3442,1,2364,
+913,1,2039,848,1,
+1931,946,1,2041,854,
+1,2021,804,1,2043,
+860,1,2045,865,1,
+2033,832,1,2522,3607,
+16,0,467,1,2037,
+843,1,2777,3608,16,
+0,113,1,1574,885,
+1,1958,3609,16,0,
+113,1,2724,3610,16,
+0,113,1,56,3611,
+19,112,1,56,3612,
+5,55,1,0,3613,
+16,0,110,1,2510,
+3614,16,0,662,1,
+2075,3615,16,0,110,
+1,1860,907,1,10,
+3616,16,0,110,1,
+2737,3459,1,2337,3617,
+16,0,110,1,2413,
+3618,16,0,110,1,
+2198,3619,16,0,110,
+1,1873,921,1,21,
+3620,16,0,110,1,
+1657,979,1,2030,817,
+1,2032,827,1,1989,
+1002,1,1990,3621,16,
+0,110,1,2458,961,
+1,1775,3622,16,0,
+110,1,32,3623,16,
+0,110,1,2105,900,
+1,2106,3624,16,0,
+110,1,2765,3453,1,
+2553,3625,16,0,110,
+1,2227,993,1,1901,
+3626,16,0,110,1,
+2776,3417,1,52,3627,
+16,0,110,1,1803,
+873,1,1804,3628,16,
+0,110,1,2459,967,
+1,2462,974,1,2136,
+928,1,2464,984,1,
+2029,811,1,2466,3447,
+1,2031,822,1,2795,
+3426,1,2796,3432,1,
+2797,3437,1,2798,3442,
+1,2364,913,1,2039,
+848,1,1931,946,1,
+2041,854,1,2021,804,
+1,2043,860,1,2045,
+865,1,2514,3629,16,
+0,662,1,2033,832,
+1,2035,838,1,2037,
+843,1,2777,3630,16,
+0,110,1,1574,885,
+1,1958,3631,16,0,
+110,1,2724,3632,16,
+0,110,1,57,3633,
+19,109,1,57,3634,
+5,53,1,0,3635,
+16,0,107,1,2075,
+3636,16,0,107,1,
+1860,907,1,1804,3637,
+16,0,107,1,10,
+3638,16,0,107,1,
+2737,3459,1,2337,3639,
 16,0,107,1,2413,
-3580,16,0,107,1,
-2743,3367,1,1873,899,
-1,21,3581,16,0,
-107,1,1657,958,1,
-2030,795,1,2773,3403,
-1,1990,3582,16,0,
-107,1,2754,3390,1,
-2755,3583,16,0,107,
-1,2538,3584,16,0,
-107,1,32,3585,16,
-0,107,1,2105,878,
-1,2106,3586,16,0,
-107,1,2227,972,1,
-2337,3587,16,0,107,
-1,2198,3588,16,0,
-107,1,2775,3374,1,
-2776,3361,1,52,3589,
+3640,16,0,107,1,
+2198,3641,16,0,107,
+1,1873,921,1,21,
+3642,16,0,107,1,
+1657,979,1,2030,817,
+1,2032,827,1,1989,
+1002,1,1990,3643,16,
+0,107,1,2035,838,
+1,1775,3644,16,0,
+107,1,32,3645,16,
+0,107,1,2105,900,
+1,2106,3646,16,0,
+107,1,2765,3453,1,
+2553,3647,16,0,107,
+1,2227,993,1,1901,
+3648,16,0,107,1,
+2776,3417,1,52,3649,
 16,0,107,1,1803,
-851,1,2458,940,1,
-1901,3590,16,0,107,
-1,2462,953,1,2136,
-906,1,2464,963,1,
-2029,789,1,2466,3396,
-1,2031,800,1,2032,
-805,1,2033,810,1,
-2035,816,1,2364,891,
-1,2715,3379,1,2039,
-826,1,1931,925,1,
-2041,832,1,2021,782,
-1,2043,838,1,2045,
-843,1,2702,3591,16,
-0,107,1,1775,3592,
-16,0,107,1,1989,
-980,1,2774,3385,1,
-2037,821,1,1574,863,
-1,1958,3593,16,0,
-107,1,2459,946,1,
-58,3594,19,446,1,
-58,3595,5,21,1,
-2553,3596,16,0,444,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3597,16,0,444,
-1,2536,1686,1,2464,
-963,1,2605,3598,16,
-0,444,1,2470,3599,
-16,0,444,1,2513,
-1692,1,2551,1712,1,
-59,3600,19,443,1,
-59,3601,5,21,1,
-2553,3602,16,0,441,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3603,16,0,441,
-1,2536,1686,1,2464,
-963,1,2605,3604,16,
-0,441,1,2470,3605,
-16,0,441,1,2513,
-1692,1,2551,1712,1,
-60,3606,19,520,1,
-60,3607,5,21,1,
-2553,3608,16,0,518,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3609,16,0,518,
-1,2536,1686,1,2464,
-963,1,2605,3610,16,
-0,518,1,2470,3611,
-16,0,518,1,2513,
-1692,1,2551,1712,1,
-61,3612,19,397,1,
-61,3613,5,21,1,
-2553,3614,16,0,395,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3615,16,0,395,
-1,2536,1686,1,2464,
-963,1,2605,3616,16,
-0,395,1,2470,3617,
-16,0,395,1,2513,
-1692,1,2551,1712,1,
-62,3618,19,394,1,
-62,3619,5,21,1,
-2553,3620,16,0,392,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3621,16,0,392,
-1,2536,1686,1,2464,
-963,1,2605,3622,16,
-0,392,1,2470,3623,
-16,0,392,1,2513,
-1692,1,2551,1712,1,
-63,3624,19,391,1,
-63,3625,5,21,1,
-2553,3626,16,0,389,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3627,16,0,389,
-1,2536,1686,1,2464,
-963,1,2605,3628,16,
-0,389,1,2470,3629,
-16,0,389,1,2513,
-1692,1,2551,1712,1,
-64,3630,19,388,1,
-64,3631,5,21,1,
-2553,3632,16,0,386,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3633,16,0,386,
-1,2536,1686,1,2464,
-963,1,2605,3634,16,
-0,386,1,2470,3635,
-16,0,386,1,2513,
-1692,1,2551,1712,1,
-65,3636,19,440,1,
-65,3637,5,21,1,
-2553,3638,16,0,438,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3639,16,0,438,
-1,2536,1686,1,2464,
-963,1,2605,3640,16,
-0,438,1,2470,3641,
-16,0,438,1,2513,
-1692,1,2551,1712,1,
-66,3642,19,437,1,
-66,3643,5,21,1,
-2553,3644,16,0,435,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3645,16,0,435,
-1,2536,1686,1,2464,
-963,1,2605,3646,16,
-0,435,1,2470,3647,
-16,0,435,1,2513,
-1692,1,2551,1712,1,
-67,3648,19,434,1,
-67,3649,5,21,1,
-2553,3650,16,0,432,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3651,16,0,432,
-1,2536,1686,1,2464,
-963,1,2605,3652,16,
-0,432,1,2470,3653,
-16,0,432,1,2513,
-1692,1,2551,1712,1,
-68,3654,19,431,1,
-68,3655,5,21,1,
-2553,3656,16,0,429,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3657,16,0,429,
-1,2536,1686,1,2464,
-963,1,2605,3658,16,
-0,429,1,2470,3659,
-16,0,429,1,2513,
-1692,1,2551,1712,1,
-69,3660,19,367,1,
-69,3661,5,21,1,
-2553,3662,16,0,365,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3663,16,0,365,
-1,2536,1686,1,2464,
-963,1,2605,3664,16,
-0,365,1,2470,3665,
-16,0,365,1,2513,
-1692,1,2551,1712,1,
-70,3666,19,364,1,
-70,3667,5,21,1,
-2553,3668,16,0,362,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3669,16,0,362,
-1,2536,1686,1,2464,
-963,1,2605,3670,16,
-0,362,1,2470,3671,
-16,0,362,1,2513,
-1692,1,2551,1712,1,
-71,3672,19,361,1,
-71,3673,5,21,1,
-2553,3674,16,0,359,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3675,16,0,359,
-1,2536,1686,1,2464,
-963,1,2605,3676,16,
-0,359,1,2470,3677,
-16,0,359,1,2513,
-1692,1,2551,1712,1,
-72,3678,19,709,1,
-72,3679,5,21,1,
-2553,3680,16,0,707,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3681,16,0,707,
-1,2536,1686,1,2464,
-963,1,2605,3682,16,
-0,707,1,2470,3683,
-16,0,707,1,2513,
-1692,1,2551,1712,1,
-73,3684,19,427,1,
-73,3685,5,21,1,
-2553,3686,16,0,425,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3687,16,0,425,
-1,2536,1686,1,2464,
-963,1,2605,3688,16,
-0,425,1,2470,3689,
-16,0,425,1,2513,
-1692,1,2551,1712,1,
-74,3690,19,542,1,
-74,3691,5,21,1,
-2553,3692,16,0,540,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3693,16,0,540,
-1,2536,1686,1,2464,
-963,1,2605,3694,16,
-0,540,1,2470,3695,
-16,0,540,1,2513,
-1692,1,2551,1712,1,
-75,3696,19,532,1,
-75,3697,5,21,1,
-2553,3698,16,0,530,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3699,16,0,530,
-1,2536,1686,1,2464,
-963,1,2605,3700,16,
-0,530,1,2470,3701,
-16,0,530,1,2513,
-1692,1,2551,1712,1,
-76,3702,19,529,1,
-76,3703,5,21,1,
-2553,3704,16,0,527,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3705,16,0,527,
-1,2536,1686,1,2464,
-963,1,2605,3706,16,
-0,527,1,2470,3707,
-16,0,527,1,2513,
-1692,1,2551,1712,1,
-77,3708,19,526,1,
-77,3709,5,21,1,
-2553,3710,16,0,524,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3711,16,0,524,
-1,2536,1686,1,2464,
-963,1,2605,3712,16,
-0,524,1,2470,3713,
-16,0,524,1,2513,
-1692,1,2551,1712,1,
-78,3714,19,523,1,
-78,3715,5,21,1,
-2553,3716,16,0,521,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3717,16,0,521,
-1,2536,1686,1,2464,
-963,1,2605,3718,16,
-0,521,1,2470,3719,
-16,0,521,1,2513,
-1692,1,2551,1712,1,
-79,3720,19,407,1,
-79,3721,5,21,1,
-2553,3722,16,0,405,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3723,16,0,405,
-1,2536,1686,1,2464,
-963,1,2605,3724,16,
-0,405,1,2470,3725,
-16,0,405,1,2513,
-1692,1,2551,1712,1,
-80,3726,19,615,1,
-80,3727,5,21,1,
-2553,3728,16,0,613,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3729,16,0,613,
-1,2536,1686,1,2464,
-963,1,2605,3730,16,
-0,613,1,2470,3731,
-16,0,613,1,2513,
-1692,1,2551,1712,1,
-81,3732,19,385,1,
-81,3733,5,21,1,
-2553,3734,16,0,383,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3735,16,0,383,
-1,2536,1686,1,2464,
-963,1,2605,3736,16,
-0,383,1,2470,3737,
-16,0,383,1,2513,
-1692,1,2551,1712,1,
-82,3738,19,423,1,
-82,3739,5,21,1,
-2553,3740,16,0,421,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3741,16,0,421,
-1,2536,1686,1,2464,
-963,1,2605,3742,16,
-0,421,1,2470,3743,
-16,0,421,1,2513,
-1692,1,2551,1712,1,
-83,3744,19,382,1,
-83,3745,5,21,1,
-2553,3746,16,0,380,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3747,16,0,380,
-1,2536,1686,1,2464,
-963,1,2605,3748,16,
-0,380,1,2470,3749,
-16,0,380,1,2513,
-1692,1,2551,1712,1,
-84,3750,19,379,1,
-84,3751,5,21,1,
-2553,3752,16,0,377,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3753,16,0,377,
-1,2536,1686,1,2464,
-963,1,2605,3754,16,
-0,377,1,2470,3755,
-16,0,377,1,2513,
-1692,1,2551,1712,1,
-85,3756,19,535,1,
-85,3757,5,21,1,
-2553,3758,16,0,533,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3759,16,0,533,
-1,2536,1686,1,2464,
-963,1,2605,3760,16,
-0,533,1,2470,3761,
-16,0,533,1,2513,
-1692,1,2551,1712,1,
-86,3762,19,416,1,
-86,3763,5,21,1,
-2553,3764,16,0,414,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3765,16,0,414,
-1,2536,1686,1,2464,
-963,1,2605,3766,16,
-0,414,1,2470,3767,
-16,0,414,1,2513,
-1692,1,2551,1712,1,
-87,3768,19,404,1,
-87,3769,5,21,1,
-2553,3770,16,0,402,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3771,16,0,402,
-1,2536,1686,1,2464,
-963,1,2605,3772,16,
-0,402,1,2470,3773,
-16,0,402,1,2513,
-1692,1,2551,1712,1,
-88,3774,19,376,1,
-88,3775,5,21,1,
-2553,3776,16,0,374,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3777,16,0,374,
-1,2536,1686,1,2464,
-963,1,2605,3778,16,
-0,374,1,2470,3779,
-16,0,374,1,2513,
-1692,1,2551,1712,1,
-89,3780,19,370,1,
-89,3781,5,21,1,
-2553,3782,16,0,368,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3783,16,0,368,
-1,2536,1686,1,2464,
-963,1,2605,3784,16,
-0,368,1,2470,3785,
-16,0,368,1,2513,
-1692,1,2551,1712,1,
-90,3786,19,373,1,
-90,3787,5,21,1,
-2553,3788,16,0,371,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3789,16,0,371,
-1,2536,1686,1,2464,
-963,1,2605,3790,16,
-0,371,1,2470,3791,
-16,0,371,1,2513,
-1692,1,2551,1712,1,
-91,3792,19,420,1,
-91,3793,5,21,1,
-2553,3794,16,0,418,
-1,2596,1740,1,2593,
-1725,1,2594,1730,1,
-2595,1735,1,2522,1698,
-1,2597,1745,1,2599,
-1719,1,2600,1751,1,
-2601,1756,1,2602,1761,
-1,2603,1766,1,2531,
-1704,1,2459,946,1,
-2645,3795,16,0,418,
-1,2536,1686,1,2464,
-963,1,2605,3796,16,
-0,418,1,2470,3797,
-16,0,418,1,2513,
-1692,1,2551,1712,1,
-92,3798,19,133,1,
-92,3799,5,128,1,
-0,3800,16,0,674,
-1,1,2092,1,2,
-2098,1,3,2103,1,
-4,2108,1,5,2113,
-1,6,2118,1,7,
-2123,1,8,3801,16,
-0,131,1,1515,3802,
-16,0,168,1,2773,
-3403,1,2021,782,1,
-2022,3803,16,0,546,
-1,2525,3804,16,0,
-481,1,2025,3805,16,
-0,550,1,18,3806,
-16,0,138,1,2027,
-3807,16,0,554,1,
-2029,789,1,2030,795,
-1,2031,800,1,2032,
-805,1,256,3808,16,
-0,176,1,277,3809,
-16,0,176,1,2035,
-816,1,2037,821,1,
-2039,826,1,32,3810,
-16,0,168,1,2041,
-832,1,2293,3811,16,
-0,176,1,2043,838,
-1,2045,843,1,2715,
-3379,1,41,3812,16,
-0,176,1,1297,3813,
-16,0,168,1,43,
-3814,16,0,176,1,
-46,3815,16,0,181,
-1,1804,3816,16,0,
-168,1,299,3817,16,
-0,176,1,52,3818,
-16,0,168,1,509,
-3819,16,0,176,1,
-2318,3820,16,0,168,
-1,62,3821,16,0,
-202,1,65,3822,16,
-0,204,1,2075,3823,
-16,0,168,1,1574,
-863,1,2743,3367,1,
-71,3824,16,0,176,
-1,1775,3825,16,0,
-168,1,76,3826,16,
-0,176,1,1834,3827,
-16,0,168,1,2337,
-3828,16,0,168,1,
-79,3829,16,0,176,
-1,1335,3830,16,0,
-168,1,322,3831,16,
-0,176,1,85,3832,
-16,0,176,1,2516,
-3833,16,0,466,1,
-1261,3834,16,0,168,
-1,89,3835,16,0,
-176,1,2033,810,1,
-346,3836,16,0,176,
-1,97,3837,16,0,
-176,1,2106,3838,16,
-0,168,1,2774,3385,
-1,102,3839,16,0,
-176,1,2776,3361,1,
-1803,851,1,2364,891,
-1,1113,3840,16,0,
-161,1,112,3841,16,
-0,176,1,1117,3842,
-16,0,168,1,2775,
-3374,1,1873,899,1,
-1876,3843,16,0,168,
-1,372,3844,16,0,
-584,1,374,3845,16,
-0,586,1,124,3846,
-16,0,176,1,376,
-3847,16,0,588,1,
-378,3848,16,0,590,
-1,2136,906,1,2718,
-3849,16,0,176,1,
-381,3850,16,0,176,
-1,525,3851,16,0,
-176,1,137,3852,16,
-0,176,1,1901,3853,
-16,0,168,1,1153,
-3854,16,0,168,1,
-151,3855,16,0,176,
-1,1407,3856,16,0,
-168,1,1659,3857,16,
-0,168,1,2413,3858,
-16,0,168,1,406,
-3859,16,0,176,1,
-1371,3860,16,0,168,
-1,1860,885,1,2105,
-878,1,166,3861,16,
-0,176,1,1622,3862,
-16,0,176,1,1931,
-925,1,1933,3863,16,
-0,168,1,431,3864,
-16,0,176,1,1585,
-3865,16,0,176,1,
-182,3866,16,0,176,
-1,1189,3867,16,0,
-168,1,1443,3868,16,
-0,168,1,1695,3869,
-16,0,168,1,2198,
-3870,16,0,168,1,
-447,3871,16,0,176,
-1,2458,940,1,2459,
-946,1,1958,3872,16,
-0,168,1,2462,953,
-1,1657,958,1,2464,
-963,1,2466,3396,1,
-459,3873,16,0,176,
-1,2468,3874,16,0,
-357,1,462,3875,16,
-0,176,1,199,3876,
-16,0,176,1,217,
-3877,16,0,176,1,
-2227,972,1,1225,3878,
-16,0,168,1,1479,
-3879,16,0,168,1,
-1731,3880,16,0,176,
-1,1989,980,1,1990,
-3881,16,0,168,1,
-236,3882,16,0,176,
-1,2754,3390,1,2755,
-3883,16,0,674,1,
-2507,3884,16,0,452,
-1,1756,3885,16,0,
-168,1,93,3886,19,
-687,1,93,3887,5,
-95,1,256,3888,16,
-0,685,1,1261,3889,
-16,0,685,1,509,
-3890,16,0,685,1,
-1515,3891,16,0,685,
-1,2021,782,1,1775,
-3892,16,0,685,1,
-2029,789,1,2030,795,
-1,2031,800,1,2032,
-805,1,2033,810,1,
-277,3893,16,0,685,
-1,2035,816,1,2037,
-821,1,2039,826,1,
-32,3894,16,0,685,
-1,2041,832,1,2293,
-3895,16,0,685,1,
-2043,838,1,2045,843,
-1,41,3896,16,0,
-685,1,1297,3897,16,
-0,685,1,43,3898,
-16,0,685,1,1803,
-851,1,1804,3899,16,
-0,685,1,299,3900,
-16,0,685,1,52,
-3901,16,0,685,1,
-2318,3902,16,0,685,
-1,62,3903,16,0,
-685,1,2075,3904,16,
-0,685,1,1574,863,
-1,71,3905,16,0,
-685,1,76,3906,16,
-0,685,1,1834,3907,
-16,0,685,1,2337,
-3908,16,0,685,1,
-79,3909,16,0,685,
-1,1335,3910,16,0,
-685,1,322,3911,16,
-0,685,1,85,3912,
-16,0,685,1,89,
-3913,16,0,685,1,
-346,3914,16,0,685,
-1,2105,878,1,2106,
-3915,16,0,685,1,
-97,3916,16,0,685,
-1,1860,885,1,2364,
-891,1,102,3917,16,
-0,685,1,112,3918,
-16,0,685,1,1117,
-3919,16,0,685,1,
-1873,899,1,1876,3920,
-16,0,685,1,124,
-3921,16,0,685,1,
-2136,906,1,2718,3922,
-16,0,685,1,381,
-3923,16,0,685,1,
-525,3924,16,0,685,
-1,137,3925,16,0,
-685,1,1901,3926,16,
-0,685,1,1153,3927,
-16,0,685,1,151,
-3928,16,0,685,1,
-1407,3929,16,0,685,
-1,1659,3930,16,0,
-685,1,2413,3931,16,
-0,685,1,406,3932,
-16,0,685,1,1371,
-3933,16,0,685,1,
-166,3934,16,0,685,
-1,1622,3935,16,0,
-685,1,1931,925,1,
-1933,3936,16,0,685,
-1,431,3937,16,0,
-685,1,1585,3938,16,
-0,685,1,182,3939,
-16,0,685,1,1189,
-3940,16,0,685,1,
-1443,3941,16,0,685,
-1,1695,3942,16,0,
-685,1,2198,3943,16,
-0,685,1,447,3944,
-16,0,685,1,2458,
-940,1,2459,946,1,
-1958,3945,16,0,685,
-1,2462,953,1,1657,
-958,1,2464,963,1,
-199,3946,16,0,685,
-1,459,3947,16,0,
-685,1,462,3948,16,
-0,685,1,217,3949,
-16,0,685,1,2227,
-972,1,1225,3950,16,
-0,685,1,1479,3951,
-16,0,685,1,1731,
-3952,16,0,685,1,
-1989,980,1,1990,3953,
-16,0,685,1,236,
-3954,16,0,685,1,
-1756,3955,16,0,685,
-1,94,3956,19,684,
-1,94,3957,5,95,
-1,256,3958,16,0,
-682,1,1261,3959,16,
-0,682,1,509,3960,
-16,0,682,1,1515,
-3961,16,0,682,1,
-2021,782,1,1775,3962,
-16,0,682,1,2029,
-789,1,2030,795,1,
-2031,800,1,2032,805,
-1,2033,810,1,277,
-3963,16,0,682,1,
-2035,816,1,2037,821,
-1,2039,826,1,32,
-3964,16,0,682,1,
-2041,832,1,2293,3965,
-16,0,682,1,2043,
-838,1,2045,843,1,
-41,3966,16,0,682,
-1,1297,3967,16,0,
-682,1,43,3968,16,
-0,682,1,1803,851,
-1,1804,3969,16,0,
-682,1,299,3970,16,
-0,682,1,52,3971,
-16,0,682,1,2318,
-3972,16,0,682,1,
-62,3973,16,0,682,
-1,2075,3974,16,0,
-682,1,1574,863,1,
-71,3975,16,0,682,
-1,76,3976,16,0,
-682,1,1834,3977,16,
-0,682,1,2337,3978,
-16,0,682,1,79,
-3979,16,0,682,1,
-1335,3980,16,0,682,
-1,322,3981,16,0,
-682,1,85,3982,16,
-0,682,1,89,3983,
-16,0,682,1,346,
-3984,16,0,682,1,
-2105,878,1,2106,3985,
-16,0,682,1,97,
-3986,16,0,682,1,
-1860,885,1,2364,891,
-1,102,3987,16,0,
-682,1,112,3988,16,
-0,682,1,1117,3989,
-16,0,682,1,1873,
-899,1,1876,3990,16,
-0,682,1,124,3991,
-16,0,682,1,2136,
-906,1,2718,3992,16,
-0,682,1,381,3993,
-16,0,682,1,525,
-3994,16,0,682,1,
-137,3995,16,0,682,
-1,1901,3996,16,0,
-682,1,1153,3997,16,
-0,682,1,151,3998,
-16,0,682,1,1407,
-3999,16,0,682,1,
-1659,4000,16,0,682,
-1,2413,4001,16,0,
-682,1,406,4002,16,
-0,682,1,1371,4003,
-16,0,682,1,166,
-4004,16,0,682,1,
-1622,4005,16,0,682,
-1,1931,925,1,1933,
-4006,16,0,682,1,
-431,4007,16,0,682,
-1,1585,4008,16,0,
-682,1,182,4009,16,
-0,682,1,1189,4010,
-16,0,682,1,1443,
-4011,16,0,682,1,
-1695,4012,16,0,682,
-1,2198,4013,16,0,
-682,1,447,4014,16,
-0,682,1,2458,940,
-1,2459,946,1,1958,
-4015,16,0,682,1,
-2462,953,1,1657,958,
-1,2464,963,1,199,
-4016,16,0,682,1,
-459,4017,16,0,682,
-1,462,4018,16,0,
-682,1,217,4019,16,
-0,682,1,2227,972,
-1,1225,4020,16,0,
-682,1,1479,4021,16,
-0,682,1,1731,4022,
-16,0,682,1,1989,
-980,1,1990,4023,16,
-0,682,1,236,4024,
-16,0,682,1,1756,
-4025,16,0,682,1,
-95,4026,19,681,1,
-95,4027,5,95,1,
-256,4028,16,0,679,
-1,1261,4029,16,0,
-679,1,509,4030,16,
-0,679,1,1515,4031,
-16,0,679,1,2021,
-782,1,1775,4032,16,
-0,679,1,2029,789,
-1,2030,795,1,2031,
-800,1,2032,805,1,
-2033,810,1,277,4033,
-16,0,679,1,2035,
-816,1,2037,821,1,
-2039,826,1,32,4034,
-16,0,679,1,2041,
-832,1,2293,4035,16,
-0,679,1,2043,838,
-1,2045,843,1,41,
-4036,16,0,679,1,
-1297,4037,16,0,679,
-1,43,4038,16,0,
-679,1,1803,851,1,
-1804,4039,16,0,679,
-1,299,4040,16,0,
-679,1,52,4041,16,
-0,679,1,2318,4042,
-16,0,679,1,62,
-4043,16,0,679,1,
-2075,4044,16,0,679,
-1,1574,863,1,71,
-4045,16,0,679,1,
-76,4046,16,0,679,
-1,1834,4047,16,0,
-679,1,2337,4048,16,
-0,679,1,79,4049,
-16,0,679,1,1335,
-4050,16,0,679,1,
-322,4051,16,0,679,
-1,85,4052,16,0,
-679,1,89,4053,16,
-0,679,1,346,4054,
-16,0,679,1,2105,
-878,1,2106,4055,16,
-0,679,1,97,4056,
-16,0,679,1,1860,
-885,1,2364,891,1,
-102,4057,16,0,679,
-1,112,4058,16,0,
-679,1,1117,4059,16,
-0,679,1,1873,899,
-1,1876,4060,16,0,
-679,1,124,4061,16,
-0,679,1,2136,906,
-1,2718,4062,16,0,
-679,1,381,4063,16,
-0,679,1,525,4064,
-16,0,679,1,137,
-4065,16,0,679,1,
-1901,4066,16,0,679,
-1,1153,4067,16,0,
-679,1,151,4068,16,
-0,679,1,1407,4069,
-16,0,679,1,1659,
-4070,16,0,679,1,
-2413,4071,16,0,679,
-1,406,4072,16,0,
-679,1,1371,4073,16,
-0,679,1,166,4074,
-16,0,679,1,1622,
-4075,16,0,679,1,
-1931,925,1,1933,4076,
-16,0,679,1,431,
-4077,16,0,679,1,
-1585,4078,16,0,679,
-1,182,4079,16,0,
-679,1,1189,4080,16,
-0,679,1,1443,4081,
-16,0,679,1,1695,
-4082,16,0,679,1,
-2198,4083,16,0,679,
-1,447,4084,16,0,
-679,1,2458,940,1,
-2459,946,1,1958,4085,
-16,0,679,1,2462,
-953,1,1657,958,1,
-2464,963,1,199,4086,
-16,0,679,1,459,
-4087,16,0,679,1,
-462,4088,16,0,679,
-1,217,4089,16,0,
-679,1,2227,972,1,
-1225,4090,16,0,679,
-1,1479,4091,16,0,
-679,1,1731,4092,16,
-0,679,1,1989,980,
-1,1990,4093,16,0,
-679,1,236,4094,16,
-0,679,1,1756,4095,
-16,0,679,1,96,
-4096,19,103,1,96,
-4097,5,1,1,0,
-4098,16,0,104,1,
-97,4099,19,197,1,
-97,4100,5,1,1,
-0,4101,16,0,195,
-1,98,4102,19,305,
-1,98,4103,5,2,
-1,0,4104,16,0,
-303,1,2755,4105,16,
-0,731,1,99,4106,
-19,299,1,99,4107,
-5,2,1,0,4108,
-16,0,732,1,2755,
-4109,16,0,297,1,
-100,4110,19,516,1,
-100,4111,5,2,1,
-0,4112,16,0,667,
-1,2755,4113,16,0,
-514,1,101,4114,19,
-673,1,101,4115,5,
-4,1,0,4116,16,
-0,671,1,2696,4117,
-16,0,712,1,2766,
-4118,16,0,712,1,
-2755,4119,16,0,671,
-1,102,4120,19,151,
-1,102,4121,5,2,
-1,2470,4122,16,0,
-510,1,2605,4123,16,
-0,149,1,103,4124,
-19,654,1,103,4125,
-5,4,1,2553,4126,
-16,0,720,1,2645,
-4127,16,0,720,1,
-2470,4128,16,0,652,
-1,2605,4129,16,0,
-652,1,104,4130,19,
-645,1,104,4131,5,
-4,1,2553,4132,16,
-0,643,1,2645,4133,
-16,0,643,1,2470,
-4134,16,0,651,1,
-2605,4135,16,0,651,
-1,105,4136,19,500,
-1,105,4137,5,4,
-1,2553,4138,16,0,
-642,1,2645,4139,16,
-0,642,1,2470,4140,
-16,0,498,1,2605,
-4141,16,0,498,1,
-106,4142,19,641,1,
-106,4143,5,4,1,
-2553,4144,16,0,639,
-1,2645,4145,16,0,
-639,1,2470,4146,16,
-0,723,1,2605,4147,
-16,0,723,1,107,
-4148,19,343,1,107,
-4149,5,4,1,2553,
-4150,16,0,638,1,
-2645,4151,16,0,638,
-1,2470,4152,16,0,
-341,1,2605,4153,16,
-0,341,1,108,4154,
-19,141,1,108,4155,
-5,3,1,2702,4156,
-16,0,692,1,2538,
-4157,16,0,230,1,
-10,4158,16,0,139,
-1,109,4159,19,284,
-1,109,4160,5,1,
-1,2524,4161,16,0,
-282,1,110,4162,19,
-472,1,110,4163,5,
-1,1,2515,4164,16,
-0,470,1,111,4165,
-19,458,1,111,4166,
-5,1,1,2506,4167,
-16,0,456,1,112,
-4168,19,154,1,112,
-4169,5,17,1,0,
-4170,16,0,695,1,
-2702,4171,16,0,353,
-1,2075,4172,16,0,
-704,1,2337,4173,16,
-0,704,1,2413,4174,
-16,0,704,1,10,
-4175,16,0,353,1,
-1901,4176,16,0,704,
-1,2198,4177,16,0,
-704,1,2106,4178,16,
-0,704,1,2755,4179,
-16,0,695,1,21,
-4180,16,0,152,1,
-2538,4181,16,0,353,
-1,1804,4182,16,0,
-704,1,1990,4183,16,
-0,704,1,32,4184,
-16,0,704,1,1958,
-4185,16,0,704,1,
-1775,4186,16,0,704,
-1,113,4187,19,275,
-1,113,4188,5,1,
-1,2524,4189,16,0,
-273,1,114,4190,19,
-469,1,114,4191,5,
-1,1,2515,4192,16,
-0,467,1,115,4193,
-19,455,1,115,4194,
-5,1,1,2506,4195,
-16,0,453,1,116,
-4196,19,130,1,116,
-4197,5,18,1,0,
-4198,16,0,128,1,
-2702,4199,16,0,137,
-1,2075,4200,16,0,
-137,1,2337,4201,16,
-0,137,1,2413,4202,
-16,0,137,1,10,
-4203,16,0,137,1,
-2198,4204,16,0,137,
-1,1901,4205,16,0,
-137,1,52,4206,16,
-0,200,1,2106,4207,
-16,0,137,1,2755,
-4208,16,0,128,1,
-21,4209,16,0,137,
-1,2538,4210,16,0,
-137,1,1804,4211,16,
-0,137,1,1990,4212,
-16,0,137,1,32,
-4213,16,0,137,1,
-1958,4214,16,0,137,
-1,1775,4215,16,0,
-137,1,117,4216,19,
-604,1,117,4217,5,
-4,1,2553,4218,16,
-0,602,1,2645,4219,
-16,0,602,1,2470,
-4220,16,0,602,1,
-2605,4221,16,0,602,
-1,118,4222,19,490,
-1,118,4223,5,4,
-1,2553,4224,16,0,
-488,1,2645,4225,16,
-0,488,1,2470,4226,
-16,0,488,1,2605,
-4227,16,0,488,1,
-119,4228,19,478,1,
-119,4229,5,4,1,
-2553,4230,16,0,476,
-1,2645,4231,16,0,
-476,1,2470,4232,16,
-0,476,1,2605,4233,
-16,0,476,1,120,
-4234,19,463,1,120,
-4235,5,4,1,2553,
-4236,16,0,461,1,
-2645,4237,16,0,461,
-1,2470,4238,16,0,
-461,1,2605,4239,16,
-0,461,1,121,4240,
-19,715,1,121,4241,
-5,4,1,2553,4242,
-16,0,713,1,2645,
-4243,16,0,713,1,
-2470,4244,16,0,713,
-1,2605,4245,16,0,
-713,1,122,4246,19,
-352,1,122,4247,5,
-18,1,2075,4248,16,
-0,555,1,2520,4249,
-16,0,475,1,2337,
-4250,16,0,555,1,
-2413,4251,16,0,555,
-1,2511,4252,16,0,
-460,1,2713,4253,16,
-0,694,1,2529,4254,
-16,0,487,1,1901,
-4255,16,0,555,1,
-2198,4256,16,0,555,
-1,2534,4257,16,0,
-601,1,2106,4258,16,
-0,555,1,1804,4259,
-16,0,555,1,1990,
-4260,16,0,555,1,
-31,4261,16,0,350,
-1,32,4262,16,0,
-555,1,2549,4263,16,
-0,508,1,1958,4264,
-16,0,555,1,1775,
-4265,16,0,555,1,
-123,4266,19,315,1,
-123,4267,5,1,1,
-32,4268,16,0,313,
-1,124,4269,19,262,
-1,124,4270,5,11,
-1,2075,4271,16,0,
-625,1,2337,4272,16,
-0,266,1,2413,4273,
-16,0,493,1,1901,
-4274,16,0,408,1,
-2198,4275,16,0,332,
-1,2106,4276,16,0,
-666,1,1804,4277,16,
-0,292,1,1990,4278,
-16,0,543,1,32,
-4279,16,0,346,1,
-1958,4280,16,0,502,
-1,1775,4281,16,0,
-260,1,125,4282,19,
-631,1,125,4283,5,
-11,1,2075,4284,16,
-0,629,1,2337,4285,
-16,0,629,1,2413,
-4286,16,0,629,1,
-1901,4287,16,0,629,
-1,2198,4288,16,0,
-629,1,2106,4289,16,
-0,629,1,1804,4290,
-16,0,629,1,1990,
-4291,16,0,629,1,
-32,4292,16,0,629,
-1,1958,4293,16,0,
-629,1,1775,4294,16,
-0,629,1,126,4295,
-19,701,1,126,4296,
-5,11,1,2075,4297,
-16,0,699,1,2337,
-4298,16,0,699,1,
-2413,4299,16,0,699,
-1,1901,4300,16,0,
-699,1,2198,4301,16,
-0,699,1,2106,4302,
-16,0,699,1,1804,
-4303,16,0,699,1,
-1990,4304,16,0,699,
-1,32,4305,16,0,
-699,1,1958,4306,16,
-0,699,1,1775,4307,
-16,0,699,1,127,
-4308,19,164,1,127,
-4309,5,31,1,1901,
-4310,16,0,703,1,
-1479,4311,16,0,605,
-1,2075,4312,16,0,
-703,1,1695,4313,16,
-0,198,1,1756,4314,
-16,0,191,1,2413,
-4315,16,0,703,1,
-2198,4316,16,0,703,
-1,1876,4317,16,0,
-717,1,1659,4318,16,
-0,191,1,1443,4319,
-16,0,571,1,1117,
-4320,16,0,162,1,
-1990,4321,16,0,703,
-1,1189,4322,16,0,
-245,1,1775,4323,16,
-0,703,1,32,4324,
-16,0,703,1,2106,
-4325,16,0,703,1,
-1515,4326,16,0,627,
-1,2337,4327,16,0,
-703,1,52,4328,16,
-0,647,1,1804,4329,
-16,0,703,1,1261,
-4330,16,0,309,1,
-1153,4331,16,0,252,
-1,1225,4332,16,0,
-278,1,1335,4333,16,
-0,485,1,1933,4334,
-16,0,608,1,1834,
-4335,16,0,325,1,
-1297,4336,16,0,336,
-1,1407,4337,16,0,
-619,1,2318,4338,16,
-0,191,1,1958,4339,
-16,0,703,1,1371,
-4340,16,0,473,1,
-128,4341,19,580,1,
-128,4342,5,11,1,
-2075,4343,16,0,578,
-1,2337,4344,16,0,
-578,1,2413,4345,16,
-0,578,1,1901,4346,
-16,0,578,1,2198,
-4347,16,0,578,1,
-2106,4348,16,0,578,
-1,1804,4349,16,0,
-578,1,1990,4350,16,
-0,578,1,32,4351,
-16,0,578,1,1958,
-4352,16,0,578,1,
-1775,4353,16,0,578,
-1,129,4354,19,576,
-1,129,4355,5,11,
-1,2075,4356,16,0,
-574,1,2337,4357,16,
-0,574,1,2413,4358,
-16,0,574,1,1901,
-4359,16,0,574,1,
-2198,4360,16,0,574,
-1,2106,4361,16,0,
-574,1,1804,4362,16,
-0,574,1,1990,4363,
-16,0,574,1,32,
-4364,16,0,574,1,
-1958,4365,16,0,574,
-1,1775,4366,16,0,
-574,1,130,4367,19,
-623,1,130,4368,5,
-11,1,2075,4369,16,
-0,621,1,2337,4370,
-16,0,621,1,2413,
-4371,16,0,621,1,
-1901,4372,16,0,621,
-1,2198,4373,16,0,
-621,1,2106,4374,16,
-0,621,1,1804,4375,
-16,0,621,1,1990,
-4376,16,0,621,1,
-32,4377,16,0,621,
-1,1958,4378,16,0,
-621,1,1775,4379,16,
-0,621,1,131,4380,
-19,570,1,131,4381,
-5,11,1,2075,4382,
-16,0,568,1,2337,
-4383,16,0,568,1,
-2413,4384,16,0,568,
-1,1901,4385,16,0,
-568,1,2198,4386,16,
-0,568,1,2106,4387,
-16,0,568,1,1804,
-4388,16,0,568,1,
-1990,4389,16,0,568,
-1,32,4390,16,0,
-568,1,1958,4391,16,
-0,568,1,1775,4392,
-16,0,568,1,132,
-4393,19,567,1,132,
-4394,5,11,1,2075,
-4395,16,0,565,1,
-2337,4396,16,0,565,
-1,2413,4397,16,0,
-565,1,1901,4398,16,
-0,565,1,2198,4399,
-16,0,565,1,2106,
-4400,16,0,565,1,
-1804,4401,16,0,565,
+873,1,2458,961,1,
+2459,967,1,2462,974,
+1,2136,928,1,2464,
+984,1,2029,811,1,
+2466,3447,1,2031,822,
+1,2795,3426,1,2796,
+3432,1,2797,3437,1,
+2798,3442,1,2364,913,
+1,2039,848,1,1931,
+946,1,2041,854,1,
+2021,804,1,2043,860,
+1,2045,865,1,2033,
+832,1,2037,843,1,
+2777,3650,16,0,107,
+1,1574,885,1,1958,
+3651,16,0,107,1,
+2724,3652,16,0,107,
+1,58,3653,19,356,
+1,58,3654,5,24,
+1,2664,3655,16,0,
+354,1,2546,1761,1,
+2620,1730,1,2621,1735,
+1,2612,1795,1,2618,
+1720,1,2520,1740,1,
+2566,1773,1,2568,3656,
+16,0,354,1,2459,
+967,1,2609,1780,1,
+2610,1785,1,2611,1790,
+1,2464,984,1,2613,
+1800,1,2614,1805,1,
+2616,1709,1,2617,1715,
+1,2470,3657,16,0,
+354,1,2619,1725,1,
+2537,1754,1,2529,1747,
+1,2623,3658,16,0,
+354,1,2551,1767,1,
+59,3659,19,441,1,
+59,3660,5,24,1,
+2664,3661,16,0,439,
+1,2546,1761,1,2620,
+1730,1,2621,1735,1,
+2612,1795,1,2618,1720,
+1,2520,1740,1,2566,
+1773,1,2568,3662,16,
+0,439,1,2459,967,
+1,2609,1780,1,2610,
+1785,1,2611,1790,1,
+2464,984,1,2613,1800,
+1,2614,1805,1,2616,
+1709,1,2617,1715,1,
+2470,3663,16,0,439,
+1,2619,1725,1,2537,
+1754,1,2529,1747,1,
+2623,3664,16,0,439,
+1,2551,1767,1,60,
+3665,19,399,1,60,
+3666,5,24,1,2664,
+3667,16,0,397,1,
+2546,1761,1,2620,1730,
+1,2621,1735,1,2612,
+1795,1,2618,1720,1,
+2520,1740,1,2566,1773,
+1,2568,3668,16,0,
+397,1,2459,967,1,
+2609,1780,1,2610,1785,
+1,2611,1790,1,2464,
+984,1,2613,1800,1,
+2614,1805,1,2616,1709,
+1,2617,1715,1,2470,
+3669,16,0,397,1,
+2619,1725,1,2537,1754,
+1,2529,1747,1,2623,
+3670,16,0,397,1,
+2551,1767,1,61,3671,
+19,644,1,61,3672,
+5,24,1,2664,3673,
+16,0,642,1,2546,
+1761,1,2620,1730,1,
+2621,1735,1,2612,1795,
+1,2618,1720,1,2520,
+1740,1,2566,1773,1,
+2568,3674,16,0,642,
+1,2459,967,1,2609,
+1780,1,2610,1785,1,
+2611,1790,1,2464,984,
+1,2613,1800,1,2614,
+1805,1,2616,1709,1,
+2617,1715,1,2470,3675,
+16,0,642,1,2619,
+1725,1,2537,1754,1,
+2529,1747,1,2623,3676,
+16,0,642,1,2551,
+1767,1,62,3677,19,
+392,1,62,3678,5,
+24,1,2664,3679,16,
+0,390,1,2546,1761,
+1,2620,1730,1,2621,
+1735,1,2612,1795,1,
+2618,1720,1,2520,1740,
+1,2566,1773,1,2568,
+3680,16,0,390,1,
+2459,967,1,2609,1780,
+1,2610,1785,1,2611,
+1790,1,2464,984,1,
+2613,1800,1,2614,1805,
+1,2616,1709,1,2617,
+1715,1,2470,3681,16,
+0,390,1,2619,1725,
+1,2537,1754,1,2529,
+1747,1,2623,3682,16,
+0,390,1,2551,1767,
+1,63,3683,19,389,
+1,63,3684,5,24,
+1,2664,3685,16,0,
+387,1,2546,1761,1,
+2620,1730,1,2621,1735,
+1,2612,1795,1,2618,
+1720,1,2520,1740,1,
+2566,1773,1,2568,3686,
+16,0,387,1,2459,
+967,1,2609,1780,1,
+2610,1785,1,2611,1790,
+1,2464,984,1,2613,
+1800,1,2614,1805,1,
+2616,1709,1,2617,1715,
+1,2470,3687,16,0,
+387,1,2619,1725,1,
+2537,1754,1,2529,1747,
+1,2623,3688,16,0,
+387,1,2551,1767,1,
+64,3689,19,386,1,
+64,3690,5,24,1,
+2664,3691,16,0,384,
+1,2546,1761,1,2620,
+1730,1,2621,1735,1,
+2612,1795,1,2618,1720,
+1,2520,1740,1,2566,
+1773,1,2568,3692,16,
+0,384,1,2459,967,
+1,2609,1780,1,2610,
+1785,1,2611,1790,1,
+2464,984,1,2613,1800,
+1,2614,1805,1,2616,
+1709,1,2617,1715,1,
+2470,3693,16,0,384,
+1,2619,1725,1,2537,
+1754,1,2529,1747,1,
+2623,3694,16,0,384,
+1,2551,1767,1,65,
+3695,19,438,1,65,
+3696,5,24,1,2664,
+3697,16,0,436,1,
+2546,1761,1,2620,1730,
+1,2621,1735,1,2612,
+1795,1,2618,1720,1,
+2520,1740,1,2566,1773,
+1,2568,3698,16,0,
+436,1,2459,967,1,
+2609,1780,1,2610,1785,
+1,2611,1790,1,2464,
+984,1,2613,1800,1,
+2614,1805,1,2616,1709,
+1,2617,1715,1,2470,
+3699,16,0,436,1,
+2619,1725,1,2537,1754,
+1,2529,1747,1,2623,
+3700,16,0,436,1,
+2551,1767,1,66,3701,
+19,435,1,66,3702,
+5,24,1,2664,3703,
+16,0,433,1,2546,
+1761,1,2620,1730,1,
+2621,1735,1,2612,1795,
+1,2618,1720,1,2520,
+1740,1,2566,1773,1,
+2568,3704,16,0,433,
+1,2459,967,1,2609,
+1780,1,2610,1785,1,
+2611,1790,1,2464,984,
+1,2613,1800,1,2614,
+1805,1,2616,1709,1,
+2617,1715,1,2470,3705,
+16,0,433,1,2619,
+1725,1,2537,1754,1,
+2529,1747,1,2623,3706,
+16,0,433,1,2551,
+1767,1,67,3707,19,
+432,1,67,3708,5,
+24,1,2664,3709,16,
+0,430,1,2546,1761,
+1,2620,1730,1,2621,
+1735,1,2612,1795,1,
+2618,1720,1,2520,1740,
+1,2566,1773,1,2568,
+3710,16,0,430,1,
+2459,967,1,2609,1780,
+1,2610,1785,1,2611,
+1790,1,2464,984,1,
+2613,1800,1,2614,1805,
+1,2616,1709,1,2617,
+1715,1,2470,3711,16,
+0,430,1,2619,1725,
+1,2537,1754,1,2529,
+1747,1,2623,3712,16,
+0,430,1,2551,1767,
+1,68,3713,19,429,
+1,68,3714,5,24,
+1,2664,3715,16,0,
+427,1,2546,1761,1,
+2620,1730,1,2621,1735,
+1,2612,1795,1,2618,
+1720,1,2520,1740,1,
+2566,1773,1,2568,3716,
+16,0,427,1,2459,
+967,1,2609,1780,1,
+2610,1785,1,2611,1790,
+1,2464,984,1,2613,
+1800,1,2614,1805,1,
+2616,1709,1,2617,1715,
+1,2470,3717,16,0,
+427,1,2619,1725,1,
+2537,1754,1,2529,1747,
+1,2623,3718,16,0,
+427,1,2551,1767,1,
+69,3719,19,365,1,
+69,3720,5,24,1,
+2664,3721,16,0,363,
+1,2546,1761,1,2620,
+1730,1,2621,1735,1,
+2612,1795,1,2618,1720,
+1,2520,1740,1,2566,
+1773,1,2568,3722,16,
+0,363,1,2459,967,
+1,2609,1780,1,2610,
+1785,1,2611,1790,1,
+2464,984,1,2613,1800,
+1,2614,1805,1,2616,
+1709,1,2617,1715,1,
+2470,3723,16,0,363,
+1,2619,1725,1,2537,
+1754,1,2529,1747,1,
+2623,3724,16,0,363,
+1,2551,1767,1,70,
+3725,19,362,1,70,
+3726,5,24,1,2664,
+3727,16,0,360,1,
+2546,1761,1,2620,1730,
+1,2621,1735,1,2612,
+1795,1,2618,1720,1,
+2520,1740,1,2566,1773,
+1,2568,3728,16,0,
+360,1,2459,967,1,
+2609,1780,1,2610,1785,
+1,2611,1790,1,2464,
+984,1,2613,1800,1,
+2614,1805,1,2616,1709,
+1,2617,1715,1,2470,
+3729,16,0,360,1,
+2619,1725,1,2537,1754,
+1,2529,1747,1,2623,
+3730,16,0,360,1,
+2551,1767,1,71,3731,
+19,359,1,71,3732,
+5,24,1,2664,3733,
+16,0,357,1,2546,
+1761,1,2620,1730,1,
+2621,1735,1,2612,1795,
+1,2618,1720,1,2520,
+1740,1,2566,1773,1,
+2568,3734,16,0,357,
+1,2459,967,1,2609,
+1780,1,2610,1785,1,
+2611,1790,1,2464,984,
+1,2613,1800,1,2614,
+1805,1,2616,1709,1,
+2617,1715,1,2470,3735,
+16,0,357,1,2619,
+1725,1,2537,1754,1,
+2529,1747,1,2623,3736,
+16,0,357,1,2551,
+1767,1,72,3737,19,
+426,1,72,3738,5,
+24,1,2664,3739,16,
+0,424,1,2546,1761,
+1,2620,1730,1,2621,
+1735,1,2612,1795,1,
+2618,1720,1,2520,1740,
+1,2566,1773,1,2568,
+3740,16,0,424,1,
+2459,967,1,2609,1780,
+1,2610,1785,1,2611,
+1790,1,2464,984,1,
+2613,1800,1,2614,1805,
+1,2616,1709,1,2617,
+1715,1,2470,3741,16,
+0,424,1,2619,1725,
+1,2537,1754,1,2529,
+1747,1,2623,3742,16,
+0,424,1,2551,1767,
+1,73,3743,19,730,
+1,73,3744,5,24,
+1,2664,3745,16,0,
+728,1,2546,1761,1,
+2620,1730,1,2621,1735,
+1,2612,1795,1,2618,
+1720,1,2520,1740,1,
+2566,1773,1,2568,3746,
+16,0,728,1,2459,
+967,1,2609,1780,1,
+2610,1785,1,2611,1790,
+1,2464,984,1,2613,
+1800,1,2614,1805,1,
+2616,1709,1,2617,1715,
+1,2470,3747,16,0,
+728,1,2619,1725,1,
+2537,1754,1,2529,1747,
+1,2623,3748,16,0,
+728,1,2551,1767,1,
+74,3749,19,422,1,
+74,3750,5,24,1,
+2664,3751,16,0,420,
+1,2546,1761,1,2620,
+1730,1,2621,1735,1,
+2612,1795,1,2618,1720,
+1,2520,1740,1,2566,
+1773,1,2568,3752,16,
+0,420,1,2459,967,
+1,2609,1780,1,2610,
+1785,1,2611,1790,1,
+2464,984,1,2613,1800,
+1,2614,1805,1,2616,
+1709,1,2617,1715,1,
+2470,3753,16,0,420,
+1,2619,1725,1,2537,
+1754,1,2529,1747,1,
+2623,3754,16,0,420,
+1,2551,1767,1,75,
+3755,19,411,1,75,
+3756,5,24,1,2664,
+3757,16,0,409,1,
+2546,1761,1,2620,1730,
+1,2621,1735,1,2612,
+1795,1,2618,1720,1,
+2520,1740,1,2566,1773,
+1,2568,3758,16,0,
+409,1,2459,967,1,
+2609,1780,1,2610,1785,
+1,2611,1790,1,2464,
+984,1,2613,1800,1,
+2614,1805,1,2616,1709,
+1,2617,1715,1,2470,
+3759,16,0,409,1,
+2619,1725,1,2537,1754,
+1,2529,1747,1,2623,
+3760,16,0,409,1,
+2551,1767,1,76,3761,
+19,534,1,76,3762,
+5,24,1,2664,3763,
+16,0,532,1,2546,
+1761,1,2620,1730,1,
+2621,1735,1,2612,1795,
+1,2618,1720,1,2520,
+1740,1,2566,1773,1,
+2568,3764,16,0,532,
+1,2459,967,1,2609,
+1780,1,2610,1785,1,
+2611,1790,1,2464,984,
+1,2613,1800,1,2614,
+1805,1,2616,1709,1,
+2617,1715,1,2470,3765,
+16,0,532,1,2619,
+1725,1,2537,1754,1,
+2529,1747,1,2623,3766,
+16,0,532,1,2551,
+1767,1,77,3767,19,
+531,1,77,3768,5,
+24,1,2664,3769,16,
+0,529,1,2546,1761,
+1,2620,1730,1,2621,
+1735,1,2612,1795,1,
+2618,1720,1,2520,1740,
+1,2566,1773,1,2568,
+3770,16,0,529,1,
+2459,967,1,2609,1780,
+1,2610,1785,1,2611,
+1790,1,2464,984,1,
+2613,1800,1,2614,1805,
+1,2616,1709,1,2617,
+1715,1,2470,3771,16,
+0,529,1,2619,1725,
+1,2537,1754,1,2529,
+1747,1,2623,3772,16,
+0,529,1,2551,1767,
+1,78,3773,19,528,
+1,78,3774,5,24,
+1,2664,3775,16,0,
+526,1,2546,1761,1,
+2620,1730,1,2621,1735,
+1,2612,1795,1,2618,
+1720,1,2520,1740,1,
+2566,1773,1,2568,3776,
+16,0,526,1,2459,
+967,1,2609,1780,1,
+2610,1785,1,2611,1790,
+1,2464,984,1,2613,
+1800,1,2614,1805,1,
+2616,1709,1,2617,1715,
+1,2470,3777,16,0,
+526,1,2619,1725,1,
+2537,1754,1,2529,1747,
+1,2623,3778,16,0,
+526,1,2551,1767,1,
+79,3779,19,525,1,
+79,3780,5,24,1,
+2664,3781,16,0,523,
+1,2546,1761,1,2620,
+1730,1,2621,1735,1,
+2612,1795,1,2618,1720,
+1,2520,1740,1,2566,
+1773,1,2568,3782,16,
+0,523,1,2459,967,
+1,2609,1780,1,2610,
+1785,1,2611,1790,1,
+2464,984,1,2613,1800,
+1,2614,1805,1,2616,
+1709,1,2617,1715,1,
+2470,3783,16,0,523,
+1,2619,1725,1,2537,
+1754,1,2529,1747,1,
+2623,3784,16,0,523,
+1,2551,1767,1,80,
+3785,19,521,1,80,
+3786,5,24,1,2664,
+3787,16,0,519,1,
+2546,1761,1,2620,1730,
+1,2621,1735,1,2612,
+1795,1,2618,1720,1,
+2520,1740,1,2566,1773,
+1,2568,3788,16,0,
+519,1,2459,967,1,
+2609,1780,1,2610,1785,
+1,2611,1790,1,2464,
+984,1,2613,1800,1,
+2614,1805,1,2616,1709,
+1,2617,1715,1,2470,
+3789,16,0,519,1,
+2619,1725,1,2537,1754,
+1,2529,1747,1,2623,
+3790,16,0,519,1,
+2551,1767,1,81,3791,
+19,383,1,81,3792,
+5,24,1,2664,3793,
+16,0,381,1,2546,
+1761,1,2620,1730,1,
+2621,1735,1,2612,1795,
+1,2618,1720,1,2520,
+1740,1,2566,1773,1,
+2568,3794,16,0,381,
+1,2459,967,1,2609,
+1780,1,2610,1785,1,
+2611,1790,1,2464,984,
+1,2613,1800,1,2614,
+1805,1,2616,1709,1,
+2617,1715,1,2470,3795,
+16,0,381,1,2619,
+1725,1,2537,1754,1,
+2529,1747,1,2623,3796,
+16,0,381,1,2551,
+1767,1,82,3797,19,
+544,1,82,3798,5,
+24,1,2664,3799,16,
+0,542,1,2546,1761,
+1,2620,1730,1,2621,
+1735,1,2612,1795,1,
+2618,1720,1,2520,1740,
+1,2566,1773,1,2568,
+3800,16,0,542,1,
+2459,967,1,2609,1780,
+1,2610,1785,1,2611,
+1790,1,2464,984,1,
+2613,1800,1,2614,1805,
+1,2616,1709,1,2617,
+1715,1,2470,3801,16,
+0,542,1,2619,1725,
+1,2537,1754,1,2529,
+1747,1,2623,3802,16,
+0,542,1,2551,1767,
+1,83,3803,19,380,
+1,83,3804,5,24,
+1,2664,3805,16,0,
+378,1,2546,1761,1,
+2620,1730,1,2621,1735,
+1,2612,1795,1,2618,
+1720,1,2520,1740,1,
+2566,1773,1,2568,3806,
+16,0,378,1,2459,
+967,1,2609,1780,1,
+2610,1785,1,2611,1790,
+1,2464,984,1,2613,
+1800,1,2614,1805,1,
+2616,1709,1,2617,1715,
+1,2470,3807,16,0,
+378,1,2619,1725,1,
+2537,1754,1,2529,1747,
+1,2623,3808,16,0,
+378,1,2551,1767,1,
+84,3809,19,377,1,
+84,3810,5,24,1,
+2664,3811,16,0,375,
+1,2546,1761,1,2620,
+1730,1,2621,1735,1,
+2612,1795,1,2618,1720,
+1,2520,1740,1,2566,
+1773,1,2568,3812,16,
+0,375,1,2459,967,
+1,2609,1780,1,2610,
+1785,1,2611,1790,1,
+2464,984,1,2613,1800,
+1,2614,1805,1,2616,
+1709,1,2617,1715,1,
+2470,3813,16,0,375,
+1,2619,1725,1,2537,
+1754,1,2529,1747,1,
+2623,3814,16,0,375,
+1,2551,1767,1,85,
+3815,19,415,1,85,
+3816,5,24,1,2664,
+3817,16,0,413,1,
+2546,1761,1,2620,1730,
+1,2621,1735,1,2612,
+1795,1,2618,1720,1,
+2520,1740,1,2566,1773,
+1,2568,3818,16,0,
+413,1,2459,967,1,
+2609,1780,1,2610,1785,
+1,2611,1790,1,2464,
+984,1,2613,1800,1,
+2614,1805,1,2616,1709,
+1,2617,1715,1,2470,
+3819,16,0,413,1,
+2619,1725,1,2537,1754,
+1,2529,1747,1,2623,
+3820,16,0,413,1,
+2551,1767,1,86,3821,
+19,537,1,86,3822,
+5,24,1,2664,3823,
+16,0,535,1,2546,
+1761,1,2620,1730,1,
+2621,1735,1,2612,1795,
+1,2618,1720,1,2520,
+1740,1,2566,1773,1,
+2568,3824,16,0,535,
+1,2459,967,1,2609,
+1780,1,2610,1785,1,
+2611,1790,1,2464,984,
+1,2613,1800,1,2614,
+1805,1,2616,1709,1,
+2617,1715,1,2470,3825,
+16,0,535,1,2619,
+1725,1,2537,1754,1,
+2529,1747,1,2623,3826,
+16,0,535,1,2551,
+1767,1,87,3827,19,
+402,1,87,3828,5,
+24,1,2664,3829,16,
+0,400,1,2546,1761,
+1,2620,1730,1,2621,
+1735,1,2612,1795,1,
+2618,1720,1,2520,1740,
+1,2566,1773,1,2568,
+3830,16,0,400,1,
+2459,967,1,2609,1780,
+1,2610,1785,1,2611,
+1790,1,2464,984,1,
+2613,1800,1,2614,1805,
+1,2616,1709,1,2617,
+1715,1,2470,3831,16,
+0,400,1,2619,1725,
+1,2537,1754,1,2529,
+1747,1,2623,3832,16,
+0,400,1,2551,1767,
+1,88,3833,19,374,
+1,88,3834,5,24,
+1,2664,3835,16,0,
+372,1,2546,1761,1,
+2620,1730,1,2621,1735,
+1,2612,1795,1,2618,
+1720,1,2520,1740,1,
+2566,1773,1,2568,3836,
+16,0,372,1,2459,
+967,1,2609,1780,1,
+2610,1785,1,2611,1790,
+1,2464,984,1,2613,
+1800,1,2614,1805,1,
+2616,1709,1,2617,1715,
+1,2470,3837,16,0,
+372,1,2619,1725,1,
+2537,1754,1,2529,1747,
+1,2623,3838,16,0,
+372,1,2551,1767,1,
+89,3839,19,368,1,
+89,3840,5,24,1,
+2664,3841,16,0,366,
+1,2546,1761,1,2620,
+1730,1,2621,1735,1,
+2612,1795,1,2618,1720,
+1,2520,1740,1,2566,
+1773,1,2568,3842,16,
+0,366,1,2459,967,
+1,2609,1780,1,2610,
+1785,1,2611,1790,1,
+2464,984,1,2613,1800,
+1,2614,1805,1,2616,
+1709,1,2617,1715,1,
+2470,3843,16,0,366,
+1,2619,1725,1,2537,
+1754,1,2529,1747,1,
+2623,3844,16,0,366,
+1,2551,1767,1,90,
+3845,19,371,1,90,
+3846,5,24,1,2664,
+3847,16,0,369,1,
+2546,1761,1,2620,1730,
+1,2621,1735,1,2612,
+1795,1,2618,1720,1,
+2520,1740,1,2566,1773,
+1,2568,3848,16,0,
+369,1,2459,967,1,
+2609,1780,1,2610,1785,
+1,2611,1790,1,2464,
+984,1,2613,1800,1,
+2614,1805,1,2616,1709,
+1,2617,1715,1,2470,
+3849,16,0,369,1,
+2619,1725,1,2537,1754,
+1,2529,1747,1,2623,
+3850,16,0,369,1,
+2551,1767,1,91,3851,
+19,418,1,91,3852,
+5,24,1,2664,3853,
+16,0,416,1,2546,
+1761,1,2620,1730,1,
+2621,1735,1,2612,1795,
+1,2618,1720,1,2520,
+1740,1,2566,1773,1,
+2568,3854,16,0,416,
+1,2459,967,1,2609,
+1780,1,2610,1785,1,
+2611,1790,1,2464,984,
+1,2613,1800,1,2614,
+1805,1,2616,1709,1,
+2617,1715,1,2470,3855,
+16,0,416,1,2619,
+1725,1,2537,1754,1,
+2529,1747,1,2623,3856,
+16,0,416,1,2551,
+1767,1,92,3857,19,
+133,1,92,3858,5,
+129,1,0,3859,16,
+0,714,1,1,2146,
+1,2,2152,1,3,
+2157,1,4,2162,1,
+5,2167,1,6,2172,
+1,7,2177,1,8,
+3860,16,0,131,1,
+1515,3861,16,0,176,
+1,2523,3862,16,0,
+468,1,2022,3863,16,
+0,548,1,256,3864,
+16,0,184,1,2777,
+3865,16,0,714,1,
+2025,3866,16,0,552,
+1,18,3867,16,0,
+148,1,2027,3868,16,
+0,556,1,2029,811,
+1,2030,817,1,2031,
+822,1,2032,827,1,
+2033,832,1,277,3869,
+16,0,184,1,2035,
+838,1,2037,843,1,
+2540,3870,16,0,498,
+1,2039,848,1,32,
+3871,16,0,176,1,
+2041,854,1,2795,3426,
+1,2796,3432,1,2797,
+3437,1,2798,3442,1,
+41,3872,16,0,184,
+1,1297,3873,16,0,
+176,1,43,3874,16,
+0,184,1,46,3875,
+16,0,189,1,1804,
+3876,16,0,176,1,
+299,3877,16,0,184,
+1,52,3878,16,0,
+176,1,509,3879,16,
+0,184,1,2318,3880,
+16,0,176,1,62,
+3881,16,0,206,1,
+65,3882,16,0,208,
+1,2075,3883,16,0,
+176,1,1574,885,1,
+71,3884,16,0,184,
+1,1775,3885,16,0,
+176,1,76,3886,16,
+0,184,1,1834,3887,
+16,0,176,1,2337,
+3888,16,0,176,1,
+79,3889,16,0,184,
+1,1335,3890,16,0,
+176,1,2511,3891,16,
+0,453,1,322,3892,
+16,0,184,1,85,
+3893,16,0,184,1,
+1261,3894,16,0,176,
+1,89,3895,16,0,
+184,1,2765,3453,1,
+346,3896,16,0,184,
+1,97,3897,16,0,
+184,1,2106,3898,16,
+0,176,1,2043,860,
+1,102,3899,16,0,
+184,1,1860,907,1,
+1803,873,1,2364,913,
+1,2293,3900,16,0,
+184,1,1113,3901,16,
+0,168,1,112,3902,
+16,0,184,1,1117,
+3903,16,0,176,1,
+1873,921,1,1876,3904,
+16,0,176,1,372,
+3905,16,0,586,1,
+374,3906,16,0,588,
+1,124,3907,16,0,
+184,1,376,3908,16,
+0,590,1,378,3909,
+16,0,592,1,2136,
+928,1,381,3910,16,
+0,184,1,525,3911,
+16,0,184,1,137,
+3912,16,0,184,1,
+2021,804,1,1901,3913,
+16,0,176,1,1153,
+3914,16,0,176,1,
+151,3915,16,0,184,
+1,1407,3916,16,0,
+176,1,1659,3917,16,
+0,176,1,2413,3918,
+16,0,176,1,406,
+3919,16,0,184,1,
+1371,3920,16,0,176,
+1,2105,900,1,166,
+3921,16,0,184,1,
+2045,865,1,1622,3922,
+16,0,184,1,1931,
+946,1,1933,3923,16,
+0,176,1,431,3924,
+16,0,184,1,1585,
+3925,16,0,184,1,
+182,3926,16,0,184,
+1,1189,3927,16,0,
+176,1,1443,3928,16,
+0,176,1,1695,3929,
+16,0,176,1,2198,
+3930,16,0,176,1,
+2776,3417,1,447,3931,
+16,0,184,1,2458,
+961,1,2459,967,1,
+1958,3932,16,0,176,
+1,2462,974,1,1657,
+979,1,2464,984,1,
+2466,3447,1,459,3933,
+16,0,184,1,2468,
+3934,16,0,352,1,
+462,3935,16,0,184,
+1,199,3936,16,0,
+184,1,217,3937,16,
+0,184,1,2227,993,
+1,1225,3938,16,0,
+176,1,1479,3939,16,
+0,176,1,1731,3940,
+16,0,184,1,2737,
+3459,1,2740,3941,16,
+0,184,1,1989,1002,
+1,1990,3942,16,0,
+176,1,236,3943,16,
+0,184,1,2507,3944,
+16,0,447,1,1756,
+3945,16,0,176,1,
+93,3946,19,702,1,
+93,3947,5,95,1,
+256,3948,16,0,700,
+1,1261,3949,16,0,
+700,1,509,3950,16,
+0,700,1,1515,3951,
+16,0,700,1,2021,
+804,1,1775,3952,16,
+0,700,1,2029,811,
+1,2030,817,1,2031,
+822,1,2032,827,1,
+2033,832,1,277,3953,
+16,0,700,1,2035,
+838,1,2037,843,1,
+2039,848,1,32,3954,
+16,0,700,1,2041,
+854,1,2293,3955,16,
+0,700,1,2043,860,
+1,2045,865,1,41,
+3956,16,0,700,1,
+1297,3957,16,0,700,
+1,43,3958,16,0,
+700,1,1803,873,1,
+1804,3959,16,0,700,
+1,299,3960,16,0,
+700,1,52,3961,16,
+0,700,1,2318,3962,
+16,0,700,1,62,
+3963,16,0,700,1,
+2075,3964,16,0,700,
+1,1574,885,1,71,
+3965,16,0,700,1,
+76,3966,16,0,700,
+1,1834,3967,16,0,
+700,1,2337,3968,16,
+0,700,1,79,3969,
+16,0,700,1,1335,
+3970,16,0,700,1,
+322,3971,16,0,700,
+1,85,3972,16,0,
+700,1,89,3973,16,
+0,700,1,346,3974,
+16,0,700,1,2105,
+900,1,2106,3975,16,
+0,700,1,97,3976,
+16,0,700,1,1860,
+907,1,2364,913,1,
+102,3977,16,0,700,
+1,112,3978,16,0,
+700,1,1117,3979,16,
+0,700,1,1873,921,
+1,1876,3980,16,0,
+700,1,124,3981,16,
+0,700,1,2136,928,
+1,381,3982,16,0,
+700,1,525,3983,16,
+0,700,1,137,3984,
+16,0,700,1,1901,
+3985,16,0,700,1,
+1153,3986,16,0,700,
+1,151,3987,16,0,
+700,1,1407,3988,16,
+0,700,1,1659,3989,
+16,0,700,1,2413,
+3990,16,0,700,1,
+406,3991,16,0,700,
+1,1371,3992,16,0,
+700,1,166,3993,16,
+0,700,1,1622,3994,
+16,0,700,1,1931,
+946,1,1933,3995,16,
+0,700,1,431,3996,
+16,0,700,1,1585,
+3997,16,0,700,1,
+182,3998,16,0,700,
+1,1189,3999,16,0,
+700,1,1443,4000,16,
+0,700,1,1695,4001,
+16,0,700,1,2198,
+4002,16,0,700,1,
+447,4003,16,0,700,
+1,2458,961,1,2459,
+967,1,1958,4004,16,
+0,700,1,2462,974,
+1,1657,979,1,2464,
+984,1,199,4005,16,
+0,700,1,459,4006,
+16,0,700,1,462,
+4007,16,0,700,1,
+217,4008,16,0,700,
+1,2227,993,1,1225,
+4009,16,0,700,1,
+1479,4010,16,0,700,
+1,1731,4011,16,0,
+700,1,2740,4012,16,
+0,700,1,1989,1002,
+1,1990,4013,16,0,
+700,1,236,4014,16,
+0,700,1,1756,4015,
+16,0,700,1,94,
+4016,19,699,1,94,
+4017,5,95,1,256,
+4018,16,0,697,1,
+1261,4019,16,0,697,
+1,509,4020,16,0,
+697,1,1515,4021,16,
+0,697,1,2021,804,
+1,1775,4022,16,0,
+697,1,2029,811,1,
+2030,817,1,2031,822,
+1,2032,827,1,2033,
+832,1,277,4023,16,
+0,697,1,2035,838,
+1,2037,843,1,2039,
+848,1,32,4024,16,
+0,697,1,2041,854,
+1,2293,4025,16,0,
+697,1,2043,860,1,
+2045,865,1,41,4026,
+16,0,697,1,1297,
+4027,16,0,697,1,
+43,4028,16,0,697,
+1,1803,873,1,1804,
+4029,16,0,697,1,
+299,4030,16,0,697,
+1,52,4031,16,0,
+697,1,2318,4032,16,
+0,697,1,62,4033,
+16,0,697,1,2075,
+4034,16,0,697,1,
+1574,885,1,71,4035,
+16,0,697,1,76,
+4036,16,0,697,1,
+1834,4037,16,0,697,
+1,2337,4038,16,0,
+697,1,79,4039,16,
+0,697,1,1335,4040,
+16,0,697,1,322,
+4041,16,0,697,1,
+85,4042,16,0,697,
+1,89,4043,16,0,
+697,1,346,4044,16,
+0,697,1,2105,900,
+1,2106,4045,16,0,
+697,1,97,4046,16,
+0,697,1,1860,907,
+1,2364,913,1,102,
+4047,16,0,697,1,
+112,4048,16,0,697,
+1,1117,4049,16,0,
+697,1,1873,921,1,
+1876,4050,16,0,697,
+1,124,4051,16,0,
+697,1,2136,928,1,
+381,4052,16,0,697,
+1,525,4053,16,0,
+697,1,137,4054,16,
+0,697,1,1901,4055,
+16,0,697,1,1153,
+4056,16,0,697,1,
+151,4057,16,0,697,
+1,1407,4058,16,0,
+697,1,1659,4059,16,
+0,697,1,2413,4060,
+16,0,697,1,406,
+4061,16,0,697,1,
+1371,4062,16,0,697,
+1,166,4063,16,0,
+697,1,1622,4064,16,
+0,697,1,1931,946,
+1,1933,4065,16,0,
+697,1,431,4066,16,
+0,697,1,1585,4067,
+16,0,697,1,182,
+4068,16,0,697,1,
+1189,4069,16,0,697,
+1,1443,4070,16,0,
+697,1,1695,4071,16,
+0,697,1,2198,4072,
+16,0,697,1,447,
+4073,16,0,697,1,
+2458,961,1,2459,967,
+1,1958,4074,16,0,
+697,1,2462,974,1,
+1657,979,1,2464,984,
+1,199,4075,16,0,
+697,1,459,4076,16,
+0,697,1,462,4077,
+16,0,697,1,217,
+4078,16,0,697,1,
+2227,993,1,1225,4079,
+16,0,697,1,1479,
+4080,16,0,697,1,
+1731,4081,16,0,697,
+1,2740,4082,16,0,
+697,1,1989,1002,1,
+1990,4083,16,0,697,
+1,236,4084,16,0,
+697,1,1756,4085,16,
+0,697,1,95,4086,
+19,696,1,95,4087,
+5,95,1,256,4088,
+16,0,694,1,1261,
+4089,16,0,694,1,
+509,4090,16,0,694,
+1,1515,4091,16,0,
+694,1,2021,804,1,
+1775,4092,16,0,694,
+1,2029,811,1,2030,
+817,1,2031,822,1,
+2032,827,1,2033,832,
+1,277,4093,16,0,
+694,1,2035,838,1,
+2037,843,1,2039,848,
+1,32,4094,16,0,
+694,1,2041,854,1,
+2293,4095,16,0,694,
+1,2043,860,1,2045,
+865,1,41,4096,16,
+0,694,1,1297,4097,
+16,0,694,1,43,
+4098,16,0,694,1,
+1803,873,1,1804,4099,
+16,0,694,1,299,
+4100,16,0,694,1,
+52,4101,16,0,694,
+1,2318,4102,16,0,
+694,1,62,4103,16,
+0,694,1,2075,4104,
+16,0,694,1,1574,
+885,1,71,4105,16,
+0,694,1,76,4106,
+16,0,694,1,1834,
+4107,16,0,694,1,
+2337,4108,16,0,694,
+1,79,4109,16,0,
+694,1,1335,4110,16,
+0,694,1,322,4111,
+16,0,694,1,85,
+4112,16,0,694,1,
+89,4113,16,0,694,
+1,346,4114,16,0,
+694,1,2105,900,1,
+2106,4115,16,0,694,
+1,97,4116,16,0,
+694,1,1860,907,1,
+2364,913,1,102,4117,
+16,0,694,1,112,
+4118,16,0,694,1,
+1117,4119,16,0,694,
+1,1873,921,1,1876,
+4120,16,0,694,1,
+124,4121,16,0,694,
+1,2136,928,1,381,
+4122,16,0,694,1,
+525,4123,16,0,694,
+1,137,4124,16,0,
+694,1,1901,4125,16,
+0,694,1,1153,4126,
+16,0,694,1,151,
+4127,16,0,694,1,
+1407,4128,16,0,694,
+1,1659,4129,16,0,
+694,1,2413,4130,16,
+0,694,1,406,4131,
+16,0,694,1,1371,
+4132,16,0,694,1,
+166,4133,16,0,694,
+1,1622,4134,16,0,
+694,1,1931,946,1,
+1933,4135,16,0,694,
+1,431,4136,16,0,
+694,1,1585,4137,16,
+0,694,1,182,4138,
+16,0,694,1,1189,
+4139,16,0,694,1,
+1443,4140,16,0,694,
+1,1695,4141,16,0,
+694,1,2198,4142,16,
+0,694,1,447,4143,
+16,0,694,1,2458,
+961,1,2459,967,1,
+1958,4144,16,0,694,
+1,2462,974,1,1657,
+979,1,2464,984,1,
+199,4145,16,0,694,
+1,459,4146,16,0,
+694,1,462,4147,16,
+0,694,1,217,4148,
+16,0,694,1,2227,
+993,1,1225,4149,16,
+0,694,1,1479,4150,
+16,0,694,1,1731,
+4151,16,0,694,1,
+2740,4152,16,0,694,
+1,1989,1002,1,1990,
+4153,16,0,694,1,
+236,4154,16,0,694,
+1,1756,4155,16,0,
+694,1,96,4156,19,
+103,1,96,4157,5,
+1,1,0,4158,16,
+0,104,1,97,4159,
+19,758,1,97,4160,
+5,1,1,0,4161,
+16,0,756,1,98,
+4162,19,139,1,98,
+4163,5,2,1,0,
+4164,16,0,143,1,
+2777,4165,16,0,137,
+1,99,4166,19,142,
+1,99,4167,5,2,
+1,0,4168,16,0,
+140,1,2777,4169,16,
+0,248,1,100,4170,
+19,243,1,100,4171,
+5,2,1,0,4172,
+16,0,708,1,2777,
+4173,16,0,241,1,
+101,4174,19,712,1,
+101,4175,5,4,1,
+0,4176,16,0,713,
+1,2718,4177,16,0,
+710,1,2777,4178,16,
+0,713,1,2788,4179,
+16,0,710,1,102,
+4180,19,722,1,102,
+4181,5,2,1,2623,
+4182,16,0,739,1,
+2470,4183,16,0,720,
+1,103,4184,19,622,
+1,103,4185,5,4,
+1,2664,4186,16,0,
+685,1,2623,4187,16,
+0,620,1,2470,4188,
+16,0,620,1,2568,
+4189,16,0,685,1,
+104,4190,19,619,1,
+104,4191,5,4,1,
+2664,4192,16,0,684,
+1,2623,4193,16,0,
+617,1,2470,4194,16,
+0,617,1,2568,4195,
+16,0,684,1,105,
+4196,19,616,1,105,
+4197,5,4,1,2664,
+4198,16,0,683,1,
+2623,4199,16,0,614,
+1,2470,4200,16,0,
+614,1,2568,4201,16,
+0,683,1,106,4202,
+19,602,1,106,4203,
+5,4,1,2664,4204,
+16,0,600,1,2623,
+4205,16,0,690,1,
+2470,4206,16,0,690,
+1,2568,4207,16,0,
+600,1,107,4208,19,
+599,1,107,4209,5,
+4,1,2664,4210,16,
+0,597,1,2623,4211,
+16,0,612,1,2470,
+4212,16,0,612,1,
+2568,4213,16,0,597,
+1,108,4214,19,611,
+1,108,4215,5,4,
+1,2664,4216,16,0,
+754,1,2623,4217,16,
+0,609,1,2470,4218,
+16,0,609,1,2568,
+4219,16,0,754,1,
+109,4220,19,151,1,
+109,4221,5,3,1,
+2553,4222,16,0,517,
+1,2724,4223,16,0,
+723,1,10,4224,16,
+0,149,1,110,4225,
+19,629,1,110,4226,
+5,1,1,2539,4227,
+16,0,627,1,111,
+4228,19,487,1,111,
+4229,5,1,1,2531,
+4230,16,0,485,1,
+112,4231,19,474,1,
+112,4232,5,1,1,
+2522,4233,16,0,472,
+1,113,4234,19,462,
+1,113,4235,5,1,
+1,2506,4236,16,0,
+460,1,114,4237,19,
+161,1,114,4238,5,
+17,1,0,4239,16,
+0,731,1,2777,4240,
+16,0,731,1,2075,
+4241,16,0,725,1,
+2337,4242,16,0,725,
+1,2413,4243,16,0,
+725,1,2553,4244,16,
+0,348,1,10,4245,
+16,0,348,1,1901,
+4246,16,0,725,1,
+2198,4247,16,0,725,
+1,21,4248,16,0,
+159,1,2106,4249,16,
+0,725,1,2724,4250,
+16,0,348,1,1804,
+4251,16,0,725,1,
+1990,4252,16,0,725,
+1,32,4253,16,0,
+725,1,1958,4254,16,
+0,725,1,1775,4255,
+16,0,725,1,115,
+4256,19,501,1,115,
+4257,5,1,1,2539,
+4258,16,0,499,1,
+116,4259,19,450,1,
+116,4260,5,2,1,
+2531,4261,16,0,607,
+1,2506,4262,16,0,
+448,1,117,4263,19,
+471,1,117,4264,5,
+1,1,2522,4265,16,
+0,469,1,118,4266,
+19,456,1,118,4267,
+5,2,1,2510,4268,
+16,0,454,1,2514,
+4269,16,0,459,1,
+119,4270,19,130,1,
+119,4271,5,18,1,
+0,4272,16,0,128,
+1,2777,4273,16,0,
+128,1,2075,4274,16,
+0,147,1,2337,4275,
+16,0,147,1,2413,
+4276,16,0,147,1,
+2553,4277,16,0,147,
+1,10,4278,16,0,
+147,1,2198,4279,16,
+0,147,1,1901,4280,
+16,0,147,1,52,
+4281,16,0,204,1,
+21,4282,16,0,147,
+1,2106,4283,16,0,
+147,1,2724,4284,16,
+0,147,1,1804,4285,
+16,0,147,1,1990,
+4286,16,0,147,1,
+32,4287,16,0,147,
+1,1958,4288,16,0,
+147,1,1775,4289,16,
+0,147,1,120,4290,
+19,638,1,120,4291,
+5,4,1,2664,4292,
+16,0,636,1,2623,
+4293,16,0,636,1,
+2470,4294,16,0,636,
+1,2568,4295,16,0,
+636,1,121,4296,19,
+236,1,121,4297,5,
+4,1,2664,4298,16,
+0,234,1,2623,4299,
+16,0,234,1,2470,
+4300,16,0,234,1,
+2568,4301,16,0,234,
+1,122,4302,19,495,
+1,122,4303,5,4,
+1,2664,4304,16,0,
+493,1,2623,4305,16,
+0,493,1,2470,4306,
+16,0,493,1,2568,
+4307,16,0,493,1,
+123,4308,19,482,1,
+123,4309,5,4,1,
+2664,4310,16,0,480,
+1,2623,4311,16,0,
+480,1,2470,4312,16,
+0,480,1,2568,4313,
+16,0,480,1,124,
+4314,19,746,1,124,
+4315,5,4,1,2664,
+4316,16,0,744,1,
+2623,4317,16,0,744,
+1,2470,4318,16,0,
+744,1,2568,4319,16,
+0,744,1,125,4320,
+19,737,1,125,4321,
+5,4,1,2664,4322,
+16,0,735,1,2623,
+4323,16,0,735,1,
+2470,4324,16,0,735,
+1,2568,4325,16,0,
+735,1,126,4326,19,
+271,1,126,4327,5,
+19,1,2544,4328,16,
+0,630,1,2518,4329,
+16,0,666,1,2075,
+4330,16,0,557,1,
+2337,4331,16,0,557,
+1,2413,4332,16,0,
+557,1,2527,4333,16,
+0,479,1,1901,4334,
+16,0,557,1,2198,
+4335,16,0,557,1,
+2535,4336,16,0,613,
+1,2564,4337,16,0,
+522,1,2106,4338,16,
+0,557,1,1958,4339,
+16,0,557,1,1804,
+4340,16,0,557,1,
+1990,4341,16,0,557,
+1,31,4342,16,0,
+347,1,32,4343,16,
+0,557,1,2549,4344,
+16,0,511,1,2735,
+4345,16,0,269,1,
+1775,4346,16,0,557,
+1,127,4347,19,317,
+1,127,4348,5,1,
+1,32,4349,16,0,
+315,1,128,4350,19,
+275,1,128,4351,5,
+11,1,2075,4352,16,
+0,653,1,2337,4353,
+16,0,279,1,2413,
+4354,16,0,489,1,
+1901,4355,16,0,403,
+1,2198,4356,16,0,
+333,1,2106,4357,16,
+0,682,1,1804,4358,
+16,0,300,1,1990,
+4359,16,0,545,1,
+32,4360,16,0,343,
+1,1958,4361,16,0,
+504,1,1775,4362,16,
+0,273,1,129,4363,
+19,659,1,129,4364,
+5,11,1,2075,4365,
+16,0,657,1,2337,
+4366,16,0,657,1,
+2413,4367,16,0,657,
+1,1901,4368,16,0,
+657,1,2198,4369,16,
+0,657,1,2106,4370,
+16,0,657,1,1804,
+4371,16,0,657,1,
+1990,4372,16,0,657,
+1,32,4373,16,0,
+657,1,1958,4374,16,
+0,657,1,1775,4375,
+16,0,657,1,130,
+4376,19,718,1,130,
+4377,5,11,1,2075,
+4378,16,0,716,1,
+2337,4379,16,0,716,
+1,2413,4380,16,0,
+716,1,1901,4381,16,
+0,716,1,2198,4382,
+16,0,716,1,2106,
+4383,16,0,716,1,
+1804,4384,16,0,716,
+1,1990,4385,16,0,
+716,1,32,4386,16,
+0,716,1,1958,4387,
+16,0,716,1,1775,
+4388,16,0,716,1,
+131,4389,19,172,1,
+131,4390,5,31,1,
+1901,4391,16,0,724,
+1,1479,4392,16,0,
+631,1,2075,4393,16,
+0,724,1,1695,4394,
+16,0,200,1,1756,
+4395,16,0,199,1,
+2413,4396,16,0,724,
+1,2198,4397,16,0,
+724,1,1876,4398,16,
+0,741,1,1659,4399,
+16,0,199,1,1443,
+4400,16,0,573,1,
+1117,4401,16,0,170,
 1,1990,4402,16,0,
-565,1,32,4403,16,
-0,565,1,1958,4404,
-16,0,565,1,1775,
-4405,16,0,565,1,
-133,4406,19,564,1,
-133,4407,5,11,1,
-2075,4408,16,0,562,
-1,2337,4409,16,0,
-562,1,2413,4410,16,
-0,562,1,1901,4411,
-16,0,562,1,2198,
-4412,16,0,562,1,
-2106,4413,16,0,562,
-1,1804,4414,16,0,
-562,1,1990,4415,16,
-0,562,1,32,4416,
-16,0,562,1,1958,
-4417,16,0,562,1,
-1775,4418,16,0,562,
-1,134,4419,19,561,
-1,134,4420,5,11,
-1,2075,4421,16,0,
-559,1,2337,4422,16,
-0,559,1,2413,4423,
-16,0,559,1,1901,
-4424,16,0,559,1,
-2198,4425,16,0,559,
-1,2106,4426,16,0,
-559,1,1804,4427,16,
-0,559,1,1990,4428,
-16,0,559,1,32,
-4429,16,0,559,1,
-1958,4430,16,0,559,
-1,1775,4431,16,0,
-559,1,135,4432,19,
-558,1,135,4433,5,
-11,1,2075,4434,16,
-0,556,1,2337,4435,
-16,0,556,1,2413,
-4436,16,0,556,1,
-1901,4437,16,0,556,
-1,2198,4438,16,0,
-556,1,2106,4439,16,
-0,556,1,1804,4440,
-16,0,556,1,1990,
-4441,16,0,556,1,
-32,4442,16,0,556,
-1,1958,4443,16,0,
-556,1,1775,4444,16,
-0,556,1,136,4445,
-19,147,1,136,4446,
-5,3,1,1756,4447,
-16,0,291,1,2318,
-4448,16,0,308,1,
-1659,4449,16,0,145,
-1,137,4450,19,597,
-1,137,4451,5,68,
-1,1901,4452,16,0,
-595,1,1479,4453,16,
-0,595,1,112,4454,
-16,0,595,1,2293,
-4455,16,0,595,1,
-1804,4456,16,0,595,
-1,431,4457,16,0,
-595,1,1443,4458,16,
-0,595,1,1756,4459,
-16,0,595,1,124,
-4460,16,0,595,1,
-525,4461,16,0,595,
-1,236,4462,16,0,
-595,1,346,4463,16,
-0,595,1,1876,4464,
-16,0,595,1,1659,
-4465,16,0,595,1,
-1225,4466,16,0,595,
-1,1117,4467,16,0,
-595,1,137,4468,16,
-0,595,1,2318,4469,
-16,0,595,1,1775,
-4470,16,0,595,1,
-32,4471,16,0,595,
-1,2718,4472,16,0,
-595,1,1407,4473,16,
-0,595,1,256,4474,
-16,0,595,1,459,
-4475,16,0,595,1,
-406,4476,16,0,595,
-1,41,4477,16,0,
-595,1,151,4478,16,
-0,595,1,43,4479,
-16,0,595,1,1585,
-4480,16,0,595,1,
-1990,4481,16,0,595,
-1,2337,4482,16,0,
-595,1,509,4483,16,
-0,595,1,52,4484,
-16,0,595,1,381,
-4485,16,0,595,1,
-447,4486,16,0,595,
-1,166,4487,16,0,
-595,1,462,4488,16,
-0,595,1,277,4489,
-16,0,595,1,1695,
-4490,16,0,595,1,
-62,4491,16,0,635,
-1,1153,4492,16,0,
-595,1,2106,4493,16,
-0,595,1,1335,4494,
-16,0,595,1,71,
-4495,16,0,595,1,
-182,4496,16,0,595,
-1,76,4497,16,0,
-595,1,79,4498,16,
-0,595,1,1933,4499,
-16,0,595,1,299,
-4500,16,0,595,1,
-85,4501,16,0,595,
-1,1515,4502,16,0,
-595,1,2198,4503,16,
-0,595,1,89,4504,
-16,0,595,1,1834,
-4505,16,0,595,1,
-1622,4506,16,0,595,
-1,2413,4507,16,0,
-595,1,2075,4508,16,
-0,595,1,1731,4509,
-16,0,595,1,97,
-4510,16,0,595,1,
-1297,4511,16,0,595,
-1,1189,4512,16,0,
-595,1,102,4513,16,
-0,595,1,1261,4514,
-16,0,595,1,322,
-4515,16,0,595,1,
-1958,4516,16,0,595,
-1,199,4517,16,0,
-595,1,1371,4518,16,
-0,595,1,217,4519,
-16,0,595,1,138,
-4520,19,661,1,138,
-4521,5,2,1,459,
-4522,16,0,659,1,
-41,4523,16,0,722,
-1,139,4524,19,665,
-1,139,4525,5,3,
-1,462,4526,16,0,
-663,1,459,4527,16,
-0,691,1,41,4528,
-16,0,691,1,140,
-4529,19,4530,4,36,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
+724,1,1189,4403,16,
+0,255,1,1775,4404,
+16,0,724,1,32,
+4405,16,0,724,1,
+2106,4406,16,0,724,
+1,1515,4407,16,0,
+655,1,2337,4408,16,
+0,724,1,52,4409,
+16,0,667,1,1804,
+4410,16,0,724,1,
+1261,4411,16,0,311,
+1,1153,4412,16,0,
+262,1,1225,4413,16,
+0,289,1,1335,4414,
+16,0,478,1,1933,
+4415,16,0,634,1,
+1834,4416,16,0,327,
+1,1297,4417,16,0,
+337,1,1407,4418,16,
+0,647,1,2318,4419,
+16,0,199,1,1958,
+4420,16,0,724,1,
+1371,4421,16,0,464,
+1,132,4422,19,582,
+1,132,4423,5,11,
+1,2075,4424,16,0,
+580,1,2337,4425,16,
+0,580,1,2413,4426,
+16,0,580,1,1901,
+4427,16,0,580,1,
+2198,4428,16,0,580,
+1,2106,4429,16,0,
+580,1,1804,4430,16,
+0,580,1,1990,4431,
+16,0,580,1,32,
+4432,16,0,580,1,
+1958,4433,16,0,580,
+1,1775,4434,16,0,
+580,1,133,4435,19,
+578,1,133,4436,5,
+11,1,2075,4437,16,
+0,576,1,2337,4438,
+16,0,576,1,2413,
+4439,16,0,576,1,
+1901,4440,16,0,576,
+1,2198,4441,16,0,
+576,1,2106,4442,16,
+0,576,1,1804,4443,
+16,0,576,1,1990,
+4444,16,0,576,1,
+32,4445,16,0,576,
+1,1958,4446,16,0,
+576,1,1775,4447,16,
+0,576,1,134,4448,
+19,651,1,134,4449,
+5,11,1,2075,4450,
+16,0,649,1,2337,
+4451,16,0,649,1,
+2413,4452,16,0,649,
+1,1901,4453,16,0,
+649,1,2198,4454,16,
+0,649,1,2106,4455,
+16,0,649,1,1804,
+4456,16,0,649,1,
+1990,4457,16,0,649,
+1,32,4458,16,0,
+649,1,1958,4459,16,
+0,649,1,1775,4460,
+16,0,649,1,135,
+4461,19,572,1,135,
+4462,5,11,1,2075,
+4463,16,0,570,1,
+2337,4464,16,0,570,
+1,2413,4465,16,0,
+570,1,1901,4466,16,
+0,570,1,2198,4467,
+16,0,570,1,2106,
+4468,16,0,570,1,
+1804,4469,16,0,570,
+1,1990,4470,16,0,
+570,1,32,4471,16,
+0,570,1,1958,4472,
+16,0,570,1,1775,
+4473,16,0,570,1,
+136,4474,19,569,1,
+136,4475,5,11,1,
+2075,4476,16,0,567,
+1,2337,4477,16,0,
+567,1,2413,4478,16,
+0,567,1,1901,4479,
+16,0,567,1,2198,
+4480,16,0,567,1,
+2106,4481,16,0,567,
+1,1804,4482,16,0,
+567,1,1990,4483,16,
+0,567,1,32,4484,
+16,0,567,1,1958,
+4485,16,0,567,1,
+1775,4486,16,0,567,
+1,137,4487,19,566,
+1,137,4488,5,11,
+1,2075,4489,16,0,
+564,1,2337,4490,16,
+0,564,1,2413,4491,
+16,0,564,1,1901,
+4492,16,0,564,1,
+2198,4493,16,0,564,
+1,2106,4494,16,0,
+564,1,1804,4495,16,
+0,564,1,1990,4496,
+16,0,564,1,32,
+4497,16,0,564,1,
+1958,4498,16,0,564,
+1,1775,4499,16,0,
+564,1,138,4500,19,
+563,1,138,4501,5,
+11,1,2075,4502,16,
+0,561,1,2337,4503,
+16,0,561,1,2413,
+4504,16,0,561,1,
+1901,4505,16,0,561,
+1,2198,4506,16,0,
+561,1,2106,4507,16,
+0,561,1,1804,4508,
+16,0,561,1,1990,
+4509,16,0,561,1,
+32,4510,16,0,561,
+1,1958,4511,16,0,
+561,1,1775,4512,16,
+0,561,1,139,4513,
+19,560,1,139,4514,
+5,11,1,2075,4515,
+16,0,558,1,2337,
+4516,16,0,558,1,
+2413,4517,16,0,558,
+1,1901,4518,16,0,
+558,1,2198,4519,16,
+0,558,1,2106,4520,
+16,0,558,1,1804,
+4521,16,0,558,1,
+1990,4522,16,0,558,
+1,32,4523,16,0,
+558,1,1958,4524,16,
+0,558,1,1775,4525,
+16,0,558,1,140,
+4526,19,157,1,140,
+4527,5,3,1,1756,
+4528,16,0,299,1,
+2318,4529,16,0,310,
+1,1659,4530,16,0,
+155,1,141,4531,19,
+605,1,141,4532,5,
+68,1,1901,4533,16,
+0,603,1,1479,4534,
+16,0,603,1,112,
+4535,16,0,603,1,
+2293,4536,16,0,603,
+1,1804,4537,16,0,
+603,1,431,4538,16,
+0,603,1,1443,4539,
+16,0,603,1,1756,
+4540,16,0,603,1,
+124,4541,16,0,603,
+1,525,4542,16,0,
+603,1,236,4543,16,
+0,603,1,346,4544,
+16,0,603,1,1876,
+4545,16,0,603,1,
+1659,4546,16,0,603,
+1,1225,4547,16,0,
+603,1,1117,4548,16,
+0,603,1,137,4549,
+16,0,603,1,2318,
+4550,16,0,603,1,
+1775,4551,16,0,603,
+1,32,4552,16,0,
+603,1,1407,4553,16,
+0,603,1,2740,4554,
+16,0,603,1,256,
+4555,16,0,603,1,
+459,4556,16,0,603,
+1,406,4557,16,0,
+603,1,41,4558,16,
+0,603,1,151,4559,
+16,0,603,1,43,
+4560,16,0,603,1,
+1585,4561,16,0,603,
+1,1990,4562,16,0,
+603,1,2337,4563,16,
+0,603,1,509,4564,
+16,0,603,1,52,
+4565,16,0,603,1,
+381,4566,16,0,603,
+1,447,4567,16,0,
+603,1,166,4568,16,
+0,603,1,462,4569,
+16,0,603,1,277,
+4570,16,0,603,1,
+1695,4571,16,0,603,
+1,62,4572,16,0,
+663,1,1153,4573,16,
+0,603,1,2106,4574,
+16,0,603,1,1335,
+4575,16,0,603,1,
+71,4576,16,0,603,
+1,182,4577,16,0,
+603,1,76,4578,16,
+0,603,1,79,4579,
+16,0,603,1,1933,
+4580,16,0,603,1,
+299,4581,16,0,603,
+1,85,4582,16,0,
+603,1,1515,4583,16,
+0,603,1,2198,4584,
+16,0,603,1,89,
+4585,16,0,603,1,
+1834,4586,16,0,603,
+1,1622,4587,16,0,
+603,1,2413,4588,16,
+0,603,1,2075,4589,
+16,0,603,1,1731,
+4590,16,0,603,1,
+97,4591,16,0,603,
+1,1297,4592,16,0,
+603,1,1189,4593,16,
+0,603,1,102,4594,
+16,0,603,1,1261,
+4595,16,0,603,1,
+322,4596,16,0,603,
+1,1958,4597,16,0,
+603,1,199,4598,16,
+0,603,1,1371,4599,
+16,0,603,1,217,
+4600,16,0,603,1,
+142,4601,19,677,1,
+142,4602,5,2,1,
+459,4603,16,0,675,
+1,41,4604,16,0,
+747,1,143,4605,19,
+681,1,143,4606,5,
+3,1,462,4607,16,
+0,679,1,459,4608,
+16,0,706,1,41,
+4609,16,0,706,1,
+144,4610,19,4611,4,
+36,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,1,144,4606,
+1,145,4612,19,595,
+1,145,4613,5,68,
+1,1901,4614,16,0,
+593,1,1479,4615,16,
+0,593,1,112,4616,
+16,0,593,1,2293,
+4617,16,0,593,1,
+1804,4618,16,0,593,
+1,431,4619,16,0,
+593,1,1443,4620,16,
+0,593,1,1756,4621,
+16,0,593,1,124,
+4622,16,0,593,1,
+525,4623,16,0,593,
+1,236,4624,16,0,
+593,1,346,4625,16,
+0,593,1,1876,4626,
+16,0,593,1,1659,
+4627,16,0,593,1,
+1225,4628,16,0,593,
+1,1117,4629,16,0,
+593,1,137,4630,16,
+0,593,1,2318,4631,
+16,0,593,1,1775,
+4632,16,0,593,1,
+32,4633,16,0,593,
+1,1407,4634,16,0,
+593,1,2740,4635,16,
+0,593,1,256,4636,
+16,0,593,1,459,
+4637,16,0,593,1,
+406,4638,16,0,593,
+1,41,4639,16,0,
+593,1,151,4640,16,
+0,593,1,43,4641,
+16,0,593,1,1585,
+4642,16,0,593,1,
+1990,4643,16,0,593,
+1,2337,4644,16,0,
+593,1,509,4645,16,
+0,593,1,52,4646,
+16,0,593,1,381,
+4647,16,0,593,1,
+447,4648,16,0,593,
+1,166,4649,16,0,
+593,1,462,4650,16,
+0,593,1,277,4651,
+16,0,593,1,1695,
+4652,16,0,593,1,
+62,4653,16,0,664,
+1,1153,4654,16,0,
+593,1,2106,4655,16,
+0,593,1,1335,4656,
+16,0,593,1,71,
+4657,16,0,593,1,
+182,4658,16,0,593,
+1,76,4659,16,0,
+593,1,79,4660,16,
+0,593,1,1933,4661,
+16,0,593,1,299,
+4662,16,0,593,1,
+85,4663,16,0,593,
+1,1515,4664,16,0,
+593,1,2198,4665,16,
+0,593,1,89,4666,
+16,0,593,1,1834,
+4667,16,0,593,1,
+1622,4668,16,0,593,
+1,2413,4669,16,0,
+593,1,2075,4670,16,
+0,593,1,1731,4671,
+16,0,593,1,97,
+4672,16,0,593,1,
+1297,4673,16,0,593,
+1,1189,4674,16,0,
+593,1,102,4675,16,
+0,593,1,1261,4676,
+16,0,593,1,322,
+4677,16,0,593,1,
+1958,4678,16,0,593,
+1,199,4679,16,0,
+593,1,1371,4680,16,
+0,593,1,217,4681,
+16,0,593,1,146,
+4682,19,4683,4,28,
+86,0,101,0,99,
+0,116,0,111,0,
+114,0,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
+0,116,0,1,146,
+4613,1,147,4684,19,
+4685,4,32,82,0,
+111,0,116,0,97,
+0,116,0,105,0,
+111,0,110,0,67,
 0,111,0,110,0,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,1,140,4525,1,
-141,4531,19,593,1,
-141,4532,5,68,1,
-1901,4533,16,0,591,
-1,1479,4534,16,0,
-591,1,112,4535,16,
-0,591,1,2293,4536,
-16,0,591,1,1804,
-4537,16,0,591,1,
-431,4538,16,0,591,
-1,1443,4539,16,0,
-591,1,1756,4540,16,
-0,591,1,124,4541,
-16,0,591,1,525,
-4542,16,0,591,1,
-236,4543,16,0,591,
-1,346,4544,16,0,
-591,1,1876,4545,16,
-0,591,1,1659,4546,
-16,0,591,1,1225,
-4547,16,0,591,1,
-1117,4548,16,0,591,
-1,137,4549,16,0,
-591,1,2318,4550,16,
-0,591,1,1775,4551,
-16,0,591,1,32,
-4552,16,0,591,1,
-2718,4553,16,0,591,
-1,1407,4554,16,0,
-591,1,256,4555,16,
-0,591,1,459,4556,
-16,0,591,1,406,
-4557,16,0,591,1,
-41,4558,16,0,591,
-1,151,4559,16,0,
-591,1,43,4560,16,
-0,591,1,1585,4561,
-16,0,591,1,1990,
-4562,16,0,591,1,
-2337,4563,16,0,591,
-1,509,4564,16,0,
-591,1,52,4565,16,
-0,591,1,381,4566,
-16,0,591,1,447,
-4567,16,0,591,1,
-166,4568,16,0,591,
-1,462,4569,16,0,
-591,1,277,4570,16,
-0,591,1,1695,4571,
-16,0,591,1,62,
-4572,16,0,636,1,
-1153,4573,16,0,591,
-1,2106,4574,16,0,
-591,1,1335,4575,16,
-0,591,1,71,4576,
-16,0,591,1,182,
-4577,16,0,591,1,
-76,4578,16,0,591,
-1,79,4579,16,0,
-591,1,1933,4580,16,
-0,591,1,299,4581,
-16,0,591,1,85,
-4582,16,0,591,1,
-1515,4583,16,0,591,
-1,2198,4584,16,0,
-591,1,89,4585,16,
-0,591,1,1834,4586,
-16,0,591,1,1622,
-4587,16,0,591,1,
-2413,4588,16,0,591,
-1,2075,4589,16,0,
-591,1,1731,4590,16,
-0,591,1,97,4591,
-16,0,591,1,1297,
-4592,16,0,591,1,
-1189,4593,16,0,591,
-1,102,4594,16,0,
-591,1,1261,4595,16,
-0,591,1,322,4596,
-16,0,591,1,1958,
-4597,16,0,591,1,
-199,4598,16,0,591,
-1,1371,4599,16,0,
-591,1,217,4600,16,
-0,591,1,142,4601,
-19,4602,4,28,86,
-0,101,0,99,0,
-116,0,111,0,114,
-0,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,1,142,4532,
-1,143,4603,19,4604,
-4,32,82,0,111,
-0,116,0,97,0,
-116,0,105,0,111,
-0,110,0,67,0,
+115,0,116,0,97,
+0,110,0,116,0,
+1,147,4613,1,148,
+4686,19,4687,4,24,
+76,0,105,0,115,
+0,116,0,67,0,
 111,0,110,0,115,
 0,116,0,97,0,
 110,0,116,0,1,
-143,4532,1,144,4605,
-19,4606,4,24,76,
-0,105,0,115,0,
-116,0,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,1,144,
-4532,1,145,4607,19,
-172,1,145,4608,5,
-67,1,1901,4609,16,
-0,633,1,1479,4610,
-16,0,582,1,112,
-4611,16,0,254,1,
-2293,4612,16,0,277,
-1,1804,4613,16,0,
-633,1,431,4614,16,
-0,628,1,1443,4615,
-16,0,517,1,1756,
-4616,16,0,737,1,
-124,4617,16,0,259,
-1,525,4618,16,0,
-318,1,236,4619,16,
-0,358,1,346,4620,
-16,0,545,1,1876,
-4621,16,0,331,1,
-1659,4622,16,0,737,
-1,1225,4623,16,0,
-253,1,1117,4624,16,
-0,226,1,137,4625,
-16,0,276,1,2318,
-4626,16,0,737,1,
-1775,4627,16,0,633,
-1,32,4628,16,0,
-633,1,2718,4629,16,
-0,698,1,1407,4630,
-16,0,536,1,256,
-4631,16,0,412,1,
-459,4632,16,0,170,
-1,406,4633,16,0,
-612,1,41,4634,16,
-0,170,1,151,4635,
-16,0,290,1,43,
-4636,16,0,697,1,
-1990,4637,16,0,633,
-1,2337,4638,16,0,
-633,1,509,4639,16,
-0,711,1,52,4640,
-16,0,649,1,381,
-4641,16,0,600,1,
-447,4642,16,0,318,
-1,166,4643,16,0,
-307,1,462,4644,16,
-0,170,1,277,4645,
-16,0,459,1,1695,
-4646,16,0,271,1,
-1261,4647,16,0,289,
-1,1153,4648,16,0,
-177,1,2106,4649,16,
-0,633,1,1335,4650,
-16,0,340,1,71,
-4651,16,0,210,1,
-182,4652,16,0,318,
-1,76,4653,16,0,
-598,1,79,4654,16,
-0,225,1,1933,4655,
-16,0,424,1,299,
-4656,16,0,491,1,
-85,4657,16,0,511,
-1,1515,4658,16,0,
-611,1,2198,4659,16,
-0,633,1,89,4660,
-16,0,235,1,1834,
-4661,16,0,306,1,
-1622,4662,16,0,710,
-1,2413,4663,16,0,
-633,1,2075,4664,16,
-0,633,1,1731,4665,
-16,0,255,1,97,
-4666,16,0,428,1,
-1297,4667,16,0,345,
-1,1189,4668,16,0,
-224,1,102,4669,16,
-0,243,1,1585,4670,
-16,0,719,1,322,
-4671,16,0,512,1,
-1958,4672,16,0,633,
-1,199,4673,16,0,
-329,1,1371,4674,16,
-0,413,1,217,4675,
-16,0,339,1,146,
-4676,19,4677,4,36,
-67,0,111,0,110,
-0,115,0,116,0,
-97,0,110,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,146,4608,1,
-147,4678,19,4679,4,
-30,73,0,100,0,
-101,0,110,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,147,4608,1,
-148,4680,19,4681,4,
-36,73,0,100,0,
-101,0,110,0,116,
-0,68,0,111,0,
+148,4613,1,149,4688,
+19,180,1,149,4689,
+5,67,1,1901,4690,
+16,0,661,1,1479,
+4691,16,0,584,1,
+112,4692,16,0,264,
+1,2293,4693,16,0,
+288,1,1804,4694,16,
+0,661,1,431,4695,
+16,0,656,1,1443,
+4696,16,0,518,1,
+1756,4697,16,0,759,
+1,124,4698,16,0,
+272,1,525,4699,16,
+0,320,1,236,4700,
+16,0,353,1,346,
+4701,16,0,547,1,
+1876,4702,16,0,332,
+1,1659,4703,16,0,
+759,1,1225,4704,16,
+0,263,1,1117,4705,
+16,0,230,1,137,
+4706,16,0,287,1,
+2318,4707,16,0,759,
+1,1775,4708,16,0,
+661,1,32,4709,16,
+0,661,1,1407,4710,
+16,0,538,1,2740,
+4711,16,0,738,1,
+256,4712,16,0,407,
+1,459,4713,16,0,
+178,1,406,4714,16,
+0,641,1,41,4715,
+16,0,178,1,151,
+4716,16,0,298,1,
+43,4717,16,0,709,
+1,1990,4718,16,0,
+661,1,2337,4719,16,
+0,661,1,509,4720,
+16,0,734,1,52,
+4721,16,0,669,1,
+381,4722,16,0,608,
+1,447,4723,16,0,
+320,1,166,4724,16,
+0,309,1,462,4725,
+16,0,178,1,277,
+4726,16,0,452,1,
+1695,4727,16,0,284,
+1,1261,4728,16,0,
+296,1,1153,4729,16,
+0,185,1,2106,4730,
+16,0,661,1,1335,
+4731,16,0,340,1,
+71,4732,16,0,214,
+1,182,4733,16,0,
+320,1,76,4734,16,
+0,606,1,79,4735,
+16,0,229,1,1933,
+4736,16,0,419,1,
+299,4737,16,0,484,
+1,85,4738,16,0,
+514,1,1515,4739,16,
+0,640,1,2198,4740,
+16,0,661,1,89,
+4741,16,0,244,1,
+1834,4742,16,0,308,
+1,1622,4743,16,0,
+733,1,2413,4744,16,
+0,661,1,2075,4745,
+16,0,661,1,1731,
+4746,16,0,265,1,
+97,4747,16,0,423,
+1,1297,4748,16,0,
+342,1,1189,4749,16,
+0,228,1,102,4750,
+16,0,253,1,1585,
+4751,16,0,743,1,
+322,4752,16,0,515,
+1,1958,4753,16,0,
+661,1,199,4754,16,
+0,331,1,1371,4755,
+16,0,408,1,217,
+4756,16,0,339,1,
+150,4757,19,4758,4,
+36,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
 116,0,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,1,148,4608,
-1,149,4682,19,4683,
-4,44,70,0,117,
-0,110,0,99,0,
-116,0,105,0,111,
-0,110,0,67,0,
-97,0,108,0,108,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,149,4608,1,
-150,4684,19,4685,4,
-32,66,0,105,0,
-110,0,97,0,114,
-0,121,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,150,
-4608,1,151,4686,19,
-4687,4,30,85,0,
-110,0,97,0,114,
-0,121,0,69,0,
+110,0,1,150,4689,
+1,151,4759,19,4760,
+4,30,73,0,100,
+0,101,0,110,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,151,4689,
+1,152,4761,19,4762,
+4,36,73,0,100,
+0,101,0,110,0,
+116,0,68,0,111,
+0,116,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
-0,110,0,1,151,
-4608,1,152,4688,19,
-4689,4,36,84,0,
-121,0,112,0,101,
-0,99,0,97,0,
-115,0,116,0,69,
+0,110,0,1,152,
+4689,1,153,4763,19,
+4764,4,44,70,0,
+117,0,110,0,99,
+0,116,0,105,0,
+111,0,110,0,67,
+0,97,0,108,0,
+108,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,153,4689,
+1,154,4765,19,4766,
+4,32,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,1,
-152,4608,1,153,4690,
-19,4691,4,42,80,
-0,97,0,114,0,
-101,0,110,0,116,
-0,104,0,101,0,
-115,0,105,0,115,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,153,4608,1,
-154,4692,19,4693,4,
-56,73,0,110,0,
-99,0,114,0,101,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-114,0,101,0,109,
+154,4689,1,155,4767,
+19,4768,4,30,85,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,1,
+155,4689,1,156,4769,
+19,4770,4,36,84,
+0,121,0,112,0,
+101,0,99,0,97,
+0,115,0,116,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+1,156,4689,1,157,
+4771,19,4772,4,42,
+80,0,97,0,114,
 0,101,0,110,0,
-116,0,69,0,120,
+116,0,104,0,101,
+0,115,0,105,0,
+115,0,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,1,154,4608,
-1,156,4694,19,769,
-1,156,4097,1,157,
-4695,19,753,1,157,
-4097,1,158,4696,19,
-3365,1,158,4100,1,
-159,4697,19,3388,1,
-159,4100,1,160,4698,
-19,3377,1,160,4100,
-1,161,4699,19,3406,
-1,161,4100,1,162,
-4700,19,3393,1,162,
-4103,1,163,4701,19,
-3371,1,163,4103,1,
-164,4702,19,3383,1,
-164,4107,1,165,4703,
-19,3399,1,165,4107,
-1,166,4704,19,747,
-1,166,4111,1,167,
-4705,19,764,1,167,
-4111,1,168,4706,19,
-774,1,168,4115,1,
-169,4707,19,759,1,
-169,4115,1,170,4708,
-19,1769,1,170,4121,
-1,171,4709,19,1748,
-1,171,4121,1,172,
-4710,19,1764,1,172,
-4121,1,173,4711,19,
-1743,1,173,4121,1,
-174,4712,19,1759,1,
-174,4121,1,175,4713,
-19,1738,1,175,4121,
-1,176,4714,19,1754,
-1,176,4121,1,177,
-4715,19,1733,1,177,
-4121,1,178,4716,19,
-1723,1,178,4121,1,
-179,4717,19,1728,1,
-179,4121,1,180,4718,
-19,1716,1,180,4125,
-1,181,4719,19,1690,
-1,181,4131,1,182,
-4720,19,1708,1,182,
-4137,1,183,4721,19,
-1702,1,183,4143,1,
-184,4722,19,1696,1,
-184,4149,1,185,4723,
-19,1809,1,185,4155,
-1,186,4724,19,1784,
-1,186,4155,1,187,
-4725,19,2139,1,187,
-4160,1,188,4726,19,
-2132,1,188,4163,1,
-189,4727,19,2181,1,
-189,4166,1,190,4728,
-19,1181,1,190,4169,
-1,191,4729,19,2161,
-1,191,4188,1,192,
-4730,19,2154,1,192,
-4191,1,193,4731,19,
-2175,1,193,4194,1,
-194,4732,19,966,1,
-194,4247,1,195,4733,
-19,950,1,195,4247,
-1,196,4734,19,956,
-1,196,4267,1,197,
-4735,19,944,1,197,
-4267,1,198,4736,19,
-1209,1,198,4283,1,
-199,4737,19,846,1,
-199,4270,1,200,4738,
-19,961,1,200,4270,
-1,201,4739,19,841,
-1,201,4270,1,202,
-4740,19,866,1,202,
-4270,1,203,4741,19,
-835,1,203,4270,1,
-204,4742,19,829,1,
-204,4270,1,205,4743,
-19,824,1,205,4270,
-1,206,4744,19,819,
-1,206,4270,1,207,
-4745,19,813,1,207,
-4270,1,208,4746,19,
-808,1,208,4270,1,
-209,4747,19,803,1,
-209,4270,1,210,4748,
-19,798,1,210,4270,
-1,211,4749,19,793,
-1,211,4270,1,212,
-4750,19,1216,1,212,
-4355,1,213,4751,19,
-1354,1,213,4368,1,
-214,4752,19,1203,1,
-214,4381,1,215,4753,
-19,1342,1,215,4381,
-1,216,4754,19,983,
-1,216,4394,1,217,
-4755,19,786,1,217,
-4394,1,218,4756,19,
-881,1,218,4394,1,
-219,4757,19,909,1,
-219,4394,1,220,4758,
-19,929,1,220,4407,
-1,221,4759,19,975,
-1,221,4407,1,222,
-4760,19,889,1,222,
-4420,1,223,4761,19,
-902,1,223,4420,1,
-224,4762,19,855,1,
-224,4433,1,225,4763,
-19,894,1,225,4433,
-1,226,4764,19,1540,
-1,226,4446,1,227,
-4765,19,1222,1,227,
-4446,1,228,4766,19,
-1572,1,228,4446,1,
-229,4767,19,1606,1,
-229,4446,1,230,4768,
-19,1470,1,230,4296,
-1,231,4769,19,1529,
-1,231,4296,1,232,
-4770,19,1197,1,232,
-4309,1,233,4771,19,
-1638,1,233,4309,1,
-234,4772,19,1567,1,
-234,4309,1,235,4773,
-19,1514,1,235,4309,
-1,236,4774,19,1438,
-1,236,4309,1,237,
-4775,19,1364,1,237,
-4309,1,238,4776,19,
-1374,1,238,4309,1,
-239,4777,19,1192,1,
-239,4309,1,240,4778,
-19,1622,1,240,4309,
-1,241,4779,19,1562,
-1,241,4309,1,242,
-4780,19,1504,1,242,
-4309,1,243,4781,19,
-1427,1,243,4309,1,
-244,4782,19,1390,1,
-244,4309,1,245,4783,
-19,1175,1,245,4309,
-1,246,4784,19,1524,
-1,246,4309,1,247,
-4785,19,1550,1,247,
-4309,1,248,4786,19,
-1497,1,248,4309,1,
-249,4787,19,1519,1,
-249,4309,1,250,4788,
-19,1330,1,250,4309,
-1,251,4789,19,1234,
-1,251,4309,1,252,
-4790,19,1164,1,252,
-4309,1,253,4791,19,
-1596,1,253,4309,1,
-254,4792,19,1545,1,
-254,4309,1,255,4793,
-19,1492,1,255,4309,
-1,256,4794,19,1359,
-1,256,4342,1,257,
-4795,19,1337,1,257,
-4342,1,258,4796,19,
-1627,1,258,4532,1,
-259,4797,19,1650,1,
-259,4532,1,260,4798,
-19,1617,1,260,4532,
-1,261,4799,19,1612,
-1,261,4532,1,262,
-4800,19,1633,1,262,
-4532,1,263,4801,19,
-1578,1,263,4532,1,
-264,4802,19,1284,1,
-264,4532,1,265,4803,
-19,1459,1,265,4608,
-1,266,4804,19,1245,
-1,266,4608,1,267,
-4805,19,1252,1,267,
-4608,1,268,4806,19,
-1273,1,268,4608,1,
-269,4807,19,1268,1,
-269,4608,1,270,4808,
-19,1263,1,270,4608,
-1,271,4809,19,1258,
-1,271,4608,1,272,
-4810,19,1448,1,272,
-4608,1,273,4811,19,
-1476,1,273,4608,1,
-274,4812,19,1453,1,
-274,4608,1,275,4813,
-19,1443,1,275,4608,
-1,276,4814,19,1433,
-1,276,4608,1,277,
-4815,19,1416,1,277,
-4608,1,278,4816,19,
-1369,1,278,4608,1,
-279,4817,19,1278,1,
-279,4608,1,280,4818,
-19,1239,1,280,4608,
-1,281,4819,19,1187,
-1,281,4608,1,282,
-4820,19,1645,1,282,
-4608,1,283,4821,19,
-1601,1,283,4608,1,
-284,4822,19,1590,1,
-284,4608,1,285,4823,
-19,1584,1,285,4608,
-1,286,4824,19,1535,
-1,286,4608,1,287,
-4825,19,1509,1,287,
-4608,1,288,4826,19,
-1486,1,288,4608,1,
-289,4827,19,1481,1,
-289,4608,1,290,4828,
-19,1422,1,290,4608,
-1,291,4829,19,1398,
-1,291,4608,1,292,
-4830,19,1464,1,292,
-4608,1,293,4831,19,
-1556,1,293,4608,1,
-294,4832,19,1411,1,
-294,4608,1,295,4833,
-19,1405,1,295,4608,
-1,296,4834,19,1385,
-1,296,4608,1,297,
-4835,19,1348,1,297,
-4608,1,298,4836,19,
-1325,1,298,4608,1,
-299,4837,19,1170,1,
-299,4608,1,300,4838,
-19,1660,1,300,4608,
-1,301,4839,19,1290,
-1,301,4608,1,302,
-4840,19,1295,1,302,
-4608,1,303,4841,19,
-1315,1,303,4608,1,
-304,4842,19,1305,1,
-304,4608,1,305,4843,
-19,1310,1,305,4608,
-1,306,4844,19,1300,
-1,306,4608,1,307,
-4845,19,1655,1,307,
-4608,1,308,4846,19,
-1320,1,308,4608,1,
-309,4847,19,1380,1,
-309,4451,1,310,4848,
-19,1822,1,310,4521,
-1,311,4849,19,1815,
-1,311,4521,1,312,
-4850,19,1795,1,312,
-4525,1,313,4851,19,
-2126,1,313,4197,1,
-314,4852,19,2121,1,
-314,4197,1,315,4853,
-19,2116,1,315,4197,
-1,316,4854,19,2111,
-1,316,4197,1,317,
-4855,19,2106,1,317,
-4197,1,318,4856,19,
-2101,1,318,4197,1,
-319,4857,19,2096,1,
-319,4197,1,320,4858,
-19,2084,1,320,4217,
-1,321,4859,19,2079,
-1,321,4217,1,322,
-4860,19,2074,1,322,
-4217,1,323,4861,19,
-2069,1,323,4217,1,
-324,4862,19,2064,1,
-324,4217,1,325,4863,
-19,2059,1,325,4217,
-1,326,4864,19,2054,
-1,326,4217,1,327,
-4865,19,2049,1,327,
-4217,1,328,4866,19,
-2044,1,328,4217,1,
-329,4867,19,1878,1,
-329,4217,1,330,4868,
-19,2038,1,330,4217,
-1,331,4869,19,2033,
-1,331,4223,1,332,
-4870,19,2028,1,332,
-4223,1,333,4871,19,
-1870,1,333,4223,1,
-334,4872,19,2023,1,
-334,4223,1,335,4873,
-19,2018,1,335,4223,
-1,336,4874,19,2013,
-1,336,4223,1,337,
-4875,19,2008,1,337,
-4223,1,338,4876,19,
-2003,1,338,4223,1,
-339,4877,19,1998,1,
-339,4229,1,340,4878,
-19,1862,1,340,4229,
-1,341,4879,19,1992,
-1,341,4235,1,342,
-4880,19,1987,1,342,
-4235,1,343,4881,19,
-1982,1,343,4235,1,
-344,4882,19,1855,1,
-344,4235,1,345,4883,
-19,1976,1,345,4235,
-1,346,4884,19,1906,
-1,346,4235,1,347,
-4885,19,1971,1,347,
-4235,1,348,4886,19,
-1966,1,348,4235,1,
-349,4887,19,1961,1,
-349,4235,1,350,4888,
-19,1956,1,350,4235,
-1,351,4889,19,1951,
-1,351,4241,1,352,
-4890,19,1946,1,352,
-4241,1,353,4891,19,
-1941,1,353,4241,1,
-354,4892,19,4893,4,
-50,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,76,
-0,105,0,115,0,
-116,0,95,0,51,
-0,1,354,4155,1,
-355,4894,19,4895,4,
-28,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,76,0,105,
-0,115,0,116,0,
-95,0,51,0,1,
-355,4521,1,356,4896,
-19,4897,4,50,65,
-0,114,0,103,0,
-117,0,109,0,101,
+110,0,1,157,4689,
+1,158,4773,19,4774,
+4,56,73,0,110,
+0,99,0,114,0,
+101,0,109,0,101,
 0,110,0,116,0,
 68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
-95,0,52,0,1,
-356,4155,1,357,4898,
-19,4899,4,28,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-76,0,105,0,115,
-0,116,0,95,0,
-52,0,1,357,4521,
-1,358,4900,19,4901,
+0,114,0,101,0,
+109,0,101,0,110,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,158,
+4689,1,160,4775,19,
+786,1,160,4157,1,
+161,4776,19,775,1,
+161,4157,1,162,4777,
+19,3445,1,162,4160,
+1,163,4778,19,3435,
+1,163,4160,1,164,
+4779,19,3440,1,164,
+4160,1,165,4780,19,
+3430,1,165,4160,1,
+166,4781,19,3421,1,
+166,4163,1,167,4782,
+19,3456,1,167,4163,
+1,168,4783,19,3462,
+1,168,4167,1,169,
+4784,19,3451,1,169,
+4167,1,170,4785,19,
+791,1,170,4171,1,
+171,4786,19,781,1,
+171,4171,1,172,4787,
+19,769,1,172,4175,
+1,173,4788,19,796,
+1,173,4175,1,174,
+4789,19,1738,1,174,
+4181,1,175,4790,19,
+1808,1,175,4181,1,
+176,4791,19,1733,1,
+176,4181,1,177,4792,
+19,1803,1,177,4181,
+1,178,4793,19,1728,
+1,178,4181,1,179,
+4794,19,1798,1,179,
+4181,1,180,4795,19,
+1723,1,180,4181,1,
+181,4796,19,1793,1,
+181,4181,1,182,4797,
+19,1718,1,182,4181,
+1,183,4798,19,1788,
+1,183,4181,1,184,
+4799,19,1713,1,184,
+4181,1,185,4800,19,
+1783,1,185,4181,1,
+186,4801,19,1777,1,
+186,4185,1,187,4802,
+19,1771,1,187,4191,
+1,188,4803,19,1765,
+1,188,4197,1,189,
+4804,19,1758,1,189,
+4203,1,190,4805,19,
+1751,1,190,4209,1,
+191,4806,19,1744,1,
+191,4215,1,192,4807,
+19,1853,1,192,4221,
+1,193,4808,19,1828,
+1,193,4221,1,194,
+4809,19,2231,1,194,
+4226,1,195,4810,19,
+2200,1,195,4229,1,
+196,4811,19,2192,1,
+196,4232,1,197,4812,
+19,2222,1,197,4235,
+1,198,4813,19,1203,
+1,198,4238,1,199,
+4814,19,2207,1,199,
+4257,1,200,4815,19,
+1874,1,200,4260,1,
+201,4816,19,2186,1,
+201,4264,1,202,4817,
+19,1816,1,202,4267,
+1,203,4818,19,987,
+1,203,4327,1,204,
+4819,19,971,1,204,
+4327,1,205,4820,19,
+977,1,205,4348,1,
+206,4821,19,965,1,
+206,4348,1,207,4822,
+19,1231,1,207,4364,
+1,208,4823,19,868,
+1,208,4351,1,209,
+4824,19,982,1,209,
+4351,1,210,4825,19,
+863,1,210,4351,1,
+211,4826,19,888,1,
+211,4351,1,212,4827,
+19,857,1,212,4351,
+1,213,4828,19,851,
+1,213,4351,1,214,
+4829,19,846,1,214,
+4351,1,215,4830,19,
+841,1,215,4351,1,
+216,4831,19,835,1,
+216,4351,1,217,4832,
+19,830,1,217,4351,
+1,218,4833,19,825,
+1,218,4351,1,219,
+4834,19,820,1,219,
+4351,1,220,4835,19,
+815,1,220,4351,1,
+221,4836,19,1238,1,
+221,4436,1,222,4837,
+19,1377,1,222,4449,
+1,223,4838,19,1225,
+1,223,4462,1,224,
+4839,19,1365,1,224,
+4462,1,225,4840,19,
+1005,1,225,4475,1,
+226,4841,19,808,1,
+226,4475,1,227,4842,
+19,903,1,227,4475,
+1,228,4843,19,931,
+1,228,4475,1,229,
+4844,19,950,1,229,
+4488,1,230,4845,19,
+996,1,230,4488,1,
+231,4846,19,911,1,
+231,4501,1,232,4847,
+19,924,1,232,4501,
+1,233,4848,19,877,
+1,233,4514,1,234,
+4849,19,916,1,234,
+4514,1,235,4850,19,
+1563,1,235,4527,1,
+236,4851,19,1244,1,
+236,4527,1,237,4852,
+19,1595,1,237,4527,
+1,238,4853,19,1627,
+1,238,4527,1,239,
+4854,19,1493,1,239,
+4377,1,240,4855,19,
+1552,1,240,4377,1,
+241,4856,19,1219,1,
+241,4390,1,242,4857,
+19,1659,1,242,4390,
+1,243,4858,19,1590,
+1,243,4390,1,244,
+4859,19,1537,1,244,
+4390,1,245,4860,19,
+1461,1,245,4390,1,
+246,4861,19,1387,1,
+246,4390,1,247,4862,
+19,1397,1,247,4390,
+1,248,4863,19,1214,
+1,248,4390,1,249,
+4864,19,1643,1,249,
+4390,1,250,4865,19,
+1585,1,250,4390,1,
+251,4866,19,1527,1,
+251,4390,1,252,4867,
+19,1450,1,252,4390,
+1,253,4868,19,1413,
+1,253,4390,1,254,
+4869,19,1197,1,254,
+4390,1,255,4870,19,
+1547,1,255,4390,1,
+256,4871,19,1573,1,
+256,4390,1,257,4872,
+19,1520,1,257,4390,
+1,258,4873,19,1542,
+1,258,4390,1,259,
+4874,19,1353,1,259,
+4390,1,260,4875,19,
+1256,1,260,4390,1,
+261,4876,19,1186,1,
+261,4390,1,262,4877,
+19,1617,1,262,4390,
+1,263,4878,19,1568,
+1,263,4390,1,264,
+4879,19,1515,1,264,
+4390,1,265,4880,19,
+1382,1,265,4423,1,
+266,4881,19,1360,1,
+266,4423,1,267,4882,
+19,1648,1,267,4613,
+1,268,4883,19,1672,
+1,268,4613,1,269,
+4884,19,1638,1,269,
+4613,1,270,4885,19,
+1633,1,270,4613,1,
+271,4886,19,1654,1,
+271,4613,1,272,4887,
+19,1601,1,272,4613,
+1,273,4888,19,1306,
+1,273,4613,1,274,
+4889,19,1482,1,274,
+4689,1,275,4890,19,
+1267,1,275,4689,1,
+276,4891,19,1274,1,
+276,4689,1,277,4892,
+19,1295,1,277,4689,
+1,278,4893,19,1290,
+1,278,4689,1,279,
+4894,19,1285,1,279,
+4689,1,280,4895,19,
+1280,1,280,4689,1,
+281,4896,19,1471,1,
+281,4689,1,282,4897,
+19,1499,1,282,4689,
+1,283,4898,19,1476,
+1,283,4689,1,284,
+4899,19,1466,1,284,
+4689,1,285,4900,19,
+1456,1,285,4689,1,
+286,4901,19,1439,1,
+286,4689,1,287,4902,
+19,1392,1,287,4689,
+1,288,4903,19,1300,
+1,288,4689,1,289,
+4904,19,1261,1,289,
+4689,1,290,4905,19,
+1209,1,290,4689,1,
+291,4906,19,1667,1,
+291,4689,1,292,4907,
+19,1622,1,292,4689,
+1,293,4908,19,1612,
+1,293,4689,1,294,
+4909,19,1607,1,294,
+4689,1,295,4910,19,
+1558,1,295,4689,1,
+296,4911,19,1532,1,
+296,4689,1,297,4912,
+19,1509,1,297,4689,
+1,298,4913,19,1504,
+1,298,4689,1,299,
+4914,19,1445,1,299,
+4689,1,300,4915,19,
+1421,1,300,4689,1,
+301,4916,19,1487,1,
+301,4689,1,302,4917,
+19,1579,1,302,4689,
+1,303,4918,19,1434,
+1,303,4689,1,304,
+4919,19,1428,1,304,
+4689,1,305,4920,19,
+1408,1,305,4689,1,
+306,4921,19,1371,1,
+306,4689,1,307,4922,
+19,1348,1,307,4689,
+1,308,4923,19,1192,
+1,308,4689,1,309,
+4924,19,1682,1,309,
+4689,1,310,4925,19,
+1312,1,310,4689,1,
+311,4926,19,1318,1,
+311,4689,1,312,4927,
+19,1338,1,312,4689,
+1,313,4928,19,1328,
+1,313,4689,1,314,
+4929,19,1333,1,314,
+4689,1,315,4930,19,
+1323,1,315,4689,1,
+316,4931,19,1677,1,
+316,4689,1,317,4932,
+19,1343,1,317,4689,
+1,318,4933,19,1403,
+1,318,4532,1,319,
+4934,19,1868,1,319,
+4602,1,320,4935,19,
+1859,1,320,4602,1,
+321,4936,19,1838,1,
+321,4606,1,322,4937,
+19,2180,1,322,4271,
+1,323,4938,19,2175,
+1,323,4271,1,324,
+4939,19,2170,1,324,
+4271,1,325,4940,19,
+2165,1,325,4271,1,
+326,4941,19,2160,1,
+326,4271,1,327,4942,
+19,2155,1,327,4271,
+1,328,4943,19,2150,
+1,328,4271,1,329,
+4944,19,2139,1,329,
+4291,1,330,4945,19,
+2134,1,330,4291,1,
+331,4946,19,2129,1,
+331,4291,1,332,4947,
+19,2124,1,332,4291,
+1,333,4948,19,2119,
+1,333,4291,1,334,
+4949,19,2114,1,334,
+4291,1,335,4950,19,
+2109,1,335,4291,1,
+336,4951,19,2104,1,
+336,4291,1,337,4952,
+19,2099,1,337,4291,
+1,338,4953,19,1930,
+1,338,4291,1,339,
+4954,19,2093,1,339,
+4297,1,340,4955,19,
+2088,1,340,4297,1,
+341,4956,19,2083,1,
+341,4297,1,342,4957,
+19,1922,1,342,4297,
+1,343,4958,19,2078,
+1,343,4297,1,344,
+4959,19,2073,1,344,
+4297,1,345,4960,19,
+2068,1,345,4297,1,
+346,4961,19,2063,1,
+346,4297,1,347,4962,
+19,2058,1,347,4303,
+1,348,4963,19,2053,
+1,348,4303,1,349,
+4964,19,1914,1,349,
+4309,1,350,4965,19,
+2046,1,350,4309,1,
+351,4966,19,2041,1,
+351,4309,1,352,4967,
+19,2036,1,352,4309,
+1,353,4968,19,1908,
+1,353,4309,1,354,
+4969,19,2030,1,354,
+4309,1,355,4970,19,
+1960,1,355,4309,1,
+356,4971,19,2025,1,
+356,4309,1,357,4972,
+19,2020,1,357,4309,
+1,358,4973,19,2015,
+1,358,4309,1,359,
+4974,19,2010,1,359,
+4315,1,360,4975,19,
+2005,1,360,4315,1,
+361,4976,19,2000,1,
+361,4315,1,362,4977,
+19,1994,1,362,4321,
+1,363,4978,19,4979,
 4,50,65,0,114,
 0,103,0,117,0,
 109,0,101,0,110,
@@ -11949,14 +12267,54 @@ public yyLSLSyntax
 0,111,0,110,0,
 76,0,105,0,115,
 0,116,0,95,0,
-53,0,1,358,4155,
-2,0,0};
+51,0,1,363,4221,
+1,364,4980,19,4981,
+4,28,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,76,0,
+105,0,115,0,116,
+0,95,0,51,0,
+1,364,4602,1,365,
+4982,19,4983,4,50,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,76,0,
+105,0,115,0,116,
+0,95,0,52,0,
+1,365,4221,1,366,
+4984,19,4985,4,28,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,76,0,105,0,
+115,0,116,0,95,
+0,52,0,1,366,
+4602,1,367,4986,19,
+4987,4,50,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,76,0,105,0,
+115,0,116,0,95,
+0,53,0,1,367,
+4221,2,0,0};
 new Sfactory(this,"ExpressionArgument_1",new SCreator(ExpressionArgument_1_factory));
 new Sfactory(this,"VectorArgStateEvent",new SCreator(VectorArgStateEvent_factory));
-new Sfactory(this,"SimpleAssignment_8",new SCreator(SimpleAssignment_8_factory));
+new Sfactory(this,"IntArgStateEvent_1",new SCreator(IntArgStateEvent_1_factory));
 new Sfactory(this,"SimpleAssignment_9",new SCreator(SimpleAssignment_9_factory));
 new Sfactory(this,"StatementList_1",new SCreator(StatementList_1_factory));
-new Sfactory(this,"StatementList_2",new SCreator(StatementList_2_factory));
+new Sfactory(this,"RotDeclaration_1",new SCreator(RotDeclaration_1_factory));
+new Sfactory(this,"IntRotRotArgEvent_1",new SCreator(IntRotRotArgEvent_1_factory));
 new Sfactory(this,"StateChange_1",new SCreator(StateChange_1_factory));
 new Sfactory(this,"EmptyStatement",new SCreator(EmptyStatement_factory));
 new Sfactory(this,"Declaration",new SCreator(Declaration_factory));
@@ -11972,6 +12330,7 @@ new Sfactory(this,"BinaryExpression_9",new SCreator(BinaryExpression_9_factory))
 new Sfactory(this,"VectorConstant_1",new SCreator(VectorConstant_1_factory));
 new Sfactory(this,"ParenthesisExpression",new SCreator(ParenthesisExpression_factory));
 new Sfactory(this,"StatementList",new SCreator(StatementList_factory));
+new Sfactory(this,"IntRotRotArgEvent",new SCreator(IntRotRotArgEvent_factory));
 new Sfactory(this,"UnaryExpression",new SCreator(UnaryExpression_factory));
 new Sfactory(this,"IdentDotExpression_1",new SCreator(IdentDotExpression_1_factory));
 new Sfactory(this,"ArgumentList_4",new SCreator(ArgumentList_4_factory));
@@ -11999,7 +12358,7 @@ new Sfactory(this,"SimpleAssignment_5",new SCreator(SimpleAssignment_5_factory))
 new Sfactory(this,"Typename_1",new SCreator(Typename_1_factory));
 new Sfactory(this,"VoidArgStateEvent_1",new SCreator(VoidArgStateEvent_1_factory));
 new Sfactory(this,"Typename_3",new SCreator(Typename_3_factory));
-new Sfactory(this,"Typename_4",new SCreator(Typename_4_factory));
+new Sfactory(this,"IntRotRotArgStateEvent",new SCreator(IntRotRotArgStateEvent_factory));
 new Sfactory(this,"Typename_5",new SCreator(Typename_5_factory));
 new Sfactory(this,"Typename_6",new SCreator(Typename_6_factory));
 new Sfactory(this,"Typename_7",new SCreator(Typename_7_factory));
@@ -12012,8 +12371,9 @@ new Sfactory(this,"States_2",new SCreator(States_2_factory));
 new Sfactory(this,"FunctionCallExpression_1",new SCreator(FunctionCallExpression_1_factory));
 new Sfactory(this,"KeyArgEvent_1",new SCreator(KeyArgEvent_1_factory));
 new Sfactory(this,"ForLoopStatement",new SCreator(ForLoopStatement_factory));
-new Sfactory(this,"IntArgStateEvent_1",new SCreator(IntArgStateEvent_1_factory));
+new Sfactory(this,"IntArgStateEvent",new SCreator(IntArgStateEvent_factory));
 new Sfactory(this,"IntArgEvent_6",new SCreator(IntArgEvent_6_factory));
+new Sfactory(this,"IntRotRotArgumentDeclarationList_1",new SCreator(IntRotRotArgumentDeclarationList_1_factory));
 new Sfactory(this,"IntArgEvent_9",new SCreator(IntArgEvent_9_factory));
 new Sfactory(this,"DoWhileStatement_1",new SCreator(DoWhileStatement_1_factory));
 new Sfactory(this,"DoWhileStatement_2",new SCreator(DoWhileStatement_2_factory));
@@ -12024,8 +12384,8 @@ new Sfactory(this,"SimpleAssignment_13",new SCreator(SimpleAssignment_13_factory
 new Sfactory(this,"JumpLabel",new SCreator(JumpLabel_factory));
 new Sfactory(this,"SimpleAssignment_15",new SCreator(SimpleAssignment_15_factory));
 new Sfactory(this,"StateBody_10",new SCreator(StateBody_10_factory));
-new Sfactory(this,"SimpleAssignment_17",new SCreator(SimpleAssignment_17_factory));
-new Sfactory(this,"SimpleAssignment_18",new SCreator(SimpleAssignment_18_factory));
+new Sfactory(this,"StateBody_11",new SCreator(StateBody_11_factory));
+new Sfactory(this,"StateBody_12",new SCreator(StateBody_12_factory));
 new Sfactory(this,"JumpStatement_1",new SCreator(JumpStatement_1_factory));
 new Sfactory(this,"GlobalDefinitions",new SCreator(GlobalDefinitions_factory));
 new Sfactory(this,"ConstantExpression_1",new SCreator(ConstantExpression_1_factory));
@@ -12033,6 +12393,7 @@ new Sfactory(this,"VoidArgEvent_4",new SCreator(VoidArgEvent_4_factory));
 new Sfactory(this,"FunctionCall_1",new SCreator(FunctionCall_1_factory));
 new Sfactory(this,"Assignment_2",new SCreator(Assignment_2_factory));
 new Sfactory(this,"TypecastExpression_1",new SCreator(TypecastExpression_1_factory));
+new Sfactory(this,"SimpleAssignment_21",new SCreator(SimpleAssignment_21_factory));
 new Sfactory(this,"SimpleAssignment_22",new SCreator(SimpleAssignment_22_factory));
 new Sfactory(this,"SimpleAssignment_23",new SCreator(SimpleAssignment_23_factory));
 new Sfactory(this,"TypecastExpression_9",new SCreator(TypecastExpression_9_factory));
@@ -12047,12 +12408,10 @@ new Sfactory(this,"GlobalVariableDeclaration",new SCreator(GlobalVariableDeclara
 new Sfactory(this,"IntArgumentDeclarationList_1",new SCreator(IntArgumentDeclarationList_1_factory));
 new Sfactory(this,"IntDeclaration_1",new SCreator(IntDeclaration_1_factory));
 new Sfactory(this,"ArgumentDeclarationList_5",new SCreator(ArgumentDeclarationList_5_factory));
-new Sfactory(this,"Event_11",new SCreator(Event_11_factory));
 new Sfactory(this,"VectorArgumentDeclarationList_1",new SCreator(VectorArgumentDeclarationList_1_factory));
 new Sfactory(this,"KeyArgumentDeclarationList",new SCreator(KeyArgumentDeclarationList_factory));
 new Sfactory(this,"TypecastExpression_2",new SCreator(TypecastExpression_2_factory));
 new Sfactory(this,"KeyArgStateEvent",new SCreator(KeyArgStateEvent_factory));
-new Sfactory(this,"TypecastExpression_4",new SCreator(TypecastExpression_4_factory));
 new Sfactory(this,"TypecastExpression_5",new SCreator(TypecastExpression_5_factory));
 new Sfactory(this,"TypecastExpression_8",new SCreator(TypecastExpression_8_factory));
 new Sfactory(this,"Constant_1",new SCreator(Constant_1_factory));
@@ -12078,6 +12437,7 @@ new Sfactory(this,"ArgumentList_3",new SCreator(ArgumentList_3_factory));
 new Sfactory(this,"Constant",new SCreator(Constant_factory));
 new Sfactory(this,"State",new SCreator(State_factory));
 new Sfactory(this,"KeyArgStateEvent_1",new SCreator(KeyArgStateEvent_1_factory));
+new Sfactory(this,"SimpleAssignment_8",new SCreator(SimpleAssignment_8_factory));
 new Sfactory(this,"LSLProgramRoot",new SCreator(LSLProgramRoot_factory));
 new Sfactory(this,"StateChange",new SCreator(StateChange_factory));
 new Sfactory(this,"IncrementDecrementExpression_2",new SCreator(IncrementDecrementExpression_2_factory));
@@ -12094,6 +12454,7 @@ new Sfactory(this,"IntArgEvent_10",new SCreator(IntArgEvent_10_factory));
 new Sfactory(this,"CompoundStatement",new SCreator(CompoundStatement_factory));
 new Sfactory(this,"TypecastExpression_3",new SCreator(TypecastExpression_3_factory));
 new Sfactory(this,"IntArgumentDeclarationList",new SCreator(IntArgumentDeclarationList_factory));
+new Sfactory(this,"ArgumentDeclarationList_4",new SCreator(ArgumentDeclarationList_4_factory));
 new Sfactory(this,"SimpleAssignment_3",new SCreator(SimpleAssignment_3_factory));
 new Sfactory(this,"SimpleAssignment_4",new SCreator(SimpleAssignment_4_factory));
 new Sfactory(this,"Statement_1",new SCreator(Statement_1_factory));
@@ -12125,19 +12486,21 @@ new Sfactory(this,"Statement_3",new SCreator(Statement_3_factory));
 new Sfactory(this,"IntArgEvent_7",new SCreator(IntArgEvent_7_factory));
 new Sfactory(this,"IntArgEvent_8",new SCreator(IntArgEvent_8_factory));
 new Sfactory(this,"SimpleAssignment_10",new SCreator(SimpleAssignment_10_factory));
-new Sfactory(this,"Statement_7",new SCreator(Statement_7_factory));
+new Sfactory(this,"StatementList_2",new SCreator(StatementList_2_factory));
+new Sfactory(this,"IntRotRotArgStateEvent_1",new SCreator(IntRotRotArgStateEvent_1_factory));
 new Sfactory(this,"VectorArgEvent_2",new SCreator(VectorArgEvent_2_factory));
 new Sfactory(this,"Event",new SCreator(Event_factory));
 new Sfactory(this,"SimpleAssignment_14",new SCreator(SimpleAssignment_14_factory));
 new Sfactory(this,"SimpleAssignment_16",new SCreator(SimpleAssignment_16_factory));
+new Sfactory(this,"SimpleAssignment_17",new SCreator(SimpleAssignment_17_factory));
+new Sfactory(this,"SimpleAssignment_18",new SCreator(SimpleAssignment_18_factory));
 new Sfactory(this,"Statement_10",new SCreator(Statement_10_factory));
 new Sfactory(this,"Statement_11",new SCreator(Statement_11_factory));
 new Sfactory(this,"SimpleAssignment",new SCreator(SimpleAssignment_factory));
 new Sfactory(this,"TypecastExpression",new SCreator(TypecastExpression_factory));
-new Sfactory(this,"VectorArgStateEvent_1",new SCreator(VectorArgStateEvent_1_factory));
 new Sfactory(this,"SimpleAssignment_19",new SCreator(SimpleAssignment_19_factory));
 new Sfactory(this,"SimpleAssignment_20",new SCreator(SimpleAssignment_20_factory));
-new Sfactory(this,"SimpleAssignment_21",new SCreator(SimpleAssignment_21_factory));
+new Sfactory(this,"Statement_7",new SCreator(Statement_7_factory));
 new Sfactory(this,"SimpleAssignment_24",new SCreator(SimpleAssignment_24_factory));
 new Sfactory(this,"SimpleAssignment_1",new SCreator(SimpleAssignment_1_factory));
 new Sfactory(this,"SimpleAssignment_2",new SCreator(SimpleAssignment_2_factory));
@@ -12163,6 +12526,7 @@ new Sfactory(this,"BinaryExpression_15",new SCreator(BinaryExpression_15_factory
 new Sfactory(this,"BinaryExpression_16",new SCreator(BinaryExpression_16_factory));
 new Sfactory(this,"BinaryExpression_6",new SCreator(BinaryExpression_6_factory));
 new Sfactory(this,"BinaryExpression_7",new SCreator(BinaryExpression_7_factory));
+new Sfactory(this,"Typename_4",new SCreator(Typename_4_factory));
 new Sfactory(this,"ArgumentList",new SCreator(ArgumentList_factory));
 new Sfactory(this,"VectorDeclaration",new SCreator(VectorDeclaration_factory));
 new Sfactory(this,"Event_10",new SCreator(Event_10_factory));
@@ -12182,7 +12546,7 @@ new Sfactory(this,"VectorConstant",new SCreator(VectorConstant_factory));
 new Sfactory(this,"VectorArgEvent_1",new SCreator(VectorArgEvent_1_factory));
 new Sfactory(this,"IntDeclaration",new SCreator(IntDeclaration_factory));
 new Sfactory(this,"VectorArgEvent_3",new SCreator(VectorArgEvent_3_factory));
-new Sfactory(this,"IntArgStateEvent",new SCreator(IntArgStateEvent_factory));
+new Sfactory(this,"TypecastExpression_4",new SCreator(TypecastExpression_4_factory));
 new Sfactory(this,"TypecastExpression_6",new SCreator(TypecastExpression_6_factory));
 new Sfactory(this,"TypecastExpression_7",new SCreator(TypecastExpression_7_factory));
 new Sfactory(this,"FunctionCall",new SCreator(FunctionCall_factory));
@@ -12201,15 +12565,17 @@ new Sfactory(this,"IfStatement",new SCreator(IfStatement_factory));
 new Sfactory(this,"ForLoopStatement_1",new SCreator(ForLoopStatement_1_factory));
 new Sfactory(this,"ForLoopStatement_2",new SCreator(ForLoopStatement_2_factory));
 new Sfactory(this,"ForLoopStatement_3",new SCreator(ForLoopStatement_3_factory));
-new Sfactory(this,"ArgumentDeclarationList_4",new SCreator(ArgumentDeclarationList_4_factory));
+new Sfactory(this,"IntRotRotArgumentDeclarationList",new SCreator(IntRotRotArgumentDeclarationList_factory));
 new Sfactory(this,"IntArgEvent_1",new SCreator(IntArgEvent_1_factory));
 new Sfactory(this,"IntArgEvent_2",new SCreator(IntArgEvent_2_factory));
 new Sfactory(this,"WhileStatement",new SCreator(WhileStatement_factory));
 new Sfactory(this,"ForLoop_1",new SCreator(ForLoop_1_factory));
 new Sfactory(this,"Constant_2",new SCreator(Constant_2_factory));
 new Sfactory(this,"VoidArgEvent",new SCreator(VoidArgEvent_factory));
+new Sfactory(this,"RotDeclaration",new SCreator(RotDeclaration_factory));
 new Sfactory(this,"WhileStatement_1",new SCreator(WhileStatement_1_factory));
 new Sfactory(this,"WhileStatement_2",new SCreator(WhileStatement_2_factory));
+new Sfactory(this,"VectorArgStateEvent_1",new SCreator(VectorArgStateEvent_1_factory));
 new Sfactory(this,"IdentExpression_1",new SCreator(IdentExpression_1_factory));
 new Sfactory(this,"VectorArgumentDeclarationList",new SCreator(VectorArgumentDeclarationList_factory));
 new Sfactory(this,"States",new SCreator(States_factory));
@@ -12217,10 +12583,11 @@ new Sfactory(this,"VoidArgStateEvent",new SCreator(VoidArgStateEvent_factory));
 }
 public static object ExpressionArgument_1_factory(Parser yyp) { return new ExpressionArgument_1(yyp); }
 public static object VectorArgStateEvent_factory(Parser yyp) { return new VectorArgStateEvent(yyp); }
-public static object SimpleAssignment_8_factory(Parser yyp) { return new SimpleAssignment_8(yyp); }
+public static object IntArgStateEvent_1_factory(Parser yyp) { return new IntArgStateEvent_1(yyp); }
 public static object SimpleAssignment_9_factory(Parser yyp) { return new SimpleAssignment_9(yyp); }
 public static object StatementList_1_factory(Parser yyp) { return new StatementList_1(yyp); }
-public static object StatementList_2_factory(Parser yyp) { return new StatementList_2(yyp); }
+public static object RotDeclaration_1_factory(Parser yyp) { return new RotDeclaration_1(yyp); }
+public static object IntRotRotArgEvent_1_factory(Parser yyp) { return new IntRotRotArgEvent_1(yyp); }
 public static object StateChange_1_factory(Parser yyp) { return new StateChange_1(yyp); }
 public static object EmptyStatement_factory(Parser yyp) { return new EmptyStatement(yyp); }
 public static object Declaration_factory(Parser yyp) { return new Declaration(yyp); }
@@ -12236,6 +12603,7 @@ public static object BinaryExpression_9_factory(Parser yyp) { return new BinaryE
 public static object VectorConstant_1_factory(Parser yyp) { return new VectorConstant_1(yyp); }
 public static object ParenthesisExpression_factory(Parser yyp) { return new ParenthesisExpression(yyp); }
 public static object StatementList_factory(Parser yyp) { return new StatementList(yyp); }
+public static object IntRotRotArgEvent_factory(Parser yyp) { return new IntRotRotArgEvent(yyp); }
 public static object UnaryExpression_factory(Parser yyp) { return new UnaryExpression(yyp); }
 public static object IdentDotExpression_1_factory(Parser yyp) { return new IdentDotExpression_1(yyp); }
 public static object ArgumentList_4_factory(Parser yyp) { return new ArgumentList_4(yyp); }
@@ -12263,7 +12631,7 @@ public static object SimpleAssignment_5_factory(Parser yyp) { return new SimpleA
 public static object Typename_1_factory(Parser yyp) { return new Typename_1(yyp); }
 public static object VoidArgStateEvent_1_factory(Parser yyp) { return new VoidArgStateEvent_1(yyp); }
 public static object Typename_3_factory(Parser yyp) { return new Typename_3(yyp); }
-public static object Typename_4_factory(Parser yyp) { return new Typename_4(yyp); }
+public static object IntRotRotArgStateEvent_factory(Parser yyp) { return new IntRotRotArgStateEvent(yyp); }
 public static object Typename_5_factory(Parser yyp) { return new Typename_5(yyp); }
 public static object Typename_6_factory(Parser yyp) { return new Typename_6(yyp); }
 public static object Typename_7_factory(Parser yyp) { return new Typename_7(yyp); }
@@ -12276,8 +12644,9 @@ public static object States_2_factory(Parser yyp) { return new States_2(yyp); }
 public static object FunctionCallExpression_1_factory(Parser yyp) { return new FunctionCallExpression_1(yyp); }
 public static object KeyArgEvent_1_factory(Parser yyp) { return new KeyArgEvent_1(yyp); }
 public static object ForLoopStatement_factory(Parser yyp) { return new ForLoopStatement(yyp); }
-public static object IntArgStateEvent_1_factory(Parser yyp) { return new IntArgStateEvent_1(yyp); }
+public static object IntArgStateEvent_factory(Parser yyp) { return new IntArgStateEvent(yyp); }
 public static object IntArgEvent_6_factory(Parser yyp) { return new IntArgEvent_6(yyp); }
+public static object IntRotRotArgumentDeclarationList_1_factory(Parser yyp) { return new IntRotRotArgumentDeclarationList_1(yyp); }
 public static object IntArgEvent_9_factory(Parser yyp) { return new IntArgEvent_9(yyp); }
 public static object DoWhileStatement_1_factory(Parser yyp) { return new DoWhileStatement_1(yyp); }
 public static object DoWhileStatement_2_factory(Parser yyp) { return new DoWhileStatement_2(yyp); }
@@ -12288,8 +12657,8 @@ public static object SimpleAssignment_13_factory(Parser yyp) { return new Simple
 public static object JumpLabel_factory(Parser yyp) { return new JumpLabel(yyp); }
 public static object SimpleAssignment_15_factory(Parser yyp) { return new SimpleAssignment_15(yyp); }
 public static object StateBody_10_factory(Parser yyp) { return new StateBody_10(yyp); }
-public static object SimpleAssignment_17_factory(Parser yyp) { return new SimpleAssignment_17(yyp); }
-public static object SimpleAssignment_18_factory(Parser yyp) { return new SimpleAssignment_18(yyp); }
+public static object StateBody_11_factory(Parser yyp) { return new StateBody_11(yyp); }
+public static object StateBody_12_factory(Parser yyp) { return new StateBody_12(yyp); }
 public static object JumpStatement_1_factory(Parser yyp) { return new JumpStatement_1(yyp); }
 public static object GlobalDefinitions_factory(Parser yyp) { return new GlobalDefinitions(yyp); }
 public static object ConstantExpression_1_factory(Parser yyp) { return new ConstantExpression_1(yyp); }
@@ -12297,6 +12666,7 @@ public static object VoidArgEvent_4_factory(Parser yyp) { return new VoidArgEven
 public static object FunctionCall_1_factory(Parser yyp) { return new FunctionCall_1(yyp); }
 public static object Assignment_2_factory(Parser yyp) { return new Assignment_2(yyp); }
 public static object TypecastExpression_1_factory(Parser yyp) { return new TypecastExpression_1(yyp); }
+public static object SimpleAssignment_21_factory(Parser yyp) { return new SimpleAssignment_21(yyp); }
 public static object SimpleAssignment_22_factory(Parser yyp) { return new SimpleAssignment_22(yyp); }
 public static object SimpleAssignment_23_factory(Parser yyp) { return new SimpleAssignment_23(yyp); }
 public static object TypecastExpression_9_factory(Parser yyp) { return new TypecastExpression_9(yyp); }
@@ -12311,12 +12681,10 @@ public static object GlobalVariableDeclaration_factory(Parser yyp) { return new
 public static object IntArgumentDeclarationList_1_factory(Parser yyp) { return new IntArgumentDeclarationList_1(yyp); }
 public static object IntDeclaration_1_factory(Parser yyp) { return new IntDeclaration_1(yyp); }
 public static object ArgumentDeclarationList_5_factory(Parser yyp) { return new ArgumentDeclarationList_5(yyp); }
-public static object Event_11_factory(Parser yyp) { return new Event_11(yyp); }
 public static object VectorArgumentDeclarationList_1_factory(Parser yyp) { return new VectorArgumentDeclarationList_1(yyp); }
 public static object KeyArgumentDeclarationList_factory(Parser yyp) { return new KeyArgumentDeclarationList(yyp); }
 public static object TypecastExpression_2_factory(Parser yyp) { return new TypecastExpression_2(yyp); }
 public static object KeyArgStateEvent_factory(Parser yyp) { return new KeyArgStateEvent(yyp); }
-public static object TypecastExpression_4_factory(Parser yyp) { return new TypecastExpression_4(yyp); }
 public static object TypecastExpression_5_factory(Parser yyp) { return new TypecastExpression_5(yyp); }
 public static object TypecastExpression_8_factory(Parser yyp) { return new TypecastExpression_8(yyp); }
 public static object Constant_1_factory(Parser yyp) { return new Constant_1(yyp); }
@@ -12342,6 +12710,7 @@ public static object ArgumentList_3_factory(Parser yyp) { return new ArgumentLis
 public static object Constant_factory(Parser yyp) { return new Constant(yyp); }
 public static object State_factory(Parser yyp) { return new State(yyp); }
 public static object KeyArgStateEvent_1_factory(Parser yyp) { return new KeyArgStateEvent_1(yyp); }
+public static object SimpleAssignment_8_factory(Parser yyp) { return new SimpleAssignment_8(yyp); }
 public static object LSLProgramRoot_factory(Parser yyp) { return new LSLProgramRoot(yyp); }
 public static object StateChange_factory(Parser yyp) { return new StateChange(yyp); }
 public static object IncrementDecrementExpression_2_factory(Parser yyp) { return new IncrementDecrementExpression_2(yyp); }
@@ -12358,6 +12727,7 @@ public static object IntArgEvent_10_factory(Parser yyp) { return new IntArgEvent
 public static object CompoundStatement_factory(Parser yyp) { return new CompoundStatement(yyp); }
 public static object TypecastExpression_3_factory(Parser yyp) { return new TypecastExpression_3(yyp); }
 public static object IntArgumentDeclarationList_factory(Parser yyp) { return new IntArgumentDeclarationList(yyp); }
+public static object ArgumentDeclarationList_4_factory(Parser yyp) { return new ArgumentDeclarationList_4(yyp); }
 public static object SimpleAssignment_3_factory(Parser yyp) { return new SimpleAssignment_3(yyp); }
 public static object SimpleAssignment_4_factory(Parser yyp) { return new SimpleAssignment_4(yyp); }
 public static object Statement_1_factory(Parser yyp) { return new Statement_1(yyp); }
@@ -12389,19 +12759,21 @@ public static object Statement_3_factory(Parser yyp) { return new Statement_3(yy
 public static object IntArgEvent_7_factory(Parser yyp) { return new IntArgEvent_7(yyp); }
 public static object IntArgEvent_8_factory(Parser yyp) { return new IntArgEvent_8(yyp); }
 public static object SimpleAssignment_10_factory(Parser yyp) { return new SimpleAssignment_10(yyp); }
-public static object Statement_7_factory(Parser yyp) { return new Statement_7(yyp); }
+public static object StatementList_2_factory(Parser yyp) { return new StatementList_2(yyp); }
+public static object IntRotRotArgStateEvent_1_factory(Parser yyp) { return new IntRotRotArgStateEvent_1(yyp); }
 public static object VectorArgEvent_2_factory(Parser yyp) { return new VectorArgEvent_2(yyp); }
 public static object Event_factory(Parser yyp) { return new Event(yyp); }
 public static object SimpleAssignment_14_factory(Parser yyp) { return new SimpleAssignment_14(yyp); }
 public static object SimpleAssignment_16_factory(Parser yyp) { return new SimpleAssignment_16(yyp); }
+public static object SimpleAssignment_17_factory(Parser yyp) { return new SimpleAssignment_17(yyp); }
+public static object SimpleAssignment_18_factory(Parser yyp) { return new SimpleAssignment_18(yyp); }
 public static object Statement_10_factory(Parser yyp) { return new Statement_10(yyp); }
 public static object Statement_11_factory(Parser yyp) { return new Statement_11(yyp); }
 public static object SimpleAssignment_factory(Parser yyp) { return new SimpleAssignment(yyp); }
 public static object TypecastExpression_factory(Parser yyp) { return new TypecastExpression(yyp); }
-public static object VectorArgStateEvent_1_factory(Parser yyp) { return new VectorArgStateEvent_1(yyp); }
 public static object SimpleAssignment_19_factory(Parser yyp) { return new SimpleAssignment_19(yyp); }
 public static object SimpleAssignment_20_factory(Parser yyp) { return new SimpleAssignment_20(yyp); }
-public static object SimpleAssignment_21_factory(Parser yyp) { return new SimpleAssignment_21(yyp); }
+public static object Statement_7_factory(Parser yyp) { return new Statement_7(yyp); }
 public static object SimpleAssignment_24_factory(Parser yyp) { return new SimpleAssignment_24(yyp); }
 public static object SimpleAssignment_1_factory(Parser yyp) { return new SimpleAssignment_1(yyp); }
 public static object SimpleAssignment_2_factory(Parser yyp) { return new SimpleAssignment_2(yyp); }
@@ -12427,6 +12799,7 @@ public static object BinaryExpression_15_factory(Parser yyp) { return new Binary
 public static object BinaryExpression_16_factory(Parser yyp) { return new BinaryExpression_16(yyp); }
 public static object BinaryExpression_6_factory(Parser yyp) { return new BinaryExpression_6(yyp); }
 public static object BinaryExpression_7_factory(Parser yyp) { return new BinaryExpression_7(yyp); }
+public static object Typename_4_factory(Parser yyp) { return new Typename_4(yyp); }
 public static object ArgumentList_factory(Parser yyp) { return new ArgumentList(yyp); }
 public static object VectorDeclaration_factory(Parser yyp) { return new VectorDeclaration(yyp); }
 public static object Event_10_factory(Parser yyp) { return new Event_10(yyp); }
@@ -12446,7 +12819,7 @@ public static object VectorConstant_factory(Parser yyp) { return new VectorConst
 public static object VectorArgEvent_1_factory(Parser yyp) { return new VectorArgEvent_1(yyp); }
 public static object IntDeclaration_factory(Parser yyp) { return new IntDeclaration(yyp); }
 public static object VectorArgEvent_3_factory(Parser yyp) { return new VectorArgEvent_3(yyp); }
-public static object IntArgStateEvent_factory(Parser yyp) { return new IntArgStateEvent(yyp); }
+public static object TypecastExpression_4_factory(Parser yyp) { return new TypecastExpression_4(yyp); }
 public static object TypecastExpression_6_factory(Parser yyp) { return new TypecastExpression_6(yyp); }
 public static object TypecastExpression_7_factory(Parser yyp) { return new TypecastExpression_7(yyp); }
 public static object FunctionCall_factory(Parser yyp) { return new FunctionCall(yyp); }
@@ -12465,15 +12838,17 @@ public static object IfStatement_factory(Parser yyp) { return new IfStatement(yy
 public static object ForLoopStatement_1_factory(Parser yyp) { return new ForLoopStatement_1(yyp); }
 public static object ForLoopStatement_2_factory(Parser yyp) { return new ForLoopStatement_2(yyp); }
 public static object ForLoopStatement_3_factory(Parser yyp) { return new ForLoopStatement_3(yyp); }
-public static object ArgumentDeclarationList_4_factory(Parser yyp) { return new ArgumentDeclarationList_4(yyp); }
+public static object IntRotRotArgumentDeclarationList_factory(Parser yyp) { return new IntRotRotArgumentDeclarationList(yyp); }
 public static object IntArgEvent_1_factory(Parser yyp) { return new IntArgEvent_1(yyp); }
 public static object IntArgEvent_2_factory(Parser yyp) { return new IntArgEvent_2(yyp); }
 public static object WhileStatement_factory(Parser yyp) { return new WhileStatement(yyp); }
 public static object ForLoop_1_factory(Parser yyp) { return new ForLoop_1(yyp); }
 public static object Constant_2_factory(Parser yyp) { return new Constant_2(yyp); }
 public static object VoidArgEvent_factory(Parser yyp) { return new VoidArgEvent(yyp); }
+public static object RotDeclaration_factory(Parser yyp) { return new RotDeclaration(yyp); }
 public static object WhileStatement_1_factory(Parser yyp) { return new WhileStatement_1(yyp); }
 public static object WhileStatement_2_factory(Parser yyp) { return new WhileStatement_2(yyp); }
+public static object VectorArgStateEvent_1_factory(Parser yyp) { return new VectorArgStateEvent_1(yyp); }
 public static object IdentExpression_1_factory(Parser yyp) { return new IdentExpression_1(yyp); }
 public static object VectorArgumentDeclarationList_factory(Parser yyp) { return new VectorArgumentDeclarationList(yyp); }
 public static object States_factory(Parser yyp) { return new States(yyp); }
-- 
cgit v1.1


From 871ac5b16c368fb08045db7c48857db93da5899e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 21 Dec 2013 00:46:34 +0000
Subject: Add arg checking for at_target lsl event

---
 .../Shared/CodeTools/Tests/LSL_EventTests.cs       |    17 +
 .../ScriptEngine/Shared/CodeTools/lsl.parser.cs    | 17997 ++++++++++---------
 2 files changed, 9172 insertions(+), 8842 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
index 854b4bf..ea43d66 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
@@ -269,6 +269,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TestIntRotRotArgEvent("at_rot_target");
         }
 
+        [Test]
+        public void TestAtTargetEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestIntVecVecArgEvent("at_target");
+        }
+
         private void TestIntArgEvent(string eventName)
         {
             TestCompile("default { " + eventName + "(integer n) {} }", false);
@@ -301,6 +310,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TestCompile("default { " + eventName + "(integer n, rotation r, rotation s, rotation t) {{}} }", true);
         }
 
+        private void TestIntVecVecArgEvent(string eventName)
+        {
+            TestCompile("default { " + eventName + "(integer n, vector v, vector w) {} }", false);
+            TestCompile("default { " + eventName + "{{}} }", true);
+            TestCompile("default { " + eventName + "(string s) {{}} }", true);
+            TestCompile("default { " + eventName + "(integer n, vector v, vector w, vector x) {{}} }", true);
+        }
+
         private void TestCompile(string script, bool expectException)
         {
             bool gotException = false;
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
index a4938a0..fe8ab4f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
@@ -170,7 +170,15 @@ public class IntRotRotArgStateEvent : StateEvent{
 public override string yyname { get { return "IntRotRotArgStateEvent"; }}
 public override int yynum { get { return 108; }}
 public IntRotRotArgStateEvent(Parser yyp):base(yyp){}}
-//%+ArgumentDeclarationList+109
+//%+IntVecVecArgStateEvent+109
+public class IntVecVecArgStateEvent : StateEvent{
+ public  IntVecVecArgStateEvent (Parser yyp, string  name , IntVecVecArgumentDeclarationList  adl , CompoundStatement  cs ):base(((LSLSyntax
+)yyp), name , adl , cs ){}
+
+public override string yyname { get { return "IntVecVecArgStateEvent"; }}
+public override int yynum { get { return 109; }}
+public IntVecVecArgStateEvent(Parser yyp):base(yyp){}}
+//%+ArgumentDeclarationList+110
 public class ArgumentDeclarationList : SYMBOL{
  public  ArgumentDeclarationList (Parser yyp, Declaration  d ):base(((LSLSyntax
 )yyp)){ kids . Add ( d );
@@ -190,41 +198,49 @@ public class ArgumentDeclarationList : SYMBOL{
 }
 
 public override string yyname { get { return "ArgumentDeclarationList"; }}
-public override int yynum { get { return 109; }}
+public override int yynum { get { return 110; }}
 public ArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+KeyArgumentDeclarationList+110
+//%+KeyArgumentDeclarationList+111
 public class KeyArgumentDeclarationList : ArgumentDeclarationList{
  public  KeyArgumentDeclarationList (Parser yyp, KeyDeclaration  d ):base(((LSLSyntax
 )yyp), d ){}
 
 public override string yyname { get { return "KeyArgumentDeclarationList"; }}
-public override int yynum { get { return 110; }}
+public override int yynum { get { return 111; }}
 public KeyArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+IntArgumentDeclarationList+111
+//%+IntArgumentDeclarationList+112
 public class IntArgumentDeclarationList : ArgumentDeclarationList{
  public  IntArgumentDeclarationList (Parser yyp, IntDeclaration  d ):base(((LSLSyntax
 )yyp), d ){}
 
 public override string yyname { get { return "IntArgumentDeclarationList"; }}
-public override int yynum { get { return 111; }}
+public override int yynum { get { return 112; }}
 public IntArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+VectorArgumentDeclarationList+112
+//%+VectorArgumentDeclarationList+113
 public class VectorArgumentDeclarationList : ArgumentDeclarationList{
  public  VectorArgumentDeclarationList (Parser yyp, VectorDeclaration  d ):base(((LSLSyntax
 )yyp), d ){}
 
 public override string yyname { get { return "VectorArgumentDeclarationList"; }}
-public override int yynum { get { return 112; }}
+public override int yynum { get { return 113; }}
 public VectorArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+IntRotRotArgumentDeclarationList+113
+//%+IntRotRotArgumentDeclarationList+114
 public class IntRotRotArgumentDeclarationList : ArgumentDeclarationList{
  public  IntRotRotArgumentDeclarationList (Parser yyp, Declaration  d1 , Declaration  d2 , Declaration  d3 ):base(((LSLSyntax
 )yyp), d1 , d2 , d3 ){}
 
 public override string yyname { get { return "IntRotRotArgumentDeclarationList"; }}
-public override int yynum { get { return 113; }}
+public override int yynum { get { return 114; }}
 public IntRotRotArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+Declaration+114
+//%+IntVecVecArgumentDeclarationList+115
+public class IntVecVecArgumentDeclarationList : ArgumentDeclarationList{
+ public  IntVecVecArgumentDeclarationList (Parser yyp, Declaration  d1 , Declaration  d2 , Declaration  d3 ):base(((LSLSyntax
+)yyp), d1 , d2 , d3 ){}
+
+public override string yyname { get { return "IntVecVecArgumentDeclarationList"; }}
+public override int yynum { get { return 115; }}
+public IntVecVecArgumentDeclarationList(Parser yyp):base(yyp){}}
+//%+Declaration+116
 public class Declaration : SYMBOL{
  private  string  m_datatype ;
  private  string  m_id ;
@@ -244,41 +260,41 @@ public class Declaration : SYMBOL{
 }
 
 public override string yyname { get { return "Declaration"; }}
-public override int yynum { get { return 114; }}
+public override int yynum { get { return 116; }}
 public Declaration(Parser yyp):base(yyp){}}
-//%+KeyDeclaration+115
+//%+KeyDeclaration+117
 public class KeyDeclaration : Declaration{
  public  KeyDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
 )yyp), type , id ){}
 
 public override string yyname { get { return "KeyDeclaration"; }}
-public override int yynum { get { return 115; }}
+public override int yynum { get { return 117; }}
 public KeyDeclaration(Parser yyp):base(yyp){}}
-//%+IntDeclaration+116
+//%+IntDeclaration+118
 public class IntDeclaration : Declaration{
  public  IntDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
 )yyp), type , id ){}
 
 public override string yyname { get { return "IntDeclaration"; }}
-public override int yynum { get { return 116; }}
+public override int yynum { get { return 118; }}
 public IntDeclaration(Parser yyp):base(yyp){}}
-//%+VectorDeclaration+117
+//%+VectorDeclaration+119
 public class VectorDeclaration : Declaration{
  public  VectorDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
 )yyp), type , id ){}
 
 public override string yyname { get { return "VectorDeclaration"; }}
-public override int yynum { get { return 117; }}
+public override int yynum { get { return 119; }}
 public VectorDeclaration(Parser yyp):base(yyp){}}
-//%+RotDeclaration+118
+//%+RotDeclaration+120
 public class RotDeclaration : Declaration{
  public  RotDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
 )yyp), type , id ){}
 
 public override string yyname { get { return "RotDeclaration"; }}
-public override int yynum { get { return 118; }}
+public override int yynum { get { return 120; }}
 public RotDeclaration(Parser yyp):base(yyp){}}
-//%+Typename+119
+//%+Typename+121
 public class Typename : SYMBOL{
  public  string  yytext ;
  public  Typename (Parser yyp, string  text ):base(((LSLSyntax
@@ -286,9 +302,9 @@ public class Typename : SYMBOL{
 }
 
 public override string yyname { get { return "Typename"; }}
-public override int yynum { get { return 119; }}
+public override int yynum { get { return 121; }}
 public Typename(Parser yyp):base(yyp){}}
-//%+Event+120
+//%+Event+122
 public class Event : SYMBOL{
  public  string  yytext ;
  public  Event (Parser yyp, string  text ):base(((LSLSyntax
@@ -296,49 +312,57 @@ public class Event : SYMBOL{
 }
 
 public override string yyname { get { return "Event"; }}
-public override int yynum { get { return 120; }}
+public override int yynum { get { return 122; }}
 public Event(Parser yyp):base(yyp){}}
-//%+VoidArgEvent+121
+//%+VoidArgEvent+123
 public class VoidArgEvent : Event{
  public  VoidArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "VoidArgEvent"; }}
-public override int yynum { get { return 121; }}
+public override int yynum { get { return 123; }}
 public VoidArgEvent(Parser yyp):base(yyp){}}
-//%+KeyArgEvent+122
+//%+KeyArgEvent+124
 public class KeyArgEvent : Event{
  public  KeyArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "KeyArgEvent"; }}
-public override int yynum { get { return 122; }}
+public override int yynum { get { return 124; }}
 public KeyArgEvent(Parser yyp):base(yyp){}}
-//%+IntArgEvent+123
+//%+IntArgEvent+125
 public class IntArgEvent : Event{
  public  IntArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "IntArgEvent"; }}
-public override int yynum { get { return 123; }}
+public override int yynum { get { return 125; }}
 public IntArgEvent(Parser yyp):base(yyp){}}
-//%+VectorArgEvent+124
+//%+VectorArgEvent+126
 public class VectorArgEvent : Event{
  public  VectorArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "VectorArgEvent"; }}
-public override int yynum { get { return 124; }}
+public override int yynum { get { return 126; }}
 public VectorArgEvent(Parser yyp):base(yyp){}}
-//%+IntRotRotArgEvent+125
+//%+IntRotRotArgEvent+127
 public class IntRotRotArgEvent : Event{
  public  IntRotRotArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "IntRotRotArgEvent"; }}
-public override int yynum { get { return 125; }}
+public override int yynum { get { return 127; }}
 public IntRotRotArgEvent(Parser yyp):base(yyp){}}
-//%+CompoundStatement+126
+//%+IntVecVecArgEvent+128
+public class IntVecVecArgEvent : Event{
+ public  IntVecVecArgEvent (Parser yyp, string  text ):base(((LSLSyntax
+)yyp), text ){}
+
+public override string yyname { get { return "IntVecVecArgEvent"; }}
+public override int yynum { get { return 128; }}
+public IntVecVecArgEvent(Parser yyp):base(yyp){}}
+//%+CompoundStatement+129
 public class CompoundStatement : SYMBOL{
  public  CompoundStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -347,9 +371,9 @@ public class CompoundStatement : SYMBOL{
 }
 
 public override string yyname { get { return "CompoundStatement"; }}
-public override int yynum { get { return 126; }}
+public override int yynum { get { return 129; }}
 }
-//%+StatementList+127
+//%+StatementList+130
 public class StatementList : SYMBOL{
  private  void  AddStatement ( Statement  s ){ if ( s . kids . Top  is  IfStatement || s . kids . Top  is  WhileStatement || s . kids . Top  is  DoWhileStatement || s . kids . Top  is  ForLoop ) kids . Add ( s . kids . Pop ());
  else  kids . Add ( s );
@@ -363,9 +387,9 @@ public class StatementList : SYMBOL{
 }
 
 public override string yyname { get { return "StatementList"; }}
-public override int yynum { get { return 127; }}
+public override int yynum { get { return 130; }}
 public StatementList(Parser yyp):base(yyp){}}
-//%+Statement+128
+//%+Statement+131
 public class Statement : SYMBOL{
  public  Statement (Parser yyp, Declaration  d ):base(((LSLSyntax
 )yyp)){ kids . Add ( d );
@@ -411,9 +435,9 @@ public class Statement : SYMBOL{
 }
 
 public override string yyname { get { return "Statement"; }}
-public override int yynum { get { return 128; }}
+public override int yynum { get { return 131; }}
 public Statement(Parser yyp):base(yyp){}}
-//%+EmptyStatement+129
+//%+EmptyStatement+132
 public class EmptyStatement : SYMBOL{
  public  EmptyStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -421,9 +445,9 @@ public class EmptyStatement : SYMBOL{
 }
 
 public override string yyname { get { return "EmptyStatement"; }}
-public override int yynum { get { return 129; }}
+public override int yynum { get { return 132; }}
 }
-//%+Assignment+130
+//%+Assignment+133
 public class Assignment : SYMBOL{
  protected  string  m_assignmentType ;
  public  Assignment (Parser yyp, SYMBOL  lhs , SYMBOL  rhs , string  assignmentType ):base(((LSLSyntax
@@ -443,9 +467,9 @@ public class Assignment : SYMBOL{
 }
 
 public override string yyname { get { return "Assignment"; }}
-public override int yynum { get { return 130; }}
+public override int yynum { get { return 133; }}
 public Assignment(Parser yyp):base(yyp){}}
-//%+SimpleAssignment+131
+//%+SimpleAssignment+134
 public class SimpleAssignment : Assignment{
  public  SimpleAssignment (Parser yyp, SYMBOL  lhs , SYMBOL  rhs , string  assignmentType ):base(((LSLSyntax
 )yyp)){ m_assignmentType = assignmentType ;
@@ -455,9 +479,9 @@ public class SimpleAssignment : Assignment{
 }
 
 public override string yyname { get { return "SimpleAssignment"; }}
-public override int yynum { get { return 131; }}
+public override int yynum { get { return 134; }}
 public SimpleAssignment(Parser yyp):base(yyp){}}
-//%+ReturnStatement+132
+//%+ReturnStatement+135
 public class ReturnStatement : SYMBOL{
  public  ReturnStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -467,9 +491,9 @@ public class ReturnStatement : SYMBOL{
 }
 
 public override string yyname { get { return "ReturnStatement"; }}
-public override int yynum { get { return 132; }}
+public override int yynum { get { return 135; }}
 }
-//%+JumpLabel+133
+//%+JumpLabel+136
 public class JumpLabel : SYMBOL{
  private  string  m_labelName ;
  public  JumpLabel (Parser yyp, string  labelName ):base(((LSLSyntax
@@ -482,9 +506,9 @@ public class JumpLabel : SYMBOL{
 }
 
 public override string yyname { get { return "JumpLabel"; }}
-public override int yynum { get { return 133; }}
+public override int yynum { get { return 136; }}
 public JumpLabel(Parser yyp):base(yyp){}}
-//%+JumpStatement+134
+//%+JumpStatement+137
 public class JumpStatement : SYMBOL{
  private  string  m_targetName ;
  public  JumpStatement (Parser yyp, string  targetName ):base(((LSLSyntax
@@ -497,9 +521,9 @@ public class JumpStatement : SYMBOL{
 }
 
 public override string yyname { get { return "JumpStatement"; }}
-public override int yynum { get { return 134; }}
+public override int yynum { get { return 137; }}
 public JumpStatement(Parser yyp):base(yyp){}}
-//%+StateChange+135
+//%+StateChange+138
 public class StateChange : SYMBOL{
  private  string  m_newState ;
  public  StateChange (Parser yyp, string  newState ):base(((LSLSyntax
@@ -510,9 +534,9 @@ public class StateChange : SYMBOL{
 }
 
 public override string yyname { get { return "StateChange"; }}
-public override int yynum { get { return 135; }}
+public override int yynum { get { return 138; }}
 public StateChange(Parser yyp):base(yyp){}}
-//%+IfStatement+136
+//%+IfStatement+139
 public class IfStatement : SYMBOL{
  private  void  AddStatement ( Statement  s ){ if (0< s . kids . Count && s . kids . Top  is  CompoundStatement ) kids . Add ( s . kids . Pop ());
  else  kids . Add ( s );
@@ -529,9 +553,9 @@ public class IfStatement : SYMBOL{
 }
 
 public override string yyname { get { return "IfStatement"; }}
-public override int yynum { get { return 136; }}
+public override int yynum { get { return 139; }}
 public IfStatement(Parser yyp):base(yyp){}}
-//%+WhileStatement+137
+//%+WhileStatement+140
 public class WhileStatement : SYMBOL{
  public  WhileStatement (Parser yyp, SYMBOL  s , Statement  st ):base(((LSLSyntax
 )yyp)){ kids . Add ( s );
@@ -540,9 +564,9 @@ public class WhileStatement : SYMBOL{
 }
 
 public override string yyname { get { return "WhileStatement"; }}
-public override int yynum { get { return 137; }}
+public override int yynum { get { return 140; }}
 public WhileStatement(Parser yyp):base(yyp){}}
-//%+DoWhileStatement+138
+//%+DoWhileStatement+141
 public class DoWhileStatement : SYMBOL{
  public  DoWhileStatement (Parser yyp, SYMBOL  s , Statement  st ):base(((LSLSyntax
 )yyp)){ if (0< st . kids . Count && st . kids . Top  is  CompoundStatement ) kids . Add ( st . kids . Pop ());
@@ -551,9 +575,9 @@ public class DoWhileStatement : SYMBOL{
 }
 
 public override string yyname { get { return "DoWhileStatement"; }}
-public override int yynum { get { return 138; }}
+public override int yynum { get { return 141; }}
 public DoWhileStatement(Parser yyp):base(yyp){}}
-//%+ForLoop+139
+//%+ForLoop+142
 public class ForLoop : SYMBOL{
  public  ForLoop (Parser yyp, ForLoopStatement  flsa , Expression  e , ForLoopStatement  flsb , Statement  s ):base(((LSLSyntax
 )yyp)){ kids . Add ( flsa );
@@ -564,9 +588,9 @@ public class ForLoop : SYMBOL{
 }
 
 public override string yyname { get { return "ForLoop"; }}
-public override int yynum { get { return 139; }}
+public override int yynum { get { return 142; }}
 public ForLoop(Parser yyp):base(yyp){}}
-//%+ForLoopStatement+140
+//%+ForLoopStatement+143
 public class ForLoopStatement : SYMBOL{
  public  ForLoopStatement (Parser yyp, Expression  e ):base(((LSLSyntax
 )yyp)){ kids . Add ( e );
@@ -584,9 +608,9 @@ public class ForLoopStatement : SYMBOL{
 }
 
 public override string yyname { get { return "ForLoopStatement"; }}
-public override int yynum { get { return 140; }}
+public override int yynum { get { return 143; }}
 public ForLoopStatement(Parser yyp):base(yyp){}}
-//%+FunctionCall+141
+//%+FunctionCall+144
 public class FunctionCall : SYMBOL{
  private  string  m_id ;
  public  FunctionCall (Parser yyp, string  id , ArgumentList  al ):base(((LSLSyntax
@@ -600,9 +624,9 @@ public class FunctionCall : SYMBOL{
 }
 
 public override string yyname { get { return "FunctionCall"; }}
-public override int yynum { get { return 141; }}
+public override int yynum { get { return 144; }}
 public FunctionCall(Parser yyp):base(yyp){}}
-//%+ArgumentList+142
+//%+ArgumentList+145
 public class ArgumentList : SYMBOL{
  public  ArgumentList (Parser yyp, Argument  a ):base(((LSLSyntax
 )yyp)){ AddArgument ( a );
@@ -616,14 +640,14 @@ public class ArgumentList : SYMBOL{
 }
 
 public override string yyname { get { return "ArgumentList"; }}
-public override int yynum { get { return 142; }}
+public override int yynum { get { return 145; }}
 public ArgumentList(Parser yyp):base(yyp){}}
-//%+Argument+143
+//%+Argument+146
 public class Argument : SYMBOL{
 public override string yyname { get { return "Argument"; }}
-public override int yynum { get { return 143; }}
+public override int yynum { get { return 146; }}
 public Argument(Parser yyp):base(yyp){}}
-//%+ExpressionArgument+144
+//%+ExpressionArgument+147
 public class ExpressionArgument : Argument{
  public  ExpressionArgument (Parser yyp, Expression  e ):base(((LSLSyntax
 )yyp)){ if ( e  is  ConstantExpression ) while (0< e . kids . Count ) kids . Add ( e . kids . Pop ());
@@ -631,9 +655,9 @@ public class ExpressionArgument : Argument{
 }
 
 public override string yyname { get { return "ExpressionArgument"; }}
-public override int yynum { get { return 144; }}
+public override int yynum { get { return 147; }}
 public ExpressionArgument(Parser yyp):base(yyp){}}
-//%+Constant+145
+//%+Constant+148
 public class Constant : SYMBOL{
  private  string  m_type ;
  private  string  m_val ;
@@ -655,9 +679,9 @@ public class Constant : SYMBOL{
 }
 
 public override string yyname { get { return "Constant"; }}
-public override int yynum { get { return 145; }}
+public override int yynum { get { return 148; }}
 public Constant(Parser yyp):base(yyp){}}
-//%+VectorConstant+146
+//%+VectorConstant+149
 public class VectorConstant : Constant{
  public  VectorConstant (Parser yyp, Expression  valX , Expression  valY , Expression  valZ ):base(((LSLSyntax
 )yyp),"vector", null ){ kids . Add ( valX );
@@ -666,9 +690,9 @@ public class VectorConstant : Constant{
 }
 
 public override string yyname { get { return "VectorConstant"; }}
-public override int yynum { get { return 146; }}
+public override int yynum { get { return 149; }}
 public VectorConstant(Parser yyp):base(yyp){}}
-//%+RotationConstant+147
+//%+RotationConstant+150
 public class RotationConstant : Constant{
  public  RotationConstant (Parser yyp, Expression  valX , Expression  valY , Expression  valZ , Expression  valS ):base(((LSLSyntax
 )yyp),"rotation", null ){ kids . Add ( valX );
@@ -678,36 +702,36 @@ public class RotationConstant : Constant{
 }
 
 public override string yyname { get { return "RotationConstant"; }}
-public override int yynum { get { return 147; }}
+public override int yynum { get { return 150; }}
 public RotationConstant(Parser yyp):base(yyp){}}
-//%+ListConstant+148
+//%+ListConstant+151
 public class ListConstant : Constant{
  public  ListConstant (Parser yyp, ArgumentList  al ):base(((LSLSyntax
 )yyp),"list", null ){ kids . Add ( al );
 }
 
 public override string yyname { get { return "ListConstant"; }}
-public override int yynum { get { return 148; }}
+public override int yynum { get { return 151; }}
 public ListConstant(Parser yyp):base(yyp){}}
-//%+Expression+149
+//%+Expression+152
 public class Expression : SYMBOL{
  protected  void  AddExpression ( Expression  e ){ if ( e  is  ConstantExpression ) while (0< e . kids . Count ) kids . Add ( e . kids . Pop ());
  else  kids . Add ( e );
 }
 
 public override string yyname { get { return "Expression"; }}
-public override int yynum { get { return 149; }}
+public override int yynum { get { return 152; }}
 public Expression(Parser yyp):base(yyp){}}
-//%+ConstantExpression+150
+//%+ConstantExpression+153
 public class ConstantExpression : Expression{
  public  ConstantExpression (Parser yyp, Constant  c ):base(((LSLSyntax
 )yyp)){ kids . Add ( c );
 }
 
 public override string yyname { get { return "ConstantExpression"; }}
-public override int yynum { get { return 150; }}
+public override int yynum { get { return 153; }}
 public ConstantExpression(Parser yyp):base(yyp){}}
-//%+IdentExpression+151
+//%+IdentExpression+154
 public class IdentExpression : Expression{
  protected  string  m_name ;
  public  IdentExpression (Parser yyp, string  name ):base(((LSLSyntax
@@ -720,9 +744,9 @@ public class IdentExpression : Expression{
 }
 
 public override string yyname { get { return "IdentExpression"; }}
-public override int yynum { get { return 151; }}
+public override int yynum { get { return 154; }}
 public IdentExpression(Parser yyp):base(yyp){}}
-//%+IdentDotExpression+152
+//%+IdentDotExpression+155
 public class IdentDotExpression : IdentExpression{
  private  string  m_member ;
  public  IdentDotExpression (Parser yyp, string  name , string  member ):base(((LSLSyntax
@@ -736,18 +760,18 @@ public class IdentDotExpression : IdentExpression{
 }
 
 public override string yyname { get { return "IdentDotExpression"; }}
-public override int yynum { get { return 152; }}
+public override int yynum { get { return 155; }}
 public IdentDotExpression(Parser yyp):base(yyp){}}
-//%+FunctionCallExpression+153
+//%+FunctionCallExpression+156
 public class FunctionCallExpression : Expression{
  public  FunctionCallExpression (Parser yyp, FunctionCall  fc ):base(((LSLSyntax
 )yyp)){ kids . Add ( fc );
 }
 
 public override string yyname { get { return "FunctionCallExpression"; }}
-public override int yynum { get { return 153; }}
+public override int yynum { get { return 156; }}
 public FunctionCallExpression(Parser yyp):base(yyp){}}
-//%+BinaryExpression+154
+//%+BinaryExpression+157
 public class BinaryExpression : Expression{
  private  string  m_expressionSymbol ;
  public  BinaryExpression (Parser yyp, Expression  lhs , Expression  rhs , string  expressionSymbol ):base(((LSLSyntax
@@ -762,9 +786,9 @@ public class BinaryExpression : Expression{
 }
 
 public override string yyname { get { return "BinaryExpression"; }}
-public override int yynum { get { return 154; }}
+public override int yynum { get { return 157; }}
 public BinaryExpression(Parser yyp):base(yyp){}}
-//%+UnaryExpression+155
+//%+UnaryExpression+158
 public class UnaryExpression : Expression{
  private  string  m_unarySymbol ;
  public  UnaryExpression (Parser yyp, string  unarySymbol , Expression  e ):base(((LSLSyntax
@@ -778,9 +802,9 @@ public class UnaryExpression : Expression{
 }
 
 public override string yyname { get { return "UnaryExpression"; }}
-public override int yynum { get { return 155; }}
+public override int yynum { get { return 158; }}
 public UnaryExpression(Parser yyp):base(yyp){}}
-//%+TypecastExpression+156
+//%+TypecastExpression+159
 public class TypecastExpression : Expression{
  private  string  m_typecastType ;
  public  TypecastExpression (Parser yyp, string  typecastType , SYMBOL  rhs ):base(((LSLSyntax
@@ -794,18 +818,18 @@ public class TypecastExpression : Expression{
 }
 
 public override string yyname { get { return "TypecastExpression"; }}
-public override int yynum { get { return 156; }}
+public override int yynum { get { return 159; }}
 public TypecastExpression(Parser yyp):base(yyp){}}
-//%+ParenthesisExpression+157
+//%+ParenthesisExpression+160
 public class ParenthesisExpression : Expression{
  public  ParenthesisExpression (Parser yyp, SYMBOL  s ):base(((LSLSyntax
 )yyp)){ kids . Add ( s );
 }
 
 public override string yyname { get { return "ParenthesisExpression"; }}
-public override int yynum { get { return 157; }}
+public override int yynum { get { return 160; }}
 public ParenthesisExpression(Parser yyp):base(yyp){}}
-//%+IncrementDecrementExpression+158
+//%+IncrementDecrementExpression+161
 public class IncrementDecrementExpression : Expression{
  private  string  m_name ;
  private  string  m_operation ;
@@ -833,7 +857,7 @@ public class IncrementDecrementExpression : Expression{
 }
 
 public override string yyname { get { return "IncrementDecrementExpression"; }}
-public override int yynum { get { return 158; }}
+public override int yynum { get { return 161; }}
 public IncrementDecrementExpression(Parser yyp):base(yyp){}}
 
 public class LSLProgramRoot_1 : LSLProgramRoot {
@@ -1005,6 +1029,18 @@ public class StateBody_12 : StateBody {
 	((IntRotRotArgStateEvent)(yyq.StackAt(0).m_value))
 	){}}
 
+public class StateBody_13 : StateBody {
+  public StateBody_13(Parser yyq):base(yyq,
+	((IntVecVecArgStateEvent)(yyq.StackAt(0).m_value))
+	){}}
+
+public class StateBody_14 : StateBody {
+  public StateBody_14(Parser yyq):base(yyq,
+	((StateBody)(yyq.StackAt(1).m_value))
+	, 
+	((IntVecVecArgStateEvent)(yyq.StackAt(0).m_value))
+	){}}
+
 public class StateEvent_1 : StateEvent {
   public StateEvent_1(Parser yyq):base(yyq,
 	((Event)(yyq.StackAt(4).m_value))
@@ -1057,6 +1093,15 @@ public class IntRotRotArgStateEvent_1 : IntRotRotArgStateEvent {
 	((CompoundStatement)(yyq.StackAt(0).m_value))
 	){}}
 
+public class IntVecVecArgStateEvent_1 : IntVecVecArgStateEvent {
+  public IntVecVecArgStateEvent_1(Parser yyq):base(yyq,
+	((IntVecVecArgEvent)(yyq.StackAt(4).m_value))
+	.yytext, 
+	((IntVecVecArgumentDeclarationList)(yyq.StackAt(2).m_value))
+	, 
+	((CompoundStatement)(yyq.StackAt(0).m_value))
+	){}}
+
 public class ArgumentDeclarationList_1 : ArgumentDeclarationList {
   public ArgumentDeclarationList_1(Parser yyq):base(yyq,
 	((Declaration)(yyq.StackAt(0).m_value))
@@ -1093,6 +1138,15 @@ public class IntRotRotArgumentDeclarationList_1 : IntRotRotArgumentDeclarationLi
 	((RotDeclaration)(yyq.StackAt(0).m_value))
 	){}}
 
+public class IntVecVecArgumentDeclarationList_1 : IntVecVecArgumentDeclarationList {
+  public IntVecVecArgumentDeclarationList_1(Parser yyq):base(yyq,
+	((IntDeclaration)(yyq.StackAt(4).m_value))
+	, 
+	((VectorDeclaration)(yyq.StackAt(2).m_value))
+	, 
+	((VectorDeclaration)(yyq.StackAt(0).m_value))
+	){}}
+
 public class Declaration_1 : Declaration {
   public Declaration_1(Parser yyq):base(yyq,
 	((Typename)(yyq.StackAt(1).m_value))
@@ -2088,51 +2142,46 @@ public class Typename_7 : Typename {
 
 public class Event_1 : Event {
   public Event_1(Parser yyq):base(yyq,
-	((AT_TARGET_EVENT)(yyq.StackAt(0).m_value))
+	((CONTROL_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_2 : Event {
   public Event_2(Parser yyq):base(yyq,
-	((CONTROL_EVENT)(yyq.StackAt(0).m_value))
+	((DATASERVER_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_3 : Event {
   public Event_3(Parser yyq):base(yyq,
-	((DATASERVER_EVENT)(yyq.StackAt(0).m_value))
+	((EMAIL_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_4 : Event {
   public Event_4(Parser yyq):base(yyq,
-	((EMAIL_EVENT)(yyq.StackAt(0).m_value))
+	((HTTP_RESPONSE_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_5 : Event {
   public Event_5(Parser yyq):base(yyq,
-	((HTTP_RESPONSE_EVENT)(yyq.StackAt(0).m_value))
+	((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_6 : Event {
   public Event_6(Parser yyq):base(yyq,
-	((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value))
+	((LISTEN_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_7 : Event {
   public Event_7(Parser yyq):base(yyq,
-	((LISTEN_EVENT)(yyq.StackAt(0).m_value))
+	((MONEY_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_8 : Event {
   public Event_8(Parser yyq):base(yyq,
-	((MONEY_EVENT)(yyq.StackAt(0).m_value))
+	((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_9 : Event {
   public Event_9(Parser yyq):base(yyq,
-	((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value))
-	.yytext){}}
-
-public class Event_10 : Event {
-  public Event_10(Parser yyq):base(yyq,
 	((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
@@ -2255,6 +2304,11 @@ public class IntRotRotArgEvent_1 : IntRotRotArgEvent {
   public IntRotRotArgEvent_1(Parser yyq):base(yyq,
 	((AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
+
+public class IntVecVecArgEvent_1 : IntVecVecArgEvent {
+  public IntVecVecArgEvent_1(Parser yyq):base(yyq,
+	((AT_TARGET_EVENT)(yyq.StackAt(0).m_value))
+	.yytext){}}
 public class yyLSLSyntax
 : YyParser {
   public override object Action(Parser yyq,SYMBOL yysym, int yyact) {
@@ -2271,11 +2325,11 @@ public class ArgumentList_3 : ArgumentList {
 public class ArgumentDeclarationList_4 : ArgumentDeclarationList {
   public ArgumentDeclarationList_4(Parser yyq):base(yyq){}}
 
-public class ArgumentList_4 : ArgumentList {
-  public ArgumentList_4(Parser yyq):base(yyq){}}
-
 public class ArgumentDeclarationList_5 : ArgumentDeclarationList {
   public ArgumentDeclarationList_5(Parser yyq):base(yyq){}}
+
+public class ArgumentList_4 : ArgumentList {
+  public ArgumentList_4(Parser yyq):base(yyq){}}
 public yyLSLSyntax
 ():base() { arr = new int[] { 
 101,4,6,52,0,
@@ -2287,9 +2341,9 @@ public yyLSLSyntax
 97,0,109,0,82,
 0,111,0,111,0,
 116,0,1,96,1,
-2,104,18,1,2799,
+2,104,18,1,2820,
 102,2,0,105,5,
-370,1,0,106,18,
+382,1,0,106,18,
 1,0,0,2,0,
 1,1,107,18,1,
 1,108,20,109,4,
@@ -2350,7 +2404,7 @@ public yyLSLSyntax
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,1,
-119,1,2,2,0,
+121,1,2,2,0,
 1,9,131,18,1,
 9,132,20,133,4,
 10,73,0,68,0,
@@ -2364,45 +2418,41 @@ public yyLSLSyntax
 65,0,82,0,69,
 0,78,0,1,16,
 1,1,2,0,1,
-2796,137,18,1,2796,
-138,20,139,4,50,
+2797,137,18,1,2797,
+138,20,139,4,18,
+83,0,69,0,77,
+0,73,0,67,0,
+79,0,76,0,79,
+0,78,0,1,11,
+1,1,2,0,1,
+2798,140,18,1,2798,
+141,20,142,4,34,
 71,0,108,0,111,
 0,98,0,97,0,
-108,0,86,0,97,
-0,114,0,105,0,
-97,0,98,0,108,
-0,101,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-1,98,1,2,2,
-0,1,2797,140,18,
-1,2797,141,20,142,
-4,48,71,0,108,
-0,111,0,98,0,
-97,0,108,0,70,
-0,117,0,110,0,
-99,0,116,0,105,
-0,111,0,110,0,
-68,0,101,0,102,
-0,105,0,110,0,
-105,0,116,0,105,
-0,111,0,110,0,
-1,99,1,2,2,
-0,1,2798,143,18,
-1,2798,138,2,0,
-1,2799,104,1,2800,
-144,18,1,2800,145,
-23,146,4,6,69,
-0,79,0,70,0,
-1,2,1,6,2,
-0,1,18,147,18,
+108,0,68,0,101,
+0,102,0,105,0,
+110,0,105,0,116,
+0,105,0,111,0,
+110,0,115,0,1,
+97,1,2,2,0,
+1,2632,143,18,1,
+2632,144,20,145,4,
+44,73,0,110,0,
+116,0,86,0,101,
+0,99,0,86,0,
+101,0,99,0,65,
+0,114,0,103,0,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,109,1,2,2,
+0,1,18,146,18,
 1,18,129,2,0,
-1,19,148,18,1,
+1,19,147,18,1,
 19,132,2,0,1,
-20,149,18,1,20,
-150,20,151,4,46,
+20,148,18,1,20,
+149,20,150,4,46,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
@@ -2412,300 +2462,326 @@ public yyLSLSyntax
 116,0,105,0,111,
 0,110,0,76,0,
 105,0,115,0,116,
-0,1,109,1,2,
-2,0,1,21,152,
-18,1,21,153,20,
-154,4,10,67,0,
+0,1,110,1,2,
+2,0,1,21,151,
+18,1,21,152,20,
+153,4,10,67,0,
 79,0,77,0,77,
 0,65,0,1,14,
 1,1,2,0,1,
-1694,155,18,1,1694,
-156,20,157,4,32,
+1694,154,18,1,1694,
+155,20,156,4,32,
 70,0,111,0,114,
 0,76,0,111,0,
 111,0,112,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,1,140,1,
+116,0,1,143,1,
 2,2,0,1,1695,
-158,18,1,1695,153,
-2,0,1,30,159,
-18,1,30,160,20,
-161,4,22,68,0,
+157,18,1,1695,152,
+2,0,1,30,158,
+18,1,30,159,20,
+160,4,22,68,0,
 101,0,99,0,108,
 0,97,0,114,0,
 97,0,116,0,105,
 0,111,0,110,0,
-1,114,1,2,2,
-0,1,31,162,18,
-1,31,163,20,164,
+1,116,1,2,2,
+0,1,31,161,18,
+1,31,162,20,163,
 4,22,82,0,73,
 0,71,0,72,0,
 84,0,95,0,80,
 0,65,0,82,0,
 69,0,78,0,1,
 17,1,1,2,0,
-1,32,165,18,1,
-32,166,20,167,4,
+1,32,164,18,1,
+32,165,20,166,4,
 20,76,0,69,0,
 70,0,84,0,95,
 0,66,0,82,0,
 65,0,67,0,69,
 0,1,12,1,1,
-2,0,1,1114,168,
-18,1,1114,132,2,
-0,1,2735,169,18,
-1,2735,163,2,0,
-1,1152,170,18,1,
-1152,171,20,172,4,
-32,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,1,131,
+2,0,1,2818,167,
+18,1,2818,168,20,
+169,4,48,71,0,
+108,0,111,0,98,
+0,97,0,108,0,
+70,0,117,0,110,
+0,99,0,116,0,
+105,0,111,0,110,
+0,68,0,101,0,
+102,0,105,0,110,
+0,105,0,116,0,
+105,0,111,0,110,
+0,1,99,1,2,
+2,0,1,2819,170,
+18,1,2819,171,20,
+172,4,50,71,0,
+108,0,111,0,98,
+0,97,0,108,0,
+86,0,97,0,114,
+0,105,0,97,0,
+98,0,108,0,101,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,1,98,
 1,2,2,0,1,
-1117,173,18,1,1117,
-174,20,175,4,28,
-80,0,69,0,82,
-0,67,0,69,0,
-78,0,84,0,95,
+2820,104,1,1114,173,
+18,1,1114,132,2,
+0,1,1152,174,18,
+1,1152,175,20,176,
+4,32,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,1,
+134,1,2,2,0,
+1,1117,177,18,1,
+1117,178,20,179,4,
+28,80,0,69,0,
+82,0,67,0,69,
+0,78,0,84,0,
+95,0,69,0,81,
+0,85,0,65,0,
+76,0,83,0,1,
+10,1,1,2,0,
+1,40,180,18,1,
+40,132,2,0,1,
+41,181,18,1,41,
+135,2,0,1,42,
+182,18,1,42,183,
+20,184,4,20,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,1,
+152,1,2,2,0,
+1,43,185,18,1,
+43,186,20,187,4,
+22,82,0,73,0,
+71,0,72,0,84,
+0,95,0,83,0,
+72,0,73,0,70,
+0,84,0,1,41,
+1,1,2,0,1,
+44,188,18,1,44,
+132,2,0,1,1159,
+189,18,1,1159,183,
+2,0,1,46,190,
+18,1,46,191,20,
+192,4,12,80,0,
+69,0,82,0,73,
+0,79,0,68,0,
+1,24,1,1,2,
+0,1,47,193,18,
+1,47,132,2,0,
+1,48,194,18,1,
+48,195,20,196,4,
+18,68,0,69,0,
+67,0,82,0,69,
+0,77,0,69,0,
+78,0,84,0,1,
+5,1,1,2,0,
+1,49,197,18,1,
+49,198,20,199,4,
+18,73,0,78,0,
+67,0,82,0,69,
+0,77,0,69,0,
+78,0,84,0,1,
+4,1,1,2,0,
+1,50,200,18,1,
+50,195,2,0,1,
+51,201,18,1,51,
+198,2,0,1,52,
+202,18,1,52,135,
+2,0,1,2281,203,
+18,1,2281,175,2,
+0,1,2754,204,18,
+1,2754,149,2,0,
+1,1730,205,18,1,
+1730,175,2,0,1,
+1731,206,18,1,1731,
+138,2,0,1,61,
+207,18,1,61,129,
+2,0,1,62,208,
+18,1,62,162,2,
+0,1,63,209,18,
+1,63,132,2,0,
+1,2761,210,18,1,
+2761,211,20,212,4,
+12,69,0,81,0,
+85,0,65,0,76,
+0,83,0,1,15,
+1,1,2,0,1,
+65,213,18,1,65,
+191,2,0,1,66,
+214,18,1,66,132,
+2,0,1,67,215,
+18,1,67,195,2,
+0,1,68,216,18,
+1,68,198,2,0,
+1,69,217,18,1,
+69,195,2,0,1,
+70,218,18,1,70,
+198,2,0,1,71,
+219,18,1,71,135,
+2,0,1,73,220,
+18,1,73,183,2,
+0,1,74,221,18,
+1,74,162,2,0,
+1,1189,222,18,1,
+1189,223,20,224,4,
+22,83,0,84,0,
+65,0,82,0,95,
 0,69,0,81,0,
 85,0,65,0,76,
-0,83,0,1,10,
+0,83,0,1,8,
 1,1,2,0,1,
-40,176,18,1,40,
-132,2,0,1,41,
-177,18,1,41,135,
-2,0,1,42,178,
-18,1,42,179,20,
-180,4,20,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,149,
-1,2,2,0,1,
-43,181,18,1,43,
-182,20,183,4,22,
-82,0,73,0,71,
-0,72,0,84,0,
-95,0,83,0,72,
-0,73,0,70,0,
-84,0,1,41,1,
-1,2,0,1,44,
-184,18,1,44,132,
-2,0,1,1159,185,
-18,1,1159,179,2,
-0,1,46,186,18,
-1,46,187,20,188,
-4,12,80,0,69,
-0,82,0,73,0,
-79,0,68,0,1,
-24,1,1,2,0,
-1,47,189,18,1,
-47,132,2,0,1,
-48,190,18,1,48,
-191,20,192,4,18,
-68,0,69,0,67,
-0,82,0,69,0,
-77,0,69,0,78,
-0,84,0,1,5,
+76,225,18,1,76,
+226,20,227,4,20,
+76,0,69,0,70,
+0,84,0,95,0,
+83,0,72,0,73,
+0,70,0,84,0,
+1,40,1,1,2,
+0,1,1153,228,18,
+1,1153,229,20,230,
+4,24,83,0,76,
+0,65,0,83,0,
+72,0,95,0,69,
+0,81,0,85,0,
+65,0,76,0,83,
+0,1,9,1,1,
+2,0,1,79,231,
+18,1,79,232,20,
+233,4,10,84,0,
+73,0,76,0,68,
+0,69,0,1,36,
 1,1,2,0,1,
-49,193,18,1,49,
-194,20,195,4,18,
-73,0,78,0,67,
-0,82,0,69,0,
-77,0,69,0,78,
-0,84,0,1,4,
+1195,234,18,1,1195,
+183,2,0,1,82,
+235,18,1,82,183,
+2,0,1,1123,236,
+18,1,1123,183,2,
+0,1,85,237,18,
+1,85,238,20,239,
+4,26,83,0,84,
+0,82,0,79,0,
+75,0,69,0,95,
+0,83,0,84,0,
+82,0,79,0,75,
+0,69,0,1,39,
 1,1,2,0,1,
-50,196,18,1,50,
-191,2,0,1,51,
-197,18,1,51,194,
-2,0,1,52,198,
-18,1,52,135,2,
-0,1,2281,199,18,
-1,2281,171,2,0,
-1,1730,200,18,1,
-1730,171,2,0,1,
-1731,201,18,1,1731,
-202,20,203,4,18,
-83,0,69,0,77,
-0,73,0,67,0,
-79,0,76,0,79,
-0,78,0,1,11,
+2547,240,18,1,2547,
+241,20,242,4,28,
+73,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,1,118,
+1,2,2,0,1,
+89,243,18,1,89,
+244,20,245,4,10,
+77,0,73,0,78,
+0,85,0,83,0,
+1,19,1,1,2,
+0,1,2318,246,18,
+1,2318,138,2,0,
+1,2624,247,18,1,
+2624,144,2,0,1,
+93,248,18,1,93,
+183,2,0,1,97,
+249,18,1,97,250,
+20,251,4,14,65,
+0,77,0,80,0,
+95,0,65,0,77,
+0,80,0,1,38,
 1,1,2,0,1,
-61,204,18,1,61,
-129,2,0,1,62,
-205,18,1,62,163,
-2,0,1,63,206,
-18,1,63,132,2,
-0,1,65,207,18,
-1,65,187,2,0,
-1,66,208,18,1,
-66,132,2,0,1,
-67,209,18,1,67,
-191,2,0,1,68,
-210,18,1,68,194,
-2,0,1,69,211,
-18,1,69,191,2,
-0,1,70,212,18,
-1,70,194,2,0,
-1,71,213,18,1,
-71,135,2,0,1,
-73,214,18,1,73,
-179,2,0,1,74,
-215,18,1,74,163,
-2,0,1,1189,216,
-18,1,1189,217,20,
-218,4,22,83,0,
-84,0,65,0,82,
-0,95,0,69,0,
-81,0,85,0,65,
-0,76,0,83,0,
-1,8,1,1,2,
-0,1,76,219,18,
-1,76,220,20,221,
-4,20,76,0,69,
-0,70,0,84,0,
-95,0,83,0,72,
-0,73,0,70,0,
-84,0,1,40,1,
-1,2,0,1,1153,
-222,18,1,1153,223,
-20,224,4,24,83,
+102,252,18,1,102,
+253,20,254,4,22,
+69,0,88,0,67,
 0,76,0,65,0,
-83,0,72,0,95,
+77,0,65,0,84,
+0,73,0,79,0,
+78,0,1,37,1,
+1,2,0,1,1775,
+255,18,1,1775,162,
+2,0,1,107,256,
+18,1,107,183,2,
+0,1,2337,257,18,
+1,2337,162,2,0,
+1,1224,258,18,1,
+1224,175,2,0,1,
+1225,259,18,1,1225,
+260,20,261,4,24,
+77,0,73,0,78,
+0,85,0,83,0,
+95,0,69,0,81,
+0,85,0,65,0,
+76,0,83,0,1,
+7,1,1,2,0,
+1,112,262,18,1,
+112,263,20,264,4,
+28,71,0,82,0,
+69,0,65,0,84,
+0,69,0,82,0,
+95,0,69,0,81,
+0,85,0,65,0,
+76,0,83,0,1,
+32,1,1,2,0,
+1,1188,265,18,1,
+1188,175,2,0,1,
+1231,266,18,1,1231,
+183,2,0,1,118,
+267,18,1,118,183,
+2,0,1,2816,268,
+18,1,2816,168,2,
+0,1,1737,269,18,
+1,1737,183,2,0,
+1,124,270,18,1,
+124,271,20,272,4,
+22,76,0,69,0,
+83,0,83,0,95,
 0,69,0,81,0,
 85,0,65,0,76,
-0,83,0,1,9,
-1,1,2,0,1,
-79,225,18,1,79,
-226,20,227,4,10,
-84,0,73,0,76,
-0,68,0,69,0,
-1,36,1,1,2,
-0,1,1195,228,18,
-1,1195,179,2,0,
-1,82,229,18,1,
-82,179,2,0,1,
-1123,230,18,1,1123,
-179,2,0,1,85,
-231,18,1,85,232,
-20,233,4,26,83,
-0,84,0,82,0,
-79,0,75,0,69,
-0,95,0,83,0,
-84,0,82,0,79,
-0,75,0,69,0,
-1,39,1,1,2,
-0,1,2547,234,18,
-1,2547,235,20,236,
-4,24,86,0,111,
-0,105,0,100,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,1,121,1,2,
-2,0,1,89,237,
-18,1,89,238,20,
-239,4,10,77,0,
-73,0,78,0,85,
-0,83,0,1,19,
+0,83,0,1,31,
 1,1,2,0,1,
-2318,240,18,1,2318,
-202,2,0,1,2788,
-241,18,1,2788,242,
-20,243,4,12,83,
-0,116,0,97,0,
-116,0,101,0,115,
-0,1,100,1,2,
-2,0,1,93,244,
-18,1,93,179,2,
-0,1,97,245,18,
-1,97,246,20,247,
-4,14,65,0,77,
-0,80,0,95,0,
-65,0,77,0,80,
-0,1,38,1,1,
-2,0,1,2795,248,
-18,1,2795,141,2,
-0,1,102,249,18,
-1,102,250,20,251,
-4,22,69,0,88,
-0,67,0,76,0,
-65,0,77,0,65,
-0,84,0,73,0,
-79,0,78,0,1,
-37,1,1,2,0,
-1,1775,252,18,1,
-1775,163,2,0,1,
-107,253,18,1,107,
-179,2,0,1,2337,
-254,18,1,2337,163,
-2,0,1,1224,255,
-18,1,1224,171,2,
-0,1,1225,256,18,
-1,1225,257,20,258,
-4,24,77,0,73,
-0,78,0,85,0,
-83,0,95,0,69,
-0,81,0,85,0,
-65,0,76,0,83,
-0,1,7,1,1,
-2,0,1,112,259,
-18,1,112,260,20,
-261,4,28,71,0,
-82,0,69,0,65,
-0,84,0,69,0,
-82,0,95,0,69,
-0,81,0,85,0,
-65,0,76,0,83,
-0,1,32,1,1,
-2,0,1,1188,262,
-18,1,1188,171,2,
-0,1,1231,263,18,
-1,1231,179,2,0,
-1,118,264,18,1,
-118,179,2,0,1,
-1737,265,18,1,1737,
-179,2,0,1,124,
-266,18,1,124,267,
-20,268,4,22,76,
-0,69,0,83,0,
-83,0,95,0,69,
-0,81,0,85,0,
-65,0,76,0,83,
-0,1,31,1,1,
-2,0,1,2737,269,
-18,1,2737,270,20,
-271,4,34,67,0,
-111,0,109,0,112,
-0,111,0,117,0,
-110,0,100,0,83,
+2821,273,18,1,2821,
+274,23,275,4,6,
+69,0,79,0,70,
+0,1,2,1,6,
+2,0,1,130,276,
+18,1,130,183,2,
+0,1,2742,277,18,
+1,2742,278,20,279,
+4,10,83,0,116,
+0,97,0,116,0,
+101,0,1,101,1,
+2,2,0,1,1803,
+280,18,1,1803,281,
+20,282,4,18,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,1,126,1,
-2,2,0,1,130,
-272,18,1,130,179,
-2,0,1,1803,273,
-18,1,1803,274,20,
-275,4,18,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,1,128,1,2,
-2,0,1,1804,276,
-18,1,1804,277,20,
-278,4,4,68,0,
-79,0,1,44,1,
-1,2,0,1,2364,
-279,18,1,2364,274,
-2,0,1,137,280,
-18,1,137,281,20,
-282,4,36,69,0,
+116,0,1,131,1,
+2,2,0,1,1804,
+283,18,1,1804,284,
+20,285,4,4,68,
+0,79,0,1,44,
+1,1,2,0,1,
+2745,286,18,1,2745,
+135,2,0,1,2364,
+287,18,1,2364,281,
+2,0,1,137,288,
+18,1,137,289,20,
+290,4,36,69,0,
 88,0,67,0,76,
 0,65,0,77,0,
 65,0,84,0,73,
@@ -2714,268 +2790,223 @@ public yyLSLSyntax
 0,85,0,65,0,
 76,0,83,0,1,
 30,1,1,2,0,
-1,2293,283,18,1,
-2293,202,2,0,1,
-1701,284,18,1,1701,
-179,2,0,1,1756,
-285,18,1,1756,202,
-2,0,1,2527,286,
-18,1,2527,163,2,
-0,1,143,287,18,
-1,143,179,2,0,
-1,2299,288,18,1,
-2299,179,2,0,1,
-1260,289,18,1,1260,
-171,2,0,1,1261,
-290,18,1,1261,291,
-20,292,4,22,80,
+1,2293,291,18,1,
+2293,138,2,0,1,
+1701,292,18,1,1701,
+183,2,0,1,1756,
+293,18,1,1756,138,
+2,0,1,2527,294,
+18,1,2527,132,2,
+0,1,143,295,18,
+1,143,183,2,0,
+1,2299,296,18,1,
+2299,183,2,0,1,
+1260,297,18,1,1260,
+175,2,0,1,1261,
+298,18,1,1261,299,
+20,300,4,22,80,
 0,76,0,85,0,
 83,0,95,0,69,
 0,81,0,85,0,
 65,0,76,0,83,
 0,1,6,1,1,
-2,0,1,151,293,
-18,1,151,294,20,
-295,4,26,69,0,
+2,0,1,2528,301,
+18,1,2528,302,20,
+303,4,28,82,0,
+111,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,1,120,1,2,
+2,0,1,151,304,
+18,1,151,305,20,
+306,4,26,69,0,
 81,0,85,0,65,
 0,76,0,83,0,
 95,0,69,0,81,
 0,85,0,65,0,
 76,0,83,0,1,
 29,1,1,2,0,
-1,1267,296,18,1,
-1267,179,2,0,1,
-2765,297,18,1,2765,
-202,2,0,1,157,
-298,18,1,157,179,
-2,0,1,1773,299,
-18,1,1773,156,2,
-0,1,1832,300,18,
-1,1832,274,2,0,
-1,1833,301,18,1,
-1833,302,20,303,4,
+1,2682,307,18,1,
+2682,308,20,309,4,
+18,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,1,
+102,1,2,2,0,
+1,1267,310,18,1,
+1267,183,2,0,1,
+157,311,18,1,157,
+183,2,0,1,2767,
+312,18,1,2767,183,
+2,0,1,1773,313,
+18,1,1773,155,2,
+0,1,1832,314,18,
+1,1832,281,2,0,
+1,1833,315,18,1,
+1833,316,20,317,4,
 10,87,0,72,0,
 73,0,76,0,69,
 0,1,45,1,1,
-2,0,1,1834,304,
+2,0,1,1834,318,
 18,1,1834,135,2,
-0,1,166,305,18,
-1,166,306,20,307,
+0,1,166,319,18,
+1,166,320,20,321,
 4,20,76,0,69,
 0,70,0,84,0,
 95,0,65,0,78,
 0,71,0,76,0,
 69,0,1,25,1,
 1,2,0,1,1840,
-308,18,1,1840,179,
-2,0,1,172,309,
-18,1,172,179,2,
-0,1,2335,310,18,
-1,2335,156,2,0,
-1,1296,311,18,1,
-1296,171,2,0,1,
-1297,312,18,1,1297,
-313,20,314,4,12,
-69,0,81,0,85,
-0,65,0,76,0,
-83,0,1,15,1,
-1,2,0,1,2413,
-315,18,1,2413,316,
-20,317,4,26,83,
+322,18,1,1840,183,
+2,0,1,172,323,
+18,1,172,183,2,
+0,1,2786,324,18,
+1,2786,138,2,0,
+1,2335,325,18,1,
+2335,155,2,0,1,
+1296,326,18,1,1296,
+175,2,0,1,1297,
+327,18,1,1297,211,
+2,0,1,2413,328,
+18,1,2413,329,20,
+330,4,26,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,76,0,105,0,
+115,0,116,0,1,
+130,1,2,2,0,
+1,2635,331,18,1,
+2635,332,20,333,4,
+32,73,0,110,0,
+116,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,1,106,
+1,2,2,0,1,
+1859,334,18,1,1859,
+162,2,0,1,1860,
+335,18,1,1860,138,
+2,0,1,188,336,
+18,1,188,183,2,
+0,1,182,337,18,
+1,182,338,20,339,
+4,22,82,0,73,
+0,71,0,72,0,
+84,0,95,0,65,
+0,78,0,71,0,
+76,0,69,0,1,
+26,1,1,2,0,
+1,199,340,18,1,
+199,341,20,342,4,
+10,67,0,65,0,
+82,0,69,0,84,
+0,1,35,1,1,
+2,0,1,1871,343,
+18,1,1871,175,2,
+0,1,1872,344,18,
+1,1872,162,2,0,
+1,1873,345,18,1,
+1873,138,2,0,1,
+1875,346,18,1,1875,
+316,2,0,1,205,
+347,18,1,205,183,
+2,0,1,1882,348,
+18,1,1882,183,2,
+0,1,2227,349,18,
+1,2227,281,2,0,
+1,217,350,18,1,
+217,351,20,352,4,
+12,83,0,84,0,
+82,0,79,0,75,
+0,69,0,1,34,
+1,1,2,0,1,
+1332,353,18,1,1332,
+175,2,0,1,2743,
+354,18,1,2743,278,
+2,0,1,2744,355,
+18,1,2744,132,2,
+0,1,1335,356,18,
+1,1335,178,2,0,
+1,223,357,18,1,
+223,183,2,0,1,
+1341,358,18,1,1341,
+183,2,0,1,1901,
+359,18,1,1901,162,
+2,0,1,1303,360,
+18,1,1303,183,2,
+0,1,2462,361,18,
+1,2462,281,2,0,
+1,2756,362,18,1,
+2756,162,2,0,1,
+236,363,18,1,236,
+364,20,365,4,6,
+65,0,77,0,80,
+0,1,33,1,1,
+2,0,1,2466,366,
+18,1,2466,367,20,
+368,4,34,67,0,
+111,0,109,0,112,
+0,111,0,117,0,
+110,0,100,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,76,0,105,
-0,115,0,116,0,
-1,127,1,2,2,
-0,1,1859,318,18,
-1,1859,163,2,0,
-1,1860,319,18,1,
-1860,202,2,0,1,
-188,320,18,1,188,
-179,2,0,1,182,
-321,18,1,182,322,
-20,323,4,22,82,
-0,73,0,71,0,
-72,0,84,0,95,
-0,65,0,78,0,
-71,0,76,0,69,
-0,1,26,1,1,
-2,0,1,199,324,
-18,1,199,325,20,
-326,4,10,67,0,
-65,0,82,0,69,
-0,84,0,1,35,
+116,0,1,129,1,
+2,2,0,1,2467,
+369,18,1,2467,159,
+2,0,1,2468,370,
+18,1,2468,371,20,
+372,4,10,83,0,
+84,0,65,0,84,
+0,69,0,1,48,
 1,1,2,0,1,
-1871,327,18,1,1871,
-171,2,0,1,1872,
-328,18,1,1872,163,
-2,0,1,1873,329,
-18,1,1873,202,2,
-0,1,1875,330,18,
-1,1875,302,2,0,
-1,205,331,18,1,
-205,179,2,0,1,
-1882,332,18,1,1882,
-179,2,0,1,2227,
-333,18,1,2227,274,
-2,0,1,217,334,
-18,1,217,335,20,
-336,4,12,83,0,
-84,0,82,0,79,
-0,75,0,69,0,
-1,34,1,1,2,
-0,1,1332,337,18,
-1,1332,171,2,0,
-1,1335,338,18,1,
-1335,174,2,0,1,
-223,339,18,1,223,
-179,2,0,1,1341,
-340,18,1,1341,179,
-2,0,1,1901,341,
-18,1,1901,163,2,
-0,1,1303,342,18,
-1,1303,179,2,0,
-1,2462,343,18,1,
-2462,274,2,0,1,
-236,344,18,1,236,
-345,20,346,4,6,
-65,0,77,0,80,
-0,1,33,1,1,
-2,0,1,2466,347,
-18,1,2466,270,2,
-0,1,2467,348,18,
-1,2467,160,2,0,
-1,2468,349,18,1,
-2468,350,20,351,4,
-10,83,0,84,0,
-65,0,84,0,69,
-0,1,48,1,1,
-2,0,1,2469,352,
-18,1,2469,132,2,
-0,1,242,353,18,
-1,242,179,2,0,
-1,2471,354,18,1,
-2471,355,20,356,4,
-38,65,0,84,0,
-95,0,82,0,79,
-0,84,0,95,0,
-84,0,65,0,82,
-0,71,0,69,0,
-84,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-58,1,1,2,0,
-1,2472,357,18,1,
-2472,358,20,359,4,
-52,76,0,65,0,
-78,0,68,0,95,
-0,67,0,79,0,
-76,0,76,0,73,
-0,83,0,73,0,
-79,0,78,0,95,
-0,83,0,84,0,
-65,0,82,0,84,
+2469,373,18,1,2469,
+132,2,0,1,242,
+374,18,1,242,183,
+2,0,1,2471,375,
+18,1,2471,376,20,
+377,4,30,65,0,
+84,0,95,0,84,
+0,65,0,82,0,
+71,0,69,0,84,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,71,
+0,84,0,1,59,
 1,1,2,0,1,
-2473,360,18,1,2473,
-361,20,362,4,48,
-76,0,65,0,78,
-0,68,0,95,0,
-67,0,79,0,76,
-0,76,0,73,0,
-83,0,73,0,79,
-0,78,0,95,0,
-69,0,78,0,68,
+2472,378,18,1,2472,
+379,20,380,4,38,
+65,0,84,0,95,
+0,82,0,79,0,
+84,0,95,0,84,
+0,65,0,82,0,
+71,0,69,0,84,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,70,
+0,84,0,1,58,
 1,1,2,0,1,
-2474,363,18,1,2474,
-364,20,365,4,40,
+2473,381,18,1,2473,
+382,20,383,4,52,
 76,0,65,0,78,
 0,68,0,95,0,
 67,0,79,0,76,
 0,76,0,73,0,
 83,0,73,0,79,
 0,78,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,69,1,1,2,
-0,1,2475,366,18,
-1,2475,367,20,368,
-4,34,84,0,79,
-0,85,0,67,0,
-72,0,95,0,83,
-0,84,0,65,0,
-82,0,84,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,89,1,1,
-2,0,1,2476,369,
-18,1,2476,370,20,
-371,4,30,84,0,
-79,0,85,0,67,
-0,72,0,95,0,
-69,0,78,0,68,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,90,
-1,1,2,0,1,
-2477,372,18,1,2477,
-373,20,374,4,22,
-84,0,79,0,85,
-0,67,0,72,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,88,1,
-1,2,0,1,2478,
-375,18,1,2478,376,
-20,377,4,24,83,
-0,69,0,78,0,
-83,0,79,0,82,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,84,
-1,1,2,0,1,
-2479,378,18,1,2479,
-379,20,380,4,52,
-82,0,85,0,78,
-0,95,0,84,0,
-73,0,77,0,69,
-0,95,0,80,0,
-69,0,82,0,77,
-0,73,0,83,0,
-83,0,73,0,79,
-0,78,0,83,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,83,1,
-1,2,0,1,2480,
-381,18,1,2480,382,
-20,383,4,24,79,
-0,78,0,95,0,
-82,0,69,0,90,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,81,
-1,1,2,0,1,
-2481,384,18,1,2481,
-385,20,386,4,42,
-67,0,79,0,76,
-0,76,0,73,0,
-83,0,73,0,79,
-0,78,0,95,0,
 83,0,84,0,65,
 0,82,0,84,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,64,1,
-1,2,0,1,2482,
-387,18,1,2482,388,
-20,389,4,38,67,
+84,0,1,71,1,
+1,2,0,1,2474,
+384,18,1,2474,385,
+20,386,4,48,76,
+0,65,0,78,0,
+68,0,95,0,67,
 0,79,0,76,0,
 76,0,73,0,83,
 0,73,0,79,0,
@@ -2983,64 +3014,159 @@ public yyLSLSyntax
 0,78,0,68,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,63,1,
-1,2,0,1,2483,
-390,18,1,2483,391,
-20,392,4,30,67,
+84,0,1,70,1,
+1,2,0,1,2475,
+387,18,1,2475,388,
+20,389,4,40,76,
+0,65,0,78,0,
+68,0,95,0,67,
 0,79,0,76,0,
 76,0,73,0,83,
 0,73,0,79,0,
 78,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
-62,1,1,2,0,
-1,256,393,18,1,
-256,394,20,395,4,
-14,80,0,69,0,
-82,0,67,0,69,
-0,78,0,84,0,
-1,22,1,1,2,
-0,1,1371,396,18,
-1,1371,223,2,0,
-1,2486,397,18,1,
-2486,398,20,399,4,
-24,65,0,84,0,
-84,0,65,0,67,
-0,72,0,95,0,
+69,1,1,2,0,
+1,2476,390,18,1,
+2476,391,20,392,4,
+34,84,0,79,0,
+85,0,67,0,72,
+0,95,0,83,0,
+84,0,65,0,82,
+0,84,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,60,1,1,2,
-0,1,2487,400,18,
-1,2487,401,20,402,
-4,22,84,0,73,
+1,89,1,1,2,
+0,1,2477,393,18,
+1,2477,394,20,395,
+4,30,84,0,79,
+0,85,0,67,0,
+72,0,95,0,69,
+0,78,0,68,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,90,1,
+1,2,0,1,2478,
+396,18,1,2478,397,
+20,398,4,22,84,
+0,79,0,85,0,
+67,0,72,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,88,1,1,
+2,0,1,2479,399,
+18,1,2479,400,20,
+401,4,24,83,0,
+69,0,78,0,83,
+0,79,0,82,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,84,1,
+1,2,0,1,2480,
+402,18,1,2480,403,
+20,404,4,52,82,
+0,85,0,78,0,
+95,0,84,0,73,
 0,77,0,69,0,
-82,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-87,1,1,2,0,
-1,1931,403,18,1,
-1931,274,2,0,1,
-1932,404,18,1,1932,
-405,20,406,4,4,
-73,0,70,0,1,
-42,1,1,2,0,
-1,262,407,18,1,
-262,179,2,0,1,
-1377,408,18,1,1377,
-179,2,0,1,2492,
-409,18,1,2492,410,
-20,411,4,32,77,
-0,79,0,86,0,
-73,0,78,0,71,
+95,0,80,0,69,
+0,82,0,77,0,
+73,0,83,0,83,
+0,73,0,79,0,
+78,0,83,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,83,1,1,
+2,0,1,2481,405,
+18,1,2481,406,20,
+407,4,24,79,0,
+78,0,95,0,82,
+0,69,0,90,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,81,1,
+1,2,0,1,2482,
+408,18,1,2482,409,
+20,410,4,42,67,
+0,79,0,76,0,
+76,0,73,0,83,
+0,73,0,79,0,
+78,0,95,0,83,
+0,84,0,65,0,
+82,0,84,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,64,1,1,
+2,0,1,2483,411,
+18,1,2483,412,20,
+413,4,38,67,0,
+79,0,76,0,76,
+0,73,0,83,0,
+73,0,79,0,78,
 0,95,0,69,0,
 78,0,68,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,75,1,1,
-2,0,1,1876,412,
-18,1,1876,135,2,
-0,1,2494,413,18,
-1,2494,414,20,415,
+0,1,63,1,1,
+2,0,1,256,414,
+18,1,256,415,20,
+416,4,14,80,0,
+69,0,82,0,67,
+0,69,0,78,0,
+84,0,1,22,1,
+1,2,0,1,1371,
+417,18,1,1371,229,
+2,0,1,2486,418,
+18,1,2486,419,20,
+420,4,32,79,0,
+66,0,74,0,69,
+0,67,0,84,0,
+95,0,82,0,69,
+0,90,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,80,1,1,2,
+0,1,2487,421,18,
+1,2487,422,20,423,
+4,24,65,0,84,
+0,84,0,65,0,
+67,0,72,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,60,1,1,
+2,0,1,1931,424,
+18,1,1931,281,2,
+0,1,1932,425,18,
+1,1932,426,20,427,
+4,4,73,0,70,
+0,1,42,1,1,
+2,0,1,262,428,
+18,1,262,183,2,
+0,1,1377,429,18,
+1,1377,183,2,0,
+1,2492,430,18,1,
+2492,431,20,432,4,
+36,77,0,79,0,
+86,0,73,0,78,
+0,71,0,95,0,
+83,0,84,0,65,
+0,82,0,84,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,76,1,
+1,2,0,1,1876,
+433,18,1,1876,135,
+2,0,1,2494,434,
+18,1,2494,435,20,
+436,4,32,83,0,
+84,0,65,0,84,
+0,69,0,95,0,
+69,0,88,0,73,
+0,84,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,86,1,1,2,
+0,1,2495,437,18,
+1,2495,438,20,439,
 4,34,83,0,84,
 0,65,0,84,0,
 69,0,95,0,69,
@@ -3049,31 +3175,31 @@ public yyLSLSyntax
 0,69,0,86,0,
 69,0,78,0,84,
 0,1,85,1,1,
-2,0,1,2495,416,
-18,1,2495,417,20,
-418,4,36,72,0,
-84,0,84,0,80,
-0,95,0,82,0,
-69,0,81,0,85,
-0,69,0,83,0,
-84,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-91,1,1,2,0,
-1,1939,419,18,1,
-1939,179,2,0,1,
-2497,420,18,1,2497,
-421,20,422,4,22,
-77,0,79,0,78,
-0,69,0,89,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,74,1,
-1,2,0,1,827,
-423,18,1,827,179,
-2,0,1,2499,424,
-18,1,2499,425,20,
-426,4,36,76,0,
+2,0,1,1939,440,
+18,1,1939,183,2,
+0,1,2497,441,18,
+1,2497,442,20,443,
+4,34,82,0,69,
+0,77,0,79,0,
+84,0,69,0,95,
+0,68,0,65,0,
+84,0,65,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,82,1,1,
+2,0,1,827,444,
+18,1,827,183,2,
+0,1,2499,445,18,
+1,2499,446,20,447,
+4,24,76,0,73,
+0,83,0,84,0,
+69,0,78,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,73,1,1,
+2,0,1,2500,448,
+18,1,2500,449,20,
+450,4,36,76,0,
 73,0,78,0,75,
 0,95,0,77,0,
 69,0,83,0,83,
@@ -3082,8 +3208,8 @@ public yyLSLSyntax
 0,86,0,69,0,
 78,0,84,0,1,
 72,1,1,2,0,
-1,2500,427,18,1,
-2500,428,20,429,4,
+1,2501,451,18,1,
+2501,452,20,453,4,
 38,72,0,84,0,
 84,0,80,0,95,
 0,82,0,69,0,
@@ -3093,16 +3219,16 @@ public yyLSLSyntax
 0,86,0,69,0,
 78,0,84,0,1,
 68,1,1,2,0,
-1,2501,430,18,1,
-2501,431,20,432,4,
+1,2502,454,18,1,
+2502,455,20,456,4,
 22,69,0,77,0,
 65,0,73,0,76,
 0,95,0,69,0,
 86,0,69,0,78,
 0,84,0,1,67,
 1,1,2,0,1,
-2502,433,18,1,2502,
-434,20,435,4,32,
+2503,457,18,1,2503,
+458,20,459,4,32,
 68,0,65,0,84,
 0,65,0,83,0,
 69,0,82,0,86,
@@ -3110,1081 +3236,1065 @@ public yyLSLSyntax
 95,0,69,0,86,
 0,69,0,78,0,
 84,0,1,66,1,
-1,2,0,1,2503,
-436,18,1,2503,437,
-20,438,4,26,67,
+1,2,0,1,2504,
+460,18,1,2504,461,
+20,462,4,26,67,
 0,79,0,78,0,
 84,0,82,0,79,
 0,76,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
 1,65,1,1,2,
-0,1,2504,439,18,
-1,2504,440,20,441,
-4,30,65,0,84,
-0,95,0,84,0,
-65,0,82,0,71,
-0,69,0,84,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,59,1,
-1,2,0,1,277,
-442,18,1,277,443,
-20,444,4,10,83,
-0,76,0,65,0,
-83,0,72,0,1,
-21,1,1,2,0,
-1,2506,445,18,1,
-2506,135,2,0,1,
-2507,446,18,1,2507,
-126,2,0,1,2508,
-447,18,1,2508,132,
-2,0,1,2509,448,
-18,1,2509,449,20,
-450,4,28,73,0,
-110,0,116,0,68,
+0,1,277,463,18,
+1,277,464,20,465,
+4,10,83,0,76,
+0,65,0,83,0,
+72,0,1,21,1,
+1,2,0,1,2506,
+466,18,1,2506,135,
+2,0,1,2507,467,
+18,1,2507,126,2,
+0,1,2508,468,18,
+1,2508,132,2,0,
+1,2509,469,18,1,
+2509,241,2,0,1,
+2510,470,18,1,2510,
+152,2,0,1,283,
+471,18,1,283,183,
+2,0,1,2512,472,
+18,1,2512,132,2,
+0,1,2513,473,18,
+1,2513,474,20,475,
+4,34,86,0,101,
+0,99,0,116,0,
+111,0,114,0,68,
 0,101,0,99,0,
 108,0,97,0,114,
 0,97,0,116,0,
 105,0,111,0,110,
-0,1,116,1,2,
-2,0,1,2510,451,
-18,1,2510,153,2,
-0,1,283,452,18,
-1,283,179,2,0,
-1,2512,453,18,1,
-2512,132,2,0,1,
-2513,454,18,1,2513,
-455,20,456,4,28,
-82,0,111,0,116,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,1,118,
-1,2,2,0,1,
-2514,457,18,1,2514,
-153,2,0,1,1958,
-458,18,1,1958,163,
-2,0,1,2516,459,
-18,1,2516,455,2,
-0,1,2517,460,18,
-1,2517,461,20,462,
-4,64,73,0,110,
-0,116,0,82,0,
-111,0,116,0,82,
-0,111,0,116,0,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,76,0,
-105,0,115,0,116,
-0,1,113,1,2,
-2,0,1,2518,463,
-18,1,2518,163,2,
-0,1,1406,464,18,
-1,1406,171,2,0,
-1,1407,465,18,1,
-1407,217,2,0,1,
-2522,466,18,1,2522,
-135,2,0,1,2523,
-467,18,1,2523,114,
-2,0,1,2524,468,
-18,1,2524,132,2,
-0,1,2525,469,18,
-1,2525,470,20,471,
-4,34,86,0,101,
-0,99,0,116,0,
-111,0,114,0,68,
+0,1,119,1,2,
+2,0,1,2514,476,
+18,1,2514,152,2,
+0,1,1958,477,18,
+1,1958,162,2,0,
+1,2516,478,18,1,
+2516,474,2,0,1,
+2517,479,18,1,2517,
+480,20,481,4,64,
+73,0,110,0,116,
+0,86,0,101,0,
+99,0,86,0,101,
+0,99,0,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
 0,101,0,99,0,
 108,0,97,0,114,
 0,97,0,116,0,
 105,0,111,0,110,
-0,1,117,1,2,
-2,0,1,2526,472,
-18,1,2526,473,20,
-474,4,58,86,0,
-101,0,99,0,116,
-0,111,0,114,0,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,76,0,
-105,0,115,0,116,
-0,1,112,1,2,
-2,0,1,299,475,
-18,1,299,476,20,
-477,4,8,83,0,
+0,76,0,105,0,
+115,0,116,0,1,
+115,1,2,2,0,
+1,2518,482,18,1,
+2518,162,2,0,1,
+2809,483,18,1,2809,
+484,20,485,4,12,
+83,0,116,0,97,
+0,116,0,101,0,
+115,0,1,100,1,
+2,2,0,1,1406,
+486,18,1,1406,175,
+2,0,1,1407,487,
+18,1,1407,223,2,
+0,1,2522,488,18,
+1,2522,135,2,0,
+1,2524,489,18,1,
+2524,241,2,0,1,
+2525,490,18,1,2525,
+152,2,0,1,2526,
+491,18,1,2526,111,
+2,0,1,299,492,
+18,1,299,493,20,
+494,4,8,83,0,
 84,0,65,0,82,
 0,1,20,1,1,
-2,0,1,1370,478,
-18,1,1370,171,2,
-0,1,2529,479,18,
-1,2529,270,2,0,
-1,2530,480,18,1,
-2530,481,20,482,4,
-22,73,0,110,0,
-116,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,1,123,
+2,0,1,1370,495,
+18,1,1370,175,2,
+0,1,2529,496,18,
+1,2529,152,2,0,
+1,2817,497,18,1,
+2817,171,2,0,1,
+2531,498,18,1,2531,
+302,2,0,1,2532,
+499,18,1,2532,500,
+20,501,4,64,73,
+0,110,0,116,0,
+82,0,111,0,116,
+0,82,0,111,0,
+116,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+76,0,105,0,115,
+0,116,0,1,114,
+1,2,2,0,1,
+305,502,18,1,305,
+183,2,0,1,2535,
+503,18,1,2535,367,
+2,0,1,2458,504,
+18,1,2458,281,2,
+0,1,2459,505,18,
+1,2459,506,20,507,
+4,22,82,0,73,
+0,71,0,72,0,
+84,0,95,0,66,
+0,82,0,65,0,
+67,0,69,0,1,
+13,1,1,2,0,
+1,2539,508,18,1,
+2539,474,2,0,1,
+2540,509,18,1,2540,
+510,20,511,4,58,
+86,0,101,0,99,
+0,116,0,111,0,
+114,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+76,0,105,0,115,
+0,116,0,1,113,
 1,2,2,0,1,
-2531,483,18,1,2531,
-135,2,0,1,305,
-484,18,1,305,179,
-2,0,1,2534,485,
-18,1,2534,486,20,
-487,4,52,73,0,
+2541,512,18,1,2541,
+162,2,0,1,2464,
+513,18,1,2464,506,
+2,0,1,2544,514,
+18,1,2544,515,20,
+516,4,22,73,0,
 110,0,116,0,65,
 0,114,0,103,0,
-117,0,109,0,101,
+69,0,118,0,101,
 0,110,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
-1,111,1,2,2,
-0,1,2535,488,18,
-1,2535,163,2,0,
-1,2458,489,18,1,
-2458,274,2,0,1,
-2459,490,18,1,2459,
-491,20,492,4,22,
-82,0,73,0,71,
-0,72,0,84,0,
-95,0,66,0,82,
-0,65,0,67,0,
-69,0,1,13,1,
-1,2,0,1,2538,
-493,18,1,2538,494,
-20,495,4,22,75,
-0,101,0,121,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,1,122,1,2,
-2,0,1,2539,496,
-18,1,2539,135,2,
-0,1,2540,497,18,
-1,2540,117,2,0,
-1,2541,498,18,1,
-2541,132,2,0,1,
-2542,499,18,1,2542,
-500,20,501,4,28,
-75,0,101,0,121,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,1,115,
-1,2,2,0,1,
-2464,502,18,1,2464,
-491,2,0,1,2544,
-503,18,1,2544,163,
-2,0,1,1989,504,
-18,1,1989,274,2,
-0,1,1990,505,18,
-1,1990,506,20,507,
-4,8,69,0,76,
-0,83,0,69,0,
-1,43,1,1,2,
-0,1,2548,508,18,
-1,2548,135,2,0,
-1,2470,509,18,1,
-2470,166,2,0,1,
-322,510,18,1,322,
-238,2,0,1,2551,
-511,18,1,2551,270,
-2,0,1,1933,512,
-18,1,1933,135,2,
-0,1,2553,513,18,
-1,2553,135,2,0,
-1,883,514,18,1,
-883,179,2,0,1,
-328,515,18,1,328,
-179,2,0,1,1443,
-516,18,1,1443,257,
-2,0,1,2562,517,
-18,1,2562,150,2,
-0,1,1449,518,18,
-1,1449,179,2,0,
-1,2485,519,18,1,
-2485,520,20,521,4,
-32,79,0,66,0,
-74,0,69,0,67,
-0,84,0,95,0,
-82,0,69,0,90,
+1,125,1,2,2,
+0,1,2545,517,18,
+1,2545,135,2,0,
+1,1989,518,18,1,
+1989,281,2,0,1,
+1990,519,18,1,1990,
+520,20,521,4,8,
+69,0,76,0,83,
+0,69,0,1,43,
+1,1,2,0,1,
+2548,522,18,1,2548,
+523,20,524,4,52,
+73,0,110,0,116,
+0,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,76,
+0,105,0,115,0,
+116,0,1,112,1,
+2,2,0,1,2470,
+525,18,1,2470,165,
+2,0,1,322,526,
+18,1,322,244,2,
+0,1,2551,527,18,
+1,2551,367,2,0,
+1,1933,528,18,1,
+1933,135,2,0,1,
+2553,529,18,1,2553,
+135,2,0,1,883,
+530,18,1,883,183,
+2,0,1,2555,531,
+18,1,2555,132,2,
+0,1,328,532,18,
+1,328,183,2,0,
+1,1443,533,18,1,
+1443,260,2,0,1,
+2558,534,18,1,2558,
+162,2,0,1,2560,
+535,18,1,2560,367,
+2,0,1,2561,536,
+18,1,2561,537,20,
+538,4,24,86,0,
+111,0,105,0,100,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,1,123,1,
+2,2,0,1,2562,
+539,18,1,2562,135,
+2,0,1,1449,540,
+18,1,1449,183,2,
+0,1,2485,541,18,
+1,2485,542,20,543,
+4,26,67,0,72,
+0,65,0,78,0,
+71,0,69,0,68,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,61,
+1,1,2,0,1,
+2565,544,18,1,2565,
+367,2,0,1,2566,
+545,18,1,2566,546,
+20,547,4,10,69,
+0,118,0,101,0,
+110,0,116,0,1,
+122,1,2,2,0,
+1,2488,548,18,1,
+2488,549,20,550,4,
+22,84,0,73,0,
+77,0,69,0,82,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,87,
+1,1,2,0,1,
+2489,551,18,1,2489,
+552,20,553,4,38,
+78,0,79,0,84,
+0,95,0,65,0,
+84,0,95,0,84,
+0,65,0,82,0,
+71,0,69,0,84,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,80,
+0,84,0,1,79,
 1,1,2,0,1,
-2566,522,18,1,2566,
-270,2,0,1,2488,
-523,18,1,2488,524,
-20,525,4,38,78,
+2490,554,18,1,2490,
+555,20,556,4,46,
+78,0,79,0,84,
+0,95,0,65,0,
+84,0,95,0,82,
 0,79,0,84,0,
-95,0,65,0,84,
-0,95,0,84,0,
-65,0,82,0,71,
-0,69,0,84,0,
-95,0,69,0,86,
+95,0,84,0,65,
+0,82,0,71,0,
+69,0,84,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,78,1,1,
+2,0,1,2491,557,
+18,1,2491,558,20,
+559,4,30,78,0,
+79,0,95,0,83,
 0,69,0,78,0,
-84,0,1,79,1,
-1,2,0,1,2489,
-526,18,1,2489,527,
-20,528,4,46,78,
-0,79,0,84,0,
-95,0,65,0,84,
-0,95,0,82,0,
-79,0,84,0,95,
-0,84,0,65,0,
-82,0,71,0,69,
-0,84,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,78,1,1,2,
-0,1,2490,529,18,
-1,2490,530,20,531,
-4,30,78,0,79,
-0,95,0,83,0,
-69,0,78,0,83,
-0,79,0,82,0,
+83,0,79,0,82,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,77,
+1,1,2,0,1,
+2493,560,18,1,2493,
+561,20,562,4,32,
+77,0,79,0,86,
+0,73,0,78,0,
+71,0,95,0,69,
+0,78,0,68,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,77,1,
-1,2,0,1,2491,
-532,18,1,2491,533,
-20,534,4,36,77,
-0,79,0,86,0,
-73,0,78,0,71,
-0,95,0,83,0,
-84,0,65,0,82,
-0,84,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,76,1,1,2,
-0,1,2493,535,18,
-1,2493,536,20,537,
-4,32,83,0,84,
-0,65,0,84,0,
-69,0,95,0,69,
-0,88,0,73,0,
+84,0,1,75,1,
+1,2,0,1,1413,
+563,18,1,1413,183,
+2,0,1,346,564,
+18,1,346,565,20,
+566,4,8,80,0,
+76,0,85,0,83,
+0,1,18,1,1,
+2,0,1,2496,567,
+18,1,2496,568,20,
+569,4,36,72,0,
+84,0,84,0,80,
+0,95,0,82,0,
+69,0,81,0,85,
+0,69,0,83,0,
 84,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
-86,1,1,2,0,
-1,1413,538,18,1,
-1413,179,2,0,1,
-346,539,18,1,346,
-540,20,541,4,8,
-80,0,76,0,85,
-0,83,0,1,18,
-1,1,2,0,1,
-2496,542,18,1,2496,
-543,20,544,4,34,
-82,0,69,0,77,
-0,79,0,84,0,
-69,0,95,0,68,
-0,65,0,84,0,
-65,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-82,1,1,2,0,
-1,2021,545,18,1,
-2021,274,2,0,1,
-2022,546,18,1,2022,
-350,2,0,1,352,
-547,18,1,352,179,
-2,0,1,2024,548,
+91,1,1,2,0,
+1,2021,570,18,1,
+2021,281,2,0,1,
+2022,571,18,1,2022,
+371,2,0,1,352,
+572,18,1,352,183,
+2,0,1,2024,573,
 18,1,2024,132,2,
-0,1,2025,549,18,
-1,2025,550,20,551,
+0,1,2025,574,18,
+1,2025,575,20,576,
 4,8,74,0,85,
 0,77,0,80,0,
 1,49,1,1,2,
-0,1,2026,552,18,
+0,1,2026,577,18,
 1,2026,132,2,0,
-1,2027,553,18,1,
-2027,554,20,555,4,
+1,2027,578,18,1,
+2027,579,20,580,4,
 4,65,0,84,0,
 1,23,1,1,2,
-0,1,2028,556,18,
+0,1,2028,581,18,
 1,2028,132,2,0,
-1,2029,557,18,1,
-2029,270,2,0,1,
-2030,558,18,1,2030,
-559,20,560,4,14,
+1,2029,582,18,1,
+2029,367,2,0,1,
+2030,583,18,1,2030,
+584,20,585,4,14,
 70,0,111,0,114,
 0,76,0,111,0,
 111,0,112,0,1,
-139,1,2,2,0,
-1,2031,561,18,1,
-2031,562,20,563,4,
+142,1,2,2,0,
+1,2031,586,18,1,
+2031,587,20,588,4,
 32,68,0,111,0,
 87,0,104,0,105,
 0,108,0,101,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
-0,116,0,1,138,
+0,116,0,1,141,
 1,2,2,0,1,
-2032,564,18,1,2032,
-565,20,566,4,28,
+2032,589,18,1,2032,
+590,20,591,4,28,
 87,0,104,0,105,
 0,108,0,101,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
-0,116,0,1,137,
+0,116,0,1,140,
 1,2,2,0,1,
-2033,567,18,1,2033,
-568,20,569,4,22,
+2033,592,18,1,2033,
+593,20,594,4,22,
 73,0,102,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,1,136,1,
+116,0,1,139,1,
 2,2,0,1,2034,
-570,18,1,2034,571,
-20,572,4,22,83,
+595,18,1,2034,596,
+20,597,4,22,83,
 0,116,0,97,0,
 116,0,101,0,67,
 0,104,0,97,0,
 110,0,103,0,101,
-0,1,135,1,2,
-2,0,1,1478,573,
-18,1,1478,171,2,
-0,1,1479,574,18,
-1,1479,291,2,0,
-1,2037,575,18,1,
-2037,202,2,0,1,
-2038,576,18,1,2038,
-577,20,578,4,18,
+0,1,138,1,2,
+2,0,1,1478,598,
+18,1,1478,175,2,
+0,1,1479,599,18,
+1,1479,299,2,0,
+1,2037,600,18,1,
+2037,138,2,0,1,
+2038,601,18,1,2038,
+602,20,603,4,18,
 74,0,117,0,109,
 0,112,0,76,0,
 97,0,98,0,101,
-0,108,0,1,133,
+0,108,0,1,136,
 1,2,2,0,1,
-2039,579,18,1,2039,
-202,2,0,1,2040,
-580,18,1,2040,581,
-20,582,4,30,82,
+2039,604,18,1,2039,
+138,2,0,1,2040,
+605,18,1,2040,606,
+20,607,4,30,82,
 0,101,0,116,0,
 117,0,114,0,110,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,1,
-132,1,2,2,0,
-1,2041,583,18,1,
-2041,202,2,0,1,
-1485,584,18,1,1485,
-179,2,0,1,372,
-585,18,1,372,191,
-2,0,1,373,586,
+135,1,2,2,0,
+1,2041,608,18,1,
+2041,138,2,0,1,
+1485,609,18,1,1485,
+183,2,0,1,372,
+610,18,1,372,195,
+2,0,1,373,611,
 18,1,373,132,2,
-0,1,374,587,18,
-1,374,187,2,0,
-1,375,588,18,1,
+0,1,374,612,18,
+1,374,191,2,0,
+1,375,613,18,1,
 375,132,2,0,1,
-376,589,18,1,376,
-194,2,0,1,377,
-590,18,1,377,132,
-2,0,1,378,591,
-18,1,378,187,2,
-0,1,379,592,18,
+376,614,18,1,376,
+198,2,0,1,377,
+615,18,1,377,132,
+2,0,1,378,616,
+18,1,378,191,2,
+0,1,379,617,18,
 1,379,132,2,0,
-1,380,593,18,1,
-380,594,20,595,4,
+1,380,618,18,1,
+380,619,20,620,4,
 16,67,0,111,0,
 110,0,115,0,116,
 0,97,0,110,0,
-116,0,1,145,1,
+116,0,1,148,1,
 2,2,0,1,381,
-596,18,1,381,306,
-2,0,1,2610,597,
-18,1,2610,598,20,
-599,4,38,86,0,
-101,0,99,0,116,
-0,111,0,114,0,
-65,0,114,0,103,
-0,83,0,116,0,
-97,0,116,0,101,
-0,69,0,118,0,
-101,0,110,0,116,
-0,1,107,1,2,
-2,0,1,2611,600,
-18,1,2611,601,20,
-602,4,32,73,0,
-110,0,116,0,65,
-0,114,0,103,0,
-83,0,116,0,97,
-0,116,0,101,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,106,1,2,2,
-0,1,371,603,18,
-1,371,604,20,605,
-4,24,70,0,117,
-0,110,0,99,0,
-116,0,105,0,111,
-0,110,0,67,0,
-97,0,108,0,108,
-0,1,141,1,2,
-2,0,1,942,606,
-18,1,942,179,2,
-0,1,2533,607,18,
-1,2533,449,2,0,
-1,387,608,18,1,
-387,179,2,0,1,
-2616,609,18,1,2616,
-610,20,611,4,44,
-73,0,110,0,116,
-0,82,0,111,0,
-116,0,82,0,111,
-0,116,0,65,0,
-114,0,103,0,83,
-0,116,0,97,0,
-116,0,101,0,69,
+621,18,1,381,320,
+2,0,1,371,622,
+18,1,371,623,20,
+624,4,24,70,0,
+117,0,110,0,99,
+0,116,0,105,0,
+111,0,110,0,67,
+0,97,0,108,0,
+108,0,1,144,1,
+2,2,0,1,942,
+625,18,1,942,183,
+2,0,1,2533,626,
+18,1,2533,162,2,
+0,1,387,627,18,
+1,387,183,2,0,
+1,2536,628,18,1,
+2536,629,20,630,4,
+28,86,0,101,0,
+99,0,116,0,111,
+0,114,0,65,0,
+114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,1,
-108,1,2,2,0,
-1,2617,612,18,1,
-2617,598,2,0,1,
-2537,613,18,1,2537,
-270,2,0,1,2619,
-614,18,1,2619,615,
-20,616,4,32,75,
+126,1,2,2,0,
+1,2537,631,18,1,
+2537,135,2,0,1,
+2543,632,18,1,2543,
+367,2,0,1,2625,
+633,18,1,2625,634,
+20,635,4,44,73,
+0,110,0,116,0,
+82,0,111,0,116,
+0,82,0,111,0,
+116,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,1,108,
+1,2,2,0,1,
+2626,636,18,1,2626,
+637,20,638,4,38,
+86,0,101,0,99,
+0,116,0,111,0,
+114,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,1,107,
+1,2,2,0,1,
+2627,639,18,1,2627,
+332,2,0,1,1514,
+640,18,1,1514,175,
+2,0,1,1515,641,
+18,1,1515,211,2,
+0,1,2549,642,18,
+1,2549,162,2,0,
+1,2074,643,18,1,
+2074,175,2,0,1,
+2075,644,18,1,2075,
+162,2,0,1,2552,
+645,18,1,2552,646,
+20,647,4,22,75,
 0,101,0,121,0,
 65,0,114,0,103,
-0,83,0,116,0,
-97,0,116,0,101,
 0,69,0,118,0,
 101,0,110,0,116,
-0,1,105,1,2,
-2,0,1,2620,617,
-18,1,2620,618,20,
-619,4,34,86,0,
-111,0,105,0,100,
+0,1,124,1,2,
+2,0,1,406,648,
+18,1,406,152,2,
+0,1,1521,649,18,
+1,1521,183,2,0,
+1,2636,650,18,1,
+2636,651,20,652,4,
+32,75,0,101,0,
+121,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,1,105,
+1,2,2,0,1,
+2556,653,18,1,2556,
+654,20,655,4,28,
+75,0,101,0,121,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,1,117,
+1,2,2,0,1,
+2557,656,18,1,2557,
+657,20,658,4,52,
+75,0,101,0,121,
 0,65,0,114,0,
-103,0,83,0,116,
-0,97,0,116,0,
-101,0,69,0,118,
+103,0,117,0,109,
 0,101,0,110,0,
-116,0,1,104,1,
-2,2,0,1,2621,
-620,18,1,2621,621,
-20,622,4,20,83,
-0,116,0,97,0,
-116,0,101,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
-103,1,2,2,0,
-1,2622,623,18,1,
-2622,624,20,625,4,
-26,68,0,69,0,
-70,0,65,0,85,
-0,76,0,84,0,
-95,0,83,0,84,
-0,65,0,84,0,
-69,0,1,47,1,
-1,2,0,1,2623,
-626,18,1,2623,166,
-2,0,1,2543,627,
-18,1,2543,628,20,
-629,4,52,75,0,
-101,0,121,0,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
-1,110,1,2,2,
-0,1,2546,630,18,
-1,2546,270,2,0,
-1,1514,631,18,1,
-1514,171,2,0,1,
-1515,632,18,1,1515,
-313,2,0,1,2549,
-633,18,1,2549,163,
-2,0,1,2074,634,
-18,1,2074,171,2,
-0,1,2075,635,18,
-1,2075,163,2,0,
-1,2552,636,18,1,
-2552,637,20,638,4,
-10,69,0,118,0,
-101,0,110,0,116,
-0,1,120,1,2,
-2,0,1,406,639,
-18,1,406,153,2,
-0,1,1521,640,18,
-1,1521,179,2,0,
-1,412,641,18,1,
-412,179,2,0,1,
-2484,642,18,1,2484,
-643,20,644,4,26,
-67,0,72,0,65,
-0,78,0,71,0,
-69,0,68,0,95,
+116,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,76,
+0,105,0,115,0,
+116,0,1,111,1,
+2,2,0,1,2639,
+659,18,1,2639,660,
+20,661,4,26,68,
+0,69,0,70,0,
+65,0,85,0,76,
+0,84,0,95,0,
+83,0,84,0,65,
+0,84,0,69,0,
+1,47,1,1,2,
+0,1,412,662,18,
+1,412,183,2,0,
+1,2484,663,18,1,
+2484,664,20,665,4,
+30,67,0,79,0,
+76,0,76,0,73,
+0,83,0,73,0,
+79,0,78,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,61,1,1,
-2,0,1,2023,645,
-18,1,2023,624,2,
-0,1,2564,646,18,
-1,2564,163,2,0,
-1,1442,647,18,1,
-1442,171,2,0,1,
-2035,648,18,1,2035,
-202,2,0,1,2036,
-649,18,1,2036,650,
-20,651,4,26,74,
+0,1,62,1,1,
+2,0,1,2023,666,
+18,1,2023,660,2,
+0,1,2567,667,18,
+1,2567,135,2,0,
+1,1442,668,18,1,
+1442,175,2,0,1,
+2035,669,18,1,2035,
+138,2,0,1,2036,
+670,18,1,2036,671,
+20,672,4,26,74,
 0,117,0,109,0,
 112,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,134,1,2,2,
-0,1,431,652,18,
-1,431,153,2,0,
-1,2105,653,18,1,
-2105,274,2,0,1,
-2106,654,18,1,2106,
-506,2,0,1,1550,
-655,18,1,1550,171,
-2,0,1,437,656,
-18,1,437,179,2,
-0,1,2044,657,18,
-1,2044,658,20,659,
-4,28,69,0,109,
-0,112,0,116,0,
-121,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-1,129,1,2,2,
-0,1,2045,660,18,
-1,2045,202,2,0,
-1,1555,661,18,1,
-1555,179,2,0,1,
-2511,662,18,1,2511,
-111,2,0,1,1001,
-663,18,1,1001,604,
-2,0,1,1002,664,
-18,1,1002,594,2,
-0,1,447,665,18,
-1,447,322,2,0,
-1,2520,666,18,1,
-2520,270,2,0,1,
-1010,667,18,1,1010,
-171,2,0,1,1011,
-668,18,1,1011,163,
-2,0,1,1012,669,
-18,1,1012,179,2,
-0,1,1013,670,18,
-1,1013,163,2,0,
-1,459,671,18,1,
-459,672,20,673,4,
-24,76,0,69,0,
-70,0,84,0,95,
-0,66,0,82,0,
-65,0,67,0,75,
-0,69,0,84,0,
-1,27,1,1,2,
-0,1,1574,674,18,
-1,1574,202,2,0,
-1,461,675,18,1,
-461,676,20,677,4,
-24,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,76,0,105,
-0,115,0,116,0,
-1,142,1,2,2,
-0,1,462,678,18,
-1,462,153,2,0,
-1,464,679,18,1,
-464,680,20,681,4,
-16,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,1,143,1,
-2,2,0,1,2136,
-682,18,1,2136,274,
-2,0,1,2612,683,
-18,1,2612,615,2,
-0,1,2613,684,18,
-1,2613,618,2,0,
-1,2614,685,18,1,
-2614,621,2,0,1,
-2615,686,18,1,2615,
-491,2,0,1,1585,
-687,18,1,1585,688,
-20,689,4,12,82,
-0,69,0,84,0,
-85,0,82,0,78,
-0,1,50,1,1,
-2,0,1,2618,690,
-18,1,2618,601,2,
-0,1,476,691,18,
-1,476,692,20,693,
-4,30,83,0,84,
-0,82,0,73,0,
-78,0,71,0,95,
-0,67,0,79,0,
-78,0,83,0,84,
-0,65,0,78,0,
-84,0,1,3,1,
-1,2,0,1,477,
-694,18,1,477,695,
-20,696,4,28,70,
-0,76,0,79,0,
-65,0,84,0,95,
-0,67,0,79,0,
-78,0,83,0,84,
-0,65,0,78,0,
-84,0,1,95,1,
-1,2,0,1,478,
-697,18,1,478,698,
-20,699,4,40,72,
-0,69,0,88,0,
-95,0,73,0,78,
-0,84,0,69,0,
-71,0,69,0,82,
-0,95,0,67,0,
-79,0,78,0,83,
-0,84,0,65,0,
-78,0,84,0,1,
-94,1,1,2,0,
-1,479,700,18,1,
-479,701,20,702,4,
-32,73,0,78,0,
+1,137,1,2,2,
+0,1,431,673,18,
+1,431,152,2,0,
+1,2578,674,18,1,
+2578,162,2,0,1,
+2105,675,18,1,2105,
+281,2,0,1,2106,
+676,18,1,2106,520,
+2,0,1,1550,677,
+18,1,1550,175,2,
+0,1,437,678,18,
+1,437,183,2,0,
+1,2044,679,18,1,
+2044,680,20,681,4,
+28,69,0,109,0,
+112,0,116,0,121,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,1,
+132,1,2,2,0,
+1,2045,682,18,1,
+2045,138,2,0,1,
+1555,683,18,1,1555,
+183,2,0,1,2511,
+684,18,1,2511,114,
+2,0,1,1001,685,
+18,1,1001,623,2,
+0,1,1002,686,18,
+1,1002,619,2,0,
+1,447,687,18,1,
+447,338,2,0,1,
+2520,688,18,1,2520,
+367,2,0,1,1010,
+689,18,1,1010,175,
+2,0,1,1011,690,
+18,1,1011,162,2,
+0,1,1012,691,18,
+1,1012,183,2,0,
+1,1013,692,18,1,
+1013,162,2,0,1,
+459,693,18,1,459,
+694,20,695,4,24,
+76,0,69,0,70,
+0,84,0,95,0,
+66,0,82,0,65,
+0,67,0,75,0,
+69,0,84,0,1,
+27,1,1,2,0,
+1,1574,696,18,1,
+1574,138,2,0,1,
+461,697,18,1,461,
+698,20,699,4,24,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,76,0,105,0,
+115,0,116,0,1,
+145,1,2,2,0,
+1,462,700,18,1,
+462,152,2,0,1,
+464,701,18,1,464,
+702,20,703,4,16,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,1,146,1,2,
+2,0,1,2136,704,
+18,1,2136,281,2,
+0,1,1585,705,18,
+1,1585,706,20,707,
+4,12,82,0,69,
+0,84,0,85,0,
+82,0,78,0,1,
+50,1,1,2,0,
+1,476,708,18,1,
+476,709,20,710,4,
+30,83,0,84,0,
+82,0,73,0,78,
+0,71,0,95,0,
+67,0,79,0,78,
+0,83,0,84,0,
+65,0,78,0,84,
+0,1,3,1,1,
+2,0,1,477,711,
+18,1,477,712,20,
+713,4,28,70,0,
+76,0,79,0,65,
+0,84,0,95,0,
+67,0,79,0,78,
+0,83,0,84,0,
+65,0,78,0,84,
+0,1,95,1,1,
+2,0,1,478,714,
+18,1,478,715,20,
+716,4,40,72,0,
+69,0,88,0,95,
+0,73,0,78,0,
 84,0,69,0,71,
 0,69,0,82,0,
 95,0,67,0,79,
 0,78,0,83,0,
 84,0,65,0,78,
-0,84,0,1,93,
+0,84,0,1,94,
 1,1,2,0,1,
-480,703,18,1,480,
-704,20,705,4,26,
-82,0,73,0,71,
-0,72,0,84,0,
-95,0,66,0,82,
-0,65,0,67,0,
-75,0,69,0,84,
-0,1,28,1,1,
-2,0,1,481,706,
-18,1,481,680,2,
-0,1,2711,707,18,
-1,2711,491,2,0,
-1,2718,708,18,1,
-2718,242,2,0,1,
-1048,709,18,1,1048,
-179,2,0,1,2721,
-710,18,1,2721,711,
-20,712,4,10,83,
-0,116,0,97,0,
-116,0,101,0,1,
-101,1,2,2,0,
-1,2722,713,18,1,
-2722,711,2,0,1,
-2723,714,18,1,2723,
-132,2,0,1,2724,
-715,18,1,2724,135,
-2,0,1,2042,716,
-18,1,2042,717,20,
-718,4,20,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,1,130,
-1,2,2,0,1,
-2043,719,18,1,2043,
-202,2,0,1,2568,
-720,18,1,2568,721,
-20,722,4,18,83,
+479,717,18,1,479,
+718,20,719,4,32,
+73,0,78,0,84,
+0,69,0,71,0,
+69,0,82,0,95,
+0,67,0,79,0,
+78,0,83,0,84,
+0,65,0,78,0,
+84,0,1,93,1,
+1,2,0,1,480,
+720,18,1,480,721,
+20,722,4,26,82,
+0,73,0,71,0,
+72,0,84,0,95,
+0,66,0,82,0,
+65,0,67,0,75,
+0,69,0,84,0,
+1,28,1,1,2,
+0,1,481,723,18,
+1,481,702,2,0,
+1,2628,724,18,1,
+2628,651,2,0,1,
+2629,725,18,1,2629,
+726,20,727,4,34,
+86,0,111,0,105,
+0,100,0,65,0,
+114,0,103,0,83,
 0,116,0,97,0,
-116,0,101,0,66,
-0,111,0,100,0,
-121,0,1,102,1,
-2,2,0,1,2733,
-723,18,1,2733,150,
-2,0,1,1620,724,
-18,1,1620,171,2,
-0,1,1621,725,18,
-1,1621,160,2,0,
-1,1622,726,18,1,
-1622,313,2,0,1,
-509,727,18,1,509,
-153,2,0,1,2498,
-728,18,1,2498,729,
-20,730,4,24,76,
-0,73,0,83,0,
-84,0,69,0,78,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,73,
-1,1,2,0,1,
-2739,731,18,1,2739,
-160,2,0,1,2740,
-732,18,1,2740,313,
-2,0,1,1628,733,
-18,1,1628,179,2,
-0,1,515,734,18,
-1,515,179,2,0,
-1,2505,735,18,1,
-2505,736,20,737,4,
-34,73,0,110,0,
-116,0,82,0,111,
-0,116,0,82,0,
-111,0,116,0,65,
-0,114,0,103,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,125,1,2,2,
-0,1,2746,738,18,
-1,2746,179,2,0,
-1,2664,739,18,1,
-2664,721,2,0,1,
-525,740,18,1,525,
-322,2,0,1,2197,
-741,18,1,2197,171,
-2,0,1,2198,742,
-18,1,2198,163,2,
-0,1,1591,743,18,
-1,1591,179,2,0,
-1,2521,744,18,1,
-2521,745,20,746,4,
-28,86,0,101,0,
-99,0,116,0,111,
-0,114,0,65,0,
-114,0,103,0,69,
+116,0,101,0,69,
 0,118,0,101,0,
 110,0,116,0,1,
-124,1,2,2,0,
-1,1094,747,18,1,
-1094,676,2,0,1,
-1096,748,18,1,1096,
-163,2,0,1,1657,
-749,18,1,1657,202,
-2,0,1,1658,750,
-18,1,1658,751,20,
-752,4,6,70,0,
-79,0,82,0,1,
-46,1,1,2,0,
-1,1659,753,18,1,
-1659,135,2,0,1,
-2609,754,18,1,2609,
-610,2,0,1,2776,
-755,18,1,2776,202,
-2,0,1,2777,756,
-18,1,2777,757,20,
-758,4,34,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
-68,0,101,0,102,
-0,105,0,110,0,
-105,0,116,0,105,
-0,111,0,110,0,
-115,0,1,97,1,
-2,2,0,1,1665,
-759,18,1,1665,179,
-2,0,1,1113,760,
-18,1,1113,187,2,
-0,761,5,0,762,
-5,365,1,2,763,
-19,146,1,2,764,
-5,6,1,2711,765,
-17,766,15,767,4,
-12,37,0,83,0,
-116,0,97,0,116,
-0,101,0,1,-1,
-1,5,768,20,769,
-4,14,83,0,116,
-0,97,0,116,0,
-101,0,95,0,49,
-0,1,172,1,3,
-1,5,1,4,770,
-22,1,13,1,2718,
-771,17,772,15,773,
-4,30,37,0,76,
+104,1,2,2,0,
+1,2630,728,18,1,
+2630,729,20,730,4,
+20,83,0,116,0,
+97,0,116,0,101,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,103,1,2,
+2,0,1,2631,731,
+18,1,2631,506,2,
+0,1,2554,732,18,
+1,2554,117,2,0,
+1,2633,733,18,1,
+2633,634,2,0,1,
+2634,734,18,1,2634,
+637,2,0,1,1048,
+735,18,1,1048,183,
+2,0,1,2637,736,
+18,1,2637,726,2,
+0,1,2638,737,18,
+1,2638,729,2,0,
+1,2640,738,18,1,
+2640,165,2,0,1,
+2563,739,18,1,2563,
+162,2,0,1,2042,
+740,18,1,2042,741,
+20,742,4,20,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,1,
+133,1,2,2,0,
+1,2043,743,18,1,
+2043,138,2,0,1,
+2731,744,18,1,2731,
+506,2,0,1,1620,
+745,18,1,1620,175,
+2,0,1,1621,746,
+18,1,1621,159,2,
+0,1,1622,747,18,
+1,1622,211,2,0,
+1,509,748,18,1,
+509,152,2,0,1,
+2498,749,18,1,2498,
+750,20,751,4,22,
+77,0,79,0,78,
+0,69,0,89,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,74,1,
+1,2,0,1,2739,
+752,18,1,2739,484,
+2,0,1,2576,753,
+18,1,2576,149,2,
+0,1,1628,754,18,
+1,1628,183,2,0,
+1,515,755,18,1,
+515,183,2,0,1,
+2580,756,18,1,2580,
+367,2,0,1,2505,
+757,18,1,2505,758,
+20,759,4,34,73,
+0,110,0,116,0,
+86,0,101,0,99,
+0,86,0,101,0,
+99,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,1,128,
+1,2,2,0,1,
+2582,760,18,1,2582,
+308,2,0,1,525,
+761,18,1,525,338,
+2,0,1,2197,762,
+18,1,2197,175,2,
+0,1,2198,763,18,
+1,2198,162,2,0,
+1,1591,764,18,1,
+1591,183,2,0,1,
+2758,765,18,1,2758,
+367,2,0,1,2760,
+766,18,1,2760,159,
+2,0,1,2521,767,
+18,1,2521,768,20,
+769,4,34,73,0,
+110,0,116,0,82,
+0,111,0,116,0,
+82,0,111,0,116,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,1,127,1,
+2,2,0,1,1094,
+770,18,1,1094,698,
+2,0,1,1096,771,
+18,1,1096,162,2,
+0,1,1657,772,18,
+1,1657,138,2,0,
+1,1658,773,18,1,
+1658,774,20,775,4,
+6,70,0,79,0,
+82,0,1,46,1,
+1,2,0,1,1659,
+776,18,1,1659,135,
+2,0,1,1665,777,
+18,1,1665,183,2,
+0,1,1113,778,18,
+1,1113,191,2,0,
+779,5,0,780,5,
+372,1,2,781,19,
+275,1,2,782,5,
+6,1,2739,783,17,
+784,15,785,4,30,
+37,0,76,0,83,
+0,76,0,80,0,
+114,0,111,0,103,
+0,114,0,97,0,
+109,0,82,0,111,
+0,111,0,116,0,
+1,-1,1,5,786,
+20,787,4,32,76,
 0,83,0,76,0,
 80,0,114,0,111,
 0,103,0,114,0,
 97,0,109,0,82,
 0,111,0,111,0,
-116,0,1,-1,1,
-5,774,20,775,4,
-32,76,0,83,0,
-76,0,80,0,114,
-0,111,0,103,0,
-114,0,97,0,109,
-0,82,0,111,0,
-111,0,116,0,95,
-0,50,0,1,161,
-1,3,1,2,1,
-1,776,22,1,2,
-1,2721,777,17,778,
-15,779,4,14,37,
-0,83,0,116,0,
-97,0,116,0,101,
-0,115,0,1,-1,
-1,5,780,20,781,
-4,16,83,0,116,
-0,97,0,116,0,
-101,0,115,0,95,
-0,50,0,1,171,
-1,3,1,3,1,
-2,782,22,1,12,
-1,2788,783,17,784,
-15,773,1,-1,1,
-5,785,20,786,4,
-32,76,0,83,0,
-76,0,80,0,114,
-0,111,0,103,0,
-114,0,97,0,109,
-0,82,0,111,0,
-111,0,116,0,95,
-0,49,0,1,160,
-1,3,1,3,1,
-2,787,22,1,1,
-1,2722,788,17,789,
-15,779,1,-1,1,
-5,790,20,791,4,
-16,83,0,116,0,
-97,0,116,0,101,
-0,115,0,95,0,
-49,0,1,170,1,
-3,1,2,1,1,
-792,22,1,11,1,
-2615,793,17,794,15,
-767,1,-1,1,5,
-795,20,796,4,14,
+116,0,95,0,50,
+0,1,164,1,3,
+1,2,1,1,788,
+22,1,2,1,2809,
+789,17,790,15,785,
+1,-1,1,5,791,
+20,792,4,32,76,
+0,83,0,76,0,
+80,0,114,0,111,
+0,103,0,114,0,
+97,0,109,0,82,
+0,111,0,111,0,
+116,0,95,0,49,
+0,1,163,1,3,
+1,3,1,2,793,
+22,1,1,1,2742,
+794,17,795,15,796,
+4,14,37,0,83,
+0,116,0,97,0,
+116,0,101,0,115,
+0,1,-1,1,5,
+797,20,798,4,16,
 83,0,116,0,97,
 0,116,0,101,0,
-95,0,50,0,1,
-173,1,3,1,6,
-1,5,797,22,1,
-14,1,3,798,19,
-693,1,3,799,5,
-95,1,256,800,16,
-0,691,1,1261,801,
-16,0,691,1,509,
-802,16,0,691,1,
-1515,803,16,0,691,
-1,2021,804,17,805,
-15,806,4,24,37,
+115,0,95,0,50,
+0,1,174,1,3,
+1,3,1,2,799,
+22,1,12,1,2743,
+800,17,801,15,796,
+1,-1,1,5,802,
+20,803,4,16,83,
+0,116,0,97,0,
+116,0,101,0,115,
+0,95,0,49,0,
+1,173,1,3,1,
+2,1,1,804,22,
+1,11,1,2631,805,
+17,806,15,807,4,
+12,37,0,83,0,
+116,0,97,0,116,
+0,101,0,1,-1,
+1,5,808,20,809,
+4,14,83,0,116,
+0,97,0,116,0,
+101,0,95,0,50,
+0,1,176,1,3,
+1,6,1,5,810,
+22,1,14,1,2731,
+811,17,812,15,807,
+1,-1,1,5,813,
+20,814,4,14,83,
+0,116,0,97,0,
+116,0,101,0,95,
+0,49,0,1,175,
+1,3,1,5,1,
+4,815,22,1,13,
+1,3,816,19,710,
+1,3,817,5,95,
+1,2761,818,16,0,
+708,1,256,819,16,
+0,708,1,1261,820,
+16,0,708,1,509,
+821,16,0,708,1,
+1515,822,16,0,708,
+1,2021,823,17,824,
+15,825,4,24,37,
 0,73,0,102,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,1,-1,
-1,5,807,20,808,
+1,5,826,20,827,
 4,26,73,0,102,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,50,0,1,226,
+0,50,0,1,233,
 1,3,1,8,1,
-7,809,22,1,68,
-1,1775,810,16,0,
-691,1,2029,811,17,
-812,15,813,4,20,
+7,828,22,1,72,
+1,1775,829,16,0,
+708,1,2029,830,17,
+831,15,832,4,20,
 37,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-1,-1,1,5,814,
-20,815,4,24,83,
+1,-1,1,5,833,
+20,834,4,24,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,95,0,49,
-0,51,0,1,220,
+0,51,0,1,227,
 1,3,1,2,1,
-1,816,22,1,62,
-1,2030,817,17,818,
-15,813,1,-1,1,
-5,819,20,820,4,
+1,835,22,1,66,
+1,2030,836,17,837,
+15,832,1,-1,1,
+5,838,20,839,4,
 24,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
 0,49,0,50,0,
-1,219,1,3,1,
-2,1,1,821,22,
-1,61,1,2031,822,
-17,823,15,813,1,
--1,1,5,824,20,
-825,4,24,83,0,
+1,226,1,3,1,
+2,1,1,840,22,
+1,65,1,2031,841,
+17,842,15,832,1,
+-1,1,5,843,20,
+844,4,24,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-49,0,1,218,1,
+49,0,1,225,1,
 3,1,2,1,1,
-826,22,1,60,1,
-2032,827,17,828,15,
-813,1,-1,1,5,
-829,20,830,4,24,
+845,22,1,64,1,
+2032,846,17,847,15,
+832,1,-1,1,5,
+848,20,849,4,24,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
 49,0,48,0,1,
-217,1,3,1,2,
-1,1,831,22,1,
-59,1,2033,832,17,
-833,15,813,1,-1,
-1,5,834,20,835,
+224,1,3,1,2,
+1,1,850,22,1,
+63,1,2033,851,17,
+852,15,832,1,-1,
+1,5,853,20,854,
 4,22,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
 95,0,57,0,1,
-216,1,3,1,2,
-1,1,836,22,1,
-58,1,277,837,16,
-0,691,1,2035,838,
-17,839,15,813,1,
--1,1,5,840,20,
-841,4,22,83,0,
+223,1,3,1,2,
+1,1,855,22,1,
+62,1,277,856,16,
+0,708,1,2035,857,
+17,858,15,832,1,
+-1,1,5,859,20,
+860,4,22,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,56,0,
-1,215,1,3,1,
-3,1,2,842,22,
-1,57,1,2037,843,
-17,844,15,813,1,
--1,1,5,845,20,
-846,4,22,83,0,
+1,222,1,3,1,
+3,1,2,861,22,
+1,61,1,2037,862,
+17,863,15,832,1,
+-1,1,5,864,20,
+865,4,22,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,55,0,
-1,214,1,3,1,
-3,1,2,847,22,
-1,56,1,2039,848,
-17,849,15,813,1,
--1,1,5,850,20,
-851,4,22,83,0,
+1,221,1,3,1,
+3,1,2,866,22,
+1,60,1,2039,867,
+17,868,15,832,1,
+-1,1,5,869,20,
+870,4,22,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,54,0,
-1,213,1,3,1,
-3,1,2,852,22,
-1,55,1,32,853,
-16,0,691,1,2041,
-854,17,855,15,813,
-1,-1,1,5,856,
-20,857,4,22,83,
+1,220,1,3,1,
+3,1,2,871,22,
+1,59,1,32,872,
+16,0,708,1,2041,
+873,17,874,15,832,
+1,-1,1,5,875,
+20,876,4,22,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,95,0,53,
-0,1,212,1,3,
-1,3,1,2,858,
-22,1,54,1,2293,
-859,16,0,691,1,
-2043,860,17,861,15,
-813,1,-1,1,5,
-862,20,863,4,22,
+0,1,219,1,3,
+1,3,1,2,877,
+22,1,58,1,2293,
+878,16,0,708,1,
+2043,879,17,880,15,
+832,1,-1,1,5,
+881,20,882,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-51,0,1,210,1,
+51,0,1,217,1,
 3,1,3,1,2,
-864,22,1,52,1,
-2045,865,17,866,15,
-813,1,-1,1,5,
-867,20,868,4,22,
+883,22,1,56,1,
+2045,884,17,885,15,
+832,1,-1,1,5,
+886,20,887,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,1,208,1,
+49,0,1,215,1,
 3,1,3,1,2,
-869,22,1,50,1,
-41,870,16,0,691,
-1,1297,871,16,0,
-691,1,43,872,16,
-0,691,1,1803,873,
-17,874,15,875,4,
+888,22,1,54,1,
+41,889,16,0,708,
+1,1297,890,16,0,
+708,1,43,891,16,
+0,708,1,1803,892,
+17,893,15,894,4,
 16,37,0,70,0,
 111,0,114,0,76,
 0,111,0,111,0,
 112,0,1,-1,1,
-5,876,20,877,4,
+5,895,20,896,4,
 18,70,0,111,0,
 114,0,76,0,111,
 0,111,0,112,0,
 95,0,49,0,1,
-233,1,3,1,10,
-1,9,878,22,1,
-75,1,1804,879,16,
-0,691,1,299,880,
-16,0,691,1,52,
-881,16,0,691,1,
-2318,882,16,0,691,
-1,62,883,16,0,
-691,1,2075,884,16,
-0,691,1,1574,885,
-17,886,15,813,1,
--1,1,5,887,20,
-888,4,22,83,0,
+240,1,3,1,10,
+1,9,897,22,1,
+79,1,1804,898,16,
+0,708,1,299,899,
+16,0,708,1,52,
+900,16,0,708,1,
+2318,901,16,0,708,
+1,62,902,16,0,
+708,1,2075,903,16,
+0,708,1,1574,904,
+17,905,15,832,1,
+-1,1,5,906,20,
+907,4,22,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,52,0,
-1,211,1,3,1,
-3,1,2,889,22,
-1,53,1,71,890,
-16,0,691,1,76,
-891,16,0,691,1,
-1834,892,16,0,691,
-1,2337,893,16,0,
-691,1,79,894,16,
-0,691,1,1335,895,
-16,0,691,1,322,
-896,16,0,691,1,
-85,897,16,0,691,
-1,89,898,16,0,
-691,1,346,899,16,
-0,691,1,2105,900,
-17,901,15,806,1,
--1,1,5,902,20,
-903,4,26,73,0,
+1,218,1,3,1,
+3,1,2,908,22,
+1,57,1,71,909,
+16,0,708,1,76,
+910,16,0,708,1,
+1834,911,16,0,708,
+1,2337,912,16,0,
+708,1,79,913,16,
+0,708,1,1335,914,
+16,0,708,1,322,
+915,16,0,708,1,
+85,916,16,0,708,
+1,89,917,16,0,
+708,1,346,918,16,
+0,708,1,2105,919,
+17,920,15,825,1,
+-1,1,5,921,20,
+922,4,26,73,0,
 102,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
 95,0,51,0,1,
-227,1,3,1,6,
-1,5,904,22,1,
-69,1,2106,905,16,
-0,691,1,97,906,
-16,0,691,1,1860,
-907,17,908,15,909,
+234,1,3,1,6,
+1,5,923,22,1,
+73,1,2106,924,16,
+0,708,1,97,925,
+16,0,708,1,1860,
+926,17,927,15,928,
 4,34,37,0,68,
 0,111,0,87,0,
 104,0,105,0,108,
@@ -4193,7 +4303,7 @@ public yyLSLSyntax
 0,101,0,109,0,
 101,0,110,0,116,
 0,1,-1,1,5,
-910,20,911,4,36,
+929,20,930,4,36,
 68,0,111,0,87,
 0,104,0,105,0,
 108,0,101,0,83,
@@ -4201,25 +4311,25 @@ public yyLSLSyntax
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,95,0,49,
-0,1,231,1,3,
-1,8,1,7,912,
-22,1,73,1,2364,
-913,17,914,15,875,
-1,-1,1,5,915,
-20,916,4,18,70,
+0,1,238,1,3,
+1,8,1,7,931,
+22,1,77,1,2364,
+932,17,933,15,894,
+1,-1,1,5,934,
+20,935,4,18,70,
 0,111,0,114,0,
 76,0,111,0,111,
 0,112,0,95,0,
-50,0,1,234,1,
+50,0,1,241,1,
 3,1,9,1,8,
-917,22,1,76,1,
-102,918,16,0,691,
-1,112,919,16,0,
-691,1,1117,920,16,
-0,691,1,1873,921,
-17,922,15,909,1,
--1,1,5,923,20,
-924,4,36,68,0,
+936,22,1,80,1,
+102,937,16,0,708,
+1,112,938,16,0,
+708,1,1117,939,16,
+0,708,1,1873,940,
+17,941,15,928,1,
+-1,1,5,942,20,
+943,4,36,68,0,
 111,0,87,0,104,
 0,105,0,108,0,
 101,0,83,0,116,
@@ -4227,86 +4337,86 @@ public yyLSLSyntax
 101,0,109,0,101,
 0,110,0,116,0,
 95,0,50,0,1,
-232,1,3,1,8,
-1,7,925,22,1,
-74,1,1876,926,16,
-0,691,1,124,927,
-16,0,691,1,2136,
-928,17,929,15,806,
-1,-1,1,5,930,
-20,931,4,26,73,
+239,1,3,1,8,
+1,7,944,22,1,
+78,1,1876,945,16,
+0,708,1,124,946,
+16,0,708,1,2136,
+947,17,948,15,825,
+1,-1,1,5,949,
+20,950,4,26,73,
 0,102,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,52,0,
-1,228,1,3,1,
-8,1,7,932,22,
-1,70,1,381,933,
-16,0,691,1,525,
-934,16,0,691,1,
-137,935,16,0,691,
-1,1901,936,16,0,
-691,1,1153,937,16,
-0,691,1,151,938,
-16,0,691,1,1407,
-939,16,0,691,1,
-1659,940,16,0,691,
-1,2413,941,16,0,
-691,1,406,942,16,
-0,691,1,1371,943,
-16,0,691,1,166,
-944,16,0,691,1,
-1622,945,16,0,691,
-1,1931,946,17,947,
-15,948,4,30,37,
+1,235,1,3,1,
+8,1,7,951,22,
+1,74,1,381,952,
+16,0,708,1,525,
+953,16,0,708,1,
+137,954,16,0,708,
+1,1901,955,16,0,
+708,1,1153,956,16,
+0,708,1,151,957,
+16,0,708,1,1407,
+958,16,0,708,1,
+1659,959,16,0,708,
+1,2413,960,16,0,
+708,1,406,961,16,
+0,708,1,1371,962,
+16,0,708,1,166,
+963,16,0,708,1,
+1622,964,16,0,708,
+1,1931,965,17,966,
+15,967,4,30,37,
 0,87,0,104,0,
 105,0,108,0,101,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,1,
--1,1,5,949,20,
-950,4,32,87,0,
+-1,1,5,968,20,
+969,4,32,87,0,
 104,0,105,0,108,
 0,101,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-1,229,1,3,1,
-6,1,5,951,22,
-1,71,1,1933,952,
-16,0,691,1,431,
-953,16,0,691,1,
-1585,954,16,0,691,
-1,182,955,16,0,
-691,1,1189,956,16,
-0,691,1,1443,957,
-16,0,691,1,1695,
-958,16,0,691,1,
-2198,959,16,0,691,
-1,447,960,16,0,
-691,1,2458,961,17,
-962,15,963,4,28,
+1,236,1,3,1,
+6,1,5,970,22,
+1,75,1,1933,971,
+16,0,708,1,431,
+972,16,0,708,1,
+1585,973,16,0,708,
+1,182,974,16,0,
+708,1,1189,975,16,
+0,708,1,1443,976,
+16,0,708,1,1695,
+977,16,0,708,1,
+2198,978,16,0,708,
+1,447,979,16,0,
+708,1,2458,980,17,
+981,15,982,4,28,
 37,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
 76,0,105,0,115,
 0,116,0,1,-1,
-1,5,964,20,965,
+1,5,983,20,984,
 4,30,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
 76,0,105,0,115,
 0,116,0,95,0,
-50,0,1,206,1,
+50,0,1,213,1,
 3,1,3,1,2,
-966,22,1,48,1,
-2459,967,17,968,15,
-969,4,36,37,0,
+985,22,1,52,1,
+2459,986,17,987,15,
+988,4,36,37,0,
 67,0,111,0,109,
 0,112,0,111,0,
 117,0,110,0,100,
@@ -4314,8 +4424,8 @@ public yyLSLSyntax
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,1,
--1,1,5,970,20,
-971,4,38,67,0,
+-1,1,5,989,20,
+990,4,38,67,0,
 111,0,109,0,112,
 0,111,0,117,0,
 110,0,100,0,83,
@@ -4323,35 +4433,35 @@ public yyLSLSyntax
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,95,0,50,
-0,1,204,1,3,
-1,4,1,3,972,
-22,1,46,1,1958,
-973,16,0,691,1,
-2462,974,17,975,15,
-963,1,-1,1,5,
-976,20,977,4,30,
+0,1,211,1,3,
+1,4,1,3,991,
+22,1,50,1,1958,
+992,16,0,708,1,
+2462,993,17,994,15,
+982,1,-1,1,5,
+995,20,996,4,30,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,76,0,
 105,0,115,0,116,
 0,95,0,49,0,
-1,205,1,3,1,
-2,1,1,978,22,
-1,47,1,1657,979,
-17,980,15,813,1,
--1,1,5,981,20,
-982,4,22,83,0,
+1,212,1,3,1,
+2,1,1,997,22,
+1,51,1,1657,998,
+17,999,15,832,1,
+-1,1,5,1000,20,
+1001,4,22,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,50,0,
-1,209,1,3,1,
-3,1,2,983,22,
-1,51,1,2464,984,
-17,985,15,969,1,
--1,1,5,986,20,
-987,4,38,67,0,
+1,216,1,3,1,
+3,1,2,1002,22,
+1,55,1,2464,1003,
+17,1004,15,988,1,
+-1,1,5,1005,20,
+1006,4,38,67,0,
 111,0,109,0,112,
 0,111,0,117,0,
 110,0,100,0,83,
@@ -4359,302 +4469,302 @@ public yyLSLSyntax
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,95,0,49,
-0,1,203,1,3,
-1,3,1,2,988,
-22,1,45,1,199,
-989,16,0,691,1,
-459,990,16,0,691,
-1,462,991,16,0,
-691,1,217,992,16,
-0,691,1,2227,993,
-17,994,15,948,1,
--1,1,5,995,20,
-996,4,32,87,0,
+0,1,210,1,3,
+1,3,1,2,1007,
+22,1,49,1,199,
+1008,16,0,708,1,
+459,1009,16,0,708,
+1,462,1010,16,0,
+708,1,217,1011,16,
+0,708,1,2227,1012,
+17,1013,15,967,1,
+-1,1,5,1014,20,
+1015,4,32,87,0,
 104,0,105,0,108,
 0,101,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,50,0,
-1,230,1,3,1,
-6,1,5,997,22,
-1,72,1,1225,998,
-16,0,691,1,1479,
-999,16,0,691,1,
-1731,1000,16,0,691,
-1,2740,1001,16,0,
-691,1,1989,1002,17,
-1003,15,806,1,-1,
-1,5,1004,20,1005,
-4,26,73,0,102,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,1,225,
-1,3,1,6,1,
-5,1006,22,1,67,
-1,1990,1007,16,0,
-691,1,236,1008,16,
-0,691,1,1756,1009,
-16,0,691,1,4,
-1010,19,195,1,4,
-1011,5,100,1,256,
-1012,16,0,589,1,
-1261,1013,16,0,589,
-1,509,1014,16,0,
-589,1,1515,1015,16,
-0,589,1,2021,804,
-1,1775,1016,16,0,
-589,1,2029,811,1,
-2030,817,1,2031,822,
-1,2032,827,1,2033,
-832,1,277,1017,16,
-0,589,1,2035,838,
-1,2037,843,1,2039,
-848,1,32,1018,16,
-0,589,1,2041,854,
-1,2293,1019,16,0,
-589,1,2043,860,1,
-2045,865,1,40,1020,
-16,0,197,1,41,
-1021,16,0,589,1,
-1297,1022,16,0,589,
-1,43,1023,16,0,
-589,1,44,1024,16,
-0,197,1,1803,873,
-1,1804,1025,16,0,
-589,1,299,1026,16,
-0,589,1,47,1027,
-16,0,193,1,52,
-1028,16,0,589,1,
-2318,1029,16,0,589,
-1,63,1030,16,0,
-212,1,66,1031,16,
-0,210,1,2075,1032,
-16,0,589,1,1574,
-885,1,71,1033,16,
-0,589,1,76,1034,
-16,0,589,1,1834,
-1035,16,0,589,1,
-2337,1036,16,0,589,
-1,79,1037,16,0,
-589,1,1335,1038,16,
-0,589,1,322,1039,
-16,0,589,1,85,
-1040,16,0,589,1,
-89,1041,16,0,589,
-1,346,1042,16,0,
-589,1,97,1043,16,
-0,589,1,2106,1044,
-16,0,589,1,102,
-1045,16,0,589,1,
-1860,907,1,2364,913,
-1,1114,1046,16,0,
-193,1,112,1047,16,
-0,589,1,1117,1048,
-16,0,589,1,1873,
-921,1,1876,1049,16,
-0,589,1,124,1050,
-16,0,589,1,2136,
-928,1,381,1051,16,
-0,589,1,525,1052,
-16,0,589,1,137,
-1053,16,0,589,1,
-1901,1054,16,0,589,
-1,1153,1055,16,0,
-589,1,151,1056,16,
-0,589,1,1407,1057,
-16,0,589,1,1659,
-1058,16,0,589,1,
-2413,1059,16,0,589,
-1,406,1060,16,0,
-589,1,1371,1061,16,
-0,589,1,2105,900,
-1,166,1062,16,0,
-589,1,1622,1063,16,
-0,589,1,1931,946,
-1,1933,1064,16,0,
-589,1,431,1065,16,
-0,589,1,1585,1066,
-16,0,589,1,182,
-1067,16,0,589,1,
-1189,1068,16,0,589,
-1,1443,1069,16,0,
-589,1,1695,1070,16,
-0,589,1,2198,1071,
-16,0,589,1,447,
-1072,16,0,589,1,
-2458,961,1,2459,967,
-1,1958,1073,16,0,
-589,1,2462,974,1,
-1657,979,1,2464,984,
-1,199,1074,16,0,
-589,1,459,1075,16,
-0,589,1,462,1076,
-16,0,589,1,217,
-1077,16,0,589,1,
-2227,993,1,1225,1078,
-16,0,589,1,1479,
-1079,16,0,589,1,
-1731,1080,16,0,589,
-1,2740,1081,16,0,
-589,1,1989,1002,1,
-1990,1082,16,0,589,
-1,236,1083,16,0,
-589,1,1756,1084,16,
-0,589,1,5,1085,
-19,192,1,5,1086,
-5,100,1,256,1087,
-16,0,585,1,1261,
-1088,16,0,585,1,
-509,1089,16,0,585,
-1,1515,1090,16,0,
-585,1,2021,804,1,
-1775,1091,16,0,585,
-1,2029,811,1,2030,
-817,1,2031,822,1,
-2032,827,1,2033,832,
-1,277,1092,16,0,
-585,1,2035,838,1,
-2037,843,1,2039,848,
-1,32,1093,16,0,
-585,1,2041,854,1,
-2293,1094,16,0,585,
-1,2043,860,1,2045,
-865,1,40,1095,16,
-0,196,1,41,1096,
-16,0,585,1,1297,
-1097,16,0,585,1,
-43,1098,16,0,585,
-1,44,1099,16,0,
-196,1,1803,873,1,
-1804,1100,16,0,585,
-1,299,1101,16,0,
-585,1,47,1102,16,
-0,190,1,52,1103,
-16,0,585,1,2318,
-1104,16,0,585,1,
-63,1105,16,0,211,
-1,66,1106,16,0,
-209,1,2075,1107,16,
-0,585,1,1574,885,
-1,71,1108,16,0,
-585,1,76,1109,16,
-0,585,1,1834,1110,
-16,0,585,1,2337,
-1111,16,0,585,1,
-79,1112,16,0,585,
-1,1335,1113,16,0,
-585,1,322,1114,16,
-0,585,1,85,1115,
-16,0,585,1,89,
-1116,16,0,585,1,
-346,1117,16,0,585,
-1,97,1118,16,0,
-585,1,2106,1119,16,
-0,585,1,102,1120,
-16,0,585,1,1860,
-907,1,2364,913,1,
-1114,1121,16,0,190,
-1,112,1122,16,0,
-585,1,1117,1123,16,
-0,585,1,1873,921,
-1,1876,1124,16,0,
-585,1,124,1125,16,
-0,585,1,2136,928,
-1,381,1126,16,0,
-585,1,525,1127,16,
-0,585,1,137,1128,
-16,0,585,1,1901,
-1129,16,0,585,1,
-1153,1130,16,0,585,
-1,151,1131,16,0,
-585,1,1407,1132,16,
-0,585,1,1659,1133,
-16,0,585,1,2413,
-1134,16,0,585,1,
-406,1135,16,0,585,
-1,1371,1136,16,0,
-585,1,2105,900,1,
-166,1137,16,0,585,
-1,1622,1138,16,0,
-585,1,1931,946,1,
-1933,1139,16,0,585,
-1,431,1140,16,0,
-585,1,1585,1141,16,
-0,585,1,182,1142,
-16,0,585,1,1189,
-1143,16,0,585,1,
-1443,1144,16,0,585,
-1,1695,1145,16,0,
-585,1,2198,1146,16,
-0,585,1,447,1147,
-16,0,585,1,2458,
-961,1,2459,967,1,
-1958,1148,16,0,585,
-1,2462,974,1,1657,
-979,1,2464,984,1,
-199,1149,16,0,585,
-1,459,1150,16,0,
-585,1,462,1151,16,
-0,585,1,217,1152,
-16,0,585,1,2227,
-993,1,1225,1153,16,
-0,585,1,1479,1154,
-16,0,585,1,1731,
-1155,16,0,585,1,
-2740,1156,16,0,585,
-1,1989,1002,1,1990,
-1157,16,0,585,1,
-236,1158,16,0,585,
-1,1756,1159,16,0,
-585,1,6,1160,19,
-292,1,6,1161,5,
-2,1,1114,1162,16,
-0,290,1,40,1163,
-16,0,574,1,7,
-1164,19,258,1,7,
-1165,5,2,1,1114,
-1166,16,0,256,1,
-40,1167,16,0,516,
-1,8,1168,19,218,
-1,8,1169,5,2,
-1,1114,1170,16,0,
-216,1,40,1171,16,
-0,465,1,9,1172,
-19,224,1,9,1173,
-5,2,1,1114,1174,
-16,0,222,1,40,
-1175,16,0,396,1,
-10,1176,19,175,1,
-10,1177,5,2,1,
-1114,1178,16,0,173,
-1,40,1179,16,0,
-338,1,11,1180,19,
-203,1,11,1181,5,
-146,1,1260,1182,17,
-1183,15,1184,4,34,
-37,0,83,0,105,
+1,237,1,3,1,
+6,1,5,1016,22,
+1,76,1,1225,1017,
+16,0,708,1,1479,
+1018,16,0,708,1,
+1731,1019,16,0,708,
+1,1989,1020,17,1021,
+15,825,1,-1,1,
+5,1022,20,1023,4,
+26,73,0,102,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,1,232,1,
+3,1,6,1,5,
+1024,22,1,71,1,
+1990,1025,16,0,708,
+1,236,1026,16,0,
+708,1,1756,1027,16,
+0,708,1,4,1028,
+19,199,1,4,1029,
+5,100,1,2761,1030,
+16,0,614,1,256,
+1031,16,0,614,1,
+1261,1032,16,0,614,
+1,509,1033,16,0,
+614,1,1515,1034,16,
+0,614,1,2021,823,
+1,1775,1035,16,0,
+614,1,2029,830,1,
+2030,836,1,2031,841,
+1,2032,846,1,2033,
+851,1,277,1036,16,
+0,614,1,2035,857,
+1,2037,862,1,2039,
+867,1,32,1037,16,
+0,614,1,2041,873,
+1,2293,1038,16,0,
+614,1,2043,879,1,
+2045,884,1,40,1039,
+16,0,201,1,41,
+1040,16,0,614,1,
+1297,1041,16,0,614,
+1,43,1042,16,0,
+614,1,44,1043,16,
+0,201,1,1803,892,
+1,1804,1044,16,0,
+614,1,299,1045,16,
+0,614,1,47,1046,
+16,0,197,1,52,
+1047,16,0,614,1,
+2318,1048,16,0,614,
+1,63,1049,16,0,
+218,1,66,1050,16,
+0,216,1,2075,1051,
+16,0,614,1,1574,
+904,1,71,1052,16,
+0,614,1,76,1053,
+16,0,614,1,1834,
+1054,16,0,614,1,
+2337,1055,16,0,614,
+1,79,1056,16,0,
+614,1,1335,1057,16,
+0,614,1,322,1058,
+16,0,614,1,85,
+1059,16,0,614,1,
+89,1060,16,0,614,
+1,346,1061,16,0,
+614,1,97,1062,16,
+0,614,1,2106,1063,
+16,0,614,1,102,
+1064,16,0,614,1,
+1860,926,1,2364,932,
+1,1114,1065,16,0,
+197,1,112,1066,16,
+0,614,1,1117,1067,
+16,0,614,1,1873,
+940,1,1876,1068,16,
+0,614,1,124,1069,
+16,0,614,1,2136,
+947,1,381,1070,16,
+0,614,1,525,1071,
+16,0,614,1,137,
+1072,16,0,614,1,
+1901,1073,16,0,614,
+1,1153,1074,16,0,
+614,1,151,1075,16,
+0,614,1,1407,1076,
+16,0,614,1,1659,
+1077,16,0,614,1,
+2413,1078,16,0,614,
+1,406,1079,16,0,
+614,1,1371,1080,16,
+0,614,1,2105,919,
+1,166,1081,16,0,
+614,1,1622,1082,16,
+0,614,1,1931,965,
+1,1933,1083,16,0,
+614,1,431,1084,16,
+0,614,1,1585,1085,
+16,0,614,1,182,
+1086,16,0,614,1,
+1189,1087,16,0,614,
+1,1443,1088,16,0,
+614,1,1695,1089,16,
+0,614,1,2198,1090,
+16,0,614,1,447,
+1091,16,0,614,1,
+2458,980,1,2459,986,
+1,1958,1092,16,0,
+614,1,2462,993,1,
+1657,998,1,2464,1003,
+1,199,1093,16,0,
+614,1,459,1094,16,
+0,614,1,462,1095,
+16,0,614,1,217,
+1096,16,0,614,1,
+2227,1012,1,1225,1097,
+16,0,614,1,1479,
+1098,16,0,614,1,
+1731,1099,16,0,614,
+1,1989,1020,1,1990,
+1100,16,0,614,1,
+236,1101,16,0,614,
+1,1756,1102,16,0,
+614,1,5,1103,19,
+196,1,5,1104,5,
+100,1,2761,1105,16,
+0,610,1,256,1106,
+16,0,610,1,1261,
+1107,16,0,610,1,
+509,1108,16,0,610,
+1,1515,1109,16,0,
+610,1,2021,823,1,
+1775,1110,16,0,610,
+1,2029,830,1,2030,
+836,1,2031,841,1,
+2032,846,1,2033,851,
+1,277,1111,16,0,
+610,1,2035,857,1,
+2037,862,1,2039,867,
+1,32,1112,16,0,
+610,1,2041,873,1,
+2293,1113,16,0,610,
+1,2043,879,1,2045,
+884,1,40,1114,16,
+0,200,1,41,1115,
+16,0,610,1,1297,
+1116,16,0,610,1,
+43,1117,16,0,610,
+1,44,1118,16,0,
+200,1,1803,892,1,
+1804,1119,16,0,610,
+1,299,1120,16,0,
+610,1,47,1121,16,
+0,194,1,52,1122,
+16,0,610,1,2318,
+1123,16,0,610,1,
+63,1124,16,0,217,
+1,66,1125,16,0,
+215,1,2075,1126,16,
+0,610,1,1574,904,
+1,71,1127,16,0,
+610,1,76,1128,16,
+0,610,1,1834,1129,
+16,0,610,1,2337,
+1130,16,0,610,1,
+79,1131,16,0,610,
+1,1335,1132,16,0,
+610,1,322,1133,16,
+0,610,1,85,1134,
+16,0,610,1,89,
+1135,16,0,610,1,
+346,1136,16,0,610,
+1,97,1137,16,0,
+610,1,2106,1138,16,
+0,610,1,102,1139,
+16,0,610,1,1860,
+926,1,2364,932,1,
+1114,1140,16,0,194,
+1,112,1141,16,0,
+610,1,1117,1142,16,
+0,610,1,1873,940,
+1,1876,1143,16,0,
+610,1,124,1144,16,
+0,610,1,2136,947,
+1,381,1145,16,0,
+610,1,525,1146,16,
+0,610,1,137,1147,
+16,0,610,1,1901,
+1148,16,0,610,1,
+1153,1149,16,0,610,
+1,151,1150,16,0,
+610,1,1407,1151,16,
+0,610,1,1659,1152,
+16,0,610,1,2413,
+1153,16,0,610,1,
+406,1154,16,0,610,
+1,1371,1155,16,0,
+610,1,2105,919,1,
+166,1156,16,0,610,
+1,1622,1157,16,0,
+610,1,1931,965,1,
+1933,1158,16,0,610,
+1,431,1159,16,0,
+610,1,1585,1160,16,
+0,610,1,182,1161,
+16,0,610,1,1189,
+1162,16,0,610,1,
+1443,1163,16,0,610,
+1,1695,1164,16,0,
+610,1,2198,1165,16,
+0,610,1,447,1166,
+16,0,610,1,2458,
+980,1,2459,986,1,
+1958,1167,16,0,610,
+1,2462,993,1,1657,
+998,1,2464,1003,1,
+199,1168,16,0,610,
+1,459,1169,16,0,
+610,1,462,1170,16,
+0,610,1,217,1171,
+16,0,610,1,2227,
+1012,1,1225,1172,16,
+0,610,1,1479,1173,
+16,0,610,1,1731,
+1174,16,0,610,1,
+1989,1020,1,1990,1175,
+16,0,610,1,236,
+1176,16,0,610,1,
+1756,1177,16,0,610,
+1,6,1178,19,300,
+1,6,1179,5,2,
+1,1114,1180,16,0,
+298,1,40,1181,16,
+0,599,1,7,1182,
+19,261,1,7,1183,
+5,2,1,1114,1184,
+16,0,259,1,40,
+1185,16,0,533,1,
+8,1186,19,224,1,
+8,1187,5,2,1,
+1114,1188,16,0,222,
+1,40,1189,16,0,
+487,1,9,1190,19,
+230,1,9,1191,5,
+2,1,1114,1192,16,
+0,228,1,40,1193,
+16,0,417,1,10,
+1194,19,179,1,10,
+1195,5,2,1,1114,
+1196,16,0,177,1,
+40,1197,16,0,356,
+1,11,1198,19,139,
+1,11,1199,5,146,
+1,1260,1200,17,1201,
+15,1202,4,34,37,
+0,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,1,-1,
+1,5,1203,20,1204,
+4,38,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
 0,115,0,115,0,
 105,0,103,0,110,
 0,109,0,101,0,
-110,0,116,0,1,
--1,1,5,1185,20,
-1186,4,38,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,50,0,49,
-0,1,261,1,3,
-1,6,1,5,1187,
-22,1,103,1,1011,
-1188,17,1189,15,1190,
+110,0,116,0,95,
+0,50,0,49,0,
+1,268,1,3,1,
+6,1,5,1205,22,
+1,107,1,2767,1206,
+16,0,324,1,1011,
+1207,17,1208,15,1209,
 4,44,37,0,80,
 0,97,0,114,0,
 101,0,110,0,116,
@@ -4665,7 +4775,7 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,1,-1,1,5,
-1191,20,1192,4,46,
+1210,20,1211,4,46,
 80,0,97,0,114,
 0,101,0,110,0,
 116,0,104,0,101,
@@ -4675,12 +4785,12 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,50,
-0,1,308,1,3,
-1,4,1,3,1193,
-22,1,150,1,1514,
-1194,17,1195,15,1184,
-1,-1,1,5,1196,
-20,1197,4,38,83,
+0,1,315,1,3,
+1,4,1,3,1212,
+22,1,154,1,1514,
+1213,17,1214,15,1202,
+1,-1,1,5,1215,
+20,1216,4,38,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
@@ -4688,27 +4798,27 @@ public yyLSLSyntax
 0,110,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-52,0,1,254,1,
+52,0,1,261,1,
 3,1,4,1,3,
-1198,22,1,96,1,
-9,1199,17,1200,15,
-1201,4,24,37,0,
+1217,22,1,100,1,
+9,1218,17,1219,15,
+1220,4,24,37,0,
 68,0,101,0,99,
 0,108,0,97,0,
 114,0,97,0,116,
 0,105,0,111,0,
 110,0,1,-1,1,
-5,1202,20,1203,4,
+5,1221,20,1222,4,
 26,68,0,101,0,
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
 0,110,0,95,0,
-49,0,1,198,1,
+49,0,1,205,1,
 3,1,3,1,2,
-1204,22,1,40,1,
-262,1205,17,1206,15,
-1207,4,34,37,0,
+1223,22,1,44,1,
+262,1224,17,1225,15,
+1226,4,34,37,0,
 66,0,105,0,110,
 0,97,0,114,0,
 121,0,69,0,120,
@@ -4716,7 +4826,7 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,1,-1,1,
-5,1208,20,1209,4,
+5,1227,20,1228,4,
 36,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
@@ -4724,12 +4834,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-53,0,1,290,1,
+53,0,1,297,1,
 3,1,4,1,3,
-1210,22,1,132,1,
-1267,1211,17,1212,15,
-1184,1,-1,1,5,
-1213,20,1214,4,36,
+1229,22,1,136,1,
+1267,1230,17,1231,15,
+1202,1,-1,1,5,
+1232,20,1233,4,36,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
@@ -4737,12 +4847,12 @@ public yyLSLSyntax
 103,0,110,0,109,
 0,101,0,110,0,
 116,0,95,0,56,
-0,1,248,1,3,
-1,6,1,5,1215,
-22,1,90,1,2021,
-804,1,1521,1216,17,
-1217,15,1184,1,-1,
-1,5,1218,20,1219,
+0,1,255,1,3,
+1,6,1,5,1234,
+22,1,94,1,2021,
+823,1,1521,1235,17,
+1236,15,1202,1,-1,
+1,5,1237,20,1238,
 4,36,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -4750,62 +4860,62 @@ public yyLSLSyntax
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,1,241,
+0,49,0,1,248,
 1,3,1,4,1,
-3,1220,22,1,83,
-1,2024,1221,17,1222,
-15,1223,4,24,37,
+3,1239,22,1,87,
+1,2024,1240,17,1241,
+15,1242,4,24,37,
 0,83,0,116,0,
 97,0,116,0,101,
 0,67,0,104,0,
 97,0,110,0,103,
 0,101,0,1,-1,
-1,5,1224,20,1225,
+1,5,1243,20,1244,
 4,26,83,0,116,
 0,97,0,116,0,
 101,0,67,0,104,
 0,97,0,110,0,
 103,0,101,0,95,
-0,49,0,1,223,
+0,49,0,1,230,
 1,3,1,3,1,
-2,1226,22,1,65,
-1,1775,1227,17,1228,
-15,1229,4,30,37,
+2,1245,22,1,69,
+1,1775,1246,17,1247,
+15,1248,4,30,37,
 0,69,0,109,0,
 112,0,116,0,121,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,1,
--1,1,5,1230,20,
-1231,4,32,69,0,
+-1,1,5,1249,20,
+1250,4,32,69,0,
 109,0,112,0,116,
 0,121,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-1,207,1,3,1,
-1,1,0,1232,22,
-1,49,1,19,1233,
-17,1200,1,2,1204,
-1,2028,1234,17,1235,
-15,1236,4,20,37,
+1,214,1,3,1,
+1,1,0,1251,22,
+1,53,1,19,1252,
+17,1219,1,2,1223,
+1,2028,1253,17,1254,
+15,1255,4,20,37,
 0,74,0,117,0,
 109,0,112,0,76,
 0,97,0,98,0,
 101,0,108,0,1,
--1,1,5,1237,20,
-1238,4,22,74,0,
+-1,1,5,1256,20,
+1257,4,22,74,0,
 117,0,109,0,112,
 0,76,0,97,0,
 98,0,101,0,108,
 0,95,0,49,0,
-1,221,1,3,1,
-3,1,2,1239,22,
-1,63,1,2029,811,
-1,2281,1240,17,1241,
-15,1242,4,34,37,
+1,228,1,3,1,
+3,1,2,1258,22,
+1,67,1,2029,830,
+1,2281,1259,17,1260,
+15,1261,4,34,37,
 0,70,0,111,0,
 114,0,76,0,111,
 0,111,0,112,0,
@@ -4813,7 +4923,7 @@ public yyLSLSyntax
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,1,-1,
-1,5,1243,20,1244,
+1,5,1262,20,1263,
 4,36,70,0,111,
 0,114,0,76,0,
 111,0,111,0,112,
@@ -4821,26 +4931,26 @@ public yyLSLSyntax
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,50,0,1,236,
+0,50,0,1,243,
 1,3,1,2,1,
-1,1245,22,1,78,
-1,2031,822,1,2032,
-827,1,2033,832,1,
-2034,1246,16,0,648,
-1,2035,838,1,2036,
-1247,16,0,575,1,
-2037,843,1,2038,1248,
-16,0,579,1,2039,
-848,1,32,1249,17,
-1228,1,0,1232,1,
-2041,854,1,2042,1250,
-16,0,719,1,2043,
-860,1,2044,1251,16,
-0,660,1,2045,865,
-1,2299,1252,16,0,
-240,1,1296,1253,17,
-1254,15,1184,1,-1,
-1,5,1255,20,1256,
+1,1264,22,1,82,
+1,2031,841,1,2032,
+846,1,2033,851,1,
+2034,1265,16,0,669,
+1,2035,857,1,2036,
+1266,16,0,600,1,
+2037,862,1,2038,1267,
+16,0,604,1,2039,
+867,1,32,1268,17,
+1247,1,0,1251,1,
+2041,873,1,2042,1269,
+16,0,743,1,2043,
+879,1,2044,1270,16,
+0,682,1,2045,884,
+1,2299,1271,16,0,
+246,1,1296,1272,17,
+1273,15,1202,1,-1,
+1,5,1274,20,1275,
 4,38,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -4849,12 +4959,12 @@ public yyLSLSyntax
 0,109,0,101,0,
 110,0,116,0,95,
 0,50,0,48,0,
-1,260,1,3,1,
-6,1,5,1257,22,
-1,102,1,283,1258,
-17,1259,15,1207,1,
--1,1,5,1260,20,
-1261,4,36,66,0,
+1,267,1,3,1,
+6,1,5,1276,22,
+1,106,1,283,1277,
+17,1278,15,1226,1,
+-1,1,5,1279,20,
+1280,4,36,66,0,
 105,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
@@ -4862,10 +4972,10 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,52,0,1,
-289,1,3,1,4,
-1,3,1262,22,1,
-131,1,40,1263,17,
-1264,15,1265,4,32,
+296,1,3,1,4,
+1,3,1281,22,1,
+135,1,40,1282,17,
+1283,15,1284,4,32,
 37,0,73,0,100,
 0,101,0,110,0,
 116,0,69,0,120,
@@ -4873,7 +4983,7 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,1,-1,1,
-5,1266,20,1267,4,
+5,1285,20,1286,4,
 34,73,0,100,0,
 101,0,110,0,116,
 0,69,0,120,0,
@@ -4881,12 +4991,12 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,49,0,
-1,275,1,3,1,
-2,1,1,1268,22,
-1,117,1,44,1269,
-17,1264,1,1,1268,
-1,1803,873,1,47,
-1270,17,1271,15,1272,
+1,282,1,3,1,
+2,1,1,1287,22,
+1,121,1,44,1288,
+17,1283,1,1,1287,
+1,1803,892,1,47,
+1289,17,1290,15,1291,
 4,38,37,0,73,
 0,100,0,101,0,
 110,0,116,0,68,
@@ -4895,8 +5005,8 @@ public yyLSLSyntax
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-1,-1,1,5,1273,
-20,1274,4,40,73,
+1,-1,1,5,1292,
+20,1293,4,40,73,
 0,100,0,101,0,
 110,0,116,0,68,
 0,111,0,116,0,
@@ -4905,10 +5015,10 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,49,0,1,
-276,1,3,1,4,
-1,3,1275,22,1,
-118,1,48,1276,17,
-1277,15,1278,4,58,
+283,1,3,1,4,
+1,3,1294,22,1,
+122,1,48,1295,17,
+1296,15,1297,4,58,
 37,0,73,0,110,
 0,99,0,114,0,
 101,0,109,0,101,
@@ -4921,7 +5031,7 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,1,-1,
-1,5,1279,20,1280,
+1,5,1298,20,1299,
 4,60,73,0,110,
 0,99,0,114,0,
 101,0,109,0,101,
@@ -4934,12 +5044,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-52,0,1,280,1,
+52,0,1,287,1,
 3,1,5,1,4,
-1281,22,1,122,1,
-49,1282,17,1283,15,
-1278,1,-1,1,5,
-1284,20,1285,4,60,
+1300,22,1,126,1,
+49,1301,17,1302,15,
+1297,1,-1,1,5,
+1303,20,1304,4,60,
 73,0,110,0,99,
 0,114,0,101,0,
 109,0,101,0,110,
@@ -4952,12 +5062,12 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,51,0,
-1,279,1,3,1,
-5,1,4,1286,22,
-1,121,1,50,1287,
-17,1288,15,1278,1,
--1,1,5,1289,20,
-1290,4,60,73,0,
+1,286,1,3,1,
+5,1,4,1305,22,
+1,125,1,50,1306,
+17,1307,15,1297,1,
+-1,1,5,1308,20,
+1309,4,60,73,0,
 110,0,99,0,114,
 0,101,0,109,0,
 101,0,110,0,116,
@@ -4969,12 +5079,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,50,0,1,278,
+0,50,0,1,285,
 1,3,1,3,1,
-2,1291,22,1,120,
-1,51,1292,17,1293,
-15,1278,1,-1,1,
-5,1294,20,1295,4,
+2,1310,22,1,124,
+1,51,1311,17,1312,
+15,1297,1,-1,1,
+5,1313,20,1314,4,
 60,73,0,110,0,
 99,0,114,0,101,
 0,109,0,101,0,
@@ -4987,12 +5097,12 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,49,
-0,1,277,1,3,
-1,3,1,2,1296,
-22,1,119,1,305,
-1297,17,1298,15,1207,
-1,-1,1,5,1299,
-20,1300,4,36,66,
+0,1,284,1,3,
+1,3,1,2,1315,
+22,1,123,1,305,
+1316,17,1317,15,1226,
+1,-1,1,5,1318,
+20,1319,4,36,66,
 0,105,0,110,0,
 97,0,114,0,121,
 0,69,0,120,0,
@@ -5000,10 +5110,10 @@ public yyLSLSyntax
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,51,0,
-1,288,1,3,1,
-4,1,3,1301,22,
-1,130,1,525,1302,
-17,1303,15,1304,4,
+1,295,1,3,1,
+4,1,3,1320,22,
+1,134,1,525,1321,
+17,1322,15,1323,4,
 34,37,0,82,0,
 111,0,116,0,97,
 0,116,0,105,0,
@@ -5011,8 +5121,8 @@ public yyLSLSyntax
 0,111,0,110,0,
 115,0,116,0,97,
 0,110,0,116,0,
-1,-1,1,5,1305,
-20,1306,4,36,82,
+1,-1,1,5,1324,
+20,1325,4,36,82,
 0,111,0,116,0,
 97,0,116,0,105,
 0,111,0,110,0,
@@ -5020,10 +5130,10 @@ public yyLSLSyntax
 0,115,0,116,0,
 97,0,110,0,116,
 0,95,0,49,0,
-1,273,1,3,1,
-10,1,9,1307,22,
-1,115,1,63,1308,
-17,1309,15,1310,4,
+1,280,1,3,1,
+10,1,9,1326,22,
+1,119,1,63,1327,
+17,1328,15,1329,4,
 38,37,0,84,0,
 121,0,112,0,101,
 0,99,0,97,0,
@@ -5032,8 +5142,8 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,1,
--1,1,5,1311,20,
-1312,4,40,84,0,
+-1,1,5,1330,20,
+1331,4,40,84,0,
 121,0,112,0,101,
 0,99,0,97,0,
 115,0,116,0,69,
@@ -5041,13 +5151,39 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,50,0,1,310,
+0,50,0,1,317,
 1,3,1,5,1,
-4,1313,22,1,152,
-1,2739,1314,16,0,
-755,1,66,1315,17,
-1316,15,1310,1,-1,
-1,5,1317,20,1318,
+4,1332,22,1,156,
+1,66,1333,17,1334,
+15,1329,1,-1,1,
+5,1335,20,1336,4,
+40,84,0,121,0,
+112,0,101,0,99,
+0,97,0,115,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,51,
+0,1,318,1,3,
+1,7,1,6,1337,
+22,1,157,1,67,
+1338,17,1339,15,1329,
+1,-1,1,5,1340,
+20,1341,4,40,84,
+0,121,0,112,0,
+101,0,99,0,97,
+0,115,0,116,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,55,0,1,
+322,1,3,1,8,
+1,7,1342,22,1,
+161,1,68,1343,17,
+1344,15,1329,1,-1,
+1,5,1345,20,1346,
 4,40,84,0,121,
 0,112,0,101,0,
 99,0,97,0,115,
@@ -5056,12 +5192,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-51,0,1,311,1,
-3,1,7,1,6,
-1319,22,1,153,1,
-67,1320,17,1321,15,
-1310,1,-1,1,5,
-1322,20,1323,4,40,
+53,0,1,320,1,
+3,1,8,1,7,
+1347,22,1,159,1,
+69,1348,17,1349,15,
+1329,1,-1,1,5,
+1350,20,1351,4,40,
 84,0,121,0,112,
 0,101,0,99,0,
 97,0,115,0,116,
@@ -5069,13 +5205,13 @@ public yyLSLSyntax
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,55,0,
-1,315,1,3,1,
-8,1,7,1324,22,
-1,157,1,68,1325,
-17,1326,15,1310,1,
--1,1,5,1327,20,
-1328,4,40,84,0,
+0,95,0,54,0,
+1,321,1,3,1,
+6,1,5,1352,22,
+1,160,1,70,1353,
+17,1354,15,1329,1,
+-1,1,5,1355,20,
+1356,4,40,84,0,
 121,0,112,0,101,
 0,99,0,97,0,
 115,0,116,0,69,
@@ -5083,12 +5219,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,53,0,1,313,
-1,3,1,8,1,
-7,1329,22,1,155,
-1,69,1330,17,1331,
-15,1310,1,-1,1,
-5,1332,20,1333,4,
+0,52,0,1,319,
+1,3,1,6,1,
+5,1357,22,1,158,
+1,74,1358,17,1359,
+15,1329,1,-1,1,
+5,1360,20,1361,4,
 40,84,0,121,0,
 112,0,101,0,99,
 0,97,0,115,0,
@@ -5096,479 +5232,238 @@ public yyLSLSyntax
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,95,0,54,
-0,1,314,1,3,
-1,6,1,5,1334,
-22,1,156,1,70,
-1335,17,1336,15,1310,
-1,-1,1,5,1337,
-20,1338,4,40,84,
-0,121,0,112,0,
-101,0,99,0,97,
-0,115,0,116,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,52,0,1,
-312,1,3,1,6,
-1,5,1339,22,1,
-154,1,74,1340,17,
-1341,15,1310,1,-1,
-1,5,1342,20,1343,
-4,40,84,0,121,
-0,112,0,101,0,
-99,0,97,0,115,
-0,116,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-57,0,1,317,1,
-3,1,7,1,6,
-1344,22,1,159,1,
-1013,1345,17,1346,15,
-1190,1,-1,1,5,
-1347,20,1348,4,46,
-80,0,97,0,114,
-0,101,0,110,0,
-116,0,104,0,101,
-0,115,0,105,0,
-115,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,1,307,1,3,
-1,4,1,3,1349,
-22,1,149,1,1332,
-1350,17,1351,15,1184,
-1,-1,1,5,1352,
-20,1353,4,38,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
+110,0,95,0,57,
+0,1,324,1,3,
+1,7,1,6,1362,
+22,1,163,1,1013,
+1363,17,1364,15,1209,
+1,-1,1,5,1365,
+20,1366,4,46,80,
+0,97,0,114,0,
 101,0,110,0,116,
+0,104,0,101,0,
+115,0,105,0,115,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
 0,95,0,49,0,
-57,0,1,259,1,
-3,1,6,1,5,
-1354,22,1,101,1,
-2337,1355,17,1228,1,
-0,1232,1,1585,1356,
-17,1357,15,1358,4,
-32,37,0,82,0,
-101,0,116,0,117,
-0,114,0,110,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,1,-1,
-1,5,1359,20,1360,
-4,34,82,0,101,
+1,314,1,3,1,
+4,1,3,1367,22,
+1,153,1,1332,1368,
+17,1369,15,1202,1,
+-1,1,5,1370,20,
+1371,4,38,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,57,
+0,1,266,1,3,
+1,6,1,5,1372,
+22,1,105,1,2337,
+1373,17,1247,1,0,
+1251,1,1585,1374,17,
+1375,15,1376,4,32,
+37,0,82,0,101,
 0,116,0,117,0,
 114,0,110,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,95,0,50,
-0,1,266,1,3,
-1,2,1,1,1361,
-22,1,108,1,2023,
-1362,17,1363,15,1223,
-1,-1,1,5,1364,
-20,1365,4,26,83,
-0,116,0,97,0,
-116,0,101,0,67,
-0,104,0,97,0,
-110,0,103,0,101,
+116,0,1,-1,1,
+5,1377,20,1378,4,
+34,82,0,101,0,
+116,0,117,0,114,
+0,110,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
 0,95,0,50,0,
-1,224,1,3,1,
-3,1,2,1366,22,
-1,66,1,2136,928,
-1,82,1367,17,1368,
-15,1369,4,32,37,
-0,85,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,-1,1,5,
-1370,20,1371,4,34,
+1,273,1,3,1,
+2,1,1,1379,22,
+1,112,1,2023,1380,
+17,1381,15,1242,1,
+-1,1,5,1382,20,
+1383,4,26,83,0,
+116,0,97,0,116,
+0,101,0,67,0,
+104,0,97,0,110,
+0,103,0,101,0,
+95,0,50,0,1,
+231,1,3,1,3,
+1,2,1384,22,1,
+70,1,2136,947,1,
+82,1385,17,1386,15,
+1387,4,32,37,0,
 85,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,51,0,1,
-306,1,3,1,3,
-1,2,1372,22,1,
-148,1,2026,1373,17,
-1374,15,1375,4,28,
-37,0,74,0,117,
-0,109,0,112,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,1,-1,
-1,5,1376,20,1377,
-4,30,74,0,117,
-0,109,0,112,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,1,222,1,
-3,1,3,1,2,
-1378,22,1,64,1,
-1591,1379,17,1380,15,
-1358,1,-1,1,5,
-1381,20,1382,4,34,
-82,0,101,0,116,
-0,117,0,114,0,
-110,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,1,
-265,1,3,1,3,
-1,2,1383,22,1,
-107,1,1341,1384,17,
-1385,15,1184,1,-1,
-1,5,1386,20,1387,
-4,36,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,54,0,1,246,
-1,3,1,4,1,
-3,1388,22,1,88,
-1,2030,817,1,328,
-1389,17,1390,15,1207,
-1,-1,1,5,1391,
-20,1392,4,36,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,50,0,
-1,287,1,3,1,
-4,1,3,1393,22,
-1,129,1,1303,1394,
-17,1395,15,1184,1,
--1,1,5,1396,20,
-1397,4,36,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,55,0,1,
-247,1,3,1,6,
-1,5,1398,22,1,
-89,1,1096,1399,17,
-1400,15,1401,4,26,
-37,0,70,0,117,
-0,110,0,99,0,
-116,0,105,0,111,
-0,110,0,67,0,
-97,0,108,0,108,
-0,1,-1,1,5,
-1402,20,1403,4,28,
-70,0,117,0,110,
-0,99,0,116,0,
-105,0,111,0,110,
-0,67,0,97,0,
-108,0,108,0,95,
-0,49,0,1,318,
-1,3,1,5,1,
-4,1404,22,1,160,
-1,93,1405,17,1406,
-15,1369,1,-1,1,
-5,1407,20,1408,4,
-34,85,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,50,0,
-1,305,1,3,1,
-3,1,2,1409,22,
-1,147,1,1550,1410,
-17,1411,15,1184,1,
--1,1,5,1412,20,
-1413,4,38,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,51,
-0,1,253,1,3,
-1,4,1,3,1414,
-22,1,95,1,2040,
-1415,16,0,583,1,
-2106,1416,17,1228,1,
-0,1232,1,1555,1417,
-16,0,674,1,827,
-1418,17,1419,15,1207,
-1,-1,1,5,1420,
-20,1421,4,38,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,49,0,
-53,0,1,300,1,
-3,1,4,1,3,
-1422,22,1,142,1,
-1859,1423,16,0,319,
-1,1860,907,1,1804,
-1424,17,1228,1,0,
-1232,1,107,1425,17,
-1426,15,1369,1,-1,
-1,5,1427,20,1428,
-4,34,85,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,1,304,1,3,
-1,3,1,2,1429,
-22,1,146,1,1114,
-1430,17,1271,1,3,
-1275,1,1048,1431,17,
-1432,15,1207,1,-1,
-1,5,1433,20,1434,
-4,38,66,0,105,
+1,-1,1,5,1388,
+20,1389,4,34,85,
 0,110,0,97,0,
 114,0,121,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,49,0,56,0,
-1,303,1,3,1,
-4,1,3,1435,22,
-1,145,1,352,1436,
-17,1437,15,1207,1,
--1,1,5,1438,20,
-1439,4,36,66,0,
+0,51,0,1,313,
+1,3,1,3,1,
+2,1390,22,1,152,
+1,2026,1391,17,1392,
+15,1393,4,28,37,
+0,74,0,117,0,
+109,0,112,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,1394,20,1395,4,
+30,74,0,117,0,
+109,0,112,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,49,
+0,1,229,1,3,
+1,3,1,2,1396,
+22,1,68,1,1591,
+1397,17,1398,15,1376,
+1,-1,1,5,1399,
+20,1400,4,34,82,
+0,101,0,116,0,
+117,0,114,0,110,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,95,
+0,49,0,1,272,
+1,3,1,3,1,
+2,1401,22,1,111,
+1,1341,1402,17,1403,
+15,1202,1,-1,1,
+5,1404,20,1405,4,
+36,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+54,0,1,253,1,
+3,1,4,1,3,
+1406,22,1,92,1,
+2030,836,1,328,1407,
+17,1408,15,1226,1,
+-1,1,5,1409,20,
+1410,4,36,66,0,
 105,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,49,0,1,
-286,1,3,1,4,
-1,3,1440,22,1,
-128,1,1872,1441,16,
-0,329,1,1873,921,
-1,118,1442,17,1443,
-15,1207,1,-1,1,
-5,1444,20,1445,4,
-38,66,0,105,0,
-110,0,97,0,114,
-0,121,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-49,0,52,0,1,
-299,1,3,1,4,
-1,3,1446,22,1,
-141,1,1123,1447,17,
-1448,15,1184,1,-1,
-1,5,1449,20,1450,
-4,38,83,0,105,
+95,0,50,0,1,
+294,1,3,1,4,
+1,3,1411,22,1,
+133,1,1303,1412,17,
+1413,15,1202,1,-1,
+1,5,1414,20,1415,
+4,36,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
 0,115,0,115,0,
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,50,0,
-1,252,1,3,1,
-6,1,5,1451,22,
-1,94,1,371,1452,
-17,1453,15,1454,4,
-46,37,0,70,0,
-117,0,110,0,99,
-0,116,0,105,0,
-111,0,110,0,67,
-0,97,0,108,0,
-108,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,1,-1,1,
-5,1455,20,1456,4,
-48,70,0,117,0,
+0,55,0,1,254,
+1,3,1,6,1,
+5,1416,22,1,93,
+1,1096,1417,17,1418,
+15,1419,4,26,37,
+0,70,0,117,0,
 110,0,99,0,116,
 0,105,0,111,0,
 110,0,67,0,97,
 0,108,0,108,0,
+1,-1,1,5,1420,
+20,1421,4,28,70,
+0,117,0,110,0,
+99,0,116,0,105,
+0,111,0,110,0,
+67,0,97,0,108,
+0,108,0,95,0,
+49,0,1,325,1,
+3,1,5,1,4,
+1422,22,1,164,1,
+93,1423,17,1424,15,
+1387,1,-1,1,5,
+1425,20,1426,4,34,
+85,0,110,0,97,
+0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,49,0,1,
-285,1,3,1,2,
-1,1,1457,22,1,
-127,1,1377,1458,17,
-1459,15,1184,1,-1,
-1,5,1460,20,1461,
-4,36,83,0,105,
+95,0,50,0,1,
+312,1,3,1,3,
+1,2,1427,22,1,
+151,1,1550,1428,17,
+1429,15,1202,1,-1,
+1,5,1430,20,1431,
+4,38,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
 0,115,0,115,0,
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,53,0,1,245,
-1,3,1,4,1,
-3,1462,22,1,87,
-1,375,1463,17,1464,
-15,1278,1,-1,1,
-5,1465,20,1466,4,
-60,73,0,110,0,
-99,0,114,0,101,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-114,0,101,0,109,
-0,101,0,110,0,
-116,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,56,
-0,1,284,1,3,
-1,5,1,4,1467,
-22,1,126,1,377,
-1468,17,1469,15,1278,
-1,-1,1,5,1470,
-20,1471,4,60,73,
-0,110,0,99,0,
-114,0,101,0,109,
-0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,114,0,
-101,0,109,0,101,
-0,110,0,116,0,
+0,49,0,51,0,
+1,260,1,3,1,
+4,1,3,1432,22,
+1,99,1,2040,1433,
+16,0,608,1,2106,
+1434,17,1247,1,0,
+1251,1,1555,1435,16,
+0,696,1,827,1436,
+17,1437,15,1226,1,
+-1,1,5,1438,20,
+1439,4,38,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,53,0,1,
-281,1,3,1,3,
-1,2,1472,22,1,
-123,1,379,1473,17,
-1474,15,1278,1,-1,
-1,5,1475,20,1476,
-4,60,73,0,110,
-0,99,0,114,0,
-101,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,114,0,101,0,
-109,0,101,0,110,
-0,116,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-55,0,1,283,1,
-3,1,5,1,4,
-1477,22,1,125,1,
-380,1478,17,1479,15,
-1480,4,38,37,0,
-67,0,111,0,110,
-0,115,0,116,0,
-97,0,110,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,-1,1,5,
-1481,20,1482,4,40,
-67,0,111,0,110,
-0,115,0,116,0,
-97,0,110,0,116,
+95,0,49,0,53,
+0,1,307,1,3,
+1,4,1,3,1440,
+22,1,146,1,1859,
+1441,16,0,335,1,
+1860,926,1,1804,1442,
+17,1247,1,0,1251,
+1,107,1443,17,1444,
+15,1387,1,-1,1,
+5,1445,20,1446,4,
+34,85,0,110,0,
+97,0,114,0,121,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,49,0,
-1,274,1,3,1,
-2,1,1,1483,22,
-1,116,1,883,1484,
-17,1485,15,1207,1,
--1,1,5,1486,20,
-1487,4,38,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,49,0,54,
-0,1,301,1,3,
-1,4,1,3,1488,
-22,1,143,1,1628,
-1489,17,1490,15,1491,
-4,22,37,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,1,
--1,1,5,1492,20,
-1493,4,24,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,1,239,1,
-3,1,4,1,3,
-1494,22,1,81,1,
-2075,1495,17,1228,1,
-0,1232,1,373,1496,
-17,1497,15,1278,1,
--1,1,5,1498,20,
-1499,4,60,73,0,
-110,0,99,0,114,
-0,101,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
-99,0,114,0,101,
-0,109,0,101,0,
-110,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,54,0,1,282,
-1,3,1,3,1,
-2,1500,22,1,124,
-1,130,1501,17,1502,
-15,1207,1,-1,1,
-5,1503,20,1504,4,
+1,311,1,3,1,
+3,1,2,1447,22,
+1,150,1,1114,1448,
+17,1290,1,3,1294,
+1,1048,1449,17,1450,
+15,1226,1,-1,1,
+5,1451,20,1452,4,
 38,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
@@ -5576,27 +5471,40 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,51,0,1,
-298,1,3,1,4,
-1,3,1505,22,1,
-140,1,143,1506,17,
-1507,15,1207,1,-1,
-1,5,1508,20,1509,
-4,38,66,0,105,
+49,0,56,0,1,
+310,1,3,1,4,
+1,3,1453,22,1,
+149,1,352,1454,17,
+1455,15,1226,1,-1,
+1,5,1456,20,1457,
+4,36,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,49,0,50,0,
-1,297,1,3,1,
-4,1,3,1510,22,
-1,139,1,1901,1511,
-17,1228,1,0,1232,
-1,1152,1512,17,1513,
-15,1184,1,-1,1,
-5,1514,20,1515,4,
+0,49,0,1,293,
+1,3,1,4,1,
+3,1458,22,1,132,
+1,1872,1459,16,0,
+345,1,1873,940,1,
+118,1460,17,1461,15,
+1226,1,-1,1,5,
+1462,20,1463,4,38,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,49,
+0,52,0,1,306,
+1,3,1,4,1,
+3,1464,22,1,145,
+1,1123,1465,17,1466,
+15,1202,1,-1,1,
+5,1467,20,1468,4,
 38,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
@@ -5604,106 +5512,185 @@ public yyLSLSyntax
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-50,0,52,0,1,
-264,1,3,1,6,
-1,5,1516,22,1,
-106,1,1406,1517,17,
-1518,15,1184,1,-1,
-1,5,1519,20,1520,
-4,38,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
+49,0,50,0,1,
+259,1,3,1,6,
+1,5,1469,22,1,
+98,1,371,1470,17,
+1471,15,1472,4,46,
+37,0,70,0,117,
+0,110,0,99,0,
+116,0,105,0,111,
+0,110,0,67,0,
+97,0,108,0,108,
+0,69,0,120,0,
+112,0,114,0,101,
 0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,55,0,
-1,257,1,3,1,
-4,1,3,1521,22,
-1,99,1,1659,1522,
-16,0,283,1,2413,
-1523,17,1228,1,0,
-1232,1,1159,1524,17,
-1525,15,1184,1,-1,
-1,5,1526,20,1527,
-4,38,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
+105,0,111,0,110,
+0,1,-1,1,5,
+1473,20,1474,4,48,
+70,0,117,0,110,
+0,99,0,116,0,
+105,0,111,0,110,
+0,67,0,97,0,
+108,0,108,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,49,0,1,292,
+1,3,1,2,1,
+1,1475,22,1,131,
+1,1377,1476,17,1477,
+15,1202,1,-1,1,
+5,1478,20,1479,4,
+36,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+53,0,1,252,1,
+3,1,4,1,3,
+1480,22,1,91,1,
+375,1481,17,1482,15,
+1297,1,-1,1,5,
+1483,20,1484,4,60,
+73,0,110,0,99,
+0,114,0,101,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,114,
+0,101,0,109,0,
+101,0,110,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
 0,115,0,115,0,
-105,0,103,0,110,
+105,0,111,0,110,
+0,95,0,56,0,
+1,291,1,3,1,
+5,1,4,1485,22,
+1,130,1,377,1486,
+17,1487,15,1297,1,
+-1,1,5,1488,20,
+1489,4,60,73,0,
+110,0,99,0,114,
+0,101,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,114,0,101,
 0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,49,0,
-1,251,1,3,1,
-6,1,5,1528,22,
-1,93,1,157,1529,
-17,1530,15,1207,1,
--1,1,5,1531,20,
-1532,4,38,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
+110,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,53,0,1,288,
+1,3,1,3,1,
+2,1490,22,1,127,
+1,379,1491,17,1492,
+15,1297,1,-1,1,
+5,1493,20,1494,4,
+60,73,0,110,0,
+99,0,114,0,101,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+114,0,101,0,109,
+0,101,0,110,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,55,
+0,1,290,1,3,
+1,5,1,4,1495,
+22,1,129,1,380,
+1496,17,1497,15,1498,
+4,38,37,0,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,49,0,49,
-0,1,296,1,3,
-1,4,1,3,1533,
-22,1,138,1,1413,
-1534,17,1535,15,1184,
-1,-1,1,5,1536,
-20,1537,4,36,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,52,0,
-1,244,1,3,1,
-4,1,3,1538,22,
-1,86,1,1370,1539,
-17,1540,15,1184,1,
--1,1,5,1541,20,
-1542,4,38,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
+1,-1,1,5,1499,
+20,1500,4,40,67,
+0,111,0,110,0,
+115,0,116,0,97,
 0,110,0,116,0,
-95,0,49,0,56,
-0,1,258,1,3,
-1,4,1,3,1543,
-22,1,100,1,1478,
-1544,17,1545,15,1184,
-1,-1,1,5,1546,
-20,1547,4,38,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,49,0,
-53,0,1,255,1,
-3,1,4,1,3,
-1548,22,1,97,1,
-1620,1549,17,1550,15,
-1491,1,-1,1,5,
-1551,20,1552,4,24,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,49,0,1,
+281,1,3,1,2,
+1,1,1501,22,1,
+120,1,883,1502,17,
+1503,15,1226,1,-1,
+1,5,1504,20,1505,
+4,38,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,49,0,54,0,
+1,308,1,3,1,
+4,1,3,1506,22,
+1,147,1,1628,1507,
+17,1508,15,1509,4,
+22,37,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,1,-1,
+1,5,1510,20,1511,
+4,24,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,49,
+0,1,246,1,3,
+1,4,1,3,1512,
+22,1,85,1,2075,
+1513,17,1247,1,0,
+1251,1,373,1514,17,
+1515,15,1297,1,-1,
+1,5,1516,20,1517,
+4,60,73,0,110,
+0,99,0,114,0,
+101,0,109,0,101,
 0,110,0,116,0,
-95,0,50,0,1,
-240,1,3,1,2,
-1,1,1553,22,1,
-82,1,1621,1554,16,
-0,749,1,1574,885,
-1,172,1555,17,1556,
-15,1207,1,-1,1,
-5,1557,20,1558,4,
+68,0,101,0,99,
+0,114,0,101,0,
+109,0,101,0,110,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+54,0,1,289,1,
+3,1,3,1,2,
+1518,22,1,128,1,
+130,1519,17,1520,15,
+1226,1,-1,1,5,
+1521,20,1522,4,38,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,49,
+0,51,0,1,305,
+1,3,1,4,1,
+3,1523,22,1,144,
+1,143,1524,17,1525,
+15,1226,1,-1,1,
+5,1526,20,1527,4,
 38,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
@@ -5711,27 +5698,14 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,48,0,1,
-295,1,3,1,4,
-1,3,1559,22,1,
-137,1,1931,946,1,
-1665,1560,17,1561,15,
-1242,1,-1,1,5,
-1562,20,1563,4,36,
-70,0,111,0,114,
-0,76,0,111,0,
-111,0,112,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,1,235,1,3,
-1,2,1,1,1564,
-22,1,77,1,2364,
-913,1,2105,900,1,
-1188,1565,17,1566,15,
-1184,1,-1,1,5,
-1567,20,1568,4,38,
+49,0,50,0,1,
+304,1,3,1,4,
+1,3,1528,22,1,
+143,1,1901,1529,17,
+1247,1,0,1251,1,
+1152,1530,17,1531,15,
+1202,1,-1,1,5,
+1532,20,1533,4,38,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
@@ -5739,12 +5713,12 @@ public yyLSLSyntax
 103,0,110,0,109,
 0,101,0,110,0,
 116,0,95,0,50,
-0,51,0,1,263,
+0,52,0,1,271,
 1,3,1,6,1,
-5,1569,22,1,105,
-1,1442,1570,17,1571,
-15,1184,1,-1,1,
-5,1572,20,1573,4,
+5,1534,22,1,110,
+1,1406,1535,17,1536,
+15,1202,1,-1,1,
+5,1537,20,1538,4,
 38,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
@@ -5752,28 +5726,54 @@ public yyLSLSyntax
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,54,0,1,
-256,1,3,1,4,
-1,3,1574,22,1,
-98,1,1694,1575,16,
-0,201,1,942,1576,
-17,1577,15,1207,1,
--1,1,5,1578,20,
-1579,4,38,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
+49,0,55,0,1,
+264,1,3,1,4,
+1,3,1539,22,1,
+103,1,1659,1540,16,
+0,291,1,2413,1541,
+17,1247,1,0,1251,
+1,1159,1542,17,1543,
+15,1202,1,-1,1,
+5,1544,20,1545,4,
+38,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
 115,0,115,0,105,
-0,111,0,110,0,
-95,0,49,0,55,
-0,1,302,1,3,
-1,4,1,3,1580,
-22,1,144,1,2198,
-1581,17,1228,1,0,
-1232,1,1195,1582,17,
-1583,15,1184,1,-1,
-1,5,1584,20,1585,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,49,0,1,
+258,1,3,1,6,
+1,5,1546,22,1,
+97,1,157,1547,17,
+1548,15,1226,1,-1,
+1,5,1549,20,1550,
+4,38,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,49,0,49,0,
+1,303,1,3,1,
+4,1,3,1551,22,
+1,142,1,1413,1552,
+17,1553,15,1202,1,
+-1,1,5,1554,20,
+1555,4,36,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+95,0,52,0,1,
+251,1,3,1,4,
+1,3,1556,22,1,
+90,1,1370,1557,17,
+1558,15,1202,1,-1,
+1,5,1559,20,1560,
 4,38,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -5781,149 +5781,121 @@ public yyLSLSyntax
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,48,0,
-1,250,1,3,1,
-6,1,5,1586,22,
-1,92,1,1449,1587,
-17,1588,15,1184,1,
--1,1,5,1589,20,
-1590,4,36,83,0,
+0,49,0,56,0,
+1,265,1,3,1,
+4,1,3,1561,22,
+1,104,1,1478,1562,
+17,1563,15,1202,1,
+-1,1,5,1564,20,
+1565,4,38,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,51,0,1,
-243,1,3,1,4,
-1,3,1591,22,1,
-85,1,1701,1592,17,
-1593,15,1242,1,-1,
-1,5,1594,20,1595,
-4,36,70,0,111,
-0,114,0,76,0,
-111,0,111,0,112,
-0,83,0,116,0,
-97,0,116,0,101,
+95,0,49,0,53,
+0,1,262,1,3,
+1,4,1,3,1566,
+22,1,101,1,1620,
+1567,17,1568,15,1509,
+1,-1,1,5,1569,
+20,1570,4,24,65,
+0,115,0,115,0,
+105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,51,0,1,237,
+0,50,0,1,247,
+1,3,1,2,1,
+1,1571,22,1,86,
+1,1621,1572,16,0,
+772,1,1574,904,1,
+172,1573,17,1574,15,
+1226,1,-1,1,5,
+1575,20,1576,4,38,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,49,
+0,48,0,1,302,
 1,3,1,4,1,
-3,1596,22,1,79,
-1,447,1597,17,1598,
-15,1599,4,30,37,
-0,86,0,101,0,
-99,0,116,0,111,
-0,114,0,67,0,
-111,0,110,0,115,
-0,116,0,97,0,
-110,0,116,0,1,
--1,1,5,1600,20,
-1601,4,32,86,0,
-101,0,99,0,116,
+3,1577,22,1,141,
+1,1931,965,1,1665,
+1578,17,1579,15,1261,
+1,-1,1,5,1580,
+20,1581,4,36,70,
 0,111,0,114,0,
-67,0,111,0,110,
-0,115,0,116,0,
-97,0,110,0,116,
+76,0,111,0,111,
+0,112,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
 0,95,0,49,0,
-1,272,1,3,1,
-8,1,7,1602,22,
-1,114,1,2458,961,
-1,2459,967,1,1958,
-1603,17,1228,1,0,
-1232,1,188,1604,17,
-1605,15,1207,1,-1,
-1,5,1606,20,1607,
-4,36,66,0,105,
+1,242,1,3,1,
+2,1,1,1582,22,
+1,81,1,2364,932,
+1,2105,919,1,1188,
+1583,17,1584,15,1202,
+1,-1,1,5,1585,
+20,1586,4,38,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
+101,0,110,0,116,
+0,95,0,50,0,
+51,0,1,270,1,
+3,1,6,1,5,
+1587,22,1,109,1,
+1442,1588,17,1589,15,
+1202,1,-1,1,5,
+1590,20,1591,4,38,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,49,
+0,54,0,1,263,
+1,3,1,4,1,
+3,1592,22,1,102,
+1,1694,1593,16,0,
+206,1,942,1594,17,
+1595,15,1226,1,-1,
+1,5,1596,20,1597,
+4,38,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,57,0,1,294,
-1,3,1,4,1,
-3,1608,22,1,136,
-1,2462,974,1,1657,
-979,1,2464,984,1,
-205,1609,17,1610,15,
-1207,1,-1,1,5,
-1611,20,1612,4,36,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,56,
-0,1,293,1,3,
-1,4,1,3,1613,
-22,1,135,1,2227,
-993,1,1224,1614,17,
-1615,15,1184,1,-1,
-1,5,1616,20,1617,
-4,38,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,50,0,50,0,
-1,262,1,3,1,
-6,1,5,1618,22,
-1,104,1,223,1619,
-17,1620,15,1207,1,
--1,1,5,1621,20,
-1622,4,36,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
+0,49,0,55,0,
+1,309,1,3,1,
+4,1,3,1598,22,
+1,148,1,2198,1599,
+17,1247,1,0,1251,
+1,1195,1600,17,1601,
+15,1202,1,-1,1,
+5,1602,20,1603,4,
+38,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
 115,0,115,0,105,
-0,111,0,110,0,
-95,0,55,0,1,
-292,1,3,1,4,
-1,3,1623,22,1,
-134,1,1730,1624,17,
-1625,15,1242,1,-1,
-1,5,1626,20,1627,
-4,36,70,0,111,
-0,114,0,76,0,
-111,0,111,0,112,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,52,0,1,238,
-1,3,1,4,1,
-3,1628,22,1,80,
-1,476,1629,17,1630,
-15,1631,4,18,37,
-0,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,1,-1,1,
-5,1632,20,1633,4,
-20,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,95,0,52,
-0,1,270,1,3,
-1,2,1,1,1634,
-22,1,112,1,477,
-1635,17,1636,15,1631,
-1,-1,1,5,1637,
-20,1638,4,20,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-95,0,51,0,1,
-269,1,3,1,2,
-1,1,1639,22,1,
-111,1,1231,1640,17,
-1641,15,1184,1,-1,
-1,5,1642,20,1643,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,48,0,1,
+257,1,3,1,6,
+1,5,1604,22,1,
+96,1,1449,1605,17,
+1606,15,1202,1,-1,
+1,5,1607,20,1608,
 4,36,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -5931,92 +5903,214 @@ public yyLSLSyntax
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,57,0,1,249,
-1,3,1,6,1,
-5,1644,22,1,91,
-1,479,1645,17,1646,
-15,1631,1,-1,1,
-5,1647,20,1648,4,
-20,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,95,0,49,
-0,1,267,1,3,
-1,2,1,1,1649,
-22,1,109,1,480,
-1650,17,1651,15,1652,
-4,26,37,0,76,
-0,105,0,115,0,
-116,0,67,0,111,
+0,51,0,1,250,
+1,3,1,4,1,
+3,1609,22,1,89,
+1,1701,1610,17,1611,
+15,1261,1,-1,1,
+5,1612,20,1613,4,
+36,70,0,111,0,
+114,0,76,0,111,
+0,111,0,112,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+51,0,1,244,1,
+3,1,4,1,3,
+1614,22,1,83,1,
+447,1615,17,1616,15,
+1617,4,30,37,0,
+86,0,101,0,99,
+0,116,0,111,0,
+114,0,67,0,111,
 0,110,0,115,0,
 116,0,97,0,110,
 0,116,0,1,-1,
-1,5,1653,20,1654,
-4,28,76,0,105,
+1,5,1618,20,1619,
+4,32,86,0,101,
+0,99,0,116,0,
+111,0,114,0,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+95,0,49,0,1,
+279,1,3,1,8,
+1,7,1620,22,1,
+118,1,2458,980,1,
+2459,986,1,1958,1621,
+17,1247,1,0,1251,
+1,188,1622,17,1623,
+15,1226,1,-1,1,
+5,1624,20,1625,4,
+36,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+57,0,1,301,1,
+3,1,4,1,3,
+1626,22,1,140,1,
+2462,993,1,1657,998,
+1,2464,1003,1,205,
+1627,17,1628,15,1226,
+1,-1,1,5,1629,
+20,1630,4,36,66,
+0,105,0,110,0,
+97,0,114,0,121,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,56,0,
+1,300,1,3,1,
+4,1,3,1631,22,
+1,139,1,2227,1012,
+1,1224,1632,17,1633,
+15,1202,1,-1,1,
+5,1634,20,1635,4,
+38,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+50,0,50,0,1,
+269,1,3,1,6,
+1,5,1636,22,1,
+108,1,223,1637,17,
+1638,15,1226,1,-1,
+1,5,1639,20,1640,
+4,36,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,55,0,1,299,
+1,3,1,4,1,
+3,1641,22,1,138,
+1,1730,1642,17,1643,
+15,1261,1,-1,1,
+5,1644,20,1645,4,
+36,70,0,111,0,
+114,0,76,0,111,
+0,111,0,112,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+52,0,1,245,1,
+3,1,4,1,3,
+1646,22,1,84,1,
+476,1647,17,1648,15,
+1649,4,18,37,0,
+67,0,111,0,110,
 0,115,0,116,0,
+97,0,110,0,116,
+0,1,-1,1,5,
+1650,20,1651,4,20,
 67,0,111,0,110,
 0,115,0,116,0,
 97,0,110,0,116,
-0,95,0,49,0,
-1,271,1,3,1,
-4,1,3,1655,22,
-1,113,1,1485,1656,
-17,1657,15,1184,1,
--1,1,5,1658,20,
-1659,4,36,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,50,0,1,
-242,1,3,1,4,
-1,3,1660,22,1,
-84,1,1737,1661,16,
-0,285,1,1989,1002,
-1,1990,1662,17,1228,
-1,0,1232,1,2746,
-1663,16,0,297,1,
-242,1664,17,1665,15,
-1207,1,-1,1,5,
-1666,20,1667,4,36,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,54,
-0,1,291,1,3,
-1,4,1,3,1668,
-22,1,133,1,478,
-1669,17,1670,15,1631,
-1,-1,1,5,1671,
-20,1672,4,20,67,
+0,95,0,52,0,
+1,277,1,3,1,
+2,1,1,1652,22,
+1,116,1,477,1653,
+17,1654,15,1649,1,
+-1,1,5,1655,20,
+1656,4,20,67,0,
+111,0,110,0,115,
+0,116,0,97,0,
+110,0,116,0,95,
+0,51,0,1,276,
+1,3,1,2,1,
+1,1657,22,1,115,
+1,1231,1658,17,1659,
+15,1202,1,-1,1,
+5,1660,20,1661,4,
+36,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+57,0,1,256,1,
+3,1,6,1,5,
+1662,22,1,95,1,
+479,1663,17,1664,15,
+1649,1,-1,1,5,
+1665,20,1666,4,20,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,95,0,49,0,
+1,274,1,3,1,
+2,1,1,1667,22,
+1,113,1,480,1668,
+17,1669,15,1670,4,
+26,37,0,76,0,
+105,0,115,0,116,
+0,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,1,-1,1,
+5,1671,20,1672,4,
+28,76,0,105,0,
+115,0,116,0,67,
 0,111,0,110,0,
 115,0,116,0,97,
 0,110,0,116,0,
-95,0,50,0,1,
-268,1,3,1,2,
-1,1,1673,22,1,
-110,1,1001,1674,17,
-1675,15,1310,1,-1,
+95,0,49,0,1,
+278,1,3,1,4,
+1,3,1673,22,1,
+117,1,1485,1674,17,
+1675,15,1202,1,-1,
 1,5,1676,20,1677,
-4,40,84,0,121,
-0,112,0,101,0,
-99,0,97,0,115,
-0,116,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-56,0,1,316,1,
-3,1,5,1,4,
-1678,22,1,158,1,
-1002,1679,17,1680,15,
-1310,1,-1,1,5,
-1681,20,1682,4,40,
+4,36,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,50,0,1,249,
+1,3,1,4,1,
+3,1678,22,1,88,
+1,1737,1679,16,0,
+293,1,1989,1020,1,
+1990,1680,17,1247,1,
+0,1251,1,242,1681,
+17,1682,15,1226,1,
+-1,1,5,1683,20,
+1684,4,36,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,54,0,1,
+298,1,3,1,4,
+1,3,1685,22,1,
+137,1,478,1686,17,
+1687,15,1649,1,-1,
+1,5,1688,20,1689,
+4,20,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
+0,116,0,95,0,
+50,0,1,275,1,
+3,1,2,1,1,
+1690,22,1,114,1,
+1001,1691,17,1692,15,
+1329,1,-1,1,5,
+1693,20,1694,4,40,
 84,0,121,0,112,
 0,101,0,99,0,
 97,0,115,0,116,
@@ -6024,350 +6118,414 @@ public yyLSLSyntax
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
+0,95,0,56,0,
+1,323,1,3,1,
+5,1,4,1695,22,
+1,162,1,1002,1696,
+17,1697,15,1329,1,
+-1,1,5,1698,20,
+1699,4,40,84,0,
+121,0,112,0,101,
+0,99,0,97,0,
+115,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,49,0,1,316,
+1,3,1,5,1,
+4,1700,22,1,155,
+1,2760,1701,16,0,
+137,1,12,1702,19,
+166,1,12,1703,5,
+49,1,1901,1704,16,
+0,164,1,2075,1705,
+16,0,164,1,1860,
+926,1,1803,892,1,
+1804,1706,16,0,164,
+1,2518,1707,16,0,
+164,1,2413,1708,16,
+0,164,1,2198,1709,
+16,0,164,1,1873,
+940,1,1657,998,1,
+2639,1710,16,0,738,
+1,2533,1711,16,0,
+164,1,1989,1020,1,
+1990,1712,16,0,164,
+1,2756,1713,16,0,
+164,1,32,1714,16,
+0,164,1,31,1715,
+16,0,164,1,2541,
+1716,16,0,164,1,
+2106,1717,16,0,164,
+1,2549,1718,16,0,
+164,1,2578,1719,16,
+0,164,1,2227,1012,
+1,2337,1720,16,0,
+164,1,2558,1721,16,
+0,164,1,2563,1722,
+16,0,164,1,2021,
+823,1,2458,980,1,
+2459,986,1,2462,993,
+1,2136,947,1,2464,
+1003,1,2029,830,1,
+2030,836,1,2031,841,
+1,2032,846,1,2469,
+1723,16,0,525,1,
+2035,857,1,2364,932,
+1,2039,867,1,1931,
+965,1,2041,873,1,
+2043,879,1,2045,884,
+1,1775,1724,16,0,
+164,1,2033,851,1,
+2037,862,1,1574,904,
+1,2105,919,1,1958,
+1725,16,0,164,1,
+13,1726,19,507,1,
+13,1727,5,52,1,
+1860,926,1,1803,892,
+1,2625,1728,17,1729,
+15,1730,4,20,37,
+0,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,1,
+-1,1,5,1731,20,
+1732,4,24,83,0,
+116,0,97,0,116,
+0,101,0,66,0,
+111,0,100,0,121,
 0,95,0,49,0,
-1,309,1,3,1,
-5,1,4,1683,22,
-1,151,1,12,1684,
-19,167,1,12,1685,
-5,48,1,1901,1686,
-16,0,165,1,2033,
-832,1,2622,1687,16,
-0,626,1,1860,907,
-1,1803,873,1,1804,
-1688,16,0,165,1,
-2735,1689,16,0,165,
-1,2518,1690,16,0,
-165,1,2413,1691,16,
-0,165,1,2198,1692,
-16,0,165,1,2527,
-1693,16,0,165,1,
-1657,979,1,1989,1002,
-1,2535,1694,16,0,
-165,1,31,1695,16,
-0,165,1,32,1696,
-16,0,165,1,2105,
-900,1,2106,1697,16,
-0,165,1,2544,1698,
-16,0,165,1,2549,
-1699,16,0,165,1,
-2227,993,1,2337,1700,
-16,0,165,1,2564,
-1701,16,0,165,1,
-2021,804,1,2458,961,
-1,2459,967,1,2462,
-974,1,2136,928,1,
-2464,984,1,2029,811,
-1,2030,817,1,2031,
-822,1,2032,827,1,
-2469,1702,16,0,509,
-1,2035,838,1,2364,
-913,1,2039,848,1,
-1931,946,1,2041,854,
-1,1873,921,1,2043,
-860,1,2045,865,1,
-1775,1703,16,0,165,
-1,1990,1704,16,0,
-165,1,2075,1705,16,
-0,165,1,2037,843,
-1,1574,885,1,1958,
-1706,16,0,165,1,
-13,1707,19,492,1,
-13,1708,5,49,1,
-2616,1709,17,1710,15,
-1711,4,20,37,0,
+50,0,1,188,1,
+3,1,3,1,2,
+1733,22,1,26,1,
+2626,1734,17,1735,15,
+1730,1,-1,1,5,
+1736,20,1737,4,24,
 83,0,116,0,97,
 0,116,0,101,0,
 66,0,111,0,100,
-0,121,0,1,-1,
-1,5,1712,20,1713,
-4,24,83,0,116,
+0,121,0,95,0,
+49,0,48,0,1,
+186,1,3,1,3,
+1,2,1738,22,1,
+24,1,2627,1739,17,
+1740,15,1730,1,-1,
+1,5,1741,20,1742,
+4,22,83,0,116,
 0,97,0,116,0,
 101,0,66,0,111,
 0,100,0,121,0,
-95,0,49,0,49,
-0,1,184,1,3,
-1,2,1,1,1714,
-22,1,25,1,2617,
-1715,17,1716,15,1711,
-1,-1,1,5,1717,
-20,1718,4,22,83,
-0,116,0,97,0,
-116,0,101,0,66,
-0,111,0,100,0,
-121,0,95,0,57,
-0,1,182,1,3,
-1,2,1,1,1719,
-22,1,23,1,2618,
-1720,17,1721,15,1711,
-1,-1,1,5,1722,
-20,1723,4,22,83,
+95,0,56,0,1,
+184,1,3,1,3,
+1,2,1743,22,1,
+22,1,2628,1744,17,
+1745,15,1730,1,-1,
+1,5,1746,20,1747,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,54,0,1,
+182,1,3,1,3,
+1,2,1748,22,1,
+20,1,2520,1749,17,
+1750,15,1751,4,46,
+37,0,73,0,110,
+0,116,0,86,0,
+101,0,99,0,86,
+0,101,0,99,0,
+65,0,114,0,103,
+0,83,0,116,0,
+97,0,116,0,101,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,-1,1,5,
+1752,20,1753,4,48,
+73,0,110,0,116,
+0,86,0,101,0,
+99,0,86,0,101,
+0,99,0,65,0,
+114,0,103,0,83,
 0,116,0,97,0,
-116,0,101,0,66,
-0,111,0,100,0,
-121,0,95,0,55,
-0,1,180,1,3,
-1,2,1,1,1724,
-22,1,21,1,2619,
-1725,17,1726,15,1711,
-1,-1,1,5,1727,
-20,1728,4,22,83,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,49,0,1,197,
+1,3,1,6,1,
+5,1754,22,1,35,
+1,2630,1755,17,1756,
+15,1730,1,-1,1,
+5,1757,20,1758,4,
+22,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,95,
+0,50,0,1,178,
+1,3,1,3,1,
+2,1759,22,1,16,
+1,2413,1760,16,0,
+505,1,2632,1761,17,
+1762,15,1730,1,-1,
+1,5,1763,20,1764,
+4,24,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,49,0,51,
+0,1,189,1,3,
+1,2,1,1,1765,
+22,1,27,1,2633,
+1766,17,1767,15,1730,
+1,-1,1,5,1768,
+20,1769,4,24,83,
 0,116,0,97,0,
 116,0,101,0,66,
 0,111,0,100,0,
-121,0,95,0,53,
-0,1,178,1,3,
-1,2,1,1,1729,
-22,1,19,1,2620,
-1730,17,1731,15,1711,
-1,-1,1,5,1732,
-20,1733,4,22,83,
+121,0,95,0,49,
+0,49,0,1,187,
+1,3,1,2,1,
+1,1770,22,1,25,
+1,2634,1771,17,1772,
+15,1730,1,-1,1,
+5,1773,20,1774,4,
+22,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,95,
+0,57,0,1,185,
+1,3,1,2,1,
+1,1775,22,1,23,
+1,2635,1776,17,1777,
+15,1730,1,-1,1,
+5,1778,20,1779,4,
+22,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,95,
+0,55,0,1,183,
+1,3,1,2,1,
+1,1780,22,1,21,
+1,1873,940,1,2637,
+1781,17,1782,15,1730,
+1,-1,1,5,1783,
+20,1784,4,22,83,
 0,116,0,97,0,
 116,0,101,0,66,
 0,111,0,100,0,
 121,0,95,0,51,
-0,1,176,1,3,
-1,2,1,1,1734,
-22,1,17,1,2621,
-1735,17,1736,15,1711,
-1,-1,1,5,1737,
-20,1738,4,22,83,
+0,1,179,1,3,
+1,2,1,1,1785,
+22,1,17,1,2638,
+1786,17,1787,15,1730,
+1,-1,1,5,1788,
+20,1789,4,22,83,
 0,116,0,97,0,
 116,0,101,0,66,
 0,111,0,100,0,
 121,0,95,0,49,
-0,1,174,1,3,
-1,2,1,1,1739,
-22,1,15,1,1860,
-907,1,1803,873,1,
-2520,1740,17,1741,15,
-1742,4,46,37,0,
-73,0,110,0,116,
-0,82,0,111,0,
-116,0,82,0,111,
-0,116,0,65,0,
-114,0,103,0,83,
-0,116,0,97,0,
-116,0,101,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
--1,1,5,1743,20,
-1744,4,48,73,0,
-110,0,116,0,82,
+0,1,177,1,3,
+1,2,1,1,1790,
+22,1,15,1,1989,
+1020,1,2535,1791,17,
+1792,15,1793,4,46,
+37,0,73,0,110,
+0,116,0,82,0,
+111,0,116,0,82,
 0,111,0,116,0,
-82,0,111,0,116,
-0,65,0,114,0,
-103,0,83,0,116,
-0,97,0,116,0,
-101,0,69,0,118,
-0,101,0,110,0,
-116,0,95,0,49,
-0,1,191,1,3,
-1,6,1,5,1745,
-22,1,32,1,2413,
-1746,16,0,490,1,
-1657,979,1,1873,921,
-1,2529,1747,17,1748,
-15,1749,4,40,37,
-0,86,0,101,0,
-99,0,116,0,111,
-0,114,0,65,0,
-114,0,103,0,83,
-0,116,0,97,0,
-116,0,101,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
--1,1,5,1750,20,
-1751,4,42,86,0,
-101,0,99,0,116,
-0,111,0,114,0,
 65,0,114,0,103,
 0,83,0,116,0,
 97,0,116,0,101,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,49,0,
-1,190,1,3,1,
-6,1,5,1752,22,
-1,31,1,2664,1753,
-16,0,707,1,1989,
-1002,1,2537,1754,17,
-1755,15,1756,4,34,
-37,0,73,0,110,
+0,1,-1,1,5,
+1794,20,1795,4,48,
+73,0,110,0,116,
+0,82,0,111,0,
+116,0,82,0,111,
 0,116,0,65,0,
 114,0,103,0,83,
 0,116,0,97,0,
 116,0,101,0,69,
 0,118,0,101,0,
-110,0,116,0,1,
--1,1,5,1757,20,
-1758,4,36,73,0,
-110,0,116,0,65,
-0,114,0,103,0,
-83,0,116,0,97,
-0,116,0,101,0,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,49,0,1,
-189,1,3,1,6,
-1,5,1759,22,1,
-30,1,32,1760,16,
-0,502,1,2105,900,
-1,2546,1761,17,1762,
-15,1763,4,34,37,
-0,75,0,101,0,
-121,0,65,0,114,
+110,0,116,0,95,
+0,49,0,1,196,
+1,3,1,6,1,
+5,1796,22,1,34,
+1,2037,862,1,32,
+1797,16,0,513,1,
+2105,919,1,2464,1003,
+1,2551,1798,17,1799,
+15,1800,4,34,37,
+0,73,0,110,0,
+116,0,65,0,114,
 0,103,0,83,0,
 116,0,97,0,116,
 0,101,0,69,0,
 118,0,101,0,110,
 0,116,0,1,-1,
-1,5,1764,20,1765,
-4,36,75,0,101,
-0,121,0,65,0,
+1,5,1801,20,1802,
+4,36,73,0,110,
+0,116,0,65,0,
 114,0,103,0,83,
 0,116,0,97,0,
 116,0,101,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,49,0,1,188,
+0,49,0,1,194,
 1,3,1,6,1,
-5,1766,22,1,29,
-1,2364,913,1,2551,
-1767,17,1768,15,1769,
-4,36,37,0,86,
-0,111,0,105,0,
-100,0,65,0,114,
-0,103,0,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,1,-1,
-1,5,1770,20,1771,
-4,38,86,0,111,
-0,105,0,100,0,
+5,1803,22,1,32,
+1,2580,1804,17,1805,
+15,1806,4,22,37,
+0,83,0,116,0,
+97,0,116,0,101,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,-1,1,5,
+1807,20,1808,4,24,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+191,1,3,1,6,
+1,5,1809,22,1,
+29,1,2227,1012,1,
+1574,904,1,2560,1810,
+17,1811,15,1812,4,
+34,37,0,75,0,
+101,0,121,0,65,
+0,114,0,103,0,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,-1,1,5,1813,
+20,1814,4,36,75,
+0,101,0,121,0,
 65,0,114,0,103,
 0,83,0,116,0,
 97,0,116,0,101,
 0,69,0,118,0,
 101,0,110,0,116,
 0,95,0,49,0,
-1,187,1,3,1,
-5,1,4,1772,22,
-1,28,1,2227,993,
-1,1574,885,1,2566,
-1773,17,1774,15,1775,
-4,22,37,0,83,
-0,116,0,97,0,
-116,0,101,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
--1,1,5,1776,20,
-1777,4,24,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-49,0,1,186,1,
-3,1,6,1,5,
-1778,22,1,27,1,
-2458,961,1,2459,967,
-1,2462,974,1,2136,
-928,1,2464,984,1,
-2029,811,1,2030,817,
-1,2031,822,1,2032,
-827,1,2033,832,1,
-2035,838,1,2037,843,
-1,2039,848,1,1931,
-946,1,2041,854,1,
-2021,804,1,2043,860,
-1,2045,865,1,2568,
-1779,16,0,686,1,
-2609,1780,17,1781,15,
-1711,1,-1,1,5,
-1782,20,1783,4,24,
+1,193,1,3,1,
+6,1,5,1815,22,
+1,31,1,2565,1816,
+17,1817,15,1818,4,
+36,37,0,86,0,
+111,0,105,0,100,
+0,65,0,114,0,
+103,0,83,0,116,
+0,97,0,116,0,
+101,0,69,0,118,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,1819,20,1820,4,
+38,86,0,111,0,
+105,0,100,0,65,
+0,114,0,103,0,
 83,0,116,0,97,
 0,116,0,101,0,
-66,0,111,0,100,
-0,121,0,95,0,
-49,0,50,0,1,
-185,1,3,1,3,
-1,2,1784,22,1,
-26,1,2610,1785,17,
-1786,15,1711,1,-1,
-1,5,1787,20,1788,
-4,24,83,0,116,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+192,1,3,1,5,
+1,4,1821,22,1,
+30,1,2021,823,1,
+2458,980,1,2459,986,
+1,2462,993,1,2136,
+947,1,2682,1822,16,
+0,744,1,2029,830,
+1,2030,836,1,2031,
+841,1,2032,846,1,
+2033,851,1,1657,998,
+1,2035,857,1,2364,
+932,1,2039,867,1,
+1931,965,1,2041,873,
+1,2043,879,1,2045,
+884,1,2543,1823,17,
+1824,15,1825,4,40,
+37,0,86,0,101,
+0,99,0,116,0,
+111,0,114,0,65,
+0,114,0,103,0,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,-1,1,5,1826,
+20,1827,4,42,86,
+0,101,0,99,0,
+116,0,111,0,114,
+0,65,0,114,0,
+103,0,83,0,116,
 0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-95,0,49,0,48,
-0,1,183,1,3,
-1,3,1,2,1789,
-22,1,24,1,2611,
-1790,17,1791,15,1711,
-1,-1,1,5,1792,
-20,1793,4,22,83,
-0,116,0,97,0,
-116,0,101,0,66,
-0,111,0,100,0,
-121,0,95,0,56,
-0,1,181,1,3,
-1,3,1,2,1794,
-22,1,22,1,2612,
-1795,17,1796,15,1711,
-1,-1,1,5,1797,
-20,1798,4,22,83,
-0,116,0,97,0,
-116,0,101,0,66,
-0,111,0,100,0,
-121,0,95,0,54,
-0,1,179,1,3,
-1,3,1,2,1799,
-22,1,20,1,2613,
-1800,17,1801,15,1711,
-1,-1,1,5,1802,
-20,1803,4,22,83,
-0,116,0,97,0,
-116,0,101,0,66,
-0,111,0,100,0,
-121,0,95,0,52,
-0,1,177,1,3,
-1,3,1,2,1804,
-22,1,18,1,2614,
-1805,17,1806,15,1711,
-1,-1,1,5,1807,
-20,1808,4,22,83,
+101,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,49,
+0,1,195,1,3,
+1,6,1,5,1828,
+22,1,33,1,2624,
+1829,17,1830,15,1730,
+1,-1,1,5,1831,
+20,1832,4,24,83,
 0,116,0,97,0,
 116,0,101,0,66,
 0,111,0,100,0,
-121,0,95,0,50,
-0,1,175,1,3,
-1,3,1,2,1809,
-22,1,16,1,14,
-1810,19,154,1,14,
-1811,5,109,1,2512,
-1812,17,1813,15,1814,
-4,30,37,0,82,
-0,111,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,1,-1,1,
-5,1815,20,1816,4,
-32,82,0,111,0,
-116,0,68,0,101,
+121,0,95,0,49,
+0,52,0,1,190,
+1,3,1,3,1,
+2,1833,22,1,28,
+1,2629,1834,17,1835,
+15,1730,1,-1,1,
+5,1836,20,1837,4,
+22,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,95,
+0,52,0,1,180,
+1,3,1,3,1,
+2,1838,22,1,18,
+1,2582,1839,16,0,
+731,1,2636,1840,17,
+1841,15,1730,1,-1,
+1,5,1842,20,1843,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,53,0,1,
+181,1,3,1,2,
+1,1,1844,22,1,
+19,1,14,1845,19,
+153,1,14,1846,5,
+112,1,2512,1847,17,
+1848,15,1849,4,36,
+37,0,86,0,101,
+0,99,0,116,0,
+111,0,114,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,1,-1,1,5,
+1850,20,1851,4,38,
+86,0,101,0,99,
+0,116,0,111,0,
+114,0,68,0,101,
 0,99,0,108,0,
 97,0,114,0,97,
 0,116,0,105,0,
 111,0,110,0,95,
-0,49,0,1,202,
+0,49,0,1,208,
 1,3,1,3,1,
-2,1817,22,1,44,
-1,2513,1818,16,0,
-457,1,1260,1182,1,
-1011,1188,1,1514,1194,
-1,9,1199,1,10,
-1819,17,1820,15,1821,
+2,1852,22,1,47,
+1,2513,1853,16,0,
+476,1,1260,1200,1,
+1011,1207,1,1514,1213,
+1,9,1218,1,10,
+1854,17,1855,15,1856,
 4,48,37,0,65,
 0,114,0,103,0,
 117,0,109,0,101,
@@ -6378,809 +6536,847 @@ public yyLSLSyntax
 0,105,0,111,0,
 110,0,76,0,105,
 0,115,0,116,0,
-1,-1,1,5,150,
-1,0,1,0,1822,
-22,1,33,1,262,
-1205,1,1267,1211,1,
-1521,1216,1,1773,1823,
-16,0,158,1,19,
-1233,1,20,1824,16,
-0,152,1,2281,1240,
-1,525,1302,1,30,
-1825,17,1826,15,1821,
-1,-1,1,5,1827,
-20,1828,4,50,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
-95,0,50,0,1,
-193,1,3,1,4,
-1,3,1829,22,1,
-35,1,1002,1679,1,
-283,1258,1,40,1263,
-1,41,1830,17,1831,
-15,1832,4,26,37,
-0,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,76,0,105,
-0,115,0,116,0,
-1,-1,1,5,676,
-1,0,1,0,1833,
-22,1,161,1,42,
-1834,17,1835,15,1836,
-4,38,37,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-1,-1,1,5,1837,
-20,1838,4,40,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,1,
-321,1,3,1,2,
-1,1,1839,22,1,
-164,1,2553,1840,17,
-1841,15,1821,1,-1,
-1,5,150,1,0,
-1,0,1822,1,44,
-1269,1,47,1270,1,
-48,1276,1,49,1282,
-1,50,1287,1,51,
-1292,1,2562,1842,16,
-0,152,1,305,1297,
-1,2733,1843,16,0,
-152,1,63,1308,1,
-66,1315,1,67,1320,
-1,1478,1544,1,69,
-1330,1,70,1335,1,
-68,1325,1,74,1340,
-1,1013,1345,1,2335,
-1844,16,0,158,1,
-1332,1350,1,1048,1431,
-1,82,1367,1,1296,
-1253,1,1341,1384,1,
-328,1389,1,1303,1394,
-1,1096,1399,1,93,
-1405,1,1550,1410,1,
-352,1436,1,107,1425,
-1,1114,1430,1,1370,
-1539,1,118,1442,1,
-1123,1447,1,371,1452,
-1,1377,1458,1,375,
-1463,1,377,1468,1,
-379,1473,1,380,1478,
-1,883,1484,1,373,
-1496,1,130,1501,1,
-143,1506,1,1152,1512,
-1,387,1845,16,0,
-639,1,1406,1517,1,
-1159,1524,1,157,1529,
-1,1413,1534,1,1665,
-1560,1,412,1846,16,
-0,652,1,1094,1847,
-16,0,678,1,172,
-1555,1,827,1418,1,
-1188,1565,1,437,1848,
-16,0,727,1,1442,
-1570,1,1694,1849,16,
-0,158,1,942,1576,
-1,1195,1582,1,1449,
-1587,1,1701,1592,1,
-447,1597,1,188,1604,
-1,205,1609,1,2467,
-1850,17,1851,15,1821,
-1,-1,1,5,1852,
-20,1853,4,50,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
-95,0,49,0,1,
-192,1,3,1,2,
-1,1,1854,22,1,
-34,1,461,1855,16,
-0,678,1,464,1856,
-17,1857,15,1832,1,
--1,1,5,1858,20,
-1859,4,28,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,76,
-0,105,0,115,0,
-116,0,95,0,50,
-0,1,320,1,3,
-1,4,1,3,1860,
-22,1,163,1,2724,
-1861,17,1862,15,1821,
-1,-1,1,5,150,
-1,0,1,0,1822,
-1,1224,1614,1,223,
-1619,1,1730,1624,1,
-476,1629,1,477,1635,
-1,1231,1640,1,479,
-1645,1,480,1650,1,
-1485,1656,1,459,1863,
-17,1864,15,1832,1,
--1,1,5,676,1,
-0,1,0,1833,1,
-242,1664,1,478,1669,
-1,481,1865,17,1866,
-15,1832,1,-1,1,
-5,1867,20,1868,4,
-28,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,76,0,105,
-0,115,0,116,0,
-95,0,49,0,1,
-319,1,3,1,2,
-1,1,1869,22,1,
-162,1,1001,1674,1,
-2508,1870,17,1871,15,
-1872,4,30,37,0,
-73,0,110,0,116,
+1,-1,1,5,149,
+1,0,1,0,1857,
+22,1,36,1,262,
+1224,1,1267,1230,1,
+2524,1858,16,0,490,
+1,1521,1235,1,1773,
+1859,16,0,157,1,
+2527,1860,17,1861,15,
+1862,4,30,37,0,
+82,0,111,0,116,
 0,68,0,101,0,
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
 0,110,0,1,-1,
-1,5,1873,20,1874,
-4,32,73,0,110,
+1,5,1863,20,1864,
+4,32,82,0,111,
 0,116,0,68,0,
 101,0,99,0,108,
 0,97,0,114,0,
 97,0,116,0,105,
 0,111,0,110,0,
 95,0,49,0,1,
-200,1,3,1,3,
-1,2,1875,22,1,
-42,1,2509,1876,16,
-0,451,1,15,1877,
-19,314,1,15,1878,
-5,6,1,2739,1879,
-16,0,732,1,1114,
-1880,16,0,312,1,
-1621,1881,16,0,726,
-1,40,1882,16,0,
-632,1,19,1233,1,
-9,1199,1,16,1883,
-19,136,1,16,1884,
-5,144,1,256,1885,
-16,0,198,1,1261,
-1886,16,0,198,1,
-509,1887,16,0,198,
-1,9,1888,16,0,
-134,1,2521,1889,16,
-0,466,1,2021,804,
-1,1775,1890,16,0,
-198,1,2530,1891,16,
-0,483,1,2029,811,
-1,2030,817,1,2031,
-822,1,2032,827,1,
-2033,832,1,277,1892,
-16,0,198,1,2035,
-838,1,2538,1893,16,
-0,496,1,2037,843,
-1,2039,848,1,32,
-1894,16,0,198,1,
-2041,854,1,2293,1895,
-16,0,198,1,2043,
-860,1,2547,1896,16,
-0,508,1,40,1897,
-16,0,177,1,41,
-1898,16,0,198,1,
-1297,1899,16,0,198,
-1,43,1900,16,0,
-198,1,44,1901,16,
-0,177,1,1803,873,
-1,1804,1902,16,0,
-198,1,299,1903,16,
-0,198,1,2480,1904,
-17,1905,15,1906,4,
+209,1,3,1,3,
+1,2,1865,22,1,
+48,1,2528,1866,16,
+0,496,1,19,1252,
+1,20,1867,16,0,
+151,1,2281,1259,1,
+525,1321,1,30,1868,
+17,1869,15,1856,1,
+-1,1,5,1870,20,
+1871,4,50,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,76,0,105,0,
+115,0,116,0,95,
+0,50,0,1,199,
+1,3,1,4,1,
+3,1872,22,1,38,
+1,1002,1696,1,283,
+1277,1,40,1282,1,
+41,1873,17,1874,15,
+1875,4,26,37,0,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,76,0,105,0,
+115,0,116,0,1,
+-1,1,5,698,1,
+0,1,0,1876,22,
+1,165,1,42,1877,
+17,1878,15,1879,4,
+38,37,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,1,
+-1,1,5,1880,20,
+1881,4,40,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,95,
+0,49,0,1,328,
+1,3,1,2,1,
+1,1882,22,1,168,
+1,44,1288,1,47,
+1289,1,48,1295,1,
+49,1301,1,50,1306,
+1,51,1311,1,305,
+1316,1,2567,1883,17,
+1884,15,1856,1,-1,
+1,5,149,1,0,
+1,0,1857,1,2576,
+1885,16,0,151,1,
+63,1327,1,66,1333,
+1,67,1338,1,1478,
+1562,1,69,1348,1,
+70,1353,1,68,1343,
+1,74,1358,1,1013,
+1363,1,2335,1886,16,
+0,157,1,1332,1368,
+1,1048,1449,1,82,
+1385,1,1296,1272,1,
+1341,1402,1,328,1407,
+1,1303,1412,1,1096,
+1417,1,93,1423,1,
+1550,1428,1,352,1454,
+1,107,1443,1,1114,
+1448,1,1370,1557,1,
+118,1460,1,1123,1465,
+1,371,1470,1,1377,
+1476,1,375,1481,1,
+377,1486,1,379,1491,
+1,380,1496,1,883,
+1502,1,373,1514,1,
+130,1519,1,143,1524,
+1,1152,1530,1,387,
+1887,16,0,648,1,
+1406,1535,1,1159,1542,
+1,157,1547,1,1413,
+1552,1,1665,1578,1,
+412,1888,16,0,673,
+1,1094,1889,16,0,
+700,1,172,1573,1,
+827,1436,1,1188,1583,
+1,437,1890,16,0,
+748,1,1442,1588,1,
+1694,1891,16,0,157,
+1,942,1594,1,1195,
+1600,1,1449,1605,1,
+1701,1610,1,447,1615,
+1,188,1622,1,205,
+1627,1,2467,1892,17,
+1893,15,1856,1,-1,
+1,5,1894,20,1895,
+4,50,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+76,0,105,0,115,
+0,116,0,95,0,
+49,0,1,198,1,
+3,1,2,1,1,
+1896,22,1,37,1,
+461,1897,16,0,700,
+1,464,1898,17,1899,
+15,1875,1,-1,1,
+5,1900,20,1901,4,
+28,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,76,0,105,
+0,115,0,116,0,
+95,0,50,0,1,
+327,1,3,1,4,
+1,3,1902,22,1,
+167,1,1224,1632,1,
+223,1637,1,1730,1642,
+1,476,1647,1,477,
+1653,1,1231,1658,1,
+479,1663,1,480,1668,
+1,1485,1674,1,2745,
+1903,17,1904,15,1856,
+1,-1,1,5,149,
+1,0,1,0,1857,
+1,459,1905,17,1906,
+15,1875,1,-1,1,
+5,698,1,0,1,
+0,1876,1,242,1681,
+1,478,1686,1,2754,
+1907,16,0,151,1,
+481,1908,17,1909,15,
+1875,1,-1,1,5,
+1910,20,1911,4,28,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,76,0,105,0,
+115,0,116,0,95,
+0,49,0,1,326,
+1,3,1,2,1,
+1,1912,22,1,166,
+1,1001,1691,1,2508,
+1913,17,1914,15,1915,
+4,30,37,0,73,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,1,-1,1,
+5,1916,20,1917,4,
+32,73,0,110,0,
+116,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,95,
+0,49,0,1,207,
+1,3,1,3,1,
+2,1918,22,1,46,
+1,2509,1919,16,0,
+470,1,15,1920,19,
+212,1,15,1921,5,
+6,1,1114,1922,16,
+0,327,1,1621,1923,
+16,0,747,1,40,
+1924,16,0,641,1,
+19,1252,1,9,1218,
+1,2760,1925,16,0,
+210,1,16,1926,19,
+136,1,16,1927,5,
+145,1,2761,1928,16,
+0,202,1,256,1929,
+16,0,202,1,1261,
+1930,16,0,202,1,
+509,1931,16,0,202,
+1,9,1932,16,0,
+134,1,2521,1933,16,
+0,488,1,2021,823,
+1,1775,1934,16,0,
+202,1,2029,830,1,
+2030,836,1,2031,841,
+1,2032,846,1,2033,
+851,1,277,1935,16,
+0,202,1,2035,857,
+1,2037,862,1,2039,
+867,1,32,1936,16,
+0,202,1,2041,873,
+1,2293,1937,16,0,
+202,1,2043,879,1,
+2045,884,1,40,1938,
+16,0,181,1,41,
+1939,16,0,202,1,
+1297,1940,16,0,202,
+1,43,1941,16,0,
+202,1,44,1942,16,
+0,181,1,1803,892,
+1,1804,1943,16,0,
+202,1,299,1944,16,
+0,202,1,2480,1945,
+17,1946,15,1947,4,
 24,37,0,73,0,
 110,0,116,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-1,-1,1,5,1907,
-20,1908,4,26,73,
+1,-1,1,5,1948,
+20,1949,4,26,73,
 0,110,0,116,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,53,0,
-1,353,1,3,1,
-2,1,1,1909,22,
-1,196,1,52,1910,
-16,0,198,1,2484,
-1911,17,1912,15,1906,
-1,-1,1,5,1913,
-20,1914,4,26,73,
-0,110,0,116,0,
+0,95,0,54,0,
+1,360,1,3,1,
+2,1,1,1950,22,
+1,200,1,2561,1951,
+16,0,539,1,52,
+1952,16,0,202,1,
+2484,1953,17,1954,15,
+1947,1,-1,1,5,
+1955,20,1956,4,26,
+73,0,110,0,116,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,50,
+0,1,356,1,3,
+1,2,1,1,1957,
+22,1,196,1,2566,
+1958,16,0,667,1,
+1515,1959,16,0,202,
+1,2318,1960,16,0,
+202,1,2491,1961,17,
+1962,15,1963,4,26,
+37,0,86,0,111,
+0,105,0,100,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,49,0,
-1,349,1,3,1,
-2,1,1,1915,22,
-1,192,1,1515,1916,
-16,0,198,1,2318,
-1917,16,0,198,1,
-2491,1918,17,1919,15,
-1920,4,26,37,0,
+0,1,-1,1,5,
+1964,20,1965,4,28,
 86,0,111,0,105,
 0,100,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
-110,0,116,0,1,
--1,1,5,1921,20,
-1922,4,28,86,0,
+110,0,116,0,95,
+0,53,0,1,349,
+1,3,1,2,1,
+1,1966,22,1,189,
+1,62,1967,16,0,
+219,1,63,1968,16,
+0,181,1,2495,1969,
+17,1970,15,1963,1,
+-1,1,5,1971,20,
+1972,4,28,86,0,
 111,0,105,0,100,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,52,
-0,1,342,1,3,
-1,2,1,1,1923,
-22,1,185,1,62,
-1924,16,0,213,1,
-63,1925,16,0,177,
-1,2495,1926,17,1927,
-15,1928,4,12,37,
-0,69,0,118,0,
-101,0,110,0,116,
-0,1,-1,1,5,
-1929,20,1930,4,16,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,49,0,48,
-0,1,338,1,3,
-1,2,1,1,1931,
-22,1,181,1,2740,
-1932,16,0,198,1,
-2075,1933,16,0,198,
-1,1574,885,1,1479,
-1934,16,0,198,1,
-71,1935,16,0,198,
-1,1658,1936,16,0,
-753,1,1833,1937,16,
-0,304,1,1834,1938,
-16,0,198,1,2337,
-1939,16,0,198,1,
-79,1940,16,0,198,
-1,1335,1941,16,0,
-198,1,322,1942,16,
-0,198,1,76,1943,
-16,0,198,1,85,
-1944,16,0,198,1,
-89,1945,16,0,198,
-1,346,1946,16,0,
-198,1,97,1947,16,
-0,198,1,2106,1948,
-16,0,198,1,102,
-1949,16,0,198,1,
-1860,907,1,2458,961,
-1,2364,913,1,1990,
-1950,16,0,198,1,
-112,1951,16,0,198,
-1,1117,1952,16,0,
-198,1,1873,921,1,
-1875,1953,16,0,412,
-1,1876,1954,16,0,
-198,1,2552,1955,16,
-0,513,1,124,1956,
-16,0,198,1,2478,
-1957,17,1958,15,1906,
-1,-1,1,5,1959,
-20,1960,4,26,73,
-0,110,0,116,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,95,0,55,0,
-1,355,1,3,1,
-2,1,1,1961,22,
-1,198,1,2136,928,
-1,381,1962,16,0,
-198,1,525,1963,16,
-0,198,1,2723,1964,
-16,0,715,1,137,
-1965,16,0,198,1,
-1901,1966,16,0,198,
-1,1153,1967,16,0,
-198,1,151,1968,16,
-0,198,1,1407,1969,
-16,0,198,1,1659,
-1970,16,0,198,1,
-2413,1971,16,0,198,
-1,406,1972,16,0,
-198,1,1371,1973,16,
-0,198,1,2105,900,
-1,166,1974,16,0,
-198,1,2045,865,1,
-1622,1975,16,0,198,
-1,1931,946,1,1932,
-1976,16,0,512,1,
-1933,1977,16,0,198,
-1,431,1978,16,0,
-198,1,1585,1979,16,
-0,198,1,182,1980,
-16,0,198,1,1189,
-1981,16,0,198,1,
-1443,1982,16,0,198,
-1,1695,1983,16,0,
-198,1,2198,1984,16,
-0,198,1,447,1985,
-16,0,198,1,199,
-1986,16,0,198,1,
-2459,967,1,1958,1987,
-16,0,198,1,2462,
-974,1,1657,979,1,
-2464,984,1,459,1988,
-16,0,198,1,462,
-1989,16,0,198,1,
-2471,1990,17,1991,15,
-1992,4,36,37,0,
+116,0,95,0,49,
+0,1,345,1,3,
+1,2,1,1,1973,
+22,1,185,1,2075,
+1974,16,0,202,1,
+1574,904,1,1479,1975,
+16,0,202,1,71,
+1976,16,0,202,1,
+1658,1977,16,0,776,
+1,1833,1978,16,0,
+318,1,1834,1979,16,
+0,202,1,2337,1980,
+16,0,202,1,79,
+1981,16,0,202,1,
+1335,1982,16,0,202,
+1,322,1983,16,0,
+202,1,76,1984,16,
+0,202,1,85,1985,
+16,0,202,1,89,
+1986,16,0,202,1,
+346,1987,16,0,202,
+1,97,1988,16,0,
+202,1,2106,1989,16,
+0,202,1,102,1990,
+16,0,202,1,1860,
+926,1,2458,980,1,
+2364,932,1,2536,1991,
+16,0,631,1,1990,
+1992,16,0,202,1,
+112,1993,16,0,202,
+1,1117,1994,16,0,
+202,1,2544,1995,16,
+0,517,1,1873,940,
+1,1875,1996,16,0,
+433,1,1876,1997,16,
+0,202,1,2552,1998,
+16,0,529,1,124,
+1999,16,0,202,1,
+2478,2000,17,2001,15,
+1947,1,-1,1,5,
+2002,20,2003,4,26,
 73,0,110,0,116,
-0,82,0,111,0,
-116,0,82,0,111,
-0,116,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
--1,1,5,1993,20,
-1994,4,38,73,0,
-110,0,116,0,82,
-0,111,0,116,0,
-82,0,111,0,116,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,49,
+116,0,95,0,56,
 0,1,362,1,3,
-1,2,1,1,1995,
-22,1,205,1,2472,
-1996,17,1997,15,1998,
-4,30,37,0,86,
+1,2,1,1,2004,
+22,1,202,1,2136,
+947,1,381,2005,16,
+0,202,1,525,2006,
+16,0,202,1,137,
+2007,16,0,202,1,
+2493,2008,17,2009,15,
+1963,1,-1,1,5,
+2010,20,2011,4,28,
+86,0,111,0,105,
+0,100,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,51,0,1,347,
+1,3,1,2,1,
+1,2012,22,1,187,
+1,1901,2013,16,0,
+202,1,1153,2014,16,
+0,202,1,151,2015,
+16,0,202,1,1407,
+2016,16,0,202,1,
+1659,2017,16,0,202,
+1,2413,2018,16,0,
+202,1,406,2019,16,
+0,202,1,1371,2020,
+16,0,202,1,2105,
+919,1,166,2021,16,
+0,202,1,1622,2022,
+16,0,202,1,1931,
+965,1,1932,2023,16,
+0,528,1,1933,2024,
+16,0,202,1,431,
+2025,16,0,202,1,
+1585,2026,16,0,202,
+1,182,2027,16,0,
+202,1,1189,2028,16,
+0,202,1,1443,2029,
+16,0,202,1,1695,
+2030,16,0,202,1,
+2198,2031,16,0,202,
+1,447,2032,16,0,
+202,1,199,2033,16,
+0,202,1,2459,986,
+1,1958,2034,16,0,
+202,1,2462,993,1,
+1657,998,1,2464,1003,
+1,459,2035,16,0,
+202,1,462,2036,16,
+0,202,1,2471,2037,
+17,2038,15,2039,4,
+36,37,0,73,0,
+110,0,116,0,86,
 0,101,0,99,0,
-116,0,111,0,114,
+86,0,101,0,99,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
 116,0,1,-1,1,
-5,1999,20,2000,4,
-32,86,0,101,0,
-99,0,116,0,111,
-0,114,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,51,0,1,361,
-1,3,1,2,1,
-1,2001,22,1,204,
-1,2473,2002,17,2003,
-15,1998,1,-1,1,
-5,2004,20,2005,4,
-32,86,0,101,0,
-99,0,116,0,111,
-0,114,0,65,0,
+5,2040,20,2041,4,
+38,73,0,110,0,
+116,0,86,0,101,
+0,99,0,86,0,
+101,0,99,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+369,1,3,1,2,
+1,1,2042,22,1,
+209,1,2472,2043,17,
+2044,15,2045,4,36,
+37,0,73,0,110,
+0,116,0,82,0,
+111,0,116,0,82,
+0,111,0,116,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,-1,1,5,
+2046,20,2047,4,38,
+73,0,110,0,116,
+0,82,0,111,0,
+116,0,82,0,111,
+0,116,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,50,0,1,360,
+0,49,0,1,368,
 1,3,1,2,1,
-1,2006,22,1,203,
-1,2474,2007,17,2008,
-15,1998,1,-1,1,
-5,2009,20,2010,4,
-32,86,0,101,0,
+1,2048,22,1,208,
+1,2473,2049,17,2050,
+15,2051,4,30,37,
+0,86,0,101,0,
 99,0,116,0,111,
 0,114,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
-110,0,116,0,95,
-0,49,0,1,359,
-1,3,1,2,1,
-1,2011,22,1,202,
-1,2475,2012,17,2013,
-15,1906,1,-1,1,
-5,2014,20,2015,4,
-28,73,0,110,0,
-116,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-49,0,48,0,1,
-358,1,3,1,2,
-1,1,2016,22,1,
-201,1,2476,2017,17,
-2018,15,1906,1,-1,
-1,5,2019,20,2020,
-4,26,73,0,110,
-0,116,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,57,0,1,357,
-1,3,1,2,1,
-1,2021,22,1,200,
-1,2477,2022,17,2023,
-15,1906,1,-1,1,
-5,2024,20,2025,4,
-26,73,0,110,0,
-116,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-56,0,1,356,1,
-3,1,2,1,1,
-2026,22,1,199,1,
-2227,993,1,2479,2027,
-17,2028,15,1906,1,
--1,1,5,2029,20,
-2030,4,26,73,0,
+110,0,116,0,1,
+-1,1,5,2052,20,
+2053,4,32,86,0,
+101,0,99,0,116,
+0,111,0,114,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,51,0,
+1,367,1,3,1,
+2,1,1,2054,22,
+1,207,1,2474,2055,
+17,2056,15,2051,1,
+-1,1,5,2057,20,
+2058,4,32,86,0,
+101,0,99,0,116,
+0,111,0,114,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,50,0,
+1,366,1,3,1,
+2,1,1,2059,22,
+1,206,1,2475,2060,
+17,2061,15,2051,1,
+-1,1,5,2062,20,
+2063,4,32,86,0,
+101,0,99,0,116,
+0,111,0,114,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,49,0,
+1,365,1,3,1,
+2,1,1,2064,22,
+1,205,1,2476,2065,
+17,2066,15,1947,1,
+-1,1,5,2067,20,
+2068,4,28,73,0,
 110,0,116,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,54,0,1,
-354,1,3,1,2,
-1,1,2031,22,1,
-197,1,1225,2032,16,
-0,198,1,2481,2033,
-17,2034,15,1906,1,
--1,1,5,2035,20,
-2036,4,26,73,0,
-110,0,116,0,65,
-0,114,0,103,0,
-69,0,118,0,101,
+95,0,49,0,48,
+0,1,364,1,3,
+1,2,1,1,2069,
+22,1,204,1,2477,
+2070,17,2071,15,1947,
+1,-1,1,5,2072,
+20,2073,4,26,73,
 0,110,0,116,0,
-95,0,52,0,1,
-352,1,3,1,2,
-1,1,2037,22,1,
-195,1,2482,2038,17,
-2039,15,1906,1,-1,
-1,5,2040,20,2041,
-4,26,73,0,110,
-0,116,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,51,0,1,351,
-1,3,1,2,1,
-1,2042,22,1,194,
-1,2483,2043,17,2044,
-15,1906,1,-1,1,
-5,2045,20,2046,4,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,57,0,
+1,363,1,3,1,
+2,1,1,2074,22,
+1,203,1,2227,1012,
+1,2479,2075,17,2076,
+15,1947,1,-1,1,
+5,2077,20,2078,4,
 26,73,0,110,0,
 116,0,65,0,114,
 0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-50,0,1,350,1,
+55,0,1,361,1,
 3,1,2,1,1,
-2047,22,1,193,1,
-1731,2048,16,0,198,
-1,2485,2049,17,2050,
-15,2051,4,24,37,
-0,75,0,101,0,
-121,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,1,-1,
-1,5,2052,20,2053,
-4,26,75,0,101,
-0,121,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,50,0,1,348,
-1,3,1,2,1,
-1,2054,22,1,191,
-1,2486,2055,17,2056,
-15,2051,1,-1,1,
-5,2057,20,2058,4,
-26,75,0,101,0,
-121,0,65,0,114,
+2079,22,1,201,1,
+1225,2080,16,0,202,
+1,2481,2081,17,2082,
+15,1947,1,-1,1,
+5,2083,20,2084,4,
+26,73,0,110,0,
+116,0,65,0,114,
 0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-49,0,1,347,1,
+53,0,1,359,1,
 3,1,2,1,1,
-2059,22,1,190,1,
-2487,2060,17,2061,15,
-1920,1,-1,1,5,
-2062,20,2063,4,28,
-86,0,111,0,105,
-0,100,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,56,0,1,346,
-1,3,1,2,1,
-1,2064,22,1,189,
-1,2488,2065,17,2066,
-15,1920,1,-1,1,
-5,2067,20,2068,4,
-28,86,0,111,0,
-105,0,100,0,65,
+2085,22,1,199,1,
+2482,2086,17,2087,15,
+1947,1,-1,1,5,
+2088,20,2089,4,26,
+73,0,110,0,116,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,52,
+0,1,358,1,3,
+1,2,1,1,2090,
+22,1,198,1,2483,
+2091,17,2092,15,1947,
+1,-1,1,5,2093,
+20,2094,4,26,73,
+0,110,0,116,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,51,0,
+1,357,1,3,1,
+2,1,1,2095,22,
+1,197,1,1731,2096,
+16,0,202,1,2485,
+2097,17,2098,15,1947,
+1,-1,1,5,2099,
+20,2100,4,26,73,
+0,110,0,116,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,49,0,
+1,355,1,3,1,
+2,1,1,2101,22,
+1,195,1,2486,2102,
+17,2103,15,2104,4,
+24,37,0,75,0,
+101,0,121,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,55,0,1,
-345,1,3,1,2,
-1,1,2069,22,1,
-188,1,2489,2070,17,
-2071,15,1920,1,-1,
-1,5,2072,20,2073,
-4,28,86,0,111,
-0,105,0,100,0,
+1,-1,1,5,2105,
+20,2106,4,26,75,
+0,101,0,121,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,54,0,
-1,344,1,3,1,
-2,1,1,2074,22,
-1,187,1,2490,2075,
-17,2076,15,1920,1,
--1,1,5,2077,20,
-2078,4,28,86,0,
-111,0,105,0,100,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,95,0,53,
-0,1,343,1,3,
-1,2,1,1,2079,
-22,1,186,1,1989,
-1002,1,2492,2080,17,
-2081,15,1920,1,-1,
-1,5,2082,20,2083,
+0,95,0,50,0,
+1,354,1,3,1,
+2,1,1,2107,22,
+1,194,1,2487,2108,
+17,2109,15,2104,1,
+-1,1,5,2110,20,
+2111,4,26,75,0,
+101,0,121,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+353,1,3,1,2,
+1,1,2112,22,1,
+193,1,2488,2113,17,
+2114,15,1963,1,-1,
+1,5,2115,20,2116,
 4,28,86,0,111,
 0,105,0,100,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,51,0,
-1,341,1,3,1,
-2,1,1,2084,22,
-1,184,1,2493,2085,
-17,2086,15,1920,1,
--1,1,5,2087,20,
-2088,4,28,86,0,
+0,95,0,56,0,
+1,352,1,3,1,
+2,1,1,2117,22,
+1,192,1,2489,2118,
+17,2119,15,1963,1,
+-1,1,5,2120,20,
+2121,4,28,86,0,
 111,0,105,0,100,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,50,
-0,1,340,1,3,
-1,2,1,1,2089,
-22,1,183,1,2494,
-2090,17,2091,15,1920,
-1,-1,1,5,2092,
-20,2093,4,28,86,
+116,0,95,0,55,
+0,1,351,1,3,
+1,2,1,1,2122,
+22,1,191,1,2490,
+2123,17,2124,15,1963,
+1,-1,1,5,2125,
+20,2126,4,28,86,
 0,111,0,105,0,
 100,0,65,0,114,
 0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-49,0,1,339,1,
+54,0,1,350,1,
 3,1,2,1,1,
-2094,22,1,182,1,
-236,2095,16,0,198,
-1,2496,2096,17,2097,
-15,1928,1,-1,1,
-5,2098,20,2099,4,
+2127,22,1,190,1,
+1989,1020,1,2492,2128,
+17,2129,15,1963,1,
+-1,1,5,2130,20,
+2131,4,28,86,0,
+111,0,105,0,100,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,52,
+0,1,348,1,3,
+1,2,1,1,2132,
+22,1,188,1,2744,
+2133,16,0,286,1,
+2494,2134,17,2135,15,
+1963,1,-1,1,5,
+2136,20,2137,4,28,
+86,0,111,0,105,
+0,100,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,50,0,1,346,
+1,3,1,2,1,
+1,2138,22,1,186,
+1,236,2139,16,0,
+202,1,2496,2140,17,
+2141,15,2142,4,12,
+37,0,69,0,118,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,2143,20,2144,4,
 14,69,0,118,0,
 101,0,110,0,116,
 0,95,0,57,0,
-1,337,1,3,1,
-2,1,1,2100,22,
-1,180,1,2497,2101,
-17,2102,15,1928,1,
--1,1,5,2103,20,
-2104,4,14,69,0,
+1,344,1,3,1,
+2,1,1,2145,22,
+1,184,1,2497,2146,
+17,2147,15,2142,1,
+-1,1,5,2148,20,
+2149,4,14,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-56,0,1,336,1,
+56,0,1,343,1,
 3,1,2,1,1,
-2105,22,1,179,1,
-2498,2106,17,2107,15,
-1928,1,-1,1,5,
-2108,20,2109,4,14,
+2150,22,1,183,1,
+2498,2151,17,2152,15,
+2142,1,-1,1,5,
+2153,20,2154,4,14,
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,55,0,1,
-335,1,3,1,2,
-1,1,2110,22,1,
-178,1,2499,2111,17,
-2112,15,1928,1,-1,
-1,5,2113,20,2114,
+342,1,3,1,2,
+1,1,2155,22,1,
+182,1,2499,2156,17,
+2157,15,2142,1,-1,
+1,5,2158,20,2159,
 4,14,69,0,118,
 0,101,0,110,0,
 116,0,95,0,54,
-0,1,334,1,3,
-1,2,1,1,2115,
-22,1,177,1,2500,
-2116,17,2117,15,1928,
-1,-1,1,5,2118,
-20,2119,4,14,69,
+0,1,341,1,3,
+1,2,1,1,2160,
+22,1,181,1,2500,
+2161,17,2162,15,2142,
+1,-1,1,5,2163,
+20,2164,4,14,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,53,0,1,333,
+0,53,0,1,340,
 1,3,1,2,1,
-1,2120,22,1,176,
-1,2501,2121,17,2122,
-15,1928,1,-1,1,
-5,2123,20,2124,4,
+1,2165,22,1,180,
+1,2501,2166,17,2167,
+15,2142,1,-1,1,
+5,2168,20,2169,4,
 14,69,0,118,0,
 101,0,110,0,116,
 0,95,0,52,0,
-1,332,1,3,1,
-2,1,1,2125,22,
-1,175,1,2502,2126,
-17,2127,15,1928,1,
--1,1,5,2128,20,
-2129,4,14,69,0,
+1,339,1,3,1,
+2,1,1,2170,22,
+1,179,1,2502,2171,
+17,2172,15,2142,1,
+-1,1,5,2173,20,
+2174,4,14,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-51,0,1,331,1,
+51,0,1,338,1,
 3,1,2,1,1,
-2130,22,1,174,1,
-2503,2131,17,2132,15,
-1928,1,-1,1,5,
-2133,20,2134,4,14,
+2175,22,1,178,1,
+2503,2176,17,2177,15,
+2142,1,-1,1,5,
+2178,20,2179,4,14,
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,50,0,1,
-330,1,3,1,2,
-1,1,2135,22,1,
-173,1,2504,2136,17,
-2137,15,1928,1,-1,
-1,5,2138,20,2139,
+337,1,3,1,2,
+1,1,2180,22,1,
+177,1,2504,2181,17,
+2182,15,2142,1,-1,
+1,5,2183,20,2184,
 4,14,69,0,118,
 0,101,0,110,0,
 116,0,95,0,49,
-0,1,329,1,3,
-1,2,1,1,2140,
-22,1,172,1,2505,
-2141,16,0,445,1,
-217,2142,16,0,198,
-1,1756,2143,16,0,
-198,1,17,2144,19,
-164,1,17,2145,5,
-130,1,1,2146,17,
-2147,15,2148,4,18,
+0,1,336,1,3,
+1,2,1,1,2185,
+22,1,176,1,2505,
+2186,16,0,466,1,
+217,2187,16,0,202,
+1,1756,2188,16,0,
+202,1,17,2189,19,
+163,1,17,2190,5,
+132,1,1,2191,17,
+2192,15,2193,4,18,
 37,0,84,0,121,
 0,112,0,101,0,
 110,0,97,0,109,
 0,101,0,1,-1,
-1,5,2149,20,2150,
+1,5,2194,20,2195,
 4,20,84,0,121,
 0,112,0,101,0,
 110,0,97,0,109,
 0,101,0,95,0,
-55,0,1,328,1,
+55,0,1,335,1,
 3,1,2,1,1,
-2151,22,1,171,1,
-2,2152,17,2153,15,
-2148,1,-1,1,5,
-2154,20,2155,4,20,
+2196,22,1,175,1,
+2,2197,17,2198,15,
+2193,1,-1,1,5,
+2199,20,2200,4,20,
 84,0,121,0,112,
 0,101,0,110,0,
 97,0,109,0,101,
 0,95,0,54,0,
-1,327,1,3,1,
-2,1,1,2156,22,
-1,170,1,3,2157,
-17,2158,15,2148,1,
--1,1,5,2159,20,
-2160,4,20,84,0,
+1,334,1,3,1,
+2,1,1,2201,22,
+1,174,1,3,2202,
+17,2203,15,2193,1,
+-1,1,5,2204,20,
+2205,4,20,84,0,
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,95,
-0,53,0,1,326,
+0,53,0,1,333,
 1,3,1,2,1,
-1,2161,22,1,169,
-1,4,2162,17,2163,
-15,2148,1,-1,1,
-5,2164,20,2165,4,
+1,2206,22,1,173,
+1,4,2207,17,2208,
+15,2193,1,-1,1,
+5,2209,20,2210,4,
 20,84,0,121,0,
 112,0,101,0,110,
 0,97,0,109,0,
 101,0,95,0,52,
-0,1,325,1,3,
-1,2,1,1,2166,
-22,1,168,1,5,
-2167,17,2168,15,2148,
-1,-1,1,5,2169,
-20,2170,4,20,84,
+0,1,332,1,3,
+1,2,1,1,2211,
+22,1,172,1,5,
+2212,17,2213,15,2193,
+1,-1,1,5,2214,
+20,2215,4,20,84,
 0,121,0,112,0,
 101,0,110,0,97,
 0,109,0,101,0,
 95,0,51,0,1,
-324,1,3,1,2,
-1,1,2171,22,1,
-167,1,6,2172,17,
-2173,15,2148,1,-1,
-1,5,2174,20,2175,
+331,1,3,1,2,
+1,1,2216,22,1,
+171,1,6,2217,17,
+2218,15,2193,1,-1,
+1,5,2219,20,2220,
 4,20,84,0,121,
 0,112,0,101,0,
 110,0,97,0,109,
 0,101,0,95,0,
-50,0,1,323,1,
+50,0,1,330,1,
 3,1,2,1,1,
-2176,22,1,166,1,
-7,2177,17,2178,15,
-2148,1,-1,1,5,
-2179,20,2180,4,20,
+2221,22,1,170,1,
+7,2222,17,2223,15,
+2193,1,-1,1,5,
+2224,20,2225,4,20,
 84,0,121,0,112,
 0,101,0,110,0,
 97,0,109,0,101,
 0,95,0,49,0,
-1,322,1,3,1,
-2,1,1,2181,22,
-1,165,1,1514,1194,
-1,9,1199,1,10,
-1819,1,262,1205,1,
-1267,1211,1,2524,2182,
-17,2183,15,2184,4,
-36,37,0,86,0,
-101,0,99,0,116,
-0,111,0,114,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,1,-1,1,
-5,2185,20,2186,4,
-38,86,0,101,0,
-99,0,116,0,111,
-0,114,0,68,0,
+1,329,1,3,1,
+2,1,1,2226,22,
+1,169,1,1514,1213,
+1,9,1218,1,10,
+1854,1,262,1224,1,
+1267,1230,1,1521,1235,
+1,1773,2227,16,0,
+255,1,2527,1860,1,
+19,1252,1,20,2228,
+16,0,161,1,2531,
+2229,17,2230,15,2231,
+4,66,37,0,73,
+0,110,0,116,0,
+82,0,111,0,116,
+0,82,0,111,0,
+116,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
 101,0,99,0,108,
 0,97,0,114,0,
 97,0,116,0,105,
 0,111,0,110,0,
-95,0,49,0,1,
-201,1,3,1,3,
-1,2,2187,22,1,
-43,1,2525,2188,17,
-2189,15,2190,4,60,
-37,0,86,0,101,
-0,99,0,116,0,
-111,0,114,0,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
-1,-1,1,5,2191,
-20,2192,4,62,86,
+76,0,105,0,115,
+0,116,0,1,-1,
+1,5,2232,20,2233,
+4,68,73,0,110,
+0,116,0,82,0,
+111,0,116,0,82,
+0,111,0,116,0,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,76,0,
+105,0,115,0,116,
+0,95,0,49,0,
+1,203,1,3,1,
+6,1,5,2234,22,
+1,42,1,2281,1259,
+1,525,1321,1,2539,
+2235,17,2236,15,2237,
+4,60,37,0,86,
 0,101,0,99,0,
 116,0,111,0,114,
 0,65,0,114,0,
@@ -7192,17 +7388,11 @@ public yyLSLSyntax
 0,116,0,105,0,
 111,0,110,0,76,
 0,105,0,115,0,
-116,0,95,0,49,
-0,1,196,1,3,
-1,2,1,1,2193,
-22,1,38,1,1773,
-2194,16,0,252,1,
-19,1233,1,20,2195,
-16,0,162,1,2281,
-1240,1,2533,2196,17,
-2197,15,2198,4,54,
-37,0,73,0,110,
-0,116,0,65,0,
+116,0,1,-1,1,
+5,2238,20,2239,4,
+62,86,0,101,0,
+99,0,116,0,111,
+0,114,0,65,0,
 114,0,103,0,117,
 0,109,0,101,0,
 110,0,116,0,68,
@@ -7211,89 +7401,15 @@ public yyLSLSyntax
 0,97,0,116,0,
 105,0,111,0,110,
 0,76,0,105,0,
-115,0,116,0,1,
--1,1,5,2199,20,
-2200,4,56,73,0,
-110,0,116,0,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
-95,0,49,0,1,
-195,1,3,1,2,
-1,1,2201,22,1,
-37,1,2534,2202,16,
-0,488,1,30,1825,
-1,2541,2203,17,2204,
-15,2205,4,30,37,
-0,75,0,101,0,
-121,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,1,
--1,1,5,2206,20,
-2207,4,32,75,0,
-101,0,121,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,95,0,49,0,
-1,199,1,3,1,
-3,1,2,2208,22,
-1,41,1,283,1258,
-1,2543,2209,16,0,
-503,1,2548,2210,16,
-0,633,1,1010,2211,
-16,0,668,1,40,
-1263,1,41,1830,1,
-42,1834,1,2553,1840,
-1,44,1269,1,1260,
-1182,1,47,1270,1,
-1303,1394,1,49,1282,
-1,50,1287,1,48,
-1276,1,2562,2212,16,
-0,646,1,305,1297,
-1,51,1292,1,2733,
-2213,16,0,169,1,
-61,2214,16,0,205,
-1,63,1308,1,1521,
-1216,1,66,1315,1,
-67,1320,1,68,1325,
-1,69,1330,1,70,
-1335,1,73,2215,16,
-0,215,1,74,1340,
-1,1013,1345,1,2335,
-2216,16,0,254,1,
-1332,1350,1,1048,1431,
-1,82,1367,1,1840,
-2217,16,0,318,1,
-2516,2218,17,2219,15,
-2220,4,66,37,0,
+115,0,116,0,95,
+0,49,0,1,202,
+1,3,1,2,1,
+1,2240,22,1,41,
+1,30,1868,1,1002,
+1696,1,283,1277,1,
+2547,2241,17,2242,15,
+2243,4,54,37,0,
 73,0,110,0,116,
-0,82,0,111,0,
-116,0,82,0,111,
-0,116,0,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,1,
--1,1,5,2221,20,
-2222,4,68,73,0,
-110,0,116,0,82,
-0,111,0,116,0,
-82,0,111,0,116,
 0,65,0,114,0,
 103,0,117,0,109,
 0,101,0,110,0,
@@ -7303,34 +7419,135 @@ public yyLSLSyntax
 0,116,0,105,0,
 111,0,110,0,76,
 0,105,0,115,0,
-116,0,95,0,49,
-0,1,197,1,3,
-1,6,1,5,2223,
-22,1,39,1,2517,
-2224,16,0,463,1,
-328,1389,1,1094,2225,
-16,0,748,1,1096,
-1399,1,93,1405,1,
-1550,1410,1,525,1302,
-1,2526,2226,16,0,
-286,1,1002,1679,1,
-827,1418,1,1011,1188,
-1,107,1425,1,1114,
-1430,1,2542,2227,17,
-2228,15,2229,4,54,
-37,0,75,0,101,
-0,121,0,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,68,
+116,0,1,-1,1,
+5,2244,20,2245,4,
+56,73,0,110,0,
+116,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+76,0,105,0,115,
+0,116,0,95,0,
+49,0,1,201,1,
+3,1,2,1,1,
+2246,22,1,40,1,
+2548,2247,16,0,642,
+1,1010,2248,16,0,
+690,1,40,1282,1,
+41,1873,1,42,1877,
+1,44,1288,1,2555,
+2249,17,2250,15,2251,
+4,30,37,0,75,
+0,101,0,121,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,1,-1,1,
+5,2252,20,2253,4,
+32,75,0,101,0,
+121,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,95,
+0,49,0,1,206,
+1,3,1,3,1,
+2,2254,22,1,45,
+1,1260,1200,1,47,
+1289,1,48,1295,1,
+49,1301,1,50,1306,
+1,51,1311,1,2562,
+2255,16,0,739,1,
+305,1316,1,2576,2256,
+16,0,674,1,2567,
+1883,1,61,2257,16,
+0,208,1,63,1327,
+1,66,1333,1,67,
+1338,1,68,1343,1,
+69,1348,1,70,1353,
+1,73,2258,16,0,
+221,1,74,1358,1,
+1013,1363,1,2335,2259,
+16,0,257,1,1332,
+1368,1,1048,1449,1,
+2512,1847,1,1840,2260,
+16,0,334,1,2516,
+2261,17,2262,15,2263,
+4,66,37,0,73,
+0,110,0,116,0,
+86,0,101,0,99,
+0,86,0,101,0,
+99,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+76,0,105,0,115,
+0,116,0,1,-1,
+1,5,2264,20,2265,
+4,68,73,0,110,
+0,116,0,86,0,
+101,0,99,0,86,
 0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,1,
--1,1,5,2230,20,
-2231,4,56,75,0,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,76,0,
+105,0,115,0,116,
+0,95,0,49,0,
+1,204,1,3,1,
+6,1,5,2266,22,
+1,43,1,2517,2267,
+16,0,482,1,328,
+1407,1,1303,1412,1,
+1096,1417,1,93,1423,
+1,82,1385,1,827,
+1436,1,2532,2268,16,
+0,626,1,1011,1207,
+1,107,1443,1,1114,
+1448,1,2540,2269,16,
+0,512,1,1871,2270,
+16,0,344,1,1370,
+1557,1,1478,1562,1,
+118,1460,1,1123,1465,
+1,371,1470,1,1377,
+1476,1,375,1481,1,
+1882,2271,16,0,359,
+1,377,1486,1,352,
+1454,1,379,1491,1,
+1341,1402,1,130,1519,
+1,2074,2272,16,0,
+644,1,373,1514,1,
+1012,2273,16,0,692,
+1,380,1496,1,143,
+1524,1,1550,1428,1,
+1152,1530,1,1406,1535,
+1,1159,1542,1,157,
+1547,1,1413,1552,1,
+883,1502,1,1094,2274,
+16,0,771,1,1296,
+1272,1,172,1573,1,
+1665,1578,1,1939,2275,
+16,0,477,1,1188,
+1583,1,1442,1588,1,
+188,1622,1,942,1594,
+1,1195,1600,1,1449,
+1605,1,1701,1610,1,
+447,1615,1,2556,2276,
+17,2277,15,2278,4,
+54,37,0,75,0,
 101,0,121,0,65,
 0,114,0,103,0,
 117,0,109,0,101,
@@ -7341,2205 +7558,2136 @@ public yyLSLSyntax
 0,105,0,111,0,
 110,0,76,0,105,
 0,115,0,116,0,
-95,0,49,0,1,
-194,1,3,1,2,
-1,1,2232,22,1,
-36,1,1871,2233,16,
-0,328,1,1370,1539,
-1,1478,1544,1,118,
-1442,1,1123,1447,1,
-371,1452,1,1377,1458,
-1,375,1463,1,1882,
-2234,16,0,341,1,
-377,1468,1,352,1436,
-1,379,1473,1,1341,
-1384,1,130,1501,1,
-2074,2235,16,0,635,
-1,373,1496,1,1012,
-2236,16,0,670,1,
-380,1478,1,143,1506,
-1,1152,1512,1,1406,
-1517,1,1159,1524,1,
-157,1529,1,1413,1534,
-1,883,1484,1,2512,
-1812,1,1296,1253,1,
-172,1555,1,1665,1560,
-1,1939,2237,16,0,
-458,1,1188,1565,1,
-1442,1570,1,188,1604,
-1,942,1576,1,1195,
-1582,1,1449,1587,1,
-1701,1592,1,447,1597,
-1,205,1609,1,2467,
-1850,1,464,1856,1,
-2724,1861,1,2197,2238,
-16,0,742,1,1224,
-1614,1,223,1619,1,
-1730,1624,1,476,1629,
-1,477,1635,1,1231,
-1640,1,479,1645,1,
-480,1650,1,1485,1656,
-1,459,1863,1,242,
-1664,1,478,1669,1,
-481,1865,1,1001,1674,
-1,2508,1870,1,18,
-2239,19,541,1,18,
-2240,5,84,1,1011,
-1188,1,1012,2241,16,
-0,539,1,1013,1345,
-1,262,1205,1,1267,
-2242,16,0,539,1,
-515,2243,16,0,539,
-1,1521,2244,16,0,
-539,1,525,1302,1,
-283,1258,1,2299,2245,
-16,0,539,1,42,
-2246,16,0,539,1,
-40,1263,1,44,1269,
-1,47,1270,1,1303,
-2247,16,0,539,1,
-1555,2248,16,0,539,
-1,50,1287,1,48,
-1276,1,49,1282,1,
-51,1292,1,63,1308,
-1,305,1297,1,66,
-1315,1,67,1320,1,
-68,1325,1,69,1330,
-1,70,1335,1,73,
-2249,16,0,539,1,
-74,1340,1,328,1389,
-1,1048,2250,16,0,
-539,1,82,2251,16,
-0,539,1,1840,2252,
-16,0,539,1,1591,
-2253,16,0,539,1,
-1341,2254,16,0,539,
-1,1096,1399,1,93,
-1405,1,352,1436,1,
-107,2255,16,0,539,
-1,1114,1430,1,118,
-2256,16,0,539,1,
-1123,2257,16,0,539,
-1,371,1452,1,1628,
-2258,16,0,539,1,
-375,1463,1,1882,2259,
-16,0,539,1,377,
-1468,1,379,1473,1,
-380,1478,1,883,2260,
-16,0,539,1,373,
-1496,1,130,2261,16,
-0,539,1,143,2262,
-16,0,539,1,387,
-2263,16,0,539,1,
-1159,2264,16,0,539,
-1,157,2265,16,0,
-539,1,1413,2266,16,
-0,539,1,1665,2267,
-16,0,539,1,412,
-2268,16,0,539,1,
-1377,2269,16,0,539,
-1,172,2270,16,0,
-539,1,1939,2271,16,
-0,539,1,437,2272,
-16,0,539,1,188,
-2273,16,0,539,1,
-942,2274,16,0,539,
-1,1195,2275,16,0,
-539,1,1449,2276,16,
-0,539,1,1701,2277,
-16,0,539,1,447,
-1597,1,205,2278,16,
-0,539,1,827,2279,
-16,0,539,1,223,
-2280,16,0,539,1,
-476,1629,1,477,1635,
-1,1231,2281,16,0,
-539,1,479,1645,1,
-480,1650,1,1485,2282,
-16,0,539,1,1737,
-2283,16,0,539,1,
-2746,2284,16,0,539,
-1,242,2285,16,0,
-539,1,478,1669,1,
-1001,1674,1,1002,1679,
-1,19,2286,19,239,
-1,19,2287,5,176,
-1,256,2288,16,0,
-237,1,1261,2289,16,
-0,237,1,1011,1188,
-1,1012,2290,16,0,
-510,1,2458,961,1,
-262,1205,1,1267,2291,
-16,0,510,1,2021,
-804,1,1521,2292,16,
-0,510,1,1775,2293,
-16,0,237,1,2029,
-811,1,2030,817,1,
-2031,822,1,2032,827,
-1,2033,832,1,277,
-2294,16,0,237,1,
-2035,838,1,2037,843,
-1,2039,848,1,32,
-2295,16,0,237,1,
-2464,984,1,2293,2296,
-16,0,237,1,2043,
-860,1,2045,865,1,
-2299,2297,16,0,510,
-1,41,2298,16,0,
-237,1,42,2299,16,
-0,510,1,40,1263,
-1,44,1269,1,43,
-2300,16,0,237,1,
-1804,2301,16,0,237,
-1,48,1276,1,49,
-1282,1,47,1270,1,
-51,1292,1,52,2302,
-16,0,237,1,50,
-1287,1,305,1297,1,
-1096,1399,1,1515,2303,
-16,0,237,1,2318,
-2304,16,0,237,1,
-283,1258,1,63,1308,
-1,66,1315,1,67,
-1320,1,68,1325,1,
-69,1330,1,70,1335,
-1,71,2305,16,0,
-237,1,2746,2306,16,
-0,510,1,73,2307,
-16,0,510,1,74,
-1340,1,1013,1345,1,
-76,2308,16,0,237,
-1,1834,2309,16,0,
-237,1,2337,2310,16,
-0,237,1,79,2311,
-16,0,237,1,1335,
-2312,16,0,237,1,
-299,2313,16,0,237,
-1,82,2314,16,0,
-510,1,1840,2315,16,
-0,510,1,1297,2316,
-16,0,237,1,85,
-2317,16,0,237,1,
-1341,2318,16,0,510,
-1,89,2319,16,0,
-237,1,1303,2320,16,
-0,510,1,509,2321,
-16,0,237,1,93,
-1405,1,322,2322,16,
-0,237,1,97,2323,
-16,0,237,1,2041,
-854,1,1555,2324,16,
-0,510,1,827,2325,
-16,0,510,1,102,
-2326,16,0,237,1,
-1860,907,1,1803,873,
-1,2364,913,1,107,
-2327,16,0,510,1,
-1114,1430,1,112,2328,
-16,0,237,1,1117,
-2329,16,0,237,1,
-352,1436,1,1873,921,
-1,118,2330,16,0,
-510,1,1123,2331,16,
-0,510,1,371,1452,
-1,515,2332,16,0,
-510,1,1377,2333,16,
-0,510,1,124,2334,
-16,0,237,1,1882,
-2335,16,0,510,1,
-377,1468,1,379,1473,
-1,380,1478,1,130,
-2336,16,0,510,1,
-346,2337,16,0,237,
-1,2075,2338,16,0,
-237,1,373,1496,1,
-387,2339,16,0,510,
-1,137,2340,16,0,
-237,1,143,2341,16,
-0,510,1,1901,2342,
-16,0,237,1,1048,
-2343,16,0,510,1,
-1153,2344,16,0,237,
-1,375,1463,1,151,
-2345,16,0,237,1,
-1407,2346,16,0,237,
-1,2740,2347,16,0,
-237,1,2413,2348,16,
-0,237,1,1159,2349,
-16,0,510,1,381,
-2350,16,0,237,1,
-157,2351,16,0,510,
-1,1413,2352,16,0,
-510,1,883,2353,16,
-0,510,1,1371,2354,
-16,0,237,1,328,
-1389,1,2105,900,1,
-2106,2355,16,0,237,
-1,166,2356,16,0,
-237,1,525,2357,16,
-0,237,1,1622,2358,
-16,0,237,1,406,
-2359,16,0,237,1,
-1574,885,1,172,2360,
-16,0,510,1,1931,
-946,1,412,2361,16,
-0,510,1,1933,2362,
-16,0,237,1,1876,
-2363,16,0,237,1,
-431,2364,16,0,237,
-1,1585,2365,16,0,
-237,1,182,2366,16,
-0,237,1,1628,2367,
-16,0,510,1,1189,
-2368,16,0,237,1,
-437,2369,16,0,510,
-1,1591,2370,16,0,
-510,1,188,2371,16,
-0,510,1,1695,2372,
-16,0,237,1,2198,
-2373,16,0,237,1,
-1195,2374,16,0,510,
-1,1449,2375,16,0,
-510,1,1701,2376,16,
-0,510,1,447,2377,
-16,0,237,1,199,
-2378,16,0,237,1,
-2459,967,1,1958,2379,
-16,0,237,1,2462,
-974,1,1657,979,1,
-205,2380,16,0,510,
-1,1659,2381,16,0,
-237,1,459,2382,16,
-0,237,1,462,2383,
-16,0,237,1,1665,
-2384,16,0,510,1,
-217,2385,16,0,237,
-1,2227,993,1,942,
-2386,16,0,510,1,
-1225,2387,16,0,237,
-1,223,2388,16,0,
-510,1,1479,2389,16,
-0,237,1,1731,2390,
-16,0,237,1,477,
-1635,1,1231,2391,16,
-0,510,1,479,1645,
-1,480,1650,1,1485,
-2392,16,0,510,1,
-1737,2393,16,0,510,
-1,1989,1002,1,1990,
-2394,16,0,237,1,
-1443,2395,16,0,237,
-1,236,2396,16,0,
-237,1,2136,928,1,
-476,1629,1,242,2397,
-16,0,510,1,478,
-1669,1,1939,2398,16,
-0,510,1,1001,1674,
-1,1002,1679,1,1756,
-2399,16,0,237,1,
-20,2400,19,477,1,
-20,2401,5,84,1,
-1011,1188,1,1012,2402,
-16,0,475,1,1013,
-1345,1,262,1205,1,
-1267,2403,16,0,475,
-1,515,2404,16,0,
-475,1,1521,2405,16,
-0,475,1,525,1302,
-1,283,1258,1,2299,
-2406,16,0,475,1,
-42,2407,16,0,475,
-1,40,1263,1,44,
-1269,1,47,1270,1,
-1303,2408,16,0,475,
-1,1555,2409,16,0,
-475,1,50,1287,1,
-48,1276,1,49,1282,
-1,51,1292,1,63,
-1308,1,305,1297,1,
-66,1315,1,67,1320,
-1,68,1325,1,69,
-1330,1,70,1335,1,
-73,2410,16,0,475,
-1,74,1340,1,328,
-2411,16,0,475,1,
-1048,2412,16,0,475,
-1,82,2413,16,0,
-475,1,1840,2414,16,
-0,475,1,1591,2415,
-16,0,475,1,1341,
-2416,16,0,475,1,
-1096,1399,1,93,1405,
-1,352,2417,16,0,
-475,1,107,2418,16,
-0,475,1,1114,1430,
-1,118,2419,16,0,
-475,1,1123,2420,16,
-0,475,1,371,1452,
-1,1628,2421,16,0,
-475,1,375,1463,1,
-1882,2422,16,0,475,
-1,377,1468,1,379,
-1473,1,380,1478,1,
-883,2423,16,0,475,
-1,373,1496,1,130,
-2424,16,0,475,1,
-143,2425,16,0,475,
-1,387,2426,16,0,
-475,1,1159,2427,16,
-0,475,1,157,2428,
-16,0,475,1,1413,
-2429,16,0,475,1,
-1665,2430,16,0,475,
-1,412,2431,16,0,
-475,1,1377,2432,16,
-0,475,1,172,2433,
-16,0,475,1,1939,
-2434,16,0,475,1,
-437,2435,16,0,475,
-1,188,2436,16,0,
-475,1,942,2437,16,
-0,475,1,1195,2438,
-16,0,475,1,1449,
-2439,16,0,475,1,
-1701,2440,16,0,475,
-1,447,1597,1,205,
-2441,16,0,475,1,
-827,2442,16,0,475,
-1,223,2443,16,0,
-475,1,476,1629,1,
-477,1635,1,1231,2444,
-16,0,475,1,479,
-1645,1,480,1650,1,
-1485,2445,16,0,475,
-1,1737,2446,16,0,
-475,1,2746,2447,16,
-0,475,1,242,2448,
-16,0,475,1,478,
-1669,1,1001,1674,1,
-1002,1679,1,21,2449,
-19,444,1,21,2450,
-5,84,1,1011,1188,
-1,1012,2451,16,0,
-442,1,1013,1345,1,
-262,1205,1,1267,2452,
-16,0,442,1,515,
-2453,16,0,442,1,
-1521,2454,16,0,442,
-1,525,1302,1,283,
-1258,1,2299,2455,16,
-0,442,1,42,2456,
-16,0,442,1,40,
-1263,1,44,1269,1,
-47,1270,1,1303,2457,
-16,0,442,1,1555,
-2458,16,0,442,1,
-50,1287,1,48,1276,
-1,49,1282,1,51,
-1292,1,63,1308,1,
-305,1297,1,66,1315,
-1,67,1320,1,68,
-1325,1,69,1330,1,
-70,1335,1,73,2459,
-16,0,442,1,74,
-1340,1,328,2460,16,
-0,442,1,1048,2461,
-16,0,442,1,82,
-2462,16,0,442,1,
-1840,2463,16,0,442,
-1,1591,2464,16,0,
-442,1,1341,2465,16,
-0,442,1,1096,1399,
-1,93,1405,1,352,
-2466,16,0,442,1,
-107,2467,16,0,442,
-1,1114,1430,1,118,
-2468,16,0,442,1,
-1123,2469,16,0,442,
-1,371,1452,1,1628,
-2470,16,0,442,1,
-375,1463,1,1882,2471,
-16,0,442,1,377,
-1468,1,379,1473,1,
-380,1478,1,883,2472,
-16,0,442,1,373,
-1496,1,130,2473,16,
-0,442,1,143,2474,
-16,0,442,1,387,
-2475,16,0,442,1,
-1159,2476,16,0,442,
-1,157,2477,16,0,
-442,1,1413,2478,16,
-0,442,1,1665,2479,
-16,0,442,1,412,
-2480,16,0,442,1,
-1377,2481,16,0,442,
-1,172,2482,16,0,
-442,1,1939,2483,16,
-0,442,1,437,2484,
-16,0,442,1,188,
-2485,16,0,442,1,
-942,2486,16,0,442,
-1,1195,2487,16,0,
-442,1,1449,2488,16,
-0,442,1,1701,2489,
-16,0,442,1,447,
-1597,1,205,2490,16,
-0,442,1,827,2491,
-16,0,442,1,223,
-2492,16,0,442,1,
-476,1629,1,477,1635,
-1,1231,2493,16,0,
-442,1,479,1645,1,
-480,1650,1,1485,2494,
-16,0,442,1,1737,
-2495,16,0,442,1,
-2746,2496,16,0,442,
-1,242,2497,16,0,
-442,1,478,1669,1,
-1001,1674,1,1002,1679,
-1,22,2498,19,395,
-1,22,2499,5,84,
-1,1011,1188,1,1012,
-2500,16,0,393,1,
-1013,1345,1,262,1205,
-1,1267,2501,16,0,
-393,1,515,2502,16,
-0,393,1,1521,2503,
-16,0,393,1,525,
-1302,1,283,1258,1,
-2299,2504,16,0,393,
-1,42,2505,16,0,
-393,1,40,1263,1,
-44,1269,1,47,1270,
-1,1303,2506,16,0,
-393,1,1555,2507,16,
-0,393,1,50,1287,
-1,48,1276,1,49,
-1282,1,51,1292,1,
-63,1308,1,305,1297,
-1,66,1315,1,67,
-1320,1,68,1325,1,
-69,1330,1,70,1335,
-1,73,2508,16,0,
-393,1,74,1340,1,
-328,2509,16,0,393,
-1,1048,2510,16,0,
-393,1,82,2511,16,
-0,393,1,1840,2512,
-16,0,393,1,1591,
-2513,16,0,393,1,
-1341,2514,16,0,393,
-1,1096,1399,1,93,
-1405,1,352,2515,16,
-0,393,1,107,2516,
-16,0,393,1,1114,
-1430,1,118,2517,16,
-0,393,1,1123,2518,
-16,0,393,1,371,
-1452,1,1628,2519,16,
-0,393,1,375,1463,
-1,1882,2520,16,0,
-393,1,377,1468,1,
-379,1473,1,380,1478,
-1,883,2521,16,0,
-393,1,373,1496,1,
-130,2522,16,0,393,
-1,143,2523,16,0,
-393,1,387,2524,16,
-0,393,1,1159,2525,
-16,0,393,1,157,
-2526,16,0,393,1,
-1413,2527,16,0,393,
-1,1665,2528,16,0,
-393,1,412,2529,16,
-0,393,1,1377,2530,
-16,0,393,1,172,
-2531,16,0,393,1,
-1939,2532,16,0,393,
-1,437,2533,16,0,
-393,1,188,2534,16,
-0,393,1,942,2535,
-16,0,393,1,1195,
-2536,16,0,393,1,
-1449,2537,16,0,393,
-1,1701,2538,16,0,
-393,1,447,1597,1,
-205,2539,16,0,393,
-1,827,2540,16,0,
-393,1,223,2541,16,
-0,393,1,476,1629,
-1,477,1635,1,1231,
-2542,16,0,393,1,
-479,1645,1,480,1650,
-1,1485,2543,16,0,
-393,1,1737,2544,16,
-0,393,1,2746,2545,
-16,0,393,1,242,
-2546,16,0,393,1,
-478,1669,1,1001,1674,
-1,1002,1679,1,23,
-2547,19,555,1,23,
-2548,5,38,1,1901,
-2549,16,0,553,1,
-2075,2550,16,0,553,
-1,1860,907,1,1803,
-873,1,1804,2551,16,
-0,553,1,2413,2552,
-16,0,553,1,2198,
-2553,16,0,553,1,
-1873,921,1,1657,979,
-1,1989,1002,1,1990,
-2554,16,0,553,1,
-1775,2555,16,0,553,
-1,32,2556,16,0,
-553,1,2105,900,1,
-2106,2557,16,0,553,
-1,2364,913,1,2227,
-993,1,2337,2558,16,
-0,553,1,2021,804,
-1,2458,961,1,2459,
-967,1,2462,974,1,
-2136,928,1,2464,984,
-1,2029,811,1,2030,
-817,1,2031,822,1,
-2032,827,1,2033,832,
-1,2035,838,1,2037,
-843,1,2039,848,1,
-1931,946,1,2041,854,
-1,2043,860,1,2045,
-865,1,1574,885,1,
-1958,2559,16,0,553,
-1,24,2560,19,188,
-1,24,2561,5,5,
-1,44,2562,16,0,
-186,1,377,2563,16,
-0,591,1,40,2564,
-16,0,760,1,63,
-2565,16,0,207,1,
-373,2566,16,0,587,
-1,25,2567,19,307,
-1,25,2568,5,177,
-1,256,2569,16,0,
-596,1,1261,2570,16,
-0,596,1,1011,1188,
-1,1012,2571,16,0,
-305,1,2458,961,1,
-262,1205,1,1267,2572,
-16,0,305,1,2021,
-804,1,1521,2573,16,
-0,305,1,1775,2574,
-16,0,596,1,2029,
-811,1,2030,817,1,
-2031,822,1,2032,827,
-1,2033,832,1,277,
-2575,16,0,596,1,
-2035,838,1,2037,843,
-1,2039,848,1,32,
-2576,16,0,596,1,
-2464,984,1,2293,2577,
-16,0,596,1,2043,
-860,1,2045,865,1,
-2299,2578,16,0,305,
-1,41,2579,16,0,
-596,1,42,2580,16,
-0,305,1,40,1263,
-1,44,1269,1,43,
-2581,16,0,596,1,
-1804,2582,16,0,596,
-1,48,1276,1,49,
-1282,1,47,1270,1,
-51,1292,1,52,2583,
-16,0,596,1,50,
-1287,1,305,1297,1,
-1096,1399,1,1515,2584,
-16,0,596,1,2318,
-2585,16,0,596,1,
-62,2586,16,0,596,
-1,63,1308,1,66,
-1315,1,67,1320,1,
-68,1325,1,69,1330,
-1,70,1335,1,71,
-2587,16,0,596,1,
-283,1258,1,73,2588,
-16,0,305,1,74,
-1340,1,1013,1345,1,
-76,2589,16,0,596,
-1,1834,2590,16,0,
-596,1,2337,2591,16,
-0,596,1,79,2592,
-16,0,596,1,1335,
-2593,16,0,596,1,
-299,2594,16,0,596,
-1,82,2595,16,0,
-305,1,1840,2596,16,
-0,305,1,1297,2597,
-16,0,596,1,85,
-2598,16,0,596,1,
-1341,2599,16,0,305,
-1,89,2600,16,0,
-596,1,1303,2601,16,
-0,305,1,509,2602,
-16,0,596,1,93,
-1405,1,322,2603,16,
-0,596,1,97,2604,
-16,0,596,1,2041,
-854,1,1555,2605,16,
-0,305,1,827,2606,
-16,0,305,1,102,
-2607,16,0,596,1,
-1860,907,1,1803,873,
-1,2364,913,1,107,
-2608,16,0,305,1,
-1114,1430,1,112,2609,
-16,0,596,1,1117,
-2610,16,0,596,1,
-352,1436,1,1873,921,
-1,118,1442,1,1123,
-2611,16,0,305,1,
-371,1452,1,515,2612,
-16,0,305,1,1377,
-2613,16,0,305,1,
-124,2614,16,0,596,
-1,1882,2615,16,0,
-305,1,377,1468,1,
-379,1473,1,380,1478,
-1,130,1501,1,346,
-2616,16,0,596,1,
-2075,2617,16,0,596,
-1,373,1496,1,387,
-2618,16,0,305,1,
-137,2619,16,0,596,
-1,143,2620,16,0,
-305,1,1901,2621,16,
-0,596,1,1048,1431,
-1,1153,2622,16,0,
-596,1,375,1463,1,
-151,2623,16,0,596,
-1,1407,2624,16,0,
-596,1,2740,2625,16,
-0,596,1,2413,2626,
-16,0,596,1,1159,
-2627,16,0,305,1,
-381,2628,16,0,596,
-1,157,2629,16,0,
-305,1,1413,2630,16,
-0,305,1,883,2631,
-16,0,305,1,1371,
-2632,16,0,596,1,
-328,1389,1,2105,900,
-1,2106,2633,16,0,
-596,1,166,2634,16,
-0,596,1,525,2635,
-16,0,596,1,1622,
-2636,16,0,596,1,
-406,2637,16,0,596,
-1,1574,885,1,172,
-1555,1,1931,946,1,
-412,2638,16,0,305,
-1,1933,2639,16,0,
-596,1,1876,2640,16,
-0,596,1,431,2641,
-16,0,596,1,1585,
-2642,16,0,596,1,
-182,2643,16,0,596,
-1,1628,2644,16,0,
-305,1,1189,2645,16,
-0,596,1,437,2646,
-16,0,305,1,1591,
-2647,16,0,305,1,
-188,1604,1,1695,2648,
-16,0,596,1,2198,
-2649,16,0,596,1,
-1195,2650,16,0,305,
-1,1449,2651,16,0,
-305,1,1701,2652,16,
-0,305,1,447,2653,
-16,0,596,1,199,
-2654,16,0,596,1,
-2459,967,1,1958,2655,
-16,0,596,1,2462,
-974,1,1657,979,1,
-205,2656,16,0,305,
-1,1659,2657,16,0,
-596,1,459,2658,16,
-0,596,1,462,2659,
-16,0,596,1,1665,
-2660,16,0,305,1,
-217,2661,16,0,596,
-1,2227,993,1,942,
-1576,1,1225,2662,16,
-0,596,1,223,2663,
-16,0,305,1,1479,
-2664,16,0,596,1,
-1731,2665,16,0,596,
-1,477,1635,1,1231,
-2666,16,0,305,1,
-479,1645,1,480,1650,
-1,1485,2667,16,0,
-305,1,1737,2668,16,
-0,305,1,1989,1002,
-1,1990,2669,16,0,
-596,1,1443,2670,16,
-0,596,1,236,2671,
-16,0,596,1,2136,
-928,1,476,1629,1,
-242,2672,16,0,305,
-1,478,1669,1,1939,
-2673,16,0,305,1,
-2746,2674,16,0,305,
-1,1001,1674,1,1002,
-1679,1,1756,2675,16,
-0,596,1,26,2676,
-19,323,1,26,2677,
-5,84,1,1011,1188,
-1,1012,2678,16,0,
-321,1,1013,1345,1,
-262,1205,1,1267,2679,
-16,0,321,1,515,
-2680,16,0,740,1,
-1521,2681,16,0,321,
-1,525,1302,1,283,
-1258,1,2299,2682,16,
-0,321,1,42,2683,
-16,0,321,1,40,
-1263,1,44,1269,1,
-47,1270,1,1303,2684,
-16,0,321,1,1555,
-2685,16,0,321,1,
-50,1287,1,48,1276,
-1,49,1282,1,51,
-1292,1,63,1308,1,
-305,1297,1,66,1315,
-1,67,1320,1,68,
-1325,1,69,1330,1,
-70,1335,1,73,2686,
-16,0,321,1,74,
-1340,1,328,1389,1,
-1048,1431,1,82,2687,
-16,0,321,1,1840,
-2688,16,0,321,1,
-1591,2689,16,0,321,
-1,1341,2690,16,0,
-321,1,1096,1399,1,
-93,1405,1,352,1436,
-1,107,2691,16,0,
-321,1,1114,1430,1,
-118,1442,1,1123,2692,
-16,0,321,1,371,
-1452,1,1628,2693,16,
-0,321,1,375,1463,
-1,1882,2694,16,0,
-321,1,377,1468,1,
-379,1473,1,380,1478,
-1,883,2695,16,0,
-321,1,373,1496,1,
-130,1501,1,143,2696,
-16,0,321,1,387,
-2697,16,0,321,1,
-1159,2698,16,0,321,
-1,157,2699,16,0,
-321,1,1413,2700,16,
-0,321,1,1665,2701,
-16,0,321,1,412,
-2702,16,0,321,1,
-1377,2703,16,0,321,
-1,172,1555,1,1939,
-2704,16,0,321,1,
-437,2705,16,0,665,
-1,188,1604,1,942,
-1576,1,1195,2706,16,
-0,321,1,1449,2707,
-16,0,321,1,1701,
-2708,16,0,321,1,
-447,1597,1,205,2709,
-16,0,321,1,827,
-2710,16,0,321,1,
-223,2711,16,0,321,
-1,476,1629,1,477,
-1635,1,1231,2712,16,
-0,321,1,479,1645,
-1,480,1650,1,1485,
-2713,16,0,321,1,
-1737,2714,16,0,321,
-1,2746,2715,16,0,
-321,1,242,2716,16,
-0,321,1,478,1669,
-1,1001,1674,1,1002,
-1679,1,27,2717,19,
-673,1,27,2718,5,
-95,1,256,2719,16,
-0,671,1,1261,2720,
-16,0,671,1,509,
-2721,16,0,671,1,
-1515,2722,16,0,671,
-1,2021,804,1,1775,
-2723,16,0,671,1,
-2029,811,1,2030,817,
-1,2031,822,1,2032,
-827,1,2033,832,1,
-277,2724,16,0,671,
-1,2035,838,1,2037,
-843,1,2039,848,1,
-32,2725,16,0,671,
-1,2041,854,1,2293,
-2726,16,0,671,1,
-2043,860,1,2045,865,
-1,41,2727,16,0,
-671,1,1297,2728,16,
-0,671,1,43,2729,
-16,0,671,1,1803,
-873,1,1804,2730,16,
-0,671,1,299,2731,
-16,0,671,1,52,
-2732,16,0,671,1,
-2318,2733,16,0,671,
-1,62,2734,16,0,
-671,1,2075,2735,16,
-0,671,1,1574,885,
-1,71,2736,16,0,
-671,1,76,2737,16,
-0,671,1,1834,2738,
-16,0,671,1,2337,
-2739,16,0,671,1,
-79,2740,16,0,671,
-1,1335,2741,16,0,
-671,1,322,2742,16,
-0,671,1,85,2743,
-16,0,671,1,89,
-2744,16,0,671,1,
-346,2745,16,0,671,
-1,2105,900,1,2106,
-2746,16,0,671,1,
-97,2747,16,0,671,
-1,1860,907,1,2364,
-913,1,102,2748,16,
-0,671,1,112,2749,
-16,0,671,1,1117,
-2750,16,0,671,1,
-1873,921,1,1876,2751,
-16,0,671,1,124,
-2752,16,0,671,1,
-2136,928,1,381,2753,
-16,0,671,1,525,
-2754,16,0,671,1,
-137,2755,16,0,671,
-1,1901,2756,16,0,
-671,1,1153,2757,16,
-0,671,1,151,2758,
-16,0,671,1,1407,
-2759,16,0,671,1,
-1659,2760,16,0,671,
-1,2413,2761,16,0,
-671,1,406,2762,16,
-0,671,1,1371,2763,
-16,0,671,1,166,
-2764,16,0,671,1,
-1622,2765,16,0,671,
-1,1931,946,1,1933,
-2766,16,0,671,1,
-431,2767,16,0,671,
-1,1585,2768,16,0,
-671,1,182,2769,16,
-0,671,1,1189,2770,
-16,0,671,1,1443,
-2771,16,0,671,1,
-1695,2772,16,0,671,
-1,2198,2773,16,0,
-671,1,447,2774,16,
-0,671,1,2458,961,
-1,2459,967,1,1958,
-2775,16,0,671,1,
-2462,974,1,1657,979,
-1,2464,984,1,199,
-2776,16,0,671,1,
-459,2777,16,0,671,
-1,462,2778,16,0,
-671,1,217,2779,16,
-0,671,1,2227,993,
-1,1225,2780,16,0,
-671,1,1479,2781,16,
-0,671,1,1731,2782,
-16,0,671,1,2740,
-2783,16,0,671,1,
-1989,1002,1,1990,2784,
-16,0,671,1,236,
-2785,16,0,671,1,
-1756,2786,16,0,671,
-1,28,2787,19,705,
-1,28,2788,5,60,
-1,328,1389,1,223,
-1619,1,1096,1399,1,
-118,1442,1,883,1484,
-1,525,1302,1,1001,
-1674,1,130,1501,1,
-459,1863,1,1114,1430,
-1,352,1436,1,447,
-1597,1,464,1856,1,
-1011,1188,1,1013,1345,
-1,242,1664,1,143,
-1506,1,40,1263,1,
-41,1830,1,42,1834,
-1,479,1645,1,44,
-1269,1,481,1865,1,
-373,1496,1,47,1270,
-1,157,1529,1,49,
-1282,1,50,1287,1,
-48,1276,1,379,1473,
-1,380,1478,1,51,
-1292,1,476,1629,1,
-371,1452,1,478,1669,
-1,1048,1431,1,375,
-1463,1,172,1555,1,
-262,1205,1,283,1258,
-1,63,1308,1,67,
-1320,1,68,1325,1,
-69,1330,1,66,1315,
-1,461,2789,16,0,
-703,1,74,1340,1,
-377,1468,1,1002,1679,
-1,70,1335,1,188,
-1604,1,82,1367,1,
-305,1297,1,477,1635,
-1,827,1418,1,93,
-1405,1,480,1650,1,
-205,1609,1,942,1576,
-1,107,1425,1,29,
-2790,19,295,1,29,
-2791,5,84,1,1011,
-1188,1,1012,2792,16,
-0,293,1,1013,1345,
-1,262,1205,1,1267,
-2793,16,0,293,1,
-515,2794,16,0,293,
-1,1521,2795,16,0,
-293,1,525,1302,1,
-283,1258,1,2299,2796,
-16,0,293,1,42,
-2797,16,0,293,1,
-40,1263,1,44,1269,
-1,47,1270,1,1303,
-2798,16,0,293,1,
-1555,2799,16,0,293,
-1,50,1287,1,48,
-1276,1,49,1282,1,
-51,1292,1,63,1308,
-1,305,1297,1,66,
-1315,1,67,1320,1,
-68,1325,1,69,1330,
-1,70,1335,1,73,
-2800,16,0,293,1,
-74,1340,1,328,1389,
-1,1048,1431,1,82,
-2801,16,0,293,1,
-1840,2802,16,0,293,
-1,1591,2803,16,0,
-293,1,1341,2804,16,
-0,293,1,1096,1399,
-1,93,1405,1,352,
-1436,1,107,2805,16,
-0,293,1,1114,1430,
-1,118,1442,1,1123,
-2806,16,0,293,1,
-371,1452,1,1628,2807,
-16,0,293,1,375,
-1463,1,1882,2808,16,
-0,293,1,377,1468,
-1,379,1473,1,380,
-1478,1,883,2809,16,
-0,293,1,373,1496,
-1,130,1501,1,143,
-1506,1,387,2810,16,
-0,293,1,1159,2811,
-16,0,293,1,157,
-1529,1,1413,2812,16,
-0,293,1,1665,2813,
-16,0,293,1,412,
-2814,16,0,293,1,
-1377,2815,16,0,293,
-1,172,1555,1,1939,
-2816,16,0,293,1,
-437,2817,16,0,293,
-1,188,1604,1,942,
-1576,1,1195,2818,16,
-0,293,1,1449,2819,
-16,0,293,1,1701,
-2820,16,0,293,1,
-447,1597,1,205,2821,
-16,0,293,1,827,
-2822,16,0,293,1,
-223,2823,16,0,293,
-1,476,1629,1,477,
-1635,1,1231,2824,16,
-0,293,1,479,1645,
-1,480,1650,1,1485,
-2825,16,0,293,1,
-1737,2826,16,0,293,
-1,2746,2827,16,0,
-293,1,242,2828,16,
-0,293,1,478,1669,
-1,1001,1674,1,1002,
-1679,1,30,2829,19,
-282,1,30,2830,5,
-84,1,1011,1188,1,
-1012,2831,16,0,280,
-1,1013,1345,1,262,
-1205,1,1267,2832,16,
-0,280,1,515,2833,
-16,0,280,1,1521,
-2834,16,0,280,1,
-525,1302,1,283,1258,
-1,2299,2835,16,0,
-280,1,42,2836,16,
-0,280,1,40,1263,
-1,44,1269,1,47,
-1270,1,1303,2837,16,
-0,280,1,1555,2838,
-16,0,280,1,50,
-1287,1,48,1276,1,
-49,1282,1,51,1292,
-1,63,1308,1,305,
-1297,1,66,1315,1,
-67,1320,1,68,1325,
-1,69,1330,1,70,
-1335,1,73,2839,16,
-0,280,1,74,1340,
-1,328,1389,1,1048,
-1431,1,82,2840,16,
-0,280,1,1840,2841,
-16,0,280,1,1591,
-2842,16,0,280,1,
-1341,2843,16,0,280,
-1,1096,1399,1,93,
-1405,1,352,1436,1,
-107,2844,16,0,280,
-1,1114,1430,1,118,
-1442,1,1123,2845,16,
-0,280,1,371,1452,
-1,1628,2846,16,0,
-280,1,375,1463,1,
-1882,2847,16,0,280,
-1,377,1468,1,379,
-1473,1,380,1478,1,
-883,2848,16,0,280,
-1,373,1496,1,130,
-1501,1,143,1506,1,
-387,2849,16,0,280,
-1,1159,2850,16,0,
-280,1,157,1529,1,
-1413,2851,16,0,280,
-1,1665,2852,16,0,
-280,1,412,2853,16,
-0,280,1,1377,2854,
-16,0,280,1,172,
-1555,1,1939,2855,16,
-0,280,1,437,2856,
-16,0,280,1,188,
-1604,1,942,1576,1,
-1195,2857,16,0,280,
-1,1449,2858,16,0,
-280,1,1701,2859,16,
-0,280,1,447,1597,
-1,205,2860,16,0,
-280,1,827,2861,16,
-0,280,1,223,2862,
-16,0,280,1,476,
-1629,1,477,1635,1,
-1231,2863,16,0,280,
-1,479,1645,1,480,
-1650,1,1485,2864,16,
-0,280,1,1737,2865,
-16,0,280,1,2746,
-2866,16,0,280,1,
-242,2867,16,0,280,
-1,478,1669,1,1001,
-1674,1,1002,1679,1,
-31,2868,19,268,1,
-31,2869,5,84,1,
-1011,1188,1,1012,2870,
-16,0,266,1,1013,
-1345,1,262,1205,1,
-1267,2871,16,0,266,
-1,515,2872,16,0,
-266,1,1521,2873,16,
-0,266,1,525,1302,
-1,283,1258,1,2299,
-2874,16,0,266,1,
-42,2875,16,0,266,
-1,40,1263,1,44,
-1269,1,47,1270,1,
-1303,2876,16,0,266,
-1,1555,2877,16,0,
-266,1,50,1287,1,
-48,1276,1,49,1282,
-1,51,1292,1,63,
-1308,1,305,1297,1,
-66,1315,1,67,1320,
-1,68,1325,1,69,
-1330,1,70,1335,1,
-73,2878,16,0,266,
-1,74,1340,1,328,
-1389,1,1048,1431,1,
-82,2879,16,0,266,
-1,1840,2880,16,0,
-266,1,1591,2881,16,
-0,266,1,1341,2882,
-16,0,266,1,1096,
-1399,1,93,1405,1,
-352,1436,1,107,2883,
-16,0,266,1,1114,
-1430,1,118,1442,1,
-1123,2884,16,0,266,
-1,371,1452,1,1628,
-2885,16,0,266,1,
-375,1463,1,1882,2886,
-16,0,266,1,377,
-1468,1,379,1473,1,
-380,1478,1,883,2887,
-16,0,266,1,373,
-1496,1,130,1501,1,
-143,2888,16,0,266,
-1,387,2889,16,0,
-266,1,1159,2890,16,
-0,266,1,157,2891,
-16,0,266,1,1413,
-2892,16,0,266,1,
-1665,2893,16,0,266,
-1,412,2894,16,0,
-266,1,1377,2895,16,
-0,266,1,172,1555,
-1,1939,2896,16,0,
-266,1,437,2897,16,
-0,266,1,188,1604,
-1,942,1576,1,1195,
-2898,16,0,266,1,
-1449,2899,16,0,266,
-1,1701,2900,16,0,
-266,1,447,1597,1,
-205,2901,16,0,266,
-1,827,2902,16,0,
-266,1,223,2903,16,
-0,266,1,476,1629,
-1,477,1635,1,1231,
-2904,16,0,266,1,
-479,1645,1,480,1650,
-1,1485,2905,16,0,
-266,1,1737,2906,16,
-0,266,1,2746,2907,
-16,0,266,1,242,
-2908,16,0,266,1,
-478,1669,1,1001,1674,
-1,1002,1679,1,32,
-2909,19,261,1,32,
-2910,5,84,1,1011,
-1188,1,1012,2911,16,
-0,259,1,1013,1345,
-1,262,1205,1,1267,
-2912,16,0,259,1,
-515,2913,16,0,259,
-1,1521,2914,16,0,
-259,1,525,1302,1,
-283,1258,1,2299,2915,
-16,0,259,1,42,
-2916,16,0,259,1,
-40,1263,1,44,1269,
-1,47,1270,1,1303,
-2917,16,0,259,1,
-1555,2918,16,0,259,
-1,50,1287,1,48,
-1276,1,49,1282,1,
-51,1292,1,63,1308,
-1,305,1297,1,66,
-1315,1,67,1320,1,
-68,1325,1,69,1330,
-1,70,1335,1,73,
-2919,16,0,259,1,
-74,1340,1,328,1389,
-1,1048,1431,1,82,
-2920,16,0,259,1,
-1840,2921,16,0,259,
-1,1591,2922,16,0,
-259,1,1341,2923,16,
-0,259,1,1096,1399,
-1,93,1405,1,352,
-1436,1,107,2924,16,
-0,259,1,1114,1430,
-1,118,1442,1,1123,
-2925,16,0,259,1,
-371,1452,1,1628,2926,
-16,0,259,1,375,
-1463,1,1882,2927,16,
-0,259,1,377,1468,
-1,379,1473,1,380,
-1478,1,883,2928,16,
-0,259,1,373,1496,
-1,130,1501,1,143,
-2929,16,0,259,1,
-387,2930,16,0,259,
-1,1159,2931,16,0,
-259,1,157,2932,16,
-0,259,1,1413,2933,
-16,0,259,1,1665,
-2934,16,0,259,1,
-412,2935,16,0,259,
-1,1377,2936,16,0,
-259,1,172,1555,1,
-1939,2937,16,0,259,
-1,437,2938,16,0,
-259,1,188,1604,1,
-942,1576,1,1195,2939,
-16,0,259,1,1449,
-2940,16,0,259,1,
-1701,2941,16,0,259,
-1,447,1597,1,205,
-2942,16,0,259,1,
-827,2943,16,0,259,
-1,223,2944,16,0,
-259,1,476,1629,1,
-477,1635,1,1231,2945,
-16,0,259,1,479,
-1645,1,480,1650,1,
-1485,2946,16,0,259,
-1,1737,2947,16,0,
-259,1,2746,2948,16,
-0,259,1,242,2949,
-16,0,259,1,478,
-1669,1,1001,1674,1,
-1002,1679,1,33,2950,
-19,346,1,33,2951,
-5,84,1,1011,1188,
-1,1012,2952,16,0,
-344,1,1013,1345,1,
-262,1205,1,1267,2953,
-16,0,344,1,515,
-2954,16,0,344,1,
-1521,2955,16,0,344,
-1,525,1302,1,283,
-1258,1,2299,2956,16,
-0,344,1,42,2957,
-16,0,344,1,40,
-1263,1,44,1269,1,
-47,1270,1,1303,2958,
-16,0,344,1,1555,
-2959,16,0,344,1,
-50,1287,1,48,1276,
-1,49,1282,1,51,
-1292,1,63,1308,1,
-305,1297,1,66,1315,
-1,67,1320,1,68,
-1325,1,69,1330,1,
-70,1335,1,73,2960,
-16,0,344,1,74,
-1340,1,328,1389,1,
-1048,1431,1,82,2961,
-16,0,344,1,1840,
-2962,16,0,344,1,
-1591,2963,16,0,344,
-1,1341,2964,16,0,
-344,1,1096,1399,1,
-93,1405,1,352,1436,
-1,107,2965,16,0,
-344,1,1114,1430,1,
-118,1442,1,1123,2966,
-16,0,344,1,371,
-1452,1,1628,2967,16,
-0,344,1,375,1463,
-1,1882,2968,16,0,
-344,1,377,1468,1,
-379,1473,1,380,1478,
-1,883,2969,16,0,
-344,1,373,1496,1,
-130,1501,1,143,1506,
-1,387,2970,16,0,
-344,1,1159,2971,16,
-0,344,1,157,1529,
-1,1413,2972,16,0,
-344,1,1665,2973,16,
-0,344,1,412,2974,
-16,0,344,1,1377,
-2975,16,0,344,1,
-172,1555,1,1939,2976,
-16,0,344,1,437,
-2977,16,0,344,1,
-188,1604,1,942,1576,
-1,1195,2978,16,0,
-344,1,1449,2979,16,
-0,344,1,1701,2980,
-16,0,344,1,447,
-1597,1,205,2981,16,
-0,344,1,827,2982,
-16,0,344,1,223,
-2983,16,0,344,1,
-476,1629,1,477,1635,
-1,1231,2984,16,0,
-344,1,479,1645,1,
-480,1650,1,1485,2985,
-16,0,344,1,1737,
-2986,16,0,344,1,
-2746,2987,16,0,344,
-1,242,1664,1,478,
-1669,1,1001,1674,1,
-1002,1679,1,34,2988,
-19,336,1,34,2989,
-5,84,1,1011,1188,
-1,1012,2990,16,0,
-334,1,1013,1345,1,
-262,1205,1,1267,2991,
-16,0,334,1,515,
-2992,16,0,334,1,
-1521,2993,16,0,334,
-1,525,1302,1,283,
-1258,1,2299,2994,16,
-0,334,1,42,2995,
-16,0,334,1,40,
-1263,1,44,1269,1,
-47,1270,1,1303,2996,
-16,0,334,1,1555,
-2997,16,0,334,1,
-50,1287,1,48,1276,
-1,49,1282,1,51,
-1292,1,63,1308,1,
-305,1297,1,66,1315,
-1,67,1320,1,68,
-1325,1,69,1330,1,
-70,1335,1,73,2998,
-16,0,334,1,74,
-1340,1,328,1389,1,
-1048,1431,1,82,2999,
-16,0,334,1,1840,
-3000,16,0,334,1,
-1591,3001,16,0,334,
-1,1341,3002,16,0,
-334,1,1096,1399,1,
-93,1405,1,352,1436,
-1,107,3003,16,0,
-334,1,1114,1430,1,
-118,1442,1,1123,3004,
-16,0,334,1,371,
-1452,1,1628,3005,16,
-0,334,1,375,1463,
-1,1882,3006,16,0,
-334,1,377,1468,1,
-379,1473,1,380,1478,
-1,883,3007,16,0,
-334,1,373,1496,1,
-130,1501,1,143,1506,
-1,387,3008,16,0,
-334,1,1159,3009,16,
-0,334,1,157,1529,
-1,1413,3010,16,0,
-334,1,1665,3011,16,
-0,334,1,412,3012,
-16,0,334,1,1377,
-3013,16,0,334,1,
-172,1555,1,1939,3014,
-16,0,334,1,437,
-3015,16,0,334,1,
-188,1604,1,942,1576,
-1,1195,3016,16,0,
-334,1,1449,3017,16,
-0,334,1,1701,3018,
-16,0,334,1,447,
-1597,1,205,1609,1,
-827,3019,16,0,334,
-1,223,1619,1,476,
-1629,1,477,1635,1,
-1231,3020,16,0,334,
-1,479,1645,1,480,
-1650,1,1485,3021,16,
-0,334,1,1737,3022,
-16,0,334,1,2746,
-3023,16,0,334,1,
-242,1664,1,478,1669,
-1,1001,1674,1,1002,
-1679,1,35,3024,19,
-326,1,35,3025,5,
-84,1,1011,1188,1,
-1012,3026,16,0,324,
-1,1013,1345,1,262,
-1205,1,1267,3027,16,
-0,324,1,515,3028,
-16,0,324,1,1521,
-3029,16,0,324,1,
-525,1302,1,283,1258,
-1,2299,3030,16,0,
-324,1,42,3031,16,
-0,324,1,40,1263,
-1,44,1269,1,47,
-1270,1,1303,3032,16,
-0,324,1,1555,3033,
-16,0,324,1,50,
-1287,1,48,1276,1,
-49,1282,1,51,1292,
-1,63,1308,1,305,
-1297,1,66,1315,1,
-67,1320,1,68,1325,
-1,69,1330,1,70,
-1335,1,73,3034,16,
-0,324,1,74,1340,
-1,328,1389,1,1048,
-1431,1,82,3035,16,
-0,324,1,1840,3036,
-16,0,324,1,1591,
-3037,16,0,324,1,
-1341,3038,16,0,324,
-1,1096,1399,1,93,
-1405,1,352,1436,1,
-107,3039,16,0,324,
-1,1114,1430,1,118,
-1442,1,1123,3040,16,
-0,324,1,371,1452,
-1,1628,3041,16,0,
-324,1,375,1463,1,
-1882,3042,16,0,324,
-1,377,1468,1,379,
-1473,1,380,1478,1,
-883,3043,16,0,324,
-1,373,1496,1,130,
-1501,1,143,1506,1,
-387,3044,16,0,324,
-1,1159,3045,16,0,
-324,1,157,1529,1,
-1413,3046,16,0,324,
-1,1665,3047,16,0,
-324,1,412,3048,16,
-0,324,1,1377,3049,
-16,0,324,1,172,
-1555,1,1939,3050,16,
-0,324,1,437,3051,
-16,0,324,1,188,
-1604,1,942,1576,1,
-1195,3052,16,0,324,
-1,1449,3053,16,0,
-324,1,1701,3054,16,
-0,324,1,447,1597,
-1,205,1609,1,827,
-3055,16,0,324,1,
-223,3056,16,0,324,
-1,476,1629,1,477,
-1635,1,1231,3057,16,
-0,324,1,479,1645,
-1,480,1650,1,1485,
-3058,16,0,324,1,
-1737,3059,16,0,324,
-1,2746,3060,16,0,
-324,1,242,1664,1,
-478,1669,1,1001,1674,
-1,1002,1679,1,36,
-3061,19,227,1,36,
-3062,5,94,1,256,
-3063,16,0,225,1,
-1261,3064,16,0,225,
-1,509,3065,16,0,
-225,1,1515,3066,16,
-0,225,1,2021,804,
-1,1775,3067,16,0,
-225,1,2029,811,1,
-2030,817,1,2031,822,
-1,2032,827,1,2033,
-832,1,277,3068,16,
-0,225,1,2035,838,
-1,2037,843,1,2039,
-848,1,32,3069,16,
-0,225,1,2041,854,
-1,2293,3070,16,0,
-225,1,2043,860,1,
-2045,865,1,41,3071,
-16,0,225,1,1297,
-3072,16,0,225,1,
-43,3073,16,0,225,
-1,1803,873,1,1804,
-3074,16,0,225,1,
-299,3075,16,0,225,
-1,52,3076,16,0,
-225,1,2318,3077,16,
-0,225,1,2075,3078,
-16,0,225,1,1574,
-885,1,71,3079,16,
-0,225,1,76,3080,
-16,0,225,1,1834,
-3081,16,0,225,1,
-2337,3082,16,0,225,
-1,79,3083,16,0,
-225,1,1335,3084,16,
-0,225,1,322,3085,
-16,0,225,1,85,
-3086,16,0,225,1,
-89,3087,16,0,225,
-1,346,3088,16,0,
-225,1,2105,900,1,
-2106,3089,16,0,225,
-1,97,3090,16,0,
-225,1,1860,907,1,
-2364,913,1,102,3091,
-16,0,225,1,112,
-3092,16,0,225,1,
-1117,3093,16,0,225,
-1,1873,921,1,1876,
-3094,16,0,225,1,
-124,3095,16,0,225,
-1,2136,928,1,381,
-3096,16,0,225,1,
-525,3097,16,0,225,
-1,137,3098,16,0,
-225,1,1901,3099,16,
-0,225,1,1153,3100,
-16,0,225,1,151,
-3101,16,0,225,1,
-1407,3102,16,0,225,
-1,1659,3103,16,0,
-225,1,2413,3104,16,
-0,225,1,406,3105,
-16,0,225,1,1371,
-3106,16,0,225,1,
-166,3107,16,0,225,
-1,1622,3108,16,0,
-225,1,1931,946,1,
-1933,3109,16,0,225,
-1,431,3110,16,0,
-225,1,1585,3111,16,
-0,225,1,182,3112,
-16,0,225,1,1189,
-3113,16,0,225,1,
-1443,3114,16,0,225,
-1,1695,3115,16,0,
-225,1,2198,3116,16,
-0,225,1,447,3117,
-16,0,225,1,2458,
-961,1,2459,967,1,
-1958,3118,16,0,225,
-1,2462,974,1,1657,
-979,1,2464,984,1,
-199,3119,16,0,225,
-1,459,3120,16,0,
-225,1,462,3121,16,
-0,225,1,217,3122,
-16,0,225,1,2227,
-993,1,1225,3123,16,
-0,225,1,1479,3124,
-16,0,225,1,1731,
-3125,16,0,225,1,
-2740,3126,16,0,225,
-1,1989,1002,1,1990,
-3127,16,0,225,1,
-236,3128,16,0,225,
-1,1756,3129,16,0,
-225,1,37,3130,19,
-251,1,37,3131,5,
-94,1,256,3132,16,
-0,249,1,1261,3133,
-16,0,249,1,509,
-3134,16,0,249,1,
-1515,3135,16,0,249,
-1,2021,804,1,1775,
-3136,16,0,249,1,
-2029,811,1,2030,817,
-1,2031,822,1,2032,
-827,1,2033,832,1,
-277,3137,16,0,249,
-1,2035,838,1,2037,
-843,1,2039,848,1,
-32,3138,16,0,249,
-1,2041,854,1,2293,
-3139,16,0,249,1,
-2043,860,1,2045,865,
-1,41,3140,16,0,
-249,1,1297,3141,16,
-0,249,1,43,3142,
-16,0,249,1,1803,
-873,1,1804,3143,16,
-0,249,1,299,3144,
-16,0,249,1,52,
-3145,16,0,249,1,
-2318,3146,16,0,249,
-1,2075,3147,16,0,
-249,1,1574,885,1,
-71,3148,16,0,249,
-1,76,3149,16,0,
-249,1,1834,3150,16,
-0,249,1,2337,3151,
-16,0,249,1,79,
-3152,16,0,249,1,
-1335,3153,16,0,249,
-1,322,3154,16,0,
-249,1,85,3155,16,
-0,249,1,89,3156,
-16,0,249,1,346,
-3157,16,0,249,1,
-2105,900,1,2106,3158,
-16,0,249,1,97,
-3159,16,0,249,1,
-1860,907,1,2364,913,
-1,102,3160,16,0,
-249,1,112,3161,16,
-0,249,1,1117,3162,
-16,0,249,1,1873,
-921,1,1876,3163,16,
-0,249,1,124,3164,
-16,0,249,1,2136,
-928,1,381,3165,16,
-0,249,1,525,3166,
-16,0,249,1,137,
-3167,16,0,249,1,
-1901,3168,16,0,249,
-1,1153,3169,16,0,
-249,1,151,3170,16,
-0,249,1,1407,3171,
-16,0,249,1,1659,
-3172,16,0,249,1,
-2413,3173,16,0,249,
-1,406,3174,16,0,
-249,1,1371,3175,16,
-0,249,1,166,3176,
-16,0,249,1,1622,
-3177,16,0,249,1,
-1931,946,1,1933,3178,
-16,0,249,1,431,
-3179,16,0,249,1,
-1585,3180,16,0,249,
-1,182,3181,16,0,
-249,1,1189,3182,16,
-0,249,1,1443,3183,
-16,0,249,1,1695,
-3184,16,0,249,1,
-2198,3185,16,0,249,
-1,447,3186,16,0,
-249,1,2458,961,1,
-2459,967,1,1958,3187,
-16,0,249,1,2462,
-974,1,1657,979,1,
-2464,984,1,199,3188,
-16,0,249,1,459,
-3189,16,0,249,1,
-462,3190,16,0,249,
-1,217,3191,16,0,
-249,1,2227,993,1,
-1225,3192,16,0,249,
-1,1479,3193,16,0,
-249,1,1731,3194,16,
-0,249,1,2740,3195,
-16,0,249,1,1989,
-1002,1,1990,3196,16,
-0,249,1,236,3197,
-16,0,249,1,1756,
-3198,16,0,249,1,
-38,3199,19,247,1,
-38,3200,5,84,1,
-1011,1188,1,1012,3201,
-16,0,245,1,1013,
-1345,1,262,1205,1,
-1267,3202,16,0,245,
-1,515,3203,16,0,
-245,1,1521,3204,16,
-0,245,1,525,1302,
-1,283,1258,1,2299,
-3205,16,0,245,1,
-42,3206,16,0,245,
-1,40,1263,1,44,
-1269,1,47,1270,1,
-1303,3207,16,0,245,
-1,1555,3208,16,0,
-245,1,50,1287,1,
-48,1276,1,49,1282,
-1,51,1292,1,63,
-1308,1,305,1297,1,
-66,1315,1,67,1320,
-1,68,1325,1,69,
-1330,1,70,1335,1,
-73,3209,16,0,245,
-1,74,1340,1,328,
-1389,1,1048,1431,1,
-82,3210,16,0,245,
-1,1840,3211,16,0,
-245,1,1591,3212,16,
-0,245,1,1341,3213,
-16,0,245,1,1096,
-1399,1,93,1405,1,
-352,1436,1,107,3214,
-16,0,245,1,1114,
-1430,1,118,1442,1,
-1123,3215,16,0,245,
-1,371,1452,1,1628,
-3216,16,0,245,1,
-375,1463,1,1882,3217,
-16,0,245,1,377,
-1468,1,379,1473,1,
-380,1478,1,883,1484,
-1,373,1496,1,130,
-1501,1,143,1506,1,
-387,3218,16,0,245,
-1,1159,3219,16,0,
-245,1,157,1529,1,
-1413,3220,16,0,245,
-1,1665,3221,16,0,
-245,1,412,3222,16,
-0,245,1,1377,3223,
-16,0,245,1,172,
-1555,1,1939,3224,16,
-0,245,1,437,3225,
-16,0,245,1,188,
-1604,1,942,1576,1,
-1195,3226,16,0,245,
-1,1449,3227,16,0,
-245,1,1701,3228,16,
-0,245,1,447,1597,
-1,205,1609,1,827,
-1418,1,223,1619,1,
-476,1629,1,477,1635,
-1,1231,3229,16,0,
-245,1,479,1645,1,
-480,1650,1,1485,3230,
-16,0,245,1,1737,
-3231,16,0,245,1,
-2746,3232,16,0,245,
-1,242,1664,1,478,
-1669,1,1001,1674,1,
-1002,1679,1,39,3233,
-19,233,1,39,3234,
-5,84,1,1011,1188,
-1,1012,3235,16,0,
-231,1,1013,1345,1,
-262,1205,1,1267,3236,
-16,0,231,1,515,
-3237,16,0,231,1,
-1521,3238,16,0,231,
-1,525,1302,1,283,
-1258,1,2299,3239,16,
-0,231,1,42,3240,
-16,0,231,1,40,
-1263,1,44,1269,1,
-47,1270,1,1303,3241,
-16,0,231,1,1555,
-3242,16,0,231,1,
-50,1287,1,48,1276,
-1,49,1282,1,51,
-1292,1,63,1308,1,
-305,1297,1,66,1315,
-1,67,1320,1,68,
-1325,1,69,1330,1,
-70,1335,1,73,3243,
-16,0,231,1,74,
-1340,1,328,1389,1,
-1048,1431,1,82,3244,
-16,0,231,1,1840,
-3245,16,0,231,1,
-1591,3246,16,0,231,
-1,1341,3247,16,0,
-231,1,1096,1399,1,
-93,1405,1,352,1436,
-1,107,3248,16,0,
-231,1,1114,1430,1,
-118,1442,1,1123,3249,
-16,0,231,1,371,
-1452,1,1628,3250,16,
-0,231,1,375,1463,
-1,1882,3251,16,0,
-231,1,377,1468,1,
-379,1473,1,380,1478,
-1,883,1484,1,373,
-1496,1,130,1501,1,
-143,1506,1,387,3252,
-16,0,231,1,1159,
-3253,16,0,231,1,
-157,1529,1,1413,3254,
-16,0,231,1,1665,
-3255,16,0,231,1,
-412,3256,16,0,231,
-1,1377,3257,16,0,
-231,1,172,1555,1,
-1939,3258,16,0,231,
-1,437,3259,16,0,
-231,1,188,1604,1,
-942,1576,1,1195,3260,
-16,0,231,1,1449,
-3261,16,0,231,1,
-1701,3262,16,0,231,
-1,447,1597,1,205,
-1609,1,827,1418,1,
-223,1619,1,476,1629,
-1,477,1635,1,1231,
-3263,16,0,231,1,
-479,1645,1,480,1650,
-1,1485,3264,16,0,
-231,1,1737,3265,16,
-0,231,1,2746,3266,
-16,0,231,1,242,
-1664,1,478,1669,1,
-1001,1674,1,1002,1679,
-1,40,3267,19,221,
-1,40,3268,5,84,
-1,1011,1188,1,1012,
-3269,16,0,219,1,
-1013,1345,1,262,1205,
-1,1267,3270,16,0,
-219,1,515,3271,16,
-0,219,1,1521,3272,
-16,0,219,1,525,
-1302,1,283,1258,1,
-2299,3273,16,0,219,
-1,42,3274,16,0,
-219,1,40,1263,1,
-44,1269,1,47,1270,
-1,1303,3275,16,0,
-219,1,1555,3276,16,
-0,219,1,50,1287,
-1,48,1276,1,49,
-1282,1,51,1292,1,
-63,1308,1,305,1297,
-1,66,1315,1,67,
-1320,1,68,1325,1,
-69,1330,1,70,1335,
-1,73,3277,16,0,
-219,1,74,1340,1,
-328,1389,1,1048,1431,
-1,82,3278,16,0,
-219,1,1840,3279,16,
-0,219,1,1591,3280,
-16,0,219,1,1341,
-3281,16,0,219,1,
-1096,1399,1,93,1405,
-1,352,1436,1,107,
-3282,16,0,219,1,
-1114,1430,1,118,3283,
-16,0,219,1,1123,
-3284,16,0,219,1,
-371,1452,1,1628,3285,
-16,0,219,1,375,
-1463,1,1882,3286,16,
-0,219,1,377,1468,
-1,379,1473,1,380,
-1478,1,883,3287,16,
-0,219,1,373,1496,
-1,130,3288,16,0,
-219,1,143,3289,16,
-0,219,1,387,3290,
-16,0,219,1,1159,
-3291,16,0,219,1,
-157,3292,16,0,219,
-1,1413,3293,16,0,
-219,1,1665,3294,16,
-0,219,1,412,3295,
-16,0,219,1,1377,
-3296,16,0,219,1,
-172,3297,16,0,219,
-1,1939,3298,16,0,
-219,1,437,3299,16,
-0,219,1,188,3300,
-16,0,219,1,942,
-1576,1,1195,3301,16,
-0,219,1,1449,3302,
-16,0,219,1,1701,
-3303,16,0,219,1,
-447,1597,1,205,3304,
-16,0,219,1,827,
-3305,16,0,219,1,
-223,3306,16,0,219,
-1,476,1629,1,477,
-1635,1,1231,3307,16,
-0,219,1,479,1645,
-1,480,1650,1,1485,
-3308,16,0,219,1,
-1737,3309,16,0,219,
-1,2746,3310,16,0,
-219,1,242,3311,16,
-0,219,1,478,1669,
-1,1001,1674,1,1002,
-1679,1,41,3312,19,
-183,1,41,3313,5,
-84,1,1011,1188,1,
-1012,3314,16,0,181,
-1,1013,1345,1,262,
-1205,1,1267,3315,16,
-0,181,1,515,3316,
-16,0,181,1,1521,
-3317,16,0,181,1,
-525,1302,1,283,1258,
-1,2299,3318,16,0,
-181,1,42,3319,16,
-0,181,1,40,1263,
-1,44,1269,1,47,
-1270,1,1303,3320,16,
-0,181,1,1555,3321,
-16,0,181,1,50,
-1287,1,48,1276,1,
-49,1282,1,51,1292,
-1,63,1308,1,305,
-1297,1,66,1315,1,
-67,1320,1,68,1325,
-1,69,1330,1,70,
-1335,1,73,3322,16,
-0,181,1,74,1340,
-1,328,1389,1,1048,
-1431,1,82,3323,16,
-0,181,1,1840,3324,
-16,0,181,1,1591,
-3325,16,0,181,1,
-1341,3326,16,0,181,
-1,1096,1399,1,93,
-1405,1,352,1436,1,
-107,3327,16,0,181,
-1,1114,1430,1,118,
-3328,16,0,181,1,
-1123,3329,16,0,181,
-1,371,1452,1,1628,
-3330,16,0,181,1,
-375,1463,1,1882,3331,
-16,0,181,1,377,
-1468,1,379,1473,1,
-380,1478,1,883,3332,
-16,0,181,1,373,
-1496,1,130,3333,16,
-0,181,1,143,3334,
-16,0,181,1,387,
-3335,16,0,181,1,
-1159,3336,16,0,181,
-1,157,3337,16,0,
-181,1,1413,3338,16,
-0,181,1,1665,3339,
-16,0,181,1,412,
-3340,16,0,181,1,
-1377,3341,16,0,181,
-1,172,3342,16,0,
-181,1,1939,3343,16,
-0,181,1,437,3344,
-16,0,181,1,188,
-3345,16,0,181,1,
-942,1576,1,1195,3346,
-16,0,181,1,1449,
-3347,16,0,181,1,
-1701,3348,16,0,181,
-1,447,1597,1,205,
-3349,16,0,181,1,
-827,3350,16,0,181,
-1,223,3351,16,0,
-181,1,476,1629,1,
-477,1635,1,1231,3352,
-16,0,181,1,479,
-1645,1,480,1650,1,
-1485,3353,16,0,181,
-1,1737,3354,16,0,
-181,1,2746,3355,16,
-0,181,1,242,3356,
-16,0,181,1,478,
-1669,1,1001,1674,1,
-1002,1679,1,42,3357,
-19,406,1,42,3358,
-5,38,1,1901,3359,
-16,0,404,1,2075,
-3360,16,0,404,1,
-1860,907,1,1803,873,
-1,1804,3361,16,0,
-404,1,2413,3362,16,
-0,404,1,2198,3363,
-16,0,404,1,1873,
-921,1,1657,979,1,
-1989,1002,1,1990,3364,
-16,0,404,1,1775,
-3365,16,0,404,1,
-32,3366,16,0,404,
-1,2105,900,1,2106,
-3367,16,0,404,1,
-2364,913,1,2227,993,
-1,2337,3368,16,0,
-404,1,2021,804,1,
-2458,961,1,2459,967,
-1,2462,974,1,2136,
-928,1,2464,984,1,
-2029,811,1,2030,817,
-1,2031,822,1,2032,
-827,1,2033,832,1,
-2035,838,1,2037,843,
-1,2039,848,1,1931,
-946,1,2041,854,1,
-2043,860,1,2045,865,
-1,1574,885,1,1958,
-3369,16,0,404,1,
-43,3370,19,507,1,
-43,3371,5,25,1,
-2035,838,1,2037,843,
-1,2039,848,1,2041,
-854,1,2227,993,1,
-2043,860,1,1657,979,
-1,1860,907,1,2136,
-928,1,2021,804,1,
-2459,967,1,1574,885,
-1,2105,3372,16,0,
-654,1,1931,946,1,
-1873,921,1,2031,822,
-1,1803,873,1,1989,
-3373,16,0,505,1,
-2464,984,1,2029,811,
-1,2030,817,1,2364,
-913,1,2032,827,1,
-2033,832,1,2045,865,
-1,44,3374,19,278,
-1,44,3375,5,38,
-1,1901,3376,16,0,
-276,1,2075,3377,16,
-0,276,1,1860,907,
-1,1803,873,1,1804,
-3378,16,0,276,1,
-2413,3379,16,0,276,
-1,2198,3380,16,0,
-276,1,1873,921,1,
-1657,979,1,1989,1002,
-1,1990,3381,16,0,
-276,1,1775,3382,16,
-0,276,1,32,3383,
-16,0,276,1,2105,
-900,1,2106,3384,16,
-0,276,1,2364,913,
-1,2227,993,1,2337,
-3385,16,0,276,1,
-2021,804,1,2458,961,
-1,2459,967,1,2462,
-974,1,2136,928,1,
-2464,984,1,2029,811,
-1,2030,817,1,2031,
-822,1,2032,827,1,
-2033,832,1,2035,838,
-1,2037,843,1,2039,
-848,1,1931,946,1,
-2041,854,1,2043,860,
-1,2045,865,1,1574,
-885,1,1958,3386,16,
-0,276,1,45,3387,
-19,303,1,45,3388,
-5,39,1,1901,3389,
-16,0,330,1,2075,
-3390,16,0,330,1,
-1860,907,1,1803,873,
-1,1804,3391,16,0,
-330,1,2413,3392,16,
-0,330,1,2198,3393,
-16,0,330,1,1873,
-921,1,1657,979,1,
-1989,1002,1,1990,3394,
-16,0,330,1,1775,
-3395,16,0,330,1,
-32,3396,16,0,330,
-1,2105,900,1,2106,
-3397,16,0,330,1,
-2364,913,1,2227,993,
-1,2337,3398,16,0,
-330,1,2021,804,1,
-2458,961,1,2459,967,
-1,2462,974,1,2136,
-928,1,2464,984,1,
-2029,811,1,2030,817,
-1,2031,822,1,2032,
-827,1,2033,832,1,
-2035,838,1,2037,843,
-1,2039,848,1,1931,
-946,1,2041,854,1,
-2043,860,1,2045,865,
-1,1832,3399,16,0,
-301,1,1574,885,1,
-1958,3400,16,0,330,
-1,46,3401,19,752,
-1,46,3402,5,38,
-1,1901,3403,16,0,
-750,1,2075,3404,16,
-0,750,1,1860,907,
-1,1803,873,1,1804,
-3405,16,0,750,1,
-2413,3406,16,0,750,
-1,2198,3407,16,0,
-750,1,1873,921,1,
-1657,979,1,1989,1002,
-1,1990,3408,16,0,
-750,1,1775,3409,16,
-0,750,1,32,3410,
-16,0,750,1,2105,
-900,1,2106,3411,16,
-0,750,1,2364,913,
-1,2227,993,1,2337,
-3412,16,0,750,1,
-2021,804,1,2458,961,
-1,2459,967,1,2462,
-974,1,2136,928,1,
-2464,984,1,2029,811,
-1,2030,817,1,2031,
-822,1,2032,827,1,
-2033,832,1,2035,838,
-1,2037,843,1,2039,
-848,1,1931,946,1,
-2041,854,1,2043,860,
-1,2045,865,1,1574,
-885,1,1958,3413,16,
-0,750,1,47,3414,
-19,625,1,47,3415,
-5,19,1,0,3416,
-16,0,623,1,2776,
-3417,17,3418,15,3419,
-4,52,37,0,71,
-0,108,0,111,0,
-98,0,97,0,108,
-0,86,0,97,0,
-114,0,105,0,97,
-0,98,0,108,0,
-101,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,1,
--1,1,5,3420,20,
-3421,4,54,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
-86,0,97,0,114,
-0,105,0,97,0,
-98,0,108,0,101,
+1,-1,1,5,2279,
+20,2280,4,56,75,
+0,101,0,121,0,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
 0,68,0,101,0,
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
-0,110,0,95,0,
-49,0,1,166,1,
-3,1,3,1,2,
-3422,22,1,7,1,
-2777,3423,16,0,623,
-1,2711,765,1,2788,
-3424,16,0,623,1,
-2722,788,1,2022,3425,
-16,0,645,1,2459,
-967,1,2795,3426,17,
-3427,15,3428,4,36,
-37,0,71,0,108,
-0,111,0,98,0,
-97,0,108,0,68,
-0,101,0,102,0,
-105,0,110,0,105,
-0,116,0,105,0,
-111,0,110,0,115,
-0,1,-1,1,5,
-3429,20,3430,4,38,
-71,0,108,0,111,
-0,98,0,97,0,
-108,0,68,0,101,
-0,102,0,105,0,
-110,0,105,0,116,
-0,105,0,111,0,
-110,0,115,0,95,
-0,52,0,1,165,
-1,3,1,3,1,
-2,3431,22,1,6,
-1,2796,3432,17,3433,
-15,3428,1,-1,1,
-5,3434,20,3435,4,
-38,71,0,108,0,
-111,0,98,0,97,
-0,108,0,68,0,
-101,0,102,0,105,
-0,110,0,105,0,
-116,0,105,0,111,
-0,110,0,115,0,
-95,0,50,0,1,
-163,1,3,1,3,
-1,2,3436,22,1,
-4,1,2797,3437,17,
-3438,15,3428,1,-1,
-1,5,3439,20,3440,
+0,110,0,76,0,
+105,0,115,0,116,
+0,95,0,49,0,
+1,200,1,3,1,
+2,1,1,2281,22,
+1,39,1,205,1627,
+1,2467,1892,1,2557,
+2282,16,0,534,1,
+464,1898,1,2197,2283,
+16,0,763,1,1224,
+1632,1,223,1637,1,
+1730,1642,1,476,1647,
+1,477,1653,1,1231,
+1658,1,479,1663,1,
+480,1668,1,1485,1674,
+1,2745,1903,1,459,
+1905,1,242,1681,1,
+478,1686,1,2754,2284,
+16,0,362,1,481,
+1908,1,1001,1691,1,
+2508,1913,1,18,2285,
+19,566,1,18,2286,
+5,84,1,2767,2287,
+16,0,564,1,1011,
+1207,1,1012,2288,16,
+0,564,1,1013,1363,
+1,262,1224,1,1267,
+2289,16,0,564,1,
+515,2290,16,0,564,
+1,1521,2291,16,0,
+564,1,525,1321,1,
+283,1277,1,2299,2292,
+16,0,564,1,42,
+2293,16,0,564,1,
+40,1282,1,44,1288,
+1,47,1289,1,1303,
+2294,16,0,564,1,
+1555,2295,16,0,564,
+1,50,1306,1,48,
+1295,1,49,1301,1,
+51,1311,1,63,1327,
+1,305,1316,1,66,
+1333,1,67,1338,1,
+68,1343,1,69,1348,
+1,70,1353,1,73,
+2296,16,0,564,1,
+74,1358,1,328,1407,
+1,1048,2297,16,0,
+564,1,82,2298,16,
+0,564,1,1840,2299,
+16,0,564,1,1591,
+2300,16,0,564,1,
+1341,2301,16,0,564,
+1,1096,1417,1,93,
+1423,1,352,1454,1,
+107,2302,16,0,564,
+1,1114,1448,1,118,
+2303,16,0,564,1,
+1123,2304,16,0,564,
+1,371,1470,1,1628,
+2305,16,0,564,1,
+375,1481,1,1882,2306,
+16,0,564,1,377,
+1486,1,379,1491,1,
+380,1496,1,883,2307,
+16,0,564,1,373,
+1514,1,130,2308,16,
+0,564,1,143,2309,
+16,0,564,1,387,
+2310,16,0,564,1,
+1159,2311,16,0,564,
+1,157,2312,16,0,
+564,1,1413,2313,16,
+0,564,1,1665,2314,
+16,0,564,1,412,
+2315,16,0,564,1,
+1377,2316,16,0,564,
+1,172,2317,16,0,
+564,1,1939,2318,16,
+0,564,1,437,2319,
+16,0,564,1,188,
+2320,16,0,564,1,
+942,2321,16,0,564,
+1,1195,2322,16,0,
+564,1,1449,2323,16,
+0,564,1,1701,2324,
+16,0,564,1,447,
+1615,1,205,2325,16,
+0,564,1,827,2326,
+16,0,564,1,223,
+2327,16,0,564,1,
+476,1647,1,477,1653,
+1,1231,2328,16,0,
+564,1,479,1663,1,
+480,1668,1,1485,2329,
+16,0,564,1,1737,
+2330,16,0,564,1,
+242,2331,16,0,564,
+1,478,1686,1,1001,
+1691,1,1002,1696,1,
+19,2332,19,245,1,
+19,2333,5,176,1,
+2761,2334,16,0,243,
+1,256,2335,16,0,
+243,1,1261,2336,16,
+0,243,1,1011,1207,
+1,1012,2337,16,0,
+526,1,2458,980,1,
+262,1224,1,1267,2338,
+16,0,526,1,2021,
+823,1,1521,2339,16,
+0,526,1,1775,2340,
+16,0,243,1,2029,
+830,1,2030,836,1,
+2031,841,1,2032,846,
+1,2033,851,1,277,
+2341,16,0,243,1,
+2035,857,1,2037,862,
+1,2039,867,1,32,
+2342,16,0,243,1,
+2464,1003,1,2293,2343,
+16,0,243,1,2043,
+879,1,2045,884,1,
+2299,2344,16,0,526,
+1,41,2345,16,0,
+243,1,42,2346,16,
+0,526,1,40,1282,
+1,44,1288,1,43,
+2347,16,0,243,1,
+1804,2348,16,0,243,
+1,48,1295,1,49,
+1301,1,47,1289,1,
+51,1311,1,52,2349,
+16,0,243,1,50,
+1306,1,305,1316,1,
+1096,1417,1,1515,2350,
+16,0,243,1,2318,
+2351,16,0,243,1,
+283,1277,1,63,1327,
+1,66,1333,1,67,
+1338,1,68,1343,1,
+69,1348,1,70,1353,
+1,71,2352,16,0,
+243,1,73,2353,16,
+0,526,1,74,1358,
+1,1013,1363,1,76,
+2354,16,0,243,1,
+1834,2355,16,0,243,
+1,2337,2356,16,0,
+243,1,79,2357,16,
+0,243,1,1335,2358,
+16,0,243,1,299,
+2359,16,0,243,1,
+82,2360,16,0,526,
+1,1840,2361,16,0,
+526,1,1297,2362,16,
+0,243,1,85,2363,
+16,0,243,1,1341,
+2364,16,0,526,1,
+89,2365,16,0,243,
+1,1303,2366,16,0,
+526,1,509,2367,16,
+0,243,1,93,1423,
+1,2767,2368,16,0,
+526,1,322,2369,16,
+0,243,1,97,2370,
+16,0,243,1,2041,
+873,1,1555,2371,16,
+0,526,1,827,2372,
+16,0,526,1,102,
+2373,16,0,243,1,
+1860,926,1,1803,892,
+1,2364,932,1,107,
+2374,16,0,526,1,
+1114,1448,1,112,2375,
+16,0,243,1,1117,
+2376,16,0,243,1,
+352,1454,1,1873,940,
+1,118,2377,16,0,
+526,1,1123,2378,16,
+0,526,1,371,1470,
+1,515,2379,16,0,
+526,1,1377,2380,16,
+0,526,1,124,2381,
+16,0,243,1,1882,
+2382,16,0,526,1,
+377,1486,1,379,1491,
+1,380,1496,1,130,
+2383,16,0,526,1,
+346,2384,16,0,243,
+1,2075,2385,16,0,
+243,1,373,1514,1,
+387,2386,16,0,526,
+1,137,2387,16,0,
+243,1,143,2388,16,
+0,526,1,1901,2389,
+16,0,243,1,1048,
+2390,16,0,526,1,
+1153,2391,16,0,243,
+1,375,1481,1,151,
+2392,16,0,243,1,
+1407,2393,16,0,243,
+1,1659,2394,16,0,
+243,1,2413,2395,16,
+0,243,1,1159,2396,
+16,0,526,1,381,
+2397,16,0,243,1,
+157,2398,16,0,526,
+1,1413,2399,16,0,
+526,1,883,2400,16,
+0,526,1,1371,2401,
+16,0,243,1,328,
+1407,1,2105,919,1,
+2106,2402,16,0,243,
+1,166,2403,16,0,
+243,1,525,2404,16,
+0,243,1,1622,2405,
+16,0,243,1,406,
+2406,16,0,243,1,
+1574,904,1,172,2407,
+16,0,526,1,1931,
+965,1,412,2408,16,
+0,526,1,1933,2409,
+16,0,243,1,1876,
+2410,16,0,243,1,
+431,2411,16,0,243,
+1,1585,2412,16,0,
+243,1,182,2413,16,
+0,243,1,1628,2414,
+16,0,526,1,1189,
+2415,16,0,243,1,
+437,2416,16,0,526,
+1,1591,2417,16,0,
+526,1,188,2418,16,
+0,526,1,1695,2419,
+16,0,243,1,2198,
+2420,16,0,243,1,
+1195,2421,16,0,526,
+1,1449,2422,16,0,
+526,1,1701,2423,16,
+0,526,1,447,2424,
+16,0,243,1,199,
+2425,16,0,243,1,
+2459,986,1,1958,2426,
+16,0,243,1,2462,
+993,1,1657,998,1,
+205,2427,16,0,526,
+1,459,2428,16,0,
+243,1,462,2429,16,
+0,243,1,1665,2430,
+16,0,526,1,217,
+2431,16,0,243,1,
+2227,1012,1,942,2432,
+16,0,526,1,1225,
+2433,16,0,243,1,
+223,2434,16,0,526,
+1,1479,2435,16,0,
+243,1,1731,2436,16,
+0,243,1,477,1653,
+1,1231,2437,16,0,
+526,1,479,1663,1,
+480,1668,1,1485,2438,
+16,0,526,1,1737,
+2439,16,0,526,1,
+1989,1020,1,1990,2440,
+16,0,243,1,1443,
+2441,16,0,243,1,
+236,2442,16,0,243,
+1,2136,947,1,476,
+1647,1,242,2443,16,
+0,526,1,478,1686,
+1,1939,2444,16,0,
+526,1,1001,1691,1,
+1002,1696,1,1756,2445,
+16,0,243,1,20,
+2446,19,494,1,20,
+2447,5,84,1,2767,
+2448,16,0,492,1,
+1011,1207,1,1012,2449,
+16,0,492,1,1013,
+1363,1,262,1224,1,
+1267,2450,16,0,492,
+1,515,2451,16,0,
+492,1,1521,2452,16,
+0,492,1,525,1321,
+1,283,1277,1,2299,
+2453,16,0,492,1,
+42,2454,16,0,492,
+1,40,1282,1,44,
+1288,1,47,1289,1,
+1303,2455,16,0,492,
+1,1555,2456,16,0,
+492,1,50,1306,1,
+48,1295,1,49,1301,
+1,51,1311,1,63,
+1327,1,305,1316,1,
+66,1333,1,67,1338,
+1,68,1343,1,69,
+1348,1,70,1353,1,
+73,2457,16,0,492,
+1,74,1358,1,328,
+2458,16,0,492,1,
+1048,2459,16,0,492,
+1,82,2460,16,0,
+492,1,1840,2461,16,
+0,492,1,1591,2462,
+16,0,492,1,1341,
+2463,16,0,492,1,
+1096,1417,1,93,1423,
+1,352,2464,16,0,
+492,1,107,2465,16,
+0,492,1,1114,1448,
+1,118,2466,16,0,
+492,1,1123,2467,16,
+0,492,1,371,1470,
+1,1628,2468,16,0,
+492,1,375,1481,1,
+1882,2469,16,0,492,
+1,377,1486,1,379,
+1491,1,380,1496,1,
+883,2470,16,0,492,
+1,373,1514,1,130,
+2471,16,0,492,1,
+143,2472,16,0,492,
+1,387,2473,16,0,
+492,1,1159,2474,16,
+0,492,1,157,2475,
+16,0,492,1,1413,
+2476,16,0,492,1,
+1665,2477,16,0,492,
+1,412,2478,16,0,
+492,1,1377,2479,16,
+0,492,1,172,2480,
+16,0,492,1,1939,
+2481,16,0,492,1,
+437,2482,16,0,492,
+1,188,2483,16,0,
+492,1,942,2484,16,
+0,492,1,1195,2485,
+16,0,492,1,1449,
+2486,16,0,492,1,
+1701,2487,16,0,492,
+1,447,1615,1,205,
+2488,16,0,492,1,
+827,2489,16,0,492,
+1,223,2490,16,0,
+492,1,476,1647,1,
+477,1653,1,1231,2491,
+16,0,492,1,479,
+1663,1,480,1668,1,
+1485,2492,16,0,492,
+1,1737,2493,16,0,
+492,1,242,2494,16,
+0,492,1,478,1686,
+1,1001,1691,1,1002,
+1696,1,21,2495,19,
+465,1,21,2496,5,
+84,1,2767,2497,16,
+0,463,1,1011,1207,
+1,1012,2498,16,0,
+463,1,1013,1363,1,
+262,1224,1,1267,2499,
+16,0,463,1,515,
+2500,16,0,463,1,
+1521,2501,16,0,463,
+1,525,1321,1,283,
+1277,1,2299,2502,16,
+0,463,1,42,2503,
+16,0,463,1,40,
+1282,1,44,1288,1,
+47,1289,1,1303,2504,
+16,0,463,1,1555,
+2505,16,0,463,1,
+50,1306,1,48,1295,
+1,49,1301,1,51,
+1311,1,63,1327,1,
+305,1316,1,66,1333,
+1,67,1338,1,68,
+1343,1,69,1348,1,
+70,1353,1,73,2506,
+16,0,463,1,74,
+1358,1,328,2507,16,
+0,463,1,1048,2508,
+16,0,463,1,82,
+2509,16,0,463,1,
+1840,2510,16,0,463,
+1,1591,2511,16,0,
+463,1,1341,2512,16,
+0,463,1,1096,1417,
+1,93,1423,1,352,
+2513,16,0,463,1,
+107,2514,16,0,463,
+1,1114,1448,1,118,
+2515,16,0,463,1,
+1123,2516,16,0,463,
+1,371,1470,1,1628,
+2517,16,0,463,1,
+375,1481,1,1882,2518,
+16,0,463,1,377,
+1486,1,379,1491,1,
+380,1496,1,883,2519,
+16,0,463,1,373,
+1514,1,130,2520,16,
+0,463,1,143,2521,
+16,0,463,1,387,
+2522,16,0,463,1,
+1159,2523,16,0,463,
+1,157,2524,16,0,
+463,1,1413,2525,16,
+0,463,1,1665,2526,
+16,0,463,1,412,
+2527,16,0,463,1,
+1377,2528,16,0,463,
+1,172,2529,16,0,
+463,1,1939,2530,16,
+0,463,1,437,2531,
+16,0,463,1,188,
+2532,16,0,463,1,
+942,2533,16,0,463,
+1,1195,2534,16,0,
+463,1,1449,2535,16,
+0,463,1,1701,2536,
+16,0,463,1,447,
+1615,1,205,2537,16,
+0,463,1,827,2538,
+16,0,463,1,223,
+2539,16,0,463,1,
+476,1647,1,477,1653,
+1,1231,2540,16,0,
+463,1,479,1663,1,
+480,1668,1,1485,2541,
+16,0,463,1,1737,
+2542,16,0,463,1,
+242,2543,16,0,463,
+1,478,1686,1,1001,
+1691,1,1002,1696,1,
+22,2544,19,416,1,
+22,2545,5,84,1,
+2767,2546,16,0,414,
+1,1011,1207,1,1012,
+2547,16,0,414,1,
+1013,1363,1,262,1224,
+1,1267,2548,16,0,
+414,1,515,2549,16,
+0,414,1,1521,2550,
+16,0,414,1,525,
+1321,1,283,1277,1,
+2299,2551,16,0,414,
+1,42,2552,16,0,
+414,1,40,1282,1,
+44,1288,1,47,1289,
+1,1303,2553,16,0,
+414,1,1555,2554,16,
+0,414,1,50,1306,
+1,48,1295,1,49,
+1301,1,51,1311,1,
+63,1327,1,305,1316,
+1,66,1333,1,67,
+1338,1,68,1343,1,
+69,1348,1,70,1353,
+1,73,2555,16,0,
+414,1,74,1358,1,
+328,2556,16,0,414,
+1,1048,2557,16,0,
+414,1,82,2558,16,
+0,414,1,1840,2559,
+16,0,414,1,1591,
+2560,16,0,414,1,
+1341,2561,16,0,414,
+1,1096,1417,1,93,
+1423,1,352,2562,16,
+0,414,1,107,2563,
+16,0,414,1,1114,
+1448,1,118,2564,16,
+0,414,1,1123,2565,
+16,0,414,1,371,
+1470,1,1628,2566,16,
+0,414,1,375,1481,
+1,1882,2567,16,0,
+414,1,377,1486,1,
+379,1491,1,380,1496,
+1,883,2568,16,0,
+414,1,373,1514,1,
+130,2569,16,0,414,
+1,143,2570,16,0,
+414,1,387,2571,16,
+0,414,1,1159,2572,
+16,0,414,1,157,
+2573,16,0,414,1,
+1413,2574,16,0,414,
+1,1665,2575,16,0,
+414,1,412,2576,16,
+0,414,1,1377,2577,
+16,0,414,1,172,
+2578,16,0,414,1,
+1939,2579,16,0,414,
+1,437,2580,16,0,
+414,1,188,2581,16,
+0,414,1,942,2582,
+16,0,414,1,1195,
+2583,16,0,414,1,
+1449,2584,16,0,414,
+1,1701,2585,16,0,
+414,1,447,1615,1,
+205,2586,16,0,414,
+1,827,2587,16,0,
+414,1,223,2588,16,
+0,414,1,476,1647,
+1,477,1653,1,1231,
+2589,16,0,414,1,
+479,1663,1,480,1668,
+1,1485,2590,16,0,
+414,1,1737,2591,16,
+0,414,1,242,2592,
+16,0,414,1,478,
+1686,1,1001,1691,1,
+1002,1696,1,23,2593,
+19,580,1,23,2594,
+5,38,1,1901,2595,
+16,0,578,1,2075,
+2596,16,0,578,1,
+1860,926,1,1803,892,
+1,1804,2597,16,0,
+578,1,2413,2598,16,
+0,578,1,2198,2599,
+16,0,578,1,1873,
+940,1,1657,998,1,
+1989,1020,1,1990,2600,
+16,0,578,1,1775,
+2601,16,0,578,1,
+32,2602,16,0,578,
+1,2105,919,1,2106,
+2603,16,0,578,1,
+2364,932,1,2227,1012,
+1,2337,2604,16,0,
+578,1,2021,823,1,
+2458,980,1,2459,986,
+1,2462,993,1,2136,
+947,1,2464,1003,1,
+2029,830,1,2030,836,
+1,2031,841,1,2032,
+846,1,2033,851,1,
+2035,857,1,2037,862,
+1,2039,867,1,1931,
+965,1,2041,873,1,
+2043,879,1,2045,884,
+1,1574,904,1,1958,
+2605,16,0,578,1,
+24,2606,19,192,1,
+24,2607,5,5,1,
+44,2608,16,0,190,
+1,377,2609,16,0,
+616,1,40,2610,16,
+0,778,1,63,2611,
+16,0,213,1,373,
+2612,16,0,612,1,
+25,2613,19,321,1,
+25,2614,5,177,1,
+2761,2615,16,0,621,
+1,256,2616,16,0,
+621,1,2767,2617,16,
+0,319,1,1011,1207,
+1,1012,2618,16,0,
+319,1,2458,980,1,
+262,1224,1,1267,2619,
+16,0,319,1,2021,
+823,1,1521,2620,16,
+0,319,1,1775,2621,
+16,0,621,1,2029,
+830,1,2030,836,1,
+2031,841,1,2032,846,
+1,2033,851,1,277,
+2622,16,0,621,1,
+2035,857,1,2037,862,
+1,2039,867,1,32,
+2623,16,0,621,1,
+2464,1003,1,2293,2624,
+16,0,621,1,2043,
+879,1,2045,884,1,
+2299,2625,16,0,319,
+1,41,2626,16,0,
+621,1,42,2627,16,
+0,319,1,40,1282,
+1,44,1288,1,43,
+2628,16,0,621,1,
+1804,2629,16,0,621,
+1,48,1295,1,49,
+1301,1,47,1289,1,
+51,1311,1,52,2630,
+16,0,621,1,50,
+1306,1,305,1316,1,
+1096,1417,1,1515,2631,
+16,0,621,1,2318,
+2632,16,0,621,1,
+62,2633,16,0,621,
+1,63,1327,1,66,
+1333,1,67,1338,1,
+68,1343,1,69,1348,
+1,70,1353,1,71,
+2634,16,0,621,1,
+283,1277,1,73,2635,
+16,0,319,1,74,
+1358,1,1013,1363,1,
+76,2636,16,0,621,
+1,1834,2637,16,0,
+621,1,2337,2638,16,
+0,621,1,79,2639,
+16,0,621,1,1335,
+2640,16,0,621,1,
+299,2641,16,0,621,
+1,82,2642,16,0,
+319,1,1840,2643,16,
+0,319,1,1297,2644,
+16,0,621,1,85,
+2645,16,0,621,1,
+1341,2646,16,0,319,
+1,1261,2647,16,0,
+621,1,89,2648,16,
+0,621,1,1303,2649,
+16,0,319,1,509,
+2650,16,0,621,1,
+93,1423,1,322,2651,
+16,0,621,1,97,
+2652,16,0,621,1,
+2041,873,1,1555,2653,
+16,0,319,1,827,
+2654,16,0,319,1,
+102,2655,16,0,621,
+1,1860,926,1,1803,
+892,1,2364,932,1,
+107,2656,16,0,319,
+1,1114,1448,1,112,
+2657,16,0,621,1,
+1117,2658,16,0,621,
+1,352,1454,1,1873,
+940,1,118,1460,1,
+1123,2659,16,0,319,
+1,371,1470,1,515,
+2660,16,0,319,1,
+1377,2661,16,0,319,
+1,124,2662,16,0,
+621,1,1882,2663,16,
+0,319,1,377,1486,
+1,379,1491,1,380,
+1496,1,130,1519,1,
+346,2664,16,0,621,
+1,2075,2665,16,0,
+621,1,373,1514,1,
+387,2666,16,0,319,
+1,137,2667,16,0,
+621,1,143,2668,16,
+0,319,1,1901,2669,
+16,0,621,1,1048,
+1449,1,1153,2670,16,
+0,621,1,375,1481,
+1,151,2671,16,0,
+621,1,1407,2672,16,
+0,621,1,1659,2673,
+16,0,621,1,2413,
+2674,16,0,621,1,
+1159,2675,16,0,319,
+1,381,2676,16,0,
+621,1,157,2677,16,
+0,319,1,1413,2678,
+16,0,319,1,883,
+2679,16,0,319,1,
+1371,2680,16,0,621,
+1,328,1407,1,2105,
+919,1,2106,2681,16,
+0,621,1,166,2682,
+16,0,621,1,525,
+2683,16,0,621,1,
+1622,2684,16,0,621,
+1,406,2685,16,0,
+621,1,1574,904,1,
+172,1573,1,1931,965,
+1,412,2686,16,0,
+319,1,1933,2687,16,
+0,621,1,1876,2688,
+16,0,621,1,431,
+2689,16,0,621,1,
+1585,2690,16,0,621,
+1,182,2691,16,0,
+621,1,1628,2692,16,
+0,319,1,1189,2693,
+16,0,621,1,437,
+2694,16,0,319,1,
+1591,2695,16,0,319,
+1,188,1622,1,1695,
+2696,16,0,621,1,
+2198,2697,16,0,621,
+1,1195,2698,16,0,
+319,1,1449,2699,16,
+0,319,1,1701,2700,
+16,0,319,1,447,
+2701,16,0,621,1,
+199,2702,16,0,621,
+1,2459,986,1,1958,
+2703,16,0,621,1,
+2462,993,1,1657,998,
+1,205,2704,16,0,
+319,1,459,2705,16,
+0,621,1,462,2706,
+16,0,621,1,1665,
+2707,16,0,319,1,
+217,2708,16,0,621,
+1,2227,1012,1,942,
+1594,1,1225,2709,16,
+0,621,1,223,2710,
+16,0,319,1,1479,
+2711,16,0,621,1,
+1731,2712,16,0,621,
+1,477,1653,1,1231,
+2713,16,0,319,1,
+479,1663,1,480,1668,
+1,1485,2714,16,0,
+319,1,1737,2715,16,
+0,319,1,1989,1020,
+1,1990,2716,16,0,
+621,1,1443,2717,16,
+0,621,1,236,2718,
+16,0,621,1,2136,
+947,1,476,1647,1,
+242,2719,16,0,319,
+1,478,1686,1,1939,
+2720,16,0,319,1,
+1001,1691,1,1002,1696,
+1,1756,2721,16,0,
+621,1,26,2722,19,
+339,1,26,2723,5,
+84,1,2767,2724,16,
+0,337,1,1011,1207,
+1,1012,2725,16,0,
+337,1,1013,1363,1,
+262,1224,1,1267,2726,
+16,0,337,1,515,
+2727,16,0,761,1,
+1521,2728,16,0,337,
+1,525,1321,1,283,
+1277,1,2299,2729,16,
+0,337,1,42,2730,
+16,0,337,1,40,
+1282,1,44,1288,1,
+47,1289,1,1303,2731,
+16,0,337,1,1555,
+2732,16,0,337,1,
+50,1306,1,48,1295,
+1,49,1301,1,51,
+1311,1,63,1327,1,
+305,1316,1,66,1333,
+1,67,1338,1,68,
+1343,1,69,1348,1,
+70,1353,1,73,2733,
+16,0,337,1,74,
+1358,1,328,1407,1,
+1048,1449,1,82,2734,
+16,0,337,1,1840,
+2735,16,0,337,1,
+1591,2736,16,0,337,
+1,1341,2737,16,0,
+337,1,1096,1417,1,
+93,1423,1,352,1454,
+1,107,2738,16,0,
+337,1,1114,1448,1,
+118,1460,1,1123,2739,
+16,0,337,1,371,
+1470,1,1628,2740,16,
+0,337,1,375,1481,
+1,1882,2741,16,0,
+337,1,377,1486,1,
+379,1491,1,380,1496,
+1,883,2742,16,0,
+337,1,373,1514,1,
+130,1519,1,143,2743,
+16,0,337,1,387,
+2744,16,0,337,1,
+1159,2745,16,0,337,
+1,157,2746,16,0,
+337,1,1413,2747,16,
+0,337,1,1665,2748,
+16,0,337,1,412,
+2749,16,0,337,1,
+1377,2750,16,0,337,
+1,172,1573,1,1939,
+2751,16,0,337,1,
+437,2752,16,0,687,
+1,188,1622,1,942,
+1594,1,1195,2753,16,
+0,337,1,1449,2754,
+16,0,337,1,1701,
+2755,16,0,337,1,
+447,1615,1,205,2756,
+16,0,337,1,827,
+2757,16,0,337,1,
+223,2758,16,0,337,
+1,476,1647,1,477,
+1653,1,1231,2759,16,
+0,337,1,479,1663,
+1,480,1668,1,1485,
+2760,16,0,337,1,
+1737,2761,16,0,337,
+1,242,2762,16,0,
+337,1,478,1686,1,
+1001,1691,1,1002,1696,
+1,27,2763,19,695,
+1,27,2764,5,95,
+1,2761,2765,16,0,
+693,1,256,2766,16,
+0,693,1,1261,2767,
+16,0,693,1,509,
+2768,16,0,693,1,
+1515,2769,16,0,693,
+1,2021,823,1,1775,
+2770,16,0,693,1,
+2029,830,1,2030,836,
+1,2031,841,1,2032,
+846,1,2033,851,1,
+277,2771,16,0,693,
+1,2035,857,1,2037,
+862,1,2039,867,1,
+32,2772,16,0,693,
+1,2041,873,1,2293,
+2773,16,0,693,1,
+2043,879,1,2045,884,
+1,41,2774,16,0,
+693,1,1297,2775,16,
+0,693,1,43,2776,
+16,0,693,1,1803,
+892,1,1804,2777,16,
+0,693,1,299,2778,
+16,0,693,1,52,
+2779,16,0,693,1,
+2318,2780,16,0,693,
+1,62,2781,16,0,
+693,1,2075,2782,16,
+0,693,1,1574,904,
+1,71,2783,16,0,
+693,1,76,2784,16,
+0,693,1,1834,2785,
+16,0,693,1,2337,
+2786,16,0,693,1,
+79,2787,16,0,693,
+1,1335,2788,16,0,
+693,1,322,2789,16,
+0,693,1,85,2790,
+16,0,693,1,89,
+2791,16,0,693,1,
+346,2792,16,0,693,
+1,2105,919,1,2106,
+2793,16,0,693,1,
+97,2794,16,0,693,
+1,1860,926,1,2364,
+932,1,102,2795,16,
+0,693,1,112,2796,
+16,0,693,1,1117,
+2797,16,0,693,1,
+1873,940,1,1876,2798,
+16,0,693,1,124,
+2799,16,0,693,1,
+2136,947,1,381,2800,
+16,0,693,1,525,
+2801,16,0,693,1,
+137,2802,16,0,693,
+1,1901,2803,16,0,
+693,1,1153,2804,16,
+0,693,1,151,2805,
+16,0,693,1,1407,
+2806,16,0,693,1,
+1659,2807,16,0,693,
+1,2413,2808,16,0,
+693,1,406,2809,16,
+0,693,1,1371,2810,
+16,0,693,1,166,
+2811,16,0,693,1,
+1622,2812,16,0,693,
+1,1931,965,1,1933,
+2813,16,0,693,1,
+431,2814,16,0,693,
+1,1585,2815,16,0,
+693,1,182,2816,16,
+0,693,1,1189,2817,
+16,0,693,1,1443,
+2818,16,0,693,1,
+1695,2819,16,0,693,
+1,2198,2820,16,0,
+693,1,447,2821,16,
+0,693,1,2458,980,
+1,2459,986,1,1958,
+2822,16,0,693,1,
+2462,993,1,1657,998,
+1,2464,1003,1,199,
+2823,16,0,693,1,
+459,2824,16,0,693,
+1,462,2825,16,0,
+693,1,217,2826,16,
+0,693,1,2227,1012,
+1,1225,2827,16,0,
+693,1,1479,2828,16,
+0,693,1,1731,2829,
+16,0,693,1,1989,
+1020,1,1990,2830,16,
+0,693,1,236,2831,
+16,0,693,1,1756,
+2832,16,0,693,1,
+28,2833,19,722,1,
+28,2834,5,60,1,
+328,1407,1,223,1637,
+1,1096,1417,1,118,
+1460,1,883,1502,1,
+525,1321,1,1001,1691,
+1,130,1519,1,459,
+1905,1,1114,1448,1,
+352,1454,1,447,1615,
+1,464,1898,1,1011,
+1207,1,1013,1363,1,
+242,1681,1,143,1524,
+1,40,1282,1,41,
+1873,1,42,1877,1,
+479,1663,1,44,1288,
+1,481,1908,1,373,
+1514,1,47,1289,1,
+157,1547,1,49,1301,
+1,50,1306,1,48,
+1295,1,379,1491,1,
+380,1496,1,51,1311,
+1,476,1647,1,371,
+1470,1,478,1686,1,
+1048,1449,1,375,1481,
+1,172,1573,1,262,
+1224,1,283,1277,1,
+63,1327,1,67,1338,
+1,68,1343,1,69,
+1348,1,66,1333,1,
+461,2835,16,0,720,
+1,74,1358,1,377,
+1486,1,1002,1696,1,
+70,1353,1,188,1622,
+1,82,1385,1,305,
+1316,1,477,1653,1,
+827,1436,1,93,1423,
+1,480,1668,1,205,
+1627,1,942,1594,1,
+107,1443,1,29,2836,
+19,306,1,29,2837,
+5,84,1,2767,2838,
+16,0,304,1,1011,
+1207,1,1012,2839,16,
+0,304,1,1013,1363,
+1,262,1224,1,1267,
+2840,16,0,304,1,
+515,2841,16,0,304,
+1,1521,2842,16,0,
+304,1,525,1321,1,
+283,1277,1,2299,2843,
+16,0,304,1,42,
+2844,16,0,304,1,
+40,1282,1,44,1288,
+1,47,1289,1,1303,
+2845,16,0,304,1,
+1555,2846,16,0,304,
+1,50,1306,1,48,
+1295,1,49,1301,1,
+51,1311,1,63,1327,
+1,305,1316,1,66,
+1333,1,67,1338,1,
+68,1343,1,69,1348,
+1,70,1353,1,73,
+2847,16,0,304,1,
+74,1358,1,328,1407,
+1,1048,1449,1,82,
+2848,16,0,304,1,
+1840,2849,16,0,304,
+1,1591,2850,16,0,
+304,1,1341,2851,16,
+0,304,1,1096,1417,
+1,93,1423,1,352,
+1454,1,107,2852,16,
+0,304,1,1114,1448,
+1,118,1460,1,1123,
+2853,16,0,304,1,
+371,1470,1,1628,2854,
+16,0,304,1,375,
+1481,1,1882,2855,16,
+0,304,1,377,1486,
+1,379,1491,1,380,
+1496,1,883,2856,16,
+0,304,1,373,1514,
+1,130,1519,1,143,
+1524,1,387,2857,16,
+0,304,1,1159,2858,
+16,0,304,1,157,
+1547,1,1413,2859,16,
+0,304,1,1665,2860,
+16,0,304,1,412,
+2861,16,0,304,1,
+1377,2862,16,0,304,
+1,172,1573,1,1939,
+2863,16,0,304,1,
+437,2864,16,0,304,
+1,188,1622,1,942,
+1594,1,1195,2865,16,
+0,304,1,1449,2866,
+16,0,304,1,1701,
+2867,16,0,304,1,
+447,1615,1,205,2868,
+16,0,304,1,827,
+2869,16,0,304,1,
+223,2870,16,0,304,
+1,476,1647,1,477,
+1653,1,1231,2871,16,
+0,304,1,479,1663,
+1,480,1668,1,1485,
+2872,16,0,304,1,
+1737,2873,16,0,304,
+1,242,2874,16,0,
+304,1,478,1686,1,
+1001,1691,1,1002,1696,
+1,30,2875,19,290,
+1,30,2876,5,84,
+1,2767,2877,16,0,
+288,1,1011,1207,1,
+1012,2878,16,0,288,
+1,1013,1363,1,262,
+1224,1,1267,2879,16,
+0,288,1,515,2880,
+16,0,288,1,1521,
+2881,16,0,288,1,
+525,1321,1,283,1277,
+1,2299,2882,16,0,
+288,1,42,2883,16,
+0,288,1,40,1282,
+1,44,1288,1,47,
+1289,1,1303,2884,16,
+0,288,1,1555,2885,
+16,0,288,1,50,
+1306,1,48,1295,1,
+49,1301,1,51,1311,
+1,63,1327,1,305,
+1316,1,66,1333,1,
+67,1338,1,68,1343,
+1,69,1348,1,70,
+1353,1,73,2886,16,
+0,288,1,74,1358,
+1,328,1407,1,1048,
+1449,1,82,2887,16,
+0,288,1,1840,2888,
+16,0,288,1,1591,
+2889,16,0,288,1,
+1341,2890,16,0,288,
+1,1096,1417,1,93,
+1423,1,352,1454,1,
+107,2891,16,0,288,
+1,1114,1448,1,118,
+1460,1,1123,2892,16,
+0,288,1,371,1470,
+1,1628,2893,16,0,
+288,1,375,1481,1,
+1882,2894,16,0,288,
+1,377,1486,1,379,
+1491,1,380,1496,1,
+883,2895,16,0,288,
+1,373,1514,1,130,
+1519,1,143,1524,1,
+387,2896,16,0,288,
+1,1159,2897,16,0,
+288,1,157,1547,1,
+1413,2898,16,0,288,
+1,1665,2899,16,0,
+288,1,412,2900,16,
+0,288,1,1377,2901,
+16,0,288,1,172,
+1573,1,1939,2902,16,
+0,288,1,437,2903,
+16,0,288,1,188,
+1622,1,942,1594,1,
+1195,2904,16,0,288,
+1,1449,2905,16,0,
+288,1,1701,2906,16,
+0,288,1,447,1615,
+1,205,2907,16,0,
+288,1,827,2908,16,
+0,288,1,223,2909,
+16,0,288,1,476,
+1647,1,477,1653,1,
+1231,2910,16,0,288,
+1,479,1663,1,480,
+1668,1,1485,2911,16,
+0,288,1,1737,2912,
+16,0,288,1,242,
+2913,16,0,288,1,
+478,1686,1,1001,1691,
+1,1002,1696,1,31,
+2914,19,272,1,31,
+2915,5,84,1,2767,
+2916,16,0,270,1,
+1011,1207,1,1012,2917,
+16,0,270,1,1013,
+1363,1,262,1224,1,
+1267,2918,16,0,270,
+1,515,2919,16,0,
+270,1,1521,2920,16,
+0,270,1,525,1321,
+1,283,1277,1,2299,
+2921,16,0,270,1,
+42,2922,16,0,270,
+1,40,1282,1,44,
+1288,1,47,1289,1,
+1303,2923,16,0,270,
+1,1555,2924,16,0,
+270,1,50,1306,1,
+48,1295,1,49,1301,
+1,51,1311,1,63,
+1327,1,305,1316,1,
+66,1333,1,67,1338,
+1,68,1343,1,69,
+1348,1,70,1353,1,
+73,2925,16,0,270,
+1,74,1358,1,328,
+1407,1,1048,1449,1,
+82,2926,16,0,270,
+1,1840,2927,16,0,
+270,1,1591,2928,16,
+0,270,1,1341,2929,
+16,0,270,1,1096,
+1417,1,93,1423,1,
+352,1454,1,107,2930,
+16,0,270,1,1114,
+1448,1,118,1460,1,
+1123,2931,16,0,270,
+1,371,1470,1,1628,
+2932,16,0,270,1,
+375,1481,1,1882,2933,
+16,0,270,1,377,
+1486,1,379,1491,1,
+380,1496,1,883,2934,
+16,0,270,1,373,
+1514,1,130,1519,1,
+143,2935,16,0,270,
+1,387,2936,16,0,
+270,1,1159,2937,16,
+0,270,1,157,2938,
+16,0,270,1,1413,
+2939,16,0,270,1,
+1665,2940,16,0,270,
+1,412,2941,16,0,
+270,1,1377,2942,16,
+0,270,1,172,1573,
+1,1939,2943,16,0,
+270,1,437,2944,16,
+0,270,1,188,1622,
+1,942,1594,1,1195,
+2945,16,0,270,1,
+1449,2946,16,0,270,
+1,1701,2947,16,0,
+270,1,447,1615,1,
+205,2948,16,0,270,
+1,827,2949,16,0,
+270,1,223,2950,16,
+0,270,1,476,1647,
+1,477,1653,1,1231,
+2951,16,0,270,1,
+479,1663,1,480,1668,
+1,1485,2952,16,0,
+270,1,1737,2953,16,
+0,270,1,242,2954,
+16,0,270,1,478,
+1686,1,1001,1691,1,
+1002,1696,1,32,2955,
+19,264,1,32,2956,
+5,84,1,2767,2957,
+16,0,262,1,1011,
+1207,1,1012,2958,16,
+0,262,1,1013,1363,
+1,262,1224,1,1267,
+2959,16,0,262,1,
+515,2960,16,0,262,
+1,1521,2961,16,0,
+262,1,525,1321,1,
+283,1277,1,2299,2962,
+16,0,262,1,42,
+2963,16,0,262,1,
+40,1282,1,44,1288,
+1,47,1289,1,1303,
+2964,16,0,262,1,
+1555,2965,16,0,262,
+1,50,1306,1,48,
+1295,1,49,1301,1,
+51,1311,1,63,1327,
+1,305,1316,1,66,
+1333,1,67,1338,1,
+68,1343,1,69,1348,
+1,70,1353,1,73,
+2966,16,0,262,1,
+74,1358,1,328,1407,
+1,1048,1449,1,82,
+2967,16,0,262,1,
+1840,2968,16,0,262,
+1,1591,2969,16,0,
+262,1,1341,2970,16,
+0,262,1,1096,1417,
+1,93,1423,1,352,
+1454,1,107,2971,16,
+0,262,1,1114,1448,
+1,118,1460,1,1123,
+2972,16,0,262,1,
+371,1470,1,1628,2973,
+16,0,262,1,375,
+1481,1,1882,2974,16,
+0,262,1,377,1486,
+1,379,1491,1,380,
+1496,1,883,2975,16,
+0,262,1,373,1514,
+1,130,1519,1,143,
+2976,16,0,262,1,
+387,2977,16,0,262,
+1,1159,2978,16,0,
+262,1,157,2979,16,
+0,262,1,1413,2980,
+16,0,262,1,1665,
+2981,16,0,262,1,
+412,2982,16,0,262,
+1,1377,2983,16,0,
+262,1,172,1573,1,
+1939,2984,16,0,262,
+1,437,2985,16,0,
+262,1,188,1622,1,
+942,1594,1,1195,2986,
+16,0,262,1,1449,
+2987,16,0,262,1,
+1701,2988,16,0,262,
+1,447,1615,1,205,
+2989,16,0,262,1,
+827,2990,16,0,262,
+1,223,2991,16,0,
+262,1,476,1647,1,
+477,1653,1,1231,2992,
+16,0,262,1,479,
+1663,1,480,1668,1,
+1485,2993,16,0,262,
+1,1737,2994,16,0,
+262,1,242,2995,16,
+0,262,1,478,1686,
+1,1001,1691,1,1002,
+1696,1,33,2996,19,
+365,1,33,2997,5,
+84,1,2767,2998,16,
+0,363,1,1011,1207,
+1,1012,2999,16,0,
+363,1,1013,1363,1,
+262,1224,1,1267,3000,
+16,0,363,1,515,
+3001,16,0,363,1,
+1521,3002,16,0,363,
+1,525,1321,1,283,
+1277,1,2299,3003,16,
+0,363,1,42,3004,
+16,0,363,1,40,
+1282,1,44,1288,1,
+47,1289,1,1303,3005,
+16,0,363,1,1555,
+3006,16,0,363,1,
+50,1306,1,48,1295,
+1,49,1301,1,51,
+1311,1,63,1327,1,
+305,1316,1,66,1333,
+1,67,1338,1,68,
+1343,1,69,1348,1,
+70,1353,1,73,3007,
+16,0,363,1,74,
+1358,1,328,1407,1,
+1048,1449,1,82,3008,
+16,0,363,1,1840,
+3009,16,0,363,1,
+1591,3010,16,0,363,
+1,1341,3011,16,0,
+363,1,1096,1417,1,
+93,1423,1,352,1454,
+1,107,3012,16,0,
+363,1,1114,1448,1,
+118,1460,1,1123,3013,
+16,0,363,1,371,
+1470,1,1628,3014,16,
+0,363,1,375,1481,
+1,1882,3015,16,0,
+363,1,377,1486,1,
+379,1491,1,380,1496,
+1,883,3016,16,0,
+363,1,373,1514,1,
+130,1519,1,143,1524,
+1,387,3017,16,0,
+363,1,1159,3018,16,
+0,363,1,157,1547,
+1,1413,3019,16,0,
+363,1,1665,3020,16,
+0,363,1,412,3021,
+16,0,363,1,1377,
+3022,16,0,363,1,
+172,1573,1,1939,3023,
+16,0,363,1,437,
+3024,16,0,363,1,
+188,1622,1,942,1594,
+1,1195,3025,16,0,
+363,1,1449,3026,16,
+0,363,1,1701,3027,
+16,0,363,1,447,
+1615,1,205,3028,16,
+0,363,1,827,3029,
+16,0,363,1,223,
+3030,16,0,363,1,
+476,1647,1,477,1653,
+1,1231,3031,16,0,
+363,1,479,1663,1,
+480,1668,1,1485,3032,
+16,0,363,1,1737,
+3033,16,0,363,1,
+242,1681,1,478,1686,
+1,1001,1691,1,1002,
+1696,1,34,3034,19,
+352,1,34,3035,5,
+84,1,2767,3036,16,
+0,350,1,1011,1207,
+1,1012,3037,16,0,
+350,1,1013,1363,1,
+262,1224,1,1267,3038,
+16,0,350,1,515,
+3039,16,0,350,1,
+1521,3040,16,0,350,
+1,525,1321,1,283,
+1277,1,2299,3041,16,
+0,350,1,42,3042,
+16,0,350,1,40,
+1282,1,44,1288,1,
+47,1289,1,1303,3043,
+16,0,350,1,1555,
+3044,16,0,350,1,
+50,1306,1,48,1295,
+1,49,1301,1,51,
+1311,1,63,1327,1,
+305,1316,1,66,1333,
+1,67,1338,1,68,
+1343,1,69,1348,1,
+70,1353,1,73,3045,
+16,0,350,1,74,
+1358,1,328,1407,1,
+1048,1449,1,82,3046,
+16,0,350,1,1840,
+3047,16,0,350,1,
+1591,3048,16,0,350,
+1,1341,3049,16,0,
+350,1,1096,1417,1,
+93,1423,1,352,1454,
+1,107,3050,16,0,
+350,1,1114,1448,1,
+118,1460,1,1123,3051,
+16,0,350,1,371,
+1470,1,1628,3052,16,
+0,350,1,375,1481,
+1,1882,3053,16,0,
+350,1,377,1486,1,
+379,1491,1,380,1496,
+1,883,3054,16,0,
+350,1,373,1514,1,
+130,1519,1,143,1524,
+1,387,3055,16,0,
+350,1,1159,3056,16,
+0,350,1,157,1547,
+1,1413,3057,16,0,
+350,1,1665,3058,16,
+0,350,1,412,3059,
+16,0,350,1,1377,
+3060,16,0,350,1,
+172,1573,1,1939,3061,
+16,0,350,1,437,
+3062,16,0,350,1,
+188,1622,1,942,1594,
+1,1195,3063,16,0,
+350,1,1449,3064,16,
+0,350,1,1701,3065,
+16,0,350,1,447,
+1615,1,205,1627,1,
+827,3066,16,0,350,
+1,223,1637,1,476,
+1647,1,477,1653,1,
+1231,3067,16,0,350,
+1,479,1663,1,480,
+1668,1,1485,3068,16,
+0,350,1,1737,3069,
+16,0,350,1,242,
+1681,1,478,1686,1,
+1001,1691,1,1002,1696,
+1,35,3070,19,342,
+1,35,3071,5,84,
+1,2767,3072,16,0,
+340,1,1011,1207,1,
+1012,3073,16,0,340,
+1,1013,1363,1,262,
+1224,1,1267,3074,16,
+0,340,1,515,3075,
+16,0,340,1,1521,
+3076,16,0,340,1,
+525,1321,1,283,1277,
+1,2299,3077,16,0,
+340,1,42,3078,16,
+0,340,1,40,1282,
+1,44,1288,1,47,
+1289,1,1303,3079,16,
+0,340,1,1555,3080,
+16,0,340,1,50,
+1306,1,48,1295,1,
+49,1301,1,51,1311,
+1,63,1327,1,305,
+1316,1,66,1333,1,
+67,1338,1,68,1343,
+1,69,1348,1,70,
+1353,1,73,3081,16,
+0,340,1,74,1358,
+1,328,1407,1,1048,
+1449,1,82,3082,16,
+0,340,1,1840,3083,
+16,0,340,1,1591,
+3084,16,0,340,1,
+1341,3085,16,0,340,
+1,1096,1417,1,93,
+1423,1,352,1454,1,
+107,3086,16,0,340,
+1,1114,1448,1,118,
+1460,1,1123,3087,16,
+0,340,1,371,1470,
+1,1628,3088,16,0,
+340,1,375,1481,1,
+1882,3089,16,0,340,
+1,377,1486,1,379,
+1491,1,380,1496,1,
+883,3090,16,0,340,
+1,373,1514,1,130,
+1519,1,143,1524,1,
+387,3091,16,0,340,
+1,1159,3092,16,0,
+340,1,157,1547,1,
+1413,3093,16,0,340,
+1,1665,3094,16,0,
+340,1,412,3095,16,
+0,340,1,1377,3096,
+16,0,340,1,172,
+1573,1,1939,3097,16,
+0,340,1,437,3098,
+16,0,340,1,188,
+1622,1,942,1594,1,
+1195,3099,16,0,340,
+1,1449,3100,16,0,
+340,1,1701,3101,16,
+0,340,1,447,1615,
+1,205,1627,1,827,
+3102,16,0,340,1,
+223,3103,16,0,340,
+1,476,1647,1,477,
+1653,1,1231,3104,16,
+0,340,1,479,1663,
+1,480,1668,1,1485,
+3105,16,0,340,1,
+1737,3106,16,0,340,
+1,242,1681,1,478,
+1686,1,1001,1691,1,
+1002,1696,1,36,3107,
+19,233,1,36,3108,
+5,94,1,2761,3109,
+16,0,231,1,256,
+3110,16,0,231,1,
+1261,3111,16,0,231,
+1,509,3112,16,0,
+231,1,1515,3113,16,
+0,231,1,2021,823,
+1,1775,3114,16,0,
+231,1,2029,830,1,
+2030,836,1,2031,841,
+1,2032,846,1,2033,
+851,1,277,3115,16,
+0,231,1,2035,857,
+1,2037,862,1,2039,
+867,1,32,3116,16,
+0,231,1,2041,873,
+1,2293,3117,16,0,
+231,1,2043,879,1,
+2045,884,1,41,3118,
+16,0,231,1,1297,
+3119,16,0,231,1,
+43,3120,16,0,231,
+1,1803,892,1,1804,
+3121,16,0,231,1,
+299,3122,16,0,231,
+1,52,3123,16,0,
+231,1,2318,3124,16,
+0,231,1,2075,3125,
+16,0,231,1,1574,
+904,1,71,3126,16,
+0,231,1,76,3127,
+16,0,231,1,1834,
+3128,16,0,231,1,
+2337,3129,16,0,231,
+1,79,3130,16,0,
+231,1,1335,3131,16,
+0,231,1,322,3132,
+16,0,231,1,85,
+3133,16,0,231,1,
+89,3134,16,0,231,
+1,346,3135,16,0,
+231,1,2105,919,1,
+2106,3136,16,0,231,
+1,97,3137,16,0,
+231,1,1860,926,1,
+2364,932,1,102,3138,
+16,0,231,1,112,
+3139,16,0,231,1,
+1117,3140,16,0,231,
+1,1873,940,1,1876,
+3141,16,0,231,1,
+124,3142,16,0,231,
+1,2136,947,1,381,
+3143,16,0,231,1,
+525,3144,16,0,231,
+1,137,3145,16,0,
+231,1,1901,3146,16,
+0,231,1,1153,3147,
+16,0,231,1,151,
+3148,16,0,231,1,
+1407,3149,16,0,231,
+1,1659,3150,16,0,
+231,1,2413,3151,16,
+0,231,1,406,3152,
+16,0,231,1,1371,
+3153,16,0,231,1,
+166,3154,16,0,231,
+1,1622,3155,16,0,
+231,1,1931,965,1,
+1933,3156,16,0,231,
+1,431,3157,16,0,
+231,1,1585,3158,16,
+0,231,1,182,3159,
+16,0,231,1,1189,
+3160,16,0,231,1,
+1443,3161,16,0,231,
+1,1695,3162,16,0,
+231,1,2198,3163,16,
+0,231,1,447,3164,
+16,0,231,1,2458,
+980,1,2459,986,1,
+1958,3165,16,0,231,
+1,2462,993,1,1657,
+998,1,2464,1003,1,
+199,3166,16,0,231,
+1,459,3167,16,0,
+231,1,462,3168,16,
+0,231,1,217,3169,
+16,0,231,1,2227,
+1012,1,1225,3170,16,
+0,231,1,1479,3171,
+16,0,231,1,1731,
+3172,16,0,231,1,
+1989,1020,1,1990,3173,
+16,0,231,1,236,
+3174,16,0,231,1,
+1756,3175,16,0,231,
+1,37,3176,19,254,
+1,37,3177,5,94,
+1,2761,3178,16,0,
+252,1,256,3179,16,
+0,252,1,1261,3180,
+16,0,252,1,509,
+3181,16,0,252,1,
+1515,3182,16,0,252,
+1,2021,823,1,1775,
+3183,16,0,252,1,
+2029,830,1,2030,836,
+1,2031,841,1,2032,
+846,1,2033,851,1,
+277,3184,16,0,252,
+1,2035,857,1,2037,
+862,1,2039,867,1,
+32,3185,16,0,252,
+1,2041,873,1,2293,
+3186,16,0,252,1,
+2043,879,1,2045,884,
+1,41,3187,16,0,
+252,1,1297,3188,16,
+0,252,1,43,3189,
+16,0,252,1,1803,
+892,1,1804,3190,16,
+0,252,1,299,3191,
+16,0,252,1,52,
+3192,16,0,252,1,
+2318,3193,16,0,252,
+1,2075,3194,16,0,
+252,1,1574,904,1,
+71,3195,16,0,252,
+1,76,3196,16,0,
+252,1,1834,3197,16,
+0,252,1,2337,3198,
+16,0,252,1,79,
+3199,16,0,252,1,
+1335,3200,16,0,252,
+1,322,3201,16,0,
+252,1,85,3202,16,
+0,252,1,89,3203,
+16,0,252,1,346,
+3204,16,0,252,1,
+2105,919,1,2106,3205,
+16,0,252,1,97,
+3206,16,0,252,1,
+1860,926,1,2364,932,
+1,102,3207,16,0,
+252,1,112,3208,16,
+0,252,1,1117,3209,
+16,0,252,1,1873,
+940,1,1876,3210,16,
+0,252,1,124,3211,
+16,0,252,1,2136,
+947,1,381,3212,16,
+0,252,1,525,3213,
+16,0,252,1,137,
+3214,16,0,252,1,
+1901,3215,16,0,252,
+1,1153,3216,16,0,
+252,1,151,3217,16,
+0,252,1,1407,3218,
+16,0,252,1,1659,
+3219,16,0,252,1,
+2413,3220,16,0,252,
+1,406,3221,16,0,
+252,1,1371,3222,16,
+0,252,1,166,3223,
+16,0,252,1,1622,
+3224,16,0,252,1,
+1931,965,1,1933,3225,
+16,0,252,1,431,
+3226,16,0,252,1,
+1585,3227,16,0,252,
+1,182,3228,16,0,
+252,1,1189,3229,16,
+0,252,1,1443,3230,
+16,0,252,1,1695,
+3231,16,0,252,1,
+2198,3232,16,0,252,
+1,447,3233,16,0,
+252,1,2458,980,1,
+2459,986,1,1958,3234,
+16,0,252,1,2462,
+993,1,1657,998,1,
+2464,1003,1,199,3235,
+16,0,252,1,459,
+3236,16,0,252,1,
+462,3237,16,0,252,
+1,217,3238,16,0,
+252,1,2227,1012,1,
+1225,3239,16,0,252,
+1,1479,3240,16,0,
+252,1,1731,3241,16,
+0,252,1,1989,1020,
+1,1990,3242,16,0,
+252,1,236,3243,16,
+0,252,1,1756,3244,
+16,0,252,1,38,
+3245,19,251,1,38,
+3246,5,84,1,2767,
+3247,16,0,249,1,
+1011,1207,1,1012,3248,
+16,0,249,1,1013,
+1363,1,262,1224,1,
+1267,3249,16,0,249,
+1,515,3250,16,0,
+249,1,1521,3251,16,
+0,249,1,525,1321,
+1,283,1277,1,2299,
+3252,16,0,249,1,
+42,3253,16,0,249,
+1,40,1282,1,44,
+1288,1,47,1289,1,
+1303,3254,16,0,249,
+1,1555,3255,16,0,
+249,1,50,1306,1,
+48,1295,1,49,1301,
+1,51,1311,1,63,
+1327,1,305,1316,1,
+66,1333,1,67,1338,
+1,68,1343,1,69,
+1348,1,70,1353,1,
+73,3256,16,0,249,
+1,74,1358,1,328,
+1407,1,1048,1449,1,
+82,3257,16,0,249,
+1,1840,3258,16,0,
+249,1,1591,3259,16,
+0,249,1,1341,3260,
+16,0,249,1,1096,
+1417,1,93,1423,1,
+352,1454,1,107,3261,
+16,0,249,1,1114,
+1448,1,118,1460,1,
+1123,3262,16,0,249,
+1,371,1470,1,1628,
+3263,16,0,249,1,
+375,1481,1,1882,3264,
+16,0,249,1,377,
+1486,1,379,1491,1,
+380,1496,1,883,1502,
+1,373,1514,1,130,
+1519,1,143,1524,1,
+387,3265,16,0,249,
+1,1159,3266,16,0,
+249,1,157,1547,1,
+1413,3267,16,0,249,
+1,1665,3268,16,0,
+249,1,412,3269,16,
+0,249,1,1377,3270,
+16,0,249,1,172,
+1573,1,1939,3271,16,
+0,249,1,437,3272,
+16,0,249,1,188,
+1622,1,942,1594,1,
+1195,3273,16,0,249,
+1,1449,3274,16,0,
+249,1,1701,3275,16,
+0,249,1,447,1615,
+1,205,1627,1,827,
+1436,1,223,1637,1,
+476,1647,1,477,1653,
+1,1231,3276,16,0,
+249,1,479,1663,1,
+480,1668,1,1485,3277,
+16,0,249,1,1737,
+3278,16,0,249,1,
+242,1681,1,478,1686,
+1,1001,1691,1,1002,
+1696,1,39,3279,19,
+239,1,39,3280,5,
+84,1,2767,3281,16,
+0,237,1,1011,1207,
+1,1012,3282,16,0,
+237,1,1013,1363,1,
+262,1224,1,1267,3283,
+16,0,237,1,515,
+3284,16,0,237,1,
+1521,3285,16,0,237,
+1,525,1321,1,283,
+1277,1,2299,3286,16,
+0,237,1,42,3287,
+16,0,237,1,40,
+1282,1,44,1288,1,
+47,1289,1,1303,3288,
+16,0,237,1,1555,
+3289,16,0,237,1,
+50,1306,1,48,1295,
+1,49,1301,1,51,
+1311,1,63,1327,1,
+305,1316,1,66,1333,
+1,67,1338,1,68,
+1343,1,69,1348,1,
+70,1353,1,73,3290,
+16,0,237,1,74,
+1358,1,328,1407,1,
+1048,1449,1,82,3291,
+16,0,237,1,1840,
+3292,16,0,237,1,
+1591,3293,16,0,237,
+1,1341,3294,16,0,
+237,1,1096,1417,1,
+93,1423,1,352,1454,
+1,107,3295,16,0,
+237,1,1114,1448,1,
+118,1460,1,1123,3296,
+16,0,237,1,371,
+1470,1,1628,3297,16,
+0,237,1,375,1481,
+1,1882,3298,16,0,
+237,1,377,1486,1,
+379,1491,1,380,1496,
+1,883,1502,1,373,
+1514,1,130,1519,1,
+143,1524,1,387,3299,
+16,0,237,1,1159,
+3300,16,0,237,1,
+157,1547,1,1413,3301,
+16,0,237,1,1665,
+3302,16,0,237,1,
+412,3303,16,0,237,
+1,1377,3304,16,0,
+237,1,172,1573,1,
+1939,3305,16,0,237,
+1,437,3306,16,0,
+237,1,188,1622,1,
+942,1594,1,1195,3307,
+16,0,237,1,1449,
+3308,16,0,237,1,
+1701,3309,16,0,237,
+1,447,1615,1,205,
+1627,1,827,1436,1,
+223,1637,1,476,1647,
+1,477,1653,1,1231,
+3310,16,0,237,1,
+479,1663,1,480,1668,
+1,1485,3311,16,0,
+237,1,1737,3312,16,
+0,237,1,242,1681,
+1,478,1686,1,1001,
+1691,1,1002,1696,1,
+40,3313,19,227,1,
+40,3314,5,84,1,
+2767,3315,16,0,225,
+1,1011,1207,1,1012,
+3316,16,0,225,1,
+1013,1363,1,262,1224,
+1,1267,3317,16,0,
+225,1,515,3318,16,
+0,225,1,1521,3319,
+16,0,225,1,525,
+1321,1,283,1277,1,
+2299,3320,16,0,225,
+1,42,3321,16,0,
+225,1,40,1282,1,
+44,1288,1,47,1289,
+1,1303,3322,16,0,
+225,1,1555,3323,16,
+0,225,1,50,1306,
+1,48,1295,1,49,
+1301,1,51,1311,1,
+63,1327,1,305,1316,
+1,66,1333,1,67,
+1338,1,68,1343,1,
+69,1348,1,70,1353,
+1,73,3324,16,0,
+225,1,74,1358,1,
+328,1407,1,1048,1449,
+1,82,3325,16,0,
+225,1,1840,3326,16,
+0,225,1,1591,3327,
+16,0,225,1,1341,
+3328,16,0,225,1,
+1096,1417,1,93,1423,
+1,352,1454,1,107,
+3329,16,0,225,1,
+1114,1448,1,118,3330,
+16,0,225,1,1123,
+3331,16,0,225,1,
+371,1470,1,1628,3332,
+16,0,225,1,375,
+1481,1,1882,3333,16,
+0,225,1,377,1486,
+1,379,1491,1,380,
+1496,1,883,3334,16,
+0,225,1,373,1514,
+1,130,3335,16,0,
+225,1,143,3336,16,
+0,225,1,387,3337,
+16,0,225,1,1159,
+3338,16,0,225,1,
+157,3339,16,0,225,
+1,1413,3340,16,0,
+225,1,1665,3341,16,
+0,225,1,412,3342,
+16,0,225,1,1377,
+3343,16,0,225,1,
+172,3344,16,0,225,
+1,1939,3345,16,0,
+225,1,437,3346,16,
+0,225,1,188,3347,
+16,0,225,1,942,
+1594,1,1195,3348,16,
+0,225,1,1449,3349,
+16,0,225,1,1701,
+3350,16,0,225,1,
+447,1615,1,205,3351,
+16,0,225,1,827,
+3352,16,0,225,1,
+223,3353,16,0,225,
+1,476,1647,1,477,
+1653,1,1231,3354,16,
+0,225,1,479,1663,
+1,480,1668,1,1485,
+3355,16,0,225,1,
+1737,3356,16,0,225,
+1,242,3357,16,0,
+225,1,478,1686,1,
+1001,1691,1,1002,1696,
+1,41,3358,19,187,
+1,41,3359,5,84,
+1,2767,3360,16,0,
+185,1,1011,1207,1,
+1012,3361,16,0,185,
+1,1013,1363,1,262,
+1224,1,1267,3362,16,
+0,185,1,515,3363,
+16,0,185,1,1521,
+3364,16,0,185,1,
+525,1321,1,283,1277,
+1,2299,3365,16,0,
+185,1,42,3366,16,
+0,185,1,40,1282,
+1,44,1288,1,47,
+1289,1,1303,3367,16,
+0,185,1,1555,3368,
+16,0,185,1,50,
+1306,1,48,1295,1,
+49,1301,1,51,1311,
+1,63,1327,1,305,
+1316,1,66,1333,1,
+67,1338,1,68,1343,
+1,69,1348,1,70,
+1353,1,73,3369,16,
+0,185,1,74,1358,
+1,328,1407,1,1048,
+1449,1,82,3370,16,
+0,185,1,1840,3371,
+16,0,185,1,1591,
+3372,16,0,185,1,
+1341,3373,16,0,185,
+1,1096,1417,1,93,
+1423,1,352,1454,1,
+107,3374,16,0,185,
+1,1114,1448,1,118,
+3375,16,0,185,1,
+1123,3376,16,0,185,
+1,371,1470,1,1628,
+3377,16,0,185,1,
+375,1481,1,1882,3378,
+16,0,185,1,377,
+1486,1,379,1491,1,
+380,1496,1,883,3379,
+16,0,185,1,373,
+1514,1,130,3380,16,
+0,185,1,143,3381,
+16,0,185,1,387,
+3382,16,0,185,1,
+1159,3383,16,0,185,
+1,157,3384,16,0,
+185,1,1413,3385,16,
+0,185,1,1665,3386,
+16,0,185,1,412,
+3387,16,0,185,1,
+1377,3388,16,0,185,
+1,172,3389,16,0,
+185,1,1939,3390,16,
+0,185,1,437,3391,
+16,0,185,1,188,
+3392,16,0,185,1,
+942,1594,1,1195,3393,
+16,0,185,1,1449,
+3394,16,0,185,1,
+1701,3395,16,0,185,
+1,447,1615,1,205,
+3396,16,0,185,1,
+827,3397,16,0,185,
+1,223,3398,16,0,
+185,1,476,1647,1,
+477,1653,1,1231,3399,
+16,0,185,1,479,
+1663,1,480,1668,1,
+1485,3400,16,0,185,
+1,1737,3401,16,0,
+185,1,242,3402,16,
+0,185,1,478,1686,
+1,1001,1691,1,1002,
+1696,1,42,3403,19,
+427,1,42,3404,5,
+38,1,1901,3405,16,
+0,425,1,2075,3406,
+16,0,425,1,1860,
+926,1,1803,892,1,
+1804,3407,16,0,425,
+1,2413,3408,16,0,
+425,1,2198,3409,16,
+0,425,1,1873,940,
+1,1657,998,1,1989,
+1020,1,1990,3410,16,
+0,425,1,1775,3411,
+16,0,425,1,32,
+3412,16,0,425,1,
+2105,919,1,2106,3413,
+16,0,425,1,2364,
+932,1,2227,1012,1,
+2337,3414,16,0,425,
+1,2021,823,1,2458,
+980,1,2459,986,1,
+2462,993,1,2136,947,
+1,2464,1003,1,2029,
+830,1,2030,836,1,
+2031,841,1,2032,846,
+1,2033,851,1,2035,
+857,1,2037,862,1,
+2039,867,1,1931,965,
+1,2041,873,1,2043,
+879,1,2045,884,1,
+1574,904,1,1958,3415,
+16,0,425,1,43,
+3416,19,521,1,43,
+3417,5,25,1,2035,
+857,1,2037,862,1,
+2039,867,1,2041,873,
+1,2227,1012,1,2043,
+879,1,1657,998,1,
+1860,926,1,2136,947,
+1,2021,823,1,2459,
+986,1,1574,904,1,
+2105,3418,16,0,676,
+1,1931,965,1,1873,
+940,1,2031,841,1,
+1803,892,1,1989,3419,
+16,0,519,1,2464,
+1003,1,2029,830,1,
+2030,836,1,2364,932,
+1,2032,846,1,2033,
+851,1,2045,884,1,
+44,3420,19,285,1,
+44,3421,5,38,1,
+1901,3422,16,0,283,
+1,2075,3423,16,0,
+283,1,1860,926,1,
+1803,892,1,1804,3424,
+16,0,283,1,2413,
+3425,16,0,283,1,
+2198,3426,16,0,283,
+1,1873,940,1,1657,
+998,1,1989,1020,1,
+1990,3427,16,0,283,
+1,1775,3428,16,0,
+283,1,32,3429,16,
+0,283,1,2105,919,
+1,2106,3430,16,0,
+283,1,2364,932,1,
+2227,1012,1,2337,3431,
+16,0,283,1,2021,
+823,1,2458,980,1,
+2459,986,1,2462,993,
+1,2136,947,1,2464,
+1003,1,2029,830,1,
+2030,836,1,2031,841,
+1,2032,846,1,2033,
+851,1,2035,857,1,
+2037,862,1,2039,867,
+1,1931,965,1,2041,
+873,1,2043,879,1,
+2045,884,1,1574,904,
+1,1958,3432,16,0,
+283,1,45,3433,19,
+317,1,45,3434,5,
+39,1,1901,3435,16,
+0,346,1,2075,3436,
+16,0,346,1,1860,
+926,1,1803,892,1,
+1804,3437,16,0,346,
+1,2413,3438,16,0,
+346,1,2198,3439,16,
+0,346,1,1873,940,
+1,1657,998,1,1989,
+1020,1,1990,3440,16,
+0,346,1,1775,3441,
+16,0,346,1,32,
+3442,16,0,346,1,
+2105,919,1,2106,3443,
+16,0,346,1,2364,
+932,1,2227,1012,1,
+2337,3444,16,0,346,
+1,2021,823,1,2458,
+980,1,2459,986,1,
+2462,993,1,2136,947,
+1,2464,1003,1,2029,
+830,1,2030,836,1,
+2031,841,1,2032,846,
+1,2033,851,1,2035,
+857,1,2037,862,1,
+2039,867,1,1931,965,
+1,2041,873,1,2043,
+879,1,2045,884,1,
+1832,3445,16,0,315,
+1,1574,904,1,1958,
+3446,16,0,346,1,
+46,3447,19,775,1,
+46,3448,5,38,1,
+1901,3449,16,0,773,
+1,2075,3450,16,0,
+773,1,1860,926,1,
+1803,892,1,1804,3451,
+16,0,773,1,2413,
+3452,16,0,773,1,
+2198,3453,16,0,773,
+1,1873,940,1,1657,
+998,1,1989,1020,1,
+1990,3454,16,0,773,
+1,1775,3455,16,0,
+773,1,32,3456,16,
+0,773,1,2105,919,
+1,2106,3457,16,0,
+773,1,2364,932,1,
+2227,1012,1,2337,3458,
+16,0,773,1,2021,
+823,1,2458,980,1,
+2459,986,1,2462,993,
+1,2136,947,1,2464,
+1003,1,2029,830,1,
+2030,836,1,2031,841,
+1,2032,846,1,2033,
+851,1,2035,857,1,
+2037,862,1,2039,867,
+1,1931,965,1,2041,
+873,1,2043,879,1,
+2045,884,1,1574,904,
+1,1958,3459,16,0,
+773,1,47,3460,19,
+661,1,47,3461,5,
+19,1,0,3462,16,
+0,659,1,2739,3463,
+16,0,659,1,2816,
+3464,17,3465,15,3466,
+4,36,37,0,71,
+0,108,0,111,0,
+98,0,97,0,108,
+0,68,0,101,0,
+102,0,105,0,110,
+0,105,0,116,0,
+105,0,111,0,110,
+0,115,0,1,-1,
+1,5,3467,20,3468,
 4,38,71,0,108,
 0,111,0,98,0,
 97,0,108,0,68,
@@ -9547,37 +9695,69 @@ public yyLSLSyntax
 105,0,110,0,105,
 0,116,0,105,0,
 111,0,110,0,115,
-0,95,0,51,0,
-1,164,1,3,1,
-2,1,1,3441,22,
-1,5,1,2798,3442,
-17,3443,15,3428,1,
--1,1,5,3444,20,
-3445,4,38,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
-68,0,101,0,102,
-0,105,0,110,0,
-105,0,116,0,105,
-0,111,0,110,0,
-115,0,95,0,49,
-0,1,162,1,3,
-1,2,1,1,3446,
-22,1,3,1,2466,
-3447,17,3448,15,3449,
-4,50,37,0,71,
+0,95,0,52,0,
+1,168,1,3,1,
+3,1,2,3469,22,
+1,6,1,2742,794,
+1,2743,800,1,2818,
+3470,17,3471,15,3466,
+1,-1,1,5,3472,
+20,3473,4,38,71,
 0,108,0,111,0,
 98,0,97,0,108,
-0,70,0,117,0,
-110,0,99,0,116,
-0,105,0,111,0,
-110,0,68,0,101,
+0,68,0,101,0,
+102,0,105,0,110,
+0,105,0,116,0,
+105,0,111,0,110,
+0,115,0,95,0,
+51,0,1,167,1,
+3,1,2,1,1,
+3474,22,1,5,1,
+2819,3475,17,3476,15,
+3466,1,-1,1,5,
+3477,20,3478,4,38,
+71,0,108,0,111,
+0,98,0,97,0,
+108,0,68,0,101,
 0,102,0,105,0,
 110,0,105,0,116,
 0,105,0,111,0,
-110,0,1,-1,1,
-5,3450,20,3451,4,
-52,71,0,108,0,
+110,0,115,0,95,
+0,49,0,1,165,
+1,3,1,2,1,
+1,3479,22,1,3,
+1,2786,3480,17,3481,
+15,3482,4,52,37,
+0,71,0,108,0,
+111,0,98,0,97,
+0,108,0,86,0,
+97,0,114,0,105,
+0,97,0,98,0,
+108,0,101,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,1,-1,1,5,
+3483,20,3484,4,54,
+71,0,108,0,111,
+0,98,0,97,0,
+108,0,86,0,97,
+0,114,0,105,0,
+97,0,98,0,108,
+0,101,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+95,0,50,0,1,
+170,1,3,1,5,
+1,4,3485,22,1,
+8,1,2022,3486,16,
+0,666,1,2459,986,
+1,2758,3487,17,3488,
+15,3489,4,50,37,
+0,71,0,108,0,
 111,0,98,0,97,
 0,108,0,70,0,
 117,0,110,0,99,
@@ -9586,33 +9766,9 @@ public yyLSLSyntax
 0,101,0,102,0,
 105,0,110,0,105,
 0,116,0,105,0,
-111,0,110,0,95,
-0,50,0,1,169,
-1,3,1,7,1,
-6,3452,22,1,10,
-1,2615,793,1,2765,
-3453,17,3454,15,3419,
-1,-1,1,5,3455,
-20,3456,4,54,71,
-0,108,0,111,0,
-98,0,97,0,108,
-0,86,0,97,0,
-114,0,105,0,97,
-0,98,0,108,0,
-101,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,95,
-0,50,0,1,167,
-1,3,1,5,1,
-4,3457,22,1,8,
-1,2464,984,1,2718,
-3458,16,0,623,1,
-2721,777,1,2737,3459,
-17,3460,15,3449,1,
--1,1,5,3461,20,
-3462,4,52,71,0,
+111,0,110,0,1,
+-1,1,5,3490,20,
+3491,4,52,71,0,
 108,0,111,0,98,
 0,97,0,108,0,
 70,0,117,0,110,
@@ -9623,2660 +9779,2783 @@ public yyLSLSyntax
 0,105,0,116,0,
 105,0,111,0,110,
 0,95,0,49,0,
-1,168,1,3,1,
-6,1,5,3463,22,
-1,9,1,48,3464,
-19,351,1,48,3465,
-5,54,1,0,3466,
-16,0,349,1,2075,
-3467,16,0,546,1,
-1860,907,1,1804,3468,
-16,0,546,1,2737,
-3459,1,2337,3469,16,
-0,546,1,2413,3470,
-16,0,546,1,2198,
-3471,16,0,546,1,
-1873,921,1,1657,979,
-1,2030,817,1,2032,
-827,1,1989,1002,1,
-1990,3472,16,0,546,
-1,2035,838,1,1775,
-3473,16,0,546,1,
-32,3474,16,0,546,
-1,2105,900,1,2106,
-3475,16,0,546,1,
-2721,777,1,2765,3453,
-1,2227,993,1,1901,
-3476,16,0,546,1,
-2776,3417,1,2777,3477,
-16,0,349,1,1803,
-873,1,2458,961,1,
-2459,967,1,2788,3478,
-16,0,349,1,2462,
-974,1,2136,928,1,
-2464,984,1,2029,811,
-1,2466,3447,1,2031,
-822,1,2795,3426,1,
-2796,3432,1,2797,3437,
-1,2798,3442,1,2364,
-913,1,2039,848,1,
-1931,946,1,2041,854,
-1,2021,804,1,2043,
-860,1,2045,865,1,
-2033,832,1,2711,765,
-1,2037,843,1,1574,
-885,1,2718,3479,16,
-0,349,1,1958,3480,
-16,0,546,1,2722,
-788,1,2615,793,1,
-49,3481,19,551,1,
-49,3482,5,38,1,
-1901,3483,16,0,549,
-1,2075,3484,16,0,
-549,1,1860,907,1,
-1803,873,1,1804,3485,
-16,0,549,1,2413,
-3486,16,0,549,1,
-2198,3487,16,0,549,
-1,1873,921,1,1657,
-979,1,1989,1002,1,
-1990,3488,16,0,549,
-1,1775,3489,16,0,
-549,1,32,3490,16,
-0,549,1,2105,900,
-1,2106,3491,16,0,
-549,1,2364,913,1,
-2227,993,1,2337,3492,
-16,0,549,1,2021,
-804,1,2458,961,1,
-2459,967,1,2462,974,
-1,2136,928,1,2464,
-984,1,2029,811,1,
-2030,817,1,2031,822,
-1,2032,827,1,2033,
-832,1,2035,838,1,
-2037,843,1,2039,848,
-1,1931,946,1,2041,
-854,1,2043,860,1,
-2045,865,1,1574,885,
-1,1958,3493,16,0,
-549,1,50,3494,19,
-689,1,50,3495,5,
-38,1,1901,3496,16,
-0,687,1,2075,3497,
-16,0,687,1,1860,
-907,1,1803,873,1,
-1804,3498,16,0,687,
-1,2413,3499,16,0,
-687,1,2198,3500,16,
-0,687,1,1873,921,
-1,1657,979,1,1989,
-1002,1,1990,3501,16,
-0,687,1,1775,3502,
-16,0,687,1,32,
-3503,16,0,687,1,
-2105,900,1,2106,3504,
-16,0,687,1,2364,
-913,1,2227,993,1,
-2337,3505,16,0,687,
-1,2021,804,1,2458,
-961,1,2459,967,1,
-2462,974,1,2136,928,
-1,2464,984,1,2029,
-811,1,2030,817,1,
-2031,822,1,2032,827,
-1,2033,832,1,2035,
-838,1,2037,843,1,
-2039,848,1,1931,946,
-1,2041,854,1,2043,
-860,1,2045,865,1,
-1574,885,1,1958,3506,
-16,0,687,1,51,
-3507,19,127,1,51,
-3508,5,55,1,0,
-3509,16,0,125,1,
-2075,3510,16,0,125,
-1,1860,907,1,10,
-3511,16,0,125,1,
-2737,3459,1,2337,3512,
-16,0,125,1,2413,
-3513,16,0,125,1,
-2198,3514,16,0,125,
-1,1873,921,1,21,
-3515,16,0,125,1,
-1657,979,1,2531,3516,
-16,0,446,1,2032,
-827,1,1989,1002,1,
-1990,3517,16,0,125,
-1,2458,961,1,1775,
-3518,16,0,125,1,
-32,3519,16,0,125,
-1,2105,900,1,2106,
-3520,16,0,125,1,
-2765,3453,1,2553,3521,
-16,0,125,1,2227,
-993,1,1901,3522,16,
-0,125,1,2776,3417,
-1,52,3523,16,0,
-125,1,1803,873,1,
-1804,3524,16,0,125,
-1,2459,967,1,2462,
-974,1,2136,928,1,
-2464,984,1,2029,811,
-1,2466,3447,1,2031,
-822,1,2795,3426,1,
-2796,3432,1,2797,3437,
-1,2798,3442,1,2364,
-913,1,2039,848,1,
-1931,946,1,2041,854,
-1,2021,804,1,2043,
-860,1,2045,865,1,
-2724,3525,16,0,125,
-1,2030,817,1,2033,
-832,1,2035,838,1,
-2037,843,1,2777,3526,
-16,0,125,1,1574,
-885,1,1958,3527,16,
-0,125,1,2506,3528,
-16,0,446,1,52,
-3529,19,124,1,52,
-3530,5,53,1,0,
-3531,16,0,122,1,
-2075,3532,16,0,122,
-1,1860,907,1,1804,
-3533,16,0,122,1,
-10,3534,16,0,122,
-1,2737,3459,1,2337,
-3535,16,0,122,1,
-2413,3536,16,0,122,
-1,2198,3537,16,0,
-122,1,1873,921,1,
-21,3538,16,0,122,
-1,1657,979,1,2030,
-817,1,2032,827,1,
-1989,1002,1,1990,3539,
-16,0,122,1,2035,
-838,1,1775,3540,16,
-0,122,1,32,3541,
+1,171,1,3,1,
+6,1,5,3492,22,
+1,9,1,2817,3493,
+17,3494,15,3466,1,
+-1,1,5,3495,20,
+3496,4,38,71,0,
+108,0,111,0,98,
+0,97,0,108,0,
+68,0,101,0,102,
+0,105,0,110,0,
+105,0,116,0,105,
+0,111,0,110,0,
+115,0,95,0,50,
+0,1,166,1,3,
+1,3,1,2,3497,
+22,1,4,1,2797,
+3498,17,3499,15,3482,
+1,-1,1,5,3500,
+20,3501,4,54,71,
+0,108,0,111,0,
+98,0,97,0,108,
+0,86,0,97,0,
+114,0,105,0,97,
+0,98,0,108,0,
+101,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,95,
+0,49,0,1,169,
+1,3,1,3,1,
+2,3502,22,1,7,
+1,2798,3503,16,0,
+659,1,2466,3504,17,
+3505,15,3489,1,-1,
+1,5,3506,20,3507,
+4,52,71,0,108,
+0,111,0,98,0,
+97,0,108,0,70,
+0,117,0,110,0,
+99,0,116,0,105,
+0,111,0,110,0,
+68,0,101,0,102,
+0,105,0,110,0,
+105,0,116,0,105,
+0,111,0,110,0,
+95,0,50,0,1,
+172,1,3,1,7,
+1,6,3508,22,1,
+10,1,2631,805,1,
+2464,1003,1,2731,811,
+1,2809,3509,16,0,
+659,1,48,3510,19,
+372,1,48,3511,5,
+54,1,0,3512,16,
+0,370,1,2075,3513,
+16,0,571,1,2731,
+811,1,1860,926,1,
+1804,3514,16,0,571,
+1,1901,3515,16,0,
+571,1,2739,3516,16,
+0,370,1,2413,3517,
+16,0,571,1,2742,
+794,1,2743,800,1,
+1873,940,1,1657,998,
+1,2030,836,1,1989,
+1020,1,1990,3518,16,
+0,571,1,2035,857,
+1,2459,986,1,1775,
+3519,16,0,571,1,
+32,3520,16,0,571,
+1,2758,3487,1,2105,
+919,1,2106,3521,16,
+0,571,1,2227,1012,
+1,2337,3522,16,0,
+571,1,1803,892,1,
+2458,980,1,2786,3480,
+1,2462,993,1,2136,
+947,1,2464,1003,1,
+2029,830,1,2466,3504,
+1,2031,841,1,2032,
+846,1,2033,851,1,
+2797,3498,1,2798,3523,
+16,0,370,1,2631,
+805,1,2364,932,1,
+2039,867,1,1931,965,
+1,2041,873,1,2021,
+823,1,2043,879,1,
+2045,884,1,2809,3524,
+16,0,370,1,2198,
+3525,16,0,571,1,
+2816,3464,1,2817,3493,
+1,2818,3470,1,2819,
+3475,1,2037,862,1,
+1574,904,1,1958,3526,
+16,0,571,1,49,
+3527,19,576,1,49,
+3528,5,38,1,1901,
+3529,16,0,574,1,
+2075,3530,16,0,574,
+1,1860,926,1,1803,
+892,1,1804,3531,16,
+0,574,1,2413,3532,
+16,0,574,1,2198,
+3533,16,0,574,1,
+1873,940,1,1657,998,
+1,1989,1020,1,1990,
+3534,16,0,574,1,
+1775,3535,16,0,574,
+1,32,3536,16,0,
+574,1,2105,919,1,
+2106,3537,16,0,574,
+1,2364,932,1,2227,
+1012,1,2337,3538,16,
+0,574,1,2021,823,
+1,2458,980,1,2459,
+986,1,2462,993,1,
+2136,947,1,2464,1003,
+1,2029,830,1,2030,
+836,1,2031,841,1,
+2032,846,1,2033,851,
+1,2035,857,1,2037,
+862,1,2039,867,1,
+1931,965,1,2041,873,
+1,2043,879,1,2045,
+884,1,1574,904,1,
+1958,3539,16,0,574,
+1,50,3540,19,707,
+1,50,3541,5,38,
+1,1901,3542,16,0,
+705,1,2075,3543,16,
+0,705,1,1860,926,
+1,1803,892,1,1804,
+3544,16,0,705,1,
+2413,3545,16,0,705,
+1,2198,3546,16,0,
+705,1,1873,940,1,
+1657,998,1,1989,1020,
+1,1990,3547,16,0,
+705,1,1775,3548,16,
+0,705,1,32,3549,
+16,0,705,1,2105,
+919,1,2106,3550,16,
+0,705,1,2364,932,
+1,2227,1012,1,2337,
+3551,16,0,705,1,
+2021,823,1,2458,980,
+1,2459,986,1,2462,
+993,1,2136,947,1,
+2464,1003,1,2029,830,
+1,2030,836,1,2031,
+841,1,2032,846,1,
+2033,851,1,2035,857,
+1,2037,862,1,2039,
+867,1,1931,965,1,
+2041,873,1,2043,879,
+1,2045,884,1,1574,
+904,1,1958,3552,16,
+0,705,1,51,3553,
+19,127,1,51,3554,
+5,56,1,0,3555,
+16,0,125,1,2075,
+3556,16,0,125,1,
+1860,926,1,10,3557,
+16,0,125,1,2758,
+3487,1,1901,3558,16,
+0,125,1,2413,3559,
+16,0,125,1,2198,
+3560,16,0,125,1,
+1873,940,1,21,3561,
+16,0,125,1,1657,
+998,1,2030,836,1,
+1989,1020,1,1990,3562,
+16,0,125,1,2458,
+980,1,2459,986,1,
+1775,3563,16,0,125,
+1,32,3564,16,0,
+125,1,2567,3565,16,
+0,125,1,2105,919,
+1,2106,3566,16,0,
+125,1,2545,3567,16,
+0,467,1,2227,1012,
+1,2337,3568,16,0,
+125,1,2035,857,1,
+52,3569,16,0,125,
+1,1803,892,1,1804,
+3570,16,0,125,1,
+2786,3480,1,2462,993,
+1,2136,947,1,2464,
+1003,1,2029,830,1,
+2466,3504,1,2031,841,
+1,2032,846,1,2033,
+851,1,2797,3498,1,
+2798,3571,16,0,125,
+1,2364,932,1,2039,
+867,1,1931,965,1,
+2041,873,1,2021,823,
+1,2043,879,1,2045,
+884,1,2816,3464,1,
+2817,3493,1,2818,3470,
+1,2819,3475,1,2522,
+3572,16,0,467,1,
+2037,862,1,1574,904,
+1,1958,3573,16,0,
+125,1,2745,3574,16,
+0,125,1,2506,3575,
+16,0,467,1,52,
+3576,19,124,1,52,
+3577,5,53,1,0,
+3578,16,0,122,1,
+2075,3579,16,0,122,
+1,1860,926,1,10,
+3580,16,0,122,1,
+2758,3487,1,1901,3581,
+16,0,122,1,2413,
+3582,16,0,122,1,
+2198,3583,16,0,122,
+1,1873,940,1,21,
+3584,16,0,122,1,
+1657,998,1,2030,836,
+1,1989,1020,1,1990,
+3585,16,0,122,1,
+2458,980,1,2459,986,
+1,1775,3586,16,0,
+122,1,32,3587,16,
+0,122,1,2567,3588,
 16,0,122,1,2105,
-900,1,2106,3542,16,
-0,122,1,2765,3453,
-1,2553,3543,16,0,
-122,1,2227,993,1,
-1901,3544,16,0,122,
-1,2776,3417,1,52,
-3545,16,0,122,1,
-1803,873,1,2458,961,
-1,2459,967,1,2462,
-974,1,2136,928,1,
-2464,984,1,2029,811,
-1,2466,3447,1,2031,
-822,1,2795,3426,1,
-2796,3432,1,2797,3437,
-1,2798,3442,1,2364,
-913,1,2039,848,1,
-1931,946,1,2041,854,
-1,2021,804,1,2043,
-860,1,2045,865,1,
-2033,832,1,2037,843,
-1,2777,3546,16,0,
-122,1,1574,885,1,
-1958,3547,16,0,122,
-1,2724,3548,16,0,
-122,1,53,3549,19,
-121,1,53,3550,5,
-53,1,0,3551,16,
-0,119,1,2075,3552,
+919,1,2106,3589,16,
+0,122,1,2227,1012,
+1,2337,3590,16,0,
+122,1,2035,857,1,
+52,3591,16,0,122,
+1,1803,892,1,1804,
+3592,16,0,122,1,
+2786,3480,1,2462,993,
+1,2136,947,1,2464,
+1003,1,2029,830,1,
+2466,3504,1,2031,841,
+1,2032,846,1,2033,
+851,1,2797,3498,1,
+2798,3593,16,0,122,
+1,2364,932,1,2039,
+867,1,1931,965,1,
+2041,873,1,2021,823,
+1,2043,879,1,2045,
+884,1,2816,3464,1,
+2817,3493,1,2818,3470,
+1,2819,3475,1,2037,
+862,1,1574,904,1,
+1958,3594,16,0,122,
+1,2745,3595,16,0,
+122,1,53,3596,19,
+121,1,53,3597,5,
+53,1,0,3598,16,
+0,119,1,2075,3599,
 16,0,119,1,1860,
-907,1,1804,3553,16,
-0,119,1,10,3554,
-16,0,119,1,2737,
-3459,1,2337,3555,16,
-0,119,1,2413,3556,
-16,0,119,1,2198,
-3557,16,0,119,1,
-1873,921,1,21,3558,
-16,0,119,1,1657,
-979,1,2030,817,1,
-2032,827,1,1989,1002,
-1,1990,3559,16,0,
-119,1,2035,838,1,
-1775,3560,16,0,119,
-1,32,3561,16,0,
-119,1,2105,900,1,
-2106,3562,16,0,119,
-1,2765,3453,1,2553,
-3563,16,0,119,1,
-2227,993,1,1901,3564,
-16,0,119,1,2776,
-3417,1,52,3565,16,
-0,119,1,1803,873,
-1,2458,961,1,2459,
-967,1,2462,974,1,
-2136,928,1,2464,984,
-1,2029,811,1,2466,
-3447,1,2031,822,1,
-2795,3426,1,2796,3432,
-1,2797,3437,1,2798,
-3442,1,2364,913,1,
-2039,848,1,1931,946,
-1,2041,854,1,2021,
-804,1,2043,860,1,
-2045,865,1,2033,832,
-1,2037,843,1,2777,
-3566,16,0,119,1,
-1574,885,1,1958,3567,
-16,0,119,1,2724,
-3568,16,0,119,1,
-54,3569,19,118,1,
-54,3570,5,54,1,
-0,3571,16,0,116,
-1,2539,3572,16,0,
-497,1,1860,907,1,
-1804,3573,16,0,116,
-1,10,3574,16,0,
-116,1,2737,3459,1,
-2337,3575,16,0,116,
-1,2413,3576,16,0,
-116,1,2198,3577,16,
-0,116,1,1873,921,
-1,21,3578,16,0,
-116,1,1657,979,1,
-2030,817,1,2032,827,
-1,1989,1002,1,1990,
-3579,16,0,116,1,
-2035,838,1,1775,3580,
-16,0,116,1,32,
-3581,16,0,116,1,
-2105,900,1,2106,3582,
-16,0,116,1,2765,
-3453,1,2553,3583,16,
-0,116,1,2227,993,
-1,1901,3584,16,0,
-116,1,2776,3417,1,
-52,3585,16,0,116,
-1,1803,873,1,2458,
-961,1,2459,967,1,
-2462,974,1,2136,928,
-1,2464,984,1,2029,
-811,1,2466,3447,1,
-2031,822,1,2795,3426,
-1,2796,3432,1,2797,
-3437,1,2798,3442,1,
-2364,913,1,2039,848,
-1,1931,946,1,2041,
-854,1,2021,804,1,
-2043,860,1,2045,865,
-1,2033,832,1,2075,
-3586,16,0,116,1,
-2037,843,1,2777,3587,
-16,0,116,1,1574,
-885,1,1958,3588,16,
-0,116,1,2724,3589,
+926,1,10,3600,16,
+0,119,1,2758,3487,
+1,1901,3601,16,0,
+119,1,2413,3602,16,
+0,119,1,2198,3603,
+16,0,119,1,1873,
+940,1,21,3604,16,
+0,119,1,1657,998,
+1,2030,836,1,1989,
+1020,1,1990,3605,16,
+0,119,1,2458,980,
+1,2459,986,1,1775,
+3606,16,0,119,1,
+32,3607,16,0,119,
+1,2567,3608,16,0,
+119,1,2105,919,1,
+2106,3609,16,0,119,
+1,2227,1012,1,2337,
+3610,16,0,119,1,
+2035,857,1,52,3611,
+16,0,119,1,1803,
+892,1,1804,3612,16,
+0,119,1,2786,3480,
+1,2462,993,1,2136,
+947,1,2464,1003,1,
+2029,830,1,2466,3504,
+1,2031,841,1,2032,
+846,1,2033,851,1,
+2797,3498,1,2798,3613,
+16,0,119,1,2364,
+932,1,2039,867,1,
+1931,965,1,2041,873,
+1,2021,823,1,2043,
+879,1,2045,884,1,
+2816,3464,1,2817,3493,
+1,2818,3470,1,2819,
+3475,1,2037,862,1,
+1574,904,1,1958,3614,
+16,0,119,1,2745,
+3615,16,0,119,1,
+54,3616,19,118,1,
+54,3617,5,54,1,
+0,3618,16,0,116,
+1,2075,3619,16,0,
+116,1,1860,926,1,
+10,3620,16,0,116,
+1,2758,3487,1,1901,
+3621,16,0,116,1,
+2413,3622,16,0,116,
+1,2198,3623,16,0,
+116,1,1873,940,1,
+21,3624,16,0,116,
+1,1657,998,1,2030,
+836,1,1989,1020,1,
+1990,3625,16,0,116,
+1,2458,980,1,2459,
+986,1,1775,3626,16,
+0,116,1,32,3627,
+16,0,116,1,2567,
+3628,16,0,116,1,
+2105,919,1,2106,3629,
+16,0,116,1,2553,
+3630,16,0,732,1,
+2227,1012,1,2337,3631,
+16,0,116,1,2035,
+857,1,52,3632,16,
+0,116,1,1803,892,
+1,1804,3633,16,0,
+116,1,2786,3480,1,
+2462,993,1,2136,947,
+1,2464,1003,1,2029,
+830,1,2466,3504,1,
+2031,841,1,2032,846,
+1,2033,851,1,2797,
+3498,1,2798,3634,16,
+0,116,1,2364,932,
+1,2039,867,1,1931,
+965,1,2041,873,1,
+2021,823,1,2043,879,
+1,2045,884,1,2816,
+3464,1,2817,3493,1,
+2818,3470,1,2819,3475,
+1,2037,862,1,1574,
+904,1,1958,3635,16,
+0,116,1,2745,3636,
 16,0,116,1,55,
-3590,19,115,1,55,
-3591,5,54,1,0,
-3592,16,0,113,1,
-2075,3593,16,0,113,
-1,1860,907,1,1804,
-3594,16,0,113,1,
-10,3595,16,0,113,
-1,2737,3459,1,2337,
-3596,16,0,113,1,
-2413,3597,16,0,113,
-1,2198,3598,16,0,
-113,1,1873,921,1,
-21,3599,16,0,113,
-1,1657,979,1,2030,
-817,1,2032,827,1,
-1989,1002,1,1990,3600,
+3637,19,115,1,55,
+3638,5,56,1,0,
+3639,16,0,113,1,
+2537,3640,16,0,684,
+1,2510,3641,16,0,
+684,1,2075,3642,16,
+0,113,1,1860,926,
+1,10,3643,16,0,
+113,1,2758,3487,1,
+1901,3644,16,0,113,
+1,2413,3645,16,0,
+113,1,2198,3646,16,
+0,113,1,1873,940,
+1,21,3647,16,0,
+113,1,1657,998,1,
+2030,836,1,1989,1020,
+1,1990,3648,16,0,
+113,1,2458,980,1,
+2459,986,1,1775,3649,
+16,0,113,1,32,
+3650,16,0,113,1,
+2567,3651,16,0,113,
+1,2105,919,1,2106,
+3652,16,0,113,1,
+2227,1012,1,2337,3653,
 16,0,113,1,2035,
-838,1,1775,3601,16,
-0,113,1,32,3602,
-16,0,113,1,2105,
-900,1,2106,3603,16,
-0,113,1,2765,3453,
-1,2553,3604,16,0,
-113,1,2227,993,1,
-1901,3605,16,0,113,
-1,2776,3417,1,52,
-3606,16,0,113,1,
-1803,873,1,2458,961,
-1,2459,967,1,2462,
-974,1,2136,928,1,
-2464,984,1,2029,811,
-1,2466,3447,1,2031,
-822,1,2795,3426,1,
-2796,3432,1,2797,3437,
-1,2798,3442,1,2364,
-913,1,2039,848,1,
-1931,946,1,2041,854,
-1,2021,804,1,2043,
-860,1,2045,865,1,
-2033,832,1,2522,3607,
-16,0,467,1,2037,
-843,1,2777,3608,16,
-0,113,1,1574,885,
-1,1958,3609,16,0,
-113,1,2724,3610,16,
-0,113,1,56,3611,
-19,112,1,56,3612,
-5,55,1,0,3613,
-16,0,110,1,2510,
-3614,16,0,662,1,
-2075,3615,16,0,110,
-1,1860,907,1,10,
-3616,16,0,110,1,
-2737,3459,1,2337,3617,
-16,0,110,1,2413,
-3618,16,0,110,1,
-2198,3619,16,0,110,
-1,1873,921,1,21,
-3620,16,0,110,1,
-1657,979,1,2030,817,
-1,2032,827,1,1989,
-1002,1,1990,3621,16,
-0,110,1,2458,961,
-1,1775,3622,16,0,
-110,1,32,3623,16,
-0,110,1,2105,900,
-1,2106,3624,16,0,
-110,1,2765,3453,1,
-2553,3625,16,0,110,
-1,2227,993,1,1901,
-3626,16,0,110,1,
-2776,3417,1,52,3627,
-16,0,110,1,1803,
-873,1,1804,3628,16,
-0,110,1,2459,967,
-1,2462,974,1,2136,
-928,1,2464,984,1,
-2029,811,1,2466,3447,
-1,2031,822,1,2795,
-3426,1,2796,3432,1,
-2797,3437,1,2798,3442,
-1,2364,913,1,2039,
-848,1,1931,946,1,
-2041,854,1,2021,804,
-1,2043,860,1,2045,
-865,1,2514,3629,16,
-0,662,1,2033,832,
-1,2035,838,1,2037,
-843,1,2777,3630,16,
-0,110,1,1574,885,
-1,1958,3631,16,0,
-110,1,2724,3632,16,
-0,110,1,57,3633,
-19,109,1,57,3634,
-5,53,1,0,3635,
-16,0,107,1,2075,
-3636,16,0,107,1,
-1860,907,1,1804,3637,
-16,0,107,1,10,
-3638,16,0,107,1,
-2737,3459,1,2337,3639,
-16,0,107,1,2413,
-3640,16,0,107,1,
-2198,3641,16,0,107,
-1,1873,921,1,21,
-3642,16,0,107,1,
-1657,979,1,2030,817,
-1,2032,827,1,1989,
-1002,1,1990,3643,16,
-0,107,1,2035,838,
-1,1775,3644,16,0,
-107,1,32,3645,16,
-0,107,1,2105,900,
-1,2106,3646,16,0,
-107,1,2765,3453,1,
-2553,3647,16,0,107,
-1,2227,993,1,1901,
-3648,16,0,107,1,
-2776,3417,1,52,3649,
-16,0,107,1,1803,
-873,1,2458,961,1,
-2459,967,1,2462,974,
-1,2136,928,1,2464,
-984,1,2029,811,1,
-2466,3447,1,2031,822,
-1,2795,3426,1,2796,
-3432,1,2797,3437,1,
-2798,3442,1,2364,913,
-1,2039,848,1,1931,
-946,1,2041,854,1,
-2021,804,1,2043,860,
-1,2045,865,1,2033,
-832,1,2037,843,1,
-2777,3650,16,0,107,
-1,1574,885,1,1958,
-3651,16,0,107,1,
-2724,3652,16,0,107,
-1,58,3653,19,356,
-1,58,3654,5,24,
-1,2664,3655,16,0,
-354,1,2546,1761,1,
-2620,1730,1,2621,1735,
-1,2612,1795,1,2618,
-1720,1,2520,1740,1,
-2566,1773,1,2568,3656,
-16,0,354,1,2459,
-967,1,2609,1780,1,
-2610,1785,1,2611,1790,
-1,2464,984,1,2613,
-1800,1,2614,1805,1,
-2616,1709,1,2617,1715,
-1,2470,3657,16,0,
-354,1,2619,1725,1,
-2537,1754,1,2529,1747,
-1,2623,3658,16,0,
-354,1,2551,1767,1,
-59,3659,19,441,1,
-59,3660,5,24,1,
-2664,3661,16,0,439,
-1,2546,1761,1,2620,
-1730,1,2621,1735,1,
-2612,1795,1,2618,1720,
-1,2520,1740,1,2566,
-1773,1,2568,3662,16,
-0,439,1,2459,967,
-1,2609,1780,1,2610,
-1785,1,2611,1790,1,
-2464,984,1,2613,1800,
-1,2614,1805,1,2616,
-1709,1,2617,1715,1,
-2470,3663,16,0,439,
-1,2619,1725,1,2537,
-1754,1,2529,1747,1,
-2623,3664,16,0,439,
-1,2551,1767,1,60,
-3665,19,399,1,60,
-3666,5,24,1,2664,
-3667,16,0,397,1,
-2546,1761,1,2620,1730,
-1,2621,1735,1,2612,
-1795,1,2618,1720,1,
-2520,1740,1,2566,1773,
-1,2568,3668,16,0,
-397,1,2459,967,1,
-2609,1780,1,2610,1785,
-1,2611,1790,1,2464,
-984,1,2613,1800,1,
-2614,1805,1,2616,1709,
-1,2617,1715,1,2470,
-3669,16,0,397,1,
-2619,1725,1,2537,1754,
-1,2529,1747,1,2623,
-3670,16,0,397,1,
-2551,1767,1,61,3671,
-19,644,1,61,3672,
-5,24,1,2664,3673,
-16,0,642,1,2546,
-1761,1,2620,1730,1,
-2621,1735,1,2612,1795,
-1,2618,1720,1,2520,
-1740,1,2566,1773,1,
-2568,3674,16,0,642,
-1,2459,967,1,2609,
-1780,1,2610,1785,1,
-2611,1790,1,2464,984,
-1,2613,1800,1,2614,
-1805,1,2616,1709,1,
-2617,1715,1,2470,3675,
-16,0,642,1,2619,
-1725,1,2537,1754,1,
-2529,1747,1,2623,3676,
-16,0,642,1,2551,
-1767,1,62,3677,19,
-392,1,62,3678,5,
-24,1,2664,3679,16,
-0,390,1,2546,1761,
-1,2620,1730,1,2621,
-1735,1,2612,1795,1,
-2618,1720,1,2520,1740,
-1,2566,1773,1,2568,
-3680,16,0,390,1,
-2459,967,1,2609,1780,
-1,2610,1785,1,2611,
-1790,1,2464,984,1,
-2613,1800,1,2614,1805,
-1,2616,1709,1,2617,
-1715,1,2470,3681,16,
-0,390,1,2619,1725,
-1,2537,1754,1,2529,
-1747,1,2623,3682,16,
-0,390,1,2551,1767,
-1,63,3683,19,389,
-1,63,3684,5,24,
-1,2664,3685,16,0,
-387,1,2546,1761,1,
-2620,1730,1,2621,1735,
-1,2612,1795,1,2618,
-1720,1,2520,1740,1,
-2566,1773,1,2568,3686,
-16,0,387,1,2459,
-967,1,2609,1780,1,
-2610,1785,1,2611,1790,
-1,2464,984,1,2613,
-1800,1,2614,1805,1,
-2616,1709,1,2617,1715,
-1,2470,3687,16,0,
-387,1,2619,1725,1,
-2537,1754,1,2529,1747,
-1,2623,3688,16,0,
-387,1,2551,1767,1,
-64,3689,19,386,1,
-64,3690,5,24,1,
-2664,3691,16,0,384,
-1,2546,1761,1,2620,
-1730,1,2621,1735,1,
-2612,1795,1,2618,1720,
-1,2520,1740,1,2566,
-1773,1,2568,3692,16,
-0,384,1,2459,967,
-1,2609,1780,1,2610,
-1785,1,2611,1790,1,
-2464,984,1,2613,1800,
-1,2614,1805,1,2616,
-1709,1,2617,1715,1,
-2470,3693,16,0,384,
-1,2619,1725,1,2537,
-1754,1,2529,1747,1,
-2623,3694,16,0,384,
-1,2551,1767,1,65,
-3695,19,438,1,65,
-3696,5,24,1,2664,
-3697,16,0,436,1,
-2546,1761,1,2620,1730,
-1,2621,1735,1,2612,
-1795,1,2618,1720,1,
-2520,1740,1,2566,1773,
-1,2568,3698,16,0,
-436,1,2459,967,1,
-2609,1780,1,2610,1785,
-1,2611,1790,1,2464,
-984,1,2613,1800,1,
-2614,1805,1,2616,1709,
-1,2617,1715,1,2470,
-3699,16,0,436,1,
-2619,1725,1,2537,1754,
-1,2529,1747,1,2623,
-3700,16,0,436,1,
-2551,1767,1,66,3701,
-19,435,1,66,3702,
-5,24,1,2664,3703,
-16,0,433,1,2546,
-1761,1,2620,1730,1,
-2621,1735,1,2612,1795,
-1,2618,1720,1,2520,
-1740,1,2566,1773,1,
-2568,3704,16,0,433,
-1,2459,967,1,2609,
-1780,1,2610,1785,1,
-2611,1790,1,2464,984,
-1,2613,1800,1,2614,
-1805,1,2616,1709,1,
-2617,1715,1,2470,3705,
-16,0,433,1,2619,
-1725,1,2537,1754,1,
-2529,1747,1,2623,3706,
-16,0,433,1,2551,
-1767,1,67,3707,19,
-432,1,67,3708,5,
-24,1,2664,3709,16,
-0,430,1,2546,1761,
-1,2620,1730,1,2621,
-1735,1,2612,1795,1,
-2618,1720,1,2520,1740,
-1,2566,1773,1,2568,
-3710,16,0,430,1,
-2459,967,1,2609,1780,
-1,2610,1785,1,2611,
-1790,1,2464,984,1,
-2613,1800,1,2614,1805,
-1,2616,1709,1,2617,
-1715,1,2470,3711,16,
-0,430,1,2619,1725,
-1,2537,1754,1,2529,
-1747,1,2623,3712,16,
-0,430,1,2551,1767,
-1,68,3713,19,429,
-1,68,3714,5,24,
-1,2664,3715,16,0,
-427,1,2546,1761,1,
-2620,1730,1,2621,1735,
-1,2612,1795,1,2618,
-1720,1,2520,1740,1,
-2566,1773,1,2568,3716,
-16,0,427,1,2459,
-967,1,2609,1780,1,
-2610,1785,1,2611,1790,
-1,2464,984,1,2613,
-1800,1,2614,1805,1,
-2616,1709,1,2617,1715,
-1,2470,3717,16,0,
-427,1,2619,1725,1,
-2537,1754,1,2529,1747,
-1,2623,3718,16,0,
-427,1,2551,1767,1,
-69,3719,19,365,1,
-69,3720,5,24,1,
-2664,3721,16,0,363,
-1,2546,1761,1,2620,
-1730,1,2621,1735,1,
-2612,1795,1,2618,1720,
-1,2520,1740,1,2566,
-1773,1,2568,3722,16,
-0,363,1,2459,967,
-1,2609,1780,1,2610,
-1785,1,2611,1790,1,
-2464,984,1,2613,1800,
-1,2614,1805,1,2616,
-1709,1,2617,1715,1,
-2470,3723,16,0,363,
-1,2619,1725,1,2537,
-1754,1,2529,1747,1,
-2623,3724,16,0,363,
-1,2551,1767,1,70,
-3725,19,362,1,70,
-3726,5,24,1,2664,
-3727,16,0,360,1,
-2546,1761,1,2620,1730,
-1,2621,1735,1,2612,
-1795,1,2618,1720,1,
-2520,1740,1,2566,1773,
-1,2568,3728,16,0,
-360,1,2459,967,1,
-2609,1780,1,2610,1785,
-1,2611,1790,1,2464,
-984,1,2613,1800,1,
-2614,1805,1,2616,1709,
-1,2617,1715,1,2470,
-3729,16,0,360,1,
-2619,1725,1,2537,1754,
-1,2529,1747,1,2623,
-3730,16,0,360,1,
-2551,1767,1,71,3731,
-19,359,1,71,3732,
-5,24,1,2664,3733,
-16,0,357,1,2546,
-1761,1,2620,1730,1,
-2621,1735,1,2612,1795,
-1,2618,1720,1,2520,
-1740,1,2566,1773,1,
-2568,3734,16,0,357,
-1,2459,967,1,2609,
-1780,1,2610,1785,1,
-2611,1790,1,2464,984,
-1,2613,1800,1,2614,
-1805,1,2616,1709,1,
-2617,1715,1,2470,3735,
-16,0,357,1,2619,
-1725,1,2537,1754,1,
-2529,1747,1,2623,3736,
-16,0,357,1,2551,
-1767,1,72,3737,19,
-426,1,72,3738,5,
-24,1,2664,3739,16,
-0,424,1,2546,1761,
-1,2620,1730,1,2621,
-1735,1,2612,1795,1,
-2618,1720,1,2520,1740,
-1,2566,1773,1,2568,
-3740,16,0,424,1,
-2459,967,1,2609,1780,
-1,2610,1785,1,2611,
-1790,1,2464,984,1,
-2613,1800,1,2614,1805,
-1,2616,1709,1,2617,
-1715,1,2470,3741,16,
-0,424,1,2619,1725,
-1,2537,1754,1,2529,
-1747,1,2623,3742,16,
-0,424,1,2551,1767,
-1,73,3743,19,730,
-1,73,3744,5,24,
-1,2664,3745,16,0,
-728,1,2546,1761,1,
-2620,1730,1,2621,1735,
-1,2612,1795,1,2618,
-1720,1,2520,1740,1,
-2566,1773,1,2568,3746,
-16,0,728,1,2459,
-967,1,2609,1780,1,
-2610,1785,1,2611,1790,
-1,2464,984,1,2613,
-1800,1,2614,1805,1,
-2616,1709,1,2617,1715,
-1,2470,3747,16,0,
-728,1,2619,1725,1,
-2537,1754,1,2529,1747,
-1,2623,3748,16,0,
-728,1,2551,1767,1,
-74,3749,19,422,1,
-74,3750,5,24,1,
-2664,3751,16,0,420,
-1,2546,1761,1,2620,
-1730,1,2621,1735,1,
-2612,1795,1,2618,1720,
-1,2520,1740,1,2566,
-1773,1,2568,3752,16,
-0,420,1,2459,967,
-1,2609,1780,1,2610,
-1785,1,2611,1790,1,
-2464,984,1,2613,1800,
-1,2614,1805,1,2616,
-1709,1,2617,1715,1,
-2470,3753,16,0,420,
-1,2619,1725,1,2537,
-1754,1,2529,1747,1,
-2623,3754,16,0,420,
-1,2551,1767,1,75,
-3755,19,411,1,75,
-3756,5,24,1,2664,
-3757,16,0,409,1,
-2546,1761,1,2620,1730,
-1,2621,1735,1,2612,
-1795,1,2618,1720,1,
-2520,1740,1,2566,1773,
-1,2568,3758,16,0,
-409,1,2459,967,1,
-2609,1780,1,2610,1785,
-1,2611,1790,1,2464,
-984,1,2613,1800,1,
-2614,1805,1,2616,1709,
-1,2617,1715,1,2470,
-3759,16,0,409,1,
-2619,1725,1,2537,1754,
-1,2529,1747,1,2623,
-3760,16,0,409,1,
-2551,1767,1,76,3761,
-19,534,1,76,3762,
-5,24,1,2664,3763,
-16,0,532,1,2546,
-1761,1,2620,1730,1,
-2621,1735,1,2612,1795,
-1,2618,1720,1,2520,
-1740,1,2566,1773,1,
-2568,3764,16,0,532,
-1,2459,967,1,2609,
-1780,1,2610,1785,1,
-2611,1790,1,2464,984,
-1,2613,1800,1,2614,
-1805,1,2616,1709,1,
-2617,1715,1,2470,3765,
-16,0,532,1,2619,
-1725,1,2537,1754,1,
-2529,1747,1,2623,3766,
-16,0,532,1,2551,
-1767,1,77,3767,19,
-531,1,77,3768,5,
-24,1,2664,3769,16,
-0,529,1,2546,1761,
-1,2620,1730,1,2621,
-1735,1,2612,1795,1,
-2618,1720,1,2520,1740,
-1,2566,1773,1,2568,
-3770,16,0,529,1,
-2459,967,1,2609,1780,
-1,2610,1785,1,2611,
-1790,1,2464,984,1,
-2613,1800,1,2614,1805,
-1,2616,1709,1,2617,
-1715,1,2470,3771,16,
-0,529,1,2619,1725,
-1,2537,1754,1,2529,
-1747,1,2623,3772,16,
-0,529,1,2551,1767,
-1,78,3773,19,528,
-1,78,3774,5,24,
-1,2664,3775,16,0,
-526,1,2546,1761,1,
-2620,1730,1,2621,1735,
-1,2612,1795,1,2618,
-1720,1,2520,1740,1,
-2566,1773,1,2568,3776,
-16,0,526,1,2459,
-967,1,2609,1780,1,
-2610,1785,1,2611,1790,
-1,2464,984,1,2613,
-1800,1,2614,1805,1,
-2616,1709,1,2617,1715,
-1,2470,3777,16,0,
-526,1,2619,1725,1,
-2537,1754,1,2529,1747,
-1,2623,3778,16,0,
-526,1,2551,1767,1,
-79,3779,19,525,1,
-79,3780,5,24,1,
-2664,3781,16,0,523,
-1,2546,1761,1,2620,
-1730,1,2621,1735,1,
-2612,1795,1,2618,1720,
-1,2520,1740,1,2566,
-1773,1,2568,3782,16,
-0,523,1,2459,967,
-1,2609,1780,1,2610,
-1785,1,2611,1790,1,
-2464,984,1,2613,1800,
-1,2614,1805,1,2616,
-1709,1,2617,1715,1,
-2470,3783,16,0,523,
-1,2619,1725,1,2537,
-1754,1,2529,1747,1,
-2623,3784,16,0,523,
-1,2551,1767,1,80,
-3785,19,521,1,80,
-3786,5,24,1,2664,
-3787,16,0,519,1,
-2546,1761,1,2620,1730,
-1,2621,1735,1,2612,
-1795,1,2618,1720,1,
-2520,1740,1,2566,1773,
-1,2568,3788,16,0,
-519,1,2459,967,1,
-2609,1780,1,2610,1785,
-1,2611,1790,1,2464,
-984,1,2613,1800,1,
-2614,1805,1,2616,1709,
-1,2617,1715,1,2470,
-3789,16,0,519,1,
-2619,1725,1,2537,1754,
-1,2529,1747,1,2623,
-3790,16,0,519,1,
-2551,1767,1,81,3791,
-19,383,1,81,3792,
-5,24,1,2664,3793,
-16,0,381,1,2546,
-1761,1,2620,1730,1,
-2621,1735,1,2612,1795,
-1,2618,1720,1,2520,
-1740,1,2566,1773,1,
-2568,3794,16,0,381,
-1,2459,967,1,2609,
-1780,1,2610,1785,1,
-2611,1790,1,2464,984,
-1,2613,1800,1,2614,
-1805,1,2616,1709,1,
-2617,1715,1,2470,3795,
-16,0,381,1,2619,
-1725,1,2537,1754,1,
-2529,1747,1,2623,3796,
-16,0,381,1,2551,
-1767,1,82,3797,19,
-544,1,82,3798,5,
-24,1,2664,3799,16,
-0,542,1,2546,1761,
-1,2620,1730,1,2621,
-1735,1,2612,1795,1,
-2618,1720,1,2520,1740,
-1,2566,1773,1,2568,
-3800,16,0,542,1,
-2459,967,1,2609,1780,
-1,2610,1785,1,2611,
-1790,1,2464,984,1,
-2613,1800,1,2614,1805,
-1,2616,1709,1,2617,
-1715,1,2470,3801,16,
-0,542,1,2619,1725,
-1,2537,1754,1,2529,
-1747,1,2623,3802,16,
-0,542,1,2551,1767,
-1,83,3803,19,380,
-1,83,3804,5,24,
-1,2664,3805,16,0,
-378,1,2546,1761,1,
-2620,1730,1,2621,1735,
-1,2612,1795,1,2618,
-1720,1,2520,1740,1,
-2566,1773,1,2568,3806,
-16,0,378,1,2459,
-967,1,2609,1780,1,
-2610,1785,1,2611,1790,
-1,2464,984,1,2613,
-1800,1,2614,1805,1,
-2616,1709,1,2617,1715,
-1,2470,3807,16,0,
-378,1,2619,1725,1,
-2537,1754,1,2529,1747,
-1,2623,3808,16,0,
-378,1,2551,1767,1,
-84,3809,19,377,1,
-84,3810,5,24,1,
-2664,3811,16,0,375,
-1,2546,1761,1,2620,
-1730,1,2621,1735,1,
-2612,1795,1,2618,1720,
-1,2520,1740,1,2566,
-1773,1,2568,3812,16,
-0,375,1,2459,967,
-1,2609,1780,1,2610,
-1785,1,2611,1790,1,
-2464,984,1,2613,1800,
-1,2614,1805,1,2616,
-1709,1,2617,1715,1,
-2470,3813,16,0,375,
-1,2619,1725,1,2537,
-1754,1,2529,1747,1,
-2623,3814,16,0,375,
-1,2551,1767,1,85,
-3815,19,415,1,85,
-3816,5,24,1,2664,
-3817,16,0,413,1,
-2546,1761,1,2620,1730,
-1,2621,1735,1,2612,
-1795,1,2618,1720,1,
-2520,1740,1,2566,1773,
-1,2568,3818,16,0,
-413,1,2459,967,1,
-2609,1780,1,2610,1785,
-1,2611,1790,1,2464,
-984,1,2613,1800,1,
-2614,1805,1,2616,1709,
-1,2617,1715,1,2470,
-3819,16,0,413,1,
-2619,1725,1,2537,1754,
-1,2529,1747,1,2623,
-3820,16,0,413,1,
-2551,1767,1,86,3821,
-19,537,1,86,3822,
-5,24,1,2664,3823,
-16,0,535,1,2546,
-1761,1,2620,1730,1,
-2621,1735,1,2612,1795,
-1,2618,1720,1,2520,
-1740,1,2566,1773,1,
-2568,3824,16,0,535,
-1,2459,967,1,2609,
-1780,1,2610,1785,1,
-2611,1790,1,2464,984,
-1,2613,1800,1,2614,
-1805,1,2616,1709,1,
-2617,1715,1,2470,3825,
-16,0,535,1,2619,
-1725,1,2537,1754,1,
-2529,1747,1,2623,3826,
-16,0,535,1,2551,
-1767,1,87,3827,19,
-402,1,87,3828,5,
-24,1,2664,3829,16,
-0,400,1,2546,1761,
-1,2620,1730,1,2621,
-1735,1,2612,1795,1,
-2618,1720,1,2520,1740,
-1,2566,1773,1,2568,
-3830,16,0,400,1,
-2459,967,1,2609,1780,
-1,2610,1785,1,2611,
-1790,1,2464,984,1,
-2613,1800,1,2614,1805,
-1,2616,1709,1,2617,
-1715,1,2470,3831,16,
-0,400,1,2619,1725,
-1,2537,1754,1,2529,
-1747,1,2623,3832,16,
-0,400,1,2551,1767,
-1,88,3833,19,374,
-1,88,3834,5,24,
-1,2664,3835,16,0,
-372,1,2546,1761,1,
-2620,1730,1,2621,1735,
-1,2612,1795,1,2618,
-1720,1,2520,1740,1,
-2566,1773,1,2568,3836,
-16,0,372,1,2459,
-967,1,2609,1780,1,
-2610,1785,1,2611,1790,
-1,2464,984,1,2613,
-1800,1,2614,1805,1,
-2616,1709,1,2617,1715,
-1,2470,3837,16,0,
-372,1,2619,1725,1,
-2537,1754,1,2529,1747,
-1,2623,3838,16,0,
-372,1,2551,1767,1,
-89,3839,19,368,1,
-89,3840,5,24,1,
-2664,3841,16,0,366,
-1,2546,1761,1,2620,
-1730,1,2621,1735,1,
-2612,1795,1,2618,1720,
-1,2520,1740,1,2566,
-1773,1,2568,3842,16,
-0,366,1,2459,967,
-1,2609,1780,1,2610,
-1785,1,2611,1790,1,
-2464,984,1,2613,1800,
-1,2614,1805,1,2616,
-1709,1,2617,1715,1,
-2470,3843,16,0,366,
-1,2619,1725,1,2537,
-1754,1,2529,1747,1,
-2623,3844,16,0,366,
-1,2551,1767,1,90,
-3845,19,371,1,90,
-3846,5,24,1,2664,
-3847,16,0,369,1,
-2546,1761,1,2620,1730,
-1,2621,1735,1,2612,
-1795,1,2618,1720,1,
-2520,1740,1,2566,1773,
-1,2568,3848,16,0,
-369,1,2459,967,1,
-2609,1780,1,2610,1785,
-1,2611,1790,1,2464,
-984,1,2613,1800,1,
-2614,1805,1,2616,1709,
-1,2617,1715,1,2470,
-3849,16,0,369,1,
-2619,1725,1,2537,1754,
-1,2529,1747,1,2623,
-3850,16,0,369,1,
-2551,1767,1,91,3851,
-19,418,1,91,3852,
-5,24,1,2664,3853,
-16,0,416,1,2546,
-1761,1,2620,1730,1,
-2621,1735,1,2612,1795,
-1,2618,1720,1,2520,
-1740,1,2566,1773,1,
-2568,3854,16,0,416,
-1,2459,967,1,2609,
-1780,1,2610,1785,1,
-2611,1790,1,2464,984,
-1,2613,1800,1,2614,
-1805,1,2616,1709,1,
-2617,1715,1,2470,3855,
-16,0,416,1,2619,
-1725,1,2537,1754,1,
-2529,1747,1,2623,3856,
-16,0,416,1,2551,
-1767,1,92,3857,19,
-133,1,92,3858,5,
-129,1,0,3859,16,
-0,714,1,1,2146,
-1,2,2152,1,3,
-2157,1,4,2162,1,
-5,2167,1,6,2172,
-1,7,2177,1,8,
-3860,16,0,131,1,
-1515,3861,16,0,176,
-1,2523,3862,16,0,
-468,1,2022,3863,16,
-0,548,1,256,3864,
-16,0,184,1,2777,
-3865,16,0,714,1,
-2025,3866,16,0,552,
-1,18,3867,16,0,
-148,1,2027,3868,16,
-0,556,1,2029,811,
-1,2030,817,1,2031,
-822,1,2032,827,1,
-2033,832,1,277,3869,
-16,0,184,1,2035,
-838,1,2037,843,1,
-2540,3870,16,0,498,
-1,2039,848,1,32,
-3871,16,0,176,1,
-2041,854,1,2795,3426,
-1,2796,3432,1,2797,
-3437,1,2798,3442,1,
-41,3872,16,0,184,
-1,1297,3873,16,0,
-176,1,43,3874,16,
-0,184,1,46,3875,
-16,0,189,1,1804,
-3876,16,0,176,1,
-299,3877,16,0,184,
-1,52,3878,16,0,
-176,1,509,3879,16,
-0,184,1,2318,3880,
-16,0,176,1,62,
-3881,16,0,206,1,
-65,3882,16,0,208,
-1,2075,3883,16,0,
-176,1,1574,885,1,
-71,3884,16,0,184,
-1,1775,3885,16,0,
-176,1,76,3886,16,
-0,184,1,1834,3887,
-16,0,176,1,2337,
-3888,16,0,176,1,
-79,3889,16,0,184,
-1,1335,3890,16,0,
-176,1,2511,3891,16,
-0,453,1,322,3892,
-16,0,184,1,85,
-3893,16,0,184,1,
-1261,3894,16,0,176,
-1,89,3895,16,0,
-184,1,2765,3453,1,
-346,3896,16,0,184,
-1,97,3897,16,0,
-184,1,2106,3898,16,
-0,176,1,2043,860,
-1,102,3899,16,0,
-184,1,1860,907,1,
-1803,873,1,2364,913,
-1,2293,3900,16,0,
-184,1,1113,3901,16,
-0,168,1,112,3902,
-16,0,184,1,1117,
-3903,16,0,176,1,
-1873,921,1,1876,3904,
-16,0,176,1,372,
-3905,16,0,586,1,
-374,3906,16,0,588,
-1,124,3907,16,0,
-184,1,376,3908,16,
-0,590,1,378,3909,
-16,0,592,1,2136,
-928,1,381,3910,16,
-0,184,1,525,3911,
-16,0,184,1,137,
-3912,16,0,184,1,
-2021,804,1,1901,3913,
-16,0,176,1,1153,
-3914,16,0,176,1,
-151,3915,16,0,184,
-1,1407,3916,16,0,
-176,1,1659,3917,16,
-0,176,1,2413,3918,
-16,0,176,1,406,
-3919,16,0,184,1,
-1371,3920,16,0,176,
-1,2105,900,1,166,
-3921,16,0,184,1,
-2045,865,1,1622,3922,
-16,0,184,1,1931,
-946,1,1933,3923,16,
-0,176,1,431,3924,
-16,0,184,1,1585,
-3925,16,0,184,1,
-182,3926,16,0,184,
-1,1189,3927,16,0,
-176,1,1443,3928,16,
-0,176,1,1695,3929,
-16,0,176,1,2198,
-3930,16,0,176,1,
-2776,3417,1,447,3931,
-16,0,184,1,2458,
-961,1,2459,967,1,
-1958,3932,16,0,176,
-1,2462,974,1,1657,
-979,1,2464,984,1,
-2466,3447,1,459,3933,
-16,0,184,1,2468,
-3934,16,0,352,1,
-462,3935,16,0,184,
-1,199,3936,16,0,
-184,1,217,3937,16,
-0,184,1,2227,993,
-1,1225,3938,16,0,
-176,1,1479,3939,16,
-0,176,1,1731,3940,
-16,0,184,1,2737,
-3459,1,2740,3941,16,
-0,184,1,1989,1002,
-1,1990,3942,16,0,
-176,1,236,3943,16,
-0,184,1,2507,3944,
-16,0,447,1,1756,
-3945,16,0,176,1,
-93,3946,19,702,1,
-93,3947,5,95,1,
-256,3948,16,0,700,
-1,1261,3949,16,0,
-700,1,509,3950,16,
-0,700,1,1515,3951,
-16,0,700,1,2021,
-804,1,1775,3952,16,
-0,700,1,2029,811,
-1,2030,817,1,2031,
-822,1,2032,827,1,
-2033,832,1,277,3953,
-16,0,700,1,2035,
-838,1,2037,843,1,
-2039,848,1,32,3954,
-16,0,700,1,2041,
-854,1,2293,3955,16,
-0,700,1,2043,860,
-1,2045,865,1,41,
-3956,16,0,700,1,
-1297,3957,16,0,700,
-1,43,3958,16,0,
-700,1,1803,873,1,
-1804,3959,16,0,700,
-1,299,3960,16,0,
-700,1,52,3961,16,
-0,700,1,2318,3962,
-16,0,700,1,62,
-3963,16,0,700,1,
-2075,3964,16,0,700,
-1,1574,885,1,71,
-3965,16,0,700,1,
-76,3966,16,0,700,
-1,1834,3967,16,0,
-700,1,2337,3968,16,
-0,700,1,79,3969,
-16,0,700,1,1335,
-3970,16,0,700,1,
-322,3971,16,0,700,
-1,85,3972,16,0,
-700,1,89,3973,16,
-0,700,1,346,3974,
-16,0,700,1,2105,
-900,1,2106,3975,16,
-0,700,1,97,3976,
-16,0,700,1,1860,
-907,1,2364,913,1,
-102,3977,16,0,700,
-1,112,3978,16,0,
-700,1,1117,3979,16,
-0,700,1,1873,921,
-1,1876,3980,16,0,
-700,1,124,3981,16,
-0,700,1,2136,928,
-1,381,3982,16,0,
-700,1,525,3983,16,
-0,700,1,137,3984,
-16,0,700,1,1901,
-3985,16,0,700,1,
-1153,3986,16,0,700,
-1,151,3987,16,0,
-700,1,1407,3988,16,
-0,700,1,1659,3989,
-16,0,700,1,2413,
-3990,16,0,700,1,
-406,3991,16,0,700,
-1,1371,3992,16,0,
-700,1,166,3993,16,
-0,700,1,1622,3994,
-16,0,700,1,1931,
-946,1,1933,3995,16,
-0,700,1,431,3996,
-16,0,700,1,1585,
-3997,16,0,700,1,
-182,3998,16,0,700,
-1,1189,3999,16,0,
-700,1,1443,4000,16,
-0,700,1,1695,4001,
-16,0,700,1,2198,
-4002,16,0,700,1,
-447,4003,16,0,700,
-1,2458,961,1,2459,
-967,1,1958,4004,16,
-0,700,1,2462,974,
-1,1657,979,1,2464,
-984,1,199,4005,16,
-0,700,1,459,4006,
-16,0,700,1,462,
-4007,16,0,700,1,
-217,4008,16,0,700,
-1,2227,993,1,1225,
-4009,16,0,700,1,
-1479,4010,16,0,700,
-1,1731,4011,16,0,
-700,1,2740,4012,16,
-0,700,1,1989,1002,
-1,1990,4013,16,0,
-700,1,236,4014,16,
-0,700,1,1756,4015,
-16,0,700,1,94,
-4016,19,699,1,94,
-4017,5,95,1,256,
-4018,16,0,697,1,
-1261,4019,16,0,697,
-1,509,4020,16,0,
-697,1,1515,4021,16,
-0,697,1,2021,804,
-1,1775,4022,16,0,
-697,1,2029,811,1,
-2030,817,1,2031,822,
-1,2032,827,1,2033,
-832,1,277,4023,16,
-0,697,1,2035,838,
-1,2037,843,1,2039,
-848,1,32,4024,16,
-0,697,1,2041,854,
-1,2293,4025,16,0,
-697,1,2043,860,1,
-2045,865,1,41,4026,
-16,0,697,1,1297,
-4027,16,0,697,1,
-43,4028,16,0,697,
-1,1803,873,1,1804,
-4029,16,0,697,1,
-299,4030,16,0,697,
-1,52,4031,16,0,
-697,1,2318,4032,16,
-0,697,1,62,4033,
-16,0,697,1,2075,
-4034,16,0,697,1,
-1574,885,1,71,4035,
-16,0,697,1,76,
-4036,16,0,697,1,
-1834,4037,16,0,697,
-1,2337,4038,16,0,
-697,1,79,4039,16,
-0,697,1,1335,4040,
-16,0,697,1,322,
-4041,16,0,697,1,
-85,4042,16,0,697,
-1,89,4043,16,0,
-697,1,346,4044,16,
-0,697,1,2105,900,
-1,2106,4045,16,0,
-697,1,97,4046,16,
-0,697,1,1860,907,
-1,2364,913,1,102,
-4047,16,0,697,1,
-112,4048,16,0,697,
-1,1117,4049,16,0,
-697,1,1873,921,1,
-1876,4050,16,0,697,
-1,124,4051,16,0,
-697,1,2136,928,1,
-381,4052,16,0,697,
-1,525,4053,16,0,
-697,1,137,4054,16,
-0,697,1,1901,4055,
-16,0,697,1,1153,
-4056,16,0,697,1,
-151,4057,16,0,697,
-1,1407,4058,16,0,
-697,1,1659,4059,16,
-0,697,1,2413,4060,
-16,0,697,1,406,
-4061,16,0,697,1,
-1371,4062,16,0,697,
-1,166,4063,16,0,
-697,1,1622,4064,16,
-0,697,1,1931,946,
-1,1933,4065,16,0,
-697,1,431,4066,16,
-0,697,1,1585,4067,
-16,0,697,1,182,
-4068,16,0,697,1,
-1189,4069,16,0,697,
-1,1443,4070,16,0,
-697,1,1695,4071,16,
-0,697,1,2198,4072,
-16,0,697,1,447,
-4073,16,0,697,1,
-2458,961,1,2459,967,
-1,1958,4074,16,0,
-697,1,2462,974,1,
-1657,979,1,2464,984,
-1,199,4075,16,0,
-697,1,459,4076,16,
-0,697,1,462,4077,
-16,0,697,1,217,
-4078,16,0,697,1,
-2227,993,1,1225,4079,
-16,0,697,1,1479,
-4080,16,0,697,1,
-1731,4081,16,0,697,
-1,2740,4082,16,0,
-697,1,1989,1002,1,
-1990,4083,16,0,697,
-1,236,4084,16,0,
-697,1,1756,4085,16,
-0,697,1,95,4086,
-19,696,1,95,4087,
-5,95,1,256,4088,
-16,0,694,1,1261,
-4089,16,0,694,1,
-509,4090,16,0,694,
-1,1515,4091,16,0,
-694,1,2021,804,1,
-1775,4092,16,0,694,
-1,2029,811,1,2030,
-817,1,2031,822,1,
-2032,827,1,2033,832,
-1,277,4093,16,0,
-694,1,2035,838,1,
-2037,843,1,2039,848,
-1,32,4094,16,0,
-694,1,2041,854,1,
-2293,4095,16,0,694,
-1,2043,860,1,2045,
-865,1,41,4096,16,
-0,694,1,1297,4097,
-16,0,694,1,43,
-4098,16,0,694,1,
-1803,873,1,1804,4099,
-16,0,694,1,299,
-4100,16,0,694,1,
-52,4101,16,0,694,
-1,2318,4102,16,0,
-694,1,62,4103,16,
-0,694,1,2075,4104,
-16,0,694,1,1574,
-885,1,71,4105,16,
-0,694,1,76,4106,
-16,0,694,1,1834,
-4107,16,0,694,1,
-2337,4108,16,0,694,
-1,79,4109,16,0,
-694,1,1335,4110,16,
-0,694,1,322,4111,
-16,0,694,1,85,
-4112,16,0,694,1,
-89,4113,16,0,694,
-1,346,4114,16,0,
-694,1,2105,900,1,
-2106,4115,16,0,694,
-1,97,4116,16,0,
-694,1,1860,907,1,
-2364,913,1,102,4117,
-16,0,694,1,112,
-4118,16,0,694,1,
-1117,4119,16,0,694,
-1,1873,921,1,1876,
-4120,16,0,694,1,
-124,4121,16,0,694,
-1,2136,928,1,381,
-4122,16,0,694,1,
-525,4123,16,0,694,
-1,137,4124,16,0,
-694,1,1901,4125,16,
-0,694,1,1153,4126,
-16,0,694,1,151,
-4127,16,0,694,1,
-1407,4128,16,0,694,
-1,1659,4129,16,0,
-694,1,2413,4130,16,
-0,694,1,406,4131,
-16,0,694,1,1371,
-4132,16,0,694,1,
-166,4133,16,0,694,
-1,1622,4134,16,0,
-694,1,1931,946,1,
-1933,4135,16,0,694,
-1,431,4136,16,0,
-694,1,1585,4137,16,
-0,694,1,182,4138,
-16,0,694,1,1189,
-4139,16,0,694,1,
-1443,4140,16,0,694,
-1,1695,4141,16,0,
-694,1,2198,4142,16,
-0,694,1,447,4143,
-16,0,694,1,2458,
-961,1,2459,967,1,
-1958,4144,16,0,694,
-1,2462,974,1,1657,
-979,1,2464,984,1,
-199,4145,16,0,694,
-1,459,4146,16,0,
-694,1,462,4147,16,
-0,694,1,217,4148,
-16,0,694,1,2227,
-993,1,1225,4149,16,
-0,694,1,1479,4150,
-16,0,694,1,1731,
-4151,16,0,694,1,
-2740,4152,16,0,694,
-1,1989,1002,1,1990,
-4153,16,0,694,1,
-236,4154,16,0,694,
-1,1756,4155,16,0,
-694,1,96,4156,19,
-103,1,96,4157,5,
-1,1,0,4158,16,
-0,104,1,97,4159,
-19,758,1,97,4160,
-5,1,1,0,4161,
-16,0,756,1,98,
-4162,19,139,1,98,
-4163,5,2,1,0,
-4164,16,0,143,1,
-2777,4165,16,0,137,
-1,99,4166,19,142,
-1,99,4167,5,2,
-1,0,4168,16,0,
-140,1,2777,4169,16,
-0,248,1,100,4170,
-19,243,1,100,4171,
-5,2,1,0,4172,
-16,0,708,1,2777,
-4173,16,0,241,1,
-101,4174,19,712,1,
-101,4175,5,4,1,
-0,4176,16,0,713,
-1,2718,4177,16,0,
-710,1,2777,4178,16,
-0,713,1,2788,4179,
-16,0,710,1,102,
-4180,19,722,1,102,
-4181,5,2,1,2623,
-4182,16,0,739,1,
-2470,4183,16,0,720,
-1,103,4184,19,622,
-1,103,4185,5,4,
-1,2664,4186,16,0,
-685,1,2623,4187,16,
-0,620,1,2470,4188,
-16,0,620,1,2568,
-4189,16,0,685,1,
-104,4190,19,619,1,
-104,4191,5,4,1,
-2664,4192,16,0,684,
-1,2623,4193,16,0,
-617,1,2470,4194,16,
-0,617,1,2568,4195,
-16,0,684,1,105,
-4196,19,616,1,105,
-4197,5,4,1,2664,
-4198,16,0,683,1,
-2623,4199,16,0,614,
-1,2470,4200,16,0,
-614,1,2568,4201,16,
-0,683,1,106,4202,
-19,602,1,106,4203,
-5,4,1,2664,4204,
-16,0,600,1,2623,
-4205,16,0,690,1,
-2470,4206,16,0,690,
-1,2568,4207,16,0,
-600,1,107,4208,19,
-599,1,107,4209,5,
-4,1,2664,4210,16,
-0,597,1,2623,4211,
-16,0,612,1,2470,
-4212,16,0,612,1,
-2568,4213,16,0,597,
-1,108,4214,19,611,
-1,108,4215,5,4,
-1,2664,4216,16,0,
-754,1,2623,4217,16,
-0,609,1,2470,4218,
-16,0,609,1,2568,
-4219,16,0,754,1,
-109,4220,19,151,1,
-109,4221,5,3,1,
-2553,4222,16,0,517,
-1,2724,4223,16,0,
-723,1,10,4224,16,
-0,149,1,110,4225,
-19,629,1,110,4226,
-5,1,1,2539,4227,
-16,0,627,1,111,
-4228,19,487,1,111,
-4229,5,1,1,2531,
-4230,16,0,485,1,
-112,4231,19,474,1,
-112,4232,5,1,1,
-2522,4233,16,0,472,
-1,113,4234,19,462,
-1,113,4235,5,1,
-1,2506,4236,16,0,
-460,1,114,4237,19,
-161,1,114,4238,5,
-17,1,0,4239,16,
-0,731,1,2777,4240,
-16,0,731,1,2075,
-4241,16,0,725,1,
-2337,4242,16,0,725,
-1,2413,4243,16,0,
-725,1,2553,4244,16,
-0,348,1,10,4245,
-16,0,348,1,1901,
-4246,16,0,725,1,
-2198,4247,16,0,725,
-1,21,4248,16,0,
-159,1,2106,4249,16,
-0,725,1,2724,4250,
-16,0,348,1,1804,
-4251,16,0,725,1,
-1990,4252,16,0,725,
-1,32,4253,16,0,
-725,1,1958,4254,16,
-0,725,1,1775,4255,
-16,0,725,1,115,
-4256,19,501,1,115,
-4257,5,1,1,2539,
-4258,16,0,499,1,
-116,4259,19,450,1,
-116,4260,5,2,1,
-2531,4261,16,0,607,
-1,2506,4262,16,0,
-448,1,117,4263,19,
-471,1,117,4264,5,
-1,1,2522,4265,16,
-0,469,1,118,4266,
-19,456,1,118,4267,
-5,2,1,2510,4268,
-16,0,454,1,2514,
-4269,16,0,459,1,
-119,4270,19,130,1,
-119,4271,5,18,1,
-0,4272,16,0,128,
-1,2777,4273,16,0,
-128,1,2075,4274,16,
-0,147,1,2337,4275,
-16,0,147,1,2413,
-4276,16,0,147,1,
-2553,4277,16,0,147,
-1,10,4278,16,0,
-147,1,2198,4279,16,
-0,147,1,1901,4280,
-16,0,147,1,52,
-4281,16,0,204,1,
-21,4282,16,0,147,
-1,2106,4283,16,0,
-147,1,2724,4284,16,
-0,147,1,1804,4285,
-16,0,147,1,1990,
-4286,16,0,147,1,
-32,4287,16,0,147,
-1,1958,4288,16,0,
-147,1,1775,4289,16,
-0,147,1,120,4290,
-19,638,1,120,4291,
-5,4,1,2664,4292,
-16,0,636,1,2623,
-4293,16,0,636,1,
-2470,4294,16,0,636,
-1,2568,4295,16,0,
-636,1,121,4296,19,
-236,1,121,4297,5,
-4,1,2664,4298,16,
-0,234,1,2623,4299,
-16,0,234,1,2470,
-4300,16,0,234,1,
-2568,4301,16,0,234,
-1,122,4302,19,495,
-1,122,4303,5,4,
-1,2664,4304,16,0,
-493,1,2623,4305,16,
-0,493,1,2470,4306,
-16,0,493,1,2568,
-4307,16,0,493,1,
-123,4308,19,482,1,
-123,4309,5,4,1,
-2664,4310,16,0,480,
-1,2623,4311,16,0,
-480,1,2470,4312,16,
-0,480,1,2568,4313,
-16,0,480,1,124,
-4314,19,746,1,124,
-4315,5,4,1,2664,
-4316,16,0,744,1,
-2623,4317,16,0,744,
-1,2470,4318,16,0,
-744,1,2568,4319,16,
-0,744,1,125,4320,
-19,737,1,125,4321,
-5,4,1,2664,4322,
-16,0,735,1,2623,
-4323,16,0,735,1,
-2470,4324,16,0,735,
-1,2568,4325,16,0,
-735,1,126,4326,19,
-271,1,126,4327,5,
-19,1,2544,4328,16,
-0,630,1,2518,4329,
-16,0,666,1,2075,
-4330,16,0,557,1,
-2337,4331,16,0,557,
-1,2413,4332,16,0,
-557,1,2527,4333,16,
-0,479,1,1901,4334,
-16,0,557,1,2198,
-4335,16,0,557,1,
-2535,4336,16,0,613,
-1,2564,4337,16,0,
-522,1,2106,4338,16,
-0,557,1,1958,4339,
-16,0,557,1,1804,
-4340,16,0,557,1,
-1990,4341,16,0,557,
-1,31,4342,16,0,
-347,1,32,4343,16,
-0,557,1,2549,4344,
-16,0,511,1,2735,
-4345,16,0,269,1,
-1775,4346,16,0,557,
-1,127,4347,19,317,
-1,127,4348,5,1,
-1,32,4349,16,0,
-315,1,128,4350,19,
-275,1,128,4351,5,
-11,1,2075,4352,16,
-0,653,1,2337,4353,
-16,0,279,1,2413,
-4354,16,0,489,1,
-1901,4355,16,0,403,
-1,2198,4356,16,0,
-333,1,2106,4357,16,
-0,682,1,1804,4358,
-16,0,300,1,1990,
-4359,16,0,545,1,
-32,4360,16,0,343,
-1,1958,4361,16,0,
-504,1,1775,4362,16,
-0,273,1,129,4363,
-19,659,1,129,4364,
-5,11,1,2075,4365,
-16,0,657,1,2337,
-4366,16,0,657,1,
-2413,4367,16,0,657,
-1,1901,4368,16,0,
-657,1,2198,4369,16,
-0,657,1,2106,4370,
-16,0,657,1,1804,
-4371,16,0,657,1,
-1990,4372,16,0,657,
-1,32,4373,16,0,
-657,1,1958,4374,16,
-0,657,1,1775,4375,
-16,0,657,1,130,
-4376,19,718,1,130,
-4377,5,11,1,2075,
-4378,16,0,716,1,
-2337,4379,16,0,716,
-1,2413,4380,16,0,
-716,1,1901,4381,16,
-0,716,1,2198,4382,
-16,0,716,1,2106,
-4383,16,0,716,1,
-1804,4384,16,0,716,
-1,1990,4385,16,0,
-716,1,32,4386,16,
-0,716,1,1958,4387,
-16,0,716,1,1775,
-4388,16,0,716,1,
-131,4389,19,172,1,
-131,4390,5,31,1,
-1901,4391,16,0,724,
-1,1479,4392,16,0,
-631,1,2075,4393,16,
-0,724,1,1695,4394,
-16,0,200,1,1756,
-4395,16,0,199,1,
-2413,4396,16,0,724,
-1,2198,4397,16,0,
-724,1,1876,4398,16,
-0,741,1,1659,4399,
-16,0,199,1,1443,
-4400,16,0,573,1,
-1117,4401,16,0,170,
-1,1990,4402,16,0,
-724,1,1189,4403,16,
-0,255,1,1775,4404,
-16,0,724,1,32,
-4405,16,0,724,1,
-2106,4406,16,0,724,
-1,1515,4407,16,0,
-655,1,2337,4408,16,
-0,724,1,52,4409,
-16,0,667,1,1804,
-4410,16,0,724,1,
-1261,4411,16,0,311,
-1,1153,4412,16,0,
-262,1,1225,4413,16,
-0,289,1,1335,4414,
-16,0,478,1,1933,
-4415,16,0,634,1,
-1834,4416,16,0,327,
-1,1297,4417,16,0,
-337,1,1407,4418,16,
-0,647,1,2318,4419,
-16,0,199,1,1958,
-4420,16,0,724,1,
-1371,4421,16,0,464,
-1,132,4422,19,582,
-1,132,4423,5,11,
-1,2075,4424,16,0,
-580,1,2337,4425,16,
-0,580,1,2413,4426,
-16,0,580,1,1901,
-4427,16,0,580,1,
-2198,4428,16,0,580,
-1,2106,4429,16,0,
-580,1,1804,4430,16,
-0,580,1,1990,4431,
-16,0,580,1,32,
-4432,16,0,580,1,
-1958,4433,16,0,580,
-1,1775,4434,16,0,
-580,1,133,4435,19,
-578,1,133,4436,5,
-11,1,2075,4437,16,
-0,576,1,2337,4438,
-16,0,576,1,2413,
-4439,16,0,576,1,
-1901,4440,16,0,576,
-1,2198,4441,16,0,
-576,1,2106,4442,16,
-0,576,1,1804,4443,
-16,0,576,1,1990,
-4444,16,0,576,1,
-32,4445,16,0,576,
-1,1958,4446,16,0,
-576,1,1775,4447,16,
-0,576,1,134,4448,
-19,651,1,134,4449,
-5,11,1,2075,4450,
-16,0,649,1,2337,
-4451,16,0,649,1,
-2413,4452,16,0,649,
-1,1901,4453,16,0,
-649,1,2198,4454,16,
-0,649,1,2106,4455,
-16,0,649,1,1804,
-4456,16,0,649,1,
-1990,4457,16,0,649,
-1,32,4458,16,0,
-649,1,1958,4459,16,
-0,649,1,1775,4460,
-16,0,649,1,135,
-4461,19,572,1,135,
-4462,5,11,1,2075,
-4463,16,0,570,1,
-2337,4464,16,0,570,
-1,2413,4465,16,0,
-570,1,1901,4466,16,
-0,570,1,2198,4467,
-16,0,570,1,2106,
-4468,16,0,570,1,
-1804,4469,16,0,570,
-1,1990,4470,16,0,
-570,1,32,4471,16,
-0,570,1,1958,4472,
-16,0,570,1,1775,
-4473,16,0,570,1,
-136,4474,19,569,1,
-136,4475,5,11,1,
-2075,4476,16,0,567,
-1,2337,4477,16,0,
-567,1,2413,4478,16,
-0,567,1,1901,4479,
-16,0,567,1,2198,
-4480,16,0,567,1,
-2106,4481,16,0,567,
-1,1804,4482,16,0,
-567,1,1990,4483,16,
-0,567,1,32,4484,
-16,0,567,1,1958,
-4485,16,0,567,1,
-1775,4486,16,0,567,
-1,137,4487,19,566,
-1,137,4488,5,11,
-1,2075,4489,16,0,
-564,1,2337,4490,16,
-0,564,1,2413,4491,
-16,0,564,1,1901,
-4492,16,0,564,1,
-2198,4493,16,0,564,
-1,2106,4494,16,0,
-564,1,1804,4495,16,
-0,564,1,1990,4496,
-16,0,564,1,32,
-4497,16,0,564,1,
-1958,4498,16,0,564,
-1,1775,4499,16,0,
-564,1,138,4500,19,
-563,1,138,4501,5,
-11,1,2075,4502,16,
-0,561,1,2337,4503,
-16,0,561,1,2413,
-4504,16,0,561,1,
-1901,4505,16,0,561,
-1,2198,4506,16,0,
-561,1,2106,4507,16,
-0,561,1,1804,4508,
-16,0,561,1,1990,
-4509,16,0,561,1,
-32,4510,16,0,561,
-1,1958,4511,16,0,
-561,1,1775,4512,16,
-0,561,1,139,4513,
-19,560,1,139,4514,
-5,11,1,2075,4515,
-16,0,558,1,2337,
-4516,16,0,558,1,
-2413,4517,16,0,558,
-1,1901,4518,16,0,
-558,1,2198,4519,16,
-0,558,1,2106,4520,
-16,0,558,1,1804,
-4521,16,0,558,1,
-1990,4522,16,0,558,
-1,32,4523,16,0,
-558,1,1958,4524,16,
-0,558,1,1775,4525,
-16,0,558,1,140,
-4526,19,157,1,140,
-4527,5,3,1,1756,
-4528,16,0,299,1,
-2318,4529,16,0,310,
-1,1659,4530,16,0,
-155,1,141,4531,19,
-605,1,141,4532,5,
-68,1,1901,4533,16,
-0,603,1,1479,4534,
-16,0,603,1,112,
-4535,16,0,603,1,
-2293,4536,16,0,603,
+857,1,52,3654,16,
+0,113,1,1803,892,
+1,1804,3655,16,0,
+113,1,2786,3480,1,
+2462,993,1,2136,947,
+1,2464,1003,1,2029,
+830,1,2466,3504,1,
+2031,841,1,2032,846,
+1,2033,851,1,2797,
+3498,1,2798,3656,16,
+0,113,1,2364,932,
+1,2039,867,1,1931,
+965,1,2041,873,1,
+2021,823,1,2043,879,
+1,2045,884,1,2514,
+3657,16,0,684,1,
+2816,3464,1,2817,3493,
+1,2818,3470,1,2819,
+3475,1,2037,862,1,
+1574,904,1,1958,3658,
+16,0,113,1,2745,
+3659,16,0,113,1,
+56,3660,19,112,1,
+56,3661,5,55,1,
+0,3662,16,0,110,
+1,2075,3663,16,0,
+110,1,1860,926,1,
+10,3664,16,0,110,
+1,2758,3487,1,1901,
+3665,16,0,110,1,
+2413,3666,16,0,110,
+1,2525,3667,16,0,
+491,1,1657,998,1,
+1873,940,1,21,3668,
+16,0,110,1,2529,
+3669,16,0,491,1,
+2030,836,1,1989,1020,
+1,1990,3670,16,0,
+110,1,2458,980,1,
+2459,986,1,1775,3671,
+16,0,110,1,32,
+3672,16,0,110,1,
+2567,3673,16,0,110,
+1,2105,919,1,2106,
+3674,16,0,110,1,
+2227,1012,1,2337,3675,
+16,0,110,1,2035,
+857,1,52,3676,16,
+0,110,1,1803,892,
+1,1804,3677,16,0,
+110,1,2786,3480,1,
+2462,993,1,2136,947,
+1,2464,1003,1,2029,
+830,1,2466,3504,1,
+2031,841,1,2032,846,
+1,2033,851,1,2797,
+3498,1,2798,3678,16,
+0,110,1,2364,932,
+1,2039,867,1,1931,
+965,1,2041,873,1,
+2021,823,1,2043,879,
+1,2045,884,1,2198,
+3679,16,0,110,1,
+2816,3464,1,2817,3493,
+1,2818,3470,1,2819,
+3475,1,2037,862,1,
+1574,904,1,1958,3680,
+16,0,110,1,2745,
+3681,16,0,110,1,
+57,3682,19,109,1,
+57,3683,5,53,1,
+0,3684,16,0,107,
+1,2075,3685,16,0,
+107,1,1860,926,1,
+10,3686,16,0,107,
+1,2758,3487,1,1901,
+3687,16,0,107,1,
+2413,3688,16,0,107,
+1,2198,3689,16,0,
+107,1,1873,940,1,
+21,3690,16,0,107,
+1,1657,998,1,2030,
+836,1,1989,1020,1,
+1990,3691,16,0,107,
+1,2458,980,1,2459,
+986,1,1775,3692,16,
+0,107,1,32,3693,
+16,0,107,1,2567,
+3694,16,0,107,1,
+2105,919,1,2106,3695,
+16,0,107,1,2227,
+1012,1,2337,3696,16,
+0,107,1,2035,857,
+1,52,3697,16,0,
+107,1,1803,892,1,
+1804,3698,16,0,107,
+1,2786,3480,1,2462,
+993,1,2136,947,1,
+2464,1003,1,2029,830,
+1,2466,3504,1,2031,
+841,1,2032,846,1,
+2033,851,1,2797,3498,
+1,2798,3699,16,0,
+107,1,2364,932,1,
+2039,867,1,1931,965,
+1,2041,873,1,2021,
+823,1,2043,879,1,
+2045,884,1,2816,3464,
+1,2817,3493,1,2818,
+3470,1,2819,3475,1,
+2037,862,1,1574,904,
+1,1958,3700,16,0,
+107,1,2745,3701,16,
+0,107,1,58,3702,
+19,380,1,58,3703,
+5,27,1,2627,1739,
+1,2628,1744,1,2629,
+1834,1,2630,1755,1,
+2520,1749,1,2632,1761,
+1,2633,1766,1,2560,
+1810,1,2635,1776,1,
+2636,1840,1,2625,1728,
+1,2638,1786,1,2565,
+1816,1,2640,3704,16,
+0,378,1,2459,986,
+1,2682,3705,16,0,
+378,1,2535,1791,1,
+2580,1804,1,2637,1781,
+1,2464,1003,1,2543,
+1823,1,2470,3706,16,
+0,378,1,2582,3707,
+16,0,378,1,2634,
+1771,1,2624,1829,1,
+2551,1798,1,2626,1734,
+1,59,3708,19,377,
+1,59,3709,5,27,
+1,2627,1739,1,2628,
+1744,1,2629,1834,1,
+2630,1755,1,2520,1749,
+1,2632,1761,1,2633,
+1766,1,2560,1810,1,
+2635,1776,1,2636,1840,
+1,2625,1728,1,2638,
+1786,1,2565,1816,1,
+2640,3710,16,0,375,
+1,2459,986,1,2682,
+3711,16,0,375,1,
+2535,1791,1,2580,1804,
+1,2637,1781,1,2464,
+1003,1,2543,1823,1,
+2470,3712,16,0,375,
+1,2582,3713,16,0,
+375,1,2634,1771,1,
+2624,1829,1,2551,1798,
+1,2626,1734,1,60,
+3714,19,423,1,60,
+3715,5,27,1,2627,
+1739,1,2628,1744,1,
+2629,1834,1,2630,1755,
+1,2520,1749,1,2632,
+1761,1,2633,1766,1,
+2560,1810,1,2635,1776,
+1,2636,1840,1,2625,
+1728,1,2638,1786,1,
+2565,1816,1,2640,3716,
+16,0,421,1,2459,
+986,1,2682,3717,16,
+0,421,1,2535,1791,
+1,2580,1804,1,2637,
+1781,1,2464,1003,1,
+2543,1823,1,2470,3718,
+16,0,421,1,2582,
+3719,16,0,421,1,
+2634,1771,1,2624,1829,
+1,2551,1798,1,2626,
+1734,1,61,3720,19,
+543,1,61,3721,5,
+27,1,2627,1739,1,
+2628,1744,1,2629,1834,
+1,2630,1755,1,2520,
+1749,1,2632,1761,1,
+2633,1766,1,2560,1810,
+1,2635,1776,1,2636,
+1840,1,2625,1728,1,
+2638,1786,1,2565,1816,
+1,2640,3722,16,0,
+541,1,2459,986,1,
+2682,3723,16,0,541,
+1,2535,1791,1,2580,
+1804,1,2637,1781,1,
+2464,1003,1,2543,1823,
+1,2470,3724,16,0,
+541,1,2582,3725,16,
+0,541,1,2634,1771,
+1,2624,1829,1,2551,
+1798,1,2626,1734,1,
+62,3726,19,665,1,
+62,3727,5,27,1,
+2627,1739,1,2628,1744,
+1,2629,1834,1,2630,
+1755,1,2520,1749,1,
+2632,1761,1,2633,1766,
+1,2560,1810,1,2635,
+1776,1,2636,1840,1,
+2625,1728,1,2638,1786,
+1,2565,1816,1,2640,
+3728,16,0,663,1,
+2459,986,1,2682,3729,
+16,0,663,1,2535,
+1791,1,2580,1804,1,
+2637,1781,1,2464,1003,
+1,2543,1823,1,2470,
+3730,16,0,663,1,
+2582,3731,16,0,663,
+1,2634,1771,1,2624,
+1829,1,2551,1798,1,
+2626,1734,1,63,3732,
+19,413,1,63,3733,
+5,27,1,2627,1739,
+1,2628,1744,1,2629,
+1834,1,2630,1755,1,
+2520,1749,1,2632,1761,
+1,2633,1766,1,2560,
+1810,1,2635,1776,1,
+2636,1840,1,2625,1728,
+1,2638,1786,1,2565,
+1816,1,2640,3734,16,
+0,411,1,2459,986,
+1,2682,3735,16,0,
+411,1,2535,1791,1,
+2580,1804,1,2637,1781,
+1,2464,1003,1,2543,
+1823,1,2470,3736,16,
+0,411,1,2582,3737,
+16,0,411,1,2634,
+1771,1,2624,1829,1,
+2551,1798,1,2626,1734,
+1,64,3738,19,410,
+1,64,3739,5,27,
+1,2627,1739,1,2628,
+1744,1,2629,1834,1,
+2630,1755,1,2520,1749,
+1,2632,1761,1,2633,
+1766,1,2560,1810,1,
+2635,1776,1,2636,1840,
+1,2625,1728,1,2638,
+1786,1,2565,1816,1,
+2640,3740,16,0,408,
+1,2459,986,1,2682,
+3741,16,0,408,1,
+2535,1791,1,2580,1804,
+1,2637,1781,1,2464,
+1003,1,2543,1823,1,
+2470,3742,16,0,408,
+1,2582,3743,16,0,
+408,1,2634,1771,1,
+2624,1829,1,2551,1798,
+1,2626,1734,1,65,
+3744,19,462,1,65,
+3745,5,27,1,2627,
+1739,1,2628,1744,1,
+2629,1834,1,2630,1755,
+1,2520,1749,1,2632,
+1761,1,2633,1766,1,
+2560,1810,1,2635,1776,
+1,2636,1840,1,2625,
+1728,1,2638,1786,1,
+2565,1816,1,2640,3746,
+16,0,460,1,2459,
+986,1,2682,3747,16,
+0,460,1,2535,1791,
+1,2580,1804,1,2637,
+1781,1,2464,1003,1,
+2543,1823,1,2470,3748,
+16,0,460,1,2582,
+3749,16,0,460,1,
+2634,1771,1,2624,1829,
+1,2551,1798,1,2626,
+1734,1,66,3750,19,
+459,1,66,3751,5,
+27,1,2627,1739,1,
+2628,1744,1,2629,1834,
+1,2630,1755,1,2520,
+1749,1,2632,1761,1,
+2633,1766,1,2560,1810,
+1,2635,1776,1,2636,
+1840,1,2625,1728,1,
+2638,1786,1,2565,1816,
+1,2640,3752,16,0,
+457,1,2459,986,1,
+2682,3753,16,0,457,
+1,2535,1791,1,2580,
+1804,1,2637,1781,1,
+2464,1003,1,2543,1823,
+1,2470,3754,16,0,
+457,1,2582,3755,16,
+0,457,1,2634,1771,
+1,2624,1829,1,2551,
+1798,1,2626,1734,1,
+67,3756,19,456,1,
+67,3757,5,27,1,
+2627,1739,1,2628,1744,
+1,2629,1834,1,2630,
+1755,1,2520,1749,1,
+2632,1761,1,2633,1766,
+1,2560,1810,1,2635,
+1776,1,2636,1840,1,
+2625,1728,1,2638,1786,
+1,2565,1816,1,2640,
+3758,16,0,454,1,
+2459,986,1,2682,3759,
+16,0,454,1,2535,
+1791,1,2580,1804,1,
+2637,1781,1,2464,1003,
+1,2543,1823,1,2470,
+3760,16,0,454,1,
+2582,3761,16,0,454,
+1,2634,1771,1,2624,
+1829,1,2551,1798,1,
+2626,1734,1,68,3762,
+19,453,1,68,3763,
+5,27,1,2627,1739,
+1,2628,1744,1,2629,
+1834,1,2630,1755,1,
+2520,1749,1,2632,1761,
+1,2633,1766,1,2560,
+1810,1,2635,1776,1,
+2636,1840,1,2625,1728,
+1,2638,1786,1,2565,
+1816,1,2640,3764,16,
+0,451,1,2459,986,
+1,2682,3765,16,0,
+451,1,2535,1791,1,
+2580,1804,1,2637,1781,
+1,2464,1003,1,2543,
+1823,1,2470,3766,16,
+0,451,1,2582,3767,
+16,0,451,1,2634,
+1771,1,2624,1829,1,
+2551,1798,1,2626,1734,
+1,69,3768,19,389,
+1,69,3769,5,27,
+1,2627,1739,1,2628,
+1744,1,2629,1834,1,
+2630,1755,1,2520,1749,
+1,2632,1761,1,2633,
+1766,1,2560,1810,1,
+2635,1776,1,2636,1840,
+1,2625,1728,1,2638,
+1786,1,2565,1816,1,
+2640,3770,16,0,387,
+1,2459,986,1,2682,
+3771,16,0,387,1,
+2535,1791,1,2580,1804,
+1,2637,1781,1,2464,
+1003,1,2543,1823,1,
+2470,3772,16,0,387,
+1,2582,3773,16,0,
+387,1,2634,1771,1,
+2624,1829,1,2551,1798,
+1,2626,1734,1,70,
+3774,19,386,1,70,
+3775,5,27,1,2627,
+1739,1,2628,1744,1,
+2629,1834,1,2630,1755,
+1,2520,1749,1,2632,
+1761,1,2633,1766,1,
+2560,1810,1,2635,1776,
+1,2636,1840,1,2625,
+1728,1,2638,1786,1,
+2565,1816,1,2640,3776,
+16,0,384,1,2459,
+986,1,2682,3777,16,
+0,384,1,2535,1791,
+1,2580,1804,1,2637,
+1781,1,2464,1003,1,
+2543,1823,1,2470,3778,
+16,0,384,1,2582,
+3779,16,0,384,1,
+2634,1771,1,2624,1829,
+1,2551,1798,1,2626,
+1734,1,71,3780,19,
+383,1,71,3781,5,
+27,1,2627,1739,1,
+2628,1744,1,2629,1834,
+1,2630,1755,1,2520,
+1749,1,2632,1761,1,
+2633,1766,1,2560,1810,
+1,2635,1776,1,2636,
+1840,1,2625,1728,1,
+2638,1786,1,2565,1816,
+1,2640,3782,16,0,
+381,1,2459,986,1,
+2682,3783,16,0,381,
+1,2535,1791,1,2580,
+1804,1,2637,1781,1,
+2464,1003,1,2543,1823,
+1,2470,3784,16,0,
+381,1,2582,3785,16,
+0,381,1,2634,1771,
+1,2624,1829,1,2551,
+1798,1,2626,1734,1,
+72,3786,19,450,1,
+72,3787,5,27,1,
+2627,1739,1,2628,1744,
+1,2629,1834,1,2630,
+1755,1,2520,1749,1,
+2632,1761,1,2633,1766,
+1,2560,1810,1,2635,
+1776,1,2636,1840,1,
+2625,1728,1,2638,1786,
+1,2565,1816,1,2640,
+3788,16,0,448,1,
+2459,986,1,2682,3789,
+16,0,448,1,2535,
+1791,1,2580,1804,1,
+2637,1781,1,2464,1003,
+1,2543,1823,1,2470,
+3790,16,0,448,1,
+2582,3791,16,0,448,
+1,2634,1771,1,2624,
+1829,1,2551,1798,1,
+2626,1734,1,73,3792,
+19,447,1,73,3793,
+5,27,1,2627,1739,
+1,2628,1744,1,2629,
+1834,1,2630,1755,1,
+2520,1749,1,2632,1761,
+1,2633,1766,1,2560,
+1810,1,2635,1776,1,
+2636,1840,1,2625,1728,
+1,2638,1786,1,2565,
+1816,1,2640,3794,16,
+0,445,1,2459,986,
+1,2682,3795,16,0,
+445,1,2535,1791,1,
+2580,1804,1,2637,1781,
+1,2464,1003,1,2543,
+1823,1,2470,3796,16,
+0,445,1,2582,3797,
+16,0,445,1,2634,
+1771,1,2624,1829,1,
+2551,1798,1,2626,1734,
+1,74,3798,19,751,
+1,74,3799,5,27,
+1,2627,1739,1,2628,
+1744,1,2629,1834,1,
+2630,1755,1,2520,1749,
+1,2632,1761,1,2633,
+1766,1,2560,1810,1,
+2635,1776,1,2636,1840,
+1,2625,1728,1,2638,
+1786,1,2565,1816,1,
+2640,3800,16,0,749,
+1,2459,986,1,2682,
+3801,16,0,749,1,
+2535,1791,1,2580,1804,
+1,2637,1781,1,2464,
+1003,1,2543,1823,1,
+2470,3802,16,0,749,
+1,2582,3803,16,0,
+749,1,2634,1771,1,
+2624,1829,1,2551,1798,
+1,2626,1734,1,75,
+3804,19,562,1,75,
+3805,5,27,1,2627,
+1739,1,2628,1744,1,
+2629,1834,1,2630,1755,
+1,2520,1749,1,2632,
+1761,1,2633,1766,1,
+2560,1810,1,2635,1776,
+1,2636,1840,1,2625,
+1728,1,2638,1786,1,
+2565,1816,1,2640,3806,
+16,0,560,1,2459,
+986,1,2682,3807,16,
+0,560,1,2535,1791,
+1,2580,1804,1,2637,
+1781,1,2464,1003,1,
+2543,1823,1,2470,3808,
+16,0,560,1,2582,
+3809,16,0,560,1,
+2634,1771,1,2624,1829,
+1,2551,1798,1,2626,
+1734,1,76,3810,19,
+432,1,76,3811,5,
+27,1,2627,1739,1,
+2628,1744,1,2629,1834,
+1,2630,1755,1,2520,
+1749,1,2632,1761,1,
+2633,1766,1,2560,1810,
+1,2635,1776,1,2636,
+1840,1,2625,1728,1,
+2638,1786,1,2565,1816,
+1,2640,3812,16,0,
+430,1,2459,986,1,
+2682,3813,16,0,430,
+1,2535,1791,1,2580,
+1804,1,2637,1781,1,
+2464,1003,1,2543,1823,
+1,2470,3814,16,0,
+430,1,2582,3815,16,
+0,430,1,2634,1771,
+1,2624,1829,1,2551,
+1798,1,2626,1734,1,
+77,3816,19,559,1,
+77,3817,5,27,1,
+2627,1739,1,2628,1744,
+1,2629,1834,1,2630,
+1755,1,2520,1749,1,
+2632,1761,1,2633,1766,
+1,2560,1810,1,2635,
+1776,1,2636,1840,1,
+2625,1728,1,2638,1786,
+1,2565,1816,1,2640,
+3818,16,0,557,1,
+2459,986,1,2682,3819,
+16,0,557,1,2535,
+1791,1,2580,1804,1,
+2637,1781,1,2464,1003,
+1,2543,1823,1,2470,
+3820,16,0,557,1,
+2582,3821,16,0,557,
+1,2634,1771,1,2624,
+1829,1,2551,1798,1,
+2626,1734,1,78,3822,
+19,556,1,78,3823,
+5,27,1,2627,1739,
+1,2628,1744,1,2629,
+1834,1,2630,1755,1,
+2520,1749,1,2632,1761,
+1,2633,1766,1,2560,
+1810,1,2635,1776,1,
+2636,1840,1,2625,1728,
+1,2638,1786,1,2565,
+1816,1,2640,3824,16,
+0,554,1,2459,986,
+1,2682,3825,16,0,
+554,1,2535,1791,1,
+2580,1804,1,2637,1781,
+1,2464,1003,1,2543,
+1823,1,2470,3826,16,
+0,554,1,2582,3827,
+16,0,554,1,2634,
+1771,1,2624,1829,1,
+2551,1798,1,2626,1734,
+1,79,3828,19,553,
+1,79,3829,5,27,
+1,2627,1739,1,2628,
+1744,1,2629,1834,1,
+2630,1755,1,2520,1749,
+1,2632,1761,1,2633,
+1766,1,2560,1810,1,
+2635,1776,1,2636,1840,
+1,2625,1728,1,2638,
+1786,1,2565,1816,1,
+2640,3830,16,0,551,
+1,2459,986,1,2682,
+3831,16,0,551,1,
+2535,1791,1,2580,1804,
+1,2637,1781,1,2464,
+1003,1,2543,1823,1,
+2470,3832,16,0,551,
+1,2582,3833,16,0,
+551,1,2634,1771,1,
+2624,1829,1,2551,1798,
+1,2626,1734,1,80,
+3834,19,420,1,80,
+3835,5,27,1,2627,
+1739,1,2628,1744,1,
+2629,1834,1,2630,1755,
+1,2520,1749,1,2632,
+1761,1,2633,1766,1,
+2560,1810,1,2635,1776,
+1,2636,1840,1,2625,
+1728,1,2638,1786,1,
+2565,1816,1,2640,3836,
+16,0,418,1,2459,
+986,1,2682,3837,16,
+0,418,1,2535,1791,
+1,2580,1804,1,2637,
+1781,1,2464,1003,1,
+2543,1823,1,2470,3838,
+16,0,418,1,2582,
+3839,16,0,418,1,
+2634,1771,1,2624,1829,
+1,2551,1798,1,2626,
+1734,1,81,3840,19,
+407,1,81,3841,5,
+27,1,2627,1739,1,
+2628,1744,1,2629,1834,
+1,2630,1755,1,2520,
+1749,1,2632,1761,1,
+2633,1766,1,2560,1810,
+1,2635,1776,1,2636,
+1840,1,2625,1728,1,
+2638,1786,1,2565,1816,
+1,2640,3842,16,0,
+405,1,2459,986,1,
+2682,3843,16,0,405,
+1,2535,1791,1,2580,
+1804,1,2637,1781,1,
+2464,1003,1,2543,1823,
+1,2470,3844,16,0,
+405,1,2582,3845,16,
+0,405,1,2634,1771,
+1,2624,1829,1,2551,
+1798,1,2626,1734,1,
+82,3846,19,443,1,
+82,3847,5,27,1,
+2627,1739,1,2628,1744,
+1,2629,1834,1,2630,
+1755,1,2520,1749,1,
+2632,1761,1,2633,1766,
+1,2560,1810,1,2635,
+1776,1,2636,1840,1,
+2625,1728,1,2638,1786,
+1,2565,1816,1,2640,
+3848,16,0,441,1,
+2459,986,1,2682,3849,
+16,0,441,1,2535,
+1791,1,2580,1804,1,
+2637,1781,1,2464,1003,
+1,2543,1823,1,2470,
+3850,16,0,441,1,
+2582,3851,16,0,441,
+1,2634,1771,1,2624,
+1829,1,2551,1798,1,
+2626,1734,1,83,3852,
+19,404,1,83,3853,
+5,27,1,2627,1739,
+1,2628,1744,1,2629,
+1834,1,2630,1755,1,
+2520,1749,1,2632,1761,
+1,2633,1766,1,2560,
+1810,1,2635,1776,1,
+2636,1840,1,2625,1728,
+1,2638,1786,1,2565,
+1816,1,2640,3854,16,
+0,402,1,2459,986,
+1,2682,3855,16,0,
+402,1,2535,1791,1,
+2580,1804,1,2637,1781,
+1,2464,1003,1,2543,
+1823,1,2470,3856,16,
+0,402,1,2582,3857,
+16,0,402,1,2634,
+1771,1,2624,1829,1,
+2551,1798,1,2626,1734,
+1,84,3858,19,401,
+1,84,3859,5,27,
+1,2627,1739,1,2628,
+1744,1,2629,1834,1,
+2630,1755,1,2520,1749,
+1,2632,1761,1,2633,
+1766,1,2560,1810,1,
+2635,1776,1,2636,1840,
+1,2625,1728,1,2638,
+1786,1,2565,1816,1,
+2640,3860,16,0,399,
+1,2459,986,1,2682,
+3861,16,0,399,1,
+2535,1791,1,2580,1804,
+1,2637,1781,1,2464,
+1003,1,2543,1823,1,
+2470,3862,16,0,399,
+1,2582,3863,16,0,
+399,1,2634,1771,1,
+2624,1829,1,2551,1798,
+1,2626,1734,1,85,
+3864,19,439,1,85,
+3865,5,27,1,2627,
+1739,1,2628,1744,1,
+2629,1834,1,2630,1755,
+1,2520,1749,1,2632,
+1761,1,2633,1766,1,
+2560,1810,1,2635,1776,
+1,2636,1840,1,2625,
+1728,1,2638,1786,1,
+2565,1816,1,2640,3866,
+16,0,437,1,2459,
+986,1,2682,3867,16,
+0,437,1,2535,1791,
+1,2580,1804,1,2637,
+1781,1,2464,1003,1,
+2543,1823,1,2470,3868,
+16,0,437,1,2582,
+3869,16,0,437,1,
+2634,1771,1,2624,1829,
+1,2551,1798,1,2626,
+1734,1,86,3870,19,
+436,1,86,3871,5,
+27,1,2627,1739,1,
+2628,1744,1,2629,1834,
+1,2630,1755,1,2520,
+1749,1,2632,1761,1,
+2633,1766,1,2560,1810,
+1,2635,1776,1,2636,
+1840,1,2625,1728,1,
+2638,1786,1,2565,1816,
+1,2640,3872,16,0,
+434,1,2459,986,1,
+2682,3873,16,0,434,
+1,2535,1791,1,2580,
+1804,1,2637,1781,1,
+2464,1003,1,2543,1823,
+1,2470,3874,16,0,
+434,1,2582,3875,16,
+0,434,1,2634,1771,
+1,2624,1829,1,2551,
+1798,1,2626,1734,1,
+87,3876,19,550,1,
+87,3877,5,27,1,
+2627,1739,1,2628,1744,
+1,2629,1834,1,2630,
+1755,1,2520,1749,1,
+2632,1761,1,2633,1766,
+1,2560,1810,1,2635,
+1776,1,2636,1840,1,
+2625,1728,1,2638,1786,
+1,2565,1816,1,2640,
+3878,16,0,548,1,
+2459,986,1,2682,3879,
+16,0,548,1,2535,
+1791,1,2580,1804,1,
+2637,1781,1,2464,1003,
+1,2543,1823,1,2470,
+3880,16,0,548,1,
+2582,3881,16,0,548,
+1,2634,1771,1,2624,
+1829,1,2551,1798,1,
+2626,1734,1,88,3882,
+19,398,1,88,3883,
+5,27,1,2627,1739,
+1,2628,1744,1,2629,
+1834,1,2630,1755,1,
+2520,1749,1,2632,1761,
+1,2633,1766,1,2560,
+1810,1,2635,1776,1,
+2636,1840,1,2625,1728,
+1,2638,1786,1,2565,
+1816,1,2640,3884,16,
+0,396,1,2459,986,
+1,2682,3885,16,0,
+396,1,2535,1791,1,
+2580,1804,1,2637,1781,
+1,2464,1003,1,2543,
+1823,1,2470,3886,16,
+0,396,1,2582,3887,
+16,0,396,1,2634,
+1771,1,2624,1829,1,
+2551,1798,1,2626,1734,
+1,89,3888,19,392,
+1,89,3889,5,27,
+1,2627,1739,1,2628,
+1744,1,2629,1834,1,
+2630,1755,1,2520,1749,
+1,2632,1761,1,2633,
+1766,1,2560,1810,1,
+2635,1776,1,2636,1840,
+1,2625,1728,1,2638,
+1786,1,2565,1816,1,
+2640,3890,16,0,390,
+1,2459,986,1,2682,
+3891,16,0,390,1,
+2535,1791,1,2580,1804,
+1,2637,1781,1,2464,
+1003,1,2543,1823,1,
+2470,3892,16,0,390,
+1,2582,3893,16,0,
+390,1,2634,1771,1,
+2624,1829,1,2551,1798,
+1,2626,1734,1,90,
+3894,19,395,1,90,
+3895,5,27,1,2627,
+1739,1,2628,1744,1,
+2629,1834,1,2630,1755,
+1,2520,1749,1,2632,
+1761,1,2633,1766,1,
+2560,1810,1,2635,1776,
+1,2636,1840,1,2625,
+1728,1,2638,1786,1,
+2565,1816,1,2640,3896,
+16,0,393,1,2459,
+986,1,2682,3897,16,
+0,393,1,2535,1791,
+1,2580,1804,1,2637,
+1781,1,2464,1003,1,
+2543,1823,1,2470,3898,
+16,0,393,1,2582,
+3899,16,0,393,1,
+2634,1771,1,2624,1829,
+1,2551,1798,1,2626,
+1734,1,91,3900,19,
+569,1,91,3901,5,
+27,1,2627,1739,1,
+2628,1744,1,2629,1834,
+1,2630,1755,1,2520,
+1749,1,2632,1761,1,
+2633,1766,1,2560,1810,
+1,2635,1776,1,2636,
+1840,1,2625,1728,1,
+2638,1786,1,2565,1816,
+1,2640,3902,16,0,
+567,1,2459,986,1,
+2682,3903,16,0,567,
+1,2535,1791,1,2580,
+1804,1,2637,1781,1,
+2464,1003,1,2543,1823,
+1,2470,3904,16,0,
+567,1,2582,3905,16,
+0,567,1,2634,1771,
+1,2624,1829,1,2551,
+1798,1,2626,1734,1,
+92,3906,19,133,1,
+92,3907,5,129,1,
+0,3908,16,0,355,
+1,1,2191,1,2,
+2197,1,3,2202,1,
+4,2207,1,5,2212,
+1,6,2217,1,7,
+2222,1,8,3909,16,
+0,131,1,1515,3910,
+16,0,180,1,2021,
+823,1,2022,3911,16,
+0,573,1,256,3912,
+16,0,188,1,2526,
+3913,16,0,294,1,
+2025,3914,16,0,577,
+1,18,3915,16,0,
+147,1,2027,3916,16,
+0,581,1,2029,830,
+1,2030,836,1,2031,
+841,1,2032,846,1,
+2786,3480,1,277,3917,
+16,0,188,1,2035,
+857,1,2037,862,1,
+2039,867,1,32,3918,
+16,0,180,1,2041,
+873,1,2293,3919,16,
+0,188,1,2043,879,
+1,2797,3498,1,2798,
+3920,16,0,355,1,
+41,3921,16,0,188,
+1,1297,3922,16,0,
+180,1,43,3923,16,
+0,188,1,2554,3924,
+16,0,531,1,46,
+3925,16,0,193,1,
+1804,3926,16,0,180,
+1,299,3927,16,0,
+188,1,52,3928,16,
+0,180,1,2816,3464,
+1,2817,3493,1,2818,
+3470,1,2819,3475,1,
+2318,3929,16,0,180,
+1,62,3930,16,0,
+209,1,65,3931,16,
+0,214,1,2075,3932,
+16,0,180,1,1574,
+904,1,71,3933,16,
+0,188,1,1775,3934,
+16,0,180,1,76,
+3935,16,0,188,1,
+1834,3936,16,0,180,
+1,2337,3937,16,0,
+180,1,79,3938,16,
+0,188,1,1335,3939,
+16,0,180,1,2511,
+3940,16,0,472,1,
+322,3941,16,0,188,
+1,85,3942,16,0,
+188,1,2761,3943,16,
+0,188,1,89,3944,
+16,0,188,1,2033,
+851,1,509,3945,16,
+0,188,1,346,3946,
+16,0,188,1,97,
+3947,16,0,188,1,
+2106,3948,16,0,180,
+1,102,3949,16,0,
+188,1,1860,926,1,
+1803,892,1,2364,932,
+1,1113,3950,16,0,
+173,1,112,3951,16,
+0,188,1,1117,3952,
+16,0,180,1,1873,
+940,1,1876,3953,16,
+0,180,1,372,3954,
+16,0,611,1,374,
+3955,16,0,613,1,
+124,3956,16,0,188,
+1,376,3957,16,0,
+615,1,378,3958,16,
+0,617,1,2136,947,
+1,1261,3959,16,0,
+180,1,381,3960,16,
+0,188,1,525,3961,
+16,0,188,1,137,
+3962,16,0,188,1,
+1901,3963,16,0,180,
+1,1153,3964,16,0,
+180,1,151,3965,16,
+0,188,1,1407,3966,
+16,0,180,1,1659,
+3967,16,0,180,1,
+2413,3968,16,0,180,
+1,406,3969,16,0,
+188,1,1371,3970,16,
+0,180,1,2105,919,
+1,166,3971,16,0,
+188,1,2045,884,1,
+1622,3972,16,0,188,
+1,2758,3487,1,1931,
+965,1,1933,3973,16,
+0,180,1,431,3974,
+16,0,188,1,1585,
+3975,16,0,188,1,
+182,3976,16,0,188,
+1,1189,3977,16,0,
+180,1,1443,3978,16,
+0,180,1,1695,3979,
+16,0,180,1,2198,
+3980,16,0,180,1,
+447,3981,16,0,188,
+1,2458,980,1,2459,
+986,1,1958,3982,16,
+0,180,1,2462,993,
+1,1657,998,1,2464,
+1003,1,2466,3504,1,
+459,3983,16,0,188,
+1,2468,3984,16,0,
+373,1,462,3985,16,
+0,188,1,199,3986,
+16,0,188,1,217,
+3987,16,0,188,1,
+2227,1012,1,1225,3988,
+16,0,180,1,1479,
+3989,16,0,180,1,
+1731,3990,16,0,188,
+1,1989,1020,1,1990,
+3991,16,0,180,1,
+236,3992,16,0,188,
+1,2507,3993,16,0,
+468,1,1756,3994,16,
+0,180,1,93,3995,
+19,719,1,93,3996,
+5,95,1,2761,3997,
+16,0,717,1,256,
+3998,16,0,717,1,
+1261,3999,16,0,717,
+1,509,4000,16,0,
+717,1,1515,4001,16,
+0,717,1,2021,823,
+1,1775,4002,16,0,
+717,1,2029,830,1,
+2030,836,1,2031,841,
+1,2032,846,1,2033,
+851,1,277,4003,16,
+0,717,1,2035,857,
+1,2037,862,1,2039,
+867,1,32,4004,16,
+0,717,1,2041,873,
+1,2293,4005,16,0,
+717,1,2043,879,1,
+2045,884,1,41,4006,
+16,0,717,1,1297,
+4007,16,0,717,1,
+43,4008,16,0,717,
+1,1803,892,1,1804,
+4009,16,0,717,1,
+299,4010,16,0,717,
+1,52,4011,16,0,
+717,1,2318,4012,16,
+0,717,1,62,4013,
+16,0,717,1,2075,
+4014,16,0,717,1,
+1574,904,1,71,4015,
+16,0,717,1,76,
+4016,16,0,717,1,
+1834,4017,16,0,717,
+1,2337,4018,16,0,
+717,1,79,4019,16,
+0,717,1,1335,4020,
+16,0,717,1,322,
+4021,16,0,717,1,
+85,4022,16,0,717,
+1,89,4023,16,0,
+717,1,346,4024,16,
+0,717,1,2105,919,
+1,2106,4025,16,0,
+717,1,97,4026,16,
+0,717,1,1860,926,
+1,2364,932,1,102,
+4027,16,0,717,1,
+112,4028,16,0,717,
+1,1117,4029,16,0,
+717,1,1873,940,1,
+1876,4030,16,0,717,
+1,124,4031,16,0,
+717,1,2136,947,1,
+381,4032,16,0,717,
+1,525,4033,16,0,
+717,1,137,4034,16,
+0,717,1,1901,4035,
+16,0,717,1,1153,
+4036,16,0,717,1,
+151,4037,16,0,717,
+1,1407,4038,16,0,
+717,1,1659,4039,16,
+0,717,1,2413,4040,
+16,0,717,1,406,
+4041,16,0,717,1,
+1371,4042,16,0,717,
+1,166,4043,16,0,
+717,1,1622,4044,16,
+0,717,1,1931,965,
+1,1933,4045,16,0,
+717,1,431,4046,16,
+0,717,1,1585,4047,
+16,0,717,1,182,
+4048,16,0,717,1,
+1189,4049,16,0,717,
+1,1443,4050,16,0,
+717,1,1695,4051,16,
+0,717,1,2198,4052,
+16,0,717,1,447,
+4053,16,0,717,1,
+2458,980,1,2459,986,
+1,1958,4054,16,0,
+717,1,2462,993,1,
+1657,998,1,2464,1003,
+1,199,4055,16,0,
+717,1,459,4056,16,
+0,717,1,462,4057,
+16,0,717,1,217,
+4058,16,0,717,1,
+2227,1012,1,1225,4059,
+16,0,717,1,1479,
+4060,16,0,717,1,
+1731,4061,16,0,717,
+1,1989,1020,1,1990,
+4062,16,0,717,1,
+236,4063,16,0,717,
+1,1756,4064,16,0,
+717,1,94,4065,19,
+716,1,94,4066,5,
+95,1,2761,4067,16,
+0,714,1,256,4068,
+16,0,714,1,1261,
+4069,16,0,714,1,
+509,4070,16,0,714,
+1,1515,4071,16,0,
+714,1,2021,823,1,
+1775,4072,16,0,714,
+1,2029,830,1,2030,
+836,1,2031,841,1,
+2032,846,1,2033,851,
+1,277,4073,16,0,
+714,1,2035,857,1,
+2037,862,1,2039,867,
+1,32,4074,16,0,
+714,1,2041,873,1,
+2293,4075,16,0,714,
+1,2043,879,1,2045,
+884,1,41,4076,16,
+0,714,1,1297,4077,
+16,0,714,1,43,
+4078,16,0,714,1,
+1803,892,1,1804,4079,
+16,0,714,1,299,
+4080,16,0,714,1,
+52,4081,16,0,714,
+1,2318,4082,16,0,
+714,1,62,4083,16,
+0,714,1,2075,4084,
+16,0,714,1,1574,
+904,1,71,4085,16,
+0,714,1,76,4086,
+16,0,714,1,1834,
+4087,16,0,714,1,
+2337,4088,16,0,714,
+1,79,4089,16,0,
+714,1,1335,4090,16,
+0,714,1,322,4091,
+16,0,714,1,85,
+4092,16,0,714,1,
+89,4093,16,0,714,
+1,346,4094,16,0,
+714,1,2105,919,1,
+2106,4095,16,0,714,
+1,97,4096,16,0,
+714,1,1860,926,1,
+2364,932,1,102,4097,
+16,0,714,1,112,
+4098,16,0,714,1,
+1117,4099,16,0,714,
+1,1873,940,1,1876,
+4100,16,0,714,1,
+124,4101,16,0,714,
+1,2136,947,1,381,
+4102,16,0,714,1,
+525,4103,16,0,714,
+1,137,4104,16,0,
+714,1,1901,4105,16,
+0,714,1,1153,4106,
+16,0,714,1,151,
+4107,16,0,714,1,
+1407,4108,16,0,714,
+1,1659,4109,16,0,
+714,1,2413,4110,16,
+0,714,1,406,4111,
+16,0,714,1,1371,
+4112,16,0,714,1,
+166,4113,16,0,714,
+1,1622,4114,16,0,
+714,1,1931,965,1,
+1933,4115,16,0,714,
+1,431,4116,16,0,
+714,1,1585,4117,16,
+0,714,1,182,4118,
+16,0,714,1,1189,
+4119,16,0,714,1,
+1443,4120,16,0,714,
+1,1695,4121,16,0,
+714,1,2198,4122,16,
+0,714,1,447,4123,
+16,0,714,1,2458,
+980,1,2459,986,1,
+1958,4124,16,0,714,
+1,2462,993,1,1657,
+998,1,2464,1003,1,
+199,4125,16,0,714,
+1,459,4126,16,0,
+714,1,462,4127,16,
+0,714,1,217,4128,
+16,0,714,1,2227,
+1012,1,1225,4129,16,
+0,714,1,1479,4130,
+16,0,714,1,1731,
+4131,16,0,714,1,
+1989,1020,1,1990,4132,
+16,0,714,1,236,
+4133,16,0,714,1,
+1756,4134,16,0,714,
+1,95,4135,19,713,
+1,95,4136,5,95,
+1,2761,4137,16,0,
+711,1,256,4138,16,
+0,711,1,1261,4139,
+16,0,711,1,509,
+4140,16,0,711,1,
+1515,4141,16,0,711,
+1,2021,823,1,1775,
+4142,16,0,711,1,
+2029,830,1,2030,836,
+1,2031,841,1,2032,
+846,1,2033,851,1,
+277,4143,16,0,711,
+1,2035,857,1,2037,
+862,1,2039,867,1,
+32,4144,16,0,711,
+1,2041,873,1,2293,
+4145,16,0,711,1,
+2043,879,1,2045,884,
+1,41,4146,16,0,
+711,1,1297,4147,16,
+0,711,1,43,4148,
+16,0,711,1,1803,
+892,1,1804,4149,16,
+0,711,1,299,4150,
+16,0,711,1,52,
+4151,16,0,711,1,
+2318,4152,16,0,711,
+1,62,4153,16,0,
+711,1,2075,4154,16,
+0,711,1,1574,904,
+1,71,4155,16,0,
+711,1,76,4156,16,
+0,711,1,1834,4157,
+16,0,711,1,2337,
+4158,16,0,711,1,
+79,4159,16,0,711,
+1,1335,4160,16,0,
+711,1,322,4161,16,
+0,711,1,85,4162,
+16,0,711,1,89,
+4163,16,0,711,1,
+346,4164,16,0,711,
+1,2105,919,1,2106,
+4165,16,0,711,1,
+97,4166,16,0,711,
+1,1860,926,1,2364,
+932,1,102,4167,16,
+0,711,1,112,4168,
+16,0,711,1,1117,
+4169,16,0,711,1,
+1873,940,1,1876,4170,
+16,0,711,1,124,
+4171,16,0,711,1,
+2136,947,1,381,4172,
+16,0,711,1,525,
+4173,16,0,711,1,
+137,4174,16,0,711,
+1,1901,4175,16,0,
+711,1,1153,4176,16,
+0,711,1,151,4177,
+16,0,711,1,1407,
+4178,16,0,711,1,
+1659,4179,16,0,711,
+1,2413,4180,16,0,
+711,1,406,4181,16,
+0,711,1,1371,4182,
+16,0,711,1,166,
+4183,16,0,711,1,
+1622,4184,16,0,711,
+1,1931,965,1,1933,
+4185,16,0,711,1,
+431,4186,16,0,711,
+1,1585,4187,16,0,
+711,1,182,4188,16,
+0,711,1,1189,4189,
+16,0,711,1,1443,
+4190,16,0,711,1,
+1695,4191,16,0,711,
+1,2198,4192,16,0,
+711,1,447,4193,16,
+0,711,1,2458,980,
+1,2459,986,1,1958,
+4194,16,0,711,1,
+2462,993,1,1657,998,
+1,2464,1003,1,199,
+4195,16,0,711,1,
+459,4196,16,0,711,
+1,462,4197,16,0,
+711,1,217,4198,16,
+0,711,1,2227,1012,
+1,1225,4199,16,0,
+711,1,1479,4200,16,
+0,711,1,1731,4201,
+16,0,711,1,1989,
+1020,1,1990,4202,16,
+0,711,1,236,4203,
+16,0,711,1,1756,
+4204,16,0,711,1,
+96,4205,19,103,1,
+96,4206,5,1,1,
+0,4207,16,0,104,
+1,97,4208,19,142,
+1,97,4209,5,1,
+1,0,4210,16,0,
+140,1,98,4211,19,
+172,1,98,4212,5,
+2,1,0,4213,16,
+0,170,1,2798,4214,
+16,0,497,1,99,
+4215,19,169,1,99,
+4216,5,2,1,0,
+4217,16,0,167,1,
+2798,4218,16,0,268,
+1,100,4219,19,485,
+1,100,4220,5,2,
+1,0,4221,16,0,
+752,1,2798,4222,16,
+0,483,1,101,4223,
+19,279,1,101,4224,
+5,4,1,0,4225,
+16,0,354,1,2809,
+4226,16,0,277,1,
+2798,4227,16,0,354,
+1,2739,4228,16,0,
+277,1,102,4229,19,
+309,1,102,4230,5,
+2,1,2640,4231,16,
+0,307,1,2470,4232,
+16,0,760,1,103,
+4233,19,730,1,103,
+4234,5,4,1,2640,
+4235,16,0,737,1,
+2470,4236,16,0,737,
+1,2582,4237,16,0,
+728,1,2682,4238,16,
+0,728,1,104,4239,
+19,727,1,104,4240,
+5,4,1,2640,4241,
+16,0,736,1,2470,
+4242,16,0,736,1,
+2582,4243,16,0,725,
+1,2682,4244,16,0,
+725,1,105,4245,19,
+652,1,105,4246,5,
+4,1,2640,4247,16,
+0,650,1,2470,4248,
+16,0,650,1,2582,
+4249,16,0,724,1,
+2682,4250,16,0,724,
+1,106,4251,19,333,
+1,106,4252,5,4,
+1,2640,4253,16,0,
+331,1,2470,4254,16,
+0,331,1,2582,4255,
+16,0,639,1,2682,
+4256,16,0,639,1,
+107,4257,19,638,1,
+107,4258,5,4,1,
+2640,4259,16,0,734,
+1,2470,4260,16,0,
+734,1,2582,4261,16,
+0,636,1,2682,4262,
+16,0,636,1,108,
+4263,19,635,1,108,
+4264,5,4,1,2640,
+4265,16,0,733,1,
+2470,4266,16,0,733,
+1,2582,4267,16,0,
+633,1,2682,4268,16,
+0,633,1,109,4269,
+19,145,1,109,4270,
+5,4,1,2640,4271,
+16,0,143,1,2470,
+4272,16,0,143,1,
+2582,4273,16,0,247,
+1,2682,4274,16,0,
+247,1,110,4275,19,
+150,1,110,4276,5,
+3,1,2567,4277,16,
+0,753,1,2745,4278,
+16,0,204,1,10,
+4279,16,0,148,1,
+111,4280,19,658,1,
+111,4281,5,1,1,
+2553,4282,16,0,656,
+1,112,4283,19,524,
+1,112,4284,5,1,
+1,2545,4285,16,0,
+522,1,113,4286,19,
+511,1,113,4287,5,
+1,1,2537,4288,16,
+0,509,1,114,4289,
+19,501,1,114,4290,
+5,1,1,2522,4291,
+16,0,499,1,115,
+4292,19,481,1,115,
+4293,5,1,1,2506,
+4294,16,0,479,1,
+116,4295,19,160,1,
+116,4296,5,17,1,
+0,4297,16,0,766,
+1,2075,4298,16,0,
+746,1,2337,4299,16,
+0,746,1,2745,4300,
+16,0,369,1,2413,
+4301,16,0,746,1,
+10,4302,16,0,369,
+1,1901,4303,16,0,
+746,1,2198,4304,16,
+0,746,1,21,4305,
+16,0,158,1,2106,
+4306,16,0,746,1,
+2798,4307,16,0,766,
+1,2567,4308,16,0,
+369,1,1804,4309,16,
+0,746,1,1990,4310,
+16,0,746,1,32,
+4311,16,0,746,1,
+1958,4312,16,0,746,
+1,1775,4313,16,0,
+746,1,117,4314,19,
+655,1,117,4315,5,
+1,1,2553,4316,16,
+0,653,1,118,4317,
+19,242,1,118,4318,
+5,3,1,2522,4319,
+16,0,489,1,2545,
+4320,16,0,240,1,
+2506,4321,16,0,469,
+1,119,4322,19,475,
+1,119,4323,5,3,
+1,2510,4324,16,0,
+473,1,2514,4325,16,
+0,478,1,2537,4326,
+16,0,508,1,120,
+4327,19,303,1,120,
+4328,5,2,1,2525,
+4329,16,0,301,1,
+2529,4330,16,0,498,
+1,121,4331,19,130,
+1,121,4332,5,18,
+1,0,4333,16,0,
+128,1,2075,4334,16,
+0,146,1,2337,4335,
+16,0,146,1,2745,
+4336,16,0,146,1,
+2413,4337,16,0,146,
+1,10,4338,16,0,
+146,1,2198,4339,16,
+0,146,1,1901,4340,
+16,0,146,1,52,
+4341,16,0,207,1,
+21,4342,16,0,146,
+1,2106,4343,16,0,
+146,1,2798,4344,16,
+0,128,1,2567,4345,
+16,0,146,1,1804,
+4346,16,0,146,1,
+1990,4347,16,0,146,
+1,32,4348,16,0,
+146,1,1958,4349,16,
+0,146,1,1775,4350,
+16,0,146,1,122,
+4351,19,547,1,122,
+4352,5,4,1,2640,
+4353,16,0,545,1,
+2470,4354,16,0,545,
+1,2582,4355,16,0,
+545,1,2682,4356,16,
+0,545,1,123,4357,
+19,538,1,123,4358,
+5,4,1,2640,4359,
+16,0,536,1,2470,
+4360,16,0,536,1,
+2582,4361,16,0,536,
+1,2682,4362,16,0,
+536,1,124,4363,19,
+647,1,124,4364,5,
+4,1,2640,4365,16,
+0,645,1,2470,4366,
+16,0,645,1,2582,
+4367,16,0,645,1,
+2682,4368,16,0,645,
+1,125,4369,19,516,
+1,125,4370,5,4,
+1,2640,4371,16,0,
+514,1,2470,4372,16,
+0,514,1,2582,4373,
+16,0,514,1,2682,
+4374,16,0,514,1,
+126,4375,19,630,1,
+126,4376,5,4,1,
+2640,4377,16,0,628,
+1,2470,4378,16,0,
+628,1,2582,4379,16,
+0,628,1,2682,4380,
+16,0,628,1,127,
+4381,19,769,1,127,
+4382,5,4,1,2640,
+4383,16,0,767,1,
+2470,4384,16,0,767,
+1,2582,4385,16,0,
+767,1,2682,4386,16,
+0,767,1,128,4387,
+19,759,1,128,4388,
+5,4,1,2640,4389,
+16,0,757,1,2470,
+4390,16,0,757,1,
+2582,4391,16,0,757,
+1,2682,4392,16,0,
+757,1,129,4393,19,
+368,1,129,4394,5,
+20,1,2518,4395,16,
+0,688,1,2075,4396,
+16,0,582,1,2558,
+4397,16,0,535,1,
+2337,4398,16,0,582,
+1,2413,4399,16,0,
+582,1,2563,4400,16,
+0,544,1,1901,4401,
+16,0,582,1,2198,
+4402,16,0,582,1,
+2533,4403,16,0,503,
+1,2756,4404,16,0,
+765,1,2106,4405,16,
+0,582,1,2541,4406,
+16,0,632,1,1804,
+4407,16,0,582,1,
+1990,4408,16,0,582,
+1,31,4409,16,0,
+366,1,32,4410,16,
+0,582,1,2549,4411,
+16,0,527,1,1958,
+4412,16,0,582,1,
+2578,4413,16,0,756,
+1,1775,4414,16,0,
+582,1,130,4415,19,
+330,1,130,4416,5,
+1,1,32,4417,16,
+0,328,1,131,4418,
+19,282,1,131,4419,
+5,11,1,2075,4420,
+16,0,675,1,2337,
+4421,16,0,287,1,
+2413,4422,16,0,504,
+1,1901,4423,16,0,
+424,1,2198,4424,16,
+0,349,1,2106,4425,
+16,0,704,1,1804,
+4426,16,0,314,1,
+1990,4427,16,0,570,
+1,32,4428,16,0,
+361,1,1958,4429,16,
+0,518,1,1775,4430,
+16,0,280,1,132,
+4431,19,681,1,132,
+4432,5,11,1,2075,
+4433,16,0,679,1,
+2337,4434,16,0,679,
+1,2413,4435,16,0,
+679,1,1901,4436,16,
+0,679,1,2198,4437,
+16,0,679,1,2106,
+4438,16,0,679,1,
+1804,4439,16,0,679,
+1,1990,4440,16,0,
+679,1,32,4441,16,
+0,679,1,1958,4442,
+16,0,679,1,1775,
+4443,16,0,679,1,
+133,4444,19,742,1,
+133,4445,5,11,1,
+2075,4446,16,0,740,
+1,2337,4447,16,0,
+740,1,2413,4448,16,
+0,740,1,1901,4449,
+16,0,740,1,2198,
+4450,16,0,740,1,
+2106,4451,16,0,740,
+1,1804,4452,16,0,
+740,1,1990,4453,16,
+0,740,1,32,4454,
+16,0,740,1,1958,
+4455,16,0,740,1,
+1775,4456,16,0,740,
+1,134,4457,19,176,
+1,134,4458,5,31,
+1,1901,4459,16,0,
+745,1,1479,4460,16,
+0,640,1,2075,4461,
+16,0,745,1,1695,
+4462,16,0,205,1,
+1756,4463,16,0,203,
+1,2413,4464,16,0,
+745,1,2198,4465,16,
+0,745,1,1876,4466,
+16,0,762,1,1659,
+4467,16,0,203,1,
+1443,4468,16,0,598,
+1,1117,4469,16,0,
+174,1,1990,4470,16,
+0,745,1,1189,4471,
+16,0,258,1,1775,
+4472,16,0,745,1,
+32,4473,16,0,745,
+1,2106,4474,16,0,
+745,1,1515,4475,16,
+0,677,1,2337,4476,
+16,0,745,1,52,
+4477,16,0,689,1,
+1804,4478,16,0,745,
+1,1261,4479,16,0,
+326,1,1153,4480,16,
+0,265,1,1225,4481,
+16,0,297,1,1335,
+4482,16,0,495,1,
+1933,4483,16,0,643,
+1,1834,4484,16,0,
+343,1,1297,4485,16,
+0,353,1,1407,4486,
+16,0,668,1,2318,
+4487,16,0,203,1,
+1958,4488,16,0,745,
+1,1371,4489,16,0,
+486,1,135,4490,19,
+607,1,135,4491,5,
+11,1,2075,4492,16,
+0,605,1,2337,4493,
+16,0,605,1,2413,
+4494,16,0,605,1,
+1901,4495,16,0,605,
+1,2198,4496,16,0,
+605,1,2106,4497,16,
+0,605,1,1804,4498,
+16,0,605,1,1990,
+4499,16,0,605,1,
+32,4500,16,0,605,
+1,1958,4501,16,0,
+605,1,1775,4502,16,
+0,605,1,136,4503,
+19,603,1,136,4504,
+5,11,1,2075,4505,
+16,0,601,1,2337,
+4506,16,0,601,1,
+2413,4507,16,0,601,
+1,1901,4508,16,0,
+601,1,2198,4509,16,
+0,601,1,2106,4510,
+16,0,601,1,1804,
+4511,16,0,601,1,
+1990,4512,16,0,601,
+1,32,4513,16,0,
+601,1,1958,4514,16,
+0,601,1,1775,4515,
+16,0,601,1,137,
+4516,19,672,1,137,
+4517,5,11,1,2075,
+4518,16,0,670,1,
+2337,4519,16,0,670,
+1,2413,4520,16,0,
+670,1,1901,4521,16,
+0,670,1,2198,4522,
+16,0,670,1,2106,
+4523,16,0,670,1,
+1804,4524,16,0,670,
+1,1990,4525,16,0,
+670,1,32,4526,16,
+0,670,1,1958,4527,
+16,0,670,1,1775,
+4528,16,0,670,1,
+138,4529,19,597,1,
+138,4530,5,11,1,
+2075,4531,16,0,595,
+1,2337,4532,16,0,
+595,1,2413,4533,16,
+0,595,1,1901,4534,
+16,0,595,1,2198,
+4535,16,0,595,1,
+2106,4536,16,0,595,
 1,1804,4537,16,0,
-603,1,431,4538,16,
-0,603,1,1443,4539,
-16,0,603,1,1756,
-4540,16,0,603,1,
-124,4541,16,0,603,
-1,525,4542,16,0,
-603,1,236,4543,16,
-0,603,1,346,4544,
-16,0,603,1,1876,
-4545,16,0,603,1,
-1659,4546,16,0,603,
-1,1225,4547,16,0,
-603,1,1117,4548,16,
-0,603,1,137,4549,
-16,0,603,1,2318,
-4550,16,0,603,1,
-1775,4551,16,0,603,
-1,32,4552,16,0,
-603,1,1407,4553,16,
-0,603,1,2740,4554,
-16,0,603,1,256,
-4555,16,0,603,1,
-459,4556,16,0,603,
-1,406,4557,16,0,
-603,1,41,4558,16,
-0,603,1,151,4559,
-16,0,603,1,43,
-4560,16,0,603,1,
-1585,4561,16,0,603,
-1,1990,4562,16,0,
-603,1,2337,4563,16,
-0,603,1,509,4564,
-16,0,603,1,52,
-4565,16,0,603,1,
-381,4566,16,0,603,
-1,447,4567,16,0,
-603,1,166,4568,16,
-0,603,1,462,4569,
-16,0,603,1,277,
-4570,16,0,603,1,
-1695,4571,16,0,603,
-1,62,4572,16,0,
-663,1,1153,4573,16,
-0,603,1,2106,4574,
-16,0,603,1,1335,
-4575,16,0,603,1,
-71,4576,16,0,603,
-1,182,4577,16,0,
-603,1,76,4578,16,
-0,603,1,79,4579,
-16,0,603,1,1933,
-4580,16,0,603,1,
-299,4581,16,0,603,
-1,85,4582,16,0,
-603,1,1515,4583,16,
-0,603,1,2198,4584,
-16,0,603,1,89,
-4585,16,0,603,1,
-1834,4586,16,0,603,
-1,1622,4587,16,0,
-603,1,2413,4588,16,
-0,603,1,2075,4589,
-16,0,603,1,1731,
-4590,16,0,603,1,
-97,4591,16,0,603,
-1,1297,4592,16,0,
-603,1,1189,4593,16,
-0,603,1,102,4594,
-16,0,603,1,1261,
-4595,16,0,603,1,
-322,4596,16,0,603,
-1,1958,4597,16,0,
-603,1,199,4598,16,
-0,603,1,1371,4599,
-16,0,603,1,217,
-4600,16,0,603,1,
-142,4601,19,677,1,
-142,4602,5,2,1,
-459,4603,16,0,675,
-1,41,4604,16,0,
-747,1,143,4605,19,
-681,1,143,4606,5,
-3,1,462,4607,16,
-0,679,1,459,4608,
-16,0,706,1,41,
-4609,16,0,706,1,
-144,4610,19,4611,4,
-36,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,1,144,4606,
-1,145,4612,19,595,
-1,145,4613,5,68,
-1,1901,4614,16,0,
-593,1,1479,4615,16,
-0,593,1,112,4616,
-16,0,593,1,2293,
-4617,16,0,593,1,
-1804,4618,16,0,593,
-1,431,4619,16,0,
-593,1,1443,4620,16,
-0,593,1,1756,4621,
-16,0,593,1,124,
-4622,16,0,593,1,
-525,4623,16,0,593,
-1,236,4624,16,0,
-593,1,346,4625,16,
-0,593,1,1876,4626,
-16,0,593,1,1659,
-4627,16,0,593,1,
-1225,4628,16,0,593,
-1,1117,4629,16,0,
-593,1,137,4630,16,
-0,593,1,2318,4631,
-16,0,593,1,1775,
-4632,16,0,593,1,
-32,4633,16,0,593,
-1,1407,4634,16,0,
-593,1,2740,4635,16,
-0,593,1,256,4636,
-16,0,593,1,459,
-4637,16,0,593,1,
-406,4638,16,0,593,
-1,41,4639,16,0,
-593,1,151,4640,16,
-0,593,1,43,4641,
-16,0,593,1,1585,
-4642,16,0,593,1,
-1990,4643,16,0,593,
-1,2337,4644,16,0,
-593,1,509,4645,16,
-0,593,1,52,4646,
-16,0,593,1,381,
-4647,16,0,593,1,
-447,4648,16,0,593,
-1,166,4649,16,0,
-593,1,462,4650,16,
-0,593,1,277,4651,
-16,0,593,1,1695,
-4652,16,0,593,1,
-62,4653,16,0,664,
-1,1153,4654,16,0,
-593,1,2106,4655,16,
-0,593,1,1335,4656,
-16,0,593,1,71,
-4657,16,0,593,1,
-182,4658,16,0,593,
-1,76,4659,16,0,
-593,1,79,4660,16,
-0,593,1,1933,4661,
-16,0,593,1,299,
-4662,16,0,593,1,
-85,4663,16,0,593,
-1,1515,4664,16,0,
-593,1,2198,4665,16,
-0,593,1,89,4666,
-16,0,593,1,1834,
-4667,16,0,593,1,
-1622,4668,16,0,593,
-1,2413,4669,16,0,
-593,1,2075,4670,16,
-0,593,1,1731,4671,
-16,0,593,1,97,
-4672,16,0,593,1,
-1297,4673,16,0,593,
-1,1189,4674,16,0,
-593,1,102,4675,16,
-0,593,1,1261,4676,
-16,0,593,1,322,
-4677,16,0,593,1,
-1958,4678,16,0,593,
-1,199,4679,16,0,
-593,1,1371,4680,16,
-0,593,1,217,4681,
-16,0,593,1,146,
-4682,19,4683,4,28,
-86,0,101,0,99,
-0,116,0,111,0,
-114,0,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,1,146,
-4613,1,147,4684,19,
-4685,4,32,82,0,
-111,0,116,0,97,
-0,116,0,105,0,
-111,0,110,0,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-1,147,4613,1,148,
-4686,19,4687,4,24,
-76,0,105,0,115,
-0,116,0,67,0,
-111,0,110,0,115,
-0,116,0,97,0,
-110,0,116,0,1,
-148,4613,1,149,4688,
-19,180,1,149,4689,
-5,67,1,1901,4690,
-16,0,661,1,1479,
-4691,16,0,584,1,
-112,4692,16,0,264,
-1,2293,4693,16,0,
-288,1,1804,4694,16,
-0,661,1,431,4695,
-16,0,656,1,1443,
-4696,16,0,518,1,
-1756,4697,16,0,759,
-1,124,4698,16,0,
-272,1,525,4699,16,
-0,320,1,236,4700,
-16,0,353,1,346,
-4701,16,0,547,1,
-1876,4702,16,0,332,
-1,1659,4703,16,0,
-759,1,1225,4704,16,
-0,263,1,1117,4705,
-16,0,230,1,137,
-4706,16,0,287,1,
-2318,4707,16,0,759,
-1,1775,4708,16,0,
-661,1,32,4709,16,
-0,661,1,1407,4710,
-16,0,538,1,2740,
-4711,16,0,738,1,
-256,4712,16,0,407,
-1,459,4713,16,0,
-178,1,406,4714,16,
-0,641,1,41,4715,
-16,0,178,1,151,
-4716,16,0,298,1,
-43,4717,16,0,709,
-1,1990,4718,16,0,
-661,1,2337,4719,16,
-0,661,1,509,4720,
-16,0,734,1,52,
-4721,16,0,669,1,
-381,4722,16,0,608,
-1,447,4723,16,0,
-320,1,166,4724,16,
-0,309,1,462,4725,
-16,0,178,1,277,
-4726,16,0,452,1,
-1695,4727,16,0,284,
-1,1261,4728,16,0,
-296,1,1153,4729,16,
-0,185,1,2106,4730,
-16,0,661,1,1335,
-4731,16,0,340,1,
-71,4732,16,0,214,
-1,182,4733,16,0,
-320,1,76,4734,16,
-0,606,1,79,4735,
-16,0,229,1,1933,
-4736,16,0,419,1,
-299,4737,16,0,484,
-1,85,4738,16,0,
-514,1,1515,4739,16,
-0,640,1,2198,4740,
-16,0,661,1,89,
-4741,16,0,244,1,
-1834,4742,16,0,308,
-1,1622,4743,16,0,
-733,1,2413,4744,16,
-0,661,1,2075,4745,
-16,0,661,1,1731,
-4746,16,0,265,1,
-97,4747,16,0,423,
-1,1297,4748,16,0,
-342,1,1189,4749,16,
-0,228,1,102,4750,
-16,0,253,1,1585,
-4751,16,0,743,1,
-322,4752,16,0,515,
-1,1958,4753,16,0,
-661,1,199,4754,16,
-0,331,1,1371,4755,
-16,0,408,1,217,
-4756,16,0,339,1,
-150,4757,19,4758,4,
-36,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,69,0,120,
+595,1,1990,4538,16,
+0,595,1,32,4539,
+16,0,595,1,1958,
+4540,16,0,595,1,
+1775,4541,16,0,595,
+1,139,4542,19,594,
+1,139,4543,5,11,
+1,2075,4544,16,0,
+592,1,2337,4545,16,
+0,592,1,2413,4546,
+16,0,592,1,1901,
+4547,16,0,592,1,
+2198,4548,16,0,592,
+1,2106,4549,16,0,
+592,1,1804,4550,16,
+0,592,1,1990,4551,
+16,0,592,1,32,
+4552,16,0,592,1,
+1958,4553,16,0,592,
+1,1775,4554,16,0,
+592,1,140,4555,19,
+591,1,140,4556,5,
+11,1,2075,4557,16,
+0,589,1,2337,4558,
+16,0,589,1,2413,
+4559,16,0,589,1,
+1901,4560,16,0,589,
+1,2198,4561,16,0,
+589,1,2106,4562,16,
+0,589,1,1804,4563,
+16,0,589,1,1990,
+4564,16,0,589,1,
+32,4565,16,0,589,
+1,1958,4566,16,0,
+589,1,1775,4567,16,
+0,589,1,141,4568,
+19,588,1,141,4569,
+5,11,1,2075,4570,
+16,0,586,1,2337,
+4571,16,0,586,1,
+2413,4572,16,0,586,
+1,1901,4573,16,0,
+586,1,2198,4574,16,
+0,586,1,2106,4575,
+16,0,586,1,1804,
+4576,16,0,586,1,
+1990,4577,16,0,586,
+1,32,4578,16,0,
+586,1,1958,4579,16,
+0,586,1,1775,4580,
+16,0,586,1,142,
+4581,19,585,1,142,
+4582,5,11,1,2075,
+4583,16,0,583,1,
+2337,4584,16,0,583,
+1,2413,4585,16,0,
+583,1,1901,4586,16,
+0,583,1,2198,4587,
+16,0,583,1,2106,
+4588,16,0,583,1,
+1804,4589,16,0,583,
+1,1990,4590,16,0,
+583,1,32,4591,16,
+0,583,1,1958,4592,
+16,0,583,1,1775,
+4593,16,0,583,1,
+143,4594,19,156,1,
+143,4595,5,3,1,
+1756,4596,16,0,313,
+1,2318,4597,16,0,
+325,1,1659,4598,16,
+0,154,1,144,4599,
+19,624,1,144,4600,
+5,68,1,1901,4601,
+16,0,622,1,1479,
+4602,16,0,622,1,
+112,4603,16,0,622,
+1,2293,4604,16,0,
+622,1,1804,4605,16,
+0,622,1,431,4606,
+16,0,622,1,1443,
+4607,16,0,622,1,
+1756,4608,16,0,622,
+1,124,4609,16,0,
+622,1,525,4610,16,
+0,622,1,236,4611,
+16,0,622,1,346,
+4612,16,0,622,1,
+1876,4613,16,0,622,
+1,1659,4614,16,0,
+622,1,1225,4615,16,
+0,622,1,1117,4616,
+16,0,622,1,137,
+4617,16,0,622,1,
+2318,4618,16,0,622,
+1,1775,4619,16,0,
+622,1,32,4620,16,
+0,622,1,1407,4621,
+16,0,622,1,2761,
+4622,16,0,622,1,
+256,4623,16,0,622,
+1,459,4624,16,0,
+622,1,406,4625,16,
+0,622,1,41,4626,
+16,0,622,1,151,
+4627,16,0,622,1,
+43,4628,16,0,622,
+1,1585,4629,16,0,
+622,1,1990,4630,16,
+0,622,1,2337,4631,
+16,0,622,1,509,
+4632,16,0,622,1,
+52,4633,16,0,622,
+1,381,4634,16,0,
+622,1,447,4635,16,
+0,622,1,166,4636,
+16,0,622,1,462,
+4637,16,0,622,1,
+277,4638,16,0,622,
+1,1695,4639,16,0,
+622,1,62,4640,16,
+0,685,1,1153,4641,
+16,0,622,1,2106,
+4642,16,0,622,1,
+1335,4643,16,0,622,
+1,71,4644,16,0,
+622,1,182,4645,16,
+0,622,1,76,4646,
+16,0,622,1,79,
+4647,16,0,622,1,
+1933,4648,16,0,622,
+1,299,4649,16,0,
+622,1,85,4650,16,
+0,622,1,1515,4651,
+16,0,622,1,2198,
+4652,16,0,622,1,
+89,4653,16,0,622,
+1,1834,4654,16,0,
+622,1,1622,4655,16,
+0,622,1,2413,4656,
+16,0,622,1,2075,
+4657,16,0,622,1,
+1731,4658,16,0,622,
+1,97,4659,16,0,
+622,1,1297,4660,16,
+0,622,1,1189,4661,
+16,0,622,1,102,
+4662,16,0,622,1,
+1261,4663,16,0,622,
+1,322,4664,16,0,
+622,1,1958,4665,16,
+0,622,1,199,4666,
+16,0,622,1,1371,
+4667,16,0,622,1,
+217,4668,16,0,622,
+1,145,4669,19,699,
+1,145,4670,5,2,
+1,459,4671,16,0,
+697,1,41,4672,16,
+0,770,1,146,4673,
+19,703,1,146,4674,
+5,3,1,462,4675,
+16,0,701,1,459,
+4676,16,0,723,1,
+41,4677,16,0,723,
+1,147,4678,19,4679,
+4,36,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,1,150,4689,
-1,151,4759,19,4760,
-4,30,73,0,100,
-0,101,0,110,0,
-116,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,1,151,4689,
-1,152,4761,19,4762,
-4,36,73,0,100,
-0,101,0,110,0,
-116,0,68,0,111,
+110,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,1,147,
+4674,1,148,4680,19,
+620,1,148,4681,5,
+68,1,1901,4682,16,
+0,618,1,1479,4683,
+16,0,618,1,112,
+4684,16,0,618,1,
+2293,4685,16,0,618,
+1,1804,4686,16,0,
+618,1,431,4687,16,
+0,618,1,1443,4688,
+16,0,618,1,1756,
+4689,16,0,618,1,
+124,4690,16,0,618,
+1,525,4691,16,0,
+618,1,236,4692,16,
+0,618,1,346,4693,
+16,0,618,1,1876,
+4694,16,0,618,1,
+1659,4695,16,0,618,
+1,1225,4696,16,0,
+618,1,1117,4697,16,
+0,618,1,137,4698,
+16,0,618,1,2318,
+4699,16,0,618,1,
+1775,4700,16,0,618,
+1,32,4701,16,0,
+618,1,1407,4702,16,
+0,618,1,2761,4703,
+16,0,618,1,256,
+4704,16,0,618,1,
+459,4705,16,0,618,
+1,406,4706,16,0,
+618,1,41,4707,16,
+0,618,1,151,4708,
+16,0,618,1,43,
+4709,16,0,618,1,
+1585,4710,16,0,618,
+1,1990,4711,16,0,
+618,1,2337,4712,16,
+0,618,1,509,4713,
+16,0,618,1,52,
+4714,16,0,618,1,
+381,4715,16,0,618,
+1,447,4716,16,0,
+618,1,166,4717,16,
+0,618,1,462,4718,
+16,0,618,1,277,
+4719,16,0,618,1,
+1695,4720,16,0,618,
+1,62,4721,16,0,
+686,1,1153,4722,16,
+0,618,1,2106,4723,
+16,0,618,1,1335,
+4724,16,0,618,1,
+71,4725,16,0,618,
+1,182,4726,16,0,
+618,1,76,4727,16,
+0,618,1,79,4728,
+16,0,618,1,1933,
+4729,16,0,618,1,
+299,4730,16,0,618,
+1,85,4731,16,0,
+618,1,1515,4732,16,
+0,618,1,2198,4733,
+16,0,618,1,89,
+4734,16,0,618,1,
+1834,4735,16,0,618,
+1,1622,4736,16,0,
+618,1,2413,4737,16,
+0,618,1,2075,4738,
+16,0,618,1,1731,
+4739,16,0,618,1,
+97,4740,16,0,618,
+1,1297,4741,16,0,
+618,1,1189,4742,16,
+0,618,1,102,4743,
+16,0,618,1,1261,
+4744,16,0,618,1,
+322,4745,16,0,618,
+1,1958,4746,16,0,
+618,1,199,4747,16,
+0,618,1,1371,4748,
+16,0,618,1,217,
+4749,16,0,618,1,
+149,4750,19,4751,4,
+28,86,0,101,0,
+99,0,116,0,111,
+0,114,0,67,0,
+111,0,110,0,115,
+0,116,0,97,0,
+110,0,116,0,1,
+149,4681,1,150,4752,
+19,4753,4,32,82,
+0,111,0,116,0,
+97,0,116,0,105,
+0,111,0,110,0,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,1,150,4681,1,
+151,4754,19,4755,4,
+24,76,0,105,0,
+115,0,116,0,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+1,151,4681,1,152,
+4756,19,184,1,152,
+4757,5,67,1,1901,
+4758,16,0,683,1,
+1479,4759,16,0,609,
+1,112,4760,16,0,
+267,1,2293,4761,16,
+0,296,1,1804,4762,
+16,0,683,1,431,
+4763,16,0,678,1,
+1443,4764,16,0,540,
+1,1756,4765,16,0,
+777,1,124,4766,16,
+0,276,1,525,4767,
+16,0,336,1,236,
+4768,16,0,374,1,
+346,4769,16,0,572,
+1,1876,4770,16,0,
+348,1,1659,4771,16,
+0,777,1,1225,4772,
+16,0,266,1,1117,
+4773,16,0,236,1,
+137,4774,16,0,295,
+1,2318,4775,16,0,
+777,1,1775,4776,16,
+0,683,1,32,4777,
+16,0,683,1,1407,
+4778,16,0,563,1,
+2761,4779,16,0,312,
+1,256,4780,16,0,
+428,1,459,4781,16,
+0,182,1,406,4782,
+16,0,662,1,41,
+4783,16,0,182,1,
+151,4784,16,0,311,
+1,43,4785,16,0,
+735,1,1990,4786,16,
+0,683,1,2337,4787,
+16,0,683,1,509,
+4788,16,0,755,1,
+52,4789,16,0,691,
+1,381,4790,16,0,
+627,1,447,4791,16,
+0,336,1,166,4792,
+16,0,323,1,462,
+4793,16,0,182,1,
+277,4794,16,0,471,
+1,1695,4795,16,0,
+292,1,1261,4796,16,
+0,310,1,1153,4797,
+16,0,189,1,2106,
+4798,16,0,683,1,
+1335,4799,16,0,358,
+1,71,4800,16,0,
+220,1,182,4801,16,
+0,336,1,76,4802,
+16,0,625,1,79,
+4803,16,0,235,1,
+1933,4804,16,0,440,
+1,299,4805,16,0,
+502,1,85,4806,16,
+0,530,1,1515,4807,
+16,0,649,1,2198,
+4808,16,0,683,1,
+89,4809,16,0,248,
+1,1834,4810,16,0,
+322,1,1622,4811,16,
+0,754,1,2413,4812,
+16,0,683,1,2075,
+4813,16,0,683,1,
+1731,4814,16,0,269,
+1,97,4815,16,0,
+444,1,1297,4816,16,
+0,360,1,1189,4817,
+16,0,234,1,102,
+4818,16,0,256,1,
+1585,4819,16,0,764,
+1,322,4820,16,0,
+532,1,1958,4821,16,
+0,683,1,199,4822,
+16,0,347,1,1371,
+4823,16,0,429,1,
+217,4824,16,0,357,
+1,153,4825,19,4826,
+4,36,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
 0,116,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
-0,110,0,1,152,
-4689,1,153,4763,19,
-4764,4,44,70,0,
-117,0,110,0,99,
-0,116,0,105,0,
-111,0,110,0,67,
-0,97,0,108,0,
-108,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,1,153,4689,
-1,154,4765,19,4766,
-4,32,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,1,
-154,4689,1,155,4767,
-19,4768,4,30,85,
-0,110,0,97,0,
-114,0,121,0,69,
+0,110,0,1,153,
+4757,1,154,4827,19,
+4828,4,30,73,0,
+100,0,101,0,110,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,154,
+4757,1,155,4829,19,
+4830,4,36,73,0,
+100,0,101,0,110,
+0,116,0,68,0,
+111,0,116,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,1,
-155,4689,1,156,4769,
-19,4770,4,36,84,
-0,121,0,112,0,
-101,0,99,0,97,
-0,115,0,116,0,
+155,4757,1,156,4831,
+19,4832,4,44,70,
+0,117,0,110,0,
+99,0,116,0,105,
+0,111,0,110,0,
+67,0,97,0,108,
+0,108,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,156,
+4757,1,157,4833,19,
+4834,4,32,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-1,156,4689,1,157,
-4771,19,4772,4,42,
-80,0,97,0,114,
-0,101,0,110,0,
-116,0,104,0,101,
-0,115,0,105,0,
-115,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,1,157,4689,
-1,158,4773,19,4774,
-4,56,73,0,110,
-0,99,0,114,0,
-101,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
+1,157,4757,1,158,
+4835,19,4836,4,30,
+85,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
 0,114,0,101,0,
-109,0,101,0,110,
-0,116,0,69,0,
+115,0,115,0,105,
+0,111,0,110,0,
+1,158,4757,1,159,
+4837,19,4838,4,36,
+84,0,121,0,112,
+0,101,0,99,0,
+97,0,115,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,1,159,4757,1,
+160,4839,19,4840,4,
+42,80,0,97,0,
+114,0,101,0,110,
+0,116,0,104,0,
+101,0,115,0,105,
+0,115,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
-0,110,0,1,158,
-4689,1,160,4775,19,
-786,1,160,4157,1,
-161,4776,19,775,1,
-161,4157,1,162,4777,
-19,3445,1,162,4160,
-1,163,4778,19,3435,
-1,163,4160,1,164,
-4779,19,3440,1,164,
-4160,1,165,4780,19,
-3430,1,165,4160,1,
-166,4781,19,3421,1,
-166,4163,1,167,4782,
-19,3456,1,167,4163,
-1,168,4783,19,3462,
-1,168,4167,1,169,
-4784,19,3451,1,169,
-4167,1,170,4785,19,
-791,1,170,4171,1,
-171,4786,19,781,1,
-171,4171,1,172,4787,
-19,769,1,172,4175,
-1,173,4788,19,796,
-1,173,4175,1,174,
-4789,19,1738,1,174,
-4181,1,175,4790,19,
-1808,1,175,4181,1,
-176,4791,19,1733,1,
-176,4181,1,177,4792,
-19,1803,1,177,4181,
-1,178,4793,19,1728,
-1,178,4181,1,179,
-4794,19,1798,1,179,
-4181,1,180,4795,19,
-1723,1,180,4181,1,
-181,4796,19,1793,1,
-181,4181,1,182,4797,
-19,1718,1,182,4181,
-1,183,4798,19,1788,
-1,183,4181,1,184,
-4799,19,1713,1,184,
-4181,1,185,4800,19,
-1783,1,185,4181,1,
-186,4801,19,1777,1,
-186,4185,1,187,4802,
-19,1771,1,187,4191,
-1,188,4803,19,1765,
-1,188,4197,1,189,
-4804,19,1758,1,189,
-4203,1,190,4805,19,
-1751,1,190,4209,1,
-191,4806,19,1744,1,
-191,4215,1,192,4807,
-19,1853,1,192,4221,
-1,193,4808,19,1828,
-1,193,4221,1,194,
-4809,19,2231,1,194,
-4226,1,195,4810,19,
-2200,1,195,4229,1,
-196,4811,19,2192,1,
-196,4232,1,197,4812,
-19,2222,1,197,4235,
-1,198,4813,19,1203,
-1,198,4238,1,199,
-4814,19,2207,1,199,
-4257,1,200,4815,19,
-1874,1,200,4260,1,
-201,4816,19,2186,1,
-201,4264,1,202,4817,
-19,1816,1,202,4267,
-1,203,4818,19,987,
-1,203,4327,1,204,
-4819,19,971,1,204,
-4327,1,205,4820,19,
-977,1,205,4348,1,
-206,4821,19,965,1,
-206,4348,1,207,4822,
-19,1231,1,207,4364,
-1,208,4823,19,868,
-1,208,4351,1,209,
-4824,19,982,1,209,
-4351,1,210,4825,19,
-863,1,210,4351,1,
-211,4826,19,888,1,
-211,4351,1,212,4827,
-19,857,1,212,4351,
-1,213,4828,19,851,
-1,213,4351,1,214,
-4829,19,846,1,214,
-4351,1,215,4830,19,
-841,1,215,4351,1,
-216,4831,19,835,1,
-216,4351,1,217,4832,
-19,830,1,217,4351,
-1,218,4833,19,825,
-1,218,4351,1,219,
-4834,19,820,1,219,
-4351,1,220,4835,19,
-815,1,220,4351,1,
-221,4836,19,1238,1,
-221,4436,1,222,4837,
-19,1377,1,222,4449,
-1,223,4838,19,1225,
-1,223,4462,1,224,
-4839,19,1365,1,224,
-4462,1,225,4840,19,
-1005,1,225,4475,1,
-226,4841,19,808,1,
-226,4475,1,227,4842,
-19,903,1,227,4475,
-1,228,4843,19,931,
-1,228,4475,1,229,
-4844,19,950,1,229,
-4488,1,230,4845,19,
-996,1,230,4488,1,
-231,4846,19,911,1,
-231,4501,1,232,4847,
-19,924,1,232,4501,
-1,233,4848,19,877,
-1,233,4514,1,234,
-4849,19,916,1,234,
-4514,1,235,4850,19,
-1563,1,235,4527,1,
-236,4851,19,1244,1,
-236,4527,1,237,4852,
-19,1595,1,237,4527,
-1,238,4853,19,1627,
-1,238,4527,1,239,
-4854,19,1493,1,239,
-4377,1,240,4855,19,
-1552,1,240,4377,1,
-241,4856,19,1219,1,
-241,4390,1,242,4857,
-19,1659,1,242,4390,
-1,243,4858,19,1590,
-1,243,4390,1,244,
-4859,19,1537,1,244,
-4390,1,245,4860,19,
-1461,1,245,4390,1,
-246,4861,19,1387,1,
-246,4390,1,247,4862,
-19,1397,1,247,4390,
-1,248,4863,19,1214,
-1,248,4390,1,249,
-4864,19,1643,1,249,
-4390,1,250,4865,19,
-1585,1,250,4390,1,
-251,4866,19,1527,1,
-251,4390,1,252,4867,
-19,1450,1,252,4390,
-1,253,4868,19,1413,
-1,253,4390,1,254,
-4869,19,1197,1,254,
-4390,1,255,4870,19,
-1547,1,255,4390,1,
-256,4871,19,1573,1,
-256,4390,1,257,4872,
-19,1520,1,257,4390,
-1,258,4873,19,1542,
-1,258,4390,1,259,
-4874,19,1353,1,259,
-4390,1,260,4875,19,
-1256,1,260,4390,1,
-261,4876,19,1186,1,
-261,4390,1,262,4877,
-19,1617,1,262,4390,
-1,263,4878,19,1568,
-1,263,4390,1,264,
-4879,19,1515,1,264,
-4390,1,265,4880,19,
-1382,1,265,4423,1,
-266,4881,19,1360,1,
-266,4423,1,267,4882,
-19,1648,1,267,4613,
-1,268,4883,19,1672,
-1,268,4613,1,269,
-4884,19,1638,1,269,
-4613,1,270,4885,19,
-1633,1,270,4613,1,
-271,4886,19,1654,1,
-271,4613,1,272,4887,
-19,1601,1,272,4613,
-1,273,4888,19,1306,
-1,273,4613,1,274,
-4889,19,1482,1,274,
-4689,1,275,4890,19,
-1267,1,275,4689,1,
-276,4891,19,1274,1,
-276,4689,1,277,4892,
-19,1295,1,277,4689,
-1,278,4893,19,1290,
-1,278,4689,1,279,
-4894,19,1285,1,279,
-4689,1,280,4895,19,
-1280,1,280,4689,1,
-281,4896,19,1471,1,
-281,4689,1,282,4897,
-19,1499,1,282,4689,
-1,283,4898,19,1476,
-1,283,4689,1,284,
-4899,19,1466,1,284,
-4689,1,285,4900,19,
-1456,1,285,4689,1,
-286,4901,19,1439,1,
-286,4689,1,287,4902,
-19,1392,1,287,4689,
-1,288,4903,19,1300,
-1,288,4689,1,289,
-4904,19,1261,1,289,
-4689,1,290,4905,19,
-1209,1,290,4689,1,
-291,4906,19,1667,1,
-291,4689,1,292,4907,
-19,1622,1,292,4689,
-1,293,4908,19,1612,
-1,293,4689,1,294,
-4909,19,1607,1,294,
-4689,1,295,4910,19,
-1558,1,295,4689,1,
-296,4911,19,1532,1,
-296,4689,1,297,4912,
-19,1509,1,297,4689,
-1,298,4913,19,1504,
-1,298,4689,1,299,
-4914,19,1445,1,299,
-4689,1,300,4915,19,
-1421,1,300,4689,1,
-301,4916,19,1487,1,
-301,4689,1,302,4917,
-19,1579,1,302,4689,
-1,303,4918,19,1434,
-1,303,4689,1,304,
-4919,19,1428,1,304,
-4689,1,305,4920,19,
-1408,1,305,4689,1,
-306,4921,19,1371,1,
-306,4689,1,307,4922,
-19,1348,1,307,4689,
-1,308,4923,19,1192,
-1,308,4689,1,309,
-4924,19,1682,1,309,
-4689,1,310,4925,19,
-1312,1,310,4689,1,
-311,4926,19,1318,1,
-311,4689,1,312,4927,
-19,1338,1,312,4689,
-1,313,4928,19,1328,
-1,313,4689,1,314,
-4929,19,1333,1,314,
-4689,1,315,4930,19,
-1323,1,315,4689,1,
-316,4931,19,1677,1,
-316,4689,1,317,4932,
-19,1343,1,317,4689,
-1,318,4933,19,1403,
-1,318,4532,1,319,
-4934,19,1868,1,319,
-4602,1,320,4935,19,
-1859,1,320,4602,1,
-321,4936,19,1838,1,
-321,4606,1,322,4937,
-19,2180,1,322,4271,
-1,323,4938,19,2175,
-1,323,4271,1,324,
-4939,19,2170,1,324,
-4271,1,325,4940,19,
-2165,1,325,4271,1,
-326,4941,19,2160,1,
-326,4271,1,327,4942,
-19,2155,1,327,4271,
-1,328,4943,19,2150,
-1,328,4271,1,329,
-4944,19,2139,1,329,
-4291,1,330,4945,19,
-2134,1,330,4291,1,
-331,4946,19,2129,1,
-331,4291,1,332,4947,
-19,2124,1,332,4291,
-1,333,4948,19,2119,
-1,333,4291,1,334,
-4949,19,2114,1,334,
-4291,1,335,4950,19,
-2109,1,335,4291,1,
-336,4951,19,2104,1,
-336,4291,1,337,4952,
-19,2099,1,337,4291,
-1,338,4953,19,1930,
-1,338,4291,1,339,
-4954,19,2093,1,339,
-4297,1,340,4955,19,
-2088,1,340,4297,1,
-341,4956,19,2083,1,
-341,4297,1,342,4957,
-19,1922,1,342,4297,
-1,343,4958,19,2078,
-1,343,4297,1,344,
-4959,19,2073,1,344,
-4297,1,345,4960,19,
-2068,1,345,4297,1,
-346,4961,19,2063,1,
-346,4297,1,347,4962,
-19,2058,1,347,4303,
-1,348,4963,19,2053,
-1,348,4303,1,349,
-4964,19,1914,1,349,
-4309,1,350,4965,19,
-2046,1,350,4309,1,
-351,4966,19,2041,1,
-351,4309,1,352,4967,
-19,2036,1,352,4309,
-1,353,4968,19,1908,
-1,353,4309,1,354,
-4969,19,2030,1,354,
-4309,1,355,4970,19,
-1960,1,355,4309,1,
-356,4971,19,2025,1,
-356,4309,1,357,4972,
-19,2020,1,357,4309,
-1,358,4973,19,2015,
-1,358,4309,1,359,
-4974,19,2010,1,359,
-4315,1,360,4975,19,
-2005,1,360,4315,1,
-361,4976,19,2000,1,
-361,4315,1,362,4977,
-19,1994,1,362,4321,
-1,363,4978,19,4979,
-4,50,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-76,0,105,0,115,
-0,116,0,95,0,
-51,0,1,363,4221,
-1,364,4980,19,4981,
-4,28,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,76,0,
-105,0,115,0,116,
-0,95,0,51,0,
-1,364,4602,1,365,
-4982,19,4983,4,50,
+0,110,0,1,160,
+4757,1,161,4841,19,
+4842,4,56,73,0,
+110,0,99,0,114,
+0,101,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,114,0,101,
+0,109,0,101,0,
+110,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,1,
+161,4757,1,163,4843,
+19,792,1,163,4206,
+1,164,4844,19,787,
+1,164,4206,1,165,
+4845,19,3478,1,165,
+4209,1,166,4846,19,
+3496,1,166,4209,1,
+167,4847,19,3473,1,
+167,4209,1,168,4848,
+19,3468,1,168,4209,
+1,169,4849,19,3501,
+1,169,4212,1,170,
+4850,19,3484,1,170,
+4212,1,171,4851,19,
+3491,1,171,4216,1,
+172,4852,19,3507,1,
+172,4216,1,173,4853,
+19,803,1,173,4220,
+1,174,4854,19,798,
+1,174,4220,1,175,
+4855,19,814,1,175,
+4224,1,176,4856,19,
+809,1,176,4224,1,
+177,4857,19,1789,1,
+177,4230,1,178,4858,
+19,1758,1,178,4230,
+1,179,4859,19,1784,
+1,179,4230,1,180,
+4860,19,1837,1,180,
+4230,1,181,4861,19,
+1843,1,181,4230,1,
+182,4862,19,1747,1,
+182,4230,1,183,4863,
+19,1779,1,183,4230,
+1,184,4864,19,1742,
+1,184,4230,1,185,
+4865,19,1774,1,185,
+4230,1,186,4866,19,
+1737,1,186,4230,1,
+187,4867,19,1769,1,
+187,4230,1,188,4868,
+19,1732,1,188,4230,
+1,189,4869,19,1764,
+1,189,4230,1,190,
+4870,19,1832,1,190,
+4230,1,191,4871,19,
+1808,1,191,4234,1,
+192,4872,19,1820,1,
+192,4240,1,193,4873,
+19,1814,1,193,4246,
+1,194,4874,19,1802,
+1,194,4252,1,195,
+4875,19,1827,1,195,
+4258,1,196,4876,19,
+1795,1,196,4264,1,
+197,4877,19,1753,1,
+197,4270,1,198,4878,
+19,1895,1,198,4276,
+1,199,4879,19,1871,
+1,199,4276,1,200,
+4880,19,2280,1,200,
+4281,1,201,4881,19,
+2245,1,201,4284,1,
+202,4882,19,2239,1,
+202,4287,1,203,4883,
+19,2233,1,203,4290,
+1,204,4884,19,2265,
+1,204,4293,1,205,
+4885,19,1222,1,205,
+4296,1,206,4886,19,
+2253,1,206,4315,1,
+207,4887,19,1917,1,
+207,4318,1,208,4888,
+19,1851,1,208,4323,
+1,209,4889,19,1864,
+1,209,4328,1,210,
+4890,19,1006,1,210,
+4394,1,211,4891,19,
+990,1,211,4394,1,
+212,4892,19,996,1,
+212,4416,1,213,4893,
+19,984,1,213,4416,
+1,214,4894,19,1250,
+1,214,4432,1,215,
+4895,19,887,1,215,
+4419,1,216,4896,19,
+1001,1,216,4419,1,
+217,4897,19,882,1,
+217,4419,1,218,4898,
+19,907,1,218,4419,
+1,219,4899,19,876,
+1,219,4419,1,220,
+4900,19,870,1,220,
+4419,1,221,4901,19,
+865,1,221,4419,1,
+222,4902,19,860,1,
+222,4419,1,223,4903,
+19,854,1,223,4419,
+1,224,4904,19,849,
+1,224,4419,1,225,
+4905,19,844,1,225,
+4419,1,226,4906,19,
+839,1,226,4419,1,
+227,4907,19,834,1,
+227,4419,1,228,4908,
+19,1257,1,228,4504,
+1,229,4909,19,1395,
+1,229,4517,1,230,
+4910,19,1244,1,230,
+4530,1,231,4911,19,
+1383,1,231,4530,1,
+232,4912,19,1023,1,
+232,4543,1,233,4913,
+19,827,1,233,4543,
+1,234,4914,19,922,
+1,234,4543,1,235,
+4915,19,950,1,235,
+4543,1,236,4916,19,
+969,1,236,4556,1,
+237,4917,19,1015,1,
+237,4556,1,238,4918,
+19,930,1,238,4569,
+1,239,4919,19,943,
+1,239,4569,1,240,
+4920,19,896,1,240,
+4582,1,241,4921,19,
+935,1,241,4582,1,
+242,4922,19,1581,1,
+242,4595,1,243,4923,
+19,1263,1,243,4595,
+1,244,4924,19,1613,
+1,244,4595,1,245,
+4925,19,1645,1,245,
+4595,1,246,4926,19,
+1511,1,246,4445,1,
+247,4927,19,1570,1,
+247,4445,1,248,4928,
+19,1238,1,248,4458,
+1,249,4929,19,1677,
+1,249,4458,1,250,
+4930,19,1608,1,250,
+4458,1,251,4931,19,
+1555,1,251,4458,1,
+252,4932,19,1479,1,
+252,4458,1,253,4933,
+19,1405,1,253,4458,
+1,254,4934,19,1415,
+1,254,4458,1,255,
+4935,19,1233,1,255,
+4458,1,256,4936,19,
+1661,1,256,4458,1,
+257,4937,19,1603,1,
+257,4458,1,258,4938,
+19,1545,1,258,4458,
+1,259,4939,19,1468,
+1,259,4458,1,260,
+4940,19,1431,1,260,
+4458,1,261,4941,19,
+1216,1,261,4458,1,
+262,4942,19,1565,1,
+262,4458,1,263,4943,
+19,1591,1,263,4458,
+1,264,4944,19,1538,
+1,264,4458,1,265,
+4945,19,1560,1,265,
+4458,1,266,4946,19,
+1371,1,266,4458,1,
+267,4947,19,1275,1,
+267,4458,1,268,4948,
+19,1204,1,268,4458,
+1,269,4949,19,1635,
+1,269,4458,1,270,
+4950,19,1586,1,270,
+4458,1,271,4951,19,
+1533,1,271,4458,1,
+272,4952,19,1400,1,
+272,4491,1,273,4953,
+19,1378,1,273,4491,
+1,274,4954,19,1666,
+1,274,4681,1,275,
+4955,19,1689,1,275,
+4681,1,276,4956,19,
+1656,1,276,4681,1,
+277,4957,19,1651,1,
+277,4681,1,278,4958,
+19,1672,1,278,4681,
+1,279,4959,19,1619,
+1,279,4681,1,280,
+4960,19,1325,1,280,
+4681,1,281,4961,19,
+1500,1,281,4757,1,
+282,4962,19,1286,1,
+282,4757,1,283,4963,
+19,1293,1,283,4757,
+1,284,4964,19,1314,
+1,284,4757,1,285,
+4965,19,1309,1,285,
+4757,1,286,4966,19,
+1304,1,286,4757,1,
+287,4967,19,1299,1,
+287,4757,1,288,4968,
+19,1489,1,288,4757,
+1,289,4969,19,1517,
+1,289,4757,1,290,
+4970,19,1494,1,290,
+4757,1,291,4971,19,
+1484,1,291,4757,1,
+292,4972,19,1474,1,
+292,4757,1,293,4973,
+19,1457,1,293,4757,
+1,294,4974,19,1410,
+1,294,4757,1,295,
+4975,19,1319,1,295,
+4757,1,296,4976,19,
+1280,1,296,4757,1,
+297,4977,19,1228,1,
+297,4757,1,298,4978,
+19,1684,1,298,4757,
+1,299,4979,19,1640,
+1,299,4757,1,300,
+4980,19,1630,1,300,
+4757,1,301,4981,19,
+1625,1,301,4757,1,
+302,4982,19,1576,1,
+302,4757,1,303,4983,
+19,1550,1,303,4757,
+1,304,4984,19,1527,
+1,304,4757,1,305,
+4985,19,1522,1,305,
+4757,1,306,4986,19,
+1463,1,306,4757,1,
+307,4987,19,1439,1,
+307,4757,1,308,4988,
+19,1505,1,308,4757,
+1,309,4989,19,1597,
+1,309,4757,1,310,
+4990,19,1452,1,310,
+4757,1,311,4991,19,
+1446,1,311,4757,1,
+312,4992,19,1426,1,
+312,4757,1,313,4993,
+19,1389,1,313,4757,
+1,314,4994,19,1366,
+1,314,4757,1,315,
+4995,19,1211,1,315,
+4757,1,316,4996,19,
+1699,1,316,4757,1,
+317,4997,19,1331,1,
+317,4757,1,318,4998,
+19,1336,1,318,4757,
+1,319,4999,19,1356,
+1,319,4757,1,320,
+5000,19,1346,1,320,
+4757,1,321,5001,19,
+1351,1,321,4757,1,
+322,5002,19,1341,1,
+322,4757,1,323,5003,
+19,1694,1,323,4757,
+1,324,5004,19,1361,
+1,324,4757,1,325,
+5005,19,1421,1,325,
+4600,1,326,5006,19,
+1911,1,326,4670,1,
+327,5007,19,1901,1,
+327,4670,1,328,5008,
+19,1881,1,328,4674,
+1,329,5009,19,2225,
+1,329,4332,1,330,
+5010,19,2220,1,330,
+4332,1,331,5011,19,
+2215,1,331,4332,1,
+332,5012,19,2210,1,
+332,4332,1,333,5013,
+19,2205,1,333,4332,
+1,334,5014,19,2200,
+1,334,4332,1,335,
+5015,19,2195,1,335,
+4332,1,336,5016,19,
+2184,1,336,4352,1,
+337,5017,19,2179,1,
+337,4352,1,338,5018,
+19,2174,1,338,4352,
+1,339,5019,19,2169,
+1,339,4352,1,340,
+5020,19,2164,1,340,
+4352,1,341,5021,19,
+2159,1,341,4352,1,
+342,5022,19,2154,1,
+342,4352,1,343,5023,
+19,2149,1,343,4352,
+1,344,5024,19,2144,
+1,344,4352,1,345,
+5025,19,1972,1,345,
+4358,1,346,5026,19,
+2137,1,346,4358,1,
+347,5027,19,2011,1,
+347,4358,1,348,5028,
+19,2131,1,348,4358,
+1,349,5029,19,1965,
+1,349,4358,1,350,
+5030,19,2126,1,350,
+4358,1,351,5031,19,
+2121,1,351,4358,1,
+352,5032,19,2116,1,
+352,4358,1,353,5033,
+19,2111,1,353,4364,
+1,354,5034,19,2106,
+1,354,4364,1,355,
+5035,19,2100,1,355,
+4370,1,356,5036,19,
+1956,1,356,4370,1,
+357,5037,19,2094,1,
+357,4370,1,358,5038,
+19,2089,1,358,4370,
+1,359,5039,19,2084,
+1,359,4370,1,360,
+5040,19,1949,1,360,
+4370,1,361,5041,19,
+2078,1,361,4370,1,
+362,5042,19,2003,1,
+362,4370,1,363,5043,
+19,2073,1,363,4370,
+1,364,5044,19,2068,
+1,364,4370,1,365,
+5045,19,2063,1,365,
+4376,1,366,5046,19,
+2058,1,366,4376,1,
+367,5047,19,2053,1,
+367,4376,1,368,5048,
+19,2047,1,368,4382,
+1,369,5049,19,2041,
+1,369,4388,1,370,
+5050,19,5051,4,50,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
@@ -12286,17 +12565,29 @@ public yyLSLSyntax
 116,0,105,0,111,
 0,110,0,76,0,
 105,0,115,0,116,
-0,95,0,52,0,
-1,365,4221,1,366,
-4984,19,4985,4,28,
+0,95,0,51,0,
+1,370,4276,1,371,
+5052,19,5053,4,28,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
 0,76,0,105,0,
 115,0,116,0,95,
-0,52,0,1,366,
-4602,1,367,4986,19,
-4987,4,50,65,0,
+0,51,0,1,371,
+4670,1,372,5054,19,
+5055,4,50,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,76,0,105,0,
+115,0,116,0,95,
+0,52,0,1,372,
+4276,1,373,5056,19,
+5057,4,50,65,0,
 114,0,103,0,117,
 0,109,0,101,0,
 110,0,116,0,68,
@@ -12306,10 +12597,19 @@ public yyLSLSyntax
 105,0,111,0,110,
 0,76,0,105,0,
 115,0,116,0,95,
-0,53,0,1,367,
-4221,2,0,0};
+0,53,0,1,373,
+4276,1,374,5058,19,
+5059,4,28,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,76,
+0,105,0,115,0,
+116,0,95,0,52,
+0,1,374,4670,2,
+0,0};
 new Sfactory(this,"ExpressionArgument_1",new SCreator(ExpressionArgument_1_factory));
 new Sfactory(this,"VectorArgStateEvent",new SCreator(VectorArgStateEvent_factory));
+new Sfactory(this,"IntVecVecArgStateEvent",new SCreator(IntVecVecArgStateEvent_factory));
 new Sfactory(this,"IntArgStateEvent_1",new SCreator(IntArgStateEvent_1_factory));
 new Sfactory(this,"SimpleAssignment_9",new SCreator(SimpleAssignment_9_factory));
 new Sfactory(this,"StatementList_1",new SCreator(StatementList_1_factory));
@@ -12384,14 +12684,15 @@ new Sfactory(this,"SimpleAssignment_13",new SCreator(SimpleAssignment_13_factory
 new Sfactory(this,"JumpLabel",new SCreator(JumpLabel_factory));
 new Sfactory(this,"SimpleAssignment_15",new SCreator(SimpleAssignment_15_factory));
 new Sfactory(this,"StateBody_10",new SCreator(StateBody_10_factory));
-new Sfactory(this,"StateBody_11",new SCreator(StateBody_11_factory));
+new Sfactory(this,"IntVecVecArgEvent",new SCreator(IntVecVecArgEvent_factory));
 new Sfactory(this,"StateBody_12",new SCreator(StateBody_12_factory));
-new Sfactory(this,"JumpStatement_1",new SCreator(JumpStatement_1_factory));
+new Sfactory(this,"StateBody_14",new SCreator(StateBody_14_factory));
 new Sfactory(this,"GlobalDefinitions",new SCreator(GlobalDefinitions_factory));
 new Sfactory(this,"ConstantExpression_1",new SCreator(ConstantExpression_1_factory));
 new Sfactory(this,"VoidArgEvent_4",new SCreator(VoidArgEvent_4_factory));
 new Sfactory(this,"FunctionCall_1",new SCreator(FunctionCall_1_factory));
 new Sfactory(this,"Assignment_2",new SCreator(Assignment_2_factory));
+new Sfactory(this,"IntVecVecArgEvent_1",new SCreator(IntVecVecArgEvent_1_factory));
 new Sfactory(this,"TypecastExpression_1",new SCreator(TypecastExpression_1_factory));
 new Sfactory(this,"SimpleAssignment_21",new SCreator(SimpleAssignment_21_factory));
 new Sfactory(this,"SimpleAssignment_22",new SCreator(SimpleAssignment_22_factory));
@@ -12408,6 +12709,7 @@ new Sfactory(this,"GlobalVariableDeclaration",new SCreator(GlobalVariableDeclara
 new Sfactory(this,"IntArgumentDeclarationList_1",new SCreator(IntArgumentDeclarationList_1_factory));
 new Sfactory(this,"IntDeclaration_1",new SCreator(IntDeclaration_1_factory));
 new Sfactory(this,"ArgumentDeclarationList_5",new SCreator(ArgumentDeclarationList_5_factory));
+new Sfactory(this,"IntVecVecArgumentDeclarationList",new SCreator(IntVecVecArgumentDeclarationList_factory));
 new Sfactory(this,"VectorArgumentDeclarationList_1",new SCreator(VectorArgumentDeclarationList_1_factory));
 new Sfactory(this,"KeyArgumentDeclarationList",new SCreator(KeyArgumentDeclarationList_factory));
 new Sfactory(this,"TypecastExpression_2",new SCreator(TypecastExpression_2_factory));
@@ -12436,6 +12738,7 @@ new Sfactory(this,"ArgumentList_2",new SCreator(ArgumentList_2_factory));
 new Sfactory(this,"ArgumentList_3",new SCreator(ArgumentList_3_factory));
 new Sfactory(this,"Constant",new SCreator(Constant_factory));
 new Sfactory(this,"State",new SCreator(State_factory));
+new Sfactory(this,"StateBody_13",new SCreator(StateBody_13_factory));
 new Sfactory(this,"KeyArgStateEvent_1",new SCreator(KeyArgStateEvent_1_factory));
 new Sfactory(this,"SimpleAssignment_8",new SCreator(SimpleAssignment_8_factory));
 new Sfactory(this,"LSLProgramRoot",new SCreator(LSLProgramRoot_factory));
@@ -12446,8 +12749,9 @@ new Sfactory(this,"GlobalVariableDeclaration_2",new SCreator(GlobalVariableDecla
 new Sfactory(this,"IncrementDecrementExpression_5",new SCreator(IncrementDecrementExpression_5_factory));
 new Sfactory(this,"ReturnStatement",new SCreator(ReturnStatement_factory));
 new Sfactory(this,"IncrementDecrementExpression_7",new SCreator(IncrementDecrementExpression_7_factory));
-new Sfactory(this,"IncrementDecrementExpression_8",new SCreator(IncrementDecrementExpression_8_factory));
+new Sfactory(this,"StateBody_11",new SCreator(StateBody_11_factory));
 new Sfactory(this,"Assignment_1",new SCreator(Assignment_1_factory));
+new Sfactory(this,"IntVecVecArgStateEvent_1",new SCreator(IntVecVecArgStateEvent_1_factory));
 new Sfactory(this,"KeyDeclaration",new SCreator(KeyDeclaration_factory));
 new Sfactory(this,"ArgumentDeclarationList_3",new SCreator(ArgumentDeclarationList_3_factory));
 new Sfactory(this,"IntArgEvent_10",new SCreator(IntArgEvent_10_factory));
@@ -12475,7 +12779,7 @@ new Sfactory(this,"Event_7",new SCreator(Event_7_factory));
 new Sfactory(this,"Event_8",new SCreator(Event_8_factory));
 new Sfactory(this,"IncrementDecrementExpression_1",new SCreator(IncrementDecrementExpression_1_factory));
 new Sfactory(this,"Typename_2",new SCreator(Typename_2_factory));
-new Sfactory(this,"IncrementDecrementExpression_3",new SCreator(IncrementDecrementExpression_3_factory));
+new Sfactory(this,"IntVecVecArgumentDeclarationList_1",new SCreator(IntVecVecArgumentDeclarationList_1_factory));
 new Sfactory(this,"IncrementDecrementExpression_4",new SCreator(IncrementDecrementExpression_4_factory));
 new Sfactory(this,"IncrementDecrementExpression_6",new SCreator(IncrementDecrementExpression_6_factory));
 new Sfactory(this,"StateEvent",new SCreator(StateEvent_factory));
@@ -12498,6 +12802,7 @@ new Sfactory(this,"Statement_10",new SCreator(Statement_10_factory));
 new Sfactory(this,"Statement_11",new SCreator(Statement_11_factory));
 new Sfactory(this,"SimpleAssignment",new SCreator(SimpleAssignment_factory));
 new Sfactory(this,"TypecastExpression",new SCreator(TypecastExpression_factory));
+new Sfactory(this,"JumpStatement_1",new SCreator(JumpStatement_1_factory));
 new Sfactory(this,"SimpleAssignment_19",new SCreator(SimpleAssignment_19_factory));
 new Sfactory(this,"SimpleAssignment_20",new SCreator(SimpleAssignment_20_factory));
 new Sfactory(this,"Statement_7",new SCreator(Statement_7_factory));
@@ -12517,10 +12822,11 @@ new Sfactory(this,"StateBody_7",new SCreator(StateBody_7_factory));
 new Sfactory(this,"StateBody_8",new SCreator(StateBody_8_factory));
 new Sfactory(this,"StateBody_9",new SCreator(StateBody_9_factory));
 new Sfactory(this,"Statement",new SCreator(Statement_factory));
+new Sfactory(this,"IncrementDecrementExpression_3",new SCreator(IncrementDecrementExpression_3_factory));
 new Sfactory(this,"JumpStatement",new SCreator(JumpStatement_factory));
 new Sfactory(this,"BinaryExpression_11",new SCreator(BinaryExpression_11_factory));
 new Sfactory(this,"IntArgEvent",new SCreator(IntArgEvent_factory));
-new Sfactory(this,"BinaryExpression_13",new SCreator(BinaryExpression_13_factory));
+new Sfactory(this,"IncrementDecrementExpression_8",new SCreator(IncrementDecrementExpression_8_factory));
 new Sfactory(this,"BinaryExpression_14",new SCreator(BinaryExpression_14_factory));
 new Sfactory(this,"BinaryExpression_15",new SCreator(BinaryExpression_15_factory));
 new Sfactory(this,"BinaryExpression_16",new SCreator(BinaryExpression_16_factory));
@@ -12529,7 +12835,7 @@ new Sfactory(this,"BinaryExpression_7",new SCreator(BinaryExpression_7_factory))
 new Sfactory(this,"Typename_4",new SCreator(Typename_4_factory));
 new Sfactory(this,"ArgumentList",new SCreator(ArgumentList_factory));
 new Sfactory(this,"VectorDeclaration",new SCreator(VectorDeclaration_factory));
-new Sfactory(this,"Event_10",new SCreator(Event_10_factory));
+new Sfactory(this,"BinaryExpression_13",new SCreator(BinaryExpression_13_factory));
 new Sfactory(this,"GlobalFunctionDefinition_2",new SCreator(GlobalFunctionDefinition_2_factory));
 new Sfactory(this,"VoidArgEvent_6",new SCreator(VoidArgEvent_6_factory));
 new Sfactory(this,"StateChange_2",new SCreator(StateChange_2_factory));
@@ -12583,6 +12889,7 @@ new Sfactory(this,"VoidArgStateEvent",new SCreator(VoidArgStateEvent_factory));
 }
 public static object ExpressionArgument_1_factory(Parser yyp) { return new ExpressionArgument_1(yyp); }
 public static object VectorArgStateEvent_factory(Parser yyp) { return new VectorArgStateEvent(yyp); }
+public static object IntVecVecArgStateEvent_factory(Parser yyp) { return new IntVecVecArgStateEvent(yyp); }
 public static object IntArgStateEvent_1_factory(Parser yyp) { return new IntArgStateEvent_1(yyp); }
 public static object SimpleAssignment_9_factory(Parser yyp) { return new SimpleAssignment_9(yyp); }
 public static object StatementList_1_factory(Parser yyp) { return new StatementList_1(yyp); }
@@ -12657,14 +12964,15 @@ public static object SimpleAssignment_13_factory(Parser yyp) { return new Simple
 public static object JumpLabel_factory(Parser yyp) { return new JumpLabel(yyp); }
 public static object SimpleAssignment_15_factory(Parser yyp) { return new SimpleAssignment_15(yyp); }
 public static object StateBody_10_factory(Parser yyp) { return new StateBody_10(yyp); }
-public static object StateBody_11_factory(Parser yyp) { return new StateBody_11(yyp); }
+public static object IntVecVecArgEvent_factory(Parser yyp) { return new IntVecVecArgEvent(yyp); }
 public static object StateBody_12_factory(Parser yyp) { return new StateBody_12(yyp); }
-public static object JumpStatement_1_factory(Parser yyp) { return new JumpStatement_1(yyp); }
+public static object StateBody_14_factory(Parser yyp) { return new StateBody_14(yyp); }
 public static object GlobalDefinitions_factory(Parser yyp) { return new GlobalDefinitions(yyp); }
 public static object ConstantExpression_1_factory(Parser yyp) { return new ConstantExpression_1(yyp); }
 public static object VoidArgEvent_4_factory(Parser yyp) { return new VoidArgEvent_4(yyp); }
 public static object FunctionCall_1_factory(Parser yyp) { return new FunctionCall_1(yyp); }
 public static object Assignment_2_factory(Parser yyp) { return new Assignment_2(yyp); }
+public static object IntVecVecArgEvent_1_factory(Parser yyp) { return new IntVecVecArgEvent_1(yyp); }
 public static object TypecastExpression_1_factory(Parser yyp) { return new TypecastExpression_1(yyp); }
 public static object SimpleAssignment_21_factory(Parser yyp) { return new SimpleAssignment_21(yyp); }
 public static object SimpleAssignment_22_factory(Parser yyp) { return new SimpleAssignment_22(yyp); }
@@ -12681,6 +12989,7 @@ public static object GlobalVariableDeclaration_factory(Parser yyp) { return new
 public static object IntArgumentDeclarationList_1_factory(Parser yyp) { return new IntArgumentDeclarationList_1(yyp); }
 public static object IntDeclaration_1_factory(Parser yyp) { return new IntDeclaration_1(yyp); }
 public static object ArgumentDeclarationList_5_factory(Parser yyp) { return new ArgumentDeclarationList_5(yyp); }
+public static object IntVecVecArgumentDeclarationList_factory(Parser yyp) { return new IntVecVecArgumentDeclarationList(yyp); }
 public static object VectorArgumentDeclarationList_1_factory(Parser yyp) { return new VectorArgumentDeclarationList_1(yyp); }
 public static object KeyArgumentDeclarationList_factory(Parser yyp) { return new KeyArgumentDeclarationList(yyp); }
 public static object TypecastExpression_2_factory(Parser yyp) { return new TypecastExpression_2(yyp); }
@@ -12709,6 +13018,7 @@ public static object ArgumentList_2_factory(Parser yyp) { return new ArgumentLis
 public static object ArgumentList_3_factory(Parser yyp) { return new ArgumentList_3(yyp); }
 public static object Constant_factory(Parser yyp) { return new Constant(yyp); }
 public static object State_factory(Parser yyp) { return new State(yyp); }
+public static object StateBody_13_factory(Parser yyp) { return new StateBody_13(yyp); }
 public static object KeyArgStateEvent_1_factory(Parser yyp) { return new KeyArgStateEvent_1(yyp); }
 public static object SimpleAssignment_8_factory(Parser yyp) { return new SimpleAssignment_8(yyp); }
 public static object LSLProgramRoot_factory(Parser yyp) { return new LSLProgramRoot(yyp); }
@@ -12719,8 +13029,9 @@ public static object GlobalVariableDeclaration_2_factory(Parser yyp) { return ne
 public static object IncrementDecrementExpression_5_factory(Parser yyp) { return new IncrementDecrementExpression_5(yyp); }
 public static object ReturnStatement_factory(Parser yyp) { return new ReturnStatement(yyp); }
 public static object IncrementDecrementExpression_7_factory(Parser yyp) { return new IncrementDecrementExpression_7(yyp); }
-public static object IncrementDecrementExpression_8_factory(Parser yyp) { return new IncrementDecrementExpression_8(yyp); }
+public static object StateBody_11_factory(Parser yyp) { return new StateBody_11(yyp); }
 public static object Assignment_1_factory(Parser yyp) { return new Assignment_1(yyp); }
+public static object IntVecVecArgStateEvent_1_factory(Parser yyp) { return new IntVecVecArgStateEvent_1(yyp); }
 public static object KeyDeclaration_factory(Parser yyp) { return new KeyDeclaration(yyp); }
 public static object ArgumentDeclarationList_3_factory(Parser yyp) { return new ArgumentDeclarationList_3(yyp); }
 public static object IntArgEvent_10_factory(Parser yyp) { return new IntArgEvent_10(yyp); }
@@ -12748,7 +13059,7 @@ public static object Event_7_factory(Parser yyp) { return new Event_7(yyp); }
 public static object Event_8_factory(Parser yyp) { return new Event_8(yyp); }
 public static object IncrementDecrementExpression_1_factory(Parser yyp) { return new IncrementDecrementExpression_1(yyp); }
 public static object Typename_2_factory(Parser yyp) { return new Typename_2(yyp); }
-public static object IncrementDecrementExpression_3_factory(Parser yyp) { return new IncrementDecrementExpression_3(yyp); }
+public static object IntVecVecArgumentDeclarationList_1_factory(Parser yyp) { return new IntVecVecArgumentDeclarationList_1(yyp); }
 public static object IncrementDecrementExpression_4_factory(Parser yyp) { return new IncrementDecrementExpression_4(yyp); }
 public static object IncrementDecrementExpression_6_factory(Parser yyp) { return new IncrementDecrementExpression_6(yyp); }
 public static object StateEvent_factory(Parser yyp) { return new StateEvent(yyp); }
@@ -12771,6 +13082,7 @@ public static object Statement_10_factory(Parser yyp) { return new Statement_10(
 public static object Statement_11_factory(Parser yyp) { return new Statement_11(yyp); }
 public static object SimpleAssignment_factory(Parser yyp) { return new SimpleAssignment(yyp); }
 public static object TypecastExpression_factory(Parser yyp) { return new TypecastExpression(yyp); }
+public static object JumpStatement_1_factory(Parser yyp) { return new JumpStatement_1(yyp); }
 public static object SimpleAssignment_19_factory(Parser yyp) { return new SimpleAssignment_19(yyp); }
 public static object SimpleAssignment_20_factory(Parser yyp) { return new SimpleAssignment_20(yyp); }
 public static object Statement_7_factory(Parser yyp) { return new Statement_7(yyp); }
@@ -12790,10 +13102,11 @@ public static object StateBody_7_factory(Parser yyp) { return new StateBody_7(yy
 public static object StateBody_8_factory(Parser yyp) { return new StateBody_8(yyp); }
 public static object StateBody_9_factory(Parser yyp) { return new StateBody_9(yyp); }
 public static object Statement_factory(Parser yyp) { return new Statement(yyp); }
+public static object IncrementDecrementExpression_3_factory(Parser yyp) { return new IncrementDecrementExpression_3(yyp); }
 public static object JumpStatement_factory(Parser yyp) { return new JumpStatement(yyp); }
 public static object BinaryExpression_11_factory(Parser yyp) { return new BinaryExpression_11(yyp); }
 public static object IntArgEvent_factory(Parser yyp) { return new IntArgEvent(yyp); }
-public static object BinaryExpression_13_factory(Parser yyp) { return new BinaryExpression_13(yyp); }
+public static object IncrementDecrementExpression_8_factory(Parser yyp) { return new IncrementDecrementExpression_8(yyp); }
 public static object BinaryExpression_14_factory(Parser yyp) { return new BinaryExpression_14(yyp); }
 public static object BinaryExpression_15_factory(Parser yyp) { return new BinaryExpression_15(yyp); }
 public static object BinaryExpression_16_factory(Parser yyp) { return new BinaryExpression_16(yyp); }
@@ -12802,7 +13115,7 @@ public static object BinaryExpression_7_factory(Parser yyp) { return new BinaryE
 public static object Typename_4_factory(Parser yyp) { return new Typename_4(yyp); }
 public static object ArgumentList_factory(Parser yyp) { return new ArgumentList(yyp); }
 public static object VectorDeclaration_factory(Parser yyp) { return new VectorDeclaration(yyp); }
-public static object Event_10_factory(Parser yyp) { return new Event_10(yyp); }
+public static object BinaryExpression_13_factory(Parser yyp) { return new BinaryExpression_13(yyp); }
 public static object GlobalFunctionDefinition_2_factory(Parser yyp) { return new GlobalFunctionDefinition_2(yyp); }
 public static object VoidArgEvent_6_factory(Parser yyp) { return new VoidArgEvent_6(yyp); }
 public static object StateChange_2_factory(Parser yyp) { return new StateChange_2(yyp); }
-- 
cgit v1.1


From f1cd813a29baec2e77c082e68ed74161b4a97c7d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 21 Dec 2013 00:49:01 +0000
Subject: refactor: rename internal lsl parser VectorDeclaration ->
 VecDeclaration for consistency

---
 .../ScriptEngine/Shared/CodeTools/lsl.parser.cs    | 15892 +++++++++----------
 1 file changed, 7944 insertions(+), 7948 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
index fe8ab4f..9484c42 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
@@ -218,7 +218,7 @@ public override int yynum { get { return 112; }}
 public IntArgumentDeclarationList(Parser yyp):base(yyp){}}
 //%+VectorArgumentDeclarationList+113
 public class VectorArgumentDeclarationList : ArgumentDeclarationList{
- public  VectorArgumentDeclarationList (Parser yyp, VectorDeclaration  d ):base(((LSLSyntax
+ public  VectorArgumentDeclarationList (Parser yyp, VecDeclaration  d ):base(((LSLSyntax
 )yyp), d ){}
 
 public override string yyname { get { return "VectorArgumentDeclarationList"; }}
@@ -278,14 +278,14 @@ public class IntDeclaration : Declaration{
 public override string yyname { get { return "IntDeclaration"; }}
 public override int yynum { get { return 118; }}
 public IntDeclaration(Parser yyp):base(yyp){}}
-//%+VectorDeclaration+119
-public class VectorDeclaration : Declaration{
- public  VectorDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
+//%+VecDeclaration+119
+public class VecDeclaration : Declaration{
+ public  VecDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
 )yyp), type , id ){}
 
-public override string yyname { get { return "VectorDeclaration"; }}
+public override string yyname { get { return "VecDeclaration"; }}
 public override int yynum { get { return 119; }}
-public VectorDeclaration(Parser yyp):base(yyp){}}
+public VecDeclaration(Parser yyp):base(yyp){}}
 //%+RotDeclaration+120
 public class RotDeclaration : Declaration{
  public  RotDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
@@ -1126,7 +1126,7 @@ public class IntArgumentDeclarationList_1 : IntArgumentDeclarationList {
 
 public class VectorArgumentDeclarationList_1 : VectorArgumentDeclarationList {
   public VectorArgumentDeclarationList_1(Parser yyq):base(yyq,
-	((VectorDeclaration)(yyq.StackAt(0).m_value))
+	((VecDeclaration)(yyq.StackAt(0).m_value))
 	){}}
 
 public class IntRotRotArgumentDeclarationList_1 : IntRotRotArgumentDeclarationList {
@@ -1142,9 +1142,9 @@ public class IntVecVecArgumentDeclarationList_1 : IntVecVecArgumentDeclarationLi
   public IntVecVecArgumentDeclarationList_1(Parser yyq):base(yyq,
 	((IntDeclaration)(yyq.StackAt(4).m_value))
 	, 
-	((VectorDeclaration)(yyq.StackAt(2).m_value))
+	((VecDeclaration)(yyq.StackAt(2).m_value))
 	, 
-	((VectorDeclaration)(yyq.StackAt(0).m_value))
+	((VecDeclaration)(yyq.StackAt(0).m_value))
 	){}}
 
 public class Declaration_1 : Declaration {
@@ -1168,8 +1168,8 @@ public class IntDeclaration_1 : IntDeclaration {
 	((IDENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
-public class VectorDeclaration_1 : VectorDeclaration {
-  public VectorDeclaration_1(Parser yyq):base(yyq,
+public class VecDeclaration_1 : VecDeclaration {
+  public VecDeclaration_1(Parser yyq):base(yyq,
 	((VECTOR_TYPE)(yyq.StackAt(1).m_value))
 	.yytext, 
 	((IDENT)(yyq.StackAt(0).m_value))
@@ -3265,103 +3265,25 @@ public yyLSLSyntax
 18,1,2512,132,2,
 0,1,2513,473,18,
 1,2513,474,20,475,
-4,34,86,0,101,
-0,99,0,116,0,
-111,0,114,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,1,119,1,2,
-2,0,1,2514,476,
-18,1,2514,152,2,
-0,1,1958,477,18,
-1,1958,162,2,0,
-1,2516,478,18,1,
-2516,474,2,0,1,
-2517,479,18,1,2517,
-480,20,481,4,64,
-73,0,110,0,116,
-0,86,0,101,0,
-99,0,86,0,101,
-0,99,0,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,1,
-115,1,2,2,0,
-1,2518,482,18,1,
-2518,162,2,0,1,
-2809,483,18,1,2809,
-484,20,485,4,12,
-83,0,116,0,97,
-0,116,0,101,0,
-115,0,1,100,1,
-2,2,0,1,1406,
-486,18,1,1406,175,
-2,0,1,1407,487,
-18,1,1407,223,2,
-0,1,2522,488,18,
-1,2522,135,2,0,
-1,2524,489,18,1,
-2524,241,2,0,1,
-2525,490,18,1,2525,
-152,2,0,1,2526,
-491,18,1,2526,111,
-2,0,1,299,492,
-18,1,299,493,20,
-494,4,8,83,0,
-84,0,65,0,82,
-0,1,20,1,1,
-2,0,1,1370,495,
-18,1,1370,175,2,
-0,1,2529,496,18,
-1,2529,152,2,0,
-1,2817,497,18,1,
-2817,171,2,0,1,
-2531,498,18,1,2531,
-302,2,0,1,2532,
-499,18,1,2532,500,
-20,501,4,64,73,
-0,110,0,116,0,
-82,0,111,0,116,
-0,82,0,111,0,
-116,0,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,68,0,
+4,28,86,0,101,
+0,99,0,68,0,
 101,0,99,0,108,
 0,97,0,114,0,
 97,0,116,0,105,
 0,111,0,110,0,
-76,0,105,0,115,
-0,116,0,1,114,
-1,2,2,0,1,
-305,502,18,1,305,
-183,2,0,1,2535,
-503,18,1,2535,367,
-2,0,1,2458,504,
-18,1,2458,281,2,
-0,1,2459,505,18,
-1,2459,506,20,507,
-4,22,82,0,73,
-0,71,0,72,0,
-84,0,95,0,66,
-0,82,0,65,0,
-67,0,69,0,1,
-13,1,1,2,0,
-1,2539,508,18,1,
-2539,474,2,0,1,
-2540,509,18,1,2540,
-510,20,511,4,58,
+1,119,1,2,2,
+0,1,2514,476,18,
+1,2514,152,2,0,
+1,1958,477,18,1,
+1958,162,2,0,1,
+2516,478,18,1,2516,
+474,2,0,1,2517,
+479,18,1,2517,480,
+20,481,4,64,73,
+0,110,0,116,0,
 86,0,101,0,99,
-0,116,0,111,0,
-114,0,65,0,114,
+0,86,0,101,0,
+99,0,65,0,114,
 0,103,0,117,0,
 109,0,101,0,110,
 0,116,0,68,0,
@@ -3370,31 +3292,44 @@ public yyLSLSyntax
 97,0,116,0,105,
 0,111,0,110,0,
 76,0,105,0,115,
-0,116,0,1,113,
+0,116,0,1,115,
 1,2,2,0,1,
-2541,512,18,1,2541,
-162,2,0,1,2464,
-513,18,1,2464,506,
-2,0,1,2544,514,
-18,1,2544,515,20,
-516,4,22,73,0,
-110,0,116,0,65,
-0,114,0,103,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,125,1,2,2,
-0,1,2545,517,18,
-1,2545,135,2,0,
-1,1989,518,18,1,
-1989,281,2,0,1,
-1990,519,18,1,1990,
-520,20,521,4,8,
-69,0,76,0,83,
-0,69,0,1,43,
-1,1,2,0,1,
-2548,522,18,1,2548,
-523,20,524,4,52,
-73,0,110,0,116,
+2518,482,18,1,2518,
+162,2,0,1,2809,
+483,18,1,2809,484,
+20,485,4,12,83,
+0,116,0,97,0,
+116,0,101,0,115,
+0,1,100,1,2,
+2,0,1,1406,486,
+18,1,1406,175,2,
+0,1,1407,487,18,
+1,1407,223,2,0,
+1,2522,488,18,1,
+2522,135,2,0,1,
+2524,489,18,1,2524,
+241,2,0,1,2525,
+490,18,1,2525,152,
+2,0,1,2526,491,
+18,1,2526,111,2,
+0,1,299,492,18,
+1,299,493,20,494,
+4,8,83,0,84,
+0,65,0,82,0,
+1,20,1,1,2,
+0,1,1370,495,18,
+1,1370,175,2,0,
+1,2529,496,18,1,
+2529,152,2,0,1,
+2817,497,18,1,2817,
+171,2,0,1,2531,
+498,18,1,2531,302,
+2,0,1,2532,499,
+18,1,2532,500,20,
+501,4,64,73,0,
+110,0,116,0,82,
+0,111,0,116,0,
+82,0,111,0,116,
 0,65,0,114,0,
 103,0,117,0,109,
 0,101,0,110,0,
@@ -3404,1368 +3339,1442 @@ public yyLSLSyntax
 0,116,0,105,0,
 111,0,110,0,76,
 0,105,0,115,0,
-116,0,1,112,1,
-2,2,0,1,2470,
-525,18,1,2470,165,
-2,0,1,322,526,
-18,1,322,244,2,
-0,1,2551,527,18,
-1,2551,367,2,0,
-1,1933,528,18,1,
-1933,135,2,0,1,
-2553,529,18,1,2553,
-135,2,0,1,883,
-530,18,1,883,183,
-2,0,1,2555,531,
-18,1,2555,132,2,
-0,1,328,532,18,
-1,328,183,2,0,
-1,1443,533,18,1,
-1443,260,2,0,1,
-2558,534,18,1,2558,
-162,2,0,1,2560,
-535,18,1,2560,367,
-2,0,1,2561,536,
-18,1,2561,537,20,
-538,4,24,86,0,
-111,0,105,0,100,
+116,0,1,114,1,
+2,2,0,1,305,
+502,18,1,305,183,
+2,0,1,2535,503,
+18,1,2535,367,2,
+0,1,2458,504,18,
+1,2458,281,2,0,
+1,2459,505,18,1,
+2459,506,20,507,4,
+22,82,0,73,0,
+71,0,72,0,84,
+0,95,0,66,0,
+82,0,65,0,67,
+0,69,0,1,13,
+1,1,2,0,1,
+2539,508,18,1,2539,
+474,2,0,1,2540,
+509,18,1,2540,510,
+20,511,4,58,86,
+0,101,0,99,0,
+116,0,111,0,114,
 0,65,0,114,0,
-103,0,69,0,118,
+103,0,117,0,109,
 0,101,0,110,0,
-116,0,1,123,1,
-2,2,0,1,2562,
-539,18,1,2562,135,
-2,0,1,1449,540,
-18,1,1449,183,2,
-0,1,2485,541,18,
-1,2485,542,20,543,
-4,26,67,0,72,
-0,65,0,78,0,
-71,0,69,0,68,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,61,
-1,1,2,0,1,
-2565,544,18,1,2565,
-367,2,0,1,2566,
-545,18,1,2566,546,
-20,547,4,10,69,
+116,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,76,
+0,105,0,115,0,
+116,0,1,113,1,
+2,2,0,1,2541,
+512,18,1,2541,162,
+2,0,1,2464,513,
+18,1,2464,506,2,
+0,1,2544,514,18,
+1,2544,515,20,516,
+4,22,73,0,110,
+0,116,0,65,0,
+114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,1,
-122,1,2,2,0,
-1,2488,548,18,1,
-2488,549,20,550,4,
-22,84,0,73,0,
-77,0,69,0,82,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,87,
-1,1,2,0,1,
-2489,551,18,1,2489,
-552,20,553,4,38,
-78,0,79,0,84,
-0,95,0,65,0,
-84,0,95,0,84,
-0,65,0,82,0,
-71,0,69,0,84,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,79,
-1,1,2,0,1,
-2490,554,18,1,2490,
-555,20,556,4,46,
-78,0,79,0,84,
-0,95,0,65,0,
-84,0,95,0,82,
+125,1,2,2,0,
+1,2545,517,18,1,
+2545,135,2,0,1,
+1989,518,18,1,1989,
+281,2,0,1,1990,
+519,18,1,1990,520,
+20,521,4,8,69,
+0,76,0,83,0,
+69,0,1,43,1,
+1,2,0,1,2548,
+522,18,1,2548,523,
+20,524,4,52,73,
+0,110,0,116,0,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,76,0,
+105,0,115,0,116,
+0,1,112,1,2,
+2,0,1,2470,525,
+18,1,2470,165,2,
+0,1,322,526,18,
+1,322,244,2,0,
+1,2551,527,18,1,
+2551,367,2,0,1,
+1933,528,18,1,1933,
+135,2,0,1,2553,
+529,18,1,2553,135,
+2,0,1,883,530,
+18,1,883,183,2,
+0,1,2555,531,18,
+1,2555,132,2,0,
+1,328,532,18,1,
+328,183,2,0,1,
+1443,533,18,1,1443,
+260,2,0,1,2558,
+534,18,1,2558,162,
+2,0,1,2560,535,
+18,1,2560,367,2,
+0,1,2561,536,18,
+1,2561,537,20,538,
+4,24,86,0,111,
+0,105,0,100,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,123,1,2,
+2,0,1,2562,539,
+18,1,2562,135,2,
+0,1,1449,540,18,
+1,1449,183,2,0,
+1,2485,541,18,1,
+2485,542,20,543,4,
+26,67,0,72,0,
+65,0,78,0,71,
+0,69,0,68,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,61,1,
+1,2,0,1,2565,
+544,18,1,2565,367,
+2,0,1,2566,545,
+18,1,2566,546,20,
+547,4,10,69,0,
+118,0,101,0,110,
+0,116,0,1,122,
+1,2,2,0,1,
+2488,548,18,1,2488,
+549,20,550,4,22,
+84,0,73,0,77,
+0,69,0,82,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,87,1,
+1,2,0,1,2489,
+551,18,1,2489,552,
+20,553,4,38,78,
+0,79,0,84,0,
+95,0,65,0,84,
+0,95,0,84,0,
+65,0,82,0,71,
+0,69,0,84,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,79,1,
+1,2,0,1,2490,
+554,18,1,2490,555,
+20,556,4,46,78,
 0,79,0,84,0,
-95,0,84,0,65,
-0,82,0,71,0,
-69,0,84,0,95,
+95,0,65,0,84,
+0,95,0,82,0,
+79,0,84,0,95,
+0,84,0,65,0,
+82,0,71,0,69,
+0,84,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,78,1,1,2,
+0,1,2491,557,18,
+1,2491,558,20,559,
+4,30,78,0,79,
+0,95,0,83,0,
+69,0,78,0,83,
+0,79,0,82,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,77,1,
+1,2,0,1,2493,
+560,18,1,2493,561,
+20,562,4,32,77,
+0,79,0,86,0,
+73,0,78,0,71,
+0,95,0,69,0,
+78,0,68,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,78,1,1,
-2,0,1,2491,557,
-18,1,2491,558,20,
-559,4,30,78,0,
-79,0,95,0,83,
-0,69,0,78,0,
-83,0,79,0,82,
+0,1,75,1,1,
+2,0,1,1413,563,
+18,1,1413,183,2,
+0,1,346,564,18,
+1,346,565,20,566,
+4,8,80,0,76,
+0,85,0,83,0,
+1,18,1,1,2,
+0,1,2496,567,18,
+1,2496,568,20,569,
+4,36,72,0,84,
+0,84,0,80,0,
+95,0,82,0,69,
+0,81,0,85,0,
+69,0,83,0,84,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,77,
+0,84,0,1,91,
 1,1,2,0,1,
-2493,560,18,1,2493,
-561,20,562,4,32,
-77,0,79,0,86,
-0,73,0,78,0,
-71,0,95,0,69,
-0,78,0,68,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,75,1,
-1,2,0,1,1413,
-563,18,1,1413,183,
-2,0,1,346,564,
-18,1,346,565,20,
-566,4,8,80,0,
-76,0,85,0,83,
-0,1,18,1,1,
-2,0,1,2496,567,
-18,1,2496,568,20,
-569,4,36,72,0,
-84,0,84,0,80,
-0,95,0,82,0,
-69,0,81,0,85,
-0,69,0,83,0,
-84,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-91,1,1,2,0,
-1,2021,570,18,1,
-2021,281,2,0,1,
-2022,571,18,1,2022,
-371,2,0,1,352,
-572,18,1,352,183,
-2,0,1,2024,573,
-18,1,2024,132,2,
-0,1,2025,574,18,
-1,2025,575,20,576,
-4,8,74,0,85,
-0,77,0,80,0,
-1,49,1,1,2,
-0,1,2026,577,18,
-1,2026,132,2,0,
-1,2027,578,18,1,
-2027,579,20,580,4,
-4,65,0,84,0,
-1,23,1,1,2,
-0,1,2028,581,18,
-1,2028,132,2,0,
-1,2029,582,18,1,
-2029,367,2,0,1,
-2030,583,18,1,2030,
-584,20,585,4,14,
-70,0,111,0,114,
-0,76,0,111,0,
-111,0,112,0,1,
-142,1,2,2,0,
-1,2031,586,18,1,
-2031,587,20,588,4,
-32,68,0,111,0,
-87,0,104,0,105,
-0,108,0,101,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,1,141,
-1,2,2,0,1,
-2032,589,18,1,2032,
-590,20,591,4,28,
-87,0,104,0,105,
-0,108,0,101,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,1,140,
+2021,570,18,1,2021,
+281,2,0,1,2022,
+571,18,1,2022,371,
+2,0,1,352,572,
+18,1,352,183,2,
+0,1,2024,573,18,
+1,2024,132,2,0,
+1,2025,574,18,1,
+2025,575,20,576,4,
+8,74,0,85,0,
+77,0,80,0,1,
+49,1,1,2,0,
+1,2026,577,18,1,
+2026,132,2,0,1,
+2027,578,18,1,2027,
+579,20,580,4,4,
+65,0,84,0,1,
+23,1,1,2,0,
+1,2028,581,18,1,
+2028,132,2,0,1,
+2029,582,18,1,2029,
+367,2,0,1,2030,
+583,18,1,2030,584,
+20,585,4,14,70,
+0,111,0,114,0,
+76,0,111,0,111,
+0,112,0,1,142,
 1,2,2,0,1,
-2033,592,18,1,2033,
-593,20,594,4,22,
-73,0,102,0,83,
+2031,586,18,1,2031,
+587,20,588,4,32,
+68,0,111,0,87,
+0,104,0,105,0,
+108,0,101,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,1,139,1,
-2,2,0,1,2034,
-595,18,1,2034,596,
-20,597,4,22,83,
+116,0,1,141,1,
+2,2,0,1,2032,
+589,18,1,2032,590,
+20,591,4,28,87,
+0,104,0,105,0,
+108,0,101,0,83,
 0,116,0,97,0,
-116,0,101,0,67,
-0,104,0,97,0,
-110,0,103,0,101,
-0,1,138,1,2,
-2,0,1,1478,598,
-18,1,1478,175,2,
-0,1,1479,599,18,
-1,1479,299,2,0,
-1,2037,600,18,1,
-2037,138,2,0,1,
-2038,601,18,1,2038,
-602,20,603,4,18,
-74,0,117,0,109,
-0,112,0,76,0,
-97,0,98,0,101,
-0,108,0,1,136,
-1,2,2,0,1,
-2039,604,18,1,2039,
-138,2,0,1,2040,
-605,18,1,2040,606,
-20,607,4,30,82,
-0,101,0,116,0,
-117,0,114,0,110,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,1,
-135,1,2,2,0,
-1,2041,608,18,1,
-2041,138,2,0,1,
-1485,609,18,1,1485,
-183,2,0,1,372,
-610,18,1,372,195,
-2,0,1,373,611,
-18,1,373,132,2,
-0,1,374,612,18,
-1,374,191,2,0,
-1,375,613,18,1,
-375,132,2,0,1,
-376,614,18,1,376,
-198,2,0,1,377,
-615,18,1,377,132,
-2,0,1,378,616,
-18,1,378,191,2,
-0,1,379,617,18,
-1,379,132,2,0,
-1,380,618,18,1,
-380,619,20,620,4,
-16,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,1,148,1,
-2,2,0,1,381,
-621,18,1,381,320,
-2,0,1,371,622,
-18,1,371,623,20,
-624,4,24,70,0,
-117,0,110,0,99,
-0,116,0,105,0,
-111,0,110,0,67,
-0,97,0,108,0,
-108,0,1,144,1,
-2,2,0,1,942,
-625,18,1,942,183,
-2,0,1,2533,626,
-18,1,2533,162,2,
-0,1,387,627,18,
-1,387,183,2,0,
-1,2536,628,18,1,
-2536,629,20,630,4,
-28,86,0,101,0,
-99,0,116,0,111,
-0,114,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
-126,1,2,2,0,
-1,2537,631,18,1,
-2537,135,2,0,1,
-2543,632,18,1,2543,
-367,2,0,1,2625,
-633,18,1,2625,634,
-20,635,4,44,73,
-0,110,0,116,0,
-82,0,111,0,116,
-0,82,0,111,0,
-116,0,65,0,114,
-0,103,0,83,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,140,1,
+2,2,0,1,2033,
+592,18,1,2033,593,
+20,594,4,22,73,
+0,102,0,83,0,
 116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,1,108,
+0,101,0,109,0,
+101,0,110,0,116,
+0,1,139,1,2,
+2,0,1,2034,595,
+18,1,2034,596,20,
+597,4,22,83,0,
+116,0,97,0,116,
+0,101,0,67,0,
+104,0,97,0,110,
+0,103,0,101,0,
+1,138,1,2,2,
+0,1,1478,598,18,
+1,1478,175,2,0,
+1,1479,599,18,1,
+1479,299,2,0,1,
+2037,600,18,1,2037,
+138,2,0,1,2038,
+601,18,1,2038,602,
+20,603,4,18,74,
+0,117,0,109,0,
+112,0,76,0,97,
+0,98,0,101,0,
+108,0,1,136,1,
+2,2,0,1,2039,
+604,18,1,2039,138,
+2,0,1,2040,605,
+18,1,2040,606,20,
+607,4,30,82,0,
+101,0,116,0,117,
+0,114,0,110,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,135,
 1,2,2,0,1,
-2626,636,18,1,2626,
-637,20,638,4,38,
+2041,608,18,1,2041,
+138,2,0,1,1485,
+609,18,1,1485,183,
+2,0,1,372,610,
+18,1,372,195,2,
+0,1,373,611,18,
+1,373,132,2,0,
+1,374,612,18,1,
+374,191,2,0,1,
+375,613,18,1,375,
+132,2,0,1,376,
+614,18,1,376,198,
+2,0,1,377,615,
+18,1,377,132,2,
+0,1,378,616,18,
+1,378,191,2,0,
+1,379,617,18,1,
+379,132,2,0,1,
+380,618,18,1,380,
+619,20,620,4,16,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,1,148,1,2,
+2,0,1,381,621,
+18,1,381,320,2,
+0,1,371,622,18,
+1,371,623,20,624,
+4,24,70,0,117,
+0,110,0,99,0,
+116,0,105,0,111,
+0,110,0,67,0,
+97,0,108,0,108,
+0,1,144,1,2,
+2,0,1,942,625,
+18,1,942,183,2,
+0,1,2533,626,18,
+1,2533,162,2,0,
+1,387,627,18,1,
+387,183,2,0,1,
+2536,628,18,1,2536,
+629,20,630,4,28,
 86,0,101,0,99,
 0,116,0,111,0,
 114,0,65,0,114,
-0,103,0,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
+0,103,0,69,0,
 118,0,101,0,110,
-0,116,0,1,107,
+0,116,0,1,126,
 1,2,2,0,1,
-2627,639,18,1,2627,
-332,2,0,1,1514,
-640,18,1,1514,175,
-2,0,1,1515,641,
-18,1,1515,211,2,
-0,1,2549,642,18,
-1,2549,162,2,0,
-1,2074,643,18,1,
-2074,175,2,0,1,
-2075,644,18,1,2075,
-162,2,0,1,2552,
-645,18,1,2552,646,
-20,647,4,22,75,
+2537,631,18,1,2537,
+135,2,0,1,2543,
+632,18,1,2543,367,
+2,0,1,2625,633,
+18,1,2625,634,20,
+635,4,44,73,0,
+110,0,116,0,82,
+0,111,0,116,0,
+82,0,111,0,116,
+0,65,0,114,0,
+103,0,83,0,116,
+0,97,0,116,0,
+101,0,69,0,118,
+0,101,0,110,0,
+116,0,1,108,1,
+2,2,0,1,2626,
+636,18,1,2626,637,
+20,638,4,38,86,
+0,101,0,99,0,
+116,0,111,0,114,
+0,65,0,114,0,
+103,0,83,0,116,
+0,97,0,116,0,
+101,0,69,0,118,
+0,101,0,110,0,
+116,0,1,107,1,
+2,2,0,1,2627,
+639,18,1,2627,332,
+2,0,1,1514,640,
+18,1,1514,175,2,
+0,1,1515,641,18,
+1,1515,211,2,0,
+1,2549,642,18,1,
+2549,162,2,0,1,
+2074,643,18,1,2074,
+175,2,0,1,2075,
+644,18,1,2075,162,
+2,0,1,2552,645,
+18,1,2552,646,20,
+647,4,22,75,0,
+101,0,121,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,124,1,2,2,
+0,1,406,648,18,
+1,406,152,2,0,
+1,1521,649,18,1,
+1521,183,2,0,1,
+2636,650,18,1,2636,
+651,20,652,4,32,
+75,0,101,0,121,
+0,65,0,114,0,
+103,0,83,0,116,
+0,97,0,116,0,
+101,0,69,0,118,
+0,101,0,110,0,
+116,0,1,105,1,
+2,2,0,1,2556,
+653,18,1,2556,654,
+20,655,4,28,75,
+0,101,0,121,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,1,117,1,
+2,2,0,1,2557,
+656,18,1,2557,657,
+20,658,4,52,75,
 0,101,0,121,0,
 65,0,114,0,103,
-0,69,0,118,0,
+0,117,0,109,0,
 101,0,110,0,116,
-0,1,124,1,2,
-2,0,1,406,648,
-18,1,406,152,2,
-0,1,1521,649,18,
-1,1521,183,2,0,
-1,2636,650,18,1,
-2636,651,20,652,4,
-32,75,0,101,0,
-121,0,65,0,114,
-0,103,0,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,1,105,
-1,2,2,0,1,
-2556,653,18,1,2556,
-654,20,655,4,28,
-75,0,101,0,121,
 0,68,0,101,0,
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
-0,110,0,1,117,
-1,2,2,0,1,
-2557,656,18,1,2557,
-657,20,658,4,52,
-75,0,101,0,121,
-0,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,76,
-0,105,0,115,0,
-116,0,1,111,1,
-2,2,0,1,2639,
-659,18,1,2639,660,
-20,661,4,26,68,
-0,69,0,70,0,
-65,0,85,0,76,
-0,84,0,95,0,
-83,0,84,0,65,
-0,84,0,69,0,
-1,47,1,1,2,
-0,1,412,662,18,
-1,412,183,2,0,
-1,2484,663,18,1,
-2484,664,20,665,4,
-30,67,0,79,0,
-76,0,76,0,73,
-0,83,0,73,0,
-79,0,78,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,62,1,1,
-2,0,1,2023,666,
-18,1,2023,660,2,
-0,1,2567,667,18,
-1,2567,135,2,0,
-1,1442,668,18,1,
-1442,175,2,0,1,
-2035,669,18,1,2035,
-138,2,0,1,2036,
-670,18,1,2036,671,
-20,672,4,26,74,
-0,117,0,109,0,
-112,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-1,137,1,2,2,
-0,1,431,673,18,
-1,431,152,2,0,
-1,2578,674,18,1,
-2578,162,2,0,1,
-2105,675,18,1,2105,
-281,2,0,1,2106,
-676,18,1,2106,520,
-2,0,1,1550,677,
-18,1,1550,175,2,
-0,1,437,678,18,
-1,437,183,2,0,
-1,2044,679,18,1,
-2044,680,20,681,4,
-28,69,0,109,0,
-112,0,116,0,121,
+0,110,0,76,0,
+105,0,115,0,116,
+0,1,111,1,2,
+2,0,1,2639,659,
+18,1,2639,660,20,
+661,4,26,68,0,
+69,0,70,0,65,
+0,85,0,76,0,
+84,0,95,0,83,
+0,84,0,65,0,
+84,0,69,0,1,
+47,1,1,2,0,
+1,412,662,18,1,
+412,183,2,0,1,
+2484,663,18,1,2484,
+664,20,665,4,30,
+67,0,79,0,76,
+0,76,0,73,0,
+83,0,73,0,79,
+0,78,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,62,1,1,2,
+0,1,2023,666,18,
+1,2023,660,2,0,
+1,2567,667,18,1,
+2567,135,2,0,1,
+1442,668,18,1,1442,
+175,2,0,1,2035,
+669,18,1,2035,138,
+2,0,1,2036,670,
+18,1,2036,671,20,
+672,4,26,74,0,
+117,0,109,0,112,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,1,
-132,1,2,2,0,
-1,2045,682,18,1,
-2045,138,2,0,1,
-1555,683,18,1,1555,
-183,2,0,1,2511,
-684,18,1,2511,114,
-2,0,1,1001,685,
-18,1,1001,623,2,
-0,1,1002,686,18,
-1,1002,619,2,0,
-1,447,687,18,1,
-447,338,2,0,1,
-2520,688,18,1,2520,
-367,2,0,1,1010,
-689,18,1,1010,175,
-2,0,1,1011,690,
-18,1,1011,162,2,
-0,1,1012,691,18,
-1,1012,183,2,0,
-1,1013,692,18,1,
-1013,162,2,0,1,
-459,693,18,1,459,
-694,20,695,4,24,
-76,0,69,0,70,
-0,84,0,95,0,
-66,0,82,0,65,
-0,67,0,75,0,
-69,0,84,0,1,
-27,1,1,2,0,
-1,1574,696,18,1,
-1574,138,2,0,1,
-461,697,18,1,461,
-698,20,699,4,24,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,76,0,105,0,
-115,0,116,0,1,
-145,1,2,2,0,
-1,462,700,18,1,
-462,152,2,0,1,
-464,701,18,1,464,
-702,20,703,4,16,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,1,146,1,2,
-2,0,1,2136,704,
-18,1,2136,281,2,
-0,1,1585,705,18,
-1,1585,706,20,707,
-4,12,82,0,69,
-0,84,0,85,0,
-82,0,78,0,1,
-50,1,1,2,0,
-1,476,708,18,1,
-476,709,20,710,4,
-30,83,0,84,0,
-82,0,73,0,78,
-0,71,0,95,0,
-67,0,79,0,78,
-0,83,0,84,0,
-65,0,78,0,84,
-0,1,3,1,1,
-2,0,1,477,711,
-18,1,477,712,20,
-713,4,28,70,0,
-76,0,79,0,65,
-0,84,0,95,0,
-67,0,79,0,78,
-0,83,0,84,0,
-65,0,78,0,84,
-0,1,95,1,1,
-2,0,1,478,714,
-18,1,478,715,20,
-716,4,40,72,0,
-69,0,88,0,95,
-0,73,0,78,0,
-84,0,69,0,71,
-0,69,0,82,0,
-95,0,67,0,79,
-0,78,0,83,0,
-84,0,65,0,78,
-0,84,0,1,94,
+137,1,2,2,0,
+1,431,673,18,1,
+431,152,2,0,1,
+2578,674,18,1,2578,
+162,2,0,1,2105,
+675,18,1,2105,281,
+2,0,1,2106,676,
+18,1,2106,520,2,
+0,1,1550,677,18,
+1,1550,175,2,0,
+1,437,678,18,1,
+437,183,2,0,1,
+2044,679,18,1,2044,
+680,20,681,4,28,
+69,0,109,0,112,
+0,116,0,121,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,132,
+1,2,2,0,1,
+2045,682,18,1,2045,
+138,2,0,1,1555,
+683,18,1,1555,183,
+2,0,1,2511,684,
+18,1,2511,114,2,
+0,1,1001,685,18,
+1,1001,623,2,0,
+1,1002,686,18,1,
+1002,619,2,0,1,
+447,687,18,1,447,
+338,2,0,1,2520,
+688,18,1,2520,367,
+2,0,1,1010,689,
+18,1,1010,175,2,
+0,1,1011,690,18,
+1,1011,162,2,0,
+1,1012,691,18,1,
+1012,183,2,0,1,
+1013,692,18,1,1013,
+162,2,0,1,459,
+693,18,1,459,694,
+20,695,4,24,76,
+0,69,0,70,0,
+84,0,95,0,66,
+0,82,0,65,0,
+67,0,75,0,69,
+0,84,0,1,27,
 1,1,2,0,1,
-479,717,18,1,479,
-718,20,719,4,32,
+1574,696,18,1,1574,
+138,2,0,1,461,
+697,18,1,461,698,
+20,699,4,24,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+76,0,105,0,115,
+0,116,0,1,145,
+1,2,2,0,1,
+462,700,18,1,462,
+152,2,0,1,464,
+701,18,1,464,702,
+20,703,4,16,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+1,146,1,2,2,
+0,1,2136,704,18,
+1,2136,281,2,0,
+1,1585,705,18,1,
+1585,706,20,707,4,
+12,82,0,69,0,
+84,0,85,0,82,
+0,78,0,1,50,
+1,1,2,0,1,
+476,708,18,1,476,
+709,20,710,4,30,
+83,0,84,0,82,
+0,73,0,78,0,
+71,0,95,0,67,
+0,79,0,78,0,
+83,0,84,0,65,
+0,78,0,84,0,
+1,3,1,1,2,
+0,1,477,711,18,
+1,477,712,20,713,
+4,28,70,0,76,
+0,79,0,65,0,
+84,0,95,0,67,
+0,79,0,78,0,
+83,0,84,0,65,
+0,78,0,84,0,
+1,95,1,1,2,
+0,1,478,714,18,
+1,478,715,20,716,
+4,40,72,0,69,
+0,88,0,95,0,
 73,0,78,0,84,
 0,69,0,71,0,
 69,0,82,0,95,
 0,67,0,79,0,
 78,0,83,0,84,
 0,65,0,78,0,
-84,0,1,93,1,
-1,2,0,1,480,
-720,18,1,480,721,
-20,722,4,26,82,
-0,73,0,71,0,
-72,0,84,0,95,
-0,66,0,82,0,
-65,0,67,0,75,
-0,69,0,84,0,
-1,28,1,1,2,
-0,1,481,723,18,
-1,481,702,2,0,
-1,2628,724,18,1,
-2628,651,2,0,1,
-2629,725,18,1,2629,
-726,20,727,4,34,
-86,0,111,0,105,
-0,100,0,65,0,
-114,0,103,0,83,
-0,116,0,97,0,
-116,0,101,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
-104,1,2,2,0,
-1,2630,728,18,1,
-2630,729,20,730,4,
-20,83,0,116,0,
-97,0,116,0,101,
-0,69,0,118,0,
-101,0,110,0,116,
-0,1,103,1,2,
-2,0,1,2631,731,
-18,1,2631,506,2,
-0,1,2554,732,18,
-1,2554,117,2,0,
-1,2633,733,18,1,
-2633,634,2,0,1,
-2634,734,18,1,2634,
-637,2,0,1,1048,
-735,18,1,1048,183,
-2,0,1,2637,736,
-18,1,2637,726,2,
-0,1,2638,737,18,
-1,2638,729,2,0,
-1,2640,738,18,1,
-2640,165,2,0,1,
-2563,739,18,1,2563,
-162,2,0,1,2042,
-740,18,1,2042,741,
-20,742,4,20,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,1,
-133,1,2,2,0,
-1,2043,743,18,1,
-2043,138,2,0,1,
-2731,744,18,1,2731,
-506,2,0,1,1620,
-745,18,1,1620,175,
-2,0,1,1621,746,
-18,1,1621,159,2,
-0,1,1622,747,18,
-1,1622,211,2,0,
-1,509,748,18,1,
-509,152,2,0,1,
-2498,749,18,1,2498,
-750,20,751,4,22,
-77,0,79,0,78,
-0,69,0,89,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,74,1,
-1,2,0,1,2739,
-752,18,1,2739,484,
-2,0,1,2576,753,
-18,1,2576,149,2,
-0,1,1628,754,18,
-1,1628,183,2,0,
-1,515,755,18,1,
-515,183,2,0,1,
-2580,756,18,1,2580,
-367,2,0,1,2505,
-757,18,1,2505,758,
-20,759,4,34,73,
-0,110,0,116,0,
-86,0,101,0,99,
-0,86,0,101,0,
-99,0,65,0,114,
-0,103,0,69,0,
+84,0,1,94,1,
+1,2,0,1,479,
+717,18,1,479,718,
+20,719,4,32,73,
+0,78,0,84,0,
+69,0,71,0,69,
+0,82,0,95,0,
+67,0,79,0,78,
+0,83,0,84,0,
+65,0,78,0,84,
+0,1,93,1,1,
+2,0,1,480,720,
+18,1,480,721,20,
+722,4,26,82,0,
+73,0,71,0,72,
+0,84,0,95,0,
+66,0,82,0,65,
+0,67,0,75,0,
+69,0,84,0,1,
+28,1,1,2,0,
+1,481,723,18,1,
+481,702,2,0,1,
+2628,724,18,1,2628,
+651,2,0,1,2629,
+725,18,1,2629,726,
+20,727,4,34,86,
+0,111,0,105,0,
+100,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
 118,0,101,0,110,
-0,116,0,1,128,
+0,116,0,1,104,
 1,2,2,0,1,
-2582,760,18,1,2582,
-308,2,0,1,525,
-761,18,1,525,338,
-2,0,1,2197,762,
-18,1,2197,175,2,
-0,1,2198,763,18,
-1,2198,162,2,0,
-1,1591,764,18,1,
-1591,183,2,0,1,
-2758,765,18,1,2758,
-367,2,0,1,2760,
-766,18,1,2760,159,
-2,0,1,2521,767,
-18,1,2521,768,20,
-769,4,34,73,0,
-110,0,116,0,82,
-0,111,0,116,0,
-82,0,111,0,116,
+2630,728,18,1,2630,
+729,20,730,4,20,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,103,1,2,2,
+0,1,2631,731,18,
+1,2631,506,2,0,
+1,2554,732,18,1,
+2554,117,2,0,1,
+2633,733,18,1,2633,
+634,2,0,1,2634,
+734,18,1,2634,637,
+2,0,1,1048,735,
+18,1,1048,183,2,
+0,1,2637,736,18,
+1,2637,726,2,0,
+1,2638,737,18,1,
+2638,729,2,0,1,
+2640,738,18,1,2640,
+165,2,0,1,2563,
+739,18,1,2563,162,
+2,0,1,2042,740,
+18,1,2042,741,20,
+742,4,20,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,1,133,
+1,2,2,0,1,
+2043,743,18,1,2043,
+138,2,0,1,2731,
+744,18,1,2731,506,
+2,0,1,1620,745,
+18,1,1620,175,2,
+0,1,1621,746,18,
+1,1621,159,2,0,
+1,1622,747,18,1,
+1622,211,2,0,1,
+509,748,18,1,509,
+152,2,0,1,2498,
+749,18,1,2498,750,
+20,751,4,22,77,
+0,79,0,78,0,
+69,0,89,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,74,1,1,
+2,0,1,2739,752,
+18,1,2739,484,2,
+0,1,2576,753,18,
+1,2576,149,2,0,
+1,1628,754,18,1,
+1628,183,2,0,1,
+515,755,18,1,515,
+183,2,0,1,2580,
+756,18,1,2580,367,
+2,0,1,2505,757,
+18,1,2505,758,20,
+759,4,34,73,0,
+110,0,116,0,86,
+0,101,0,99,0,
+86,0,101,0,99,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,1,127,1,
-2,2,0,1,1094,
-770,18,1,1094,698,
-2,0,1,1096,771,
-18,1,1096,162,2,
-0,1,1657,772,18,
-1,1657,138,2,0,
-1,1658,773,18,1,
-1658,774,20,775,4,
-6,70,0,79,0,
-82,0,1,46,1,
-1,2,0,1,1659,
-776,18,1,1659,135,
-2,0,1,1665,777,
-18,1,1665,183,2,
-0,1,1113,778,18,
-1,1113,191,2,0,
-779,5,0,780,5,
-372,1,2,781,19,
-275,1,2,782,5,
-6,1,2739,783,17,
-784,15,785,4,30,
-37,0,76,0,83,
-0,76,0,80,0,
-114,0,111,0,103,
-0,114,0,97,0,
-109,0,82,0,111,
+116,0,1,128,1,
+2,2,0,1,2582,
+760,18,1,2582,308,
+2,0,1,525,761,
+18,1,525,338,2,
+0,1,2197,762,18,
+1,2197,175,2,0,
+1,2198,763,18,1,
+2198,162,2,0,1,
+1591,764,18,1,1591,
+183,2,0,1,2758,
+765,18,1,2758,367,
+2,0,1,2760,766,
+18,1,2760,159,2,
+0,1,2521,767,18,
+1,2521,768,20,769,
+4,34,73,0,110,
+0,116,0,82,0,
+111,0,116,0,82,
 0,111,0,116,0,
-1,-1,1,5,786,
-20,787,4,32,76,
-0,83,0,76,0,
-80,0,114,0,111,
-0,103,0,114,0,
-97,0,109,0,82,
-0,111,0,111,0,
-116,0,95,0,50,
-0,1,164,1,3,
-1,2,1,1,788,
-22,1,2,1,2809,
-789,17,790,15,785,
-1,-1,1,5,791,
-20,792,4,32,76,
-0,83,0,76,0,
-80,0,114,0,111,
-0,103,0,114,0,
-97,0,109,0,82,
-0,111,0,111,0,
-116,0,95,0,49,
-0,1,163,1,3,
-1,3,1,2,793,
-22,1,1,1,2742,
-794,17,795,15,796,
-4,14,37,0,83,
-0,116,0,97,0,
-116,0,101,0,115,
-0,1,-1,1,5,
-797,20,798,4,16,
-83,0,116,0,97,
-0,116,0,101,0,
-115,0,95,0,50,
-0,1,174,1,3,
-1,3,1,2,799,
-22,1,12,1,2743,
-800,17,801,15,796,
-1,-1,1,5,802,
-20,803,4,16,83,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,127,1,2,
+2,0,1,1094,770,
+18,1,1094,698,2,
+0,1,1096,771,18,
+1,1096,162,2,0,
+1,1657,772,18,1,
+1657,138,2,0,1,
+1658,773,18,1,1658,
+774,20,775,4,6,
+70,0,79,0,82,
+0,1,46,1,1,
+2,0,1,1659,776,
+18,1,1659,135,2,
+0,1,1665,777,18,
+1,1665,183,2,0,
+1,1113,778,18,1,
+1113,191,2,0,779,
+5,0,780,5,372,
+1,2,781,19,275,
+1,2,782,5,6,
+1,2739,783,17,784,
+15,785,4,30,37,
+0,76,0,83,0,
+76,0,80,0,114,
+0,111,0,103,0,
+114,0,97,0,109,
+0,82,0,111,0,
+111,0,116,0,1,
+-1,1,5,786,20,
+787,4,32,76,0,
+83,0,76,0,80,
+0,114,0,111,0,
+103,0,114,0,97,
+0,109,0,82,0,
+111,0,111,0,116,
+0,95,0,50,0,
+1,164,1,3,1,
+2,1,1,788,22,
+1,2,1,2809,789,
+17,790,15,785,1,
+-1,1,5,791,20,
+792,4,32,76,0,
+83,0,76,0,80,
+0,114,0,111,0,
+103,0,114,0,97,
+0,109,0,82,0,
+111,0,111,0,116,
+0,95,0,49,0,
+1,163,1,3,1,
+3,1,2,793,22,
+1,1,1,2742,794,
+17,795,15,796,4,
+14,37,0,83,0,
+116,0,97,0,116,
+0,101,0,115,0,
+1,-1,1,5,797,
+20,798,4,16,83,
 0,116,0,97,0,
 116,0,101,0,115,
-0,95,0,49,0,
-1,173,1,3,1,
-2,1,1,804,22,
-1,11,1,2631,805,
-17,806,15,807,4,
-12,37,0,83,0,
+0,95,0,50,0,
+1,174,1,3,1,
+3,1,2,799,22,
+1,12,1,2743,800,
+17,801,15,796,1,
+-1,1,5,802,20,
+803,4,16,83,0,
 116,0,97,0,116,
-0,101,0,1,-1,
-1,5,808,20,809,
-4,14,83,0,116,
+0,101,0,115,0,
+95,0,49,0,1,
+173,1,3,1,2,
+1,1,804,22,1,
+11,1,2631,805,17,
+806,15,807,4,12,
+37,0,83,0,116,
 0,97,0,116,0,
-101,0,95,0,50,
-0,1,176,1,3,
-1,6,1,5,810,
-22,1,14,1,2731,
-811,17,812,15,807,
-1,-1,1,5,813,
-20,814,4,14,83,
+101,0,1,-1,1,
+5,808,20,809,4,
+14,83,0,116,0,
+97,0,116,0,101,
+0,95,0,50,0,
+1,176,1,3,1,
+6,1,5,810,22,
+1,14,1,2731,811,
+17,812,15,807,1,
+-1,1,5,813,20,
+814,4,14,83,0,
+116,0,97,0,116,
+0,101,0,95,0,
+49,0,1,175,1,
+3,1,5,1,4,
+815,22,1,13,1,
+3,816,19,710,1,
+3,817,5,95,1,
+2761,818,16,0,708,
+1,256,819,16,0,
+708,1,1261,820,16,
+0,708,1,509,821,
+16,0,708,1,1515,
+822,16,0,708,1,
+2021,823,17,824,15,
+825,4,24,37,0,
+73,0,102,0,83,
 0,116,0,97,0,
-116,0,101,0,95,
-0,49,0,1,175,
-1,3,1,5,1,
-4,815,22,1,13,
-1,3,816,19,710,
-1,3,817,5,95,
-1,2761,818,16,0,
-708,1,256,819,16,
-0,708,1,1261,820,
-16,0,708,1,509,
-821,16,0,708,1,
-1515,822,16,0,708,
-1,2021,823,17,824,
-15,825,4,24,37,
-0,73,0,102,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,826,20,827,4,
+26,73,0,102,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
-0,116,0,1,-1,
-1,5,826,20,827,
-4,26,73,0,102,
+0,116,0,95,0,
+50,0,1,233,1,
+3,1,8,1,7,
+828,22,1,72,1,
+1775,829,16,0,708,
+1,2029,830,17,831,
+15,832,4,20,37,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
-110,0,116,0,95,
-0,50,0,1,233,
-1,3,1,8,1,
-7,828,22,1,72,
-1,1775,829,16,0,
-708,1,2029,830,17,
-831,15,832,4,20,
-37,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-1,-1,1,5,833,
-20,834,4,24,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,51,0,1,227,
-1,3,1,2,1,
-1,835,22,1,66,
-1,2030,836,17,837,
-15,832,1,-1,1,
-5,838,20,839,4,
-24,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,50,0,
-1,226,1,3,1,
-2,1,1,840,22,
-1,65,1,2031,841,
-17,842,15,832,1,
--1,1,5,843,20,
-844,4,24,83,0,
+110,0,116,0,1,
+-1,1,5,833,20,
+834,4,24,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-49,0,1,225,1,
+51,0,1,227,1,
 3,1,2,1,1,
-845,22,1,64,1,
-2032,846,17,847,15,
+835,22,1,66,1,
+2030,836,17,837,15,
 832,1,-1,1,5,
-848,20,849,4,24,
+838,20,839,4,24,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,48,0,1,
-224,1,3,1,2,
-1,1,850,22,1,
-63,1,2033,851,17,
-852,15,832,1,-1,
-1,5,853,20,854,
-4,22,83,0,116,
+49,0,50,0,1,
+226,1,3,1,2,
+1,1,840,22,1,
+65,1,2031,841,17,
+842,15,832,1,-1,
+1,5,843,20,844,
+4,24,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-95,0,57,0,1,
-223,1,3,1,2,
-1,1,855,22,1,
-62,1,277,856,16,
-0,708,1,2035,857,
-17,858,15,832,1,
--1,1,5,859,20,
-860,4,22,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,56,0,
-1,222,1,3,1,
-3,1,2,861,22,
-1,61,1,2037,862,
-17,863,15,832,1,
--1,1,5,864,20,
-865,4,22,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,55,0,
-1,221,1,3,1,
-3,1,2,866,22,
-1,60,1,2039,867,
-17,868,15,832,1,
--1,1,5,869,20,
-870,4,22,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,54,0,
-1,220,1,3,1,
-3,1,2,871,22,
-1,59,1,32,872,
-16,0,708,1,2041,
-873,17,874,15,832,
-1,-1,1,5,875,
-20,876,4,22,83,
+95,0,49,0,49,
+0,1,225,1,3,
+1,2,1,1,845,
+22,1,64,1,2032,
+846,17,847,15,832,
+1,-1,1,5,848,
+20,849,4,24,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,95,0,53,
-0,1,219,1,3,
-1,3,1,2,877,
-22,1,58,1,2293,
-878,16,0,708,1,
-2043,879,17,880,15,
-832,1,-1,1,5,
-881,20,882,4,22,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-51,0,1,217,1,
-3,1,3,1,2,
-883,22,1,56,1,
-2045,884,17,885,15,
-832,1,-1,1,5,
-886,20,887,4,22,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,1,215,1,
-3,1,3,1,2,
-888,22,1,54,1,
-41,889,16,0,708,
-1,1297,890,16,0,
-708,1,43,891,16,
-0,708,1,1803,892,
-17,893,15,894,4,
-16,37,0,70,0,
-111,0,114,0,76,
-0,111,0,111,0,
-112,0,1,-1,1,
-5,895,20,896,4,
-18,70,0,111,0,
-114,0,76,0,111,
-0,111,0,112,0,
-95,0,49,0,1,
-240,1,3,1,10,
-1,9,897,22,1,
-79,1,1804,898,16,
-0,708,1,299,899,
-16,0,708,1,52,
-900,16,0,708,1,
-2318,901,16,0,708,
-1,62,902,16,0,
-708,1,2075,903,16,
-0,708,1,1574,904,
-17,905,15,832,1,
--1,1,5,906,20,
-907,4,22,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,52,0,
-1,218,1,3,1,
-3,1,2,908,22,
-1,57,1,71,909,
-16,0,708,1,76,
-910,16,0,708,1,
-1834,911,16,0,708,
-1,2337,912,16,0,
-708,1,79,913,16,
-0,708,1,1335,914,
-16,0,708,1,322,
-915,16,0,708,1,
-85,916,16,0,708,
-1,89,917,16,0,
-708,1,346,918,16,
-0,708,1,2105,919,
-17,920,15,825,1,
--1,1,5,921,20,
-922,4,26,73,0,
-102,0,83,0,116,
+116,0,95,0,49,
+0,48,0,1,224,
+1,3,1,2,1,
+1,850,22,1,63,
+1,2033,851,17,852,
+15,832,1,-1,1,
+5,853,20,854,4,
+22,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,95,
+0,57,0,1,223,
+1,3,1,2,1,
+1,855,22,1,62,
+1,277,856,16,0,
+708,1,2035,857,17,
+858,15,832,1,-1,
+1,5,859,20,860,
+4,22,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-95,0,51,0,1,
-234,1,3,1,6,
-1,5,923,22,1,
-73,1,2106,924,16,
-0,708,1,97,925,
-16,0,708,1,1860,
-926,17,927,15,928,
-4,34,37,0,68,
-0,111,0,87,0,
-104,0,105,0,108,
-0,101,0,83,0,
+95,0,56,0,1,
+222,1,3,1,3,
+1,2,861,22,1,
+61,1,2037,862,17,
+863,15,832,1,-1,
+1,5,864,20,865,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,55,0,1,
+221,1,3,1,3,
+1,2,866,22,1,
+60,1,2039,867,17,
+868,15,832,1,-1,
+1,5,869,20,870,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,54,0,1,
+220,1,3,1,3,
+1,2,871,22,1,
+59,1,32,872,16,
+0,708,1,2041,873,
+17,874,15,832,1,
+-1,1,5,875,20,
+876,4,22,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
-0,1,-1,1,5,
-929,20,930,4,36,
-68,0,111,0,87,
-0,104,0,105,0,
-108,0,101,0,83,
+0,95,0,53,0,
+1,219,1,3,1,
+3,1,2,877,22,
+1,58,1,2293,878,
+16,0,708,1,2043,
+879,17,880,15,832,
+1,-1,1,5,881,
+20,882,4,22,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,51,
+0,1,217,1,3,
+1,3,1,2,883,
+22,1,56,1,2045,
+884,17,885,15,832,
+1,-1,1,5,886,
+20,887,4,22,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
 116,0,95,0,49,
-0,1,238,1,3,
-1,8,1,7,931,
-22,1,77,1,2364,
-932,17,933,15,894,
-1,-1,1,5,934,
-20,935,4,18,70,
-0,111,0,114,0,
-76,0,111,0,111,
-0,112,0,95,0,
-50,0,1,241,1,
-3,1,9,1,8,
-936,22,1,80,1,
-102,937,16,0,708,
-1,112,938,16,0,
-708,1,1117,939,16,
-0,708,1,1873,940,
-17,941,15,928,1,
--1,1,5,942,20,
-943,4,36,68,0,
-111,0,87,0,104,
-0,105,0,108,0,
-101,0,83,0,116,
+0,1,215,1,3,
+1,3,1,2,888,
+22,1,54,1,41,
+889,16,0,708,1,
+1297,890,16,0,708,
+1,43,891,16,0,
+708,1,1803,892,17,
+893,15,894,4,16,
+37,0,70,0,111,
+0,114,0,76,0,
+111,0,111,0,112,
+0,1,-1,1,5,
+895,20,896,4,18,
+70,0,111,0,114,
+0,76,0,111,0,
+111,0,112,0,95,
+0,49,0,1,240,
+1,3,1,10,1,
+9,897,22,1,79,
+1,1804,898,16,0,
+708,1,299,899,16,
+0,708,1,52,900,
+16,0,708,1,2318,
+901,16,0,708,1,
+62,902,16,0,708,
+1,2075,903,16,0,
+708,1,1574,904,17,
+905,15,832,1,-1,
+1,5,906,20,907,
+4,22,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-95,0,50,0,1,
-239,1,3,1,8,
-1,7,944,22,1,
-78,1,1876,945,16,
-0,708,1,124,946,
-16,0,708,1,2136,
-947,17,948,15,825,
-1,-1,1,5,949,
-20,950,4,26,73,
-0,102,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,52,0,
-1,235,1,3,1,
-8,1,7,951,22,
-1,74,1,381,952,
-16,0,708,1,525,
-953,16,0,708,1,
-137,954,16,0,708,
-1,1901,955,16,0,
-708,1,1153,956,16,
-0,708,1,151,957,
-16,0,708,1,1407,
-958,16,0,708,1,
-1659,959,16,0,708,
-1,2413,960,16,0,
-708,1,406,961,16,
-0,708,1,1371,962,
-16,0,708,1,166,
-963,16,0,708,1,
-1622,964,16,0,708,
-1,1931,965,17,966,
-15,967,4,30,37,
-0,87,0,104,0,
-105,0,108,0,101,
+95,0,52,0,1,
+218,1,3,1,3,
+1,2,908,22,1,
+57,1,71,909,16,
+0,708,1,76,910,
+16,0,708,1,1834,
+911,16,0,708,1,
+2337,912,16,0,708,
+1,79,913,16,0,
+708,1,1335,914,16,
+0,708,1,322,915,
+16,0,708,1,85,
+916,16,0,708,1,
+89,917,16,0,708,
+1,346,918,16,0,
+708,1,2105,919,17,
+920,15,825,1,-1,
+1,5,921,20,922,
+4,26,73,0,102,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
-110,0,116,0,1,
--1,1,5,968,20,
-969,4,32,87,0,
+110,0,116,0,95,
+0,51,0,1,234,
+1,3,1,6,1,
+5,923,22,1,73,
+1,2106,924,16,0,
+708,1,97,925,16,
+0,708,1,1860,926,
+17,927,15,928,4,
+34,37,0,68,0,
+111,0,87,0,104,
+0,105,0,108,0,
+101,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+1,-1,1,5,929,
+20,930,4,36,68,
+0,111,0,87,0,
 104,0,105,0,108,
 0,101,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-1,236,1,3,1,
-6,1,5,970,22,
-1,75,1,1933,971,
-16,0,708,1,431,
-972,16,0,708,1,
-1585,973,16,0,708,
-1,182,974,16,0,
-708,1,1189,975,16,
-0,708,1,1443,976,
-16,0,708,1,1695,
-977,16,0,708,1,
-2198,978,16,0,708,
-1,447,979,16,0,
-708,1,2458,980,17,
-981,15,982,4,28,
-37,0,83,0,116,
+1,238,1,3,1,
+8,1,7,931,22,
+1,77,1,2364,932,
+17,933,15,894,1,
+-1,1,5,934,20,
+935,4,18,70,0,
+111,0,114,0,76,
+0,111,0,111,0,
+112,0,95,0,50,
+0,1,241,1,3,
+1,9,1,8,936,
+22,1,80,1,102,
+937,16,0,708,1,
+112,938,16,0,708,
+1,1117,939,16,0,
+708,1,1873,940,17,
+941,15,928,1,-1,
+1,5,942,20,943,
+4,36,68,0,111,
+0,87,0,104,0,
+105,0,108,0,101,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,95,
+0,50,0,1,239,
+1,3,1,8,1,
+7,944,22,1,78,
+1,1876,945,16,0,
+708,1,124,946,16,
+0,708,1,2136,947,
+17,948,15,825,1,
+-1,1,5,949,20,
+950,4,26,73,0,
+102,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-76,0,105,0,115,
+95,0,52,0,1,
+235,1,3,1,8,
+1,7,951,22,1,
+74,1,381,952,16,
+0,708,1,525,953,
+16,0,708,1,137,
+954,16,0,708,1,
+1901,955,16,0,708,
+1,1153,956,16,0,
+708,1,151,957,16,
+0,708,1,1407,958,
+16,0,708,1,1659,
+959,16,0,708,1,
+2413,960,16,0,708,
+1,406,961,16,0,
+708,1,1371,962,16,
+0,708,1,166,963,
+16,0,708,1,1622,
+964,16,0,708,1,
+1931,965,17,966,15,
+967,4,30,37,0,
+87,0,104,0,105,
+0,108,0,101,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
 0,116,0,1,-1,
-1,5,983,20,984,
-4,30,83,0,116,
+1,5,968,20,969,
+4,32,87,0,104,
+0,105,0,108,0,
+101,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-76,0,105,0,115,
-0,116,0,95,0,
-50,0,1,213,1,
-3,1,3,1,2,
-985,22,1,52,1,
-2459,986,17,987,15,
-988,4,36,37,0,
-67,0,111,0,109,
-0,112,0,111,0,
-117,0,110,0,100,
+95,0,49,0,1,
+236,1,3,1,6,
+1,5,970,22,1,
+75,1,1933,971,16,
+0,708,1,431,972,
+16,0,708,1,1585,
+973,16,0,708,1,
+182,974,16,0,708,
+1,1189,975,16,0,
+708,1,1443,976,16,
+0,708,1,1695,977,
+16,0,708,1,2198,
+978,16,0,708,1,
+447,979,16,0,708,
+1,2458,980,17,981,
+15,982,4,28,37,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
-110,0,116,0,1,
--1,1,5,989,20,
-990,4,38,67,0,
-111,0,109,0,112,
-0,111,0,117,0,
-110,0,100,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
+110,0,116,0,76,
+0,105,0,115,0,
+116,0,1,-1,1,
+5,983,20,984,4,
+30,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,76,
+0,105,0,115,0,
 116,0,95,0,50,
-0,1,211,1,3,
-1,4,1,3,991,
-22,1,50,1,1958,
-992,16,0,708,1,
-2462,993,17,994,15,
-982,1,-1,1,5,
-995,20,996,4,30,
+0,1,213,1,3,
+1,3,1,2,985,
+22,1,52,1,2459,
+986,17,987,15,988,
+4,36,37,0,67,
+0,111,0,109,0,
+112,0,111,0,117,
+0,110,0,100,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
-0,116,0,76,0,
-105,0,115,0,116,
-0,95,0,49,0,
-1,212,1,3,1,
-2,1,1,997,22,
-1,51,1,1657,998,
-17,999,15,832,1,
--1,1,5,1000,20,
-1001,4,22,83,0,
+0,116,0,1,-1,
+1,5,989,20,990,
+4,38,67,0,111,
+0,109,0,112,0,
+111,0,117,0,110,
+0,100,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,50,0,
-1,216,1,3,1,
-3,1,2,1002,22,
-1,55,1,2464,1003,
-17,1004,15,988,1,
--1,1,5,1005,20,
-1006,4,38,67,0,
-111,0,109,0,112,
-0,111,0,117,0,
-110,0,100,0,83,
+1,211,1,3,1,
+4,1,3,991,22,
+1,50,1,1958,992,
+16,0,708,1,2462,
+993,17,994,15,982,
+1,-1,1,5,995,
+20,996,4,30,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,95,0,49,
-0,1,210,1,3,
-1,3,1,2,1007,
-22,1,49,1,199,
-1008,16,0,708,1,
-459,1009,16,0,708,
-1,462,1010,16,0,
-708,1,217,1011,16,
-0,708,1,2227,1012,
-17,1013,15,967,1,
--1,1,5,1014,20,
-1015,4,32,87,0,
-104,0,105,0,108,
-0,101,0,83,0,
+116,0,76,0,105,
+0,115,0,116,0,
+95,0,49,0,1,
+212,1,3,1,2,
+1,1,997,22,1,
+51,1,1657,998,17,
+999,15,832,1,-1,
+1,5,1000,20,1001,
+4,22,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,50,0,1,
+216,1,3,1,3,
+1,2,1002,22,1,
+55,1,2464,1003,17,
+1004,15,988,1,-1,
+1,5,1005,20,1006,
+4,38,67,0,111,
+0,109,0,112,0,
+111,0,117,0,110,
+0,100,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
-0,95,0,50,0,
-1,237,1,3,1,
-6,1,5,1016,22,
-1,76,1,1225,1017,
-16,0,708,1,1479,
-1018,16,0,708,1,
-1731,1019,16,0,708,
-1,1989,1020,17,1021,
-15,825,1,-1,1,
-5,1022,20,1023,4,
-26,73,0,102,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,1,232,1,
-3,1,6,1,5,
-1024,22,1,71,1,
-1990,1025,16,0,708,
-1,236,1026,16,0,
-708,1,1756,1027,16,
-0,708,1,4,1028,
-19,199,1,4,1029,
-5,100,1,2761,1030,
-16,0,614,1,256,
-1031,16,0,614,1,
-1261,1032,16,0,614,
-1,509,1033,16,0,
-614,1,1515,1034,16,
-0,614,1,2021,823,
-1,1775,1035,16,0,
-614,1,2029,830,1,
-2030,836,1,2031,841,
-1,2032,846,1,2033,
-851,1,277,1036,16,
-0,614,1,2035,857,
-1,2037,862,1,2039,
-867,1,32,1037,16,
-0,614,1,2041,873,
-1,2293,1038,16,0,
-614,1,2043,879,1,
-2045,884,1,40,1039,
-16,0,201,1,41,
-1040,16,0,614,1,
-1297,1041,16,0,614,
-1,43,1042,16,0,
-614,1,44,1043,16,
-0,201,1,1803,892,
-1,1804,1044,16,0,
-614,1,299,1045,16,
-0,614,1,47,1046,
-16,0,197,1,52,
-1047,16,0,614,1,
-2318,1048,16,0,614,
-1,63,1049,16,0,
-218,1,66,1050,16,
-0,216,1,2075,1051,
-16,0,614,1,1574,
-904,1,71,1052,16,
-0,614,1,76,1053,
-16,0,614,1,1834,
-1054,16,0,614,1,
-2337,1055,16,0,614,
-1,79,1056,16,0,
-614,1,1335,1057,16,
-0,614,1,322,1058,
-16,0,614,1,85,
-1059,16,0,614,1,
-89,1060,16,0,614,
-1,346,1061,16,0,
-614,1,97,1062,16,
-0,614,1,2106,1063,
-16,0,614,1,102,
-1064,16,0,614,1,
-1860,926,1,2364,932,
-1,1114,1065,16,0,
-197,1,112,1066,16,
-0,614,1,1117,1067,
-16,0,614,1,1873,
-940,1,1876,1068,16,
-0,614,1,124,1069,
-16,0,614,1,2136,
-947,1,381,1070,16,
-0,614,1,525,1071,
-16,0,614,1,137,
-1072,16,0,614,1,
-1901,1073,16,0,614,
-1,1153,1074,16,0,
-614,1,151,1075,16,
-0,614,1,1407,1076,
-16,0,614,1,1659,
-1077,16,0,614,1,
-2413,1078,16,0,614,
-1,406,1079,16,0,
-614,1,1371,1080,16,
-0,614,1,2105,919,
-1,166,1081,16,0,
-614,1,1622,1082,16,
-0,614,1,1931,965,
-1,1933,1083,16,0,
-614,1,431,1084,16,
-0,614,1,1585,1085,
-16,0,614,1,182,
-1086,16,0,614,1,
-1189,1087,16,0,614,
-1,1443,1088,16,0,
-614,1,1695,1089,16,
-0,614,1,2198,1090,
-16,0,614,1,447,
-1091,16,0,614,1,
-2458,980,1,2459,986,
-1,1958,1092,16,0,
-614,1,2462,993,1,
-1657,998,1,2464,1003,
-1,199,1093,16,0,
-614,1,459,1094,16,
-0,614,1,462,1095,
-16,0,614,1,217,
-1096,16,0,614,1,
-2227,1012,1,1225,1097,
-16,0,614,1,1479,
-1098,16,0,614,1,
-1731,1099,16,0,614,
-1,1989,1020,1,1990,
-1100,16,0,614,1,
-236,1101,16,0,614,
-1,1756,1102,16,0,
-614,1,5,1103,19,
-196,1,5,1104,5,
-100,1,2761,1105,16,
-0,610,1,256,1106,
-16,0,610,1,1261,
-1107,16,0,610,1,
-509,1108,16,0,610,
-1,1515,1109,16,0,
-610,1,2021,823,1,
-1775,1110,16,0,610,
+0,95,0,49,0,
+1,210,1,3,1,
+3,1,2,1007,22,
+1,49,1,199,1008,
+16,0,708,1,459,
+1009,16,0,708,1,
+462,1010,16,0,708,
+1,217,1011,16,0,
+708,1,2227,1012,17,
+1013,15,967,1,-1,
+1,5,1014,20,1015,
+4,32,87,0,104,
+0,105,0,108,0,
+101,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,50,0,1,
+237,1,3,1,6,
+1,5,1016,22,1,
+76,1,1225,1017,16,
+0,708,1,1479,1018,
+16,0,708,1,1731,
+1019,16,0,708,1,
+1989,1020,17,1021,15,
+825,1,-1,1,5,
+1022,20,1023,4,26,
+73,0,102,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,49,
+0,1,232,1,3,
+1,6,1,5,1024,
+22,1,71,1,1990,
+1025,16,0,708,1,
+236,1026,16,0,708,
+1,1756,1027,16,0,
+708,1,4,1028,19,
+199,1,4,1029,5,
+100,1,2761,1030,16,
+0,614,1,256,1031,
+16,0,614,1,1261,
+1032,16,0,614,1,
+509,1033,16,0,614,
+1,1515,1034,16,0,
+614,1,2021,823,1,
+1775,1035,16,0,614,
 1,2029,830,1,2030,
 836,1,2031,841,1,
 2032,846,1,2033,851,
-1,277,1111,16,0,
-610,1,2035,857,1,
+1,277,1036,16,0,
+614,1,2035,857,1,
 2037,862,1,2039,867,
-1,32,1112,16,0,
-610,1,2041,873,1,
-2293,1113,16,0,610,
+1,32,1037,16,0,
+614,1,2041,873,1,
+2293,1038,16,0,614,
 1,2043,879,1,2045,
-884,1,40,1114,16,
-0,200,1,41,1115,
-16,0,610,1,1297,
-1116,16,0,610,1,
-43,1117,16,0,610,
-1,44,1118,16,0,
-200,1,1803,892,1,
-1804,1119,16,0,610,
-1,299,1120,16,0,
-610,1,47,1121,16,
-0,194,1,52,1122,
-16,0,610,1,2318,
-1123,16,0,610,1,
-63,1124,16,0,217,
-1,66,1125,16,0,
-215,1,2075,1126,16,
-0,610,1,1574,904,
-1,71,1127,16,0,
-610,1,76,1128,16,
-0,610,1,1834,1129,
-16,0,610,1,2337,
-1130,16,0,610,1,
-79,1131,16,0,610,
-1,1335,1132,16,0,
-610,1,322,1133,16,
-0,610,1,85,1134,
-16,0,610,1,89,
-1135,16,0,610,1,
-346,1136,16,0,610,
-1,97,1137,16,0,
-610,1,2106,1138,16,
-0,610,1,102,1139,
-16,0,610,1,1860,
+884,1,40,1039,16,
+0,201,1,41,1040,
+16,0,614,1,1297,
+1041,16,0,614,1,
+43,1042,16,0,614,
+1,44,1043,16,0,
+201,1,1803,892,1,
+1804,1044,16,0,614,
+1,299,1045,16,0,
+614,1,47,1046,16,
+0,197,1,52,1047,
+16,0,614,1,2318,
+1048,16,0,614,1,
+63,1049,16,0,218,
+1,66,1050,16,0,
+216,1,2075,1051,16,
+0,614,1,1574,904,
+1,71,1052,16,0,
+614,1,76,1053,16,
+0,614,1,1834,1054,
+16,0,614,1,2337,
+1055,16,0,614,1,
+79,1056,16,0,614,
+1,1335,1057,16,0,
+614,1,322,1058,16,
+0,614,1,85,1059,
+16,0,614,1,89,
+1060,16,0,614,1,
+346,1061,16,0,614,
+1,97,1062,16,0,
+614,1,2106,1063,16,
+0,614,1,102,1064,
+16,0,614,1,1860,
 926,1,2364,932,1,
-1114,1140,16,0,194,
-1,112,1141,16,0,
-610,1,1117,1142,16,
-0,610,1,1873,940,
-1,1876,1143,16,0,
-610,1,124,1144,16,
-0,610,1,2136,947,
-1,381,1145,16,0,
-610,1,525,1146,16,
-0,610,1,137,1147,
-16,0,610,1,1901,
-1148,16,0,610,1,
-1153,1149,16,0,610,
-1,151,1150,16,0,
-610,1,1407,1151,16,
-0,610,1,1659,1152,
-16,0,610,1,2413,
-1153,16,0,610,1,
-406,1154,16,0,610,
-1,1371,1155,16,0,
-610,1,2105,919,1,
-166,1156,16,0,610,
-1,1622,1157,16,0,
-610,1,1931,965,1,
-1933,1158,16,0,610,
-1,431,1159,16,0,
-610,1,1585,1160,16,
-0,610,1,182,1161,
-16,0,610,1,1189,
-1162,16,0,610,1,
-1443,1163,16,0,610,
-1,1695,1164,16,0,
-610,1,2198,1165,16,
-0,610,1,447,1166,
-16,0,610,1,2458,
+1114,1065,16,0,197,
+1,112,1066,16,0,
+614,1,1117,1067,16,
+0,614,1,1873,940,
+1,1876,1068,16,0,
+614,1,124,1069,16,
+0,614,1,2136,947,
+1,381,1070,16,0,
+614,1,525,1071,16,
+0,614,1,137,1072,
+16,0,614,1,1901,
+1073,16,0,614,1,
+1153,1074,16,0,614,
+1,151,1075,16,0,
+614,1,1407,1076,16,
+0,614,1,1659,1077,
+16,0,614,1,2413,
+1078,16,0,614,1,
+406,1079,16,0,614,
+1,1371,1080,16,0,
+614,1,2105,919,1,
+166,1081,16,0,614,
+1,1622,1082,16,0,
+614,1,1931,965,1,
+1933,1083,16,0,614,
+1,431,1084,16,0,
+614,1,1585,1085,16,
+0,614,1,182,1086,
+16,0,614,1,1189,
+1087,16,0,614,1,
+1443,1088,16,0,614,
+1,1695,1089,16,0,
+614,1,2198,1090,16,
+0,614,1,447,1091,
+16,0,614,1,2458,
 980,1,2459,986,1,
-1958,1167,16,0,610,
+1958,1092,16,0,614,
 1,2462,993,1,1657,
 998,1,2464,1003,1,
-199,1168,16,0,610,
-1,459,1169,16,0,
-610,1,462,1170,16,
-0,610,1,217,1171,
-16,0,610,1,2227,
-1012,1,1225,1172,16,
-0,610,1,1479,1173,
-16,0,610,1,1731,
-1174,16,0,610,1,
-1989,1020,1,1990,1175,
-16,0,610,1,236,
-1176,16,0,610,1,
-1756,1177,16,0,610,
-1,6,1178,19,300,
-1,6,1179,5,2,
-1,1114,1180,16,0,
-298,1,40,1181,16,
-0,599,1,7,1182,
-19,261,1,7,1183,
-5,2,1,1114,1184,
-16,0,259,1,40,
-1185,16,0,533,1,
-8,1186,19,224,1,
-8,1187,5,2,1,
-1114,1188,16,0,222,
-1,40,1189,16,0,
-487,1,9,1190,19,
-230,1,9,1191,5,
-2,1,1114,1192,16,
-0,228,1,40,1193,
-16,0,417,1,10,
-1194,19,179,1,10,
-1195,5,2,1,1114,
-1196,16,0,177,1,
-40,1197,16,0,356,
-1,11,1198,19,139,
-1,11,1199,5,146,
-1,1260,1200,17,1201,
-15,1202,4,34,37,
-0,83,0,105,0,
+199,1093,16,0,614,
+1,459,1094,16,0,
+614,1,462,1095,16,
+0,614,1,217,1096,
+16,0,614,1,2227,
+1012,1,1225,1097,16,
+0,614,1,1479,1098,
+16,0,614,1,1731,
+1099,16,0,614,1,
+1989,1020,1,1990,1100,
+16,0,614,1,236,
+1101,16,0,614,1,
+1756,1102,16,0,614,
+1,5,1103,19,196,
+1,5,1104,5,100,
+1,2761,1105,16,0,
+610,1,256,1106,16,
+0,610,1,1261,1107,
+16,0,610,1,509,
+1108,16,0,610,1,
+1515,1109,16,0,610,
+1,2021,823,1,1775,
+1110,16,0,610,1,
+2029,830,1,2030,836,
+1,2031,841,1,2032,
+846,1,2033,851,1,
+277,1111,16,0,610,
+1,2035,857,1,2037,
+862,1,2039,867,1,
+32,1112,16,0,610,
+1,2041,873,1,2293,
+1113,16,0,610,1,
+2043,879,1,2045,884,
+1,40,1114,16,0,
+200,1,41,1115,16,
+0,610,1,1297,1116,
+16,0,610,1,43,
+1117,16,0,610,1,
+44,1118,16,0,200,
+1,1803,892,1,1804,
+1119,16,0,610,1,
+299,1120,16,0,610,
+1,47,1121,16,0,
+194,1,52,1122,16,
+0,610,1,2318,1123,
+16,0,610,1,63,
+1124,16,0,217,1,
+66,1125,16,0,215,
+1,2075,1126,16,0,
+610,1,1574,904,1,
+71,1127,16,0,610,
+1,76,1128,16,0,
+610,1,1834,1129,16,
+0,610,1,2337,1130,
+16,0,610,1,79,
+1131,16,0,610,1,
+1335,1132,16,0,610,
+1,322,1133,16,0,
+610,1,85,1134,16,
+0,610,1,89,1135,
+16,0,610,1,346,
+1136,16,0,610,1,
+97,1137,16,0,610,
+1,2106,1138,16,0,
+610,1,102,1139,16,
+0,610,1,1860,926,
+1,2364,932,1,1114,
+1140,16,0,194,1,
+112,1141,16,0,610,
+1,1117,1142,16,0,
+610,1,1873,940,1,
+1876,1143,16,0,610,
+1,124,1144,16,0,
+610,1,2136,947,1,
+381,1145,16,0,610,
+1,525,1146,16,0,
+610,1,137,1147,16,
+0,610,1,1901,1148,
+16,0,610,1,1153,
+1149,16,0,610,1,
+151,1150,16,0,610,
+1,1407,1151,16,0,
+610,1,1659,1152,16,
+0,610,1,2413,1153,
+16,0,610,1,406,
+1154,16,0,610,1,
+1371,1155,16,0,610,
+1,2105,919,1,166,
+1156,16,0,610,1,
+1622,1157,16,0,610,
+1,1931,965,1,1933,
+1158,16,0,610,1,
+431,1159,16,0,610,
+1,1585,1160,16,0,
+610,1,182,1161,16,
+0,610,1,1189,1162,
+16,0,610,1,1443,
+1163,16,0,610,1,
+1695,1164,16,0,610,
+1,2198,1165,16,0,
+610,1,447,1166,16,
+0,610,1,2458,980,
+1,2459,986,1,1958,
+1167,16,0,610,1,
+2462,993,1,1657,998,
+1,2464,1003,1,199,
+1168,16,0,610,1,
+459,1169,16,0,610,
+1,462,1170,16,0,
+610,1,217,1171,16,
+0,610,1,2227,1012,
+1,1225,1172,16,0,
+610,1,1479,1173,16,
+0,610,1,1731,1174,
+16,0,610,1,1989,
+1020,1,1990,1175,16,
+0,610,1,236,1176,
+16,0,610,1,1756,
+1177,16,0,610,1,
+6,1178,19,300,1,
+6,1179,5,2,1,
+1114,1180,16,0,298,
+1,40,1181,16,0,
+599,1,7,1182,19,
+261,1,7,1183,5,
+2,1,1114,1184,16,
+0,259,1,40,1185,
+16,0,533,1,8,
+1186,19,224,1,8,
+1187,5,2,1,1114,
+1188,16,0,222,1,
+40,1189,16,0,487,
+1,9,1190,19,230,
+1,9,1191,5,2,
+1,1114,1192,16,0,
+228,1,40,1193,16,
+0,417,1,10,1194,
+19,179,1,10,1195,
+5,2,1,1114,1196,
+16,0,177,1,40,
+1197,16,0,356,1,
+11,1198,19,139,1,
+11,1199,5,146,1,
+1260,1200,17,1201,15,
+1202,4,34,37,0,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,1203,20,1204,4,
+38,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
 115,0,115,0,105,
 0,103,0,110,0,
 109,0,101,0,110,
-0,116,0,1,-1,
-1,5,1203,20,1204,
-4,38,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,50,0,49,0,
-1,268,1,3,1,
-6,1,5,1205,22,
-1,107,1,2767,1206,
-16,0,324,1,1011,
-1207,17,1208,15,1209,
-4,44,37,0,80,
+0,116,0,95,0,
+50,0,49,0,1,
+268,1,3,1,6,
+1,5,1205,22,1,
+107,1,2767,1206,16,
+0,324,1,1011,1207,
+17,1208,15,1209,4,
+44,37,0,80,0,
+97,0,114,0,101,
+0,110,0,116,0,
+104,0,101,0,115,
+0,105,0,115,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+1,-1,1,5,1210,
+20,1211,4,46,80,
 0,97,0,114,0,
 101,0,110,0,116,
 0,104,0,101,0,
@@ -4774,264 +4783,289 @@ public yyLSLSyntax
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
+0,95,0,50,0,
+1,315,1,3,1,
+4,1,3,1212,22,
+1,154,1,1514,1213,
+17,1214,15,1202,1,
+-1,1,5,1215,20,
+1216,4,38,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,52,
+0,1,261,1,3,
+1,4,1,3,1217,
+22,1,100,1,9,
+1218,17,1219,15,1220,
+4,24,37,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
 0,1,-1,1,5,
-1210,20,1211,4,46,
-80,0,97,0,114,
-0,101,0,110,0,
-116,0,104,0,101,
-0,115,0,105,0,
-115,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,50,
-0,1,315,1,3,
-1,4,1,3,1212,
-22,1,154,1,1514,
-1213,17,1214,15,1202,
-1,-1,1,5,1215,
-20,1216,4,38,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,49,0,
-52,0,1,261,1,
-3,1,4,1,3,
-1217,22,1,100,1,
-9,1218,17,1219,15,
-1220,4,24,37,0,
+1221,20,1222,4,26,
 68,0,101,0,99,
 0,108,0,97,0,
 114,0,97,0,116,
 0,105,0,111,0,
-110,0,1,-1,1,
-5,1221,20,1222,4,
-26,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,95,0,
-49,0,1,205,1,
-3,1,3,1,2,
-1223,22,1,44,1,
-262,1224,17,1225,15,
-1226,4,34,37,0,
+110,0,95,0,49,
+0,1,205,1,3,
+1,3,1,2,1223,
+22,1,44,1,262,
+1224,17,1225,15,1226,
+4,34,37,0,66,
+0,105,0,110,0,
+97,0,114,0,121,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,1,-1,1,5,
+1227,20,1228,4,36,
 66,0,105,0,110,
 0,97,0,114,0,
 121,0,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,1,-1,1,
-5,1227,20,1228,4,
-36,66,0,105,0,
-110,0,97,0,114,
-0,121,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-53,0,1,297,1,
+110,0,95,0,53,
+0,1,297,1,3,
+1,4,1,3,1229,
+22,1,136,1,1267,
+1230,17,1231,15,1202,
+1,-1,1,5,1232,
+20,1233,4,36,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
+101,0,110,0,116,
+0,95,0,56,0,
+1,255,1,3,1,
+6,1,5,1234,22,
+1,94,1,2021,823,
+1,1521,1235,17,1236,
+15,1202,1,-1,1,
+5,1237,20,1238,4,
+36,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,1,248,1,
 3,1,4,1,3,
-1229,22,1,136,1,
-1267,1230,17,1231,15,
-1202,1,-1,1,5,
-1232,20,1233,4,36,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,56,
-0,1,255,1,3,
-1,6,1,5,1234,
-22,1,94,1,2021,
-823,1,1521,1235,17,
-1236,15,1202,1,-1,
-1,5,1237,20,1238,
-4,36,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,1,248,
-1,3,1,4,1,
-3,1239,22,1,87,
-1,2024,1240,17,1241,
-15,1242,4,24,37,
-0,83,0,116,0,
+1239,22,1,87,1,
+2024,1240,17,1241,15,
+1242,4,24,37,0,
+83,0,116,0,97,
+0,116,0,101,0,
+67,0,104,0,97,
+0,110,0,103,0,
+101,0,1,-1,1,
+5,1243,20,1244,4,
+26,83,0,116,0,
 97,0,116,0,101,
 0,67,0,104,0,
 97,0,110,0,103,
-0,101,0,1,-1,
-1,5,1243,20,1244,
-4,26,83,0,116,
-0,97,0,116,0,
-101,0,67,0,104,
-0,97,0,110,0,
-103,0,101,0,95,
-0,49,0,1,230,
-1,3,1,3,1,
-2,1245,22,1,69,
-1,1775,1246,17,1247,
-15,1248,4,30,37,
-0,69,0,109,0,
-112,0,116,0,121,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,1,
--1,1,5,1249,20,
-1250,4,32,69,0,
-109,0,112,0,116,
-0,121,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,49,0,
-1,214,1,3,1,
-1,1,0,1251,22,
-1,53,1,19,1252,
-17,1219,1,2,1223,
-1,2028,1253,17,1254,
-15,1255,4,20,37,
-0,74,0,117,0,
-109,0,112,0,76,
-0,97,0,98,0,
-101,0,108,0,1,
--1,1,5,1256,20,
-1257,4,22,74,0,
-117,0,109,0,112,
-0,76,0,97,0,
-98,0,101,0,108,
-0,95,0,49,0,
-1,228,1,3,1,
-3,1,2,1258,22,
-1,67,1,2029,830,
-1,2281,1259,17,1260,
-15,1261,4,34,37,
-0,70,0,111,0,
-114,0,76,0,111,
-0,111,0,112,0,
+0,101,0,95,0,
+49,0,1,230,1,
+3,1,3,1,2,
+1245,22,1,69,1,
+1775,1246,17,1247,15,
+1248,4,30,37,0,
+69,0,109,0,112,
+0,116,0,121,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,1,-1,
-1,5,1262,20,1263,
-4,36,70,0,111,
-0,114,0,76,0,
-111,0,111,0,112,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,50,0,1,243,
-1,3,1,2,1,
-1,1264,22,1,82,
-1,2031,841,1,2032,
-846,1,2033,851,1,
-2034,1265,16,0,669,
-1,2035,857,1,2036,
-1266,16,0,600,1,
-2037,862,1,2038,1267,
-16,0,604,1,2039,
-867,1,32,1268,17,
-1247,1,0,1251,1,
-2041,873,1,2042,1269,
-16,0,743,1,2043,
-879,1,2044,1270,16,
-0,682,1,2045,884,
-1,2299,1271,16,0,
-246,1,1296,1272,17,
-1273,15,1202,1,-1,
-1,5,1274,20,1275,
-4,38,83,0,105,
+1,5,1249,20,1250,
+4,32,69,0,109,
+0,112,0,116,0,
+121,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+214,1,3,1,1,
+1,0,1251,22,1,
+53,1,19,1252,17,
+1219,1,2,1223,1,
+2028,1253,17,1254,15,
+1255,4,20,37,0,
+74,0,117,0,109,
+0,112,0,76,0,
+97,0,98,0,101,
+0,108,0,1,-1,
+1,5,1256,20,1257,
+4,22,74,0,117,
 0,109,0,112,0,
-108,0,101,0,65,
+76,0,97,0,98,
+0,101,0,108,0,
+95,0,49,0,1,
+228,1,3,1,3,
+1,2,1258,22,1,
+67,1,2029,830,1,
+2281,1259,17,1260,15,
+1261,4,34,37,0,
+70,0,111,0,114,
+0,76,0,111,0,
+111,0,112,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,1262,20,1263,4,
+36,70,0,111,0,
+114,0,76,0,111,
+0,111,0,112,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+50,0,1,243,1,
+3,1,2,1,1,
+1264,22,1,82,1,
+2031,841,1,2032,846,
+1,2033,851,1,2034,
+1265,16,0,669,1,
+2035,857,1,2036,1266,
+16,0,600,1,2037,
+862,1,2038,1267,16,
+0,604,1,2039,867,
+1,32,1268,17,1247,
+1,0,1251,1,2041,
+873,1,2042,1269,16,
+0,743,1,2043,879,
+1,2044,1270,16,0,
+682,1,2045,884,1,
+2299,1271,16,0,246,
+1,1296,1272,17,1273,
+15,1202,1,-1,1,
+5,1274,20,1275,4,
+38,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+50,0,48,0,1,
+267,1,3,1,6,
+1,5,1276,22,1,
+106,1,283,1277,17,
+1278,15,1226,1,-1,
+1,5,1279,20,1280,
+4,36,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,52,0,1,296,
+1,3,1,4,1,
+3,1281,22,1,135,
+1,40,1282,17,1283,
+15,1284,4,32,37,
+0,73,0,100,0,
+101,0,110,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
 0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,50,0,48,0,
-1,267,1,3,1,
-6,1,5,1276,22,
-1,106,1,283,1277,
-17,1278,15,1226,1,
--1,1,5,1279,20,
-1280,4,36,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
+105,0,111,0,110,
+0,1,-1,1,5,
+1285,20,1286,4,34,
+73,0,100,0,101,
+0,110,0,116,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,52,0,1,
-296,1,3,1,4,
-1,3,1281,22,1,
-135,1,40,1282,17,
-1283,15,1284,4,32,
-37,0,73,0,100,
+95,0,49,0,1,
+282,1,3,1,2,
+1,1,1287,22,1,
+121,1,44,1288,17,
+1283,1,1,1287,1,
+1803,892,1,47,1289,
+17,1290,15,1291,4,
+38,37,0,73,0,
+100,0,101,0,110,
+0,116,0,68,0,
+111,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,1,
+-1,1,5,1292,20,
+1293,4,40,73,0,
+100,0,101,0,110,
+0,116,0,68,0,
+111,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,49,0,1,283,
+1,3,1,4,1,
+3,1294,22,1,122,
+1,48,1295,17,1296,
+15,1297,4,58,37,
+0,73,0,110,0,
+99,0,114,0,101,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+114,0,101,0,109,
 0,101,0,110,0,
 116,0,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,1,-1,1,
-5,1285,20,1286,4,
-34,73,0,100,0,
-101,0,110,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,49,0,
-1,282,1,3,1,
-2,1,1,1287,22,
-1,121,1,44,1288,
-17,1283,1,1,1287,
-1,1803,892,1,47,
-1289,17,1290,15,1291,
-4,38,37,0,73,
-0,100,0,101,0,
-110,0,116,0,68,
-0,111,0,116,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-1,-1,1,5,1292,
-20,1293,4,40,73,
-0,100,0,101,0,
+5,1298,20,1299,4,
+60,73,0,110,0,
+99,0,114,0,101,
+0,109,0,101,0,
 110,0,116,0,68,
-0,111,0,116,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,49,0,1,
-283,1,3,1,4,
-1,3,1294,22,1,
-122,1,48,1295,17,
-1296,15,1297,4,58,
-37,0,73,0,110,
+0,101,0,99,0,
+114,0,101,0,109,
+0,101,0,110,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,52,
+0,1,287,1,3,
+1,5,1,4,1300,
+22,1,126,1,49,
+1301,17,1302,15,1297,
+1,-1,1,5,1303,
+20,1304,4,60,73,
+0,110,0,99,0,
+114,0,101,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
 0,99,0,114,0,
 101,0,109,0,101,
 0,110,0,116,0,
-68,0,101,0,99,
+69,0,120,0,112,
 0,114,0,101,0,
-109,0,101,0,110,
-0,116,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,-1,
-1,5,1298,20,1299,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,51,0,1,
+286,1,3,1,5,
+1,4,1305,22,1,
+125,1,50,1306,17,
+1307,15,1297,1,-1,
+1,5,1308,20,1309,
 4,60,73,0,110,
 0,99,0,114,0,
 101,0,109,0,101,
@@ -5044,12 +5078,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-52,0,1,287,1,
-3,1,5,1,4,
-1300,22,1,126,1,
-49,1301,17,1302,15,
+50,0,1,285,1,
+3,1,3,1,2,
+1310,22,1,124,1,
+51,1311,17,1312,15,
 1297,1,-1,1,5,
-1303,20,1304,4,60,
+1313,20,1314,4,60,
 73,0,110,0,99,
 0,114,0,101,0,
 109,0,101,0,110,
@@ -5061,89 +5095,81 @@ public yyLSLSyntax
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,51,0,
-1,286,1,3,1,
-5,1,4,1305,22,
-1,125,1,50,1306,
-17,1307,15,1297,1,
--1,1,5,1308,20,
-1309,4,60,73,0,
-110,0,99,0,114,
-0,101,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
-99,0,114,0,101,
-0,109,0,101,0,
-110,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,50,0,1,285,
-1,3,1,3,1,
-2,1310,22,1,124,
-1,51,1311,17,1312,
-15,1297,1,-1,1,
-5,1313,20,1314,4,
-60,73,0,110,0,
-99,0,114,0,101,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-114,0,101,0,109,
-0,101,0,110,0,
-116,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,1,284,1,3,
-1,3,1,2,1315,
-22,1,123,1,305,
-1316,17,1317,15,1226,
-1,-1,1,5,1318,
-20,1319,4,36,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,51,0,
-1,295,1,3,1,
-4,1,3,1320,22,
-1,134,1,525,1321,
-17,1322,15,1323,4,
-34,37,0,82,0,
+0,95,0,49,0,
+1,284,1,3,1,
+3,1,2,1315,22,
+1,123,1,305,1316,
+17,1317,15,1226,1,
+-1,1,5,1318,20,
+1319,4,36,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,51,0,1,
+295,1,3,1,4,
+1,3,1320,22,1,
+134,1,525,1321,17,
+1322,15,1323,4,34,
+37,0,82,0,111,
+0,116,0,97,0,
+116,0,105,0,111,
+0,110,0,67,0,
+111,0,110,0,115,
+0,116,0,97,0,
+110,0,116,0,1,
+-1,1,5,1324,20,
+1325,4,36,82,0,
 111,0,116,0,97,
 0,116,0,105,0,
 111,0,110,0,67,
 0,111,0,110,0,
 115,0,116,0,97,
 0,110,0,116,0,
-1,-1,1,5,1324,
-20,1325,4,36,82,
-0,111,0,116,0,
-97,0,116,0,105,
-0,111,0,110,0,
-67,0,111,0,110,
-0,115,0,116,0,
-97,0,110,0,116,
-0,95,0,49,0,
-1,280,1,3,1,
-10,1,9,1326,22,
-1,119,1,63,1327,
-17,1328,15,1329,4,
-38,37,0,84,0,
-121,0,112,0,101,
-0,99,0,97,0,
-115,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,1,
--1,1,5,1330,20,
-1331,4,40,84,0,
+95,0,49,0,1,
+280,1,3,1,10,
+1,9,1326,22,1,
+119,1,63,1327,17,
+1328,15,1329,4,38,
+37,0,84,0,121,
+0,112,0,101,0,
+99,0,97,0,115,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,-1,
+1,5,1330,20,1331,
+4,40,84,0,121,
+0,112,0,101,0,
+99,0,97,0,115,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+50,0,1,317,1,
+3,1,5,1,4,
+1332,22,1,156,1,
+66,1333,17,1334,15,
+1329,1,-1,1,5,
+1335,20,1336,4,40,
+84,0,121,0,112,
+0,101,0,99,0,
+97,0,115,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,51,0,
+1,318,1,3,1,
+7,1,6,1337,22,
+1,157,1,67,1338,
+17,1339,15,1329,1,
+-1,1,5,1340,20,
+1341,4,40,84,0,
 121,0,112,0,101,
 0,99,0,97,0,
 115,0,116,0,69,
@@ -5151,12 +5177,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,50,0,1,317,
-1,3,1,5,1,
-4,1332,22,1,156,
-1,66,1333,17,1334,
+0,55,0,1,322,
+1,3,1,8,1,
+7,1342,22,1,161,
+1,68,1343,17,1344,
 15,1329,1,-1,1,
-5,1335,20,1336,4,
+5,1345,20,1346,4,
 40,84,0,121,0,
 112,0,101,0,99,
 0,97,0,115,0,
@@ -5164,13 +5190,13 @@ public yyLSLSyntax
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,95,0,51,
-0,1,318,1,3,
-1,7,1,6,1337,
-22,1,157,1,67,
-1338,17,1339,15,1329,
-1,-1,1,5,1340,
-20,1341,4,40,84,
+110,0,95,0,53,
+0,1,320,1,3,
+1,8,1,7,1347,
+22,1,159,1,69,
+1348,17,1349,15,1329,
+1,-1,1,5,1350,
+20,1351,4,40,84,
 0,121,0,112,0,
 101,0,99,0,97,
 0,115,0,116,0,
@@ -5178,12 +5204,12 @@ public yyLSLSyntax
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,55,0,1,
-322,1,3,1,8,
-1,7,1342,22,1,
-161,1,68,1343,17,
-1344,15,1329,1,-1,
-1,5,1345,20,1346,
+95,0,54,0,1,
+321,1,3,1,6,
+1,5,1352,22,1,
+160,1,70,1353,17,
+1354,15,1329,1,-1,
+1,5,1355,20,1356,
 4,40,84,0,121,
 0,112,0,101,0,
 99,0,97,0,115,
@@ -5192,12 +5218,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-53,0,1,320,1,
-3,1,8,1,7,
-1347,22,1,159,1,
-69,1348,17,1349,15,
+52,0,1,319,1,
+3,1,6,1,5,
+1357,22,1,158,1,
+74,1358,17,1359,15,
 1329,1,-1,1,5,
-1350,20,1351,4,40,
+1360,20,1361,4,40,
 84,0,121,0,112,
 0,101,0,99,0,
 97,0,115,0,116,
@@ -5205,265 +5231,404 @@ public yyLSLSyntax
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,54,0,
-1,321,1,3,1,
-6,1,5,1352,22,
-1,160,1,70,1353,
-17,1354,15,1329,1,
--1,1,5,1355,20,
-1356,4,40,84,0,
-121,0,112,0,101,
-0,99,0,97,0,
-115,0,116,0,69,
+0,95,0,57,0,
+1,324,1,3,1,
+7,1,6,1362,22,
+1,163,1,1013,1363,
+17,1364,15,1209,1,
+-1,1,5,1365,20,
+1366,4,46,80,0,
+97,0,114,0,101,
+0,110,0,116,0,
+104,0,101,0,115,
+0,105,0,115,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,49,0,1,
+314,1,3,1,4,
+1,3,1367,22,1,
+153,1,1332,1368,17,
+1369,15,1202,1,-1,
+1,5,1370,20,1371,
+4,38,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,49,0,57,0,
+1,266,1,3,1,
+6,1,5,1372,22,
+1,105,1,2337,1373,
+17,1247,1,0,1251,
+1,1585,1374,17,1375,
+15,1376,4,32,37,
+0,82,0,101,0,
+116,0,117,0,114,
+0,110,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,1,-1,1,5,
+1377,20,1378,4,34,
+82,0,101,0,116,
+0,117,0,114,0,
+110,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,50,0,1,
+273,1,3,1,2,
+1,1,1379,22,1,
+112,1,2023,1380,17,
+1381,15,1242,1,-1,
+1,5,1382,20,1383,
+4,26,83,0,116,
+0,97,0,116,0,
+101,0,67,0,104,
+0,97,0,110,0,
+103,0,101,0,95,
+0,50,0,1,231,
+1,3,1,3,1,
+2,1384,22,1,70,
+1,2136,947,1,82,
+1385,17,1386,15,1387,
+4,32,37,0,85,
+0,110,0,97,0,
+114,0,121,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
-111,0,110,0,95,
-0,52,0,1,319,
-1,3,1,6,1,
-5,1357,22,1,158,
-1,74,1358,17,1359,
-15,1329,1,-1,1,
-5,1360,20,1361,4,
-40,84,0,121,0,
-112,0,101,0,99,
-0,97,0,115,0,
-116,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,57,
-0,1,324,1,3,
-1,7,1,6,1362,
-22,1,163,1,1013,
-1363,17,1364,15,1209,
-1,-1,1,5,1365,
-20,1366,4,46,80,
-0,97,0,114,0,
-101,0,110,0,116,
-0,104,0,101,0,
-115,0,105,0,115,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,49,0,
-1,314,1,3,1,
-4,1,3,1367,22,
-1,153,1,1332,1368,
-17,1369,15,1202,1,
--1,1,5,1370,20,
-1371,4,38,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,57,
-0,1,266,1,3,
-1,6,1,5,1372,
-22,1,105,1,2337,
-1373,17,1247,1,0,
-1251,1,1585,1374,17,
-1375,15,1376,4,32,
-37,0,82,0,101,
-0,116,0,117,0,
-114,0,110,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,1377,20,1378,4,
-34,82,0,101,0,
-116,0,117,0,114,
-0,110,0,83,0,
+111,0,110,0,1,
+-1,1,5,1388,20,
+1389,4,34,85,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+51,0,1,313,1,
+3,1,3,1,2,
+1390,22,1,152,1,
+2026,1391,17,1392,15,
+1393,4,28,37,0,
+74,0,117,0,109,
+0,112,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
-0,95,0,50,0,
-1,273,1,3,1,
-2,1,1,1379,22,
-1,112,1,2023,1380,
-17,1381,15,1242,1,
--1,1,5,1382,20,
-1383,4,26,83,0,
+0,1,-1,1,5,
+1394,20,1395,4,30,
+74,0,117,0,109,
+0,112,0,83,0,
 116,0,97,0,116,
-0,101,0,67,0,
-104,0,97,0,110,
-0,103,0,101,0,
-95,0,50,0,1,
-231,1,3,1,3,
-1,2,1384,22,1,
-70,1,2136,947,1,
-82,1385,17,1386,15,
-1387,4,32,37,0,
-85,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,49,0,
+1,229,1,3,1,
+3,1,2,1396,22,
+1,68,1,1591,1397,
+17,1398,15,1376,1,
+-1,1,5,1399,20,
+1400,4,34,82,0,
+101,0,116,0,117,
+0,114,0,110,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,1,272,1,
+3,1,3,1,2,
+1401,22,1,111,1,
+1341,1402,17,1403,15,
+1202,1,-1,1,5,
+1404,20,1405,4,36,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,54,
+0,1,253,1,3,
+1,4,1,3,1406,
+22,1,92,1,2030,
+836,1,328,1407,17,
+1408,15,1226,1,-1,
+1,5,1409,20,1410,
+4,36,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,50,0,1,294,
+1,3,1,4,1,
+3,1411,22,1,133,
+1,1303,1412,17,1413,
+15,1202,1,-1,1,
+5,1414,20,1415,4,
+36,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
 115,0,115,0,105,
-0,111,0,110,0,
-1,-1,1,5,1388,
-20,1389,4,34,85,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+55,0,1,254,1,
+3,1,6,1,5,
+1416,22,1,93,1,
+1096,1417,17,1418,15,
+1419,4,26,37,0,
+70,0,117,0,110,
+0,99,0,116,0,
+105,0,111,0,110,
+0,67,0,97,0,
+108,0,108,0,1,
+-1,1,5,1420,20,
+1421,4,28,70,0,
+117,0,110,0,99,
+0,116,0,105,0,
+111,0,110,0,67,
+0,97,0,108,0,
+108,0,95,0,49,
+0,1,325,1,3,
+1,5,1,4,1422,
+22,1,164,1,93,
+1423,17,1424,15,1387,
+1,-1,1,5,1425,
+20,1426,4,34,85,
 0,110,0,97,0,
 114,0,121,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,51,0,1,313,
-1,3,1,3,1,
-2,1390,22,1,152,
-1,2026,1391,17,1392,
-15,1393,4,28,37,
-0,74,0,117,0,
-109,0,112,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,1394,20,1395,4,
-30,74,0,117,0,
-109,0,112,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,1,229,1,3,
-1,3,1,2,1396,
-22,1,68,1,1591,
-1397,17,1398,15,1376,
-1,-1,1,5,1399,
-20,1400,4,34,82,
-0,101,0,116,0,
-117,0,114,0,110,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,1,272,
+0,50,0,1,312,
 1,3,1,3,1,
-2,1401,22,1,111,
-1,1341,1402,17,1403,
+2,1427,22,1,151,
+1,1550,1428,17,1429,
 15,1202,1,-1,1,
-5,1404,20,1405,4,
-36,83,0,105,0,
+5,1430,20,1431,4,
+38,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
 115,0,115,0,105,
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-54,0,1,253,1,
-3,1,4,1,3,
-1406,22,1,92,1,
-2030,836,1,328,1407,
-17,1408,15,1226,1,
--1,1,5,1409,20,
-1410,4,36,66,0,
-105,0,110,0,97,
+49,0,51,0,1,
+260,1,3,1,4,
+1,3,1432,22,1,
+99,1,2040,1433,16,
+0,608,1,2106,1434,
+17,1247,1,0,1251,
+1,1555,1435,16,0,
+696,1,827,1436,17,
+1437,15,1226,1,-1,
+1,5,1438,20,1439,
+4,38,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,49,0,53,0,
+1,307,1,3,1,
+4,1,3,1440,22,
+1,146,1,1859,1441,
+16,0,335,1,1860,
+926,1,1804,1442,17,
+1247,1,0,1251,1,
+107,1443,17,1444,15,
+1387,1,-1,1,5,
+1445,20,1446,4,34,
+85,0,110,0,97,
 0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,50,0,1,
-294,1,3,1,4,
-1,3,1411,22,1,
-133,1,1303,1412,17,
-1413,15,1202,1,-1,
-1,5,1414,20,1415,
-4,36,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
+95,0,49,0,1,
+311,1,3,1,3,
+1,2,1447,22,1,
+150,1,1114,1448,17,
+1290,1,3,1294,1,
+1048,1449,17,1450,15,
+1226,1,-1,1,5,
+1451,20,1452,4,38,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,49,
+0,56,0,1,310,
+1,3,1,4,1,
+3,1453,22,1,149,
+1,352,1454,17,1455,
+15,1226,1,-1,1,
+5,1456,20,1457,4,
+36,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+49,0,1,293,1,
+3,1,4,1,3,
+1458,22,1,132,1,
+1872,1459,16,0,345,
+1,1873,940,1,118,
+1460,17,1461,15,1226,
+1,-1,1,5,1462,
+20,1463,4,38,66,
+0,105,0,110,0,
+97,0,114,0,121,
+0,69,0,120,0,
+112,0,114,0,101,
 0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,55,0,1,254,
+105,0,111,0,110,
+0,95,0,49,0,
+52,0,1,306,1,
+3,1,4,1,3,
+1464,22,1,145,1,
+1123,1465,17,1466,15,
+1202,1,-1,1,5,
+1467,20,1468,4,38,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,49,
+0,50,0,1,259,
 1,3,1,6,1,
-5,1416,22,1,93,
-1,1096,1417,17,1418,
-15,1419,4,26,37,
+5,1469,22,1,98,
+1,371,1470,17,1471,
+15,1472,4,46,37,
 0,70,0,117,0,
 110,0,99,0,116,
 0,105,0,111,0,
 110,0,67,0,97,
 0,108,0,108,0,
-1,-1,1,5,1420,
-20,1421,4,28,70,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+1,-1,1,5,1473,
+20,1474,4,48,70,
 0,117,0,110,0,
 99,0,116,0,105,
 0,111,0,110,0,
 67,0,97,0,108,
-0,108,0,95,0,
-49,0,1,325,1,
-3,1,5,1,4,
-1422,22,1,164,1,
-93,1423,17,1424,15,
-1387,1,-1,1,5,
-1425,20,1426,4,34,
-85,0,110,0,97,
-0,114,0,121,0,
+0,108,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+49,0,1,292,1,
+3,1,2,1,1,
+1475,22,1,131,1,
+1377,1476,17,1477,15,
+1202,1,-1,1,5,
+1478,20,1479,4,36,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,53,
+0,1,252,1,3,
+1,4,1,3,1480,
+22,1,91,1,375,
+1481,17,1482,15,1297,
+1,-1,1,5,1483,
+20,1484,4,60,73,
+0,110,0,99,0,
+114,0,101,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
+0,99,0,114,0,
+101,0,109,0,101,
+0,110,0,116,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,50,0,1,
-312,1,3,1,3,
-1,2,1427,22,1,
-151,1,1550,1428,17,
-1429,15,1202,1,-1,
-1,5,1430,20,1431,
-4,38,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,51,0,
-1,260,1,3,1,
-4,1,3,1432,22,
-1,99,1,2040,1433,
-16,0,608,1,2106,
-1434,17,1247,1,0,
-1251,1,1555,1435,16,
-0,696,1,827,1436,
-17,1437,15,1226,1,
--1,1,5,1438,20,
-1439,4,38,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
+95,0,56,0,1,
+291,1,3,1,5,
+1,4,1485,22,1,
+130,1,377,1486,17,
+1487,15,1297,1,-1,
+1,5,1488,20,1489,
+4,60,73,0,110,
+0,99,0,114,0,
+101,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
 0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,49,0,53,
-0,1,307,1,3,
-1,4,1,3,1440,
-22,1,146,1,1859,
-1441,16,0,335,1,
-1860,926,1,1804,1442,
-17,1247,1,0,1251,
-1,107,1443,17,1444,
-15,1387,1,-1,1,
-5,1445,20,1446,4,
-34,85,0,110,0,
-97,0,114,0,121,
+109,0,101,0,110,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+53,0,1,288,1,
+3,1,3,1,2,
+1490,22,1,127,1,
+379,1491,17,1492,15,
+1297,1,-1,1,5,
+1493,20,1494,4,60,
+73,0,110,0,99,
+0,114,0,101,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,114,
+0,101,0,109,0,
+101,0,110,0,116,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,49,0,
-1,311,1,3,1,
-3,1,2,1447,22,
-1,150,1,1114,1448,
-17,1290,1,3,1294,
-1,1048,1449,17,1450,
+0,95,0,55,0,
+1,290,1,3,1,
+5,1,4,1495,22,
+1,129,1,380,1496,
+17,1497,15,1498,4,
+38,37,0,67,0,
+111,0,110,0,115,
+0,116,0,97,0,
+110,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,1,
+-1,1,5,1499,20,
+1500,4,40,67,0,
+111,0,110,0,115,
+0,116,0,97,0,
+110,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,49,0,1,281,
+1,3,1,2,1,
+1,1501,22,1,120,
+1,883,1502,17,1503,
 15,1226,1,-1,1,
-5,1451,20,1452,4,
+5,1504,20,1505,4,
 38,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
@@ -5471,126 +5636,29 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,56,0,1,
-310,1,3,1,4,
-1,3,1453,22,1,
-149,1,352,1454,17,
-1455,15,1226,1,-1,
-1,5,1456,20,1457,
-4,36,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
+49,0,54,0,1,
+308,1,3,1,4,
+1,3,1506,22,1,
+147,1,1628,1507,17,
+1508,15,1509,4,22,
+37,0,65,0,115,
 0,115,0,105,0,
-111,0,110,0,95,
-0,49,0,1,293,
-1,3,1,4,1,
-3,1458,22,1,132,
-1,1872,1459,16,0,
-345,1,1873,940,1,
-118,1460,17,1461,15,
-1226,1,-1,1,5,
-1462,20,1463,4,38,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,52,0,1,306,
-1,3,1,4,1,
-3,1464,22,1,145,
-1,1123,1465,17,1466,
-15,1202,1,-1,1,
-5,1467,20,1468,4,
-38,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,50,0,1,
-259,1,3,1,6,
-1,5,1469,22,1,
-98,1,371,1470,17,
-1471,15,1472,4,46,
-37,0,70,0,117,
-0,110,0,99,0,
-116,0,105,0,111,
-0,110,0,67,0,
-97,0,108,0,108,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,-1,1,5,
-1473,20,1474,4,48,
-70,0,117,0,110,
-0,99,0,116,0,
-105,0,111,0,110,
-0,67,0,97,0,
-108,0,108,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,49,0,1,292,
-1,3,1,2,1,
-1,1475,22,1,131,
-1,1377,1476,17,1477,
-15,1202,1,-1,1,
-5,1478,20,1479,4,
-36,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-53,0,1,252,1,
-3,1,4,1,3,
-1480,22,1,91,1,
-375,1481,17,1482,15,
-1297,1,-1,1,5,
-1483,20,1484,4,60,
-73,0,110,0,99,
-0,114,0,101,0,
-109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,114,
-0,101,0,109,0,
-101,0,110,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,56,0,
-1,291,1,3,1,
-5,1,4,1485,22,
-1,130,1,377,1486,
-17,1487,15,1297,1,
--1,1,5,1488,20,
-1489,4,60,73,0,
-110,0,99,0,114,
-0,101,0,109,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,1510,20,1511,4,
+24,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
 101,0,110,0,116,
-0,68,0,101,0,
-99,0,114,0,101,
-0,109,0,101,0,
-110,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,53,0,1,288,
-1,3,1,3,1,
-2,1490,22,1,127,
-1,379,1491,17,1492,
+0,95,0,49,0,
+1,246,1,3,1,
+4,1,3,1512,22,
+1,85,1,2075,1513,
+17,1247,1,0,1251,
+1,373,1514,17,1515,
 15,1297,1,-1,1,
-5,1493,20,1494,4,
+5,1516,20,1517,4,
 60,73,0,110,0,
 99,0,114,0,101,
 0,109,0,101,0,
@@ -5602,82 +5670,26 @@ public yyLSLSyntax
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,95,0,55,
-0,1,290,1,3,
-1,5,1,4,1495,
-22,1,129,1,380,
-1496,17,1497,15,1498,
-4,38,37,0,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-1,-1,1,5,1499,
-20,1500,4,40,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,49,0,1,
-281,1,3,1,2,
-1,1,1501,22,1,
-120,1,883,1502,17,
-1503,15,1226,1,-1,
-1,5,1504,20,1505,
-4,38,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,49,0,54,0,
-1,308,1,3,1,
-4,1,3,1506,22,
-1,147,1,1628,1507,
-17,1508,15,1509,4,
-22,37,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,1,-1,
-1,5,1510,20,1511,
-4,24,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,1,246,1,3,
-1,4,1,3,1512,
-22,1,85,1,2075,
-1513,17,1247,1,0,
-1251,1,373,1514,17,
-1515,15,1297,1,-1,
-1,5,1516,20,1517,
-4,60,73,0,110,
-0,99,0,114,0,
-101,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,114,0,101,0,
-109,0,101,0,110,
-0,116,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-54,0,1,289,1,
-3,1,3,1,2,
-1518,22,1,128,1,
-130,1519,17,1520,15,
+110,0,95,0,54,
+0,1,289,1,3,
+1,3,1,2,1518,
+22,1,128,1,130,
+1519,17,1520,15,1226,
+1,-1,1,5,1521,
+20,1522,4,38,66,
+0,105,0,110,0,
+97,0,114,0,121,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,49,0,
+51,0,1,305,1,
+3,1,4,1,3,
+1523,22,1,144,1,
+143,1524,17,1525,15,
 1226,1,-1,1,5,
-1521,20,1522,4,38,
+1526,20,1527,4,38,
 66,0,105,0,110,
 0,97,0,114,0,
 121,0,69,0,120,
@@ -5685,56 +5697,82 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,49,
-0,51,0,1,305,
+0,50,0,1,304,
 1,3,1,4,1,
-3,1523,22,1,144,
-1,143,1524,17,1525,
-15,1226,1,-1,1,
-5,1526,20,1527,4,
-38,66,0,105,0,
-110,0,97,0,114,
-0,121,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-49,0,50,0,1,
-304,1,3,1,4,
-1,3,1528,22,1,
-143,1,1901,1529,17,
+3,1528,22,1,143,
+1,1901,1529,17,1247,
+1,0,1251,1,1152,
+1530,17,1531,15,1202,
+1,-1,1,5,1532,
+20,1533,4,38,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
+101,0,110,0,116,
+0,95,0,50,0,
+52,0,1,271,1,
+3,1,6,1,5,
+1534,22,1,110,1,
+1406,1535,17,1536,15,
+1202,1,-1,1,5,
+1537,20,1538,4,38,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,49,
+0,55,0,1,264,
+1,3,1,4,1,
+3,1539,22,1,103,
+1,1659,1540,16,0,
+291,1,2413,1541,17,
 1247,1,0,1251,1,
-1152,1530,17,1531,15,
+1159,1542,17,1543,15,
 1202,1,-1,1,5,
-1532,20,1533,4,38,
+1544,20,1545,4,38,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
 0,115,0,105,0,
 103,0,110,0,109,
 0,101,0,110,0,
-116,0,95,0,50,
-0,52,0,1,271,
+116,0,95,0,49,
+0,49,0,1,258,
 1,3,1,6,1,
-5,1534,22,1,110,
-1,1406,1535,17,1536,
-15,1202,1,-1,1,
-5,1537,20,1538,4,
-38,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,55,0,1,
-264,1,3,1,4,
-1,3,1539,22,1,
-103,1,1659,1540,16,
-0,291,1,2413,1541,
-17,1247,1,0,1251,
-1,1159,1542,17,1543,
+5,1546,22,1,97,
+1,157,1547,17,1548,
+15,1226,1,-1,1,
+5,1549,20,1550,4,
+38,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+49,0,49,0,1,
+303,1,3,1,4,
+1,3,1551,22,1,
+142,1,1413,1552,17,
+1553,15,1202,1,-1,
+1,5,1554,20,1555,
+4,36,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,52,0,1,251,
+1,3,1,4,1,
+3,1556,22,1,90,
+1,1370,1557,17,1558,
 15,1202,1,-1,1,
-5,1544,20,1545,4,
+5,1559,20,1560,4,
 38,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
@@ -5742,38 +5780,12 @@ public yyLSLSyntax
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,49,0,1,
-258,1,3,1,6,
-1,5,1546,22,1,
-97,1,157,1547,17,
-1548,15,1226,1,-1,
-1,5,1549,20,1550,
-4,38,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,49,0,49,0,
-1,303,1,3,1,
-4,1,3,1551,22,
-1,142,1,1413,1552,
-17,1553,15,1202,1,
--1,1,5,1554,20,
-1555,4,36,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,52,0,1,
-251,1,3,1,4,
-1,3,1556,22,1,
-90,1,1370,1557,17,
-1558,15,1202,1,-1,
-1,5,1559,20,1560,
+49,0,56,0,1,
+265,1,3,1,4,
+1,3,1561,22,1,
+104,1,1478,1562,17,
+1563,15,1202,1,-1,
+1,5,1564,20,1565,
 4,38,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
@@ -5781,79 +5793,95 @@ public yyLSLSyntax
 105,0,103,0,110,
 0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,56,0,
-1,265,1,3,1,
-4,1,3,1561,22,
-1,104,1,1478,1562,
-17,1563,15,1202,1,
--1,1,5,1564,20,
-1565,4,38,83,0,
+0,49,0,53,0,
+1,262,1,3,1,
+4,1,3,1566,22,
+1,101,1,1620,1567,
+17,1568,15,1509,1,
+-1,1,5,1569,20,
+1570,4,24,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+50,0,1,247,1,
+3,1,2,1,1,
+1571,22,1,86,1,
+1621,1572,16,0,772,
+1,1574,904,1,172,
+1573,17,1574,15,1226,
+1,-1,1,5,1575,
+20,1576,4,38,66,
+0,105,0,110,0,
+97,0,114,0,121,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,49,0,
+48,0,1,302,1,
+3,1,4,1,3,
+1577,22,1,141,1,
+1931,965,1,1665,1578,
+17,1579,15,1261,1,
+-1,1,5,1580,20,
+1581,4,36,70,0,
+111,0,114,0,76,
+0,111,0,111,0,
+112,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+242,1,3,1,2,
+1,1,1582,22,1,
+81,1,2364,932,1,
+2105,919,1,1188,1583,
+17,1584,15,1202,1,
+-1,1,5,1585,20,
+1586,4,38,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,49,0,53,
-0,1,262,1,3,
-1,4,1,3,1566,
-22,1,101,1,1620,
-1567,17,1568,15,1509,
-1,-1,1,5,1569,
-20,1570,4,24,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,50,0,1,247,
-1,3,1,2,1,
-1,1571,22,1,86,
-1,1621,1572,16,0,
-772,1,1574,904,1,
-172,1573,17,1574,15,
-1226,1,-1,1,5,
-1575,20,1576,4,38,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,48,0,1,302,
-1,3,1,4,1,
-3,1577,22,1,141,
-1,1931,965,1,1665,
-1578,17,1579,15,1261,
-1,-1,1,5,1580,
-20,1581,4,36,70,
-0,111,0,114,0,
-76,0,111,0,111,
-0,112,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,49,0,
-1,242,1,3,1,
-2,1,1,1582,22,
-1,81,1,2364,932,
-1,2105,919,1,1188,
-1583,17,1584,15,1202,
-1,-1,1,5,1585,
-20,1586,4,38,83,
+95,0,50,0,51,
+0,1,270,1,3,
+1,6,1,5,1587,
+22,1,109,1,1442,
+1588,17,1589,15,1202,
+1,-1,1,5,1590,
+20,1591,4,38,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
 115,0,105,0,103,
 0,110,0,109,0,
 101,0,110,0,116,
-0,95,0,50,0,
-51,0,1,270,1,
-3,1,6,1,5,
-1587,22,1,109,1,
-1442,1588,17,1589,15,
+0,95,0,49,0,
+54,0,1,263,1,
+3,1,4,1,3,
+1592,22,1,102,1,
+1694,1593,16,0,206,
+1,942,1594,17,1595,
+15,1226,1,-1,1,
+5,1596,20,1597,4,
+38,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+49,0,55,0,1,
+309,1,3,1,4,
+1,3,1598,22,1,
+148,1,2198,1599,17,
+1247,1,0,1251,1,
+1195,1600,17,1601,15,
 1202,1,-1,1,5,
-1590,20,1591,4,38,
+1602,20,1603,4,38,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
@@ -5861,88 +5889,100 @@ public yyLSLSyntax
 103,0,110,0,109,
 0,101,0,110,0,
 116,0,95,0,49,
-0,54,0,1,263,
-1,3,1,4,1,
-3,1592,22,1,102,
-1,1694,1593,16,0,
-206,1,942,1594,17,
-1595,15,1226,1,-1,
-1,5,1596,20,1597,
-4,38,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,49,0,55,0,
-1,309,1,3,1,
-4,1,3,1598,22,
-1,148,1,2198,1599,
-17,1247,1,0,1251,
-1,1195,1600,17,1601,
+0,48,0,1,257,
+1,3,1,6,1,
+5,1604,22,1,96,
+1,1449,1605,17,1606,
 15,1202,1,-1,1,
-5,1602,20,1603,4,
-38,83,0,105,0,
+5,1607,20,1608,4,
+36,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
 115,0,115,0,105,
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,48,0,1,
-257,1,3,1,6,
-1,5,1604,22,1,
-96,1,1449,1605,17,
-1606,15,1202,1,-1,
-1,5,1607,20,1608,
-4,36,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,51,0,1,250,
-1,3,1,4,1,
-3,1609,22,1,89,
-1,1701,1610,17,1611,
-15,1261,1,-1,1,
-5,1612,20,1613,4,
-36,70,0,111,0,
-114,0,76,0,111,
-0,111,0,112,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-51,0,1,244,1,
+51,0,1,250,1,
 3,1,4,1,3,
-1614,22,1,83,1,
-447,1615,17,1616,15,
-1617,4,30,37,0,
-86,0,101,0,99,
-0,116,0,111,0,
-114,0,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,1,-1,
-1,5,1618,20,1619,
-4,32,86,0,101,
-0,99,0,116,0,
-111,0,114,0,67,
+1609,22,1,89,1,
+1701,1610,17,1611,15,
+1261,1,-1,1,5,
+1612,20,1613,4,36,
+70,0,111,0,114,
+0,76,0,111,0,
+111,0,112,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,51,
+0,1,244,1,3,
+1,4,1,3,1614,
+22,1,83,1,447,
+1615,17,1616,15,1617,
+4,30,37,0,86,
+0,101,0,99,0,
+116,0,111,0,114,
+0,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,1,-1,1,
+5,1618,20,1619,4,
+32,86,0,101,0,
+99,0,116,0,111,
+0,114,0,67,0,
+111,0,110,0,115,
+0,116,0,97,0,
+110,0,116,0,95,
+0,49,0,1,279,
+1,3,1,8,1,
+7,1620,22,1,118,
+1,2458,980,1,2459,
+986,1,1958,1621,17,
+1247,1,0,1251,1,
+188,1622,17,1623,15,
+1226,1,-1,1,5,
+1624,20,1625,4,36,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,57,
+0,1,301,1,3,
+1,4,1,3,1626,
+22,1,140,1,2462,
+993,1,1657,998,1,
+2464,1003,1,205,1627,
+17,1628,15,1226,1,
+-1,1,5,1629,20,
+1630,4,36,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
 0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-95,0,49,0,1,
-279,1,3,1,8,
-1,7,1620,22,1,
-118,1,2458,980,1,
-2459,986,1,1958,1621,
-17,1247,1,0,1251,
-1,188,1622,17,1623,
+95,0,56,0,1,
+300,1,3,1,4,
+1,3,1631,22,1,
+139,1,2227,1012,1,
+1224,1632,17,1633,15,
+1202,1,-1,1,5,
+1634,20,1635,4,38,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,50,
+0,50,0,1,269,
+1,3,1,6,1,
+5,1636,22,1,108,
+1,223,1637,17,1638,
 15,1226,1,-1,1,
-5,1624,20,1625,4,
+5,1639,20,1640,4,
 36,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
@@ -5950,89 +5990,87 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-57,0,1,301,1,
+55,0,1,299,1,
 3,1,4,1,3,
-1626,22,1,140,1,
-2462,993,1,1657,998,
-1,2464,1003,1,205,
-1627,17,1628,15,1226,
-1,-1,1,5,1629,
-20,1630,4,36,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,56,0,
-1,300,1,3,1,
-4,1,3,1631,22,
-1,139,1,2227,1012,
-1,1224,1632,17,1633,
-15,1202,1,-1,1,
-5,1634,20,1635,4,
-38,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
+1641,22,1,138,1,
+1730,1642,17,1643,15,
+1261,1,-1,1,5,
+1644,20,1645,4,36,
+70,0,111,0,114,
+0,76,0,111,0,
+111,0,112,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,52,
+0,1,245,1,3,
+1,4,1,3,1646,
+22,1,84,1,476,
+1647,17,1648,15,1649,
+4,18,37,0,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+1,-1,1,5,1650,
+20,1651,4,20,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+95,0,52,0,1,
+277,1,3,1,2,
+1,1,1652,22,1,
+116,1,477,1653,17,
+1654,15,1649,1,-1,
+1,5,1655,20,1656,
+4,20,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
 0,116,0,95,0,
-50,0,50,0,1,
-269,1,3,1,6,
-1,5,1636,22,1,
-108,1,223,1637,17,
-1638,15,1226,1,-1,
-1,5,1639,20,1640,
-4,36,66,0,105,
-0,110,0,97,0,
-114,0,121,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
+51,0,1,276,1,
+3,1,2,1,1,
+1657,22,1,115,1,
+1231,1658,17,1659,15,
+1202,1,-1,1,5,
+1660,20,1661,4,36,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
 0,115,0,105,0,
-111,0,110,0,95,
-0,55,0,1,299,
-1,3,1,4,1,
-3,1641,22,1,138,
-1,1730,1642,17,1643,
-15,1261,1,-1,1,
-5,1644,20,1645,4,
-36,70,0,111,0,
-114,0,76,0,111,
-0,111,0,112,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-52,0,1,245,1,
-3,1,4,1,3,
-1646,22,1,84,1,
-476,1647,17,1648,15,
-1649,4,18,37,0,
-67,0,111,0,110,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,57,
+0,1,256,1,3,
+1,6,1,5,1662,
+22,1,95,1,479,
+1663,17,1664,15,1649,
+1,-1,1,5,1665,
+20,1666,4,20,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+95,0,49,0,1,
+274,1,3,1,2,
+1,1,1667,22,1,
+113,1,480,1668,17,
+1669,15,1670,4,26,
+37,0,76,0,105,
 0,115,0,116,0,
-97,0,110,0,116,
-0,1,-1,1,5,
-1650,20,1651,4,20,
 67,0,111,0,110,
 0,115,0,116,0,
 97,0,110,0,116,
-0,95,0,52,0,
-1,277,1,3,1,
-2,1,1,1652,22,
-1,116,1,477,1653,
-17,1654,15,1649,1,
--1,1,5,1655,20,
-1656,4,20,67,0,
+0,1,-1,1,5,
+1671,20,1672,4,28,
+76,0,105,0,115,
+0,116,0,67,0,
 111,0,110,0,115,
 0,116,0,97,0,
 110,0,116,0,95,
-0,51,0,1,276,
-1,3,1,2,1,
-1,1657,22,1,115,
-1,1231,1658,17,1659,
+0,49,0,1,278,
+1,3,1,4,1,
+3,1673,22,1,117,
+1,1485,1674,17,1675,
 15,1202,1,-1,1,
-5,1660,20,1661,4,
+5,1676,20,1677,4,
 36,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
@@ -6040,1309 +6078,1282 @@ public yyLSLSyntax
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-57,0,1,256,1,
-3,1,6,1,5,
-1662,22,1,95,1,
-479,1663,17,1664,15,
-1649,1,-1,1,5,
-1665,20,1666,4,20,
-67,0,111,0,110,
-0,115,0,116,0,
-97,0,110,0,116,
-0,95,0,49,0,
-1,274,1,3,1,
-2,1,1,1667,22,
-1,113,1,480,1668,
-17,1669,15,1670,4,
-26,37,0,76,0,
-105,0,115,0,116,
-0,67,0,111,0,
+50,0,1,249,1,
+3,1,4,1,3,
+1678,22,1,88,1,
+1737,1679,16,0,293,
+1,1989,1020,1,1990,
+1680,17,1247,1,0,
+1251,1,242,1681,17,
+1682,15,1226,1,-1,
+1,5,1683,20,1684,
+4,36,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,54,0,1,298,
+1,3,1,4,1,
+3,1685,22,1,137,
+1,478,1686,17,1687,
+15,1649,1,-1,1,
+5,1688,20,1689,4,
+20,67,0,111,0,
 110,0,115,0,116,
 0,97,0,110,0,
-116,0,1,-1,1,
-5,1671,20,1672,4,
-28,76,0,105,0,
-115,0,116,0,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-95,0,49,0,1,
-278,1,3,1,4,
-1,3,1673,22,1,
-117,1,1485,1674,17,
-1675,15,1202,1,-1,
-1,5,1676,20,1677,
-4,36,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,50,0,1,249,
-1,3,1,4,1,
-3,1678,22,1,88,
-1,1737,1679,16,0,
-293,1,1989,1020,1,
-1990,1680,17,1247,1,
-0,1251,1,242,1681,
-17,1682,15,1226,1,
--1,1,5,1683,20,
-1684,4,36,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
+116,0,95,0,50,
+0,1,275,1,3,
+1,2,1,1,1690,
+22,1,114,1,1001,
+1691,17,1692,15,1329,
+1,-1,1,5,1693,
+20,1694,4,40,84,
+0,121,0,112,0,
+101,0,99,0,97,
+0,115,0,116,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,54,0,1,
-298,1,3,1,4,
-1,3,1685,22,1,
-137,1,478,1686,17,
-1687,15,1649,1,-1,
-1,5,1688,20,1689,
-4,20,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,95,0,
-50,0,1,275,1,
-3,1,2,1,1,
-1690,22,1,114,1,
-1001,1691,17,1692,15,
-1329,1,-1,1,5,
-1693,20,1694,4,40,
-84,0,121,0,112,
-0,101,0,99,0,
-97,0,115,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,56,0,
-1,323,1,3,1,
-5,1,4,1695,22,
-1,162,1,1002,1696,
-17,1697,15,1329,1,
--1,1,5,1698,20,
-1699,4,40,84,0,
-121,0,112,0,101,
-0,99,0,97,0,
-115,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,49,0,1,316,
-1,3,1,5,1,
-4,1700,22,1,155,
-1,2760,1701,16,0,
-137,1,12,1702,19,
-166,1,12,1703,5,
-49,1,1901,1704,16,
-0,164,1,2075,1705,
-16,0,164,1,1860,
+95,0,56,0,1,
+323,1,3,1,5,
+1,4,1695,22,1,
+162,1,1002,1696,17,
+1697,15,1329,1,-1,
+1,5,1698,20,1699,
+4,40,84,0,121,
+0,112,0,101,0,
+99,0,97,0,115,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+49,0,1,316,1,
+3,1,5,1,4,
+1700,22,1,155,1,
+2760,1701,16,0,137,
+1,12,1702,19,166,
+1,12,1703,5,49,
+1,1901,1704,16,0,
+164,1,2075,1705,16,
+0,164,1,1860,926,
+1,1803,892,1,1804,
+1706,16,0,164,1,
+2518,1707,16,0,164,
+1,2413,1708,16,0,
+164,1,2198,1709,16,
+0,164,1,1873,940,
+1,1657,998,1,2639,
+1710,16,0,738,1,
+2533,1711,16,0,164,
+1,1989,1020,1,1990,
+1712,16,0,164,1,
+2756,1713,16,0,164,
+1,32,1714,16,0,
+164,1,31,1715,16,
+0,164,1,2541,1716,
+16,0,164,1,2106,
+1717,16,0,164,1,
+2549,1718,16,0,164,
+1,2578,1719,16,0,
+164,1,2227,1012,1,
+2337,1720,16,0,164,
+1,2558,1721,16,0,
+164,1,2563,1722,16,
+0,164,1,2021,823,
+1,2458,980,1,2459,
+986,1,2462,993,1,
+2136,947,1,2464,1003,
+1,2029,830,1,2030,
+836,1,2031,841,1,
+2032,846,1,2469,1723,
+16,0,525,1,2035,
+857,1,2364,932,1,
+2039,867,1,1931,965,
+1,2041,873,1,2043,
+879,1,2045,884,1,
+1775,1724,16,0,164,
+1,2033,851,1,2037,
+862,1,1574,904,1,
+2105,919,1,1958,1725,
+16,0,164,1,13,
+1726,19,507,1,13,
+1727,5,52,1,1860,
 926,1,1803,892,1,
-1804,1706,16,0,164,
-1,2518,1707,16,0,
-164,1,2413,1708,16,
-0,164,1,2198,1709,
-16,0,164,1,1873,
-940,1,1657,998,1,
-2639,1710,16,0,738,
-1,2533,1711,16,0,
-164,1,1989,1020,1,
-1990,1712,16,0,164,
-1,2756,1713,16,0,
-164,1,32,1714,16,
-0,164,1,31,1715,
-16,0,164,1,2541,
-1716,16,0,164,1,
-2106,1717,16,0,164,
-1,2549,1718,16,0,
-164,1,2578,1719,16,
-0,164,1,2227,1012,
-1,2337,1720,16,0,
-164,1,2558,1721,16,
-0,164,1,2563,1722,
-16,0,164,1,2021,
-823,1,2458,980,1,
-2459,986,1,2462,993,
-1,2136,947,1,2464,
-1003,1,2029,830,1,
-2030,836,1,2031,841,
-1,2032,846,1,2469,
-1723,16,0,525,1,
-2035,857,1,2364,932,
-1,2039,867,1,1931,
-965,1,2041,873,1,
-2043,879,1,2045,884,
-1,1775,1724,16,0,
-164,1,2033,851,1,
-2037,862,1,1574,904,
-1,2105,919,1,1958,
-1725,16,0,164,1,
-13,1726,19,507,1,
-13,1727,5,52,1,
-1860,926,1,1803,892,
-1,2625,1728,17,1729,
-15,1730,4,20,37,
-0,83,0,116,0,
+2625,1728,17,1729,15,
+1730,4,20,37,0,
+83,0,116,0,97,
+0,116,0,101,0,
+66,0,111,0,100,
+0,121,0,1,-1,
+1,5,1731,20,1732,
+4,24,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,49,0,50,
+0,1,188,1,3,
+1,3,1,2,1733,
+22,1,26,1,2626,
+1734,17,1735,15,1730,
+1,-1,1,5,1736,
+20,1737,4,24,83,
+0,116,0,97,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,95,0,49,
+0,48,0,1,186,
+1,3,1,3,1,
+2,1738,22,1,24,
+1,2627,1739,17,1740,
+15,1730,1,-1,1,
+5,1741,20,1742,4,
+22,83,0,116,0,
 97,0,116,0,101,
 0,66,0,111,0,
-100,0,121,0,1,
--1,1,5,1731,20,
-1732,4,24,83,0,
+100,0,121,0,95,
+0,56,0,1,184,
+1,3,1,3,1,
+2,1743,22,1,22,
+1,2628,1744,17,1745,
+15,1730,1,-1,1,
+5,1746,20,1747,4,
+22,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,95,
+0,54,0,1,182,
+1,3,1,3,1,
+2,1748,22,1,20,
+1,2520,1749,17,1750,
+15,1751,4,46,37,
+0,73,0,110,0,
+116,0,86,0,101,
+0,99,0,86,0,
+101,0,99,0,65,
+0,114,0,103,0,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,-1,1,5,1752,
+20,1753,4,48,73,
+0,110,0,116,0,
+86,0,101,0,99,
+0,86,0,101,0,
+99,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+49,0,1,197,1,
+3,1,6,1,5,
+1754,22,1,35,1,
+2630,1755,17,1756,15,
+1730,1,-1,1,5,
+1757,20,1758,4,22,
+83,0,116,0,97,
+0,116,0,101,0,
+66,0,111,0,100,
+0,121,0,95,0,
+50,0,1,178,1,
+3,1,3,1,2,
+1759,22,1,16,1,
+2413,1760,16,0,505,
+1,2632,1761,17,1762,
+15,1730,1,-1,1,
+5,1763,20,1764,4,
+24,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,95,
+0,49,0,51,0,
+1,189,1,3,1,
+2,1,1,1765,22,
+1,27,1,2633,1766,
+17,1767,15,1730,1,
+-1,1,5,1768,20,
+1769,4,24,83,0,
 116,0,97,0,116,
 0,101,0,66,0,
 111,0,100,0,121,
 0,95,0,49,0,
-50,0,1,188,1,
-3,1,3,1,2,
-1733,22,1,26,1,
-2626,1734,17,1735,15,
+49,0,1,187,1,
+3,1,2,1,1,
+1770,22,1,25,1,
+2634,1771,17,1772,15,
 1730,1,-1,1,5,
-1736,20,1737,4,24,
+1773,20,1774,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
 66,0,111,0,100,
 0,121,0,95,0,
-49,0,48,0,1,
-186,1,3,1,3,
-1,2,1738,22,1,
-24,1,2627,1739,17,
-1740,15,1730,1,-1,
-1,5,1741,20,1742,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-95,0,56,0,1,
-184,1,3,1,3,
-1,2,1743,22,1,
-22,1,2628,1744,17,
-1745,15,1730,1,-1,
-1,5,1746,20,1747,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-95,0,54,0,1,
-182,1,3,1,3,
-1,2,1748,22,1,
-20,1,2520,1749,17,
-1750,15,1751,4,46,
-37,0,73,0,110,
-0,116,0,86,0,
-101,0,99,0,86,
-0,101,0,99,0,
-65,0,114,0,103,
-0,83,0,116,0,
-97,0,116,0,101,
-0,69,0,118,0,
-101,0,110,0,116,
-0,1,-1,1,5,
-1752,20,1753,4,48,
+57,0,1,185,1,
+3,1,2,1,1,
+1775,22,1,23,1,
+2635,1776,17,1777,15,
+1730,1,-1,1,5,
+1778,20,1779,4,22,
+83,0,116,0,97,
+0,116,0,101,0,
+66,0,111,0,100,
+0,121,0,95,0,
+55,0,1,183,1,
+3,1,2,1,1,
+1780,22,1,21,1,
+1873,940,1,2637,1781,
+17,1782,15,1730,1,
+-1,1,5,1783,20,
+1784,4,22,83,0,
+116,0,97,0,116,
+0,101,0,66,0,
+111,0,100,0,121,
+0,95,0,51,0,
+1,179,1,3,1,
+2,1,1,1785,22,
+1,17,1,2638,1786,
+17,1787,15,1730,1,
+-1,1,5,1788,20,
+1789,4,22,83,0,
+116,0,97,0,116,
+0,101,0,66,0,
+111,0,100,0,121,
+0,95,0,49,0,
+1,177,1,3,1,
+2,1,1,1790,22,
+1,15,1,1989,1020,
+1,2535,1791,17,1792,
+15,1793,4,46,37,
+0,73,0,110,0,
+116,0,82,0,111,
+0,116,0,82,0,
+111,0,116,0,65,
+0,114,0,103,0,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,-1,1,5,1794,
+20,1795,4,48,73,
+0,110,0,116,0,
+82,0,111,0,116,
+0,82,0,111,0,
+116,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+49,0,1,196,1,
+3,1,6,1,5,
+1796,22,1,34,1,
+2037,862,1,32,1797,
+16,0,513,1,2105,
+919,1,2464,1003,1,
+2551,1798,17,1799,15,
+1800,4,34,37,0,
 73,0,110,0,116,
-0,86,0,101,0,
-99,0,86,0,101,
-0,99,0,65,0,
-114,0,103,0,83,
+0,65,0,114,0,
+103,0,83,0,116,
+0,97,0,116,0,
+101,0,69,0,118,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,1801,20,1802,4,
+36,73,0,110,0,
+116,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+49,0,1,194,1,
+3,1,6,1,5,
+1803,22,1,32,1,
+2580,1804,17,1805,15,
+1806,4,22,37,0,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,-1,1,5,1807,
+20,1808,4,24,83,
 0,116,0,97,0,
 116,0,101,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,49,0,1,197,
+0,49,0,1,191,
 1,3,1,6,1,
-5,1754,22,1,35,
-1,2630,1755,17,1756,
-15,1730,1,-1,1,
-5,1757,20,1758,4,
-22,83,0,116,0,
-97,0,116,0,101,
-0,66,0,111,0,
-100,0,121,0,95,
-0,50,0,1,178,
-1,3,1,3,1,
-2,1759,22,1,16,
-1,2413,1760,16,0,
-505,1,2632,1761,17,
-1762,15,1730,1,-1,
-1,5,1763,20,1764,
-4,24,83,0,116,
-0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-95,0,49,0,51,
-0,1,189,1,3,
-1,2,1,1,1765,
-22,1,27,1,2633,
-1766,17,1767,15,1730,
-1,-1,1,5,1768,
-20,1769,4,24,83,
-0,116,0,97,0,
-116,0,101,0,66,
-0,111,0,100,0,
-121,0,95,0,49,
-0,49,0,1,187,
-1,3,1,2,1,
-1,1770,22,1,25,
-1,2634,1771,17,1772,
-15,1730,1,-1,1,
-5,1773,20,1774,4,
-22,83,0,116,0,
-97,0,116,0,101,
-0,66,0,111,0,
-100,0,121,0,95,
-0,57,0,1,185,
-1,3,1,2,1,
-1,1775,22,1,23,
-1,2635,1776,17,1777,
-15,1730,1,-1,1,
-5,1778,20,1779,4,
-22,83,0,116,0,
-97,0,116,0,101,
-0,66,0,111,0,
-100,0,121,0,95,
-0,55,0,1,183,
-1,3,1,2,1,
-1,1780,22,1,21,
-1,1873,940,1,2637,
-1781,17,1782,15,1730,
-1,-1,1,5,1783,
-20,1784,4,22,83,
-0,116,0,97,0,
-116,0,101,0,66,
-0,111,0,100,0,
-121,0,95,0,51,
-0,1,179,1,3,
-1,2,1,1,1785,
-22,1,17,1,2638,
-1786,17,1787,15,1730,
-1,-1,1,5,1788,
-20,1789,4,22,83,
+5,1809,22,1,29,
+1,2227,1012,1,1574,
+904,1,2560,1810,17,
+1811,15,1812,4,34,
+37,0,75,0,101,
+0,121,0,65,0,
+114,0,103,0,83,
 0,116,0,97,0,
-116,0,101,0,66,
-0,111,0,100,0,
-121,0,95,0,49,
-0,1,177,1,3,
-1,2,1,1,1790,
-22,1,15,1,1989,
-1020,1,2535,1791,17,
-1792,15,1793,4,46,
-37,0,73,0,110,
-0,116,0,82,0,
-111,0,116,0,82,
-0,111,0,116,0,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+-1,1,5,1813,20,
+1814,4,36,75,0,
+101,0,121,0,65,
+0,114,0,103,0,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+193,1,3,1,6,
+1,5,1815,22,1,
+31,1,2565,1816,17,
+1817,15,1818,4,36,
+37,0,86,0,111,
+0,105,0,100,0,
 65,0,114,0,103,
 0,83,0,116,0,
 97,0,116,0,101,
 0,69,0,118,0,
 101,0,110,0,116,
 0,1,-1,1,5,
-1794,20,1795,4,48,
-73,0,110,0,116,
-0,82,0,111,0,
-116,0,82,0,111,
-0,116,0,65,0,
+1819,20,1820,4,38,
+86,0,111,0,105,
+0,100,0,65,0,
 114,0,103,0,83,
 0,116,0,97,0,
 116,0,101,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,49,0,1,196,
-1,3,1,6,1,
-5,1796,22,1,34,
-1,2037,862,1,32,
-1797,16,0,513,1,
-2105,919,1,2464,1003,
-1,2551,1798,17,1799,
-15,1800,4,34,37,
-0,73,0,110,0,
-116,0,65,0,114,
-0,103,0,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,1,-1,
-1,5,1801,20,1802,
-4,36,73,0,110,
-0,116,0,65,0,
+0,49,0,1,192,
+1,3,1,5,1,
+4,1821,22,1,30,
+1,2021,823,1,2458,
+980,1,2459,986,1,
+2462,993,1,2136,947,
+1,2682,1822,16,0,
+744,1,2029,830,1,
+2030,836,1,2031,841,
+1,2032,846,1,2033,
+851,1,1657,998,1,
+2035,857,1,2364,932,
+1,2039,867,1,1931,
+965,1,2041,873,1,
+2043,879,1,2045,884,
+1,2543,1823,17,1824,
+15,1825,4,40,37,
+0,86,0,101,0,
+99,0,116,0,111,
+0,114,0,65,0,
 114,0,103,0,83,
 0,116,0,97,0,
 116,0,101,0,69,
 0,118,0,101,0,
-110,0,116,0,95,
-0,49,0,1,194,
-1,3,1,6,1,
-5,1803,22,1,32,
-1,2580,1804,17,1805,
-15,1806,4,22,37,
-0,83,0,116,0,
-97,0,116,0,101,
-0,69,0,118,0,
-101,0,110,0,116,
-0,1,-1,1,5,
-1807,20,1808,4,24,
-83,0,116,0,97,
-0,116,0,101,0,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,49,0,1,
-191,1,3,1,6,
-1,5,1809,22,1,
-29,1,2227,1012,1,
-1574,904,1,2560,1810,
-17,1811,15,1812,4,
-34,37,0,75,0,
-101,0,121,0,65,
-0,114,0,103,0,
-83,0,116,0,97,
-0,116,0,101,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,-1,1,5,1813,
-20,1814,4,36,75,
-0,101,0,121,0,
+110,0,116,0,1,
+-1,1,5,1826,20,
+1827,4,42,86,0,
+101,0,99,0,116,
+0,111,0,114,0,
 65,0,114,0,103,
 0,83,0,116,0,
 97,0,116,0,101,
 0,69,0,118,0,
 101,0,110,0,116,
 0,95,0,49,0,
-1,193,1,3,1,
-6,1,5,1815,22,
-1,31,1,2565,1816,
-17,1817,15,1818,4,
-36,37,0,86,0,
-111,0,105,0,100,
-0,65,0,114,0,
-103,0,83,0,116,
-0,97,0,116,0,
-101,0,69,0,118,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,1819,20,1820,4,
-38,86,0,111,0,
-105,0,100,0,65,
-0,114,0,103,0,
-83,0,116,0,97,
-0,116,0,101,0,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,49,0,1,
-192,1,3,1,5,
-1,4,1821,22,1,
-30,1,2021,823,1,
-2458,980,1,2459,986,
-1,2462,993,1,2136,
-947,1,2682,1822,16,
-0,744,1,2029,830,
-1,2030,836,1,2031,
-841,1,2032,846,1,
-2033,851,1,1657,998,
-1,2035,857,1,2364,
-932,1,2039,867,1,
-1931,965,1,2041,873,
-1,2043,879,1,2045,
-884,1,2543,1823,17,
-1824,15,1825,4,40,
-37,0,86,0,101,
-0,99,0,116,0,
-111,0,114,0,65,
-0,114,0,103,0,
+1,195,1,3,1,
+6,1,5,1828,22,
+1,33,1,2624,1829,
+17,1830,15,1730,1,
+-1,1,5,1831,20,
+1832,4,24,83,0,
+116,0,97,0,116,
+0,101,0,66,0,
+111,0,100,0,121,
+0,95,0,49,0,
+52,0,1,190,1,
+3,1,3,1,2,
+1833,22,1,28,1,
+2629,1834,17,1835,15,
+1730,1,-1,1,5,
+1836,20,1837,4,22,
 83,0,116,0,97,
 0,116,0,101,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,-1,1,5,1826,
-20,1827,4,42,86,
-0,101,0,99,0,
-116,0,111,0,114,
-0,65,0,114,0,
-103,0,83,0,116,
-0,97,0,116,0,
-101,0,69,0,118,
-0,101,0,110,0,
-116,0,95,0,49,
-0,1,195,1,3,
-1,6,1,5,1828,
-22,1,33,1,2624,
-1829,17,1830,15,1730,
-1,-1,1,5,1831,
-20,1832,4,24,83,
-0,116,0,97,0,
-116,0,101,0,66,
-0,111,0,100,0,
-121,0,95,0,49,
-0,52,0,1,190,
-1,3,1,3,1,
-2,1833,22,1,28,
-1,2629,1834,17,1835,
+66,0,111,0,100,
+0,121,0,95,0,
+52,0,1,180,1,
+3,1,3,1,2,
+1838,22,1,18,1,
+2582,1839,16,0,731,
+1,2636,1840,17,1841,
 15,1730,1,-1,1,
-5,1836,20,1837,4,
+5,1842,20,1843,4,
 22,83,0,116,0,
 97,0,116,0,101,
 0,66,0,111,0,
 100,0,121,0,95,
-0,52,0,1,180,
-1,3,1,3,1,
-2,1838,22,1,18,
-1,2582,1839,16,0,
-731,1,2636,1840,17,
-1841,15,1730,1,-1,
-1,5,1842,20,1843,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,66,0,111,
-0,100,0,121,0,
-95,0,53,0,1,
-181,1,3,1,2,
-1,1,1844,22,1,
-19,1,14,1845,19,
-153,1,14,1846,5,
-112,1,2512,1847,17,
-1848,15,1849,4,36,
-37,0,86,0,101,
-0,99,0,116,0,
-111,0,114,0,68,
+0,53,0,1,181,
+1,3,1,2,1,
+1,1844,22,1,19,
+1,14,1845,19,153,
+1,14,1846,5,112,
+1,2512,1847,17,1848,
+15,1849,4,30,37,
+0,86,0,101,0,
+99,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,1,
+-1,1,5,1850,20,
+1851,4,32,86,0,
+101,0,99,0,68,
 0,101,0,99,0,
 108,0,97,0,114,
 0,97,0,116,0,
 105,0,111,0,110,
-0,1,-1,1,5,
-1850,20,1851,4,38,
-86,0,101,0,99,
-0,116,0,111,0,
-114,0,68,0,101,
+0,95,0,49,0,
+1,208,1,3,1,
+3,1,2,1852,22,
+1,47,1,2513,1853,
+16,0,476,1,1260,
+1200,1,1011,1207,1,
+1514,1213,1,9,1218,
+1,10,1854,17,1855,
+15,1856,4,48,37,
+0,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
 0,99,0,108,0,
 97,0,114,0,97,
 0,116,0,105,0,
-111,0,110,0,95,
-0,49,0,1,208,
-1,3,1,3,1,
-2,1852,22,1,47,
-1,2513,1853,16,0,
-476,1,1260,1200,1,
-1011,1207,1,1514,1213,
-1,9,1218,1,10,
-1854,17,1855,15,1856,
-4,48,37,0,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
-1,-1,1,5,149,
-1,0,1,0,1857,
-22,1,36,1,262,
-1224,1,1267,1230,1,
-2524,1858,16,0,490,
-1,1521,1235,1,1773,
-1859,16,0,157,1,
-2527,1860,17,1861,15,
-1862,4,30,37,0,
-82,0,111,0,116,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,1,-1,
-1,5,1863,20,1864,
-4,32,82,0,111,
+111,0,110,0,76,
+0,105,0,115,0,
+116,0,1,-1,1,
+5,149,1,0,1,
+0,1857,22,1,36,
+1,262,1224,1,1267,
+1230,1,2524,1858,16,
+0,490,1,1521,1235,
+1,1773,1859,16,0,
+157,1,2527,1860,17,
+1861,15,1862,4,30,
+37,0,82,0,111,
 0,116,0,68,0,
 101,0,99,0,108,
 0,97,0,114,0,
 97,0,116,0,105,
 0,111,0,110,0,
-95,0,49,0,1,
-209,1,3,1,3,
-1,2,1865,22,1,
-48,1,2528,1866,16,
-0,496,1,19,1252,
-1,20,1867,16,0,
-151,1,2281,1259,1,
-525,1321,1,30,1868,
-17,1869,15,1856,1,
--1,1,5,1870,20,
-1871,4,50,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,95,
-0,50,0,1,199,
-1,3,1,4,1,
-3,1872,22,1,38,
-1,1002,1696,1,283,
-1277,1,40,1282,1,
-41,1873,17,1874,15,
-1875,4,26,37,0,
+1,-1,1,5,1863,
+20,1864,4,32,82,
+0,111,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,95,0,49,
+0,1,209,1,3,
+1,3,1,2,1865,
+22,1,48,1,2528,
+1866,16,0,496,1,
+19,1252,1,20,1867,
+16,0,151,1,2281,
+1259,1,525,1321,1,
+30,1868,17,1869,15,
+1856,1,-1,1,5,
+1870,20,1871,4,50,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
-0,76,0,105,0,
-115,0,116,0,1,
--1,1,5,698,1,
-0,1,0,1876,22,
-1,165,1,42,1877,
-17,1878,15,1879,4,
-38,37,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,1,
--1,1,5,1880,20,
-1881,4,40,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,1,328,
-1,3,1,2,1,
-1,1882,22,1,168,
-1,44,1288,1,47,
-1289,1,48,1295,1,
-49,1301,1,50,1306,
-1,51,1311,1,305,
-1316,1,2567,1883,17,
-1884,15,1856,1,-1,
-1,5,149,1,0,
-1,0,1857,1,2576,
-1885,16,0,151,1,
-63,1327,1,66,1333,
-1,67,1338,1,1478,
-1562,1,69,1348,1,
-70,1353,1,68,1343,
-1,74,1358,1,1013,
-1363,1,2335,1886,16,
-0,157,1,1332,1368,
-1,1048,1449,1,82,
-1385,1,1296,1272,1,
-1341,1402,1,328,1407,
-1,1303,1412,1,1096,
-1417,1,93,1423,1,
-1550,1428,1,352,1454,
-1,107,1443,1,1114,
-1448,1,1370,1557,1,
-118,1460,1,1123,1465,
-1,371,1470,1,1377,
-1476,1,375,1481,1,
-377,1486,1,379,1491,
-1,380,1496,1,883,
-1502,1,373,1514,1,
-130,1519,1,143,1524,
-1,1152,1530,1,387,
-1887,16,0,648,1,
-1406,1535,1,1159,1542,
-1,157,1547,1,1413,
-1552,1,1665,1578,1,
-412,1888,16,0,673,
-1,1094,1889,16,0,
-700,1,172,1573,1,
-827,1436,1,1188,1583,
-1,437,1890,16,0,
-748,1,1442,1588,1,
-1694,1891,16,0,157,
-1,942,1594,1,1195,
-1600,1,1449,1605,1,
-1701,1610,1,447,1615,
-1,188,1622,1,205,
-1627,1,2467,1892,17,
-1893,15,1856,1,-1,
-1,5,1894,20,1895,
-4,50,65,0,114,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,76,0,
+105,0,115,0,116,
+0,95,0,50,0,
+1,199,1,3,1,
+4,1,3,1872,22,
+1,38,1,1002,1696,
+1,283,1277,1,40,
+1282,1,41,1873,17,
+1874,15,1875,4,26,
+37,0,65,0,114,
 0,103,0,117,0,
 109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
+0,116,0,76,0,
+105,0,115,0,116,
+0,1,-1,1,5,
+698,1,0,1,0,
+1876,22,1,165,1,
+42,1877,17,1878,15,
+1879,4,38,37,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
 0,111,0,110,0,
-76,0,105,0,115,
-0,116,0,95,0,
-49,0,1,198,1,
-3,1,2,1,1,
-1896,22,1,37,1,
-461,1897,16,0,700,
-1,464,1898,17,1899,
-15,1875,1,-1,1,
-5,1900,20,1901,4,
-28,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,76,0,105,
-0,115,0,116,0,
-95,0,50,0,1,
-327,1,3,1,4,
-1,3,1902,22,1,
-167,1,1224,1632,1,
-223,1637,1,1730,1642,
-1,476,1647,1,477,
-1653,1,1231,1658,1,
-479,1663,1,480,1668,
-1,1485,1674,1,2745,
-1903,17,1904,15,1856,
-1,-1,1,5,149,
-1,0,1,0,1857,
-1,459,1905,17,1906,
-15,1875,1,-1,1,
-5,698,1,0,1,
-0,1876,1,242,1681,
-1,478,1686,1,2754,
-1907,16,0,151,1,
-481,1908,17,1909,15,
-1875,1,-1,1,5,
-1910,20,1911,4,28,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
-0,76,0,105,0,
-115,0,116,0,95,
-0,49,0,1,326,
-1,3,1,2,1,
-1,1912,22,1,166,
-1,1001,1691,1,2508,
-1913,17,1914,15,1915,
-4,30,37,0,73,
+0,1,-1,1,5,
+1880,20,1881,4,40,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,95,0,49,0,
+1,328,1,3,1,
+2,1,1,1882,22,
+1,168,1,44,1288,
+1,47,1289,1,48,
+1295,1,49,1301,1,
+50,1306,1,51,1311,
+1,305,1316,1,2567,
+1883,17,1884,15,1856,
+1,-1,1,5,149,
+1,0,1,0,1857,
+1,2576,1885,16,0,
+151,1,63,1327,1,
+66,1333,1,67,1338,
+1,1478,1562,1,69,
+1348,1,70,1353,1,
+68,1343,1,74,1358,
+1,1013,1363,1,2335,
+1886,16,0,157,1,
+1332,1368,1,1048,1449,
+1,82,1385,1,1296,
+1272,1,1341,1402,1,
+328,1407,1,1303,1412,
+1,1096,1417,1,93,
+1423,1,1550,1428,1,
+352,1454,1,107,1443,
+1,1114,1448,1,1370,
+1557,1,118,1460,1,
+1123,1465,1,371,1470,
+1,1377,1476,1,375,
+1481,1,377,1486,1,
+379,1491,1,380,1496,
+1,883,1502,1,373,
+1514,1,130,1519,1,
+143,1524,1,1152,1530,
+1,387,1887,16,0,
+648,1,1406,1535,1,
+1159,1542,1,157,1547,
+1,1413,1552,1,1665,
+1578,1,412,1888,16,
+0,673,1,1094,1889,
+16,0,700,1,172,
+1573,1,827,1436,1,
+1188,1583,1,437,1890,
+16,0,748,1,1442,
+1588,1,1694,1891,16,
+0,157,1,942,1594,
+1,1195,1600,1,1449,
+1605,1,1701,1610,1,
+447,1615,1,188,1622,
+1,205,1627,1,2467,
+1892,17,1893,15,1856,
+1,-1,1,5,1894,
+20,1895,4,50,65,
+0,114,0,103,0,
+117,0,109,0,101,
 0,110,0,116,0,
 68,0,101,0,99,
 0,108,0,97,0,
 114,0,97,0,116,
 0,105,0,111,0,
-110,0,1,-1,1,
-5,1916,20,1917,4,
-32,73,0,110,0,
+110,0,76,0,105,
+0,115,0,116,0,
+95,0,49,0,1,
+198,1,3,1,2,
+1,1,1896,22,1,
+37,1,461,1897,16,
+0,700,1,464,1898,
+17,1899,15,1875,1,
+-1,1,5,1900,20,
+1901,4,28,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,76,
+0,105,0,115,0,
+116,0,95,0,50,
+0,1,327,1,3,
+1,4,1,3,1902,
+22,1,167,1,1224,
+1632,1,223,1637,1,
+1730,1642,1,476,1647,
+1,477,1653,1,1231,
+1658,1,479,1663,1,
+480,1668,1,1485,1674,
+1,2745,1903,17,1904,
+15,1856,1,-1,1,
+5,149,1,0,1,
+0,1857,1,459,1905,
+17,1906,15,1875,1,
+-1,1,5,698,1,
+0,1,0,1876,1,
+242,1681,1,478,1686,
+1,2754,1907,16,0,
+151,1,481,1908,17,
+1909,15,1875,1,-1,
+1,5,1910,20,1911,
+4,28,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,76,0,
+105,0,115,0,116,
+0,95,0,49,0,
+1,326,1,3,1,
+2,1,1,1912,22,
+1,166,1,1001,1691,
+1,2508,1913,17,1914,
+15,1915,4,30,37,
+0,73,0,110,0,
 116,0,68,0,101,
 0,99,0,108,0,
 97,0,114,0,97,
 0,116,0,105,0,
-111,0,110,0,95,
-0,49,0,1,207,
-1,3,1,3,1,
-2,1918,22,1,46,
-1,2509,1919,16,0,
-470,1,15,1920,19,
-212,1,15,1921,5,
-6,1,1114,1922,16,
-0,327,1,1621,1923,
-16,0,747,1,40,
-1924,16,0,641,1,
-19,1252,1,9,1218,
-1,2760,1925,16,0,
-210,1,16,1926,19,
-136,1,16,1927,5,
-145,1,2761,1928,16,
-0,202,1,256,1929,
-16,0,202,1,1261,
-1930,16,0,202,1,
-509,1931,16,0,202,
-1,9,1932,16,0,
-134,1,2521,1933,16,
-0,488,1,2021,823,
-1,1775,1934,16,0,
-202,1,2029,830,1,
-2030,836,1,2031,841,
-1,2032,846,1,2033,
-851,1,277,1935,16,
-0,202,1,2035,857,
-1,2037,862,1,2039,
-867,1,32,1936,16,
-0,202,1,2041,873,
-1,2293,1937,16,0,
-202,1,2043,879,1,
-2045,884,1,40,1938,
-16,0,181,1,41,
-1939,16,0,202,1,
-1297,1940,16,0,202,
-1,43,1941,16,0,
-202,1,44,1942,16,
-0,181,1,1803,892,
-1,1804,1943,16,0,
-202,1,299,1944,16,
-0,202,1,2480,1945,
-17,1946,15,1947,4,
-24,37,0,73,0,
-110,0,116,0,65,
-0,114,0,103,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,-1,1,5,1948,
-20,1949,4,26,73,
-0,110,0,116,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,95,0,54,0,
-1,360,1,3,1,
-2,1,1,1950,22,
-1,200,1,2561,1951,
-16,0,539,1,52,
-1952,16,0,202,1,
-2484,1953,17,1954,15,
-1947,1,-1,1,5,
-1955,20,1956,4,26,
+111,0,110,0,1,
+-1,1,5,1916,20,
+1917,4,32,73,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,95,0,49,0,
+1,207,1,3,1,
+3,1,2,1918,22,
+1,46,1,2509,1919,
+16,0,470,1,15,
+1920,19,212,1,15,
+1921,5,6,1,1114,
+1922,16,0,327,1,
+1621,1923,16,0,747,
+1,40,1924,16,0,
+641,1,19,1252,1,
+9,1218,1,2760,1925,
+16,0,210,1,16,
+1926,19,136,1,16,
+1927,5,145,1,2761,
+1928,16,0,202,1,
+256,1929,16,0,202,
+1,1261,1930,16,0,
+202,1,509,1931,16,
+0,202,1,9,1932,
+16,0,134,1,2521,
+1933,16,0,488,1,
+2021,823,1,1775,1934,
+16,0,202,1,2029,
+830,1,2030,836,1,
+2031,841,1,2032,846,
+1,2033,851,1,277,
+1935,16,0,202,1,
+2035,857,1,2037,862,
+1,2039,867,1,32,
+1936,16,0,202,1,
+2041,873,1,2293,1937,
+16,0,202,1,2043,
+879,1,2045,884,1,
+40,1938,16,0,181,
+1,41,1939,16,0,
+202,1,1297,1940,16,
+0,202,1,43,1941,
+16,0,202,1,44,
+1942,16,0,181,1,
+1803,892,1,1804,1943,
+16,0,202,1,299,
+1944,16,0,202,1,
+2480,1945,17,1946,15,
+1947,4,24,37,0,
 73,0,110,0,116,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,50,
-0,1,356,1,3,
-1,2,1,1,1957,
-22,1,196,1,2566,
-1958,16,0,667,1,
-1515,1959,16,0,202,
-1,2318,1960,16,0,
-202,1,2491,1961,17,
-1962,15,1963,4,26,
-37,0,86,0,111,
+116,0,1,-1,1,
+5,1948,20,1949,4,
+26,73,0,110,0,
+116,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+54,0,1,360,1,
+3,1,2,1,1,
+1950,22,1,200,1,
+2561,1951,16,0,539,
+1,52,1952,16,0,
+202,1,2484,1953,17,
+1954,15,1947,1,-1,
+1,5,1955,20,1956,
+4,26,73,0,110,
+0,116,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,50,0,1,356,
+1,3,1,2,1,
+1,1957,22,1,196,
+1,2566,1958,16,0,
+667,1,1515,1959,16,
+0,202,1,2318,1960,
+16,0,202,1,2491,
+1961,17,1962,15,1963,
+4,26,37,0,86,
+0,111,0,105,0,
+100,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,1,-1,
+1,5,1964,20,1965,
+4,28,86,0,111,
 0,105,0,100,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,1,-1,1,5,
-1964,20,1965,4,28,
+0,95,0,53,0,
+1,349,1,3,1,
+2,1,1,1966,22,
+1,189,1,62,1967,
+16,0,219,1,63,
+1968,16,0,181,1,
+2495,1969,17,1970,15,
+1963,1,-1,1,5,
+1971,20,1972,4,28,
 86,0,111,0,105,
 0,100,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,53,0,1,349,
+0,49,0,1,345,
 1,3,1,2,1,
-1,1966,22,1,189,
-1,62,1967,16,0,
-219,1,63,1968,16,
-0,181,1,2495,1969,
-17,1970,15,1963,1,
--1,1,5,1971,20,
-1972,4,28,86,0,
-111,0,105,0,100,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,95,0,49,
-0,1,345,1,3,
-1,2,1,1,1973,
-22,1,185,1,2075,
-1974,16,0,202,1,
-1574,904,1,1479,1975,
-16,0,202,1,71,
-1976,16,0,202,1,
-1658,1977,16,0,776,
-1,1833,1978,16,0,
-318,1,1834,1979,16,
-0,202,1,2337,1980,
-16,0,202,1,79,
-1981,16,0,202,1,
-1335,1982,16,0,202,
-1,322,1983,16,0,
-202,1,76,1984,16,
-0,202,1,85,1985,
-16,0,202,1,89,
-1986,16,0,202,1,
-346,1987,16,0,202,
-1,97,1988,16,0,
-202,1,2106,1989,16,
-0,202,1,102,1990,
-16,0,202,1,1860,
-926,1,2458,980,1,
-2364,932,1,2536,1991,
-16,0,631,1,1990,
-1992,16,0,202,1,
-112,1993,16,0,202,
-1,1117,1994,16,0,
-202,1,2544,1995,16,
-0,517,1,1873,940,
-1,1875,1996,16,0,
-433,1,1876,1997,16,
-0,202,1,2552,1998,
-16,0,529,1,124,
-1999,16,0,202,1,
-2478,2000,17,2001,15,
-1947,1,-1,1,5,
-2002,20,2003,4,26,
-73,0,110,0,116,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,95,0,56,
-0,1,362,1,3,
-1,2,1,1,2004,
-22,1,202,1,2136,
-947,1,381,2005,16,
-0,202,1,525,2006,
-16,0,202,1,137,
-2007,16,0,202,1,
-2493,2008,17,2009,15,
-1963,1,-1,1,5,
-2010,20,2011,4,28,
-86,0,111,0,105,
-0,100,0,65,0,
+1,1973,22,1,185,
+1,2075,1974,16,0,
+202,1,1574,904,1,
+1479,1975,16,0,202,
+1,71,1976,16,0,
+202,1,1658,1977,16,
+0,776,1,1833,1978,
+16,0,318,1,1834,
+1979,16,0,202,1,
+2337,1980,16,0,202,
+1,79,1981,16,0,
+202,1,1335,1982,16,
+0,202,1,322,1983,
+16,0,202,1,76,
+1984,16,0,202,1,
+85,1985,16,0,202,
+1,89,1986,16,0,
+202,1,346,1987,16,
+0,202,1,97,1988,
+16,0,202,1,2106,
+1989,16,0,202,1,
+102,1990,16,0,202,
+1,1860,926,1,2458,
+980,1,2364,932,1,
+2536,1991,16,0,631,
+1,1990,1992,16,0,
+202,1,112,1993,16,
+0,202,1,1117,1994,
+16,0,202,1,2544,
+1995,16,0,517,1,
+1873,940,1,1875,1996,
+16,0,433,1,1876,
+1997,16,0,202,1,
+2552,1998,16,0,529,
+1,124,1999,16,0,
+202,1,2478,2000,17,
+2001,15,1947,1,-1,
+1,5,2002,20,2003,
+4,26,73,0,110,
+0,116,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,51,0,1,347,
+0,56,0,1,362,
 1,3,1,2,1,
-1,2012,22,1,187,
-1,1901,2013,16,0,
-202,1,1153,2014,16,
-0,202,1,151,2015,
-16,0,202,1,1407,
-2016,16,0,202,1,
-1659,2017,16,0,202,
-1,2413,2018,16,0,
-202,1,406,2019,16,
-0,202,1,1371,2020,
-16,0,202,1,2105,
-919,1,166,2021,16,
-0,202,1,1622,2022,
-16,0,202,1,1931,
-965,1,1932,2023,16,
-0,528,1,1933,2024,
-16,0,202,1,431,
-2025,16,0,202,1,
-1585,2026,16,0,202,
-1,182,2027,16,0,
-202,1,1189,2028,16,
-0,202,1,1443,2029,
-16,0,202,1,1695,
-2030,16,0,202,1,
-2198,2031,16,0,202,
-1,447,2032,16,0,
-202,1,199,2033,16,
-0,202,1,2459,986,
-1,1958,2034,16,0,
-202,1,2462,993,1,
-1657,998,1,2464,1003,
-1,459,2035,16,0,
-202,1,462,2036,16,
-0,202,1,2471,2037,
-17,2038,15,2039,4,
-36,37,0,73,0,
+1,2004,22,1,202,
+1,2136,947,1,381,
+2005,16,0,202,1,
+525,2006,16,0,202,
+1,137,2007,16,0,
+202,1,2493,2008,17,
+2009,15,1963,1,-1,
+1,5,2010,20,2011,
+4,28,86,0,111,
+0,105,0,100,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,51,0,
+1,347,1,3,1,
+2,1,1,2012,22,
+1,187,1,1901,2013,
+16,0,202,1,1153,
+2014,16,0,202,1,
+151,2015,16,0,202,
+1,1407,2016,16,0,
+202,1,1659,2017,16,
+0,202,1,2413,2018,
+16,0,202,1,406,
+2019,16,0,202,1,
+1371,2020,16,0,202,
+1,2105,919,1,166,
+2021,16,0,202,1,
+1622,2022,16,0,202,
+1,1931,965,1,1932,
+2023,16,0,528,1,
+1933,2024,16,0,202,
+1,431,2025,16,0,
+202,1,1585,2026,16,
+0,202,1,182,2027,
+16,0,202,1,1189,
+2028,16,0,202,1,
+1443,2029,16,0,202,
+1,1695,2030,16,0,
+202,1,2198,2031,16,
+0,202,1,447,2032,
+16,0,202,1,199,
+2033,16,0,202,1,
+2459,986,1,1958,2034,
+16,0,202,1,2462,
+993,1,1657,998,1,
+2464,1003,1,459,2035,
+16,0,202,1,462,
+2036,16,0,202,1,
+2471,2037,17,2038,15,
+2039,4,36,37,0,
+73,0,110,0,116,
+0,86,0,101,0,
+99,0,86,0,101,
+0,99,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+-1,1,5,2040,20,
+2041,4,38,73,0,
 110,0,116,0,86,
 0,101,0,99,0,
 86,0,101,0,99,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,1,-1,1,
-5,2040,20,2041,4,
-38,73,0,110,0,
-116,0,86,0,101,
-0,99,0,86,0,
-101,0,99,0,65,
-0,114,0,103,0,
-69,0,118,0,101,
+116,0,95,0,49,
+0,1,369,1,3,
+1,2,1,1,2042,
+22,1,209,1,2472,
+2043,17,2044,15,2045,
+4,36,37,0,73,
 0,110,0,116,0,
-95,0,49,0,1,
-369,1,3,1,2,
-1,1,2042,22,1,
-209,1,2472,2043,17,
-2044,15,2045,4,36,
-37,0,73,0,110,
+82,0,111,0,116,
+0,82,0,111,0,
+116,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,1,-1,
+1,5,2046,20,2047,
+4,38,73,0,110,
 0,116,0,82,0,
 111,0,116,0,82,
 0,111,0,116,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,1,-1,1,5,
-2046,20,2047,4,38,
-73,0,110,0,116,
-0,82,0,111,0,
-116,0,82,0,111,
-0,116,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,49,0,1,368,
-1,3,1,2,1,
-1,2048,22,1,208,
-1,2473,2049,17,2050,
-15,2051,4,30,37,
-0,86,0,101,0,
-99,0,116,0,111,
-0,114,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
--1,1,5,2052,20,
-2053,4,32,86,0,
-101,0,99,0,116,
-0,111,0,114,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,95,0,51,0,
-1,367,1,3,1,
-2,1,1,2054,22,
-1,207,1,2474,2055,
-17,2056,15,2051,1,
--1,1,5,2057,20,
-2058,4,32,86,0,
-101,0,99,0,116,
-0,111,0,114,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,95,0,50,0,
-1,366,1,3,1,
-2,1,1,2059,22,
-1,206,1,2475,2060,
-17,2061,15,2051,1,
--1,1,5,2062,20,
-2063,4,32,86,0,
+0,95,0,49,0,
+1,368,1,3,1,
+2,1,1,2048,22,
+1,208,1,2473,2049,
+17,2050,15,2051,4,
+30,37,0,86,0,
 101,0,99,0,116,
 0,111,0,114,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,49,0,
-1,365,1,3,1,
-2,1,1,2064,22,
-1,205,1,2476,2065,
-17,2066,15,1947,1,
--1,1,5,2067,20,
-2068,4,28,73,0,
-110,0,116,0,65,
-0,114,0,103,0,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,49,0,48,
-0,1,364,1,3,
-1,2,1,1,2069,
-22,1,204,1,2477,
-2070,17,2071,15,1947,
-1,-1,1,5,2072,
-20,2073,4,26,73,
-0,110,0,116,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,95,0,57,0,
-1,363,1,3,1,
-2,1,1,2074,22,
-1,203,1,2227,1012,
-1,2479,2075,17,2076,
-15,1947,1,-1,1,
-5,2077,20,2078,4,
-26,73,0,110,0,
-116,0,65,0,114,
+0,1,-1,1,5,
+2052,20,2053,4,32,
+86,0,101,0,99,
+0,116,0,111,0,
+114,0,65,0,114,
 0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-55,0,1,361,1,
+51,0,1,367,1,
 3,1,2,1,1,
-2079,22,1,201,1,
-1225,2080,16,0,202,
-1,2481,2081,17,2082,
-15,1947,1,-1,1,
-5,2083,20,2084,4,
-26,73,0,110,0,
-116,0,65,0,114,
+2054,22,1,207,1,
+2474,2055,17,2056,15,
+2051,1,-1,1,5,
+2057,20,2058,4,32,
+86,0,101,0,99,
+0,116,0,111,0,
+114,0,65,0,114,
 0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-53,0,1,359,1,
+50,0,1,366,1,
 3,1,2,1,1,
-2085,22,1,199,1,
-2482,2086,17,2087,15,
+2059,22,1,206,1,
+2475,2060,17,2061,15,
+2051,1,-1,1,5,
+2062,20,2063,4,32,
+86,0,101,0,99,
+0,116,0,111,0,
+114,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+49,0,1,365,1,
+3,1,2,1,1,
+2064,22,1,205,1,
+2476,2065,17,2066,15,
 1947,1,-1,1,5,
-2088,20,2089,4,26,
+2067,20,2068,4,28,
 73,0,110,0,116,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,52,
-0,1,358,1,3,
-1,2,1,1,2090,
-22,1,198,1,2483,
-2091,17,2092,15,1947,
-1,-1,1,5,2093,
-20,2094,4,26,73,
-0,110,0,116,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,95,0,51,0,
-1,357,1,3,1,
-2,1,1,2095,22,
-1,197,1,1731,2096,
-16,0,202,1,2485,
-2097,17,2098,15,1947,
-1,-1,1,5,2099,
-20,2100,4,26,73,
-0,110,0,116,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,95,0,49,0,
-1,355,1,3,1,
-2,1,1,2101,22,
-1,195,1,2486,2102,
-17,2103,15,2104,4,
-24,37,0,75,0,
-101,0,121,0,65,
+116,0,95,0,49,
+0,48,0,1,364,
+1,3,1,2,1,
+1,2069,22,1,204,
+1,2477,2070,17,2071,
+15,1947,1,-1,1,
+5,2072,20,2073,4,
+26,73,0,110,0,
+116,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+57,0,1,363,1,
+3,1,2,1,1,
+2074,22,1,203,1,
+2227,1012,1,2479,2075,
+17,2076,15,1947,1,
+-1,1,5,2077,20,
+2078,4,26,73,0,
+110,0,116,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-1,-1,1,5,2105,
-20,2106,4,26,75,
-0,101,0,121,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,95,0,50,0,
-1,354,1,3,1,
-2,1,1,2107,22,
-1,194,1,2487,2108,
-17,2109,15,2104,1,
--1,1,5,2110,20,
-2111,4,26,75,0,
-101,0,121,0,65,
+95,0,55,0,1,
+361,1,3,1,2,
+1,1,2079,22,1,
+201,1,1225,2080,16,
+0,202,1,2481,2081,
+17,2082,15,1947,1,
+-1,1,5,2083,20,
+2084,4,26,73,0,
+110,0,116,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,49,0,1,
-353,1,3,1,2,
-1,1,2112,22,1,
-193,1,2488,2113,17,
-2114,15,1963,1,-1,
-1,5,2115,20,2116,
-4,28,86,0,111,
-0,105,0,100,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,95,0,56,0,
-1,352,1,3,1,
-2,1,1,2117,22,
-1,192,1,2489,2118,
-17,2119,15,1963,1,
--1,1,5,2120,20,
-2121,4,28,86,0,
-111,0,105,0,100,
+95,0,53,0,1,
+359,1,3,1,2,
+1,1,2085,22,1,
+199,1,2482,2086,17,
+2087,15,1947,1,-1,
+1,5,2088,20,2089,
+4,26,73,0,110,
+0,116,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,52,0,1,358,
+1,3,1,2,1,
+1,2090,22,1,198,
+1,2483,2091,17,2092,
+15,1947,1,-1,1,
+5,2093,20,2094,4,
+26,73,0,110,0,
+116,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+51,0,1,357,1,
+3,1,2,1,1,
+2095,22,1,197,1,
+1731,2096,16,0,202,
+1,2485,2097,17,2098,
+15,1947,1,-1,1,
+5,2099,20,2100,4,
+26,73,0,110,0,
+116,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+49,0,1,355,1,
+3,1,2,1,1,
+2101,22,1,195,1,
+2486,2102,17,2103,15,
+2104,4,24,37,0,
+75,0,101,0,121,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,55,
-0,1,351,1,3,
-1,2,1,1,2122,
-22,1,191,1,2490,
-2123,17,2124,15,1963,
-1,-1,1,5,2125,
-20,2126,4,28,86,
-0,111,0,105,0,
-100,0,65,0,114,
+116,0,1,-1,1,
+5,2105,20,2106,4,
+26,75,0,101,0,
+121,0,65,0,114,
 0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-54,0,1,350,1,
+50,0,1,354,1,
 3,1,2,1,1,
-2127,22,1,190,1,
-1989,1020,1,2492,2128,
-17,2129,15,1963,1,
--1,1,5,2130,20,
-2131,4,28,86,0,
-111,0,105,0,100,
+2107,22,1,194,1,
+2487,2108,17,2109,15,
+2104,1,-1,1,5,
+2110,20,2111,4,26,
+75,0,101,0,121,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,52,
-0,1,348,1,3,
-1,2,1,1,2132,
-22,1,188,1,2744,
-2133,16,0,286,1,
-2494,2134,17,2135,15,
+116,0,95,0,49,
+0,1,353,1,3,
+1,2,1,1,2112,
+22,1,193,1,2488,
+2113,17,2114,15,1963,
+1,-1,1,5,2115,
+20,2116,4,28,86,
+0,111,0,105,0,
+100,0,65,0,114,
+0,103,0,69,0,
+118,0,101,0,110,
+0,116,0,95,0,
+56,0,1,352,1,
+3,1,2,1,1,
+2117,22,1,192,1,
+2489,2118,17,2119,15,
 1963,1,-1,1,5,
-2136,20,2137,4,28,
+2120,20,2121,4,28,
 86,0,111,0,105,
 0,100,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,50,0,1,346,
+0,55,0,1,351,
 1,3,1,2,1,
-1,2138,22,1,186,
-1,236,2139,16,0,
-202,1,2496,2140,17,
-2141,15,2142,4,12,
-37,0,69,0,118,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,2143,20,2144,4,
-14,69,0,118,0,
+1,2122,22,1,191,
+1,2490,2123,17,2124,
+15,1963,1,-1,1,
+5,2125,20,2126,4,
+28,86,0,111,0,
+105,0,100,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,54,0,1,
+350,1,3,1,2,
+1,1,2127,22,1,
+190,1,1989,1020,1,
+2492,2128,17,2129,15,
+1963,1,-1,1,5,
+2130,20,2131,4,28,
+86,0,111,0,105,
+0,100,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,52,0,1,348,
+1,3,1,2,1,
+1,2132,22,1,188,
+1,2744,2133,16,0,
+286,1,2494,2134,17,
+2135,15,1963,1,-1,
+1,5,2136,20,2137,
+4,28,86,0,111,
+0,105,0,100,0,
+65,0,114,0,103,
+0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,57,0,
-1,344,1,3,1,
-2,1,1,2145,22,
-1,184,1,2497,2146,
-17,2147,15,2142,1,
--1,1,5,2148,20,
-2149,4,14,69,0,
+0,95,0,50,0,
+1,346,1,3,1,
+2,1,1,2138,22,
+1,186,1,236,2139,
+16,0,202,1,2496,
+2140,17,2141,15,2142,
+4,12,37,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+-1,1,5,2143,20,
+2144,4,14,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-56,0,1,343,1,
+57,0,1,344,1,
 3,1,2,1,1,
-2150,22,1,183,1,
-2498,2151,17,2152,15,
+2145,22,1,184,1,
+2497,2146,17,2147,15,
 2142,1,-1,1,5,
-2153,20,2154,4,14,
+2148,20,2149,4,14,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,55,0,1,
-342,1,3,1,2,
-1,1,2155,22,1,
-182,1,2499,2156,17,
-2157,15,2142,1,-1,
-1,5,2158,20,2159,
+95,0,56,0,1,
+343,1,3,1,2,
+1,1,2150,22,1,
+183,1,2498,2151,17,
+2152,15,2142,1,-1,
+1,5,2153,20,2154,
 4,14,69,0,118,
 0,101,0,110,0,
-116,0,95,0,54,
-0,1,341,1,3,
-1,2,1,1,2160,
-22,1,181,1,2500,
-2161,17,2162,15,2142,
-1,-1,1,5,2163,
-20,2164,4,14,69,
+116,0,95,0,55,
+0,1,342,1,3,
+1,2,1,1,2155,
+22,1,182,1,2499,
+2156,17,2157,15,2142,
+1,-1,1,5,2158,
+20,2159,4,14,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,53,0,1,340,
+0,54,0,1,341,
 1,3,1,2,1,
-1,2165,22,1,180,
-1,2501,2166,17,2167,
+1,2160,22,1,181,
+1,2500,2161,17,2162,
 15,2142,1,-1,1,
-5,2168,20,2169,4,
+5,2163,20,2164,4,
 14,69,0,118,0,
 101,0,110,0,116,
-0,95,0,52,0,
-1,339,1,3,1,
-2,1,1,2170,22,
-1,179,1,2502,2171,
-17,2172,15,2142,1,
--1,1,5,2173,20,
-2174,4,14,69,0,
+0,95,0,53,0,
+1,340,1,3,1,
+2,1,1,2165,22,
+1,180,1,2501,2166,
+17,2167,15,2142,1,
+-1,1,5,2168,20,
+2169,4,14,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-51,0,1,338,1,
+52,0,1,339,1,
 3,1,2,1,1,
-2175,22,1,178,1,
-2503,2176,17,2177,15,
+2170,22,1,179,1,
+2502,2171,17,2172,15,
 2142,1,-1,1,5,
-2178,20,2179,4,14,
+2173,20,2174,4,14,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,50,0,1,
-337,1,3,1,2,
-1,1,2180,22,1,
-177,1,2504,2181,17,
-2182,15,2142,1,-1,
-1,5,2183,20,2184,
+95,0,51,0,1,
+338,1,3,1,2,
+1,1,2175,22,1,
+178,1,2503,2176,17,
+2177,15,2142,1,-1,
+1,5,2178,20,2179,
 4,14,69,0,118,
 0,101,0,110,0,
-116,0,95,0,49,
-0,1,336,1,3,
-1,2,1,1,2185,
-22,1,176,1,2505,
-2186,16,0,466,1,
-217,2187,16,0,202,
-1,1756,2188,16,0,
-202,1,17,2189,19,
-163,1,17,2190,5,
-132,1,1,2191,17,
-2192,15,2193,4,18,
-37,0,84,0,121,
-0,112,0,101,0,
-110,0,97,0,109,
-0,101,0,1,-1,
-1,5,2194,20,2195,
+116,0,95,0,50,
+0,1,337,1,3,
+1,2,1,1,2180,
+22,1,177,1,2504,
+2181,17,2182,15,2142,
+1,-1,1,5,2183,
+20,2184,4,14,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,49,0,1,336,
+1,3,1,2,1,
+1,2185,22,1,176,
+1,2505,2186,16,0,
+466,1,217,2187,16,
+0,202,1,1756,2188,
+16,0,202,1,17,
+2189,19,163,1,17,
+2190,5,132,1,1,
+2191,17,2192,15,2193,
+4,18,37,0,84,
+0,121,0,112,0,
+101,0,110,0,97,
+0,109,0,101,0,
+1,-1,1,5,2194,
+20,2195,4,20,84,
+0,121,0,112,0,
+101,0,110,0,97,
+0,109,0,101,0,
+95,0,55,0,1,
+335,1,3,1,2,
+1,1,2196,22,1,
+175,1,2,2197,17,
+2198,15,2193,1,-1,
+1,5,2199,20,2200,
 4,20,84,0,121,
 0,112,0,101,0,
 110,0,97,0,109,
 0,101,0,95,0,
-55,0,1,335,1,
+54,0,1,334,1,
 3,1,2,1,1,
-2196,22,1,175,1,
-2,2197,17,2198,15,
+2201,22,1,174,1,
+3,2202,17,2203,15,
 2193,1,-1,1,5,
-2199,20,2200,4,20,
+2204,20,2205,4,20,
 84,0,121,0,112,
 0,101,0,110,0,
 97,0,109,0,101,
-0,95,0,54,0,
-1,334,1,3,1,
-2,1,1,2201,22,
-1,174,1,3,2202,
-17,2203,15,2193,1,
--1,1,5,2204,20,
-2205,4,20,84,0,
+0,95,0,53,0,
+1,333,1,3,1,
+2,1,1,2206,22,
+1,173,1,4,2207,
+17,2208,15,2193,1,
+-1,1,5,2209,20,
+2210,4,20,84,0,
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,95,
-0,53,0,1,333,
+0,52,0,1,332,
 1,3,1,2,1,
-1,2206,22,1,173,
-1,4,2207,17,2208,
+1,2211,22,1,172,
+1,5,2212,17,2213,
 15,2193,1,-1,1,
-5,2209,20,2210,4,
+5,2214,20,2215,4,
 20,84,0,121,0,
 112,0,101,0,110,
 0,97,0,109,0,
-101,0,95,0,52,
-0,1,332,1,3,
-1,2,1,1,2211,
-22,1,172,1,5,
-2212,17,2213,15,2193,
-1,-1,1,5,2214,
-20,2215,4,20,84,
+101,0,95,0,51,
+0,1,331,1,3,
+1,2,1,1,2216,
+22,1,171,1,6,
+2217,17,2218,15,2193,
+1,-1,1,5,2219,
+20,2220,4,20,84,
 0,121,0,112,0,
 101,0,110,0,97,
 0,109,0,101,0,
-95,0,51,0,1,
-331,1,3,1,2,
-1,1,2216,22,1,
-171,1,6,2217,17,
-2218,15,2193,1,-1,
-1,5,2219,20,2220,
+95,0,50,0,1,
+330,1,3,1,2,
+1,1,2221,22,1,
+170,1,7,2222,17,
+2223,15,2193,1,-1,
+1,5,2224,20,2225,
 4,20,84,0,121,
 0,112,0,101,0,
 110,0,97,0,109,
 0,101,0,95,0,
-50,0,1,330,1,
+49,0,1,329,1,
 3,1,2,1,1,
-2221,22,1,170,1,
-7,2222,17,2223,15,
-2193,1,-1,1,5,
-2224,20,2225,4,20,
-84,0,121,0,112,
-0,101,0,110,0,
-97,0,109,0,101,
-0,95,0,49,0,
-1,329,1,3,1,
-2,1,1,2226,22,
-1,169,1,1514,1213,
-1,9,1218,1,10,
-1854,1,262,1224,1,
-1267,1230,1,1521,1235,
-1,1773,2227,16,0,
-255,1,2527,1860,1,
-19,1252,1,20,2228,
-16,0,161,1,2531,
-2229,17,2230,15,2231,
-4,66,37,0,73,
+2226,22,1,169,1,
+1514,1213,1,9,1218,
+1,10,1854,1,262,
+1224,1,1267,1230,1,
+1521,1235,1,1773,2227,
+16,0,255,1,2527,
+1860,1,19,1252,1,
+20,2228,16,0,161,
+1,2531,2229,17,2230,
+15,2231,4,66,37,
+0,73,0,110,0,
+116,0,82,0,111,
+0,116,0,82,0,
+111,0,116,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
+1,-1,1,5,2232,
+20,2233,4,68,73,
 0,110,0,116,0,
 82,0,111,0,116,
 0,82,0,111,0,
@@ -7355,12 +7366,29 @@ public yyLSLSyntax
 97,0,116,0,105,
 0,111,0,110,0,
 76,0,105,0,115,
-0,116,0,1,-1,
-1,5,2232,20,2233,
-4,68,73,0,110,
-0,116,0,82,0,
-111,0,116,0,82,
-0,111,0,116,0,
+0,116,0,95,0,
+49,0,1,203,1,
+3,1,6,1,5,
+2234,22,1,42,1,
+2281,1259,1,525,1321,
+1,2539,2235,17,2236,
+15,2237,4,60,37,
+0,86,0,101,0,
+99,0,116,0,111,
+0,114,0,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,76,0,105,0,
+115,0,116,0,1,
+-1,1,5,2238,20,
+2239,4,62,86,0,
+101,0,99,0,116,
+0,111,0,114,0,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
@@ -7371,28 +7399,14 @@ public yyLSLSyntax
 0,110,0,76,0,
 105,0,115,0,116,
 0,95,0,49,0,
-1,203,1,3,1,
-6,1,5,2234,22,
-1,42,1,2281,1259,
-1,525,1321,1,2539,
-2235,17,2236,15,2237,
-4,60,37,0,86,
-0,101,0,99,0,
-116,0,111,0,114,
-0,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,76,
-0,105,0,115,0,
-116,0,1,-1,1,
-5,2238,20,2239,4,
-62,86,0,101,0,
-99,0,116,0,111,
-0,114,0,65,0,
+1,202,1,3,1,
+2,1,1,2240,22,
+1,41,1,30,1868,
+1,1002,1696,1,283,
+1277,1,2547,2241,17,
+2242,15,2243,4,54,
+37,0,73,0,110,
+0,116,0,65,0,
 114,0,103,0,117,
 0,109,0,101,0,
 110,0,116,0,68,
@@ -7401,154 +7415,70 @@ public yyLSLSyntax
 0,97,0,116,0,
 105,0,111,0,110,
 0,76,0,105,0,
-115,0,116,0,95,
-0,49,0,1,202,
-1,3,1,2,1,
-1,2240,22,1,41,
-1,30,1868,1,1002,
-1696,1,283,1277,1,
-2547,2241,17,2242,15,
-2243,4,54,37,0,
-73,0,110,0,116,
-0,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,76,
-0,105,0,115,0,
-116,0,1,-1,1,
-5,2244,20,2245,4,
-56,73,0,110,0,
-116,0,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-76,0,105,0,115,
-0,116,0,95,0,
-49,0,1,201,1,
-3,1,2,1,1,
-2246,22,1,40,1,
-2548,2247,16,0,642,
-1,1010,2248,16,0,
-690,1,40,1282,1,
-41,1873,1,42,1877,
-1,44,1288,1,2555,
-2249,17,2250,15,2251,
-4,30,37,0,75,
-0,101,0,121,0,
+115,0,116,0,1,
+-1,1,5,2244,20,
+2245,4,56,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
 68,0,101,0,99,
 0,108,0,97,0,
 114,0,97,0,116,
 0,105,0,111,0,
-110,0,1,-1,1,
-5,2252,20,2253,4,
-32,75,0,101,0,
+110,0,76,0,105,
+0,115,0,116,0,
+95,0,49,0,1,
+201,1,3,1,2,
+1,1,2246,22,1,
+40,1,2548,2247,16,
+0,642,1,1010,2248,
+16,0,690,1,40,
+1282,1,41,1873,1,
+42,1877,1,44,1288,
+1,2555,2249,17,2250,
+15,2251,4,30,37,
+0,75,0,101,0,
 121,0,68,0,101,
 0,99,0,108,0,
 97,0,114,0,97,
 0,116,0,105,0,
-111,0,110,0,95,
-0,49,0,1,206,
-1,3,1,3,1,
-2,2254,22,1,45,
-1,1260,1200,1,47,
-1289,1,48,1295,1,
-49,1301,1,50,1306,
-1,51,1311,1,2562,
-2255,16,0,739,1,
-305,1316,1,2576,2256,
-16,0,674,1,2567,
-1883,1,61,2257,16,
-0,208,1,63,1327,
-1,66,1333,1,67,
-1338,1,68,1343,1,
-69,1348,1,70,1353,
-1,73,2258,16,0,
-221,1,74,1358,1,
-1013,1363,1,2335,2259,
-16,0,257,1,1332,
-1368,1,1048,1449,1,
-2512,1847,1,1840,2260,
-16,0,334,1,2516,
-2261,17,2262,15,2263,
-4,66,37,0,73,
-0,110,0,116,0,
-86,0,101,0,99,
-0,86,0,101,0,
-99,0,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-76,0,105,0,115,
-0,116,0,1,-1,
-1,5,2264,20,2265,
-4,68,73,0,110,
-0,116,0,86,0,
-101,0,99,0,86,
+111,0,110,0,1,
+-1,1,5,2252,20,
+2253,4,32,75,0,
+101,0,121,0,68,
 0,101,0,99,0,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,76,0,
-105,0,115,0,116,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
 0,95,0,49,0,
-1,204,1,3,1,
-6,1,5,2266,22,
-1,43,1,2517,2267,
-16,0,482,1,328,
-1407,1,1303,1412,1,
-1096,1417,1,93,1423,
-1,82,1385,1,827,
-1436,1,2532,2268,16,
-0,626,1,1011,1207,
-1,107,1443,1,1114,
-1448,1,2540,2269,16,
-0,512,1,1871,2270,
-16,0,344,1,1370,
-1557,1,1478,1562,1,
-118,1460,1,1123,1465,
-1,371,1470,1,1377,
-1476,1,375,1481,1,
-1882,2271,16,0,359,
-1,377,1486,1,352,
-1454,1,379,1491,1,
-1341,1402,1,130,1519,
-1,2074,2272,16,0,
-644,1,373,1514,1,
-1012,2273,16,0,692,
-1,380,1496,1,143,
-1524,1,1550,1428,1,
-1152,1530,1,1406,1535,
-1,1159,1542,1,157,
-1547,1,1413,1552,1,
-883,1502,1,1094,2274,
-16,0,771,1,1296,
-1272,1,172,1573,1,
-1665,1578,1,1939,2275,
-16,0,477,1,1188,
-1583,1,1442,1588,1,
-188,1622,1,942,1594,
-1,1195,1600,1,1449,
-1605,1,1701,1610,1,
-447,1615,1,2556,2276,
-17,2277,15,2278,4,
-54,37,0,75,0,
-101,0,121,0,65,
+1,206,1,3,1,
+3,1,2,2254,22,
+1,45,1,1260,1200,
+1,47,1289,1,48,
+1295,1,49,1301,1,
+50,1306,1,51,1311,
+1,2562,2255,16,0,
+739,1,305,1316,1,
+2576,2256,16,0,674,
+1,2567,1883,1,61,
+2257,16,0,208,1,
+63,1327,1,66,1333,
+1,67,1338,1,68,
+1343,1,69,1348,1,
+70,1353,1,73,2258,
+16,0,221,1,74,
+1358,1,1013,1363,1,
+2335,2259,16,0,257,
+1,1332,1368,1,1048,
+1449,1,2512,1847,1,
+1840,2260,16,0,334,
+1,2516,2261,17,2262,
+15,2263,4,66,37,
+0,73,0,110,0,
+116,0,86,0,101,
+0,99,0,86,0,
+101,0,99,0,65,
 0,114,0,103,0,
 117,0,109,0,101,
 0,110,0,116,0,
@@ -7558,976 +7488,1117 @@ public yyLSLSyntax
 0,105,0,111,0,
 110,0,76,0,105,
 0,115,0,116,0,
-1,-1,1,5,2279,
-20,2280,4,56,75,
-0,101,0,121,0,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,76,0,
-105,0,115,0,116,
-0,95,0,49,0,
-1,200,1,3,1,
-2,1,1,2281,22,
-1,39,1,205,1627,
-1,2467,1892,1,2557,
-2282,16,0,534,1,
-464,1898,1,2197,2283,
-16,0,763,1,1224,
-1632,1,223,1637,1,
-1730,1642,1,476,1647,
-1,477,1653,1,1231,
-1658,1,479,1663,1,
-480,1668,1,1485,1674,
-1,2745,1903,1,459,
-1905,1,242,1681,1,
-478,1686,1,2754,2284,
-16,0,362,1,481,
-1908,1,1001,1691,1,
-2508,1913,1,18,2285,
-19,566,1,18,2286,
-5,84,1,2767,2287,
-16,0,564,1,1011,
-1207,1,1012,2288,16,
-0,564,1,1013,1363,
-1,262,1224,1,1267,
-2289,16,0,564,1,
-515,2290,16,0,564,
-1,1521,2291,16,0,
-564,1,525,1321,1,
-283,1277,1,2299,2292,
-16,0,564,1,42,
-2293,16,0,564,1,
-40,1282,1,44,1288,
-1,47,1289,1,1303,
-2294,16,0,564,1,
-1555,2295,16,0,564,
-1,50,1306,1,48,
-1295,1,49,1301,1,
-51,1311,1,63,1327,
-1,305,1316,1,66,
-1333,1,67,1338,1,
-68,1343,1,69,1348,
-1,70,1353,1,73,
-2296,16,0,564,1,
-74,1358,1,328,1407,
-1,1048,2297,16,0,
-564,1,82,2298,16,
-0,564,1,1840,2299,
-16,0,564,1,1591,
-2300,16,0,564,1,
-1341,2301,16,0,564,
-1,1096,1417,1,93,
-1423,1,352,1454,1,
-107,2302,16,0,564,
-1,1114,1448,1,118,
-2303,16,0,564,1,
-1123,2304,16,0,564,
-1,371,1470,1,1628,
-2305,16,0,564,1,
-375,1481,1,1882,2306,
-16,0,564,1,377,
-1486,1,379,1491,1,
-380,1496,1,883,2307,
-16,0,564,1,373,
-1514,1,130,2308,16,
-0,564,1,143,2309,
-16,0,564,1,387,
-2310,16,0,564,1,
-1159,2311,16,0,564,
-1,157,2312,16,0,
-564,1,1413,2313,16,
-0,564,1,1665,2314,
-16,0,564,1,412,
-2315,16,0,564,1,
-1377,2316,16,0,564,
-1,172,2317,16,0,
-564,1,1939,2318,16,
-0,564,1,437,2319,
-16,0,564,1,188,
-2320,16,0,564,1,
-942,2321,16,0,564,
-1,1195,2322,16,0,
-564,1,1449,2323,16,
-0,564,1,1701,2324,
-16,0,564,1,447,
-1615,1,205,2325,16,
-0,564,1,827,2326,
-16,0,564,1,223,
-2327,16,0,564,1,
+1,-1,1,5,2264,
+20,2265,4,68,73,
+0,110,0,116,0,
+86,0,101,0,99,
+0,86,0,101,0,
+99,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+76,0,105,0,115,
+0,116,0,95,0,
+49,0,1,204,1,
+3,1,6,1,5,
+2266,22,1,43,1,
+2517,2267,16,0,482,
+1,328,1407,1,1303,
+1412,1,1096,1417,1,
+93,1423,1,82,1385,
+1,827,1436,1,2532,
+2268,16,0,626,1,
+1011,1207,1,107,1443,
+1,1114,1448,1,2540,
+2269,16,0,512,1,
+1871,2270,16,0,344,
+1,1370,1557,1,1478,
+1562,1,118,1460,1,
+1123,1465,1,371,1470,
+1,1377,1476,1,375,
+1481,1,1882,2271,16,
+0,359,1,377,1486,
+1,352,1454,1,379,
+1491,1,1341,1402,1,
+130,1519,1,2074,2272,
+16,0,644,1,373,
+1514,1,1012,2273,16,
+0,692,1,380,1496,
+1,143,1524,1,1550,
+1428,1,1152,1530,1,
+1406,1535,1,1159,1542,
+1,157,1547,1,1413,
+1552,1,883,1502,1,
+1094,2274,16,0,771,
+1,1296,1272,1,172,
+1573,1,1665,1578,1,
+1939,2275,16,0,477,
+1,1188,1583,1,1442,
+1588,1,188,1622,1,
+942,1594,1,1195,1600,
+1,1449,1605,1,1701,
+1610,1,447,1615,1,
+2556,2276,17,2277,15,
+2278,4,54,37,0,
+75,0,101,0,121,
+0,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,76,
+0,105,0,115,0,
+116,0,1,-1,1,
+5,2279,20,2280,4,
+56,75,0,101,0,
+121,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+76,0,105,0,115,
+0,116,0,95,0,
+49,0,1,200,1,
+3,1,2,1,1,
+2281,22,1,39,1,
+205,1627,1,2467,1892,
+1,2557,2282,16,0,
+534,1,464,1898,1,
+2197,2283,16,0,763,
+1,1224,1632,1,223,
+1637,1,1730,1642,1,
 476,1647,1,477,1653,
-1,1231,2328,16,0,
-564,1,479,1663,1,
-480,1668,1,1485,2329,
-16,0,564,1,1737,
-2330,16,0,564,1,
-242,2331,16,0,564,
-1,478,1686,1,1001,
-1691,1,1002,1696,1,
-19,2332,19,245,1,
-19,2333,5,176,1,
-2761,2334,16,0,243,
-1,256,2335,16,0,
-243,1,1261,2336,16,
-0,243,1,1011,1207,
-1,1012,2337,16,0,
-526,1,2458,980,1,
-262,1224,1,1267,2338,
-16,0,526,1,2021,
-823,1,1521,2339,16,
-0,526,1,1775,2340,
-16,0,243,1,2029,
-830,1,2030,836,1,
-2031,841,1,2032,846,
-1,2033,851,1,277,
-2341,16,0,243,1,
-2035,857,1,2037,862,
-1,2039,867,1,32,
-2342,16,0,243,1,
-2464,1003,1,2293,2343,
-16,0,243,1,2043,
-879,1,2045,884,1,
-2299,2344,16,0,526,
-1,41,2345,16,0,
-243,1,42,2346,16,
-0,526,1,40,1282,
-1,44,1288,1,43,
-2347,16,0,243,1,
-1804,2348,16,0,243,
+1,1231,1658,1,479,
+1663,1,480,1668,1,
+1485,1674,1,2745,1903,
+1,459,1905,1,242,
+1681,1,478,1686,1,
+2754,2284,16,0,362,
+1,481,1908,1,1001,
+1691,1,2508,1913,1,
+18,2285,19,566,1,
+18,2286,5,84,1,
+2767,2287,16,0,564,
+1,1011,1207,1,1012,
+2288,16,0,564,1,
+1013,1363,1,262,1224,
+1,1267,2289,16,0,
+564,1,515,2290,16,
+0,564,1,1521,2291,
+16,0,564,1,525,
+1321,1,283,1277,1,
+2299,2292,16,0,564,
+1,42,2293,16,0,
+564,1,40,1282,1,
+44,1288,1,47,1289,
+1,1303,2294,16,0,
+564,1,1555,2295,16,
+0,564,1,50,1306,
 1,48,1295,1,49,
-1301,1,47,1289,1,
-51,1311,1,52,2349,
-16,0,243,1,50,
-1306,1,305,1316,1,
-1096,1417,1,1515,2350,
-16,0,243,1,2318,
-2351,16,0,243,1,
-283,1277,1,63,1327,
+1301,1,51,1311,1,
+63,1327,1,305,1316,
 1,66,1333,1,67,
 1338,1,68,1343,1,
 69,1348,1,70,1353,
-1,71,2352,16,0,
-243,1,73,2353,16,
-0,526,1,74,1358,
-1,1013,1363,1,76,
-2354,16,0,243,1,
-1834,2355,16,0,243,
-1,2337,2356,16,0,
-243,1,79,2357,16,
-0,243,1,1335,2358,
-16,0,243,1,299,
-2359,16,0,243,1,
-82,2360,16,0,526,
-1,1840,2361,16,0,
-526,1,1297,2362,16,
-0,243,1,85,2363,
-16,0,243,1,1341,
-2364,16,0,526,1,
-89,2365,16,0,243,
-1,1303,2366,16,0,
-526,1,509,2367,16,
-0,243,1,93,1423,
-1,2767,2368,16,0,
-526,1,322,2369,16,
-0,243,1,97,2370,
-16,0,243,1,2041,
-873,1,1555,2371,16,
-0,526,1,827,2372,
-16,0,526,1,102,
-2373,16,0,243,1,
-1860,926,1,1803,892,
-1,2364,932,1,107,
-2374,16,0,526,1,
-1114,1448,1,112,2375,
-16,0,243,1,1117,
-2376,16,0,243,1,
-352,1454,1,1873,940,
-1,118,2377,16,0,
-526,1,1123,2378,16,
-0,526,1,371,1470,
-1,515,2379,16,0,
-526,1,1377,2380,16,
-0,526,1,124,2381,
-16,0,243,1,1882,
-2382,16,0,526,1,
-377,1486,1,379,1491,
-1,380,1496,1,130,
-2383,16,0,526,1,
-346,2384,16,0,243,
-1,2075,2385,16,0,
-243,1,373,1514,1,
-387,2386,16,0,526,
-1,137,2387,16,0,
-243,1,143,2388,16,
-0,526,1,1901,2389,
-16,0,243,1,1048,
-2390,16,0,526,1,
-1153,2391,16,0,243,
-1,375,1481,1,151,
-2392,16,0,243,1,
-1407,2393,16,0,243,
-1,1659,2394,16,0,
-243,1,2413,2395,16,
-0,243,1,1159,2396,
-16,0,526,1,381,
-2397,16,0,243,1,
-157,2398,16,0,526,
-1,1413,2399,16,0,
-526,1,883,2400,16,
-0,526,1,1371,2401,
-16,0,243,1,328,
-1407,1,2105,919,1,
-2106,2402,16,0,243,
-1,166,2403,16,0,
-243,1,525,2404,16,
-0,243,1,1622,2405,
-16,0,243,1,406,
-2406,16,0,243,1,
-1574,904,1,172,2407,
-16,0,526,1,1931,
-965,1,412,2408,16,
-0,526,1,1933,2409,
-16,0,243,1,1876,
-2410,16,0,243,1,
-431,2411,16,0,243,
-1,1585,2412,16,0,
-243,1,182,2413,16,
-0,243,1,1628,2414,
-16,0,526,1,1189,
-2415,16,0,243,1,
-437,2416,16,0,526,
-1,1591,2417,16,0,
-526,1,188,2418,16,
-0,526,1,1695,2419,
-16,0,243,1,2198,
-2420,16,0,243,1,
-1195,2421,16,0,526,
-1,1449,2422,16,0,
-526,1,1701,2423,16,
-0,526,1,447,2424,
-16,0,243,1,199,
-2425,16,0,243,1,
-2459,986,1,1958,2426,
-16,0,243,1,2462,
-993,1,1657,998,1,
-205,2427,16,0,526,
-1,459,2428,16,0,
-243,1,462,2429,16,
-0,243,1,1665,2430,
-16,0,526,1,217,
-2431,16,0,243,1,
-2227,1012,1,942,2432,
-16,0,526,1,1225,
-2433,16,0,243,1,
-223,2434,16,0,526,
-1,1479,2435,16,0,
-243,1,1731,2436,16,
-0,243,1,477,1653,
-1,1231,2437,16,0,
-526,1,479,1663,1,
-480,1668,1,1485,2438,
-16,0,526,1,1737,
-2439,16,0,526,1,
-1989,1020,1,1990,2440,
-16,0,243,1,1443,
-2441,16,0,243,1,
-236,2442,16,0,243,
-1,2136,947,1,476,
-1647,1,242,2443,16,
-0,526,1,478,1686,
-1,1939,2444,16,0,
-526,1,1001,1691,1,
-1002,1696,1,1756,2445,
-16,0,243,1,20,
-2446,19,494,1,20,
-2447,5,84,1,2767,
-2448,16,0,492,1,
-1011,1207,1,1012,2449,
-16,0,492,1,1013,
+1,73,2296,16,0,
+564,1,74,1358,1,
+328,1407,1,1048,2297,
+16,0,564,1,82,
+2298,16,0,564,1,
+1840,2299,16,0,564,
+1,1591,2300,16,0,
+564,1,1341,2301,16,
+0,564,1,1096,1417,
+1,93,1423,1,352,
+1454,1,107,2302,16,
+0,564,1,1114,1448,
+1,118,2303,16,0,
+564,1,1123,2304,16,
+0,564,1,371,1470,
+1,1628,2305,16,0,
+564,1,375,1481,1,
+1882,2306,16,0,564,
+1,377,1486,1,379,
+1491,1,380,1496,1,
+883,2307,16,0,564,
+1,373,1514,1,130,
+2308,16,0,564,1,
+143,2309,16,0,564,
+1,387,2310,16,0,
+564,1,1159,2311,16,
+0,564,1,157,2312,
+16,0,564,1,1413,
+2313,16,0,564,1,
+1665,2314,16,0,564,
+1,412,2315,16,0,
+564,1,1377,2316,16,
+0,564,1,172,2317,
+16,0,564,1,1939,
+2318,16,0,564,1,
+437,2319,16,0,564,
+1,188,2320,16,0,
+564,1,942,2321,16,
+0,564,1,1195,2322,
+16,0,564,1,1449,
+2323,16,0,564,1,
+1701,2324,16,0,564,
+1,447,1615,1,205,
+2325,16,0,564,1,
+827,2326,16,0,564,
+1,223,2327,16,0,
+564,1,476,1647,1,
+477,1653,1,1231,2328,
+16,0,564,1,479,
+1663,1,480,1668,1,
+1485,2329,16,0,564,
+1,1737,2330,16,0,
+564,1,242,2331,16,
+0,564,1,478,1686,
+1,1001,1691,1,1002,
+1696,1,19,2332,19,
+245,1,19,2333,5,
+176,1,2761,2334,16,
+0,243,1,256,2335,
+16,0,243,1,1261,
+2336,16,0,243,1,
+1011,1207,1,1012,2337,
+16,0,526,1,2458,
+980,1,262,1224,1,
+1267,2338,16,0,526,
+1,2021,823,1,1521,
+2339,16,0,526,1,
+1775,2340,16,0,243,
+1,2029,830,1,2030,
+836,1,2031,841,1,
+2032,846,1,2033,851,
+1,277,2341,16,0,
+243,1,2035,857,1,
+2037,862,1,2039,867,
+1,32,2342,16,0,
+243,1,2464,1003,1,
+2293,2343,16,0,243,
+1,2043,879,1,2045,
+884,1,2299,2344,16,
+0,526,1,41,2345,
+16,0,243,1,42,
+2346,16,0,526,1,
+40,1282,1,44,1288,
+1,43,2347,16,0,
+243,1,1804,2348,16,
+0,243,1,48,1295,
+1,49,1301,1,47,
+1289,1,51,1311,1,
+52,2349,16,0,243,
+1,50,1306,1,305,
+1316,1,1096,1417,1,
+1515,2350,16,0,243,
+1,2318,2351,16,0,
+243,1,283,1277,1,
+63,1327,1,66,1333,
+1,67,1338,1,68,
+1343,1,69,1348,1,
+70,1353,1,71,2352,
+16,0,243,1,73,
+2353,16,0,526,1,
+74,1358,1,1013,1363,
+1,76,2354,16,0,
+243,1,1834,2355,16,
+0,243,1,2337,2356,
+16,0,243,1,79,
+2357,16,0,243,1,
+1335,2358,16,0,243,
+1,299,2359,16,0,
+243,1,82,2360,16,
+0,526,1,1840,2361,
+16,0,526,1,1297,
+2362,16,0,243,1,
+85,2363,16,0,243,
+1,1341,2364,16,0,
+526,1,89,2365,16,
+0,243,1,1303,2366,
+16,0,526,1,509,
+2367,16,0,243,1,
+93,1423,1,2767,2368,
+16,0,526,1,322,
+2369,16,0,243,1,
+97,2370,16,0,243,
+1,2041,873,1,1555,
+2371,16,0,526,1,
+827,2372,16,0,526,
+1,102,2373,16,0,
+243,1,1860,926,1,
+1803,892,1,2364,932,
+1,107,2374,16,0,
+526,1,1114,1448,1,
+112,2375,16,0,243,
+1,1117,2376,16,0,
+243,1,352,1454,1,
+1873,940,1,118,2377,
+16,0,526,1,1123,
+2378,16,0,526,1,
+371,1470,1,515,2379,
+16,0,526,1,1377,
+2380,16,0,526,1,
+124,2381,16,0,243,
+1,1882,2382,16,0,
+526,1,377,1486,1,
+379,1491,1,380,1496,
+1,130,2383,16,0,
+526,1,346,2384,16,
+0,243,1,2075,2385,
+16,0,243,1,373,
+1514,1,387,2386,16,
+0,526,1,137,2387,
+16,0,243,1,143,
+2388,16,0,526,1,
+1901,2389,16,0,243,
+1,1048,2390,16,0,
+526,1,1153,2391,16,
+0,243,1,375,1481,
+1,151,2392,16,0,
+243,1,1407,2393,16,
+0,243,1,1659,2394,
+16,0,243,1,2413,
+2395,16,0,243,1,
+1159,2396,16,0,526,
+1,381,2397,16,0,
+243,1,157,2398,16,
+0,526,1,1413,2399,
+16,0,526,1,883,
+2400,16,0,526,1,
+1371,2401,16,0,243,
+1,328,1407,1,2105,
+919,1,2106,2402,16,
+0,243,1,166,2403,
+16,0,243,1,525,
+2404,16,0,243,1,
+1622,2405,16,0,243,
+1,406,2406,16,0,
+243,1,1574,904,1,
+172,2407,16,0,526,
+1,1931,965,1,412,
+2408,16,0,526,1,
+1933,2409,16,0,243,
+1,1876,2410,16,0,
+243,1,431,2411,16,
+0,243,1,1585,2412,
+16,0,243,1,182,
+2413,16,0,243,1,
+1628,2414,16,0,526,
+1,1189,2415,16,0,
+243,1,437,2416,16,
+0,526,1,1591,2417,
+16,0,526,1,188,
+2418,16,0,526,1,
+1695,2419,16,0,243,
+1,2198,2420,16,0,
+243,1,1195,2421,16,
+0,526,1,1449,2422,
+16,0,526,1,1701,
+2423,16,0,526,1,
+447,2424,16,0,243,
+1,199,2425,16,0,
+243,1,2459,986,1,
+1958,2426,16,0,243,
+1,2462,993,1,1657,
+998,1,205,2427,16,
+0,526,1,459,2428,
+16,0,243,1,462,
+2429,16,0,243,1,
+1665,2430,16,0,526,
+1,217,2431,16,0,
+243,1,2227,1012,1,
+942,2432,16,0,526,
+1,1225,2433,16,0,
+243,1,223,2434,16,
+0,526,1,1479,2435,
+16,0,243,1,1731,
+2436,16,0,243,1,
+477,1653,1,1231,2437,
+16,0,526,1,479,
+1663,1,480,1668,1,
+1485,2438,16,0,526,
+1,1737,2439,16,0,
+526,1,1989,1020,1,
+1990,2440,16,0,243,
+1,1443,2441,16,0,
+243,1,236,2442,16,
+0,243,1,2136,947,
+1,476,1647,1,242,
+2443,16,0,526,1,
+478,1686,1,1939,2444,
+16,0,526,1,1001,
+1691,1,1002,1696,1,
+1756,2445,16,0,243,
+1,20,2446,19,494,
+1,20,2447,5,84,
+1,2767,2448,16,0,
+492,1,1011,1207,1,
+1012,2449,16,0,492,
+1,1013,1363,1,262,
+1224,1,1267,2450,16,
+0,492,1,515,2451,
+16,0,492,1,1521,
+2452,16,0,492,1,
+525,1321,1,283,1277,
+1,2299,2453,16,0,
+492,1,42,2454,16,
+0,492,1,40,1282,
+1,44,1288,1,47,
+1289,1,1303,2455,16,
+0,492,1,1555,2456,
+16,0,492,1,50,
+1306,1,48,1295,1,
+49,1301,1,51,1311,
+1,63,1327,1,305,
+1316,1,66,1333,1,
+67,1338,1,68,1343,
+1,69,1348,1,70,
+1353,1,73,2457,16,
+0,492,1,74,1358,
+1,328,2458,16,0,
+492,1,1048,2459,16,
+0,492,1,82,2460,
+16,0,492,1,1840,
+2461,16,0,492,1,
+1591,2462,16,0,492,
+1,1341,2463,16,0,
+492,1,1096,1417,1,
+93,1423,1,352,2464,
+16,0,492,1,107,
+2465,16,0,492,1,
+1114,1448,1,118,2466,
+16,0,492,1,1123,
+2467,16,0,492,1,
+371,1470,1,1628,2468,
+16,0,492,1,375,
+1481,1,1882,2469,16,
+0,492,1,377,1486,
+1,379,1491,1,380,
+1496,1,883,2470,16,
+0,492,1,373,1514,
+1,130,2471,16,0,
+492,1,143,2472,16,
+0,492,1,387,2473,
+16,0,492,1,1159,
+2474,16,0,492,1,
+157,2475,16,0,492,
+1,1413,2476,16,0,
+492,1,1665,2477,16,
+0,492,1,412,2478,
+16,0,492,1,1377,
+2479,16,0,492,1,
+172,2480,16,0,492,
+1,1939,2481,16,0,
+492,1,437,2482,16,
+0,492,1,188,2483,
+16,0,492,1,942,
+2484,16,0,492,1,
+1195,2485,16,0,492,
+1,1449,2486,16,0,
+492,1,1701,2487,16,
+0,492,1,447,1615,
+1,205,2488,16,0,
+492,1,827,2489,16,
+0,492,1,223,2490,
+16,0,492,1,476,
+1647,1,477,1653,1,
+1231,2491,16,0,492,
+1,479,1663,1,480,
+1668,1,1485,2492,16,
+0,492,1,1737,2493,
+16,0,492,1,242,
+2494,16,0,492,1,
+478,1686,1,1001,1691,
+1,1002,1696,1,21,
+2495,19,465,1,21,
+2496,5,84,1,2767,
+2497,16,0,463,1,
+1011,1207,1,1012,2498,
+16,0,463,1,1013,
 1363,1,262,1224,1,
-1267,2450,16,0,492,
-1,515,2451,16,0,
-492,1,1521,2452,16,
-0,492,1,525,1321,
+1267,2499,16,0,463,
+1,515,2500,16,0,
+463,1,1521,2501,16,
+0,463,1,525,1321,
 1,283,1277,1,2299,
-2453,16,0,492,1,
-42,2454,16,0,492,
+2502,16,0,463,1,
+42,2503,16,0,463,
 1,40,1282,1,44,
 1288,1,47,1289,1,
-1303,2455,16,0,492,
-1,1555,2456,16,0,
-492,1,50,1306,1,
+1303,2504,16,0,463,
+1,1555,2505,16,0,
+463,1,50,1306,1,
 48,1295,1,49,1301,
 1,51,1311,1,63,
 1327,1,305,1316,1,
 66,1333,1,67,1338,
 1,68,1343,1,69,
 1348,1,70,1353,1,
-73,2457,16,0,492,
+73,2506,16,0,463,
 1,74,1358,1,328,
-2458,16,0,492,1,
-1048,2459,16,0,492,
-1,82,2460,16,0,
-492,1,1840,2461,16,
-0,492,1,1591,2462,
-16,0,492,1,1341,
-2463,16,0,492,1,
+2507,16,0,463,1,
+1048,2508,16,0,463,
+1,82,2509,16,0,
+463,1,1840,2510,16,
+0,463,1,1591,2511,
+16,0,463,1,1341,
+2512,16,0,463,1,
 1096,1417,1,93,1423,
-1,352,2464,16,0,
-492,1,107,2465,16,
-0,492,1,1114,1448,
-1,118,2466,16,0,
-492,1,1123,2467,16,
-0,492,1,371,1470,
-1,1628,2468,16,0,
-492,1,375,1481,1,
-1882,2469,16,0,492,
+1,352,2513,16,0,
+463,1,107,2514,16,
+0,463,1,1114,1448,
+1,118,2515,16,0,
+463,1,1123,2516,16,
+0,463,1,371,1470,
+1,1628,2517,16,0,
+463,1,375,1481,1,
+1882,2518,16,0,463,
 1,377,1486,1,379,
 1491,1,380,1496,1,
-883,2470,16,0,492,
+883,2519,16,0,463,
 1,373,1514,1,130,
-2471,16,0,492,1,
-143,2472,16,0,492,
-1,387,2473,16,0,
-492,1,1159,2474,16,
-0,492,1,157,2475,
-16,0,492,1,1413,
-2476,16,0,492,1,
-1665,2477,16,0,492,
-1,412,2478,16,0,
-492,1,1377,2479,16,
-0,492,1,172,2480,
-16,0,492,1,1939,
-2481,16,0,492,1,
-437,2482,16,0,492,
-1,188,2483,16,0,
-492,1,942,2484,16,
-0,492,1,1195,2485,
-16,0,492,1,1449,
-2486,16,0,492,1,
-1701,2487,16,0,492,
+2520,16,0,463,1,
+143,2521,16,0,463,
+1,387,2522,16,0,
+463,1,1159,2523,16,
+0,463,1,157,2524,
+16,0,463,1,1413,
+2525,16,0,463,1,
+1665,2526,16,0,463,
+1,412,2527,16,0,
+463,1,1377,2528,16,
+0,463,1,172,2529,
+16,0,463,1,1939,
+2530,16,0,463,1,
+437,2531,16,0,463,
+1,188,2532,16,0,
+463,1,942,2533,16,
+0,463,1,1195,2534,
+16,0,463,1,1449,
+2535,16,0,463,1,
+1701,2536,16,0,463,
 1,447,1615,1,205,
-2488,16,0,492,1,
-827,2489,16,0,492,
-1,223,2490,16,0,
-492,1,476,1647,1,
-477,1653,1,1231,2491,
-16,0,492,1,479,
+2537,16,0,463,1,
+827,2538,16,0,463,
+1,223,2539,16,0,
+463,1,476,1647,1,
+477,1653,1,1231,2540,
+16,0,463,1,479,
 1663,1,480,1668,1,
-1485,2492,16,0,492,
-1,1737,2493,16,0,
-492,1,242,2494,16,
-0,492,1,478,1686,
+1485,2541,16,0,463,
+1,1737,2542,16,0,
+463,1,242,2543,16,
+0,463,1,478,1686,
 1,1001,1691,1,1002,
-1696,1,21,2495,19,
-465,1,21,2496,5,
-84,1,2767,2497,16,
-0,463,1,1011,1207,
-1,1012,2498,16,0,
-463,1,1013,1363,1,
-262,1224,1,1267,2499,
-16,0,463,1,515,
-2500,16,0,463,1,
-1521,2501,16,0,463,
+1696,1,22,2544,19,
+416,1,22,2545,5,
+84,1,2767,2546,16,
+0,414,1,1011,1207,
+1,1012,2547,16,0,
+414,1,1013,1363,1,
+262,1224,1,1267,2548,
+16,0,414,1,515,
+2549,16,0,414,1,
+1521,2550,16,0,414,
 1,525,1321,1,283,
-1277,1,2299,2502,16,
-0,463,1,42,2503,
-16,0,463,1,40,
+1277,1,2299,2551,16,
+0,414,1,42,2552,
+16,0,414,1,40,
 1282,1,44,1288,1,
-47,1289,1,1303,2504,
-16,0,463,1,1555,
-2505,16,0,463,1,
+47,1289,1,1303,2553,
+16,0,414,1,1555,
+2554,16,0,414,1,
 50,1306,1,48,1295,
 1,49,1301,1,51,
 1311,1,63,1327,1,
 305,1316,1,66,1333,
 1,67,1338,1,68,
 1343,1,69,1348,1,
-70,1353,1,73,2506,
-16,0,463,1,74,
-1358,1,328,2507,16,
-0,463,1,1048,2508,
-16,0,463,1,82,
-2509,16,0,463,1,
-1840,2510,16,0,463,
-1,1591,2511,16,0,
-463,1,1341,2512,16,
-0,463,1,1096,1417,
+70,1353,1,73,2555,
+16,0,414,1,74,
+1358,1,328,2556,16,
+0,414,1,1048,2557,
+16,0,414,1,82,
+2558,16,0,414,1,
+1840,2559,16,0,414,
+1,1591,2560,16,0,
+414,1,1341,2561,16,
+0,414,1,1096,1417,
 1,93,1423,1,352,
-2513,16,0,463,1,
-107,2514,16,0,463,
+2562,16,0,414,1,
+107,2563,16,0,414,
 1,1114,1448,1,118,
-2515,16,0,463,1,
-1123,2516,16,0,463,
+2564,16,0,414,1,
+1123,2565,16,0,414,
 1,371,1470,1,1628,
-2517,16,0,463,1,
-375,1481,1,1882,2518,
-16,0,463,1,377,
+2566,16,0,414,1,
+375,1481,1,1882,2567,
+16,0,414,1,377,
 1486,1,379,1491,1,
-380,1496,1,883,2519,
-16,0,463,1,373,
-1514,1,130,2520,16,
-0,463,1,143,2521,
-16,0,463,1,387,
-2522,16,0,463,1,
-1159,2523,16,0,463,
-1,157,2524,16,0,
-463,1,1413,2525,16,
-0,463,1,1665,2526,
-16,0,463,1,412,
-2527,16,0,463,1,
-1377,2528,16,0,463,
-1,172,2529,16,0,
-463,1,1939,2530,16,
-0,463,1,437,2531,
-16,0,463,1,188,
-2532,16,0,463,1,
-942,2533,16,0,463,
-1,1195,2534,16,0,
-463,1,1449,2535,16,
-0,463,1,1701,2536,
-16,0,463,1,447,
-1615,1,205,2537,16,
-0,463,1,827,2538,
-16,0,463,1,223,
-2539,16,0,463,1,
+380,1496,1,883,2568,
+16,0,414,1,373,
+1514,1,130,2569,16,
+0,414,1,143,2570,
+16,0,414,1,387,
+2571,16,0,414,1,
+1159,2572,16,0,414,
+1,157,2573,16,0,
+414,1,1413,2574,16,
+0,414,1,1665,2575,
+16,0,414,1,412,
+2576,16,0,414,1,
+1377,2577,16,0,414,
+1,172,2578,16,0,
+414,1,1939,2579,16,
+0,414,1,437,2580,
+16,0,414,1,188,
+2581,16,0,414,1,
+942,2582,16,0,414,
+1,1195,2583,16,0,
+414,1,1449,2584,16,
+0,414,1,1701,2585,
+16,0,414,1,447,
+1615,1,205,2586,16,
+0,414,1,827,2587,
+16,0,414,1,223,
+2588,16,0,414,1,
 476,1647,1,477,1653,
-1,1231,2540,16,0,
-463,1,479,1663,1,
-480,1668,1,1485,2541,
-16,0,463,1,1737,
-2542,16,0,463,1,
-242,2543,16,0,463,
+1,1231,2589,16,0,
+414,1,479,1663,1,
+480,1668,1,1485,2590,
+16,0,414,1,1737,
+2591,16,0,414,1,
+242,2592,16,0,414,
 1,478,1686,1,1001,
 1691,1,1002,1696,1,
-22,2544,19,416,1,
-22,2545,5,84,1,
-2767,2546,16,0,414,
+23,2593,19,580,1,
+23,2594,5,38,1,
+1901,2595,16,0,578,
+1,2075,2596,16,0,
+578,1,1860,926,1,
+1803,892,1,1804,2597,
+16,0,578,1,2413,
+2598,16,0,578,1,
+2198,2599,16,0,578,
+1,1873,940,1,1657,
+998,1,1989,1020,1,
+1990,2600,16,0,578,
+1,1775,2601,16,0,
+578,1,32,2602,16,
+0,578,1,2105,919,
+1,2106,2603,16,0,
+578,1,2364,932,1,
+2227,1012,1,2337,2604,
+16,0,578,1,2021,
+823,1,2458,980,1,
+2459,986,1,2462,993,
+1,2136,947,1,2464,
+1003,1,2029,830,1,
+2030,836,1,2031,841,
+1,2032,846,1,2033,
+851,1,2035,857,1,
+2037,862,1,2039,867,
+1,1931,965,1,2041,
+873,1,2043,879,1,
+2045,884,1,1574,904,
+1,1958,2605,16,0,
+578,1,24,2606,19,
+192,1,24,2607,5,
+5,1,44,2608,16,
+0,190,1,377,2609,
+16,0,616,1,40,
+2610,16,0,778,1,
+63,2611,16,0,213,
+1,373,2612,16,0,
+612,1,25,2613,19,
+321,1,25,2614,5,
+177,1,2761,2615,16,
+0,621,1,256,2616,
+16,0,621,1,2767,
+2617,16,0,319,1,
+1011,1207,1,1012,2618,
+16,0,319,1,2458,
+980,1,262,1224,1,
+1267,2619,16,0,319,
+1,2021,823,1,1521,
+2620,16,0,319,1,
+1775,2621,16,0,621,
+1,2029,830,1,2030,
+836,1,2031,841,1,
+2032,846,1,2033,851,
+1,277,2622,16,0,
+621,1,2035,857,1,
+2037,862,1,2039,867,
+1,32,2623,16,0,
+621,1,2464,1003,1,
+2293,2624,16,0,621,
+1,2043,879,1,2045,
+884,1,2299,2625,16,
+0,319,1,41,2626,
+16,0,621,1,42,
+2627,16,0,319,1,
+40,1282,1,44,1288,
+1,43,2628,16,0,
+621,1,1804,2629,16,
+0,621,1,48,1295,
+1,49,1301,1,47,
+1289,1,51,1311,1,
+52,2630,16,0,621,
+1,50,1306,1,305,
+1316,1,1096,1417,1,
+1515,2631,16,0,621,
+1,2318,2632,16,0,
+621,1,62,2633,16,
+0,621,1,63,1327,
+1,66,1333,1,67,
+1338,1,68,1343,1,
+69,1348,1,70,1353,
+1,71,2634,16,0,
+621,1,283,1277,1,
+73,2635,16,0,319,
+1,74,1358,1,1013,
+1363,1,76,2636,16,
+0,621,1,1834,2637,
+16,0,621,1,2337,
+2638,16,0,621,1,
+79,2639,16,0,621,
+1,1335,2640,16,0,
+621,1,299,2641,16,
+0,621,1,82,2642,
+16,0,319,1,1840,
+2643,16,0,319,1,
+1297,2644,16,0,621,
+1,85,2645,16,0,
+621,1,1341,2646,16,
+0,319,1,1261,2647,
+16,0,621,1,89,
+2648,16,0,621,1,
+1303,2649,16,0,319,
+1,509,2650,16,0,
+621,1,93,1423,1,
+322,2651,16,0,621,
+1,97,2652,16,0,
+621,1,2041,873,1,
+1555,2653,16,0,319,
+1,827,2654,16,0,
+319,1,102,2655,16,
+0,621,1,1860,926,
+1,1803,892,1,2364,
+932,1,107,2656,16,
+0,319,1,1114,1448,
+1,112,2657,16,0,
+621,1,1117,2658,16,
+0,621,1,352,1454,
+1,1873,940,1,118,
+1460,1,1123,2659,16,
+0,319,1,371,1470,
+1,515,2660,16,0,
+319,1,1377,2661,16,
+0,319,1,124,2662,
+16,0,621,1,1882,
+2663,16,0,319,1,
+377,1486,1,379,1491,
+1,380,1496,1,130,
+1519,1,346,2664,16,
+0,621,1,2075,2665,
+16,0,621,1,373,
+1514,1,387,2666,16,
+0,319,1,137,2667,
+16,0,621,1,143,
+2668,16,0,319,1,
+1901,2669,16,0,621,
+1,1048,1449,1,1153,
+2670,16,0,621,1,
+375,1481,1,151,2671,
+16,0,621,1,1407,
+2672,16,0,621,1,
+1659,2673,16,0,621,
+1,2413,2674,16,0,
+621,1,1159,2675,16,
+0,319,1,381,2676,
+16,0,621,1,157,
+2677,16,0,319,1,
+1413,2678,16,0,319,
+1,883,2679,16,0,
+319,1,1371,2680,16,
+0,621,1,328,1407,
+1,2105,919,1,2106,
+2681,16,0,621,1,
+166,2682,16,0,621,
+1,525,2683,16,0,
+621,1,1622,2684,16,
+0,621,1,406,2685,
+16,0,621,1,1574,
+904,1,172,1573,1,
+1931,965,1,412,2686,
+16,0,319,1,1933,
+2687,16,0,621,1,
+1876,2688,16,0,621,
+1,431,2689,16,0,
+621,1,1585,2690,16,
+0,621,1,182,2691,
+16,0,621,1,1628,
+2692,16,0,319,1,
+1189,2693,16,0,621,
+1,437,2694,16,0,
+319,1,1591,2695,16,
+0,319,1,188,1622,
+1,1695,2696,16,0,
+621,1,2198,2697,16,
+0,621,1,1195,2698,
+16,0,319,1,1449,
+2699,16,0,319,1,
+1701,2700,16,0,319,
+1,447,2701,16,0,
+621,1,199,2702,16,
+0,621,1,2459,986,
+1,1958,2703,16,0,
+621,1,2462,993,1,
+1657,998,1,205,2704,
+16,0,319,1,459,
+2705,16,0,621,1,
+462,2706,16,0,621,
+1,1665,2707,16,0,
+319,1,217,2708,16,
+0,621,1,2227,1012,
+1,942,1594,1,1225,
+2709,16,0,621,1,
+223,2710,16,0,319,
+1,1479,2711,16,0,
+621,1,1731,2712,16,
+0,621,1,477,1653,
+1,1231,2713,16,0,
+319,1,479,1663,1,
+480,1668,1,1485,2714,
+16,0,319,1,1737,
+2715,16,0,319,1,
+1989,1020,1,1990,2716,
+16,0,621,1,1443,
+2717,16,0,621,1,
+236,2718,16,0,621,
+1,2136,947,1,476,
+1647,1,242,2719,16,
+0,319,1,478,1686,
+1,1939,2720,16,0,
+319,1,1001,1691,1,
+1002,1696,1,1756,2721,
+16,0,621,1,26,
+2722,19,339,1,26,
+2723,5,84,1,2767,
+2724,16,0,337,1,
+1011,1207,1,1012,2725,
+16,0,337,1,1013,
+1363,1,262,1224,1,
+1267,2726,16,0,337,
+1,515,2727,16,0,
+761,1,1521,2728,16,
+0,337,1,525,1321,
+1,283,1277,1,2299,
+2729,16,0,337,1,
+42,2730,16,0,337,
+1,40,1282,1,44,
+1288,1,47,1289,1,
+1303,2731,16,0,337,
+1,1555,2732,16,0,
+337,1,50,1306,1,
+48,1295,1,49,1301,
+1,51,1311,1,63,
+1327,1,305,1316,1,
+66,1333,1,67,1338,
+1,68,1343,1,69,
+1348,1,70,1353,1,
+73,2733,16,0,337,
+1,74,1358,1,328,
+1407,1,1048,1449,1,
+82,2734,16,0,337,
+1,1840,2735,16,0,
+337,1,1591,2736,16,
+0,337,1,1341,2737,
+16,0,337,1,1096,
+1417,1,93,1423,1,
+352,1454,1,107,2738,
+16,0,337,1,1114,
+1448,1,118,1460,1,
+1123,2739,16,0,337,
+1,371,1470,1,1628,
+2740,16,0,337,1,
+375,1481,1,1882,2741,
+16,0,337,1,377,
+1486,1,379,1491,1,
+380,1496,1,883,2742,
+16,0,337,1,373,
+1514,1,130,1519,1,
+143,2743,16,0,337,
+1,387,2744,16,0,
+337,1,1159,2745,16,
+0,337,1,157,2746,
+16,0,337,1,1413,
+2747,16,0,337,1,
+1665,2748,16,0,337,
+1,412,2749,16,0,
+337,1,1377,2750,16,
+0,337,1,172,1573,
+1,1939,2751,16,0,
+337,1,437,2752,16,
+0,687,1,188,1622,
+1,942,1594,1,1195,
+2753,16,0,337,1,
+1449,2754,16,0,337,
+1,1701,2755,16,0,
+337,1,447,1615,1,
+205,2756,16,0,337,
+1,827,2757,16,0,
+337,1,223,2758,16,
+0,337,1,476,1647,
+1,477,1653,1,1231,
+2759,16,0,337,1,
+479,1663,1,480,1668,
+1,1485,2760,16,0,
+337,1,1737,2761,16,
+0,337,1,242,2762,
+16,0,337,1,478,
+1686,1,1001,1691,1,
+1002,1696,1,27,2763,
+19,695,1,27,2764,
+5,95,1,2761,2765,
+16,0,693,1,256,
+2766,16,0,693,1,
+1261,2767,16,0,693,
+1,509,2768,16,0,
+693,1,1515,2769,16,
+0,693,1,2021,823,
+1,1775,2770,16,0,
+693,1,2029,830,1,
+2030,836,1,2031,841,
+1,2032,846,1,2033,
+851,1,277,2771,16,
+0,693,1,2035,857,
+1,2037,862,1,2039,
+867,1,32,2772,16,
+0,693,1,2041,873,
+1,2293,2773,16,0,
+693,1,2043,879,1,
+2045,884,1,41,2774,
+16,0,693,1,1297,
+2775,16,0,693,1,
+43,2776,16,0,693,
+1,1803,892,1,1804,
+2777,16,0,693,1,
+299,2778,16,0,693,
+1,52,2779,16,0,
+693,1,2318,2780,16,
+0,693,1,62,2781,
+16,0,693,1,2075,
+2782,16,0,693,1,
+1574,904,1,71,2783,
+16,0,693,1,76,
+2784,16,0,693,1,
+1834,2785,16,0,693,
+1,2337,2786,16,0,
+693,1,79,2787,16,
+0,693,1,1335,2788,
+16,0,693,1,322,
+2789,16,0,693,1,
+85,2790,16,0,693,
+1,89,2791,16,0,
+693,1,346,2792,16,
+0,693,1,2105,919,
+1,2106,2793,16,0,
+693,1,97,2794,16,
+0,693,1,1860,926,
+1,2364,932,1,102,
+2795,16,0,693,1,
+112,2796,16,0,693,
+1,1117,2797,16,0,
+693,1,1873,940,1,
+1876,2798,16,0,693,
+1,124,2799,16,0,
+693,1,2136,947,1,
+381,2800,16,0,693,
+1,525,2801,16,0,
+693,1,137,2802,16,
+0,693,1,1901,2803,
+16,0,693,1,1153,
+2804,16,0,693,1,
+151,2805,16,0,693,
+1,1407,2806,16,0,
+693,1,1659,2807,16,
+0,693,1,2413,2808,
+16,0,693,1,406,
+2809,16,0,693,1,
+1371,2810,16,0,693,
+1,166,2811,16,0,
+693,1,1622,2812,16,
+0,693,1,1931,965,
+1,1933,2813,16,0,
+693,1,431,2814,16,
+0,693,1,1585,2815,
+16,0,693,1,182,
+2816,16,0,693,1,
+1189,2817,16,0,693,
+1,1443,2818,16,0,
+693,1,1695,2819,16,
+0,693,1,2198,2820,
+16,0,693,1,447,
+2821,16,0,693,1,
+2458,980,1,2459,986,
+1,1958,2822,16,0,
+693,1,2462,993,1,
+1657,998,1,2464,1003,
+1,199,2823,16,0,
+693,1,459,2824,16,
+0,693,1,462,2825,
+16,0,693,1,217,
+2826,16,0,693,1,
+2227,1012,1,1225,2827,
+16,0,693,1,1479,
+2828,16,0,693,1,
+1731,2829,16,0,693,
+1,1989,1020,1,1990,
+2830,16,0,693,1,
+236,2831,16,0,693,
+1,1756,2832,16,0,
+693,1,28,2833,19,
+722,1,28,2834,5,
+60,1,328,1407,1,
+223,1637,1,1096,1417,
+1,118,1460,1,883,
+1502,1,525,1321,1,
+1001,1691,1,130,1519,
+1,459,1905,1,1114,
+1448,1,352,1454,1,
+447,1615,1,464,1898,
+1,1011,1207,1,1013,
+1363,1,242,1681,1,
+143,1524,1,40,1282,
+1,41,1873,1,42,
+1877,1,479,1663,1,
+44,1288,1,481,1908,
+1,373,1514,1,47,
+1289,1,157,1547,1,
+49,1301,1,50,1306,
+1,48,1295,1,379,
+1491,1,380,1496,1,
+51,1311,1,476,1647,
+1,371,1470,1,478,
+1686,1,1048,1449,1,
+375,1481,1,172,1573,
+1,262,1224,1,283,
+1277,1,63,1327,1,
+67,1338,1,68,1343,
+1,69,1348,1,66,
+1333,1,461,2835,16,
+0,720,1,74,1358,
+1,377,1486,1,1002,
+1696,1,70,1353,1,
+188,1622,1,82,1385,
+1,305,1316,1,477,
+1653,1,827,1436,1,
+93,1423,1,480,1668,
+1,205,1627,1,942,
+1594,1,107,1443,1,
+29,2836,19,306,1,
+29,2837,5,84,1,
+2767,2838,16,0,304,
 1,1011,1207,1,1012,
-2547,16,0,414,1,
+2839,16,0,304,1,
 1013,1363,1,262,1224,
-1,1267,2548,16,0,
-414,1,515,2549,16,
-0,414,1,1521,2550,
-16,0,414,1,525,
+1,1267,2840,16,0,
+304,1,515,2841,16,
+0,304,1,1521,2842,
+16,0,304,1,525,
 1321,1,283,1277,1,
-2299,2551,16,0,414,
-1,42,2552,16,0,
-414,1,40,1282,1,
+2299,2843,16,0,304,
+1,42,2844,16,0,
+304,1,40,1282,1,
 44,1288,1,47,1289,
-1,1303,2553,16,0,
-414,1,1555,2554,16,
-0,414,1,50,1306,
+1,1303,2845,16,0,
+304,1,1555,2846,16,
+0,304,1,50,1306,
 1,48,1295,1,49,
 1301,1,51,1311,1,
 63,1327,1,305,1316,
 1,66,1333,1,67,
 1338,1,68,1343,1,
 69,1348,1,70,1353,
-1,73,2555,16,0,
-414,1,74,1358,1,
-328,2556,16,0,414,
-1,1048,2557,16,0,
-414,1,82,2558,16,
-0,414,1,1840,2559,
-16,0,414,1,1591,
-2560,16,0,414,1,
-1341,2561,16,0,414,
-1,1096,1417,1,93,
-1423,1,352,2562,16,
-0,414,1,107,2563,
-16,0,414,1,1114,
-1448,1,118,2564,16,
-0,414,1,1123,2565,
-16,0,414,1,371,
-1470,1,1628,2566,16,
-0,414,1,375,1481,
-1,1882,2567,16,0,
-414,1,377,1486,1,
-379,1491,1,380,1496,
-1,883,2568,16,0,
-414,1,373,1514,1,
-130,2569,16,0,414,
-1,143,2570,16,0,
-414,1,387,2571,16,
-0,414,1,1159,2572,
-16,0,414,1,157,
-2573,16,0,414,1,
-1413,2574,16,0,414,
-1,1665,2575,16,0,
-414,1,412,2576,16,
-0,414,1,1377,2577,
-16,0,414,1,172,
-2578,16,0,414,1,
-1939,2579,16,0,414,
-1,437,2580,16,0,
-414,1,188,2581,16,
-0,414,1,942,2582,
-16,0,414,1,1195,
-2583,16,0,414,1,
-1449,2584,16,0,414,
-1,1701,2585,16,0,
-414,1,447,1615,1,
-205,2586,16,0,414,
-1,827,2587,16,0,
-414,1,223,2588,16,
-0,414,1,476,1647,
+1,73,2847,16,0,
+304,1,74,1358,1,
+328,1407,1,1048,1449,
+1,82,2848,16,0,
+304,1,1840,2849,16,
+0,304,1,1591,2850,
+16,0,304,1,1341,
+2851,16,0,304,1,
+1096,1417,1,93,1423,
+1,352,1454,1,107,
+2852,16,0,304,1,
+1114,1448,1,118,1460,
+1,1123,2853,16,0,
+304,1,371,1470,1,
+1628,2854,16,0,304,
+1,375,1481,1,1882,
+2855,16,0,304,1,
+377,1486,1,379,1491,
+1,380,1496,1,883,
+2856,16,0,304,1,
+373,1514,1,130,1519,
+1,143,1524,1,387,
+2857,16,0,304,1,
+1159,2858,16,0,304,
+1,157,1547,1,1413,
+2859,16,0,304,1,
+1665,2860,16,0,304,
+1,412,2861,16,0,
+304,1,1377,2862,16,
+0,304,1,172,1573,
+1,1939,2863,16,0,
+304,1,437,2864,16,
+0,304,1,188,1622,
+1,942,1594,1,1195,
+2865,16,0,304,1,
+1449,2866,16,0,304,
+1,1701,2867,16,0,
+304,1,447,1615,1,
+205,2868,16,0,304,
+1,827,2869,16,0,
+304,1,223,2870,16,
+0,304,1,476,1647,
 1,477,1653,1,1231,
-2589,16,0,414,1,
+2871,16,0,304,1,
 479,1663,1,480,1668,
-1,1485,2590,16,0,
-414,1,1737,2591,16,
-0,414,1,242,2592,
-16,0,414,1,478,
+1,1485,2872,16,0,
+304,1,1737,2873,16,
+0,304,1,242,2874,
+16,0,304,1,478,
 1686,1,1001,1691,1,
-1002,1696,1,23,2593,
-19,580,1,23,2594,
-5,38,1,1901,2595,
-16,0,578,1,2075,
-2596,16,0,578,1,
-1860,926,1,1803,892,
-1,1804,2597,16,0,
-578,1,2413,2598,16,
-0,578,1,2198,2599,
-16,0,578,1,1873,
-940,1,1657,998,1,
-1989,1020,1,1990,2600,
-16,0,578,1,1775,
-2601,16,0,578,1,
-32,2602,16,0,578,
-1,2105,919,1,2106,
-2603,16,0,578,1,
-2364,932,1,2227,1012,
-1,2337,2604,16,0,
-578,1,2021,823,1,
-2458,980,1,2459,986,
-1,2462,993,1,2136,
-947,1,2464,1003,1,
-2029,830,1,2030,836,
-1,2031,841,1,2032,
-846,1,2033,851,1,
-2035,857,1,2037,862,
-1,2039,867,1,1931,
-965,1,2041,873,1,
-2043,879,1,2045,884,
-1,1574,904,1,1958,
-2605,16,0,578,1,
-24,2606,19,192,1,
-24,2607,5,5,1,
-44,2608,16,0,190,
-1,377,2609,16,0,
-616,1,40,2610,16,
-0,778,1,63,2611,
-16,0,213,1,373,
-2612,16,0,612,1,
-25,2613,19,321,1,
-25,2614,5,177,1,
-2761,2615,16,0,621,
-1,256,2616,16,0,
-621,1,2767,2617,16,
-0,319,1,1011,1207,
-1,1012,2618,16,0,
-319,1,2458,980,1,
-262,1224,1,1267,2619,
-16,0,319,1,2021,
-823,1,1521,2620,16,
-0,319,1,1775,2621,
-16,0,621,1,2029,
-830,1,2030,836,1,
-2031,841,1,2032,846,
-1,2033,851,1,277,
-2622,16,0,621,1,
-2035,857,1,2037,862,
-1,2039,867,1,32,
-2623,16,0,621,1,
-2464,1003,1,2293,2624,
-16,0,621,1,2043,
-879,1,2045,884,1,
-2299,2625,16,0,319,
-1,41,2626,16,0,
-621,1,42,2627,16,
-0,319,1,40,1282,
-1,44,1288,1,43,
-2628,16,0,621,1,
-1804,2629,16,0,621,
-1,48,1295,1,49,
-1301,1,47,1289,1,
-51,1311,1,52,2630,
-16,0,621,1,50,
-1306,1,305,1316,1,
-1096,1417,1,1515,2631,
-16,0,621,1,2318,
-2632,16,0,621,1,
-62,2633,16,0,621,
-1,63,1327,1,66,
-1333,1,67,1338,1,
-68,1343,1,69,1348,
-1,70,1353,1,71,
-2634,16,0,621,1,
-283,1277,1,73,2635,
-16,0,319,1,74,
-1358,1,1013,1363,1,
-76,2636,16,0,621,
-1,1834,2637,16,0,
-621,1,2337,2638,16,
-0,621,1,79,2639,
-16,0,621,1,1335,
-2640,16,0,621,1,
-299,2641,16,0,621,
-1,82,2642,16,0,
-319,1,1840,2643,16,
-0,319,1,1297,2644,
-16,0,621,1,85,
-2645,16,0,621,1,
-1341,2646,16,0,319,
-1,1261,2647,16,0,
-621,1,89,2648,16,
-0,621,1,1303,2649,
-16,0,319,1,509,
-2650,16,0,621,1,
-93,1423,1,322,2651,
-16,0,621,1,97,
-2652,16,0,621,1,
-2041,873,1,1555,2653,
-16,0,319,1,827,
-2654,16,0,319,1,
-102,2655,16,0,621,
-1,1860,926,1,1803,
-892,1,2364,932,1,
-107,2656,16,0,319,
-1,1114,1448,1,112,
-2657,16,0,621,1,
-1117,2658,16,0,621,
-1,352,1454,1,1873,
-940,1,118,1460,1,
-1123,2659,16,0,319,
-1,371,1470,1,515,
-2660,16,0,319,1,
-1377,2661,16,0,319,
-1,124,2662,16,0,
-621,1,1882,2663,16,
-0,319,1,377,1486,
-1,379,1491,1,380,
-1496,1,130,1519,1,
-346,2664,16,0,621,
-1,2075,2665,16,0,
-621,1,373,1514,1,
-387,2666,16,0,319,
-1,137,2667,16,0,
-621,1,143,2668,16,
-0,319,1,1901,2669,
-16,0,621,1,1048,
-1449,1,1153,2670,16,
-0,621,1,375,1481,
-1,151,2671,16,0,
-621,1,1407,2672,16,
-0,621,1,1659,2673,
-16,0,621,1,2413,
-2674,16,0,621,1,
-1159,2675,16,0,319,
-1,381,2676,16,0,
-621,1,157,2677,16,
-0,319,1,1413,2678,
-16,0,319,1,883,
-2679,16,0,319,1,
-1371,2680,16,0,621,
-1,328,1407,1,2105,
-919,1,2106,2681,16,
-0,621,1,166,2682,
-16,0,621,1,525,
-2683,16,0,621,1,
-1622,2684,16,0,621,
-1,406,2685,16,0,
-621,1,1574,904,1,
-172,1573,1,1931,965,
-1,412,2686,16,0,
-319,1,1933,2687,16,
-0,621,1,1876,2688,
-16,0,621,1,431,
-2689,16,0,621,1,
-1585,2690,16,0,621,
-1,182,2691,16,0,
-621,1,1628,2692,16,
-0,319,1,1189,2693,
-16,0,621,1,437,
-2694,16,0,319,1,
-1591,2695,16,0,319,
-1,188,1622,1,1695,
-2696,16,0,621,1,
-2198,2697,16,0,621,
-1,1195,2698,16,0,
-319,1,1449,2699,16,
-0,319,1,1701,2700,
-16,0,319,1,447,
-2701,16,0,621,1,
-199,2702,16,0,621,
-1,2459,986,1,1958,
-2703,16,0,621,1,
-2462,993,1,1657,998,
-1,205,2704,16,0,
-319,1,459,2705,16,
-0,621,1,462,2706,
-16,0,621,1,1665,
-2707,16,0,319,1,
-217,2708,16,0,621,
-1,2227,1012,1,942,
-1594,1,1225,2709,16,
-0,621,1,223,2710,
-16,0,319,1,1479,
-2711,16,0,621,1,
-1731,2712,16,0,621,
-1,477,1653,1,1231,
-2713,16,0,319,1,
-479,1663,1,480,1668,
-1,1485,2714,16,0,
-319,1,1737,2715,16,
-0,319,1,1989,1020,
-1,1990,2716,16,0,
-621,1,1443,2717,16,
-0,621,1,236,2718,
-16,0,621,1,2136,
-947,1,476,1647,1,
-242,2719,16,0,319,
-1,478,1686,1,1939,
-2720,16,0,319,1,
-1001,1691,1,1002,1696,
-1,1756,2721,16,0,
-621,1,26,2722,19,
-339,1,26,2723,5,
-84,1,2767,2724,16,
-0,337,1,1011,1207,
-1,1012,2725,16,0,
-337,1,1013,1363,1,
-262,1224,1,1267,2726,
-16,0,337,1,515,
-2727,16,0,761,1,
-1521,2728,16,0,337,
-1,525,1321,1,283,
-1277,1,2299,2729,16,
-0,337,1,42,2730,
-16,0,337,1,40,
-1282,1,44,1288,1,
-47,1289,1,1303,2731,
-16,0,337,1,1555,
-2732,16,0,337,1,
-50,1306,1,48,1295,
-1,49,1301,1,51,
-1311,1,63,1327,1,
-305,1316,1,66,1333,
-1,67,1338,1,68,
-1343,1,69,1348,1,
-70,1353,1,73,2733,
-16,0,337,1,74,
-1358,1,328,1407,1,
-1048,1449,1,82,2734,
-16,0,337,1,1840,
-2735,16,0,337,1,
-1591,2736,16,0,337,
-1,1341,2737,16,0,
-337,1,1096,1417,1,
-93,1423,1,352,1454,
-1,107,2738,16,0,
-337,1,1114,1448,1,
-118,1460,1,1123,2739,
-16,0,337,1,371,
-1470,1,1628,2740,16,
-0,337,1,375,1481,
-1,1882,2741,16,0,
-337,1,377,1486,1,
-379,1491,1,380,1496,
-1,883,2742,16,0,
-337,1,373,1514,1,
-130,1519,1,143,2743,
-16,0,337,1,387,
-2744,16,0,337,1,
-1159,2745,16,0,337,
-1,157,2746,16,0,
-337,1,1413,2747,16,
-0,337,1,1665,2748,
-16,0,337,1,412,
-2749,16,0,337,1,
-1377,2750,16,0,337,
-1,172,1573,1,1939,
-2751,16,0,337,1,
-437,2752,16,0,687,
-1,188,1622,1,942,
-1594,1,1195,2753,16,
-0,337,1,1449,2754,
-16,0,337,1,1701,
-2755,16,0,337,1,
-447,1615,1,205,2756,
-16,0,337,1,827,
-2757,16,0,337,1,
-223,2758,16,0,337,
-1,476,1647,1,477,
-1653,1,1231,2759,16,
-0,337,1,479,1663,
-1,480,1668,1,1485,
-2760,16,0,337,1,
-1737,2761,16,0,337,
-1,242,2762,16,0,
-337,1,478,1686,1,
-1001,1691,1,1002,1696,
-1,27,2763,19,695,
-1,27,2764,5,95,
-1,2761,2765,16,0,
-693,1,256,2766,16,
-0,693,1,1261,2767,
-16,0,693,1,509,
-2768,16,0,693,1,
-1515,2769,16,0,693,
-1,2021,823,1,1775,
-2770,16,0,693,1,
-2029,830,1,2030,836,
-1,2031,841,1,2032,
-846,1,2033,851,1,
-277,2771,16,0,693,
-1,2035,857,1,2037,
-862,1,2039,867,1,
-32,2772,16,0,693,
-1,2041,873,1,2293,
-2773,16,0,693,1,
-2043,879,1,2045,884,
-1,41,2774,16,0,
-693,1,1297,2775,16,
-0,693,1,43,2776,
-16,0,693,1,1803,
-892,1,1804,2777,16,
-0,693,1,299,2778,
-16,0,693,1,52,
-2779,16,0,693,1,
-2318,2780,16,0,693,
-1,62,2781,16,0,
-693,1,2075,2782,16,
-0,693,1,1574,904,
-1,71,2783,16,0,
-693,1,76,2784,16,
-0,693,1,1834,2785,
-16,0,693,1,2337,
-2786,16,0,693,1,
-79,2787,16,0,693,
-1,1335,2788,16,0,
-693,1,322,2789,16,
-0,693,1,85,2790,
-16,0,693,1,89,
-2791,16,0,693,1,
-346,2792,16,0,693,
-1,2105,919,1,2106,
-2793,16,0,693,1,
-97,2794,16,0,693,
-1,1860,926,1,2364,
-932,1,102,2795,16,
-0,693,1,112,2796,
-16,0,693,1,1117,
-2797,16,0,693,1,
-1873,940,1,1876,2798,
-16,0,693,1,124,
-2799,16,0,693,1,
-2136,947,1,381,2800,
-16,0,693,1,525,
-2801,16,0,693,1,
-137,2802,16,0,693,
-1,1901,2803,16,0,
-693,1,1153,2804,16,
-0,693,1,151,2805,
-16,0,693,1,1407,
-2806,16,0,693,1,
-1659,2807,16,0,693,
-1,2413,2808,16,0,
-693,1,406,2809,16,
-0,693,1,1371,2810,
-16,0,693,1,166,
-2811,16,0,693,1,
-1622,2812,16,0,693,
-1,1931,965,1,1933,
-2813,16,0,693,1,
-431,2814,16,0,693,
-1,1585,2815,16,0,
-693,1,182,2816,16,
-0,693,1,1189,2817,
-16,0,693,1,1443,
-2818,16,0,693,1,
-1695,2819,16,0,693,
-1,2198,2820,16,0,
-693,1,447,2821,16,
-0,693,1,2458,980,
-1,2459,986,1,1958,
-2822,16,0,693,1,
-2462,993,1,1657,998,
-1,2464,1003,1,199,
-2823,16,0,693,1,
-459,2824,16,0,693,
-1,462,2825,16,0,
-693,1,217,2826,16,
-0,693,1,2227,1012,
-1,1225,2827,16,0,
-693,1,1479,2828,16,
-0,693,1,1731,2829,
-16,0,693,1,1989,
-1020,1,1990,2830,16,
-0,693,1,236,2831,
-16,0,693,1,1756,
-2832,16,0,693,1,
-28,2833,19,722,1,
-28,2834,5,60,1,
-328,1407,1,223,1637,
-1,1096,1417,1,118,
-1460,1,883,1502,1,
-525,1321,1,1001,1691,
-1,130,1519,1,459,
-1905,1,1114,1448,1,
-352,1454,1,447,1615,
-1,464,1898,1,1011,
-1207,1,1013,1363,1,
-242,1681,1,143,1524,
-1,40,1282,1,41,
-1873,1,42,1877,1,
-479,1663,1,44,1288,
-1,481,1908,1,373,
-1514,1,47,1289,1,
-157,1547,1,49,1301,
-1,50,1306,1,48,
-1295,1,379,1491,1,
-380,1496,1,51,1311,
-1,476,1647,1,371,
-1470,1,478,1686,1,
-1048,1449,1,375,1481,
-1,172,1573,1,262,
-1224,1,283,1277,1,
-63,1327,1,67,1338,
-1,68,1343,1,69,
-1348,1,66,1333,1,
-461,2835,16,0,720,
-1,74,1358,1,377,
-1486,1,1002,1696,1,
-70,1353,1,188,1622,
-1,82,1385,1,305,
-1316,1,477,1653,1,
-827,1436,1,93,1423,
-1,480,1668,1,205,
-1627,1,942,1594,1,
-107,1443,1,29,2836,
-19,306,1,29,2837,
-5,84,1,2767,2838,
-16,0,304,1,1011,
-1207,1,1012,2839,16,
-0,304,1,1013,1363,
+1002,1696,1,30,2875,
+19,290,1,30,2876,
+5,84,1,2767,2877,
+16,0,288,1,1011,
+1207,1,1012,2878,16,
+0,288,1,1013,1363,
 1,262,1224,1,1267,
-2840,16,0,304,1,
-515,2841,16,0,304,
-1,1521,2842,16,0,
-304,1,525,1321,1,
-283,1277,1,2299,2843,
-16,0,304,1,42,
-2844,16,0,304,1,
+2879,16,0,288,1,
+515,2880,16,0,288,
+1,1521,2881,16,0,
+288,1,525,1321,1,
+283,1277,1,2299,2882,
+16,0,288,1,42,
+2883,16,0,288,1,
 40,1282,1,44,1288,
 1,47,1289,1,1303,
-2845,16,0,304,1,
-1555,2846,16,0,304,
+2884,16,0,288,1,
+1555,2885,16,0,288,
 1,50,1306,1,48,
 1295,1,49,1301,1,
 51,1311,1,63,1327,
@@ -8535,224 +8606,372 @@ public yyLSLSyntax
 1333,1,67,1338,1,
 68,1343,1,69,1348,
 1,70,1353,1,73,
-2847,16,0,304,1,
+2886,16,0,288,1,
 74,1358,1,328,1407,
 1,1048,1449,1,82,
-2848,16,0,304,1,
-1840,2849,16,0,304,
-1,1591,2850,16,0,
-304,1,1341,2851,16,
-0,304,1,1096,1417,
+2887,16,0,288,1,
+1840,2888,16,0,288,
+1,1591,2889,16,0,
+288,1,1341,2890,16,
+0,288,1,1096,1417,
 1,93,1423,1,352,
-1454,1,107,2852,16,
-0,304,1,1114,1448,
+1454,1,107,2891,16,
+0,288,1,1114,1448,
 1,118,1460,1,1123,
-2853,16,0,304,1,
-371,1470,1,1628,2854,
-16,0,304,1,375,
-1481,1,1882,2855,16,
-0,304,1,377,1486,
+2892,16,0,288,1,
+371,1470,1,1628,2893,
+16,0,288,1,375,
+1481,1,1882,2894,16,
+0,288,1,377,1486,
 1,379,1491,1,380,
-1496,1,883,2856,16,
-0,304,1,373,1514,
+1496,1,883,2895,16,
+0,288,1,373,1514,
 1,130,1519,1,143,
-1524,1,387,2857,16,
-0,304,1,1159,2858,
-16,0,304,1,157,
-1547,1,1413,2859,16,
-0,304,1,1665,2860,
-16,0,304,1,412,
-2861,16,0,304,1,
-1377,2862,16,0,304,
+1524,1,387,2896,16,
+0,288,1,1159,2897,
+16,0,288,1,157,
+1547,1,1413,2898,16,
+0,288,1,1665,2899,
+16,0,288,1,412,
+2900,16,0,288,1,
+1377,2901,16,0,288,
 1,172,1573,1,1939,
-2863,16,0,304,1,
-437,2864,16,0,304,
+2902,16,0,288,1,
+437,2903,16,0,288,
 1,188,1622,1,942,
-1594,1,1195,2865,16,
-0,304,1,1449,2866,
-16,0,304,1,1701,
-2867,16,0,304,1,
-447,1615,1,205,2868,
-16,0,304,1,827,
-2869,16,0,304,1,
-223,2870,16,0,304,
+1594,1,1195,2904,16,
+0,288,1,1449,2905,
+16,0,288,1,1701,
+2906,16,0,288,1,
+447,1615,1,205,2907,
+16,0,288,1,827,
+2908,16,0,288,1,
+223,2909,16,0,288,
 1,476,1647,1,477,
-1653,1,1231,2871,16,
-0,304,1,479,1663,
+1653,1,1231,2910,16,
+0,288,1,479,1663,
 1,480,1668,1,1485,
-2872,16,0,304,1,
-1737,2873,16,0,304,
-1,242,2874,16,0,
-304,1,478,1686,1,
+2911,16,0,288,1,
+1737,2912,16,0,288,
+1,242,2913,16,0,
+288,1,478,1686,1,
 1001,1691,1,1002,1696,
-1,30,2875,19,290,
-1,30,2876,5,84,
-1,2767,2877,16,0,
-288,1,1011,1207,1,
-1012,2878,16,0,288,
+1,31,2914,19,272,
+1,31,2915,5,84,
+1,2767,2916,16,0,
+270,1,1011,1207,1,
+1012,2917,16,0,270,
 1,1013,1363,1,262,
-1224,1,1267,2879,16,
-0,288,1,515,2880,
-16,0,288,1,1521,
-2881,16,0,288,1,
+1224,1,1267,2918,16,
+0,270,1,515,2919,
+16,0,270,1,1521,
+2920,16,0,270,1,
 525,1321,1,283,1277,
-1,2299,2882,16,0,
-288,1,42,2883,16,
-0,288,1,40,1282,
+1,2299,2921,16,0,
+270,1,42,2922,16,
+0,270,1,40,1282,
 1,44,1288,1,47,
-1289,1,1303,2884,16,
-0,288,1,1555,2885,
-16,0,288,1,50,
+1289,1,1303,2923,16,
+0,270,1,1555,2924,
+16,0,270,1,50,
 1306,1,48,1295,1,
 49,1301,1,51,1311,
 1,63,1327,1,305,
 1316,1,66,1333,1,
 67,1338,1,68,1343,
 1,69,1348,1,70,
-1353,1,73,2886,16,
-0,288,1,74,1358,
+1353,1,73,2925,16,
+0,270,1,74,1358,
 1,328,1407,1,1048,
-1449,1,82,2887,16,
-0,288,1,1840,2888,
-16,0,288,1,1591,
-2889,16,0,288,1,
-1341,2890,16,0,288,
+1449,1,82,2926,16,
+0,270,1,1840,2927,
+16,0,270,1,1591,
+2928,16,0,270,1,
+1341,2929,16,0,270,
 1,1096,1417,1,93,
 1423,1,352,1454,1,
-107,2891,16,0,288,
+107,2930,16,0,270,
 1,1114,1448,1,118,
-1460,1,1123,2892,16,
-0,288,1,371,1470,
-1,1628,2893,16,0,
-288,1,375,1481,1,
-1882,2894,16,0,288,
+1460,1,1123,2931,16,
+0,270,1,371,1470,
+1,1628,2932,16,0,
+270,1,375,1481,1,
+1882,2933,16,0,270,
 1,377,1486,1,379,
 1491,1,380,1496,1,
-883,2895,16,0,288,
+883,2934,16,0,270,
 1,373,1514,1,130,
-1519,1,143,1524,1,
-387,2896,16,0,288,
-1,1159,2897,16,0,
-288,1,157,1547,1,
-1413,2898,16,0,288,
-1,1665,2899,16,0,
-288,1,412,2900,16,
-0,288,1,1377,2901,
-16,0,288,1,172,
-1573,1,1939,2902,16,
-0,288,1,437,2903,
-16,0,288,1,188,
+1519,1,143,2935,16,
+0,270,1,387,2936,
+16,0,270,1,1159,
+2937,16,0,270,1,
+157,2938,16,0,270,
+1,1413,2939,16,0,
+270,1,1665,2940,16,
+0,270,1,412,2941,
+16,0,270,1,1377,
+2942,16,0,270,1,
+172,1573,1,1939,2943,
+16,0,270,1,437,
+2944,16,0,270,1,
+188,1622,1,942,1594,
+1,1195,2945,16,0,
+270,1,1449,2946,16,
+0,270,1,1701,2947,
+16,0,270,1,447,
+1615,1,205,2948,16,
+0,270,1,827,2949,
+16,0,270,1,223,
+2950,16,0,270,1,
+476,1647,1,477,1653,
+1,1231,2951,16,0,
+270,1,479,1663,1,
+480,1668,1,1485,2952,
+16,0,270,1,1737,
+2953,16,0,270,1,
+242,2954,16,0,270,
+1,478,1686,1,1001,
+1691,1,1002,1696,1,
+32,2955,19,264,1,
+32,2956,5,84,1,
+2767,2957,16,0,262,
+1,1011,1207,1,1012,
+2958,16,0,262,1,
+1013,1363,1,262,1224,
+1,1267,2959,16,0,
+262,1,515,2960,16,
+0,262,1,1521,2961,
+16,0,262,1,525,
+1321,1,283,1277,1,
+2299,2962,16,0,262,
+1,42,2963,16,0,
+262,1,40,1282,1,
+44,1288,1,47,1289,
+1,1303,2964,16,0,
+262,1,1555,2965,16,
+0,262,1,50,1306,
+1,48,1295,1,49,
+1301,1,51,1311,1,
+63,1327,1,305,1316,
+1,66,1333,1,67,
+1338,1,68,1343,1,
+69,1348,1,70,1353,
+1,73,2966,16,0,
+262,1,74,1358,1,
+328,1407,1,1048,1449,
+1,82,2967,16,0,
+262,1,1840,2968,16,
+0,262,1,1591,2969,
+16,0,262,1,1341,
+2970,16,0,262,1,
+1096,1417,1,93,1423,
+1,352,1454,1,107,
+2971,16,0,262,1,
+1114,1448,1,118,1460,
+1,1123,2972,16,0,
+262,1,371,1470,1,
+1628,2973,16,0,262,
+1,375,1481,1,1882,
+2974,16,0,262,1,
+377,1486,1,379,1491,
+1,380,1496,1,883,
+2975,16,0,262,1,
+373,1514,1,130,1519,
+1,143,2976,16,0,
+262,1,387,2977,16,
+0,262,1,1159,2978,
+16,0,262,1,157,
+2979,16,0,262,1,
+1413,2980,16,0,262,
+1,1665,2981,16,0,
+262,1,412,2982,16,
+0,262,1,1377,2983,
+16,0,262,1,172,
+1573,1,1939,2984,16,
+0,262,1,437,2985,
+16,0,262,1,188,
 1622,1,942,1594,1,
-1195,2904,16,0,288,
-1,1449,2905,16,0,
-288,1,1701,2906,16,
-0,288,1,447,1615,
-1,205,2907,16,0,
-288,1,827,2908,16,
-0,288,1,223,2909,
-16,0,288,1,476,
+1195,2986,16,0,262,
+1,1449,2987,16,0,
+262,1,1701,2988,16,
+0,262,1,447,1615,
+1,205,2989,16,0,
+262,1,827,2990,16,
+0,262,1,223,2991,
+16,0,262,1,476,
 1647,1,477,1653,1,
-1231,2910,16,0,288,
+1231,2992,16,0,262,
 1,479,1663,1,480,
-1668,1,1485,2911,16,
-0,288,1,1737,2912,
-16,0,288,1,242,
-2913,16,0,288,1,
+1668,1,1485,2993,16,
+0,262,1,1737,2994,
+16,0,262,1,242,
+2995,16,0,262,1,
 478,1686,1,1001,1691,
-1,1002,1696,1,31,
-2914,19,272,1,31,
-2915,5,84,1,2767,
-2916,16,0,270,1,
-1011,1207,1,1012,2917,
-16,0,270,1,1013,
+1,1002,1696,1,33,
+2996,19,365,1,33,
+2997,5,84,1,2767,
+2998,16,0,363,1,
+1011,1207,1,1012,2999,
+16,0,363,1,1013,
 1363,1,262,1224,1,
-1267,2918,16,0,270,
-1,515,2919,16,0,
-270,1,1521,2920,16,
-0,270,1,525,1321,
+1267,3000,16,0,363,
+1,515,3001,16,0,
+363,1,1521,3002,16,
+0,363,1,525,1321,
 1,283,1277,1,2299,
-2921,16,0,270,1,
-42,2922,16,0,270,
+3003,16,0,363,1,
+42,3004,16,0,363,
 1,40,1282,1,44,
 1288,1,47,1289,1,
-1303,2923,16,0,270,
-1,1555,2924,16,0,
-270,1,50,1306,1,
+1303,3005,16,0,363,
+1,1555,3006,16,0,
+363,1,50,1306,1,
 48,1295,1,49,1301,
 1,51,1311,1,63,
 1327,1,305,1316,1,
 66,1333,1,67,1338,
 1,68,1343,1,69,
 1348,1,70,1353,1,
-73,2925,16,0,270,
+73,3007,16,0,363,
 1,74,1358,1,328,
 1407,1,1048,1449,1,
-82,2926,16,0,270,
-1,1840,2927,16,0,
-270,1,1591,2928,16,
-0,270,1,1341,2929,
-16,0,270,1,1096,
+82,3008,16,0,363,
+1,1840,3009,16,0,
+363,1,1591,3010,16,
+0,363,1,1341,3011,
+16,0,363,1,1096,
 1417,1,93,1423,1,
-352,1454,1,107,2930,
-16,0,270,1,1114,
+352,1454,1,107,3012,
+16,0,363,1,1114,
 1448,1,118,1460,1,
-1123,2931,16,0,270,
+1123,3013,16,0,363,
 1,371,1470,1,1628,
-2932,16,0,270,1,
-375,1481,1,1882,2933,
-16,0,270,1,377,
+3014,16,0,363,1,
+375,1481,1,1882,3015,
+16,0,363,1,377,
 1486,1,379,1491,1,
-380,1496,1,883,2934,
-16,0,270,1,373,
+380,1496,1,883,3016,
+16,0,363,1,373,
 1514,1,130,1519,1,
-143,2935,16,0,270,
-1,387,2936,16,0,
-270,1,1159,2937,16,
-0,270,1,157,2938,
-16,0,270,1,1413,
-2939,16,0,270,1,
-1665,2940,16,0,270,
-1,412,2941,16,0,
-270,1,1377,2942,16,
-0,270,1,172,1573,
-1,1939,2943,16,0,
-270,1,437,2944,16,
-0,270,1,188,1622,
-1,942,1594,1,1195,
-2945,16,0,270,1,
-1449,2946,16,0,270,
-1,1701,2947,16,0,
-270,1,447,1615,1,
-205,2948,16,0,270,
-1,827,2949,16,0,
-270,1,223,2950,16,
-0,270,1,476,1647,
-1,477,1653,1,1231,
-2951,16,0,270,1,
-479,1663,1,480,1668,
-1,1485,2952,16,0,
-270,1,1737,2953,16,
-0,270,1,242,2954,
-16,0,270,1,478,
+143,1524,1,387,3017,
+16,0,363,1,1159,
+3018,16,0,363,1,
+157,1547,1,1413,3019,
+16,0,363,1,1665,
+3020,16,0,363,1,
+412,3021,16,0,363,
+1,1377,3022,16,0,
+363,1,172,1573,1,
+1939,3023,16,0,363,
+1,437,3024,16,0,
+363,1,188,1622,1,
+942,1594,1,1195,3025,
+16,0,363,1,1449,
+3026,16,0,363,1,
+1701,3027,16,0,363,
+1,447,1615,1,205,
+3028,16,0,363,1,
+827,3029,16,0,363,
+1,223,3030,16,0,
+363,1,476,1647,1,
+477,1653,1,1231,3031,
+16,0,363,1,479,
+1663,1,480,1668,1,
+1485,3032,16,0,363,
+1,1737,3033,16,0,
+363,1,242,1681,1,
+478,1686,1,1001,1691,
+1,1002,1696,1,34,
+3034,19,352,1,34,
+3035,5,84,1,2767,
+3036,16,0,350,1,
+1011,1207,1,1012,3037,
+16,0,350,1,1013,
+1363,1,262,1224,1,
+1267,3038,16,0,350,
+1,515,3039,16,0,
+350,1,1521,3040,16,
+0,350,1,525,1321,
+1,283,1277,1,2299,
+3041,16,0,350,1,
+42,3042,16,0,350,
+1,40,1282,1,44,
+1288,1,47,1289,1,
+1303,3043,16,0,350,
+1,1555,3044,16,0,
+350,1,50,1306,1,
+48,1295,1,49,1301,
+1,51,1311,1,63,
+1327,1,305,1316,1,
+66,1333,1,67,1338,
+1,68,1343,1,69,
+1348,1,70,1353,1,
+73,3045,16,0,350,
+1,74,1358,1,328,
+1407,1,1048,1449,1,
+82,3046,16,0,350,
+1,1840,3047,16,0,
+350,1,1591,3048,16,
+0,350,1,1341,3049,
+16,0,350,1,1096,
+1417,1,93,1423,1,
+352,1454,1,107,3050,
+16,0,350,1,1114,
+1448,1,118,1460,1,
+1123,3051,16,0,350,
+1,371,1470,1,1628,
+3052,16,0,350,1,
+375,1481,1,1882,3053,
+16,0,350,1,377,
+1486,1,379,1491,1,
+380,1496,1,883,3054,
+16,0,350,1,373,
+1514,1,130,1519,1,
+143,1524,1,387,3055,
+16,0,350,1,1159,
+3056,16,0,350,1,
+157,1547,1,1413,3057,
+16,0,350,1,1665,
+3058,16,0,350,1,
+412,3059,16,0,350,
+1,1377,3060,16,0,
+350,1,172,1573,1,
+1939,3061,16,0,350,
+1,437,3062,16,0,
+350,1,188,1622,1,
+942,1594,1,1195,3063,
+16,0,350,1,1449,
+3064,16,0,350,1,
+1701,3065,16,0,350,
+1,447,1615,1,205,
+1627,1,827,3066,16,
+0,350,1,223,1637,
+1,476,1647,1,477,
+1653,1,1231,3067,16,
+0,350,1,479,1663,
+1,480,1668,1,1485,
+3068,16,0,350,1,
+1737,3069,16,0,350,
+1,242,1681,1,478,
 1686,1,1001,1691,1,
-1002,1696,1,32,2955,
-19,264,1,32,2956,
-5,84,1,2767,2957,
-16,0,262,1,1011,
-1207,1,1012,2958,16,
-0,262,1,1013,1363,
+1002,1696,1,35,3070,
+19,342,1,35,3071,
+5,84,1,2767,3072,
+16,0,340,1,1011,
+1207,1,1012,3073,16,
+0,340,1,1013,1363,
 1,262,1224,1,1267,
-2959,16,0,262,1,
-515,2960,16,0,262,
-1,1521,2961,16,0,
-262,1,525,1321,1,
-283,1277,1,2299,2962,
-16,0,262,1,42,
-2963,16,0,262,1,
+3074,16,0,340,1,
+515,3075,16,0,340,
+1,1521,3076,16,0,
+340,1,525,1321,1,
+283,1277,1,2299,3077,
+16,0,340,1,42,
+3078,16,0,340,1,
 40,1282,1,44,1288,
 1,47,1289,1,1303,
-2964,16,0,262,1,
-1555,2965,16,0,262,
+3079,16,0,340,1,
+1555,3080,16,0,340,
 1,50,1306,1,48,
 1295,1,49,1301,1,
 51,1311,1,63,1327,
@@ -8760,793 +8979,620 @@ public yyLSLSyntax
 1333,1,67,1338,1,
 68,1343,1,69,1348,
 1,70,1353,1,73,
-2966,16,0,262,1,
+3081,16,0,340,1,
 74,1358,1,328,1407,
 1,1048,1449,1,82,
-2967,16,0,262,1,
-1840,2968,16,0,262,
-1,1591,2969,16,0,
-262,1,1341,2970,16,
-0,262,1,1096,1417,
+3082,16,0,340,1,
+1840,3083,16,0,340,
+1,1591,3084,16,0,
+340,1,1341,3085,16,
+0,340,1,1096,1417,
 1,93,1423,1,352,
-1454,1,107,2971,16,
-0,262,1,1114,1448,
+1454,1,107,3086,16,
+0,340,1,1114,1448,
 1,118,1460,1,1123,
-2972,16,0,262,1,
-371,1470,1,1628,2973,
-16,0,262,1,375,
-1481,1,1882,2974,16,
-0,262,1,377,1486,
+3087,16,0,340,1,
+371,1470,1,1628,3088,
+16,0,340,1,375,
+1481,1,1882,3089,16,
+0,340,1,377,1486,
 1,379,1491,1,380,
-1496,1,883,2975,16,
-0,262,1,373,1514,
+1496,1,883,3090,16,
+0,340,1,373,1514,
 1,130,1519,1,143,
-2976,16,0,262,1,
-387,2977,16,0,262,
-1,1159,2978,16,0,
-262,1,157,2979,16,
-0,262,1,1413,2980,
-16,0,262,1,1665,
-2981,16,0,262,1,
-412,2982,16,0,262,
-1,1377,2983,16,0,
-262,1,172,1573,1,
-1939,2984,16,0,262,
-1,437,2985,16,0,
-262,1,188,1622,1,
-942,1594,1,1195,2986,
-16,0,262,1,1449,
-2987,16,0,262,1,
-1701,2988,16,0,262,
-1,447,1615,1,205,
-2989,16,0,262,1,
-827,2990,16,0,262,
-1,223,2991,16,0,
-262,1,476,1647,1,
-477,1653,1,1231,2992,
-16,0,262,1,479,
-1663,1,480,1668,1,
-1485,2993,16,0,262,
-1,1737,2994,16,0,
-262,1,242,2995,16,
-0,262,1,478,1686,
-1,1001,1691,1,1002,
-1696,1,33,2996,19,
-365,1,33,2997,5,
-84,1,2767,2998,16,
-0,363,1,1011,1207,
-1,1012,2999,16,0,
-363,1,1013,1363,1,
-262,1224,1,1267,3000,
-16,0,363,1,515,
-3001,16,0,363,1,
-1521,3002,16,0,363,
-1,525,1321,1,283,
-1277,1,2299,3003,16,
-0,363,1,42,3004,
-16,0,363,1,40,
-1282,1,44,1288,1,
-47,1289,1,1303,3005,
-16,0,363,1,1555,
-3006,16,0,363,1,
-50,1306,1,48,1295,
-1,49,1301,1,51,
-1311,1,63,1327,1,
-305,1316,1,66,1333,
-1,67,1338,1,68,
-1343,1,69,1348,1,
-70,1353,1,73,3007,
-16,0,363,1,74,
-1358,1,328,1407,1,
-1048,1449,1,82,3008,
-16,0,363,1,1840,
-3009,16,0,363,1,
-1591,3010,16,0,363,
-1,1341,3011,16,0,
-363,1,1096,1417,1,
-93,1423,1,352,1454,
-1,107,3012,16,0,
-363,1,1114,1448,1,
-118,1460,1,1123,3013,
-16,0,363,1,371,
-1470,1,1628,3014,16,
-0,363,1,375,1481,
-1,1882,3015,16,0,
-363,1,377,1486,1,
-379,1491,1,380,1496,
-1,883,3016,16,0,
-363,1,373,1514,1,
-130,1519,1,143,1524,
-1,387,3017,16,0,
-363,1,1159,3018,16,
-0,363,1,157,1547,
-1,1413,3019,16,0,
-363,1,1665,3020,16,
-0,363,1,412,3021,
-16,0,363,1,1377,
-3022,16,0,363,1,
-172,1573,1,1939,3023,
-16,0,363,1,437,
-3024,16,0,363,1,
-188,1622,1,942,1594,
-1,1195,3025,16,0,
-363,1,1449,3026,16,
-0,363,1,1701,3027,
-16,0,363,1,447,
-1615,1,205,3028,16,
-0,363,1,827,3029,
-16,0,363,1,223,
-3030,16,0,363,1,
-476,1647,1,477,1653,
-1,1231,3031,16,0,
-363,1,479,1663,1,
-480,1668,1,1485,3032,
-16,0,363,1,1737,
-3033,16,0,363,1,
-242,1681,1,478,1686,
-1,1001,1691,1,1002,
-1696,1,34,3034,19,
-352,1,34,3035,5,
-84,1,2767,3036,16,
-0,350,1,1011,1207,
-1,1012,3037,16,0,
-350,1,1013,1363,1,
-262,1224,1,1267,3038,
-16,0,350,1,515,
-3039,16,0,350,1,
-1521,3040,16,0,350,
-1,525,1321,1,283,
-1277,1,2299,3041,16,
-0,350,1,42,3042,
-16,0,350,1,40,
-1282,1,44,1288,1,
-47,1289,1,1303,3043,
-16,0,350,1,1555,
-3044,16,0,350,1,
-50,1306,1,48,1295,
-1,49,1301,1,51,
-1311,1,63,1327,1,
-305,1316,1,66,1333,
-1,67,1338,1,68,
-1343,1,69,1348,1,
-70,1353,1,73,3045,
-16,0,350,1,74,
-1358,1,328,1407,1,
-1048,1449,1,82,3046,
-16,0,350,1,1840,
-3047,16,0,350,1,
-1591,3048,16,0,350,
-1,1341,3049,16,0,
-350,1,1096,1417,1,
-93,1423,1,352,1454,
-1,107,3050,16,0,
-350,1,1114,1448,1,
-118,1460,1,1123,3051,
-16,0,350,1,371,
-1470,1,1628,3052,16,
-0,350,1,375,1481,
-1,1882,3053,16,0,
-350,1,377,1486,1,
-379,1491,1,380,1496,
-1,883,3054,16,0,
-350,1,373,1514,1,
-130,1519,1,143,1524,
-1,387,3055,16,0,
-350,1,1159,3056,16,
-0,350,1,157,1547,
-1,1413,3057,16,0,
-350,1,1665,3058,16,
-0,350,1,412,3059,
-16,0,350,1,1377,
-3060,16,0,350,1,
-172,1573,1,1939,3061,
-16,0,350,1,437,
-3062,16,0,350,1,
-188,1622,1,942,1594,
-1,1195,3063,16,0,
-350,1,1449,3064,16,
-0,350,1,1701,3065,
-16,0,350,1,447,
-1615,1,205,1627,1,
-827,3066,16,0,350,
-1,223,1637,1,476,
-1647,1,477,1653,1,
-1231,3067,16,0,350,
-1,479,1663,1,480,
-1668,1,1485,3068,16,
-0,350,1,1737,3069,
-16,0,350,1,242,
-1681,1,478,1686,1,
-1001,1691,1,1002,1696,
-1,35,3070,19,342,
-1,35,3071,5,84,
-1,2767,3072,16,0,
-340,1,1011,1207,1,
-1012,3073,16,0,340,
+1524,1,387,3091,16,
+0,340,1,1159,3092,
+16,0,340,1,157,
+1547,1,1413,3093,16,
+0,340,1,1665,3094,
+16,0,340,1,412,
+3095,16,0,340,1,
+1377,3096,16,0,340,
+1,172,1573,1,1939,
+3097,16,0,340,1,
+437,3098,16,0,340,
+1,188,1622,1,942,
+1594,1,1195,3099,16,
+0,340,1,1449,3100,
+16,0,340,1,1701,
+3101,16,0,340,1,
+447,1615,1,205,1627,
+1,827,3102,16,0,
+340,1,223,3103,16,
+0,340,1,476,1647,
+1,477,1653,1,1231,
+3104,16,0,340,1,
+479,1663,1,480,1668,
+1,1485,3105,16,0,
+340,1,1737,3106,16,
+0,340,1,242,1681,
+1,478,1686,1,1001,
+1691,1,1002,1696,1,
+36,3107,19,233,1,
+36,3108,5,94,1,
+2761,3109,16,0,231,
+1,256,3110,16,0,
+231,1,1261,3111,16,
+0,231,1,509,3112,
+16,0,231,1,1515,
+3113,16,0,231,1,
+2021,823,1,1775,3114,
+16,0,231,1,2029,
+830,1,2030,836,1,
+2031,841,1,2032,846,
+1,2033,851,1,277,
+3115,16,0,231,1,
+2035,857,1,2037,862,
+1,2039,867,1,32,
+3116,16,0,231,1,
+2041,873,1,2293,3117,
+16,0,231,1,2043,
+879,1,2045,884,1,
+41,3118,16,0,231,
+1,1297,3119,16,0,
+231,1,43,3120,16,
+0,231,1,1803,892,
+1,1804,3121,16,0,
+231,1,299,3122,16,
+0,231,1,52,3123,
+16,0,231,1,2318,
+3124,16,0,231,1,
+2075,3125,16,0,231,
+1,1574,904,1,71,
+3126,16,0,231,1,
+76,3127,16,0,231,
+1,1834,3128,16,0,
+231,1,2337,3129,16,
+0,231,1,79,3130,
+16,0,231,1,1335,
+3131,16,0,231,1,
+322,3132,16,0,231,
+1,85,3133,16,0,
+231,1,89,3134,16,
+0,231,1,346,3135,
+16,0,231,1,2105,
+919,1,2106,3136,16,
+0,231,1,97,3137,
+16,0,231,1,1860,
+926,1,2364,932,1,
+102,3138,16,0,231,
+1,112,3139,16,0,
+231,1,1117,3140,16,
+0,231,1,1873,940,
+1,1876,3141,16,0,
+231,1,124,3142,16,
+0,231,1,2136,947,
+1,381,3143,16,0,
+231,1,525,3144,16,
+0,231,1,137,3145,
+16,0,231,1,1901,
+3146,16,0,231,1,
+1153,3147,16,0,231,
+1,151,3148,16,0,
+231,1,1407,3149,16,
+0,231,1,1659,3150,
+16,0,231,1,2413,
+3151,16,0,231,1,
+406,3152,16,0,231,
+1,1371,3153,16,0,
+231,1,166,3154,16,
+0,231,1,1622,3155,
+16,0,231,1,1931,
+965,1,1933,3156,16,
+0,231,1,431,3157,
+16,0,231,1,1585,
+3158,16,0,231,1,
+182,3159,16,0,231,
+1,1189,3160,16,0,
+231,1,1443,3161,16,
+0,231,1,1695,3162,
+16,0,231,1,2198,
+3163,16,0,231,1,
+447,3164,16,0,231,
+1,2458,980,1,2459,
+986,1,1958,3165,16,
+0,231,1,2462,993,
+1,1657,998,1,2464,
+1003,1,199,3166,16,
+0,231,1,459,3167,
+16,0,231,1,462,
+3168,16,0,231,1,
+217,3169,16,0,231,
+1,2227,1012,1,1225,
+3170,16,0,231,1,
+1479,3171,16,0,231,
+1,1731,3172,16,0,
+231,1,1989,1020,1,
+1990,3173,16,0,231,
+1,236,3174,16,0,
+231,1,1756,3175,16,
+0,231,1,37,3176,
+19,254,1,37,3177,
+5,94,1,2761,3178,
+16,0,252,1,256,
+3179,16,0,252,1,
+1261,3180,16,0,252,
+1,509,3181,16,0,
+252,1,1515,3182,16,
+0,252,1,2021,823,
+1,1775,3183,16,0,
+252,1,2029,830,1,
+2030,836,1,2031,841,
+1,2032,846,1,2033,
+851,1,277,3184,16,
+0,252,1,2035,857,
+1,2037,862,1,2039,
+867,1,32,3185,16,
+0,252,1,2041,873,
+1,2293,3186,16,0,
+252,1,2043,879,1,
+2045,884,1,41,3187,
+16,0,252,1,1297,
+3188,16,0,252,1,
+43,3189,16,0,252,
+1,1803,892,1,1804,
+3190,16,0,252,1,
+299,3191,16,0,252,
+1,52,3192,16,0,
+252,1,2318,3193,16,
+0,252,1,2075,3194,
+16,0,252,1,1574,
+904,1,71,3195,16,
+0,252,1,76,3196,
+16,0,252,1,1834,
+3197,16,0,252,1,
+2337,3198,16,0,252,
+1,79,3199,16,0,
+252,1,1335,3200,16,
+0,252,1,322,3201,
+16,0,252,1,85,
+3202,16,0,252,1,
+89,3203,16,0,252,
+1,346,3204,16,0,
+252,1,2105,919,1,
+2106,3205,16,0,252,
+1,97,3206,16,0,
+252,1,1860,926,1,
+2364,932,1,102,3207,
+16,0,252,1,112,
+3208,16,0,252,1,
+1117,3209,16,0,252,
+1,1873,940,1,1876,
+3210,16,0,252,1,
+124,3211,16,0,252,
+1,2136,947,1,381,
+3212,16,0,252,1,
+525,3213,16,0,252,
+1,137,3214,16,0,
+252,1,1901,3215,16,
+0,252,1,1153,3216,
+16,0,252,1,151,
+3217,16,0,252,1,
+1407,3218,16,0,252,
+1,1659,3219,16,0,
+252,1,2413,3220,16,
+0,252,1,406,3221,
+16,0,252,1,1371,
+3222,16,0,252,1,
+166,3223,16,0,252,
+1,1622,3224,16,0,
+252,1,1931,965,1,
+1933,3225,16,0,252,
+1,431,3226,16,0,
+252,1,1585,3227,16,
+0,252,1,182,3228,
+16,0,252,1,1189,
+3229,16,0,252,1,
+1443,3230,16,0,252,
+1,1695,3231,16,0,
+252,1,2198,3232,16,
+0,252,1,447,3233,
+16,0,252,1,2458,
+980,1,2459,986,1,
+1958,3234,16,0,252,
+1,2462,993,1,1657,
+998,1,2464,1003,1,
+199,3235,16,0,252,
+1,459,3236,16,0,
+252,1,462,3237,16,
+0,252,1,217,3238,
+16,0,252,1,2227,
+1012,1,1225,3239,16,
+0,252,1,1479,3240,
+16,0,252,1,1731,
+3241,16,0,252,1,
+1989,1020,1,1990,3242,
+16,0,252,1,236,
+3243,16,0,252,1,
+1756,3244,16,0,252,
+1,38,3245,19,251,
+1,38,3246,5,84,
+1,2767,3247,16,0,
+249,1,1011,1207,1,
+1012,3248,16,0,249,
 1,1013,1363,1,262,
-1224,1,1267,3074,16,
-0,340,1,515,3075,
-16,0,340,1,1521,
-3076,16,0,340,1,
+1224,1,1267,3249,16,
+0,249,1,515,3250,
+16,0,249,1,1521,
+3251,16,0,249,1,
 525,1321,1,283,1277,
-1,2299,3077,16,0,
-340,1,42,3078,16,
-0,340,1,40,1282,
+1,2299,3252,16,0,
+249,1,42,3253,16,
+0,249,1,40,1282,
 1,44,1288,1,47,
-1289,1,1303,3079,16,
-0,340,1,1555,3080,
-16,0,340,1,50,
+1289,1,1303,3254,16,
+0,249,1,1555,3255,
+16,0,249,1,50,
 1306,1,48,1295,1,
 49,1301,1,51,1311,
 1,63,1327,1,305,
 1316,1,66,1333,1,
 67,1338,1,68,1343,
 1,69,1348,1,70,
-1353,1,73,3081,16,
-0,340,1,74,1358,
+1353,1,73,3256,16,
+0,249,1,74,1358,
 1,328,1407,1,1048,
-1449,1,82,3082,16,
-0,340,1,1840,3083,
-16,0,340,1,1591,
-3084,16,0,340,1,
-1341,3085,16,0,340,
+1449,1,82,3257,16,
+0,249,1,1840,3258,
+16,0,249,1,1591,
+3259,16,0,249,1,
+1341,3260,16,0,249,
 1,1096,1417,1,93,
 1423,1,352,1454,1,
-107,3086,16,0,340,
+107,3261,16,0,249,
 1,1114,1448,1,118,
-1460,1,1123,3087,16,
-0,340,1,371,1470,
-1,1628,3088,16,0,
-340,1,375,1481,1,
-1882,3089,16,0,340,
+1460,1,1123,3262,16,
+0,249,1,371,1470,
+1,1628,3263,16,0,
+249,1,375,1481,1,
+1882,3264,16,0,249,
 1,377,1486,1,379,
 1491,1,380,1496,1,
-883,3090,16,0,340,
-1,373,1514,1,130,
-1519,1,143,1524,1,
-387,3091,16,0,340,
-1,1159,3092,16,0,
-340,1,157,1547,1,
-1413,3093,16,0,340,
-1,1665,3094,16,0,
-340,1,412,3095,16,
-0,340,1,1377,3096,
-16,0,340,1,172,
-1573,1,1939,3097,16,
-0,340,1,437,3098,
-16,0,340,1,188,
-1622,1,942,1594,1,
-1195,3099,16,0,340,
-1,1449,3100,16,0,
-340,1,1701,3101,16,
-0,340,1,447,1615,
-1,205,1627,1,827,
-3102,16,0,340,1,
-223,3103,16,0,340,
-1,476,1647,1,477,
-1653,1,1231,3104,16,
-0,340,1,479,1663,
-1,480,1668,1,1485,
-3105,16,0,340,1,
-1737,3106,16,0,340,
-1,242,1681,1,478,
-1686,1,1001,1691,1,
-1002,1696,1,36,3107,
-19,233,1,36,3108,
-5,94,1,2761,3109,
-16,0,231,1,256,
-3110,16,0,231,1,
-1261,3111,16,0,231,
-1,509,3112,16,0,
-231,1,1515,3113,16,
-0,231,1,2021,823,
-1,1775,3114,16,0,
-231,1,2029,830,1,
-2030,836,1,2031,841,
-1,2032,846,1,2033,
-851,1,277,3115,16,
-0,231,1,2035,857,
-1,2037,862,1,2039,
-867,1,32,3116,16,
-0,231,1,2041,873,
-1,2293,3117,16,0,
-231,1,2043,879,1,
-2045,884,1,41,3118,
-16,0,231,1,1297,
-3119,16,0,231,1,
-43,3120,16,0,231,
-1,1803,892,1,1804,
-3121,16,0,231,1,
-299,3122,16,0,231,
-1,52,3123,16,0,
-231,1,2318,3124,16,
-0,231,1,2075,3125,
-16,0,231,1,1574,
-904,1,71,3126,16,
-0,231,1,76,3127,
-16,0,231,1,1834,
-3128,16,0,231,1,
-2337,3129,16,0,231,
-1,79,3130,16,0,
-231,1,1335,3131,16,
-0,231,1,322,3132,
-16,0,231,1,85,
-3133,16,0,231,1,
-89,3134,16,0,231,
-1,346,3135,16,0,
-231,1,2105,919,1,
-2106,3136,16,0,231,
-1,97,3137,16,0,
-231,1,1860,926,1,
-2364,932,1,102,3138,
-16,0,231,1,112,
-3139,16,0,231,1,
-1117,3140,16,0,231,
-1,1873,940,1,1876,
-3141,16,0,231,1,
-124,3142,16,0,231,
-1,2136,947,1,381,
-3143,16,0,231,1,
-525,3144,16,0,231,
-1,137,3145,16,0,
-231,1,1901,3146,16,
-0,231,1,1153,3147,
-16,0,231,1,151,
-3148,16,0,231,1,
-1407,3149,16,0,231,
-1,1659,3150,16,0,
-231,1,2413,3151,16,
-0,231,1,406,3152,
-16,0,231,1,1371,
-3153,16,0,231,1,
-166,3154,16,0,231,
-1,1622,3155,16,0,
-231,1,1931,965,1,
-1933,3156,16,0,231,
-1,431,3157,16,0,
-231,1,1585,3158,16,
-0,231,1,182,3159,
-16,0,231,1,1189,
-3160,16,0,231,1,
-1443,3161,16,0,231,
-1,1695,3162,16,0,
-231,1,2198,3163,16,
-0,231,1,447,3164,
-16,0,231,1,2458,
-980,1,2459,986,1,
-1958,3165,16,0,231,
-1,2462,993,1,1657,
-998,1,2464,1003,1,
-199,3166,16,0,231,
-1,459,3167,16,0,
-231,1,462,3168,16,
-0,231,1,217,3169,
-16,0,231,1,2227,
-1012,1,1225,3170,16,
-0,231,1,1479,3171,
-16,0,231,1,1731,
-3172,16,0,231,1,
-1989,1020,1,1990,3173,
-16,0,231,1,236,
-3174,16,0,231,1,
-1756,3175,16,0,231,
-1,37,3176,19,254,
-1,37,3177,5,94,
-1,2761,3178,16,0,
-252,1,256,3179,16,
-0,252,1,1261,3180,
-16,0,252,1,509,
-3181,16,0,252,1,
-1515,3182,16,0,252,
-1,2021,823,1,1775,
-3183,16,0,252,1,
-2029,830,1,2030,836,
-1,2031,841,1,2032,
-846,1,2033,851,1,
-277,3184,16,0,252,
-1,2035,857,1,2037,
-862,1,2039,867,1,
-32,3185,16,0,252,
-1,2041,873,1,2293,
-3186,16,0,252,1,
-2043,879,1,2045,884,
-1,41,3187,16,0,
-252,1,1297,3188,16,
-0,252,1,43,3189,
-16,0,252,1,1803,
-892,1,1804,3190,16,
-0,252,1,299,3191,
-16,0,252,1,52,
-3192,16,0,252,1,
-2318,3193,16,0,252,
-1,2075,3194,16,0,
-252,1,1574,904,1,
-71,3195,16,0,252,
-1,76,3196,16,0,
-252,1,1834,3197,16,
-0,252,1,2337,3198,
-16,0,252,1,79,
-3199,16,0,252,1,
-1335,3200,16,0,252,
-1,322,3201,16,0,
-252,1,85,3202,16,
-0,252,1,89,3203,
-16,0,252,1,346,
-3204,16,0,252,1,
-2105,919,1,2106,3205,
-16,0,252,1,97,
-3206,16,0,252,1,
-1860,926,1,2364,932,
-1,102,3207,16,0,
-252,1,112,3208,16,
-0,252,1,1117,3209,
-16,0,252,1,1873,
-940,1,1876,3210,16,
-0,252,1,124,3211,
-16,0,252,1,2136,
-947,1,381,3212,16,
-0,252,1,525,3213,
-16,0,252,1,137,
-3214,16,0,252,1,
-1901,3215,16,0,252,
-1,1153,3216,16,0,
-252,1,151,3217,16,
-0,252,1,1407,3218,
-16,0,252,1,1659,
-3219,16,0,252,1,
-2413,3220,16,0,252,
-1,406,3221,16,0,
-252,1,1371,3222,16,
-0,252,1,166,3223,
-16,0,252,1,1622,
-3224,16,0,252,1,
-1931,965,1,1933,3225,
-16,0,252,1,431,
-3226,16,0,252,1,
-1585,3227,16,0,252,
-1,182,3228,16,0,
-252,1,1189,3229,16,
-0,252,1,1443,3230,
-16,0,252,1,1695,
-3231,16,0,252,1,
-2198,3232,16,0,252,
-1,447,3233,16,0,
-252,1,2458,980,1,
-2459,986,1,1958,3234,
-16,0,252,1,2462,
-993,1,1657,998,1,
-2464,1003,1,199,3235,
-16,0,252,1,459,
-3236,16,0,252,1,
-462,3237,16,0,252,
-1,217,3238,16,0,
-252,1,2227,1012,1,
-1225,3239,16,0,252,
-1,1479,3240,16,0,
-252,1,1731,3241,16,
-0,252,1,1989,1020,
-1,1990,3242,16,0,
-252,1,236,3243,16,
-0,252,1,1756,3244,
-16,0,252,1,38,
-3245,19,251,1,38,
-3246,5,84,1,2767,
-3247,16,0,249,1,
-1011,1207,1,1012,3248,
-16,0,249,1,1013,
+883,1502,1,373,1514,
+1,130,1519,1,143,
+1524,1,387,3265,16,
+0,249,1,1159,3266,
+16,0,249,1,157,
+1547,1,1413,3267,16,
+0,249,1,1665,3268,
+16,0,249,1,412,
+3269,16,0,249,1,
+1377,3270,16,0,249,
+1,172,1573,1,1939,
+3271,16,0,249,1,
+437,3272,16,0,249,
+1,188,1622,1,942,
+1594,1,1195,3273,16,
+0,249,1,1449,3274,
+16,0,249,1,1701,
+3275,16,0,249,1,
+447,1615,1,205,1627,
+1,827,1436,1,223,
+1637,1,476,1647,1,
+477,1653,1,1231,3276,
+16,0,249,1,479,
+1663,1,480,1668,1,
+1485,3277,16,0,249,
+1,1737,3278,16,0,
+249,1,242,1681,1,
+478,1686,1,1001,1691,
+1,1002,1696,1,39,
+3279,19,239,1,39,
+3280,5,84,1,2767,
+3281,16,0,237,1,
+1011,1207,1,1012,3282,
+16,0,237,1,1013,
 1363,1,262,1224,1,
-1267,3249,16,0,249,
-1,515,3250,16,0,
-249,1,1521,3251,16,
-0,249,1,525,1321,
+1267,3283,16,0,237,
+1,515,3284,16,0,
+237,1,1521,3285,16,
+0,237,1,525,1321,
 1,283,1277,1,2299,
-3252,16,0,249,1,
-42,3253,16,0,249,
+3286,16,0,237,1,
+42,3287,16,0,237,
 1,40,1282,1,44,
 1288,1,47,1289,1,
-1303,3254,16,0,249,
-1,1555,3255,16,0,
-249,1,50,1306,1,
+1303,3288,16,0,237,
+1,1555,3289,16,0,
+237,1,50,1306,1,
 48,1295,1,49,1301,
 1,51,1311,1,63,
 1327,1,305,1316,1,
 66,1333,1,67,1338,
 1,68,1343,1,69,
 1348,1,70,1353,1,
-73,3256,16,0,249,
+73,3290,16,0,237,
 1,74,1358,1,328,
 1407,1,1048,1449,1,
-82,3257,16,0,249,
-1,1840,3258,16,0,
-249,1,1591,3259,16,
-0,249,1,1341,3260,
-16,0,249,1,1096,
+82,3291,16,0,237,
+1,1840,3292,16,0,
+237,1,1591,3293,16,
+0,237,1,1341,3294,
+16,0,237,1,1096,
 1417,1,93,1423,1,
-352,1454,1,107,3261,
-16,0,249,1,1114,
+352,1454,1,107,3295,
+16,0,237,1,1114,
 1448,1,118,1460,1,
-1123,3262,16,0,249,
+1123,3296,16,0,237,
 1,371,1470,1,1628,
-3263,16,0,249,1,
-375,1481,1,1882,3264,
-16,0,249,1,377,
+3297,16,0,237,1,
+375,1481,1,1882,3298,
+16,0,237,1,377,
 1486,1,379,1491,1,
 380,1496,1,883,1502,
 1,373,1514,1,130,
 1519,1,143,1524,1,
-387,3265,16,0,249,
-1,1159,3266,16,0,
-249,1,157,1547,1,
-1413,3267,16,0,249,
-1,1665,3268,16,0,
-249,1,412,3269,16,
-0,249,1,1377,3270,
-16,0,249,1,172,
-1573,1,1939,3271,16,
-0,249,1,437,3272,
-16,0,249,1,188,
+387,3299,16,0,237,
+1,1159,3300,16,0,
+237,1,157,1547,1,
+1413,3301,16,0,237,
+1,1665,3302,16,0,
+237,1,412,3303,16,
+0,237,1,1377,3304,
+16,0,237,1,172,
+1573,1,1939,3305,16,
+0,237,1,437,3306,
+16,0,237,1,188,
 1622,1,942,1594,1,
-1195,3273,16,0,249,
-1,1449,3274,16,0,
-249,1,1701,3275,16,
-0,249,1,447,1615,
+1195,3307,16,0,237,
+1,1449,3308,16,0,
+237,1,1701,3309,16,
+0,237,1,447,1615,
 1,205,1627,1,827,
 1436,1,223,1637,1,
 476,1647,1,477,1653,
-1,1231,3276,16,0,
-249,1,479,1663,1,
-480,1668,1,1485,3277,
-16,0,249,1,1737,
-3278,16,0,249,1,
+1,1231,3310,16,0,
+237,1,479,1663,1,
+480,1668,1,1485,3311,
+16,0,237,1,1737,
+3312,16,0,237,1,
 242,1681,1,478,1686,
 1,1001,1691,1,1002,
-1696,1,39,3279,19,
-239,1,39,3280,5,
-84,1,2767,3281,16,
-0,237,1,1011,1207,
-1,1012,3282,16,0,
-237,1,1013,1363,1,
-262,1224,1,1267,3283,
-16,0,237,1,515,
-3284,16,0,237,1,
-1521,3285,16,0,237,
+1696,1,40,3313,19,
+227,1,40,3314,5,
+84,1,2767,3315,16,
+0,225,1,1011,1207,
+1,1012,3316,16,0,
+225,1,1013,1363,1,
+262,1224,1,1267,3317,
+16,0,225,1,515,
+3318,16,0,225,1,
+1521,3319,16,0,225,
 1,525,1321,1,283,
-1277,1,2299,3286,16,
-0,237,1,42,3287,
-16,0,237,1,40,
+1277,1,2299,3320,16,
+0,225,1,42,3321,
+16,0,225,1,40,
 1282,1,44,1288,1,
-47,1289,1,1303,3288,
-16,0,237,1,1555,
-3289,16,0,237,1,
+47,1289,1,1303,3322,
+16,0,225,1,1555,
+3323,16,0,225,1,
 50,1306,1,48,1295,
 1,49,1301,1,51,
 1311,1,63,1327,1,
 305,1316,1,66,1333,
 1,67,1338,1,68,
 1343,1,69,1348,1,
-70,1353,1,73,3290,
-16,0,237,1,74,
+70,1353,1,73,3324,
+16,0,225,1,74,
 1358,1,328,1407,1,
-1048,1449,1,82,3291,
-16,0,237,1,1840,
-3292,16,0,237,1,
-1591,3293,16,0,237,
-1,1341,3294,16,0,
-237,1,1096,1417,1,
+1048,1449,1,82,3325,
+16,0,225,1,1840,
+3326,16,0,225,1,
+1591,3327,16,0,225,
+1,1341,3328,16,0,
+225,1,1096,1417,1,
 93,1423,1,352,1454,
-1,107,3295,16,0,
-237,1,1114,1448,1,
-118,1460,1,1123,3296,
-16,0,237,1,371,
-1470,1,1628,3297,16,
-0,237,1,375,1481,
-1,1882,3298,16,0,
-237,1,377,1486,1,
-379,1491,1,380,1496,
-1,883,1502,1,373,
-1514,1,130,1519,1,
-143,1524,1,387,3299,
-16,0,237,1,1159,
-3300,16,0,237,1,
-157,1547,1,1413,3301,
-16,0,237,1,1665,
-3302,16,0,237,1,
-412,3303,16,0,237,
-1,1377,3304,16,0,
-237,1,172,1573,1,
-1939,3305,16,0,237,
-1,437,3306,16,0,
-237,1,188,1622,1,
-942,1594,1,1195,3307,
-16,0,237,1,1449,
-3308,16,0,237,1,
-1701,3309,16,0,237,
-1,447,1615,1,205,
-1627,1,827,1436,1,
-223,1637,1,476,1647,
+1,107,3329,16,0,
+225,1,1114,1448,1,
+118,3330,16,0,225,
+1,1123,3331,16,0,
+225,1,371,1470,1,
+1628,3332,16,0,225,
+1,375,1481,1,1882,
+3333,16,0,225,1,
+377,1486,1,379,1491,
+1,380,1496,1,883,
+3334,16,0,225,1,
+373,1514,1,130,3335,
+16,0,225,1,143,
+3336,16,0,225,1,
+387,3337,16,0,225,
+1,1159,3338,16,0,
+225,1,157,3339,16,
+0,225,1,1413,3340,
+16,0,225,1,1665,
+3341,16,0,225,1,
+412,3342,16,0,225,
+1,1377,3343,16,0,
+225,1,172,3344,16,
+0,225,1,1939,3345,
+16,0,225,1,437,
+3346,16,0,225,1,
+188,3347,16,0,225,
+1,942,1594,1,1195,
+3348,16,0,225,1,
+1449,3349,16,0,225,
+1,1701,3350,16,0,
+225,1,447,1615,1,
+205,3351,16,0,225,
+1,827,3352,16,0,
+225,1,223,3353,16,
+0,225,1,476,1647,
 1,477,1653,1,1231,
-3310,16,0,237,1,
+3354,16,0,225,1,
 479,1663,1,480,1668,
-1,1485,3311,16,0,
-237,1,1737,3312,16,
-0,237,1,242,1681,
-1,478,1686,1,1001,
-1691,1,1002,1696,1,
-40,3313,19,227,1,
-40,3314,5,84,1,
-2767,3315,16,0,225,
-1,1011,1207,1,1012,
-3316,16,0,225,1,
-1013,1363,1,262,1224,
-1,1267,3317,16,0,
-225,1,515,3318,16,
-0,225,1,1521,3319,
-16,0,225,1,525,
-1321,1,283,1277,1,
-2299,3320,16,0,225,
-1,42,3321,16,0,
-225,1,40,1282,1,
-44,1288,1,47,1289,
-1,1303,3322,16,0,
-225,1,1555,3323,16,
-0,225,1,50,1306,
-1,48,1295,1,49,
-1301,1,51,1311,1,
-63,1327,1,305,1316,
-1,66,1333,1,67,
-1338,1,68,1343,1,
-69,1348,1,70,1353,
-1,73,3324,16,0,
-225,1,74,1358,1,
-328,1407,1,1048,1449,
-1,82,3325,16,0,
-225,1,1840,3326,16,
-0,225,1,1591,3327,
-16,0,225,1,1341,
-3328,16,0,225,1,
-1096,1417,1,93,1423,
-1,352,1454,1,107,
-3329,16,0,225,1,
-1114,1448,1,118,3330,
-16,0,225,1,1123,
-3331,16,0,225,1,
-371,1470,1,1628,3332,
-16,0,225,1,375,
-1481,1,1882,3333,16,
-0,225,1,377,1486,
-1,379,1491,1,380,
-1496,1,883,3334,16,
-0,225,1,373,1514,
-1,130,3335,16,0,
-225,1,143,3336,16,
-0,225,1,387,3337,
-16,0,225,1,1159,
-3338,16,0,225,1,
-157,3339,16,0,225,
-1,1413,3340,16,0,
-225,1,1665,3341,16,
-0,225,1,412,3342,
-16,0,225,1,1377,
-3343,16,0,225,1,
-172,3344,16,0,225,
-1,1939,3345,16,0,
-225,1,437,3346,16,
-0,225,1,188,3347,
-16,0,225,1,942,
-1594,1,1195,3348,16,
-0,225,1,1449,3349,
-16,0,225,1,1701,
-3350,16,0,225,1,
-447,1615,1,205,3351,
-16,0,225,1,827,
-3352,16,0,225,1,
-223,3353,16,0,225,
-1,476,1647,1,477,
-1653,1,1231,3354,16,
-0,225,1,479,1663,
-1,480,1668,1,1485,
-3355,16,0,225,1,
-1737,3356,16,0,225,
-1,242,3357,16,0,
-225,1,478,1686,1,
-1001,1691,1,1002,1696,
-1,41,3358,19,187,
-1,41,3359,5,84,
-1,2767,3360,16,0,
-185,1,1011,1207,1,
-1012,3361,16,0,185,
-1,1013,1363,1,262,
-1224,1,1267,3362,16,
-0,185,1,515,3363,
-16,0,185,1,1521,
-3364,16,0,185,1,
-525,1321,1,283,1277,
-1,2299,3365,16,0,
-185,1,42,3366,16,
-0,185,1,40,1282,
-1,44,1288,1,47,
-1289,1,1303,3367,16,
-0,185,1,1555,3368,
-16,0,185,1,50,
-1306,1,48,1295,1,
-49,1301,1,51,1311,
-1,63,1327,1,305,
-1316,1,66,1333,1,
-67,1338,1,68,1343,
-1,69,1348,1,70,
-1353,1,73,3369,16,
-0,185,1,74,1358,
-1,328,1407,1,1048,
-1449,1,82,3370,16,
-0,185,1,1840,3371,
-16,0,185,1,1591,
-3372,16,0,185,1,
-1341,3373,16,0,185,
-1,1096,1417,1,93,
-1423,1,352,1454,1,
-107,3374,16,0,185,
-1,1114,1448,1,118,
-3375,16,0,185,1,
-1123,3376,16,0,185,
-1,371,1470,1,1628,
-3377,16,0,185,1,
-375,1481,1,1882,3378,
-16,0,185,1,377,
-1486,1,379,1491,1,
-380,1496,1,883,3379,
-16,0,185,1,373,
-1514,1,130,3380,16,
-0,185,1,143,3381,
-16,0,185,1,387,
-3382,16,0,185,1,
-1159,3383,16,0,185,
-1,157,3384,16,0,
-185,1,1413,3385,16,
-0,185,1,1665,3386,
-16,0,185,1,412,
-3387,16,0,185,1,
-1377,3388,16,0,185,
-1,172,3389,16,0,
-185,1,1939,3390,16,
-0,185,1,437,3391,
-16,0,185,1,188,
-3392,16,0,185,1,
-942,1594,1,1195,3393,
-16,0,185,1,1449,
-3394,16,0,185,1,
-1701,3395,16,0,185,
-1,447,1615,1,205,
-3396,16,0,185,1,
-827,3397,16,0,185,
-1,223,3398,16,0,
-185,1,476,1647,1,
-477,1653,1,1231,3399,
-16,0,185,1,479,
-1663,1,480,1668,1,
-1485,3400,16,0,185,
-1,1737,3401,16,0,
-185,1,242,3402,16,
-0,185,1,478,1686,
-1,1001,1691,1,1002,
-1696,1,42,3403,19,
-427,1,42,3404,5,
-38,1,1901,3405,16,
-0,425,1,2075,3406,
-16,0,425,1,1860,
+1,1485,3355,16,0,
+225,1,1737,3356,16,
+0,225,1,242,3357,
+16,0,225,1,478,
+1686,1,1001,1691,1,
+1002,1696,1,41,3358,
+19,187,1,41,3359,
+5,84,1,2767,3360,
+16,0,185,1,1011,
+1207,1,1012,3361,16,
+0,185,1,1013,1363,
+1,262,1224,1,1267,
+3362,16,0,185,1,
+515,3363,16,0,185,
+1,1521,3364,16,0,
+185,1,525,1321,1,
+283,1277,1,2299,3365,
+16,0,185,1,42,
+3366,16,0,185,1,
+40,1282,1,44,1288,
+1,47,1289,1,1303,
+3367,16,0,185,1,
+1555,3368,16,0,185,
+1,50,1306,1,48,
+1295,1,49,1301,1,
+51,1311,1,63,1327,
+1,305,1316,1,66,
+1333,1,67,1338,1,
+68,1343,1,69,1348,
+1,70,1353,1,73,
+3369,16,0,185,1,
+74,1358,1,328,1407,
+1,1048,1449,1,82,
+3370,16,0,185,1,
+1840,3371,16,0,185,
+1,1591,3372,16,0,
+185,1,1341,3373,16,
+0,185,1,1096,1417,
+1,93,1423,1,352,
+1454,1,107,3374,16,
+0,185,1,1114,1448,
+1,118,3375,16,0,
+185,1,1123,3376,16,
+0,185,1,371,1470,
+1,1628,3377,16,0,
+185,1,375,1481,1,
+1882,3378,16,0,185,
+1,377,1486,1,379,
+1491,1,380,1496,1,
+883,3379,16,0,185,
+1,373,1514,1,130,
+3380,16,0,185,1,
+143,3381,16,0,185,
+1,387,3382,16,0,
+185,1,1159,3383,16,
+0,185,1,157,3384,
+16,0,185,1,1413,
+3385,16,0,185,1,
+1665,3386,16,0,185,
+1,412,3387,16,0,
+185,1,1377,3388,16,
+0,185,1,172,3389,
+16,0,185,1,1939,
+3390,16,0,185,1,
+437,3391,16,0,185,
+1,188,3392,16,0,
+185,1,942,1594,1,
+1195,3393,16,0,185,
+1,1449,3394,16,0,
+185,1,1701,3395,16,
+0,185,1,447,1615,
+1,205,3396,16,0,
+185,1,827,3397,16,
+0,185,1,223,3398,
+16,0,185,1,476,
+1647,1,477,1653,1,
+1231,3399,16,0,185,
+1,479,1663,1,480,
+1668,1,1485,3400,16,
+0,185,1,1737,3401,
+16,0,185,1,242,
+3402,16,0,185,1,
+478,1686,1,1001,1691,
+1,1002,1696,1,42,
+3403,19,427,1,42,
+3404,5,38,1,1901,
+3405,16,0,425,1,
+2075,3406,16,0,425,
+1,1860,926,1,1803,
+892,1,1804,3407,16,
+0,425,1,2413,3408,
+16,0,425,1,2198,
+3409,16,0,425,1,
+1873,940,1,1657,998,
+1,1989,1020,1,1990,
+3410,16,0,425,1,
+1775,3411,16,0,425,
+1,32,3412,16,0,
+425,1,2105,919,1,
+2106,3413,16,0,425,
+1,2364,932,1,2227,
+1012,1,2337,3414,16,
+0,425,1,2021,823,
+1,2458,980,1,2459,
+986,1,2462,993,1,
+2136,947,1,2464,1003,
+1,2029,830,1,2030,
+836,1,2031,841,1,
+2032,846,1,2033,851,
+1,2035,857,1,2037,
+862,1,2039,867,1,
+1931,965,1,2041,873,
+1,2043,879,1,2045,
+884,1,1574,904,1,
+1958,3415,16,0,425,
+1,43,3416,19,521,
+1,43,3417,5,25,
+1,2035,857,1,2037,
+862,1,2039,867,1,
+2041,873,1,2227,1012,
+1,2043,879,1,1657,
+998,1,1860,926,1,
+2136,947,1,2021,823,
+1,2459,986,1,1574,
+904,1,2105,3418,16,
+0,676,1,1931,965,
+1,1873,940,1,2031,
+841,1,1803,892,1,
+1989,3419,16,0,519,
+1,2464,1003,1,2029,
+830,1,2030,836,1,
+2364,932,1,2032,846,
+1,2033,851,1,2045,
+884,1,44,3420,19,
+285,1,44,3421,5,
+38,1,1901,3422,16,
+0,283,1,2075,3423,
+16,0,283,1,1860,
 926,1,1803,892,1,
-1804,3407,16,0,425,
-1,2413,3408,16,0,
-425,1,2198,3409,16,
-0,425,1,1873,940,
+1804,3424,16,0,283,
+1,2413,3425,16,0,
+283,1,2198,3426,16,
+0,283,1,1873,940,
 1,1657,998,1,1989,
-1020,1,1990,3410,16,
-0,425,1,1775,3411,
-16,0,425,1,32,
-3412,16,0,425,1,
-2105,919,1,2106,3413,
-16,0,425,1,2364,
+1020,1,1990,3427,16,
+0,283,1,1775,3428,
+16,0,283,1,32,
+3429,16,0,283,1,
+2105,919,1,2106,3430,
+16,0,283,1,2364,
 932,1,2227,1012,1,
-2337,3414,16,0,425,
+2337,3431,16,0,283,
 1,2021,823,1,2458,
 980,1,2459,986,1,
 2462,993,1,2136,947,
@@ -9558,76 +9604,59 @@ public yyLSLSyntax
 2039,867,1,1931,965,
 1,2041,873,1,2043,
 879,1,2045,884,1,
-1574,904,1,1958,3415,
-16,0,425,1,43,
-3416,19,521,1,43,
-3417,5,25,1,2035,
-857,1,2037,862,1,
-2039,867,1,2041,873,
-1,2227,1012,1,2043,
-879,1,1657,998,1,
-1860,926,1,2136,947,
-1,2021,823,1,2459,
-986,1,1574,904,1,
-2105,3418,16,0,676,
-1,1931,965,1,1873,
-940,1,2031,841,1,
-1803,892,1,1989,3419,
-16,0,519,1,2464,
-1003,1,2029,830,1,
-2030,836,1,2364,932,
-1,2032,846,1,2033,
-851,1,2045,884,1,
-44,3420,19,285,1,
-44,3421,5,38,1,
-1901,3422,16,0,283,
-1,2075,3423,16,0,
-283,1,1860,926,1,
-1803,892,1,1804,3424,
-16,0,283,1,2413,
-3425,16,0,283,1,
-2198,3426,16,0,283,
-1,1873,940,1,1657,
-998,1,1989,1020,1,
-1990,3427,16,0,283,
-1,1775,3428,16,0,
-283,1,32,3429,16,
-0,283,1,2105,919,
-1,2106,3430,16,0,
-283,1,2364,932,1,
-2227,1012,1,2337,3431,
-16,0,283,1,2021,
-823,1,2458,980,1,
-2459,986,1,2462,993,
-1,2136,947,1,2464,
-1003,1,2029,830,1,
-2030,836,1,2031,841,
-1,2032,846,1,2033,
-851,1,2035,857,1,
-2037,862,1,2039,867,
-1,1931,965,1,2041,
-873,1,2043,879,1,
-2045,884,1,1574,904,
-1,1958,3432,16,0,
-283,1,45,3433,19,
-317,1,45,3434,5,
-39,1,1901,3435,16,
-0,346,1,2075,3436,
-16,0,346,1,1860,
+1574,904,1,1958,3432,
+16,0,283,1,45,
+3433,19,317,1,45,
+3434,5,39,1,1901,
+3435,16,0,346,1,
+2075,3436,16,0,346,
+1,1860,926,1,1803,
+892,1,1804,3437,16,
+0,346,1,2413,3438,
+16,0,346,1,2198,
+3439,16,0,346,1,
+1873,940,1,1657,998,
+1,1989,1020,1,1990,
+3440,16,0,346,1,
+1775,3441,16,0,346,
+1,32,3442,16,0,
+346,1,2105,919,1,
+2106,3443,16,0,346,
+1,2364,932,1,2227,
+1012,1,2337,3444,16,
+0,346,1,2021,823,
+1,2458,980,1,2459,
+986,1,2462,993,1,
+2136,947,1,2464,1003,
+1,2029,830,1,2030,
+836,1,2031,841,1,
+2032,846,1,2033,851,
+1,2035,857,1,2037,
+862,1,2039,867,1,
+1931,965,1,2041,873,
+1,2043,879,1,2045,
+884,1,1832,3445,16,
+0,315,1,1574,904,
+1,1958,3446,16,0,
+346,1,46,3447,19,
+775,1,46,3448,5,
+38,1,1901,3449,16,
+0,773,1,2075,3450,
+16,0,773,1,1860,
 926,1,1803,892,1,
-1804,3437,16,0,346,
-1,2413,3438,16,0,
-346,1,2198,3439,16,
-0,346,1,1873,940,
+1804,3451,16,0,773,
+1,2413,3452,16,0,
+773,1,2198,3453,16,
+0,773,1,1873,940,
 1,1657,998,1,1989,
-1020,1,1990,3440,16,
-0,346,1,1775,3441,
-16,0,346,1,32,
-3442,16,0,346,1,
-2105,919,1,2106,3443,
-16,0,346,1,2364,
+1020,1,1990,3454,16,
+0,773,1,1775,3455,
+16,0,773,1,32,
+3456,16,0,773,1,
+2105,919,1,2106,3457,
+16,0,773,1,2364,
 932,1,2227,1012,1,
-2337,3444,16,0,346,
+2337,3458,16,0,773,
 1,2021,823,1,2458,
 980,1,2459,986,1,
 2462,993,1,2136,947,
@@ -9639,83 +9668,119 @@ public yyLSLSyntax
 2039,867,1,1931,965,
 1,2041,873,1,2043,
 879,1,2045,884,1,
-1832,3445,16,0,315,
-1,1574,904,1,1958,
-3446,16,0,346,1,
-46,3447,19,775,1,
-46,3448,5,38,1,
-1901,3449,16,0,773,
-1,2075,3450,16,0,
-773,1,1860,926,1,
-1803,892,1,1804,3451,
-16,0,773,1,2413,
-3452,16,0,773,1,
-2198,3453,16,0,773,
-1,1873,940,1,1657,
-998,1,1989,1020,1,
-1990,3454,16,0,773,
-1,1775,3455,16,0,
-773,1,32,3456,16,
-0,773,1,2105,919,
-1,2106,3457,16,0,
-773,1,2364,932,1,
-2227,1012,1,2337,3458,
-16,0,773,1,2021,
-823,1,2458,980,1,
-2459,986,1,2462,993,
-1,2136,947,1,2464,
-1003,1,2029,830,1,
-2030,836,1,2031,841,
-1,2032,846,1,2033,
-851,1,2035,857,1,
-2037,862,1,2039,867,
-1,1931,965,1,2041,
-873,1,2043,879,1,
-2045,884,1,1574,904,
-1,1958,3459,16,0,
-773,1,47,3460,19,
-661,1,47,3461,5,
-19,1,0,3462,16,
-0,659,1,2739,3463,
-16,0,659,1,2816,
-3464,17,3465,15,3466,
-4,36,37,0,71,
+1574,904,1,1958,3459,
+16,0,773,1,47,
+3460,19,661,1,47,
+3461,5,19,1,0,
+3462,16,0,659,1,
+2739,3463,16,0,659,
+1,2816,3464,17,3465,
+15,3466,4,36,37,
+0,71,0,108,0,
+111,0,98,0,97,
+0,108,0,68,0,
+101,0,102,0,105,
+0,110,0,105,0,
+116,0,105,0,111,
+0,110,0,115,0,
+1,-1,1,5,3467,
+20,3468,4,38,71,
 0,108,0,111,0,
 98,0,97,0,108,
 0,68,0,101,0,
 102,0,105,0,110,
 0,105,0,116,0,
 105,0,111,0,110,
-0,115,0,1,-1,
-1,5,3467,20,3468,
-4,38,71,0,108,
-0,111,0,98,0,
-97,0,108,0,68,
-0,101,0,102,0,
-105,0,110,0,105,
-0,116,0,105,0,
-111,0,110,0,115,
-0,95,0,52,0,
-1,168,1,3,1,
-3,1,2,3469,22,
-1,6,1,2742,794,
-1,2743,800,1,2818,
-3470,17,3471,15,3466,
-1,-1,1,5,3472,
-20,3473,4,38,71,
-0,108,0,111,0,
-98,0,97,0,108,
+0,115,0,95,0,
+52,0,1,168,1,
+3,1,3,1,2,
+3469,22,1,6,1,
+2742,794,1,2743,800,
+1,2818,3470,17,3471,
+15,3466,1,-1,1,
+5,3472,20,3473,4,
+38,71,0,108,0,
+111,0,98,0,97,
+0,108,0,68,0,
+101,0,102,0,105,
+0,110,0,105,0,
+116,0,105,0,111,
+0,110,0,115,0,
+95,0,51,0,1,
+167,1,3,1,2,
+1,1,3474,22,1,
+5,1,2819,3475,17,
+3476,15,3466,1,-1,
+1,5,3477,20,3478,
+4,38,71,0,108,
+0,111,0,98,0,
+97,0,108,0,68,
+0,101,0,102,0,
+105,0,110,0,105,
+0,116,0,105,0,
+111,0,110,0,115,
+0,95,0,49,0,
+1,165,1,3,1,
+2,1,1,3479,22,
+1,3,1,2786,3480,
+17,3481,15,3482,4,
+52,37,0,71,0,
+108,0,111,0,98,
+0,97,0,108,0,
+86,0,97,0,114,
+0,105,0,97,0,
+98,0,108,0,101,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,1,-1,
+1,5,3483,20,3484,
+4,54,71,0,108,
+0,111,0,98,0,
+97,0,108,0,86,
+0,97,0,114,0,
+105,0,97,0,98,
+0,108,0,101,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,95,0,50,
+0,1,170,1,3,
+1,5,1,4,3485,
+22,1,8,1,2022,
+3486,16,0,666,1,
+2459,986,1,2758,3487,
+17,3488,15,3489,4,
+50,37,0,71,0,
+108,0,111,0,98,
+0,97,0,108,0,
+70,0,117,0,110,
+0,99,0,116,0,
+105,0,111,0,110,
 0,68,0,101,0,
 102,0,105,0,110,
 0,105,0,116,0,
 105,0,111,0,110,
-0,115,0,95,0,
-51,0,1,167,1,
-3,1,2,1,1,
-3474,22,1,5,1,
-2819,3475,17,3476,15,
+0,1,-1,1,5,
+3490,20,3491,4,52,
+71,0,108,0,111,
+0,98,0,97,0,
+108,0,70,0,117,
+0,110,0,99,0,
+116,0,105,0,111,
+0,110,0,68,0,
+101,0,102,0,105,
+0,110,0,105,0,
+116,0,105,0,111,
+0,110,0,95,0,
+49,0,1,171,1,
+3,1,6,1,5,
+3492,22,1,9,1,
+2817,3493,17,3494,15,
 3466,1,-1,1,5,
-3477,20,3478,4,38,
+3495,20,3496,4,38,
 71,0,108,0,111,
 0,98,0,97,0,
 108,0,68,0,101,
@@ -9723,12 +9788,13 @@ public yyLSLSyntax
 110,0,105,0,116,
 0,105,0,111,0,
 110,0,115,0,95,
-0,49,0,1,165,
-1,3,1,2,1,
-1,3479,22,1,3,
-1,2786,3480,17,3481,
-15,3482,4,52,37,
-0,71,0,108,0,
+0,50,0,1,166,
+1,3,1,3,1,
+2,3497,22,1,4,
+1,2797,3498,17,3499,
+15,3482,1,-1,1,
+5,3500,20,3501,4,
+54,71,0,108,0,
 111,0,98,0,97,
 0,108,0,86,0,
 97,0,114,0,105,
@@ -9738,193 +9804,92 @@ public yyLSLSyntax
 108,0,97,0,114,
 0,97,0,116,0,
 105,0,111,0,110,
-0,1,-1,1,5,
-3483,20,3484,4,54,
-71,0,108,0,111,
-0,98,0,97,0,
-108,0,86,0,97,
-0,114,0,105,0,
-97,0,98,0,108,
-0,101,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-95,0,50,0,1,
-170,1,3,1,5,
-1,4,3485,22,1,
-8,1,2022,3486,16,
-0,666,1,2459,986,
-1,2758,3487,17,3488,
-15,3489,4,50,37,
-0,71,0,108,0,
-111,0,98,0,97,
-0,108,0,70,0,
-117,0,110,0,99,
-0,116,0,105,0,
-111,0,110,0,68,
-0,101,0,102,0,
-105,0,110,0,105,
-0,116,0,105,0,
-111,0,110,0,1,
--1,1,5,3490,20,
-3491,4,52,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
-70,0,117,0,110,
-0,99,0,116,0,
-105,0,111,0,110,
-0,68,0,101,0,
-102,0,105,0,110,
-0,105,0,116,0,
-105,0,111,0,110,
 0,95,0,49,0,
-1,171,1,3,1,
-6,1,5,3492,22,
-1,9,1,2817,3493,
-17,3494,15,3466,1,
--1,1,5,3495,20,
-3496,4,38,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
-68,0,101,0,102,
-0,105,0,110,0,
-105,0,116,0,105,
-0,111,0,110,0,
-115,0,95,0,50,
-0,1,166,1,3,
-1,3,1,2,3497,
-22,1,4,1,2797,
-3498,17,3499,15,3482,
-1,-1,1,5,3500,
-20,3501,4,54,71,
+1,169,1,3,1,
+3,1,2,3502,22,
+1,7,1,2798,3503,
+16,0,659,1,2466,
+3504,17,3505,15,3489,
+1,-1,1,5,3506,
+20,3507,4,52,71,
 0,108,0,111,0,
 98,0,97,0,108,
-0,86,0,97,0,
-114,0,105,0,97,
-0,98,0,108,0,
-101,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,95,
-0,49,0,1,169,
-1,3,1,3,1,
-2,3502,22,1,7,
-1,2798,3503,16,0,
-659,1,2466,3504,17,
-3505,15,3489,1,-1,
-1,5,3506,20,3507,
-4,52,71,0,108,
-0,111,0,98,0,
-97,0,108,0,70,
-0,117,0,110,0,
-99,0,116,0,105,
-0,111,0,110,0,
-68,0,101,0,102,
-0,105,0,110,0,
-105,0,116,0,105,
-0,111,0,110,0,
-95,0,50,0,1,
-172,1,3,1,7,
-1,6,3508,22,1,
-10,1,2631,805,1,
-2464,1003,1,2731,811,
-1,2809,3509,16,0,
-659,1,48,3510,19,
-372,1,48,3511,5,
-54,1,0,3512,16,
-0,370,1,2075,3513,
-16,0,571,1,2731,
-811,1,1860,926,1,
-1804,3514,16,0,571,
-1,1901,3515,16,0,
-571,1,2739,3516,16,
-0,370,1,2413,3517,
-16,0,571,1,2742,
-794,1,2743,800,1,
-1873,940,1,1657,998,
-1,2030,836,1,1989,
-1020,1,1990,3518,16,
-0,571,1,2035,857,
-1,2459,986,1,1775,
-3519,16,0,571,1,
-32,3520,16,0,571,
-1,2758,3487,1,2105,
-919,1,2106,3521,16,
-0,571,1,2227,1012,
-1,2337,3522,16,0,
-571,1,1803,892,1,
-2458,980,1,2786,3480,
-1,2462,993,1,2136,
-947,1,2464,1003,1,
-2029,830,1,2466,3504,
-1,2031,841,1,2032,
-846,1,2033,851,1,
-2797,3498,1,2798,3523,
-16,0,370,1,2631,
-805,1,2364,932,1,
-2039,867,1,1931,965,
-1,2041,873,1,2021,
-823,1,2043,879,1,
-2045,884,1,2809,3524,
-16,0,370,1,2198,
-3525,16,0,571,1,
-2816,3464,1,2817,3493,
-1,2818,3470,1,2819,
-3475,1,2037,862,1,
-1574,904,1,1958,3526,
-16,0,571,1,49,
-3527,19,576,1,49,
-3528,5,38,1,1901,
-3529,16,0,574,1,
-2075,3530,16,0,574,
-1,1860,926,1,1803,
-892,1,1804,3531,16,
-0,574,1,2413,3532,
-16,0,574,1,2198,
-3533,16,0,574,1,
-1873,940,1,1657,998,
+0,70,0,117,0,
+110,0,99,0,116,
+0,105,0,111,0,
+110,0,68,0,101,
+0,102,0,105,0,
+110,0,105,0,116,
+0,105,0,111,0,
+110,0,95,0,50,
+0,1,172,1,3,
+1,7,1,6,3508,
+22,1,10,1,2631,
+805,1,2464,1003,1,
+2731,811,1,2809,3509,
+16,0,659,1,48,
+3510,19,372,1,48,
+3511,5,54,1,0,
+3512,16,0,370,1,
+2075,3513,16,0,571,
+1,2731,811,1,1860,
+926,1,1804,3514,16,
+0,571,1,1901,3515,
+16,0,571,1,2739,
+3516,16,0,370,1,
+2413,3517,16,0,571,
+1,2742,794,1,2743,
+800,1,1873,940,1,
+1657,998,1,2030,836,
 1,1989,1020,1,1990,
-3534,16,0,574,1,
-1775,3535,16,0,574,
-1,32,3536,16,0,
-574,1,2105,919,1,
-2106,3537,16,0,574,
-1,2364,932,1,2227,
-1012,1,2337,3538,16,
-0,574,1,2021,823,
-1,2458,980,1,2459,
-986,1,2462,993,1,
-2136,947,1,2464,1003,
-1,2029,830,1,2030,
-836,1,2031,841,1,
-2032,846,1,2033,851,
-1,2035,857,1,2037,
-862,1,2039,867,1,
+3518,16,0,571,1,
+2035,857,1,2459,986,
+1,1775,3519,16,0,
+571,1,32,3520,16,
+0,571,1,2758,3487,
+1,2105,919,1,2106,
+3521,16,0,571,1,
+2227,1012,1,2337,3522,
+16,0,571,1,1803,
+892,1,2458,980,1,
+2786,3480,1,2462,993,
+1,2136,947,1,2464,
+1003,1,2029,830,1,
+2466,3504,1,2031,841,
+1,2032,846,1,2033,
+851,1,2797,3498,1,
+2798,3523,16,0,370,
+1,2631,805,1,2364,
+932,1,2039,867,1,
 1931,965,1,2041,873,
-1,2043,879,1,2045,
-884,1,1574,904,1,
-1958,3539,16,0,574,
-1,50,3540,19,707,
-1,50,3541,5,38,
-1,1901,3542,16,0,
-705,1,2075,3543,16,
-0,705,1,1860,926,
+1,2021,823,1,2043,
+879,1,2045,884,1,
+2809,3524,16,0,370,
+1,2198,3525,16,0,
+571,1,2816,3464,1,
+2817,3493,1,2818,3470,
+1,2819,3475,1,2037,
+862,1,1574,904,1,
+1958,3526,16,0,571,
+1,49,3527,19,576,
+1,49,3528,5,38,
+1,1901,3529,16,0,
+574,1,2075,3530,16,
+0,574,1,1860,926,
 1,1803,892,1,1804,
-3544,16,0,705,1,
-2413,3545,16,0,705,
-1,2198,3546,16,0,
-705,1,1873,940,1,
+3531,16,0,574,1,
+2413,3532,16,0,574,
+1,2198,3533,16,0,
+574,1,1873,940,1,
 1657,998,1,1989,1020,
-1,1990,3547,16,0,
-705,1,1775,3548,16,
-0,705,1,32,3549,
-16,0,705,1,2105,
-919,1,2106,3550,16,
-0,705,1,2364,932,
+1,1990,3534,16,0,
+574,1,1775,3535,16,
+0,574,1,32,3536,
+16,0,574,1,2105,
+919,1,2106,3537,16,
+0,574,1,2364,932,
 1,2227,1012,1,2337,
-3551,16,0,705,1,
+3538,16,0,574,1,
 2021,823,1,2458,980,
 1,2459,986,1,2462,
 993,1,2136,947,1,
@@ -9936,90 +9901,166 @@ public yyLSLSyntax
 867,1,1931,965,1,
 2041,873,1,2043,879,
 1,2045,884,1,1574,
-904,1,1958,3552,16,
-0,705,1,51,3553,
-19,127,1,51,3554,
-5,56,1,0,3555,
-16,0,125,1,2075,
-3556,16,0,125,1,
-1860,926,1,10,3557,
-16,0,125,1,2758,
-3487,1,1901,3558,16,
-0,125,1,2413,3559,
-16,0,125,1,2198,
-3560,16,0,125,1,
-1873,940,1,21,3561,
-16,0,125,1,1657,
-998,1,2030,836,1,
-1989,1020,1,1990,3562,
-16,0,125,1,2458,
-980,1,2459,986,1,
-1775,3563,16,0,125,
-1,32,3564,16,0,
-125,1,2567,3565,16,
-0,125,1,2105,919,
-1,2106,3566,16,0,
-125,1,2545,3567,16,
-0,467,1,2227,1012,
-1,2337,3568,16,0,
-125,1,2035,857,1,
-52,3569,16,0,125,
-1,1803,892,1,1804,
-3570,16,0,125,1,
-2786,3480,1,2462,993,
-1,2136,947,1,2464,
-1003,1,2029,830,1,
-2466,3504,1,2031,841,
-1,2032,846,1,2033,
-851,1,2797,3498,1,
-2798,3571,16,0,125,
-1,2364,932,1,2039,
-867,1,1931,965,1,
-2041,873,1,2021,823,
-1,2043,879,1,2045,
-884,1,2816,3464,1,
-2817,3493,1,2818,3470,
-1,2819,3475,1,2522,
-3572,16,0,467,1,
-2037,862,1,1574,904,
-1,1958,3573,16,0,
-125,1,2745,3574,16,
-0,125,1,2506,3575,
-16,0,467,1,52,
-3576,19,124,1,52,
-3577,5,53,1,0,
-3578,16,0,122,1,
-2075,3579,16,0,122,
+904,1,1958,3539,16,
+0,574,1,50,3540,
+19,707,1,50,3541,
+5,38,1,1901,3542,
+16,0,705,1,2075,
+3543,16,0,705,1,
+1860,926,1,1803,892,
+1,1804,3544,16,0,
+705,1,2413,3545,16,
+0,705,1,2198,3546,
+16,0,705,1,1873,
+940,1,1657,998,1,
+1989,1020,1,1990,3547,
+16,0,705,1,1775,
+3548,16,0,705,1,
+32,3549,16,0,705,
+1,2105,919,1,2106,
+3550,16,0,705,1,
+2364,932,1,2227,1012,
+1,2337,3551,16,0,
+705,1,2021,823,1,
+2458,980,1,2459,986,
+1,2462,993,1,2136,
+947,1,2464,1003,1,
+2029,830,1,2030,836,
+1,2031,841,1,2032,
+846,1,2033,851,1,
+2035,857,1,2037,862,
+1,2039,867,1,1931,
+965,1,2041,873,1,
+2043,879,1,2045,884,
+1,1574,904,1,1958,
+3552,16,0,705,1,
+51,3553,19,127,1,
+51,3554,5,56,1,
+0,3555,16,0,125,
+1,2075,3556,16,0,
+125,1,1860,926,1,
+10,3557,16,0,125,
+1,2758,3487,1,1901,
+3558,16,0,125,1,
+2413,3559,16,0,125,
+1,2198,3560,16,0,
+125,1,1873,940,1,
+21,3561,16,0,125,
+1,1657,998,1,2030,
+836,1,1989,1020,1,
+1990,3562,16,0,125,
+1,2458,980,1,2459,
+986,1,1775,3563,16,
+0,125,1,32,3564,
+16,0,125,1,2567,
+3565,16,0,125,1,
+2105,919,1,2106,3566,
+16,0,125,1,2545,
+3567,16,0,467,1,
+2227,1012,1,2337,3568,
+16,0,125,1,2035,
+857,1,52,3569,16,
+0,125,1,1803,892,
+1,1804,3570,16,0,
+125,1,2786,3480,1,
+2462,993,1,2136,947,
+1,2464,1003,1,2029,
+830,1,2466,3504,1,
+2031,841,1,2032,846,
+1,2033,851,1,2797,
+3498,1,2798,3571,16,
+0,125,1,2364,932,
+1,2039,867,1,1931,
+965,1,2041,873,1,
+2021,823,1,2043,879,
+1,2045,884,1,2816,
+3464,1,2817,3493,1,
+2818,3470,1,2819,3475,
+1,2522,3572,16,0,
+467,1,2037,862,1,
+1574,904,1,1958,3573,
+16,0,125,1,2745,
+3574,16,0,125,1,
+2506,3575,16,0,467,
+1,52,3576,19,124,
+1,52,3577,5,53,
+1,0,3578,16,0,
+122,1,2075,3579,16,
+0,122,1,1860,926,
+1,10,3580,16,0,
+122,1,2758,3487,1,
+1901,3581,16,0,122,
+1,2413,3582,16,0,
+122,1,2198,3583,16,
+0,122,1,1873,940,
+1,21,3584,16,0,
+122,1,1657,998,1,
+2030,836,1,1989,1020,
+1,1990,3585,16,0,
+122,1,2458,980,1,
+2459,986,1,1775,3586,
+16,0,122,1,32,
+3587,16,0,122,1,
+2567,3588,16,0,122,
+1,2105,919,1,2106,
+3589,16,0,122,1,
+2227,1012,1,2337,3590,
+16,0,122,1,2035,
+857,1,52,3591,16,
+0,122,1,1803,892,
+1,1804,3592,16,0,
+122,1,2786,3480,1,
+2462,993,1,2136,947,
+1,2464,1003,1,2029,
+830,1,2466,3504,1,
+2031,841,1,2032,846,
+1,2033,851,1,2797,
+3498,1,2798,3593,16,
+0,122,1,2364,932,
+1,2039,867,1,1931,
+965,1,2041,873,1,
+2021,823,1,2043,879,
+1,2045,884,1,2816,
+3464,1,2817,3493,1,
+2818,3470,1,2819,3475,
+1,2037,862,1,1574,
+904,1,1958,3594,16,
+0,122,1,2745,3595,
+16,0,122,1,53,
+3596,19,121,1,53,
+3597,5,53,1,0,
+3598,16,0,119,1,
+2075,3599,16,0,119,
 1,1860,926,1,10,
-3580,16,0,122,1,
-2758,3487,1,1901,3581,
-16,0,122,1,2413,
-3582,16,0,122,1,
-2198,3583,16,0,122,
+3600,16,0,119,1,
+2758,3487,1,1901,3601,
+16,0,119,1,2413,
+3602,16,0,119,1,
+2198,3603,16,0,119,
 1,1873,940,1,21,
-3584,16,0,122,1,
+3604,16,0,119,1,
 1657,998,1,2030,836,
 1,1989,1020,1,1990,
-3585,16,0,122,1,
+3605,16,0,119,1,
 2458,980,1,2459,986,
-1,1775,3586,16,0,
-122,1,32,3587,16,
-0,122,1,2567,3588,
-16,0,122,1,2105,
-919,1,2106,3589,16,
-0,122,1,2227,1012,
-1,2337,3590,16,0,
-122,1,2035,857,1,
-52,3591,16,0,122,
+1,1775,3606,16,0,
+119,1,32,3607,16,
+0,119,1,2567,3608,
+16,0,119,1,2105,
+919,1,2106,3609,16,
+0,119,1,2227,1012,
+1,2337,3610,16,0,
+119,1,2035,857,1,
+52,3611,16,0,119,
 1,1803,892,1,1804,
-3592,16,0,122,1,
+3612,16,0,119,1,
 2786,3480,1,2462,993,
 1,2136,947,1,2464,
 1003,1,2029,830,1,
 2466,3504,1,2031,841,
 1,2032,846,1,2033,
 851,1,2797,3498,1,
-2798,3593,16,0,122,
+2798,3613,16,0,119,
 1,2364,932,1,2039,
 867,1,1931,965,1,
 2041,873,1,2021,823,
@@ -10028,43 +10069,184 @@ public yyLSLSyntax
 2817,3493,1,2818,3470,
 1,2819,3475,1,2037,
 862,1,1574,904,1,
-1958,3594,16,0,122,
-1,2745,3595,16,0,
-122,1,53,3596,19,
-121,1,53,3597,5,
-53,1,0,3598,16,
-0,119,1,2075,3599,
-16,0,119,1,1860,
-926,1,10,3600,16,
-0,119,1,2758,3487,
-1,1901,3601,16,0,
-119,1,2413,3602,16,
-0,119,1,2198,3603,
-16,0,119,1,1873,
-940,1,21,3604,16,
-0,119,1,1657,998,
+1958,3614,16,0,119,
+1,2745,3615,16,0,
+119,1,54,3616,19,
+118,1,54,3617,5,
+54,1,0,3618,16,
+0,116,1,2075,3619,
+16,0,116,1,1860,
+926,1,10,3620,16,
+0,116,1,2758,3487,
+1,1901,3621,16,0,
+116,1,2413,3622,16,
+0,116,1,2198,3623,
+16,0,116,1,1873,
+940,1,21,3624,16,
+0,116,1,1657,998,
+1,2030,836,1,1989,
+1020,1,1990,3625,16,
+0,116,1,2458,980,
+1,2459,986,1,1775,
+3626,16,0,116,1,
+32,3627,16,0,116,
+1,2567,3628,16,0,
+116,1,2105,919,1,
+2106,3629,16,0,116,
+1,2553,3630,16,0,
+732,1,2227,1012,1,
+2337,3631,16,0,116,
+1,2035,857,1,52,
+3632,16,0,116,1,
+1803,892,1,1804,3633,
+16,0,116,1,2786,
+3480,1,2462,993,1,
+2136,947,1,2464,1003,
+1,2029,830,1,2466,
+3504,1,2031,841,1,
+2032,846,1,2033,851,
+1,2797,3498,1,2798,
+3634,16,0,116,1,
+2364,932,1,2039,867,
+1,1931,965,1,2041,
+873,1,2021,823,1,
+2043,879,1,2045,884,
+1,2816,3464,1,2817,
+3493,1,2818,3470,1,
+2819,3475,1,2037,862,
+1,1574,904,1,1958,
+3635,16,0,116,1,
+2745,3636,16,0,116,
+1,55,3637,19,115,
+1,55,3638,5,56,
+1,0,3639,16,0,
+113,1,2537,3640,16,
+0,684,1,2510,3641,
+16,0,684,1,2075,
+3642,16,0,113,1,
+1860,926,1,10,3643,
+16,0,113,1,2758,
+3487,1,1901,3644,16,
+0,113,1,2413,3645,
+16,0,113,1,2198,
+3646,16,0,113,1,
+1873,940,1,21,3647,
+16,0,113,1,1657,
+998,1,2030,836,1,
+1989,1020,1,1990,3648,
+16,0,113,1,2458,
+980,1,2459,986,1,
+1775,3649,16,0,113,
+1,32,3650,16,0,
+113,1,2567,3651,16,
+0,113,1,2105,919,
+1,2106,3652,16,0,
+113,1,2227,1012,1,
+2337,3653,16,0,113,
+1,2035,857,1,52,
+3654,16,0,113,1,
+1803,892,1,1804,3655,
+16,0,113,1,2786,
+3480,1,2462,993,1,
+2136,947,1,2464,1003,
+1,2029,830,1,2466,
+3504,1,2031,841,1,
+2032,846,1,2033,851,
+1,2797,3498,1,2798,
+3656,16,0,113,1,
+2364,932,1,2039,867,
+1,1931,965,1,2041,
+873,1,2021,823,1,
+2043,879,1,2045,884,
+1,2514,3657,16,0,
+684,1,2816,3464,1,
+2817,3493,1,2818,3470,
+1,2819,3475,1,2037,
+862,1,1574,904,1,
+1958,3658,16,0,113,
+1,2745,3659,16,0,
+113,1,56,3660,19,
+112,1,56,3661,5,
+55,1,0,3662,16,
+0,110,1,2075,3663,
+16,0,110,1,1860,
+926,1,10,3664,16,
+0,110,1,2758,3487,
+1,1901,3665,16,0,
+110,1,2413,3666,16,
+0,110,1,2525,3667,
+16,0,491,1,1657,
+998,1,1873,940,1,
+21,3668,16,0,110,
+1,2529,3669,16,0,
+491,1,2030,836,1,
+1989,1020,1,1990,3670,
+16,0,110,1,2458,
+980,1,2459,986,1,
+1775,3671,16,0,110,
+1,32,3672,16,0,
+110,1,2567,3673,16,
+0,110,1,2105,919,
+1,2106,3674,16,0,
+110,1,2227,1012,1,
+2337,3675,16,0,110,
+1,2035,857,1,52,
+3676,16,0,110,1,
+1803,892,1,1804,3677,
+16,0,110,1,2786,
+3480,1,2462,993,1,
+2136,947,1,2464,1003,
+1,2029,830,1,2466,
+3504,1,2031,841,1,
+2032,846,1,2033,851,
+1,2797,3498,1,2798,
+3678,16,0,110,1,
+2364,932,1,2039,867,
+1,1931,965,1,2041,
+873,1,2021,823,1,
+2043,879,1,2045,884,
+1,2198,3679,16,0,
+110,1,2816,3464,1,
+2817,3493,1,2818,3470,
+1,2819,3475,1,2037,
+862,1,1574,904,1,
+1958,3680,16,0,110,
+1,2745,3681,16,0,
+110,1,57,3682,19,
+109,1,57,3683,5,
+53,1,0,3684,16,
+0,107,1,2075,3685,
+16,0,107,1,1860,
+926,1,10,3686,16,
+0,107,1,2758,3487,
+1,1901,3687,16,0,
+107,1,2413,3688,16,
+0,107,1,2198,3689,
+16,0,107,1,1873,
+940,1,21,3690,16,
+0,107,1,1657,998,
 1,2030,836,1,1989,
-1020,1,1990,3605,16,
-0,119,1,2458,980,
+1020,1,1990,3691,16,
+0,107,1,2458,980,
 1,2459,986,1,1775,
-3606,16,0,119,1,
-32,3607,16,0,119,
-1,2567,3608,16,0,
-119,1,2105,919,1,
-2106,3609,16,0,119,
+3692,16,0,107,1,
+32,3693,16,0,107,
+1,2567,3694,16,0,
+107,1,2105,919,1,
+2106,3695,16,0,107,
 1,2227,1012,1,2337,
-3610,16,0,119,1,
-2035,857,1,52,3611,
-16,0,119,1,1803,
-892,1,1804,3612,16,
-0,119,1,2786,3480,
+3696,16,0,107,1,
+2035,857,1,52,3697,
+16,0,107,1,1803,
+892,1,1804,3698,16,
+0,107,1,2786,3480,
 1,2462,993,1,2136,
 947,1,2464,1003,1,
 2029,830,1,2466,3504,
 1,2031,841,1,2032,
 846,1,2033,851,1,
-2797,3498,1,2798,3613,
-16,0,119,1,2364,
+2797,3498,1,2798,3699,
+16,0,107,1,2364,
 932,1,2039,867,1,
 1931,965,1,2041,873,
 1,2021,823,1,2043,
@@ -10072,196 +10254,31 @@ public yyLSLSyntax
 2816,3464,1,2817,3493,
 1,2818,3470,1,2819,
 3475,1,2037,862,1,
-1574,904,1,1958,3614,
-16,0,119,1,2745,
-3615,16,0,119,1,
-54,3616,19,118,1,
-54,3617,5,54,1,
-0,3618,16,0,116,
-1,2075,3619,16,0,
-116,1,1860,926,1,
-10,3620,16,0,116,
-1,2758,3487,1,1901,
-3621,16,0,116,1,
-2413,3622,16,0,116,
-1,2198,3623,16,0,
-116,1,1873,940,1,
-21,3624,16,0,116,
-1,1657,998,1,2030,
-836,1,1989,1020,1,
-1990,3625,16,0,116,
-1,2458,980,1,2459,
-986,1,1775,3626,16,
-0,116,1,32,3627,
-16,0,116,1,2567,
-3628,16,0,116,1,
-2105,919,1,2106,3629,
-16,0,116,1,2553,
-3630,16,0,732,1,
-2227,1012,1,2337,3631,
-16,0,116,1,2035,
-857,1,52,3632,16,
-0,116,1,1803,892,
-1,1804,3633,16,0,
-116,1,2786,3480,1,
-2462,993,1,2136,947,
-1,2464,1003,1,2029,
-830,1,2466,3504,1,
-2031,841,1,2032,846,
-1,2033,851,1,2797,
-3498,1,2798,3634,16,
-0,116,1,2364,932,
-1,2039,867,1,1931,
-965,1,2041,873,1,
-2021,823,1,2043,879,
-1,2045,884,1,2816,
-3464,1,2817,3493,1,
-2818,3470,1,2819,3475,
-1,2037,862,1,1574,
-904,1,1958,3635,16,
-0,116,1,2745,3636,
-16,0,116,1,55,
-3637,19,115,1,55,
-3638,5,56,1,0,
-3639,16,0,113,1,
-2537,3640,16,0,684,
-1,2510,3641,16,0,
-684,1,2075,3642,16,
-0,113,1,1860,926,
-1,10,3643,16,0,
-113,1,2758,3487,1,
-1901,3644,16,0,113,
-1,2413,3645,16,0,
-113,1,2198,3646,16,
-0,113,1,1873,940,
-1,21,3647,16,0,
-113,1,1657,998,1,
-2030,836,1,1989,1020,
-1,1990,3648,16,0,
-113,1,2458,980,1,
-2459,986,1,1775,3649,
-16,0,113,1,32,
-3650,16,0,113,1,
-2567,3651,16,0,113,
-1,2105,919,1,2106,
-3652,16,0,113,1,
-2227,1012,1,2337,3653,
-16,0,113,1,2035,
-857,1,52,3654,16,
-0,113,1,1803,892,
-1,1804,3655,16,0,
-113,1,2786,3480,1,
-2462,993,1,2136,947,
-1,2464,1003,1,2029,
-830,1,2466,3504,1,
-2031,841,1,2032,846,
-1,2033,851,1,2797,
-3498,1,2798,3656,16,
-0,113,1,2364,932,
-1,2039,867,1,1931,
-965,1,2041,873,1,
-2021,823,1,2043,879,
-1,2045,884,1,2514,
-3657,16,0,684,1,
-2816,3464,1,2817,3493,
-1,2818,3470,1,2819,
-3475,1,2037,862,1,
-1574,904,1,1958,3658,
-16,0,113,1,2745,
-3659,16,0,113,1,
-56,3660,19,112,1,
-56,3661,5,55,1,
-0,3662,16,0,110,
-1,2075,3663,16,0,
-110,1,1860,926,1,
-10,3664,16,0,110,
-1,2758,3487,1,1901,
-3665,16,0,110,1,
-2413,3666,16,0,110,
-1,2525,3667,16,0,
-491,1,1657,998,1,
-1873,940,1,21,3668,
-16,0,110,1,2529,
-3669,16,0,491,1,
-2030,836,1,1989,1020,
-1,1990,3670,16,0,
-110,1,2458,980,1,
-2459,986,1,1775,3671,
-16,0,110,1,32,
-3672,16,0,110,1,
-2567,3673,16,0,110,
-1,2105,919,1,2106,
-3674,16,0,110,1,
-2227,1012,1,2337,3675,
-16,0,110,1,2035,
-857,1,52,3676,16,
-0,110,1,1803,892,
-1,1804,3677,16,0,
-110,1,2786,3480,1,
-2462,993,1,2136,947,
-1,2464,1003,1,2029,
-830,1,2466,3504,1,
-2031,841,1,2032,846,
-1,2033,851,1,2797,
-3498,1,2798,3678,16,
-0,110,1,2364,932,
-1,2039,867,1,1931,
-965,1,2041,873,1,
-2021,823,1,2043,879,
-1,2045,884,1,2198,
-3679,16,0,110,1,
-2816,3464,1,2817,3493,
-1,2818,3470,1,2819,
-3475,1,2037,862,1,
-1574,904,1,1958,3680,
-16,0,110,1,2745,
-3681,16,0,110,1,
-57,3682,19,109,1,
-57,3683,5,53,1,
-0,3684,16,0,107,
-1,2075,3685,16,0,
-107,1,1860,926,1,
-10,3686,16,0,107,
-1,2758,3487,1,1901,
-3687,16,0,107,1,
-2413,3688,16,0,107,
-1,2198,3689,16,0,
-107,1,1873,940,1,
-21,3690,16,0,107,
-1,1657,998,1,2030,
-836,1,1989,1020,1,
-1990,3691,16,0,107,
-1,2458,980,1,2459,
-986,1,1775,3692,16,
-0,107,1,32,3693,
-16,0,107,1,2567,
-3694,16,0,107,1,
-2105,919,1,2106,3695,
-16,0,107,1,2227,
-1012,1,2337,3696,16,
-0,107,1,2035,857,
-1,52,3697,16,0,
-107,1,1803,892,1,
-1804,3698,16,0,107,
-1,2786,3480,1,2462,
-993,1,2136,947,1,
-2464,1003,1,2029,830,
-1,2466,3504,1,2031,
-841,1,2032,846,1,
-2033,851,1,2797,3498,
-1,2798,3699,16,0,
-107,1,2364,932,1,
-2039,867,1,1931,965,
-1,2041,873,1,2021,
-823,1,2043,879,1,
-2045,884,1,2816,3464,
-1,2817,3493,1,2818,
-3470,1,2819,3475,1,
-2037,862,1,1574,904,
-1,1958,3700,16,0,
-107,1,2745,3701,16,
-0,107,1,58,3702,
-19,380,1,58,3703,
+1574,904,1,1958,3700,
+16,0,107,1,2745,
+3701,16,0,107,1,
+58,3702,19,380,1,
+58,3703,5,27,1,
+2627,1739,1,2628,1744,
+1,2629,1834,1,2630,
+1755,1,2520,1749,1,
+2632,1761,1,2633,1766,
+1,2560,1810,1,2635,
+1776,1,2636,1840,1,
+2625,1728,1,2638,1786,
+1,2565,1816,1,2640,
+3704,16,0,378,1,
+2459,986,1,2682,3705,
+16,0,378,1,2535,
+1791,1,2580,1804,1,
+2637,1781,1,2464,1003,
+1,2543,1823,1,2470,
+3706,16,0,378,1,
+2582,3707,16,0,378,
+1,2634,1771,1,2624,
+1829,1,2551,1798,1,
+2626,1734,1,59,3708,
+19,377,1,59,3709,
 5,27,1,2627,1739,
 1,2628,1744,1,2629,
 1834,1,2630,1755,1,
@@ -10270,19 +10287,19 @@ public yyLSLSyntax
 1810,1,2635,1776,1,
 2636,1840,1,2625,1728,
 1,2638,1786,1,2565,
-1816,1,2640,3704,16,
-0,378,1,2459,986,
-1,2682,3705,16,0,
-378,1,2535,1791,1,
+1816,1,2640,3710,16,
+0,375,1,2459,986,
+1,2682,3711,16,0,
+375,1,2535,1791,1,
 2580,1804,1,2637,1781,
 1,2464,1003,1,2543,
-1823,1,2470,3706,16,
-0,378,1,2582,3707,
-16,0,378,1,2634,
+1823,1,2470,3712,16,
+0,375,1,2582,3713,
+16,0,375,1,2634,
 1771,1,2624,1829,1,
 2551,1798,1,2626,1734,
-1,59,3708,19,377,
-1,59,3709,5,27,
+1,60,3714,19,423,
+1,60,3715,5,27,
 1,2627,1739,1,2628,
 1744,1,2629,1834,1,
 2630,1755,1,2520,1749,
@@ -10291,19 +10308,19 @@ public yyLSLSyntax
 2635,1776,1,2636,1840,
 1,2625,1728,1,2638,
 1786,1,2565,1816,1,
-2640,3710,16,0,375,
+2640,3716,16,0,421,
 1,2459,986,1,2682,
-3711,16,0,375,1,
+3717,16,0,421,1,
 2535,1791,1,2580,1804,
 1,2637,1781,1,2464,
 1003,1,2543,1823,1,
-2470,3712,16,0,375,
-1,2582,3713,16,0,
-375,1,2634,1771,1,
+2470,3718,16,0,421,
+1,2582,3719,16,0,
+421,1,2634,1771,1,
 2624,1829,1,2551,1798,
-1,2626,1734,1,60,
-3714,19,423,1,60,
-3715,5,27,1,2627,
+1,2626,1734,1,61,
+3720,19,543,1,61,
+3721,5,27,1,2627,
 1739,1,2628,1744,1,
 2629,1834,1,2630,1755,
 1,2520,1749,1,2632,
@@ -10311,19 +10328,19 @@ public yyLSLSyntax
 2560,1810,1,2635,1776,
 1,2636,1840,1,2625,
 1728,1,2638,1786,1,
-2565,1816,1,2640,3716,
-16,0,421,1,2459,
-986,1,2682,3717,16,
-0,421,1,2535,1791,
+2565,1816,1,2640,3722,
+16,0,541,1,2459,
+986,1,2682,3723,16,
+0,541,1,2535,1791,
 1,2580,1804,1,2637,
 1781,1,2464,1003,1,
-2543,1823,1,2470,3718,
-16,0,421,1,2582,
-3719,16,0,421,1,
+2543,1823,1,2470,3724,
+16,0,541,1,2582,
+3725,16,0,541,1,
 2634,1771,1,2624,1829,
 1,2551,1798,1,2626,
-1734,1,61,3720,19,
-543,1,61,3721,5,
+1734,1,62,3726,19,
+665,1,62,3727,5,
 27,1,2627,1739,1,
 2628,1744,1,2629,1834,
 1,2630,1755,1,2520,
@@ -10332,19 +10349,19 @@ public yyLSLSyntax
 1,2635,1776,1,2636,
 1840,1,2625,1728,1,
 2638,1786,1,2565,1816,
-1,2640,3722,16,0,
-541,1,2459,986,1,
-2682,3723,16,0,541,
+1,2640,3728,16,0,
+663,1,2459,986,1,
+2682,3729,16,0,663,
 1,2535,1791,1,2580,
 1804,1,2637,1781,1,
 2464,1003,1,2543,1823,
-1,2470,3724,16,0,
-541,1,2582,3725,16,
-0,541,1,2634,1771,
+1,2470,3730,16,0,
+663,1,2582,3731,16,
+0,663,1,2634,1771,
 1,2624,1829,1,2551,
 1798,1,2626,1734,1,
-62,3726,19,665,1,
-62,3727,5,27,1,
+63,3732,19,413,1,
+63,3733,5,27,1,
 2627,1739,1,2628,1744,
 1,2629,1834,1,2630,
 1755,1,2520,1749,1,
@@ -10353,18 +10370,18 @@ public yyLSLSyntax
 1776,1,2636,1840,1,
 2625,1728,1,2638,1786,
 1,2565,1816,1,2640,
-3728,16,0,663,1,
-2459,986,1,2682,3729,
-16,0,663,1,2535,
+3734,16,0,411,1,
+2459,986,1,2682,3735,
+16,0,411,1,2535,
 1791,1,2580,1804,1,
 2637,1781,1,2464,1003,
 1,2543,1823,1,2470,
-3730,16,0,663,1,
-2582,3731,16,0,663,
+3736,16,0,411,1,
+2582,3737,16,0,411,
 1,2634,1771,1,2624,
 1829,1,2551,1798,1,
-2626,1734,1,63,3732,
-19,413,1,63,3733,
+2626,1734,1,64,3738,
+19,410,1,64,3739,
 5,27,1,2627,1739,
 1,2628,1744,1,2629,
 1834,1,2630,1755,1,
@@ -10373,19 +10390,19 @@ public yyLSLSyntax
 1810,1,2635,1776,1,
 2636,1840,1,2625,1728,
 1,2638,1786,1,2565,
-1816,1,2640,3734,16,
-0,411,1,2459,986,
-1,2682,3735,16,0,
-411,1,2535,1791,1,
+1816,1,2640,3740,16,
+0,408,1,2459,986,
+1,2682,3741,16,0,
+408,1,2535,1791,1,
 2580,1804,1,2637,1781,
 1,2464,1003,1,2543,
-1823,1,2470,3736,16,
-0,411,1,2582,3737,
-16,0,411,1,2634,
+1823,1,2470,3742,16,
+0,408,1,2582,3743,
+16,0,408,1,2634,
 1771,1,2624,1829,1,
 2551,1798,1,2626,1734,
-1,64,3738,19,410,
-1,64,3739,5,27,
+1,65,3744,19,462,
+1,65,3745,5,27,
 1,2627,1739,1,2628,
 1744,1,2629,1834,1,
 2630,1755,1,2520,1749,
@@ -10394,19 +10411,19 @@ public yyLSLSyntax
 2635,1776,1,2636,1840,
 1,2625,1728,1,2638,
 1786,1,2565,1816,1,
-2640,3740,16,0,408,
+2640,3746,16,0,460,
 1,2459,986,1,2682,
-3741,16,0,408,1,
+3747,16,0,460,1,
 2535,1791,1,2580,1804,
 1,2637,1781,1,2464,
 1003,1,2543,1823,1,
-2470,3742,16,0,408,
-1,2582,3743,16,0,
-408,1,2634,1771,1,
+2470,3748,16,0,460,
+1,2582,3749,16,0,
+460,1,2634,1771,1,
 2624,1829,1,2551,1798,
-1,2626,1734,1,65,
-3744,19,462,1,65,
-3745,5,27,1,2627,
+1,2626,1734,1,66,
+3750,19,459,1,66,
+3751,5,27,1,2627,
 1739,1,2628,1744,1,
 2629,1834,1,2630,1755,
 1,2520,1749,1,2632,
@@ -10414,19 +10431,19 @@ public yyLSLSyntax
 2560,1810,1,2635,1776,
 1,2636,1840,1,2625,
 1728,1,2638,1786,1,
-2565,1816,1,2640,3746,
-16,0,460,1,2459,
-986,1,2682,3747,16,
-0,460,1,2535,1791,
+2565,1816,1,2640,3752,
+16,0,457,1,2459,
+986,1,2682,3753,16,
+0,457,1,2535,1791,
 1,2580,1804,1,2637,
 1781,1,2464,1003,1,
-2543,1823,1,2470,3748,
-16,0,460,1,2582,
-3749,16,0,460,1,
+2543,1823,1,2470,3754,
+16,0,457,1,2582,
+3755,16,0,457,1,
 2634,1771,1,2624,1829,
 1,2551,1798,1,2626,
-1734,1,66,3750,19,
-459,1,66,3751,5,
+1734,1,67,3756,19,
+456,1,67,3757,5,
 27,1,2627,1739,1,
 2628,1744,1,2629,1834,
 1,2630,1755,1,2520,
@@ -10435,19 +10452,19 @@ public yyLSLSyntax
 1,2635,1776,1,2636,
 1840,1,2625,1728,1,
 2638,1786,1,2565,1816,
-1,2640,3752,16,0,
-457,1,2459,986,1,
-2682,3753,16,0,457,
+1,2640,3758,16,0,
+454,1,2459,986,1,
+2682,3759,16,0,454,
 1,2535,1791,1,2580,
 1804,1,2637,1781,1,
 2464,1003,1,2543,1823,
-1,2470,3754,16,0,
-457,1,2582,3755,16,
-0,457,1,2634,1771,
+1,2470,3760,16,0,
+454,1,2582,3761,16,
+0,454,1,2634,1771,
 1,2624,1829,1,2551,
 1798,1,2626,1734,1,
-67,3756,19,456,1,
-67,3757,5,27,1,
+68,3762,19,453,1,
+68,3763,5,27,1,
 2627,1739,1,2628,1744,
 1,2629,1834,1,2630,
 1755,1,2520,1749,1,
@@ -10456,18 +10473,18 @@ public yyLSLSyntax
 1776,1,2636,1840,1,
 2625,1728,1,2638,1786,
 1,2565,1816,1,2640,
-3758,16,0,454,1,
-2459,986,1,2682,3759,
-16,0,454,1,2535,
+3764,16,0,451,1,
+2459,986,1,2682,3765,
+16,0,451,1,2535,
 1791,1,2580,1804,1,
 2637,1781,1,2464,1003,
 1,2543,1823,1,2470,
-3760,16,0,454,1,
-2582,3761,16,0,454,
+3766,16,0,451,1,
+2582,3767,16,0,451,
 1,2634,1771,1,2624,
 1829,1,2551,1798,1,
-2626,1734,1,68,3762,
-19,453,1,68,3763,
+2626,1734,1,69,3768,
+19,389,1,69,3769,
 5,27,1,2627,1739,
 1,2628,1744,1,2629,
 1834,1,2630,1755,1,
@@ -10476,19 +10493,19 @@ public yyLSLSyntax
 1810,1,2635,1776,1,
 2636,1840,1,2625,1728,
 1,2638,1786,1,2565,
-1816,1,2640,3764,16,
-0,451,1,2459,986,
-1,2682,3765,16,0,
-451,1,2535,1791,1,
+1816,1,2640,3770,16,
+0,387,1,2459,986,
+1,2682,3771,16,0,
+387,1,2535,1791,1,
 2580,1804,1,2637,1781,
 1,2464,1003,1,2543,
-1823,1,2470,3766,16,
-0,451,1,2582,3767,
-16,0,451,1,2634,
+1823,1,2470,3772,16,
+0,387,1,2582,3773,
+16,0,387,1,2634,
 1771,1,2624,1829,1,
 2551,1798,1,2626,1734,
-1,69,3768,19,389,
-1,69,3769,5,27,
+1,70,3774,19,386,
+1,70,3775,5,27,
 1,2627,1739,1,2628,
 1744,1,2629,1834,1,
 2630,1755,1,2520,1749,
@@ -10497,19 +10514,19 @@ public yyLSLSyntax
 2635,1776,1,2636,1840,
 1,2625,1728,1,2638,
 1786,1,2565,1816,1,
-2640,3770,16,0,387,
+2640,3776,16,0,384,
 1,2459,986,1,2682,
-3771,16,0,387,1,
+3777,16,0,384,1,
 2535,1791,1,2580,1804,
 1,2637,1781,1,2464,
 1003,1,2543,1823,1,
-2470,3772,16,0,387,
-1,2582,3773,16,0,
-387,1,2634,1771,1,
+2470,3778,16,0,384,
+1,2582,3779,16,0,
+384,1,2634,1771,1,
 2624,1829,1,2551,1798,
-1,2626,1734,1,70,
-3774,19,386,1,70,
-3775,5,27,1,2627,
+1,2626,1734,1,71,
+3780,19,383,1,71,
+3781,5,27,1,2627,
 1739,1,2628,1744,1,
 2629,1834,1,2630,1755,
 1,2520,1749,1,2632,
@@ -10517,19 +10534,19 @@ public yyLSLSyntax
 2560,1810,1,2635,1776,
 1,2636,1840,1,2625,
 1728,1,2638,1786,1,
-2565,1816,1,2640,3776,
-16,0,384,1,2459,
-986,1,2682,3777,16,
-0,384,1,2535,1791,
+2565,1816,1,2640,3782,
+16,0,381,1,2459,
+986,1,2682,3783,16,
+0,381,1,2535,1791,
 1,2580,1804,1,2637,
 1781,1,2464,1003,1,
-2543,1823,1,2470,3778,
-16,0,384,1,2582,
-3779,16,0,384,1,
+2543,1823,1,2470,3784,
+16,0,381,1,2582,
+3785,16,0,381,1,
 2634,1771,1,2624,1829,
 1,2551,1798,1,2626,
-1734,1,71,3780,19,
-383,1,71,3781,5,
+1734,1,72,3786,19,
+450,1,72,3787,5,
 27,1,2627,1739,1,
 2628,1744,1,2629,1834,
 1,2630,1755,1,2520,
@@ -10538,19 +10555,19 @@ public yyLSLSyntax
 1,2635,1776,1,2636,
 1840,1,2625,1728,1,
 2638,1786,1,2565,1816,
-1,2640,3782,16,0,
-381,1,2459,986,1,
-2682,3783,16,0,381,
+1,2640,3788,16,0,
+448,1,2459,986,1,
+2682,3789,16,0,448,
 1,2535,1791,1,2580,
 1804,1,2637,1781,1,
 2464,1003,1,2543,1823,
-1,2470,3784,16,0,
-381,1,2582,3785,16,
-0,381,1,2634,1771,
+1,2470,3790,16,0,
+448,1,2582,3791,16,
+0,448,1,2634,1771,
 1,2624,1829,1,2551,
 1798,1,2626,1734,1,
-72,3786,19,450,1,
-72,3787,5,27,1,
+73,3792,19,447,1,
+73,3793,5,27,1,
 2627,1739,1,2628,1744,
 1,2629,1834,1,2630,
 1755,1,2520,1749,1,
@@ -10559,18 +10576,18 @@ public yyLSLSyntax
 1776,1,2636,1840,1,
 2625,1728,1,2638,1786,
 1,2565,1816,1,2640,
-3788,16,0,448,1,
-2459,986,1,2682,3789,
-16,0,448,1,2535,
+3794,16,0,445,1,
+2459,986,1,2682,3795,
+16,0,445,1,2535,
 1791,1,2580,1804,1,
 2637,1781,1,2464,1003,
 1,2543,1823,1,2470,
-3790,16,0,448,1,
-2582,3791,16,0,448,
+3796,16,0,445,1,
+2582,3797,16,0,445,
 1,2634,1771,1,2624,
 1829,1,2551,1798,1,
-2626,1734,1,73,3792,
-19,447,1,73,3793,
+2626,1734,1,74,3798,
+19,751,1,74,3799,
 5,27,1,2627,1739,
 1,2628,1744,1,2629,
 1834,1,2630,1755,1,
@@ -10579,19 +10596,19 @@ public yyLSLSyntax
 1810,1,2635,1776,1,
 2636,1840,1,2625,1728,
 1,2638,1786,1,2565,
-1816,1,2640,3794,16,
-0,445,1,2459,986,
-1,2682,3795,16,0,
-445,1,2535,1791,1,
+1816,1,2640,3800,16,
+0,749,1,2459,986,
+1,2682,3801,16,0,
+749,1,2535,1791,1,
 2580,1804,1,2637,1781,
 1,2464,1003,1,2543,
-1823,1,2470,3796,16,
-0,445,1,2582,3797,
-16,0,445,1,2634,
+1823,1,2470,3802,16,
+0,749,1,2582,3803,
+16,0,749,1,2634,
 1771,1,2624,1829,1,
 2551,1798,1,2626,1734,
-1,74,3798,19,751,
-1,74,3799,5,27,
+1,75,3804,19,562,
+1,75,3805,5,27,
 1,2627,1739,1,2628,
 1744,1,2629,1834,1,
 2630,1755,1,2520,1749,
@@ -10600,19 +10617,19 @@ public yyLSLSyntax
 2635,1776,1,2636,1840,
 1,2625,1728,1,2638,
 1786,1,2565,1816,1,
-2640,3800,16,0,749,
+2640,3806,16,0,560,
 1,2459,986,1,2682,
-3801,16,0,749,1,
+3807,16,0,560,1,
 2535,1791,1,2580,1804,
 1,2637,1781,1,2464,
 1003,1,2543,1823,1,
-2470,3802,16,0,749,
-1,2582,3803,16,0,
-749,1,2634,1771,1,
+2470,3808,16,0,560,
+1,2582,3809,16,0,
+560,1,2634,1771,1,
 2624,1829,1,2551,1798,
-1,2626,1734,1,75,
-3804,19,562,1,75,
-3805,5,27,1,2627,
+1,2626,1734,1,76,
+3810,19,432,1,76,
+3811,5,27,1,2627,
 1739,1,2628,1744,1,
 2629,1834,1,2630,1755,
 1,2520,1749,1,2632,
@@ -10620,19 +10637,19 @@ public yyLSLSyntax
 2560,1810,1,2635,1776,
 1,2636,1840,1,2625,
 1728,1,2638,1786,1,
-2565,1816,1,2640,3806,
-16,0,560,1,2459,
-986,1,2682,3807,16,
-0,560,1,2535,1791,
+2565,1816,1,2640,3812,
+16,0,430,1,2459,
+986,1,2682,3813,16,
+0,430,1,2535,1791,
 1,2580,1804,1,2637,
 1781,1,2464,1003,1,
-2543,1823,1,2470,3808,
-16,0,560,1,2582,
-3809,16,0,560,1,
+2543,1823,1,2470,3814,
+16,0,430,1,2582,
+3815,16,0,430,1,
 2634,1771,1,2624,1829,
 1,2551,1798,1,2626,
-1734,1,76,3810,19,
-432,1,76,3811,5,
+1734,1,77,3816,19,
+559,1,77,3817,5,
 27,1,2627,1739,1,
 2628,1744,1,2629,1834,
 1,2630,1755,1,2520,
@@ -10641,19 +10658,19 @@ public yyLSLSyntax
 1,2635,1776,1,2636,
 1840,1,2625,1728,1,
 2638,1786,1,2565,1816,
-1,2640,3812,16,0,
-430,1,2459,986,1,
-2682,3813,16,0,430,
+1,2640,3818,16,0,
+557,1,2459,986,1,
+2682,3819,16,0,557,
 1,2535,1791,1,2580,
 1804,1,2637,1781,1,
 2464,1003,1,2543,1823,
-1,2470,3814,16,0,
-430,1,2582,3815,16,
-0,430,1,2634,1771,
+1,2470,3820,16,0,
+557,1,2582,3821,16,
+0,557,1,2634,1771,
 1,2624,1829,1,2551,
 1798,1,2626,1734,1,
-77,3816,19,559,1,
-77,3817,5,27,1,
+78,3822,19,556,1,
+78,3823,5,27,1,
 2627,1739,1,2628,1744,
 1,2629,1834,1,2630,
 1755,1,2520,1749,1,
@@ -10662,18 +10679,18 @@ public yyLSLSyntax
 1776,1,2636,1840,1,
 2625,1728,1,2638,1786,
 1,2565,1816,1,2640,
-3818,16,0,557,1,
-2459,986,1,2682,3819,
-16,0,557,1,2535,
+3824,16,0,554,1,
+2459,986,1,2682,3825,
+16,0,554,1,2535,
 1791,1,2580,1804,1,
 2637,1781,1,2464,1003,
 1,2543,1823,1,2470,
-3820,16,0,557,1,
-2582,3821,16,0,557,
+3826,16,0,554,1,
+2582,3827,16,0,554,
 1,2634,1771,1,2624,
 1829,1,2551,1798,1,
-2626,1734,1,78,3822,
-19,556,1,78,3823,
+2626,1734,1,79,3828,
+19,553,1,79,3829,
 5,27,1,2627,1739,
 1,2628,1744,1,2629,
 1834,1,2630,1755,1,
@@ -10682,19 +10699,19 @@ public yyLSLSyntax
 1810,1,2635,1776,1,
 2636,1840,1,2625,1728,
 1,2638,1786,1,2565,
-1816,1,2640,3824,16,
-0,554,1,2459,986,
-1,2682,3825,16,0,
-554,1,2535,1791,1,
+1816,1,2640,3830,16,
+0,551,1,2459,986,
+1,2682,3831,16,0,
+551,1,2535,1791,1,
 2580,1804,1,2637,1781,
 1,2464,1003,1,2543,
-1823,1,2470,3826,16,
-0,554,1,2582,3827,
-16,0,554,1,2634,
+1823,1,2470,3832,16,
+0,551,1,2582,3833,
+16,0,551,1,2634,
 1771,1,2624,1829,1,
 2551,1798,1,2626,1734,
-1,79,3828,19,553,
-1,79,3829,5,27,
+1,80,3834,19,420,
+1,80,3835,5,27,
 1,2627,1739,1,2628,
 1744,1,2629,1834,1,
 2630,1755,1,2520,1749,
@@ -10703,19 +10720,19 @@ public yyLSLSyntax
 2635,1776,1,2636,1840,
 1,2625,1728,1,2638,
 1786,1,2565,1816,1,
-2640,3830,16,0,551,
+2640,3836,16,0,418,
 1,2459,986,1,2682,
-3831,16,0,551,1,
+3837,16,0,418,1,
 2535,1791,1,2580,1804,
 1,2637,1781,1,2464,
 1003,1,2543,1823,1,
-2470,3832,16,0,551,
-1,2582,3833,16,0,
-551,1,2634,1771,1,
+2470,3838,16,0,418,
+1,2582,3839,16,0,
+418,1,2634,1771,1,
 2624,1829,1,2551,1798,
-1,2626,1734,1,80,
-3834,19,420,1,80,
-3835,5,27,1,2627,
+1,2626,1734,1,81,
+3840,19,407,1,81,
+3841,5,27,1,2627,
 1739,1,2628,1744,1,
 2629,1834,1,2630,1755,
 1,2520,1749,1,2632,
@@ -10723,19 +10740,19 @@ public yyLSLSyntax
 2560,1810,1,2635,1776,
 1,2636,1840,1,2625,
 1728,1,2638,1786,1,
-2565,1816,1,2640,3836,
-16,0,418,1,2459,
-986,1,2682,3837,16,
-0,418,1,2535,1791,
+2565,1816,1,2640,3842,
+16,0,405,1,2459,
+986,1,2682,3843,16,
+0,405,1,2535,1791,
 1,2580,1804,1,2637,
 1781,1,2464,1003,1,
-2543,1823,1,2470,3838,
-16,0,418,1,2582,
-3839,16,0,418,1,
+2543,1823,1,2470,3844,
+16,0,405,1,2582,
+3845,16,0,405,1,
 2634,1771,1,2624,1829,
 1,2551,1798,1,2626,
-1734,1,81,3840,19,
-407,1,81,3841,5,
+1734,1,82,3846,19,
+443,1,82,3847,5,
 27,1,2627,1739,1,
 2628,1744,1,2629,1834,
 1,2630,1755,1,2520,
@@ -10744,19 +10761,19 @@ public yyLSLSyntax
 1,2635,1776,1,2636,
 1840,1,2625,1728,1,
 2638,1786,1,2565,1816,
-1,2640,3842,16,0,
-405,1,2459,986,1,
-2682,3843,16,0,405,
+1,2640,3848,16,0,
+441,1,2459,986,1,
+2682,3849,16,0,441,
 1,2535,1791,1,2580,
 1804,1,2637,1781,1,
 2464,1003,1,2543,1823,
-1,2470,3844,16,0,
-405,1,2582,3845,16,
-0,405,1,2634,1771,
+1,2470,3850,16,0,
+441,1,2582,3851,16,
+0,441,1,2634,1771,
 1,2624,1829,1,2551,
 1798,1,2626,1734,1,
-82,3846,19,443,1,
-82,3847,5,27,1,
+83,3852,19,404,1,
+83,3853,5,27,1,
 2627,1739,1,2628,1744,
 1,2629,1834,1,2630,
 1755,1,2520,1749,1,
@@ -10765,18 +10782,18 @@ public yyLSLSyntax
 1776,1,2636,1840,1,
 2625,1728,1,2638,1786,
 1,2565,1816,1,2640,
-3848,16,0,441,1,
-2459,986,1,2682,3849,
-16,0,441,1,2535,
+3854,16,0,402,1,
+2459,986,1,2682,3855,
+16,0,402,1,2535,
 1791,1,2580,1804,1,
 2637,1781,1,2464,1003,
 1,2543,1823,1,2470,
-3850,16,0,441,1,
-2582,3851,16,0,441,
+3856,16,0,402,1,
+2582,3857,16,0,402,
 1,2634,1771,1,2624,
 1829,1,2551,1798,1,
-2626,1734,1,83,3852,
-19,404,1,83,3853,
+2626,1734,1,84,3858,
+19,401,1,84,3859,
 5,27,1,2627,1739,
 1,2628,1744,1,2629,
 1834,1,2630,1755,1,
@@ -10785,19 +10802,19 @@ public yyLSLSyntax
 1810,1,2635,1776,1,
 2636,1840,1,2625,1728,
 1,2638,1786,1,2565,
-1816,1,2640,3854,16,
-0,402,1,2459,986,
-1,2682,3855,16,0,
-402,1,2535,1791,1,
+1816,1,2640,3860,16,
+0,399,1,2459,986,
+1,2682,3861,16,0,
+399,1,2535,1791,1,
 2580,1804,1,2637,1781,
 1,2464,1003,1,2543,
-1823,1,2470,3856,16,
-0,402,1,2582,3857,
-16,0,402,1,2634,
+1823,1,2470,3862,16,
+0,399,1,2582,3863,
+16,0,399,1,2634,
 1771,1,2624,1829,1,
 2551,1798,1,2626,1734,
-1,84,3858,19,401,
-1,84,3859,5,27,
+1,85,3864,19,439,
+1,85,3865,5,27,
 1,2627,1739,1,2628,
 1744,1,2629,1834,1,
 2630,1755,1,2520,1749,
@@ -10806,19 +10823,19 @@ public yyLSLSyntax
 2635,1776,1,2636,1840,
 1,2625,1728,1,2638,
 1786,1,2565,1816,1,
-2640,3860,16,0,399,
+2640,3866,16,0,437,
 1,2459,986,1,2682,
-3861,16,0,399,1,
+3867,16,0,437,1,
 2535,1791,1,2580,1804,
 1,2637,1781,1,2464,
 1003,1,2543,1823,1,
-2470,3862,16,0,399,
-1,2582,3863,16,0,
-399,1,2634,1771,1,
+2470,3868,16,0,437,
+1,2582,3869,16,0,
+437,1,2634,1771,1,
 2624,1829,1,2551,1798,
-1,2626,1734,1,85,
-3864,19,439,1,85,
-3865,5,27,1,2627,
+1,2626,1734,1,86,
+3870,19,436,1,86,
+3871,5,27,1,2627,
 1739,1,2628,1744,1,
 2629,1834,1,2630,1755,
 1,2520,1749,1,2632,
@@ -10826,19 +10843,19 @@ public yyLSLSyntax
 2560,1810,1,2635,1776,
 1,2636,1840,1,2625,
 1728,1,2638,1786,1,
-2565,1816,1,2640,3866,
-16,0,437,1,2459,
-986,1,2682,3867,16,
-0,437,1,2535,1791,
+2565,1816,1,2640,3872,
+16,0,434,1,2459,
+986,1,2682,3873,16,
+0,434,1,2535,1791,
 1,2580,1804,1,2637,
 1781,1,2464,1003,1,
-2543,1823,1,2470,3868,
-16,0,437,1,2582,
-3869,16,0,437,1,
+2543,1823,1,2470,3874,
+16,0,434,1,2582,
+3875,16,0,434,1,
 2634,1771,1,2624,1829,
 1,2551,1798,1,2626,
-1734,1,86,3870,19,
-436,1,86,3871,5,
+1734,1,87,3876,19,
+550,1,87,3877,5,
 27,1,2627,1739,1,
 2628,1744,1,2629,1834,
 1,2630,1755,1,2520,
@@ -10847,19 +10864,19 @@ public yyLSLSyntax
 1,2635,1776,1,2636,
 1840,1,2625,1728,1,
 2638,1786,1,2565,1816,
-1,2640,3872,16,0,
-434,1,2459,986,1,
-2682,3873,16,0,434,
+1,2640,3878,16,0,
+548,1,2459,986,1,
+2682,3879,16,0,548,
 1,2535,1791,1,2580,
 1804,1,2637,1781,1,
 2464,1003,1,2543,1823,
-1,2470,3874,16,0,
-434,1,2582,3875,16,
-0,434,1,2634,1771,
+1,2470,3880,16,0,
+548,1,2582,3881,16,
+0,548,1,2634,1771,
 1,2624,1829,1,2551,
 1798,1,2626,1734,1,
-87,3876,19,550,1,
-87,3877,5,27,1,
+88,3882,19,398,1,
+88,3883,5,27,1,
 2627,1739,1,2628,1744,
 1,2629,1834,1,2630,
 1755,1,2520,1749,1,
@@ -10868,18 +10885,18 @@ public yyLSLSyntax
 1776,1,2636,1840,1,
 2625,1728,1,2638,1786,
 1,2565,1816,1,2640,
-3878,16,0,548,1,
-2459,986,1,2682,3879,
-16,0,548,1,2535,
+3884,16,0,396,1,
+2459,986,1,2682,3885,
+16,0,396,1,2535,
 1791,1,2580,1804,1,
 2637,1781,1,2464,1003,
 1,2543,1823,1,2470,
-3880,16,0,548,1,
-2582,3881,16,0,548,
+3886,16,0,396,1,
+2582,3887,16,0,396,
 1,2634,1771,1,2624,
 1829,1,2551,1798,1,
-2626,1734,1,88,3882,
-19,398,1,88,3883,
+2626,1734,1,89,3888,
+19,392,1,89,3889,
 5,27,1,2627,1739,
 1,2628,1744,1,2629,
 1834,1,2630,1755,1,
@@ -10888,19 +10905,19 @@ public yyLSLSyntax
 1810,1,2635,1776,1,
 2636,1840,1,2625,1728,
 1,2638,1786,1,2565,
-1816,1,2640,3884,16,
-0,396,1,2459,986,
-1,2682,3885,16,0,
-396,1,2535,1791,1,
+1816,1,2640,3890,16,
+0,390,1,2459,986,
+1,2682,3891,16,0,
+390,1,2535,1791,1,
 2580,1804,1,2637,1781,
 1,2464,1003,1,2543,
-1823,1,2470,3886,16,
-0,396,1,2582,3887,
-16,0,396,1,2634,
+1823,1,2470,3892,16,
+0,390,1,2582,3893,
+16,0,390,1,2634,
 1771,1,2624,1829,1,
 2551,1798,1,2626,1734,
-1,89,3888,19,392,
-1,89,3889,5,27,
+1,90,3894,19,395,
+1,90,3895,5,27,
 1,2627,1739,1,2628,
 1744,1,2629,1834,1,
 2630,1755,1,2520,1749,
@@ -10909,19 +10926,19 @@ public yyLSLSyntax
 2635,1776,1,2636,1840,
 1,2625,1728,1,2638,
 1786,1,2565,1816,1,
-2640,3890,16,0,390,
+2640,3896,16,0,393,
 1,2459,986,1,2682,
-3891,16,0,390,1,
+3897,16,0,393,1,
 2535,1791,1,2580,1804,
 1,2637,1781,1,2464,
 1003,1,2543,1823,1,
-2470,3892,16,0,390,
-1,2582,3893,16,0,
-390,1,2634,1771,1,
+2470,3898,16,0,393,
+1,2582,3899,16,0,
+393,1,2634,1771,1,
 2624,1829,1,2551,1798,
-1,2626,1734,1,90,
-3894,19,395,1,90,
-3895,5,27,1,2627,
+1,2626,1734,1,91,
+3900,19,569,1,91,
+3901,5,27,1,2627,
 1739,1,2628,1744,1,
 2629,1834,1,2630,1755,
 1,2520,1749,1,2632,
@@ -10929,1633 +10946,1644 @@ public yyLSLSyntax
 2560,1810,1,2635,1776,
 1,2636,1840,1,2625,
 1728,1,2638,1786,1,
-2565,1816,1,2640,3896,
-16,0,393,1,2459,
-986,1,2682,3897,16,
-0,393,1,2535,1791,
+2565,1816,1,2640,3902,
+16,0,567,1,2459,
+986,1,2682,3903,16,
+0,567,1,2535,1791,
 1,2580,1804,1,2637,
 1781,1,2464,1003,1,
-2543,1823,1,2470,3898,
-16,0,393,1,2582,
-3899,16,0,393,1,
+2543,1823,1,2470,3904,
+16,0,567,1,2582,
+3905,16,0,567,1,
 2634,1771,1,2624,1829,
 1,2551,1798,1,2626,
-1734,1,91,3900,19,
-569,1,91,3901,5,
-27,1,2627,1739,1,
-2628,1744,1,2629,1834,
-1,2630,1755,1,2520,
-1749,1,2632,1761,1,
-2633,1766,1,2560,1810,
-1,2635,1776,1,2636,
-1840,1,2625,1728,1,
-2638,1786,1,2565,1816,
-1,2640,3902,16,0,
-567,1,2459,986,1,
-2682,3903,16,0,567,
-1,2535,1791,1,2580,
-1804,1,2637,1781,1,
-2464,1003,1,2543,1823,
-1,2470,3904,16,0,
-567,1,2582,3905,16,
-0,567,1,2634,1771,
-1,2624,1829,1,2551,
-1798,1,2626,1734,1,
-92,3906,19,133,1,
-92,3907,5,129,1,
-0,3908,16,0,355,
-1,1,2191,1,2,
-2197,1,3,2202,1,
-4,2207,1,5,2212,
-1,6,2217,1,7,
-2222,1,8,3909,16,
-0,131,1,1515,3910,
-16,0,180,1,2021,
-823,1,2022,3911,16,
-0,573,1,256,3912,
-16,0,188,1,2526,
-3913,16,0,294,1,
-2025,3914,16,0,577,
-1,18,3915,16,0,
-147,1,2027,3916,16,
-0,581,1,2029,830,
+1734,1,92,3906,19,
+133,1,92,3907,5,
+129,1,0,3908,16,
+0,355,1,1,2191,
+1,2,2197,1,3,
+2202,1,4,2207,1,
+5,2212,1,6,2217,
+1,7,2222,1,8,
+3909,16,0,131,1,
+1515,3910,16,0,180,
+1,2021,823,1,2022,
+3911,16,0,573,1,
+256,3912,16,0,188,
+1,2526,3913,16,0,
+294,1,2025,3914,16,
+0,577,1,18,3915,
+16,0,147,1,2027,
+3916,16,0,581,1,
+2029,830,1,2030,836,
+1,2031,841,1,2032,
+846,1,2786,3480,1,
+277,3917,16,0,188,
+1,2035,857,1,2037,
+862,1,2039,867,1,
+32,3918,16,0,180,
+1,2041,873,1,2293,
+3919,16,0,188,1,
+2043,879,1,2797,3498,
+1,2798,3920,16,0,
+355,1,41,3921,16,
+0,188,1,1297,3922,
+16,0,180,1,43,
+3923,16,0,188,1,
+2554,3924,16,0,531,
+1,46,3925,16,0,
+193,1,1804,3926,16,
+0,180,1,299,3927,
+16,0,188,1,52,
+3928,16,0,180,1,
+2816,3464,1,2817,3493,
+1,2818,3470,1,2819,
+3475,1,2318,3929,16,
+0,180,1,62,3930,
+16,0,209,1,65,
+3931,16,0,214,1,
+2075,3932,16,0,180,
+1,1574,904,1,71,
+3933,16,0,188,1,
+1775,3934,16,0,180,
+1,76,3935,16,0,
+188,1,1834,3936,16,
+0,180,1,2337,3937,
+16,0,180,1,79,
+3938,16,0,188,1,
+1335,3939,16,0,180,
+1,2511,3940,16,0,
+472,1,322,3941,16,
+0,188,1,85,3942,
+16,0,188,1,2761,
+3943,16,0,188,1,
+89,3944,16,0,188,
+1,2033,851,1,509,
+3945,16,0,188,1,
+346,3946,16,0,188,
+1,97,3947,16,0,
+188,1,2106,3948,16,
+0,180,1,102,3949,
+16,0,188,1,1860,
+926,1,1803,892,1,
+2364,932,1,1113,3950,
+16,0,173,1,112,
+3951,16,0,188,1,
+1117,3952,16,0,180,
+1,1873,940,1,1876,
+3953,16,0,180,1,
+372,3954,16,0,611,
+1,374,3955,16,0,
+613,1,124,3956,16,
+0,188,1,376,3957,
+16,0,615,1,378,
+3958,16,0,617,1,
+2136,947,1,1261,3959,
+16,0,180,1,381,
+3960,16,0,188,1,
+525,3961,16,0,188,
+1,137,3962,16,0,
+188,1,1901,3963,16,
+0,180,1,1153,3964,
+16,0,180,1,151,
+3965,16,0,188,1,
+1407,3966,16,0,180,
+1,1659,3967,16,0,
+180,1,2413,3968,16,
+0,180,1,406,3969,
+16,0,188,1,1371,
+3970,16,0,180,1,
+2105,919,1,166,3971,
+16,0,188,1,2045,
+884,1,1622,3972,16,
+0,188,1,2758,3487,
+1,1931,965,1,1933,
+3973,16,0,180,1,
+431,3974,16,0,188,
+1,1585,3975,16,0,
+188,1,182,3976,16,
+0,188,1,1189,3977,
+16,0,180,1,1443,
+3978,16,0,180,1,
+1695,3979,16,0,180,
+1,2198,3980,16,0,
+180,1,447,3981,16,
+0,188,1,2458,980,
+1,2459,986,1,1958,
+3982,16,0,180,1,
+2462,993,1,1657,998,
+1,2464,1003,1,2466,
+3504,1,459,3983,16,
+0,188,1,2468,3984,
+16,0,373,1,462,
+3985,16,0,188,1,
+199,3986,16,0,188,
+1,217,3987,16,0,
+188,1,2227,1012,1,
+1225,3988,16,0,180,
+1,1479,3989,16,0,
+180,1,1731,3990,16,
+0,188,1,1989,1020,
+1,1990,3991,16,0,
+180,1,236,3992,16,
+0,188,1,2507,3993,
+16,0,468,1,1756,
+3994,16,0,180,1,
+93,3995,19,719,1,
+93,3996,5,95,1,
+2761,3997,16,0,717,
+1,256,3998,16,0,
+717,1,1261,3999,16,
+0,717,1,509,4000,
+16,0,717,1,1515,
+4001,16,0,717,1,
+2021,823,1,1775,4002,
+16,0,717,1,2029,
+830,1,2030,836,1,
+2031,841,1,2032,846,
+1,2033,851,1,277,
+4003,16,0,717,1,
+2035,857,1,2037,862,
+1,2039,867,1,32,
+4004,16,0,717,1,
+2041,873,1,2293,4005,
+16,0,717,1,2043,
+879,1,2045,884,1,
+41,4006,16,0,717,
+1,1297,4007,16,0,
+717,1,43,4008,16,
+0,717,1,1803,892,
+1,1804,4009,16,0,
+717,1,299,4010,16,
+0,717,1,52,4011,
+16,0,717,1,2318,
+4012,16,0,717,1,
+62,4013,16,0,717,
+1,2075,4014,16,0,
+717,1,1574,904,1,
+71,4015,16,0,717,
+1,76,4016,16,0,
+717,1,1834,4017,16,
+0,717,1,2337,4018,
+16,0,717,1,79,
+4019,16,0,717,1,
+1335,4020,16,0,717,
+1,322,4021,16,0,
+717,1,85,4022,16,
+0,717,1,89,4023,
+16,0,717,1,346,
+4024,16,0,717,1,
+2105,919,1,2106,4025,
+16,0,717,1,97,
+4026,16,0,717,1,
+1860,926,1,2364,932,
+1,102,4027,16,0,
+717,1,112,4028,16,
+0,717,1,1117,4029,
+16,0,717,1,1873,
+940,1,1876,4030,16,
+0,717,1,124,4031,
+16,0,717,1,2136,
+947,1,381,4032,16,
+0,717,1,525,4033,
+16,0,717,1,137,
+4034,16,0,717,1,
+1901,4035,16,0,717,
+1,1153,4036,16,0,
+717,1,151,4037,16,
+0,717,1,1407,4038,
+16,0,717,1,1659,
+4039,16,0,717,1,
+2413,4040,16,0,717,
+1,406,4041,16,0,
+717,1,1371,4042,16,
+0,717,1,166,4043,
+16,0,717,1,1622,
+4044,16,0,717,1,
+1931,965,1,1933,4045,
+16,0,717,1,431,
+4046,16,0,717,1,
+1585,4047,16,0,717,
+1,182,4048,16,0,
+717,1,1189,4049,16,
+0,717,1,1443,4050,
+16,0,717,1,1695,
+4051,16,0,717,1,
+2198,4052,16,0,717,
+1,447,4053,16,0,
+717,1,2458,980,1,
+2459,986,1,1958,4054,
+16,0,717,1,2462,
+993,1,1657,998,1,
+2464,1003,1,199,4055,
+16,0,717,1,459,
+4056,16,0,717,1,
+462,4057,16,0,717,
+1,217,4058,16,0,
+717,1,2227,1012,1,
+1225,4059,16,0,717,
+1,1479,4060,16,0,
+717,1,1731,4061,16,
+0,717,1,1989,1020,
+1,1990,4062,16,0,
+717,1,236,4063,16,
+0,717,1,1756,4064,
+16,0,717,1,94,
+4065,19,716,1,94,
+4066,5,95,1,2761,
+4067,16,0,714,1,
+256,4068,16,0,714,
+1,1261,4069,16,0,
+714,1,509,4070,16,
+0,714,1,1515,4071,
+16,0,714,1,2021,
+823,1,1775,4072,16,
+0,714,1,2029,830,
 1,2030,836,1,2031,
 841,1,2032,846,1,
-2786,3480,1,277,3917,
-16,0,188,1,2035,
+2033,851,1,277,4073,
+16,0,714,1,2035,
 857,1,2037,862,1,
-2039,867,1,32,3918,
-16,0,180,1,2041,
-873,1,2293,3919,16,
-0,188,1,2043,879,
-1,2797,3498,1,2798,
-3920,16,0,355,1,
-41,3921,16,0,188,
-1,1297,3922,16,0,
-180,1,43,3923,16,
-0,188,1,2554,3924,
-16,0,531,1,46,
-3925,16,0,193,1,
-1804,3926,16,0,180,
-1,299,3927,16,0,
-188,1,52,3928,16,
-0,180,1,2816,3464,
-1,2817,3493,1,2818,
-3470,1,2819,3475,1,
-2318,3929,16,0,180,
-1,62,3930,16,0,
-209,1,65,3931,16,
-0,214,1,2075,3932,
-16,0,180,1,1574,
-904,1,71,3933,16,
-0,188,1,1775,3934,
-16,0,180,1,76,
-3935,16,0,188,1,
-1834,3936,16,0,180,
-1,2337,3937,16,0,
-180,1,79,3938,16,
-0,188,1,1335,3939,
-16,0,180,1,2511,
-3940,16,0,472,1,
-322,3941,16,0,188,
-1,85,3942,16,0,
-188,1,2761,3943,16,
-0,188,1,89,3944,
-16,0,188,1,2033,
-851,1,509,3945,16,
-0,188,1,346,3946,
-16,0,188,1,97,
-3947,16,0,188,1,
-2106,3948,16,0,180,
-1,102,3949,16,0,
-188,1,1860,926,1,
-1803,892,1,2364,932,
-1,1113,3950,16,0,
-173,1,112,3951,16,
-0,188,1,1117,3952,
-16,0,180,1,1873,
-940,1,1876,3953,16,
-0,180,1,372,3954,
-16,0,611,1,374,
-3955,16,0,613,1,
-124,3956,16,0,188,
-1,376,3957,16,0,
-615,1,378,3958,16,
-0,617,1,2136,947,
-1,1261,3959,16,0,
-180,1,381,3960,16,
-0,188,1,525,3961,
-16,0,188,1,137,
-3962,16,0,188,1,
-1901,3963,16,0,180,
-1,1153,3964,16,0,
-180,1,151,3965,16,
-0,188,1,1407,3966,
-16,0,180,1,1659,
-3967,16,0,180,1,
-2413,3968,16,0,180,
-1,406,3969,16,0,
-188,1,1371,3970,16,
-0,180,1,2105,919,
-1,166,3971,16,0,
-188,1,2045,884,1,
-1622,3972,16,0,188,
-1,2758,3487,1,1931,
-965,1,1933,3973,16,
-0,180,1,431,3974,
-16,0,188,1,1585,
-3975,16,0,188,1,
-182,3976,16,0,188,
-1,1189,3977,16,0,
-180,1,1443,3978,16,
-0,180,1,1695,3979,
-16,0,180,1,2198,
-3980,16,0,180,1,
-447,3981,16,0,188,
+2039,867,1,32,4074,
+16,0,714,1,2041,
+873,1,2293,4075,16,
+0,714,1,2043,879,
+1,2045,884,1,41,
+4076,16,0,714,1,
+1297,4077,16,0,714,
+1,43,4078,16,0,
+714,1,1803,892,1,
+1804,4079,16,0,714,
+1,299,4080,16,0,
+714,1,52,4081,16,
+0,714,1,2318,4082,
+16,0,714,1,62,
+4083,16,0,714,1,
+2075,4084,16,0,714,
+1,1574,904,1,71,
+4085,16,0,714,1,
+76,4086,16,0,714,
+1,1834,4087,16,0,
+714,1,2337,4088,16,
+0,714,1,79,4089,
+16,0,714,1,1335,
+4090,16,0,714,1,
+322,4091,16,0,714,
+1,85,4092,16,0,
+714,1,89,4093,16,
+0,714,1,346,4094,
+16,0,714,1,2105,
+919,1,2106,4095,16,
+0,714,1,97,4096,
+16,0,714,1,1860,
+926,1,2364,932,1,
+102,4097,16,0,714,
+1,112,4098,16,0,
+714,1,1117,4099,16,
+0,714,1,1873,940,
+1,1876,4100,16,0,
+714,1,124,4101,16,
+0,714,1,2136,947,
+1,381,4102,16,0,
+714,1,525,4103,16,
+0,714,1,137,4104,
+16,0,714,1,1901,
+4105,16,0,714,1,
+1153,4106,16,0,714,
+1,151,4107,16,0,
+714,1,1407,4108,16,
+0,714,1,1659,4109,
+16,0,714,1,2413,
+4110,16,0,714,1,
+406,4111,16,0,714,
+1,1371,4112,16,0,
+714,1,166,4113,16,
+0,714,1,1622,4114,
+16,0,714,1,1931,
+965,1,1933,4115,16,
+0,714,1,431,4116,
+16,0,714,1,1585,
+4117,16,0,714,1,
+182,4118,16,0,714,
+1,1189,4119,16,0,
+714,1,1443,4120,16,
+0,714,1,1695,4121,
+16,0,714,1,2198,
+4122,16,0,714,1,
+447,4123,16,0,714,
 1,2458,980,1,2459,
-986,1,1958,3982,16,
-0,180,1,2462,993,
+986,1,1958,4124,16,
+0,714,1,2462,993,
 1,1657,998,1,2464,
-1003,1,2466,3504,1,
-459,3983,16,0,188,
-1,2468,3984,16,0,
-373,1,462,3985,16,
-0,188,1,199,3986,
-16,0,188,1,217,
-3987,16,0,188,1,
-2227,1012,1,1225,3988,
-16,0,180,1,1479,
-3989,16,0,180,1,
-1731,3990,16,0,188,
-1,1989,1020,1,1990,
-3991,16,0,180,1,
-236,3992,16,0,188,
-1,2507,3993,16,0,
-468,1,1756,3994,16,
-0,180,1,93,3995,
-19,719,1,93,3996,
-5,95,1,2761,3997,
-16,0,717,1,256,
-3998,16,0,717,1,
-1261,3999,16,0,717,
-1,509,4000,16,0,
-717,1,1515,4001,16,
-0,717,1,2021,823,
-1,1775,4002,16,0,
-717,1,2029,830,1,
+1003,1,199,4125,16,
+0,714,1,459,4126,
+16,0,714,1,462,
+4127,16,0,714,1,
+217,4128,16,0,714,
+1,2227,1012,1,1225,
+4129,16,0,714,1,
+1479,4130,16,0,714,
+1,1731,4131,16,0,
+714,1,1989,1020,1,
+1990,4132,16,0,714,
+1,236,4133,16,0,
+714,1,1756,4134,16,
+0,714,1,95,4135,
+19,713,1,95,4136,
+5,95,1,2761,4137,
+16,0,711,1,256,
+4138,16,0,711,1,
+1261,4139,16,0,711,
+1,509,4140,16,0,
+711,1,1515,4141,16,
+0,711,1,2021,823,
+1,1775,4142,16,0,
+711,1,2029,830,1,
 2030,836,1,2031,841,
 1,2032,846,1,2033,
-851,1,277,4003,16,
-0,717,1,2035,857,
+851,1,277,4143,16,
+0,711,1,2035,857,
 1,2037,862,1,2039,
-867,1,32,4004,16,
-0,717,1,2041,873,
-1,2293,4005,16,0,
-717,1,2043,879,1,
-2045,884,1,41,4006,
-16,0,717,1,1297,
-4007,16,0,717,1,
-43,4008,16,0,717,
+867,1,32,4144,16,
+0,711,1,2041,873,
+1,2293,4145,16,0,
+711,1,2043,879,1,
+2045,884,1,41,4146,
+16,0,711,1,1297,
+4147,16,0,711,1,
+43,4148,16,0,711,
 1,1803,892,1,1804,
-4009,16,0,717,1,
-299,4010,16,0,717,
-1,52,4011,16,0,
-717,1,2318,4012,16,
-0,717,1,62,4013,
-16,0,717,1,2075,
-4014,16,0,717,1,
-1574,904,1,71,4015,
-16,0,717,1,76,
-4016,16,0,717,1,
-1834,4017,16,0,717,
-1,2337,4018,16,0,
-717,1,79,4019,16,
-0,717,1,1335,4020,
-16,0,717,1,322,
-4021,16,0,717,1,
-85,4022,16,0,717,
-1,89,4023,16,0,
-717,1,346,4024,16,
-0,717,1,2105,919,
-1,2106,4025,16,0,
-717,1,97,4026,16,
-0,717,1,1860,926,
+4149,16,0,711,1,
+299,4150,16,0,711,
+1,52,4151,16,0,
+711,1,2318,4152,16,
+0,711,1,62,4153,
+16,0,711,1,2075,
+4154,16,0,711,1,
+1574,904,1,71,4155,
+16,0,711,1,76,
+4156,16,0,711,1,
+1834,4157,16,0,711,
+1,2337,4158,16,0,
+711,1,79,4159,16,
+0,711,1,1335,4160,
+16,0,711,1,322,
+4161,16,0,711,1,
+85,4162,16,0,711,
+1,89,4163,16,0,
+711,1,346,4164,16,
+0,711,1,2105,919,
+1,2106,4165,16,0,
+711,1,97,4166,16,
+0,711,1,1860,926,
 1,2364,932,1,102,
-4027,16,0,717,1,
-112,4028,16,0,717,
-1,1117,4029,16,0,
-717,1,1873,940,1,
-1876,4030,16,0,717,
-1,124,4031,16,0,
-717,1,2136,947,1,
-381,4032,16,0,717,
-1,525,4033,16,0,
-717,1,137,4034,16,
-0,717,1,1901,4035,
-16,0,717,1,1153,
-4036,16,0,717,1,
-151,4037,16,0,717,
-1,1407,4038,16,0,
-717,1,1659,4039,16,
-0,717,1,2413,4040,
-16,0,717,1,406,
-4041,16,0,717,1,
-1371,4042,16,0,717,
-1,166,4043,16,0,
-717,1,1622,4044,16,
-0,717,1,1931,965,
-1,1933,4045,16,0,
-717,1,431,4046,16,
-0,717,1,1585,4047,
-16,0,717,1,182,
-4048,16,0,717,1,
-1189,4049,16,0,717,
-1,1443,4050,16,0,
-717,1,1695,4051,16,
-0,717,1,2198,4052,
-16,0,717,1,447,
-4053,16,0,717,1,
+4167,16,0,711,1,
+112,4168,16,0,711,
+1,1117,4169,16,0,
+711,1,1873,940,1,
+1876,4170,16,0,711,
+1,124,4171,16,0,
+711,1,2136,947,1,
+381,4172,16,0,711,
+1,525,4173,16,0,
+711,1,137,4174,16,
+0,711,1,1901,4175,
+16,0,711,1,1153,
+4176,16,0,711,1,
+151,4177,16,0,711,
+1,1407,4178,16,0,
+711,1,1659,4179,16,
+0,711,1,2413,4180,
+16,0,711,1,406,
+4181,16,0,711,1,
+1371,4182,16,0,711,
+1,166,4183,16,0,
+711,1,1622,4184,16,
+0,711,1,1931,965,
+1,1933,4185,16,0,
+711,1,431,4186,16,
+0,711,1,1585,4187,
+16,0,711,1,182,
+4188,16,0,711,1,
+1189,4189,16,0,711,
+1,1443,4190,16,0,
+711,1,1695,4191,16,
+0,711,1,2198,4192,
+16,0,711,1,447,
+4193,16,0,711,1,
 2458,980,1,2459,986,
-1,1958,4054,16,0,
-717,1,2462,993,1,
+1,1958,4194,16,0,
+711,1,2462,993,1,
 1657,998,1,2464,1003,
-1,199,4055,16,0,
-717,1,459,4056,16,
-0,717,1,462,4057,
-16,0,717,1,217,
-4058,16,0,717,1,
-2227,1012,1,1225,4059,
-16,0,717,1,1479,
-4060,16,0,717,1,
-1731,4061,16,0,717,
+1,199,4195,16,0,
+711,1,459,4196,16,
+0,711,1,462,4197,
+16,0,711,1,217,
+4198,16,0,711,1,
+2227,1012,1,1225,4199,
+16,0,711,1,1479,
+4200,16,0,711,1,
+1731,4201,16,0,711,
 1,1989,1020,1,1990,
-4062,16,0,717,1,
-236,4063,16,0,717,
-1,1756,4064,16,0,
-717,1,94,4065,19,
-716,1,94,4066,5,
-95,1,2761,4067,16,
-0,714,1,256,4068,
-16,0,714,1,1261,
-4069,16,0,714,1,
-509,4070,16,0,714,
-1,1515,4071,16,0,
-714,1,2021,823,1,
-1775,4072,16,0,714,
-1,2029,830,1,2030,
-836,1,2031,841,1,
-2032,846,1,2033,851,
-1,277,4073,16,0,
-714,1,2035,857,1,
-2037,862,1,2039,867,
-1,32,4074,16,0,
-714,1,2041,873,1,
-2293,4075,16,0,714,
-1,2043,879,1,2045,
-884,1,41,4076,16,
-0,714,1,1297,4077,
-16,0,714,1,43,
-4078,16,0,714,1,
-1803,892,1,1804,4079,
-16,0,714,1,299,
-4080,16,0,714,1,
-52,4081,16,0,714,
-1,2318,4082,16,0,
-714,1,62,4083,16,
-0,714,1,2075,4084,
-16,0,714,1,1574,
-904,1,71,4085,16,
-0,714,1,76,4086,
-16,0,714,1,1834,
-4087,16,0,714,1,
-2337,4088,16,0,714,
-1,79,4089,16,0,
-714,1,1335,4090,16,
-0,714,1,322,4091,
-16,0,714,1,85,
-4092,16,0,714,1,
-89,4093,16,0,714,
-1,346,4094,16,0,
-714,1,2105,919,1,
-2106,4095,16,0,714,
-1,97,4096,16,0,
-714,1,1860,926,1,
-2364,932,1,102,4097,
-16,0,714,1,112,
-4098,16,0,714,1,
-1117,4099,16,0,714,
-1,1873,940,1,1876,
-4100,16,0,714,1,
-124,4101,16,0,714,
-1,2136,947,1,381,
-4102,16,0,714,1,
-525,4103,16,0,714,
-1,137,4104,16,0,
-714,1,1901,4105,16,
-0,714,1,1153,4106,
-16,0,714,1,151,
-4107,16,0,714,1,
-1407,4108,16,0,714,
-1,1659,4109,16,0,
-714,1,2413,4110,16,
-0,714,1,406,4111,
-16,0,714,1,1371,
-4112,16,0,714,1,
-166,4113,16,0,714,
-1,1622,4114,16,0,
-714,1,1931,965,1,
-1933,4115,16,0,714,
-1,431,4116,16,0,
-714,1,1585,4117,16,
-0,714,1,182,4118,
-16,0,714,1,1189,
-4119,16,0,714,1,
-1443,4120,16,0,714,
-1,1695,4121,16,0,
-714,1,2198,4122,16,
-0,714,1,447,4123,
-16,0,714,1,2458,
-980,1,2459,986,1,
-1958,4124,16,0,714,
-1,2462,993,1,1657,
-998,1,2464,1003,1,
-199,4125,16,0,714,
-1,459,4126,16,0,
-714,1,462,4127,16,
-0,714,1,217,4128,
-16,0,714,1,2227,
-1012,1,1225,4129,16,
-0,714,1,1479,4130,
-16,0,714,1,1731,
-4131,16,0,714,1,
-1989,1020,1,1990,4132,
-16,0,714,1,236,
-4133,16,0,714,1,
-1756,4134,16,0,714,
-1,95,4135,19,713,
-1,95,4136,5,95,
-1,2761,4137,16,0,
-711,1,256,4138,16,
-0,711,1,1261,4139,
-16,0,711,1,509,
-4140,16,0,711,1,
-1515,4141,16,0,711,
-1,2021,823,1,1775,
-4142,16,0,711,1,
-2029,830,1,2030,836,
-1,2031,841,1,2032,
-846,1,2033,851,1,
-277,4143,16,0,711,
-1,2035,857,1,2037,
-862,1,2039,867,1,
-32,4144,16,0,711,
-1,2041,873,1,2293,
-4145,16,0,711,1,
-2043,879,1,2045,884,
-1,41,4146,16,0,
-711,1,1297,4147,16,
-0,711,1,43,4148,
-16,0,711,1,1803,
-892,1,1804,4149,16,
-0,711,1,299,4150,
-16,0,711,1,52,
-4151,16,0,711,1,
-2318,4152,16,0,711,
-1,62,4153,16,0,
-711,1,2075,4154,16,
-0,711,1,1574,904,
-1,71,4155,16,0,
-711,1,76,4156,16,
-0,711,1,1834,4157,
-16,0,711,1,2337,
-4158,16,0,711,1,
-79,4159,16,0,711,
-1,1335,4160,16,0,
-711,1,322,4161,16,
-0,711,1,85,4162,
-16,0,711,1,89,
-4163,16,0,711,1,
-346,4164,16,0,711,
-1,2105,919,1,2106,
-4165,16,0,711,1,
-97,4166,16,0,711,
-1,1860,926,1,2364,
-932,1,102,4167,16,
-0,711,1,112,4168,
-16,0,711,1,1117,
-4169,16,0,711,1,
-1873,940,1,1876,4170,
-16,0,711,1,124,
-4171,16,0,711,1,
-2136,947,1,381,4172,
-16,0,711,1,525,
-4173,16,0,711,1,
-137,4174,16,0,711,
-1,1901,4175,16,0,
-711,1,1153,4176,16,
-0,711,1,151,4177,
-16,0,711,1,1407,
-4178,16,0,711,1,
-1659,4179,16,0,711,
-1,2413,4180,16,0,
-711,1,406,4181,16,
-0,711,1,1371,4182,
-16,0,711,1,166,
-4183,16,0,711,1,
-1622,4184,16,0,711,
-1,1931,965,1,1933,
-4185,16,0,711,1,
-431,4186,16,0,711,
-1,1585,4187,16,0,
-711,1,182,4188,16,
-0,711,1,1189,4189,
-16,0,711,1,1443,
-4190,16,0,711,1,
-1695,4191,16,0,711,
-1,2198,4192,16,0,
-711,1,447,4193,16,
-0,711,1,2458,980,
-1,2459,986,1,1958,
-4194,16,0,711,1,
-2462,993,1,1657,998,
-1,2464,1003,1,199,
-4195,16,0,711,1,
-459,4196,16,0,711,
-1,462,4197,16,0,
-711,1,217,4198,16,
-0,711,1,2227,1012,
-1,1225,4199,16,0,
-711,1,1479,4200,16,
-0,711,1,1731,4201,
-16,0,711,1,1989,
-1020,1,1990,4202,16,
-0,711,1,236,4203,
-16,0,711,1,1756,
-4204,16,0,711,1,
-96,4205,19,103,1,
-96,4206,5,1,1,
-0,4207,16,0,104,
-1,97,4208,19,142,
-1,97,4209,5,1,
-1,0,4210,16,0,
-140,1,98,4211,19,
-172,1,98,4212,5,
-2,1,0,4213,16,
-0,170,1,2798,4214,
-16,0,497,1,99,
-4215,19,169,1,99,
-4216,5,2,1,0,
-4217,16,0,167,1,
-2798,4218,16,0,268,
-1,100,4219,19,485,
-1,100,4220,5,2,
-1,0,4221,16,0,
-752,1,2798,4222,16,
-0,483,1,101,4223,
-19,279,1,101,4224,
-5,4,1,0,4225,
-16,0,354,1,2809,
-4226,16,0,277,1,
-2798,4227,16,0,354,
-1,2739,4228,16,0,
-277,1,102,4229,19,
-309,1,102,4230,5,
-2,1,2640,4231,16,
-0,307,1,2470,4232,
-16,0,760,1,103,
-4233,19,730,1,103,
-4234,5,4,1,2640,
-4235,16,0,737,1,
-2470,4236,16,0,737,
-1,2582,4237,16,0,
-728,1,2682,4238,16,
-0,728,1,104,4239,
-19,727,1,104,4240,
-5,4,1,2640,4241,
-16,0,736,1,2470,
-4242,16,0,736,1,
-2582,4243,16,0,725,
-1,2682,4244,16,0,
-725,1,105,4245,19,
-652,1,105,4246,5,
-4,1,2640,4247,16,
-0,650,1,2470,4248,
-16,0,650,1,2582,
-4249,16,0,724,1,
-2682,4250,16,0,724,
-1,106,4251,19,333,
-1,106,4252,5,4,
-1,2640,4253,16,0,
-331,1,2470,4254,16,
-0,331,1,2582,4255,
-16,0,639,1,2682,
-4256,16,0,639,1,
-107,4257,19,638,1,
-107,4258,5,4,1,
-2640,4259,16,0,734,
-1,2470,4260,16,0,
-734,1,2582,4261,16,
-0,636,1,2682,4262,
-16,0,636,1,108,
-4263,19,635,1,108,
-4264,5,4,1,2640,
-4265,16,0,733,1,
-2470,4266,16,0,733,
-1,2582,4267,16,0,
-633,1,2682,4268,16,
-0,633,1,109,4269,
-19,145,1,109,4270,
-5,4,1,2640,4271,
-16,0,143,1,2470,
-4272,16,0,143,1,
-2582,4273,16,0,247,
-1,2682,4274,16,0,
-247,1,110,4275,19,
-150,1,110,4276,5,
-3,1,2567,4277,16,
-0,753,1,2745,4278,
-16,0,204,1,10,
-4279,16,0,148,1,
-111,4280,19,658,1,
-111,4281,5,1,1,
-2553,4282,16,0,656,
-1,112,4283,19,524,
-1,112,4284,5,1,
-1,2545,4285,16,0,
-522,1,113,4286,19,
-511,1,113,4287,5,
-1,1,2537,4288,16,
-0,509,1,114,4289,
-19,501,1,114,4290,
-5,1,1,2522,4291,
-16,0,499,1,115,
-4292,19,481,1,115,
-4293,5,1,1,2506,
-4294,16,0,479,1,
-116,4295,19,160,1,
-116,4296,5,17,1,
-0,4297,16,0,766,
-1,2075,4298,16,0,
-746,1,2337,4299,16,
-0,746,1,2745,4300,
-16,0,369,1,2413,
-4301,16,0,746,1,
-10,4302,16,0,369,
-1,1901,4303,16,0,
-746,1,2198,4304,16,
-0,746,1,21,4305,
-16,0,158,1,2106,
-4306,16,0,746,1,
-2798,4307,16,0,766,
-1,2567,4308,16,0,
-369,1,1804,4309,16,
-0,746,1,1990,4310,
-16,0,746,1,32,
-4311,16,0,746,1,
-1958,4312,16,0,746,
-1,1775,4313,16,0,
-746,1,117,4314,19,
-655,1,117,4315,5,
-1,1,2553,4316,16,
-0,653,1,118,4317,
-19,242,1,118,4318,
-5,3,1,2522,4319,
-16,0,489,1,2545,
-4320,16,0,240,1,
-2506,4321,16,0,469,
-1,119,4322,19,475,
-1,119,4323,5,3,
-1,2510,4324,16,0,
-473,1,2514,4325,16,
-0,478,1,2537,4326,
-16,0,508,1,120,
-4327,19,303,1,120,
-4328,5,2,1,2525,
-4329,16,0,301,1,
-2529,4330,16,0,498,
-1,121,4331,19,130,
-1,121,4332,5,18,
-1,0,4333,16,0,
-128,1,2075,4334,16,
-0,146,1,2337,4335,
-16,0,146,1,2745,
-4336,16,0,146,1,
-2413,4337,16,0,146,
-1,10,4338,16,0,
-146,1,2198,4339,16,
-0,146,1,1901,4340,
-16,0,146,1,52,
-4341,16,0,207,1,
-21,4342,16,0,146,
-1,2106,4343,16,0,
-146,1,2798,4344,16,
-0,128,1,2567,4345,
-16,0,146,1,1804,
-4346,16,0,146,1,
-1990,4347,16,0,146,
-1,32,4348,16,0,
-146,1,1958,4349,16,
-0,146,1,1775,4350,
-16,0,146,1,122,
-4351,19,547,1,122,
-4352,5,4,1,2640,
-4353,16,0,545,1,
-2470,4354,16,0,545,
-1,2582,4355,16,0,
-545,1,2682,4356,16,
-0,545,1,123,4357,
-19,538,1,123,4358,
-5,4,1,2640,4359,
-16,0,536,1,2470,
-4360,16,0,536,1,
-2582,4361,16,0,536,
-1,2682,4362,16,0,
-536,1,124,4363,19,
-647,1,124,4364,5,
-4,1,2640,4365,16,
-0,645,1,2470,4366,
-16,0,645,1,2582,
-4367,16,0,645,1,
-2682,4368,16,0,645,
-1,125,4369,19,516,
-1,125,4370,5,4,
-1,2640,4371,16,0,
-514,1,2470,4372,16,
-0,514,1,2582,4373,
-16,0,514,1,2682,
-4374,16,0,514,1,
-126,4375,19,630,1,
-126,4376,5,4,1,
-2640,4377,16,0,628,
-1,2470,4378,16,0,
-628,1,2582,4379,16,
-0,628,1,2682,4380,
-16,0,628,1,127,
-4381,19,769,1,127,
-4382,5,4,1,2640,
-4383,16,0,767,1,
-2470,4384,16,0,767,
-1,2582,4385,16,0,
-767,1,2682,4386,16,
-0,767,1,128,4387,
-19,759,1,128,4388,
-5,4,1,2640,4389,
-16,0,757,1,2470,
-4390,16,0,757,1,
-2582,4391,16,0,757,
-1,2682,4392,16,0,
-757,1,129,4393,19,
-368,1,129,4394,5,
-20,1,2518,4395,16,
-0,688,1,2075,4396,
-16,0,582,1,2558,
-4397,16,0,535,1,
-2337,4398,16,0,582,
-1,2413,4399,16,0,
-582,1,2563,4400,16,
-0,544,1,1901,4401,
-16,0,582,1,2198,
-4402,16,0,582,1,
-2533,4403,16,0,503,
-1,2756,4404,16,0,
-765,1,2106,4405,16,
-0,582,1,2541,4406,
-16,0,632,1,1804,
-4407,16,0,582,1,
-1990,4408,16,0,582,
-1,31,4409,16,0,
-366,1,32,4410,16,
-0,582,1,2549,4411,
-16,0,527,1,1958,
-4412,16,0,582,1,
-2578,4413,16,0,756,
-1,1775,4414,16,0,
-582,1,130,4415,19,
-330,1,130,4416,5,
-1,1,32,4417,16,
-0,328,1,131,4418,
-19,282,1,131,4419,
-5,11,1,2075,4420,
-16,0,675,1,2337,
-4421,16,0,287,1,
-2413,4422,16,0,504,
-1,1901,4423,16,0,
-424,1,2198,4424,16,
-0,349,1,2106,4425,
-16,0,704,1,1804,
-4426,16,0,314,1,
-1990,4427,16,0,570,
-1,32,4428,16,0,
-361,1,1958,4429,16,
-0,518,1,1775,4430,
-16,0,280,1,132,
-4431,19,681,1,132,
-4432,5,11,1,2075,
-4433,16,0,679,1,
-2337,4434,16,0,679,
-1,2413,4435,16,0,
-679,1,1901,4436,16,
-0,679,1,2198,4437,
-16,0,679,1,2106,
-4438,16,0,679,1,
-1804,4439,16,0,679,
-1,1990,4440,16,0,
-679,1,32,4441,16,
-0,679,1,1958,4442,
-16,0,679,1,1775,
-4443,16,0,679,1,
-133,4444,19,742,1,
-133,4445,5,11,1,
-2075,4446,16,0,740,
-1,2337,4447,16,0,
-740,1,2413,4448,16,
-0,740,1,1901,4449,
-16,0,740,1,2198,
-4450,16,0,740,1,
-2106,4451,16,0,740,
-1,1804,4452,16,0,
-740,1,1990,4453,16,
-0,740,1,32,4454,
-16,0,740,1,1958,
-4455,16,0,740,1,
-1775,4456,16,0,740,
-1,134,4457,19,176,
-1,134,4458,5,31,
-1,1901,4459,16,0,
-745,1,1479,4460,16,
-0,640,1,2075,4461,
-16,0,745,1,1695,
-4462,16,0,205,1,
-1756,4463,16,0,203,
-1,2413,4464,16,0,
-745,1,2198,4465,16,
-0,745,1,1876,4466,
-16,0,762,1,1659,
-4467,16,0,203,1,
-1443,4468,16,0,598,
-1,1117,4469,16,0,
-174,1,1990,4470,16,
-0,745,1,1189,4471,
-16,0,258,1,1775,
-4472,16,0,745,1,
-32,4473,16,0,745,
-1,2106,4474,16,0,
-745,1,1515,4475,16,
-0,677,1,2337,4476,
-16,0,745,1,52,
-4477,16,0,689,1,
-1804,4478,16,0,745,
-1,1261,4479,16,0,
-326,1,1153,4480,16,
-0,265,1,1225,4481,
-16,0,297,1,1335,
-4482,16,0,495,1,
-1933,4483,16,0,643,
-1,1834,4484,16,0,
-343,1,1297,4485,16,
-0,353,1,1407,4486,
-16,0,668,1,2318,
-4487,16,0,203,1,
-1958,4488,16,0,745,
-1,1371,4489,16,0,
-486,1,135,4490,19,
-607,1,135,4491,5,
-11,1,2075,4492,16,
-0,605,1,2337,4493,
-16,0,605,1,2413,
-4494,16,0,605,1,
-1901,4495,16,0,605,
-1,2198,4496,16,0,
-605,1,2106,4497,16,
-0,605,1,1804,4498,
-16,0,605,1,1990,
-4499,16,0,605,1,
-32,4500,16,0,605,
-1,1958,4501,16,0,
-605,1,1775,4502,16,
-0,605,1,136,4503,
-19,603,1,136,4504,
-5,11,1,2075,4505,
-16,0,601,1,2337,
-4506,16,0,601,1,
-2413,4507,16,0,601,
-1,1901,4508,16,0,
-601,1,2198,4509,16,
-0,601,1,2106,4510,
-16,0,601,1,1804,
-4511,16,0,601,1,
-1990,4512,16,0,601,
-1,32,4513,16,0,
-601,1,1958,4514,16,
-0,601,1,1775,4515,
-16,0,601,1,137,
-4516,19,672,1,137,
-4517,5,11,1,2075,
-4518,16,0,670,1,
-2337,4519,16,0,670,
-1,2413,4520,16,0,
-670,1,1901,4521,16,
-0,670,1,2198,4522,
-16,0,670,1,2106,
-4523,16,0,670,1,
-1804,4524,16,0,670,
-1,1990,4525,16,0,
-670,1,32,4526,16,
-0,670,1,1958,4527,
-16,0,670,1,1775,
-4528,16,0,670,1,
-138,4529,19,597,1,
-138,4530,5,11,1,
-2075,4531,16,0,595,
-1,2337,4532,16,0,
-595,1,2413,4533,16,
-0,595,1,1901,4534,
-16,0,595,1,2198,
-4535,16,0,595,1,
-2106,4536,16,0,595,
-1,1804,4537,16,0,
-595,1,1990,4538,16,
-0,595,1,32,4539,
-16,0,595,1,1958,
-4540,16,0,595,1,
-1775,4541,16,0,595,
-1,139,4542,19,594,
-1,139,4543,5,11,
-1,2075,4544,16,0,
-592,1,2337,4545,16,
-0,592,1,2413,4546,
-16,0,592,1,1901,
-4547,16,0,592,1,
-2198,4548,16,0,592,
-1,2106,4549,16,0,
-592,1,1804,4550,16,
-0,592,1,1990,4551,
-16,0,592,1,32,
-4552,16,0,592,1,
-1958,4553,16,0,592,
-1,1775,4554,16,0,
-592,1,140,4555,19,
-591,1,140,4556,5,
-11,1,2075,4557,16,
-0,589,1,2337,4558,
-16,0,589,1,2413,
-4559,16,0,589,1,
-1901,4560,16,0,589,
-1,2198,4561,16,0,
-589,1,2106,4562,16,
-0,589,1,1804,4563,
-16,0,589,1,1990,
-4564,16,0,589,1,
-32,4565,16,0,589,
-1,1958,4566,16,0,
-589,1,1775,4567,16,
-0,589,1,141,4568,
-19,588,1,141,4569,
-5,11,1,2075,4570,
-16,0,586,1,2337,
-4571,16,0,586,1,
-2413,4572,16,0,586,
-1,1901,4573,16,0,
-586,1,2198,4574,16,
-0,586,1,2106,4575,
-16,0,586,1,1804,
-4576,16,0,586,1,
-1990,4577,16,0,586,
-1,32,4578,16,0,
-586,1,1958,4579,16,
-0,586,1,1775,4580,
-16,0,586,1,142,
-4581,19,585,1,142,
-4582,5,11,1,2075,
-4583,16,0,583,1,
-2337,4584,16,0,583,
-1,2413,4585,16,0,
-583,1,1901,4586,16,
-0,583,1,2198,4587,
-16,0,583,1,2106,
-4588,16,0,583,1,
-1804,4589,16,0,583,
-1,1990,4590,16,0,
-583,1,32,4591,16,
-0,583,1,1958,4592,
-16,0,583,1,1775,
-4593,16,0,583,1,
-143,4594,19,156,1,
-143,4595,5,3,1,
-1756,4596,16,0,313,
-1,2318,4597,16,0,
-325,1,1659,4598,16,
-0,154,1,144,4599,
-19,624,1,144,4600,
-5,68,1,1901,4601,
-16,0,622,1,1479,
-4602,16,0,622,1,
-112,4603,16,0,622,
-1,2293,4604,16,0,
-622,1,1804,4605,16,
-0,622,1,431,4606,
-16,0,622,1,1443,
-4607,16,0,622,1,
-1756,4608,16,0,622,
-1,124,4609,16,0,
-622,1,525,4610,16,
-0,622,1,236,4611,
-16,0,622,1,346,
-4612,16,0,622,1,
-1876,4613,16,0,622,
-1,1659,4614,16,0,
-622,1,1225,4615,16,
-0,622,1,1117,4616,
-16,0,622,1,137,
-4617,16,0,622,1,
-2318,4618,16,0,622,
-1,1775,4619,16,0,
-622,1,32,4620,16,
-0,622,1,1407,4621,
-16,0,622,1,2761,
-4622,16,0,622,1,
-256,4623,16,0,622,
-1,459,4624,16,0,
-622,1,406,4625,16,
-0,622,1,41,4626,
-16,0,622,1,151,
-4627,16,0,622,1,
-43,4628,16,0,622,
-1,1585,4629,16,0,
-622,1,1990,4630,16,
-0,622,1,2337,4631,
-16,0,622,1,509,
-4632,16,0,622,1,
-52,4633,16,0,622,
-1,381,4634,16,0,
-622,1,447,4635,16,
-0,622,1,166,4636,
-16,0,622,1,462,
-4637,16,0,622,1,
-277,4638,16,0,622,
-1,1695,4639,16,0,
-622,1,62,4640,16,
-0,685,1,1153,4641,
-16,0,622,1,2106,
-4642,16,0,622,1,
-1335,4643,16,0,622,
-1,71,4644,16,0,
-622,1,182,4645,16,
-0,622,1,76,4646,
-16,0,622,1,79,
-4647,16,0,622,1,
-1933,4648,16,0,622,
-1,299,4649,16,0,
-622,1,85,4650,16,
-0,622,1,1515,4651,
-16,0,622,1,2198,
-4652,16,0,622,1,
-89,4653,16,0,622,
-1,1834,4654,16,0,
-622,1,1622,4655,16,
-0,622,1,2413,4656,
-16,0,622,1,2075,
-4657,16,0,622,1,
-1731,4658,16,0,622,
-1,97,4659,16,0,
-622,1,1297,4660,16,
-0,622,1,1189,4661,
-16,0,622,1,102,
-4662,16,0,622,1,
-1261,4663,16,0,622,
-1,322,4664,16,0,
-622,1,1958,4665,16,
-0,622,1,199,4666,
-16,0,622,1,1371,
-4667,16,0,622,1,
-217,4668,16,0,622,
-1,145,4669,19,699,
-1,145,4670,5,2,
-1,459,4671,16,0,
-697,1,41,4672,16,
-0,770,1,146,4673,
-19,703,1,146,4674,
-5,3,1,462,4675,
-16,0,701,1,459,
-4676,16,0,723,1,
-41,4677,16,0,723,
-1,147,4678,19,4679,
-4,36,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,1,147,
-4674,1,148,4680,19,
-620,1,148,4681,5,
-68,1,1901,4682,16,
-0,618,1,1479,4683,
-16,0,618,1,112,
-4684,16,0,618,1,
-2293,4685,16,0,618,
-1,1804,4686,16,0,
-618,1,431,4687,16,
-0,618,1,1443,4688,
-16,0,618,1,1756,
-4689,16,0,618,1,
-124,4690,16,0,618,
-1,525,4691,16,0,
-618,1,236,4692,16,
-0,618,1,346,4693,
-16,0,618,1,1876,
-4694,16,0,618,1,
-1659,4695,16,0,618,
-1,1225,4696,16,0,
-618,1,1117,4697,16,
-0,618,1,137,4698,
-16,0,618,1,2318,
-4699,16,0,618,1,
-1775,4700,16,0,618,
-1,32,4701,16,0,
-618,1,1407,4702,16,
-0,618,1,2761,4703,
-16,0,618,1,256,
-4704,16,0,618,1,
-459,4705,16,0,618,
-1,406,4706,16,0,
-618,1,41,4707,16,
-0,618,1,151,4708,
-16,0,618,1,43,
-4709,16,0,618,1,
-1585,4710,16,0,618,
-1,1990,4711,16,0,
-618,1,2337,4712,16,
-0,618,1,509,4713,
-16,0,618,1,52,
-4714,16,0,618,1,
-381,4715,16,0,618,
-1,447,4716,16,0,
-618,1,166,4717,16,
-0,618,1,462,4718,
-16,0,618,1,277,
-4719,16,0,618,1,
-1695,4720,16,0,618,
-1,62,4721,16,0,
-686,1,1153,4722,16,
-0,618,1,2106,4723,
-16,0,618,1,1335,
-4724,16,0,618,1,
-71,4725,16,0,618,
-1,182,4726,16,0,
-618,1,76,4727,16,
-0,618,1,79,4728,
-16,0,618,1,1933,
-4729,16,0,618,1,
-299,4730,16,0,618,
-1,85,4731,16,0,
-618,1,1515,4732,16,
-0,618,1,2198,4733,
-16,0,618,1,89,
-4734,16,0,618,1,
-1834,4735,16,0,618,
-1,1622,4736,16,0,
-618,1,2413,4737,16,
-0,618,1,2075,4738,
-16,0,618,1,1731,
-4739,16,0,618,1,
-97,4740,16,0,618,
-1,1297,4741,16,0,
-618,1,1189,4742,16,
-0,618,1,102,4743,
-16,0,618,1,1261,
-4744,16,0,618,1,
-322,4745,16,0,618,
-1,1958,4746,16,0,
-618,1,199,4747,16,
-0,618,1,1371,4748,
-16,0,618,1,217,
-4749,16,0,618,1,
-149,4750,19,4751,4,
-28,86,0,101,0,
-99,0,116,0,111,
-0,114,0,67,0,
-111,0,110,0,115,
-0,116,0,97,0,
-110,0,116,0,1,
-149,4681,1,150,4752,
-19,4753,4,32,82,
-0,111,0,116,0,
-97,0,116,0,105,
-0,111,0,110,0,
+4202,16,0,711,1,
+236,4203,16,0,711,
+1,1756,4204,16,0,
+711,1,96,4205,19,
+103,1,96,4206,5,
+1,1,0,4207,16,
+0,104,1,97,4208,
+19,142,1,97,4209,
+5,1,1,0,4210,
+16,0,140,1,98,
+4211,19,172,1,98,
+4212,5,2,1,0,
+4213,16,0,170,1,
+2798,4214,16,0,497,
+1,99,4215,19,169,
+1,99,4216,5,2,
+1,0,4217,16,0,
+167,1,2798,4218,16,
+0,268,1,100,4219,
+19,485,1,100,4220,
+5,2,1,0,4221,
+16,0,752,1,2798,
+4222,16,0,483,1,
+101,4223,19,279,1,
+101,4224,5,4,1,
+0,4225,16,0,354,
+1,2809,4226,16,0,
+277,1,2798,4227,16,
+0,354,1,2739,4228,
+16,0,277,1,102,
+4229,19,309,1,102,
+4230,5,2,1,2640,
+4231,16,0,307,1,
+2470,4232,16,0,760,
+1,103,4233,19,730,
+1,103,4234,5,4,
+1,2640,4235,16,0,
+737,1,2470,4236,16,
+0,737,1,2582,4237,
+16,0,728,1,2682,
+4238,16,0,728,1,
+104,4239,19,727,1,
+104,4240,5,4,1,
+2640,4241,16,0,736,
+1,2470,4242,16,0,
+736,1,2582,4243,16,
+0,725,1,2682,4244,
+16,0,725,1,105,
+4245,19,652,1,105,
+4246,5,4,1,2640,
+4247,16,0,650,1,
+2470,4248,16,0,650,
+1,2582,4249,16,0,
+724,1,2682,4250,16,
+0,724,1,106,4251,
+19,333,1,106,4252,
+5,4,1,2640,4253,
+16,0,331,1,2470,
+4254,16,0,331,1,
+2582,4255,16,0,639,
+1,2682,4256,16,0,
+639,1,107,4257,19,
+638,1,107,4258,5,
+4,1,2640,4259,16,
+0,734,1,2470,4260,
+16,0,734,1,2582,
+4261,16,0,636,1,
+2682,4262,16,0,636,
+1,108,4263,19,635,
+1,108,4264,5,4,
+1,2640,4265,16,0,
+733,1,2470,4266,16,
+0,733,1,2582,4267,
+16,0,633,1,2682,
+4268,16,0,633,1,
+109,4269,19,145,1,
+109,4270,5,4,1,
+2640,4271,16,0,143,
+1,2470,4272,16,0,
+143,1,2582,4273,16,
+0,247,1,2682,4274,
+16,0,247,1,110,
+4275,19,150,1,110,
+4276,5,3,1,2567,
+4277,16,0,753,1,
+2745,4278,16,0,204,
+1,10,4279,16,0,
+148,1,111,4280,19,
+658,1,111,4281,5,
+1,1,2553,4282,16,
+0,656,1,112,4283,
+19,524,1,112,4284,
+5,1,1,2545,4285,
+16,0,522,1,113,
+4286,19,511,1,113,
+4287,5,1,1,2537,
+4288,16,0,509,1,
+114,4289,19,501,1,
+114,4290,5,1,1,
+2522,4291,16,0,499,
+1,115,4292,19,481,
+1,115,4293,5,1,
+1,2506,4294,16,0,
+479,1,116,4295,19,
+160,1,116,4296,5,
+17,1,0,4297,16,
+0,766,1,2075,4298,
+16,0,746,1,2337,
+4299,16,0,746,1,
+2745,4300,16,0,369,
+1,2413,4301,16,0,
+746,1,10,4302,16,
+0,369,1,1901,4303,
+16,0,746,1,2198,
+4304,16,0,746,1,
+21,4305,16,0,158,
+1,2106,4306,16,0,
+746,1,2798,4307,16,
+0,766,1,2567,4308,
+16,0,369,1,1804,
+4309,16,0,746,1,
+1990,4310,16,0,746,
+1,32,4311,16,0,
+746,1,1958,4312,16,
+0,746,1,1775,4313,
+16,0,746,1,117,
+4314,19,655,1,117,
+4315,5,1,1,2553,
+4316,16,0,653,1,
+118,4317,19,242,1,
+118,4318,5,3,1,
+2522,4319,16,0,489,
+1,2545,4320,16,0,
+240,1,2506,4321,16,
+0,469,1,119,4322,
+19,475,1,119,4323,
+5,3,1,2510,4324,
+16,0,473,1,2514,
+4325,16,0,478,1,
+2537,4326,16,0,508,
+1,120,4327,19,303,
+1,120,4328,5,2,
+1,2525,4329,16,0,
+301,1,2529,4330,16,
+0,498,1,121,4331,
+19,130,1,121,4332,
+5,18,1,0,4333,
+16,0,128,1,2075,
+4334,16,0,146,1,
+2337,4335,16,0,146,
+1,2745,4336,16,0,
+146,1,2413,4337,16,
+0,146,1,10,4338,
+16,0,146,1,2198,
+4339,16,0,146,1,
+1901,4340,16,0,146,
+1,52,4341,16,0,
+207,1,21,4342,16,
+0,146,1,2106,4343,
+16,0,146,1,2798,
+4344,16,0,128,1,
+2567,4345,16,0,146,
+1,1804,4346,16,0,
+146,1,1990,4347,16,
+0,146,1,32,4348,
+16,0,146,1,1958,
+4349,16,0,146,1,
+1775,4350,16,0,146,
+1,122,4351,19,547,
+1,122,4352,5,4,
+1,2640,4353,16,0,
+545,1,2470,4354,16,
+0,545,1,2582,4355,
+16,0,545,1,2682,
+4356,16,0,545,1,
+123,4357,19,538,1,
+123,4358,5,4,1,
+2640,4359,16,0,536,
+1,2470,4360,16,0,
+536,1,2582,4361,16,
+0,536,1,2682,4362,
+16,0,536,1,124,
+4363,19,647,1,124,
+4364,5,4,1,2640,
+4365,16,0,645,1,
+2470,4366,16,0,645,
+1,2582,4367,16,0,
+645,1,2682,4368,16,
+0,645,1,125,4369,
+19,516,1,125,4370,
+5,4,1,2640,4371,
+16,0,514,1,2470,
+4372,16,0,514,1,
+2582,4373,16,0,514,
+1,2682,4374,16,0,
+514,1,126,4375,19,
+630,1,126,4376,5,
+4,1,2640,4377,16,
+0,628,1,2470,4378,
+16,0,628,1,2582,
+4379,16,0,628,1,
+2682,4380,16,0,628,
+1,127,4381,19,769,
+1,127,4382,5,4,
+1,2640,4383,16,0,
+767,1,2470,4384,16,
+0,767,1,2582,4385,
+16,0,767,1,2682,
+4386,16,0,767,1,
+128,4387,19,759,1,
+128,4388,5,4,1,
+2640,4389,16,0,757,
+1,2470,4390,16,0,
+757,1,2582,4391,16,
+0,757,1,2682,4392,
+16,0,757,1,129,
+4393,19,368,1,129,
+4394,5,20,1,2518,
+4395,16,0,688,1,
+2075,4396,16,0,582,
+1,2558,4397,16,0,
+535,1,2337,4398,16,
+0,582,1,2413,4399,
+16,0,582,1,2563,
+4400,16,0,544,1,
+1901,4401,16,0,582,
+1,2198,4402,16,0,
+582,1,2533,4403,16,
+0,503,1,2756,4404,
+16,0,765,1,2106,
+4405,16,0,582,1,
+2541,4406,16,0,632,
+1,1804,4407,16,0,
+582,1,1990,4408,16,
+0,582,1,31,4409,
+16,0,366,1,32,
+4410,16,0,582,1,
+2549,4411,16,0,527,
+1,1958,4412,16,0,
+582,1,2578,4413,16,
+0,756,1,1775,4414,
+16,0,582,1,130,
+4415,19,330,1,130,
+4416,5,1,1,32,
+4417,16,0,328,1,
+131,4418,19,282,1,
+131,4419,5,11,1,
+2075,4420,16,0,675,
+1,2337,4421,16,0,
+287,1,2413,4422,16,
+0,504,1,1901,4423,
+16,0,424,1,2198,
+4424,16,0,349,1,
+2106,4425,16,0,704,
+1,1804,4426,16,0,
+314,1,1990,4427,16,
+0,570,1,32,4428,
+16,0,361,1,1958,
+4429,16,0,518,1,
+1775,4430,16,0,280,
+1,132,4431,19,681,
+1,132,4432,5,11,
+1,2075,4433,16,0,
+679,1,2337,4434,16,
+0,679,1,2413,4435,
+16,0,679,1,1901,
+4436,16,0,679,1,
+2198,4437,16,0,679,
+1,2106,4438,16,0,
+679,1,1804,4439,16,
+0,679,1,1990,4440,
+16,0,679,1,32,
+4441,16,0,679,1,
+1958,4442,16,0,679,
+1,1775,4443,16,0,
+679,1,133,4444,19,
+742,1,133,4445,5,
+11,1,2075,4446,16,
+0,740,1,2337,4447,
+16,0,740,1,2413,
+4448,16,0,740,1,
+1901,4449,16,0,740,
+1,2198,4450,16,0,
+740,1,2106,4451,16,
+0,740,1,1804,4452,
+16,0,740,1,1990,
+4453,16,0,740,1,
+32,4454,16,0,740,
+1,1958,4455,16,0,
+740,1,1775,4456,16,
+0,740,1,134,4457,
+19,176,1,134,4458,
+5,31,1,1901,4459,
+16,0,745,1,1479,
+4460,16,0,640,1,
+2075,4461,16,0,745,
+1,1695,4462,16,0,
+205,1,1756,4463,16,
+0,203,1,2413,4464,
+16,0,745,1,2198,
+4465,16,0,745,1,
+1876,4466,16,0,762,
+1,1659,4467,16,0,
+203,1,1443,4468,16,
+0,598,1,1117,4469,
+16,0,174,1,1990,
+4470,16,0,745,1,
+1189,4471,16,0,258,
+1,1775,4472,16,0,
+745,1,32,4473,16,
+0,745,1,2106,4474,
+16,0,745,1,1515,
+4475,16,0,677,1,
+2337,4476,16,0,745,
+1,52,4477,16,0,
+689,1,1804,4478,16,
+0,745,1,1261,4479,
+16,0,326,1,1153,
+4480,16,0,265,1,
+1225,4481,16,0,297,
+1,1335,4482,16,0,
+495,1,1933,4483,16,
+0,643,1,1834,4484,
+16,0,343,1,1297,
+4485,16,0,353,1,
+1407,4486,16,0,668,
+1,2318,4487,16,0,
+203,1,1958,4488,16,
+0,745,1,1371,4489,
+16,0,486,1,135,
+4490,19,607,1,135,
+4491,5,11,1,2075,
+4492,16,0,605,1,
+2337,4493,16,0,605,
+1,2413,4494,16,0,
+605,1,1901,4495,16,
+0,605,1,2198,4496,
+16,0,605,1,2106,
+4497,16,0,605,1,
+1804,4498,16,0,605,
+1,1990,4499,16,0,
+605,1,32,4500,16,
+0,605,1,1958,4501,
+16,0,605,1,1775,
+4502,16,0,605,1,
+136,4503,19,603,1,
+136,4504,5,11,1,
+2075,4505,16,0,601,
+1,2337,4506,16,0,
+601,1,2413,4507,16,
+0,601,1,1901,4508,
+16,0,601,1,2198,
+4509,16,0,601,1,
+2106,4510,16,0,601,
+1,1804,4511,16,0,
+601,1,1990,4512,16,
+0,601,1,32,4513,
+16,0,601,1,1958,
+4514,16,0,601,1,
+1775,4515,16,0,601,
+1,137,4516,19,672,
+1,137,4517,5,11,
+1,2075,4518,16,0,
+670,1,2337,4519,16,
+0,670,1,2413,4520,
+16,0,670,1,1901,
+4521,16,0,670,1,
+2198,4522,16,0,670,
+1,2106,4523,16,0,
+670,1,1804,4524,16,
+0,670,1,1990,4525,
+16,0,670,1,32,
+4526,16,0,670,1,
+1958,4527,16,0,670,
+1,1775,4528,16,0,
+670,1,138,4529,19,
+597,1,138,4530,5,
+11,1,2075,4531,16,
+0,595,1,2337,4532,
+16,0,595,1,2413,
+4533,16,0,595,1,
+1901,4534,16,0,595,
+1,2198,4535,16,0,
+595,1,2106,4536,16,
+0,595,1,1804,4537,
+16,0,595,1,1990,
+4538,16,0,595,1,
+32,4539,16,0,595,
+1,1958,4540,16,0,
+595,1,1775,4541,16,
+0,595,1,139,4542,
+19,594,1,139,4543,
+5,11,1,2075,4544,
+16,0,592,1,2337,
+4545,16,0,592,1,
+2413,4546,16,0,592,
+1,1901,4547,16,0,
+592,1,2198,4548,16,
+0,592,1,2106,4549,
+16,0,592,1,1804,
+4550,16,0,592,1,
+1990,4551,16,0,592,
+1,32,4552,16,0,
+592,1,1958,4553,16,
+0,592,1,1775,4554,
+16,0,592,1,140,
+4555,19,591,1,140,
+4556,5,11,1,2075,
+4557,16,0,589,1,
+2337,4558,16,0,589,
+1,2413,4559,16,0,
+589,1,1901,4560,16,
+0,589,1,2198,4561,
+16,0,589,1,2106,
+4562,16,0,589,1,
+1804,4563,16,0,589,
+1,1990,4564,16,0,
+589,1,32,4565,16,
+0,589,1,1958,4566,
+16,0,589,1,1775,
+4567,16,0,589,1,
+141,4568,19,588,1,
+141,4569,5,11,1,
+2075,4570,16,0,586,
+1,2337,4571,16,0,
+586,1,2413,4572,16,
+0,586,1,1901,4573,
+16,0,586,1,2198,
+4574,16,0,586,1,
+2106,4575,16,0,586,
+1,1804,4576,16,0,
+586,1,1990,4577,16,
+0,586,1,32,4578,
+16,0,586,1,1958,
+4579,16,0,586,1,
+1775,4580,16,0,586,
+1,142,4581,19,585,
+1,142,4582,5,11,
+1,2075,4583,16,0,
+583,1,2337,4584,16,
+0,583,1,2413,4585,
+16,0,583,1,1901,
+4586,16,0,583,1,
+2198,4587,16,0,583,
+1,2106,4588,16,0,
+583,1,1804,4589,16,
+0,583,1,1990,4590,
+16,0,583,1,32,
+4591,16,0,583,1,
+1958,4592,16,0,583,
+1,1775,4593,16,0,
+583,1,143,4594,19,
+156,1,143,4595,5,
+3,1,1756,4596,16,
+0,313,1,2318,4597,
+16,0,325,1,1659,
+4598,16,0,154,1,
+144,4599,19,624,1,
+144,4600,5,68,1,
+1901,4601,16,0,622,
+1,1479,4602,16,0,
+622,1,112,4603,16,
+0,622,1,2293,4604,
+16,0,622,1,1804,
+4605,16,0,622,1,
+431,4606,16,0,622,
+1,1443,4607,16,0,
+622,1,1756,4608,16,
+0,622,1,124,4609,
+16,0,622,1,525,
+4610,16,0,622,1,
+236,4611,16,0,622,
+1,346,4612,16,0,
+622,1,1876,4613,16,
+0,622,1,1659,4614,
+16,0,622,1,1225,
+4615,16,0,622,1,
+1117,4616,16,0,622,
+1,137,4617,16,0,
+622,1,2318,4618,16,
+0,622,1,1775,4619,
+16,0,622,1,32,
+4620,16,0,622,1,
+1407,4621,16,0,622,
+1,2761,4622,16,0,
+622,1,256,4623,16,
+0,622,1,459,4624,
+16,0,622,1,406,
+4625,16,0,622,1,
+41,4626,16,0,622,
+1,151,4627,16,0,
+622,1,43,4628,16,
+0,622,1,1585,4629,
+16,0,622,1,1990,
+4630,16,0,622,1,
+2337,4631,16,0,622,
+1,509,4632,16,0,
+622,1,52,4633,16,
+0,622,1,381,4634,
+16,0,622,1,447,
+4635,16,0,622,1,
+166,4636,16,0,622,
+1,462,4637,16,0,
+622,1,277,4638,16,
+0,622,1,1695,4639,
+16,0,622,1,62,
+4640,16,0,685,1,
+1153,4641,16,0,622,
+1,2106,4642,16,0,
+622,1,1335,4643,16,
+0,622,1,71,4644,
+16,0,622,1,182,
+4645,16,0,622,1,
+76,4646,16,0,622,
+1,79,4647,16,0,
+622,1,1933,4648,16,
+0,622,1,299,4649,
+16,0,622,1,85,
+4650,16,0,622,1,
+1515,4651,16,0,622,
+1,2198,4652,16,0,
+622,1,89,4653,16,
+0,622,1,1834,4654,
+16,0,622,1,1622,
+4655,16,0,622,1,
+2413,4656,16,0,622,
+1,2075,4657,16,0,
+622,1,1731,4658,16,
+0,622,1,97,4659,
+16,0,622,1,1297,
+4660,16,0,622,1,
+1189,4661,16,0,622,
+1,102,4662,16,0,
+622,1,1261,4663,16,
+0,622,1,322,4664,
+16,0,622,1,1958,
+4665,16,0,622,1,
+199,4666,16,0,622,
+1,1371,4667,16,0,
+622,1,217,4668,16,
+0,622,1,145,4669,
+19,699,1,145,4670,
+5,2,1,459,4671,
+16,0,697,1,41,
+4672,16,0,770,1,
+146,4673,19,703,1,
+146,4674,5,3,1,
+462,4675,16,0,701,
+1,459,4676,16,0,
+723,1,41,4677,16,
+0,723,1,147,4678,
+19,4679,4,36,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+1,147,4674,1,148,
+4680,19,620,1,148,
+4681,5,68,1,1901,
+4682,16,0,618,1,
+1479,4683,16,0,618,
+1,112,4684,16,0,
+618,1,2293,4685,16,
+0,618,1,1804,4686,
+16,0,618,1,431,
+4687,16,0,618,1,
+1443,4688,16,0,618,
+1,1756,4689,16,0,
+618,1,124,4690,16,
+0,618,1,525,4691,
+16,0,618,1,236,
+4692,16,0,618,1,
+346,4693,16,0,618,
+1,1876,4694,16,0,
+618,1,1659,4695,16,
+0,618,1,1225,4696,
+16,0,618,1,1117,
+4697,16,0,618,1,
+137,4698,16,0,618,
+1,2318,4699,16,0,
+618,1,1775,4700,16,
+0,618,1,32,4701,
+16,0,618,1,1407,
+4702,16,0,618,1,
+2761,4703,16,0,618,
+1,256,4704,16,0,
+618,1,459,4705,16,
+0,618,1,406,4706,
+16,0,618,1,41,
+4707,16,0,618,1,
+151,4708,16,0,618,
+1,43,4709,16,0,
+618,1,1585,4710,16,
+0,618,1,1990,4711,
+16,0,618,1,2337,
+4712,16,0,618,1,
+509,4713,16,0,618,
+1,52,4714,16,0,
+618,1,381,4715,16,
+0,618,1,447,4716,
+16,0,618,1,166,
+4717,16,0,618,1,
+462,4718,16,0,618,
+1,277,4719,16,0,
+618,1,1695,4720,16,
+0,618,1,62,4721,
+16,0,686,1,1153,
+4722,16,0,618,1,
+2106,4723,16,0,618,
+1,1335,4724,16,0,
+618,1,71,4725,16,
+0,618,1,182,4726,
+16,0,618,1,76,
+4727,16,0,618,1,
+79,4728,16,0,618,
+1,1933,4729,16,0,
+618,1,299,4730,16,
+0,618,1,85,4731,
+16,0,618,1,1515,
+4732,16,0,618,1,
+2198,4733,16,0,618,
+1,89,4734,16,0,
+618,1,1834,4735,16,
+0,618,1,1622,4736,
+16,0,618,1,2413,
+4737,16,0,618,1,
+2075,4738,16,0,618,
+1,1731,4739,16,0,
+618,1,97,4740,16,
+0,618,1,1297,4741,
+16,0,618,1,1189,
+4742,16,0,618,1,
+102,4743,16,0,618,
+1,1261,4744,16,0,
+618,1,322,4745,16,
+0,618,1,1958,4746,
+16,0,618,1,199,
+4747,16,0,618,1,
+1371,4748,16,0,618,
+1,217,4749,16,0,
+618,1,149,4750,19,
+4751,4,28,86,0,
+101,0,99,0,116,
+0,111,0,114,0,
 67,0,111,0,110,
 0,115,0,116,0,
 97,0,110,0,116,
-0,1,150,4681,1,
-151,4754,19,4755,4,
-24,76,0,105,0,
-115,0,116,0,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-1,151,4681,1,152,
-4756,19,184,1,152,
-4757,5,67,1,1901,
-4758,16,0,683,1,
-1479,4759,16,0,609,
-1,112,4760,16,0,
-267,1,2293,4761,16,
-0,296,1,1804,4762,
-16,0,683,1,431,
-4763,16,0,678,1,
-1443,4764,16,0,540,
-1,1756,4765,16,0,
-777,1,124,4766,16,
-0,276,1,525,4767,
-16,0,336,1,236,
-4768,16,0,374,1,
-346,4769,16,0,572,
-1,1876,4770,16,0,
-348,1,1659,4771,16,
-0,777,1,1225,4772,
-16,0,266,1,1117,
-4773,16,0,236,1,
-137,4774,16,0,295,
-1,2318,4775,16,0,
-777,1,1775,4776,16,
-0,683,1,32,4777,
-16,0,683,1,1407,
-4778,16,0,563,1,
-2761,4779,16,0,312,
-1,256,4780,16,0,
-428,1,459,4781,16,
-0,182,1,406,4782,
-16,0,662,1,41,
-4783,16,0,182,1,
-151,4784,16,0,311,
-1,43,4785,16,0,
-735,1,1990,4786,16,
-0,683,1,2337,4787,
-16,0,683,1,509,
-4788,16,0,755,1,
-52,4789,16,0,691,
-1,381,4790,16,0,
-627,1,447,4791,16,
-0,336,1,166,4792,
-16,0,323,1,462,
-4793,16,0,182,1,
-277,4794,16,0,471,
-1,1695,4795,16,0,
-292,1,1261,4796,16,
-0,310,1,1153,4797,
-16,0,189,1,2106,
-4798,16,0,683,1,
-1335,4799,16,0,358,
-1,71,4800,16,0,
-220,1,182,4801,16,
-0,336,1,76,4802,
-16,0,625,1,79,
-4803,16,0,235,1,
-1933,4804,16,0,440,
-1,299,4805,16,0,
-502,1,85,4806,16,
-0,530,1,1515,4807,
-16,0,649,1,2198,
-4808,16,0,683,1,
-89,4809,16,0,248,
-1,1834,4810,16,0,
-322,1,1622,4811,16,
-0,754,1,2413,4812,
-16,0,683,1,2075,
-4813,16,0,683,1,
-1731,4814,16,0,269,
-1,97,4815,16,0,
-444,1,1297,4816,16,
-0,360,1,1189,4817,
-16,0,234,1,102,
-4818,16,0,256,1,
-1585,4819,16,0,764,
-1,322,4820,16,0,
-532,1,1958,4821,16,
-0,683,1,199,4822,
-16,0,347,1,1371,
-4823,16,0,429,1,
-217,4824,16,0,357,
-1,153,4825,19,4826,
-4,36,67,0,111,
+0,1,149,4681,1,
+150,4752,19,4753,4,
+32,82,0,111,0,
+116,0,97,0,116,
+0,105,0,111,0,
+110,0,67,0,111,
 0,110,0,115,0,
 116,0,97,0,110,
-0,116,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,153,
-4757,1,154,4827,19,
-4828,4,30,73,0,
-100,0,101,0,110,
-0,116,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,154,
-4757,1,155,4829,19,
-4830,4,36,73,0,
-100,0,101,0,110,
-0,116,0,68,0,
-111,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,1,
-155,4757,1,156,4831,
-19,4832,4,44,70,
-0,117,0,110,0,
-99,0,116,0,105,
+0,116,0,1,150,
+4681,1,151,4754,19,
+4755,4,24,76,0,
+105,0,115,0,116,
+0,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,1,151,4681,
+1,152,4756,19,184,
+1,152,4757,5,67,
+1,1901,4758,16,0,
+683,1,1479,4759,16,
+0,609,1,112,4760,
+16,0,267,1,2293,
+4761,16,0,296,1,
+1804,4762,16,0,683,
+1,431,4763,16,0,
+678,1,1443,4764,16,
+0,540,1,1756,4765,
+16,0,777,1,124,
+4766,16,0,276,1,
+525,4767,16,0,336,
+1,236,4768,16,0,
+374,1,346,4769,16,
+0,572,1,1876,4770,
+16,0,348,1,1659,
+4771,16,0,777,1,
+1225,4772,16,0,266,
+1,1117,4773,16,0,
+236,1,137,4774,16,
+0,295,1,2318,4775,
+16,0,777,1,1775,
+4776,16,0,683,1,
+32,4777,16,0,683,
+1,1407,4778,16,0,
+563,1,2761,4779,16,
+0,312,1,256,4780,
+16,0,428,1,459,
+4781,16,0,182,1,
+406,4782,16,0,662,
+1,41,4783,16,0,
+182,1,151,4784,16,
+0,311,1,43,4785,
+16,0,735,1,1990,
+4786,16,0,683,1,
+2337,4787,16,0,683,
+1,509,4788,16,0,
+755,1,52,4789,16,
+0,691,1,381,4790,
+16,0,627,1,447,
+4791,16,0,336,1,
+166,4792,16,0,323,
+1,462,4793,16,0,
+182,1,277,4794,16,
+0,471,1,1695,4795,
+16,0,292,1,1261,
+4796,16,0,310,1,
+1153,4797,16,0,189,
+1,2106,4798,16,0,
+683,1,1335,4799,16,
+0,358,1,71,4800,
+16,0,220,1,182,
+4801,16,0,336,1,
+76,4802,16,0,625,
+1,79,4803,16,0,
+235,1,1933,4804,16,
+0,440,1,299,4805,
+16,0,502,1,85,
+4806,16,0,530,1,
+1515,4807,16,0,649,
+1,2198,4808,16,0,
+683,1,89,4809,16,
+0,248,1,1834,4810,
+16,0,322,1,1622,
+4811,16,0,754,1,
+2413,4812,16,0,683,
+1,2075,4813,16,0,
+683,1,1731,4814,16,
+0,269,1,97,4815,
+16,0,444,1,1297,
+4816,16,0,360,1,
+1189,4817,16,0,234,
+1,102,4818,16,0,
+256,1,1585,4819,16,
+0,764,1,322,4820,
+16,0,532,1,1958,
+4821,16,0,683,1,
+199,4822,16,0,347,
+1,1371,4823,16,0,
+429,1,217,4824,16,
+0,357,1,153,4825,
+19,4826,4,36,67,
 0,111,0,110,0,
-67,0,97,0,108,
-0,108,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,156,
-4757,1,157,4833,19,
-4834,4,32,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
+115,0,116,0,97,
+0,110,0,116,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-1,157,4757,1,158,
-4835,19,4836,4,30,
-85,0,110,0,97,
-0,114,0,121,0,
+1,153,4757,1,154,
+4827,19,4828,4,30,
+73,0,100,0,101,
+0,110,0,116,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-1,158,4757,1,159,
-4837,19,4838,4,36,
-84,0,121,0,112,
-0,101,0,99,0,
-97,0,115,0,116,
+1,154,4757,1,155,
+4829,19,4830,4,36,
+73,0,100,0,101,
+0,110,0,116,0,
+68,0,111,0,116,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,1,159,4757,1,
-160,4839,19,4840,4,
-42,80,0,97,0,
-114,0,101,0,110,
-0,116,0,104,0,
-101,0,115,0,105,
-0,115,0,69,0,
+0,1,155,4757,1,
+156,4831,19,4832,4,
+44,70,0,117,0,
+110,0,99,0,116,
+0,105,0,111,0,
+110,0,67,0,97,
+0,108,0,108,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+1,156,4757,1,157,
+4833,19,4834,4,32,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,157,4757,
+1,158,4835,19,4836,
+4,30,85,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,1,158,4757,
+1,159,4837,19,4838,
+4,36,84,0,121,
+0,112,0,101,0,
+99,0,97,0,115,
+0,116,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
-0,110,0,1,160,
-4757,1,161,4841,19,
-4842,4,56,73,0,
-110,0,99,0,114,
+0,110,0,1,159,
+4757,1,160,4839,19,
+4840,4,42,80,0,
+97,0,114,0,101,
+0,110,0,116,0,
+104,0,101,0,115,
+0,105,0,115,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+1,160,4757,1,161,
+4841,19,4842,4,56,
+73,0,110,0,99,
+0,114,0,101,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,114,
 0,101,0,109,0,
 101,0,110,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,1,161,4757,1,
+163,4843,19,792,1,
+163,4206,1,164,4844,
+19,787,1,164,4206,
+1,165,4845,19,3478,
+1,165,4209,1,166,
+4846,19,3496,1,166,
+4209,1,167,4847,19,
+3473,1,167,4209,1,
+168,4848,19,3468,1,
+168,4209,1,169,4849,
+19,3501,1,169,4212,
+1,170,4850,19,3484,
+1,170,4212,1,171,
+4851,19,3491,1,171,
+4216,1,172,4852,19,
+3507,1,172,4216,1,
+173,4853,19,803,1,
+173,4220,1,174,4854,
+19,798,1,174,4220,
+1,175,4855,19,814,
+1,175,4224,1,176,
+4856,19,809,1,176,
+4224,1,177,4857,19,
+1789,1,177,4230,1,
+178,4858,19,1758,1,
+178,4230,1,179,4859,
+19,1784,1,179,4230,
+1,180,4860,19,1837,
+1,180,4230,1,181,
+4861,19,1843,1,181,
+4230,1,182,4862,19,
+1747,1,182,4230,1,
+183,4863,19,1779,1,
+183,4230,1,184,4864,
+19,1742,1,184,4230,
+1,185,4865,19,1774,
+1,185,4230,1,186,
+4866,19,1737,1,186,
+4230,1,187,4867,19,
+1769,1,187,4230,1,
+188,4868,19,1732,1,
+188,4230,1,189,4869,
+19,1764,1,189,4230,
+1,190,4870,19,1832,
+1,190,4230,1,191,
+4871,19,1808,1,191,
+4234,1,192,4872,19,
+1820,1,192,4240,1,
+193,4873,19,1814,1,
+193,4246,1,194,4874,
+19,1802,1,194,4252,
+1,195,4875,19,1827,
+1,195,4258,1,196,
+4876,19,1795,1,196,
+4264,1,197,4877,19,
+1753,1,197,4270,1,
+198,4878,19,1895,1,
+198,4276,1,199,4879,
+19,1871,1,199,4276,
+1,200,4880,19,2280,
+1,200,4281,1,201,
+4881,19,2245,1,201,
+4284,1,202,4882,19,
+2239,1,202,4287,1,
+203,4883,19,2233,1,
+203,4290,1,204,4884,
+19,2265,1,204,4293,
+1,205,4885,19,1222,
+1,205,4296,1,206,
+4886,19,2253,1,206,
+4315,1,207,4887,19,
+1917,1,207,4318,1,
+208,4888,19,1851,1,
+208,4323,1,209,4889,
+19,1864,1,209,4328,
+1,210,4890,19,1006,
+1,210,4394,1,211,
+4891,19,990,1,211,
+4394,1,212,4892,19,
+996,1,212,4416,1,
+213,4893,19,984,1,
+213,4416,1,214,4894,
+19,1250,1,214,4432,
+1,215,4895,19,887,
+1,215,4419,1,216,
+4896,19,1001,1,216,
+4419,1,217,4897,19,
+882,1,217,4419,1,
+218,4898,19,907,1,
+218,4419,1,219,4899,
+19,876,1,219,4419,
+1,220,4900,19,870,
+1,220,4419,1,221,
+4901,19,865,1,221,
+4419,1,222,4902,19,
+860,1,222,4419,1,
+223,4903,19,854,1,
+223,4419,1,224,4904,
+19,849,1,224,4419,
+1,225,4905,19,844,
+1,225,4419,1,226,
+4906,19,839,1,226,
+4419,1,227,4907,19,
+834,1,227,4419,1,
+228,4908,19,1257,1,
+228,4504,1,229,4909,
+19,1395,1,229,4517,
+1,230,4910,19,1244,
+1,230,4530,1,231,
+4911,19,1383,1,231,
+4530,1,232,4912,19,
+1023,1,232,4543,1,
+233,4913,19,827,1,
+233,4543,1,234,4914,
+19,922,1,234,4543,
+1,235,4915,19,950,
+1,235,4543,1,236,
+4916,19,969,1,236,
+4556,1,237,4917,19,
+1015,1,237,4556,1,
+238,4918,19,930,1,
+238,4569,1,239,4919,
+19,943,1,239,4569,
+1,240,4920,19,896,
+1,240,4582,1,241,
+4921,19,935,1,241,
+4582,1,242,4922,19,
+1581,1,242,4595,1,
+243,4923,19,1263,1,
+243,4595,1,244,4924,
+19,1613,1,244,4595,
+1,245,4925,19,1645,
+1,245,4595,1,246,
+4926,19,1511,1,246,
+4445,1,247,4927,19,
+1570,1,247,4445,1,
+248,4928,19,1238,1,
+248,4458,1,249,4929,
+19,1677,1,249,4458,
+1,250,4930,19,1608,
+1,250,4458,1,251,
+4931,19,1555,1,251,
+4458,1,252,4932,19,
+1479,1,252,4458,1,
+253,4933,19,1405,1,
+253,4458,1,254,4934,
+19,1415,1,254,4458,
+1,255,4935,19,1233,
+1,255,4458,1,256,
+4936,19,1661,1,256,
+4458,1,257,4937,19,
+1603,1,257,4458,1,
+258,4938,19,1545,1,
+258,4458,1,259,4939,
+19,1468,1,259,4458,
+1,260,4940,19,1431,
+1,260,4458,1,261,
+4941,19,1216,1,261,
+4458,1,262,4942,19,
+1565,1,262,4458,1,
+263,4943,19,1591,1,
+263,4458,1,264,4944,
+19,1538,1,264,4458,
+1,265,4945,19,1560,
+1,265,4458,1,266,
+4946,19,1371,1,266,
+4458,1,267,4947,19,
+1275,1,267,4458,1,
+268,4948,19,1204,1,
+268,4458,1,269,4949,
+19,1635,1,269,4458,
+1,270,4950,19,1586,
+1,270,4458,1,271,
+4951,19,1533,1,271,
+4458,1,272,4952,19,
+1400,1,272,4491,1,
+273,4953,19,1378,1,
+273,4491,1,274,4954,
+19,1666,1,274,4681,
+1,275,4955,19,1689,
+1,275,4681,1,276,
+4956,19,1656,1,276,
+4681,1,277,4957,19,
+1651,1,277,4681,1,
+278,4958,19,1672,1,
+278,4681,1,279,4959,
+19,1619,1,279,4681,
+1,280,4960,19,1325,
+1,280,4681,1,281,
+4961,19,1500,1,281,
+4757,1,282,4962,19,
+1286,1,282,4757,1,
+283,4963,19,1293,1,
+283,4757,1,284,4964,
+19,1314,1,284,4757,
+1,285,4965,19,1309,
+1,285,4757,1,286,
+4966,19,1304,1,286,
+4757,1,287,4967,19,
+1299,1,287,4757,1,
+288,4968,19,1489,1,
+288,4757,1,289,4969,
+19,1517,1,289,4757,
+1,290,4970,19,1494,
+1,290,4757,1,291,
+4971,19,1484,1,291,
+4757,1,292,4972,19,
+1474,1,292,4757,1,
+293,4973,19,1457,1,
+293,4757,1,294,4974,
+19,1410,1,294,4757,
+1,295,4975,19,1319,
+1,295,4757,1,296,
+4976,19,1280,1,296,
+4757,1,297,4977,19,
+1228,1,297,4757,1,
+298,4978,19,1684,1,
+298,4757,1,299,4979,
+19,1640,1,299,4757,
+1,300,4980,19,1630,
+1,300,4757,1,301,
+4981,19,1625,1,301,
+4757,1,302,4982,19,
+1576,1,302,4757,1,
+303,4983,19,1550,1,
+303,4757,1,304,4984,
+19,1527,1,304,4757,
+1,305,4985,19,1522,
+1,305,4757,1,306,
+4986,19,1463,1,306,
+4757,1,307,4987,19,
+1439,1,307,4757,1,
+308,4988,19,1505,1,
+308,4757,1,309,4989,
+19,1597,1,309,4757,
+1,310,4990,19,1452,
+1,310,4757,1,311,
+4991,19,1446,1,311,
+4757,1,312,4992,19,
+1426,1,312,4757,1,
+313,4993,19,1389,1,
+313,4757,1,314,4994,
+19,1366,1,314,4757,
+1,315,4995,19,1211,
+1,315,4757,1,316,
+4996,19,1699,1,316,
+4757,1,317,4997,19,
+1331,1,317,4757,1,
+318,4998,19,1336,1,
+318,4757,1,319,4999,
+19,1356,1,319,4757,
+1,320,5000,19,1346,
+1,320,4757,1,321,
+5001,19,1351,1,321,
+4757,1,322,5002,19,
+1341,1,322,4757,1,
+323,5003,19,1694,1,
+323,4757,1,324,5004,
+19,1361,1,324,4757,
+1,325,5005,19,1421,
+1,325,4600,1,326,
+5006,19,1911,1,326,
+4670,1,327,5007,19,
+1901,1,327,4670,1,
+328,5008,19,1881,1,
+328,4674,1,329,5009,
+19,2225,1,329,4332,
+1,330,5010,19,2220,
+1,330,4332,1,331,
+5011,19,2215,1,331,
+4332,1,332,5012,19,
+2210,1,332,4332,1,
+333,5013,19,2205,1,
+333,4332,1,334,5014,
+19,2200,1,334,4332,
+1,335,5015,19,2195,
+1,335,4332,1,336,
+5016,19,2184,1,336,
+4352,1,337,5017,19,
+2179,1,337,4352,1,
+338,5018,19,2174,1,
+338,4352,1,339,5019,
+19,2169,1,339,4352,
+1,340,5020,19,2164,
+1,340,4352,1,341,
+5021,19,2159,1,341,
+4352,1,342,5022,19,
+2154,1,342,4352,1,
+343,5023,19,2149,1,
+343,4352,1,344,5024,
+19,2144,1,344,4352,
+1,345,5025,19,1972,
+1,345,4358,1,346,
+5026,19,2137,1,346,
+4358,1,347,5027,19,
+2011,1,347,4358,1,
+348,5028,19,2131,1,
+348,4358,1,349,5029,
+19,1965,1,349,4358,
+1,350,5030,19,2126,
+1,350,4358,1,351,
+5031,19,2121,1,351,
+4358,1,352,5032,19,
+2116,1,352,4358,1,
+353,5033,19,2111,1,
+353,4364,1,354,5034,
+19,2106,1,354,4364,
+1,355,5035,19,2100,
+1,355,4370,1,356,
+5036,19,1956,1,356,
+4370,1,357,5037,19,
+2094,1,357,4370,1,
+358,5038,19,2089,1,
+358,4370,1,359,5039,
+19,2084,1,359,4370,
+1,360,5040,19,1949,
+1,360,4370,1,361,
+5041,19,2078,1,361,
+4370,1,362,5042,19,
+2003,1,362,4370,1,
+363,5043,19,2073,1,
+363,4370,1,364,5044,
+19,2068,1,364,4370,
+1,365,5045,19,2063,
+1,365,4376,1,366,
+5046,19,2058,1,366,
+4376,1,367,5047,19,
+2053,1,367,4376,1,
+368,5048,19,2047,1,
+368,4382,1,369,5049,
+19,2041,1,369,4388,
+1,370,5050,19,5051,
+4,50,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+76,0,105,0,115,
+0,116,0,95,0,
+51,0,1,370,4276,
+1,371,5052,19,5053,
+4,28,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,76,0,
+105,0,115,0,116,
+0,95,0,51,0,
+1,371,4670,1,372,
+5054,19,5055,4,50,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
 0,68,0,101,0,
-99,0,114,0,101,
-0,109,0,101,0,
-110,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,1,
-161,4757,1,163,4843,
-19,792,1,163,4206,
-1,164,4844,19,787,
-1,164,4206,1,165,
-4845,19,3478,1,165,
-4209,1,166,4846,19,
-3496,1,166,4209,1,
-167,4847,19,3473,1,
-167,4209,1,168,4848,
-19,3468,1,168,4209,
-1,169,4849,19,3501,
-1,169,4212,1,170,
-4850,19,3484,1,170,
-4212,1,171,4851,19,
-3491,1,171,4216,1,
-172,4852,19,3507,1,
-172,4216,1,173,4853,
-19,803,1,173,4220,
-1,174,4854,19,798,
-1,174,4220,1,175,
-4855,19,814,1,175,
-4224,1,176,4856,19,
-809,1,176,4224,1,
-177,4857,19,1789,1,
-177,4230,1,178,4858,
-19,1758,1,178,4230,
-1,179,4859,19,1784,
-1,179,4230,1,180,
-4860,19,1837,1,180,
-4230,1,181,4861,19,
-1843,1,181,4230,1,
-182,4862,19,1747,1,
-182,4230,1,183,4863,
-19,1779,1,183,4230,
-1,184,4864,19,1742,
-1,184,4230,1,185,
-4865,19,1774,1,185,
-4230,1,186,4866,19,
-1737,1,186,4230,1,
-187,4867,19,1769,1,
-187,4230,1,188,4868,
-19,1732,1,188,4230,
-1,189,4869,19,1764,
-1,189,4230,1,190,
-4870,19,1832,1,190,
-4230,1,191,4871,19,
-1808,1,191,4234,1,
-192,4872,19,1820,1,
-192,4240,1,193,4873,
-19,1814,1,193,4246,
-1,194,4874,19,1802,
-1,194,4252,1,195,
-4875,19,1827,1,195,
-4258,1,196,4876,19,
-1795,1,196,4264,1,
-197,4877,19,1753,1,
-197,4270,1,198,4878,
-19,1895,1,198,4276,
-1,199,4879,19,1871,
-1,199,4276,1,200,
-4880,19,2280,1,200,
-4281,1,201,4881,19,
-2245,1,201,4284,1,
-202,4882,19,2239,1,
-202,4287,1,203,4883,
-19,2233,1,203,4290,
-1,204,4884,19,2265,
-1,204,4293,1,205,
-4885,19,1222,1,205,
-4296,1,206,4886,19,
-2253,1,206,4315,1,
-207,4887,19,1917,1,
-207,4318,1,208,4888,
-19,1851,1,208,4323,
-1,209,4889,19,1864,
-1,209,4328,1,210,
-4890,19,1006,1,210,
-4394,1,211,4891,19,
-990,1,211,4394,1,
-212,4892,19,996,1,
-212,4416,1,213,4893,
-19,984,1,213,4416,
-1,214,4894,19,1250,
-1,214,4432,1,215,
-4895,19,887,1,215,
-4419,1,216,4896,19,
-1001,1,216,4419,1,
-217,4897,19,882,1,
-217,4419,1,218,4898,
-19,907,1,218,4419,
-1,219,4899,19,876,
-1,219,4419,1,220,
-4900,19,870,1,220,
-4419,1,221,4901,19,
-865,1,221,4419,1,
-222,4902,19,860,1,
-222,4419,1,223,4903,
-19,854,1,223,4419,
-1,224,4904,19,849,
-1,224,4419,1,225,
-4905,19,844,1,225,
-4419,1,226,4906,19,
-839,1,226,4419,1,
-227,4907,19,834,1,
-227,4419,1,228,4908,
-19,1257,1,228,4504,
-1,229,4909,19,1395,
-1,229,4517,1,230,
-4910,19,1244,1,230,
-4530,1,231,4911,19,
-1383,1,231,4530,1,
-232,4912,19,1023,1,
-232,4543,1,233,4913,
-19,827,1,233,4543,
-1,234,4914,19,922,
-1,234,4543,1,235,
-4915,19,950,1,235,
-4543,1,236,4916,19,
-969,1,236,4556,1,
-237,4917,19,1015,1,
-237,4556,1,238,4918,
-19,930,1,238,4569,
-1,239,4919,19,943,
-1,239,4569,1,240,
-4920,19,896,1,240,
-4582,1,241,4921,19,
-935,1,241,4582,1,
-242,4922,19,1581,1,
-242,4595,1,243,4923,
-19,1263,1,243,4595,
-1,244,4924,19,1613,
-1,244,4595,1,245,
-4925,19,1645,1,245,
-4595,1,246,4926,19,
-1511,1,246,4445,1,
-247,4927,19,1570,1,
-247,4445,1,248,4928,
-19,1238,1,248,4458,
-1,249,4929,19,1677,
-1,249,4458,1,250,
-4930,19,1608,1,250,
-4458,1,251,4931,19,
-1555,1,251,4458,1,
-252,4932,19,1479,1,
-252,4458,1,253,4933,
-19,1405,1,253,4458,
-1,254,4934,19,1415,
-1,254,4458,1,255,
-4935,19,1233,1,255,
-4458,1,256,4936,19,
-1661,1,256,4458,1,
-257,4937,19,1603,1,
-257,4458,1,258,4938,
-19,1545,1,258,4458,
-1,259,4939,19,1468,
-1,259,4458,1,260,
-4940,19,1431,1,260,
-4458,1,261,4941,19,
-1216,1,261,4458,1,
-262,4942,19,1565,1,
-262,4458,1,263,4943,
-19,1591,1,263,4458,
-1,264,4944,19,1538,
-1,264,4458,1,265,
-4945,19,1560,1,265,
-4458,1,266,4946,19,
-1371,1,266,4458,1,
-267,4947,19,1275,1,
-267,4458,1,268,4948,
-19,1204,1,268,4458,
-1,269,4949,19,1635,
-1,269,4458,1,270,
-4950,19,1586,1,270,
-4458,1,271,4951,19,
-1533,1,271,4458,1,
-272,4952,19,1400,1,
-272,4491,1,273,4953,
-19,1378,1,273,4491,
-1,274,4954,19,1666,
-1,274,4681,1,275,
-4955,19,1689,1,275,
-4681,1,276,4956,19,
-1656,1,276,4681,1,
-277,4957,19,1651,1,
-277,4681,1,278,4958,
-19,1672,1,278,4681,
-1,279,4959,19,1619,
-1,279,4681,1,280,
-4960,19,1325,1,280,
-4681,1,281,4961,19,
-1500,1,281,4757,1,
-282,4962,19,1286,1,
-282,4757,1,283,4963,
-19,1293,1,283,4757,
-1,284,4964,19,1314,
-1,284,4757,1,285,
-4965,19,1309,1,285,
-4757,1,286,4966,19,
-1304,1,286,4757,1,
-287,4967,19,1299,1,
-287,4757,1,288,4968,
-19,1489,1,288,4757,
-1,289,4969,19,1517,
-1,289,4757,1,290,
-4970,19,1494,1,290,
-4757,1,291,4971,19,
-1484,1,291,4757,1,
-292,4972,19,1474,1,
-292,4757,1,293,4973,
-19,1457,1,293,4757,
-1,294,4974,19,1410,
-1,294,4757,1,295,
-4975,19,1319,1,295,
-4757,1,296,4976,19,
-1280,1,296,4757,1,
-297,4977,19,1228,1,
-297,4757,1,298,4978,
-19,1684,1,298,4757,
-1,299,4979,19,1640,
-1,299,4757,1,300,
-4980,19,1630,1,300,
-4757,1,301,4981,19,
-1625,1,301,4757,1,
-302,4982,19,1576,1,
-302,4757,1,303,4983,
-19,1550,1,303,4757,
-1,304,4984,19,1527,
-1,304,4757,1,305,
-4985,19,1522,1,305,
-4757,1,306,4986,19,
-1463,1,306,4757,1,
-307,4987,19,1439,1,
-307,4757,1,308,4988,
-19,1505,1,308,4757,
-1,309,4989,19,1597,
-1,309,4757,1,310,
-4990,19,1452,1,310,
-4757,1,311,4991,19,
-1446,1,311,4757,1,
-312,4992,19,1426,1,
-312,4757,1,313,4993,
-19,1389,1,313,4757,
-1,314,4994,19,1366,
-1,314,4757,1,315,
-4995,19,1211,1,315,
-4757,1,316,4996,19,
-1699,1,316,4757,1,
-317,4997,19,1331,1,
-317,4757,1,318,4998,
-19,1336,1,318,4757,
-1,319,4999,19,1356,
-1,319,4757,1,320,
-5000,19,1346,1,320,
-4757,1,321,5001,19,
-1351,1,321,4757,1,
-322,5002,19,1341,1,
-322,4757,1,323,5003,
-19,1694,1,323,4757,
-1,324,5004,19,1361,
-1,324,4757,1,325,
-5005,19,1421,1,325,
-4600,1,326,5006,19,
-1911,1,326,4670,1,
-327,5007,19,1901,1,
-327,4670,1,328,5008,
-19,1881,1,328,4674,
-1,329,5009,19,2225,
-1,329,4332,1,330,
-5010,19,2220,1,330,
-4332,1,331,5011,19,
-2215,1,331,4332,1,
-332,5012,19,2210,1,
-332,4332,1,333,5013,
-19,2205,1,333,4332,
-1,334,5014,19,2200,
-1,334,4332,1,335,
-5015,19,2195,1,335,
-4332,1,336,5016,19,
-2184,1,336,4352,1,
-337,5017,19,2179,1,
-337,4352,1,338,5018,
-19,2174,1,338,4352,
-1,339,5019,19,2169,
-1,339,4352,1,340,
-5020,19,2164,1,340,
-4352,1,341,5021,19,
-2159,1,341,4352,1,
-342,5022,19,2154,1,
-342,4352,1,343,5023,
-19,2149,1,343,4352,
-1,344,5024,19,2144,
-1,344,4352,1,345,
-5025,19,1972,1,345,
-4358,1,346,5026,19,
-2137,1,346,4358,1,
-347,5027,19,2011,1,
-347,4358,1,348,5028,
-19,2131,1,348,4358,
-1,349,5029,19,1965,
-1,349,4358,1,350,
-5030,19,2126,1,350,
-4358,1,351,5031,19,
-2121,1,351,4358,1,
-352,5032,19,2116,1,
-352,4358,1,353,5033,
-19,2111,1,353,4364,
-1,354,5034,19,2106,
-1,354,4364,1,355,
-5035,19,2100,1,355,
-4370,1,356,5036,19,
-1956,1,356,4370,1,
-357,5037,19,2094,1,
-357,4370,1,358,5038,
-19,2089,1,358,4370,
-1,359,5039,19,2084,
-1,359,4370,1,360,
-5040,19,1949,1,360,
-4370,1,361,5041,19,
-2078,1,361,4370,1,
-362,5042,19,2003,1,
-362,4370,1,363,5043,
-19,2073,1,363,4370,
-1,364,5044,19,2068,
-1,364,4370,1,365,
-5045,19,2063,1,365,
-4376,1,366,5046,19,
-2058,1,366,4376,1,
-367,5047,19,2053,1,
-367,4376,1,368,5048,
-19,2047,1,368,4382,
-1,369,5049,19,2041,
-1,369,4388,1,370,
-5050,19,5051,4,50,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,76,0,
+105,0,115,0,116,
+0,95,0,52,0,
+1,372,4276,1,373,
+5056,19,5057,4,50,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
@@ -12565,48 +12593,16 @@ public yyLSLSyntax
 116,0,105,0,111,
 0,110,0,76,0,
 105,0,115,0,116,
-0,95,0,51,0,
-1,370,4276,1,371,
-5052,19,5053,4,28,
+0,95,0,53,0,
+1,373,4276,1,374,
+5058,19,5059,4,28,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
 0,76,0,105,0,
 115,0,116,0,95,
-0,51,0,1,371,
-4670,1,372,5054,19,
-5055,4,50,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,95,
-0,52,0,1,372,
-4276,1,373,5056,19,
-5057,4,50,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,95,
-0,53,0,1,373,
-4276,1,374,5058,19,
-5059,4,28,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,76,
-0,105,0,115,0,
-116,0,95,0,52,
-0,1,374,4670,2,
-0,0};
+0,52,0,1,374,
+4670,2,0,0};
 new Sfactory(this,"ExpressionArgument_1",new SCreator(ExpressionArgument_1_factory));
 new Sfactory(this,"VectorArgStateEvent",new SCreator(VectorArgStateEvent_factory));
 new Sfactory(this,"IntVecVecArgStateEvent",new SCreator(IntVecVecArgStateEvent_factory));
@@ -12625,7 +12621,7 @@ new Sfactory(this,"BinaryExpression_3",new SCreator(BinaryExpression_3_factory))
 new Sfactory(this,"BinaryExpression_4",new SCreator(BinaryExpression_4_factory));
 new Sfactory(this,"BinaryExpression_5",new SCreator(BinaryExpression_5_factory));
 new Sfactory(this,"ReturnStatement_2",new SCreator(ReturnStatement_2_factory));
-new Sfactory(this,"VectorDeclaration_1",new SCreator(VectorDeclaration_1_factory));
+new Sfactory(this,"SimpleAssignment_19",new SCreator(SimpleAssignment_19_factory));
 new Sfactory(this,"BinaryExpression_9",new SCreator(BinaryExpression_9_factory));
 new Sfactory(this,"VectorConstant_1",new SCreator(VectorConstant_1_factory));
 new Sfactory(this,"ParenthesisExpression",new SCreator(ParenthesisExpression_factory));
@@ -12685,12 +12681,13 @@ new Sfactory(this,"JumpLabel",new SCreator(JumpLabel_factory));
 new Sfactory(this,"SimpleAssignment_15",new SCreator(SimpleAssignment_15_factory));
 new Sfactory(this,"StateBody_10",new SCreator(StateBody_10_factory));
 new Sfactory(this,"IntVecVecArgEvent",new SCreator(IntVecVecArgEvent_factory));
-new Sfactory(this,"StateBody_12",new SCreator(StateBody_12_factory));
+new Sfactory(this,"VecDeclaration",new SCreator(VecDeclaration_factory));
 new Sfactory(this,"StateBody_14",new SCreator(StateBody_14_factory));
 new Sfactory(this,"GlobalDefinitions",new SCreator(GlobalDefinitions_factory));
 new Sfactory(this,"ConstantExpression_1",new SCreator(ConstantExpression_1_factory));
 new Sfactory(this,"VoidArgEvent_4",new SCreator(VoidArgEvent_4_factory));
 new Sfactory(this,"FunctionCall_1",new SCreator(FunctionCall_1_factory));
+new Sfactory(this,"Assignment_1",new SCreator(Assignment_1_factory));
 new Sfactory(this,"Assignment_2",new SCreator(Assignment_2_factory));
 new Sfactory(this,"IntVecVecArgEvent_1",new SCreator(IntVecVecArgEvent_1_factory));
 new Sfactory(this,"TypecastExpression_1",new SCreator(TypecastExpression_1_factory));
@@ -12743,14 +12740,14 @@ new Sfactory(this,"KeyArgStateEvent_1",new SCreator(KeyArgStateEvent_1_factory))
 new Sfactory(this,"SimpleAssignment_8",new SCreator(SimpleAssignment_8_factory));
 new Sfactory(this,"LSLProgramRoot",new SCreator(LSLProgramRoot_factory));
 new Sfactory(this,"StateChange",new SCreator(StateChange_factory));
-new Sfactory(this,"IncrementDecrementExpression_2",new SCreator(IncrementDecrementExpression_2_factory));
+new Sfactory(this,"VecDeclaration_1",new SCreator(VecDeclaration_1_factory));
 new Sfactory(this,"GlobalVariableDeclaration_1",new SCreator(GlobalVariableDeclaration_1_factory));
 new Sfactory(this,"GlobalVariableDeclaration_2",new SCreator(GlobalVariableDeclaration_2_factory));
 new Sfactory(this,"IncrementDecrementExpression_5",new SCreator(IncrementDecrementExpression_5_factory));
 new Sfactory(this,"ReturnStatement",new SCreator(ReturnStatement_factory));
 new Sfactory(this,"IncrementDecrementExpression_7",new SCreator(IncrementDecrementExpression_7_factory));
 new Sfactory(this,"StateBody_11",new SCreator(StateBody_11_factory));
-new Sfactory(this,"Assignment_1",new SCreator(Assignment_1_factory));
+new Sfactory(this,"StateBody_12",new SCreator(StateBody_12_factory));
 new Sfactory(this,"IntVecVecArgStateEvent_1",new SCreator(IntVecVecArgStateEvent_1_factory));
 new Sfactory(this,"KeyDeclaration",new SCreator(KeyDeclaration_factory));
 new Sfactory(this,"ArgumentDeclarationList_3",new SCreator(ArgumentDeclarationList_3_factory));
@@ -12778,7 +12775,7 @@ new Sfactory(this,"StateBody",new SCreator(StateBody_factory));
 new Sfactory(this,"Event_7",new SCreator(Event_7_factory));
 new Sfactory(this,"Event_8",new SCreator(Event_8_factory));
 new Sfactory(this,"IncrementDecrementExpression_1",new SCreator(IncrementDecrementExpression_1_factory));
-new Sfactory(this,"Typename_2",new SCreator(Typename_2_factory));
+new Sfactory(this,"IncrementDecrementExpression_2",new SCreator(IncrementDecrementExpression_2_factory));
 new Sfactory(this,"IntVecVecArgumentDeclarationList_1",new SCreator(IntVecVecArgumentDeclarationList_1_factory));
 new Sfactory(this,"IncrementDecrementExpression_4",new SCreator(IncrementDecrementExpression_4_factory));
 new Sfactory(this,"IncrementDecrementExpression_6",new SCreator(IncrementDecrementExpression_6_factory));
@@ -12803,7 +12800,6 @@ new Sfactory(this,"Statement_11",new SCreator(Statement_11_factory));
 new Sfactory(this,"SimpleAssignment",new SCreator(SimpleAssignment_factory));
 new Sfactory(this,"TypecastExpression",new SCreator(TypecastExpression_factory));
 new Sfactory(this,"JumpStatement_1",new SCreator(JumpStatement_1_factory));
-new Sfactory(this,"SimpleAssignment_19",new SCreator(SimpleAssignment_19_factory));
 new Sfactory(this,"SimpleAssignment_20",new SCreator(SimpleAssignment_20_factory));
 new Sfactory(this,"Statement_7",new SCreator(Statement_7_factory));
 new Sfactory(this,"SimpleAssignment_24",new SCreator(SimpleAssignment_24_factory));
@@ -12832,18 +12828,18 @@ new Sfactory(this,"BinaryExpression_15",new SCreator(BinaryExpression_15_factory
 new Sfactory(this,"BinaryExpression_16",new SCreator(BinaryExpression_16_factory));
 new Sfactory(this,"BinaryExpression_6",new SCreator(BinaryExpression_6_factory));
 new Sfactory(this,"BinaryExpression_7",new SCreator(BinaryExpression_7_factory));
+new Sfactory(this,"Typename_2",new SCreator(Typename_2_factory));
 new Sfactory(this,"Typename_4",new SCreator(Typename_4_factory));
 new Sfactory(this,"ArgumentList",new SCreator(ArgumentList_factory));
-new Sfactory(this,"VectorDeclaration",new SCreator(VectorDeclaration_factory));
+new Sfactory(this,"BinaryExpression_12",new SCreator(BinaryExpression_12_factory));
 new Sfactory(this,"BinaryExpression_13",new SCreator(BinaryExpression_13_factory));
 new Sfactory(this,"GlobalFunctionDefinition_2",new SCreator(GlobalFunctionDefinition_2_factory));
-new Sfactory(this,"VoidArgEvent_6",new SCreator(VoidArgEvent_6_factory));
 new Sfactory(this,"StateChange_2",new SCreator(StateChange_2_factory));
 new Sfactory(this,"VoidArgEvent_1",new SCreator(VoidArgEvent_1_factory));
 new Sfactory(this,"VoidArgEvent_3",new SCreator(VoidArgEvent_3_factory));
 new Sfactory(this,"BinaryExpression_10",new SCreator(BinaryExpression_10_factory));
 new Sfactory(this,"VoidArgEvent_5",new SCreator(VoidArgEvent_5_factory));
-new Sfactory(this,"BinaryExpression_12",new SCreator(BinaryExpression_12_factory));
+new Sfactory(this,"VoidArgEvent_6",new SCreator(VoidArgEvent_6_factory));
 new Sfactory(this,"VoidArgEvent_7",new SCreator(VoidArgEvent_7_factory));
 new Sfactory(this,"VoidArgEvent_8",new SCreator(VoidArgEvent_8_factory));
 new Sfactory(this,"BinaryExpression_17",new SCreator(BinaryExpression_17_factory));
@@ -12905,7 +12901,7 @@ public static object BinaryExpression_3_factory(Parser yyp) { return new BinaryE
 public static object BinaryExpression_4_factory(Parser yyp) { return new BinaryExpression_4(yyp); }
 public static object BinaryExpression_5_factory(Parser yyp) { return new BinaryExpression_5(yyp); }
 public static object ReturnStatement_2_factory(Parser yyp) { return new ReturnStatement_2(yyp); }
-public static object VectorDeclaration_1_factory(Parser yyp) { return new VectorDeclaration_1(yyp); }
+public static object SimpleAssignment_19_factory(Parser yyp) { return new SimpleAssignment_19(yyp); }
 public static object BinaryExpression_9_factory(Parser yyp) { return new BinaryExpression_9(yyp); }
 public static object VectorConstant_1_factory(Parser yyp) { return new VectorConstant_1(yyp); }
 public static object ParenthesisExpression_factory(Parser yyp) { return new ParenthesisExpression(yyp); }
@@ -12965,12 +12961,13 @@ public static object JumpLabel_factory(Parser yyp) { return new JumpLabel(yyp);
 public static object SimpleAssignment_15_factory(Parser yyp) { return new SimpleAssignment_15(yyp); }
 public static object StateBody_10_factory(Parser yyp) { return new StateBody_10(yyp); }
 public static object IntVecVecArgEvent_factory(Parser yyp) { return new IntVecVecArgEvent(yyp); }
-public static object StateBody_12_factory(Parser yyp) { return new StateBody_12(yyp); }
+public static object VecDeclaration_factory(Parser yyp) { return new VecDeclaration(yyp); }
 public static object StateBody_14_factory(Parser yyp) { return new StateBody_14(yyp); }
 public static object GlobalDefinitions_factory(Parser yyp) { return new GlobalDefinitions(yyp); }
 public static object ConstantExpression_1_factory(Parser yyp) { return new ConstantExpression_1(yyp); }
 public static object VoidArgEvent_4_factory(Parser yyp) { return new VoidArgEvent_4(yyp); }
 public static object FunctionCall_1_factory(Parser yyp) { return new FunctionCall_1(yyp); }
+public static object Assignment_1_factory(Parser yyp) { return new Assignment_1(yyp); }
 public static object Assignment_2_factory(Parser yyp) { return new Assignment_2(yyp); }
 public static object IntVecVecArgEvent_1_factory(Parser yyp) { return new IntVecVecArgEvent_1(yyp); }
 public static object TypecastExpression_1_factory(Parser yyp) { return new TypecastExpression_1(yyp); }
@@ -13023,14 +13020,14 @@ public static object KeyArgStateEvent_1_factory(Parser yyp) { return new KeyArgS
 public static object SimpleAssignment_8_factory(Parser yyp) { return new SimpleAssignment_8(yyp); }
 public static object LSLProgramRoot_factory(Parser yyp) { return new LSLProgramRoot(yyp); }
 public static object StateChange_factory(Parser yyp) { return new StateChange(yyp); }
-public static object IncrementDecrementExpression_2_factory(Parser yyp) { return new IncrementDecrementExpression_2(yyp); }
+public static object VecDeclaration_1_factory(Parser yyp) { return new VecDeclaration_1(yyp); }
 public static object GlobalVariableDeclaration_1_factory(Parser yyp) { return new GlobalVariableDeclaration_1(yyp); }
 public static object GlobalVariableDeclaration_2_factory(Parser yyp) { return new GlobalVariableDeclaration_2(yyp); }
 public static object IncrementDecrementExpression_5_factory(Parser yyp) { return new IncrementDecrementExpression_5(yyp); }
 public static object ReturnStatement_factory(Parser yyp) { return new ReturnStatement(yyp); }
 public static object IncrementDecrementExpression_7_factory(Parser yyp) { return new IncrementDecrementExpression_7(yyp); }
 public static object StateBody_11_factory(Parser yyp) { return new StateBody_11(yyp); }
-public static object Assignment_1_factory(Parser yyp) { return new Assignment_1(yyp); }
+public static object StateBody_12_factory(Parser yyp) { return new StateBody_12(yyp); }
 public static object IntVecVecArgStateEvent_1_factory(Parser yyp) { return new IntVecVecArgStateEvent_1(yyp); }
 public static object KeyDeclaration_factory(Parser yyp) { return new KeyDeclaration(yyp); }
 public static object ArgumentDeclarationList_3_factory(Parser yyp) { return new ArgumentDeclarationList_3(yyp); }
@@ -13058,7 +13055,7 @@ public static object StateBody_factory(Parser yyp) { return new StateBody(yyp);
 public static object Event_7_factory(Parser yyp) { return new Event_7(yyp); }
 public static object Event_8_factory(Parser yyp) { return new Event_8(yyp); }
 public static object IncrementDecrementExpression_1_factory(Parser yyp) { return new IncrementDecrementExpression_1(yyp); }
-public static object Typename_2_factory(Parser yyp) { return new Typename_2(yyp); }
+public static object IncrementDecrementExpression_2_factory(Parser yyp) { return new IncrementDecrementExpression_2(yyp); }
 public static object IntVecVecArgumentDeclarationList_1_factory(Parser yyp) { return new IntVecVecArgumentDeclarationList_1(yyp); }
 public static object IncrementDecrementExpression_4_factory(Parser yyp) { return new IncrementDecrementExpression_4(yyp); }
 public static object IncrementDecrementExpression_6_factory(Parser yyp) { return new IncrementDecrementExpression_6(yyp); }
@@ -13083,7 +13080,6 @@ public static object Statement_11_factory(Parser yyp) { return new Statement_11(
 public static object SimpleAssignment_factory(Parser yyp) { return new SimpleAssignment(yyp); }
 public static object TypecastExpression_factory(Parser yyp) { return new TypecastExpression(yyp); }
 public static object JumpStatement_1_factory(Parser yyp) { return new JumpStatement_1(yyp); }
-public static object SimpleAssignment_19_factory(Parser yyp) { return new SimpleAssignment_19(yyp); }
 public static object SimpleAssignment_20_factory(Parser yyp) { return new SimpleAssignment_20(yyp); }
 public static object Statement_7_factory(Parser yyp) { return new Statement_7(yyp); }
 public static object SimpleAssignment_24_factory(Parser yyp) { return new SimpleAssignment_24(yyp); }
@@ -13112,18 +13108,18 @@ public static object BinaryExpression_15_factory(Parser yyp) { return new Binary
 public static object BinaryExpression_16_factory(Parser yyp) { return new BinaryExpression_16(yyp); }
 public static object BinaryExpression_6_factory(Parser yyp) { return new BinaryExpression_6(yyp); }
 public static object BinaryExpression_7_factory(Parser yyp) { return new BinaryExpression_7(yyp); }
+public static object Typename_2_factory(Parser yyp) { return new Typename_2(yyp); }
 public static object Typename_4_factory(Parser yyp) { return new Typename_4(yyp); }
 public static object ArgumentList_factory(Parser yyp) { return new ArgumentList(yyp); }
-public static object VectorDeclaration_factory(Parser yyp) { return new VectorDeclaration(yyp); }
+public static object BinaryExpression_12_factory(Parser yyp) { return new BinaryExpression_12(yyp); }
 public static object BinaryExpression_13_factory(Parser yyp) { return new BinaryExpression_13(yyp); }
 public static object GlobalFunctionDefinition_2_factory(Parser yyp) { return new GlobalFunctionDefinition_2(yyp); }
-public static object VoidArgEvent_6_factory(Parser yyp) { return new VoidArgEvent_6(yyp); }
 public static object StateChange_2_factory(Parser yyp) { return new StateChange_2(yyp); }
 public static object VoidArgEvent_1_factory(Parser yyp) { return new VoidArgEvent_1(yyp); }
 public static object VoidArgEvent_3_factory(Parser yyp) { return new VoidArgEvent_3(yyp); }
 public static object BinaryExpression_10_factory(Parser yyp) { return new BinaryExpression_10(yyp); }
 public static object VoidArgEvent_5_factory(Parser yyp) { return new VoidArgEvent_5(yyp); }
-public static object BinaryExpression_12_factory(Parser yyp) { return new BinaryExpression_12(yyp); }
+public static object VoidArgEvent_6_factory(Parser yyp) { return new VoidArgEvent_6(yyp); }
 public static object VoidArgEvent_7_factory(Parser yyp) { return new VoidArgEvent_7(yyp); }
 public static object VoidArgEvent_8_factory(Parser yyp) { return new VoidArgEvent_8(yyp); }
 public static object BinaryExpression_17_factory(Parser yyp) { return new BinaryExpression_17(yyp); }
-- 
cgit v1.1


From 2f94165dccb8dfd27cf475eacd60d38d95d86d3c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 21 Dec 2013 01:00:50 +0000
Subject: Add lsl arg syntax checking for control event

---
 .../Shared/CodeTools/Tests/LSL_EventTests.cs       |    17 +
 .../ScriptEngine/Shared/CodeTools/lsl.parser.cs    | 19193 ++++++++++---------
 2 files changed, 9770 insertions(+), 9440 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
index ea43d66..67ce10a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
@@ -278,6 +278,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TestIntVecVecArgEvent("at_target");
         }
 
+        [Test]
+        public void TestControlEvent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            TestKeyIntIntArgEvent("control");
+        }
+
         private void TestIntArgEvent(string eventName)
         {
             TestCompile("default { " + eventName + "(integer n) {} }", false);
@@ -318,6 +327,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             TestCompile("default { " + eventName + "(integer n, vector v, vector w, vector x) {{}} }", true);
         }
 
+        private void TestKeyIntIntArgEvent(string eventName)
+        {
+            TestCompile("default { " + eventName + "(key k, integer n, integer o) {} }", false);
+            TestCompile("default { " + eventName + "{{}} }", true);
+            TestCompile("default { " + eventName + "(string s) {{}} }", true);
+            TestCompile("default { " + eventName + "(key k, integer n, integer o, integer p) {{}} }", true);
+        }
+
         private void TestCompile(string script, bool expectException)
         {
             bool gotException = false;
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
index 9484c42..44957bd 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
@@ -178,7 +178,15 @@ public class IntVecVecArgStateEvent : StateEvent{
 public override string yyname { get { return "IntVecVecArgStateEvent"; }}
 public override int yynum { get { return 109; }}
 public IntVecVecArgStateEvent(Parser yyp):base(yyp){}}
-//%+ArgumentDeclarationList+110
+//%+KeyIntIntArgStateEvent+110
+public class KeyIntIntArgStateEvent : StateEvent{
+ public  KeyIntIntArgStateEvent (Parser yyp, string  name , KeyIntIntArgumentDeclarationList  adl , CompoundStatement  cs ):base(((LSLSyntax
+)yyp), name , adl , cs ){}
+
+public override string yyname { get { return "KeyIntIntArgStateEvent"; }}
+public override int yynum { get { return 110; }}
+public KeyIntIntArgStateEvent(Parser yyp):base(yyp){}}
+//%+ArgumentDeclarationList+111
 public class ArgumentDeclarationList : SYMBOL{
  public  ArgumentDeclarationList (Parser yyp, Declaration  d ):base(((LSLSyntax
 )yyp)){ kids . Add ( d );
@@ -198,49 +206,57 @@ public class ArgumentDeclarationList : SYMBOL{
 }
 
 public override string yyname { get { return "ArgumentDeclarationList"; }}
-public override int yynum { get { return 110; }}
+public override int yynum { get { return 111; }}
 public ArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+KeyArgumentDeclarationList+111
+//%+KeyArgumentDeclarationList+112
 public class KeyArgumentDeclarationList : ArgumentDeclarationList{
  public  KeyArgumentDeclarationList (Parser yyp, KeyDeclaration  d ):base(((LSLSyntax
 )yyp), d ){}
 
 public override string yyname { get { return "KeyArgumentDeclarationList"; }}
-public override int yynum { get { return 111; }}
+public override int yynum { get { return 112; }}
 public KeyArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+IntArgumentDeclarationList+112
+//%+IntArgumentDeclarationList+113
 public class IntArgumentDeclarationList : ArgumentDeclarationList{
  public  IntArgumentDeclarationList (Parser yyp, IntDeclaration  d ):base(((LSLSyntax
 )yyp), d ){}
 
 public override string yyname { get { return "IntArgumentDeclarationList"; }}
-public override int yynum { get { return 112; }}
+public override int yynum { get { return 113; }}
 public IntArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+VectorArgumentDeclarationList+113
+//%+VectorArgumentDeclarationList+114
 public class VectorArgumentDeclarationList : ArgumentDeclarationList{
  public  VectorArgumentDeclarationList (Parser yyp, VecDeclaration  d ):base(((LSLSyntax
 )yyp), d ){}
 
 public override string yyname { get { return "VectorArgumentDeclarationList"; }}
-public override int yynum { get { return 113; }}
+public override int yynum { get { return 114; }}
 public VectorArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+IntRotRotArgumentDeclarationList+114
+//%+IntRotRotArgumentDeclarationList+115
 public class IntRotRotArgumentDeclarationList : ArgumentDeclarationList{
  public  IntRotRotArgumentDeclarationList (Parser yyp, Declaration  d1 , Declaration  d2 , Declaration  d3 ):base(((LSLSyntax
 )yyp), d1 , d2 , d3 ){}
 
 public override string yyname { get { return "IntRotRotArgumentDeclarationList"; }}
-public override int yynum { get { return 114; }}
+public override int yynum { get { return 115; }}
 public IntRotRotArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+IntVecVecArgumentDeclarationList+115
+//%+IntVecVecArgumentDeclarationList+116
 public class IntVecVecArgumentDeclarationList : ArgumentDeclarationList{
  public  IntVecVecArgumentDeclarationList (Parser yyp, Declaration  d1 , Declaration  d2 , Declaration  d3 ):base(((LSLSyntax
 )yyp), d1 , d2 , d3 ){}
 
 public override string yyname { get { return "IntVecVecArgumentDeclarationList"; }}
-public override int yynum { get { return 115; }}
+public override int yynum { get { return 116; }}
 public IntVecVecArgumentDeclarationList(Parser yyp):base(yyp){}}
-//%+Declaration+116
+//%+KeyIntIntArgumentDeclarationList+117
+public class KeyIntIntArgumentDeclarationList : ArgumentDeclarationList{
+ public  KeyIntIntArgumentDeclarationList (Parser yyp, Declaration  d1 , Declaration  d2 , Declaration  d3 ):base(((LSLSyntax
+)yyp), d1 , d2 , d3 ){}
+
+public override string yyname { get { return "KeyIntIntArgumentDeclarationList"; }}
+public override int yynum { get { return 117; }}
+public KeyIntIntArgumentDeclarationList(Parser yyp):base(yyp){}}
+//%+Declaration+118
 public class Declaration : SYMBOL{
  private  string  m_datatype ;
  private  string  m_id ;
@@ -260,41 +276,41 @@ public class Declaration : SYMBOL{
 }
 
 public override string yyname { get { return "Declaration"; }}
-public override int yynum { get { return 116; }}
+public override int yynum { get { return 118; }}
 public Declaration(Parser yyp):base(yyp){}}
-//%+KeyDeclaration+117
+//%+KeyDeclaration+119
 public class KeyDeclaration : Declaration{
  public  KeyDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
 )yyp), type , id ){}
 
 public override string yyname { get { return "KeyDeclaration"; }}
-public override int yynum { get { return 117; }}
+public override int yynum { get { return 119; }}
 public KeyDeclaration(Parser yyp):base(yyp){}}
-//%+IntDeclaration+118
+//%+IntDeclaration+120
 public class IntDeclaration : Declaration{
  public  IntDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
 )yyp), type , id ){}
 
 public override string yyname { get { return "IntDeclaration"; }}
-public override int yynum { get { return 118; }}
+public override int yynum { get { return 120; }}
 public IntDeclaration(Parser yyp):base(yyp){}}
-//%+VecDeclaration+119
+//%+VecDeclaration+121
 public class VecDeclaration : Declaration{
  public  VecDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
 )yyp), type , id ){}
 
 public override string yyname { get { return "VecDeclaration"; }}
-public override int yynum { get { return 119; }}
+public override int yynum { get { return 121; }}
 public VecDeclaration(Parser yyp):base(yyp){}}
-//%+RotDeclaration+120
+//%+RotDeclaration+122
 public class RotDeclaration : Declaration{
  public  RotDeclaration (Parser yyp, string  type , string  id ):base(((LSLSyntax
 )yyp), type , id ){}
 
 public override string yyname { get { return "RotDeclaration"; }}
-public override int yynum { get { return 120; }}
+public override int yynum { get { return 122; }}
 public RotDeclaration(Parser yyp):base(yyp){}}
-//%+Typename+121
+//%+Typename+123
 public class Typename : SYMBOL{
  public  string  yytext ;
  public  Typename (Parser yyp, string  text ):base(((LSLSyntax
@@ -302,9 +318,9 @@ public class Typename : SYMBOL{
 }
 
 public override string yyname { get { return "Typename"; }}
-public override int yynum { get { return 121; }}
+public override int yynum { get { return 123; }}
 public Typename(Parser yyp):base(yyp){}}
-//%+Event+122
+//%+Event+124
 public class Event : SYMBOL{
  public  string  yytext ;
  public  Event (Parser yyp, string  text ):base(((LSLSyntax
@@ -312,57 +328,65 @@ public class Event : SYMBOL{
 }
 
 public override string yyname { get { return "Event"; }}
-public override int yynum { get { return 122; }}
+public override int yynum { get { return 124; }}
 public Event(Parser yyp):base(yyp){}}
-//%+VoidArgEvent+123
+//%+VoidArgEvent+125
 public class VoidArgEvent : Event{
  public  VoidArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "VoidArgEvent"; }}
-public override int yynum { get { return 123; }}
+public override int yynum { get { return 125; }}
 public VoidArgEvent(Parser yyp):base(yyp){}}
-//%+KeyArgEvent+124
+//%+KeyArgEvent+126
 public class KeyArgEvent : Event{
  public  KeyArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "KeyArgEvent"; }}
-public override int yynum { get { return 124; }}
+public override int yynum { get { return 126; }}
 public KeyArgEvent(Parser yyp):base(yyp){}}
-//%+IntArgEvent+125
+//%+IntArgEvent+127
 public class IntArgEvent : Event{
  public  IntArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "IntArgEvent"; }}
-public override int yynum { get { return 125; }}
+public override int yynum { get { return 127; }}
 public IntArgEvent(Parser yyp):base(yyp){}}
-//%+VectorArgEvent+126
+//%+VectorArgEvent+128
 public class VectorArgEvent : Event{
  public  VectorArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "VectorArgEvent"; }}
-public override int yynum { get { return 126; }}
+public override int yynum { get { return 128; }}
 public VectorArgEvent(Parser yyp):base(yyp){}}
-//%+IntRotRotArgEvent+127
+//%+IntRotRotArgEvent+129
 public class IntRotRotArgEvent : Event{
  public  IntRotRotArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "IntRotRotArgEvent"; }}
-public override int yynum { get { return 127; }}
+public override int yynum { get { return 129; }}
 public IntRotRotArgEvent(Parser yyp):base(yyp){}}
-//%+IntVecVecArgEvent+128
+//%+IntVecVecArgEvent+130
 public class IntVecVecArgEvent : Event{
  public  IntVecVecArgEvent (Parser yyp, string  text ):base(((LSLSyntax
 )yyp), text ){}
 
 public override string yyname { get { return "IntVecVecArgEvent"; }}
-public override int yynum { get { return 128; }}
+public override int yynum { get { return 130; }}
 public IntVecVecArgEvent(Parser yyp):base(yyp){}}
-//%+CompoundStatement+129
+//%+KeyIntIntArgEvent+131
+public class KeyIntIntArgEvent : Event{
+ public  KeyIntIntArgEvent (Parser yyp, string  text ):base(((LSLSyntax
+)yyp), text ){}
+
+public override string yyname { get { return "KeyIntIntArgEvent"; }}
+public override int yynum { get { return 131; }}
+public KeyIntIntArgEvent(Parser yyp):base(yyp){}}
+//%+CompoundStatement+132
 public class CompoundStatement : SYMBOL{
  public  CompoundStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -371,9 +395,9 @@ public class CompoundStatement : SYMBOL{
 }
 
 public override string yyname { get { return "CompoundStatement"; }}
-public override int yynum { get { return 129; }}
+public override int yynum { get { return 132; }}
 }
-//%+StatementList+130
+//%+StatementList+133
 public class StatementList : SYMBOL{
  private  void  AddStatement ( Statement  s ){ if ( s . kids . Top  is  IfStatement || s . kids . Top  is  WhileStatement || s . kids . Top  is  DoWhileStatement || s . kids . Top  is  ForLoop ) kids . Add ( s . kids . Pop ());
  else  kids . Add ( s );
@@ -387,9 +411,9 @@ public class StatementList : SYMBOL{
 }
 
 public override string yyname { get { return "StatementList"; }}
-public override int yynum { get { return 130; }}
+public override int yynum { get { return 133; }}
 public StatementList(Parser yyp):base(yyp){}}
-//%+Statement+131
+//%+Statement+134
 public class Statement : SYMBOL{
  public  Statement (Parser yyp, Declaration  d ):base(((LSLSyntax
 )yyp)){ kids . Add ( d );
@@ -435,9 +459,9 @@ public class Statement : SYMBOL{
 }
 
 public override string yyname { get { return "Statement"; }}
-public override int yynum { get { return 131; }}
+public override int yynum { get { return 134; }}
 public Statement(Parser yyp):base(yyp){}}
-//%+EmptyStatement+132
+//%+EmptyStatement+135
 public class EmptyStatement : SYMBOL{
  public  EmptyStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -445,9 +469,9 @@ public class EmptyStatement : SYMBOL{
 }
 
 public override string yyname { get { return "EmptyStatement"; }}
-public override int yynum { get { return 132; }}
+public override int yynum { get { return 135; }}
 }
-//%+Assignment+133
+//%+Assignment+136
 public class Assignment : SYMBOL{
  protected  string  m_assignmentType ;
  public  Assignment (Parser yyp, SYMBOL  lhs , SYMBOL  rhs , string  assignmentType ):base(((LSLSyntax
@@ -467,9 +491,9 @@ public class Assignment : SYMBOL{
 }
 
 public override string yyname { get { return "Assignment"; }}
-public override int yynum { get { return 133; }}
+public override int yynum { get { return 136; }}
 public Assignment(Parser yyp):base(yyp){}}
-//%+SimpleAssignment+134
+//%+SimpleAssignment+137
 public class SimpleAssignment : Assignment{
  public  SimpleAssignment (Parser yyp, SYMBOL  lhs , SYMBOL  rhs , string  assignmentType ):base(((LSLSyntax
 )yyp)){ m_assignmentType = assignmentType ;
@@ -479,9 +503,9 @@ public class SimpleAssignment : Assignment{
 }
 
 public override string yyname { get { return "SimpleAssignment"; }}
-public override int yynum { get { return 134; }}
+public override int yynum { get { return 137; }}
 public SimpleAssignment(Parser yyp):base(yyp){}}
-//%+ReturnStatement+135
+//%+ReturnStatement+138
 public class ReturnStatement : SYMBOL{
  public  ReturnStatement (Parser yyp):base(((LSLSyntax
 )yyp)){}
@@ -491,9 +515,9 @@ public class ReturnStatement : SYMBOL{
 }
 
 public override string yyname { get { return "ReturnStatement"; }}
-public override int yynum { get { return 135; }}
+public override int yynum { get { return 138; }}
 }
-//%+JumpLabel+136
+//%+JumpLabel+139
 public class JumpLabel : SYMBOL{
  private  string  m_labelName ;
  public  JumpLabel (Parser yyp, string  labelName ):base(((LSLSyntax
@@ -506,9 +530,9 @@ public class JumpLabel : SYMBOL{
 }
 
 public override string yyname { get { return "JumpLabel"; }}
-public override int yynum { get { return 136; }}
+public override int yynum { get { return 139; }}
 public JumpLabel(Parser yyp):base(yyp){}}
-//%+JumpStatement+137
+//%+JumpStatement+140
 public class JumpStatement : SYMBOL{
  private  string  m_targetName ;
  public  JumpStatement (Parser yyp, string  targetName ):base(((LSLSyntax
@@ -521,9 +545,9 @@ public class JumpStatement : SYMBOL{
 }
 
 public override string yyname { get { return "JumpStatement"; }}
-public override int yynum { get { return 137; }}
+public override int yynum { get { return 140; }}
 public JumpStatement(Parser yyp):base(yyp){}}
-//%+StateChange+138
+//%+StateChange+141
 public class StateChange : SYMBOL{
  private  string  m_newState ;
  public  StateChange (Parser yyp, string  newState ):base(((LSLSyntax
@@ -534,9 +558,9 @@ public class StateChange : SYMBOL{
 }
 
 public override string yyname { get { return "StateChange"; }}
-public override int yynum { get { return 138; }}
+public override int yynum { get { return 141; }}
 public StateChange(Parser yyp):base(yyp){}}
-//%+IfStatement+139
+//%+IfStatement+142
 public class IfStatement : SYMBOL{
  private  void  AddStatement ( Statement  s ){ if (0< s . kids . Count && s . kids . Top  is  CompoundStatement ) kids . Add ( s . kids . Pop ());
  else  kids . Add ( s );
@@ -553,9 +577,9 @@ public class IfStatement : SYMBOL{
 }
 
 public override string yyname { get { return "IfStatement"; }}
-public override int yynum { get { return 139; }}
+public override int yynum { get { return 142; }}
 public IfStatement(Parser yyp):base(yyp){}}
-//%+WhileStatement+140
+//%+WhileStatement+143
 public class WhileStatement : SYMBOL{
  public  WhileStatement (Parser yyp, SYMBOL  s , Statement  st ):base(((LSLSyntax
 )yyp)){ kids . Add ( s );
@@ -564,9 +588,9 @@ public class WhileStatement : SYMBOL{
 }
 
 public override string yyname { get { return "WhileStatement"; }}
-public override int yynum { get { return 140; }}
+public override int yynum { get { return 143; }}
 public WhileStatement(Parser yyp):base(yyp){}}
-//%+DoWhileStatement+141
+//%+DoWhileStatement+144
 public class DoWhileStatement : SYMBOL{
  public  DoWhileStatement (Parser yyp, SYMBOL  s , Statement  st ):base(((LSLSyntax
 )yyp)){ if (0< st . kids . Count && st . kids . Top  is  CompoundStatement ) kids . Add ( st . kids . Pop ());
@@ -575,9 +599,9 @@ public class DoWhileStatement : SYMBOL{
 }
 
 public override string yyname { get { return "DoWhileStatement"; }}
-public override int yynum { get { return 141; }}
+public override int yynum { get { return 144; }}
 public DoWhileStatement(Parser yyp):base(yyp){}}
-//%+ForLoop+142
+//%+ForLoop+145
 public class ForLoop : SYMBOL{
  public  ForLoop (Parser yyp, ForLoopStatement  flsa , Expression  e , ForLoopStatement  flsb , Statement  s ):base(((LSLSyntax
 )yyp)){ kids . Add ( flsa );
@@ -588,9 +612,9 @@ public class ForLoop : SYMBOL{
 }
 
 public override string yyname { get { return "ForLoop"; }}
-public override int yynum { get { return 142; }}
+public override int yynum { get { return 145; }}
 public ForLoop(Parser yyp):base(yyp){}}
-//%+ForLoopStatement+143
+//%+ForLoopStatement+146
 public class ForLoopStatement : SYMBOL{
  public  ForLoopStatement (Parser yyp, Expression  e ):base(((LSLSyntax
 )yyp)){ kids . Add ( e );
@@ -608,9 +632,9 @@ public class ForLoopStatement : SYMBOL{
 }
 
 public override string yyname { get { return "ForLoopStatement"; }}
-public override int yynum { get { return 143; }}
+public override int yynum { get { return 146; }}
 public ForLoopStatement(Parser yyp):base(yyp){}}
-//%+FunctionCall+144
+//%+FunctionCall+147
 public class FunctionCall : SYMBOL{
  private  string  m_id ;
  public  FunctionCall (Parser yyp, string  id , ArgumentList  al ):base(((LSLSyntax
@@ -624,9 +648,9 @@ public class FunctionCall : SYMBOL{
 }
 
 public override string yyname { get { return "FunctionCall"; }}
-public override int yynum { get { return 144; }}
+public override int yynum { get { return 147; }}
 public FunctionCall(Parser yyp):base(yyp){}}
-//%+ArgumentList+145
+//%+ArgumentList+148
 public class ArgumentList : SYMBOL{
  public  ArgumentList (Parser yyp, Argument  a ):base(((LSLSyntax
 )yyp)){ AddArgument ( a );
@@ -640,14 +664,14 @@ public class ArgumentList : SYMBOL{
 }
 
 public override string yyname { get { return "ArgumentList"; }}
-public override int yynum { get { return 145; }}
+public override int yynum { get { return 148; }}
 public ArgumentList(Parser yyp):base(yyp){}}
-//%+Argument+146
+//%+Argument+149
 public class Argument : SYMBOL{
 public override string yyname { get { return "Argument"; }}
-public override int yynum { get { return 146; }}
+public override int yynum { get { return 149; }}
 public Argument(Parser yyp):base(yyp){}}
-//%+ExpressionArgument+147
+//%+ExpressionArgument+150
 public class ExpressionArgument : Argument{
  public  ExpressionArgument (Parser yyp, Expression  e ):base(((LSLSyntax
 )yyp)){ if ( e  is  ConstantExpression ) while (0< e . kids . Count ) kids . Add ( e . kids . Pop ());
@@ -655,9 +679,9 @@ public class ExpressionArgument : Argument{
 }
 
 public override string yyname { get { return "ExpressionArgument"; }}
-public override int yynum { get { return 147; }}
+public override int yynum { get { return 150; }}
 public ExpressionArgument(Parser yyp):base(yyp){}}
-//%+Constant+148
+//%+Constant+151
 public class Constant : SYMBOL{
  private  string  m_type ;
  private  string  m_val ;
@@ -679,9 +703,9 @@ public class Constant : SYMBOL{
 }
 
 public override string yyname { get { return "Constant"; }}
-public override int yynum { get { return 148; }}
+public override int yynum { get { return 151; }}
 public Constant(Parser yyp):base(yyp){}}
-//%+VectorConstant+149
+//%+VectorConstant+152
 public class VectorConstant : Constant{
  public  VectorConstant (Parser yyp, Expression  valX , Expression  valY , Expression  valZ ):base(((LSLSyntax
 )yyp),"vector", null ){ kids . Add ( valX );
@@ -690,9 +714,9 @@ public class VectorConstant : Constant{
 }
 
 public override string yyname { get { return "VectorConstant"; }}
-public override int yynum { get { return 149; }}
+public override int yynum { get { return 152; }}
 public VectorConstant(Parser yyp):base(yyp){}}
-//%+RotationConstant+150
+//%+RotationConstant+153
 public class RotationConstant : Constant{
  public  RotationConstant (Parser yyp, Expression  valX , Expression  valY , Expression  valZ , Expression  valS ):base(((LSLSyntax
 )yyp),"rotation", null ){ kids . Add ( valX );
@@ -702,36 +726,36 @@ public class RotationConstant : Constant{
 }
 
 public override string yyname { get { return "RotationConstant"; }}
-public override int yynum { get { return 150; }}
+public override int yynum { get { return 153; }}
 public RotationConstant(Parser yyp):base(yyp){}}
-//%+ListConstant+151
+//%+ListConstant+154
 public class ListConstant : Constant{
  public  ListConstant (Parser yyp, ArgumentList  al ):base(((LSLSyntax
 )yyp),"list", null ){ kids . Add ( al );
 }
 
 public override string yyname { get { return "ListConstant"; }}
-public override int yynum { get { return 151; }}
+public override int yynum { get { return 154; }}
 public ListConstant(Parser yyp):base(yyp){}}
-//%+Expression+152
+//%+Expression+155
 public class Expression : SYMBOL{
  protected  void  AddExpression ( Expression  e ){ if ( e  is  ConstantExpression ) while (0< e . kids . Count ) kids . Add ( e . kids . Pop ());
  else  kids . Add ( e );
 }
 
 public override string yyname { get { return "Expression"; }}
-public override int yynum { get { return 152; }}
+public override int yynum { get { return 155; }}
 public Expression(Parser yyp):base(yyp){}}
-//%+ConstantExpression+153
+//%+ConstantExpression+156
 public class ConstantExpression : Expression{
  public  ConstantExpression (Parser yyp, Constant  c ):base(((LSLSyntax
 )yyp)){ kids . Add ( c );
 }
 
 public override string yyname { get { return "ConstantExpression"; }}
-public override int yynum { get { return 153; }}
+public override int yynum { get { return 156; }}
 public ConstantExpression(Parser yyp):base(yyp){}}
-//%+IdentExpression+154
+//%+IdentExpression+157
 public class IdentExpression : Expression{
  protected  string  m_name ;
  public  IdentExpression (Parser yyp, string  name ):base(((LSLSyntax
@@ -744,9 +768,9 @@ public class IdentExpression : Expression{
 }
 
 public override string yyname { get { return "IdentExpression"; }}
-public override int yynum { get { return 154; }}
+public override int yynum { get { return 157; }}
 public IdentExpression(Parser yyp):base(yyp){}}
-//%+IdentDotExpression+155
+//%+IdentDotExpression+158
 public class IdentDotExpression : IdentExpression{
  private  string  m_member ;
  public  IdentDotExpression (Parser yyp, string  name , string  member ):base(((LSLSyntax
@@ -760,18 +784,18 @@ public class IdentDotExpression : IdentExpression{
 }
 
 public override string yyname { get { return "IdentDotExpression"; }}
-public override int yynum { get { return 155; }}
+public override int yynum { get { return 158; }}
 public IdentDotExpression(Parser yyp):base(yyp){}}
-//%+FunctionCallExpression+156
+//%+FunctionCallExpression+159
 public class FunctionCallExpression : Expression{
  public  FunctionCallExpression (Parser yyp, FunctionCall  fc ):base(((LSLSyntax
 )yyp)){ kids . Add ( fc );
 }
 
 public override string yyname { get { return "FunctionCallExpression"; }}
-public override int yynum { get { return 156; }}
+public override int yynum { get { return 159; }}
 public FunctionCallExpression(Parser yyp):base(yyp){}}
-//%+BinaryExpression+157
+//%+BinaryExpression+160
 public class BinaryExpression : Expression{
  private  string  m_expressionSymbol ;
  public  BinaryExpression (Parser yyp, Expression  lhs , Expression  rhs , string  expressionSymbol ):base(((LSLSyntax
@@ -786,9 +810,9 @@ public class BinaryExpression : Expression{
 }
 
 public override string yyname { get { return "BinaryExpression"; }}
-public override int yynum { get { return 157; }}
+public override int yynum { get { return 160; }}
 public BinaryExpression(Parser yyp):base(yyp){}}
-//%+UnaryExpression+158
+//%+UnaryExpression+161
 public class UnaryExpression : Expression{
  private  string  m_unarySymbol ;
  public  UnaryExpression (Parser yyp, string  unarySymbol , Expression  e ):base(((LSLSyntax
@@ -802,9 +826,9 @@ public class UnaryExpression : Expression{
 }
 
 public override string yyname { get { return "UnaryExpression"; }}
-public override int yynum { get { return 158; }}
+public override int yynum { get { return 161; }}
 public UnaryExpression(Parser yyp):base(yyp){}}
-//%+TypecastExpression+159
+//%+TypecastExpression+162
 public class TypecastExpression : Expression{
  private  string  m_typecastType ;
  public  TypecastExpression (Parser yyp, string  typecastType , SYMBOL  rhs ):base(((LSLSyntax
@@ -818,18 +842,18 @@ public class TypecastExpression : Expression{
 }
 
 public override string yyname { get { return "TypecastExpression"; }}
-public override int yynum { get { return 159; }}
+public override int yynum { get { return 162; }}
 public TypecastExpression(Parser yyp):base(yyp){}}
-//%+ParenthesisExpression+160
+//%+ParenthesisExpression+163
 public class ParenthesisExpression : Expression{
  public  ParenthesisExpression (Parser yyp, SYMBOL  s ):base(((LSLSyntax
 )yyp)){ kids . Add ( s );
 }
 
 public override string yyname { get { return "ParenthesisExpression"; }}
-public override int yynum { get { return 160; }}
+public override int yynum { get { return 163; }}
 public ParenthesisExpression(Parser yyp):base(yyp){}}
-//%+IncrementDecrementExpression+161
+//%+IncrementDecrementExpression+164
 public class IncrementDecrementExpression : Expression{
  private  string  m_name ;
  private  string  m_operation ;
@@ -857,7 +881,7 @@ public class IncrementDecrementExpression : Expression{
 }
 
 public override string yyname { get { return "IncrementDecrementExpression"; }}
-public override int yynum { get { return 161; }}
+public override int yynum { get { return 164; }}
 public IncrementDecrementExpression(Parser yyp):base(yyp){}}
 
 public class LSLProgramRoot_1 : LSLProgramRoot {
@@ -1041,6 +1065,18 @@ public class StateBody_14 : StateBody {
 	((IntVecVecArgStateEvent)(yyq.StackAt(0).m_value))
 	){}}
 
+public class StateBody_15 : StateBody {
+  public StateBody_15(Parser yyq):base(yyq,
+	((KeyIntIntArgStateEvent)(yyq.StackAt(0).m_value))
+	){}}
+
+public class StateBody_16 : StateBody {
+  public StateBody_16(Parser yyq):base(yyq,
+	((StateBody)(yyq.StackAt(1).m_value))
+	, 
+	((KeyIntIntArgStateEvent)(yyq.StackAt(0).m_value))
+	){}}
+
 public class StateEvent_1 : StateEvent {
   public StateEvent_1(Parser yyq):base(yyq,
 	((Event)(yyq.StackAt(4).m_value))
@@ -1102,6 +1138,15 @@ public class IntVecVecArgStateEvent_1 : IntVecVecArgStateEvent {
 	((CompoundStatement)(yyq.StackAt(0).m_value))
 	){}}
 
+public class KeyIntIntArgStateEvent_1 : KeyIntIntArgStateEvent {
+  public KeyIntIntArgStateEvent_1(Parser yyq):base(yyq,
+	((KeyIntIntArgEvent)(yyq.StackAt(4).m_value))
+	.yytext, 
+	((KeyIntIntArgumentDeclarationList)(yyq.StackAt(2).m_value))
+	, 
+	((CompoundStatement)(yyq.StackAt(0).m_value))
+	){}}
+
 public class ArgumentDeclarationList_1 : ArgumentDeclarationList {
   public ArgumentDeclarationList_1(Parser yyq):base(yyq,
 	((Declaration)(yyq.StackAt(0).m_value))
@@ -1147,6 +1192,15 @@ public class IntVecVecArgumentDeclarationList_1 : IntVecVecArgumentDeclarationLi
 	((VecDeclaration)(yyq.StackAt(0).m_value))
 	){}}
 
+public class KeyIntIntArgumentDeclarationList_1 : KeyIntIntArgumentDeclarationList {
+  public KeyIntIntArgumentDeclarationList_1(Parser yyq):base(yyq,
+	((KeyDeclaration)(yyq.StackAt(4).m_value))
+	, 
+	((IntDeclaration)(yyq.StackAt(2).m_value))
+	, 
+	((IntDeclaration)(yyq.StackAt(0).m_value))
+	){}}
+
 public class Declaration_1 : Declaration {
   public Declaration_1(Parser yyq):base(yyq,
 	((Typename)(yyq.StackAt(1).m_value))
@@ -2142,46 +2196,41 @@ public class Typename_7 : Typename {
 
 public class Event_1 : Event {
   public Event_1(Parser yyq):base(yyq,
-	((CONTROL_EVENT)(yyq.StackAt(0).m_value))
+	((DATASERVER_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_2 : Event {
   public Event_2(Parser yyq):base(yyq,
-	((DATASERVER_EVENT)(yyq.StackAt(0).m_value))
+	((EMAIL_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_3 : Event {
   public Event_3(Parser yyq):base(yyq,
-	((EMAIL_EVENT)(yyq.StackAt(0).m_value))
+	((HTTP_RESPONSE_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_4 : Event {
   public Event_4(Parser yyq):base(yyq,
-	((HTTP_RESPONSE_EVENT)(yyq.StackAt(0).m_value))
+	((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_5 : Event {
   public Event_5(Parser yyq):base(yyq,
-	((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value))
+	((LISTEN_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_6 : Event {
   public Event_6(Parser yyq):base(yyq,
-	((LISTEN_EVENT)(yyq.StackAt(0).m_value))
+	((MONEY_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_7 : Event {
   public Event_7(Parser yyq):base(yyq,
-	((MONEY_EVENT)(yyq.StackAt(0).m_value))
+	((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
 public class Event_8 : Event {
   public Event_8(Parser yyq):base(yyq,
-	((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value))
-	.yytext){}}
-
-public class Event_9 : Event {
-  public Event_9(Parser yyq):base(yyq,
 	((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
 
@@ -2309,6 +2358,11 @@ public class IntVecVecArgEvent_1 : IntVecVecArgEvent {
   public IntVecVecArgEvent_1(Parser yyq):base(yyq,
 	((AT_TARGET_EVENT)(yyq.StackAt(0).m_value))
 	.yytext){}}
+
+public class KeyIntIntArgEvent_1 : KeyIntIntArgEvent {
+  public KeyIntIntArgEvent_1(Parser yyq):base(yyq,
+	((CONTROL_EVENT)(yyq.StackAt(0).m_value))
+	.yytext){}}
 public class yyLSLSyntax
 : YyParser {
   public override object Action(Parser yyq,SYMBOL yysym, int yyact) {
@@ -2325,11 +2379,11 @@ public class ArgumentList_3 : ArgumentList {
 public class ArgumentDeclarationList_4 : ArgumentDeclarationList {
   public ArgumentDeclarationList_4(Parser yyq):base(yyq){}}
 
-public class ArgumentDeclarationList_5 : ArgumentDeclarationList {
-  public ArgumentDeclarationList_5(Parser yyq):base(yyq){}}
-
 public class ArgumentList_4 : ArgumentList {
   public ArgumentList_4(Parser yyq):base(yyq){}}
+
+public class ArgumentDeclarationList_5 : ArgumentDeclarationList {
+  public ArgumentDeclarationList_5(Parser yyq):base(yyq){}}
 public yyLSLSyntax
 ():base() { arr = new int[] { 
 101,4,6,52,0,
@@ -2341,9 +2395,9 @@ public yyLSLSyntax
 97,0,109,0,82,
 0,111,0,111,0,
 116,0,1,96,1,
-2,104,18,1,2820,
+2,104,18,1,2841,
 102,2,0,105,5,
-382,1,0,106,18,
+394,1,0,106,18,
 1,0,0,2,0,
 1,1,107,18,1,
 1,108,20,109,4,
@@ -2404,7 +2458,7 @@ public yyLSLSyntax
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,1,
-121,1,2,2,0,
+123,1,2,2,0,
 1,9,131,18,1,
 9,132,20,133,4,
 10,73,0,68,0,
@@ -2418,15 +2472,101 @@ public yyLSLSyntax
 65,0,82,0,69,
 0,78,0,1,16,
 1,1,2,0,1,
-2797,137,18,1,2797,
-138,20,139,4,18,
-83,0,69,0,77,
-0,73,0,67,0,
-79,0,76,0,79,
-0,78,0,1,11,
-1,1,2,0,1,
-2798,140,18,1,2798,
-141,20,142,4,34,
+18,137,18,1,18,
+129,2,0,1,19,
+138,18,1,19,132,
+2,0,1,20,139,
+18,1,20,140,20,
+141,4,46,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,76,0,105,0,
+115,0,116,0,1,
+111,1,2,2,0,
+1,21,142,18,1,
+21,143,20,144,4,
+10,67,0,79,0,
+77,0,77,0,65,
+0,1,14,1,1,
+2,0,1,2807,145,
+18,1,2807,146,20,
+147,4,18,83,0,
+69,0,77,0,73,
+0,67,0,79,0,
+76,0,79,0,78,
+0,1,11,1,1,
+2,0,1,1694,148,
+18,1,1694,149,20,
+150,4,32,70,0,
+111,0,114,0,76,
+0,111,0,111,0,
+112,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+1,146,1,2,2,
+0,1,1695,151,18,
+1,1695,143,2,0,
+1,2645,152,18,1,
+2645,153,20,154,4,
+34,86,0,111,0,
+105,0,100,0,65,
+0,114,0,103,0,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,104,1,2,2,
+0,1,2646,155,18,
+1,2646,156,20,157,
+4,20,83,0,116,
+0,97,0,116,0,
+101,0,69,0,118,
+0,101,0,110,0,
+116,0,1,103,1,
+2,2,0,1,30,
+158,18,1,30,159,
+20,160,4,22,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,1,118,1,2,
+2,0,1,31,161,
+18,1,31,162,20,
+163,4,22,82,0,
+73,0,71,0,72,
+0,84,0,95,0,
+80,0,65,0,82,
+0,69,0,78,0,
+1,17,1,1,2,
+0,1,32,164,18,
+1,32,165,20,166,
+4,20,76,0,69,
+0,70,0,84,0,
+95,0,66,0,82,
+0,65,0,67,0,
+69,0,1,12,1,
+1,2,0,1,2650,
+167,18,1,2650,168,
+20,169,4,44,73,
+0,110,0,116,0,
+82,0,111,0,116,
+0,82,0,111,0,
+116,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,1,108,
+1,2,2,0,1,
+2819,170,18,1,2819,
+171,20,172,4,34,
 71,0,108,0,111,
 0,98,0,97,0,
 108,0,68,0,101,
@@ -2435,77 +2575,92 @@ public yyLSLSyntax
 0,105,0,111,0,
 110,0,115,0,1,
 97,1,2,2,0,
-1,2632,143,18,1,
-2632,144,20,145,4,
-44,73,0,110,0,
-116,0,86,0,101,
-0,99,0,86,0,
-101,0,99,0,65,
-0,114,0,103,0,
-83,0,116,0,97,
-0,116,0,101,0,
-69,0,118,0,101,
+1,2652,173,18,1,
+2652,174,20,175,4,
+32,73,0,110,0,
+116,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,1,106,
+1,2,2,0,1,
+1114,176,18,1,1114,
+132,2,0,1,2654,
+177,18,1,2654,153,
+2,0,1,1152,178,
+18,1,1152,179,20,
+180,4,32,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
 0,110,0,116,0,
-1,109,1,2,2,
-0,1,18,146,18,
-1,18,129,2,0,
-1,19,147,18,1,
-19,132,2,0,1,
-20,148,18,1,20,
-149,20,150,4,46,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,76,0,
-105,0,115,0,116,
-0,1,110,1,2,
-2,0,1,21,151,
-18,1,21,152,20,
-153,4,10,67,0,
-79,0,77,0,77,
-0,65,0,1,14,
-1,1,2,0,1,
-1694,154,18,1,1694,
-155,20,156,4,32,
-70,0,111,0,114,
-0,76,0,111,0,
-111,0,112,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,143,1,
-2,2,0,1,1695,
-157,18,1,1695,152,
-2,0,1,30,158,
-18,1,30,159,20,
-160,4,22,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
+1,137,1,2,2,
+0,1,1117,181,18,
+1,1117,182,20,183,
+4,28,80,0,69,
+0,82,0,67,0,
+69,0,78,0,84,
+0,95,0,69,0,
+81,0,85,0,65,
+0,76,0,83,0,
+1,10,1,1,2,
+0,1,40,184,18,
+1,40,132,2,0,
+1,41,185,18,1,
+41,135,2,0,1,
+42,186,18,1,42,
+187,20,188,4,20,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
 0,111,0,110,0,
-1,116,1,2,2,
-0,1,31,161,18,
-1,31,162,20,163,
+1,155,1,2,2,
+0,1,43,189,18,
+1,43,190,20,191,
 4,22,82,0,73,
 0,71,0,72,0,
-84,0,95,0,80,
-0,65,0,82,0,
-69,0,78,0,1,
-17,1,1,2,0,
-1,32,164,18,1,
-32,165,20,166,4,
-20,76,0,69,0,
-70,0,84,0,95,
-0,66,0,82,0,
-65,0,67,0,69,
-0,1,12,1,1,
-2,0,1,2818,167,
-18,1,2818,168,20,
-169,4,48,71,0,
+84,0,95,0,83,
+0,72,0,73,0,
+70,0,84,0,1,
+41,1,1,2,0,
+1,44,192,18,1,
+44,132,2,0,1,
+1159,193,18,1,1159,
+187,2,0,1,46,
+194,18,1,46,195,
+20,196,4,12,80,
+0,69,0,82,0,
+73,0,79,0,68,
+0,1,24,1,1,
+2,0,1,47,197,
+18,1,47,132,2,
+0,1,48,198,18,
+1,48,199,20,200,
+4,18,68,0,69,
+0,67,0,82,0,
+69,0,77,0,69,
+0,78,0,84,0,
+1,5,1,1,2,
+0,1,49,201,18,
+1,49,202,20,203,
+4,18,73,0,78,
+0,67,0,82,0,
+69,0,77,0,69,
+0,78,0,84,0,
+1,4,1,1,2,
+0,1,50,204,18,
+1,50,199,2,0,
+1,51,205,18,1,
+51,202,2,0,1,
+52,206,18,1,52,
+135,2,0,1,2281,
+207,18,1,2281,179,
+2,0,1,2839,208,
+18,1,2839,209,20,
+210,4,48,71,0,
 108,0,111,0,98,
 0,97,0,108,0,
 70,0,117,0,110,
@@ -2516,9 +2671,9 @@ public yyLSLSyntax
 0,105,0,116,0,
 105,0,111,0,110,
 0,1,99,1,2,
-2,0,1,2819,170,
-18,1,2819,171,20,
-172,4,50,71,0,
+2,0,1,2840,211,
+18,1,2840,212,20,
+213,4,50,71,0,
 108,0,111,0,98,
 0,97,0,108,0,
 86,0,97,0,114,
@@ -2530,563 +2685,395 @@ public yyLSLSyntax
 116,0,105,0,111,
 0,110,0,1,98,
 1,2,2,0,1,
-2820,104,1,1114,173,
-18,1,1114,132,2,
-0,1,1152,174,18,
-1,1152,175,20,176,
-4,32,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,1,
-134,1,2,2,0,
-1,1117,177,18,1,
-1117,178,20,179,4,
-28,80,0,69,0,
-82,0,67,0,69,
-0,78,0,84,0,
-95,0,69,0,81,
-0,85,0,65,0,
-76,0,83,0,1,
-10,1,1,2,0,
-1,40,180,18,1,
-40,132,2,0,1,
-41,181,18,1,41,
-135,2,0,1,42,
-182,18,1,42,183,
-20,184,4,20,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,1,
-152,1,2,2,0,
-1,43,185,18,1,
-43,186,20,187,4,
-22,82,0,73,0,
-71,0,72,0,84,
-0,95,0,83,0,
-72,0,73,0,70,
-0,84,0,1,41,
-1,1,2,0,1,
-44,188,18,1,44,
-132,2,0,1,1159,
-189,18,1,1159,183,
-2,0,1,46,190,
-18,1,46,191,20,
-192,4,12,80,0,
-69,0,82,0,73,
-0,79,0,68,0,
-1,24,1,1,2,
-0,1,47,193,18,
-1,47,132,2,0,
-1,48,194,18,1,
-48,195,20,196,4,
-18,68,0,69,0,
-67,0,82,0,69,
-0,77,0,69,0,
-78,0,84,0,1,
-5,1,1,2,0,
-1,49,197,18,1,
-49,198,20,199,4,
-18,73,0,78,0,
-67,0,82,0,69,
-0,77,0,69,0,
-78,0,84,0,1,
-4,1,1,2,0,
-1,50,200,18,1,
-50,195,2,0,1,
-51,201,18,1,51,
-198,2,0,1,52,
-202,18,1,52,135,
-2,0,1,2281,203,
-18,1,2281,175,2,
-0,1,2754,204,18,
-1,2754,149,2,0,
-1,1730,205,18,1,
-1730,175,2,0,1,
-1731,206,18,1,1731,
-138,2,0,1,61,
-207,18,1,61,129,
-2,0,1,62,208,
+2841,104,1,2842,214,
+18,1,2842,215,23,
+216,4,6,69,0,
+79,0,70,0,1,
+2,1,6,2,0,
+1,1730,217,18,1,
+1730,179,2,0,1,
+1731,218,18,1,1731,
+146,2,0,1,61,
+219,18,1,61,129,
+2,0,1,62,220,
 18,1,62,162,2,
-0,1,63,209,18,
+0,1,63,221,18,
 1,63,132,2,0,
-1,2761,210,18,1,
-2761,211,20,212,4,
-12,69,0,81,0,
-85,0,65,0,76,
-0,83,0,1,15,
-1,1,2,0,1,
-65,213,18,1,65,
-191,2,0,1,66,
-214,18,1,66,132,
-2,0,1,67,215,
-18,1,67,195,2,
-0,1,68,216,18,
-1,68,198,2,0,
-1,69,217,18,1,
-69,195,2,0,1,
-70,218,18,1,70,
-198,2,0,1,71,
-219,18,1,71,135,
-2,0,1,73,220,
-18,1,73,183,2,
-0,1,74,221,18,
-1,74,162,2,0,
-1,1189,222,18,1,
-1189,223,20,224,4,
-22,83,0,84,0,
-65,0,82,0,95,
-0,69,0,81,0,
-85,0,65,0,76,
-0,83,0,1,8,
-1,1,2,0,1,
-76,225,18,1,76,
-226,20,227,4,20,
-76,0,69,0,70,
-0,84,0,95,0,
-83,0,72,0,73,
-0,70,0,84,0,
-1,40,1,1,2,
-0,1,1153,228,18,
-1,1153,229,20,230,
-4,24,83,0,76,
-0,65,0,83,0,
-72,0,95,0,69,
-0,81,0,85,0,
-65,0,76,0,83,
-0,1,9,1,1,
-2,0,1,79,231,
-18,1,79,232,20,
-233,4,10,84,0,
-73,0,76,0,68,
-0,69,0,1,36,
-1,1,2,0,1,
-1195,234,18,1,1195,
-183,2,0,1,82,
-235,18,1,82,183,
-2,0,1,1123,236,
-18,1,1123,183,2,
-0,1,85,237,18,
-1,85,238,20,239,
-4,26,83,0,84,
-0,82,0,79,0,
-75,0,69,0,95,
-0,83,0,84,0,
-82,0,79,0,75,
-0,69,0,1,39,
-1,1,2,0,1,
-2547,240,18,1,2547,
-241,20,242,4,28,
-73,0,110,0,116,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,1,118,
-1,2,2,0,1,
-89,243,18,1,89,
-244,20,245,4,10,
-77,0,73,0,78,
-0,85,0,83,0,
-1,19,1,1,2,
-0,1,2318,246,18,
-1,2318,138,2,0,
-1,2624,247,18,1,
-2624,144,2,0,1,
-93,248,18,1,93,
-183,2,0,1,97,
-249,18,1,97,250,
-20,251,4,14,65,
-0,77,0,80,0,
-95,0,65,0,77,
-0,80,0,1,38,
-1,1,2,0,1,
-102,252,18,1,102,
-253,20,254,4,22,
-69,0,88,0,67,
-0,76,0,65,0,
-77,0,65,0,84,
-0,73,0,79,0,
-78,0,1,37,1,
-1,2,0,1,1775,
-255,18,1,1775,162,
-2,0,1,107,256,
-18,1,107,183,2,
-0,1,2337,257,18,
-1,2337,162,2,0,
-1,1224,258,18,1,
-1224,175,2,0,1,
-1225,259,18,1,1225,
-260,20,261,4,24,
-77,0,73,0,78,
-0,85,0,83,0,
-95,0,69,0,81,
-0,85,0,65,0,
-76,0,83,0,1,
-7,1,1,2,0,
-1,112,262,18,1,
-112,263,20,264,4,
-28,71,0,82,0,
-69,0,65,0,84,
-0,69,0,82,0,
-95,0,69,0,81,
-0,85,0,65,0,
-76,0,83,0,1,
-32,1,1,2,0,
-1,1188,265,18,1,
-1188,175,2,0,1,
-1231,266,18,1,1231,
-183,2,0,1,118,
-267,18,1,118,183,
-2,0,1,2816,268,
-18,1,2816,168,2,
-0,1,1737,269,18,
-1,1737,183,2,0,
-1,124,270,18,1,
-124,271,20,272,4,
-22,76,0,69,0,
-83,0,83,0,95,
-0,69,0,81,0,
-85,0,65,0,76,
-0,83,0,1,31,
-1,1,2,0,1,
-2821,273,18,1,2821,
-274,23,275,4,6,
-69,0,79,0,70,
-0,1,2,1,6,
-2,0,1,130,276,
-18,1,130,183,2,
-0,1,2742,277,18,
-1,2742,278,20,279,
-4,10,83,0,116,
-0,97,0,116,0,
-101,0,1,101,1,
-2,2,0,1,1803,
-280,18,1,1803,281,
-20,282,4,18,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,131,1,
-2,2,0,1,1804,
-283,18,1,1804,284,
-20,285,4,4,68,
-0,79,0,1,44,
-1,1,2,0,1,
-2745,286,18,1,2745,
-135,2,0,1,2364,
-287,18,1,2364,281,
-2,0,1,137,288,
-18,1,137,289,20,
-290,4,36,69,0,
-88,0,67,0,76,
-0,65,0,77,0,
-65,0,84,0,73,
-0,79,0,78,0,
+1,65,222,18,1,
+65,195,2,0,1,
+66,223,18,1,66,
+132,2,0,1,67,
+224,18,1,67,199,
+2,0,1,68,225,
+18,1,68,202,2,
+0,1,69,226,18,
+1,69,199,2,0,
+1,70,227,18,1,
+70,202,2,0,1,
+71,228,18,1,71,
+135,2,0,1,73,
+229,18,1,73,187,
+2,0,1,74,230,
+18,1,74,162,2,
+0,1,1189,231,18,
+1,1189,232,20,233,
+4,22,83,0,84,
+0,65,0,82,0,
 95,0,69,0,81,
 0,85,0,65,0,
 76,0,83,0,1,
-30,1,1,2,0,
-1,2293,291,18,1,
-2293,138,2,0,1,
-1701,292,18,1,1701,
-183,2,0,1,1756,
-293,18,1,1756,138,
-2,0,1,2527,294,
-18,1,2527,132,2,
-0,1,143,295,18,
-1,143,183,2,0,
-1,2299,296,18,1,
-2299,183,2,0,1,
-1260,297,18,1,1260,
-175,2,0,1,1261,
-298,18,1,1261,299,
-20,300,4,22,80,
-0,76,0,85,0,
+8,1,1,2,0,
+1,76,234,18,1,
+76,235,20,236,4,
+20,76,0,69,0,
+70,0,84,0,95,
+0,83,0,72,0,
+73,0,70,0,84,
+0,1,40,1,1,
+2,0,1,1153,237,
+18,1,1153,238,20,
+239,4,24,83,0,
+76,0,65,0,83,
+0,72,0,95,0,
+69,0,81,0,85,
+0,65,0,76,0,
+83,0,1,9,1,
+1,2,0,1,79,
+240,18,1,79,241,
+20,242,4,10,84,
+0,73,0,76,0,
+68,0,69,0,1,
+36,1,1,2,0,
+1,1195,243,18,1,
+1195,187,2,0,1,
+82,244,18,1,82,
+187,2,0,1,1123,
+245,18,1,1123,187,
+2,0,1,85,246,
+18,1,85,247,20,
+248,4,26,83,0,
+84,0,82,0,79,
+0,75,0,69,0,
+95,0,83,0,84,
+0,82,0,79,0,
+75,0,69,0,1,
+39,1,1,2,0,
+1,2547,249,18,1,
+2547,250,20,251,4,
+64,73,0,110,0,
+116,0,82,0,111,
+0,116,0,82,0,
+111,0,116,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
+1,115,1,2,2,
+0,1,89,252,18,
+1,89,253,20,254,
+4,10,77,0,73,
+0,78,0,85,0,
+83,0,1,19,1,
+1,2,0,1,2318,
+255,18,1,2318,146,
+2,0,1,2788,256,
+18,1,2788,187,2,
+0,1,93,257,18,
+1,93,187,2,0,
+1,97,258,18,1,
+97,259,20,260,4,
+14,65,0,77,0,
+80,0,95,0,65,
+0,77,0,80,0,
+1,38,1,1,2,
+0,1,102,261,18,
+1,102,262,20,263,
+4,22,69,0,88,
+0,67,0,76,0,
+65,0,77,0,65,
+0,84,0,73,0,
+79,0,78,0,1,
+37,1,1,2,0,
+1,1775,264,18,1,
+1775,162,2,0,1,
+107,265,18,1,107,
+187,2,0,1,2337,
+266,18,1,2337,162,
+2,0,1,1224,267,
+18,1,1224,179,2,
+0,1,1225,268,18,
+1,1225,269,20,270,
+4,24,77,0,73,
+0,78,0,85,0,
 83,0,95,0,69,
 0,81,0,85,0,
 65,0,76,0,83,
-0,1,6,1,1,
-2,0,1,2528,301,
-18,1,2528,302,20,
-303,4,28,82,0,
-111,0,116,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,1,120,1,2,
-2,0,1,151,304,
-18,1,151,305,20,
-306,4,26,69,0,
+0,1,7,1,1,
+2,0,1,112,271,
+18,1,112,272,20,
+273,4,28,71,0,
+82,0,69,0,65,
+0,84,0,69,0,
+82,0,95,0,69,
+0,81,0,85,0,
+65,0,76,0,83,
+0,1,32,1,1,
+2,0,1,1188,274,
+18,1,1188,179,2,
+0,1,1231,275,18,
+1,1231,187,2,0,
+1,118,276,18,1,
+118,187,2,0,1,
+1737,277,18,1,1737,
+187,2,0,1,2818,
+278,18,1,2818,146,
+2,0,1,124,279,
+18,1,124,280,20,
+281,4,22,76,0,
+69,0,83,0,83,
+0,95,0,69,0,
 81,0,85,0,65,
 0,76,0,83,0,
-95,0,69,0,81,
-0,85,0,65,0,
-76,0,83,0,1,
-29,1,1,2,0,
-1,2682,307,18,1,
-2682,308,20,309,4,
-18,83,0,116,0,
+1,31,1,1,2,
+0,1,2657,282,18,
+1,2657,165,2,0,
+1,130,283,18,1,
+130,187,2,0,1,
+1803,284,18,1,1803,
+285,20,286,4,18,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,134,
+1,2,2,0,1,
+1804,287,18,1,1804,
+288,20,289,4,4,
+68,0,79,0,1,
+44,1,1,2,0,
+1,2830,290,18,1,
+2830,291,20,292,4,
+12,83,0,116,0,
 97,0,116,0,101,
-0,66,0,111,0,
-100,0,121,0,1,
-102,1,2,2,0,
-1,1267,310,18,1,
-1267,183,2,0,1,
-157,311,18,1,157,
-183,2,0,1,2767,
-312,18,1,2767,183,
-2,0,1,1773,313,
-18,1,1773,155,2,
-0,1,1832,314,18,
-1,1832,281,2,0,
-1,1833,315,18,1,
-1833,316,20,317,4,
-10,87,0,72,0,
-73,0,76,0,69,
-0,1,45,1,1,
-2,0,1,1834,318,
-18,1,1834,135,2,
-0,1,166,319,18,
-1,166,320,20,321,
-4,20,76,0,69,
-0,70,0,84,0,
-95,0,65,0,78,
-0,71,0,76,0,
-69,0,1,25,1,
-1,2,0,1,1840,
-322,18,1,1840,183,
-2,0,1,172,323,
-18,1,172,183,2,
-0,1,2786,324,18,
-1,2786,138,2,0,
-1,2335,325,18,1,
-2335,155,2,0,1,
-1296,326,18,1,1296,
-175,2,0,1,1297,
-327,18,1,1297,211,
-2,0,1,2413,328,
-18,1,2413,329,20,
-330,4,26,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,76,0,105,0,
-115,0,116,0,1,
-130,1,2,2,0,
-1,2635,331,18,1,
-2635,332,20,333,4,
-32,73,0,110,0,
-116,0,65,0,114,
-0,103,0,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,1,106,
+0,115,0,1,100,
 1,2,2,0,1,
-1859,334,18,1,1859,
-162,2,0,1,1860,
-335,18,1,1860,138,
-2,0,1,188,336,
-18,1,188,183,2,
-0,1,182,337,18,
-1,182,338,20,339,
-4,22,82,0,73,
-0,71,0,72,0,
-84,0,95,0,65,
-0,78,0,71,0,
-76,0,69,0,1,
-26,1,1,2,0,
-1,199,340,18,1,
-199,341,20,342,4,
-10,67,0,65,0,
-82,0,69,0,84,
-0,1,35,1,1,
-2,0,1,1871,343,
-18,1,1871,175,2,
-0,1,1872,344,18,
-1,1872,162,2,0,
-1,1873,345,18,1,
-1873,138,2,0,1,
-1875,346,18,1,1875,
-316,2,0,1,205,
-347,18,1,205,183,
-2,0,1,1882,348,
-18,1,1882,183,2,
-0,1,2227,349,18,
-1,2227,281,2,0,
-1,217,350,18,1,
-217,351,20,352,4,
-12,83,0,84,0,
-82,0,79,0,75,
-0,69,0,1,34,
-1,1,2,0,1,
-1332,353,18,1,1332,
-175,2,0,1,2743,
-354,18,1,2743,278,
-2,0,1,2744,355,
-18,1,2744,132,2,
-0,1,1335,356,18,
-1,1335,178,2,0,
-1,223,357,18,1,
-223,183,2,0,1,
-1341,358,18,1,1341,
-183,2,0,1,1901,
-359,18,1,1901,162,
-2,0,1,1303,360,
-18,1,1303,183,2,
-0,1,2462,361,18,
-1,2462,281,2,0,
-1,2756,362,18,1,
-2756,162,2,0,1,
-236,363,18,1,236,
-364,20,365,4,6,
-65,0,77,0,80,
-0,1,33,1,1,
-2,0,1,2466,366,
-18,1,2466,367,20,
-368,4,34,67,0,
-111,0,109,0,112,
-0,111,0,117,0,
-110,0,100,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,129,1,
-2,2,0,1,2467,
-369,18,1,2467,159,
-2,0,1,2468,370,
-18,1,2468,371,20,
-372,4,10,83,0,
-84,0,65,0,84,
-0,69,0,1,48,
-1,1,2,0,1,
-2469,373,18,1,2469,
-132,2,0,1,242,
-374,18,1,242,183,
-2,0,1,2471,375,
-18,1,2471,376,20,
-377,4,30,65,0,
-84,0,95,0,84,
-0,65,0,82,0,
-71,0,69,0,84,
+2364,293,18,1,2364,
+285,2,0,1,137,
+294,18,1,137,295,
+20,296,4,36,69,
+0,88,0,67,0,
+76,0,65,0,77,
+0,65,0,84,0,
+73,0,79,0,78,
 0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,59,
-1,1,2,0,1,
-2472,378,18,1,2472,
-379,20,380,4,38,
-65,0,84,0,95,
-0,82,0,79,0,
-84,0,95,0,84,
-0,65,0,82,0,
-71,0,69,0,84,
+81,0,85,0,65,
+0,76,0,83,0,
+1,30,1,1,2,
+0,1,2293,297,18,
+1,2293,146,2,0,
+1,1701,298,18,1,
+1701,187,2,0,1,
+1756,299,18,1,1756,
+146,2,0,1,2527,
+300,18,1,2527,132,
+2,0,1,143,301,
+18,1,143,187,2,
+0,1,2299,302,18,
+1,2299,187,2,0,
+1,1260,303,18,1,
+1260,179,2,0,1,
+1261,304,18,1,1261,
+305,20,306,4,22,
+80,0,76,0,85,
+0,83,0,95,0,
+69,0,81,0,85,
+0,65,0,76,0,
+83,0,1,6,1,
+1,2,0,1,2528,
+307,18,1,2528,308,
+20,309,4,28,86,
+0,101,0,99,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,1,121,1,
+2,2,0,1,151,
+310,18,1,151,311,
+20,312,4,26,69,
+0,81,0,85,0,
+65,0,76,0,83,
 0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,58,
+81,0,85,0,65,
+0,76,0,83,0,
+1,29,1,1,2,
+0,1,1267,313,18,
+1,1267,187,2,0,
+1,2765,314,18,1,
+2765,132,2,0,1,
+157,315,18,1,157,
+187,2,0,1,1773,
+316,18,1,1773,149,
+2,0,1,1832,317,
+18,1,1832,285,2,
+0,1,1833,318,18,
+1,1833,319,20,320,
+4,10,87,0,72,
+0,73,0,76,0,
+69,0,1,45,1,
+1,2,0,1,1834,
+321,18,1,1834,135,
+2,0,1,166,322,
+18,1,166,323,20,
+324,4,20,76,0,
+69,0,70,0,84,
+0,95,0,65,0,
+78,0,71,0,76,
+0,69,0,1,25,
 1,1,2,0,1,
-2473,381,18,1,2473,
-382,20,383,4,52,
-76,0,65,0,78,
-0,68,0,95,0,
-67,0,79,0,76,
-0,76,0,73,0,
-83,0,73,0,79,
-0,78,0,95,0,
-83,0,84,0,65,
-0,82,0,84,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,71,1,
-1,2,0,1,2474,
-384,18,1,2474,385,
-20,386,4,48,76,
-0,65,0,78,0,
-68,0,95,0,67,
-0,79,0,76,0,
-76,0,73,0,83,
-0,73,0,79,0,
-78,0,95,0,69,
-0,78,0,68,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,70,1,
-1,2,0,1,2475,
-387,18,1,2475,388,
-20,389,4,40,76,
-0,65,0,78,0,
-68,0,95,0,67,
-0,79,0,76,0,
-76,0,73,0,83,
-0,73,0,79,0,
-78,0,95,0,69,
-0,86,0,69,0,
-78,0,84,0,1,
-69,1,1,2,0,
-1,2476,390,18,1,
-2476,391,20,392,4,
-34,84,0,79,0,
-85,0,67,0,72,
-0,95,0,83,0,
-84,0,65,0,82,
-0,84,0,95,0,
+1840,325,18,1,1840,
+187,2,0,1,2779,
+326,18,1,2779,327,
+20,328,4,34,67,
+0,111,0,109,0,
+112,0,111,0,117,
+0,110,0,100,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,132,
+1,2,2,0,1,
+172,329,18,1,172,
+187,2,0,1,2335,
+330,18,1,2335,149,
+2,0,1,1296,331,
+18,1,1296,179,2,
+0,1,1297,332,18,
+1,1297,333,20,334,
+4,12,69,0,81,
+0,85,0,65,0,
+76,0,83,0,1,
+15,1,1,2,0,
+1,2413,335,18,1,
+2413,336,20,337,4,
+26,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,76,
+0,105,0,115,0,
+116,0,1,133,1,
+2,2,0,1,1859,
+338,18,1,1859,162,
+2,0,1,1860,339,
+18,1,1860,146,2,
+0,1,188,340,18,
+1,188,187,2,0,
+1,182,341,18,1,
+182,342,20,343,4,
+22,82,0,73,0,
+71,0,72,0,84,
+0,95,0,65,0,
+78,0,71,0,76,
+0,69,0,1,26,
+1,1,2,0,1,
+199,344,18,1,199,
+345,20,346,4,10,
+67,0,65,0,82,
+0,69,0,84,0,
+1,35,1,1,2,
+0,1,1871,347,18,
+1,1871,179,2,0,
+1,1872,348,18,1,
+1872,162,2,0,1,
+1873,349,18,1,1873,
+146,2,0,1,1875,
+350,18,1,1875,319,
+2,0,1,205,351,
+18,1,205,187,2,
+0,1,2581,352,18,
+1,2581,135,2,0,
+1,1882,353,18,1,
+1882,187,2,0,1,
+2227,354,18,1,2227,
+285,2,0,1,2590,
+355,18,1,2590,140,
+2,0,1,217,356,
+18,1,217,357,20,
+358,4,12,83,0,
+84,0,82,0,79,
+0,75,0,69,0,
+1,34,1,1,2,
+0,1,1332,359,18,
+1,1332,179,2,0,
+1,1335,360,18,1,
+1335,182,2,0,1,
+223,361,18,1,223,
+187,2,0,1,1341,
+362,18,1,1341,187,
+2,0,1,1901,363,
+18,1,1901,162,2,
+0,1,1303,364,18,
+1,1303,187,2,0,
+1,2837,365,18,1,
+2837,209,2,0,1,
+2838,366,18,1,2838,
+212,2,0,1,2462,
+367,18,1,2462,285,
+2,0,1,236,368,
+18,1,236,369,20,
+370,4,6,65,0,
+77,0,80,0,1,
+33,1,1,2,0,
+1,2466,371,18,1,
+2466,327,2,0,1,
+2467,372,18,1,2467,
+159,2,0,1,2468,
+373,18,1,2468,374,
+20,375,4,10,83,
+0,84,0,65,0,
+84,0,69,0,1,
+48,1,1,2,0,
+1,2469,376,18,1,
+2469,132,2,0,1,
+242,377,18,1,242,
+187,2,0,1,2471,
+378,18,1,2471,379,
+20,380,4,26,67,
+0,79,0,78,0,
+84,0,82,0,79,
+0,76,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,89,1,1,2,
-0,1,2477,393,18,
-1,2477,394,20,395,
-4,30,84,0,79,
-0,85,0,67,0,
-72,0,95,0,69,
-0,78,0,68,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,90,1,
-1,2,0,1,2478,
-396,18,1,2478,397,
-20,398,4,22,84,
-0,79,0,85,0,
-67,0,72,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,88,1,1,
-2,0,1,2479,399,
-18,1,2479,400,20,
-401,4,24,83,0,
-69,0,78,0,83,
-0,79,0,82,0,
+1,65,1,1,2,
+0,1,2472,381,18,
+1,2472,382,20,383,
+4,30,65,0,84,
+0,95,0,84,0,
+65,0,82,0,71,
+0,69,0,84,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,84,1,
-1,2,0,1,2480,
-402,18,1,2480,403,
-20,404,4,52,82,
-0,85,0,78,0,
-95,0,84,0,73,
-0,77,0,69,0,
-95,0,80,0,69,
-0,82,0,77,0,
-73,0,83,0,83,
-0,73,0,79,0,
-78,0,83,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,83,1,1,
-2,0,1,2481,405,
-18,1,2481,406,20,
-407,4,24,79,0,
-78,0,95,0,82,
-0,69,0,90,0,
+84,0,1,59,1,
+1,2,0,1,2473,
+384,18,1,2473,385,
+20,386,4,38,65,
+0,84,0,95,0,
+82,0,79,0,84,
+0,95,0,84,0,
+65,0,82,0,71,
+0,69,0,84,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,81,1,
-1,2,0,1,2482,
-408,18,1,2482,409,
-20,410,4,42,67,
+84,0,1,58,1,
+1,2,0,1,2474,
+387,18,1,2474,388,
+20,389,4,52,76,
+0,65,0,78,0,
+68,0,95,0,67,
 0,79,0,76,0,
 76,0,73,0,83,
 0,73,0,79,0,
@@ -3095,10 +3082,12 @@ public yyLSLSyntax
 82,0,84,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,64,1,1,
-2,0,1,2483,411,
-18,1,2483,412,20,
-413,4,38,67,0,
+0,1,71,1,1,
+2,0,1,2475,390,
+18,1,2475,391,20,
+392,4,48,76,0,
+65,0,78,0,68,
+0,95,0,67,0,
 79,0,76,0,76,
 0,73,0,83,0,
 73,0,79,0,78,
@@ -3106,294 +3095,309 @@ public yyLSLSyntax
 78,0,68,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,63,1,1,
-2,0,1,256,414,
-18,1,256,415,20,
-416,4,14,80,0,
-69,0,82,0,67,
-0,69,0,78,0,
-84,0,1,22,1,
-1,2,0,1,1371,
-417,18,1,1371,229,
-2,0,1,2486,418,
-18,1,2486,419,20,
-420,4,32,79,0,
-66,0,74,0,69,
-0,67,0,84,0,
-95,0,82,0,69,
-0,90,0,95,0,
+0,1,70,1,1,
+2,0,1,2476,393,
+18,1,2476,394,20,
+395,4,40,76,0,
+65,0,78,0,68,
+0,95,0,67,0,
+79,0,76,0,76,
+0,73,0,83,0,
+73,0,79,0,78,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,69,
+1,1,2,0,1,
+2477,396,18,1,2477,
+397,20,398,4,34,
+84,0,79,0,85,
+0,67,0,72,0,
+95,0,83,0,84,
+0,65,0,82,0,
+84,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+89,1,1,2,0,
+1,2478,399,18,1,
+2478,400,20,401,4,
+30,84,0,79,0,
+85,0,67,0,72,
+0,95,0,69,0,
+78,0,68,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,90,1,1,
+2,0,1,2479,402,
+18,1,2479,403,20,
+404,4,22,84,0,
+79,0,85,0,67,
+0,72,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,80,1,1,2,
-0,1,2487,421,18,
-1,2487,422,20,423,
-4,24,65,0,84,
-0,84,0,65,0,
-67,0,72,0,95,
+1,88,1,1,2,
+0,1,2480,405,18,
+1,2480,406,20,407,
+4,24,83,0,69,
+0,78,0,83,0,
+79,0,82,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,60,1,1,
-2,0,1,1931,424,
-18,1,1931,281,2,
-0,1,1932,425,18,
-1,1932,426,20,427,
-4,4,73,0,70,
-0,1,42,1,1,
-2,0,1,262,428,
-18,1,262,183,2,
-0,1,1377,429,18,
-1,1377,183,2,0,
-1,2492,430,18,1,
-2492,431,20,432,4,
-36,77,0,79,0,
-86,0,73,0,78,
-0,71,0,95,0,
-83,0,84,0,65,
-0,82,0,84,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,76,1,
-1,2,0,1,1876,
-433,18,1,1876,135,
-2,0,1,2494,434,
-18,1,2494,435,20,
-436,4,32,83,0,
-84,0,65,0,84,
-0,69,0,95,0,
-69,0,88,0,73,
-0,84,0,95,0,
+0,1,84,1,1,
+2,0,1,2481,408,
+18,1,2481,409,20,
+410,4,52,82,0,
+85,0,78,0,95,
+0,84,0,73,0,
+77,0,69,0,95,
+0,80,0,69,0,
+82,0,77,0,73,
+0,83,0,83,0,
+73,0,79,0,78,
+0,83,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,86,1,1,2,
-0,1,2495,437,18,
-1,2495,438,20,439,
-4,34,83,0,84,
-0,65,0,84,0,
-69,0,95,0,69,
-0,78,0,84,0,
-82,0,89,0,95,
+1,83,1,1,2,
+0,1,2482,411,18,
+1,2482,412,20,413,
+4,24,79,0,78,
+0,95,0,82,0,
+69,0,90,0,95,
 0,69,0,86,0,
 69,0,78,0,84,
-0,1,85,1,1,
-2,0,1,1939,440,
-18,1,1939,183,2,
-0,1,2497,441,18,
-1,2497,442,20,443,
-4,34,82,0,69,
-0,77,0,79,0,
-84,0,69,0,95,
-0,68,0,65,0,
-84,0,65,0,95,
-0,69,0,86,0,
+0,1,81,1,1,
+2,0,1,2483,414,
+18,1,2483,415,20,
+416,4,42,67,0,
+79,0,76,0,76,
+0,73,0,83,0,
+73,0,79,0,78,
+0,95,0,83,0,
+84,0,65,0,82,
+0,84,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,64,1,1,2,
+0,1,256,417,18,
+1,256,418,20,419,
+4,14,80,0,69,
+0,82,0,67,0,
 69,0,78,0,84,
-0,1,82,1,1,
-2,0,1,827,444,
-18,1,827,183,2,
-0,1,2499,445,18,
-1,2499,446,20,447,
-4,24,76,0,73,
-0,83,0,84,0,
-69,0,78,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,73,1,1,
-2,0,1,2500,448,
-18,1,2500,449,20,
-450,4,36,76,0,
-73,0,78,0,75,
-0,95,0,77,0,
-69,0,83,0,83,
-0,65,0,71,0,
+0,1,22,1,1,
+2,0,1,1371,420,
+18,1,1371,238,2,
+0,1,2486,421,18,
+1,2486,422,20,423,
+4,26,67,0,72,
+0,65,0,78,0,
+71,0,69,0,68,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,61,
+1,1,2,0,1,
+2487,424,18,1,2487,
+425,20,426,4,32,
+79,0,66,0,74,
+0,69,0,67,0,
+84,0,95,0,82,
+0,69,0,90,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,80,1,
+1,2,0,1,1931,
+427,18,1,1931,285,
+2,0,1,1932,428,
+18,1,1932,429,20,
+430,4,4,73,0,
+70,0,1,42,1,
+1,2,0,1,262,
+431,18,1,262,187,
+2,0,1,1377,432,
+18,1,1377,187,2,
+0,1,2492,433,18,
+1,2492,434,20,435,
+4,30,78,0,79,
+0,95,0,83,0,
+69,0,78,0,83,
+0,79,0,82,0,
+95,0,69,0,86,
+0,69,0,78,0,
+84,0,1,77,1,
+1,2,0,1,1876,
+436,18,1,1876,135,
+2,0,1,2494,437,
+18,1,2494,438,20,
+439,4,32,77,0,
+79,0,86,0,73,
+0,78,0,71,0,
+95,0,69,0,78,
+0,68,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,75,1,1,2,
+0,1,2495,440,18,
+1,2495,441,20,442,
+4,32,83,0,84,
+0,65,0,84,0,
 69,0,95,0,69,
+0,88,0,73,0,
+84,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
-72,1,1,2,0,
-1,2501,451,18,1,
-2501,452,20,453,4,
-38,72,0,84,0,
-84,0,80,0,95,
-0,82,0,69,0,
-83,0,80,0,79,
-0,78,0,83,0,
-69,0,95,0,69,
+86,1,1,2,0,
+1,1939,443,18,1,
+1939,187,2,0,1,
+2497,444,18,1,2497,
+445,20,446,4,36,
+72,0,84,0,84,
+0,80,0,95,0,
+82,0,69,0,81,
+0,85,0,69,0,
+83,0,84,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,91,1,1,
+2,0,1,827,447,
+18,1,827,187,2,
+0,1,2499,448,18,
+1,2499,449,20,450,
+4,22,77,0,79,
+0,78,0,69,0,
+89,0,95,0,69,
 0,86,0,69,0,
 78,0,84,0,1,
-68,1,1,2,0,
-1,2502,454,18,1,
-2502,455,20,456,4,
-22,69,0,77,0,
-65,0,73,0,76,
+74,1,1,2,0,
+1,2500,451,18,1,
+2500,452,20,453,4,
+24,76,0,73,0,
+83,0,84,0,69,
+0,78,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,73,1,1,2,
+0,1,2501,454,18,
+1,2501,455,20,456,
+4,36,76,0,73,
+0,78,0,75,0,
+95,0,77,0,69,
+0,83,0,83,0,
+65,0,71,0,69,
 0,95,0,69,0,
 86,0,69,0,78,
-0,84,0,1,67,
+0,84,0,1,72,
 1,1,2,0,1,
-2503,457,18,1,2503,
-458,20,459,4,32,
-68,0,65,0,84,
-0,65,0,83,0,
-69,0,82,0,86,
-0,69,0,82,0,
+2502,457,18,1,2502,
+458,20,459,4,38,
+72,0,84,0,84,
+0,80,0,95,0,
+82,0,69,0,83,
+0,80,0,79,0,
+78,0,83,0,69,
+0,95,0,69,0,
+86,0,69,0,78,
+0,84,0,1,68,
+1,1,2,0,1,
+2503,460,18,1,2503,
+461,20,462,4,22,
+69,0,77,0,65,
+0,73,0,76,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,66,1,
+84,0,1,67,1,
 1,2,0,1,2504,
-460,18,1,2504,461,
-20,462,4,26,67,
-0,79,0,78,0,
-84,0,82,0,79,
-0,76,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,65,1,1,2,
-0,1,277,463,18,
-1,277,464,20,465,
-4,10,83,0,76,
-0,65,0,83,0,
-72,0,1,21,1,
-1,2,0,1,2506,
-466,18,1,2506,135,
-2,0,1,2507,467,
-18,1,2507,126,2,
-0,1,2508,468,18,
-1,2508,132,2,0,
-1,2509,469,18,1,
-2509,241,2,0,1,
-2510,470,18,1,2510,
-152,2,0,1,283,
-471,18,1,283,183,
-2,0,1,2512,472,
-18,1,2512,132,2,
-0,1,2513,473,18,
-1,2513,474,20,475,
-4,28,86,0,101,
-0,99,0,68,0,
+463,18,1,2504,464,
+20,465,4,32,68,
+0,65,0,84,0,
+65,0,83,0,69,
+0,82,0,86,0,
+69,0,82,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,66,1,1,
+2,0,1,277,466,
+18,1,277,467,20,
+468,4,10,83,0,
+76,0,65,0,83,
+0,72,0,1,21,
+1,1,2,0,1,
+2506,469,18,1,2506,
+135,2,0,1,2507,
+470,18,1,2507,117,
+2,0,1,2508,471,
+18,1,2508,132,2,
+0,1,2509,472,18,
+1,2509,473,20,474,
+4,28,75,0,101,
+0,121,0,68,0,
 101,0,99,0,108,
 0,97,0,114,0,
 97,0,116,0,105,
 0,111,0,110,0,
 1,119,1,2,2,
-0,1,2514,476,18,
-1,2514,152,2,0,
-1,1958,477,18,1,
-1958,162,2,0,1,
-2516,478,18,1,2516,
-474,2,0,1,2517,
-479,18,1,2517,480,
-20,481,4,64,73,
+0,1,2510,475,18,
+1,2510,143,2,0,
+1,283,476,18,1,
+283,187,2,0,1,
+2512,477,18,1,2512,
+132,2,0,1,2513,
+478,18,1,2513,479,
+20,480,4,28,73,
 0,110,0,116,0,
-86,0,101,0,99,
-0,86,0,101,0,
-99,0,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-76,0,105,0,115,
-0,116,0,1,115,
-1,2,2,0,1,
-2518,482,18,1,2518,
-162,2,0,1,2809,
-483,18,1,2809,484,
-20,485,4,12,83,
-0,116,0,97,0,
-116,0,101,0,115,
-0,1,100,1,2,
-2,0,1,1406,486,
-18,1,1406,175,2,
-0,1,1407,487,18,
-1,1407,223,2,0,
-1,2522,488,18,1,
-2522,135,2,0,1,
-2524,489,18,1,2524,
-241,2,0,1,2525,
-490,18,1,2525,152,
-2,0,1,2526,491,
-18,1,2526,111,2,
-0,1,299,492,18,
-1,299,493,20,494,
-4,8,83,0,84,
-0,65,0,82,0,
-1,20,1,1,2,
-0,1,1370,495,18,
-1,1370,175,2,0,
-1,2529,496,18,1,
-2529,152,2,0,1,
-2817,497,18,1,2817,
-171,2,0,1,2531,
-498,18,1,2531,302,
-2,0,1,2532,499,
-18,1,2532,500,20,
-501,4,64,73,0,
-110,0,116,0,82,
-0,111,0,116,0,
-82,0,111,0,116,
-0,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,76,
-0,105,0,115,0,
-116,0,1,114,1,
-2,2,0,1,305,
-502,18,1,305,183,
-2,0,1,2535,503,
-18,1,2535,367,2,
-0,1,2458,504,18,
-1,2458,281,2,0,
-1,2459,505,18,1,
-2459,506,20,507,4,
-22,82,0,73,0,
-71,0,72,0,84,
-0,95,0,66,0,
-82,0,65,0,67,
-0,69,0,1,13,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,1,120,1,
+2,2,0,1,2514,
+481,18,1,2514,143,
+2,0,1,1958,482,
+18,1,1958,162,2,
+0,1,2516,483,18,
+1,2516,479,2,0,
+1,2517,484,18,1,
+2517,485,20,486,4,
+64,75,0,101,0,
+121,0,73,0,110,
+0,116,0,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
+1,117,1,2,2,
+0,1,2518,487,18,
+1,2518,162,2,0,
+1,1406,488,18,1,
+1406,179,2,0,1,
+1407,489,18,1,1407,
+232,2,0,1,2522,
+490,18,1,2522,135,
+2,0,1,2524,491,
+18,1,2524,479,2,
+0,1,2525,492,18,
+1,2525,143,2,0,
+1,2526,493,18,1,
+2526,114,2,0,1,
+299,494,18,1,299,
+495,20,496,4,8,
+83,0,84,0,65,
+0,82,0,1,20,
 1,1,2,0,1,
-2539,508,18,1,2539,
-474,2,0,1,2540,
-509,18,1,2540,510,
-20,511,4,58,86,
+1370,497,18,1,1370,
+179,2,0,1,2529,
+498,18,1,2529,143,
+2,0,1,2531,499,
+18,1,2531,308,2,
+0,1,2532,500,18,
+1,2532,501,20,502,
+4,64,73,0,110,
+0,116,0,86,0,
+101,0,99,0,86,
 0,101,0,99,0,
-116,0,111,0,114,
-0,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,76,
-0,105,0,115,0,
-116,0,1,113,1,
-2,2,0,1,2541,
-512,18,1,2541,162,
-2,0,1,2464,513,
-18,1,2464,506,2,
-0,1,2544,514,18,
-1,2544,515,20,516,
-4,22,73,0,110,
-0,116,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
-125,1,2,2,0,
-1,2545,517,18,1,
-2545,135,2,0,1,
-1989,518,18,1,1989,
-281,2,0,1,1990,
-519,18,1,1990,520,
-20,521,4,8,69,
-0,76,0,83,0,
-69,0,1,43,1,
-1,2,0,1,2548,
-522,18,1,2548,523,
-20,524,4,52,73,
-0,110,0,116,0,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
@@ -3403,309 +3407,386 @@ public yyLSLSyntax
 116,0,105,0,111,
 0,110,0,76,0,
 105,0,115,0,116,
-0,1,112,1,2,
-2,0,1,2470,525,
-18,1,2470,165,2,
-0,1,322,526,18,
-1,322,244,2,0,
-1,2551,527,18,1,
-2551,367,2,0,1,
-1933,528,18,1,1933,
-135,2,0,1,2553,
-529,18,1,2553,135,
-2,0,1,883,530,
-18,1,883,183,2,
-0,1,2555,531,18,
-1,2555,132,2,0,
-1,328,532,18,1,
-328,183,2,0,1,
-1443,533,18,1,1443,
-260,2,0,1,2558,
-534,18,1,2558,162,
-2,0,1,2560,535,
-18,1,2560,367,2,
-0,1,2561,536,18,
-1,2561,537,20,538,
-4,24,86,0,111,
-0,105,0,100,0,
+0,1,116,1,2,
+2,0,1,305,503,
+18,1,305,187,2,
+0,1,2535,504,18,
+1,2535,327,2,0,
+1,2458,505,18,1,
+2458,285,2,0,1,
+2459,506,18,1,2459,
+507,20,508,4,22,
+82,0,73,0,71,
+0,72,0,84,0,
+95,0,66,0,82,
+0,65,0,67,0,
+69,0,1,13,1,
+1,2,0,1,2539,
+509,18,1,2539,479,
+2,0,1,2540,510,
+18,1,2540,143,2,
+0,1,2541,511,18,
+1,2541,111,2,0,
+1,2542,512,18,1,
+2542,132,2,0,1,
+2464,513,18,1,2464,
+507,2,0,1,2544,
+514,18,1,2544,143,
+2,0,1,1989,515,
+18,1,1989,285,2,
+0,1,1990,516,18,
+1,1990,517,20,518,
+4,8,69,0,76,
+0,83,0,69,0,
+1,43,1,1,2,
+0,1,2548,519,18,
+1,2548,162,2,0,
+1,2470,520,18,1,
+2470,165,2,0,1,
+322,521,18,1,322,
+253,2,0,1,2551,
+522,18,1,2551,523,
+20,524,4,28,86,
+0,101,0,99,0,
+116,0,111,0,114,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,1,128,1,
+2,2,0,1,1933,
+525,18,1,1933,135,
+2,0,1,883,526,
+18,1,883,187,2,
+0,1,2555,527,18,
+1,2555,528,20,529,
+4,58,86,0,101,
+0,99,0,116,0,
+111,0,114,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
+1,114,1,2,2,
+0,1,328,530,18,
+1,328,187,2,0,
+1,1443,531,18,1,
+1443,269,2,0,1,
+2558,532,18,1,2558,
+327,2,0,1,2559,
+533,18,1,2559,534,
+20,535,4,22,73,
+0,110,0,116,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,1,123,1,2,
-2,0,1,2562,539,
-18,1,2562,135,2,
-0,1,1449,540,18,
-1,1449,183,2,0,
-1,2485,541,18,1,
-2485,542,20,543,4,
-26,67,0,72,0,
-65,0,78,0,71,
-0,69,0,68,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,61,1,
-1,2,0,1,2565,
-544,18,1,2565,367,
-2,0,1,2566,545,
-18,1,2566,546,20,
-547,4,10,69,0,
-118,0,101,0,110,
-0,116,0,1,122,
-1,2,2,0,1,
-2488,548,18,1,2488,
-549,20,550,4,22,
-84,0,73,0,77,
-0,69,0,82,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,87,1,
-1,2,0,1,2489,
-551,18,1,2489,552,
-20,553,4,38,78,
-0,79,0,84,0,
-95,0,65,0,84,
+0,1,127,1,2,
+2,0,1,2560,536,
+18,1,2560,135,2,
+0,1,2562,537,18,
+1,2562,479,2,0,
+1,1449,538,18,1,
+1449,187,2,0,1,
+2485,539,18,1,2485,
+540,20,541,4,30,
+67,0,79,0,76,
+0,76,0,73,0,
+83,0,73,0,79,
+0,78,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,62,1,1,2,
+0,1,2566,542,18,
+1,2566,327,2,0,
+1,2488,543,18,1,
+2488,544,20,545,4,
+24,65,0,84,0,
+84,0,65,0,67,
+0,72,0,95,0,
+69,0,86,0,69,
+0,78,0,84,0,
+1,60,1,1,2,
+0,1,2489,546,18,
+1,2489,547,20,548,
+4,22,84,0,73,
+0,77,0,69,0,
+82,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+87,1,1,2,0,
+1,2490,549,18,1,
+2490,550,20,551,4,
+38,78,0,79,0,
+84,0,95,0,65,
+0,84,0,95,0,
+84,0,65,0,82,
+0,71,0,69,0,
+84,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+79,1,1,2,0,
+1,2491,552,18,1,
+2491,553,20,554,4,
+46,78,0,79,0,
+84,0,95,0,65,
+0,84,0,95,0,
+82,0,79,0,84,
 0,95,0,84,0,
 65,0,82,0,71,
 0,69,0,84,0,
 95,0,69,0,86,
 0,69,0,78,0,
-84,0,1,79,1,
-1,2,0,1,2490,
-554,18,1,2490,555,
-20,556,4,46,78,
-0,79,0,84,0,
-95,0,65,0,84,
-0,95,0,82,0,
-79,0,84,0,95,
-0,84,0,65,0,
-82,0,71,0,69,
-0,84,0,95,0,
+84,0,1,78,1,
+1,2,0,1,2571,
+555,18,1,2571,556,
+20,557,4,52,75,
+0,101,0,121,0,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,76,0,
+105,0,115,0,116,
+0,1,112,1,2,
+2,0,1,2493,558,
+18,1,2493,559,20,
+560,4,36,77,0,
+79,0,86,0,73,
+0,78,0,71,0,
+95,0,83,0,84,
+0,65,0,82,0,
+84,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+76,1,1,2,0,
+1,1413,561,18,1,
+1413,187,2,0,1,
+346,562,18,1,346,
+563,20,564,4,8,
+80,0,76,0,85,
+0,83,0,1,18,
+1,1,2,0,1,
+2575,565,18,1,2575,
+566,20,567,4,24,
+86,0,111,0,105,
+0,100,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+125,1,2,2,0,
+1,2496,568,18,1,
+2496,569,20,570,4,
+34,83,0,84,0,
+65,0,84,0,69,
+0,95,0,69,0,
+78,0,84,0,82,
+0,89,0,95,0,
 69,0,86,0,69,
 0,78,0,84,0,
-1,78,1,1,2,
-0,1,2491,557,18,
-1,2491,558,20,559,
-4,30,78,0,79,
-0,95,0,83,0,
-69,0,78,0,83,
-0,79,0,82,0,
-95,0,69,0,86,
-0,69,0,78,0,
-84,0,1,77,1,
-1,2,0,1,2493,
-560,18,1,2493,561,
-20,562,4,32,77,
-0,79,0,86,0,
-73,0,78,0,71,
-0,95,0,69,0,
-78,0,68,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,75,1,1,
-2,0,1,1413,563,
-18,1,1413,183,2,
-0,1,346,564,18,
-1,346,565,20,566,
-4,8,80,0,76,
-0,85,0,83,0,
-1,18,1,1,2,
-0,1,2496,567,18,
-1,2496,568,20,569,
-4,36,72,0,84,
-0,84,0,80,0,
-95,0,82,0,69,
-0,81,0,85,0,
-69,0,83,0,84,
-0,95,0,69,0,
-86,0,69,0,78,
-0,84,0,1,91,
-1,1,2,0,1,
-2021,570,18,1,2021,
-281,2,0,1,2022,
-571,18,1,2022,371,
-2,0,1,352,572,
-18,1,352,183,2,
-0,1,2024,573,18,
-1,2024,132,2,0,
-1,2025,574,18,1,
-2025,575,20,576,4,
-8,74,0,85,0,
-77,0,80,0,1,
-49,1,1,2,0,
-1,2026,577,18,1,
-2026,132,2,0,1,
-2027,578,18,1,2027,
-579,20,580,4,4,
-65,0,84,0,1,
-23,1,1,2,0,
-1,2028,581,18,1,
-2028,132,2,0,1,
-2029,582,18,1,2029,
-367,2,0,1,2030,
-583,18,1,2030,584,
-20,585,4,14,70,
-0,111,0,114,0,
-76,0,111,0,111,
-0,112,0,1,142,
-1,2,2,0,1,
-2031,586,18,1,2031,
-587,20,588,4,32,
-68,0,111,0,87,
-0,104,0,105,0,
-108,0,101,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,141,1,
-2,2,0,1,2032,
-589,18,1,2032,590,
-20,591,4,28,87,
-0,104,0,105,0,
-108,0,101,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,140,1,
-2,2,0,1,2033,
-592,18,1,2033,593,
-20,594,4,22,73,
-0,102,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,1,139,1,2,
-2,0,1,2034,595,
-18,1,2034,596,20,
-597,4,22,83,0,
-116,0,97,0,116,
-0,101,0,67,0,
-104,0,97,0,110,
-0,103,0,101,0,
-1,138,1,2,2,
-0,1,1478,598,18,
-1,1478,175,2,0,
-1,1479,599,18,1,
-1479,299,2,0,1,
-2037,600,18,1,2037,
-138,2,0,1,2038,
-601,18,1,2038,602,
-20,603,4,18,74,
-0,117,0,109,0,
-112,0,76,0,97,
-0,98,0,101,0,
-108,0,1,136,1,
-2,2,0,1,2039,
-604,18,1,2039,138,
-2,0,1,2040,605,
-18,1,2040,606,20,
-607,4,30,82,0,
-101,0,116,0,117,
-0,114,0,110,0,
+1,85,1,1,2,
+0,1,2577,571,18,
+1,2577,162,2,0,
+1,2021,572,18,1,
+2021,285,2,0,1,
+2022,573,18,1,2022,
+374,2,0,1,352,
+574,18,1,352,187,
+2,0,1,2024,575,
+18,1,2024,132,2,
+0,1,2025,576,18,
+1,2025,577,20,578,
+4,8,74,0,85,
+0,77,0,80,0,
+1,49,1,1,2,
+0,1,2026,579,18,
+1,2026,132,2,0,
+1,2027,580,18,1,
+2027,581,20,582,4,
+4,65,0,84,0,
+1,23,1,1,2,
+0,1,2028,583,18,
+1,2028,132,2,0,
+1,2029,584,18,1,
+2029,327,2,0,1,
+2030,585,18,1,2030,
+586,20,587,4,14,
+70,0,111,0,114,
+0,76,0,111,0,
+111,0,112,0,1,
+145,1,2,2,0,
+1,2031,588,18,1,
+2031,589,20,590,4,
+32,68,0,111,0,
+87,0,104,0,105,
+0,108,0,101,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
-0,116,0,1,135,
+0,116,0,1,144,
 1,2,2,0,1,
-2041,608,18,1,2041,
-138,2,0,1,1485,
-609,18,1,1485,183,
-2,0,1,372,610,
-18,1,372,195,2,
-0,1,373,611,18,
-1,373,132,2,0,
-1,374,612,18,1,
-374,191,2,0,1,
-375,613,18,1,375,
-132,2,0,1,376,
-614,18,1,376,198,
-2,0,1,377,615,
-18,1,377,132,2,
-0,1,378,616,18,
-1,378,191,2,0,
-1,379,617,18,1,
-379,132,2,0,1,
-380,618,18,1,380,
-619,20,620,4,16,
-67,0,111,0,110,
-0,115,0,116,0,
-97,0,110,0,116,
-0,1,148,1,2,
-2,0,1,381,621,
-18,1,381,320,2,
-0,1,371,622,18,
-1,371,623,20,624,
-4,24,70,0,117,
-0,110,0,99,0,
-116,0,105,0,111,
-0,110,0,67,0,
-97,0,108,0,108,
-0,1,144,1,2,
-2,0,1,942,625,
-18,1,942,183,2,
-0,1,2533,626,18,
-1,2533,162,2,0,
-1,387,627,18,1,
-387,183,2,0,1,
-2536,628,18,1,2536,
-629,20,630,4,28,
-86,0,101,0,99,
-0,116,0,111,0,
-114,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,1,126,
+2032,591,18,1,2032,
+592,20,593,4,28,
+87,0,104,0,105,
+0,108,0,101,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,143,
 1,2,2,0,1,
-2537,631,18,1,2537,
-135,2,0,1,2543,
-632,18,1,2543,367,
-2,0,1,2625,633,
-18,1,2625,634,20,
-635,4,44,73,0,
-110,0,116,0,82,
-0,111,0,116,0,
-82,0,111,0,116,
-0,65,0,114,0,
-103,0,83,0,116,
-0,97,0,116,0,
-101,0,69,0,118,
-0,101,0,110,0,
-116,0,1,108,1,
-2,2,0,1,2626,
-636,18,1,2626,637,
-20,638,4,38,86,
-0,101,0,99,0,
-116,0,111,0,114,
-0,65,0,114,0,
-103,0,83,0,116,
-0,97,0,116,0,
-101,0,69,0,118,
+2033,594,18,1,2033,
+595,20,596,4,22,
+73,0,102,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
 0,101,0,110,0,
-116,0,1,107,1,
-2,2,0,1,2627,
-639,18,1,2627,332,
-2,0,1,1514,640,
-18,1,1514,175,2,
-0,1,1515,641,18,
-1,1515,211,2,0,
-1,2549,642,18,1,
-2549,162,2,0,1,
-2074,643,18,1,2074,
-175,2,0,1,2075,
-644,18,1,2075,162,
-2,0,1,2552,645,
-18,1,2552,646,20,
-647,4,22,75,0,
-101,0,121,0,65,
+116,0,1,142,1,
+2,2,0,1,2034,
+597,18,1,2034,598,
+20,599,4,22,83,
+0,116,0,97,0,
+116,0,101,0,67,
+0,104,0,97,0,
+110,0,103,0,101,
+0,1,141,1,2,
+2,0,1,1478,600,
+18,1,1478,179,2,
+0,1,1479,601,18,
+1,1479,305,2,0,
+1,2037,602,18,1,
+2037,146,2,0,1,
+2038,603,18,1,2038,
+604,20,605,4,18,
+74,0,117,0,109,
+0,112,0,76,0,
+97,0,98,0,101,
+0,108,0,1,139,
+1,2,2,0,1,
+2039,606,18,1,2039,
+146,2,0,1,2040,
+607,18,1,2040,608,
+20,609,4,30,82,
+0,101,0,116,0,
+117,0,114,0,110,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,1,
+138,1,2,2,0,
+1,2041,610,18,1,
+2041,146,2,0,1,
+1485,611,18,1,1485,
+187,2,0,1,372,
+612,18,1,372,199,
+2,0,1,373,613,
+18,1,373,132,2,
+0,1,374,614,18,
+1,374,195,2,0,
+1,375,615,18,1,
+375,132,2,0,1,
+376,616,18,1,376,
+202,2,0,1,377,
+617,18,1,377,132,
+2,0,1,378,618,
+18,1,378,195,2,
+0,1,379,619,18,
+1,379,132,2,0,
+1,380,620,18,1,
+380,621,20,622,4,
+16,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,1,151,1,
+2,2,0,1,381,
+623,18,1,381,323,
+2,0,1,371,624,
+18,1,371,625,20,
+626,4,24,70,0,
+117,0,110,0,99,
+0,116,0,105,0,
+111,0,110,0,67,
+0,97,0,108,0,
+108,0,1,147,1,
+2,2,0,1,942,
+627,18,1,942,187,
+2,0,1,2533,628,
+18,1,2533,162,2,
+0,1,387,629,18,
+1,387,187,2,0,
+1,2536,630,18,1,
+2536,631,20,632,4,
+34,73,0,110,0,
+116,0,82,0,111,
+0,116,0,82,0,
+111,0,116,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-1,124,1,2,2,
-0,1,406,648,18,
-1,406,152,2,0,
-1,1521,649,18,1,
-1521,183,2,0,1,
-2636,650,18,1,2636,
-651,20,652,4,32,
+1,129,1,2,2,
+0,1,2537,633,18,
+1,2537,135,2,0,
+1,2543,634,18,1,
+2543,635,20,636,4,
+28,82,0,111,0,
+116,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,1,
+122,1,2,2,0,
+1,2546,637,18,1,
+2546,635,2,0,1,
+1514,638,18,1,1514,
+179,2,0,1,1515,
+639,18,1,1515,333,
+2,0,1,2074,640,
+18,1,2074,179,2,
+0,1,2075,641,18,
+1,2075,162,2,0,
+1,2552,642,18,1,
+2552,135,2,0,1,
+406,643,18,1,406,
+143,2,0,1,1521,
+644,18,1,1521,187,
+2,0,1,2556,645,
+18,1,2556,162,2,
+0,1,2639,646,18,
+1,2639,647,20,648,
+4,44,75,0,101,
+0,121,0,73,0,
+110,0,116,0,73,
+0,110,0,116,0,
+65,0,114,0,103,
+0,83,0,116,0,
+97,0,116,0,101,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,110,1,2,
+2,0,1,412,649,
+18,1,412,187,2,
+0,1,2641,650,18,
+1,2641,168,2,0,
+1,2484,651,18,1,
+2484,652,20,653,4,
+38,67,0,79,0,
+76,0,76,0,73,
+0,83,0,73,0,
+79,0,78,0,95,
+0,69,0,78,0,
+68,0,95,0,69,
+0,86,0,69,0,
+78,0,84,0,1,
+63,1,1,2,0,
+1,2643,654,18,1,
+2643,174,2,0,1,
+2644,655,18,1,2644,
+656,20,657,4,32,
 75,0,101,0,121,
 0,65,0,114,0,
 103,0,83,0,116,
@@ -3713,621 +3794,622 @@ public yyLSLSyntax
 101,0,69,0,118,
 0,101,0,110,0,
 116,0,1,105,1,
-2,2,0,1,2556,
-653,18,1,2556,654,
-20,655,4,28,75,
-0,101,0,121,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,1,117,1,
-2,2,0,1,2557,
-656,18,1,2557,657,
-20,658,4,52,75,
+2,2,0,1,2023,
+658,18,1,2023,659,
+20,660,4,26,68,
+0,69,0,70,0,
+65,0,85,0,76,
+0,84,0,95,0,
+83,0,84,0,65,
+0,84,0,69,0,
+1,47,1,1,2,
+0,1,2564,661,18,
+1,2564,162,2,0,
+1,2647,662,18,1,
+2647,507,2,0,1,
+2648,663,18,1,2648,
+647,2,0,1,2567,
+664,18,1,2567,665,
+20,666,4,22,75,
 0,101,0,121,0,
 65,0,114,0,103,
-0,117,0,109,0,
+0,69,0,118,0,
 101,0,110,0,116,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,76,0,
-105,0,115,0,116,
-0,1,111,1,2,
-2,0,1,2639,659,
-18,1,2639,660,20,
-661,4,26,68,0,
-69,0,70,0,65,
-0,85,0,76,0,
-84,0,95,0,83,
-0,84,0,65,0,
-84,0,69,0,1,
-47,1,1,2,0,
-1,412,662,18,1,
-412,183,2,0,1,
-2484,663,18,1,2484,
-664,20,665,4,30,
-67,0,79,0,76,
-0,76,0,73,0,
-83,0,73,0,79,
-0,78,0,95,0,
-69,0,86,0,69,
-0,78,0,84,0,
-1,62,1,1,2,
-0,1,2023,666,18,
-1,2023,660,2,0,
-1,2567,667,18,1,
-2567,135,2,0,1,
-1442,668,18,1,1442,
-175,2,0,1,2035,
-669,18,1,2035,138,
-2,0,1,2036,670,
-18,1,2036,671,20,
-672,4,26,74,0,
-117,0,109,0,112,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,1,
-137,1,2,2,0,
-1,431,673,18,1,
-431,152,2,0,1,
-2578,674,18,1,2578,
-162,2,0,1,2105,
-675,18,1,2105,281,
-2,0,1,2106,676,
-18,1,2106,520,2,
-0,1,1550,677,18,
-1,1550,175,2,0,
-1,437,678,18,1,
-437,183,2,0,1,
-2044,679,18,1,2044,
-680,20,681,4,28,
-69,0,109,0,112,
-0,116,0,121,0,
+0,1,126,1,2,
+2,0,1,1442,667,
+18,1,1442,179,2,
+0,1,2651,668,18,
+1,2651,669,20,670,
+4,38,86,0,101,
+0,99,0,116,0,
+111,0,114,0,65,
+0,114,0,103,0,
 83,0,116,0,97,
 0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,1,132,
-1,2,2,0,1,
-2045,682,18,1,2045,
-138,2,0,1,1555,
-683,18,1,1555,183,
-2,0,1,2511,684,
-18,1,2511,114,2,
-0,1,1001,685,18,
-1,1001,623,2,0,
-1,1002,686,18,1,
-1002,619,2,0,1,
-447,687,18,1,447,
-338,2,0,1,2520,
-688,18,1,2520,367,
-2,0,1,1010,689,
-18,1,1010,175,2,
-0,1,1011,690,18,
-1,1011,162,2,0,
-1,1012,691,18,1,
-1012,183,2,0,1,
-1013,692,18,1,1013,
-162,2,0,1,459,
-693,18,1,459,694,
-20,695,4,24,76,
-0,69,0,70,0,
-84,0,95,0,66,
-0,82,0,65,0,
-67,0,75,0,69,
-0,84,0,1,27,
-1,1,2,0,1,
-1574,696,18,1,1574,
-138,2,0,1,461,
-697,18,1,461,698,
-20,699,4,24,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-76,0,105,0,115,
-0,116,0,1,145,
-1,2,2,0,1,
-462,700,18,1,462,
-152,2,0,1,464,
-701,18,1,464,702,
-20,703,4,16,65,
-0,114,0,103,0,
-117,0,109,0,101,
+69,0,118,0,101,
 0,110,0,116,0,
-1,146,1,2,2,
-0,1,2136,704,18,
-1,2136,281,2,0,
-1,1585,705,18,1,
-1585,706,20,707,4,
-12,82,0,69,0,
-84,0,85,0,82,
-0,78,0,1,50,
-1,1,2,0,1,
-476,708,18,1,476,
-709,20,710,4,30,
-83,0,84,0,82,
+1,107,1,2,2,
+0,1,2570,671,18,
+1,2570,473,2,0,
+1,2653,672,18,1,
+2653,656,2,0,1,
+2572,673,18,1,2572,
+162,2,0,1,2655,
+674,18,1,2655,156,
+2,0,1,2574,675,
+18,1,2574,327,2,
+0,1,2035,676,18,
+1,2035,146,2,0,
+1,2036,677,18,1,
+2036,678,20,679,4,
+26,74,0,117,0,
+109,0,112,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,140,1,
+2,2,0,1,431,
+680,18,1,431,143,
+2,0,1,2579,681,
+18,1,2579,327,2,
+0,1,2105,682,18,
+1,2105,285,2,0,
+1,2106,683,18,1,
+2106,517,2,0,1,
+1550,684,18,1,1550,
+179,2,0,1,437,
+685,18,1,437,187,
+2,0,1,2044,686,
+18,1,2044,687,20,
+688,4,28,69,0,
+109,0,112,0,116,
+0,121,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,1,135,1,2,
+2,0,1,2045,689,
+18,1,2045,146,2,
+0,1,1555,690,18,
+1,1555,187,2,0,
+1,2511,691,18,1,
+2511,126,2,0,1,
+1001,692,18,1,1001,
+625,2,0,1,1002,
+693,18,1,1002,621,
+2,0,1,447,694,
+18,1,447,342,2,
+0,1,2594,695,18,
+1,2594,327,2,0,
+1,2596,696,18,1,
+2596,697,20,698,4,
+18,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,1,
+102,1,2,2,0,
+1,2520,699,18,1,
+2520,327,2,0,1,
+1010,700,18,1,1010,
+179,2,0,1,1011,
+701,18,1,1011,162,
+2,0,1,1012,702,
+18,1,1012,187,2,
+0,1,1013,703,18,
+1,1013,162,2,0,
+1,459,704,18,1,
+459,705,20,706,4,
+24,76,0,69,0,
+70,0,84,0,95,
+0,66,0,82,0,
+65,0,67,0,75,
+0,69,0,84,0,
+1,27,1,1,2,
+0,1,1574,707,18,
+1,1574,146,2,0,
+1,461,708,18,1,
+461,709,20,710,4,
+24,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,76,0,105,
+0,115,0,116,0,
+1,148,1,2,2,
+0,1,462,711,18,
+1,462,143,2,0,
+1,464,712,18,1,
+464,713,20,714,4,
+16,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,1,149,1,
+2,2,0,1,2136,
+715,18,1,2136,285,
+2,0,1,1585,716,
+18,1,1585,717,20,
+718,4,12,82,0,
+69,0,84,0,85,
+0,82,0,78,0,
+1,50,1,1,2,
+0,1,2700,719,18,
+1,2700,697,2,0,
+1,476,720,18,1,
+476,721,20,722,4,
+30,83,0,84,0,
+82,0,73,0,78,
+0,71,0,95,0,
+67,0,79,0,78,
+0,83,0,84,0,
+65,0,78,0,84,
+0,1,3,1,1,
+2,0,1,477,723,
+18,1,477,724,20,
+725,4,28,70,0,
+76,0,79,0,65,
+0,84,0,95,0,
+67,0,79,0,78,
+0,83,0,84,0,
+65,0,78,0,84,
+0,1,95,1,1,
+2,0,1,478,726,
+18,1,478,727,20,
+728,4,40,72,0,
+69,0,88,0,95,
 0,73,0,78,0,
-71,0,95,0,67,
-0,79,0,78,0,
-83,0,84,0,65,
-0,78,0,84,0,
-1,3,1,1,2,
-0,1,477,711,18,
-1,477,712,20,713,
-4,28,70,0,76,
-0,79,0,65,0,
-84,0,95,0,67,
-0,79,0,78,0,
-83,0,84,0,65,
-0,78,0,84,0,
-1,95,1,1,2,
-0,1,478,714,18,
-1,478,715,20,716,
-4,40,72,0,69,
-0,88,0,95,0,
+84,0,69,0,71,
+0,69,0,82,0,
+95,0,67,0,79,
+0,78,0,83,0,
+84,0,65,0,78,
+0,84,0,1,94,
+1,1,2,0,1,
+479,729,18,1,479,
+730,20,731,4,32,
 73,0,78,0,84,
 0,69,0,71,0,
 69,0,82,0,95,
 0,67,0,79,0,
 78,0,83,0,84,
 0,65,0,78,0,
-84,0,1,94,1,
-1,2,0,1,479,
-717,18,1,479,718,
-20,719,4,32,73,
-0,78,0,84,0,
-69,0,71,0,69,
-0,82,0,95,0,
-67,0,79,0,78,
-0,83,0,84,0,
-65,0,78,0,84,
-0,1,93,1,1,
-2,0,1,480,720,
-18,1,480,721,20,
-722,4,26,82,0,
-73,0,71,0,72,
-0,84,0,95,0,
-66,0,82,0,65,
-0,67,0,75,0,
-69,0,84,0,1,
-28,1,1,2,0,
-1,481,723,18,1,
-481,702,2,0,1,
-2628,724,18,1,2628,
-651,2,0,1,2629,
-725,18,1,2629,726,
-20,727,4,34,86,
-0,111,0,105,0,
-100,0,65,0,114,
-0,103,0,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,1,104,
-1,2,2,0,1,
-2630,728,18,1,2630,
-729,20,730,4,20,
-83,0,116,0,97,
-0,116,0,101,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,103,1,2,2,
-0,1,2631,731,18,
-1,2631,506,2,0,
-1,2554,732,18,1,
-2554,117,2,0,1,
-2633,733,18,1,2633,
-634,2,0,1,2634,
-734,18,1,2634,637,
-2,0,1,1048,735,
-18,1,1048,183,2,
-0,1,2637,736,18,
-1,2637,726,2,0,
-1,2638,737,18,1,
-2638,729,2,0,1,
-2640,738,18,1,2640,
-165,2,0,1,2563,
-739,18,1,2563,162,
-2,0,1,2042,740,
-18,1,2042,741,20,
-742,4,20,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,1,133,
-1,2,2,0,1,
-2043,743,18,1,2043,
-138,2,0,1,2731,
-744,18,1,2731,506,
-2,0,1,1620,745,
-18,1,1620,175,2,
-0,1,1621,746,18,
-1,1621,159,2,0,
-1,1622,747,18,1,
-1622,211,2,0,1,
-509,748,18,1,509,
-152,2,0,1,2498,
-749,18,1,2498,750,
-20,751,4,22,77,
-0,79,0,78,0,
-69,0,89,0,95,
-0,69,0,86,0,
-69,0,78,0,84,
-0,1,74,1,1,
-2,0,1,2739,752,
-18,1,2739,484,2,
-0,1,2576,753,18,
-1,2576,149,2,0,
-1,1628,754,18,1,
-1628,183,2,0,1,
-515,755,18,1,515,
-183,2,0,1,2580,
-756,18,1,2580,367,
-2,0,1,2505,757,
-18,1,2505,758,20,
-759,4,34,73,0,
+84,0,1,93,1,
+1,2,0,1,480,
+732,18,1,480,733,
+20,734,4,26,82,
+0,73,0,71,0,
+72,0,84,0,95,
+0,66,0,82,0,
+65,0,67,0,75,
+0,69,0,84,0,
+1,28,1,1,2,
+0,1,481,735,18,
+1,481,713,2,0,
+1,2550,736,18,1,
+2550,327,2,0,1,
+2554,737,18,1,2554,
+308,2,0,1,1048,
+738,18,1,1048,187,
+2,0,1,2640,739,
+18,1,2640,740,20,
+741,4,44,73,0,
 110,0,116,0,86,
 0,101,0,99,0,
 86,0,101,0,99,
 0,65,0,114,0,
-103,0,69,0,118,
+103,0,83,0,116,
+0,97,0,116,0,
+101,0,69,0,118,
 0,101,0,110,0,
-116,0,1,128,1,
-2,2,0,1,2582,
-760,18,1,2582,308,
-2,0,1,525,761,
-18,1,525,338,2,
-0,1,2197,762,18,
-1,2197,175,2,0,
-1,2198,763,18,1,
-2198,162,2,0,1,
-1591,764,18,1,1591,
-183,2,0,1,2758,
-765,18,1,2758,367,
-2,0,1,2760,766,
-18,1,2760,159,2,
-0,1,2521,767,18,
-1,2521,768,20,769,
-4,34,73,0,110,
-0,116,0,82,0,
-111,0,116,0,82,
-0,111,0,116,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,1,127,1,2,
-2,0,1,1094,770,
-18,1,1094,698,2,
-0,1,1096,771,18,
-1,1096,162,2,0,
-1,1657,772,18,1,
-1657,138,2,0,1,
-1658,773,18,1,1658,
-774,20,775,4,6,
-70,0,79,0,82,
-0,1,46,1,1,
-2,0,1,1659,776,
-18,1,1659,135,2,
-0,1,1665,777,18,
-1,1665,183,2,0,
-1,1113,778,18,1,
-1113,191,2,0,779,
-5,0,780,5,372,
-1,2,781,19,275,
-1,2,782,5,6,
-1,2739,783,17,784,
-15,785,4,30,37,
-0,76,0,83,0,
-76,0,80,0,114,
-0,111,0,103,0,
-114,0,97,0,109,
-0,82,0,111,0,
-111,0,116,0,1,
--1,1,5,786,20,
-787,4,32,76,0,
-83,0,76,0,80,
-0,114,0,111,0,
-103,0,114,0,97,
-0,109,0,82,0,
-111,0,111,0,116,
-0,95,0,50,0,
-1,164,1,3,1,
-2,1,1,788,22,
-1,2,1,2809,789,
-17,790,15,785,1,
--1,1,5,791,20,
-792,4,32,76,0,
-83,0,76,0,80,
-0,114,0,111,0,
-103,0,114,0,97,
-0,109,0,82,0,
-111,0,111,0,116,
-0,95,0,49,0,
-1,163,1,3,1,
-3,1,2,793,22,
-1,1,1,2742,794,
-17,795,15,796,4,
-14,37,0,83,0,
-116,0,97,0,116,
-0,101,0,115,0,
-1,-1,1,5,797,
-20,798,4,16,83,
+116,0,1,109,1,
+2,2,0,1,2642,
+742,18,1,2642,669,
+2,0,1,2563,743,
+18,1,2563,744,20,
+745,4,52,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
+1,113,1,2,2,
+0,1,2042,746,18,
+1,2042,747,20,748,
+4,20,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,1,136,1,
+2,2,0,1,2043,
+749,18,1,2043,146,
+2,0,1,2568,750,
+18,1,2568,135,2,
+0,1,2649,751,18,
+1,2649,740,2,0,
+1,1620,752,18,1,
+1620,179,2,0,1,
+1621,753,18,1,1621,
+159,2,0,1,1622,
+754,18,1,1622,333,
+2,0,1,509,755,
+18,1,509,143,2,
+0,1,2498,756,18,
+1,2498,757,20,758,
+4,34,82,0,69,
+0,77,0,79,0,
+84,0,69,0,95,
+0,68,0,65,0,
+84,0,65,0,95,
+0,69,0,86,0,
+69,0,78,0,84,
+0,1,82,1,1,
+2,0,1,2576,759,
+18,1,2576,135,2,
+0,1,2656,760,18,
+1,2656,659,2,0,
+1,1628,761,18,1,
+1628,187,2,0,1,
+515,762,18,1,515,
+187,2,0,1,2580,
+763,18,1,2580,764,
+20,765,4,10,69,
+0,118,0,101,0,
+110,0,116,0,1,
+124,1,2,2,0,
+1,2505,766,18,1,
+2505,767,20,768,4,
+34,75,0,101,0,
+121,0,73,0,110,
+0,116,0,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,131,1,2,2,
+0,1,2751,769,18,
+1,2751,507,2,0,
+1,525,770,18,1,
+525,342,2,0,1,
+2197,771,18,1,2197,
+179,2,0,1,2198,
+772,18,1,2198,162,
+2,0,1,1591,773,
+18,1,1591,187,2,
+0,1,2592,774,18,
+1,2592,162,2,0,
+1,2760,775,18,1,
+2760,291,2,0,1,
+2521,776,18,1,2521,
+777,20,778,4,34,
+73,0,110,0,116,
+0,86,0,101,0,
+99,0,86,0,101,
+0,99,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+130,1,2,2,0,
+1,2763,779,18,1,
+2763,780,20,781,4,
+10,83,0,116,0,
+97,0,116,0,101,
+0,1,101,1,2,
+2,0,1,2764,782,
+18,1,2764,780,2,
+0,1,1094,783,18,
+1,1094,709,2,0,
+1,2766,784,18,1,
+2766,135,2,0,1,
+1096,785,18,1,1096,
+162,2,0,1,1657,
+786,18,1,1657,146,
+2,0,1,1658,787,
+18,1,1658,788,20,
+789,4,6,70,0,
+79,0,82,0,1,
+46,1,1,2,0,
+1,1659,790,18,1,
+1659,135,2,0,1,
+2775,791,18,1,2775,
+140,2,0,1,2777,
+792,18,1,2777,162,
+2,0,1,1665,793,
+18,1,1665,187,2,
+0,1,2781,794,18,
+1,2781,159,2,0,
+1,2782,795,18,1,
+2782,333,2,0,1,
+1113,796,18,1,1113,
+195,2,0,797,5,
+0,798,5,379,1,
+2,799,19,216,1,
+2,800,5,6,1,
+2764,801,17,802,15,
+803,4,14,37,0,
+83,0,116,0,97,
+0,116,0,101,0,
+115,0,1,-1,1,
+5,804,20,805,4,
+16,83,0,116,0,
+97,0,116,0,101,
+0,115,0,95,0,
+49,0,1,176,1,
+3,1,2,1,1,
+806,22,1,11,1,
+2751,807,17,808,15,
+809,4,12,37,0,
+83,0,116,0,97,
+0,116,0,101,0,
+1,-1,1,5,810,
+20,811,4,14,83,
 0,116,0,97,0,
-116,0,101,0,115,
-0,95,0,50,0,
-1,174,1,3,1,
-3,1,2,799,22,
-1,12,1,2743,800,
-17,801,15,796,1,
--1,1,5,802,20,
-803,4,16,83,0,
-116,0,97,0,116,
-0,101,0,115,0,
+116,0,101,0,95,
+0,49,0,1,178,
+1,3,1,5,1,
+4,812,22,1,13,
+1,2763,813,17,814,
+15,803,1,-1,1,
+5,815,20,816,4,
+16,83,0,116,0,
+97,0,116,0,101,
+0,115,0,95,0,
+50,0,1,177,1,
+3,1,3,1,2,
+817,22,1,12,1,
+2830,818,17,819,15,
+820,4,30,37,0,
+76,0,83,0,76,
+0,80,0,114,0,
+111,0,103,0,114,
+0,97,0,109,0,
+82,0,111,0,111,
+0,116,0,1,-1,
+1,5,821,20,822,
+4,32,76,0,83,
+0,76,0,80,0,
+114,0,111,0,103,
+0,114,0,97,0,
+109,0,82,0,111,
+0,111,0,116,0,
 95,0,49,0,1,
-173,1,3,1,2,
-1,1,804,22,1,
-11,1,2631,805,17,
-806,15,807,4,12,
-37,0,83,0,116,
+166,1,3,1,3,
+1,2,823,22,1,
+1,1,2647,824,17,
+825,15,809,1,-1,
+1,5,826,20,827,
+4,14,83,0,116,
 0,97,0,116,0,
-101,0,1,-1,1,
-5,808,20,809,4,
-14,83,0,116,0,
-97,0,116,0,101,
-0,95,0,50,0,
-1,176,1,3,1,
-6,1,5,810,22,
-1,14,1,2731,811,
-17,812,15,807,1,
--1,1,5,813,20,
-814,4,14,83,0,
+101,0,95,0,50,
+0,1,179,1,3,
+1,6,1,5,828,
+22,1,14,1,2760,
+829,17,830,15,820,
+1,-1,1,5,831,
+20,832,4,32,76,
+0,83,0,76,0,
+80,0,114,0,111,
+0,103,0,114,0,
+97,0,109,0,82,
+0,111,0,111,0,
+116,0,95,0,50,
+0,1,167,1,3,
+1,2,1,1,833,
+22,1,2,1,3,
+834,19,722,1,3,
+835,5,95,1,256,
+836,16,0,720,1,
+1261,837,16,0,720,
+1,509,838,16,0,
+720,1,1515,839,16,
+0,720,1,2021,840,
+17,841,15,842,4,
+24,37,0,73,0,
+102,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
+0,110,0,116,0,
+1,-1,1,5,843,
+20,844,4,26,73,
+0,102,0,83,0,
 116,0,97,0,116,
-0,101,0,95,0,
-49,0,1,175,1,
-3,1,5,1,4,
-815,22,1,13,1,
-3,816,19,710,1,
-3,817,5,95,1,
-2761,818,16,0,708,
-1,256,819,16,0,
-708,1,1261,820,16,
-0,708,1,509,821,
-16,0,708,1,1515,
-822,16,0,708,1,
-2021,823,17,824,15,
-825,4,24,37,0,
-73,0,102,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,826,20,827,4,
-26,73,0,102,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-50,0,1,233,1,
-3,1,8,1,7,
-828,22,1,72,1,
-1775,829,16,0,708,
-1,2029,830,17,831,
-15,832,4,20,37,
-0,83,0,116,0,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,50,0,
+1,240,1,3,1,
+8,1,7,845,22,
+1,76,1,1775,846,
+16,0,720,1,2029,
+847,17,848,15,849,
+4,20,37,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,850,20,851,4,
+24,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
-110,0,116,0,1,
--1,1,5,833,20,
-834,4,24,83,0,
+110,0,116,0,95,
+0,49,0,51,0,
+1,234,1,3,1,
+2,1,1,852,22,
+1,70,1,2030,853,
+17,854,15,849,1,
+-1,1,5,855,20,
+856,4,24,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
 0,95,0,49,0,
-51,0,1,227,1,
+50,0,1,233,1,
 3,1,2,1,1,
-835,22,1,66,1,
-2030,836,17,837,15,
-832,1,-1,1,5,
-838,20,839,4,24,
+857,22,1,69,1,
+2031,858,17,859,15,
+849,1,-1,1,5,
+860,20,861,4,24,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,50,0,1,
-226,1,3,1,2,
-1,1,840,22,1,
-65,1,2031,841,17,
-842,15,832,1,-1,
-1,5,843,20,844,
+49,0,49,0,1,
+232,1,3,1,2,
+1,1,862,22,1,
+68,1,2032,863,17,
+864,15,849,1,-1,
+1,5,865,20,866,
 4,24,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-95,0,49,0,49,
-0,1,225,1,3,
-1,2,1,1,845,
-22,1,64,1,2032,
-846,17,847,15,832,
-1,-1,1,5,848,
-20,849,4,24,83,
+95,0,49,0,48,
+0,1,231,1,3,
+1,2,1,1,867,
+22,1,67,1,2033,
+868,17,869,15,849,
+1,-1,1,5,870,
+20,871,4,22,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,95,0,49,
-0,48,0,1,224,
-1,3,1,2,1,
-1,850,22,1,63,
-1,2033,851,17,852,
-15,832,1,-1,1,
-5,853,20,854,4,
+116,0,95,0,57,
+0,1,230,1,3,
+1,2,1,1,872,
+22,1,66,1,277,
+873,16,0,720,1,
+2035,874,17,875,15,
+849,1,-1,1,5,
+876,20,877,4,22,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+56,0,1,229,1,
+3,1,3,1,2,
+878,22,1,65,1,
+2037,879,17,880,15,
+849,1,-1,1,5,
+881,20,882,4,22,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+55,0,1,228,1,
+3,1,3,1,2,
+883,22,1,64,1,
+2039,884,17,885,15,
+849,1,-1,1,5,
+886,20,887,4,22,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+54,0,1,227,1,
+3,1,3,1,2,
+888,22,1,63,1,
+32,889,16,0,720,
+1,2041,890,17,891,
+15,849,1,-1,1,
+5,892,20,893,4,
 22,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,57,0,1,223,
-1,3,1,2,1,
-1,855,22,1,62,
-1,277,856,16,0,
-708,1,2035,857,17,
-858,15,832,1,-1,
-1,5,859,20,860,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-95,0,56,0,1,
-222,1,3,1,3,
-1,2,861,22,1,
-61,1,2037,862,17,
-863,15,832,1,-1,
-1,5,864,20,865,
+0,53,0,1,226,
+1,3,1,3,1,
+2,894,22,1,62,
+1,2293,895,16,0,
+720,1,2043,896,17,
+897,15,849,1,-1,
+1,5,898,20,899,
 4,22,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-95,0,55,0,1,
-221,1,3,1,3,
-1,2,866,22,1,
-60,1,2039,867,17,
-868,15,832,1,-1,
-1,5,869,20,870,
+95,0,51,0,1,
+224,1,3,1,3,
+1,2,900,22,1,
+60,1,2045,901,17,
+902,15,849,1,-1,
+1,5,903,20,904,
 4,22,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
-95,0,54,0,1,
-220,1,3,1,3,
-1,2,871,22,1,
-59,1,32,872,16,
-0,708,1,2041,873,
-17,874,15,832,1,
--1,1,5,875,20,
-876,4,22,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,53,0,
-1,219,1,3,1,
-3,1,2,877,22,
-1,58,1,2293,878,
-16,0,708,1,2043,
-879,17,880,15,832,
-1,-1,1,5,881,
-20,882,4,22,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,51,
-0,1,217,1,3,
-1,3,1,2,883,
-22,1,56,1,2045,
-884,17,885,15,832,
-1,-1,1,5,886,
-20,887,4,22,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,1,215,1,3,
-1,3,1,2,888,
-22,1,54,1,41,
-889,16,0,708,1,
-1297,890,16,0,708,
-1,43,891,16,0,
-708,1,1803,892,17,
-893,15,894,4,16,
-37,0,70,0,111,
-0,114,0,76,0,
-111,0,111,0,112,
-0,1,-1,1,5,
-895,20,896,4,18,
+95,0,49,0,1,
+222,1,3,1,3,
+1,2,905,22,1,
+58,1,41,906,16,
+0,720,1,1297,907,
+16,0,720,1,43,
+908,16,0,720,1,
+1803,909,17,910,15,
+911,4,16,37,0,
 70,0,111,0,114,
 0,76,0,111,0,
-111,0,112,0,95,
-0,49,0,1,240,
-1,3,1,10,1,
-9,897,22,1,79,
-1,1804,898,16,0,
-708,1,299,899,16,
-0,708,1,52,900,
-16,0,708,1,2318,
-901,16,0,708,1,
-62,902,16,0,708,
-1,2075,903,16,0,
-708,1,1574,904,17,
-905,15,832,1,-1,
-1,5,906,20,907,
-4,22,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-95,0,52,0,1,
-218,1,3,1,3,
-1,2,908,22,1,
-57,1,71,909,16,
-0,708,1,76,910,
-16,0,708,1,1834,
-911,16,0,708,1,
-2337,912,16,0,708,
-1,79,913,16,0,
-708,1,1335,914,16,
-0,708,1,322,915,
-16,0,708,1,85,
-916,16,0,708,1,
-89,917,16,0,708,
-1,346,918,16,0,
-708,1,2105,919,17,
-920,15,825,1,-1,
-1,5,921,20,922,
-4,26,73,0,102,
-0,83,0,116,0,
-97,0,116,0,101,
-0,109,0,101,0,
-110,0,116,0,95,
-0,51,0,1,234,
-1,3,1,6,1,
-5,923,22,1,73,
-1,2106,924,16,0,
-708,1,97,925,16,
-0,708,1,1860,926,
-17,927,15,928,4,
-34,37,0,68,0,
-111,0,87,0,104,
-0,105,0,108,0,
-101,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-1,-1,1,5,929,
-20,930,4,36,68,
-0,111,0,87,0,
-104,0,105,0,108,
-0,101,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,49,0,
-1,238,1,3,1,
-8,1,7,931,22,
-1,77,1,2364,932,
-17,933,15,894,1,
--1,1,5,934,20,
-935,4,18,70,0,
+111,0,112,0,1,
+-1,1,5,912,20,
+913,4,18,70,0,
 111,0,114,0,76,
 0,111,0,111,0,
-112,0,95,0,50,
+112,0,95,0,49,
+0,1,247,1,3,
+1,10,1,9,914,
+22,1,83,1,1804,
+915,16,0,720,1,
+299,916,16,0,720,
+1,52,917,16,0,
+720,1,2318,918,16,
+0,720,1,62,919,
+16,0,720,1,2075,
+920,16,0,720,1,
+1574,921,17,922,15,
+849,1,-1,1,5,
+923,20,924,4,22,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+52,0,1,225,1,
+3,1,3,1,2,
+925,22,1,61,1,
+71,926,16,0,720,
+1,76,927,16,0,
+720,1,1834,928,16,
+0,720,1,2337,929,
+16,0,720,1,79,
+930,16,0,720,1,
+1335,931,16,0,720,
+1,322,932,16,0,
+720,1,85,933,16,
+0,720,1,89,934,
+16,0,720,1,346,
+935,16,0,720,1,
+2105,936,17,937,15,
+842,1,-1,1,5,
+938,20,939,4,26,
+73,0,102,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,51,
 0,1,241,1,3,
-1,9,1,8,936,
-22,1,80,1,102,
-937,16,0,708,1,
-112,938,16,0,708,
-1,1117,939,16,0,
-708,1,1873,940,17,
-941,15,928,1,-1,
-1,5,942,20,943,
+1,6,1,5,940,
+22,1,77,1,2106,
+941,16,0,720,1,
+97,942,16,0,720,
+1,1860,943,17,944,
+15,945,4,34,37,
+0,68,0,111,0,
+87,0,104,0,105,
+0,108,0,101,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,1,-1,
+1,5,946,20,947,
 4,36,68,0,111,
 0,87,0,104,0,
 105,0,108,0,101,
@@ -4335,621 +4417,486 @@ public yyLSLSyntax
 97,0,116,0,101,
 0,109,0,101,0,
 110,0,116,0,95,
-0,50,0,1,239,
+0,49,0,1,245,
 1,3,1,8,1,
-7,944,22,1,78,
-1,1876,945,16,0,
-708,1,124,946,16,
-0,708,1,2136,947,
-17,948,15,825,1,
--1,1,5,949,20,
-950,4,26,73,0,
-102,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-95,0,52,0,1,
-235,1,3,1,8,
-1,7,951,22,1,
-74,1,381,952,16,
-0,708,1,525,953,
-16,0,708,1,137,
-954,16,0,708,1,
-1901,955,16,0,708,
-1,1153,956,16,0,
-708,1,151,957,16,
-0,708,1,1407,958,
-16,0,708,1,1659,
-959,16,0,708,1,
-2413,960,16,0,708,
-1,406,961,16,0,
-708,1,1371,962,16,
-0,708,1,166,963,
-16,0,708,1,1622,
-964,16,0,708,1,
-1931,965,17,966,15,
-967,4,30,37,0,
+7,948,22,1,81,
+1,2364,949,17,950,
+15,911,1,-1,1,
+5,951,20,952,4,
+18,70,0,111,0,
+114,0,76,0,111,
+0,111,0,112,0,
+95,0,50,0,1,
+248,1,3,1,9,
+1,8,953,22,1,
+84,1,102,954,16,
+0,720,1,2782,955,
+16,0,720,1,112,
+956,16,0,720,1,
+1117,957,16,0,720,
+1,1873,958,17,959,
+15,945,1,-1,1,
+5,960,20,961,4,
+36,68,0,111,0,
 87,0,104,0,105,
 0,108,0,101,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
-0,116,0,1,-1,
-1,5,968,20,969,
-4,32,87,0,104,
-0,105,0,108,0,
-101,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,1,
-236,1,3,1,6,
-1,5,970,22,1,
-75,1,1933,971,16,
-0,708,1,431,972,
-16,0,708,1,1585,
-973,16,0,708,1,
-182,974,16,0,708,
-1,1189,975,16,0,
-708,1,1443,976,16,
-0,708,1,1695,977,
-16,0,708,1,2198,
-978,16,0,708,1,
-447,979,16,0,708,
-1,2458,980,17,981,
-15,982,4,28,37,
+0,116,0,95,0,
+50,0,1,246,1,
+3,1,8,1,7,
+962,22,1,82,1,
+1876,963,16,0,720,
+1,124,964,16,0,
+720,1,2136,965,17,
+966,15,842,1,-1,
+1,5,967,20,968,
+4,26,73,0,102,
 0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
-110,0,116,0,76,
-0,105,0,115,0,
+110,0,116,0,95,
+0,52,0,1,242,
+1,3,1,8,1,
+7,969,22,1,78,
+1,381,970,16,0,
+720,1,525,971,16,
+0,720,1,137,972,
+16,0,720,1,1901,
+973,16,0,720,1,
+1153,974,16,0,720,
+1,151,975,16,0,
+720,1,1407,976,16,
+0,720,1,1659,977,
+16,0,720,1,2413,
+978,16,0,720,1,
+406,979,16,0,720,
+1,1371,980,16,0,
+720,1,166,981,16,
+0,720,1,1622,982,
+16,0,720,1,1931,
+983,17,984,15,985,
+4,30,37,0,87,
+0,104,0,105,0,
+108,0,101,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
 116,0,1,-1,1,
-5,983,20,984,4,
-30,83,0,116,0,
+5,986,20,987,4,
+32,87,0,104,0,
+105,0,108,0,101,
+0,83,0,116,0,
 97,0,116,0,101,
 0,109,0,101,0,
-110,0,116,0,76,
-0,105,0,115,0,
-116,0,95,0,50,
-0,1,213,1,3,
-1,3,1,2,985,
-22,1,52,1,2459,
-986,17,987,15,988,
-4,36,37,0,67,
-0,111,0,109,0,
-112,0,111,0,117,
-0,110,0,100,0,
+110,0,116,0,95,
+0,49,0,1,243,
+1,3,1,6,1,
+5,988,22,1,79,
+1,1933,989,16,0,
+720,1,431,990,16,
+0,720,1,1585,991,
+16,0,720,1,182,
+992,16,0,720,1,
+1189,993,16,0,720,
+1,1443,994,16,0,
+720,1,1695,995,16,
+0,720,1,2198,996,
+16,0,720,1,447,
+997,16,0,720,1,
+2458,998,17,999,15,
+1000,4,28,37,0,
 83,0,116,0,97,
 0,116,0,101,0,
 109,0,101,0,110,
-0,116,0,1,-1,
-1,5,989,20,990,
-4,38,67,0,111,
-0,109,0,112,0,
-111,0,117,0,110,
-0,100,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
+0,116,0,76,0,
+105,0,115,0,116,
+0,1,-1,1,5,
+1001,20,1002,4,30,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,76,0,
+105,0,115,0,116,
 0,95,0,50,0,
-1,211,1,3,1,
-4,1,3,991,22,
-1,50,1,1958,992,
-16,0,708,1,2462,
-993,17,994,15,982,
-1,-1,1,5,995,
-20,996,4,30,83,
+1,220,1,3,1,
+3,1,2,1003,22,
+1,56,1,2459,1004,
+17,1005,15,1006,4,
+36,37,0,67,0,
+111,0,109,0,112,
+0,111,0,117,0,
+110,0,100,0,83,
 0,116,0,97,0,
 116,0,101,0,109,
 0,101,0,110,0,
-116,0,76,0,105,
-0,115,0,116,0,
-95,0,49,0,1,
-212,1,3,1,2,
-1,1,997,22,1,
-51,1,1657,998,17,
-999,15,832,1,-1,
-1,5,1000,20,1001,
-4,22,83,0,116,
+116,0,1,-1,1,
+5,1007,20,1008,4,
+38,67,0,111,0,
+109,0,112,0,111,
+0,117,0,110,0,
+100,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
 95,0,50,0,1,
-216,1,3,1,3,
-1,2,1002,22,1,
-55,1,2464,1003,17,
-1004,15,988,1,-1,
-1,5,1005,20,1006,
-4,38,67,0,111,
-0,109,0,112,0,
-111,0,117,0,110,
-0,100,0,83,0,
+218,1,3,1,4,
+1,3,1009,22,1,
+54,1,1958,1010,16,
+0,720,1,2462,1011,
+17,1012,15,1000,1,
+-1,1,5,1013,20,
+1014,4,30,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
-0,95,0,49,0,
-1,210,1,3,1,
-3,1,2,1007,22,
-1,49,1,199,1008,
-16,0,708,1,459,
-1009,16,0,708,1,
-462,1010,16,0,708,
-1,217,1011,16,0,
-708,1,2227,1012,17,
-1013,15,967,1,-1,
-1,5,1014,20,1015,
-4,32,87,0,104,
-0,105,0,108,0,
-101,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-95,0,50,0,1,
-237,1,3,1,6,
-1,5,1016,22,1,
-76,1,1225,1017,16,
-0,708,1,1479,1018,
-16,0,708,1,1731,
-1019,16,0,708,1,
-1989,1020,17,1021,15,
-825,1,-1,1,5,
-1022,20,1023,4,26,
-73,0,102,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,1,232,1,3,
-1,6,1,5,1024,
-22,1,71,1,1990,
-1025,16,0,708,1,
-236,1026,16,0,708,
-1,1756,1027,16,0,
-708,1,4,1028,19,
-199,1,4,1029,5,
-100,1,2761,1030,16,
-0,614,1,256,1031,
-16,0,614,1,1261,
-1032,16,0,614,1,
-509,1033,16,0,614,
-1,1515,1034,16,0,
-614,1,2021,823,1,
-1775,1035,16,0,614,
-1,2029,830,1,2030,
-836,1,2031,841,1,
-2032,846,1,2033,851,
-1,277,1036,16,0,
-614,1,2035,857,1,
-2037,862,1,2039,867,
-1,32,1037,16,0,
-614,1,2041,873,1,
-2293,1038,16,0,614,
-1,2043,879,1,2045,
-884,1,40,1039,16,
-0,201,1,41,1040,
-16,0,614,1,1297,
-1041,16,0,614,1,
-43,1042,16,0,614,
-1,44,1043,16,0,
-201,1,1803,892,1,
-1804,1044,16,0,614,
-1,299,1045,16,0,
-614,1,47,1046,16,
-0,197,1,52,1047,
-16,0,614,1,2318,
-1048,16,0,614,1,
-63,1049,16,0,218,
-1,66,1050,16,0,
-216,1,2075,1051,16,
-0,614,1,1574,904,
-1,71,1052,16,0,
-614,1,76,1053,16,
-0,614,1,1834,1054,
-16,0,614,1,2337,
-1055,16,0,614,1,
-79,1056,16,0,614,
-1,1335,1057,16,0,
-614,1,322,1058,16,
-0,614,1,85,1059,
-16,0,614,1,89,
-1060,16,0,614,1,
-346,1061,16,0,614,
-1,97,1062,16,0,
-614,1,2106,1063,16,
-0,614,1,102,1064,
-16,0,614,1,1860,
-926,1,2364,932,1,
-1114,1065,16,0,197,
-1,112,1066,16,0,
-614,1,1117,1067,16,
-0,614,1,1873,940,
-1,1876,1068,16,0,
-614,1,124,1069,16,
-0,614,1,2136,947,
-1,381,1070,16,0,
-614,1,525,1071,16,
-0,614,1,137,1072,
-16,0,614,1,1901,
-1073,16,0,614,1,
-1153,1074,16,0,614,
-1,151,1075,16,0,
-614,1,1407,1076,16,
-0,614,1,1659,1077,
-16,0,614,1,2413,
-1078,16,0,614,1,
-406,1079,16,0,614,
-1,1371,1080,16,0,
-614,1,2105,919,1,
-166,1081,16,0,614,
-1,1622,1082,16,0,
-614,1,1931,965,1,
-1933,1083,16,0,614,
-1,431,1084,16,0,
-614,1,1585,1085,16,
-0,614,1,182,1086,
-16,0,614,1,1189,
-1087,16,0,614,1,
-1443,1088,16,0,614,
-1,1695,1089,16,0,
-614,1,2198,1090,16,
-0,614,1,447,1091,
-16,0,614,1,2458,
-980,1,2459,986,1,
-1958,1092,16,0,614,
-1,2462,993,1,1657,
-998,1,2464,1003,1,
-199,1093,16,0,614,
-1,459,1094,16,0,
-614,1,462,1095,16,
-0,614,1,217,1096,
-16,0,614,1,2227,
-1012,1,1225,1097,16,
-0,614,1,1479,1098,
-16,0,614,1,1731,
-1099,16,0,614,1,
-1989,1020,1,1990,1100,
-16,0,614,1,236,
-1101,16,0,614,1,
-1756,1102,16,0,614,
-1,5,1103,19,196,
-1,5,1104,5,100,
-1,2761,1105,16,0,
-610,1,256,1106,16,
-0,610,1,1261,1107,
-16,0,610,1,509,
-1108,16,0,610,1,
-1515,1109,16,0,610,
-1,2021,823,1,1775,
-1110,16,0,610,1,
-2029,830,1,2030,836,
-1,2031,841,1,2032,
-846,1,2033,851,1,
-277,1111,16,0,610,
-1,2035,857,1,2037,
-862,1,2039,867,1,
-32,1112,16,0,610,
-1,2041,873,1,2293,
-1113,16,0,610,1,
-2043,879,1,2045,884,
-1,40,1114,16,0,
-200,1,41,1115,16,
-0,610,1,1297,1116,
-16,0,610,1,43,
-1117,16,0,610,1,
-44,1118,16,0,200,
-1,1803,892,1,1804,
-1119,16,0,610,1,
-299,1120,16,0,610,
-1,47,1121,16,0,
-194,1,52,1122,16,
-0,610,1,2318,1123,
-16,0,610,1,63,
-1124,16,0,217,1,
-66,1125,16,0,215,
-1,2075,1126,16,0,
-610,1,1574,904,1,
-71,1127,16,0,610,
-1,76,1128,16,0,
-610,1,1834,1129,16,
-0,610,1,2337,1130,
-16,0,610,1,79,
-1131,16,0,610,1,
-1335,1132,16,0,610,
-1,322,1133,16,0,
-610,1,85,1134,16,
-0,610,1,89,1135,
-16,0,610,1,346,
-1136,16,0,610,1,
-97,1137,16,0,610,
-1,2106,1138,16,0,
-610,1,102,1139,16,
-0,610,1,1860,926,
-1,2364,932,1,1114,
-1140,16,0,194,1,
-112,1141,16,0,610,
-1,1117,1142,16,0,
-610,1,1873,940,1,
-1876,1143,16,0,610,
-1,124,1144,16,0,
-610,1,2136,947,1,
-381,1145,16,0,610,
-1,525,1146,16,0,
-610,1,137,1147,16,
-0,610,1,1901,1148,
-16,0,610,1,1153,
-1149,16,0,610,1,
-151,1150,16,0,610,
-1,1407,1151,16,0,
-610,1,1659,1152,16,
-0,610,1,2413,1153,
-16,0,610,1,406,
-1154,16,0,610,1,
-1371,1155,16,0,610,
-1,2105,919,1,166,
-1156,16,0,610,1,
-1622,1157,16,0,610,
-1,1931,965,1,1933,
-1158,16,0,610,1,
-431,1159,16,0,610,
-1,1585,1160,16,0,
-610,1,182,1161,16,
-0,610,1,1189,1162,
-16,0,610,1,1443,
-1163,16,0,610,1,
-1695,1164,16,0,610,
-1,2198,1165,16,0,
-610,1,447,1166,16,
-0,610,1,2458,980,
-1,2459,986,1,1958,
-1167,16,0,610,1,
-2462,993,1,1657,998,
-1,2464,1003,1,199,
-1168,16,0,610,1,
-459,1169,16,0,610,
-1,462,1170,16,0,
-610,1,217,1171,16,
-0,610,1,2227,1012,
-1,1225,1172,16,0,
-610,1,1479,1173,16,
-0,610,1,1731,1174,
-16,0,610,1,1989,
-1020,1,1990,1175,16,
-0,610,1,236,1176,
-16,0,610,1,1756,
-1177,16,0,610,1,
-6,1178,19,300,1,
-6,1179,5,2,1,
-1114,1180,16,0,298,
-1,40,1181,16,0,
-599,1,7,1182,19,
-261,1,7,1183,5,
-2,1,1114,1184,16,
-0,259,1,40,1185,
-16,0,533,1,8,
-1186,19,224,1,8,
-1187,5,2,1,1114,
-1188,16,0,222,1,
-40,1189,16,0,487,
-1,9,1190,19,230,
-1,9,1191,5,2,
-1,1114,1192,16,0,
-228,1,40,1193,16,
-0,417,1,10,1194,
-19,179,1,10,1195,
-5,2,1,1114,1196,
-16,0,177,1,40,
-1197,16,0,356,1,
-11,1198,19,139,1,
-11,1199,5,146,1,
-1260,1200,17,1201,15,
-1202,4,34,37,0,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,1203,20,1204,4,
-38,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-50,0,49,0,1,
-268,1,3,1,6,
-1,5,1205,22,1,
-107,1,2767,1206,16,
-0,324,1,1011,1207,
-17,1208,15,1209,4,
-44,37,0,80,0,
-97,0,114,0,101,
-0,110,0,116,0,
-104,0,101,0,115,
-0,105,0,115,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-1,-1,1,5,1210,
-20,1211,4,46,80,
-0,97,0,114,0,
-101,0,110,0,116,
-0,104,0,101,0,
-115,0,105,0,115,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,50,0,
-1,315,1,3,1,
-4,1,3,1212,22,
-1,154,1,1514,1213,
-17,1214,15,1202,1,
--1,1,5,1215,20,
-1216,4,38,83,0,
-105,0,109,0,112,
-0,108,0,101,0,
-65,0,115,0,115,
-0,105,0,103,0,
-110,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,52,
-0,1,261,1,3,
-1,4,1,3,1217,
-22,1,100,1,9,
-1218,17,1219,15,1220,
-4,24,37,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,1,-1,1,5,
-1221,20,1222,4,26,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,95,0,49,
-0,1,205,1,3,
-1,3,1,2,1223,
-22,1,44,1,262,
-1224,17,1225,15,1226,
-4,34,37,0,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,-1,1,5,
-1227,20,1228,4,36,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,53,
-0,1,297,1,3,
-1,4,1,3,1229,
-22,1,136,1,1267,
-1230,17,1231,15,1202,
-1,-1,1,5,1232,
-20,1233,4,36,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,56,0,
-1,255,1,3,1,
-6,1,5,1234,22,
-1,94,1,2021,823,
-1,1521,1235,17,1236,
-15,1202,1,-1,1,
-5,1237,20,1238,4,
-36,83,0,105,0,
-109,0,112,0,108,
-0,101,0,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,1,248,1,
-3,1,4,1,3,
-1239,22,1,87,1,
-2024,1240,17,1241,15,
-1242,4,24,37,0,
-83,0,116,0,97,
-0,116,0,101,0,
-67,0,104,0,97,
-0,110,0,103,0,
-101,0,1,-1,1,
-5,1243,20,1244,4,
-26,83,0,116,0,
+0,76,0,105,0,
+115,0,116,0,95,
+0,49,0,1,219,
+1,3,1,2,1,
+1,1015,22,1,55,
+1,1657,1016,17,1017,
+15,849,1,-1,1,
+5,1018,20,1019,4,
+22,83,0,116,0,
 97,0,116,0,101,
-0,67,0,104,0,
-97,0,110,0,103,
-0,101,0,95,0,
-49,0,1,230,1,
-3,1,3,1,2,
-1245,22,1,69,1,
-1775,1246,17,1247,15,
-1248,4,30,37,0,
-69,0,109,0,112,
-0,116,0,121,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,1,-1,
-1,5,1249,20,1250,
-4,32,69,0,109,
-0,112,0,116,0,
-121,0,83,0,116,
+0,109,0,101,0,
+110,0,116,0,95,
+0,50,0,1,223,
+1,3,1,3,1,
+2,1020,22,1,59,
+1,2464,1021,17,1022,
+15,1006,1,-1,1,
+5,1023,20,1024,4,
+38,67,0,111,0,
+109,0,112,0,111,
+0,117,0,110,0,
+100,0,83,0,116,
 0,97,0,116,0,
 101,0,109,0,101,
 0,110,0,116,0,
 95,0,49,0,1,
-214,1,3,1,1,
-1,0,1251,22,1,
-53,1,19,1252,17,
-1219,1,2,1223,1,
-2028,1253,17,1254,15,
-1255,4,20,37,0,
-74,0,117,0,109,
-0,112,0,76,0,
-97,0,98,0,101,
-0,108,0,1,-1,
-1,5,1256,20,1257,
-4,22,74,0,117,
-0,109,0,112,0,
-76,0,97,0,98,
-0,101,0,108,0,
-95,0,49,0,1,
-228,1,3,1,3,
-1,2,1258,22,1,
-67,1,2029,830,1,
-2281,1259,17,1260,15,
-1261,4,34,37,0,
-70,0,111,0,114,
-0,76,0,111,0,
-111,0,112,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
+217,1,3,1,3,
+1,2,1025,22,1,
+53,1,199,1026,16,
+0,720,1,459,1027,
+16,0,720,1,462,
+1028,16,0,720,1,
+217,1029,16,0,720,
+1,2227,1030,17,1031,
+15,985,1,-1,1,
+5,1032,20,1033,4,
+32,87,0,104,0,
+105,0,108,0,101,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,95,
+0,50,0,1,244,
+1,3,1,6,1,
+5,1034,22,1,80,
+1,1225,1035,16,0,
+720,1,1479,1036,16,
+0,720,1,1731,1037,
+16,0,720,1,1989,
+1038,17,1039,15,842,
+1,-1,1,5,1040,
+20,1041,4,26,73,
+0,102,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,49,0,
+1,239,1,3,1,
+6,1,5,1042,22,
+1,75,1,1990,1043,
+16,0,720,1,236,
+1044,16,0,720,1,
+1756,1045,16,0,720,
+1,4,1046,19,203,
+1,4,1047,5,100,
+1,256,1048,16,0,
+616,1,1261,1049,16,
+0,616,1,509,1050,
+16,0,616,1,1515,
+1051,16,0,616,1,
+2021,840,1,1775,1052,
+16,0,616,1,2029,
+847,1,2030,853,1,
+2031,858,1,2032,863,
+1,2033,868,1,277,
+1053,16,0,616,1,
+2035,874,1,2037,879,
+1,2039,884,1,32,
+1054,16,0,616,1,
+2041,890,1,2293,1055,
+16,0,616,1,2043,
+896,1,2045,901,1,
+40,1056,16,0,205,
+1,41,1057,16,0,
+616,1,1297,1058,16,
+0,616,1,43,1059,
+16,0,616,1,44,
+1060,16,0,205,1,
+1803,909,1,1804,1061,
+16,0,616,1,299,
+1062,16,0,616,1,
+47,1063,16,0,201,
+1,52,1064,16,0,
+616,1,2318,1065,16,
+0,616,1,63,1066,
+16,0,227,1,66,
+1067,16,0,225,1,
+2075,1068,16,0,616,
+1,1574,921,1,71,
+1069,16,0,616,1,
+76,1070,16,0,616,
+1,1834,1071,16,0,
+616,1,2337,1072,16,
+0,616,1,79,1073,
+16,0,616,1,1335,
+1074,16,0,616,1,
+322,1075,16,0,616,
+1,85,1076,16,0,
+616,1,89,1077,16,
+0,616,1,346,1078,
+16,0,616,1,97,
+1079,16,0,616,1,
+2106,1080,16,0,616,
+1,102,1081,16,0,
+616,1,1860,943,1,
+2364,949,1,2782,1082,
+16,0,616,1,1114,
+1083,16,0,201,1,
+112,1084,16,0,616,
+1,1117,1085,16,0,
+616,1,1873,958,1,
+1876,1086,16,0,616,
+1,124,1087,16,0,
+616,1,2136,965,1,
+381,1088,16,0,616,
+1,525,1089,16,0,
+616,1,137,1090,16,
+0,616,1,1901,1091,
+16,0,616,1,1153,
+1092,16,0,616,1,
+151,1093,16,0,616,
+1,1407,1094,16,0,
+616,1,1659,1095,16,
+0,616,1,2413,1096,
+16,0,616,1,406,
+1097,16,0,616,1,
+1371,1098,16,0,616,
+1,2105,936,1,166,
+1099,16,0,616,1,
+1622,1100,16,0,616,
+1,1931,983,1,1933,
+1101,16,0,616,1,
+431,1102,16,0,616,
+1,1585,1103,16,0,
+616,1,182,1104,16,
+0,616,1,1189,1105,
+16,0,616,1,1443,
+1106,16,0,616,1,
+1695,1107,16,0,616,
+1,2198,1108,16,0,
+616,1,447,1109,16,
+0,616,1,2458,998,
+1,2459,1004,1,1958,
+1110,16,0,616,1,
+2462,1011,1,1657,1016,
+1,2464,1021,1,199,
+1111,16,0,616,1,
+459,1112,16,0,616,
+1,462,1113,16,0,
+616,1,217,1114,16,
+0,616,1,2227,1030,
+1,1225,1115,16,0,
+616,1,1479,1116,16,
+0,616,1,1731,1117,
+16,0,616,1,1989,
+1038,1,1990,1118,16,
+0,616,1,236,1119,
+16,0,616,1,1756,
+1120,16,0,616,1,
+5,1121,19,200,1,
+5,1122,5,100,1,
+256,1123,16,0,612,
+1,1261,1124,16,0,
+612,1,509,1125,16,
+0,612,1,1515,1126,
+16,0,612,1,2021,
+840,1,1775,1127,16,
+0,612,1,2029,847,
+1,2030,853,1,2031,
+858,1,2032,863,1,
+2033,868,1,277,1128,
+16,0,612,1,2035,
+874,1,2037,879,1,
+2039,884,1,32,1129,
+16,0,612,1,2041,
+890,1,2293,1130,16,
+0,612,1,2043,896,
+1,2045,901,1,40,
+1131,16,0,204,1,
+41,1132,16,0,612,
+1,1297,1133,16,0,
+612,1,43,1134,16,
+0,612,1,44,1135,
+16,0,204,1,1803,
+909,1,1804,1136,16,
+0,612,1,299,1137,
+16,0,612,1,47,
+1138,16,0,198,1,
+52,1139,16,0,612,
+1,2318,1140,16,0,
+612,1,63,1141,16,
+0,226,1,66,1142,
+16,0,224,1,2075,
+1143,16,0,612,1,
+1574,921,1,71,1144,
+16,0,612,1,76,
+1145,16,0,612,1,
+1834,1146,16,0,612,
+1,2337,1147,16,0,
+612,1,79,1148,16,
+0,612,1,1335,1149,
+16,0,612,1,322,
+1150,16,0,612,1,
+85,1151,16,0,612,
+1,89,1152,16,0,
+612,1,346,1153,16,
+0,612,1,97,1154,
+16,0,612,1,2106,
+1155,16,0,612,1,
+102,1156,16,0,612,
+1,1860,943,1,2364,
+949,1,2782,1157,16,
+0,612,1,1114,1158,
+16,0,198,1,112,
+1159,16,0,612,1,
+1117,1160,16,0,612,
+1,1873,958,1,1876,
+1161,16,0,612,1,
+124,1162,16,0,612,
+1,2136,965,1,381,
+1163,16,0,612,1,
+525,1164,16,0,612,
+1,137,1165,16,0,
+612,1,1901,1166,16,
+0,612,1,1153,1167,
+16,0,612,1,151,
+1168,16,0,612,1,
+1407,1169,16,0,612,
+1,1659,1170,16,0,
+612,1,2413,1171,16,
+0,612,1,406,1172,
+16,0,612,1,1371,
+1173,16,0,612,1,
+2105,936,1,166,1174,
+16,0,612,1,1622,
+1175,16,0,612,1,
+1931,983,1,1933,1176,
+16,0,612,1,431,
+1177,16,0,612,1,
+1585,1178,16,0,612,
+1,182,1179,16,0,
+612,1,1189,1180,16,
+0,612,1,1443,1181,
+16,0,612,1,1695,
+1182,16,0,612,1,
+2198,1183,16,0,612,
+1,447,1184,16,0,
+612,1,2458,998,1,
+2459,1004,1,1958,1185,
+16,0,612,1,2462,
+1011,1,1657,1016,1,
+2464,1021,1,199,1186,
+16,0,612,1,459,
+1187,16,0,612,1,
+462,1188,16,0,612,
+1,217,1189,16,0,
+612,1,2227,1030,1,
+1225,1190,16,0,612,
+1,1479,1191,16,0,
+612,1,1731,1192,16,
+0,612,1,1989,1038,
+1,1990,1193,16,0,
+612,1,236,1194,16,
+0,612,1,1756,1195,
+16,0,612,1,6,
+1196,19,306,1,6,
+1197,5,2,1,1114,
+1198,16,0,304,1,
+40,1199,16,0,601,
+1,7,1200,19,270,
+1,7,1201,5,2,
+1,1114,1202,16,0,
+268,1,40,1203,16,
+0,531,1,8,1204,
+19,233,1,8,1205,
+5,2,1,1114,1206,
+16,0,231,1,40,
+1207,16,0,489,1,
+9,1208,19,239,1,
+9,1209,5,2,1,
+1114,1210,16,0,237,
+1,40,1211,16,0,
+420,1,10,1212,19,
+183,1,10,1213,5,
+2,1,1114,1214,16,
+0,181,1,40,1215,
+16,0,360,1,11,
+1216,19,147,1,11,
+1217,5,146,1,1260,
+1218,17,1219,15,1220,
+4,34,37,0,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
+101,0,110,0,116,
+0,1,-1,1,5,
+1221,20,1222,4,38,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
 0,101,0,110,0,
-116,0,1,-1,1,
-5,1262,20,1263,4,
-36,70,0,111,0,
-114,0,76,0,111,
-0,111,0,112,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-50,0,1,243,1,
-3,1,2,1,1,
-1264,22,1,82,1,
-2031,841,1,2032,846,
-1,2033,851,1,2034,
-1265,16,0,669,1,
-2035,857,1,2036,1266,
-16,0,600,1,2037,
-862,1,2038,1267,16,
-0,604,1,2039,867,
-1,32,1268,17,1247,
-1,0,1251,1,2041,
-873,1,2042,1269,16,
-0,743,1,2043,879,
-1,2044,1270,16,0,
-682,1,2045,884,1,
-2299,1271,16,0,246,
-1,1296,1272,17,1273,
-15,1202,1,-1,1,
-5,1274,20,1275,4,
+116,0,95,0,50,
+0,49,0,1,275,
+1,3,1,6,1,
+5,1223,22,1,111,
+1,1011,1224,17,1225,
+15,1226,4,44,37,
+0,80,0,97,0,
+114,0,101,0,110,
+0,116,0,104,0,
+101,0,115,0,105,
+0,115,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,-1,
+1,5,1227,20,1228,
+4,46,80,0,97,
+0,114,0,101,0,
+110,0,116,0,104,
+0,101,0,115,0,
+105,0,115,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,50,0,1,322,
+1,3,1,4,1,
+3,1229,22,1,158,
+1,1514,1230,17,1231,
+15,1220,1,-1,1,
+5,1232,20,1233,4,
 38,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
@@ -4957,115 +4904,241 @@ public yyLSLSyntax
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-50,0,48,0,1,
-267,1,3,1,6,
-1,5,1276,22,1,
-106,1,283,1277,17,
-1278,15,1226,1,-1,
-1,5,1279,20,1280,
-4,36,66,0,105,
+49,0,52,0,1,
+268,1,3,1,4,
+1,3,1234,22,1,
+104,1,9,1235,17,
+1236,15,1237,4,24,
+37,0,68,0,101,
+0,99,0,108,0,
+97,0,114,0,97,
+0,116,0,105,0,
+111,0,110,0,1,
+-1,1,5,1238,20,
+1239,4,26,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+95,0,49,0,1,
+212,1,3,1,3,
+1,2,1240,22,1,
+48,1,262,1241,17,
+1242,15,1243,4,34,
+37,0,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
-111,0,110,0,95,
-0,52,0,1,296,
-1,3,1,4,1,
-3,1281,22,1,135,
-1,40,1282,17,1283,
-15,1284,4,32,37,
-0,73,0,100,0,
-101,0,110,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
+111,0,110,0,1,
+-1,1,5,1244,20,
+1245,4,36,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,53,0,1,
+304,1,3,1,4,
+1,3,1246,22,1,
+140,1,1267,1247,17,
+1248,15,1220,1,-1,
+1,5,1249,20,1250,
+4,36,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
 0,115,0,115,0,
-105,0,111,0,110,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,56,0,1,262,
+1,3,1,6,1,
+5,1251,22,1,98,
+1,2021,840,1,1521,
+1252,17,1253,15,1220,
+1,-1,1,5,1254,
+20,1255,4,36,83,
+0,105,0,109,0,
+112,0,108,0,101,
+0,65,0,115,0,
+115,0,105,0,103,
+0,110,0,109,0,
+101,0,110,0,116,
+0,95,0,49,0,
+1,255,1,3,1,
+4,1,3,1256,22,
+1,91,1,2024,1257,
+17,1258,15,1259,4,
+24,37,0,83,0,
+116,0,97,0,116,
+0,101,0,67,0,
+104,0,97,0,110,
+0,103,0,101,0,
+1,-1,1,5,1260,
+20,1261,4,26,83,
+0,116,0,97,0,
+116,0,101,0,67,
+0,104,0,97,0,
+110,0,103,0,101,
+0,95,0,49,0,
+1,237,1,3,1,
+3,1,2,1262,22,
+1,73,1,1775,1263,
+17,1264,15,1265,4,
+30,37,0,69,0,
+109,0,112,0,116,
+0,121,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,1,-1,1,5,
+1266,20,1267,4,32,
+69,0,109,0,112,
+0,116,0,121,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,1,221,1,
+3,1,1,1,0,
+1268,22,1,57,1,
+19,1269,17,1236,1,
+2,1240,1,2028,1270,
+17,1271,15,1272,4,
+20,37,0,74,0,
+117,0,109,0,112,
+0,76,0,97,0,
+98,0,101,0,108,
 0,1,-1,1,5,
-1285,20,1286,4,34,
-73,0,100,0,101,
+1273,20,1274,4,22,
+74,0,117,0,109,
+0,112,0,76,0,
+97,0,98,0,101,
+0,108,0,95,0,
+49,0,1,235,1,
+3,1,3,1,2,
+1275,22,1,71,1,
+2029,847,1,2281,1276,
+17,1277,15,1278,4,
+34,37,0,70,0,
+111,0,114,0,76,
+0,111,0,111,0,
+112,0,83,0,116,
+0,97,0,116,0,
+101,0,109,0,101,
 0,110,0,116,0,
+1,-1,1,5,1279,
+20,1280,4,36,70,
+0,111,0,114,0,
+76,0,111,0,111,
+0,112,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,50,0,
+1,250,1,3,1,
+2,1,1,1281,22,
+1,86,1,2031,858,
+1,2032,863,1,2033,
+868,1,2034,1282,16,
+0,676,1,2788,1283,
+16,0,145,1,2036,
+1284,16,0,602,1,
+2037,879,1,2038,1285,
+16,0,606,1,2039,
+884,1,32,1286,17,
+1264,1,0,1268,1,
+2041,890,1,2042,1287,
+16,0,749,1,2043,
+896,1,2044,1288,16,
+0,689,1,2045,901,
+1,2299,1289,16,0,
+255,1,1296,1290,17,
+1291,15,1220,1,-1,
+1,5,1292,20,1293,
+4,38,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,50,0,48,0,
+1,274,1,3,1,
+6,1,5,1294,22,
+1,110,1,283,1295,
+17,1296,15,1243,1,
+-1,1,5,1297,20,
+1298,4,36,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,49,0,1,
-282,1,3,1,2,
-1,1,1287,22,1,
-121,1,44,1288,17,
-1283,1,1,1287,1,
-1803,892,1,47,1289,
-17,1290,15,1291,4,
-38,37,0,73,0,
-100,0,101,0,110,
-0,116,0,68,0,
-111,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,1,
--1,1,5,1292,20,
-1293,4,40,73,0,
-100,0,101,0,110,
-0,116,0,68,0,
-111,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,49,0,1,283,
-1,3,1,4,1,
-3,1294,22,1,122,
-1,48,1295,17,1296,
-15,1297,4,58,37,
-0,73,0,110,0,
-99,0,114,0,101,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-114,0,101,0,109,
+95,0,52,0,1,
+303,1,3,1,4,
+1,3,1299,22,1,
+139,1,40,1300,17,
+1301,15,1302,4,32,
+37,0,73,0,100,
 0,101,0,110,0,
 116,0,69,0,120,
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,1,-1,1,
-5,1298,20,1299,4,
-60,73,0,110,0,
-99,0,114,0,101,
-0,109,0,101,0,
+5,1303,20,1304,4,
+34,73,0,100,0,
+101,0,110,0,116,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,49,0,
+1,289,1,3,1,
+2,1,1,1305,22,
+1,125,1,44,1306,
+17,1301,1,1,1305,
+1,1803,909,1,47,
+1307,17,1308,15,1309,
+4,38,37,0,73,
+0,100,0,101,0,
 110,0,116,0,68,
-0,101,0,99,0,
-114,0,101,0,109,
-0,101,0,110,0,
-116,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,52,
-0,1,287,1,3,
-1,5,1,4,1300,
-22,1,126,1,49,
-1301,17,1302,15,1297,
-1,-1,1,5,1303,
-20,1304,4,60,73,
-0,110,0,99,0,
-114,0,101,0,109,
-0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,114,0,
-101,0,109,0,101,
-0,110,0,116,0,
+0,111,0,116,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,51,0,1,
-286,1,3,1,5,
-1,4,1305,22,1,
-125,1,50,1306,17,
-1307,15,1297,1,-1,
-1,5,1308,20,1309,
+1,-1,1,5,1310,
+20,1311,4,40,73,
+0,100,0,101,0,
+110,0,116,0,68,
+0,111,0,116,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,49,0,1,
+290,1,3,1,4,
+1,3,1312,22,1,
+126,1,48,1313,17,
+1314,15,1315,4,58,
+37,0,73,0,110,
+0,99,0,114,0,
+101,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,114,0,101,0,
+109,0,101,0,110,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,-1,
+1,5,1316,20,1317,
 4,60,73,0,110,
 0,99,0,114,0,
 101,0,109,0,101,
@@ -5078,12 +5151,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-50,0,1,285,1,
-3,1,3,1,2,
-1310,22,1,124,1,
-51,1311,17,1312,15,
-1297,1,-1,1,5,
-1313,20,1314,4,60,
+52,0,1,294,1,
+3,1,5,1,4,
+1318,22,1,130,1,
+49,1319,17,1320,15,
+1315,1,-1,1,5,
+1321,20,1322,4,60,
 73,0,110,0,99,
 0,114,0,101,0,
 109,0,101,0,110,
@@ -5095,81 +5168,89 @@ public yyLSLSyntax
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,49,0,
-1,284,1,3,1,
-3,1,2,1315,22,
-1,123,1,305,1316,
-17,1317,15,1226,1,
--1,1,5,1318,20,
-1319,4,36,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,51,0,1,
-295,1,3,1,4,
-1,3,1320,22,1,
-134,1,525,1321,17,
-1322,15,1323,4,34,
-37,0,82,0,111,
-0,116,0,97,0,
-116,0,105,0,111,
-0,110,0,67,0,
-111,0,110,0,115,
-0,116,0,97,0,
-110,0,116,0,1,
--1,1,5,1324,20,
-1325,4,36,82,0,
-111,0,116,0,97,
-0,116,0,105,0,
-111,0,110,0,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-95,0,49,0,1,
-280,1,3,1,10,
-1,9,1326,22,1,
-119,1,63,1327,17,
-1328,15,1329,4,38,
-37,0,84,0,121,
-0,112,0,101,0,
-99,0,97,0,115,
-0,116,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,1,-1,
-1,5,1330,20,1331,
-4,40,84,0,121,
-0,112,0,101,0,
-99,0,97,0,115,
-0,116,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-50,0,1,317,1,
-3,1,5,1,4,
-1332,22,1,156,1,
-66,1333,17,1334,15,
-1329,1,-1,1,5,
-1335,20,1336,4,40,
-84,0,121,0,112,
+0,95,0,51,0,
+1,293,1,3,1,
+5,1,4,1323,22,
+1,129,1,50,1324,
+17,1325,15,1315,1,
+-1,1,5,1326,20,
+1327,4,60,73,0,
+110,0,99,0,114,
+0,101,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,114,0,101,
+0,109,0,101,0,
+110,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,50,0,1,292,
+1,3,1,3,1,
+2,1328,22,1,128,
+1,51,1329,17,1330,
+15,1315,1,-1,1,
+5,1331,20,1332,4,
+60,73,0,110,0,
+99,0,114,0,101,
+0,109,0,101,0,
+110,0,116,0,68,
 0,101,0,99,0,
-97,0,115,0,116,
+114,0,101,0,109,
+0,101,0,110,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,49,
+0,1,291,1,3,
+1,3,1,2,1333,
+22,1,127,1,305,
+1334,17,1335,15,1243,
+1,-1,1,5,1336,
+20,1337,4,36,66,
+0,105,0,110,0,
+97,0,114,0,121,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
 0,95,0,51,0,
-1,318,1,3,1,
-7,1,6,1337,22,
-1,157,1,67,1338,
-17,1339,15,1329,1,
--1,1,5,1340,20,
-1341,4,40,84,0,
+1,302,1,3,1,
+4,1,3,1338,22,
+1,138,1,525,1339,
+17,1340,15,1341,4,
+34,37,0,82,0,
+111,0,116,0,97,
+0,116,0,105,0,
+111,0,110,0,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+1,-1,1,5,1342,
+20,1343,4,36,82,
+0,111,0,116,0,
+97,0,116,0,105,
+0,111,0,110,0,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,95,0,49,0,
+1,287,1,3,1,
+10,1,9,1344,22,
+1,123,1,63,1345,
+17,1346,15,1347,4,
+38,37,0,84,0,
+121,0,112,0,101,
+0,99,0,97,0,
+115,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,1,
+-1,1,5,1348,20,
+1349,4,40,84,0,
 121,0,112,0,101,
 0,99,0,97,0,
 115,0,116,0,69,
@@ -5177,12 +5258,12 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,55,0,1,322,
-1,3,1,8,1,
-7,1342,22,1,161,
-1,68,1343,17,1344,
-15,1329,1,-1,1,
-5,1345,20,1346,4,
+0,50,0,1,324,
+1,3,1,5,1,
+4,1350,22,1,160,
+1,66,1351,17,1352,
+15,1347,1,-1,1,
+5,1353,20,1354,4,
 40,84,0,121,0,
 112,0,101,0,99,
 0,97,0,115,0,
@@ -5190,13 +5271,13 @@ public yyLSLSyntax
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,95,0,53,
-0,1,320,1,3,
-1,8,1,7,1347,
-22,1,159,1,69,
-1348,17,1349,15,1329,
-1,-1,1,5,1350,
-20,1351,4,40,84,
+110,0,95,0,51,
+0,1,325,1,3,
+1,7,1,6,1355,
+22,1,161,1,67,
+1356,17,1357,15,1347,
+1,-1,1,5,1358,
+20,1359,4,40,84,
 0,121,0,112,0,
 101,0,99,0,97,
 0,115,0,116,0,
@@ -5204,12 +5285,12 @@ public yyLSLSyntax
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,54,0,1,
-321,1,3,1,6,
-1,5,1352,22,1,
-160,1,70,1353,17,
-1354,15,1329,1,-1,
-1,5,1355,20,1356,
+95,0,55,0,1,
+329,1,3,1,8,
+1,7,1360,22,1,
+165,1,68,1361,17,
+1362,15,1347,1,-1,
+1,5,1363,20,1364,
 4,40,84,0,121,
 0,112,0,101,0,
 99,0,97,0,115,
@@ -5218,12 +5299,12 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-52,0,1,319,1,
-3,1,6,1,5,
-1357,22,1,158,1,
-74,1358,17,1359,15,
-1329,1,-1,1,5,
-1360,20,1361,4,40,
+53,0,1,327,1,
+3,1,8,1,7,
+1365,22,1,163,1,
+69,1366,17,1367,15,
+1347,1,-1,1,5,
+1368,20,1369,4,40,
 84,0,121,0,112,
 0,101,0,99,0,
 97,0,115,0,116,
@@ -5231,148 +5312,149 @@ public yyLSLSyntax
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,57,0,
-1,324,1,3,1,
-7,1,6,1362,22,
-1,163,1,1013,1363,
-17,1364,15,1209,1,
--1,1,5,1365,20,
-1366,4,46,80,0,
-97,0,114,0,101,
-0,110,0,116,0,
-104,0,101,0,115,
-0,105,0,115,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,49,0,1,
-314,1,3,1,4,
-1,3,1367,22,1,
-153,1,1332,1368,17,
-1369,15,1202,1,-1,
-1,5,1370,20,1371,
-4,38,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,57,0,
-1,266,1,3,1,
-6,1,5,1372,22,
-1,105,1,2337,1373,
-17,1247,1,0,1251,
-1,1585,1374,17,1375,
-15,1376,4,32,37,
-0,82,0,101,0,
-116,0,117,0,114,
-0,110,0,83,0,
-116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,1,-1,1,5,
-1377,20,1378,4,34,
-82,0,101,0,116,
-0,117,0,114,0,
-110,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-95,0,50,0,1,
-273,1,3,1,2,
-1,1,1379,22,1,
-112,1,2023,1380,17,
-1381,15,1242,1,-1,
-1,5,1382,20,1383,
-4,26,83,0,116,
-0,97,0,116,0,
-101,0,67,0,104,
-0,97,0,110,0,
-103,0,101,0,95,
-0,50,0,1,231,
-1,3,1,3,1,
-2,1384,22,1,70,
-1,2136,947,1,82,
-1385,17,1386,15,1387,
-4,32,37,0,85,
-0,110,0,97,0,
-114,0,121,0,69,
+0,95,0,54,0,
+1,328,1,3,1,
+6,1,5,1370,22,
+1,164,1,70,1371,
+17,1372,15,1347,1,
+-1,1,5,1373,20,
+1374,4,40,84,0,
+121,0,112,0,101,
+0,99,0,97,0,
+115,0,116,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
-111,0,110,0,1,
+111,0,110,0,95,
+0,52,0,1,326,
+1,3,1,6,1,
+5,1375,22,1,162,
+1,74,1376,17,1377,
+15,1347,1,-1,1,
+5,1378,20,1379,4,
+40,84,0,121,0,
+112,0,101,0,99,
+0,97,0,115,0,
+116,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,57,
+0,1,331,1,3,
+1,7,1,6,1380,
+22,1,167,1,1013,
+1381,17,1382,15,1226,
+1,-1,1,5,1383,
+20,1384,4,46,80,
+0,97,0,114,0,
+101,0,110,0,116,
+0,104,0,101,0,
+115,0,105,0,115,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,49,0,
+1,321,1,3,1,
+4,1,3,1385,22,
+1,157,1,1332,1386,
+17,1387,15,1220,1,
 -1,1,5,1388,20,
-1389,4,34,85,0,
-110,0,97,0,114,
-0,121,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-51,0,1,313,1,
-3,1,3,1,2,
-1390,22,1,152,1,
-2026,1391,17,1392,15,
-1393,4,28,37,0,
-74,0,117,0,109,
-0,112,0,83,0,
+1389,4,38,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,57,
+0,1,273,1,3,
+1,6,1,5,1390,
+22,1,109,1,2337,
+1391,17,1264,1,0,
+1268,1,1585,1392,17,
+1393,15,1394,4,32,
+37,0,82,0,101,
+0,116,0,117,0,
+114,0,110,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,1395,20,1396,4,
+34,82,0,101,0,
+116,0,117,0,114,
+0,110,0,83,0,
 116,0,97,0,116,
 0,101,0,109,0,
 101,0,110,0,116,
-0,1,-1,1,5,
-1394,20,1395,4,30,
-74,0,117,0,109,
-0,112,0,83,0,
+0,95,0,50,0,
+1,280,1,3,1,
+2,1,1,1397,22,
+1,116,1,2023,1398,
+17,1399,15,1259,1,
+-1,1,5,1400,20,
+1401,4,26,83,0,
 116,0,97,0,116,
-0,101,0,109,0,
-101,0,110,0,116,
-0,95,0,49,0,
-1,229,1,3,1,
-3,1,2,1396,22,
-1,68,1,1591,1397,
-17,1398,15,1376,1,
--1,1,5,1399,20,
-1400,4,34,82,0,
-101,0,116,0,117,
-0,114,0,110,0,
-83,0,116,0,97,
-0,116,0,101,0,
-109,0,101,0,110,
-0,116,0,95,0,
-49,0,1,272,1,
-3,1,3,1,2,
-1401,22,1,111,1,
-1341,1402,17,1403,15,
-1202,1,-1,1,5,
-1404,20,1405,4,36,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,54,
-0,1,253,1,3,
-1,4,1,3,1406,
-22,1,92,1,2030,
-836,1,328,1407,17,
-1408,15,1226,1,-1,
-1,5,1409,20,1410,
-4,36,66,0,105,
+0,101,0,67,0,
+104,0,97,0,110,
+0,103,0,101,0,
+95,0,50,0,1,
+238,1,3,1,3,
+1,2,1402,22,1,
+74,1,2136,965,1,
+82,1403,17,1404,15,
+1405,4,32,37,0,
+85,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+1,-1,1,5,1406,
+20,1407,4,34,85,
 0,110,0,97,0,
 114,0,121,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,50,0,1,294,
-1,3,1,4,1,
-3,1411,22,1,133,
-1,1303,1412,17,1413,
-15,1202,1,-1,1,
-5,1414,20,1415,4,
+0,51,0,1,320,
+1,3,1,3,1,
+2,1408,22,1,156,
+1,2026,1409,17,1410,
+15,1411,4,28,37,
+0,74,0,117,0,
+109,0,112,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,1412,20,1413,4,
+30,74,0,117,0,
+109,0,112,0,83,
+0,116,0,97,0,
+116,0,101,0,109,
+0,101,0,110,0,
+116,0,95,0,49,
+0,1,236,1,3,
+1,3,1,2,1414,
+22,1,72,1,1591,
+1415,17,1416,15,1394,
+1,-1,1,5,1417,
+20,1418,4,34,82,
+0,101,0,116,0,
+117,0,114,0,110,
+0,83,0,116,0,
+97,0,116,0,101,
+0,109,0,101,0,
+110,0,116,0,95,
+0,49,0,1,279,
+1,3,1,3,1,
+2,1419,22,1,115,
+1,1341,1420,17,1421,
+15,1220,1,-1,1,
+5,1422,20,1423,4,
 36,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
@@ -5380,41 +5462,51 @@ public yyLSLSyntax
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-55,0,1,254,1,
-3,1,6,1,5,
-1416,22,1,93,1,
-1096,1417,17,1418,15,
-1419,4,26,37,0,
-70,0,117,0,110,
-0,99,0,116,0,
-105,0,111,0,110,
-0,67,0,97,0,
-108,0,108,0,1,
--1,1,5,1420,20,
-1421,4,28,70,0,
-117,0,110,0,99,
-0,116,0,105,0,
-111,0,110,0,67,
-0,97,0,108,0,
-108,0,95,0,49,
-0,1,325,1,3,
-1,5,1,4,1422,
-22,1,164,1,93,
-1423,17,1424,15,1387,
-1,-1,1,5,1425,
-20,1426,4,34,85,
+54,0,1,260,1,
+3,1,4,1,3,
+1424,22,1,96,1,
+2030,853,1,328,1425,
+17,1426,15,1243,1,
+-1,1,5,1427,20,
+1428,4,36,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,50,0,1,
+301,1,3,1,4,
+1,3,1429,22,1,
+137,1,1303,1430,17,
+1431,15,1220,1,-1,
+1,5,1432,20,1433,
+4,36,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,55,0,1,261,
+1,3,1,6,1,
+5,1434,22,1,97,
+1,2035,874,1,93,
+1435,17,1436,15,1405,
+1,-1,1,5,1437,
+20,1438,4,34,85,
 0,110,0,97,0,
 114,0,121,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,50,0,1,312,
+0,50,0,1,319,
 1,3,1,3,1,
-2,1427,22,1,151,
-1,1550,1428,17,1429,
-15,1202,1,-1,1,
-5,1430,20,1431,4,
+2,1439,22,1,155,
+1,1550,1440,17,1441,
+15,1220,1,-1,1,
+5,1442,20,1443,4,
 38,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
@@ -5423,173 +5515,139 @@ public yyLSLSyntax
 109,0,101,0,110,
 0,116,0,95,0,
 49,0,51,0,1,
-260,1,3,1,4,
-1,3,1432,22,1,
-99,1,2040,1433,16,
-0,608,1,2106,1434,
-17,1247,1,0,1251,
-1,1555,1435,16,0,
-696,1,827,1436,17,
-1437,15,1226,1,-1,
-1,5,1438,20,1439,
+267,1,3,1,4,
+1,3,1444,22,1,
+103,1,2040,1445,16,
+0,610,1,2106,1446,
+17,1264,1,0,1268,
+1,1555,1447,16,0,
+707,1,827,1448,17,
+1449,15,1243,1,-1,
+1,5,1450,20,1451,
 4,38,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
 0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,95,
-0,49,0,53,0,
-1,307,1,3,1,
-4,1,3,1440,22,
-1,146,1,1859,1441,
-16,0,335,1,1860,
-926,1,1804,1442,17,
-1247,1,0,1251,1,
-107,1443,17,1444,15,
-1387,1,-1,1,5,
-1445,20,1446,4,34,
-85,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-95,0,49,0,1,
-311,1,3,1,3,
-1,2,1447,22,1,
-150,1,1114,1448,17,
-1290,1,3,1294,1,
-1048,1449,17,1450,15,
-1226,1,-1,1,5,
-1451,20,1452,4,38,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,49,
-0,56,0,1,310,
-1,3,1,4,1,
-3,1453,22,1,149,
-1,352,1454,17,1455,
-15,1226,1,-1,1,
-5,1456,20,1457,4,
-36,66,0,105,0,
-110,0,97,0,114,
-0,121,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-49,0,1,293,1,
-3,1,4,1,3,
-1458,22,1,132,1,
-1872,1459,16,0,345,
-1,1873,940,1,118,
-1460,17,1461,15,1226,
-1,-1,1,5,1462,
-20,1463,4,38,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,49,0,
-52,0,1,306,1,
-3,1,4,1,3,
-1464,22,1,145,1,
-1123,1465,17,1466,15,
-1202,1,-1,1,5,
-1467,20,1468,4,38,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,50,0,1,259,
-1,3,1,6,1,
-5,1469,22,1,98,
-1,371,1470,17,1471,
-15,1472,4,46,37,
-0,70,0,117,0,
-110,0,99,0,116,
-0,105,0,111,0,
-110,0,67,0,97,
-0,108,0,108,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-1,-1,1,5,1473,
-20,1474,4,48,70,
-0,117,0,110,0,
-99,0,116,0,105,
-0,111,0,110,0,
-67,0,97,0,108,
-0,108,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-49,0,1,292,1,
-3,1,2,1,1,
-1475,22,1,131,1,
-1377,1476,17,1477,15,
-1202,1,-1,1,5,
-1478,20,1479,4,36,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
+114,0,101,0,115,
 0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,53,
-0,1,252,1,3,
-1,4,1,3,1480,
-22,1,91,1,375,
-1481,17,1482,15,1297,
-1,-1,1,5,1483,
-20,1484,4,60,73,
-0,110,0,99,0,
-114,0,101,0,109,
-0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,114,0,
-101,0,109,0,101,
-0,110,0,116,0,
+111,0,110,0,95,
+0,49,0,53,0,
+1,314,1,3,1,
+4,1,3,1452,22,
+1,150,1,1859,1453,
+16,0,339,1,1860,
+943,1,1804,1454,17,
+1264,1,0,1268,1,
+107,1455,17,1456,15,
+1405,1,-1,1,5,
+1457,20,1458,4,34,
+85,0,110,0,97,
+0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-95,0,56,0,1,
-291,1,3,1,5,
-1,4,1485,22,1,
-130,1,377,1486,17,
-1487,15,1297,1,-1,
-1,5,1488,20,1489,
-4,60,73,0,110,
-0,99,0,114,0,
-101,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,114,0,101,0,
-109,0,101,0,110,
-0,116,0,69,0,
+95,0,49,0,1,
+318,1,3,1,3,
+1,2,1459,22,1,
+154,1,2781,1460,16,
+0,278,1,1114,1461,
+17,1308,1,3,1312,
+1,1048,1462,17,1463,
+15,1243,1,-1,1,
+5,1464,20,1465,4,
+38,66,0,105,0,
+110,0,97,0,114,
+0,121,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-53,0,1,288,1,
-3,1,3,1,2,
-1490,22,1,127,1,
-379,1491,17,1492,15,
-1297,1,-1,1,5,
-1493,20,1494,4,60,
+49,0,56,0,1,
+317,1,3,1,4,
+1,3,1466,22,1,
+153,1,352,1467,17,
+1468,15,1243,1,-1,
+1,5,1469,20,1470,
+4,36,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,49,0,1,300,
+1,3,1,4,1,
+3,1471,22,1,136,
+1,1872,1472,16,0,
+349,1,1873,958,1,
+118,1473,17,1474,15,
+1243,1,-1,1,5,
+1475,20,1476,4,38,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,49,
+0,52,0,1,313,
+1,3,1,4,1,
+3,1477,22,1,149,
+1,1123,1478,17,1479,
+15,1220,1,-1,1,
+5,1480,20,1481,4,
+38,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,50,0,1,
+266,1,3,1,6,
+1,5,1482,22,1,
+102,1,371,1483,17,
+1484,15,1485,4,46,
+37,0,70,0,117,
+0,110,0,99,0,
+116,0,105,0,111,
+0,110,0,67,0,
+97,0,108,0,108,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,1,-1,1,5,
+1486,20,1487,4,48,
+70,0,117,0,110,
+0,99,0,116,0,
+105,0,111,0,110,
+0,67,0,97,0,
+108,0,108,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,49,0,1,299,
+1,3,1,2,1,
+1,1488,22,1,135,
+1,1377,1489,17,1490,
+15,1220,1,-1,1,
+5,1491,20,1492,4,
+36,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+53,0,1,259,1,
+3,1,4,1,3,
+1493,22,1,95,1,
+375,1494,17,1495,15,
+1315,1,-1,1,5,
+1496,20,1497,4,60,
 73,0,110,0,99,
 0,114,0,101,0,
 109,0,101,0,110,
@@ -5601,64 +5659,30 @@ public yyLSLSyntax
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,95,0,55,0,
-1,290,1,3,1,
-5,1,4,1495,22,
-1,129,1,380,1496,
-17,1497,15,1498,4,
-38,37,0,67,0,
-111,0,110,0,115,
-0,116,0,97,0,
-110,0,116,0,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,1,
--1,1,5,1499,20,
-1500,4,40,67,0,
-111,0,110,0,115,
-0,116,0,97,0,
+0,95,0,56,0,
+1,298,1,3,1,
+5,1,4,1498,22,
+1,134,1,377,1499,
+17,1500,15,1315,1,
+-1,1,5,1501,20,
+1502,4,60,73,0,
+110,0,99,0,114,
+0,101,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,114,0,101,
+0,109,0,101,0,
 110,0,116,0,69,
 0,120,0,112,0,
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,49,0,1,281,
-1,3,1,2,1,
-1,1501,22,1,120,
-1,883,1502,17,1503,
-15,1226,1,-1,1,
-5,1504,20,1505,4,
-38,66,0,105,0,
-110,0,97,0,114,
-0,121,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-49,0,54,0,1,
-308,1,3,1,4,
-1,3,1506,22,1,
-147,1,1628,1507,17,
-1508,15,1509,4,22,
-37,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,1510,20,1511,4,
-24,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,49,0,
-1,246,1,3,1,
-4,1,3,1512,22,
-1,85,1,2075,1513,
-17,1247,1,0,1251,
-1,373,1514,17,1515,
-15,1297,1,-1,1,
-5,1516,20,1517,4,
+0,53,0,1,295,
+1,3,1,3,1,
+2,1503,22,1,131,
+1,379,1504,17,1505,
+15,1315,1,-1,1,
+5,1506,20,1507,4,
 60,73,0,110,0,
 99,0,114,0,101,
 0,109,0,101,0,
@@ -5670,26 +5694,82 @@ public yyLSLSyntax
 0,112,0,114,0,
 101,0,115,0,115,
 0,105,0,111,0,
-110,0,95,0,54,
-0,1,289,1,3,
-1,3,1,2,1518,
-22,1,128,1,130,
-1519,17,1520,15,1226,
-1,-1,1,5,1521,
-20,1522,4,38,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,49,0,
-51,0,1,305,1,
-3,1,4,1,3,
-1523,22,1,144,1,
-143,1524,17,1525,15,
-1226,1,-1,1,5,
-1526,20,1527,4,38,
+110,0,95,0,55,
+0,1,297,1,3,
+1,5,1,4,1508,
+22,1,133,1,380,
+1509,17,1510,15,1511,
+4,38,37,0,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+1,-1,1,5,1512,
+20,1513,4,40,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+69,0,120,0,112,
+0,114,0,101,0,
+115,0,115,0,105,
+0,111,0,110,0,
+95,0,49,0,1,
+288,1,3,1,2,
+1,1,1514,22,1,
+124,1,883,1515,17,
+1516,15,1243,1,-1,
+1,5,1517,20,1518,
+4,38,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,49,0,54,0,
+1,315,1,3,1,
+4,1,3,1519,22,
+1,151,1,1628,1520,
+17,1521,15,1522,4,
+22,37,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,1,-1,
+1,5,1523,20,1524,
+4,24,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,49,
+0,1,253,1,3,
+1,4,1,3,1525,
+22,1,89,1,2075,
+1526,17,1264,1,0,
+1268,1,373,1527,17,
+1528,15,1315,1,-1,
+1,5,1529,20,1530,
+4,60,73,0,110,
+0,99,0,114,0,
+101,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,114,0,101,0,
+109,0,101,0,110,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,95,0,
+54,0,1,296,1,
+3,1,3,1,2,
+1531,22,1,132,1,
+130,1532,17,1533,15,
+1243,1,-1,1,5,
+1534,20,1535,4,38,
 66,0,105,0,110,
 0,97,0,114,0,
 121,0,69,0,120,
@@ -5697,56 +5777,12 @@ public yyLSLSyntax
 101,0,115,0,115,
 0,105,0,111,0,
 110,0,95,0,49,
-0,50,0,1,304,
-1,3,1,4,1,
-3,1528,22,1,143,
-1,1901,1529,17,1247,
-1,0,1251,1,1152,
-1530,17,1531,15,1202,
-1,-1,1,5,1532,
-20,1533,4,38,83,
-0,105,0,109,0,
-112,0,108,0,101,
-0,65,0,115,0,
-115,0,105,0,103,
-0,110,0,109,0,
-101,0,110,0,116,
-0,95,0,50,0,
-52,0,1,271,1,
-3,1,6,1,5,
-1534,22,1,110,1,
-1406,1535,17,1536,15,
-1202,1,-1,1,5,
-1537,20,1538,4,38,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,55,0,1,264,
+0,51,0,1,312,
 1,3,1,4,1,
-3,1539,22,1,103,
-1,1659,1540,16,0,
-291,1,2413,1541,17,
-1247,1,0,1251,1,
-1159,1542,17,1543,15,
-1202,1,-1,1,5,
-1544,20,1545,4,38,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,49,
-0,49,0,1,258,
-1,3,1,6,1,
-5,1546,22,1,97,
-1,157,1547,17,1548,
-15,1226,1,-1,1,
-5,1549,20,1550,4,
+3,1536,22,1,148,
+1,143,1537,17,1538,
+15,1243,1,-1,1,
+5,1539,20,1540,4,
 38,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
@@ -5754,25 +5790,27 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,49,0,1,
-303,1,3,1,4,
-1,3,1551,22,1,
-142,1,1413,1552,17,
-1553,15,1202,1,-1,
-1,5,1554,20,1555,
-4,36,83,0,105,
-0,109,0,112,0,
-108,0,101,0,65,
-0,115,0,115,0,
-105,0,103,0,110,
-0,109,0,101,0,
-110,0,116,0,95,
-0,52,0,1,251,
-1,3,1,4,1,
-3,1556,22,1,90,
-1,1370,1557,17,1558,
-15,1202,1,-1,1,
-5,1559,20,1560,4,
+49,0,50,0,1,
+311,1,3,1,4,
+1,3,1541,22,1,
+147,1,1901,1542,17,
+1264,1,0,1268,1,
+1152,1543,17,1544,15,
+1220,1,-1,1,5,
+1545,20,1546,4,38,
+83,0,105,0,109,
+0,112,0,108,0,
+101,0,65,0,115,
+0,115,0,105,0,
+103,0,110,0,109,
+0,101,0,110,0,
+116,0,95,0,50,
+0,52,0,1,278,
+1,3,1,6,1,
+5,1547,22,1,114,
+1,1406,1548,17,1549,
+15,1220,1,-1,1,
+5,1550,20,1551,4,
 38,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
@@ -5780,108 +5818,134 @@ public yyLSLSyntax
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-49,0,56,0,1,
-265,1,3,1,4,
-1,3,1561,22,1,
-104,1,1478,1562,17,
-1563,15,1202,1,-1,
-1,5,1564,20,1565,
+49,0,55,0,1,
+271,1,3,1,4,
+1,3,1552,22,1,
+107,1,1659,1553,16,
+0,297,1,2413,1554,
+17,1264,1,0,1268,
+1,1159,1555,17,1556,
+15,1220,1,-1,1,
+5,1557,20,1558,4,
+38,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
+0,116,0,95,0,
+49,0,49,0,1,
+265,1,3,1,6,
+1,5,1559,22,1,
+101,1,157,1560,17,
+1561,15,1243,1,-1,
+1,5,1562,20,1563,
+4,38,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,49,0,49,0,
+1,310,1,3,1,
+4,1,3,1564,22,
+1,146,1,1413,1565,
+17,1566,15,1220,1,
+-1,1,5,1567,20,
+1568,4,36,83,0,
+105,0,109,0,112,
+0,108,0,101,0,
+65,0,115,0,115,
+0,105,0,103,0,
+110,0,109,0,101,
+0,110,0,116,0,
+95,0,52,0,1,
+258,1,3,1,4,
+1,3,1569,22,1,
+94,1,1370,1570,17,
+1571,15,1220,1,-1,
+1,5,1572,20,1573,
 4,38,83,0,105,
 0,109,0,112,0,
 108,0,101,0,65,
 0,115,0,115,0,
 105,0,103,0,110,
 0,109,0,101,0,
-110,0,116,0,95,
-0,49,0,53,0,
-1,262,1,3,1,
-4,1,3,1566,22,
-1,101,1,1620,1567,
-17,1568,15,1509,1,
--1,1,5,1569,20,
-1570,4,24,65,0,
-115,0,115,0,105,
-0,103,0,110,0,
-109,0,101,0,110,
-0,116,0,95,0,
-50,0,1,247,1,
-3,1,2,1,1,
-1571,22,1,86,1,
-1621,1572,16,0,772,
-1,1574,904,1,172,
-1573,17,1574,15,1226,
-1,-1,1,5,1575,
-20,1576,4,38,66,
-0,105,0,110,0,
-97,0,114,0,121,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,95,0,49,0,
-48,0,1,302,1,
-3,1,4,1,3,
-1577,22,1,141,1,
-1931,965,1,1665,1578,
-17,1579,15,1261,1,
--1,1,5,1580,20,
-1581,4,36,70,0,
-111,0,114,0,76,
-0,111,0,111,0,
-112,0,83,0,116,
-0,97,0,116,0,
-101,0,109,0,101,
-0,110,0,116,0,
-95,0,49,0,1,
-242,1,3,1,2,
-1,1,1582,22,1,
-81,1,2364,932,1,
-2105,919,1,1188,1583,
-17,1584,15,1202,1,
--1,1,5,1585,20,
-1586,4,38,83,0,
+110,0,116,0,95,
+0,49,0,56,0,
+1,272,1,3,1,
+4,1,3,1574,22,
+1,108,1,1478,1575,
+17,1576,15,1220,1,
+-1,1,5,1577,20,
+1578,4,38,83,0,
 105,0,109,0,112,
 0,108,0,101,0,
 65,0,115,0,115,
 0,105,0,103,0,
 110,0,109,0,101,
 0,110,0,116,0,
-95,0,50,0,51,
-0,1,270,1,3,
-1,6,1,5,1587,
-22,1,109,1,1442,
-1588,17,1589,15,1202,
-1,-1,1,5,1590,
-20,1591,4,38,83,
+95,0,49,0,53,
+0,1,269,1,3,
+1,4,1,3,1579,
+22,1,105,1,1620,
+1580,17,1581,15,1522,
+1,-1,1,5,1582,
+20,1583,4,24,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,50,0,1,254,
+1,3,1,2,1,
+1,1584,22,1,90,
+1,1621,1585,16,0,
+786,1,1574,921,1,
+172,1586,17,1587,15,
+1243,1,-1,1,5,
+1588,20,1589,4,38,
+66,0,105,0,110,
+0,97,0,114,0,
+121,0,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,95,0,49,
+0,48,0,1,309,
+1,3,1,4,1,
+3,1590,22,1,145,
+1,1931,983,1,1665,
+1591,17,1592,15,1278,
+1,-1,1,5,1593,
+20,1594,4,36,70,
+0,111,0,114,0,
+76,0,111,0,111,
+0,112,0,83,0,
+116,0,97,0,116,
+0,101,0,109,0,
+101,0,110,0,116,
+0,95,0,49,0,
+1,249,1,3,1,
+2,1,1,1595,22,
+1,85,1,2364,949,
+1,2105,936,1,1188,
+1596,17,1597,15,1220,
+1,-1,1,5,1598,
+20,1599,4,38,83,
 0,105,0,109,0,
 112,0,108,0,101,
 0,65,0,115,0,
 115,0,105,0,103,
 0,110,0,109,0,
 101,0,110,0,116,
-0,95,0,49,0,
-54,0,1,263,1,
-3,1,4,1,3,
-1592,22,1,102,1,
-1694,1593,16,0,206,
-1,942,1594,17,1595,
-15,1226,1,-1,1,
-5,1596,20,1597,4,
-38,66,0,105,0,
-110,0,97,0,114,
-0,121,0,69,0,
-120,0,112,0,114,
-0,101,0,115,0,
-115,0,105,0,111,
-0,110,0,95,0,
-49,0,55,0,1,
-309,1,3,1,4,
-1,3,1598,22,1,
-148,1,2198,1599,17,
-1247,1,0,1251,1,
-1195,1600,17,1601,15,
-1202,1,-1,1,5,
-1602,20,1603,4,38,
+0,95,0,50,0,
+51,0,1,277,1,
+3,1,6,1,5,
+1600,22,1,113,1,
+1442,1601,17,1602,15,
+1220,1,-1,1,5,
+1603,20,1604,4,38,
 83,0,105,0,109,
 0,112,0,108,0,
 101,0,65,0,115,
@@ -5889,100 +5953,88 @@ public yyLSLSyntax
 103,0,110,0,109,
 0,101,0,110,0,
 116,0,95,0,49,
-0,48,0,1,257,
-1,3,1,6,1,
-5,1604,22,1,96,
-1,1449,1605,17,1606,
-15,1202,1,-1,1,
-5,1607,20,1608,4,
-36,83,0,105,0,
+0,54,0,1,270,
+1,3,1,4,1,
+3,1605,22,1,106,
+1,1694,1606,16,0,
+218,1,942,1607,17,
+1608,15,1243,1,-1,
+1,5,1609,20,1610,
+4,38,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,95,
+0,49,0,55,0,
+1,316,1,3,1,
+4,1,3,1611,22,
+1,152,1,2198,1612,
+17,1264,1,0,1268,
+1,1195,1613,17,1614,
+15,1220,1,-1,1,
+5,1615,20,1616,4,
+38,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
 115,0,115,0,105,
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-51,0,1,250,1,
-3,1,4,1,3,
-1609,22,1,89,1,
-1701,1610,17,1611,15,
-1261,1,-1,1,5,
-1612,20,1613,4,36,
-70,0,111,0,114,
-0,76,0,111,0,
-111,0,112,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,51,
-0,1,244,1,3,
-1,4,1,3,1614,
-22,1,83,1,447,
-1615,17,1616,15,1617,
-4,30,37,0,86,
-0,101,0,99,0,
-116,0,111,0,114,
-0,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,1,-1,1,
-5,1618,20,1619,4,
-32,86,0,101,0,
-99,0,116,0,111,
-0,114,0,67,0,
-111,0,110,0,115,
-0,116,0,97,0,
+49,0,48,0,1,
+264,1,3,1,6,
+1,5,1617,22,1,
+100,1,1449,1618,17,
+1619,15,1220,1,-1,
+1,5,1620,20,1621,
+4,36,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
 110,0,116,0,95,
-0,49,0,1,279,
-1,3,1,8,1,
-7,1620,22,1,118,
-1,2458,980,1,2459,
-986,1,1958,1621,17,
-1247,1,0,1251,1,
-188,1622,17,1623,15,
-1226,1,-1,1,5,
-1624,20,1625,4,36,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,95,0,57,
-0,1,301,1,3,
-1,4,1,3,1626,
-22,1,140,1,2462,
-993,1,1657,998,1,
-2464,1003,1,205,1627,
-17,1628,15,1226,1,
--1,1,5,1629,20,
-1630,4,36,66,0,
-105,0,110,0,97,
-0,114,0,121,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
+0,51,0,1,257,
+1,3,1,4,1,
+3,1622,22,1,93,
+1,1701,1623,17,1624,
+15,1278,1,-1,1,
+5,1625,20,1626,4,
+36,70,0,111,0,
+114,0,76,0,111,
+0,111,0,112,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+51,0,1,251,1,
+3,1,4,1,3,
+1627,22,1,87,1,
+447,1628,17,1629,15,
+1630,4,30,37,0,
+86,0,101,0,99,
+0,116,0,111,0,
+114,0,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
+0,116,0,1,-1,
+1,5,1631,20,1632,
+4,32,86,0,101,
+0,99,0,116,0,
+111,0,114,0,67,
 0,111,0,110,0,
-95,0,56,0,1,
-300,1,3,1,4,
-1,3,1631,22,1,
-139,1,2227,1012,1,
-1224,1632,17,1633,15,
-1202,1,-1,1,5,
-1634,20,1635,4,38,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
-0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,50,
-0,50,0,1,269,
-1,3,1,6,1,
-5,1636,22,1,108,
-1,223,1637,17,1638,
-15,1226,1,-1,1,
-5,1639,20,1640,4,
+115,0,116,0,97,
+0,110,0,116,0,
+95,0,49,0,1,
+286,1,3,1,8,
+1,7,1633,22,1,
+122,1,2458,998,1,
+2459,1004,1,1958,1634,
+17,1264,1,0,1268,
+1,188,1635,17,1636,
+15,1243,1,-1,1,
+5,1637,20,1638,4,
 36,66,0,105,0,
 110,0,97,0,114,
 0,121,0,69,0,
@@ -5990,87 +6042,89 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-55,0,1,299,1,
+57,0,1,308,1,
 3,1,4,1,3,
-1641,22,1,138,1,
-1730,1642,17,1643,15,
-1261,1,-1,1,5,
-1644,20,1645,4,36,
-70,0,111,0,114,
-0,76,0,111,0,
-111,0,112,0,83,
-0,116,0,97,0,
-116,0,101,0,109,
-0,101,0,110,0,
-116,0,95,0,52,
-0,1,245,1,3,
-1,4,1,3,1646,
-22,1,84,1,476,
-1647,17,1648,15,1649,
-4,18,37,0,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-1,-1,1,5,1650,
-20,1651,4,20,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-95,0,52,0,1,
-277,1,3,1,2,
-1,1,1652,22,1,
-116,1,477,1653,17,
-1654,15,1649,1,-1,
-1,5,1655,20,1656,
-4,20,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
+1639,22,1,144,1,
+2462,1011,1,1657,1016,
+1,2464,1021,1,205,
+1640,17,1641,15,1243,
+1,-1,1,5,1642,
+20,1643,4,36,66,
+0,105,0,110,0,
+97,0,114,0,121,
+0,69,0,120,0,
+112,0,114,0,101,
+0,115,0,115,0,
+105,0,111,0,110,
+0,95,0,56,0,
+1,307,1,3,1,
+4,1,3,1644,22,
+1,143,1,2227,1030,
+1,1224,1645,17,1646,
+15,1220,1,-1,1,
+5,1647,20,1648,4,
+38,83,0,105,0,
+109,0,112,0,108,
+0,101,0,65,0,
+115,0,115,0,105,
+0,103,0,110,0,
+109,0,101,0,110,
 0,116,0,95,0,
-51,0,1,276,1,
-3,1,2,1,1,
-1657,22,1,115,1,
-1231,1658,17,1659,15,
-1202,1,-1,1,5,
-1660,20,1661,4,36,
-83,0,105,0,109,
-0,112,0,108,0,
-101,0,65,0,115,
+50,0,50,0,1,
+276,1,3,1,6,
+1,5,1649,22,1,
+112,1,223,1650,17,
+1651,15,1243,1,-1,
+1,5,1652,20,1653,
+4,36,66,0,105,
+0,110,0,97,0,
+114,0,121,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
 0,115,0,105,0,
-103,0,110,0,109,
-0,101,0,110,0,
-116,0,95,0,57,
-0,1,256,1,3,
-1,6,1,5,1662,
-22,1,95,1,479,
-1663,17,1664,15,1649,
-1,-1,1,5,1665,
-20,1666,4,20,67,
-0,111,0,110,0,
-115,0,116,0,97,
-0,110,0,116,0,
-95,0,49,0,1,
-274,1,3,1,2,
-1,1,1667,22,1,
-113,1,480,1668,17,
-1669,15,1670,4,26,
-37,0,76,0,105,
-0,115,0,116,0,
+111,0,110,0,95,
+0,55,0,1,306,
+1,3,1,4,1,
+3,1654,22,1,142,
+1,1730,1655,17,1656,
+15,1278,1,-1,1,
+5,1657,20,1658,4,
+36,70,0,111,0,
+114,0,76,0,111,
+0,111,0,112,0,
+83,0,116,0,97,
+0,116,0,101,0,
+109,0,101,0,110,
+0,116,0,95,0,
+52,0,1,252,1,
+3,1,4,1,3,
+1659,22,1,88,1,
+476,1660,17,1661,15,
+1662,4,18,37,0,
 67,0,111,0,110,
 0,115,0,116,0,
 97,0,110,0,116,
 0,1,-1,1,5,
-1671,20,1672,4,28,
-76,0,105,0,115,
-0,116,0,67,0,
+1663,20,1664,4,20,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,95,0,52,0,
+1,284,1,3,1,
+2,1,1,1665,22,
+1,120,1,477,1666,
+17,1667,15,1662,1,
+-1,1,5,1668,20,
+1669,4,20,67,0,
 111,0,110,0,115,
 0,116,0,97,0,
 110,0,116,0,95,
-0,49,0,1,278,
-1,3,1,4,1,
-3,1673,22,1,117,
-1,1485,1674,17,1675,
-15,1202,1,-1,1,
-5,1676,20,1677,4,
+0,51,0,1,283,
+1,3,1,2,1,
+1,1670,22,1,119,
+1,1231,1671,17,1672,
+15,1220,1,-1,1,
+5,1673,20,1674,4,
 36,83,0,105,0,
 109,0,112,0,108,
 0,101,0,65,0,
@@ -6078,15 +6132,71 @@ public yyLSLSyntax
 0,103,0,110,0,
 109,0,101,0,110,
 0,116,0,95,0,
-50,0,1,249,1,
-3,1,4,1,3,
-1678,22,1,88,1,
-1737,1679,16,0,293,
-1,1989,1020,1,1990,
-1680,17,1247,1,0,
-1251,1,242,1681,17,
-1682,15,1226,1,-1,
-1,5,1683,20,1684,
+57,0,1,263,1,
+3,1,6,1,5,
+1675,22,1,99,1,
+479,1676,17,1677,15,
+1662,1,-1,1,5,
+1678,20,1679,4,20,
+67,0,111,0,110,
+0,115,0,116,0,
+97,0,110,0,116,
+0,95,0,49,0,
+1,281,1,3,1,
+2,1,1,1680,22,
+1,117,1,480,1681,
+17,1682,15,1683,4,
+26,37,0,76,0,
+105,0,115,0,116,
+0,67,0,111,0,
+110,0,115,0,116,
+0,97,0,110,0,
+116,0,1,-1,1,
+5,1684,20,1685,4,
+28,76,0,105,0,
+115,0,116,0,67,
+0,111,0,110,0,
+115,0,116,0,97,
+0,110,0,116,0,
+95,0,49,0,1,
+285,1,3,1,4,
+1,3,1686,22,1,
+121,1,1485,1687,17,
+1688,15,1220,1,-1,
+1,5,1689,20,1690,
+4,36,83,0,105,
+0,109,0,112,0,
+108,0,101,0,65,
+0,115,0,115,0,
+105,0,103,0,110,
+0,109,0,101,0,
+110,0,116,0,95,
+0,50,0,1,256,
+1,3,1,4,1,
+3,1691,22,1,92,
+1,1737,1692,16,0,
+299,1,1989,1038,1,
+1990,1693,17,1264,1,
+0,1268,1,1096,1694,
+17,1695,15,1696,4,
+26,37,0,70,0,
+117,0,110,0,99,
+0,116,0,105,0,
+111,0,110,0,67,
+0,97,0,108,0,
+108,0,1,-1,1,
+5,1697,20,1698,4,
+28,70,0,117,0,
+110,0,99,0,116,
+0,105,0,111,0,
+110,0,67,0,97,
+0,108,0,108,0,
+95,0,49,0,1,
+332,1,3,1,5,
+1,4,1699,22,1,
+168,1,242,1700,17,
+1701,15,1243,1,-1,
+1,5,1702,20,1703,
 4,36,66,0,105,
 0,110,0,97,0,
 114,0,121,0,69,
@@ -6094,22 +6204,22 @@ public yyLSLSyntax
 114,0,101,0,115,
 0,115,0,105,0,
 111,0,110,0,95,
-0,54,0,1,298,
+0,54,0,1,305,
 1,3,1,4,1,
-3,1685,22,1,137,
-1,478,1686,17,1687,
-15,1649,1,-1,1,
-5,1688,20,1689,4,
+3,1704,22,1,141,
+1,478,1705,17,1706,
+15,1662,1,-1,1,
+5,1707,20,1708,4,
 20,67,0,111,0,
 110,0,115,0,116,
 0,97,0,110,0,
 116,0,95,0,50,
-0,1,275,1,3,
-1,2,1,1,1690,
-22,1,114,1,1001,
-1691,17,1692,15,1329,
-1,-1,1,5,1693,
-20,1694,4,40,84,
+0,1,282,1,3,
+1,2,1,1,1709,
+22,1,118,1,1001,
+1710,17,1711,15,1347,
+1,-1,1,5,1712,
+20,1713,4,40,84,
 0,121,0,112,0,
 101,0,99,0,97,
 0,115,0,116,0,
@@ -6118,11 +6228,11 @@ public yyLSLSyntax
 115,0,115,0,105,
 0,111,0,110,0,
 95,0,56,0,1,
-323,1,3,1,5,
-1,4,1695,22,1,
-162,1,1002,1696,17,
-1697,15,1329,1,-1,
-1,5,1698,20,1699,
+330,1,3,1,5,
+1,4,1714,22,1,
+166,1,1002,1715,17,
+1716,15,1347,1,-1,
+1,5,1717,20,1718,
 4,40,84,0,121,
 0,112,0,101,0,
 99,0,97,0,115,
@@ -6131,203 +6241,291 @@ public yyLSLSyntax
 0,101,0,115,0,
 115,0,105,0,111,
 0,110,0,95,0,
-49,0,1,316,1,
+49,0,1,323,1,
 3,1,5,1,4,
-1700,22,1,155,1,
-2760,1701,16,0,137,
-1,12,1702,19,166,
-1,12,1703,5,49,
-1,1901,1704,16,0,
-164,1,2075,1705,16,
-0,164,1,1860,926,
-1,1803,892,1,1804,
-1706,16,0,164,1,
-2518,1707,16,0,164,
-1,2413,1708,16,0,
-164,1,2198,1709,16,
-0,164,1,1873,940,
-1,1657,998,1,2639,
-1710,16,0,738,1,
-2533,1711,16,0,164,
-1,1989,1020,1,1990,
-1712,16,0,164,1,
-2756,1713,16,0,164,
-1,32,1714,16,0,
-164,1,31,1715,16,
-0,164,1,2541,1716,
-16,0,164,1,2106,
-1717,16,0,164,1,
-2549,1718,16,0,164,
-1,2578,1719,16,0,
-164,1,2227,1012,1,
-2337,1720,16,0,164,
-1,2558,1721,16,0,
-164,1,2563,1722,16,
-0,164,1,2021,823,
-1,2458,980,1,2459,
-986,1,2462,993,1,
-2136,947,1,2464,1003,
-1,2029,830,1,2030,
-836,1,2031,841,1,
-2032,846,1,2469,1723,
-16,0,525,1,2035,
-857,1,2364,932,1,
-2039,867,1,1931,965,
-1,2041,873,1,2043,
-879,1,2045,884,1,
-1775,1724,16,0,164,
-1,2033,851,1,2037,
-862,1,1574,904,1,
-2105,919,1,1958,1725,
+1719,22,1,159,1,
+12,1720,19,166,1,
+12,1721,5,50,1,
+1901,1722,16,0,164,
+1,2075,1723,16,0,
+164,1,1860,943,1,
+1803,909,1,1804,1724,
+16,0,164,1,2518,
+1725,16,0,164,1,
+2413,1726,16,0,164,
+1,2198,1727,16,0,
+164,1,1873,958,1,
+1657,1016,1,2136,965,
+1,2032,863,1,1989,
+1038,1,1990,1728,16,
+0,164,1,31,1729,
+16,0,164,1,32,
+1730,16,0,164,1,
+2105,936,1,2106,1731,
+16,0,164,1,2656,
+1732,16,0,282,1,
+2548,1733,16,0,164,
+1,2227,1030,1,2337,
+1734,16,0,164,1,
+2556,1735,16,0,164,
+1,2777,1736,16,0,
+164,1,2564,1737,16,
+0,164,1,2021,840,
+1,2458,998,1,2459,
+1004,1,2462,1011,1,
+2572,1738,16,0,164,
+1,2464,1021,1,2029,
+847,1,2030,853,1,
+2031,858,1,2577,1739,
+16,0,164,1,2469,
+1740,16,0,520,1,
+2035,874,1,2364,949,
+1,2039,884,1,1931,
+983,1,2041,890,1,
+2043,896,1,2045,901,
+1,2592,1741,16,0,
+164,1,1775,1742,16,
+0,164,1,2033,868,
+1,2037,879,1,1574,
+921,1,1958,1743,16,
+0,164,1,2533,1744,
 16,0,164,1,13,
-1726,19,507,1,13,
-1727,5,52,1,1860,
-926,1,1803,892,1,
-2625,1728,17,1729,15,
-1730,4,20,37,0,
+1745,19,508,1,13,
+1746,5,55,1,2643,
+1747,17,1748,15,1749,
+4,20,37,0,83,
+0,116,0,97,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,1,-1,1,
+5,1750,20,1751,4,
+22,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,95,
+0,56,0,1,187,
+1,3,1,3,1,
+2,1752,22,1,22,
+1,2644,1753,17,1754,
+15,1749,1,-1,1,
+5,1755,20,1756,4,
+22,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,95,
+0,54,0,1,185,
+1,3,1,3,1,
+2,1757,22,1,20,
+1,1860,943,1,1803,
+909,1,2520,1758,17,
+1759,15,1760,4,46,
+37,0,75,0,101,
+0,121,0,73,0,
+110,0,116,0,73,
+0,110,0,116,0,
+65,0,114,0,103,
+0,83,0,116,0,
+97,0,116,0,101,
+0,69,0,118,0,
+101,0,110,0,116,
+0,1,-1,1,5,
+1761,20,1762,4,48,
+75,0,101,0,121,
+0,73,0,110,0,
+116,0,73,0,110,
+0,116,0,65,0,
+114,0,103,0,83,
+0,116,0,97,0,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,49,0,1,203,
+1,3,1,6,1,
+5,1763,22,1,38,
+1,2413,1764,16,0,
+506,1,1873,958,1,
+1657,1016,1,2639,1765,
+17,1766,15,1749,1,
+-1,1,5,1767,20,
+1768,4,24,83,0,
+116,0,97,0,116,
+0,101,0,66,0,
+111,0,100,0,121,
+0,95,0,49,0,
+54,0,1,195,1,
+3,1,3,1,2,
+1769,22,1,30,1,
+2640,1770,17,1771,15,
+1749,1,-1,1,5,
+1772,20,1773,4,24,
 83,0,116,0,97,
 0,116,0,101,0,
 66,0,111,0,100,
-0,121,0,1,-1,
-1,5,1731,20,1732,
+0,121,0,95,0,
+49,0,52,0,1,
+193,1,3,1,3,
+1,2,1774,22,1,
+28,1,2641,1775,17,
+1776,15,1749,1,-1,
+1,5,1777,20,1778,
+4,24,83,0,116,
+0,97,0,116,0,
+101,0,66,0,111,
+0,100,0,121,0,
+95,0,49,0,50,
+0,1,191,1,3,
+1,3,1,2,1779,
+22,1,26,1,2642,
+1780,17,1781,15,1749,
+1,-1,1,5,1782,
+20,1783,4,24,83,
+0,116,0,97,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,95,0,49,
+0,48,0,1,189,
+1,3,1,3,1,
+2,1784,22,1,24,
+1,1989,1038,1,2535,
+1785,17,1786,15,1787,
+4,46,37,0,73,
+0,110,0,116,0,
+86,0,101,0,99,
+0,86,0,101,0,
+99,0,65,0,114,
+0,103,0,83,0,
+116,0,97,0,116,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,1,-1,
+1,5,1788,20,1789,
+4,48,73,0,110,
+0,116,0,86,0,
+101,0,99,0,86,
+0,101,0,99,0,
+65,0,114,0,103,
+0,83,0,116,0,
+97,0,116,0,101,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,49,0,
+1,202,1,3,1,
+6,1,5,1790,22,
+1,37,1,2645,1791,
+17,1792,15,1749,1,
+-1,1,5,1793,20,
+1794,4,22,83,0,
+116,0,97,0,116,
+0,101,0,66,0,
+111,0,100,0,121,
+0,95,0,52,0,
+1,183,1,3,1,
+3,1,2,1795,22,
+1,18,1,2646,1796,
+17,1797,15,1749,1,
+-1,1,5,1798,20,
+1799,4,22,83,0,
+116,0,97,0,116,
+0,101,0,66,0,
+111,0,100,0,121,
+0,95,0,50,0,
+1,181,1,3,1,
+3,1,2,1800,22,
+1,16,1,2037,879,
+1,32,1801,16,0,
+513,1,2649,1802,17,
+1803,15,1749,1,-1,
+1,5,1804,20,1805,
 4,24,83,0,116,
 0,97,0,116,0,
 101,0,66,0,111,
 0,100,0,121,0,
-95,0,49,0,50,
-0,1,188,1,3,
-1,3,1,2,1733,
-22,1,26,1,2626,
-1734,17,1735,15,1730,
-1,-1,1,5,1736,
-20,1737,4,24,83,
+95,0,49,0,51,
+0,1,192,1,3,
+1,2,1,1,1806,
+22,1,27,1,2650,
+1807,17,1808,15,1749,
+1,-1,1,5,1809,
+20,1810,4,24,83,
 0,116,0,97,0,
 116,0,101,0,66,
 0,111,0,100,0,
 121,0,95,0,49,
-0,48,0,1,186,
-1,3,1,3,1,
-2,1738,22,1,24,
-1,2627,1739,17,1740,
-15,1730,1,-1,1,
-5,1741,20,1742,4,
+0,49,0,1,190,
+1,3,1,2,1,
+1,1811,22,1,25,
+1,2651,1812,17,1813,
+15,1749,1,-1,1,
+5,1814,20,1815,4,
 22,83,0,116,0,
 97,0,116,0,101,
 0,66,0,111,0,
 100,0,121,0,95,
-0,56,0,1,184,
-1,3,1,3,1,
-2,1743,22,1,22,
-1,2628,1744,17,1745,
-15,1730,1,-1,1,
-5,1746,20,1747,4,
+0,57,0,1,188,
+1,3,1,2,1,
+1,1816,22,1,23,
+1,2652,1817,17,1818,
+15,1749,1,-1,1,
+5,1819,20,1820,4,
 22,83,0,116,0,
 97,0,116,0,101,
 0,66,0,111,0,
 100,0,121,0,95,
-0,54,0,1,182,
-1,3,1,3,1,
-2,1748,22,1,20,
-1,2520,1749,17,1750,
-15,1751,4,46,37,
-0,73,0,110,0,
-116,0,86,0,101,
-0,99,0,86,0,
-101,0,99,0,65,
-0,114,0,103,0,
-83,0,116,0,97,
-0,116,0,101,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,-1,1,5,1752,
-20,1753,4,48,73,
-0,110,0,116,0,
-86,0,101,0,99,
-0,86,0,101,0,
-99,0,65,0,114,
-0,103,0,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-49,0,1,197,1,
-3,1,6,1,5,
-1754,22,1,35,1,
-2630,1755,17,1756,15,
-1730,1,-1,1,5,
-1757,20,1758,4,22,
-83,0,116,0,97,
-0,116,0,101,0,
-66,0,111,0,100,
-0,121,0,95,0,
-50,0,1,178,1,
-3,1,3,1,2,
-1759,22,1,16,1,
-2413,1760,16,0,505,
-1,2632,1761,17,1762,
-15,1730,1,-1,1,
-5,1763,20,1764,4,
-24,83,0,116,0,
+0,55,0,1,186,
+1,3,1,2,1,
+1,1821,22,1,21,
+1,2653,1822,17,1823,
+15,1749,1,-1,1,
+5,1824,20,1825,4,
+22,83,0,116,0,
 97,0,116,0,101,
 0,66,0,111,0,
 100,0,121,0,95,
-0,49,0,51,0,
-1,189,1,3,1,
-2,1,1,1765,22,
-1,27,1,2633,1766,
-17,1767,15,1730,1,
--1,1,5,1768,20,
-1769,4,24,83,0,
-116,0,97,0,116,
-0,101,0,66,0,
-111,0,100,0,121,
-0,95,0,49,0,
-49,0,1,187,1,
-3,1,2,1,1,
-1770,22,1,25,1,
-2634,1771,17,1772,15,
-1730,1,-1,1,5,
-1773,20,1774,4,22,
-83,0,116,0,97,
-0,116,0,101,0,
-66,0,111,0,100,
-0,121,0,95,0,
-57,0,1,185,1,
-3,1,2,1,1,
-1775,22,1,23,1,
-2635,1776,17,1777,15,
-1730,1,-1,1,5,
-1778,20,1779,4,22,
-83,0,116,0,97,
-0,116,0,101,0,
-66,0,111,0,100,
-0,121,0,95,0,
-55,0,1,183,1,
-3,1,2,1,1,
-1780,22,1,21,1,
-1873,940,1,2637,1781,
-17,1782,15,1730,1,
--1,1,5,1783,20,
-1784,4,22,83,0,
-116,0,97,0,116,
-0,101,0,66,0,
-111,0,100,0,121,
-0,95,0,51,0,
-1,179,1,3,1,
-2,1,1,1785,22,
-1,17,1,2638,1786,
-17,1787,15,1730,1,
--1,1,5,1788,20,
-1789,4,22,83,0,
+0,53,0,1,184,
+1,3,1,2,1,
+1,1826,22,1,19,
+1,2654,1827,17,1828,
+15,1749,1,-1,1,
+5,1829,20,1830,4,
+22,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,95,
+0,51,0,1,182,
+1,3,1,2,1,
+1,1831,22,1,17,
+1,2655,1832,17,1833,
+15,1749,1,-1,1,
+5,1834,20,1835,4,
+22,83,0,116,0,
+97,0,116,0,101,
+0,66,0,111,0,
+100,0,121,0,95,
+0,49,0,1,180,
+1,3,1,2,1,
+1,1836,22,1,15,
+1,2574,1837,17,1838,
+15,1839,4,34,37,
+0,75,0,101,0,
+121,0,65,0,114,
+0,103,0,83,0,
 116,0,97,0,116,
-0,101,0,66,0,
-111,0,100,0,121,
-0,95,0,49,0,
-1,177,1,3,1,
-2,1,1,1790,22,
-1,15,1,1989,1020,
-1,2535,1791,17,1792,
-15,1793,4,46,37,
+0,101,0,69,0,
+118,0,101,0,110,
+0,116,0,1,-1,
+1,5,1840,20,1841,
+4,36,75,0,101,
+0,121,0,65,0,
+114,0,103,0,83,
+0,116,0,97,0,
+116,0,101,0,69,
+0,118,0,101,0,
+110,0,116,0,95,
+0,49,0,1,198,
+1,3,1,6,1,
+5,1842,22,1,33,
+1,2550,1843,17,1844,
+15,1845,4,46,37,
 0,73,0,110,0,
 116,0,82,0,111,
 0,116,0,82,0,
@@ -6337,8 +6535,8 @@ public yyLSLSyntax
 0,116,0,101,0,
 69,0,118,0,101,
 0,110,0,116,0,
-1,-1,1,5,1794,
-20,1795,4,48,73,
+1,-1,1,5,1846,
+20,1847,4,48,73,
 0,110,0,116,0,
 82,0,111,0,116,
 0,82,0,111,0,
@@ -6348,103 +6546,12 @@ public yyLSLSyntax
 0,101,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-49,0,1,196,1,
-3,1,6,1,5,
-1796,22,1,34,1,
-2037,862,1,32,1797,
-16,0,513,1,2105,
-919,1,2464,1003,1,
-2551,1798,17,1799,15,
-1800,4,34,37,0,
-73,0,110,0,116,
-0,65,0,114,0,
-103,0,83,0,116,
-0,97,0,116,0,
-101,0,69,0,118,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,1801,20,1802,4,
-36,73,0,110,0,
-116,0,65,0,114,
-0,103,0,83,0,
-116,0,97,0,116,
-0,101,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-49,0,1,194,1,
+49,0,1,201,1,
 3,1,6,1,5,
-1803,22,1,32,1,
-2580,1804,17,1805,15,
-1806,4,22,37,0,
-83,0,116,0,97,
-0,116,0,101,0,
-69,0,118,0,101,
-0,110,0,116,0,
-1,-1,1,5,1807,
-20,1808,4,24,83,
-0,116,0,97,0,
-116,0,101,0,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,49,0,1,191,
-1,3,1,6,1,
-5,1809,22,1,29,
-1,2227,1012,1,1574,
-904,1,2560,1810,17,
-1811,15,1812,4,34,
-37,0,75,0,101,
-0,121,0,65,0,
-114,0,103,0,83,
-0,116,0,97,0,
-116,0,101,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
--1,1,5,1813,20,
-1814,4,36,75,0,
-101,0,121,0,65,
-0,114,0,103,0,
-83,0,116,0,97,
-0,116,0,101,0,
-69,0,118,0,101,
-0,110,0,116,0,
-95,0,49,0,1,
-193,1,3,1,6,
-1,5,1815,22,1,
-31,1,2565,1816,17,
-1817,15,1818,4,36,
-37,0,86,0,111,
-0,105,0,100,0,
-65,0,114,0,103,
-0,83,0,116,0,
-97,0,116,0,101,
-0,69,0,118,0,
-101,0,110,0,116,
-0,1,-1,1,5,
-1819,20,1820,4,38,
-86,0,111,0,105,
-0,100,0,65,0,
-114,0,103,0,83,
-0,116,0,97,0,
-116,0,101,0,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,49,0,1,192,
-1,3,1,5,1,
-4,1821,22,1,30,
-1,2021,823,1,2458,
-980,1,2459,986,1,
-2462,993,1,2136,947,
-1,2682,1822,16,0,
-744,1,2029,830,1,
-2030,836,1,2031,841,
-1,2032,846,1,2033,
-851,1,1657,998,1,
-2035,857,1,2364,932,
-1,2039,867,1,1931,
-965,1,2041,873,1,
-2043,879,1,2045,884,
-1,2543,1823,17,1824,
-15,1825,4,40,37,
+1848,22,1,36,1,
+2227,1030,1,1574,921,
+1,2558,1849,17,1850,
+15,1851,4,40,37,
 0,86,0,101,0,
 99,0,116,0,111,
 0,114,0,65,0,
@@ -6453,8 +6560,8 @@ public yyLSLSyntax
 116,0,101,0,69,
 0,118,0,101,0,
 110,0,116,0,1,
--1,1,5,1826,20,
-1827,4,42,86,0,
+-1,1,5,1852,20,
+1853,4,42,86,0,
 101,0,99,0,116,
 0,111,0,114,0,
 65,0,114,0,103,
@@ -6463,204 +6570,278 @@ public yyLSLSyntax
 0,69,0,118,0,
 101,0,110,0,116,
 0,95,0,49,0,
-1,195,1,3,1,
-6,1,5,1828,22,
-1,33,1,2624,1829,
-17,1830,15,1730,1,
--1,1,5,1831,20,
-1832,4,24,83,0,
-116,0,97,0,116,
-0,101,0,66,0,
-111,0,100,0,121,
-0,95,0,49,0,
-52,0,1,190,1,
-3,1,3,1,2,
-1833,22,1,28,1,
-2629,1834,17,1835,15,
-1730,1,-1,1,5,
-1836,20,1837,4,22,
+1,200,1,3,1,
+6,1,5,1854,22,
+1,35,1,2566,1855,
+17,1856,15,1857,4,
+34,37,0,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
 83,0,116,0,97,
 0,116,0,101,0,
-66,0,111,0,100,
-0,121,0,95,0,
-52,0,1,180,1,
-3,1,3,1,2,
-1838,22,1,18,1,
-2582,1839,16,0,731,
-1,2636,1840,17,1841,
-15,1730,1,-1,1,
-5,1842,20,1843,4,
-22,83,0,116,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,-1,1,5,1858,
+20,1859,4,36,73,
+0,110,0,116,0,
+65,0,114,0,103,
+0,83,0,116,0,
 97,0,116,0,101,
-0,66,0,111,0,
-100,0,121,0,95,
-0,53,0,1,181,
-1,3,1,2,1,
-1,1844,22,1,19,
-1,14,1845,19,153,
-1,14,1846,5,112,
-1,2512,1847,17,1848,
-15,1849,4,30,37,
-0,86,0,101,0,
-99,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,1,
--1,1,5,1850,20,
-1851,4,32,86,0,
-101,0,99,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
+0,69,0,118,0,
+101,0,110,0,116,
 0,95,0,49,0,
-1,208,1,3,1,
-3,1,2,1852,22,
-1,47,1,2513,1853,
-16,0,476,1,1260,
-1200,1,1011,1207,1,
-1514,1213,1,9,1218,
-1,10,1854,17,1855,
-15,1856,4,48,37,
+1,199,1,3,1,
+6,1,5,1860,22,
+1,34,1,2458,998,
+1,2459,1004,1,2462,
+1011,1,2136,965,1,
+2464,1021,1,2029,847,
+1,2030,853,1,2031,
+858,1,2032,863,1,
+2033,868,1,2579,1861,
+17,1862,15,1863,4,
+36,37,0,86,0,
+111,0,105,0,100,
 0,65,0,114,0,
-103,0,117,0,109,
+103,0,83,0,116,
+0,97,0,116,0,
+101,0,69,0,118,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,1864,20,1865,4,
+38,86,0,111,0,
+105,0,100,0,65,
+0,114,0,103,0,
+83,0,116,0,97,
+0,116,0,101,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+197,1,3,1,5,
+1,4,1866,22,1,
+32,1,2035,874,1,
+2364,949,1,2039,884,
+1,1931,983,1,2041,
+890,1,2021,840,1,
+2043,896,1,2045,901,
+1,2700,1867,16,0,
+769,1,2594,1868,17,
+1869,15,1870,4,22,
+37,0,83,0,116,
+0,97,0,116,0,
+101,0,69,0,118,
 0,101,0,110,0,
+116,0,1,-1,1,
+5,1871,20,1872,4,
+24,83,0,116,0,
+97,0,116,0,101,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,49,0,
+1,196,1,3,1,
+6,1,5,1873,22,
+1,31,1,2596,1874,
+16,0,662,1,2648,
+1875,17,1876,15,1749,
+1,-1,1,5,1877,
+20,1878,4,24,83,
+0,116,0,97,0,
+116,0,101,0,66,
+0,111,0,100,0,
+121,0,95,0,49,
+0,53,0,1,194,
+1,3,1,2,1,
+1,1879,22,1,29,
+1,2105,936,1,14,
+1880,19,144,1,14,
+1881,5,115,1,2512,
+1882,17,1883,15,1884,
+4,30,37,0,73,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,1,-1,1,
+5,1885,20,1886,4,
+32,73,0,110,0,
 116,0,68,0,101,
 0,99,0,108,0,
 97,0,114,0,97,
 0,116,0,105,0,
-111,0,110,0,76,
-0,105,0,115,0,
-116,0,1,-1,1,
-5,149,1,0,1,
-0,1857,22,1,36,
-1,262,1224,1,1267,
-1230,1,2524,1858,16,
-0,490,1,1521,1235,
-1,1773,1859,16,0,
-157,1,2527,1860,17,
-1861,15,1862,4,30,
-37,0,82,0,111,
-0,116,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-1,-1,1,5,1863,
-20,1864,4,32,82,
-0,111,0,116,0,
+111,0,110,0,95,
+0,49,0,1,214,
+1,3,1,3,1,
+2,1887,22,1,50,
+1,2513,1888,16,0,
+481,1,1260,1218,1,
+1011,1224,1,1514,1230,
+1,9,1235,1,10,
+1889,17,1890,15,1891,
+4,48,37,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
 68,0,101,0,99,
 0,108,0,97,0,
 114,0,97,0,116,
 0,105,0,111,0,
-110,0,95,0,49,
-0,1,209,1,3,
-1,3,1,2,1865,
-22,1,48,1,2528,
-1866,16,0,496,1,
-19,1252,1,20,1867,
-16,0,151,1,2281,
-1259,1,525,1321,1,
-30,1868,17,1869,15,
-1856,1,-1,1,5,
-1870,20,1871,4,50,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
+110,0,76,0,105,
+0,115,0,116,0,
+1,-1,1,5,140,
+1,0,1,0,1892,
+22,1,39,1,262,
+1241,1,1267,1247,1,
+2524,1893,16,0,492,
+1,1521,1252,1,1773,
+1894,16,0,151,1,
+2527,1895,17,1896,15,
+1897,4,30,37,0,
+86,0,101,0,99,
 0,68,0,101,0,
 99,0,108,0,97,
 0,114,0,97,0,
 116,0,105,0,111,
-0,110,0,76,0,
-105,0,115,0,116,
-0,95,0,50,0,
-1,199,1,3,1,
-4,1,3,1872,22,
-1,38,1,1002,1696,
-1,283,1277,1,40,
-1282,1,41,1873,17,
-1874,15,1875,4,26,
-37,0,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,76,0,
-105,0,115,0,116,
-0,1,-1,1,5,
-698,1,0,1,0,
-1876,22,1,165,1,
-42,1877,17,1878,15,
-1879,4,38,37,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,1,-1,1,5,
-1880,20,1881,4,40,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
+0,110,0,1,-1,
+1,5,1898,20,1899,
+4,32,86,0,101,
+0,99,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
 0,111,0,110,0,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,95,0,49,0,
-1,328,1,3,1,
-2,1,1,1882,22,
-1,168,1,44,1288,
-1,47,1289,1,48,
-1295,1,49,1301,1,
-50,1306,1,51,1311,
-1,305,1316,1,2567,
-1883,17,1884,15,1856,
-1,-1,1,5,149,
-1,0,1,0,1857,
-1,2576,1885,16,0,
-151,1,63,1327,1,
-66,1333,1,67,1338,
-1,1478,1562,1,69,
-1348,1,70,1353,1,
-68,1343,1,74,1358,
-1,1013,1363,1,2335,
-1886,16,0,157,1,
-1332,1368,1,1048,1449,
-1,82,1385,1,1296,
-1272,1,1341,1402,1,
-328,1407,1,1303,1412,
-1,1096,1417,1,93,
-1423,1,1550,1428,1,
-352,1454,1,107,1443,
-1,1114,1448,1,1370,
-1557,1,118,1460,1,
-1123,1465,1,371,1470,
-1,1377,1476,1,375,
-1481,1,377,1486,1,
-379,1491,1,380,1496,
-1,883,1502,1,373,
-1514,1,130,1519,1,
-143,1524,1,1152,1530,
-1,387,1887,16,0,
-648,1,1406,1535,1,
-1159,1542,1,157,1547,
-1,1413,1552,1,1665,
-1578,1,412,1888,16,
-0,673,1,1094,1889,
-16,0,700,1,172,
-1573,1,827,1436,1,
-1188,1583,1,437,1890,
-16,0,748,1,1442,
-1588,1,1694,1891,16,
-0,157,1,942,1594,
-1,1195,1600,1,1449,
-1605,1,1701,1610,1,
-447,1615,1,188,1622,
-1,205,1627,1,2467,
-1892,17,1893,15,1856,
-1,-1,1,5,1894,
-20,1895,4,50,65,
+95,0,49,0,1,
+215,1,3,1,3,
+1,2,1900,22,1,
+51,1,2528,1901,16,
+0,498,1,19,1269,
+1,20,1902,16,0,
+142,1,2281,1276,1,
+525,1339,1,2539,1903,
+16,0,510,1,30,
+1904,17,1905,15,1891,
+1,-1,1,5,1906,
+20,1907,4,50,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
+95,0,50,0,1,
+205,1,3,1,4,
+1,3,1908,22,1,
+41,1,1002,1715,1,
+2542,1909,17,1910,15,
+1911,4,30,37,0,
+82,0,111,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,1,-1,
+1,5,1912,20,1913,
+4,32,82,0,111,
+0,116,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+95,0,49,0,1,
+216,1,3,1,3,
+1,2,1914,22,1,
+52,1,2543,1915,16,
+0,514,1,40,1300,
+1,41,1916,17,1917,
+15,1918,4,26,37,
+0,65,0,114,0,
+103,0,117,0,109,
+0,101,0,110,0,
+116,0,76,0,105,
+0,115,0,116,0,
+1,-1,1,5,709,
+1,0,1,0,1919,
+22,1,169,1,42,
+1920,17,1921,15,1922,
+4,38,37,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+1,-1,1,5,1923,
+20,1924,4,40,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+335,1,3,1,2,
+1,1,1925,22,1,
+172,1,44,1306,1,
+47,1307,1,48,1313,
+1,49,1319,1,50,
+1324,1,51,1329,1,
+283,1295,1,305,1334,
+1,63,1345,1,66,
+1351,1,67,1356,1,
+1478,1575,1,69,1366,
+1,70,1371,1,2581,
+1926,17,1927,15,1891,
+1,-1,1,5,140,
+1,0,1,0,1892,
+1,68,1361,1,74,
+1376,1,1013,1381,1,
+2335,1928,16,0,151,
+1,1332,1386,1,1048,
+1462,1,2590,1929,16,
+0,142,1,82,1403,
+1,1296,1290,1,1341,
+1420,1,328,1425,1,
+1303,1430,1,1096,1694,
+1,93,1435,1,1550,
+1440,1,352,1467,1,
+2775,1930,16,0,142,
+1,107,1455,1,1114,
+1461,1,1370,1570,1,
+118,1473,1,1123,1478,
+1,371,1483,1,1377,
+1489,1,375,1494,1,
+377,1499,1,827,1448,
+1,380,1509,1,883,
+1515,1,373,1527,1,
+130,1532,1,379,1504,
+1,143,1537,1,1152,
+1543,1,387,1931,16,
+0,643,1,1406,1548,
+1,1159,1555,1,157,
+1560,1,1413,1565,1,
+1665,1591,1,412,1932,
+16,0,680,1,1094,
+1933,16,0,711,1,
+172,1586,1,2766,1934,
+17,1935,15,1891,1,
+-1,1,5,140,1,
+0,1,0,1892,1,
+1188,1596,1,437,1936,
+16,0,755,1,1442,
+1601,1,1694,1937,16,
+0,151,1,942,1607,
+1,1195,1613,1,1449,
+1618,1,1701,1623,1,
+447,1628,1,188,1635,
+1,205,1640,1,2467,
+1938,17,1939,15,1891,
+1,-1,1,5,1940,
+20,1941,4,50,65,
 0,114,0,103,0,
 117,0,109,0,101,
 0,110,0,116,0,
@@ -6671,674 +6852,720 @@ public yyLSLSyntax
 110,0,76,0,105,
 0,115,0,116,0,
 95,0,49,0,1,
-198,1,3,1,2,
-1,1,1896,22,1,
-37,1,461,1897,16,
-0,700,1,464,1898,
-17,1899,15,1875,1,
--1,1,5,1900,20,
-1901,4,28,65,0,
+204,1,3,1,2,
+1,1,1942,22,1,
+40,1,461,1943,16,
+0,711,1,464,1944,
+17,1945,15,1918,1,
+-1,1,5,1946,20,
+1947,4,28,65,0,
 114,0,103,0,117,
 0,109,0,101,0,
 110,0,116,0,76,
 0,105,0,115,0,
 116,0,95,0,50,
-0,1,327,1,3,
-1,4,1,3,1902,
-22,1,167,1,1224,
-1632,1,223,1637,1,
-1730,1642,1,476,1647,
-1,477,1653,1,1231,
-1658,1,479,1663,1,
-480,1668,1,1485,1674,
-1,2745,1903,17,1904,
-15,1856,1,-1,1,
-5,149,1,0,1,
-0,1857,1,459,1905,
-17,1906,15,1875,1,
--1,1,5,698,1,
-0,1,0,1876,1,
-242,1681,1,478,1686,
-1,2754,1907,16,0,
-151,1,481,1908,17,
-1909,15,1875,1,-1,
-1,5,1910,20,1911,
-4,28,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,76,0,
-105,0,115,0,116,
-0,95,0,49,0,
-1,326,1,3,1,
-2,1,1,1912,22,
-1,166,1,1001,1691,
-1,2508,1913,17,1914,
-15,1915,4,30,37,
-0,73,0,110,0,
-116,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,1,
--1,1,5,1916,20,
-1917,4,32,73,0,
-110,0,116,0,68,
+0,1,334,1,3,
+1,4,1,3,1948,
+22,1,171,1,1224,
+1645,1,223,1650,1,
+1730,1655,1,476,1660,
+1,477,1666,1,1231,
+1671,1,479,1676,1,
+480,1681,1,1485,1687,
+1,459,1949,17,1950,
+15,1918,1,-1,1,
+5,709,1,0,1,
+0,1919,1,242,1700,
+1,478,1705,1,481,
+1951,17,1952,15,1918,
+1,-1,1,5,1953,
+20,1954,4,28,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+76,0,105,0,115,
+0,116,0,95,0,
+49,0,1,333,1,
+3,1,2,1,1,
+1955,22,1,170,1,
+1001,1710,1,2508,1956,
+17,1957,15,1958,4,
+30,37,0,75,0,
+101,0,121,0,68,
 0,101,0,99,0,
 108,0,97,0,114,
 0,97,0,116,0,
 105,0,111,0,110,
-0,95,0,49,0,
-1,207,1,3,1,
-3,1,2,1918,22,
-1,46,1,2509,1919,
-16,0,470,1,15,
-1920,19,212,1,15,
-1921,5,6,1,1114,
-1922,16,0,327,1,
-1621,1923,16,0,747,
-1,40,1924,16,0,
-641,1,19,1252,1,
-9,1218,1,2760,1925,
-16,0,210,1,16,
-1926,19,136,1,16,
-1927,5,145,1,2761,
-1928,16,0,202,1,
-256,1929,16,0,202,
-1,1261,1930,16,0,
-202,1,509,1931,16,
-0,202,1,9,1932,
-16,0,134,1,2521,
-1933,16,0,488,1,
-2021,823,1,1775,1934,
-16,0,202,1,2029,
-830,1,2030,836,1,
-2031,841,1,2032,846,
-1,2033,851,1,277,
-1935,16,0,202,1,
-2035,857,1,2037,862,
-1,2039,867,1,32,
-1936,16,0,202,1,
-2041,873,1,2293,1937,
-16,0,202,1,2043,
-879,1,2045,884,1,
-40,1938,16,0,181,
-1,41,1939,16,0,
-202,1,1297,1940,16,
-0,202,1,43,1941,
-16,0,202,1,44,
-1942,16,0,181,1,
-1803,892,1,1804,1943,
-16,0,202,1,299,
-1944,16,0,202,1,
-2480,1945,17,1946,15,
-1947,4,24,37,0,
-73,0,110,0,116,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,1948,20,1949,4,
-26,73,0,110,0,
-116,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-54,0,1,360,1,
-3,1,2,1,1,
-1950,22,1,200,1,
-2561,1951,16,0,539,
-1,52,1952,16,0,
-202,1,2484,1953,17,
-1954,15,1947,1,-1,
-1,5,1955,20,1956,
-4,26,73,0,110,
+0,1,-1,1,5,
+1959,20,1960,4,32,
+75,0,101,0,121,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,95,0,
+49,0,1,213,1,
+3,1,3,1,2,
+1961,22,1,49,1,
+2509,1962,16,0,475,
+1,15,1963,19,334,
+1,15,1964,5,6,
+1,1114,1965,16,0,
+332,1,1621,1966,16,
+0,754,1,2781,1967,
+16,0,795,1,40,
+1968,16,0,639,1,
+19,1269,1,9,1235,
+1,16,1969,19,136,
+1,16,1970,5,146,
+1,2765,1971,16,0,
+784,1,256,1972,16,
+0,206,1,1261,1973,
+16,0,206,1,509,
+1974,16,0,206,1,
+9,1975,16,0,134,
+1,2521,1976,16,0,
+490,1,2021,840,1,
+1775,1977,16,0,206,
+1,2029,847,1,2030,
+853,1,2031,858,1,
+2032,863,1,2033,868,
+1,277,1978,16,0,
+206,1,2035,874,1,
+2037,879,1,2039,884,
+1,32,1979,16,0,
+206,1,2041,890,1,
+2293,1980,16,0,206,
+1,2043,896,1,2045,
+901,1,40,1981,16,
+0,185,1,41,1982,
+16,0,206,1,1297,
+1983,16,0,206,1,
+43,1984,16,0,206,
+1,44,1985,16,0,
+185,1,1803,909,1,
+1804,1986,16,0,206,
+1,299,1987,16,0,
+206,1,2480,1988,17,
+1989,15,1990,4,24,
+37,0,73,0,110,
 0,116,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
-110,0,116,0,95,
-0,50,0,1,356,
-1,3,1,2,1,
-1,1957,22,1,196,
-1,2566,1958,16,0,
-667,1,1515,1959,16,
-0,202,1,2318,1960,
-16,0,202,1,2491,
-1961,17,1962,15,1963,
-4,26,37,0,86,
-0,111,0,105,0,
-100,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,1,-1,
-1,5,1964,20,1965,
-4,28,86,0,111,
-0,105,0,100,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,95,0,53,0,
-1,349,1,3,1,
-2,1,1,1966,22,
-1,189,1,62,1967,
-16,0,219,1,63,
-1968,16,0,181,1,
-2495,1969,17,1970,15,
-1963,1,-1,1,5,
-1971,20,1972,4,28,
+110,0,116,0,1,
+-1,1,5,1991,20,
+1992,4,26,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,55,0,1,
+367,1,3,1,2,
+1,1,1993,22,1,
+204,1,52,1994,16,
+0,206,1,2484,1995,
+17,1996,15,1990,1,
+-1,1,5,1997,20,
+1998,4,26,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,51,0,1,
+363,1,3,1,2,
+1,1,1999,22,1,
+200,1,2567,2000,16,
+0,750,1,1515,2001,
+16,0,206,1,2318,
+2002,16,0,206,1,
+2491,2003,17,2004,15,
+2005,4,26,37,0,
 86,0,111,0,105,
 0,100,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
-110,0,116,0,95,
-0,49,0,1,345,
-1,3,1,2,1,
-1,1973,22,1,185,
-1,2075,1974,16,0,
-202,1,1574,904,1,
-1479,1975,16,0,202,
-1,71,1976,16,0,
-202,1,1658,1977,16,
-0,776,1,1833,1978,
-16,0,318,1,1834,
-1979,16,0,202,1,
-2337,1980,16,0,202,
-1,79,1981,16,0,
-202,1,1335,1982,16,
-0,202,1,322,1983,
-16,0,202,1,76,
-1984,16,0,202,1,
-85,1985,16,0,202,
-1,89,1986,16,0,
-202,1,346,1987,16,
-0,202,1,97,1988,
-16,0,202,1,2106,
-1989,16,0,202,1,
-102,1990,16,0,202,
-1,1860,926,1,2458,
-980,1,2364,932,1,
-2536,1991,16,0,631,
-1,1990,1992,16,0,
-202,1,112,1993,16,
-0,202,1,1117,1994,
-16,0,202,1,2544,
-1995,16,0,517,1,
-1873,940,1,1875,1996,
-16,0,433,1,1876,
-1997,16,0,202,1,
-2552,1998,16,0,529,
-1,124,1999,16,0,
-202,1,2478,2000,17,
-2001,15,1947,1,-1,
-1,5,2002,20,2003,
-4,26,73,0,110,
-0,116,0,65,0,
-114,0,103,0,69,
-0,118,0,101,0,
-110,0,116,0,95,
-0,56,0,1,362,
-1,3,1,2,1,
-1,2004,22,1,202,
-1,2136,947,1,381,
-2005,16,0,202,1,
-525,2006,16,0,202,
-1,137,2007,16,0,
-202,1,2493,2008,17,
-2009,15,1963,1,-1,
-1,5,2010,20,2011,
-4,28,86,0,111,
-0,105,0,100,0,
+110,0,116,0,1,
+-1,1,5,2006,20,
+2007,4,28,86,0,
+111,0,105,0,100,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,54,
+0,1,356,1,3,
+1,2,1,1,2008,
+22,1,193,1,62,
+2009,16,0,228,1,
+63,2010,16,0,185,
+1,2495,2011,17,2012,
+15,2005,1,-1,1,
+5,2013,20,2014,4,
+28,86,0,111,0,
+105,0,100,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,50,0,1,
+352,1,3,1,2,
+1,1,2015,22,1,
+189,1,2575,2016,16,
+0,759,1,2075,2017,
+16,0,206,1,1574,
+921,1,1479,2018,16,
+0,206,1,2580,2019,
+16,0,352,1,71,
+2020,16,0,206,1,
+1658,2021,16,0,790,
+1,1833,2022,16,0,
+321,1,1834,2023,16,
+0,206,1,2337,2024,
+16,0,206,1,79,
+2025,16,0,206,1,
+1335,2026,16,0,206,
+1,322,2027,16,0,
+206,1,76,2028,16,
+0,206,1,85,2029,
+16,0,206,1,89,
+2030,16,0,206,1,
+346,2031,16,0,206,
+1,97,2032,16,0,
+206,1,2106,2033,16,
+0,206,1,102,2034,
+16,0,206,1,1860,
+943,1,2458,998,1,
+2364,949,1,2536,2035,
+16,0,633,1,2782,
+2036,16,0,206,1,
+1990,2037,16,0,206,
+1,112,2038,16,0,
+206,1,1117,2039,16,
+0,206,1,1873,958,
+1,1875,2040,16,0,
+436,1,1876,2041,16,
+0,206,1,2551,2042,
+16,0,642,1,124,
+2043,16,0,206,1,
+2478,2044,17,2045,15,
+1990,1,-1,1,5,
+2046,20,2047,4,26,
+73,0,110,0,116,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,57,
+0,1,369,1,3,
+1,2,1,1,2048,
+22,1,206,1,2136,
+965,1,2559,2049,16,
+0,536,1,525,2050,
+16,0,206,1,137,
+2051,16,0,206,1,
+381,2052,16,0,206,
+1,1901,2053,16,0,
+206,1,1153,2054,16,
+0,206,1,151,2055,
+16,0,206,1,1407,
+2056,16,0,206,1,
+1659,2057,16,0,206,
+1,2413,2058,16,0,
+206,1,406,2059,16,
+0,206,1,1371,2060,
+16,0,206,1,2105,
+936,1,166,2061,16,
+0,206,1,1622,2062,
+16,0,206,1,1931,
+983,1,1932,2063,16,
+0,525,1,1933,2064,
+16,0,206,1,431,
+2065,16,0,206,1,
+1585,2066,16,0,206,
+1,182,2067,16,0,
+206,1,1189,2068,16,
+0,206,1,1443,2069,
+16,0,206,1,1695,
+2070,16,0,206,1,
+2198,2071,16,0,206,
+1,447,2072,16,0,
+206,1,199,2073,16,
+0,206,1,2459,1004,
+1,1958,2074,16,0,
+206,1,2462,1011,1,
+1657,1016,1,2464,1021,
+1,459,2075,16,0,
+206,1,462,2076,16,
+0,206,1,2471,2077,
+17,2078,15,2079,4,
+36,37,0,75,0,
+101,0,121,0,73,
+0,110,0,116,0,
+73,0,110,0,116,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,1,-1,1,
+5,2080,20,2081,4,
+38,75,0,101,0,
+121,0,73,0,110,
+0,116,0,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+376,1,3,1,2,
+1,1,2082,22,1,
+213,1,2472,2083,17,
+2084,15,2085,4,36,
+37,0,73,0,110,
+0,116,0,86,0,
+101,0,99,0,86,
+0,101,0,99,0,
 65,0,114,0,103,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,51,0,
-1,347,1,3,1,
-2,1,1,2012,22,
-1,187,1,1901,2013,
-16,0,202,1,1153,
-2014,16,0,202,1,
-151,2015,16,0,202,
-1,1407,2016,16,0,
-202,1,1659,2017,16,
-0,202,1,2413,2018,
-16,0,202,1,406,
-2019,16,0,202,1,
-1371,2020,16,0,202,
-1,2105,919,1,166,
-2021,16,0,202,1,
-1622,2022,16,0,202,
-1,1931,965,1,1932,
-2023,16,0,528,1,
-1933,2024,16,0,202,
-1,431,2025,16,0,
-202,1,1585,2026,16,
-0,202,1,182,2027,
-16,0,202,1,1189,
-2028,16,0,202,1,
-1443,2029,16,0,202,
-1,1695,2030,16,0,
-202,1,2198,2031,16,
-0,202,1,447,2032,
-16,0,202,1,199,
-2033,16,0,202,1,
-2459,986,1,1958,2034,
-16,0,202,1,2462,
-993,1,1657,998,1,
-2464,1003,1,459,2035,
-16,0,202,1,462,
-2036,16,0,202,1,
-2471,2037,17,2038,15,
-2039,4,36,37,0,
+0,1,-1,1,5,
+2086,20,2087,4,38,
 73,0,110,0,116,
 0,86,0,101,0,
 99,0,86,0,101,
 0,99,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
-110,0,116,0,1,
--1,1,5,2040,20,
-2041,4,38,73,0,
-110,0,116,0,86,
-0,101,0,99,0,
-86,0,101,0,99,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,95,0,49,
-0,1,369,1,3,
-1,2,1,1,2042,
-22,1,209,1,2472,
-2043,17,2044,15,2045,
-4,36,37,0,73,
+110,0,116,0,95,
+0,49,0,1,375,
+1,3,1,2,1,
+1,2088,22,1,212,
+1,2473,2089,17,2090,
+15,2091,4,36,37,
+0,73,0,110,0,
+116,0,82,0,111,
+0,116,0,82,0,
+111,0,116,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+1,-1,1,5,2092,
+20,2093,4,38,73,
 0,110,0,116,0,
 82,0,111,0,116,
 0,82,0,111,0,
 116,0,65,0,114,
 0,103,0,69,0,
 118,0,101,0,110,
-0,116,0,1,-1,
-1,5,2046,20,2047,
-4,38,73,0,110,
-0,116,0,82,0,
-111,0,116,0,82,
-0,111,0,116,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,95,0,49,0,
-1,368,1,3,1,
-2,1,1,2048,22,
-1,208,1,2473,2049,
-17,2050,15,2051,4,
-30,37,0,86,0,
-101,0,99,0,116,
-0,111,0,114,0,
-65,0,114,0,103,
-0,69,0,118,0,
-101,0,110,0,116,
-0,1,-1,1,5,
-2052,20,2053,4,32,
-86,0,101,0,99,
-0,116,0,111,0,
-114,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-51,0,1,367,1,
-3,1,2,1,1,
-2054,22,1,207,1,
-2474,2055,17,2056,15,
-2051,1,-1,1,5,
-2057,20,2058,4,32,
-86,0,101,0,99,
-0,116,0,111,0,
-114,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
 0,116,0,95,0,
-50,0,1,366,1,
+49,0,1,374,1,
 3,1,2,1,1,
-2059,22,1,206,1,
-2475,2060,17,2061,15,
-2051,1,-1,1,5,
-2062,20,2063,4,32,
+2094,22,1,211,1,
+2474,2095,17,2096,15,
+2097,4,30,37,0,
 86,0,101,0,99,
 0,116,0,111,0,
 114,0,65,0,114,
 0,103,0,69,0,
 118,0,101,0,110,
-0,116,0,95,0,
-49,0,1,365,1,
-3,1,2,1,1,
-2064,22,1,205,1,
-2476,2065,17,2066,15,
-1947,1,-1,1,5,
-2067,20,2068,4,28,
-73,0,110,0,116,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,95,0,49,
-0,48,0,1,364,
-1,3,1,2,1,
-1,2069,22,1,204,
-1,2477,2070,17,2071,
-15,1947,1,-1,1,
-5,2072,20,2073,4,
-26,73,0,110,0,
-116,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-57,0,1,363,1,
-3,1,2,1,1,
-2074,22,1,203,1,
-2227,1012,1,2479,2075,
-17,2076,15,1947,1,
--1,1,5,2077,20,
-2078,4,26,73,0,
-110,0,116,0,65,
+0,116,0,1,-1,
+1,5,2098,20,2099,
+4,32,86,0,101,
+0,99,0,116,0,
+111,0,114,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,55,0,1,
-361,1,3,1,2,
-1,1,2079,22,1,
-201,1,1225,2080,16,
-0,202,1,2481,2081,
-17,2082,15,1947,1,
--1,1,5,2083,20,
-2084,4,26,73,0,
-110,0,116,0,65,
+95,0,51,0,1,
+373,1,3,1,2,
+1,1,2100,22,1,
+210,1,2475,2101,17,
+2102,15,2097,1,-1,
+1,5,2103,20,2104,
+4,32,86,0,101,
+0,99,0,116,0,
+111,0,114,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,53,0,1,
-359,1,3,1,2,
-1,1,2085,22,1,
-199,1,2482,2086,17,
-2087,15,1947,1,-1,
-1,5,2088,20,2089,
-4,26,73,0,110,
+95,0,50,0,1,
+372,1,3,1,2,
+1,1,2105,22,1,
+209,1,2476,2106,17,
+2107,15,2097,1,-1,
+1,5,2108,20,2109,
+4,32,86,0,101,
+0,99,0,116,0,
+111,0,114,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+371,1,3,1,2,
+1,1,2110,22,1,
+208,1,2477,2111,17,
+2112,15,1990,1,-1,
+1,5,2113,20,2114,
+4,28,73,0,110,
 0,116,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,52,0,1,358,
-1,3,1,2,1,
-1,2090,22,1,198,
-1,2483,2091,17,2092,
-15,1947,1,-1,1,
-5,2093,20,2094,4,
+0,49,0,48,0,
+1,370,1,3,1,
+2,1,1,2115,22,
+1,207,1,2227,1030,
+1,2479,2116,17,2117,
+15,1990,1,-1,1,
+5,2118,20,2119,4,
 26,73,0,110,0,
 116,0,65,0,114,
 0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-51,0,1,357,1,
+56,0,1,368,1,
 3,1,2,1,1,
-2095,22,1,197,1,
-1731,2096,16,0,202,
-1,2485,2097,17,2098,
-15,1947,1,-1,1,
-5,2099,20,2100,4,
+2120,22,1,205,1,
+1225,2121,16,0,206,
+1,2481,2122,17,2123,
+15,1990,1,-1,1,
+5,2124,20,2125,4,
 26,73,0,110,0,
 116,0,65,0,114,
 0,103,0,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-49,0,1,355,1,
-3,1,2,1,1,
-2101,22,1,195,1,
-2486,2102,17,2103,15,
-2104,4,24,37,0,
-75,0,101,0,121,
-0,65,0,114,0,
-103,0,69,0,118,
-0,101,0,110,0,
-116,0,1,-1,1,
-5,2105,20,2106,4,
-26,75,0,101,0,
-121,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-50,0,1,354,1,
+54,0,1,366,1,
 3,1,2,1,1,
-2107,22,1,194,1,
-2487,2108,17,2109,15,
-2104,1,-1,1,5,
-2110,20,2111,4,26,
-75,0,101,0,121,
+2126,22,1,203,1,
+2482,2127,17,2128,15,
+1990,1,-1,1,5,
+2129,20,2130,4,26,
+73,0,110,0,116,
 0,65,0,114,0,
 103,0,69,0,118,
 0,101,0,110,0,
-116,0,95,0,49,
-0,1,353,1,3,
-1,2,1,1,2112,
-22,1,193,1,2488,
-2113,17,2114,15,1963,
-1,-1,1,5,2115,
-20,2116,4,28,86,
-0,111,0,105,0,
-100,0,65,0,114,
-0,103,0,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-56,0,1,352,1,
-3,1,2,1,1,
-2117,22,1,192,1,
-2489,2118,17,2119,15,
-1963,1,-1,1,5,
-2120,20,2121,4,28,
-86,0,111,0,105,
-0,100,0,65,0,
+116,0,95,0,53,
+0,1,365,1,3,
+1,2,1,1,2131,
+22,1,202,1,2483,
+2132,17,2133,15,1990,
+1,-1,1,5,2134,
+20,2135,4,26,73,
+0,110,0,116,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,52,0,
+1,364,1,3,1,
+2,1,1,2136,22,
+1,201,1,1731,2137,
+16,0,206,1,2485,
+2138,17,2139,15,1990,
+1,-1,1,5,2140,
+20,2141,4,26,73,
+0,110,0,116,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,50,0,
+1,362,1,3,1,
+2,1,1,2142,22,
+1,199,1,2486,2143,
+17,2144,15,1990,1,
+-1,1,5,2145,20,
+2146,4,26,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,49,0,1,
+361,1,3,1,2,
+1,1,2147,22,1,
+198,1,2487,2148,17,
+2149,15,2150,4,24,
+37,0,75,0,101,
+0,121,0,65,0,
+114,0,103,0,69,
+0,118,0,101,0,
+110,0,116,0,1,
+-1,1,5,2151,20,
+2152,4,26,75,0,
+101,0,121,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,50,0,1,
+360,1,3,1,2,
+1,1,2153,22,1,
+197,1,2488,2154,17,
+2155,15,2150,1,-1,
+1,5,2156,20,2157,
+4,26,75,0,101,
+0,121,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,55,0,1,351,
+0,49,0,1,359,
 1,3,1,2,1,
-1,2122,22,1,191,
-1,2490,2123,17,2124,
-15,1963,1,-1,1,
-5,2125,20,2126,4,
+1,2158,22,1,196,
+1,2489,2159,17,2160,
+15,2005,1,-1,1,
+5,2161,20,2162,4,
 28,86,0,111,0,
 105,0,100,0,65,
 0,114,0,103,0,
 69,0,118,0,101,
 0,110,0,116,0,
-95,0,54,0,1,
-350,1,3,1,2,
-1,1,2127,22,1,
-190,1,1989,1020,1,
-2492,2128,17,2129,15,
-1963,1,-1,1,5,
-2130,20,2131,4,28,
+95,0,56,0,1,
+358,1,3,1,2,
+1,1,2163,22,1,
+195,1,2490,2164,17,
+2165,15,2005,1,-1,
+1,5,2166,20,2167,
+4,28,86,0,111,
+0,105,0,100,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,55,0,
+1,357,1,3,1,
+2,1,1,2168,22,
+1,194,1,1989,1038,
+1,2492,2169,17,2170,
+15,2005,1,-1,1,
+5,2171,20,2172,4,
+28,86,0,111,0,
+105,0,100,0,65,
+0,114,0,103,0,
+69,0,118,0,101,
+0,110,0,116,0,
+95,0,53,0,1,
+355,1,3,1,2,
+1,1,2173,22,1,
+192,1,2493,2174,17,
+2175,15,2005,1,-1,
+1,5,2176,20,2177,
+4,28,86,0,111,
+0,105,0,100,0,
+65,0,114,0,103,
+0,69,0,118,0,
+101,0,110,0,116,
+0,95,0,52,0,
+1,354,1,3,1,
+2,1,1,2178,22,
+1,191,1,2494,2179,
+17,2180,15,2005,1,
+-1,1,5,2181,20,
+2182,4,28,86,0,
+111,0,105,0,100,
+0,65,0,114,0,
+103,0,69,0,118,
+0,101,0,110,0,
+116,0,95,0,51,
+0,1,353,1,3,
+1,2,1,1,2183,
+22,1,190,1,236,
+2184,16,0,206,1,
+2496,2185,17,2186,15,
+2005,1,-1,1,5,
+2187,20,2188,4,28,
 86,0,111,0,105,
 0,100,0,65,0,
 114,0,103,0,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,52,0,1,348,
+0,49,0,1,351,
 1,3,1,2,1,
-1,2132,22,1,188,
-1,2744,2133,16,0,
-286,1,2494,2134,17,
-2135,15,1963,1,-1,
-1,5,2136,20,2137,
-4,28,86,0,111,
-0,105,0,100,0,
-65,0,114,0,103,
+1,2189,22,1,188,
+1,2497,2190,17,2191,
+15,2192,4,12,37,
 0,69,0,118,0,
 101,0,110,0,116,
-0,95,0,50,0,
-1,346,1,3,1,
-2,1,1,2138,22,
-1,186,1,236,2139,
-16,0,202,1,2496,
-2140,17,2141,15,2142,
-4,12,37,0,69,
-0,118,0,101,0,
-110,0,116,0,1,
--1,1,5,2143,20,
-2144,4,14,69,0,
-118,0,101,0,110,
-0,116,0,95,0,
-57,0,1,344,1,
-3,1,2,1,1,
-2145,22,1,184,1,
-2497,2146,17,2147,15,
-2142,1,-1,1,5,
-2148,20,2149,4,14,
+0,1,-1,1,5,
+2193,20,2194,4,14,
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,56,0,1,
-343,1,3,1,2,
-1,1,2150,22,1,
-183,1,2498,2151,17,
-2152,15,2142,1,-1,
-1,5,2153,20,2154,
+350,1,3,1,2,
+1,1,2195,22,1,
+187,1,2498,2196,17,
+2197,15,2192,1,-1,
+1,5,2198,20,2199,
 4,14,69,0,118,
 0,101,0,110,0,
 116,0,95,0,55,
-0,1,342,1,3,
-1,2,1,1,2155,
-22,1,182,1,2499,
-2156,17,2157,15,2142,
-1,-1,1,5,2158,
-20,2159,4,14,69,
+0,1,349,1,3,
+1,2,1,1,2200,
+22,1,186,1,2499,
+2201,17,2202,15,2192,
+1,-1,1,5,2203,
+20,2204,4,14,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,54,0,1,341,
+0,54,0,1,348,
 1,3,1,2,1,
-1,2160,22,1,181,
-1,2500,2161,17,2162,
-15,2142,1,-1,1,
-5,2163,20,2164,4,
+1,2205,22,1,185,
+1,2500,2206,17,2207,
+15,2192,1,-1,1,
+5,2208,20,2209,4,
 14,69,0,118,0,
 101,0,110,0,116,
 0,95,0,53,0,
-1,340,1,3,1,
-2,1,1,2165,22,
-1,180,1,2501,2166,
-17,2167,15,2142,1,
--1,1,5,2168,20,
-2169,4,14,69,0,
+1,347,1,3,1,
+2,1,1,2210,22,
+1,184,1,2501,2211,
+17,2212,15,2192,1,
+-1,1,5,2213,20,
+2214,4,14,69,0,
 118,0,101,0,110,
 0,116,0,95,0,
-52,0,1,339,1,
+52,0,1,346,1,
 3,1,2,1,1,
-2170,22,1,179,1,
-2502,2171,17,2172,15,
-2142,1,-1,1,5,
-2173,20,2174,4,14,
+2215,22,1,183,1,
+2502,2216,17,2217,15,
+2192,1,-1,1,5,
+2218,20,2219,4,14,
 69,0,118,0,101,
 0,110,0,116,0,
 95,0,51,0,1,
-338,1,3,1,2,
-1,1,2175,22,1,
-178,1,2503,2176,17,
-2177,15,2142,1,-1,
-1,5,2178,20,2179,
+345,1,3,1,2,
+1,1,2220,22,1,
+182,1,2503,2221,17,
+2222,15,2192,1,-1,
+1,5,2223,20,2224,
 4,14,69,0,118,
 0,101,0,110,0,
 116,0,95,0,50,
-0,1,337,1,3,
-1,2,1,1,2180,
-22,1,177,1,2504,
-2181,17,2182,15,2142,
-1,-1,1,5,2183,
-20,2184,4,14,69,
+0,1,344,1,3,
+1,2,1,1,2225,
+22,1,181,1,2504,
+2226,17,2227,15,2192,
+1,-1,1,5,2228,
+20,2229,4,14,69,
 0,118,0,101,0,
 110,0,116,0,95,
-0,49,0,1,336,
+0,49,0,1,343,
 1,3,1,2,1,
-1,2185,22,1,176,
-1,2505,2186,16,0,
-466,1,217,2187,16,
-0,202,1,1756,2188,
-16,0,202,1,17,
-2189,19,163,1,17,
-2190,5,132,1,1,
-2191,17,2192,15,2193,
+1,2230,22,1,180,
+1,2505,2231,16,0,
+469,1,217,2232,16,
+0,206,1,1756,2233,
+16,0,206,1,17,
+2234,19,163,1,17,
+2235,5,134,1,1,
+2236,17,2237,15,2238,
 4,18,37,0,84,
 0,121,0,112,0,
 101,0,110,0,97,
 0,109,0,101,0,
-1,-1,1,5,2194,
-20,2195,4,20,84,
+1,-1,1,5,2239,
+20,2240,4,20,84,
 0,121,0,112,0,
 101,0,110,0,97,
 0,109,0,101,0,
 95,0,55,0,1,
-335,1,3,1,2,
-1,1,2196,22,1,
-175,1,2,2197,17,
-2198,15,2193,1,-1,
-1,5,2199,20,2200,
+342,1,3,1,2,
+1,1,2241,22,1,
+179,1,2,2242,17,
+2243,15,2238,1,-1,
+1,5,2244,20,2245,
 4,20,84,0,121,
 0,112,0,101,0,
 110,0,97,0,109,
 0,101,0,95,0,
-54,0,1,334,1,
+54,0,1,341,1,
 3,1,2,1,1,
-2201,22,1,174,1,
-3,2202,17,2203,15,
-2193,1,-1,1,5,
-2204,20,2205,4,20,
+2246,22,1,178,1,
+3,2247,17,2248,15,
+2238,1,-1,1,5,
+2249,20,2250,4,20,
 84,0,121,0,112,
 0,101,0,110,0,
 97,0,109,0,101,
 0,95,0,53,0,
-1,333,1,3,1,
-2,1,1,2206,22,
-1,173,1,4,2207,
-17,2208,15,2193,1,
--1,1,5,2209,20,
-2210,4,20,84,0,
+1,340,1,3,1,
+2,1,1,2251,22,
+1,177,1,4,2252,
+17,2253,15,2238,1,
+-1,1,5,2254,20,
+2255,4,20,84,0,
 121,0,112,0,101,
 0,110,0,97,0,
 109,0,101,0,95,
-0,52,0,1,332,
+0,52,0,1,339,
 1,3,1,2,1,
-1,2211,22,1,172,
-1,5,2212,17,2213,
-15,2193,1,-1,1,
-5,2214,20,2215,4,
+1,2256,22,1,176,
+1,5,2257,17,2258,
+15,2238,1,-1,1,
+5,2259,20,2260,4,
 20,84,0,121,0,
 112,0,101,0,110,
 0,97,0,109,0,
 101,0,95,0,51,
-0,1,331,1,3,
-1,2,1,1,2216,
-22,1,171,1,6,
-2217,17,2218,15,2193,
-1,-1,1,5,2219,
-20,2220,4,20,84,
+0,1,338,1,3,
+1,2,1,1,2261,
+22,1,175,1,6,
+2262,17,2263,15,2238,
+1,-1,1,5,2264,
+20,2265,4,20,84,
 0,121,0,112,0,
 101,0,110,0,97,
 0,109,0,101,0,
 95,0,50,0,1,
-330,1,3,1,2,
-1,1,2221,22,1,
-170,1,7,2222,17,
-2223,15,2193,1,-1,
-1,5,2224,20,2225,
+337,1,3,1,2,
+1,1,2266,22,1,
+174,1,7,2267,17,
+2268,15,2238,1,-1,
+1,5,2269,20,2270,
 4,20,84,0,121,
 0,112,0,101,0,
 110,0,97,0,109,
 0,101,0,95,0,
-49,0,1,329,1,
+49,0,1,336,1,
 3,1,2,1,1,
-2226,22,1,169,1,
-1514,1213,1,9,1218,
-1,10,1854,1,262,
-1224,1,1267,1230,1,
-1521,1235,1,1773,2227,
-16,0,255,1,2527,
-1860,1,19,1252,1,
-20,2228,16,0,161,
-1,2531,2229,17,2230,
-15,2231,4,66,37,
+2271,22,1,173,1,
+1514,1230,1,9,1235,
+1,10,1889,1,262,
+1241,1,1267,1247,1,
+2775,2272,16,0,792,
+1,1521,1252,1,1773,
+2273,16,0,264,1,
+2527,1895,1,19,1269,
+1,20,2274,16,0,
+161,1,2531,2275,17,
+2276,15,2277,4,66,
+37,0,73,0,110,
+0,116,0,86,0,
+101,0,99,0,86,
+0,101,0,99,0,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,76,0,
+105,0,115,0,116,
+0,1,-1,1,5,
+2278,20,2279,4,68,
+73,0,110,0,116,
+0,86,0,101,0,
+99,0,86,0,101,
+0,99,0,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,76,0,105,0,
+115,0,116,0,95,
+0,49,0,1,210,
+1,3,1,6,1,
+5,2280,22,1,46,
+1,2281,1276,1,525,
+1339,1,30,1904,1,
+1002,1715,1,283,1295,
+1,2546,2281,17,2282,
+15,2283,4,66,37,
 0,73,0,110,0,
 116,0,82,0,111,
 0,116,0,82,0,
@@ -7352,8 +7579,8 @@ public yyLSLSyntax
 0,105,0,111,0,
 110,0,76,0,105,
 0,115,0,116,0,
-1,-1,1,5,2232,
-20,2233,4,68,73,
+1,-1,1,5,2284,
+20,2285,4,68,73,
 0,110,0,116,0,
 82,0,111,0,116,
 0,82,0,111,0,
@@ -7367,28 +7594,34 @@ public yyLSLSyntax
 0,111,0,110,0,
 76,0,105,0,115,
 0,116,0,95,0,
-49,0,1,203,1,
+49,0,1,209,1,
 3,1,6,1,5,
-2234,22,1,42,1,
-2281,1259,1,525,1321,
-1,2539,2235,17,2236,
-15,2237,4,60,37,
-0,86,0,101,0,
-99,0,116,0,111,
-0,114,0,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,1,
--1,1,5,2238,20,
-2239,4,62,86,0,
-101,0,99,0,116,
-0,111,0,114,0,
+2286,22,1,45,1,
+2547,2287,16,0,519,
+1,1010,2288,16,0,
+701,1,40,1300,1,
+41,1916,1,42,1920,
+1,44,1306,1,2555,
+2289,16,0,645,1,
+1260,1218,1,47,1307,
+1,48,1313,1,49,
+1319,1,50,1324,1,
+51,1329,1,2562,2290,
+17,2291,15,2292,4,
+54,37,0,73,0,
+110,0,116,0,65,
+0,114,0,103,0,
+117,0,109,0,101,
+0,110,0,116,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,76,0,105,
+0,115,0,116,0,
+1,-1,1,5,2293,
+20,2294,4,56,73,
+0,110,0,116,0,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
@@ -7399,26 +7632,15 @@ public yyLSLSyntax
 0,110,0,76,0,
 105,0,115,0,116,
 0,95,0,49,0,
-1,202,1,3,1,
-2,1,1,2240,22,
-1,41,1,30,1868,
-1,1002,1696,1,283,
-1277,1,2547,2241,17,
-2242,15,2243,4,54,
-37,0,73,0,110,
-0,116,0,65,0,
-114,0,103,0,117,
-0,109,0,101,0,
-110,0,116,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,76,0,105,0,
-115,0,116,0,1,
--1,1,5,2244,20,
-2245,4,56,73,0,
-110,0,116,0,65,
+1,207,1,3,1,
+2,1,1,2295,22,
+1,43,1,2563,2296,
+16,0,661,1,305,
+1334,1,2576,2297,16,
+0,571,1,2570,2298,
+17,2299,15,2300,4,
+54,37,0,75,0,
+101,0,121,0,65,
 0,114,0,103,0,
 117,0,109,0,101,
 0,110,0,116,0,
@@ -7428,136 +7650,41 @@ public yyLSLSyntax
 0,105,0,111,0,
 110,0,76,0,105,
 0,115,0,116,0,
-95,0,49,0,1,
-201,1,3,1,2,
-1,1,2246,22,1,
-40,1,2548,2247,16,
-0,642,1,1010,2248,
-16,0,690,1,40,
-1282,1,41,1873,1,
-42,1877,1,44,1288,
-1,2555,2249,17,2250,
-15,2251,4,30,37,
-0,75,0,101,0,
-121,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,1,
--1,1,5,2252,20,
-2253,4,32,75,0,
-101,0,121,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
+1,-1,1,5,2301,
+20,2302,4,56,75,
+0,101,0,121,0,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,76,0,
+105,0,115,0,116,
 0,95,0,49,0,
 1,206,1,3,1,
-3,1,2,2254,22,
-1,45,1,1260,1200,
-1,47,1289,1,48,
-1295,1,49,1301,1,
-50,1306,1,51,1311,
-1,2562,2255,16,0,
-739,1,305,1316,1,
-2576,2256,16,0,674,
-1,2567,1883,1,61,
-2257,16,0,208,1,
-63,1327,1,66,1333,
-1,67,1338,1,68,
-1343,1,69,1348,1,
-70,1353,1,73,2258,
-16,0,221,1,74,
-1358,1,1013,1363,1,
-2335,2259,16,0,257,
-1,1332,1368,1,1048,
-1449,1,2512,1847,1,
-1840,2260,16,0,334,
-1,2516,2261,17,2262,
-15,2263,4,66,37,
+2,1,1,2303,22,
+1,42,1,61,2304,
+16,0,220,1,63,
+1345,1,66,1351,1,
+67,1356,1,68,1361,
+1,69,1366,1,70,
+1371,1,2581,1926,1,
+73,2305,16,0,230,
+1,74,1376,1,1013,
+1381,1,2335,2306,16,
+0,266,1,1332,1386,
+1,1048,1462,1,2590,
+2307,16,0,774,1,
+82,1403,1,1840,2308,
+16,0,338,1,2516,
+2309,17,2310,15,2311,
+4,66,37,0,75,
+0,101,0,121,0,
+73,0,110,0,116,
 0,73,0,110,0,
-116,0,86,0,101,
-0,99,0,86,0,
-101,0,99,0,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,76,0,105,
-0,115,0,116,0,
-1,-1,1,5,2264,
-20,2265,4,68,73,
-0,110,0,116,0,
-86,0,101,0,99,
-0,86,0,101,0,
-99,0,65,0,114,
-0,103,0,117,0,
-109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,108,
-0,97,0,114,0,
-97,0,116,0,105,
-0,111,0,110,0,
-76,0,105,0,115,
-0,116,0,95,0,
-49,0,1,204,1,
-3,1,6,1,5,
-2266,22,1,43,1,
-2517,2267,16,0,482,
-1,328,1407,1,1303,
-1412,1,1096,1417,1,
-93,1423,1,82,1385,
-1,827,1436,1,2532,
-2268,16,0,626,1,
-1011,1207,1,107,1443,
-1,1114,1448,1,2540,
-2269,16,0,512,1,
-1871,2270,16,0,344,
-1,1370,1557,1,1478,
-1562,1,118,1460,1,
-1123,1465,1,371,1470,
-1,1377,1476,1,375,
-1481,1,1882,2271,16,
-0,359,1,377,1486,
-1,352,1454,1,379,
-1491,1,1341,1402,1,
-130,1519,1,2074,2272,
-16,0,644,1,373,
-1514,1,1012,2273,16,
-0,692,1,380,1496,
-1,143,1524,1,1550,
-1428,1,1152,1530,1,
-1406,1535,1,1159,1542,
-1,157,1547,1,1413,
-1552,1,883,1502,1,
-1094,2274,16,0,771,
-1,1296,1272,1,172,
-1573,1,1665,1578,1,
-1939,2275,16,0,477,
-1,1188,1583,1,1442,
-1588,1,188,1622,1,
-942,1594,1,1195,1600,
-1,1449,1605,1,1701,
-1610,1,447,1615,1,
-2556,2276,17,2277,15,
-2278,4,54,37,0,
-75,0,101,0,121,
-0,65,0,114,0,
-103,0,117,0,109,
-0,101,0,110,0,
-116,0,68,0,101,
-0,99,0,108,0,
-97,0,114,0,97,
-0,116,0,105,0,
-111,0,110,0,76,
-0,105,0,115,0,
-116,0,1,-1,1,
-5,2279,20,2280,4,
-56,75,0,101,0,
-121,0,65,0,114,
+116,0,65,0,114,
 0,103,0,117,0,
 109,0,101,0,110,
 0,116,0,68,0,
@@ -7566,2139 +7693,2280 @@ public yyLSLSyntax
 97,0,116,0,105,
 0,111,0,110,0,
 76,0,105,0,115,
-0,116,0,95,0,
-49,0,1,200,1,
-3,1,2,1,1,
-2281,22,1,39,1,
-205,1627,1,2467,1892,
-1,2557,2282,16,0,
-534,1,464,1898,1,
-2197,2283,16,0,763,
-1,1224,1632,1,223,
-1637,1,1730,1642,1,
-476,1647,1,477,1653,
-1,1231,1658,1,479,
-1663,1,480,1668,1,
-1485,1674,1,2745,1903,
-1,459,1905,1,242,
-1681,1,478,1686,1,
-2754,2284,16,0,362,
-1,481,1908,1,1001,
-1691,1,2508,1913,1,
-18,2285,19,566,1,
-18,2286,5,84,1,
-2767,2287,16,0,564,
-1,1011,1207,1,1012,
-2288,16,0,564,1,
-1013,1363,1,262,1224,
-1,1267,2289,16,0,
-564,1,515,2290,16,
-0,564,1,1521,2291,
-16,0,564,1,525,
-1321,1,283,1277,1,
-2299,2292,16,0,564,
-1,42,2293,16,0,
-564,1,40,1282,1,
-44,1288,1,47,1289,
-1,1303,2294,16,0,
-564,1,1555,2295,16,
-0,564,1,50,1306,
-1,48,1295,1,49,
-1301,1,51,1311,1,
-63,1327,1,305,1316,
-1,66,1333,1,67,
-1338,1,68,1343,1,
-69,1348,1,70,1353,
-1,73,2296,16,0,
-564,1,74,1358,1,
-328,1407,1,1048,2297,
-16,0,564,1,82,
-2298,16,0,564,1,
-1840,2299,16,0,564,
-1,1591,2300,16,0,
-564,1,1341,2301,16,
-0,564,1,1096,1417,
-1,93,1423,1,352,
-1454,1,107,2302,16,
-0,564,1,1114,1448,
-1,118,2303,16,0,
-564,1,1123,2304,16,
-0,564,1,371,1470,
-1,1628,2305,16,0,
-564,1,375,1481,1,
-1882,2306,16,0,564,
-1,377,1486,1,379,
-1491,1,380,1496,1,
-883,2307,16,0,564,
-1,373,1514,1,130,
-2308,16,0,564,1,
-143,2309,16,0,564,
-1,387,2310,16,0,
-564,1,1159,2311,16,
-0,564,1,157,2312,
-16,0,564,1,1413,
-2313,16,0,564,1,
-1665,2314,16,0,564,
-1,412,2315,16,0,
-564,1,1377,2316,16,
-0,564,1,172,2317,
-16,0,564,1,1939,
-2318,16,0,564,1,
-437,2319,16,0,564,
-1,188,2320,16,0,
-564,1,942,2321,16,
-0,564,1,1195,2322,
-16,0,564,1,1449,
-2323,16,0,564,1,
-1701,2324,16,0,564,
-1,447,1615,1,205,
-2325,16,0,564,1,
-827,2326,16,0,564,
-1,223,2327,16,0,
-564,1,476,1647,1,
-477,1653,1,1231,2328,
-16,0,564,1,479,
-1663,1,480,1668,1,
-1485,2329,16,0,564,
-1,1737,2330,16,0,
-564,1,242,2331,16,
-0,564,1,478,1686,
-1,1001,1691,1,1002,
-1696,1,19,2332,19,
-245,1,19,2333,5,
-176,1,2761,2334,16,
-0,243,1,256,2335,
-16,0,243,1,1261,
-2336,16,0,243,1,
-1011,1207,1,1012,2337,
-16,0,526,1,2458,
-980,1,262,1224,1,
-1267,2338,16,0,526,
-1,2021,823,1,1521,
-2339,16,0,526,1,
-1775,2340,16,0,243,
-1,2029,830,1,2030,
-836,1,2031,841,1,
-2032,846,1,2033,851,
-1,277,2341,16,0,
-243,1,2035,857,1,
-2037,862,1,2039,867,
-1,32,2342,16,0,
-243,1,2464,1003,1,
-2293,2343,16,0,243,
-1,2043,879,1,2045,
-884,1,2299,2344,16,
-0,526,1,41,2345,
-16,0,243,1,42,
-2346,16,0,526,1,
-40,1282,1,44,1288,
-1,43,2347,16,0,
-243,1,1804,2348,16,
-0,243,1,48,1295,
-1,49,1301,1,47,
-1289,1,51,1311,1,
-52,2349,16,0,243,
-1,50,1306,1,305,
-1316,1,1096,1417,1,
-1515,2350,16,0,243,
-1,2318,2351,16,0,
-243,1,283,1277,1,
-63,1327,1,66,1333,
-1,67,1338,1,68,
-1343,1,69,1348,1,
-70,1353,1,71,2352,
-16,0,243,1,73,
-2353,16,0,526,1,
-74,1358,1,1013,1363,
-1,76,2354,16,0,
-243,1,1834,2355,16,
-0,243,1,2337,2356,
-16,0,243,1,79,
-2357,16,0,243,1,
-1335,2358,16,0,243,
-1,299,2359,16,0,
-243,1,82,2360,16,
-0,526,1,1840,2361,
-16,0,526,1,1297,
-2362,16,0,243,1,
-85,2363,16,0,243,
-1,1341,2364,16,0,
-526,1,89,2365,16,
-0,243,1,1303,2366,
-16,0,526,1,509,
-2367,16,0,243,1,
-93,1423,1,2767,2368,
-16,0,526,1,322,
-2369,16,0,243,1,
-97,2370,16,0,243,
-1,2041,873,1,1555,
-2371,16,0,526,1,
-827,2372,16,0,526,
-1,102,2373,16,0,
-243,1,1860,926,1,
-1803,892,1,2364,932,
-1,107,2374,16,0,
-526,1,1114,1448,1,
-112,2375,16,0,243,
-1,1117,2376,16,0,
-243,1,352,1454,1,
-1873,940,1,118,2377,
-16,0,526,1,1123,
-2378,16,0,526,1,
-371,1470,1,515,2379,
-16,0,526,1,1377,
-2380,16,0,526,1,
-124,2381,16,0,243,
-1,1882,2382,16,0,
-526,1,377,1486,1,
-379,1491,1,380,1496,
-1,130,2383,16,0,
-526,1,346,2384,16,
-0,243,1,2075,2385,
-16,0,243,1,373,
-1514,1,387,2386,16,
-0,526,1,137,2387,
-16,0,243,1,143,
-2388,16,0,526,1,
-1901,2389,16,0,243,
-1,1048,2390,16,0,
-526,1,1153,2391,16,
-0,243,1,375,1481,
-1,151,2392,16,0,
-243,1,1407,2393,16,
-0,243,1,1659,2394,
-16,0,243,1,2413,
-2395,16,0,243,1,
-1159,2396,16,0,526,
-1,381,2397,16,0,
-243,1,157,2398,16,
-0,526,1,1413,2399,
-16,0,526,1,883,
-2400,16,0,526,1,
-1371,2401,16,0,243,
-1,328,1407,1,2105,
-919,1,2106,2402,16,
-0,243,1,166,2403,
-16,0,243,1,525,
-2404,16,0,243,1,
-1622,2405,16,0,243,
-1,406,2406,16,0,
-243,1,1574,904,1,
-172,2407,16,0,526,
-1,1931,965,1,412,
-2408,16,0,526,1,
-1933,2409,16,0,243,
-1,1876,2410,16,0,
-243,1,431,2411,16,
-0,243,1,1585,2412,
-16,0,243,1,182,
-2413,16,0,243,1,
-1628,2414,16,0,526,
-1,1189,2415,16,0,
-243,1,437,2416,16,
-0,526,1,1591,2417,
-16,0,526,1,188,
-2418,16,0,526,1,
-1695,2419,16,0,243,
-1,2198,2420,16,0,
-243,1,1195,2421,16,
-0,526,1,1449,2422,
-16,0,526,1,1701,
-2423,16,0,526,1,
-447,2424,16,0,243,
-1,199,2425,16,0,
-243,1,2459,986,1,
-1958,2426,16,0,243,
-1,2462,993,1,1657,
-998,1,205,2427,16,
-0,526,1,459,2428,
-16,0,243,1,462,
-2429,16,0,243,1,
-1665,2430,16,0,526,
-1,217,2431,16,0,
-243,1,2227,1012,1,
-942,2432,16,0,526,
-1,1225,2433,16,0,
-243,1,223,2434,16,
-0,526,1,1479,2435,
-16,0,243,1,1731,
-2436,16,0,243,1,
-477,1653,1,1231,2437,
-16,0,526,1,479,
-1663,1,480,1668,1,
-1485,2438,16,0,526,
-1,1737,2439,16,0,
-526,1,1989,1020,1,
-1990,2440,16,0,243,
-1,1443,2441,16,0,
-243,1,236,2442,16,
-0,243,1,2136,947,
-1,476,1647,1,242,
-2443,16,0,526,1,
-478,1686,1,1939,2444,
-16,0,526,1,1001,
-1691,1,1002,1696,1,
-1756,2445,16,0,243,
-1,20,2446,19,494,
-1,20,2447,5,84,
-1,2767,2448,16,0,
-492,1,1011,1207,1,
-1012,2449,16,0,492,
-1,1013,1363,1,262,
-1224,1,1267,2450,16,
-0,492,1,515,2451,
-16,0,492,1,1521,
-2452,16,0,492,1,
-525,1321,1,283,1277,
-1,2299,2453,16,0,
-492,1,42,2454,16,
-0,492,1,40,1282,
-1,44,1288,1,47,
-1289,1,1303,2455,16,
-0,492,1,1555,2456,
-16,0,492,1,50,
-1306,1,48,1295,1,
-49,1301,1,51,1311,
-1,63,1327,1,305,
-1316,1,66,1333,1,
-67,1338,1,68,1343,
-1,69,1348,1,70,
-1353,1,73,2457,16,
-0,492,1,74,1358,
-1,328,2458,16,0,
-492,1,1048,2459,16,
-0,492,1,82,2460,
-16,0,492,1,1840,
-2461,16,0,492,1,
-1591,2462,16,0,492,
-1,1341,2463,16,0,
-492,1,1096,1417,1,
-93,1423,1,352,2464,
-16,0,492,1,107,
-2465,16,0,492,1,
-1114,1448,1,118,2466,
-16,0,492,1,1123,
-2467,16,0,492,1,
-371,1470,1,1628,2468,
-16,0,492,1,375,
-1481,1,1882,2469,16,
-0,492,1,377,1486,
-1,379,1491,1,380,
-1496,1,883,2470,16,
-0,492,1,373,1514,
-1,130,2471,16,0,
-492,1,143,2472,16,
-0,492,1,387,2473,
-16,0,492,1,1159,
-2474,16,0,492,1,
-157,2475,16,0,492,
-1,1413,2476,16,0,
-492,1,1665,2477,16,
-0,492,1,412,2478,
-16,0,492,1,1377,
-2479,16,0,492,1,
-172,2480,16,0,492,
-1,1939,2481,16,0,
-492,1,437,2482,16,
-0,492,1,188,2483,
-16,0,492,1,942,
-2484,16,0,492,1,
-1195,2485,16,0,492,
-1,1449,2486,16,0,
-492,1,1701,2487,16,
-0,492,1,447,1615,
-1,205,2488,16,0,
-492,1,827,2489,16,
-0,492,1,223,2490,
-16,0,492,1,476,
-1647,1,477,1653,1,
-1231,2491,16,0,492,
-1,479,1663,1,480,
-1668,1,1485,2492,16,
-0,492,1,1737,2493,
-16,0,492,1,242,
-2494,16,0,492,1,
-478,1686,1,1001,1691,
-1,1002,1696,1,21,
-2495,19,465,1,21,
-2496,5,84,1,2767,
-2497,16,0,463,1,
-1011,1207,1,1012,2498,
-16,0,463,1,1013,
-1363,1,262,1224,1,
-1267,2499,16,0,463,
-1,515,2500,16,0,
-463,1,1521,2501,16,
-0,463,1,525,1321,
-1,283,1277,1,2299,
-2502,16,0,463,1,
-42,2503,16,0,463,
-1,40,1282,1,44,
-1288,1,47,1289,1,
-1303,2504,16,0,463,
-1,1555,2505,16,0,
-463,1,50,1306,1,
-48,1295,1,49,1301,
-1,51,1311,1,63,
-1327,1,305,1316,1,
-66,1333,1,67,1338,
-1,68,1343,1,69,
-1348,1,70,1353,1,
-73,2506,16,0,463,
-1,74,1358,1,328,
-2507,16,0,463,1,
-1048,2508,16,0,463,
-1,82,2509,16,0,
-463,1,1840,2510,16,
-0,463,1,1591,2511,
-16,0,463,1,1341,
-2512,16,0,463,1,
-1096,1417,1,93,1423,
-1,352,2513,16,0,
-463,1,107,2514,16,
-0,463,1,1114,1448,
-1,118,2515,16,0,
-463,1,1123,2516,16,
-0,463,1,371,1470,
-1,1628,2517,16,0,
-463,1,375,1481,1,
-1882,2518,16,0,463,
-1,377,1486,1,379,
-1491,1,380,1496,1,
-883,2519,16,0,463,
-1,373,1514,1,130,
-2520,16,0,463,1,
-143,2521,16,0,463,
-1,387,2522,16,0,
-463,1,1159,2523,16,
-0,463,1,157,2524,
-16,0,463,1,1413,
-2525,16,0,463,1,
-1665,2526,16,0,463,
-1,412,2527,16,0,
-463,1,1377,2528,16,
-0,463,1,172,2529,
-16,0,463,1,1939,
-2530,16,0,463,1,
-437,2531,16,0,463,
-1,188,2532,16,0,
-463,1,942,2533,16,
-0,463,1,1195,2534,
-16,0,463,1,1449,
-2535,16,0,463,1,
-1701,2536,16,0,463,
-1,447,1615,1,205,
-2537,16,0,463,1,
-827,2538,16,0,463,
-1,223,2539,16,0,
-463,1,476,1647,1,
-477,1653,1,1231,2540,
-16,0,463,1,479,
-1663,1,480,1668,1,
-1485,2541,16,0,463,
-1,1737,2542,16,0,
-463,1,242,2543,16,
-0,463,1,478,1686,
-1,1001,1691,1,1002,
-1696,1,22,2544,19,
-416,1,22,2545,5,
-84,1,2767,2546,16,
-0,414,1,1011,1207,
-1,1012,2547,16,0,
-414,1,1013,1363,1,
-262,1224,1,1267,2548,
-16,0,414,1,515,
-2549,16,0,414,1,
-1521,2550,16,0,414,
-1,525,1321,1,283,
-1277,1,2299,2551,16,
-0,414,1,42,2552,
-16,0,414,1,40,
-1282,1,44,1288,1,
-47,1289,1,1303,2553,
-16,0,414,1,1555,
-2554,16,0,414,1,
-50,1306,1,48,1295,
-1,49,1301,1,51,
-1311,1,63,1327,1,
-305,1316,1,66,1333,
-1,67,1338,1,68,
-1343,1,69,1348,1,
-70,1353,1,73,2555,
-16,0,414,1,74,
-1358,1,328,2556,16,
-0,414,1,1048,2557,
-16,0,414,1,82,
-2558,16,0,414,1,
-1840,2559,16,0,414,
-1,1591,2560,16,0,
-414,1,1341,2561,16,
-0,414,1,1096,1417,
-1,93,1423,1,352,
-2562,16,0,414,1,
-107,2563,16,0,414,
-1,1114,1448,1,118,
-2564,16,0,414,1,
-1123,2565,16,0,414,
-1,371,1470,1,1628,
-2566,16,0,414,1,
-375,1481,1,1882,2567,
-16,0,414,1,377,
-1486,1,379,1491,1,
-380,1496,1,883,2568,
-16,0,414,1,373,
-1514,1,130,2569,16,
-0,414,1,143,2570,
-16,0,414,1,387,
-2571,16,0,414,1,
-1159,2572,16,0,414,
-1,157,2573,16,0,
-414,1,1413,2574,16,
-0,414,1,1665,2575,
-16,0,414,1,412,
-2576,16,0,414,1,
-1377,2577,16,0,414,
-1,172,2578,16,0,
-414,1,1939,2579,16,
-0,414,1,437,2580,
-16,0,414,1,188,
-2581,16,0,414,1,
-942,2582,16,0,414,
-1,1195,2583,16,0,
-414,1,1449,2584,16,
-0,414,1,1701,2585,
-16,0,414,1,447,
-1615,1,205,2586,16,
-0,414,1,827,2587,
-16,0,414,1,223,
-2588,16,0,414,1,
-476,1647,1,477,1653,
-1,1231,2589,16,0,
-414,1,479,1663,1,
-480,1668,1,1485,2590,
-16,0,414,1,1737,
-2591,16,0,414,1,
-242,2592,16,0,414,
-1,478,1686,1,1001,
-1691,1,1002,1696,1,
-23,2593,19,580,1,
-23,2594,5,38,1,
-1901,2595,16,0,578,
-1,2075,2596,16,0,
-578,1,1860,926,1,
-1803,892,1,1804,2597,
-16,0,578,1,2413,
-2598,16,0,578,1,
-2198,2599,16,0,578,
-1,1873,940,1,1657,
-998,1,1989,1020,1,
-1990,2600,16,0,578,
-1,1775,2601,16,0,
-578,1,32,2602,16,
-0,578,1,2105,919,
-1,2106,2603,16,0,
-578,1,2364,932,1,
-2227,1012,1,2337,2604,
-16,0,578,1,2021,
-823,1,2458,980,1,
-2459,986,1,2462,993,
-1,2136,947,1,2464,
-1003,1,2029,830,1,
-2030,836,1,2031,841,
-1,2032,846,1,2033,
-851,1,2035,857,1,
-2037,862,1,2039,867,
-1,1931,965,1,2041,
-873,1,2043,879,1,
-2045,884,1,1574,904,
-1,1958,2605,16,0,
-578,1,24,2606,19,
-192,1,24,2607,5,
-5,1,44,2608,16,
-0,190,1,377,2609,
-16,0,616,1,40,
-2610,16,0,778,1,
-63,2611,16,0,213,
-1,373,2612,16,0,
-612,1,25,2613,19,
-321,1,25,2614,5,
-177,1,2761,2615,16,
-0,621,1,256,2616,
-16,0,621,1,2767,
-2617,16,0,319,1,
-1011,1207,1,1012,2618,
-16,0,319,1,2458,
-980,1,262,1224,1,
-1267,2619,16,0,319,
-1,2021,823,1,1521,
-2620,16,0,319,1,
-1775,2621,16,0,621,
-1,2029,830,1,2030,
-836,1,2031,841,1,
-2032,846,1,2033,851,
-1,277,2622,16,0,
-621,1,2035,857,1,
-2037,862,1,2039,867,
-1,32,2623,16,0,
-621,1,2464,1003,1,
-2293,2624,16,0,621,
-1,2043,879,1,2045,
-884,1,2299,2625,16,
-0,319,1,41,2626,
-16,0,621,1,42,
-2627,16,0,319,1,
-40,1282,1,44,1288,
-1,43,2628,16,0,
-621,1,1804,2629,16,
-0,621,1,48,1295,
-1,49,1301,1,47,
-1289,1,51,1311,1,
-52,2630,16,0,621,
-1,50,1306,1,305,
-1316,1,1096,1417,1,
-1515,2631,16,0,621,
-1,2318,2632,16,0,
-621,1,62,2633,16,
-0,621,1,63,1327,
-1,66,1333,1,67,
-1338,1,68,1343,1,
-69,1348,1,70,1353,
-1,71,2634,16,0,
-621,1,283,1277,1,
-73,2635,16,0,319,
-1,74,1358,1,1013,
-1363,1,76,2636,16,
-0,621,1,1834,2637,
-16,0,621,1,2337,
-2638,16,0,621,1,
-79,2639,16,0,621,
-1,1335,2640,16,0,
-621,1,299,2641,16,
-0,621,1,82,2642,
-16,0,319,1,1840,
-2643,16,0,319,1,
-1297,2644,16,0,621,
-1,85,2645,16,0,
-621,1,1341,2646,16,
-0,319,1,1261,2647,
-16,0,621,1,89,
-2648,16,0,621,1,
-1303,2649,16,0,319,
-1,509,2650,16,0,
-621,1,93,1423,1,
-322,2651,16,0,621,
-1,97,2652,16,0,
-621,1,2041,873,1,
-1555,2653,16,0,319,
-1,827,2654,16,0,
-319,1,102,2655,16,
-0,621,1,1860,926,
-1,1803,892,1,2364,
-932,1,107,2656,16,
-0,319,1,1114,1448,
-1,112,2657,16,0,
-621,1,1117,2658,16,
-0,621,1,352,1454,
-1,1873,940,1,118,
-1460,1,1123,2659,16,
-0,319,1,371,1470,
-1,515,2660,16,0,
-319,1,1377,2661,16,
-0,319,1,124,2662,
-16,0,621,1,1882,
-2663,16,0,319,1,
-377,1486,1,379,1491,
-1,380,1496,1,130,
-1519,1,346,2664,16,
-0,621,1,2075,2665,
-16,0,621,1,373,
-1514,1,387,2666,16,
-0,319,1,137,2667,
-16,0,621,1,143,
-2668,16,0,319,1,
-1901,2669,16,0,621,
-1,1048,1449,1,1153,
-2670,16,0,621,1,
-375,1481,1,151,2671,
-16,0,621,1,1407,
-2672,16,0,621,1,
-1659,2673,16,0,621,
-1,2413,2674,16,0,
-621,1,1159,2675,16,
-0,319,1,381,2676,
-16,0,621,1,157,
-2677,16,0,319,1,
-1413,2678,16,0,319,
-1,883,2679,16,0,
-319,1,1371,2680,16,
-0,621,1,328,1407,
-1,2105,919,1,2106,
-2681,16,0,621,1,
-166,2682,16,0,621,
-1,525,2683,16,0,
-621,1,1622,2684,16,
-0,621,1,406,2685,
-16,0,621,1,1574,
-904,1,172,1573,1,
-1931,965,1,412,2686,
-16,0,319,1,1933,
-2687,16,0,621,1,
-1876,2688,16,0,621,
-1,431,2689,16,0,
-621,1,1585,2690,16,
-0,621,1,182,2691,
-16,0,621,1,1628,
-2692,16,0,319,1,
-1189,2693,16,0,621,
-1,437,2694,16,0,
-319,1,1591,2695,16,
-0,319,1,188,1622,
-1,1695,2696,16,0,
-621,1,2198,2697,16,
-0,621,1,1195,2698,
-16,0,319,1,1449,
-2699,16,0,319,1,
-1701,2700,16,0,319,
-1,447,2701,16,0,
-621,1,199,2702,16,
-0,621,1,2459,986,
-1,1958,2703,16,0,
-621,1,2462,993,1,
-1657,998,1,205,2704,
-16,0,319,1,459,
-2705,16,0,621,1,
-462,2706,16,0,621,
-1,1665,2707,16,0,
-319,1,217,2708,16,
-0,621,1,2227,1012,
-1,942,1594,1,1225,
-2709,16,0,621,1,
-223,2710,16,0,319,
-1,1479,2711,16,0,
-621,1,1731,2712,16,
-0,621,1,477,1653,
-1,1231,2713,16,0,
-319,1,479,1663,1,
-480,1668,1,1485,2714,
-16,0,319,1,1737,
-2715,16,0,319,1,
-1989,1020,1,1990,2716,
-16,0,621,1,1443,
-2717,16,0,621,1,
-236,2718,16,0,621,
-1,2136,947,1,476,
-1647,1,242,2719,16,
-0,319,1,478,1686,
-1,1939,2720,16,0,
-319,1,1001,1691,1,
-1002,1696,1,1756,2721,
-16,0,621,1,26,
-2722,19,339,1,26,
-2723,5,84,1,2767,
-2724,16,0,337,1,
-1011,1207,1,1012,2725,
-16,0,337,1,1013,
-1363,1,262,1224,1,
-1267,2726,16,0,337,
-1,515,2727,16,0,
-761,1,1521,2728,16,
-0,337,1,525,1321,
-1,283,1277,1,2299,
-2729,16,0,337,1,
-42,2730,16,0,337,
-1,40,1282,1,44,
-1288,1,47,1289,1,
-1303,2731,16,0,337,
-1,1555,2732,16,0,
-337,1,50,1306,1,
-48,1295,1,49,1301,
-1,51,1311,1,63,
-1327,1,305,1316,1,
-66,1333,1,67,1338,
-1,68,1343,1,69,
-1348,1,70,1353,1,
-73,2733,16,0,337,
-1,74,1358,1,328,
-1407,1,1048,1449,1,
-82,2734,16,0,337,
-1,1840,2735,16,0,
-337,1,1591,2736,16,
-0,337,1,1341,2737,
-16,0,337,1,1096,
-1417,1,93,1423,1,
-352,1454,1,107,2738,
-16,0,337,1,1114,
-1448,1,118,1460,1,
-1123,2739,16,0,337,
-1,371,1470,1,1628,
-2740,16,0,337,1,
-375,1481,1,1882,2741,
-16,0,337,1,377,
-1486,1,379,1491,1,
-380,1496,1,883,2742,
-16,0,337,1,373,
-1514,1,130,1519,1,
-143,2743,16,0,337,
-1,387,2744,16,0,
-337,1,1159,2745,16,
-0,337,1,157,2746,
-16,0,337,1,1413,
-2747,16,0,337,1,
-1665,2748,16,0,337,
-1,412,2749,16,0,
-337,1,1377,2750,16,
-0,337,1,172,1573,
-1,1939,2751,16,0,
-337,1,437,2752,16,
-0,687,1,188,1622,
-1,942,1594,1,1195,
-2753,16,0,337,1,
-1449,2754,16,0,337,
-1,1701,2755,16,0,
-337,1,447,1615,1,
-205,2756,16,0,337,
-1,827,2757,16,0,
-337,1,223,2758,16,
-0,337,1,476,1647,
-1,477,1653,1,1231,
-2759,16,0,337,1,
-479,1663,1,480,1668,
-1,1485,2760,16,0,
-337,1,1737,2761,16,
-0,337,1,242,2762,
-16,0,337,1,478,
-1686,1,1001,1691,1,
-1002,1696,1,27,2763,
-19,695,1,27,2764,
-5,95,1,2761,2765,
-16,0,693,1,256,
-2766,16,0,693,1,
-1261,2767,16,0,693,
-1,509,2768,16,0,
-693,1,1515,2769,16,
-0,693,1,2021,823,
-1,1775,2770,16,0,
-693,1,2029,830,1,
-2030,836,1,2031,841,
-1,2032,846,1,2033,
-851,1,277,2771,16,
-0,693,1,2035,857,
-1,2037,862,1,2039,
-867,1,32,2772,16,
-0,693,1,2041,873,
-1,2293,2773,16,0,
-693,1,2043,879,1,
-2045,884,1,41,2774,
-16,0,693,1,1297,
-2775,16,0,693,1,
-43,2776,16,0,693,
-1,1803,892,1,1804,
-2777,16,0,693,1,
-299,2778,16,0,693,
-1,52,2779,16,0,
-693,1,2318,2780,16,
-0,693,1,62,2781,
-16,0,693,1,2075,
-2782,16,0,693,1,
-1574,904,1,71,2783,
-16,0,693,1,76,
-2784,16,0,693,1,
-1834,2785,16,0,693,
-1,2337,2786,16,0,
-693,1,79,2787,16,
-0,693,1,1335,2788,
-16,0,693,1,322,
-2789,16,0,693,1,
-85,2790,16,0,693,
-1,89,2791,16,0,
-693,1,346,2792,16,
-0,693,1,2105,919,
-1,2106,2793,16,0,
-693,1,97,2794,16,
-0,693,1,1860,926,
-1,2364,932,1,102,
-2795,16,0,693,1,
-112,2796,16,0,693,
-1,1117,2797,16,0,
-693,1,1873,940,1,
-1876,2798,16,0,693,
-1,124,2799,16,0,
-693,1,2136,947,1,
-381,2800,16,0,693,
-1,525,2801,16,0,
-693,1,137,2802,16,
-0,693,1,1901,2803,
-16,0,693,1,1153,
-2804,16,0,693,1,
-151,2805,16,0,693,
-1,1407,2806,16,0,
-693,1,1659,2807,16,
-0,693,1,2413,2808,
-16,0,693,1,406,
-2809,16,0,693,1,
-1371,2810,16,0,693,
-1,166,2811,16,0,
-693,1,1622,2812,16,
-0,693,1,1931,965,
-1,1933,2813,16,0,
-693,1,431,2814,16,
-0,693,1,1585,2815,
-16,0,693,1,182,
-2816,16,0,693,1,
-1189,2817,16,0,693,
-1,1443,2818,16,0,
-693,1,1695,2819,16,
-0,693,1,2198,2820,
-16,0,693,1,447,
-2821,16,0,693,1,
-2458,980,1,2459,986,
-1,1958,2822,16,0,
-693,1,2462,993,1,
-1657,998,1,2464,1003,
-1,199,2823,16,0,
-693,1,459,2824,16,
-0,693,1,462,2825,
-16,0,693,1,217,
-2826,16,0,693,1,
-2227,1012,1,1225,2827,
-16,0,693,1,1479,
-2828,16,0,693,1,
-1731,2829,16,0,693,
-1,1989,1020,1,1990,
-2830,16,0,693,1,
-236,2831,16,0,693,
-1,1756,2832,16,0,
-693,1,28,2833,19,
-722,1,28,2834,5,
-60,1,328,1407,1,
-223,1637,1,1096,1417,
-1,118,1460,1,883,
-1502,1,525,1321,1,
-1001,1691,1,130,1519,
-1,459,1905,1,1114,
-1448,1,352,1454,1,
-447,1615,1,464,1898,
-1,1011,1207,1,1013,
-1363,1,242,1681,1,
-143,1524,1,40,1282,
-1,41,1873,1,42,
-1877,1,479,1663,1,
-44,1288,1,481,1908,
-1,373,1514,1,47,
-1289,1,157,1547,1,
-49,1301,1,50,1306,
-1,48,1295,1,379,
-1491,1,380,1496,1,
-51,1311,1,476,1647,
-1,371,1470,1,478,
-1686,1,1048,1449,1,
-375,1481,1,172,1573,
-1,262,1224,1,283,
-1277,1,63,1327,1,
-67,1338,1,68,1343,
-1,69,1348,1,66,
-1333,1,461,2835,16,
-0,720,1,74,1358,
-1,377,1486,1,1002,
-1696,1,70,1353,1,
-188,1622,1,82,1385,
-1,305,1316,1,477,
-1653,1,827,1436,1,
-93,1423,1,480,1668,
-1,205,1627,1,942,
-1594,1,107,1443,1,
-29,2836,19,306,1,
-29,2837,5,84,1,
-2767,2838,16,0,304,
-1,1011,1207,1,1012,
-2839,16,0,304,1,
-1013,1363,1,262,1224,
-1,1267,2840,16,0,
-304,1,515,2841,16,
-0,304,1,1521,2842,
-16,0,304,1,525,
-1321,1,283,1277,1,
-2299,2843,16,0,304,
-1,42,2844,16,0,
-304,1,40,1282,1,
-44,1288,1,47,1289,
-1,1303,2845,16,0,
-304,1,1555,2846,16,
-0,304,1,50,1306,
-1,48,1295,1,49,
-1301,1,51,1311,1,
-63,1327,1,305,1316,
-1,66,1333,1,67,
-1338,1,68,1343,1,
-69,1348,1,70,1353,
-1,73,2847,16,0,
-304,1,74,1358,1,
-328,1407,1,1048,1449,
-1,82,2848,16,0,
-304,1,1840,2849,16,
-0,304,1,1591,2850,
-16,0,304,1,1341,
-2851,16,0,304,1,
-1096,1417,1,93,1423,
-1,352,1454,1,107,
-2852,16,0,304,1,
-1114,1448,1,118,1460,
-1,1123,2853,16,0,
-304,1,371,1470,1,
-1628,2854,16,0,304,
-1,375,1481,1,1882,
-2855,16,0,304,1,
-377,1486,1,379,1491,
-1,380,1496,1,883,
-2856,16,0,304,1,
-373,1514,1,130,1519,
-1,143,1524,1,387,
-2857,16,0,304,1,
-1159,2858,16,0,304,
-1,157,1547,1,1413,
-2859,16,0,304,1,
-1665,2860,16,0,304,
-1,412,2861,16,0,
-304,1,1377,2862,16,
-0,304,1,172,1573,
-1,1939,2863,16,0,
-304,1,437,2864,16,
-0,304,1,188,1622,
-1,942,1594,1,1195,
-2865,16,0,304,1,
-1449,2866,16,0,304,
-1,1701,2867,16,0,
-304,1,447,1615,1,
-205,2868,16,0,304,
-1,827,2869,16,0,
-304,1,223,2870,16,
-0,304,1,476,1647,
-1,477,1653,1,1231,
-2871,16,0,304,1,
-479,1663,1,480,1668,
-1,1485,2872,16,0,
-304,1,1737,2873,16,
-0,304,1,242,2874,
-16,0,304,1,478,
-1686,1,1001,1691,1,
-1002,1696,1,30,2875,
-19,290,1,30,2876,
-5,84,1,2767,2877,
-16,0,288,1,1011,
-1207,1,1012,2878,16,
-0,288,1,1013,1363,
-1,262,1224,1,1267,
-2879,16,0,288,1,
-515,2880,16,0,288,
-1,1521,2881,16,0,
-288,1,525,1321,1,
-283,1277,1,2299,2882,
-16,0,288,1,42,
-2883,16,0,288,1,
-40,1282,1,44,1288,
-1,47,1289,1,1303,
-2884,16,0,288,1,
-1555,2885,16,0,288,
-1,50,1306,1,48,
-1295,1,49,1301,1,
-51,1311,1,63,1327,
-1,305,1316,1,66,
-1333,1,67,1338,1,
-68,1343,1,69,1348,
-1,70,1353,1,73,
-2886,16,0,288,1,
-74,1358,1,328,1407,
-1,1048,1449,1,82,
-2887,16,0,288,1,
-1840,2888,16,0,288,
-1,1591,2889,16,0,
-288,1,1341,2890,16,
-0,288,1,1096,1417,
-1,93,1423,1,352,
-1454,1,107,2891,16,
-0,288,1,1114,1448,
-1,118,1460,1,1123,
-2892,16,0,288,1,
-371,1470,1,1628,2893,
-16,0,288,1,375,
-1481,1,1882,2894,16,
-0,288,1,377,1486,
-1,379,1491,1,380,
-1496,1,883,2895,16,
-0,288,1,373,1514,
-1,130,1519,1,143,
-1524,1,387,2896,16,
-0,288,1,1159,2897,
-16,0,288,1,157,
-1547,1,1413,2898,16,
-0,288,1,1665,2899,
-16,0,288,1,412,
-2900,16,0,288,1,
-1377,2901,16,0,288,
-1,172,1573,1,1939,
-2902,16,0,288,1,
-437,2903,16,0,288,
-1,188,1622,1,942,
-1594,1,1195,2904,16,
-0,288,1,1449,2905,
-16,0,288,1,1701,
-2906,16,0,288,1,
-447,1615,1,205,2907,
-16,0,288,1,827,
-2908,16,0,288,1,
-223,2909,16,0,288,
-1,476,1647,1,477,
-1653,1,1231,2910,16,
-0,288,1,479,1663,
-1,480,1668,1,1485,
-2911,16,0,288,1,
-1737,2912,16,0,288,
-1,242,2913,16,0,
-288,1,478,1686,1,
-1001,1691,1,1002,1696,
-1,31,2914,19,272,
-1,31,2915,5,84,
-1,2767,2916,16,0,
-270,1,1011,1207,1,
-1012,2917,16,0,270,
-1,1013,1363,1,262,
-1224,1,1267,2918,16,
-0,270,1,515,2919,
-16,0,270,1,1521,
-2920,16,0,270,1,
-525,1321,1,283,1277,
-1,2299,2921,16,0,
-270,1,42,2922,16,
-0,270,1,40,1282,
-1,44,1288,1,47,
-1289,1,1303,2923,16,
-0,270,1,1555,2924,
-16,0,270,1,50,
-1306,1,48,1295,1,
-49,1301,1,51,1311,
-1,63,1327,1,305,
-1316,1,66,1333,1,
-67,1338,1,68,1343,
-1,69,1348,1,70,
-1353,1,73,2925,16,
-0,270,1,74,1358,
-1,328,1407,1,1048,
-1449,1,82,2926,16,
-0,270,1,1840,2927,
-16,0,270,1,1591,
-2928,16,0,270,1,
-1341,2929,16,0,270,
-1,1096,1417,1,93,
-1423,1,352,1454,1,
-107,2930,16,0,270,
-1,1114,1448,1,118,
-1460,1,1123,2931,16,
-0,270,1,371,1470,
-1,1628,2932,16,0,
-270,1,375,1481,1,
-1882,2933,16,0,270,
-1,377,1486,1,379,
-1491,1,380,1496,1,
-883,2934,16,0,270,
-1,373,1514,1,130,
-1519,1,143,2935,16,
-0,270,1,387,2936,
-16,0,270,1,1159,
-2937,16,0,270,1,
-157,2938,16,0,270,
-1,1413,2939,16,0,
-270,1,1665,2940,16,
-0,270,1,412,2941,
-16,0,270,1,1377,
-2942,16,0,270,1,
-172,1573,1,1939,2943,
-16,0,270,1,437,
-2944,16,0,270,1,
-188,1622,1,942,1594,
-1,1195,2945,16,0,
-270,1,1449,2946,16,
-0,270,1,1701,2947,
-16,0,270,1,447,
-1615,1,205,2948,16,
-0,270,1,827,2949,
-16,0,270,1,223,
-2950,16,0,270,1,
-476,1647,1,477,1653,
-1,1231,2951,16,0,
-270,1,479,1663,1,
-480,1668,1,1485,2952,
-16,0,270,1,1737,
-2953,16,0,270,1,
-242,2954,16,0,270,
-1,478,1686,1,1001,
-1691,1,1002,1696,1,
-32,2955,19,264,1,
-32,2956,5,84,1,
-2767,2957,16,0,262,
-1,1011,1207,1,1012,
-2958,16,0,262,1,
-1013,1363,1,262,1224,
-1,1267,2959,16,0,
-262,1,515,2960,16,
-0,262,1,1521,2961,
-16,0,262,1,525,
-1321,1,283,1277,1,
-2299,2962,16,0,262,
-1,42,2963,16,0,
-262,1,40,1282,1,
-44,1288,1,47,1289,
-1,1303,2964,16,0,
-262,1,1555,2965,16,
-0,262,1,50,1306,
-1,48,1295,1,49,
-1301,1,51,1311,1,
-63,1327,1,305,1316,
-1,66,1333,1,67,
-1338,1,68,1343,1,
-69,1348,1,70,1353,
-1,73,2966,16,0,
-262,1,74,1358,1,
-328,1407,1,1048,1449,
-1,82,2967,16,0,
-262,1,1840,2968,16,
-0,262,1,1591,2969,
-16,0,262,1,1341,
-2970,16,0,262,1,
-1096,1417,1,93,1423,
-1,352,1454,1,107,
-2971,16,0,262,1,
-1114,1448,1,118,1460,
-1,1123,2972,16,0,
-262,1,371,1470,1,
-1628,2973,16,0,262,
-1,375,1481,1,1882,
-2974,16,0,262,1,
-377,1486,1,379,1491,
-1,380,1496,1,883,
-2975,16,0,262,1,
-373,1514,1,130,1519,
-1,143,2976,16,0,
-262,1,387,2977,16,
-0,262,1,1159,2978,
-16,0,262,1,157,
-2979,16,0,262,1,
-1413,2980,16,0,262,
-1,1665,2981,16,0,
-262,1,412,2982,16,
-0,262,1,1377,2983,
-16,0,262,1,172,
-1573,1,1939,2984,16,
-0,262,1,437,2985,
-16,0,262,1,188,
-1622,1,942,1594,1,
-1195,2986,16,0,262,
-1,1449,2987,16,0,
-262,1,1701,2988,16,
-0,262,1,447,1615,
-1,205,2989,16,0,
-262,1,827,2990,16,
-0,262,1,223,2991,
-16,0,262,1,476,
-1647,1,477,1653,1,
-1231,2992,16,0,262,
-1,479,1663,1,480,
-1668,1,1485,2993,16,
-0,262,1,1737,2994,
-16,0,262,1,242,
-2995,16,0,262,1,
-478,1686,1,1001,1691,
-1,1002,1696,1,33,
-2996,19,365,1,33,
-2997,5,84,1,2767,
-2998,16,0,363,1,
-1011,1207,1,1012,2999,
-16,0,363,1,1013,
-1363,1,262,1224,1,
-1267,3000,16,0,363,
-1,515,3001,16,0,
-363,1,1521,3002,16,
-0,363,1,525,1321,
-1,283,1277,1,2299,
-3003,16,0,363,1,
-42,3004,16,0,363,
-1,40,1282,1,44,
-1288,1,47,1289,1,
-1303,3005,16,0,363,
-1,1555,3006,16,0,
-363,1,50,1306,1,
-48,1295,1,49,1301,
-1,51,1311,1,63,
-1327,1,305,1316,1,
-66,1333,1,67,1338,
-1,68,1343,1,69,
-1348,1,70,1353,1,
-73,3007,16,0,363,
-1,74,1358,1,328,
-1407,1,1048,1449,1,
-82,3008,16,0,363,
-1,1840,3009,16,0,
-363,1,1591,3010,16,
-0,363,1,1341,3011,
-16,0,363,1,1096,
-1417,1,93,1423,1,
-352,1454,1,107,3012,
-16,0,363,1,1114,
-1448,1,118,1460,1,
-1123,3013,16,0,363,
-1,371,1470,1,1628,
-3014,16,0,363,1,
-375,1481,1,1882,3015,
-16,0,363,1,377,
-1486,1,379,1491,1,
-380,1496,1,883,3016,
-16,0,363,1,373,
-1514,1,130,1519,1,
-143,1524,1,387,3017,
-16,0,363,1,1159,
-3018,16,0,363,1,
-157,1547,1,1413,3019,
-16,0,363,1,1665,
-3020,16,0,363,1,
-412,3021,16,0,363,
-1,1377,3022,16,0,
-363,1,172,1573,1,
-1939,3023,16,0,363,
-1,437,3024,16,0,
-363,1,188,1622,1,
-942,1594,1,1195,3025,
-16,0,363,1,1449,
-3026,16,0,363,1,
-1701,3027,16,0,363,
-1,447,1615,1,205,
-3028,16,0,363,1,
-827,3029,16,0,363,
-1,223,3030,16,0,
-363,1,476,1647,1,
-477,1653,1,1231,3031,
-16,0,363,1,479,
-1663,1,480,1668,1,
-1485,3032,16,0,363,
-1,1737,3033,16,0,
-363,1,242,1681,1,
-478,1686,1,1001,1691,
-1,1002,1696,1,34,
-3034,19,352,1,34,
-3035,5,84,1,2767,
-3036,16,0,350,1,
-1011,1207,1,1012,3037,
-16,0,350,1,1013,
-1363,1,262,1224,1,
-1267,3038,16,0,350,
-1,515,3039,16,0,
-350,1,1521,3040,16,
-0,350,1,525,1321,
-1,283,1277,1,2299,
-3041,16,0,350,1,
-42,3042,16,0,350,
-1,40,1282,1,44,
-1288,1,47,1289,1,
-1303,3043,16,0,350,
-1,1555,3044,16,0,
-350,1,50,1306,1,
-48,1295,1,49,1301,
-1,51,1311,1,63,
-1327,1,305,1316,1,
-66,1333,1,67,1338,
-1,68,1343,1,69,
-1348,1,70,1353,1,
-73,3045,16,0,350,
-1,74,1358,1,328,
-1407,1,1048,1449,1,
-82,3046,16,0,350,
-1,1840,3047,16,0,
-350,1,1591,3048,16,
-0,350,1,1341,3049,
-16,0,350,1,1096,
-1417,1,93,1423,1,
-352,1454,1,107,3050,
-16,0,350,1,1114,
-1448,1,118,1460,1,
-1123,3051,16,0,350,
-1,371,1470,1,1628,
-3052,16,0,350,1,
-375,1481,1,1882,3053,
-16,0,350,1,377,
-1486,1,379,1491,1,
-380,1496,1,883,3054,
-16,0,350,1,373,
-1514,1,130,1519,1,
-143,1524,1,387,3055,
-16,0,350,1,1159,
-3056,16,0,350,1,
-157,1547,1,1413,3057,
-16,0,350,1,1665,
-3058,16,0,350,1,
-412,3059,16,0,350,
-1,1377,3060,16,0,
-350,1,172,1573,1,
-1939,3061,16,0,350,
-1,437,3062,16,0,
-350,1,188,1622,1,
-942,1594,1,1195,3063,
-16,0,350,1,1449,
-3064,16,0,350,1,
-1701,3065,16,0,350,
-1,447,1615,1,205,
-1627,1,827,3066,16,
-0,350,1,223,1637,
-1,476,1647,1,477,
-1653,1,1231,3067,16,
-0,350,1,479,1663,
-1,480,1668,1,1485,
-3068,16,0,350,1,
-1737,3069,16,0,350,
-1,242,1681,1,478,
-1686,1,1001,1691,1,
-1002,1696,1,35,3070,
-19,342,1,35,3071,
-5,84,1,2767,3072,
-16,0,340,1,1011,
-1207,1,1012,3073,16,
-0,340,1,1013,1363,
-1,262,1224,1,1267,
-3074,16,0,340,1,
-515,3075,16,0,340,
-1,1521,3076,16,0,
-340,1,525,1321,1,
-283,1277,1,2299,3077,
-16,0,340,1,42,
-3078,16,0,340,1,
-40,1282,1,44,1288,
-1,47,1289,1,1303,
-3079,16,0,340,1,
-1555,3080,16,0,340,
-1,50,1306,1,48,
-1295,1,49,1301,1,
-51,1311,1,63,1327,
-1,305,1316,1,66,
-1333,1,67,1338,1,
-68,1343,1,69,1348,
-1,70,1353,1,73,
-3081,16,0,340,1,
-74,1358,1,328,1407,
-1,1048,1449,1,82,
-3082,16,0,340,1,
-1840,3083,16,0,340,
-1,1591,3084,16,0,
-340,1,1341,3085,16,
-0,340,1,1096,1417,
-1,93,1423,1,352,
-1454,1,107,3086,16,
-0,340,1,1114,1448,
-1,118,1460,1,1123,
-3087,16,0,340,1,
-371,1470,1,1628,3088,
-16,0,340,1,375,
-1481,1,1882,3089,16,
-0,340,1,377,1486,
-1,379,1491,1,380,
-1496,1,883,3090,16,
-0,340,1,373,1514,
-1,130,1519,1,143,
-1524,1,387,3091,16,
-0,340,1,1159,3092,
-16,0,340,1,157,
-1547,1,1413,3093,16,
-0,340,1,1665,3094,
-16,0,340,1,412,
-3095,16,0,340,1,
-1377,3096,16,0,340,
-1,172,1573,1,1939,
-3097,16,0,340,1,
-437,3098,16,0,340,
-1,188,1622,1,942,
-1594,1,1195,3099,16,
-0,340,1,1449,3100,
-16,0,340,1,1701,
-3101,16,0,340,1,
-447,1615,1,205,1627,
-1,827,3102,16,0,
-340,1,223,3103,16,
-0,340,1,476,1647,
-1,477,1653,1,1231,
-3104,16,0,340,1,
-479,1663,1,480,1668,
-1,1485,3105,16,0,
-340,1,1737,3106,16,
-0,340,1,242,1681,
-1,478,1686,1,1001,
-1691,1,1002,1696,1,
-36,3107,19,233,1,
-36,3108,5,94,1,
-2761,3109,16,0,231,
-1,256,3110,16,0,
-231,1,1261,3111,16,
-0,231,1,509,3112,
-16,0,231,1,1515,
-3113,16,0,231,1,
-2021,823,1,1775,3114,
-16,0,231,1,2029,
-830,1,2030,836,1,
-2031,841,1,2032,846,
-1,2033,851,1,277,
-3115,16,0,231,1,
-2035,857,1,2037,862,
-1,2039,867,1,32,
-3116,16,0,231,1,
-2041,873,1,2293,3117,
-16,0,231,1,2043,
-879,1,2045,884,1,
-41,3118,16,0,231,
-1,1297,3119,16,0,
-231,1,43,3120,16,
-0,231,1,1803,892,
-1,1804,3121,16,0,
-231,1,299,3122,16,
-0,231,1,52,3123,
-16,0,231,1,2318,
-3124,16,0,231,1,
-2075,3125,16,0,231,
-1,1574,904,1,71,
-3126,16,0,231,1,
-76,3127,16,0,231,
-1,1834,3128,16,0,
-231,1,2337,3129,16,
-0,231,1,79,3130,
-16,0,231,1,1335,
-3131,16,0,231,1,
-322,3132,16,0,231,
-1,85,3133,16,0,
-231,1,89,3134,16,
-0,231,1,346,3135,
-16,0,231,1,2105,
-919,1,2106,3136,16,
-0,231,1,97,3137,
-16,0,231,1,1860,
-926,1,2364,932,1,
-102,3138,16,0,231,
-1,112,3139,16,0,
-231,1,1117,3140,16,
-0,231,1,1873,940,
-1,1876,3141,16,0,
-231,1,124,3142,16,
-0,231,1,2136,947,
-1,381,3143,16,0,
-231,1,525,3144,16,
-0,231,1,137,3145,
-16,0,231,1,1901,
-3146,16,0,231,1,
-1153,3147,16,0,231,
-1,151,3148,16,0,
-231,1,1407,3149,16,
-0,231,1,1659,3150,
-16,0,231,1,2413,
-3151,16,0,231,1,
-406,3152,16,0,231,
-1,1371,3153,16,0,
-231,1,166,3154,16,
-0,231,1,1622,3155,
-16,0,231,1,1931,
-965,1,1933,3156,16,
-0,231,1,431,3157,
-16,0,231,1,1585,
-3158,16,0,231,1,
-182,3159,16,0,231,
-1,1189,3160,16,0,
-231,1,1443,3161,16,
-0,231,1,1695,3162,
-16,0,231,1,2198,
-3163,16,0,231,1,
-447,3164,16,0,231,
-1,2458,980,1,2459,
-986,1,1958,3165,16,
-0,231,1,2462,993,
-1,1657,998,1,2464,
-1003,1,199,3166,16,
-0,231,1,459,3167,
-16,0,231,1,462,
-3168,16,0,231,1,
-217,3169,16,0,231,
-1,2227,1012,1,1225,
-3170,16,0,231,1,
-1479,3171,16,0,231,
-1,1731,3172,16,0,
-231,1,1989,1020,1,
-1990,3173,16,0,231,
-1,236,3174,16,0,
-231,1,1756,3175,16,
-0,231,1,37,3176,
-19,254,1,37,3177,
-5,94,1,2761,3178,
-16,0,252,1,256,
-3179,16,0,252,1,
-1261,3180,16,0,252,
-1,509,3181,16,0,
-252,1,1515,3182,16,
-0,252,1,2021,823,
-1,1775,3183,16,0,
-252,1,2029,830,1,
-2030,836,1,2031,841,
-1,2032,846,1,2033,
-851,1,277,3184,16,
-0,252,1,2035,857,
-1,2037,862,1,2039,
-867,1,32,3185,16,
-0,252,1,2041,873,
-1,2293,3186,16,0,
-252,1,2043,879,1,
-2045,884,1,41,3187,
-16,0,252,1,1297,
-3188,16,0,252,1,
-43,3189,16,0,252,
-1,1803,892,1,1804,
-3190,16,0,252,1,
-299,3191,16,0,252,
-1,52,3192,16,0,
-252,1,2318,3193,16,
-0,252,1,2075,3194,
-16,0,252,1,1574,
-904,1,71,3195,16,
-0,252,1,76,3196,
-16,0,252,1,1834,
-3197,16,0,252,1,
-2337,3198,16,0,252,
-1,79,3199,16,0,
-252,1,1335,3200,16,
-0,252,1,322,3201,
-16,0,252,1,85,
-3202,16,0,252,1,
-89,3203,16,0,252,
-1,346,3204,16,0,
-252,1,2105,919,1,
-2106,3205,16,0,252,
-1,97,3206,16,0,
-252,1,1860,926,1,
-2364,932,1,102,3207,
-16,0,252,1,112,
-3208,16,0,252,1,
-1117,3209,16,0,252,
-1,1873,940,1,1876,
-3210,16,0,252,1,
-124,3211,16,0,252,
-1,2136,947,1,381,
-3212,16,0,252,1,
-525,3213,16,0,252,
-1,137,3214,16,0,
-252,1,1901,3215,16,
-0,252,1,1153,3216,
-16,0,252,1,151,
-3217,16,0,252,1,
-1407,3218,16,0,252,
-1,1659,3219,16,0,
-252,1,2413,3220,16,
-0,252,1,406,3221,
-16,0,252,1,1371,
-3222,16,0,252,1,
-166,3223,16,0,252,
-1,1622,3224,16,0,
-252,1,1931,965,1,
-1933,3225,16,0,252,
-1,431,3226,16,0,
-252,1,1585,3227,16,
-0,252,1,182,3228,
-16,0,252,1,1189,
-3229,16,0,252,1,
-1443,3230,16,0,252,
-1,1695,3231,16,0,
-252,1,2198,3232,16,
-0,252,1,447,3233,
-16,0,252,1,2458,
-980,1,2459,986,1,
-1958,3234,16,0,252,
-1,2462,993,1,1657,
-998,1,2464,1003,1,
-199,3235,16,0,252,
-1,459,3236,16,0,
-252,1,462,3237,16,
-0,252,1,217,3238,
-16,0,252,1,2227,
-1012,1,1225,3239,16,
-0,252,1,1479,3240,
-16,0,252,1,1731,
-3241,16,0,252,1,
-1989,1020,1,1990,3242,
-16,0,252,1,236,
-3243,16,0,252,1,
-1756,3244,16,0,252,
-1,38,3245,19,251,
-1,38,3246,5,84,
-1,2767,3247,16,0,
-249,1,1011,1207,1,
-1012,3248,16,0,249,
-1,1013,1363,1,262,
-1224,1,1267,3249,16,
-0,249,1,515,3250,
-16,0,249,1,1521,
-3251,16,0,249,1,
-525,1321,1,283,1277,
-1,2299,3252,16,0,
-249,1,42,3253,16,
-0,249,1,40,1282,
-1,44,1288,1,47,
-1289,1,1303,3254,16,
-0,249,1,1555,3255,
-16,0,249,1,50,
-1306,1,48,1295,1,
-49,1301,1,51,1311,
-1,63,1327,1,305,
-1316,1,66,1333,1,
-67,1338,1,68,1343,
-1,69,1348,1,70,
-1353,1,73,3256,16,
-0,249,1,74,1358,
-1,328,1407,1,1048,
-1449,1,82,3257,16,
-0,249,1,1840,3258,
-16,0,249,1,1591,
-3259,16,0,249,1,
-1341,3260,16,0,249,
-1,1096,1417,1,93,
-1423,1,352,1454,1,
-107,3261,16,0,249,
-1,1114,1448,1,118,
-1460,1,1123,3262,16,
-0,249,1,371,1470,
-1,1628,3263,16,0,
-249,1,375,1481,1,
-1882,3264,16,0,249,
-1,377,1486,1,379,
-1491,1,380,1496,1,
-883,1502,1,373,1514,
-1,130,1519,1,143,
-1524,1,387,3265,16,
-0,249,1,1159,3266,
-16,0,249,1,157,
-1547,1,1413,3267,16,
-0,249,1,1665,3268,
-16,0,249,1,412,
-3269,16,0,249,1,
-1377,3270,16,0,249,
-1,172,1573,1,1939,
-3271,16,0,249,1,
-437,3272,16,0,249,
-1,188,1622,1,942,
-1594,1,1195,3273,16,
-0,249,1,1449,3274,
-16,0,249,1,1701,
-3275,16,0,249,1,
-447,1615,1,205,1627,
-1,827,1436,1,223,
-1637,1,476,1647,1,
-477,1653,1,1231,3276,
-16,0,249,1,479,
-1663,1,480,1668,1,
-1485,3277,16,0,249,
-1,1737,3278,16,0,
-249,1,242,1681,1,
-478,1686,1,1001,1691,
-1,1002,1696,1,39,
-3279,19,239,1,39,
-3280,5,84,1,2767,
-3281,16,0,237,1,
-1011,1207,1,1012,3282,
-16,0,237,1,1013,
-1363,1,262,1224,1,
-1267,3283,16,0,237,
-1,515,3284,16,0,
-237,1,1521,3285,16,
-0,237,1,525,1321,
-1,283,1277,1,2299,
-3286,16,0,237,1,
-42,3287,16,0,237,
-1,40,1282,1,44,
-1288,1,47,1289,1,
-1303,3288,16,0,237,
-1,1555,3289,16,0,
-237,1,50,1306,1,
-48,1295,1,49,1301,
-1,51,1311,1,63,
-1327,1,305,1316,1,
-66,1333,1,67,1338,
-1,68,1343,1,69,
-1348,1,70,1353,1,
-73,3290,16,0,237,
-1,74,1358,1,328,
-1407,1,1048,1449,1,
-82,3291,16,0,237,
-1,1840,3292,16,0,
-237,1,1591,3293,16,
-0,237,1,1341,3294,
-16,0,237,1,1096,
-1417,1,93,1423,1,
-352,1454,1,107,3295,
-16,0,237,1,1114,
-1448,1,118,1460,1,
-1123,3296,16,0,237,
-1,371,1470,1,1628,
-3297,16,0,237,1,
-375,1481,1,1882,3298,
-16,0,237,1,377,
-1486,1,379,1491,1,
-380,1496,1,883,1502,
-1,373,1514,1,130,
-1519,1,143,1524,1,
-387,3299,16,0,237,
-1,1159,3300,16,0,
-237,1,157,1547,1,
-1413,3301,16,0,237,
-1,1665,3302,16,0,
-237,1,412,3303,16,
-0,237,1,1377,3304,
-16,0,237,1,172,
-1573,1,1939,3305,16,
-0,237,1,437,3306,
-16,0,237,1,188,
-1622,1,942,1594,1,
-1195,3307,16,0,237,
-1,1449,3308,16,0,
-237,1,1701,3309,16,
-0,237,1,447,1615,
-1,205,1627,1,827,
-1436,1,223,1637,1,
-476,1647,1,477,1653,
-1,1231,3310,16,0,
-237,1,479,1663,1,
-480,1668,1,1485,3311,
-16,0,237,1,1737,
-3312,16,0,237,1,
-242,1681,1,478,1686,
-1,1001,1691,1,1002,
-1696,1,40,3313,19,
-227,1,40,3314,5,
-84,1,2767,3315,16,
-0,225,1,1011,1207,
-1,1012,3316,16,0,
-225,1,1013,1363,1,
-262,1224,1,1267,3317,
-16,0,225,1,515,
-3318,16,0,225,1,
-1521,3319,16,0,225,
-1,525,1321,1,283,
-1277,1,2299,3320,16,
-0,225,1,42,3321,
-16,0,225,1,40,
-1282,1,44,1288,1,
-47,1289,1,1303,3322,
-16,0,225,1,1555,
-3323,16,0,225,1,
-50,1306,1,48,1295,
-1,49,1301,1,51,
-1311,1,63,1327,1,
-305,1316,1,66,1333,
-1,67,1338,1,68,
-1343,1,69,1348,1,
-70,1353,1,73,3324,
-16,0,225,1,74,
-1358,1,328,1407,1,
-1048,1449,1,82,3325,
-16,0,225,1,1840,
-3326,16,0,225,1,
-1591,3327,16,0,225,
-1,1341,3328,16,0,
-225,1,1096,1417,1,
-93,1423,1,352,1454,
-1,107,3329,16,0,
-225,1,1114,1448,1,
-118,3330,16,0,225,
-1,1123,3331,16,0,
-225,1,371,1470,1,
-1628,3332,16,0,225,
-1,375,1481,1,1882,
-3333,16,0,225,1,
-377,1486,1,379,1491,
-1,380,1496,1,883,
-3334,16,0,225,1,
-373,1514,1,130,3335,
-16,0,225,1,143,
-3336,16,0,225,1,
-387,3337,16,0,225,
-1,1159,3338,16,0,
-225,1,157,3339,16,
-0,225,1,1413,3340,
-16,0,225,1,1665,
-3341,16,0,225,1,
-412,3342,16,0,225,
-1,1377,3343,16,0,
-225,1,172,3344,16,
-0,225,1,1939,3345,
-16,0,225,1,437,
-3346,16,0,225,1,
-188,3347,16,0,225,
-1,942,1594,1,1195,
-3348,16,0,225,1,
-1449,3349,16,0,225,
-1,1701,3350,16,0,
-225,1,447,1615,1,
-205,3351,16,0,225,
-1,827,3352,16,0,
-225,1,223,3353,16,
-0,225,1,476,1647,
-1,477,1653,1,1231,
-3354,16,0,225,1,
-479,1663,1,480,1668,
-1,1485,3355,16,0,
-225,1,1737,3356,16,
-0,225,1,242,3357,
-16,0,225,1,478,
-1686,1,1001,1691,1,
-1002,1696,1,41,3358,
-19,187,1,41,3359,
-5,84,1,2767,3360,
-16,0,185,1,1011,
-1207,1,1012,3361,16,
-0,185,1,1013,1363,
-1,262,1224,1,1267,
-3362,16,0,185,1,
-515,3363,16,0,185,
-1,1521,3364,16,0,
-185,1,525,1321,1,
-283,1277,1,2299,3365,
-16,0,185,1,42,
-3366,16,0,185,1,
-40,1282,1,44,1288,
-1,47,1289,1,1303,
-3367,16,0,185,1,
-1555,3368,16,0,185,
-1,50,1306,1,48,
-1295,1,49,1301,1,
-51,1311,1,63,1327,
-1,305,1316,1,66,
-1333,1,67,1338,1,
-68,1343,1,69,1348,
-1,70,1353,1,73,
-3369,16,0,185,1,
-74,1358,1,328,1407,
-1,1048,1449,1,82,
-3370,16,0,185,1,
-1840,3371,16,0,185,
-1,1591,3372,16,0,
-185,1,1341,3373,16,
-0,185,1,1096,1417,
-1,93,1423,1,352,
-1454,1,107,3374,16,
-0,185,1,1114,1448,
-1,118,3375,16,0,
-185,1,1123,3376,16,
-0,185,1,371,1470,
-1,1628,3377,16,0,
-185,1,375,1481,1,
-1882,3378,16,0,185,
-1,377,1486,1,379,
-1491,1,380,1496,1,
-883,3379,16,0,185,
-1,373,1514,1,130,
-3380,16,0,185,1,
-143,3381,16,0,185,
-1,387,3382,16,0,
-185,1,1159,3383,16,
-0,185,1,157,3384,
-16,0,185,1,1413,
-3385,16,0,185,1,
-1665,3386,16,0,185,
-1,412,3387,16,0,
-185,1,1377,3388,16,
-0,185,1,172,3389,
-16,0,185,1,1939,
-3390,16,0,185,1,
-437,3391,16,0,185,
-1,188,3392,16,0,
-185,1,942,1594,1,
-1195,3393,16,0,185,
-1,1449,3394,16,0,
-185,1,1701,3395,16,
-0,185,1,447,1615,
-1,205,3396,16,0,
-185,1,827,3397,16,
-0,185,1,223,3398,
-16,0,185,1,476,
-1647,1,477,1653,1,
-1231,3399,16,0,185,
-1,479,1663,1,480,
-1668,1,1485,3400,16,
-0,185,1,1737,3401,
-16,0,185,1,242,
-3402,16,0,185,1,
-478,1686,1,1001,1691,
-1,1002,1696,1,42,
-3403,19,427,1,42,
-3404,5,38,1,1901,
-3405,16,0,425,1,
-2075,3406,16,0,425,
-1,1860,926,1,1803,
-892,1,1804,3407,16,
-0,425,1,2413,3408,
-16,0,425,1,2198,
-3409,16,0,425,1,
-1873,940,1,1657,998,
-1,1989,1020,1,1990,
-3410,16,0,425,1,
-1775,3411,16,0,425,
-1,32,3412,16,0,
-425,1,2105,919,1,
-2106,3413,16,0,425,
-1,2364,932,1,2227,
-1012,1,2337,3414,16,
-0,425,1,2021,823,
-1,2458,980,1,2459,
-986,1,2462,993,1,
-2136,947,1,2464,1003,
-1,2029,830,1,2030,
-836,1,2031,841,1,
-2032,846,1,2033,851,
-1,2035,857,1,2037,
-862,1,2039,867,1,
-1931,965,1,2041,873,
-1,2043,879,1,2045,
-884,1,1574,904,1,
-1958,3415,16,0,425,
-1,43,3416,19,521,
-1,43,3417,5,25,
-1,2035,857,1,2037,
-862,1,2039,867,1,
-2041,873,1,2227,1012,
-1,2043,879,1,1657,
-998,1,1860,926,1,
-2136,947,1,2021,823,
-1,2459,986,1,1574,
-904,1,2105,3418,16,
-0,676,1,1931,965,
-1,1873,940,1,2031,
-841,1,1803,892,1,
-1989,3419,16,0,519,
-1,2464,1003,1,2029,
-830,1,2030,836,1,
-2364,932,1,2032,846,
-1,2033,851,1,2045,
-884,1,44,3420,19,
-285,1,44,3421,5,
-38,1,1901,3422,16,
-0,283,1,2075,3423,
-16,0,283,1,1860,
-926,1,1803,892,1,
-1804,3424,16,0,283,
-1,2413,3425,16,0,
-283,1,2198,3426,16,
-0,283,1,1873,940,
-1,1657,998,1,1989,
-1020,1,1990,3427,16,
-0,283,1,1775,3428,
-16,0,283,1,32,
-3429,16,0,283,1,
-2105,919,1,2106,3430,
-16,0,283,1,2364,
-932,1,2227,1012,1,
-2337,3431,16,0,283,
-1,2021,823,1,2458,
-980,1,2459,986,1,
-2462,993,1,2136,947,
-1,2464,1003,1,2029,
-830,1,2030,836,1,
-2031,841,1,2032,846,
-1,2033,851,1,2035,
-857,1,2037,862,1,
-2039,867,1,1931,965,
-1,2041,873,1,2043,
-879,1,2045,884,1,
-1574,904,1,1958,3432,
-16,0,283,1,45,
-3433,19,317,1,45,
-3434,5,39,1,1901,
-3435,16,0,346,1,
-2075,3436,16,0,346,
-1,1860,926,1,1803,
-892,1,1804,3437,16,
-0,346,1,2413,3438,
-16,0,346,1,2198,
-3439,16,0,346,1,
-1873,940,1,1657,998,
-1,1989,1020,1,1990,
-3440,16,0,346,1,
-1775,3441,16,0,346,
-1,32,3442,16,0,
-346,1,2105,919,1,
-2106,3443,16,0,346,
-1,2364,932,1,2227,
-1012,1,2337,3444,16,
-0,346,1,2021,823,
-1,2458,980,1,2459,
-986,1,2462,993,1,
-2136,947,1,2464,1003,
-1,2029,830,1,2030,
-836,1,2031,841,1,
-2032,846,1,2033,851,
-1,2035,857,1,2037,
-862,1,2039,867,1,
-1931,965,1,2041,873,
-1,2043,879,1,2045,
-884,1,1832,3445,16,
-0,315,1,1574,904,
-1,1958,3446,16,0,
-346,1,46,3447,19,
-775,1,46,3448,5,
-38,1,1901,3449,16,
-0,773,1,2075,3450,
-16,0,773,1,1860,
-926,1,1803,892,1,
-1804,3451,16,0,773,
-1,2413,3452,16,0,
-773,1,2198,3453,16,
-0,773,1,1873,940,
-1,1657,998,1,1989,
-1020,1,1990,3454,16,
-0,773,1,1775,3455,
-16,0,773,1,32,
-3456,16,0,773,1,
-2105,919,1,2106,3457,
-16,0,773,1,2364,
-932,1,2227,1012,1,
-2337,3458,16,0,773,
-1,2021,823,1,2458,
-980,1,2459,986,1,
-2462,993,1,2136,947,
-1,2464,1003,1,2029,
-830,1,2030,836,1,
-2031,841,1,2032,846,
-1,2033,851,1,2035,
-857,1,2037,862,1,
-2039,867,1,1931,965,
-1,2041,873,1,2043,
-879,1,2045,884,1,
-1574,904,1,1958,3459,
-16,0,773,1,47,
-3460,19,661,1,47,
-3461,5,19,1,0,
-3462,16,0,659,1,
-2739,3463,16,0,659,
-1,2816,3464,17,3465,
-15,3466,4,36,37,
-0,71,0,108,0,
-111,0,98,0,97,
-0,108,0,68,0,
-101,0,102,0,105,
-0,110,0,105,0,
+0,116,0,1,-1,
+1,5,2312,20,2313,
+4,68,75,0,101,
+0,121,0,73,0,
+110,0,116,0,73,
+0,110,0,116,0,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
 116,0,105,0,111,
-0,110,0,115,0,
-1,-1,1,5,3467,
-20,3468,4,38,71,
+0,110,0,76,0,
+105,0,115,0,116,
+0,95,0,49,0,
+1,211,1,3,1,
+6,1,5,2314,22,
+1,47,1,2517,2315,
+16,0,487,1,328,
+1425,1,1303,1430,1,
+1096,1694,1,93,1435,
+1,1550,1440,1,827,
+1448,1,2532,2316,16,
+0,628,1,1011,1224,
+1,107,1455,1,1114,
+1461,1,2542,1909,1,
+1871,2317,16,0,348,
+1,1370,1570,1,1478,
+1575,1,118,1473,1,
+1123,1478,1,371,1483,
+1,1377,1489,1,375,
+1494,1,1882,2318,16,
+0,363,1,377,1499,
+1,352,1467,1,379,
+1504,1,1341,1420,1,
+130,1532,1,2074,2319,
+16,0,641,1,373,
+1527,1,1012,2320,16,
+0,703,1,380,1509,
+1,143,1537,1,1152,
+1543,1,1406,1548,1,
+1159,1555,1,157,1560,
+1,1413,1565,1,883,
+1515,1,2512,1882,1,
+1296,1290,1,172,1586,
+1,1665,1591,1,2766,
+1934,1,1939,2321,16,
+0,482,1,1188,1596,
+1,1442,1601,1,188,
+1635,1,942,1607,1,
+1195,1613,1,1449,1618,
+1,1701,1623,1,447,
+1628,1,1094,2322,16,
+0,785,1,205,1640,
+1,2554,2323,17,2324,
+15,2325,4,60,37,
+0,86,0,101,0,
+99,0,116,0,111,
+0,114,0,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,76,0,105,0,
+115,0,116,0,1,
+-1,1,5,2326,20,
+2327,4,62,86,0,
+101,0,99,0,116,
+0,111,0,114,0,
+65,0,114,0,103,
+0,117,0,109,0,
+101,0,110,0,116,
+0,68,0,101,0,
+99,0,108,0,97,
+0,114,0,97,0,
+116,0,105,0,111,
+0,110,0,76,0,
+105,0,115,0,116,
+0,95,0,49,0,
+1,208,1,3,1,
+2,1,1,2328,22,
+1,44,1,2467,1938,
+1,464,1944,1,2197,
+2329,16,0,772,1,
+1224,1645,1,223,1650,
+1,1730,1655,1,2571,
+2330,16,0,673,1,
+477,1666,1,1231,1671,
+1,479,1676,1,480,
+1681,1,1485,1687,1,
+459,1949,1,476,1660,
+1,242,1700,1,478,
+1705,1,481,1951,1,
+1001,1710,1,2508,1956,
+1,18,2331,19,564,
+1,18,2332,5,84,
+1,1011,1224,1,1012,
+2333,16,0,562,1,
+1013,1381,1,262,1241,
+1,1267,2334,16,0,
+562,1,515,2335,16,
+0,562,1,1521,2336,
+16,0,562,1,525,
+1339,1,2788,2337,16,
+0,562,1,283,1295,
+1,2299,2338,16,0,
+562,1,42,2339,16,
+0,562,1,40,1300,
+1,44,1306,1,47,
+1307,1,1303,2340,16,
+0,562,1,1555,2341,
+16,0,562,1,50,
+1324,1,48,1313,1,
+49,1319,1,51,1329,
+1,63,1345,1,305,
+1334,1,66,1351,1,
+67,1356,1,68,1361,
+1,69,1366,1,70,
+1371,1,73,2342,16,
+0,562,1,74,1376,
+1,328,1425,1,1048,
+2343,16,0,562,1,
+82,2344,16,0,562,
+1,1840,2345,16,0,
+562,1,1591,2346,16,
+0,562,1,1341,2347,
+16,0,562,1,1096,
+1694,1,93,1435,1,
+352,1467,1,107,2348,
+16,0,562,1,1114,
+1461,1,118,2349,16,
+0,562,1,1123,2350,
+16,0,562,1,371,
+1483,1,1628,2351,16,
+0,562,1,375,1494,
+1,1882,2352,16,0,
+562,1,377,1499,1,
+379,1504,1,380,1509,
+1,883,2353,16,0,
+562,1,373,1527,1,
+130,2354,16,0,562,
+1,143,2355,16,0,
+562,1,387,2356,16,
+0,562,1,1159,2357,
+16,0,562,1,157,
+2358,16,0,562,1,
+1413,2359,16,0,562,
+1,1665,2360,16,0,
+562,1,412,2361,16,
+0,562,1,1377,2362,
+16,0,562,1,172,
+2363,16,0,562,1,
+1939,2364,16,0,562,
+1,437,2365,16,0,
+562,1,188,2366,16,
+0,562,1,942,2367,
+16,0,562,1,1195,
+2368,16,0,562,1,
+1449,2369,16,0,562,
+1,1701,2370,16,0,
+562,1,447,1628,1,
+205,2371,16,0,562,
+1,827,2372,16,0,
+562,1,223,2373,16,
+0,562,1,476,1660,
+1,477,1666,1,1231,
+2374,16,0,562,1,
+479,1676,1,480,1681,
+1,1485,2375,16,0,
+562,1,1737,2376,16,
+0,562,1,242,2377,
+16,0,562,1,478,
+1705,1,1001,1710,1,
+1002,1715,1,19,2378,
+19,254,1,19,2379,
+5,176,1,256,2380,
+16,0,252,1,1261,
+2381,16,0,252,1,
+1011,1224,1,1012,2382,
+16,0,521,1,2458,
+998,1,262,1241,1,
+1267,2383,16,0,521,
+1,2021,840,1,1521,
+2384,16,0,521,1,
+1775,2385,16,0,252,
+1,2029,847,1,2030,
+853,1,2031,858,1,
+2032,863,1,2033,868,
+1,277,2386,16,0,
+252,1,2788,2387,16,
+0,521,1,2037,879,
+1,2039,884,1,32,
+2388,16,0,252,1,
+2464,1021,1,2293,2389,
+16,0,252,1,2043,
+896,1,2045,901,1,
+2299,2390,16,0,521,
+1,41,2391,16,0,
+252,1,42,2392,16,
+0,521,1,40,1300,
+1,44,1306,1,43,
+2393,16,0,252,1,
+1804,2394,16,0,252,
+1,48,1313,1,49,
+1319,1,47,1307,1,
+51,1329,1,52,2395,
+16,0,252,1,50,
+1324,1,305,1334,1,
+1096,1694,1,1515,2396,
+16,0,252,1,2318,
+2397,16,0,252,1,
+283,1295,1,63,1345,
+1,66,1351,1,67,
+1356,1,68,1361,1,
+69,1366,1,70,1371,
+1,71,2398,16,0,
+252,1,73,2399,16,
+0,521,1,74,1376,
+1,1013,1381,1,76,
+2400,16,0,252,1,
+1834,2401,16,0,252,
+1,2337,2402,16,0,
+252,1,79,2403,16,
+0,252,1,1335,2404,
+16,0,252,1,299,
+2405,16,0,252,1,
+82,2406,16,0,521,
+1,1840,2407,16,0,
+521,1,1297,2408,16,
+0,252,1,85,2409,
+16,0,252,1,1341,
+2410,16,0,521,1,
+89,2411,16,0,252,
+1,1303,2412,16,0,
+521,1,2035,874,1,
+93,1435,1,322,2413,
+16,0,252,1,97,
+2414,16,0,252,1,
+2041,890,1,1555,2415,
+16,0,521,1,827,
+2416,16,0,521,1,
+102,2417,16,0,252,
+1,1860,943,1,1803,
+909,1,2364,949,1,
+107,2418,16,0,521,
+1,509,2419,16,0,
+252,1,1114,1461,1,
+112,2420,16,0,252,
+1,1117,2421,16,0,
+252,1,352,1467,1,
+1873,958,1,118,2422,
+16,0,521,1,1123,
+2423,16,0,521,1,
+371,1483,1,515,2424,
+16,0,521,1,1377,
+2425,16,0,521,1,
+124,2426,16,0,252,
+1,1882,2427,16,0,
+521,1,377,1499,1,
+379,1504,1,380,1509,
+1,130,2428,16,0,
+521,1,346,2429,16,
+0,252,1,2075,2430,
+16,0,252,1,373,
+1527,1,387,2431,16,
+0,521,1,137,2432,
+16,0,252,1,143,
+2433,16,0,521,1,
+1901,2434,16,0,252,
+1,1048,2435,16,0,
+521,1,1153,2436,16,
+0,252,1,375,1494,
+1,151,2437,16,0,
+252,1,1407,2438,16,
+0,252,1,1659,2439,
+16,0,252,1,2413,
+2440,16,0,252,1,
+1159,2441,16,0,521,
+1,381,2442,16,0,
+252,1,157,2443,16,
+0,521,1,1413,2444,
+16,0,521,1,883,
+2445,16,0,521,1,
+1371,2446,16,0,252,
+1,328,1425,1,2105,
+936,1,2106,2447,16,
+0,252,1,166,2448,
+16,0,252,1,525,
+2449,16,0,252,1,
+1622,2450,16,0,252,
+1,406,2451,16,0,
+252,1,1574,921,1,
+172,2452,16,0,521,
+1,1931,983,1,412,
+2453,16,0,521,1,
+1933,2454,16,0,252,
+1,1876,2455,16,0,
+252,1,431,2456,16,
+0,252,1,1585,2457,
+16,0,252,1,182,
+2458,16,0,252,1,
+1628,2459,16,0,521,
+1,1189,2460,16,0,
+252,1,437,2461,16,
+0,521,1,1591,2462,
+16,0,521,1,188,
+2463,16,0,521,1,
+1695,2464,16,0,252,
+1,2198,2465,16,0,
+252,1,1195,2466,16,
+0,521,1,1449,2467,
+16,0,521,1,1701,
+2468,16,0,521,1,
+447,2469,16,0,252,
+1,2782,2470,16,0,
+252,1,199,2471,16,
+0,252,1,2459,1004,
+1,1958,2472,16,0,
+252,1,2462,1011,1,
+1657,1016,1,205,2473,
+16,0,521,1,459,
+2474,16,0,252,1,
+462,2475,16,0,252,
+1,1665,2476,16,0,
+521,1,217,2477,16,
+0,252,1,2227,1030,
+1,942,2478,16,0,
+521,1,1225,2479,16,
+0,252,1,223,2480,
+16,0,521,1,1479,
+2481,16,0,252,1,
+1731,2482,16,0,252,
+1,477,1666,1,1231,
+2483,16,0,521,1,
+479,1676,1,480,1681,
+1,1485,2484,16,0,
+521,1,1737,2485,16,
+0,521,1,1989,1038,
+1,1990,2486,16,0,
+252,1,1443,2487,16,
+0,252,1,236,2488,
+16,0,252,1,2136,
+965,1,476,1660,1,
+242,2489,16,0,521,
+1,478,1705,1,1939,
+2490,16,0,521,1,
+1001,1710,1,1002,1715,
+1,1756,2491,16,0,
+252,1,20,2492,19,
+496,1,20,2493,5,
+84,1,1011,1224,1,
+1012,2494,16,0,494,
+1,1013,1381,1,262,
+1241,1,1267,2495,16,
+0,494,1,515,2496,
+16,0,494,1,1521,
+2497,16,0,494,1,
+525,1339,1,2788,2498,
+16,0,494,1,283,
+1295,1,2299,2499,16,
+0,494,1,42,2500,
+16,0,494,1,40,
+1300,1,44,1306,1,
+47,1307,1,1303,2501,
+16,0,494,1,1555,
+2502,16,0,494,1,
+50,1324,1,48,1313,
+1,49,1319,1,51,
+1329,1,63,1345,1,
+305,1334,1,66,1351,
+1,67,1356,1,68,
+1361,1,69,1366,1,
+70,1371,1,73,2503,
+16,0,494,1,74,
+1376,1,328,2504,16,
+0,494,1,1048,2505,
+16,0,494,1,82,
+2506,16,0,494,1,
+1840,2507,16,0,494,
+1,1591,2508,16,0,
+494,1,1341,2509,16,
+0,494,1,1096,1694,
+1,93,1435,1,352,
+2510,16,0,494,1,
+107,2511,16,0,494,
+1,1114,1461,1,118,
+2512,16,0,494,1,
+1123,2513,16,0,494,
+1,371,1483,1,1628,
+2514,16,0,494,1,
+375,1494,1,1882,2515,
+16,0,494,1,377,
+1499,1,379,1504,1,
+380,1509,1,883,2516,
+16,0,494,1,373,
+1527,1,130,2517,16,
+0,494,1,143,2518,
+16,0,494,1,387,
+2519,16,0,494,1,
+1159,2520,16,0,494,
+1,157,2521,16,0,
+494,1,1413,2522,16,
+0,494,1,1665,2523,
+16,0,494,1,412,
+2524,16,0,494,1,
+1377,2525,16,0,494,
+1,172,2526,16,0,
+494,1,1939,2527,16,
+0,494,1,437,2528,
+16,0,494,1,188,
+2529,16,0,494,1,
+942,2530,16,0,494,
+1,1195,2531,16,0,
+494,1,1449,2532,16,
+0,494,1,1701,2533,
+16,0,494,1,447,
+1628,1,205,2534,16,
+0,494,1,827,2535,
+16,0,494,1,223,
+2536,16,0,494,1,
+476,1660,1,477,1666,
+1,1231,2537,16,0,
+494,1,479,1676,1,
+480,1681,1,1485,2538,
+16,0,494,1,1737,
+2539,16,0,494,1,
+242,2540,16,0,494,
+1,478,1705,1,1001,
+1710,1,1002,1715,1,
+21,2541,19,468,1,
+21,2542,5,84,1,
+1011,1224,1,1012,2543,
+16,0,466,1,1013,
+1381,1,262,1241,1,
+1267,2544,16,0,466,
+1,515,2545,16,0,
+466,1,1521,2546,16,
+0,466,1,525,1339,
+1,2788,2547,16,0,
+466,1,283,1295,1,
+2299,2548,16,0,466,
+1,42,2549,16,0,
+466,1,40,1300,1,
+44,1306,1,47,1307,
+1,1303,2550,16,0,
+466,1,1555,2551,16,
+0,466,1,50,1324,
+1,48,1313,1,49,
+1319,1,51,1329,1,
+63,1345,1,305,1334,
+1,66,1351,1,67,
+1356,1,68,1361,1,
+69,1366,1,70,1371,
+1,73,2552,16,0,
+466,1,74,1376,1,
+328,2553,16,0,466,
+1,1048,2554,16,0,
+466,1,82,2555,16,
+0,466,1,1840,2556,
+16,0,466,1,1591,
+2557,16,0,466,1,
+1341,2558,16,0,466,
+1,1096,1694,1,93,
+1435,1,352,2559,16,
+0,466,1,107,2560,
+16,0,466,1,1114,
+1461,1,118,2561,16,
+0,466,1,1123,2562,
+16,0,466,1,371,
+1483,1,1628,2563,16,
+0,466,1,375,1494,
+1,1882,2564,16,0,
+466,1,377,1499,1,
+379,1504,1,380,1509,
+1,883,2565,16,0,
+466,1,373,1527,1,
+130,2566,16,0,466,
+1,143,2567,16,0,
+466,1,387,2568,16,
+0,466,1,1159,2569,
+16,0,466,1,157,
+2570,16,0,466,1,
+1413,2571,16,0,466,
+1,1665,2572,16,0,
+466,1,412,2573,16,
+0,466,1,1377,2574,
+16,0,466,1,172,
+2575,16,0,466,1,
+1939,2576,16,0,466,
+1,437,2577,16,0,
+466,1,188,2578,16,
+0,466,1,942,2579,
+16,0,466,1,1195,
+2580,16,0,466,1,
+1449,2581,16,0,466,
+1,1701,2582,16,0,
+466,1,447,1628,1,
+205,2583,16,0,466,
+1,827,2584,16,0,
+466,1,223,2585,16,
+0,466,1,476,1660,
+1,477,1666,1,1231,
+2586,16,0,466,1,
+479,1676,1,480,1681,
+1,1485,2587,16,0,
+466,1,1737,2588,16,
+0,466,1,242,2589,
+16,0,466,1,478,
+1705,1,1001,1710,1,
+1002,1715,1,22,2590,
+19,419,1,22,2591,
+5,84,1,1011,1224,
+1,1012,2592,16,0,
+417,1,1013,1381,1,
+262,1241,1,1267,2593,
+16,0,417,1,515,
+2594,16,0,417,1,
+1521,2595,16,0,417,
+1,525,1339,1,2788,
+2596,16,0,417,1,
+283,1295,1,2299,2597,
+16,0,417,1,42,
+2598,16,0,417,1,
+40,1300,1,44,1306,
+1,47,1307,1,1303,
+2599,16,0,417,1,
+1555,2600,16,0,417,
+1,50,1324,1,48,
+1313,1,49,1319,1,
+51,1329,1,63,1345,
+1,305,1334,1,66,
+1351,1,67,1356,1,
+68,1361,1,69,1366,
+1,70,1371,1,73,
+2601,16,0,417,1,
+74,1376,1,328,2602,
+16,0,417,1,1048,
+2603,16,0,417,1,
+82,2604,16,0,417,
+1,1840,2605,16,0,
+417,1,1591,2606,16,
+0,417,1,1341,2607,
+16,0,417,1,1096,
+1694,1,93,1435,1,
+352,2608,16,0,417,
+1,107,2609,16,0,
+417,1,1114,1461,1,
+118,2610,16,0,417,
+1,1123,2611,16,0,
+417,1,371,1483,1,
+1628,2612,16,0,417,
+1,375,1494,1,1882,
+2613,16,0,417,1,
+377,1499,1,379,1504,
+1,380,1509,1,883,
+2614,16,0,417,1,
+373,1527,1,130,2615,
+16,0,417,1,143,
+2616,16,0,417,1,
+387,2617,16,0,417,
+1,1159,2618,16,0,
+417,1,157,2619,16,
+0,417,1,1413,2620,
+16,0,417,1,1665,
+2621,16,0,417,1,
+412,2622,16,0,417,
+1,1377,2623,16,0,
+417,1,172,2624,16,
+0,417,1,1939,2625,
+16,0,417,1,437,
+2626,16,0,417,1,
+188,2627,16,0,417,
+1,942,2628,16,0,
+417,1,1195,2629,16,
+0,417,1,1449,2630,
+16,0,417,1,1701,
+2631,16,0,417,1,
+447,1628,1,205,2632,
+16,0,417,1,827,
+2633,16,0,417,1,
+223,2634,16,0,417,
+1,476,1660,1,477,
+1666,1,1231,2635,16,
+0,417,1,479,1676,
+1,480,1681,1,1485,
+2636,16,0,417,1,
+1737,2637,16,0,417,
+1,242,2638,16,0,
+417,1,478,1705,1,
+1001,1710,1,1002,1715,
+1,23,2639,19,582,
+1,23,2640,5,38,
+1,1901,2641,16,0,
+580,1,2075,2642,16,
+0,580,1,1860,943,
+1,1803,909,1,1804,
+2643,16,0,580,1,
+2413,2644,16,0,580,
+1,2198,2645,16,0,
+580,1,1873,958,1,
+1657,1016,1,1989,1038,
+1,1990,2646,16,0,
+580,1,1775,2647,16,
+0,580,1,32,2648,
+16,0,580,1,2105,
+936,1,2106,2649,16,
+0,580,1,2364,949,
+1,2227,1030,1,2337,
+2650,16,0,580,1,
+2021,840,1,2458,998,
+1,2459,1004,1,2462,
+1011,1,2136,965,1,
+2464,1021,1,2029,847,
+1,2030,853,1,2031,
+858,1,2032,863,1,
+2033,868,1,2035,874,
+1,2037,879,1,2039,
+884,1,1931,983,1,
+2041,890,1,2043,896,
+1,2045,901,1,1574,
+921,1,1958,2651,16,
+0,580,1,24,2652,
+19,196,1,24,2653,
+5,5,1,44,2654,
+16,0,194,1,377,
+2655,16,0,618,1,
+40,2656,16,0,796,
+1,63,2657,16,0,
+222,1,373,2658,16,
+0,614,1,25,2659,
+19,324,1,25,2660,
+5,177,1,256,2661,
+16,0,623,1,1261,
+2662,16,0,623,1,
+1011,1224,1,1012,2663,
+16,0,322,1,2458,
+998,1,262,1241,1,
+1267,2664,16,0,322,
+1,2021,840,1,1521,
+2665,16,0,322,1,
+1775,2666,16,0,623,
+1,2029,847,1,2030,
+853,1,2031,858,1,
+2032,863,1,2033,868,
+1,277,2667,16,0,
+623,1,2788,2668,16,
+0,322,1,2037,879,
+1,2039,884,1,32,
+2669,16,0,623,1,
+2464,1021,1,2293,2670,
+16,0,623,1,2043,
+896,1,2045,901,1,
+2299,2671,16,0,322,
+1,41,2672,16,0,
+623,1,42,2673,16,
+0,322,1,40,1300,
+1,44,1306,1,43,
+2674,16,0,623,1,
+1804,2675,16,0,623,
+1,48,1313,1,49,
+1319,1,47,1307,1,
+51,1329,1,52,2676,
+16,0,623,1,50,
+1324,1,305,1334,1,
+1096,1694,1,1515,2677,
+16,0,623,1,2318,
+2678,16,0,623,1,
+62,2679,16,0,623,
+1,63,1345,1,66,
+1351,1,67,1356,1,
+68,1361,1,69,1366,
+1,70,1371,1,71,
+2680,16,0,623,1,
+283,1295,1,73,2681,
+16,0,322,1,74,
+1376,1,1013,1381,1,
+76,2682,16,0,623,
+1,1834,2683,16,0,
+623,1,2337,2684,16,
+0,623,1,79,2685,
+16,0,623,1,1335,
+2686,16,0,623,1,
+299,2687,16,0,623,
+1,82,2688,16,0,
+322,1,1840,2689,16,
+0,322,1,1297,2690,
+16,0,623,1,85,
+2691,16,0,623,1,
+1341,2692,16,0,322,
+1,89,2693,16,0,
+623,1,1303,2694,16,
+0,322,1,2035,874,
+1,93,1435,1,322,
+2695,16,0,623,1,
+97,2696,16,0,623,
+1,2041,890,1,1555,
+2697,16,0,322,1,
+827,2698,16,0,322,
+1,102,2699,16,0,
+623,1,1860,943,1,
+1803,909,1,2364,949,
+1,107,2700,16,0,
+322,1,509,2701,16,
+0,623,1,1114,1461,
+1,112,2702,16,0,
+623,1,1117,2703,16,
+0,623,1,352,1467,
+1,1873,958,1,118,
+1473,1,1123,2704,16,
+0,322,1,371,1483,
+1,515,2705,16,0,
+322,1,1377,2706,16,
+0,322,1,124,2707,
+16,0,623,1,1882,
+2708,16,0,322,1,
+377,1499,1,379,1504,
+1,380,1509,1,130,
+1532,1,346,2709,16,
+0,623,1,2075,2710,
+16,0,623,1,373,
+1527,1,387,2711,16,
+0,322,1,137,2712,
+16,0,623,1,143,
+2713,16,0,322,1,
+1901,2714,16,0,623,
+1,1048,1462,1,1153,
+2715,16,0,623,1,
+375,1494,1,151,2716,
+16,0,623,1,1407,
+2717,16,0,623,1,
+1659,2718,16,0,623,
+1,2413,2719,16,0,
+623,1,1159,2720,16,
+0,322,1,381,2721,
+16,0,623,1,157,
+2722,16,0,322,1,
+1413,2723,16,0,322,
+1,883,2724,16,0,
+322,1,1371,2725,16,
+0,623,1,328,1425,
+1,2105,936,1,2106,
+2726,16,0,623,1,
+166,2727,16,0,623,
+1,525,2728,16,0,
+623,1,1622,2729,16,
+0,623,1,406,2730,
+16,0,623,1,1574,
+921,1,172,1586,1,
+1931,983,1,412,2731,
+16,0,322,1,1933,
+2732,16,0,623,1,
+1876,2733,16,0,623,
+1,431,2734,16,0,
+623,1,1585,2735,16,
+0,623,1,182,2736,
+16,0,623,1,1628,
+2737,16,0,322,1,
+1189,2738,16,0,623,
+1,437,2739,16,0,
+322,1,1591,2740,16,
+0,322,1,188,1635,
+1,1695,2741,16,0,
+623,1,2198,2742,16,
+0,623,1,1195,2743,
+16,0,322,1,1449,
+2744,16,0,322,1,
+1701,2745,16,0,322,
+1,447,2746,16,0,
+623,1,2782,2747,16,
+0,623,1,199,2748,
+16,0,623,1,2459,
+1004,1,1958,2749,16,
+0,623,1,2462,1011,
+1,1657,1016,1,205,
+2750,16,0,322,1,
+459,2751,16,0,623,
+1,462,2752,16,0,
+623,1,1665,2753,16,
+0,322,1,217,2754,
+16,0,623,1,2227,
+1030,1,942,1607,1,
+1225,2755,16,0,623,
+1,223,2756,16,0,
+322,1,1479,2757,16,
+0,623,1,1731,2758,
+16,0,623,1,477,
+1666,1,1231,2759,16,
+0,322,1,479,1676,
+1,480,1681,1,1485,
+2760,16,0,322,1,
+1737,2761,16,0,322,
+1,1989,1038,1,1990,
+2762,16,0,623,1,
+1443,2763,16,0,623,
+1,236,2764,16,0,
+623,1,2136,965,1,
+476,1660,1,242,2765,
+16,0,322,1,478,
+1705,1,1939,2766,16,
+0,322,1,1001,1710,
+1,1002,1715,1,1756,
+2767,16,0,623,1,
+26,2768,19,343,1,
+26,2769,5,84,1,
+1011,1224,1,1012,2770,
+16,0,341,1,1013,
+1381,1,262,1241,1,
+1267,2771,16,0,341,
+1,515,2772,16,0,
+770,1,1521,2773,16,
+0,341,1,525,1339,
+1,2788,2774,16,0,
+341,1,283,1295,1,
+2299,2775,16,0,341,
+1,42,2776,16,0,
+341,1,40,1300,1,
+44,1306,1,47,1307,
+1,1303,2777,16,0,
+341,1,1555,2778,16,
+0,341,1,50,1324,
+1,48,1313,1,49,
+1319,1,51,1329,1,
+63,1345,1,305,1334,
+1,66,1351,1,67,
+1356,1,68,1361,1,
+69,1366,1,70,1371,
+1,73,2779,16,0,
+341,1,74,1376,1,
+328,1425,1,1048,1462,
+1,82,2780,16,0,
+341,1,1840,2781,16,
+0,341,1,1591,2782,
+16,0,341,1,1341,
+2783,16,0,341,1,
+1096,1694,1,93,1435,
+1,352,1467,1,107,
+2784,16,0,341,1,
+1114,1461,1,118,1473,
+1,1123,2785,16,0,
+341,1,371,1483,1,
+1628,2786,16,0,341,
+1,375,1494,1,1882,
+2787,16,0,341,1,
+377,1499,1,379,1504,
+1,380,1509,1,883,
+2788,16,0,341,1,
+373,1527,1,130,1532,
+1,143,2789,16,0,
+341,1,387,2790,16,
+0,341,1,1159,2791,
+16,0,341,1,157,
+2792,16,0,341,1,
+1413,2793,16,0,341,
+1,1665,2794,16,0,
+341,1,412,2795,16,
+0,341,1,1377,2796,
+16,0,341,1,172,
+1586,1,1939,2797,16,
+0,341,1,437,2798,
+16,0,694,1,188,
+1635,1,942,1607,1,
+1195,2799,16,0,341,
+1,1449,2800,16,0,
+341,1,1701,2801,16,
+0,341,1,447,1628,
+1,205,2802,16,0,
+341,1,827,2803,16,
+0,341,1,223,2804,
+16,0,341,1,476,
+1660,1,477,1666,1,
+1231,2805,16,0,341,
+1,479,1676,1,480,
+1681,1,1485,2806,16,
+0,341,1,1737,2807,
+16,0,341,1,242,
+2808,16,0,341,1,
+478,1705,1,1001,1710,
+1,1002,1715,1,27,
+2809,19,706,1,27,
+2810,5,95,1,256,
+2811,16,0,704,1,
+1261,2812,16,0,704,
+1,509,2813,16,0,
+704,1,1515,2814,16,
+0,704,1,2021,840,
+1,1775,2815,16,0,
+704,1,2029,847,1,
+2030,853,1,2031,858,
+1,2032,863,1,2033,
+868,1,277,2816,16,
+0,704,1,2035,874,
+1,2037,879,1,2039,
+884,1,32,2817,16,
+0,704,1,2041,890,
+1,2293,2818,16,0,
+704,1,2043,896,1,
+2045,901,1,41,2819,
+16,0,704,1,1297,
+2820,16,0,704,1,
+43,2821,16,0,704,
+1,1803,909,1,1804,
+2822,16,0,704,1,
+299,2823,16,0,704,
+1,52,2824,16,0,
+704,1,2318,2825,16,
+0,704,1,62,2826,
+16,0,704,1,2075,
+2827,16,0,704,1,
+1574,921,1,71,2828,
+16,0,704,1,76,
+2829,16,0,704,1,
+1834,2830,16,0,704,
+1,2337,2831,16,0,
+704,1,79,2832,16,
+0,704,1,1335,2833,
+16,0,704,1,322,
+2834,16,0,704,1,
+85,2835,16,0,704,
+1,89,2836,16,0,
+704,1,346,2837,16,
+0,704,1,2105,936,
+1,2106,2838,16,0,
+704,1,97,2839,16,
+0,704,1,1860,943,
+1,2364,949,1,102,
+2840,16,0,704,1,
+2782,2841,16,0,704,
+1,112,2842,16,0,
+704,1,1117,2843,16,
+0,704,1,1873,958,
+1,1876,2844,16,0,
+704,1,124,2845,16,
+0,704,1,2136,965,
+1,381,2846,16,0,
+704,1,525,2847,16,
+0,704,1,137,2848,
+16,0,704,1,1901,
+2849,16,0,704,1,
+1153,2850,16,0,704,
+1,151,2851,16,0,
+704,1,1407,2852,16,
+0,704,1,1659,2853,
+16,0,704,1,2413,
+2854,16,0,704,1,
+406,2855,16,0,704,
+1,1371,2856,16,0,
+704,1,166,2857,16,
+0,704,1,1622,2858,
+16,0,704,1,1931,
+983,1,1933,2859,16,
+0,704,1,431,2860,
+16,0,704,1,1585,
+2861,16,0,704,1,
+182,2862,16,0,704,
+1,1189,2863,16,0,
+704,1,1443,2864,16,
+0,704,1,1695,2865,
+16,0,704,1,2198,
+2866,16,0,704,1,
+447,2867,16,0,704,
+1,2458,998,1,2459,
+1004,1,1958,2868,16,
+0,704,1,2462,1011,
+1,1657,1016,1,2464,
+1021,1,199,2869,16,
+0,704,1,459,2870,
+16,0,704,1,462,
+2871,16,0,704,1,
+217,2872,16,0,704,
+1,2227,1030,1,1225,
+2873,16,0,704,1,
+1479,2874,16,0,704,
+1,1731,2875,16,0,
+704,1,1989,1038,1,
+1990,2876,16,0,704,
+1,236,2877,16,0,
+704,1,1756,2878,16,
+0,704,1,28,2879,
+19,734,1,28,2880,
+5,60,1,328,1425,
+1,223,1650,1,1096,
+1694,1,118,1473,1,
+883,1515,1,525,1339,
+1,1001,1710,1,130,
+1532,1,459,1949,1,
+1114,1461,1,352,1467,
+1,447,1628,1,464,
+1944,1,1011,1224,1,
+1013,1381,1,242,1700,
+1,143,1537,1,40,
+1300,1,41,1916,1,
+42,1920,1,479,1676,
+1,44,1306,1,481,
+1951,1,373,1527,1,
+47,1307,1,157,1560,
+1,49,1319,1,50,
+1324,1,48,1313,1,
+379,1504,1,380,1509,
+1,51,1329,1,476,
+1660,1,371,1483,1,
+478,1705,1,1048,1462,
+1,375,1494,1,172,
+1586,1,262,1241,1,
+283,1295,1,63,1345,
+1,67,1356,1,68,
+1361,1,69,1366,1,
+66,1351,1,461,2881,
+16,0,732,1,74,
+1376,1,377,1499,1,
+1002,1715,1,70,1371,
+1,188,1635,1,82,
+1403,1,305,1334,1,
+477,1666,1,827,1448,
+1,93,1435,1,480,
+1681,1,205,1640,1,
+942,1607,1,107,1455,
+1,29,2882,19,312,
+1,29,2883,5,84,
+1,1011,1224,1,1012,
+2884,16,0,310,1,
+1013,1381,1,262,1241,
+1,1267,2885,16,0,
+310,1,515,2886,16,
+0,310,1,1521,2887,
+16,0,310,1,525,
+1339,1,2788,2888,16,
+0,310,1,283,1295,
+1,2299,2889,16,0,
+310,1,42,2890,16,
+0,310,1,40,1300,
+1,44,1306,1,47,
+1307,1,1303,2891,16,
+0,310,1,1555,2892,
+16,0,310,1,50,
+1324,1,48,1313,1,
+49,1319,1,51,1329,
+1,63,1345,1,305,
+1334,1,66,1351,1,
+67,1356,1,68,1361,
+1,69,1366,1,70,
+1371,1,73,2893,16,
+0,310,1,74,1376,
+1,328,1425,1,1048,
+1462,1,82,2894,16,
+0,310,1,1840,2895,
+16,0,310,1,1591,
+2896,16,0,310,1,
+1341,2897,16,0,310,
+1,1096,1694,1,93,
+1435,1,352,1467,1,
+107,2898,16,0,310,
+1,1114,1461,1,118,
+1473,1,1123,2899,16,
+0,310,1,371,1483,
+1,1628,2900,16,0,
+310,1,375,1494,1,
+1882,2901,16,0,310,
+1,377,1499,1,379,
+1504,1,380,1509,1,
+883,2902,16,0,310,
+1,373,1527,1,130,
+1532,1,143,1537,1,
+387,2903,16,0,310,
+1,1159,2904,16,0,
+310,1,157,1560,1,
+1413,2905,16,0,310,
+1,1665,2906,16,0,
+310,1,412,2907,16,
+0,310,1,1377,2908,
+16,0,310,1,172,
+1586,1,1939,2909,16,
+0,310,1,437,2910,
+16,0,310,1,188,
+1635,1,942,1607,1,
+1195,2911,16,0,310,
+1,1449,2912,16,0,
+310,1,1701,2913,16,
+0,310,1,447,1628,
+1,205,2914,16,0,
+310,1,827,2915,16,
+0,310,1,223,2916,
+16,0,310,1,476,
+1660,1,477,1666,1,
+1231,2917,16,0,310,
+1,479,1676,1,480,
+1681,1,1485,2918,16,
+0,310,1,1737,2919,
+16,0,310,1,242,
+2920,16,0,310,1,
+478,1705,1,1001,1710,
+1,1002,1715,1,30,
+2921,19,296,1,30,
+2922,5,84,1,1011,
+1224,1,1012,2923,16,
+0,294,1,1013,1381,
+1,262,1241,1,1267,
+2924,16,0,294,1,
+515,2925,16,0,294,
+1,1521,2926,16,0,
+294,1,525,1339,1,
+2788,2927,16,0,294,
+1,283,1295,1,2299,
+2928,16,0,294,1,
+42,2929,16,0,294,
+1,40,1300,1,44,
+1306,1,47,1307,1,
+1303,2930,16,0,294,
+1,1555,2931,16,0,
+294,1,50,1324,1,
+48,1313,1,49,1319,
+1,51,1329,1,63,
+1345,1,305,1334,1,
+66,1351,1,67,1356,
+1,68,1361,1,69,
+1366,1,70,1371,1,
+73,2932,16,0,294,
+1,74,1376,1,328,
+1425,1,1048,1462,1,
+82,2933,16,0,294,
+1,1840,2934,16,0,
+294,1,1591,2935,16,
+0,294,1,1341,2936,
+16,0,294,1,1096,
+1694,1,93,1435,1,
+352,1467,1,107,2937,
+16,0,294,1,1114,
+1461,1,118,1473,1,
+1123,2938,16,0,294,
+1,371,1483,1,1628,
+2939,16,0,294,1,
+375,1494,1,1882,2940,
+16,0,294,1,377,
+1499,1,379,1504,1,
+380,1509,1,883,2941,
+16,0,294,1,373,
+1527,1,130,1532,1,
+143,1537,1,387,2942,
+16,0,294,1,1159,
+2943,16,0,294,1,
+157,1560,1,1413,2944,
+16,0,294,1,1665,
+2945,16,0,294,1,
+412,2946,16,0,294,
+1,1377,2947,16,0,
+294,1,172,1586,1,
+1939,2948,16,0,294,
+1,437,2949,16,0,
+294,1,188,1635,1,
+942,1607,1,1195,2950,
+16,0,294,1,1449,
+2951,16,0,294,1,
+1701,2952,16,0,294,
+1,447,1628,1,205,
+2953,16,0,294,1,
+827,2954,16,0,294,
+1,223,2955,16,0,
+294,1,476,1660,1,
+477,1666,1,1231,2956,
+16,0,294,1,479,
+1676,1,480,1681,1,
+1485,2957,16,0,294,
+1,1737,2958,16,0,
+294,1,242,2959,16,
+0,294,1,478,1705,
+1,1001,1710,1,1002,
+1715,1,31,2960,19,
+281,1,31,2961,5,
+84,1,1011,1224,1,
+1012,2962,16,0,279,
+1,1013,1381,1,262,
+1241,1,1267,2963,16,
+0,279,1,515,2964,
+16,0,279,1,1521,
+2965,16,0,279,1,
+525,1339,1,2788,2966,
+16,0,279,1,283,
+1295,1,2299,2967,16,
+0,279,1,42,2968,
+16,0,279,1,40,
+1300,1,44,1306,1,
+47,1307,1,1303,2969,
+16,0,279,1,1555,
+2970,16,0,279,1,
+50,1324,1,48,1313,
+1,49,1319,1,51,
+1329,1,63,1345,1,
+305,1334,1,66,1351,
+1,67,1356,1,68,
+1361,1,69,1366,1,
+70,1371,1,73,2971,
+16,0,279,1,74,
+1376,1,328,1425,1,
+1048,1462,1,82,2972,
+16,0,279,1,1840,
+2973,16,0,279,1,
+1591,2974,16,0,279,
+1,1341,2975,16,0,
+279,1,1096,1694,1,
+93,1435,1,352,1467,
+1,107,2976,16,0,
+279,1,1114,1461,1,
+118,1473,1,1123,2977,
+16,0,279,1,371,
+1483,1,1628,2978,16,
+0,279,1,375,1494,
+1,1882,2979,16,0,
+279,1,377,1499,1,
+379,1504,1,380,1509,
+1,883,2980,16,0,
+279,1,373,1527,1,
+130,1532,1,143,2981,
+16,0,279,1,387,
+2982,16,0,279,1,
+1159,2983,16,0,279,
+1,157,2984,16,0,
+279,1,1413,2985,16,
+0,279,1,1665,2986,
+16,0,279,1,412,
+2987,16,0,279,1,
+1377,2988,16,0,279,
+1,172,1586,1,1939,
+2989,16,0,279,1,
+437,2990,16,0,279,
+1,188,1635,1,942,
+1607,1,1195,2991,16,
+0,279,1,1449,2992,
+16,0,279,1,1701,
+2993,16,0,279,1,
+447,1628,1,205,2994,
+16,0,279,1,827,
+2995,16,0,279,1,
+223,2996,16,0,279,
+1,476,1660,1,477,
+1666,1,1231,2997,16,
+0,279,1,479,1676,
+1,480,1681,1,1485,
+2998,16,0,279,1,
+1737,2999,16,0,279,
+1,242,3000,16,0,
+279,1,478,1705,1,
+1001,1710,1,1002,1715,
+1,32,3001,19,273,
+1,32,3002,5,84,
+1,1011,1224,1,1012,
+3003,16,0,271,1,
+1013,1381,1,262,1241,
+1,1267,3004,16,0,
+271,1,515,3005,16,
+0,271,1,1521,3006,
+16,0,271,1,525,
+1339,1,2788,3007,16,
+0,271,1,283,1295,
+1,2299,3008,16,0,
+271,1,42,3009,16,
+0,271,1,40,1300,
+1,44,1306,1,47,
+1307,1,1303,3010,16,
+0,271,1,1555,3011,
+16,0,271,1,50,
+1324,1,48,1313,1,
+49,1319,1,51,1329,
+1,63,1345,1,305,
+1334,1,66,1351,1,
+67,1356,1,68,1361,
+1,69,1366,1,70,
+1371,1,73,3012,16,
+0,271,1,74,1376,
+1,328,1425,1,1048,
+1462,1,82,3013,16,
+0,271,1,1840,3014,
+16,0,271,1,1591,
+3015,16,0,271,1,
+1341,3016,16,0,271,
+1,1096,1694,1,93,
+1435,1,352,1467,1,
+107,3017,16,0,271,
+1,1114,1461,1,118,
+1473,1,1123,3018,16,
+0,271,1,371,1483,
+1,1628,3019,16,0,
+271,1,375,1494,1,
+1882,3020,16,0,271,
+1,377,1499,1,379,
+1504,1,380,1509,1,
+883,3021,16,0,271,
+1,373,1527,1,130,
+1532,1,143,3022,16,
+0,271,1,387,3023,
+16,0,271,1,1159,
+3024,16,0,271,1,
+157,3025,16,0,271,
+1,1413,3026,16,0,
+271,1,1665,3027,16,
+0,271,1,412,3028,
+16,0,271,1,1377,
+3029,16,0,271,1,
+172,1586,1,1939,3030,
+16,0,271,1,437,
+3031,16,0,271,1,
+188,1635,1,942,1607,
+1,1195,3032,16,0,
+271,1,1449,3033,16,
+0,271,1,1701,3034,
+16,0,271,1,447,
+1628,1,205,3035,16,
+0,271,1,827,3036,
+16,0,271,1,223,
+3037,16,0,271,1,
+476,1660,1,477,1666,
+1,1231,3038,16,0,
+271,1,479,1676,1,
+480,1681,1,1485,3039,
+16,0,271,1,1737,
+3040,16,0,271,1,
+242,3041,16,0,271,
+1,478,1705,1,1001,
+1710,1,1002,1715,1,
+33,3042,19,370,1,
+33,3043,5,84,1,
+1011,1224,1,1012,3044,
+16,0,368,1,1013,
+1381,1,262,1241,1,
+1267,3045,16,0,368,
+1,515,3046,16,0,
+368,1,1521,3047,16,
+0,368,1,525,1339,
+1,2788,3048,16,0,
+368,1,283,1295,1,
+2299,3049,16,0,368,
+1,42,3050,16,0,
+368,1,40,1300,1,
+44,1306,1,47,1307,
+1,1303,3051,16,0,
+368,1,1555,3052,16,
+0,368,1,50,1324,
+1,48,1313,1,49,
+1319,1,51,1329,1,
+63,1345,1,305,1334,
+1,66,1351,1,67,
+1356,1,68,1361,1,
+69,1366,1,70,1371,
+1,73,3053,16,0,
+368,1,74,1376,1,
+328,1425,1,1048,1462,
+1,82,3054,16,0,
+368,1,1840,3055,16,
+0,368,1,1591,3056,
+16,0,368,1,1341,
+3057,16,0,368,1,
+1096,1694,1,93,1435,
+1,352,1467,1,107,
+3058,16,0,368,1,
+1114,1461,1,118,1473,
+1,1123,3059,16,0,
+368,1,371,1483,1,
+1628,3060,16,0,368,
+1,375,1494,1,1882,
+3061,16,0,368,1,
+377,1499,1,379,1504,
+1,380,1509,1,883,
+3062,16,0,368,1,
+373,1527,1,130,1532,
+1,143,1537,1,387,
+3063,16,0,368,1,
+1159,3064,16,0,368,
+1,157,1560,1,1413,
+3065,16,0,368,1,
+1665,3066,16,0,368,
+1,412,3067,16,0,
+368,1,1377,3068,16,
+0,368,1,172,1586,
+1,1939,3069,16,0,
+368,1,437,3070,16,
+0,368,1,188,1635,
+1,942,1607,1,1195,
+3071,16,0,368,1,
+1449,3072,16,0,368,
+1,1701,3073,16,0,
+368,1,447,1628,1,
+205,3074,16,0,368,
+1,827,3075,16,0,
+368,1,223,3076,16,
+0,368,1,476,1660,
+1,477,1666,1,1231,
+3077,16,0,368,1,
+479,1676,1,480,1681,
+1,1485,3078,16,0,
+368,1,1737,3079,16,
+0,368,1,242,1700,
+1,478,1705,1,1001,
+1710,1,1002,1715,1,
+34,3080,19,358,1,
+34,3081,5,84,1,
+1011,1224,1,1012,3082,
+16,0,356,1,1013,
+1381,1,262,1241,1,
+1267,3083,16,0,356,
+1,515,3084,16,0,
+356,1,1521,3085,16,
+0,356,1,525,1339,
+1,2788,3086,16,0,
+356,1,283,1295,1,
+2299,3087,16,0,356,
+1,42,3088,16,0,
+356,1,40,1300,1,
+44,1306,1,47,1307,
+1,1303,3089,16,0,
+356,1,1555,3090,16,
+0,356,1,50,1324,
+1,48,1313,1,49,
+1319,1,51,1329,1,
+63,1345,1,305,1334,
+1,66,1351,1,67,
+1356,1,68,1361,1,
+69,1366,1,70,1371,
+1,73,3091,16,0,
+356,1,74,1376,1,
+328,1425,1,1048,1462,
+1,82,3092,16,0,
+356,1,1840,3093,16,
+0,356,1,1591,3094,
+16,0,356,1,1341,
+3095,16,0,356,1,
+1096,1694,1,93,1435,
+1,352,1467,1,107,
+3096,16,0,356,1,
+1114,1461,1,118,1473,
+1,1123,3097,16,0,
+356,1,371,1483,1,
+1628,3098,16,0,356,
+1,375,1494,1,1882,
+3099,16,0,356,1,
+377,1499,1,379,1504,
+1,380,1509,1,883,
+3100,16,0,356,1,
+373,1527,1,130,1532,
+1,143,1537,1,387,
+3101,16,0,356,1,
+1159,3102,16,0,356,
+1,157,1560,1,1413,
+3103,16,0,356,1,
+1665,3104,16,0,356,
+1,412,3105,16,0,
+356,1,1377,3106,16,
+0,356,1,172,1586,
+1,1939,3107,16,0,
+356,1,437,3108,16,
+0,356,1,188,1635,
+1,942,1607,1,1195,
+3109,16,0,356,1,
+1449,3110,16,0,356,
+1,1701,3111,16,0,
+356,1,447,1628,1,
+205,1640,1,827,3112,
+16,0,356,1,223,
+1650,1,476,1660,1,
+477,1666,1,1231,3113,
+16,0,356,1,479,
+1676,1,480,1681,1,
+1485,3114,16,0,356,
+1,1737,3115,16,0,
+356,1,242,1700,1,
+478,1705,1,1001,1710,
+1,1002,1715,1,35,
+3116,19,346,1,35,
+3117,5,84,1,1011,
+1224,1,1012,3118,16,
+0,344,1,1013,1381,
+1,262,1241,1,1267,
+3119,16,0,344,1,
+515,3120,16,0,344,
+1,1521,3121,16,0,
+344,1,525,1339,1,
+2788,3122,16,0,344,
+1,283,1295,1,2299,
+3123,16,0,344,1,
+42,3124,16,0,344,
+1,40,1300,1,44,
+1306,1,47,1307,1,
+1303,3125,16,0,344,
+1,1555,3126,16,0,
+344,1,50,1324,1,
+48,1313,1,49,1319,
+1,51,1329,1,63,
+1345,1,305,1334,1,
+66,1351,1,67,1356,
+1,68,1361,1,69,
+1366,1,70,1371,1,
+73,3127,16,0,344,
+1,74,1376,1,328,
+1425,1,1048,1462,1,
+82,3128,16,0,344,
+1,1840,3129,16,0,
+344,1,1591,3130,16,
+0,344,1,1341,3131,
+16,0,344,1,1096,
+1694,1,93,1435,1,
+352,1467,1,107,3132,
+16,0,344,1,1114,
+1461,1,118,1473,1,
+1123,3133,16,0,344,
+1,371,1483,1,1628,
+3134,16,0,344,1,
+375,1494,1,1882,3135,
+16,0,344,1,377,
+1499,1,379,1504,1,
+380,1509,1,883,3136,
+16,0,344,1,373,
+1527,1,130,1532,1,
+143,1537,1,387,3137,
+16,0,344,1,1159,
+3138,16,0,344,1,
+157,1560,1,1413,3139,
+16,0,344,1,1665,
+3140,16,0,344,1,
+412,3141,16,0,344,
+1,1377,3142,16,0,
+344,1,172,1586,1,
+1939,3143,16,0,344,
+1,437,3144,16,0,
+344,1,188,1635,1,
+942,1607,1,1195,3145,
+16,0,344,1,1449,
+3146,16,0,344,1,
+1701,3147,16,0,344,
+1,447,1628,1,205,
+1640,1,827,3148,16,
+0,344,1,223,3149,
+16,0,344,1,476,
+1660,1,477,1666,1,
+1231,3150,16,0,344,
+1,479,1676,1,480,
+1681,1,1485,3151,16,
+0,344,1,1737,3152,
+16,0,344,1,242,
+1700,1,478,1705,1,
+1001,1710,1,1002,1715,
+1,36,3153,19,242,
+1,36,3154,5,94,
+1,256,3155,16,0,
+240,1,1261,3156,16,
+0,240,1,509,3157,
+16,0,240,1,1515,
+3158,16,0,240,1,
+2021,840,1,1775,3159,
+16,0,240,1,2029,
+847,1,2030,853,1,
+2031,858,1,2032,863,
+1,2033,868,1,277,
+3160,16,0,240,1,
+2035,874,1,2037,879,
+1,2039,884,1,32,
+3161,16,0,240,1,
+2041,890,1,2293,3162,
+16,0,240,1,2043,
+896,1,2045,901,1,
+41,3163,16,0,240,
+1,1297,3164,16,0,
+240,1,43,3165,16,
+0,240,1,1803,909,
+1,1804,3166,16,0,
+240,1,299,3167,16,
+0,240,1,52,3168,
+16,0,240,1,2318,
+3169,16,0,240,1,
+2075,3170,16,0,240,
+1,1574,921,1,71,
+3171,16,0,240,1,
+76,3172,16,0,240,
+1,1834,3173,16,0,
+240,1,2337,3174,16,
+0,240,1,79,3175,
+16,0,240,1,1335,
+3176,16,0,240,1,
+322,3177,16,0,240,
+1,85,3178,16,0,
+240,1,89,3179,16,
+0,240,1,346,3180,
+16,0,240,1,2105,
+936,1,2106,3181,16,
+0,240,1,97,3182,
+16,0,240,1,1860,
+943,1,2364,949,1,
+102,3183,16,0,240,
+1,2782,3184,16,0,
+240,1,112,3185,16,
+0,240,1,1117,3186,
+16,0,240,1,1873,
+958,1,1876,3187,16,
+0,240,1,124,3188,
+16,0,240,1,2136,
+965,1,381,3189,16,
+0,240,1,525,3190,
+16,0,240,1,137,
+3191,16,0,240,1,
+1901,3192,16,0,240,
+1,1153,3193,16,0,
+240,1,151,3194,16,
+0,240,1,1407,3195,
+16,0,240,1,1659,
+3196,16,0,240,1,
+2413,3197,16,0,240,
+1,406,3198,16,0,
+240,1,1371,3199,16,
+0,240,1,166,3200,
+16,0,240,1,1622,
+3201,16,0,240,1,
+1931,983,1,1933,3202,
+16,0,240,1,431,
+3203,16,0,240,1,
+1585,3204,16,0,240,
+1,182,3205,16,0,
+240,1,1189,3206,16,
+0,240,1,1443,3207,
+16,0,240,1,1695,
+3208,16,0,240,1,
+2198,3209,16,0,240,
+1,447,3210,16,0,
+240,1,2458,998,1,
+2459,1004,1,1958,3211,
+16,0,240,1,2462,
+1011,1,1657,1016,1,
+2464,1021,1,199,3212,
+16,0,240,1,459,
+3213,16,0,240,1,
+462,3214,16,0,240,
+1,217,3215,16,0,
+240,1,2227,1030,1,
+1225,3216,16,0,240,
+1,1479,3217,16,0,
+240,1,1731,3218,16,
+0,240,1,1989,1038,
+1,1990,3219,16,0,
+240,1,236,3220,16,
+0,240,1,1756,3221,
+16,0,240,1,37,
+3222,19,263,1,37,
+3223,5,94,1,256,
+3224,16,0,261,1,
+1261,3225,16,0,261,
+1,509,3226,16,0,
+261,1,1515,3227,16,
+0,261,1,2021,840,
+1,1775,3228,16,0,
+261,1,2029,847,1,
+2030,853,1,2031,858,
+1,2032,863,1,2033,
+868,1,277,3229,16,
+0,261,1,2035,874,
+1,2037,879,1,2039,
+884,1,32,3230,16,
+0,261,1,2041,890,
+1,2293,3231,16,0,
+261,1,2043,896,1,
+2045,901,1,41,3232,
+16,0,261,1,1297,
+3233,16,0,261,1,
+43,3234,16,0,261,
+1,1803,909,1,1804,
+3235,16,0,261,1,
+299,3236,16,0,261,
+1,52,3237,16,0,
+261,1,2318,3238,16,
+0,261,1,2075,3239,
+16,0,261,1,1574,
+921,1,71,3240,16,
+0,261,1,76,3241,
+16,0,261,1,1834,
+3242,16,0,261,1,
+2337,3243,16,0,261,
+1,79,3244,16,0,
+261,1,1335,3245,16,
+0,261,1,322,3246,
+16,0,261,1,85,
+3247,16,0,261,1,
+89,3248,16,0,261,
+1,346,3249,16,0,
+261,1,2105,936,1,
+2106,3250,16,0,261,
+1,97,3251,16,0,
+261,1,1860,943,1,
+2364,949,1,102,3252,
+16,0,261,1,2782,
+3253,16,0,261,1,
+112,3254,16,0,261,
+1,1117,3255,16,0,
+261,1,1873,958,1,
+1876,3256,16,0,261,
+1,124,3257,16,0,
+261,1,2136,965,1,
+381,3258,16,0,261,
+1,525,3259,16,0,
+261,1,137,3260,16,
+0,261,1,1901,3261,
+16,0,261,1,1153,
+3262,16,0,261,1,
+151,3263,16,0,261,
+1,1407,3264,16,0,
+261,1,1659,3265,16,
+0,261,1,2413,3266,
+16,0,261,1,406,
+3267,16,0,261,1,
+1371,3268,16,0,261,
+1,166,3269,16,0,
+261,1,1622,3270,16,
+0,261,1,1931,983,
+1,1933,3271,16,0,
+261,1,431,3272,16,
+0,261,1,1585,3273,
+16,0,261,1,182,
+3274,16,0,261,1,
+1189,3275,16,0,261,
+1,1443,3276,16,0,
+261,1,1695,3277,16,
+0,261,1,2198,3278,
+16,0,261,1,447,
+3279,16,0,261,1,
+2458,998,1,2459,1004,
+1,1958,3280,16,0,
+261,1,2462,1011,1,
+1657,1016,1,2464,1021,
+1,199,3281,16,0,
+261,1,459,3282,16,
+0,261,1,462,3283,
+16,0,261,1,217,
+3284,16,0,261,1,
+2227,1030,1,1225,3285,
+16,0,261,1,1479,
+3286,16,0,261,1,
+1731,3287,16,0,261,
+1,1989,1038,1,1990,
+3288,16,0,261,1,
+236,3289,16,0,261,
+1,1756,3290,16,0,
+261,1,38,3291,19,
+260,1,38,3292,5,
+84,1,1011,1224,1,
+1012,3293,16,0,258,
+1,1013,1381,1,262,
+1241,1,1267,3294,16,
+0,258,1,515,3295,
+16,0,258,1,1521,
+3296,16,0,258,1,
+525,1339,1,2788,3297,
+16,0,258,1,283,
+1295,1,2299,3298,16,
+0,258,1,42,3299,
+16,0,258,1,40,
+1300,1,44,1306,1,
+47,1307,1,1303,3300,
+16,0,258,1,1555,
+3301,16,0,258,1,
+50,1324,1,48,1313,
+1,49,1319,1,51,
+1329,1,63,1345,1,
+305,1334,1,66,1351,
+1,67,1356,1,68,
+1361,1,69,1366,1,
+70,1371,1,73,3302,
+16,0,258,1,74,
+1376,1,328,1425,1,
+1048,1462,1,82,3303,
+16,0,258,1,1840,
+3304,16,0,258,1,
+1591,3305,16,0,258,
+1,1341,3306,16,0,
+258,1,1096,1694,1,
+93,1435,1,352,1467,
+1,107,3307,16,0,
+258,1,1114,1461,1,
+118,1473,1,1123,3308,
+16,0,258,1,371,
+1483,1,1628,3309,16,
+0,258,1,375,1494,
+1,1882,3310,16,0,
+258,1,377,1499,1,
+379,1504,1,380,1509,
+1,883,1515,1,373,
+1527,1,130,1532,1,
+143,1537,1,387,3311,
+16,0,258,1,1159,
+3312,16,0,258,1,
+157,1560,1,1413,3313,
+16,0,258,1,1665,
+3314,16,0,258,1,
+412,3315,16,0,258,
+1,1377,3316,16,0,
+258,1,172,1586,1,
+1939,3317,16,0,258,
+1,437,3318,16,0,
+258,1,188,1635,1,
+942,1607,1,1195,3319,
+16,0,258,1,1449,
+3320,16,0,258,1,
+1701,3321,16,0,258,
+1,447,1628,1,205,
+1640,1,827,1448,1,
+223,1650,1,476,1660,
+1,477,1666,1,1231,
+3322,16,0,258,1,
+479,1676,1,480,1681,
+1,1485,3323,16,0,
+258,1,1737,3324,16,
+0,258,1,242,1700,
+1,478,1705,1,1001,
+1710,1,1002,1715,1,
+39,3325,19,248,1,
+39,3326,5,84,1,
+1011,1224,1,1012,3327,
+16,0,246,1,1013,
+1381,1,262,1241,1,
+1267,3328,16,0,246,
+1,515,3329,16,0,
+246,1,1521,3330,16,
+0,246,1,525,1339,
+1,2788,3331,16,0,
+246,1,283,1295,1,
+2299,3332,16,0,246,
+1,42,3333,16,0,
+246,1,40,1300,1,
+44,1306,1,47,1307,
+1,1303,3334,16,0,
+246,1,1555,3335,16,
+0,246,1,50,1324,
+1,48,1313,1,49,
+1319,1,51,1329,1,
+63,1345,1,305,1334,
+1,66,1351,1,67,
+1356,1,68,1361,1,
+69,1366,1,70,1371,
+1,73,3336,16,0,
+246,1,74,1376,1,
+328,1425,1,1048,1462,
+1,82,3337,16,0,
+246,1,1840,3338,16,
+0,246,1,1591,3339,
+16,0,246,1,1341,
+3340,16,0,246,1,
+1096,1694,1,93,1435,
+1,352,1467,1,107,
+3341,16,0,246,1,
+1114,1461,1,118,1473,
+1,1123,3342,16,0,
+246,1,371,1483,1,
+1628,3343,16,0,246,
+1,375,1494,1,1882,
+3344,16,0,246,1,
+377,1499,1,379,1504,
+1,380,1509,1,883,
+1515,1,373,1527,1,
+130,1532,1,143,1537,
+1,387,3345,16,0,
+246,1,1159,3346,16,
+0,246,1,157,1560,
+1,1413,3347,16,0,
+246,1,1665,3348,16,
+0,246,1,412,3349,
+16,0,246,1,1377,
+3350,16,0,246,1,
+172,1586,1,1939,3351,
+16,0,246,1,437,
+3352,16,0,246,1,
+188,1635,1,942,1607,
+1,1195,3353,16,0,
+246,1,1449,3354,16,
+0,246,1,1701,3355,
+16,0,246,1,447,
+1628,1,205,1640,1,
+827,1448,1,223,1650,
+1,476,1660,1,477,
+1666,1,1231,3356,16,
+0,246,1,479,1676,
+1,480,1681,1,1485,
+3357,16,0,246,1,
+1737,3358,16,0,246,
+1,242,1700,1,478,
+1705,1,1001,1710,1,
+1002,1715,1,40,3359,
+19,236,1,40,3360,
+5,84,1,1011,1224,
+1,1012,3361,16,0,
+234,1,1013,1381,1,
+262,1241,1,1267,3362,
+16,0,234,1,515,
+3363,16,0,234,1,
+1521,3364,16,0,234,
+1,525,1339,1,2788,
+3365,16,0,234,1,
+283,1295,1,2299,3366,
+16,0,234,1,42,
+3367,16,0,234,1,
+40,1300,1,44,1306,
+1,47,1307,1,1303,
+3368,16,0,234,1,
+1555,3369,16,0,234,
+1,50,1324,1,48,
+1313,1,49,1319,1,
+51,1329,1,63,1345,
+1,305,1334,1,66,
+1351,1,67,1356,1,
+68,1361,1,69,1366,
+1,70,1371,1,73,
+3370,16,0,234,1,
+74,1376,1,328,1425,
+1,1048,1462,1,82,
+3371,16,0,234,1,
+1840,3372,16,0,234,
+1,1591,3373,16,0,
+234,1,1341,3374,16,
+0,234,1,1096,1694,
+1,93,1435,1,352,
+1467,1,107,3375,16,
+0,234,1,1114,1461,
+1,118,3376,16,0,
+234,1,1123,3377,16,
+0,234,1,371,1483,
+1,1628,3378,16,0,
+234,1,375,1494,1,
+1882,3379,16,0,234,
+1,377,1499,1,379,
+1504,1,380,1509,1,
+883,3380,16,0,234,
+1,373,1527,1,130,
+3381,16,0,234,1,
+143,3382,16,0,234,
+1,387,3383,16,0,
+234,1,1159,3384,16,
+0,234,1,157,3385,
+16,0,234,1,1413,
+3386,16,0,234,1,
+1665,3387,16,0,234,
+1,412,3388,16,0,
+234,1,1377,3389,16,
+0,234,1,172,3390,
+16,0,234,1,1939,
+3391,16,0,234,1,
+437,3392,16,0,234,
+1,188,3393,16,0,
+234,1,942,1607,1,
+1195,3394,16,0,234,
+1,1449,3395,16,0,
+234,1,1701,3396,16,
+0,234,1,447,1628,
+1,205,3397,16,0,
+234,1,827,3398,16,
+0,234,1,223,3399,
+16,0,234,1,476,
+1660,1,477,1666,1,
+1231,3400,16,0,234,
+1,479,1676,1,480,
+1681,1,1485,3401,16,
+0,234,1,1737,3402,
+16,0,234,1,242,
+3403,16,0,234,1,
+478,1705,1,1001,1710,
+1,1002,1715,1,41,
+3404,19,191,1,41,
+3405,5,84,1,1011,
+1224,1,1012,3406,16,
+0,189,1,1013,1381,
+1,262,1241,1,1267,
+3407,16,0,189,1,
+515,3408,16,0,189,
+1,1521,3409,16,0,
+189,1,525,1339,1,
+2788,3410,16,0,189,
+1,283,1295,1,2299,
+3411,16,0,189,1,
+42,3412,16,0,189,
+1,40,1300,1,44,
+1306,1,47,1307,1,
+1303,3413,16,0,189,
+1,1555,3414,16,0,
+189,1,50,1324,1,
+48,1313,1,49,1319,
+1,51,1329,1,63,
+1345,1,305,1334,1,
+66,1351,1,67,1356,
+1,68,1361,1,69,
+1366,1,70,1371,1,
+73,3415,16,0,189,
+1,74,1376,1,328,
+1425,1,1048,1462,1,
+82,3416,16,0,189,
+1,1840,3417,16,0,
+189,1,1591,3418,16,
+0,189,1,1341,3419,
+16,0,189,1,1096,
+1694,1,93,1435,1,
+352,1467,1,107,3420,
+16,0,189,1,1114,
+1461,1,118,3421,16,
+0,189,1,1123,3422,
+16,0,189,1,371,
+1483,1,1628,3423,16,
+0,189,1,375,1494,
+1,1882,3424,16,0,
+189,1,377,1499,1,
+379,1504,1,380,1509,
+1,883,3425,16,0,
+189,1,373,1527,1,
+130,3426,16,0,189,
+1,143,3427,16,0,
+189,1,387,3428,16,
+0,189,1,1159,3429,
+16,0,189,1,157,
+3430,16,0,189,1,
+1413,3431,16,0,189,
+1,1665,3432,16,0,
+189,1,412,3433,16,
+0,189,1,1377,3434,
+16,0,189,1,172,
+3435,16,0,189,1,
+1939,3436,16,0,189,
+1,437,3437,16,0,
+189,1,188,3438,16,
+0,189,1,942,1607,
+1,1195,3439,16,0,
+189,1,1449,3440,16,
+0,189,1,1701,3441,
+16,0,189,1,447,
+1628,1,205,3442,16,
+0,189,1,827,3443,
+16,0,189,1,223,
+3444,16,0,189,1,
+476,1660,1,477,1666,
+1,1231,3445,16,0,
+189,1,479,1676,1,
+480,1681,1,1485,3446,
+16,0,189,1,1737,
+3447,16,0,189,1,
+242,3448,16,0,189,
+1,478,1705,1,1001,
+1710,1,1002,1715,1,
+42,3449,19,430,1,
+42,3450,5,38,1,
+1901,3451,16,0,428,
+1,2075,3452,16,0,
+428,1,1860,943,1,
+1803,909,1,1804,3453,
+16,0,428,1,2413,
+3454,16,0,428,1,
+2198,3455,16,0,428,
+1,1873,958,1,1657,
+1016,1,1989,1038,1,
+1990,3456,16,0,428,
+1,1775,3457,16,0,
+428,1,32,3458,16,
+0,428,1,2105,936,
+1,2106,3459,16,0,
+428,1,2364,949,1,
+2227,1030,1,2337,3460,
+16,0,428,1,2021,
+840,1,2458,998,1,
+2459,1004,1,2462,1011,
+1,2136,965,1,2464,
+1021,1,2029,847,1,
+2030,853,1,2031,858,
+1,2032,863,1,2033,
+868,1,2035,874,1,
+2037,879,1,2039,884,
+1,1931,983,1,2041,
+890,1,2043,896,1,
+2045,901,1,1574,921,
+1,1958,3461,16,0,
+428,1,43,3462,19,
+518,1,43,3463,5,
+25,1,2035,874,1,
+2037,879,1,2039,884,
+1,2041,890,1,2227,
+1030,1,2043,896,1,
+1657,1016,1,1860,943,
+1,2136,965,1,2021,
+840,1,2459,1004,1,
+1574,921,1,2105,3464,
+16,0,683,1,1931,
+983,1,1873,958,1,
+2031,858,1,1803,909,
+1,1989,3465,16,0,
+516,1,2464,1021,1,
+2029,847,1,2030,853,
+1,2364,949,1,2032,
+863,1,2033,868,1,
+2045,901,1,44,3466,
+19,289,1,44,3467,
+5,38,1,1901,3468,
+16,0,287,1,2075,
+3469,16,0,287,1,
+1860,943,1,1803,909,
+1,1804,3470,16,0,
+287,1,2413,3471,16,
+0,287,1,2198,3472,
+16,0,287,1,1873,
+958,1,1657,1016,1,
+1989,1038,1,1990,3473,
+16,0,287,1,1775,
+3474,16,0,287,1,
+32,3475,16,0,287,
+1,2105,936,1,2106,
+3476,16,0,287,1,
+2364,949,1,2227,1030,
+1,2337,3477,16,0,
+287,1,2021,840,1,
+2458,998,1,2459,1004,
+1,2462,1011,1,2136,
+965,1,2464,1021,1,
+2029,847,1,2030,853,
+1,2031,858,1,2032,
+863,1,2033,868,1,
+2035,874,1,2037,879,
+1,2039,884,1,1931,
+983,1,2041,890,1,
+2043,896,1,2045,901,
+1,1574,921,1,1958,
+3478,16,0,287,1,
+45,3479,19,320,1,
+45,3480,5,39,1,
+1901,3481,16,0,350,
+1,2075,3482,16,0,
+350,1,1860,943,1,
+1803,909,1,1804,3483,
+16,0,350,1,2413,
+3484,16,0,350,1,
+2198,3485,16,0,350,
+1,1873,958,1,1657,
+1016,1,1989,1038,1,
+1990,3486,16,0,350,
+1,1775,3487,16,0,
+350,1,32,3488,16,
+0,350,1,2105,936,
+1,2106,3489,16,0,
+350,1,2364,949,1,
+2227,1030,1,2337,3490,
+16,0,350,1,2021,
+840,1,2458,998,1,
+2459,1004,1,2462,1011,
+1,2136,965,1,2464,
+1021,1,2029,847,1,
+2030,853,1,2031,858,
+1,2032,863,1,2033,
+868,1,2035,874,1,
+2037,879,1,2039,884,
+1,1931,983,1,2041,
+890,1,2043,896,1,
+2045,901,1,1832,3491,
+16,0,318,1,1574,
+921,1,1958,3492,16,
+0,350,1,46,3493,
+19,789,1,46,3494,
+5,38,1,1901,3495,
+16,0,787,1,2075,
+3496,16,0,787,1,
+1860,943,1,1803,909,
+1,1804,3497,16,0,
+787,1,2413,3498,16,
+0,787,1,2198,3499,
+16,0,787,1,1873,
+958,1,1657,1016,1,
+1989,1038,1,1990,3500,
+16,0,787,1,1775,
+3501,16,0,787,1,
+32,3502,16,0,787,
+1,2105,936,1,2106,
+3503,16,0,787,1,
+2364,949,1,2227,1030,
+1,2337,3504,16,0,
+787,1,2021,840,1,
+2458,998,1,2459,1004,
+1,2462,1011,1,2136,
+965,1,2464,1021,1,
+2029,847,1,2030,853,
+1,2031,858,1,2032,
+863,1,2033,868,1,
+2035,874,1,2037,879,
+1,2039,884,1,1931,
+983,1,2041,890,1,
+2043,896,1,2045,901,
+1,1574,921,1,1958,
+3505,16,0,787,1,
+47,3506,19,660,1,
+47,3507,5,19,1,
+0,3508,16,0,760,
+1,2760,3509,16,0,
+760,1,2779,3510,17,
+3511,15,3512,4,50,
+37,0,71,0,108,
+0,111,0,98,0,
+97,0,108,0,70,
+0,117,0,110,0,
+99,0,116,0,105,
+0,111,0,110,0,
+68,0,101,0,102,
+0,105,0,110,0,
+105,0,116,0,105,
+0,111,0,110,0,
+1,-1,1,5,3513,
+20,3514,4,52,71,
 0,108,0,111,0,
 98,0,97,0,108,
+0,70,0,117,0,
+110,0,99,0,116,
+0,105,0,111,0,
+110,0,68,0,101,
+0,102,0,105,0,
+110,0,105,0,116,
+0,105,0,111,0,
+110,0,95,0,49,
+0,1,174,1,3,
+1,6,1,5,3515,
+22,1,9,1,2764,
+801,1,2818,3516,17,
+3517,15,3518,4,52,
+37,0,71,0,108,
+0,111,0,98,0,
+97,0,108,0,86,
+0,97,0,114,0,
+105,0,97,0,98,
+0,108,0,101,0,
+68,0,101,0,99,
+0,108,0,97,0,
+114,0,97,0,116,
+0,105,0,111,0,
+110,0,1,-1,1,
+5,3519,20,3520,4,
+54,71,0,108,0,
+111,0,98,0,97,
+0,108,0,86,0,
+97,0,114,0,105,
+0,97,0,98,0,
+108,0,101,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,95,0,49,0,
+1,172,1,3,1,
+3,1,2,3521,22,
+1,7,1,2819,3522,
+16,0,760,1,2751,
+807,1,2022,3523,16,
+0,658,1,2459,1004,
+1,2830,3524,16,0,
+760,1,2647,824,1,
+2464,1021,1,2466,3525,
+17,3526,15,3512,1,
+-1,1,5,3527,20,
+3528,4,52,71,0,
+108,0,111,0,98,
+0,97,0,108,0,
+70,0,117,0,110,
+0,99,0,116,0,
+105,0,111,0,110,
 0,68,0,101,0,
 102,0,105,0,110,
 0,105,0,116,0,
 105,0,111,0,110,
-0,115,0,95,0,
-52,0,1,168,1,
-3,1,3,1,2,
-3469,22,1,6,1,
-2742,794,1,2743,800,
-1,2818,3470,17,3471,
-15,3466,1,-1,1,
-5,3472,20,3473,4,
+0,95,0,50,0,
+1,175,1,3,1,
+7,1,6,3529,22,
+1,10,1,2837,3530,
+17,3531,15,3532,4,
+36,37,0,71,0,
+108,0,111,0,98,
+0,97,0,108,0,
+68,0,101,0,102,
+0,105,0,110,0,
+105,0,116,0,105,
+0,111,0,110,0,
+115,0,1,-1,1,
+5,3533,20,3534,4,
 38,71,0,108,0,
 111,0,98,0,97,
 0,108,0,68,0,
@@ -9706,12 +9974,12 @@ public yyLSLSyntax
 0,110,0,105,0,
 116,0,105,0,111,
 0,110,0,115,0,
-95,0,51,0,1,
-167,1,3,1,2,
-1,1,3474,22,1,
-5,1,2819,3475,17,
-3476,15,3466,1,-1,
-1,5,3477,20,3478,
+95,0,52,0,1,
+171,1,3,1,3,
+1,2,3535,22,1,
+6,1,2838,3536,17,
+3537,15,3532,1,-1,
+1,5,3538,20,3539,
 4,38,71,0,108,
 0,111,0,98,0,
 97,0,108,0,68,
@@ -9719,2839 +9987,2870 @@ public yyLSLSyntax
 105,0,110,0,105,
 0,116,0,105,0,
 111,0,110,0,115,
-0,95,0,49,0,
-1,165,1,3,1,
-2,1,1,3479,22,
-1,3,1,2786,3480,
-17,3481,15,3482,4,
-52,37,0,71,0,
+0,95,0,50,0,
+1,169,1,3,1,
+3,1,2,3540,22,
+1,4,1,2839,3541,
+17,3542,15,3532,1,
+-1,1,5,3543,20,
+3544,4,38,71,0,
 108,0,111,0,98,
 0,97,0,108,0,
-86,0,97,0,114,
-0,105,0,97,0,
-98,0,108,0,101,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,1,-1,
-1,5,3483,20,3484,
-4,54,71,0,108,
-0,111,0,98,0,
-97,0,108,0,86,
-0,97,0,114,0,
-105,0,97,0,98,
-0,108,0,101,0,
-68,0,101,0,99,
-0,108,0,97,0,
-114,0,97,0,116,
-0,105,0,111,0,
-110,0,95,0,50,
+68,0,101,0,102,
+0,105,0,110,0,
+105,0,116,0,105,
+0,111,0,110,0,
+115,0,95,0,51,
 0,1,170,1,3,
-1,5,1,4,3485,
-22,1,8,1,2022,
-3486,16,0,666,1,
-2459,986,1,2758,3487,
-17,3488,15,3489,4,
-50,37,0,71,0,
-108,0,111,0,98,
-0,97,0,108,0,
-70,0,117,0,110,
-0,99,0,116,0,
-105,0,111,0,110,
+1,2,1,1,3545,
+22,1,5,1,2840,
+3546,17,3547,15,3532,
+1,-1,1,5,3548,
+20,3549,4,38,71,
+0,108,0,111,0,
+98,0,97,0,108,
 0,68,0,101,0,
 102,0,105,0,110,
 0,105,0,116,0,
 105,0,111,0,110,
-0,1,-1,1,5,
-3490,20,3491,4,52,
-71,0,108,0,111,
-0,98,0,97,0,
-108,0,70,0,117,
-0,110,0,99,0,
-116,0,105,0,111,
-0,110,0,68,0,
-101,0,102,0,105,
-0,110,0,105,0,
-116,0,105,0,111,
-0,110,0,95,0,
-49,0,1,171,1,
-3,1,6,1,5,
-3492,22,1,9,1,
-2817,3493,17,3494,15,
-3466,1,-1,1,5,
-3495,20,3496,4,38,
+0,115,0,95,0,
+49,0,1,168,1,
+3,1,2,1,1,
+3550,22,1,3,1,
+2807,3551,17,3552,15,
+3518,1,-1,1,5,
+3553,20,3554,4,54,
 71,0,108,0,111,
 0,98,0,97,0,
-108,0,68,0,101,
-0,102,0,105,0,
-110,0,105,0,116,
-0,105,0,111,0,
-110,0,115,0,95,
-0,50,0,1,166,
-1,3,1,3,1,
-2,3497,22,1,4,
-1,2797,3498,17,3499,
-15,3482,1,-1,1,
-5,3500,20,3501,4,
-54,71,0,108,0,
-111,0,98,0,97,
-0,108,0,86,0,
-97,0,114,0,105,
-0,97,0,98,0,
-108,0,101,0,68,
-0,101,0,99,0,
-108,0,97,0,114,
-0,97,0,116,0,
-105,0,111,0,110,
-0,95,0,49,0,
-1,169,1,3,1,
-3,1,2,3502,22,
-1,7,1,2798,3503,
-16,0,659,1,2466,
-3504,17,3505,15,3489,
-1,-1,1,5,3506,
-20,3507,4,52,71,
-0,108,0,111,0,
-98,0,97,0,108,
-0,70,0,117,0,
-110,0,99,0,116,
-0,105,0,111,0,
-110,0,68,0,101,
-0,102,0,105,0,
-110,0,105,0,116,
-0,105,0,111,0,
-110,0,95,0,50,
-0,1,172,1,3,
-1,7,1,6,3508,
-22,1,10,1,2631,
-805,1,2464,1003,1,
-2731,811,1,2809,3509,
-16,0,659,1,48,
-3510,19,372,1,48,
-3511,5,54,1,0,
-3512,16,0,370,1,
-2075,3513,16,0,571,
-1,2731,811,1,1860,
-926,1,1804,3514,16,
-0,571,1,1901,3515,
-16,0,571,1,2739,
-3516,16,0,370,1,
-2413,3517,16,0,571,
-1,2742,794,1,2743,
-800,1,1873,940,1,
-1657,998,1,2030,836,
-1,1989,1020,1,1990,
-3518,16,0,571,1,
-2035,857,1,2459,986,
-1,1775,3519,16,0,
-571,1,32,3520,16,
-0,571,1,2758,3487,
-1,2105,919,1,2106,
-3521,16,0,571,1,
-2227,1012,1,2337,3522,
-16,0,571,1,1803,
-892,1,2458,980,1,
-2786,3480,1,2462,993,
-1,2136,947,1,2464,
-1003,1,2029,830,1,
-2466,3504,1,2031,841,
-1,2032,846,1,2033,
-851,1,2797,3498,1,
-2798,3523,16,0,370,
-1,2631,805,1,2364,
-932,1,2039,867,1,
-1931,965,1,2041,873,
-1,2021,823,1,2043,
-879,1,2045,884,1,
-2809,3524,16,0,370,
-1,2198,3525,16,0,
-571,1,2816,3464,1,
-2817,3493,1,2818,3470,
-1,2819,3475,1,2037,
-862,1,1574,904,1,
-1958,3526,16,0,571,
-1,49,3527,19,576,
-1,49,3528,5,38,
-1,1901,3529,16,0,
-574,1,2075,3530,16,
-0,574,1,1860,926,
-1,1803,892,1,1804,
-3531,16,0,574,1,
-2413,3532,16,0,574,
-1,2198,3533,16,0,
-574,1,1873,940,1,
-1657,998,1,1989,1020,
-1,1990,3534,16,0,
-574,1,1775,3535,16,
-0,574,1,32,3536,
-16,0,574,1,2105,
-919,1,2106,3537,16,
-0,574,1,2364,932,
-1,2227,1012,1,2337,
-3538,16,0,574,1,
-2021,823,1,2458,980,
-1,2459,986,1,2462,
-993,1,2136,947,1,
-2464,1003,1,2029,830,
-1,2030,836,1,2031,
-841,1,2032,846,1,
-2033,851,1,2035,857,
-1,2037,862,1,2039,
-867,1,1931,965,1,
-2041,873,1,2043,879,
-1,2045,884,1,1574,
-904,1,1958,3539,16,
-0,574,1,50,3540,
-19,707,1,50,3541,
-5,38,1,1901,3542,
-16,0,705,1,2075,
-3543,16,0,705,1,
-1860,926,1,1803,892,
-1,1804,3544,16,0,
-705,1,2413,3545,16,
-0,705,1,2198,3546,
-16,0,705,1,1873,
-940,1,1657,998,1,
-1989,1020,1,1990,3547,
-16,0,705,1,1775,
-3548,16,0,705,1,
-32,3549,16,0,705,
-1,2105,919,1,2106,
-3550,16,0,705,1,
-2364,932,1,2227,1012,
-1,2337,3551,16,0,
-705,1,2021,823,1,
-2458,980,1,2459,986,
-1,2462,993,1,2136,
-947,1,2464,1003,1,
-2029,830,1,2030,836,
-1,2031,841,1,2032,
-846,1,2033,851,1,
-2035,857,1,2037,862,
-1,2039,867,1,1931,
-965,1,2041,873,1,
-2043,879,1,2045,884,
-1,1574,904,1,1958,
-3552,16,0,705,1,
-51,3553,19,127,1,
-51,3554,5,56,1,
-0,3555,16,0,125,
-1,2075,3556,16,0,
-125,1,1860,926,1,
-10,3557,16,0,125,
-1,2758,3487,1,1901,
-3558,16,0,125,1,
-2413,3559,16,0,125,
-1,2198,3560,16,0,
-125,1,1873,940,1,
-21,3561,16,0,125,
-1,1657,998,1,2030,
-836,1,1989,1020,1,
-1990,3562,16,0,125,
-1,2458,980,1,2459,
-986,1,1775,3563,16,
-0,125,1,32,3564,
-16,0,125,1,2567,
-3565,16,0,125,1,
-2105,919,1,2106,3566,
-16,0,125,1,2545,
-3567,16,0,467,1,
-2227,1012,1,2337,3568,
-16,0,125,1,2035,
-857,1,52,3569,16,
-0,125,1,1803,892,
-1,1804,3570,16,0,
-125,1,2786,3480,1,
-2462,993,1,2136,947,
-1,2464,1003,1,2029,
-830,1,2466,3504,1,
-2031,841,1,2032,846,
-1,2033,851,1,2797,
-3498,1,2798,3571,16,
-0,125,1,2364,932,
-1,2039,867,1,1931,
-965,1,2041,873,1,
-2021,823,1,2043,879,
-1,2045,884,1,2816,
-3464,1,2817,3493,1,
-2818,3470,1,2819,3475,
-1,2522,3572,16,0,
-467,1,2037,862,1,
-1574,904,1,1958,3573,
-16,0,125,1,2745,
-3574,16,0,125,1,
-2506,3575,16,0,467,
-1,52,3576,19,124,
-1,52,3577,5,53,
-1,0,3578,16,0,
-122,1,2075,3579,16,
-0,122,1,1860,926,
-1,10,3580,16,0,
-122,1,2758,3487,1,
-1901,3581,16,0,122,
-1,2413,3582,16,0,
-122,1,2198,3583,16,
-0,122,1,1873,940,
-1,21,3584,16,0,
-122,1,1657,998,1,
-2030,836,1,1989,1020,
-1,1990,3585,16,0,
-122,1,2458,980,1,
-2459,986,1,1775,3586,
+108,0,86,0,97,
+0,114,0,105,0,
+97,0,98,0,108,
+0,101,0,68,0,
+101,0,99,0,108,
+0,97,0,114,0,
+97,0,116,0,105,
+0,111,0,110,0,
+95,0,50,0,1,
+173,1,3,1,5,
+1,4,3555,22,1,
+8,1,2763,813,1,
+48,3556,19,375,1,
+48,3557,5,54,1,
+0,3558,16,0,373,
+1,2837,3530,1,2838,
+3536,1,2839,3541,1,
+2840,3546,1,1860,943,
+1,1958,3559,16,0,
+573,1,2760,3560,16,
+0,373,1,2413,3561,
+16,0,573,1,2198,
+3562,16,0,573,1,
+1873,958,1,1657,1016,
+1,2030,853,1,2751,
+807,1,1989,1038,1,
+1990,3563,16,0,573,
+1,2458,998,1,2459,
+1004,1,1775,3564,16,
+0,573,1,32,3565,
+16,0,573,1,2105,
+936,1,2106,3566,16,
+0,573,1,2763,813,
+1,2764,801,1,2227,
+1030,1,2337,3567,16,
+0,573,1,2075,3568,
+16,0,573,1,2779,
+3510,1,1803,909,1,
+1804,3569,16,0,573,
+1,1901,3570,16,0,
+573,1,2462,1011,1,
+2136,965,1,2464,1021,
+1,2029,847,1,2466,
+3525,1,2031,858,1,
+2032,863,1,2033,868,
+1,2035,874,1,2364,
+949,1,2039,884,1,
+1931,983,1,2041,890,
+1,2021,840,1,2043,
+896,1,2807,3551,1,
+2045,901,1,2647,824,
+1,2818,3516,1,2819,
+3571,16,0,373,1,
+2037,879,1,1574,921,
+1,2830,3572,16,0,
+373,1,49,3573,19,
+578,1,49,3574,5,
+38,1,1901,3575,16,
+0,576,1,2075,3576,
+16,0,576,1,1860,
+943,1,1803,909,1,
+1804,3577,16,0,576,
+1,2413,3578,16,0,
+576,1,2198,3579,16,
+0,576,1,1873,958,
+1,1657,1016,1,1989,
+1038,1,1990,3580,16,
+0,576,1,1775,3581,
+16,0,576,1,32,
+3582,16,0,576,1,
+2105,936,1,2106,3583,
+16,0,576,1,2364,
+949,1,2227,1030,1,
+2337,3584,16,0,576,
+1,2021,840,1,2458,
+998,1,2459,1004,1,
+2462,1011,1,2136,965,
+1,2464,1021,1,2029,
+847,1,2030,853,1,
+2031,858,1,2032,863,
+1,2033,868,1,2035,
+874,1,2037,879,1,
+2039,884,1,1931,983,
+1,2041,890,1,2043,
+896,1,2045,901,1,
+1574,921,1,1958,3585,
+16,0,576,1,50,
+3586,19,718,1,50,
+3587,5,38,1,1901,
+3588,16,0,716,1,
+2075,3589,16,0,716,
+1,1860,943,1,1803,
+909,1,1804,3590,16,
+0,716,1,2413,3591,
+16,0,716,1,2198,
+3592,16,0,716,1,
+1873,958,1,1657,1016,
+1,1989,1038,1,1990,
+3593,16,0,716,1,
+1775,3594,16,0,716,
+1,32,3595,16,0,
+716,1,2105,936,1,
+2106,3596,16,0,716,
+1,2364,949,1,2227,
+1030,1,2337,3597,16,
+0,716,1,2021,840,
+1,2458,998,1,2459,
+1004,1,2462,1011,1,
+2136,965,1,2464,1021,
+1,2029,847,1,2030,
+853,1,2031,858,1,
+2032,863,1,2033,868,
+1,2035,874,1,2037,
+879,1,2039,884,1,
+1931,983,1,2041,890,
+1,2043,896,1,2045,
+901,1,1574,921,1,
+1958,3598,16,0,716,
+1,51,3599,19,127,
+1,51,3600,5,58,
+1,0,3601,16,0,
+125,1,2537,3602,16,
+0,691,1,2837,3530,
+1,2838,3536,1,2839,
+3541,1,2840,3546,1,
+1860,943,1,10,3603,
+16,0,125,1,2413,
+3604,16,0,125,1,
+2198,3605,16,0,125,
+1,1873,958,1,21,
+3606,16,0,125,1,
+1657,1016,1,2030,853,
+1,1989,1038,1,1990,
+3607,16,0,125,1,
+2458,998,1,2459,1004,
+1,1775,3608,16,0,
+125,1,32,3609,16,
+0,125,1,2105,936,
+1,2106,3610,16,0,
+125,1,2045,901,1,
+2766,3611,16,0,125,
+1,2227,1030,1,2337,
+3612,16,0,125,1,
+2075,3613,16,0,125,
+1,52,3614,16,0,
+125,1,2560,3615,16,
+0,691,1,2779,3510,
+1,1803,909,1,1804,
+3616,16,0,125,1,
+1901,3617,16,0,125,
+1,2462,1011,1,2136,
+965,1,2464,1021,1,
+2029,847,1,2466,3525,
+1,2031,858,1,2032,
+863,1,2033,868,1,
+2035,874,1,2581,3618,
+16,0,125,1,2364,
+949,1,2039,884,1,
+1931,983,1,2041,890,
+1,2021,840,1,2043,
+896,1,2807,3551,1,
+2510,3619,16,0,691,
+1,2514,3620,16,0,
+691,1,2818,3516,1,
+2819,3621,16,0,125,
+1,2522,3622,16,0,
+691,1,2037,879,1,
+1574,921,1,1958,3623,
+16,0,125,1,52,
+3624,19,124,1,52,
+3625,5,53,1,0,
+3626,16,0,122,1,
+2837,3530,1,2838,3536,
+1,2839,3541,1,2840,
+3546,1,1860,943,1,
+10,3627,16,0,122,
+1,2413,3628,16,0,
+122,1,2198,3629,16,
+0,122,1,1873,958,
+1,21,3630,16,0,
+122,1,1657,1016,1,
+2030,853,1,1989,1038,
+1,1990,3631,16,0,
+122,1,2458,998,1,
+2459,1004,1,1775,3632,
 16,0,122,1,32,
-3587,16,0,122,1,
-2567,3588,16,0,122,
-1,2105,919,1,2106,
-3589,16,0,122,1,
-2227,1012,1,2337,3590,
-16,0,122,1,2035,
-857,1,52,3591,16,
-0,122,1,1803,892,
-1,1804,3592,16,0,
-122,1,2786,3480,1,
-2462,993,1,2136,947,
-1,2464,1003,1,2029,
-830,1,2466,3504,1,
-2031,841,1,2032,846,
-1,2033,851,1,2797,
-3498,1,2798,3593,16,
-0,122,1,2364,932,
-1,2039,867,1,1931,
-965,1,2041,873,1,
-2021,823,1,2043,879,
-1,2045,884,1,2816,
-3464,1,2817,3493,1,
-2818,3470,1,2819,3475,
-1,2037,862,1,1574,
-904,1,1958,3594,16,
-0,122,1,2745,3595,
-16,0,122,1,53,
-3596,19,121,1,53,
-3597,5,53,1,0,
-3598,16,0,119,1,
-2075,3599,16,0,119,
-1,1860,926,1,10,
-3600,16,0,119,1,
-2758,3487,1,1901,3601,
+3633,16,0,122,1,
+2105,936,1,2106,3634,
+16,0,122,1,2766,
+3635,16,0,122,1,
+2227,1030,1,2337,3636,
+16,0,122,1,2075,
+3637,16,0,122,1,
+52,3638,16,0,122,
+1,2779,3510,1,1803,
+909,1,1804,3639,16,
+0,122,1,1901,3640,
+16,0,122,1,2462,
+1011,1,2136,965,1,
+2464,1021,1,2029,847,
+1,2466,3525,1,2031,
+858,1,2032,863,1,
+2033,868,1,2035,874,
+1,2581,3641,16,0,
+122,1,2364,949,1,
+2039,884,1,1931,983,
+1,2041,890,1,2021,
+840,1,2043,896,1,
+2807,3551,1,2045,901,
+1,2818,3516,1,2819,
+3642,16,0,122,1,
+2037,879,1,1574,921,
+1,1958,3643,16,0,
+122,1,53,3644,19,
+121,1,53,3645,5,
+53,1,0,3646,16,
+0,119,1,2837,3530,
+1,2838,3536,1,2839,
+3541,1,2840,3546,1,
+1860,943,1,10,3647,
 16,0,119,1,2413,
-3602,16,0,119,1,
-2198,3603,16,0,119,
-1,1873,940,1,21,
-3604,16,0,119,1,
-1657,998,1,2030,836,
-1,1989,1020,1,1990,
-3605,16,0,119,1,
-2458,980,1,2459,986,
-1,1775,3606,16,0,
-119,1,32,3607,16,
-0,119,1,2567,3608,
-16,0,119,1,2105,
-919,1,2106,3609,16,
-0,119,1,2227,1012,
-1,2337,3610,16,0,
-119,1,2035,857,1,
-52,3611,16,0,119,
-1,1803,892,1,1804,
-3612,16,0,119,1,
-2786,3480,1,2462,993,
-1,2136,947,1,2464,
-1003,1,2029,830,1,
-2466,3504,1,2031,841,
-1,2032,846,1,2033,
-851,1,2797,3498,1,
-2798,3613,16,0,119,
-1,2364,932,1,2039,
-867,1,1931,965,1,
-2041,873,1,2021,823,
-1,2043,879,1,2045,
-884,1,2816,3464,1,
-2817,3493,1,2818,3470,
-1,2819,3475,1,2037,
-862,1,1574,904,1,
-1958,3614,16,0,119,
-1,2745,3615,16,0,
-119,1,54,3616,19,
-118,1,54,3617,5,
-54,1,0,3618,16,
-0,116,1,2075,3619,
-16,0,116,1,1860,
-926,1,10,3620,16,
-0,116,1,2758,3487,
-1,1901,3621,16,0,
-116,1,2413,3622,16,
-0,116,1,2198,3623,
+3648,16,0,119,1,
+2198,3649,16,0,119,
+1,1873,958,1,21,
+3650,16,0,119,1,
+1657,1016,1,2030,853,
+1,1989,1038,1,1990,
+3651,16,0,119,1,
+2458,998,1,2459,1004,
+1,1775,3652,16,0,
+119,1,32,3653,16,
+0,119,1,2105,936,
+1,2106,3654,16,0,
+119,1,2766,3655,16,
+0,119,1,2227,1030,
+1,2337,3656,16,0,
+119,1,2075,3657,16,
+0,119,1,52,3658,
+16,0,119,1,2779,
+3510,1,1803,909,1,
+1804,3659,16,0,119,
+1,1901,3660,16,0,
+119,1,2462,1011,1,
+2136,965,1,2464,1021,
+1,2029,847,1,2466,
+3525,1,2031,858,1,
+2032,863,1,2033,868,
+1,2035,874,1,2581,
+3661,16,0,119,1,
+2364,949,1,2039,884,
+1,1931,983,1,2041,
+890,1,2021,840,1,
+2043,896,1,2807,3551,
+1,2045,901,1,2818,
+3516,1,2819,3662,16,
+0,119,1,2037,879,
+1,1574,921,1,1958,
+3663,16,0,119,1,
+54,3664,19,118,1,
+54,3665,5,55,1,
+0,3666,16,0,116,
+1,2837,3530,1,2838,
+3536,1,2839,3541,1,
+2840,3546,1,1860,943,
+1,10,3667,16,0,
+116,1,2413,3668,16,
+0,116,1,2198,3669,
 16,0,116,1,1873,
-940,1,21,3624,16,
-0,116,1,1657,998,
-1,2030,836,1,1989,
-1020,1,1990,3625,16,
-0,116,1,2458,980,
-1,2459,986,1,1775,
-3626,16,0,116,1,
-32,3627,16,0,116,
-1,2567,3628,16,0,
-116,1,2105,919,1,
-2106,3629,16,0,116,
-1,2553,3630,16,0,
-732,1,2227,1012,1,
-2337,3631,16,0,116,
-1,2035,857,1,52,
-3632,16,0,116,1,
-1803,892,1,1804,3633,
-16,0,116,1,2786,
-3480,1,2462,993,1,
-2136,947,1,2464,1003,
-1,2029,830,1,2466,
-3504,1,2031,841,1,
-2032,846,1,2033,851,
-1,2797,3498,1,2798,
-3634,16,0,116,1,
-2364,932,1,2039,867,
-1,1931,965,1,2041,
-873,1,2021,823,1,
-2043,879,1,2045,884,
-1,2816,3464,1,2817,
-3493,1,2818,3470,1,
-2819,3475,1,2037,862,
-1,1574,904,1,1958,
-3635,16,0,116,1,
-2745,3636,16,0,116,
-1,55,3637,19,115,
-1,55,3638,5,56,
-1,0,3639,16,0,
-113,1,2537,3640,16,
-0,684,1,2510,3641,
-16,0,684,1,2075,
-3642,16,0,113,1,
-1860,926,1,10,3643,
-16,0,113,1,2758,
-3487,1,1901,3644,16,
-0,113,1,2413,3645,
-16,0,113,1,2198,
-3646,16,0,113,1,
-1873,940,1,21,3647,
-16,0,113,1,1657,
-998,1,2030,836,1,
-1989,1020,1,1990,3648,
+958,1,21,3670,16,
+0,116,1,1657,1016,
+1,2030,853,1,1989,
+1038,1,1990,3671,16,
+0,116,1,2458,998,
+1,2459,1004,1,1775,
+3672,16,0,116,1,
+32,3673,16,0,116,
+1,2105,936,1,2106,
+3674,16,0,116,1,
+2766,3675,16,0,116,
+1,2227,1030,1,2337,
+3676,16,0,116,1,
+2075,3677,16,0,116,
+1,52,3678,16,0,
+116,1,2779,3510,1,
+1803,909,1,1804,3679,
+16,0,116,1,1901,
+3680,16,0,116,1,
+2462,1011,1,2136,965,
+1,2464,1021,1,2029,
+847,1,2466,3525,1,
+2031,858,1,2032,863,
+1,2033,868,1,2035,
+874,1,2581,3681,16,
+0,116,1,2364,949,
+1,2039,884,1,1931,
+983,1,2041,890,1,
+2021,840,1,2043,896,
+1,2807,3551,1,2045,
+901,1,2568,3682,16,
+0,470,1,2818,3516,
+1,2819,3683,16,0,
+116,1,2037,879,1,
+1574,921,1,1958,3684,
+16,0,116,1,2506,
+3685,16,0,470,1,
+55,3686,19,115,1,
+55,3687,5,56,1,
+0,3688,16,0,113,
+1,2837,3530,1,2838,
+3536,1,2839,3541,1,
+2840,3546,1,1860,943,
+1,10,3689,16,0,
+113,1,2413,3690,16,
+0,113,1,2525,3691,
+16,0,493,1,1657,
+1016,1,1873,958,1,
+21,3692,16,0,113,
+1,2529,3693,16,0,
+493,1,2030,853,1,
+1989,1038,1,1990,3694,
 16,0,113,1,2458,
-980,1,2459,986,1,
-1775,3649,16,0,113,
-1,32,3650,16,0,
-113,1,2567,3651,16,
-0,113,1,2105,919,
-1,2106,3652,16,0,
-113,1,2227,1012,1,
-2337,3653,16,0,113,
-1,2035,857,1,52,
-3654,16,0,113,1,
-1803,892,1,1804,3655,
-16,0,113,1,2786,
-3480,1,2462,993,1,
-2136,947,1,2464,1003,
-1,2029,830,1,2466,
-3504,1,2031,841,1,
-2032,846,1,2033,851,
-1,2797,3498,1,2798,
-3656,16,0,113,1,
-2364,932,1,2039,867,
-1,1931,965,1,2041,
-873,1,2021,823,1,
-2043,879,1,2045,884,
-1,2514,3657,16,0,
-684,1,2816,3464,1,
-2817,3493,1,2818,3470,
-1,2819,3475,1,2037,
-862,1,1574,904,1,
-1958,3658,16,0,113,
-1,2745,3659,16,0,
-113,1,56,3660,19,
-112,1,56,3661,5,
-55,1,0,3662,16,
-0,110,1,2075,3663,
-16,0,110,1,1860,
-926,1,10,3664,16,
-0,110,1,2758,3487,
-1,1901,3665,16,0,
-110,1,2413,3666,16,
-0,110,1,2525,3667,
-16,0,491,1,1657,
-998,1,1873,940,1,
-21,3668,16,0,110,
-1,2529,3669,16,0,
-491,1,2030,836,1,
-1989,1020,1,1990,3670,
+998,1,2459,1004,1,
+1775,3695,16,0,113,
+1,32,3696,16,0,
+113,1,2105,936,1,
+2106,3697,16,0,113,
+1,2766,3698,16,0,
+113,1,2552,3699,16,
+0,493,1,2227,1030,
+1,2337,3700,16,0,
+113,1,2075,3701,16,
+0,113,1,52,3702,
+16,0,113,1,2779,
+3510,1,1803,909,1,
+1804,3703,16,0,113,
+1,1901,3704,16,0,
+113,1,2462,1011,1,
+2136,965,1,2464,1021,
+1,2029,847,1,2466,
+3525,1,2031,858,1,
+2032,863,1,2033,868,
+1,2035,874,1,2581,
+3705,16,0,113,1,
+2364,949,1,2039,884,
+1,1931,983,1,2041,
+890,1,2021,840,1,
+2043,896,1,2807,3551,
+1,2045,901,1,2198,
+3706,16,0,113,1,
+2818,3516,1,2819,3707,
+16,0,113,1,2037,
+879,1,1574,921,1,
+1958,3708,16,0,113,
+1,56,3709,19,112,
+1,56,3710,5,55,
+1,0,3711,16,0,
+110,1,2837,3530,1,
+2838,3536,1,2839,3541,
+1,2840,3546,1,1860,
+943,1,10,3712,16,
+0,110,1,2413,3713,
+16,0,110,1,2198,
+3714,16,0,110,1,
+1873,958,1,21,3715,
+16,0,110,1,1657,
+1016,1,2030,853,1,
+1989,1038,1,1990,3716,
 16,0,110,1,2458,
-980,1,2459,986,1,
-1775,3671,16,0,110,
-1,32,3672,16,0,
-110,1,2567,3673,16,
-0,110,1,2105,919,
-1,2106,3674,16,0,
-110,1,2227,1012,1,
-2337,3675,16,0,110,
-1,2035,857,1,52,
-3676,16,0,110,1,
-1803,892,1,1804,3677,
-16,0,110,1,2786,
-3480,1,2462,993,1,
-2136,947,1,2464,1003,
-1,2029,830,1,2466,
-3504,1,2031,841,1,
-2032,846,1,2033,851,
-1,2797,3498,1,2798,
-3678,16,0,110,1,
-2364,932,1,2039,867,
-1,1931,965,1,2041,
-873,1,2021,823,1,
-2043,879,1,2045,884,
-1,2198,3679,16,0,
-110,1,2816,3464,1,
-2817,3493,1,2818,3470,
-1,2819,3475,1,2037,
-862,1,1574,904,1,
-1958,3680,16,0,110,
-1,2745,3681,16,0,
-110,1,57,3682,19,
-109,1,57,3683,5,
-53,1,0,3684,16,
-0,107,1,2075,3685,
-16,0,107,1,1860,
-926,1,10,3686,16,
-0,107,1,2758,3487,
-1,1901,3687,16,0,
-107,1,2413,3688,16,
-0,107,1,2198,3689,
-16,0,107,1,1873,
-940,1,21,3690,16,
-0,107,1,1657,998,
-1,2030,836,1,1989,
-1020,1,1990,3691,16,
-0,107,1,2458,980,
-1,2459,986,1,1775,
-3692,16,0,107,1,
-32,3693,16,0,107,
-1,2567,3694,16,0,
-107,1,2105,919,1,
-2106,3695,16,0,107,
-1,2227,1012,1,2337,
-3696,16,0,107,1,
-2035,857,1,52,3697,
-16,0,107,1,1803,
-892,1,1804,3698,16,
-0,107,1,2786,3480,
-1,2462,993,1,2136,
-947,1,2464,1003,1,
-2029,830,1,2466,3504,
-1,2031,841,1,2032,
-846,1,2033,851,1,
-2797,3498,1,2798,3699,
+998,1,2459,1004,1,
+1775,3717,16,0,110,
+1,32,3718,16,0,
+110,1,2540,3719,16,
+0,511,1,2105,936,
+1,2106,3720,16,0,
+110,1,2544,3721,16,
+0,511,1,2766,3722,
+16,0,110,1,2227,
+1030,1,2337,3723,16,
+0,110,1,2075,3724,
+16,0,110,1,52,
+3725,16,0,110,1,
+2779,3510,1,1803,909,
+1,1804,3726,16,0,
+110,1,1901,3727,16,
+0,110,1,2462,1011,
+1,2136,965,1,2464,
+1021,1,2029,847,1,
+2466,3525,1,2031,858,
+1,2032,863,1,2033,
+868,1,2035,874,1,
+2581,3728,16,0,110,
+1,2364,949,1,2039,
+884,1,1931,983,1,
+2041,890,1,2021,840,
+1,2043,896,1,2807,
+3551,1,2045,901,1,
+2818,3516,1,2819,3729,
+16,0,110,1,2037,
+879,1,1574,921,1,
+1958,3730,16,0,110,
+1,57,3731,19,109,
+1,57,3732,5,53,
+1,0,3733,16,0,
+107,1,2837,3530,1,
+2838,3536,1,2839,3541,
+1,2840,3546,1,1860,
+943,1,10,3734,16,
+0,107,1,2413,3735,
+16,0,107,1,2198,
+3736,16,0,107,1,
+1873,958,1,21,3737,
+16,0,107,1,1657,
+1016,1,2030,853,1,
+1989,1038,1,1990,3738,
+16,0,107,1,2458,
+998,1,2459,1004,1,
+1775,3739,16,0,107,
+1,32,3740,16,0,
+107,1,2105,936,1,
+2106,3741,16,0,107,
+1,2766,3742,16,0,
+107,1,2227,1030,1,
+2337,3743,16,0,107,
+1,2075,3744,16,0,
+107,1,52,3745,16,
+0,107,1,2779,3510,
+1,1803,909,1,1804,
+3746,16,0,107,1,
+1901,3747,16,0,107,
+1,2462,1011,1,2136,
+965,1,2464,1021,1,
+2029,847,1,2466,3525,
+1,2031,858,1,2032,
+863,1,2033,868,1,
+2035,874,1,2581,3748,
 16,0,107,1,2364,
-932,1,2039,867,1,
-1931,965,1,2041,873,
-1,2021,823,1,2043,
-879,1,2045,884,1,
-2816,3464,1,2817,3493,
-1,2818,3470,1,2819,
-3475,1,2037,862,1,
-1574,904,1,1958,3700,
-16,0,107,1,2745,
-3701,16,0,107,1,
-58,3702,19,380,1,
-58,3703,5,27,1,
-2627,1739,1,2628,1744,
-1,2629,1834,1,2630,
-1755,1,2520,1749,1,
-2632,1761,1,2633,1766,
-1,2560,1810,1,2635,
-1776,1,2636,1840,1,
-2625,1728,1,2638,1786,
-1,2565,1816,1,2640,
-3704,16,0,378,1,
-2459,986,1,2682,3705,
-16,0,378,1,2535,
-1791,1,2580,1804,1,
-2637,1781,1,2464,1003,
-1,2543,1823,1,2470,
-3706,16,0,378,1,
-2582,3707,16,0,378,
-1,2634,1771,1,2624,
-1829,1,2551,1798,1,
-2626,1734,1,59,3708,
-19,377,1,59,3709,
-5,27,1,2627,1739,
-1,2628,1744,1,2629,
-1834,1,2630,1755,1,
-2520,1749,1,2632,1761,
-1,2633,1766,1,2560,
-1810,1,2635,1776,1,
-2636,1840,1,2625,1728,
-1,2638,1786,1,2565,
-1816,1,2640,3710,16,
-0,375,1,2459,986,
-1,2682,3711,16,0,
-375,1,2535,1791,1,
-2580,1804,1,2637,1781,
-1,2464,1003,1,2543,
-1823,1,2470,3712,16,
-0,375,1,2582,3713,
-16,0,375,1,2634,
-1771,1,2624,1829,1,
-2551,1798,1,2626,1734,
-1,60,3714,19,423,
-1,60,3715,5,27,
-1,2627,1739,1,2628,
-1744,1,2629,1834,1,
-2630,1755,1,2520,1749,
-1,2632,1761,1,2633,
-1766,1,2560,1810,1,
-2635,1776,1,2636,1840,
-1,2625,1728,1,2638,
-1786,1,2565,1816,1,
-2640,3716,16,0,421,
-1,2459,986,1,2682,
-3717,16,0,421,1,
-2535,1791,1,2580,1804,
-1,2637,1781,1,2464,
-1003,1,2543,1823,1,
-2470,3718,16,0,421,
-1,2582,3719,16,0,
-421,1,2634,1771,1,
-2624,1829,1,2551,1798,
-1,2626,1734,1,61,
-3720,19,543,1,61,
-3721,5,27,1,2627,
-1739,1,2628,1744,1,
-2629,1834,1,2630,1755,
-1,2520,1749,1,2632,
-1761,1,2633,1766,1,
-2560,1810,1,2635,1776,
-1,2636,1840,1,2625,
-1728,1,2638,1786,1,
-2565,1816,1,2640,3722,
-16,0,541,1,2459,
-986,1,2682,3723,16,
-0,541,1,2535,1791,
-1,2580,1804,1,2637,
-1781,1,2464,1003,1,
-2543,1823,1,2470,3724,
-16,0,541,1,2582,
-3725,16,0,541,1,
-2634,1771,1,2624,1829,
-1,2551,1798,1,2626,
-1734,1,62,3726,19,
-665,1,62,3727,5,
-27,1,2627,1739,1,
-2628,1744,1,2629,1834,
-1,2630,1755,1,2520,
-1749,1,2632,1761,1,
-2633,1766,1,2560,1810,
-1,2635,1776,1,2636,
-1840,1,2625,1728,1,
-2638,1786,1,2565,1816,
-1,2640,3728,16,0,
-663,1,2459,986,1,
-2682,3729,16,0,663,
-1,2535,1791,1,2580,
-1804,1,2637,1781,1,
-2464,1003,1,2543,1823,
-1,2470,3730,16,0,
-663,1,2582,3731,16,
-0,663,1,2634,1771,
-1,2624,1829,1,2551,
-1798,1,2626,1734,1,
-63,3732,19,413,1,
-63,3733,5,27,1,
-2627,1739,1,2628,1744,
-1,2629,1834,1,2630,
-1755,1,2520,1749,1,
-2632,1761,1,2633,1766,
-1,2560,1810,1,2635,
-1776,1,2636,1840,1,
-2625,1728,1,2638,1786,
-1,2565,1816,1,2640,
-3734,16,0,411,1,
-2459,986,1,2682,3735,
-16,0,411,1,2535,
-1791,1,2580,1804,1,
-2637,1781,1,2464,1003,
-1,2543,1823,1,2470,
-3736,16,0,411,1,
-2582,3737,16,0,411,
-1,2634,1771,1,2624,
-1829,1,2551,1798,1,
-2626,1734,1,64,3738,
-19,410,1,64,3739,
-5,27,1,2627,1739,
-1,2628,1744,1,2629,
-1834,1,2630,1755,1,
-2520,1749,1,2632,1761,
-1,2633,1766,1,2560,
-1810,1,2635,1776,1,
-2636,1840,1,2625,1728,
-1,2638,1786,1,2565,
-1816,1,2640,3740,16,
-0,408,1,2459,986,
-1,2682,3741,16,0,
-408,1,2535,1791,1,
-2580,1804,1,2637,1781,
-1,2464,1003,1,2543,
-1823,1,2470,3742,16,
-0,408,1,2582,3743,
-16,0,408,1,2634,
-1771,1,2624,1829,1,
-2551,1798,1,2626,1734,
-1,65,3744,19,462,
-1,65,3745,5,27,
-1,2627,1739,1,2628,
-1744,1,2629,1834,1,
-2630,1755,1,2520,1749,
-1,2632,1761,1,2633,
-1766,1,2560,1810,1,
-2635,1776,1,2636,1840,
-1,2625,1728,1,2638,
-1786,1,2565,1816,1,
-2640,3746,16,0,460,
-1,2459,986,1,2682,
-3747,16,0,460,1,
-2535,1791,1,2580,1804,
-1,2637,1781,1,2464,
-1003,1,2543,1823,1,
-2470,3748,16,0,460,
-1,2582,3749,16,0,
-460,1,2634,1771,1,
-2624,1829,1,2551,1798,
-1,2626,1734,1,66,
-3750,19,459,1,66,
-3751,5,27,1,2627,
-1739,1,2628,1744,1,
-2629,1834,1,2630,1755,
-1,2520,1749,1,2632,
-1761,1,2633,1766,1,
-2560,1810,1,2635,1776,
-1,2636,1840,1,2625,
-1728,1,2638,1786,1,
-2565,1816,1,2640,3752,
-16,0,457,1,2459,
-986,1,2682,3753,16,
-0,457,1,2535,1791,
-1,2580,1804,1,2637,
-1781,1,2464,1003,1,
-2543,1823,1,2470,3754,
-16,0,457,1,2582,
-3755,16,0,457,1,
-2634,1771,1,2624,1829,
-1,2551,1798,1,2626,
-1734,1,67,3756,19,
-456,1,67,3757,5,
-27,1,2627,1739,1,
-2628,1744,1,2629,1834,
-1,2630,1755,1,2520,
-1749,1,2632,1761,1,
-2633,1766,1,2560,1810,
-1,2635,1776,1,2636,
-1840,1,2625,1728,1,
-2638,1786,1,2565,1816,
-1,2640,3758,16,0,
-454,1,2459,986,1,
-2682,3759,16,0,454,
-1,2535,1791,1,2580,
-1804,1,2637,1781,1,
-2464,1003,1,2543,1823,
-1,2470,3760,16,0,
-454,1,2582,3761,16,
-0,454,1,2634,1771,
-1,2624,1829,1,2551,
-1798,1,2626,1734,1,
-68,3762,19,453,1,
-68,3763,5,27,1,
-2627,1739,1,2628,1744,
-1,2629,1834,1,2630,
-1755,1,2520,1749,1,
-2632,1761,1,2633,1766,
-1,2560,1810,1,2635,
-1776,1,2636,1840,1,
-2625,1728,1,2638,1786,
-1,2565,1816,1,2640,
-3764,16,0,451,1,
-2459,986,1,2682,3765,
-16,0,451,1,2535,
-1791,1,2580,1804,1,
-2637,1781,1,2464,1003,
-1,2543,1823,1,2470,
-3766,16,0,451,1,
-2582,3767,16,0,451,
-1,2634,1771,1,2624,
-1829,1,2551,1798,1,
-2626,1734,1,69,3768,
-19,389,1,69,3769,
-5,27,1,2627,1739,
-1,2628,1744,1,2629,
-1834,1,2630,1755,1,
-2520,1749,1,2632,1761,
-1,2633,1766,1,2560,
-1810,1,2635,1776,1,
-2636,1840,1,2625,1728,
-1,2638,1786,1,2565,
-1816,1,2640,3770,16,
-0,387,1,2459,986,
-1,2682,3771,16,0,
-387,1,2535,1791,1,
-2580,1804,1,2637,1781,
-1,2464,1003,1,2543,
-1823,1,2470,3772,16,
-0,387,1,2582,3773,
-16,0,387,1,2634,
-1771,1,2624,1829,1,
-2551,1798,1,2626,1734,
-1,70,3774,19,386,
-1,70,3775,5,27,
-1,2627,1739,1,2628,
-1744,1,2629,1834,1,
-2630,1755,1,2520,1749,
-1,2632,1761,1,2633,
-1766,1,2560,1810,1,
-2635,1776,1,2636,1840,
-1,2625,1728,1,2638,
-1786,1,2565,1816,1,
-2640,3776,16,0,384,
-1,2459,986,1,2682,
-3777,16,0,384,1,
-2535,1791,1,2580,1804,
-1,2637,1781,1,2464,
-1003,1,2543,1823,1,
-2470,3778,16,0,384,
-1,2582,3779,16,0,
-384,1,2634,1771,1,
-2624,1829,1,2551,1798,
-1,2626,1734,1,71,
-3780,19,383,1,71,
-3781,5,27,1,2627,
-1739,1,2628,1744,1,
-2629,1834,1,2630,1755,
-1,2520,1749,1,2632,
-1761,1,2633,1766,1,
-2560,1810,1,2635,1776,
-1,2636,1840,1,2625,
-1728,1,2638,1786,1,
-2565,1816,1,2640,3782,
-16,0,381,1,2459,
-986,1,2682,3783,16,
-0,381,1,2535,1791,
-1,2580,1804,1,2637,
-1781,1,2464,1003,1,
-2543,1823,1,2470,3784,
-16,0,381,1,2582,
-3785,16,0,381,1,
-2634,1771,1,2624,1829,
-1,2551,1798,1,2626,
-1734,1,72,3786,19,
-450,1,72,3787,5,
-27,1,2627,1739,1,
-2628,1744,1,2629,1834,
-1,2630,1755,1,2520,
-1749,1,2632,1761,1,
-2633,1766,1,2560,1810,
-1,2635,1776,1,2636,
-1840,1,2625,1728,1,
-2638,1786,1,2565,1816,
-1,2640,3788,16,0,
-448,1,2459,986,1,
-2682,3789,16,0,448,
-1,2535,1791,1,2580,
-1804,1,2637,1781,1,
-2464,1003,1,2543,1823,
-1,2470,3790,16,0,
-448,1,2582,3791,16,
-0,448,1,2634,1771,
-1,2624,1829,1,2551,
-1798,1,2626,1734,1,
-73,3792,19,447,1,
-73,3793,5,27,1,
-2627,1739,1,2628,1744,
-1,2629,1834,1,2630,
-1755,1,2520,1749,1,
-2632,1761,1,2633,1766,
-1,2560,1810,1,2635,
-1776,1,2636,1840,1,
-2625,1728,1,2638,1786,
-1,2565,1816,1,2640,
-3794,16,0,445,1,
-2459,986,1,2682,3795,
-16,0,445,1,2535,
-1791,1,2580,1804,1,
-2637,1781,1,2464,1003,
-1,2543,1823,1,2470,
-3796,16,0,445,1,
-2582,3797,16,0,445,
-1,2634,1771,1,2624,
-1829,1,2551,1798,1,
-2626,1734,1,74,3798,
-19,751,1,74,3799,
-5,27,1,2627,1739,
-1,2628,1744,1,2629,
-1834,1,2630,1755,1,
-2520,1749,1,2632,1761,
-1,2633,1766,1,2560,
-1810,1,2635,1776,1,
-2636,1840,1,2625,1728,
-1,2638,1786,1,2565,
-1816,1,2640,3800,16,
-0,749,1,2459,986,
-1,2682,3801,16,0,
-749,1,2535,1791,1,
-2580,1804,1,2637,1781,
-1,2464,1003,1,2543,
-1823,1,2470,3802,16,
-0,749,1,2582,3803,
-16,0,749,1,2634,
-1771,1,2624,1829,1,
-2551,1798,1,2626,1734,
-1,75,3804,19,562,
-1,75,3805,5,27,
-1,2627,1739,1,2628,
-1744,1,2629,1834,1,
-2630,1755,1,2520,1749,
-1,2632,1761,1,2633,
-1766,1,2560,1810,1,
-2635,1776,1,2636,1840,
-1,2625,1728,1,2638,
-1786,1,2565,1816,1,
-2640,3806,16,0,560,
-1,2459,986,1,2682,
-3807,16,0,560,1,
-2535,1791,1,2580,1804,
-1,2637,1781,1,2464,
-1003,1,2543,1823,1,
-2470,3808,16,0,560,
-1,2582,3809,16,0,
-560,1,2634,1771,1,
-2624,1829,1,2551,1798,
-1,2626,1734,1,76,
-3810,19,432,1,76,
-3811,5,27,1,2627,
-1739,1,2628,1744,1,
-2629,1834,1,2630,1755,
-1,2520,1749,1,2632,
-1761,1,2633,1766,1,
-2560,1810,1,2635,1776,
-1,2636,1840,1,2625,
-1728,1,2638,1786,1,
-2565,1816,1,2640,3812,
-16,0,430,1,2459,
-986,1,2682,3813,16,
-0,430,1,2535,1791,
-1,2580,1804,1,2637,
-1781,1,2464,1003,1,
-2543,1823,1,2470,3814,
-16,0,430,1,2582,
-3815,16,0,430,1,
-2634,1771,1,2624,1829,
-1,2551,1798,1,2626,
-1734,1,77,3816,19,
-559,1,77,3817,5,
-27,1,2627,1739,1,
-2628,1744,1,2629,1834,
-1,2630,1755,1,2520,
-1749,1,2632,1761,1,
-2633,1766,1,2560,1810,
-1,2635,1776,1,2636,
-1840,1,2625,1728,1,
-2638,1786,1,2565,1816,
-1,2640,3818,16,0,
-557,1,2459,986,1,
-2682,3819,16,0,557,
-1,2535,1791,1,2580,
-1804,1,2637,1781,1,
-2464,1003,1,2543,1823,
-1,2470,3820,16,0,
-557,1,2582,3821,16,
-0,557,1,2634,1771,
-1,2624,1829,1,2551,
-1798,1,2626,1734,1,
-78,3822,19,556,1,
-78,3823,5,27,1,
-2627,1739,1,2628,1744,
-1,2629,1834,1,2630,
-1755,1,2520,1749,1,
-2632,1761,1,2633,1766,
-1,2560,1810,1,2635,
-1776,1,2636,1840,1,
-2625,1728,1,2638,1786,
-1,2565,1816,1,2640,
-3824,16,0,554,1,
-2459,986,1,2682,3825,
-16,0,554,1,2535,
-1791,1,2580,1804,1,
-2637,1781,1,2464,1003,
-1,2543,1823,1,2470,
-3826,16,0,554,1,
-2582,3827,16,0,554,
-1,2634,1771,1,2624,
-1829,1,2551,1798,1,
-2626,1734,1,79,3828,
-19,553,1,79,3829,
-5,27,1,2627,1739,
-1,2628,1744,1,2629,
-1834,1,2630,1755,1,
-2520,1749,1,2632,1761,
-1,2633,1766,1,2560,
-1810,1,2635,1776,1,
-2636,1840,1,2625,1728,
-1,2638,1786,1,2565,
-1816,1,2640,3830,16,
-0,551,1,2459,986,
-1,2682,3831,16,0,
-551,1,2535,1791,1,
-2580,1804,1,2637,1781,
-1,2464,1003,1,2543,
-1823,1,2470,3832,16,
-0,551,1,2582,3833,
-16,0,551,1,2634,
-1771,1,2624,1829,1,
-2551,1798,1,2626,1734,
-1,80,3834,19,420,
-1,80,3835,5,27,
-1,2627,1739,1,2628,
-1744,1,2629,1834,1,
-2630,1755,1,2520,1749,
-1,2632,1761,1,2633,
-1766,1,2560,1810,1,
-2635,1776,1,2636,1840,
-1,2625,1728,1,2638,
-1786,1,2565,1816,1,
-2640,3836,16,0,418,
-1,2459,986,1,2682,
-3837,16,0,418,1,
-2535,1791,1,2580,1804,
-1,2637,1781,1,2464,
-1003,1,2543,1823,1,
-2470,3838,16,0,418,
-1,2582,3839,16,0,
-418,1,2634,1771,1,
-2624,1829,1,2551,1798,
-1,2626,1734,1,81,
-3840,19,407,1,81,
-3841,5,27,1,2627,
-1739,1,2628,1744,1,
-2629,1834,1,2630,1755,
-1,2520,1749,1,2632,
-1761,1,2633,1766,1,
-2560,1810,1,2635,1776,
-1,2636,1840,1,2625,
-1728,1,2638,1786,1,
-2565,1816,1,2640,3842,
-16,0,405,1,2459,
-986,1,2682,3843,16,
-0,405,1,2535,1791,
-1,2580,1804,1,2637,
-1781,1,2464,1003,1,
-2543,1823,1,2470,3844,
-16,0,405,1,2582,
-3845,16,0,405,1,
-2634,1771,1,2624,1829,
-1,2551,1798,1,2626,
-1734,1,82,3846,19,
-443,1,82,3847,5,
-27,1,2627,1739,1,
-2628,1744,1,2629,1834,
-1,2630,1755,1,2520,
-1749,1,2632,1761,1,
-2633,1766,1,2560,1810,
-1,2635,1776,1,2636,
-1840,1,2625,1728,1,
-2638,1786,1,2565,1816,
-1,2640,3848,16,0,
-441,1,2459,986,1,
-2682,3849,16,0,441,
-1,2535,1791,1,2580,
-1804,1,2637,1781,1,
-2464,1003,1,2543,1823,
-1,2470,3850,16,0,
-441,1,2582,3851,16,
-0,441,1,2634,1771,
-1,2624,1829,1,2551,
-1798,1,2626,1734,1,
-83,3852,19,404,1,
-83,3853,5,27,1,
-2627,1739,1,2628,1744,
-1,2629,1834,1,2630,
-1755,1,2520,1749,1,
-2632,1761,1,2633,1766,
-1,2560,1810,1,2635,
-1776,1,2636,1840,1,
-2625,1728,1,2638,1786,
-1,2565,1816,1,2640,
-3854,16,0,402,1,
-2459,986,1,2682,3855,
-16,0,402,1,2535,
-1791,1,2580,1804,1,
-2637,1781,1,2464,1003,
-1,2543,1823,1,2470,
-3856,16,0,402,1,
-2582,3857,16,0,402,
-1,2634,1771,1,2624,
-1829,1,2551,1798,1,
-2626,1734,1,84,3858,
-19,401,1,84,3859,
-5,27,1,2627,1739,
-1,2628,1744,1,2629,
-1834,1,2630,1755,1,
-2520,1749,1,2632,1761,
-1,2633,1766,1,2560,
-1810,1,2635,1776,1,
-2636,1840,1,2625,1728,
-1,2638,1786,1,2565,
-1816,1,2640,3860,16,
-0,399,1,2459,986,
-1,2682,3861,16,0,
-399,1,2535,1791,1,
-2580,1804,1,2637,1781,
-1,2464,1003,1,2543,
-1823,1,2470,3862,16,
-0,399,1,2582,3863,
-16,0,399,1,2634,
-1771,1,2624,1829,1,
-2551,1798,1,2626,1734,
-1,85,3864,19,439,
-1,85,3865,5,27,
-1,2627,1739,1,2628,
-1744,1,2629,1834,1,
-2630,1755,1,2520,1749,
-1,2632,1761,1,2633,
-1766,1,2560,1810,1,
-2635,1776,1,2636,1840,
-1,2625,1728,1,2638,
-1786,1,2565,1816,1,
-2640,3866,16,0,437,
-1,2459,986,1,2682,
-3867,16,0,437,1,
-2535,1791,1,2580,1804,
-1,2637,1781,1,2464,
-1003,1,2543,1823,1,
-2470,3868,16,0,437,
-1,2582,3869,16,0,
-437,1,2634,1771,1,
-2624,1829,1,2551,1798,
-1,2626,1734,1,86,
-3870,19,436,1,86,
-3871,5,27,1,2627,
-1739,1,2628,1744,1,
-2629,1834,1,2630,1755,
-1,2520,1749,1,2632,
-1761,1,2633,1766,1,
-2560,1810,1,2635,1776,
-1,2636,1840,1,2625,
-1728,1,2638,1786,1,
-2565,1816,1,2640,3872,
-16,0,434,1,2459,
-986,1,2682,3873,16,
-0,434,1,2535,1791,
-1,2580,1804,1,2637,
-1781,1,2464,1003,1,
-2543,1823,1,2470,3874,
-16,0,434,1,2582,
-3875,16,0,434,1,
-2634,1771,1,2624,1829,
-1,2551,1798,1,2626,
-1734,1,87,3876,19,
-550,1,87,3877,5,
-27,1,2627,1739,1,
-2628,1744,1,2629,1834,
-1,2630,1755,1,2520,
-1749,1,2632,1761,1,
-2633,1766,1,2560,1810,
-1,2635,1776,1,2636,
-1840,1,2625,1728,1,
-2638,1786,1,2565,1816,
-1,2640,3878,16,0,
-548,1,2459,986,1,
-2682,3879,16,0,548,
-1,2535,1791,1,2580,
-1804,1,2637,1781,1,
-2464,1003,1,2543,1823,
-1,2470,3880,16,0,
-548,1,2582,3881,16,
-0,548,1,2634,1771,
-1,2624,1829,1,2551,
-1798,1,2626,1734,1,
-88,3882,19,398,1,
-88,3883,5,27,1,
-2627,1739,1,2628,1744,
-1,2629,1834,1,2630,
-1755,1,2520,1749,1,
-2632,1761,1,2633,1766,
-1,2560,1810,1,2635,
-1776,1,2636,1840,1,
-2625,1728,1,2638,1786,
-1,2565,1816,1,2640,
-3884,16,0,396,1,
-2459,986,1,2682,3885,
-16,0,396,1,2535,
-1791,1,2580,1804,1,
-2637,1781,1,2464,1003,
-1,2543,1823,1,2470,
-3886,16,0,396,1,
-2582,3887,16,0,396,
-1,2634,1771,1,2624,
-1829,1,2551,1798,1,
-2626,1734,1,89,3888,
-19,392,1,89,3889,
-5,27,1,2627,1739,
-1,2628,1744,1,2629,
-1834,1,2630,1755,1,
-2520,1749,1,2632,1761,
-1,2633,1766,1,2560,
-1810,1,2635,1776,1,
-2636,1840,1,2625,1728,
-1,2638,1786,1,2565,
-1816,1,2640,3890,16,
-0,390,1,2459,986,
-1,2682,3891,16,0,
-390,1,2535,1791,1,
-2580,1804,1,2637,1781,
-1,2464,1003,1,2543,
-1823,1,2470,3892,16,
-0,390,1,2582,3893,
-16,0,390,1,2634,
-1771,1,2624,1829,1,
-2551,1798,1,2626,1734,
-1,90,3894,19,395,
-1,90,3895,5,27,
-1,2627,1739,1,2628,
-1744,1,2629,1834,1,
-2630,1755,1,2520,1749,
-1,2632,1761,1,2633,
-1766,1,2560,1810,1,
-2635,1776,1,2636,1840,
-1,2625,1728,1,2638,
-1786,1,2565,1816,1,
-2640,3896,16,0,393,
-1,2459,986,1,2682,
-3897,16,0,393,1,
-2535,1791,1,2580,1804,
-1,2637,1781,1,2464,
-1003,1,2543,1823,1,
-2470,3898,16,0,393,
-1,2582,3899,16,0,
-393,1,2634,1771,1,
-2624,1829,1,2551,1798,
-1,2626,1734,1,91,
-3900,19,569,1,91,
-3901,5,27,1,2627,
-1739,1,2628,1744,1,
-2629,1834,1,2630,1755,
-1,2520,1749,1,2632,
-1761,1,2633,1766,1,
-2560,1810,1,2635,1776,
-1,2636,1840,1,2625,
-1728,1,2638,1786,1,
-2565,1816,1,2640,3902,
-16,0,567,1,2459,
-986,1,2682,3903,16,
-0,567,1,2535,1791,
-1,2580,1804,1,2637,
-1781,1,2464,1003,1,
-2543,1823,1,2470,3904,
-16,0,567,1,2582,
-3905,16,0,567,1,
-2634,1771,1,2624,1829,
-1,2551,1798,1,2626,
-1734,1,92,3906,19,
-133,1,92,3907,5,
-129,1,0,3908,16,
-0,355,1,1,2191,
-1,2,2197,1,3,
-2202,1,4,2207,1,
-5,2212,1,6,2217,
-1,7,2222,1,8,
-3909,16,0,131,1,
-1515,3910,16,0,180,
-1,2021,823,1,2022,
-3911,16,0,573,1,
-256,3912,16,0,188,
-1,2526,3913,16,0,
-294,1,2025,3914,16,
-0,577,1,18,3915,
-16,0,147,1,2027,
-3916,16,0,581,1,
-2029,830,1,2030,836,
-1,2031,841,1,2032,
-846,1,2786,3480,1,
-277,3917,16,0,188,
-1,2035,857,1,2037,
-862,1,2039,867,1,
-32,3918,16,0,180,
-1,2041,873,1,2293,
-3919,16,0,188,1,
-2043,879,1,2797,3498,
-1,2798,3920,16,0,
-355,1,41,3921,16,
-0,188,1,1297,3922,
-16,0,180,1,43,
-3923,16,0,188,1,
-2554,3924,16,0,531,
-1,46,3925,16,0,
-193,1,1804,3926,16,
-0,180,1,299,3927,
-16,0,188,1,52,
-3928,16,0,180,1,
-2816,3464,1,2817,3493,
-1,2818,3470,1,2819,
-3475,1,2318,3929,16,
-0,180,1,62,3930,
-16,0,209,1,65,
-3931,16,0,214,1,
-2075,3932,16,0,180,
-1,1574,904,1,71,
-3933,16,0,188,1,
-1775,3934,16,0,180,
-1,76,3935,16,0,
-188,1,1834,3936,16,
-0,180,1,2337,3937,
-16,0,180,1,79,
-3938,16,0,188,1,
-1335,3939,16,0,180,
-1,2511,3940,16,0,
-472,1,322,3941,16,
-0,188,1,85,3942,
-16,0,188,1,2761,
-3943,16,0,188,1,
-89,3944,16,0,188,
-1,2033,851,1,509,
-3945,16,0,188,1,
-346,3946,16,0,188,
-1,97,3947,16,0,
-188,1,2106,3948,16,
-0,180,1,102,3949,
-16,0,188,1,1860,
-926,1,1803,892,1,
-2364,932,1,1113,3950,
-16,0,173,1,112,
-3951,16,0,188,1,
-1117,3952,16,0,180,
-1,1873,940,1,1876,
-3953,16,0,180,1,
-372,3954,16,0,611,
-1,374,3955,16,0,
-613,1,124,3956,16,
-0,188,1,376,3957,
-16,0,615,1,378,
-3958,16,0,617,1,
-2136,947,1,1261,3959,
-16,0,180,1,381,
-3960,16,0,188,1,
-525,3961,16,0,188,
-1,137,3962,16,0,
-188,1,1901,3963,16,
-0,180,1,1153,3964,
-16,0,180,1,151,
-3965,16,0,188,1,
-1407,3966,16,0,180,
-1,1659,3967,16,0,
-180,1,2413,3968,16,
-0,180,1,406,3969,
-16,0,188,1,1371,
-3970,16,0,180,1,
-2105,919,1,166,3971,
-16,0,188,1,2045,
-884,1,1622,3972,16,
-0,188,1,2758,3487,
-1,1931,965,1,1933,
-3973,16,0,180,1,
-431,3974,16,0,188,
-1,1585,3975,16,0,
-188,1,182,3976,16,
-0,188,1,1189,3977,
-16,0,180,1,1443,
-3978,16,0,180,1,
-1695,3979,16,0,180,
-1,2198,3980,16,0,
-180,1,447,3981,16,
-0,188,1,2458,980,
-1,2459,986,1,1958,
-3982,16,0,180,1,
-2462,993,1,1657,998,
-1,2464,1003,1,2466,
-3504,1,459,3983,16,
-0,188,1,2468,3984,
-16,0,373,1,462,
-3985,16,0,188,1,
-199,3986,16,0,188,
-1,217,3987,16,0,
-188,1,2227,1012,1,
-1225,3988,16,0,180,
-1,1479,3989,16,0,
-180,1,1731,3990,16,
-0,188,1,1989,1020,
-1,1990,3991,16,0,
-180,1,236,3992,16,
-0,188,1,2507,3993,
-16,0,468,1,1756,
-3994,16,0,180,1,
-93,3995,19,719,1,
-93,3996,5,95,1,
-2761,3997,16,0,717,
-1,256,3998,16,0,
-717,1,1261,3999,16,
-0,717,1,509,4000,
-16,0,717,1,1515,
-4001,16,0,717,1,
-2021,823,1,1775,4002,
-16,0,717,1,2029,
-830,1,2030,836,1,
-2031,841,1,2032,846,
-1,2033,851,1,277,
-4003,16,0,717,1,
-2035,857,1,2037,862,
-1,2039,867,1,32,
-4004,16,0,717,1,
-2041,873,1,2293,4005,
-16,0,717,1,2043,
-879,1,2045,884,1,
-41,4006,16,0,717,
-1,1297,4007,16,0,
-717,1,43,4008,16,
-0,717,1,1803,892,
-1,1804,4009,16,0,
-717,1,299,4010,16,
-0,717,1,52,4011,
-16,0,717,1,2318,
-4012,16,0,717,1,
-62,4013,16,0,717,
-1,2075,4014,16,0,
-717,1,1574,904,1,
-71,4015,16,0,717,
-1,76,4016,16,0,
-717,1,1834,4017,16,
-0,717,1,2337,4018,
-16,0,717,1,79,
-4019,16,0,717,1,
-1335,4020,16,0,717,
-1,322,4021,16,0,
-717,1,85,4022,16,
-0,717,1,89,4023,
-16,0,717,1,346,
-4024,16,0,717,1,
-2105,919,1,2106,4025,
-16,0,717,1,97,
-4026,16,0,717,1,
-1860,926,1,2364,932,
-1,102,4027,16,0,
-717,1,112,4028,16,
-0,717,1,1117,4029,
-16,0,717,1,1873,
-940,1,1876,4030,16,
-0,717,1,124,4031,
-16,0,717,1,2136,
-947,1,381,4032,16,
-0,717,1,525,4033,
-16,0,717,1,137,
-4034,16,0,717,1,
-1901,4035,16,0,717,
-1,1153,4036,16,0,
-717,1,151,4037,16,
-0,717,1,1407,4038,
-16,0,717,1,1659,
-4039,16,0,717,1,
-2413,4040,16,0,717,
-1,406,4041,16,0,
-717,1,1371,4042,16,
-0,717,1,166,4043,
-16,0,717,1,1622,
-4044,16,0,717,1,
-1931,965,1,1933,4045,
-16,0,717,1,431,
-4046,16,0,717,1,
-1585,4047,16,0,717,
-1,182,4048,16,0,
-717,1,1189,4049,16,
-0,717,1,1443,4050,
-16,0,717,1,1695,
-4051,16,0,717,1,
-2198,4052,16,0,717,
-1,447,4053,16,0,
-717,1,2458,980,1,
-2459,986,1,1958,4054,
-16,0,717,1,2462,
-993,1,1657,998,1,
-2464,1003,1,199,4055,
-16,0,717,1,459,
-4056,16,0,717,1,
-462,4057,16,0,717,
-1,217,4058,16,0,
-717,1,2227,1012,1,
-1225,4059,16,0,717,
-1,1479,4060,16,0,
-717,1,1731,4061,16,
-0,717,1,1989,1020,
-1,1990,4062,16,0,
-717,1,236,4063,16,
-0,717,1,1756,4064,
-16,0,717,1,94,
-4065,19,716,1,94,
-4066,5,95,1,2761,
-4067,16,0,714,1,
-256,4068,16,0,714,
-1,1261,4069,16,0,
-714,1,509,4070,16,
-0,714,1,1515,4071,
-16,0,714,1,2021,
-823,1,1775,4072,16,
-0,714,1,2029,830,
-1,2030,836,1,2031,
-841,1,2032,846,1,
-2033,851,1,277,4073,
-16,0,714,1,2035,
-857,1,2037,862,1,
-2039,867,1,32,4074,
-16,0,714,1,2041,
-873,1,2293,4075,16,
-0,714,1,2043,879,
-1,2045,884,1,41,
-4076,16,0,714,1,
-1297,4077,16,0,714,
-1,43,4078,16,0,
-714,1,1803,892,1,
-1804,4079,16,0,714,
-1,299,4080,16,0,
-714,1,52,4081,16,
-0,714,1,2318,4082,
-16,0,714,1,62,
-4083,16,0,714,1,
-2075,4084,16,0,714,
-1,1574,904,1,71,
-4085,16,0,714,1,
-76,4086,16,0,714,
-1,1834,4087,16,0,
-714,1,2337,4088,16,
-0,714,1,79,4089,
-16,0,714,1,1335,
-4090,16,0,714,1,
-322,4091,16,0,714,
-1,85,4092,16,0,
-714,1,89,4093,16,
-0,714,1,346,4094,
-16,0,714,1,2105,
-919,1,2106,4095,16,
-0,714,1,97,4096,
-16,0,714,1,1860,
-926,1,2364,932,1,
-102,4097,16,0,714,
-1,112,4098,16,0,
-714,1,1117,4099,16,
-0,714,1,1873,940,
-1,1876,4100,16,0,
-714,1,124,4101,16,
-0,714,1,2136,947,
-1,381,4102,16,0,
-714,1,525,4103,16,
-0,714,1,137,4104,
-16,0,714,1,1901,
-4105,16,0,714,1,
-1153,4106,16,0,714,
-1,151,4107,16,0,
-714,1,1407,4108,16,
-0,714,1,1659,4109,
-16,0,714,1,2413,
-4110,16,0,714,1,
-406,4111,16,0,714,
-1,1371,4112,16,0,
-714,1,166,4113,16,
-0,714,1,1622,4114,
-16,0,714,1,1931,
-965,1,1933,4115,16,
-0,714,1,431,4116,
-16,0,714,1,1585,
-4117,16,0,714,1,
-182,4118,16,0,714,
-1,1189,4119,16,0,
-714,1,1443,4120,16,
-0,714,1,1695,4121,
-16,0,714,1,2198,
-4122,16,0,714,1,
-447,4123,16,0,714,
-1,2458,980,1,2459,
-986,1,1958,4124,16,
-0,714,1,2462,993,
-1,1657,998,1,2464,
-1003,1,199,4125,16,
-0,714,1,459,4126,
-16,0,714,1,462,
-4127,16,0,714,1,
-217,4128,16,0,714,
-1,2227,1012,1,1225,
-4129,16,0,714,1,
-1479,4130,16,0,714,
-1,1731,4131,16,0,
-714,1,1989,1020,1,
-1990,4132,16,0,714,
-1,236,4133,16,0,
-714,1,1756,4134,16,
-0,714,1,95,4135,
-19,713,1,95,4136,
-5,95,1,2761,4137,
-16,0,711,1,256,
-4138,16,0,711,1,
-1261,4139,16,0,711,
-1,509,4140,16,0,
-711,1,1515,4141,16,
-0,711,1,2021,823,
-1,1775,4142,16,0,
-711,1,2029,830,1,
-2030,836,1,2031,841,
-1,2032,846,1,2033,
-851,1,277,4143,16,
-0,711,1,2035,857,
-1,2037,862,1,2039,
-867,1,32,4144,16,
-0,711,1,2041,873,
-1,2293,4145,16,0,
-711,1,2043,879,1,
-2045,884,1,41,4146,
-16,0,711,1,1297,
-4147,16,0,711,1,
-43,4148,16,0,711,
-1,1803,892,1,1804,
-4149,16,0,711,1,
-299,4150,16,0,711,
-1,52,4151,16,0,
-711,1,2318,4152,16,
-0,711,1,62,4153,
-16,0,711,1,2075,
-4154,16,0,711,1,
-1574,904,1,71,4155,
-16,0,711,1,76,
-4156,16,0,711,1,
-1834,4157,16,0,711,
-1,2337,4158,16,0,
-711,1,79,4159,16,
-0,711,1,1335,4160,
-16,0,711,1,322,
-4161,16,0,711,1,
-85,4162,16,0,711,
-1,89,4163,16,0,
-711,1,346,4164,16,
-0,711,1,2105,919,
-1,2106,4165,16,0,
-711,1,97,4166,16,
-0,711,1,1860,926,
-1,2364,932,1,102,
-4167,16,0,711,1,
-112,4168,16,0,711,
-1,1117,4169,16,0,
-711,1,1873,940,1,
-1876,4170,16,0,711,
-1,124,4171,16,0,
-711,1,2136,947,1,
-381,4172,16,0,711,
-1,525,4173,16,0,
-711,1,137,4174,16,
-0,711,1,1901,4175,
-16,0,711,1,1153,
-4176,16,0,711,1,
-151,4177,16,0,711,
-1,1407,4178,16,0,
-711,1,1659,4179,16,
-0,711,1,2413,4180,
-16,0,711,1,406,
-4181,16,0,711,1,
-1371,4182,16,0,711,
-1,166,4183,16,0,
-711,1,1622,4184,16,
-0,711,1,1931,965,
-1,1933,4185,16,0,
-711,1,431,4186,16,
-0,711,1,1585,4187,
-16,0,711,1,182,
-4188,16,0,711,1,
-1189,4189,16,0,711,
-1,1443,4190,16,0,
-711,1,1695,4191,16,
-0,711,1,2198,4192,
-16,0,711,1,447,
-4193,16,0,711,1,
-2458,980,1,2459,986,
-1,1958,4194,16,0,
-711,1,2462,993,1,
-1657,998,1,2464,1003,
-1,199,4195,16,0,
-711,1,459,4196,16,
-0,711,1,462,4197,
-16,0,711,1,217,
-4198,16,0,711,1,
-2227,1012,1,1225,4199,
-16,0,711,1,1479,
-4200,16,0,711,1,
-1731,4201,16,0,711,
-1,1989,1020,1,1990,
-4202,16,0,711,1,
-236,4203,16,0,711,
-1,1756,4204,16,0,
-711,1,96,4205,19,
-103,1,96,4206,5,
-1,1,0,4207,16,
-0,104,1,97,4208,
-19,142,1,97,4209,
-5,1,1,0,4210,
-16,0,140,1,98,
-4211,19,172,1,98,
-4212,5,2,1,0,
-4213,16,0,170,1,
-2798,4214,16,0,497,
-1,99,4215,19,169,
-1,99,4216,5,2,
-1,0,4217,16,0,
-167,1,2798,4218,16,
-0,268,1,100,4219,
-19,485,1,100,4220,
-5,2,1,0,4221,
-16,0,752,1,2798,
-4222,16,0,483,1,
-101,4223,19,279,1,
-101,4224,5,4,1,
-0,4225,16,0,354,
-1,2809,4226,16,0,
-277,1,2798,4227,16,
-0,354,1,2739,4228,
-16,0,277,1,102,
-4229,19,309,1,102,
-4230,5,2,1,2640,
-4231,16,0,307,1,
-2470,4232,16,0,760,
-1,103,4233,19,730,
-1,103,4234,5,4,
-1,2640,4235,16,0,
-737,1,2470,4236,16,
-0,737,1,2582,4237,
-16,0,728,1,2682,
-4238,16,0,728,1,
-104,4239,19,727,1,
-104,4240,5,4,1,
-2640,4241,16,0,736,
-1,2470,4242,16,0,
-736,1,2582,4243,16,
-0,725,1,2682,4244,
-16,0,725,1,105,
-4245,19,652,1,105,
-4246,5,4,1,2640,
-4247,16,0,650,1,
-2470,4248,16,0,650,
-1,2582,4249,16,0,
-724,1,2682,4250,16,
-0,724,1,106,4251,
-19,333,1,106,4252,
-5,4,1,2640,4253,
-16,0,331,1,2470,
-4254,16,0,331,1,
-2582,4255,16,0,639,
-1,2682,4256,16,0,
-639,1,107,4257,19,
-638,1,107,4258,5,
-4,1,2640,4259,16,
-0,734,1,2470,4260,
-16,0,734,1,2582,
-4261,16,0,636,1,
-2682,4262,16,0,636,
-1,108,4263,19,635,
-1,108,4264,5,4,
-1,2640,4265,16,0,
-733,1,2470,4266,16,
-0,733,1,2582,4267,
-16,0,633,1,2682,
-4268,16,0,633,1,
-109,4269,19,145,1,
-109,4270,5,4,1,
-2640,4271,16,0,143,
-1,2470,4272,16,0,
-143,1,2582,4273,16,
-0,247,1,2682,4274,
-16,0,247,1,110,
-4275,19,150,1,110,
-4276,5,3,1,2567,
-4277,16,0,753,1,
-2745,4278,16,0,204,
-1,10,4279,16,0,
-148,1,111,4280,19,
-658,1,111,4281,5,
-1,1,2553,4282,16,
-0,656,1,112,4283,
-19,524,1,112,4284,
-5,1,1,2545,4285,
-16,0,522,1,113,
-4286,19,511,1,113,
-4287,5,1,1,2537,
-4288,16,0,509,1,
-114,4289,19,501,1,
-114,4290,5,1,1,
-2522,4291,16,0,499,
-1,115,4292,19,481,
-1,115,4293,5,1,
-1,2506,4294,16,0,
-479,1,116,4295,19,
-160,1,116,4296,5,
-17,1,0,4297,16,
-0,766,1,2075,4298,
-16,0,746,1,2337,
-4299,16,0,746,1,
-2745,4300,16,0,369,
-1,2413,4301,16,0,
-746,1,10,4302,16,
-0,369,1,1901,4303,
+949,1,2039,884,1,
+1931,983,1,2041,890,
+1,2021,840,1,2043,
+896,1,2807,3551,1,
+2045,901,1,2818,3516,
+1,2819,3749,16,0,
+107,1,2037,879,1,
+1574,921,1,1958,3750,
+16,0,107,1,58,
+3751,19,386,1,58,
+3752,5,30,1,2644,
+1753,1,2520,1758,1,
+2639,1765,1,2640,1770,
+1,2641,1775,1,2642,
+1780,1,2643,1747,1,
+2535,1785,1,2645,1791,
+1,2646,1796,1,2648,
+1875,1,2649,1802,1,
+2650,1807,1,2651,1812,
+1,2652,1817,1,2653,
+1822,1,2654,1827,1,
+2655,1832,1,2657,3753,
+16,0,384,1,2550,
+1843,1,2579,1861,1,
+2558,1849,1,2566,1855,
+1,2459,1004,1,2464,
+1021,1,2574,1837,1,
+2470,3754,16,0,384,
+1,2700,3755,16,0,
+384,1,2594,1868,1,
+2596,3756,16,0,384,
+1,59,3757,19,383,
+1,59,3758,5,30,
+1,2644,1753,1,2520,
+1758,1,2639,1765,1,
+2640,1770,1,2641,1775,
+1,2642,1780,1,2643,
+1747,1,2535,1785,1,
+2645,1791,1,2646,1796,
+1,2648,1875,1,2649,
+1802,1,2650,1807,1,
+2651,1812,1,2652,1817,
+1,2653,1822,1,2654,
+1827,1,2655,1832,1,
+2657,3759,16,0,381,
+1,2550,1843,1,2579,
+1861,1,2558,1849,1,
+2566,1855,1,2459,1004,
+1,2464,1021,1,2574,
+1837,1,2470,3760,16,
+0,381,1,2700,3761,
+16,0,381,1,2594,
+1868,1,2596,3762,16,
+0,381,1,60,3763,
+19,545,1,60,3764,
+5,30,1,2644,1753,
+1,2520,1758,1,2639,
+1765,1,2640,1770,1,
+2641,1775,1,2642,1780,
+1,2643,1747,1,2535,
+1785,1,2645,1791,1,
+2646,1796,1,2648,1875,
+1,2649,1802,1,2650,
+1807,1,2651,1812,1,
+2652,1817,1,2653,1822,
+1,2654,1827,1,2655,
+1832,1,2657,3765,16,
+0,543,1,2550,1843,
+1,2579,1861,1,2558,
+1849,1,2566,1855,1,
+2459,1004,1,2464,1021,
+1,2574,1837,1,2470,
+3766,16,0,543,1,
+2700,3767,16,0,543,
+1,2594,1868,1,2596,
+3768,16,0,543,1,
+61,3769,19,423,1,
+61,3770,5,30,1,
+2644,1753,1,2520,1758,
+1,2639,1765,1,2640,
+1770,1,2641,1775,1,
+2642,1780,1,2643,1747,
+1,2535,1785,1,2645,
+1791,1,2646,1796,1,
+2648,1875,1,2649,1802,
+1,2650,1807,1,2651,
+1812,1,2652,1817,1,
+2653,1822,1,2654,1827,
+1,2655,1832,1,2657,
+3771,16,0,421,1,
+2550,1843,1,2579,1861,
+1,2558,1849,1,2566,
+1855,1,2459,1004,1,
+2464,1021,1,2574,1837,
+1,2470,3772,16,0,
+421,1,2700,3773,16,
+0,421,1,2594,1868,
+1,2596,3774,16,0,
+421,1,62,3775,19,
+541,1,62,3776,5,
+30,1,2644,1753,1,
+2520,1758,1,2639,1765,
+1,2640,1770,1,2641,
+1775,1,2642,1780,1,
+2643,1747,1,2535,1785,
+1,2645,1791,1,2646,
+1796,1,2648,1875,1,
+2649,1802,1,2650,1807,
+1,2651,1812,1,2652,
+1817,1,2653,1822,1,
+2654,1827,1,2655,1832,
+1,2657,3777,16,0,
+539,1,2550,1843,1,
+2579,1861,1,2558,1849,
+1,2566,1855,1,2459,
+1004,1,2464,1021,1,
+2574,1837,1,2470,3778,
+16,0,539,1,2700,
+3779,16,0,539,1,
+2594,1868,1,2596,3780,
+16,0,539,1,63,
+3781,19,653,1,63,
+3782,5,30,1,2644,
+1753,1,2520,1758,1,
+2639,1765,1,2640,1770,
+1,2641,1775,1,2642,
+1780,1,2643,1747,1,
+2535,1785,1,2645,1791,
+1,2646,1796,1,2648,
+1875,1,2649,1802,1,
+2650,1807,1,2651,1812,
+1,2652,1817,1,2653,
+1822,1,2654,1827,1,
+2655,1832,1,2657,3783,
+16,0,651,1,2550,
+1843,1,2579,1861,1,
+2558,1849,1,2566,1855,
+1,2459,1004,1,2464,
+1021,1,2574,1837,1,
+2470,3784,16,0,651,
+1,2700,3785,16,0,
+651,1,2594,1868,1,
+2596,3786,16,0,651,
+1,64,3787,19,416,
+1,64,3788,5,30,
+1,2644,1753,1,2520,
+1758,1,2639,1765,1,
+2640,1770,1,2641,1775,
+1,2642,1780,1,2643,
+1747,1,2535,1785,1,
+2645,1791,1,2646,1796,
+1,2648,1875,1,2649,
+1802,1,2650,1807,1,
+2651,1812,1,2652,1817,
+1,2653,1822,1,2654,
+1827,1,2655,1832,1,
+2657,3789,16,0,414,
+1,2550,1843,1,2579,
+1861,1,2558,1849,1,
+2566,1855,1,2459,1004,
+1,2464,1021,1,2574,
+1837,1,2470,3790,16,
+0,414,1,2700,3791,
+16,0,414,1,2594,
+1868,1,2596,3792,16,
+0,414,1,65,3793,
+19,380,1,65,3794,
+5,30,1,2644,1753,
+1,2520,1758,1,2639,
+1765,1,2640,1770,1,
+2641,1775,1,2642,1780,
+1,2643,1747,1,2535,
+1785,1,2645,1791,1,
+2646,1796,1,2648,1875,
+1,2649,1802,1,2650,
+1807,1,2651,1812,1,
+2652,1817,1,2653,1822,
+1,2654,1827,1,2655,
+1832,1,2657,3795,16,
+0,378,1,2550,1843,
+1,2579,1861,1,2558,
+1849,1,2566,1855,1,
+2459,1004,1,2464,1021,
+1,2574,1837,1,2470,
+3796,16,0,378,1,
+2700,3797,16,0,378,
+1,2594,1868,1,2596,
+3798,16,0,378,1,
+66,3799,19,465,1,
+66,3800,5,30,1,
+2644,1753,1,2520,1758,
+1,2639,1765,1,2640,
+1770,1,2641,1775,1,
+2642,1780,1,2643,1747,
+1,2535,1785,1,2645,
+1791,1,2646,1796,1,
+2648,1875,1,2649,1802,
+1,2650,1807,1,2651,
+1812,1,2652,1817,1,
+2653,1822,1,2654,1827,
+1,2655,1832,1,2657,
+3801,16,0,463,1,
+2550,1843,1,2579,1861,
+1,2558,1849,1,2566,
+1855,1,2459,1004,1,
+2464,1021,1,2574,1837,
+1,2470,3802,16,0,
+463,1,2700,3803,16,
+0,463,1,2594,1868,
+1,2596,3804,16,0,
+463,1,67,3805,19,
+462,1,67,3806,5,
+30,1,2644,1753,1,
+2520,1758,1,2639,1765,
+1,2640,1770,1,2641,
+1775,1,2642,1780,1,
+2643,1747,1,2535,1785,
+1,2645,1791,1,2646,
+1796,1,2648,1875,1,
+2649,1802,1,2650,1807,
+1,2651,1812,1,2652,
+1817,1,2653,1822,1,
+2654,1827,1,2655,1832,
+1,2657,3807,16,0,
+460,1,2550,1843,1,
+2579,1861,1,2558,1849,
+1,2566,1855,1,2459,
+1004,1,2464,1021,1,
+2574,1837,1,2470,3808,
+16,0,460,1,2700,
+3809,16,0,460,1,
+2594,1868,1,2596,3810,
+16,0,460,1,68,
+3811,19,459,1,68,
+3812,5,30,1,2644,
+1753,1,2520,1758,1,
+2639,1765,1,2640,1770,
+1,2641,1775,1,2642,
+1780,1,2643,1747,1,
+2535,1785,1,2645,1791,
+1,2646,1796,1,2648,
+1875,1,2649,1802,1,
+2650,1807,1,2651,1812,
+1,2652,1817,1,2653,
+1822,1,2654,1827,1,
+2655,1832,1,2657,3813,
+16,0,457,1,2550,
+1843,1,2579,1861,1,
+2558,1849,1,2566,1855,
+1,2459,1004,1,2464,
+1021,1,2574,1837,1,
+2470,3814,16,0,457,
+1,2700,3815,16,0,
+457,1,2594,1868,1,
+2596,3816,16,0,457,
+1,69,3817,19,395,
+1,69,3818,5,30,
+1,2644,1753,1,2520,
+1758,1,2639,1765,1,
+2640,1770,1,2641,1775,
+1,2642,1780,1,2643,
+1747,1,2535,1785,1,
+2645,1791,1,2646,1796,
+1,2648,1875,1,2649,
+1802,1,2650,1807,1,
+2651,1812,1,2652,1817,
+1,2653,1822,1,2654,
+1827,1,2655,1832,1,
+2657,3819,16,0,393,
+1,2550,1843,1,2579,
+1861,1,2558,1849,1,
+2566,1855,1,2459,1004,
+1,2464,1021,1,2574,
+1837,1,2470,3820,16,
+0,393,1,2700,3821,
+16,0,393,1,2594,
+1868,1,2596,3822,16,
+0,393,1,70,3823,
+19,392,1,70,3824,
+5,30,1,2644,1753,
+1,2520,1758,1,2639,
+1765,1,2640,1770,1,
+2641,1775,1,2642,1780,
+1,2643,1747,1,2535,
+1785,1,2645,1791,1,
+2646,1796,1,2648,1875,
+1,2649,1802,1,2650,
+1807,1,2651,1812,1,
+2652,1817,1,2653,1822,
+1,2654,1827,1,2655,
+1832,1,2657,3825,16,
+0,390,1,2550,1843,
+1,2579,1861,1,2558,
+1849,1,2566,1855,1,
+2459,1004,1,2464,1021,
+1,2574,1837,1,2470,
+3826,16,0,390,1,
+2700,3827,16,0,390,
+1,2594,1868,1,2596,
+3828,16,0,390,1,
+71,3829,19,389,1,
+71,3830,5,30,1,
+2644,1753,1,2520,1758,
+1,2639,1765,1,2640,
+1770,1,2641,1775,1,
+2642,1780,1,2643,1747,
+1,2535,1785,1,2645,
+1791,1,2646,1796,1,
+2648,1875,1,2649,1802,
+1,2650,1807,1,2651,
+1812,1,2652,1817,1,
+2653,1822,1,2654,1827,
+1,2655,1832,1,2657,
+3831,16,0,387,1,
+2550,1843,1,2579,1861,
+1,2558,1849,1,2566,
+1855,1,2459,1004,1,
+2464,1021,1,2574,1837,
+1,2470,3832,16,0,
+387,1,2700,3833,16,
+0,387,1,2594,1868,
+1,2596,3834,16,0,
+387,1,72,3835,19,
+456,1,72,3836,5,
+30,1,2644,1753,1,
+2520,1758,1,2639,1765,
+1,2640,1770,1,2641,
+1775,1,2642,1780,1,
+2643,1747,1,2535,1785,
+1,2645,1791,1,2646,
+1796,1,2648,1875,1,
+2649,1802,1,2650,1807,
+1,2651,1812,1,2652,
+1817,1,2653,1822,1,
+2654,1827,1,2655,1832,
+1,2657,3837,16,0,
+454,1,2550,1843,1,
+2579,1861,1,2558,1849,
+1,2566,1855,1,2459,
+1004,1,2464,1021,1,
+2574,1837,1,2470,3838,
+16,0,454,1,2700,
+3839,16,0,454,1,
+2594,1868,1,2596,3840,
+16,0,454,1,73,
+3841,19,453,1,73,
+3842,5,30,1,2644,
+1753,1,2520,1758,1,
+2639,1765,1,2640,1770,
+1,2641,1775,1,2642,
+1780,1,2643,1747,1,
+2535,1785,1,2645,1791,
+1,2646,1796,1,2648,
+1875,1,2649,1802,1,
+2650,1807,1,2651,1812,
+1,2652,1817,1,2653,
+1822,1,2654,1827,1,
+2655,1832,1,2657,3843,
+16,0,451,1,2550,
+1843,1,2579,1861,1,
+2558,1849,1,2566,1855,
+1,2459,1004,1,2464,
+1021,1,2574,1837,1,
+2470,3844,16,0,451,
+1,2700,3845,16,0,
+451,1,2594,1868,1,
+2596,3846,16,0,451,
+1,74,3847,19,450,
+1,74,3848,5,30,
+1,2644,1753,1,2520,
+1758,1,2639,1765,1,
+2640,1770,1,2641,1775,
+1,2642,1780,1,2643,
+1747,1,2535,1785,1,
+2645,1791,1,2646,1796,
+1,2648,1875,1,2649,
+1802,1,2650,1807,1,
+2651,1812,1,2652,1817,
+1,2653,1822,1,2654,
+1827,1,2655,1832,1,
+2657,3849,16,0,448,
+1,2550,1843,1,2579,
+1861,1,2558,1849,1,
+2566,1855,1,2459,1004,
+1,2464,1021,1,2574,
+1837,1,2470,3850,16,
+0,448,1,2700,3851,
+16,0,448,1,2594,
+1868,1,2596,3852,16,
+0,448,1,75,3853,
+19,439,1,75,3854,
+5,30,1,2644,1753,
+1,2520,1758,1,2639,
+1765,1,2640,1770,1,
+2641,1775,1,2642,1780,
+1,2643,1747,1,2535,
+1785,1,2645,1791,1,
+2646,1796,1,2648,1875,
+1,2649,1802,1,2650,
+1807,1,2651,1812,1,
+2652,1817,1,2653,1822,
+1,2654,1827,1,2655,
+1832,1,2657,3855,16,
+0,437,1,2550,1843,
+1,2579,1861,1,2558,
+1849,1,2566,1855,1,
+2459,1004,1,2464,1021,
+1,2574,1837,1,2470,
+3856,16,0,437,1,
+2700,3857,16,0,437,
+1,2594,1868,1,2596,
+3858,16,0,437,1,
+76,3859,19,560,1,
+76,3860,5,30,1,
+2644,1753,1,2520,1758,
+1,2639,1765,1,2640,
+1770,1,2641,1775,1,
+2642,1780,1,2643,1747,
+1,2535,1785,1,2645,
+1791,1,2646,1796,1,
+2648,1875,1,2649,1802,
+1,2650,1807,1,2651,
+1812,1,2652,1817,1,
+2653,1822,1,2654,1827,
+1,2655,1832,1,2657,
+3861,16,0,558,1,
+2550,1843,1,2579,1861,
+1,2558,1849,1,2566,
+1855,1,2459,1004,1,
+2464,1021,1,2574,1837,
+1,2470,3862,16,0,
+558,1,2700,3863,16,
+0,558,1,2594,1868,
+1,2596,3864,16,0,
+558,1,77,3865,19,
+435,1,77,3866,5,
+30,1,2644,1753,1,
+2520,1758,1,2639,1765,
+1,2640,1770,1,2641,
+1775,1,2642,1780,1,
+2643,1747,1,2535,1785,
+1,2645,1791,1,2646,
+1796,1,2648,1875,1,
+2649,1802,1,2650,1807,
+1,2651,1812,1,2652,
+1817,1,2653,1822,1,
+2654,1827,1,2655,1832,
+1,2657,3867,16,0,
+433,1,2550,1843,1,
+2579,1861,1,2558,1849,
+1,2566,1855,1,2459,
+1004,1,2464,1021,1,
+2574,1837,1,2470,3868,
+16,0,433,1,2700,
+3869,16,0,433,1,
+2594,1868,1,2596,3870,
+16,0,433,1,78,
+3871,19,554,1,78,
+3872,5,30,1,2644,
+1753,1,2520,1758,1,
+2639,1765,1,2640,1770,
+1,2641,1775,1,2642,
+1780,1,2643,1747,1,
+2535,1785,1,2645,1791,
+1,2646,1796,1,2648,
+1875,1,2649,1802,1,
+2650,1807,1,2651,1812,
+1,2652,1817,1,2653,
+1822,1,2654,1827,1,
+2655,1832,1,2657,3873,
+16,0,552,1,2550,
+1843,1,2579,1861,1,
+2558,1849,1,2566,1855,
+1,2459,1004,1,2464,
+1021,1,2574,1837,1,
+2470,3874,16,0,552,
+1,2700,3875,16,0,
+552,1,2594,1868,1,
+2596,3876,16,0,552,
+1,79,3877,19,551,
+1,79,3878,5,30,
+1,2644,1753,1,2520,
+1758,1,2639,1765,1,
+2640,1770,1,2641,1775,
+1,2642,1780,1,2643,
+1747,1,2535,1785,1,
+2645,1791,1,2646,1796,
+1,2648,1875,1,2649,
+1802,1,2650,1807,1,
+2651,1812,1,2652,1817,
+1,2653,1822,1,2654,
+1827,1,2655,1832,1,
+2657,3879,16,0,549,
+1,2550,1843,1,2579,
+1861,1,2558,1849,1,
+2566,1855,1,2459,1004,
+1,2464,1021,1,2574,
+1837,1,2470,3880,16,
+0,549,1,2700,3881,
+16,0,549,1,2594,
+1868,1,2596,3882,16,
+0,549,1,80,3883,
+19,426,1,80,3884,
+5,30,1,2644,1753,
+1,2520,1758,1,2639,
+1765,1,2640,1770,1,
+2641,1775,1,2642,1780,
+1,2643,1747,1,2535,
+1785,1,2645,1791,1,
+2646,1796,1,2648,1875,
+1,2649,1802,1,2650,
+1807,1,2651,1812,1,
+2652,1817,1,2653,1822,
+1,2654,1827,1,2655,
+1832,1,2657,3885,16,
+0,424,1,2550,1843,
+1,2579,1861,1,2558,
+1849,1,2566,1855,1,
+2459,1004,1,2464,1021,
+1,2574,1837,1,2470,
+3886,16,0,424,1,
+2700,3887,16,0,424,
+1,2594,1868,1,2596,
+3888,16,0,424,1,
+81,3889,19,413,1,
+81,3890,5,30,1,
+2644,1753,1,2520,1758,
+1,2639,1765,1,2640,
+1770,1,2641,1775,1,
+2642,1780,1,2643,1747,
+1,2535,1785,1,2645,
+1791,1,2646,1796,1,
+2648,1875,1,2649,1802,
+1,2650,1807,1,2651,
+1812,1,2652,1817,1,
+2653,1822,1,2654,1827,
+1,2655,1832,1,2657,
+3891,16,0,411,1,
+2550,1843,1,2579,1861,
+1,2558,1849,1,2566,
+1855,1,2459,1004,1,
+2464,1021,1,2574,1837,
+1,2470,3892,16,0,
+411,1,2700,3893,16,
+0,411,1,2594,1868,
+1,2596,3894,16,0,
+411,1,82,3895,19,
+758,1,82,3896,5,
+30,1,2644,1753,1,
+2520,1758,1,2639,1765,
+1,2640,1770,1,2641,
+1775,1,2642,1780,1,
+2643,1747,1,2535,1785,
+1,2645,1791,1,2646,
+1796,1,2648,1875,1,
+2649,1802,1,2650,1807,
+1,2651,1812,1,2652,
+1817,1,2653,1822,1,
+2654,1827,1,2655,1832,
+1,2657,3897,16,0,
+756,1,2550,1843,1,
+2579,1861,1,2558,1849,
+1,2566,1855,1,2459,
+1004,1,2464,1021,1,
+2574,1837,1,2470,3898,
+16,0,756,1,2700,
+3899,16,0,756,1,
+2594,1868,1,2596,3900,
+16,0,756,1,83,
+3901,19,410,1,83,
+3902,5,30,1,2644,
+1753,1,2520,1758,1,
+2639,1765,1,2640,1770,
+1,2641,1775,1,2642,
+1780,1,2643,1747,1,
+2535,1785,1,2645,1791,
+1,2646,1796,1,2648,
+1875,1,2649,1802,1,
+2650,1807,1,2651,1812,
+1,2652,1817,1,2653,
+1822,1,2654,1827,1,
+2655,1832,1,2657,3903,
+16,0,408,1,2550,
+1843,1,2579,1861,1,
+2558,1849,1,2566,1855,
+1,2459,1004,1,2464,
+1021,1,2574,1837,1,
+2470,3904,16,0,408,
+1,2700,3905,16,0,
+408,1,2594,1868,1,
+2596,3906,16,0,408,
+1,84,3907,19,407,
+1,84,3908,5,30,
+1,2644,1753,1,2520,
+1758,1,2639,1765,1,
+2640,1770,1,2641,1775,
+1,2642,1780,1,2643,
+1747,1,2535,1785,1,
+2645,1791,1,2646,1796,
+1,2648,1875,1,2649,
+1802,1,2650,1807,1,
+2651,1812,1,2652,1817,
+1,2653,1822,1,2654,
+1827,1,2655,1832,1,
+2657,3909,16,0,405,
+1,2550,1843,1,2579,
+1861,1,2558,1849,1,
+2566,1855,1,2459,1004,
+1,2464,1021,1,2574,
+1837,1,2470,3910,16,
+0,405,1,2700,3911,
+16,0,405,1,2594,
+1868,1,2596,3912,16,
+0,405,1,85,3913,
+19,570,1,85,3914,
+5,30,1,2644,1753,
+1,2520,1758,1,2639,
+1765,1,2640,1770,1,
+2641,1775,1,2642,1780,
+1,2643,1747,1,2535,
+1785,1,2645,1791,1,
+2646,1796,1,2648,1875,
+1,2649,1802,1,2650,
+1807,1,2651,1812,1,
+2652,1817,1,2653,1822,
+1,2654,1827,1,2655,
+1832,1,2657,3915,16,
+0,568,1,2550,1843,
+1,2579,1861,1,2558,
+1849,1,2566,1855,1,
+2459,1004,1,2464,1021,
+1,2574,1837,1,2470,
+3916,16,0,568,1,
+2700,3917,16,0,568,
+1,2594,1868,1,2596,
+3918,16,0,568,1,
+86,3919,19,442,1,
+86,3920,5,30,1,
+2644,1753,1,2520,1758,
+1,2639,1765,1,2640,
+1770,1,2641,1775,1,
+2642,1780,1,2643,1747,
+1,2535,1785,1,2645,
+1791,1,2646,1796,1,
+2648,1875,1,2649,1802,
+1,2650,1807,1,2651,
+1812,1,2652,1817,1,
+2653,1822,1,2654,1827,
+1,2655,1832,1,2657,
+3921,16,0,440,1,
+2550,1843,1,2579,1861,
+1,2558,1849,1,2566,
+1855,1,2459,1004,1,
+2464,1021,1,2574,1837,
+1,2470,3922,16,0,
+440,1,2700,3923,16,
+0,440,1,2594,1868,
+1,2596,3924,16,0,
+440,1,87,3925,19,
+548,1,87,3926,5,
+30,1,2644,1753,1,
+2520,1758,1,2639,1765,
+1,2640,1770,1,2641,
+1775,1,2642,1780,1,
+2643,1747,1,2535,1785,
+1,2645,1791,1,2646,
+1796,1,2648,1875,1,
+2649,1802,1,2650,1807,
+1,2651,1812,1,2652,
+1817,1,2653,1822,1,
+2654,1827,1,2655,1832,
+1,2657,3927,16,0,
+546,1,2550,1843,1,
+2579,1861,1,2558,1849,
+1,2566,1855,1,2459,
+1004,1,2464,1021,1,
+2574,1837,1,2470,3928,
+16,0,546,1,2700,
+3929,16,0,546,1,
+2594,1868,1,2596,3930,
+16,0,546,1,88,
+3931,19,404,1,88,
+3932,5,30,1,2644,
+1753,1,2520,1758,1,
+2639,1765,1,2640,1770,
+1,2641,1775,1,2642,
+1780,1,2643,1747,1,
+2535,1785,1,2645,1791,
+1,2646,1796,1,2648,
+1875,1,2649,1802,1,
+2650,1807,1,2651,1812,
+1,2652,1817,1,2653,
+1822,1,2654,1827,1,
+2655,1832,1,2657,3933,
+16,0,402,1,2550,
+1843,1,2579,1861,1,
+2558,1849,1,2566,1855,
+1,2459,1004,1,2464,
+1021,1,2574,1837,1,
+2470,3934,16,0,402,
+1,2700,3935,16,0,
+402,1,2594,1868,1,
+2596,3936,16,0,402,
+1,89,3937,19,398,
+1,89,3938,5,30,
+1,2644,1753,1,2520,
+1758,1,2639,1765,1,
+2640,1770,1,2641,1775,
+1,2642,1780,1,2643,
+1747,1,2535,1785,1,
+2645,1791,1,2646,1796,
+1,2648,1875,1,2649,
+1802,1,2650,1807,1,
+2651,1812,1,2652,1817,
+1,2653,1822,1,2654,
+1827,1,2655,1832,1,
+2657,3939,16,0,396,
+1,2550,1843,1,2579,
+1861,1,2558,1849,1,
+2566,1855,1,2459,1004,
+1,2464,1021,1,2574,
+1837,1,2470,3940,16,
+0,396,1,2700,3941,
+16,0,396,1,2594,
+1868,1,2596,3942,16,
+0,396,1,90,3943,
+19,401,1,90,3944,
+5,30,1,2644,1753,
+1,2520,1758,1,2639,
+1765,1,2640,1770,1,
+2641,1775,1,2642,1780,
+1,2643,1747,1,2535,
+1785,1,2645,1791,1,
+2646,1796,1,2648,1875,
+1,2649,1802,1,2650,
+1807,1,2651,1812,1,
+2652,1817,1,2653,1822,
+1,2654,1827,1,2655,
+1832,1,2657,3945,16,
+0,399,1,2550,1843,
+1,2579,1861,1,2558,
+1849,1,2566,1855,1,
+2459,1004,1,2464,1021,
+1,2574,1837,1,2470,
+3946,16,0,399,1,
+2700,3947,16,0,399,
+1,2594,1868,1,2596,
+3948,16,0,399,1,
+91,3949,19,446,1,
+91,3950,5,30,1,
+2644,1753,1,2520,1758,
+1,2639,1765,1,2640,
+1770,1,2641,1775,1,
+2642,1780,1,2643,1747,
+1,2535,1785,1,2645,
+1791,1,2646,1796,1,
+2648,1875,1,2649,1802,
+1,2650,1807,1,2651,
+1812,1,2652,1817,1,
+2653,1822,1,2654,1827,
+1,2655,1832,1,2657,
+3951,16,0,444,1,
+2550,1843,1,2579,1861,
+1,2558,1849,1,2566,
+1855,1,2459,1004,1,
+2464,1021,1,2574,1837,
+1,2470,3952,16,0,
+444,1,2700,3953,16,
+0,444,1,2594,1868,
+1,2596,3954,16,0,
+444,1,92,3955,19,
+133,1,92,3956,5,
+129,1,0,3957,16,
+0,314,1,1,2236,
+1,2,2242,1,3,
+2247,1,4,2252,1,
+5,2257,1,6,2262,
+1,7,2267,1,8,
+3958,16,0,131,1,
+1515,3959,16,0,184,
+1,2021,840,1,2022,
+3960,16,0,575,1,
+256,3961,16,0,192,
+1,2526,3962,16,0,
+300,1,2025,3963,16,
+0,579,1,18,3964,
+16,0,138,1,2027,
+3965,16,0,583,1,
+2029,847,1,2030,853,
+1,2031,858,1,2032,
+863,1,2033,868,1,
+277,3966,16,0,192,
+1,2035,874,1,2037,
+879,1,2541,3967,16,
+0,512,1,32,3968,
+16,0,184,1,2041,
+890,1,2293,3969,16,
+0,192,1,2043,896,
+1,2045,901,1,41,
+3970,16,0,192,1,
+1297,3971,16,0,184,
+1,43,3972,16,0,
+192,1,46,3973,16,
+0,197,1,1804,3974,
+16,0,184,1,299,
+3975,16,0,192,1,
+52,3976,16,0,184,
+1,2818,3516,1,2819,
+3977,16,0,314,1,
+2318,3978,16,0,184,
+1,62,3979,16,0,
+221,1,65,3980,16,
+0,223,1,2075,3981,
+16,0,184,1,1574,
+921,1,71,3982,16,
+0,192,1,1775,3983,
+16,0,184,1,2837,
+3530,1,2838,3536,1,
+2337,3984,16,0,184,
+1,79,3985,16,0,
+192,1,1335,3986,16,
+0,184,1,2511,3987,
+16,0,477,1,322,
+3988,16,0,192,1,
+76,3989,16,0,192,
+1,85,3990,16,0,
+192,1,1261,3991,16,
+0,184,1,89,3992,
+16,0,192,1,509,
+3993,16,0,192,1,
+346,3994,16,0,192,
+1,2039,884,1,97,
+3995,16,0,192,1,
+2106,3996,16,0,184,
+1,102,3997,16,0,
+192,1,1860,943,1,
+1803,909,1,2364,949,
+1,2779,3510,1,2782,
+3998,16,0,192,1,
+112,3999,16,0,192,
+1,1117,4000,16,0,
+184,1,1873,958,1,
+1876,4001,16,0,184,
+1,372,4002,16,0,
+613,1,374,4003,16,
+0,615,1,124,4004,
+16,0,192,1,376,
+4005,16,0,617,1,
+378,4006,16,0,619,
+1,2136,965,1,381,
+4007,16,0,192,1,
+525,4008,16,0,192,
+1,2807,3551,1,1834,
+4009,16,0,184,1,
+137,4010,16,0,192,
+1,1901,4011,16,0,
+184,1,1113,4012,16,
+0,176,1,1153,4013,
+16,0,184,1,151,
+4014,16,0,192,1,
+1407,4015,16,0,184,
+1,1659,4016,16,0,
+184,1,2413,4017,16,
+0,184,1,406,4018,
+16,0,192,1,1371,
+4019,16,0,184,1,
+2105,936,1,166,4020,
+16,0,192,1,2839,
+3541,1,2840,3546,1,
+1931,983,1,1933,4021,
+16,0,184,1,431,
+4022,16,0,192,1,
+1585,4023,16,0,192,
+1,182,4024,16,0,
+192,1,1189,4025,16,
+0,184,1,1443,4026,
+16,0,184,1,1695,
+4027,16,0,184,1,
+2198,4028,16,0,184,
+1,447,4029,16,0,
+192,1,2458,998,1,
+2459,1004,1,1958,4030,
+16,0,184,1,2462,
+1011,1,1657,1016,1,
+2464,1021,1,2466,3525,
+1,459,4031,16,0,
+192,1,2468,4032,16,
+0,376,1,462,4033,
+16,0,192,1,199,
+4034,16,0,192,1,
+217,4035,16,0,192,
+1,2227,1030,1,1622,
+4036,16,0,192,1,
+1225,4037,16,0,184,
+1,1479,4038,16,0,
+184,1,1731,4039,16,
+0,192,1,1989,1038,
+1,1990,4040,16,0,
+184,1,236,4041,16,
+0,192,1,2507,4042,
+16,0,471,1,1756,
+4043,16,0,184,1,
+93,4044,19,731,1,
+93,4045,5,95,1,
+256,4046,16,0,729,
+1,1261,4047,16,0,
+729,1,509,4048,16,
+0,729,1,1515,4049,
+16,0,729,1,2021,
+840,1,1775,4050,16,
+0,729,1,2029,847,
+1,2030,853,1,2031,
+858,1,2032,863,1,
+2033,868,1,277,4051,
+16,0,729,1,2035,
+874,1,2037,879,1,
+2039,884,1,32,4052,
+16,0,729,1,2041,
+890,1,2293,4053,16,
+0,729,1,2043,896,
+1,2045,901,1,41,
+4054,16,0,729,1,
+1297,4055,16,0,729,
+1,43,4056,16,0,
+729,1,1803,909,1,
+1804,4057,16,0,729,
+1,299,4058,16,0,
+729,1,52,4059,16,
+0,729,1,2318,4060,
+16,0,729,1,62,
+4061,16,0,729,1,
+2075,4062,16,0,729,
+1,1574,921,1,71,
+4063,16,0,729,1,
+76,4064,16,0,729,
+1,1834,4065,16,0,
+729,1,2337,4066,16,
+0,729,1,79,4067,
+16,0,729,1,1335,
+4068,16,0,729,1,
+322,4069,16,0,729,
+1,85,4070,16,0,
+729,1,89,4071,16,
+0,729,1,346,4072,
+16,0,729,1,2105,
+936,1,2106,4073,16,
+0,729,1,97,4074,
+16,0,729,1,1860,
+943,1,2364,949,1,
+102,4075,16,0,729,
+1,2782,4076,16,0,
+729,1,112,4077,16,
+0,729,1,1117,4078,
+16,0,729,1,1873,
+958,1,1876,4079,16,
+0,729,1,124,4080,
+16,0,729,1,2136,
+965,1,381,4081,16,
+0,729,1,525,4082,
+16,0,729,1,137,
+4083,16,0,729,1,
+1901,4084,16,0,729,
+1,1153,4085,16,0,
+729,1,151,4086,16,
+0,729,1,1407,4087,
+16,0,729,1,1659,
+4088,16,0,729,1,
+2413,4089,16,0,729,
+1,406,4090,16,0,
+729,1,1371,4091,16,
+0,729,1,166,4092,
+16,0,729,1,1622,
+4093,16,0,729,1,
+1931,983,1,1933,4094,
+16,0,729,1,431,
+4095,16,0,729,1,
+1585,4096,16,0,729,
+1,182,4097,16,0,
+729,1,1189,4098,16,
+0,729,1,1443,4099,
+16,0,729,1,1695,
+4100,16,0,729,1,
+2198,4101,16,0,729,
+1,447,4102,16,0,
+729,1,2458,998,1,
+2459,1004,1,1958,4103,
+16,0,729,1,2462,
+1011,1,1657,1016,1,
+2464,1021,1,199,4104,
+16,0,729,1,459,
+4105,16,0,729,1,
+462,4106,16,0,729,
+1,217,4107,16,0,
+729,1,2227,1030,1,
+1225,4108,16,0,729,
+1,1479,4109,16,0,
+729,1,1731,4110,16,
+0,729,1,1989,1038,
+1,1990,4111,16,0,
+729,1,236,4112,16,
+0,729,1,1756,4113,
+16,0,729,1,94,
+4114,19,728,1,94,
+4115,5,95,1,256,
+4116,16,0,726,1,
+1261,4117,16,0,726,
+1,509,4118,16,0,
+726,1,1515,4119,16,
+0,726,1,2021,840,
+1,1775,4120,16,0,
+726,1,2029,847,1,
+2030,853,1,2031,858,
+1,2032,863,1,2033,
+868,1,277,4121,16,
+0,726,1,2035,874,
+1,2037,879,1,2039,
+884,1,32,4122,16,
+0,726,1,2041,890,
+1,2293,4123,16,0,
+726,1,2043,896,1,
+2045,901,1,41,4124,
+16,0,726,1,1297,
+4125,16,0,726,1,
+43,4126,16,0,726,
+1,1803,909,1,1804,
+4127,16,0,726,1,
+299,4128,16,0,726,
+1,52,4129,16,0,
+726,1,2318,4130,16,
+0,726,1,62,4131,
+16,0,726,1,2075,
+4132,16,0,726,1,
+1574,921,1,71,4133,
+16,0,726,1,76,
+4134,16,0,726,1,
+1834,4135,16,0,726,
+1,2337,4136,16,0,
+726,1,79,4137,16,
+0,726,1,1335,4138,
+16,0,726,1,322,
+4139,16,0,726,1,
+85,4140,16,0,726,
+1,89,4141,16,0,
+726,1,346,4142,16,
+0,726,1,2105,936,
+1,2106,4143,16,0,
+726,1,97,4144,16,
+0,726,1,1860,943,
+1,2364,949,1,102,
+4145,16,0,726,1,
+2782,4146,16,0,726,
+1,112,4147,16,0,
+726,1,1117,4148,16,
+0,726,1,1873,958,
+1,1876,4149,16,0,
+726,1,124,4150,16,
+0,726,1,2136,965,
+1,381,4151,16,0,
+726,1,525,4152,16,
+0,726,1,137,4153,
+16,0,726,1,1901,
+4154,16,0,726,1,
+1153,4155,16,0,726,
+1,151,4156,16,0,
+726,1,1407,4157,16,
+0,726,1,1659,4158,
+16,0,726,1,2413,
+4159,16,0,726,1,
+406,4160,16,0,726,
+1,1371,4161,16,0,
+726,1,166,4162,16,
+0,726,1,1622,4163,
+16,0,726,1,1931,
+983,1,1933,4164,16,
+0,726,1,431,4165,
+16,0,726,1,1585,
+4166,16,0,726,1,
+182,4167,16,0,726,
+1,1189,4168,16,0,
+726,1,1443,4169,16,
+0,726,1,1695,4170,
+16,0,726,1,2198,
+4171,16,0,726,1,
+447,4172,16,0,726,
+1,2458,998,1,2459,
+1004,1,1958,4173,16,
+0,726,1,2462,1011,
+1,1657,1016,1,2464,
+1021,1,199,4174,16,
+0,726,1,459,4175,
+16,0,726,1,462,
+4176,16,0,726,1,
+217,4177,16,0,726,
+1,2227,1030,1,1225,
+4178,16,0,726,1,
+1479,4179,16,0,726,
+1,1731,4180,16,0,
+726,1,1989,1038,1,
+1990,4181,16,0,726,
+1,236,4182,16,0,
+726,1,1756,4183,16,
+0,726,1,95,4184,
+19,725,1,95,4185,
+5,95,1,256,4186,
+16,0,723,1,1261,
+4187,16,0,723,1,
+509,4188,16,0,723,
+1,1515,4189,16,0,
+723,1,2021,840,1,
+1775,4190,16,0,723,
+1,2029,847,1,2030,
+853,1,2031,858,1,
+2032,863,1,2033,868,
+1,277,4191,16,0,
+723,1,2035,874,1,
+2037,879,1,2039,884,
+1,32,4192,16,0,
+723,1,2041,890,1,
+2293,4193,16,0,723,
+1,2043,896,1,2045,
+901,1,41,4194,16,
+0,723,1,1297,4195,
+16,0,723,1,43,
+4196,16,0,723,1,
+1803,909,1,1804,4197,
+16,0,723,1,299,
+4198,16,0,723,1,
+52,4199,16,0,723,
+1,2318,4200,16,0,
+723,1,62,4201,16,
+0,723,1,2075,4202,
+16,0,723,1,1574,
+921,1,71,4203,16,
+0,723,1,76,4204,
+16,0,723,1,1834,
+4205,16,0,723,1,
+2337,4206,16,0,723,
+1,79,4207,16,0,
+723,1,1335,4208,16,
+0,723,1,322,4209,
+16,0,723,1,85,
+4210,16,0,723,1,
+89,4211,16,0,723,
+1,346,4212,16,0,
+723,1,2105,936,1,
+2106,4213,16,0,723,
+1,97,4214,16,0,
+723,1,1860,943,1,
+2364,949,1,102,4215,
+16,0,723,1,2782,
+4216,16,0,723,1,
+112,4217,16,0,723,
+1,1117,4218,16,0,
+723,1,1873,958,1,
+1876,4219,16,0,723,
+1,124,4220,16,0,
+723,1,2136,965,1,
+381,4221,16,0,723,
+1,525,4222,16,0,
+723,1,137,4223,16,
+0,723,1,1901,4224,
+16,0,723,1,1153,
+4225,16,0,723,1,
+151,4226,16,0,723,
+1,1407,4227,16,0,
+723,1,1659,4228,16,
+0,723,1,2413,4229,
+16,0,723,1,406,
+4230,16,0,723,1,
+1371,4231,16,0,723,
+1,166,4232,16,0,
+723,1,1622,4233,16,
+0,723,1,1931,983,
+1,1933,4234,16,0,
+723,1,431,4235,16,
+0,723,1,1585,4236,
+16,0,723,1,182,
+4237,16,0,723,1,
+1189,4238,16,0,723,
+1,1443,4239,16,0,
+723,1,1695,4240,16,
+0,723,1,2198,4241,
+16,0,723,1,447,
+4242,16,0,723,1,
+2458,998,1,2459,1004,
+1,1958,4243,16,0,
+723,1,2462,1011,1,
+1657,1016,1,2464,1021,
+1,199,4244,16,0,
+723,1,459,4245,16,
+0,723,1,462,4246,
+16,0,723,1,217,
+4247,16,0,723,1,
+2227,1030,1,1225,4248,
+16,0,723,1,1479,
+4249,16,0,723,1,
+1731,4250,16,0,723,
+1,1989,1038,1,1990,
+4251,16,0,723,1,
+236,4252,16,0,723,
+1,1756,4253,16,0,
+723,1,96,4254,19,
+103,1,96,4255,5,
+1,1,0,4256,16,
+0,104,1,97,4257,
+19,172,1,97,4258,
+5,1,1,0,4259,
+16,0,170,1,98,
+4260,19,213,1,98,
+4261,5,2,1,0,
+4262,16,0,211,1,
+2819,4263,16,0,366,
+1,99,4264,19,210,
+1,99,4265,5,2,
+1,0,4266,16,0,
+208,1,2819,4267,16,
+0,365,1,100,4268,
+19,292,1,100,4269,
+5,2,1,0,4270,
+16,0,775,1,2819,
+4271,16,0,290,1,
+101,4272,19,781,1,
+101,4273,5,4,1,
+0,4274,16,0,782,
+1,2830,4275,16,0,
+779,1,2819,4276,16,
+0,782,1,2760,4277,
+16,0,779,1,102,
+4278,19,698,1,102,
+4279,5,2,1,2470,
+4280,16,0,696,1,
+2657,4281,16,0,719,
+1,103,4282,19,157,
+1,103,4283,5,4,
+1,2596,4284,16,0,
+155,1,2470,4285,16,
+0,674,1,2700,4286,
+16,0,155,1,2657,
+4287,16,0,674,1,
+104,4288,19,154,1,
+104,4289,5,4,1,
+2596,4290,16,0,152,
+1,2470,4291,16,0,
+177,1,2700,4292,16,
+0,152,1,2657,4293,
+16,0,177,1,105,
+4294,19,657,1,105,
+4295,5,4,1,2596,
+4296,16,0,655,1,
+2470,4297,16,0,672,
+1,2700,4298,16,0,
+655,1,2657,4299,16,
+0,672,1,106,4300,
+19,175,1,106,4301,
+5,4,1,2596,4302,
+16,0,654,1,2470,
+4303,16,0,173,1,
+2700,4304,16,0,654,
+1,2657,4305,16,0,
+173,1,107,4306,19,
+670,1,107,4307,5,
+4,1,2596,4308,16,
+0,742,1,2470,4309,
+16,0,668,1,2700,
+4310,16,0,742,1,
+2657,4311,16,0,668,
+1,108,4312,19,169,
+1,108,4313,5,4,
+1,2596,4314,16,0,
+650,1,2470,4315,16,
+0,167,1,2700,4316,
+16,0,650,1,2657,
+4317,16,0,167,1,
+109,4318,19,741,1,
+109,4319,5,4,1,
+2596,4320,16,0,739,
+1,2470,4321,16,0,
+751,1,2700,4322,16,
+0,739,1,2657,4323,
+16,0,751,1,110,
+4324,19,648,1,110,
+4325,5,4,1,2596,
+4326,16,0,646,1,
+2470,4327,16,0,663,
+1,2700,4328,16,0,
+646,1,2657,4329,16,
+0,663,1,111,4330,
+19,141,1,111,4331,
+5,3,1,2766,4332,
+16,0,791,1,2581,
+4333,16,0,355,1,
+10,4334,16,0,139,
+1,112,4335,19,557,
+1,112,4336,5,1,
+1,2568,4337,16,0,
+555,1,113,4338,19,
+745,1,113,4339,5,
+1,1,2560,4340,16,
+0,743,1,114,4341,
+19,529,1,114,4342,
+5,1,1,2552,4343,
+16,0,527,1,115,
+4344,19,251,1,115,
+4345,5,1,1,2537,
+4346,16,0,249,1,
+116,4347,19,502,1,
+116,4348,5,1,1,
+2522,4349,16,0,500,
+1,117,4350,19,486,
+1,117,4351,5,1,
+1,2506,4352,16,0,
+484,1,118,4353,19,
+160,1,118,4354,5,
+17,1,0,4355,16,
+0,794,1,2581,4356,
+16,0,372,1,2075,
+4357,16,0,753,1,
+2337,4358,16,0,753,
+1,2819,4359,16,0,
+794,1,2413,4360,16,
+0,753,1,10,4361,
+16,0,372,1,1901,
+4362,16,0,753,1,
+2198,4363,16,0,753,
+1,21,4364,16,0,
+158,1,2106,4365,16,
+0,753,1,2766,4366,
+16,0,372,1,1804,
+4367,16,0,753,1,
+1990,4368,16,0,753,
+1,32,4369,16,0,
+753,1,1958,4370,16,
+0,753,1,1775,4371,
+16,0,753,1,119,
+4372,19,474,1,119,
+4373,5,2,1,2568,
+4374,16,0,671,1,
+2506,4375,16,0,472,
+1,120,4376,19,480,
+1,120,4377,5,5,
+1,2510,4378,16,0,
+478,1,2522,4379,16,
+0,491,1,2514,4380,
+16,0,483,1,2537,
+4381,16,0,509,1,
+2560,4382,16,0,537,
+1,121,4383,19,309,
+1,121,4384,5,3,
+1,2552,4385,16,0,
+737,1,2525,4386,16,
+0,307,1,2529,4387,
+16,0,499,1,122,
+4388,19,636,1,122,
+4389,5,2,1,2544,
+4390,16,0,637,1,
+2540,4391,16,0,634,
+1,123,4392,19,130,
+1,123,4393,5,18,
+1,0,4394,16,0,
+128,1,2581,4395,16,
+0,137,1,2075,4396,
+16,0,137,1,2337,
+4397,16,0,137,1,
+2819,4398,16,0,128,
+1,2413,4399,16,0,
+137,1,10,4400,16,
+0,137,1,2198,4401,
+16,0,137,1,1901,
+4402,16,0,137,1,
+52,4403,16,0,219,
+1,21,4404,16,0,
+137,1,2106,4405,16,
+0,137,1,2766,4406,
+16,0,137,1,1804,
+4407,16,0,137,1,
+1990,4408,16,0,137,
+1,32,4409,16,0,
+137,1,1958,4410,16,
+0,137,1,1775,4411,
+16,0,137,1,124,
+4412,19,765,1,124,
+4413,5,4,1,2596,
+4414,16,0,763,1,
+2470,4415,16,0,763,
+1,2700,4416,16,0,
+763,1,2657,4417,16,
+0,763,1,125,4418,
+19,567,1,125,4419,
+5,4,1,2596,4420,
+16,0,565,1,2470,
+4421,16,0,565,1,
+2700,4422,16,0,565,
+1,2657,4423,16,0,
+565,1,126,4424,19,
+666,1,126,4425,5,
+4,1,2596,4426,16,
+0,664,1,2470,4427,
+16,0,664,1,2700,
+4428,16,0,664,1,
+2657,4429,16,0,664,
+1,127,4430,19,535,
+1,127,4431,5,4,
+1,2596,4432,16,0,
+533,1,2470,4433,16,
+0,533,1,2700,4434,
+16,0,533,1,2657,
+4435,16,0,533,1,
+128,4436,19,524,1,
+128,4437,5,4,1,
+2596,4438,16,0,522,
+1,2470,4439,16,0,
+522,1,2700,4440,16,
+0,522,1,2657,4441,
+16,0,522,1,129,
+4442,19,632,1,129,
+4443,5,4,1,2596,
+4444,16,0,630,1,
+2470,4445,16,0,630,
+1,2700,4446,16,0,
+630,1,2657,4447,16,
+0,630,1,130,4448,
+19,778,1,130,4449,
+5,4,1,2596,4450,
+16,0,776,1,2470,
+4451,16,0,776,1,
+2700,4452,16,0,776,
+1,2657,4453,16,0,
+776,1,131,4454,19,
+768,1,131,4455,5,
+4,1,2596,4456,16,
+0,766,1,2470,4457,
+16,0,766,1,2700,
+4458,16,0,766,1,
+2657,4459,16,0,766,
+1,132,4460,19,328,
+1,132,4461,5,21,
+1,2518,4462,16,0,
+699,1,2075,4463,16,
+0,584,1,2548,4464,
+16,0,736,1,2337,
+4465,16,0,584,1,
+2413,4466,16,0,584,
+1,2564,4467,16,0,
+542,1,2556,4468,16,
+0,532,1,2592,4469,
+16,0,695,1,1901,
+4470,16,0,584,1,
+2198,4471,16,0,584,
+1,2533,4472,16,0,
+504,1,2777,4473,16,
+0,326,1,2572,4474,
+16,0,675,1,2106,
+4475,16,0,584,1,
+2577,4476,16,0,681,
+1,1804,4477,16,0,
+584,1,1990,4478,16,
+0,584,1,31,4479,
+16,0,371,1,32,
+4480,16,0,584,1,
+1958,4481,16,0,584,
+1,1775,4482,16,0,
+584,1,133,4483,19,
+337,1,133,4484,5,
+1,1,32,4485,16,
+0,335,1,134,4486,
+19,286,1,134,4487,
+5,11,1,2075,4488,
+16,0,682,1,2337,
+4489,16,0,293,1,
+2413,4490,16,0,505,
+1,1901,4491,16,0,
+427,1,2198,4492,16,
+0,354,1,2106,4493,
+16,0,715,1,1804,
+4494,16,0,317,1,
+1990,4495,16,0,572,
+1,32,4496,16,0,
+367,1,1958,4497,16,
+0,515,1,1775,4498,
+16,0,284,1,135,
+4499,19,688,1,135,
+4500,5,11,1,2075,
+4501,16,0,686,1,
+2337,4502,16,0,686,
+1,2413,4503,16,0,
+686,1,1901,4504,16,
+0,686,1,2198,4505,
+16,0,686,1,2106,
+4506,16,0,686,1,
+1804,4507,16,0,686,
+1,1990,4508,16,0,
+686,1,32,4509,16,
+0,686,1,1958,4510,
+16,0,686,1,1775,
+4511,16,0,686,1,
+136,4512,19,748,1,
+136,4513,5,11,1,
+2075,4514,16,0,746,
+1,2337,4515,16,0,
+746,1,2413,4516,16,
+0,746,1,1901,4517,
 16,0,746,1,2198,
-4304,16,0,746,1,
-21,4305,16,0,158,
-1,2106,4306,16,0,
-746,1,2798,4307,16,
-0,766,1,2567,4308,
-16,0,369,1,1804,
-4309,16,0,746,1,
-1990,4310,16,0,746,
-1,32,4311,16,0,
-746,1,1958,4312,16,
-0,746,1,1775,4313,
-16,0,746,1,117,
-4314,19,655,1,117,
-4315,5,1,1,2553,
-4316,16,0,653,1,
-118,4317,19,242,1,
-118,4318,5,3,1,
-2522,4319,16,0,489,
-1,2545,4320,16,0,
-240,1,2506,4321,16,
-0,469,1,119,4322,
-19,475,1,119,4323,
-5,3,1,2510,4324,
-16,0,473,1,2514,
-4325,16,0,478,1,
-2537,4326,16,0,508,
-1,120,4327,19,303,
-1,120,4328,5,2,
-1,2525,4329,16,0,
-301,1,2529,4330,16,
-0,498,1,121,4331,
-19,130,1,121,4332,
-5,18,1,0,4333,
-16,0,128,1,2075,
-4334,16,0,146,1,
-2337,4335,16,0,146,
-1,2745,4336,16,0,
-146,1,2413,4337,16,
-0,146,1,10,4338,
-16,0,146,1,2198,
-4339,16,0,146,1,
-1901,4340,16,0,146,
-1,52,4341,16,0,
-207,1,21,4342,16,
-0,146,1,2106,4343,
-16,0,146,1,2798,
-4344,16,0,128,1,
-2567,4345,16,0,146,
-1,1804,4346,16,0,
-146,1,1990,4347,16,
-0,146,1,32,4348,
-16,0,146,1,1958,
-4349,16,0,146,1,
-1775,4350,16,0,146,
-1,122,4351,19,547,
-1,122,4352,5,4,
-1,2640,4353,16,0,
-545,1,2470,4354,16,
-0,545,1,2582,4355,
-16,0,545,1,2682,
-4356,16,0,545,1,
-123,4357,19,538,1,
-123,4358,5,4,1,
-2640,4359,16,0,536,
-1,2470,4360,16,0,
-536,1,2582,4361,16,
-0,536,1,2682,4362,
-16,0,536,1,124,
-4363,19,647,1,124,
-4364,5,4,1,2640,
-4365,16,0,645,1,
-2470,4366,16,0,645,
-1,2582,4367,16,0,
-645,1,2682,4368,16,
-0,645,1,125,4369,
-19,516,1,125,4370,
-5,4,1,2640,4371,
-16,0,514,1,2470,
-4372,16,0,514,1,
-2582,4373,16,0,514,
-1,2682,4374,16,0,
-514,1,126,4375,19,
-630,1,126,4376,5,
-4,1,2640,4377,16,
-0,628,1,2470,4378,
-16,0,628,1,2582,
-4379,16,0,628,1,
-2682,4380,16,0,628,
-1,127,4381,19,769,
-1,127,4382,5,4,
-1,2640,4383,16,0,
-767,1,2470,4384,16,
-0,767,1,2582,4385,
-16,0,767,1,2682,
-4386,16,0,767,1,
-128,4387,19,759,1,
-128,4388,5,4,1,
-2640,4389,16,0,757,
-1,2470,4390,16,0,
-757,1,2582,4391,16,
-0,757,1,2682,4392,
-16,0,757,1,129,
-4393,19,368,1,129,
-4394,5,20,1,2518,
-4395,16,0,688,1,
-2075,4396,16,0,582,
-1,2558,4397,16,0,
-535,1,2337,4398,16,
-0,582,1,2413,4399,
-16,0,582,1,2563,
-4400,16,0,544,1,
-1901,4401,16,0,582,
-1,2198,4402,16,0,
-582,1,2533,4403,16,
-0,503,1,2756,4404,
-16,0,765,1,2106,
-4405,16,0,582,1,
-2541,4406,16,0,632,
-1,1804,4407,16,0,
-582,1,1990,4408,16,
-0,582,1,31,4409,
-16,0,366,1,32,
-4410,16,0,582,1,
-2549,4411,16,0,527,
-1,1958,4412,16,0,
-582,1,2578,4413,16,
-0,756,1,1775,4414,
-16,0,582,1,130,
-4415,19,330,1,130,
-4416,5,1,1,32,
-4417,16,0,328,1,
-131,4418,19,282,1,
-131,4419,5,11,1,
-2075,4420,16,0,675,
-1,2337,4421,16,0,
-287,1,2413,4422,16,
-0,504,1,1901,4423,
-16,0,424,1,2198,
-4424,16,0,349,1,
-2106,4425,16,0,704,
-1,1804,4426,16,0,
-314,1,1990,4427,16,
-0,570,1,32,4428,
-16,0,361,1,1958,
-4429,16,0,518,1,
-1775,4430,16,0,280,
-1,132,4431,19,681,
-1,132,4432,5,11,
-1,2075,4433,16,0,
-679,1,2337,4434,16,
-0,679,1,2413,4435,
-16,0,679,1,1901,
-4436,16,0,679,1,
-2198,4437,16,0,679,
-1,2106,4438,16,0,
-679,1,1804,4439,16,
-0,679,1,1990,4440,
-16,0,679,1,32,
-4441,16,0,679,1,
-1958,4442,16,0,679,
-1,1775,4443,16,0,
-679,1,133,4444,19,
-742,1,133,4445,5,
-11,1,2075,4446,16,
-0,740,1,2337,4447,
-16,0,740,1,2413,
-4448,16,0,740,1,
-1901,4449,16,0,740,
-1,2198,4450,16,0,
-740,1,2106,4451,16,
-0,740,1,1804,4452,
-16,0,740,1,1990,
-4453,16,0,740,1,
-32,4454,16,0,740,
-1,1958,4455,16,0,
-740,1,1775,4456,16,
-0,740,1,134,4457,
-19,176,1,134,4458,
-5,31,1,1901,4459,
-16,0,745,1,1479,
-4460,16,0,640,1,
-2075,4461,16,0,745,
-1,1695,4462,16,0,
-205,1,1756,4463,16,
-0,203,1,2413,4464,
-16,0,745,1,2198,
-4465,16,0,745,1,
-1876,4466,16,0,762,
-1,1659,4467,16,0,
-203,1,1443,4468,16,
-0,598,1,1117,4469,
-16,0,174,1,1990,
-4470,16,0,745,1,
-1189,4471,16,0,258,
-1,1775,4472,16,0,
-745,1,32,4473,16,
-0,745,1,2106,4474,
-16,0,745,1,1515,
-4475,16,0,677,1,
-2337,4476,16,0,745,
-1,52,4477,16,0,
-689,1,1804,4478,16,
-0,745,1,1261,4479,
-16,0,326,1,1153,
-4480,16,0,265,1,
-1225,4481,16,0,297,
-1,1335,4482,16,0,
-495,1,1933,4483,16,
-0,643,1,1834,4484,
-16,0,343,1,1297,
-4485,16,0,353,1,
-1407,4486,16,0,668,
-1,2318,4487,16,0,
-203,1,1958,4488,16,
-0,745,1,1371,4489,
-16,0,486,1,135,
-4490,19,607,1,135,
-4491,5,11,1,2075,
-4492,16,0,605,1,
-2337,4493,16,0,605,
-1,2413,4494,16,0,
-605,1,1901,4495,16,
-0,605,1,2198,4496,
-16,0,605,1,2106,
-4497,16,0,605,1,
-1804,4498,16,0,605,
-1,1990,4499,16,0,
-605,1,32,4500,16,
-0,605,1,1958,4501,
-16,0,605,1,1775,
-4502,16,0,605,1,
-136,4503,19,603,1,
-136,4504,5,11,1,
-2075,4505,16,0,601,
-1,2337,4506,16,0,
-601,1,2413,4507,16,
-0,601,1,1901,4508,
-16,0,601,1,2198,
-4509,16,0,601,1,
-2106,4510,16,0,601,
-1,1804,4511,16,0,
-601,1,1990,4512,16,
-0,601,1,32,4513,
-16,0,601,1,1958,
-4514,16,0,601,1,
-1775,4515,16,0,601,
-1,137,4516,19,672,
-1,137,4517,5,11,
-1,2075,4518,16,0,
-670,1,2337,4519,16,
-0,670,1,2413,4520,
-16,0,670,1,1901,
-4521,16,0,670,1,
-2198,4522,16,0,670,
-1,2106,4523,16,0,
-670,1,1804,4524,16,
-0,670,1,1990,4525,
-16,0,670,1,32,
-4526,16,0,670,1,
-1958,4527,16,0,670,
-1,1775,4528,16,0,
-670,1,138,4529,19,
-597,1,138,4530,5,
-11,1,2075,4531,16,
-0,595,1,2337,4532,
-16,0,595,1,2413,
-4533,16,0,595,1,
-1901,4534,16,0,595,
-1,2198,4535,16,0,
-595,1,2106,4536,16,
-0,595,1,1804,4537,
-16,0,595,1,1990,
-4538,16,0,595,1,
-32,4539,16,0,595,
-1,1958,4540,16,0,
-595,1,1775,4541,16,
-0,595,1,139,4542,
-19,594,1,139,4543,
-5,11,1,2075,4544,
-16,0,592,1,2337,
-4545,16,0,592,1,
-2413,4546,16,0,592,
-1,1901,4547,16,0,
-592,1,2198,4548,16,
-0,592,1,2106,4549,
-16,0,592,1,1804,
-4550,16,0,592,1,
-1990,4551,16,0,592,
-1,32,4552,16,0,
-592,1,1958,4553,16,
-0,592,1,1775,4554,
-16,0,592,1,140,
-4555,19,591,1,140,
-4556,5,11,1,2075,
-4557,16,0,589,1,
-2337,4558,16,0,589,
-1,2413,4559,16,0,
-589,1,1901,4560,16,
-0,589,1,2198,4561,
-16,0,589,1,2106,
-4562,16,0,589,1,
-1804,4563,16,0,589,
-1,1990,4564,16,0,
-589,1,32,4565,16,
-0,589,1,1958,4566,
-16,0,589,1,1775,
-4567,16,0,589,1,
-141,4568,19,588,1,
-141,4569,5,11,1,
-2075,4570,16,0,586,
-1,2337,4571,16,0,
-586,1,2413,4572,16,
-0,586,1,1901,4573,
-16,0,586,1,2198,
-4574,16,0,586,1,
-2106,4575,16,0,586,
-1,1804,4576,16,0,
-586,1,1990,4577,16,
-0,586,1,32,4578,
-16,0,586,1,1958,
-4579,16,0,586,1,
-1775,4580,16,0,586,
-1,142,4581,19,585,
-1,142,4582,5,11,
-1,2075,4583,16,0,
-583,1,2337,4584,16,
-0,583,1,2413,4585,
-16,0,583,1,1901,
-4586,16,0,583,1,
-2198,4587,16,0,583,
-1,2106,4588,16,0,
-583,1,1804,4589,16,
-0,583,1,1990,4590,
-16,0,583,1,32,
-4591,16,0,583,1,
-1958,4592,16,0,583,
-1,1775,4593,16,0,
-583,1,143,4594,19,
-156,1,143,4595,5,
-3,1,1756,4596,16,
-0,313,1,2318,4597,
-16,0,325,1,1659,
-4598,16,0,154,1,
-144,4599,19,624,1,
-144,4600,5,68,1,
-1901,4601,16,0,622,
-1,1479,4602,16,0,
-622,1,112,4603,16,
-0,622,1,2293,4604,
-16,0,622,1,1804,
-4605,16,0,622,1,
-431,4606,16,0,622,
-1,1443,4607,16,0,
-622,1,1756,4608,16,
-0,622,1,124,4609,
-16,0,622,1,525,
-4610,16,0,622,1,
-236,4611,16,0,622,
-1,346,4612,16,0,
-622,1,1876,4613,16,
-0,622,1,1659,4614,
-16,0,622,1,1225,
-4615,16,0,622,1,
-1117,4616,16,0,622,
-1,137,4617,16,0,
-622,1,2318,4618,16,
-0,622,1,1775,4619,
-16,0,622,1,32,
-4620,16,0,622,1,
-1407,4621,16,0,622,
-1,2761,4622,16,0,
-622,1,256,4623,16,
-0,622,1,459,4624,
-16,0,622,1,406,
-4625,16,0,622,1,
-41,4626,16,0,622,
-1,151,4627,16,0,
-622,1,43,4628,16,
-0,622,1,1585,4629,
-16,0,622,1,1990,
-4630,16,0,622,1,
-2337,4631,16,0,622,
-1,509,4632,16,0,
-622,1,52,4633,16,
-0,622,1,381,4634,
-16,0,622,1,447,
-4635,16,0,622,1,
-166,4636,16,0,622,
-1,462,4637,16,0,
-622,1,277,4638,16,
-0,622,1,1695,4639,
-16,0,622,1,62,
-4640,16,0,685,1,
-1153,4641,16,0,622,
-1,2106,4642,16,0,
-622,1,1335,4643,16,
-0,622,1,71,4644,
-16,0,622,1,182,
-4645,16,0,622,1,
-76,4646,16,0,622,
-1,79,4647,16,0,
-622,1,1933,4648,16,
-0,622,1,299,4649,
-16,0,622,1,85,
-4650,16,0,622,1,
-1515,4651,16,0,622,
-1,2198,4652,16,0,
-622,1,89,4653,16,
-0,622,1,1834,4654,
-16,0,622,1,1622,
-4655,16,0,622,1,
-2413,4656,16,0,622,
-1,2075,4657,16,0,
-622,1,1731,4658,16,
-0,622,1,97,4659,
-16,0,622,1,1297,
-4660,16,0,622,1,
-1189,4661,16,0,622,
-1,102,4662,16,0,
-622,1,1261,4663,16,
-0,622,1,322,4664,
-16,0,622,1,1958,
-4665,16,0,622,1,
-199,4666,16,0,622,
-1,1371,4667,16,0,
-622,1,217,4668,16,
-0,622,1,145,4669,
-19,699,1,145,4670,
-5,2,1,459,4671,
-16,0,697,1,41,
-4672,16,0,770,1,
-146,4673,19,703,1,
-146,4674,5,3,1,
-462,4675,16,0,701,
-1,459,4676,16,0,
-723,1,41,4677,16,
-0,723,1,147,4678,
-19,4679,4,36,69,
-0,120,0,112,0,
-114,0,101,0,115,
-0,115,0,105,0,
-111,0,110,0,65,
-0,114,0,103,0,
-117,0,109,0,101,
-0,110,0,116,0,
-1,147,4674,1,148,
-4680,19,620,1,148,
-4681,5,68,1,1901,
-4682,16,0,618,1,
-1479,4683,16,0,618,
-1,112,4684,16,0,
-618,1,2293,4685,16,
-0,618,1,1804,4686,
-16,0,618,1,431,
-4687,16,0,618,1,
-1443,4688,16,0,618,
-1,1756,4689,16,0,
-618,1,124,4690,16,
-0,618,1,525,4691,
-16,0,618,1,236,
-4692,16,0,618,1,
-346,4693,16,0,618,
-1,1876,4694,16,0,
-618,1,1659,4695,16,
-0,618,1,1225,4696,
-16,0,618,1,1117,
-4697,16,0,618,1,
-137,4698,16,0,618,
-1,2318,4699,16,0,
-618,1,1775,4700,16,
-0,618,1,32,4701,
-16,0,618,1,1407,
-4702,16,0,618,1,
-2761,4703,16,0,618,
-1,256,4704,16,0,
-618,1,459,4705,16,
-0,618,1,406,4706,
-16,0,618,1,41,
-4707,16,0,618,1,
-151,4708,16,0,618,
-1,43,4709,16,0,
-618,1,1585,4710,16,
-0,618,1,1990,4711,
-16,0,618,1,2337,
-4712,16,0,618,1,
-509,4713,16,0,618,
-1,52,4714,16,0,
-618,1,381,4715,16,
-0,618,1,447,4716,
-16,0,618,1,166,
-4717,16,0,618,1,
-462,4718,16,0,618,
-1,277,4719,16,0,
-618,1,1695,4720,16,
-0,618,1,62,4721,
-16,0,686,1,1153,
-4722,16,0,618,1,
-2106,4723,16,0,618,
-1,1335,4724,16,0,
-618,1,71,4725,16,
-0,618,1,182,4726,
-16,0,618,1,76,
-4727,16,0,618,1,
-79,4728,16,0,618,
-1,1933,4729,16,0,
-618,1,299,4730,16,
-0,618,1,85,4731,
-16,0,618,1,1515,
-4732,16,0,618,1,
-2198,4733,16,0,618,
-1,89,4734,16,0,
-618,1,1834,4735,16,
-0,618,1,1622,4736,
-16,0,618,1,2413,
-4737,16,0,618,1,
-2075,4738,16,0,618,
-1,1731,4739,16,0,
-618,1,97,4740,16,
-0,618,1,1297,4741,
-16,0,618,1,1189,
-4742,16,0,618,1,
-102,4743,16,0,618,
-1,1261,4744,16,0,
-618,1,322,4745,16,
-0,618,1,1958,4746,
-16,0,618,1,199,
-4747,16,0,618,1,
-1371,4748,16,0,618,
-1,217,4749,16,0,
-618,1,149,4750,19,
-4751,4,28,86,0,
-101,0,99,0,116,
-0,111,0,114,0,
+4518,16,0,746,1,
+2106,4519,16,0,746,
+1,1804,4520,16,0,
+746,1,1990,4521,16,
+0,746,1,32,4522,
+16,0,746,1,1958,
+4523,16,0,746,1,
+1775,4524,16,0,746,
+1,137,4525,19,180,
+1,137,4526,5,31,
+1,1901,4527,16,0,
+752,1,1479,4528,16,
+0,638,1,2075,4529,
+16,0,752,1,1695,
+4530,16,0,217,1,
+1756,4531,16,0,207,
+1,2413,4532,16,0,
+752,1,2198,4533,16,
+0,752,1,1876,4534,
+16,0,771,1,1659,
+4535,16,0,207,1,
+1443,4536,16,0,600,
+1,1117,4537,16,0,
+178,1,1990,4538,16,
+0,752,1,1189,4539,
+16,0,267,1,1775,
+4540,16,0,752,1,
+32,4541,16,0,752,
+1,2106,4542,16,0,
+752,1,1515,4543,16,
+0,684,1,2337,4544,
+16,0,752,1,52,
+4545,16,0,700,1,
+1804,4546,16,0,752,
+1,1261,4547,16,0,
+331,1,1153,4548,16,
+0,274,1,1225,4549,
+16,0,303,1,1335,
+4550,16,0,497,1,
+1933,4551,16,0,640,
+1,1834,4552,16,0,
+347,1,1297,4553,16,
+0,359,1,1407,4554,
+16,0,667,1,2318,
+4555,16,0,207,1,
+1958,4556,16,0,752,
+1,1371,4557,16,0,
+488,1,138,4558,19,
+609,1,138,4559,5,
+11,1,2075,4560,16,
+0,607,1,2337,4561,
+16,0,607,1,2413,
+4562,16,0,607,1,
+1901,4563,16,0,607,
+1,2198,4564,16,0,
+607,1,2106,4565,16,
+0,607,1,1804,4566,
+16,0,607,1,1990,
+4567,16,0,607,1,
+32,4568,16,0,607,
+1,1958,4569,16,0,
+607,1,1775,4570,16,
+0,607,1,139,4571,
+19,605,1,139,4572,
+5,11,1,2075,4573,
+16,0,603,1,2337,
+4574,16,0,603,1,
+2413,4575,16,0,603,
+1,1901,4576,16,0,
+603,1,2198,4577,16,
+0,603,1,2106,4578,
+16,0,603,1,1804,
+4579,16,0,603,1,
+1990,4580,16,0,603,
+1,32,4581,16,0,
+603,1,1958,4582,16,
+0,603,1,1775,4583,
+16,0,603,1,140,
+4584,19,679,1,140,
+4585,5,11,1,2075,
+4586,16,0,677,1,
+2337,4587,16,0,677,
+1,2413,4588,16,0,
+677,1,1901,4589,16,
+0,677,1,2198,4590,
+16,0,677,1,2106,
+4591,16,0,677,1,
+1804,4592,16,0,677,
+1,1990,4593,16,0,
+677,1,32,4594,16,
+0,677,1,1958,4595,
+16,0,677,1,1775,
+4596,16,0,677,1,
+141,4597,19,599,1,
+141,4598,5,11,1,
+2075,4599,16,0,597,
+1,2337,4600,16,0,
+597,1,2413,4601,16,
+0,597,1,1901,4602,
+16,0,597,1,2198,
+4603,16,0,597,1,
+2106,4604,16,0,597,
+1,1804,4605,16,0,
+597,1,1990,4606,16,
+0,597,1,32,4607,
+16,0,597,1,1958,
+4608,16,0,597,1,
+1775,4609,16,0,597,
+1,142,4610,19,596,
+1,142,4611,5,11,
+1,2075,4612,16,0,
+594,1,2337,4613,16,
+0,594,1,2413,4614,
+16,0,594,1,1901,
+4615,16,0,594,1,
+2198,4616,16,0,594,
+1,2106,4617,16,0,
+594,1,1804,4618,16,
+0,594,1,1990,4619,
+16,0,594,1,32,
+4620,16,0,594,1,
+1958,4621,16,0,594,
+1,1775,4622,16,0,
+594,1,143,4623,19,
+593,1,143,4624,5,
+11,1,2075,4625,16,
+0,591,1,2337,4626,
+16,0,591,1,2413,
+4627,16,0,591,1,
+1901,4628,16,0,591,
+1,2198,4629,16,0,
+591,1,2106,4630,16,
+0,591,1,1804,4631,
+16,0,591,1,1990,
+4632,16,0,591,1,
+32,4633,16,0,591,
+1,1958,4634,16,0,
+591,1,1775,4635,16,
+0,591,1,144,4636,
+19,590,1,144,4637,
+5,11,1,2075,4638,
+16,0,588,1,2337,
+4639,16,0,588,1,
+2413,4640,16,0,588,
+1,1901,4641,16,0,
+588,1,2198,4642,16,
+0,588,1,2106,4643,
+16,0,588,1,1804,
+4644,16,0,588,1,
+1990,4645,16,0,588,
+1,32,4646,16,0,
+588,1,1958,4647,16,
+0,588,1,1775,4648,
+16,0,588,1,145,
+4649,19,587,1,145,
+4650,5,11,1,2075,
+4651,16,0,585,1,
+2337,4652,16,0,585,
+1,2413,4653,16,0,
+585,1,1901,4654,16,
+0,585,1,2198,4655,
+16,0,585,1,2106,
+4656,16,0,585,1,
+1804,4657,16,0,585,
+1,1990,4658,16,0,
+585,1,32,4659,16,
+0,585,1,1958,4660,
+16,0,585,1,1775,
+4661,16,0,585,1,
+146,4662,19,150,1,
+146,4663,5,3,1,
+1756,4664,16,0,316,
+1,2318,4665,16,0,
+330,1,1659,4666,16,
+0,148,1,147,4667,
+19,626,1,147,4668,
+5,68,1,1901,4669,
+16,0,624,1,1479,
+4670,16,0,624,1,
+112,4671,16,0,624,
+1,2293,4672,16,0,
+624,1,1804,4673,16,
+0,624,1,431,4674,
+16,0,624,1,1443,
+4675,16,0,624,1,
+1756,4676,16,0,624,
+1,124,4677,16,0,
+624,1,525,4678,16,
+0,624,1,236,4679,
+16,0,624,1,346,
+4680,16,0,624,1,
+1876,4681,16,0,624,
+1,1659,4682,16,0,
+624,1,1225,4683,16,
+0,624,1,1117,4684,
+16,0,624,1,137,
+4685,16,0,624,1,
+2318,4686,16,0,624,
+1,1775,4687,16,0,
+624,1,32,4688,16,
+0,624,1,1407,4689,
+16,0,624,1,2782,
+4690,16,0,624,1,
+256,4691,16,0,624,
+1,459,4692,16,0,
+624,1,406,4693,16,
+0,624,1,41,4694,
+16,0,624,1,151,
+4695,16,0,624,1,
+43,4696,16,0,624,
+1,1585,4697,16,0,
+624,1,1990,4698,16,
+0,624,1,2337,4699,
+16,0,624,1,509,
+4700,16,0,624,1,
+52,4701,16,0,624,
+1,381,4702,16,0,
+624,1,447,4703,16,
+0,624,1,166,4704,
+16,0,624,1,462,
+4705,16,0,624,1,
+277,4706,16,0,624,
+1,1695,4707,16,0,
+624,1,62,4708,16,
+0,692,1,1153,4709,
+16,0,624,1,2106,
+4710,16,0,624,1,
+1335,4711,16,0,624,
+1,71,4712,16,0,
+624,1,182,4713,16,
+0,624,1,76,4714,
+16,0,624,1,79,
+4715,16,0,624,1,
+1933,4716,16,0,624,
+1,299,4717,16,0,
+624,1,85,4718,16,
+0,624,1,1515,4719,
+16,0,624,1,2198,
+4720,16,0,624,1,
+89,4721,16,0,624,
+1,1834,4722,16,0,
+624,1,1622,4723,16,
+0,624,1,2413,4724,
+16,0,624,1,2075,
+4725,16,0,624,1,
+1731,4726,16,0,624,
+1,97,4727,16,0,
+624,1,1297,4728,16,
+0,624,1,1189,4729,
+16,0,624,1,102,
+4730,16,0,624,1,
+1261,4731,16,0,624,
+1,322,4732,16,0,
+624,1,1958,4733,16,
+0,624,1,199,4734,
+16,0,624,1,1371,
+4735,16,0,624,1,
+217,4736,16,0,624,
+1,148,4737,19,710,
+1,148,4738,5,2,
+1,459,4739,16,0,
+708,1,41,4740,16,
+0,783,1,149,4741,
+19,714,1,149,4742,
+5,3,1,462,4743,
+16,0,712,1,459,
+4744,16,0,735,1,
+41,4745,16,0,735,
+1,150,4746,19,4747,
+4,36,69,0,120,
+0,112,0,114,0,
+101,0,115,0,115,
+0,105,0,111,0,
+110,0,65,0,114,
+0,103,0,117,0,
+109,0,101,0,110,
+0,116,0,1,150,
+4742,1,151,4748,19,
+622,1,151,4749,5,
+68,1,1901,4750,16,
+0,620,1,1479,4751,
+16,0,620,1,112,
+4752,16,0,620,1,
+2293,4753,16,0,620,
+1,1804,4754,16,0,
+620,1,431,4755,16,
+0,620,1,1443,4756,
+16,0,620,1,1756,
+4757,16,0,620,1,
+124,4758,16,0,620,
+1,525,4759,16,0,
+620,1,236,4760,16,
+0,620,1,346,4761,
+16,0,620,1,1876,
+4762,16,0,620,1,
+1659,4763,16,0,620,
+1,1225,4764,16,0,
+620,1,1117,4765,16,
+0,620,1,137,4766,
+16,0,620,1,2318,
+4767,16,0,620,1,
+1775,4768,16,0,620,
+1,32,4769,16,0,
+620,1,1407,4770,16,
+0,620,1,2782,4771,
+16,0,620,1,256,
+4772,16,0,620,1,
+459,4773,16,0,620,
+1,406,4774,16,0,
+620,1,41,4775,16,
+0,620,1,151,4776,
+16,0,620,1,43,
+4777,16,0,620,1,
+1585,4778,16,0,620,
+1,1990,4779,16,0,
+620,1,2337,4780,16,
+0,620,1,509,4781,
+16,0,620,1,52,
+4782,16,0,620,1,
+381,4783,16,0,620,
+1,447,4784,16,0,
+620,1,166,4785,16,
+0,620,1,462,4786,
+16,0,620,1,277,
+4787,16,0,620,1,
+1695,4788,16,0,620,
+1,62,4789,16,0,
+693,1,1153,4790,16,
+0,620,1,2106,4791,
+16,0,620,1,1335,
+4792,16,0,620,1,
+71,4793,16,0,620,
+1,182,4794,16,0,
+620,1,76,4795,16,
+0,620,1,79,4796,
+16,0,620,1,1933,
+4797,16,0,620,1,
+299,4798,16,0,620,
+1,85,4799,16,0,
+620,1,1515,4800,16,
+0,620,1,2198,4801,
+16,0,620,1,89,
+4802,16,0,620,1,
+1834,4803,16,0,620,
+1,1622,4804,16,0,
+620,1,2413,4805,16,
+0,620,1,2075,4806,
+16,0,620,1,1731,
+4807,16,0,620,1,
+97,4808,16,0,620,
+1,1297,4809,16,0,
+620,1,1189,4810,16,
+0,620,1,102,4811,
+16,0,620,1,1261,
+4812,16,0,620,1,
+322,4813,16,0,620,
+1,1958,4814,16,0,
+620,1,199,4815,16,
+0,620,1,1371,4816,
+16,0,620,1,217,
+4817,16,0,620,1,
+152,4818,19,4819,4,
+28,86,0,101,0,
+99,0,116,0,111,
+0,114,0,67,0,
+111,0,110,0,115,
+0,116,0,97,0,
+110,0,116,0,1,
+152,4749,1,153,4820,
+19,4821,4,32,82,
+0,111,0,116,0,
+97,0,116,0,105,
+0,111,0,110,0,
 67,0,111,0,110,
 0,115,0,116,0,
 97,0,110,0,116,
-0,1,149,4681,1,
-150,4752,19,4753,4,
-32,82,0,111,0,
-116,0,97,0,116,
-0,105,0,111,0,
-110,0,67,0,111,
-0,110,0,115,0,
-116,0,97,0,110,
-0,116,0,1,150,
-4681,1,151,4754,19,
-4755,4,24,76,0,
-105,0,115,0,116,
-0,67,0,111,0,
-110,0,115,0,116,
-0,97,0,110,0,
-116,0,1,151,4681,
-1,152,4756,19,184,
-1,152,4757,5,67,
-1,1901,4758,16,0,
-683,1,1479,4759,16,
-0,609,1,112,4760,
-16,0,267,1,2293,
-4761,16,0,296,1,
-1804,4762,16,0,683,
-1,431,4763,16,0,
-678,1,1443,4764,16,
-0,540,1,1756,4765,
-16,0,777,1,124,
-4766,16,0,276,1,
-525,4767,16,0,336,
-1,236,4768,16,0,
-374,1,346,4769,16,
-0,572,1,1876,4770,
-16,0,348,1,1659,
-4771,16,0,777,1,
-1225,4772,16,0,266,
-1,1117,4773,16,0,
-236,1,137,4774,16,
-0,295,1,2318,4775,
-16,0,777,1,1775,
-4776,16,0,683,1,
-32,4777,16,0,683,
-1,1407,4778,16,0,
-563,1,2761,4779,16,
-0,312,1,256,4780,
-16,0,428,1,459,
-4781,16,0,182,1,
-406,4782,16,0,662,
-1,41,4783,16,0,
-182,1,151,4784,16,
-0,311,1,43,4785,
-16,0,735,1,1990,
-4786,16,0,683,1,
-2337,4787,16,0,683,
-1,509,4788,16,0,
-755,1,52,4789,16,
-0,691,1,381,4790,
-16,0,627,1,447,
-4791,16,0,336,1,
-166,4792,16,0,323,
-1,462,4793,16,0,
-182,1,277,4794,16,
-0,471,1,1695,4795,
-16,0,292,1,1261,
-4796,16,0,310,1,
-1153,4797,16,0,189,
-1,2106,4798,16,0,
-683,1,1335,4799,16,
-0,358,1,71,4800,
-16,0,220,1,182,
-4801,16,0,336,1,
-76,4802,16,0,625,
-1,79,4803,16,0,
-235,1,1933,4804,16,
-0,440,1,299,4805,
-16,0,502,1,85,
-4806,16,0,530,1,
-1515,4807,16,0,649,
-1,2198,4808,16,0,
-683,1,89,4809,16,
-0,248,1,1834,4810,
-16,0,322,1,1622,
-4811,16,0,754,1,
-2413,4812,16,0,683,
-1,2075,4813,16,0,
-683,1,1731,4814,16,
-0,269,1,97,4815,
-16,0,444,1,1297,
-4816,16,0,360,1,
-1189,4817,16,0,234,
-1,102,4818,16,0,
-256,1,1585,4819,16,
-0,764,1,322,4820,
-16,0,532,1,1958,
-4821,16,0,683,1,
-199,4822,16,0,347,
-1,1371,4823,16,0,
-429,1,217,4824,16,
-0,357,1,153,4825,
-19,4826,4,36,67,
+0,1,153,4749,1,
+154,4822,19,4823,4,
+24,76,0,105,0,
+115,0,116,0,67,
 0,111,0,110,0,
 115,0,116,0,97,
 0,110,0,116,0,
+1,154,4749,1,155,
+4824,19,188,1,155,
+4825,5,67,1,1901,
+4826,16,0,690,1,
+1479,4827,16,0,611,
+1,112,4828,16,0,
+276,1,2293,4829,16,
+0,302,1,1804,4830,
+16,0,690,1,431,
+4831,16,0,685,1,
+1443,4832,16,0,538,
+1,1756,4833,16,0,
+793,1,124,4834,16,
+0,283,1,525,4835,
+16,0,340,1,236,
+4836,16,0,377,1,
+346,4837,16,0,574,
+1,1876,4838,16,0,
+353,1,1659,4839,16,
+0,793,1,1225,4840,
+16,0,275,1,1117,
+4841,16,0,245,1,
+137,4842,16,0,301,
+1,2318,4843,16,0,
+793,1,1775,4844,16,
+0,690,1,32,4845,
+16,0,690,1,1407,
+4846,16,0,561,1,
+2782,4847,16,0,256,
+1,256,4848,16,0,
+431,1,459,4849,16,
+0,186,1,406,4850,
+16,0,649,1,41,
+4851,16,0,186,1,
+151,4852,16,0,315,
+1,43,4853,16,0,
+738,1,1990,4854,16,
+0,690,1,2337,4855,
+16,0,690,1,509,
+4856,16,0,762,1,
+52,4857,16,0,702,
+1,381,4858,16,0,
+629,1,447,4859,16,
+0,340,1,166,4860,
+16,0,329,1,462,
+4861,16,0,186,1,
+277,4862,16,0,476,
+1,1695,4863,16,0,
+298,1,1261,4864,16,
+0,313,1,1153,4865,
+16,0,193,1,2106,
+4866,16,0,690,1,
+1335,4867,16,0,362,
+1,71,4868,16,0,
+229,1,182,4869,16,
+0,340,1,76,4870,
+16,0,627,1,79,
+4871,16,0,244,1,
+1933,4872,16,0,443,
+1,299,4873,16,0,
+503,1,85,4874,16,
+0,526,1,1515,4875,
+16,0,644,1,2198,
+4876,16,0,690,1,
+89,4877,16,0,257,
+1,1834,4878,16,0,
+325,1,1622,4879,16,
+0,761,1,2413,4880,
+16,0,690,1,2075,
+4881,16,0,690,1,
+1731,4882,16,0,277,
+1,97,4883,16,0,
+447,1,1297,4884,16,
+0,364,1,1189,4885,
+16,0,243,1,102,
+4886,16,0,265,1,
+1585,4887,16,0,773,
+1,322,4888,16,0,
+530,1,1958,4889,16,
+0,690,1,199,4890,
+16,0,351,1,1371,
+4891,16,0,432,1,
+217,4892,16,0,361,
+1,156,4893,19,4894,
+4,36,67,0,111,
+0,110,0,115,0,
+116,0,97,0,110,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,156,
+4825,1,157,4895,19,
+4896,4,30,73,0,
+100,0,101,0,110,
+0,116,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,157,
+4825,1,158,4897,19,
+4898,4,36,73,0,
+100,0,101,0,110,
+0,116,0,68,0,
+111,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,1,
+158,4825,1,159,4899,
+19,4900,4,44,70,
+0,117,0,110,0,
+99,0,116,0,105,
+0,111,0,110,0,
+67,0,97,0,108,
+0,108,0,69,0,
+120,0,112,0,114,
+0,101,0,115,0,
+115,0,105,0,111,
+0,110,0,1,159,
+4825,1,160,4901,19,
+4902,4,32,66,0,
+105,0,110,0,97,
+0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-1,153,4757,1,154,
-4827,19,4828,4,30,
-73,0,100,0,101,
-0,110,0,116,0,
+1,160,4825,1,161,
+4903,19,4904,4,30,
+85,0,110,0,97,
+0,114,0,121,0,
 69,0,120,0,112,
 0,114,0,101,0,
 115,0,115,0,105,
 0,111,0,110,0,
-1,154,4757,1,155,
-4829,19,4830,4,36,
-73,0,100,0,101,
-0,110,0,116,0,
-68,0,111,0,116,
+1,161,4825,1,162,
+4905,19,4906,4,36,
+84,0,121,0,112,
+0,101,0,99,0,
+97,0,115,0,116,
 0,69,0,120,0,
 112,0,114,0,101,
 0,115,0,115,0,
 105,0,111,0,110,
-0,1,155,4757,1,
-156,4831,19,4832,4,
-44,70,0,117,0,
-110,0,99,0,116,
-0,105,0,111,0,
-110,0,67,0,97,
-0,108,0,108,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-1,156,4757,1,157,
-4833,19,4834,4,32,
-66,0,105,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,1,157,4757,
-1,158,4835,19,4836,
-4,30,85,0,110,
-0,97,0,114,0,
-121,0,69,0,120,
-0,112,0,114,0,
-101,0,115,0,115,
-0,105,0,111,0,
-110,0,1,158,4757,
-1,159,4837,19,4838,
-4,36,84,0,121,
-0,112,0,101,0,
-99,0,97,0,115,
-0,116,0,69,0,
+0,1,162,4825,1,
+163,4907,19,4908,4,
+42,80,0,97,0,
+114,0,101,0,110,
+0,116,0,104,0,
+101,0,115,0,105,
+0,115,0,69,0,
 120,0,112,0,114,
 0,101,0,115,0,
 115,0,105,0,111,
-0,110,0,1,159,
-4757,1,160,4839,19,
-4840,4,42,80,0,
-97,0,114,0,101,
-0,110,0,116,0,
-104,0,101,0,115,
-0,105,0,115,0,
-69,0,120,0,112,
-0,114,0,101,0,
-115,0,115,0,105,
-0,111,0,110,0,
-1,160,4757,1,161,
-4841,19,4842,4,56,
-73,0,110,0,99,
-0,114,0,101,0,
-109,0,101,0,110,
-0,116,0,68,0,
-101,0,99,0,114,
+0,110,0,1,163,
+4825,1,164,4909,19,
+4910,4,56,73,0,
+110,0,99,0,114,
 0,101,0,109,0,
 101,0,110,0,116,
-0,69,0,120,0,
-112,0,114,0,101,
-0,115,0,115,0,
-105,0,111,0,110,
-0,1,161,4757,1,
-163,4843,19,792,1,
-163,4206,1,164,4844,
-19,787,1,164,4206,
-1,165,4845,19,3478,
-1,165,4209,1,166,
-4846,19,3496,1,166,
-4209,1,167,4847,19,
-3473,1,167,4209,1,
-168,4848,19,3468,1,
-168,4209,1,169,4849,
-19,3501,1,169,4212,
-1,170,4850,19,3484,
-1,170,4212,1,171,
-4851,19,3491,1,171,
-4216,1,172,4852,19,
-3507,1,172,4216,1,
-173,4853,19,803,1,
-173,4220,1,174,4854,
-19,798,1,174,4220,
-1,175,4855,19,814,
-1,175,4224,1,176,
-4856,19,809,1,176,
-4224,1,177,4857,19,
-1789,1,177,4230,1,
-178,4858,19,1758,1,
-178,4230,1,179,4859,
-19,1784,1,179,4230,
-1,180,4860,19,1837,
-1,180,4230,1,181,
-4861,19,1843,1,181,
-4230,1,182,4862,19,
-1747,1,182,4230,1,
-183,4863,19,1779,1,
-183,4230,1,184,4864,
-19,1742,1,184,4230,
-1,185,4865,19,1774,
-1,185,4230,1,186,
-4866,19,1737,1,186,
-4230,1,187,4867,19,
-1769,1,187,4230,1,
-188,4868,19,1732,1,
-188,4230,1,189,4869,
-19,1764,1,189,4230,
-1,190,4870,19,1832,
-1,190,4230,1,191,
-4871,19,1808,1,191,
-4234,1,192,4872,19,
-1820,1,192,4240,1,
-193,4873,19,1814,1,
-193,4246,1,194,4874,
-19,1802,1,194,4252,
-1,195,4875,19,1827,
-1,195,4258,1,196,
-4876,19,1795,1,196,
-4264,1,197,4877,19,
-1753,1,197,4270,1,
-198,4878,19,1895,1,
-198,4276,1,199,4879,
-19,1871,1,199,4276,
-1,200,4880,19,2280,
-1,200,4281,1,201,
-4881,19,2245,1,201,
-4284,1,202,4882,19,
-2239,1,202,4287,1,
-203,4883,19,2233,1,
-203,4290,1,204,4884,
-19,2265,1,204,4293,
-1,205,4885,19,1222,
-1,205,4296,1,206,
-4886,19,2253,1,206,
-4315,1,207,4887,19,
-1917,1,207,4318,1,
-208,4888,19,1851,1,
-208,4323,1,209,4889,
-19,1864,1,209,4328,
-1,210,4890,19,1006,
-1,210,4394,1,211,
-4891,19,990,1,211,
-4394,1,212,4892,19,
-996,1,212,4416,1,
-213,4893,19,984,1,
-213,4416,1,214,4894,
-19,1250,1,214,4432,
-1,215,4895,19,887,
-1,215,4419,1,216,
-4896,19,1001,1,216,
-4419,1,217,4897,19,
-882,1,217,4419,1,
-218,4898,19,907,1,
-218,4419,1,219,4899,
-19,876,1,219,4419,
-1,220,4900,19,870,
-1,220,4419,1,221,
-4901,19,865,1,221,
-4419,1,222,4902,19,
-860,1,222,4419,1,
-223,4903,19,854,1,
-223,4419,1,224,4904,
-19,849,1,224,4419,
-1,225,4905,19,844,
-1,225,4419,1,226,
-4906,19,839,1,226,
-4419,1,227,4907,19,
-834,1,227,4419,1,
-228,4908,19,1257,1,
-228,4504,1,229,4909,
-19,1395,1,229,4517,
-1,230,4910,19,1244,
-1,230,4530,1,231,
-4911,19,1383,1,231,
-4530,1,232,4912,19,
-1023,1,232,4543,1,
-233,4913,19,827,1,
-233,4543,1,234,4914,
-19,922,1,234,4543,
-1,235,4915,19,950,
-1,235,4543,1,236,
-4916,19,969,1,236,
-4556,1,237,4917,19,
-1015,1,237,4556,1,
-238,4918,19,930,1,
-238,4569,1,239,4919,
-19,943,1,239,4569,
-1,240,4920,19,896,
-1,240,4582,1,241,
-4921,19,935,1,241,
-4582,1,242,4922,19,
-1581,1,242,4595,1,
-243,4923,19,1263,1,
-243,4595,1,244,4924,
-19,1613,1,244,4595,
-1,245,4925,19,1645,
-1,245,4595,1,246,
-4926,19,1511,1,246,
-4445,1,247,4927,19,
-1570,1,247,4445,1,
-248,4928,19,1238,1,
-248,4458,1,249,4929,
-19,1677,1,249,4458,
-1,250,4930,19,1608,
-1,250,4458,1,251,
-4931,19,1555,1,251,
-4458,1,252,4932,19,
-1479,1,252,4458,1,
-253,4933,19,1405,1,
-253,4458,1,254,4934,
-19,1415,1,254,4458,
-1,255,4935,19,1233,
-1,255,4458,1,256,
-4936,19,1661,1,256,
-4458,1,257,4937,19,
-1603,1,257,4458,1,
-258,4938,19,1545,1,
-258,4458,1,259,4939,
-19,1468,1,259,4458,
-1,260,4940,19,1431,
-1,260,4458,1,261,
-4941,19,1216,1,261,
-4458,1,262,4942,19,
-1565,1,262,4458,1,
-263,4943,19,1591,1,
-263,4458,1,264,4944,
-19,1538,1,264,4458,
-1,265,4945,19,1560,
-1,265,4458,1,266,
-4946,19,1371,1,266,
-4458,1,267,4947,19,
-1275,1,267,4458,1,
-268,4948,19,1204,1,
-268,4458,1,269,4949,
-19,1635,1,269,4458,
-1,270,4950,19,1586,
-1,270,4458,1,271,
-4951,19,1533,1,271,
-4458,1,272,4952,19,
-1400,1,272,4491,1,
-273,4953,19,1378,1,
-273,4491,1,274,4954,
-19,1666,1,274,4681,
-1,275,4955,19,1689,
-1,275,4681,1,276,
-4956,19,1656,1,276,
-4681,1,277,4957,19,
-1651,1,277,4681,1,
-278,4958,19,1672,1,
-278,4681,1,279,4959,
-19,1619,1,279,4681,
-1,280,4960,19,1325,
-1,280,4681,1,281,
-4961,19,1500,1,281,
-4757,1,282,4962,19,
-1286,1,282,4757,1,
-283,4963,19,1293,1,
-283,4757,1,284,4964,
-19,1314,1,284,4757,
-1,285,4965,19,1309,
-1,285,4757,1,286,
-4966,19,1304,1,286,
-4757,1,287,4967,19,
-1299,1,287,4757,1,
-288,4968,19,1489,1,
-288,4757,1,289,4969,
-19,1517,1,289,4757,
-1,290,4970,19,1494,
-1,290,4757,1,291,
-4971,19,1484,1,291,
-4757,1,292,4972,19,
-1474,1,292,4757,1,
-293,4973,19,1457,1,
-293,4757,1,294,4974,
-19,1410,1,294,4757,
-1,295,4975,19,1319,
-1,295,4757,1,296,
-4976,19,1280,1,296,
-4757,1,297,4977,19,
-1228,1,297,4757,1,
-298,4978,19,1684,1,
-298,4757,1,299,4979,
-19,1640,1,299,4757,
-1,300,4980,19,1630,
-1,300,4757,1,301,
-4981,19,1625,1,301,
-4757,1,302,4982,19,
-1576,1,302,4757,1,
-303,4983,19,1550,1,
-303,4757,1,304,4984,
-19,1527,1,304,4757,
-1,305,4985,19,1522,
-1,305,4757,1,306,
-4986,19,1463,1,306,
-4757,1,307,4987,19,
-1439,1,307,4757,1,
-308,4988,19,1505,1,
-308,4757,1,309,4989,
-19,1597,1,309,4757,
-1,310,4990,19,1452,
-1,310,4757,1,311,
-4991,19,1446,1,311,
-4757,1,312,4992,19,
-1426,1,312,4757,1,
-313,4993,19,1389,1,
-313,4757,1,314,4994,
-19,1366,1,314,4757,
-1,315,4995,19,1211,
-1,315,4757,1,316,
-4996,19,1699,1,316,
-4757,1,317,4997,19,
-1331,1,317,4757,1,
-318,4998,19,1336,1,
-318,4757,1,319,4999,
-19,1356,1,319,4757,
-1,320,5000,19,1346,
-1,320,4757,1,321,
-5001,19,1351,1,321,
-4757,1,322,5002,19,
-1341,1,322,4757,1,
-323,5003,19,1694,1,
-323,4757,1,324,5004,
-19,1361,1,324,4757,
-1,325,5005,19,1421,
-1,325,4600,1,326,
-5006,19,1911,1,326,
-4670,1,327,5007,19,
-1901,1,327,4670,1,
-328,5008,19,1881,1,
-328,4674,1,329,5009,
-19,2225,1,329,4332,
-1,330,5010,19,2220,
-1,330,4332,1,331,
-5011,19,2215,1,331,
-4332,1,332,5012,19,
-2210,1,332,4332,1,
-333,5013,19,2205,1,
-333,4332,1,334,5014,
-19,2200,1,334,4332,
-1,335,5015,19,2195,
-1,335,4332,1,336,
-5016,19,2184,1,336,
-4352,1,337,5017,19,
-2179,1,337,4352,1,
-338,5018,19,2174,1,
-338,4352,1,339,5019,
-19,2169,1,339,4352,
-1,340,5020,19,2164,
-1,340,4352,1,341,
-5021,19,2159,1,341,
-4352,1,342,5022,19,
-2154,1,342,4352,1,
-343,5023,19,2149,1,
-343,4352,1,344,5024,
-19,2144,1,344,4352,
-1,345,5025,19,1972,
-1,345,4358,1,346,
-5026,19,2137,1,346,
-4358,1,347,5027,19,
-2011,1,347,4358,1,
-348,5028,19,2131,1,
-348,4358,1,349,5029,
-19,1965,1,349,4358,
-1,350,5030,19,2126,
-1,350,4358,1,351,
-5031,19,2121,1,351,
-4358,1,352,5032,19,
-2116,1,352,4358,1,
-353,5033,19,2111,1,
-353,4364,1,354,5034,
-19,2106,1,354,4364,
-1,355,5035,19,2100,
-1,355,4370,1,356,
-5036,19,1956,1,356,
-4370,1,357,5037,19,
-2094,1,357,4370,1,
-358,5038,19,2089,1,
-358,4370,1,359,5039,
-19,2084,1,359,4370,
-1,360,5040,19,1949,
-1,360,4370,1,361,
-5041,19,2078,1,361,
-4370,1,362,5042,19,
-2003,1,362,4370,1,
-363,5043,19,2073,1,
-363,4370,1,364,5044,
-19,2068,1,364,4370,
-1,365,5045,19,2063,
-1,365,4376,1,366,
-5046,19,2058,1,366,
-4376,1,367,5047,19,
-2053,1,367,4376,1,
-368,5048,19,2047,1,
-368,4382,1,369,5049,
-19,2041,1,369,4388,
-1,370,5050,19,5051,
+0,68,0,101,0,
+99,0,114,0,101,
+0,109,0,101,0,
+110,0,116,0,69,
+0,120,0,112,0,
+114,0,101,0,115,
+0,115,0,105,0,
+111,0,110,0,1,
+164,4825,1,166,4911,
+19,822,1,166,4255,
+1,167,4912,19,832,
+1,167,4255,1,168,
+4913,19,3549,1,168,
+4258,1,169,4914,19,
+3539,1,169,4258,1,
+170,4915,19,3544,1,
+170,4258,1,171,4916,
+19,3534,1,171,4258,
+1,172,4917,19,3520,
+1,172,4261,1,173,
+4918,19,3554,1,173,
+4261,1,174,4919,19,
+3514,1,174,4265,1,
+175,4920,19,3528,1,
+175,4265,1,176,4921,
+19,805,1,176,4269,
+1,177,4922,19,816,
+1,177,4269,1,178,
+4923,19,811,1,178,
+4273,1,179,4924,19,
+827,1,179,4273,1,
+180,4925,19,1835,1,
+180,4279,1,181,4926,
+19,1799,1,181,4279,
+1,182,4927,19,1830,
+1,182,4279,1,183,
+4928,19,1794,1,183,
+4279,1,184,4929,19,
+1825,1,184,4279,1,
+185,4930,19,1756,1,
+185,4279,1,186,4931,
+19,1820,1,186,4279,
+1,187,4932,19,1751,
+1,187,4279,1,188,
+4933,19,1815,1,188,
+4279,1,189,4934,19,
+1783,1,189,4279,1,
+190,4935,19,1810,1,
+190,4279,1,191,4936,
+19,1778,1,191,4279,
+1,192,4937,19,1805,
+1,192,4279,1,193,
+4938,19,1773,1,193,
+4279,1,194,4939,19,
+1878,1,194,4279,1,
+195,4940,19,1768,1,
+195,4279,1,196,4941,
+19,1872,1,196,4283,
+1,197,4942,19,1865,
+1,197,4289,1,198,
+4943,19,1841,1,198,
+4295,1,199,4944,19,
+1859,1,199,4301,1,
+200,4945,19,1853,1,
+200,4307,1,201,4946,
+19,1847,1,201,4313,
+1,202,4947,19,1789,
+1,202,4319,1,203,
+4948,19,1762,1,203,
+4325,1,204,4949,19,
+1941,1,204,4331,1,
+205,4950,19,1907,1,
+205,4331,1,206,4951,
+19,2302,1,206,4336,
+1,207,4952,19,2294,
+1,207,4339,1,208,
+4953,19,2327,1,208,
+4342,1,209,4954,19,
+2285,1,209,4345,1,
+210,4955,19,2279,1,
+210,4348,1,211,4956,
+19,2313,1,211,4351,
+1,212,4957,19,1239,
+1,212,4354,1,213,
+4958,19,1960,1,213,
+4373,1,214,4959,19,
+1886,1,214,4377,1,
+215,4960,19,1899,1,
+215,4384,1,216,4961,
+19,1913,1,216,4389,
+1,217,4962,19,1024,
+1,217,4461,1,218,
+4963,19,1008,1,218,
+4461,1,219,4964,19,
+1014,1,219,4484,1,
+220,4965,19,1002,1,
+220,4484,1,221,4966,
+19,1267,1,221,4500,
+1,222,4967,19,904,
+1,222,4487,1,223,
+4968,19,1019,1,223,
+4487,1,224,4969,19,
+899,1,224,4487,1,
+225,4970,19,924,1,
+225,4487,1,226,4971,
+19,893,1,226,4487,
+1,227,4972,19,887,
+1,227,4487,1,228,
+4973,19,882,1,228,
+4487,1,229,4974,19,
+877,1,229,4487,1,
+230,4975,19,871,1,
+230,4487,1,231,4976,
+19,866,1,231,4487,
+1,232,4977,19,861,
+1,232,4487,1,233,
+4978,19,856,1,233,
+4487,1,234,4979,19,
+851,1,234,4487,1,
+235,4980,19,1274,1,
+235,4572,1,236,4981,
+19,1413,1,236,4585,
+1,237,4982,19,1261,
+1,237,4598,1,238,
+4983,19,1401,1,238,
+4598,1,239,4984,19,
+1041,1,239,4611,1,
+240,4985,19,844,1,
+240,4611,1,241,4986,
+19,939,1,241,4611,
+1,242,4987,19,968,
+1,242,4611,1,243,
+4988,19,987,1,243,
+4624,1,244,4989,19,
+1033,1,244,4624,1,
+245,4990,19,947,1,
+245,4637,1,246,4991,
+19,961,1,246,4637,
+1,247,4992,19,913,
+1,247,4650,1,248,
+4993,19,952,1,248,
+4650,1,249,4994,19,
+1594,1,249,4663,1,
+250,4995,19,1280,1,
+250,4663,1,251,4996,
+19,1626,1,251,4663,
+1,252,4997,19,1658,
+1,252,4663,1,253,
+4998,19,1524,1,253,
+4513,1,254,4999,19,
+1583,1,254,4513,1,
+255,5000,19,1255,1,
+255,4526,1,256,5001,
+19,1690,1,256,4526,
+1,257,5002,19,1621,
+1,257,4526,1,258,
+5003,19,1568,1,258,
+4526,1,259,5004,19,
+1492,1,259,4526,1,
+260,5005,19,1423,1,
+260,4526,1,261,5006,
+19,1433,1,261,4526,
+1,262,5007,19,1250,
+1,262,4526,1,263,
+5008,19,1674,1,263,
+4526,1,264,5009,19,
+1616,1,264,4526,1,
+265,5010,19,1558,1,
+265,4526,1,266,5011,
+19,1481,1,266,4526,
+1,267,5012,19,1443,
+1,267,4526,1,268,
+5013,19,1233,1,268,
+4526,1,269,5014,19,
+1578,1,269,4526,1,
+270,5015,19,1604,1,
+270,4526,1,271,5016,
+19,1551,1,271,4526,
+1,272,5017,19,1573,
+1,272,4526,1,273,
+5018,19,1389,1,273,
+4526,1,274,5019,19,
+1293,1,274,4526,1,
+275,5020,19,1222,1,
+275,4526,1,276,5021,
+19,1648,1,276,4526,
+1,277,5022,19,1599,
+1,277,4526,1,278,
+5023,19,1546,1,278,
+4526,1,279,5024,19,
+1418,1,279,4559,1,
+280,5025,19,1396,1,
+280,4559,1,281,5026,
+19,1679,1,281,4749,
+1,282,5027,19,1708,
+1,282,4749,1,283,
+5028,19,1669,1,283,
+4749,1,284,5029,19,
+1664,1,284,4749,1,
+285,5030,19,1685,1,
+285,4749,1,286,5031,
+19,1632,1,286,4749,
+1,287,5032,19,1343,
+1,287,4749,1,288,
+5033,19,1513,1,288,
+4825,1,289,5034,19,
+1304,1,289,4825,1,
+290,5035,19,1311,1,
+290,4825,1,291,5036,
+19,1332,1,291,4825,
+1,292,5037,19,1327,
+1,292,4825,1,293,
+5038,19,1322,1,293,
+4825,1,294,5039,19,
+1317,1,294,4825,1,
+295,5040,19,1502,1,
+295,4825,1,296,5041,
+19,1530,1,296,4825,
+1,297,5042,19,1507,
+1,297,4825,1,298,
+5043,19,1497,1,298,
+4825,1,299,5044,19,
+1487,1,299,4825,1,
+300,5045,19,1470,1,
+300,4825,1,301,5046,
+19,1428,1,301,4825,
+1,302,5047,19,1337,
+1,302,4825,1,303,
+5048,19,1298,1,303,
+4825,1,304,5049,19,
+1245,1,304,4825,1,
+305,5050,19,1703,1,
+305,4825,1,306,5051,
+19,1653,1,306,4825,
+1,307,5052,19,1643,
+1,307,4825,1,308,
+5053,19,1638,1,308,
+4825,1,309,5054,19,
+1589,1,309,4825,1,
+310,5055,19,1563,1,
+310,4825,1,311,5056,
+19,1540,1,311,4825,
+1,312,5057,19,1535,
+1,312,4825,1,313,
+5058,19,1476,1,313,
+4825,1,314,5059,19,
+1451,1,314,4825,1,
+315,5060,19,1518,1,
+315,4825,1,316,5061,
+19,1610,1,316,4825,
+1,317,5062,19,1465,
+1,317,4825,1,318,
+5063,19,1458,1,318,
+4825,1,319,5064,19,
+1438,1,319,4825,1,
+320,5065,19,1407,1,
+320,4825,1,321,5066,
+19,1384,1,321,4825,
+1,322,5067,19,1228,
+1,322,4825,1,323,
+5068,19,1718,1,323,
+4825,1,324,5069,19,
+1349,1,324,4825,1,
+325,5070,19,1354,1,
+325,4825,1,326,5071,
+19,1374,1,326,4825,
+1,327,5072,19,1364,
+1,327,4825,1,328,
+5073,19,1369,1,328,
+4825,1,329,5074,19,
+1359,1,329,4825,1,
+330,5075,19,1713,1,
+330,4825,1,331,5076,
+19,1379,1,331,4825,
+1,332,5077,19,1698,
+1,332,4668,1,333,
+5078,19,1954,1,333,
+4738,1,334,5079,19,
+1947,1,334,4738,1,
+335,5080,19,1924,1,
+335,4742,1,336,5081,
+19,2270,1,336,4393,
+1,337,5082,19,2265,
+1,337,4393,1,338,
+5083,19,2260,1,338,
+4393,1,339,5084,19,
+2255,1,339,4393,1,
+340,5085,19,2250,1,
+340,4393,1,341,5086,
+19,2245,1,341,4393,
+1,342,5087,19,2240,
+1,342,4393,1,343,
+5088,19,2229,1,343,
+4413,1,344,5089,19,
+2224,1,344,4413,1,
+345,5090,19,2219,1,
+345,4413,1,346,5091,
+19,2214,1,346,4413,
+1,347,5092,19,2209,
+1,347,4413,1,348,
+5093,19,2204,1,348,
+4413,1,349,5094,19,
+2199,1,349,4413,1,
+350,5095,19,2194,1,
+350,4413,1,351,5096,
+19,2188,1,351,4419,
+1,352,5097,19,2014,
+1,352,4419,1,353,
+5098,19,2182,1,353,
+4419,1,354,5099,19,
+2177,1,354,4419,1,
+355,5100,19,2172,1,
+355,4419,1,356,5101,
+19,2007,1,356,4419,
+1,357,5102,19,2167,
+1,357,4419,1,358,
+5103,19,2162,1,358,
+4419,1,359,5104,19,
+2157,1,359,4425,1,
+360,5105,19,2152,1,
+360,4425,1,361,5106,
+19,2146,1,361,4431,
+1,362,5107,19,2141,
+1,362,4431,1,363,
+5108,19,1998,1,363,
+4431,1,364,5109,19,
+2135,1,364,4431,1,
+365,5110,19,2130,1,
+365,4431,1,366,5111,
+19,2125,1,366,4431,
+1,367,5112,19,1992,
+1,367,4431,1,368,
+5113,19,2119,1,368,
+4431,1,369,5114,19,
+2047,1,369,4431,1,
+370,5115,19,2114,1,
+370,4431,1,371,5116,
+19,2109,1,371,4437,
+1,372,5117,19,2104,
+1,372,4437,1,373,
+5118,19,2099,1,373,
+4437,1,374,5119,19,
+2093,1,374,4443,1,
+375,5120,19,2087,1,
+375,4449,1,376,5121,
+19,2081,1,376,4455,
+1,377,5122,19,5123,
 4,50,65,0,114,
 0,103,0,117,0,
 109,0,101,0,110,
@@ -12562,16 +12861,16 @@ public yyLSLSyntax
 0,111,0,110,0,
 76,0,105,0,115,
 0,116,0,95,0,
-51,0,1,370,4276,
-1,371,5052,19,5053,
+51,0,1,377,4331,
+1,378,5124,19,5125,
 4,28,65,0,114,
 0,103,0,117,0,
 109,0,101,0,110,
 0,116,0,76,0,
 105,0,115,0,116,
 0,95,0,51,0,
-1,371,4670,1,372,
-5054,19,5055,4,50,
+1,378,4738,1,379,
+5126,19,5127,4,50,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
@@ -12582,27 +12881,27 @@ public yyLSLSyntax
 0,110,0,76,0,
 105,0,115,0,116,
 0,95,0,52,0,
-1,372,4276,1,373,
-5056,19,5057,4,50,
-65,0,114,0,103,
-0,117,0,109,0,
-101,0,110,0,116,
-0,68,0,101,0,
-99,0,108,0,97,
-0,114,0,97,0,
-116,0,105,0,111,
-0,110,0,76,0,
-105,0,115,0,116,
-0,95,0,53,0,
-1,373,4276,1,374,
-5058,19,5059,4,28,
+1,379,4331,1,380,
+5128,19,5129,4,28,
 65,0,114,0,103,
 0,117,0,109,0,
 101,0,110,0,116,
 0,76,0,105,0,
 115,0,116,0,95,
-0,52,0,1,374,
-4670,2,0,0};
+0,52,0,1,380,
+4738,1,381,5130,19,
+5131,4,50,65,0,
+114,0,103,0,117,
+0,109,0,101,0,
+110,0,116,0,68,
+0,101,0,99,0,
+108,0,97,0,114,
+0,97,0,116,0,
+105,0,111,0,110,
+0,76,0,105,0,
+115,0,116,0,95,
+0,53,0,1,381,
+4331,2,0,0};
 new Sfactory(this,"ExpressionArgument_1",new SCreator(ExpressionArgument_1_factory));
 new Sfactory(this,"VectorArgStateEvent",new SCreator(VectorArgStateEvent_factory));
 new Sfactory(this,"IntVecVecArgStateEvent",new SCreator(IntVecVecArgStateEvent_factory));
@@ -12637,6 +12936,7 @@ new Sfactory(this,"Assignment",new SCreator(Assignment_factory));
 new Sfactory(this,"IfStatement_4",new SCreator(IfStatement_4_factory));
 new Sfactory(this,"CompoundStatement_1",new SCreator(CompoundStatement_1_factory));
 new Sfactory(this,"CompoundStatement_2",new SCreator(CompoundStatement_2_factory));
+new Sfactory(this,"KeyIntIntArgumentDeclarationList_1",new SCreator(KeyIntIntArgumentDeclarationList_1_factory));
 new Sfactory(this,"BinaryExpression_8",new SCreator(BinaryExpression_8_factory));
 new Sfactory(this,"VectorArgEvent",new SCreator(VectorArgEvent_factory));
 new Sfactory(this,"ReturnStatement_1",new SCreator(ReturnStatement_1_factory));
@@ -12662,13 +12962,14 @@ new Sfactory(this,"ArgumentDeclarationList",new SCreator(ArgumentDeclarationList
 new Sfactory(this,"ConstantExpression",new SCreator(ConstantExpression_factory));
 new Sfactory(this,"LSLProgramRoot_1",new SCreator(LSLProgramRoot_1_factory));
 new Sfactory(this,"LSLProgramRoot_2",new SCreator(LSLProgramRoot_2_factory));
+new Sfactory(this,"KeyIntIntArgEvent_1",new SCreator(KeyIntIntArgEvent_1_factory));
 new Sfactory(this,"States_1",new SCreator(States_1_factory));
 new Sfactory(this,"States_2",new SCreator(States_2_factory));
 new Sfactory(this,"FunctionCallExpression_1",new SCreator(FunctionCallExpression_1_factory));
 new Sfactory(this,"KeyArgEvent_1",new SCreator(KeyArgEvent_1_factory));
 new Sfactory(this,"ForLoopStatement",new SCreator(ForLoopStatement_factory));
 new Sfactory(this,"IntArgStateEvent",new SCreator(IntArgStateEvent_factory));
-new Sfactory(this,"IntArgEvent_6",new SCreator(IntArgEvent_6_factory));
+new Sfactory(this,"StateBody_15",new SCreator(StateBody_15_factory));
 new Sfactory(this,"IntRotRotArgumentDeclarationList_1",new SCreator(IntRotRotArgumentDeclarationList_1_factory));
 new Sfactory(this,"IntArgEvent_9",new SCreator(IntArgEvent_9_factory));
 new Sfactory(this,"DoWhileStatement_1",new SCreator(DoWhileStatement_1_factory));
@@ -12679,11 +12980,12 @@ new Sfactory(this,"SimpleAssignment_12",new SCreator(SimpleAssignment_12_factory
 new Sfactory(this,"SimpleAssignment_13",new SCreator(SimpleAssignment_13_factory));
 new Sfactory(this,"JumpLabel",new SCreator(JumpLabel_factory));
 new Sfactory(this,"SimpleAssignment_15",new SCreator(SimpleAssignment_15_factory));
-new Sfactory(this,"StateBody_10",new SCreator(StateBody_10_factory));
 new Sfactory(this,"IntVecVecArgEvent",new SCreator(IntVecVecArgEvent_factory));
 new Sfactory(this,"VecDeclaration",new SCreator(VecDeclaration_factory));
 new Sfactory(this,"StateBody_14",new SCreator(StateBody_14_factory));
 new Sfactory(this,"GlobalDefinitions",new SCreator(GlobalDefinitions_factory));
+new Sfactory(this,"StateBody_16",new SCreator(StateBody_16_factory));
+new Sfactory(this,"KeyIntIntArgumentDeclarationList",new SCreator(KeyIntIntArgumentDeclarationList_factory));
 new Sfactory(this,"ConstantExpression_1",new SCreator(ConstantExpression_1_factory));
 new Sfactory(this,"VoidArgEvent_4",new SCreator(VoidArgEvent_4_factory));
 new Sfactory(this,"FunctionCall_1",new SCreator(FunctionCall_1_factory));
@@ -12693,10 +12995,10 @@ new Sfactory(this,"IntVecVecArgEvent_1",new SCreator(IntVecVecArgEvent_1_factory
 new Sfactory(this,"TypecastExpression_1",new SCreator(TypecastExpression_1_factory));
 new Sfactory(this,"SimpleAssignment_21",new SCreator(SimpleAssignment_21_factory));
 new Sfactory(this,"SimpleAssignment_22",new SCreator(SimpleAssignment_22_factory));
-new Sfactory(this,"SimpleAssignment_23",new SCreator(SimpleAssignment_23_factory));
+new Sfactory(this,"KeyIntIntArgStateEvent",new SCreator(KeyIntIntArgStateEvent_factory));
 new Sfactory(this,"TypecastExpression_9",new SCreator(TypecastExpression_9_factory));
 new Sfactory(this,"VoidArgEvent_2",new SCreator(VoidArgEvent_2_factory));
-new Sfactory(this,"Event_9",new SCreator(Event_9_factory));
+new Sfactory(this,"VoidArgEvent_3",new SCreator(VoidArgEvent_3_factory));
 new Sfactory(this,"ArgumentDeclarationList_1",new SCreator(ArgumentDeclarationList_1_factory));
 new Sfactory(this,"ArgumentDeclarationList_2",new SCreator(ArgumentDeclarationList_2_factory));
 new Sfactory(this,"GlobalDefinitions_1",new SCreator(GlobalDefinitions_1_factory));
@@ -12731,7 +13033,7 @@ new Sfactory(this,"UnaryExpression_1",new SCreator(UnaryExpression_1_factory));
 new Sfactory(this,"UnaryExpression_2",new SCreator(UnaryExpression_2_factory));
 new Sfactory(this,"UnaryExpression_3",new SCreator(UnaryExpression_3_factory));
 new Sfactory(this,"ArgumentList_1",new SCreator(ArgumentList_1_factory));
-new Sfactory(this,"ArgumentList_2",new SCreator(ArgumentList_2_factory));
+new Sfactory(this,"KeyIntIntArgEvent",new SCreator(KeyIntIntArgEvent_factory));
 new Sfactory(this,"ArgumentList_3",new SCreator(ArgumentList_3_factory));
 new Sfactory(this,"Constant",new SCreator(Constant_factory));
 new Sfactory(this,"State",new SCreator(State_factory));
@@ -12745,12 +13047,14 @@ new Sfactory(this,"GlobalVariableDeclaration_1",new SCreator(GlobalVariableDecla
 new Sfactory(this,"GlobalVariableDeclaration_2",new SCreator(GlobalVariableDeclaration_2_factory));
 new Sfactory(this,"IncrementDecrementExpression_5",new SCreator(IncrementDecrementExpression_5_factory));
 new Sfactory(this,"ReturnStatement",new SCreator(ReturnStatement_factory));
-new Sfactory(this,"IncrementDecrementExpression_7",new SCreator(IncrementDecrementExpression_7_factory));
+new Sfactory(this,"StateBody_10",new SCreator(StateBody_10_factory));
 new Sfactory(this,"StateBody_11",new SCreator(StateBody_11_factory));
 new Sfactory(this,"StateBody_12",new SCreator(StateBody_12_factory));
 new Sfactory(this,"IntVecVecArgStateEvent_1",new SCreator(IntVecVecArgStateEvent_1_factory));
 new Sfactory(this,"KeyDeclaration",new SCreator(KeyDeclaration_factory));
+new Sfactory(this,"IntArgEvent_6",new SCreator(IntArgEvent_6_factory));
 new Sfactory(this,"ArgumentDeclarationList_3",new SCreator(ArgumentDeclarationList_3_factory));
+new Sfactory(this,"ArgumentList_2",new SCreator(ArgumentList_2_factory));
 new Sfactory(this,"IntArgEvent_10",new SCreator(IntArgEvent_10_factory));
 new Sfactory(this,"CompoundStatement",new SCreator(CompoundStatement_factory));
 new Sfactory(this,"TypecastExpression_3",new SCreator(TypecastExpression_3_factory));
@@ -12779,6 +13083,7 @@ new Sfactory(this,"IncrementDecrementExpression_2",new SCreator(IncrementDecreme
 new Sfactory(this,"IntVecVecArgumentDeclarationList_1",new SCreator(IntVecVecArgumentDeclarationList_1_factory));
 new Sfactory(this,"IncrementDecrementExpression_4",new SCreator(IncrementDecrementExpression_4_factory));
 new Sfactory(this,"IncrementDecrementExpression_6",new SCreator(IncrementDecrementExpression_6_factory));
+new Sfactory(this,"IncrementDecrementExpression_7",new SCreator(IncrementDecrementExpression_7_factory));
 new Sfactory(this,"StateEvent",new SCreator(StateEvent_factory));
 new Sfactory(this,"IntArgEvent_3",new SCreator(IntArgEvent_3_factory));
 new Sfactory(this,"IntArgEvent_4",new SCreator(IntArgEvent_4_factory));
@@ -12802,6 +13107,7 @@ new Sfactory(this,"TypecastExpression",new SCreator(TypecastExpression_factory))
 new Sfactory(this,"JumpStatement_1",new SCreator(JumpStatement_1_factory));
 new Sfactory(this,"SimpleAssignment_20",new SCreator(SimpleAssignment_20_factory));
 new Sfactory(this,"Statement_7",new SCreator(Statement_7_factory));
+new Sfactory(this,"SimpleAssignment_23",new SCreator(SimpleAssignment_23_factory));
 new Sfactory(this,"SimpleAssignment_24",new SCreator(SimpleAssignment_24_factory));
 new Sfactory(this,"SimpleAssignment_1",new SCreator(SimpleAssignment_1_factory));
 new Sfactory(this,"SimpleAssignment_2",new SCreator(SimpleAssignment_2_factory));
@@ -12836,7 +13142,6 @@ new Sfactory(this,"BinaryExpression_13",new SCreator(BinaryExpression_13_factory
 new Sfactory(this,"GlobalFunctionDefinition_2",new SCreator(GlobalFunctionDefinition_2_factory));
 new Sfactory(this,"StateChange_2",new SCreator(StateChange_2_factory));
 new Sfactory(this,"VoidArgEvent_1",new SCreator(VoidArgEvent_1_factory));
-new Sfactory(this,"VoidArgEvent_3",new SCreator(VoidArgEvent_3_factory));
 new Sfactory(this,"BinaryExpression_10",new SCreator(BinaryExpression_10_factory));
 new Sfactory(this,"VoidArgEvent_5",new SCreator(VoidArgEvent_5_factory));
 new Sfactory(this,"VoidArgEvent_6",new SCreator(VoidArgEvent_6_factory));
@@ -12861,6 +13166,7 @@ new Sfactory(this,"EmptyStatement_1",new SCreator(EmptyStatement_1_factory));
 new Sfactory(this,"SimpleAssignment_7",new SCreator(SimpleAssignment_7_factory));
 new Sfactory(this,"ForLoop",new SCreator(ForLoop_factory));
 new Sfactory(this,"ForLoop_2",new SCreator(ForLoop_2_factory));
+new Sfactory(this,"KeyIntIntArgStateEvent_1",new SCreator(KeyIntIntArgStateEvent_1_factory));
 new Sfactory(this,"KeyArgumentDeclarationList_1",new SCreator(KeyArgumentDeclarationList_1_factory));
 new Sfactory(this,"GlobalFunctionDefinition_1",new SCreator(GlobalFunctionDefinition_1_factory));
 new Sfactory(this,"IfStatement",new SCreator(IfStatement_factory));
@@ -12917,6 +13223,7 @@ public static object Assignment_factory(Parser yyp) { return new Assignment(yyp)
 public static object IfStatement_4_factory(Parser yyp) { return new IfStatement_4(yyp); }
 public static object CompoundStatement_1_factory(Parser yyp) { return new CompoundStatement_1(yyp); }
 public static object CompoundStatement_2_factory(Parser yyp) { return new CompoundStatement_2(yyp); }
+public static object KeyIntIntArgumentDeclarationList_1_factory(Parser yyp) { return new KeyIntIntArgumentDeclarationList_1(yyp); }
 public static object BinaryExpression_8_factory(Parser yyp) { return new BinaryExpression_8(yyp); }
 public static object VectorArgEvent_factory(Parser yyp) { return new VectorArgEvent(yyp); }
 public static object ReturnStatement_1_factory(Parser yyp) { return new ReturnStatement_1(yyp); }
@@ -12942,13 +13249,14 @@ public static object ArgumentDeclarationList_factory(Parser yyp) { return new Ar
 public static object ConstantExpression_factory(Parser yyp) { return new ConstantExpression(yyp); }
 public static object LSLProgramRoot_1_factory(Parser yyp) { return new LSLProgramRoot_1(yyp); }
 public static object LSLProgramRoot_2_factory(Parser yyp) { return new LSLProgramRoot_2(yyp); }
+public static object KeyIntIntArgEvent_1_factory(Parser yyp) { return new KeyIntIntArgEvent_1(yyp); }
 public static object States_1_factory(Parser yyp) { return new States_1(yyp); }
 public static object States_2_factory(Parser yyp) { return new States_2(yyp); }
 public static object FunctionCallExpression_1_factory(Parser yyp) { return new FunctionCallExpression_1(yyp); }
 public static object KeyArgEvent_1_factory(Parser yyp) { return new KeyArgEvent_1(yyp); }
 public static object ForLoopStatement_factory(Parser yyp) { return new ForLoopStatement(yyp); }
 public static object IntArgStateEvent_factory(Parser yyp) { return new IntArgStateEvent(yyp); }
-public static object IntArgEvent_6_factory(Parser yyp) { return new IntArgEvent_6(yyp); }
+public static object StateBody_15_factory(Parser yyp) { return new StateBody_15(yyp); }
 public static object IntRotRotArgumentDeclarationList_1_factory(Parser yyp) { return new IntRotRotArgumentDeclarationList_1(yyp); }
 public static object IntArgEvent_9_factory(Parser yyp) { return new IntArgEvent_9(yyp); }
 public static object DoWhileStatement_1_factory(Parser yyp) { return new DoWhileStatement_1(yyp); }
@@ -12959,11 +13267,12 @@ public static object SimpleAssignment_12_factory(Parser yyp) { return new Simple
 public static object SimpleAssignment_13_factory(Parser yyp) { return new SimpleAssignment_13(yyp); }
 public static object JumpLabel_factory(Parser yyp) { return new JumpLabel(yyp); }
 public static object SimpleAssignment_15_factory(Parser yyp) { return new SimpleAssignment_15(yyp); }
-public static object StateBody_10_factory(Parser yyp) { return new StateBody_10(yyp); }
 public static object IntVecVecArgEvent_factory(Parser yyp) { return new IntVecVecArgEvent(yyp); }
 public static object VecDeclaration_factory(Parser yyp) { return new VecDeclaration(yyp); }
 public static object StateBody_14_factory(Parser yyp) { return new StateBody_14(yyp); }
 public static object GlobalDefinitions_factory(Parser yyp) { return new GlobalDefinitions(yyp); }
+public static object StateBody_16_factory(Parser yyp) { return new StateBody_16(yyp); }
+public static object KeyIntIntArgumentDeclarationList_factory(Parser yyp) { return new KeyIntIntArgumentDeclarationList(yyp); }
 public static object ConstantExpression_1_factory(Parser yyp) { return new ConstantExpression_1(yyp); }
 public static object VoidArgEvent_4_factory(Parser yyp) { return new VoidArgEvent_4(yyp); }
 public static object FunctionCall_1_factory(Parser yyp) { return new FunctionCall_1(yyp); }
@@ -12973,10 +13282,10 @@ public static object IntVecVecArgEvent_1_factory(Parser yyp) { return new IntVec
 public static object TypecastExpression_1_factory(Parser yyp) { return new TypecastExpression_1(yyp); }
 public static object SimpleAssignment_21_factory(Parser yyp) { return new SimpleAssignment_21(yyp); }
 public static object SimpleAssignment_22_factory(Parser yyp) { return new SimpleAssignment_22(yyp); }
-public static object SimpleAssignment_23_factory(Parser yyp) { return new SimpleAssignment_23(yyp); }
+public static object KeyIntIntArgStateEvent_factory(Parser yyp) { return new KeyIntIntArgStateEvent(yyp); }
 public static object TypecastExpression_9_factory(Parser yyp) { return new TypecastExpression_9(yyp); }
 public static object VoidArgEvent_2_factory(Parser yyp) { return new VoidArgEvent_2(yyp); }
-public static object Event_9_factory(Parser yyp) { return new Event_9(yyp); }
+public static object VoidArgEvent_3_factory(Parser yyp) { return new VoidArgEvent_3(yyp); }
 public static object ArgumentDeclarationList_1_factory(Parser yyp) { return new ArgumentDeclarationList_1(yyp); }
 public static object ArgumentDeclarationList_2_factory(Parser yyp) { return new ArgumentDeclarationList_2(yyp); }
 public static object GlobalDefinitions_1_factory(Parser yyp) { return new GlobalDefinitions_1(yyp); }
@@ -13011,7 +13320,7 @@ public static object UnaryExpression_1_factory(Parser yyp) { return new UnaryExp
 public static object UnaryExpression_2_factory(Parser yyp) { return new UnaryExpression_2(yyp); }
 public static object UnaryExpression_3_factory(Parser yyp) { return new UnaryExpression_3(yyp); }
 public static object ArgumentList_1_factory(Parser yyp) { return new ArgumentList_1(yyp); }
-public static object ArgumentList_2_factory(Parser yyp) { return new ArgumentList_2(yyp); }
+public static object KeyIntIntArgEvent_factory(Parser yyp) { return new KeyIntIntArgEvent(yyp); }
 public static object ArgumentList_3_factory(Parser yyp) { return new ArgumentList_3(yyp); }
 public static object Constant_factory(Parser yyp) { return new Constant(yyp); }
 public static object State_factory(Parser yyp) { return new State(yyp); }
@@ -13025,12 +13334,14 @@ public static object GlobalVariableDeclaration_1_factory(Parser yyp) { return ne
 public static object GlobalVariableDeclaration_2_factory(Parser yyp) { return new GlobalVariableDeclaration_2(yyp); }
 public static object IncrementDecrementExpression_5_factory(Parser yyp) { return new IncrementDecrementExpression_5(yyp); }
 public static object ReturnStatement_factory(Parser yyp) { return new ReturnStatement(yyp); }
-public static object IncrementDecrementExpression_7_factory(Parser yyp) { return new IncrementDecrementExpression_7(yyp); }
+public static object StateBody_10_factory(Parser yyp) { return new StateBody_10(yyp); }
 public static object StateBody_11_factory(Parser yyp) { return new StateBody_11(yyp); }
 public static object StateBody_12_factory(Parser yyp) { return new StateBody_12(yyp); }
 public static object IntVecVecArgStateEvent_1_factory(Parser yyp) { return new IntVecVecArgStateEvent_1(yyp); }
 public static object KeyDeclaration_factory(Parser yyp) { return new KeyDeclaration(yyp); }
+public static object IntArgEvent_6_factory(Parser yyp) { return new IntArgEvent_6(yyp); }
 public static object ArgumentDeclarationList_3_factory(Parser yyp) { return new ArgumentDeclarationList_3(yyp); }
+public static object ArgumentList_2_factory(Parser yyp) { return new ArgumentList_2(yyp); }
 public static object IntArgEvent_10_factory(Parser yyp) { return new IntArgEvent_10(yyp); }
 public static object CompoundStatement_factory(Parser yyp) { return new CompoundStatement(yyp); }
 public static object TypecastExpression_3_factory(Parser yyp) { return new TypecastExpression_3(yyp); }
@@ -13059,6 +13370,7 @@ public static object IncrementDecrementExpression_2_factory(Parser yyp) { return
 public static object IntVecVecArgumentDeclarationList_1_factory(Parser yyp) { return new IntVecVecArgumentDeclarationList_1(yyp); }
 public static object IncrementDecrementExpression_4_factory(Parser yyp) { return new IncrementDecrementExpression_4(yyp); }
 public static object IncrementDecrementExpression_6_factory(Parser yyp) { return new IncrementDecrementExpression_6(yyp); }
+public static object IncrementDecrementExpression_7_factory(Parser yyp) { return new IncrementDecrementExpression_7(yyp); }
 public static object StateEvent_factory(Parser yyp) { return new StateEvent(yyp); }
 public static object IntArgEvent_3_factory(Parser yyp) { return new IntArgEvent_3(yyp); }
 public static object IntArgEvent_4_factory(Parser yyp) { return new IntArgEvent_4(yyp); }
@@ -13082,6 +13394,7 @@ public static object TypecastExpression_factory(Parser yyp) { return new Typecas
 public static object JumpStatement_1_factory(Parser yyp) { return new JumpStatement_1(yyp); }
 public static object SimpleAssignment_20_factory(Parser yyp) { return new SimpleAssignment_20(yyp); }
 public static object Statement_7_factory(Parser yyp) { return new Statement_7(yyp); }
+public static object SimpleAssignment_23_factory(Parser yyp) { return new SimpleAssignment_23(yyp); }
 public static object SimpleAssignment_24_factory(Parser yyp) { return new SimpleAssignment_24(yyp); }
 public static object SimpleAssignment_1_factory(Parser yyp) { return new SimpleAssignment_1(yyp); }
 public static object SimpleAssignment_2_factory(Parser yyp) { return new SimpleAssignment_2(yyp); }
@@ -13116,7 +13429,6 @@ public static object BinaryExpression_13_factory(Parser yyp) { return new Binary
 public static object GlobalFunctionDefinition_2_factory(Parser yyp) { return new GlobalFunctionDefinition_2(yyp); }
 public static object StateChange_2_factory(Parser yyp) { return new StateChange_2(yyp); }
 public static object VoidArgEvent_1_factory(Parser yyp) { return new VoidArgEvent_1(yyp); }
-public static object VoidArgEvent_3_factory(Parser yyp) { return new VoidArgEvent_3(yyp); }
 public static object BinaryExpression_10_factory(Parser yyp) { return new BinaryExpression_10(yyp); }
 public static object VoidArgEvent_5_factory(Parser yyp) { return new VoidArgEvent_5(yyp); }
 public static object VoidArgEvent_6_factory(Parser yyp) { return new VoidArgEvent_6(yyp); }
@@ -13141,6 +13453,7 @@ public static object EmptyStatement_1_factory(Parser yyp) { return new EmptyStat
 public static object SimpleAssignment_7_factory(Parser yyp) { return new SimpleAssignment_7(yyp); }
 public static object ForLoop_factory(Parser yyp) { return new ForLoop(yyp); }
 public static object ForLoop_2_factory(Parser yyp) { return new ForLoop_2(yyp); }
+public static object KeyIntIntArgStateEvent_1_factory(Parser yyp) { return new KeyIntIntArgStateEvent_1(yyp); }
 public static object KeyArgumentDeclarationList_1_factory(Parser yyp) { return new KeyArgumentDeclarationList_1(yyp); }
 public static object GlobalFunctionDefinition_1_factory(Parser yyp) { return new GlobalFunctionDefinition_1(yyp); }
 public static object IfStatement_factory(Parser yyp) { return new IfStatement(yyp); }
-- 
cgit v1.1


From 6869633d76b2a6664743a608e4284b8dd7df85a6 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 28 Dec 2013 06:58:15 -0800
Subject: Add serialization/deserialization of region size to RegionInfo,
 GridRegion, and RegionData. This does not modify interfaces or handling of
 variable sized regions. This only enables the loading and storing of the
 region size and the reporting of the region size in grid service responses.
 The database tables already have the code to load and store the region size.

---
 OpenSim/Framework/Constants.cs              |   6 +
 OpenSim/Framework/RegionInfo.cs             | 189 ++++++++++++++++++++++------
 OpenSim/Services/GridService/GridService.cs |  14 ++-
 OpenSim/Services/Interfaces/IGridService.cs |  25 ++++
 4 files changed, 195 insertions(+), 39 deletions(-)

diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs
index a2eb5ee..3468cea 100644
--- a/OpenSim/Framework/Constants.cs
+++ b/OpenSim/Framework/Constants.cs
@@ -30,8 +30,14 @@ namespace OpenSim.Framework
 {
     public class Constants
     {
+        // 'RegionSize' is the legacy region size.
+        // DO NOT USE THIS FOR ANY NEW CODE. Use Scene.RegionInfo.RegionSize[XYZ] as a region might not
+        //      be the legacy region size.
         public const uint RegionSize = 256;
         public const uint RegionHeight = 4096;
+        // This could be a parameters but, really, a region of greater than this is pretty unmanageable
+        public const uint MaximumRegionSize = 8192;
+
         public const byte TerrainPatchSize = 16;
         public const string DefaultTexture = "89556747-24cb-43ed-920b-47caed15465f";
 
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 24b9c89..857c151 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -99,6 +99,7 @@ namespace OpenSim.Framework
     public class RegionInfo
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly string LogHeader = "[REGION INFO]";
 
         public bool commFailTF = false;
         public ConfigurationMember configMember;
@@ -137,16 +138,20 @@ namespace OpenSim.Framework
         public bool m_allow_alternate_ports;
         protected string m_externalHostName;
         protected IPEndPoint m_internalEndPoint;
-        protected uint? m_regionLocX;
-        protected uint? m_regionLocY;
         protected uint m_remotingPort;
         public UUID RegionID = UUID.Zero;
         public string RemotingAddress;
         public UUID ScopeID = UUID.Zero;
         private UUID m_maptileStaticUUID = UUID.Zero;
 
-        private Dictionary<String, String> m_otherSettings = new Dictionary<string, string>();
+        public uint WorldLocX = 0;
+        public uint WorldLocY = 0;
+        public uint WorldLocZ = 0;
+        public uint RegionSizeX = Constants.RegionSize;
+        public uint RegionSizeY = Constants.RegionSize;
+        public uint RegionSizeZ = Constants.RegionHeight;
 
+        private Dictionary<String, String> m_otherSettings = new Dictionary<string, string>();
 
         // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
 
@@ -229,11 +234,10 @@ namespace OpenSim.Framework
             m_serverURI = string.Empty;
         }
 
-        public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
+        public RegionInfo(uint legacyRegionLocX, uint legacyRegionLocY, IPEndPoint internalEndPoint, string externalUri)
         {
-            m_regionLocX = regionLocX;
-            m_regionLocY = regionLocY;
-
+            RegionLocX = legacyRegionLocX;
+            RegionLocY = legacyRegionLocY;
             m_internalEndPoint = internalEndPoint;
             m_externalHostName = externalUri;
             m_serverURI = string.Empty;
@@ -447,25 +451,42 @@ namespace OpenSim.Framework
 
         /// <summary>
         /// The x co-ordinate of this region in map tiles (e.g. 1000).
+        /// Coordinate is scaled as world coordinates divided by the legacy region size
+        /// and is thus is the number of legacy regions.
         /// </summary>
         public uint RegionLocX
         {
-            get { return m_regionLocX.Value; }
-            set { m_regionLocX = value; }
+            get { return WorldLocX / Constants.RegionSize; }
+            set { WorldLocX = value * Constants.RegionSize; }
         }
 
         /// <summary>
         /// The y co-ordinate of this region in map tiles (e.g. 1000).
+        /// Coordinate is scaled as world coordinates divided by the legacy region size
+        /// and is thus is the number of legacy regions.
         /// </summary>
         public uint RegionLocY
         {
-            get { return m_regionLocY.Value; }
-            set { m_regionLocY = value; }
+            get { return WorldLocY / Constants.RegionSize; }
+            set { WorldLocY = value * Constants.RegionSize; }
+        }
+
+        public void SetDefaultRegionSize()
+        {
+            WorldLocX = 0;
+            WorldLocY = 0;
+            WorldLocZ = 0;
+            RegionSizeX = Constants.RegionSize;
+            RegionSizeY = Constants.RegionSize;
+            RegionSizeZ = Constants.RegionHeight;
         }
 
+        // A unique region handle is created from the region's world coordinates.
+        // This cannot be changed because some code expects to receive the region handle and then
+        //    compute the region coordinates from it.
         public ulong RegionHandle
         {
-            get { return Util.UIntsToLong((RegionLocX * (uint) Constants.RegionSize), (RegionLocY * (uint) Constants.RegionSize)); }
+            get { return Util.UIntsToLong(WorldLocX, WorldLocY); }
         }
 
         public void SetEndPoint(string ipaddr, int port)
@@ -572,8 +593,25 @@ namespace OpenSim.Framework
 
             string[] locationElements = location.Split(new char[] {','});
 
-            m_regionLocX = Convert.ToUInt32(locationElements[0]);
-            m_regionLocY = Convert.ToUInt32(locationElements[1]);
+            RegionLocX = Convert.ToUInt32(locationElements[0]);
+            RegionLocY = Convert.ToUInt32(locationElements[1]);
+
+            // Region size
+            // Default to legacy region size if not specified.
+            allKeys.Remove("SizeX");
+            string configSizeX = config.GetString("SizeX", Constants.RegionSize.ToString());
+            config.Set("SizeX", configSizeX);
+            RegionSizeX = Convert.ToUInt32(configSizeX);
+            allKeys.Remove("SizeY");
+            string configSizeY = config.GetString("SizeY", Constants.RegionSize.ToString());
+            config.Set("SizeY", configSizeX);
+            RegionSizeY = Convert.ToUInt32(configSizeY);
+            allKeys.Remove("SizeZ");
+            string configSizeZ = config.GetString("SizeZ", Constants.RegionHeight.ToString());
+            config.Set("SizeZ", configSizeX);
+            RegionSizeZ = Convert.ToUInt32(configSizeZ);
+
+            DoRegionSizeSanityChecks();
 
             // InternalAddress
             //
@@ -693,6 +731,57 @@ namespace OpenSim.Framework
             }
         }
 
+        // Make sure user specified region sizes are sane.
+        // Must be multiples of legacy region size (256).
+        private void DoRegionSizeSanityChecks()
+        {
+            if (RegionSizeX != Constants.RegionSize || RegionSizeY != Constants.RegionSize)
+            {
+                // Doing non-legacy region sizes.
+                // Enforce region size to be multiples of the legacy region size (256)
+                uint partial = RegionSizeX % Constants.RegionSize;
+                if (partial != 0)
+                {
+                    RegionSizeX -= partial;
+                    if (RegionSizeX == 0)
+                        RegionSizeX = Constants.RegionSize;
+                    m_log.ErrorFormat("{0} Region size must be multiple of {1}. Enforcing {2}.RegionSizeX={3} instead of specified {4}",
+                        LogHeader, Constants.RegionSize, m_regionName, RegionSizeX, RegionSizeX + partial);
+                }
+                partial = RegionSizeY % Constants.RegionSize;
+                if (partial != 0)
+                {
+                    RegionSizeY -= partial;
+                    if (RegionSizeY == 0)
+                        RegionSizeY = Constants.RegionSize;
+                    m_log.ErrorFormat("{0} Region size must be multiple of {1}. Enforcing {2}.RegionSizeY={3} instead of specified {4}",
+                        LogHeader, Constants.RegionSize, m_regionName, RegionSizeY, RegionSizeY + partial);
+                }
+
+                // Because of things in the viewer, regions MUST be square.
+                // Remove this check when viewers have been updated.
+                if (RegionSizeX != RegionSizeY)
+                {
+                    uint minSize = Math.Min(RegionSizeX, RegionSizeY);
+                    RegionSizeX = minSize;
+                    RegionSizeY = minSize;
+                    m_log.ErrorFormat("{0} Regions must be square until viewers are updated. Forcing region {1} size to <{2},{3}>",
+                                        LogHeader, m_regionName, RegionSizeX, RegionSizeY);
+                }
+
+                // There is a practical limit to region size.
+                if (RegionSizeX > Constants.MaximumRegionSize || RegionSizeY > Constants.MaximumRegionSize)
+                {
+                    RegionSizeX = Util.Clamp<uint>(RegionSizeX, Constants.RegionSize, Constants.MaximumRegionSize);
+                    RegionSizeY = Util.Clamp<uint>(RegionSizeY, Constants.RegionSize, Constants.MaximumRegionSize);
+                    m_log.ErrorFormat("{0} Region dimensions must be less than {1}. Clamping {2}'s size to <{3},{4}>",
+                                        LogHeader, Constants.MaximumRegionSize, m_regionName, RegionSizeX, RegionSizeY);
+                }
+
+                m_log.InfoFormat("{0} Region {1} size set to <{2},{3}>", LogHeader, m_regionName, RegionSizeX, RegionSizeY);
+            }
+        }
+
         private void WriteNiniConfig(IConfigSource source)
         {
             IConfig config = source.Configs[RegionName];
@@ -704,9 +793,16 @@ namespace OpenSim.Framework
 
             config.Set("RegionUUID", RegionID.ToString());
 
-            string location = String.Format("{0},{1}", m_regionLocX, m_regionLocY);
+            string location = String.Format("{0},{1}", RegionLocX, RegionLocY);
             config.Set("Location", location);
 
+            if (RegionSizeX != Constants.RegionSize || RegionSizeY != Constants.RegionSize)
+            {
+                config.Set("SizeX", RegionSizeX);
+                config.Set("SizeY", RegionSizeY);
+                config.Set("SizeZ", RegionSizeZ);
+            }
+
             config.Set("InternalAddress", m_internalEndPoint.Address.ToString());
             config.Set("InternalPort", m_internalEndPoint.Port);
 
@@ -789,10 +885,18 @@ namespace OpenSim.Framework
                                                 RegionID.ToString(), true);
             configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                 "Region Name", RegionName, true);
+
             configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                                                "Grid Location (X Axis)", m_regionLocX.ToString(), true);
+                                                "Grid Location (X Axis)", RegionLocX.ToString(), true);
             configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                                                "Grid Location (Y Axis)", m_regionLocY.ToString(), true);
+                                                "Grid Location (Y Axis)", RegionLocY.ToString(), true);
+            configMember.addConfigurationOption("sim_size_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+                                                "Size of region in X dimension", RegionSizeX.ToString(), true);
+            configMember.addConfigurationOption("sim_size_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+                                                "Size of region in Y dimension", RegionSizeY.ToString(), true);
+            configMember.addConfigurationOption("sim_size_z", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+                                                "Size of region in Z dimension", RegionSizeZ.ToString(), true);
+
             //m_configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false);
             configMember.addConfigurationOption("internal_ip_address",
                                                 ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS,
@@ -855,10 +959,18 @@ namespace OpenSim.Framework
                                                 UUID.Random().ToString(), true);
             configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                 "Region Name", "OpenSim Test", false);
+
             configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
                                                 "Grid Location (X Axis)", "1000", false);
             configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
                                                 "Grid Location (Y Axis)", "1000", false);
+            configMember.addConfigurationOption("sim_size_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+                                                "Size of region in X dimension", Constants.RegionSize.ToString(), false);
+            configMember.addConfigurationOption("sim_size_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+                                                "Size of region in Y dimension", Constants.RegionSize.ToString(), false);
+            configMember.addConfigurationOption("sim_size_z", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+                                                "Size of region in Z dimension", Constants.RegionHeight.ToString(), false);
+
             //m_configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false);
             configMember.addConfigurationOption("internal_ip_address",
                                                 ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS,
@@ -916,10 +1028,19 @@ namespace OpenSim.Framework
                     RegionName = (string) configuration_result;
                     break;
                 case "sim_location_x":
-                    m_regionLocX = (uint) configuration_result;
+                    RegionLocX = (uint) configuration_result;
                     break;
                 case "sim_location_y":
-                    m_regionLocY = (uint) configuration_result;
+                    RegionLocY = (uint) configuration_result;
+                    break;
+                case "sim_size_x":
+                    RegionSizeX = (uint) configuration_result;
+                    break;
+                case "sim_size_y":
+                    RegionSizeY = (uint) configuration_result;
+                    break;
+                case "sim_size_z":
+                    RegionSizeZ = (uint) configuration_result;
                     break;
                 case "internal_ip_address":
                     IPAddress address = (IPAddress) configuration_result;
@@ -1000,8 +1121,13 @@ namespace OpenSim.Framework
             args["external_host_name"] = OSD.FromString(ExternalHostName);
             args["http_port"] = OSD.FromString(HttpPort.ToString());
             args["server_uri"] = OSD.FromString(ServerURI);
+
             args["region_xloc"] = OSD.FromString(RegionLocX.ToString());
             args["region_yloc"] = OSD.FromString(RegionLocY.ToString());
+            args["region_size_x"] = OSD.FromString(RegionSizeX.ToString());
+            args["region_size_y"] = OSD.FromString(RegionSizeY.ToString());
+            args["region_size_z"] = OSD.FromString(RegionSizeZ.ToString());
+
             args["internal_ep_address"] = OSD.FromString(InternalEndPoint.Address.ToString());
             args["internal_ep_port"] = OSD.FromString(InternalEndPoint.Port.ToString());
             if ((RemotingAddress != null) && !RemotingAddress.Equals(""))
@@ -1040,6 +1166,13 @@ namespace OpenSim.Framework
                 UInt32.TryParse(args["region_yloc"].AsString(), out locy);
                 RegionLocY = locy;
             }
+            if (args.ContainsKey("region_size_x"))
+                RegionSizeX = (uint)args["region_size_x"].AsInteger();
+            if (args.ContainsKey("region_size_y"))
+                RegionSizeY = (uint)args["region_size_y"].AsInteger();
+            if (args.ContainsKey("region_size_z"))
+                RegionSizeZ = (uint)args["region_size_z"].AsInteger();
+
             IPAddress ip_addr = null;
             if (args["internal_ep_address"] != null)
             {
@@ -1076,23 +1209,5 @@ namespace OpenSim.Framework
             regionInfo.ServerURI = serverURI;
             return regionInfo;
         }
-
-        public Dictionary<string, object> ToKeyValuePairs()
-        {
-            Dictionary<string, object> kvp = new Dictionary<string, object>();
-            kvp["uuid"] = RegionID.ToString();
-            kvp["locX"] = RegionLocX.ToString();
-            kvp["locY"] = RegionLocY.ToString();
-            kvp["external_ip_address"] = ExternalEndPoint.Address.ToString();
-            kvp["external_port"] = ExternalEndPoint.Port.ToString();
-            kvp["external_host_name"] = ExternalHostName;
-            kvp["http_port"] = HttpPort.ToString();
-            kvp["internal_ip_address"] = InternalEndPoint.Address.ToString();
-            kvp["internal_port"] = InternalEndPoint.Port.ToString();
-            kvp["alternate_ports"] = m_allow_alternate_ports.ToString();
-            kvp["server_uri"] = ServerURI;
-
-            return kvp;
-        }
     }
 }
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index e72b7f9..137ce04 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -313,8 +313,9 @@ namespace OpenSim.Services.GridService
             if (region != null)
             {
                 // Not really? Maybe?
-                List<RegionData> rdatas = m_Database.Get(region.posX - (int)Constants.RegionSize - 1, region.posY - (int)Constants.RegionSize - 1, 
-                    region.posX + (int)Constants.RegionSize + 1, region.posY + (int)Constants.RegionSize + 1, scopeID);
+                List<RegionData> rdatas = m_Database.Get(
+                    region.posX - region.sizeX - 1, region.posY - region.sizeY - 1, 
+                    region.posX + region.sizeX + 1, region.posY + region.sizeY + 1, scopeID);
 
                 foreach (RegionData rdata in rdatas)
                 {
@@ -347,6 +348,11 @@ namespace OpenSim.Services.GridService
             return null;
         }
 
+        // Get a region given its base coordinates.
+        // NOTE: this is NOT 'get a region by some point in the region'. The coordinate MUST
+        //     be the base coordinate of the region.
+        // The snapping is technically unnecessary but is harmless because regions are always
+        //     multiples of the legacy region size (256).
         public GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
         {
             int snapX = (int)(x / Constants.RegionSize) * (int)Constants.RegionSize;
@@ -441,6 +447,8 @@ namespace OpenSim.Services.GridService
             RegionData rdata = new RegionData();
             rdata.posX = (int)rinfo.RegionLocX;
             rdata.posY = (int)rinfo.RegionLocY;
+            rdata.sizeX = rinfo.RegionSizeX;
+            rdata.sizeY = rinfo.RegionSizeY;
             rdata.RegionID = rinfo.RegionID;
             rdata.RegionName = rinfo.RegionName;
             rdata.Data = rinfo.ToKeyValuePairs();
@@ -454,6 +462,8 @@ namespace OpenSim.Services.GridService
             GridRegion rinfo = new GridRegion(rdata.Data);
             rinfo.RegionLocX = rdata.posX;
             rinfo.RegionLocY = rdata.posY;
+            rinfo.RegionSizeX = rdata.sizeX;
+            rinfo.RegionSizeY = rdata.sizeY;
             rinfo.RegionID = rdata.RegionID;
             rinfo.RegionName = rdata.RegionName;
             rinfo.ScopeID = rdata.ScopeID;
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 88ac5b3..651bd97 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -177,6 +177,7 @@ namespace OpenSim.Services.Interfaces
 
         /// <summary>
         /// The location of this region in meters.
+        /// DANGER DANGER! Note that this name means something different in RegionInfo.
         /// </summary>
         public int RegionLocX
         {
@@ -185,8 +186,12 @@ namespace OpenSim.Services.Interfaces
         }
         protected int m_regionLocX;
 
+        public int RegionSizeX { get; set; }
+        public int RegionSizeY { get; set; }
+
         /// <summary>
         /// The location of this region in meters.
+        /// DANGER DANGER! Note that this name means something different in RegionInfo.
         /// </summary>
         public int RegionLocY
         {
@@ -218,10 +223,13 @@ namespace OpenSim.Services.Interfaces
             m_serverURI = string.Empty;
         }
 
+        /*
         public GridRegion(int regionLocX, int regionLocY, IPEndPoint internalEndPoint, string externalUri)
         {
             m_regionLocX = regionLocX;
             m_regionLocY = regionLocY;
+            RegionSizeX = (int)Constants.RegionSize;
+            RegionSizeY = (int)Constants.RegionSize;
 
             m_internalEndPoint = internalEndPoint;
             m_externalHostName = externalUri;
@@ -231,16 +239,21 @@ namespace OpenSim.Services.Interfaces
         {
             m_regionLocX = regionLocX;
             m_regionLocY = regionLocY;
+            RegionSizeX = (int)Constants.RegionSize;
+            RegionSizeY = (int)Constants.RegionSize;
 
             m_externalHostName = externalUri;
 
             m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int)port);
         }
+         */
 
         public GridRegion(uint xcell, uint ycell)
         {
             m_regionLocX = (int)(xcell * Constants.RegionSize);
             m_regionLocY = (int)(ycell * Constants.RegionSize);
+            RegionSizeX = (int)Constants.RegionSize;
+            RegionSizeY = (int)Constants.RegionSize;
         }
 
         public GridRegion(RegionInfo ConvertFrom)
@@ -248,6 +261,8 @@ namespace OpenSim.Services.Interfaces
             m_regionName = ConvertFrom.RegionName;
             m_regionLocX = (int)(ConvertFrom.RegionLocX * Constants.RegionSize);
             m_regionLocY = (int)(ConvertFrom.RegionLocY * Constants.RegionSize);
+            RegionSizeX = (int)ConvertFrom.RegionSizeX;
+            RegionSizeY = (int)ConvertFrom.RegionSizeY;
             m_internalEndPoint = ConvertFrom.InternalEndPoint;
             m_externalHostName = ConvertFrom.ExternalHostName;
             m_httpPort = ConvertFrom.HttpPort;
@@ -266,6 +281,8 @@ namespace OpenSim.Services.Interfaces
             m_regionName = ConvertFrom.RegionName;
             m_regionLocX = ConvertFrom.RegionLocX;
             m_regionLocY = ConvertFrom.RegionLocY;
+            RegionSizeX = ConvertFrom.RegionSizeX;
+            RegionSizeY = ConvertFrom.RegionSizeY;
             m_internalEndPoint = ConvertFrom.InternalEndPoint;
             m_externalHostName = ConvertFrom.ExternalHostName;
             m_httpPort = ConvertFrom.HttpPort;
@@ -373,6 +390,8 @@ namespace OpenSim.Services.Interfaces
             kvp["uuid"] = RegionID.ToString();
             kvp["locX"] = RegionLocX.ToString();
             kvp["locY"] = RegionLocY.ToString();
+            kvp["sizeX"] = RegionSizeX.ToString();
+            kvp["sizeY"] = RegionSizeY.ToString();
             kvp["regionName"] = RegionName;
             kvp["serverIP"] = ExternalHostName; //ExternalEndPoint.Address.ToString();
             kvp["serverHttpPort"] = HttpPort.ToString();
@@ -399,6 +418,12 @@ namespace OpenSim.Services.Interfaces
             if (kvp.ContainsKey("locY"))
                 RegionLocY = Convert.ToInt32((string)kvp["locY"]);
 
+            if (kvp.ContainsKey("sizeX"))
+                RegionSizeX = Convert.ToInt32((string)kvp["sizeX"]);
+
+            if (kvp.ContainsKey("sizeY"))
+                RegionSizeY = Convert.ToInt32((string)kvp["sizeY"]);
+
             if (kvp.ContainsKey("regionName"))
                 RegionName = (string)kvp["regionName"];
 
-- 
cgit v1.1


From eab9390e05920ac848df4e4c9681858b70858b34 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 28 Dec 2013 07:20:14 -0800
Subject: Initialize default region size in GridRegion in the no parameter
 constructor as is used by the grid connector tests.

---
 OpenSim/Services/Interfaces/IGridService.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 651bd97..59d6167 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -220,6 +220,8 @@ namespace OpenSim.Services.Interfaces
 
         public GridRegion()
         {
+            RegionSizeX = (int)Constants.RegionSize;
+            RegionSizeY = (int)Constants.RegionSize;
             m_serverURI = string.Empty;
         }
 
-- 
cgit v1.1


From dd96fef9404daa2b702cc499661a350f8bba69ea Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 4 Jan 2014 21:18:37 +0000
Subject: Dynamically adjust to the number of visual params sent.

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 6cb7332..1d65136 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -3634,7 +3634,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance);
             // TODO: don't create new blocks if recycling an old packet
-            avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218];
+            avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[visualParams.Length];
             avp.ObjectData.TextureEntry = textureEntry;
 
             AvatarAppearancePacket.VisualParamBlock avblock = null;
-- 
cgit v1.1


From d9848943a96672b14fb9a6be58c4adc1e1552f3c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 4 Jan 2014 10:39:05 -0800
Subject: Add routines in Util.cs for conversion of region handles to region
 locations and for the conversion of region world location to region 'region'
 location. These routines will replace all the arithmatic scattered throughout
 OpenSimulator.

---
 OpenSim/Framework/Constants.cs |  5 ++++-
 OpenSim/Framework/Util.cs      | 43 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs
index 3468cea..3ba264c 100644
--- a/OpenSim/Framework/Constants.cs
+++ b/OpenSim/Framework/Constants.cs
@@ -38,7 +38,10 @@ namespace OpenSim.Framework
         // This could be a parameters but, really, a region of greater than this is pretty unmanageable
         public const uint MaximumRegionSize = 8192;
 
-        public const byte TerrainPatchSize = 16;
+        // Since terrain is stored in 16x16 heights, regions must be a multiple of this number and that is the minimum
+        public const int MinRegionSize = 16;
+        public const int TerrainPatchSize = 16;
+
         public const string DefaultTexture = "89556747-24cb-43ed-920b-47caed15465f";
 
         public enum EstateAccessCodex : uint
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index e8dfec1..b84673b 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -333,6 +333,49 @@ namespace OpenSim.Framework
             return Utils.UIntsToLong(X, Y);
         }
 
+        // Regions are identified with a 'handle' made up of its region coordinates packed into a ulong.
+        // Several places rely on the ability to extract a region's location from its handle.
+        // Note the location is in 'world coordinates' (see below).
+        // Region handles are based on the lowest coordinate of the region so trim the passed x,y to be the regions 0,0.
+        public static ulong RegionWorldLocToHandle(uint X, uint Y)
+        {
+            return Utils.UIntsToLong(X, Y);
+        }
+
+        public static ulong RegionLocToHandle(uint X, uint Y)
+        {
+            return Utils.UIntsToLong(Util.RegionToWorldLoc(X), Util.RegionToWorldLoc(Y));
+        }
+
+        public static void RegionHandleToWorldLoc(ulong handle, out uint X, out uint Y)
+        {
+            X = (uint)(handle >> 32);
+            Y = (uint)(handle & (ulong)uint.MaxValue);
+        }
+
+        public static void RegionHandleToRegionLoc(ulong handle, out uint X, out uint Y)
+        {
+            uint worldX, worldY;
+            RegionHandleToWorldLoc(handle, out worldX, out worldY);
+            X = WorldToRegionLoc(worldX);
+            Y = WorldToRegionLoc(worldY);
+        }
+
+        // A region location can be 'world coordinates' (meters from zero) or 'region coordinates'
+        //      (number of regions from zero). This measurement of regions relies on the legacy 256 region size.
+        // These routines exist to make what is being converted explicit so the next person knows what was meant.
+        // Convert a region's 'world coordinate' to its 'region coordinate'.
+        public static uint WorldToRegionLoc(uint worldCoord)
+        {
+            return worldCoord / Constants.RegionSize;
+        }
+
+        // Convert a region's 'region coordinate' to its 'world coordinate'.
+        public static uint RegionToWorldLoc(uint regionCoord)
+        {
+            return regionCoord * Constants.RegionSize;
+        }
+
         public static T Clamp<T>(T x, T min, T max)
             where T : IComparable<T>
         {
-- 
cgit v1.1


From 004ecee3147cde699adbedcb2fcd88caee87527a Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 2 Nov 2013 15:42:26 -0700
Subject: varregion: send region size in LLLoginResponse.

---
 OpenSim/Services/LLLoginService/LLLoginResponse.cs | 11 ++++++++++-
 OpenSim/Services/LLLoginService/LLLoginService.cs  |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 6ab5258..f96480c 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -254,11 +254,12 @@ namespace OpenSim.Services.LLLoginService
             Currency = currency;
             ClassifiedFee = classifiedFee;
 
-
             FillOutHomeData(pinfo, home);
             LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z);
 
             FillOutRegionData(destination);
+            m_log.DebugFormat("[LOGIN RESPONSE] LLLoginResponse create. sizeX={0}, sizeY={1}", RegionSizeX, RegionSizeY);
+            Util.PrintCallStack();
 
             FillOutSeedCap(aCircuit, destination, clientIP);
 
@@ -384,6 +385,8 @@ namespace OpenSim.Services.LLLoginService
             SimPort = (uint)endPoint.Port;
             RegionX = (uint)destination.RegionLocX;
             RegionY = (uint)destination.RegionLocY;
+            RegionSizeX = destination.RegionSizeX;
+            RegionSizeY = destination.RegionSizeY;
         }
 
         private void FillOutSeedCap(AgentCircuitData aCircuit, GridRegion destination, IPEndPoint ipepClient)
@@ -529,6 +532,9 @@ namespace OpenSim.Services.LLLoginService
                 responseData["message"] = welcomeMessage;
                 responseData["region_x"] = (Int32)(RegionX);
                 responseData["region_y"] = (Int32)(RegionY);
+                responseData["region_size_x"] = (Int32)RegionSizeX;
+                responseData["region_size_y"] = (Int32)RegionSizeY;
+                m_log.DebugFormat("[LOGIN RESPONSE] returning sizeX={0}, sizeY={1}", RegionSizeX, RegionSizeY);
 
                 if (searchURL != String.Empty)
                     responseData["search"] = searchURL;
@@ -918,6 +924,9 @@ namespace OpenSim.Services.LLLoginService
             set { regionY = value; }
         }
 
+        public int RegionSizeX { get; private set; }
+        public int RegionSizeY { get; private set; }
+
         public string SunTexture
         {
             get { return sunTexture; }
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index fe43582..e2f9966 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -50,6 +50,8 @@ namespace OpenSim.Services.LLLoginService
     public class LLLoginService : ILoginService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly string LogHeader = "[LLOGIN SERVICE]";
+
         private static bool Initialized = false;
 
         protected IUserAccountService m_UserAccountService;
@@ -389,6 +391,7 @@ namespace OpenSim.Services.LLLoginService
                 if (guinfo == null)
                 {
                     // something went wrong, make something up, so that we don't have to test this anywhere else
+                    m_log.DebugFormat("{0} Failed to fetch GridUserInfo. Creating empty GridUserInfo as home", LogHeader);
                     guinfo = new GridUserInfo();
                     guinfo.LastPosition = guinfo.HomePosition = new Vector3(128, 128, 30);
                 }
-- 
cgit v1.1


From 7e32313a491defe8f5fb62ce0036c1692d4b4af9 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 3 Jan 2014 07:41:06 -0800
Subject: varregion: Add region size to teleport event messages
 (EnableSimulator, CorssRegion, TeleportFinishEvent). Have Simian grid service
 return the region size. Many teleport related debug log messages. Can be
 removed when teleport works (like that's ever going to happen).

Conflicts:

	OpenSim/Framework/RegionInfo.cs
---
 OpenSim/Framework/RegionInfo.cs                    |  2 ++
 .../Linden/Caps/EventQueue/EventQueueGetModule.cs  | 28 ++++++++++++-----
 .../Linden/Caps/EventQueue/EventQueueHelper.cs     | 36 +++++++++++++++-------
 .../EntityTransfer/EntityTransferModule.cs         | 32 ++++++++++++-------
 OpenSim/Region/Framework/Interfaces/IEventQueue.cs |  9 +++---
 OpenSim/Region/Framework/Scenes/Scene.cs           |  5 +++
 .../SimianGrid/SimianGridServiceConnector.cs       |  6 +++-
 OpenSim/Services/Interfaces/IGridService.cs        | 14 +++++++++
 .../Tests/Common/Mock/TestEventQueueGetModule.cs   | 11 ++++---
 9 files changed, 104 insertions(+), 39 deletions(-)

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 857c151..1de30af 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -238,6 +238,8 @@ namespace OpenSim.Framework
         {
             RegionLocX = legacyRegionLocX;
             RegionLocY = legacyRegionLocY;
+            RegionSizeX = Constants.RegionSize;
+            RegionSizeY = Constants.RegionSize;
             m_internalEndPoint = internalEndPoint;
             m_externalHostName = externalUri;
             m_serverURI = string.Empty;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 0dbdbaf..a05e88c 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -711,34 +711,46 @@ namespace OpenSim.Region.ClientStack.Linden
             Enqueue(item, avatarID);
         }
 
-        public virtual void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID)
+        public virtual void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY)
         {
-            OSD item = EventQueueHelper.EnableSimulator(handle, endPoint);
+            m_log.DebugFormat("{0} EnableSimulator. handle={1}, avatarID={2}, regionSize={3},{4}>",
+                "[EVENT QUEUE GET MODULE]", handle, avatarID, regionSizeX, regionSizeY);
+
+            OSD item = EventQueueHelper.EnableSimulator(handle, endPoint, regionSizeX, regionSizeY);
             Enqueue(item, avatarID);
         }
 
-        public virtual void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath) 
+        public virtual void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath,
+                                ulong regionHandle, int regionSizeX, int regionSizeY) 
         {
-            OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath);
+            m_log.DebugFormat("{0} EstablishAgentCommunication. handle={1}, avatarID={2}, regionSize={3},{4}>",
+                "[EVENT QUEUE GET MODULE]", regionHandle, avatarID, regionSizeX, regionSizeY);
+            OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath, regionHandle, regionSizeX, regionSizeY);
             Enqueue(item, avatarID);
         }
 
         public virtual void TeleportFinishEvent(ulong regionHandle, byte simAccess, 
                                         IPEndPoint regionExternalEndPoint,
                                         uint locationID, uint flags, string capsURL, 
-                                        UUID avatarID)
+                                        UUID avatarID, int regionSizeX, int regionSizeY)
         {
+            m_log.DebugFormat("{0} TeleportFinishEvent. handle={1}, avatarID={2}, regionSize={3},{4}>",
+                "[EVENT QUEUE GET MODULE]", regionHandle, avatarID, regionSizeX, regionSizeY);
+
             OSD item = EventQueueHelper.TeleportFinishEvent(regionHandle, simAccess, regionExternalEndPoint,
-                                                            locationID, flags, capsURL, avatarID);
+                                                            locationID, flags, capsURL, avatarID, regionSizeX, regionSizeY);
             Enqueue(item, avatarID);
         }
 
         public virtual void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt,
                                 IPEndPoint newRegionExternalEndPoint,
-                                string capsURL, UUID avatarID, UUID sessionID)
+                                string capsURL, UUID avatarID, UUID sessionID, int regionSizeX, int regionSizeY)
         {
+            m_log.DebugFormat("{0} CrossRegion. handle={1}, avatarID={2}, regionSize={3},{4}>",
+                "[EVENT QUEUE GET MODULE]", handle, avatarID, regionSizeX, regionSizeY);
+
             OSD item = EventQueueHelper.CrossRegion(handle, pos, lookAt, newRegionExternalEndPoint,
-                                                    capsURL, avatarID, sessionID);
+                                                    capsURL, avatarID, sessionID, regionSizeX, regionSizeY);
             Enqueue(item, avatarID);
         }
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
index dab727f..ded228d 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
@@ -70,13 +70,15 @@ namespace OpenSim.Region.ClientStack.Linden
             return llsdEvent;
         }
 
-        public static OSD EnableSimulator(ulong handle, IPEndPoint endPoint)
+        public static OSD EnableSimulator(ulong handle, IPEndPoint endPoint, int regionSizeX, int regionSizeY)
         {
-            OSDMap llsdSimInfo = new OSDMap(3);
+            OSDMap llsdSimInfo = new OSDMap(5);
 
             llsdSimInfo.Add("Handle", new OSDBinary(ulongToByteArray(handle)));
             llsdSimInfo.Add("IP", new OSDBinary(endPoint.Address.GetAddressBytes()));
             llsdSimInfo.Add("Port", new OSDInteger(endPoint.Port));
+            llsdSimInfo.Add("RegionSizeX", new OSDInteger(regionSizeX));
+            llsdSimInfo.Add("RegionSizeY", new OSDInteger(regionSizeY));
 
             OSDArray arr = new OSDArray(1);
             arr.Add(llsdSimInfo);
@@ -104,7 +106,8 @@ namespace OpenSim.Region.ClientStack.Linden
         
         public static OSD CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt,
                                       IPEndPoint newRegionExternalEndPoint,
-                                      string capsURL, UUID agentID, UUID sessionID)
+                                      string capsURL, UUID agentID, UUID sessionID,
+                                      int regionSizeX, int regionSizeY)
         {
             OSDArray lookAtArr = new OSDArray(3);
             lookAtArr.Add(OSD.FromReal(lookAt.X));
@@ -130,11 +133,13 @@ namespace OpenSim.Region.ClientStack.Linden
             OSDArray agentDataArr = new OSDArray(1);
             agentDataArr.Add(agentDataMap);
 
-            OSDMap regionDataMap = new OSDMap(4);
+            OSDMap regionDataMap = new OSDMap(6);
             regionDataMap.Add("RegionHandle", OSD.FromBinary(ulongToByteArray(handle)));
             regionDataMap.Add("SeedCapability", OSD.FromString(capsURL));
             regionDataMap.Add("SimIP", OSD.FromBinary(newRegionExternalEndPoint.Address.GetAddressBytes()));
             regionDataMap.Add("SimPort", OSD.FromInteger(newRegionExternalEndPoint.Port));
+            regionDataMap.Add("RegionSizeX", new OSDInteger(regionSizeX));
+            regionDataMap.Add("RegionSizeY", new OSDInteger(regionSizeY));
 
             OSDArray regionDataArr = new OSDArray(1);
             regionDataArr.Add(regionDataMap);
@@ -148,8 +153,9 @@ namespace OpenSim.Region.ClientStack.Linden
         }
 
         public static OSD TeleportFinishEvent(
-            ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint,
-            uint locationID, uint flags, string capsURL, UUID agentID)
+                        ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint,
+                        uint locationID, uint flags, string capsURL, UUID agentID,
+                        int regionSizeX, int regionSizeY)
         {
             OSDMap info = new OSDMap();
             info.Add("AgentID", OSD.FromUUID(agentID));
@@ -160,6 +166,8 @@ namespace OpenSim.Region.ClientStack.Linden
             info.Add("SimIP", OSD.FromBinary(regionExternalEndPoint.Address.GetAddressBytes()));
             info.Add("SimPort", OSD.FromInteger(regionExternalEndPoint.Port));
             info.Add("TeleportFlags", OSD.FromULong(1L << 4)); // AgentManager.TeleportFlags.ViaLocation
+            info.Add("RegionSizeX", new OSDInteger(regionSizeX));
+            info.Add("RegionSizeY", new OSDInteger(regionSizeY));
 
             OSDArray infoArr = new OSDArray();
             infoArr.Add(info);
@@ -187,12 +195,18 @@ namespace OpenSim.Region.ClientStack.Linden
             return BuildEvent("ScriptRunningReply", body);
         }
 
-        public static OSD EstablishAgentCommunication(UUID agentID, string simIpAndPort, string seedcap)
+        public static OSD EstablishAgentCommunication(UUID agentID, string simIpAndPort, string seedcap,
+                                    ulong regionHandle, int regionSizeX, int regionSizeY)
         {
-            OSDMap body = new OSDMap(3);
-            body.Add("agent-id", new OSDUUID(agentID));
-            body.Add("sim-ip-and-port", new OSDString(simIpAndPort));
-            body.Add("seed-capability", new OSDString(seedcap));
+            OSDMap body = new OSDMap(6)
+                              {
+                                  {"agent-id", new OSDUUID(agentID)},
+                                  {"sim-ip-and-port", new OSDString(simIpAndPort)},
+                                  {"seed-capability", new OSDString(seedcap)},
+                                  {"region-handle", OSD.FromULong(regionHandle)},
+                                  {"region-size-x", OSD.FromInteger(regionSizeX)},
+                                  {"region-size-y", OSD.FromInteger(regionSizeY)}
+                              };
 
             return BuildEvent("EstablishAgentCommunication", body);
         }
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index ef5239a..717c802 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -825,7 +825,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     // The EnableSimulator message makes the client establish a connection with the destination
                     // simulator by sending the initial UseCircuitCode UDP packet to the destination containing the
                     // correct circuit code.
-                    m_eqModule.EnableSimulator(destinationHandle, endPoint, sp.UUID);
+                    m_eqModule.EnableSimulator(destinationHandle, endPoint, sp.UUID,
+                                        finalDestination.RegionSizeX, finalDestination.RegionSizeY);
+                    m_log.DebugFormat("{0} Sent EnableSimulator. regName={1}, size=<{2},{3}>", LogHeader,
+                        finalDestination.RegionName, finalDestination.RegionSizeX, finalDestination.RegionSizeY);
 
                     // XXX: Is this wait necessary?  We will always end up waiting on UpdateAgent for the destination
                     // simulator to confirm that it has established communication with the viewer.
@@ -835,7 +838,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     // unnecessary - teleport will succeed and SEED caps will be requested without it (though possibly
                     // only on TeleportFinish).  This is untested for region teleport between different simulators
                     // though this probably also works.
-                    m_eqModule.EstablishAgentCommunication(sp.UUID, endPoint, capsPath);
+                    m_eqModule.EstablishAgentCommunication(sp.UUID, endPoint, capsPath, finalDestination.RegionHandle,
+                                        finalDestination.RegionSizeX, finalDestination.RegionSizeY);
                 }
                 else
                 {
@@ -921,7 +925,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // 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);
+                m_eqModule.TeleportFinishEvent(destinationHandle, 13, endPoint, 0, teleportFlags, capsPath, sp.UUID,
+                            finalDestination.RegionSizeX, finalDestination.RegionSizeY);
             }
             else
             {
@@ -1074,7 +1079,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             // 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);
+                m_eqModule.TeleportFinishEvent(destinationHandle, 13, endPoint, 0, teleportFlags, capsPath, sp.UUID,
+                                    finalDestination.RegionSizeX, finalDestination.RegionSizeY);
             else
                 sp.ControllingClient.SendRegionTeleport(destinationHandle, 13, endPoint, 4,
                                                             teleportFlags, capsPath);
@@ -1717,11 +1723,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (m_eqModule != null)
             {
                 m_eqModule.CrossRegion(
-                    neighbourRegion.RegionHandle, pos + agent.Velocity, vel2 /* agent.Velocity */, neighbourRegion.ExternalEndPoint,
-                    capsPath, agent.UUID, agent.ControllingClient.SessionId);
+                    neighbourRegion.RegionHandle, pos + agent.Velocity, vel2 /* agent.Velocity */,
+                    neighbourRegion.ExternalEndPoint,
+                    capsPath, agent.UUID, agent.ControllingClient.SessionId,
+                    neighbourRegion.RegionSizeX, neighbourRegion.RegionSizeY);
             }
             else
             {
+                m_log.ErrorFormat("{0} Using old CrossRegion packet. Varregion will not work!!", LogHeader);
                 agent.ControllingClient.CrossRegion(neighbourRegion.RegionHandle, pos + agent.Velocity, agent.Velocity, neighbourRegion.ExternalEndPoint,
                                             capsPath);
             }
@@ -2087,12 +2096,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     }
                     #endregion
 
-                    m_log.DebugFormat("[ENTITY TRANSFER MODULE]: {0} is sending {1} EnableSimulator for neighbour region {2} @ {3} " +
-                        "and EstablishAgentCommunication with seed cap {4}",
-                        scene.RegionInfo.RegionName, sp.Name, reg.RegionName, reg.RegionHandle, capsPath);
+                    m_log.DebugFormat("{0} {1} is sending {2} EnableSimulator for neighbour region {3}(loc=<{4},{5}>,siz=<{6},{7}>) " +
+                        "and EstablishAgentCommunication with seed cap {8}", LogHeader,
+                        scene.RegionInfo.RegionName, sp.Name,
+                        reg.RegionName, reg.RegionLocX, reg.RegionLocY, reg.RegionSizeX, reg.RegionSizeY , capsPath);
 
-                    m_eqModule.EnableSimulator(reg.RegionHandle, endPoint, sp.UUID);
-                    m_eqModule.EstablishAgentCommunication(sp.UUID, endPoint, capsPath);
+                    m_eqModule.EnableSimulator(reg.RegionHandle, endPoint, sp.UUID, reg.RegionSizeX, reg.RegionSizeY);
+                    m_eqModule.EstablishAgentCommunication(sp.UUID, endPoint, capsPath, reg.RegionHandle, reg.RegionSizeX, reg.RegionSizeY);
                 }
                 else
                 {
diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
index 3780ece..dfc269e 100644
--- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
@@ -39,16 +39,17 @@ namespace OpenSim.Region.Framework.Interfaces
 
         // These are required to decouple Scenes from EventQueueHelper
         void DisableSimulator(ulong handle, UUID avatarID);
-        void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID);
+        void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY);
         void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, 
-                                         string capsPath);
+                                         string capsPath, ulong regionHandle, int regionSizeX, int regionSizeY);
         void TeleportFinishEvent(ulong regionHandle, byte simAccess, 
                                  IPEndPoint regionExternalEndPoint,
                                  uint locationID, uint flags, string capsURL, 
-                                 UUID agentID);
+                                 UUID agentID, int regionSizeX, int regionSizeY);
         void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt,
                          IPEndPoint newRegionExternalEndPoint,
-                         string capsURL, UUID avatarID, UUID sessionID);
+                         string capsURL, UUID avatarID, UUID sessionID,
+                            int regionSizeX, int regionSizeY);
         void ChatterboxInvitation(UUID sessionID, string sessionName,
                                   UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog,
                                   uint timeStamp, bool offline, int parentEstateID, Vector3 position,
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 7772f94..610bcd6 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1953,6 +1953,11 @@ namespace OpenSim.Region.Framework.Scenes
 
             GridRegion region = new GridRegion(RegionInfo);
             string error = GridService.RegisterRegion(RegionInfo.ScopeID, region);
+            m_log.DebugFormat("{0} RegisterRegionWithGrid. name={1},id={2},loc=<{3},{4}>,size=<{5},{6}>",
+                                LogHeader, m_regionName, 
+                                RegionInfo.RegionID,
+                                RegionInfo.RegionLocX, RegionInfo.RegionLocY,
+                                RegionInfo.RegionSizeX, RegionInfo.RegionSizeY);
             if (error != String.Empty)
                 throw new Exception(error);
         }
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index 816591b..c928f16 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -443,9 +443,13 @@ namespace OpenSim.Services.Connectors.SimianGrid
             region.RegionName = response["Name"].AsString();
 
             Vector3d minPosition = response["MinPosition"].AsVector3d();
+            Vector3d maxPosition = response["MaxPosition"].AsVector3d();
             region.RegionLocX = (int)minPosition.X;
             region.RegionLocY = (int)minPosition.Y;
-            
+
+            region.RegionSizeX = (int)maxPosition.X - (int)minPosition.X;
+            region.RegionSizeY = (int)maxPosition.Y - (int)minPosition.Y;
+
             if ( ! extraData["HyperGrid"] ) {
                 Uri httpAddress = response["Address"].AsUri();
                 region.ExternalHostName = httpAddress.Host;
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 59d6167..9459ecd 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -29,9 +29,13 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
+using System.Reflection;
+
 using OpenSim.Framework;
 using OpenMetaverse;
 
+using log4net;
+
 namespace OpenSim.Services.Interfaces
 {
     public interface IGridService
@@ -119,6 +123,9 @@ namespace OpenSim.Services.Interfaces
 
     public class GridRegion
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly string LogHeader = "[GRID REGION]";
+
         /// <summary>
         /// The port by which http communication occurs with the region 
         /// </summary>
@@ -422,9 +429,13 @@ namespace OpenSim.Services.Interfaces
 
             if (kvp.ContainsKey("sizeX"))
                 RegionSizeX = Convert.ToInt32((string)kvp["sizeX"]);
+            else
+                RegionSizeX = (int)Constants.RegionSize;
 
             if (kvp.ContainsKey("sizeY"))
                 RegionSizeY = Convert.ToInt32((string)kvp["sizeY"]);
+            else
+                RegionSizeX = (int)Constants.RegionSize;
 
             if (kvp.ContainsKey("regionName"))
                 RegionName = (string)kvp["regionName"];
@@ -473,6 +484,9 @@ namespace OpenSim.Services.Interfaces
 
             if (kvp.ContainsKey("Token"))
                 Token = kvp["Token"].ToString();
+
+            m_log.DebugFormat("{0} New GridRegion. id={1}, loc=<{2},{3}>, size=<{4},{5}>",
+                                    LogHeader, RegionID, RegionLocX, RegionLocY, RegionSizeX, RegionSizeY);
         }
     }
 }
diff --git a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
index e666433..f2bae58 100644
--- a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
+++ b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
@@ -114,22 +114,25 @@ namespace OpenSim.Tests.Common
             AddEvent(avatarID, "DisableSimulator", handle);
         }
 
-        public void EnableSimulator (ulong handle, IPEndPoint endPoint, UUID avatarID)
+        public void EnableSimulator (ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY)
         {
             AddEvent(avatarID, "EnableSimulator", handle);
         }
 
-        public void EstablishAgentCommunication (UUID avatarID, IPEndPoint endPoint, string capsPath)
+        public void EstablishAgentCommunication (UUID avatarID, IPEndPoint endPoint, string capsPath,
+                                ulong regionHandle, int regionSizeX, int regionSizeY)
         {
             AddEvent(avatarID, "EstablishAgentCommunication", endPoint, capsPath);
         }
 
-        public void TeleportFinishEvent (ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL, UUID agentID)
+        public void TeleportFinishEvent (ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint,
+                    uint locationID, uint flags, string capsURL, UUID agentID, int regionSizeX, int regionSizeY)
         {
             AddEvent(agentID, "TeleportFinishEvent", regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL);
         }
 
-        public void CrossRegion (ulong handle, Vector3 pos, Vector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL, UUID avatarID, UUID sessionID)
+        public void CrossRegion (ulong handle, Vector3 pos, Vector3 lookAt, IPEndPoint newRegionExternalEndPoint,
+                                    string capsURL, UUID avatarID, UUID sessionID, int regionSizeX, int regionSizeY)
         {
             AddEvent(avatarID, "CrossRegion", handle, pos, lookAt, newRegionExternalEndPoint, capsURL, sessionID);
         }
-- 
cgit v1.1


From 8ff2ff1a3667a679c4e8e8502a80e03e7e2ca69d Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 4 Jan 2014 15:10:35 -0800
Subject: Remove some chatty DebugFormat statements. No functional changes.

---
 OpenSim/Services/Interfaces/IGridService.cs        | 4 ++--
 OpenSim/Services/LLLoginService/LLLoginResponse.cs | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 9459ecd..739e279 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -485,8 +485,8 @@ namespace OpenSim.Services.Interfaces
             if (kvp.ContainsKey("Token"))
                 Token = kvp["Token"].ToString();
 
-            m_log.DebugFormat("{0} New GridRegion. id={1}, loc=<{2},{3}>, size=<{4},{5}>",
-                                    LogHeader, RegionID, RegionLocX, RegionLocY, RegionSizeX, RegionSizeY);
+            // m_log.DebugFormat("{0} New GridRegion. id={1}, loc=<{2},{3}>, size=<{4},{5}>",
+            //                         LogHeader, RegionID, RegionLocX, RegionLocY, RegionSizeX, RegionSizeY);
         }
     }
 }
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index f96480c..5256b74 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -258,8 +258,7 @@ namespace OpenSim.Services.LLLoginService
             LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z);
 
             FillOutRegionData(destination);
-            m_log.DebugFormat("[LOGIN RESPONSE] LLLoginResponse create. sizeX={0}, sizeY={1}", RegionSizeX, RegionSizeY);
-            Util.PrintCallStack();
+            // m_log.DebugFormat("[LOGIN RESPONSE] LLLoginResponse create. sizeX=<{0},{1}>", RegionSizeX, RegionSizeY);
 
             FillOutSeedCap(aCircuit, destination, clientIP);
 
@@ -534,7 +533,7 @@ namespace OpenSim.Services.LLLoginService
                 responseData["region_y"] = (Int32)(RegionY);
                 responseData["region_size_x"] = (Int32)RegionSizeX;
                 responseData["region_size_y"] = (Int32)RegionSizeY;
-                m_log.DebugFormat("[LOGIN RESPONSE] returning sizeX={0}, sizeY={1}", RegionSizeX, RegionSizeY);
+                // m_log.DebugFormat("[LOGIN RESPONSE] returning sizeX=<{0},{1}>", RegionSizeX, RegionSizeY);
 
                 if (searchURL != String.Empty)
                     responseData["search"] = searchURL;
-- 
cgit v1.1


From 38148bd4b68ad718bf6274342ac8382a611e2010 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 4 Jan 2014 17:52:38 -0800
Subject: Some missing definitions needed for successful compilation.

---
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs       | 3 ++-
 OpenSim/Region/Framework/Scenes/SceneBase.cs                           | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 717c802..246b253 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -51,7 +51,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "EntityTransferModule")]
     public class EntityTransferModule : INonSharedRegionModule, IEntityTransferModule
     {
-        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 string LogHeader = "[ENTITY TRANSFER MODULE]";
 
         public const int DefaultMaxTransferDistance = 4095;
         public const bool WaitForAgentArrivedAtDestinationDefault = true;
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 4f04706..c86f412 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -42,7 +42,8 @@ namespace OpenSim.Region.Framework.Scenes
 {
     public abstract class SceneBase : IScene
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        protected static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        protected static readonly string LogHeader = "[SCENE]";
 
         #region Events
 
-- 
cgit v1.1


From 1eecb34e62987f43181bea912464b76eb4c6aa45 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 5 Jan 2014 21:16:30 +0000
Subject: Remove the core module extra profile settings support carried in with
 the latest patches. We don't need it.

---
 OpenSim/Data/MySQL/MySQLUserProfilesData.cs                 | 4 ++--
 OpenSim/Data/SQLite/SQLiteUserProfilesData.cs               | 2 ++
 OpenSim/Services/UserProfilesService/UserProfilesService.cs | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index 8e9f77d..8b50c54 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -941,8 +941,8 @@ namespace OpenSim.Data.MySQL
                                 using (MySqlCommand put = new MySqlCommand(query, dbcon))
                                 {
                                     
-                                    put.Parameters.AddWithValue("?Email", pref.EMail);
-                                    put.Parameters.AddWithValue("?uuid", pref.UserId.ToString());
+//                                    put.Parameters.AddWithValue("?Email", pref.EMail);
+//                                    put.Parameters.AddWithValue("?uuid", pref.UserId.ToString());
 
                                     put.ExecuteNonQuery();
                                 }
diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
index 90d45e9..84e56b1 100644
--- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
@@ -748,6 +748,7 @@ namespace OpenSim.Data.SQLite
             return true;
         }
 
+        /*
         public bool UpdateUserPreferences(ref UserPreferences pref, ref string result)
         {           
             string query = string.Empty;
@@ -830,6 +831,7 @@ namespace OpenSim.Data.SQLite
             }
             return true;
         }
+        */
 
         public bool GetUserAppData(ref UserAppData props, ref string result)
         {
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
index dd26cdc..038e993 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
@@ -164,6 +164,7 @@ namespace OpenSim.Services.ProfilesService
         }
         #endregion Interests
 
+        /*
         #region User Preferences
         public bool UserPreferencesUpdate(ref UserPreferences pref, ref string result)
         {
@@ -235,6 +236,7 @@ namespace OpenSim.Services.ProfilesService
             return ProfilesData.GetUserPreferences(ref pref, ref result);
         }
         #endregion User Preferences
+        */
 
         #region Utility
         public OSD AvatarImageAssetsRequest(UUID avatarId)
-- 
cgit v1.1


From 0155d42b80ee7b35d0a882052d8cf4976e7d15de Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 8 Jan 2014 00:54:39 +0000
Subject: If an agent is sitting, then do send the rotation in the agent update
 instead of zeroing it to resolve mouselook camera problems

Addresses http://opensimulator.org/mantis/view.php?id=6892
Thanks to tglion for this spot.
This resolves a recent regression from 17b32b764acd815400d9eb903aaec6dcebd60ac7
---
 .../Region/ClientStack/Linden/UDP/LLClientView.cs  | 25 +++++++++++++++-------
 OpenSim/Region/Framework/Scenes/ScenePresence.cs   |  2 ++
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index a04ded5..c38c829 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5098,11 +5098,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // excessive up and down movements of the camera when looking up and down.
                 // See http://opensimulator.org/mantis/view.php?id=3274
                 // This does not affect head movement, since this is controlled entirely by camera movement rather than
-                // body rotation.  It does not affect sitting avatar since it's the sitting part rotation that takes
-                // effect, not the avatar rotation.
+                // body rotation.  We still need to transmit X and Y for sitting avatars but mouselook does not change
+                // the rotation in this case.
                 rotation = presence.Rotation;
-                rotation.X = 0;
-                rotation.Y = 0;
+
+                if (!presence.IsSatOnObject)
+                {
+                    rotation.X = 0;
+                    rotation.Y = 0;
+                }
 
                 if (sendTexture)
                     textureEntry = presence.Appearance.Texture.GetBytes();
@@ -5225,11 +5229,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // excessive up and down movements of the camera when looking up and down.
             // See http://opensimulator.org/mantis/view.php?id=3274
             // This does not affect head movement, since this is controlled entirely by camera movement rather than
-            // body rotation.  It does not affect sitting avatar since it's the sitting part rotation that takes
-            // effect, not the avatar rotation.
+            // body rotation.  We still need to transmit X and Y for sitting avatars but mouselook does not change
+            // the rotation in this case.
             Quaternion rot = data.Rotation;
-            rot.X = 0;
-            rot.Y = 0;
+
+            if (!data.IsSatOnObject)
+            {
+                rot.X = 0;
+                rot.Y = 0;
+            }
+
             rot.ToBytes(objectData, 52);
             //data.AngularVelocity.ToBytes(objectData, 64);
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 7ed3a4b..49f70c4 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1640,6 +1640,8 @@ namespace OpenSim.Region.Framework.Scenes
                 ControllingClient.SendAgentTerseUpdate(this);
 
             PhysicsActor actor = PhysicsActor;
+
+            // This will be the case if the agent is sitting on the groudn or on an object.
             if (actor == null)
             {
                 SendControlsToScripts(flagsForScripts);
-- 
cgit v1.1


From 13f31fdf85c404896c166932730b7b8bc5416626 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Mon, 4 Nov 2013 19:28:24 +0200
Subject: Refactored setting permissions when rezzing items: use the same
 function when rezzing from user inventory and prim inventory.

Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.)
---
 OpenSim/Framework/PermissionsUtil.cs               | 68 ++++++++++++++++++++
 .../InventoryAccess/InventoryAccessModule.cs       | 51 ++++-----------
 .../Region/Framework/Scenes/SceneObjectGroup.cs    |  3 +
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 58 +++++++++++++++++
 .../Framework/Scenes/SceneObjectPartInventory.cs   | 74 +++++-----------------
 5 files changed, 160 insertions(+), 94 deletions(-)
 create mode 100644 OpenSim/Framework/PermissionsUtil.cs

diff --git a/OpenSim/Framework/PermissionsUtil.cs b/OpenSim/Framework/PermissionsUtil.cs
new file mode 100644
index 0000000..3dce04d
--- /dev/null
+++ b/OpenSim/Framework/PermissionsUtil.cs
@@ -0,0 +1,68 @@
+/*
+ * 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 log4net;
+
+namespace OpenSim.Framework
+{
+    public static class PermissionsUtil
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        /// <summary>
+        /// Logs permissions flags. Useful when debugging permission problems.
+        /// </summary>
+        /// <param name="message"></param>
+        public static void LogPermissions(String name, String message, uint basePerm, uint curPerm, uint nextPerm)
+        {
+            m_log.DebugFormat("Permissions of \"{0}\" at \"{1}\": Base {2} ({3:X4}), Current {4} ({5:X4}), NextOwner {6} ({7:X4})",
+                name, message,
+                PermissionsToString(basePerm), basePerm, PermissionsToString(curPerm), curPerm, PermissionsToString(nextPerm), nextPerm);
+        }
+
+        /// <summary>
+        /// Converts a permissions bit-mask to a string (e.g., "MCT").
+        /// </summary>
+        private static string PermissionsToString(uint perms)
+        {
+            string str = "";
+            if ((perms & (int)PermissionMask.Modify) != 0)
+                str += "M";
+            if ((perms & (int)PermissionMask.Copy) != 0)
+                str += "C";
+            if ((perms & (int)PermissionMask.Transfer) != 0)
+                str += "T";
+            if (str == "")
+                str = ".";
+            return str;
+        }
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 831922e..da36ed0 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -512,10 +512,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 item.EveryOnePermissions = so.RootPart.EveryoneMask & so.RootPart.NextOwnerMask;
                 item.GroupPermissions = so.RootPart.GroupMask & so.RootPart.NextOwnerMask;
                 
-                // Magic number badness. Maybe this deserves an enum.
-                // bit 4 (16) is the "Slam" bit, it means treat as passed
-                // and apply next owner perms on rez
-                item.CurrentPermissions |= 16; // Slam!
+                // apply next owner perms on rez
+                item.CurrentPermissions |= SceneObjectGroup.SLAM;
             }
             else
             {
@@ -809,11 +807,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     group.RootPart.Shape.LastAttachPoint = (byte)group.AttachmentPoint;
                 }
 
-                foreach (SceneObjectPart part in group.Parts)
+                if (item == null)
                 {
-                    // Make the rezzer the owner, as this is not necessarily set correctly in the serialized asset.
-                    part.LastOwnerID = part.OwnerID;
-                    part.OwnerID = remoteClient.AgentId;
+                    // Change ownership. Normally this is done in DoPreRezWhenFromItem(), but in this case we must do it here.
+                    foreach (SceneObjectPart part in group.Parts)
+                    {
+                        // Make the rezzer the owner, as this is not necessarily set correctly in the serialized asset.
+                        part.LastOwnerID = part.OwnerID;
+                        part.OwnerID = remoteClient.AgentId;
+                    }
                 }
 
                 if (!attachment)
@@ -969,44 +971,19 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 //                    "[INVENTORY ACCESS MODULE]: rootPart.OwnedID {0}, item.Owner {1}, item.CurrentPermissions {2:X}",
 //                    rootPart.OwnerID, item.Owner, item.CurrentPermissions);
 
-                if ((rootPart.OwnerID != item.Owner) ||
-                    (item.CurrentPermissions & 16) != 0)
+                if ((rootPart.OwnerID != item.Owner) || (item.CurrentPermissions & SceneObjectGroup.SLAM) != 0)
                 {
                     //Need to kill the for sale here
                     rootPart.ObjectSaleType = 0;
                     rootPart.SalePrice = 10;
-    
-                    if (m_Scene.Permissions.PropagatePermissions())
-                    {
-                        foreach (SceneObjectPart part in so.Parts)
-                        {
-                            if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
-                            {
-                                part.EveryoneMask = item.EveryOnePermissions;
-                                part.NextOwnerMask = item.NextPermissions;
-                            }
-                            part.GroupMask = 0; // DO NOT propagate here
-                        }
-    
-                        so.ApplyNextOwnerPermissions();
-                    }
                 }
-    
+
                 foreach (SceneObjectPart part in so.Parts)
                 {
                     part.FromUserInventoryItemID = fromUserInventoryItemId;
-
-                    if ((part.OwnerID != item.Owner) ||
-                        (item.CurrentPermissions & 16) != 0)
-                    {
-                        part.Inventory.ChangeInventoryOwner(item.Owner);
-                        part.GroupMask = 0; // DO NOT propagate here
-                    }
-
-                    part.EveryoneMask = item.EveryOnePermissions;
-                    part.NextOwnerMask = item.NextPermissions;
+                    part.ApplyPermissionsOnRez(item, true, m_Scene);
                 }
-    
+
                 rootPart.TrimPermissions();
 
                 if (isAttachment)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 4b4e4ba..23507f4 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -109,6 +109,9 @@ namespace OpenSim.Region.Framework.Scenes
             STATUS_ROTATE_Z = 0x008,
         }
 
+        // This flag has the same purpose as InventoryItemFlags.ObjectSlamPerm
+        public static readonly uint SLAM = 16;
+
         // private PrimCountTaintedDelegate handlerPrimCountTainted = null;
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ea9d0d8..1cf7726 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4800,6 +4800,64 @@ namespace OpenSim.Region.Framework.Scenes
         {
             ParentGroup.AddScriptLPS(count);
         }
+
+        /// <summary>
+        /// Sets a prim's owner and permissions when it's rezzed.
+        /// </summary>
+        /// <param name="item">The inventory item from which the item was rezzed</param>
+        /// <param name="userInventory">True: the item is being rezzed from the user's inventory. False: from a prim's inventory.</param>
+        /// <param name="scene">The scene the prim is being rezzed into</param>
+        public void ApplyPermissionsOnRez(InventoryItemBase item, bool userInventory, Scene scene)
+        {
+            if ((OwnerID != item.Owner) || ((item.CurrentPermissions & SceneObjectGroup.SLAM) != 0) || ((item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0))
+            {
+                if (scene.Permissions.PropagatePermissions())
+                {
+                    if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
+                    {
+                        // Apply the item's permissions to the object
+                        //LogPermissions("Before applying item permissions");
+                        if (userInventory)
+                        {
+                            EveryoneMask = item.EveryOnePermissions;
+                            NextOwnerMask = item.NextPermissions;
+                        }
+                        else
+                        {
+                            if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
+                                EveryoneMask = item.EveryOnePermissions;
+                            if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
+                                NextOwnerMask = item.NextPermissions;
+                            if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteGroup) != 0)
+                                GroupMask = item.GroupPermissions;
+                        }
+                        //LogPermissions("After applying item permissions");
+                    }
+                }
+
+                GroupMask = 0; // DO NOT propagate here
+            }
+
+            if (OwnerID != item.Owner)
+            {
+                //LogPermissions("Before ApplyNextOwnerPermissions");
+                ApplyNextOwnerPermissions();
+                //LogPermissions("After ApplyNextOwnerPermissions");
+
+                LastOwnerID = OwnerID;
+                OwnerID = item.Owner;
+                Inventory.ChangeInventoryOwner(item.Owner);
+            }
+        }
+
+        /// <summary>
+        /// Logs the prim's permissions. Useful when debugging permission problems.
+        /// </summary>
+        /// <param name="message"></param>
+        private void LogPermissions(String message)
+        {
+            PermissionsUtil.LogPermissions(Name, message, BaseMask, OwnerMask, NextOwnerMask);
+        }
         
         public void ApplyNextOwnerPermissions()
         {
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 380e402..5fa01e3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -764,48 +764,27 @@ namespace OpenSim.Region.Framework.Scenes
                 // Since renaming the item in the inventory does not affect the name stored
                 // in the serialization, transfer the correct name from the inventory to the
                 // object itself before we rez.
-                rootPart.Name = item.Name;
-                rootPart.Description = item.Description;
-
-                SceneObjectPart[] partList = group.Parts;
-
-                group.SetGroup(m_part.GroupID, null);
-
-                // TODO: Remove magic number badness
-                if ((rootPart.OwnerID != item.OwnerID) || (item.CurrentPermissions & 16) != 0 || (item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0) // Magic number
+                // Only do these for the first object if we are rezzing a coalescence.
+                if (i == 0)
                 {
-                    if (m_part.ParentGroup.Scene.Permissions.PropagatePermissions())
-                    {
-                        foreach (SceneObjectPart part in partList)
-                        {
-                            if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
-                                part.EveryoneMask = item.EveryonePermissions;
-                            if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
-                                part.NextOwnerMask = item.NextPermissions;
-                            if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteGroup) != 0)
-                                part.GroupMask = item.GroupPermissions;
-                        }
-
-                        group.ApplyNextOwnerPermissions();
-                    }
+                    rootPart.Name = item.Name;
+                    rootPart.Description = item.Description;
                 }
 
-                foreach (SceneObjectPart part in partList)
-                {
-                    // TODO: Remove magic number badness
-                    if ((part.OwnerID != item.OwnerID) || (item.CurrentPermissions & 16) != 0 || (item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0) // Magic number
-                    {
-                        part.LastOwnerID = part.OwnerID;
-                        part.OwnerID = item.OwnerID;
-                        part.Inventory.ChangeInventoryOwner(item.OwnerID);
-                    }
+                group.SetGroup(m_part.GroupID, null);
 
-                    if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
-                        part.EveryoneMask = item.EveryonePermissions;
-                    if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
-                        part.NextOwnerMask = item.NextPermissions;
-                    if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteGroup) != 0)
-                        part.GroupMask = item.GroupPermissions;
+                foreach (SceneObjectPart part in group.Parts)
+                {
+                    // Convert between InventoryItem classes. You can never have too many similar but slightly different classes :)
+                    InventoryItemBase dest = new InventoryItemBase(item.ItemID, item.OwnerID);
+                    dest.BasePermissions = item.BasePermissions;
+                    dest.CurrentPermissions = item.CurrentPermissions;
+                    dest.EveryOnePermissions = item.EveryonePermissions;
+                    dest.GroupPermissions = item.GroupPermissions;
+                    dest.NextPermissions = item.NextPermissions;
+                    dest.Flags = item.Flags;
+
+                    part.ApplyPermissionsOnRez(dest, false, m_part.ParentGroup.Scene);
                 }
 
                 rootPart.TrimPermissions();
@@ -1130,25 +1109,6 @@ namespace OpenSim.Region.Framework.Scenes
                         mask &= ~((uint)PermissionMask.Transfer >> 13);
                     if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0)
                         mask &= ~((uint)PermissionMask.Modify >> 13);
-
-                    if (item.InvType != (int)InventoryType.Object)
-                    {
-                        if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0)
-                            mask &= ~((uint)PermissionMask.Copy >> 13);
-                        if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0)
-                            mask &= ~((uint)PermissionMask.Transfer >> 13);
-                        if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0)
-                            mask &= ~((uint)PermissionMask.Modify >> 13);
-                    }
-                    else
-                    {
-                        if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
-                            mask &= ~((uint)PermissionMask.Copy >> 13);
-                        if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
-                            mask &= ~((uint)PermissionMask.Transfer >> 13);
-                        if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
-                            mask &= ~((uint)PermissionMask.Modify >> 13);
-                    }
     
                     if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
                         mask &= ~(uint)PermissionMask.Copy;
-- 
cgit v1.1


From 91fd9c467083a57e2898594ce3ae764aa0525bb5 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Tue, 5 Nov 2013 15:42:23 +0200
Subject: Refactored: use a single function to apply an object's folded
 permissions to its main permissions

---
 .../RemoteController/RemoteAdminPlugin.cs            | 12 +++++-------
 OpenSim/Framework/PermissionsUtil.cs                 | 19 +++++++++++++++++++
 .../InventoryAccess/InventoryAccessModule.cs         | 20 +++++++++-----------
 .../World/Objects/BuySell/BuySellModule.cs           |  8 +-------
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs   | 17 ++++++++++-------
 .../Framework/Scenes/SceneObjectPartInventory.cs     | 11 ++++-------
 6 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 354f587..811781c 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -2763,15 +2763,13 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         /// </summary>
         private void ApplyNextOwnerPermissions(InventoryItemBase item)
         {
-            if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0)
+            if (item.InvType == (int)InventoryType.Object)
             {
-                if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
-                    item.CurrentPermissions &= ~(uint)PermissionMask.Copy;
-                if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
-                    item.CurrentPermissions &= ~(uint)PermissionMask.Transfer;
-                if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
-                    item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
+                uint perms = item.CurrentPermissions;
+                PermissionsUtil.ApplyFoldedPermissions(item.CurrentPermissions, ref perms);
+                item.CurrentPermissions = perms;
             }
+
             item.CurrentPermissions &= item.NextPermissions;
             item.BasePermissions &= item.NextPermissions;
             item.EveryOnePermissions &= item.NextPermissions;
diff --git a/OpenSim/Framework/PermissionsUtil.cs b/OpenSim/Framework/PermissionsUtil.cs
index 3dce04d..d785a78 100644
--- a/OpenSim/Framework/PermissionsUtil.cs
+++ b/OpenSim/Framework/PermissionsUtil.cs
@@ -64,5 +64,24 @@ namespace OpenSim.Framework
                 str = ".";
             return str;
         }
+
+        /// <summary>
+        /// Applies an object's folded permissions to its regular permissions.
+        /// </summary>
+        /// <param name="foldedPerms">The folded permissions. Only the lowest 7 bits are examined.</param>
+        /// <param name="mainPerms">The permissions variable to modify.</param>
+        public static void ApplyFoldedPermissions(uint foldedPerms, ref uint mainPerms)
+        {
+            if ((foldedPerms & 7) == 0)
+                return; // assume that if the folded permissions are 0 then this means that they weren't actually recorded
+
+            if ((foldedPerms & ((uint)PermissionMask.Copy >> 13)) == 0)
+                mainPerms &= ~(uint)PermissionMask.Copy;
+            if ((foldedPerms & ((uint)PermissionMask.Transfer >> 13)) == 0)
+                mainPerms &= ~(uint)PermissionMask.Transfer;
+            if ((foldedPerms & ((uint)PermissionMask.Modify >> 13)) == 0)
+                mainPerms &= ~(uint)PermissionMask.Modify;
+        }
+
     }
 }
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index da36ed0..a7e6fdd 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -443,13 +443,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             }
             else
             {
-                AddPermissions(item, objlist[0], objlist, remoteClient);
-
                 item.CreationDate = Util.UnixTimeSinceEpoch();
                 item.Description = asset.Description;
                 item.Name = asset.Name;
                 item.AssetType = asset.Type;
 
+                AddPermissions(item, objlist[0], objlist, remoteClient);
+
                 m_Scene.AddInventoryItem(item);
 
                 if (remoteClient != null && item.Owner == remoteClient.AgentId)
@@ -495,16 +495,12 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 effectivePerms &= grp.GetEffectivePermissions();
             effectivePerms |= (uint)PermissionMask.Move;
 
+            //PermissionsUtil.LogPermissions(item.Name, "Before AddPermissions", item.BasePermissions, item.CurrentPermissions, item.NextPermissions);
+
             if (remoteClient != null && (remoteClient.AgentId != so.RootPart.OwnerID) && m_Scene.Permissions.PropagatePermissions())
             {
                 uint perms = effectivePerms;
-                uint nextPerms = (perms & 7) << 13;
-                if ((nextPerms & (uint)PermissionMask.Copy) == 0)
-                    perms &= ~(uint)PermissionMask.Copy;
-                if ((nextPerms & (uint)PermissionMask.Transfer) == 0)
-                    perms &= ~(uint)PermissionMask.Transfer;
-                if ((nextPerms & (uint)PermissionMask.Modify) == 0)
-                    perms &= ~(uint)PermissionMask.Modify;
+                PermissionsUtil.ApplyFoldedPermissions(effectivePerms, ref perms);
 
                 item.BasePermissions = perms & so.RootPart.NextOwnerMask;
                 item.CurrentPermissions = item.BasePermissions;
@@ -530,8 +526,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                          (uint)PermissionMask.Move |
                          (uint)PermissionMask.Export |
                          7); // Preserve folded permissions
-            }    
-            
+            }
+
+            //PermissionsUtil.LogPermissions(item.Name, "After AddPermissions", item.BasePermissions, item.CurrentPermissions, item.NextPermissions);            
+
             return item;
         }
         
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
index 22a53a8..0cb574a 100644
--- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
@@ -198,13 +198,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
                 item.InvType = (int)InventoryType.Object;
                 item.Folder = categoryID;
 
-                uint nextPerms=(perms & 7) << 13;
-                if ((nextPerms & (uint)PermissionMask.Copy) == 0)
-                    perms &= ~(uint)PermissionMask.Copy;
-                if ((nextPerms & (uint)PermissionMask.Transfer) == 0)
-                    perms &= ~(uint)PermissionMask.Transfer;
-                if ((nextPerms & (uint)PermissionMask.Modify) == 0)
-                    perms &= ~(uint)PermissionMask.Modify;
+                PermissionsUtil.ApplyFoldedPermissions(perms, ref perms);
 
                 item.BasePermissions = perms & part.NextOwnerMask;
                 item.CurrentPermissions = perms & part.NextOwnerMask;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 65536db..9cc5cde 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -669,17 +669,13 @@ namespace OpenSim.Region.Framework.Scenes
                 // a mask
                 if (item.InvType == (int)InventoryType.Object)
                 {
-                    // Create a safe mask for the current perms
-                    uint foldedPerms = (item.CurrentPermissions & 7) << 13;
-                    foldedPerms |= permsMask;
-
                     bool isRootMod = (item.CurrentPermissions &
                                       (uint)PermissionMask.Modify) != 0 ?
                                       true : false;
 
                     // Mask the owner perms to the folded perms
-                    ownerPerms &= foldedPerms;
-                    basePerms &= foldedPerms;
+                    PermissionsUtil.ApplyFoldedPermissions(item.CurrentPermissions, ref ownerPerms);
+                    PermissionsUtil.ApplyFoldedPermissions(item.CurrentPermissions, ref basePerms);
 
                     // If the root was mod, let the mask reflect that
                     // We also need to adjust the base here, because
@@ -1209,9 +1205,16 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 agentItem.BasePermissions = taskItem.BasePermissions & (taskItem.NextPermissions | (uint)PermissionMask.Move);
                 if (taskItem.InvType == (int)InventoryType.Object)
-                    agentItem.CurrentPermissions = agentItem.BasePermissions & (((taskItem.CurrentPermissions & 7) << 13) | (taskItem.CurrentPermissions & (uint)PermissionMask.Move));
+                {
+                    uint perms = taskItem.CurrentPermissions;
+                    PermissionsUtil.ApplyFoldedPermissions(taskItem.CurrentPermissions, ref perms);
+                    agentItem.BasePermissions = perms | (uint)PermissionMask.Move;
+                    agentItem.CurrentPermissions = agentItem.BasePermissions;
+                }
                 else
+                {
                     agentItem.CurrentPermissions = agentItem.BasePermissions & taskItem.CurrentPermissions;
+                }
 
                 agentItem.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm;
                 agentItem.NextPermissions = taskItem.NextPermissions;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 5fa01e3..fb8ecd5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -1132,14 +1132,11 @@ namespace OpenSim.Region.Framework.Scenes
 //                        "[SCENE OBJECT PART INVENTORY]: Applying next permissions {0} to {1} in {2} with current {3}, base {4}, everyone {5}",
 //                        item.NextPermissions, item.Name, m_part.Name, item.CurrentPermissions, item.BasePermissions, item.EveryonePermissions);
 
-                    if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0)
+                    if (item.InvType == (int)InventoryType.Object)
                     {
-                        if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
-                            item.CurrentPermissions &= ~(uint)PermissionMask.Copy;
-                        if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
-                            item.CurrentPermissions &= ~(uint)PermissionMask.Transfer;
-                        if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
-                            item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
+                        uint perms = item.CurrentPermissions;
+                        PermissionsUtil.ApplyFoldedPermissions(perms, ref perms);
+                        item.CurrentPermissions = perms;
                     }
 
                     item.CurrentPermissions &= item.NextPermissions;
-- 
cgit v1.1


From a94e1e0e085a3c70e35e2c9cf0583d193c6ed32f Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Wed, 6 Nov 2013 12:57:44 +0200
Subject: When creating a coalesced object, set its Creator ID if all the
 objects have the same creator

---
 .../InventoryAccess/InventoryAccessModule.cs          | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index a7e6fdd..af95577 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -412,17 +412,28 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
             if (item == null)
                 return null;
+
+            item.CreatorId = objlist[0].RootPart.CreatorID.ToString();
+            item.CreatorData = objlist[0].RootPart.CreatorData;
                             
-            // Can't know creator is the same, so null it in inventory
             if (objlist.Count > 1)
             {
-                item.CreatorId = UUID.Zero.ToString();
                 item.Flags = (uint)InventoryItemFlags.ObjectHasMultipleItems;
+                
+                // If the objects have different creators then don't specify a creator at all
+                foreach (SceneObjectGroup objectGroup in objlist)
+                {
+                    if ((objectGroup.RootPart.CreatorID.ToString() != item.CreatorId)
+                        || (objectGroup.RootPart.CreatorData.ToString() != item.CreatorData))
+                    {
+                        item.CreatorId = UUID.Zero.ToString();
+                        item.CreatorData = string.Empty;
+                        break;
+                    }
+                }
             }
             else
             {
-                item.CreatorId = objlist[0].RootPart.CreatorID.ToString();
-                item.CreatorData = objlist[0].RootPart.CreatorData;
                 item.SaleType = objlist[0].RootPart.ObjectSaleType;
                 item.SalePrice = objlist[0].RootPart.SalePrice;                    
             }              
-- 
cgit v1.1


From 88f01a41305364e0d505964c6743d95d1564530b Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Thu, 7 Nov 2013 17:25:39 +0200
Subject: When creating a coalesced object, set its permissions to the
 lowest-common-denominator of all the sub-objects

---
 .../InventoryAccess/InventoryAccessModule.cs       | 23 +++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index af95577..781cc69 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -502,8 +502,17 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             IClientAPI remoteClient)
         {
             uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move | PermissionMask.Export) | 7;
+            uint allObjectsNextOwnerPerms = 0x7fffffff;
+            uint allObjectsEveryOnePerms = 0x7fffffff;
+            uint allObjectsGroupPerms = 0x7fffffff;
+
             foreach (SceneObjectGroup grp in objsForEffectivePermissions)
+            {
                 effectivePerms &= grp.GetEffectivePermissions();
+                allObjectsNextOwnerPerms &= grp.RootPart.NextOwnerMask;
+                allObjectsEveryOnePerms &= grp.RootPart.EveryoneMask;
+                allObjectsGroupPerms &= grp.RootPart.GroupMask;
+            }
             effectivePerms |= (uint)PermissionMask.Move;
 
             //PermissionsUtil.LogPermissions(item.Name, "Before AddPermissions", item.BasePermissions, item.CurrentPermissions, item.NextPermissions);
@@ -513,11 +522,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 uint perms = effectivePerms;
                 PermissionsUtil.ApplyFoldedPermissions(effectivePerms, ref perms);
 
-                item.BasePermissions = perms & so.RootPart.NextOwnerMask;
+                item.BasePermissions = perms & allObjectsNextOwnerPerms;
                 item.CurrentPermissions = item.BasePermissions;
-                item.NextPermissions = perms & so.RootPart.NextOwnerMask;
-                item.EveryOnePermissions = so.RootPart.EveryoneMask & so.RootPart.NextOwnerMask;
-                item.GroupPermissions = so.RootPart.GroupMask & so.RootPart.NextOwnerMask;
+                item.NextPermissions = perms & allObjectsNextOwnerPerms;
+                item.EveryOnePermissions = allObjectsEveryOnePerms & allObjectsNextOwnerPerms;
+                item.GroupPermissions = allObjectsGroupPerms & allObjectsNextOwnerPerms;
                 
                 // apply next owner perms on rez
                 item.CurrentPermissions |= SceneObjectGroup.SLAM;
@@ -526,9 +535,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             {
                 item.BasePermissions = effectivePerms;
                 item.CurrentPermissions = effectivePerms;
-                item.NextPermissions = so.RootPart.NextOwnerMask & effectivePerms;
-                item.EveryOnePermissions = so.RootPart.EveryoneMask & effectivePerms;
-                item.GroupPermissions = so.RootPart.GroupMask & effectivePerms;
+                item.NextPermissions = allObjectsNextOwnerPerms & effectivePerms;
+                item.EveryOnePermissions = allObjectsEveryOnePerms & effectivePerms;
+                item.GroupPermissions = allObjectsGroupPerms & effectivePerms;
 
                 item.CurrentPermissions &=
                         ((uint)PermissionMask.Copy |
-- 
cgit v1.1


From da47bcae3ec625e7cb8dc1947d1aa39ba7b8ac0f Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Mon, 16 Sep 2013 09:42:14 +0300
Subject: When moving the root prim of an attachment: a) Change the attach
 position; b) Move the other prims in the reverse direction to compensate

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 23507f4..e31270c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3043,13 +3043,10 @@ namespace OpenSim.Region.Framework.Scenes
 
             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;
+                oldPos = m_rootPart.AttachedPos + m_rootPart.OffsetPosition;  // OffsetPosition should always be 0 in an attachments's root prim
             else
-                oldPos = AbsolutePosition + RootPart.OffsetPosition;
+                oldPos = AbsolutePosition + m_rootPart.OffsetPosition;
 
             Vector3 diff = oldPos - newPos;
             Quaternion partRotation = m_rootPart.RotationOffset;
@@ -3064,6 +3061,9 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             AbsolutePosition = newPos;
+            
+            if (IsAttachment)
+                m_rootPart.AttachedPos = newPos;
 
             HasGroupChanged = true;
             ScheduleGroupForTerseUpdate();
-- 
cgit v1.1


From 9050c152b402d0c629b7050033c4d9361fda637b Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 4 Jan 2014 21:18:37 +0000
Subject: Dynamically adjust to the number of visual params sent.

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index c38c829..0ebccbe 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -3634,7 +3634,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance);
             // TODO: don't create new blocks if recycling an old packet
-            avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218];
+            avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[visualParams.Length];
             avp.ObjectData.TextureEntry = textureEntry;
 
             AvatarAppearancePacket.VisualParamBlock avblock = null;
-- 
cgit v1.1


From 08f2fc63cd2891bbc445371584b5b8da5822a25f Mon Sep 17 00:00:00 2001
From: David Rowe
Date: Thu, 9 Jan 2014 15:35:12 -0800
Subject: Fixed llTextBox error message text

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 5663048..e54b697 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4397,7 +4397,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID av = new UUID();
             if (!UUID.TryParse(agent,out av))
             {
-                LSLError("First parameter to llDialog needs to be a key");
+                LSLError("First parameter to llTextBox needs to be a key");
                 return;
             }
 
-- 
cgit v1.1


From 8c6b9ef86574e9a3f95774715ef63417a2981c18 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 10 Jan 2014 20:45:05 +0000
Subject: minor: Add ctrlaltdavid to contributors list

---
 CONTRIBUTORS.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index ef84315..ee3d7c7 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -75,6 +75,7 @@ what it is today.
 * Chris Yeoh (IBM)
 * controlbreak
 * coyled
+* ctrlaltdavid
 * Daedius
 * daTwitch 
 * devalnor-#708
-- 
cgit v1.1


From 70dd4cf1525deeaf2c71cb184a6f35dcc63b01df Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 10 Jan 2014 20:51:28 +0000
Subject: In library inventory, correct asset id for llSay example script

From http://opensimulator.org/mantis/view.php?id=6917
Thanks to FreakyTech for this spot.
---
 bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml       | 6 +++---
 bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml b/bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml
index c76cb78..eae9642 100644
--- a/bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml
+++ b/bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml
@@ -89,9 +89,9 @@
     <Key Name="assetType" Value="10" />
     <Key Name="fileName" Value="llResetLandBanList.lsl" />
   </Section>
-  <Section Name="llResetLandPassList">
+  <Section Name="llSay">
     <Key Name="assetID" Value="366ac8e9-b391-11dc-8314-0800200c9a66" />
-    <Key Name="name" Value="llResetLandPassList" />
+    <Key Name="name" Value="llSay" />
     <Key Name="assetType" Value="10" />
     <Key Name="fileName" Value="llSay.lsl" />
   </Section>
@@ -240,4 +240,4 @@
     <Key Name="fileName" Value="KanEd-Test16.lsl" />
   </Section>
 
-</Nini>
\ No newline at end of file
+</Nini>
diff --git a/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml b/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml
index df9d867..6e51d0b 100644
--- a/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml
+++ b/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml
@@ -195,7 +195,7 @@
 <!-- S == <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba018"/> -->
   <Section Name="llSay">
     <Key Name="inventoryID" Value="3af51d20-b38f-11dc-8314-0800200c9a66" />
-    <Key Name="assetID" Value="3af51d21-b38f-11dc-8314-0800200c9a66" />
+    <Key Name="assetID" Value="366ac8e9-b391-11dc-8314-0800200c9a66" />
     <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba018"/>
     <Key Name="description" Value="llS" />
     <Key Name="name" Value="llSay" />
-- 
cgit v1.1


From bc0ff5e7d43b873f8895f782c73170a84b5c35d6 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Thu, 2 May 2013 15:23:37 +0300
Subject: Allow Boolean nodes in XML to be specified as "0/1". AuroraSim does
 that.

---
 OpenSim/Framework/Util.cs                                          | 4 +++-
 OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index e8dfec1..52635b2 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -2029,8 +2029,10 @@ namespace OpenSim.Framework
         #region Xml Serialization Utilities
         public static bool ReadBoolean(XmlTextReader reader)
         {
+            // AuroraSim uses "int" for some fields that are boolean in OpenSim, e.g. "PassCollisions". Don't fail because of this.
             reader.ReadStartElement();
-            bool result = Boolean.Parse(reader.ReadContentAsString().ToLower());
+            string val = reader.ReadContentAsString().ToLower();
+            bool result = val.Equals("true") || val.Equals("1");
             reader.ReadEndElement();
 
             return result;
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index d8a3184..2511c08 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -557,7 +557,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             }
             catch
             {
-                m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0} for GetServerURLs", m_ServerURL);
+                m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0} for GetServerURLs for user {1}", m_ServerURL, userID);
 //                reason = "Exception: " + e.Message;
                 return serverURLs;
             }
-- 
cgit v1.1


From 239b85d7cee3d8e0ae7349cbe62582d46940c732 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 10 Jan 2014 22:52:31 -0800
Subject: Fix crash in BulletSim which sometimes happens making a linkset
 physical (like sitting on and activating a vehicle) and crossing borders.
 This keeps better bookkeeping on compound shapes so BulletSim can identify
 them when being freed.

---
 OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 39 +++++++++++++++++++-----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 006a9c1..fbe320b 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -71,7 +71,7 @@ public abstract class BSShape
         lastReferenced = DateTime.Now;
     }
 
-    // Called when this shape is being used again.
+    // Called when this shape is done being used.
     protected virtual void DecrementReference()
     {
         referenceCount--;
@@ -866,6 +866,8 @@ public class BSShapeHull : BSShape
 public class BSShapeCompound : BSShape
 {
     private static string LogHeader = "[BULLETSIM SHAPE COMPOUND]";
+    public static Dictionary<string, BSShapeCompound> CompoundShapes = new Dictionary<string, BSShapeCompound>();
+
     public BSShapeCompound(BulletShape pShape) : base(pShape)
     {
     }
@@ -873,7 +875,9 @@ public class BSShapeCompound : BSShape
     {
         // 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));
+        BSShapeCompound ret = new BSShapeCompound(CreatePhysicalCompoundShape(physicsScene));
+        CompoundShapes.Add(ret.AddrString, ret);
+        return ret;
     }
     public override BSShape GetReference(BSScene physicsScene, BSPhysObject prim)
     {
@@ -911,10 +915,21 @@ public class BSShapeCompound : BSShape
                     BulletShape childShape = physicsScene.PE.RemoveChildShapeFromCompoundShapeIndex(physShapeInfo, ii);
                     DereferenceAnonCollisionShape(physicsScene, childShape);
                 }
+
+                lock (CompoundShapes)
+                    CompoundShapes.Remove(physShapeInfo.AddrString);
                 physicsScene.PE.DeleteCollisionShape(physicsScene.World, physShapeInfo);
             }
         }
     }
+    public static bool TryGetCompoundByPtr(BulletShape pShape, out BSShapeCompound outCompound)
+    {
+        lock (CompoundShapes)
+        {
+            string addr = pShape.AddrString;
+            return CompoundShapes.TryGetValue(addr, out outCompound);
+        }
+    }
     private static BulletShape CreatePhysicalCompoundShape(BSScene physicsScene)
     {
         BulletShape cShape = physicsScene.PE.CreateCompoundShape(physicsScene.World, false);
@@ -926,10 +941,13 @@ public class BSShapeCompound : BSShape
     private void DereferenceAnonCollisionShape(BSScene physicsScene, BulletShape pShape)
     {
         // TODO: figure a better way to go through all the shape types and find a possible instance.
+        physicsScene.DetailLog("{0},BSShapeCompound.DereferenceAnonCollisionShape,shape={1}",
+                                            BSScene.DetailLogZero, pShape);
         BSShapeMesh meshDesc;
         if (BSShapeMesh.TryGetMeshByPtr(pShape, out meshDesc))
         {
             meshDesc.Dereference(physicsScene);
+            // physicsScene.DetailLog("{0},BSShapeCompound.DereferenceAnonCollisionShape,foundMesh,shape={1}", BSScene.DetailLogZero, pShape);
         }
         else
         {
@@ -937,13 +955,15 @@ public class BSShapeCompound : BSShape
             if (BSShapeHull.TryGetHullByPtr(pShape, out hullDesc))
             {
                 hullDesc.Dereference(physicsScene);
+                // physicsScene.DetailLog("{0},BSShapeCompound.DereferenceAnonCollisionShape,foundHull,shape={1}", BSScene.DetailLogZero, pShape);
             }
             else
             {
                 BSShapeConvexHull chullDesc;
-                if (BSShapeConvexHull.TryGetHullByPtr(pShape, out chullDesc))
+                if (BSShapeConvexHull.TryGetConvexHullByPtr(pShape, out chullDesc))
                 {
                     chullDesc.Dereference(physicsScene);
+                    // physicsScene.DetailLog("{0},BSShapeCompound.DereferenceAnonCollisionShape,foundConvexHull,shape={1}", BSScene.DetailLogZero, pShape);
                 }
                 else
                 {
@@ -951,20 +971,23 @@ public class BSShapeCompound : BSShape
                     if (BSShapeGImpact.TryGetGImpactByPtr(pShape, out gImpactDesc))
                     {
                         gImpactDesc.Dereference(physicsScene);
+                        // physicsScene.DetailLog("{0},BSShapeCompound.DereferenceAnonCollisionShape,foundgImpact,shape={1}", BSScene.DetailLogZero, pShape);
                     }
                     else
                     {
                         // Didn't find it in the lists of specific types. It could be compound.
-                        if (physicsScene.PE.IsCompound(pShape))
+                        BSShapeCompound compoundDesc;
+                        if (BSShapeCompound.TryGetCompoundByPtr(pShape, out compoundDesc))
                         {
-                            BSShapeCompound recursiveCompound = new BSShapeCompound(pShape);
-                            recursiveCompound.Dereference(physicsScene);
+                            compoundDesc.Dereference(physicsScene);
+                            // physicsScene.DetailLog("{0},BSShapeCompound.DereferenceAnonCollisionShape,recursiveCompoundShape,shape={1}", BSScene.DetailLogZero, pShape);
                         }
                         else
                         {
                             // If none of the above, maybe it is a simple native shape.
                             if (physicsScene.PE.IsNativeShape(pShape))
                             {
+                                // physicsScene.DetailLog("{0},BSShapeCompound.DereferenceAnonCollisionShape,assumingNative,shape={1}", BSScene.DetailLogZero, pShape);
                                 BSShapeNative nativeShape = new BSShapeNative(pShape);
                                 nativeShape.Dereference(physicsScene);
                             }
@@ -1021,6 +1044,8 @@ public class BSShapeConvexHull : BSShape
                     convexShape = physicsScene.PE.BuildConvexHullShapeFromMesh(physicsScene.World, baseMesh.physShapeInfo);
                     convexShape.shapeKey = newMeshKey;
                     ConvexHulls.Add(convexShape.shapeKey, retConvexHull);
+                    physicsScene.DetailLog("{0},BSShapeConvexHull.GetReference,addingNewlyCreatedShape,shape={1}",
+                                        BSScene.DetailLogZero, convexShape);
                 }
 
                 // Done with the base mesh
@@ -1049,7 +1074,7 @@ public class BSShapeConvexHull : BSShape
         }
     }
     // Loop through all the known hulls and return the description based on the physical address.
-    public static bool TryGetHullByPtr(BulletShape pShape, out BSShapeConvexHull outHull)
+    public static bool TryGetConvexHullByPtr(BulletShape pShape, out BSShapeConvexHull outHull)
     {
         bool ret = false;
         BSShapeConvexHull foundDesc = null;
-- 
cgit v1.1


From 797684115c1170c0b02566716863f0d8590b3e2c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 14 Jan 2014 01:16:04 +0000
Subject: minor: Add David Rowe to ctrlaltdavid handle by request

---
 CONTRIBUTORS.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index ee3d7c7..9114fc5 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -75,7 +75,7 @@ what it is today.
 * Chris Yeoh (IBM)
 * controlbreak
 * coyled
-* ctrlaltdavid
+* ctrlaltdavid (David Rowe)
 * Daedius
 * daTwitch 
 * devalnor-#708
-- 
cgit v1.1


From e99a7d879ecf59737e9916a9eb229698ef866627 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 16 Jan 2014 00:05:04 +0000
Subject: Remove old IInterRegionComms and references.  This hasn't been used
 since 2009 and was superseded by ISimulationService

---
 .../Simulation/LocalSimulationConnector.cs         |   4 +-
 .../Simulation/RemoteSimulationConnector.cs        |   4 +-
 .../Framework/Interfaces/IInterregionComms.cs      | 111 ---------------------
 OpenSim/Region/Framework/Scenes/Scene.cs           |  12 ---
 4 files changed, 4 insertions(+), 127 deletions(-)
 delete mode 100644 OpenSim/Region/Framework/Interfaces/IInterregionComms.cs

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 678f3dc..4dcb99f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -174,7 +174,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 
         #endregion
 
-        #region ISimulation
+        #region ISimulationService
 
         public IScene GetScene(UUID regionId)
         {
@@ -353,7 +353,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return false;
         }
 
-        #endregion /* IInterregionComms */
+        #endregion
 
         #region Misc
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index f45f560..cc01430 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 
         #endregion
 
-        #region IInterregionComms
+        #region ISimulationService
 
         public IScene GetScene(UUID regionId)
         {
@@ -279,6 +279,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return false;
         }
 
-        #endregion /* IInterregionComms */
+        #endregion
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
deleted file mode 100644
index 2d6287f..0000000
--- a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
+++ /dev/null
@@ -1,111 +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 OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Region.Framework.Interfaces
-{
-    public delegate bool ChildAgentUpdateReceived(AgentData data);
-
-    public interface IInterregionCommsOut
-    {
-        #region Agents
-
-        bool SendCreateChildAgent(ulong regionHandle, AgentCircuitData aCircuit, uint teleportFlags, out string reason);
-
-        /// <summary>
-        /// Full child agent update.
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <param name="data"></param>
-        /// <returns></returns>
-        bool SendChildAgentUpdate(ulong regionHandle, AgentData data);
-
-        /// <summary>
-        /// Short child agent update, mostly for position.
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <param name="data"></param>
-        /// <returns></returns>
-        bool SendChildAgentUpdate(ulong regionHandle, AgentPosition data);
-
-        bool SendRetrieveRootAgent(ulong regionHandle, UUID id, out IAgentData agent);
-
-        /// <summary>
-        /// Message from receiving region to departing region, telling it got contacted by the client.
-        /// When sent over REST, it invokes the opaque uri.
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <param name="id"></param>
-        /// <param name="uri"></param>
-        /// <returns></returns>
-        bool SendReleaseAgent(ulong regionHandle, UUID id, string uri);
-
-        /// <summary>
-        /// Close agent.
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        bool SendCloseAgent(ulong regionHandle, UUID id);
-
-        #endregion Agents
-
-        #region Objects
-
-        /// <summary>
-        /// Create an object in the destination region. This message is used primarily for prim crossing.
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <param name="sog"></param>
-        /// <param name="isLocalCall"></param>
-        /// <returns></returns>
-        bool SendCreateObject(ulong regionHandle, SceneObjectGroup sog, bool isLocalCall);
-
-        /// <summary>
-        /// Create an object from the user's inventory in the destination region. 
-        /// This message is used primarily by clients.
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <param name="userID"></param>
-        /// <param name="itemID"></param>
-        /// <returns></returns>
-        bool SendCreateObject(ulong regionHandle, UUID userID, UUID itemID);
-
-        #endregion Objects
-
-    }
-
-    // This may not be needed, but having it here for now.
-    public interface IInterregionCommsIn
-    {
-        event ChildAgentUpdateReceived OnChildAgentUpdate;
-    }
-
-}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 7772f94..567ce2a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4405,18 +4405,6 @@ namespace OpenSim.Region.Framework.Scenes
             return sp;
         }
 
-        public virtual bool IncomingRetrieveRootAgent(UUID id, out IAgentData agent)
-        {
-            agent = null;
-            ScenePresence sp = GetScenePresence(id);
-            if ((sp != null) && (!sp.IsChildAgent))
-            {
-                sp.IsChildAgent = true;
-                return sp.CopyAgent(out agent);
-            }
-
-            return false;
-        }
         /// <summary>
         /// Authenticated close (via network)
         /// </summary>
-- 
cgit v1.1


From 21bc799a17f6f0315256d901f3ec226a39f93a51 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Thu, 9 Jan 2014 18:34:10 +0200
Subject: Fixed offline IM

---
 OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs b/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs
index 6731923..d36f9a4 100644
--- a/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs
+++ b/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -100,7 +100,7 @@ namespace OpenSim.OfflineIM
                 return false;
             }
 
-            string imXml = string.Empty;
+            string imXml;
             using (MemoryStream mstream = new MemoryStream())
             {
                 XmlWriterSettings settings = new XmlWriterSettings();
@@ -110,13 +110,9 @@ namespace OpenSim.OfflineIM
                 {
                     m_serializer.Serialize(writer, im);
                     writer.Flush();
-                    
-                    mstream.Position = 0;
-                    using (StreamReader sreader = new StreamReader(mstream))
-                    {
-                        imXml = sreader.ReadToEnd();
-                    }
                 }
+
+                imXml = Util.UTF8.GetString(mstream.ToArray());
             }
 
             OfflineIMData data = new OfflineIMData();
-- 
cgit v1.1


From 46c2791fe2f9ea92535d3933602e24dcba8f96f9 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Tue, 29 Oct 2013 16:03:58 +0200
Subject: In the offline message table, store the sender.

This data is useful for preventing abuse (e.g., someone who sends too many messages), or for deleting message if their sender has been deleted.
---
 .../OfflineIM/Remote/OfflineIMServiceRobustConnector.cs      |  3 +--
 OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs         |  3 ++-
 OpenSim/Data/IOfflineIMData.cs                               |  3 ++-
 OpenSim/Data/MySQL/Resources/IM_Store.migrations             | 12 +++++++++++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRobustConnector.cs b/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRobustConnector.cs
index 32c24db..6158abc 100644
--- a/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRobustConnector.cs
+++ b/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRobustConnector.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -96,7 +96,6 @@ namespace OpenSim.OfflineIM
                 string method = request["METHOD"].ToString();
                 request.Remove("METHOD");
 
-                m_log.DebugFormat("[OfflineIM.V2.Handler]: {0}", method);
                 switch (method)
                 {
                     case "GET":
diff --git a/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs b/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs
index d36f9a4..df0c53f 100644
--- a/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs
+++ b/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs
@@ -91,7 +91,7 @@ namespace OpenSim.OfflineIM
         {
             reason = string.Empty;
             
-            // TODO Check limits
+            // Check limits
             UUID principalID = new UUID(im.toAgentID);
             long count = m_Database.GetCount("PrincipalID", principalID.ToString());
             if (count >= MAX_IM)
@@ -117,6 +117,7 @@ namespace OpenSim.OfflineIM
 
             OfflineIMData data = new OfflineIMData();
             data.PrincipalID = principalID;
+            data.FromID = new UUID(im.fromAgentID);
             data.Data = new Dictionary<string, string>();
             data.Data["Message"] = imXml;
 
diff --git a/OpenSim/Data/IOfflineIMData.cs b/OpenSim/Data/IOfflineIMData.cs
index e780304..58501a3 100644
--- a/OpenSim/Data/IOfflineIMData.cs
+++ b/OpenSim/Data/IOfflineIMData.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -34,6 +34,7 @@ namespace OpenSim.Data
     public class OfflineIMData
     {
         public UUID PrincipalID;
+        public UUID FromID;
         public Dictionary<string, string> Data;
     }
 
diff --git a/OpenSim/Data/MySQL/Resources/IM_Store.migrations b/OpenSim/Data/MySQL/Resources/IM_Store.migrations
index 7cfcd43..f73475e 100644
--- a/OpenSim/Data/MySQL/Resources/IM_Store.migrations
+++ b/OpenSim/Data/MySQL/Resources/IM_Store.migrations
@@ -21,4 +21,14 @@ INSERT INTO `im_offline` SELECT * from `diva_im_offline`;
 DROP TABLE `diva_im_offline`;
 DELETE FROM `migrations` WHERE name='diva_im_Store';
 
-COMMIT;
\ No newline at end of file
+COMMIT;
+
+:VERSION 3         # -------------------------- 
+
+BEGIN;
+
+ALTER TABLE `im_offline`
+  ADD `FromID` char(36) NOT NULL default '' AFTER `PrincipalID`,
+  ADD KEY `FromID` (`FromID`);
+
+COMMIT;
-- 
cgit v1.1


From 2d9d6fe922c99e79489b19b18ac33338012137ff Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Tue, 29 Oct 2013 16:38:03 +0200
Subject: Can delete the Offline Messages sent to/from a user.

This is useful if the user is deleted.
---
 OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs       |  5 +++++
 .../OfflineIM/Remote/OfflineIMServiceRemoteConnector.cs |  8 ++++++++
 .../OfflineIM/Remote/OfflineIMServiceRobustConnector.cs | 17 +++++++++++++++++
 OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs    |  7 +++++++
 OpenSim/Services/Interfaces/IOfflineIMService.cs        |  7 +++++++
 5 files changed, 44 insertions(+)

diff --git a/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs b/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs
index 050ebd2..5ef068a 100644
--- a/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs
+++ b/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs
@@ -261,6 +261,11 @@ namespace OpenSim.OfflineIM
             return m_OfflineIMService.StoreMessage(im, out reason);
         }
 
+        public void DeleteMessages(UUID userID)
+        {
+            m_OfflineIMService.DeleteMessages(userID);
+        }
+
         #endregion
     }
 }
diff --git a/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRemoteConnector.cs b/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRemoteConnector.cs
index 69feb76..f6b17e5 100644
--- a/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRemoteConnector.cs
+++ b/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRemoteConnector.cs
@@ -117,6 +117,14 @@ namespace OpenSim.OfflineIM
             return true;
         }
 
+        public void DeleteMessages(UUID userID)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            sendData["UserID"] = userID;
+            
+            MakeRequest("DELETE", sendData);
+        }
+
         #endregion
 
 
diff --git a/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRobustConnector.cs b/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRobustConnector.cs
index 6158abc..13b0e7e 100644
--- a/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRobustConnector.cs
+++ b/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRobustConnector.cs
@@ -102,6 +102,8 @@ namespace OpenSim.OfflineIM
                         return HandleGet(request);
                     case "STORE":
                         return HandleStore(request);
+                    case "DELETE":
+                        return HandleDelete(request);
                 }
                 m_log.DebugFormat("[OFFLINE IM HANDLER]: unknown method request: {0}", method);
             }
@@ -158,6 +160,21 @@ namespace OpenSim.OfflineIM
             return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
+        byte[] HandleDelete(Dictionary<string, object> request)
+        {
+            if (!request.ContainsKey("UserID"))
+            {
+                return FailureResult();
+            }
+            else
+            {
+                UUID userID = new UUID(request["UserID"].ToString());
+                m_OfflineIMService.DeleteMessages(userID);
+
+                return SuccessResult();
+            }
+        }
+
         #region Helpers
 
         private void NullResult(Dictionary<string, object> result, string reason)
diff --git a/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs b/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs
index df0c53f..690c955 100644
--- a/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs
+++ b/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs
@@ -124,5 +124,12 @@ namespace OpenSim.OfflineIM
             return m_Database.Store(data);
 
         }
+
+        public void DeleteMessages(UUID userID)
+        {
+            m_Database.Delete("PrincipalID", userID.ToString());
+            m_Database.Delete("FromID", userID.ToString());
+        }
+
     }
 }
diff --git a/OpenSim/Services/Interfaces/IOfflineIMService.cs b/OpenSim/Services/Interfaces/IOfflineIMService.cs
index 2848967..588aaaf 100644
--- a/OpenSim/Services/Interfaces/IOfflineIMService.cs
+++ b/OpenSim/Services/Interfaces/IOfflineIMService.cs
@@ -35,7 +35,14 @@ namespace OpenSim.Services.Interfaces
     public interface IOfflineIMService
     {
         List<GridInstantMessage> GetMessages(UUID principalID);
+        
         bool StoreMessage(GridInstantMessage im, out string reason);
+        
+        /// <summary>
+        /// Delete messages to or from this user (or group).
+        /// </summary>
+        /// <param name="userID">A user or group ID</param>
+        void DeleteMessages(UUID userID);
     }
 
     public class OfflineIMDataUtils
-- 
cgit v1.1


From 3ffd90496a366f2b64eb8daadf63a2b6ee05ad7a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 16 Jan 2014 20:23:31 +0000
Subject: Prevent duplicate invocations or race dontision in
 SP.CompleteMovement()

This can happen under poor network conditions if a viewer repeats the message send
If this happens, physics actors can get orphaned, which unecessarily raises physics frame times
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs   | 29 ++++++-
 .../Scenes/Tests/ScenePresenceAgentTests.cs        | 92 +++++++++-------------
 2 files changed, 65 insertions(+), 56 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 49f70c4..63cca56 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -108,6 +108,16 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        /// <summary>
+        /// This exists to prevent race conditions between two CompleteMovement threads if the simulator is slow and
+        /// the viewer fires these in quick succession.
+        /// </summary>
+        /// <remarks>
+        /// TODO: The child -> agent transition should be folded into LifecycleState and the CompleteMovement 
+        /// regulation done there.
+        /// </remarks>
+        private object m_completeMovementLock = new object();
+
 //        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);
@@ -905,6 +915,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Turns a child agent into a root agent.
         /// </summary>
+        /// <remarks>
         /// Child agents are logged into neighbouring sims largely to observe changes.  Root agents exist when the
         /// avatar is actual in the sim.  They can perform all actions.
         /// This change is made whenever an avatar enters a region, whether by crossing over from a neighbouring sim,
@@ -912,8 +923,8 @@ namespace OpenSim.Region.Framework.Scenes
         ///
         /// This method is on the critical path for transferring an avatar from one region to another.  Delay here
         /// delays that crossing.
-        /// </summary>
-        private void MakeRootAgent(Vector3 pos, bool isFlying)
+        /// </remarks>
+        private bool MakeRootAgent(Vector3 pos, bool isFlying)
         {
 //            m_log.InfoFormat(
 //                "[SCENE]: Upgrading child to root agent for {0} in {1}",
@@ -921,6 +932,10 @@ namespace OpenSim.Region.Framework.Scenes
 
             //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count);
 
+            lock (m_completeMovementLock)
+                if (!IsChildAgent)
+                    return false;
+
             IsChildAgent = false;
 
             // Must reset this here so that a teleport to a region next to an existing region does not keep the flag
@@ -1070,6 +1085,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_scene.EventManager.TriggerOnMakeRootAgent(this);
 
+            return true;
         }
 
         public int GetStateSource()
@@ -1443,7 +1459,14 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);
-            MakeRootAgent(AbsolutePosition, flying);
+            if (!MakeRootAgent(AbsolutePosition, flying))
+            {
+                m_log.DebugFormat(
+                    "[SCENE PRESENCE]: Aborting CompleteMovement call for {0} in {1} as they are already root", 
+                    Name, Scene.Name);
+
+                return;
+            }
 
             // Tell the client that we're totally ready
             ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
index d1aeaee..1ff1329 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
@@ -111,6 +111,45 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Assert.That(scene.GetScenePresences().Count, Is.EqualTo(1));
         }
 
+        /// <summary>
+        /// Test that duplicate complete movement calls are ignored.
+        /// </summary>
+        /// <remarks>
+        /// If duplicate calls are not ignored then there is a risk of race conditions or other unexpected effects.
+        /// </remarks>
+        [Test]
+        public void TestDupeCompleteMovementCalls()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID spUuid = TestHelpers.ParseTail(0x1);
+
+            TestScene scene = new SceneHelpers().SetupScene();
+
+            int makeRootAgentEvents = 0;
+            scene.EventManager.OnMakeRootAgent += spi => makeRootAgentEvents++;
+
+            ScenePresence sp = SceneHelpers.AddScenePresence(scene, spUuid);
+
+            Assert.That(makeRootAgentEvents, Is.EqualTo(1));
+
+            // Normally these would be invoked by a CompleteMovement message coming in to the UDP stack.  But for
+            // convenience, here we will invoke it manually.
+            sp.CompleteMovement(sp.ControllingClient, true);
+
+            Assert.That(makeRootAgentEvents, Is.EqualTo(1));
+
+            // Check rest of exepcted parameters.
+            Assert.That(scene.AuthenticateHandler.GetAgentCircuitData(spUuid), Is.Not.Null);
+            Assert.That(scene.AuthenticateHandler.GetAgentCircuits().Count, Is.EqualTo(1));
+          
+            Assert.That(sp.IsChildAgent, Is.False);
+            Assert.That(sp.UUID, Is.EqualTo(spUuid));
+
+            Assert.That(scene.GetScenePresences().Count, Is.EqualTo(1));
+        }
+
         [Test]
         public void TestCreateDuplicateRootScenePresence()
         {
@@ -249,58 +288,5 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 //            Assert.That(childPresence, Is.Not.Null);
 //            Assert.That(childPresence.IsChildAgent, Is.True);
         }
-
-//        /// <summary>
-//        /// Test adding a root agent to a scene.  Doesn't yet actually complete crossing the agent into the scene.
-//        /// </summary>
-//        [Test]
-//        public void T010_TestAddRootAgent()
-//        {
-//            TestHelpers.InMethod();
-//
-//            string firstName = "testfirstname";
-//
-//            AgentCircuitData agent = new AgentCircuitData();
-//            agent.AgentID = agent1;
-//            agent.firstname = firstName;
-//            agent.lastname = "testlastname";
-//            agent.SessionID = UUID.Random();
-//            agent.SecureSessionID = UUID.Random();
-//            agent.circuitcode = 123;
-//            agent.BaseFolder = UUID.Zero;
-//            agent.InventoryFolder = UUID.Zero;
-//            agent.startpos = Vector3.Zero;
-//            agent.CapsPath = GetRandomCapsObjectPath();
-//            agent.ChildrenCapSeeds = new Dictionary<ulong, string>();
-//            agent.child = true;
-//
-//            scene.PresenceService.LoginAgent(agent.AgentID.ToString(), agent.SessionID, agent.SecureSessionID);
-//
-//            string reason;
-//            scene.NewUserConnection(agent, (uint)TeleportFlags.ViaLogin, out reason);
-//            testclient = new TestClient(agent, scene);
-//            scene.AddNewAgent(testclient);
-//
-//            ScenePresence presence = scene.GetScenePresence(agent1);
-//
-//            Assert.That(presence, Is.Not.Null, "presence is null");
-//            Assert.That(presence.Firstname, Is.EqualTo(firstName), "First name not same");
-//            acd1 = agent;
-//        }
-//
-//        /// <summary>
-//        /// Test removing an uncrossed root agent from a scene.
-//        /// </summary>
-//        [Test]
-//        public void T011_TestRemoveRootAgent()
-//        {
-//            TestHelpers.InMethod();
-//
-//            scene.RemoveClient(agent1);
-//
-//            ScenePresence presence = scene.GetScenePresence(agent1);
-//
-//            Assert.That(presence, Is.Null, "presence is not null");
-//        }
     }
 }
\ No newline at end of file
-- 
cgit v1.1


From 3bc669ffc7638b56d5ab5aac038c33106ba9a95b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 16 Jan 2014 23:31:50 +0000
Subject: Actually put IsChildAgent = true inside the lock, otherwise there is
 still a small window for race conditions on duplicate CompleteMovement calls

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 63cca56..3290da1 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -933,10 +933,12 @@ namespace OpenSim.Region.Framework.Scenes
             //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count);
 
             lock (m_completeMovementLock)
+            {
                 if (!IsChildAgent)
                     return false;
 
-            IsChildAgent = false;
+                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.
-- 
cgit v1.1


From 4fa843ff19441c9daa4e7dae0a4d705f912fca54 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 16 Jan 2014 23:44:17 +0000
Subject: Reorder checks in SP.CompleteMovement() to fix test failures

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 69 ++++++++++++------------
 1 file changed, 33 insertions(+), 36 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 18d84a2..85a20e9 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1003,48 +1003,45 @@ namespace OpenSim.Region.Framework.Scenes
         /// </remarks>
         private bool MakeRootAgent(Vector3 pos, bool isFlying)
         {
-//            m_log.InfoFormat(
-//                "[SCENE]: Upgrading child to root agent for {0} in {1}",
-//                Name, m_scene.RegionInfo.RegionName);
-
-            if (ParentUUID != UUID.Zero)
+            lock (m_completeMovementLock)
             {
-                m_log.DebugFormat("[SCENE PRESENCE]: Sitting avatar back on prim {0}", ParentUUID);
-                SceneObjectPart part = m_scene.GetSceneObjectPart(ParentUUID);
-                if (part == null)
+                if (!IsChildAgent)
+                    return false;
+
+                //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count);
+
+    //            m_log.InfoFormat(
+    //                "[SCENE]: Upgrading child to root agent for {0} in {1}",
+    //                Name, m_scene.RegionInfo.RegionName);
+
+                if (ParentUUID != UUID.Zero)
                 {
-                    m_log.ErrorFormat("[SCENE PRESENCE]: Can't find prim {0} to sit on", ParentUUID);
+                    m_log.DebugFormat("[SCENE PRESENCE]: Sitting avatar back on prim {0}", ParentUUID);
+                    SceneObjectPart part = m_scene.GetSceneObjectPart(ParentUUID);
+                    if (part == null)
+                    {
+                        m_log.ErrorFormat("[SCENE PRESENCE]: Can't find prim {0} to sit on", ParentUUID);
+                    }
+                    else
+                    {
+                        part.ParentGroup.AddAvatar(UUID);
+                        if (part.SitTargetPosition != Vector3.Zero)
+                            part.SitTargetAvatar = UUID;
+    //                    ParentPosition = part.GetWorldPosition();
+                        ParentID = part.LocalId;
+                        ParentPart = part;
+                        m_pos = PrevSitOffset;
+    //                    pos = ParentPosition;
+                        pos = part.GetWorldPosition();
+                    }
+                    ParentUUID = UUID.Zero;
+
+    //                Animator.TrySetMovementAnimation("SIT");
                 }
                 else
                 {
-                    part.ParentGroup.AddAvatar(UUID);
-                    if (part.SitTargetPosition != Vector3.Zero)
-                        part.SitTargetAvatar = UUID;
-//                    ParentPosition = part.GetWorldPosition();
-                    ParentID = part.LocalId;
-                    ParentPart = part;
-                    m_pos = PrevSitOffset;
-//                    pos = ParentPosition;
-                    pos = part.GetWorldPosition();
+                    IsLoggingIn = false;
                 }
-                ParentUUID = UUID.Zero;
-
-                IsChildAgent = false;
-
-//                Animator.TrySetMovementAnimation("SIT");
-            }
-            else
-            {
-                IsChildAgent = false;
-                IsLoggingIn = false;
-            }
-
-            //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count);
-
-            lock (m_completeMovementLock)
-            {
-                if (!IsChildAgent)
-                    return false;
 
                 IsChildAgent = false;
             }
-- 
cgit v1.1


From 39e5785c0f5bfa9fce2549757ac895920c88825a Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Thu, 31 Oct 2013 12:50:17 +0200
Subject: Fixed: Windlight functions caused an error if called when the
 script's owner isn't in the scene

---
 .../Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index 1d6cb6d..30eed40 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -446,7 +446,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 LSShoutError("LightShare functions are not enabled.");
                 return 0;
             }
-            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
+
+            ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
+            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && (sp == null || sp.GodLevel < 200))
             {
                 LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
                 return 0;
@@ -474,7 +476,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 LSShoutError("LightShare functions are not enabled.");
                 return;
             }
-            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
+            
+            ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
+            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && (sp == null || sp.GodLevel < 200))
             {
                 LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
                 return;
@@ -497,7 +501,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 LSShoutError("LightShare functions are not enabled.");
                 return 0;
             }
-            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
+            
+            ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
+            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && (sp == null || sp.GodLevel < 200))
             {
                 LSShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners.");
                 return 0;
-- 
cgit v1.1


From 18e0d2f343ea83d1dee0ac1a71e0465aca2b6758 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 17 Jan 2014 01:55:40 +0000
Subject: minor: Add Ai Austin to additional OpenSim contributors by request as
 he has added config corrections and does extensive liaison with other
 projects

---
 CONTRIBUTORS.txt | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 9114fc5..6fa116d 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -1,5 +1,4 @@
-   <<<>>>>The following people have contributed to OpenSim (Thank you 
-for your effort!) 
+The following people have contributed to OpenSim (Thank you for your effort!) 
 
 = Current OpenSim Developers (in very rough order of appearance) =
 These folks represent the current core team for OpenSim, and are the
@@ -61,8 +60,9 @@ where we are today.
 These folks have contributed code patches or content to OpenSimulator to help make it
 what it is today.  
 
-* aduffy70
 * A_Biondi
+* aduffy70
+* Ai Austin
 * alex_carnell
 * Alan Webb (IBM)
 * Aleric
@@ -173,23 +173,18 @@ what it is today.
 * Zha Ewry
 * ziah
 
-
 = LSL Devs =
-
 * Alondria
 * CharlieO
 * Tedd
 * Melanie Thielker
 
-
 = Testers =
-
 * Ai Austin
 * CharlieO (LSL)
 * Ckrinke
 * openlifegrid.com
 
-
 This software uses components from the following developers:
 * Sleepycat Software (Berkeley DB)
 * Aurora-Sim (http://aurora-sim.org)
-- 
cgit v1.1


From 14c72d4a5bba73c10bd4a5d93d53cd4fc0398570 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 17 Jan 2014 01:58:10 +0000
Subject: Revert "Fixed: Windlight functions caused an error if called when the
 script's owner isn't in the scene"

This reverts commit 39e5785c0f5bfa9fce2549757ac895920c88825a.

Did not mean to apply this yet.
---
 .../Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs  | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index 30eed40..1d6cb6d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -446,9 +446,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 LSShoutError("LightShare functions are not enabled.");
                 return 0;
             }
-
-            ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
-            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && (sp == null || sp.GodLevel < 200))
+            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
             {
                 LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
                 return 0;
@@ -476,9 +474,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 LSShoutError("LightShare functions are not enabled.");
                 return;
             }
-            
-            ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
-            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && (sp == null || sp.GodLevel < 200))
+            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
             {
                 LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
                 return;
@@ -501,9 +497,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 LSShoutError("LightShare functions are not enabled.");
                 return 0;
             }
-            
-            ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
-            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && (sp == null || sp.GodLevel < 200))
+            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
             {
                 LSShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners.");
                 return 0;
-- 
cgit v1.1


From 9fefbcf7fc5e8767030757da7ab077fa96cc0904 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 17 Jan 2014 23:32:37 +0000
Subject: minor: since structs are values, assigning them to another variable
 copies it.  Instantiation is unnecessary.

---
 .../Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 246b253..5fea0cf 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1385,7 +1385,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         public GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out uint xDest, out uint yDest, out string version, out Vector3 newpos)
         {
             version = String.Empty;
-            newpos = new Vector3(pos.X, pos.Y, pos.Z);
+            newpos = pos;
 
 //            m_log.DebugFormat(
 //                "[ENTITY TRANSFER MODULE]: Crossing agent {0} at pos {1} in {2}", agent.Name, pos, scene.Name);
-- 
cgit v1.1


From b52b50ee56f3461d7f2dc47a905a0b10d07d3346 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 17 Jan 2014 23:36:23 +0000
Subject: minor: reinsert some method doc back into IEntityTransferModule

---
 .../Framework/Interfaces/IEntityTransferModule.cs    | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 1949a90..214b07a 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -47,13 +47,33 @@ namespace OpenSim.Region.Framework.Interfaces
         /// The handle of the destination region.  If it's the same as the region currently
         /// occupied by the agent then the teleport will be within that region.
         /// </param>
+        /// <param name='agent'></param>
+        /// <param name='regionHandle'></param>
         /// <param name='position'></param>
         /// <param name='lookAt'></param>
         /// <param name='teleportFlags'></param>
         void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, Vector3 lookAt, uint teleportFlags);
 
+        /// <summary>
+        /// Teleports the agent for the given client to their home destination.
+        /// </summary>
+        /// <param name='id'></param>
+        /// <param name='client'></param>
         bool TeleportHome(UUID id, IClientAPI client);
 
+        /// <summary>
+        /// Teleport an agent directly to a given region without checking whether the region should be substituted.
+        /// </summary>
+        /// <remarks>
+        /// Please use Teleport() instead unless you know exactly what you're doing.
+        /// Do not use for same region teleports.
+        /// </remarks>
+        /// <param name='sp'></param>
+        /// <param name='reg'></param>
+        /// <param name='finalDestination'>/param>
+        /// <param name='position'></param>
+        /// <param name='lookAt'></param>
+        /// <param name='teleportFlags'></param>
         void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination,
             Vector3 position, Vector3 lookAt, uint teleportFlags);
 
-- 
cgit v1.1


From 12bfce7b9f1356893e351d13ddd947810c352727 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 18 Jan 2014 00:06:12 +0000
Subject: elminate unnecessary asset != null check in
 FlotsamAssetCache.UpdateFileCache()

Passed in asset is always not null
---
 .../Region/CoreModules/Asset/FlotsamAssetCache.cs  | 97 +++++++++++-----------
 1 file changed, 47 insertions(+), 50 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index f1fee63..e1aa460 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -248,70 +248,67 @@ namespace OpenSim.Region.CoreModules.Asset
 
         private void UpdateFileCache(string key, AssetBase asset)
         {
-            // TODO: Spawn this off to some seperate thread to do the actual writing
-            if (asset != null)
-            {
-                string filename = GetFileName(key);
+            string filename = GetFileName(key);
 
-                try
+            try
+            {
+                // If the file is already cached, don't cache it, just touch it so access time is updated
+                if (File.Exists(filename))
                 {
-                    // If the file is already cached, don't cache it, just touch it so access time is updated
-                    if (File.Exists(filename))
+                    // We don't really want to know about sharing
+                    // violations here. If the file is locked, then
+                    // the other thread has updated the time for us.
+                    try
                     {
-                        // We don't really want to know about sharing
-                        // violations here. If the file is locked, then
-                        // the other thread has updated the time for us.
-                        try
+                        lock (m_CurrentlyWriting)
                         {
-                            lock (m_CurrentlyWriting)
-                            {
-                                if (!m_CurrentlyWriting.Contains(filename))
-                                    File.SetLastAccessTime(filename, DateTime.Now);
-                            }
+                            if (!m_CurrentlyWriting.Contains(filename))
+                                File.SetLastAccessTime(filename, DateTime.Now);
                         }
-                        catch
+                    }
+                    catch
+                    {
+                    }
+                } 
+                else 
+                {
+                    // Once we start writing, make sure we flag that we're writing
+                    // that object to the cache so that we don't try to write the 
+                    // same file multiple times.
+                    lock (m_CurrentlyWriting)
+                    {
+#if WAIT_ON_INPROGRESS_REQUESTS
+                        if (m_CurrentlyWriting.ContainsKey(filename))
                         {
+                            return;
                         }
-                    } else {
-
-                        // Once we start writing, make sure we flag that we're writing
-                        // that object to the cache so that we don't try to write the 
-                        // same file multiple times.
-                        lock (m_CurrentlyWriting)
+                        else
                         {
-#if WAIT_ON_INPROGRESS_REQUESTS
-                            if (m_CurrentlyWriting.ContainsKey(filename))
-                            {
-                                return;
-                            }
-                            else
-                            {
-                                m_CurrentlyWriting.Add(filename, new ManualResetEvent(false));
-                            }
+                            m_CurrentlyWriting.Add(filename, new ManualResetEvent(false));
+                        }
 
 #else
-                            if (m_CurrentlyWriting.Contains(filename))
-                            {
-                                return;
-                            }
-                            else
-                            {
-                                m_CurrentlyWriting.Add(filename);
-                            }
-#endif
-
+                        if (m_CurrentlyWriting.Contains(filename))
+                        {
+                            return;
                         }
+                        else
+                        {
+                            m_CurrentlyWriting.Add(filename);
+                        }
+#endif
 
-                        Util.FireAndForget(
-                            delegate { WriteFileCache(filename, asset); });
                     }
+
+                    Util.FireAndForget(
+                        delegate { WriteFileCache(filename, asset); });
                 }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat(
-                        "[FLOTSAM ASSET CACHE]: Failed to update cache for asset {0}.  Exception {1} {2}",
-                        asset.ID, e.Message, e.StackTrace);
-                }
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat(
+                    "[FLOTSAM ASSET CACHE]: Failed to update cache for asset {0}.  Exception {1} {2}",
+                    asset.ID, e.Message, e.StackTrace);
             }
         }
 
-- 
cgit v1.1


From 97fbb8ed45e4827ea7473bac2b792499a9284c3e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 18 Jan 2014 00:12:12 +0000
Subject: Elminate some copy/paste in FlotsamAssetCache.CheckFromFileCache()
 and use using() construct to ensure filestream is always closed

---
 .../Region/CoreModules/Asset/FlotsamAssetCache.cs  | 43 +++++-----------------
 1 file changed, 10 insertions(+), 33 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index e1aa460..169412e 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -352,7 +352,6 @@ namespace OpenSim.Region.CoreModules.Asset
             return false;
         }
 
-
         /// <summary>
         /// Try to get an asset from the file cache.
         /// </summary>
@@ -390,15 +389,16 @@ namespace OpenSim.Region.CoreModules.Asset
 
             if (File.Exists(filename))
             {
-                FileStream stream = null;
                 try
                 {
-                    stream = File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.Read);
-                    BinaryFormatter bformatter = new BinaryFormatter();
+                    using (FileStream stream = File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.Read))
+                    {
+                        BinaryFormatter bformatter = new BinaryFormatter();
 
-                    asset = (AssetBase)bformatter.Deserialize(stream);
+                        asset = (AssetBase)bformatter.Deserialize(stream);
 
-                    m_DiskHits++;
+                        m_DiskHits++;
+                    }
                 }
                 catch (System.Runtime.Serialization.SerializationException e)
                 {
@@ -417,12 +417,6 @@ namespace OpenSim.Region.CoreModules.Asset
                     m_log.WarnFormat(
                         "[FLOTSAM ASSET CACHE]: Failed to get file {0} for asset {1}.  Exception {2} {3}",
                         filename, id, e.Message, e.StackTrace);
-
-                }
-                finally
-                {
-                    if (stream != null)
-                        stream.Close();
                 }
             }
 
@@ -434,36 +428,19 @@ namespace OpenSim.Region.CoreModules.Asset
             bool found = false;
 
             string filename = GetFileName(id);
+
             if (File.Exists(filename))
             {
-                // actually check if we can open it, and so update expire
-                FileStream stream = null;
                 try
                 {
-                    stream = File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.Read);
-                    if (stream != null)
+                    using (FileStream stream = File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.Read))
                     {
-                        found = true;
-                        stream.Close();
+                        if (stream != null)
+                            found = true;
                     }
-
-                }
-                catch (System.Runtime.Serialization.SerializationException e)
-                {
-                    found = false;
-                    m_log.ErrorFormat(
-                        "[FLOTSAM ASSET CACHE]: Failed to check file {0} for asset {1}.  Exception {2} {3}",
-                        filename, id, e.Message, e.StackTrace);
-
-                    // If there was a problem deserializing the asset, the asset may
-                    // either be corrupted OR was serialized under an old format
-                    // {different version of AssetBase} -- we should attempt to
-                    // delete it and re-cache
-                    File.Delete(filename);
                 }
                 catch (Exception e)
                 {
-                    found = false;
                     m_log.ErrorFormat(
                         "[FLOTSAM ASSET CACHE]: Failed to check file {0} for asset {1}.  Exception {2} {3}",
                         filename, id, e.Message, e.StackTrace);
-- 
cgit v1.1


From d381da81d6bf57f05dd3f3430de6c8c936932292 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 18 Jan 2014 00:15:38 +0000
Subject: minor: Add method doc to IImproveAssetCache

---
 OpenSim/Framework/IImprovedAssetCache.cs | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Framework/IImprovedAssetCache.cs b/OpenSim/Framework/IImprovedAssetCache.cs
index a0b8b55..a853e90 100644
--- a/OpenSim/Framework/IImprovedAssetCache.cs
+++ b/OpenSim/Framework/IImprovedAssetCache.cs
@@ -31,10 +31,34 @@ namespace OpenSim.Framework
 {
     public interface IImprovedAssetCache
     {
+        /// <summary>
+        /// Cache the specified asset.
+        /// </summary>
+        /// <param name='asset'></param>
         void Cache(AssetBase asset);
+
+        /// <summary>
+        /// Get an asset by its id.
+        /// </summary>
+        /// <param name='id'></param>
+        /// <returns>null if the asset does not exist.</returns>
         AssetBase Get(string id);
+
+        /// <summary>
+        /// Check whether an asset with the specified id exists in the cache.
+        /// </summary>
+        /// <param name='id'></param>
         bool Check(string id);
+
+        /// <summary>
+        /// Expire an asset from the cache.
+        /// </summary>
+        /// <param name='id'></param>
         void Expire(string id);
+
+        /// <summary>
+        /// Clear the cache.
+        /// </summary>
         void Clear();
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1


From ee8ba1ab9a30cf397c390b161a5d03e8c7b86290 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 18 Jan 2014 00:21:53 +0000
Subject: Simplify FlotsamAssetCache.CheckFromMemoryCache()

---
 OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 169412e..a1803c1 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -344,12 +344,7 @@ namespace OpenSim.Region.CoreModules.Asset
 
         private bool CheckFromMemoryCache(string id)
         {
-            AssetBase asset = null;
-
-            if (m_MemoryCache.TryGetValue(id, out asset))
-                return true;
-
-            return false;
+            return m_MemoryCache.Contains(id);
         }
 
         /// <summary>
-- 
cgit v1.1


From fc7ccfdafae7b8e9acd130b9f70e99241e0d33fa Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 18 Jan 2014 00:30:23 +0000
Subject: Properly implement CenomeAssetCache.Check()

---
 OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
index f43305f..9b0e1f4 100644
--- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
@@ -194,10 +194,12 @@ namespace OpenSim.Region.CoreModules.Asset
 
         #region IImprovedAssetCache Members
 
-
         public bool Check(string id)
         {
-            return false;
+            AssetBase asset;
+
+            // XXX:This is probably not an efficient implementation.
+            return m_cache.TryGetValue(id, out asset);
         }
 
         /// <summary>
-- 
cgit v1.1


From 427ffd3387c13daf7babc08c13a9acac1fe405c5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 18 Jan 2014 00:48:20 +0000
Subject: implement GlynnTuckerAssetCache.Check()

---
 OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
index ce9b546..5f76ac2 100644
--- a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Region.CoreModules.Asset
 
         public bool Check(string id)
         {
-            return false;
+            return m_Cache.Contains(id);
         }
 
         public void Cache(AssetBase asset)
-- 
cgit v1.1


From b9453a8f6f68cff86c261d245c41955ec8f8af84 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 18 Jan 2014 00:52:36 +0000
Subject: implement CoreAssetCache.Check()

---
 OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
index 58ce61a..f720748 100644
--- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
@@ -114,7 +114,8 @@ namespace OpenSim.Region.CoreModules.Asset
         //
         public bool Check(string id)
         {
-            return false;
+            // XXX This is probably not an efficient implementation.
+            return Get(id) != null;
         }
 
         public void Cache(AssetBase asset)
-- 
cgit v1.1


From 0cbe5f842419040dcfee688664d605a03d2f420b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 18 Jan 2014 00:55:49 +0000
Subject: Remove redundant methods in FlotsamAssetCache

---
 OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index a1803c1..6a5f8f3 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -487,11 +487,6 @@ namespace OpenSim.Region.CoreModules.Asset
             return Get(id);
         }
 
-        public AssetBase CheckCached(string id)
-        {
-            return Get(id);
-        }
-
         public void Expire(string id)
         {
             if (m_LogLevel >= 2)
@@ -1036,11 +1031,6 @@ namespace OpenSim.Region.CoreModules.Asset
             return asset.Data;
         }
 
-        public bool CheckData(string id)
-        {
-            return Check(id); ;
-        }
-
         public bool Get(string id, object sender, AssetRetrieved handler)
         {
             AssetBase asset = Get(id);
-- 
cgit v1.1


From 50ea2e0d67a9edee86d76b2fa8d4561710326461 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Thu, 31 Oct 2013 12:50:17 +0200
Subject: Fixed: Windlight functions caused an error if called when the
 script's owner isn't in the scene

---
 .../Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index 1d6cb6d..30eed40 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -446,7 +446,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 LSShoutError("LightShare functions are not enabled.");
                 return 0;
             }
-            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
+
+            ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
+            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && (sp == null || sp.GodLevel < 200))
             {
                 LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
                 return 0;
@@ -474,7 +476,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 LSShoutError("LightShare functions are not enabled.");
                 return;
             }
-            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
+            
+            ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
+            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && (sp == null || sp.GodLevel < 200))
             {
                 LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
                 return;
@@ -497,7 +501,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 LSShoutError("LightShare functions are not enabled.");
                 return 0;
             }
-            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
+            
+            ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
+            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && (sp == null || sp.GodLevel < 200))
             {
                 LSShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners.");
                 return 0;
-- 
cgit v1.1


From e9454d4672782647247db36e0d5e18b82cad58f0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 18 Jan 2014 01:36:40 +0000
Subject: Following on from 50ea2e0, only fetch scene presence for check if
 lightscript function has failed initial IsEstateManagerOrOwner() check

---
 .../Shared/Api/Implementation/LS_Api.cs            | 55 +++++++++++++++-------
 1 file changed, 38 insertions(+), 17 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index 30eed40..b13a5ae 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -434,6 +434,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             return wl;
         }
+
         /// <summary>
         /// Set the current Windlight scene
         /// </summary>
@@ -447,14 +448,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return 0;
             }
 
-            ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
-            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && (sp == null || sp.GodLevel < 200))
+            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID))
             {
-                LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
-                return 0;
+                ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
+
+                if (sp == null || sp.GodLevel < 200)
+                {
+                    LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
+                    return 0;
+                }
             }
+
             int success = 0;
             m_host.AddScriptLPS(1);
+
             if (LightShareModule.EnableWindlight)
             {
                 RegionLightShareData wl = getWindlightProfileFromRules(rules);
@@ -467,8 +474,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 LSShoutError("Windlight module is disabled");
                 return 0;
             }
+
             return success;
         }
+
         public void lsClearWindlightScene()
         {
             if (!m_LSFunctionsEnabled)
@@ -476,19 +485,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 LSShoutError("LightShare functions are not enabled.");
                 return;
             }
-            
-            ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
-            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && (sp == null || sp.GodLevel < 200))
+
+            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID))
             {
-                LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
-                return;
+                ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
+
+                if (sp == null || sp.GodLevel < 200)
+                {
+                    LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
+                    return;
+                }
             }
 
             m_host.ParentGroup.Scene.RegionInfo.WindlightSettings.valid = false;
             if (m_host.ParentGroup.Scene.SimulationDataService != null)
                 m_host.ParentGroup.Scene.SimulationDataService.RemoveRegionWindlightSettings(m_host.ParentGroup.Scene.RegionInfo.RegionID);
+
             m_host.ParentGroup.Scene.EventManager.TriggerOnSaveNewWindlightProfile();
         }
+
         /// <summary>
         /// Set the current Windlight scene to a target avatar
         /// </summary>
@@ -501,15 +516,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 LSShoutError("LightShare functions are not enabled.");
                 return 0;
             }
-            
-            ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
-            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && (sp == null || sp.GodLevel < 200))
+
+            if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID))
             {
-                LSShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners.");
-                return 0;
+                ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
+
+                if (sp == null || sp.GodLevel < 200)
+                {
+                    LSShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners.");
+                    return 0;
+                }
             }
+
             int success = 0;
             m_host.AddScriptLPS(1);
+
             if (LightShareModule.EnableWindlight)
             { 
                 RegionLightShareData wl = getWindlightProfileFromRules(rules);
@@ -521,8 +542,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 LSShoutError("Windlight module is disabled");
                 return 0;
             }
+
             return success;
-        }
-        
+        }        
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1


From 4fb3d314b85019af0e30cf0c2e7c24e9bf32ab66 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 19 Jan 2014 07:26:55 -0800
Subject: Fix casting error for float type INI file parameter parsing.

---
 OpenSim/Framework/Util.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index cebba46..7bc8176 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1031,7 +1031,7 @@ namespace OpenSim.Framework
                 else if (typeof(T) == typeof(Int32))
                     val = cnf.GetInt(varname, (int)val);
                 else if (typeof(T) == typeof(float))
-                    val = cnf.GetFloat(varname, (int)val);
+                    val = cnf.GetFloat(varname, (float)val);
                 else
                     m_log.ErrorFormat("[UTIL]: Unhandled type {0}", typeof(T));
             }
-- 
cgit v1.1


From e8273fa8ad85323f18fb67ecf6d5f07eced87178 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Tue, 26 Nov 2013 10:37:32 +0200
Subject: - Materials: support the viewer removing the material (in which case
 matsMap["Material"] is missing) - Reduced logging

---
 .../Materials/MaterialsDemoModule.cs               | 77 ++++++++++++----------
 1 file changed, 42 insertions(+), 35 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index d8f5563..44b1a4a 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             if (!m_enabled)
                 return;
 
-            m_log.DebugFormat("[MaterialsDemoModule]: INITIALIZED MODULE");
+            m_log.DebugFormat("[MaterialsDemoModule]: Initialized");
         }
         
         public void Close()
@@ -112,7 +112,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             if (!m_enabled)
                 return;
 
-            m_log.DebugFormat("[MaterialsDemoModule]: CLOSED MODULE");
+            //m_log.DebugFormat("[MaterialsDemoModule]: CLOSED MODULE");
         }
         
         public void AddRegion(Scene scene)
@@ -120,7 +120,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             if (!m_enabled)
                 return;
 
-            m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} ADDED", scene.RegionInfo.RegionName);
+            //m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} ADDED", scene.RegionInfo.RegionName);
 
             m_scene = scene;
             m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
@@ -166,7 +166,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             m_scene.EventManager.OnObjectAddedToScene -= EventManager_OnObjectAddedToScene;
 //            m_scene.EventManager.OnGatherUuids -= GatherMaterialsUuids; 
 
-            m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
+            //m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
         }        
         
         public void RegionLoaded(Scene scene)
@@ -195,7 +195,8 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
 
             if (part.DynAttrs == null)
             {
-                m_log.Warn("[MaterialsDemoModule]: NULL DYNATTRS :( ");
+                //m_log.Warn("[MaterialsDemoModule]: NULL DYNATTRS :( ");
+                return;
             }
 
             lock (part.DynAttrs)
@@ -216,11 +217,11 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                     return;
             }
 
-            m_log.Info("[MaterialsDemoModule]: OSMaterials: " + OSDParser.SerializeJsonString(OSMaterials));
+            //m_log.Info("[MaterialsDemoModule]: OSMaterials: " + OSDParser.SerializeJsonString(OSMaterials));
 
             if (matsArr == null)
             {
-                m_log.Info("[MaterialsDemoModule]: matsArr is null :( ");
+                //m_log.Info("[MaterialsDemoModule]: matsArr is null :( ");
                 return;
             }
 
@@ -238,7 +239,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                         }
                         catch (Exception e)
                         {
-                            m_log.Warn("[MaterialsDemoModule]: exception decoding persisted material: " + e.ToString());
+                            m_log.Warn("[MaterialsDemoModule]: exception decoding persisted material ", e);
                         }
                     }
                 }
@@ -299,7 +300,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             }
             catch (Exception e)
             {
-                m_log.Warn("[MaterialsDemoModule]: exception in StoreMaterialsForPart(): " + e.ToString());
+                m_log.Warn("[MaterialsDemoModule]: exception in StoreMaterialsForPart() ", e);
             }
         }
 
@@ -307,7 +308,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                 string param, IOSHttpRequest httpRequest,
                 IOSHttpResponse httpResponse)
         {
-            m_log.Debug("[MaterialsDemoModule]: POST cap handler");
+            //m_log.Debug("[MaterialsDemoModule]: POST cap handler");
 
             OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
             OSDMap resp = new OSDMap();
@@ -341,7 +342,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                                     {
                                         if (m_knownMaterials.ContainsKey(id))
                                         {
-                                            m_log.Info("[MaterialsDemoModule]: request for known material ID: " + id.ToString());
+                                            //m_log.Info("[MaterialsDemoModule]: request for known material ID: " + id.ToString());
                                             OSDMap matMap = new OSDMap();
                                             matMap["ID"] = OSD.FromBinary(id.GetBytes());
 
@@ -374,34 +375,40 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                                     {
                                         foreach (OSDMap matsMap in matsArr)
                                         {
-                                            m_log.Debug("[MaterialsDemoModule]: processing matsMap: " + OSDParser.SerializeJsonString(matsMap));
+                                            //m_log.Debug("[MaterialsDemoModule]: processing matsMap: " + OSDParser.SerializeJsonString(matsMap));
 
-                                            uint matLocalID = 0;
-                                            try { matLocalID = matsMap["ID"].AsUInteger(); }
+                                            uint primLocalID = 0;
+                                            try { primLocalID = matsMap["ID"].AsUInteger(); }
                                             catch (Exception e) { m_log.Warn("[MaterialsDemoModule]: cannot decode \"ID\" from matsMap: " + e.Message); }
-                                            m_log.Debug("[MaterialsDemoModule]: matLocalId: " + matLocalID.ToString());
-
+                                            //m_log.Debug("[MaterialsDemoModule]: primLocalID: " + primLocalID.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);
+                                            //m_log.Debug("[MaterialsDemoModule]: mat: " + OSDParser.SerializeJsonString(mat));
+
+                                            UUID id;
+                                            if (mat == null)
+                                            {
+                                                id = UUID.Zero;
+                                            }
+                                            else
+                                            {
+                                                id = HashOsd(mat);
+                                                lock (m_knownMaterials)
+                                                    m_knownMaterials[id] = mat;
+                                            }
+
+                                            var sop = m_scene.GetSceneObjectPart(primLocalID);
                                             if (sop == null)
-                                                m_log.Debug("[MaterialsDemoModule]: null SOP for localId: " + matLocalID.ToString());
+                                                m_log.Debug("[MaterialsDemoModule]: null SOP for localId: " + primLocalID.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());
+                                                    m_log.Debug("[MaterialsDemoModule]: null TextureEntry for localId: " + primLocalID.ToString());
                                                 }
                                                 else
                                                 {
@@ -434,7 +441,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                                                             te.DefaultTexture.MaterialID = id;
                                                     }
 
-                                                    m_log.Debug("[MaterialsDemoModule]: setting material ID for face " + face.ToString() + " to " + id.ToString());
+                                                    //m_log.DebugFormat("[MaterialsDemoModule]: in \"{0}\", setting material ID for face {1} to {2}", sop.Name, face, id);
 
                                                     //we cant use sop.UpdateTextureEntry(te); because it filters so do it manually
 
@@ -455,7 +462,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                                     }
                                     catch (Exception e)
                                     {
-                                        m_log.Warn("[MaterialsDemoModule]: exception processing received material: " + e.Message);
+                                        m_log.Warn("[MaterialsDemoModule]: exception processing received material ", e);
                                     }
                                 }
                             }
@@ -465,10 +472,10 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                 }
                 catch (Exception e)
                 {
-                    m_log.Warn("[MaterialsDemoModule]: exception decoding zipped CAP payload: " + e.Message);
+                    m_log.Warn("[MaterialsDemoModule]: exception decoding zipped CAP payload ", e);
                     //return "";
                 }
-                m_log.Debug("[MaterialsDemoModule]: knownMaterials.Count: " + m_knownMaterials.Count.ToString());
+                //m_log.Debug("[MaterialsDemoModule]: knownMaterials.Count: " + m_knownMaterials.Count.ToString());
             }
 
             
@@ -476,8 +483,8 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             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);
+            //m_log.Debug("[MaterialsDemoModule]: cap request (zipped portion): " + ZippedOsdBytesToString(req["Zipped"].AsBinary()));
+            //m_log.Debug("[MaterialsDemoModule]: cap response: " + response);
             return response;
         }
 
@@ -486,7 +493,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                 string param, IOSHttpRequest httpRequest,
                 IOSHttpResponse httpResponse)
         {
-            m_log.Debug("[MaterialsDemoModule]: GET cap handler");
+            //m_log.Debug("[MaterialsDemoModule]: GET cap handler");
 
             OSDMap resp = new OSDMap();
             int matsCount = 0;
@@ -506,7 +513,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             }
 
             resp["Zipped"] = ZCompressOSD(allOsd, false);
-            m_log.Debug("[MaterialsDemoModule]: matsCount: " + matsCount.ToString());
+            //m_log.Debug("[MaterialsDemoModule]: matsCount: " + matsCount.ToString());
 
             return OSDParser.SerializeLLSDXmlString(resp);
         }
@@ -654,4 +661,4 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
 //            }
 //        }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1


From ca0336d8349382ddb46df4c7e7f6377c64151f25 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Thu, 5 Dec 2013 14:18:59 +0200
Subject: Renamed MaterialsDemoModule to MaterialsModule

---
 .../Materials/MaterialsDemoModule.cs               | 664 ---------------------
 .../OptionalModules/Materials/MaterialsModule.cs   | 664 +++++++++++++++++++++
 2 files changed, 664 insertions(+), 664 deletions(-)
 delete mode 100644 OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
 create mode 100644 OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
deleted file mode 100644
index 44b1a4a..0000000
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ /dev/null
@@ -1,664 +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.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");
-        }
-        
-        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 :( ");
-                return;
-            }
-
-            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);
-                        }
-                    }
-                }
-            }
-        }
-
-        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);
-            }
-        }
-
-        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 primLocalID = 0;
-                                            try { primLocalID = matsMap["ID"].AsUInteger(); }
-                                            catch (Exception e) { m_log.Warn("[MaterialsDemoModule]: cannot decode \"ID\" from matsMap: " + e.Message); }
-                                            //m_log.Debug("[MaterialsDemoModule]: primLocalID: " + primLocalID.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;
-                                            if (mat == null)
-                                            {
-                                                id = UUID.Zero;
-                                            }
-                                            else
-                                            {
-                                                id = HashOsd(mat);
-                                                lock (m_knownMaterials)
-                                                    m_knownMaterials[id] = mat;
-                                            }
-
-                                            var sop = m_scene.GetSceneObjectPart(primLocalID);
-                                            if (sop == null)
-                                                m_log.Debug("[MaterialsDemoModule]: null SOP for localId: " + primLocalID.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: " + primLocalID.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.DebugFormat("[MaterialsDemoModule]: in \"{0}\", setting material ID for face {1} to {2}", sop.Name, face, id);
-
-                                                    //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);
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                }
-                catch (Exception e)
-                {
-                    m_log.Warn("[MaterialsDemoModule]: exception decoding zipped CAP payload ", e);
-                    //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);
-//                            }
-//                        }
-//                    }
-//                }
-//            }
-//        }
-    }
-}
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
new file mode 100644
index 0000000..e707154
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -0,0 +1,664 @@
+/*
+ * 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");
+        }
+        
+        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 :( ");
+                return;
+            }
+
+            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);
+                        }
+                    }
+                }
+            }
+        }
+
+        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);
+            }
+        }
+
+        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 primLocalID = 0;
+                                            try { primLocalID = matsMap["ID"].AsUInteger(); }
+                                            catch (Exception e) { m_log.Warn("[MaterialsDemoModule]: cannot decode \"ID\" from matsMap: " + e.Message); }
+                                            //m_log.Debug("[MaterialsDemoModule]: primLocalID: " + primLocalID.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;
+                                            if (mat == null)
+                                            {
+                                                id = UUID.Zero;
+                                            }
+                                            else
+                                            {
+                                                id = HashOsd(mat);
+                                                lock (m_knownMaterials)
+                                                    m_knownMaterials[id] = mat;
+                                            }
+
+                                            var sop = m_scene.GetSceneObjectPart(primLocalID);
+                                            if (sop == null)
+                                                m_log.Debug("[MaterialsDemoModule]: null SOP for localId: " + primLocalID.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: " + primLocalID.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.DebugFormat("[MaterialsDemoModule]: in \"{0}\", setting material ID for face {1} to {2}", sop.Name, face, id);
+
+                                                    //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);
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                }
+                catch (Exception e)
+                {
+                    m_log.Warn("[MaterialsDemoModule]: exception decoding zipped CAP payload ", e);
+                    //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);
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//        }
+    }
+}
-- 
cgit v1.1


From 3018b2c5d7c9de0e8da6d158f0848c840b7864ab Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Fri, 6 Dec 2013 16:21:11 +0200
Subject: Materials module: a) Store materials as assets; b) Finalized it
 (removed the "Demo" label; removed most of the logging); c) Enabled by
 default

Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
---
 OpenSim/Framework/SLUtil.cs                        |  40 +-
 .../Framework/Serialization/ArchiveConstants.cs    |   3 +
 .../Region/CoreModules/Asset/FlotsamAssetCache.cs  |   4 +-
 .../Archiver/InventoryArchiveWriteRequest.cs       |   4 +-
 .../EntityTransfer/HGEntityTransferModule.cs       |   4 +-
 .../Framework/InventoryAccess/HGAssetMapper.cs     |   8 +-
 .../World/Archiver/ArchiveWriteRequest.cs          |  12 +-
 .../CoreModules/World/Archiver/AssetsRequest.cs    |  11 +-
 .../Framework/Scenes/Tests/UuidGathererTests.cs    |  12 +-
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs    | 138 ++----
 .../OptionalModules/Materials/MaterialsModule.cs   | 518 ++++++++-------------
 bin/OpenSim.ini.example                            |   6 +
 12 files changed, 307 insertions(+), 453 deletions(-)

diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs
index cb73e8f..9249105 100644
--- a/OpenSim/Framework/SLUtil.cs
+++ b/OpenSim/Framework/SLUtil.cs
@@ -39,8 +39,32 @@ namespace OpenSim.Framework
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        /// <summary>
+        /// Asset types used only in OpenSim.
+        /// To avoid clashing with the code numbers used in Second Life, use only negative numbers here.
+        /// </summary>
+        public enum OpenSimAssetType : sbyte
+        {
+            Material = -2
+        }
+
+        
         #region SL / file extension / content-type conversions
 
+        /// <summary>
+        /// Returns the Enum entry corresponding to the given code, regardless of whether it belongs
+        /// to the AssetType or OpenSimAssetType enums.
+        /// </summary>
+        public static object AssetTypeFromCode(sbyte assetType)
+        {
+            if (Enum.IsDefined(typeof(OpenMetaverse.AssetType), assetType))
+                return (OpenMetaverse.AssetType)assetType;
+            else if (Enum.IsDefined(typeof(OpenSimAssetType), assetType))
+                return (OpenSimAssetType)assetType;
+            else
+                return OpenMetaverse.AssetType.Unknown;
+        }
+
         private class TypeMapping
         {
             private sbyte assetType;
@@ -56,12 +80,7 @@ namespace OpenSim.Framework
 
             public object AssetType
             {
-                get {
-                    if (Enum.IsDefined(typeof(OpenMetaverse.AssetType), assetType))
-                        return (OpenMetaverse.AssetType)assetType;
-                    else
-                        return OpenMetaverse.AssetType.Unknown;
-                }
+                get { return AssetTypeFromCode(assetType); }
             }
 
             public InventoryType InventoryType
@@ -102,6 +121,11 @@ namespace OpenSim.Framework
                 : this((sbyte)assetType, inventoryType, contentType, null, extension)
             {
             }
+
+            public TypeMapping(OpenSimAssetType assetType, InventoryType inventoryType, string contentType, string extension)
+                : this((sbyte)assetType, inventoryType, contentType, null, extension)
+            {
+            }
         }
 
         /// <summary>
@@ -142,7 +166,9 @@ namespace OpenSim.Framework
             new TypeMapping(AssetType.CurrentOutfitFolder, InventoryType.Unknown, "application/vnd.ll.currentoutfitfolder", "currentoutfitfolder"),
             new TypeMapping(AssetType.OutfitFolder, InventoryType.Unknown, "application/vnd.ll.outfitfolder", "outfitfolder"),
             new TypeMapping(AssetType.MyOutfitsFolder, InventoryType.Unknown, "application/vnd.ll.myoutfitsfolder", "myoutfitsfolder"),
-            new TypeMapping(AssetType.Mesh, InventoryType.Mesh, "application/vnd.ll.mesh", "llm")
+            new TypeMapping(AssetType.Mesh, InventoryType.Mesh, "application/vnd.ll.mesh", "llm"),
+            
+            new TypeMapping(OpenSimAssetType.Material, InventoryType.Unknown, "application/llsd+xml", "material")
         };
 
         private static Dictionary<sbyte, string> asset2Content;
diff --git a/OpenSim/Framework/Serialization/ArchiveConstants.cs b/OpenSim/Framework/Serialization/ArchiveConstants.cs
index 0c12787..73ebfae 100644
--- a/OpenSim/Framework/Serialization/ArchiveConstants.cs
+++ b/OpenSim/Framework/Serialization/ArchiveConstants.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using OpenMetaverse;
+using OpenSimAssetType = OpenSim.Framework.SLUtil.OpenSimAssetType;
 
 namespace OpenSim.Framework.Serialization
 {
@@ -128,6 +129,7 @@ namespace OpenSim.Framework.Serialization
             ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Texture]             = ASSET_EXTENSION_SEPARATOR + "texture.jp2";
             ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.TextureTGA]          = ASSET_EXTENSION_SEPARATOR + "texture.tga";
             ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.TrashFolder]         = ASSET_EXTENSION_SEPARATOR + "trashfolder.txt";   // Not sure if we'll ever see this
+            ASSET_TYPE_TO_EXTENSION[(sbyte)OpenSimAssetType.Material]     = ASSET_EXTENSION_SEPARATOR + "material.xml";   // Not sure if we'll ever see this
 
             EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "animation.bvh"]            = (sbyte)AssetType.Animation;
             EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "bodypart.txt"]             = (sbyte)AssetType.Bodypart;
@@ -152,6 +154,7 @@ namespace OpenSim.Framework.Serialization
             EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "texture.jp2"]              = (sbyte)AssetType.Texture;
             EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "texture.tga"]              = (sbyte)AssetType.TextureTGA;
             EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "trashfolder.txt"]          = (sbyte)AssetType.TrashFolder;
+            EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "material.xml"]        = (sbyte)OpenSimAssetType.Material;
         }
 
         public static string CreateOarLandDataPath(LandData ld)
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 6a5f8f3..b270de9 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -771,7 +771,7 @@ namespace OpenSim.Region.CoreModules.Asset
             UuidGatherer gatherer = new UuidGatherer(m_AssetService);
 
             HashSet<UUID> uniqueUuids = new HashSet<UUID>();
-            Dictionary<UUID, AssetType> assets = new Dictionary<UUID, AssetType>();
+            Dictionary<UUID, sbyte> assets = new Dictionary<UUID, sbyte>();
 
             foreach (Scene s in m_Scenes)
             {
@@ -794,7 +794,7 @@ namespace OpenSim.Region.CoreModules.Asset
                         else if (storeUncached)
                         {
                             AssetBase cachedAsset = m_AssetService.Get(assetID.ToString());
-                            if (cachedAsset == null && assets[assetID] != AssetType.Unknown)
+                            if (cachedAsset == null && assets[assetID] != (sbyte)AssetType.Unknown)
                                 m_log.DebugFormat(
                                 "[FLOTSAM ASSET CACHE]: Could not find asset {0}, type {1} referenced by object {2} at {3} in scene {4} when pre-caching all scene assets",
                                     assetID, assets[assetID], e.Name, e.AbsolutePosition, s.Name);
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index 4ec8ae7..4292719 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// <value>
         /// Used to collect the uuids of the assets that we need to save into the archive
         /// </value>
-        protected Dictionary<UUID, AssetType> m_assetUuids = new Dictionary<UUID, AssetType>();
+        protected Dictionary<UUID, sbyte> m_assetUuids = new Dictionary<UUID, sbyte>();
 
         /// <value>
         /// Used to collect the uuids of the users that we need to save into the archive
@@ -187,7 +187,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             // Don't chase down link asset items as they actually point to their target item IDs rather than an asset
             if (SaveAssets && itemAssetType != AssetType.Link && itemAssetType != AssetType.LinkFolder)
-                m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, m_assetUuids);
+                m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (sbyte)inventoryItem.AssetType, m_assetUuids);
         }
 
         /// <summary>
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 04a0db6..09b1975 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -182,11 +182,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 {
                     string url = aCircuit.ServiceURLs["AssetServerURI"].ToString();
                     m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Incoming attachment {0} for HG user {1} with asset server {2}", so.Name, so.AttachedAvatar, url);
-                    Dictionary<UUID, AssetType> ids = new Dictionary<UUID, AssetType>();
+                    Dictionary<UUID, sbyte> ids = new Dictionary<UUID, sbyte>();
                     HGUuidGatherer uuidGatherer = new HGUuidGatherer(Scene.AssetService, url);
                     uuidGatherer.GatherAssetUuids(so, ids);
 
-                    foreach (KeyValuePair<UUID, AssetType> kvp in ids)
+                    foreach (KeyValuePair<UUID, sbyte> kvp in ids)
                         uuidGatherer.FetchAsset(kvp.Key);
                 }
             }
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
index b7a4d1a..d4fb1ba 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
@@ -260,9 +260,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
             // The act of gathering UUIDs downloads some assets from the remote server
             // but not all...
-            Dictionary<UUID, AssetType> ids = new Dictionary<UUID, AssetType>();
+            Dictionary<UUID, sbyte> ids = new Dictionary<UUID, sbyte>();
             HGUuidGatherer uuidGatherer = new HGUuidGatherer(m_scene.AssetService, userAssetURL);
-            uuidGatherer.GatherAssetUuids(assetID, (AssetType)meta.Type, ids);
+            uuidGatherer.GatherAssetUuids(assetID, meta.Type, ids);
             m_log.DebugFormat("[HG ASSET MAPPER]: Preparing to get {0} assets", ids.Count);
             bool success = true;
             foreach (UUID uuid in ids.Keys)
@@ -286,9 +286,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             AssetBase asset = m_scene.AssetService.Get(assetID.ToString());
             if (asset != null)
             {
-                Dictionary<UUID, AssetType> ids = new Dictionary<UUID, AssetType>();
+                Dictionary<UUID, sbyte> ids = new Dictionary<UUID, sbyte>();
                 HGUuidGatherer uuidGatherer = new HGUuidGatherer(m_scene.AssetService, string.Empty);
-                uuidGatherer.GatherAssetUuids(asset.FullID, (AssetType)asset.Type, ids);
+                uuidGatherer.GatherAssetUuids(asset.FullID, asset.Type, ids);
                 bool success = false;
                 foreach (UUID uuid in ids.Keys)
                 {
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
index a990898..7a844f4 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
@@ -178,7 +178,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
                 // Archive the regions
 
-                Dictionary<UUID, AssetType> assetUuids = new Dictionary<UUID, AssetType>();
+                Dictionary<UUID, sbyte> assetUuids = new Dictionary<UUID, sbyte>();
 
                 scenesGroup.ForEachScene(delegate(Scene scene)
                 {
@@ -216,7 +216,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             }
         }
 
-        private void ArchiveOneRegion(Scene scene, string regionDir, Dictionary<UUID, AssetType> assetUuids)
+        private void ArchiveOneRegion(Scene scene, string regionDir, Dictionary<UUID, sbyte> assetUuids)
         {
             m_log.InfoFormat("[ARCHIVER]: Writing region {0}", scene.RegionInfo.RegionName);
 
@@ -276,16 +276,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             RegionSettings regionSettings = scene.RegionInfo.RegionSettings;
     
             if (regionSettings.TerrainTexture1 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_1)
-                assetUuids[regionSettings.TerrainTexture1] = AssetType.Texture;
+                assetUuids[regionSettings.TerrainTexture1] = (sbyte)AssetType.Texture;
                 
             if (regionSettings.TerrainTexture2 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_2)
-                assetUuids[regionSettings.TerrainTexture2] = AssetType.Texture;
+                assetUuids[regionSettings.TerrainTexture2] = (sbyte)AssetType.Texture;
                 
             if (regionSettings.TerrainTexture3 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_3)
-                assetUuids[regionSettings.TerrainTexture3] = AssetType.Texture;
+                assetUuids[regionSettings.TerrainTexture3] = (sbyte)AssetType.Texture;
                 
             if (regionSettings.TerrainTexture4 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_4)
-                assetUuids[regionSettings.TerrainTexture4] = AssetType.Texture;
+                assetUuids[regionSettings.TerrainTexture4] = (sbyte)AssetType.Texture;
 
             Save(scene, sceneObjects, regionDir);
         }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index 9600023..2d0da61 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <value>
         /// uuids to request
         /// </value>
-        protected IDictionary<UUID, AssetType> m_uuids;
+        protected IDictionary<UUID, sbyte> m_uuids;
 
         /// <value>
         /// Callback used when all the assets requested have been received.
@@ -115,7 +115,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         protected Dictionary<string, object> m_options;
 
         protected internal AssetsRequest(
-            AssetsArchiver assetsArchiver, IDictionary<UUID, AssetType> uuids, 
+            AssetsArchiver assetsArchiver, IDictionary<UUID, sbyte> uuids, 
             IAssetService assetService, IUserAccountService userService, 
             UUID scope, Dictionary<string, object> options, 
             AssetsRequestCallback assetsRequestCallback)
@@ -154,7 +154,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             m_requestCallbackTimer.Enabled = true;
 
-            foreach (KeyValuePair<UUID, AssetType> kvp in m_uuids)
+            foreach (KeyValuePair<UUID, sbyte> kvp in m_uuids)
             {
 //                m_log.DebugFormat("[ARCHIVER]: Requesting asset {0}", kvp.Key);
 
@@ -235,9 +235,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             // Check for broken asset types and fix them with the AssetType gleaned by UuidGatherer
             if (fetchedAsset != null && fetchedAsset.Type == (sbyte)AssetType.Unknown)
             {
-                AssetType type = (AssetType)assetType;
-                m_log.InfoFormat("[ARCHIVER]: Rewriting broken asset type for {0} to {1}", fetchedAsset.ID, type);
-                fetchedAsset.Type = (sbyte)type;
+                m_log.InfoFormat("[ARCHIVER]: Rewriting broken asset type for {0} to {1}", fetchedAsset.ID,  SLUtil.AssetTypeFromCode((sbyte)assetType));
+                fetchedAsset.Type = (sbyte)assetType;
             }
 
             AssetRequestCallback(fetchedAssetID, this, fetchedAsset);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
index dd27294..1e59e3f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
@@ -62,8 +62,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 = AssetHelpers.CreateAsset(corruptAssetUuid, AssetType.Notecard, "CORRUPT ASSET", UUID.Zero);
             m_assetService.Store(corruptAsset);
 
-            IDictionary<UUID, AssetType> foundAssetUuids = new Dictionary<UUID, AssetType>();
-            m_uuidGatherer.GatherAssetUuids(corruptAssetUuid, AssetType.Object, foundAssetUuids);
+            IDictionary<UUID, sbyte> foundAssetUuids = new Dictionary<UUID, sbyte>();
+            m_uuidGatherer.GatherAssetUuids(corruptAssetUuid, (sbyte)AssetType.Object, foundAssetUuids);
 
             // We count the uuid as gathered even if the asset itself is corrupt.
             Assert.That(foundAssetUuids.Count, Is.EqualTo(1));
@@ -78,9 +78,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             TestHelpers.InMethod();
             
             UUID missingAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
-            IDictionary<UUID, AssetType> foundAssetUuids = new Dictionary<UUID, AssetType>();
+            IDictionary<UUID, sbyte> foundAssetUuids = new Dictionary<UUID, sbyte>();
             
-            m_uuidGatherer.GatherAssetUuids(missingAssetUuid, AssetType.Object, foundAssetUuids);
+            m_uuidGatherer.GatherAssetUuids(missingAssetUuid, (sbyte)AssetType.Object, foundAssetUuids);
 
             // We count the uuid as gathered even if the asset itself is missing.
             Assert.That(foundAssetUuids.Count, Is.EqualTo(1));
@@ -103,8 +103,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             AssetBase ncAsset = AssetHelpers.CreateNotecardAsset(ncAssetId, soAssetId.ToString());
             m_assetService.Store(ncAsset);
 
-            IDictionary<UUID, AssetType> foundAssetUuids = new Dictionary<UUID, AssetType>();
-            m_uuidGatherer.GatherAssetUuids(ncAssetId, AssetType.Notecard, foundAssetUuids);
+            IDictionary<UUID, sbyte> foundAssetUuids = new Dictionary<UUID, sbyte>();
+            m_uuidGatherer.GatherAssetUuids(ncAssetId, (sbyte)AssetType.Notecard, foundAssetUuids);
 
             // We count the uuid as gathered even if the asset itself is corrupt.
             Assert.That(foundAssetUuids.Count, Is.EqualTo(2));
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 3e074b9..42a1977 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -38,6 +38,7 @@ using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Services.Interfaces;
+using OpenSimAssetType = OpenSim.Framework.SLUtil.OpenSimAssetType;
 
 namespace OpenSim.Region.Framework.Scenes
 {
@@ -83,7 +84,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="assetUuid">The uuid of the asset for which to gather referenced assets</param>
         /// <param name="assetType">The type of the asset for the uuid given</param>
         /// <param name="assetUuids">The assets gathered</param>
-        public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, AssetType> assetUuids)
+        public void GatherAssetUuids(UUID assetUuid, sbyte assetType, IDictionary<UUID, sbyte> assetUuids)
         {
             // avoid infinite loops
             if (assetUuids.ContainsKey(assetUuid))
@@ -93,23 +94,27 @@ namespace OpenSim.Region.Framework.Scenes
             {               
                 assetUuids[assetUuid] = assetType;
     
-                if (AssetType.Bodypart == assetType || AssetType.Clothing == assetType)
+                if ((sbyte)AssetType.Bodypart == assetType || (sbyte)AssetType.Clothing == assetType)
                 {
                     GetWearableAssetUuids(assetUuid, assetUuids);
                 }
-                else if (AssetType.Gesture == assetType)
+                else if ((sbyte)AssetType.Gesture == assetType)
                 {
                     GetGestureAssetUuids(assetUuid, assetUuids);
                 }
-                else if (AssetType.Notecard == assetType)
+                else if ((sbyte)AssetType.Notecard == assetType)
                 {
                     GetTextEmbeddedAssetUuids(assetUuid, assetUuids);
                 }
-                else if (AssetType.LSLText == assetType)
+                else if ((sbyte)AssetType.LSLText == assetType)
                 {
                     GetTextEmbeddedAssetUuids(assetUuid, assetUuids);
                 }
-                else if (AssetType.Object == assetType)
+                else if ((sbyte)OpenSimAssetType.Material == assetType)
+                {
+                    GetMaterialAssetUuids(assetUuid, assetUuids);
+                }
+                else if ((sbyte)AssetType.Object == assetType)
                 {
                     GetSceneObjectAssetUuids(assetUuid, assetUuids);
                 }
@@ -136,7 +141,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// A dictionary which is populated with the asset UUIDs gathered and the type of that asset.
         /// For assets where the type is not clear (e.g. UUIDs extracted from LSL and notecards), the type is Unknown.
         /// </param>
-        public void GatherAssetUuids(SceneObjectGroup sceneObject, IDictionary<UUID, AssetType> assetUuids)
+        public void GatherAssetUuids(SceneObjectGroup sceneObject, IDictionary<UUID, sbyte> assetUuids)
         {
 //            m_log.DebugFormat(
 //                "[ASSET GATHERER]: Getting assets for object {0}, {1}", sceneObject.Name, sceneObject.UUID);
@@ -156,7 +161,7 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         // Get the prim's default texture.  This will be used for faces which don't have their own texture
                         if (textureEntry.DefaultTexture != null)
-                            assetUuids[textureEntry.DefaultTexture.TextureID] = AssetType.Texture;
+                            assetUuids[textureEntry.DefaultTexture.TextureID] = (sbyte)AssetType.Texture;
 
                         if (textureEntry.FaceTextures != null)
                         {
@@ -164,20 +169,20 @@ namespace OpenSim.Region.Framework.Scenes
                             foreach (Primitive.TextureEntryFace texture in textureEntry.FaceTextures)
                             {
                                 if (texture != null)
-                                    assetUuids[texture.TextureID] = AssetType.Texture;
+                                    assetUuids[texture.TextureID] = (sbyte)AssetType.Texture;
                             }
                         }
                     }
                     
                     // If the prim is a sculpt then preserve this information too
                     if (part.Shape.SculptTexture != UUID.Zero)
-                        assetUuids[part.Shape.SculptTexture] = AssetType.Texture;
+                        assetUuids[part.Shape.SculptTexture] = (sbyte)AssetType.Texture;
 
                     if (part.Shape.ProjectionTextureUUID != UUID.Zero)
-                        assetUuids[part.Shape.ProjectionTextureUUID] = AssetType.Texture;
+                        assetUuids[part.Shape.ProjectionTextureUUID] = (sbyte)AssetType.Texture;
 
                     if (part.CollisionSound != UUID.Zero)
-                        assetUuids[part.CollisionSound] = AssetType.Sound;
+                        assetUuids[part.CollisionSound] = (sbyte)AssetType.Sound;
 
                     if (part.ParticleSystem.Length > 0)
                     {
@@ -185,7 +190,7 @@ namespace OpenSim.Region.Framework.Scenes
                         {
                             Primitive.ParticleSystem ps = new Primitive.ParticleSystem(part.ParticleSystem, 0);
                             if (ps.Texture != UUID.Zero)
-                                assetUuids[ps.Texture] = AssetType.Texture;
+                                assetUuids[ps.Texture] = (sbyte)AssetType.Texture;
                         }
                         catch (Exception e)
                         {
@@ -205,7 +210,7 @@ namespace OpenSim.Region.Framework.Scenes
 //                            tii.Name, tii.Type, part.Name, part.UUID);
 
                         if (!assetUuids.ContainsKey(tii.AssetID))
-                            GatherAssetUuids(tii.AssetID, (AssetType)tii.Type, assetUuids);
+                            GatherAssetUuids(tii.AssetID, (sbyte)tii.Type, assetUuids);
                     }
 
                     // FIXME: We need to make gathering modular but we cannot yet, since gatherers are not guaranteed
@@ -213,8 +218,6 @@ namespace OpenSim.Region.Framework.Scenes
                     // 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)
                 {
@@ -225,7 +228,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
         }
-        
+
 //        /// <summary>
 //        /// The callback made when we request the asset for an object from the asset service.
 //        /// </summary>
@@ -238,73 +241,6 @@ namespace OpenSim.Region.Framework.Scenes
 //                Monitor.Pulse(this);
 //            }
 //        }
-
-        /// <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
@@ -344,7 +280,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="scriptUuid"></param>
         /// <param name="assetUuids">Dictionary in which to record the references</param>
-        private void GetTextEmbeddedAssetUuids(UUID embeddingAssetId, IDictionary<UUID, AssetType> assetUuids)
+        private void GetTextEmbeddedAssetUuids(UUID embeddingAssetId, IDictionary<UUID, sbyte> assetUuids)
         {
 //            m_log.DebugFormat("[ASSET GATHERER]: Getting assets for uuid references in asset {0}", embeddingAssetId);
 
@@ -364,7 +300,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     // Embedded asset references (if not false positives) could be for many types of asset, so we will
                     // label these as unknown.
-                    assetUuids[uuid] = AssetType.Unknown;
+                    assetUuids[uuid] = (sbyte)AssetType.Unknown;
                 }
             }
         }
@@ -374,7 +310,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="wearableAssetUuid"></param>
         /// <param name="assetUuids">Dictionary in which to record the references</param>
-        private void GetWearableAssetUuids(UUID wearableAssetUuid, IDictionary<UUID, AssetType> assetUuids)
+        private void GetWearableAssetUuids(UUID wearableAssetUuid, IDictionary<UUID, sbyte> assetUuids)
         {
             AssetBase assetBase = GetAsset(wearableAssetUuid);
 
@@ -389,7 +325,7 @@ namespace OpenSim.Region.Framework.Scenes
     
                 foreach (UUID uuid in wearableAsset.Textures.Values)
                 {
-                    assetUuids[uuid] = AssetType.Texture;
+                    assetUuids[uuid] = (sbyte)AssetType.Texture;
                 }
             }
         }
@@ -401,7 +337,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="sceneObject"></param>
         /// <param name="assetUuids"></param>
-        private void GetSceneObjectAssetUuids(UUID sceneObjectUuid, IDictionary<UUID, AssetType> assetUuids)
+        private void GetSceneObjectAssetUuids(UUID sceneObjectUuid, IDictionary<UUID, sbyte> assetUuids)
         {
             AssetBase objectAsset = GetAsset(sceneObjectUuid);
 
@@ -430,7 +366,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="gestureUuid"></param>
         /// <param name="assetUuids"></param>
-        private void GetGestureAssetUuids(UUID gestureUuid, IDictionary<UUID, AssetType> assetUuids)
+        private void GetGestureAssetUuids(UUID gestureUuid, IDictionary<UUID, sbyte> assetUuids)
         {
             AssetBase assetBase = GetAsset(gestureUuid);
             if (null == assetBase)
@@ -464,9 +400,29 @@ namespace OpenSim.Region.Framework.Scenes
                 // If it can be parsed as a UUID, it is an asset ID
                 UUID uuid;
                 if (UUID.TryParse(id, out uuid))
-                    assetUuids[uuid] = AssetType.Animation;
+                    assetUuids[uuid] = (sbyte)AssetType.Animation;
             }
         }
+
+        /// <summary>
+        /// Get the asset uuid's referenced in a material.
+        /// </summary>
+        private void GetMaterialAssetUuids(UUID materialUuid, IDictionary<UUID, sbyte> assetUuids)
+        {
+            AssetBase assetBase = GetAsset(materialUuid);
+            if (null == assetBase)
+                return;
+
+            OSDMap mat = (OSDMap)OSDParser.DeserializeLLSDXml(assetBase.Data);
+
+            UUID normMap = mat["NormMap"].AsUUID();
+            if (normMap != UUID.Zero)
+                assetUuids[normMap] = (sbyte)AssetType.Texture;
+
+            UUID specMap = mat["SpecMap"].AsUUID();
+            if (specMap != UUID.Zero)
+                assetUuids[specMap] = (sbyte)AssetType.Texture;
+        }
     }
 
     public class HGUuidGatherer : UuidGatherer
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index e707154..09041e8 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -42,77 +42,49 @@ using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSimAssetType = OpenSim.Framework.SLUtil.OpenSimAssetType;
 
 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: Addin("MaterialsModule", "1.0")]
 //[assembly: AddinDependency("OpenSim", "0.5")]
 
-namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
+namespace OpenSim.Region.OptionalModules.Materials
 {
-    /// <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
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MaterialsModule")]
+    public class MaterialsModule : INonSharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public string Name { get { return "MaterialsDemoModule"; } }        
+        public string Name { get { return "MaterialsModule"; } }        
         
         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 Dictionary<UUID, OSDMap> m_regionMaterials = new Dictionary<UUID, OSDMap>();
         
         public void Initialise(IConfigSource source)
         {
-            m_enabled = (source.Configs["MaterialsDemoModule"] != null);
+            IConfig config = source.Configs["Materials"];
+            if (config == null)
+                return;
+
+            m_enabled = config.GetBoolean("enable_materials", true);
             if (!m_enabled)
                 return;
 
-            m_log.DebugFormat("[MaterialsDemoModule]: Initialized");
+            m_log.DebugFormat("[Materials]: Initialized");
         }
         
         public void Close()
         {
             if (!m_enabled)
                 return;
-
-            //m_log.DebugFormat("[MaterialsDemoModule]: CLOSED MODULE");
         }
         
         public void AddRegion(Scene scene)
@@ -120,22 +92,19 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             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)
+        private void EventManager_OnObjectAddedToScene(SceneObjectGroup obj)
         {
             foreach (var part in obj.Parts)
                 if (part != null)
-                    GetStoredMaterialsForPart(part);
+                    GetStoredMaterialsInPart(part);
         }
 
-        void OnRegisterCaps(OpenMetaverse.UUID agentID, OpenSim.Framework.Capabilities.Caps caps)
+        private void OnRegisterCaps(OpenMetaverse.UUID agentID, OpenSim.Framework.Capabilities.Caps caps)
         {
             string capsBase = "/CAPS/" + caps.CapsObjectPath;
 
@@ -164,143 +133,65 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
 
             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)
+        /// <summary>
+        /// Find the materials used in the SOP, and add them to 'm_regionMaterials'.
+        /// </summary>
+        private void GetStoredMaterialsInPart(SceneObjectPart part)
         { 
-            OSD OSMaterials = null;
-            OSDArray matsArr = null;
-
-            if (part.DynAttrs == null)
-            {
-                //m_log.Warn("[MaterialsDemoModule]: NULL DYNATTRS :( ");
+            if (part.Shape == null)
                 return;
-            }
-
-            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 :( ");
+            var te = new Primitive.TextureEntry(part.Shape.TextureEntry, 0, part.Shape.TextureEntry.Length);
+            if (te == null)
                 return;
-            }
 
-            foreach (OSD elemOsd in matsArr)
+            GetStoredMaterialInFace(part, te.DefaultTexture);
+
+            foreach (Primitive.TextureEntryFace face in te.FaceTextures)
             {
-                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);
-                        }
-                    }
-                }
+                if (face != null)
+                    GetStoredMaterialInFace(part, face);
             }
         }
 
-        void StoreMaterialsForPart(SceneObjectPart part)
+        /// <summary>
+        /// Find the materials used in one Face, and add them to 'm_regionMaterials'.
+        /// </summary>
+        private void GetStoredMaterialInFace(SceneObjectPart part, Primitive.TextureEntryFace face)
         {
-            try
+            UUID id = face.MaterialID;
+            if (id == UUID.Zero)
+                return;
+
+            lock (m_regionMaterials)
             {
-                if (part == null || part.Shape == null)
+                if (m_regionMaterials.ContainsKey(id))
                     return;
-
-                Dictionary<UUID, OSDMap> mats = new Dictionary<UUID, OSDMap>();
-
-                Primitive.TextureEntry te = part.Shape.Textures;
-
-                if (te.DefaultTexture != null)
+                
+                byte[] data = m_scene.AssetService.GetData(id.ToString());
+                if (data == null)
                 {
-                    lock (m_knownMaterials)
-                    {
-                        if (m_knownMaterials.ContainsKey(te.DefaultTexture.MaterialID))
-                            mats[te.DefaultTexture.MaterialID] = m_knownMaterials[te.DefaultTexture.MaterialID];
-                    }
+                    m_log.WarnFormat("[Materials]: Prim \"{0}\" ({1}) contains unknown material ID {2}", part.Name, part.UUID, id);
+                    return;
                 }
 
-                if (te.FaceTextures != null)
+                OSDMap mat;
+                try
                 {
-                    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];
-                            }
-                        }
-                    }
+                    mat = (OSDMap)OSDParser.DeserializeLLSDXml(data);
                 }
-                if (mats.Count == 0)
-                    return;
-
-                OSDArray matsArr = new OSDArray();
-                foreach (KeyValuePair<UUID, OSDMap> kvp in mats)
+                catch (Exception e)
                 {
-                    OSDMap matOsd = new OSDMap();
-                    matOsd["ID"] = OSD.FromUUID(kvp.Key);
-                    matOsd["Material"] = kvp.Value;
-                    matsArr.Add(matOsd);
+                    m_log.WarnFormat("[Materials]: cannot decode material asset {0}: {1}", id, e.Message);
+                    return;
                 }
 
-                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);
+                m_regionMaterials[id] = mat;
             }
         }
 
@@ -308,8 +199,6 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                 string param, IOSHttpRequest httpRequest,
                 IOSHttpResponse httpResponse)
         {
-            //m_log.Debug("[MaterialsDemoModule]: POST cap handler");
-
             OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
             OSDMap resp = new OSDMap();
 
@@ -333,34 +222,38 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                         {
                             foreach (OSD elem in (OSDArray)osd)
                             {
-
                                 try
                                 {
                                     UUID id = new UUID(elem.AsBinary(), 0);
 
-                                    lock (m_knownMaterials)
+                                    lock (m_regionMaterials)
                                     {
-                                        if (m_knownMaterials.ContainsKey(id))
+                                        if (m_regionMaterials.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];
+                                            matMap["Material"] = m_regionMaterials[id];
                                             respArr.Add(matMap);
                                         }
                                         else
-                                            m_log.Info("[MaterialsDemoModule]: request for UNKNOWN material ID: " + id.ToString());
+                                        {
+                                            m_log.Warn("[Materials]: request for unknown material ID: " + id.ToString());
+
+                                            // Theoretically we could try to load the material from the assets service,
+                                            // but that shouldn't be necessary because the viewer should only request
+                                            // materials that exist in a prim on the region, and all of these materials
+                                            // are already stored in m_regionMaterials.
+                                        }
                                     }
                                 }
                                 catch (Exception e)
                                 {
-                                    // report something here?
+                                    m_log.Error("Error getting materials in response to viewer request", e);
                                     continue;
                                 }
                             }
                         }
-                        else if (osd is OSDMap) // reqest to assign a material
+                        else if (osd is OSDMap) // request to assign a material
                         {
                             materialsFromViewer = osd as OSDMap;
 
@@ -375,94 +268,118 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                                     {
                                         foreach (OSDMap matsMap in matsArr)
                                         {
-                                            //m_log.Debug("[MaterialsDemoModule]: processing matsMap: " + OSDParser.SerializeJsonString(matsMap));
-
                                             uint primLocalID = 0;
-                                            try { primLocalID = matsMap["ID"].AsUInteger(); }
-                                            catch (Exception e) { m_log.Warn("[MaterialsDemoModule]: cannot decode \"ID\" from matsMap: " + e.Message); }
-                                            //m_log.Debug("[MaterialsDemoModule]: primLocalID: " + primLocalID.ToString());
+                                            try {
+                                                primLocalID = matsMap["ID"].AsUInteger();
+                                            }
+                                            catch (Exception e) {
+                                                m_log.Warn("[Materials]: cannot decode \"ID\" from matsMap: " + e.Message);
+                                                continue;
+                                            }
 
                                             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));
+                                            try
+                                            {
+                                                mat = matsMap["Material"] as OSDMap;
+                                            }
+                                            catch (Exception e)
+                                            {
+                                                m_log.Warn("[Materials]: cannot decode \"Material\" from matsMap: " + e.Message);
+                                                continue;
+                                            }
+
+                                            SceneObjectPart sop = m_scene.GetSceneObjectPart(primLocalID);
+                                            if (sop == null)
+                                            {
+                                                m_log.WarnFormat("[Materials]: SOP not found for localId: {0}", primLocalID.ToString());
+                                                continue;
+                                            }
+
+                                            Primitive.TextureEntry te = new Primitive.TextureEntry(sop.Shape.TextureEntry, 0, sop.Shape.TextureEntry.Length);
+                                            if (te == null)
+                                            {
+                                                m_log.WarnFormat("[Materials]: Error in TextureEntry for SOP {0} {1}", sop.Name, sop.UUID);
+                                                continue;
+                                            }
+
 
                                             UUID id;
                                             if (mat == null)
                                             {
+                                                // This happens then the user removes a material from a prim
                                                 id = UUID.Zero;
                                             }
                                             else
                                             {
-                                                id = HashOsd(mat);
-                                                lock (m_knownMaterials)
-                                                    m_knownMaterials[id] = mat;
+                                                // Material UUID = hash of the material's data.
+                                                // This makes materials deduplicate across the entire grid (but isn't otherwise required).
+                                                byte[] data = System.Text.Encoding.ASCII.GetBytes(OSDParser.SerializeLLSDXmlString(mat));
+                                                using (var md5 = MD5.Create())
+                                                    id = new UUID(md5.ComputeHash(data), 0);
+
+                                                lock (m_regionMaterials)
+                                                {
+                                                    if (!m_regionMaterials.ContainsKey(id))
+                                                    {
+                                                        m_regionMaterials[id] = mat;
+
+                                                        // This asset might exist already, but it's ok to try to store it again
+                                                        string name = "Material " + ChooseMaterialName(mat, sop);
+                                                        name = name.Substring(0, Math.Min(64, name.Length)).Trim();
+                                                        AssetBase asset = new AssetBase(id, name, (sbyte)OpenSimAssetType.Material, sop.OwnerID.ToString());
+                                                        asset.Data = data;
+                                                        m_scene.AssetService.Store(asset);
+                                                    }
+                                                }
                                             }
 
-                                            var sop = m_scene.GetSceneObjectPart(primLocalID);
-                                            if (sop == null)
-                                                m_log.Debug("[MaterialsDemoModule]: null SOP for localId: " + primLocalID.ToString());
-                                            else
-                                            {
-                                                var te = new Primitive.TextureEntry(sop.Shape.TextureEntry, 0, sop.Shape.TextureEntry.Length);
 
-                                                if (te == null)
+                                            int face = -1;
+
+                                            if (matsMap.ContainsKey("Face"))
+                                            {
+                                                face = matsMap["Face"].AsInteger();
+                                                if (te.FaceTextures == null) // && face == 0)
                                                 {
-                                                    m_log.Debug("[MaterialsDemoModule]: null TextureEntry for localId: " + primLocalID.ToString());
+                                                    if (te.DefaultTexture == null)
+                                                        m_log.WarnFormat("[Materials]: te.DefaultTexture is null in {0} {1}", sop.Name, sop.UUID);
+                                                    else
+                                                        te.DefaultTexture.MaterialID = id;
                                                 }
                                                 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.FaceTextures.Length >= face - 1)
                                                     {
-                                                        if (te.DefaultTexture != null)
+                                                        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.DebugFormat("[MaterialsDemoModule]: in \"{0}\", setting material ID for face {1} to {2}", sop.Name, face, id);
-
-                                                    //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;
+                                            //m_log.DebugFormat("[Materials]: in \"{0}\" {1}, setting material ID for face {2} to {3}", sop.Name, sop.UUID, face, id);
 
-                                                        sop.ScheduleFullUpdate();
+                                            // We can't use sop.UpdateTextureEntry(te) because it filters, so do it manually
+                                            sop.Shape.TextureEntry = te.GetBytes();
 
-                                                        StoreMaterialsForPart(sop);
-                                                    }
-                                                }
+                                            if (sop.ParentGroup != null)
+                                            {
+                                                sop.TriggerScriptChangedEvent(Changed.TEXTURE);
+                                                sop.UpdateFlag = UpdateRequired.FULL;
+                                                sop.ParentGroup.HasGroupChanged = true;
+                                                sop.ScheduleFullUpdate();
                                             }
                                         }
                                     }
                                     catch (Exception e)
                                     {
-                                        m_log.Warn("[MaterialsDemoModule]: exception processing received material ", e);
+                                        m_log.Warn("[Materials]: exception processing received material ", e);
                                     }
                                 }
                             }
@@ -472,36 +389,63 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                 }
                 catch (Exception e)
                 {
-                    m_log.Warn("[MaterialsDemoModule]: exception decoding zipped CAP payload ", e);
+                    m_log.Warn("[Materials]: exception decoding zipped CAP payload ", e);
                     //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);
+            //m_log.Debug("[Materials]: cap request: " + request);
+            //m_log.Debug("[Materials]: cap request (zipped portion): " + ZippedOsdBytesToString(req["Zipped"].AsBinary()));
+            //m_log.Debug("[Materials]: cap response: " + response);
             return response;
         }
 
+        /// <summary>
+        /// Use heuristics to choose a good name for the material.
+        /// </summary>
+        private string ChooseMaterialName(OSDMap mat, SceneObjectPart sop)
+        {
+            UUID normMap = mat["NormMap"].AsUUID();
+            if (normMap != UUID.Zero)
+            {
+                AssetBase asset = m_scene.AssetService.GetCached(normMap.ToString());
+                if ((asset != null) && (asset.Name.Length > 0) && !asset.Name.Equals("From IAR"))
+                    return asset.Name;
+            }
+
+            UUID specMap = mat["SpecMap"].AsUUID();
+            if (specMap != UUID.Zero)
+            {
+                AssetBase asset = m_scene.AssetService.GetCached(specMap.ToString());
+                if ((asset != null) && (asset.Name.Length > 0) && !asset.Name.Equals("From IAR"))
+                    return asset.Name;
+            }
+
+            if (sop.Name != "Primitive")
+                return sop.Name;
+            
+            if ((sop.ParentGroup != null) && (sop.ParentGroup.Name != "Primitive"))
+                return sop.ParentGroup.Name;
+
+            return "";
+        }
+
 
         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)
+            lock (m_regionMaterials)
             {
-                foreach (KeyValuePair<UUID, OSDMap> kvp in m_knownMaterials)
+                foreach (KeyValuePair<UUID, OSDMap> kvp in m_regionMaterials)
                 {
                     OSDMap matMap = new OSDMap();
 
@@ -513,12 +457,11 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             }
 
             resp["Zipped"] = ZCompressOSD(allOsd, false);
-            //m_log.Debug("[MaterialsDemoModule]: matsCount: " + matsCount.ToString());
 
             return OSDParser.SerializeLLSDXmlString(resp);
         }
 
-        static string ZippedOsdBytesToString(byte[] bytes)
+        private static string ZippedOsdBytesToString(byte[] bytes)
         {
             try
             {
@@ -537,26 +480,27 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
         /// <returns></returns>
         private static UUID HashOsd(OSD osd)
         {
+            byte[] data = OSDParser.SerializeLLSDBinary(osd, false);
             using (var md5 = MD5.Create())
-                using (MemoryStream ms = new MemoryStream(OSDParser.SerializeLLSDBinary(osd, false)))
-                    return new UUID(md5.ComputeHash(ms), 0);
+                return new UUID(md5.ComputeHash(data), 0);
         }
 
         public static OSD ZCompressOSD(OSD inOsd, bool useHeader)
         {
             OSD osd = null;
 
+            byte[] data = OSDParser.SerializeLLSDBinary(inOsd, useHeader);
+
             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();
+                    zOut.Write(data, 0, data.Length);
                 }
 
                 msSinkCompressed.Seek(0L, SeekOrigin.Begin);
-                osd = OSD.FromBinary( msSinkCompressed.ToArray());
+                osd = OSD.FromBinary(msSinkCompressed.ToArray());
             }
 
             return osd;
@@ -571,94 +515,14 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
             {
                 using (Ionic.Zlib.ZlibStream zOut = new Ionic.Zlib.ZlibStream(msSinkUnCompressed, CompressionMode.Decompress, true))
                 {
-                    CopyStream(new MemoryStream(input), zOut);
-                    zOut.Close();
+                    zOut.Write(input, 0, input.Length);
                 }
+
                 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);
-//                            }
-//                        }
-//                    }
-//                }
-//            }
-//        }
     }
 }
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 28c16cf..28369a3 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -691,6 +691,12 @@
     ; enable_windlight = false
 
 
+[Materials]
+    ;# {enable_materials} {} {Enable Materials support?} {true false} true
+    ;; This enables the use of Materials.
+    ; enable_materials = true
+
+
 [DataSnapshot]
     ;# {index_sims} {} {Enable data snapshotting (search)?} {true false} false
     ;; The following set of configs pertains to search.
-- 
cgit v1.1


From 68d83425c6b39614210b28e97d5006a882ea3097 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Thu, 12 Dec 2013 15:14:24 +0200
Subject: When asked to change the Material for one face, change only that
 face; not the default material

---
 .../OptionalModules/Materials/MaterialsModule.cs   | 23 +++++-----------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index 09041e8..9779594 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -339,27 +339,14 @@ namespace OpenSim.Region.OptionalModules.Materials
                                             if (matsMap.ContainsKey("Face"))
                                             {
                                                 face = matsMap["Face"].AsInteger();
-                                                if (te.FaceTextures == null) // && face == 0)
-                                                {
-                                                    if (te.DefaultTexture == null)
-                                                        m_log.WarnFormat("[Materials]: te.DefaultTexture is null in {0} {1}", sop.Name, sop.UUID);
-                                                    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;
-                                                    }
-                                                }
+                                                Primitive.TextureEntryFace faceEntry = te.CreateFace((uint)face);
+                                                faceEntry.MaterialID = id;
                                             }
                                             else
                                             {
-                                                if (te.DefaultTexture != null)
+                                                if (te.DefaultTexture == null)
+                                                    m_log.WarnFormat("[Materials]: TextureEntry.DefaultTexture is null in {0} {1}", sop.Name, sop.UUID);
+                                                else
                                                     te.DefaultTexture.MaterialID = id;
                                             }
 
-- 
cgit v1.1


From d1f16c4b4b3f5c0938f3f0572c70e92cb90b6a0b Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Sun, 5 Jan 2014 14:03:10 +0200
Subject: Check agent permissions before modifying an object's materials. Also,
 when creating a Material asset, set the current agent as the Creator.

---
 .../OptionalModules/Materials/MaterialsModule.cs   | 31 +++++++++++++++-------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index 9779594..4b635d8 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -109,7 +109,10 @@ namespace OpenSim.Region.OptionalModules.Materials
             string capsBase = "/CAPS/" + caps.CapsObjectPath;
 
             IRequestHandler renderMaterialsPostHandler 
-                = new RestStreamHandler("POST", capsBase + "/", RenderMaterialsPostCap, "RenderMaterials", null);
+                = new RestStreamHandler("POST", capsBase + "/",
+                    (request, path, param, httpRequest, httpResponse)
+                        => RenderMaterialsPostCap(request, agentID),
+                    "RenderMaterials", null);
             caps.RegisterHandler("RenderMaterials", renderMaterialsPostHandler);
 
             // OpenSimulator CAPs infrastructure seems to be somewhat hostile towards any CAP that requires both GET
@@ -117,12 +120,18 @@ namespace OpenSim.Region.OptionalModules.Materials
             // handler normally and then add a GET handler via MainServer
 
             IRequestHandler renderMaterialsGetHandler 
-                = new RestStreamHandler("GET", capsBase + "/", RenderMaterialsGetCap, "RenderMaterials", null);
+                = new RestStreamHandler("GET", capsBase + "/",
+                    (request, path, param, httpRequest, httpResponse)
+                        => RenderMaterialsGetCap(request),
+                    "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);
+                = new RestStreamHandler("PUT", capsBase + "/",
+                    (request, path, param, httpRequest, httpResponse)
+                        => RenderMaterialsPostCap(request, agentID),
+                    "RenderMaterials", null);
             MainServer.Instance.AddStreamHandler(renderMaterialsPutHandler);
         }
         
@@ -195,9 +204,7 @@ namespace OpenSim.Region.OptionalModules.Materials
             }
         }
 
-        public string RenderMaterialsPostCap(string request, string path,
-                string param, IOSHttpRequest httpRequest,
-                IOSHttpResponse httpResponse)
+        public string RenderMaterialsPostCap(string request, UUID agentID)
         {
             OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
             OSDMap resp = new OSDMap();
@@ -295,6 +302,12 @@ namespace OpenSim.Region.OptionalModules.Materials
                                                 continue;
                                             }
 
+                                            if (!m_scene.Permissions.CanEditObject(sop.UUID, agentID))
+                                            {
+                                                m_log.WarnFormat("User {0} can't edit object {1} {2}", agentID, sop.Name, sop.UUID);
+                                                continue;
+                                            }
+
                                             Primitive.TextureEntry te = new Primitive.TextureEntry(sop.Shape.TextureEntry, 0, sop.Shape.TextureEntry.Length);
                                             if (te == null)
                                             {
@@ -326,7 +339,7 @@ namespace OpenSim.Region.OptionalModules.Materials
                                                         // This asset might exist already, but it's ok to try to store it again
                                                         string name = "Material " + ChooseMaterialName(mat, sop);
                                                         name = name.Substring(0, Math.Min(64, name.Length)).Trim();
-                                                        AssetBase asset = new AssetBase(id, name, (sbyte)OpenSimAssetType.Material, sop.OwnerID.ToString());
+                                                        AssetBase asset = new AssetBase(id, name, (sbyte)OpenSimAssetType.Material, agentID.ToString());
                                                         asset.Data = data;
                                                         m_scene.AssetService.Store(asset);
                                                     }
@@ -422,9 +435,7 @@ namespace OpenSim.Region.OptionalModules.Materials
         }
 
 
-        public string RenderMaterialsGetCap(string request, string path,
-                string param, IOSHttpRequest httpRequest,
-                IOSHttpResponse httpResponse)
+        public string RenderMaterialsGetCap(string request)
         {
             OSDMap resp = new OSDMap();
             int matsCount = 0;
-- 
cgit v1.1


From 28723beb0ccec654ac24ee1632b137b424fd3360 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Mon, 20 Jan 2014 02:57:08 -0800
Subject: Add code to convert legacy materials stored in DynAttrs to new asset
 format and store them as assets

---
 .../OptionalModules/Materials/MaterialsModule.cs   | 122 +++++++++++++++++----
 1 file changed, 102 insertions(+), 20 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index 4b635d8..1b5a7a3 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -149,12 +149,87 @@ namespace OpenSim.Region.OptionalModules.Materials
         }
 
         /// <summary>
+        /// Searches the part for any legacy materials stored in DynAttrs and converts them to assets, replacing
+        /// the MaterialIDs in the TextureEntries for the part.
+        /// Deletes the legacy materials from the part as they are no longer needed.
+        /// </summary>
+        /// <param name="part"></param>
+        private void ConvertLegacyMaterialsInPart(SceneObjectPart part)
+        {
+            if (part.DynAttrs == null)
+                return;
+
+            var te = new Primitive.TextureEntry(part.Shape.TextureEntry, 0, part.Shape.TextureEntry.Length);
+            if (te == null)
+                return;
+
+            OSD OSMaterials = null;
+            OSDArray matsArr = 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 OSMaterials);
+                }
+
+                if (OSMaterials != null && OSMaterials is OSDArray)
+                    matsArr = OSMaterials as OSDArray;
+                else
+                    return;
+            }
+
+            if (matsArr == 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"))
+                    {
+                        UUID id = matMap["ID"].AsUUID();
+                        OSDMap material = (OSDMap)matMap["Material"];
+                        bool used = false;
+
+                        foreach (var face in te.FaceTextures)
+                            if (face.MaterialID == id)
+                                used = true;
+
+                        if (used)
+                        { // store legacy material in new asset format, and update the part texture entry with the new hashed UUID
+
+                            var newId = StoreMaterialAsAsset(part.CreatorID, material, part);
+                            foreach (var face in te.FaceTextures)
+                                if (face.MaterialID == id)
+                                    face.MaterialID = newId;
+                        }
+                    }
+                }
+            }
+
+            part.Shape.TextureEntry = te.GetBytes();
+
+            lock (part.DynAttrs)
+                part.DynAttrs.RemoveStore("OpenSim", "Materials");
+        }
+
+        /// <summary>
         /// Find the materials used in the SOP, and add them to 'm_regionMaterials'.
         /// </summary>
         private void GetStoredMaterialsInPart(SceneObjectPart part)
         { 
             if (part.Shape == null)
                 return;
+
+            ConvertLegacyMaterialsInPart(part);
+
             var te = new Primitive.TextureEntry(part.Shape.TextureEntry, 0, part.Shape.TextureEntry.Length);
             if (te == null)
                 return;
@@ -324,26 +399,7 @@ namespace OpenSim.Region.OptionalModules.Materials
                                             }
                                             else
                                             {
-                                                // Material UUID = hash of the material's data.
-                                                // This makes materials deduplicate across the entire grid (but isn't otherwise required).
-                                                byte[] data = System.Text.Encoding.ASCII.GetBytes(OSDParser.SerializeLLSDXmlString(mat));
-                                                using (var md5 = MD5.Create())
-                                                    id = new UUID(md5.ComputeHash(data), 0);
-
-                                                lock (m_regionMaterials)
-                                                {
-                                                    if (!m_regionMaterials.ContainsKey(id))
-                                                    {
-                                                        m_regionMaterials[id] = mat;
-
-                                                        // This asset might exist already, but it's ok to try to store it again
-                                                        string name = "Material " + ChooseMaterialName(mat, sop);
-                                                        name = name.Substring(0, Math.Min(64, name.Length)).Trim();
-                                                        AssetBase asset = new AssetBase(id, name, (sbyte)OpenSimAssetType.Material, agentID.ToString());
-                                                        asset.Data = data;
-                                                        m_scene.AssetService.Store(asset);
-                                                    }
-                                                }
+                                                id = StoreMaterialAsAsset(agentID, mat, sop);
                                             }
 
 
@@ -404,6 +460,32 @@ namespace OpenSim.Region.OptionalModules.Materials
             return response;
         }
 
+        private UUID StoreMaterialAsAsset(UUID agentID, OSDMap mat, SceneObjectPart sop)
+        {
+            UUID id;
+            // Material UUID = hash of the material's data.
+            // This makes materials deduplicate across the entire grid (but isn't otherwise required).
+            byte[] data = System.Text.Encoding.ASCII.GetBytes(OSDParser.SerializeLLSDXmlString(mat));
+            using (var md5 = MD5.Create())
+                id = new UUID(md5.ComputeHash(data), 0);
+
+            lock (m_regionMaterials)
+            {
+                if (!m_regionMaterials.ContainsKey(id))
+                {
+                    m_regionMaterials[id] = mat;
+
+                    // This asset might exist already, but it's ok to try to store it again
+                    string name = "Material " + ChooseMaterialName(mat, sop);
+                    name = name.Substring(0, Math.Min(64, name.Length)).Trim();
+                    AssetBase asset = new AssetBase(id, name, (sbyte)OpenSimAssetType.Material, agentID.ToString());
+                    asset.Data = data;
+                    m_scene.AssetService.Store(asset);
+                }
+            }
+            return id;
+        }
+
         /// <summary>
         /// Use heuristics to choose a good name for the material.
         /// </summary>
-- 
cgit v1.1


From 95c926b2cd8585dd5b84ad7827d21b6122ea1001 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Mon, 20 Jan 2014 03:02:30 -0800
Subject: delay texture entry parsing until absolutely necessary while
 converting legacy materials

---
 OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index 1b5a7a3..d8ec979 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -159,10 +159,6 @@ namespace OpenSim.Region.OptionalModules.Materials
             if (part.DynAttrs == null)
                 return;
 
-            var te = new Primitive.TextureEntry(part.Shape.TextureEntry, 0, part.Shape.TextureEntry.Length);
-            if (te == null)
-                return;
-
             OSD OSMaterials = null;
             OSDArray matsArr = null;
 
@@ -187,6 +183,10 @@ namespace OpenSim.Region.OptionalModules.Materials
             if (matsArr == null)
                 return;
 
+            var te = new Primitive.TextureEntry(part.Shape.TextureEntry, 0, part.Shape.TextureEntry.Length);
+            if (te == null)
+                return;
+
             foreach (OSD elemOsd in matsArr)
             {
                 if (elemOsd != null && elemOsd is OSDMap)
-- 
cgit v1.1


From 36d8a24a867fbbc95214653fec463aced8ba7c5f Mon Sep 17 00:00:00 2001
From: dahlia
Date: Mon, 20 Jan 2014 03:11:01 -0800
Subject: force SOG update when converting legacy materials to ensure changes
 are persisted

---
 OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index d8ec979..ce2a56a 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -215,6 +215,8 @@ namespace OpenSim.Region.OptionalModules.Materials
             }
 
             part.Shape.TextureEntry = te.GetBytes();
+            part.ParentGroup.HasGroupChanged = true;
+            part.ScheduleFullUpdate();
 
             lock (part.DynAttrs)
                 part.DynAttrs.RemoveStore("OpenSim", "Materials");
-- 
cgit v1.1


From 4800303abdaff19471988097c89193ff6cc4b24e Mon Sep 17 00:00:00 2001
From: dahlia
Date: Mon, 20 Jan 2014 03:18:36 -0800
Subject: update OpenMetaverse.StructuredData to git master
 (bf4e9f654ff99c85e20b53e56faac38e307dd8c2) which fixes JSON OSD serialization
 to a standards compliant means of encoding floating point NaN and Infinity

---
 bin/OpenMetaverse.StructuredData.XML | 234 +++++++++++++++++------------------
 bin/OpenMetaverse.StructuredData.dll | Bin 106496 -> 106496 bytes
 2 files changed, 117 insertions(+), 117 deletions(-)

diff --git a/bin/OpenMetaverse.StructuredData.XML b/bin/OpenMetaverse.StructuredData.XML
index 789ad5b..3999d99 100644
--- a/bin/OpenMetaverse.StructuredData.XML
+++ b/bin/OpenMetaverse.StructuredData.XML
@@ -4,123 +4,6 @@
         <name>OpenMetaverse.StructuredData</name>
     </assembly>
     <members>
-        <member name="T:OpenMetaverse.StructuredData.OSDType">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Unknown">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Boolean">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Integer">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Real">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.String">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.UUID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Date">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.URI">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Binary">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Map">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Array">
-            <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)">
-            <summary>
-            Uses reflection to create an SDMap from all of the SD
-            serializable types in an object
-            </summary>
-            <param name="obj">Class or struct containing serializable types</param>
-            <returns>An SDMap holding the serialized values from the
-            container object</returns>
-        </member>
-        <member name="M:OpenMetaverse.StructuredData.OSD.DeserializeMembers(System.Object@,OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Uses reflection to deserialize member variables in an object from
-            an SDMap
-            </summary>
-            <param name="obj">Reference to an object to fill with deserialized
-            values</param>
-            <param name="serialized">Serialized values to put in the target
-            object</param>
-        </member>
-        <member name="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>
             
@@ -345,5 +228,122 @@
             <param name="c"></param>
             <returns></returns>
         </member>
+        <member name="T:OpenMetaverse.StructuredData.OSDType">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Unknown">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Boolean">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Integer">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Real">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.String">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.UUID">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Date">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.URI">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Binary">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Map">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Array">
+            <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)">
+            <summary>
+            Uses reflection to create an SDMap from all of the SD
+            serializable types in an object
+            </summary>
+            <param name="obj">Class or struct containing serializable types</param>
+            <returns>An SDMap holding the serialized values from the
+            container object</returns>
+        </member>
+        <member name="M:OpenMetaverse.StructuredData.OSD.DeserializeMembers(System.Object@,OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Uses reflection to deserialize member variables in an object from
+            an SDMap
+            </summary>
+            <param name="obj">Reference to an object to fill with deserialized
+            values</param>
+            <param name="serialized">Serialized values to put in the target
+            object</param>
+        </member>
+        <member name="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>
     </members>
 </doc>
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index d980531..ed613e7 100755
Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ
-- 
cgit v1.1


From 8e72b53edc435c2c2fbec0b8c91304e7f7a6a4f2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 20 Jan 2014 19:16:19 +0000
Subject: Stop exceptions being generated on agent connection if a telehub
 object has been deleted or has no spawn points.

---
 OpenSim/Framework/RegionSettings.cs                |  21 ++--
 .../World/Estate/EstateManagementCommands.cs       |   2 +-
 .../World/Estate/EstateManagementModule.cs         |   8 +-
 OpenSim/Region/Framework/Scenes/Scene.cs           |  50 ++++++---
 .../Framework/Scenes/Tests/SceneTelehubTests.cs    | 119 +++++++++++++++++++++
 OpenSim/Tests/Common/Mock/TestClient.cs            |   5 -
 OpenSim/Tests/Common/TestHelpers.cs                |  21 +++-
 7 files changed, 186 insertions(+), 40 deletions(-)
 create mode 100644 OpenSim/Region/Framework/Scenes/Tests/SceneTelehubTests.cs

diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index db8c53e..a895c40 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -482,21 +482,14 @@ namespace OpenSim.Framework
             set { m_LoadedCreationID = value; }
         }
 
-        // Connected Telehub object
-        private UUID m_TelehubObject = UUID.Zero;
-        public UUID TelehubObject
-        {
-            get
-            {
-                return m_TelehubObject;
-            }
-            set
-            {
-                m_TelehubObject = value;
-            }
-        }
+        /// <summary>
+        /// Connected Telehub object
+        /// </summary>
+        public UUID TelehubObject { get; set; }
 
-        // Our Connected Telehub's SpawnPoints
+        /// <summary>
+        /// Our connected Telehub's SpawnPoints
+        /// </summary>
         public List<SpawnPoint> l_SpawnPoints = new List<SpawnPoint>();
 
         // Add a SpawnPoint
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
index 173b603..1659493 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         
         public void Initialise()
         {            
-            m_log.DebugFormat("[ESTATE MODULE]: Setting up estate commands for region {0}", m_module.Scene.RegionInfo.RegionName);
+//            m_log.DebugFormat("[ESTATE MODULE]: Setting up estate commands for region {0}", m_module.Scene.RegionInfo.RegionName);
             
             m_module.Scene.AddCommand("Regions", m_module, "set terrain texture",
                                "set terrain texture <number> <uuid> [<x>] [<y>]",
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 17387da..3bd7b4a 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -702,7 +702,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             }
         }
 
-        public void handleOnEstateManageTelehub(IClientAPI client, UUID invoice, UUID senderID, string cmd, uint param1)
+        public void HandleOnEstateManageTelehub(IClientAPI client, UUID invoice, UUID senderID, string cmd, uint param1)
         {
             SceneObjectPart part;
 
@@ -742,7 +742,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 default:
                     break;
             }
-            SendTelehubInfo(client);
+
+            if (client != null)
+                SendTelehubInfo(client);
         }
 
         private void SendSimulatorBlueBoxMessage(
@@ -1214,7 +1216,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             client.OnEstateRestartSimRequest += handleEstateRestartSimRequest;
             client.OnEstateChangeCovenantRequest += handleChangeEstateCovenantRequest;
             client.OnEstateChangeInfo += handleEstateChangeInfo;
-            client.OnEstateManageTelehub += handleOnEstateManageTelehub;
+            client.OnEstateManageTelehub += HandleOnEstateManageTelehub;
             client.OnUpdateEstateAccessDeltaRequest += handleEstateAccessDeltaRequest;
             client.OnSimulatorBlueBoxMessageRequest += SendSimulatorBlueBoxMessage;
             client.OnEstateBlueBoxMessageRequest += SendEstateBlueBoxMessage;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 567ce2a..59c5b09 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3946,32 +3946,52 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
 
+//                m_log.DebugFormat(
+//                    "[SCENE]: Found telehub object {0} for new user connection {1} to {2}", 
+//                    RegionInfo.RegionSettings.TelehubObject, acd.Name, Name);
+
                 // Honor Estate teleport routing via Telehubs excluding ViaHome and GodLike TeleportFlags
                 if (RegionInfo.RegionSettings.TelehubObject != UUID.Zero &&
                     RegionInfo.EstateSettings.AllowDirectTeleport == false &&
                     !viahome && !godlike)
                 {
                     SceneObjectGroup telehub = GetSceneObjectGroup(RegionInfo.RegionSettings.TelehubObject);
-                    // Can have multiple SpawnPoints
-                    List<SpawnPoint> spawnpoints = RegionInfo.RegionSettings.SpawnPoints();
-                    if (spawnpoints.Count > 1)
+
+                    if (telehub != null)
                     {
-                        // We have multiple SpawnPoints, Route the agent to a random or sequential one
-                        if (SpawnPointRouting == "random")
-                            acd.startpos = spawnpoints[Util.RandomClass.Next(spawnpoints.Count) - 1].GetLocation(
-                                telehub.AbsolutePosition,
-                                telehub.GroupRotation
-                            );
+                        // Can have multiple SpawnPoints
+                        List<SpawnPoint> spawnpoints = RegionInfo.RegionSettings.SpawnPoints();
+                        if (spawnpoints.Count > 1)
+                        {
+                            // We have multiple SpawnPoints, Route the agent to a random or sequential one
+                            if (SpawnPointRouting == "random")
+                                acd.startpos = spawnpoints[Util.RandomClass.Next(spawnpoints.Count) - 1].GetLocation(
+                                    telehub.AbsolutePosition,
+                                    telehub.GroupRotation
+                                );
+                            else
+                                acd.startpos = spawnpoints[SpawnPoint()].GetLocation(
+                                    telehub.AbsolutePosition,
+                                    telehub.GroupRotation
+                                );
+                        }
+                        else if (spawnpoints.Count == 1)
+                        {
+                            // We have a single SpawnPoint and will route the agent to it
+                            acd.startpos = spawnpoints[0].GetLocation(telehub.AbsolutePosition, telehub.GroupRotation);
+                        }
                         else
-                            acd.startpos = spawnpoints[SpawnPoint()].GetLocation(
-                                telehub.AbsolutePosition,
-                                telehub.GroupRotation
-                            );
+                        {
+                            m_log.DebugFormat(
+                                "[SCENE]: No spawnpoints defined for telehub {0} for {1} in {2}.  Continuing.", 
+                                RegionInfo.RegionSettings.TelehubObject, acd.Name, Name);
+                        }
                     }
                     else
                     {
-                        // We have a single SpawnPoint and will route the agent to it
-                        acd.startpos = spawnpoints[0].GetLocation(telehub.AbsolutePosition, telehub.GroupRotation);
+                        m_log.DebugFormat(
+                            "[SCENE]: No telehub {0} found to direct {1} in {2}.  Continuing.", 
+                            RegionInfo.RegionSettings.TelehubObject, acd.Name, Name);
                     }
 
                     return true;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTelehubTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTelehubTests.cs
new file mode 100644
index 0000000..9a97acc
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTelehubTests.cs
@@ -0,0 +1,119 @@
+/*
+ * 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.World.Estate;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Services.Interfaces;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Region.Framework.Scenes.Tests
+{
+    /// <summary>
+    /// Scene telehub tests
+    /// </summary>
+    /// <remarks>
+    /// TODO: Tests which run through normal functionality.  Currently, the only test is one that checks behaviour
+    /// in the case of an error condition
+    /// </remarks>
+    [TestFixture]
+    public class SceneTelehubTests : OpenSimTestCase
+    {
+        /// <summary>
+        /// Test for desired behaviour when a telehub has no spawn points
+        /// </summary>
+        [Test]
+        public void TestNoTelehubSpawnPoints()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            EstateManagementModule emm = new EstateManagementModule();
+
+            SceneHelpers sh = new SceneHelpers();
+            Scene scene = sh.SetupScene();
+            SceneHelpers.SetupSceneModules(scene, emm);
+
+            UUID telehubSceneObjectOwner = TestHelpers.ParseTail(0x1);
+
+            SceneObjectGroup telehubSo = SceneHelpers.AddSceneObject(scene, "telehubObject", telehubSceneObjectOwner);
+
+            emm.HandleOnEstateManageTelehub(null, UUID.Zero, UUID.Zero, "connect", telehubSo.LocalId);
+            scene.RegionInfo.EstateSettings.AllowDirectTeleport = false;
+
+            // Must still be possible to successfully log in
+            UUID loggingInUserId = TestHelpers.ParseTail(0x2);
+
+            UserAccount ua 
+                = UserAccountHelpers.CreateUserWithInventory(scene, "Test", "User", loggingInUserId, "password");
+
+            SceneHelpers.AddScenePresence(scene, ua);
+
+            Assert.That(scene.GetScenePresence(loggingInUserId), Is.Not.Null);
+        }
+
+        /// <summary>
+        /// Test for desired behaviour when the scene object nominated as a telehub object does not exist.
+        /// </summary>
+        [Test]
+        public void TestNoTelehubSceneObject()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            EstateManagementModule emm = new EstateManagementModule();
+
+            SceneHelpers sh = new SceneHelpers();
+            Scene scene = sh.SetupScene();
+            SceneHelpers.SetupSceneModules(scene, emm);
+
+            UUID telehubSceneObjectOwner = TestHelpers.ParseTail(0x1);
+
+            SceneObjectGroup telehubSo = SceneHelpers.AddSceneObject(scene, "telehubObject", telehubSceneObjectOwner);
+            SceneObjectGroup spawnPointSo = SceneHelpers.AddSceneObject(scene, "spawnpointObject", telehubSceneObjectOwner);
+
+            emm.HandleOnEstateManageTelehub(null, UUID.Zero, UUID.Zero, "connect", telehubSo.LocalId);
+            emm.HandleOnEstateManageTelehub(null, UUID.Zero, UUID.Zero, "spawnpoint add", spawnPointSo.LocalId);
+            scene.RegionInfo.EstateSettings.AllowDirectTeleport = false;
+
+            scene.DeleteSceneObject(telehubSo, false);
+
+            // Must still be possible to successfully log in
+            UUID loggingInUserId = TestHelpers.ParseTail(0x2);
+
+            UserAccount ua 
+                = UserAccountHelpers.CreateUserWithInventory(scene, "Test", "User", loggingInUserId, "password");
+
+            SceneHelpers.AddScenePresence(scene, ua);
+
+            Assert.That(scene.GetScenePresence(loggingInUserId), Is.Not.Null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 9370102..a4247e3 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -788,11 +788,6 @@ namespace OpenSim.Tests.Common.Mock
             {
                 OnRegionHandShakeReply(this);
             }
-
-            if (OnCompleteMovementToRegion != null)
-            {
-                OnCompleteMovementToRegion(this, true);
-            }
         }
         
         public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
diff --git a/OpenSim/Tests/Common/TestHelpers.cs b/OpenSim/Tests/Common/TestHelpers.cs
index a684d72..6bf23f8 100644
--- a/OpenSim/Tests/Common/TestHelpers.cs
+++ b/OpenSim/Tests/Common/TestHelpers.cs
@@ -117,8 +117,6 @@ namespace OpenSim.Tests.Common
         /// Parse a UUID stem into a full UUID.
         /// </summary>
         /// <remarks>
-        /// Yes, this is completely inconsistent with ParseTail but this is probably a better way to do it,
-        /// UUIDs are conceptually not hexadecmial numbers.
         /// The fragment will come at the start of the UUID.  The rest will be 0s
         /// </remarks>
         /// <returns></returns>
@@ -143,5 +141,24 @@ namespace OpenSim.Tests.Common
         {
             return new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", tail));
         }
+
+        /// <summary>
+        /// Parse a UUID tail section into a full UUID.
+        /// </summary>
+        /// <remarks>
+        /// The fragment will come at the end of the UUID.  The rest will be 0s
+        /// </remarks>
+        /// <returns></returns>
+        /// <param name='frag'>
+        /// A UUID fragment that will be parsed into a full UUID.  Therefore, it can only contain
+        /// cahracters which are valid in a UUID, except for "-" which is currently only allowed if a full UUID is
+        /// given as the 'fragment'.
+        /// </param>
+        public static UUID ParseTail(string stem)
+        {
+            string rawUuid = stem.PadLeft(32, '0');
+
+            return UUID.Parse(rawUuid);           
+        }
     }
 }
-- 
cgit v1.1


From 2e78e89c36e661f72773e54f97bec3f04af67b79 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Mon, 20 Jan 2014 11:33:49 -0800
Subject: Clean up orphaned json stores. This can happen when an object is
 removed, when a script is removed, or when a script is reset. Also added a
 stats command to track the number of json stores used by a region. Will
 probably add some more commands later.

---
 .../Framework/Interfaces/IJsonStoreModule.cs       |   7 +
 .../Scripting/JsonStore/JsonStoreCommands.cs       | 195 +++++++++++++++++++++
 .../Scripting/JsonStore/JsonStoreModule.cs         |  41 ++++-
 .../Scripting/JsonStore/JsonStoreScriptModule.cs   |  41 ++++-
 4 files changed, 281 insertions(+), 3 deletions(-)
 create mode 100644 OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs

diff --git a/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs b/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs
index b67312e..1a89721 100644
--- a/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs
@@ -51,10 +51,17 @@ namespace OpenSim.Region.Framework.Interfaces
         UUID = 5
     }
     
+    public struct JsonStoreStats
+    {
+        public int StoreCount;
+    }
+
     public delegate void TakeValueCallback(string s);
 
     public interface IJsonStoreModule
     {
+        JsonStoreStats GetStoreStats();
+
         bool AttachObjectStore(UUID objectID);
         bool CreateStore(string value, ref UUID result);
         bool DestroyStore(UUID storeID);
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs
new file mode 100644
index 0000000..d4b19dd
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) Contributors 
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim 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 Mono.Addins;
+
+using System;
+using System.Reflection;
+using System.Threading;
+using System.Text;
+using System.Net;
+using System.Net.Sockets;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "JsonStoreCommandsModule")]
+
+    public class JsonStoreCommandsModule  : INonSharedRegionModule
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private IConfig m_config = null;
+        private bool m_enabled = false;
+
+        private Scene m_scene = null;
+        //private IJsonStoreModule m_store;
+        private JsonStoreModule m_store;
+
+#region Region Module interface
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// Name of this shared module is it's class name
+        /// </summary>
+        // -----------------------------------------------------------------
+        public string Name
+        {
+            get { return this.GetType().Name; }
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// Initialise this shared module
+        /// </summary>
+        /// <param name="scene">this region is getting initialised</param>
+        /// <param name="source">nini config, we are not using this</param>
+        // -----------------------------------------------------------------
+        public void Initialise(IConfigSource config)
+        {
+            try 
+            {
+                if ((m_config = config.Configs["JsonStore"]) == null)
+                {
+                    // There is no configuration, the module is disabled
+                    // m_log.InfoFormat("[JsonStore] no configuration info");
+                    return;
+                }
+
+                m_enabled = m_config.GetBoolean("Enabled", m_enabled);
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[JsonStore]: initialization error: {0}", e);
+                return;
+            }
+
+            if (m_enabled)
+                m_log.DebugFormat("[JsonStore]: module is enabled");
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// everything is loaded, perform post load configuration
+        /// </summary>
+        // -----------------------------------------------------------------
+        public void PostInitialise()
+        {
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// Nothing to do on close
+        /// </summary>
+        // -----------------------------------------------------------------
+        public void Close()
+        {
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// </summary>
+        // -----------------------------------------------------------------
+        public void AddRegion(Scene scene)
+        {
+            if (m_enabled)
+            {
+                m_scene = scene;
+                
+            }
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// </summary>
+        // -----------------------------------------------------------------
+        public void RemoveRegion(Scene scene)
+        {
+            // need to remove all references to the scene in the subscription
+            // list to enable full garbage collection of the scene object
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// Called when all modules have been added for a region. This is 
+        /// where we hook up events
+        /// </summary>
+        // -----------------------------------------------------------------
+        public void RegionLoaded(Scene scene)
+        {
+            if (m_enabled)
+            {
+                m_scene = scene;
+
+                m_store = (JsonStoreModule) m_scene.RequestModuleInterface<IJsonStoreModule>();
+                if (m_store == null)
+                {
+                    m_log.ErrorFormat("[JsonStoreCommands]: JsonModule interface not defined");
+                    m_enabled = false;
+                    return;
+                }
+
+                scene.AddCommand("JsonStore", this, "jsonstore stats", "jsonstore stats",
+                                 "Display statistics about the state of the JsonStore module", "",
+                                 CmdStats);
+            }
+        }
+
+        /// -----------------------------------------------------------------
+        /// <summary>
+        /// </summary>
+        // -----------------------------------------------------------------
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+#endregion
+
+#region Commands
+
+        private void CmdStats(string module, string[] cmd)
+        {
+            if (MainConsole.Instance.ConsoleScene != m_scene && MainConsole.Instance.ConsoleScene != null)
+                return;
+
+            JsonStoreStats stats = m_store.GetStoreStats();
+            MainConsole.Instance.OutputFormat("{0}\t{1}",m_scene.RegionInfo.RegionName,stats.StoreCount);
+        }
+
+#endregion
+
+    }
+}
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
index 5fbfcc5..b502a55 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
@@ -42,7 +42,6 @@ using OpenSim.Region.Framework.Scenes;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-            
 namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "JsonStoreModule")]
@@ -60,6 +59,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         private Scene m_scene = null;
 
         private Dictionary<UUID,JsonStore> m_JsonValueStore;
+
         private UUID m_sharedStore;
 
 #region Region Module interface
@@ -140,6 +140,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                 m_sharedStore = UUID.Zero;
                 m_JsonValueStore = new Dictionary<UUID,JsonStore>();
                 m_JsonValueStore.Add(m_sharedStore,new JsonStore(""));
+
+                scene.EventManager.OnObjectBeingRemovedFromScene += EventManagerOnObjectBeingRemovedFromScene;
             }
         }
 
@@ -149,6 +151,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         // -----------------------------------------------------------------
         public void RemoveRegion(Scene scene)
         {
+            scene.EventManager.OnObjectBeingRemovedFromScene -= EventManagerOnObjectBeingRemovedFromScene;
+
             // need to remove all references to the scene in the subscription
             // list to enable full garbage collection of the scene object
         }
@@ -161,7 +165,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         // -----------------------------------------------------------------
         public void RegionLoaded(Scene scene)
         {
-            if (m_enabled) {}
+            if (m_enabled)
+            {
+            }
         }
 
         /// -----------------------------------------------------------------
@@ -175,8 +181,39 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
 #endregion
 
+#region SceneEvents
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        public void EventManagerOnObjectBeingRemovedFromScene(SceneObjectGroup obj)
+        {
+            obj.ForEachPart(delegate(SceneObjectPart sop) { DestroyStore(sop.UUID); } );
+        }
+
+#endregion
+
 #region ScriptInvocationInteface
 
+        
+        // -----------------------------------------------------------------
+        /// <summary>
+        /// 
+        /// </summary>
+        // -----------------------------------------------------------------
+        public JsonStoreStats GetStoreStats()
+        {
+            JsonStoreStats stats;
+
+            lock (m_JsonValueStore)
+            {
+                stats.StoreCount = m_JsonValueStore.Count;
+            }
+            
+            return stats;
+        }
+        
         // -----------------------------------------------------------------
         /// <summary>
         /// 
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
index 1bb5aee..9fbfb66 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
@@ -59,7 +59,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
         private IScriptModuleComms m_comms;
         private IJsonStoreModule m_store;
-        
+
+        private Dictionary<UUID,HashSet<UUID>> m_scriptStores = new Dictionary<UUID,HashSet<UUID>>();
+
 #region Region Module interface
 
         // -----------------------------------------------------------------
@@ -126,6 +128,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         // -----------------------------------------------------------------
         public void AddRegion(Scene scene)
         {
+            scene.EventManager.OnScriptReset += HandleScriptReset;
+            scene.EventManager.OnRemoveScript += HandleScriptReset;
         }
 
         // -----------------------------------------------------------------
@@ -134,12 +138,34 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         // -----------------------------------------------------------------
         public void RemoveRegion(Scene scene)
         {
+            scene.EventManager.OnScriptReset -= HandleScriptReset;
+            scene.EventManager.OnRemoveScript -= HandleScriptReset;
+
             // need to remove all references to the scene in the subscription
             // list to enable full garbage collection of the scene object
         }
 
         // -----------------------------------------------------------------
         /// <summary>
+        /// </summary>
+        // -----------------------------------------------------------------
+        private void HandleScriptReset(uint localID, UUID itemID)
+        {
+            HashSet<UUID> stores;
+
+            lock (m_scriptStores)
+            {
+                if (! m_scriptStores.TryGetValue(itemID, out stores))
+                    return;
+                m_scriptStores.Remove(itemID);
+            }
+
+            foreach (UUID id in stores)
+                m_store.DestroyStore(id);
+        }
+
+        // -----------------------------------------------------------------
+        /// <summary>
         /// Called when all modules have been added for a region. This is 
         /// where we hook up events
         /// </summary>
@@ -250,6 +276,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             if (! m_store.CreateStore(value, ref uuid))
                 GenerateRuntimeError("Failed to create Json store");
             
+            lock (m_scriptStores)
+            {
+                if (! m_scriptStores.ContainsKey(scriptID))
+                    m_scriptStores[scriptID] = new HashSet<UUID>();
+                
+                m_scriptStores[scriptID].Add(uuid);
+            }
             return uuid;
         }
 
@@ -261,6 +294,12 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         [ScriptInvocation]
         public int JsonDestroyStore(UUID hostID, UUID scriptID, UUID storeID)
         {
+            lock(m_scriptStores)
+            {
+                if (m_scriptStores.ContainsKey(scriptID))
+                    m_scriptStores[scriptID].Remove(storeID);
+            }
+
             return m_store.DestroyStore(storeID) ? 1 : 0;
         }
 
-- 
cgit v1.1


From 1cae3664a52fe48965954afc19804b11720c4add Mon Sep 17 00:00:00 2001
From: dahlia
Date: Mon, 20 Jan 2014 11:53:33 -0800
Subject: add null texture entry face check before converting legacy materials

---
 OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index ce2a56a..c4bc8a0 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -199,7 +199,7 @@ namespace OpenSim.Region.OptionalModules.Materials
                         bool used = false;
 
                         foreach (var face in te.FaceTextures)
-                            if (face.MaterialID == id)
+                            if (face != null && face.MaterialID == id)
                                 used = true;
 
                         if (used)
@@ -207,7 +207,7 @@ namespace OpenSim.Region.OptionalModules.Materials
 
                             var newId = StoreMaterialAsAsset(part.CreatorID, material, part);
                             foreach (var face in te.FaceTextures)
-                                if (face.MaterialID == id)
+                                if (face != null && face.MaterialID == id)
                                     face.MaterialID = newId;
                         }
                     }
-- 
cgit v1.1


From af58631f00b95081dc99f4f75e8ec6b031b8cf2a Mon Sep 17 00:00:00 2001
From: dahlia
Date: Mon, 20 Jan 2014 13:57:14 -0800
Subject: rather than converting existing materials to assets, just retrieve
 them and make them available for viewing. Any new materials added to the
 scene will become assets.

---
 .../OptionalModules/Materials/MaterialsModule.cs   | 44 ++++++----------------
 1 file changed, 12 insertions(+), 32 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index c4bc8a0..afb788b 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -149,12 +149,10 @@ namespace OpenSim.Region.OptionalModules.Materials
         }
 
         /// <summary>
-        /// Searches the part for any legacy materials stored in DynAttrs and converts them to assets, replacing
-        /// the MaterialIDs in the TextureEntries for the part.
-        /// Deletes the legacy materials from the part as they are no longer needed.
+        /// Finds any legacy materials stored in DynAttrs that may exist for this part and add them to 'm_regionMaterials'.
         /// </summary>
         /// <param name="part"></param>
-        private void ConvertLegacyMaterialsInPart(SceneObjectPart part)
+        private void GetLegacyStoredMaterialsInPart(SceneObjectPart part)
         {
             if (part.DynAttrs == null)
                 return;
@@ -183,10 +181,6 @@ namespace OpenSim.Region.OptionalModules.Materials
             if (matsArr == null)
                 return;
 
-            var te = new Primitive.TextureEntry(part.Shape.TextureEntry, 0, part.Shape.TextureEntry.Length);
-            if (te == null)
-                return;
-
             foreach (OSD elemOsd in matsArr)
             {
                 if (elemOsd != null && elemOsd is OSDMap)
@@ -194,32 +188,18 @@ namespace OpenSim.Region.OptionalModules.Materials
                     OSDMap matMap = elemOsd as OSDMap;
                     if (matMap.ContainsKey("ID") && matMap.ContainsKey("Material"))
                     {
-                        UUID id = matMap["ID"].AsUUID();
-                        OSDMap material = (OSDMap)matMap["Material"];
-                        bool used = false;
-
-                        foreach (var face in te.FaceTextures)
-                            if (face != null && face.MaterialID == id)
-                                used = true;
-
-                        if (used)
-                        { // store legacy material in new asset format, and update the part texture entry with the new hashed UUID
-
-                            var newId = StoreMaterialAsAsset(part.CreatorID, material, part);
-                            foreach (var face in te.FaceTextures)
-                                if (face != null && face.MaterialID == id)
-                                    face.MaterialID = newId;
+                        try
+                        {
+                            lock (m_regionMaterials)
+                                m_regionMaterials[matMap["ID"].AsUUID()] = (OSDMap)matMap["Material"];
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.Warn("[Materials]: exception decoding persisted legacy material: " + e.ToString());
                         }
                     }
                 }
             }
-
-            part.Shape.TextureEntry = te.GetBytes();
-            part.ParentGroup.HasGroupChanged = true;
-            part.ScheduleFullUpdate();
-
-            lock (part.DynAttrs)
-                part.DynAttrs.RemoveStore("OpenSim", "Materials");
         }
 
         /// <summary>
@@ -230,12 +210,12 @@ namespace OpenSim.Region.OptionalModules.Materials
             if (part.Shape == null)
                 return;
 
-            ConvertLegacyMaterialsInPart(part);
-
             var te = new Primitive.TextureEntry(part.Shape.TextureEntry, 0, part.Shape.TextureEntry.Length);
             if (te == null)
                 return;
 
+            GetLegacyStoredMaterialsInPart(part);
+
             GetStoredMaterialInFace(part, te.DefaultTexture);
 
             foreach (Primitive.TextureEntryFace face in te.FaceTextures)
-- 
cgit v1.1


From 7bd42fc42f0d945fe96b058d06f14c091d96b2d2 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Mon, 20 Jan 2014 15:01:18 -0800
Subject: Add back code to UuidGatherer to retrieve UUIDs for materials stored
 in DynAttrs. This is unfortunately still necessary until a better solution
 for handling existing legacy materials can be implemented

---
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 73 +++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 42a1977..75a51b5 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -218,6 +218,10 @@ namespace OpenSim.Region.Framework.Scenes
                     // 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);
+
+
+                    // still needed to retrieve textures used as materials for any parts containing legacy materials stored in DynAttrs
+                    GatherMaterialsUuids(part, assetUuids); 
                 }
                 catch (Exception e)
                 {
@@ -241,6 +245,75 @@ namespace OpenSim.Region.Framework.Scenes
 //                Monitor.Pulse(this);
 //            }
 //        }
+
+        /// <summary>
+        /// Gather all of the texture asset UUIDs used to reference "Materials" such as normal and specular maps
+        /// stored in legacy format in part.DynAttrs
+        /// </summary>
+        /// <param name="part"></param>
+        /// <param name="assetUuids"></param>
+        //public void GatherMaterialsUuids(SceneObjectPart part, IDictionary<UUID, AssetType> assetUuids)
+        public void GatherMaterialsUuids(SceneObjectPart part, IDictionary<UUID, sbyte> 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] = (sbyte)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] = (sbyte)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
-- 
cgit v1.1


From 83626e60e69ac0534faffa40f9e79a5d3ae0d332 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Mon, 20 Jan 2014 18:59:43 -0800
Subject: Adds a configuration option to cannibalize bandwidth from the udp
 texture throttle and move it to the task throttle. Since most viewers are
 using http textures, the udp texture throttle is holding onto bw that could
 be used for more responsive prims updates. See the documentation for
 CannibalizeTextureRate in OpenSimDefaults.ini. Option is disabled by default.

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs   | 14 ++++++++++++++
 OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs |  6 ++++++
 bin/OpenSimDefaults.ini                                | 10 ++++++++++
 3 files changed, 30 insertions(+)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index 202cc62..51433cb 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -162,6 +162,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private int m_defaultRTO = 1000; // 1sec is the recommendation in the RFC
         private int m_maxRTO = 60000;
 
+        /// <summary>
+        /// This is the percentage of the udp texture queue to add to the task queue since
+        /// textures are now generally handled through http.
+        /// </summary>
+        private double m_cannibalrate = 0.0;
+        
         private ClientInfo m_info = new ClientInfo();
 
         /// <summary>
@@ -201,6 +207,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // Create an array of token buckets for this clients different throttle categories
             m_throttleCategories = new TokenBucket[THROTTLE_CATEGORY_COUNT];
 
+            m_cannibalrate = rates.CannibalizeTextureRate;
+            
             for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++)
             {
                 ThrottleOutPacketType type = (ThrottleOutPacketType)i;
@@ -349,6 +357,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             texture = Math.Max(texture, LLUDPServer.MTU);
             asset = Math.Max(asset, LLUDPServer.MTU);
 
+            // Since most textures are now delivered through http, make it possible
+            // to cannibalize some of the bw from the texture throttle to use for
+            // the task queue (e.g. object updates)
+            task = task + (int)(m_cannibalrate * texture);
+            texture = (int)((1 - m_cannibalrate) * texture);
+            
             //int total = resend + land + wind + cloud + task + texture + asset;
             //m_log.DebugFormat("[LLUDPCLIENT]: {0} is setting throttles. Resend={1}, Land={2}, Wind={3}, Cloud={4}, Task={5}, Texture={6}, Asset={7}, Total={8}",
             //                  AgentID, resend, land, wind, cloud, task, texture, asset, total);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
index c9aac0b..e5bae6e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs
@@ -59,6 +59,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>Flag used to enable adaptive throttles</summary>
         public bool AdaptiveThrottlesEnabled;
         
+        /// <summary>Amount of the texture throttle to steal for the task throttle</summary>
+        public double CannibalizeTextureRate;
+
         /// <summary>
         /// Default constructor
         /// </summary>
@@ -80,6 +83,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 Total = throttleConfig.GetInt("client_throttle_max_bps", 0);
 
                 AdaptiveThrottlesEnabled = throttleConfig.GetBoolean("enable_adaptive_throttles", false);
+                
+                CannibalizeTextureRate = (double)throttleConfig.GetFloat("CannibalizeTextureRate", 0.0f);
+                CannibalizeTextureRate = Util.Clamp<double>(CannibalizeTextureRate,0.0, 0.9);
             }
             catch (Exception) { }
         }
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index ae7b794..0da99ba 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -539,6 +539,16 @@
     ;
     ;TextureSendLimit = 20
 
+    ; CannibalizeTextureRate allows bandwidth to be moved from the
+    ; UDP texture throttle to the task throttle. Since most viewers
+    ; use HTTP textures, this provides a means of using what is largely
+    ; unused bandwidth in the total throttle. The value is the proportion
+    ; of the texture rate to move to the task queue. It must be between
+    ; 0.0 (none of the bandwidth is cannibalized) and 0.9 (90% of the
+    ; bandwidth is grabbed)
+    ;
+    ; CannibalizeTextureRate = 0.5
+
     ; Quash and remove any light properties from attachments not on the
     ; hands. This allows flashlights and lanterns to function, but kills
     ; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps
-- 
cgit v1.1


From a859464e91f724816c2ba588a541981469d58d2b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 23 Jan 2014 23:44:21 +0000
Subject: Add "generate map" console command to allow manual regeneration and
 storage of maptiles

Primarily for test purposes though could be useful if one prefers to manually update the map tile
---
 .../Region/CoreModules/World/LegacyMap/MapImageModule.cs  |  5 ++++-
 .../Region/CoreModules/World/WorldMap/WorldMapModule.cs   | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
index 40638f8..61ba5f3 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
@@ -127,7 +127,10 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
             try
             {
                 using (Bitmap mapbmp = CreateMapTile())
-                    return OpenJPEG.EncodeFromImage(mapbmp, true);
+                {
+                    if (mapbmp != null)
+                        return OpenJPEG.EncodeFromImage(mapbmp, true);
+                }
             }
             catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke
             {
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index cdf1467..88761a2 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -114,6 +114,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     "export-map [<path>]",
                     "Save an image of the world map", HandleExportWorldMapConsoleCommand);
 
+                m_scene.AddCommand(
+                    "Regions", this, "generate map",
+                    "generate map",
+                    "Generates and stores a new maptile.", HandleGenerateMapConsoleCommand);
+
                 AddHandlers();
             }
         }
@@ -1274,6 +1279,16 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 m_scene.RegionInfo.RegionName, exportPath);
         }
 
+        public void HandleGenerateMapConsoleCommand(string module, string[] cmdparams)
+        {
+            Scene consoleScene = m_scene.ConsoleScene();
+
+            if (consoleScene != null && consoleScene != m_scene)
+                return;
+
+            GenerateMaptile();
+        }
+
         public OSD HandleRemoteMapItemRequest(string path, OSD request, string endpoint)
         {
             uint xstart = 0;
-- 
cgit v1.1


From a2d5d810e0572e7f87808ba35c4b2a21e6f48c40 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 24 Jan 2014 00:14:58 +0000
Subject: Properly dispose of drawing objects to reduce/stop memory leakage on
 generating map tiles with the MapImageModule and TexturedMapTileRenderer (the
 current defaults)

---
 .../CoreModules/World/LegacyMap/MapImageModule.cs  | 533 +++++++++++----------
 .../World/LegacyMap/ShadedMapTileRenderer.cs       |  11 +-
 .../World/LegacyMap/TexturedMapTileRenderer.cs     |  27 +-
 .../CoreModules/World/WorldMap/WorldMapModule.cs   |  91 ++--
 4 files changed, 343 insertions(+), 319 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
index 61ba5f3..bc52a43 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
     public struct DrawStruct
     {
         public DrawRoutine dr;
-        public Rectangle rect;
+//        public Rectangle rect;
         public SolidBrush brush;
         public face[] trns;
     }
@@ -119,6 +119,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
             {
                 mapbmp = FetchTexture(m_scene.RegionInfo.RegionSettings.TerrainImageID);
             }
+
             return mapbmp;
         }
 
@@ -280,321 +281,331 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
             tc = Environment.TickCount;
             m_log.Debug("[MAPTILE]: Generating Maptile Step 2: Object Volume Profile");
             EntityBase[] objs = whichScene.GetEntities();
-            Dictionary<uint, DrawStruct> z_sort = new Dictionary<uint, DrawStruct>();
-            //SortedList<float, RectangleDrawStruct> z_sort = new SortedList<float, RectangleDrawStruct>();
             List<float> z_sortheights = new List<float>();
             List<uint> z_localIDs = new List<uint>();
+            Dictionary<uint, DrawStruct> z_sort = new Dictionary<uint, DrawStruct>();
 
-            lock (objs)
+            try 
             {
-                foreach (EntityBase obj in objs)
+                //SortedList<float, RectangleDrawStruct> z_sort = new SortedList<float, RectangleDrawStruct>();
+
+                lock (objs)
                 {
-                    // Only draw the contents of SceneObjectGroup
-                    if (obj is SceneObjectGroup)
+                    foreach (EntityBase obj in objs)
                     {
-                        SceneObjectGroup mapdot = (SceneObjectGroup)obj;
-                        Color mapdotspot = Color.Gray; // Default color when prim color is white
-                        
-                        // Loop over prim in group
-                        foreach (SceneObjectPart part in mapdot.Parts)
+                        // Only draw the contents of SceneObjectGroup
+                        if (obj is SceneObjectGroup)
                         {
-                            if (part == null)
-                                continue;
-
-                            // Draw if the object is at least 1 meter wide in any direction
-                            if (part.Scale.X > 1f || part.Scale.Y > 1f || part.Scale.Z > 1f)
+                            SceneObjectGroup mapdot = (SceneObjectGroup)obj;
+                            Color mapdotspot = Color.Gray; // Default color when prim color is white
+                            
+                            // Loop over prim in group
+                            foreach (SceneObjectPart part in mapdot.Parts)
                             {
-                                // Try to get the RGBA of the default texture entry..
-                                //
-                                try
+                                if (part == null)
+                                    continue;
+
+                                // Draw if the object is at least 1 meter wide in any direction
+                                if (part.Scale.X > 1f || part.Scale.Y > 1f || part.Scale.Z > 1f)
                                 {
-                                    // get the null checks out of the way
-                                    // skip the ones that break
-                                    if (part == null)
-                                        continue;
+                                    // Try to get the RGBA of the default texture entry..
+                                    //
+                                    try
+                                    {
+                                        // get the null checks out of the way
+                                        // skip the ones that break
+                                        if (part == null)
+                                            continue;
 
-                                    if (part.Shape == null)
-                                        continue;
+                                        if (part.Shape == null)
+                                            continue;
 
-                                    if (part.Shape.PCode == (byte)PCode.Tree || part.Shape.PCode == (byte)PCode.NewTree || part.Shape.PCode == (byte)PCode.Grass)
-                                        continue; // eliminates trees from this since we don't really have a good tree representation
-                                    // if you want tree blocks on the map comment the above line and uncomment the below line
-                                    //mapdotspot = Color.PaleGreen;
+                                        if (part.Shape.PCode == (byte)PCode.Tree || part.Shape.PCode == (byte)PCode.NewTree || part.Shape.PCode == (byte)PCode.Grass)
+                                            continue; // eliminates trees from this since we don't really have a good tree representation
+                                        // if you want tree blocks on the map comment the above line and uncomment the below line
+                                        //mapdotspot = Color.PaleGreen;
 
-                                    Primitive.TextureEntry textureEntry = part.Shape.Textures;
+                                        Primitive.TextureEntry textureEntry = part.Shape.Textures;
 
-                                    if (textureEntry == null || textureEntry.DefaultTexture == null)
-                                        continue;
+                                        if (textureEntry == null || textureEntry.DefaultTexture == null)
+                                            continue;
 
-                                    Color4 texcolor = textureEntry.DefaultTexture.RGBA;
+                                        Color4 texcolor = textureEntry.DefaultTexture.RGBA;
 
-                                    // Not sure why some of these are null, oh well.
+                                        // Not sure why some of these are null, oh well.
 
-                                    int colorr = 255 - (int)(texcolor.R * 255f);
-                                    int colorg = 255 - (int)(texcolor.G * 255f);
-                                    int colorb = 255 - (int)(texcolor.B * 255f);
+                                        int colorr = 255 - (int)(texcolor.R * 255f);
+                                        int colorg = 255 - (int)(texcolor.G * 255f);
+                                        int colorb = 255 - (int)(texcolor.B * 255f);
 
-                                    if (!(colorr == 255 && colorg == 255 && colorb == 255))
-                                    {
-                                        //Try to set the map spot color
-                                        try
-                                        {
-                                            // If the color gets goofy somehow, skip it *shakes fist at Color4
-                                            mapdotspot = Color.FromArgb(colorr, colorg, colorb);
-                                        }
-                                        catch (ArgumentException)
+                                        if (!(colorr == 255 && colorg == 255 && colorb == 255))
                                         {
+                                            //Try to set the map spot color
+                                            try
+                                            {
+                                                // If the color gets goofy somehow, skip it *shakes fist at Color4
+                                                mapdotspot = Color.FromArgb(colorr, colorg, colorb);
+                                            }
+                                            catch (ArgumentException)
+                                            {
+                                            }
                                         }
                                     }
-                                }
-                                catch (IndexOutOfRangeException)
-                                {
-                                    // Windows Array
-                                }
-                                catch (ArgumentOutOfRangeException)
-                                {
-                                    // Mono Array
-                                }
-
-                                Vector3 pos = part.GetWorldPosition();
-
-                                // skip prim outside of retion
-                                if (pos.X < 0f || pos.X > 256f || pos.Y < 0f || pos.Y > 256f)
-                                    continue;
-
-                                // skip prim in non-finite position
-                                if (Single.IsNaN(pos.X) || Single.IsNaN(pos.Y) ||
-                                    Single.IsInfinity(pos.X) || Single.IsInfinity(pos.Y))
-                                    continue;
+                                    catch (IndexOutOfRangeException)
+                                    {
+                                        // Windows Array
+                                    }
+                                    catch (ArgumentOutOfRangeException)
+                                    {
+                                        // Mono Array
+                                    }
 
-                                // Figure out if object is under 256m above the height of the terrain
-                                bool isBelow256AboveTerrain = false;
+                                    Vector3 pos = part.GetWorldPosition();
 
-                                try
-                                {
-                                    isBelow256AboveTerrain = (pos.Z < ((float)hm[(int)pos.X, (int)pos.Y] + 256f));
-                                }
-                                catch (Exception)
-                                {
-                                }
-
-                                if (isBelow256AboveTerrain)
-                                {
-                                    // Translate scale by rotation so scale is represented properly when object is rotated
-                                    Vector3 lscale = new Vector3(part.Shape.Scale.X, part.Shape.Scale.Y, part.Shape.Scale.Z);
-                                    Vector3 scale = new Vector3();
-                                    Vector3 tScale = new Vector3();
-                                    Vector3 axPos = new Vector3(pos.X,pos.Y,pos.Z);
-
-                                    Quaternion llrot = part.GetWorldRotation();
-                                    Quaternion rot = new Quaternion(llrot.W, llrot.X, llrot.Y, llrot.Z);
-                                    scale = lscale * rot;
-
-                                    // negative scales don't work in this situation
-                                    scale.X = Math.Abs(scale.X);
-                                    scale.Y = Math.Abs(scale.Y);
-                                    scale.Z = Math.Abs(scale.Z);
-
-                                    // This scaling isn't very accurate and doesn't take into account the face rotation :P
-                                    int mapdrawstartX = (int)(pos.X - scale.X);
-                                    int mapdrawstartY = (int)(pos.Y - scale.Y);
-                                    int mapdrawendX = (int)(pos.X + scale.X);
-                                    int mapdrawendY = (int)(pos.Y + scale.Y);
-
-                                    // If object is beyond the edge of the map, don't draw it to avoid errors
-                                    if (mapdrawstartX < 0 || mapdrawstartX > ((int)Constants.RegionSize - 1) || mapdrawendX < 0 || mapdrawendX > ((int)Constants.RegionSize - 1)
-                                                          || mapdrawstartY < 0 || mapdrawstartY > ((int)Constants.RegionSize - 1) || mapdrawendY < 0
-                                                          || mapdrawendY > ((int)Constants.RegionSize - 1))
+                                    // skip prim outside of retion
+                                    if (pos.X < 0f || pos.X > 256f || pos.Y < 0f || pos.Y > 256f)
                                         continue;
 
-#region obb face reconstruction part duex
-                                    Vector3[] vertexes = new Vector3[8];
-
-                                    // float[] distance = new float[6];
-                                    Vector3[] FaceA = new Vector3[6]; // vertex A for Facei
-                                    Vector3[] FaceB = new Vector3[6]; // vertex B for Facei
-                                    Vector3[] FaceC = new Vector3[6]; // vertex C for Facei
-                                    Vector3[] FaceD = new Vector3[6]; // vertex D for Facei
-
-                                    tScale = new Vector3(lscale.X, -lscale.Y, lscale.Z);
-                                    scale = ((tScale * rot));
-                                    vertexes[0] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
-                                    // vertexes[0].x = pos.X + vertexes[0].x;
-                                    //vertexes[0].y = pos.Y + vertexes[0].y;
-                                    //vertexes[0].z = pos.Z + vertexes[0].z;
-
-                                    FaceA[0] = vertexes[0];
-                                    FaceB[3] = vertexes[0];
-                                    FaceA[4] = vertexes[0];
-
-                                    tScale = lscale;
-                                    scale = ((tScale * rot));
-                                    vertexes[1] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
-
-                                    // vertexes[1].x = pos.X + vertexes[1].x;
-                                    // vertexes[1].y = pos.Y + vertexes[1].y;
-                                    //vertexes[1].z = pos.Z + vertexes[1].z;
-
-                                    FaceB[0] = vertexes[1];
-                                    FaceA[1] = vertexes[1];
-                                    FaceC[4] = vertexes[1];
-
-                                    tScale = new Vector3(lscale.X, -lscale.Y, -lscale.Z);
-                                    scale = ((tScale * rot));
-
-                                    vertexes[2] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
-
-                                    //vertexes[2].x = pos.X + vertexes[2].x;
-                                    //vertexes[2].y = pos.Y + vertexes[2].y;
-                                    //vertexes[2].z = pos.Z + vertexes[2].z;
-
-                                    FaceC[0] = vertexes[2];
-                                    FaceD[3] = vertexes[2];
-                                    FaceC[5] = vertexes[2];
-
-                                    tScale = new Vector3(lscale.X, lscale.Y, -lscale.Z);
-                                    scale = ((tScale * rot));
-                                    vertexes[3] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
-
-                                    //vertexes[3].x = pos.X + vertexes[3].x;
-                                    // vertexes[3].y = pos.Y + vertexes[3].y;
-                                    // vertexes[3].z = pos.Z + vertexes[3].z;
-
-                                    FaceD[0] = vertexes[3];
-                                    FaceC[1] = vertexes[3];
-                                    FaceA[5] = vertexes[3];
-
-                                    tScale = new Vector3(-lscale.X, lscale.Y, lscale.Z);
-                                    scale = ((tScale * rot));
-                                    vertexes[4] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
-
-                                    // vertexes[4].x = pos.X + vertexes[4].x;
-                                    // vertexes[4].y = pos.Y + vertexes[4].y;
-                                    // vertexes[4].z = pos.Z + vertexes[4].z;
-
-                                    FaceB[1] = vertexes[4];
-                                    FaceA[2] = vertexes[4];
-                                    FaceD[4] = vertexes[4];
-
-                                    tScale = new Vector3(-lscale.X, lscale.Y, -lscale.Z);
-                                    scale = ((tScale * rot));
-                                    vertexes[5] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
-
-                                    // vertexes[5].x = pos.X + vertexes[5].x;
-                                    // vertexes[5].y = pos.Y + vertexes[5].y;
-                                    // vertexes[5].z = pos.Z + vertexes[5].z;
-
-                                    FaceD[1] = vertexes[5];
-                                    FaceC[2] = vertexes[5];
-                                    FaceB[5] = vertexes[5];
+                                    // skip prim in non-finite position
+                                    if (Single.IsNaN(pos.X) || Single.IsNaN(pos.Y) ||
+                                        Single.IsInfinity(pos.X) || Single.IsInfinity(pos.Y))
+                                        continue;
 
-                                    tScale = new Vector3(-lscale.X, -lscale.Y, lscale.Z);
-                                    scale = ((tScale * rot));
-                                    vertexes[6] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
+                                    // Figure out if object is under 256m above the height of the terrain
+                                    bool isBelow256AboveTerrain = false;
 
-                                    // vertexes[6].x = pos.X + vertexes[6].x;
-                                    // vertexes[6].y = pos.Y + vertexes[6].y;
-                                    // vertexes[6].z = pos.Z + vertexes[6].z;
+                                    try
+                                    {
+                                        isBelow256AboveTerrain = (pos.Z < ((float)hm[(int)pos.X, (int)pos.Y] + 256f));
+                                    }
+                                    catch (Exception)
+                                    {
+                                    }
 
-                                    FaceB[2] = vertexes[6];
-                                    FaceA[3] = vertexes[6];
-                                    FaceB[4] = vertexes[6];
+                                    if (isBelow256AboveTerrain)
+                                    {
+                                        // Translate scale by rotation so scale is represented properly when object is rotated
+                                        Vector3 lscale = new Vector3(part.Shape.Scale.X, part.Shape.Scale.Y, part.Shape.Scale.Z);
+                                        Vector3 scale = new Vector3();
+                                        Vector3 tScale = new Vector3();
+                                        Vector3 axPos = new Vector3(pos.X,pos.Y,pos.Z);
+
+                                        Quaternion llrot = part.GetWorldRotation();
+                                        Quaternion rot = new Quaternion(llrot.W, llrot.X, llrot.Y, llrot.Z);
+                                        scale = lscale * rot;
+
+                                        // negative scales don't work in this situation
+                                        scale.X = Math.Abs(scale.X);
+                                        scale.Y = Math.Abs(scale.Y);
+                                        scale.Z = Math.Abs(scale.Z);
+
+                                        // This scaling isn't very accurate and doesn't take into account the face rotation :P
+                                        int mapdrawstartX = (int)(pos.X - scale.X);
+                                        int mapdrawstartY = (int)(pos.Y - scale.Y);
+                                        int mapdrawendX = (int)(pos.X + scale.X);
+                                        int mapdrawendY = (int)(pos.Y + scale.Y);
+
+                                        // If object is beyond the edge of the map, don't draw it to avoid errors
+                                        if (mapdrawstartX < 0 || mapdrawstartX > ((int)Constants.RegionSize - 1) || mapdrawendX < 0 || mapdrawendX > ((int)Constants.RegionSize - 1)
+                                                              || mapdrawstartY < 0 || mapdrawstartY > ((int)Constants.RegionSize - 1) || mapdrawendY < 0
+                                                              || mapdrawendY > ((int)Constants.RegionSize - 1))
+                                            continue;
+
+    #region obb face reconstruction part duex
+                                        Vector3[] vertexes = new Vector3[8];
+
+                                        // float[] distance = new float[6];
+                                        Vector3[] FaceA = new Vector3[6]; // vertex A for Facei
+                                        Vector3[] FaceB = new Vector3[6]; // vertex B for Facei
+                                        Vector3[] FaceC = new Vector3[6]; // vertex C for Facei
+                                        Vector3[] FaceD = new Vector3[6]; // vertex D for Facei
+
+                                        tScale = new Vector3(lscale.X, -lscale.Y, lscale.Z);
+                                        scale = ((tScale * rot));
+                                        vertexes[0] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
+                                        // vertexes[0].x = pos.X + vertexes[0].x;
+                                        //vertexes[0].y = pos.Y + vertexes[0].y;
+                                        //vertexes[0].z = pos.Z + vertexes[0].z;
+
+                                        FaceA[0] = vertexes[0];
+                                        FaceB[3] = vertexes[0];
+                                        FaceA[4] = vertexes[0];
+
+                                        tScale = lscale;
+                                        scale = ((tScale * rot));
+                                        vertexes[1] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
+
+                                        // vertexes[1].x = pos.X + vertexes[1].x;
+                                        // vertexes[1].y = pos.Y + vertexes[1].y;
+                                        //vertexes[1].z = pos.Z + vertexes[1].z;
+
+                                        FaceB[0] = vertexes[1];
+                                        FaceA[1] = vertexes[1];
+                                        FaceC[4] = vertexes[1];
+
+                                        tScale = new Vector3(lscale.X, -lscale.Y, -lscale.Z);
+                                        scale = ((tScale * rot));
+
+                                        vertexes[2] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
+
+                                        //vertexes[2].x = pos.X + vertexes[2].x;
+                                        //vertexes[2].y = pos.Y + vertexes[2].y;
+                                        //vertexes[2].z = pos.Z + vertexes[2].z;
+
+                                        FaceC[0] = vertexes[2];
+                                        FaceD[3] = vertexes[2];
+                                        FaceC[5] = vertexes[2];
+
+                                        tScale = new Vector3(lscale.X, lscale.Y, -lscale.Z);
+                                        scale = ((tScale * rot));
+                                        vertexes[3] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
+
+                                        //vertexes[3].x = pos.X + vertexes[3].x;
+                                        // vertexes[3].y = pos.Y + vertexes[3].y;
+                                        // vertexes[3].z = pos.Z + vertexes[3].z;
+
+                                        FaceD[0] = vertexes[3];
+                                        FaceC[1] = vertexes[3];
+                                        FaceA[5] = vertexes[3];
+
+                                        tScale = new Vector3(-lscale.X, lscale.Y, lscale.Z);
+                                        scale = ((tScale * rot));
+                                        vertexes[4] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
+
+                                        // vertexes[4].x = pos.X + vertexes[4].x;
+                                        // vertexes[4].y = pos.Y + vertexes[4].y;
+                                        // vertexes[4].z = pos.Z + vertexes[4].z;
+
+                                        FaceB[1] = vertexes[4];
+                                        FaceA[2] = vertexes[4];
+                                        FaceD[4] = vertexes[4];
+
+                                        tScale = new Vector3(-lscale.X, lscale.Y, -lscale.Z);
+                                        scale = ((tScale * rot));
+                                        vertexes[5] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
+
+                                        // vertexes[5].x = pos.X + vertexes[5].x;
+                                        // vertexes[5].y = pos.Y + vertexes[5].y;
+                                        // vertexes[5].z = pos.Z + vertexes[5].z;
+
+                                        FaceD[1] = vertexes[5];
+                                        FaceC[2] = vertexes[5];
+                                        FaceB[5] = vertexes[5];
+
+                                        tScale = new Vector3(-lscale.X, -lscale.Y, lscale.Z);
+                                        scale = ((tScale * rot));
+                                        vertexes[6] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
+
+                                        // vertexes[6].x = pos.X + vertexes[6].x;
+                                        // vertexes[6].y = pos.Y + vertexes[6].y;
+                                        // vertexes[6].z = pos.Z + vertexes[6].z;
+
+                                        FaceB[2] = vertexes[6];
+                                        FaceA[3] = vertexes[6];
+                                        FaceB[4] = vertexes[6];
 
-                                    tScale = new Vector3(-lscale.X, -lscale.Y, -lscale.Z);
-                                    scale = ((tScale * rot));
-                                    vertexes[7] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
+                                        tScale = new Vector3(-lscale.X, -lscale.Y, -lscale.Z);
+                                        scale = ((tScale * rot));
+                                        vertexes[7] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
 
-                                    // vertexes[7].x = pos.X + vertexes[7].x;
-                                    // vertexes[7].y = pos.Y + vertexes[7].y;
-                                    // vertexes[7].z = pos.Z + vertexes[7].z;
+                                        // vertexes[7].x = pos.X + vertexes[7].x;
+                                        // vertexes[7].y = pos.Y + vertexes[7].y;
+                                        // vertexes[7].z = pos.Z + vertexes[7].z;
 
-                                    FaceD[2] = vertexes[7];
-                                    FaceC[3] = vertexes[7];
-                                    FaceD[5] = vertexes[7];
-#endregion
+                                        FaceD[2] = vertexes[7];
+                                        FaceC[3] = vertexes[7];
+                                        FaceD[5] = vertexes[7];
+    #endregion
 
-                                    //int wy = 0;
+                                        //int wy = 0;
 
-                                    //bool breakYN = false; // If we run into an error drawing, break out of the
-                                    // loop so we don't lag to death on error handling
-                                    DrawStruct ds = new DrawStruct();
-                                    ds.brush = new SolidBrush(mapdotspot);
-                                    //ds.rect = new Rectangle(mapdrawstartX, (255 - mapdrawstartY), mapdrawendX - mapdrawstartX, mapdrawendY - mapdrawstartY);
+                                        //bool breakYN = false; // If we run into an error drawing, break out of the
+                                        // loop so we don't lag to death on error handling
+                                        DrawStruct ds = new DrawStruct();
+                                        ds.brush = new SolidBrush(mapdotspot);
+                                        //ds.rect = new Rectangle(mapdrawstartX, (255 - mapdrawstartY), mapdrawendX - mapdrawstartX, mapdrawendY - mapdrawstartY);
 
-                                    ds.trns = new face[FaceA.Length];
+                                        ds.trns = new face[FaceA.Length];
 
-                                    for (int i = 0; i < FaceA.Length; i++)
-                                    {
-                                        Point[] working = new Point[5];
-                                        working[0] = project(FaceA[i], axPos);
-                                        working[1] = project(FaceB[i], axPos);
-                                        working[2] = project(FaceD[i], axPos);
-                                        working[3] = project(FaceC[i], axPos);
-                                        working[4] = project(FaceA[i], axPos);
+                                        for (int i = 0; i < FaceA.Length; i++)
+                                        {
+                                            Point[] working = new Point[5];
+                                            working[0] = project(FaceA[i], axPos);
+                                            working[1] = project(FaceB[i], axPos);
+                                            working[2] = project(FaceD[i], axPos);
+                                            working[3] = project(FaceC[i], axPos);
+                                            working[4] = project(FaceA[i], axPos);
 
-                                        face workingface = new face();
-                                        workingface.pts = working;
+                                            face workingface = new face();
+                                            workingface.pts = working;
 
-                                        ds.trns[i] = workingface;
-                                    }
+                                            ds.trns[i] = workingface;
+                                        }
 
-                                    z_sort.Add(part.LocalId, ds);
-                                    z_localIDs.Add(part.LocalId);
-                                    z_sortheights.Add(pos.Z);
+                                        z_sort.Add(part.LocalId, ds);
+                                        z_localIDs.Add(part.LocalId);
+                                        z_sortheights.Add(pos.Z);
 
-                                    //for (int wx = mapdrawstartX; wx < mapdrawendX; wx++)
-                                    //{
-                                        //for (wy = mapdrawstartY; wy < mapdrawendY; wy++)
+                                        //for (int wx = mapdrawstartX; wx < mapdrawendX; wx++)
                                         //{
-                                            //m_log.InfoFormat("[MAPDEBUG]: {0},{1}({2})", wx, (255 - wy),wy);
-                                            //try
-                                            //{
-                                                // Remember, flip the y!
-                                            //    mapbmp.SetPixel(wx, (255 - wy), mapdotspot);
-                                            //}
-                                            //catch (ArgumentException)
+                                            //for (wy = mapdrawstartY; wy < mapdrawendY; wy++)
                                             //{
-                                            //    breakYN = true;
+                                                //m_log.InfoFormat("[MAPDEBUG]: {0},{1}({2})", wx, (255 - wy),wy);
+                                                //try
+                                                //{
+                                                    // Remember, flip the y!
+                                                //    mapbmp.SetPixel(wx, (255 - wy), mapdotspot);
+                                                //}
+                                                //catch (ArgumentException)
+                                                //{
+                                                //    breakYN = true;
+                                                //}
+
+                                                //if (breakYN)
+                                                //    break;
                                             //}
 
                                             //if (breakYN)
                                             //    break;
                                         //}
+                                    } // Object is within 256m Z of terrain
+                                } // object is at least a meter wide
+                            } // loop over group children
+                        } // entitybase is sceneobject group
+                    } // foreach loop over entities
 
-                                        //if (breakYN)
-                                        //    break;
-                                    //}
-                                } // Object is within 256m Z of terrain
-                            } // object is at least a meter wide
-                        } // loop over group children
-                    } // entitybase is sceneobject group
-                } // foreach loop over entities
-
-                float[] sortedZHeights = z_sortheights.ToArray();
-                uint[] sortedlocalIds = z_localIDs.ToArray();
-
-                // Sort prim by Z position
-                Array.Sort(sortedZHeights, sortedlocalIds);
+                    float[] sortedZHeights = z_sortheights.ToArray();
+                    uint[] sortedlocalIds = z_localIDs.ToArray();
 
-                Graphics g = Graphics.FromImage(mapbmp);
+                    // Sort prim by Z position
+                    Array.Sort(sortedZHeights, sortedlocalIds);
 
-                for (int s = 0; s < sortedZHeights.Length; s++)
-                {
-                    if (z_sort.ContainsKey(sortedlocalIds[s]))
+                    using (Graphics g = Graphics.FromImage(mapbmp))
                     {
-                        DrawStruct rectDrawStruct = z_sort[sortedlocalIds[s]];
-                        for (int r = 0; r < rectDrawStruct.trns.Length; r++)
+                        for (int s = 0; s < sortedZHeights.Length; s++)
                         {
-                            g.FillPolygon(rectDrawStruct.brush,rectDrawStruct.trns[r].pts);
+                            if (z_sort.ContainsKey(sortedlocalIds[s]))
+                            {
+                                DrawStruct rectDrawStruct = z_sort[sortedlocalIds[s]];
+                                for (int r = 0; r < rectDrawStruct.trns.Length; r++)
+                                {
+                                    g.FillPolygon(rectDrawStruct.brush,rectDrawStruct.trns[r].pts);
+                                }
+                                //g.FillRectangle(rectDrawStruct.brush , rectDrawStruct.rect);
+                            }
                         }
-                        //g.FillRectangle(rectDrawStruct.brush , rectDrawStruct.rect);
                     }
-                }
+                } // lock entities objs
 
-                g.Dispose();
-            } // lock entities objs
+            }
+            finally
+            {
+                foreach (DrawStruct ds in z_sort.Values)
+                    ds.brush.Dispose();
+            }
 
             m_log.Debug("[MAPTILE]: Generating Maptile Step 2: Done in " + (Environment.TickCount - tc) + " ms");
+
             return mapbmp;
         }
 
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs
index 992bff3..cb06fd4 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
         public void TerrainToBitmap(Bitmap mapbmp)
         {
             int tc = Environment.TickCount;
-            m_log.Debug("[MAPTILE]: Generating Maptile Step 1: Terrain");
+            m_log.Debug("[SHADED MAP TILE RENDERER]: Generating Maptile Step 1: Terrain");
 
             double[,] hm = m_scene.Heightmap.GetDoubles();
             bool ShadowDebugContinue = true;
@@ -199,7 +199,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                         {
                             if (!terraincorruptedwarningsaid)
                             {
-                                m_log.WarnFormat("[MAPIMAGE]: Your terrain is corrupted in region {0}, it might take a few minutes to generate the map image depending on the corruption level", m_scene.RegionInfo.RegionName);
+                                m_log.WarnFormat("[SHADED MAP TILE RENDERER]: Your terrain is corrupted in region {0}, it might take a few minutes to generate the map image depending on the corruption level", m_scene.RegionInfo.RegionName);
                                 terraincorruptedwarningsaid = true;
                             }
                             color = Color.Black;
@@ -229,7 +229,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                         {
                             if (!terraincorruptedwarningsaid)
                             {
-                                m_log.WarnFormat("[MAPIMAGE]: Your terrain is corrupted in region {0}, it might take a few minutes to generate the map image depending on the corruption level", m_scene.RegionInfo.RegionName);
+                                m_log.WarnFormat("[SHADED MAP TILE RENDERER]: Your terrain is corrupted in region {0}, it might take a few minutes to generate the map image depending on the corruption level", m_scene.RegionInfo.RegionName);
                                 terraincorruptedwarningsaid = true;
                             }
                             Color black = Color.Black;
@@ -238,7 +238,8 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                     }
                 }
             }
-            m_log.Debug("[MAPTILE]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms");
+
+            m_log.Debug("[SHADED MAP TILE RENDERER]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
index d13c2ef..e895178 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
@@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
         private Bitmap fetchTexture(UUID id)
         {
             AssetBase asset = m_scene.AssetService.Get(id.ToString());
-            m_log.DebugFormat("[TexturedMapTileRenderer]: Fetched texture {0}, found: {1}", id, asset != null);
+            m_log.DebugFormat("[TEXTURED MAP TILE RENDERER]: Fetched texture {0}, found: {1}", id, asset != null);
             if (asset == null) return null;
 
             ManagedImage managedImage;
@@ -188,17 +188,17 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
             }
             catch (DllNotFoundException)
             {
-                m_log.ErrorFormat("[TexturedMapTileRenderer]: OpenJpeg is not installed correctly on this system.   Asset Data is empty for {0}", id);
+                m_log.ErrorFormat("[TEXTURED MAP TILE RENDERER]: OpenJpeg is not installed correctly on this system.   Asset Data is empty for {0}", id);
                 
             }
             catch (IndexOutOfRangeException)
             {
-                m_log.ErrorFormat("[TexturedMapTileRenderer]: OpenJpeg was unable to encode this.   Asset Data is empty for {0}", id);
+                m_log.ErrorFormat("[TEXTURED MAP TILE RENDERER]: OpenJpeg was unable to encode this.   Asset Data is empty for {0}", id);
                 
             }
             catch (Exception)
             {
-                m_log.ErrorFormat("[TexturedMapTileRenderer]: OpenJpeg was unable to encode this.   Asset Data is empty for {0}", id);
+                m_log.ErrorFormat("[TEXTURED MAP TILE RENDERER]: OpenJpeg was unable to encode this.   Asset Data is empty for {0}", id);
                 
             }
             return null;
@@ -233,10 +233,14 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
             if (textureID == UUID.Zero) return defaultColor; // not set
             if (m_mapping.ContainsKey(textureID)) return m_mapping[textureID]; // one of the predefined textures
 
-            Bitmap bmp = fetchTexture(textureID);
-            Color color = bmp == null ? defaultColor : computeAverageColor(bmp);
-            // store it for future reference
-            m_mapping[textureID] = color;
+            Color color;
+
+            using (Bitmap bmp = fetchTexture(textureID))
+            {
+                color = bmp == null ? defaultColor : computeAverageColor(bmp);
+                // store it for future reference
+                m_mapping[textureID] = color;
+            }
 
             return color;
         }
@@ -278,7 +282,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
         public void TerrainToBitmap(Bitmap mapbmp)
         {
             int tc = Environment.TickCount;
-            m_log.Debug("[MAPTILE]: Generating Maptile Step 1: Terrain");
+            m_log.Debug("[TEXTURED MAP TILE RENDERER]: Generating Maptile Step 1: Terrain");
 
             // These textures should be in the AssetCache anyway, as every client conneting to this
             // region needs them. Except on start, when the map is recreated (before anyone connected),
@@ -412,7 +416,8 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                     }
                 }
             }
-            m_log.Debug("[MAPTILE]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms");
+
+            m_log.Debug("[TEXTURED MAP TILE RENDERER]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 88761a2..cf2ef29 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -1520,62 +1520,69 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
         private Byte[] GenerateOverlay()
         {
-            Bitmap overlay = new Bitmap(256, 256);
-
-            bool[,] saleBitmap = new bool[64, 64];
-            for (int x = 0 ; x < 64 ; x++)
+            using (Bitmap overlay = new Bitmap(256, 256))
             {
-                for (int y = 0 ; y < 64 ; y++)
-                    saleBitmap[x, y] = false;
-            }
-
-            bool landForSale = false;
+                bool[,] saleBitmap = new bool[64, 64];
+                for (int x = 0 ; x < 64 ; x++)
+                {
+                    for (int y = 0 ; y < 64 ; y++)
+                        saleBitmap[x, y] = false;
+                }
 
-            List<ILandObject> parcels = m_scene.LandChannel.AllParcels();
+                bool landForSale = false;
 
-            Color background = Color.FromArgb(0, 0, 0, 0);
-            SolidBrush transparent = new SolidBrush(background);
-            Graphics g = Graphics.FromImage(overlay);
-            g.FillRectangle(transparent, 0, 0, 256, 256);
+                List<ILandObject> parcels = m_scene.LandChannel.AllParcels();
 
-            SolidBrush yellow = new SolidBrush(Color.FromArgb(255, 249, 223, 9));
+                Color background = Color.FromArgb(0, 0, 0, 0);
 
-            foreach (ILandObject land in parcels)
-            {
-                // m_log.DebugFormat("[WORLD MAP]: Parcel {0} flags {1}", land.LandData.Name, land.LandData.Flags);
-                if ((land.LandData.Flags & (uint)ParcelFlags.ForSale) != 0)
+                using (Graphics g = Graphics.FromImage(overlay))
                 {
-                    landForSale = true;
+                    using (SolidBrush transparent = new SolidBrush(background))
+                        g.FillRectangle(transparent, 0, 0, 256, 256);
 
-                    saleBitmap = land.MergeLandBitmaps(saleBitmap, land.GetLandBitmap());
-                }
-            }
 
-            if (!landForSale)
-            {
-                m_log.DebugFormat("[WORLD MAP]: Region {0} has no parcels for sale, not generating overlay", m_scene.RegionInfo.RegionName);
-                return null;
-            }
+                    foreach (ILandObject land in parcels)
+                    {
+                        // m_log.DebugFormat("[WORLD MAP]: Parcel {0} flags {1}", land.LandData.Name, land.LandData.Flags);
+                        if ((land.LandData.Flags & (uint)ParcelFlags.ForSale) != 0)
+                        {
+                            landForSale = true;
 
-            m_log.DebugFormat("[WORLD MAP]: Region {0} has parcels for sale, generating overlay", m_scene.RegionInfo.RegionName);
+                            saleBitmap = land.MergeLandBitmaps(saleBitmap, land.GetLandBitmap());
+                        }
+                    }
 
-            for (int x = 0 ; x < 64 ; x++)
-            {
-                for (int y = 0 ; y < 64 ; y++)
+                    if (!landForSale)
+                    {
+                        m_log.DebugFormat("[WORLD MAP]: Region {0} has no parcels for sale, not generating overlay", m_scene.RegionInfo.RegionName);
+                        return null;
+                    }
+
+                    m_log.DebugFormat("[WORLD MAP]: Region {0} has parcels for sale, generating overlay", m_scene.RegionInfo.RegionName);
+
+                    using (SolidBrush yellow = new SolidBrush(Color.FromArgb(255, 249, 223, 9)))
+                    {
+                        for (int x = 0 ; x < 64 ; x++)
+                        {
+                            for (int y = 0 ; y < 64 ; y++)
+                            {
+                                if (saleBitmap[x, y])
+                                    g.FillRectangle(yellow, x * 4, 252 - (y * 4), 4, 4);
+                            }
+                        }
+                    }
+                }
+
+                try
+                {
+                    return OpenJPEG.EncodeFromImage(overlay, true);
+                }
+                catch (Exception e)
                 {
-                    if (saleBitmap[x, y])
-                        g.FillRectangle(yellow, x * 4, 252 - (y * 4), 4, 4);
+                    m_log.DebugFormat("[WORLD MAP]: Error creating parcel overlay: " + e.ToString());
                 }
             }
 
-            try
-            {
-                return OpenJPEG.EncodeFromImage(overlay, true);
-            }
-            catch (Exception e)
-            {
-                m_log.DebugFormat("[WORLD MAP]: Error creating parcel overlay: " + e.ToString());
-            }
             return null;
         }
     }
-- 
cgit v1.1


From 4a9796a50680ef7aeaa8c9c617b90205724879c8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 24 Jan 2014 19:31:31 +0000
Subject: Skip IClientAPIs that don't implement IStatsCollector (such as
 NPCAvatar) from the "show queues" console report to stop screwing up
 formatting.

"show pquques" already did this
---
 .../Agent/UDP/Linden/LindenUDPInfoModule.cs        | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index 1eb0a6b..3bf5585 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -434,24 +434,24 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                     scene.ForEachClient(
                         delegate(IClientAPI client)
                         {
-                            bool isChild = client.SceneAgent.IsChildAgent;
-                            if (isChild && !showChildren)
-                                return;
-                    
-                            string name = client.Name;
-                            if (pname != "" && name != pname)
-                                return;
-
-                            string regionName = scene.RegionInfo.RegionName;
-
-                            report.Append(GetColumnEntry(name, maxNameLength, columnPadding));
-                            report.Append(GetColumnEntry(regionName, maxRegionNameLength, columnPadding));
-                            report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding));
-
                             if (client is IStatsCollector)
                             {
-                                IStatsCollector stats = (IStatsCollector)client;
+
+                                bool isChild = client.SceneAgent.IsChildAgent;
+                                if (isChild && !showChildren)
+                                    return;
                         
+                                string name = client.Name;
+                                if (pname != "" && name != pname)
+                                    return;
+
+                                string regionName = scene.RegionInfo.RegionName;
+
+                                report.Append(GetColumnEntry(name, maxNameLength, columnPadding));
+                                report.Append(GetColumnEntry(regionName, maxRegionNameLength, columnPadding));
+                                report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding));
+
+                                IStatsCollector stats = (IStatsCollector)client;                            
                                 report.AppendLine(stats.Report());
                             }
                         });
-- 
cgit v1.1


From c9b5ba78d959e6368a525630fecc6103f317f1da Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 24 Jan 2014 19:36:12 +0000
Subject: minor: correct the usage statement on the "show image queues" console
 command - should not have been "image queues show"

---
 OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index 3bf5585..034082e 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -304,7 +304,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
         private string GetImageQueuesReport(string[] showParams)
         {
             if (showParams.Length < 5 || showParams.Length > 6)
-                return "Usage: image queues show <first-name> <last-name> [full]";
+                return "Usage: show image queues <first-name> <last-name> [full]";
 
             string firstName = showParams[3];
             string lastName = showParams[4];
-- 
cgit v1.1


From fea8345f560370d20e13f8362fc8f63396c2247f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 24 Jan 2014 19:40:14 +0000
Subject: minor: remove long unused state queue from "show queues" console
 reports

---
 .../OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs       | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index 034082e..ec18db0 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -395,7 +395,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
             report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding));
             
             report.AppendFormat(
-                "{0,7} {1,7} {2,7} {3,7} {4,9} {5,7} {6,7} {7,7} {8,7} {9,7} {10,8} {11,7} {12,7}\n",
+                "{0,7} {1,7} {2,7} {3,7} {4,9} {5,7} {6,7} {7,7} {8,7} {9,7} {10,8} {11,7}\n",
                 "Since",
                 "Pkts",
                 "Pkts",
@@ -407,12 +407,11 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                 "Q Pkts",
                 "Q Pkts",
                 "Q Pkts",
-                "Q Pkts",
                 "Q Pkts");
     
             report.AppendFormat("{0,-" + totalInfoFieldsLength +  "}", "");
             report.AppendFormat(
-                "{0,7} {1,7} {2,7} {3,7} {4,9} {5,7} {6,7} {7,7} {8,7} {9,7} {10,8} {11,7} {12,7}\n",
+                "{0,7} {1,7} {2,7} {3,7} {4,9} {5,7} {6,7} {7,7} {8,7} {9,7} {10,8} {11,7}\n",
                 "Last In",
                 "In",
                 "Out",
@@ -424,8 +423,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                 "Cloud",
                 "Task",
                 "Texture",
-                "Asset",
-                "State");            
+                "Asset");            
             
             lock (m_scenes)
             {
-- 
cgit v1.1


From e2fbc88d98b8e23b26716b6b800ab540ac0ca821 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 27 Jan 2014 22:56:51 +0000
Subject: Re-enabled NPCModuleTests.TestCreate()

---
 OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index 7f9e440..c65794e 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -110,8 +110,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
             // ScenePresence.SendInitialData() to reset our entire appearance.
             m_scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId));
 
-/*
-            m_afMod.SetAppearance(sp, originalTe, null);
+            m_afMod.SetAppearance(sp, originalTe, null, null);
 
             UUID npcId = m_npcMod.CreateNPC("John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, m_scene, sp.Appearance);
 
@@ -126,7 +125,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
 
             // Have to account for both SP and NPC.
             Assert.That(m_scene.AuthenticateHandler.GetAgentCircuits().Count, Is.EqualTo(2));
-*/
         }
 
         [Test]
-- 
cgit v1.1


From 1b86239f791754e2c3ba7bf2641db5882efb0c80 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 27 Jan 2014 23:17:09 +0000
Subject: refactor: Remove identical part.ParentGroup.AddAvatar(UUID); calls
 which occur no matter which branch of the conditional is executed

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 85a20e9..0cc00ed 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2909,7 +2909,6 @@ namespace OpenSim.Region.Framework.Scenes
                     Rotation = newRot;
 
 //                    ParentPosition = part.AbsolutePosition;
-                    part.ParentGroup.AddAvatar(UUID);
                 }
                 else
                 {
@@ -2918,13 +2917,13 @@ namespace OpenSim.Region.Framework.Scenes
                     m_pos -= part.GroupPosition;
 
 //                    ParentPosition = part.AbsolutePosition;
-                    part.ParentGroup.AddAvatar(UUID);
 
 //                        m_log.DebugFormat(
 //                            "[SCENE PRESENCE]: Sitting {0} at position {1} ({2} + {3}) on part {4} {5} without sit target",
 //                            Name, part.AbsolutePosition, m_pos, ParentPosition, part.Name, part.LocalId);
                 }
 
+                part.ParentGroup.AddAvatar(UUID);
                 ParentPart = m_scene.GetSceneObjectPart(m_requestedSitTargetID);
                 ParentID = m_requestedSitTargetID;
                 m_AngularVelocity = Vector3.Zero;
-- 
cgit v1.1


From a4017ee1eb30af8af4ac08c8003a796fcdd6f4a8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 27 Jan 2014 23:47:43 +0000
Subject: Reinsert attachments list taking code in SP.MakeRootAgent()

Locking attachments then launching script instances on a separate thread will not work, attachments will simply be unlocked and vulnerable to race conditions.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 44 ++++++++++++++++--------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 0cc00ed..84201cc 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1190,22 +1190,36 @@ namespace OpenSim.Region.Framework.Scenes
                 // and CHANGED_REGION) when the attachments have been rezzed in the new region.  This cannot currently
                 // be done in AttachmentsModule.CopyAttachments(AgentData ad, IScenePresence sp) itself since we are
                 // not transporting the required data.
-                lock (m_attachments)
+                //
+                // We need to restart scripts here so that they receive the correct changed events (CHANGED_TELEPORT
+                // and CHANGED_REGION) when the attachments have been rezzed in the new region.  This cannot currently
+                // be done in AttachmentsModule.CopyAttachments(AgentData ad, IScenePresence sp) itself since we are
+                // not transporting the required data.
+                //
+                // We must take a copy of the attachments list here (rather than locking) to avoid a deadlock where a script in one of 
+                // the attachments may start processing an event (which locks ScriptInstance.m_Script) that then calls a method here
+                // which needs to lock m_attachments.  ResumeScripts() needs to take a ScriptInstance.m_Script lock to try to unset the Suspend status.
+                //
+                // FIXME: In theory, this deadlock should not arise since scripts should not be processing events until ResumeScripts().
+                // But XEngine starts all scripts unsuspended.  Starting them suspended will not currently work because script rezzing
+                // is placed in an asynchronous queue in XEngine and so the ResumeScripts() call will almost certainly execute before the 
+                // script is rezzed.  This means the ResumeScripts() does absolutely nothing when using XEngine.
+                //
+                // One cannot simply iterate over attachments in a fire and forget thread because this would no longer
+                // be locked, allowing race conditions if other code changes the attachments list.
+                List<SceneObjectGroup> attachments = GetAttachments();
+
+                if (attachments.Count > 0)
                 {
-                    if (HasAttachments())
-                    {
-                        m_log.DebugFormat(
-                            "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name);
+                    m_log.DebugFormat(
+                        "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name);
 
-                        // Resume scripts
-                        Util.FireAndForget(delegate(object x) {
-                            foreach (SceneObjectGroup sog in m_attachments)
-                            {
-                                sog.ScheduleGroupForFullUpdate();
-                                sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource());
-                                sog.ResumeScripts();
-                            }
-                        });
+                    // Resume scripts
+                    foreach (SceneObjectGroup sog in attachments)
+                    {
+                        sog.ScheduleGroupForFullUpdate();
+                        sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource());
+                        sog.ResumeScripts();
                     }
                 }
             }
@@ -3227,6 +3241,8 @@ namespace OpenSim.Region.Framework.Scenes
             // again here... this comes after the cached appearance check because the avatars
             // appearance goes into the avatar update packet
             SendAvatarDataToAllAgents();
+
+            // This invocation always shows up in the viewer logs as an error.  Is it needed?
             SendAppearanceToAgent(this);
 
             // If we are using the the cached appearance then send it out to everyone
-- 
cgit v1.1


From 8c2b41b01dac74ecd4275d558d1bf1462f691b0e Mon Sep 17 00:00:00 2001
From: Dev Random
Date: Thu, 23 Jan 2014 23:05:00 -0500
Subject: Make inidirectory files supercede distro files

---
 OpenSim/Region/Application/ConfigurationLoader.cs | 76 +++++++++++++++--------
 1 file changed, 49 insertions(+), 27 deletions(-)

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index e3e0c01..9634dab 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -139,12 +139,29 @@ namespace OpenSim
                 }
             }
 
+            m_config = new OpenSimConfigSource();
+            m_config.Source = new IniConfigSource();
+            m_config.Source.Merge(DefaultConfig());
+
+            m_log.Info("[CONFIG]: Reading configuration settings");
+
+            for (int i = 0 ; i < sources.Count ; i++)
+            {
+                if (ReadConfig(m_config, sources[i]))
+                {
+                    iniFileExists = true;
+                    AddIncludes(m_config, sources);
+                }
+            }
+
+			// Override distro settings with contents of inidirectory
             string iniDirName = startupConfig.GetString("inidirectory", "config");
             string iniDirPath = Path.Combine(Util.configDir(), iniDirName);
 
             if (Directory.Exists(iniDirPath))
             {
-                m_log.InfoFormat("Searching folder {0} for config ini files", iniDirPath);
+                m_log.InfoFormat("[CONFIG]: Searching folder {0} for config ini files", iniDirPath);
+	            List<string> overrideSources = new List<string>();
 
                 string[] fileEntries = Directory.GetFiles(iniDirName);
                 foreach (string filePath in fileEntries)
@@ -152,40 +169,45 @@ namespace OpenSim
                     if (Path.GetExtension(filePath).ToLower() == ".ini")
                     {
                         if (!sources.Contains(Path.GetFullPath(filePath)))
-                            sources.Add(Path.GetFullPath(filePath));
+						{
+                            overrideSources.Add(Path.GetFullPath(filePath));
+							// put it in sources too, to avoid circularity
+							sources.Add(Path.GetFullPath(filePath));
+						}
                     }
                 }
-            }
 
-            m_config = new OpenSimConfigSource();
-            m_config.Source = new IniConfigSource();
-            m_config.Source.Merge(DefaultConfig());
-
-            m_log.Info("[CONFIG]: Reading configuration settings");
 
+            	if (overrideSources.Count > 0)
+            	{
+					OpenSimConfigSource overrideConfig = new OpenSimConfigSource();
+					overrideConfig.Source = new IniConfigSource();
+    	        	
+	            	for (int i = 0 ; i < overrideSources.Count ; i++)
+            		{
+		                if (ReadConfig(overrideConfig, overrideSources[i]))
+                		{
+		                    iniFileExists = true;
+                    		AddIncludes(overrideConfig, overrideSources);
+                		} 
+	           		}
+		            m_config.Source.Merge(overrideConfig.Source);
+				}			
+			}
+			
             if (sources.Count == 0)
             {
                 m_log.FatalFormat("[CONFIG]: Could not load any configuration");
                 Environment.Exit(1);
-            }
-
-            for (int i = 0 ; i < sources.Count ; i++)
-            {
-                if (ReadConfig(sources[i]))
-                {
-                    iniFileExists = true;
-                    AddIncludes(sources);
-                }
-            }
-
-            if (!iniFileExists)
+            } 
+			else if (!iniFileExists)
             {
                 m_log.FatalFormat("[CONFIG]: Could not load any configuration");
                 m_log.FatalFormat("[CONFIG]: Configuration exists, but there was an error loading it!");
                 Environment.Exit(1);
             }
-
-            // Make sure command line options take precedence
+			
+			// Make sure command line options take precedence
             m_config.Source.Merge(argvSource);
 
             IConfig enVars = m_config.Source.Configs["Environment"];
@@ -214,10 +236,10 @@ namespace OpenSim
         /// Adds the included files as ini configuration files
         /// </summary>
         /// <param name="sources">List of URL strings or filename strings</param>
-        private void AddIncludes(List<string> sources)
+        private void AddIncludes(OpenSimConfigSource configSource, List<string> sources)
         {
             //loop over config sources
-            foreach (IConfig config in m_config.Source.Configs)
+            foreach (IConfig config in configSource.Source.Configs)
             {
                 // Look for Include-* in the key name
                 string[] keys = config.GetKeys();
@@ -284,7 +306,7 @@ namespace OpenSim
         /// </summary>
         /// <param name="iniPath">Full path to the ini</param>
         /// <returns></returns>
-        private bool ReadConfig(string iniPath)
+        private bool ReadConfig(OpenSimConfigSource configSource, string iniPath)
         {
             bool success = false;
 
@@ -292,7 +314,7 @@ namespace OpenSim
             {
                 m_log.InfoFormat("[CONFIG]: Reading configuration file {0}", Path.GetFullPath(iniPath));
 
-                m_config.Source.Merge(new IniConfigSource(iniPath));
+                configSource.Source.Merge(new IniConfigSource(iniPath));
                 success = true;
             }
             else
@@ -305,7 +327,7 @@ namespace OpenSim
                 {
                     XmlReader r = XmlReader.Create(iniPath);
                     XmlConfigSource cs = new XmlConfigSource(r);
-                    m_config.Source.Merge(cs);
+                    configSource.Source.Merge(cs);
 
                     success = true;
                 }
-- 
cgit v1.1


From f7172095e09bf76bd85e17f3be24280b49348168 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 28 Jan 2014 00:04:55 +0000
Subject: Convert tabs to spaces from previous commit 8c2b41b01

---
 OpenSim/Region/Application/ConfigurationLoader.cs | 54 +++++++++++------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 9634dab..52e520c 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -124,7 +124,7 @@ namespace OpenSim
             else
             {
                 Application.iniFilePath = Path.GetFullPath(
-                        Path.Combine(Util.configDir(), iniFileName));
+                    Path.Combine(Util.configDir(), iniFileName));
 
                 if (!File.Exists(Application.iniFilePath))
                 {
@@ -154,14 +154,14 @@ namespace OpenSim
                 }
             }
 
-			// Override distro settings with contents of inidirectory
+            // Override distro settings with contents of inidirectory
             string iniDirName = startupConfig.GetString("inidirectory", "config");
             string iniDirPath = Path.Combine(Util.configDir(), iniDirName);
 
             if (Directory.Exists(iniDirPath))
             {
                 m_log.InfoFormat("[CONFIG]: Searching folder {0} for config ini files", iniDirPath);
-	            List<string> overrideSources = new List<string>();
+                List<string> overrideSources = new List<string>();
 
                 string[] fileEntries = Directory.GetFiles(iniDirName);
                 foreach (string filePath in fileEntries)
@@ -169,45 +169,45 @@ namespace OpenSim
                     if (Path.GetExtension(filePath).ToLower() == ".ini")
                     {
                         if (!sources.Contains(Path.GetFullPath(filePath)))
-						{
+                        {
                             overrideSources.Add(Path.GetFullPath(filePath));
-							// put it in sources too, to avoid circularity
-							sources.Add(Path.GetFullPath(filePath));
-						}
+                            // put it in sources too, to avoid circularity
+                            sources.Add(Path.GetFullPath(filePath));
+                        }
                     }
                 }
 
 
-            	if (overrideSources.Count > 0)
-            	{
-					OpenSimConfigSource overrideConfig = new OpenSimConfigSource();
-					overrideConfig.Source = new IniConfigSource();
-    	        	
-	            	for (int i = 0 ; i < overrideSources.Count ; i++)
-            		{
-		                if (ReadConfig(overrideConfig, overrideSources[i]))
-                		{
-		                    iniFileExists = true;
-                    		AddIncludes(overrideConfig, overrideSources);
-                		} 
-	           		}
-		            m_config.Source.Merge(overrideConfig.Source);
-				}			
-			}
-			
+                if (overrideSources.Count > 0)
+                {
+                    OpenSimConfigSource overrideConfig = new OpenSimConfigSource();
+                    overrideConfig.Source = new IniConfigSource();
+
+                    for (int i = 0 ; i < overrideSources.Count ; i++)
+                    {
+                        if (ReadConfig(overrideConfig, overrideSources[i]))
+                        {
+                            iniFileExists = true;
+                            AddIncludes(overrideConfig, overrideSources);
+                        } 
+                    }
+                    m_config.Source.Merge(overrideConfig.Source);
+                }
+            }
+
             if (sources.Count == 0)
             {
                 m_log.FatalFormat("[CONFIG]: Could not load any configuration");
                 Environment.Exit(1);
             } 
-			else if (!iniFileExists)
+            else if (!iniFileExists)
             {
                 m_log.FatalFormat("[CONFIG]: Could not load any configuration");
                 m_log.FatalFormat("[CONFIG]: Configuration exists, but there was an error loading it!");
                 Environment.Exit(1);
             }
-			
-			// Make sure command line options take precedence
+
+            // Make sure command line options take precedence
             m_config.Source.Merge(argvSource);
 
             IConfig enVars = m_config.Source.Configs["Environment"];
-- 
cgit v1.1


From 2cf224166f232076c6d51312aaae1a9a9c24bd1c Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Wed, 15 Jan 2014 17:38:09 +0200
Subject: Added osGetRegionSize(), which returns the region size in meters and
 recognizes megaregions

---
 .../Shared/Api/Implementation/OSSL_Api.cs          | 23 ++++++++++++++++++++++
 .../ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs |  1 +
 .../ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs   |  5 +++++
 3 files changed, 29 insertions(+)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index f4d5562..15fbbfd 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2926,6 +2926,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return ret;
         }
 
+        public LSL_Vector osGetRegionSize()
+        {
+            CheckThreatLevel(ThreatLevel.None, "osGetRegionSize");
+            m_host.AddScriptLPS(1);
+
+            bool isMegaregion;
+            IRegionCombinerModule rcMod = World.RequestModuleInterface<IRegionCombinerModule>();
+            if (rcMod != null)
+                isMegaregion = rcMod.IsRootForMegaregion(World.RegionInfo.RegionID);
+            else
+                isMegaregion = false;
+
+            if (isMegaregion)
+            {
+                Vector2 size = rcMod.GetSizeOfMegaregion(World.RegionInfo.RegionID);
+                return new LSL_Vector(size.X, size.Y, Constants.RegionHeight);
+            }
+            else
+            {
+                return new LSL_Vector((float)Constants.RegionSize, (float)Constants.RegionSize, Constants.RegionHeight);
+            }
+        }
+
         public int osGetSimulatorMemory()
         {
             CheckThreatLevel(ThreatLevel.Moderate, "osGetSimulatorMemory");
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 51d0581..519779e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -337,6 +337,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         key osGetMapTexture();
         key osGetRegionMapTexture(string regionName);
         LSL_List osGetRegionStats();
+        vector osGetRegionSize();
 
         int osGetSimulatorMemory();
         void osKickAvatar(string FirstName,string SurName,string alert);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index c9902e4..02a3541 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -863,6 +863,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_OSSL_Functions.osGetRegionStats();
         }
 
+        public vector osGetRegionSize()
+        {
+            return m_OSSL_Functions.osGetRegionSize();
+        }
+
         /// <summary>
         /// Returns the amount of memory in use by the Simulator Daemon.
         /// Amount in bytes - if >= 4GB, returns 4GB. (LSL is not 64-bit aware)
-- 
cgit v1.1